diff --git a/.editorconfig b/.editorconfig index b780def5d11e..17f92c50d169 100644 --- a/.editorconfig +++ b/.editorconfig @@ -67,10 +67,6 @@ indent_style = unset insert_final_newline = unset trim_trailing_whitespace = unset -[pkgs/build-support/upstream-updater/**] -indent_style = unset -trim_trailing_whitespace = unset - [pkgs/development/compilers/elm/registry.dat] end_of_line = unset insert_final_newline = unset @@ -84,10 +80,3 @@ trim_trailing_whitespace = unset [pkgs/tools/misc/timidity/timidity.cfg] trim_trailing_whitespace = unset - -[pkgs/tools/security/enpass/data.json] -insert_final_newline = unset -trim_trailing_whitespace = unset - -[pkgs/top-level/emscripten-packages.nix] -trim_trailing_whitespace = unset diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000000..4a581f9dcea3 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,32 @@ +# This file contains a list of commits that are not likely what you +# are looking for in a blame, such as mass reformatting or renaming. +# You can set this file as a default ignore file for blame by running +# the following command. +# +# $ git config blame.ignoreRevsFile .git-blame-ignore-revs +# +# To temporarily not use this file add +# --ignore-revs-file="" +# to your blame command. +# +# The ignoreRevsFile can't be set globally due to blame failing if the file isn't present. +# To not have to set the option in every repository it is needed in, +# save the following script in your path with the name "git-bblame" +# now you can run +# $ git bblame $FILE +# to use the .git-blame-ignore-revs file if it is present. +# +# #!/usr/bin/env bash +# repo_root=$(git rev-parse --show-toplevel) +# if [[ -e $repo_root/.git-blame-ignore-revs ]]; then +# git blame --ignore-revs-file="$repo_root/.git-blame-ignore-revs" $@ +# else +# git blame $@ +# fi + + +# nixos/modules/rename: Sort alphabetically +1f71224fe86605ef4cd23ed327b3da7882dad382 + +# nixos: fix module paths in rename.nix +d08ede042b74b8199dc748323768227b88efcf7c diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f2b58f80ee15..008d51b29aa4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -10,9 +10,6 @@ # IMPORTANT NOTE: in order to actually get pinged, commit access is required. # 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. -# We still add the team to the list next to its members, this helps keeping things -# in sync. (Put non team members before the team to distinguish them.) -# See https://github.com/NixOS/nixpkgs/issues/124085 for more details # This file /.github/CODEOWNERS @edolstra @@ -39,10 +36,10 @@ /pkgs/top-level/stage.nix @nbp @Ericson2314 @matthewbauer /pkgs/top-level/splice.nix @Ericson2314 @matthewbauer /pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer -/pkgs/stdenv/generic @Ericson2314 @matthewbauer @cab404 +/pkgs/stdenv/generic @Ericson2314 @matthewbauer /pkgs/stdenv/cross @Ericson2314 @matthewbauer -/pkgs/build-support/cc-wrapper @Ericson2314 @orivej -/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej +/pkgs/build-support/cc-wrapper @Ericson2314 +/pkgs/build-support/bintools-wrapper @Ericson2314 /pkgs/build-support/setup-hooks @Ericson2314 /pkgs/build-support/setup-hooks/auto-patchelf.sh @aszlig @@ -77,6 +74,12 @@ # NixOS integration test driver /nixos/lib/test-driver @tfc +# Systemd +/nixos/modules/system/boot/systemd.nix @NixOS/systemd +/nixos/modules/system/boot/systemd @NixOS/systemd +/nixos/lib/systemd-*.nix @NixOS/systemd +/pkgs/os-specific/linux/systemd @NixOS/systemd + # Updaters ## update.nix /maintainers/scripts/update.nix @jtojnar @@ -91,8 +94,7 @@ /pkgs/development/python-modules @FRidh @jonringer /doc/languages-frameworks/python.section.md @FRidh /pkgs/development/tools/poetry2nix @adisbladis -/pkgs/development/interpreters/python/hooks @FRidh @jonringer @DavHau -/pkgs/development/interpreters/python/conda @DavHau +/pkgs/development/interpreters/python/hooks @FRidh @jonringer # Haskell /doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn @expipiplus1 @@ -104,13 +106,13 @@ /pkgs/top-level/haskell-packages.nix @cdepillabout @sternenseemann @maralorn @expipiplus1 # Perl -/pkgs/development/interpreters/perl @volth @stigtsp @zakame -/pkgs/top-level/perl-packages.nix @volth @stigtsp @zakame -/pkgs/development/perl-modules @volth @stigtsp @zakame +/pkgs/development/interpreters/perl @stigtsp @zakame +/pkgs/top-level/perl-packages.nix @stigtsp @zakame +/pkgs/development/perl-modules @stigtsp @zakame # R -/pkgs/applications/science/math/R @jbedo @bcdarwin -/pkgs/development/r-modules @jbedo @bcdarwin +/pkgs/applications/science/math/R @jbedo +/pkgs/development/r-modules @jbedo # Ruby /pkgs/development/interpreters/ruby @marsam @@ -119,10 +121,7 @@ # Rust /pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq /pkgs/build-support/rust @zowoq - -# Darwin-related -/pkgs/stdenv/darwin @NixOS/darwin-maintainers -/pkgs/os-specific/darwin @NixOS/darwin-maintainers +/doc/languages-frameworks/rust.section.md @zowoq # C compilers /pkgs/development/compilers/gcc @matthewbauer @@ -132,15 +131,6 @@ /pkgs/top-level/unix-tools.nix @matthewbauer /pkgs/development/tools/xcbuild @matthewbauer -# Beam-related (Erlang, Elixir, LFE, etc) -/pkgs/development/beam-modules @gleber -/pkgs/development/interpreters/erlang @gleber -/pkgs/development/interpreters/lfe @gleber -/pkgs/development/interpreters/elixir @gleber -/pkgs/development/tools/build-managers/rebar @gleber -/pkgs/development/tools/build-managers/rebar3 @gleber -/pkgs/development/tools/erlang @gleber - # Audio /nixos/modules/services/audio/botamusique.nix @mweinelt /nixos/modules/services/audio/snapserver.nix @mweinelt @@ -208,7 +198,7 @@ /pkgs/development/idris-modules @Infinisil # Bazel -/pkgs/development/tools/build-managers/bazel @mboes @Profpatsch +/pkgs/development/tools/build-managers/bazel @Profpatsch # NixOS modules for e-mail and dns services /nixos/modules/services/mail/mailman.nix @peti @@ -217,18 +207,18 @@ /nixos/modules/services/mail/rspamd.nix @peti # Emacs -/pkgs/applications/editors/emacs-modes @adisbladis -/pkgs/applications/editors/emacs @adisbladis -/pkgs/top-level/emacs-packages.nix @adisbladis +/pkgs/applications/editors/emacs/elisp-packages @adisbladis +/pkgs/applications/editors/emacs @adisbladis +/pkgs/top-level/emacs-packages.nix @adisbladis # Neovim /pkgs/applications/editors/neovim @jonringer @teto # VimPlugins -/pkgs/misc/vim-plugins @jonringer @softinio +/pkgs/applications/editors/vim/plugins @jonringer # VsCode Extensions -/pkgs/misc/vscode-extensions @jonringer +/pkgs/applications/editors/vscode/extensions @jonringer # Prometheus exporter modules and tests /nixos/modules/services/monitoring/prometheus/exporters.nix @WilliButz @@ -236,22 +226,22 @@ /nixos/tests/prometheus-exporters.nix @WilliButz # PHP interpreter, packages, extensions, tests and documentation -/doc/languages-frameworks/php.section.md @NixOS/php @aanderse @etu @globin @ma27 @talyz -/nixos/tests/php @NixOS/php @aanderse @etu @globin @ma27 @talyz -/pkgs/build-support/build-pecl.nix @NixOS/php @aanderse @etu @globin @ma27 @talyz -/pkgs/development/interpreters/php @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz -/pkgs/development/php-packages @NixOS/php @aanderse @etu @globin @ma27 @talyz -/pkgs/top-level/php-packages.nix @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz +/doc/languages-frameworks/php.section.md @aanderse @etu @globin @ma27 @talyz +/nixos/tests/php @aanderse @etu @globin @ma27 @talyz +/pkgs/build-support/build-pecl.nix @aanderse @etu @globin @ma27 @talyz +/pkgs/development/interpreters/php @jtojnar @aanderse @etu @globin @ma27 @talyz +/pkgs/development/php-packages @aanderse @etu @globin @ma27 @talyz +/pkgs/top-level/php-packages.nix @jtojnar @aanderse @etu @globin @ma27 @talyz # Podman, CRI-O modules and related -/nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq @adisbladis -/nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq @adisbladis -/nixos/modules/virtualisation/podman @NixOS/podman @zowoq @adisbladis -/nixos/tests/cri-o.nix @NixOS/podman @zowoq @adisbladis -/nixos/tests/podman @NixOS/podman @zowoq @adisbladis +/nixos/modules/virtualisation/containers.nix @zowoq @adisbladis +/nixos/modules/virtualisation/cri-o.nix @zowoq @adisbladis +/nixos/modules/virtualisation/podman @zowoq @adisbladis +/nixos/tests/cri-o.nix @zowoq @adisbladis +/nixos/tests/podman @zowoq @adisbladis # Docker tools -/pkgs/build-support/docker @roberth @utdemir +/pkgs/build-support/docker @roberth /nixos/tests/docker-tools-overlay.nix @roberth /nixos/tests/docker-tools.nix @roberth /doc/builders/images/dockertools.xml @roberth @@ -266,8 +256,8 @@ /pkgs/development/go-packages @kalbasit @Mic92 @zowoq # GNOME -/pkgs/desktops/gnome @NixOS/GNOME @jtojnar @hedning -/pkgs/desktops/gnome/extensions @piegamesde @NixOS/GNOME @jtojnar @hedning +/pkgs/desktops/gnome @jtojnar @hedning +/pkgs/desktops/gnome/extensions @piegamesde @jtojnar @hedning # Cinnamon /pkgs/desktops/cinnamon @mkg20001 @@ -288,10 +278,10 @@ # Matrix /pkgs/servers/heisenbridge @piegamesde -/pkgs/servers/matrix-conduit @piegamesde @pstn +/pkgs/servers/matrix-conduit @piegamesde /pkgs/servers/matrix-synapse/matrix-appservice-irc @piegamesde /nixos/modules/services/misc/heisenbridge.nix @piegamesde /nixos/modules/services/misc/matrix-appservice-irc.nix @piegamesde -/nixos/modules/services/misc/matrix-conduit.nix @piegamesde @pstn +/nixos/modules/services/misc/matrix-conduit.nix @piegamesde /nixos/tests/matrix-appservice-irc.nix @piegamesde -/nixos/tests/matrix-conduit.nix @piegamesde @pstn +/nixos/tests/matrix-conduit.nix @piegamesde diff --git a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md index 72c09a19c0e6..f1535526c2a7 100644 --- a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md +++ b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md @@ -13,10 +13,10 @@ assignees: '' - [ ] Checked the [nixpkgs master branch](https://github.com/NixOS/nixpkgs) current version: diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 268b1594de71..397e5ff5d175 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,16 +1,10 @@ +###### Description of changes + -###### Motivation for this change - - ###### Things done @@ -34,3 +28,14 @@ Reviewing guidelines: https://nixos.org/manual/nixpkgs/unstable/#chap-reviewing- - [ ] (Module addition) Added a release notes entry if adding a new NixOS module - [ ] (Release notes changes) Ran `nixos/doc/manual/md-to-db.sh` to update generated release notes - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md). + + diff --git a/.github/labeler.yml b/.github/labeler.yml index e23cd9598ff9..a48f60e77638 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -5,10 +5,6 @@ - pkgs/development/libraries/agda/**/* - pkgs/top-level/agda-packages.nix -"6.topic: bsd": - - pkgs/os-specific/bsd/**/* - - pkgs/stdenv/freebsd/**/* - "6.topic: cinnamon": - pkgs/desktops/cinnamon/**/* @@ -16,7 +12,7 @@ - nixos/modules/services/editors/emacs.nix - nixos/modules/services/editors/emacs.xml - nixos/tests/emacs-daemon.nix - - pkgs/applications/editors/emacs-modes/**/* + - pkgs/applications/editors/emacs/elisp-packages/**/* - pkgs/applications/editors/emacs/**/* - pkgs/build-support/emacs/**/* - pkgs/top-level/emacs-packages.nix @@ -142,7 +138,7 @@ "6.topic: vim": - doc/languages-frameworks/vim.section.md - pkgs/applications/editors/vim/**/* - - pkgs/misc/vim-plugins/**/* + - pkgs/applications/editors/vim/plugins/**/* - nixos/modules/programs/neovim.nix - pkgs/applications/editors/neovim/**/* diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 0e3f315bb0de..4ee5adfaac1e 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -2,13 +2,19 @@ name: Backport on: pull_request_target: types: [closed, labeled] + +# WARNING: +# When extending this action, be aware that $GITHUB_TOKEN allows write access to +# the GitHub repository. This means that it should not evaluate user input in a +# way that allows code injection. + jobs: backport: name: Backport Pull Request if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # required to find all branches fetch-depth: 0 diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index 67634af51f62..51429ae40bee 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -14,7 +14,12 @@ jobs: runs-on: ubuntu-latest # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v16 + - uses: cachix/cachix-action@v10 + with: + # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. + name: nixpkgs-ci + signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset - run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' diff --git a/.github/workflows/direct-push.yml b/.github/workflows/direct-push.yml index 459475c3c6bc..082a4806e619 100644 --- a/.github/workflows/direct-push.yml +++ b/.github/workflows/direct-push.yml @@ -22,7 +22,7 @@ jobs: if: steps.ismerge.outputs.ismerge != 'true' - name: Warn if the commit was a direct push if: steps.ismerge.outputs.ismerge != 'true' - uses: peter-evans/commit-comment@v1 + uses: peter-evans/commit-comment@v2 with: body: | @${{ github.actor }}, you pushed a commit directly to master/release branch diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 28e20d6c9458..de49e55ef2a7 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -24,7 +24,7 @@ jobs: - name: print list of changed files run: | cat "$HOME/changed_files" - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 4d1e2a2a0f95..5f949ddc56b1 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -4,6 +4,11 @@ on: pull_request_target: types: [edited, opened, synchronize, reopened] +# WARNING: +# When extending this action, be aware that $GITHUB_TOKEN allows some write +# access to the GitHub API. This means that it should not evaluate user input in +# a way that allows code injection. + permissions: contents: read pull-requests: write @@ -13,7 +18,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/labeler@v3 + - uses: actions/labeler@v4 with: repo-token: ${{ secrets.GITHUB_TOKEN }} sync-labels: true diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index b9181c5f3bbc..61a8a217651d 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge @@ -24,7 +24,7 @@ jobs: extra_nix_config: sandbox = true - uses: cachix/cachix-action@v10 with: - # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere. + # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' - name: Building NixOS manual diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 3bdbd7f78fc4..70d9aab69828 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge @@ -24,7 +24,7 @@ jobs: extra_nix_config: sandbox = true - uses: cachix/cachix-action@v10 with: - # This cache is for the nixos/nixpkgs manual builds and should not be trusted or used elsewhere. + # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. name: nixpkgs-ci signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' - name: Building Nixpkgs manual diff --git a/.github/workflows/nixos-manual.yml b/.github/workflows/nixos-manual.yml index e1c5b4dc93b9..bd70f228d462 100644 --- a/.github/workflows/nixos-manual.yml +++ b/.github/workflows/nixos-manual.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/pending-set.yml b/.github/workflows/pending-set.yml index 944d1deefb9f..b15e4847e67c 100644 --- a/.github/workflows/pending-set.yml +++ b/.github/workflows/pending-set.yml @@ -3,6 +3,11 @@ name: "set pending status" on: pull_request_target: +# WARNING: +# When extending this action, be aware that $GITHUB_TOKEN allows write access to +# the GitHub repository. This means that it should not evaluate user input in a +# way that allows code injection. + jobs: action: runs-on: ubuntu-latest diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index b8535fdf9527..027c63aad9a2 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -38,7 +38,7 @@ jobs: into: staging-21.11 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@1.4.0 @@ -49,7 +49,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} - name: Comment on failure - uses: peter-evans/create-or-update-comment@v1 + uses: peter-evans/create-or-update-comment@v2 if: ${{ failure() }} with: issue-number: 105153 diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml index daa9b6d3c844..5588d216ea03 100644 --- a/.github/workflows/periodic-merge-6h.yml +++ b/.github/workflows/periodic-merge-6h.yml @@ -32,7 +32,7 @@ jobs: into: staging name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@1.4.0 @@ -43,7 +43,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} - name: Comment on failure - uses: peter-evans/create-or-update-comment@v1 + uses: peter-evans/create-or-update-comment@v2 if: ${{ failure() }} with: issue-number: 105153 diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 33ebb6f14ac3..0c775cb6e402 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -10,7 +10,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: cachix/install-nix-action@v16 - name: setup id: setup @@ -21,7 +21,7 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" git config user.name "github-actions[bot]" pushd pkgs/applications/networking/cluster/terraform-providers - ./update-all-providers + ./update-all-providers --no-build git commit -m "${{ steps.setup.outputs.title }}" providers.json popd - name: create PR @@ -39,7 +39,7 @@ jobs: title: ${{ steps.setup.outputs.title }} token: ${{ secrets.GITHUB_TOKEN }} - name: comment on failure - uses: peter-evans/create-or-update-comment@v1 + uses: peter-evans/create-or-update-comment@v2 if: ${{ failure() }} with: issue-number: 153416 diff --git a/README.md b/README.md index e0970f85ff23..ff66ef0d85e8 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,15 @@

- NixOS logo + + NixOS logo + + + NixOS logo +

- Code Triagers badge - Open Collective supporters + Contributors badge + Open Collective supporters

[Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index 28388ba685d8..d9f22b062827 100644 --- a/doc/builders/fetchers.chapter.md +++ b/doc/builders/fetchers.chapter.md @@ -72,6 +72,10 @@ Used with Mercurial. Expects `url`, `rev`, and `sha256`. A number of fetcher functions wrap part of `fetchurl` and `fetchzip`. They are mainly convenience functions intended for commonly used destinations of source code in Nixpkgs. These wrapper fetchers are listed below. +## `fetchFromGitea` {#fetchfromgitea} + +`fetchFromGitea` expects five arguments. `domain` is the gitea server name. `owner` is a string corresponding to the Gitea user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every Gitea HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `sha256` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `sha256` is currently preferred. + ## `fetchFromGitHub` {#fetchfromgithub} `fetchFromGitHub` expects four arguments. `owner` is a string corresponding to the GitHub user or organization that controls this repository. `repo` corresponds to the name of the software repository. These are located at the top of every GitHub HTML page as `owner`/`repo`. `rev` corresponds to the Git commit hash or tag (e.g `v1.0`) that will be downloaded from Git. Finally, `sha256` corresponds to the hash of the extracted directory. Again, other hash algorithms are also available but `sha256` is currently preferred. diff --git a/doc/builders/packages/steam.section.md b/doc/builders/packages/steam.section.md index 0cfc1a2c2458..3ce33c9b60ef 100644 --- a/doc/builders/packages/steam.section.md +++ b/doc/builders/packages/steam.section.md @@ -56,7 +56,7 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a ## steam-run {#sec-steam-run} -The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run-native` package and run the game with +The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run` package and run the game with ``` steam-run ./foo diff --git a/doc/builders/special/fhs-environments.section.md b/doc/builders/special/fhs-environments.section.md index 43dc99b7c18f..cacad261e28f 100644 --- a/doc/builders/special/fhs-environments.section.md +++ b/doc/builders/special/fhs-environments.section.md @@ -45,3 +45,5 @@ One can create a simple environment using a `shell.nix` like that: ``` Running `nix-shell` would then drop you into a shell with these libraries and binaries available. You can use this to run closed-source applications which expect FHS structure without hassles: simply change `runScript` to the application path, e.g. `./bin/start.sh` -- relative paths are supported. + +Additionally, the FHS builder links all relocated gsettings-schemas (the glib setup-hook moves them to `share/gsettings-schemas/${name}/glib-2.0/schemas`) to their standard FHS location. This means you don't need to wrap binaries with `wrapGAppsHook`. diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index 79d90c23a40f..dac6d828ac0b 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -224,7 +224,7 @@ There are a few naming guidelines: - Dashes in the package name _should_ be preserved in new variable names, rather than converted to underscores or camel cased — e.g., `http-parser` instead of `http_parser` or `httpParser`. The hyphenated style is preferred in all three package names. -- If there are multiple versions of a package, this _should_ be reflected in the variable names in `all-packages.nix`, e.g. `json-c-0-9` and `json-c-0-11`. If there is an obvious “default” version, make an attribute like `json-c = json-c-0-9;`. See also [](#sec-versioning) +- If there are multiple versions of a package, this _should_ be reflected in the variable names in `all-packages.nix`, e.g. `json-c_0_9` and `json-c_0_11`. If there is an obvious “default” version, make an attribute like `json-c = json-c_0_9;`. See also [](#sec-versioning) ## File naming and organisation {#sec-organisation} @@ -540,10 +540,11 @@ If you do need to do create this sort of patch file, one way to do so is with gi If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`: +- `relative`: Similar to using `git-diff`'s `--relative` flag, only keep changes inside the specified directory, making paths relative to it. - `stripLen`: Remove the first `stripLen` components of pathnames in the patch. - `extraPrefix`: Prefix pathnames by this string. -- `excludes`: Exclude files matching this pattern. -- `includes`: Include only files matching this pattern. +- `excludes`: Exclude files matching these patterns (applies after the above arguments). +- `includes`: Include only files matching these patterns (applies after the above arguments). - `revert`: Revert the patch. Note that because the checksum is computed after applying these effects, using or modifying these arguments will have no effect unless the `sha256` argument is changed as well. diff --git a/doc/contributing/reviewing-contributions.chapter.md b/doc/contributing/reviewing-contributions.chapter.md index 3f3ba60947cc..3417854730ef 100644 --- a/doc/contributing/reviewing-contributions.chapter.md +++ b/doc/contributing/reviewing-contributions.chapter.md @@ -103,7 +103,8 @@ Sample template for a new package review is provided below. - [ ] `meta.maintainers` is set - [ ] build time only dependencies are declared in `nativeBuildInputs` - [ ] source is fetched using the appropriate function -- [ ] phases are respected +- [ ] the list of `phases` is not overridden +- [ ] when a phase (like `installPhase`) is overridden it starts with `runHook preInstall` and ends with `runHook postInstall`. - [ ] patches that are remotely available are fetched with `fetchpatch` ##### Possible improvements @@ -121,10 +122,10 @@ Reviewing process: - [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. - Ensure that the introduced options are correct. - - Type should be appropriate (string related types differs in their merging capabilities, `optionSet` and `string` types are deprecated). + - 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. - - `mkRenamedOptionModule` and `mkAliasOptionModule` functions provide way to make option changes backward compatible. + - `mkRenamedOptionModuleWith` provides a way to make option changes backward compatible. - 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. @@ -156,7 +157,7 @@ Reviewing process: - 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, `optionSet` and `string` types are deprecated). + - 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 module `meta` field is present - Maintainers should be declared in `meta.maintainers`. diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index d5b5f5a60175..109d051c016f 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -98,7 +98,7 @@ We use jbidwatcher as an example for a discontinued project here. 1. Create a new branch for your change, e.g. `git checkout -b jbidwatcher` 1. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher` 1. Remove the package from the list of all packages (`pkgs/top-level/all-packages.nix`). -1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/misc/vim-plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.) +1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/applications/editors/vim/plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.) For example in this case: diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index a30f4edf4c19..052bfa1f6ae3 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -1474,7 +1474,7 @@ lib.attrsets.zipAttrsWith
<function>lib.attrsets.zipAttrs</function> - zipAttrsWith :: [ AttrSet ] -> AttrSet + zipAttrs :: [ AttrSet ] -> AttrSet diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index a5155aedaf52..9a692104a041 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -29,7 +29,8 @@ The recommended way of defining a derivation for a Coq library, is to use the `c * `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags, * `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers, * `namePrefix` (optional, defaults to `[ "coq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`, -* `extraBuildInputs` (optional), by default `buildInputs` just contains `coq`, this allows to add more build inputs, +* `extraNativeBuildInputs` (optional), by default `nativeBuildInputs` just contains `coq`, this allows to add more native build inputs, `nativeBuildInputs` are executables and `buildInputs` are libraries and dependencies, +* `extraBuildInputs` (optional), this allows to add more build inputs, * `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `extraBuildInputs` to depend on the same package set Coq was built against. * `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2if = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`, * `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one. diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index bf5742d6855e..817317804923 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -85,7 +85,7 @@ you will still need to commit the modified version of the lock files, but at lea each tool has an abstraction to just build the node_modules (dependencies) directory. you can always use the stdenv.mkDerivation with the node_modules to build the package (symlink the node_modules directory and then use the package build command). the node_modules abstraction can be also used to build some web framework frontends. For an example of this see how [plausible](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix) is built. mkYarnModules to make the derivation containing node_modules. Then when building the frontend you can just symlink the node_modules directory -## javascript packages inside nixpkgs {#javascript-packages-nixpkgs} +## Javascript packages inside nixpkgs {#javascript-packages-nixpkgs} The `pkgs/development/node-packages` folder contains a generated collection of [NPM packages](https://npmjs.com/) that can be installed with the Nix package @@ -121,12 +121,14 @@ requires `node-gyp-build`, so [we override](https://github.com/NixOS/nixpkgs/blo }; ``` +### Adding and Updating Javascript packages in nixpkgs + To add a package from NPM to nixpkgs: 1. Modify `pkgs/development/node-packages/node-packages.json` to add, update or remove package entries to have it included in `nodePackages` and `nodePackages_latest`. -2. Run the script: `cd pkgs/development/node-packages && ./generate.sh`. +2. Run the script: `./pkgs/development/node-packages/generate.sh`. 3. Build your new package to test your changes: `cd /path/to/nixpkgs && nix-build -A nodePackages.`. To build against the latest stable Current Node.js version (e.g. 14.x): @@ -137,6 +139,26 @@ For more information about the generation process, consult the [README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` tool. +To update NPM packages in nixpkgs, run the same `generate.sh` script: + +```sh +./pkgs/development/node-packages/generate.sh +``` + +#### Git protocol error + +Some packages may have Git dependencies from GitHub specified with `git://`. +GitHub has +[disabled unecrypted Git connections](https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git), +so you may see the following error when running the generate script: +`The unauthenticated git protocol on port 9418 is no longer supported`. + +Use the following Git configuration to resolve the issue: + +```sh +git config --global url."https://github.com/".insteadOf git://github.com/ +``` + ## Tool specific instructions {#javascript-tool-specific} ### node2nix {#javascript-node2nix} diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index d266a032268c..c6e40eaa20d0 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -32,14 +32,18 @@ Given that most of the OCaml ecosystem is now built with dune, nixpkgs includes Here is a simple package example. -- It defines an (optional) attribute `minimalOCamlVersion` that will be used to - throw a descriptive evaluation error if building with an older OCaml is - attempted. +- It defines an (optional) attribute `minimalOCamlVersion` (see note below) + that will be used to throw a descriptive evaluation error if building with + an older OCaml is attempted. - It uses the `fetchFromGitHub` fetcher to get its source. -- `useDune2 = true` ensures that the latest version of Dune is used for the - build (this may become the default value in a future release). +- `duneVersion = "2"` ensures that Dune version 2 is used for the + build (this is the default; valid values are `"1"`, `"2"`, and `"3"`); + note that there is also a legacy `useDune2` boolean attribute: + set to `false` it corresponds to `duneVersion = "1"`; set to `true` it + corresponds to `duneVersion = "2"`. If both arguments (`duneVersion` and + `useDune2`) are given, the second one (`useDune2`) is silently ignored. - It sets the optional `doCheck` attribute such that tests will be run with `dune runtest -p angstrom` after the build (`dune build -p angstrom`) is @@ -67,7 +71,7 @@ Here is a simple package example. buildDunePackage rec { pname = "angstrom"; version = "0.15.0"; - useDune2 = true; + duneVersion = "2"; minimalOCamlVersion = "4.04"; @@ -117,3 +121,11 @@ buildDunePackage rec { }; } ``` + +Note about `minimalOCamlVersion`. A deprecated version of this argument was +spelled `minimumOCamlVersion`; setting the old attribute wrongly modifies the +derivation hash and is therefore inappropriate. As a technical dept, currently +packaged libraries may still use the old spelling: maintainers are invited to +fix this when updating packages. Massive renaming is strongly discouraged as it +would be challenging to review, difficult to test, and will cause unnecessary +rebuild. diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 9f9ace513c30..693ea016e0a5 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -979,6 +979,31 @@ with import {}; in python.withPackages(ps: [ps.blaze])).env ``` +#### Optional extra dependencies + +Some packages define optional dependencies for additional features. With +`setuptools` this is called `extras_require` and `flit` calls it `extras-require`. A +method for supporting this is by declaring the extras of a package in its +`passthru`, e.g. in case of the package `dask` + +```nix +passthru.extras-require = { + complete = [ distributed ]; +}; +``` + +and letting the package requiring the extra add the list to its dependencies + +```nix +propagatedBuildInputs = [ + ... +] ++ dask.extras-require.complete; +``` + +Note this method is preferred over adding parameters to builders, as that can +result in packages depending on different variants and thereby causing +collisions. + #### `buildPythonApplication` function {#buildpythonapplication-function} The `buildPythonApplication` function is practically the same as diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 56faf636df10..e19783e29e6a 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -464,6 +464,8 @@ you of the correct hash. be disabled by setting `dontUseCargoParallelTests`. * `cargoInstallHook`: install binaries and static/shared libraries that were built using `cargoBuildHook`. +* `bindgenHook`: for crates which use `bindgen` as a build dependency, lets + `bindgen` find `libclang` and `libclang` find the libraries in `buildInputs`. ### Examples {#examples} diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index 6b505cefcc95..060f5c647c29 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -6,7 +6,7 @@ Since release 15.09 there is a new TeX Live packaging that lives entirely under - For basic usage just pull `texlive.combined.scheme-basic` for an environment with basic LaTeX support. -- It typically won't work to use separately installed packages together. Instead, you can build a custom set of packages like this: +- It typically won't work to use separately installed packages together. Instead, you can build a custom set of packages like this. Most CTAN packages should be available: ```nix texlive.combine { diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 4ffd6736e238..563fdf45a861 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -18,7 +18,7 @@ Adding custom .vimrc lines can be done using the following code: ```nix vim_configurable.customize { - # `name` specifies the name of the executable and package + # `name` optionally specifies the name of the executable and package name = "vim-with-plugins"; vimrcConfig.customRC = '' @@ -28,6 +28,9 @@ vim_configurable.customize { ``` This configuration is used when Vim is invoked with the command specified as name, in this case `vim-with-plugins`. +You can also omit `name` to customize Vim itself. See the +[definition of `vimUtils.makeCustomizable`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-utils.nix#L408) +for all supported options. For Neovim the `configure` argument can be overridden to achieve the same: @@ -286,7 +289,7 @@ Sample output1: "reload" = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "reload"; src = fetchgit { - url = "git://github.com/xolox/vim-reload"; + url = "https://github.com/xolox/vim-reload"; rev = "0a601a668727f5b675cb1ddc19f6861f3f7ab9e1"; sha256 = "0vb832l9yxj919f5hfg6qj6bn9ni57gnjd3bj7zpq7d4iv2s4wdh"; }; @@ -309,9 +312,9 @@ Sample output2: ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs} -Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. +Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. -Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: +Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: ```nix deoplete-fish = super.deoplete-fish.overrideAttrs(old: { @@ -330,13 +333,13 @@ Finally, there are some plugins that are also packaged in nodePackages because t Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token). ```sh -GITHUB_API_TOKEN=my_token ./pkgs/misc/vim-plugins/update.py +GITHUB_API_TOKEN=my_token ./pkgs/applications/editors/vim/plugins/update.py ``` Alternatively, set the number of processes to a lower count to avoid rate-limiting. ```sh -./pkgs/misc/vim-plugins/update.py --proc 1 +./pkgs/applications/editors/vim/plugins/update.py --proc 1 ``` ## Important repositories {#important-repositories} diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index ac518cee524c..d3e1dd5b27d8 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -192,10 +192,6 @@ meta.hydraPlatforms = []; If set to `true`, the package is marked as "broken", meaning that it won’t show up in `nix-env -qa`, and cannot be built or installed. Such packages should be removed from Nixpkgs eventually unless they are fixed. -### `updateWalker` {#var-meta-updateWalker} - -If set to `true`, the package is tested to be updated correctly by the `update-walker.sh` script without additional settings. Such packages have `meta.version` set and their homepage (or the page specified by `meta.downloadPage`) contains a direct link to the package tarball. - ## Licenses {#sec-meta-license} The `meta.license` attribute should preferably contain a value from `lib.licenses` defined in [`nixpkgs/lib/licenses.nix`](https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix), or in-place license description of the same format if the license is unlikely to be useful in another expression. diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 6d72bd0deb4f..1d4ca99e3cbe 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -319,10 +319,16 @@ For information about how to run the updates, execute `nix-shell maintainers/scr ## Phases {#sec-stdenv-phases} -The generic builder has a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Furthermore, it allows a nicer presentation of build logs in the Nix build farm. +`stdenv.mkDerivation` sets the Nix [derivation](https://nixos.org/manual/nix/stable/expressions/derivations.html#derivations)'s builder to a script that loads the stdenv `setup.sh` bash library and calls `genericBuild`. Most packaging functions rely on this default builder. + +This generic command invokes a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Each phase can be overridden in its entirety either by setting the environment variable `namePhase` to a string containing some shell commands to be executed, or by redefining the shell function `namePhase`. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to *add* some commands to a phase, e.g. by defining `postInstall` or `preFixup`, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file `pkgs/stdenv/generic/setup.sh`. +When overriding a phase, for example `installPhase`, it is important to start with `runHook preInstall` and end it with `runHook postInstall`, otherwise `preInstall` and `postInstall` will not be run. Even if you don't use them directly, it is good practice to do so anyways for downstream users who would want to add a `postInstall` by overriding your derivation. + +While inside an interactive `nix-shell`, if you wanted to run all phases in the order they would be run in an actual build, you can invoke `genericBuild` yourself. + ### Controlling phases {#ssec-controlling-phases} There are a number of variables that control what phases are executed and in what order: @@ -333,7 +339,8 @@ There are a number of variables that control what phases are executed and in wha Specifies the phases. You can change the order in which phases are executed, or add new phases, by setting this variable. If it’s not set, the default value is used, which is `$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase fixupPhase installCheckPhase $preDistPhases distPhase $postPhases`. -Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as `preInstallPhases`), as you then don’t specify all the normal phases. +It is discouraged to set this variable, as it is easy to miss some important functionality hidden in some of the less obviously needed phases (like `fixupPhase` which patches the shebang of scripts). +Usually, if you just want to add a few phases, it’s more convenient to set one of the variables below (such as `preInstallPhases`). ##### `prePhases` {#var-stdenv-prePhases} @@ -790,7 +797,7 @@ Hook executed at the start of the distribution phase. Hook executed at the end of the distribution phase. -## Shell functions {#ssec-stdenv-functions} +## Shell functions and utilities {#ssec-stdenv-functions} The standard environment provides a number of useful functions. @@ -814,6 +821,19 @@ There’s many more kinds of arguments, they are documented in `nixpkgs/pkgs/bui Using the `makeBinaryWrapper` implementation is usually preferred, as it creates a tiny _compiled_ wrapper executable, that can be used as a shebang interpreter. This is needed mostly on Darwin, where shebangs cannot point to scripts, [due to a limitation with the `execve`-syscall](https://stackoverflow.com/questions/67100831/macos-shebang-with-absolute-path-not-working). Compiled wrappers generated by `makeBinaryWrapper` can be inspected with `less ` - by scrolling past the binary data you should be able to see the shell command that generated the executable and there see the environment variables that were injected into the wrapper. +### `remove-references-to -t` \ [ `-t` \ ... ] \ ... {#fun-remove-references-to} + +Removes the references of the specified files to the specified store files. This is done without changing the size of the file by replacing the hash by `eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee`, and should work on compiled executables. This is meant to be used to remove the dependency of the output on inputs that are known to be unnecessary at runtime. Of course, reckless usage will break the patched programs. +To use this, add `removeReferencesTo` to `nativeBuildInputs`. + +As `remove-references-to` is an actual executable and not a shell function, it can be used with `find`. +Example removing all references to the compiler in the output: +```nix +postInstall = '' + find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + +''; +``` + ### `substitute` \ \ \ {#fun-substitute} Performs string substitution on the contents of \, writing the result to \. The substitutions in \ are of the following form: diff --git a/doc/using/overlays.chapter.md b/doc/using/overlays.chapter.md index df152bc14e7b..a51aa9ee8fc5 100644 --- a/doc/using/overlays.chapter.md +++ b/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) +- [LAPACK reference](http://www.netlib.org/lapack/) (also provides BLAS and CBLAS) The Nixpkgs attribute is `lapack-reference`. @@ -117,7 +117,23 @@ $ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH n Intel MKL requires an `openmp` implementation when running with multiple processors. By default, `mkl` will use Intel's `iomp` implementation if no other is specified, but this is a runtime-only dependency and binary compatible with the LLVM implementation. To use that one instead, Intel recommends users set it with `LD_PRELOAD`. Note that `mkl` is only available on `x86_64-linux` and `x86_64-darwin`. Moreover, Hydra is not building and distributing pre-compiled binaries using it. -For BLAS/LAPACK switching to work correctly, all packages must depend on `blas` or `lapack`. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, `LP64` (integer size = 32 bits) and `ILP64` (integer size = 64 bits). Some software needs special flags or patches to work with `ILP64`. You can check if `ILP64` is used in Nixpkgs with `blas.isILP64` and `lapack.isILP64`. Some software does NOT work with `ILP64`, and derivations need to specify an assertion to prevent this. You can prevent `ILP64` from being used with the following: +To override `blas` and `lapack` with its reference implementations (i.e. for development purposes), one can use the following overlay: + +```nix +self: super: + +{ + blas = super.blas.override { + blasProvider = self.lapack-reference; + }; + + lapack = super.lapack.override { + lapackProvider = self.lapack-reference; + }; +} +``` + +For BLAS/LAPACK switching to work correctly, all packages must depend on `blas` or `lapack`. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, `LP64` (integer size = 32 bits) and `ILP64` (integer size = 64 bits). The attributes `blas` and `lapack` are `LP64` by default. Their `ILP64` version are provided through the attributes `blas-ilp64` and `lapack-ilp64`. Some software needs special flags or patches to work with `ILP64`. You can check if `ILP64` is used in Nixpkgs with `blas.isILP64` and `lapack.isILP64`. Some software does NOT work with `ILP64`, and derivations need to specify an assertion to prevent this. You can prevent `ILP64` from being used with the following: ```nix { stdenv, blas, lapack, ... }: diff --git a/flake.nix b/flake.nix index 39553cde0ab5..c48d6c68e583 100644 --- a/flake.nix +++ b/flake.nix @@ -21,39 +21,13 @@ nixos = import ./nixos/lib { lib = final; }; - nixosSystem = { modules, ... } @ args: + nixosSystem = args: import ./nixos/lib/eval-config.nix (args // { - modules = - let - moduleDeclarationFile = - let - # Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't - # mean that the evaluator always keeps track of its position. If there - # are too many levels of indirection, the position gets lost at some point. - intermediatePos = builtins.unsafeGetAttrPos "modules" args; - in - if intermediatePos == null then null else intermediatePos.file; - - # Add the invoking file as error message location for modules - # that don't have their own locations; presumably inline modules. - addModuleDeclarationFile = - m: if moduleDeclarationFile == null then m else { - _file = moduleDeclarationFile; - imports = [ m ]; - }; - - in - map addModuleDeclarationFile modules ++ [ - { - system.nixos.versionSuffix = - ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; - system.nixos.revision = final.mkIf (self ? rev) self.rev; - - # NOTE: This assumes that `nixpkgs.config` is _not_ used when - # nixpkgs.pkgs is set OR _module.args.pkgs is set. - nixpkgs.config.path = self.outPath; - } - ]; + modules = args.modules ++ [ { + system.nixos.versionSuffix = + ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; + system.nixos.revision = final.mkIf (self ? rev) self.rev; + } ]; }); }); @@ -66,7 +40,7 @@ }).nixos.manual.x86_64-linux; }; - legacyPackages = forAllSystems (system: import ./. { inherit system; config.path = self.outPath; }); + legacyPackages = forAllSystems (system: import ./. { inherit system; }); nixosModules = { notDetected = import ./nixos/modules/installer/scan/not-detected.nix; diff --git a/lib/attrsets.nix b/lib/attrsets.nix index dafdd98f498e..516fdd8d33fd 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -4,8 +4,8 @@ let inherit (builtins) head tail length; inherit (lib.trivial) id; - inherit (lib.strings) concatStringsSep sanitizeDerivationName; - inherit (lib.lists) foldr foldl' concatMap concatLists elemAt all; + inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName; + inherit (lib.lists) foldr foldl' concatMap concatLists elemAt all partition groupBy take foldl; in rec { @@ -78,6 +78,103 @@ rec { in attrByPath attrPath (abort errorMsg); + /* Update or set specific paths of an attribute set. + + Takes a list of updates to apply and an attribute set to apply them to, + and returns the attribute set with the updates applied. Updates are + represented as { path = ...; update = ...; } values, where `path` is a + list of strings representing the attribute path that should be updated, + and `update` is a function that takes the old value at that attribute path + as an argument and returns the new + value it should be. + + Properties: + - Updates to deeper attribute paths are applied before updates to more + shallow attribute paths + - Multiple updates to the same attribute path are applied in the order + they appear in the update list + - If any but the last `path` element leads into a value that is not an + attribute set, an error is thrown + - If there is an update for an attribute path that doesn't exist, + accessing the argument in the update function causes an error, but + intermediate attribute sets are implicitly created as needed + + Example: + updateManyAttrsByPath [ + { + path = [ "a" "b" ]; + update = old: { d = old.c; }; + } + { + path = [ "a" "b" "c" ]; + update = old: old + 1; + } + { + path = [ "x" "y" ]; + update = old: "xy"; + } + ] { a.b.c = 0; } + => { a = { b = { d = 1; }; }; x = { y = "xy"; }; } + */ + updateManyAttrsByPath = let + # When recursing into attributes, instead of updating the `path` of each + # update using `tail`, which needs to allocate an entirely new list, + # we just pass a prefix length to use and make sure to only look at the + # path without the prefix length, so that we can reuse the original list + # entries. + go = prefixLength: hasValue: value: updates: + let + # Splits updates into ones on this level (split.right) + # And ones on levels further down (split.wrong) + split = partition (el: length el.path == prefixLength) updates; + + # Groups updates on further down levels into the attributes they modify + nested = groupBy (el: elemAt el.path prefixLength) split.wrong; + + # Applies only nested modification to the input value + withNestedMods = + # Return the value directly if we don't have any nested modifications + if split.wrong == [] then + if hasValue then value + else + # Throw an error if there is no value. This `head` call here is + # safe, but only in this branch since `go` could only be called + # with `hasValue == false` for nested updates, in which case + # it's also always called with at least one update + let updatePath = (head split.right).path; in + throw + ( "updateManyAttrsByPath: Path '${showAttrPath updatePath}' does " + + "not exist in the given value, but the first update to this " + + "path tries to access the existing value.") + else + # If there are nested modifications, try to apply them to the value + if ! hasValue then + # But if we don't have a value, just use an empty attribute set + # as the value, but simplify the code a bit + mapAttrs (name: go (prefixLength + 1) false null) nested + else if isAttrs value then + # If we do have a value and it's an attribute set, override it + # with the nested modifications + value // + mapAttrs (name: go (prefixLength + 1) (value ? ${name}) value.${name}) nested + else + # However if it's not an attribute set, we can't apply the nested + # modifications, throw an error + let updatePath = (head split.wrong).path; in + throw + ( "updateManyAttrsByPath: Path '${showAttrPath updatePath}' needs to " + + "be updated, but path '${showAttrPath (take prefixLength updatePath)}' " + + "of the given value is not an attribute set, so we can't " + + "update an attribute inside of it."); + + # We get the final result by applying all the updates on this level + # after having applied all the nested updates + # We use foldl instead of foldl' so that in case of multiple updates, + # intermediate values aren't evaluated if not needed + in foldl (acc: el: el.update acc) withNestedMods split.right; + + in updates: value: go 0 true value updates; + /* Return the specified attributes from a set. Example: @@ -276,7 +373,7 @@ rec { /* Like `mapAttrsRecursive', but it takes an additional predicate - function that tells it whether to recursive into an attribute + function that tells it whether to recurse into an attribute set. If it returns false, `mapAttrsRecursiveCond' does not recurse, but does apply the map function. If it returns true, it does recurse, and does not apply the map function. @@ -327,7 +424,7 @@ rec { isDerivation "foobar" => false */ - isDerivation = x: isAttrs x && x ? type && x.type == "derivation"; + isDerivation = x: x.type or null == "derivation"; /* Converts a store path to a fake derivation. */ toDerivation = path: @@ -477,6 +574,20 @@ rec { overrideExisting = old: new: mapAttrs (name: value: new.${name} or value) old; + /* Turns a list of strings into a human-readable description of those + strings represented as an attribute path. The result of this function is + not intended to be machine-readable. + + Example: + showAttrPath [ "foo" "10" "bar" ] + => "foo.\"10\".bar" + showAttrPath [] + => "" + */ + showAttrPath = path: + if path == [] then "" + else concatMapStringsSep "." escapeNixIdentifier path; + /* Get a package output. If no output is found, fallback to `.out` and then to the default. diff --git a/lib/default.nix b/lib/default.nix index 268422538803..1f06283790a8 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -66,9 +66,10 @@ let stringLength sub substring tail trace; inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max - importJSON importTOML warn warnIf throwIfNot checkListOfEnum - info showWarnings nixpkgsVersion version - mod compare splitByAndCompare functionArgs setFunctionArgs isFunction + importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum + info showWarnings nixpkgsVersion version isInOldestRelease + mod compare splitByAndCompare + functionArgs setFunctionArgs isFunction toFunction toHexString toBaseDigits; inherit (self.fixedPoints) fix fix' converge extends composeExtensions composeManyExtensions makeExtensible makeExtensibleWithCustomName; @@ -78,9 +79,10 @@ let mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond genAttrs isDerivation toDerivation optionalAttrs zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil - recursiveUpdate matchAttrs overrideExisting getOutput getBin + recursiveUpdate matchAttrs overrideExisting showAttrPath getOutput getBin getLib getDev getMan chooseDevOutputs zipWithNames zip - recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets; + recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets + updateManyAttrsByPath; inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1 concatMap flatten remove findSingle findFirst any all count optional optionals toList range partition zipListsWith zipLists @@ -111,22 +113,23 @@ let cleanSource sourceByRegex sourceFilesBySuffices commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource pathIsRegularFile pathIsGitRepo; - inherit (self.modules) evalModules unifyModuleSyntax - applyIfFunction mergeModules + inherit (self.modules) evalModules setDefaultModuleLocation + unifyModuleSyntax applyModuleArgsIfFunction mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions pushDownProperties dischargeProperties filterOverrides sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride mkOptionDefault mkDefault mkImageMediaOverride mkForce mkVMOverride mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule - mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule + mkRenamedOptionModule mkRenamedOptionModuleWith + mkMergedOptionModule mkChangedOptionModule mkAliasOptionModule mkDerivedConfig doRename; inherit (self.options) isOption mkEnableOption mkSinkUndeclaredOptions mergeDefaultOption mergeOneOption mergeEqualOption mergeUniqueOption getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' scrubOptionValue literalExpression literalExample literalDocBook - showOption showFiles unknownModule mkOption; + showOption showFiles unknownModule mkOption mkPackageOption; inherit (self.types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; inherit (self.asserts) diff --git a/lib/licenses.nix b/lib/licenses.nix index 160b684330ef..2928d11d8b22 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -389,6 +389,11 @@ in mkLicense lset) ({ free = false; }; + generaluser = { + fullName = "GeneralUser GS License v2.0"; + url = "http://www.schristiancollins.com/generaluser.php"; # license included in sources + }; + gpl1Only = { spdxId = "GPL-1.0-only"; fullName = "GNU General Public License v1.0 only"; @@ -465,6 +470,11 @@ in mkLicense lset) ({ spdxId = "imagemagick"; }; + imlib2 = { + spdxId = "Imlib2"; + fullName = "Imlib2 License"; + }; + inria-compcert = { fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler"; url = "https://compcert.org/doc/LICENSE.txt"; @@ -591,6 +601,21 @@ in mkLicense lset) ({ spdxId = "MIT"; fullName = "MIT License"; }; + # https://spdx.org/licenses/MIT-feh.html + mit-feh = { + spdxId = "MIT-feh"; + fullName = "feh License"; + }; + + mitAdvertising = { + spdxId = "MIT-advertising"; + fullName = "Enlightenment License (e16)"; + }; + + mit0 = { + spdxId = "MIT-0"; + fullName = "MIT No Attribution"; + }; mpl10 = { spdxId = "MPL-1.0"; diff --git a/lib/lists.nix b/lib/lists.nix index 1dbff7668d75..a030280c8dcc 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -4,6 +4,7 @@ let inherit (lib.strings) toInt; inherit (lib.trivial) compare min; + inherit (lib.attrsets) mapAttrs; in rec { @@ -340,15 +341,15 @@ rec { groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ] => { true = 12; false = 3; } */ - groupBy' = op: nul: pred: lst: - foldl' (r: e: - let - key = pred e; - in - r // { ${key} = op (r.${key} or nul) e; } - ) {} lst; + groupBy' = op: nul: pred: lst: mapAttrs (name: foldl op nul) (groupBy pred lst); - groupBy = groupBy' (sum: e: sum ++ [e]) []; + groupBy = builtins.groupBy or ( + pred: foldl' (r: e: + let + key = pred e; + in + r // { ${key} = (r.${key} or []) ++ [e]; } + ) {}); /* Merges two lists of the same size together. If the sizes aren't the same the merging stops at the shortest. How both lists are merged is defined diff --git a/lib/modules.nix b/lib/modules.nix index c68bbfcaa3e0..894104cc5790 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -9,7 +9,7 @@ let catAttrs concatLists concatMap - count + concatStringsSep elem filter findFirst @@ -47,6 +47,20 @@ let showOption unknownModule ; + + showDeclPrefix = loc: decl: prefix: + " - option(s) with prefix `${showOption (loc ++ [prefix])}' in module `${decl._file}'"; + showRawDecls = loc: decls: + concatStringsSep "\n" + (sort (a: b: a < b) + (concatMap + (decl: map + (showDeclPrefix loc decl) + (attrNames decl.options) + ) + decls + )); + in rec { @@ -138,7 +152,7 @@ rec { # support for that, in turn it's lazy in its values. This means e.g. # a `_module.args.pkgs = import (fetchTarball { ... }) {}` won't # start a download when `pkgs` wasn't evaluated. - type = types.lazyAttrsOf types.unspecified; + type = types.lazyAttrsOf types.raw; internal = true; description = "Arguments passed to each module."; }; @@ -151,8 +165,7 @@ rec { }; _module.freeformType = mkOption { - # Disallow merging for now, but could be implemented nicely with a `types.optionType` - type = types.nullOr (types.uniq types.attrs); + type = types.nullOr types.optionType; internal = true; default = null; description = '' @@ -269,11 +282,11 @@ rec { # Like unifyModuleSyntax, but also imports paths and calls functions if necessary loadModule = args: fallbackFile: fallbackKey: m: if isFunction m || isAttrs m then - unifyModuleSyntax fallbackFile fallbackKey (applyIfFunction fallbackKey m args) + unifyModuleSyntax fallbackFile fallbackKey (applyModuleArgsIfFunction fallbackKey m args) else if isList m then let defs = [{ file = fallbackFile; value = m; }]; in throw "Module imports can't be nested lists. Perhaps you meant to remove one level of lists? Definitions: ${showDefs defs}" - else unifyModuleSyntax (toString m) (toString m) (applyIfFunction (toString m) (import m) args); + else unifyModuleSyntax (toString m) (toString m) (applyModuleArgsIfFunction (toString m) (import m) args); /* Collects all modules recursively into the form @@ -334,6 +347,10 @@ rec { in modulesPath: initialModules: args: filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args); + /* Wrap a module with a default location for reporting errors. */ + setDefaultModuleLocation = file: m: + { _file = file; imports = [ m ]; }; + /* Massage a module into canonical form, that is, a set consisting of ‘options’, ‘config’ and ‘imports’ attributes. */ unifyModuleSyntax = file: key: m: @@ -366,7 +383,7 @@ rec { config = addFreeformType (addMeta (removeAttrs m ["_file" "key" "disabledModules" "require" "imports" "freeformType"])); }; - applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then + applyModuleArgsIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then let # Module arguments are resolved in a strict manner when attribute set # deconstruction is used. As the arguments are now defined with the @@ -471,26 +488,61 @@ rec { [{ inherit (module) file; inherit value; }] ) configs; + # Convert an option tree decl to a submodule option decl + optionTreeToOption = decl: + if isOption decl.options + then decl + else decl // { + options = mkOption { + type = types.submoduleWith { + modules = [ { options = decl.options; } ]; + # `null` is not intended for use by modules. It is an internal + # value that means "whatever the user has declared elsewhere". + # This might become obsolete with https://github.com/NixOS/nixpkgs/issues/162398 + shorthandOnlyDefinesConfig = null; + }; + }; + }; + resultsByName = mapAttrs (name: decls: # We're descending into attribute ‘name’. let loc = prefix ++ [name]; defns = defnsByName.${name} or []; defns' = defnsByName'.${name} or []; - nrOptions = count (m: isOption m.options) decls; + optionDecls = filter (m: isOption m.options) decls; in - if nrOptions == length decls then + if length optionDecls == length decls then let opt = fixupOptionType loc (mergeOptionDecls loc decls); in { matchedOptions = evalOptionValue loc opt defns'; unmatchedDefns = []; } - else if nrOptions != 0 then - let - firstOption = findFirst (m: isOption m.options) "" decls; - firstNonOption = findFirst (m: !isOption m.options) "" decls; - in - throw "The option `${showOption loc}' in `${firstOption._file}' is a prefix of options in `${firstNonOption._file}'." + else if optionDecls != [] then + if all (x: x.options.type.name == "submodule") optionDecls + # Raw options can only be merged into submodules. Merging into + # attrsets might be nice, but ambiguous. Suppose we have + # attrset as a `attrsOf submodule`. User declares option + # attrset.foo.bar, this could mean: + # a. option `bar` is only available in `attrset.foo` + # b. option `foo.bar` is available in all `attrset.*` + # c. reject and require "" as a reminder that it behaves like (b). + # d. magically combine (a) and (c). + # All of the above are merely syntax sugar though. + then + let opt = fixupOptionType loc (mergeOptionDecls loc (map optionTreeToOption decls)); + in { + matchedOptions = evalOptionValue loc opt defns'; + unmatchedDefns = []; + } + else + let + firstNonOption = findFirst (m: !isOption m.options) "" decls; + nonOptions = filter (m: !isOption m.options) decls; + in + throw "The option `${showOption loc}' in module `${(lib.head optionDecls)._file}' would be a parent of the following options, but its type `${(lib.head optionDecls).options.type.description or ""}' does not support nested options.\n${ + showRawDecls loc nonOptions + }" else mergeModules' loc decls defns) declsByName; @@ -534,11 +586,9 @@ rec { correspond to the definition of 'loc' in 'opt.file'. */ mergeOptionDecls = let - packSubmodule = file: m: - { _file = file; imports = [ m ]; }; coerceOption = file: opt: - if isFunction opt then packSubmodule file opt - else packSubmodule file { options = opt; }; + if isFunction opt then setDefaultModuleLocation file opt + else setDefaultModuleLocation file { options = opt; }; in loc: opts: foldl' (res: opt: let t = res.type; @@ -559,17 +609,9 @@ rec { throw "The option `${showOption loc}' in `${opt._file}' is already declared in ${showFiles res.declarations}." else let - /* Add the modules of the current option to the list of modules - already collected. The options attribute except either a list of - submodules or a submodule. For each submodule, we add the file of the - current option declaration as the file use for the submodule. If the - submodule defines any filename, then we ignore the enclosing option file. */ - options' = toList opt.options.options; - getSubModules = opt.options.type.getSubModules or null; submodules = - if getSubModules != null then map (packSubmodule opt._file) getSubModules ++ res.options - else if opt.options ? options then map (coerceOption opt._file) options' ++ res.options + if getSubModules != null then map (setDefaultModuleLocation opt._file) getSubModules ++ res.options else res.options; in opt.options // res // { declarations = res.declarations ++ [opt._file]; @@ -752,26 +794,13 @@ rec { compare = a: b: (a.priority or 1000) < (b.priority or 1000); in sort compare defs'; - /* Hack for backward compatibility: convert options of type - optionSet to options of type submodule. FIXME: remove - eventually. */ + # This calls substSubModules, whose entire purpose is only to ensure that + # option declarations in submodules have accurate position information. + # TODO: Merge this into mergeOptionDecls fixupOptionType = loc: opt: - let - options = opt.options or - (throw "Option `${showOption loc}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}."); - f = tp: - let optionSetIn = type: (tp.name == type) && (tp.functor.wrapped.name == "optionSet"); - in - if tp.name == "option set" || tp.name == "submodule" then - throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}." - else if optionSetIn "attrsOf" then types.attrsOf (types.submodule options) - else if optionSetIn "listOf" then types.listOf (types.submodule options) - else if optionSetIn "nullOr" then types.nullOr (types.submodule options) - else tp; - in - if opt.type.getSubModules or null == null - then opt // { type = f (opt.type or types.unspecified); } - else opt // { type = opt.type.substSubModules opt.options; options = []; }; + if opt.type.getSubModules or null == null + then opt // { type = opt.type or types.unspecified; } + else opt // { type = opt.type.substSubModules opt.options; options = []; }; /* Properties. */ @@ -903,6 +932,26 @@ rec { use = builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'."; }; + mkRenamedOptionModuleWith = { + /* Old option path as list of strings. */ + from, + /* New option path as list of strings. */ + to, + + /* + Release number of the first release that contains the rename, ignoring backports. + Set it to the upcoming release, matching the nixpkgs/.version file. + */ + sinceRelease, + + }: doRename { + inherit from to; + visible = false; + warn = lib.isInOldestRelease sinceRelease; + use = lib.warnIf (lib.isInOldestRelease sinceRelease) + "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'."; + }; + /* Return a module that causes a warning to be shown if any of the "from" option is defined; the defined values can be used in the "mergeFn" to set the "to" value. diff --git a/lib/options.nix b/lib/options.nix index 627aac24d2fb..8d0801775c46 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -79,8 +79,6 @@ rec { visible ? null, # Whether the option can be set only once readOnly ? null, - # Deprecated, used by types.optionSet. - options ? null } @ attrs: attrs // { _type = "option"; }; @@ -231,7 +229,7 @@ rec { then true else opt.visible or true; readOnly = opt.readOnly or false; - type = opt.type.description or null; + type = opt.type.description or "unspecified"; } // optionalAttrs (opt ? example) { example = scrubOptionValue opt.example; } // optionalAttrs (opt ? default) { default = scrubOptionValue opt.default; } diff --git a/lib/sources.nix b/lib/sources.nix index ae2df7235213..343449d9a603 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -20,17 +20,26 @@ let readFile ; - # Returns the type of a path: regular (for file), symlink, or directory - pathType = p: getAttr (baseNameOf p) (readDir (dirOf p)); + /* + Returns the type of a path: regular (for file), symlink, or directory. + */ + pathType = path: getAttr (baseNameOf path) (readDir (dirOf path)); - # Returns true if the path exists and is a directory, false otherwise - pathIsDirectory = p: if pathExists p then (pathType p) == "directory" else false; + /* + Returns true if the path exists and is a directory, false otherwise. + */ + pathIsDirectory = path: if pathExists path then (pathType path) == "directory" else false; - # Returns true if the path exists and is a regular file, false otherwise - pathIsRegularFile = p: if pathExists p then (pathType p) == "regular" else false; + /* + Returns true if the path exists and is a regular file, false otherwise. + */ + pathIsRegularFile = path: if pathExists path then (pathType path) == "regular" else false; - # Bring in a path as a source, filtering out all Subversion and CVS - # directories, as well as backup files (*~). + /* + A basic filter for `cleanSourceWith` that removes + directories of version control system, backup files (*~) + and some generated files. + */ cleanSourceFilter = name: type: let baseName = baseNameOf (toString name); in ! ( # Filter out version control software files/directories (baseName == ".git" || type == "directory" && (baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) || @@ -48,43 +57,48 @@ let (type == "unknown") ); - # Filters a source tree removing version control files and directories using cleanSourceWith - # - # Example: - # cleanSource ./. + /* + Filters a source tree removing version control files and directories using cleanSourceFilter. + + Example: + cleanSource ./. + */ cleanSource = src: cleanSourceWith { filter = cleanSourceFilter; inherit src; }; - # Like `builtins.filterSource`, except it will compose with itself, - # allowing you to chain multiple calls together without any - # intermediate copies being put in the nix store. - # - # lib.cleanSourceWith { - # filter = f; - # src = lib.cleanSourceWith { - # filter = g; - # src = ./.; - # }; - # } - # # Succeeds! - # - # builtins.filterSource f (builtins.filterSource g ./.) - # # Fails! - # - # Parameters: - # - # src: A path or cleanSourceWith result to filter and/or rename. - # - # filter: A function (path -> type -> bool) - # Optional with default value: constant true (include everything) - # The function will be combined with the && operator such - # that src.filter is called lazily. - # For implementing a filter, see - # https://nixos.org/nix/manual/#builtin-filterSource - # - # name: Optional name to use as part of the store path. - # This defaults to `src.name` or otherwise `"source"`. - # - cleanSourceWith = { filter ? _path: _type: true, src, name ? null }: + /* + Like `builtins.filterSource`, except it will compose with itself, + allowing you to chain multiple calls together without any + intermediate copies being put in the nix store. + + Example: + lib.cleanSourceWith { + filter = f; + src = lib.cleanSourceWith { + filter = g; + src = ./.; + }; + } + # Succeeds! + + builtins.filterSource f (builtins.filterSource g ./.) + # Fails! + + */ + cleanSourceWith = + { + # A path or cleanSourceWith result to filter and/or rename. + src, + # Optional with default value: constant true (include everything) + # The function will be combined with the && operator such + # that src.filter is called lazily. + # For implementing a filter, see + # https://nixos.org/nix/manual/#builtin-filterSource + # Type: A function (path -> type -> bool) + filter ? _path: _type: true, + # Optional name to use as part of the store path. + # This defaults to `src.name` or otherwise `"source"`. + name ? null + }: let orig = toSourceAttributes src; in fromSourceAttributes { @@ -116,9 +130,11 @@ let satisfiesSubpathInvariant = src ? satisfiesSubpathInvariant && src.satisfiesSubpathInvariant; }; - # Filter sources by a list of regular expressions. - # - # E.g. `src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]` + /* + Filter sources by a list of regular expressions. + + Example: src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"] + */ sourceByRegex = src: regexes: let isFiltered = src ? _isLibCleanSourceWith; @@ -153,8 +169,11 @@ let pathIsGitRepo = path: (tryEval (commitIdFromGitRepo path)).success; - # Get the commit id of a git repo - # Example: commitIdFromGitRepo + /* + Get the commit id of a git repo. + + Example: commitIdFromGitRepo + */ commitIdFromGitRepo = let readCommitFromFile = file: path: let fileName = toString path + "/" + file; diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 529eeb6514b9..7ddd5b8a5812 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -105,7 +105,8 @@ rec { else if final.isAarch64 then "arm64" else if final.isx86_32 then "i386" else if final.isx86_64 then "x86_64" - else if final.isMips then "mips" + else if final.isMips32 then "mips" + else if final.isMips64 then "mips" # linux kernel does not distinguish mips32/mips64 else if final.isPower then "powerpc" else if final.isRiscV then "riscv" else if final.isS390 then "s390" diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 00e57339a310..27cdaf6a7233 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -26,7 +26,7 @@ let # Linux "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" - "armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux" + "armv7l-linux" "i686-linux" "m68k-linux" "mipsel-linux" "mips64el-linux" "powerpc64-linux" "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "s390-linux" "s390x-linux" "x86_64-linux" @@ -87,7 +87,11 @@ in { darwin = filterDoubles predicates.isDarwin; freebsd = filterDoubles predicates.isFreeBSD; # Should be better, but MinGW is unclear. - gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }); + gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) + ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) + ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }) + ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnuabin32; }) + ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnuabi64; }); illumos = filterDoubles predicates.isSunOS; linux = filterDoubles predicates.isLinux; netbsd = filterDoubles predicates.isNetBSD; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 9c0c91617e8a..997a7a8c273a 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -93,6 +93,26 @@ rec { config = "mipsel-unknown-linux-gnu"; } // platforms.fuloong2f_n32; + # MIPS ABI table transcribed from here: https://wiki.debian.org/Multiarch/Tuples + + # can execute on 32bit chip + mips-linux-gnu = { config = "mips-linux-gnu"; } // platforms.gcc_mips32r2_o32; + mipsel-linux-gnu = { config = "mipsel-linux-gnu"; } // platforms.gcc_mips32r2_o32; + mipsisa32r6-linux-gnu = { config = "mipsisa32r6-linux-gnu"; } // platforms.gcc_mips32r6_o32; + mipsisa32r6el-linux-gnu = { config = "mipsisa32r6el-linux-gnu"; } // platforms.gcc_mips32r6_o32; + + # require 64bit chip (for more registers, 64-bit floating point, 64-bit "long long") but use 32bit pointers + mips64-linux-gnuabin32 = { config = "mips64-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32; + mips64el-linux-gnuabin32 = { config = "mips64el-linux-gnuabin32"; } // platforms.gcc_mips64r2_n32; + mipsisa64r6-linux-gnuabin32 = { config = "mipsisa64r6-linux-gnuabin32"; } // platforms.gcc_mips64r6_n32; + mipsisa64r6el-linux-gnuabin32 = { config = "mipsisa64r6el-linux-gnuabin32"; } // platforms.gcc_mips64r6_n32; + + # 64bit pointers + mips64-linux-gnuabi64 = { config = "mips64-linux-gnuabi64"; } // platforms.gcc_mips64r2_64; + mips64el-linux-gnuabi64 = { config = "mips64el-linux-gnuabi64"; } // platforms.gcc_mips64r2_64; + mipsisa64r6-linux-gnuabi64 = { config = "mipsisa64r6-linux-gnuabi64"; } // platforms.gcc_mips64r6_64; + mipsisa64r6el-linux-gnuabi64 = { config = "mipsisa64r6el-linux-gnuabi64"; } // platforms.gcc_mips64r6_64; + muslpi = raspberryPi // { config = "armv6l-unknown-linux-musleabihf"; }; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 718954e0839a..89cac575c67d 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -17,6 +17,10 @@ rec { isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; isMips = { cpu = { family = "mips"; }; }; + isMips32 = { cpu = { family = "mips"; bits = 32; }; }; + isMips64 = { cpu = { family = "mips"; bits = 64; }; }; + isMips64n32 = { cpu = { family = "mips"; bits = 64; }; abi = { abi = "n32"; }; }; + isMips64n64 = { cpu = { family = "mips"; bits = 64; }; abi = { abi = "64"; }; }; isMmix = { cpu = { family = "mmix"; }; }; isRiscV = { cpu = { family = "riscv"; }; }; isSparc = { cpu = { family = "sparc"; }; }; @@ -57,7 +61,7 @@ rec { isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ]; isGnu = with abis; map (a: { abi = a; }) [ gnuabi64 gnu gnueabi gnueabihf ]; - isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; + isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf muslabin32 muslabi64 ]; isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; isEfi = map (family: { cpu.family = family; }) diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 8a88d8cfbe87..3ceddbb599b9 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -359,13 +359,20 @@ rec { ]; }; gnuabi64 = { abi = "64"; }; + muslabi64 = { abi = "64"; }; + + # NOTE: abi=n32 requires a 64-bit MIPS chip! That is not a typo. + # It is basically the 64-bit abi with 32-bit pointers. Details: + # https://www.linux-mips.org/pub/linux/mips/doc/ABI/MIPS-N32-ABI-Handbook.pdf + gnuabin32 = { abi = "n32"; }; + muslabin32 = { abi = "n32"; }; musleabi = { float = "soft"; }; musleabihf = { float = "hard"; }; musl = {}; - uclibceabihf = { float = "soft"; }; - uclibceabi = { float = "hard"; }; + uclibceabi = { float = "soft"; }; + uclibceabihf = { float = "hard"; }; uclibc = {}; unknown = {}; diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index b2a8dbedef4f..04d55416242e 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -1,3 +1,10 @@ +# Note: lib/systems/default.nix takes care of producing valid, +# fully-formed "platform" values (e.g. hostPlatform, buildPlatform, +# targetPlatform, etc) containing at least the minimal set of attrs +# required (see types.parsedPlatform in lib/systems/parse.nix). This +# file takes an already-valid platform and further elaborates it with +# optional fields such as linux-kernel, gcc, etc. + { lib }: rec { pc = { @@ -482,6 +489,43 @@ rec { }; }; + # can execute on 32bit chip + gcc_mips32r2_o32 = { gcc = { arch = "mips32r2"; abi = "o32"; }; }; + gcc_mips32r6_o32 = { gcc = { arch = "mips32r6"; abi = "o32"; }; }; + gcc_mips64r2_n32 = { gcc = { arch = "mips64r2"; abi = "n32"; }; }; + gcc_mips64r6_n32 = { gcc = { arch = "mips64r6"; abi = "n32"; }; }; + gcc_mips64r2_64 = { gcc = { arch = "mips64r2"; abi = "64"; }; }; + gcc_mips64r6_64 = { gcc = { arch = "mips64r6"; abi = "64"; }; }; + + # based on: + # https://www.mail-archive.com/qemu-discuss@nongnu.org/msg05179.html + # https://gmplib.org/~tege/qemu.html#mips64-debian + mips64el-qemu-linux-gnuabi64 = (import ./examples).mips64el-linux-gnuabi64 // { + linux-kernel = { + name = "mips64el"; + baseConfig = "64r2el_defconfig"; + target = "vmlinuz"; + autoModules = false; + DTB = true; + # for qemu 9p passthrough filesystem + extraConfig = '' + MIPS_MALTA y + PAGE_SIZE_4KB y + CPU_LITTLE_ENDIAN y + CPU_MIPS64_R2 y + 64BIT y + CPU_MIPS64_R2 y + + NET_9P y + NET_9P_VIRTIO y + 9P_FS y + 9P_FS_POSIX_ACL y + PCI y + VIRTIO_PCI y + ''; + }; + }; + ## ## Other ## @@ -499,6 +543,9 @@ rec { }; }; + # This function takes a minimally-valid "platform" and returns an + # attrset containing zero or more additional attrs which should be + # included in the platform in order to further elaborate it. select = platform: # x86 /**/ if platform.isx86 then pc diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 5fa95828df69..271119031395 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -761,4 +761,156 @@ runTests { { a = 3; b = 30; c = 300; } ]; }; + + # The example from the showAttrPath documentation + testShowAttrPathExample = { + expr = showAttrPath [ "foo" "10" "bar" ]; + expected = "foo.\"10\".bar"; + }; + + testShowAttrPathEmpty = { + expr = showAttrPath []; + expected = ""; + }; + + testShowAttrPathVarious = { + expr = showAttrPath [ + "." + "foo" + "2" + "a2-b" + "_bc'de" + ]; + expected = ''".".foo."2".a2-b._bc'de''; + }; + + testGroupBy = { + expr = groupBy (n: toString (mod n 5)) (range 0 16); + expected = { + "0" = [ 0 5 10 15 ]; + "1" = [ 1 6 11 16 ]; + "2" = [ 2 7 12 ]; + "3" = [ 3 8 13 ]; + "4" = [ 4 9 14 ]; + }; + }; + + testGroupBy' = { + expr = groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ]; + expected = { false = 3; true = 12; }; + }; + + # The example from the updateManyAttrsByPath documentation + testUpdateManyAttrsByPathExample = { + expr = updateManyAttrsByPath [ + { + path = [ "a" "b" ]; + update = old: { d = old.c; }; + } + { + path = [ "a" "b" "c" ]; + update = old: old + 1; + } + { + path = [ "x" "y" ]; + update = old: "xy"; + } + ] { a.b.c = 0; }; + expected = { a = { b = { d = 1; }; }; x = { y = "xy"; }; }; + }; + + # If there are no updates, the value is passed through + testUpdateManyAttrsByPathNone = { + expr = updateManyAttrsByPath [] "something"; + expected = "something"; + }; + + # A single update to the root path is just like applying the function directly + testUpdateManyAttrsByPathSingleIncrement = { + expr = updateManyAttrsByPath [ + { + path = [ ]; + update = old: old + 1; + } + ] 0; + expected = 1; + }; + + # Multiple updates can be applied are done in order + testUpdateManyAttrsByPathMultipleIncrements = { + expr = updateManyAttrsByPath [ + { + path = [ ]; + update = old: old + "a"; + } + { + path = [ ]; + update = old: old + "b"; + } + { + path = [ ]; + update = old: old + "c"; + } + ] ""; + expected = "abc"; + }; + + # If an update doesn't use the value, all previous updates are not evaluated + testUpdateManyAttrsByPathLazy = { + expr = updateManyAttrsByPath [ + { + path = [ ]; + update = old: old + throw "nope"; + } + { + path = [ ]; + update = old: "untainted"; + } + ] (throw "start"); + expected = "untainted"; + }; + + # Deeply nested attributes can be updated without affecting others + testUpdateManyAttrsByPathDeep = { + expr = updateManyAttrsByPath [ + { + path = [ "a" "b" "c" ]; + update = old: old + 1; + } + ] { + a.b.c = 0; + + a.b.z = 0; + a.y.z = 0; + x.y.z = 0; + }; + expected = { + a.b.c = 1; + + a.b.z = 0; + a.y.z = 0; + x.y.z = 0; + }; + }; + + # Nested attributes are updated first + testUpdateManyAttrsByPathNestedBeforehand = { + expr = updateManyAttrsByPath [ + { + path = [ "a" ]; + update = old: old // { x = old.b; }; + } + { + path = [ "a" "b" ]; + update = old: old + 1; + } + ] { + a.b = 0; + }; + expected = { + a.b = 1; + a.x = 1; + }; + }; + } diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 590937da5b8f..8050c6539fc2 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -62,6 +62,13 @@ checkConfigError() { checkConfigOutput '^false$' config.enable ./declare-enable.nix checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix +checkConfigOutput '^1$' config.bare-submodule.nested ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix +checkConfigOutput '^2$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix +checkConfigOutput '^42$' config.bare-submodule.nested ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix ./declare-bare-submodule-deep-option.nix ./define-bare-submodule-values.nix +checkConfigOutput '^420$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-nested-option.nix ./declare-bare-submodule-deep-option.nix ./define-bare-submodule-values.nix +checkConfigOutput '^2$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix ./define-shorthandOnlyDefinesConfig-true.nix +checkConfigError 'The option .bare-submodule.deep. in .*/declare-bare-submodule-deep-option.nix. is already declared in .*/declare-bare-submodule-deep-option-duplicate.nix' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix ./declare-bare-submodule-deep-option-duplicate.nix + # Check integer types. # unsigned checkConfigOutput '^42$' config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix @@ -240,6 +247,11 @@ checkConfigOutput '^"24"$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep- checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix checkConfigOutput '^"24"$' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix +# submodules in freeformTypes should have their locations annotated +checkConfigOutput '/freeform-submodules.nix"$' config.fooDeclarations.0 ./freeform-submodules.nix +# freeformTypes can get merged using `types.type`, including submodules +checkConfigOutput '^10$' config.free.xxx.foo ./freeform-submodules.nix +checkConfigOutput '^10$' config.free.yyy.bar ./freeform-submodules.nix ## types.anything # Check that attribute sets are merged recursively @@ -284,6 +296,37 @@ checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-var checkConfigOutput '^"a y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix checkConfigOutput '^"a b c"$' config.resultFooFoo ./declare-variants.nix ./define-variant.nix +## emptyValue's +checkConfigOutput "[ ]" config.list.a ./emptyValues.nix +checkConfigOutput "{ }" config.attrs.a ./emptyValues.nix +checkConfigOutput "null" config.null.a ./emptyValues.nix +checkConfigOutput "{ }" config.submodule.a ./emptyValues.nix +# These types don't have empty values +checkConfigError 'The option .int.a. is used but not defined' config.int.a ./emptyValues.nix +checkConfigError 'The option .nonEmptyList.a. is used but not defined' config.nonEmptyList.a ./emptyValues.nix + +## types.raw +checkConfigOutput "{ foo = ; }" config.unprocessedNesting ./raw.nix +checkConfigOutput "10" config.processedToplevel ./raw.nix +checkConfigError "The option .multiple. is defined multiple times" config.multiple ./raw.nix +checkConfigOutput "bar" config.priorities ./raw.nix + +## Option collision +checkConfigError \ + 'The option .set. in module .*/declare-set.nix. would be a parent of the following options, but its type .attribute set of signed integers. does not support nested options.\n\s*- option[(]s[)] with prefix .set.enable. in module .*/declare-enable-nested.nix.' \ + config.set \ + ./declare-set.nix ./declare-enable-nested.nix + +# Test that types.optionType merges types correctly +checkConfigOutput '^10$' config.theOption.int ./optionTypeMerging.nix +checkConfigOutput '^"hello"$' config.theOption.str ./optionTypeMerging.nix + +# Test that types.optionType correctly annotates option locations +checkConfigError 'The option .theOption.nested. in .other.nix. is already declared in .optionTypeFile.nix.' config.theOption.nested ./optionTypeFile.nix + +# Test that types.optionType leaves types untouched as long as they don't need to be merged +checkConfigOutput 'ok' config.freeformItems.foo.bar ./adhoc-freeformType-survives-type-merge.nix + cat < string -> a -> a */ - warnIf = cond: msg: if cond then warn msg else id; + warnIf = cond: msg: if cond then warn msg else x: x; + + /* + Like warnIf, but negated (warn if the first argument is `false`). + + Type: bool -> string -> a -> a + */ + warnIfNot = cond: msg: if cond then x: x else warn msg; /* Like the `assert b; e` expression, but with a custom error message and @@ -347,6 +378,13 @@ rec { */ throwIfNot = cond: msg: if cond then x: x else throw msg; + /* + Like throwIfNot, but negated (throw if the first argument is `true`). + + Type: bool -> string -> a -> a + */ + throwIf = cond: msg: if cond then throw msg else x: x; + /* Check if the elements in a list are valid values from a enum, returning the identity function, or throwing an error message otherwise. Example: @@ -403,6 +441,25 @@ rec { isFunction = f: builtins.isFunction f || (f ? __functor && isFunction (f.__functor f)); + /* + Turns any non-callable values into constant functions. + Returns callable values as is. + + Example: + + nix-repl> lib.toFunction 1 2 + 1 + + nix-repl> lib.toFunction (x: x + 1) 2 + 3 + */ + toFunction = + # Any value + v: + if isFunction v + then v + else k: v; + /* Convert the given positive integer to a string of its hexadecimal representation. For example: diff --git a/lib/types.nix b/lib/types.nix index f2f9b2bca985..5c4b96310617 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -61,7 +61,11 @@ let boolToString ; - inherit (lib.modules) mergeDefinitions; + inherit (lib.modules) + mergeDefinitions + fixupOptionType + mergeOptionDecls + ; outer_types = rec { isType = type: x: (x._type or "") == type; @@ -162,6 +166,13 @@ rec { # nixos/doc/manual/development/option-types.xml! types = rec { + raw = mkOptionType rec { + name = "raw"; + description = "raw value"; + check = value: true; + merge = mergeOneOption; + }; + anything = mkOptionType { name = "anything"; description = "anything"; @@ -357,13 +368,21 @@ rec { emptyValue = { value = {}; }; }; - # derivation is a reserved keyword. + # A package is a top-level store path (/nix/store/hash-name). This includes: + # - derivations + # - more generally, attribute sets with an `outPath` or `__toString` attribute + # pointing to a store path, e.g. flake inputs + # - strings with context, e.g. "${pkgs.foo}" or (toString pkgs.foo) + # - hardcoded store path literals (/nix/store/hash-foo) or strings without context + # ("/nix/store/hash-foo"). These get a context added to them using builtins.storePath. package = mkOptionType { name = "package"; check = x: isDerivation x || isStorePath x; merge = loc: defs: let res = mergeOneOption loc defs; - in if isDerivation res then res else toDerivation res; + in if builtins.isPath res || (builtins.isString res && ! builtins.hasContext res) + then toDerivation res + else res; }; shellPackage = package // { @@ -390,7 +409,7 @@ rec { ).optionalValue ) def.value ) defs))); - emptyValue = { value = {}; }; + emptyValue = { value = []; }; getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]); getSubModules = elemType.getSubModules; substSubModules = m: listOf (elemType.substSubModules m); @@ -402,7 +421,7 @@ rec { let list = addCheck (types.listOf elemType) (l: l != []); in list // { description = "non-empty " + list.description; - # Note: emptyValue is left as is, because another module may define an element. + emptyValue = { }; # no .value attr, meaning unset }; attrsOf = elemType: mkOptionType rec { @@ -503,7 +522,7 @@ rec { functionTo = elemType: mkOptionType { name = "functionTo"; - description = "function that evaluates to a(n) ${elemType.name}"; + description = "function that evaluates to a(n) ${elemType.description}"; check = isFunction; merge = loc: defs: fnArgs: (mergeDefinitions (loc ++ [ "[function body]" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue; @@ -518,6 +537,33 @@ rec { modules = toList modules; }; + # The type of a type! + optionType = mkOptionType { + name = "optionType"; + description = "optionType"; + check = value: value._type or null == "option-type"; + merge = loc: defs: + if length defs == 1 + then (head defs).value + else let + # Prepares the type definitions for mergeOptionDecls, which + # annotates submodules types with file locations + optionModules = map ({ value, file }: + { + _file = file; + # There's no way to merge types directly from the module system, + # but we can cheat a bit by just declaring an option with the type + options = lib.mkOption { + type = value; + }; + } + ) defs; + # Merges all the types into a single one, including submodule merging. + # This also propagates file information to all submodules + mergedOption = fixupOptionType loc (mergeOptionDecls loc optionModules); + in mergedOption.type; + }; + submoduleWith = { modules , specialArgs ? {} @@ -526,14 +572,18 @@ rec { let inherit (lib.modules) evalModules; - coerce = unify: value: if isFunction value - then setFunctionArgs (args: unify (value args)) (functionArgs value) - else unify (if shorthandOnlyDefinesConfig then { config = value; } else value); + shorthandToModule = if shorthandOnlyDefinesConfig == false + then value: value + else value: { config = value; }; allModules = defs: imap1 (n: { value, file }: - if isAttrs value || isFunction value then - # Annotate the value with the location of its definition for better error messages - coerce (lib.modules.unifyModuleSyntax file "${toString file}-${toString n}") value + if isFunction value + then setFunctionArgs + (args: lib.modules.unifyModuleSyntax file "${toString file}-${toString n}" (value args)) + (functionArgs value) + else if isAttrs value + then + lib.modules.unifyModuleSyntax file "${toString file}-${toString n}" (shorthandToModule value) else value ) defs; @@ -601,7 +651,11 @@ rec { then lhs.specialArgs // rhs.specialArgs else throw "A submoduleWith option is declared multiple times with the same specialArgs \"${toString (attrNames intersecting)}\""; shorthandOnlyDefinesConfig = - if lhs.shorthandOnlyDefinesConfig == rhs.shorthandOnlyDefinesConfig + if lhs.shorthandOnlyDefinesConfig == null + then rhs.shorthandOnlyDefinesConfig + else if rhs.shorthandOnlyDefinesConfig == null + then lhs.shorthandOnlyDefinesConfig + else if lhs.shorthandOnlyDefinesConfig == rhs.shorthandOnlyDefinesConfig then lhs.shorthandOnlyDefinesConfig else throw "A submoduleWith option is declared multiple times with conflicting shorthandOnlyDefinesConfig values"; }; @@ -695,14 +749,6 @@ rec { nestedTypes.finalType = finalType; }; - # Obsolete alternative to configOf. It takes its option - # declarations from the ‘options’ attribute of containing option - # declaration. - optionSet = mkOptionType { - name = "optionSet"; - description = "option set"; - deprecationMessage = "Use `types.submodule' instead"; - }; # Augment the given type with an additional type check function. addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e991280a0f28..25c5bd078e51 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -145,6 +145,12 @@ githubId = 16829510; name = "Aaron Janse"; }; + aaronjheng = { + email = "wentworth@outlook.com"; + github = "aaronjheng"; + githubId = 806876; + name = "Aaron Jheng"; + }; aaronschif = { email = "aaronschif@gmail.com"; github = "aaronschif"; @@ -513,12 +519,6 @@ githubId = 38869148; name = "Alex Eyre"; }; - algorith = { - email = "dries_van_daele@telenet.be"; - github = "DriesVanDaele"; - githubId = 1141488; - name = "Dries Van Daele"; - }; alibabzo = { email = "alistair.bill@gmail.com"; github = "alibabzo"; @@ -601,6 +601,12 @@ githubId = 15623522; name = "Amar Paul"; }; + amarshall = { + email = "andrew@johnandrewmarshall.com"; + github = "amarshall"; + githubId = 153175; + name = "Andrew Marshall"; + }; ambroisie = { email = "bruno.nixpkgs@belanyi.fr"; github = "ambroisie"; @@ -765,13 +771,6 @@ githubId = 11699655; name = "Stanislas Lange"; }; - angustrau = { - name = "Angus Trau"; - email = "nix@angus.ws"; - matrix = "@angustrau:matrix.org"; - github = "angustrau"; - githubId = 13267947; - }; anhdle14 = { name = "Le Anh Duc"; email = "anhdle14@icloud.com"; @@ -930,6 +929,12 @@ githubId = 1296771; name = "Anders Riutta"; }; + arjan-s = { + email = "github@anymore.nl"; + github = "arjan-s"; + githubId = 10400299; + name = "Arjan Schrijver"; + }; arkivm = { email = "vikram186@gmail.com"; github = "arkivm"; @@ -1083,6 +1088,12 @@ githubId = 55833; name = "Troels Henriksen"; }; + atila = { + name = "Átila Saraiva"; + email = "atilasaraiva@gmail.com"; + github = "AtilaSaraiva"; + githubId = 29521461; + }; atkinschang = { email = "atkinschang+nixpkgs@gmail.com"; github = "AtkinsChang"; @@ -1185,14 +1196,14 @@ name = "Artturi N"; }; azahi = { - email = "azahi@teknik.io"; - matrix = "@azahi:matrix.org"; + name = "Azat Bahawi"; + email = "azat@bahawi.net"; + matrix = "@azahi:azahi.cc"; github = "azahi"; githubId = 22211000; - name = "Azat Bahawi"; keys = [{ - longkeyid = "rsa2048/0xB40FCB6608BBE3B6"; - fingerprint = "E9F3 483F 31C7 29B4 4CA2 7C38 B40F CB66 08BB E3B6"; + longkeyid = "rsa4096/0xC8C6BDDB3847F72B"; + fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B"; }]; }; ayazhafiz = { @@ -1201,6 +1212,12 @@ githubId = 262763; name = "Ayaz Hafiz"; }; + azuwis = { + email = "azuwis@gmail.com"; + github = "azuwis"; + githubId = 9315; + name = "Zhong Jianxin"; + }; b4dm4n = { email = "fabianm88@gmail.com"; github = "B4dM4n"; @@ -1284,12 +1301,24 @@ githubId = 127523; name = "Herman Fries"; }; + BarinovMaxim = { + name = "Barinov Maxim"; + email = "barinov274@gmail.com"; + github = "barinov274"; + githubId = 54442153; + }; barrucadu = { email = "mike@barrucadu.co.uk"; github = "barrucadu"; githubId = 75235; name = "Michael Walker"; }; + bartsch = { + email = "consume.noise@gmail.com"; + github = "bartsch"; + githubId = 3390885; + name = "Daniel Martin"; + }; bartuka = { email = "wand@hey.com"; github = "wandersoncferreira"; @@ -1671,6 +1700,12 @@ githubId = 355401; name = "Brian Hicks"; }; + brianmcgee = { + name = "Brian McGee"; + email = "brian@41north.dev"; + github = "brianmcgee"; + githubId = 1173648; + }; Br1ght0ne = { email = "brightone@protonmail.com"; github = "Br1ght0ne"; @@ -1878,6 +1913,12 @@ githubId = 82591; name = "Carl Sverre"; }; + carpinchomug = { + email = "aki.suda@protonmail.com"; + github = "carpinchomug"; + githubId = 101536256; + name = "Akiyoshi Suda"; + }; cartr = { email = "carter.sande@duodecima.technology"; github = "cartr"; @@ -2164,6 +2205,12 @@ githubId = 42220376; name = "Charlotte Van Petegem"; }; + cigrainger = { + name = "Christopher Grainger"; + email = "chris@amplified.ai"; + github = "cigrainger"; + githubId = 3984794; + }; ciil = { email = "simon@lackerbauer.com"; github = "ciil"; @@ -2207,7 +2254,7 @@ ckie = { email = "nixpkgs-0efe364@ckie.dev"; github = "ckiee"; - githubId = 2526321; + githubId = 25263210; keys = [{ longkeyid = "rsa4096/0x13E79449C0525215"; fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215"; @@ -2309,6 +2356,13 @@ githubId = 5561189; name = "Cody Opel"; }; + Cogitri = { + email = "oss@cogitri.dev"; + github = "Cogitri"; + githubId = 8766773; + matrix = "@cogitri:cogitri.dev"; + name = "Rasmus Thomsen"; + }; cohei = { email = "a.d.xvii.kal.mai@gmail.com"; github = "cohei"; @@ -2381,6 +2435,13 @@ githubId = 11145016; name = "J.C."; }; + congee = { + email = "changshengwu@pm.me"; + matrix = "@congeec:matrix.org"; + github = "congee"; + name = "Changsheng Wu"; + githubId = 2083950; + }; contrun = { email = "uuuuuu@protonmail.com"; github = "contrun"; @@ -2393,6 +2454,23 @@ githubId = 5510514; name = "Conrad Mearns"; }; + corbanr = { + email = "corban@raunco.co"; + github = "CorbanR"; + githubId = 1918683; + matrix = "@corbansolo:matrix.org"; + name = "Corban Raun"; + keys = [ + { + longkeyid = "rsa4096/0xA697A56F1F151189"; + fingerprint = "6607 0B24 8CE5 64ED 22CE 0950 A697 A56F 1F15 1189"; + } + { + longkeyid = "ed25519/0x230F4AC153F90F29"; + fingerprint = "D8CB 816A B678 A4E6 1EC7 5325 230F 4AC1 53F9 0F29"; + } + ]; + }; couchemar = { email = "couchemar@yandex.ru"; github = "couchemar"; @@ -2752,6 +2830,12 @@ githubId = 49904992; name = "Dawid Sowa"; }; + dbeckwith = { + email = "djbsnx@gmail.com"; + github = "dbeckwith"; + githubId = 1279939; + name = "Daniel Beckwith"; + }; dbirks = { email = "david@birks.dev"; github = "dbirks"; @@ -2878,6 +2962,12 @@ githubId = 19733; name = "Moritz Heidkamp"; }; + DerickEddington = { + email = "derick.eddington@pm.me"; + github = "DerickEddington"; + githubId = 4731128; + name = "Derick Eddington"; + }; dermetfan = { email = "serverkorken@gmail.com"; github = "dermetfan"; @@ -2962,6 +3052,12 @@ githubId = 8404455; name = "Diego Lelis"; }; + DieracDelta = { + email = "justin@restivo.me"; + github = "DieracDelta"; + githubId = 13730968; + name = "Justin Restivo"; + }; diffumist = { email = "git@diffumist.me"; github = "diffumist"; @@ -3380,6 +3476,12 @@ githubId = 18535642; name = "Emily"; }; + emilytrau = { + name = "Emily Trau"; + email = "nix@angus.ws"; + github = "emilytrau"; + githubId = 13267947; + }; enderger = { email = "endergeryt@gmail.com"; github = "enderger"; @@ -3735,6 +3837,12 @@ githubId = 222467; name = "Dmitry Ivanov"; }; + Etjean = { + email = "et.jean@outlook.fr"; + github = "Etjean"; + githubId = 32169529; + name = "Etienne Jean"; + }; etu = { email = "elis@hirwing.se"; matrix = "@etu:semi.social"; @@ -3917,6 +4025,12 @@ githubId = 1276854; name = "Florian Peter"; }; + fbeffa = { + email = "beffa@fbengineering.ch"; + github = "fedeinthemix"; + githubId = 7670450; + name = "Federico Beffa"; + }; fbrs = { email = "yuuki@protonmail.com"; github = "cideM"; @@ -4009,6 +4123,12 @@ github = "fitzgibbon"; githubId = 617048; }; + fkautz = { + name = "Frederick F. Kautz IV"; + email = "fkautz@alumni.cmu.edu"; + github = "fkautz"; + githubId = 135706; + }; Flakebi = { email = "flakebi@t-online.de"; github = "Flakebi"; @@ -4133,7 +4253,12 @@ githubId = 119691; name = "Michael Gough"; }; - + freax13 = { + email = "erbse.13@gmx.de"; + github = "freax13"; + githubId = 14952658; + name = "Tom Dohrmann"; + }; fredeb = { email = "im@fredeb.dev"; github = "fredeeb"; @@ -4395,6 +4520,12 @@ githubId = 27668; name = "Tobias Pflug"; }; + gin66 = { + email = "jochen@kiemes.de"; + github = "gin66"; + githubId = 5549373; + name = "Jochen Kiemes"; + }; giogadi = { email = "lgtorres42@gmail.com"; github = "giogadi"; @@ -4474,7 +4605,7 @@ gordias = { name = "Gordias"; email = "gordias@disroot.org"; - github = "NotGordias"; + github = "gordiasdot"; githubId = 94724133; keys = [{ longkeyid = "ed25519/0x5D47284830FAA4FA"; @@ -5455,6 +5586,12 @@ githubId = 221929; name = "Jean-Baptiste Giraudeau"; }; + jc = { + name = "Josh Cooper"; + email = "josh@cooper.is"; + github = "joshua-cooper"; + githubId = 35612334; + }; jceb = { name = "jceb"; email = "jceb@e-jc.de"; @@ -5529,6 +5666,12 @@ github = "jduan"; githubId = 452450; }; + jdupak = { + name = "Jakub Dupak"; + email = "dev@jakubdupak.com"; + github = "jdupak"; + githubId = 22683640; + }; jecaro = { email = "jeancharles.quillet@gmail.com"; github = "jecaro"; @@ -5583,6 +5726,16 @@ githubId = 143075; name = "James Felix Black"; }; + jfchevrette = { + email = "jfchevrette@gmail.com"; + github = "jfchevrette"; + githubId = 3001; + name = "Jean-Francois Chevrette"; + keys = [{ + longkeyid = "rsa4096/0x67A0585801290DC6"; + fingerprint = "B612 96A9 498E EECD D5E9 C0F0 67A0 5858 0129 0DC6"; + }]; + }; jflanglois = { email = "yourstruly@julienlanglois.me"; github = "jflanglois"; @@ -5739,6 +5892,12 @@ githubId = 587870; name = "Jonathan Mettes"; }; + jmgilman = { + email = "joshuagilman@gmail.com"; + github = "jmgilman"; + githubId = 2308444; + name = "Joshua Gilman"; + }; jo1gi = { email = "joakimholm@protonmail.com"; github = "jo1gi"; @@ -5965,6 +6124,12 @@ githubId = 4611077; name = "Raymond Gauthier"; }; + jrpotter = { + email = "jrpotter2112@gmail.com"; + github = "jrpotter"; + githubId = 3267697; + name = "Joshua Potter"; + }; jschievink = { email = "jonasschievink@gmail.com"; matrix = "@jschievink:matrix.org"; @@ -6020,6 +6185,12 @@ githubId = 810075; name = "Juan Rodal"; }; + juboba = { + email = "juboba@gmail.com"; + github = "juboba"; + githubId = 1189739; + name = "Julio Borja Barra"; + }; juliendehos = { email = "dehos@lisic.univ-littoral.fr"; github = "juliendehos"; @@ -6068,6 +6239,16 @@ githubId = 2396926; name = "Justin Woo"; }; + jvanbruegge = { + email = "supermanitu@gmail.com"; + github = "jvanbruegge"; + githubId = 1529052; + name = "Jan van Brügge"; + keys = [{ + longkeyid = "rsa4096/0x366572BE7D6C78A2"; + fingerprint = "3513 5CE5 77AD 711F 3825 9A99 3665 72BE 7D6C 78A2"; + }]; + }; jwatt = { email = "jwatt@broken.watch"; github = "jjwatt"; @@ -6228,6 +6409,12 @@ githubId = 37185887; name = "Calvin Kim"; }; + keldu = { + email = "mail@keldu.de"; + github = "keldu"; + githubId = 15373888; + name = "Claudius Holeksa"; + }; kennyballou = { email = "kb@devnulllabs.io"; github = "kennyballou"; @@ -6263,6 +6450,12 @@ githubId = 209729; name = "Kevin Griffin"; }; + kevink = { + email = "kevin@kevink.dev"; + github = "Unkn0wnCat"; + githubId = 8211181; + name = "Kevin Kandlbinder"; + }; kfollesdal = { email = "kfollesdal@gmail.com"; github = "kfollesdal"; @@ -6419,7 +6612,7 @@ githubId = 18447310; }; kloenk = { - email = "me@kloenk.de"; + email = "me@kloenk.dev"; matrix = "@kloenk:petabyte.dev"; name = "Finn Behrens"; github = "kloenk"; @@ -6526,6 +6719,12 @@ githubId = 787421; name = "Kevin Quick"; }; + kradalby = { + name = "Kristoffer Dalby"; + email = "kristoffer@dalby.cc"; + github = "kradalby"; + githubId = 98431; + }; kraem = { email = "me@kraem.xyz"; github = "kraem"; @@ -6967,12 +7166,6 @@ githubId = 36448130; name = "Michael Brantley"; }; - linarcx = { - email = "linarcx@gmail.com"; - github = "linarcx"; - githubId = 10884422; - name = "Kaveh Ahangar"; - }; linc01n = { email = "git@lincoln.hk"; github = "linc01n"; @@ -7035,6 +7228,12 @@ githubId = 30698906; name = "Luna D Dragon"; }; + LunNova = { + email = "nixpkgs-maintainer@lunnova.dev"; + github = "LunNova"; + githubId = 782440; + name = "Luna Nova"; + }; lionello = { email = "lio@lunesu.com"; github = "lionello"; @@ -7071,6 +7270,29 @@ githubId = 1267527; name = "Daniel Firth"; }; + lockejan = { + email = "git@smittie.de"; + matrix = "@jan:smittie.de"; + github = "lockejan"; + githubId = 25434434; + name = "Jan Schmitt"; + keys = [{ + longkeyid = "dsa2048/0xA2BC3C6F14351991"; + fingerprint = "1763 9903 2D7C 5B82 5D5A 0EAD A2BC 3C6F 1435 1991"; + }]; + }; + lodi = { + email = "anthony.lodi@gmail.com"; + github = "lodi"; + githubId = 918448; + name = "Anthony Lodi"; + }; + loicreynier = { + email = "loic@loireynier.fr"; + github = "loicreynier"; + githubId = 88983487; + name = "Loïc Reynier"; + }; lopsided98 = { email = "benwolsieffer@gmail.com"; github = "lopsided98"; @@ -7506,16 +7728,6 @@ githubId = 29855073; name = "Michael Colicchia"; }; - matdsoupe = { - github = "matdsoupe"; - githubId = 44469426; - name = "Matheus de Souza Pessanha"; - email = "matheus_pessanha2001@outlook.com"; - keys = [{ - longkeyid = "rsa4096/0x2671964AB1E06A08"; - fingerprint = "2F32 CFEF E11A D73B A740 FA47 2671 964A B1E0 6A08"; - }]; - }; matejc = { email = "cotman.matej@gmail.com"; github = "matejc"; @@ -7571,6 +7783,16 @@ githubId = 279868; name = "Matti Kariluoma"; }; + matthewpi = { + email = "me+nix@matthewp.io"; + github = "matthewpi"; + githubId = 26559841; + name = "Matthew Penner"; + keys = [{ + longkeyid = "ed25519/0x31311906AD4CF6D6"; + fingerprint = "5118 F1CC B7B0 6C17 4DD1 5267 3131 1906 AD4C F6D6"; + }]; + }; maurer = { email = "matthew.r.maurer+nix@gmail.com"; github = "maurer"; @@ -7617,6 +7839,12 @@ githubId = 1187050; name = "Maximilian Huber"; }; + maximsmol = { + email = "maximsmol@gmail.com"; + github = "maximsmol"; + githubId = 1472826; + name = "Max Smolin"; + }; maxxk = { email = "maxim.krivchikov@gmail.com"; github = "maxxk"; @@ -7797,12 +8025,6 @@ github = "kira-bruneau"; githubId = 382041; }; - meutraa = { - email = "paul+nixpkgs@lost.host"; - name = "Paul Meredith"; - github = "meutraa"; - githubId = 68550871; - }; mephistophiles = { email = "mussitantesmortem@gmail.com"; name = "Maxim Zhukov"; @@ -7845,6 +8067,12 @@ githubId = 668926; name = "Maximilian Güntner"; }; + mh = { + email = "68288772+markus-heinrich@users.noreply.github.com"; + github = "markus-heinrich"; + githubId = 68288772; + name = "Markus Heinrich"; + }; mhaselsteiner = { email = "magdalena.haselsteiner@gmx.at"; github = "mhaselsteiner"; @@ -7916,6 +8144,12 @@ fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83"; }]; }; + mihnea-s = { + email = "mihn.stn@gmail.com"; + github = "mihnea-s"; + githubId = 43088426; + name = "Mihnea Stoian"; + }; mikefaille = { email = "michael@faille.io"; github = "mikefaille"; @@ -8030,13 +8264,6 @@ githubId = 1001112; name = "Marcin Janczyk"; }; - mjlbach = { - email = "m.j.lbach@gmail.com"; - matrix = "@atrius:matrix.org"; - github = "mjlbach"; - githubId = 13316262; - name = "Michael Lingelbach"; - }; mjp = { email = "mike@mythik.co.uk"; github = "MikePlayle"; @@ -8271,6 +8498,17 @@ githubId = 3073833; name = "Massimo Redaelli"; }; + mrhedgehog = { + name = "Mr Hedgehog"; + email = "hedgehog@mrhedgehog.xyz"; + matrix = "@mrhedgehog:jupiterbroadcasting.com"; + github = "ModdedGamers"; + githubId = 35778371; + keys = [{ + longkeyid = "rsa4096/0x7D5107866B1C6752"; + fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752"; + }]; + }; mrkkrp = { email = "markkarpov92@gmail.com"; github = "mrkkrp"; @@ -8415,6 +8653,17 @@ githubId = 25388474; name = "Matej Urbas"; }; + mvisonneau = { + name = "Maxime VISONNEAU"; + email = "maxime@visonneau.fr"; + matrix = "@maxime:visonneau.fr"; + github = "mvisonneau"; + githubId = 1761583; + keys = [{ + longkeyid = "rsa4096/0x150D6F0AE9198D24"; + fingerprint = "EC63 0CEA E8BC 5EE5 5C58 F2E3 150D 6F0A E919 8D24"; + }]; + }; mvnetbiz = { email = "mvnetbiz@gmail.com"; matrix = "@mvtva:matrix.org"; @@ -8440,6 +8689,12 @@ githubId = 9636071; name = "Myrl Hex"; }; + n0emis = { + email = "nixpkgs@n0emis.network"; + github = "n0emis"; + githubId = 22817873; + name = "Ember Keske"; + }; nadrieril = { email = "nadrieril@gmail.com"; github = "nadrieril"; @@ -8507,6 +8762,12 @@ fingerprint = "4BFF 0614 03A2 47F0 AA0B 4BC4 916D 8B67 2418 92AE"; }]; }; + nbr = { + email = "nbr@users.noreply.github.com"; + github = "nbr"; + githubId = 3819225; + name = "Nick Braga"; + }; nbren12 = { email = "nbren12@gmail.com"; github = "nbren12"; @@ -8542,6 +8803,12 @@ githubId = 3747396; name = "Nathan Isom"; }; + nelsonjeppesen = { + email = "nix@jeppesen.io"; + github = "NelsonJeppesen"; + githubId = 50854675; + name = "Nelson Jeppesen"; + }; neonfuz = { email = "neonfuz@gmail.com"; github = "neonfuz"; @@ -8664,6 +8931,12 @@ githubId = 8214542; name = "Nicolò Balzarotti"; }; + nidabdella = { + name = "Mohamed Nidabdella"; + email = "nidabdella.mohamed@gmail.com"; + github = "nidabdella"; + githubId = 8083813; + }; NieDzejkob = { email = "kuba@kadziolka.net"; github = "NieDzejkob"; @@ -8839,9 +9112,9 @@ githubId = 2946283; name = "Brian Cohen"; }; - novoxudonoser = { + novoxd = { email = "radnovox@gmail.com"; - github = "novoxudonoser"; + github = "novoxd"; githubId = 6052922; name = "Kirill Struokov"; }; @@ -8969,6 +9242,12 @@ githubId = 158758; name = "Oliver Dunkl"; }; + ofek = { + email = "oss@ofek.dev"; + github = "ofek"; + githubId = 9677399; + name = "Ofek Lev"; + }; offline = { email = "jaka@x-truder.net"; github = "offlinehacker"; @@ -9063,6 +9342,12 @@ githubId = 23431373; name = "Christoph Neidahl"; }; + opeik = { + email = "sandro@stikic.com"; + github = "opeik"; + githubId = 11566773; + name = "Sandro Stikić"; + }; orbekk = { email = "kjetil.orbekk@gmail.com"; github = "orbekk"; @@ -9147,6 +9432,12 @@ githubId = 15930073; name = "Moritz Scheuren"; }; + ozkutuk = { + email = "ozkutuk@protonmail.com"; + github = "ozkutuk"; + githubId = 5948762; + name = "Berk Özkütük"; + }; pablovsky = { email = "dealberapablo07@gmail.com"; github = "pablo1107"; @@ -9215,6 +9506,13 @@ githubId = 71795; name = "Mica Semrick"; }; + papojari = { + email = "papojari-git.ovoid@aleeas.com"; + matrix = "@papojari:artemislena.eu"; + github = "papojari"; + githubId = 81317317; + name = "papojari"; + }; paraseba = { email = "paraseba@gmail.com"; github = "paraseba"; @@ -9652,6 +9950,12 @@ fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0"; }]; }; + ppenguin = { + name = "Jeroen Versteeg"; + email = "hieronymusv@gmail.com"; + github = "ppenguin"; + githubId = 17690377; + }; ppom = { name = "Paco Pompeani"; email = "paco@ecomail.io"; @@ -9786,6 +10090,12 @@ githubId = 20524473; name = "Psyanticy"; }; + psydvl = { + email = "psydvl@fea.st"; + github = "psydvl"; + githubId = 43755002; + name = "Dmitriy P"; + }; ptival = { email = "valentin.robert.42@gmail.com"; github = "Ptival"; @@ -10002,6 +10312,16 @@ githubId = 16487165; name = "Rafael Basso"; }; + rbreslow = { + name = "Rocky Breslow"; + email = "1774125+rbreslow@users.noreply.github.com"; + github = "rbreslow"; + githubId = 1774125; + keys = [{ + longkeyid = "ed25519/0xA0D32ACCA38B88ED"; + fingerprint = "B5B7 BCA0 EE6F F31E 263A 69E3 A0D3 2ACC A38B 88ED"; + }]; + }; rbrewer = { email = "rwb123@gmail.com"; github = "rbrewer123"; @@ -10020,6 +10340,20 @@ githubId = 16624; name = "Maxim Ivanov"; }; + reckenrode = { + name = "Randy Eckenrode"; + email = "randy@largeandhighquality.com"; + matrix = "@reckenrode:matrix.org"; + github = "reckenrode"; + githubId = 7413633; + keys = [ + # compare with https://keybase.io/reckenrode + { + longkeyid = "ed25519/0xFBF19A982CCE0048"; + fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048"; + } + ]; + }; redfish64 = { email = "engler@gmail.com"; github = "redfish64"; @@ -10114,6 +10448,18 @@ githubId = 22803888; name = "Lu Hongxu"; }; + rgnns = { + email = "jglievano@gmail.com"; + github = "rgnns"; + githubId = 811827; + name = "Gabriel Lievano"; + }; + rgrinberg = { + name = "Rudi Grinberg"; + email = "me@rgrinberg.com"; + github = "rgrinberg"; + githubId = 139003; + }; rgrunbla = { email = "remy@grunblatt.org"; github = "rgrunbla"; @@ -10138,6 +10484,13 @@ githubId = 6047658; name = "Ryan Horiguchi"; }; + rhysmdnz = { + email = "rhys@memes.nz"; + matrix = "@rhys:memes.nz"; + github = "rhysmdnz"; + githubId = 2162021; + name = "Rhys Davies"; + }; ribose-jeffreylau = { name = "Jeffrey Lau"; email = "jeffrey.lau@ribose.com"; @@ -10814,6 +11167,12 @@ githubId = 19472270; name = "Sebastian"; }; + sebastianblunt = { + name = "Sebastian Blunt"; + email = "nix@sebastianblunt.com"; + github = "sebastianblunt"; + githubId = 47431204; + }; sebbadk = { email = "sebastian@sebba.dk"; github = "SEbbaDK"; @@ -10952,6 +11311,12 @@ githubId = 293035; name = "Shawn Dellysse"; }; + shawn8901 = { + email = "shawn8901@googlemail.com"; + github = "shawn8901"; + githubId = 12239057; + name = "Shawn8901"; + }; shazow = { email = "andrey.petrov@shazow.net"; github = "shazow"; @@ -10988,6 +11353,16 @@ github = "shikanime"; githubId = 22115108; }; + shiryel = { + email = "contact@shiryel.com"; + name = "Shiryel"; + github = "shiryel"; + githubId = 35617139; + keys = [{ + longkeyid = "ed25519/0xC4041EA6B32633DE"; + fingerprint = "AB63 4CD9 3322 BD42 6231 F764 C404 1EA6 B326 33DE"; + }]; + }; shlevy = { email = "shea@shealevy.com"; github = "shlevy"; @@ -11411,6 +11786,23 @@ githubId = 1699155; name = "Steve Elliott"; }; + stehessel = { + email = "stephan@stehessel.de"; + github = "stehessel"; + githubId = 55607356; + name = "Stephan Heßelmann"; + }; + steinybot = { + name = "Jason Pickens"; + email = "jasonpickensnz@gmail.com"; + matrix = "@steinybot:matrix.org"; + github = "steinybot"; + githubId = 4659562; + keys = [{ + longkeyid = "ed25519/0x21DE1CAE59762A0F"; + fingerprint = "2709 1DEC CC42 4635 4299 569C 21DE 1CAE 5976 2A0F"; + }]; + }; stelcodes = { email = "stel@stel.codes"; github = "stelcodes"; @@ -11554,6 +11946,13 @@ githubId = 2666479; name = "Y Nguyen"; }; + superherointj = { + name = "Sérgio G."; + email = "5861043+superherointj@users.noreply.github.com"; + matrix = "@superherointj:matrix.org"; + github = "superherointj"; + githubId = 5861043; + }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; matrix = "@sandro:supersandro.de"; @@ -11794,6 +12193,13 @@ githubId = 863327; name = "Tyler Benster"; }; + tboerger = { + email = "thomas@webhippie.de"; + matrix = "@tboerger:matrix.org"; + github = "tboerger"; + githubId = 156964; + name = "Thomas Boerger"; + }; tcbravo = { email = "tomas.bravo@protonmail.ch"; github = "tcbravo"; @@ -12153,6 +12559,7 @@ }; toastal = { email = "toastal+nix@posteo.net"; + matrix = "@toastal:matrix.org"; github = "toastal"; githubId = 561087; name = "toastal"; @@ -12403,6 +12810,12 @@ githubId = 1983821; name = "Eric Wolf"; }; + uakci = { + name = "uakci"; + email = "uakci@uakci.pl"; + github = "uakci"; + githubId = 6961268; + }; udono = { email = "udono@virtual-things.biz"; github = "udono"; @@ -12641,9 +13054,9 @@ githubId = 5837359; name = "Adrian Pistol"; }; - vika_nezrimaya = { + vikanezrimaya = { email = "vika@fireburn.ru"; - github = "kisik21"; + github = "vikanezrimaya"; githubId = 7953163; name = "Vika Shleina"; keys = [{ @@ -12667,6 +13080,12 @@ githubId = 118959; name = "VinyMeuh"; }; + viraptor = { + email = "nix@viraptor.info"; + github = "viraptor"; + githubId = 188063; + name = "Stanisław Pitucha"; + }; viric = { email = "viric@viric.name"; github = "viric"; @@ -12824,6 +13243,12 @@ githubId = 34962284; name = "wchresta"; }; + wdavidw = { + name = "David Worms"; + email = "david@adaltas.com"; + github = "wdavidw"; + githubId = 46896; + }; wedens = { email = "kirill.wedens@gmail.com"; name = "wedens"; @@ -13013,7 +13438,7 @@ name = "Wayne Scott"; }; wucke13 = { - email = "info@wucke13.de"; + email = "wucke13@gmail.com"; github = "wucke13"; githubId = 20400405; name = "Wucke"; @@ -13092,6 +13517,12 @@ githubId = 1297598; name = "Konrad Borowski"; }; + xgroleau = { + email = "xgroleau@gmail.com"; + github = "xgroleau"; + githubId = 31734358; + name = "Xavier Groleau"; + }; xiorcale = { email = "quentin.vaucher@pm.me"; github = "xiorcale"; @@ -13148,7 +13579,7 @@ }; yana = { email = "yana@riseup.net"; - github = "alpakido"; + github = "sowelisuwi"; githubId = 1643293; name = "Yana Timoshenko"; }; @@ -13602,10 +14033,10 @@ github = "nagisa"; githubId = 679122; }; - yevhenshymotiuk = { + yshym = { name = "Yevhen Shymotiuk"; - email = "yevhenshymotiuk@gmail.com"; - github = "yevhenshymotiuk"; + email = "yshym@pm.me"; + github = "yshym"; githubId = 44244245; }; hmenke = { @@ -13729,6 +14160,16 @@ github = "zeri42"; githubId = 68825133; }; + zoedsoupe = { + github = "zoedsoupe"; + githubId = 44469426; + name = "Zoey de Souza Pessanha"; + email = "zoey.spessanha@outlook.com"; + keys = [{ + longkeyid = "rsa4096/0x1E1E889CDBD6A315"; + fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315"; + }]; + }; zombiezen = { name = "Ross Light"; email = "ross@zombiezen.com"; @@ -13769,6 +14210,12 @@ github = "jpagex"; githubId = 635768; }; + vbrandl = { + name = "Valentin Brandl"; + email = "mail+nixpkgs@vbrandl.net"; + github = "vbrandl"; + githubId = 20639051; + }; portothree = { name = "Gustavo Porto"; email = "gustavoporto@ya.ru"; @@ -13792,4 +14239,16 @@ fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; }]; }; + ameer = { + name = "Ameer Taweel"; + email = "ameertaweel2002@gmail.com"; + github = "AmeerTaweel"; + githubId = 20538273; + }; + nigelgbanks = { + name = "Nigel Banks"; + email = "nigel.g.banks@gmail.com"; + github = "nigelgbanks"; + githubId = 487373; + }; } diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 285f6ed7cf94..9d51eb4ca4af 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -20,7 +20,7 @@ HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}" # See: https://github.com/NixOS/nixpkgs/pull/122023 export LC_ALL=C.UTF-8 -extraction_derivation='with import ./. {}; runCommand "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"' +extraction_derivation='with import ./. {}; runCommandLocal "unpacked-cabal-hashes" { } "tar xf ${all-cabal-hashes} --strip-components=1 --one-top-level=$out"' unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)" config_dir=pkgs/development/haskell-modules/configuration-hackage2nix diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 23303d22c471..bdda8020a3da 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -68,7 +68,7 @@ luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn luuid,,,,,, -luv,,,,1.42.0-0,, +luv,,,,1.43.0-0,, lyaml,,,,,,lblasc markdown,,,,,, mediator_lua,,,,,, @@ -81,6 +81,6 @@ rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, readline,,,,,, say,https://github.com/Olivine-Labs/say.git,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, -std.normalize,git://github.com/lua-stdlib/normalize.git,,,,, +std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, stdlib,,,,41.2.2,,vyp vstruct,https://github.com/ToxicFrog/vstruct.git,,,,, diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index de85b88da3fd..017e3ac758ac 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -1,4 +1,4 @@ -# Used by pkgs/misc/vim-plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py +# Used by pkgs/applications/editors/vim/plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py # format: # $ nix run nixpkgs.python3Packages.black -c black update.py @@ -73,9 +73,13 @@ def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: floa return deco_retry +@dataclass +class FetchConfig: + proc: int + github_token: str -def make_request(url: str) -> urllib.request.Request: - token = os.getenv("GITHUB_API_TOKEN") + +def make_request(url: str, token=None) -> urllib.request.Request: headers = {} if token is not None: headers["Authorization"] = f"token {token}" @@ -90,6 +94,7 @@ class Repo: self.branch = branch self.alias = alias self.redirect: Dict[str, str] = {} + self.token = "dummy_token" @property def name(self): @@ -132,10 +137,11 @@ class Repo: class RepoGitHub(Repo): def __init__( - self, owner: str, repo: str, branch: str, alias: Optional[str] + self, owner: str, repo: str, branch: str, alias: Optional[str] ) -> None: self.owner = owner self.repo = repo + self.token = None '''Url to the repo''' super().__init__(self.url(""), branch, alias) log.debug("Instantiating github repo %s/%s", self.owner, self.repo) @@ -150,7 +156,7 @@ class RepoGitHub(Repo): @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def has_submodules(self) -> bool: try: - req = make_request(self.url(f"blob/{self.branch}/.gitmodules")) + req = make_request(self.url(f"blob/{self.branch}/.gitmodules"), self.token) urllib.request.urlopen(req, timeout=10).close() except urllib.error.HTTPError as e: if e.code == 404: @@ -162,7 +168,7 @@ class RepoGitHub(Repo): @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def latest_commit(self) -> Tuple[str, datetime]: commit_url = self.url(f"commits/{self.branch}.atom") - commit_req = make_request(commit_url) + commit_req = make_request(commit_url, self.token) with urllib.request.urlopen(commit_req, timeout=10) as req: self._check_for_redirect(commit_url, req) xml = req.read() @@ -291,15 +297,41 @@ class Editor: """To fill the cache""" return get_current_plugins(self) - def load_plugin_spec(self, plugin_file) -> List[PluginDesc]: - return load_plugin_spec(plugin_file) + def load_plugin_spec(self, config: FetchConfig, plugin_file) -> List[PluginDesc]: + plugins = [] + with open(plugin_file) as f: + for line in f: + if line.startswith("#"): + continue + plugin = parse_plugin_line(config, line) + plugins.append(plugin) + return plugins def generate_nix(self, plugins, outfile: str): '''Returns nothing for now, writes directly to outfile''' raise NotImplementedError() - def get_update(self, input_file: str, outfile: str, proc: int): - return get_update(input_file, outfile, proc, editor=self) + def get_update(self, input_file: str, outfile: str, config: FetchConfig): + cache: Cache = Cache(self.get_current_plugins(), self.cache_file) + _prefetch = functools.partial(prefetch, cache=cache) + + def update() -> dict: + plugin_names = self.load_plugin_spec(config, input_file) + + try: + pool = Pool(processes=config.proc) + results = pool.map(_prefetch, plugin_names) + finally: + cache.store() + + plugins, redirects = check_results(results) + + self.generate_nix(plugins, outfile) + + return redirects + + return update + @property def attr_path(self): @@ -345,7 +377,15 @@ class Editor: dest="proc", type=int, default=30, - help="Number of concurrent processes to spawn. Export GITHUB_API_TOKEN allows higher values.", + help="Number of concurrent processes to spawn. Setting --github-token allows higher values.", + ) + parser.add_argument( + "--github-token", + "-t", + type=str, + default=os.getenv("GITHUB_API_TOKEN"), + help="""Allows to set --proc to higher values. + Uses GITHUB_API_TOKEN environment variables as the default value.""", ) parser.add_argument( "--no-commit", "-n", action="store_true", default=False, @@ -414,8 +454,8 @@ def prefetch_plugin( ) -def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin: - plugin, _ = prefetch_plugin(parse_plugin_line(plugin_line)) +def fetch_plugin_from_pluginline(config: FetchConfig, plugin_line: str) -> Plugin: + plugin, _ = prefetch_plugin(parse_plugin_line(config, plugin_line)) return plugin @@ -465,7 +505,7 @@ def make_repo(uri, branch, alias) -> Repo: repo = Repo(uri.strip(), branch, alias) return repo -def parse_plugin_line(line: str) -> PluginDesc: +def parse_plugin_line(config: FetchConfig, line: str) -> PluginDesc: branch = "HEAD" alias = None uri = line @@ -476,21 +516,11 @@ def parse_plugin_line(line: str) -> PluginDesc: uri, branch = uri.split("@") repo = make_repo(uri.strip(), branch.strip(), alias) + repo.token = config.github_token return PluginDesc(repo, branch.strip(), alias) -def load_plugin_spec(plugin_file: str) -> List[PluginDesc]: - plugins = [] - with open(plugin_file) as f: - for line in f: - if line.startswith("#"): - continue - plugin = parse_plugin_line(line) - plugins.append(plugin) - return plugins - - def get_cache_path(cache_file_name: str) -> Optional[Path]: xdg_cache = os.environ.get("XDG_CACHE_HOME", None) if xdg_cache is None: @@ -556,6 +586,7 @@ def prefetch( def rewrite_input( + config: FetchConfig, input_file: Path, deprecated: Path, redirects: Dict[str, str] = None, @@ -573,8 +604,8 @@ def rewrite_input( with open(deprecated, "r") as f: deprecations = json.load(f) for old, new in redirects.items(): - old_plugin = fetch_plugin_from_pluginline(old) - new_plugin = fetch_plugin_from_pluginline(new) + old_plugin = fetch_plugin_from_pluginline(config, old) + new_plugin = fetch_plugin_from_pluginline(config, new) if old_plugin.normalized_name != new_plugin.normalized_name: deprecations[old_plugin.normalized_name] = { "new": new_plugin.normalized_name, @@ -600,40 +631,21 @@ def commit(repo: git.Repo, message: str, files: List[Path]) -> None: print("no changes in working tree to commit") -def get_update(input_file: str, outfile: str, proc: int, editor: Editor): - cache: Cache = Cache(editor.get_current_plugins(), editor.cache_file) - _prefetch = functools.partial(prefetch, cache=cache) - - def update() -> dict: - plugin_names = editor.load_plugin_spec(input_file) - - try: - pool = Pool(processes=proc) - results = pool.map(_prefetch, plugin_names) - finally: - cache.store() - - plugins, redirects = check_results(results) - - editor.generate_nix(plugins, outfile) - - return redirects - - return update - def update_plugins(editor: Editor, args): """The main entry function of this module. All input arguments are grouped in the `Editor`.""" log.setLevel(LOG_LEVELS[args.debug]) log.info("Start updating plugins") - update = editor.get_update(args.input_file, args.outfile, args.proc) + fetch_config = FetchConfig(args.proc, args.github_token) + update = editor.get_update(args.input_file, args.outfile, fetch_config) redirects = update() - editor.rewrite_input(args.input_file, editor.deprecated, redirects) + editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, redirects) autocommit = not args.no_commit + nixpkgs_repo = None if autocommit: nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) commit(nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile]) @@ -648,9 +660,9 @@ def update_plugins(editor: Editor, args): ) for plugin_line in args.add_plugins: - editor.rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",)) + editor.rewrite_input(fetch_config, args.input_file, editor.deprecated, append=(plugin_line + "\n",)) update() - plugin = fetch_plugin_from_pluginline(plugin_line) + plugin = fetch_plugin_from_pluginline(fetch_config, plugin_line) if autocommit: commit( nixpkgs_repo, diff --git a/maintainers/scripts/remove-old-aliases.py b/maintainers/scripts/remove-old-aliases.py new file mode 100755 index 000000000000..c5629c829594 --- /dev/null +++ b/maintainers/scripts/remove-old-aliases.py @@ -0,0 +1,211 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ ])" nix +""" +A program to remove old aliases or convert old aliases to throws +Example usage: +./maintainers/scripts/remove-old-aliases.py --year 2018 --file ./pkgs/top-level/aliases.nix + +Check this file with mypy after every change! +$ mypy --strict maintainers/scripts/remove-old-aliases.py +""" +import argparse +import shutil +import subprocess +from datetime import date as datetimedate +from datetime import datetime +from pathlib import Path + + +def process_args() -> argparse.Namespace: + """process args""" + arg_parser = argparse.ArgumentParser() + arg_parser.add_argument( + "--year", required=True, type=int, help="operate on aliases older than $year" + ) + arg_parser.add_argument( + "--month", + type=int, + default=1, + help="operate on aliases older than $year-$month", + ) + arg_parser.add_argument( + "--only-throws", + action="store_true", + help="only operate on throws. e.g remove throws older than $date", + ) + arg_parser.add_argument("--file", required=True, type=Path, help="alias file") + arg_parser.add_argument( + "--dry-run", action="store_true", help="don't modify files, only print results" + ) + return arg_parser.parse_args() + + +def get_date_lists( + txt: list[str], cutoffdate: datetimedate, only_throws: bool +) -> tuple[list[str], list[str], list[str]]: + """get a list of lines in which the date is older than $cutoffdate""" + date_older_list: list[str] = [] + date_older_throw_list: list[str] = [] + date_sep_line_list: list[str] = [] + + for lineno, line in enumerate(txt, start=1): + line = line.rstrip() + my_date = None + for string in line.split(): + string = string.strip(":") + try: + # strip ':' incase there is a string like 2019-11-01: + my_date = datetime.strptime(string, "%Y-%m-%d").date() + except ValueError: + try: + my_date = datetime.strptime(string, "%Y-%m").date() + except ValueError: + continue + + if ( + my_date is None + or my_date > cutoffdate + or "preserve, reason:" in line.lower() + ): + continue + + if "=" not in line: + date_sep_line_list.append(f"{lineno} {line}") + # 'if' lines could be complicated + elif "if " in line and "if =" not in line: + print(f"RESOLVE MANUALLY {line}") + elif "throw" in line: + date_older_throw_list.append(line) + elif not only_throws: + date_older_list.append(line) + + return ( + date_older_list, + date_sep_line_list, + date_older_throw_list, + ) + + +def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]: + """convert a list of lines to throws""" + converted_list = [] + for line in date_older_list.copy(): + indent: str = " " * (len(line) - len(line.lstrip())) + before_equal = "" + after_equal = "" + try: + before_equal, after_equal = (x.strip() for x in line.split("=", maxsplit=2)) + except ValueError as err: + print(err, line, "\n") + date_older_list.remove(line) + continue + + alias = before_equal.strip() + after_equal_list = [x.strip(";:") for x in after_equal.split()] + + converted = ( + f"{indent}{alias} = throw \"'{alias}' has been renamed to/replaced by" + f" '{after_equal_list.pop(0)}'\";" + f' # Converted to throw {datetime.today().strftime("%Y-%m-%d")}' + ) + converted_list.append((line, converted)) + + return converted_list + + +def generate_text_to_write( + txt: list[str], + date_older_list: list[str], + converted_to_throw: list[tuple[str, str]], + date_older_throw_list: list[str], +) -> list[str]: + """generate a list of text to be written to the aliasfile""" + text_to_write: list[str] = [] + for line in txt: + text_to_append: str = "" + if converted_to_throw: + for tupl in converted_to_throw: + if line == tupl[0]: + text_to_append = f"{tupl[1]}\n" + if line not in date_older_list and line not in date_older_throw_list: + text_to_append = f"{line}\n" + if text_to_append: + text_to_write.append(text_to_append) + + return text_to_write + + +def write_file( + aliasfile: Path, + text_to_write: list[str], +) -> None: + """write file""" + temp_aliasfile = Path(f"{aliasfile}.raliases") + with open(temp_aliasfile, "w", encoding="utf-8") as far: + for line in text_to_write: + far.write(line) + print("\nChecking the syntax of the new aliasfile") + try: + subprocess.run( + ["nix-instantiate", "--eval", temp_aliasfile], + check=True, + stdout=subprocess.DEVNULL, + ) + except subprocess.CalledProcessError: + print( + "\nSyntax check failed,", + "there may have been a line which only has\n" + 'aliasname = "reason why";\n' + "when it should have been\n" + 'aliasname = throw "reason why";', + ) + temp_aliasfile.unlink() + return + shutil.move(f"{aliasfile}.raliases", aliasfile) + print(f"{aliasfile} modified! please verify with 'git diff'.") + + +def main() -> None: + """main""" + args = process_args() + + only_throws = args.only_throws + aliasfile = Path(args.file).absolute() + cutoffdate = (datetime.strptime(f"{args.year}-{args.month}-01", "%Y-%m-%d")).date() + + txt: list[str] = (aliasfile.read_text(encoding="utf-8")).splitlines() + + date_older_list: list[str] = [] + date_sep_line_list: list[str] = [] + date_older_throw_list: list[str] = [] + + date_older_list, date_sep_line_list, date_older_throw_list = get_date_lists( + txt, cutoffdate, only_throws + ) + + converted_to_throw: list[tuple[str, str]] = [] + if date_older_list: + converted_to_throw = convert_to_throw(date_older_list) + print(" Will be converted to throws. ".center(100, "-")) + for l_n in date_older_list: + print(l_n) + + if date_older_throw_list: + print(" Will be removed. ".center(100, "-")) + for l_n in date_older_throw_list: + print(l_n) + + if date_sep_line_list: + print(" On separate line, resolve manually. ".center(100, "-")) + for l_n in date_sep_line_list: + print(l_n) + + if not args.dry_run: + text_to_write = generate_text_to_write( + txt, date_older_list, converted_to_throw, date_older_throw_list + ) + write_file(aliasfile, text_to_write) + + +if __name__ == "__main__": + main() diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index c559d5699dff..73a233c5f103 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -25,8 +25,8 @@ from pathlib import Path log = logging.getLogger() log.addHandler(logging.StreamHandler()) -ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent -from pluginupdate import Editor, update_plugins, PluginDesc, CleanEnvironment, LOG_LEVELS, Cache +ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore +from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment PKG_LIST="maintainers/scripts/luarocks-packages.csv" TMP_FILE="$(mktemp)" @@ -118,7 +118,7 @@ class LuaEditor(Editor): def attr_path(self): return "luaPackages" - def get_update(self, input_file: str, outfile: str, proc: int): + def get_update(self, input_file: str, outfile: str, config: FetchConfig): _prefetch = generate_pkg_nix def update() -> dict: @@ -126,14 +126,14 @@ class LuaEditor(Editor): sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower()) try: - pool = Pool(processes=proc) + pool = Pool(processes=config.proc) results = pool.map(_prefetch, sorted_plugin_specs) finally: pass self.generate_nix(results, outfile) - redirects = [] + redirects = {} return redirects return update @@ -181,11 +181,9 @@ def generate_pkg_nix(plug: LuaPlugin): cmd.append(plug.version) - # if plug.server != "src" and plug.server: cmd.append(f"--only-server={plug.server}") - if plug.luaversion: with CleanEnvironment(): local_pkgs = str(ROOT.resolve()) @@ -209,7 +207,6 @@ def main(): parser = editor.create_parser() args = parser.parse_args() - log.setLevel(LOG_LEVELS[args.debug]) update_plugins(editor, args) diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index d881d68301ba..1a2f06c73a2c 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -147,7 +147,7 @@ let to run update script for specific package, or - % nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: builtins.isList pkg.updateScript && builtins.length pkg.updateScript >= 1 && (let script = builtins.head pkg.updateScript; in builtins.isAttrs script && script.name == "gnome-update-script"))' + % nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: pkg.updateScript.name or null == "gnome-update-script")' to run update script for all packages matching given predicate, or diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py index 06b12a0ee04e..07e0b5c68305 100644 --- a/maintainers/scripts/update.py +++ b/maintainers/scripts/update.py @@ -88,6 +88,10 @@ async def commit_changes(name: str, merge_lock: asyncio.Lock, worktree: str, bra async with merge_lock: await check_subprocess('git', 'add', *change['files'], cwd=worktree) commit_message = '{attrPath}: {oldVersion} → {newVersion}'.format(**change) + if 'commitMessage' in change: + commit_message = change['commitMessage'] + elif 'commitBody' in change: + commit_message = commit_message + '\n\n' + change['commitBody'] await check_subprocess('git', 'commit', '--quiet', '-m', commit_message, cwd=worktree) await check_subprocess('git', 'cherry-pick', branch) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 361be88045f1..66cba166f2ca 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -50,6 +50,7 @@ with lib.maintainers; { DianaOlympos gleber happysalada + minijackson yurrriq ]; scope = "Maintain BEAM-related packages and modules."; @@ -64,7 +65,6 @@ with lib.maintainers; { chia = { members = [ - atemu lourkeur ]; scope = "Maintain the Chia blockchain and its dependencies"; @@ -117,6 +117,7 @@ with lib.maintainers; { gnome = { members = [ + bobby285271 hedning jtojnar dasj19 @@ -214,7 +215,6 @@ with lib.maintainers; { mguentner ekleog ralith - mjlbach dandellion sumnerevans ]; @@ -223,7 +223,7 @@ with lib.maintainers; { openstack = { members = [ - angustrau + emilytrau SuperSandro2000 ]; scope = "Maintain the ecosystem around OpenStack"; @@ -278,6 +278,13 @@ with lib.maintainers; { scope = "Maintain SageMath and the dependencies that are likely to break it."; }; + sphinx = { + members = [ + SuperSandro2000 + ]; + scope = "Maintain Sphinx related packages."; + }; + serokell = { # Verify additions by approval of an already existing member of the team. members = [ diff --git a/nixos/doc/manual/development/activation-script.section.md b/nixos/doc/manual/development/activation-script.section.md new file mode 100644 index 000000000000..df6836624040 --- /dev/null +++ b/nixos/doc/manual/development/activation-script.section.md @@ -0,0 +1,72 @@ +# Activation script {#sec-activation-script} + +The activation script is a bash script called to activate the new +configuration which resides in a NixOS system in `$out/activate`. Since its +contents depend on your system configuration, the contents may differ. +This chapter explains how the script works in general and some common NixOS +snippets. Please be aware that the script is executed on every boot and system +switch, so tasks that can be performed in other places should be performed +there (for example letting a directory of a service be created by systemd using +mechanisms like `StateDirectory`, `CacheDirectory`, ... or if that's not +possible using `preStart` of the service). + +Activation scripts are defined as snippets using +[](#opt-system.activationScripts). They can either be a simple multiline string +or an attribute set that can depend on other snippets. The builder for the +activation script will take these dependencies into account and order the +snippets accordingly. As a simple example: + +```nix +system.activationScripts.my-activation-script = { + deps = [ "etc" ]; + # supportsDryActivation = true; + text = '' + echo "Hallo i bims" + ''; +}; +``` + +This example creates an activation script snippet that is run after the `etc` +snippet. The special variable `supportsDryActivation` can be set so the snippet +is also run when `nixos-rebuild dry-activate` is run. To differentiate between +real and dry activation, the `$NIXOS_ACTION` environment variable can be +read which is set to `dry-activate` when a dry activation is done. + +An activation script can write to special files instructing +`switch-to-configuration` to restart/reload units. The script will take these +requests into account and will incorperate the unit configuration as described +above. This means that the activation script will "fake" a modified unit file +and `switch-to-configuration` will act accordingly. By doing so, configuration +like [systemd.services.\.restartIfChanged](#opt-systemd.services) is +respected. Since the activation script is run **after** services are already +stopped, [systemd.services.\.stopIfChanged](#opt-systemd.services) +cannot be taken into account anymore and the unit is always restarted instead +of being stopped and started afterwards. + +The files that can be written to are `/run/nixos/activation-restart-list` and +`/run/nixos/activation-reload-list` with their respective counterparts for +dry activation being `/run/nixos/dry-activation-restart-list` and +`/run/nixos/dry-activation-reload-list`. Those files can contain +newline-separated lists of unit names where duplicates are being ignored. These +files are not create automatically and activation scripts must take the +possiblility into account that they have to create them first. + +## NixOS snippets {#sec-activation-script-nixos-snippets} + +There are some snippets NixOS enables by default because disabling them would +most likely break you system. This section lists a few of them and what they +do: + +- `binsh` creates `/bin/sh` which points to the runtime shell +- `etc` sets up the contents of `/etc`, this includes systemd units and + excludes `/etc/passwd`, `/etc/group`, and `/etc/shadow` (which are managed by + the `users` snippet) +- `hostname` sets the system's hostname in the kernel (not in `/etc`) +- `modprobe` sets the path to the `modprobe` binary for module auto-loading +- `nix` prepares the nix store and adds a default initial channel +- `specialfs` is responsible for mounting filesystems like `/proc` and `sys` +- `users` creates and removes users and groups by managing `/etc/passwd`, + `/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` diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index 0b2ad60a878b..21286cdbd2b4 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -12,6 +12,7 @@ + diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index fff06e1ea5ba..53ecb9b3a624 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -27,9 +27,10 @@ The function `mkOption` accepts the following arguments. `type` -: The type of the option (see [](#sec-option-types)). It may be - omitted, but that's not advisable since it may lead to errors that - are hard to diagnose. +: The type of the option (see [](#sec-option-types)). This + argument is mandatory for nixpkgs modules. Setting this is highly + recommended for the sake of documentation and type checking. In case it is + not set, a fallback type with unspecified behavior is used. `default` @@ -145,26 +146,26 @@ As an example, we will take the case of display managers. There is a central display manager module for generic display manager options and a module file per display manager backend (sddm, gdm \...). -There are two approach to this module structure: +There are two approaches we could take with this module structure: -- Managing the display managers independently by adding an enable +- Configuring the display managers independently by adding an enable option to every display manager module backend. (NixOS) -- Managing the display managers in the central module by adding an - option to select which display manager backend to use. +- Configuring the display managers in the central module by adding + an option to select which display manager backend to use. Both approaches have problems. Making backends independent can quickly become hard to manage. For -display managers, there can be only one enabled at a time, but the type -system can not enforce this restriction as there is no relation between -each backend `enable` option. As a result, this restriction has to be -done explicitely by adding assertions in each display manager backend -module. +display managers, there can only be one enabled at a time, but the +type system cannot enforce this restriction as there is no relation +between each backend's `enable` option. As a result, this restriction +has to be done explicitly by adding assertions in each display manager +backend module. -On the other hand, managing the display managers backends in the central -module will require to change the central module option every time a new -backend is added or removed. +On the other hand, managing the display manager backends in the +central module will require changing the central module option every +time a new backend is added or removed. By using extensible option types, it is possible to create a placeholder option in the central module @@ -175,7 +176,7 @@ and to extend it in each backend module As a result, `displayManager.enable` option values can be added without changing the main service module file and the type system automatically -enforce that there can only be a single display manager enabled. +enforces that there can only be a single display manager enabled. ::: {#ex-option-declaration-eot-service .example} ::: {.title} diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md index 56ffa8e9d79c..00f1d85bdb61 100644 --- a/nixos/doc/manual/development/option-types.section.md +++ b/nixos/doc/manual/development/option-types.section.md @@ -16,13 +16,14 @@ merging is handled. `types.path` -: A filesystem path, defined as anything that when coerced to a string - starts with a slash. Even if derivations can be considered as path, - the more specific `types.package` should be preferred. +: A filesystem path is anything that starts with a slash when + coerced to a string. Even if derivations can be considered as + paths, the more specific `types.package` should be preferred. `types.package` -: A derivation or a store path. +: A top-level store path. This can be an attribute set pointing + to a store path, like a derivation or a flake input. `types.anything` @@ -63,6 +64,24 @@ merging is handled. ``` ::: +`types.raw` + +: A type which doesn't do any checking, merging or nested evaluation. It + accepts a single arbitrary value that is not recursed into, making it + useful for values coming from outside the module system, such as package + sets or arbitrary data. Options of this type are still evaluated according + to priorities and conditionals, so `mkForce`, `mkIf` and co. still work on + the option value itself, but not for any value nested within it. This type + should only be used when checking, merging and nested evaluation are not + desirable. + +`types.optionType` + +: The type of an option's type. Its merging operation ensures that nested + options have the correct file location annotated, and that if possible, + multiple option definitions are correctly merged together. The main use + case is as the type of the `_module.freeformType` option. + `types.attrs` : A free-form attribute set. diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md index 4c399586eb52..a1431859ff59 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md @@ -5,7 +5,7 @@ when developing or debugging a test: ```ShellSession $ nix-build . -A nixosTests.login.driverInteractive -$ ./result/bin/nixos-test-driver --interactive +$ ./result/bin/nixos-test-driver [...] >>> ``` @@ -28,7 +28,7 @@ You can re-use the VM states coming from a previous run by setting the `--keep-vm-state` flag. ```ShellSession -$ ./result/bin/nixos-test-driver --interactive --keep-vm-state +$ ./result/bin/nixos-test-driver --keep-vm-state ``` The machine state is stored in the `$TMPDIR/vm-state-machinename` diff --git a/nixos/doc/manual/development/running-nixos-tests.section.md b/nixos/doc/manual/development/running-nixos-tests.section.md index d6a456f01883..1bec023b613a 100644 --- a/nixos/doc/manual/development/running-nixos-tests.section.md +++ b/nixos/doc/manual/development/running-nixos-tests.section.md @@ -24,8 +24,8 @@ After building/downloading all required dependencies, this will perform a build that starts a QEMU/KVM virtual machine containing a NixOS system. The virtual machine mounts the Nix store of the host; this makes VM creation very fast, as no disk image needs to be created. Afterwards, -you can view a pretty-printed log of the test: +you can view a log of the test: ```ShellSession -$ firefox result/log.html +$ nix-store --read-log result ``` diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index 58a3d8448af5..f9bb6ff9cc41 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -66,6 +66,45 @@ have a predefined type and string generator already declared under and returning a set with TOML-specific attributes `type` and `generate` as specified [below](#pkgs-formats-result). +`pkgs.formats.elixirConf { elixir ? pkgs.elixir }` + +: A function taking an attribute set with values + + `elixir` + + : The Elixir package which will be used to format the generated output + + It returns a set with Elixir-Config-specific attributes `type`, `lib`, and + `generate` as specified [below](#pkgs-formats-result). + + The `lib` attribute contains functions to be used in settings, for + generating special Elixir values: + + `mkRaw elixirCode` + + : Outputs the given string as raw Elixir code + + `mkGetEnv { envVariable, fallback ? null }` + + : Makes the configuration fetch an environment variable at runtime + + `mkAtom atom` + + : Outputs the given string as an Elixir atom, instead of the default + Elixir binary string. Note: lowercase atoms still needs to be prefixed + with `:` + + `mkTuple array` + + : Outputs the given array as an Elixir tuple, instead of the default + Elixir list + + `mkMap attrset` + + : Outputs the given attribute set as an Elixir map, instead of the + default Elixir keyword list + + ::: {#pkgs-formats-result} These functions all return an attribute set with these values: ::: @@ -74,6 +113,12 @@ These functions all return an attribute set with these values: : A module system type representing a value of the format +`lib` + +: Utility functions for convenience, or special interactions with the format. + This attribute is optional. It may contain inside a `types` attribute + containing types specific to this format. + `generate` *`filename jsonValue`* : A function that can render a value of the format to a file. Returns diff --git a/nixos/doc/manual/development/unit-handling.section.md b/nixos/doc/manual/development/unit-handling.section.md new file mode 100644 index 000000000000..a7ccb3dbd042 --- /dev/null +++ b/nixos/doc/manual/development/unit-handling.section.md @@ -0,0 +1,62 @@ +# Unit handling {#sec-unit-handling} + +To figure out what units need to be started/stopped/restarted/reloaded, the +script first checks the current state of the system, similar to what `systemctl +list-units` shows. For each of the units, the script goes through the following +checks: + +- Is the unit file still in the new system? If not, **stop** the service unless + it sets `X-StopOnRemoval` in the `[Unit]` section to `false`. + +- Is it a `.target` unit? If so, **start** it unless it sets + `RefuseManualStart` in the `[Unit]` section to `true` or `X-OnlyManualStart` + in the `[Unit]` section to `true`. Also **stop** the unit again unless it + sets `X-StopOnReconfiguration` to `false`. + +- Are the contents of the unit files different? They are compared by parsing + them and comparing their contents. If they are different but only + `X-Reload-Triggers` in the `[Unit]` section is changed, **reload** the unit. + The NixOS module system allows setting these triggers with the option + [systemd.services.\.reloadTriggers](#opt-systemd.services). There are + some additional keys in the `[Unit]` section that are ignored as well. If the + unit files differ in any way, the following actions are performed: + + - `.path` and `.slice` units are ignored. There is no need to restart them + since changes in their values are applied by systemd when systemd is + reloaded. + + - `.mount` units are **reload**ed. These mostly come from the `/etc/fstab` + parser. + + - `.socket` units are currently ignored. This is to be fixed at a later + point. + + - The rest of the units (mostly `.service` units) are then **reload**ed if + `X-ReloadIfChanged` in the `[Service]` section is set to `true` (exposed + via [systemd.services.\.reloadIfChanged](#opt-systemd.services)). + A little exception is done for units that were deactivated in the meantime, + for example because they require a unit that got stopped before. These + are **start**ed instead of reloaded. + + - If the reload flag is not set, some more flags decide if the unit is + skipped. These flags are `X-RestartIfChanged` in the `[Service]` section + (exposed via + [systemd.services.\.restartIfChanged](#opt-systemd.services)), + `RefuseManualStop` in the `[Unit]` section, and `X-OnlyManualStart` in the + `[Unit]` section. + + - Further behavior depends on the unit having `X-StopIfChanged` in the + `[Service]` section set to `true` (exposed via + [systemd.services.\.stopIfChanged](#opt-systemd.services)). This is + set to `true` by default and must be explicitly turned off if not wanted. + If the flag is enabled, the unit is **stop**ped and then **start**ed. If + not, the unit is **restart**ed. The goal of the flag is to make sure that + the new unit never runs in the old environment which is still in place + before the activation script is run. This behavior is different when the + service is socket-activated, as outlined in the following steps. + + - The last thing that is taken into account is whether the unit is a service + and socket-activated. If `X-StopIfChanged` is **not** set, the service + is **restart**ed with the others. If it is set, both the service and the + socket are **stop**ped and the socket is **start**ed, leaving socket + activation to start the service when it's needed. diff --git a/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md b/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md new file mode 100644 index 000000000000..aad82831a3c2 --- /dev/null +++ b/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md @@ -0,0 +1,53 @@ +# What happens during a system switch? {#sec-switching-systems} + +Running `nixos-rebuild switch` is one of the more common tasks under NixOS. +This chapter explains some of the internals of this command to make it simpler +for new module developers to configure their units correctly and to make it +easier to understand what is happening and why for curious administrators. + +`nixos-rebuild`, like many deployment solutions, calls `switch-to-configuration` +which resides in a NixOS system at `$out/bin/switch-to-configuration`. The +script is called with the action that is to be performed like `switch`, `test`, +`boot`. There is also the `dry-activate` action which does not really perform +the actions but rather prints what it would do if you called it with `test`. +This feature can be used to check what service states would be changed if the +configuration was switched to. + +If the action is `switch` or `boot`, the bootloader is updated first so the +configuration will be the next one to boot. Unless `NIXOS_NO_SYNC` is set to +`1`, `/nix/store` is synced to disk. + +If the action is `switch` or `test`, the currently running system is inspected +and the actions to switch to the new system are calculated. This process takes +two data sources into account: `/etc/fstab` and the current systemd status. +Mounts and swaps are read from `/etc/fstab` and the corresponding actions are +generated. If a new mount is added, for example, the proper `.mount` unit is +marked to be started. The current systemd state is inspected, the difference +between the current system and the desired configuration is calculated and +actions are generated to get to this state. There are a lot of nuances that can +be controlled by the units which are explained here. + +After calculating what should be done, the actions are carried out. The order +of actions is always the same: +- Stop units (`systemctl stop`) +- Run activation script (`$out/activate`) +- See if the activation script requested more units to restart +- Restart systemd if needed (`systemd daemon-reexec`) +- Forget about the failed state of units (`systemctl reset-failed`) +- Reload systemd (`systemctl daemon-reload`) +- Reload systemd user instances (`systemctl --user daemon-reload`) +- Set up tmpfiles (`systemd-tmpfiles --create`) +- Reload units (`systemctl reload`) +- Restart units (`systemctl restart`) +- Start units (`systemctl start`) +- Inspect what changed during these actions and print units that failed and + that were newly started + +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. + +```{=docbook} + + +``` diff --git a/nixos/doc/manual/development/writing-modules.chapter.md b/nixos/doc/manual/development/writing-modules.chapter.md index 2e3c6b34f1f5..0c41cbd3cb75 100644 --- a/nixos/doc/manual/development/writing-modules.chapter.md +++ b/nixos/doc/manual/development/writing-modules.chapter.md @@ -90,6 +90,17 @@ modules: `systemd.services` (the set of all systemd services) and `systemd.timers` (the list of commands to be executed periodically by `systemd`). +Care must be taken when writing systemd services using `Exec*` directives. By +default systemd performs substitution on `%` specifiers in these +directives, expands environment variables from `$FOO` and `${FOO}`, splits +arguments on whitespace, and splits commands on `;`. All of these must be escaped +to avoid unexpected substitution or splitting when interpolating into an `Exec*` +directive, e.g. when using an `extraArgs` option to pass additional arguments to +the service. The functions `utils.escapeSystemdExecArg` and +`utils.escapeSystemdExecArgs` are provided for this, see [Example: Escaping in +Exec directives](#exec-escaping-example) for an example. When using these +functions system environment substitution should *not* be disabled explicitly. + ::: {#locate-example .example} ::: {.title} **Example: NixOS Module for the "locate" Service** @@ -153,6 +164,37 @@ in { ``` ::: +::: {#exec-escaping-example .example} +::: {.title} +**Example: Escaping in Exec directives** +::: +```nix +{ config, lib, pkgs, utils, ... }: + +with lib; + +let + cfg = config.services.echo; + echoAll = pkgs.writeScript "echo-all" '' + #! ${pkgs.runtimeShell} + for s in "$@"; do + printf '%s\n' "$s" + done + ''; + args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ]; +in { + systemd.services.echo = + { description = "Echo to the journal"; + wantedBy = [ "multi-user.target" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = '' + ${echoAll} ${utils.escapeSystemdExecArgs args} + ''; + }; +} +``` +::: + ```{=docbook} diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md index 7de57d0d2a37..433e1906f775 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -158,6 +158,12 @@ The following methods are available on machine objects: e.g., `send_chars("foobar\n")` will type the string `foobar` followed by the Enter key. +`send_console` + +: Send keys to the kernel console. This allows interaction with the systemd + emergency mode, for example. Takes a string that is sent, e.g., + `send_console("\n\nsystemctl default\n")`. + `execute` : Execute a shell command, returning a list `(status, stdout)`. @@ -272,6 +278,13 @@ The following methods are available on machine objects: Killing the interactive session with `Ctrl-d` or `Ctrl-c` also ends the guest session. +`console_interact` + +: Allows you to directly interact with QEMU's stdin. This should + only be used during test development, not in production tests. + Output from QEMU is only read line-wise. `Ctrl-c` kills QEMU and + `Ctrl-d` closes console and returns to the test runner. + To test user units declared by `systemd.user.services` the optional `user` argument can be used: diff --git a/nixos/doc/manual/from_md/development/activation-script.section.xml b/nixos/doc/manual/from_md/development/activation-script.section.xml new file mode 100644 index 000000000000..0d9e911216ef --- /dev/null +++ b/nixos/doc/manual/from_md/development/activation-script.section.xml @@ -0,0 +1,150 @@ +
+ Activation script + + The activation script is a bash script called to activate the new + configuration which resides in a NixOS system in + $out/activate. Since its contents depend on your + system configuration, the contents may differ. This chapter explains + how the script works in general and some common NixOS snippets. + Please be aware that the script is executed on every boot and system + switch, so tasks that can be performed in other places should be + performed there (for example letting a directory of a service be + created by systemd using mechanisms like + StateDirectory, + CacheDirectory, … or if that’s not possible using + preStart of the service). + + + Activation scripts are defined as snippets using + . They can either be + a simple multiline string or an attribute set that can depend on + other snippets. The builder for the activation script will take + these dependencies into account and order the snippets accordingly. + As a simple example: + + +system.activationScripts.my-activation-script = { + deps = [ "etc" ]; + # supportsDryActivation = true; + text = '' + echo "Hallo i bims" + ''; +}; + + + This example creates an activation script snippet that is run after + the etc snippet. The special variable + supportsDryActivation can be set so the snippet + is also run when nixos-rebuild dry-activate is + run. To differentiate between real and dry activation, the + $NIXOS_ACTION environment variable can be read + which is set to dry-activate when a dry + activation is done. + + + An activation script can write to special files instructing + switch-to-configuration to restart/reload units. + The script will take these requests into account and will + incorperate the unit configuration as described above. This means + that the activation script will fake a modified unit + file and switch-to-configuration will act + accordingly. By doing so, configuration like + systemd.services.<name>.restartIfChanged + is respected. Since the activation script is run + after services are already + stopped, + systemd.services.<name>.stopIfChanged + cannot be taken into account anymore and the unit is always + restarted instead of being stopped and started afterwards. + + + The files that can be written to are + /run/nixos/activation-restart-list and + /run/nixos/activation-reload-list with their + respective counterparts for dry activation being + /run/nixos/dry-activation-restart-list and + /run/nixos/dry-activation-reload-list. Those + files can contain newline-separated lists of unit names where + duplicates are being ignored. These files are not create + automatically and activation scripts must take the possiblility into + account that they have to create them first. + +
+ NixOS snippets + + There are some snippets NixOS enables by default because disabling + them would most likely break you system. This section lists a few + of them and what they do: + + + + + binsh creates /bin/sh + which points to the runtime shell + + + + + etc sets up the contents of + /etc, this includes systemd units and + excludes /etc/passwd, + /etc/group, and + /etc/shadow (which are managed by the + users snippet) + + + + + hostname sets the system’s hostname in the + kernel (not in /etc) + + + + + modprobe sets the path to the + modprobe binary for module auto-loading + + + + + nix prepares the nix store and adds a + default initial channel + + + + + specialfs is responsible for mounting + filesystems like /proc and + sys + + + + + users creates and removes users and groups + by managing /etc/passwd, + /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 + + + +
+
diff --git a/nixos/doc/manual/from_md/development/option-declarations.section.xml b/nixos/doc/manual/from_md/development/option-declarations.section.xml index 0eeffae628e1..0ac5e0eeca2d 100644 --- a/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -38,9 +38,11 @@ options = { The type of the option (see - ). It may be omitted, but - that’s not advisable since it may lead to errors that are hard - to diagnose. + ). This argument is + mandatory for nixpkgs modules. Setting this is highly + recommended for the sake of documentation and type checking. + In case it is not set, a fallback type with unspecified + behavior is used. @@ -215,21 +217,22 @@ lib.mkOption { manager backend (sddm, gdm ...). - There are two approach to this module structure: + There are two approaches we could take with this module + structure: - Managing the display managers independently by adding an - enable option to every display manager module backend. - (NixOS) + Configuring the display managers independently by adding + an enable option to every display manager module + backend. (NixOS) - Managing the display managers in the central module by - adding an option to select which display manager backend - to use. + Configuring the display managers in the central module + by adding an option to select which display manager + backend to use. @@ -238,16 +241,16 @@ lib.mkOption { Making backends independent can quickly become hard to - manage. For display managers, there can be only one enabled - at a time, but the type system can not enforce this - restriction as there is no relation between each backend + manage. For display managers, there can only be one enabled + at a time, but the type system cannot enforce this + restriction as there is no relation between each backend’s enable option. As a result, this - restriction has to be done explicitely by adding assertions + restriction has to be done explicitly by adding assertions in each display manager backend module. - On the other hand, managing the display managers backends in - the central module will require to change the central module + On the other hand, managing the display manager backends in + the central module will require changing the central module option every time a new backend is added or removed. @@ -268,7 +271,7 @@ lib.mkOption { As a result, displayManager.enable option values can be added without changing the main service module - file and the type system automatically enforce that there + file and the type system automatically enforces that there can only be a single display manager enabled. diff --git a/nixos/doc/manual/from_md/development/option-types.section.xml b/nixos/doc/manual/from_md/development/option-types.section.xml index 76ffb6f837c3..444729292702 100644 --- a/nixos/doc/manual/from_md/development/option-types.section.xml +++ b/nixos/doc/manual/from_md/development/option-types.section.xml @@ -30,10 +30,10 @@ - A filesystem path, defined as anything that when coerced to - a string starts with a slash. Even if derivations can be - considered as path, the more specific - types.package should be preferred. + A filesystem path is anything that starts with a slash when + coerced to a string. Even if derivations can be considered + as paths, the more specific types.package + should be preferred. @@ -43,7 +43,9 @@ - A derivation or a store path. + A top-level store path. This can be an attribute set + pointing to a store path, like a derivation or a flake + input. @@ -92,6 +94,39 @@ + + + types.raw + + + + A type which doesn’t do any checking, merging or nested + evaluation. It accepts a single arbitrary value that is not + recursed into, making it useful for values coming from + outside the module system, such as package sets or arbitrary + data. Options of this type are still evaluated according to + priorities and conditionals, so mkForce, + mkIf and co. still work on the option + value itself, but not for any value nested within it. This + type should only be used when checking, merging and nested + evaluation are not desirable. + + + + + + types.optionType + + + + The type of an option’s type. Its merging operation ensures + that nested options have the correct file location + annotated, and that if possible, multiple option definitions + are correctly merged together. The main use case is as the + type of the _module.freeformType option. + + + types.attrs diff --git a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml index 8348ab56deb3..0e47350a0d24 100644 --- a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml +++ b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml @@ -6,7 +6,7 @@ $ nix-build . -A nixosTests.login.driverInteractive -$ ./result/bin/nixos-test-driver --interactive +$ ./result/bin/nixos-test-driver [...] >>> @@ -30,7 +30,7 @@ $ ./result/bin/nixos-test-driver --interactive the --keep-vm-state flag. -$ ./result/bin/nixos-test-driver --interactive --keep-vm-state +$ ./result/bin/nixos-test-driver --keep-vm-state The machine state is stored in the diff --git a/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml index 7159b95b22b0..da2e5076c956 100644 --- a/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml +++ b/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml @@ -26,9 +26,9 @@ machine: QEMU running (pid 8841) perform a build that starts a QEMU/KVM virtual machine containing a NixOS system. The virtual machine mounts the Nix store of the host; this makes VM creation very fast, as no disk image needs to be - created. Afterwards, you can view a pretty-printed log of the test: + created. Afterwards, you can view a log of the test: -$ firefox result/log.html +$ nix-store --read-log result
diff --git a/nixos/doc/manual/from_md/development/settings-options.section.xml b/nixos/doc/manual/from_md/development/settings-options.section.xml index c9430b77579c..746011a2d075 100644 --- a/nixos/doc/manual/from_md/development/settings-options.section.xml +++ b/nixos/doc/manual/from_md/development/settings-options.section.xml @@ -137,6 +137,97 @@ + + + pkgs.formats.elixirConf { elixir ? pkgs.elixir } + + + + A function taking an attribute set with values + + + + + elixir + + + + The Elixir package which will be used to format the + generated output + + + + + + It returns a set with Elixir-Config-specific attributes + type, lib, and + generate as specified + below. + + + The lib attribute contains functions to + be used in settings, for generating special Elixir values: + + + + + mkRaw elixirCode + + + + Outputs the given string as raw Elixir code + + + + + + mkGetEnv { envVariable, fallback ? null } + + + + Makes the configuration fetch an environment variable + at runtime + + + + + + mkAtom atom + + + + Outputs the given string as an Elixir atom, instead of + the default Elixir binary string. Note: lowercase + atoms still needs to be prefixed with + : + + + + + + mkTuple array + + + + Outputs the given array as an Elixir tuple, instead of + the default Elixir list + + + + + + mkMap attrset + + + + Outputs the given attribute set as an Elixir map, + instead of the default Elixir keyword list + + + + + + These functions all return an attribute set with these values: @@ -152,6 +243,19 @@ + + + lib + + + + Utility functions for convenience, or special interactions + with the format. This attribute is optional. It may contain + inside a types attribute containing types + specific to this format. + + + generate diff --git a/nixos/doc/manual/from_md/development/unit-handling.section.xml b/nixos/doc/manual/from_md/development/unit-handling.section.xml new file mode 100644 index 000000000000..4c980e1213a8 --- /dev/null +++ b/nixos/doc/manual/from_md/development/unit-handling.section.xml @@ -0,0 +1,131 @@ +
+ Unit handling + + To figure out what units need to be + started/stopped/restarted/reloaded, the script first checks the + current state of the system, similar to what + systemctl list-units shows. For each of the + units, the script goes through the following checks: + + + + + Is the unit file still in the new system? If not, + stop the service unless it + sets X-StopOnRemoval in the + [Unit] section to false. + + + + + Is it a .target unit? If so, + start it unless it sets + RefuseManualStart in the + [Unit] section to true or + X-OnlyManualStart in the + [Unit] section to true. + Also stop the unit again + unless it sets X-StopOnReconfiguration to + false. + + + + + Are the contents of the unit files different? They are compared + by parsing them and comparing their contents. If they are + different but only X-Reload-Triggers in the + [Unit] section is changed, + reload the unit. The NixOS + module system allows setting these triggers with the option + systemd.services.<name>.reloadTriggers. + There are some additional keys in the [Unit] + section that are ignored as well. If the unit files differ in + any way, the following actions are performed: + + + + + .path and .slice units + are ignored. There is no need to restart them since changes + in their values are applied by systemd when systemd is + reloaded. + + + + + .mount units are + reloaded. These mostly + come from the /etc/fstab parser. + + + + + .socket units are currently ignored. This + is to be fixed at a later point. + + + + + The rest of the units (mostly .service + units) are then reloaded + if X-ReloadIfChanged in the + [Service] section is set to + true (exposed via + systemd.services.<name>.reloadIfChanged). + A little exception is done for units that were deactivated + in the meantime, for example because they require a unit + that got stopped before. These are + started instead of + reloaded. + + + + + If the reload flag is not set, some more flags decide if the + unit is skipped. These flags are + X-RestartIfChanged in the + [Service] section (exposed via + systemd.services.<name>.restartIfChanged), + RefuseManualStop in the + [Unit] section, and + X-OnlyManualStart in the + [Unit] section. + + + + + Further behavior depends on the unit having + X-StopIfChanged in the + [Service] section set to + true (exposed via + systemd.services.<name>.stopIfChanged). + This is set to true by default and must + be explicitly turned off if not wanted. If the flag is + enabled, the unit is + stopped and then + started. If not, the unit + is restarted. The goal of + the flag is to make sure that the new unit never runs in the + old environment which is still in place before the + activation script is run. This behavior is different when + the service is socket-activated, as outlined in the + following steps. + + + + + The last thing that is taken into account is whether the + unit is a service and socket-activated. If + X-StopIfChanged is + not set, the service is + restarted with the + others. If it is set, both the service and the socket are + stopped and the socket is + started, leaving socket + activation to start the service when it’s needed. + + + + + +
diff --git a/nixos/doc/manual/from_md/development/what-happens-during-a-system-switch.chapter.xml b/nixos/doc/manual/from_md/development/what-happens-during-a-system-switch.chapter.xml new file mode 100644 index 000000000000..66ba792ddacb --- /dev/null +++ b/nixos/doc/manual/from_md/development/what-happens-during-a-system-switch.chapter.xml @@ -0,0 +1,122 @@ + + What happens during a system switch? + + Running nixos-rebuild switch is one of the more + common tasks under NixOS. This chapter explains some of the + internals of this command to make it simpler for new module + developers to configure their units correctly and to make it easier + to understand what is happening and why for curious administrators. + + + nixos-rebuild, like many deployment solutions, + calls switch-to-configuration which resides in a + NixOS system at $out/bin/switch-to-configuration. + The script is called with the action that is to be performed like + switch, test, + boot. There is also the + dry-activate action which does not really perform + the actions but rather prints what it would do if you called it with + test. This feature can be used to check what + service states would be changed if the configuration was switched + to. + + + If the action is switch or + boot, the bootloader is updated first so the + configuration will be the next one to boot. Unless + NIXOS_NO_SYNC is set to 1, + /nix/store is synced to disk. + + + If the action is switch or + test, the currently running system is inspected + and the actions to switch to the new system are calculated. This + process takes two data sources into account: + /etc/fstab and the current systemd status. Mounts + and swaps are read from /etc/fstab and the + corresponding actions are generated. If a new mount is added, for + example, the proper .mount unit is marked to be + started. The current systemd state is inspected, the difference + between the current system and the desired configuration is + calculated and actions are generated to get to this state. There are + a lot of nuances that can be controlled by the units which are + explained here. + + + After calculating what should be done, the actions are carried out. + The order of actions is always the same: + + + + + Stop units (systemctl stop) + + + + + Run activation script ($out/activate) + + + + + See if the activation script requested more units to restart + + + + + Restart systemd if needed + (systemd daemon-reexec) + + + + + Forget about the failed state of units + (systemctl reset-failed) + + + + + Reload systemd (systemctl daemon-reload) + + + + + Reload systemd user instances + (systemctl --user daemon-reload) + + + + + Set up tmpfiles (systemd-tmpfiles --create) + + + + + Reload units (systemctl reload) + + + + + Restart units (systemctl restart) + + + + + Start units (systemctl start) + + + + + Inspect what changed during these actions and print units that + failed and that were newly started + + + + + 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. + + + + diff --git a/nixos/doc/manual/from_md/development/writing-modules.chapter.xml b/nixos/doc/manual/from_md/development/writing-modules.chapter.xml index e33c24f4f12c..367731eda090 100644 --- a/nixos/doc/manual/from_md/development/writing-modules.chapter.xml +++ b/nixos/doc/manual/from_md/development/writing-modules.chapter.xml @@ -122,6 +122,25 @@ services) and systemd.timers (the list of commands to be executed periodically by systemd). + + Care must be taken when writing systemd services using + Exec* directives. By default systemd performs + substitution on %<char> specifiers in these + directives, expands environment variables from + $FOO and ${FOO}, splits + arguments on whitespace, and splits commands on + ;. All of these must be escaped to avoid + unexpected substitution or splitting when interpolating into an + Exec* directive, e.g. when using an + extraArgs option to pass additional arguments to + the service. The functions + utils.escapeSystemdExecArg and + utils.escapeSystemdExecArgs are provided for + this, see Example: Escaping in + Exec directives for an example. When using these functions + system environment substitution should not be + disabled explicitly. + Example: NixOS Module for the @@ -183,6 +202,36 @@ in { }; }; } + + + + Example: Escaping in Exec + directives + + +{ config, lib, pkgs, utils, ... }: + +with lib; + +let + cfg = config.services.echo; + echoAll = pkgs.writeScript "echo-all" '' + #! ${pkgs.runtimeShell} + for s in "$@"; do + printf '%s\n' "$s" + done + ''; + args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ]; +in { + systemd.services.echo = + { description = "Echo to the journal"; + wantedBy = [ "multi-user.target" ]; + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = '' + ${echoAll} ${utils.escapeSystemdExecArgs args} + ''; + }; +} diff --git a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml index 45c9c40c6095..4f856f98f2a2 100644 --- a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml +++ b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml @@ -261,6 +261,19 @@ start_all() + + + send_console + + + + Send keys to the kernel console. This allows interaction + with the systemd emergency mode, for example. Takes a string + that is sent, e.g., + send_console("\n\nsystemctl default\n"). + + + execute @@ -502,6 +515,21 @@ machine.systemctl("list-jobs --no-pager", "any-user") # spaw + + + console_interact + + + + Allows you to directly interact with QEMU’s stdin. This + should only be used during test development, not in + production tests. Output from QEMU is only read line-wise. + Ctrl-c kills QEMU and + Ctrl-d closes console and returns to the + test runner. + + + To test user units declared by diff --git a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml b/nixos/doc/manual/from_md/installation/installing-pxe.section.xml index 1dd15ddacba8..94172de65ea0 100644 --- a/nixos/doc/manual/from_md/installation/installing-pxe.section.xml +++ b/nixos/doc/manual/from_md/installation/installing-pxe.section.xml @@ -7,11 +7,11 @@ These instructions assume that you have an existing PXE or iPXE infrastructure and simply want to add the NixOS installer as another - option. To build the necessary files from a recent version of + option. To build the necessary files from your current version of nixpkgs, you can run: -nix-build -A netboot.x86_64-linux nixos/release.nix +nix-build -A netboot.x86_64-linux '<nixpkgs/nixos/release.nix>' This will create a result directory containing: * diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 59da373f38e1..b61a0268dee2 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -26,8 +26,36 @@ - iptables now uses - nf_tables backend. + iptables is now using + nf_tables under the hood, by using + iptables-nft, similar to + Debian + and + Fedora. + This means, ip[6]tables, + arptables and ebtables + commands will actually show rules from some specific tables in + the nf_tables kernel subsystem. In case + you’re migrating from an older release without rebooting, + there might be cases where you end up with iptable rules + configured both in the legacy iptables + kernel backend, as well as in the nf_tables + backend. This can lead to confusing firewall behaviour. An + iptables-save after switching will complain + about iptables-legacy tables present. It’s + probably best to reboot after the upgrade, or manually + removing all legacy iptables rules (via the + iptables-legacy package). + + + + + systemd got an nftables backend, and + configures (networkd) rules in their own + io.systemd.* tables. Check + nft list ruleset to see these rules, not + iptables-save (which only shows + iptables-created rules. @@ -1429,6 +1457,17 @@ Superuser created successfully. knob. + + + /usr will always be included in the initial + ramdisk. See the + fileSystems.<name>.neededForBoot + option. If any files exist under /usr + (which is not typical for NixOS), they will be included in the + initial ramdisk, increasing its size to a possibly problematic + extent. + +
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 436157515ebe..0c5b3b4fec76 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -15,6 +15,14 @@
Highlights + + + The firefox browser on + x86_64-linux is now making use of + profile-guided optimization resulting in a much more + responsive browsing experience. + + security.acme.defaults has been added to @@ -25,6 +33,16 @@ services.nginx.virtualHosts.*.enableACME). + + + GNOME has been upgraded to 42. Please take a look at their + Release + Notes for details. Notably, it replaces gedit with + GNOME Text Editor, GNOME Terminal with GNOME Console (formerly + King’s Cross), and GNOME Screenshot with a tool built into the + Shell. + + PHP 8.1 is now available @@ -42,6 +60,34 @@ upgrade notes. + + + systemd services can now set + systemd.services.<name>.reloadTriggers + instead of reloadIfChanged for a more + granular distinction between reloads and restarts. + + + + + kops + defaults to 1.22.4, which will enable + Instance + Metadata Service Version 2 and require tokens on new + clusters with Kubernetes 1.22. This will increase security by + default, but may break some types of workloads. See the + release + notes for details. + + + + + Module authors can use + mkRenamedOptionModuleWith to automate the + deprecation cycle without annoying out-of-tree module authors + and their users. + +
@@ -79,12 +125,18 @@ services.filebeat. + + + apfs, + a kernel module for mounting the Apple File System (APFS). + + FRRouting, a popular suite of Internet routing protocol daemons (BGP, BFD, - OSPF, IS-IS, VVRP and others). Available as - services.frr + OSPF, IS-IS, VRRP and others). Available as + services.frr @@ -94,6 +146,13 @@ services.heisenbridge. + + + snowflake-proxy, + a system to defeat internet censorship. Available as + services.snowflake-proxy. + + ergochat, a modern @@ -108,6 +167,21 @@ services.powerdns-admin. + + + pgadmin4, + an admin interface for the PostgreSQL database. Available at + services.pgadmin. + + + + + input-remapper, + an easy to use tool to change the mapping of your input device + buttons. Available at + services.input-remapper. + + InvoicePlane, @@ -123,6 +197,15 @@ services.maddy. + + + K40-Whisperer, + a program to control cheap Chinese laser cutters. Available as + programs.k40-whisperer.enable. + Users must add themselves to the k40 group + to be able to access the device. + + mtr-exporter, @@ -130,6 +213,14 @@ services.mtr-exporter. + + + prometheus-pve-exporter, + a tool that exposes information from the Proxmox VE API for + use by Prometheus. Available as + services.prometheus.exporters.pve. + + tetrd, share your @@ -138,6 +229,14 @@ services.tetrd. + + + agate, + a very simple server for the Gemini hypertext protocol. + Available as + services.agate. + + ArchiSteamFarm, @@ -162,6 +261,13 @@ services.baget. + + + moosefs, fault + tolerant petabyte distributed file system. Available as + moosefs. + + prosody-filer, @@ -169,6 +275,38 @@ services.prosody-filer. + + + systembus-notify, + allow system level notifications to reach the users. Available + as + services.systembus-notify. + Please keep in mind that this service should only be enabled + on machines with fully trusted users, as any local user is + able to DoS user sessions by spamming notifications. + + + + + ethercalc, + an online collaborative spreadsheet. Available as + services.ethercalc. + + + + + nbd, a + Network Block Device server. Available as + services.nbd. + + + + + nix-ld, + Run unpatched dynamic binaries on NixOS. Available as + programs.nix-ld. + + timetagger, @@ -185,6 +323,28 @@ services.rstudio-server. + + + headscale, + an Open Source implementation of the + Tailscale + Control Server. Available as + services.headscale + + + + + blocky, + fast and lightweight DNS proxy as ad-blocker for local network + with many features. + + + + + pacemaker + cluster resource manager + +
@@ -211,6 +371,36 @@ haskellPackages.callPackage). + + + pkgs.ghc.withPackages as well as + haskellPackages.ghcWithPackages etc. now + needs be overridden directly, as opposed to overriding the + result of calling it. Additionally, the + withLLVM parameter has been renamed to + useLLVM. So instead of + (ghc.withPackages (p: [])).override { withLLVM = true; }, + one needs to use + (ghc.withPackages.override { useLLVM = true; }) (p: []). + + + + + The home-assistant module now requires + users that don’t want their configuration to be managed + declaratively to set + services.home-assistant.config = null;. + This is required due to the way default settings are handled + with the new settings style. + + + Additionally the default list of + extraComponents now includes the minimal + dependencies to successfully complete the + onboarding + procedure. + + pkgs.emacsPackages.orgPackages is removed @@ -228,6 +418,66 @@ removed due to it being an outdated version. + + + services.kubernetes.scheduler.{port,address} + now set --secure-port and + --bind-address instead of + --port and --address, + since the former have been deprecated and are no longer + functional in kubernetes>=1.23. Ensure that you are not + relying on the insecure behaviour before upgrading. + + + + + services.k3s.enable no longer implies + systemd.enableUnifiedCgroupHierarchy = false, + and will default to the systemd cgroup driver + when using services.k3s.docker = true. This + change may require a reboot to take effect, and k3s may not be + able to run if the boot cgroup hierarchy does not match its + configuration. The previous behavior may be retained by + explicitly setting + systemd.enableUnifiedCgroupHierarchy = false + in your configuration. + + + + + fonts.fonts no longer includes ancient + bitmap fonts when both + config.services.xserver.enable and + config.nixpkgs.config.allowUnfree are + enabled. If you still want these fonts, use: + + +{ + fonts.fonts = [ + pkgs.xorg.fontbhlucidatypewriter100dpi + pkgs.xorg.fontbhlucidatypewriter75dpi + pkgs.xorg.fontbh100dpi + ]; +} + + + + + The DHCP server (services.dhcpd4, + services.dhcpd6) has been hardened. The + service is now using the systemd’s + DynamicUser mechanism to run as an + unprivileged dynamically-allocated user with limited + capabilities. The dhcpd state files are now always stored in + /var/lib/dhcpd{4,6} and the + services.dhcpd4.stateDir and + service.dhcpd6.stateDir options have been + removed. If you were depending on root privileges or + set{uid,gid,cap} binaries in dhcpd shell hooks, you may give + dhcpd more capabilities with e.g. + systemd.services.dhcpd6.serviceConfig.AmbientCapabilities. + + The mailpile email webclient @@ -235,6 +485,138 @@ its reliance on python2. + + + services.ipfs.extraFlags is now escaped + with utils.escapeSystemdExecArgs. If you + rely on systemd interpolating extraFlags in + the service ExecStart, this will no longer + work. + + + + + The matrix-synapse service + (services.matrix-synapse) has been + converted to use the settings option + defined in RFC42. This means that options that are part of + your homeserver.yaml configuration, and + that were specified at the top-level of the module + (services.matrix-synapse) now need to be + moved into + services.matrix-synapse.settings. And while + not all options you may use are defined in there, they are + still supported, because you can set arbitrary values in this + freeform type. + + + The listeners.*.bind_address option was + renamed to bind_addresses in order to match + the upstream homeserver.yaml option name. + It is now also a list of strings instead of a string. + + + An example to make the required migration clearer: + + + Before: + + +{ + services.matrix-synapse = { + enable = true; + + server_name = "example.com"; + public_baseurl = "https://example.com:8448"; + + enable_registration = false; + registration_shared_secret = "xohshaeyui8jic7uutuDogahkee3aehuaf6ei3Xouz4iicie5thie6nohNahceut"; + macaroon_secret_key = "xoo8eder9seivukaiPh1cheikohquuw8Yooreid0The4aifahth3Ou0aiShaiz4l"; + + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + + listeners = [ { + port = 8448; + bind_address = ""; + type = "http"; + tls = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + + }; +} + + + After: + + +{ + services.matrix-synapse = { + enable = true; + + # this attribute set holds all values that go into your homeserver.yaml configuration + # See https://github.com/matrix-org/synapse/blob/develop/docs/sample_config.yaml for + # possible values. + settings = { + server_name = "example.com"; + public_baseurl = "https://example.com:8448"; + + enable_registration = false; + # pass `registration_shared_secret` and `macaroon_secret_key` via `extraConfigFiles` instead + + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + + listeners = [ { + port = 8448; + bind_addresses = [ + "::" + "0.0.0.0" + ]; + type = "http"; + tls = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + }; + + extraConfigFiles = [ + /run/keys/matrix-synapse/secrets.yaml + ]; + }; +} + + + The secrets in your original config should be migrated into a + YAML file that is included via + extraConfigFiles. + + + Additionally a few option defaults have been synced up with + upstream default values, for example the + max_upload_size grew from + 10M to 50M. For the same + reason, the default media_store_path was + changed from ${dataDir}/media to + ${dataDir}/media_store if + system.stateVersion is at least + 22.05. Files will need to be manually moved + to the new location if the stateVersion is + updated. + + The MoinMoin wiki engine @@ -242,6 +624,25 @@ because Python 2 is being retired from nixpkgs. + + + Services in the hadoop module previously + set openFirewall to true by default. This + has now been changed to false. Node definitions for multi-node + clusters would need openFirewall = true; to + be added to to hadoop services when upgrading from NixOS + 21.11. + + + + + services.hadoop.yarn.nodemanager now uses + cgroup-based CPU limit enforcement by default. Additionally, + the option useCGroups was added to + nodemanagers as an easy way to switch back to the old + behavior. + + The wafHook hook now honors @@ -271,6 +672,39 @@ writers.writePyPy2 needs to be used. + + + buildGoModule was updated to use + go_1_17, third party derivations that + specify >= go 1.17 in the main go.mod + will need to regenerate their vendorSha256 + hash. + + + + + The gnome-passwordsafe package updated to + version + 6.x and renamed to gnome-secrets. + + + + + services.gnome.experimental-features.realtime-scheduling + option has been removed, as GNOME Shell now + uses + rtkit. Use + security.rtkit.enable = true; instead. As + before, you will need to have it enabled using GSettings. + + + + + services.telepathy will no longer be + enabled by default for GNOME desktops, one should enable it in + their configs if using Empathy or Polari. + + If you previously used @@ -279,6 +713,15 @@ virtualisation.docker.daemon.settings. + + + Ntopng (services.ntopng) is updated to + 5.2.1 and uses a separate Redis instance if + system.stateVersion is at least + 22.05. Existing setups shouldn’t be + affected. + + The backward compatibility in @@ -301,6 +744,13 @@ support due to python2 deprecation in nixpkgs + + + services.miniflux.adminCredentialFiles is + now required, instead of defaulting to + admin and password. + + The autorestic package has been upgraded @@ -382,6 +832,80 @@ unmaintained + + + pkgs._7zz is now correctly licensed as + LGPL3+ and BSD3 with optional unfree unRAR licensed code + + + + + The vim.customize function produced by + vimUtils.makeCustomizable now has a + slightly different interface: + + + + + The wrapper now includes everything in the given Vim + derivation if name is + "vim" (the default). This + makes the wrapManual argument obsolete, + but this behavior can be overriden by setting the + standalone argument. + + + + + All the executables present in the given derivation (or, + in standalone mode, only the + *vim ones) are wrapped. This makes the + wrapGui argument obsolete. + + + + + The vimExecutableName and + gvimExecutableName arguments were + replaced by a single executableName + argument in which the shell variable + $exe can be used to refer to the + wrapped executable’s name. + + + + + See the comments in + pkgs/applications/editors/vim/plugins/vim-utils.nix + for more details. + + + vimUtils.vimWithRC was removed. You should + instead use customize on a Vim derivation, + which now accepts vimrcFile and + gvimrcFile arguments. + + + + + tilp2 was removed together with its module + + + + + The F-PROT antivirus (fprot package) and + its service module were removed because it reached + end-of-life. + + + + + bird1 and its modules + services.bird as well as + services.bird6 have been removed. Upgrade + to services.bird2. + + The options @@ -394,6 +918,16 @@ true. + + + The miller package has been upgraded from + 5.10.3 to + 6.2.0. + See + What’s + new in Miller 6. + + MultiMC has been replaced with the fork PolyMC due to upstream @@ -410,6 +944,25 @@ ~/.local/share/polymc/polymc.cfg. + + + systemd-nspawn@.service settings have been + reverted to the default systemd behaviour. User namespaces are + now activated by default. If you want to keep running nspawn + containers without user namespaces you need to set + systemd.nspawn.<name>.execConfig.PrivateUsers = false + + + + + The Tor SOCKS proxy is now actually disabled if + services.tor.client.enable is set to + false (the default). If you are using this + functionality but didn’t change the setting or set it to + false, you now need to set it to + true. + + The terraform 0.12 compatibility has been removed and the @@ -428,6 +981,39 @@ directly. + + + The dendrite package has been upgraded from + 0.5.1 to + 0.6.5. + Instances configured with split sqlite databases, which has + been the default in NixOS, require merging of the federation + sender and signing key databases. See upstream + release + notes on version 0.6.0 for details on database changes. + + + + + The existing pkgs.opentelemetry-collector + has been moved to + pkgs.opentelemetry-collector-contrib to + match the actual source being the contrib + edition. pkgs.opentelemetry-collector is + now the actual core release of opentelemetry-collector. If you + use the community contributions you should change the package + you refer to. If you don’t need them update your commands from + otelcontribcol to + otelcorecol and enjoy a 7x smaller binary. + + + + + pkgs.pgadmin now refers to + pkgs.pgadmin4. If you still need pgadmin3, + use pkgs.pgadmin3. + + pkgs.noto-fonts-cjk is now deprecated in @@ -442,14 +1028,111 @@ - The interface that allows activation scripts to restart units - has been reworked. Restarting and reloading is now done by a - single file - /run/nixos/activation-restart-list that - honors restartIfChanged and - reloadIfChanged of the units. + pkgs.epgstation has been upgraded from v1 + to v2, resulting in incompatible changes in the database + scheme and configuration format. + + + Some top-level settings under + services.epgstation + is now deprecated because it was redudant due to the same + options being present in + services.epgstation.settings. + + + + + The option services.epgstation.basicAuth + was removed because basic authentication support was dropped + by upstream. + + + + + The option + services.epgstation.database.passwordFile + no longer has a default value. Make sure to set this option + explicitly before upgrading. Change the database password if + necessary. + + + + + The + services.epgstation.settings + option now expects options for config.yml + in EPGStation v2. + + + + + Existing data for the + services.epgstation + module would have to be backed up prior to the upgrade. To + back up exising data to + /tmp/epgstation.bak, run + sudo -u epgstation epgstation run backup /tmp/epgstation.bak. + To import that data after to the upgrade, run + sudo -u epgstation epgstation run v1migrate /tmp/epgstation.bak + + + + + switch-to-configuration (the script that is + run when running nixos-rebuild switch for + example) has been reworked + + + + + The interface that allows activation scripts to restart + units has been streamlined. Restarting and reloading is + now done by a single file + /run/nixos/activation-restart-list that + honors restartIfChanged and + reloadIfChanged of the units. + + + + + Preferring to reload instead of restarting can still + be achieved using + /run/nixos/activation-reload-list. + + + + + + + The script now uses a proper ini-file parser to parse + systemd units. Some values are now only searched in one + section instead of in the entire unit. This is only + relevant for units that don’t use the NixOS systemd moule. + + + + + RefuseManualStop, + X-OnlyManualStart, + X-StopOnRemoval, + X-StopOnReconfiguration are only + searched in the [Unit] section + + + + + X-ReloadIfChanged, + X-RestartIfChanged, + X-StopIfChanged are only searched + in the [Service] section + + + + + + The services.bookstack.cacheDir option has @@ -479,6 +1162,97 @@ wrapper for assert conditions. + + + The vpnc package has been changed to use + GnuTLS instead of OpenSSL by default for licensing reasons. + + + + + pkgs.vimPlugins.onedark-nvim now refers to + navarasu/onedark.nvim + (formerly refers to + olimorris/onedarkpro.nvim). + + + + + services.pipewire.enable will default to + enabling the WirePlumber session manager instead of + pipewire-media-session. pipewire-media-session is deprecated + by upstream and not recommended, but can still be manually + enabled by setting + services.pipewire.media-session.enable to + true and + services.pipewire.wireplumber.enable to + false. + + + + + pkgs.makeDesktopItem has been refactored to + provide a more idiomatic API. Specifically: + + + + + All valid options as of FDO Desktop Entry specification + version 1.4 can now be passed in as explicit arguments + + + + + exec can now be null, for entries that + are not of type Application + + + + + mimeType argument is renamed to + mimeTypes for consistency + + + + + mimeTypes, + categories, + implements, + keywords, onlyShowIn + and notShowIn take lists of strings + instead of one string with semicolon separators + + + + + extraDesktopEntries renamed to + extraConfig for consistency + + + + + Actions should now be provided as an attrset + actions, the Actions + line will be autogenerated. + + + + + extraEntries is removed. + + + + + Additional validation is added both at eval time and at + build time. + + + + + See the vscode package for a more detailed + example. + +
@@ -531,6 +1305,30 @@ was added. + + + The configuration portion of the nix-daemon + module has been reworked and exposed as + nix.settings: + + + + + Legacy options have been mapped to the corresponding + options under under + nix.settings + and will be deprecated when NixOS 21.11 reaches end of + life. + + + + + nix.buildMachines.publicHostKey + has been added. + + + + The @@ -541,6 +1339,46 @@ using the PyPy interpreter were added. + + + Some improvements have been made to the + hadoop module: + + + + + A gatewayRole option has been added, + for deploying hadoop cluster configuration files to a node + that does not have any active services + + + + + Support for older versions of hadoop have been added to + the module + + + + + Overriding and extending site XML files has been made + easier + + + + + + + If you are using Wayland you can choose to use the Ozone + Wayland support in Chrome and several Electron apps by setting + the environment variable NIXOS_OZONE_WL=1 + (for example via + environment.sessionVariables.NIXOS_OZONE_WL = "1"). + This is not enabled by default because Ozone Wayland is still + under heavy development and behavior is not always flawless. + Furthermore, not all Electron apps use the latest Electron + versions. + + The influxdb2 package was split into @@ -551,6 +1389,20 @@ compatibilty, but will be removed at a later date. + + + The unifi package was switched from + unifi6 to unifi7. Direct + downgrades from Unifi 7 to Unifi 6 are not possible and + require restoring from a backup made by Unifi 6. + + + + + programs.zsh.autosuggestions.strategy now + takes a list of strings instead of a string. + + The services.unifi.openPorts option default @@ -559,6 +1411,15 @@ using this default will print a warning when rebuilt. + + + The services.unifi-video.openPorts option + default value of true is now deprecated and + will be changed to false in 22.11. + Configurations using this default will print a warning when + rebuilt. + + security.acme certificates will now @@ -622,12 +1483,65 @@ - A new option - boot.initrd.extraModprobeConfig has been - added which can be used to configure kernel modules that are - loaded in the initrd. + The options boot.extraModprobeConfig and + boot.blacklistedKernelModules now also take + effect in the initrd by copying the file + /etc/modprobe.d/nixos.conf into the initrd. + + + nixos-generate-config now puts the dhcp + configuration in hardware-configuration.nix + instead of configuration.nix. + + + + + ORY Kratos was updated to version 0.8.3-alpha.1.pre.0, which + introduces some breaking changes: + + + + + If you are relying on the SQLite images, update your + Docker Pull commands as follows: + + + + + docker pull oryd/kratos:{version} + + + + + + + Additionally, all passwords now have to be at least 8 + characters long. + + + + + For more details, see: + + + + + Release + Notes for v0.8.1-alpha-1 + + + + + Release + Notes for v0.8.2-alpha-1 + + + + + + fetchFromSourcehut now allows fetching @@ -637,6 +1551,16 @@ true. + + + The element-desktop package now has an + useKeytar option (defaults to + true), which allows disabling + keytar and in turn + libsecret usage (which binds to native + credential managers / keychain libraries). + + The option services.thelounge.plugins has @@ -646,12 +1570,29 @@ pkgs.theLoungePlugins.themes. + + + The option + services.xserver.videoDriver = [ "nvidia" ]; + will now also install + nvidia + VA-API drivers by default. + + The firmwareLinuxNonfree package has been renamed to linux-firmware. + + + It is now possible to specify wordlists to include as handy to + access environment variables using the + config.environment.wordlist configuration + options. + + The services.mbpfan module was converted to @@ -660,6 +1601,14 @@ 0042 configuration. + + + The default value for + programs.spacefm.settings.graphical_su got + unset. It previously pointed to gksu which + has been removed. + + A new module was added for the @@ -669,6 +1618,12 @@ programs.starship.settings. + + + The Dino XMPP client + was updated to 0.3, adding support for audio and video calls. + + services.mattermost.plugins has been added @@ -676,6 +1631,13 @@ Plugins are automatically repackaged using autoPatchelf. + + + services.logrotate.enable now defaults to + true if any rotate path has been defined, and some paths have + been added by default. + + The zrepl package has been updated from @@ -712,6 +1674,96 @@ warning. + + + services.autorandr now allows for adding + hooks and profiles declaratively. + + + + + The pomerium-cli command has been moved out + of the pomerium package into the + pomerium-cli package, following upstream’s + repository split. If you are using the + pomerium-cli command, you should now + install the pomerium-cli package. + + + + + The option + services.networking.networkmanager.enableFccUnlock + was added to support FCC unlock procedures. Since release + 1.18.4, the ModemManager daemon no longer automatically + performs the FCC unlock procedure by default. See + the + docs for more details. + + + + + programs.tmux has a new option + plugins that accepts a list of packages + from the tmuxPlugins group. The specified + packages are added to the system and loaded by + tmux. + + + + + The polkit service, available at + security.polkit.enable, is now disabled by + default. It will automatically be enabled through services and + desktop environments as needed. + + + + + The hadoop package has added support for + aarch64-linux and + aarch64-darwin as of 3.3.1 + (#158613). + + + + + The R package now builds again on + aarch64-darwin + (#158992). + + + + + The spark3 package has been updated from + 3.1.2 to 3.2.1 + (#160075): + + + + + Testing has been enabled for + aarch64-linux in addition to + x86_64-linux. + + + + + The spark3 package is now usable on + aarch64-darwin as a result of + #158613 + and + #158992. + + + + + + + The programs.nncp options were added for + generating host-global NNCP configuration. + +
diff --git a/nixos/doc/manual/installation/installing-pxe.section.md b/nixos/doc/manual/installation/installing-pxe.section.md index 2016a258251f..4fbd6525f8c3 100644 --- a/nixos/doc/manual/installation/installing-pxe.section.md +++ b/nixos/doc/manual/installation/installing-pxe.section.md @@ -5,11 +5,11 @@ setup. These instructions assume that you have an existing PXE or iPXE infrastructure and simply want to add the NixOS installer as another -option. To build the necessary files from a recent version of nixpkgs, +option. To build the necessary files from your current version of nixpkgs, you can run: ```ShellSession -nix-build -A netboot.x86_64-linux nixos/release.nix +nix-build -A netboot.x86_64-linux '' ``` This will create a `result` directory containing: \* `bzImage` -- the diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 6c7fc57f8d83..b2ca9f457a2b 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -91,6 +91,10 @@ flake-uri + + + + input-name flake-uri @@ -453,7 +457,7 @@ Allow ad-hoc remote builders for building the new system. This requires the user executing nixos-rebuild (usually root) to be configured as a trusted user in the Nix daemon. This can be achieved by - using the nix.trustedUsers NixOS option. Examples + using the nix.settings.trusted-users NixOS option. Examples values for that option are described in the Remote builds chapter in the Nix manual, (i.e. --builders "ssh://bigbrother x86_64-linux"). By specifying an empty string @@ -594,6 +598,20 @@ + + + + + + + Do not imply if + /etc/nixos/flake.nix exists. With this + option, it is possible to build non-flake NixOS configurations + even if the current NixOS systems uses flakes. + + + + diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index 74ca57850ea5..216fea677757 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -8,6 +8,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. + diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 1b59842e020b..310d32cfdd72 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -8,7 +8,22 @@ In addition to numerous new and upgraded packages, this release has the followin - Nix has been updated to version 2.4, reference its [release notes](https://discourse.nixos.org/t/nix-2-4-released/15822) for more information on what has changed. The previous version of Nix, 2.3.16, remains available for the time being in the `nix_2_3` package. -- `iptables` now uses `nf_tables` backend. +- `iptables` is now using `nf_tables` under the hood, by using `iptables-nft`, + similar to [Debian](https://wiki.debian.org/nftables#Current_status) and + [Fedora](https://fedoraproject.org/wiki/Changes/iptables-nft-default). + This means, `ip[6]tables`, `arptables` and `ebtables` commands will actually + show rules from some specific tables in the `nf_tables` kernel subsystem. + In case you're migrating from an older release without rebooting, there might + be cases where you end up with iptable rules configured both in the legacy + `iptables` kernel backend, as well as in the `nf_tables` backend. + This can lead to confusing firewall behaviour. An `iptables-save` after + switching will complain about "iptables-legacy tables present". + It's probably best to reboot after the upgrade, or manually removing all + legacy iptables rules (via the `iptables-legacy` package). + +- systemd got an `nftables` backend, and configures (networkd) rules in their + own `io.systemd.*` tables. Check `nft list ruleset` to see these rules, not + `iptables-save` (which only shows `iptables`-created rules. - PHP now defaults to PHP 8.0, updated from 7.4. @@ -419,6 +434,9 @@ In addition to numerous new and upgraded packages, this release has the followin - The Linux kernel for security reasons now restricts access to BPF syscalls via `BPF_UNPRIV_DEFAULT_OFF=y`. Unprivileged access can be reenabled via the `kernel.unprivileged_bpf_disabled` sysctl knob. +- `/usr` will always be included in the initial ramdisk. See the `fileSystems..neededForBoot` option. + If any files exist under `/usr` (which is not typical for NixOS), they will be included in the initial ramdisk, increasing its size to a possibly problematic extent. + ## Other Notable Changes {#sec-release-21.11-notable-changes} diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 9d919711cb7f..7cafdcabbaaf 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -6,17 +6,29 @@ In addition to numerous new and upgraded packages, this release has the followin ## Highlights {#sec-release-22.05-highlights} +- The `firefox` browser on `x86_64-linux` is now making use of + profile-guided optimization resulting in a much more responsive + browsing experience. + - `security.acme.defaults` has been added to simplify configuring settings for many certificates at once. This also opens up the the option to use DNS-01 validation when using `enableACME` on web server virtual hosts (e.g. `services.nginx.virtualHosts.*.enableACME`). +- GNOME has been upgraded to 42. Please take a look at their [Release Notes](https://release.gnome.org/42/) for details. Notably, it replaces gedit with GNOME Text Editor, GNOME Terminal with GNOME Console (formerly King’s Cross), and GNOME Screenshot with a tool built into the Shell. + - PHP 8.1 is now available - Mattermost has been updated to extended support release 6.3, as the previously packaged extended support release 5.37 is [reaching its end of life](https://docs.mattermost.com/upgrade/extended-support-release.html). Migrations may take a while, see the [changelog](https://docs.mattermost.com/install/self-managed-changelog.html#release-v6-3-extended-support-release) and [important upgrade notes](https://docs.mattermost.com/upgrade/important-upgrade-notes.html). +- systemd services can now set [systemd.services.\.reloadTriggers](#opt-systemd.services) instead of `reloadIfChanged` for a more granular distinction between reloads and restarts. + +- [`kops`](https://kops.sigs.k8s.io) defaults to 1.22.4, which will enable [Instance Metadata Service Version 2](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html) and require tokens on new clusters with Kubernetes 1.22. This will increase security by default, but may break some types of workloads. See the [release notes](https://kops.sigs.k8s.io/releases/1.22-notes/) for details. + +- Module authors can use `mkRenamedOptionModuleWith` to automate the deprecation cycle without annoying out-of-tree module authors and their users. + ## New Services {#sec-release-22.05-new-services} - [aesmd](https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw), the Intel SGX Architectural Enclave Service Manager. Available as [services.aesmd](#opt-services.aesmd.enable). @@ -27,40 +39,72 @@ In addition to numerous new and upgraded packages, this release has the followin - [filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html), a lightweight shipper for forwarding and centralizing log data. Available as [services.filebeat](#opt-services.filebeat.enable). -- [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as [services.frr](#opt-services.ffr.babel.enable) +- [apfs](https://github.com/linux-apfs/linux-apfs-rw), a kernel module for mounting the Apple File System (APFS). + +- [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VRRP and others). Available as [services.frr](#opt-services.frr.babel.enable) - [heisenbridge](https://github.com/hifi/heisenbridge), a bouncer-style Matrix IRC bridge. Available as [services.heisenbridge](options.html#opt-services.heisenbridge.enable). +- [snowflake-proxy](https://snowflake.torproject.org/), a system to defeat internet censorship. Available as [services.snowflake-proxy](options.html#opt-services.snowflake-proxy.enable). + - [ergochat](https://ergo.chat), a modern IRC with IRCv3 features. Available as [services.ergochat](options.html#opt-services.ergochat.enable). - [PowerDNS-Admin](https://github.com/ngoduykhanh/PowerDNS-Admin), a web interface for the PowerDNS server. Available at [services.powerdns-admin](options.html#opt-services.powerdns-admin.enable). +- [pgadmin4](https://github.com/postgres/pgadmin4), an admin interface for the PostgreSQL database. Available at [services.pgadmin](options.html#opt-services.pgadmin.enable). + +- [input-remapper](https://github.com/sezanzeb/input-remapper), an easy to use tool to change the mapping of your input device buttons. Available at [services.input-remapper](options.html#opt-services.input-remapper.enable). + - [InvoicePlane](https://invoiceplane.com), web application for managing and creating invoices. Available at [services.invoiceplane](options.html#opt-services.invoiceplane.enable). - [maddy](https://maddy.email), a composable all-in-one mail server. Available as [services.maddy](options.html#opt-services.maddy.enable). +- [K40-Whisperer](https://www.scorchworks.com/K40whisperer/k40whisperer.html), a program to control cheap Chinese laser cutters. Available as [programs.k40-whisperer.enable](options.html#opt-programs.k4-whisperer.enable). Users must add themselves to the `k40` group to be able to access the device. + - [mtr-exporter](https://github.com/mgumz/mtr-exporter), a Prometheus exporter for mtr metrics. Available as [services.mtr-exporter](options.html#opt-services.mtr-exporter.enable). +- [prometheus-pve-exporter](https://github.com/prometheus-pve/prometheus-pve-exporter), a tool that exposes information from the Proxmox VE API for use by Prometheus. Available as [services.prometheus.exporters.pve](options.html#opt-services.prometheus.exporters.pve). + - [tetrd](https://tetrd.app), share your internet connection from your device to your PC and vice versa through a USB cable. Available at [services.tetrd](#opt-services.tetrd.enable). +- [agate](https://github.com/mbrubeck/agate), a very simple server for the Gemini hypertext protocol. Available as [services.agate](options.html#opt-services.agate.enable). + - [ArchiSteamFarm](https://github.com/JustArchiNET/ArchiSteamFarm), a C# application with primary purpose of idling Steam cards from multiple accounts simultaneously. Available as [services.archisteamfarm](options.html#opt-services.archisteamfarm.enable). - [teleport](https://goteleport.com), allows engineers and security professionals to unify access for SSH servers, Kubernetes clusters, web applications, and databases across all environments. Available at [services.teleport](#opt-services.teleport.enable). - [BaGet](https://loic-sharma.github.io/BaGet/), a lightweight NuGet and symbol server. Available at [services.baget](#opt-services.baget.enable). +- [moosefs](https://moosefs.com), fault tolerant petabyte distributed file system. + Available as [moosefs](#opt-services.moosefs.client.enable). + - [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable). +- [systembus-notify](https://github.com/rfjakob/systembus-notify), allow system level notifications to reach the users. Available as [services.systembus-notify](opt-services.systembus-notify.enable). Please keep in mind that this service should only be enabled on machines with fully trusted users, as any local user is able to DoS user sessions by spamming notifications. + +- [ethercalc](https://github.com/audreyt/ethercalc), an online collaborative + spreadsheet. Available as [services.ethercalc](options.html#opt-services.ethercalc.enable). + +- [nbd](https://nbd.sourceforge.io/), a Network Block Device server. Available as [services.nbd](options.html#opt-services.nbd.server.enable). + +- [nix-ld](https://github.com/Mic92/nix-ld), Run unpatched dynamic binaries on NixOS. Available as [programs.nix-ld](options.html#opt-programs.nix-ld.enable). + - [timetagger](https://timetagger.app), an open source time-tracker with an intuitive user experience and powerful reporting. [services.timetagger](options.html#opt-services.timetagger.enable). - [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](options.html#opt-services.rstudio-server.enable). +- [headscale](https://github.com/juanfont/headscale), an Open Source implementation of the [Tailscale](https://tailscale.io) Control Server. Available as [services.headscale](options.html#opt-services.headscale.enable) + +- [blocky](https://0xerr0r.github.io/blocky/), fast and lightweight DNS proxy as ad-blocker for local network with many features. + +- [pacemaker](https://clusterlabs.org/pacemaker/) cluster resource manager + ## Backward Incompatibilities {#sec-release-22.05-incompatibilities} - `pkgs.ghc` now refers to `pkgs.targetPackages.haskellPackages.ghc`. - This *only* makes a difference if you are cross-compiling and will + This _only_ makes a difference if you are cross-compiling and will ensure that `pkgs.ghc` always runs on the host platform and compiles for the target platform (similar to `pkgs.gcc` for example). `haskellPackages.ghc` still behaves as before, running on the build @@ -71,6 +115,21 @@ In addition to numerous new and upgraded packages, this release has the followin instead to ensure cross compilation keeps working (or switch to `haskellPackages.callPackage`). +- `pkgs.ghc.withPackages` as well as `haskellPackages.ghcWithPackages` etc. + now needs be overridden directly, as opposed to overriding the result of + calling it. Additionally, the `withLLVM` parameter has been renamed to + `useLLVM`. So instead of `(ghc.withPackages (p: [])).override { withLLVM = true; }`, + one needs to use `(ghc.withPackages.override { useLLVM = true; }) (p: [])`. + +- The `home-assistant` module now requires users that don't want their + configuration to be managed declaratively to set + `services.home-assistant.config = null;`. This is required + due to the way default settings are handled with the new settings style. + + Additionally the default list of `extraComponents` now includes the minimal + dependencies to successfully complete the [onboarding](https://www.home-assistant.io/getting-started/onboarding/) + procedure. + - `pkgs.emacsPackages.orgPackages` is removed because org elpa is deprecated. The packages in the top level of `pkgs.emacsPackages`, such as org and org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and @@ -78,10 +137,138 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.kubernetes.addons.dashboard` was removed due to it being an outdated version. +- `services.kubernetes.scheduler.{port,address}` now set `--secure-port` and `--bind-address` instead of `--port` and `--address`, since the former have been deprecated and are no longer functional in kubernetes>=1.23. Ensure that you are not relying on the insecure behaviour before upgrading. + +- `services.k3s.enable` no longer implies `systemd.enableUnifiedCgroupHierarchy = false`, and will default to the 'systemd' cgroup driver when using `services.k3s.docker = true`. + This change may require a reboot to take effect, and k3s may not be able to run if the boot cgroup hierarchy does not match its configuration. + The previous behavior may be retained by explicitly setting `systemd.enableUnifiedCgroupHierarchy = false` in your configuration. + +- `fonts.fonts` no longer includes ancient bitmap fonts when both `config.services.xserver.enable` and `config.nixpkgs.config.allowUnfree` are enabled. + If you still want these fonts, use: + + ```nix + { + fonts.fonts = [ + pkgs.xorg.fontbhlucidatypewriter100dpi + pkgs.xorg.fontbhlucidatypewriter75dpi + pkgs.xorg.fontbh100dpi + ]; + } + ``` + +- The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened. + The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities. + The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed. + If you were depending on root privileges or set{uid,gid,cap} binaries in dhcpd shell hooks, you may give dhcpd more capabilities with e.g. `systemd.services.dhcpd6.serviceConfig.AmbientCapabilities`. + - The `mailpile` email webclient (`services.mailpile`) has been removed due to its reliance on python2. +- `services.ipfs.extraFlags` is now escaped with `utils.escapeSystemdExecArgs`. If you rely on systemd interpolating `extraFlags` in the service `ExecStart`, this will no longer work. + +- The `matrix-synapse` service (`services.matrix-synapse`) has been converted to use the `settings` option defined in RFC42. + This means that options that are part of your `homeserver.yaml` configuration, and that were specified at the top-level of the + module (`services.matrix-synapse`) now need to be moved into `services.matrix-synapse.settings`. And while not all options you + may use are defined in there, they are still supported, because you can set arbitrary values in this freeform type. + + The `listeners.*.bind_address` option was renamed to `bind_addresses` in order to match the upstream `homeserver.yaml` option + name. It is now also a list of strings instead of a string. + + An example to make the required migration clearer: + + Before: + ```nix + { + services.matrix-synapse = { + enable = true; + + server_name = "example.com"; + public_baseurl = "https://example.com:8448"; + + enable_registration = false; + registration_shared_secret = "xohshaeyui8jic7uutuDogahkee3aehuaf6ei3Xouz4iicie5thie6nohNahceut"; + macaroon_secret_key = "xoo8eder9seivukaiPh1cheikohquuw8Yooreid0The4aifahth3Ou0aiShaiz4l"; + + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + + listeners = [ { + port = 8448; + bind_address = ""; + type = "http"; + tls = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + + }; + } + ``` + + After: + ```nix + { + services.matrix-synapse = { + enable = true; + + # this attribute set holds all values that go into your homeserver.yaml configuration + # See https://github.com/matrix-org/synapse/blob/develop/docs/sample_config.yaml for + # possible values. + settings = { + server_name = "example.com"; + public_baseurl = "https://example.com:8448"; + + enable_registration = false; + # pass `registration_shared_secret` and `macaroon_secret_key` via `extraConfigFiles` instead + + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + tls_certificate_path = "/var/lib/acme/example.com/fullchain.pem"; + + listeners = [ { + port = 8448; + bind_addresses = [ + "::" + "0.0.0.0" + ]; + type = "http"; + tls = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + }; + + extraConfigFiles = [ + /run/keys/matrix-synapse/secrets.yaml + ]; + }; + } + ``` + + The secrets in your original config should be migrated into a YAML file that is included via `extraConfigFiles`. + + Additionally a few option defaults have been synced up with upstream default values, for example the `max_upload_size` grew from `10M` to `50M`. For the same reason, the default + `media_store_path` was changed from `${dataDir}/media` to `${dataDir}/media_store` if `system.stateVersion` is at least `22.05`. Files will need to be manually moved to the new + location if the `stateVersion` is updated. + - The MoinMoin wiki engine (`services.moinmoin`) has been removed, because Python 2 is being retired from nixpkgs. +- Services in the `hadoop` module previously set `openFirewall` to true by default. + This has now been changed to false. Node definitions for multi-node clusters would need + `openFirewall = true;` to be added to to hadoop services when upgrading from NixOS 21.11. + +- `services.hadoop.yarn.nodemanager` now uses cgroup-based CPU limit enforcement by default. + Additionally, the option `useCGroups` was added to nodemanagers as an easy way to switch + back to the old behavior. + - The `wafHook` hook now honors `NIX_BUILD_CORES` when `enableParallelBuilding` is not set explicitly. Packages can restore the old behaviour by setting `enableParallelBuilding=false`. - `pkgs.claws-mail-gtk2`, representing Claws Mail's older release version three, was removed in order to get rid of Python 2. @@ -90,8 +277,18 @@ In addition to numerous new and upgraded packages, this release has the followin - The `writers.writePython2` and corresponding `writers.writePython2Bin` convenience functions to create executable Python 2 scripts in the store were removed in preparation of removal of the Python 2 interpreter. Scripts have to be converted to Python 3 for use with `writers.writePython3` or `writers.writePyPy2` needs to be used. +- `buildGoModule` was updated to use `go_1_17`, third party derivations that specify >= go 1.17 in the main `go.mod` will need to regenerate their `vendorSha256` hash. + +- The `gnome-passwordsafe` package updated to [version 6.x](https://gitlab.gnome.org/World/secrets/-/tags/6.0) and renamed to `gnome-secrets`. + +- `services.gnome.experimental-features.realtime-scheduling` option has been removed, as GNOME Shell now [uses rtkit](https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2060). Use `security.rtkit.enable = true;` instead. As before, you will need to have it enabled using GSettings. + +- `services.telepathy` will no longer be enabled by default for GNOME desktops, one should enable it in their configs if using Empathy or Polari. + - If you previously used `/etc/docker/daemon.json`, you need to incorporate the changes into the new option `virtualisation.docker.daemon.settings`. +- Ntopng (`services.ntopng`) is updated to 5.2.1 and uses a separate Redis instance if `system.stateVersion` is at least `22.05`. Existing setups shouldn't be affected. + - The backward compatibility in `services.wordpress` to configure sites with the old interface has been removed. Please use `services.wordpress.sites` instead. @@ -101,6 +298,8 @@ In addition to numerous new and upgraded packages, this release has the followin - opensmtpd-extras is no longer build with python2 scripting support due to python2 deprecation in nixpkgs +- `services.miniflux.adminCredentialFiles` is now required, instead of defaulting to `admin` and `password`. + - The `autorestic` package has been upgraded from 1.3.0 to 1.5.0 which introduces breaking changes in config file, check [their migration guide](https://autorestic.vercel.app/migration/1.4_1.5) for more details. - For `pkgs.python3.pkgs.ipython`, its direct dependency `pkgs.python3.pkgs.matplotlib-inline` @@ -126,22 +325,93 @@ In addition to numerous new and upgraded packages, this release has the followin - `pkgs.docbookrx` was removed since it's unmaintained +- `pkgs._7zz` is now correctly licensed as LGPL3+ and BSD3 with optional unfree unRAR licensed code + +- The `vim.customize` function produced by `vimUtils.makeCustomizable` now has a slightly different interface: + * The wrapper now includes everything in the given Vim derivation if `name` is `"vim"` (the default). This makes the `wrapManual` argument obsolete, but this behavior can be overriden by setting the `standalone` argument. + * All the executables present in the given derivation (or, in `standalone` mode, only the `*vim` ones) are wrapped. This makes the `wrapGui` argument obsolete. + * The `vimExecutableName` and `gvimExecutableName` arguments were replaced by a single `executableName` argument in which the shell variable `$exe` can be used to refer to the wrapped executable's name. + + See the comments in `pkgs/applications/editors/vim/plugins/vim-utils.nix` for more details. + + `vimUtils.vimWithRC` was removed. You should instead use `customize` on a Vim derivation, which now accepts `vimrcFile` and `gvimrcFile` arguments. + +- `tilp2` was removed together with its module + +- The F-PROT antivirus (`fprot` package) and its service module were removed because it + reached [end-of-life](https://kb.cyren.com/av-support/index.php?/Knowledgebase/Article/View/434/0/end-of-sale--end-of-life-for-f-prot-and-csam). + +- `bird1` and its modules `services.bird` as well as `services.bird6` have been removed. Upgrade to `services.bird2`. + - The options `networking.interfaces..ipv4.routes` and `networking.interfaces..ipv6.routes` are no longer ignored when using networkd instead of the default scripted network backend by setting `networking.useNetworkd` to `true`. +- The `miller` package has been upgraded from 5.10.3 to [6.2.0](https://github.com/johnkerl/miller/releases/tag/v6.2.0). See [What's new in Miller 6](https://miller.readthedocs.io/en/latest/new-in-miller-6). + - MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`. +- `systemd-nspawn@.service` settings have been reverted to the default systemd behaviour. User namespaces are now activated by default. If you want to keep running nspawn containers without user namespaces you need to set `systemd.nspawn..execConfig.PrivateUsers = false` + +- The Tor SOCKS proxy is now actually disabled if `services.tor.client.enable` is set to `false` (the default). If you are using this functionality but didn't change the setting or set it to `false`, you now need to set it to `true`. + - The terraform 0.12 compatibility has been removed and the `terraform.withPlugins` and `terraform-providers.mkProvider` implementations simplified. Providers now need to be stored under `$out/libexec/terraform-providers/////_/terraform-provider-_v` (which mkProvider does). This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly. +- The `dendrite` package has been upgraded from 0.5.1 to + [0.6.5](https://github.com/matrix-org/dendrite/releases/tag/v0.6.5). Instances + configured with split sqlite databases, which has been the default + in NixOS, require merging of the federation sender and signing key + databases. See upstream [release + notes](https://github.com/matrix-org/dendrite/releases/tag/v0.6.0) + on version 0.6.0 for details on database changes. + +- The existing `pkgs.opentelemetry-collector` has been moved to + `pkgs.opentelemetry-collector-contrib` to match the actual source being the + "contrib" edition. `pkgs.opentelemetry-collector` is now the actual core + release of opentelemetry-collector. If you use the community contributions + you should change the package you refer to. If you don't need them update your + commands from `otelcontribcol` to `otelcorecol` and enjoy a 7x smaller binary. + +- `pkgs.pgadmin` now refers to `pkgs.pgadmin4`. + If you still need pgadmin3, use `pkgs.pgadmin3`. + - `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans` and `pkgs.noto-fonts-cjk-serif` because they each have different release schedules. To maintain compatibility with prior releases of Nixpkgs, `pkgs.noto-fonts-cjk` is currently an alias of `pkgs.noto-fonts-cjk-sans` and doesn't include serif fonts. -- The interface that allows activation scripts to restart units has been reworked. Restarting and reloading is now done by a single file `/run/nixos/activation-restart-list` that honors `restartIfChanged` and `reloadIfChanged` of the units. +- `pkgs.epgstation` has been upgraded from v1 to v2, resulting in incompatible + changes in the database scheme and configuration format. + +- Some top-level settings under [services.epgstation](#opt-services.epgstation.enable) + is now deprecated because it was redudant due to the same options being + present in [services.epgstation.settings](#opt-services.epgstation.settings). + +- The option `services.epgstation.basicAuth` was removed because basic + authentication support was dropped by upstream. + +- The option [services.epgstation.database.passwordFile](#opt-services.epgstation.database.passwordFile) + no longer has a default value. Make sure to set this option explicitly before + upgrading. Change the database password if necessary. + +- The [services.epgstation.settings](#opt-services.epgstation.settings) + option now expects options for `config.yml` in EPGStation v2. + +- Existing data for the [services.epgstation](#opt-services.epgstation.enable) + module would have to be backed up prior to the upgrade. To back up exising + data to `/tmp/epgstation.bak`, run + `sudo -u epgstation epgstation run backup /tmp/epgstation.bak`. + To import that data after to the upgrade, run + `sudo -u epgstation epgstation run v1migrate /tmp/epgstation.bak` + +- `switch-to-configuration` (the script that is run when running `nixos-rebuild switch` for example) has been reworked + * The interface that allows activation scripts to restart units has been streamlined. Restarting and reloading is now done by a single file `/run/nixos/activation-restart-list` that honors `restartIfChanged` and `reloadIfChanged` of the units. + * Preferring to reload instead of restarting can still be achieved using `/run/nixos/activation-reload-list`. + * The script now uses a proper ini-file parser to parse systemd units. Some values are now only searched in one section instead of in the entire unit. This is only relevant for units that don't use the NixOS systemd moule. + * `RefuseManualStop`, `X-OnlyManualStart`, `X-StopOnRemoval`, `X-StopOnReconfiguration` are only searched in the `[Unit]` section + * `X-ReloadIfChanged`, `X-RestartIfChanged`, `X-StopIfChanged` are only searched in the `[Service]` section - The `services.bookstack.cacheDir` option has been removed, since the cache directory is now handled by systemd. @@ -153,6 +423,27 @@ In addition to numerous new and upgraded packages, this release has the followin - `lib.assertMsg` and `lib.assertOneOf` no longer return `false` if the passed condition is `false`, `throw`ing the given error message instead (which makes the resulting error message less cluttered). This will not impact the behaviour of code using these functions as intended, namely as top-level wrapper for `assert` conditions. +- The `vpnc` package has been changed to use GnuTLS instead of OpenSSL by default for licensing reasons. + +- `pkgs.vimPlugins.onedark-nvim` now refers to [navarasu/onedark.nvim](https://github.com/navarasu/onedark.nvim) + (formerly refers to [olimorris/onedarkpro.nvim](https://github.com/olimorris/onedarkpro.nvim)). + +- `services.pipewire.enable` will default to enabling the WirePlumber session manager instead of pipewire-media-session. + pipewire-media-session is deprecated by upstream and not recommended, but can still be manually enabled by setting + `services.pipewire.media-session.enable` to `true` and `services.pipewire.wireplumber.enable` to `false`. + +- `pkgs.makeDesktopItem` has been refactored to provide a more idiomatic API. Specifically: + - All valid options as of FDO Desktop Entry specification version 1.4 can now be passed in as explicit arguments + - `exec` can now be null, for entries that are not of type Application + - `mimeType` argument is renamed to `mimeTypes` for consistency + - `mimeTypes`, `categories`, `implements`, `keywords`, `onlyShowIn` and `notShowIn` take lists of strings instead of one string with semicolon separators + - `extraDesktopEntries` renamed to `extraConfig` for consistency + - Actions should now be provided as an attrset `actions`, the `Actions` line will be autogenerated. + - `extraEntries` is removed. + - Additional validation is added both at eval time and at build time. + + See the `vscode` package for a more detailed example. + ## Other Notable Changes {#sec-release-22.05-notable-changes} @@ -177,22 +468,47 @@ In addition to numerous new and upgraded packages, this release has the followin to allow users to make changes to the `nixos-rebuild build-vm` configuration that do not apply to their normal system. - The `config.system.build.vm` attribute now always exists and defaults to the + The `config.system.build.vm` attribute now always exists and defaults to the value from `vmVariant`. Configurations that import the `virtualisation/qemu-vm.nix` module themselves will override this value, such that `vmVariant` is not used. Similarly [virtualisation.vmVariantWithBootloader](#opt-virtualisation.vmVariantWithBootLoader) was added. +- The configuration portion of the `nix-daemon` module has been reworked and exposed as [nix.settings](options.html#opt-nix-settings): + * Legacy options have been mapped to the corresponding options under under [nix.settings](options.html#opt-nix.settings) and will be deprecated when NixOS 21.11 reaches end of life. + * [nix.buildMachines.publicHostKey](options.html#opt-nix.buildMachines.publicHostKey) has been added. + - The `writers.writePyPy2`/`writers.writePyPy3` and corresponding `writers.writePyPy2Bin`/`writers.writePyPy3Bin` convenience functions to create executable Python 2/3 scripts using the PyPy interpreter were added. +- Some improvements have been made to the `hadoop` module: + - A `gatewayRole` option has been added, for deploying hadoop cluster configuration files to a node that does not have any active services + - Support for older versions of hadoop have been added to the module + - Overriding and extending site XML files has been made easier + +- If you are using Wayland you can choose to use the Ozone Wayland support + in Chrome and several Electron apps by setting the environment variable + `NIXOS_OZONE_WL=1` (for example via + `environment.sessionVariables.NIXOS_OZONE_WL = "1"`). + This is not enabled by default because Ozone Wayland is + still under heavy development and behavior is not always flawless. + Furthermore, not all Electron apps use the latest Electron versions. + - The `influxdb2` package was split into `influxdb2-server` and `influxdb2-cli`, matching the split that took place upstream. A combined `influxdb2` package is still provided in this release for backwards compatibilty, but will be removed at a later date. +- The `unifi` package was switched from `unifi6` to `unifi7`. + Direct downgrades from Unifi 7 to Unifi 6 are not possible and require restoring from a backup made by Unifi 6. + +- `programs.zsh.autosuggestions.strategy` now takes a list of strings instead of a string. + - The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11. Configurations using this default will print a warning when rebuilt. +- The `services.unifi-video.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11. + Configurations using this default will print a warning when rebuilt. + - `security.acme` certificates will now correctly check for CA revokation before reaching their minimum age. @@ -217,30 +533,84 @@ In addition to numerous new and upgraded packages, this release has the followin - The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files. -- A new option `boot.initrd.extraModprobeConfig` has been added which can be used to configure kernel modules that are loaded in the initrd. +- The options `boot.extraModprobeConfig` and `boot.blacklistedKernelModules` now also take effect in the initrd by copying the file `/etc/modprobe.d/nixos.conf` into the initrd. + +- `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`. + +- ORY Kratos was updated to version 0.8.3-alpha.1.pre.0, which introduces some breaking changes: + - If you are relying on the SQLite images, update your Docker Pull commands as follows: + - `docker pull oryd/kratos:{version}` + - Additionally, all passwords now have to be at least 8 characters long. + - For more details, see: + - [Release Notes for v0.8.1-alpha-1](https://github.com/ory/kratos/releases/tag/v0.8.1-alpha.1) + - [Release Notes for v0.8.2-alpha-1](https://github.com/ory/kratos/releases/tag/v0.8.2-alpha.1) - `fetchFromSourcehut` now allows fetching repositories recursively using `fetchgit` or `fetchhg` if the argument `fetchSubmodules` is set to `true`. +- The `element-desktop` package now has an `useKeytar` option (defaults to `true`), + which allows disabling `keytar` and in turn `libsecret` usage + (which binds to native credential managers / keychain libraries). + - The option `services.thelounge.plugins` has been added to allow installing plugins for The Lounge. Plugins can be found in `pkgs.theLoungePlugins.plugins` and `pkgs.theLoungePlugins.themes`. +- The option `services.xserver.videoDriver = [ "nvidia" ];` will now also install [nvidia VA-API drivers](https://github.com/elFarto/nvidia-vaapi-driver) by default. + - The `firmwareLinuxNonfree` package has been renamed to `linux-firmware`. +- It is now possible to specify wordlists to include as handy to access environment variables using the `config.environment.wordlist` configuration options. + - The `services.mbpfan` module was converted to a [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration. +- The default value for `programs.spacefm.settings.graphical_su` got unset. It previously pointed to `gksu` which has been removed. + - A new module was added for the [Starship](https://starship.rs/) shell prompt, providing the options `programs.starship.enable` and `programs.starship.settings`. +- The [Dino](https://dino.im) XMPP client was updated to 0.3, adding support for audio and video calls. + - `services.mattermost.plugins` has been added to allow the declarative installation of Mattermost plugins. Plugins are automatically repackaged using autoPatchelf. +- `services.logrotate.enable` now defaults to true if any rotate path has + been defined, and some paths have been added by default. + - The `zrepl` package has been updated from 0.4.0 to 0.5: - * The RPC protocol version was bumped; all zrepl daemons in a setup must be updated and restarted before replication can resume. - * A bug involving encrypt-on-receive has been fixed. Read the [zrepl documentation](https://zrepl.github.io/configuration/sendrecvoptions.html#job-recv-options-placeholder) and check the output of `zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS` on the receiver. + + - The RPC protocol version was bumped; all zrepl daemons in a setup must be updated and restarted before replication can resume. + - A bug involving encrypt-on-receive has been fixed. Read the [zrepl documentation](https://zrepl.github.io/configuration/sendrecvoptions.html#job-recv-options-placeholder) and check the output of `zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS` on the receiver. - Renamed option `services.openssh.challengeResponseAuthentication` to `services.openssh.kbdInteractiveAuthentication`. Reason is that the old name has been deprecated upstream. Using the old option name will still work, but produce a warning. +- `services.autorandr` now allows for adding hooks and profiles declaratively. + +- The `pomerium-cli` command has been moved out of the `pomerium` package into + the `pomerium-cli` package, following upstream's repository split. If you are + using the `pomerium-cli` command, you should now install the `pomerium-cli` + package. + +- The option + [services.networking.networkmanager.enableFccUnlock](#opt-networking.networkmanager.enableFccUnlock) + was added to support FCC unlock procedures. Since release 1.18.4, the ModemManager + daemon no longer automatically performs the FCC unlock procedure by default. See + [the docs](https://modemmanager.org/docs/modemmanager/fcc-unlock/) for more details. + +- `programs.tmux` has a new option `plugins` that accepts a list of packages from the `tmuxPlugins` group. The specified packages are added to the system and loaded by `tmux`. + +- The polkit service, available at `security.polkit.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed. + +- The `hadoop` package has added support for `aarch64-linux` and `aarch64-darwin` as of 3.3.1 ([#158613](https://github.com/NixOS/nixpkgs/pull/158613)). + +- The `R` package now builds again on `aarch64-darwin` ([#158992](https://github.com/NixOS/nixpkgs/pull/158992)). + +- The `spark3` package has been updated from 3.1.2 to 3.2.1 ([#160075](https://github.com/NixOS/nixpkgs/pull/160075)): + + - Testing has been enabled for `aarch64-linux` in addition to `x86_64-linux`. + - The `spark3` package is now usable on `aarch64-darwin` as a result of [#158613](https://github.com/NixOS/nixpkgs/pull/158613) and [#158992](https://github.com/NixOS/nixpkgs/pull/158992). + +- The `programs.nncp` options were added for generating host-global NNCP configuration. + diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index e3eb88a60eba..2daaa8a11863 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -21,6 +21,7 @@ evalConfigArgs@ , # !!! See comment about args in lib/modules.nix specialArgs ? {} , modules +, modulesLocation ? (builtins.unsafeGetAttrPos "modules" evalConfigArgs).file or null , # !!! See comment about check in lib/modules.nix check ? true , prefix ? [] @@ -74,7 +75,18 @@ let _module.check = lib.mkDefault check; }; }; - allUserModules = modules ++ legacyModules; + + allUserModules = + let + # Add the invoking file (or specified modulesLocation) as error message location + # for modules that don't have their own locations; presumably inline modules. + locatedModules = + if modulesLocation == null then + modules + else + map (lib.setDefaultModuleLocation modulesLocation) modules; + in + locatedModules ++ legacyModules; noUserModules = evalModulesMinimal ({ inherit prefix specialArgs; diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index 029787a31586..8e2ea322dc89 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -66,14 +66,21 @@ for (k, v) in overrides.items(): elif ov is not None or cur.get(ok, None) is None: cur[ok] = ov +severity = "error" if warningsAreErrors else "warning" + # check that every option has a description hasWarnings = False for (k, v) in options.items(): if v.value.get('description', None) is None: - severity = "error" if warningsAreErrors else "warning" hasWarnings = True print(f"\x1b[1;31m{severity}: option {v.name} has no description\x1b[0m", file=sys.stderr) v.value['description'] = "This option has no description." + if v.value.get('type', "unspecified") == "unspecified": + hasWarnings = True + print( + f"\x1b[1;31m{severity}: option {v.name} has no type. Please specify a valid type, see " + + "https://nixos.org/manual/nixos/stable/index.html#sec-option-types\x1b[0m", file=sys.stderr) + if hasWarnings and warningsAreErrors: print( "\x1b[1;31m" + diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix index 964814e8c602..20bbe9ff5d99 100644 --- a/nixos/lib/qemu-common.nix +++ b/nixos/lib/qemu-common.nix @@ -22,7 +22,7 @@ rec { else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'"; qemuBinary = qemuPkg: { - x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu qemu64"; + x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max"; armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv"; diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index db4c35511871..37900b0b16f6 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -5,12 +5,16 @@ with lib; let cfg = config.systemd; lndir = "${pkgs.buildPackages.xorg.lndir}/bin/lndir"; + systemd = cfg.package; in rec { shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s); mkPathSafeName = lib.replaceChars ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""]; + # a type for options that take a unit name + unitNameType = types.strMatching "[a-zA-Z0-9@%:_.\\-]+[.](service|socket|device|mount|automount|swap|target|path|timer|scope|slice)"; + makeUnit = name: unit: if unit.enable then pkgs.runCommand "unit-${mkPathSafeName name}" @@ -19,8 +23,9 @@ in rec { inherit (unit) text; } '' - mkdir -p $out - echo -n "$text" > $out/${shellEscape name} + name=${shellEscape name} + mkdir -p "$out/$(dirname "$name")" + echo -n "$text" > "$out/$name" '' else pkgs.runCommand "unit-${mkPathSafeName name}-disabled" @@ -28,8 +33,9 @@ in rec { allowSubstitutes = false; } '' - mkdir -p $out - ln -s /dev/null $out/${shellEscape name} + name=${shellEscape name} + mkdir -p "$out/$(dirname "$name")" + ln -s /dev/null "$out/$name" ''; boolValues = [true false "yes" "no"]; @@ -232,4 +238,205 @@ in rec { ''} ''; # */ + makeJobScript = name: text: + let + scriptName = replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape name); + out = (pkgs.writeShellScriptBin scriptName '' + set -e + ${text} + '').overrideAttrs (_: { + # The derivation name is different from the script file name + # to keep the script file name short to avoid cluttering logs. + name = "unit-script-${scriptName}"; + }); + in "${out}/bin/${scriptName}"; + + unitConfig = { config, options, ... }: { + config = { + unitConfig = + optionalAttrs (config.requires != []) + { Requires = toString config.requires; } + // optionalAttrs (config.wants != []) + { Wants = toString config.wants; } + // optionalAttrs (config.after != []) + { After = toString config.after; } + // optionalAttrs (config.before != []) + { Before = toString config.before; } + // optionalAttrs (config.bindsTo != []) + { BindsTo = toString config.bindsTo; } + // optionalAttrs (config.partOf != []) + { PartOf = toString config.partOf; } + // optionalAttrs (config.conflicts != []) + { Conflicts = toString config.conflicts; } + // optionalAttrs (config.requisite != []) + { Requisite = toString config.requisite; } + // optionalAttrs (config.restartTriggers != []) + { X-Restart-Triggers = toString config.restartTriggers; } + // optionalAttrs (config.reloadTriggers != []) + { X-Reload-Triggers = toString config.reloadTriggers; } + // optionalAttrs (config.description != "") { + Description = config.description; } + // optionalAttrs (config.documentation != []) { + Documentation = toString config.documentation; } + // optionalAttrs (config.onFailure != []) { + OnFailure = toString config.onFailure; } + // optionalAttrs (options.startLimitIntervalSec.isDefined) { + StartLimitIntervalSec = toString config.startLimitIntervalSec; + } // optionalAttrs (options.startLimitBurst.isDefined) { + StartLimitBurst = toString config.startLimitBurst; + }; + }; + }; + + serviceConfig = { name, config, ... }: { + config = mkMerge + [ { # Default path for systemd services. Should be quite minimal. + path = mkAfter + [ pkgs.coreutils + pkgs.findutils + pkgs.gnugrep + pkgs.gnused + systemd + ]; + environment.PATH = "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}"; + } + (mkIf (config.preStart != "") + { serviceConfig.ExecStartPre = + [ (makeJobScript "${name}-pre-start" config.preStart) ]; + }) + (mkIf (config.script != "") + { serviceConfig.ExecStart = + makeJobScript "${name}-start" config.script + " " + config.scriptArgs; + }) + (mkIf (config.postStart != "") + { serviceConfig.ExecStartPost = + [ (makeJobScript "${name}-post-start" config.postStart) ]; + }) + (mkIf (config.reload != "") + { serviceConfig.ExecReload = + makeJobScript "${name}-reload" config.reload; + }) + (mkIf (config.preStop != "") + { serviceConfig.ExecStop = + makeJobScript "${name}-pre-stop" config.preStop; + }) + (mkIf (config.postStop != "") + { serviceConfig.ExecStopPost = + makeJobScript "${name}-post-stop" config.postStop; + }) + ]; + }; + + mountConfig = { config, ... }: { + config = { + mountConfig = + { What = config.what; + Where = config.where; + } // optionalAttrs (config.type != "") { + Type = config.type; + } // optionalAttrs (config.options != "") { + Options = config.options; + }; + }; + }; + + automountConfig = { config, ... }: { + config = { + automountConfig = + { Where = config.where; + }; + }; + }; + + commonUnitText = def: '' + [Unit] + ${attrsToSection def.unitConfig} + ''; + + targetToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = + '' + [Unit] + ${attrsToSection def.unitConfig} + ''; + }; + + serviceToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + 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 then '' + X-ReloadIfChanged=true + '' else if !def.restartIfChanged then '' + X-RestartIfChanged=false + '' else ""} + ${optionalString (!def.stopIfChanged) "X-StopIfChanged=false"} + ${attrsToSection def.serviceConfig} + ''; + }; + + socketToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = commonUnitText def + + '' + [Socket] + ${attrsToSection def.socketConfig} + ${concatStringsSep "\n" (map (s: "ListenStream=${s}") def.listenStreams)} + ${concatStringsSep "\n" (map (s: "ListenDatagram=${s}") def.listenDatagrams)} + ''; + }; + + timerToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = commonUnitText def + + '' + [Timer] + ${attrsToSection def.timerConfig} + ''; + }; + + pathToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = commonUnitText def + + '' + [Path] + ${attrsToSection def.pathConfig} + ''; + }; + + mountToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = commonUnitText def + + '' + [Mount] + ${attrsToSection def.mountConfig} + ''; + }; + + automountToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = commonUnitText def + + '' + [Automount] + ${attrsToSection def.automountConfig} + ''; + }; + + sliceToUnit = name: def: + { inherit (def) aliases wantedBy requiredBy enable; + text = commonUnitText def + + '' + [Slice] + ${attrsToSection def.sliceConfig} + ''; + }; } diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix index 01f954a4d3e0..8029ba0e3f6c 100644 --- a/nixos/lib/systemd-unit-options.nix +++ b/nixos/lib/systemd-unit-options.nix @@ -45,7 +45,7 @@ in rec { requiredBy = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Units that require (i.e. depend on and need to go down with) this unit. The discussion under wantedBy @@ -56,7 +56,7 @@ in rec { wantedBy = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Units that want (i.e. depend on) this unit. The standard way to make a unit start by default at boot is to set this option @@ -73,7 +73,7 @@ in rec { aliases = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = "Aliases of that unit."; }; @@ -98,7 +98,7 @@ in rec { description = mkOption { default = ""; - type = types.str; + type = types.singleLineStr; description = "Description of this unit used in systemd messages and progress indicators."; }; @@ -110,7 +110,7 @@ in rec { requires = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Start the specified units when this unit is started, and stop this unit when the specified units are stopped or fail. @@ -119,7 +119,7 @@ in rec { wants = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Start the specified units when this unit is started. ''; @@ -127,7 +127,7 @@ in rec { after = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' If the specified units are started at the same time as this unit, delay this unit until they have started. @@ -136,7 +136,7 @@ in rec { before = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' If the specified units are started at the same time as this unit, delay them until this unit has started. @@ -145,7 +145,7 @@ in rec { bindsTo = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Like ‘requires’, but in addition, if the specified units unexpectedly disappear, this unit will be stopped as well. @@ -154,7 +154,7 @@ in rec { partOf = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' If the specified units are stopped or restarted, then this unit is stopped or restarted as well. @@ -163,7 +163,7 @@ in rec { conflicts = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' If the specified units are started, then this unit is stopped and vice versa. @@ -172,7 +172,7 @@ in rec { requisite = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' Similar to requires. However if the units listed are not started, they will not be started and the transaction will fail. @@ -201,9 +201,20 @@ in rec { ''; }; + reloadTriggers = mkOption { + default = []; + type = types.listOf unitOption; + description = '' + An arbitrary list of items such as derivations. If any item + in the list changes between reconfigurations, the service will + be reloaded. If anything but a reload trigger changes in the + unit file, the unit will be restarted instead. + ''; + }; + onFailure = mkOption { default = []; - type = types.listOf types.str; + type = types.listOf unitNameType; description = '' A list of one or more units that are activated when this unit enters the "failed" state. @@ -338,6 +349,11 @@ in rec { configuration switch if its definition has changed. If enabled, the value of is ignored. + + This option should not be used anymore in favor of + which allows more granular + control of when a service is reloaded and when a service + is restarted. ''; }; diff --git a/nixos/lib/test-driver/test_driver/__init__.py b/nixos/lib/test-driver/test_driver/__init__.py index 5477ab5cd038..61d91c9ed654 100755 --- a/nixos/lib/test-driver/test_driver/__init__.py +++ b/nixos/lib/test-driver/test_driver/__init__.py @@ -33,6 +33,22 @@ class EnvDefault(argparse.Action): setattr(namespace, self.dest, values) +def writeable_dir(arg: str) -> Path: + """Raises an ArgumentTypeError if the given argument isn't a writeable directory + Note: We want to fail as early as possible if a directory isn't writeable, + since an executed nixos-test could fail (very late) because of the test-driver + writing in a directory without proper permissions. + """ + path = Path(arg) + if not path.is_dir(): + raise argparse.ArgumentTypeError("{0} is not a directory".format(path)) + if not os.access(path, os.W_OK): + raise argparse.ArgumentTypeError( + "{0} is not a writeable directory".format(path) + ) + return path + + def main() -> None: arg_parser = argparse.ArgumentParser(prog="nixos-test-driver") arg_parser.add_argument( @@ -45,7 +61,7 @@ def main() -> None: "-I", "--interactive", help="drop into a python repl and run the tests interactively", - action="store_true", + action=argparse.BooleanOptionalAction, ) arg_parser.add_argument( "--start-scripts", @@ -63,6 +79,14 @@ def main() -> None: nargs="*", help="vlans to span by the driver", ) + arg_parser.add_argument( + "-o", + "--output_directory", + help="""The path to the directory where outputs copied from the VM will be placed. + By e.g. Machine.copy_from_vm or Machine.screenshot""", + default=Path.cwd(), + type=writeable_dir, + ) arg_parser.add_argument( "testscript", action=EnvDefault, @@ -77,7 +101,11 @@ def main() -> None: rootlog.info("Machine state will be reset. To keep it, pass --keep-vm-state") with Driver( - args.start_scripts, args.vlans, args.testscript.read_text(), args.keep_vm_state + args.start_scripts, + args.vlans, + args.testscript.read_text(), + args.output_directory.resolve(), + args.keep_vm_state, ) as driver: if args.interactive: ptpython.repl.embed(driver.test_symbols(), {}) @@ -94,7 +122,7 @@ def generate_driver_symbols() -> None: in user's test scripts. That list is then used by pyflakes to lint those scripts. """ - d = Driver([], [], "") + d = Driver([], [], "", Path()) test_symbols = d.test_symbols() with open("driver-symbols", "w") as fp: fp.write(",".join(test_symbols.keys())) diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py index 49a42fe5fb4e..0e5f013193fe 100644 --- a/nixos/lib/test-driver/test_driver/driver.py +++ b/nixos/lib/test-driver/test_driver/driver.py @@ -10,6 +10,28 @@ from test_driver.vlan import VLan from test_driver.polling_condition import PollingCondition +def get_tmp_dir() -> Path: + """Returns a temporary directory that is defined by TMPDIR, TEMP, TMP or CWD + Raises an exception in case the retrieved temporary directory is not writeable + See https://docs.python.org/3/library/tempfile.html#tempfile.gettempdir + """ + tmp_dir = Path(tempfile.gettempdir()) + tmp_dir.mkdir(mode=0o700, exist_ok=True) + if not tmp_dir.is_dir(): + raise NotADirectoryError( + "The directory defined by TMPDIR, TEMP, TMP or CWD: {0} is not a directory".format( + tmp_dir + ) + ) + if not os.access(tmp_dir, os.W_OK): + raise PermissionError( + "The directory defined by TMPDIR, TEMP, TMP, or CWD: {0} is not writeable".format( + tmp_dir + ) + ) + return tmp_dir + + class Driver: """A handle to the driver that sets up the environment and runs the tests""" @@ -24,14 +46,16 @@ class Driver: start_scripts: List[str], vlans: List[int], tests: str, + out_dir: Path, keep_vm_state: bool = False, ): self.tests = tests + self.out_dir = out_dir - tmp_dir = Path(os.environ.get("TMPDIR", tempfile.gettempdir())) - tmp_dir.mkdir(mode=0o700, exist_ok=True) + tmp_dir = get_tmp_dir() with rootlog.nested("start all VLans"): + vlans = list(set(vlans)) self.vlans = [VLan(nr, tmp_dir) for nr in vlans] def cmd(scripts: List[str]) -> Iterator[NixStartScript]: @@ -47,6 +71,7 @@ class Driver: name=cmd.machine_name, tmp_dir=tmp_dir, callbacks=[self.check_polling_conditions], + out_dir=self.out_dir, ) for cmd in cmd(start_scripts) ] @@ -141,8 +166,8 @@ class Driver: "Using legacy create_machine(), please instantiate the" "Machine class directly, instead" ) - tmp_dir = Path(os.environ.get("TMPDIR", tempfile.gettempdir())) - tmp_dir.mkdir(mode=0o700, exist_ok=True) + + tmp_dir = get_tmp_dir() if args.get("startCommand"): start_command: str = args.get("startCommand", "") @@ -154,6 +179,7 @@ class Driver: return Machine( tmp_dir=tmp_dir, + out_dir=self.out_dir, start_command=cmd, name=name, keep_vm_state=args.get("keep_vm_state", False), diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index e050cbd7d990..f3e615fe5bf9 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -198,7 +198,7 @@ class StartCommand: ) -> subprocess.Popen: return subprocess.Popen( self.cmd(monitor_socket_path, shell_socket_path), - stdin=subprocess.DEVNULL, + stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, @@ -241,9 +241,15 @@ class LegacyStartCommand(StartCommand): cdrom: Optional[str] = None, usb: Optional[str] = None, bios: Optional[str] = None, + qemuBinary: Optional[str] = None, qemuFlags: Optional[str] = None, ): - self._cmd = "qemu-kvm -m 384" + if qemuBinary is not None: + self._cmd = qemuBinary + else: + self._cmd = "qemu-kvm" + + self._cmd += " -m 384" # networking net_backend = "-netdev user,id=net0" @@ -297,6 +303,7 @@ class Machine: the machine lifecycle with the help of a start script / command.""" name: str + out_dir: Path tmp_dir: Path shared_dir: Path state_dir: Path @@ -325,6 +332,7 @@ class Machine: def __init__( self, + out_dir: Path, tmp_dir: Path, start_command: StartCommand, name: str = "machine", @@ -332,6 +340,7 @@ class Machine: allow_reboot: bool = False, callbacks: Optional[List[Callable]] = None, ) -> None: + self.out_dir = out_dir self.tmp_dir = tmp_dir self.keep_vm_state = keep_vm_state self.allow_reboot = allow_reboot @@ -378,6 +387,7 @@ class Machine: cdrom=args.get("cdrom"), usb=args.get("usb"), bios=args.get("bios"), + qemuBinary=args.get("qemuBinary"), qemuFlags=args.get("qemuFlags"), ) @@ -540,14 +550,36 @@ class Machine: Should only be used during test development, not in the production test.""" self.connect() - self.log("Terminal is ready (there is no prompt):") + self.log("Terminal is ready (there is no initial prompt):") assert self.shell subprocess.run( - ["socat", "READLINE", f"FD:{self.shell.fileno()}"], + ["socat", "READLINE,prompt=$ ", f"FD:{self.shell.fileno()}"], pass_fds=[self.shell.fileno()], ) + def console_interact(self) -> None: + """Allows you to interact with QEMU's stdin + + The shell can be exited with Ctrl+D. Note that Ctrl+C is not allowed to be used. + QEMU's stdout is read line-wise. + + Should only be used during test development, not in the production test.""" + self.log("Terminal is ready (there is no prompt):") + + assert self.process + assert self.process.stdin + + while True: + try: + char = sys.stdin.buffer.read(1) + except KeyboardInterrupt: + break + if char == b"": # ctrl+d + self.log("Closing connection to the console") + break + self.send_console(char.decode()) + def succeed(self, *commands: str, timeout: Optional[int] = None) -> str: """Execute each command and check that it succeeds.""" output = "" @@ -702,10 +734,9 @@ class Machine: self.connected = True def screenshot(self, filename: str) -> None: - out_dir = os.environ.get("out", os.getcwd()) word_pattern = re.compile(r"^\w+$") if word_pattern.match(filename): - filename = os.path.join(out_dir, "{}.png".format(filename)) + filename = os.path.join(self.out_dir, "{}.png".format(filename)) tmp = "{}.ppm".format(filename) with self.nested( @@ -756,7 +787,6 @@ class Machine: all the VMs (using a temporary directory). """ # Compute the source, target, and intermediate shared file names - out_dir = Path(os.environ.get("out", os.getcwd())) vm_src = Path(source) with tempfile.TemporaryDirectory(dir=self.shared_dir) as shared_td: shared_temp = Path(shared_td) @@ -766,7 +796,7 @@ class Machine: # Copy the file to the shared directory inside VM self.succeed(make_command(["mkdir", "-p", vm_shared_temp])) self.succeed(make_command(["cp", "-r", vm_src, vm_intermediate])) - abs_target = out_dir / target_dir / vm_src.name + abs_target = self.out_dir / target_dir / vm_src.name abs_target.parent.mkdir(exist_ok=True, parents=True) # Copy the file from the shared directory outside VM if intermediate.is_dir(): @@ -826,6 +856,12 @@ class Machine: self.send_monitor_command("sendkey {}".format(key)) time.sleep(0.01) + def send_console(self, chars: str) -> None: + assert self.process + assert self.process.stdin + self.process.stdin.write(chars.encode()) + self.process.stdin.flush() + def start(self) -> None: if self.booted: return diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index a67040468136..facc7a253a75 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -30,7 +30,7 @@ rec { # effectively mute the XMLLogger export LOGFILE=/dev/null - ${driver}/bin/nixos-test-driver + ${driver}/bin/nixos-test-driver -o $out ''; passthru = driver.passthru // { @@ -51,6 +51,7 @@ rec { , enableOCR ? false , skipLint ? false , passthru ? {} + , interactive ? false }: let # Reifies and correctly wraps the python test driver for @@ -139,31 +140,34 @@ rec { wrapProgram $out/bin/nixos-test-driver \ --set startScripts "''${vmStartScripts[*]}" \ --set testScript "$out/test-script" \ - --set vlans '${toString vlans}' + --set vlans '${toString vlans}' \ + ${lib.optionalString (interactive) "--add-flags --interactive"} ''); # Make a full-blown test makeTest = - { testScript + { machine ? null + , nodes ? {} + , testScript , enableOCR ? false , name ? "unnamed" # Skip linting (mainly intended for faster dev cycles) , skipLint ? false , passthru ? {} + , meta ? {} , # For meta.position pos ? # position used in error messages and for meta.position - (if t.meta.description or null != null - then builtins.unsafeGetAttrPos "description" t.meta + (if meta.description or null != null + then builtins.unsafeGetAttrPos "description" meta else builtins.unsafeGetAttrPos "testScript" t) - , ... } @ t: let - nodes = qemu_pkg: + mkNodes = qemu_pkg: let testScript' = # Call the test script with the computed nodes. if lib.isFunction testScript - then testScript { nodes = nodes qemu_pkg; } + then testScript { nodes = mkNodes qemu_pkg; } else testScript; build-vms = import ./build-vms.nix { @@ -203,32 +207,29 @@ rec { }; in build-vms.buildVirtualNetwork ( - t.nodes or (if t ? machine then { machine = t.machine; } else { }) + nodes // lib.optionalAttrs (machine != null) { inherit machine; } ); driver = setupDriverForTest { inherit testScript enableOCR skipLint passthru; testName = name; qemu_pkg = pkgs.qemu_test; - nodes = nodes pkgs.qemu_test; + nodes = mkNodes pkgs.qemu_test; }; driverInteractive = setupDriverForTest { inherit testScript enableOCR skipLint passthru; testName = name; qemu_pkg = pkgs.qemu; - nodes = nodes pkgs.qemu; + nodes = mkNodes pkgs.qemu; + interactive = true; }; - test = - let - passMeta = drv: drv // lib.optionalAttrs (t ? meta) { - meta = (drv.meta or { }) // t.meta; - }; - in passMeta (runTests { inherit driver pos driverInteractive; }); + test = lib.addMetaAttrs meta (runTests { inherit driver pos driverInteractive; }); in test // { - inherit test driver driverInteractive nodes; + inherit test driver driverInteractive; + inherit (driver) nodes; }; abortForFunction = functionName: abort ''The ${functionName} function was diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index bbebf8ba35a0..ae68c3920c5b 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -45,6 +45,26 @@ rec { replaceChars ["/" "-" " "] ["-" "\\x2d" "\\x20"] (removePrefix "/" s); + # Quotes an argument for use in Exec* service lines. + # systemd accepts "-quoted strings with escape sequences, toJSON produces + # a subset of these. + # Additionally we escape % to disallow expansion of % specifiers. Any lone ; + # in the input will be turned it ";" and thus lose its special meaning. + # Every $ is escaped to $$, this makes it unnecessary to disable environment + # substitution for the directive. + escapeSystemdExecArg = arg: + let + s = if builtins.isPath arg then "${arg}" + else if builtins.isString arg then arg + else if builtins.isInt arg || builtins.isFloat arg then toString arg + else throw "escapeSystemdExecArg only allows strings, paths and numbers"; + in + replaceChars [ "%" "$" ] [ "%%" "$$" ] (builtins.toJSON s); + + # Quotes a list of arguments into a single string for use in a Exec* + # line. + escapeSystemdExecArgs = concatMapStringsSep " " escapeSystemdExecArg; + # Returns a system path for a given shell package toShellPath = shell: if types.shellPackage.check shell then @@ -149,10 +169,17 @@ rec { if [[ -h '${output}' ]]; then rm '${output}' fi + + inherit_errexit_enabled=0 + shopt -pq inherit_errexit && inherit_errexit_enabled=1 + shopt -s inherit_errexit '' + concatStringsSep "\n" - (imap1 (index: name: "export secret${toString index}=$(<'${secrets.${name}}')") + (imap1 (index: name: '' + secret${toString index}=$(<'${secrets.${name}}') + export secret${toString index} + '') (attrNames secrets)) + "\n" + "${pkgs.jq}/bin/jq >'${output}' '" @@ -164,6 +191,7 @@ rec { ' <<'EOF' ${builtins.toJSON set} EOF + (( ! $inherit_errexit_enabled )) && shopt -u inherit_errexit ''; systemdUtils = { diff --git a/nixos/maintainers/scripts/azure-new/examples/basic/system.nix b/nixos/maintainers/scripts/azure-new/examples/basic/system.nix index 855bd3bab719..d283742701d1 100644 --- a/nixos/maintainers/scripts/azure-new/examples/basic/system.nix +++ b/nixos/maintainers/scripts/azure-new/examples/basic/system.nix @@ -17,7 +17,7 @@ in description = "Azure NixOS Test User"; openssh.authorizedKeys.keys = [ (builtins.readFile ~/.ssh/id_ed25519.pub) ]; }; - nix.trustedUsers = [ username ]; + nix.settings.trusted-users = [ username ]; virtualisation.azureImage.diskSize = 2500; diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix index 04952898cb76..adc6654afc79 100644 --- a/nixos/modules/config/fonts/fonts.nix +++ b/nixos/modules/config/fonts/fonts.nix @@ -39,11 +39,6 @@ let defaultXFonts = [ (if hasHidpi then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc) pkgs.xorg.fontmiscmisc - ] ++ optionals (config.nixpkgs.config.allowUnfree or false) - [ # these are unfree, and will make usage with xserver fail - pkgs.xorg.fontbhlucidatypewriter100dpi - pkgs.xorg.fontbhlucidatypewriter75dpi - pkgs.xorg.fontbh100dpi ]; in diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix index cd0ed491383c..4499481811fd 100644 --- a/nixos/modules/config/resolvconf.nix +++ b/nixos/modules/config/resolvconf.nix @@ -47,8 +47,8 @@ in enable = mkOption { type = types.bool; - default = false; - internal = true; + default = !(config.environment.etc ? "resolv.conf"); + defaultText = literalExpression ''!(config.environment.etc ? "resolv.conf")''; description = '' DNS configuration is managed by resolvconf. ''; @@ -110,8 +110,6 @@ in config = mkMerge [ { - networking.resolvconf.enable = !(config.environment.etc ? "resolv.conf"); - environment.etc."resolvconf.conf".text = if !cfg.enable then # Force-stop any attempts to use resolvconf diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 2470d8b5bfec..b0f96c754fa5 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -449,16 +449,10 @@ in { imports = [ (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ]) (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ]) - (mkChangedOptionModule - [ "security" "initialRootPassword" ] - [ "users" "users" "root" "initialHashedPassword" ] - (cfg: if cfg.security.initialRootPassword == "!" - then null - else cfg.security.initialRootPassword)) + (mkRenamedOptionModule ["security" "initialRootPassword"] ["users" "users" "root" "initialHashedPassword"]) ]; ###### interface - options = { users.mutableUsers = mkOption { @@ -526,6 +520,17 @@ in { ''; }; + + users.allowNoPasswordLogin = mkOption { + type = types.bool; + default = false; + description = '' + Disable checking that at least the root user or a user in the wheel group can log in using + a password or an SSH key. + + WARNING: enabling this can lock you out of your system. Enable this only if you know what are you doing. + ''; + }; }; @@ -540,6 +545,7 @@ in { home = "/root"; shell = mkDefault cfg.defaultUserShell; group = "root"; + initialHashedPassword = mkDefault "!"; }; nobody = { uid = ids.uids.nobody; @@ -616,9 +622,11 @@ in { # there is at least one "privileged" account that has a # password or an SSH authorized key. Privileged accounts are # root and users in the wheel group. - assertion = !cfg.mutableUsers -> - any id ((mapAttrsToList (_: cfg: - (cfg.name == "root" + # The check does not apply when users.disableLoginPossibilityAssertion + # The check does not apply when users.mutableUsers + assertion = !cfg.mutableUsers -> !cfg.allowNoPasswordLogin -> + any id (mapAttrsToList (name: cfg: + (name == "root" || cfg.group == "wheel" || elem "wheel" cfg.extraGroups) && @@ -627,12 +635,16 @@ in { || cfg.passwordFile != null || cfg.openssh.authorizedKeys.keys != [] || cfg.openssh.authorizedKeys.keyFiles != []) - ) cfg.users) ++ [ + ) cfg.users ++ [ config.security.googleOsLogin.enable ]); message = '' Neither the root account nor any wheel user has a password or SSH authorized key. - You must set one to prevent being locked out of your system.''; + You must set one to prevent being locked out of your system. + If you really want to be locked out of your system, set users.allowNoPasswordLogin = true; + However you are most probably better off by setting users.mutableUsers = true; and + manually running passwd root to set the root password. + ''; } ] ++ flatten (flip mapAttrsToList cfg.users (name: user: [ diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 80ec3126ca54..088f2af59e22 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -1,4 +1,4 @@ -{ config, pkgs ,lib ,... }: +{ config, pkgs, lib, ... }: with lib; @@ -13,13 +13,13 @@ with lib; options.xdg.portal = { enable = - mkEnableOption "xdg desktop integration"//{ + mkEnableOption "xdg desktop integration" // { default = false; }; extraPortals = mkOption { type = types.listOf types.package; - default = []; + default = [ ]; description = '' List of additional portals to add to path. Portals allow interaction with system, like choosing files or taking screenshots. At minimum, @@ -46,25 +46,36 @@ with lib; let cfg = config.xdg.portal; packages = [ pkgs.xdg-desktop-portal ] ++ cfg.extraPortals; - joinedPortals = pkgs.symlinkJoin { + joinedPortals = pkgs.buildEnv { name = "xdg-portals"; - paths = cfg.extraPortals; + paths = packages; + pathsToLink = [ "/share/xdg-desktop-portal/portals" "/share/applications" ]; }; - in mkIf cfg.enable { + in + mkIf cfg.enable { assertions = [ - { assertion = (cfg.gtkUsePortal -> cfg.extraPortals != []); - message = "Setting xdg.portal.gtkUsePortal to true requires a portal implementation in xdg.portal.extraPortals such as xdg-desktop-portal-gtk or xdg-desktop-portal-kde."; + { + assertion = cfg.extraPortals != [ ]; + message = "Setting xdg.portal.enable to true requires a portal implementation in xdg.portal.extraPortals such as xdg-desktop-portal-gtk or xdg-desktop-portal-kde."; } ]; - services.dbus.packages = packages; + services.dbus.packages = packages; systemd.packages = packages; - environment.sessionVariables = { - GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1"; - XDG_DESKTOP_PORTAL_DIR = "${joinedPortals}/share/xdg-desktop-portal/portals"; + environment = { + # fixes screen sharing on plasmawayland on non-chromium apps by linking + # share/applications/*.desktop files + # see https://github.com/NixOS/nixpkgs/issues/145174 + systemPackages = [ joinedPortals ]; + pathsToLink = [ "/share/applications" ]; + + sessionVariables = { + GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1"; + XDG_DESKTOP_PORTAL_DIR = "${joinedPortals}/share/xdg-desktop-portal/portals"; + }; }; }; } diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 24d5b7bc2b29..5b60b17312f9 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -57,7 +57,6 @@ in { rtl8723bs-firmware rtl8761b-firmware rtw88-firmware - rtw89-firmware zd1211fw alsa-firmware sof-firmware @@ -65,6 +64,8 @@ in { ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ rtl8723bs-firmware + ] ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "5.16") [ + rtw89-firmware ]; hardware.wirelessRegulatoryDatabase = true; }) @@ -82,6 +83,7 @@ in { b43Firmware_5_1_138 b43Firmware_6_30_163_46 b43FirmwareCutter + xow_dongle-firmware ] ++ optional pkgs.stdenv.hostPlatform.isx86 facetimehd-firmware; }) (mkIf cfg.wirelessRegulatoryDatabase { diff --git a/nixos/modules/hardware/network/b43.nix b/nixos/modules/hardware/network/b43.nix index e63f2d04d1a6..eb03bf223ccf 100644 --- a/nixos/modules/hardware/network/b43.nix +++ b/nixos/modules/hardware/network/b43.nix @@ -24,10 +24,6 @@ let kernelVersion = config.boot.kernelPackages.kernel.version; in ###### implementation config = mkIf config.networking.enableB43Firmware { - assertions = singleton - { assertion = lessThan 0 (builtins.compareVersions kernelVersion "3.2"); - message = "b43 firmware for kernels older than 3.2 not packaged yet!"; - }; hardware.firmware = [ pkgs.b43Firmware_5_1_138 ]; }; diff --git a/nixos/modules/hardware/video/capture/mwprocapture.nix b/nixos/modules/hardware/video/capture/mwprocapture.nix index 61bab533edaf..76cb4c6ee9bf 100644 --- a/nixos/modules/hardware/video/capture/mwprocapture.nix +++ b/nixos/modules/hardware/video/capture/mwprocapture.nix @@ -16,11 +16,6 @@ in config = mkIf cfg.enable { - assertions = singleton { - assertion = versionAtLeast kernelPackages.kernel.version "3.2"; - message = "Magewell Pro Capture family module is not supported for kernels older than 3.2"; - }; - boot.kernelModules = [ "ProCapture" ]; environment.systemPackages = [ kernelPackages.mwprocapture ]; diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index ff4225dc29ad..6de5b99a1ee6 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -178,11 +178,6 @@ in igpuBusId = if pCfg.intelBusId != "" then pCfg.intelBusId else pCfg.amdgpuBusId; in mkIf enabled { assertions = [ - { - assertion = with config.services.xserver.displayManager; (gdm.enable && gdm.nvidiaWayland) -> cfg.modesetting.enable; - message = "You cannot use wayland with GDM without modesetting enabled for NVIDIA drivers, set `hardware.nvidia.modesetting.enable = true`"; - } - { assertion = primeEnabled -> pCfg.intelBusId == "" || pCfg.amdgpuBusId == ""; message = '' @@ -249,7 +244,7 @@ in modules = optional (igpuDriver == "amdgpu") [ pkgs.xorg.xf86videoamdgpu ]; deviceSection = '' BusID "${igpuBusId}" - ${optionalString syncCfg.enable ''Option "AccelMethod" "none"''} + ${optionalString (syncCfg.enable && igpuDriver != "amdgpu") ''Option "AccelMethod" "none"''} ''; } ++ singleton { name = "nvidia"; @@ -274,9 +269,15 @@ in Option "AllowNVIDIAGPUScreens" ''; - services.xserver.displayManager.setupCommands = optionalString syncCfg.enable '' + services.xserver.displayManager.setupCommands = let + sinkGpuProviderName = if igpuDriver == "amdgpu" then + # find the name of the provider if amdgpu + "`${pkgs.xorg.xrandr}/bin/xrandr --listproviders | ${pkgs.gnugrep}/bin/grep -i AMD | ${pkgs.gnused}/bin/sed -n 's/^.*name://p'`" + else + igpuDriver; + in optionalString syncCfg.enable '' # Added by nvidia configuration module for Optimus/PRIME. - ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource ${igpuDriver} NVIDIA-0 + ${pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource "${sinkGpuProviderName}" NVIDIA-0 ${pkgs.xorg.xrandr}/bin/xrandr --auto ''; @@ -288,10 +289,14 @@ in environment.etc."egl/egl_external_platform.d".source = "/run/opengl-driver/share/egl/egl_external_platform.d/"; - hardware.opengl.package = mkIf (!offloadCfg.enable) nvidia_x11.out; - hardware.opengl.package32 = mkIf (!offloadCfg.enable) nvidia_x11.lib32; - hardware.opengl.extraPackages = optional offloadCfg.enable nvidia_x11.out; - hardware.opengl.extraPackages32 = optional offloadCfg.enable nvidia_x11.lib32; + hardware.opengl.extraPackages = [ + nvidia_x11.out + pkgs.nvidia-vaapi-driver + ]; + hardware.opengl.extraPackages32 = [ + nvidia_x11.lib32 + pkgs.pkgsi686Linux.nvidia-vaapi-driver + ]; environment.systemPackages = [ nvidia_x11.bin ] ++ optionals cfg.nvidiaSettings [ nvidia_x11.settings ] diff --git a/nixos/modules/hardware/xone.nix b/nixos/modules/hardware/xone.nix new file mode 100644 index 000000000000..89690d8c6fb1 --- /dev/null +++ b/nixos/modules/hardware/xone.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.hardware.xone; +in +{ + options.hardware.xone = { + enable = mkEnableOption "the xone driver for Xbox One and Xbobx Series X|S accessories"; + }; + + config = mkIf cfg.enable { + boot = { + blacklistedKernelModules = [ "xpad" "mt76x2u" ]; + extraModulePackages = with config.boot.kernelPackages; [ xone ]; + }; + hardware.firmware = [ pkgs.xow_dongle-firmware ]; + }; + + meta = { + maintainers = with maintainers; [ rhysmdnz ]; + }; +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 12ad8a4ae004..303493741f3d 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -10,10 +10,10 @@ with lib; isoImage.edition = "gnome"; services.xserver.desktopManager.gnome = { - # Add firefox to favorite-apps + # Add Firefox and other tools useful for installation to the launcher favoriteAppsOverride = '' [org.gnome.shell] - favorite-apps=[ 'firefox.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ] + favorite-apps=[ 'firefox.desktop', 'nixos-manual.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'gparted.desktop' ] ''; enable = true; }; diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 3ff1b3d670e9..860e240b43d4 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -91,29 +91,9 @@ let SERIAL 0 115200 TIMEOUT ${builtins.toString syslinuxTimeout} UI vesamenu.c32 - MENU TITLE NixOS MENU BACKGROUND /isolinux/background.png - MENU RESOLUTION 800 600 - MENU CLEAR - MENU ROWS 6 - MENU CMDLINEROW -4 - MENU TIMEOUTROW -3 - MENU TABMSGROW -2 - MENU HELPMSGROW -1 - MENU HELPMSGENDROW -1 - MENU MARGIN 0 - # FG:AARRGGBB BG:AARRGGBB shadow - MENU COLOR BORDER 30;44 #00000000 #00000000 none - MENU COLOR SCREEN 37;40 #FF000000 #00E2E8FF none - MENU COLOR TABMSG 31;40 #80000000 #00000000 none - MENU COLOR TIMEOUT 1;37;40 #FF000000 #00000000 none - MENU COLOR TIMEOUT_MSG 37;40 #FF000000 #00000000 none - MENU COLOR CMDMARK 1;36;40 #FF000000 #00000000 none - MENU COLOR CMDLINE 37;40 #FF000000 #00000000 none - MENU COLOR TITLE 1;36;44 #00000000 #00000000 none - MENU COLOR UNSEL 37;44 #FF000000 #00000000 none - MENU COLOR SEL 7;37;40 #FFFFFFFF #FF5277C3 std + ${config.isoImage.syslinuxTheme} DEFAULT boot @@ -601,6 +581,37 @@ in ''; }; + isoImage.syslinuxTheme = mkOption { + default = '' + MENU TITLE NixOS + MENU RESOLUTION 800 600 + MENU CLEAR + MENU ROWS 6 + MENU CMDLINEROW -4 + MENU TIMEOUTROW -3 + MENU TABMSGROW -2 + MENU HELPMSGROW -1 + MENU HELPMSGENDROW -1 + MENU MARGIN 0 + + # FG:AARRGGBB BG:AARRGGBB shadow + MENU COLOR BORDER 30;44 #00000000 #00000000 none + MENU COLOR SCREEN 37;40 #FF000000 #00E2E8FF none + MENU COLOR TABMSG 31;40 #80000000 #00000000 none + MENU COLOR TIMEOUT 1;37;40 #FF000000 #00000000 none + MENU COLOR TIMEOUT_MSG 37;40 #FF000000 #00000000 none + MENU COLOR CMDMARK 1;36;40 #FF000000 #00000000 none + MENU COLOR CMDLINE 37;40 #FF000000 #00000000 none + MENU COLOR TITLE 1;36;44 #00000000 #00000000 none + MENU COLOR UNSEL 37;44 #FF000000 #00000000 none + MENU COLOR SEL 7;37;40 #FFFFFFFF #FF5277C3 std + ''; + type = types.str; + description = '' + The syslinux theme used for BIOS boot. + ''; + }; + isoImage.appendToMenuLabel = mkOption { default = " Installer"; example = " Live System"; diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64.nix b/nixos/modules/installer/sd-card/sd-image-aarch64.nix index 165e2aac27b4..321793882f4c 100644 --- a/nixos/modules/installer/sd-card/sd-image-aarch64.nix +++ b/nixos/modules/installer/sd-card/sd-image-aarch64.nix @@ -24,6 +24,9 @@ [pi3] kernel=u-boot-rpi3.bin + [pi02] + kernel=u-boot-rpi3.bin + [pi4] kernel=u-boot-rpi4.bin enable_gic=1 @@ -33,6 +36,9 @@ # what the pi3 firmware does by default. disable_overscan=1 + # Supported in newer board revisions + arm_boost=1 + [all] # Boot in 64-bit mode. arm_64bit=1 diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 065cea470fbb..dfafda77cb56 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/hapw7q1fkjxvprnkcgw9ppczavg4daj2-nix-2.4"; - i686-linux = "/nix/store/8qlvh8pp5j8wgrzj3is2jlbhgrwgsiy9-nix-2.4"; - aarch64-linux = "/nix/store/h48lkygcqj4hdibbdnpl67q7ks6vkrd6-nix-2.4"; - x86_64-darwin = "/nix/store/c3mvzszvyzakvcp9spnjvsb8m2bpjk7m-nix-2.4"; - aarch64-darwin = "/nix/store/hbfqs62r0hga2yr4zi5kc7fzhf71bq9n-nix-2.4"; + x86_64-linux = "/nix/store/0n2wfvi1i3fg97cjc54wslvk0804y0sn-nix-2.7.0"; + i686-linux = "/nix/store/4p27c1k9z99pli6x8cxfph20yfyzn9nh-nix-2.7.0"; + aarch64-linux = "/nix/store/r9yr8ijsb0gi9r7y92y3yzyld59yp0kj-nix-2.7.0"; + x86_64-darwin = "/nix/store/hyfj5imsd0c4amlcjpf8l6w4q2draaj3-nix-2.7.0"; + aarch64-darwin = "/nix/store/9l96qllhbb6xrsjaai76dn74ap7rq92n-nix-2.7.0"; } diff --git a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix index 8aedce2fb49c..b4a94f62ad93 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix +++ b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix @@ -25,4 +25,7 @@ pkgs.runCommand "nixos-build-vms" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ln -s ${interactiveDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms wrapProgram $out/bin/nixos-test-driver \ --add-flags "--interactive" + wrapProgram $out/bin/nixos-run-vms \ + --set testScript "${pkgs.writeText "start-all" "start_all(); join_all();"}" \ + --add-flags "--no-interactive" '' diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh index 115b3d7a7c5e..89beeee7cf9e 100644 --- a/nixos/modules/installer/tools/nixos-enter.sh +++ b/nixos/modules/installer/tools/nixos-enter.sh @@ -63,32 +63,32 @@ mount --rbind /sys "$mountPoint/sys" # modified from https://github.com/archlinux/arch-install-scripts/blob/bb04ab435a5a89cd5e5ee821783477bc80db797f/arch-chroot.in#L26-L52 chroot_add_resolv_conf() { - local chrootdir=$1 resolv_conf=$1/etc/resolv.conf + local chrootDir="$1" resolvConf="$1/etc/resolv.conf" [[ -e /etc/resolv.conf ]] || return 0 # Handle resolv.conf as a symlink to somewhere else. - if [[ -L $chrootdir/etc/resolv.conf ]]; then + if [[ -L "$resolvConf" ]]; then # readlink(1) should always give us *something* since we know at this point # it's a symlink. For simplicity, ignore the case of nested symlinks. - # We also ignore the possibility if `../`s escaping the root. - resolv_conf=$(readlink "$chrootdir/etc/resolv.conf") - if [[ $resolv_conf = /* ]]; then - resolv_conf=$chrootdir$resolv_conf + # We also ignore the possibility of `../`s escaping the root. + resolvConf="$(readlink "$resolvConf")" + if [[ "$resolvConf" = /* ]]; then + resolvConf="$chrootDir$resolvConf" else - resolv_conf=$chrootdir/etc/$resolv_conf + resolvConf="$chrootDir/etc/$resolvConf" fi fi # ensure file exists to bind mount over - if [[ ! -f $resolv_conf ]]; then - install -Dm644 /dev/null "$resolv_conf" || return 1 + if [[ ! -f "$resolvConf" ]]; then + install -Dm644 /dev/null "$resolvConf" || return 1 fi - mount --bind /etc/resolv.conf "$resolv_conf" + mount --bind /etc/resolv.conf "$resolvConf" } -chroot_add_resolv_conf "$mountPoint" || print "ERROR: failed to set up resolv.conf" +chroot_add_resolv_conf "$mountPoint" || echo "$0: failed to set up resolv.conf" >&2 ( # If silent, write both stdout and stderr of activation script to /dev/null diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index fe8c4fb1a6b5..fb5d3ba47325 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -51,7 +51,9 @@ for (my $n = 0; $n < scalar @ARGV; $n++) { $n++; $rootDir = $ARGV[$n]; die "$0: ‘--root’ requires an argument\n" unless defined $rootDir; + die "$0: no need to specify `/` with `--root`, it is the default\n" if $rootDir eq "/"; $rootDir =~ s/\/*$//; # remove trailing slashes + $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path } elsif ($arg eq "--force") { $force = 1; @@ -279,7 +281,7 @@ if (`lsblk -o TYPE` =~ "lvm") { push @initrdKernelModules, "dm-snapshot"; } -my $virt = `systemd-detect-virt`; +my $virt = `@detectvirt@`; chomp $virt; @@ -398,7 +400,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { # Maybe this is a bind-mount of a filesystem we saw earlier? if (defined $fsByDev{$fields[2]}) { # Make sure this isn't a btrfs subvolume. - my $msg = `btrfs subvol show $rootDir$mountPoint`; + my $msg = `@btrfs@ subvol show $rootDir$mountPoint`; if ($? != 0 || $msg =~ /ERROR:/s) { my $path = $fields[3]; $path = "" if $path eq "/"; my $base = $fsByDev{$fields[2]}; @@ -436,7 +438,7 @@ EOF # Is this a btrfs filesystem? if ($fsType eq "btrfs") { - my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint"); + my ($status, @info) = runCommand("@btrfs@ subvol show $rootDir$mountPoint"); if ($status != 0 || join("", @info) =~ /ERROR:/) { die "Failed to retrieve subvolume info for $mountPoint\n"; } @@ -558,6 +560,8 @@ if (!$noFilesystems) { $fsAndSwap .= "swapDevices =" . multiLineList(" ", @swapDevices) . ";\n"; } +my $networkingDhcpConfig = generateNetworkingDhcpConfig(); + my $hwConfig = <rel2abs($outDir); + $outDir =~ s/\/*$//; # remove trailing slashes + } my $fn = "$outDir/hardware-configuration.nix"; print STDERR "writing $fn...\n"; diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 2f3b0cdd48f2..2e088b977710 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -33,8 +33,9 @@ let nixos-generate-config = makeProg { name = "nixos-generate-config"; src = ./nixos-generate-config.pl; - path = lib.optionals (lib.elem "btrfs" config.boot.supportedFilesystems) [ pkgs.btrfs-progs ]; perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl"; + detectvirt = "${pkgs.systemd}/bin/systemd-detect-virt"; + btrfs = "${pkgs.btrfs-progs}/bin/btrfs"; inherit (config.system.nixos-generate-config) configuration desktopConfiguration; xserverEnabled = config.services.xserver.enable; }; @@ -116,7 +117,7 @@ in ''; }; - config = lib.mkIf (!config.system.disableInstallerTools) { + config = lib.mkIf (config.nix.enable && !config.system.disableInstallerTools) { system.nixos-generate-config.configuration = mkDefault '' # Edit this configuration file to define what should be installed on @@ -133,12 +134,13 @@ in $bootLoaderConfig # networking.hostName = "nixos"; # Define your hostname. + # Pick only one of the below networking options. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. # Set your time zone. # time.timeZone = "Europe/Amsterdam"; - $networkingDhcpConfig # Configure network proxy if necessary # networking.proxy.default = "http://user:password\@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; @@ -148,6 +150,7 @@ in # console = { # font = "Lat2-Terminus16"; # keyMap = "us"; + # useXkbConfig = true; # use xkbOptions in tty. # }; $xserverConfig @@ -155,7 +158,10 @@ in $desktopConfiguration # Configure keymap in X11 # services.xserver.layout = "us"; - # services.xserver.xkbOptions = "eurosign:e"; + # services.xserver.xkbOptions = { + # "eurosign:e"; + # "caps:escape" # map caps to escape. + # }; # Enable CUPS to print documents. # services.printing.enable = true; diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index 2768e17590b3..27a7651382b2 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -25,7 +25,7 @@ with lib; installer.cloneConfigExtra = '' # Let demo build as a trusted user. - # nix.trustedUsers = [ "demo" ]; + # nix.settings.trusted-users = [ "demo" ]; # Mount a VirtualBox shared folder. # This is configurable in the VirtualBox menu at diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 2afa43a3fe71..9304c307af2f 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -61,85 +61,17 @@ let in scrubbedEval.options; baseOptionsJSON = let - filterIntoStore = + filter = builtins.filterSource (n: t: (t == "directory" -> baseNameOf n != "tests") && (t == "file" -> hasSuffix ".nix" n) ); - - # Figure out if Nix runs in pure evaluation mode. May return true in - # impure mode, but this is highly unlikely. - # We need to know because of https://github.com/NixOS/nix/issues/1888 - # and https://github.com/NixOS/nix/issues/5868 - isPureEval = builtins.getEnv "PATH" == "" && builtins.getEnv "_" == ""; - - # Return a nixpkgs subpath with minimal copying. - # - # The sources for the base options json derivation can come in one of - # two forms: - # - single source: a store path with all of nixpkgs, postfix with - # subpaths to access various directories. This has the benefit of - # not creating copies of these subtrees in the Nix store, but - # can cause unnecessary rebuilds if you update the Nixpkgs `pkgs` - # tree often. - # - split sources: multiple store paths with subdirectories of - # nixpkgs that exclude the bulk of the pkgs directory. - # This requires more copying and hashing during evaluation but - # requires fewer files to be copied. This method produces fewer - # unnecessary rebuilds of the base options json. - # - # Flake - # - # Flakes always put a copy of the full nixpkgs sources in the store, - # so we can use the "single source" method. This method is ideal - # for using nixpkgs as a dependency, as the base options json will be - # substitutable from cache.nixos.org. - # - # This requires that the `self.outPath` is wired into `pkgs` correctly, - # which is done for you if `pkgs` comes from the `lib.nixosSystem` or - # `legacyPackages` flake attributes. - # - # Other Nixpkgs invocation - # - # If you do not use the known-correct flake attributes, but rather - # invoke Nixpkgs yourself, set `config.path` to the correct path value, - # e.g. `import nixpkgs { config.path = nixpkgs; }`. - # - # Choosing between single or split source paths - # - # We make assumptions based on the type and contents of `pkgs.path`. - # By passing a different `config.path` to Nixpkgs, you can influence - # how your documentation cache is evaluated and rebuilt. - # - # Single source - # - If pkgs.path is a string containing a store path, the code has no - # choice but to create this store path, if it hasn't already been. - # We assume that the "single source" method is most efficient. - # - If pkgs.path is a path value containing that is a store path, - # we try to convert it to a string with context without copying. - # This occurs for example when nixpkgs was fetched and using its - # default `config.path`, which is `./.`. - # Nix currently does not allow this conversion when evaluating in - # pure mode. If the conversion is not possible, we use the - # "split source" method. - # - # Split source - # - If pkgs.path is a path value that is not a store path, we assume - # that it's unlikely for all of nixpkgs to end up in the store for - # other reasons and try to keep both the copying and rebuilds low. - pull = - if builtins.typeOf pkgs.path == "string" && isStorePath pkgs.path then - dir: "${pkgs.path}/${dir}" - else if !isPureEval && isStorePath pkgs.path then - dir: "${builtins.storePath pkgs.path}/${dir}" - else - dir: filterIntoStore "${toString pkgs.path}/${dir}"; in pkgs.runCommand "lazy-options.json" { - libPath = pull "lib"; - pkgsLibPath = pull "pkgs/pkgs-lib"; - nixosPath = pull "nixos"; + libPath = filter "${toString pkgs.path}/lib"; + pkgsLibPath = filter "${toString pkgs.path}/pkgs/pkgs-lib"; + nixosPath = filter "${toString pkgs.path}/nixos"; modules = map (p: ''"${removePrefix "${modulesPath}/" (toString p)}"'') docModules.lazy; } '' export NIX_STORE_DIR=$TMPDIR/store @@ -197,7 +129,7 @@ let genericName = "View NixOS documentation in a web browser"; icon = "nix-snowflake"; exec = "nixos-help"; - categories = "System"; + categories = ["System"]; }; in pkgs.symlinkJoin { diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 9d620084308b..7d1faa50f4bf 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -82,14 +82,14 @@ in git = 41; #fourstore = 42; # dropped in 20.03 #fourstorehttp = 43; # dropped in 20.03 - virtuoso = 44; + #virtuoso = 44; dropped module #rtkit = 45; # dynamically allocated 2021-09-03 dovecot2 = 46; dovenull2 = 47; prayer = 49; mpd = 50; clamav = 51; - fprot = 52; + #fprot = 52; # unused # bind = 53; #dynamically allocated as of 2021-09-03 wwwrun = 54; #adm = 55; # unused @@ -412,7 +412,7 @@ in prayer = 49; mpd = 50; clamav = 51; - fprot = 52; + #fprot = 52; # unused #bind = 53; # unused wwwrun = 54; adm = 55; diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 66a49b0b888f..204a89143008 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -183,7 +183,11 @@ in pruneNames = mkOption { type = listOf str; - default = [ ".bzr" ".cache" ".git" ".hg" ".svn" ]; + default = lib.optionals (!isFindutils) [ ".bzr" ".cache" ".git" ".hg" ".svn" ]; + defaultText = literalDocBook '' + [ ".bzr" ".cache" ".git" ".hg" ".svn" ], if + supported by the locate implementation (i.e. mlocate or plocate). + ''; description = '' Directory components which should exclude paths containing them from indexing ''; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 14dd1d816dbe..69967c8a7601 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -59,8 +59,6 @@ let inherit (cfg) config overlays localSystem crossSystem; }; - # NOTE: flake.nix assumes that nixpkgs.config is only used with ../../.. - # as nixpkgs.config.path should be equivalent to ../../.. finalPkgs = if opt.pkgs.isDefined then cfg.pkgs.appendOverlays cfg.overlays else defaultPkgs; in diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 6c526f6d4f2d..d825f4beb301 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -1,12 +1,21 @@ { config, lib, options, pkgs, ... }: -with lib; - let cfg = config.system.nixos; opt = options.system.nixos; -in + inherit (lib) + concatStringsSep mapAttrsToList toLower + literalExpression mkRenamedOptionModule mkDefault mkOption trivial types; + + needsEscaping = s: null != builtins.match "[a-zA-Z0-9]+" s; + escapeIfNeccessary = s: if needsEscaping s then s else ''"${lib.escape [ "\$" "\"" "\\" "\`" ] s}"''; + attrsToText = attrs: + concatStringsSep "\n" ( + mapAttrsToList (n: v: ''${n}=${escapeIfNeccessary (toString v)}'') attrs + ); + +in { imports = [ (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ]) @@ -101,22 +110,30 @@ in # Generate /etc/os-release. See # https://www.freedesktop.org/software/systemd/man/os-release.html for the # format. - environment.etc.os-release.text = - '' - NAME=NixOS - ID=nixos - VERSION="${cfg.release} (${cfg.codeName})" - VERSION_CODENAME=${toLower cfg.codeName} - VERSION_ID="${cfg.release}" - BUILD_ID="${cfg.version}" - PRETTY_NAME="NixOS ${cfg.release} (${cfg.codeName})" - LOGO="nix-snowflake" - HOME_URL="https://nixos.org/" - DOCUMENTATION_URL="https://nixos.org/learn.html" - SUPPORT_URL="https://nixos.org/community.html" - BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues" - ''; + environment.etc = { + "lsb-release".text = attrsToText { + LSB_VERSION = "${cfg.release} (${cfg.codeName})"; + DISTRIB_ID = "nixos"; + DISTRIB_RELEASE = cfg.release; + DISTRIB_CODENAME = toLower cfg.codeName; + DISTRIB_DESCRIPTION = "NixOS ${cfg.release} (${cfg.codeName})"; + }; + "os-release".text = attrsToText { + NAME = "NixOS"; + ID = "nixos"; + VERSION = "${cfg.release} (${cfg.codeName})"; + VERSION_CODENAME = toLower cfg.codeName; + VERSION_ID = cfg.release; + BUILD_ID = cfg.version; + PRETTY_NAME = "NixOS ${cfg.release} (${cfg.codeName})"; + LOGO = "nix-snowflake"; + HOME_URL = "https://nixos.org/"; + DOCUMENTATION_URL = "https://nixos.org/learn.html"; + SUPPORT_URL = "https://nixos.org/community.html"; + BUG_REPORT_URL = "https://github.com/NixOS/nixpkgs/issues"; + }; + }; }; # uses version info nixpkgs, which requires a full nixpkgs path diff --git a/nixos/modules/misc/wordlist.nix b/nixos/modules/misc/wordlist.nix new file mode 100644 index 000000000000..988b522d7431 --- /dev/null +++ b/nixos/modules/misc/wordlist.nix @@ -0,0 +1,59 @@ +{ config, lib, pkgs, ... }: +with lib; +let + concatAndSort = name: files: pkgs.runCommand name {} '' + awk 1 ${lib.escapeShellArgs files} | sed '{ /^\s*$/d; s/^\s\+//; s/\s\+$// }' | sort | uniq > $out + ''; +in +{ + options = { + environment.wordlist = { + enable = mkEnableOption "environment variables for lists of words"; + + lists = mkOption { + type = types.attrsOf (types.nonEmptyListOf types.path); + + default = { + WORDLIST = [ "${pkgs.scowl}/share/dict/words.txt" ]; + }; + + defaultText = literalExpression '' + { + WORDLIST = [ "''${pkgs.scowl}/share/dict/words.txt" ]; + } + ''; + + description = '' + A set with the key names being the environment variable you'd like to + set and the values being a list of paths to text documents containing + lists of words. The various files will be merged, sorted, duplicates + removed, and extraneous spacing removed. + + If you have a handful of words that you want to add to an already + existing wordlist, you may find `builtins.toFile` useful for this + task. + ''; + + example = literalExpression '' + { + WORDLIST = [ "''${pkgs.scowl}/share/dict/words.txt" ]; + AUGMENTED_WORDLIST = [ + "''${pkgs.scowl}/share/dict/words.txt" + "''${pkgs.scowl}/share/dict/words.variants.txt" + (builtins.toFile "extra-words" ''' + desynchonization + oobleck''') + ]; + } + ''; + }; + }; + }; + + config = mkIf config.environment.wordlist.enable { + environment.variables = + lib.mapAttrs + (name: value: "${concatAndSort "wordlist-${name}" value}") + config.environment.wordlist.lists; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4b2cb803e20e..adeddbf139a3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -91,6 +91,7 @@ ./hardware/video/switcheroo-control.nix ./hardware/video/uvcvideo/default.nix ./hardware/video/webcam/facetimehd.nix + ./hardware/xone.nix ./hardware/xpadneo.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx.nix @@ -115,7 +116,10 @@ ./misc/nixpkgs.nix ./misc/passthru.nix ./misc/version.nix + ./misc/wordlist.nix ./misc/nixops-autoluks.nix + ./programs/_1password.nix + ./programs/_1password-gui.nix ./programs/adb.nix ./programs/appgate-sdp.nix ./programs/atop.nix @@ -166,6 +170,8 @@ ./programs/iftop.nix ./programs/iotop.nix ./programs/java.nix + ./programs/k40-whisperer.nix + ./programs/kclock.nix ./programs/kdeconnect.nix ./programs/kbdlight.nix ./programs/less.nix @@ -176,8 +182,11 @@ ./programs/msmtp.nix ./programs/mtr.nix ./programs/nano.nix + ./programs/nbd.nix + ./programs/nix-ld.nix ./programs/neovim.nix ./programs/nm-applet.nix + ./programs/nncp.nix ./programs/npm.nix ./programs/noisetorch.nix ./programs/oblogout.nix @@ -203,7 +212,6 @@ ./programs/sway.nix ./programs/system-config-printer.nix ./programs/thefuck.nix - ./programs/tilp2.nix ./programs/tmux.nix ./programs/traceroute.nix ./programs/tsm-client.nix @@ -253,6 +261,7 @@ ./security/tpm2.nix ./services/admin/meshcentral.nix ./services/admin/oxidized.nix + ./services/admin/pgadmin.nix ./services/admin/salt/master.nix ./services/admin/salt/minion.nix ./services/amqp/activemq/default.nix @@ -297,6 +306,7 @@ ./services/backup/znapzend.nix ./services/blockchain/ethereum/geth.nix ./services/backup/zrepl.nix + ./services/cluster/corosync/default.nix ./services/cluster/hadoop/default.nix ./services/cluster/k3s/default.nix ./services/cluster/kubernetes/addons/dns.nix @@ -309,6 +319,7 @@ ./services/cluster/kubernetes/pki.nix ./services/cluster/kubernetes/proxy.nix ./services/cluster/kubernetes/scheduler.nix + ./services/cluster/pacemaker/default.nix ./services/cluster/spark/default.nix ./services/computing/boinc/client.nix ./services/computing/foldingathome/client.nix @@ -350,14 +361,12 @@ ./services/databases/redis.nix ./services/databases/riak.nix ./services/databases/victoriametrics.nix - ./services/databases/virtuoso.nix ./services/desktops/accountsservice.nix ./services/desktops/bamf.nix ./services/desktops/blueman.nix ./services/desktops/cpupower-gui.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix - ./services/desktops/pantheon/files.nix ./services/desktops/espanso.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix @@ -396,6 +405,7 @@ ./services/development/jupyterhub/default.nix ./services/development/rstudio-server/default.nix ./services/development/lorri.nix + ./services/development/zammad.nix ./services/display-managers/greetd.nix ./services/editors/emacs.nix ./services/editors/infinoted.nix @@ -452,6 +462,8 @@ ./services/hardware/undervolt.nix ./services/hardware/vdr.nix ./services/hardware/xow.nix + ./services/home-automation/home-assistant.nix + ./services/home-automation/zigbee2mqtt.nix ./services/logging/SystemdJournal2Gelf.nix ./services/logging/awstats.nix ./services/logging/filebeat.nix @@ -496,6 +508,7 @@ ./services/mail/roundcube.nix ./services/mail/sympa.nix ./services/mail/nullmailer.nix + ./services/matrix/matrix-synapse.nix ./services/matrix/mjolnir.nix ./services/matrix/pantalaimon.nix ./services/misc/ananicy.nix @@ -547,8 +560,8 @@ ./services/misc/headphones.nix ./services/misc/heisenbridge.nix ./services/misc/greenclip.nix - ./services/misc/home-assistant.nix ./services/misc/ihaskell.nix + ./services/misc/input-remapper.nix ./services/misc/irkerd.nix ./services/misc/jackett.nix ./services/misc/jellyfin.nix @@ -562,7 +575,6 @@ ./services/misc/matrix-appservice-discord.nix ./services/misc/matrix-appservice-irc.nix ./services/misc/matrix-conduit.nix - ./services/misc/matrix-synapse.nix ./services/misc/mautrix-facebook.nix ./services/misc/mautrix-telegram.nix ./services/misc/mbpfan.nix @@ -597,6 +609,7 @@ ./services/misc/redmine.nix ./services/misc/rippled.nix ./services/misc/ripple-data-api.nix + ./services/misc/rmfakecloud.nix ./services/misc/serviio.nix ./services/misc/safeeyes.nix ./services/misc/sdrplay.nix @@ -622,7 +635,6 @@ ./services/misc/weechat.nix ./services/misc/xmr-stak.nix ./services/misc/xmrig.nix - ./services/misc/zigbee2mqtt.nix ./services/misc/zoneminder.nix ./services/misc/zookeeper.nix ./services/monitoring/alerta.nix @@ -684,6 +696,7 @@ ./services/network-filesystems/litestream/default.nix ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix + ./services/network-filesystems/moosefs.nix ./services/network-filesystems/openafs/client.nix ./services/network-filesystems/openafs/server.nix ./services/network-filesystems/orangefs/server.nix @@ -717,6 +730,7 @@ ./services/networking/bird.nix ./services/networking/bitlbee.nix ./services/networking/blockbook-frontend.nix + ./services/networking/blocky.nix ./services/networking/charybdis.nix ./services/networking/cjdns.nix ./services/networking/cntlm.nix @@ -760,12 +774,13 @@ ./services/networking/go-neb.nix ./services/networking/go-shadowsocks2.nix ./services/networking/gobgpd.nix - ./services/networking/gogoclient.nix ./services/networking/gvpe.nix ./services/networking/hans.nix ./services/networking/haproxy.nix + ./services/networking/headscale.nix ./services/networking/hostapd.nix ./services/networking/htpdate.nix + ./services/networking/https-dns-proxy.nix ./services/networking/hylafax/default.nix ./services/networking/i2pd.nix ./services/networking/i2p.nix @@ -812,6 +827,7 @@ ./services/networking/nar-serve.nix ./services/networking/nat.nix ./services/networking/nats.nix + ./services/networking/nbd.nix ./services/networking/ndppd.nix ./services/networking/nebula.nix ./services/networking/networkmanager.nix @@ -852,7 +868,6 @@ ./services/networking/quassel.nix ./services/networking/quorum.nix ./services/networking/quicktun.nix - ./services/networking/racoon.nix ./services/networking/radicale.nix ./services/networking/radvd.nix ./services/networking/rdnssd.nix @@ -872,6 +887,7 @@ ./services/networking/shorewall6.nix ./services/networking/shout.nix ./services/networking/sniproxy.nix + ./services/networking/snowflake-proxy.nix ./services/networking/smartdns.nix ./services/networking/smokeping.nix ./services/networking/softether.nix @@ -896,6 +912,7 @@ ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix ./services/networking/tedicross.nix + ./services/networking/tetrd.nix ./services/networking/teleport.nix ./services/networking/thelounge.nix ./services/networking/tinc.nix @@ -915,6 +932,7 @@ ./services/networking/vsftpd.nix ./services/networking/wasabibackend.nix ./services/networking/websockify.nix + ./services/networking/wg-netmanager.nix ./services/networking/wg-quick.nix ./services/networking/wireguard.nix ./services/networking/wpa_supplicant.nix @@ -944,7 +962,6 @@ ./services/security/clamav.nix ./services/security/fail2ban.nix ./services/security/fprintd.nix - ./services/security/fprot.nix ./services/security/haka.nix ./services/security/haveged.nix ./services/security/hockeypuck.nix @@ -977,6 +994,7 @@ ./services/system/nscd.nix ./services/system/saslauthd.nix ./services/system/self-deploy.nix + ./services/system/systembus-notify.nix ./services/system/uptimed.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix @@ -1006,6 +1024,7 @@ ./services/web-apps/documize.nix ./services/web-apps/dokuwiki.nix ./services/web-apps/engelsystem.nix + ./services/web-apps/ethercalc.nix ./services/web-apps/fluidd.nix ./services/web-apps/galene.nix ./services/web-apps/gerrit.nix @@ -1055,6 +1074,7 @@ ./services/web-apps/wordpress.nix ./services/web-apps/youtrack.nix ./services/web-apps/zabbix.nix + ./services/web-servers/agate.nix ./services/web-servers/apache-httpd/default.nix ./services/web-servers/caddy/default.nix ./services/web-servers/darkhttpd.nix @@ -1074,7 +1094,6 @@ ./services/web-servers/phpfpm/default.nix ./services/web-servers/pomerium.nix ./services/web-servers/unit/default.nix - ./services/web-servers/shellinabox.nix ./services/web-servers/tomcat.nix ./services/web-servers/traefik.nix ./services/web-servers/trafficserver/default.nix @@ -1154,15 +1173,21 @@ ./system/boot/stage-1.nix ./system/boot/stage-2.nix ./system/boot/systemd.nix - ./system/boot/systemd-nspawn.nix + ./system/boot/systemd/coredump.nix + ./system/boot/systemd/journald.nix + ./system/boot/systemd/logind.nix + ./system/boot/systemd/nspawn.nix + ./system/boot/systemd/tmpfiles.nix + ./system/boot/systemd/user.nix ./system/boot/timesyncd.nix ./system/boot/tmp.nix - ./system/etc/etc.nix + ./system/etc/etc-activation.nix ./tasks/auto-upgrade.nix ./tasks/bcache.nix ./tasks/cpu-freq.nix ./tasks/encrypted-devices.nix ./tasks/filesystems.nix + ./tasks/filesystems/apfs.nix ./tasks/filesystems/bcachefs.nix ./tasks/filesystems/btrfs.nix ./tasks/filesystems/cifs.nix diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 3f8f78f012a7..856ee480fc0b 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -17,7 +17,7 @@ with lib; boot.kernelPackages = mkDefault pkgs.linuxPackages_hardened; - nix.allowedUsers = mkDefault [ "@users" ]; + nix.settings.allowed-users = mkDefault [ "@users" ]; environment.memoryAllocator.provider = mkDefault "scudo"; environment.variables.SCUDO_OPTIONS = mkDefault "ZeroContents=1"; diff --git a/nixos/modules/programs/_1password-gui.nix b/nixos/modules/programs/_1password-gui.nix new file mode 100644 index 000000000000..f57de44bb9e2 --- /dev/null +++ b/nixos/modules/programs/_1password-gui.nix @@ -0,0 +1,69 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs._1password-gui; + +in { + options = { + programs._1password-gui = { + enable = mkEnableOption "The 1Password Desktop application with browser integration"; + + groupId = mkOption { + type = types.int; + example = literalExpression "5000"; + description = '' + The GroupID to assign to the onepassword group, which is needed for browser integration. The group ID must be 1000 or greater. + ''; + }; + + polkitPolicyOwners = mkOption { + type = types.listOf types.str; + default = []; + example = literalExpression "[\"user1\" \"user2\" \"user3\"]"; + description = '' + A list of users who should be able to integrate 1Password with polkit-based authentication mechanisms. By default, no users will have such access. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs._1password-gui; + defaultText = literalExpression "pkgs._1password-gui"; + example = literalExpression "pkgs._1password-gui"; + description = '' + The 1Password derivation to use. This can be used to upgrade from the stable release that we keep in nixpkgs to the betas. + ''; + }; + }; + }; + + config = let + package = cfg.package.override { + polkitPolicyOwners = cfg.polkitPolicyOwners; + }; + in mkIf cfg.enable { + environment.systemPackages = [ package ]; + users.groups.onepassword.gid = cfg.groupId; + + security.wrappers = { + "1Password-BrowserSupport" = + { source = "${cfg.package}/share/1password/1Password-BrowserSupport"; + owner = "root"; + group = "onepassword"; + setuid = false; + setgid = true; + }; + + "1Password-KeyringHelper" = + { source = "${cfg.package}/share/1password/1Password-KeyringHelper"; + owner = "root"; + group = "onepassword"; + setuid = true; + setgid = true; + }; + }; + + }; +} diff --git a/nixos/modules/programs/_1password.nix b/nixos/modules/programs/_1password.nix new file mode 100644 index 000000000000..eae518e61ca7 --- /dev/null +++ b/nixos/modules/programs/_1password.nix @@ -0,0 +1,46 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs._1password; +in { + options = { + programs._1password = { + enable = mkEnableOption "The 1Password CLI tool with biometric unlock and integration with the 1Password GUI."; + + groupId = mkOption { + type = types.int; + example = literalExpression "5001"; + description = '' + The GroupID to assign to the onepassword-cli group, which is needed for integration with the 1Password GUI. The group ID must be 1000 or greater. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs._1password; + defaultText = literalExpression "pkgs._1password"; + example = literalExpression "pkgs._1password"; + description = '' + The 1Password CLI derivation to use. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + users.groups.onepassword-cli.gid = cfg.groupId; + + security.wrappers = { + "op" = { + source = "${cfg.package}/bin/op"; + owner = "root"; + group = "onepassword-cli"; + setuid = false; + setgid = true; + }; + }; + }; +} diff --git a/nixos/modules/programs/calls.nix b/nixos/modules/programs/calls.nix index 59961625e5d9..08a223b408d4 100644 --- a/nixos/modules/programs/calls.nix +++ b/nixos/modules/programs/calls.nix @@ -14,6 +14,8 @@ in { }; config = mkIf cfg.enable { + programs.dconf.enable = true; + environment.systemPackages = [ pkgs.calls ]; diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index dc054504ea48..aad554c2bd66 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -1,8 +1,12 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.programs.captive-browser; + + inherit (lib) + concatStringsSep escapeShellArgs optionalString + literalExpression mkEnableOption mkIf mkOption mkOptionDefault types; + browserDefault = chromium: concatStringsSep " " [ ''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"'' ''${chromium}/bin/chromium'' @@ -15,6 +19,15 @@ let ''-no-default-browser-check'' ''http://cache.nixos.org/'' ]; + + desktopItem = pkgs.makeDesktopItem { + name = "captive-browser"; + desktopName = "Captive Portal Browser"; + exec = "/run/wrappers/bin/captive-browser"; + icon = "nix-snowflake"; + categories = [ "Network" ]; + }; + in { ###### interface @@ -84,6 +97,11 @@ in ###### implementation config = mkIf cfg.enable { + environment.systemPackages = [ + (pkgs.runCommandNoCC "captive-browser-desktop-item" { } '' + install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*.desktop + '') + ]; programs.captive-browser.dhcp-dns = let diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixos/modules/programs/command-not-found/command-not-found.pl index 220d057b7f4f..72e246c81ae9 100644 --- a/nixos/modules/programs/command-not-found/command-not-found.pl +++ b/nixos/modules/programs/command-not-found/command-not-found.pl @@ -21,11 +21,24 @@ my $res = $dbh->selectall_arrayref( "select package from Programs where system = ? and name = ?", { Slice => {} }, $system, $program); -if (!defined $res || scalar @$res == 0) { +my $len = !defined $res ? 0 : scalar @$res; + +if ($len == 0) { print STDERR "$program: command not found\n"; -} elsif (scalar @$res == 1) { +} elsif ($len == 1) { my $package = @$res[0]->{package}; if ($ENV{"NIX_AUTO_RUN"} // "") { + if ($ENV{"NIX_AUTO_RUN_INTERACTIVE"} // "") { + while (1) { + print STDERR "'$program' from package '$package' will be run, confirm? [yn]: "; + chomp(my $comfirm = ); + if (lc $comfirm eq "n") { + exit 0; + } elsif (lc $comfirm eq "y") { + last; + } + } + } exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV)); } else { print STDERR <{package}\n"; + } + my $choice = 0; + while (1) { # exec will break this loop + no warnings "numeric"; + print STDERR "Your choice [1-${len}]: "; + # 0 can be invalid user input like non-number string + # so we start from 1 + $choice = + 0; + if (1 <= $choice && $choice <= $len) { + exec("nix-shell", "-p", @$res[$choice - 1]->{package}, + "--run", shell_quote("exec", @ARGV)); + } + } + } else { + print STDERR <{package}\n" foreach @$res; + print STDERR " nix-shell -p $_->{package}\n" foreach @$res; + } } exit 127; diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index 298abac8afa9..265c41cbbbc9 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -60,7 +60,7 @@ in environment.systemPackages = [ pkgs.dconf ]; # Needed for unwrapped applications - environment.variables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ]; + environment.sessionVariables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ]; }; } diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index d552c751afd7..a448727be778 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -40,13 +40,15 @@ in KDEDIRS = [ "" ]; QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ]; QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ]; - GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ]; + GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" "/lib/gtk-4.0" ]; XDG_CONFIG_DIRS = [ "/etc/xdg" ]; XDG_DATA_DIRS = [ "/share" ]; MOZ_PLUGIN_PATH = [ "/lib/mozilla/plugins" ]; LIBEXEC_PATH = [ "/lib/libexec" ]; }; + environment.pathsToLink = [ "/lib/gtk-2.0" "/lib/gtk-3.0" "/lib/gtk-4.0" ]; + environment.extraInit = '' unset ASPELL_CONF diff --git a/nixos/modules/programs/firejail.nix b/nixos/modules/programs/firejail.nix index 8c10d7c4df39..76b42168c198 100644 --- a/nixos/modules/programs/firejail.nix +++ b/nixos/modules/programs/firejail.nix @@ -17,8 +17,8 @@ let then value else { executable = value; profile = null; extraArgs = []; }; args = lib.escapeShellArgs ( - (optional (opts.profile != null) "--profile=${toString opts.profile}") - ++ opts.extraArgs + opts.extraArgs + ++ (optional (opts.profile != null) "--profile=${toString opts.profile}") ); in '' diff --git a/nixos/modules/programs/k40-whisperer.nix b/nixos/modules/programs/k40-whisperer.nix new file mode 100644 index 000000000000..3163e45f57e4 --- /dev/null +++ b/nixos/modules/programs/k40-whisperer.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.k40-whisperer; + pkg = cfg.package.override { + udevGroup = cfg.group; + }; +in +{ + options.programs.k40-whisperer = { + enable = mkEnableOption "K40-Whisperer"; + + group = mkOption { + type = types.str; + description = '' + Group assigned to the device when connected. + ''; + default = "k40"; + }; + + package = mkOption { + type = types.package; + default = pkgs.k40-whisperer; + defaultText = literalExpression "pkgs.k40-whisperer"; + example = literalExpression "pkgs.k40-whisperer"; + description = '' + K40 Whisperer package to use. + ''; + }; + }; + + config = mkIf cfg.enable { + users.groups.${cfg.group} = {}; + + environment.systemPackages = [ pkg ]; + services.udev.packages = [ pkg ]; + }; +} diff --git a/nixos/modules/programs/kclock.nix b/nixos/modules/programs/kclock.nix new file mode 100644 index 000000000000..42d81d2798ba --- /dev/null +++ b/nixos/modules/programs/kclock.nix @@ -0,0 +1,13 @@ +{ lib, pkgs, config, ... }: +with lib; +let + cfg = config.programs.kclock; + kclockPkg = pkgs.libsForQt5.kclock; +in { + options.programs.kclock = { enable = mkEnableOption "Enable KClock"; }; + + config = mkIf cfg.enable { + services.dbus.packages = [ kclockPkg ]; + environment.systemPackages = [ kclockPkg ]; + }; +} diff --git a/nixos/modules/programs/nbd.nix b/nixos/modules/programs/nbd.nix new file mode 100644 index 000000000000..fea9bc1ff71a --- /dev/null +++ b/nixos/modules/programs/nbd.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.nbd; +in +{ + options = { + programs.nbd = { + enable = mkEnableOption "Network Block Device (nbd) support"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ nbd ]; + boot.kernelModules = [ "nbd" ]; + }; +} diff --git a/nixos/modules/programs/nix-ld.nix b/nixos/modules/programs/nix-ld.nix new file mode 100644 index 000000000000..810a74ab50b7 --- /dev/null +++ b/nixos/modules/programs/nix-ld.nix @@ -0,0 +1,12 @@ +{ pkgs, lib, config, ... }: +{ + meta.maintainers = [ lib.maintainers.mic92 ]; + options = { + programs.nix-ld.enable = lib.mkEnableOption ''nix-ld, Documentation: ''; + }; + config = lib.mkIf config.programs.nix-ld.enable { + systemd.tmpfiles.rules = [ + "L+ ${pkgs.nix-ld.ldPath} - - - - ${pkgs.nix-ld}/libexec/nix-ld" + ]; + }; +} diff --git a/nixos/modules/programs/nncp.nix b/nixos/modules/programs/nncp.nix new file mode 100644 index 000000000000..29a703eadf10 --- /dev/null +++ b/nixos/modules/programs/nncp.nix @@ -0,0 +1,101 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + nncpCfgFile = "/run/nncp.hjson"; + programCfg = config.programs.nncp; + settingsFormat = pkgs.formats.json { }; + jsonCfgFile = settingsFormat.generate "nncp.json" programCfg.settings; + pkg = programCfg.package; +in { + options.programs.nncp = { + + enable = + mkEnableOption "NNCP (Node to Node copy) utilities and configuration"; + + group = mkOption { + type = types.str; + default = "uucp"; + description = '' + The group under which NNCP files shall be owned. + Any member of this group may access the secret keys + of this NNCP node. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.nncp; + defaultText = literalExpression "pkgs.nncp"; + description = "The NNCP package to use system-wide."; + }; + + secrets = mkOption { + type = with types; listOf str; + example = [ "/run/keys/nncp.hjson" ]; + description = '' + A list of paths to NNCP configuration files that should not be + in the Nix store. These files are layered on top of the values at + . + ''; + }; + + settings = mkOption { + type = settingsFormat.type; + description = '' + NNCP configuration, see + . + At runtime these settings will be overlayed by the contents of + into the file + ${nncpCfgFile}. Node keypairs go in + secrets, do not specify them in + settings as they will be leaked into + /nix/store! + ''; + default = { }; + }; + + }; + + config = mkIf programCfg.enable { + + environment = { + systemPackages = [ pkg ]; + etc."nncp.hjson".source = nncpCfgFile; + }; + + programs.nncp.settings = { + spool = mkDefault "/var/spool/nncp"; + log = mkDefault "/var/spool/nncp/log"; + }; + + systemd.tmpfiles.rules = [ + "d ${programCfg.settings.spool} 0770 root ${programCfg.group}" + "f ${programCfg.settings.log} 0770 root ${programCfg.group}" + ]; + + systemd.services.nncp-config = { + path = [ pkg ]; + description = "Generate NNCP configuration"; + wantedBy = [ "basic.target" ]; + serviceConfig.Type = "oneshot"; + script = '' + umask u=rw + nncpCfgDir=$(mktemp --directory nncp.XXX) + for f in ${jsonCfgFile} ${toString config.programs.nncp.secrets}; do + tmpdir=$(mktemp --directory nncp.XXX) + nncp-cfgdir -cfg $f -dump $tmpdir + find $tmpdir -size 1c -delete + cp -a $tmpdir/* $nncpCfgDir/ + rm -rf $tmpdir + done + nncp-cfgdir -load $nncpCfgDir > ${nncpCfgFile} + rm -rf $nncpCfgDir + chgrp ${programCfg.group} ${nncpCfgFile} + chmod g+r ${nncpCfgFile} + ''; + }; + }; + + meta.maintainers = with lib.maintainers; [ ehmry ]; +} diff --git a/nixos/modules/programs/phosh.nix b/nixos/modules/programs/phosh.nix index cba3f73768ec..ad875616ac9e 100644 --- a/nixos/modules/programs/phosh.nix +++ b/nixos/modules/programs/phosh.nix @@ -8,18 +8,17 @@ let # Based on https://source.puri.sm/Librem5/librem5-base/-/blob/4596c1056dd75ac7f043aede07887990fd46f572/default/sm.puri.OSK0.desktop oskItem = pkgs.makeDesktopItem { name = "sm.puri.OSK0"; - type = "Application"; desktopName = "On-screen keyboard"; exec = "${pkgs.squeekboard}/bin/squeekboard"; - categories = "GNOME;Core;"; - extraEntries = '' - OnlyShowIn=GNOME; - NoDisplay=true - X-GNOME-Autostart-Phase=Panel - X-GNOME-Provides=inputmethod - X-GNOME-Autostart-Notify=true - X-GNOME-AutoRestart=true - ''; + categories = [ "GNOME" "Core" ]; + onlyShowIn = [ "GNOME" ]; + noDisplay = true; + extraConfig = { + X-GNOME-Autostart-Phase = "Panel"; + X-GNOME-Provides = "inputmethod"; + X-GNOME-Autostart-Notify = "true"; + X-GNOME-AutoRestart = "true"; + }; }; phocConfigType = types.submodule { diff --git a/nixos/modules/programs/spacefm.nix b/nixos/modules/programs/spacefm.nix index 822fca3ecec7..f71abcaa3325 100644 --- a/nixos/modules/programs/spacefm.nix +++ b/nixos/modules/programs/spacefm.nix @@ -27,13 +27,11 @@ in default = { tmp_dir = "/tmp"; terminal_su = "${pkgs.sudo}/bin/sudo"; - graphical_su = "${pkgs.gksu}/bin/gksu"; }; defaultText = literalExpression '' { tmp_dir = "/tmp"; terminal_su = "''${pkgs.sudo}/bin/sudo"; - graphical_su = "''${pkgs.gksu}/bin/gksu"; } ''; description = '' diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index bb9904d19560..01b047281344 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -134,6 +134,7 @@ in { ''; }; }; + security.polkit.enable = true; security.pam.services.swaylock = {}; hardware.opengl.enable = mkDefault true; fonts.enableDefaultFonts = mkDefault true; diff --git a/nixos/modules/programs/tilp2.nix b/nixos/modules/programs/tilp2.nix deleted file mode 100644 index da9e32e3e6c6..000000000000 --- a/nixos/modules/programs/tilp2.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.programs.tilp2; - -in { - options.programs.tilp2 = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable tilp2 and udev rules for supported calculators. - ''; - }; - }; - - config = mkIf cfg.enable { - services.udev.packages = [ - pkgs.libticables2 - ]; - - environment.systemPackages = [ - pkgs.tilp2 - ]; - }; -} diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index c39908751d29..74b3fbd9ac06 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -52,6 +52,12 @@ let set -s escape-time ${toString cfg.escapeTime} set -g history-limit ${toString cfg.historyLimit} + ${lib.optionalString (cfg.plugins != []) '' + # Run plugins + ${lib.concatMapStringsSep "\n" (x: "run-shell ${x.rtp}") cfg.plugins} + + ''} + ${cfg.extraConfig} ''; @@ -165,6 +171,13 @@ in { downside it doesn't survive user logout. ''; }; + + plugins = mkOption { + default = []; + type = types.listOf types.package; + description = "List of plugins to install."; + example = lib.literalExpression "[ pkgs.tmuxPlugins.nord ]"; + }; }; }; @@ -174,7 +187,7 @@ in { environment = { etc."tmux.conf".text = tmuxConf; - systemPackages = [ pkgs.tmux ]; + systemPackages = [ pkgs.tmux ] ++ cfg.plugins; variables = { TMUX_TMPDIR = lib.optional cfg.secureSocket ''''${XDG_RUNTIME_DIR:-"/run/user/$(id -u)"}''; diff --git a/nixos/modules/programs/zsh/zsh-autosuggestions.nix b/nixos/modules/programs/zsh/zsh-autosuggestions.nix index fee324cc7326..2e53e907d547 100644 --- a/nixos/modules/programs/zsh/zsh-autosuggestions.nix +++ b/nixos/modules/programs/zsh/zsh-autosuggestions.nix @@ -22,17 +22,18 @@ in }; strategy = mkOption { - type = types.enum [ "history" "match_prev_cmd" ]; - default = "history"; + type = types.listOf (types.enum [ "history" "completion" "match_prev_cmd" ]); + default = [ "history" ]; description = '' - Set ZSH_AUTOSUGGEST_STRATEGY to choose the strategy for generating suggestions. - There are currently two to choose from: + `ZSH_AUTOSUGGEST_STRATEGY` is an array that specifies how suggestions should be generated. + The strategies in the array are tried successively until a suggestion is found. + There are currently three built-in strategies to choose from: - * history: Chooses the most recent match. - * match_prev_cmd: Chooses the most recent match whose preceding history item matches - the most recently executed command (more info). Note that this strategy won't work as - expected with ZSH options that don't preserve the history order such as - HIST_IGNORE_ALL_DUPS or HIST_EXPIRE_DUPS_FIRST. + - `history`: Chooses the most recent match from history. + - `completion`: Chooses a suggestion based on what tab-completion would suggest. (requires `zpty` module) + - `match_prev_cmd`: Like `history`, but chooses the most recent match whose preceding history item matches + the most recently executed command. Note that this strategy won't work as expected with ZSH options that + don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`. ''; }; @@ -62,7 +63,7 @@ in source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}" - export ZSH_AUTOSUGGEST_STRATEGY=("${cfg.strategy}") + export ZSH_AUTOSUGGEST_STRATEGY=(${concatStringsSep " " cfg.strategy}) ${optionalString (!cfg.async) "unset ZSH_AUTOSUGGEST_USE_ASYNC"} ${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index b9a2f47f3f5a..195cf87e6a85 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -32,6 +32,7 @@ with lib; '') (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html")) (mkRemovedOptionModule [ "security" "hideProcessInformation" ] '' @@ -49,6 +50,7 @@ with lib; (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.") (mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed") (mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed") + (mkRemovedOptionModule [ "services" "fprot" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed") (mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.") @@ -59,6 +61,9 @@ with lib; (mkRemovedOptionModule [ "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed") + (mkRemovedOptionModule [ "services" "pantheon" "files" ] '' + This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly. + '') (mkRemovedOptionModule [ "services" "prey" ] '' prey-bash-client is deprecated upstream '') @@ -80,6 +85,12 @@ with lib; libinput and synaptics. '') (mkRemovedOptionModule [ "virtualisation" "rkt" ] "The rkt module has been removed, it was archived by upstream") + (mkRemovedOptionModule [ "services" "racoon" ] '' + The racoon module has been removed, because the software project was abandoned upstream. + '') + (mkRemovedOptionModule [ "services" "shellinabox" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "gogoclient" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "virtuoso" ] "The corresponding package was removed from nixpkgs.") # Do NOT add any option renames here, see top of the file ]; diff --git a/nixos/modules/security/google_oslogin.nix b/nixos/modules/security/google_oslogin.nix index c2889a0f0d1d..cf416035ef60 100644 --- a/nixos/modules/security/google_oslogin.nix +++ b/nixos/modules/security/google_oslogin.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.security.googleOsLogin; - package = pkgs.google-compute-engine-oslogin; + package = pkgs.google-guest-oslogin; in @@ -17,7 +17,7 @@ in type = types.bool; default = false; description = '' - Whether to enable Google OS Login + Whether to enable Google OS Login. The OS Login package enables the following components: AuthorizedKeysCommand to query valid SSH keys from the user's OS Login @@ -36,7 +36,7 @@ in security.pam.services.sshd = { makeHomeDir = true; googleOsLoginAccountVerification = true; - # disabled for now: googleOsLoginAuthentication = true; + googleOsLoginAuthentication = true; }; security.sudo.extraConfig = '' @@ -47,6 +47,9 @@ in "d /var/google-users.d 750 root root -" ]; + systemd.packages = [ package ]; + systemd.timers.google-oslogin-cache.wantedBy = [ "timers.target" ]; + # enable the nss module, so user lookups etc. work system.nssModules = [ package ]; system.nssDatabases.passwd = [ "cache_oslogin" "oslogin" ]; diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix index e7abc1e0d597..c20e067b8cc7 100644 --- a/nixos/modules/security/misc.nix +++ b/nixos/modules/security/misc.nix @@ -123,8 +123,8 @@ with lib; boot.kernel.sysctl."user.max_user_namespaces" = 0; assertions = [ - { assertion = config.nix.useSandbox -> config.security.allowUserNamespaces; - message = "`nix.useSandbox = true` conflicts with `!security.allowUserNamespaces`."; + { assertion = config.nix.settings.sandbox -> config.security.allowUserNamespaces; + message = "`nix.settings.sandbox = true` conflicts with `!security.allowUserNamespaces`."; } ]; }) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 964cfe7040c1..c0ef8b5f30bd 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -444,15 +444,15 @@ let account sufficient ${pam_krb5}/lib/security/pam_krb5.so '' + optionalString cfg.googleOsLoginAccountVerification '' - account [success=ok ignore=ignore default=die] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so - account [success=ok default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_admin.so + 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 '' + '' # Authentication management. '' + optionalString cfg.googleOsLoginAuthentication '' - auth [success=done perm_denied=bad default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so + 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 @@ -518,7 +518,7 @@ let auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so ${optionalString cfg.gnupg.storeOnly " store-only"} '' + optionalString cfg.googleAuthenticator.enable '' - auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp + 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 @@ -1091,11 +1091,11 @@ in mr ${pam_ccreds}/lib/security/pam_ccreds.so, '' + optionalString (isEnabled (cfg: cfg.googleOsLoginAccountVerification)) '' - mr ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so, - mr ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_admin.so, + 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-compute-engine-oslogin}/lib/pam_oslogin_login.so, + mr ${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so, '' + optionalString (config.security.pam.enableSSHAgentAuth && isEnabled (cfg: cfg.sshAgentAuth)) '' diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index d9c58152f1fa..1ba149745c65 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -12,11 +12,7 @@ in options = { - security.polkit.enable = mkOption { - type = types.bool; - default = true; - description = "Whether to enable PolKit."; - }; + security.polkit.enable = mkEnableOption "polkit"; security.polkit.extraConfig = mkOption { type = types.lines; diff --git a/nixos/modules/security/systemd-confinement.nix b/nixos/modules/security/systemd-confinement.nix index 0e3ec5af323e..f3a2de3bf87a 100644 --- a/nixos/modules/security/systemd-confinement.nix +++ b/nixos/modules/security/systemd-confinement.nix @@ -175,8 +175,8 @@ in { serviceName = "${name}.service"; excludedPath = rootPaths; } '' - mkdir -p "$out/lib/systemd/system" - serviceFile="$out/lib/systemd/system/$serviceName" + mkdir -p "$out/lib/systemd/system/$serviceName.d" + serviceFile="$out/lib/systemd/system/$serviceName.d/confinement.conf" echo '[Service]' > "$serviceFile" diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 66a47bcaab6c..e63f19010de8 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -92,7 +92,6 @@ let , permissions , ... }: - assert (lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3"); '' cp ${securityWrapper}/bin/security-wrapper "$wrapperDir/${program}" echo -n "${source}" > "$wrapperDir/${program}.real" diff --git a/nixos/modules/services/admin/pgadmin.nix b/nixos/modules/services/admin/pgadmin.nix new file mode 100644 index 000000000000..80b681454104 --- /dev/null +++ b/nixos/modules/services/admin/pgadmin.nix @@ -0,0 +1,127 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + pkg = pkgs.pgadmin4; + cfg = config.services.pgadmin; + + _base = with types; [ int bool str ]; + base = with types; oneOf ([ (listOf (oneOf _base)) (attrsOf (oneOf _base)) ] ++ _base); + + formatAttrset = attr: + "{${concatStringsSep "\n" (mapAttrsToList (key: value: "${builtins.toJSON key}: ${formatPyValue value},") attr)}}"; + + formatPyValue = value: + if builtins.isString value then builtins.toJSON value + else if value ? _expr then value._expr + else if builtins.isInt value then toString value + else if builtins.isBool value then (if value then "True" else "False") + else if builtins.isAttrs value then (formatAttrset value) + else if builtins.isList value then "[${concatStringsSep "\n" (map (v: "${formatPyValue v},") value)}]" + else throw "Unrecognized type"; + + formatPy = attrs: + concatStringsSep "\n" (mapAttrsToList (key: value: "${key} = ${formatPyValue value}") attrs); + + pyType = with types; attrsOf (oneOf [ (attrsOf base) (listOf base) base ]); +in +{ + options.services.pgadmin = { + enable = mkEnableOption "PostgreSQL Admin 4"; + + port = mkOption { + description = "Port for pgadmin4 to run on"; + type = types.port; + default = 5050; + }; + + initialEmail = mkOption { + description = "Initial email for the pgAdmin account."; + type = types.str; + }; + + initialPasswordFile = mkOption { + description = '' + Initial password file for the pgAdmin account. + NOTE: Should be string not a store path, to prevent the password from being world readable. + ''; + type = types.path; + }; + + openFirewall = mkEnableOption "firewall passthrough for pgadmin4"; + + settings = mkOption { + description = '' + Settings for pgadmin4. + Documentation. + ''; + type = pyType; + default= {}; + }; + }; + + config = mkIf (cfg.enable) { + networking.firewall.allowedTCPPorts = mkIf (cfg.openFirewall) [ cfg.port ]; + + services.pgadmin.settings = { + DEFAULT_SERVER_PORT = cfg.port; + SERVER_MODE = true; + } // (optionalAttrs cfg.openFirewall { + DEFAULT_SERVER = mkDefault "::"; + }); + + systemd.services.pgadmin = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + requires = [ "network.target" ]; + # we're adding this optionally so just in case there's any race it'll be caught + # in case postgres doesn't start, pgadmin will just start normally + wants = [ "postgresql.service" ]; + + path = [ config.services.postgresql.package pkgs.coreutils pkgs.bash ]; + + preStart = '' + # NOTE: this is idempotent (aka running it twice has no effect) + ( + # Email address: + echo ${escapeShellArg cfg.initialEmail} + + # file might not contain newline. echo hack fixes that. + PW=$(cat ${escapeShellArg cfg.initialPasswordFile}) + + # Password: + echo "$PW" + # Retype password: + echo "$PW" + ) | ${pkg}/bin/pgadmin4-setup + ''; + + restartTriggers = [ + "/etc/pgadmin/config_system.py" + ]; + + serviceConfig = { + User = "pgadmin"; + DynamicUser = true; + LogsDirectory = "pgadmin"; + StateDirectory = "pgadmin"; + ExecStart = "${pkg}/bin/pgadmin4"; + }; + }; + + users.users.pgadmin = { + isSystemUser = true; + group = "pgadmin"; + }; + + users.groups.pgadmin = {}; + + environment.etc."pgadmin/config_system.py" = { + text = formatPy cfg.settings; + mode = "0600"; + user = "pgadmin"; + group = "pgadmin"; + }; + }; +} diff --git a/nixos/modules/services/audio/jmusicbot.nix b/nixos/modules/services/audio/jmusicbot.nix index f573bd2ab8dd..e0f8d461af07 100644 --- a/nixos/modules/services/audio/jmusicbot.nix +++ b/nixos/modules/services/audio/jmusicbot.nix @@ -9,6 +9,13 @@ in services.jmusicbot = { enable = mkEnableOption "jmusicbot, a Discord music bot that's easy to set up and run yourself"; + package = mkOption { + type = types.package; + default = pkgs.jmusicbot; + defaultText = literalExpression "pkgs.jmusicbot"; + description = "JMusicBot package to use"; + }; + stateDir = mkOption { type = types.path; description = '' @@ -27,7 +34,7 @@ in after = [ "network-online.target" ]; description = "Discord music bot that's easy to set up and run yourself!"; serviceConfig = mkMerge [{ - ExecStart = "${pkgs.jmusicbot}/bin/JMusicBot"; + ExecStart = "${cfg.package}/bin/JMusicBot"; WorkingDirectory = cfg.stateDir; Restart = "always"; RestartSec = 20; diff --git a/nixos/modules/services/audio/snapserver.nix b/nixos/modules/services/audio/snapserver.nix index b82aca3976f0..6d5ce98df895 100644 --- a/nixos/modules/services/audio/snapserver.nix +++ b/nixos/modules/services/audio/snapserver.nix @@ -44,24 +44,24 @@ let optionString = concatStringsSep " " (mapAttrsToList streamToOption cfg.streams # global options - ++ [ "--stream.bind_to_address ${cfg.listenAddress}" ] - ++ [ "--stream.port ${toString cfg.port}" ] - ++ optionalNull cfg.sampleFormat "--stream.sampleformat ${cfg.sampleFormat}" - ++ optionalNull cfg.codec "--stream.codec ${cfg.codec}" - ++ optionalNull cfg.streamBuffer "--stream.stream_buffer ${toString cfg.streamBuffer}" - ++ optionalNull cfg.buffer "--stream.buffer ${toString cfg.buffer}" + ++ [ "--stream.bind_to_address=${cfg.listenAddress}" ] + ++ [ "--stream.port=${toString cfg.port}" ] + ++ optionalNull cfg.sampleFormat "--stream.sampleformat=${cfg.sampleFormat}" + ++ optionalNull cfg.codec "--stream.codec=${cfg.codec}" + ++ optionalNull cfg.streamBuffer "--stream.stream_buffer=${toString cfg.streamBuffer}" + ++ optionalNull cfg.buffer "--stream.buffer=${toString cfg.buffer}" ++ optional cfg.sendToMuted "--stream.send_to_muted" # tcp json rpc - ++ [ "--tcp.enabled ${toString cfg.tcp.enable}" ] + ++ [ "--tcp.enabled=${toString cfg.tcp.enable}" ] ++ optionals cfg.tcp.enable [ - "--tcp.bind_to_address ${cfg.tcp.listenAddress}" - "--tcp.port ${toString cfg.tcp.port}" ] + "--tcp.bind_to_address=${cfg.tcp.listenAddress}" + "--tcp.port=${toString cfg.tcp.port}" ] # http json rpc - ++ [ "--http.enabled ${toString cfg.http.enable}" ] + ++ [ "--http.enabled=${toString cfg.http.enable}" ] ++ optionals cfg.http.enable [ - "--http.bind_to_address ${cfg.http.listenAddress}" - "--http.port ${toString cfg.http.port}" - ] ++ optional (cfg.http.docRoot != null) "--http.doc_root \"${toString cfg.http.docRoot}\""); + "--http.bind_to_address=${cfg.http.listenAddress}" + "--http.port=${toString cfg.http.port}" + ] ++ optional (cfg.http.docRoot != null) "--http.doc_root=\"${toString cfg.http.docRoot}\""); in { imports = [ diff --git a/nixos/modules/services/audio/squeezelite.nix b/nixos/modules/services/audio/squeezelite.nix index 05506f5bcc7a..36295e21c60f 100644 --- a/nixos/modules/services/audio/squeezelite.nix +++ b/nixos/modules/services/audio/squeezelite.nix @@ -1,50 +1,46 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkEnableOption mkIf mkOption optionalString types; + dataDir = "/var/lib/squeezelite"; cfg = config.services.squeezelite; + pkg = if cfg.pulseAudio then pkgs.squeezelite-pulse else pkgs.squeezelite; + bin = "${pkg}/bin/${pkg.pname}"; -in { +in +{ ###### interface - options = { + options.services.squeezelite = { + enable = mkEnableOption "Squeezelite, a software Squeezebox emulator"; - services.squeezelite= { - - enable = mkEnableOption "Squeezelite, a software Squeezebox emulator"; - - extraArguments = mkOption { - default = ""; - type = types.str; - description = '' - Additional command line arguments to pass to Squeezelite. - ''; - }; + pulseAudio = mkEnableOption "pulseaudio support"; + extraArguments = mkOption { + default = ""; + type = types.str; + description = '' + Additional command line arguments to pass to Squeezelite. + ''; }; - }; ###### implementation config = mkIf cfg.enable { - - systemd.services.squeezelite= { + systemd.services.squeezelite = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" "sound.target" ]; description = "Software Squeezebox emulator"; serviceConfig = { DynamicUser = true; - ExecStart = "${pkgs.squeezelite}/bin/squeezelite -N ${dataDir}/player-name ${cfg.extraArguments}"; + ExecStart = "${bin} -N ${dataDir}/player-name ${cfg.extraArguments}"; StateDirectory = builtins.baseNameOf dataDir; SupplementaryGroups = "audio"; }; }; - }; - } diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 9fca21002733..c40a0b5abc40 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -113,9 +113,10 @@ in }; }; services.mysql-backup = { - description = "Mysql backup service"; + description = "MySQL backup service"; enable = true; serviceConfig = { + Type = "oneshot"; User = cfg.user; }; script = backupScript; diff --git a/nixos/modules/services/cluster/corosync/default.nix b/nixos/modules/services/cluster/corosync/default.nix new file mode 100644 index 000000000000..b4144917feea --- /dev/null +++ b/nixos/modules/services/cluster/corosync/default.nix @@ -0,0 +1,112 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.corosync; +in +{ + # interface + options.services.corosync = { + enable = mkEnableOption "corosync"; + + package = mkOption { + type = types.package; + default = pkgs.corosync; + defaultText = literalExpression "pkgs.corosync"; + description = "Package that should be used for corosync."; + }; + + clusterName = mkOption { + type = types.str; + default = "nixcluster"; + description = "Name of the corosync cluster."; + }; + + extraOptions = mkOption { + type = with types; listOf str; + default = []; + description = "Additional options with which to start corosync."; + }; + + nodelist = mkOption { + description = "Corosync nodelist: all cluster members."; + default = []; + type = with types; listOf (submodule { + options = { + nodeid = mkOption { + type = int; + description = "Node ID number"; + }; + name = mkOption { + type = str; + description = "Node name"; + }; + ring_addrs = mkOption { + type = listOf str; + description = "List of addresses, one for each ring."; + }; + }; + }); + }; + }; + + # implementation + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + environment.etc."corosync/corosync.conf".text = '' + totem { + version: 2 + secauth: on + cluster_name: ${cfg.clusterName} + transport: knet + } + + nodelist { + ${concatMapStrings ({ nodeid, name, ring_addrs }: '' + node { + nodeid: ${toString nodeid} + name: ${name} + ${concatStrings (imap0 (i: addr: '' + ring${toString i}_addr: ${addr} + '') ring_addrs)} + } + '') cfg.nodelist} + } + + quorum { + # only corosync_votequorum is supported + provider: corosync_votequorum + wait_for_all: 0 + ${optionalString (builtins.length cfg.nodelist < 3) '' + two_node: 1 + ''} + } + + logging { + to_syslog: yes + } + ''; + + environment.etc."corosync/uidgid.d/root".text = '' + # allow pacemaker connection by root + uidgid { + uid: 0 + gid: 0 + } + ''; + + systemd.packages = [ cfg.package ]; + systemd.services.corosync = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + StateDirectory = "corosync"; + StateDirectoryMode = "0700"; + }; + }; + + environment.etc."sysconfig/corosync".text = lib.optionalString (cfg.extraOptions != []) '' + COROSYNC_OPTIONS="${lib.escapeShellArgs cfg.extraOptions}" + ''; + }; +} diff --git a/nixos/modules/services/cluster/hadoop/conf.nix b/nixos/modules/services/cluster/hadoop/conf.nix index 0caec5cfc203..e3c26a0d5505 100644 --- a/nixos/modules/services/cluster/hadoop/conf.nix +++ b/nixos/modules/services/cluster/hadoop/conf.nix @@ -1,6 +1,6 @@ { cfg, pkgs, lib }: let - propertyXml = name: value: '' + propertyXml = name: value: lib.optionalString (value != null) '' ${name} ${builtins.toString value} @@ -29,16 +29,16 @@ let export HADOOP_LOG_DIR=/tmp/hadoop/$USER ''; in -pkgs.runCommand "hadoop-conf" {} '' +pkgs.runCommand "hadoop-conf" {} (with cfg; '' mkdir -p $out/ - cp ${siteXml "core-site.xml" cfg.coreSite}/* $out/ - cp ${siteXml "hdfs-site.xml" cfg.hdfsSite}/* $out/ - cp ${siteXml "mapred-site.xml" cfg.mapredSite}/* $out/ - cp ${siteXml "yarn-site.xml" cfg.yarnSite}/* $out/ - cp ${siteXml "httpfs-site.xml" cfg.httpfsSite}/* $out/ - cp ${cfgFile "container-executor.cfg" cfg.containerExecutorCfg}/* $out/ + cp ${siteXml "core-site.xml" (coreSite // coreSiteInternal)}/* $out/ + cp ${siteXml "hdfs-site.xml" (hdfsSiteDefault // hdfsSite // hdfsSiteInternal)}/* $out/ + cp ${siteXml "mapred-site.xml" (mapredSiteDefault // mapredSite)}/* $out/ + cp ${siteXml "yarn-site.xml" (yarnSiteDefault // yarnSite // yarnSiteInternal)}/* $out/ + cp ${siteXml "httpfs-site.xml" httpfsSite}/* $out/ + cp ${cfgFile "container-executor.cfg" containerExecutorCfg}/* $out/ cp ${pkgs.writeTextDir "hadoop-user-functions.sh" userFunctions}/* $out/ cp ${pkgs.writeTextDir "hadoop-env.sh" hadoopEnv}/* $out/ - cp ${cfg.log4jProperties} $out/log4j.properties - ${lib.concatMapStringsSep "\n" (dir: "cp -r ${dir}/* $out/") cfg.extraConfDirs} -'' + cp ${log4jProperties} $out/log4j.properties + ${lib.concatMapStringsSep "\n" (dir: "cp -r ${dir}/* $out/") extraConfDirs} +'') diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix index a1a95fe31cac..a4fdea81037c 100644 --- a/nixos/modules/services/cluster/hadoop/default.nix +++ b/nixos/modules/services/cluster/hadoop/default.nix @@ -21,24 +21,50 @@ with lib; ''; }; + coreSiteInternal = mkOption { + default = {}; + type = types.attrsOf types.anything; + internal = true; + description = '' + Internal option to add configs to core-site.xml based on module options + ''; + }; - hdfsSite = mkOption { + hdfsSiteDefault = mkOption { default = { "dfs.namenode.rpc-bind-host" = "0.0.0.0"; + "dfs.namenode.http-address" = "0.0.0.0:9870"; + "dfs.namenode.servicerpc-bind-host" = "0.0.0.0"; + "dfs.namenode.http-bind-host" = "0.0.0.0"; }; type = types.attrsOf types.anything; + description = '' + Default options for hdfs-site.xml + ''; + }; + hdfsSite = mkOption { + default = {}; + type = types.attrsOf types.anything; example = literalExpression '' { "dfs.nameservices" = "namenode1"; } ''; description = '' - Hadoop hdfs-site.xml definition + Additional options and overrides for hdfs-site.xml ''; }; + hdfsSiteInternal = mkOption { + default = {}; + type = types.attrsOf types.anything; + internal = true; + description = '' + Internal option to add configs to hdfs-site.xml based on module options + ''; + }; - mapredSite = mkOption { + mapredSiteDefault = mkOption { default = { "mapreduce.framework.name" = "yarn"; "yarn.app.mapreduce.am.env" = "HADOOP_MAPRED_HOME=${cfg.package}/lib/${cfg.package.untarDir}"; @@ -54,18 +80,25 @@ with lib; } ''; type = types.attrsOf types.anything; + description = '' + Default options for mapred-site.xml + ''; + }; + mapredSite = mkOption { + default = {}; + type = types.attrsOf types.anything; example = literalExpression '' - options.services.hadoop.mapredSite.default // { + { "mapreduce.map.java.opts" = "-Xmx900m -XX:+UseParallelGC"; } ''; description = '' - Hadoop mapred-site.xml definition + Additional options and overrides for mapred-site.xml ''; }; - yarnSite = mkOption { + yarnSiteDefault = mkOption { default = { "yarn.nodemanager.admin-env" = "PATH=$PATH"; "yarn.nodemanager.aux-services" = "mapreduce_shuffle"; @@ -77,19 +110,34 @@ with lib; "yarn.nodemanager.linux-container-executor.path" = "/run/wrappers/yarn-nodemanager/bin/container-executor"; "yarn.nodemanager.log-dirs" = "/var/log/hadoop/yarn/nodemanager"; "yarn.resourcemanager.bind-host" = "0.0.0.0"; - "yarn.resourcemanager.scheduler.class" = "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler"; + "yarn.resourcemanager.scheduler.class" = "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler"; }; type = types.attrsOf types.anything; + description = '' + Default options for yarn-site.xml + ''; + }; + yarnSite = mkOption { + default = {}; + type = types.attrsOf types.anything; example = literalExpression '' - options.services.hadoop.yarnSite.default // { + { "yarn.resourcemanager.hostname" = "''${config.networking.hostName}"; } ''; description = '' - Hadoop yarn-site.xml definition + Additional options and overrides for yarn-site.xml ''; }; + yarnSiteInternal = mkOption { + default = {}; + type = types.attrsOf types.anything; + internal = true; + description = '' + Internal option to add configs to yarn-site.xml based on module options + ''; + }; httpfsSite = mkOption { default = { }; @@ -123,6 +171,7 @@ with lib; "yarn.nodemanager.linux-container-executor.group"="hadoop"; "min.user.id"=1000; "feature.terminal.enabled"=1; + "feature.mount-cgroup.enabled" = 1; }; type = types.attrsOf types.anything; example = literalExpression '' @@ -148,6 +197,8 @@ with lib; description = "Directories containing additional config files to be added to HADOOP_CONF_DIR"; }; + gatewayRole.enable = mkEnableOption "gateway role for deploying hadoop configs"; + package = mkOption { type = types.package; default = pkgs.hadoop; @@ -157,20 +208,16 @@ with lib; }; - config = mkMerge [ - (mkIf (builtins.hasAttr "yarn" config.users.users || - builtins.hasAttr "hdfs" config.users.users || - builtins.hasAttr "httpfs" config.users.users) { - users.groups.hadoop = { - gid = config.ids.gids.hadoop; - }; - environment = { - systemPackages = [ cfg.package ]; - etc."hadoop-conf".source = let - hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/"; - in "${hadoopConf}"; - }; - }) - - ]; + config = mkIf cfg.gatewayRole.enable { + users.groups.hadoop = { + gid = config.ids.gids.hadoop; + }; + environment = { + systemPackages = [ cfg.package ]; + etc."hadoop-conf".source = let + hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/"; + in "${hadoopConf}"; + variables.HADOOP_CONF_DIR = "/etc/hadoop-conf/"; + }; + }; } diff --git a/nixos/modules/services/cluster/hadoop/hdfs.nix b/nixos/modules/services/cluster/hadoop/hdfs.nix index be667aa82d8a..325a002ad32f 100644 --- a/nixos/modules/services/cluster/hadoop/hdfs.nix +++ b/nixos/modules/services/cluster/hadoop/hdfs.nix @@ -1,191 +1,191 @@ -{ config, lib, pkgs, ...}: +{ config, lib, pkgs, ... }: with lib; let cfg = config.services.hadoop; + + # Config files for hadoop services hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/"; - restartIfChanged = mkOption { - type = types.bool; - description = '' - Automatically restart the service on config change. - This can be set to false to defer restarts on clusters running critical applications. - Please consider the security implications of inadvertently running an older version, - and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option. - ''; - default = false; - }; + + # Generator for HDFS service options + hadoopServiceOption = { serviceName, firewallOption ? true, extraOpts ? null }: { + enable = mkEnableOption serviceName; + restartIfChanged = mkOption { + type = types.bool; + description = '' + Automatically restart the service on config change. + This can be set to false to defer restarts on clusters running critical applications. + Please consider the security implications of inadvertently running an older version, + and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option. + ''; + default = false; + }; + extraFlags = mkOption{ + type = with types; listOf str; + default = []; + description = "Extra command line flags to pass to ${serviceName}"; + example = [ + "-Dcom.sun.management.jmxremote" + "-Dcom.sun.management.jmxremote.port=8010" + ]; + }; + extraEnv = mkOption{ + type = with types; attrsOf str; + default = {}; + description = "Extra environment variables for ${serviceName}"; + }; + } // (optionalAttrs firewallOption { + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Open firewall ports for ${serviceName}."; + }; + }) // (optionalAttrs (extraOpts != null) extraOpts); + + # Generator for HDFS service configs + hadoopServiceConfig = + { name + , serviceOptions ? cfg.hdfs."${toLower name}" + , description ? "Hadoop HDFS ${name}" + , User ? "hdfs" + , allowedTCPPorts ? [ ] + , preStart ? "" + , environment ? { } + , extraConfig ? { } + }: ( + + mkIf serviceOptions.enable ( mkMerge [{ + systemd.services."hdfs-${toLower name}" = { + inherit description preStart; + environment = environment // serviceOptions.extraEnv; + wantedBy = [ "multi-user.target" ]; + inherit (serviceOptions) restartIfChanged; + serviceConfig = { + inherit User; + SyslogIdentifier = "hdfs-${toLower name}"; + ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} ${toLower name} ${escapeShellArgs serviceOptions.extraFlags}"; + Restart = "always"; + }; + }; + + services.hadoop.gatewayRole.enable = true; + + networking.firewall.allowedTCPPorts = mkIf + ((builtins.hasAttr "openFirewall" serviceOptions) && serviceOptions.openFirewall) + allowedTCPPorts; + } extraConfig]) + ); + in { options.services.hadoop.hdfs = { - namenode = { - enable = mkEnableOption "Whether to run the HDFS NameNode"; + + namenode = hadoopServiceOption { serviceName = "HDFS NameNode"; } // { formatOnInit = mkOption { type = types.bool; default = false; description = '' - Format HDFS namenode on first start. This is useful for quickly spinning up ephemeral HDFS clusters with a single namenode. - For HA clusters, initialization involves multiple steps across multiple nodes. Follow [this guide](https://hadoop.apache.org/docs/stable/hadoop-project-dist/hadoop-hdfs/HDFSHighAvailabilityWithQJM.html) - to initialize an HA cluster manually. - ''; - }; - inherit restartIfChanged; - openFirewall = mkOption { - type = types.bool; - default = true; - description = '' - Open firewall ports for namenode + Format HDFS namenode on first start. This is useful for quickly spinning up + ephemeral HDFS clusters with a single namenode. + For HA clusters, initialization involves multiple steps across multiple nodes. + Follow this guide to initialize an HA cluster manually: + ''; }; }; - datanode = { - enable = mkEnableOption "Whether to run the HDFS DataNode"; - inherit restartIfChanged; - openFirewall = mkOption { - type = types.bool; - default = true; - description = '' - Open firewall ports for datanode - ''; + + datanode = hadoopServiceOption { serviceName = "HDFS DataNode"; } // { + dataDirs = mkOption { + default = null; + description = "Tier and path definitions for datanode storage."; + type = with types; nullOr (listOf (submodule { + options = { + type = mkOption { + type = enum [ "SSD" "DISK" "ARCHIVE" "RAM_DISK" ]; + description = '' + Storage types ([SSD]/[DISK]/[ARCHIVE]/[RAM_DISK]) for HDFS storage policies. + ''; + }; + path = mkOption { + type = path; + example = [ "/var/lib/hadoop/hdfs/dn" ]; + description = "Determines where on the local filesystem a data node should store its blocks."; + }; + }; + })); }; }; - journalnode = { - enable = mkEnableOption "Whether to run the HDFS JournalNode"; - inherit restartIfChanged; - openFirewall = mkOption { - type = types.bool; - default = true; - description = '' - Open firewall ports for journalnode - ''; - }; + + journalnode = hadoopServiceOption { serviceName = "HDFS JournalNode"; }; + + zkfc = hadoopServiceOption { + serviceName = "HDFS ZooKeeper failover controller"; + firewallOption = false; }; - zkfc = { - enable = mkEnableOption "Whether to run the HDFS ZooKeeper failover controller"; - inherit restartIfChanged; - }; - httpfs = { - enable = mkEnableOption "Whether to run the HDFS HTTPfs server"; + + httpfs = hadoopServiceOption { serviceName = "HDFS JournalNode"; } // { tempPath = mkOption { type = types.path; default = "/tmp/hadoop/httpfs"; - description = '' - HTTPFS_TEMP path used by HTTPFS - ''; - }; - inherit restartIfChanged; - openFirewall = mkOption { - type = types.bool; - default = true; - description = '' - Open firewall ports for HTTPFS - ''; + description = "HTTPFS_TEMP path used by HTTPFS"; }; }; + }; config = mkMerge [ - (mkIf cfg.hdfs.namenode.enable { - systemd.services.hdfs-namenode = { - description = "Hadoop HDFS NameNode"; - wantedBy = [ "multi-user.target" ]; - inherit (cfg.hdfs.namenode) restartIfChanged; - - preStart = (mkIf cfg.hdfs.namenode.formatOnInit '' - ${cfg.package}/bin/hdfs --config ${hadoopConf} namenode -format -nonInteractive || true - ''); - - serviceConfig = { - User = "hdfs"; - SyslogIdentifier = "hdfs-namenode"; - ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} namenode"; - Restart = "always"; - }; - }; - - networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.namenode.openFirewall [ + (hadoopServiceConfig { + name = "NameNode"; + allowedTCPPorts = [ 9870 # namenode.http-address 8020 # namenode.rpc-address - 8022 # namenode. servicerpc-address - ]); + 8022 # namenode.servicerpc-address + 8019 # dfs.ha.zkfc.port + ]; + preStart = (mkIf cfg.hdfs.namenode.formatOnInit + "${cfg.package}/bin/hdfs --config ${hadoopConf} namenode -format -nonInteractive || true" + ); }) - (mkIf cfg.hdfs.datanode.enable { - systemd.services.hdfs-datanode = { - description = "Hadoop HDFS DataNode"; - wantedBy = [ "multi-user.target" ]; - inherit (cfg.hdfs.datanode) restartIfChanged; - serviceConfig = { - User = "hdfs"; - SyslogIdentifier = "hdfs-datanode"; - ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} datanode"; - Restart = "always"; - }; - }; - - networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.datanode.openFirewall [ + (hadoopServiceConfig { + name = "DataNode"; + # port numbers for datanode changed between hadoop 2 and 3 + allowedTCPPorts = if versionAtLeast cfg.package.version "3" then [ 9864 # datanode.http.address 9866 # datanode.address 9867 # datanode.ipc.address - ]); + ] else [ + 50075 # datanode.http.address + 50010 # datanode.address + 50020 # datanode.ipc.address + ]; + extraConfig.services.hadoop.hdfsSiteInternal."dfs.datanode.data.dir" = let d = cfg.hdfs.datanode.dataDirs; in + if (d!= null) then (concatMapStringsSep "," (x: "["+x.type+"]file://"+x.path) cfg.hdfs.datanode.dataDirs) else d; }) - (mkIf cfg.hdfs.journalnode.enable { - systemd.services.hdfs-journalnode = { - description = "Hadoop HDFS JournalNode"; - wantedBy = [ "multi-user.target" ]; - inherit (cfg.hdfs.journalnode) restartIfChanged; - serviceConfig = { - User = "hdfs"; - SyslogIdentifier = "hdfs-journalnode"; - ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} journalnode"; - Restart = "always"; - }; - }; - - networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.journalnode.openFirewall [ + (hadoopServiceConfig { + name = "JournalNode"; + allowedTCPPorts = [ 8480 # dfs.journalnode.http-address 8485 # dfs.journalnode.rpc-address - ]); + ]; }) - (mkIf cfg.hdfs.zkfc.enable { - systemd.services.hdfs-zkfc = { - description = "Hadoop HDFS ZooKeeper failover controller"; - wantedBy = [ "multi-user.target" ]; - inherit (cfg.hdfs.zkfc) restartIfChanged; - serviceConfig = { - User = "hdfs"; - SyslogIdentifier = "hdfs-zkfc"; - ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} zkfc"; - Restart = "always"; - }; - }; + (hadoopServiceConfig { + name = "zkfc"; + description = "Hadoop HDFS ZooKeeper failover controller"; }) - (mkIf cfg.hdfs.httpfs.enable { - systemd.services.hdfs-httpfs = { - description = "Hadoop httpfs"; - wantedBy = [ "multi-user.target" ]; - inherit (cfg.hdfs.httpfs) restartIfChanged; - environment.HTTPFS_TEMP = cfg.hdfs.httpfs.tempPath; - - preStart = '' - mkdir -p $HTTPFS_TEMP - ''; - - serviceConfig = { - User = "httpfs"; - SyslogIdentifier = "hdfs-httpfs"; - ExecStart = "${cfg.package}/bin/hdfs --config ${hadoopConf} httpfs"; - Restart = "always"; - }; - }; - networking.firewall.allowedTCPPorts = (mkIf cfg.hdfs.httpfs.openFirewall [ + (hadoopServiceConfig { + name = "HTTPFS"; + environment.HTTPFS_TEMP = cfg.hdfs.httpfs.tempPath; + preStart = "mkdir -p $HTTPFS_TEMP"; + User = "httpfs"; + allowedTCPPorts = [ 14000 # httpfs.http.port - ]); + ]; }) - (mkIf ( - cfg.hdfs.namenode.enable || cfg.hdfs.datanode.enable || cfg.hdfs.journalnode.enable || cfg.hdfs.zkfc.enable - ) { + + (mkIf cfg.gatewayRole.enable { users.users.hdfs = { description = "Hadoop HDFS user"; group = "hadoop"; @@ -199,5 +199,6 @@ in isSystemUser = true; }; }) + ]; } diff --git a/nixos/modules/services/cluster/hadoop/yarn.nix b/nixos/modules/services/cluster/hadoop/yarn.nix index 37c26ea10f76..74e16bdec687 100644 --- a/nixos/modules/services/cluster/hadoop/yarn.nix +++ b/nixos/modules/services/cluster/hadoop/yarn.nix @@ -13,23 +13,77 @@ let ''; default = false; }; + extraFlags = mkOption{ + type = with types; listOf str; + default = []; + description = "Extra command line flags to pass to the service"; + example = [ + "-Dcom.sun.management.jmxremote" + "-Dcom.sun.management.jmxremote.port=8010" + ]; + }; + extraEnv = mkOption{ + type = with types; attrsOf str; + default = {}; + description = "Extra environment variables"; + }; in { options.services.hadoop.yarn = { resourcemanager = { - enable = mkEnableOption "Whether to run the Hadoop YARN ResourceManager"; - inherit restartIfChanged; + enable = mkEnableOption "Hadoop YARN ResourceManager"; + inherit restartIfChanged extraFlags extraEnv; + openFirewall = mkOption { type = types.bool; - default = true; + default = false; description = '' Open firewall ports for resourcemanager ''; }; }; nodemanager = { - enable = mkEnableOption "Whether to run the Hadoop YARN NodeManager"; - inherit restartIfChanged; + enable = mkEnableOption "Hadoop YARN NodeManager"; + inherit restartIfChanged extraFlags extraEnv; + + resource = { + cpuVCores = mkOption { + description = "Number of vcores that can be allocated for containers."; + type = with types; nullOr ints.positive; + default = null; + }; + maximumAllocationVCores = mkOption { + description = "The maximum virtual CPU cores any container can be allocated."; + type = with types; nullOr ints.positive; + default = null; + }; + memoryMB = mkOption { + description = "Amount of physical memory, in MB, that can be allocated for containers."; + type = with types; nullOr ints.positive; + default = null; + }; + maximumAllocationMB = mkOption { + description = "The maximum physical memory any container can be allocated."; + type = with types; nullOr ints.positive; + default = null; + }; + }; + + useCGroups = mkOption { + type = types.bool; + default = true; + description = '' + Use cgroups to enforce resource limits on containers + ''; + }; + + localDir = mkOption { + description = "List of directories to store localized files in."; + type = with types; nullOr (listOf path); + example = [ "/var/lib/hadoop/yarn/nm" ]; + default = null; + }; + addBinBash = mkOption { type = types.bool; default = true; @@ -39,7 +93,7 @@ in }; openFirewall = mkOption { type = types.bool; - default = true; + default = false; description = '' Open firewall ports for nodemanager. Because containers can listen on any ephemeral port, TCP ports 1024–65535 will be opened. @@ -49,10 +103,7 @@ in }; config = mkMerge [ - (mkIf ( - cfg.yarn.resourcemanager.enable || cfg.yarn.nodemanager.enable - ) { - + (mkIf cfg.gatewayRole.enable { users.users.yarn = { description = "Hadoop YARN user"; group = "hadoop"; @@ -65,15 +116,19 @@ in description = "Hadoop YARN ResourceManager"; wantedBy = [ "multi-user.target" ]; inherit (cfg.yarn.resourcemanager) restartIfChanged; + environment = cfg.yarn.resourcemanager.extraEnv; serviceConfig = { User = "yarn"; SyslogIdentifier = "yarn-resourcemanager"; ExecStart = "${cfg.package}/bin/yarn --config ${hadoopConf} " + - " resourcemanager"; + " resourcemanager ${escapeShellArgs cfg.yarn.resourcemanager.extraFlags}"; Restart = "always"; }; }; + + services.hadoop.gatewayRole.enable = true; + networking.firewall.allowedTCPPorts = (mkIf cfg.yarn.resourcemanager.openFirewall [ 8088 # resourcemanager.webapp.address 8030 # resourcemanager.scheduler.address @@ -94,6 +149,7 @@ in description = "Hadoop YARN NodeManager"; wantedBy = [ "multi-user.target" ]; inherit (cfg.yarn.nodemanager) restartIfChanged; + environment = cfg.yarn.nodemanager.extraEnv; preStart = '' # create log dir @@ -101,8 +157,9 @@ in chown yarn:hadoop /var/log/hadoop/yarn/nodemanager # set up setuid container executor binary + umount /run/wrappers/yarn-nodemanager/cgroup/cpu || true rm -rf /run/wrappers/yarn-nodemanager/ || true - mkdir -p /run/wrappers/yarn-nodemanager/{bin,etc/hadoop} + 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/ chgrp hadoop /run/wrappers/yarn-nodemanager/bin/container-executor chmod 6050 /run/wrappers/yarn-nodemanager/bin/container-executor @@ -114,11 +171,26 @@ in SyslogIdentifier = "yarn-nodemanager"; PermissionsStartOnly = true; ExecStart = "${cfg.package}/bin/yarn --config ${hadoopConf} " + - " nodemanager"; + " nodemanager ${escapeShellArgs cfg.yarn.nodemanager.extraFlags}"; Restart = "always"; }; }; + services.hadoop.gatewayRole.enable = true; + + services.hadoop.yarnSiteInternal = with cfg.yarn.nodemanager; { + "yarn.nodemanager.local-dirs" = localDir; + "yarn.scheduler.maximum-allocation-vcores" = resource.maximumAllocationVCores; + "yarn.scheduler.maximum-allocation-mb" = resource.maximumAllocationMB; + "yarn.nodemanager.resource.cpu-vcores" = resource.cpuVCores; + "yarn.nodemanager.resource.memory-mb" = resource.memoryMB; + } // mkIf useCGroups { + "yarn.nodemanager.linux-container-executor.cgroups.hierarchy" = "/hadoop-yarn"; + "yarn.nodemanager.linux-container-executor.resources-handler.class" = "org.apache.hadoop.yarn.server.nodemanager.util.CgroupsLCEResourcesHandler"; + "yarn.nodemanager.linux-container-executor.cgroups.mount" = "true"; + "yarn.nodemanager.linux-container-executor.cgroups.mount-path" = "/run/wrappers/yarn-nodemanager/cgroup"; + }; + networking.firewall.allowedTCPPortRanges = [ (mkIf (cfg.yarn.nodemanager.openFirewall) {from = 1024; to = 65535;}) ]; diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index 50b6780bbe66..3a36cfa3f37b 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -91,11 +91,6 @@ in virtualisation.docker = mkIf cfg.docker { enable = mkDefault true; }; - - # TODO: disable this once k3s supports cgroupsv2, either by docker - # supporting it, or their bundled containerd - systemd.enableUnifiedCgroupHierarchy = false; - environment.systemPackages = [ config.services.k3s.package ]; systemd.services.k3s = { @@ -119,6 +114,7 @@ in [ "${cfg.package}/bin/k3s ${cfg.role}" ] ++ (optional cfg.docker "--docker") + ++ (optional (cfg.docker && config.systemd.enableUnifiedCgroupHierarchy) "--kubelet-arg=cgroup-driver=systemd") ++ (optional cfg.disableAgent "--disable-agent") ++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}") ++ (optional (cfg.token != "") "--token ${cfg.token}") diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index 88bde4e91557..7d9198d20e8c 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -266,7 +266,7 @@ in in '' export KUBECONFIG=${clusterAdminKubeconfig} - ${kubectl}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files} + ${kubernetes}/bin/kubectl apply -f ${concatStringsSep " \\\n -f " files} ''; })]); diff --git a/nixos/modules/services/cluster/kubernetes/scheduler.nix b/nixos/modules/services/cluster/kubernetes/scheduler.nix index 2a522f1db89c..2d95528a6ead 100644 --- a/nixos/modules/services/cluster/kubernetes/scheduler.nix +++ b/nixos/modules/services/cluster/kubernetes/scheduler.nix @@ -66,12 +66,12 @@ in serviceConfig = { Slice = "kubernetes.slice"; ExecStart = ''${top.package}/bin/kube-scheduler \ - --address=${cfg.address} \ + --bind-address=${cfg.address} \ ${optionalString (cfg.featureGates != []) "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ --kubeconfig=${top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \ --leader-elect=${boolToString cfg.leaderElect} \ - --port=${toString cfg.port} \ + --secure-port=${toString cfg.port} \ ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ ${cfg.extraOpts} ''; diff --git a/nixos/modules/services/cluster/pacemaker/default.nix b/nixos/modules/services/cluster/pacemaker/default.nix new file mode 100644 index 000000000000..7eeadffcc586 --- /dev/null +++ b/nixos/modules/services/cluster/pacemaker/default.nix @@ -0,0 +1,52 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.pacemaker; +in +{ + # interface + options.services.pacemaker = { + enable = mkEnableOption "pacemaker"; + + package = mkOption { + type = types.package; + default = pkgs.pacemaker; + defaultText = literalExpression "pkgs.pacemaker"; + description = "Package that should be used for pacemaker."; + }; + }; + + # implementation + config = mkIf cfg.enable { + assertions = [ { + assertion = config.services.corosync.enable; + message = '' + Enabling services.pacemaker requires a services.corosync configuration. + ''; + } ]; + + environment.systemPackages = [ cfg.package ]; + + # required by pacemaker + users.users.hacluster = { + isSystemUser = true; + group = "pacemaker"; + home = "/var/lib/pacemaker"; + }; + users.groups.pacemaker = {}; + + systemd.tmpfiles.rules = [ + "d /var/log/pacemaker 0700 hacluster pacemaker -" + ]; + + systemd.packages = [ cfg.package ]; + systemd.services.pacemaker = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + StateDirectory = "pacemaker"; + StateDirectoryMode = "0700"; + }; + }; + }; +} diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index 7686ff99bfc0..8cbe54c60604 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -362,6 +362,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "systemd-tmpfiles-clean.service" ]; + requires = [ "network.target" ]; serviceConfig = { Type = "forking"; @@ -371,12 +372,12 @@ in ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; LimitMEMLOCK = "infinity"; }; - - preStart = '' - mkdir -p /var/spool - ''; }; + systemd.tmpfiles.rules = mkIf cfg.client.enable [ + "d /var/spool/slurmd 755 root root -" + ]; + services.openssh.forwardX11 = mkIf cfg.client.enable (mkDefault true); systemd.services.slurmctld = mkIf (cfg.server.enable) { diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index aaa159d3cb18..80c6c6abfd0b 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -64,7 +64,7 @@ in { description = "Factory Steps"; default = []; example = [ - "steps.Git(repourl='git://github.com/buildbot/pyflakes.git', mode='incremental')" + "steps.Git(repourl='https://github.com/buildbot/pyflakes.git', mode='incremental')" "steps.ShellCommand(command=['trial', 'pyflakes'])" ]; }; @@ -74,7 +74,7 @@ in { description = "List of Change Sources."; default = []; example = [ - "changes.GitPoller('git://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)" + "changes.GitPoller('https://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)" ]; }; diff --git a/nixos/modules/services/continuous-integration/github-runner.nix b/nixos/modules/services/continuous-integration/github-runner.nix index afd85c972b56..a7645e1f56e9 100644 --- a/nixos/modules/services/continuous-integration/github-runner.nix +++ b/nixos/modules/services/continuous-integration/github-runner.nix @@ -34,6 +34,14 @@ in Repository to add the runner to. Changing this option triggers a new runner registration. + + IMPORTANT: If your token is org-wide (not per repository), you need to + provide a github org link, not a single repository, so do it like this + https://github.com/nixos, not like this + https://github.com/nixos/nixpkgs. + Otherwise, you are going to get a 404 NotFound + from POST https://api.github.com/actions/runner-registration + in the configure script. ''; example = "https://github.com/nixos/nixpkgs"; }; @@ -208,6 +216,7 @@ in token=$(< "$STATE_DIRECTORY"/${newConfigTokenFilename}) RUNNER_ROOT="$STATE_DIRECTORY" ${cfg.package}/bin/config.sh \ --unattended \ + --disableupdate \ --work "$RUNTIME_DIRECTORY" \ --url ${escapeShellArg cfg.url} \ --token "$token" \ diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index d4b8541c6a1b..dc58c6345239 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -147,7 +147,7 @@ in concurrent = mkOption { type = types.int; default = 1; - example = literalExpression "config.nix.maxJobs"; + example = literalExpression "config.nix.settings.max-jobs"; description = '' Limits how many jobs globally can be run concurrently. The most upper limit of jobs using all defined runners. diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix index 968bc8f1e54e..ef1933e12284 100644 --- a/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix +++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix @@ -67,7 +67,7 @@ in # Trusted user allows simplified configuration and better performance # when operating in a cluster. - nix.trustedUsers = [ config.systemd.services.hercules-ci-agent.serviceConfig.User ]; + nix.settings.trusted-users = [ config.systemd.services.hercules-ci-agent.serviceConfig.User ]; services.hercules-ci-agent = { settings = { nixUserIsTrusted = true; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index ccb7cc21734e..cc5de97d6d10 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -258,8 +258,6 @@ in uid = config.ids.uids.hydra-www; }; - nix.trustedUsers = [ "hydra-queue-runner" ]; - services.hydra.extraConfig = '' using_frontend_proxy = 1 @@ -277,16 +275,21 @@ in environment.variables = hydraEnv; - nix.extraOptions = '' - keep-outputs = true - keep-derivations = true + nix.settings = mkMerge [ + { + keep-outputs = true; + keep-derivations = true; + trusted-users = [ "hydra-queue-runner" ]; + } - - '' + optionalString (versionOlder (getVersion config.nix.package.out) "2.4pre") '' - # The default (`true') slows Nix down a lot since the build farm - # has so many GC roots. - gc-check-reachability = false - ''; + (mkIf (versionOlder (getVersion config.nix.package.out) "2.4pre") + { + # The default (`true') slows Nix down a lot since the build farm + # has so many GC roots. + gc-check-reachability = false; + } + ) + ]; systemd.services.hydra-init = { wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index e0269a962fdd..a1bd73c9e371 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -81,7 +81,9 @@ in { user = mkOption { type = types.str; default = redisName name; - defaultText = "\"redis\" or \"redis-\${name}\" if name != \"\""; + defaultText = literalExpression '' + if name == "" then "redis" else "redis-''${name}" + ''; description = "The username and groupname for redis-server."; }; @@ -105,8 +107,7 @@ in { bind = mkOption { type = with types; nullOr str; - default = if name == "" then "127.0.0.1" else null; - defaultText = literalExpression ''if name == "" then "127.0.0.1" else null''; + default = "127.0.0.1"; description = '' The IP interface to bind to. null means "all interfaces". @@ -117,7 +118,9 @@ in { unixSocket = mkOption { type = with types; nullOr path; default = "/run/${redisName name}/redis.sock"; - defaultText = "\"/run/redis/redis.sock\" or \"/run/redis-\${name}/redis.sock\" if name != \"\""; + defaultText = literalExpression '' + if name == "" then "/run/redis/redis.sock" else "/run/redis-''${name}/redis.sock" + ''; description = "The path to the socket to bind to."; }; @@ -370,7 +373,7 @@ in { ProtectKernelTunables = true; ProtectControlGroups = true; RestrictAddressFamilies = - optionals (conf.bind != null) ["AF_INET" "AF_INET6"] ++ + optionals (conf.port != 0) ["AF_INET" "AF_INET6"] ++ optional (conf.unixSocket != null) "AF_UNIX"; RestrictNamespaces = true; LockPersonality = true; diff --git a/nixos/modules/services/databases/virtuoso.nix b/nixos/modules/services/databases/virtuoso.nix deleted file mode 100644 index 8b01622ecb03..000000000000 --- a/nixos/modules/services/databases/virtuoso.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.services.virtuoso; - virtuosoUser = "virtuoso"; - stateDir = "/var/lib/virtuoso"; -in -with lib; -{ - - ###### interface - - options = { - - services.virtuoso = { - - enable = mkEnableOption "Virtuoso Opensource database server"; - - config = mkOption { - type = types.lines; - default = ""; - description = "Extra options to put into Virtuoso configuration file."; - }; - - parameters = mkOption { - type = types.lines; - default = ""; - description = "Extra options to put into [Parameters] section of Virtuoso configuration file."; - }; - - listenAddress = mkOption { - type = types.str; - default = "1111"; - example = "myserver:1323"; - description = "ip:port or port to listen on."; - }; - - httpListenAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "myserver:8080"; - description = "ip:port or port for Virtuoso HTTP server to listen on."; - }; - - dirsAllowed = mkOption { - type = types.nullOr types.str; # XXX Maybe use a list in the future? - default = null; - example = "/www, /home/"; - description = "A list of directories Virtuoso is allowed to access"; - }; - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - users.users.${virtuosoUser} = - { uid = config.ids.uids.virtuoso; - description = "virtuoso user"; - home = stateDir; - }; - - systemd.services.virtuoso = { - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - preStart = '' - mkdir -p ${stateDir} - chown ${virtuosoUser} ${stateDir} - ''; - - script = '' - cd ${stateDir} - ${pkgs.virtuoso}/bin/virtuoso-t +foreground +configfile ${pkgs.writeText "virtuoso.ini" cfg.config} - ''; - }; - - services.virtuoso.config = '' - [Database] - DatabaseFile=${stateDir}/x-virtuoso.db - TransactionFile=${stateDir}/x-virtuoso.trx - ErrorLogFile=${stateDir}/x-virtuoso.log - xa_persistent_file=${stateDir}/x-virtuoso.pxa - - [Parameters] - ServerPort=${cfg.listenAddress} - RunAs=${virtuosoUser} - ${optionalString (cfg.dirsAllowed != null) "DirsAllowed=${cfg.dirsAllowed}"} - ${cfg.parameters} - - [HTTPServer] - ${optionalString (cfg.httpListenAddress != null) "ServerPort=${cfg.httpListenAddress}"} - ''; - - }; - -} diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index 7da92cc9f264..5fecc64b4f70 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -30,6 +30,8 @@ in { environment.systemPackages = [ pkgs.flatpak ]; + security.polkit.enable = true; + services.dbus.packages = [ pkgs.flatpak ]; systemd.packages = [ pkgs.flatpak ]; diff --git a/nixos/modules/services/desktops/gnome/glib-networking.nix b/nixos/modules/services/desktops/gnome/glib-networking.nix index 4288b6b5de61..1039605391ab 100644 --- a/nixos/modules/services/desktops/gnome/glib-networking.nix +++ b/nixos/modules/services/desktops/gnome/glib-networking.nix @@ -38,7 +38,7 @@ with lib; systemd.packages = [ pkgs.glib-networking ]; - environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ]; + environment.sessionVariables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ]; }; diff --git a/nixos/modules/services/desktops/gvfs.nix b/nixos/modules/services/desktops/gvfs.nix index 27864fad4f26..1aa64ea37db5 100644 --- a/nixos/modules/services/desktops/gvfs.nix +++ b/nixos/modules/services/desktops/gvfs.nix @@ -57,7 +57,7 @@ in services.udev.packages = [ pkgs.libmtp.out ]; # Needed for unwrapped applications - environment.variables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ]; + environment.sessionVariables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ]; }; diff --git a/nixos/modules/services/desktops/pantheon/files.nix b/nixos/modules/services/desktops/pantheon/files.nix deleted file mode 100644 index 8cee9f42b62f..000000000000 --- a/nixos/modules/services/desktops/pantheon/files.nix +++ /dev/null @@ -1,13 +0,0 @@ -# pantheon files daemon. - -{ config, pkgs, lib, ... }: - -with lib; - -{ - - imports = [ - (mkRemovedOptionModule [ "services" "pantheon" "files" "enable" ] "Use `environment.systemPackages [ pkgs.pantheon.elementary-files ];`") - ]; - -} diff --git a/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json b/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json index 284d8c394a61..9aa51b61431d 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json @@ -8,7 +8,7 @@ }, "context.modules": [ { - "name": "libpipewire-module-rtkit", + "name": "libpipewire-module-rt", "args": {}, "flags": [ "ifexists", diff --git a/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json b/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json new file mode 100644 index 000000000000..c7f58fd5799a --- /dev/null +++ b/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json @@ -0,0 +1,118 @@ +{ + "context.properties": { + "link.max-buffers": 16, + "core.daemon": true, + "core.name": "pipewire-0", + "settings.check-quantum": true, + "settings.check-rate": true, + "vm.overrides": { + "default.clock.min-quantum": 1024 + } + }, + "context.spa-libs": { + "audio.convert.*": "audioconvert/libspa-audioconvert", + "api.alsa.*": "alsa/libspa-alsa", + "support.*": "support/libspa-support" + }, + "context.modules": [ + { + "name": "libpipewire-module-rt", + "args": { + "nice.level": -11 + }, + "flags": [ + "ifexists", + "nofail" + ] + }, + { + "name": "libpipewire-module-protocol-native" + }, + { + "name": "libpipewire-module-profiler" + }, + { + "name": "libpipewire-module-metadata" + }, + { + "name": "libpipewire-module-spa-node-factory" + }, + { + "name": "libpipewire-module-client-node" + }, + { + "name": "libpipewire-module-access", + "args": {} + }, + { + "name": "libpipewire-module-adapter" + }, + { + "name": "libpipewire-module-link-factory" + } + ], + "context.objects": [ + { + "factory": "metadata", + "args": { + "metadata.name": "default" + } + }, + { + "factory": "spa-node-factory", + "args": { + "factory.name": "support.node.driver", + "node.name": "Dummy-Driver", + "node.group": "pipewire.dummy", + "priority.driver": 20000 + } + }, + { + "factory": "spa-node-factory", + "args": { + "factory.name": "support.node.driver", + "node.name": "Freewheel-Driver", + "priority.driver": 19000, + "node.group": "pipewire.freewheel", + "node.freewheel": true + } + }, + { + "factory": "adapter", + "args": { + "factory.name": "api.alsa.pcm.source", + "node.name": "system", + "node.description": "system", + "media.class": "Audio/Source", + "api.alsa.path": "hw:0", + "node.suspend-on-idle": true, + "resample.disable": true, + "channelmix.disable": true, + "adapter.auto-port-config": { + "mode": "dsp", + "monitor": false, + "position": "unknown" + } + } + }, + { + "factory": "adapter", + "args": { + "factory.name": "api.alsa.pcm.sink", + "node.name": "system", + "node.description": "system", + "media.class": "Audio/Sink", + "api.alsa.path": "hw:0", + "node.suspend-on-idle": true, + "resample.disable": true, + "channelmix.disable": true, + "adapter.auto-port-config": { + "mode": "dsp", + "monitor": false, + "position": "unknown" + } + } + } + ], + "context.exec": [] +} diff --git a/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json b/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json index 3ed994f11145..df0f62556dff 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json @@ -6,8 +6,10 @@ }, "context.modules": [ { - "name": "libpipewire-module-rtkit", - "args": {}, + "name": "libpipewire-module-rt", + "args": { + "nice.level": -11 + }, "flags": [ "ifexists", "nofail" @@ -37,6 +39,61 @@ } } ], - "context.exec": [], - "stream.properties": {} + "context.exec": [ + { + "path": "pactl", + "args": "load-module module-always-sink" + } + ], + "stream.properties": {}, + "pulse.rules": [ + { + "matches": [ + {} + ], + "actions": { + "update-props": {} + } + }, + { + "matches": [ + { + "application.process.binary": "teams" + }, + { + "application.process.binary": "skypeforlinux" + } + ], + "actions": { + "quirks": [ + "force-s16-info" + ] + } + }, + { + "matches": [ + { + "application.process.binary": "firefox" + } + ], + "actions": { + "quirks": [ + "remove-capture-dont-move" + ] + } + }, + { + "matches": [ + { + "application.name": "~speech-dispatcher*" + } + ], + "actions": { + "update-props": { + "pulse.min.req": "1024/48000", + "pulse.min.quantum": "1024/48000" + } + } + } + ] } diff --git a/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json b/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json index a923ab4db235..7c79f0168c02 100644 --- a/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json +++ b/nixos/modules/services/desktops/pipewire/daemon/pipewire.conf.json @@ -3,6 +3,7 @@ "link.max-buffers": 16, "core.daemon": true, "core.name": "pipewire-0", + "default.clock.min-quantum": 16, "vm.overrides": { "default.clock.min-quantum": 1024 } @@ -19,8 +20,10 @@ }, "context.modules": [ { - "name": "libpipewire-module-rtkit", - "args": {}, + "name": "libpipewire-module-rt", + "args": { + "nice.level": -11 + }, "flags": [ "ifexists", "nofail" diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index f7a03a4a3eaf..6027e4f3d4bf 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -38,9 +38,8 @@ in { services.pipewire.media-session = { enable = mkOption { type = types.bool; - default = config.services.pipewire.enable; - defaultText = literalExpression "config.services.pipewire.enable"; - description = "Example pipewire session manager"; + default = false; + description = "Whether to enable the deprecated example Pipewire session manager"; }; package = mkOption { @@ -111,6 +110,11 @@ in { source = json.generate "v4l2-monitor.conf" configs.v4l2-monitor; }; + environment.etc."pipewire/media-session.d/with-audio" = + mkIf config.services.pipewire.audio.enable { + text = ""; + }; + environment.etc."pipewire/media-session.d/with-alsa" = mkIf config.services.pipewire.alsa.enable { text = ""; diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index c3cfd46e61c2..1323336d866e 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -25,15 +25,18 @@ let client = lib.importJSON ./daemon/client.conf.json; client-rt = lib.importJSON ./daemon/client-rt.conf.json; jack = lib.importJSON ./daemon/jack.conf.json; + minimal = lib.importJSON ./daemon/minimal.conf.json; pipewire = lib.importJSON ./daemon/pipewire.conf.json; pipewire-pulse = lib.importJSON ./daemon/pipewire-pulse.conf.json; }; + useSessionManager = cfg.wireplumber.enable || cfg.media-session.enable; + configs = { client = recursiveUpdate defaults.client cfg.config.client; client-rt = recursiveUpdate defaults.client-rt cfg.config.client-rt; jack = recursiveUpdate defaults.jack cfg.config.jack; - pipewire = recursiveUpdate defaults.pipewire cfg.config.pipewire; + pipewire = recursiveUpdate (if useSessionManager then defaults.pipewire else defaults.minimal) cfg.config.pipewire; pipewire-pulse = recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse; }; in { @@ -113,6 +116,16 @@ in { }; }; + audio = { + enable = lib.mkOption { + type = lib.types.bool; + # this is for backwards compatibility + default = cfg.alsa.enable || cfg.jack.enable || cfg.pulse.enable; + defaultText = lib.literalExpression "config.services.pipewire.alsa.enable || config.services.pipewire.jack.enable || config.services.pipewire.pulse.enable"; + description = "Whether to use PipeWire as the primary sound server"; + }; + }; + alsa = { enable = mkEnableOption "ALSA support"; support32Bit = mkEnableOption "32-bit ALSA support on 64-bit systems"; @@ -149,13 +162,18 @@ in { config = mkIf cfg.enable { assertions = [ { - assertion = cfg.pulse.enable -> !config.hardware.pulseaudio.enable; - message = "PipeWire based PulseAudio server emulation replaces PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false"; + assertion = cfg.audio.enable -> !config.hardware.pulseaudio.enable; + message = "Using PipeWire as the sound server conflicts with PulseAudio. This option requires `hardware.pulseaudio.enable` to be set to false"; } { assertion = cfg.jack.enable -> !config.services.jack.jackd.enable; message = "PipeWire based JACK emulation doesn't use the JACK service. This option requires `services.jack.jackd.enable` to be set to false"; } + { + # JACK intentionally not checked, as PW-on-JACK setups are a thing that some people may want + assertion = (cfg.alsa.enable || cfg.pulse.enable) -> cfg.audio.enable; + message = "Using PipeWire's ALSA/PulseAudio compatibility layers requires running PipeWire as the sound server. Set `services.pipewire.audio.enable` to true."; + } ]; environment.systemPackages = [ cfg.package ] diff --git a/nixos/modules/services/desktops/pipewire/wireplumber.nix b/nixos/modules/services/desktops/pipewire/wireplumber.nix index ad96dc1f9745..32206ccb4e60 100644 --- a/nixos/modules/services/desktops/pipewire/wireplumber.nix +++ b/nixos/modules/services/desktops/pipewire/wireplumber.nix @@ -1,22 +1,27 @@ { config, lib, pkgs, ... }: let - cfg = config.services.pipewire.wireplumber; + pwCfg = config.services.pipewire; + cfg = pwCfg.wireplumber; + pwUsedForAudio = pwCfg.audio.enable; in { meta.maintainers = [ lib.maintainers.k900 ]; options = { services.pipewire.wireplumber = { - enable = lib.mkEnableOption "A modular session / policy manager for PipeWire"; + enable = lib.mkOption { + type = lib.types.bool; + default = config.services.pipewire.enable; + defaultText = lib.literalExpression "config.services.pipewire.enable"; + description = "Whether to enable Wireplumber, a modular session / policy manager for PipeWire"; + }; package = lib.mkOption { type = lib.types.package; default = pkgs.wireplumber; defaultText = lib.literalExpression "pkgs.wireplumber"; - description = '' - The wireplumber derivation to use. - ''; + description = "The wireplumber derivation to use."; }; }; }; @@ -30,6 +35,14 @@ in ]; environment.systemPackages = [ cfg.package ]; + + environment.etc."wireplumber/main.lua.d/80-nixos.lua" = lib.mkIf (!pwUsedForAudio) { + text = '' + # Pipewire is not used for audio, so prevent it from grabbing audio devices + alsa_monitor.enable = function() end + ''; + }; + systemd.packages = [ cfg.package ]; systemd.services.wireplumber.enable = config.services.pipewire.systemWide; diff --git a/nixos/modules/services/development/zammad.nix b/nixos/modules/services/development/zammad.nix new file mode 100644 index 000000000000..d457a6071873 --- /dev/null +++ b/nixos/modules/services/development/zammad.nix @@ -0,0 +1,323 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.zammad; + settingsFormat = pkgs.formats.yaml { }; + filterNull = filterAttrs (_: v: v != null); + serviceConfig = { + Type = "simple"; + Restart = "always"; + + User = "zammad"; + Group = "zammad"; + PrivateTmp = true; + StateDirectory = "zammad"; + WorkingDirectory = cfg.dataDir; + }; + environment = { + RAILS_ENV = "production"; + NODE_ENV = "production"; + RAILS_SERVE_STATIC_FILES = "true"; + RAILS_LOG_TO_STDOUT = "true"; + }; + databaseConfig = settingsFormat.generate "database.yml" cfg.database.settings; +in +{ + + options = { + services.zammad = { + enable = mkEnableOption "Zammad, a web-based, open source user support/ticketing solution."; + + package = mkOption { + type = types.package; + default = pkgs.zammad; + defaultText = literalExpression "pkgs.zammad"; + description = "Zammad package to use."; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/zammad"; + description = '' + Path to a folder that will contain Zammad working directory. + ''; + }; + + host = mkOption { + type = types.str; + default = "127.0.0.1"; + example = "192.168.23.42"; + description = "Host address."; + }; + + openPorts = mkOption { + type = types.bool; + default = false; + description = "Whether to open firewall ports for Zammad"; + }; + + port = mkOption { + type = types.port; + default = 3000; + description = "Web service port."; + }; + + websocketPort = mkOption { + type = types.port; + default = 6042; + description = "Websocket service port."; + }; + + database = { + type = mkOption { + type = types.enum [ "PostgreSQL" "MySQL" ]; + default = "PostgreSQL"; + example = "MySQL"; + description = "Database engine to use."; + }; + + host = mkOption { + type = types.nullOr types.str; + default = { + PostgreSQL = "/run/postgresql"; + MySQL = "localhost"; + }.${cfg.database.type}; + defaultText = literalExpression '' + { + PostgreSQL = "/run/postgresql"; + MySQL = "localhost"; + }.''${config.services.zammad.database.type}; + ''; + description = '' + Database host address. + ''; + }; + + port = mkOption { + type = types.nullOr types.port; + default = null; + description = "Database port. Use null for default port."; + }; + + name = mkOption { + type = types.str; + default = "zammad"; + description = '' + Database name. + ''; + }; + + user = mkOption { + type = types.nullOr types.str; + default = "zammad"; + description = "Database user."; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/zammad-dbpassword"; + description = '' + A file containing the password for . + ''; + }; + + createLocally = mkOption { + type = types.bool; + default = true; + description = "Whether to create a local database automatically."; + }; + + settings = mkOption { + type = settingsFormat.type; + default = { }; + example = literalExpression '' + { + } + ''; + description = '' + The database.yml configuration file as key value set. + See + for list of configuration parameters. + ''; + }; + }; + + secretKeyBaseFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/secret_key_base"; + description = '' + The path to a file containing the + secret_key_base secret. + + Zammad uses secret_key_base to encrypt + the cookie store, which contains session data, and to digest + user auth tokens. + + Needs to be a 64 byte long string of hexadecimal + characters. You can generate one by running + + + $ openssl rand -hex 64 >/path/to/secret_key_base_file + + + This should be a string, not a nix path, since nix paths are + copied into the world-readable nix store. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + services.zammad.database.settings = { + production = mapAttrs (_: v: mkDefault v) (filterNull { + adapter = { + PostgreSQL = "postgresql"; + MySQL = "mysql2"; + }.${cfg.database.type}; + database = cfg.database.name; + pool = 50; + timeout = 5000; + encoding = "utf8"; + username = cfg.database.user; + host = cfg.database.host; + port = cfg.database.port; + }); + }; + + networking.firewall.allowedTCPPorts = mkIf cfg.openPorts [ + config.services.zammad.port + config.services.zammad.websocketPort + ]; + + users.users.zammad = { + isSystemUser = true; + home = cfg.dataDir; + group = "zammad"; + }; + + users.groups.zammad = { }; + + assertions = [ + { + assertion = cfg.database.createLocally -> cfg.database.user == "zammad"; + message = "services.zammad.database.user must be set to \"zammad\" if services.zammad.database.createLocally is set to true"; + } + { + assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; + message = "a password cannot be specified if services.zammad.database.createLocally is set to true"; + } + ]; + + services.mysql = optionalAttrs (cfg.database.createLocally && cfg.database.type == "MySQL") { + enable = true; + package = mkDefault pkgs.mariadb; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { + name = cfg.database.user; + ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; + } + ]; + }; + + services.postgresql = optionalAttrs (cfg.database.createLocally && cfg.database.type == "PostgreSQL") { + enable = true; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { + name = cfg.database.user; + ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + } + ]; + }; + + systemd.services.zammad-web = { + inherit environment; + serviceConfig = serviceConfig // { + # loading all the gems takes time + TimeoutStartSec = 1200; + }; + after = [ + "network.target" + "postgresql.service" + ]; + requires = [ + "postgresql.service" + ]; + description = "Zammad web"; + wantedBy = [ "multi-user.target" ]; + preStart = '' + # Blindly copy the whole project here. + chmod -R +w . + rm -rf ./public/assets/* + rm -rf ./tmp/* + rm -rf ./log/* + cp -r --no-preserve=owner ${cfg.package}/* . + chmod -R +w . + # config file + cp ${databaseConfig} ./config/database.yml + chmod -R +w . + ${optionalString (cfg.database.passwordFile != null) '' + { + echo -n " password: " + cat ${cfg.database.passwordFile} + } >> ./config/database.yml + ''} + ${optionalString (cfg.secretKeyBaseFile != null) '' + { + echo "production: " + echo -n " secret_key_base: " + cat ${cfg.secretKeyBaseFile} + } > ./config/secrets.yml + ''} + + if [ `${config.services.postgresql.package}/bin/psql \ + --host ${cfg.database.host} \ + ${optionalString + (cfg.database.port != null) + "--port ${toString cfg.database.port}"} \ + --username ${cfg.database.user} \ + --dbname ${cfg.database.name} \ + --command "SELECT COUNT(*) FROM pg_class c \ + JOIN pg_namespace s ON s.oid = c.relnamespace \ + WHERE s.nspname NOT IN ('pg_catalog', 'pg_toast', 'information_schema') \ + AND s.nspname NOT LIKE 'pg_temp%';" | sed -n 3p` -eq 0 ]; then + echo "Initialize database" + ./bin/rake --no-system db:migrate + ./bin/rake --no-system db:seed + else + echo "Migrate database" + ./bin/rake --no-system db:migrate + fi + echo "Done" + ''; + script = "./script/rails server -b ${cfg.host} -p ${toString cfg.port}"; + }; + + systemd.services.zammad-websocket = { + inherit serviceConfig environment; + after = [ "zammad-web.service" ]; + requires = [ "zammad-web.service" ]; + description = "Zammad websocket"; + wantedBy = [ "multi-user.target" ]; + script = "./script/websocket-server.rb -b ${cfg.host} -p ${toString cfg.websocketPort} start"; + }; + + systemd.services.zammad-scheduler = { + inherit environment; + serviceConfig = serviceConfig // { Type = "forking"; }; + after = [ "zammad-web.service" ]; + requires = [ "zammad-web.service" ]; + description = "Zammad scheduler"; + wantedBy = [ "multi-user.target" ]; + script = "./script/scheduler.rb start"; + }; + }; + + meta.maintainers = with lib.maintainers; [ garbas taeer ]; +} diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index 96fcd6d2c8b3..ff73d7a46ed3 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -53,6 +53,14 @@ in ''; }; + bind = mkOption { + type = types.str; + default = "0.0.0.0"; + description = '' + The address to which the service should bind. + ''; + }; + admins = mkOption { type = types.listOf types.str; default = []; @@ -241,6 +249,7 @@ in "${cfg.package}/bin/factorio" "--config=${cfg.configFile}" "--port=${toString cfg.port}" + "--bind=${cfg.bind}" "--start-server=${mkSavePath cfg.saveName}" "--server-settings=${serverSettingsFile}" (optionalString (cfg.mods != []) "--mod-directory=${modDir}") diff --git a/nixos/modules/services/games/minecraft-server.nix b/nixos/modules/services/games/minecraft-server.nix index 5bb8eff57629..8233962c1a2c 100644 --- a/nixos/modules/services/games/minecraft-server.nix +++ b/nixos/modules/services/games/minecraft-server.nix @@ -153,7 +153,7 @@ in { type = types.separatedString " "; default = "-Xmx2048M -Xms2048M"; # Example options from https://minecraft.gamepedia.com/Tutorials/Server_startup_script - example = "-Xmx2048M -Xms4092M -XX:+UseG1GC -XX:+CMSIncrementalPacing " + example = "-Xms4092M -Xmx4092M -XX:+UseG1GC -XX:+CMSIncrementalPacing " + "-XX:+CMSClassUnloadingEnabled -XX:ParallelGCThreads=2 " + "-XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10"; description = "JVM options for the Minecraft server."; diff --git a/nixos/modules/services/hardware/ddccontrol.nix b/nixos/modules/services/hardware/ddccontrol.nix index 766bf12ee9f0..f0b5a9c81960 100644 --- a/nixos/modules/services/hardware/ddccontrol.nix +++ b/nixos/modules/services/hardware/ddccontrol.nix @@ -20,6 +20,9 @@ in ###### implementation config = lib.mkIf cfg.enable { + # Load the i2c-dev module + boot.kernelModules = [ "i2c_dev" ]; + # Give users access to the "gddccontrol" tool environment.systemPackages = [ pkgs.ddccontrol diff --git a/nixos/modules/services/hardware/joycond.nix b/nixos/modules/services/hardware/joycond.nix index ffef4f8a4e18..d81c1bb6d63d 100644 --- a/nixos/modules/services/hardware/joycond.nix +++ b/nixos/modules/services/hardware/joycond.nix @@ -22,13 +22,9 @@ with lib; }; config = mkIf cfg.enable { - environment.systemPackages = [ - kernelPackages.hid-nintendo - cfg.package - ]; + environment.systemPackages = [ cfg.package ]; - boot.extraModulePackages = [ kernelPackages.hid-nintendo ]; - boot.kernelModules = [ "hid_nintendo" ]; + boot.extraModulePackages = optional (versionOlder kernelPackages.kernel.version "5.16") kernelPackages.hid-nintendo; services.udev.packages = [ cfg.package ]; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index d48b5444677c..61448af2d33b 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -317,7 +317,8 @@ in (isYes "NET") ]; - boot.extraModprobeConfig = "options firmware_class path=${config.hardware.firmware}/lib/firmware"; + # We don't place this into `extraModprobeConfig` so that stage-1 ramdisk doesn't bloat. + environment.etc."modprobe.d/firmware.conf".text = "options firmware_class path=${config.hardware.firmware}/lib/firmware"; system.activationScripts.udevd = '' diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix index e898f3260585..6be23f39754e 100644 --- a/nixos/modules/services/hardware/udisks2.nix +++ b/nixos/modules/services/hardware/udisks2.nix @@ -32,6 +32,8 @@ with lib; environment.systemPackages = [ pkgs.udisks2 ]; + security.polkit.enable = true; + services.dbus.packages = [ pkgs.udisks2 ]; systemd.tmpfiles.rules = [ "d /var/lib/udisks2 0755 root root -" ]; diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index 212c0227c0d0..a743bbf21c8c 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -164,8 +164,6 @@ in environment.systemPackages = [ cfg.package ]; systemd.services.undervolt = { - path = [ pkgs.undervolt ]; - description = "Intel Undervolting Service"; # Apply undervolt on boot, nixos generation switch and resume @@ -175,7 +173,7 @@ in serviceConfig = { Type = "oneshot"; Restart = "no"; - ExecStart = "${pkgs.undervolt}/bin/undervolt ${toString cliArgs}"; + ExecStart = "${cfg.package}/bin/undervolt ${toString cliArgs}"; }; }; diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix index 92c060147bfc..81bf497c993d 100644 --- a/nixos/modules/services/hardware/upower.nix +++ b/nixos/modules/services/hardware/upower.nix @@ -155,8 +155,8 @@ in default = 1200; description = '' When usePercentageForPolicy is - false, the time remaining at which UPower will - consider the battery low. + false, the time remaining in seconds at which + UPower will consider the battery low. If any value (of timeLow, timeCritical and timeAction) is @@ -169,8 +169,8 @@ in default = 300; description = '' When usePercentageForPolicy is - false, the time remaining at which UPower will - consider the battery critical. + false, the time remaining in seconds at which + UPower will consider the battery critical. If any value (of timeLow, timeCritical and timeAction) is @@ -183,8 +183,8 @@ in default = 120; description = '' When usePercentageForPolicy is - false, the time remaining at which UPower will - take action for the critical battery level. + false, the time remaining in seconds at which + UPower will take action for the critical battery level. If any value (of timeLow, timeCritical and timeAction) is diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix similarity index 51% rename from nixos/modules/services/misc/home-assistant.nix rename to nixos/modules/services/home-automation/home-assistant.nix index ac4c0222aac3..6022227f6ea8 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -4,35 +4,27 @@ with lib; let cfg = config.services.home-assistant; + format = pkgs.formats.yaml {}; - # cfg.config != null can be assumed here - configJSON = pkgs.writeText "configuration.json" - (builtins.toJSON (if cfg.applyDefaultConfig then - (recursiveUpdate defaultConfig cfg.config) else cfg.config)); + # Render config attribute sets to YAML + # Values that are null will be filtered from the output, so this is one way to have optional + # options shown in settings. + # We post-process the result to add support for YAML functions, like secrets or includes, see e.g. + # https://www.home-assistant.io/docs/configuration/secrets/ + filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [ null ])) cfg.config or {}; configFile = pkgs.runCommand "configuration.yaml" { preferLocalBuild = true; } '' - ${pkgs.remarshal}/bin/json2yaml -i ${configJSON} -o $out - # Hack to support custom yaml objects, - # i.e. secrets: https://www.home-assistant.io/docs/configuration/secrets/ + cp ${format.generate "configuration.yaml" filteredConfig} $out sed -i -e "s/'\!\([a-z_]\+\) \(.*\)'/\!\1 \2/;s/^\!\!/\!/;" $out ''; + lovelaceConfig = cfg.lovelaceConfig or {}; + lovelaceConfigFile = format.generate "ui-lovelace.yaml" lovelaceConfig; - lovelaceConfigJSON = pkgs.writeText "ui-lovelace.json" - (builtins.toJSON cfg.lovelaceConfig); - lovelaceConfigFile = pkgs.runCommand "ui-lovelace.yaml" { preferLocalBuild = true; } '' - ${pkgs.remarshal}/bin/json2yaml -i ${lovelaceConfigJSON} -o $out - ''; - + # Components advertised by the home-assistant package availableComponents = cfg.package.availableComponents; + # Components that were added by overriding the package explicitComponents = cfg.package.extraComponents; - - usedPlatforms = config: - if isAttrs config then - optional (config ? platform) config.platform - ++ concatMap usedPlatforms (attrValues config) - else if isList config then - concatMap usedPlatforms config - else [ ]; + useExplicitComponent = component: elem component explicitComponents; # Given a component "platform", looks up whether it is used in the config # as `platform = "platform";`. @@ -42,33 +34,45 @@ let # platform = "mqtt"; # ... # } ]; + usedPlatforms = config: + if isAttrs config then + optional (config ? platform) config.platform + ++ concatMap usedPlatforms (attrValues config) + else if isList config then + concatMap usedPlatforms config + else [ ]; + useComponentPlatform = component: elem component (usedPlatforms cfg.config); - useExplicitComponent = component: elem component explicitComponents; - - # Returns whether component is used in config or explicitly passed into package + # Returns whether component is used in config, explicitly passed into package or + # configured in the module. useComponent = component: hasAttrByPath (splitString "." component) cfg.config || useComponentPlatform component - || useExplicitComponent component; + || useExplicitComponent component + || builtins.elem component cfg.extraComponents; - # List of components used in config + # Final list of components passed into the package to include required dependencies extraComponents = filter useComponent availableComponents; - package = if (cfg.autoExtraComponents && cfg.config != null) - then (cfg.package.override { inherit extraComponents; }) - else cfg.package; - - # If you are changing this, please update the description in applyDefaultConfig - defaultConfig = { - homeassistant.time_zone = config.time.timeZone; - http.server_port = cfg.port; - } // optionalAttrs (cfg.lovelaceConfig != null) { - lovelace.mode = "yaml"; - }; - + package = (cfg.package.override (oldArgs: { + # Respect overrides that already exist in the passed package and + # concat it with values passed via the module. + extraComponents = oldArgs.extraComponents or [] ++ extraComponents; + extraPackages = ps: (oldArgs.extraPackages or (_: []) ps) ++ (cfg.extraPackages ps); + })); in { - meta.maintainers = teams.home-assistant.members; + imports = [ + # Migrations in NixOS 22.05 + (mkRemovedOptionModule [ "services" "home-assistant" "applyDefaultConfig" ] "The default config was migrated into services.home-assistant.config") + (mkRemovedOptionModule [ "services" "home-assistant" "autoExtraComponents" ] "Components are now parsed from services.home-assistant.config unconditionally") + (mkRenamedOptionModule [ "services" "home-assistant" "port" ] [ "services" "home-assistant" "config" "http" "server_port" ]) + ]; + + meta = { + buildDocsInSandbox = false; + maintainers = teams.home-assistant.members; + }; options.services.home-assistant = { # Running home-assistant on NixOS is considered an installation method that is unsupported by the upstream project. @@ -81,42 +85,166 @@ in { description = "The config directory, where your configuration.yaml is located."; }; - port = mkOption { - default = 8123; - type = types.port; - description = "The port on which to listen."; + extraComponents = mkOption { + type = types.listOf (types.enum availableComponents); + default = [ + # List of components required to complete the onboarding + "default_config" + "met" + "esphome" + ] ++ optionals (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) [ + # Use the platform as an indicator that we might be running on a RaspberryPi and include + # relevant components + "rpi_power" + ]; + example = literalExpression '' + [ + "analytics" + "default_config" + "esphome" + "my" + "shopping_list" + "wled" + ] + ''; + description = '' + List of components that have their dependencies included in the package. + + The component name can be found in the URL, for example https://www.home-assistant.io/integrations/ffmpeg/ would map to ffmpeg. + ''; }; - applyDefaultConfig = mkOption { - default = true; - type = types.bool; + extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); + default = _: []; + defaultText = literalExpression '' + python3Packages: with python3Packages; []; + ''; + example = literalExpression '' + python3Packages: with python3Packages; [ + # postgresql support + psycopg2 + ]; + ''; description = '' - Setting this option enables a few configuration options for HA based on NixOS configuration (such as time zone) to avoid having to manually specify configuration we already have. - - - Currently one side effect of enabling this is that the http component will be enabled. - - - This only takes effect if config != null in order to ensure that a manually managed configuration.yaml is not overwritten. + List of packages to add to propagatedBuildInputs. + + A popular example is python3Packages.psycopg2 + for PostgreSQL support in the recorder component. ''; }; config = mkOption { - default = null; - # Migrate to new option types later: https://github.com/NixOS/nixpkgs/pull/75584 - type = with lib.types; let - valueType = nullOr (oneOf [ - bool - int - float - str - (lazyAttrsOf valueType) - (listOf valueType) - ]) // { - description = "Yaml value"; - emptyValue.value = {}; + type = types.nullOr (types.submodule { + freeformType = format.type; + options = { + # This is a partial selection of the most common options, so new users can quickly + # pick up how to match home-assistants config structure to ours. It also lets us preset + # config values intelligently. + + homeassistant = { + # https://www.home-assistant.io/docs/configuration/basic/ + name = mkOption { + type = types.nullOr types.str; + default = null; + example = "Home"; + description = '' + Name of the location where Home Assistant is running. + ''; + }; + + latitude = mkOption { + type = types.nullOr (types.either types.float types.str); + default = null; + example = 52.3; + description = '' + Latitude of your location required to calculate the time the sun rises and sets. + ''; + }; + + longitude = mkOption { + type = types.nullOr (types.either types.float types.str); + default = null; + example = 4.9; + description = '' + Longitude of your location required to calculate the time the sun rises and sets. + ''; + }; + + unit_system = mkOption { + type = types.nullOr (types.enum [ "metric" "imperial" ]); + default = null; + example = "metric"; + description = '' + The unit system to use. This also sets temperature_unit, Celsius for Metric and Fahrenheit for Imperial. + ''; + }; + + temperature_unit = mkOption { + type = types.nullOr (types.enum [ "C" "F" ]); + default = null; + example = "C"; + description = '' + Override temperature unit set by unit_system. C for Celsius, F for Fahrenheit. + ''; + }; + + time_zone = mkOption { + type = types.nullOr types.str; + default = config.time.timeZone or null; + defaultText = literalExpression '' + config.time.timeZone or null + ''; + example = "Europe/Amsterdam"; + description = '' + Pick your time zone from the column TZ of Wikipedia’s list of tz database time zones. + ''; + }; }; - in valueType; + + http = { + # https://www.home-assistant.io/integrations/http/ + server_host = mkOption { + type = types.either types.str (types.listOf types.str); + default = [ + "0.0.0.0" + "::" + ]; + example = "::1"; + description = '' + Only listen to incoming requests on specific IP/host. The default listed assumes support for IPv4 and IPv6. + ''; + }; + + server_port = mkOption { + default = 8123; + type = types.port; + description = '' + The port on which to listen. + ''; + }; + }; + + lovelace = { + # https://www.home-assistant.io/lovelace/dashboards/ + mode = mkOption { + type = types.enum [ "yaml" "storage" ]; + default = if cfg.lovelaceConfig != null + then "yaml" + else "storage"; + defaultText = literalExpression '' + if cfg.lovelaceConfig != null + then "yaml" + else "storage"; + ''; + example = "yaml"; + description = '' + In what mode should the main Lovelace panel be, yaml or storage (UI managed). + ''; + }; + }; + }; + }); example = literalExpression '' { homeassistant = { @@ -130,15 +258,19 @@ in { frontend = { themes = "!include_dir_merge_named themes"; }; - http = { }; + http = {}; feedreader.urls = [ "https://nixos.org/blogs.xml" ]; } ''; description = '' Your configuration.yaml as a Nix attribute set. - Beware that setting this option will delete your previous configuration.yaml. - Secrets - are encoded as strings as shown in the example. + + YAML functions like secrets + can be passed as a string and will be unquoted automatically. + + Unless this option is explicitly set to null + we assume your configuration.yaml is + managed through this module and thereby overwritten on startup. ''; }; @@ -147,16 +279,18 @@ in { type = types.bool; description = '' Whether to make configuration.yaml writable. - This only has an effect if is set. + This will allow you to edit it from Home Assistant's web interface. + + This only has an effect if is set. However, bear in mind that it will be overwritten at every start of the service. ''; }; lovelaceConfig = mkOption { default = null; - type = with types; nullOr attrs; - # from https://www.home-assistant.io/lovelace/yaml-mode/ + type = types.nullOr format.type; + # from https://www.home-assistant.io/lovelace/dashboards/ example = literalExpression '' { title = "My Awesome Home"; @@ -172,8 +306,8 @@ in { ''; description = '' Your ui-lovelace.yaml as a Nix attribute set. - Setting this option will automatically add - lovelace.mode = "yaml"; to your . + Setting this option will automatically set lovelace.mode to yaml. + Beware that setting this option will delete your previous ui-lovelace.yaml ''; }; @@ -183,8 +317,10 @@ in { type = types.bool; description = '' Whether to make ui-lovelace.yaml writable. - This only has an effect if is set. + This will allow you to edit it from Home Assistant's web interface. + + This only has an effect if is set. However, bear in mind that it will be overwritten at every start of the service. ''; }; @@ -201,30 +337,18 @@ in { type = types.package; example = literalExpression '' pkgs.home-assistant.override { - extraPackages = ps: with ps; [ colorlog ]; + extraPackages = python3Packages: with python3Packages; [ + psycopg2 + ]; + extraComponents = [ + "default_config" + "esphome" + "met" + ]; } ''; description = '' - Home Assistant package to use. By default the tests are disabled, as they take a considerable amout of time to complete. - Override extraPackages or extraComponents in order to add additional dependencies. - If you specify and do not set - to false, overriding extraComponents will have no effect. - Avoid home-assistant.overridePythonAttrs if you use autoExtraComponents. - ''; - }; - - autoExtraComponents = mkOption { - default = true; - type = types.bool; - description = '' - If set to true, the components used in config - are set as the specified package's extraComponents. - This in turn adds all packaged dependencies to the derivation. - You might still see import errors in your log. - In this case, you will need to package the necessary dependencies yourself - or ask for someone else to package them. - If a dependency is packaged but not automatically added to this list, - you might need to specify it in extraPackages. + The Home Assistant package to use. ''; }; @@ -240,18 +364,30 @@ in { systemd.services.home-assistant = { description = "Home Assistant"; - after = [ "network.target" ]; - preStart = optionalString (cfg.config != null) (if cfg.configWritable then '' - cp --no-preserve=mode ${configFile} "${cfg.configDir}/configuration.yaml" - '' else '' - rm -f "${cfg.configDir}/configuration.yaml" - ln -s ${configFile} "${cfg.configDir}/configuration.yaml" - '') + optionalString (cfg.lovelaceConfig != null) (if cfg.lovelaceConfigWritable then '' - cp --no-preserve=mode ${lovelaceConfigFile} "${cfg.configDir}/ui-lovelace.yaml" - '' else '' - rm -f "${cfg.configDir}/ui-lovelace.yaml" - ln -s ${lovelaceConfigFile} "${cfg.configDir}/ui-lovelace.yaml" - ''); + after = [ + "network-online.target" + + # prevent races with database creation + "mysql.service" + "postgresql.service" + ]; + preStart = let + copyConfig = if cfg.configWritable then '' + cp --no-preserve=mode ${configFile} "${cfg.configDir}/configuration.yaml" + '' else '' + rm -f "${cfg.configDir}/configuration.yaml" + ln -s ${configFile} "${cfg.configDir}/configuration.yaml" + ''; + copyLovelaceConfig = if cfg.lovelaceConfigWritable then '' + cp --no-preserve=mode ${lovelaceConfigFile} "${cfg.configDir}/ui-lovelace.yaml" + '' else '' + rm -f "${cfg.configDir}/ui-lovelace.yaml" + ln -s ${lovelaceConfigFile} "${cfg.configDir}/ui-lovelace.yaml" + ''; + in + (optionalString (cfg.config != null) copyConfig) + + (optionalString (cfg.lovelaceConfig != null) copyLovelaceConfig) + ; serviceConfig = let # List of capabilities to equip home-assistant with, depending on configured components capabilities = [ @@ -329,7 +465,7 @@ in { "zwave_js" ]; in { - ExecStart = "${package}/bin/hass --runner --config '${cfg.configDir}'"; + ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = "hass"; Group = "hass"; diff --git a/nixos/modules/services/misc/zigbee2mqtt.nix b/nixos/modules/services/home-automation/zigbee2mqtt.nix similarity index 100% rename from nixos/modules/services/misc/zigbee2mqtt.nix rename to nixos/modules/services/home-automation/zigbee2mqtt.nix diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix index e6a23233ba28..28e2d18bf031 100644 --- a/nixos/modules/services/logging/graylog.nix +++ b/nixos/modules/services/logging/graylog.nix @@ -132,7 +132,7 @@ in description = "Graylog server daemon user"; }; }; - users.groups = mkIf (cfg.user == "graylog") {}; + users.groups = mkIf (cfg.user == "graylog") { graylog = {}; }; systemd.tmpfiles.rules = [ "d '${cfg.messageJournalDir}' - ${cfg.user} - - -" diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 8cef4e8c083a..082cf92ff4ef 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.services.logrotate; - inherit (config.users) groups; pathOpts = { name, ... }: { options = { @@ -85,10 +84,6 @@ let }; config.name = name; - config.extraConfig = '' - missingok - notifempty - ''; }; mkConf = pathOpts: '' @@ -102,7 +97,11 @@ let ''; paths = sortProperties (attrValues (filterAttrs (_: pathOpts: pathOpts.enable) cfg.paths)); - configFile = pkgs.writeText "logrotate.conf" (concatStringsSep "\n" ((map mkConf paths) ++ [ cfg.extraConfig ])); + configFile = pkgs.writeText "logrotate.conf" ( + concatStringsSep "\n" ( + [ "missingok" "notifempty" cfg.extraConfig ] ++ (map mkConf paths) + ) + ); in { @@ -112,7 +111,10 @@ in options = { services.logrotate = { - enable = mkEnableOption "the logrotate systemd service"; + enable = mkEnableOption "the logrotate systemd service" // { + default = foldr (n: a: a || n.enable) false (attrValues cfg.paths); + defaultText = literalExpression "cfg.paths != {}"; + }; paths = mkOption { type = with types; attrsOf (submodule pathOpts); @@ -163,28 +165,8 @@ in } ) cfg.paths; - services.logrotate = { - paths = { - "/var/log/btmp" = { - frequency = mkDefault "monthly"; - keep = mkDefault 1; - extraConfig = '' - create 0660 root ${groups.utmp.name} - ''; - }; - "/var/log/wtmp" = { - frequency = mkDefault "monthly"; - keep = mkDefault 1; - extraConfig = '' - create 0664 root ${groups.utmp.name} - ''; - }; - }; - }; - systemd.services.logrotate = { description = "Logrotate Service"; - wantedBy = [ "multi-user.target" ]; startAt = "hourly"; serviceConfig = { diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix index 95c83796ece6..a34bc07b6ab2 100644 --- a/nixos/modules/services/logging/promtail.nix +++ b/nixos/modules/services/logging/promtail.nix @@ -45,7 +45,7 @@ in { Restart = "on-failure"; TimeoutStopSec = 10; - ExecStart = "${pkgs.grafana-loki}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}"; + ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}"; ProtectSystem = "strict"; ProtectHome = true; diff --git a/nixos/modules/services/mail/postfixadmin.nix b/nixos/modules/services/mail/postfixadmin.nix index f5c8efb3076c..a0846ad52902 100644 --- a/nixos/modules/services/mail/postfixadmin.nix +++ b/nixos/modules/services/mail/postfixadmin.nix @@ -114,7 +114,7 @@ in location ~* \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${fpm.socket}; - include ${pkgs.nginx}/conf/fastcgi_params; + include ${config.services.nginx.package}/conf/fastcgi_params; include ${pkgs.nginx}/conf/fastcgi.conf; } ''; diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index ac192c56aa60..1dd393da8822 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -153,7 +153,7 @@ in location ~* \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${fpm.socket}; - include ${pkgs.nginx}/conf/fastcgi_params; + include ${config.services.nginx.package}/conf/fastcgi_params; include ${pkgs.nginx}/conf/fastcgi.conf; } ''; diff --git a/nixos/modules/services/misc/matrix-synapse-log_config.yaml b/nixos/modules/services/matrix/matrix-synapse-log_config.yaml similarity index 100% rename from nixos/modules/services/misc/matrix-synapse-log_config.yaml rename to nixos/modules/services/matrix/matrix-synapse-log_config.yaml diff --git a/nixos/modules/services/matrix/matrix-synapse.nix b/nixos/modules/services/matrix/matrix-synapse.nix new file mode 100644 index 000000000000..c4d14dbd547e --- /dev/null +++ b/nixos/modules/services/matrix/matrix-synapse.nix @@ -0,0 +1,773 @@ +{ config, lib, options, pkgs, ... }: + +with lib; + +let + cfg = config.services.matrix-synapse; + format = pkgs.formats.yaml {}; + + # remove null values from the final configuration + finalSettings = lib.filterAttrsRecursive (_: v: v != null) cfg.settings; + configFile = format.generate "homeserver.yaml" finalSettings; + logConfigFile = format.generate "log_config.yaml" cfg.logConfig; + + pluginsEnv = cfg.package.python.buildEnv.override { + extraLibs = cfg.plugins; + }; + + usePostgresql = cfg.settings.database.name == "psycopg2"; + hasLocalPostgresDB = let args = cfg.settings.database.args; in + usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ])); + + registerNewMatrixUser = + let + isIpv6 = x: lib.length (lib.splitString ":" x) > 1; + listener = + lib.findFirst ( + listener: lib.any ( + resource: lib.any ( + name: name == "client" + ) resource.names + ) listener.resources + ) (lib.last cfg.settings.listeners) cfg.settings.listeners; + # FIXME: Handle cases with missing client listener properly, + # don't rely on lib.last, this will not work. + + # add a tail, so that without any bind_addresses we still have a useable address + bindAddress = head (listener.bind_addresses ++ [ "127.0.0.1" ]); + listenerProtocol = if listener.tls + then "https" + else "http"; + in + pkgs.writeShellScriptBin "matrix-synapse-register_new_matrix_user" '' + exec ${cfg.package}/bin/register_new_matrix_user \ + $@ \ + ${lib.concatMapStringsSep " " (x: "-c ${x}") ([ configFile ] ++ cfg.extraConfigFiles)} \ + "${listenerProtocol}://${ + if (isIpv6 bindAddress) then + "[${bindAddress}]" + else + "${bindAddress}" + }:${builtins.toString listener.port}/" + ''; +in { + + imports = [ + + (mkRemovedOptionModule [ "services" "matrix-synapse" "trusted_third_party_id_servers" ] '' + The `trusted_third_party_id_servers` option as been removed in `matrix-synapse` v1.4.0 + as the behavior is now obsolete. + '') + (mkRemovedOptionModule [ "services" "matrix-synapse" "create_local_database" ] '' + Database configuration must be done manually. An exemplary setup is demonstrated in + + '') + (mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "") + (mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] '' + You may add additional event types via + `services.matrix-synapse.room_prejoin_state.additional_event_types` and + disable the default events via + `services.matrix-synapse.room_prejoin_state.disable_default_event_types`. + '') + + # options that don't exist in synapse anymore + (mkRemovedOptionModule [ "services" "matrix-synapse" "bind_host" ] "Use listener settings instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "bind_port" ] "Use listener settings instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "expire_access_tokens" ] "" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "no_tls" ] "It is no longer supported by synapse." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "tls_dh_param_path" ] "It was removed from synapse." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "unsecure_port" ] "Use settings.listeners instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "user_creation_max_duration" ] "It is no longer supported by synapse." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "verbose" ] "Use a log config instead." ) + + # options that were moved into rfc42 style settigns + (mkRemovedOptionModule [ "services" "matrix-synapse" "app_service_config_files" ] "Use settings.app_service_config_Files instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "database_args" ] "Use settings.database.args instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "database_name" ] "Use settings.database.args.database instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "database_type" ] "Use settings.database.name instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "database_user" ] "Use settings.database.args.user instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "dynamic_thumbnails" ] "Use settings.dynamic_thumbnails instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "enable_metrics" ] "Use settings.enable_metrics instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "enable_registration" ] "Use settings.enable_registration instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "extraConfig" ] "Use settings instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "listeners" ] "Use settings.listeners instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "logConfig" ] "Use settings.log_config instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "max_image_pixels" ] "Use settings.max_image_pixels instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "max_upload_size" ] "Use settings.max_upload_size instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "presence" "enabled" ] "Use settings.presence.enabled instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "public_baseurl" ] "Use settings.public_baseurl instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "report_stats" ] "Use settings.report_stats instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "server_name" ] "Use settings.server_name instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "servers" ] "Use settings.trusted_key_servers instead." ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "tls_certificate_path" ] "Use settings.tls_certificate_path instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "tls_private_key_path" ] "Use settings.tls_private_key_path instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "turn_shared_secret" ] "Use settings.turn_shared_secret instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "turn_uris" ] "Use settings.turn_uris instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "turn_user_lifetime" ] "Use settings.turn_user_lifetime instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_enabled" ] "Use settings.url_preview_enabled instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_ip_range_blacklist" ] "Use settings.url_preview_ip_range_blacklist instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_ip_range_whitelist" ] "Use settings.url_preview_ip_range_whitelist instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "url_preview_url_blacklist" ] "Use settings.url_preview_url_blacklist instead" ) + + # options that are too specific to mention them explicitly in settings + (mkRemovedOptionModule [ "services" "matrix-synapse" "account_threepid_delegates" "email" ] "Use settings.account_threepid_delegates.email instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "account_threepid_delegates" "msisdn" ] "Use settings.account_threepid_delegates.msisdn instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "allow_guest_access" ] "Use settings.allow_guest_access instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "bcrypt_rounds" ] "Use settings.bcrypt_rounds instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "enable_registration_captcha" ] "Use settings.enable_registration_captcha instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "event_cache_size" ] "Use settings.event_cache_size instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_concurrent" ] "Use settings.rc_federation.concurrent instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_reject_limit" ] "Use settings.rc_federation.reject_limit instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_sleep_delay" ] "Use settings.rc_federation.sleep_delay instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_sleep_limit" ] "Use settings.rc_federation.sleep_limit instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "federation_rc_window_size" ] "Use settings.rc_federation.window_size instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "key_refresh_interval" ] "Use settings.key_refresh_interval instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "rc_messages_burst_count" ] "Use settings.rc_messages.burst_count instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "rc_messages_per_second" ] "Use settings.rc_messages.per_second instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "recaptcha_private_key" ] "Use settings.recaptcha_private_key instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "recaptcha_public_key" ] "Use settings.recaptcha_public_key instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "redaction_retention_period" ] "Use settings.redaction_retention_period instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "room_prejoin_state" "additional_event_types" ] "Use settings.room_prejoin_state.additional_event_types instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "room_prejoin_state" "disable_default_event_types" ] "Use settings.room_prejoin-state.disable_default_event_types instead" ) + + # Options that should be passed via extraConfigFiles, so they are not persisted into the nix store + (mkRemovedOptionModule [ "services" "matrix-synapse" "macaroon_secret_key" ] "Pass this value via extraConfigFiles instead" ) + (mkRemovedOptionModule [ "services" "matrix-synapse" "registration_shared_secret" ] "Pass this value via extraConfigFiles instead" ) + + ]; + + options = { + services.matrix-synapse = { + enable = mkEnableOption "matrix.org synapse"; + + configFile = mkOption { + type = types.str; + readOnly = true; + description = '' + Path to the configuration file on the target system. Useful to configure e.g. workers + that also need this. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.matrix-synapse; + defaultText = literalExpression "pkgs.matrix-synapse"; + description = '' + Overridable attribute of the matrix synapse server package to use. + ''; + }; + + plugins = mkOption { + type = types.listOf types.package; + default = [ ]; + example = literalExpression '' + with config.services.matrix-synapse.package.plugins; [ + matrix-synapse-ldap3 + matrix-synapse-pam + ]; + ''; + description = '' + List of additional Matrix plugins to make available. + ''; + }; + + withJemalloc = mkOption { + type = types.bool; + default = false; + description = '' + Whether to preload jemalloc to reduce memory fragmentation and overall usage. + ''; + }; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/matrix-synapse"; + description = '' + The directory where matrix-synapse stores its stateful data such as + certificates, media and uploads. + ''; + }; + + settings = mkOption { + default = {}; + description = '' + The primary synapse configuration. See the + sample configuration + for possible values. + + Secrets should be passed in by using the extraConfigFiles option. + ''; + type = with types; submodule { + freeformType = format.type; + options = { + # This is a reduced set of popular options and defaults + # Do not add every available option here, they can be specified + # by the user at their own discretion. This is a freeform type! + + server_name = mkOption { + type = types.str; + example = "example.com"; + default = config.networking.hostName; + defaultText = literalExpression "config.networking.hostName"; + description = '' + The domain name of the server, with optional explicit port. + This is used by remote servers to look up the server address. + This is also the last part of your UserID. + + The server_name cannot be changed later so it is important to configure this correctly before you start Synapse. + ''; + }; + + enable_registration = mkOption { + type = types.bool; + default = false; + description = '' + Enable registration for new users. + ''; + }; + + registration_shared_secret = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + If set, allows registration by anyone who also has the shared + secret, even if registration is otherwise disabled. + + Secrets should be passed in via extraConfigFiles! + ''; + }; + + macaroon_secret_key = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Secret key for authentication tokens. If none is specified, + the registration_shared_secret is used, if one is given; otherwise, + a secret key is derived from the signing key. + + Secrets should be passed in via extraConfigFiles! + ''; + }; + + enable_metrics = mkOption { + type = types.bool; + default = false; + description = '' + Enable collection and rendering of performance metrics + ''; + }; + + report_stats = mkOption { + type = types.bool; + default = false; + description = '' + Whether or not to report anonymized homeserver usage statistics. + ''; + }; + + signing_key_path = mkOption { + type = types.path; + default = "${cfg.dataDir}/homeserver.signing.key"; + description = '' + Path to the signing key to sign messages with. + ''; + }; + + pid_file = mkOption { + type = types.path; + default = "/run/matrix-synapse.pid"; + readOnly = true; + description = '' + The file to store the PID in. + ''; + }; + + log_config = mkOption { + type = types.path; + default = ./matrix-synapse-log_config.yaml; + description = '' + The file that holds the logging configuration. + ''; + }; + + media_store_path = mkOption { + type = types.path; + default = if lib.versionAtLeast config.system.stateVersion "22.05" + then "${cfg.dataDir}/media_store" + else "${cfg.dataDir}/media"; + description = '' + Directory where uploaded images and attachments are stored. + ''; + }; + + public_baseurl = mkOption { + type = types.nullOr types.str; + default = null; + example = "https://example.com:8448/"; + description = '' + The public-facing base URL for the client API (not including _matrix/...) + ''; + }; + + tls_certificate_path = mkOption { + type = types.nullOr types.str; + default = null; + example = "/var/lib/acme/example.com/fullchain.pem"; + description = '' + PEM encoded X509 certificate for TLS. + You can replace the self-signed certificate that synapse + autogenerates on launch with your own SSL certificate + key pair + if you like. Any required intermediary certificates can be + appended after the primary certificate in hierarchical order. + ''; + }; + + tls_private_key_path = mkOption { + type = types.nullOr types.str; + default = null; + example = "/var/lib/acme/example.com/key.pem"; + description = '' + PEM encoded private key for TLS. Specify null if synapse is not + speaking TLS directly. + ''; + }; + + presence.enabled = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Whether to enable presence tracking. + + Presence tracking allows users to see the state (e.g online/offline) + of other local and remote users. + ''; + }; + + listeners = mkOption { + type = types.listOf (types.submodule { + options = { + port = mkOption { + type = types.port; + example = 8448; + description = '' + The port to listen for HTTP(S) requests on. + ''; + }; + + bind_addresses = mkOption { + type = types.listOf types.str; + default = [ + "::1" + "127.0.0.1" + ]; + example = literalExpression '' + [ + "::" + "0.0.0.0" + ] + ''; + description = '' + IP addresses to bind the listener to. + ''; + }; + + type = mkOption { + type = types.enum [ + "http" + "manhole" + "metrics" + "replication" + ]; + default = "http"; + example = "metrics"; + description = '' + The type of the listener, usually http. + ''; + }; + + tls = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Whether to enable TLS on the listener socket. + ''; + }; + + x_forwarded = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Use the X-Forwarded-For (XFF) header as the client IP and not the + actual client IP. + ''; + }; + + resources = mkOption { + type = types.listOf (types.submodule { + options = { + names = mkOption { + type = types.listOf (types.enum [ + "client" + "consent" + "federation" + "keys" + "media" + "metrics" + "openid" + "replication" + "static" + ]); + description = '' + List of resources to host on this listener. + ''; + example = [ + "client" + ]; + }; + compress = mkOption { + type = types.bool; + description = '' + Should synapse compress HTTP responses to clients that support it? + This should be disabled if running synapse behind a load balancer + that can do automatic compression. + ''; + }; + }; + }); + description = '' + List of HTTP resources to serve on this listener. + ''; + }; + }; + }); + default = [ { + port = 8008; + bind_addresses = [ "127.0.0.1" ]; + type = "http"; + tls = false; + x_forwarded = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; + } ]; + description = '' + List of ports that Synapse should listen on, their purpose and their configuration. + ''; + }; + + database.name = mkOption { + type = types.enum [ + "sqlite3" + "psycopg2" + ]; + default = if versionAtLeast config.system.stateVersion "18.03" + then "psycopg2" + else "sqlite3"; + defaultText = literalExpression '' + if versionAtLeast config.system.stateVersion "18.03" + then "psycopg2" + else "sqlite3" + ''; + description = '' + The database engine name. Can be sqlite3 or psycopg2. + ''; + }; + + database.args.database = mkOption { + type = types.str; + default = { + sqlite3 = "${cfg.dataDir}/homeserver.db"; + psycopg2 = "matrix-synapse"; + }.${cfg.settings.database.name}; + defaultText = literalExpression '' + { + sqlite3 = "''${${options.services.matrix-synapse.dataDir}}/homeserver.db"; + psycopg2 = "matrix-synapse"; + }.''${${options.services.matrix-synapse.settings}.database.name}; + ''; + description = '' + Name of the database when using the psycopg2 backend, + path to the database location when using sqlite3. + ''; + }; + + database.args.user = mkOption { + type = types.nullOr types.str; + default = { + sqlite3 = null; + psycopg2 = "matrix-synapse"; + }.${cfg.settings.database.name}; + description = '' + Username to connect with psycopg2, set to null + when using sqlite3. + ''; + }; + + url_preview_enabled = mkOption { + type = types.bool; + default = true; + example = false; + description = '' + Is the preview URL API enabled? If enabled, you *must* specify an + explicit url_preview_ip_range_blacklist of IPs that the spider is + denied from accessing. + ''; + }; + + url_preview_ip_range_blacklist = mkOption { + type = types.listOf types.str; + default = [ + "10.0.0.0/8" + "100.64.0.0/10" + "127.0.0.0/8" + "169.254.0.0/16" + "172.16.0.0/12" + "192.0.0.0/24" + "192.0.2.0/24" + "192.168.0.0/16" + "192.88.99.0/24" + "198.18.0.0/15" + "198.51.100.0/24" + "2001:db8::/32" + "203.0.113.0/24" + "224.0.0.0/4" + "::1/128" + "fc00::/7" + "fe80::/10" + "fec0::/10" + "ff00::/8" + ]; + description = '' + List of IP address CIDR ranges that the URL preview spider is denied + from accessing. + ''; + }; + + url_preview_ip_range_whitelist = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of IP address CIDR ranges that the URL preview spider is allowed + to access even if they are specified in url_preview_ip_range_blacklist. + ''; + }; + + url_preview_url_blacklist = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Optional list of URL matches that the URL preview spider is + denied from accessing. + ''; + }; + + max_upload_size = mkOption { + type = types.str; + default = "50M"; + example = "100M"; + description = '' + The largest allowed upload size in bytes + ''; + }; + + max_image_pixels = mkOption { + type = types.str; + default = "32M"; + example = "64M"; + description = '' + Maximum number of pixels that will be thumbnailed + ''; + }; + + dynamic_thumbnails = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Whether to generate new thumbnails on the fly to precisely match + the resolution requested by the client. If true then whenever + a new resolution is requested by the client the server will + generate a new thumbnail. If false the server will pick a thumbnail + from a precalculated list. + ''; + }; + + turn_uris = mkOption { + type = types.listOf types.str; + default = []; + example = [ + "turn:turn.example.com:3487?transport=udp" + "turn:turn.example.com:3487?transport=tcp" + "turns:turn.example.com:5349?transport=udp" + "turns:turn.example.com:5349?transport=tcp" + ]; + description = '' + The public URIs of the TURN server to give to clients + ''; + }; + turn_shared_secret = mkOption { + type = types.str; + default = ""; + example = literalExpression '' + config.services.coturn.static-auth-secret + ''; + description = '' + The shared secret used to compute passwords for the TURN server. + + Secrets should be passed in via extraConfigFiles! + ''; + }; + + trusted_key_servers = mkOption { + type = types.listOf (types.submodule { + options = { + server_name = mkOption { + type = types.str; + example = "matrix.org"; + description = '' + Hostname of the trusted server. + ''; + }; + + verify_keys = mkOption { + type = types.nullOr (types.attrsOf types.str); + default = null; + example = literalExpression '' + { + "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"; + } + ''; + description = '' + Attribute set from key id to base64 encoded public key. + + If specified synapse will check that the response is signed + by at least one of the given keys. + ''; + }; + }; + }); + default = [ { + server_name = "matrix.org"; + verify_keys = { + "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"; + }; + } ]; + description = '' + The trusted servers to download signing keys from. + ''; + }; + + app_service_config_files = mkOption { + type = types.listOf types.path; + default = [ ]; + description = '' + A list of application service config file to use + ''; + }; + + }; + }; + }; + + extraConfigFiles = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Extra config files to include. + + The configuration files will be included based on the command line + argument --config-path. This allows to configure secrets without + having to go through the Nix store, e.g. based on deployment keys if + NixOps is in use. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { assertion = hasLocalPostgresDB -> config.services.postgresql.enable; + message = '' + Cannot deploy matrix-synapse with a configuration for a local postgresql database + and a missing postgresql service. Since 20.03 it's mandatory to manually configure the + database (please read the thread in https://github.com/NixOS/nixpkgs/pull/80447 for + further reference). + + If you + - try to deploy a fresh synapse, you need to configure the database yourself. An example + for this can be found in + - update your existing matrix-synapse instance, you simply need to add `services.postgresql.enable = true` + to your configuration. + + For further information about this update, please read the release-notes of 20.03 carefully. + ''; + } + ]; + + services.matrix-synapse.configFile = configFile; + + users.users.matrix-synapse = { + group = "matrix-synapse"; + home = cfg.dataDir; + createHome = true; + shell = "${pkgs.bash}/bin/bash"; + uid = config.ids.uids.matrix-synapse; + }; + + users.groups.matrix-synapse = { + gid = config.ids.gids.matrix-synapse; + }; + + systemd.services.matrix-synapse = { + description = "Synapse Matrix homeserver"; + after = [ "network.target" ] ++ optional hasLocalPostgresDB "postgresql.service"; + wantedBy = [ "multi-user.target" ]; + preStart = '' + ${cfg.package}/bin/synapse_homeserver \ + --config-path ${configFile} \ + --keys-directory ${cfg.dataDir} \ + --generate-keys + ''; + environment = { + PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ]; + } // optionalAttrs (cfg.withJemalloc) { + LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so"; + }; + serviceConfig = { + Type = "notify"; + User = "matrix-synapse"; + Group = "matrix-synapse"; + WorkingDirectory = cfg.dataDir; + ExecStartPre = [ ("+" + (pkgs.writeShellScript "matrix-synapse-fix-permissions" '' + chown matrix-synapse:matrix-synapse ${cfg.dataDir}/homeserver.signing.key + chmod 0600 ${cfg.dataDir}/homeserver.signing.key + '')) ]; + ExecStart = '' + ${cfg.package}/bin/synapse_homeserver \ + ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } + --keys-directory ${cfg.dataDir} + ''; + ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID"; + Restart = "on-failure"; + UMask = "0077"; + }; + }; + + environment.systemPackages = [ registerNewMatrixUser ]; + }; + + meta = { + buildDocsInSandbox = false; + doc = ./matrix-synapse.xml; + maintainers = teams.matrix.members; + }; + +} diff --git a/nixos/modules/services/misc/matrix-synapse.xml b/nixos/modules/services/matrix/matrix-synapse.xml similarity index 85% rename from nixos/modules/services/misc/matrix-synapse.xml rename to nixos/modules/services/matrix/matrix-synapse.xml index 41a56df0f2b5..cf33957d58ec 100644 --- a/nixos/modules/services/misc/matrix-synapse.xml +++ b/nixos/modules/services/matrix/matrix-synapse.xml @@ -115,20 +115,21 @@ in { }; services.matrix-synapse = { enable = true; - server_name = config.networking.domain; - listeners = [ + server_name = config.networking.domain; + listeners = [ { - port = 8008; - bind_address = "::1"; - type = "http"; - tls = false; - x_forwarded = true; - resources = [ - { - names = [ "client" "federation" ]; - compress = false; - } - ]; + port = 8008; + bind_addresses = [ "::1" ]; + type = "http"; + tls = false; + x_forwarded = true; + resources = [ { + names = [ "client" ]; + compress = true; + } { + names = [ "federation" ]; + compress = false; + } ]; } ]; }; @@ -151,11 +152,11 @@ in { If you want to run a server with public registration by anybody, you can - then enable services.matrix-synapse.enable_registration = + then enable services.matrix-synapse.settings.enable_registration = true;. Otherwise, or you can generate a registration secret with pwgen -s 64 1 and set it with - . To - create a new user or admin, run the following after you have set the secret + . + To create a new user or admin, run the following after you have set the secret and have rebuilt NixOS: $ nix run nixpkgs.matrix-synapse @@ -170,7 +171,7 @@ Success! @your-username:example.org. Note that the registration secret ends up in the nix store and therefore is world-readable by any user on your machine, so it makes sense to only temporarily activate the - registration_shared_secret + registration_shared_secret option until a better solution for NixOS is in place. diff --git a/nixos/modules/services/matrix/mjolnir.xml b/nixos/modules/services/matrix/mjolnir.xml index d462ddf7b01b..b07abe339791 100644 --- a/nixos/modules/services/matrix/mjolnir.xml +++ b/nixos/modules/services/matrix/mjolnir.xml @@ -98,7 +98,7 @@ To use the Antispam Module, add matrix-synapse-plugins.matrix-synapse-mjolnir-antispam - to the Synapse plugin list and enable the mjolnir.AntiSpam module. + to the Synapse plugin list and enable the mjolnir.Module module. { @@ -108,7 +108,7 @@ ]; extraConfig = '' modules: - - module: mjolnir.AntiSpam + - module: mjolnir.Module config: # Prevent servers/users in the ban lists from inviting users on this # server to rooms. Default true. diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix index 5a5c30a41233..2b9c6d80abbd 100644 --- a/nixos/modules/services/misc/airsonic.nix +++ b/nixos/modules/services/misc/airsonic.nix @@ -39,9 +39,11 @@ in { default = "127.0.0.1"; description = '' The host name or IP address on which to bind Airsonic. - Only relevant if you have multiple network interfaces and want - to make Airsonic available on only one of them. The default value - will bind Airsonic to all available network interfaces. + The default value is appropriate for first launch, when the + default credentials are easy to guess. It is also appropriate + if you intend to use the virtualhost option in the service + module. In other cases, you may want to change this to a + specific IP or 0.0.0.0 to listen on all interfaces. ''; }; diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index 95cee5046e81..ef799e9ce3b6 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -5,6 +5,243 @@ with lib; let cfg = config.services.autorandr; + hookType = types.lines; + + matrixOf = n: m: elemType: + mkOptionType rec { + name = "matrixOf"; + description = + "${toString n}×${toString m} matrix of ${elemType.description}s"; + check = xss: + let listOfSize = l: xs: isList xs && length xs == l; + in listOfSize n xss + && all (xs: listOfSize m xs && all elemType.check xs) xss; + merge = mergeOneOption; + getSubOptions = prefix: elemType.getSubOptions (prefix ++ [ "*" "*" ]); + getSubModules = elemType.getSubModules; + substSubModules = mod: matrixOf n m (elemType.substSubModules mod); + functor = (defaultFunctor name) // { wrapped = elemType; }; + }; + + profileModule = types.submodule { + options = { + fingerprint = mkOption { + type = types.attrsOf types.str; + description = '' + Output name to EDID mapping. + Use autorandr --fingerprint to get current setup values. + ''; + default = { }; + }; + + config = mkOption { + type = types.attrsOf configModule; + description = "Per output profile configuration."; + default = { }; + }; + + hooks = mkOption { + type = hooksModule; + description = "Profile hook scripts."; + default = { }; + }; + }; + }; + + configModule = types.submodule { + options = { + enable = mkOption { + type = types.bool; + description = "Whether to enable the output."; + default = true; + }; + + crtc = mkOption { + type = types.nullOr types.ints.unsigned; + description = "Output video display controller."; + default = null; + example = 0; + }; + + primary = mkOption { + type = types.bool; + description = "Whether output should be marked as primary"; + default = false; + }; + + position = mkOption { + type = types.str; + description = "Output position"; + default = ""; + example = "5760x0"; + }; + + mode = mkOption { + type = types.str; + description = "Output resolution."; + default = ""; + example = "3840x2160"; + }; + + rate = mkOption { + type = types.str; + description = "Output framerate."; + default = ""; + example = "60.00"; + }; + + gamma = mkOption { + type = types.str; + description = "Output gamma configuration."; + default = ""; + example = "1.0:0.909:0.833"; + }; + + rotate = mkOption { + type = types.nullOr (types.enum [ "normal" "left" "right" "inverted" ]); + description = "Output rotate configuration."; + default = null; + example = "left"; + }; + + transform = mkOption { + type = types.nullOr (matrixOf 3 3 types.float); + default = null; + example = literalExpression '' + [ + [ 0.6 0.0 0.0 ] + [ 0.0 0.6 0.0 ] + [ 0.0 0.0 1.0 ] + ] + ''; + description = '' + Refer to + + xrandr + 1 + + for the documentation of the transform matrix. + ''; + }; + + dpi = mkOption { + type = types.nullOr types.ints.positive; + description = "Output DPI configuration."; + default = null; + example = 96; + }; + + scale = mkOption { + type = types.nullOr (types.submodule { + options = { + method = mkOption { + type = types.enum [ "factor" "pixel" ]; + description = "Output scaling method."; + default = "factor"; + example = "pixel"; + }; + + x = mkOption { + type = types.either types.float types.ints.positive; + description = "Horizontal scaling factor/pixels."; + }; + + y = mkOption { + type = types.either types.float types.ints.positive; + description = "Vertical scaling factor/pixels."; + }; + }; + }); + description = '' + Output scale configuration. + + Either configure by pixels or a scaling factor. When using pixel method the + + xrandr + 1 + + option + --scale-from + will be used; when using factor method the option + --scale + will be used. + + This option is a shortcut version of the transform option and they are mutually + exclusive. + ''; + default = null; + example = literalExpression '' + { + x = 1.25; + y = 1.25; + } + ''; + }; + }; + }; + + hooksModule = types.submodule { + options = { + postswitch = mkOption { + type = types.attrsOf hookType; + description = "Postswitch hook executed after mode switch."; + default = { }; + }; + + preswitch = mkOption { + type = types.attrsOf hookType; + description = "Preswitch hook executed before mode switch."; + default = { }; + }; + + predetect = mkOption { + type = types.attrsOf hookType; + description = '' + Predetect hook executed before autorandr attempts to run xrandr. + ''; + default = { }; + }; + }; + }; + + hookToFile = folder: name: hook: + nameValuePair "xdg/autorandr/${folder}/${name}" { + source = "${pkgs.writeShellScriptBin "hook" hook}/bin/hook"; + }; + profileToFiles = name: profile: + with profile; + mkMerge ([ + { + "xdg/autorandr/${name}/setup".text = concatStringsSep "\n" + (mapAttrsToList fingerprintToString fingerprint); + "xdg/autorandr/${name}/config".text = + concatStringsSep "\n" (mapAttrsToList configToString profile.config); + } + (mapAttrs' (hookToFile "${name}/postswitch.d") hooks.postswitch) + (mapAttrs' (hookToFile "${name}/preswitch.d") hooks.preswitch) + (mapAttrs' (hookToFile "${name}/predetect.d") hooks.predetect) + ]); + fingerprintToString = name: edid: "${name} ${edid}"; + configToString = name: config: + if config.enable then + concatStringsSep "\n" ([ "output ${name}" ] + ++ optional (config.position != "") "pos ${config.position}" + ++ optional (config.crtc != null) "crtc ${toString config.crtc}" + ++ optional config.primary "primary" + ++ optional (config.dpi != null) "dpi ${toString config.dpi}" + ++ optional (config.gamma != "") "gamma ${config.gamma}" + ++ optional (config.mode != "") "mode ${config.mode}" + ++ optional (config.rate != "") "rate ${config.rate}" + ++ optional (config.rotate != null) "rotate ${config.rotate}" + ++ optional (config.transform != null) ("transform " + + concatMapStringsSep "," toString (flatten config.transform)) + ++ optional (config.scale != null) + ((if config.scale.method == "factor" then "scale" else "scale-from") + + " ${toString config.scale.x}x${toString config.scale.y}")) + else '' + output ${name} + off + ''; in { @@ -22,6 +259,67 @@ in { for further reference. ''; }; + + hooks = mkOption { + type = hooksModule; + description = "Global hook scripts"; + default = { }; + example = '' + { + postswitch = { + "notify-i3" = "''${pkgs.i3}/bin/i3-msg restart"; + "change-background" = readFile ./change-background.sh; + "change-dpi" = ''' + case "$AUTORANDR_CURRENT_PROFILE" in + default) + DPI=120 + ;; + home) + DPI=192 + ;; + work) + DPI=144 + ;; + *) + echo "Unknown profle: $AUTORANDR_CURRENT_PROFILE" + exit 1 + esac + echo "Xft.dpi: $DPI" | ''${pkgs.xorg.xrdb}/bin/xrdb -merge + ''' + }; + } + ''; + }; + profiles = mkOption { + type = types.attrsOf profileModule; + description = "Autorandr profiles specification."; + default = { }; + example = literalExpression '' + { + "work" = { + fingerprint = { + eDP1 = ""; + DP1 = ""; + }; + config = { + eDP1.enable = false; + DP1 = { + enable = true; + crtc = 0; + primary = true; + position = "0x0"; + mode = "3840x2160"; + gamma = "1.0:0.909:0.833"; + rate = "60.00"; + rotate = "left"; + }; + }; + hooks.postswitch = readFile ./work-postswitch.sh; + }; + } + ''; + }; + }; }; @@ -30,7 +328,15 @@ in { services.udev.packages = [ pkgs.autorandr ]; - environment.systemPackages = [ pkgs.autorandr ]; + environment = { + systemPackages = [ pkgs.autorandr ]; + etc = mkMerge ([ + (mapAttrs' (hookToFile "postswitch.d") cfg.hooks.postswitch) + (mapAttrs' (hookToFile "preswitch.d") cfg.hooks.preswitch) + (mapAttrs' (hookToFile "predetect.d") cfg.hooks.predetect) + (mkMerge (mapAttrsToList profileToFiles cfg.profiles)) + ]); + }; systemd.services.autorandr = { wantedBy = [ "sleep.target" ]; @@ -43,10 +349,11 @@ in { ExecStart = "${pkgs.autorandr}/bin/autorandr --batch --change --default ${cfg.defaultTarget}"; Type = "oneshot"; RemainAfterExit = false; + KillMode = "process"; }; }; }; - meta.maintainers = with maintainers; [ ]; + meta.maintainers = with maintainers; [ alexnortung ]; } diff --git a/nixos/modules/services/misc/dendrite.nix b/nixos/modules/services/misc/dendrite.nix index c967fc3a362a..89bb989a09ec 100644 --- a/nixos/modules/services/misc/dendrite.nix +++ b/nixos/modules/services/misc/dendrite.nix @@ -110,6 +110,15 @@ in ''; }; }; + options.app_service_api.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:federationapi.db"; + description = '' + Database for the Appservice API. + ''; + }; + }; options.client_api = { registration_disabled = lib.mkOption { type = lib.types.bool; @@ -120,6 +129,91 @@ in ''; }; }; + options.federation_api.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:federationapi.db"; + description = '' + Database for the Federation API. + ''; + }; + }; + options.key_server.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:keyserver.db"; + description = '' + Database for the Key Server (for end-to-end encryption). + ''; + }; + }; + options.media_api = { + database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:mediaapi.db"; + description = '' + Database for the Media API. + ''; + }; + }; + base_path = lib.mkOption { + type = lib.types.str; + default = "${workingDir}/media_store"; + description = '' + Storage path for uploaded media. + ''; + }; + }; + options.room_server.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:roomserver.db"; + description = '' + Database for the Room Server. + ''; + }; + }; + options.sync_api.database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:syncserver.db"; + description = '' + Database for the Sync API. + ''; + }; + }; + options.user_api = { + account_database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:userapi_accounts.db"; + description = '' + Database for the User API, accounts. + ''; + }; + }; + device_database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:userapi_devices.db"; + description = '' + Database for the User API, devices. + ''; + }; + }; + }; + options.mscs = { + database = { + connection_string = lib.mkOption { + type = lib.types.str; + default = "file:mscs.db"; + description = '' + Database for exerimental MSC's. + ''; + }; + }; + }; }; default = { }; description = '' @@ -154,14 +248,11 @@ in RuntimeDirectory = "dendrite"; RuntimeDirectoryMode = "0700"; EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; - ExecStartPre = - if (cfg.environmentFile != null) then '' - ${pkgs.envsubst}/bin/envsubst \ - -i ${configurationYaml} \ - -o /run/dendrite/dendrite.yaml - '' else '' - ${pkgs.coreutils}/bin/cp ${configurationYaml} /run/dendrite/dendrite.yaml - ''; + ExecStartPre = '' + ${pkgs.envsubst}/bin/envsubst \ + -i ${configurationYaml} \ + -o /run/dendrite/dendrite.yaml + ''; ExecStart = lib.strings.concatStringsSep " " ([ "${pkgs.dendrite}/bin/dendrite-monolith-server" "--config /run/dendrite/dendrite.yaml" diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 6f6a9e3110ad..e48444f71612 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -72,7 +72,7 @@ let redis = { bin = "${pkgs.redis}/bin/redis-cli"; host = "127.0.0.1"; - port = 6379; + port = config.services.redis.servers.gitlab.port; database = 0; namespace = "resque:gitlab"; }; @@ -450,7 +450,8 @@ in { redisUrl = mkOption { type = types.str; - default = "redis://localhost:6379/"; + default = "redis://localhost:${toString config.services.redis.servers.gitlab.port}/"; + defaultText = literalExpression ''redis://localhost:''${toString config.services.redis.servers.gitlab.port}/''; description = "Redis URL for all GitLab services except gitlab-shell"; }; @@ -961,7 +962,11 @@ in { }; # Redis is required for the sidekiq queue runner. - services.redis.enable = mkDefault true; + services.redis.servers.gitlab = { + enable = mkDefault true; + port = mkDefault 31636; + bind = mkDefault "127.0.0.1"; + }; # We use postgres as the main data store. services.postgresql = optionalAttrs databaseActuallyCreateLocally { @@ -1131,8 +1136,8 @@ in { ExecStartPre = let preStartFullPrivileges = '' - shopt -s dotglob nullglob - set -eu + set -o errexit -o pipefail -o nounset + shopt -s dotglob nullglob inherit_errexit chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/* if [[ -n "$(ls -A '${cfg.statePath}'/config/)" ]]; then @@ -1142,7 +1147,8 @@ in { in "+${pkgs.writeShellScript "gitlab-pre-start-full-privileges" preStartFullPrivileges}"; ExecStart = pkgs.writeShellScript "gitlab-config" '' - set -eu + set -o errexit -o pipefail -o nounset + shopt -s inherit_errexit umask u=rwx,g=rx,o= @@ -1171,7 +1177,8 @@ in { rm -f '${cfg.statePath}/config/database.yml' ${if cfg.databasePasswordFile != null then '' - export db_password="$(<'${cfg.databasePasswordFile}')" + db_password="$(<'${cfg.databasePasswordFile}')" + export db_password if [[ -z "$db_password" ]]; then >&2 echo "Database password was an empty string!" @@ -1195,10 +1202,11 @@ in { rm -f '${cfg.statePath}/config/secrets.yml' - export secret="$(<'${cfg.secrets.secretFile}')" - export db="$(<'${cfg.secrets.dbFile}')" - export otp="$(<'${cfg.secrets.otpFile}')" - export jws="$(<'${cfg.secrets.jwsFile}')" + secret="$(<'${cfg.secrets.secretFile}')" + db="$(<'${cfg.secrets.dbFile}')" + otp="$(<'${cfg.secrets.otpFile}')" + jws="$(<'${cfg.secrets.jwsFile}')" + export secret db otp jws jq -n '{production: {secret_key_base: $ENV.secret, otp_key_base: $ENV.otp, db_key_base: $ENV.db, @@ -1232,7 +1240,8 @@ in { RemainAfterExit = true; ExecStart = pkgs.writeShellScript "gitlab-db-config" '' - set -eu + set -o errexit -o pipefail -o nounset + shopt -s inherit_errexit umask u=rwx,g=rx,o= initial_root_password="$(<'${cfg.initialRootPasswordFile}')" @@ -1245,13 +1254,13 @@ in { systemd.services.gitlab-sidekiq = { after = [ "network.target" - "redis.service" + "redis-gitlab.service" "postgresql.service" "gitlab-config.service" "gitlab-db-config.service" ]; bindsTo = [ - "redis.service" + "redis-gitlab.service" "gitlab-config.service" "gitlab-db-config.service" ] ++ optional (cfg.databaseHost == "") "postgresql.service"; @@ -1366,7 +1375,7 @@ in { systemd.services.gitlab-mailroom = mkIf (gitlabConfig.production.incoming_email.enabled or false) { description = "GitLab incoming mail daemon"; - after = [ "network.target" "redis.service" "gitlab-config.service" ]; + after = [ "network.target" "redis-gitlab.service" "gitlab-config.service" ]; bindsTo = [ "gitlab-config.service" ]; wantedBy = [ "gitlab.target" ]; partOf = [ "gitlab.target" ]; @@ -1387,12 +1396,12 @@ in { after = [ "gitlab-workhorse.service" "network.target" - "redis.service" + "redis-gitlab.service" "gitlab-config.service" "gitlab-db-config.service" ]; bindsTo = [ - "redis.service" + "redis-gitlab.service" "gitlab-config.service" "gitlab-db-config.service" ] ++ optional (cfg.databaseHost == "") "postgresql.service"; diff --git a/nixos/modules/services/misc/input-remapper.nix b/nixos/modules/services/misc/input-remapper.nix new file mode 100644 index 000000000000..f5fb2bf53086 --- /dev/null +++ b/nixos/modules/services/misc/input-remapper.nix @@ -0,0 +1,30 @@ +{ pkgs, lib, config, ... }: + +with lib; + +let cfg = config.services.input-remapper; in +{ + options = { + services.input-remapper = { + enable = mkEnableOption "input-remapper, an easy to use tool to change the mapping of your input device buttons."; + package = options.mkPackageOption pkgs "input-remapper" { }; + enableUdevRules = mkEnableOption "udev rules added by input-remapper to handle hotplugged devices. Currently disabled by default due to https://github.com/sezanzeb/input-remapper/issues/140"; + serviceWantedBy = mkOption { + default = [ "graphical.target" ]; + example = [ "multi-user.target" ]; + type = types.listOf types.str; + description = "Specifies the WantedBy setting for the input-remapper service."; + }; + }; + }; + + config = mkIf cfg.enable { + services.udev.packages = mkIf cfg.enableUdevRules [ cfg.package ]; + services.dbus.packages = [ cfg.package ]; + systemd.packages = [ cfg.package ]; + environment.systemPackages = [ cfg.package ]; + systemd.services.input-remapper.wantedBy = cfg.serviceWantedBy; + }; + + meta.maintainers = with lib.maintainers; [ LunNova ]; +} diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix index b9d54f27edc2..04cf82f8a46b 100644 --- a/nixos/modules/services/misc/jellyfin.nix +++ b/nixos/modules/services/misc/jellyfin.nix @@ -70,10 +70,12 @@ in LockPersonality = true; PrivateTmp = true; - PrivateDevices = true; + # Disabled to allow Jellyfin to access hw accel devices endpoints + # PrivateDevices = true; PrivateUsers = true; - ProtectClock = true; + # Disabled as it does not allow Jellyfin to interface with CUDA devices + # ProtectClock = true; ProtectControlGroups = true; ProtectHostname = true; ProtectKernelLogs = true; @@ -84,7 +86,7 @@ in RestrictNamespaces = true; # AF_NETLINK needed because Jellyfin monitors the network connection - RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET" "AF_INET6" "AF_UNIX" ]; RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/nixos/modules/services/misc/matrix-conduit.nix b/nixos/modules/services/misc/matrix-conduit.nix index d6cd575ee9a3..108f64de7aa9 100644 --- a/nixos/modules/services/misc/matrix-conduit.nix +++ b/nixos/modules/services/misc/matrix-conduit.nix @@ -86,6 +86,15 @@ in and is set to be read only. ''; }; + global.database_backend = mkOption { + type = types.enum [ "sqlite" "rocksdb" ]; + default = "sqlite"; + example = "rocksdb"; + description = '' + The database backend for the service. Switching it on an existing + instance will require manual migration of data. + ''; + }; }; }; default = {}; diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix deleted file mode 100644 index feca4c5465ff..000000000000 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ /dev/null @@ -1,844 +0,0 @@ -{ config, lib, options, pkgs, ... }: - -with lib; - -let - cfg = config.services.matrix-synapse; - opt = options.services.matrix-synapse; - pg = config.services.postgresql; - usePostgresql = cfg.database_type == "psycopg2"; - logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig; - mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${boolToString r.compress}}''; - mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${boolToString l.tls}, x_forwarded: ${boolToString l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; - pluginsEnv = cfg.package.python.buildEnv.override { - extraLibs = cfg.plugins; - }; - configFile = pkgs.writeText "homeserver.yaml" '' -${optionalString (cfg.tls_certificate_path != null) '' -tls_certificate_path: "${cfg.tls_certificate_path}" -''} -${optionalString (cfg.tls_private_key_path != null) '' -tls_private_key_path: "${cfg.tls_private_key_path}" -''} -${optionalString (cfg.tls_dh_params_path != null) '' -tls_dh_params_path: "${cfg.tls_dh_params_path}" -''} -no_tls: ${boolToString cfg.no_tls} -${optionalString (cfg.bind_port != null) '' -bind_port: ${toString cfg.bind_port} -''} -${optionalString (cfg.unsecure_port != null) '' -unsecure_port: ${toString cfg.unsecure_port} -''} -${optionalString (cfg.bind_host != null) '' -bind_host: "${cfg.bind_host}" -''} -server_name: "${cfg.server_name}" -pid_file: "/run/matrix-synapse.pid" -${optionalString (cfg.public_baseurl != null) '' -public_baseurl: "${cfg.public_baseurl}" -''} -listeners: [${concatStringsSep "," (map mkListener cfg.listeners)}] -database: { - name: "${cfg.database_type}", - args: { - ${concatStringsSep ",\n " ( - mapAttrsToList (n: v: "\"${n}\": ${builtins.toJSON v}") cfg.database_args - )} - } -} -event_cache_size: "${cfg.event_cache_size}" -verbose: ${cfg.verbose} -log_config: "${logConfigFile}" -rc_messages_per_second: ${cfg.rc_messages_per_second} -rc_message_burst_count: ${cfg.rc_message_burst_count} -federation_rc_window_size: ${cfg.federation_rc_window_size} -federation_rc_sleep_limit: ${cfg.federation_rc_sleep_limit} -federation_rc_sleep_delay: ${cfg.federation_rc_sleep_delay} -federation_rc_reject_limit: ${cfg.federation_rc_reject_limit} -federation_rc_concurrent: ${cfg.federation_rc_concurrent} -media_store_path: "${cfg.dataDir}/media" -uploads_path: "${cfg.dataDir}/uploads" -max_upload_size: "${cfg.max_upload_size}" -max_image_pixels: "${cfg.max_image_pixels}" -dynamic_thumbnails: ${boolToString cfg.dynamic_thumbnails} -url_preview_enabled: ${boolToString cfg.url_preview_enabled} -${optionalString (cfg.url_preview_enabled == true) '' -url_preview_ip_range_blacklist: ${builtins.toJSON cfg.url_preview_ip_range_blacklist} -url_preview_ip_range_whitelist: ${builtins.toJSON cfg.url_preview_ip_range_whitelist} -url_preview_url_blacklist: ${builtins.toJSON cfg.url_preview_url_blacklist} -''} -recaptcha_private_key: "${cfg.recaptcha_private_key}" -recaptcha_public_key: "${cfg.recaptcha_public_key}" -enable_registration_captcha: ${boolToString cfg.enable_registration_captcha} -turn_uris: ${builtins.toJSON cfg.turn_uris} -turn_shared_secret: "${cfg.turn_shared_secret}" -enable_registration: ${boolToString cfg.enable_registration} -${optionalString (cfg.registration_shared_secret != null) '' -registration_shared_secret: "${cfg.registration_shared_secret}" -''} -recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify" -turn_user_lifetime: "${cfg.turn_user_lifetime}" -user_creation_max_duration: ${cfg.user_creation_max_duration} -bcrypt_rounds: ${cfg.bcrypt_rounds} -allow_guest_access: ${boolToString cfg.allow_guest_access} - -account_threepid_delegates: - ${optionalString (cfg.account_threepid_delegates.email != null) "email: ${cfg.account_threepid_delegates.email}"} - ${optionalString (cfg.account_threepid_delegates.msisdn != null) "msisdn: ${cfg.account_threepid_delegates.msisdn}"} - -room_prejoin_state: - disable_default_event_types: ${boolToString cfg.room_prejoin_state.disable_default_event_types} - additional_event_types: ${builtins.toJSON cfg.room_prejoin_state.additional_event_types} -${optionalString (cfg.macaroon_secret_key != null) '' - macaroon_secret_key: "${cfg.macaroon_secret_key}" -''} -expire_access_token: ${boolToString cfg.expire_access_token} -enable_metrics: ${boolToString cfg.enable_metrics} -report_stats: ${boolToString cfg.report_stats} -signing_key_path: "${cfg.dataDir}/homeserver.signing.key" -key_refresh_interval: "${cfg.key_refresh_interval}" -perspectives: - servers: { - ${concatStringsSep "},\n" (mapAttrsToList (n: v: '' - "${n}": { - "verify_keys": { - ${concatStringsSep "},\n" (mapAttrsToList (n: v: '' - "${n}": { - "key": "${v}" - }'') v)} - } - '') cfg.servers)} - } - } -redaction_retention_period: ${toString cfg.redaction_retention_period} -app_service_config_files: ${builtins.toJSON cfg.app_service_config_files} - -${cfg.extraConfig} -''; - - hasLocalPostgresDB = let args = cfg.database_args; in - usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ])); - - registerNewMatrixUser = - let - isIpv6 = x: lib.length (lib.splitString ":" x) > 1; - listener = - lib.findFirst ( - listener: lib.any ( - resource: lib.any ( - name: name == "client" - ) resource.names - ) listener.resources - ) (lib.last cfg.listeners) cfg.listeners; - in - pkgs.writeShellScriptBin "matrix-synapse-register_new_matrix_user" '' - exec ${cfg.package}/bin/register_new_matrix_user \ - $@ \ - ${lib.concatMapStringsSep " " (x: "-c ${x}") ([ configFile ] ++ cfg.extraConfigFiles)} \ - "${listener.type}://${ - if (isIpv6 listener.bind_address) then - "[${listener.bind_address}]" - else - "${listener.bind_address}" - }:${builtins.toString listener.port}/" - ''; -in { - options = { - services.matrix-synapse = { - enable = mkEnableOption "matrix.org synapse"; - configFile = mkOption { - type = types.str; - readOnly = true; - description = '' - Path to the configuration file on the target system. Useful to configure e.g. workers - that also need this. - ''; - }; - package = mkOption { - type = types.package; - default = pkgs.matrix-synapse; - defaultText = literalExpression "pkgs.matrix-synapse"; - description = '' - Overridable attribute of the matrix synapse server package to use. - ''; - }; - plugins = mkOption { - type = types.listOf types.package; - default = [ ]; - example = literalExpression '' - with config.services.matrix-synapse.package.plugins; [ - matrix-synapse-ldap3 - matrix-synapse-pam - ]; - ''; - description = '' - List of additional Matrix plugins to make available. - ''; - }; - withJemalloc = mkOption { - type = types.bool; - default = false; - description = '' - Whether to preload jemalloc to reduce memory fragmentation and overall usage. - ''; - }; - no_tls = mkOption { - type = types.bool; - default = false; - description = '' - Don't bind to the https port - ''; - }; - bind_port = mkOption { - type = types.nullOr types.int; - default = null; - example = 8448; - description = '' - DEPRECATED: Use listeners instead. - The port to listen for HTTPS requests on. - For when matrix traffic is sent directly to synapse. - ''; - }; - unsecure_port = mkOption { - type = types.nullOr types.int; - default = null; - example = 8008; - description = '' - DEPRECATED: Use listeners instead. - The port to listen for HTTP requests on. - For when matrix traffic passes through loadbalancer that unwraps TLS. - ''; - }; - bind_host = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - DEPRECATED: Use listeners instead. - Local interface to listen on. - The empty string will cause synapse to listen on all interfaces. - ''; - }; - tls_certificate_path = mkOption { - type = types.nullOr types.str; - default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.crt"; - description = '' - PEM encoded X509 certificate for TLS. - You can replace the self-signed certificate that synapse - autogenerates on launch with your own SSL certificate + key pair - if you like. Any required intermediary certificates can be - appended after the primary certificate in hierarchical order. - ''; - }; - tls_private_key_path = mkOption { - type = types.nullOr types.str; - default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.key"; - description = '' - PEM encoded private key for TLS. Specify null if synapse is not - speaking TLS directly. - ''; - }; - tls_dh_params_path = mkOption { - type = types.nullOr types.str; - default = null; - example = "/var/lib/matrix-synapse/homeserver.tls.dh"; - description = '' - PEM dh parameters for ephemeral keys - ''; - }; - server_name = mkOption { - type = types.str; - example = "example.com"; - default = config.networking.hostName; - defaultText = literalExpression "config.networking.hostName"; - description = '' - The domain name of the server, with optional explicit port. - This is used by remote servers to look up the server address. - This is also the last part of your UserID. - - The server_name cannot be changed later so it is important to configure this correctly before you start Synapse. - ''; - }; - public_baseurl = mkOption { - type = types.nullOr types.str; - default = null; - example = "https://example.com:8448/"; - description = '' - The public-facing base URL for the client API (not including _matrix/...) - ''; - }; - listeners = mkOption { - type = types.listOf (types.submodule { - options = { - port = mkOption { - type = types.port; - example = 8448; - description = '' - The port to listen for HTTP(S) requests on. - ''; - }; - bind_address = mkOption { - type = types.str; - default = ""; - example = "203.0.113.42"; - description = '' - Local interface to listen on. - The empty string will cause synapse to listen on all interfaces. - ''; - }; - type = mkOption { - type = types.str; - default = "http"; - description = '' - Type of listener. - ''; - }; - tls = mkOption { - type = types.bool; - default = true; - description = '' - Whether to listen for HTTPS connections rather than HTTP. - ''; - }; - x_forwarded = mkOption { - type = types.bool; - default = false; - description = '' - Use the X-Forwarded-For (XFF) header as the client IP and not the - actual client IP. - ''; - }; - resources = mkOption { - type = types.listOf (types.submodule { - options = { - names = mkOption { - type = types.listOf types.str; - description = '' - List of resources to host on this listener. - ''; - example = ["client" "federation"]; - }; - compress = mkOption { - type = types.bool; - description = '' - Should synapse compress HTTP responses to clients that support it? - This should be disabled if running synapse behind a load balancer - that can do automatic compression. - ''; - }; - }; - }); - description = '' - List of HTTP resources to serve on this listener. - ''; - }; - }; - }); - default = [{ - port = 8448; - bind_address = ""; - type = "http"; - tls = true; - x_forwarded = false; - resources = [ - { names = ["client"]; compress = true; } - { names = ["federation"]; compress = false; } - ]; - }]; - description = '' - List of ports that Synapse should listen on, their purpose and their configuration. - ''; - }; - verbose = mkOption { - type = types.str; - default = "0"; - description = "Logging verbosity level."; - }; - rc_messages_per_second = mkOption { - type = types.str; - default = "0.2"; - description = "Number of messages a client can send per second"; - }; - rc_message_burst_count = mkOption { - type = types.str; - default = "10.0"; - description = "Number of message a client can send before being throttled"; - }; - federation_rc_window_size = mkOption { - type = types.str; - default = "1000"; - description = "The federation window size in milliseconds"; - }; - federation_rc_sleep_limit = mkOption { - type = types.str; - default = "10"; - description = '' - The number of federation requests from a single server in a window - before the server will delay processing the request. - ''; - }; - federation_rc_sleep_delay = mkOption { - type = types.str; - default = "500"; - description = '' - The duration in milliseconds to delay processing events from - remote servers by if they go over the sleep limit. - ''; - }; - federation_rc_reject_limit = mkOption { - type = types.str; - default = "50"; - description = '' - The maximum number of concurrent federation requests allowed - from a single server - ''; - }; - federation_rc_concurrent = mkOption { - type = types.str; - default = "3"; - description = "The number of federation requests to concurrently process from a single server"; - }; - database_type = mkOption { - type = types.enum [ "sqlite3" "psycopg2" ]; - default = if versionAtLeast config.system.stateVersion "18.03" - then "psycopg2" - else "sqlite3"; - defaultText = literalExpression '' - if versionAtLeast config.system.stateVersion "18.03" - then "psycopg2" - else "sqlite3" - ''; - description = '' - The database engine name. Can be sqlite or psycopg2. - ''; - }; - database_name = mkOption { - type = types.str; - default = "matrix-synapse"; - description = "Database name."; - }; - database_user = mkOption { - type = types.str; - default = "matrix-synapse"; - description = "Database user name."; - }; - database_args = mkOption { - type = types.attrs; - default = { - sqlite3 = { database = "${cfg.dataDir}/homeserver.db"; }; - psycopg2 = { - user = cfg.database_user; - database = cfg.database_name; - }; - }.${cfg.database_type}; - defaultText = literalDocBook '' - - - using sqlite3 - - - { database = "''${config.${opt.dataDir}}/homeserver.db"; } - - - - - using psycopg2 - - - psycopg2 = { - user = config.${opt.database_user}; - database = config.${opt.database_name}; - } - - - - - ''; - description = '' - Arguments to pass to the engine. - ''; - }; - event_cache_size = mkOption { - type = types.str; - default = "10K"; - description = "Number of events to cache in memory."; - }; - url_preview_enabled = mkOption { - type = types.bool; - default = false; - description = '' - Is the preview URL API enabled? If enabled, you *must* specify an - explicit url_preview_ip_range_blacklist of IPs that the spider is - denied from accessing. - ''; - }; - url_preview_ip_range_blacklist = mkOption { - type = types.listOf types.str; - default = [ - "127.0.0.0/8" - "10.0.0.0/8" - "172.16.0.0/12" - "192.168.0.0/16" - "100.64.0.0/10" - "169.254.0.0/16" - "::1/128" - "fe80::/64" - "fc00::/7" - ]; - description = '' - List of IP address CIDR ranges that the URL preview spider is denied - from accessing. - ''; - }; - url_preview_ip_range_whitelist = mkOption { - type = types.listOf types.str; - default = []; - description = '' - List of IP address CIDR ranges that the URL preview spider is allowed - to access even if they are specified in - url_preview_ip_range_blacklist. - ''; - }; - url_preview_url_blacklist = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Optional list of URL matches that the URL preview spider is - denied from accessing. - ''; - }; - recaptcha_private_key = mkOption { - type = types.str; - default = ""; - description = '' - This Home Server's ReCAPTCHA private key. - ''; - }; - recaptcha_public_key = mkOption { - type = types.str; - default = ""; - description = '' - This Home Server's ReCAPTCHA public key. - ''; - }; - enable_registration_captcha = mkOption { - type = types.bool; - default = false; - description = '' - Enables ReCaptcha checks when registering, preventing signup - unless a captcha is answered. Requires a valid ReCaptcha - public/private key. - ''; - }; - turn_uris = mkOption { - type = types.listOf types.str; - default = []; - description = '' - The public URIs of the TURN server to give to clients - ''; - }; - turn_shared_secret = mkOption { - type = types.str; - default = ""; - description = '' - The shared secret used to compute passwords for the TURN server - ''; - }; - turn_user_lifetime = mkOption { - type = types.str; - default = "1h"; - description = "How long generated TURN credentials last"; - }; - enable_registration = mkOption { - type = types.bool; - default = false; - description = '' - Enable registration for new users. - ''; - }; - registration_shared_secret = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - If set, allows registration by anyone who also has the shared - secret, even if registration is otherwise disabled. - ''; - }; - enable_metrics = mkOption { - type = types.bool; - default = false; - description = '' - Enable collection and rendering of performance metrics - ''; - }; - report_stats = mkOption { - type = types.bool; - default = false; - description = ""; - }; - servers = mkOption { - type = types.attrsOf (types.attrsOf types.str); - default = { - "matrix.org" = { - "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"; - }; - }; - description = '' - The trusted servers to download signing keys from. - ''; - }; - max_upload_size = mkOption { - type = types.str; - default = "10M"; - description = "The largest allowed upload size in bytes"; - }; - max_image_pixels = mkOption { - type = types.str; - default = "32M"; - description = "Maximum number of pixels that will be thumbnailed"; - }; - dynamic_thumbnails = mkOption { - type = types.bool; - default = false; - description = '' - Whether to generate new thumbnails on the fly to precisely match - the resolution requested by the client. If true then whenever - a new resolution is requested by the client the server will - generate a new thumbnail. If false the server will pick a thumbnail - from a precalculated list. - ''; - }; - user_creation_max_duration = mkOption { - type = types.str; - default = "1209600000"; - description = '' - Sets the expiry for the short term user creation in - milliseconds. The default value is two weeks. - ''; - }; - bcrypt_rounds = mkOption { - type = types.str; - default = "12"; - description = '' - Set the number of bcrypt rounds used to generate password hash. - Larger numbers increase the work factor needed to generate the hash. - ''; - }; - allow_guest_access = mkOption { - type = types.bool; - default = false; - description = '' - Allows users to register as guests without a password/email/etc, and - participate in rooms hosted on this server which have been made - accessible to anonymous users. - ''; - }; - account_threepid_delegates.email = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Delegate email sending to https://example.org - ''; - }; - account_threepid_delegates.msisdn = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Delegate SMS sending to this local process (https://localhost:8090) - ''; - }; - room_prejoin_state.additional_event_types = mkOption { - default = []; - type = types.listOf types.str; - description = '' - Additional events to share with users who received an invite. - ''; - }; - room_prejoin_state.disable_default_event_types = mkOption { - default = false; - type = types.bool; - description = '' - Whether to disable the default state-event types for users invited to a room. - These are: - - - m.room.join_rules - m.room.canonical_alias - m.room.avatar - m.room.encryption - m.room.name - m.room.create - - ''; - }; - macaroon_secret_key = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Secret key for authentication tokens - ''; - }; - expire_access_token = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable access token expiration. - ''; - }; - key_refresh_interval = mkOption { - type = types.str; - default = "1d"; - description = '' - How long key response published by this server is valid for. - Used to set the valid_until_ts in /key/v2 APIs. - Determines how quickly servers will query to check which keys - are still valid. - ''; - }; - app_service_config_files = mkOption { - type = types.listOf types.path; - default = [ ]; - description = '' - A list of application service config file to use - ''; - }; - redaction_retention_period = mkOption { - type = types.int; - default = 7; - description = '' - How long to keep redacted events in unredacted form in the database. - ''; - }; - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra config options for matrix-synapse. - ''; - }; - extraConfigFiles = mkOption { - type = types.listOf types.path; - default = []; - description = '' - Extra config files to include. - - The configuration files will be included based on the command line - argument --config-path. This allows to configure secrets without - having to go through the Nix store, e.g. based on deployment keys if - NixOPS is in use. - ''; - }; - logConfig = mkOption { - type = types.lines; - default = readFile ./matrix-synapse-log_config.yaml; - description = '' - A yaml python logging config file - ''; - }; - dataDir = mkOption { - type = types.str; - default = "/var/lib/matrix-synapse"; - description = '' - The directory where matrix-synapse stores its stateful data such as - certificates, media and uploads. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - assertions = [ - { assertion = hasLocalPostgresDB -> config.services.postgresql.enable; - message = '' - Cannot deploy matrix-synapse with a configuration for a local postgresql database - and a missing postgresql service. Since 20.03 it's mandatory to manually configure the - database (please read the thread in https://github.com/NixOS/nixpkgs/pull/80447 for - further reference). - - If you - - try to deploy a fresh synapse, you need to configure the database yourself. An example - for this can be found in - - update your existing matrix-synapse instance, you simply need to add `services.postgresql.enable = true` - to your configuration. - - For further information about this update, please read the release-notes of 20.03 carefully. - ''; - } - ]; - - services.matrix-synapse.configFile = "${configFile}"; - - users.users.matrix-synapse = { - group = "matrix-synapse"; - home = cfg.dataDir; - createHome = true; - shell = "${pkgs.bash}/bin/bash"; - uid = config.ids.uids.matrix-synapse; - }; - - users.groups.matrix-synapse = { - gid = config.ids.gids.matrix-synapse; - }; - - systemd.services.matrix-synapse = { - description = "Synapse Matrix homeserver"; - after = [ "network.target" ] ++ optional hasLocalPostgresDB "postgresql.service"; - wantedBy = [ "multi-user.target" ]; - preStart = '' - ${cfg.package}/bin/synapse_homeserver \ - --config-path ${configFile} \ - --keys-directory ${cfg.dataDir} \ - --generate-keys - ''; - environment = { - PYTHONPATH = makeSearchPathOutput "lib" cfg.package.python.sitePackages [ pluginsEnv ]; - } // optionalAttrs (cfg.withJemalloc) { - LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so"; - }; - serviceConfig = { - Type = "notify"; - User = "matrix-synapse"; - Group = "matrix-synapse"; - WorkingDirectory = cfg.dataDir; - ExecStartPre = [ ("+" + (pkgs.writeShellScript "matrix-synapse-fix-permissions" '' - chown matrix-synapse:matrix-synapse ${cfg.dataDir}/homeserver.signing.key - chmod 0600 ${cfg.dataDir}/homeserver.signing.key - '')) ]; - ExecStart = '' - ${cfg.package}/bin/synapse_homeserver \ - ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } - --keys-directory ${cfg.dataDir} - ''; - ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID"; - Restart = "on-failure"; - UMask = "0077"; - }; - }; - - environment.systemPackages = [ registerNewMatrixUser ]; - }; - - imports = [ - (mkRemovedOptionModule [ "services" "matrix-synapse" "trusted_third_party_id_servers" ] '' - The `trusted_third_party_id_servers` option as been removed in `matrix-synapse` v1.4.0 - as the behavior is now obsolete. - '') - (mkRemovedOptionModule [ "services" "matrix-synapse" "create_local_database" ] '' - Database configuration must be done manually. An exemplary setup is demonstrated in - - '') - (mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "") - (mkRemovedOptionModule [ "services" "matrix-synapse" "room_invite_state_types" ] '' - You may add additional event types via - `services.matrix-synapse.room_prejoin_state.additional_event_types` and - disable the default events via - `services.matrix-synapse.room_prejoin_state.disable_default_event_types`. - '') - ]; - - meta.doc = ./matrix-synapse.xml; - meta.maintainers = teams.matrix.members; - -} diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix index d2b0f0da2ad9..e0a4d8a13e75 100644 --- a/nixos/modules/services/misc/mbpfan.nix +++ b/nixos/modules/services/misc/mbpfan.nix @@ -6,7 +6,7 @@ let cfg = config.services.mbpfan; verbose = if cfg.verbose then "v" else ""; settingsFormat = pkgs.formats.ini {}; - settingsFile = settingsFormat.generate "config.conf" cfg.settings; + settingsFile = settingsFormat.generate "mbpfan.ini" cfg.settings; in { options.services.mbpfan = { @@ -36,29 +36,35 @@ in { freeformType = settingsFormat.type; options.general.min_fan1_speed = mkOption { - type = types.int; + type = types.nullOr types.int; default = 2000; - description = "The minimum fan speed."; + description = '' + The minimum fan speed. Setting to null enables automatic detection. + Check minimum fan limits with "cat /sys/devices/platform/applesmc.768/fan*_min". + ''; }; options.general.max_fan1_speed = mkOption { - type = types.int; + type = types.nullOr types.int; default = 6199; - description = "The maximum fan speed."; + description = '' + The maximum fan speed. Setting to null enables automatic detection. + Check maximum fan limits with "cat /sys/devices/platform/applesmc.768/fan*_max". + ''; }; options.general.low_temp = mkOption { type = types.int; default = 55; - description = "The low temperature."; + description = "Temperature below which fan speed will be at minimum. Try ranges 55-63."; }; options.general.high_temp = mkOption { type = types.int; default = 58; - description = "The high temperature."; + description = "Fan will increase speed when higher than this temperature. Try ranges 58-66."; }; options.general.max_temp = mkOption { type = types.int; default = 86; - description = "The maximum temperature."; + description = "Fan will run at full speed above this temperature. Do not set it > 90."; }; options.general.polling_interval = mkOption { type = types.int; diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index ea9ffbb86775..ee5c0ef8d277 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -217,7 +217,6 @@ in { package = mkOption { type = types.package; - example = literalExpression "pkgs.mediatomb"; default = pkgs.gerbera; defaultText = literalExpression "pkgs.gerbera"; description = '' @@ -367,6 +366,7 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${binaryCommand} --port ${toString cfg.port} ${interfaceFlag} ${configFlag} --home ${cfg.dataDir}"; serviceConfig.User = cfg.user; + serviceConfig.Group = cfg.group; }; users.groups = optionalAttrs (cfg.group == "mediatomb") { diff --git a/nixos/modules/services/misc/moonraker.nix b/nixos/modules/services/misc/moonraker.nix index ae57aaa6d479..b75227effa04 100644 --- a/nixos/modules/services/misc/moonraker.nix +++ b/nixos/modules/services/misc/moonraker.nix @@ -79,6 +79,19 @@ in { for supported values. ''; }; + + allowSystemControl = mkOption { + type = types.bool; + default = false; + description = '' + Whether to allow Moonraker to perform system-level operations. + + Moonraker exposes APIs to perform system-level operations, such as + reboot, shutdown, and management of systemd units. See the + documentation + for details on what clients are able to do. + ''; + }; }; }; @@ -86,6 +99,13 @@ in { warnings = optional (cfg.settings ? update_manager) ''Enabling update_manager is not supported on NixOS and will lead to non-removable warnings in some clients.''; + assertions = [ + { + assertion = cfg.allowSystemControl -> config.security.polkit.enable; + message = "services.moonraker.allowSystemControl requires polkit to be enabled (security.polkit.enable)."; + } + ]; + users.users = optionalAttrs (cfg.user == "moonraker") { moonraker = { group = cfg.group; @@ -128,11 +148,31 @@ in { exec ${pkg}/bin/moonraker -c ${cfg.configDir}/moonraker-temp.cfg ''; + # Needs `ip` command + path = [ pkgs.iproute2 ]; + serviceConfig = { WorkingDirectory = cfg.stateDir; Group = cfg.group; User = cfg.user; }; }; + + security.polkit.extraConfig = lib.optionalString cfg.allowSystemControl '' + // nixos/moonraker: Allow Moonraker to perform system-level operations + // + // This was enabled via services.moonraker.allowSystemControl. + polkit.addRule(function(action, subject) { + if ((action.id == "org.freedesktop.systemd1.manage-units" || + action.id == "org.freedesktop.login1.power-off" || + action.id == "org.freedesktop.login1.power-off-multiple-sessions" || + action.id == "org.freedesktop.login1.reboot" || + action.id == "org.freedesktop.login1.reboot-multiple-sessions" || + action.id.startsWith("org.freedesktop.packagekit.")) && + subject.user == "${cfg.user}") { + return polkit.Result.YES; + } + }); + ''; }; } diff --git a/nixos/modules/services/misc/mx-puppet-discord.nix b/nixos/modules/services/misc/mx-puppet-discord.nix index b6f5e04511ae..6214f7f7eb6b 100644 --- a/nixos/modules/services/misc/mx-puppet-discord.nix +++ b/nixos/modules/services/misc/mx-puppet-discord.nix @@ -79,10 +79,7 @@ in { config = mkIf cfg.enable { systemd.services.mx-puppet-discord = { - description = '' - mx-puppet-discord is a discord puppeting bridge for matrix. - It handles bridging private and group DMs, as well as Guilds (servers). - ''; + description = "Matrix to Discord puppeting bridge"; wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ] ++ cfg.serviceDependencies; diff --git a/nixos/modules/services/misc/nitter.nix b/nixos/modules/services/misc/nitter.nix index 6a9eeb02095c..97005c9d914f 100644 --- a/nixos/modules/services/misc/nitter.nix +++ b/nixos/modules/services/misc/nitter.nix @@ -49,6 +49,13 @@ in services.nitter = { enable = mkEnableOption "If enabled, start Nitter."; + package = mkOption { + default = pkgs.nitter; + type = types.package; + defaultText = literalExpression "pkgs.nitter"; + description = "The nitter derivation to use."; + }; + server = { address = mkOption { type = types.str; @@ -78,8 +85,8 @@ in staticDir = mkOption { type = types.path; - default = "${pkgs.nitter}/share/nitter/public"; - defaultText = literalExpression ''"''${pkgs.nitter}/share/nitter/public"''; + default = "${cfg.package}/share/nitter/public"; + defaultText = literalExpression ''"''${config.services.nitter.package}/share/nitter/public"''; description = "Path to the static files directory."; }; @@ -306,8 +313,8 @@ in Environment = [ "NITTER_CONF_FILE=/var/lib/nitter/nitter.conf" ]; # Some parts of Nitter expect `public` folder in working directory, # see https://github.com/zedeus/nitter/issues/414 - WorkingDirectory = "${pkgs.nitter}/share/nitter"; - ExecStart = "${pkgs.nitter}/bin/nitter"; + WorkingDirectory = "${cfg.package}/share/nitter"; + ExecStart = "${cfg.package}/bin/nitter"; ExecStartPre = "${preStart}"; AmbientCapabilities = lib.mkIf (cfg.server.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; Restart = "on-failure"; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 869feb05eb7b..4bc5b04d3a08 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -6,20 +6,20 @@ let cfg = config.nix; - nix = cfg.package.out; + nixPackage = cfg.package.out; - nixVersion = getVersion nix; - - isNix23 = versionAtLeast nixVersion "2.3pre"; + isNixAtLeast = versionAtLeast (getVersion nixPackage); makeNixBuildUser = nr: { - name = "nixbld${toString nr}"; + name = "nixbld${toString nr}"; value = { description = "Nix build user ${toString nr}"; - /* For consistency with the setgid(2), setuid(2), and setgroups(2) - calls in `libstore/build.cc', don't add any supplementary group - here except "nixbld". */ + /* + For consistency with the setgid(2), setuid(2), and setgroups(2) + calls in `libstore/build.cc', don't add any supplementary group + here except "nixbld". + */ uid = builtins.add config.ids.uids.nixbld nr; isSystemUser = true; group = "nixbld"; @@ -30,53 +30,93 @@ let nixbldUsers = listToAttrs (map makeNixBuildUser (range 1 cfg.nrBuildUsers)); nixConf = - assert versionAtLeast nixVersion "2.2"; - pkgs.runCommand "nix.conf" { preferLocalBuild = true; extraOptions = cfg.extraOptions; } ( - '' - cat > $out </dev/null - '') - ); + ${mkKeyValuePairs cfg.settings} + ${cfg.extraOptions} + ''; + checkPhase = + if pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform then '' + echo "Ignoring validation for cross-compilation" + '' + else '' + echo "Validating generated nix.conf" + ln -s $out ./nix.conf + set -e + set +o pipefail + NIX_CONF_DIR=$PWD \ + ${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net"} \ + ${optionalString (isNixAtLeast "2.4pre") "--option experimental-features nix-command"} \ + |& sed -e 's/^warning:/error:/' \ + | (! grep '${if cfg.checkConfig then "^error:" else "^error: unknown setting"}') + set -o pipefail + ''; + }; + + legacyConfMappings = { + useSandbox = "sandbox"; + buildCores = "cores"; + maxJobs = "max-jobs"; + sandboxPaths = "extra-sandbox-paths"; + binaryCaches = "substituters"; + trustedBinaryCaches = "trusted-substituters"; + binaryCachePublicKeys = "trusted-public-keys"; + autoOptimiseStore = "auto-optimise-store"; + requireSignedBinaryCaches = "require-sigs"; + trustedUsers = "trusted-users"; + allowedUsers = "allowed-users"; + systemFeatures = "system-features"; + }; + + semanticConfType = with types; + let + confAtom = nullOr + (oneOf [ + bool + int + float + str + path + package + ]) // { + description = "Nix config atom (null, bool, int, float, str, path or package)"; + }; + in + attrsOf (either confAtom (listOf confAtom)); in { imports = [ - (mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ]) - (mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ]) - (mkRenamedOptionModule [ "nix" "daemonIONiceLevel" ] [ "nix" "daemonIOSchedPriority" ]) + (mkRenamedOptionModuleWith { sinceRelease = 2003; from = [ "nix" "useChroot" ]; to = [ "nix" "useSandbox" ]; }) + (mkRenamedOptionModuleWith { sinceRelease = 2003; from = [ "nix" "chrootDirs" ]; to = [ "nix" "sandboxPaths" ]; }) + (mkRenamedOptionModuleWith { sinceRelease = 2205; from = [ "nix" "daemonIONiceLevel" ]; to = [ "nix" "daemonIOSchedPriority" ]; }) (mkRemovedOptionModule [ "nix" "daemonNiceLevel" ] "Consider nix.daemonCPUSchedPolicy instead.") - ]; + ] ++ mapAttrsToList (oldConf: newConf: mkRenamedOptionModuleWith { sinceRelease = 2205; from = [ "nix" oldConf ]; to = [ "nix" "settings" newConf ]; }) legacyConfMappings; ###### interface @@ -102,81 +142,6 @@ in ''; }; - maxJobs = mkOption { - type = types.either types.int (types.enum ["auto"]); - default = "auto"; - example = 64; - description = '' - This option defines the maximum number of jobs that Nix will try to - build in parallel. The default is auto, which means it will use all - available logical cores. It is recommend to set it to the total - number of logical cores in your system (e.g., 16 for two CPUs with 4 - cores each and hyper-threading). - ''; - }; - - autoOptimiseStore = mkOption { - type = types.bool; - default = false; - example = true; - description = '' - If set to true, Nix automatically detects files in the store that have - identical contents, and replaces them with hard links to a single copy. - This saves disk space. If set to false (the default), you can still run - nix-store --optimise to get rid of duplicate files. - ''; - }; - - buildCores = mkOption { - type = types.int; - default = 0; - example = 64; - description = '' - This option defines the maximum number of concurrent tasks during - one build. It affects, e.g., -j option for make. - The special value 0 means that the builder should use all - available CPU cores in the system. Some builds may become - non-deterministic with this option; use with care! Packages will - only be affected if enableParallelBuilding is set for them. - ''; - }; - - useSandbox = mkOption { - type = types.either types.bool (types.enum ["relaxed"]); - default = true; - description = " - If set, Nix will perform builds in a sandboxed environment that it - will set up automatically for each build. This prevents impurities - in builds by disallowing access to dependencies outside of the Nix - store by using network and mount namespaces in a chroot environment. - This is enabled by default even though it has a possible performance - impact due to the initial setup time of a sandbox for each build. It - doesn't affect derivation hashes, so changing this option will not - trigger a rebuild of packages. - "; - }; - - sandboxPaths = mkOption { - type = types.listOf types.str; - default = []; - example = [ "/dev" "/proc" ]; - description = - '' - Directories from the host filesystem to be included - in the sandbox. - ''; - }; - - extraOptions = mkOption { - type = types.lines; - default = ""; - example = '' - keep-outputs = true - keep-derivations = true - ''; - description = "Additional text appended to nix.conf."; - }; - distributedBuilds = mkOption { type = types.bool; default = false; @@ -187,7 +152,7 @@ in }; daemonCPUSchedPolicy = mkOption { - type = types.enum ["other" "batch" "idle"]; + type = types.enum [ "other" "batch" "idle" ]; default = "other"; example = "batch"; description = '' @@ -218,7 +183,7 @@ in }; daemonIOSchedClass = mkOption { - type = types.enum ["best-effort" "idle"]; + type = types.enum [ "best-effort" "idle" ]; default = "best-effort"; example = "idle"; description = '' @@ -250,11 +215,11 @@ in scheduling policy: With idle, priorities are not used in scheduling decisions. best-effort supports values in the range 0 (high) to 7 (low). - ''; + ''; }; buildMachines = mkOption { - type = types.listOf (types.submodule ({ + type = types.listOf (types.submodule { options = { hostName = mkOption { type = types.str; @@ -276,7 +241,7 @@ in }; systems = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; example = [ "x86_64-linux" "aarch64-linux" ]; description = '' The system types the build machine can execute derivations on. @@ -293,7 +258,7 @@ in The username to log in as on the remote host. This user must be able to log in and run nix commands non-interactively. It must also be privileged to build derivations, so must be included in - . + . ''; }; sshKey = mkOption { @@ -331,7 +296,7 @@ in }; mandatoryFeatures = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; example = [ "big-parallel" ]; description = '' A list of features mandatory for this builder. The builder will @@ -342,7 +307,7 @@ in }; supportedFeatures = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; example = [ "kvm" "big-parallel" ]; description = '' A list of features supported by this builder. The builder will @@ -350,9 +315,18 @@ in list. ''; }; + publicHostKey = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The (base64-encoded) public host key of this builder. The field + is calculated via base64 -w0 /etc/ssh/ssh_host_type_key.pub. + If null, SSH will use its regular known-hosts file when connecting. + ''; + }; }; - })); - default = []; + }); + default = [ ]; description = '' This option lists the machines to be used if distributed builds are enabled (see ). @@ -366,7 +340,7 @@ in envVars = mkOption { type = types.attrs; internal = true; - default = {}; + default = { }; description = "Environment variables used by Nix."; }; @@ -391,92 +365,13 @@ in ''; }; - binaryCaches = mkOption { - type = types.listOf types.str; - description = '' - List of binary cache URLs used to obtain pre-built binaries - of Nix packages. - - By default https://cache.nixos.org/ is added, - to override it use lib.mkForce []. - ''; - }; - - trustedBinaryCaches = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "https://hydra.nixos.org/" ]; - description = '' - List of binary cache URLs that non-root users can use (in - addition to those specified using - ) by passing - --option binary-caches to Nix commands. - ''; - }; - - requireSignedBinaryCaches = mkOption { - type = types.bool; - default = true; - description = '' - If enabled (the default), Nix will only download binaries from binary caches if - they are cryptographically signed with any of the keys listed in - . If disabled, signatures are neither - required nor checked, so it's strongly recommended that you use only - trustworthy caches and https to prevent man-in-the-middle attacks. - ''; - }; - - binaryCachePublicKeys = mkOption { - type = types.listOf types.str; - example = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ]; - description = '' - List of public keys used to sign binary caches. If - is enabled, - then Nix will use a binary from a binary cache if and only - if it is signed by any of the keys - listed here. By default, only the key for - cache.nixos.org is included. - ''; - }; - - trustedUsers = mkOption { - type = types.listOf types.str; - default = [ "root" ]; - example = [ "root" "alice" "@wheel" ]; - description = '' - A list of names of users that have additional rights when - connecting to the Nix daemon, such as the ability to specify - additional binary caches, or to import unsigned NARs. You - can also specify groups by prefixing them with - @; for instance, - @wheel means all users in the wheel - group. - ''; - }; - - allowedUsers = mkOption { - type = types.listOf types.str; - default = [ "*" ]; - example = [ "@wheel" "@builders" "alice" "bob" ]; - description = '' - A list of names of users (separated by whitespace) that are - allowed to connect to the Nix daemon. As with - , you can specify groups by - prefixing them with @. Also, you can - allow all users by specifying *. The - default is *. Note that trusted users are - always allowed to connect. - ''; - }; - nixPath = mkOption { type = types.listOf types.str; - default = - [ - "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" - "nixos-config=/etc/nixos/configuration.nix" - "/nix/var/nix/profiles/per-user/root/channels" - ]; + default = [ + "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" + "nixos-config=/etc/nixos/configuration.nix" + "/nix/var/nix/profiles/per-user/root/channels" + ]; description = '' The default Nix expression search path, used by the Nix evaluator to look up paths enclosed in angle brackets @@ -484,45 +379,44 @@ in ''; }; - systemFeatures = mkOption { - type = types.listOf types.str; - example = [ "kvm" "big-parallel" "gccarch-skylake" ]; - description = '' - The supported features of a machine - ''; - }; - checkConfig = mkOption { type = types.bool; default = true; description = '' - If enabled (the default), checks that Nix can parse the generated nix.conf. + If enabled (the default), checks for data type mismatches and that Nix + can parse the generated nix.conf. ''; }; registry = mkOption { type = types.attrsOf (types.submodule ( let - inputAttrs = types.attrsOf (types.oneOf [types.str types.int types.bool types.package]); + referenceAttrs = with types; attrsOf (oneOf [ + str + int + bool + package + ]); in { config, name, ... }: - { options = { + { + options = { from = mkOption { - type = inputAttrs; + type = referenceAttrs; example = { type = "indirect"; id = "nixpkgs"; }; description = "The flake reference to be rewritten."; }; to = mkOption { - type = inputAttrs; + type = referenceAttrs; example = { type = "github"; owner = "my-org"; repo = "my-nixpkgs"; }; - description = "The flake reference to which is to be rewritten."; + description = "The flake reference is rewritten to."; }; flake = mkOption { type = types.nullOr types.attrs; default = null; example = literalExpression "nixpkgs"; description = '' - The flake input to which is to be rewritten. + The flake input is rewritten to. ''; }; exact = mkOption { @@ -537,35 +431,232 @@ in }; config = { from = mkDefault { type = "indirect"; id = name; }; - to = mkIf (config.flake != null) - ({ type = "path"; - path = config.flake.outPath; - } // lib.filterAttrs - (n: v: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") - config.flake); + to = mkIf (config.flake != null) (mkDefault + { + type = "path"; + path = config.flake.outPath; + } // filterAttrs + (n: _: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") + config.flake); }; } )); - default = {}; + default = { }; description = '' A system-wide flake registry. ''; }; - }; + extraOptions = mkOption { + type = types.lines; + default = ""; + example = '' + keep-outputs = true + keep-derivations = true + ''; + description = "Additional text appended to nix.conf."; + }; + settings = mkOption { + type = types.submodule { + freeformType = semanticConfType; + + options = { + max-jobs = mkOption { + type = types.either types.int (types.enum [ "auto" ]); + default = "auto"; + example = 64; + description = '' + This option defines the maximum number of jobs that Nix will try to + build in parallel. The default is auto, which means it will use all + available logical cores. It is recommend to set it to the total + number of logical cores in your system (e.g., 16 for two CPUs with 4 + cores each and hyper-threading). + ''; + }; + + auto-optimise-store = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + If set to true, Nix automatically detects files in the store that have + identical contents, and replaces them with hard links to a single copy. + This saves disk space. If set to false (the default), you can still run + nix-store --optimise to get rid of duplicate files. + ''; + }; + + cores = mkOption { + type = types.int; + default = 0; + example = 64; + description = '' + This option defines the maximum number of concurrent tasks during + one build. It affects, e.g., -j option for make. + The special value 0 means that the builder should use all + available CPU cores in the system. Some builds may become + non-deterministic with this option; use with care! Packages will + only be affected if enableParallelBuilding is set for them. + ''; + }; + + sandbox = mkOption { + type = types.either types.bool (types.enum [ "relaxed" ]); + default = true; + description = '' + If set, Nix will perform builds in a sandboxed environment that it + will set up automatically for each build. This prevents impurities + in builds by disallowing access to dependencies outside of the Nix + store by using network and mount namespaces in a chroot environment. + This is enabled by default even though it has a possible performance + impact due to the initial setup time of a sandbox for each build. It + doesn't affect derivation hashes, so changing this option will not + trigger a rebuild of packages. + ''; + }; + + extra-sandbox-paths = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "/dev" "/proc" ]; + description = '' + Directories from the host filesystem to be included + in the sandbox. + ''; + }; + + substituters = mkOption { + type = types.listOf types.str; + description = '' + List of binary cache URLs used to obtain pre-built binaries + of Nix packages. + + By default https://cache.nixos.org/ is added. + ''; + }; + + trusted-substituters = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "https://hydra.nixos.org/" ]; + description = '' + List of binary cache URLs that non-root users can use (in + addition to those specified using + ) by passing + --option binary-caches to Nix commands. + ''; + }; + + require-sigs = mkOption { + type = types.bool; + default = true; + description = '' + If enabled (the default), Nix will only download binaries from binary caches if + they are cryptographically signed with any of the keys listed in + . If disabled, signatures are neither + required nor checked, so it's strongly recommended that you use only + trustworthy caches and https to prevent man-in-the-middle attacks. + ''; + }; + + trusted-public-keys = mkOption { + type = types.listOf types.str; + example = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ]; + description = '' + List of public keys used to sign binary caches. If + is enabled, + then Nix will use a binary from a binary cache if and only + if it is signed by any of the keys + listed here. By default, only the key for + cache.nixos.org is included. + ''; + }; + + trusted-users = mkOption { + type = types.listOf types.str; + default = [ "root" ]; + example = [ "root" "alice" "@wheel" ]; + description = '' + A list of names of users that have additional rights when + connecting to the Nix daemon, such as the ability to specify + additional binary caches, or to import unsigned NARs. You + can also specify groups by prefixing them with + @; for instance, + @wheel means all users in the wheel + group. + ''; + }; + + system-features = mkOption { + type = types.listOf types.str; + example = [ "kvm" "big-parallel" "gccarch-skylake" ]; + description = '' + The set of features supported by the machine. Derivations + can express dependencies on system features through the + requiredSystemFeatures attribute. + + By default, pseudo-features nixos-test, benchmark, + and big-parallel used in Nixpkgs are set, kvm + is also included in it is avaliable. + ''; + }; + + allowed-users = mkOption { + type = types.listOf types.str; + default = [ "*" ]; + example = [ "@wheel" "@builders" "alice" "bob" ]; + description = '' + A list of names of users (separated by whitespace) that are + allowed to connect to the Nix daemon. As with + , you can specify groups by + prefixing them with @. Also, you can + allow all users by specifying *. The + default is *. Note that trusted users are + always allowed to connect. + ''; + }; + }; + }; + default = { }; + example = literalExpression '' + { + use-sandbox = true; + show-trace = true; + + system-features = [ "big-parallel" "kvm" "recursive-nix" ]; + sandbox-paths = { "/bin/sh" = "''${pkgs.busybox-sandbox-shell.out}/bin/busybox"; }; + } + ''; + description = '' + Configuration for Nix, see + or + + nix.conf + 5 + for avalaible options. + The value declared here will be translated directly to the key-value pairs Nix expects. + + + You can use nix-instantiate --eval --strict '<nixpkgs/nixos>' -A config.nix.settings + to view the current value. By default it is empty. + + + Nix configurations defined under will be translated and applied to this + option. In addition, configuration specified in which will be appended + verbatim to the resulting config file. + ''; + }; + }; }; ###### implementation config = mkIf cfg.enable { - - nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; - nix.binaryCaches = [ "https://cache.nixos.org/" ]; - environment.systemPackages = - [ nix + [ + nixPackage pkgs.nix-info ] ++ optional (config.programs.bash.enableCompletion) pkgs.nix-bash-completions; @@ -579,44 +670,49 @@ in # List of machines for distributed Nix builds in the format # expected by build-remote.pl. - environment.etc."nix/machines" = - { enable = cfg.buildMachines != []; - text = - concatMapStrings (machine: - "${if machine.sshUser != null then "${machine.sshUser}@" else ""}${machine.hostName} " - + (if machine.system != null then machine.system else concatStringsSep "," machine.systems) - + " ${if machine.sshKey != null then machine.sshKey else "-"} ${toString machine.maxJobs} " - + toString (machine.speedFactor) - + " " - + concatStringsSep "," (machine.mandatoryFeatures ++ machine.supportedFeatures) - + " " - + concatStringsSep "," machine.mandatoryFeatures + environment.etc."nix/machines" = mkIf (cfg.buildMachines != [ ]) { + text = + concatMapStrings + (machine: + (concatStringsSep " " ([ + "${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}" + (if machine.system != null then machine.system else if machine.systems != [ ] then concatStringsSep "," machine.systems else "-") + (if machine.sshKey != null then machine.sshKey else "-") + (toString machine.maxJobs) + (toString machine.speedFactor) + (concatStringsSep "," (machine.supportedFeatures ++ machine.mandatoryFeatures)) + (concatStringsSep "," machine.mandatoryFeatures) + ] + ++ optional (isNixAtLeast "2.4pre") (if machine.publicHostKey != null then machine.publicHostKey else "-"))) + "\n" - ) cfg.buildMachines; - }; + ) + cfg.buildMachines; + }; + assertions = - let badMachine = m: m.system == null && m.systems == []; - in [ + let badMachine = m: m.system == null && m.systems == [ ]; + in + [ { - assertion = !(builtins.any badMachine cfg.buildMachines); + assertion = !(any badMachine cfg.buildMachines); message = '' At least one system type (via system or systems) must be set for every build machine. Invalid machine specifications: '' + " " + - (builtins.concatStringsSep "\n " - (builtins.map (m: m.hostName) - (builtins.filter (badMachine) cfg.buildMachines))); + (concatStringsSep "\n " + (map (m: m.hostName) + (filter (badMachine) cfg.buildMachines))); } ]; - - systemd.packages = [ nix ]; + systemd.packages = [ nixPackage ]; systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ]; systemd.services.nix-daemon = - { path = [ nix pkgs.util-linux config.programs.ssh.package ] + { + path = [ nixPackage pkgs.util-linux config.programs.ssh.package ] ++ optionals cfg.distributedBuilds [ pkgs.gzip ]; environment = cfg.envVars @@ -626,19 +722,52 @@ in unitConfig.RequiresMountsFor = "/nix/store"; serviceConfig = - { CPUSchedulingPolicy = cfg.daemonCPUSchedPolicy; + { + CPUSchedulingPolicy = cfg.daemonCPUSchedPolicy; IOSchedulingClass = cfg.daemonIOSchedClass; IOSchedulingPriority = cfg.daemonIOSchedPriority; LimitNOFILE = 4096; }; restartTriggers = [ nixConf ]; + + # `stopIfChanged = false` changes to switch behavior + # from stop -> update units -> start + # to update units -> restart + # + # The `stopIfChanged` setting therefore controls a trade-off between a + # more predictable lifecycle, which runs the correct "version" of + # the `ExecStop` line, and on the other hand the availability of + # sockets during the switch, as the effectiveness of the stop operation + # depends on the socket being stopped as well. + # + # As `nix-daemon.service` does not make use of `ExecStop`, we prefer + # to keep the socket up and available. This is important for machines + # that run Nix-based services, such as automated build, test, and deploy + # services, that expect the daemon socket to be available at all times. + # + # Notably, the Nix client does not retry on failure to connect to the + # daemon socket, and the in-process RemoteStore instance will disable + # itself. This makes retries infeasible even for services that are + # aware of the issue. Failure to connect can affect not only new client + # processes, but also new RemoteStore instances in existing processes, + # as well as existing RemoteStore instances that have not saturated + # their connection pool. + # + # Also note that `stopIfChanged = true` does not kill existing + # connection handling daemons, as one might wish to happen before a + # breaking Nix upgrade (which is rare). The daemon forks that handle + # the individual connections split off into their own sessions, causing + # them not to be stopped by systemd. + # If a Nix upgrade does require all existing daemon processes to stop, + # nix-daemon must do so on its own accord, and only when the new version + # starts and detects that Nix's persistent state needs an upgrade. + stopIfChanged = false; + }; # Set up the environment variables for running Nix. - environment.sessionVariables = cfg.envVars // - { NIX_PATH = cfg.nixPath; - }; + environment.sessionVariables = cfg.envVars // { NIX_PATH = cfg.nixPath; }; environment.extraInit = '' @@ -647,7 +776,7 @@ in fi ''; - nix.nrBuildUsers = mkDefault (lib.max 32 (if cfg.maxJobs == "auto" then 0 else cfg.maxJobs)); + nix.nrBuildUsers = mkDefault (max 32 (if cfg.settings.max-jobs == "auto" then 0 else cfg.settings.max-jobs)); users.users = nixbldUsers; @@ -663,14 +792,26 @@ in fi ''; - nix.systemFeatures = mkDefault ( - [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ - optionals (pkgs.hostPlatform ? gcc.arch) ( - # a builder can run code for `gcc.arch` and inferior architectures - [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++ - map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} - ) - ); + # Legacy configuration conversion. + nix.settings = mkMerge [ + { + trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; + substituters = mkAfter [ "https://cache.nixos.org/" ]; + + system-features = mkDefault ( + [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ + optionals (pkgs.hostPlatform ? gcc.arch) ( + # a builder can run code for `gcc.arch` and inferior architectures + [ "gccarch-${pkgs.hostPlatform.gcc.arch}" ] ++ + map (x: "gccarch-${x}") systems.architectures.inferiors.${pkgs.hostPlatform.gcc.arch} + ) + ); + } + + (mkIf (!cfg.distributedBuilds) { builders = null; }) + + (mkIf (isNixAtLeast "2.3pre") { sandbox-fallback = false; }) + ]; }; diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index a7a6a3b59644..b4b4b55a6c82 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -81,8 +81,14 @@ in ###### implementation config = { + assertions = [ + { + assertion = cfg.automatic -> config.nix.enable; + message = ''nix.gc.automatic requires nix.enable''; + } + ]; - systemd.services.nix-gc = { + systemd.services.nix-gc = lib.mkIf config.nix.enable { description = "Nix Garbage Collector"; script = "exec ${config.nix.package.out}/bin/nix-collect-garbage ${cfg.options}"; startAt = optional cfg.automatic cfg.dates; diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix index e02026d5f76c..acf8177b146a 100644 --- a/nixos/modules/services/misc/nix-optimise.nix +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -37,8 +37,14 @@ in ###### implementation config = { + assertions = [ + { + assertion = cfg.automatic -> config.nix.enable; + message = ''nix.optimise.automatic requires nix.enable''; + } + ]; - systemd.services.nix-optimise = + systemd.services.nix-optimise = lib.mkIf config.nix.enable { description = "Nix Store Optimiser"; # No point this if the nix daemon (and thus the nix store) is outside unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket"; diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index d5c64fdb2647..355fad5db468 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -20,7 +20,7 @@ in { write = mkOption { type = types.bool; default = false; - description = "Whether to enable writing to the Nix store as a remote store via SSH. Note: the sshServe user is named nix-ssh and is not a trusted-user. nix-ssh should be added to the nix.trustedUsers option in most use cases, such as allowing remote building of derivations."; + description = "Whether to enable writing to the Nix store as a remote store via SSH. Note: the sshServe user is named nix-ssh and is not a trusted-user. nix-ssh should be added to the option in most use cases, such as allowing remote building of derivations."; }; keys = mkOption { diff --git a/nixos/modules/services/misc/packagekit.nix b/nixos/modules/services/misc/packagekit.nix index 93bd206bd983..9191078ef9ca 100644 --- a/nixos/modules/services/misc/packagekit.nix +++ b/nixos/modules/services/misc/packagekit.nix @@ -13,7 +13,7 @@ let (iniFmt.generate "PackageKit.conf" (recursiveUpdate { Daemon = { - DefaultBackend = "test_nop"; + DefaultBackend = "nix"; KeepCache = false; }; } @@ -35,7 +35,7 @@ let in { imports = [ - (mkRemovedOptionModule [ "services" "packagekit" "backend" ] "The only backend that doesn't blow up is `test_nop`.") + (mkRemovedOptionModule [ "services" "packagekit" "backend" ] "Always set to Nix.") ]; options.services.packagekit = { @@ -62,6 +62,8 @@ in services.dbus.packages = with pkgs; [ packagekit ]; + environment.systemPackages = with pkgs; [ packagekit ]; + systemd.packages = with pkgs; [ packagekit ]; environment.etc = listToAttrs (map diff --git a/nixos/modules/services/misc/paperless-ng.nix b/nixos/modules/services/misc/paperless-ng.nix index db8082f072c3..11e44f5ece57 100644 --- a/nixos/modules/services/misc/paperless-ng.nix +++ b/nixos/modules/services/misc/paperless-ng.nix @@ -6,12 +6,18 @@ let defaultUser = "paperless"; + hasCustomRedis = hasAttr "PAPERLESS_REDIS" cfg.extraConfig; + env = { PAPERLESS_DATA_DIR = cfg.dataDir; PAPERLESS_MEDIA_ROOT = cfg.mediaDir; PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir; GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}"; - } // lib.mapAttrs (_: toString) cfg.extraConfig; + } // ( + lib.mapAttrs (_: toString) cfg.extraConfig + ) // (optionalAttrs (!hasCustomRedis) { + PAPERLESS_REDIS = "unix://${config.services.redis.servers.paperless-ng.unixSocket}"; + }); manage = let setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env); @@ -30,7 +36,7 @@ let "-/etc/hosts" "-/etc/localtime" "-/run/postgresql" - ]; + ] ++ (optional (!hasCustomRedis) config.services.redis.servers.paperless-ng.unixSocket); BindPaths = [ cfg.consumptionDir cfg.dataDir @@ -44,8 +50,7 @@ let NoNewPrivileges = true; PrivateDevices = true; PrivateMounts = true; - # Needs to connect to redis - # PrivateNetwork = true; + PrivateNetwork = true; PrivateTmp = true; PrivateUsers = true; ProcSubset = "pid"; @@ -65,6 +70,7 @@ let RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; + SupplementaryGroups = optional (!hasCustomRedis) config.services.redis.servers.paperless-ng.user; SystemCallArchitectures = "native"; SystemCallFilter = [ "@system-service" "~@privileged @resources @setuid @keyring" ]; # Does not work well with the temporary root @@ -190,7 +196,7 @@ in config = mkIf cfg.enable { # Enable redis if no special url is set - services.redis.enable = mkIf (!hasAttr "PAPERLESS_REDIS" env) true; + services.redis.servers.paperless-ng.enable = mkIf (!hasCustomRedis) true; systemd.tmpfiles.rules = [ "d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -" @@ -208,6 +214,8 @@ in User = cfg.user; ExecStart = "${cfg.package}/bin/paperless-ng qcluster"; Restart = "on-failure"; + # The `mbind` syscall is needed for running the classifier. + SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "mbind" ]; }; environment = env; wantedBy = [ "multi-user.target" ]; @@ -234,6 +242,8 @@ in echo "$superuserState" > "$superuserStateFile" fi ''; + } // optionalAttrs (!hasCustomRedis) { + after = [ "redis-paperless-ng.service" ]; }; # Password copying can't be implemented as a privileged preStart script @@ -248,6 +258,8 @@ in '${cfg.passwordFile}' '${cfg.dataDir}/superuser-password' ''; Type = "oneshot"; + # Needs to talk to mail server for automated import rules + PrivateNetwork = false; }; }; @@ -279,6 +291,8 @@ in CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; # gunicorn needs setuid SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "@setuid" ]; + # Needs to serve web page + PrivateNetwork = false; }; environment = env // { PATH = mkForce cfg.package.path; diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 2ae4e80d5c3f..1cd8da768f48 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -6,6 +6,10 @@ let cfg = config.services.plex; in { + imports = [ + (mkRemovedOptionModule [ "services" "plex" "managePlugins" ] "Please omit or define the option: `services.plex.extraPlugins' instead.") + ]; + options = { services.plex = { enable = mkEnableOption "Plex Media Server"; @@ -42,16 +46,6 @@ in ''; }; - managePlugins = mkOption { - type = types.bool; - default = true; - description = '' - If set to true, this option will cause all of the symlinks in Plex's - plugin directory to be removed and symlinks for paths specified in - to be added. - ''; - }; - extraPlugins = mkOption { type = types.listOf types.path; default = []; @@ -59,9 +53,20 @@ in A list of paths to extra plugin bundles to install in Plex's plugin directory. Every time the systemd unit for Plex starts up, all of the symlinks in Plex's plugin directory will be cleared and this module - will symlink all of the paths specified here to that directory. If - this behavior is undesired, set to - false. + will symlink all of the paths specified here to that directory. + ''; + example = literalExpression '' + [ + (builtins.path { + name = "Audnexus.bundle"; + path = pkgs.fetchFromGitHub { + owner = "djdembeck"; + repo = "Audnexus.bundle"; + rev = "v0.2.8"; + sha256 = "sha256-IWOSz3vYL7zhdHan468xNc6C/eQ2C2BukQlaJNLXh7E="; + }; + }) + ] ''; }; diff --git a/nixos/modules/services/misc/rmfakecloud.nix b/nixos/modules/services/misc/rmfakecloud.nix new file mode 100644 index 000000000000..fe522653c216 --- /dev/null +++ b/nixos/modules/services/misc/rmfakecloud.nix @@ -0,0 +1,147 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.rmfakecloud; + serviceDataDir = "/var/lib/rmfakecloud"; + +in { + options = { + services.rmfakecloud = { + enable = mkEnableOption "rmfakecloud remarkable self-hosted cloud"; + + package = mkOption { + type = types.package; + default = pkgs.rmfakecloud; + defaultText = literalExpression "pkgs.rmfakecloud"; + description = '' + rmfakecloud package to use. + + The default does not include the web user interface. + ''; + }; + + storageUrl = mkOption { + type = types.str; + example = "https://local.appspot.com"; + description = '' + URL used by the tablet to access the rmfakecloud service. + ''; + }; + + port = mkOption { + type = types.port; + default = 3000; + description = '' + Listening port number. + ''; + }; + + logLevel = mkOption { + type = types.enum [ "info" "debug" "warn" "error" ]; + default = "info"; + description = '' + Logging level. + ''; + }; + + extraSettings = mkOption { + type = with types; attrsOf str; + default = { }; + example = { DATADIR = "/custom/path/for/rmfakecloud/data"; }; + description = '' + Extra settings in the form of a set of key-value pairs. + For tokens and secrets, use `environmentFile` instead. + + Available settings are listed on + https://ddvk.github.io/rmfakecloud/install/configuration/. + ''; + }; + + environmentFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/etc/secrets/rmfakecloud.env"; + description = '' + Path to an environment file loaded for the rmfakecloud service. + + This can be used to securely store tokens and secrets outside of the + world-readable Nix store. Since this file is read by systemd, it may + have permission 0400 and be owned by root. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.rmfakecloud = { + description = "rmfakecloud remarkable self-hosted cloud"; + + environment = { + STORAGE_URL = cfg.storageUrl; + PORT = toString cfg.port; + LOGLEVEL = cfg.logLevel; + } // cfg.extraSettings; + + preStart = '' + # Generate the secret key used to sign client session tokens. + # Replacing it invalidates the previously established sessions. + if [ -z "$JWT_SECRET_KEY" ] && [ ! -f jwt_secret_key ]; then + (umask 077; touch jwt_secret_key) + cat /dev/urandom | tr -cd '[:alnum:]' | head -c 48 >> jwt_secret_key + fi + ''; + + script = '' + if [ -z "$JWT_SECRET_KEY" ]; then + export JWT_SECRET_KEY="$(cat jwt_secret_key)" + fi + + ${cfg.package}/bin/rmfakecloud + ''; + + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + + serviceConfig = { + Type = "simple"; + Restart = "always"; + + EnvironmentFile = + mkIf (cfg.environmentFile != null) cfg.environmentFile; + + AmbientCapabilities = + mkIf (cfg.port < 1024) [ "CAP_NET_BIND_SERVICE" ]; + + DynamicUser = true; + PrivateDevices = true; + ProtectHome = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + ProtectClock = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + WorkingDirectory = serviceDataDir; + StateDirectory = baseNameOf serviceDataDir; + UMask = 0027; + }; + }; + }; + + meta.maintainers = with maintainers; [ pacien ]; +} diff --git a/nixos/modules/services/misc/sourcehut/git.nix b/nixos/modules/services/misc/sourcehut/git.nix index 5ce16df8cd87..ff110905d184 100644 --- a/nixos/modules/services/misc/sourcehut/git.nix +++ b/nixos/modules/services/misc/sourcehut/git.nix @@ -207,7 +207,7 @@ in fastcgi_param PATH_INFO $uri; fastcgi_param GIT_PROJECT_ROOT $document_root; fastcgi_read_timeout 500s; - include ${pkgs.nginx}/conf/fastcgi_params; + include ${config.services.nginx.package}/conf/fastcgi_params; gzip off; } ''; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index a894caed1a34..ff63c41e193c 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -106,7 +106,7 @@ let certtool = "${pkgs.gnutls.bin}/bin/certtool"; - nixos-taskserver = pkgs.pythonPackages.buildPythonApplication { + nixos-taskserver = with pkgs.python2.pkgs; buildPythonApplication { name = "nixos-taskserver"; src = pkgs.runCommand "nixos-taskserver-src" { preferLocalBuild = true; } '' @@ -129,7 +129,7 @@ let EOF ''; - propagatedBuildInputs = [ pkgs.pythonPackages.click ]; + propagatedBuildInputs = [ click ]; }; in { @@ -138,12 +138,13 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = let + url = "https://nixos.org/manual/nixos/stable/index.html#module-services-taskserver"; + in '' Whether to enable the Taskwarrior server. More instructions about NixOS in conjuction with Taskserver can be - found in the NixOS manual at - . + found in the NixOS manual. ''; }; diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml index 5656bb85b373..f6ead7c37857 100644 --- a/nixos/modules/services/misc/taskserver/doc.xml +++ b/nixos/modules/services/misc/taskserver/doc.xml @@ -1,7 +1,7 @@ + xml:id="module-services-taskserver"> Taskserver Taskserver is the server component of diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index 407742f72ad5..a557e742b7cf 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -254,7 +254,7 @@ in { location /cgi-bin { gzip off; - include ${pkgs.nginx}/conf/fastcgi_params; + include ${config.services.nginx.package}/conf/fastcgi_params; fastcgi_param SCRIPT_FILENAME ${pkg}/libexec/zoneminder/${zms}; fastcgi_param HTTP_PROXY ""; fastcgi_intercept_errors on; @@ -270,7 +270,7 @@ in { try_files $uri =404; fastcgi_index index.php; - include ${pkgs.nginx}/conf/fastcgi_params; + include ${config.services.nginx.package}/conf/fastcgi_params; fastcgi_param SCRIPT_FILENAME $request_filename; fastcgi_param HTTP_PROXY ""; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 81fca33f5fec..b959379d331a 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -214,6 +214,11 @@ let type = types.path; description = "Path grafana will watch for dashboards."; }; + foldersFromFilesStructure = mkOption { + type = types.bool; + default = false; + description = "Use folder names from filesystem to create folders in Grafana."; + }; }; }; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index d29d50706ef6..41302d6d3ceb 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -29,6 +29,7 @@ let "blackbox" "buildkite-agent" "collectd" + "dmarc" "dnsmasq" "domain" "dovecot" @@ -55,6 +56,7 @@ let "postfix" "postgres" "process" + "pve" "py-air-control" "redis" "rspamd" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix b/nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix new file mode 100644 index 000000000000..330610a15d9e --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/dmarc.nix @@ -0,0 +1,117 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.dmarc; + + json = builtins.toJSON { + inherit (cfg) folders port; + listen_addr = cfg.listenAddress; + storage_path = "$STATE_DIRECTORY"; + imap = (builtins.removeAttrs cfg.imap [ "passwordFile" ]) // { password = "$IMAP_PASSWORD"; use_ssl = true; }; + poll_interval_seconds = cfg.pollIntervalSeconds; + deduplication_max_seconds = cfg.deduplicationMaxSeconds; + logging = { + version = 1; + disable_existing_loggers = false; + }; + }; +in { + port = 9797; + extraOpts = { + imap = { + host = mkOption { + type = types.str; + default = "localhost"; + description = '' + Hostname of IMAP server to connect to. + ''; + }; + port = mkOption { + type = types.port; + default = 993; + description = '' + Port of the IMAP server to connect to. + ''; + }; + username = mkOption { + type = types.str; + example = "postmaster@example.org"; + description = '' + Login username for the IMAP connection. + ''; + }; + passwordFile = mkOption { + type = types.str; + example = "/run/secrets/dovecot_pw"; + description = '' + File containing the login password for the IMAP connection. + ''; + }; + }; + folders = { + inbox = mkOption { + type = types.str; + default = "INBOX"; + description = '' + IMAP mailbox that is checked for incoming DMARC aggregate reports + ''; + }; + done = mkOption { + type = types.str; + default = "Archive"; + description = '' + IMAP mailbox that successfully processed reports are moved to. + ''; + }; + error = mkOption { + type = types.str; + default = "Invalid"; + description = '' + IMAP mailbox that emails are moved to that could not be processed. + ''; + }; + }; + pollIntervalSeconds = mkOption { + type = types.ints.unsigned; + default = 60; + description = '' + How often to poll the IMAP server in seconds. + ''; + }; + deduplicationMaxSeconds = mkOption { + type = types.ints.unsigned; + default = 604800; + defaultText = "7 days (in seconds)"; + description = '' + How long individual report IDs will be remembered to avoid + counting double delivered reports twice. + ''; + }; + debug = mkOption { + type = types.bool; + default = false; + description = '' + Whether to declare enable --debug. + ''; + }; + }; + serviceOpts = { + path = with pkgs; [ envsubst coreutils ]; + serviceConfig = { + StateDirectory = "prometheus-dmarc-exporter"; + WorkingDirectory = "/var/lib/prometheus-dmarc-exporter"; + ExecStart = "${pkgs.writeShellScript "setup-cfg" '' + export IMAP_PASSWORD="$(<${cfg.imap.passwordFile})" + envsubst \ + -i ${pkgs.writeText "dmarc-exporter.json.template" json} \ + -o ''${STATE_DIRECTORY}/dmarc-exporter.json + + exec ${pkgs.prometheus-dmarc-exporter}/bin/prometheus-dmarc-exporter \ + --configuration /var/lib/prometheus-dmarc-exporter/dmarc-exporter.json \ + ${optionalString cfg.debug "--debug"} + ''}"; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/kea.nix b/nixos/modules/services/monitoring/prometheus/exporters/kea.nix index 27aeb9096243..e0ee90d9b97d 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/kea.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @@ -25,6 +25,10 @@ in { }; }; serviceOpts = { + after = [ + "kea-dhcp4-server.service" + "kea-dhcp6-server.service" + ]; serviceConfig = { User = "kea"; ExecStart = '' diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pve.nix b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix new file mode 100644 index 000000000000..ef708414c95e --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/pve.nix @@ -0,0 +1,118 @@ +{ config, lib, pkgs, options }: + +with lib; +let + cfg = config.services.prometheus.exporters.pve; + + # pve exporter requires a config file so create an empty one if configFile is not provided + emptyConfigFile = pkgs.writeTextFile { + name = "pve.yml"; + text = "default:"; + }; + + computedConfigFile = "${if cfg.configFile == null then emptyConfigFile else cfg.configFile}"; +in +{ + port = 9221; + extraOpts = { + package = mkOption { + type = types.package; + default = pkgs.prometheus-pve-exporter; + defaultText = literalExpression "pkgs.prometheus-pve-exporter"; + example = literalExpression "pkgs.prometheus-pve-exporter"; + description = '' + The package to use for prometheus-pve-exporter + ''; + }; + + environmentFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/etc/prometheus-pve-exporter/pve.env"; + description = '' + Path to the service's environment file. This path can either be a computed path in /nix/store or a path in the local filesystem. + + The environment file should NOT be stored in /nix/store as it contains passwords and/or keys in plain text. + + Environment reference: https://github.com/prometheus-pve/prometheus-pve-exporter#authentication + ''; + }; + + configFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/etc/prometheus-pve-exporter/pve.yml"; + description = '' + Path to the service's config file. This path can either be a computed path in /nix/store or a path in the local filesystem. + + The config file should NOT be stored in /nix/store as it will contain passwords and/or keys in plain text. + + If both configFile and environmentFile are provided, the configFile option will be ignored. + + Configuration reference: https://github.com/prometheus-pve/prometheus-pve-exporter/#authentication + ''; + }; + + collectors = { + status = mkOption { + type = types.bool; + default = true; + description = '' + Collect Node/VM/CT status + ''; + }; + version = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE version info + ''; + }; + node = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE node info + ''; + }; + cluster = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE cluster info + ''; + }; + resources = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE resources info + ''; + }; + config = mkOption { + type = types.bool; + default = true; + description = '' + Collect PVE onboot status + ''; + }; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/pve_exporter \ + --${if cfg.collectors.status == true then "" else "no-"}collector.status \ + --${if cfg.collectors.version == true then "" else "no-"}collector.version \ + --${if cfg.collectors.node == true then "" else "no-"}collector.node \ + --${if cfg.collectors.cluster == true then "" else "no-"}collector.cluster \ + --${if cfg.collectors.resources == true then "" else "no-"}collector.resources \ + --${if cfg.collectors.config == true then "" else "no-"}collector.config \ + ${computedConfigFile} \ + ${toString cfg.port} ${cfg.listenAddress} + ''; + } // optionalAttrs (cfg.environmentFile != null) { + EnvironmentFile = cfg.environmentFile; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix b/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix index b6416b93e69c..bac98364538d 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix @@ -25,7 +25,8 @@ in { [ "/dev/sda", "/dev/nvme0n1" ]; ''; description = '' - Paths to disks that will be monitored. + Paths to the disks that will be monitored. Will autodiscover + all disks if none given. ''; }; maxInterval = mkOption { @@ -41,13 +42,23 @@ in { serviceOpts = { serviceConfig = { AmbientCapabilities = [ + "CAP_SYS_RAWIO" "CAP_SYS_ADMIN" ]; CapabilityBoundingSet = [ + "CAP_SYS_RAWIO" "CAP_SYS_ADMIN" ]; DevicePolicy = "closed"; - DeviceAllow = lib.mkForce cfg.devices; + DeviceAllow = lib.mkOverride 100 ( + if cfg.devices != [] then + cfg.devices + else [ + "block-blkext rw" + "block-sd rw" + "char-nvme rw" + ] + ); ExecStart = '' ${pkgs.prometheus-smartctl-exporter}/bin/smartctl_exporter -config ${configFile} ''; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix b/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix index c0a50f07d717..2edd1de83e1b 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix @@ -11,7 +11,7 @@ in { serviceConfig = { ExecStart = '' ${pkgs.prometheus-systemd-exporter}/bin/systemd_exporter \ - --web.listen-address ${cfg.listenAddress}:${toString cfg.port} + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags} ''; RestrictAddressFamilies = [ # Need AF_UNIX to collect data diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix index 5b5a6e18fcd6..ede6028933a4 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix @@ -45,7 +45,8 @@ in }; instance = mkOption { type = types.nullOr types.str; - default = null; + default = config.services.varnish.stateDir; + defaultText = lib.literalExpression "config.services.varnish.stateDir"; description = '' varnishstat -n value. ''; @@ -66,7 +67,7 @@ in }; }; serviceOpts = { - path = [ pkgs.varnish ]; + path = [ config.services.varnish.package ]; serviceConfig = { RestartSec = mkDefault 1; DynamicUser = false; diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index e313589134f1..7a1444decafa 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -181,8 +181,8 @@ in rgwMimeTypesFile = mkOption { type = with types; nullOr path; - default = "${pkgs.mime-types}/etc/mime.types"; - defaultText = literalExpression ''"''${pkgs.mime-types}/etc/mime.types"''; + default = "${pkgs.mailcap}/etc/mime.types"; + defaultText = literalExpression ''"''${pkgs.mailcap}/etc/mime.types"''; description = '' Path to mime types used by radosgw. ''; diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 5482b2aaf88c..7e96179b3cab 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -1,16 +1,17 @@ -{ config, lib, pkgs, options, ... }: +{ config, lib, pkgs, options, utils, ... }: with lib; let cfg = config.services.ipfs; opt = options.services.ipfs; - ipfsFlags = toString ([ - (optionalString cfg.autoMount "--mount") - (optionalString cfg.enableGC "--enable-gc") - (optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=false") - (optionalString (cfg.defaultMode == "offline") "--offline") - (optionalString (cfg.defaultMode == "norouting") "--routing=none") - ] ++ cfg.extraFlags); + ipfsFlags = utils.escapeSystemdExecArgs ( + optional cfg.autoMount "--mount" ++ + optional cfg.enableGC "--enable-gc" ++ + optional (cfg.serviceFdlimit != null) "--manage-fdlimit=false" ++ + optional (cfg.defaultMode == "offline") "--offline" ++ + optional (cfg.defaultMode == "norouting") "--routing=none" ++ + cfg.extraFlags + ); profile = if cfg.localDiscovery @@ -239,7 +240,10 @@ in "d '${cfg.ipnsMountDir}' - ${cfg.user} ${cfg.group} - -" ]; - systemd.packages = [ cfg.package ]; + # The hardened systemd unit breaks the fuse-mount function according to documentation in the unit file itself + systemd.packages = if cfg.autoMount + then [ cfg.package.systemd_unit ] + else [ cfg.package.systemd_unit_hardened ]; systemd.services.ipfs = { path = [ "/run/wrappers" cfg.package ]; @@ -259,29 +263,24 @@ in ipfs --offline config Mounts.IPFS ${cfg.ipfsMountDir} ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir} '' + optionalString cfg.autoMigrate '' - ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -y - '' + concatStringsSep "\n" (collect - isString - (mapAttrsRecursive - (path: value: - # Using heredoc below so that the value is never improperly quoted - '' - read value <mfsmaster-init on a freshly installed master server to + initialize the DATA_PATH direcory. + ''; + default = false; + }; + + exports = mkOption { + type = with types; listOf str; + default = null; + description = "Paths to export (see mfsexports.cfg)."; + example = [ + "* / rw,alldirs,admin,maproot=0:0" + "* . rw" + ]; + }; + + openFirewall = mkOption { + type = types.bool; + description = "Whether to automatically open the necessary ports in the firewall."; + default = false; + }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = mkOption { + type = types.str; + default = "/var/lib/mfs"; + description = "Data storage directory."; + }; + }; + + description = "Contents of config file (mfsmaster.cfg)."; + }; + }; + + metalogger = { + enable = mkEnableOption "Moosefs metalogger daemon."; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = mkOption { + type = types.str; + default = "/var/lib/mfs"; + description = "Data storage directory"; + }; + }; + + description = "Contents of metalogger config file (mfsmetalogger.cfg)."; + }; + }; + + chunkserver = { + enable = mkEnableOption "Moosefs chunkserver daemon."; + + openFirewall = mkOption { + type = types.bool; + description = "Whether to automatically open the necessary ports in the firewall."; + default = false; + }; + + hdds = mkOption { + type = with types; listOf str; + default = null; + description = "Mount points to be used by chunkserver for storage (see mfshdd.cfg)."; + example = [ "/mnt/hdd1" ]; + }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = mkOption { + type = types.str; + default = "/var/lib/mfs"; + description = "Directory for lock file."; + }; + }; + + description = "Contents of chunkserver config file (mfschunkserver.cfg)."; + }; + }; + }; + }; + + ###### implementation + + config = mkIf ( cfg.client.enable || cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable ) { + + warnings = [ ( mkIf (!cfg.runAsUser) "Running moosefs services as root is not recommended.") ]; + + # Service settings + services.moosefs = { + master.settings = mkIf cfg.master.enable { + WORKING_USER = mfsUser; + EXPORTS_FILENAME = toString ( pkgs.writeText "mfsexports.cfg" + (concatStringsSep "\n" cfg.master.exports)); + }; + + metalogger.settings = mkIf cfg.metalogger.enable { + WORKING_USER = mfsUser; + MASTER_HOST = cfg.masterHost; + }; + + chunkserver.settings = mkIf cfg.chunkserver.enable { + WORKING_USER = mfsUser; + MASTER_HOST = cfg.masterHost; + HDD_CONF_FILENAME = toString ( pkgs.writeText "mfshdd.cfg" + (concatStringsSep "\n" cfg.chunkserver.hdds)); + }; + }; + + # Create system user account for daemons + users = mkIf ( cfg.runAsUser && ( cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable ) ) { + users.moosefs = { + isSystemUser = true; + description = "moosefs daemon user"; + group = "moosefs"; + }; + groups.moosefs = {}; + }; + + environment.systemPackages = + (lib.optional cfg.client.enable pkgs.moosefs) ++ + (lib.optional cfg.master.enable initTool); + + networking.firewall.allowedTCPPorts = + (lib.optionals cfg.master.openFirewall [ 9419 9420 9421 ]) ++ + (lib.optional cfg.chunkserver.openFirewall 9422); + + # Ensure storage directories exist + systemd.tmpfiles.rules = + optional cfg.master.enable "d ${cfg.master.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}" + ++ optional cfg.metalogger.enable "d ${cfg.metalogger.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}" + ++ optional cfg.chunkserver.enable "d ${cfg.chunkserver.settings.DATA_PATH} 0700 ${mfsUser} ${mfsUser}"; + + # Service definitions + systemd.services.mfs-master = mkIf cfg.master.enable + ( systemdService "master" { + TimeoutStartSec = 1800; + TimeoutStopSec = 1800; + Restart = "no"; + } masterCfg ); + + systemd.services.mfs-metalogger = mkIf cfg.metalogger.enable + ( systemdService "metalogger" { Restart = "on-abnormal"; } metaloggerCfg ); + + systemd.services.mfs-chunkserver = mkIf cfg.chunkserver.enable + ( systemdService "chunkserver" { Restart = "on-abnormal"; } chunkserverCfg ); + }; +} diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index edac86eb0e30..e72f9b54cd6f 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -79,7 +79,7 @@ in { in { services.rsync = { enable = !cfg.socketActivated; - aliases = [ "rsyncd" ]; + aliases = [ "rsyncd.service" ]; description = "fast remote file copy program daemon"; after = [ "network.target" ]; diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 9ed755d0465c..992f948e8cd5 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -224,6 +224,7 @@ in targets.samba = { description = "Samba Server"; after = [ "network.target" ]; + wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; }; # Refer to https://github.com/samba-team/samba/tree/master/packaging/systemd diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index e55ac7a6b18b..aa72a047526b 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -76,7 +76,7 @@ in script = '' ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${user} \ - -c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled' + -c 'HOME="${cfg.dataDir}" ${pkgs.amule-daemon}/bin/amuled' ''; }; }; diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index fc06cdaa6e58..3049c4f2bce9 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -3,103 +3,101 @@ let inherit (lib) mkEnableOption mkIf mkOption optionalString types; - generic = variant: - let - cfg = config.services.${variant}; - pkg = pkgs.${variant}; - birdBin = if variant == "bird6" then "bird6" else "bird"; - birdc = if variant == "bird6" then "birdc6" else "birdc"; - descr = - { bird = "1.6.x with IPv4 support"; - bird6 = "1.6.x with IPv6 support"; - bird2 = "2.x"; - }.${variant}; - in { - ###### interface - options = { - services.${variant} = { - enable = mkEnableOption "BIRD Internet Routing Daemon (${descr})"; - config = mkOption { - type = types.lines; - description = '' - BIRD Internet Routing Daemon configuration file. - - ''; - }; - checkConfig = mkOption { - type = types.bool; - default = true; - description = '' - Whether the config should be checked at build time. - When the config can't be checked during build time, for example when it includes - other files, either disable this option or use preCheckConfig to create - the included files before checking. - ''; - }; - preCheckConfig = mkOption { - type = types.lines; - default = ""; - example = '' - echo "cost 100;" > include.conf - ''; - description = '' - Commands to execute before the config file check. The file to be checked will be - available as ${variant}.conf in the current directory. - - Files created with this option will not be available at service runtime, only during - build time checking. - ''; - }; - }; + cfg = config.services.bird2; + caps = [ "CAP_NET_ADMIN" "CAP_NET_BIND_SERVICE" "CAP_NET_RAW" ]; +in +{ + ###### interface + options = { + services.bird2 = { + enable = mkEnableOption "BIRD Internet Routing Daemon"; + config = mkOption { + type = types.lines; + description = '' + BIRD Internet Routing Daemon configuration file. + + ''; }; + checkConfig = mkOption { + type = types.bool; + default = true; + description = '' + Whether the config should be checked at build time. + When the config can't be checked during build time, for example when it includes + other files, either disable this option or use preCheckConfig to create + the included files before checking. + ''; + }; + preCheckConfig = mkOption { + type = types.lines; + default = ""; + example = '' + echo "cost 100;" > include.conf + ''; + description = '' + Commands to execute before the config file check. The file to be checked will be + available as bird2.conf in the current directory. - ###### implementation - config = mkIf cfg.enable { - environment.systemPackages = [ pkg ]; - - environment.etc."bird/${variant}.conf".source = pkgs.writeTextFile { - name = "${variant}.conf"; - text = cfg.config; - checkPhase = optionalString cfg.checkConfig '' - ln -s $out ${variant}.conf - ${cfg.preCheckConfig} - ${pkg}/bin/${birdBin} -d -p -c ${variant}.conf - ''; - }; - - systemd.services.${variant} = { - description = "BIRD Internet Routing Daemon (${descr})"; - wantedBy = [ "multi-user.target" ]; - reloadIfChanged = true; - restartTriggers = [ config.environment.etc."bird/${variant}.conf".source ]; - serviceConfig = { - Type = "forking"; - Restart = "on-failure"; - ExecStart = "${pkg}/bin/${birdBin} -c /etc/bird/${variant}.conf -u ${variant} -g ${variant}"; - ExecReload = "/bin/sh -c '${pkg}/bin/${birdBin} -c /etc/bird/${variant}.conf -p && ${pkg}/bin/${birdc} configure'"; - ExecStop = "${pkg}/bin/${birdc} down"; - CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_FOWNER" "CAP_DAC_OVERRIDE" "CAP_SETUID" "CAP_SETGID" - # see bird/sysdep/linux/syspriv.h - "CAP_NET_BIND_SERVICE" "CAP_NET_BROADCAST" "CAP_NET_ADMIN" "CAP_NET_RAW" ]; - ProtectSystem = "full"; - ProtectHome = "yes"; - SystemCallFilter="~@cpu-emulation @debug @keyring @module @mount @obsolete @raw-io"; - MemoryDenyWriteExecute = "yes"; - }; - }; - users = { - users.${variant} = { - description = "BIRD Internet Routing Daemon user"; - group = variant; - isSystemUser = true; - }; - groups.${variant} = {}; - }; + Files created with this option will not be available at service runtime, only during + build time checking. + ''; }; }; + }; -in -{ - imports = map generic [ "bird" "bird6" "bird2" ]; + imports = [ + (lib.mkRemovedOptionModule [ "services" "bird" ] "Use services.bird2 instead") + (lib.mkRemovedOptionModule [ "services" "bird6" ] "Use services.bird2 instead") + ]; + + ###### implementation + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.bird ]; + + environment.etc."bird/bird2.conf".source = pkgs.writeTextFile { + name = "bird2"; + text = cfg.config; + checkPhase = optionalString cfg.checkConfig '' + ln -s $out bird2.conf + ${cfg.preCheckConfig} + ${pkgs.bird}/bin/bird -d -p -c bird2.conf + ''; + }; + + systemd.services.bird2 = { + description = "BIRD Internet Routing Daemon"; + wantedBy = [ "multi-user.target" ]; + reloadIfChanged = true; + restartTriggers = [ config.environment.etc."bird/bird2.conf".source ]; + serviceConfig = { + Type = "forking"; + Restart = "on-failure"; + User = "bird2"; + Group = "bird2"; + ExecStart = "${pkgs.bird}/bin/bird -c /etc/bird/bird2.conf"; + ExecReload = "${pkgs.bird}/bin/birdc configure"; + ExecStop = "${pkgs.bird}/bin/birdc down"; + RuntimeDirectory = "bird"; + CapabilityBoundingSet = caps; + AmbientCapabilities = caps; + ProtectSystem = "full"; + ProtectHome = "yes"; + ProtectKernelTunables = true; + ProtectControlGroups = true; + PrivateTmp = true; + PrivateDevices = true; + SystemCallFilter = "~@cpu-emulation @debug @keyring @module @mount @obsolete @raw-io"; + MemoryDenyWriteExecute = "yes"; + }; + }; + users = { + users.bird2 = { + description = "BIRD Internet Routing Daemon user"; + group = "bird2"; + isSystemUser = true; + }; + groups.bird2 = { }; + }; + }; } diff --git a/nixos/modules/services/networking/blocky.nix b/nixos/modules/services/networking/blocky.nix new file mode 100644 index 000000000000..7488e05fc033 --- /dev/null +++ b/nixos/modules/services/networking/blocky.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.blocky; + + format = pkgs.formats.yaml { }; + configFile = format.generate "config.yaml" cfg.settings; +in +{ + options.services.blocky = { + enable = mkEnableOption "Fast and lightweight DNS proxy as ad-blocker for local network with many features"; + + settings = mkOption { + type = format.type; + default = { }; + description = '' + Blocky configuration. Refer to + + for details on supported values. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.blocky = { + description = "A DNS proxy and ad-blocker for the local network"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + DynamicUser = true; + ExecStart = "${pkgs.blocky}/bin/blocky --config ${configFile}"; + + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix index 8886e7a30f1f..9945dc83a279 100644 --- a/nixos/modules/services/networking/connman.nix +++ b/nixos/modules/services/networking/connman.nix @@ -127,7 +127,7 @@ in { description = "ConnMan VPN service"; wantedBy = [ "multi-user.target" ]; after = [ "syslog.target" ]; - before = [ "connman" ]; + before = [ "connman.service" ]; serviceConfig = { Type = "dbus"; BusName = "net.connman.vpn"; @@ -140,7 +140,7 @@ in { description = "D-BUS Service"; serviceConfig = { Name = "net.connman.vpn"; - before = [ "connman" ]; + before = [ "connman.service" ]; ExecStart = "${cfg.package}/sbin/connman-vpnd -n"; User = "root"; SystemdService = "connman-vpn.service"; diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 2c339350acd3..3eb7ca99eafd 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -183,6 +183,20 @@ in config = mkIf enableDHCP { + assertions = [ { + # dhcpcd doesn't start properly with malloc ∉ [ libc scudo ] + # see https://github.com/NixOS/nixpkgs/issues/151696 + assertion = + dhcpcd.enablePrivSep + -> elem config.environment.memoryAllocator.provider [ "libc" "scudo" ]; + message = '' + dhcpcd with privilege separation is incompatible with chosen system malloc. + Currently only the `libc` and `scudo` allocators are known to work. + To disable dhcpcd's privilege separation, overlay Nixpkgs and override dhcpcd + to set `enablePrivSep = false`. + ''; + } ]; + systemd.services.dhcpcd = let cfgN = config.networking; hasDefaultGatewaySet = (cfgN.defaultGateway != null && cfgN.defaultGateway.address != "") diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index 54e4f9002859..49950efc0a1b 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -7,7 +7,7 @@ let cfg4 = config.services.dhcpd4; cfg6 = config.services.dhcpd6; - writeConfig = cfg: pkgs.writeText "dhcpd.conf" + writeConfig = postfix: cfg: pkgs.writeText "dhcpd.conf" '' default-lease-time 600; max-lease-time 7200; @@ -21,45 +21,54 @@ let (machine: '' host ${machine.hostName} { hardware ethernet ${machine.ethernetAddress}; - fixed-address ${machine.ipAddress}; + fixed-address${ + optionalString (postfix == "6") postfix + } ${machine.ipAddress}; } '') cfg.machines } ''; - dhcpdService = postfix: cfg: optionalAttrs cfg.enable { - "dhcpd${postfix}" = { - description = "DHCPv${postfix} server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + dhcpdService = postfix: cfg: + let + configFile = + if cfg.configFile != null + then cfg.configFile + else writeConfig postfix cfg; + leaseFile = "/var/lib/dhcpd${postfix}/dhcpd.leases"; + args = [ + "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}" + "-pf" "/run/dhcpd${postfix}/dhcpd.pid" + "-cf" configFile + "-lf" leaseFile + ] ++ cfg.extraFlags + ++ cfg.interfaces; + in + optionalAttrs cfg.enable { + "dhcpd${postfix}" = { + description = "DHCPv${postfix} server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; - preStart = '' - mkdir -m 755 -p ${cfg.stateDir} - chown dhcpd:nogroup ${cfg.stateDir} - touch ${cfg.stateDir}/dhcpd.leases - ''; - - serviceConfig = - let - configFile = if cfg.configFile != null then cfg.configFile else writeConfig cfg; - args = [ "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}" - "-pf" "/run/dhcpd${postfix}/dhcpd.pid" - "-cf" "${configFile}" - "-lf" "${cfg.stateDir}/dhcpd.leases" - "-user" "dhcpd" "-group" "nogroup" - ] ++ cfg.extraFlags - ++ cfg.interfaces; - - in { - ExecStart = concatMapStringsSep " " escapeShellArg args; - Type = "forking"; - Restart = "always"; - RuntimeDirectory = [ "dhcpd${postfix}" ]; - PIDFile = "/run/dhcpd${postfix}/dhcpd.pid"; + preStart = "touch ${leaseFile}"; + serviceConfig = { + ExecStart = concatMapStringsSep " " escapeShellArg args; + Type = "forking"; + Restart = "always"; + DynamicUser = true; + User = "dhcpd"; + Group = "dhcpd"; + AmbientCapabilities = [ + "CAP_NET_RAW" # to send ICMP messages + "CAP_NET_BIND_SERVICE" # to bind on DHCP port (67) + ]; + StateDirectory = "dhcpd${postfix}"; + RuntimeDirectory = "dhcpd${postfix}"; + PIDFile = "/run/dhcpd${postfix}/dhcpd.pid"; + }; }; - }; - }; + }; machineOpts = { ... }: { @@ -102,15 +111,6 @@ let ''; }; - stateDir = mkOption { - type = types.path; - # We use /var/lib/dhcp for DHCPv4 to save backwards compatibility. - default = "/var/lib/dhcp${if postfix == "4" then "" else postfix}"; - description = '' - State directory for the DHCP server. - ''; - }; - extraConfig = mkOption { type = types.lines; default = ""; @@ -194,7 +194,13 @@ in imports = [ (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ]) - ]; + ] ++ flip map [ "4" "6" ] (postfix: + mkRemovedOptionModule [ "services" "dhcpd${postfix}" "stateDir" ] '' + The DHCP server state directory is now managed with the systemd's DynamicUser mechanism. + This means the directory is named after the service (dhcpd${postfix}), created under + /var/lib/private/ and symlinked to /var/lib/. + '' + ); ###### interface @@ -210,15 +216,6 @@ in config = mkIf (cfg4.enable || cfg6.enable) { - users = { - users.dhcpd = { - isSystemUser = true; - group = "dhcpd"; - description = "DHCP daemon user"; - }; - groups.dhcpd = {}; - }; - systemd.services = dhcpdService "4" cfg4 // dhcpdService "6" cfg6; }; diff --git a/nixos/modules/services/networking/eternal-terminal.nix b/nixos/modules/services/networking/eternal-terminal.nix index 88b4cd90540f..0dcf3d28f4e0 100644 --- a/nixos/modules/services/networking/eternal-terminal.nix +++ b/nixos/modules/services/networking/eternal-terminal.nix @@ -90,6 +90,6 @@ in }; meta = { - maintainers = with lib.maintainers; [ pingiun ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index ff023a888f26..c213a5516a49 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -179,10 +179,6 @@ let ) cfg.allowedUDPPortRanges ) allInterfaces)} - # Accept IPv4 multicast. Not a big security risk since - # probably nobody is listening anyway. - #iptables -A nixos-fw -d 224.0.0.0/4 -j nixos-fw-accept - # Optionally respond to ICMPv4 pings. ${optionalString cfg.allowPing '' iptables -w -A nixos-fw -p icmp --icmp-type echo-request ${optionalString (cfg.pingLimit != null) @@ -326,7 +322,7 @@ in type = types.package; default = pkgs.iptables; defaultText = literalExpression "pkgs.iptables"; - example = literalExpression "pkgs.iptables-nftables-compat"; + example = literalExpression "pkgs.iptables-legacy"; description = '' The iptables package to use for running the firewall service." @@ -437,8 +433,6 @@ in drop the packet if the source address is not reachable via any interface) or false. Defaults to the value of kernelHasRPFilter. - - (needs kernel 3.3+) ''; }; diff --git a/nixos/modules/services/networking/gogoclient.nix b/nixos/modules/services/networking/gogoclient.nix deleted file mode 100644 index 1205321818b9..000000000000 --- a/nixos/modules/services/networking/gogoclient.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let cfg = config.services.gogoclient; -in - -{ - - ###### interface - - options = { - services.gogoclient = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enable the gogoCLIENT IPv6 tunnel. - ''; - }; - autorun = mkOption { - type = types.bool; - default = true; - description = '' - Whether to automatically start the tunnel. - ''; - }; - - username = mkOption { - default = ""; - type = types.str; - description = '' - Your Gateway6 login name, if any. - ''; - }; - - password = mkOption { - default = ""; - type = types.str; - description = '' - Path to a file (as a string), containing your gogoNET password, if any. - ''; - }; - - server = mkOption { - type = types.str; - default = "anonymous.freenet6.net"; - example = "broker.freenet6.net"; - description = "The Gateway6 server to be used."; - }; - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - boot.kernelModules = [ "tun" ]; - - networking.enableIPv6 = true; - - systemd.services.gogoclient = { - description = "ipv6 tunnel"; - - after = [ "network.target" ]; - requires = [ "network.target" ]; - - unitConfig.RequiresMountsFor = "/var/lib/gogoc"; - - script = let authMethod = if cfg.password == "" then "anonymous" else "any"; in '' - mkdir -p -m 700 /var/lib/gogoc - cat ${pkgs.gogoclient}/share/${pkgs.gogoclient.name}/gogoc.conf.sample | \ - ${pkgs.gnused}/bin/sed \ - -e "s|^userid=|&${cfg.username}|" \ - -e "s|^passwd=|&${optionalString (cfg.password != "") "$(cat ${cfg.password})"}|" \ - -e "s|^server=.*|server=${cfg.server}|" \ - -e "s|^auth_method=.*|auth_method=${authMethod}|" \ - -e "s|^#log_file=|log_file=1|" > /var/lib/gogoc/gogoc.conf - cd /var/lib/gogoc - exec ${pkgs.gogoclient}/bin/gogoc -y -f /var/lib/gogoc/gogoc.conf - ''; - } // optionalAttrs cfg.autorun { - wantedBy = [ "multi-user.target" ]; - }; - - }; - -} diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix new file mode 100644 index 000000000000..091d2a938cd4 --- /dev/null +++ b/nixos/modules/services/networking/headscale.nix @@ -0,0 +1,490 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.headscale; + + dataDir = "/var/lib/headscale"; + runDir = "/run/headscale"; + + settingsFormat = pkgs.formats.yaml { }; + configFile = settingsFormat.generate "headscale.yaml" cfg.settings; +in +{ + options = { + services.headscale = { + enable = mkEnableOption "headscale, Open Source coordination server for Tailscale"; + + package = mkOption { + type = types.package; + default = pkgs.headscale; + defaultText = literalExpression "pkgs.headscale"; + description = '' + Which headscale package to use for the running server. + ''; + }; + + user = mkOption { + default = "headscale"; + type = types.str; + description = '' + User account under which headscale runs. + + If left as the default value this user will automatically be created + on system activation, otherwise you are responsible for + ensuring the user exists before the headscale service starts. + + ''; + }; + + group = mkOption { + default = "headscale"; + type = types.str; + description = '' + Group under which headscale runs. + + If left as the default value this group will automatically be created + on system activation, otherwise you are responsible for + ensuring the user exists before the headscale service starts. + + ''; + }; + + serverUrl = mkOption { + type = types.str; + default = "http://127.0.0.1:8080"; + description = '' + The url clients will connect to. + ''; + example = "https://myheadscale.example.com:443"; + }; + + address = mkOption { + type = types.str; + default = "127.0.0.1"; + description = '' + Listening address of headscale. + ''; + example = "0.0.0.0"; + }; + + port = mkOption { + type = types.port; + default = 8080; + description = '' + Listening port of headscale. + ''; + example = 443; + }; + + privateKeyFile = mkOption { + type = types.path; + default = "${dataDir}/private.key"; + description = '' + Path to private key file, generated automatically if it does not exist. + ''; + }; + + derp = { + urls = mkOption { + type = types.listOf types.str; + default = [ "https://controlplane.tailscale.com/derpmap/default" ]; + description = '' + List of urls containing DERP maps. + See How Tailscale works for more information on DERP maps. + ''; + }; + + paths = mkOption { + type = types.listOf types.path; + default = [ ]; + description = '' + List of file paths containing DERP maps. + See How Tailscale works for more information on DERP maps. + ''; + }; + + + autoUpdate = mkOption { + type = types.bool; + default = true; + description = '' + Whether to automatically update DERP maps on a set frequency. + ''; + example = false; + }; + + updateFrequency = mkOption { + type = types.str; + default = "24h"; + description = '' + Frequency to update DERP maps. + ''; + example = "5m"; + }; + + }; + + ephemeralNodeInactivityTimeout = mkOption { + type = types.str; + default = "30m"; + description = '' + Time before an inactive ephemeral node is deleted. + ''; + example = "5m"; + }; + + database = { + type = mkOption { + type = types.enum [ "sqlite3" "postgres" ]; + example = "postgres"; + default = "sqlite3"; + description = "Database engine to use."; + }; + + host = mkOption { + type = types.nullOr types.str; + default = null; + example = "127.0.0.1"; + description = "Database host address."; + }; + + port = mkOption { + type = types.nullOr types.port; + default = null; + example = 3306; + description = "Database host port."; + }; + + name = mkOption { + type = types.nullOr types.str; + default = null; + example = "headscale"; + description = "Database name."; + }; + + user = mkOption { + type = types.nullOr types.str; + default = null; + example = "headscale"; + description = "Database user."; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/headscale-dbpassword"; + description = '' + A file containing the password corresponding to + . + ''; + }; + + path = mkOption { + type = types.nullOr types.str; + default = "${dataDir}/db.sqlite"; + description = "Path to the sqlite3 database file."; + }; + }; + + logLevel = mkOption { + type = types.str; + default = "info"; + description = '' + headscale log level. + ''; + example = "debug"; + }; + + dns = { + nameservers = mkOption { + type = types.listOf types.str; + default = [ "1.1.1.1" ]; + description = '' + List of nameservers to pass to Tailscale clients. + ''; + }; + + domains = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + Search domains to inject to Tailscale clients. + ''; + example = [ "mydomain.internal" ]; + }; + + magicDns = mkOption { + type = types.bool; + default = true; + description = '' + Whether to use [MagicDNS](https://tailscale.com/kb/1081/magicdns/). + Only works if there is at least a nameserver defined. + ''; + example = false; + }; + + baseDomain = mkOption { + type = types.str; + default = ""; + description = '' + Defines the base domain to create the hostnames for MagicDNS. + must be a FQDNs, without the trailing dot. + The FQDN of the hosts will be + hostname.namespace.base_domain (e.g. + myhost.mynamespace.example.com). + ''; + }; + }; + + openIdConnect = { + issuer = mkOption { + type = types.str; + default = ""; + description = '' + URL to OpenID issuer. + ''; + example = "https://openid.example.com"; + }; + + clientId = mkOption { + type = types.str; + default = ""; + description = '' + OpenID Connect client ID. + ''; + }; + + clientSecretFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to OpenID Connect client secret file. + ''; + }; + + domainMap = mkOption { + type = types.attrsOf types.str; + default = { }; + description = '' + Domain map is used to map incomming users (by their email) to + a namespace. The key can be a string, or regex. + ''; + example = { + ".*" = "default-namespace"; + }; + }; + + }; + + tls = { + letsencrypt = { + hostname = mkOption { + type = types.nullOr types.str; + default = ""; + description = '' + Domain name to request a TLS certificate for. + ''; + }; + challengeType = mkOption { + type = types.enum [ "TLS_ALPN-01" "HTTP-01" ]; + default = "HTTP-01"; + description = '' + Type of ACME challenge to use, currently supported types: + HTTP-01 or TLS_ALPN-01. + ''; + }; + httpListen = mkOption { + type = types.nullOr types.str; + default = ":http"; + description = '' + When HTTP-01 challenge is chosen, letsencrypt must set up a + verification endpoint, and it will be listening on: + :http = port 80. + ''; + }; + }; + + certFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to already created certificate. + ''; + }; + keyFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to key for already created certificate. + ''; + }; + }; + + aclPolicyFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to a file containg ACL policies. + ''; + }; + + settings = mkOption { + type = settingsFormat.type; + default = { }; + description = '' + Overrides to config.yaml as a Nix attribute set. + This option is ideal for overriding settings not exposed as Nix options. + Check the example config + for possible options. + ''; + }; + + + }; + + }; + config = mkIf cfg.enable { + + services.headscale.settings = { + server_url = mkDefault cfg.serverUrl; + listen_addr = mkDefault "${cfg.address}:${toString cfg.port}"; + + private_key_path = mkDefault cfg.privateKeyFile; + + derp = { + urls = mkDefault cfg.derp.urls; + paths = mkDefault cfg.derp.paths; + auto_update_enable = mkDefault cfg.derp.autoUpdate; + update_frequency = mkDefault cfg.derp.updateFrequency; + }; + + # Turn off update checks since the origin of our package + # is nixpkgs and not Github. + disable_check_updates = true; + + ephemeral_node_inactivity_timeout = mkDefault cfg.ephemeralNodeInactivityTimeout; + + db_type = mkDefault cfg.database.type; + db_path = mkDefault cfg.database.path; + + log_level = mkDefault cfg.logLevel; + + dns_config = { + nameservers = mkDefault cfg.dns.nameservers; + domains = mkDefault cfg.dns.domains; + magic_dns = mkDefault cfg.dns.magicDns; + base_domain = mkDefault cfg.dns.baseDomain; + }; + + unix_socket = "${runDir}/headscale.sock"; + + # OpenID Connect + oidc = { + issuer = mkDefault cfg.openIdConnect.issuer; + client_id = mkDefault cfg.openIdConnect.clientId; + domain_map = mkDefault cfg.openIdConnect.domainMap; + }; + + tls_letsencrypt_cache_dir = "${dataDir}/.cache"; + + } // optionalAttrs (cfg.database.host != null) { + db_host = mkDefault cfg.database.host; + } // optionalAttrs (cfg.database.port != null) { + db_port = mkDefault cfg.database.port; + } // optionalAttrs (cfg.database.name != null) { + db_name = mkDefault cfg.database.name; + } // optionalAttrs (cfg.database.user != null) { + db_user = mkDefault cfg.database.user; + } // optionalAttrs (cfg.tls.letsencrypt.hostname != null) { + tls_letsencrypt_hostname = mkDefault cfg.tls.letsencrypt.hostname; + } // optionalAttrs (cfg.tls.letsencrypt.challengeType != null) { + tls_letsencrypt_challenge_type = mkDefault cfg.tls.letsencrypt.challengeType; + } // optionalAttrs (cfg.tls.letsencrypt.httpListen != null) { + tls_letsencrypt_listen = mkDefault cfg.tls.letsencrypt.httpListen; + } // optionalAttrs (cfg.tls.certFile != null) { + tls_cert_path = mkDefault cfg.tls.certFile; + } // optionalAttrs (cfg.tls.keyFile != null) { + tls_key_path = mkDefault cfg.tls.keyFile; + } // optionalAttrs (cfg.aclPolicyFile != null) { + acl_policy_path = mkDefault cfg.aclPolicyFile; + }; + + # Setup the headscale configuration in a known path in /etc to + # allow both the Server and the Client use it to find the socket + # for communication. + environment.etc."headscale/config.yaml".source = configFile; + + users.groups.headscale = mkIf (cfg.group == "headscale") { }; + + users.users.headscale = mkIf (cfg.user == "headscale") { + description = "headscale user"; + home = dataDir; + group = cfg.group; + isSystemUser = true; + }; + + systemd.services.headscale = { + description = "headscale coordination server for Tailscale"; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + restartTriggers = [ configFile ]; + + script = '' + ${optionalString (cfg.database.passwordFile != null) '' + export HEADSCALE_DB_PASS="$(head -n1 ${escapeShellArg cfg.database.passwordFile})" + ''} + + export HEADSCALE_OIDC_CLIENT_SECRET="$(head -n1 ${escapeShellArg cfg.openIdConnect.clientSecretFile})" + exec ${cfg.package}/bin/headscale serve + ''; + + serviceConfig = + let + capabilityBoundingSet = [ "CAP_CHOWN" ] ++ optional (cfg.port < 1024) "CAP_NET_BIND_SERVICE"; + in + { + Restart = "always"; + Type = "simple"; + User = cfg.user; + Group = cfg.group; + + # Hardening options + RuntimeDirectory = "headscale"; + # Allow headscale group access so users can be added and use the CLI. + RuntimeDirectoryMode = "0750"; + + StateDirectory = "headscale"; + StateDirectoryMode = "0750"; + + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectHostname = true; + ProtectClock = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + RestrictNamespaces = true; + RemoveIPC = true; + UMask = "0077"; + + CapabilityBoundingSet = capabilityBoundingSet; + AmbientCapabilities = capabilityBoundingSet; + NoNewPrivileges = true; + LockPersonality = true; + RestrictRealtime = true; + SystemCallFilter = [ "@system-service" "~@priviledged" "@chown" ]; + SystemCallArchitectures = "native"; + RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX"; + }; + }; + }; + + meta.maintainers = with maintainers; [ kradalby ]; +} diff --git a/nixos/modules/services/networking/https-dns-proxy.nix b/nixos/modules/services/networking/https-dns-proxy.nix new file mode 100644 index 000000000000..85d6c362b466 --- /dev/null +++ b/nixos/modules/services/networking/https-dns-proxy.nix @@ -0,0 +1,128 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) + concatStringsSep + mkEnableOption mkIf mkOption types; + + cfg = config.services.https-dns-proxy; + + providers = { + cloudflare = { + ips = [ "1.1.1.1" "1.0.0.1" ]; + url = "https://cloudflare-dns.com/dns-query"; + }; + google = { + ips = [ "8.8.8.8" "8.8.4.4" ]; + url = "https://dns.google/dns-query"; + }; + quad9 = { + ips = [ "9.9.9.9" "149.112.112.112" ]; + url = "https://dns.quad9.net/dns-query"; + }; + }; + + defaultProvider = "quad9"; + + providerCfg = + let + isCustom = cfg.provider.kind == "custom"; + in + lib.concatStringsSep " " [ + "-b" + (concatStringsSep "," (if isCustom then cfg.provider.ips else providers."${cfg.provider.kind}".ips)) + "-r" + (if isCustom then cfg.provider.url else providers."${cfg.provider.kind}".url) + ]; + +in +{ + meta.maintainers = with lib.maintainers; [ peterhoeg ]; + + ###### interface + + options.services.https-dns-proxy = { + enable = mkEnableOption "https-dns-proxy daemon"; + + address = mkOption { + description = "The address on which to listen"; + type = types.str; + default = "127.0.0.1"; + }; + + port = mkOption { + description = "The port on which to listen"; + type = types.port; + default = 5053; + }; + + provider = { + kind = mkOption { + description = '' + The upstream provider to use or custom in case you do not trust any of + the predefined providers or just want to use your own. + + The default is ${defaultProvider} and there are privacy and security trade-offs + when using any upstream provider. Please consider that before using any + of them. + + If you pick a custom provider, you will need to provide the bootstrap + IP addresses as well as the resolver https URL. + ''; + type = types.enum ((builtins.attrNames providers) ++ [ "custom" ]); + default = defaultProvider; + }; + + ips = mkOption { + description = "The custom provider IPs"; + type = types.listOf types.str; + }; + + url = mkOption { + description = "The custom provider URL"; + type = types.str; + }; + }; + + preferIPv4 = mkOption { + description = '' + https_dns_proxy will by default use IPv6 and fail if it is not available. + To play it safe, we choose IPv4. + ''; + type = types.bool; + default = true; + }; + + extraArgs = mkOption { + description = "Additional arguments to pass to the process."; + type = types.listOf types.str; + default = [ "-v" ]; + }; + }; + + ###### implementation + + config = lib.mkIf cfg.enable { + systemd.services.https-dns-proxy = { + description = "DNS to DNS over HTTPS (DoH) proxy"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = rec { + Type = "exec"; + DynamicUser = true; + ExecStart = lib.concatStringsSep " " ( + [ + "${pkgs.https-dns-proxy}/bin/https_dns_proxy" + "-a ${toString cfg.address}" + "-p ${toString cfg.port}" + "-l -" + providerCfg + ] + ++ lib.optional cfg.preferIPv4 "-4" + ++ cfg.extraArgs + ); + Restart = "on-failure"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/hylafax/options.nix b/nixos/modules/services/networking/hylafax/options.nix index 8e59c68054d2..8f621b61002f 100644 --- a/nixos/modules/services/networking/hylafax/options.nix +++ b/nixos/modules/services/networking/hylafax/options.nix @@ -3,7 +3,7 @@ let inherit (lib.options) literalExpression mkEnableOption mkOption; - inherit (lib.types) bool enum ints lines attrsOf nullOr path str submodule; + inherit (lib.types) bool enum ints lines attrsOf nonEmptyStr nullOr path str submodule; inherit (lib.modules) mkDefault mkIf mkMerge; commonDescr = '' @@ -17,8 +17,6 @@ let configuration to yield an operational system. ''; - str1 = lib.types.addCheck str (s: s!=""); # non-empty string - configAttrType = # Options in HylaFAX configuration files can be # booleans, strings, integers, or list thereof @@ -37,7 +35,7 @@ let modemConfigOptions = { name, config, ... }: { options = { name = mkOption { - type = str1; + type = nonEmptyStr; example = "ttyS1"; description = '' Name of modem device, @@ -45,7 +43,7 @@ let ''; }; type = mkOption { - type = str1; + type = nonEmptyStr; example = "cirrus"; description = '' Name of modem configuration file, @@ -135,14 +133,14 @@ in }; countryCode = mkOption { - type = nullOr str1; + type = nullOr nonEmptyStr; default = null; example = "49"; description = "Country code for server and all modems."; }; areaCode = mkOption { - type = nullOr str1; + type = nullOr nonEmptyStr; default = null; example = "30"; description = "Area code for server and all modems."; @@ -279,7 +277,7 @@ in each time the spooling area is initialized. ''; faxcron.enable.frequency = mkOption { - type = nullOr str1; + type = nullOr nonEmptyStr; default = null; example = "daily"; description = '' @@ -319,7 +317,7 @@ in each time the spooling area is initialized. ''; faxqclean.enable.frequency = mkOption { - type = nullOr str1; + type = nullOr nonEmptyStr; default = null; example = "daily"; description = '' diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index e1a31a0c2ee0..34fda57b23d2 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -222,14 +222,12 @@ let in concatStringsSep "\n" inTunOpts))]; in pkgs.writeText "i2pd-tunnels.conf" opts; - i2pdSh = pkgs.writeScriptBin "i2pd" '' - #!/bin/sh - exec ${cfg.package}/bin/i2pd \ - ${if cfg.address == null then "" else "--host="+cfg.address} \ - --service \ - --conf=${i2pdConf} \ - --tunconf=${tunnelConf} - ''; + i2pdFlags = concatStringsSep " " ( + optional (cfg.address != null) ("--host=" + cfg.address) ++ [ + "--service" + ("--conf=" + i2pdConf) + ("--tunconf=" + tunnelConf) + ]); in @@ -686,7 +684,7 @@ in User = "i2pd"; WorkingDirectory = homeDir; Restart = "on-abort"; - ExecStart = "${i2pdSh}/bin/i2pd"; + ExecStart = "${cfg.package}/bin/i2pd ${i2pdFlags}"; }; }; }; diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix index 8835f7f9372d..5c1480e7e2fb 100644 --- a/nixos/modules/services/networking/iwd.nix +++ b/nixos/modules/services/networking/iwd.nix @@ -1,12 +1,21 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) + mkEnableOption mkIf mkOption types + recursiveUpdate; + cfg = config.networking.wireless.iwd; ini = pkgs.formats.ini { }; - configFile = ini.generate "main.conf" cfg.settings; -in { + defaults = { + # without UseDefaultInterface, sometimes wlan0 simply goes AWOL with NetworkManager + # https://iwd.wiki.kernel.org/interface_lifecycle#interface_management_in_iwd + General.UseDefaultInterface = with config.networking.networkmanager; (enable && (wifi.backend == "iwd")); + }; + configFile = ini.generate "main.conf" (recursiveUpdate defaults cfg.settings); + +in +{ options.networking.wireless.iwd = { enable = mkEnableOption "iwd"; @@ -38,10 +47,10 @@ in { ''; }]; - environment.etc."iwd/main.conf".source = configFile; + environment.etc."iwd/${configFile.name}".source = configFile; # for iwctl - environment.systemPackages = [ pkgs.iwd ]; + environment.systemPackages = [ pkgs.iwd ]; services.dbus.packages = [ pkgs.iwd ]; diff --git a/nixos/modules/services/networking/kresd.nix b/nixos/modules/services/networking/kresd.nix index 16011573f8bb..28b8be7a9a0d 100644 --- a/nixos/modules/services/networking/kresd.nix +++ b/nixos/modules/services/networking/kresd.nix @@ -9,7 +9,7 @@ let # On Nix level we don't attempt to precisely validate the address specifications. # The optional IPv6 scope spec comes *after* port, perhaps surprisingly. mkListen = kind: addr: let - al_v4 = builtins.match "([0-9.]+):([0-9]+)()" addr; + al_v4 = builtins.match "([0-9.]+):([0-9]+)($)" addr; al_v6 = builtins.match "\\[(.+)]:([0-9]+)(%.*|$)" addr; al_portOnly = builtins.match "([0-9]+)" addr; al = findFirst (a: a != null) diff --git a/nixos/modules/services/networking/multipath.nix b/nixos/modules/services/networking/multipath.nix index 1cc2ad1fc849..1a44184ff6dc 100644 --- a/nixos/modules/services/networking/multipath.nix +++ b/nixos/modules/services/networking/multipath.nix @@ -242,21 +242,6 @@ in { ''; }; - retain_attached_hw_handler = mkOption { - type = nullOr (enum [ "yes" "no" ]); - default = null; # real default: "yes" - description = '' - (Obsolete for kernels >= 4.3) If set to "yes" and the SCSI layer has - already attached a hardware_handler to the device, multipath will not - force the device to use the hardware_handler specified by mutipath.conf. - If the SCSI layer has not attached a hardware handler, multipath will - continue to use its configured hardware handler. - - Important Note: Linux kernel 4.3 or newer always behaves as if - "retain_attached_hw_handler yes" was set. - ''; - }; - detect_prio = mkOption { type = nullOr (enum [ "yes" "no" ]); default = null; # real default: "yes" diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index bbbe1e181bba..06ec04dbbf16 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -294,7 +294,7 @@ in systemd.services.murmur = { description = "Murmur Chat Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target "]; + after = [ "network-online.target" ]; preStart = '' ${pkgs.envsubst}/bin/envsubst \ -o /run/murmur/murmurd.ini \ @@ -306,7 +306,7 @@ in Type = if forking then "forking" else "simple"; PIDFile = mkIf forking "/run/murmur/murmurd.pid"; EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; - ExecStart = "${cfg.package}/bin/murmurd -ini /run/murmur/murmurd.ini"; + ExecStart = "${cfg.package}/bin/mumble-server -ini /run/murmur/murmurd.ini"; Restart = "always"; RuntimeDirectory = "murmur"; RuntimeDirectoryMode = "0700"; diff --git a/nixos/modules/services/networking/nbd.nix b/nixos/modules/services/networking/nbd.nix new file mode 100644 index 000000000000..87f8c41a8e5c --- /dev/null +++ b/nixos/modules/services/networking/nbd.nix @@ -0,0 +1,146 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.nbd; + configFormat = pkgs.formats.ini { }; + iniFields = with types; attrsOf (oneOf [ bool int float str ]); + serverConfig = configFormat.generate "nbd-server-config" + ({ + generic = + (cfg.server.extraOptions // { + user = "root"; + group = "root"; + port = cfg.server.listenPort; + } // (optionalAttrs (cfg.server.listenAddress != null) { + listenaddr = cfg.server.listenAddress; + })); + } + // (mapAttrs + (_: { path, allowAddresses, extraOptions }: + extraOptions // { + exportname = path; + } // (optionalAttrs (allowAddresses != null) { + authfile = pkgs.writeText "authfile" (concatStringsSep "\n" allowAddresses); + })) + cfg.server.exports) + ); + splitLists = + partition + (path: hasPrefix "/dev/" path) + (mapAttrsToList (_: { path, ... }: path) cfg.server.exports); + allowedDevices = splitLists.right; + boundPaths = splitLists.wrong; +in +{ + options = { + services.nbd = { + server = { + enable = mkEnableOption "the Network Block Device (nbd) server"; + + listenPort = mkOption { + type = types.port; + default = 10809; + description = "Port to listen on. The port is NOT automatically opened in the firewall."; + }; + + extraOptions = mkOption { + type = iniFields; + default = { + allowlist = false; + }; + description = '' + Extra options for the server. See + nbd-server + 5. + ''; + }; + + exports = mkOption { + description = "Files or block devices to make available over the network."; + default = { }; + type = with types; attrsOf + (submodule { + options = { + path = mkOption { + type = str; + description = "File or block device to export."; + example = "/dev/sdb1"; + }; + + allowAddresses = mkOption { + type = nullOr (listOf str); + default = null; + example = [ "10.10.0.0/24" "127.0.0.1" ]; + description = "IPs and subnets that are authorized to connect for this device. If not specified, the server will allow all connections."; + }; + + extraOptions = mkOption { + type = iniFields; + default = { + flush = true; + fua = true; + }; + description = '' + Extra options for this export. See + nbd-server + 5. + ''; + }; + }; + }); + }; + + listenAddress = mkOption { + type = with types; nullOr str; + description = "Address to listen on. If not specified, the server will listen on all interfaces."; + default = null; + example = "10.10.0.1"; + }; + }; + }; + }; + + config = mkIf cfg.server.enable { + boot.kernelModules = [ "nbd" ]; + + systemd.services.nbd-server = { + after = [ "network-online.target" ]; + before = [ "multi-user.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.nbd}/bin/nbd-server -C ${serverConfig}"; + Type = "forking"; + + DeviceAllow = map (path: "${path} rw") allowedDevices; + BindPaths = boundPaths; + + CapabilityBoundingSet = ""; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = false; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "noaccess"; + ProtectSystem = "strict"; + RestrictAddressFamilies = "AF_INET AF_INET6"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + UMask = "0077"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 73e63e2ee99b..7a9d9e5428a7 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -384,6 +384,17 @@ in { so you don't need to to that yourself. ''; }; + + enableFccUnlock = mkOption { + type = types.bool; + default = false; + description = '' + Enable FCC unlock procedures. Since release 1.18.4, the ModemManager daemon no longer + automatically performs the FCC unlock procedure by default. See + the docs + for more details. + ''; + }; }; }; @@ -438,7 +449,13 @@ in { "NetworkManager/VPN/nm-sstp-service.name".source = "${networkmanager-sstp}/lib/NetworkManager/VPN/nm-sstp-service.name"; + } + // optionalAttrs cfg.enableFccUnlock + { + "ModemManager/fcc-unlock.d".source = + "${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/*"; + } // optionalAttrs (cfg.appendNameservers != [] || cfg.insertNameservers != []) { "NetworkManager/dispatcher.d/02overridedns".source = overrideNameserversScript; @@ -539,6 +556,7 @@ in { boot.kernelModules = [ "ctr" ]; + security.polkit.enable = true; security.polkit.extraConfig = polkitConf; services.dbus.packages = cfg.packages diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix index eb74d373b0af..b911f97491eb 100644 --- a/nixos/modules/services/networking/nftables.nix +++ b/nixos/modules/services/networking/nftables.nix @@ -25,9 +25,10 @@ in for more information. There are other programs that use iptables internally too, such as - libvirt. + libvirt. For information on how the two firewalls interact, see [2]. [1]: https://github.com/NixOS/nixpkgs/issues/24318#issuecomment-289216273 + [2]: https://wiki.nftables.org/wiki-nftables/index.php/Troubleshooting#Question_4._How_do_nftables_and_iptables_interact_when_used_on_the_same_system.3F ''; }; networking.nftables.ruleset = mkOption { @@ -118,20 +119,11 @@ in flush ruleset include "${cfg.rulesetFile}" ''; - checkScript = pkgs.writeScript "nftables-check" '' - #! ${pkgs.runtimeShell} -e - if $(${pkgs.kmod}/bin/lsmod | grep -q ip_tables); then - echo "Unload ip_tables before using nftables!" 1>&2 - exit 1 - else - ${rulesScript} - fi - ''; in { Type = "oneshot"; RemainAfterExit = true; - ExecStart = checkScript; - ExecReload = checkScript; + ExecStart = rulesScript; + ExecReload = rulesScript; ExecStop = "${pkgs.nftables}/bin/nft flush ruleset"; }; }; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index cf6c9661dc1b..a51fc5345342 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -194,19 +194,8 @@ let zone.children ); - # fighting infinite recursion - zoneOptions = zoneOptionsRaw // childConfig zoneOptions1 true; - zoneOptions1 = zoneOptionsRaw // childConfig zoneOptions2 false; - zoneOptions2 = zoneOptionsRaw // childConfig zoneOptions3 false; - zoneOptions3 = zoneOptionsRaw // childConfig zoneOptions4 false; - zoneOptions4 = zoneOptionsRaw // childConfig zoneOptions5 false; - zoneOptions5 = zoneOptionsRaw // childConfig zoneOptions6 false; - zoneOptions6 = zoneOptionsRaw // childConfig null false; - - childConfig = x: v: { options.children = { type = types.attrsOf x; visible = v; }; }; - # options are ordered alphanumerically - zoneOptionsRaw = types.submodule { + zoneOptions = types.submodule { options = { allowAXFRFallback = mkOption { @@ -246,6 +235,13 @@ let }; children = mkOption { + # TODO: This relies on the fact that `types.anything` doesn't set any + # values of its own to any defaults, because in the above zoneConfigs', + # values from children override ones from parents, but only if the + # attributes are defined. Because of this, we can't replace the element + # type here with `zoneConfigs`, since that would set all the attributes + # to default values, breaking the parent inheriting function. + type = types.attrsOf types.anything; default = {}; description = '' Children zones inherit all options of their parents. Attributes diff --git a/nixos/modules/services/networking/ntopng.nix b/nixos/modules/services/networking/ntopng.nix index 77a004e8ab3a..022fc923edaa 100644 --- a/nixos/modules/services/networking/ntopng.nix +++ b/nixos/modules/services/networking/ntopng.nix @@ -6,7 +6,13 @@ let cfg = config.services.ntopng; opt = options.services.ntopng; - redisCfg = config.services.redis; + + createRedis = cfg.redis.createInstance != null; + redisService = + if cfg.redis.createInstance == "" then + "redis.service" + else + "redis-${cfg.redis.createInstance}.service"; configFile = if cfg.configText != "" then pkgs.writeText "ntopng.conf" '' @@ -15,8 +21,10 @@ let else pkgs.writeText "ntopng.conf" '' ${concatStringsSep " " (map (e: "--interface=" + e) cfg.interfaces)} - --http-port=${toString cfg.http-port} - --redis=localhost:${toString redisCfg.port} + --http-port=${toString cfg.httpPort} + --redis=${cfg.redis.address} + --data-dir=/var/lib/ntopng + --user=ntopng ${cfg.extraConfig} ''; @@ -24,6 +32,10 @@ in { + imports = [ + (mkRenamedOptionModule [ "services" "ntopng" "http-port" ] [ "services" "ntopng" "httpPort" ]) + ]; + options = { services.ntopng = { @@ -56,7 +68,7 @@ in ''; }; - http-port = mkOption { + httpPort = mkOption { default = 3000; type = types.int; description = '' @@ -64,6 +76,24 @@ in ''; }; + redis.address = mkOption { + type = types.str; + example = literalExpression "config.services.redis.ntopng.unixSocket"; + description = '' + Redis address - may be a Unix socket or a network host and port. + ''; + }; + + redis.createInstance = mkOption { + type = types.nullOr types.str; + default = if versionAtLeast config.system.stateVersion "22.05" then "ntopng" else ""; + description = '' + Local Redis instance name. Set to null to disable + local Redis instance. Defaults to "" for + system.stateVersion older than 22.05. + ''; + }; + configText = mkOption { default = ""; example = '' @@ -95,23 +125,36 @@ in config = mkIf cfg.enable { # ntopng uses redis for data storage - services.redis.enable = true; + services.ntopng.redis.address = + mkIf createRedis config.services.redis.servers.${cfg.redis.createInstance}.unixSocket; + + services.redis.servers = mkIf createRedis { + ${cfg.redis.createInstance} = { + enable = true; + user = mkIf (cfg.redis.createInstance == "ntopng") "ntopng"; + }; + }; # nice to have manual page and ntopng command in PATH environment.systemPackages = [ pkgs.ntopng ]; + systemd.tmpfiles.rules = [ "d /var/lib/ntopng 0700 ntopng ntopng -" ]; + systemd.services.ntopng = { description = "Ntopng Network Monitor"; - requires = [ "redis.service" ]; - after = [ "network.target" "redis.service" ]; + requires = optional createRedis redisService; + after = [ "network.target" ] ++ optional createRedis redisService; wantedBy = [ "multi-user.target" ]; - preStart = "mkdir -p /var/lib/ntopng/"; serviceConfig.ExecStart = "${pkgs.ntopng}/bin/ntopng ${configFile}"; unitConfig.Documentation = "man:ntopng(8)"; }; - # ntopng drops priveleges to user "nobody" and that user is already defined - # in users-groups.nix. + users.extraUsers.ntopng = { + group = "ntopng"; + isSystemUser = true; + }; + + users.extraGroups.ntopng = { }; }; } diff --git a/nixos/modules/services/networking/pleroma.nix b/nixos/modules/services/networking/pleroma.nix index 9b8382392c0a..c6d4c14dcb7e 100644 --- a/nixos/modules/services/networking/pleroma.nix +++ b/nixos/modules/services/networking/pleroma.nix @@ -1,6 +1,7 @@ { config, options, lib, pkgs, stdenv, ... }: let cfg = config.services.pleroma; + cookieFile = "/var/lib/pleroma/.cookie"; in { options = { services.pleroma = with lib; { @@ -8,7 +9,7 @@ in { package = mkOption { type = types.package; - default = pkgs.pleroma; + default = pkgs.pleroma.override { inherit cookieFile; }; defaultText = literalExpression "pkgs.pleroma"; description = "Pleroma package to use."; }; @@ -100,7 +101,6 @@ in { after = [ "network-online.target" "postgresql.service" ]; wantedBy = [ "multi-user.target" ]; restartTriggers = [ config.environment.etc."/pleroma/config.exs".source ]; - environment.RELEASE_COOKIE = "/var/lib/pleroma/.cookie"; serviceConfig = { User = cfg.user; Group = cfg.group; @@ -118,10 +118,10 @@ in { # Better be safe than sorry migration-wise. ExecStartPre = let preScript = pkgs.writers.writeBashBin "pleromaStartPre" '' - if [ ! -f /var/lib/pleroma/.cookie ] + if [ ! -f "${cookieFile}" ] || [ ! -s "${cookieFile}" ] then echo "Creating cookie file" - dd if=/dev/urandom bs=1 count=16 | hexdump -e '16/1 "%02x"' > /var/lib/pleroma/.cookie + dd if=/dev/urandom bs=1 count=16 | ${pkgs.hexdump}/bin/hexdump -e '16/1 "%02x"' > "${cookieFile}" fi ${cfg.package}/bin/pleroma_ctl migrate ''; diff --git a/nixos/modules/services/networking/powerdns.nix b/nixos/modules/services/networking/powerdns.nix index 8cae61b83543..b035698456c0 100644 --- a/nixos/modules/services/networking/powerdns.nix +++ b/nixos/modules/services/networking/powerdns.nix @@ -24,14 +24,14 @@ in { config = mkIf cfg.enable { - systemd.packages = [ pkgs.powerdns ]; + systemd.packages = [ pkgs.pdns ]; systemd.services.pdns = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" "mysql.service" "postgresql.service" "openldap.service" ]; serviceConfig = { - ExecStart = [ "" "${pkgs.powerdns}/bin/pdns_server --config-dir=${configDir} --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no" ]; + ExecStart = [ "" "${pkgs.pdns}/bin/pdns_server --config-dir=${configDir} --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no" ]; }; }; diff --git a/nixos/modules/services/networking/racoon.nix b/nixos/modules/services/networking/racoon.nix deleted file mode 100644 index 328f4cb1497f..000000000000 --- a/nixos/modules/services/networking/racoon.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.racoon; -in { - options.services.racoon = { - enable = mkEnableOption "racoon"; - - config = mkOption { - description = "Contents of racoon configuration file."; - default = ""; - type = types.str; - }; - - configPath = mkOption { - description = "Location of racoon config if config is not provided."; - default = "/etc/racoon/racoon.conf"; - type = types.path; - }; - }; - - config = mkIf cfg.enable { - systemd.services.racoon = { - description = "Racoon Daemon"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - ExecStart = "${pkgs.ipsecTools}/bin/racoon -f ${ - if (cfg.config != "") then pkgs.writeText "racoon.conf" cfg.config - else cfg.configPath - }"; - ExecReload = "${pkgs.ipsecTools}/bin/racoonctl reload-config"; - PIDFile = "/run/racoon.pid"; - Type = "forking"; - Restart = "always"; - }; - preStart = '' - rm /run/racoon.pid || true - mkdir -p /var/racoon - ''; - }; - }; -} diff --git a/nixos/modules/services/networking/seafile.nix b/nixos/modules/services/networking/seafile.nix index d7fb22edebed..2839ffb60a1f 100644 --- a/nixos/modules/services/networking/seafile.nix +++ b/nixos/modules/services/networking/seafile.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: with lib; let - python = pkgs.python3Packages.python; cfg = config.services.seafile; settingsFormat = pkgs.formats.ini { }; @@ -221,9 +220,7 @@ in { ''; }; - seahub = let - penv = (pkgs.python3.withPackages (ps: with ps; [ gunicorn seahub ])); - in { + seahub = { description = "Seafile Server Web Frontend"; wantedBy = [ "seafile.target" ]; partOf = [ "seafile.target" ]; @@ -231,8 +228,7 @@ in { requires = [ "seaf-server.service" ]; restartTriggers = [ seahubSettings ]; environment = { - PYTHONPATH = - "${pkgs.python3Packages.seahub}/thirdpart:${pkgs.python3Packages.seahub}:${penv}/${python.sitePackages}"; + PYTHONPATH = "${pkgs.seahub.pythonPath}:${pkgs.seahub}/thirdpart:${pkgs.seahub}"; DJANGO_SETTINGS_MODULE = "seahub.settings"; CCNET_CONF_DIR = ccnetDir; SEAFILE_CONF_DIR = dataDir; @@ -249,7 +245,7 @@ in { LogsDirectory = "seafile"; ConfigurationDirectory = "seafile"; ExecStart = '' - ${penv}/bin/gunicorn seahub.wsgi:application \ + ${pkgs.seahub.python.pkgs.gunicorn}/bin/gunicorn seahub.wsgi:application \ --name seahub \ --workers ${toString cfg.workers} \ --log-level=info \ @@ -262,27 +258,27 @@ in { preStart = '' mkdir -p ${seahubDir}/media # Link all media except avatars - for m in `find ${pkgs.python3Packages.seahub}/media/ -maxdepth 1 -not -name "avatars"`; do + for m in `find ${pkgs.seahub}/media/ -maxdepth 1 -not -name "avatars"`; do ln -sf $m ${seahubDir}/media/ done if [ ! -e "${seafRoot}/.seahubSecret" ]; then - ${penv}/bin/python ${pkgs.python3Packages.seahub}/tools/secret_key_generator.py > ${seafRoot}/.seahubSecret + ${pkgs.seahub.python}/bin/python ${pkgs.seahub}/tools/secret_key_generator.py > ${seafRoot}/.seahubSecret chmod 400 ${seafRoot}/.seahubSecret fi if [ ! -f "${seafRoot}/seahub-setup" ]; then # avatars directory should be writable - install -D -t ${seahubDir}/media/avatars/ ${pkgs.python3Packages.seahub}/media/avatars/default.png - install -D -t ${seahubDir}/media/avatars/groups ${pkgs.python3Packages.seahub}/media/avatars/groups/default.png + install -D -t ${seahubDir}/media/avatars/ ${pkgs.seahub}/media/avatars/default.png + install -D -t ${seahubDir}/media/avatars/groups ${pkgs.seahub}/media/avatars/groups/default.png # init database - ${pkgs.python3Packages.seahub}/manage.py migrate + ${pkgs.seahub}/manage.py migrate # create admin account - ${pkgs.expect}/bin/expect -c 'spawn ${pkgs.python3Packages.seahub}/manage.py createsuperuser --email=${cfg.adminEmail}; expect "Password: "; send "${cfg.initialAdminPassword}\r"; expect "Password (again): "; send "${cfg.initialAdminPassword}\r"; expect "Superuser created successfully."' - echo "${pkgs.python3Packages.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" + ${pkgs.expect}/bin/expect -c 'spawn ${pkgs.seahub}/manage.py createsuperuser --email=${cfg.adminEmail}; expect "Password: "; send "${cfg.initialAdminPassword}\r"; expect "Password (again): "; send "${cfg.initialAdminPassword}\r"; expect "Superuser created successfully."' + echo "${pkgs.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" fi - if [ $(cat "${seafRoot}/seahub-setup" | cut -d"-" -f1) != "${pkgs.python3Packages.seahub.version}" ]; then + if [ $(cat "${seafRoot}/seahub-setup" | cut -d"-" -f1) != "${pkgs.seahub.version}" ]; then # update database - ${pkgs.python3Packages.seahub}/manage.py migrate - echo "${pkgs.python3Packages.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" + ${pkgs.seahub}/manage.py migrate + echo "${pkgs.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" fi ''; }; diff --git a/nixos/modules/services/networking/snowflake-proxy.nix b/nixos/modules/services/networking/snowflake-proxy.nix new file mode 100644 index 000000000000..2124644ed9b5 --- /dev/null +++ b/nixos/modules/services/networking/snowflake-proxy.nix @@ -0,0 +1,81 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.snowflake-proxy; +in +{ + options = { + services.snowflake-proxy = { + enable = mkEnableOption "System to defeat internet censorship"; + + broker = mkOption { + description = "Broker URL (default \"https://snowflake-broker.torproject.net/\")"; + type = with types; nullOr str; + default = null; + }; + + capacity = mkOption { + description = "Limits the amount of maximum concurrent clients allowed."; + type = with types; nullOr int; + default = null; + }; + + relay = mkOption { + description = "websocket relay URL (default \"wss://snowflake.bamsoftware.com/\")"; + type = with types; nullOr str; + default = null; + }; + + stun = mkOption { + description = "STUN broker URL (default \"stun:stun.stunprotocol.org:3478\")"; + type = with types; nullOr str; + default = null; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.snowflake-proxy = { + wantedBy = [ "network-online.target" ]; + serviceConfig = { + ExecStart = + "${pkgs.snowflake}/bin/proxy " + concatStringsSep " " ( + optional (cfg.broker != null) "-broker ${cfg.broker}" + ++ optional (cfg.capacity != null) "-capacity ${builtins.toString cfg.capacity}" + ++ optional (cfg.relay != null) "-relay ${cfg.relay}" + ++ optional (cfg.stun != null) "-stun ${cfg.stun}" + ); + + # Security Hardening + # Refer to systemd.exec(5) for option descriptions. + CapabilityBoundingSet = ""; + + # implies RemoveIPC=, PrivateTmp=, NoNewPrivileges=, RestrictSUIDSGID=, + # ProtectSystem=strict, ProtectHome=read-only + DynamicUser = true; + LockPersonality = true; + PrivateDevices = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectProc = "invisible"; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = "~@clock @cpu-emulation @debug @mount @obsolete @reboot @swap @privileged @resources"; + UMask = "0077"; + }; + }; + }; + + meta.maintainers = with maintainers; [ yayayayaka ]; +} diff --git a/nixos/modules/services/networking/squid.nix b/nixos/modules/services/networking/squid.nix index 9d063b92aa1e..db4f0d26b6f4 100644 --- a/nixos/modules/services/networking/squid.nix +++ b/nixos/modules/services/networking/squid.nix @@ -81,7 +81,9 @@ let http_access deny all # Squid normally listens to port 3128 - http_port ${toString cfg.proxyPort} + http_port ${ + optionalString (cfg.proxyAddress != null) "${cfg.proxyAddress}:" + }${toString cfg.proxyPort} # Leave coredumps in the first cache dir coredump_dir /var/cache/squid @@ -109,6 +111,19 @@ in description = "Whether to run squid web proxy."; }; + package = mkOption { + default = pkgs.squid; + defaultText = literalExpression "pkgs.squid"; + type = types.package; + description = "Squid package to use."; + }; + + proxyAddress = mkOption { + type = types.nullOr types.str; + default = null; + description = "IP address on which squid will listen."; + }; + proxyPort = mkOption { type = types.int; default = 3128; @@ -149,17 +164,21 @@ in users.groups.squid = {}; systemd.services.squid = { - description = "Squid caching web proxy"; + description = "Squid caching proxy"; + documentation = [ "man:squid(8)" ]; after = [ "network.target" "nss-lookup.target" ]; wantedBy = [ "multi-user.target"]; preStart = '' mkdir -p "/var/log/squid" chown squid:squid "/var/log/squid" + ${cfg.package}/bin/squid --foreground -z -f ${squidConfig} ''; serviceConfig = { - Type="forking"; PIDFile="/run/squid.pid"; - ExecStart = "${pkgs.squid}/bin/squid -YCs -f ${squidConfig}"; + ExecStart = "${cfg.package}/bin/squid --foreground -YCs -f ${squidConfig}"; + ExecReload="kill -HUP $MAINPID"; + KillMode="mixed"; + NotifyAccess="all"; }; }; diff --git a/nixos/modules/services/networking/syncplay.nix b/nixos/modules/services/networking/syncplay.nix index 27a16fb2e29f..b6faf2d3f772 100644 --- a/nixos/modules/services/networking/syncplay.nix +++ b/nixos/modules/services/networking/syncplay.nix @@ -68,7 +68,7 @@ in systemd.services.syncplay = { description = "Syncplay Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target "]; + after = [ "network-online.target" ]; serviceConfig = { ExecStart = "${pkgs.syncplay}/bin/syncplay-server ${escapeShellArgs cmdArgs}"; diff --git a/nixos/modules/services/networking/tetrd.nix b/nixos/modules/services/networking/tetrd.nix index ead73c497764..0801ce129246 100644 --- a/nixos/modules/services/networking/tetrd.nix +++ b/nixos/modules/services/networking/tetrd.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, ... }: { - options.services.tetrd.enable = lib.mkEnableOption pkgs.tetrd.meta.description; + options.services.tetrd.enable = lib.mkEnableOption "tetrd"; config = lib.mkIf config.services.tetrd.enable { environment = { diff --git a/nixos/modules/services/networking/tox-node.nix b/nixos/modules/services/networking/tox-node.nix index c24e7fd12850..c6e5c2d6e819 100644 --- a/nixos/modules/services/networking/tox-node.nix +++ b/nixos/modules/services/networking/tox-node.nix @@ -8,12 +8,7 @@ let homeDir = "/var/lib/tox-node"; configFile = let - # fetchurl should be switched to getting this file from tox-node.src once - # the dpkg directory is in a release - src = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/tox-rs/tox-node/master/dpkg/config.yml"; - sha256 = "1431wzpzm786mcvyzk1rp7ar418n45dr75hdggxvlm7pkpam31xa"; - }; + src = "${pkg.src}/dpkg/config.yml"; confJSON = pkgs.writeText "config.json" ( builtins.toJSON { log-type = cfg.logType; diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index f6e963490924..87873c8c1e83 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -62,6 +62,7 @@ in { }; stateDir = mkOption { + type = types.path; default = "/var/lib/unbound"; description = "Directory holding all state for unbound to run."; }; diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 710c2d9ca17b..d205302051e1 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -153,6 +153,7 @@ in userlist = mkOption { default = []; + type = types.listOf types.str; description = "See ."; }; diff --git a/nixos/modules/services/networking/wg-netmanager.nix b/nixos/modules/services/networking/wg-netmanager.nix new file mode 100644 index 000000000000..493ff7ceba9f --- /dev/null +++ b/nixos/modules/services/networking/wg-netmanager.nix @@ -0,0 +1,42 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.wg-netmanager; +in +{ + + options = { + services.wg-netmanager = { + enable = mkEnableOption "Wireguard network manager"; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + # NOTE: wg-netmanager runs as root + systemd.services.wg-netmanager = { + description = "Wireguard network manager"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + path = with pkgs; [ wireguard-tools iproute2 wireguard-go ]; + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + ExecStart = "${pkgs.wg-netmanager}/bin/wg_netmanager"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStop = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + + ReadWritePaths = [ + "/tmp" # wg-netmanager creates files in /tmp before deleting them after use + ]; + }; + unitConfig = { + ConditionPathExists = ["/etc/wg_netmanager/network.yaml" "/etc/wg_netmanager/peer.yaml"]; + }; + }; + }; + + meta.maintainers = with maintainers; [ gin66 ]; +} diff --git a/nixos/modules/services/networking/wg-quick.nix b/nixos/modules/services/networking/wg-quick.nix index 414775fc3577..61e9fe5096b1 100644 --- a/nixos/modules/services/networking/wg-quick.nix +++ b/nixos/modules/services/networking/wg-quick.nix @@ -17,6 +17,13 @@ let description = "The IP addresses of the interface."; }; + autostart = mkOption { + description = "Whether to bring up this interface automatically during boot."; + default = true; + example = false; + type = types.bool; + }; + dns = mkOption { example = [ "192.168.2.2" ]; default = []; @@ -247,7 +254,7 @@ let description = "wg-quick WireGuard Tunnel - ${name}"; requires = [ "network-online.target" ]; after = [ "network.target" "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; + wantedBy = optional values.autostart "multi-user.target"; environment.DEVICE = name; path = [ pkgs.kmod pkgs.wireguard-tools ]; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 07dec8ea7181..c2e1d37e28bf 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -10,14 +10,45 @@ let cfg = config.networking.wireless; opt = options.networking.wireless; + wpa3Protocols = [ "SAE" "FT-SAE" ]; + hasMixedWPA = opts: + let + hasWPA3 = !mutuallyExclusive opts.authProtocols wpa3Protocols; + others = subtractLists wpa3Protocols opts.authProtocols; + in hasWPA3 && others != []; + + # Gives a WPA3 network higher priority + increaseWPA3Priority = opts: + opts // optionalAttrs (hasMixedWPA opts) + { priority = if opts.priority == null + then 1 + else opts.priority + 1; + }; + + # Creates a WPA2 fallback network + mkWPA2Fallback = opts: + opts // { authProtocols = subtractLists wpa3Protocols opts.authProtocols; }; + + # Networks attrset as a list + networkList = mapAttrsToList (ssid: opts: opts // { inherit ssid; }) + cfg.networks; + + # List of all networks (normal + generated fallbacks) + allNetworks = + if cfg.fallbackToWPA2 + then map increaseWPA3Priority networkList + ++ map mkWPA2Fallback (filter hasMixedWPA networkList) + else networkList; + # Content of wpa_supplicant.conf generatedConfig = concatStringsSep "\n" ( - (mapAttrsToList mkNetwork cfg.networks) + (map mkNetwork allNetworks) ++ optional cfg.userControlled.enable (concatStringsSep "\n" [ "ctrl_interface=/run/wpa_supplicant" "ctrl_interface_group=${cfg.userControlled.group}" "update_config=1" ]) + ++ [ "pmf=1" ] ++ optional cfg.scanOnLowSignal ''bgscan="simple:30:-70:3600"'' ++ optional (cfg.extraConfig != "") cfg.extraConfig); @@ -33,7 +64,7 @@ let finalConfig = ''"$RUNTIME_DIRECTORY"/wpa_supplicant.conf''; # Creates a network block for wpa_supplicant.conf - mkNetwork = ssid: opts: + mkNetwork = opts: let quote = x: ''"${x}"''; indent = x: " " + x; @@ -43,7 +74,7 @@ let else opts.pskRaw; options = [ - "ssid=${quote ssid}" + "ssid=${quote opts.ssid}" (if pskString != null || opts.auth != null then "key_mgmt=${concatStringsSep " " opts.authProtocols}" else "key_mgmt=NONE") @@ -175,6 +206,18 @@ in { ''; }; + fallbackToWPA2 = mkOption { + type = types.bool; + default = true; + description = '' + Whether to fall back to WPA2 authentication protocols if WPA3 failed. + This allows old wireless cards (that lack recent features required by + WPA3) to connect to mixed WPA2/WPA3 access points. + + To avoid possible downgrade attacks, disable this options. + ''; + }; + environmentFile = mkOption { type = types.nullOr types.path; default = null; diff --git a/nixos/modules/services/networking/yggdrasil.xml b/nixos/modules/services/networking/yggdrasil.xml index c012cd4a9294..a341d5d8153b 100644 --- a/nixos/modules/services/networking/yggdrasil.xml +++ b/nixos/modules/services/networking/yggdrasil.xml @@ -84,7 +84,6 @@ in { interface eth0 { AdvSendAdvert on; - AdvDefaultLifetime 0; prefix ${prefix}::/64 { AdvOnLink on; AdvAutonomous on; diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 98c35a7ec84b..041d0b3c43fd 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -143,6 +143,17 @@ in example = lib.literalExpression "[ pkgs.elasticsearchPlugins.discovery-ec2 ]"; }; + restartIfChanged = mkOption { + type = types.bool; + description = '' + Automatically restart the service on config change. + This can be set to false to defer restarts on a server or cluster. + Please consider the security implications of inadvertently running an older version, + and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option. + ''; + default = true; + }; + }; ###### implementation @@ -153,6 +164,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = [ pkgs.inetutils ]; + inherit (cfg) restartIfChanged; environment = { ES_HOME = cfg.dataDir; ES_JAVA_OPTS = toString cfg.extraJavaOptions; @@ -163,6 +175,8 @@ in User = "elasticsearch"; PermissionsStartOnly = true; LimitNOFILE = "1024000"; + Restart = "always"; + TimeoutStartSec = "infinity"; }; preStart = '' ${optionalString (!config.boot.isContainer) '' diff --git a/nixos/modules/services/security/cfssl.nix b/nixos/modules/services/security/cfssl.nix index e5bed0a9987c..6df2343b84d2 100644 --- a/nixos/modules/services/security/cfssl.nix +++ b/nixos/modules/services/security/cfssl.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, options, lib, pkgs, ... }: with lib; @@ -11,7 +11,16 @@ in { dataDir = mkOption { default = "/var/lib/cfssl"; type = types.path; - description = "Cfssl work directory."; + description = '' + The work directory for CFSSL. + + + If left as the default value this directory will automatically be + created before the CFSSL server starts, otherwise you are + responsible for ensuring the directory exists with appropriate + ownership and permissions. + + ''; }; address = mkOption { @@ -22,7 +31,7 @@ in { port = mkOption { default = 8888; - type = types.ints.u16; + type = types.port; description = "Port to bind."; }; @@ -147,13 +156,12 @@ in { }; config = mkIf cfg.enable { - users.extraGroups.cfssl = { + users.groups.cfssl = { gid = config.ids.gids.cfssl; }; - users.extraUsers.cfssl = { + users.users.cfssl = { description = "cfssl user"; - createHome = true; home = cfg.dataDir; group = "cfssl"; uid = config.ids.uids.cfssl; @@ -164,41 +172,46 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - serviceConfig = { - WorkingDirectory = cfg.dataDir; - StateDirectory = cfg.dataDir; - StateDirectoryMode = 700; - Restart = "always"; - User = "cfssl"; + serviceConfig = lib.mkMerge [ + { + WorkingDirectory = cfg.dataDir; + Restart = "always"; + User = "cfssl"; + Group = "cfssl"; - ExecStart = with cfg; let - opt = n: v: optionalString (v != null) ''-${n}="${v}"''; - in - lib.concatStringsSep " \\\n" [ - "${pkgs.cfssl}/bin/cfssl serve" - (opt "address" address) - (opt "port" (toString port)) - (opt "ca" ca) - (opt "ca-key" caKey) - (opt "ca-bundle" caBundle) - (opt "int-bundle" intBundle) - (opt "int-dir" intDir) - (opt "metadata" metadata) - (opt "remote" remote) - (opt "config" configFile) - (opt "responder" responder) - (opt "responder-key" responderKey) - (opt "tls-key" tlsKey) - (opt "tls-cert" tlsCert) - (opt "mutual-tls-ca" mutualTlsCa) - (opt "mutual-tls-cn" mutualTlsCn) - (opt "mutual-tls-client-key" mutualTlsClientKey) - (opt "mutual-tls-client-cert" mutualTlsClientCert) - (opt "tls-remote-ca" tlsRemoteCa) - (opt "db-config" dbConfig) - (opt "loglevel" (toString logLevel)) - ]; - }; + ExecStart = with cfg; let + opt = n: v: optionalString (v != null) ''-${n}="${v}"''; + in + lib.concatStringsSep " \\\n" [ + "${pkgs.cfssl}/bin/cfssl serve" + (opt "address" address) + (opt "port" (toString port)) + (opt "ca" ca) + (opt "ca-key" caKey) + (opt "ca-bundle" caBundle) + (opt "int-bundle" intBundle) + (opt "int-dir" intDir) + (opt "metadata" metadata) + (opt "remote" remote) + (opt "config" configFile) + (opt "responder" responder) + (opt "responder-key" responderKey) + (opt "tls-key" tlsKey) + (opt "tls-cert" tlsCert) + (opt "mutual-tls-ca" mutualTlsCa) + (opt "mutual-tls-cn" mutualTlsCn) + (opt "mutual-tls-client-key" mutualTlsClientKey) + (opt "mutual-tls-client-cert" mutualTlsClientCert) + (opt "tls-remote-ca" tlsRemoteCa) + (opt "db-config" dbConfig) + (opt "loglevel" (toString logLevel)) + ]; + } + (mkIf (cfg.dataDir == options.services.cfssl.dataDir.default) { + StateDirectory = baseNameOf cfg.dataDir; + StateDirectoryMode = 700; + }) + ]; }; services.cfssl = { diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 340cbbf02fb4..95a0ad8770e2 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -9,7 +9,7 @@ let pkg = pkgs.clamav; toKeyValue = generators.toKeyValue { - mkKeyValue = generators.mkKeyValueDefault {} " "; + mkKeyValue = generators.mkKeyValueDefault { } " "; listsAsDuplicateKeys = true; }; @@ -30,7 +30,7 @@ in settings = mkOption { type = with types; attrsOf (oneOf [ bool int str (listOf str) ]); - default = {}; + default = { }; description = '' ClamAV configuration. Refer to , for details on supported values. @@ -59,7 +59,7 @@ in settings = mkOption { type = with types; attrsOf (oneOf [ bool int str (listOf str) ]); - default = {}; + default = { }; description = '' freshclam configuration. Refer to , for details on supported values. @@ -104,7 +104,6 @@ in systemd.services.clamav-daemon = mkIf cfg.daemon.enable { description = "ClamAV daemon (clamd)"; after = optional cfg.updater.enable "clamav-freshclam.service"; - requires = optional cfg.updater.enable "clamav-freshclam.service"; wantedBy = [ "multi-user.target" ]; restartTriggers = [ clamdConfigFile ]; @@ -134,7 +133,7 @@ in systemd.services.clamav-freshclam = mkIf cfg.updater.enable { description = "ClamAV virus database updater (freshclam)"; restartTriggers = [ freshclamConfigFile ]; - + after = [ "network-online.target" ]; preStart = '' mkdir -m 0755 -p ${stateDir} chown ${clamavUser}:${clamavGroup} ${stateDir} diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix deleted file mode 100644 index df60d553e85b..000000000000 --- a/nixos/modules/services/security/fprot.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ config, lib, pkgs, ... }: -with lib; -let - fprotUser = "fprot"; - stateDir = "/var/lib/fprot"; - fprotGroup = fprotUser; - cfg = config.services.fprot; -in { - options = { - - services.fprot = { - updater = { - enable = mkEnableOption "automatic F-Prot virus definitions database updates"; - - productData = mkOption { - description = '' - product.data file. Defaults to the one supplied with installation package. - ''; - type = types.path; - }; - - frequency = mkOption { - default = 30; - type = types.int; - description = '' - Update virus definitions every X minutes. - ''; - }; - - licenseKeyfile = mkOption { - type = types.path; - description = '' - License keyfile. Defaults to the one supplied with installation package. - ''; - }; - - }; - }; - }; - - ###### implementation - - config = mkIf cfg.updater.enable { - - services.fprot.updater.productData = mkDefault "${pkgs.fprot}/opt/f-prot/product.data"; - services.fprot.updater.licenseKeyfile = mkDefault "${pkgs.fprot}/opt/f-prot/license.key"; - - environment.systemPackages = [ pkgs.fprot ]; - environment.etc."f-prot.conf" = { - source = "${pkgs.fprot}/opt/f-prot/f-prot.conf"; - }; - - users.users.${fprotUser} = - { uid = config.ids.uids.fprot; - description = "F-Prot daemon user"; - home = stateDir; - }; - - users.groups.${fprotGroup} = - { gid = config.ids.gids.fprot; }; - - services.cron.systemCronJobs = [ "*/${toString cfg.updater.frequency} * * * * root start fprot-updater" ]; - - systemd.services.fprot-updater = { - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = false; - }; - wantedBy = [ "multi-user.target" ]; - - # have to copy fpupdate executable because it insists on storing the virus database in the same dir - preStart = '' - mkdir -m 0755 -p ${stateDir} - chown ${fprotUser}:${fprotGroup} ${stateDir} - cp ${pkgs.fprot}/opt/f-prot/fpupdate ${stateDir} - ln -sf ${cfg.updater.productData} ${stateDir}/product.data - ''; - - script = "/var/lib/fprot/fpupdate --keyfile ${cfg.updater.licenseKeyfile}"; - }; - }; -} diff --git a/nixos/modules/services/security/haveged.nix b/nixos/modules/services/security/haveged.nix index 22ece1883446..57cef7e44d50 100644 --- a/nixos/modules/services/security/haveged.nix +++ b/nixos/modules/services/security/haveged.nix @@ -3,12 +3,10 @@ with lib; let - cfg = config.services.haveged; in - { ###### interface @@ -17,14 +15,11 @@ in services.haveged = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable to haveged entropy daemon, which refills - /dev/random when low. - ''; - }; + enable = mkEnableOption '' + haveged entropy daemon, which refills /dev/random when low. + NOTE: does nothing on kernels newer than 5.6. + ''; + # source for the note https://github.com/jirka-h/haveged/issues/57 refill_threshold = mkOption { type = types.int; @@ -39,29 +34,44 @@ in }; - - ###### implementation - config = mkIf cfg.enable { - systemd.services.haveged = - { description = "Entropy Harvesting Daemon"; - unitConfig.Documentation = "man:haveged(8)"; - wantedBy = [ "multi-user.target" ]; + # https://github.com/jirka-h/haveged/blob/a4b69d65a8dfc5a9f52ff8505c7f58dcf8b9234f/contrib/Fedora/haveged.service + systemd.services.haveged = { + description = "Entropy Daemon based on the HAVEGE algorithm"; + unitConfig = { + Documentation = "man:haveged(8)"; + DefaultDependencies = false; + ConditionKernelVersion = "<5.6"; + }; + wantedBy = [ "sysinit.target" ]; + after = [ "systemd-tmpfiles-setup-dev.service" ]; + before = [ "sysinit.target" "shutdown.target" "systemd-journald.service" ]; - path = [ pkgs.haveged ]; - - serviceConfig = { - ExecStart = "${pkgs.haveged}/bin/haveged -F -w ${toString cfg.refill_threshold} -v 1"; - SuccessExitStatus = 143; - PrivateTmp = true; - PrivateDevices = true; - PrivateNetwork = true; - ProtectSystem = "full"; - ProtectHome = true; - }; + serviceConfig = { + ExecStart = "${pkgs.haveged}/bin/haveged -w ${toString cfg.refill_threshold} --Foreground -v 1"; + Restart = "always"; + SuccessExitStatus = "137 143"; + SecureBits = "noroot-locked"; + CapabilityBoundingSet = [ "CAP_SYS_ADMIN" "CAP_SYS_CHROOT" ]; + # We can *not* set PrivateTmp=true as it can cause an ordering cycle. + PrivateTmp = false; + PrivateDevices = true; + ProtectSystem = "full"; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + RestrictNamespaces = true; + RestrictRealtime = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "newuname" "~@mount" ]; + SystemCallErrorNumber = "EPERM"; }; + }; }; } diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 4d3562424170..ce295bd4ba3b 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -102,17 +102,19 @@ in # Taken from: https://github.com/oauth2-proxy/oauth2-proxy/blob/master/providers/providers.go provider = mkOption { type = types.enum [ - "google" + "adfs" "azure" + "bitbucket" + "digitalocean" "facebook" "github" - "keycloak" "gitlab" + "google" + "keycloak" + "keycloak-oidc" "linkedin" "login.gov" - "bitbucket" "nextcloud" - "digitalocean" "oidc" ]; default = "google"; diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix index 919346cf2bb1..f9b4985e1991 100644 --- a/nixos/modules/services/security/opensnitch.nix +++ b/nixos/modules/services/security/opensnitch.nix @@ -3,22 +3,123 @@ with lib; let - name = "opensnitch"; cfg = config.services.opensnitch; + format = pkgs.formats.json {}; in { options = { services.opensnitch = { enable = mkEnableOption "Opensnitch application firewall"; + settings = mkOption { + type = types.submodule { + freeformType = format.type; + + options = { + Server = { + + Address = mkOption { + type = types.str; + description = '' + Unix socket path (unix:///tmp/osui.sock, the "unix:///" part is + mandatory) or TCP socket (192.168.1.100:50051). + ''; + }; + + LogFile = mkOption { + type = types.path; + description = '' + File to write logs to (use /dev/stdout to write logs to standard + output). + ''; + }; + + }; + + DefaultAction = mkOption { + type = types.enum [ "allow" "deny" ]; + description = '' + Default action whether to block or allow application internet + access. + ''; + }; + + DefaultDuration = mkOption { + type = types.enum [ + "once" "always" "until restart" "30s" "5m" "15m" "30m" "1h" + ]; + description = '' + Default duration of firewall rule. + ''; + }; + + InterceptUnknown = mkOption { + type = types.bool; + description = '' + Wheter to intercept spare connections. + ''; + }; + + ProcMonitorMethod = mkOption { + type = types.enum [ "ebpf" "proc" "ftrace" "audit" ]; + description = '' + Which process monitoring method to use. + ''; + }; + + LogLevel = mkOption { + type = types.enum [ 0 1 2 3 4 ]; + description = '' + Default log level from 0 to 4 (debug, info, important, warning, + error). + ''; + }; + + Firewall = mkOption { + type = types.enum [ "iptables" "nftables" ]; + description = '' + Which firewall backend to use. + ''; + }; + + Stats = { + + MaxEvents = mkOption { + type = types.int; + description = '' + Max events to send to the GUI. + ''; + }; + + MaxStats = mkOption { + type = types.int; + description = '' + Max stats per item to keep in backlog. + ''; + }; + + }; + }; + }; + description = '' + opensnitchd configuration. Refer to + + for details on supported values. + ''; + }; }; }; config = mkIf cfg.enable { + # pkg.opensnitch is referred to elsewhere in the module so we don't need to worry about it being garbage collected + services.opensnitch.settings = mapAttrs (_: v: mkDefault v) (builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile "${pkgs.opensnitch}/etc/default-config.json"))); + systemd = { packages = [ pkgs.opensnitch ]; services.opensnitchd.wantedBy = [ "multi-user.target" ]; }; + environment.etc."opensnitchd/default-config.json".source = format.generate "default-config.json" cfg.settings; + }; } diff --git a/nixos/modules/services/security/sslmate-agent.nix b/nixos/modules/services/security/sslmate-agent.nix new file mode 100644 index 000000000000..c850eb22a031 --- /dev/null +++ b/nixos/modules/services/security/sslmate-agent.nix @@ -0,0 +1,32 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.sslmate-agent; + +in { + meta.maintainers = with maintainers; [ wolfangaukang ]; + + options = { + services.sslmate-agent = { + enable = mkEnableOption "sslmate-agent, a daemon for managing SSL/TLS certificates on a server"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ sslmate-agent ]; + + systemd = { + packages = [ pkgs.sslmate-agent ]; + services.sslmate-agent = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ConfigurationDirectory = "sslmate-agent"; + LogsDirectory = "sslmate-agent"; + StateDirectory = "sslmate-agent"; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/security/step-ca.nix b/nixos/modules/services/security/step-ca.nix index 27b2ceed1a43..95183078d7b6 100644 --- a/nixos/modules/services/security/step-ca.nix +++ b/nixos/modules/services/security/step-ca.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, nixosTests, ... }: +{ config, lib, pkgs, ... }: let cfg = config.services.step-ca; settingsFormat = (pkgs.formats.json { }); @@ -82,8 +82,6 @@ in }); in { - passthru.tests.step-ca = nixosTests.step-ca; - assertions = [ { @@ -108,6 +106,9 @@ in ConditionFileNotEmpty = ""; # override upstream }; serviceConfig = { + User = "step-ca"; + Group = "step-ca"; + UMask = "0077"; Environment = "HOME=%S/step-ca"; WorkingDirectory = ""; # override upstream ReadWriteDirectories = ""; # override upstream @@ -129,6 +130,14 @@ in }; }; + users.users.step-ca = { + home = "/var/lib/step-ca"; + group = "step-ca"; + isSystemUser = true; + }; + + users.groups.step-ca = {}; + networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; }; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index cafb44e12429..a5822c02794d 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -910,6 +910,11 @@ in ORPort = mkForce []; PublishServerDescriptor = mkForce false; }) + (mkIf (!cfg.client.enable) { + # Make sure application connections via SOCKS are disabled + # when services.tor.client.enable is false + SOCKSPort = mkForce [ 0 ]; + }) (mkIf cfg.client.enable ( { SOCKSPort = [ cfg.client.socksListenAddress ]; } // optionalAttrs cfg.client.transparentProxy.enable { @@ -962,7 +967,7 @@ in '') onion.authorizedClients ++ optional (onion.secretKey != null) '' install -d -o tor -g tor -m 0700 ${escapeShellArg onion.path} - key="$(cut -f1 -d: ${escapeShellArg onion.secretKey})" + key="$(cut -f1 -d: ${escapeShellArg onion.secretKey} | head -1)" case "$key" in ("== ed25519v"*"-secret") install -o tor -g tor -m 0400 ${escapeShellArg onion.secretKey} ${escapeShellArg onion.path}/hs_ed25519_secret_key;; @@ -1008,7 +1013,11 @@ in #InaccessiblePaths = [ "-+${runDir}/root" ]; UMask = "0066"; BindPaths = [ stateDir ]; - BindReadOnlyPaths = [ storeDir "/etc" ]; + BindReadOnlyPaths = [ storeDir "/etc" ] ++ + optionals config.services.resolved.enable [ + "/run/systemd/resolve/stub-resolv.conf" + "/run/systemd/resolve/resolv.conf" + ]; AmbientCapabilities = [""] ++ lib.optional bindsPrivilegedPort "CAP_NET_BIND_SERVICE"; CapabilityBoundingSet = [""] ++ lib.optional bindsPrivilegedPort "CAP_NET_BIND_SERVICE"; # ProtectClock= adds DeviceAllow=char-rtc r diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index 71088fc4dcd8..8277f493639c 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -131,7 +131,7 @@ in { users.groups.vaultwarden = { }; systemd.services.vaultwarden = { - aliases = [ "bitwarden_rs" ]; + aliases = [ "bitwarden_rs.service" ]; after = [ "network.target" ]; path = with pkgs; [ openssl ]; serviceConfig = { @@ -151,7 +151,7 @@ in { }; systemd.services.backup-vaultwarden = mkIf (cfg.backupDir != null) { - aliases = [ "backup-bitwarden_rs" ]; + aliases = [ "backup-bitwarden_rs.service" ]; description = "Backup vaultwarden"; environment = { DATA_FOLDER = "/var/lib/bitwarden_rs"; @@ -169,7 +169,7 @@ in { }; systemd.timers.backup-vaultwarden = mkIf (cfg.backupDir != null) { - aliases = [ "backup-bitwarden_rs" ]; + aliases = [ "backup-bitwarden_rs.service" ]; description = "Backup vaultwarden on time"; timerConfig = { OnCalendar = mkDefault "23:00"; diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index eb82b738e492..8c6a6e294ebb 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -52,11 +52,22 @@ in ''; }; + network.enable = mkOption { + type = types.bool; + default = false; + description = '' + Allow the cloud-init service to configure network interfaces + through systemd-networkd. + ''; + }; + config = mkOption { type = types.str; default = '' system_info: distro: nixos + network: + renderers: [ 'networkd' ] users: - root @@ -109,9 +120,12 @@ in environment.etc."cloud/cloud.cfg".text = cfg.config; + systemd.network.enable = cfg.network.enable; + systemd.services.cloud-init-local = { description = "Initial cloud-init job (pre-networking)"; wantedBy = [ "multi-user.target" ]; + before = ["systemd-networkd.service"]; path = path; serviceConfig = { Type = "oneshot"; @@ -129,7 +143,7 @@ in "sshd.service" "sshd-keygen.service" ]; after = [ "network-online.target" "cloud-init-local.service" ]; before = [ "sshd.service" "sshd-keygen.service" ]; - requires = [ "network.target "]; + requires = [ "network.target"]; path = path; serviceConfig = { Type = "oneshot"; diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix index 452efc736439..629358559890 100644 --- a/nixos/modules/services/system/earlyoom.nix +++ b/nixos/modules/services/system/earlyoom.nix @@ -1,124 +1,160 @@ { config, lib, pkgs, ... }: -with lib; - let - ecfg = config.services.earlyoom; + cfg = config.services.earlyoom; + + inherit (lib) + mkDefault mkEnableOption mkIf mkOption types + mkRemovedOptionModule literalExpression + escapeShellArg concatStringsSep optional optionalString; + in { - options = { - services.earlyoom = { + options.services.earlyoom = { + enable = mkEnableOption "Early out of memory killing"; - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable early out of memory killing. - ''; - }; + freeMemThreshold = mkOption { + type = types.ints.between 1 100; + default = 10; + description = '' + Minimum available memory (in percent). - freeMemThreshold = mkOption { - type = types.int; - default = 10; - description = '' - Minimum of availabe memory (in percent). - If the free memory falls below this threshold and the analog is true for - - the killing begins. - ''; - }; + If the available memory falls below this threshold (and the analog is true for + ) the killing begins. + SIGTERM is sent first to the process that uses the most memory; then, if the available + memory falls below (and the analog is true for + ), SIGKILL is sent. - freeSwapThreshold = mkOption { - type = types.int; - default = 10; - description = '' - Minimum of availabe swap space (in percent). - If the available swap space falls below this threshold and the analog - is true for - the killing begins. - ''; - }; + See README for details. + ''; + }; - useKernelOOMKiller= mkOption { - type = types.bool; - default = false; - description = '' - Use kernel OOM killer instead of own user-space implementation. - ''; - }; + freeMemKillThreshold = mkOption { + type = types.nullOr (types.ints.between 1 100); + default = null; + description = '' + Minimum available memory (in percent) before sending SIGKILL. + If unset, this defaults to half of . - ignoreOOMScoreAdjust = mkOption { - type = types.bool; - default = false; - description = '' - Ignore oom_score_adjust values of processes. - User-space implementation only. - ''; - }; + See the description of . + ''; + }; - enableDebugInfo = mkOption { - type = types.bool; - default = false; - description = '' - Enable debugging messages. - ''; - }; + freeSwapThreshold = mkOption { + type = types.ints.between 1 100; + default = 10; + description = '' + Minimum free swap space (in percent) before sending SIGTERM. - notificationsCommand = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - This option is deprecated and ignored by earlyoom since 1.6. - Use instead. - ''; - }; + See the description of . + ''; + }; - enableNotifications = mkOption { - type = types.bool; - default = false; - description = '' - Send notifications about killed processes via the system d-bus. - To actually see the notifications in your GUI session, you need to have - systembus-notify running as your user. + freeSwapKillThreshold = mkOption { + type = types.nullOr (types.ints.between 1 100); + default = null; + description = '' + Minimum free swap space (in percent) before sending SIGKILL. + If unset, this defaults to half of . - See README for details. - ''; - }; + See the description of . + ''; + }; + + enableDebugInfo = mkOption { + type = types.bool; + default = false; + description = '' + Enable debugging messages. + ''; + }; + + enableNotifications = mkOption { + type = types.bool; + default = false; + description = '' + Send notifications about killed processes via the system d-bus. + + 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. + + To actually see the notifications in your GUI session, you need to have + systembus-notify running as your user, which this + option handles by enabling . + + See README for details. + ''; + }; + + killHook = mkOption { + type = types.nullOr types.path; + default = null; + example = literalExpression '' + pkgs.writeShellScript "earlyoom-kill-hook" ''' + echo "Process $EARLYOOM_NAME ($EARLYOOM_PID) was killed" >> /path/to/log + ''' + ''; + description = '' + An absolute path to an executable to be run for each process killed. + Some environment variables are available, see + README and + the man page + for details. + ''; + }; + + reportInterval = mkOption { + type = types.int; + default = 3600; + example = 0; + description = "Interval (in seconds) at which a memory report is printed (set to 0 to disable)."; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = []; + example = [ "-g" "--prefer '(^|/)(java|chromium)$'" ]; + description = "Extra command-line arguments to be passed to earlyoom."; }; }; - config = mkIf ecfg.enable { - assertions = [ - { assertion = ecfg.freeMemThreshold > 0 && ecfg.freeMemThreshold <= 100; - message = "Needs to be a positive percentage"; } - { assertion = ecfg.freeSwapThreshold > 0 && ecfg.freeSwapThreshold <= 100; - message = "Needs to be a positive percentage"; } - { assertion = !ecfg.useKernelOOMKiller || !ecfg.ignoreOOMScoreAdjust; - message = "Both options in conjunction do not make sense"; } - ]; + imports = [ + (mkRemovedOptionModule [ "services" "earlyoom" "useKernelOOMKiller" ] '' + This option is deprecated and ignored by earlyoom since 1.2. + '') + (mkRemovedOptionModule [ "services" "earlyoom" "notificationsCommand" ] '' + This option was removed in earlyoom 1.6, but was reimplemented in 1.7 + and is available as the new option `services.earlyoom.killHook`. + '') + (mkRemovedOptionModule [ "services" "earlyoom" "ignoreOOMScoreAdjust" ] '' + This option is deprecated and ignored by earlyoom since 1.7. + '') + ]; - warnings = optional (ecfg.notificationsCommand != null) - "`services.earlyoom.notificationsCommand` is deprecated and ignored by earlyoom since 1.6."; + config = mkIf cfg.enable { + services.systembus-notify.enable = mkDefault cfg.enableNotifications; systemd.services.earlyoom = { description = "Early OOM Daemon for Linux"; wantedBy = [ "multi-user.target" ]; - path = optional ecfg.enableNotifications pkgs.dbus; + path = optional cfg.enableNotifications pkgs.dbus; serviceConfig = { - StandardOutput = "null"; StandardError = "journal"; - ExecStart = '' - ${pkgs.earlyoom}/bin/earlyoom \ - -m ${toString ecfg.freeMemThreshold} \ - -s ${toString ecfg.freeSwapThreshold} \ - ${optionalString ecfg.useKernelOOMKiller "-k"} \ - ${optionalString ecfg.ignoreOOMScoreAdjust "-i"} \ - ${optionalString ecfg.enableDebugInfo "-d"} \ - ${optionalString ecfg.enableNotifications "-n"} - ''; + ExecStart = concatStringsSep " " ([ + "${pkgs.earlyoom}/bin/earlyoom" + ("-m ${toString cfg.freeMemThreshold}" + + optionalString (cfg.freeMemKillThreshold != null) ",${toString cfg.freeMemKillThreshold}") + ("-s ${toString cfg.freeSwapThreshold}" + + optionalString (cfg.freeSwapKillThreshold != null) ",${toString cfg.freeSwapKillThreshold}") + "-r ${toString cfg.reportInterval}" + ] + ++ optional cfg.enableDebugInfo "-d" + ++ optional cfg.enableNotifications "-n" + ++ optional (cfg.killHook != null) "-N ${escapeShellArg cfg.killHook}" + ++ cfg.extraArgs + ); }; }; - - environment.systemPackages = optional ecfg.enableNotifications pkgs.systembus-notify; }; } diff --git a/nixos/modules/services/system/self-deploy.nix b/nixos/modules/services/system/self-deploy.nix index 33d15e08f4aa..d7130a13c731 100644 --- a/nixos/modules/services/system/self-deploy.nix +++ b/nixos/modules/services/system/self-deploy.nix @@ -126,6 +126,8 @@ in config = lib.mkIf cfg.enable { systemd.services.self-deploy = { + inherit (cfg) startAt; + wantedBy = [ "multi-user.target" ]; requires = lib.mkIf (!(isPathType cfg.repository)) [ "network-online.target" ]; @@ -138,8 +140,7 @@ in path = with pkgs; [ git nix - systemd - ]; + ] ++ lib.optionals (cfg.switchCommand == "boot") [ systemd ]; script = '' if [ ! -e ${repositoryDirectory} ]; then diff --git a/nixos/modules/services/system/systembus-notify.nix b/nixos/modules/services/system/systembus-notify.nix new file mode 100644 index 000000000000..e918bc552ece --- /dev/null +++ b/nixos/modules/services/system/systembus-notify.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.systembus-notify; + + inherit (lib) mkEnableOption mkIf; + +in +{ + options.services.systembus-notify = { + enable = mkEnableOption '' + System bus notification support + + 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. + ''; + }; + + config = mkIf cfg.enable { + systemd = { + packages = with pkgs; [ systembus-notify ]; + + user.services.systembus-notify.wantedBy = [ "graphical-session.target" ]; + }; + }; +} diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix index 41613dcbb3ba..191f6eb52e57 100644 --- a/nixos/modules/services/video/epgstation/default.nix +++ b/nixos/modules/services/video/epgstation/default.nix @@ -1,30 +1,40 @@ { config, lib, options, pkgs, ... }: -with lib; - let cfg = config.services.epgstation; opt = options.services.epgstation; + description = "EPGStation: DVR system for Mirakurun-managed TV tuners"; + username = config.users.users.epgstation.name; groupname = config.users.users.epgstation.group; + mirakurun = { + sock = config.services.mirakurun.unixSocket; + option = options.services.mirakurun.unixSocket; + }; - settingsFmt = pkgs.formats.json {}; - settingsTemplate = settingsFmt.generate "config.json" cfg.settings; + yaml = pkgs.formats.yaml { }; + settingsTemplate = yaml.generate "config.yml" cfg.settings; preStartScript = pkgs.writeScript "epgstation-prestart" '' #!${pkgs.runtimeShell} - PASSWORD="$(head -n1 "${cfg.basicAuth.passwordFile}")" - DB_PASSWORD="$(head -n1 "${cfg.database.passwordFile}")" + DB_PASSWORD_FILE=${lib.escapeShellArg cfg.database.passwordFile} + + if [[ ! -f "$DB_PASSWORD_FILE" ]]; then + printf "[FATAL] File containing the DB password was not found in '%s'. Double check the NixOS option '%s'." \ + "$DB_PASSWORD_FILE" ${lib.escapeShellArg opt.database.passwordFile} >&2 + exit 1 + fi + + DB_PASSWORD="$(head -n1 ${lib.escapeShellArg cfg.database.passwordFile})" # setup configuration - touch /etc/epgstation/config.json - chmod 640 /etc/epgstation/config.json + touch /etc/epgstation/config.yml + chmod 640 /etc/epgstation/config.yml sed \ - -e "s,@password@,$PASSWORD,g" \ -e "s,@dbPassword@,$DB_PASSWORD,g" \ - ${settingsTemplate} > /etc/epgstation/config.json - chown "${username}:${groupname}" /etc/epgstation/config.json + ${settingsTemplate} > /etc/epgstation/config.yml + chown "${username}:${groupname}" /etc/epgstation/config.yml # NOTE: Use password authentication, since mysqljs does not yet support auth_socket if [ ! -e /var/lib/epgstation/db-created ]; then @@ -35,7 +45,7 @@ let ''; streamingConfig = lib.importJSON ./streaming.json; - logConfig = { + logConfig = yaml.generate "logConfig.yml" { appenders.stdout.type = "stdout"; categories = { default = { appenders = [ "stdout" ]; level = "info"; }; @@ -45,53 +55,51 @@ let }; }; - defaultPassword = "INSECURE_GO_CHECK_CONFIGURATION_NIX\n"; + # Deprecate top level options that are redundant. + deprecateTopLevelOption = config: + lib.mkRenamedOptionModule + ([ "services" "epgstation" ] ++ config) + ([ "services" "epgstation" "settings" ] ++ config); + + removeOption = config: instruction: + lib.mkRemovedOptionModule + ([ "services" "epgstation" ] ++ config) + instruction; in { - options.services.epgstation = { - enable = mkEnableOption "EPGStation: DTV Software in Japan"; + meta.maintainers = with lib.maintainers; [ midchildan ]; - usePreconfiguredStreaming = mkOption { - type = types.bool; + imports = [ + (deprecateTopLevelOption [ "port" ]) + (deprecateTopLevelOption [ "socketioPort" ]) + (deprecateTopLevelOption [ "clientSocketioPort" ]) + (removeOption [ "basicAuth" ] + "Use a TLS-terminated reverse proxy with authentication instead.") + ]; + + options.services.epgstation = { + enable = lib.mkEnableOption description; + + package = lib.mkOption { + default = pkgs.epgstation; + type = lib.types.package; + defaultText = lib.literalExpression "pkgs.epgstation"; + description = "epgstation package to use"; + }; + + usePreconfiguredStreaming = lib.mkOption { + type = lib.types.bool; default = true; description = '' Use preconfigured default streaming options. Upstream defaults: - + ''; }; - port = mkOption { - type = types.port; - default = 20772; - description = '' - HTTP port for EPGStation to listen on. - ''; - }; - - socketioPort = mkOption { - type = types.port; - default = cfg.port + 1; - defaultText = literalExpression "config.${opt.port} + 1"; - description = '' - Socket.io port for EPGStation to listen on. - ''; - }; - - clientSocketioPort = mkOption { - type = types.port; - default = cfg.socketioPort; - defaultText = literalExpression "config.${opt.socketioPort}"; - description = '' - Socket.io port that the web client is going to connect to. This may be - different from if EPGStation is hidden - behind a reverse proxy. - ''; - }; - - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Open ports in the firewall for the EPGStation web interface. @@ -106,50 +114,17 @@ in ''; }; - basicAuth = { - user = mkOption { - type = with types; nullOr str; - default = null; - example = "epgstation"; - description = '' - Basic auth username for EPGStation. If null, basic - auth will be disabled. - - - - Basic authentication has known weaknesses, the most critical being - that it sends passwords over the network in clear text. Use this - feature to control access to EPGStation within your family and - friends, but don't rely on it for security. - - - ''; - }; - - passwordFile = mkOption { - type = types.path; - default = pkgs.writeText "epgstation-password" defaultPassword; - defaultText = literalDocBook ''a file containing ${defaultPassword}''; - example = "/run/keys/epgstation-password"; - description = '' - A file containing the password for . - ''; - }; - }; - - database = { - name = mkOption { - type = types.str; + database = { + name = lib.mkOption { + type = lib.types.str; default = "epgstation"; description = '' Name of the MySQL database that holds EPGStation's data. ''; }; - passwordFile = mkOption { - type = types.path; - default = pkgs.writeText "epgstation-db-password" defaultPassword; - defaultText = literalDocBook ''a file containing ${defaultPassword}''; + passwordFile = lib.mkOption { + type = lib.types.path; example = "/run/keys/epgstation-db-password"; description = '' A file containing the password for the database named @@ -158,69 +133,106 @@ in }; }; - settings = mkOption { + # The defaults for some options come from the upstream template + # configuration, which is the one that users would get if they follow the + # upstream instructions. This is, in some cases, different from the + # application defaults. Some options like encodeProcessNum and + # concurrentEncodeNum doesn't have an optimal default value that works for + # all hardware setups and/or performance requirements. For those kind of + # options, the application default wouldn't always result in the expected + # out-of-the-box behavior because it's the responsibility of the user to + # configure them according to their needs. In these cases, the value in the + # upstream template configuration should serve as a "good enough" default. + settings = lib.mkOption { description = '' - Options to add to config.json. + Options to add to config.yml. Documentation: ''; - default = {}; + default = { }; example = { recPriority = 20; conflictPriority = 10; }; - type = types.submodule { - freeformType = settingsFmt.type; + type = lib.types.submodule { + freeformType = yaml.type; - options.readOnlyOnce = mkOption { - type = types.bool; - default = false; - description = "Don't reload configuration files at runtime."; + options.port = lib.mkOption { + type = lib.types.port; + default = 20772; + description = '' + HTTP port for EPGStation to listen on. + ''; }; - options.mirakurunPath = mkOption (let - sockPath = config.services.mirakurun.unixSocket; - in { - type = types.str; - default = "http+unix://${replaceStrings ["/"] ["%2F"] sockPath}"; - defaultText = literalExpression '' - "http+unix://''${replaceStrings ["/"] ["%2F"] config.${options.services.mirakurun.unixSocket}}" + options.socketioPort = lib.mkOption { + type = lib.types.port; + default = cfg.settings.port + 1; + defaultText = lib.literalExpression "config.${opt.settings}.port + 1"; + description = '' + Socket.io port for EPGStation to listen on. It is valid to share + ports with . + ''; + }; + + options.clientSocketioPort = lib.mkOption { + type = lib.types.port; + default = cfg.settings.socketioPort; + defaultText = lib.literalExpression "config.${opt.settings}.socketioPort"; + description = '' + Socket.io port that the web client is going to connect to. This may + be different from if + EPGStation is hidden behind a reverse proxy. + ''; + }; + + options.mirakurunPath = with mirakurun; lib.mkOption { + type = lib.types.str; + default = "http+unix://${lib.replaceStrings ["/"] ["%2F"] sock}"; + defaultText = lib.literalExpression '' + "http+unix://''${lib.replaceStrings ["/"] ["%2F"] config.${option}}" ''; example = "http://localhost:40772"; description = "URL to connect to Mirakurun."; - }); + }; - options.encode = mkOption { - type = with types; listOf attrs; + options.encodeProcessNum = lib.mkOption { + type = lib.types.ints.positive; + default = 4; + description = '' + The maximum number of processes that EPGStation would allow to run + at the same time for encoding or streaming videos. + ''; + }; + + options.concurrentEncodeNum = lib.mkOption { + type = lib.types.ints.positive; + default = 1; + description = '' + The maximum number of encoding jobs that EPGStation would run at the + same time. + ''; + }; + + options.encode = lib.mkOption { + type = with lib.types; listOf attrs; description = "Encoding presets for recorded videos."; default = [ { - name = "H264"; - cmd = "${pkgs.epgstation}/libexec/enc.sh main"; + name = "H.264"; + cmd = "%NODE% ${cfg.package}/libexec/enc.js"; suffix = ".mp4"; - default = true; - } - { - name = "H264-sub"; - cmd = "${pkgs.epgstation}/libexec/enc.sh sub"; - suffix = "-sub.mp4"; } ]; - defaultText = literalExpression '' + defaultText = lib.literalExpression '' [ { - name = "H264"; - cmd = "''${pkgs.epgstation}/libexec/enc.sh main"; + name = "H.264"; + cmd = "%NODE% config.${opt.package}/libexec/enc.js"; suffix = ".mp4"; - default = true; - } - { - name = "H264-sub"; - cmd = "''${pkgs.epgstation}/libexec/enc.sh sub"; - suffix = "-sub.mp4"; } ] ''; @@ -229,14 +241,25 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = !(lib.hasAttr "readOnlyOnce" cfg.settings); + message = '' + The option config.${opt.settings}.readOnlyOnce can no longer be used + since it's been removed. No replacements are available. + ''; + } + ]; + environment.etc = { - "epgstation/operatorLogConfig.json".text = builtins.toJSON logConfig; - "epgstation/serviceLogConfig.json".text = builtins.toJSON logConfig; + "epgstation/epgUpdaterLogConfig.yml".source = logConfig; + "epgstation/operatorLogConfig.yml".source = logConfig; + "epgstation/serviceLogConfig.yml".source = logConfig; }; - networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = with cfg; [ port socketioPort ]; + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = with cfg.settings; [ port socketioPort ]; }; users.users.epgstation = { @@ -245,13 +268,13 @@ in isSystemUser = true; }; - users.groups.epgstation = {}; + users.groups.epgstation = { }; - services.mirakurun.enable = mkDefault true; + services.mirakurun.enable = lib.mkDefault true; services.mysql = { - enable = mkDefault true; - package = mkDefault pkgs.mariadb; + enable = lib.mkDefault true; + package = lib.mkDefault pkgs.mariadb; ensureDatabases = [ cfg.database.name ]; # FIXME: enable once mysqljs supports auth_socket # ensureUsers = [ { @@ -260,39 +283,28 @@ in # } ]; }; - services.epgstation.settings = let - defaultSettings = { - serverPort = cfg.port; - socketioPort = cfg.socketioPort; - clientSocketioPort = cfg.clientSocketioPort; + services.epgstation.settings = + let + defaultSettings = { + dbtype = lib.mkDefault "mysql"; + mysql = { + socketPath = lib.mkDefault "/run/mysqld/mysqld.sock"; + user = username; + password = lib.mkDefault "@dbPassword@"; + database = cfg.database.name; + }; - dbType = mkDefault "mysql"; - mysql = { - user = username; - database = cfg.database.name; - socketPath = mkDefault "/run/mysqld/mysqld.sock"; - password = mkDefault "@dbPassword@"; - connectTimeout = mkDefault 1000; - connectionLimit = mkDefault 10; + ffmpeg = lib.mkDefault "${pkgs.ffmpeg-full}/bin/ffmpeg"; + ffprobe = lib.mkDefault "${pkgs.ffmpeg-full}/bin/ffprobe"; + + # for disambiguation with TypeScript files + recordedFileExtension = lib.mkDefault ".m2ts"; }; - - basicAuth = mkIf (cfg.basicAuth.user != null) { - user = mkDefault cfg.basicAuth.user; - password = mkDefault "@password@"; - }; - - ffmpeg = mkDefault "${pkgs.ffmpeg-full}/bin/ffmpeg"; - ffprobe = mkDefault "${pkgs.ffmpeg-full}/bin/ffprobe"; - - fileExtension = mkDefault ".m2ts"; - maxEncode = mkDefault 2; - maxStreaming = mkDefault 2; - }; - in - mkMerge [ - defaultSettings - (mkIf cfg.usePreconfiguredStreaming streamingConfig) - ]; + in + lib.mkMerge [ + defaultSettings + (lib.mkIf cfg.usePreconfiguredStreaming streamingConfig) + ]; systemd.tmpfiles.rules = [ "d '/var/lib/epgstation/streamfiles' - ${username} ${groupname} - -" @@ -301,15 +313,15 @@ in ]; systemd.services.epgstation = { - description = pkgs.epgstation.meta.description; + inherit description; + wantedBy = [ "multi-user.target" ]; - after = [ - "network.target" - ] ++ optional config.services.mirakurun.enable "mirakurun.service" - ++ optional config.services.mysql.enable "mysql.service"; + after = [ "network.target" ] + ++ lib.optional config.services.mirakurun.enable "mirakurun.service" + ++ lib.optional config.services.mysql.enable "mysql.service"; serviceConfig = { - ExecStart = "${pkgs.epgstation}/bin/epgstation start"; + ExecStart = "${cfg.package}/bin/epgstation start"; ExecStartPre = "+${preStartScript}"; User = username; Group = groupname; diff --git a/nixos/modules/services/video/epgstation/streaming.json b/nixos/modules/services/video/epgstation/streaming.json index 8eb99cf85584..7f8df0817fc3 100644 --- a/nixos/modules/services/video/epgstation/streaming.json +++ b/nixos/modules/services/video/epgstation/streaming.json @@ -1,119 +1,140 @@ { - "liveHLS": [ - { - "name": "720p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + "urlscheme": { + "m2ts": { + "ios": "vlc-x-callback://x-callback-url/stream?url=PROTOCOL://ADDRESS", + "android": "intent://ADDRESS#Intent;package=org.videolan.vlc;type=video;scheme=PROTOCOL;end" }, - { - "name": "480p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%" + "video": { + "ios": "infuse://x-callback-url/play?url=PROTOCOL://ADDRESS", + "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=PROTOCOL;end" }, - { - "name": "180p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 48k -ac 2 -c:v libx264 -vf yadif,scale=-2:180 -b:v 100k -preset veryfast -maxrate 110k -bufsize 1000k -flags +loop-global_header %OUTPUT%" + "download": { + "ios": "vlc-x-callback://x-callback-url/download?url=PROTOCOL://ADDRESS&filename=FILENAME" } - ], - "liveMP4": [ - { - "name": "720p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" - }, - { - "name": "480p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" - } - ], - "liveWebM": [ - { - "name": "720p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" - }, - { - "name": "480p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" - } - ], - "mpegTsStreaming": [ - { - "name": "720p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1" - }, - { - "name": "480p", - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1" - }, - { - "name": "Original" - } - ], - "mpegTsViewer": { - "ios": "vlc-x-callback://x-callback-url/stream?url=http://ADDRESS", - "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end" }, - "recordedDownloader": { - "ios": "vlc-x-callback://x-callback-url/download?url=http://ADDRESS&filename=FILENAME", - "android": "intent://ADDRESS#Intent;package=com.dv.adm;type=video;scheme=http;end" - }, - "recordedStreaming": { - "webm": [ - { - "name": "720p", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", - "vb": "3000k", - "ab": "192k" - }, - { - "name": "360p", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", - "vb": "1500k", - "ab": "128k" + "stream": { + "live": { + "ts": { + "m2ts": [ + { + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1" + }, + { + "name": "無変換" + } + ], + "m2tsll": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -f mpegts -analyzeduration 500000 -i pipe:0 -map 0 -c:s copy -c:d copy -ignore_unknown -fflags nobuffer -flags low_delay -max_delay 250000 -max_interleave_delta 1 -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -flags +cgop -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -f mpegts -analyzeduration 500000 -i pipe:0 -map 0 -c:s copy -c:d copy -ignore_unknown -fflags nobuffer -flags low_delay -max_delay 250000 -max_interleave_delta 1 -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -flags +cgop -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1" + } + ], + "webm": [ + { + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + } + ], + "mp4": [ + { + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + } + ], + "hls": [ + { + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -map 0 -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -map 0 -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%" + } + ] } - ], - "mp4": [ - { - "name": "720p", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", - "vb": "3000k", - "ab": "192k" - }, - { - "name": "360p", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", - "vb": "1500k", - "ab": "128k" - } - ], - "mpegTs": [ - { - "name": "720p (H.264)", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1", - "vb": "3000k", - "ab": "192k" - }, - { - "name": "360p (H.264)", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1", - "vb": "1500k", - "ab": "128k" - } - ] - }, - "recordedHLS": [ - { - "name": "720p", - "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" }, - { - "name": "480p", - "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%" - }, - { - "name": "480p(h265)", - "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_type fmp4 -hls_fmp4_init_filename stream%streamNum%-init.mp4 -hls_segment_filename stream%streamNum%-%09d.m4s -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx265 -vf yadif,scale=-2:480 -b:v 350k -preset veryfast -tag:v hvc1 %OUTPUT%" + "recorded": { + "ts": { + "webm": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + } + ], + "mp4": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + } + ], + "hls": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -map 0 -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -i pipe:0 -sn -map 0 -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%" + } + ] + }, + "encoded": { + "webm": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" + } + ], + "mp4": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" + } + ], + "hls": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -ss %SS% -i %INPUT% -sn -threads 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -hls_flags delete_segments -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf scale=-2:480 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + } + ] + } } - ], - "recordedViewer": { - "ios": "infuse://x-callback-url/play?url=http://ADDRESS", - "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end" } } diff --git a/nixos/modules/services/video/unifi-video.nix b/nixos/modules/services/video/unifi-video.nix index 43208a9fe4cf..11d9fe305470 100644 --- a/nixos/modules/services/video/unifi-video.nix +++ b/nixos/modules/services/video/unifi-video.nix @@ -16,7 +16,7 @@ let -pidfile ${cfg.pidFile} \ -procname unifi-video \ -Djava.security.egd=file:/dev/./urandom \ - -Xmx${cfg.maximumJavaHeapSize}M \ + -Xmx${toString cfg.maximumJavaHeapSize}M \ -Xss512K \ -XX:+UseG1GC \ -XX:+UseStringDeduplication \ @@ -91,98 +91,102 @@ let stateDir = "/var/lib/unifi-video"; in - { +{ - options.services.unifi-video = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether or not to enable the unifi-video service. - ''; - }; + options.services.unifi-video = { - jrePackage = mkOption { - type = types.package; - default = pkgs.jre8; - defaultText = literalExpression "pkgs.jre8"; - description = '' - The JRE package to use. Check the release notes to ensure it is supported. - ''; - }; + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether or not to enable the unifi-video service. + ''; + }; - unifiVideoPackage = mkOption { - type = types.package; - default = pkgs.unifi-video; - defaultText = literalExpression "pkgs.unifi-video"; - description = '' - The unifi-video package to use. - ''; - }; + jrePackage = mkOption { + type = types.package; + default = pkgs.jre8; + defaultText = literalExpression "pkgs.jre8"; + description = '' + The JRE package to use. Check the release notes to ensure it is supported. + ''; + }; - mongodbPackage = mkOption { - type = types.package; - default = pkgs.mongodb-4_0; - defaultText = literalExpression "pkgs.mongodb"; - description = '' - The mongodb package to use. - ''; - }; + unifiVideoPackage = mkOption { + type = types.package; + default = pkgs.unifi-video; + defaultText = literalExpression "pkgs.unifi-video"; + description = '' + The unifi-video package to use. + ''; + }; - logDir = mkOption { - type = types.str; - default = "${stateDir}/logs"; - description = '' - Where to store the logs. - ''; - }; + mongodbPackage = mkOption { + type = types.package; + default = pkgs.mongodb-4_0; + defaultText = literalExpression "pkgs.mongodb"; + description = '' + The mongodb package to use. + ''; + }; - dataDir = mkOption { - type = types.str; - default = "${stateDir}/data"; - description = '' - Where to store the database and other data. - ''; - }; + logDir = mkOption { + type = types.str; + default = "${stateDir}/logs"; + description = '' + Where to store the logs. + ''; + }; - openPorts = mkOption { - type = types.bool; - default = true; - description = '' - Whether or not to open the required ports on the firewall. - ''; - }; + dataDir = mkOption { + type = types.str; + default = "${stateDir}/data"; + description = '' + Where to store the database and other data. + ''; + }; - maximumJavaHeapSize = mkOption { - type = types.nullOr types.int; - default = 1024; - example = 4096; - description = '' - Set the maximimum heap size for the JVM in MB. - ''; - }; + openFirewall = mkOption { + type = types.bool; + default = true; + description = '' + Whether or not to open the required ports on the firewall. + ''; + }; - pidFile = mkOption { - type = types.path; - default = "${cfg.dataDir}/unifi-video.pid"; - defaultText = literalExpression ''"''${config.${opt.dataDir}}/unifi-video.pid"''; - description = "Location of unifi-video pid file."; - }; + maximumJavaHeapSize = mkOption { + type = types.nullOr types.int; + default = 1024; + example = 4096; + description = '' + Set the maximimum heap size for the JVM in MB. + ''; + }; -}; + pidFile = mkOption { + type = types.path; + default = "${cfg.dataDir}/unifi-video.pid"; + defaultText = literalExpression ''"''${config.${opt.dataDir}}/unifi-video.pid"''; + description = "Location of unifi-video pid file."; + }; -config = mkIf cfg.enable { - users = { - users.unifi-video = { + }; + + config = mkIf cfg.enable { + + warnings = optional + (options.services.unifi-video.openFirewall.highestPrio >= (mkOptionDefault null).priority) + "The current services.unifi-video.openFirewall = true default is deprecated and will change to false in 22.11. Set it explicitly to silence this warning."; + + users.users.unifi-video = { description = "UniFi Video controller daemon user"; home = stateDir; group = "unifi-video"; isSystemUser = true; }; - groups.unifi-video = {}; - }; + users.groups.unifi-video = {}; - networking.firewall = mkIf cfg.openPorts { + networking.firewall = mkIf cfg.openFirewall { # https://help.ui.com/hc/en-us/articles/217875218-UniFi-Video-Ports-Used allowedTCPPorts = [ 7080 # HTTP portal @@ -237,7 +241,6 @@ config = mkIf cfg.enable { "L+ '${stateDir}/conf/server.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/server.xml" "L+ '${stateDir}/conf/tomcat-users.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/tomcat-users.xml" "L+ '${stateDir}/conf/web.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/web.xml" - ]; systemd.services.unifi-video = { @@ -258,10 +261,11 @@ config = mkIf cfg.enable { WorkingDirectory = "${stateDir}"; }; }; - }; - meta = { - maintainers = with lib.maintainers; [ rsynnest ]; - }; + imports = [ + (mkRenamedOptionModule [ "services" "unifi-video" "openPorts" ] [ "services" "unifi-video" "openFirewall" ]) + ]; + + meta.maintainers = with lib.maintainers; [ rsynnest ]; } diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix index d2bbc4fc057b..a32b81a916fc 100644 --- a/nixos/modules/services/wayland/cage.nix +++ b/nixos/modules/services/wayland/cage.nix @@ -81,6 +81,8 @@ in { }; }; + security.polkit.enable = true; + security.pam.services.cage.text = '' auth required pam_unix.so nullok account required pam_unix.so diff --git a/nixos/modules/services/web-apps/bookstack.nix b/nixos/modules/services/web-apps/bookstack.nix index 54eaea63b6eb..64a2767fab6e 100644 --- a/nixos/modules/services/web-apps/bookstack.nix +++ b/nixos/modules/services/web-apps/bookstack.nix @@ -385,13 +385,13 @@ in { else if isString v then v else if true == v then "true" else if false == v then "false" - else if isSecret v then v._secret + else if isSecret v then hashString "sha256" v._secret else throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty {}) v}"; }; }; secretPaths = lib.mapAttrsToList (_: v: v._secret) (lib.filterAttrs (_: isSecret) cfg.config); mkSecretReplacement = file: '' - replace-secret ${escapeShellArgs [ file file "${cfg.dataDir}/.env" ]} + replace-secret ${escapeShellArgs [ (builtins.hashString "sha256" file) file "${cfg.dataDir}/.env" ]} ''; secretReplacements = lib.concatMapStrings mkSecretReplacement secretPaths; filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [ {} null ])) cfg.config; diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 30913ced8849..1f8ca742db95 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -376,7 +376,7 @@ in "~ \\.php$" = { extraConfig = '' try_files $uri $uri/ /doku.php; - include ${pkgs.nginx}/conf/fastcgi_params; + include ${config.services.nginx.package}/conf/fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param REDIRECT_STATUS 200; fastcgi_pass unix:${config.services.phpfpm.pools."dokuwiki-${hostName}".socket}; diff --git a/nixos/modules/services/web-apps/ethercalc.nix b/nixos/modules/services/web-apps/ethercalc.nix new file mode 100644 index 000000000000..d74def59c6c3 --- /dev/null +++ b/nixos/modules/services/web-apps/ethercalc.nix @@ -0,0 +1,62 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.ethercalc; +in { + options = { + services.ethercalc = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + ethercalc, an online collaborative spreadsheet server. + + Persistent state will be maintained under + /var/lib/ethercalc. Upstream supports using a + redis server for storage and recommends the redis backend for + intensive use; however, the Nix module doesn't currently support + redis. + + Note that while ethercalc is a good and robust project with an active + issue tracker, there haven't been new commits since the end of 2020. + ''; + }; + + package = mkOption { + default = pkgs.ethercalc; + defaultText = literalExpression "pkgs.ethercalc"; + type = types.package; + description = "Ethercalc package to use."; + }; + + host = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "Address to listen on (use 0.0.0.0 to allow access from any address)."; + }; + + port = mkOption { + type = types.port; + default = 8000; + description = "Port to bind to."; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.ethercalc = { + description = "Ethercalc service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + DynamicUser = true; + ExecStart = "${cfg.package}/bin/ethercalc --host ${cfg.host} --port ${toString cfg.port}"; + Restart = "always"; + StateDirectory = "ethercalc"; + WorkingDirectory = "/var/lib/ethercalc"; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/jirafeau.nix b/nixos/modules/services/web-apps/jirafeau.nix index a95e2b4f82a9..328c61c8e646 100644 --- a/nixos/modules/services/web-apps/jirafeau.nix +++ b/nixos/modules/services/web-apps/jirafeau.nix @@ -136,7 +136,7 @@ in ''; locations = { "~ \\.php$".extraConfig = '' - include ${pkgs.nginx}/conf/fastcgi_params; + include ${config.services.nginx.package}/conf/fastcgi_params; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_index index.php; fastcgi_pass unix:${config.services.phpfpm.pools.jirafeau.socket}; diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index a01f0049b2c7..c4a2127663a9 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -129,6 +129,14 @@ in ''; }; + plugins = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = []; + description = '' + Keycloak plugin jar, ear files or derivations with them + ''; + }; + database = { type = mkOption { type = enum [ "mysql" "postgresql" ]; @@ -693,6 +701,7 @@ in RemainAfterExit = true; User = "postgres"; Group = "postgres"; + LoadCredential = [ "db_password:${cfg.database.passwordFile}" ]; }; script = '' set -o errexit -o pipefail -o nounset -o errtrace @@ -701,7 +710,8 @@ in create_role="$(mktemp)" trap 'rm -f "$create_role"' ERR EXIT - echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$(<'${cfg.database.passwordFile}')' CREATEDB" > "$create_role" + db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")" + echo "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB" > "$create_role" psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || psql -tA --file="$create_role" psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || psql -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"' ''; @@ -717,14 +727,14 @@ in RemainAfterExit = true; User = config.services.mysql.user; Group = config.services.mysql.group; + LoadCredential = [ "db_password:${cfg.database.passwordFile}" ]; }; script = '' set -o errexit -o pipefail -o nounset -o errtrace shopt -s inherit_errexit - - db_password="$(<'${cfg.database.passwordFile}')" + db_password="$(<"$CREDENTIALS_DIRECTORY/db_password")" ( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';" - echo "CREATE DATABASE keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;" + echo "CREATE DATABASE IF NOT EXISTS keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;" echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';" ) | mysql -N ''; @@ -785,6 +795,14 @@ in umask u=rwx,g=,o= + install_plugin() { + if [ -d "$1" ]; then + find "$1" -type f \( -iname \*.ear -o -iname \*.jar \) -exec install -m 0500 -o keycloak -g keycloak "{}" "/run/keycloak/deployments/" \; + else + install -m 0500 -o keycloak -g keycloak "$1" "/run/keycloak/deployments/" + fi + } + install -m 0600 ${cfg.package}/standalone/configuration/*.properties /run/keycloak/configuration install -T -m 0600 ${keycloakConfig} /run/keycloak/configuration/standalone.xml @@ -792,7 +810,9 @@ in export JAVA_OPTS=-Djboss.server.config.user.dir=/run/keycloak/configuration add-user-keycloak.sh -u admin -p '${cfg.initialAdminPassword}' - '' + optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) '' + '' + + lib.optionalString (cfg.plugins != []) (lib.concatStringsSep "\n" (map (pl: "install_plugin ${lib.escapeShellArg pl}") cfg.plugins)) + "\n" + + optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) '' pushd /run/keycloak/ssl/ cat "$CREDENTIALS_DIRECTORY/ssl_cert" <(echo) \ "$CREDENTIALS_DIRECTORY/ssl_key" <(echo) \ diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 1e3c7e53c175..8208c85bfd70 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -92,6 +92,7 @@ let mastodonEnv = pkgs.writeShellScriptBin "mastodon-env" '' set -a + export RAILS_ROOT="${cfg.package}" source "${envFile}" source /var/lib/mastodon/.secrets_env eval -- "\$@" diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 8a0ca33b51f0..c6d4ed6d39de 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -192,6 +192,7 @@ in { # Copy config folder chmod g+s "${dataDir}" cp -r "${cfg.package}/share/config" "${dataDir}/" + mkdir -p "${dataDir}/misc" chmod -R u+rwX,g+rwX,o-rwx "${dataDir}" # check whether user setup has already been done diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 026bde2a92df..641c9be85d8c 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -4,34 +4,22 @@ with lib; let cfg = config.services.miniflux; - dbUser = "miniflux"; - dbPassword = "miniflux"; - dbHost = "localhost"; - dbName = "miniflux"; + defaultAddress = "localhost:8080"; - defaultCredentials = pkgs.writeText "miniflux-admin-credentials" '' - ADMIN_USERNAME=admin - ADMIN_PASSWORD=password - ''; + dbUser = "miniflux"; + dbName = "miniflux"; pgbin = "${config.services.postgresql.package}/bin"; preStart = pkgs.writeScript "miniflux-pre-start" '' #!${pkgs.runtimeShell} - db_exists() { - [ "$(${pgbin}/psql -Atc "select 1 from pg_database where datname='$1'")" == "1" ] - } - if ! db_exists "${dbName}"; then - ${pgbin}/psql postgres -c "CREATE ROLE ${dbUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${dbPassword}'" - ${pgbin}/createdb --owner "${dbUser}" "${dbName}" - ${pgbin}/psql "${dbName}" -c "CREATE EXTENSION IF NOT EXISTS hstore" - fi + ${pgbin}/psql "${dbName}" -c "CREATE EXTENSION IF NOT EXISTS hstore" ''; in { options = { services.miniflux = { - enable = mkEnableOption "miniflux"; + enable = mkEnableOption "miniflux and creates a local postgres database for it"; config = mkOption { type = types.attrsOf types.str; @@ -45,15 +33,17 @@ in Configuration for Miniflux, refer to for documentation on the supported values. + + Correct configuration for the database is already provided. + By default, listens on ${defaultAddress}. ''; }; adminCredentialsFile = mkOption { - type = types.nullOr types.path; - default = null; + type = types.path; description = '' - File containing the ADMIN_USERNAME, default is "admin", and - ADMIN_PASSWORD (length >= 6), default is "password"; in the format of + File containing the ADMIN_USERNAME and + ADMIN_PASSWORD (length >= 6) in the format of an EnvironmentFile=, as described by systemd.exec(5). ''; example = "/etc/nixos/miniflux-admin-credentials"; @@ -64,17 +54,25 @@ in config = mkIf cfg.enable { services.miniflux.config = { - LISTEN_ADDR = mkDefault "localhost:8080"; - DATABASE_URL = "postgresql://${dbUser}:${dbPassword}@${dbHost}/${dbName}?sslmode=disable"; + LISTEN_ADDR = mkDefault defaultAddress; + DATABASE_URL = "user=${dbUser} host=/run/postgresql dbname=${dbName}"; RUN_MIGRATIONS = "1"; CREATE_ADMIN = "1"; }; - services.postgresql.enable = true; + services.postgresql = { + enable = true; + ensureUsers = [ { + name = dbUser; + ensurePermissions = { + "DATABASE ${dbName}" = "ALL PRIVILEGES"; + }; + } ]; + ensureDatabases = [ dbName ]; + }; systemd.services.miniflux-dbsetup = { description = "Miniflux database setup"; - wantedBy = [ "multi-user.target" ]; requires = [ "postgresql.service" ]; after = [ "network.target" "postgresql.service" ]; serviceConfig = { @@ -87,17 +85,16 @@ in systemd.services.miniflux = { description = "Miniflux service"; wantedBy = [ "multi-user.target" ]; - requires = [ "postgresql.service" ]; + requires = [ "miniflux-dbsetup.service" ]; after = [ "network.target" "postgresql.service" "miniflux-dbsetup.service" ]; serviceConfig = { ExecStart = "${pkgs.miniflux}/bin/miniflux"; + User = dbUser; DynamicUser = true; RuntimeDirectory = "miniflux"; RuntimeDirectoryMode = "0700"; - EnvironmentFile = if cfg.adminCredentialsFile == null - then defaultCredentials - else cfg.adminCredentialsFile; + EnvironmentFile = cfg.adminCredentialsFile; # Hardening CapabilityBoundingSet = [ "" ]; DeviceAllow = [ "" ]; @@ -114,7 +111,7 @@ in ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 739ba1ea12f6..b32220a5e579 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -153,7 +153,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud21" "nextcloud22" "nextcloud23" ]; + relatedPackages = [ "nextcloud22" "nextcloud23" ]; }; phpPackage = mkOption { type = types.package; @@ -571,15 +571,6 @@ in { nextcloud defined in an overlay, please set `services.nextcloud.package` to `pkgs.nextcloud`. '' - # 21.03 will not be an official release - it was instead 21.05. - # This versionOlder 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. - # FIXME(@Ma27) remove this else-if as soon as 21.05 is EOL! This is only here - # to ensure that users who are on Nextcloud 19 with a stateVersion <21.05 with - # no explicit services.nextcloud.package don't upgrade to v21 by accident ( - # nextcloud20 throws an eval-error because it's dropped). - else if versionOlder stateVersion "21.03" then nextcloud20 else if versionOlder stateVersion "21.11" then nextcloud21 else if versionOlder stateVersion "22.05" then nextcloud22 else nextcloud23 @@ -599,6 +590,8 @@ in { timerConfig.Unit = "nextcloud-cron.service"; }; + systemd.tmpfiles.rules = ["d ${cfg.home} 0750 nextcloud nextcloud"]; + systemd.services = { # When upgrading the Nextcloud package, Nextcloud can report errors such as # "The files of the app [all apps in /var/lib/nextcloud/apps] were not replaced correctly" @@ -720,8 +713,6 @@ in { before = [ "phpfpm-nextcloud.service" ]; path = [ occ ]; script = '' - chmod og+x ${cfg.home} - ${optionalString (c.dbpassFile != null) '' if [ ! -r "${c.dbpassFile}" ]; then echo "dbpassFile ${c.dbpassFile} is not readable by nextcloud:nextcloud! Aborting..." @@ -814,7 +805,6 @@ in { users.users.nextcloud = { home = "${cfg.home}"; group = "nextcloud"; - createHome = true; isSystemUser = true; }; users.groups.nextcloud.members = [ "nextcloud" config.services.nginx.user ]; diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index a65428018260..e195e6e6e824 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -320,6 +320,7 @@ in { }; storage = { tmp = lib.mkDefault "/var/lib/peertube/storage/tmp/"; + bin = lib.mkDefault "/var/lib/peertube/storage/bin/"; avatars = lib.mkDefault "/var/lib/peertube/storage/avatars/"; videos = lib.mkDefault "/var/lib/peertube/storage/videos/"; streaming_playlists = lib.mkDefault "/var/lib/peertube/storage/streaming-playlists/"; @@ -333,6 +334,15 @@ in { plugins = lib.mkDefault "/var/lib/peertube/storage/plugins/"; client_overrides = lib.mkDefault "/var/lib/peertube/storage/client-overrides/"; }; + import = { + videos = { + http = { + youtube_dl_release = { + python_path = "${pkgs.python3}/bin/python"; + }; + }; + }; + }; } (lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis/redis.sock"; }; }) ]; @@ -380,7 +390,7 @@ in { environment = env; - path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn youtube-dl ]; + path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn python3 ]; script = '' #!/bin/sh diff --git a/nixos/modules/services/web-apps/plantuml-server.nix b/nixos/modules/services/web-apps/plantuml-server.nix index f4bf43f56b98..9ea37b8a4cad 100644 --- a/nixos/modules/services/web-apps/plantuml-server.nix +++ b/nixos/modules/services/web-apps/plantuml-server.nix @@ -20,6 +20,21 @@ in description = "PlantUML server package to use"; }; + packages = { + jdk = mkOption { + type = types.package; + default = pkgs.jdk; + defaultText = literalExpression "pkgs.jdk"; + description = "JDK package to use for the server"; + }; + jetty = mkOption { + type = types.package; + default = pkgs.jetty; + defaultText = literalExpression "pkgs.jetty"; + description = "Jetty package to use for the server"; + }; + }; + user = mkOption { type = types.str; default = "plantuml"; @@ -105,10 +120,10 @@ in ALLOW_PLANTUML_INCLUDE = if cfg.allowPlantumlInclude then "true" else "false"; }; script = '' - ${pkgs.jre}/bin/java \ - -jar ${pkgs.jetty}/start.jar \ + ${cfg.packages.jdk}/bin/java \ + -jar ${cfg.packages.jetty}/start.jar \ --module=deploy,http,jsp \ - jetty.home=${pkgs.jetty} \ + jetty.home=${cfg.packages.jetty} \ jetty.base=${cfg.package} \ jetty.http.host=${cfg.listenHost} \ jetty.http.port=${builtins.toString cfg.listenPort} diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index b6c48186a1d3..5d550ae5ca86 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -10,8 +10,7 @@ in { enable = mkEnableOption "plausible"; releaseCookiePath = mkOption { - default = null; - type = with types; nullOr (either str path); + type = with types; either str path; description = '' The path to the file with release cookie. (used for remote connection to the running node). ''; @@ -235,6 +234,8 @@ in { script = '' export CONFIG_DIR=$CREDENTIALS_DIRECTORY + export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )" + # setup ${pkgs.plausible}/createdb.sh ${pkgs.plausible}/migrate.sh @@ -243,10 +244,8 @@ in { psql -d plausible <<< "UPDATE users SET email_verified=true;" fi ''} - ${optionalString (cfg.releaseCookiePath != null) '' - export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )" - ''} - plausible start + + exec plausible start ''; serviceConfig = { @@ -257,8 +256,8 @@ in { LoadCredential = [ "ADMIN_USER_PWD:${cfg.adminUser.passwordFile}" "SECRET_KEY_BASE:${cfg.server.secretKeybaseFile}" - ] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"] - ++ lib.optionals (cfg.releaseCookiePath != null) [ "RELEASE_COOKIE:${cfg.releaseCookiePath}"]; + "RELEASE_COOKIE:${cfg.releaseCookiePath}" + ] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"]; }; }; } diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix index fd97ab76a5f6..4b36cc8754c6 100644 --- a/nixos/modules/services/web-apps/restya-board.nix +++ b/nixos/modules/services/web-apps/restya-board.nix @@ -235,7 +235,7 @@ in locations."~ \\.php$" = { tryFiles = "$uri =404"; extraConfig = '' - include ${pkgs.nginx}/conf/fastcgi_params; + include ${config.services.nginx.package}/conf/fastcgi_params; fastcgi_pass unix:${fpm.socket}; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; diff --git a/nixos/modules/services/web-apps/rss-bridge.nix b/nixos/modules/services/web-apps/rss-bridge.nix index 456ca00416fe..f2b6d9559823 100644 --- a/nixos/modules/services/web-apps/rss-bridge.nix +++ b/nixos/modules/services/web-apps/rss-bridge.nix @@ -111,7 +111,7 @@ in locations."~ ^/index.php(/|$)" = { extraConfig = '' - include ${pkgs.nginx}/conf/fastcgi_params; + include ${config.services.nginx.package}/conf/fastcgi_params; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket}; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; diff --git a/nixos/modules/services/web-servers/agate.nix b/nixos/modules/services/web-servers/agate.nix new file mode 100644 index 000000000000..3afdb561c0b0 --- /dev/null +++ b/nixos/modules/services/web-servers/agate.nix @@ -0,0 +1,148 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.agate; +in +{ + options = { + services.agate = { + enable = mkEnableOption "Agate Server"; + + package = mkOption { + type = types.package; + default = pkgs.agate; + defaultText = literalExpression "pkgs.agate"; + description = "The package to use"; + }; + + addresses = mkOption { + type = types.listOf types.str; + default = [ "0.0.0.0:1965" ]; + description = '' + Addresses to listen on, IP:PORT, if you haven't disabled forwarding + only set IPv4. + ''; + }; + + contentDir = mkOption { + default = "/var/lib/agate/content"; + type = types.path; + description = "Root of the content directory."; + }; + + certificatesDir = mkOption { + default = "/var/lib/agate/certificates"; + type = types.path; + description = "Root of the certificate directory."; + }; + + hostnames = mkOption { + default = [ ]; + type = types.listOf types.str; + description = '' + Domain name of this Gemini server, enables checking hostname and port + in requests. (multiple occurences means basic vhosts) + ''; + }; + + language = mkOption { + default = null; + type = types.nullOr types.str; + description = "RFC 4646 Language code for text/gemini documents."; + }; + + onlyTls_1_3 = mkOption { + default = false; + type = types.bool; + description = "Only use TLSv1.3 (default also allows TLSv1.2)."; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = [ "" ]; + example = [ "--log-ip" ]; + description = "Extra arguments to use running agate."; + }; + }; + }; + + config = mkIf cfg.enable { + # available for generating certs by hand + # it can be a bit arduous with openssl + environment.systemPackages = [ cfg.package ]; + + systemd.services.agate = { + description = "Agate"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "network-online.target" ]; + + script = + let + prefixKeyList = key: list: concatMap (v: [ key v ]) list; + addresses = prefixKeyList "--addr" cfg.addresses; + hostnames = prefixKeyList "--hostname" cfg.hostnames; + in + '' + exec ${cfg.package}/bin/agate ${ + escapeShellArgs ( + [ + "--content" "${cfg.contentDir}" + "--certs" "${cfg.certificatesDir}" + ] ++ + addresses ++ + (optionals (cfg.hostnames != []) hostnames) ++ + (optionals (cfg.language != null) [ "--lang" cfg.language ]) ++ + (optionals cfg.onlyTls_1_3 [ "--only-tls13" ]) ++ + (optionals (cfg.extraArgs != []) cfg.extraArgs) + ) + } + ''; + + serviceConfig = { + Restart = "always"; + RestartSec = "5s"; + DynamicUser = true; + StateDirectory = "agate"; + + # Security options: + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + + # ProtectClock= adds DeviceAllow=char-rtc r + DeviceAllow = ""; + + LockPersonality = true; + + PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = true; + + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + + RestrictNamespaces = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictRealtime = true; + + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ + "@system-service" + "~@cpu-emulation" + "~@debug" + "~@keyring" + "~@memlock" + "~@obsolete" + "~@privileged" + "~@setuid" + ]; + }; + }; + }; +} diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index a8610047f5f3..e046c28dd6bb 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -924,7 +924,8 @@ in PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid @mincore" ] ++ optionals (cfg.package != pkgs.tengine) [ "~@ipc" ]; + SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ] + ++ optionals ((cfg.package != pkgs.tengine) && (!lib.any (mod: (mod.disableIPC or false)) cfg.package.modules)) [ "~@ipc" ]; }; }; @@ -988,5 +989,17 @@ in nginx.gid = config.ids.gids.nginx; }; + services.logrotate.paths.nginx = mapAttrs (_: mkDefault) { + path = "/var/log/nginx/*.log"; + frequency = "weekly"; + keep = 26; + extraConfig = '' + compress + delaycompress + postrotate + [ ! -f /var/run/nginx/nginx.pid ] || kill -USR1 `cat /var/run/nginx/nginx.pid` + endscript + ''; + }; }; } diff --git a/nixos/modules/services/web-servers/nginx/gitweb.nix b/nixos/modules/services/web-servers/nginx/gitweb.nix index 11bf2a309ea8..db45577a46d1 100644 --- a/nixos/modules/services/web-servers/nginx/gitweb.nix +++ b/nixos/modules/services/web-servers/nginx/gitweb.nix @@ -79,7 +79,7 @@ in }; locations."${cfg.location}/" = { extraConfig = '' - include ${pkgs.nginx}/conf/fastcgi_params; + include ${config.services.nginx.package}/conf/fastcgi_params; fastcgi_param GITWEB_CONFIG ${gitwebConfig.gitwebConfigFile}; fastcgi_pass unix:/run/gitweb/gitweb.sock; ''; diff --git a/nixos/modules/services/web-servers/pomerium.nix b/nixos/modules/services/web-servers/pomerium.nix index 2bc7d01c7c28..0b460755f50e 100644 --- a/nixos/modules/services/web-servers/pomerium.nix +++ b/nixos/modules/services/web-servers/pomerium.nix @@ -69,11 +69,16 @@ in CERTIFICATE_KEY_FILE = "key.pem"; }; startLimitIntervalSec = 60; + script = '' + if [[ -v CREDENTIALS_DIRECTORY ]]; then + cd "$CREDENTIALS_DIRECTORY" + fi + exec "${pkgs.pomerium}/bin/pomerium" -config "${cfgFile}" + ''; serviceConfig = { DynamicUser = true; StateDirectory = [ "pomerium" ]; - ExecStart = "${pkgs.pomerium}/bin/pomerium -config ${cfgFile}"; PrivateUsers = false; # breaks CAP_NET_BIND_SERVICE MemoryDenyWriteExecute = false; # breaks LuaJIT @@ -99,7 +104,6 @@ in AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; - WorkingDirectory = mkIf (cfg.useACMEHost != null) "$CREDENTIALS_DIRECTORY"; LoadCredential = optionals (cfg.useACMEHost != null) [ "fullchain.pem:/var/lib/acme/${cfg.useACMEHost}/fullchain.pem" "key.pem:/var/lib/acme/${cfg.useACMEHost}/key.pem" @@ -124,7 +128,7 @@ in Type = "oneshot"; TimeoutSec = 60; ExecCondition = "/run/current-system/systemd/bin/systemctl -q is-active pomerium.service"; - ExecStart = "/run/current-system/systemd/bin/systemctl restart pomerium.service"; + ExecStart = "/run/current-system/systemd/bin/systemctl --no-block restart pomerium.service"; }; }; }); diff --git a/nixos/modules/services/web-servers/shellinabox.nix b/nixos/modules/services/web-servers/shellinabox.nix deleted file mode 100644 index c7c51f873eba..000000000000 --- a/nixos/modules/services/web-servers/shellinabox.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.shellinabox; - - # If a certificate file is specified, shellinaboxd requires - # a file descriptor to retrieve it - fd = "3"; - createFd = optionalString (cfg.certFile != null) "${fd}<${cfg.certFile}"; - - # Command line arguments for the shellinabox daemon - args = [ "--background" ] - ++ optional (! cfg.enableSSL) "--disable-ssl" - ++ optional (cfg.certFile != null) "--cert-fd=${fd}" - ++ optional (cfg.certDirectory != null) "--cert=${cfg.certDirectory}" - ++ cfg.extraOptions; - - # Command to start shellinaboxd - cmd = "${pkgs.shellinabox}/bin/shellinaboxd ${concatStringsSep " " args}"; - - # Command to start shellinaboxd if certFile is specified - wrappedCmd = "${pkgs.bash}/bin/bash -c 'exec ${createFd} && ${cmd}'"; - -in - -{ - - ###### interface - - options = { - services.shellinabox = { - enable = mkEnableOption "shellinabox daemon"; - - user = mkOption { - type = types.str; - default = "root"; - description = '' - User to run shellinaboxd as. If started as root, the server drops - privileges by changing to nobody, unless overridden by the - --user option. - ''; - }; - - enableSSL = mkOption { - type = types.bool; - default = false; - description = '' - Whether or not to enable SSL (https) support. - ''; - }; - - certDirectory = mkOption { - type = types.nullOr types.path; - default = null; - example = "/var/certs"; - description = '' - The daemon will look in this directory far any certificates. - If the browser negotiated a Server Name Identification the daemon - will look for a matching certificate-SERVERNAME.pem file. If no SNI - handshake takes place, it will fall back on using the certificate in the - certificate.pem file. - - If no suitable certificate is installed, shellinaboxd will attempt to - create a new self-signed certificate. This will only succeed if, after - dropping privileges, shellinaboxd has write permissions for this - directory. - ''; - }; - - certFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/var/certificate.pem"; - description = "Path to server SSL certificate."; - }; - - extraOptions = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "--port=443" "--service /:LOGIN" ]; - description = '' - A list of strings to be appended to the command line arguments - for shellinaboxd. Please see the manual page - - for a full list of available arguments. - ''; - }; - - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - - assertions = - [ { assertion = cfg.enableSSL == true - -> cfg.certDirectory != null || cfg.certFile != null; - message = "SSL is enabled for shellinabox, but no certDirectory or certFile has been specefied."; } - { assertion = ! (cfg.certDirectory != null && cfg.certFile != null); - message = "Cannot set both certDirectory and certFile for shellinabox."; } - ]; - - systemd.services.shellinaboxd = { - description = "Shellinabox Web Server Daemon"; - - wantedBy = [ "multi-user.target" ]; - requires = [ "sshd.service" ]; - after = [ "sshd.service" ]; - - serviceConfig = { - Type = "forking"; - User = "${cfg.user}"; - ExecStart = "${if cfg.certFile == null then "${cmd}" else "${wrappedCmd}"}"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - }; - }; - }; -} diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index f9446fe125a3..877097cf3781 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -23,8 +23,8 @@ in package = mkOption { type = types.package; - default = pkgs.tomcat85; - defaultText = literalExpression "pkgs.tomcat85"; + default = pkgs.tomcat9; + defaultText = literalExpression "pkgs.tomcat9"; example = lib.literalExpression "pkgs.tomcat9"; description = '' Which tomcat package to use. @@ -127,7 +127,7 @@ in webapps = mkOption { type = types.listOf types.path; default = [ tomcat.webapps ]; - defaultText = literalExpression "[ pkgs.tomcat85.webapps ]"; + defaultText = literalExpression "[ config.services.tomcat.package.webapps ]"; description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat"; }; @@ -201,6 +201,7 @@ in { uid = config.ids.uids.tomcat; description = "Tomcat user"; home = "/homeless-shelter"; + group = "tomcat"; extraGroups = cfg.extraGroups; }; diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 6ee5b0fc54f7..8247a7e381c9 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if Plasma 5 is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix - ./lxqt.nix ./enlightenment.nix ./gnome.nix ./kodi.nix + ./lxqt.nix ./enlightenment.nix ./gnome.nix ./retroarch.nix ./kodi.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix ./cinnamon.nix ]; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index efc9bd39b366..f87258ac8dc5 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -132,6 +132,10 @@ in [ "environment" "gnome3" "excludePackages" ] [ "environment" "gnome" "excludePackages" ] ) + (mkRemovedOptionModule + [ "services" "gnome" "experimental-features" "realtime-scheduling" ] + "Set `security.rtkit.enable = true;` to make realtime scheduling possible. (Still needs to be enabled using GSettings.)" + ) ]; options = { @@ -142,38 +146,6 @@ in core-utilities.enable = mkEnableOption "GNOME core utilities"; core-developer-tools.enable = mkEnableOption "GNOME core developer tools"; games.enable = mkEnableOption "GNOME games"; - - experimental-features = { - realtime-scheduling = mkOption { - type = types.bool; - default = false; - description = '' - Makes mutter (which propagates to gnome-shell) request a low priority real-time - scheduling which is only available on the wayland session. - To enable this experimental feature it requires a restart of the compositor. - Note that enabling this option only enables the capability - for realtime-scheduling to be used. It doesn't automatically set the gsetting - so that mutter actually uses realtime-scheduling. This would require adding - rt-scheduler to /org/gnome/mutter/experimental-features - with dconf-editor. You cannot use extraGSettingsOverrides because that will only - change the default value of the setting. - - Please be aware of these known issues with the feature in nixos: - - - - NixOS/nixpkgs#90201 - - - - - NixOS/nixpkgs#86730 - - - - ''; - }; - }; }; services.xserver.desktopManager.gnome = { @@ -414,7 +386,6 @@ in services.gnome.rygel.enable = mkDefault true; services.gvfs.enable = true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); - services.telepathy.enable = mkDefault true; systemd.packages = with pkgs.gnome; [ gnome-session @@ -480,29 +451,6 @@ in ]; }) - # Enable soft realtime scheduling, only supported on wayland - (mkIf serviceCfg.experimental-features.realtime-scheduling { - security.wrappers.".gnome-shell-wrapped" = { - source = "${pkgs.gnome.gnome-shell}/bin/.gnome-shell-wrapped"; - owner = "root"; - group = "root"; - capabilities = "cap_sys_nice=ep"; - }; - - systemd.user.services.gnome-shell-wayland = let - gnomeShellRT = with pkgs.gnome; pkgs.runCommand "gnome-shell-rt" {} '' - mkdir -p $out/bin/ - cp ${gnome-shell}/bin/gnome-shell $out/bin - sed -i "s@${gnome-shell}/bin/@${config.security.wrapperDir}/@" $out/bin/gnome-shell - ''; - in { - # Note we need to clear ExecStart before overriding it - serviceConfig.ExecStart = ["" "${gnomeShellRT}/bin/gnome-shell"]; - # Do not use the default environment, it provides a broken PATH - environment = mkForce {}; - }; - }) - # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst (mkIf serviceCfg.core-utilities.enable { environment.systemPackages = @@ -513,18 +461,18 @@ in cheese eog epiphany - gedit + pkgs.gnome-text-editor gnome-calculator gnome-calendar gnome-characters gnome-clocks + pkgs.gnome-console gnome-contacts gnome-font-viewer gnome-logs gnome-maps gnome-music pkgs.gnome-photos - gnome-screenshot gnome-system-monitor gnome-weather nautilus @@ -547,10 +495,13 @@ in programs.file-roller.enable = notExcluded pkgs.gnome.file-roller; programs.geary.enable = notExcluded pkgs.gnome.geary; programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility; - programs.gnome-terminal.enable = notExcluded pkgs.gnome.gnome-terminal; programs.seahorse.enable = notExcluded pkgs.gnome.seahorse; services.gnome.sushi.enable = notExcluded pkgs.gnome.sushi; + # VTE shell integration for gnome-console + programs.bash.vteIntegration = mkDefault true; + programs.zsh.vteIntegration = mkDefault true; + # Let nautilus find extensions # TODO: Create nautilus-with-extensions package environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0"; @@ -569,6 +520,7 @@ in atomix five-or-more four-in-a-row + pkgs.gnome-2048 gnome-chess gnome-klotski gnome-mahjongg diff --git a/nixos/modules/services/x11/desktop-managers/gnome.xml b/nixos/modules/services/x11/desktop-managers/gnome.xml index e5da7740196e..807c9d64e204 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.xml +++ b/nixos/modules/services/x11/desktop-managers/gnome.xml @@ -249,14 +249,5 @@ services.xserver.desktopManager.gnome = { See this issue. - -
- Why does <literal>nixos-rebuild switch</literal> sometimes kill my session? - - - This is a known issue without any workarounds. - If you are doing a fairly large upgrade, it is probably safer to use nixos-rebuild boot. - -
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index f8f47a061452..a7fda4be9796 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -74,11 +74,9 @@ in # Debugging environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1"; - environment.systemPackages = - pkgs.mate.basePackages ++ - (pkgs.gnome.removePackagesByName - pkgs.mate.extraPackages - config.environment.mate.excludePackages) ++ + environment.systemPackages = pkgs.gnome.removePackagesByName + (pkgs.mate.basePackages ++ + pkgs.mate.extraPackages ++ [ pkgs.desktop-file-utils pkgs.glib @@ -87,7 +85,8 @@ in pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ pkgs.mate.mate-settings-daemon pkgs.yelp # for 'Contents' in 'Help' menus - ]; + ]) + config.environment.mate.excludePackages; programs.dconf.enable = true; # Shell integration for VTE terminals diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 980a6b939d5a..48e119a86187 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -135,6 +135,7 @@ in services.bamf.enable = true; services.colord.enable = mkDefault true; services.fwupd.enable = mkDefault true; + services.packagekit.enable = mkDefault true; services.touchegg.enable = mkDefault true; services.touchegg.package = pkgs.pantheon.touchegg; services.tumbler.enable = mkDefault true; @@ -219,14 +220,12 @@ in ] config.environment.pantheon.excludePackages); programs.evince.enable = mkDefault true; - programs.evince.package = pkgs.pantheon.evince; programs.file-roller.enable = mkDefault true; - programs.file-roller.package = pkgs.pantheon.file-roller; # Settings from elementary-default-settings - environment.sessionVariables.GTK_CSD = "1"; environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini"; + xdg.portal.enable = true; xdg.portal.extraPortals = with pkgs.pantheon; [ elementary-files elementary-settings-daemon @@ -273,7 +272,7 @@ in }) (mkIf serviceCfg.apps.enable { - environment.systemPackages = (with pkgs.pantheon; pkgs.gnome.removePackagesByName [ + environment.systemPackages = with pkgs.pantheon; pkgs.gnome.removePackagesByName ([ elementary-calculator elementary-calendar elementary-camera @@ -287,7 +286,11 @@ in elementary-terminal elementary-videos epiphany - ] config.environment.pantheon.excludePackages); + ] ++ lib.optionals config.services.flatpak.enable [ + # Only install appcenter if flatpak is enabled before + # https://github.com/NixOS/nixpkgs/issues/15932 is resolved. + appcenter + ]) config.environment.pantheon.excludePackages; # needed by screenshot fonts.fonts = [ @@ -299,7 +302,6 @@ in environment.systemPackages = with pkgs.pantheon; [ contractor file-roller-contract - gnome-bluetooth-contract ]; environment.pathsToLink = [ diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml index fe0a1c496223..202909d398f0 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -105,10 +105,10 @@ switchboard-with-plugs.override { - AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. See this issue. + AppCenter has been available since 20.03. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. However, due to missing appstream metadata, the Packagekit backend does not function currently. See this issue. - To use AppCenter on NixOS, add pantheon.appcenter to , enable Flatpak support and optionally add the appcenter Flatpak remote: + If you are using Pantheon, AppCenter should be installed by default if you have Flatpak support enabled. If you also wish to add the appcenter Flatpak remote: $ flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 9bacdaa9be98..3ca044ad5bc8 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -394,7 +394,8 @@ in # Extra UDEV rules used by Solid services.udev.packages = [ - pkgs.libmtp + # libmtp has "bin", "dev", "out" outputs. UDEV rules file is in "out". + pkgs.libmtp.out pkgs.media-player-info ]; @@ -518,7 +519,7 @@ in with plasma5; with kdeApplications; with kdeFrameworks; [ # Basic packages without which Plasma Mobile fails to work properly. - plasma-phone-components + plasma-mobile plasma-nano pkgs.maliit-framework pkgs.maliit-keyboard @@ -572,7 +573,7 @@ in }; }; - services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-phone-components ]; + services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-mobile ]; }) ]; } diff --git a/nixos/modules/services/x11/desktop-managers/retroarch.nix b/nixos/modules/services/x11/desktop-managers/retroarch.nix new file mode 100644 index 000000000000..d471673d4521 --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/retroarch.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.services.xserver.desktopManager.retroarch; + +in { + options.services.xserver.desktopManager.retroarch = { + enable = mkEnableOption "RetroArch"; + + package = mkOption { + type = types.package; + default = pkgs.retroarch; + defaultText = literalExpression "pkgs.retroarch"; + example = literalExpression "pkgs.retroarch-full"; + description = "RetroArch package to use."; + }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--verbose" "--host" ]; + description = "Extra arguments to pass to RetroArch."; + }; + }; + + config = mkIf cfg.enable { + services.xserver.desktopManager.session = [{ + name = "RetroArch"; + start = '' + ${cfg.package}/bin/retroarch -f ${escapeShellArgs cfg.extraArgs} & + waitPID=$! + ''; + }]; + + environment.systemPackages = [ cfg.package ]; + }; + + meta.maintainers = with maintainers; [ j0hax ]; +} diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 92b3af8527f1..a5db3dd5dd45 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -219,6 +219,7 @@ in session = mkOption { default = []; + type = types.listOf types.attrs; example = literalExpression '' [ { manage = "desktop"; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 6f0d645725e9..70ae6b8978d0 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -53,6 +53,8 @@ in "autoLogin" "user" ]) + + (mkRemovedOptionModule [ "services" "xserver" "displayManager" "gdm" "nvidiaWayland" ] "We defer to GDM whether Wayland should be enabled.") ]; meta = { @@ -83,17 +85,6 @@ in default = true; description = '' Allow GDM to run on Wayland instead of Xserver. - Note to enable Wayland with Nvidia the - must not be disabled. - ''; - }; - - nvidiaWayland = mkOption { - type = types.bool; - default = true; - description = '' - Whether to allow wayland to be used with the proprietary - NVidia graphics driver. ''; }; @@ -149,7 +140,8 @@ in environment = { GDM_X_SERVER_EXTRA_ARGS = toString (filter (arg: arg != "-terminate") cfg.xserverArgs); - XDG_DATA_DIRS = "${cfg.sessionData.desktops}/share/"; + # GDM is needed for gnome-login.session + XDG_DATA_DIRS = "${gdm}/share:${cfg.sessionData.desktops}/share:${pkgs.gnome.gnome-control-center}/share"; } // optionalAttrs (xSessionWrapper != null) { # Make GDM use this wrapper before running the session, which runs the # configured setupCommands. This relies on a patched GDM which supports @@ -230,19 +222,6 @@ in services.dbus.packages = [ gdm ]; - # We duplicate upstream's udev rules manually to make wayland with nvidia configurable - services.udev.extraRules = '' - # disable Wayland on Cirrus chipsets - ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" - # disable Wayland on Hi1710 chipsets - ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" - ${optionalString (!cfg.gdm.nvidiaWayland) '' - DRIVER=="nvidia", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" - ''} - # disable Wayland when modesetting is disabled - IMPORT{cmdline}="nomodeset", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false" - ''; - systemd.user.services.dbus.wantedBy = [ "default.target" ]; programs.dconf.profiles.gdm = diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 84b75c83aeab..27dfed3cc14c 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -267,6 +267,8 @@ in # Enable the accounts daemon to find lightdm's dbus interface environment.systemPackages = [ lightdm ]; + security.polkit.enable = true; + security.pam.services.lightdm.text = '' auth substack login account include login diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index ec6d86d59bdf..0c50d82b23be 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -620,9 +620,6 @@ in in optional (driver != null) ({ inherit name; modules = []; driverName = name; display = true; } // driver)); assertions = [ - { assertion = config.security.polkit.enable; - message = "X11 requires Polkit to be enabled (‘security.polkit.enable = true’)."; - } (let primaryHeads = filter (x: x.primary) cfg.xrandrHeads; in { assertion = length primaryHeads < 2; message = "Only one head is allowed to be primary in " diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl old mode 100644 new mode 100755 index 93fff889d6bc..9e5b760434a0 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -2,40 +2,63 @@ use strict; use warnings; +use Config::IniFiles; use File::Path qw(make_path); use File::Basename; -use File::Slurp; +use File::Slurp qw(read_file write_file edit_file); use Net::DBus; use Sys::Syslog qw(:standard :macros); -use Cwd 'abs_path'; +use Cwd qw(abs_path); +## no critic(ControlStructures::ProhibitDeepNests) +## no critic(ErrorHandling::RequireCarping) +## no critic(CodeLayout::ProhibitParensWithBuiltins) +## no critic(Variables::ProhibitPunctuationVars, Variables::RequireLocalizedPunctuationVars) +## no critic(InputOutput::RequireCheckedSyscalls, InputOutput::RequireBracedFileHandleWithPrint, InputOutput::RequireBriefOpen) +## no critic(ValuesAndExpressions::ProhibitNoisyQuotes, ValuesAndExpressions::ProhibitMagicNumbers, ValuesAndExpressions::ProhibitEmptyQuotes, ValuesAndExpressions::ProhibitInterpolationOfLiterals) +## no critic(RegularExpressions::ProhibitEscapedMetacharacters) + +# System closure path to switch to my $out = "@out@"; - -my $curSystemd = abs_path("/run/current-system/sw/bin"); +# Path to the directory containing systemd tools of the old system +my $cur_systemd = abs_path("/run/current-system/sw/bin"); +# Path to the systemd store path of the new system +my $new_systemd = "@systemd@"; # To be robust against interruption, record what units need to be started etc. -my $startListFile = "/run/nixos/start-list"; -my $restartListFile = "/run/nixos/restart-list"; -my $reloadListFile = "/run/nixos/reload-list"; +# We read these files again every time this script starts to make sure we continue +# where the old (interrupted) script left off. +my $start_list_file = "/run/nixos/start-list"; +my $restart_list_file = "/run/nixos/restart-list"; +my $reload_list_file = "/run/nixos/reload-list"; # Parse restart/reload requests by the activation script. -# Activation scripts may write newline-separated units to this +# Activation scripts may write newline-separated units to the restart # file and switch-to-configuration will handle them. While # `stopIfChanged = true` is ignored, switch-to-configuration will # handle `restartIfChanged = false` and `reloadIfChanged = true`. -my $restartByActivationFile = "/run/nixos/activation-restart-list"; -my $dryRestartByActivationFile = "/run/nixos/dry-activation-restart-list"; +# This is the same as specifying a restart trigger in the NixOS module. +# +# The reload file asks the script to reload a unit. This is the same as +# specifying a reload trigger in the NixOS module and can be ignored if +# the unit is restarted in this activation. +my $restart_by_activation_file = "/run/nixos/activation-restart-list"; +my $reload_by_activation_file = "/run/nixos/activation-reload-list"; +my $dry_restart_by_activation_file = "/run/nixos/dry-activation-restart-list"; +my $dry_reload_by_activation_file = "/run/nixos/dry-activation-reload-list"; -make_path("/run/nixos", { mode => oct(755) }); - -my $action = shift @ARGV; +# The action that is to be performed (like switch, boot, test, dry-activate) +# Also exposed via environment variable from now on +my $action = shift(@ARGV); +$ENV{NIXOS_ACTION} = $action; +# Expose the locale archive as an environment variable for systemctl and the activation script if ("@localeArchive@" ne "") { $ENV{LOCALE_ARCHIVE} = "@localeArchive@"; } -if (!defined $action || ($action ne "switch" && $action ne "boot" && $action ne "test" && $action ne "dry-activate")) { - print STDERR < 'quiet') // "") =~ /ID=nixos/s; +if (!-f "/etc/NIXOS" && (read_file("/etc/os-release", err_mode => "quiet") // "") !~ /^ID="?nixos"?/msx) { + die("This is not a NixOS installation!\n"); +} +make_path("/run/nixos", { mode => oct(755) }); openlog("nixos", "", LOG_USER); # Install or update the bootloader. if ($action eq "switch" || $action eq "boot") { - system("@installBootLoader@ $out") == 0 or exit 1; + chomp(my $install_boot_loader = <<'EOFBOOTLOADER'); +@installBootLoader@ +EOFBOOTLOADER + system("$install_boot_loader $out") == 0 or exit 1; } # Just in case the new configuration hangs the system, do a sync now. -system("@coreutils@/bin/sync", "-f", "/nix/store") unless ($ENV{"NIXOS_NO_SYNC"} // "") eq "1"; +if (($ENV{"NIXOS_NO_SYNC"} // "") ne "1") { + system("@coreutils@/bin/sync", "-f", "/nix/store"); +} -exit 0 if $action eq "boot"; +if ($action eq "boot") { + exit(0); +} # Check if we can activate the new configuration. -my $oldVersion = read_file("/run/current-system/init-interface-version", err_mode => 'quiet') // ""; -my $newVersion = read_file("$out/init-interface-version"); +my $cur_init_interface_version = read_file("/run/current-system/init-interface-version", err_mode => "quiet") // ""; +my $new_init_interface_version = read_file("$out/init-interface-version"); -if ($newVersion ne $oldVersion) { - print STDERR <system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1"); my $units = $mgr->ListUnitsByPatterns([], []); my $res = {}; - for my $item (@$units) { + for my $item (@{$units}) { my ($id, $description, $load_state, $active_state, $sub_state, - $following, $unit_path, $job_id, $job_type, $job_path) = @$item; - next unless $following eq ''; - next if $job_id == 0 and $active_state eq 'inactive'; + $following, $unit_path, $job_id, $job_type, $job_path) = @{$item}; + if ($following ne "") { + next; + } + if ($job_id == 0 and $active_state eq "inactive") { + next; + } $res->{$id} = { load => $load_state, state => $active_state, substate => $sub_state }; } return $res; } -sub parseFstab { +# Asks the currently running systemd instance whether a unit is currently active. +# Takes the name of the unit as an argument and returns a bool whether the unit is active or not. +sub unit_is_active { + my ($unit_name) = @_; + + my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1"); + my $units = $mgr->ListUnitsByNames([$unit_name]); + if (scalar(@{$units}) == 0) { + return 0; + } + my $active_state = $units->[0]->[3]; + return $active_state eq "active" || $active_state eq "activating"; +} + +# Parse a fstab file, given its path. +# Returns a tuple of filesystems and swaps. +# +# Filesystems is a hash of mountpoint and { device, fsType, options } +# Swaps is a hash of device and { options } +sub parse_fstab { my ($filename) = @_; my ($fss, $swaps); - foreach my $line (read_file($filename, err_mode => 'quiet')) { - chomp $line; - $line =~ s/^\s*#.*//; - next if $line =~ /^\s*$/; - my @xs = split / /, $line; + foreach my $line (read_file($filename, err_mode => "quiet")) { + chomp($line); + $line =~ s/^\s*\#.*//msx; + if ($line =~ /^\s*$/msx) { + next; + } + my @xs = split(/\s+/msx, $line); if ($xs[2] eq "swap") { $swaps->{$xs[0]} = { options => $xs[3] // "" }; } else { @@ -113,94 +171,297 @@ sub parseFstab { return ($fss, $swaps); } -sub parseUnit { - my ($filename) = @_; - my $info = {}; - parseKeyValues($info, read_file($filename)) if -f $filename; - parseKeyValues($info, read_file("${filename}.d/overrides.conf")) if -f "${filename}.d/overrides.conf"; - return $info; -} +# This subroutine takes a single ini file that specified systemd configuration +# like unit configuration and parses it into a hash where the keys are the sections +# of the unit file and the values are hashes themselves. These hashes have the unit file +# keys as their keys (left side of =) and an array of all values that were set as their +# values. If a value is empty (for example `ExecStart=`), then all current definitions are +# removed. +# +# Instead of returning the hash, this subroutine takes a hashref to return the data in. This +# allows calling the subroutine multiple times with the same hash to parse override files. +sub parse_systemd_ini { + my ($unit_contents, $path) = @_; + # Tie the ini file to a hash for easier access + tie(my %file_contents, "Config::IniFiles", (-file => $path, -allowempty => 1, -allowcontinue => 1)); ## no critic(Miscellanea::ProhibitTies) -sub parseKeyValues { - my $info = shift; - foreach my $line (@_) { - # FIXME: not quite correct. - $line =~ /^([^=]+)=(.*)$/ or next; - $info->{$1} = $2; + # Copy over all sections + foreach my $section_name (keys(%file_contents)) { + if ($section_name eq "Install") { + # Skip the [Install] section because it has no relevant keys for us + next; + } + # Copy over all keys + foreach my $ini_key (keys(%{$file_contents{$section_name}})) { + # Ensure the value is an array so it's easier to work with + my $ini_value = $file_contents{$section_name}{$ini_key}; + my @ini_values; + if (ref($ini_value) eq "ARRAY") { + @ini_values = @{$ini_value}; + } else { + @ini_values = $ini_value; + } + # Go over all values + for my $ini_value (@ini_values) { + # If a value is empty, it's an override that tells us to clean the value + if ($ini_value eq "") { + delete $unit_contents->{$section_name}->{$ini_key}; + next; + } + push(@{$unit_contents->{$section_name}->{$ini_key}}, $ini_value); + } + } } + return; } -sub boolIsTrue { - my ($s) = @_; - return $s eq "yes" || $s eq "true"; +# This subroutine takes the path to a systemd configuration file (like a unit configuration), +# parses it, and returns a hash that contains the contents. The contents of this hash are +# explained in the `parse_systemd_ini` subroutine. Neither the sections nor the keys inside +# the sections are consistently sorted. +# +# If a directory with the same basename ending in .d exists next to the unit file, it will be +# assumed to contain override files which will be parsed as well and handled properly. +sub parse_unit { + my ($unit_path) = @_; + + # Parse the main unit and all overrides + my %unit_data; + # Replace \ with \\ so glob() still works with units that have a \ in them + # Valid characters in unit names are ASCII letters, digits, ":", "-", "_", ".", and "\" + $unit_path =~ s/\\/\\\\/gmsx; + foreach (glob("${unit_path}{,.d/*.conf}")) { + parse_systemd_ini(\%unit_data, "$_") + } + return %unit_data; } -sub recordUnit { +# Checks whether a specified boolean in a systemd unit is true +# or false, with a default that is applied when the value is not set. +sub parse_systemd_bool { + my ($unit_config, $section_name, $bool_name, $default) = @_; + + my @values = @{$unit_config->{$section_name}{$bool_name} // []}; + # Return default if value is not set + if ((scalar(@values) < 1) || (not defined($values[-1]))) { + return $default; + } + # If value is defined multiple times, use the last definition + my $last_value = $values[-1]; + # These are valid values as of systemd.syntax(7) + return $last_value eq "1" || $last_value eq "yes" || $last_value eq "true" || $last_value eq "on"; +} + +# Writes a unit name into a given file to be more resilient against +# crashes of the script. Does nothing when the action is dry-activate. +sub record_unit { my ($fn, $unit) = @_; - write_file($fn, { append => 1 }, "$unit\n") if $action ne "dry-activate"; + if ($action ne "dry-activate") { + write_file($fn, { append => 1 }, "$unit\n"); + } + return; } -# As a fingerprint for determining whether a unit has changed, we use -# its absolute path. If it has an override file, we append *its* -# absolute path as well. -sub fingerprintUnit { - my ($s) = @_; - return abs_path($s) . (-f "${s}.d/overrides.conf" ? " " . abs_path "${s}.d/overrides.conf" : ""); +# The opposite of record_unit, removes a unit name from a file +sub unrecord_unit { + my ($fn, $unit) = @_; + if ($action ne "dry-activate") { + edit_file(sub { s/^$unit\n//msx }, $fn); + } + return; } -sub handleModifiedUnit { - my ($unit, $baseName, $newUnitFile, $activePrev, $unitsToStop, $unitsToStart, $unitsToReload, $unitsToRestart, $unitsToSkip) = @_; +# Compare the contents of two unit files and return whether the unit +# needs to be restarted or reloaded. If the units differ, the service +# is restarted unless the only difference is `X-Reload-Triggers` in the +# `Unit` section. If this is the only modification, the unit is reloaded +# instead of restarted. +# Returns: +# - 0 if the units are equal +# - 1 if the units are different and a restart action is required +# - 2 if the units are different and a reload action is required +sub compare_units { ## no critic(Subroutines::ProhibitExcessComplexity) + my ($cur_unit, $new_unit) = @_; + my $ret = 0; + # Keys to ignore in the [Unit] section + my %unit_section_ignores = map { $_ => 1 } qw( + X-Reload-Triggers + Description Documentation + OnFailure OnSuccess OnFailureJobMode + IgnoreOnIsolate StopWhenUnneeded + RefuseManualStart RefuseManualStop + AllowIsolate CollectMode + SourcePath + ); - if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target" || $unit =~ /\.path$/ || $unit =~ /\.slice$/) { + my $comp_array = sub { + my ($a, $b) = @_; + return join("\0", @{$a}) eq join("\0", @{$b}); + }; + + # Comparison hash for the sections + my %section_cmp = map { $_ => 1 } keys(%{$new_unit}); + # Iterate over the sections + foreach my $section_name (keys(%{$cur_unit})) { + # Missing section in the new unit? + if (not exists($section_cmp{$section_name})) { + # If the [Unit] section was removed, make sure that only keys + # were in it that are ignored + if ($section_name eq "Unit") { + foreach my $ini_key (keys(%{$cur_unit->{"Unit"}})) { + if (not defined($unit_section_ignores{$ini_key})) { + return 1; + } + } + next; # check the next section + } else { + return 1; + } + if ($section_name eq "Unit" and %{$cur_unit->{"Unit"}} == 1 and defined(%{$cur_unit->{"Unit"}}{"X-Reload-Triggers"})) { + # If a new [Unit] section was removed that only contained X-Reload-Triggers, + # do nothing. + next; + } else { + return 1; + } + } + delete $section_cmp{$section_name}; + # Comparison hash for the section contents + my %ini_cmp = map { $_ => 1 } keys(%{$new_unit->{$section_name}}); + # Iterate over the keys of the section + foreach my $ini_key (keys(%{$cur_unit->{$section_name}})) { + delete $ini_cmp{$ini_key}; + my @cur_value = @{$cur_unit->{$section_name}{$ini_key}}; + # If the key is missing in the new unit, they are different... + if (not $new_unit->{$section_name}{$ini_key}) { + # ... unless the key that is now missing is one of the ignored keys + if ($section_name eq "Unit" and defined($unit_section_ignores{$ini_key})) { + next; + } + return 1; + } + my @new_value = @{$new_unit->{$section_name}{$ini_key}}; + # If the contents are different, the units are different + if (not $comp_array->(\@cur_value, \@new_value)) { + # Check if only the reload triggers changed or one of the ignored keys + if ($section_name eq "Unit") { + if ($ini_key eq "X-Reload-Triggers") { + $ret = 2; + next; + } elsif (defined($unit_section_ignores{$ini_key})) { + next; + } + } + return 1; + } + } + # A key was introduced that was missing in the previous unit + if (%ini_cmp) { + if ($section_name eq "Unit") { + foreach my $ini_key (keys(%ini_cmp)) { + if ($ini_key eq "X-Reload-Triggers") { + $ret = 2; + } elsif (defined($unit_section_ignores{$ini_key})) { + next; + } else { + return 1; + } + } + } else { + return 1; + } + }; + } + # A section was introduced that was missing in the previous unit + if (%section_cmp) { + if (%section_cmp == 1 and defined($section_cmp{"Unit"})) { + foreach my $ini_key (keys(%{$new_unit->{"Unit"}})) { + if (not defined($unit_section_ignores{$ini_key})) { + return 1; + } elsif ($ini_key eq "X-Reload-Triggers") { + $ret = 2; + } + } + } else { + return 1; + } + } + + return $ret; +} + +# Called when a unit exists in both the old systemd and the new system and the units +# differ. This figures out of what units are to be stopped, restarted, reloaded, started, and skipped. +sub handle_modified_unit { ## no critic(Subroutines::ProhibitManyArgs, Subroutines::ProhibitExcessComplexity) + my ($unit, $base_name, $new_unit_file, $new_unit_info, $active_cur, $units_to_stop, $units_to_start, $units_to_reload, $units_to_restart, $units_to_skip) = @_; + + if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target" || $unit =~ /\.path$/msx || $unit =~ /\.slice$/msx) { # Do nothing. These cannot be restarted directly. # Slices and Paths don't have to be restarted since # properties (resource limits and inotify watches) # seem to get applied on daemon-reload. - } elsif ($unit =~ /\.mount$/) { + } elsif ($unit =~ /\.mount$/msx) { # Reload the changed mount unit to force a remount. - $unitsToReload->{$unit} = 1; - recordUnit($reloadListFile, $unit); - } elsif ($unit =~ /\.socket$/) { + # FIXME: only reload when Options= changed, restart otherwise + $units_to_reload->{$unit} = 1; + record_unit($reload_list_file, $unit); + } elsif ($unit =~ /\.socket$/msx) { # FIXME: do something? # Attempt to fix this: https://github.com/NixOS/nixpkgs/pull/141192 # Revert of the attempt: https://github.com/NixOS/nixpkgs/pull/147609 # More details: https://github.com/NixOS/nixpkgs/issues/74899#issuecomment-981142430 } else { - my $unitInfo = parseUnit($newUnitFile); - if (boolIsTrue($unitInfo->{'X-ReloadIfChanged'} // "no")) { - $unitsToReload->{$unit} = 1; - recordUnit($reloadListFile, $unit); + my %new_unit_info = $new_unit_info ? %{$new_unit_info} : parse_unit($new_unit_file); + if (parse_systemd_bool(\%new_unit_info, "Service", "X-ReloadIfChanged", 0) and not $units_to_restart->{$unit} and not $units_to_stop->{$unit}) { + $units_to_reload->{$unit} = 1; + record_unit($reload_list_file, $unit); } - elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) { - $unitsToSkip->{$unit} = 1; + elsif (!parse_systemd_bool(\%new_unit_info, "Service", "X-RestartIfChanged", 1) || parse_systemd_bool(\%new_unit_info, "Unit", "RefuseManualStop", 0) || parse_systemd_bool(\%new_unit_info, "Unit", "X-OnlyManualStart", 0)) { + $units_to_skip->{$unit} = 1; } else { # It doesn't make sense to stop and start non-services because # they can't have ExecStop= - if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "yes") || $unit !~ /\.service$/) { + if (!parse_systemd_bool(\%new_unit_info, "Service", "X-StopIfChanged", 1) || $unit !~ /\.service$/msx) { # This unit should be restarted instead of # stopped and started. - $unitsToRestart->{$unit} = 1; - recordUnit($restartListFile, $unit); + $units_to_restart->{$unit} = 1; + record_unit($restart_list_file, $unit); + # Remove from units to reload so we don't restart and reload + if ($units_to_reload->{$unit}) { + delete $units_to_reload->{$unit}; + unrecord_unit($reload_list_file, $unit); + } } else { # If this unit is socket-activated, then stop the # socket unit(s) as well, and restart the # socket(s) instead of the service. - my $socketActivated = 0; - if ($unit =~ /\.service$/) { - my @sockets = split / /, ($unitInfo->{Sockets} // ""); - if (scalar @sockets == 0) { - @sockets = ("$baseName.socket"); + my $socket_activated = 0; + if ($unit =~ /\.service$/msx) { + my @sockets = split(/\s+/msx, join(" ", @{$new_unit_info{Service}{Sockets} // []})); + if (scalar(@sockets) == 0) { + @sockets = ("$base_name.socket"); } foreach my $socket (@sockets) { - if (defined $activePrev->{$socket}) { - $unitsToStop->{$socket} = 1; + if (defined($active_cur->{$socket})) { + # We can now be sure this is a socket-activate unit + + $units_to_stop->{$socket} = 1; # Only restart sockets that actually # exist in new configuration: if (-e "$out/etc/systemd/system/$socket") { - $unitsToStart->{$socket} = 1; - recordUnit($startListFile, $socket); - $socketActivated = 1; + $units_to_start->{$socket} = 1; + if ($units_to_start eq $units_to_restart) { + record_unit($restart_list_file, $socket); + } else { + record_unit($start_list_file, $socket); + } + $socket_activated = 1; + } + # Remove from units to reload so we don't restart and reload + if ($units_to_reload->{$unit}) { + delete $units_to_reload->{$unit}; + unrecord_unit($reload_list_file, $unit); } } } @@ -210,56 +471,68 @@ sub handleModifiedUnit { # that this unit needs to be started below. # We write this to a file to ensure that the # service gets restarted if we're interrupted. - if (!$socketActivated) { - $unitsToStart->{$unit} = 1; - recordUnit($startListFile, $unit); + if (!$socket_activated) { + $units_to_start->{$unit} = 1; + if ($units_to_start eq $units_to_restart) { + record_unit($restart_list_file, $unit); + } else { + record_unit($start_list_file, $unit); + } } - $unitsToStop->{$unit} = 1; + $units_to_stop->{$unit} = 1; + # Remove from units to reload so we don't restart and reload + if ($units_to_reload->{$unit}) { + delete $units_to_reload->{$unit}; + unrecord_unit($reload_list_file, $unit); + } } } } + return; } # Figure out what units need to be stopped, started, restarted or reloaded. -my (%unitsToStop, %unitsToSkip, %unitsToStart, %unitsToRestart, %unitsToReload); +my (%units_to_stop, %units_to_skip, %units_to_start, %units_to_restart, %units_to_reload); -my %unitsToFilter; # units not shown +my %units_to_filter; # units not shown -$unitsToStart{$_} = 1 foreach - split('\n', read_file($startListFile, err_mode => 'quiet') // ""); +%units_to_start = map { $_ => 1 } + split(/\n/msx, read_file($start_list_file, err_mode => "quiet") // ""); -$unitsToRestart{$_} = 1 foreach - split('\n', read_file($restartListFile, err_mode => 'quiet') // ""); +%units_to_restart = map { $_ => 1 } + split(/\n/msx, read_file($restart_list_file, err_mode => "quiet") // ""); -$unitsToReload{$_} = 1 foreach - split('\n', read_file($reloadListFile, err_mode => 'quiet') // ""); +%units_to_reload = map { $_ => 1 } + split(/\n/msx, read_file($reload_list_file, err_mode => "quiet") // ""); -my $activePrev = getActiveUnits; -while (my ($unit, $state) = each %{$activePrev}) { - my $baseUnit = $unit; +my $active_cur = get_active_units(); +while (my ($unit, $state) = each(%{$active_cur})) { + my $base_unit = $unit; - my $prevUnitFile = "/etc/systemd/system/$baseUnit"; - my $newUnitFile = "$out/etc/systemd/system/$baseUnit"; + my $cur_unit_file = "/etc/systemd/system/$base_unit"; + my $new_unit_file = "$out/etc/systemd/system/$base_unit"; # Detect template instances. - if (!-e $prevUnitFile && !-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) { - $baseUnit = "$1\@.$2"; - $prevUnitFile = "/etc/systemd/system/$baseUnit"; - $newUnitFile = "$out/etc/systemd/system/$baseUnit"; + if (!-e $cur_unit_file && !-e $new_unit_file && $unit =~ /^(.*)@[^\.]*\.(.*)$/msx) { + $base_unit = "$1\@.$2"; + $cur_unit_file = "/etc/systemd/system/$base_unit"; + $new_unit_file = "$out/etc/systemd/system/$base_unit"; } - my $baseName = $baseUnit; - $baseName =~ s/\.[a-z]*$//; + my $base_name = $base_unit; + $base_name =~ s/\.[[:lower:]]*$//msx; - if (-e $prevUnitFile && ($state->{state} eq "active" || $state->{state} eq "activating")) { - if (! -e $newUnitFile || abs_path($newUnitFile) eq "/dev/null") { - my $unitInfo = parseUnit($prevUnitFile); - $unitsToStop{$unit} = 1 if boolIsTrue($unitInfo->{'X-StopOnRemoval'} // "yes"); + if (-e $cur_unit_file && ($state->{state} eq "active" || $state->{state} eq "activating")) { + if (! -e $new_unit_file || abs_path($new_unit_file) eq "/dev/null") { + my %cur_unit_info = parse_unit($cur_unit_file); + if (parse_systemd_bool(\%cur_unit_info, "Unit", "X-StopOnRemoval", 1)) { + $units_to_stop{$unit} = 1; + } } - elsif ($unit =~ /\.target$/) { - my $unitInfo = parseUnit($newUnitFile); + elsif ($unit =~ /\.target$/msx) { + my %new_unit_info = parse_unit($new_unit_file); # Cause all active target units to be restarted below. # This should start most changed units we stop here as @@ -268,11 +541,11 @@ while (my ($unit, $state) = each %{$activePrev}) { # active after the system has resumed, which probably # should not be the case. Just ignore it. if ($unit ne "suspend.target" && $unit ne "hibernate.target" && $unit ne "hybrid-sleep.target") { - unless (boolIsTrue($unitInfo->{'RefuseManualStart'} // "no") || boolIsTrue($unitInfo->{'X-OnlyManualStart'} // "no")) { - $unitsToStart{$unit} = 1; - recordUnit($startListFile, $unit); + if (!(parse_systemd_bool(\%new_unit_info, "Unit", "RefuseManualStart", 0) || parse_systemd_bool(\%new_unit_info, "Unit", "X-OnlyManualStart", 0))) { + $units_to_start{$unit} = 1; + record_unit($start_list_file, $unit); # Don't spam the user with target units that always get started. - $unitsToFilter{$unit} = 1; + $units_to_filter{$unit} = 1; } } @@ -287,163 +560,188 @@ while (my ($unit, $state) = each %{$activePrev}) { # Stopping a target generally has no effect on other units # (unless there is a PartOf dependency), so this is just a # bookkeeping thing to get systemd to do the right thing. - if (boolIsTrue($unitInfo->{'X-StopOnReconfiguration'} // "no")) { - $unitsToStop{$unit} = 1; + if (parse_systemd_bool(\%new_unit_info, "Unit", "X-StopOnReconfiguration", 0)) { + $units_to_stop{$unit} = 1; } } - elsif (fingerprintUnit($prevUnitFile) ne fingerprintUnit($newUnitFile)) { - handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToStop, \%unitsToStart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip); + else { + my %cur_unit_info = parse_unit($cur_unit_file); + my %new_unit_info = parse_unit($new_unit_file); + my $diff = compare_units(\%cur_unit_info, \%new_unit_info); + if ($diff == 1) { + handle_modified_unit($unit, $base_name, $new_unit_file, \%new_unit_info, $active_cur, \%units_to_stop, \%units_to_start, \%units_to_reload, \%units_to_restart, \%units_to_skip); + } elsif ($diff == 2 and not $units_to_restart{$unit}) { + $units_to_reload{$unit} = 1; + record_unit($reload_list_file, $unit); + } } } } -sub pathToUnitName { +# Converts a path to the name of a systemd mount unit that would be responsible +# for mounting this path. +sub path_to_unit_name { my ($path) = @_; # Use current version of systemctl binary before daemon is reexeced. - open my $cmd, "-|", "$curSystemd/systemd-escape", "--suffix=mount", "-p", $path + open(my $cmd, "-|", "$cur_systemd/systemd-escape", "--suffix=mount", "-p", $path) or die "Unable to escape $path!\n"; - my $escaped = join "", <$cmd>; - chomp $escaped; - close $cmd or die; + my $escaped = do { local $/ = undef; <$cmd> }; + chomp($escaped); + close($cmd) or die("Unable to close systemd-escape pipe"); return $escaped; } -sub unique { - my %seen; - my @res; - foreach my $name (@_) { - next if $seen{$name}; - $seen{$name} = 1; - push @res, $name; - } - return @res; -} - # Compare the previous and new fstab to figure out which filesystems # need a remount or need to be unmounted. New filesystems are mounted # automatically by starting local-fs.target. FIXME: might be nicer if # we generated units for all mounts; then we could unify this with the # unit checking code above. -my ($prevFss, $prevSwaps) = parseFstab "/etc/fstab"; -my ($newFss, $newSwaps) = parseFstab "$out/etc/fstab"; -foreach my $mountPoint (keys %$prevFss) { - my $prev = $prevFss->{$mountPoint}; - my $new = $newFss->{$mountPoint}; - my $unit = pathToUnitName($mountPoint); - if (!defined $new) { +my ($cur_fss, $cur_swaps) = parse_fstab("/etc/fstab"); +my ($new_fss, $new_swaps) = parse_fstab("$out/etc/fstab"); +foreach my $mount_point (keys(%{$cur_fss})) { + my $cur = $cur_fss->{$mount_point}; + my $new = $new_fss->{$mount_point}; + my $unit = path_to_unit_name($mount_point); + if (!defined($new)) { # Filesystem entry disappeared, so unmount it. - $unitsToStop{$unit} = 1; - } elsif ($prev->{fsType} ne $new->{fsType} || $prev->{device} ne $new->{device}) { + $units_to_stop{$unit} = 1; + } elsif ($cur->{fsType} ne $new->{fsType} || $cur->{device} ne $new->{device}) { # Filesystem type or device changed, so unmount and mount it. - $unitsToStop{$unit} = 1; - $unitsToStart{$unit} = 1; - recordUnit($startListFile, $unit); - } elsif ($prev->{options} ne $new->{options}) { + $units_to_stop{$unit} = 1; + $units_to_start{$unit} = 1; + record_unit($start_list_file, $unit); + } elsif ($cur->{options} ne $new->{options}) { # Mount options changes, so remount it. - $unitsToReload{$unit} = 1; - recordUnit($reloadListFile, $unit); + $units_to_reload{$unit} = 1; + record_unit($reload_list_file, $unit); } } # Also handles swap devices. -foreach my $device (keys %$prevSwaps) { - my $prev = $prevSwaps->{$device}; - my $new = $newSwaps->{$device}; - if (!defined $new) { +foreach my $device (keys(%{$cur_swaps})) { + my $cur = $cur_swaps->{$device}; + my $new = $new_swaps->{$device}; + if (!defined($new)) { # Swap entry disappeared, so turn it off. Can't use # "systemctl stop" here because systemd has lots of alias # units that prevent a stop from actually calling # "swapoff". - print STDERR "stopping swap device: $device\n"; - system("@utillinux@/sbin/swapoff", $device); + if ($action ne "dry-activate") { + print STDERR "would stop swap device: $device\n"; + } else { + print STDERR "stopping swap device: $device\n"; + system("@utillinux@/sbin/swapoff", $device); + } } # FIXME: update swap options (i.e. its priority). } # Should we have systemd re-exec itself? -my $prevSystemd = abs_path("/proc/1/exe") // "/unknown"; -my $prevSystemdSystemConfig = abs_path("/etc/systemd/system.conf") // "/unknown"; -my $newSystemd = abs_path("@systemd@/lib/systemd/systemd") or die; -my $newSystemdSystemConfig = abs_path("$out/etc/systemd/system.conf") // "/unknown"; +my $cur_pid1_path = abs_path("/proc/1/exe") // "/unknown"; +my $cur_systemd_system_config = abs_path("/etc/systemd/system.conf") // "/unknown"; +my $new_pid1_path = abs_path("$new_systemd/lib/systemd/systemd") or die; +my $new_systemd_system_config = abs_path("$out/etc/systemd/system.conf") // "/unknown"; -my $restartSystemd = $prevSystemd ne $newSystemd; -if ($prevSystemdSystemConfig ne $newSystemdSystemConfig) { - $restartSystemd = 1; +my $restart_systemd = $cur_pid1_path ne $new_pid1_path; +if ($cur_systemd_system_config ne $new_systemd_system_config) { + $restart_systemd = 1; } - -sub filterUnits { +# Takes an array of unit names and returns an array with the same elements, +# except all units that are also in the global variable `unitsToFilter`. +sub filter_units { my ($units) = @_; my @res; - foreach my $unit (sort(keys %{$units})) { - push @res, $unit if !defined $unitsToFilter{$unit}; + foreach my $unit (sort(keys(%{$units}))) { + if (!defined($units_to_filter{$unit})) { + push(@res, $unit); + } } return @res; } -my @unitsToStopFiltered = filterUnits(\%unitsToStop); +my @units_to_stop_filtered = filter_units(\%units_to_stop); # Show dry-run actions. if ($action eq "dry-activate") { - print STDERR "would stop the following units: ", join(", ", @unitsToStopFiltered), "\n" - if scalar @unitsToStopFiltered > 0; - print STDERR "would NOT stop the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" - if scalar(keys %unitsToSkip) > 0; + if (scalar(@units_to_stop_filtered) > 0) { + print STDERR "would stop the following units: ", join(", ", @units_to_stop_filtered), "\n"; + } + if (scalar(keys(%units_to_skip)) > 0) { + print STDERR "would NOT stop the following changed units: ", join(", ", sort(keys(%units_to_skip))), "\n"; + } print STDERR "would activate the configuration...\n"; system("$out/dry-activate", "$out"); # Handle the activation script requesting the restart or reload of a unit. - foreach (split('\n', read_file($dryRestartByActivationFile, err_mode => 'quiet') // "")) { + foreach (split(/\n/msx, read_file($dry_restart_by_activation_file, err_mode => "quiet") // "")) { my $unit = $_; - my $baseUnit = $unit; - my $newUnitFile = "$out/etc/systemd/system/$baseUnit"; + my $base_unit = $unit; + my $new_unit_file = "$out/etc/systemd/system/$base_unit"; # Detect template instances. - if (!-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) { - $baseUnit = "$1\@.$2"; - $newUnitFile = "$out/etc/systemd/system/$baseUnit"; + if (!-e $new_unit_file && $unit =~ /^(.*)@[^\.]*\.(.*)$/msx) { + $base_unit = "$1\@.$2"; + $new_unit_file = "$out/etc/systemd/system/$base_unit"; } - my $baseName = $baseUnit; - $baseName =~ s/\.[a-z]*$//; + my $base_name = $base_unit; + $base_name =~ s/\.[[:lower:]]*$//msx; # Start units if they were not active previously - if (not defined $activePrev->{$unit}) { - $unitsToStart{$unit} = 1; + if (not defined($active_cur->{$unit})) { + $units_to_start{$unit} = 1; next; } - handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToRestart, \%unitsToRestart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip); + handle_modified_unit($unit, $base_name, $new_unit_file, undef, $active_cur, \%units_to_restart, \%units_to_restart, \%units_to_reload, \%units_to_restart, \%units_to_skip); } - unlink($dryRestartByActivationFile); + unlink($dry_restart_by_activation_file); - print STDERR "would restart systemd\n" if $restartSystemd; - print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n" - if scalar(keys %unitsToReload) > 0; - print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n" - if scalar(keys %unitsToRestart) > 0; - my @unitsToStartFiltered = filterUnits(\%unitsToStart); - print STDERR "would start the following units: ", join(", ", @unitsToStartFiltered), "\n" - if scalar @unitsToStartFiltered; + foreach (split(/\n/msx, read_file($dry_reload_by_activation_file, err_mode => "quiet") // "")) { + my $unit = $_; + + if (defined($active_cur->{$unit}) and not $units_to_restart{$unit} and not $units_to_stop{$unit}) { + $units_to_reload{$unit} = 1; + record_unit($reload_list_file, $unit); + } + } + unlink($dry_reload_by_activation_file); + + if ($restart_systemd) { + print STDERR "would restart systemd\n"; + } + if (scalar(keys(%units_to_reload)) > 0) { + print STDERR "would reload the following units: ", join(", ", sort(keys(%units_to_reload))), "\n"; + } + if (scalar(keys(%units_to_restart)) > 0) { + print STDERR "would restart the following units: ", join(", ", sort(keys(%units_to_restart))), "\n"; + } + my @units_to_start_filtered = filter_units(\%units_to_start); + if (scalar(@units_to_start_filtered)) { + print STDERR "would start the following units: ", join(", ", @units_to_start_filtered), "\n"; + } exit 0; } syslog(LOG_NOTICE, "switching to system configuration $out"); -if (scalar (keys %unitsToStop) > 0) { - print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n" - if scalar @unitsToStopFiltered; +if (scalar(keys(%units_to_stop)) > 0) { + if (scalar(@units_to_stop_filtered)) { + print STDERR "stopping the following units: ", join(", ", @units_to_stop_filtered), "\n"; + } # Use current version of systemctl binary before daemon is reexeced. - system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); + system("$cur_systemd/systemctl", "stop", "--", sort(keys(%units_to_stop))); } -print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n" - if scalar(keys %unitsToSkip) > 0; +if (scalar(keys(%units_to_skip)) > 0) { + print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys(%units_to_skip))), "\n"; +} # Activate the new configuration (i.e., update /etc, make accounts, # and so on). @@ -452,79 +750,110 @@ print STDERR "activating the configuration...\n"; system("$out/activate", "$out") == 0 or $res = 2; # Handle the activation script requesting the restart or reload of a unit. -foreach (split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // "")) { +foreach (split(/\n/msx, read_file($restart_by_activation_file, err_mode => "quiet") // "")) { my $unit = $_; - my $baseUnit = $unit; - my $newUnitFile = "$out/etc/systemd/system/$baseUnit"; + my $base_unit = $unit; + my $new_unit_file = "$out/etc/systemd/system/$base_unit"; # Detect template instances. - if (!-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) { - $baseUnit = "$1\@.$2"; - $newUnitFile = "$out/etc/systemd/system/$baseUnit"; + if (!-e $new_unit_file && $unit =~ /^(.*)@[^\.]*\.(.*)$/msx) { + $base_unit = "$1\@.$2"; + $new_unit_file = "$out/etc/systemd/system/$base_unit"; } - my $baseName = $baseUnit; - $baseName =~ s/\.[a-z]*$//; + my $base_name = $base_unit; + $base_name =~ s/\.[[:lower:]]*$//msx; # Start units if they were not active previously - if (not defined $activePrev->{$unit}) { - $unitsToStart{$unit} = 1; - recordUnit($startListFile, $unit); + if (not defined($active_cur->{$unit})) { + $units_to_start{$unit} = 1; + record_unit($start_list_file, $unit); next; } - handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToRestart, \%unitsToRestart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip); + handle_modified_unit($unit, $base_name, $new_unit_file, undef, $active_cur, \%units_to_restart, \%units_to_restart, \%units_to_reload, \%units_to_restart, \%units_to_skip); } # We can remove the file now because it has been propagated to the other restart/reload files -unlink($restartByActivationFile); +unlink($restart_by_activation_file); + +foreach (split(/\n/msx, read_file($reload_by_activation_file, err_mode => "quiet") // "")) { + my $unit = $_; + + if (defined($active_cur->{$unit}) and not $units_to_restart{$unit} and not $units_to_stop{$unit}) { + $units_to_reload{$unit} = 1; + record_unit($reload_list_file, $unit); + } +} +# We can remove the file now because it has been propagated to the other reload file +unlink($reload_by_activation_file); # Restart systemd if necessary. Note that this is done using the # current version of systemd, just in case the new one has trouble # communicating with the running pid 1. -if ($restartSystemd) { +if ($restart_systemd) { print STDERR "restarting systemd...\n"; - system("$curSystemd/systemctl", "daemon-reexec") == 0 or $res = 2; + system("$cur_systemd/systemctl", "daemon-reexec") == 0 or $res = 2; } # Forget about previously failed services. -system("@systemd@/bin/systemctl", "reset-failed"); +system("$new_systemd/bin/systemctl", "reset-failed"); # Make systemd reload its units. -system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3; +system("$new_systemd/bin/systemctl", "daemon-reload") == 0 or $res = 3; # Reload user units -open my $listActiveUsers, '-|', '@systemd@/bin/loginctl', 'list-users', '--no-legend'; -while (my $f = <$listActiveUsers>) { - next unless $f =~ /^\s*(?\d+)\s+(?\S+)/; +open(my $list_active_users, "-|", "$new_systemd/bin/loginctl", "list-users", "--no-legend") || die("Unable to call loginctl"); +while (my $f = <$list_active_users>) { + if ($f !~ /^\s*(?\d+)\s+(?\S+)/msx) { + next; + } my ($uid, $name) = ($+{uid}, $+{user}); print STDERR "reloading user units for $name...\n"; system("@su@", "-s", "@shell@", "-l", $name, "-c", "export XDG_RUNTIME_DIR=/run/user/$uid; " . - "$curSystemd/systemctl --user daemon-reexec; " . - "@systemd@/bin/systemctl --user start nixos-activation.service"); + "$cur_systemd/systemctl --user daemon-reexec; " . + "$new_systemd/bin/systemctl --user start nixos-activation.service"); } -close $listActiveUsers; +close($list_active_users) || die("Unable to close the file handle to loginctl"); # Set the new tmpfiles print STDERR "setting up tmpfiles\n"; -system("@systemd@/bin/systemd-tmpfiles", "--create", "--remove", "--exclude-prefix=/dev") == 0 or $res = 3; +system("$new_systemd/bin/systemd-tmpfiles", "--create", "--remove", "--exclude-prefix=/dev") == 0 or $res = 3; +# Before reloading we need to ensure that the units are still active. They may have been +# deactivated because one of their requirements got stopped. If they are inactive +# but should have been reloaded, the user probably expects them to be started. +if (scalar(keys(%units_to_reload)) > 0) { + for my $unit (keys(%units_to_reload)) { + if (!unit_is_active($unit)) { + # Figure out if we need to start the unit + my %unit_info = parse_unit("$out/etc/systemd/system/$unit"); + if (!(parse_systemd_bool(\%unit_info, "Unit", "RefuseManualStart", 0) || parse_systemd_bool(\%unit_info, "Unit", "X-OnlyManualStart", 0))) { + $units_to_start{$unit} = 1; + record_unit($start_list_file, $unit); + } + # Don't reload the unit, reloading would fail + delete %units_to_reload{$unit}; + unrecord_unit($reload_list_file, $unit); + } + } +} # Reload units that need it. This includes remounting changed mount # units. -if (scalar(keys %unitsToReload) > 0) { - print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n"; - system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4; - unlink($reloadListFile); +if (scalar(keys(%units_to_reload)) > 0) { + print STDERR "reloading the following units: ", join(", ", sort(keys(%units_to_reload))), "\n"; + system("$new_systemd/bin/systemctl", "reload", "--", sort(keys(%units_to_reload))) == 0 or $res = 4; + unlink($reload_list_file); } # Restart changed services (those that have to be restarted rather # than stopped and started). -if (scalar(keys %unitsToRestart) > 0) { - print STDERR "restarting the following units: ", join(", ", sort(keys %unitsToRestart)), "\n"; - system("@systemd@/bin/systemctl", "restart", "--", sort(keys %unitsToRestart)) == 0 or $res = 4; - unlink($restartListFile); +if (scalar(keys(%units_to_restart)) > 0) { + print STDERR "restarting the following units: ", join(", ", sort(keys(%units_to_restart))), "\n"; + system("$new_systemd/bin/systemctl", "restart", "--", sort(keys(%units_to_restart))) == 0 or $res = 4; + unlink($restart_list_file); } # Start all active targets, as well as changed units we stopped above. @@ -533,46 +862,52 @@ if (scalar(keys %unitsToRestart) > 0) { # that are symlinks to other units. We shouldn't start both at the # same time because we'll get a "Failed to add path to set" error from # systemd. -my @unitsToStartFiltered = filterUnits(\%unitsToStart); -print STDERR "starting the following units: ", join(", ", @unitsToStartFiltered), "\n" - if scalar @unitsToStartFiltered; -system("@systemd@/bin/systemctl", "start", "--", sort(keys %unitsToStart)) == 0 or $res = 4; -unlink($startListFile); +my @units_to_start_filtered = filter_units(\%units_to_start); +if (scalar(@units_to_start_filtered)) { + print STDERR "starting the following units: ", join(", ", @units_to_start_filtered), "\n" +} +system("$new_systemd/bin/systemctl", "start", "--", sort(keys(%units_to_start))) == 0 or $res = 4; +unlink($start_list_file); # Print failed and new units. my (@failed, @new); -my $activeNew = getActiveUnits; -while (my ($unit, $state) = each %{$activeNew}) { +my $active_new = get_active_units(); +while (my ($unit, $state) = each(%{$active_new})) { if ($state->{state} eq "failed") { - push @failed, $unit; + push(@failed, $unit); + next; } - elsif ($state->{state} eq "auto-restart") { - # A unit in auto-restart state is a failure *if* it previously failed to start - my $lines = `@systemd@/bin/systemctl show '$unit'`; - my $info = {}; - parseKeyValues($info, split("\n", $lines)); - if ($info->{ExecMainStatus} ne '0') { - push @failed, $unit; + if ($state->{substate} eq "auto-restart") { + # A unit in auto-restart substate is a failure *if* it previously failed to start + open(my $main_status_fd, "-|", "$new_systemd/bin/systemctl", "show", "--value", "--property=ExecMainStatus", $unit) || die("Unable to call 'systemctl show'"); + my $main_status = do { local $/ = undef; <$main_status_fd> }; + close($main_status_fd) || die("Unable to close 'systemctl show' fd"); + chomp($main_status); + + if ($main_status ne "0") { + push(@failed, $unit); + next; } } + # Ignore scopes since they are not managed by this script but rather # created and managed by third-party services via the systemd dbus API. - elsif ($state->{state} ne "failed" && !defined $activePrev->{$unit} && $unit !~ /\.scope$/) { - push @new, $unit; + # This only lists units that are not failed (including ones that are in auto-restart but have not failed previously) + if ($state->{state} ne "failed" && !defined($active_cur->{$unit}) && $unit !~ /\.scope$/msx) { + push(@new, $unit); } } -print STDERR "the following new units were started: ", join(", ", sort(@new)), "\n" - if scalar @new > 0; +if (scalar(@new) > 0) { + print STDERR "the following new units were started: ", join(", ", sort(@new)), "\n" +} -if (scalar @failed > 0) { - print STDERR "warning: the following units failed: ", join(", ", sort(@failed)), "\n"; - foreach my $unit (@failed) { - print STDERR "\n"; - system("COLUMNS=1000 @systemd@/bin/systemctl status --no-pager '$unit' >&2"); - } +if (scalar(@failed) > 0) { + my @failed_sorted = sort(@failed); + print STDERR "warning: the following units failed: ", join(", ", @failed_sorted), "\n\n"; + system("$new_systemd/bin/systemctl status --no-pager --full '" . join("' '", @failed_sorted) . "' >&2"); $res = 4; } @@ -582,4 +917,4 @@ if ($res == 0) { syslog(LOG_ERR, "switching to system configuration $out failed (status $res)"); } -exit $res; +exit($res); diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 18ac717f5dd6..b8aeee8c11b3 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -117,7 +117,7 @@ let configurationName = config.boot.loader.grub.configurationName; # Needed by switch-to-configuration. - perl = pkgs.perl.withPackages (p: with p; [ FileSlurp NetDBus XMLParser XMLTwig ]); + perl = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp NetDBus ]); }; # Handle assertions and warnings @@ -156,7 +156,7 @@ in specialisation = mkOption { default = {}; - example = lib.literalExpression "{ fewJobsManyCores.configuration = { nix.buildCores = 0; nix.maxJobs = 1; }; }"; + example = lib.literalExpression "{ fewJobsManyCores.configuration = { nix.settings = { core = 0; max-jobs = 1; }; }"; description = '' Additional configurations to build. If inheritParentConfig is true, the system diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index 5bc603530f7e..33748358e45b 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -300,18 +300,15 @@ in { interpreterSandboxPath = dirOf (dirOf interpreterReg); } // (magics.${system} or (throw "Cannot create binfmt registration for system ${system}")); }) cfg.emulatedSystems); - # TODO: add a nix.extraPlatforms option to NixOS! - nix.extraOptions = lib.mkIf (cfg.emulatedSystems != []) '' - extra-platforms = ${toString (cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux")} - ''; - nix.sandboxPaths = lib.mkIf (cfg.emulatedSystems != []) ( - let + nix.settings = lib.mkIf (cfg.emulatedSystems != []) { + extra-platforms = cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux"; + extra-sandbox-paths = let ruleFor = system: cfg.registrations.${system}; hasWrappedRule = lib.any (system: (ruleFor system).wrapInterpreterInShell) cfg.emulatedSystems; in [ "/run/binfmt" ] ++ lib.optional hasWrappedRule "${pkgs.bash}" - ++ (map (system: (ruleFor system).interpreterSandboxPath) cfg.emulatedSystems) - ); + ++ (map (system: (ruleFor system).interpreterSandboxPath) cfg.emulatedSystems); + }; environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf" (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations)); diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index d147155d796c..db00244ca0af 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -36,7 +36,7 @@ in boot.kernelPackages = mkOption { default = pkgs.linuxPackages; - type = types.unspecified // { merge = mergeEqualOption; }; + type = types.raw; apply = kernelPackages: kernelPackages.extend (self: super: { kernel = super.kernel.override (originalArgs: { inherit randstructSeed; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index adc893063098..fa879437fd81 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -15,9 +15,12 @@ import re import datetime import glob import os.path -from typing import Tuple, List, Optional +from typing import NamedTuple, List, Optional -SystemIdentifier = Tuple[Optional[str], int, Optional[str]] +class SystemIdentifier(NamedTuple): + profile: Optional[str] + generation: int + specialisation: Optional[str] def copy_if_not_exists(source: str, dest: str) -> None: @@ -151,7 +154,14 @@ def get_generations(profile: Optional[str] = None) -> List[SystemIdentifier]: gen_lines.pop() configurationLimit = @configurationLimit@ - configurations: List[SystemIdentifier] = [ (profile, int(line.split()[0]), None) for line in gen_lines ] + configurations = [ + SystemIdentifier( + profile=profile, + generation=int(line.split()[0]), + specialisation=None + ) + for line in gen_lines + ] return configurations[-configurationLimit:] @@ -160,7 +170,7 @@ def get_specialisations(profile: Optional[str], generation: int, _: Optional[str system_dir(profile, generation, None), "specialisation") if not os.path.exists(specialisations_dir): return [] - return [(profile, generation, spec) for spec in os.listdir(specialisations_dir)] + return [SystemIdentifier(profile, generation, spec) for spec in os.listdir(specialisations_dir)] def remove_old_entries(gens: List[SystemIdentifier]) -> None: @@ -271,7 +281,8 @@ def main() -> None: if os.readlink(system_dir(*gen)) == args.default_config: write_loader_conf(*gen) except OSError as e: - print("ignoring generation '{}' in the list of boot entries because of the following error:\n{}".format(*gen, e), file=sys.stderr) + profile = f"profile '{gen.profile}'" if gen.profile else "default profile" + print("ignoring {} in the list of boot entries because of the following error:\n{}".format(profile, e), file=sys.stderr) for root, _, files in os.walk('@efiSysMountPoint@/efi/nixos/.extra-files', topdown=False): relative_root = root.removeprefix("@efiSysMountPoint@/efi/nixos/.extra-files").removeprefix("/") diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index 7426d148891f..e683d1817297 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -34,23 +34,6 @@ with lib; type = types.lines; }; - boot.initrd.extraModprobeConfig = mkOption { - default = ""; - example = - '' - options zfs zfs_arc_max=1073741824 - ''; - description = '' - Does exactly the same thing as - , except - that the generated modprobe.conf - file is also included in the initrd. - This is useful for setting module options for kernel - modules that are loaded during early boot in the initrd. - ''; - type = types.lines; - }; - }; @@ -67,11 +50,10 @@ with lib; '')} ${config.boot.extraModprobeConfig} ''; - environment.etc."modprobe.d/nixos-initrd.conf".text = '' - ${config.boot.initrd.extraModprobeConfig} - ''; environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; + environment.etc."modprobe.d/systemd.conf".source = "${pkgs.systemd}/lib/modprobe.d/systemd.conf"; + environment.systemPackages = [ pkgs.kmod ]; system.activationScripts.modprobe = stringAfter ["specialfs"] diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index f86d4641228c..8fcc1f029723 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -282,6 +282,9 @@ checkFS() { # Don't check resilient COWs as they validate the fs structures at mount time if [ "$fsType" = btrfs -o "$fsType" = zfs -o "$fsType" = bcachefs ]; then return 0; fi + # Skip fsck for apfs as the fsck utility does not support repairing the filesystem (no -a option) + if [ "$fsType" = apfs ]; then return 0; fi + # Skip fsck for nilfs2 - not needed by design and no fsck tool for this filesystem. if [ "$fsType" = nilfs2 ]; then return 0; fi diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 9c684fbada2c..8b011d91563f 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -338,9 +338,6 @@ let { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf; symlink = "/etc/mdadm.conf"; } - { object = config.environment.etc."modprobe.d/nixos-initrd.conf".source; - symlink = "/etc/modprobe.d/nixos-initrd.conf"; - } { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; preferLocalBuild = true; @@ -350,6 +347,9 @@ let ''; symlink = "/etc/modprobe.d/ubuntu.conf"; } + { object = config.environment.etc."modprobe.d/nixos.conf".source; + symlink = "/etc/modprobe.d/nixos.conf"; + } { object = pkgs.kmod-debian-aliases; symlink = "/etc/modprobe.d/debian.conf"; } @@ -578,7 +578,7 @@ in else "gzip" ); defaultText = literalDocBook "zstd if the kernel supports it (5.9+), gzip if not"; - type = types.unspecified; # We don't have a function type... + type = types.either types.str (types.functionTo types.str); description = '' The compressor to use on the initrd image. May be any of: diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix index f6b6a8e4b0b4..fa2bf938df4f 100644 --- a/nixos/modules/system/boot/stage-2.nix +++ b/nixos/modules/system/boot/stage-2.nix @@ -47,36 +47,6 @@ in ''; }; - devSize = mkOption { - default = "5%"; - example = "32m"; - type = types.str; - description = '' - Size limit for the /dev tmpfs. Look at mount(8), tmpfs size option, - for the accepted syntax. - ''; - }; - - devShmSize = mkOption { - default = "50%"; - example = "256m"; - type = types.str; - description = '' - Size limit for the /dev/shm tmpfs. Look at mount(8), tmpfs size option, - for the accepted syntax. - ''; - }; - - runSize = mkOption { - default = "25%"; - example = "256m"; - type = types.str; - description = '' - Size limit for the /run tmpfs. Look at mount(8), tmpfs size option, - for the accepted syntax. - ''; - }; - systemdExecutable = mkOption { default = "systemd"; type = types.str; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 76c59c047e0f..057474c607ac 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -2,7 +2,6 @@ with utils; with systemdUtils.unitOptions; -with systemdUtils.lib; with lib; let @@ -11,6 +10,24 @@ let systemd = cfg.package; + inherit (systemdUtils.lib) + makeUnit + generateUnits + makeJobScript + unitConfig + serviceConfig + mountConfig + automountConfig + commonUnitText + targetToUnit + serviceToUnit + socketToUnit + timerToUnit + pathToUnit + mountToUnit + automountToUnit + sliceToUnit; + upstreamSystemUnits = [ # Targets. "basic.target" @@ -25,9 +42,11 @@ let "nss-lookup.target" "nss-user-lookup.target" "time-sync.target" + ] ++ (optionals cfg.package.withCryptsetup [ "cryptsetup.target" "cryptsetup-pre.target" "remote-cryptsetup.target" + ]) ++ [ "sigpwr.target" "timers.target" "paths.target" @@ -61,32 +80,6 @@ let "printer.target" "smartcard.target" - # Login stuff. - "systemd-logind.service" - "autovt@.service" - "systemd-user-sessions.service" - "dbus-org.freedesktop.import1.service" - "dbus-org.freedesktop.machine1.service" - "dbus-org.freedesktop.login1.service" - "user@.service" - "user-runtime-dir@.service" - - # Journal. - "systemd-journald.socket" - "systemd-journald@.socket" - "systemd-journald-varlink@.socket" - "systemd-journald.service" - "systemd-journald@.service" - "systemd-journal-flush.service" - "systemd-journal-catalog-update.service" - ] ++ (optional (!config.boot.isContainer) "systemd-journald-audit.socket") ++ [ - "systemd-journald-dev-log.socket" - "syslog.socket" - - # Coredumps. - "systemd-coredump.socket" - "systemd-coredump@.service" - # Kernel module loading. "systemd-modules-load.service" "kmod-static-nodes.service" @@ -147,19 +140,12 @@ let # Slices / containers. "slices.target" - "user.slice" "machine.slice" "machines.target" "systemd-importd.service" "systemd-machined.service" "systemd-nspawn@.service" - # Temporary file creation / cleanup. - "systemd-tmpfiles-clean.service" - "systemd-tmpfiles-clean.timer" - "systemd-tmpfiles-setup.service" - "systemd-tmpfiles-setup-dev.service" - # Misc. "systemd-sysctl.service" "dbus-org.freedesktop.timedate1.service" @@ -170,9 +156,6 @@ let "systemd-hostnamed.service" "systemd-exit.service" "systemd-update-done.service" - ] ++ optionals config.services.journald.enableHttpGateway [ - "systemd-journal-gatewayd.socket" - "systemd-journal-gatewayd.service" ] ++ cfg.additionalUpstreamSystemUnits; upstreamSystemWants = @@ -183,235 +166,6 @@ let "timers.target.wants" ]; - upstreamUserUnits = [ - "app.slice" - "background.slice" - "basic.target" - "bluetooth.target" - "default.target" - "exit.target" - "graphical-session-pre.target" - "graphical-session.target" - "paths.target" - "printer.target" - "session.slice" - "shutdown.target" - "smartcard.target" - "sockets.target" - "sound.target" - "systemd-exit.service" - "systemd-tmpfiles-clean.service" - "systemd-tmpfiles-clean.timer" - "systemd-tmpfiles-setup.service" - "timers.target" - "xdg-desktop-autostart.target" - ]; - - makeJobScript = name: text: - let - scriptName = replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape name); - out = (pkgs.writeShellScriptBin scriptName '' - set -e - ${text} - '').overrideAttrs (_: { - # The derivation name is different from the script file name - # to keep the script file name short to avoid cluttering logs. - name = "unit-script-${scriptName}"; - }); - in "${out}/bin/${scriptName}"; - - unitConfig = { config, options, ... }: { - config = { - unitConfig = - optionalAttrs (config.requires != []) - { Requires = toString config.requires; } - // optionalAttrs (config.wants != []) - { Wants = toString config.wants; } - // optionalAttrs (config.after != []) - { After = toString config.after; } - // optionalAttrs (config.before != []) - { Before = toString config.before; } - // optionalAttrs (config.bindsTo != []) - { BindsTo = toString config.bindsTo; } - // optionalAttrs (config.partOf != []) - { PartOf = toString config.partOf; } - // optionalAttrs (config.conflicts != []) - { Conflicts = toString config.conflicts; } - // optionalAttrs (config.requisite != []) - { Requisite = toString config.requisite; } - // optionalAttrs (config.restartTriggers != []) - { X-Restart-Triggers = toString config.restartTriggers; } - // optionalAttrs (config.description != "") { - Description = config.description; } - // optionalAttrs (config.documentation != []) { - Documentation = toString config.documentation; } - // optionalAttrs (config.onFailure != []) { - OnFailure = toString config.onFailure; } - // optionalAttrs (options.startLimitIntervalSec.isDefined) { - StartLimitIntervalSec = toString config.startLimitIntervalSec; - } // optionalAttrs (options.startLimitBurst.isDefined) { - StartLimitBurst = toString config.startLimitBurst; - }; - }; - }; - - serviceConfig = { name, config, ... }: { - config = mkMerge - [ { # Default path for systemd services. Should be quite minimal. - path = mkAfter - [ pkgs.coreutils - pkgs.findutils - pkgs.gnugrep - pkgs.gnused - systemd - ]; - environment.PATH = "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}"; - } - (mkIf (config.preStart != "") - { serviceConfig.ExecStartPre = - [ (makeJobScript "${name}-pre-start" config.preStart) ]; - }) - (mkIf (config.script != "") - { serviceConfig.ExecStart = - makeJobScript "${name}-start" config.script + " " + config.scriptArgs; - }) - (mkIf (config.postStart != "") - { serviceConfig.ExecStartPost = - [ (makeJobScript "${name}-post-start" config.postStart) ]; - }) - (mkIf (config.reload != "") - { serviceConfig.ExecReload = - makeJobScript "${name}-reload" config.reload; - }) - (mkIf (config.preStop != "") - { serviceConfig.ExecStop = - makeJobScript "${name}-pre-stop" config.preStop; - }) - (mkIf (config.postStop != "") - { serviceConfig.ExecStopPost = - makeJobScript "${name}-post-stop" config.postStop; - }) - ]; - }; - - mountConfig = { config, ... }: { - config = { - mountConfig = - { What = config.what; - Where = config.where; - } // optionalAttrs (config.type != "") { - Type = config.type; - } // optionalAttrs (config.options != "") { - Options = config.options; - }; - }; - }; - - automountConfig = { config, ... }: { - config = { - automountConfig = - { Where = config.where; - }; - }; - }; - - commonUnitText = def: '' - [Unit] - ${attrsToSection def.unitConfig} - ''; - - targetToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = - '' - [Unit] - ${attrsToSection def.unitConfig} - ''; - }; - - serviceToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - 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 then '' - X-ReloadIfChanged=true - '' else if !def.restartIfChanged then '' - X-RestartIfChanged=false - '' else ""} - ${optionalString (!def.stopIfChanged) "X-StopIfChanged=false"} - ${attrsToSection def.serviceConfig} - ''; - }; - - socketToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = commonUnitText def + - '' - [Socket] - ${attrsToSection def.socketConfig} - ${concatStringsSep "\n" (map (s: "ListenStream=${s}") def.listenStreams)} - ${concatStringsSep "\n" (map (s: "ListenDatagram=${s}") def.listenDatagrams)} - ''; - }; - - timerToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = commonUnitText def + - '' - [Timer] - ${attrsToSection def.timerConfig} - ''; - }; - - pathToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = commonUnitText def + - '' - [Path] - ${attrsToSection def.pathConfig} - ''; - }; - - mountToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = commonUnitText def + - '' - [Mount] - ${attrsToSection def.mountConfig} - ''; - }; - - automountToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = commonUnitText def + - '' - [Automount] - ${attrsToSection def.automountConfig} - ''; - }; - - sliceToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; - text = commonUnitText def + - '' - [Slice] - ${attrsToSection def.sliceConfig} - ''; - }; - - logindHandlerType = types.enum [ - "ignore" "poweroff" "reboot" "halt" "kexec" "suspend" - "hibernate" "hybrid-sleep" "suspend-then-hibernate" "lock" - ]; - proxy_env = config.networking.proxy.envVars; in @@ -564,26 +318,6 @@ in ''; }; - systemd.coredump.enable = mkOption { - default = true; - type = types.bool; - description = '' - Whether core dumps should be processed by - systemd-coredump. If disabled, core dumps - appear in the current directory of the crashing process. - ''; - }; - - systemd.coredump.extraConfig = mkOption { - default = ""; - type = types.lines; - example = "Storage=journal"; - description = '' - Extra config options for systemd-coredump. See coredump.conf(5) man page - for available options. - ''; - }; - systemd.extraConfig = mkOption { default = ""; type = types.lines; @@ -594,142 +328,6 @@ in ''; }; - services.journald.console = mkOption { - default = ""; - type = types.str; - description = "If non-empty, write log messages to the specified TTY device."; - }; - - services.journald.rateLimitInterval = mkOption { - default = "30s"; - type = types.str; - description = '' - Configures the rate limiting interval that is applied to all - messages generated on the system. This rate limiting is applied - per-service, so that two services which log do not interfere with - each other's limit. The value may be specified in the following - units: s, min, h, ms, us. To turn off any kind of rate limiting, - set either value to 0. - - See for important - considerations when setting this value. - ''; - }; - - services.journald.rateLimitBurst = mkOption { - default = 10000; - type = types.int; - description = '' - Configures the rate limiting burst limit (number of messages per - interval) that is applied to all messages generated on the system. - This rate limiting is applied per-service, so that two services - which log do not interfere with each other's limit. - - Note that the effective rate limit is multiplied by a factor derived - from the available free disk space for the journal as described on - - journald.conf(5). - - Note that the total amount of logs stored is limited by journald settings - such as SystemMaxUse, which defaults to a 4 GB cap. - - It is thus recommended to compute what period of time that you will be - able to store logs for when an application logs at full burst rate. - With default settings for log lines that are 100 Bytes long, this can - amount to just a few hours. - ''; - }; - - services.journald.extraConfig = mkOption { - default = ""; - type = types.lines; - example = "Storage=volatile"; - description = '' - Extra config options for systemd-journald. See man journald.conf - for available options. - ''; - }; - - services.journald.enableHttpGateway = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable the HTTP gateway to the journal. - ''; - }; - - services.journald.forwardToSyslog = mkOption { - default = config.services.rsyslogd.enable || config.services.syslog-ng.enable; - defaultText = literalExpression "services.rsyslogd.enable || services.syslog-ng.enable"; - type = types.bool; - description = '' - Whether to forward log messages to syslog. - ''; - }; - - services.logind.extraConfig = mkOption { - default = ""; - type = types.lines; - example = "IdleAction=lock"; - description = '' - Extra config options for systemd-logind. See - - logind.conf(5) for available options. - ''; - }; - - services.logind.killUserProcesses = mkOption { - default = false; - type = types.bool; - description = '' - Specifies whether the processes of a user should be killed - when the user logs out. If true, the scope unit corresponding - to the session and all processes inside that scope will be - terminated. If false, the scope is "abandoned" (see - - systemd.scope(5)), and processes are not killed. - - - - See logind.conf(5) - for more details. - ''; - }; - - services.logind.lidSwitch = mkOption { - default = "suspend"; - example = "ignore"; - type = logindHandlerType; - - description = '' - Specifies what to be done when the laptop lid is closed. - ''; - }; - - services.logind.lidSwitchDocked = mkOption { - default = "ignore"; - example = "suspend"; - type = logindHandlerType; - - description = '' - Specifies what to be done when the laptop lid is closed - and another screen is added. - ''; - }; - - services.logind.lidSwitchExternalPower = mkOption { - default = config.services.logind.lidSwitch; - defaultText = literalExpression "services.logind.lidSwitch"; - example = "ignore"; - type = logindHandlerType; - - description = '' - Specifies what to do when the laptop lid is closed and the system is - on external power. By default use the same action as specified in - services.logind.lidSwitch. - ''; - }; - systemd.sleep.extraConfig = mkOption { default = ""; type = types.lines; @@ -740,95 +338,6 @@ in ''; }; - systemd.user.extraConfig = mkOption { - default = ""; - type = types.lines; - example = "DefaultCPUAccounting=yes"; - description = '' - Extra config options for systemd user instances. See man systemd-user.conf for - available options. - ''; - }; - - systemd.tmpfiles.rules = mkOption { - type = types.listOf types.str; - default = []; - example = [ "d /tmp 1777 root root 10d" ]; - description = '' - Rules for creation, deletion and cleaning of volatile and temporary files - automatically. See - tmpfiles.d5 - for the exact format. - ''; - }; - - systemd.tmpfiles.packages = mkOption { - type = types.listOf types.package; - default = []; - example = literalExpression "[ pkgs.lvm2 ]"; - apply = map getLib; - description = '' - List of packages containing systemd-tmpfiles rules. - - All files ending in .conf found in - pkg/lib/tmpfiles.d - will be included. - If this folder does not exist or does not contain any files an error will be returned instead. - - If a lib output is available, rules are searched there and only there. - If there is no lib output it will fall back to out - and if that does not exist either, the default output will be used. - ''; - }; - - systemd.user.units = mkOption { - description = "Definition of systemd per-user units."; - default = {}; - type = with types; attrsOf (submodule ( - { name, config, ... }: - { options = concreteUnitOptions; - config = { - unit = mkDefault (makeUnit name config); - }; - })); - }; - - systemd.user.paths = mkOption { - default = {}; - type = with types; attrsOf (submodule [ { options = pathOptions; } unitConfig ]); - description = "Definition of systemd per-user path units."; - }; - - systemd.user.services = mkOption { - default = {}; - type = with types; attrsOf (submodule [ { options = serviceOptions; } unitConfig serviceConfig ] ); - description = "Definition of systemd per-user service units."; - }; - - systemd.user.slices = mkOption { - default = {}; - type = with types; attrsOf (submodule [ { options = sliceOptions; } unitConfig ] ); - description = "Definition of systemd per-user slice units."; - }; - - systemd.user.sockets = mkOption { - default = {}; - type = with types; attrsOf (submodule [ { options = socketOptions; } unitConfig ] ); - description = "Definition of systemd per-user socket units."; - }; - - systemd.user.targets = mkOption { - default = {}; - type = with types; attrsOf (submodule [ { options = targetOptions; } unitConfig] ); - description = "Definition of systemd per-user target units."; - }; - - systemd.user.timers = mkOption { - default = {}; - type = with types; attrsOf (submodule [ { options = timerOptions; } unitConfig ] ); - description = "Definition of systemd per-user timer units."; - }; - systemd.additionalUpstreamSystemUnits = mkOption { default = [ ]; type = types.listOf types.str; @@ -915,6 +424,9 @@ in (optional hasDeprecated "Service '${name}.service' uses the attribute 'StartLimitInterval' in the Service section, which is deprecated. See https://github.com/NixOS/nixpkgs/issues/45786." ) + (optional (service.reloadIfChanged && service.reloadTriggers != []) + "Service '${name}.service' has both 'reloadIfChanged' and 'reloadTriggers' set. This is probably not what you want, because 'reloadTriggers' behave the same whay as 'restartTriggers' if 'reloadIfChanged' is set." + ) ] ) cfg.services @@ -961,8 +473,6 @@ in in ({ "systemd/system".source = generateUnits "system" enabledUnits enabledUpstreamSystemUnits upstreamSystemWants; - "systemd/user".source = generateUnits "user" cfg.user.units upstreamUserUnits []; - "systemd/system.conf".text = '' [Manager] ${optionalString config.systemd.enableCgroupAccounting '' @@ -988,76 +498,17 @@ in ${config.systemd.extraConfig} ''; - "systemd/user.conf".text = '' - [Manager] - ${config.systemd.user.extraConfig} - ''; - - "systemd/journald.conf".text = '' - [Journal] - Storage=persistent - RateLimitInterval=${config.services.journald.rateLimitInterval} - RateLimitBurst=${toString config.services.journald.rateLimitBurst} - ${optionalString (config.services.journald.console != "") '' - ForwardToConsole=yes - TTYPath=${config.services.journald.console} - ''} - ${optionalString (config.services.journald.forwardToSyslog) '' - ForwardToSyslog=yes - ''} - ${config.services.journald.extraConfig} - ''; - - "systemd/coredump.conf".text = - '' - [Coredump] - ${config.systemd.coredump.extraConfig} - ''; - - "systemd/logind.conf".text = '' - [Login] - KillUserProcesses=${if config.services.logind.killUserProcesses then "yes" else "no"} - HandleLidSwitch=${config.services.logind.lidSwitch} - HandleLidSwitchDocked=${config.services.logind.lidSwitchDocked} - HandleLidSwitchExternalPower=${config.services.logind.lidSwitchExternalPower} - ${config.services.logind.extraConfig} - ''; - "systemd/sleep.conf".text = '' [Sleep] ${config.systemd.sleep.extraConfig} ''; - # install provided sysctl snippets - "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; - "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; - - "tmpfiles.d".source = (pkgs.symlinkJoin { - name = "tmpfiles.d"; - paths = map (p: p + "/lib/tmpfiles.d") cfg.tmpfiles.packages; - postBuild = '' - for i in $(cat $pathsPath); do - (test -d "$i" && test $(ls "$i"/*.conf | wc -l) -ge 1) || ( - echo "ERROR: The path '$i' from systemd.tmpfiles.packages contains no *.conf files." - exit 1 - ) - done - '' + concatMapStrings (name: optionalString (hasPrefix "tmpfiles.d/" name) '' - rm -f $out/${removePrefix "tmpfiles.d/" name} - '') config.system.build.etc.passthru.targets; - }) + "/*"; - "systemd/system-generators" = { source = hooks "generators" cfg.generators; }; "systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; }; }); services.dbus.enable = true; - users.users.systemd-coredump = { - uid = config.ids.uids.systemd-coredump; - group = "systemd-coredump"; - }; - users.groups.systemd-coredump = {}; users.users.systemd-network = { uid = config.ids.uids.systemd-network; group = "systemd-network"; @@ -1077,36 +528,6 @@ in unitConfig.X-StopOnReconfiguration = true; }; - systemd.tmpfiles.packages = [ - # Default tmpfiles rules provided by systemd - (pkgs.runCommand "systemd-default-tmpfiles" {} '' - mkdir -p $out/lib/tmpfiles.d - cd $out/lib/tmpfiles.d - - ln -s "${systemd}/example/tmpfiles.d/home.conf" - ln -s "${systemd}/example/tmpfiles.d/journal-nocow.conf" - ln -s "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf" - ln -s "${systemd}/example/tmpfiles.d/systemd.conf" - ln -s "${systemd}/example/tmpfiles.d/systemd-nologin.conf" - ln -s "${systemd}/example/tmpfiles.d/systemd-nspawn.conf" - ln -s "${systemd}/example/tmpfiles.d/systemd-tmp.conf" - ln -s "${systemd}/example/tmpfiles.d/tmp.conf" - ln -s "${systemd}/example/tmpfiles.d/var.conf" - ln -s "${systemd}/example/tmpfiles.d/x11.conf" - '') - # User-specified tmpfiles rules - (pkgs.writeTextFile { - name = "nixos-tmpfiles.d"; - destination = "/lib/tmpfiles.d/00-nixos.conf"; - text = '' - # This file is created automatically and should not be modified. - # Please change the option ‘systemd.tmpfiles.rules’ instead. - - ${concatStringsSep "\n" cfg.tmpfiles.rules} - ''; - }) - ]; - systemd.units = mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services @@ -1121,14 +542,6 @@ in (v: let n = escapeSystemdPath v.where; in nameValuePair "${n}.automount" (automountToUnit n v)) cfg.automounts); - systemd.user.units = - mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.user.paths - // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services - // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.user.slices - // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.user.sockets - // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.user.targets - // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.user.timers; - 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" @@ -1136,11 +549,6 @@ in "TMPFS_XATTR" "SECCOMP" ]; - users.groups.systemd-journal.gid = config.ids.gids.systemd-journal; - users.users.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway; - users.users.systemd-journal-gateway.group = "systemd-journal-gateway"; - users.groups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway; - # Generate timer units for all services that have a ‘startAt’ value. systemd.timers = mapAttrs (name: service: @@ -1157,42 +565,14 @@ in }) (filterAttrs (name: service: service.startAt != []) cfg.user.services); - systemd.sockets.systemd-journal-gatewayd.wantedBy = - optional config.services.journald.enableHttpGateway "sockets.target"; - - # Provide the systemd-user PAM service, required to run systemd - # user instances. - security.pam.services.systemd-user = - { # Ensure that pam_systemd gets included. This is special-cased - # in systemd to provide XDG_RUNTIME_DIR. - startSession = true; - }; - # Some overrides to upstream units. systemd.services."systemd-backlight@".restartIfChanged = false; systemd.services."systemd-fsck@".restartIfChanged = false; systemd.services."systemd-fsck@".path = [ config.system.path ]; - systemd.services."user@".restartIfChanged = false; - systemd.services.systemd-journal-flush.restartIfChanged = false; systemd.services.systemd-random-seed.restartIfChanged = false; systemd.services.systemd-remount-fs.restartIfChanged = false; systemd.services.systemd-update-utmp.restartIfChanged = false; - systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions. systemd.services.systemd-udev-settle.restartIfChanged = false; # Causes long delays in nixos-rebuild - # Restarting systemd-logind breaks X11 - # - upstream commit: https://cgit.freedesktop.org/xorg/xserver/commit/?id=dc48bd653c7e101 - # - systemd announcement: https://github.com/systemd/systemd/blob/22043e4317ecd2bc7834b48a6d364de76bb26d91/NEWS#L103-L112 - # - this might be addressed in the future by xorg - #systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ]; - systemd.services.systemd-logind.restartIfChanged = false; - systemd.services.systemd-logind.stopIfChanged = false; - # The user-runtime-dir@ service is managed by systemd-logind we should not touch it or else we break the users' sessions. - systemd.services."user-runtime-dir@".stopIfChanged = false; - systemd.services."user-runtime-dir@".restartIfChanged = false; - systemd.services.systemd-journald.restartTriggers = [ config.environment.etc."systemd/journald.conf".source ]; - systemd.services.systemd-journald.stopIfChanged = false; - systemd.services."systemd-journald@".restartTriggers = [ config.environment.etc."systemd/journald.conf".source ]; - systemd.services."systemd-journald@".stopIfChanged = false; systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; @@ -1203,13 +583,30 @@ in systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container"; systemd.services.systemd-random-seed.unitConfig.ConditionVirtualization = "!container"; - boot.kernel.sysctl."kernel.core_pattern" = mkIf (!cfg.coredump.enable) "core"; - # Increase numeric PID range (set directly instead of copying a one-line file from systemd) # https://github.com/systemd/systemd/pull/12226 boot.kernel.sysctl."kernel.pid_max" = mkIf pkgs.stdenv.is64bit (lib.mkDefault 4194304); boot.kernelParams = optional (!cfg.enableUnifiedCgroupHierarchy) "systemd.unified_cgroup_hierarchy=0"; + + services.logrotate.paths = { + "/var/log/btmp" = mapAttrs (_: mkDefault) { + frequency = "monthly"; + keep = 1; + extraConfig = '' + create 0660 root ${config.users.groups.utmp.name} + minsize 1M + ''; + }; + "/var/log/wtmp" = mapAttrs (_: mkDefault) { + frequency = "monthly"; + keep = 1; + extraConfig = '' + create 0664 root ${config.users.groups.utmp.name} + minsize 1M + ''; + }; + }; }; # FIXME: Remove these eventually. diff --git a/nixos/modules/system/boot/systemd/coredump.nix b/nixos/modules/system/boot/systemd/coredump.nix new file mode 100644 index 000000000000..b6ee2cff1f9a --- /dev/null +++ b/nixos/modules/system/boot/systemd/coredump.nix @@ -0,0 +1,57 @@ +{ config, lib, pkgs, utils, ... }: + +with lib; + +let + cfg = config.systemd.coredump; + systemd = config.systemd.package; +in { + options = { + systemd.coredump.enable = mkOption { + default = true; + type = types.bool; + description = '' + Whether core dumps should be processed by + systemd-coredump. If disabled, core dumps + appear in the current directory of the crashing process. + ''; + }; + + systemd.coredump.extraConfig = mkOption { + default = ""; + type = types.lines; + example = "Storage=journal"; + description = '' + Extra config options for systemd-coredump. See coredump.conf(5) man page + for available options. + ''; + }; + }; + + config = { + systemd.additionalUpstreamSystemUnits = [ + "systemd-coredump.socket" + "systemd-coredump@.service" + ]; + + environment.etc = { + "systemd/coredump.conf".text = + '' + [Coredump] + ${cfg.extraConfig} + ''; + + # install provided sysctl snippets + "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; + "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; + }; + + users.users.systemd-coredump = { + uid = config.ids.uids.systemd-coredump; + group = "systemd-coredump"; + }; + users.groups.systemd-coredump = {}; + + boot.kernel.sysctl."kernel.core_pattern" = mkIf (!cfg.enable) "core"; + }; +} diff --git a/nixos/modules/system/boot/systemd/journald.nix b/nixos/modules/system/boot/systemd/journald.nix new file mode 100644 index 000000000000..7e14c8ae4077 --- /dev/null +++ b/nixos/modules/system/boot/systemd/journald.nix @@ -0,0 +1,131 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.journald; +in { + options = { + services.journald.console = mkOption { + default = ""; + type = types.str; + description = "If non-empty, write log messages to the specified TTY device."; + }; + + services.journald.rateLimitInterval = mkOption { + default = "30s"; + type = types.str; + description = '' + Configures the rate limiting interval that is applied to all + messages generated on the system. This rate limiting is applied + per-service, so that two services which log do not interfere with + each other's limit. The value may be specified in the following + units: s, min, h, ms, us. To turn off any kind of rate limiting, + set either value to 0. + + See for important + considerations when setting this value. + ''; + }; + + services.journald.rateLimitBurst = mkOption { + default = 10000; + type = types.int; + description = '' + Configures the rate limiting burst limit (number of messages per + interval) that is applied to all messages generated on the system. + This rate limiting is applied per-service, so that two services + which log do not interfere with each other's limit. + + Note that the effective rate limit is multiplied by a factor derived + from the available free disk space for the journal as described on + + journald.conf(5). + + Note that the total amount of logs stored is limited by journald settings + such as SystemMaxUse, which defaults to a 4 GB cap. + + It is thus recommended to compute what period of time that you will be + able to store logs for when an application logs at full burst rate. + With default settings for log lines that are 100 Bytes long, this can + amount to just a few hours. + ''; + }; + + services.journald.extraConfig = mkOption { + default = ""; + type = types.lines; + example = "Storage=volatile"; + description = '' + Extra config options for systemd-journald. See man journald.conf + for available options. + ''; + }; + + services.journald.enableHttpGateway = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable the HTTP gateway to the journal. + ''; + }; + + services.journald.forwardToSyslog = mkOption { + default = config.services.rsyslogd.enable || config.services.syslog-ng.enable; + defaultText = literalExpression "services.rsyslogd.enable || services.syslog-ng.enable"; + type = types.bool; + description = '' + Whether to forward log messages to syslog. + ''; + }; + }; + + config = { + systemd.additionalUpstreamSystemUnits = [ + "systemd-journald.socket" + "systemd-journald@.socket" + "systemd-journald-varlink@.socket" + "systemd-journald.service" + "systemd-journald@.service" + "systemd-journal-flush.service" + "systemd-journal-catalog-update.service" + ] ++ (optional (!config.boot.isContainer) "systemd-journald-audit.socket") ++ [ + "systemd-journald-dev-log.socket" + "syslog.socket" + ] ++ optionals cfg.enableHttpGateway [ + "systemd-journal-gatewayd.socket" + "systemd-journal-gatewayd.service" + ]; + + environment.etc = { + "systemd/journald.conf".text = '' + [Journal] + Storage=persistent + RateLimitInterval=${cfg.rateLimitInterval} + RateLimitBurst=${toString cfg.rateLimitBurst} + ${optionalString (cfg.console != "") '' + ForwardToConsole=yes + TTYPath=${cfg.console} + ''} + ${optionalString (cfg.forwardToSyslog) '' + ForwardToSyslog=yes + ''} + ${cfg.extraConfig} + ''; + }; + + users.groups.systemd-journal.gid = config.ids.gids.systemd-journal; + users.users.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway; + users.users.systemd-journal-gateway.group = "systemd-journal-gateway"; + users.groups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway; + + systemd.sockets.systemd-journal-gatewayd.wantedBy = + optional cfg.enableHttpGateway "sockets.target"; + + systemd.services.systemd-journal-flush.restartIfChanged = false; + systemd.services.systemd-journald.restartTriggers = [ config.environment.etc."systemd/journald.conf".source ]; + systemd.services.systemd-journald.stopIfChanged = false; + systemd.services."systemd-journald@".restartTriggers = [ config.environment.etc."systemd/journald.conf".source ]; + systemd.services."systemd-journald@".stopIfChanged = false; + }; +} diff --git a/nixos/modules/system/boot/systemd/logind.nix b/nixos/modules/system/boot/systemd/logind.nix new file mode 100644 index 000000000000..c1e6cfe61d04 --- /dev/null +++ b/nixos/modules/system/boot/systemd/logind.nix @@ -0,0 +1,114 @@ +{ config, lib, pkgs, utils, ... }: + +with lib; + +let + cfg = config.services.logind; + + logindHandlerType = types.enum [ + "ignore" "poweroff" "reboot" "halt" "kexec" "suspend" + "hibernate" "hybrid-sleep" "suspend-then-hibernate" "lock" + ]; +in +{ + options = { + services.logind.extraConfig = mkOption { + default = ""; + type = types.lines; + example = "IdleAction=lock"; + description = '' + Extra config options for systemd-logind. See + + logind.conf(5) for available options. + ''; + }; + + services.logind.killUserProcesses = mkOption { + default = false; + type = types.bool; + description = '' + Specifies whether the processes of a user should be killed + when the user logs out. If true, the scope unit corresponding + to the session and all processes inside that scope will be + terminated. If false, the scope is "abandoned" (see + + systemd.scope(5)), and processes are not killed. + + + + See logind.conf(5) + for more details. + ''; + }; + + services.logind.lidSwitch = mkOption { + default = "suspend"; + example = "ignore"; + type = logindHandlerType; + + description = '' + Specifies what to be done when the laptop lid is closed. + ''; + }; + + services.logind.lidSwitchDocked = mkOption { + default = "ignore"; + example = "suspend"; + type = logindHandlerType; + + description = '' + Specifies what to be done when the laptop lid is closed + and another screen is added. + ''; + }; + + services.logind.lidSwitchExternalPower = mkOption { + default = cfg.lidSwitch; + defaultText = literalExpression "services.logind.lidSwitch"; + example = "ignore"; + type = logindHandlerType; + + description = '' + Specifies what to do when the laptop lid is closed and the system is + on external power. By default use the same action as specified in + services.logind.lidSwitch. + ''; + }; + }; + + config = { + systemd.additionalUpstreamSystemUnits = [ + "systemd-logind.service" + "autovt@.service" + "systemd-user-sessions.service" + "dbus-org.freedesktop.import1.service" + "dbus-org.freedesktop.machine1.service" + "dbus-org.freedesktop.login1.service" + "user@.service" + "user-runtime-dir@.service" + ]; + + environment.etc = { + "systemd/logind.conf".text = '' + [Login] + KillUserProcesses=${if cfg.killUserProcesses then "yes" else "no"} + HandleLidSwitch=${cfg.lidSwitch} + HandleLidSwitchDocked=${cfg.lidSwitchDocked} + HandleLidSwitchExternalPower=${cfg.lidSwitchExternalPower} + ${cfg.extraConfig} + ''; + }; + + # Restarting systemd-logind breaks X11 + # - upstream commit: https://cgit.freedesktop.org/xorg/xserver/commit/?id=dc48bd653c7e101 + # - systemd announcement: https://github.com/systemd/systemd/blob/22043e4317ecd2bc7834b48a6d364de76bb26d91/NEWS#L103-L112 + # - this might be addressed in the future by xorg + #systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ]; + systemd.services.systemd-logind.restartIfChanged = false; + systemd.services.systemd-logind.stopIfChanged = false; + + # The user-runtime-dir@ service is managed by systemd-logind we should not touch it or else we break the users' sessions. + systemd.services."user-runtime-dir@".stopIfChanged = false; + systemd.services."user-runtime-dir@".restartIfChanged = false; + }; +} diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd/nspawn.nix similarity index 86% rename from nixos/modules/system/boot/systemd-nspawn.nix rename to nixos/modules/system/boot/systemd/nspawn.nix index 02d2660add89..0c6822319a5b 100644 --- a/nixos/modules/system/boot/systemd-nspawn.nix +++ b/nixos/modules/system/boot/systemd/nspawn.nix @@ -120,14 +120,6 @@ in { }) { systemd.targets.multi-user.wants = [ "machines.target" ]; - - # Workaround for https://github.com/NixOS/nixpkgs/pull/67232#issuecomment-531315437 and https://github.com/systemd/systemd/issues/13622 - # Once systemd fixes this upstream, we can re-enable -U - systemd.services."systemd-nspawn@".serviceConfig.ExecStart = [ - "" # deliberately empty. signals systemd to override the ExecStart - # Only difference between upstream is that we do not pass the -U flag - "${config.systemd.package}/bin/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --settings=override --machine=%i" - ]; } ]; } diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix new file mode 100644 index 000000000000..57d44c8591ed --- /dev/null +++ b/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -0,0 +1,104 @@ +{ config, lib, pkgs, utils, ... }: + +with lib; + +let + cfg = config.systemd.tmpfiles; + systemd = config.systemd.package; +in +{ + options = { + systemd.tmpfiles.rules = mkOption { + type = types.listOf types.str; + default = []; + example = [ "d /tmp 1777 root root 10d" ]; + description = '' + Rules for creation, deletion and cleaning of volatile and temporary files + automatically. See + tmpfiles.d5 + for the exact format. + ''; + }; + + systemd.tmpfiles.packages = mkOption { + type = types.listOf types.package; + default = []; + example = literalExpression "[ pkgs.lvm2 ]"; + apply = map getLib; + description = '' + List of packages containing systemd-tmpfiles rules. + + All files ending in .conf found in + pkg/lib/tmpfiles.d + will be included. + If this folder does not exist or does not contain any files an error will be returned instead. + + If a lib output is available, rules are searched there and only there. + If there is no lib output it will fall back to out + and if that does not exist either, the default output will be used. + ''; + }; + }; + + config = { + systemd.additionalUpstreamSystemUnits = [ + "systemd-tmpfiles-clean.service" + "systemd-tmpfiles-clean.timer" + "systemd-tmpfiles-setup.service" + "systemd-tmpfiles-setup-dev.service" + ]; + + systemd.additionalUpstreamUserUnits = [ + "systemd-tmpfiles-clean.service" + "systemd-tmpfiles-clean.timer" + "systemd-tmpfiles-setup.service" + ]; + + environment.etc = { + "tmpfiles.d".source = (pkgs.symlinkJoin { + name = "tmpfiles.d"; + paths = map (p: p + "/lib/tmpfiles.d") cfg.packages; + postBuild = '' + for i in $(cat $pathsPath); do + (test -d "$i" && test $(ls "$i"/*.conf | wc -l) -ge 1) || ( + echo "ERROR: The path '$i' from systemd.tmpfiles.packages contains no *.conf files." + exit 1 + ) + done + '' + concatMapStrings (name: optionalString (hasPrefix "tmpfiles.d/" name) '' + rm -f $out/${removePrefix "tmpfiles.d/" name} + '') config.system.build.etc.passthru.targets; + }) + "/*"; + }; + + systemd.tmpfiles.packages = [ + # Default tmpfiles rules provided by systemd + (pkgs.runCommand "systemd-default-tmpfiles" {} '' + mkdir -p $out/lib/tmpfiles.d + cd $out/lib/tmpfiles.d + + ln -s "${systemd}/example/tmpfiles.d/home.conf" + ln -s "${systemd}/example/tmpfiles.d/journal-nocow.conf" + ln -s "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf" + ln -s "${systemd}/example/tmpfiles.d/systemd.conf" + ln -s "${systemd}/example/tmpfiles.d/systemd-nologin.conf" + ln -s "${systemd}/example/tmpfiles.d/systemd-nspawn.conf" + ln -s "${systemd}/example/tmpfiles.d/systemd-tmp.conf" + ln -s "${systemd}/example/tmpfiles.d/tmp.conf" + ln -s "${systemd}/example/tmpfiles.d/var.conf" + ln -s "${systemd}/example/tmpfiles.d/x11.conf" + '') + # User-specified tmpfiles rules + (pkgs.writeTextFile { + name = "nixos-tmpfiles.d"; + destination = "/lib/tmpfiles.d/00-nixos.conf"; + text = '' + # This file is created automatically and should not be modified. + # Please change the option ‘systemd.tmpfiles.rules’ instead. + + ${concatStringsSep "\n" cfg.rules} + ''; + }) + ]; + }; +} diff --git a/nixos/modules/system/boot/systemd/user.nix b/nixos/modules/system/boot/systemd/user.nix new file mode 100644 index 000000000000..e30f83f3457f --- /dev/null +++ b/nixos/modules/system/boot/systemd/user.nix @@ -0,0 +1,158 @@ +{ config, lib, pkgs, utils, ... }: +with utils; +with systemdUtils.unitOptions; +with lib; + +let + cfg = config.systemd.user; + + systemd = config.systemd.package; + + inherit + (systemdUtils.lib) + makeUnit + generateUnits + makeJobScript + unitConfig + serviceConfig + commonUnitText + targetToUnit + serviceToUnit + socketToUnit + timerToUnit + pathToUnit; + + upstreamUserUnits = [ + "app.slice" + "background.slice" + "basic.target" + "bluetooth.target" + "default.target" + "exit.target" + "graphical-session-pre.target" + "graphical-session.target" + "paths.target" + "printer.target" + "session.slice" + "shutdown.target" + "smartcard.target" + "sockets.target" + "sound.target" + "systemd-exit.service" + "timers.target" + "xdg-desktop-autostart.target" + ] ++ config.systemd.additionalUpstreamUserUnits; +in { + options = { + systemd.user.extraConfig = mkOption { + default = ""; + type = types.lines; + example = "DefaultCPUAccounting=yes"; + description = '' + Extra config options for systemd user instances. See man systemd-user.conf for + available options. + ''; + }; + + systemd.user.units = mkOption { + description = "Definition of systemd per-user units."; + default = {}; + type = with types; attrsOf (submodule ( + { name, config, ... }: + { options = concreteUnitOptions; + config = { + unit = mkDefault (makeUnit name config); + }; + })); + }; + + systemd.user.paths = mkOption { + default = {}; + type = with types; attrsOf (submodule [ { options = pathOptions; } unitConfig ]); + description = "Definition of systemd per-user path units."; + }; + + systemd.user.services = mkOption { + default = {}; + type = with types; attrsOf (submodule [ { options = serviceOptions; } unitConfig serviceConfig ] ); + description = "Definition of systemd per-user service units."; + }; + + systemd.user.slices = mkOption { + default = {}; + type = with types; attrsOf (submodule [ { options = sliceOptions; } unitConfig ] ); + description = "Definition of systemd per-user slice units."; + }; + + systemd.user.sockets = mkOption { + default = {}; + type = with types; attrsOf (submodule [ { options = socketOptions; } unitConfig ] ); + description = "Definition of systemd per-user socket units."; + }; + + systemd.user.targets = mkOption { + default = {}; + type = with types; attrsOf (submodule [ { options = targetOptions; } unitConfig] ); + description = "Definition of systemd per-user target units."; + }; + + systemd.user.timers = mkOption { + default = {}; + type = with types; attrsOf (submodule [ { options = timerOptions; } unitConfig ] ); + description = "Definition of systemd per-user timer units."; + }; + + systemd.additionalUpstreamUserUnits = mkOption { + default = []; + type = types.listOf types.str; + example = []; + description = '' + Additional units shipped with systemd that should be enabled for per-user systemd instances. + ''; + internal = true; + }; + }; + + config = { + systemd.additionalUpstreamSystemUnits = [ + "user.slice" + ]; + + environment.etc = { + "systemd/user".source = generateUnits "user" cfg.units upstreamUserUnits []; + + "systemd/user.conf".text = '' + [Manager] + ${cfg.extraConfig} + ''; + }; + + systemd.user.units = + mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths + // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services + // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.slices + // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets + // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets + // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers; + + # Generate timer units for all services that have a ‘startAt’ value. + systemd.user.timers = + mapAttrs (name: service: { + wantedBy = ["timers.target"]; + timerConfig.OnCalendar = service.startAt; + }) + (filterAttrs (name: service: service.startAt != []) cfg.services); + + # Provide the systemd-user PAM service, required to run systemd + # user instances. + security.pam.services.systemd-user = + { # Ensure that pam_systemd gets included. This is special-cased + # in systemd to provide XDG_RUNTIME_DIR. + startSession = true; + }; + + # Some overrides to upstream units. + systemd.services."user@".restartIfChanged = false; + systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions. + }; +} diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix index 6edafd6695b6..cf6d19eb5f0e 100644 --- a/nixos/modules/system/boot/tmp.nix +++ b/nixos/modules/system/boot/tmp.nix @@ -48,7 +48,12 @@ in what = "tmpfs"; where = "/tmp"; type = "tmpfs"; - mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=${toString cfg.tmpOnTmpfsSize}" ]; + mountConfig.Options = concatStringsSep "," [ "mode=1777" + "strictatime" + "rw" + "nosuid" + "nodev" + "size=${toString cfg.tmpOnTmpfsSize}" ]; } ]; diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix new file mode 100644 index 000000000000..780104950186 --- /dev/null +++ b/nixos/modules/system/etc/etc-activation.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: +let + inherit (lib) stringAfter; +in { + + imports = [ ./etc.nix ]; + + config = { + system.activationScripts.etc = + stringAfter [ "users" "groups" ] config.system.build.etcActivationCommands; + }; +} diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 6cc8c341e6df..ed552fecec53 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -66,6 +66,8 @@ in { + imports = [ ../build.nix ]; + ###### interface options = { @@ -188,14 +190,12 @@ in config = { system.build.etc = etc; - - system.activationScripts.etc = stringAfter [ "users" "groups" ] + system.build.etcActivationCommands = '' # Set up the statically computed bits of /etc. echo "setting up /etc..." ${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl ${./setup-etc.pl} ${etc}/etc ''; - }; } diff --git a/nixos/modules/system/etc/test.nix b/nixos/modules/system/etc/test.nix new file mode 100644 index 000000000000..5e43b155038d --- /dev/null +++ b/nixos/modules/system/etc/test.nix @@ -0,0 +1,70 @@ +{ lib +, coreutils +, fakechroot +, fakeroot +, evalMinimalConfig +, pkgsModule +, runCommand +, util-linux +, vmTools +, writeText +}: +let + node = evalMinimalConfig ({ config, ... }: { + imports = [ pkgsModule ../etc/etc.nix ]; + environment.etc."passwd" = { + text = passwdText; + }; + environment.etc."hosts" = { + text = hostsText; + mode = "0751"; + }; + }); + passwdText = '' + root:x:0:0:System administrator:/root:/run/current-system/sw/bin/bash + ''; + hostsText = '' + 127.0.0.1 localhost + ::1 localhost + # testing... + ''; +in +lib.recurseIntoAttrs { + test-etc-vm = + vmTools.runInLinuxVM (runCommand "test-etc-vm" { } '' + mkdir -p /etc + ${node.config.system.build.etcActivationCommands} + set -x + [[ -L /etc/passwd ]] + diff /etc/passwd ${writeText "expected-passwd" passwdText} + [[ 751 = $(stat --format %a /etc/hosts) ]] + diff /etc/hosts ${writeText "expected-hosts" hostsText} + set +x + touch $out + ''); + + # fakeroot is behaving weird + test-etc-fakeroot = + runCommand "test-etc" + { + nativeBuildInputs = [ + fakeroot + fakechroot + # for chroot + coreutils + # fakechroot needs getopt, which is provided by util-linux + util-linux + ]; + fakeRootCommands = '' + mkdir -p /etc + ${node.config.system.build.etcActivationCommands} + diff /etc/hosts ${writeText "expected-hosts" hostsText} + touch $out + ''; + } '' + mkdir fake-root + export FAKECHROOT_EXCLUDE_PATH=/dev:/proc:/sys:${builtins.storeDir}:$out + fakechroot fakeroot chroot $PWD/fake-root bash -c 'source $stdenv/setup; eval "$fakeRootCommands"' + ''; + +} diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix index b931b27ad817..1404dcbaf7c0 100644 --- a/nixos/modules/tasks/auto-upgrade.nix +++ b/nixos/modules/tasks/auto-upgrade.nix @@ -80,6 +80,7 @@ in { Reboot the system into the new generation instead of a switch if the new generation uses a different kernel, kernel modules or initrd than the booted system. + See for configuring the times at which a reboot is allowed. ''; }; @@ -96,6 +97,32 @@ in { ''; }; + rebootWindow = mkOption { + description = '' + Define a lower and upper time value (in HH:MM format) which + constitute a time window during which reboots are allowed after an upgrade. + This option only has an effect when is enabled. + The default value of null means that reboots are allowed at any time. + ''; + default = null; + example = { lower = "01:00"; upper = "05:00"; }; + type = with types; nullOr (submodule { + options = { + lower = mkOption { + description = "Lower limit of the reboot window"; + type = types.strMatching "[[:digit:]]{2}:[[:digit:]]{2}"; + example = "01:00"; + }; + + upper = mkOption { + description = "Upper limit of the reboot window"; + type = types.strMatching "[[:digit:]]{2}:[[:digit:]]{2}"; + example = "05:00"; + }; + }; + }); + }; + }; }; @@ -110,12 +137,10 @@ in { }]; system.autoUpgrade.flags = (if cfg.flake == null then - [ "--no-build-output" ] ++ (if cfg.channel == null then - [ "--upgrade" ] - else [ + [ "--no-build-output" ] ++ optionals (cfg.channel != null) [ "-I" "nixpkgs=${cfg.channel}/nixexprs.tar.xz" - ]) + ] else [ "--flake ${cfg.flake}" ]); @@ -143,19 +168,52 @@ in { ]; script = let - nixos-rebuild = - "${config.system.build.nixos-rebuild}/bin/nixos-rebuild"; + nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild"; + date = "${pkgs.coreutils}/bin/date"; + readlink = "${pkgs.coreutils}/bin/readlink"; + shutdown = "${pkgs.systemd}/bin/shutdown"; + upgradeFlag = optional (cfg.channel == null) "--upgrade"; in if cfg.allowReboot then '' - ${nixos-rebuild} boot ${toString cfg.flags} - booted="$(readlink /run/booted-system/{initrd,kernel,kernel-modules})" - built="$(readlink /nix/var/nix/profiles/system/{initrd,kernel,kernel-modules})" - if [ "$booted" = "$built" ]; then + ${nixos-rebuild} boot ${toString (cfg.flags ++ upgradeFlag)} + booted="$(${readlink} /run/booted-system/{initrd,kernel,kernel-modules})" + built="$(${readlink} /nix/var/nix/profiles/system/{initrd,kernel,kernel-modules})" + + ${optionalString (cfg.rebootWindow != null) '' + current_time="$(${date} +%H:%M)" + + lower="${cfg.rebootWindow.lower}" + upper="${cfg.rebootWindow.upper}" + + if [[ "''${lower}" < "''${upper}" ]]; then + if [[ "''${current_time}" > "''${lower}" ]] && \ + [[ "''${current_time}" < "''${upper}" ]]; then + do_reboot="true" + else + do_reboot="false" + fi + else + # lower > upper, so we are crossing midnight (e.g. lower=23h, upper=6h) + # we want to reboot if cur > 23h or cur < 6h + if [[ "''${current_time}" < "''${upper}" ]] || \ + [[ "''${current_time}" > "''${lower}" ]]; then + do_reboot="true" + else + do_reboot="false" + fi + fi + ''} + + if [ "''${booted}" = "''${built}" ]; then ${nixos-rebuild} switch ${toString cfg.flags} + ${optionalString (cfg.rebootWindow != null) '' + elif [ "''${do_reboot}" != true ]; then + echo "Outside of configured reboot window, skipping." + ''} else - /run/current-system/sw/bin/shutdown -r +1 + ${shutdown} -r +1 fi '' else '' - ${nixos-rebuild} switch ${toString cfg.flags} + ${nixos-rebuild} switch ${toString (cfg.flags ++ upgradeFlag)} ''; startAt = cfg.dates; @@ -167,3 +225,4 @@ in { }; } + diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 225bcbe58e01..d68edd8d7d39 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -215,6 +215,35 @@ in ''; }; + boot.devSize = mkOption { + default = "5%"; + example = "32m"; + type = types.str; + description = '' + Size limit for the /dev tmpfs. Look at mount(8), tmpfs size option, + for the accepted syntax. + ''; + }; + + boot.devShmSize = mkOption { + default = "50%"; + example = "256m"; + type = types.str; + description = '' + Size limit for the /dev/shm tmpfs. Look at mount(8), tmpfs size option, + for the accepted syntax. + ''; + }; + + boot.runSize = mkOption { + default = "25%"; + example = "256m"; + type = types.str; + description = '' + Size limit for the /run tmpfs. Look at mount(8), tmpfs size option, + for the accepted syntax. + ''; + }; }; @@ -250,7 +279,7 @@ in environment.etc.fstab.text = let - fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ]; + fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" "apfs" ]; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck; # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; diff --git a/nixos/modules/tasks/filesystems/apfs.nix b/nixos/modules/tasks/filesystems/apfs.nix new file mode 100644 index 000000000000..2f2be351df61 --- /dev/null +++ b/nixos/modules/tasks/filesystems/apfs.nix @@ -0,0 +1,22 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + inInitrd = any (fs: fs == "apfs") config.boot.initrd.supportedFilesystems; + +in + +{ + config = mkIf (any (fs: fs == "apfs") config.boot.supportedFilesystems) { + + system.fsPackages = [ pkgs.apfsprogs ]; + + boot.extraModulePackages = [ config.boot.kernelPackages.apfs ]; + + boot.initrd.kernelModules = mkIf inInitrd [ "apfs" ]; + + # Don't copy apfsck into the initramfs since it does not support repairing the filesystem + }; +} diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 19f2be2c4a25..b0f160c1dbf9 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -535,6 +535,7 @@ let createGreDevice = n: v: nameValuePair "${n}-netdev" (let deps = deviceDependency v.dev; + ttlarg = if lib.hasPrefix "ip6" v.type then "hoplimit" else "ttl"; in { description = "GRE Tunnel Interface ${n}"; wantedBy = [ "network-setup.service" (subsystemDevice n) ]; @@ -551,6 +552,7 @@ let 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 ''; diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 8a5e1b5af114..8654539b6629 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -318,6 +318,8 @@ in Remote = gre.remote; }) // (optionalAttrs (gre.local != null) { Local = gre.local; + }) // (optionalAttrs (gre.ttl != null) { + TTL = gre.ttl; }); }; networks = mkIf (gre.dev != null) { diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 1dac405ac309..8ca4ad7b7d86 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -305,7 +305,7 @@ let enable = mkOption { type = types.bool; default = false; - description = "Wether to enable wol on this interface."; + description = "Whether to enable wol on this interface."; }; }; }; @@ -1020,6 +1020,14 @@ in local = "10.0.0.22"; dev = "enp4s0f0"; type = "tap"; + ttl = 255; + }; + gre6Tunnel = { + remote = "fd7a:5634::1"; + local = "fd7a:5634::2"; + dev = "enp4s0f0"; + type = "tun6"; + ttl = 255; }; } ''; @@ -1057,11 +1065,25 @@ in ''; }; + ttl = mkOption { + type = types.nullOr types.int; + default = null; + example = 255; + description = '' + The time-to-live/hoplimit of the connection to the remote tunnel endpoint. + ''; + }; + type = mkOption { - type = with types; enum [ "tun" "tap" ]; + type = with types; enum [ "tun" "tap" "tun6" "tap6" ]; default = "tap"; example = "tap"; - apply = v: if v == "tun" then "gre" else "gretap"; + apply = v: { + tun = "gre"; + tap = "gretap"; + tun6 = "ip6gre"; + tap6 = "ip6gretap"; + }.${v}; description = '' Whether the tunnel routes layer 2 (tap) or layer 3 (tun) traffic. ''; @@ -1325,22 +1347,13 @@ in val = tempaddrValues.${opt}.sysctl; in nameValuePair "net.ipv6.conf.${replaceChars ["."] ["/"] i.name}.use_tempaddr" val)); - # Capabilities won't work unless we have at-least a 4.3 Linux - # kernel because we need the ambient capability - security.wrappers = if (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") then { + security.wrappers = { ping = { owner = "root"; group = "root"; capabilities = "cap_net_raw+p"; source = "${pkgs.iputils.out}/bin/ping"; }; - } else { - ping = { - setuid = true; - owner = "root"; - group = "root"; - source = "${pkgs.iputils.out}/bin/ping"; - }; }; security.apparmor.policies."bin.ping".profile = lib.mkIf config.security.apparmor.policies."bin.ping".enable (lib.mkAfter '' /run/wrappers/bin/ping { @@ -1438,7 +1451,7 @@ in sysctl-value = tempaddrValues.${cfg.tempAddresses}.sysctl; in '' # enable and prefer IPv6 privacy addresses by default - ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo ${sysctl-value} > /proc/sys/net/ipv6/conf/%k/use_tempaddr'" + ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.bash}/bin/sh -c 'echo ${sysctl-value} > /proc/sys/net/ipv6/conf/$name/use_tempaddr'" ''; }) (pkgs.writeTextFile rec { diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index a7011be7e042..01447e6ada87 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -109,6 +109,10 @@ in # Allow very slow start DefaultTimeoutStartSec=300 ''; + systemd.user.extraConfig = '' + # Allow very slow start + DefaultTimeoutStartSec=300 + ''; boot.consoleLogLevel = 7; diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index fe248a94488b..9a56b6950155 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -37,8 +37,13 @@ in { assertion = cfg.efi -> cfg.hvm; message = "EC2 instances using EFI must be HVM instances."; } + { assertion = versionOlder config.boot.kernelPackages.kernel.version "5.15"; + message = "ENA driver fails to build with kernel >= 5.15"; + } ]; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_10; + boot.growPartition = cfg.hvm; fileSystems."/" = mkIf (!cfg.zfs.enable) { @@ -155,7 +160,7 @@ in systemd.services."serial-getty@ttyS0".enable = true; # Creates symlinks for block device names. - services.udev.packages = [ pkgs.ec2-utils ]; + services.udev.packages = [ pkgs.amazon-ec2-utils ]; # Force getting the hostname from EC2. networking.hostName = mkDefault ""; diff --git a/nixos/modules/virtualisation/containerd.nix b/nixos/modules/virtualisation/containerd.nix index 898a66e7b04e..ea89a994b172 100644 --- a/nixos/modules/virtualisation/containerd.nix +++ b/nixos/modules/virtualisation/containerd.nix @@ -53,6 +53,7 @@ in virtualisation.containerd = { args.config = toString containerdConfigChecked; settings = { + version = 2; plugins."io.containerd.grpc.v1.cri" = { containerd.snapshotter = lib.mkIf config.boot.zfs.enabled (lib.mkOptionDefault "zfs"); diff --git a/nixos/modules/virtualisation/docker-rootless.nix b/nixos/modules/virtualisation/docker-rootless.nix index 0e7f05031420..d371f67ecdc8 100644 --- a/nixos/modules/virtualisation/docker-rootless.nix +++ b/nixos/modules/virtualisation/docker-rootless.nix @@ -76,7 +76,11 @@ in # needs newuidmap from pkgs.shadow path = [ "/run/wrappers" ]; environment = proxy_env; - unitConfig.StartLimitInterval = "60s"; + unitConfig = { + # docker-rootless doesn't support running as root. + ConditionUser = "!root"; + StartLimitInterval = "60s"; + }; serviceConfig = { Type = "notify"; ExecStart = "${cfg.package}/bin/dockerd-rootless --config-file=${daemonSettingsFile}"; diff --git a/nixos/modules/virtualisation/fetch-instance-ssh-keys.bash b/nixos/modules/virtualisation/fetch-instance-ssh-keys.bash deleted file mode 100644 index 4a8601961115..000000000000 --- a/nixos/modules/virtualisation/fetch-instance-ssh-keys.bash +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -WGET() { - wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google' "$@" -} - -# When dealing with cryptographic keys, we want to keep things private. -umask 077 -mkdir -p /root/.ssh - -echo "Fetching authorized keys..." -WGET -O /tmp/auth_keys http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys - -# Read keys one by one, split in case Google decided -# to append metadata (it does sometimes) and add to -# authorized_keys if not already present. -touch /root/.ssh/authorized_keys -while IFS='' read -r line || [[ -n "$line" ]]; do - keyLine=$(echo -n "$line" | cut -d ':' -f2) - IFS=' ' read -r -a array <<<"$keyLine" - if [[ ${#array[@]} -ge 3 ]]; then - echo "${array[@]:0:3}" >>/tmp/new_keys - echo "Added ${array[*]:2} to authorized_keys" - fi -done image attribute, as it - will be used as the image name for docker to start a container. + The image attribute must match the name and + tag of the image contained in this file, as they will be used to + run the container with that image. If they do not match, the + image will be pulled from the registry as usual. ''; example = literalExpression "pkgs.dockerTools.buildImage {...};"; }; diff --git a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix index 133cd4c0e9f9..25104bb47667 100644 --- a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix +++ b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix @@ -15,7 +15,8 @@ } wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path - (umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data) + # When no user-data is provided, the OpenStack metadata server doesn't expose the user-data route. + (umask 077 && wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data || rm -f "$metaDir/user-data") wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key '' diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 325f6f5b43f4..436a375fb5eb 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -36,17 +36,6 @@ in { Open vSwitch package to use. ''; }; - - ipsec = mkOption { - type = types.bool; - default = false; - description = '' - Whether to start racoon service for openvswitch. - Supported only if openvswitch version is less than 2.6.0. - Use virtualisation.vswitch.package = pkgs.openvswitch-lts - for a version that supports ipsec over GRE. - ''; - }; }; config = mkIf cfg.enable (let @@ -65,7 +54,7 @@ in { installPhase = "mkdir -p $out"; }; - in (mkMerge [{ + in { environment.systemPackages = [ cfg.package ]; boot.kernelModules = [ "tun" "openvswitch" ]; @@ -142,48 +131,14 @@ in { }; }; - } - (mkIf (cfg.ipsec && (versionOlder cfg.package.version "2.6.0")) { - environment.systemPackages = [ pkgs.ipsecTools ]; + }); - services.racoon.enable = true; - services.racoon.configPath = "${runDir}/ipsec/etc/racoon/racoon.conf"; - - networking.firewall.extraCommands = '' - iptables -I INPUT -t mangle -p esp -j MARK --set-mark 1/1 - iptables -I INPUT -t mangle -p udp --dport 4500 -j MARK --set-mark 1/1 - ''; - - systemd.services.ovs-monitor-ipsec = { - description = "Open_vSwitch Ipsec Daemon"; - wantedBy = [ "multi-user.target" ]; - requires = [ "ovsdb.service" ]; - before = [ "vswitchd.service" "racoon.service" ]; - environment.UNIXCTLPATH = "/tmp/ovsdb.ctl.sock"; - serviceConfig = { - ExecStart = '' - ${cfg.package}/bin/ovs-monitor-ipsec \ - --root-prefix ${runDir}/ipsec \ - --pidfile /run/openvswitch/ovs-monitor-ipsec.pid \ - --monitor --detach \ - unix:/run/openvswitch/db.sock - ''; - PIDFile = "/run/openvswitch/ovs-monitor-ipsec.pid"; - # Use service type 'forking' to correctly determine when ovs-monitor-ipsec is ready. - Type = "forking"; - }; - - preStart = '' - rm -r ${runDir}/ipsec/etc/racoon/certs || true - mkdir -p ${runDir}/ipsec/{etc/racoon,etc/init.d/,usr/sbin/} - ln -fs ${pkgs.ipsecTools}/bin/setkey ${runDir}/ipsec/usr/sbin/setkey - ln -fs ${pkgs.writeScript "racoon-restart" '' - #!${pkgs.runtimeShell} - /run/current-system/sw/bin/systemctl $1 racoon - ''} ${runDir}/ipsec/etc/init.d/racoon - ''; - }; - })])); + imports = [ + (mkRemovedOptionModule [ "virtualisation" "vswitch" "ipsec" ] '' + OpenVSwitch IPSec functionality has been removed, because it depended on racoon, + which was removed from nixpkgs, because it was abanoded upstream. + '') + ]; meta.maintainers = with maintainers; [ netixx ]; diff --git a/nixos/modules/virtualisation/proxmox-lxc.nix b/nixos/modules/virtualisation/proxmox-lxc.nix new file mode 100644 index 000000000000..3913b474afbe --- /dev/null +++ b/nixos/modules/virtualisation/proxmox-lxc.nix @@ -0,0 +1,64 @@ +{ config, pkgs, lib, ... }: + +with lib; + +{ + options.proxmoxLXC = { + privileged = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable privileged mounts + ''; + }; + manageNetwork = mkOption { + type = types.bool; + default = false; + description = '' + Whether to manage network interfaces through nix options + When false, systemd-networkd is enabled to accept network + configuration from proxmox. + ''; + }; + }; + + config = + let + cfg = config.proxmoxLXC; + in + { + system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix { + storeContents = [{ + object = config.system.build.toplevel; + symlink = "none"; + }]; + + contents = [{ + source = config.system.build.toplevel + "/init"; + target = "/sbin/init"; + }]; + + extraCommands = "mkdir -p root etc/systemd/network"; + }; + + boot = { + isContainer = true; + loader.initScript.enable = true; + }; + + networking = mkIf (!cfg.manageNetwork) { + useDHCP = false; + useHostResolvConf = false; + useNetworkd = true; + }; + + services.openssh = { + enable = mkDefault true; + startWhenNeeded = mkDefault true; + }; + + systemd.mounts = mkIf (!cfg.privileged) + [{ where = "/sys/kernel/debug"; enable = false; }]; + + }; +} diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 29e3aa024dfa..dacbb64a2dac 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -632,6 +632,15 @@ in Enable the Qemu guest agent. ''; }; + + virtioKeyboard = + mkOption { + type = types.bool; + default = true; + description = '' + Enable the virtio-keyboard device. + ''; + }; }; virtualisation.useNixStoreImage = @@ -787,7 +796,7 @@ in # allow `system.build.toplevel' to be included. (If we had a direct # reference to ${regInfo} here, then we would get a cyclic # dependency.) - boot.postBootCommands = + boot.postBootCommands = lib.mkIf config.nix.enable '' if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then ${config.nix.package.out}/bin/nix-store --load-db < ''${BASH_REMATCH[1]} @@ -835,7 +844,9 @@ in # FIXME: Consolidate this one day. virtualisation.qemu.options = mkMerge [ - [ "-device virtio-keyboard" ] + (mkIf cfg.qemu.virtioKeyboard [ + "-device virtio-keyboard" + ]) (mkIf pkgs.stdenv.hostPlatform.isx86 [ "-usb" "-device usb-tablet,bus=usb-bus.0" ]) diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index f702fb4e525c..7b55b3b9759e 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -68,7 +68,7 @@ in SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd" ''; } (mkIf cfg.x11 { - services.xserver.videoDrivers = mkOverride 50 [ "vmware" "virtualbox" "modesetting" ]; + services.xserver.videoDrivers = [ "vmware" "virtualbox" "modesetting" ]; services.xserver.config = '' diff --git a/nixos/modules/virtualisation/waydroid.nix b/nixos/modules/virtualisation/waydroid.nix index 4fc798ff39f8..2c0b658948dd 100644 --- a/nixos/modules/virtualisation/waydroid.nix +++ b/nixos/modules/virtualisation/waydroid.nix @@ -56,8 +56,6 @@ in wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ getent iptables iproute kmod nftables util-linux which ]; - unitConfig = { ConditionPathExists = "/var/lib/waydroid/lxc/waydroid"; }; @@ -68,6 +66,10 @@ in ExecStopPost = "${pkgs.waydroid}/bin/waydroid session stop"; }; }; + + systemd.tmpfiles.rules = [ + "d /var/lib/misc 0755 root root -" # for dnsmasq.leases + ]; }; } diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index ee3f3d19174e..fd8a39cfb92b 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -98,7 +98,6 @@ in rec { (onFullSupported "nixos.tests.login") (onFullSupported "nixos.tests.misc") (onFullSupported "nixos.tests.mutableUsers") - (onFullSupported "nixos.tests.nano") (onFullSupported "nixos.tests.nat.firewall-conntrack") (onFullSupported "nixos.tests.nat.firewall") (onFullSupported "nixos.tests.nat.standalone") @@ -130,7 +129,8 @@ in rec { (onFullSupported "nixos.tests.networking.networkd.virtual") (onFullSupported "nixos.tests.networking.networkd.vlan") (onFullSupported "nixos.tests.systemd-networkd-ipv6-prefix-delegation") - (onFullSupported "nixos.tests.nfs3.simple") + # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314 + #(onFullSupported "nixos.tests.nfs3.simple") (onFullSupported "nixos.tests.nfs4.simple") (onFullSupported "nixos.tests.openssh") (onFullSupported "nixos.tests.pantheon") diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 996db54c9a40..1d51b4e7f28f 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -38,7 +38,8 @@ in rec { login misc nat - nfs3 + # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314 + #nfs3 openssh php predictable-interface-names @@ -107,7 +108,8 @@ in rec { "nixos.tests.nat.firewall-conntrack.x86_64-linux" "nixos.tests.nat.firewall.x86_64-linux" "nixos.tests.nat.standalone.x86_64-linux" - "nixos.tests.nfs3.simple.x86_64-linux" + # fails with kernel >= 5.15 https://github.com/NixOS/nixpkgs/pull/152505#issuecomment-1005049314 + #"nixos.tests.nfs3.simple.x86_64-linux" "nixos.tests.openssh.x86_64-linux" "nixos.tests.php.fpm.x86_64-linux" "nixos.tests.php.pcre.x86_64-linux" diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 62bc8acef606..ab6906cd24e2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -32,9 +32,11 @@ in acme = handleTest ./acme.nix {}; adguardhome = handleTest ./adguardhome.nix {}; aesmd = handleTest ./aesmd.nix {}; + agate = handleTest ./web-servers/agate.nix {}; agda = handleTest ./agda.nix {}; airsonic = handleTest ./airsonic.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; + apfs = handleTest ./apfs.nix {}; apparmor = handleTest ./apparmor.nix {}; atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; @@ -50,11 +52,13 @@ in bitcoind = handleTest ./bitcoind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; blockbook-frontend = handleTest ./blockbook-frontend.nix {}; + blocky = handleTest ./blocky.nix {}; boot = handleTestOn ["x86_64-linux" "aarch64-linux"] ./boot.nix {}; boot-stage1 = handleTest ./boot-stage1.nix {}; borgbackup = handleTest ./borgbackup.nix {}; botamusique = handleTest ./botamusique.nix {}; bpf = handleTestOn ["x86_64-linux" "aarch64-linux"] ./bpf.nix {}; + breitbandmessung = handleTest ./breitbandmessung.nix {}; brscan5 = handleTest ./brscan5.nix {}; btrbk = handleTest ./btrbk.nix {}; buildbot = handleTest ./buildbot.nix {}; @@ -128,6 +132,7 @@ in domination = handleTest ./domination.nix {}; dovecot = handleTest ./dovecot.nix {}; drbd = handleTest ./drbd.nix {}; + earlyoom = handleTestOn ["x86_64-linux"] ./earlyoom.nix {}; ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {}; ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {}; ecryptfs = handleTest ./ecryptfs.nix {}; @@ -139,6 +144,7 @@ in env = handleTest ./env.nix {}; ergo = handleTest ./ergo.nix {}; ergochat = handleTest ./ergochat.nix {}; + etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; }; etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {}; etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {}; etebase-server = handleTest ./etebase-server.nix {}; @@ -184,9 +190,9 @@ in grocy = handleTest ./grocy.nix {}; grub = handleTest ./grub.nix {}; gvisor = handleTest ./gvisor.nix {}; - hadoop.all = handleTestOn [ "x86_64-linux" ] ./hadoop/hadoop.nix {}; - hadoop.hdfs = handleTestOn [ "x86_64-linux" ] ./hadoop/hdfs.nix {}; - hadoop.yarn = handleTestOn [ "x86_64-linux" ] ./hadoop/yarn.nix {}; + hadoop = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop; }; + hadoop_3_2 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop_3_2; }; + hadoop2 = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop2; }; haka = handleTest ./haka.nix {}; haproxy = handleTest ./haproxy.nix {}; hardened = handleTest ./hardened.nix {}; @@ -219,6 +225,7 @@ in initrd-network-ssh = handleTest ./initrd-network-ssh {}; initrdNetwork = handleTest ./initrd-network.nix {}; initrd-secrets = handleTest ./initrd-secrets.nix {}; + input-remapper = handleTest ./input-remapper.nix {}; inspircd = handleTest ./inspircd.nix {}; installer = handleTest ./installer.nix {}; invoiceplane = handleTest ./invoiceplane.nix {}; @@ -235,7 +242,6 @@ in jibri = handleTest ./jibri.nix {}; jirafeau = handleTest ./jirafeau.nix {}; jitsi-meet = handleTest ./jitsi-meet.nix {}; - k3s = handleTest ./k3s.nix {}; k3s-single-node = handleTest ./k3s-single-node.nix {}; k3s-single-node-docker = handleTest ./k3s-single-node-docker.nix {}; kafka = handleTest ./kafka.nix {}; @@ -266,6 +272,7 @@ in litestream = handleTest ./litestream.nix {}; locate = handleTest ./locate.nix {}; login = handleTest ./login.nix {}; + logrotate = handleTest ./logrotate.nix {}; loki = handleTest ./loki.nix {}; lxd = handleTest ./lxd.nix {}; lxd-image = handleTest ./lxd-image.nix {}; @@ -280,6 +287,7 @@ in mailhog = handleTest ./mailhog.nix {}; man = handleTest ./man.nix {}; mariadb-galera = handleTest ./mysql/mariadb-galera.nix {}; + mastodon = handleTestOn ["x86_64-linux" "i686-linux" "aarch64-linux"] ./web-apps/mastodon.nix {}; matomo = handleTest ./matomo.nix {}; matrix-appservice-irc = handleTest ./matrix-appservice-irc.nix {}; matrix-conduit = handleTest ./matrix-conduit.nix {}; @@ -301,8 +309,10 @@ in molly-brown = handleTest ./molly-brown.nix {}; mongodb = handleTest ./mongodb.nix {}; moodle = handleTest ./moodle.nix {}; + moonraker = handleTest ./moonraker.nix {}; morty = handleTest ./morty.nix {}; mosquitto = handleTest ./mosquitto.nix {}; + moosefs = handleTest ./moosefs.nix {}; mpd = handleTest ./mpd.nix {}; mpv = handleTest ./mpv.nix {}; mumble = handleTest ./mumble.nix {}; @@ -316,13 +326,13 @@ in mysql-replication = handleTest ./mysql/mysql-replication.nix {}; n8n = handleTest ./n8n.nix {}; nagios = handleTest ./nagios.nix {}; - nano = handleTest ./nano.nix {}; nar-serve = handleTest ./nar-serve.nix {}; nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.standalone = handleTest ./nat.nix { withFirewall = false; }; nats = handleTest ./nats.nix {}; navidrome = handleTest ./navidrome.nix {}; + nbd = handleTest ./nbd.nix {}; ncdns = handleTest ./ncdns.nix {}; ndppd = handleTest ./ndppd.nix {}; nebula = handleTest ./nebula.nix {}; @@ -342,11 +352,13 @@ in nginx = handleTest ./nginx.nix {}; nginx-auth = handleTest ./nginx-auth.nix {}; nginx-etag = handleTest ./nginx-etag.nix {}; + nginx-modsecurity = handleTest ./nginx-modsecurity.nix {}; nginx-pubhtml = handleTest ./nginx-pubhtml.nix {}; nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; nginx-variants = handleTest ./nginx-variants.nix {}; nitter = handleTest ./nitter.nix {}; + nix-ld = handleTest ./nix-ld {}; nix-serve = handleTest ./nix-serve.nix {}; nix-serve-ssh = handleTest ./nix-serve-ssh.nix {}; nixops = handleTest ./nixops/default.nix {}; @@ -354,6 +366,7 @@ in nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; }; node-red = handleTest ./node-red.nix {}; nomad = handleTest ./nomad.nix {}; + noto-fonts = handleTest ./noto-fonts.nix {}; novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {}; nsd = handleTest ./nsd.nix {}; nzbget = handleTest ./nzbget.nix {}; @@ -375,6 +388,7 @@ in os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {}; osrm-backend = handleTest ./osrm-backend.nix {}; overlayfs = handleTest ./overlayfs.nix {}; + pacemaker = handleTest ./pacemaker.nix {}; packagekit = handleTest ./packagekit.nix {}; pam-file-contents = handleTest ./pam/pam-file-contents.nix {}; pam-oath-login = handleTest ./pam/pam-oath-login.nix {}; @@ -386,6 +400,8 @@ in pdns-recursor = handleTest ./pdns-recursor.nix {}; peerflix = handleTest ./peerflix.nix {}; peertube = handleTestOn ["x86_64-linux"] ./web-apps/peertube.nix {}; + pgadmin4 = handleTest ./pgadmin4.nix {}; + pgadmin4-standalone = handleTest ./pgadmin4-standalone.nix {}; pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; php = handleTest ./php {}; @@ -422,6 +438,7 @@ in prometheus = handleTest ./prometheus.nix {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; prosody = handleTest ./xmpp/prosody.nix {}; + prosody-mysql = handleTest ./xmpp/prosody-mysql.nix {}; proxy = handleTest ./proxy.nix {}; prowlarr = handleTest ./prowlarr.nix {}; pt2-clone = handleTest ./pt2-clone.nix {}; @@ -437,6 +454,7 @@ in resolv = handleTest ./resolv.nix {}; restartByActivationScript = handleTest ./restart-by-activation-script.nix {}; restic = handleTest ./restic.nix {}; + retroarch = handleTest ./retroarch.nix {}; riak = handleTest ./riak.nix {}; robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; @@ -454,6 +472,7 @@ in seafile = handleTest ./seafile.nix {}; searx = handleTest ./searx.nix {}; service-runner = handleTest ./service-runner.nix {}; + sfxr-qt = handleTest ./sfxr-qt.nix {}; shadow = handleTest ./shadow.nix {}; shadowsocks = handleTest ./shadowsocks {}; shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix {}; @@ -471,7 +490,7 @@ in sonarr = handleTest ./sonarr.nix {}; sourcehut = handleTest ./sourcehut.nix {}; spacecookie = handleTest ./spacecookie.nix {}; - spark = handleTestOn ["x86_64-linux"] ./spark {}; + spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {}; sslh = handleTest ./sslh.nix {}; sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {}; sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; @@ -491,7 +510,9 @@ in systemd-boot = handleTest ./systemd-boot.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {}; + systemd-escaping = handleTest ./systemd-escaping.nix {}; systemd-journal = handleTest ./systemd-journal.nix {}; + systemd-machinectl = handleTest ./systemd-machinectl.nix {}; systemd-networkd = handleTest ./systemd-networkd.nix {}; systemd-networkd-dhcpserver = handleTest ./systemd-networkd-dhcpserver.nix {}; systemd-networkd-dhcpserver-static-leases = handleTest ./systemd-networkd-dhcpserver-static-leases.nix {}; @@ -499,18 +520,20 @@ in systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; systemd-nspawn = handleTest ./systemd-nspawn.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; - systemd-unit-path = handleTest ./systemd-unit-path.nix {}; + systemd-misc = handleTest ./systemd-misc.nix {}; taskserver = handleTest ./taskserver.nix {}; teeworlds = handleTest ./teeworlds.nix {}; telegraf = handleTest ./telegraf.nix {}; teleport = handleTest ./teleport.nix {}; thelounge = handleTest ./thelounge.nix {}; + terminal-emulators = handleTest ./terminal-emulators.nix {}; tiddlywiki = handleTest ./tiddlywiki.nix {}; tigervnc = handleTest ./tigervnc.nix {}; timezone = handleTest ./timezone.nix {}; tinc = handleTest ./tinc {}; tinydns = handleTest ./tinydns.nix {}; tinywl = handleTest ./tinywl.nix {}; + tomcat = handleTest ./tomcat.nix {}; tor = handleTest ./tor.nix {}; # traefik test relies on docker-containers traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {}; @@ -543,6 +566,7 @@ in vikunja = handleTest ./vikunja.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; vscodium = discoverTests (import ./vscodium.nix); + vsftpd = handleTest ./vsftpd.nix {}; wasabibackend = handleTest ./wasabibackend.nix {}; wiki-js = handleTest ./wiki-js.nix {}; wine = handleTest ./wine.nix {}; @@ -558,8 +582,10 @@ in xrdp = handleTest ./xrdp.nix {}; xss-lock = handleTest ./xss-lock.nix {}; xterm = handleTest ./xterm.nix {}; + xxh = handleTest ./xxh.nix {}; yabar = handleTest ./yabar.nix {}; yggdrasil = handleTest ./yggdrasil.nix {}; + zammad = handleTest ./zammad.nix {}; zfs = handleTest ./zfs.nix {}; zigbee2mqtt = handleTest ./zigbee2mqtt.nix {}; zoneminder = handleTest ./zoneminder.nix {}; diff --git a/nixos/tests/apfs.nix b/nixos/tests/apfs.nix new file mode 100644 index 000000000000..a82886cbe731 --- /dev/null +++ b/nixos/tests/apfs.nix @@ -0,0 +1,54 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "apfs"; + meta.maintainers = with pkgs.lib.maintainers; [ Luflosi ]; + + machine = { pkgs, ... }: { + virtualisation.emptyDiskImages = [ 1024 ]; + + boot.supportedFilesystems = [ "apfs" ]; + }; + + testScript = '' + machine.wait_for_unit("basic.target") + machine.succeed("mkdir /tmp/mnt") + + with subtest("mkapfs refuses to work with a label that is too long"): + machine.fail( "mkapfs -L '000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F' /dev/vdb") + + with subtest("mkapfs works with the maximum label length"): + machine.succeed("mkapfs -L '000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7' /dev/vdb") + + with subtest("Enable case sensitivity and normalization sensitivity"): + machine.succeed( + "mkapfs -s -z /dev/vdb", + # Triggers a bug, see https://github.com/linux-apfs/linux-apfs-rw/issues/15 + # "mount -o cknodes,readwrite /dev/vdb /tmp/mnt", + "mount -o readwrite /dev/vdb /tmp/mnt", + "echo 'Hello World 1' > /tmp/mnt/test.txt", + "[ ! -f /tmp/mnt/TeSt.TxT ] || false", # Test case sensitivity + "echo 'Hello World 1' | diff - /tmp/mnt/test.txt", + "echo 'Hello World 2' > /tmp/mnt/\u0061\u0301.txt", + "echo 'Hello World 2' | diff - /tmp/mnt/\u0061\u0301.txt", + "[ ! -f /tmp/mnt/\u00e1.txt ] || false", # Test Unicode normalization sensitivity + "umount /tmp/mnt", + "apfsck /dev/vdb", + ) + with subtest("Disable case sensitivity and normalization sensitivity"): + machine.succeed( + "mkapfs /dev/vdb", + "mount -o readwrite /dev/vdb /tmp/mnt", + "echo 'bla bla bla' > /tmp/mnt/Test.txt", + "echo -n 'Hello World' > /tmp/mnt/test.txt", + "echo ' 1' >> /tmp/mnt/TEST.TXT", + "umount /tmp/mnt", + "apfsck /dev/vdb", + "mount -o readwrite /dev/vdb /tmp/mnt", + "echo 'Hello World 1' | diff - /tmp/mnt/TeSt.TxT", # Test case insensitivity + "echo 'Hello World 2' > /tmp/mnt/\u0061\u0301.txt", + "echo 'Hello World 2' | diff - /tmp/mnt/\u0061\u0301.txt", + "echo 'Hello World 2' | diff - /tmp/mnt/\u00e1.txt", # Test Unicode normalization + "umount /tmp/mnt", + "apfsck /dev/vdb", + ) + ''; +}) diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index ebb46838325f..c53a95903291 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -59,7 +59,7 @@ import ./make-test-python.nix { two.succeed("test `wc -l < out` -gt 0") # More DNS-SD. - one.execute('avahi-publish -s "This is a test" _test._tcp 123 one=1 &') + one.execute('avahi-publish -s "This is a test" _test._tcp 123 one=1 >&2 &') one.sleep(5) two.succeed("avahi-browse -r -t _test._tcp | tee out >&2") two.succeed("test `wc -l < out` -gt 0") diff --git a/nixos/tests/bcachefs.nix b/nixos/tests/bcachefs.nix index 211195586ed9..44997a746879 100644 --- a/nixos/tests/bcachefs.nix +++ b/nixos/tests/bcachefs.nix @@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { virtualisation.emptyDiskImages = [ 4096 ]; networking.hostId = "deadbeef"; boot.supportedFilesystems = [ "bcachefs" ]; - environment.systemPackages = with pkgs; [ parted ]; + environment.systemPackages = with pkgs; [ parted keyutils ]; }; testScript = '' @@ -20,10 +20,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { "parted --script /dev/vdb mklabel msdos", "parted --script /dev/vdb -- mkpart primary 1024M 50% mkpart primary 50% -1s", "udevadm settle", - # Due to #32279, we cannot use encryption for this test yet - # "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", - # "echo password | bcachefs unlock /dev/vdb1", - "bcachefs format --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", + "keyctl link @u @s", + "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", + "echo password | bcachefs unlock /dev/vdb1", "mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt", "udevadm settle", "bcachefs fs usage /tmp/mnt", diff --git a/nixos/tests/bird.nix b/nixos/tests/bird.nix index 50d397be14ee..822a7caea9ba 100644 --- a/nixos/tests/bird.nix +++ b/nixos/tests/bird.nix @@ -9,7 +9,7 @@ let inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; inherit (pkgs.lib) optionalString; - hostShared = hostId: { pkgs, ... }: { + makeBird2Host = hostId: { pkgs, ... }: { virtualisation.vlans = [ 1 ]; environment.systemPackages = with pkgs; [ jq ]; @@ -24,105 +24,6 @@ let name = "eth1"; networkConfig.Address = "10.0.0.${hostId}/24"; }; - }; - - birdTest = v4: - let variant = "bird${optionalString (!v4) "6"}"; in - makeTest { - name = variant; - - nodes.host1 = makeBirdHost variant "1"; - nodes.host2 = makeBirdHost variant "2"; - - testScript = makeTestScript variant v4 (!v4); - }; - - bird2Test = makeTest { - name = "bird2"; - - nodes.host1 = makeBird2Host "1"; - nodes.host2 = makeBird2Host "2"; - - testScript = makeTestScript "bird2" true true; - }; - - makeTestScript = variant: v4: v6: '' - start_all() - - host1.wait_for_unit("${variant}.service") - host2.wait_for_unit("${variant}.service") - - ${optionalString v4 '' - with subtest("Waiting for advertised IPv4 routes"): - host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'") - host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'") - ''} - ${optionalString v6 '' - with subtest("Waiting for advertised IPv6 routes"): - host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'") - host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'") - ''} - - with subtest("Check fake routes in preCheckConfig do not exists"): - ${optionalString v4 ''host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")''} - ${optionalString v4 ''host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")''} - - ${optionalString v6 ''host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")''} - ${optionalString v6 ''host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")''} - ''; - - makeBirdHost = variant: hostId: { pkgs, ... }: { - imports = [ (hostShared hostId) ]; - - services.${variant} = { - enable = true; - - config = '' - log syslog all; - - debug protocols all; - - router id 10.0.0.${hostId}; - - protocol device { - } - - protocol kernel { - import none; - export all; - } - - protocol static { - include "static.conf"; - } - - protocol ospf { - export all; - area 0 { - interface "eth1" { - hello 5; - wait 5; - }; - }; - } - ''; - - preCheckConfig = - let - route = { bird = "1.2.3.4/32"; bird6 = "fd00::/128"; }.${variant}; - in - ''echo "route ${route} blackhole;" > static.conf''; - }; - - systemd.tmpfiles.rules = - let - route = { bird = "10.10.0.${hostId}/32"; bird6 = "fdff::${hostId}/128"; }.${variant}; - in - [ "f /etc/bird/static.conf - - - - route ${route} blackhole;" ]; - }; - - makeBird2Host = hostId: { pkgs, ... }: { - imports = [ (hostShared hostId) ]; services.bird2 = { enable = true; @@ -198,8 +99,31 @@ let ]; }; in -{ - bird = birdTest true; - bird6 = birdTest false; - bird2 = bird2Test; +makeTest { + name = "bird2"; + + nodes.host1 = makeBird2Host "1"; + nodes.host2 = makeBird2Host "2"; + + testScript = '' + start_all() + + host1.wait_for_unit("bird2.service") + host2.wait_for_unit("bird2.service") + host1.succeed("systemctl reload bird2.service") + + with subtest("Waiting for advertised IPv4 routes"): + host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'") + host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'") + with subtest("Waiting for advertised IPv6 routes"): + host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'") + host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'") + + with subtest("Check fake routes in preCheckConfig do not exists"): + host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'") + host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'") + + host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'") + host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'") + ''; } diff --git a/nixos/tests/blocky.nix b/nixos/tests/blocky.nix new file mode 100644 index 000000000000..18e7f45e1c73 --- /dev/null +++ b/nixos/tests/blocky.nix @@ -0,0 +1,34 @@ +import ./make-test-python.nix { + name = "blocky"; + + nodes = { + server = { pkgs, ... }: { + environment.systemPackages = [ pkgs.dnsutils ]; + services.blocky = { + enable = true; + + settings = { + customDNS = { + mapping = { + "printer.lan" = "192.168.178.3,2001:0db8:85a3:08d3:1319:8a2e:0370:7344"; + }; + }; + upstream = { + default = [ "8.8.8.8" "1.1.1.1" ]; + }; + port = 53; + httpPort = 5000; + logLevel = "info"; + }; + }; + }; + }; + + testScript = '' + with subtest("Service test"): + server.wait_for_unit("blocky.service") + server.wait_for_open_port(53) + server.wait_for_open_port(5000) + server.succeed("dig @127.0.0.1 +short -x 192.168.178.3 | grep -qF printer.lan") + ''; +} diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index cf5565667131..ec2a9f6527c9 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -38,7 +38,6 @@ let } // extraConfig); in makeTest { - inherit iso; name = "boot-" + name; nodes = { }; testScript = diff --git a/nixos/tests/bpf.nix b/nixos/tests/bpf.nix index 233c7dab1ee2..e479cd057921 100644 --- a/nixos/tests/bpf.nix +++ b/nixos/tests/bpf.nix @@ -18,8 +18,12 @@ import ./make-test-python.nix ({ pkgs, ... }: { # simple BEGIN probe (user probe on bpftrace itself) print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\"); exit(); }'")) # tracepoint - print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit(); }'")) + print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit() }'")) # kprobe print(machine.succeed("bpftrace -e 'kprobe:schedule { print(probe); exit() }'")) + # BTF + print(machine.succeed("bpftrace -e 'kprobe:schedule { " + " printf(\"tgid: %d\", ((struct task_struct*) curtask)->tgid); exit() " + "}'")) ''; }) diff --git a/nixos/tests/breitbandmessung.nix b/nixos/tests/breitbandmessung.nix new file mode 100644 index 000000000000..12b1a094839b --- /dev/null +++ b/nixos/tests/breitbandmessung.nix @@ -0,0 +1,33 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "breitbandmessung"; + meta.maintainers = with lib.maintainers; [ b4dm4n ]; + + machine = { pkgs, ... }: { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + # increase screen size to make the whole program visible + virtualisation.resolution = { x = 1280; y = 1024; }; + + test-support.displayManager.auto.user = "alice"; + + environment.systemPackages = with pkgs; [ breitbandmessung ]; + environment.variables.XAUTHORITY = "/home/alice/.Xauthority"; + + # breitbandmessung is unfree + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "breitbandmessung" ]; + }; + + enableOCR = true; + + testScript = '' + machine.wait_for_x() + machine.execute("su - alice -c breitbandmessung >&2 &") + machine.wait_for_window("Breitbandmessung") + machine.wait_for_text("Breitbandmessung") + machine.wait_for_text("Datenschutz") + machine.screenshot("breitbandmessung") + ''; +}) diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index 0902904b2086..16436ab52800 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { nodes = { webserver = { pkgs, lib, ... }: { services.caddy.enable = true; - services.caddy.config = '' + services.caddy.extraConfig = '' http://localhost { encode gzip @@ -22,7 +22,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { ''; specialisation.etag.configuration = { - services.caddy.config = lib.mkForce '' + services.caddy.extraConfig = lib.mkForce '' http://localhost { encode gzip @@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; specialisation.config-reload.configuration = { - services.caddy.config = '' + services.caddy.extraConfig = '' http://localhost:8080 { } ''; diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node.nix index 29e7c279d69a..556546beee76 100644 --- a/nixos/tests/ceph-multi-node.nix +++ b/nixos/tests/ceph-multi-node.nix @@ -48,7 +48,7 @@ let sudo ceph xfsprogs - netcat-openbsd + libressl.nc ]; boot.kernelModules = [ "xfs" ]; diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 8965646bc5dc..3815dca76220 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -15,26 +15,9 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; -mapAttrs (channel: chromiumPkg: makeTest rec { - name = "chromium-${channel}"; - meta = { - maintainers = with maintainers; [ aszlig primeos ]; - # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621 - inherit (chromiumPkg.meta) timeout; - }; - - enableOCR = true; - +let user = "alice"; - machine.imports = [ ./common/user-account.nix ./common/x11.nix ]; - machine.virtualisation.memorySize = 2047; - machine.test-support.displayManager.auto.user = user; - machine.environment = { - systemPackages = [ chromiumPkg ]; - variables."XAUTHORITY" = "/home/alice/.Xauthority"; - }; - startupHTML = pkgs.writeText "chromium-startup.html" '' @@ -50,6 +33,25 @@ mapAttrs (channel: chromiumPkg: makeTest rec { ''; +in + +mapAttrs (channel: chromiumPkg: makeTest { + name = "chromium-${channel}"; + meta = { + maintainers = with maintainers; [ aszlig primeos ]; + # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621 + inherit (chromiumPkg.meta) timeout; + }; + + enableOCR = true; + + machine.imports = [ ./common/user-account.nix ./common/x11.nix ]; + machine.virtualisation.memorySize = 2047; + machine.test-support.displayManager.auto.user = user; + machine.environment = { + systemPackages = [ chromiumPkg ]; + variables."XAUTHORITY" = "/home/alice/.Xauthority"; + }; testScript = let xdo = name: text: let diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index e06cbd056a32..3f191ff5616e 100644 --- a/nixos/tests/cloud-init.nix +++ b/nixos/tests/cloud-init.nix @@ -35,6 +35,24 @@ let public-keys: - "${snakeOilPublicKey}" EOF + + cat << EOF > $out/iso/network-config + version: 1 + config: + - type: physical + name: eth0 + mac_address: '52:54:00:12:34:56' + subnets: + - type: static + address: '12.34.56.78' + netmask: '255.255.255.0' + gateway: '12.34.56.9' + - type: nameserver + address: + - '8.8.8.8' + search: + - 'example.com' + EOF ${pkgs.cdrkit}/bin/genisoimage -volid cidata -joliet -rock -o $out/metadata.iso $out/iso ''; }; @@ -46,9 +64,13 @@ in makeTest { machine = { ... }: { virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ]; - services.cloud-init.enable = true; + services.cloud-init = { + enable = true; + network.enable = true; + }; services.openssh.enable = true; networking.hostName = ""; + networking.useDHCP = false; }; testScript = '' # To wait until cloud-init terminates its run @@ -80,5 +102,8 @@ in makeTest { ).strip() == "test" ) + + assert "default via 12.34.56.9 dev eth0 proto static" in unnamed.succeed("ip route") + assert "12.34.56.0/24 dev eth0 proto kernel scope link src 12.34.56.78" in unnamed.succeed("ip route") ''; } diff --git a/nixos/tests/cntr.nix b/nixos/tests/cntr.nix index 668470756209..e4e13545b876 100644 --- a/nixos/tests/cntr.nix +++ b/nixos/tests/cntr.nix @@ -28,10 +28,16 @@ let testScript = '' start_all() ${backend}.wait_for_unit("${backend}-nginx.service") - result = ${backend}.wait_until_succeeds( - "cntr attach -t ${backend} nginx sh -- -c 'curl localhost | grep Hello'" + ${backend}.wait_for_open_port(8181) + # For some reason, the cntr command hangs when run without the &. + # As such, we have to do some messy things to ensure we check the exitcode and output in a race-condition-safe manner + ${backend}.execute( + "(cntr attach -t ${backend} nginx sh -- -c 'curl localhost | grep Hello' > /tmp/result; echo $? > /tmp/exitcode; touch /tmp/done) &" ) - assert "Hello" in result + + ${backend}.wait_for_file("/tmp/done") + assert "0" == ${backend}.succeed("cat /tmp/exitcode").strip(), "non-zero exit code" + assert "Hello" in ${backend}.succeed("cat /tmp/result"), "no greeting in output" ''; }; @@ -54,7 +60,13 @@ let testScript = '' machine.start() machine.wait_for_unit("container@test.service") - machine.succeed("cntr attach test sh -- -c 'ping -c5 172.16.0.1'") + # I haven't observed the same hanging behaviour in this version as in the OCI version which necessetates this messy invocation, but it's probably better to be safe than sorry and use it here as well + machine.execute( + "(cntr attach test sh -- -c 'ping -c5 172.16.0.1'; echo $? > /tmp/exitcode; touch /tmp/done) &" + ) + + machine.wait_for_file("/tmp/done") + assert "0" == machine.succeed("cat /tmp/exitcode").strip(), "non-zero exit code" ''; }; in { diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index a126a5480c03..14001657bee0 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -10,8 +10,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { # XXX: Sandbox setup fails while trying to hardlink files from the host's # store file system into the prepared chroot directory. - nix.useSandbox = false; - nix.binaryCaches = []; # don't try to access cache.nixos.org + nix.settings.sandbox = false; + nix.settings.substituters = []; # don't try to access cache.nixos.org virtualisation.writableStore = true; # Make sure we always have all the required dependencies for creating a diff --git a/nixos/tests/cri-o.nix b/nixos/tests/cri-o.nix index 91d46657f241..d3a8713d6a9b 100644 --- a/nixos/tests/cri-o.nix +++ b/nixos/tests/cri-o.nix @@ -1,7 +1,7 @@ # This test runs CRI-O and verifies via critest import ./make-test-python.nix ({ pkgs, ... }: { name = "cri-o"; - maintainers = with pkgs.lib.maintainers; teams.podman.members; + meta.maintainers = with pkgs.lib.maintainers; teams.podman.members; nodes = { crio = { diff --git a/nixos/tests/doh-proxy-rust.nix b/nixos/tests/doh-proxy-rust.nix index 23f8616849c3..11ed87d23bbe 100644 --- a/nixos/tests/doh-proxy-rust.nix +++ b/nixos/tests/doh-proxy-rust.nix @@ -38,6 +38,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { machine.wait_for_unit("doh-proxy-rust.service") machine.wait_for_open_port(53) machine.wait_for_open_port(3000) - machine.succeed(f"curl --fail '{url}?dns={query}' | grep -F {bin_ip}") + machine.succeed(f"curl --fail -H 'Accept: application/dns-message' '{url}?dns={query}' | grep -F {bin_ip}") ''; }) diff --git a/nixos/tests/earlyoom.nix b/nixos/tests/earlyoom.nix new file mode 100644 index 000000000000..75bdf56899b3 --- /dev/null +++ b/nixos/tests/earlyoom.nix @@ -0,0 +1,16 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "earlyoom"; + meta = { + maintainers = with lib.maintainers; [ ncfavier ]; + }; + + machine = { + services.earlyoom = { + enable = true; + }; + }; + + testScript = '' + machine.wait_for_unit("earlyoom.service") + ''; +}) diff --git a/nixos/tests/empty-file b/nixos/tests/empty-file new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/nixos/tests/geth.nix b/nixos/tests/geth.nix index 10cbd6d9038c..af8230553bbb 100644 --- a/nixos/tests/geth.nix +++ b/nixos/tests/geth.nix @@ -31,7 +31,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_for_open_port(18545) machine.succeed( - 'geth attach --exec "eth.chainId()" http://localhost:8545 | grep \'"0x0"\' ' + 'geth attach --exec eth.blockNumber http://localhost:8545 | grep \'^0$\' ' ) machine.succeed( diff --git a/nixos/tests/gitolite-fcgiwrap.nix b/nixos/tests/gitolite-fcgiwrap.nix index fc9b214b762e..abf1db37003a 100644 --- a/nixos/tests/gitolite-fcgiwrap.nix +++ b/nixos/tests/gitolite-fcgiwrap.nix @@ -20,7 +20,7 @@ import ./make-test-python.nix ( nodes = { server = - { ... }: + { config, ... }: { networking.firewall.allowedTCPPorts = [ 80 ]; @@ -42,7 +42,7 @@ import ./make-test-python.nix ( auth_basic_user_file /etc/gitolite/htpasswd; # common FastCGI parameters are required - include ${pkgs.nginx}/conf/fastcgi_params; + include ${config.services.nginx.package}/conf/fastcgi_params; # strip the CGI program prefix fastcgi_split_path_info ^(/git)(.*)$; diff --git a/nixos/tests/gnome-xorg.nix b/nixos/tests/gnome-xorg.nix index 6264b87af4ec..d7be531e364e 100644 --- a/nixos/tests/gnome-xorg.nix +++ b/nixos/tests/gnome-xorg.nix @@ -24,6 +24,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.xserver.desktopManager.gnome.enable = true; services.xserver.desktopManager.gnome.debug = true; services.xserver.displayManager.defaultSession = "gnome-xorg"; + programs.gnome-terminal.enable = true; systemd.user.services = { "org.gnome.Shell@x11" = { diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix index 06f387ecad67..ca49183fe442 100644 --- a/nixos/tests/gnome.nix +++ b/nixos/tests/gnome.nix @@ -22,6 +22,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.xserver.desktopManager.gnome.enable = true; services.xserver.desktopManager.gnome.debug = true; + programs.gnome-terminal.enable = true; environment.systemPackages = [ (pkgs.makeAutostartItem { diff --git a/nixos/tests/google-oslogin/default.nix b/nixos/tests/google-oslogin/default.nix index dea660ed05a4..72c87d7153bd 100644 --- a/nixos/tests/google-oslogin/default.nix +++ b/nixos/tests/google-oslogin/default.nix @@ -31,10 +31,10 @@ in { # mockserver should return a non-expired ssh key for both mockuser and mockadmin server.succeed( - f'${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys {MOCKUSER} | grep -q "${snakeOilPublicKey}"' + f'${pkgs.google-guest-oslogin}/bin/google_authorized_keys {MOCKUSER} | grep -q "${snakeOilPublicKey}"' ) server.succeed( - f'${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys {MOCKADMIN} | grep -q "${snakeOilPublicKey}"' + f'${pkgs.google-guest-oslogin}/bin/google_authorized_keys {MOCKADMIN} | grep -q "${snakeOilPublicKey}"' ) # install snakeoil ssh key on the client, and provision .ssh/config file diff --git a/nixos/tests/google-oslogin/server.nix b/nixos/tests/google-oslogin/server.nix index a0a3144ae69f..faf5e847d7e9 100644 --- a/nixos/tests/google-oslogin/server.nix +++ b/nixos/tests/google-oslogin/server.nix @@ -23,7 +23,5 @@ in { security.googleOsLogin.enable = true; # Mock google service - networking.extraHosts = '' - 127.0.0.1 metadata.google.internal - ''; + networking.interfaces.lo.ipv4.addresses = [ { address = "169.254.169.254"; prefixLength = 32; } ]; } diff --git a/nixos/tests/google-oslogin/server.py b/nixos/tests/google-oslogin/server.py old mode 100644 new mode 100755 diff --git a/nixos/tests/hadoop/default.nix b/nixos/tests/hadoop/default.nix new file mode 100644 index 000000000000..d2a97cbeffb8 --- /dev/null +++ b/nixos/tests/hadoop/default.nix @@ -0,0 +1,7 @@ +{ handleTestOn, package, ... }: + +{ + all = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop.nix { inherit package; }; + hdfs = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hdfs.nix { inherit package; }; + yarn = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./yarn.nix { inherit package; }; +} diff --git a/nixos/tests/hadoop/hadoop.nix b/nixos/tests/hadoop/hadoop.nix index 48737debab54..b132f4fa58b0 100644 --- a/nixos/tests/hadoop/hadoop.nix +++ b/nixos/tests/hadoop/hadoop.nix @@ -1,121 +1,148 @@ # This test is very comprehensive. It tests whether all hadoop services work well with each other. # Run this when updating the Hadoop package or making significant changes to the hadoop module. # For a more basic test, see hdfs.nix and yarn.nix -import ../make-test-python.nix ({pkgs, ...}: { +import ../make-test-python.nix ({ package, ... }: { + name = "hadoop-combined"; - nodes = let - package = pkgs.hadoop; - coreSite = { - "fs.defaultFS" = "hdfs://ns1"; - }; - hdfsSite = { - "dfs.namenode.rpc-bind-host" = "0.0.0.0"; - "dfs.namenode.http-bind-host" = "0.0.0.0"; - "dfs.namenode.servicerpc-bind-host" = "0.0.0.0"; + nodes = + let + coreSite = { + "fs.defaultFS" = "hdfs://ns1"; + }; + hdfsSite = { + # HA Quorum Journal Manager configuration + "dfs.nameservices" = "ns1"; + "dfs.ha.namenodes.ns1" = "nn1,nn2"; + "dfs.namenode.shared.edits.dir.ns1" = "qjournal://jn1:8485;jn2:8485;jn3:8485/ns1"; + "dfs.namenode.rpc-address.ns1.nn1" = "nn1:8020"; + "dfs.namenode.rpc-address.ns1.nn2" = "nn2:8020"; + "dfs.namenode.servicerpc-address.ns1.nn1" = "nn1:8022"; + "dfs.namenode.servicerpc-address.ns1.nn2" = "nn2:8022"; + "dfs.namenode.http-address.ns1.nn1" = "nn1:9870"; + "dfs.namenode.http-address.ns1.nn2" = "nn2:9870"; - # HA Quorum Journal Manager configuration - "dfs.nameservices" = "ns1"; - "dfs.ha.namenodes.ns1" = "nn1,nn2"; - "dfs.namenode.shared.edits.dir.ns1.nn1" = "qjournal://jn1:8485;jn2:8485;jn3:8485/ns1"; - "dfs.namenode.shared.edits.dir.ns1.nn2" = "qjournal://jn1:8485;jn2:8485;jn3:8485/ns1"; - "dfs.namenode.rpc-address.ns1.nn1" = "nn1:8020"; - "dfs.namenode.rpc-address.ns1.nn2" = "nn2:8020"; - "dfs.namenode.servicerpc-address.ns1.nn1" = "nn1:8022"; - "dfs.namenode.servicerpc-address.ns1.nn2" = "nn2:8022"; - "dfs.namenode.http-address.ns1.nn1" = "nn1:9870"; - "dfs.namenode.http-address.ns1.nn2" = "nn2:9870"; + # Automatic failover configuration + "dfs.client.failover.proxy.provider.ns1" = "org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider"; + "dfs.ha.automatic-failover.enabled.ns1" = "true"; + "dfs.ha.fencing.methods" = "shell(true)"; + "ha.zookeeper.quorum" = "zk1:2181"; + }; + yarnSite = { + "yarn.resourcemanager.zk-address" = "zk1:2181"; + "yarn.resourcemanager.ha.enabled" = "true"; + "yarn.resourcemanager.ha.rm-ids" = "rm1,rm2"; + "yarn.resourcemanager.hostname.rm1" = "rm1"; + "yarn.resourcemanager.hostname.rm2" = "rm2"; + "yarn.resourcemanager.ha.automatic-failover.enabled" = "true"; + "yarn.resourcemanager.cluster-id" = "cluster1"; + # yarn.resourcemanager.webapp.address needs to be defined even though yarn.resourcemanager.hostname is set. This shouldn't be necessary, but there's a bug in + # hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java:70 + # that causes AM containers to fail otherwise. + "yarn.resourcemanager.webapp.address.rm1" = "rm1:8088"; + "yarn.resourcemanager.webapp.address.rm2" = "rm2:8088"; + }; + in + { + zk1 = { ... }: { + services.zookeeper.enable = true; + networking.firewall.allowedTCPPorts = [ 2181 ]; + }; - # Automatic failover configuration - "dfs.client.failover.proxy.provider.ns1" = "org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider"; - "dfs.ha.automatic-failover.enabled.ns1" = "true"; - "dfs.ha.fencing.methods" = "shell(true)"; - "ha.zookeeper.quorum" = "zk1:2181"; - }; - yarnSiteHA = { - "yarn.resourcemanager.zk-address" = "zk1:2181"; - "yarn.resourcemanager.ha.enabled" = "true"; - "yarn.resourcemanager.ha.rm-ids" = "rm1,rm2"; - "yarn.resourcemanager.hostname.rm1" = "rm1"; - "yarn.resourcemanager.hostname.rm2" = "rm2"; - "yarn.resourcemanager.ha.automatic-failover.enabled" = "true"; - "yarn.resourcemanager.cluster-id" = "cluster1"; - # yarn.resourcemanager.webapp.address needs to be defined even though yarn.resourcemanager.hostname is set. This shouldn't be necessary, but there's a bug in - # hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmFilterInitializer.java:70 - # that causes AM containers to fail otherwise. - "yarn.resourcemanager.webapp.address.rm1" = "rm1:8088"; - "yarn.resourcemanager.webapp.address.rm2" = "rm2:8088"; - }; - in { - zk1 = { ... }: { - services.zookeeper.enable = true; - networking.firewall.allowedTCPPorts = [ 2181 ]; - }; + # HDFS cluster + nn1 = { ... }: { + services.hadoop = { + inherit package coreSite hdfsSite; + hdfs.namenode = { + enable = true; + openFirewall = true; + }; + hdfs.zkfc.enable = true; + }; + }; + nn2 = { ... }: { + services.hadoop = { + inherit package coreSite hdfsSite; + hdfs.namenode = { + enable = true; + openFirewall = true; + }; + hdfs.zkfc.enable = true; + }; + }; - # HDFS cluster - nn1 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - hdfs.namenode.enable = true; - hdfs.zkfc.enable = true; + jn1 = { ... }: { + services.hadoop = { + inherit package coreSite hdfsSite; + hdfs.journalnode = { + enable = true; + openFirewall = true; + }; + }; }; - }; - nn2 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - hdfs.namenode.enable = true; - hdfs.zkfc.enable = true; + jn2 = { ... }: { + services.hadoop = { + inherit package coreSite hdfsSite; + hdfs.journalnode = { + enable = true; + openFirewall = true; + }; + }; + }; + jn3 = { ... }: { + services.hadoop = { + inherit package coreSite hdfsSite; + hdfs.journalnode = { + enable = true; + openFirewall = true; + }; + }; }; - }; - jn1 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - hdfs.journalnode.enable = true; + dn1 = { ... }: { + services.hadoop = { + inherit package coreSite hdfsSite; + hdfs.datanode = { + enable = true; + openFirewall = true; + }; + }; }; - }; - jn2 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - hdfs.journalnode.enable = true; - }; - }; - jn3 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - hdfs.journalnode.enable = true; - }; - }; - dn1 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - hdfs.datanode.enable = true; + # YARN cluster + rm1 = { options, ... }: { + services.hadoop = { + inherit package coreSite hdfsSite yarnSite; + yarn.resourcemanager = { + enable = true; + openFirewall = true; + }; + }; }; - }; - - # YARN cluster - rm1 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA; - yarn.resourcemanager.enable = true; + rm2 = { options, ... }: { + services.hadoop = { + inherit package coreSite hdfsSite yarnSite; + yarn.resourcemanager = { + enable = true; + openFirewall = true; + }; + }; }; - }; - rm2 = {pkgs, options, ...}: { - services.hadoop = { - inherit package coreSite hdfsSite; - yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA; - yarn.resourcemanager.enable = true; + nm1 = { options, ... }: { + virtualisation.memorySize = 2048; + services.hadoop = { + inherit package coreSite hdfsSite yarnSite; + yarn.nodemanager = { + enable = true; + openFirewall = true; + }; + }; }; - }; - nm1 = {pkgs, options, ...}: { - virtualisation.memorySize = 2048; - services.hadoop = { - inherit package coreSite hdfsSite; - yarnSite = options.services.hadoop.yarnSite.default // yarnSiteHA; - yarn.nodemanager.enable = true; + client = { options, ... }: { + services.hadoop = { + gatewayRole.enable = true; + inherit package coreSite hdfsSite yarnSite; + }; }; - }; }; testScript = '' @@ -173,26 +200,26 @@ import ../make-test-python.nix ({pkgs, ...}: { # DN should have started by now, but confirm anyway dn1.wait_for_unit("hdfs-datanode") # Print states of namenodes - dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") # Wait for cluster to exit safemode - dn1.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait") - dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + client.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait") + client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") # test R/W - dn1.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile") - assert "testfilecontents" in dn1.succeed("sudo -u hdfs hdfs dfs -cat /testfile") + client.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile") + assert "testfilecontents" in client.succeed("sudo -u hdfs hdfs dfs -cat /testfile") # Test NN failover nn1.succeed("systemctl stop hdfs-namenode") - assert "active" in dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState") - dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") - assert "testfilecontents" in dn1.succeed("sudo -u hdfs hdfs dfs -cat /testfile") + assert "active" in client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState") + client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + assert "testfilecontents" in client.succeed("sudo -u hdfs hdfs dfs -cat /testfile") nn1.succeed("systemctl start hdfs-namenode") nn1.wait_for_open_port(9870) nn1.wait_for_open_port(8022) nn1.wait_for_open_port(8020) - assert "standby" in dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState") - dn1.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") + assert "standby" in client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState") + client.succeed("sudo -u hdfs hdfs haadmin -getAllServiceState | systemd-cat") #### YARN tests #### @@ -208,21 +235,21 @@ import ../make-test-python.nix ({pkgs, ...}: { nm1.wait_for_unit("yarn-nodemanager") nm1.wait_for_open_port(8042) nm1.wait_for_open_port(8040) - nm1.wait_until_succeeds("yarn node -list | grep Nodes:1") - nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") - nm1.succeed("sudo -u yarn yarn node -list | systemd-cat") + 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") # Test RM failover rm1.succeed("systemctl stop yarn-resourcemanager") - assert "standby" not in nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") - nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") + assert "standby" not in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") + client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") rm1.succeed("systemctl start yarn-resourcemanager") rm1.wait_for_unit("yarn-resourcemanager") rm1.wait_for_open_port(8088) - assert "standby" in nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") - nm1.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") + assert "standby" in client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState") + client.succeed("sudo -u yarn yarn rmadmin -getAllServiceState | systemd-cat") - assert "Estimated value of Pi is" in nm1.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 "SUCCEEDED" in nm1.succeed("yarn application -list -appStates FINISHED") + 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 "SUCCEEDED" in client.succeed("yarn application -list -appStates FINISHED") ''; }) diff --git a/nixos/tests/hadoop/hdfs.nix b/nixos/tests/hadoop/hdfs.nix index b63cbf480327..9415500463de 100644 --- a/nixos/tests/hadoop/hdfs.nix +++ b/nixos/tests/hadoop/hdfs.nix @@ -1,32 +1,46 @@ # Test a minimal HDFS cluster with no HA -import ../make-test-python.nix ({...}: { - nodes = { - namenode = {pkgs, ...}: { +import ../make-test-python.nix ({ package, lib, ... }: +with lib; +{ + name = "hadoop-hdfs"; + + nodes = let + coreSite = { + "fs.defaultFS" = "hdfs://namenode:8020"; + "hadoop.proxyuser.httpfs.groups" = "*"; + "hadoop.proxyuser.httpfs.hosts" = "*"; + }; + in { + namenode = { pkgs, ... }: { services.hadoop = { - package = pkgs.hadoop; + inherit package; hdfs = { namenode = { enable = true; + openFirewall = true; formatOnInit = true; }; - httpfs.enable = true; - }; - coreSite = { - "fs.defaultFS" = "hdfs://namenode:8020"; - "hadoop.proxyuser.httpfs.groups" = "*"; - "hadoop.proxyuser.httpfs.hosts" = "*"; + httpfs = { + # The NixOS hadoop module only support webHDFS on 3.3 and newer + enable = mkIf (versionAtLeast package.version "3.3") true; + openFirewall = true; + }; }; + inherit coreSite; }; }; - datanode = {pkgs, ...}: { + datanode = { pkgs, ... }: { services.hadoop = { - package = pkgs.hadoop; - hdfs.datanode.enable = true; - coreSite = { - "fs.defaultFS" = "hdfs://namenode:8020"; - "hadoop.proxyuser.httpfs.groups" = "*"; - "hadoop.proxyuser.httpfs.hosts" = "*"; + inherit package; + hdfs.datanode = { + enable = true; + openFirewall = true; + dataDirs = [{ + type = "DISK"; + path = "/tmp/dn1"; + }]; }; + inherit coreSite; }; }; }; @@ -37,21 +51,32 @@ import ../make-test-python.nix ({...}: { 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.wait_for_open_port(9870) datanode.wait_for_unit("hdfs-datanode") datanode.wait_for_unit("network.target") + '' + ( if versionAtLeast package.version "3" then '' datanode.wait_for_open_port(9864) datanode.wait_for_open_port(9866) datanode.wait_for_open_port(9867) - namenode.succeed("curl -f http://namenode:9870") datanode.succeed("curl -f http://datanode:9864") + '' else '' + datanode.wait_for_open_port(50075) + datanode.wait_for_open_port(50010) + datanode.wait_for_open_port(50020) + + datanode.succeed("curl -f http://datanode:50075") + '' ) + '' + namenode.succeed("curl -f http://namenode:9870") datanode.succeed("sudo -u hdfs hdfs dfsadmin -safemode wait") datanode.succeed("echo testfilecontents | sudo -u hdfs hdfs dfs -put - /testfile") assert "testfilecontents" in datanode.succeed("sudo -u hdfs hdfs dfs -cat /testfile") + '' + optionalString ( versionAtLeast package.version "3.3" ) '' namenode.wait_for_unit("hdfs-httpfs") namenode.wait_for_open_port(14000) assert "testfilecontents" in datanode.succeed("curl -f \"http://namenode:14000/webhdfs/v1/testfile?user.name=hdfs&op=OPEN\" 2>&1") diff --git a/nixos/tests/hadoop/yarn.nix b/nixos/tests/hadoop/yarn.nix index 09bdb35791c7..1bf8e3831f67 100644 --- a/nixos/tests/hadoop/yarn.nix +++ b/nixos/tests/hadoop/yarn.nix @@ -1,22 +1,30 @@ # This only tests if YARN is able to start its services -import ../make-test-python.nix ({...}: { - nodes = { - resourcemanager = {pkgs, ...}: { - services.hadoop.package = pkgs.hadoop; - services.hadoop.yarn.resourcemanager.enable = true; - services.hadoop.yarnSite = { - "yarn.resourcemanager.scheduler.class" = "org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler"; - }; - }; - nodemanager = {pkgs, ...}: { - services.hadoop.package = pkgs.hadoop; - services.hadoop.yarn.nodemanager.enable = true; - services.hadoop.yarnSite = { - "yarn.resourcemanager.hostname" = "resourcemanager"; - "yarn.nodemanager.log-dirs" = "/tmp/userlogs"; - }; - }; +import ../make-test-python.nix ({ package, ... }: { + name = "hadoop-yarn"; + nodes = { + resourcemanager = { ... }: { + services.hadoop = { + inherit package; + yarn.resourcemanager = { + enable = true; + openFirewall = true; + }; + }; + }; + nodemanager = { options, lib, ... }: { + services.hadoop = { + inherit package; + yarn.nodemanager = { + enable = true; + openFirewall = true; + }; + yarnSite = options.services.hadoop.yarnSite.default // { + "yarn.resourcemanager.hostname" = "resourcemanager"; + "yarn.nodemanager.log-dirs" = "/tmp/userlogs"; + }; + }; + }; }; testScript = '' diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix index 2c3878131b68..b6ff4102fe68 100644 --- a/nixos/tests/haproxy.nix +++ b/nixos/tests/haproxy.nix @@ -16,7 +16,6 @@ import ./make-test-python.nix ({ pkgs, ...}: { frontend http bind *:80 mode http - option http-use-htx http-request use-service prometheus-exporter if { path /metrics } use_backend http_server ''; diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index da7e0972e131..dc455f971f5c 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, ... } : { users.users.sybil = { isNormalUser = true; group = "wheel"; }; imports = [ ../modules/profiles/hardened.nix ]; environment.memoryAllocator.provider = "graphene-hardened"; - nix.useSandbox = false; + nix.settings.sandbox = false; virtualisation.emptyDiskImages = [ 4096 ]; boot.initrd.postDeviceCommands = '' ${pkgs.dosfstools}/bin/mkfs.vfat -n EFISYS /dev/vdb diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 4f05b99a5a11..3880f1649bd3 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -45,11 +45,11 @@ in makeTest { ../modules/profiles/base.nix ]; - nix.binaryCaches = mkForce [ ]; - nix.extraOptions = '' - hashed-mirrors = - connect-timeout = 1 - ''; + nix.settings = { + substituters = mkForce []; + hashed-mirrors = null; + connect-timeout = 1; + }; virtualisation.diskSize = 8 * 1024; virtualisation.emptyDiskImages = [ diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 5b1c07c92da3..10f9cb05c9cb 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -2,33 +2,48 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: let configDir = "/var/lib/foobar"; - mqttUsername = "homeassistant"; - mqttPassword = "secret"; in { name = "home-assistant"; meta.maintainers = lib.teams.home-assistant.members; nodes.hass = { pkgs, ... }: { environment.systemPackages = with pkgs; [ mosquitto ]; - services.mosquitto = { + + services.postgresql = { enable = true; - listeners = [ { - users = { - "${mqttUsername}" = { - acl = [ "readwrite #" ]; - password = mqttPassword; - }; + ensureDatabases = [ "hass" ]; + ensureUsers = [{ + name = "hass"; + ensurePermissions = { + "DATABASE hass" = "ALL PRIVILEGES"; }; - } ]; + }]; }; + services.home-assistant = { - inherit configDir; enable = true; + inherit configDir; + + # tests loading components by overriding the package package = (pkgs.home-assistant.override { + extraPackages = ps: with ps; [ + colorama + ]; extraComponents = [ "zha" ]; }).overrideAttrs (oldAttrs: { doInstallCheck = false; }); + + # tests loading components from the module + extraComponents = [ + "wake_on_lan" + ]; + + # test extra package passing from the module + extraPackages = python3Packages: with python3Packages; [ + psycopg2 + ]; + config = { homeassistant = { name = "Home"; @@ -37,34 +52,39 @@ in { longitude = "0.0"; elevation = 0; }; + + # configure the recorder component to use the postgresql db + recorder.db_url = "postgresql://@/hass"; + + # we can't load default_config, because the updater requires + # network access and would cause an error, so load frontend + # here explicitly. + # https://www.home-assistant.io/integrations/frontend/ frontend = {}; - mqtt = { - broker = "127.0.0.1"; - username = mqttUsername; - password = mqttPassword; - }; - binary_sensor = [{ - platform = "mqtt"; - state_topic = "home-assistant/test"; - payload_on = "let_there_be_light"; - payload_off = "off"; - }]; - wake_on_lan = {}; - switch = [{ + + # set up a wake-on-lan switch to test capset capability required + # for the ping suid wrapper + # https://www.home-assistant.io/integrations/wake_on_lan/ + switch = [ { platform = "wake_on_lan"; mac = "00:11:22:33:44:55"; host = "127.0.0.1"; - }]; - # tests component-based capability assignment (CAP_NET_BIND_SERVICE) + } ]; + + # test component-based capability assignment (CAP_NET_BIND_SERVICE) + # https://www.home-assistant.io/integrations/emulated_hue/ emulated_hue = { host_ip = "127.0.0.1"; listen_port = 80; }; + + # https://www.home-assistant.io/integrations/logger/ logger = { default = "info"; - logs."homeassistant.components.mqtt" = "debug"; }; }; + + # configure the sample lovelace dashboard lovelaceConfig = { title = "My Awesome Home"; views = [{ @@ -81,43 +101,56 @@ in { }; testScript = '' + import re + start_all() + + # Parse the package path out of the systemd unit, as we cannot + # access the final package, that is overriden inside the module, + # by any other means. + pattern = re.compile(r"path=(?P[\/a-z0-9-.]+)\/bin\/hass") + response = hass.execute("systemctl show -p ExecStart home-assistant.service")[1] + match = pattern.search(response) + package = match.group('path') + hass.wait_for_unit("home-assistant.service") + with subtest("Check that YAML configuration file is in place"): hass.succeed("test -L ${configDir}/configuration.yaml") - with subtest("lovelace config is copied because lovelaceConfigWritable = true"): + + with subtest("Check the lovelace config is copied because lovelaceConfigWritable = true"): hass.succeed("test -f ${configDir}/ui-lovelace.yaml") + + with subtest("Check extraComponents and extraPackages are considered from the package"): + hass.succeed(f"grep -q 'colorama' {package}/extra_packages") + hass.succeed(f"grep -q 'zha' {package}/extra_components") + + with subtest("Check extraComponents and extraPackages are considered from the module"): + hass.succeed(f"grep -q 'psycopg2' {package}/extra_packages") + hass.succeed(f"grep -q 'wake_on_lan' {package}/extra_components") + with subtest("Check that Home Assistant's web interface and API can be reached"): + hass.wait_until_succeeds("journalctl -u home-assistant.service | grep -q 'Home Assistant initialized in'") hass.wait_for_open_port(8123) hass.succeed("curl --fail http://localhost:8123/lovelace") - with subtest("Toggle a binary sensor using MQTT"): - hass.wait_for_open_port(1883) - hass.succeed( - "mosquitto_pub -V mqttv5 -t home-assistant/test -u ${mqttUsername} -P '${mqttPassword}' -m let_there_be_light" - ) + with subtest("Check that capabilities are passed for emulated_hue to bind to port 80"): hass.wait_for_open_port(80) hass.succeed("curl --fail http://localhost:80/description.xml") + with subtest("Check extra components are considered in systemd unit hardening"): hass.succeed("systemctl show -p DeviceAllow home-assistant.service | grep -q char-ttyUSB") + with subtest("Print log to ease debugging"): output_log = hass.succeed("cat ${configDir}/home-assistant.log") print("\n### home-assistant.log ###\n") print(output_log + "\n") - # wait for home-assistant to fully boot - hass.sleep(30) - hass.wait_for_unit("home-assistant.service") - with subtest("Check that no errors were logged"): assert "ERROR" not in output_log - # example line: 2020-06-20 10:01:32 DEBUG (MainThread) [homeassistant.components.mqtt] Received message on home-assistant/test: b'let_there_be_light' - with subtest("Check we received the mosquitto message"): - assert "let_there_be_light" in output_log - with subtest("Check systemd unit hardening"): - hass.log(hass.succeed("systemctl show home-assistant.service")) + hass.log(hass.succeed("systemctl cat home-assistant.service")) hass.log(hass.succeed("systemd-analyze security home-assistant.service")) ''; }) diff --git a/nixos/tests/hydra/common.nix b/nixos/tests/hydra/common.nix index 1a3a4d8fb3d4..fdf2b2c6f6dc 100644 --- a/nixos/tests/hydra/common.nix +++ b/nixos/tests/hydra/common.nix @@ -42,7 +42,7 @@ hostName = "localhost"; systems = [ system ]; }]; - binaryCaches = []; + settings.substituters = []; }; }; } diff --git a/nixos/tests/input-remapper.nix b/nixos/tests/input-remapper.nix new file mode 100644 index 000000000000..f692564caa57 --- /dev/null +++ b/nixos/tests/input-remapper.nix @@ -0,0 +1,52 @@ +import ./make-test-python.nix ({ pkgs, ... }: + + { + name = "input-remapper"; + meta = { + maintainers = with pkgs.lib.maintainers; [ LunNova ]; + }; + + machine = { config, ... }: + let user = config.users.users.sybil; in + { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + services.xserver.enable = true; + services.input-remapper.enable = true; + users.users.sybil = { isNormalUser = true; group = "wheel"; }; + test-support.displayManager.auto.user = user.name; + # workaround for pkexec not working in the test environment + # Error creating textual authentication agent: + # Error opening current controlling terminal for the process (`/dev/tty'): + # No such device or address + # passwordless pkexec with polkit module also doesn't work + # to allow the program to run, we replace pkexec with sudo + # and turn on passwordless sudo + # this is not correct in general but good enough for this test + security.sudo = { enable = true; wheelNeedsPassword = false; }; + security.wrappers.pkexec = pkgs.lib.mkForce + { + setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.sudo}/bin/sudo"; + }; + }; + + enableOCR = true; + + testScript = { nodes, ... }: '' + start_all() + machine.wait_for_x() + + machine.succeed("systemctl status input-remapper.service") + machine.execute("su - sybil -c input-remapper-gtk >&2 &") + + machine.wait_for_text("Input Remapper") + machine.wait_for_text("Preset") + machine.wait_for_text("Change Key") + ''; + }) diff --git a/nixos/tests/installed-tests/appstream-qt.nix b/nixos/tests/installed-tests/appstream-qt.nix new file mode 100644 index 000000000000..d08187bfe466 --- /dev/null +++ b/nixos/tests/installed-tests/appstream-qt.nix @@ -0,0 +1,9 @@ +{ pkgs, makeInstalledTest, ... }: + +makeInstalledTest { + tested = pkgs.libsForQt5.appstream-qt; + + testConfig = { + appstream.enable = true; + }; +} diff --git a/nixos/tests/installed-tests/appstream.nix b/nixos/tests/installed-tests/appstream.nix new file mode 100644 index 000000000000..f71a095d4452 --- /dev/null +++ b/nixos/tests/installed-tests/appstream.nix @@ -0,0 +1,9 @@ +{ pkgs, makeInstalledTest, ... }: + +makeInstalledTest { + tested = pkgs.appstream; + + testConfig = { + appstream.enable = true; + }; +} diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index 08785e5e6669..079fd54e71e5 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -84,6 +84,8 @@ let in { + appstream = callInstalledTest ./appstream.nix {}; + appstream-qt = callInstalledTest ./appstream-qt.nix {}; colord = callInstalledTest ./colord.nix {}; flatpak = callInstalledTest ./flatpak.nix {}; flatpak-builder = callInstalledTest ./flatpak-builder.nix {}; diff --git a/nixos/tests/installed-tests/flatpak.nix b/nixos/tests/installed-tests/flatpak.nix index 8aeeaca90f61..c7fe9cf45882 100644 --- a/nixos/tests/installed-tests/flatpak.nix +++ b/nixos/tests/installed-tests/flatpak.nix @@ -6,6 +6,7 @@ makeInstalledTest { testConfig = { xdg.portal.enable = true; + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; services.flatpak.enable = true; environment.systemPackages = with pkgs; [ gnupg ostree python3 ]; virtualisation.memorySize = 2047; diff --git a/nixos/tests/installed-tests/gjs.nix b/nixos/tests/installed-tests/gjs.nix index 1656e9de171b..d12487cba249 100644 --- a/nixos/tests/installed-tests/gjs.nix +++ b/nixos/tests/installed-tests/gjs.nix @@ -3,4 +3,10 @@ makeInstalledTest { tested = pkgs.gjs; withX11 = true; + + testConfig = { + environment.systemPackages = [ + pkgs.gjs + ]; + }; } diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 7c7eb004e550..2cfadf85c935 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -306,6 +306,9 @@ let # The test cannot access the network, so any packages we # need must be included in the VM. system.extraDependencies = with pkgs; [ + brotli + brotli.dev + brotli.lib desktop-file-utils docbook5 docbook_xsl_ns @@ -315,6 +318,7 @@ let ntp perlPackages.ListCompare perlPackages.XMLLibXML + python3Minimal shared-mime-info sudo texinfo @@ -334,11 +338,11 @@ let (pkgs.grub2_efi.override { inherit zfsSupport; }) ]); - nix.binaryCaches = mkForce [ ]; - nix.extraOptions = '' - hashed-mirrors = - connect-timeout = 1 - ''; + nix.settings = { + substituters = mkForce []; + hashed-mirrors = null; + connect-timeout = 1; + }; }; }; @@ -564,7 +568,7 @@ in { "pvcreate /dev/vda1 /dev/vda2", "vgcreate MyVolGroup /dev/vda1 /dev/vda2", "lvcreate --size 1G --name swap MyVolGroup", - "lvcreate --size 3G --name nixos MyVolGroup", + "lvcreate --size 6G --name nixos MyVolGroup", "mkswap -f /dev/MyVolGroup/swap -L swap", "swapon -L swap", "mkfs.xfs -L nixos /dev/MyVolGroup/nixos", diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix index f8683b0a8580..5e7c967028e4 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/ipfs.nix @@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { # Also will add a unix domain socket socket API address, see module. startWhenNeeded = true; apiAddress = "/ip4/127.0.0.1/tcp/2324"; + dataDir = "/mnt/ipfs"; }; }; @@ -35,5 +36,9 @@ import ./make-test-python.nix ({ pkgs, ...} : { machine.succeed( f"ipfs --api /unix/run/ipfs.sock cat /ipfs/{ipfs_hash.strip()} | grep fnord2" ) + + # Test if setting dataDir works properly with the hardened systemd unit + machine.succeed("test -e /mnt/ipfs/config") + machine.succeed("test ! -e /var/lib/ipfs/") ''; }) diff --git a/nixos/tests/iscsi-multipath-root.nix b/nixos/tests/iscsi-multipath-root.nix index a26fea503b62..92ae9990c947 100644 --- a/nixos/tests/iscsi-multipath-root.nix +++ b/nixos/tests/iscsi-multipath-root.nix @@ -111,11 +111,11 @@ import ./make-test-python.nix ( environment.etc."initiator-root-disk-closure".source = nodes.initiatorRootDisk.config.system.build.toplevel; - nix.binaryCaches = lib.mkForce [ ]; - nix.extraOptions = '' - hashed-mirrors = - connect-timeout = 1 - ''; + nix.settings = { + substituters = lib.mkForce [ ]; + hashed-mirrors = null; + connect-timeout = 1; + }; }; initiatorRootDisk = { config, pkgs, modulesPath, lib, ... }: { diff --git a/nixos/tests/iscsi-root.nix b/nixos/tests/iscsi-root.nix index bda51d2c2e42..eb0719edc379 100644 --- a/nixos/tests/iscsi-root.nix +++ b/nixos/tests/iscsi-root.nix @@ -95,11 +95,11 @@ import ./make-test-python.nix ( system.extraDependencies = [ nodes.initiatorRootDisk.config.system.build.toplevel ]; - nix.binaryCaches = lib.mkForce []; - nix.extraOptions = '' - hashed-mirrors = - connect-timeout = 1 - ''; + nix.settings = { + substituters = lib.mkForce []; + hashed-mirrors = null; + connect-timeout = 1; + }; }; initiatorRootDisk = { config, pkgs, modulesPath, lib, ... }: { diff --git a/nixos/tests/jitsi-meet.nix b/nixos/tests/jitsi-meet.nix index d95f7c2ea9ea..41d53bc73800 100644 --- a/nixos/tests/jitsi-meet.nix +++ b/nixos/tests/jitsi-meet.nix @@ -21,9 +21,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { forceSSL = true; }; - security.acme.email = "me@example.org"; security.acme.acceptTerms = true; - security.acme.server = "https://example.com"; # self-signed only + security.acme.defaults.email = "me@example.org"; + security.acme.defaults.server = "https://example.com"; # self-signed only }; }; diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix index 685a200b3187..924c137a9032 100644 --- a/nixos/tests/keepassxc.nix +++ b/nixos/tests/keepassxc.nix @@ -15,20 +15,54 @@ import ./make-test-python.nix ({ pkgs, ...} : ]; services.xserver.enable = true; + + # Regression test for https://github.com/NixOS/nixpkgs/issues/163482 + qt5 = { + enable = true; + platformTheme = "gnome"; + style = "adwaita-dark"; + }; + test-support.displayManager.auto.user = "alice"; - environment.systemPackages = [ pkgs.keepassxc ]; + environment.systemPackages = with pkgs; [ + keepassxc + xdotool + ]; }; enableOCR = true; - testScript = { nodes, ... }: '' - start_all() - machine.wait_for_x() + testScript = { nodes, ... }: let + aliceDo = cmd: ''machine.succeed("su - alice -c '${cmd}' >&2 &");''; + in '' + with subtest("Ensure X starts"): + start_all() + machine.wait_for_x() - # start KeePassXC window - machine.execute("su - alice -c keepassxc >&2 &") + with subtest("Can create database and entry with CLI"): + ${aliceDo "keepassxc-cli db-create -k foo.keyfile foo.kdbx"} + ${aliceDo "keepassxc-cli add --no-password -k foo.keyfile foo.kdbx bar"} - machine.wait_for_text("KeePassXC ${pkgs.keepassxc.version}") - machine.screenshot("KeePassXC") + with subtest("Ensure KeePassXC starts"): + # start KeePassXC window + ${aliceDo "keepassxc >&2 &"} + + machine.wait_for_text("KeePassXC ${pkgs.keepassxc.version}") + machine.screenshot("KeePassXC") + + with subtest("Can open existing database"): + machine.send_key("ctrl-o") + machine.sleep(5) + # Regression #163482: keepassxc did not crash + machine.succeed("ps -e | grep keepassxc") + machine.wait_for_text("foo.kdbx") + machine.send_key("ret") + machine.sleep(1) + # Click on "Browse" button to select keyfile + machine.send_key("tab") + machine.send_chars("/home/alice/foo.keyfile") + machine.send_key("ret") + # Passwords folder is displayed + machine.wait_for_text("Passwords") ''; }) diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index 1be3fed6acc9..fce8df2b7e3a 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -16,8 +16,7 @@ let }; nodes = { - keycloak = { ... }: { - + keycloak = { config, ... }: { security.pki.certificateFiles = [ certs.ca.cert ]; @@ -36,11 +35,15 @@ let username = "bogus"; passwordFile = pkgs.writeText "dbPassword" "wzf6vOCbPp6cqTH"; }; + plugins = with config.services.keycloak.package.plugins; [ + keycloak-discord + keycloak-metrics-spi + ]; }; environment.systemPackages = with pkgs; [ xmlstarlet - libtidy + html-tidy jq ]; }; @@ -102,8 +105,21 @@ let ### Realm Setup ### # Get an admin interface access token + keycloak.succeed(""" + curl -sSf -d 'client_id=admin-cli' \ + -d 'username=admin' \ + -d 'password=${initialAdminPassword}' \ + -d 'grant_type=password' \ + '${frontendUrl}/realms/master/protocol/openid-connect/token' \ + | jq -r '"Authorization: bearer " + .access_token' >admin_auth_header + """) + + # Register the metrics SPI keycloak.succeed( - "curl -sSf -d 'client_id=admin-cli' -d 'username=admin' -d 'password=${initialAdminPassword}' -d 'grant_type=password' '${frontendUrl}/realms/master/protocol/openid-connect/token' | jq -r '\"Authorization: bearer \" + .access_token' >admin_auth_header" + "${pkgs.jre}/bin/keytool -import -alias snakeoil -file ${certs.ca.cert} -storepass aaaaaa -keystore cacert.jks -noprompt", + "KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' ${pkgs.keycloak}/bin/kcadm.sh config credentials --server '${frontendUrl}' --realm master --user admin --password '${initialAdminPassword}'", + "KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' ${pkgs.keycloak}/bin/kcadm.sh update events/config -s 'eventsEnabled=true' -s 'adminEventsEnabled=true' -s 'eventsListeners+=metrics-listener'", + "curl -sSf '${frontendUrl}/realms/master/metrics' | grep '^keycloak_admin_event_UPDATE'" ) # Publish the realm, including a test OIDC client and user diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index f0c72084be5c..d4410beb937e 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -18,7 +18,7 @@ let ${master.ip} api.${domain} ${concatMapStringsSep "\n" (machineName: "${machines.${machineName}.ip} ${machineName}.${domain}") (attrNames machines)} ''; - kubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } '' + wrapKubectl = with pkgs; runCommand "wrap-kubectl" { buildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin makeWrapper ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl --set KUBECONFIG "/etc/kubernetes/cluster-admin.kubeconfig" ''; @@ -48,7 +48,7 @@ let }; }; programs.bash.enableCompletion = true; - environment.systemPackages = [ kubectl ]; + environment.systemPackages = [ wrapKubectl ]; services.flannel.iface = "eth1"; services.kubernetes = { proxy.hostname = "${masterName}.${domain}"; diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix index ca73562256e4..9e73fbbd32a8 100644 --- a/nixos/tests/kubernetes/rbac.nix +++ b/nixos/tests/kubernetes/rbac.nix @@ -76,7 +76,7 @@ let }]; }); - kubectl = pkgs.runCommand "copy-kubectl" { buildInputs = [ pkgs.kubernetes ]; } '' + copyKubectl = pkgs.runCommand "copy-kubectl" { } '' mkdir -p $out/bin cp ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl ''; @@ -84,7 +84,7 @@ let kubectlImage = pkgs.dockerTools.buildImage { name = "kubectl"; tag = "latest"; - contents = [ kubectl pkgs.busybox kubectlPod2 ]; + contents = [ copyKubectl pkgs.busybox kubectlPod2 ]; config.Entrypoint = ["/bin/sh"]; }; diff --git a/nixos/tests/logrotate.nix b/nixos/tests/logrotate.nix new file mode 100644 index 000000000000..38da8d535275 --- /dev/null +++ b/nixos/tests/logrotate.nix @@ -0,0 +1,37 @@ +# Test logrotate service works and is enabled by default + +import ./make-test-python.nix ({ pkgs, ...} : rec { + name = "logrotate"; + meta = with pkgs.lib.maintainers; { + maintainers = [ martinetd ]; + }; + + # default machine + machine = { ... }: { + }; + + testScript = + '' + with subtest("whether logrotate works"): + machine.succeed( + # we must rotate once first to create logrotate stamp + "systemctl start logrotate.service") + # we need to wait for console text once here to + # clear console buffer up to this point for next wait + machine.wait_for_console_text('logrotate.service: Deactivated successfully') + + machine.succeed( + # wtmp is present in default config. + "rm -f /var/log/wtmp*", + # we need to give it at least 1MB + "dd if=/dev/zero of=/var/log/wtmp bs=2M count=1", + + # move into the future and check rotation. + "date -s 'now + 1 month + 1 day'") + machine.wait_for_console_text('logrotate.service: Deactivated successfully') + machine.succeed( + # check rotate worked + "[ -e /var/log/wtmp.1 ]", + ) + ''; +}) diff --git a/nixos/tests/matrix-appservice-irc.nix b/nixos/tests/matrix-appservice-irc.nix index e1da410af060..d1c561f95dbf 100644 --- a/nixos/tests/matrix-appservice-irc.nix +++ b/nixos/tests/matrix-appservice-irc.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ... }: let - homeserverUrl = "http://homeserver:8448"; + homeserverUrl = "http://homeserver:8008"; in { name = "matrix-appservice-irc"; @@ -14,28 +14,32 @@ import ./make-test-python.nix ({ pkgs, ... }: specialisation.running.configuration = { services.matrix-synapse = { enable = true; - database_type = "sqlite3"; - app_service_config_files = [ "/registration.yml" ]; + settings = { + database.name = "sqlite3"; + app_service_config_files = [ "/registration.yml" ]; - enable_registration = true; + enable_registration = true; - listeners = [ - # The default but tls=false - { - "bind_address" = ""; - "port" = 8448; - "resources" = [ - { "compress" = true; "names" = [ "client" ]; } - { "compress" = false; "names" = [ "federation" ]; } + listeners = [ { + # The default but tls=false + bind_addresses = [ + "0.0.0.0" ]; - "tls" = false; - "type" = "http"; - "x_forwarded" = false; - } - ]; + port = 8008; + resources = [ { + "compress" = true; + "names" = [ "client" ]; + } { + "compress" = false; + "names" = [ "federation" ]; + } ]; + tls = false; + type = "http"; + } ]; + }; }; - networking.firewall.allowedTCPPorts = [ 8448 ]; + networking.firewall.allowedTCPPorts = [ 8008 ]; }; }; @@ -209,7 +213,7 @@ import ./make-test-python.nix ({ pkgs, ... }: ) homeserver.wait_for_unit("matrix-synapse.service") - homeserver.wait_for_open_port(8448) + homeserver.wait_for_open_port(8008) with subtest("ensure messages can be exchanged"): client.succeed("do_test ${homeserverUrl} >&2") diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix index 21e8c24e4713..1ff1e47b2840 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix-synapse.nix @@ -33,6 +33,29 @@ import ./make-test-python.nix ({ pkgs, ... } : let testUser = "alice"; testPassword = "alicealice"; testEmail = "alice@example.com"; + + listeners = [ { + port = 8448; + bind_addresses = [ + "127.0.0.1" + "::1" + ]; + type = "http"; + tls = true; + x_forwarded = false; + resources = [ { + names = [ + "client" + ]; + compress = true; + } { + names = [ + "federation" + ]; + compress = false; + } ]; + } ]; + in { name = "matrix-synapse"; @@ -48,22 +71,24 @@ in { { services.matrix-synapse = { enable = true; - database_type = "psycopg2"; - tls_certificate_path = "${cert}"; - tls_private_key_path = "${key}"; - database_args = { - password = "synapse"; + settings = { + inherit listeners; + database = { + name = "psycopg2"; + args.password = "synapse"; + }; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + registration_shared_secret = registrationSharedSecret; + public_baseurl = "https://example.com"; + email = { + smtp_host = mailerDomain; + smtp_port = 25; + require_transport_security = true; + notif_from = "matrix "; + app_name = "Matrix"; + }; }; - registration_shared_secret = registrationSharedSecret; - public_baseurl = "https://example.com"; - extraConfig = '' - email: - smtp_host: "${mailerDomain}" - smtp_port: 25 - require_transport_security: true - notif_from: "matrix " - app_name: "Matrix" - ''; }; services.postgresql = { enable = true; @@ -165,9 +190,12 @@ in { serversqlite = args: { services.matrix-synapse = { enable = true; - database_type = "sqlite3"; - tls_certificate_path = "${cert}"; - tls_private_key_path = "${key}"; + settings = { + inherit listeners; + database.name = "sqlite3"; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + }; }; }; }; diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix index bb55f6f5440b..54094ab9d611 100644 --- a/nixos/tests/matrix/mjolnir.nix +++ b/nixos/tests/matrix/mjolnir.nix @@ -38,26 +38,31 @@ import ../make-test-python.nix ( homeserver = { pkgs, ... }: { services.matrix-synapse = { enable = true; - database_type = "sqlite3"; - tls_certificate_path = "${cert}"; - tls_private_key_path = "${key}"; - enable_registration = true; - registration_shared_secret = "supersecret-registration"; + settings = { + database.name = "sqlite3"; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + enable_registration = true; + registration_shared_secret = "supersecret-registration"; - listeners = [ - # The default but tls=false - { - "bind_address" = ""; - "port" = 8448; - "resources" = [ - { "compress" = true; "names" = [ "client" "webclient" ]; } - { "compress" = false; "names" = [ "federation" ]; } + listeners = [ { + # The default but tls=false + bind_addresses = [ + "0.0.0.0" ]; - "tls" = false; - "type" = "http"; - "x_forwarded" = false; - } - ]; + port = 8448; + resources = [ { + compress = true; + names = [ "client" ]; + } { + compress = false; + names = [ "federation" ]; + } ]; + tls = false; + type = "http"; + x_forwarded = false; + } ]; + }; }; networking.firewall.allowedTCPPorts = [ 8448 ]; diff --git a/nixos/tests/matrix/pantalaimon.nix b/nixos/tests/matrix/pantalaimon.nix index fcb9904b2138..1a9894dd2159 100644 --- a/nixos/tests/matrix/pantalaimon.nix +++ b/nixos/tests/matrix/pantalaimon.nix @@ -47,9 +47,32 @@ import ../make-test-python.nix ( services.matrix-synapse = { enable = true; - database_type = "sqlite3"; - tls_certificate_path = "${cert}"; - tls_private_key_path = "${key}"; + settings = { + listeners = [ { + port = 8448; + bind_addresses = [ + "127.0.0.1" + "::1" + ]; + type = "http"; + tls = true; + x_forwarded = false; + resources = [ { + names = [ + "client" + ]; + compress = true; + } { + names = [ + "federation" + ]; + compress = false; + } ]; + } ]; + database.name = "sqlite3"; + tls_certificate_path = "${cert}"; + tls_private_key_path = "${key}"; + }; }; }; diff --git a/nixos/tests/minidlna.nix b/nixos/tests/minidlna.nix index d852c7f60bc4..104b79078fd5 100644 --- a/nixos/tests/minidlna.nix +++ b/nixos/tests/minidlna.nix @@ -33,7 +33,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { server.succeed("mkdir -p /tmp/stuff && chown minidlna: /tmp/stuff") server.wait_for_unit("minidlna") server.wait_for_open_port("8200") - server.succeed("curl --fail http://localhost:8200/") - client.succeed("curl --fail http://server:8200/") + # requests must be made *by IP* to avoid triggering minidlna's + # DNS-rebinding protection + server.succeed("curl --fail http://$(getent ahostsv4 localhost | head -n1 | cut -f 1 -d ' '):8200/") + client.succeed("curl --fail http://$(getent ahostsv4 server | head -n1 | cut -f 1 -d ' '):8200/") ''; }) diff --git a/nixos/tests/miniflux.nix b/nixos/tests/miniflux.nix index 1015550fa8c7..d905aea048a3 100644 --- a/nixos/tests/miniflux.nix +++ b/nixos/tests/miniflux.nix @@ -7,6 +7,15 @@ let defaultPort = 8080; defaultUsername = "admin"; defaultPassword = "password"; + adminCredentialsFile = pkgs.writeText "admin-credentials" '' + ADMIN_USERNAME=${defaultUsername} + ADMIN_PASSWORD=${defaultPassword} + ''; + customAdminCredentialsFile = pkgs.writeText "admin-credentials" '' + ADMIN_USERNAME=${username} + ADMIN_PASSWORD=${password} + ''; + in with lib; { @@ -17,13 +26,19 @@ with lib; default = { ... }: { - services.miniflux.enable = true; + services.miniflux = { + enable = true; + inherit adminCredentialsFile; + }; }; withoutSudo = { ... }: { - services.miniflux.enable = true; + services.miniflux = { + enable = true; + inherit adminCredentialsFile; + }; security.sudo.enable = false; }; @@ -36,10 +51,7 @@ with lib; CLEANUP_FREQUENCY = "48"; LISTEN_ADDR = "localhost:${toString port}"; }; - adminCredentialsFile = pkgs.writeText "admin-credentials" '' - ADMIN_USERNAME=${username} - ADMIN_PASSWORD=${password} - ''; + adminCredentialsFile = customAdminCredentialsFile; }; }; }; diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 0587912c9a22..02513c4726c1 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -1,13 +1,13 @@ # Miscellaneous small tests that don't warrant their own VM run. -import ./make-test-python.nix ({ pkgs, ...} : rec { +import ./make-test-python.nix ({ pkgs, ...} : let + foo = pkgs.writeText "foo" "Hello World"; +in { name = "misc"; meta = with pkgs.lib.maintainers; { maintainers = [ eelco ]; }; - foo = pkgs.writeText "foo" "Hello World"; - machine = { lib, ... }: with lib; diff --git a/nixos/tests/moonraker.nix b/nixos/tests/moonraker.nix new file mode 100644 index 000000000000..b0a93a4a608b --- /dev/null +++ b/nixos/tests/moonraker.nix @@ -0,0 +1,45 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "moonraker"; + meta = with pkgs.lib.maintainers; { + maintainers = [ zhaofengli ]; + }; + + nodes = { + printer = { config, pkgs, ... }: { + security.polkit.enable = true; + + services.moonraker = { + enable = true; + allowSystemControl = true; + + settings = { + authorization = { + trusted_clients = [ "127.0.0.0/8" "::1/128" ]; + }; + }; + }; + + services.klipper = { + enable = true; + + user = "moonraker"; + group = "moonraker"; + + # No mcu configured so won't even enter `ready` state + settings = {}; + }; + }; + }; + + testScript = '' + printer.start() + + printer.wait_for_unit("klipper.service") + printer.wait_for_unit("moonraker.service") + printer.wait_until_succeeds("curl http://localhost:7125/printer/info | grep -v 'Not Found' >&2", timeout=30) + + with subtest("Check that we can perform system-level operations"): + printer.succeed("curl -X POST http://localhost:7125/machine/services/stop?service=klipper | grep ok >&2") + printer.wait_until_succeeds("systemctl --no-pager show klipper.service | grep ActiveState=inactive", timeout=10) + ''; +}) diff --git a/nixos/tests/moosefs.nix b/nixos/tests/moosefs.nix new file mode 100644 index 000000000000..0dc08748b828 --- /dev/null +++ b/nixos/tests/moosefs.nix @@ -0,0 +1,89 @@ +import ./make-test-python.nix ({ pkgs, ... } : + +let + master = { pkgs, ... } : { + # data base is stored in memory + # server crashes with default memory size + virtualisation.memorySize = 1024; + + services.moosefs.master = { + enable = true; + openFirewall = true; + exports = [ + "* / rw,alldirs,admin,maproot=0:0" + "* . rw" + ]; + }; + }; + + chunkserver = { pkgs, ... } : { + virtualisation.emptyDiskImages = [ 4096 ]; + boot.initrd.postDeviceCommands = '' + ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb + ''; + + fileSystems = pkgs.lib.mkVMOverride { + "/data" = { + device = "/dev/disk/by-label/data"; + fsType = "ext4"; + }; + }; + + services.moosefs = { + masterHost = "master"; + chunkserver = { + openFirewall = true; + enable = true; + hdds = [ "~/data" ]; + }; + }; + }; + + metalogger = { pkgs, ... } : { + services.moosefs = { + masterHost = "master"; + metalogger.enable = true; + }; + }; + + client = { pkgs, ... } : { + services.moosefs.client.enable = true; + }; + +in { + name = "moosefs"; + + nodes= { + inherit master; + inherit metalogger; + chunkserver1 = chunkserver; + chunkserver2 = chunkserver; + client1 = client; + client2 = client; + }; + + testScript = '' + # prepare master server + master.start() + master.wait_for_unit("multi-user.target") + master.succeed("mfsmaster-init") + master.succeed("systemctl restart mfs-master") + master.wait_for_unit("mfs-master.service") + + metalogger.wait_for_unit("mfs-metalogger.service") + + for chunkserver in [chunkserver1, chunkserver2]: + chunkserver.wait_for_unit("multi-user.target") + chunkserver.succeed("chown moosefs:moosefs /data") + chunkserver.succeed("systemctl restart mfs-chunkserver") + chunkserver.wait_for_unit("mfs-chunkserver.service") + + for client in [client1, client2]: + client.wait_for_unit("multi-user.target") + client.succeed("mkdir /moosefs") + client.succeed("mount -t moosefs master:/ /moosefs") + + client1.succeed("echo test > /moosefs/file") + client2.succeed("grep test /moosefs/file") + ''; +}) diff --git a/nixos/tests/mysql/common.nix b/nixos/tests/mysql/common.nix index 968253d109cc..040d360b6d99 100644 --- a/nixos/tests/mysql/common.nix +++ b/nixos/tests/mysql/common.nix @@ -3,7 +3,7 @@ inherit (pkgs.darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }); - mysqlPackage = { + mysqlPackages = { inherit (pkgs) mysql57 mysql80; }; mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}"; diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix index a5e42f85a7fb..197e6da80e24 100644 --- a/nixos/tests/mysql/mysql.nix +++ b/nixos/tests/mysql/mysql.nix @@ -142,7 +142,7 @@ let in lib.mapAttrs (_: package: makeMySQLTest { inherit package; - hasRocksDB = false; hasMroonga = false; + hasRocksDB = false; hasMroonga = false; useSocketAuth = false; }) mysqlPackages // (lib.mapAttrs (_: package: makeMySQLTest { inherit package; diff --git a/nixos/tests/nano.nix b/nixos/tests/nano.nix deleted file mode 100644 index 6585a6842e85..000000000000 --- a/nixos/tests/nano.nix +++ /dev/null @@ -1,44 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ...} : { - name = "nano"; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; - }; - - machine = { lib, ... }: { - environment.systemPackages = [ pkgs.nano ]; - }; - - testScript = { ... }: '' - start_all() - - with subtest("Create user and log in"): - machine.wait_for_unit("multi-user.target") - machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'") - machine.succeed("useradd -m alice") - machine.succeed("(echo foobar; echo foobar) | passwd alice") - machine.wait_until_tty_matches(1, "login: ") - machine.send_chars("alice\n") - machine.wait_until_tty_matches(1, "login: alice") - machine.wait_until_succeeds("pgrep login") - machine.wait_until_tty_matches(1, "Password: ") - machine.send_chars("foobar\n") - machine.wait_until_succeeds("pgrep -u alice bash") - machine.screenshot("prompt") - - with subtest("Use nano"): - machine.send_chars("nano /tmp/foo") - machine.send_key("ret") - machine.sleep(2) - machine.send_chars("42") - machine.sleep(1) - machine.send_key("ctrl-x") - machine.sleep(1) - machine.send_key("y") - machine.sleep(1) - machine.screenshot("nano") - machine.sleep(1) - machine.send_key("ret") - machine.wait_for_file("/tmp/foo") - assert "42" in machine.succeed("cat /tmp/foo") - ''; -}) diff --git a/nixos/tests/nats.nix b/nixos/tests/nats.nix index bee36f262f4c..c650904e53bf 100644 --- a/nixos/tests/nats.nix +++ b/nixos/tests/nats.nix @@ -45,21 +45,19 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: { "{}" ).format(" ".join(args)) + def parallel(*fns): + from threading import Thread + threads = [ Thread(target=fn) for fn in fns ] + for t in threads: t.start() + for t in threads: t.join() + start_all() server.wait_for_unit("nats.service") - client1.fail("test -f ${file}") - - # Subscribe on topic on client1 and echo messages to file. - client1.execute("({} | tee ${file} &)".format(nats_cmd("sub", "--raw", "${topic}"))) - - # Give client1 some time to subscribe. - client1.execute("sleep 2") - - # Publish message on client2. - client2.execute(nats_cmd("pub", "${topic}", "hello")) - - # Check if message has been received. - client1.succeed("grep -q hello ${file}") + with subtest("pub sub"): + parallel( + lambda: client1.succeed(nats_cmd("sub", "--count", "1", "${topic}")), + lambda: client2.succeed("sleep 2 && {}".format(nats_cmd("pub", "${topic}", "hello"))), + ) ''; }) diff --git a/nixos/tests/nbd.nix b/nixos/tests/nbd.nix new file mode 100644 index 000000000000..16255e68e8a1 --- /dev/null +++ b/nixos/tests/nbd.nix @@ -0,0 +1,87 @@ +import ./make-test-python.nix ({ pkgs, ... }: + let + listenPort = 30123; + testString = "It works!"; + mkCreateSmallFileService = { path, loop ? false }: { + script = '' + ${pkgs.coreutils}/bin/dd if=/dev/zero of=${path} bs=1K count=100 + ${pkgs.lib.optionalString loop + "${pkgs.util-linux}/bin/losetup --find ${path}"} + ''; + serviceConfig = { + Type = "oneshot"; + }; + wantedBy = [ "multi-user.target" ]; + before = [ "nbd-server.service" ]; + }; + in + { + name = "nbd"; + + nodes = { + server = { config, pkgs, ... }: { + # Create some small files of zeros to use as the ndb disks + ## `vault-pub.disk` is accessible from any IP + systemd.services.create-pub-file = + mkCreateSmallFileService { path = "/vault-pub.disk"; }; + ## `vault-priv.disk` is accessible only from localhost. + ## It's also a loopback device to test exporting /dev/... + systemd.services.create-priv-file = + mkCreateSmallFileService { path = "/vault-priv.disk"; loop = true; }; + + # Needed only for nbd-client used in the tests. + environment.systemPackages = [ pkgs.nbd ]; + + # Open the nbd port in the firewall + networking.firewall.allowedTCPPorts = [ listenPort ]; + + # Run the nbd server and expose the small file created above + services.nbd.server = { + enable = true; + exports = { + vault-pub = { + path = "/vault-pub.disk"; + }; + vault-priv = { + path = "/dev/loop0"; + allowAddresses = [ "127.0.0.1" "::1" ]; + }; + }; + listenAddress = "0.0.0.0"; + listenPort = listenPort; + }; + }; + + client = { config, pkgs, ... }: { + programs.nbd.enable = true; + }; + }; + + testScript = '' + testString = "${testString}" + + start_all() + server.wait_for_open_port(${toString listenPort}) + + # Client: Connect to the server, write a small string to the nbd disk, and cleanly disconnect + client.succeed("nbd-client server ${toString listenPort} /dev/nbd0 -name vault-pub -persist") + client.succeed(f"echo '{testString}' | dd of=/dev/nbd0 conv=notrunc") + client.succeed("nbd-client -d /dev/nbd0") + + # Server: Check that the string written by the client is indeed in the file + foundString = server.succeed(f"dd status=none if=/vault-pub.disk count={len(testString)}")[:len(testString)] + if foundString != testString: + raise Exception(f"Read the wrong string from nbd disk. Expected: '{testString}'. Found: '{foundString}'") + + # Client: Fail to connect to the private disk + client.fail("nbd-client server ${toString listenPort} /dev/nbd0 -name vault-priv -persist") + + # Server: Successfully connect to the private disk + server.succeed("nbd-client localhost ${toString listenPort} /dev/nbd0 -name vault-priv -persist") + server.succeed(f"echo '{testString}' | dd of=/dev/nbd0 conv=notrunc") + foundString = server.succeed(f"dd status=none if=/dev/loop0 count={len(testString)}")[:len(testString)] + if foundString != testString: + raise Exception(f"Read the wrong string from nbd disk. Expected: '{testString}'. Found: '{foundString}'") + server.succeed("nbd-client -d /dev/nbd0") + ''; + }) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 2510937b5dcd..dc7938a436aa 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -246,13 +246,13 @@ let networking = { useNetworkd = networkd; useDHCP = false; - bonds.bond = { + bonds.bond0 = { interfaces = [ "eth1" "eth2" ]; - driverOptions.mode = "balance-rr"; + driverOptions.mode = "802.3ad"; }; interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; - interfaces.bond.ipv4.addresses = mkOverride 0 + interfaces.bond0.ipv4.addresses = mkOverride 0 [ { inherit address; prefixLength = 30; } ]; }; }; @@ -274,6 +274,10 @@ let client2.wait_until_succeeds("ping -c 2 192.168.1.1") client2.wait_until_succeeds("ping -c 2 192.168.1.2") + + with subtest("Verify bonding mode"): + for client in client1, client2: + client.succeed('grep -q "Bonding Mode: IEEE 802.3ad Dynamic link aggregation" /proc/net/bonding/bond0') ''; }; bridge = let @@ -494,6 +498,7 @@ let networking = { useNetworkd = networkd; useDHCP = false; + firewall.extraCommands = "ip6tables -A nixos-fw -p gre -j nixos-fw-accept"; }; }; in { @@ -502,21 +507,35 @@ let mkMerge [ (node args) { - virtualisation.vlans = [ 1 2 ]; + virtualisation.vlans = [ 1 2 4 ]; networking = { greTunnels = { greTunnel = { local = "192.168.2.1"; remote = "192.168.2.2"; dev = "eth2"; + ttl = 225; type = "tap"; }; + gre6Tunnel = { + local = "fd00:1234:5678:4::1"; + remote = "fd00:1234:5678:4::2"; + dev = "eth3"; + ttl = 255; + type = "tun6"; + }; }; bridges.bridge.interfaces = [ "greTunnel" "eth1" ]; interfaces.eth1.ipv4.addresses = mkOverride 0 []; interfaces.bridge.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ]; + interfaces.eth3.ipv6.addresses = [ + { address = "fd00:1234:5678:4::1"; prefixLength = 64; } + ]; + interfaces.gre6Tunnel.ipv6.addresses = mkOverride 0 [ + { address = "fc00::1"; prefixLength = 64; } + ]; }; } ]; @@ -524,26 +543,41 @@ let mkMerge [ (node args) { - virtualisation.vlans = [ 2 3 ]; + virtualisation.vlans = [ 2 3 4 ]; networking = { greTunnels = { greTunnel = { local = "192.168.2.2"; remote = "192.168.2.1"; dev = "eth1"; + ttl = 225; type = "tap"; }; + gre6Tunnel = { + local = "fd00:1234:5678:4::2"; + remote = "fd00:1234:5678:4::1"; + dev = "eth3"; + ttl = 255; + type = "tun6"; + }; }; bridges.bridge.interfaces = [ "greTunnel" "eth2" ]; interfaces.eth2.ipv4.addresses = mkOverride 0 []; interfaces.bridge.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } ]; + interfaces.eth3.ipv6.addresses = [ + { address = "fd00:1234:5678:4::2"; prefixLength = 64; } + ]; + interfaces.gre6Tunnel.ipv6.addresses = mkOverride 0 [ + { address = "fc00::2"; prefixLength = 64; } + ]; }; } ]; testScript = { ... }: '' + import json start_all() with subtest("Wait for networking to be configured"): @@ -558,6 +592,17 @@ let client1.wait_until_succeeds("ping -c 1 192.168.1.2") client2.wait_until_succeeds("ping -c 1 192.168.1.1") + + client1.wait_until_succeeds("ping -c 1 fc00::2") + + client2.wait_until_succeeds("ping -c 1 fc00::1") + + with subtest("Test GRE tunnel TTL"): + links = json.loads(client1.succeed("ip -details -json link show greTunnel")) + assert links[0]['linkinfo']['info_data']['ttl'] == 225, "ttl not set for greTunnel" + + links = json.loads(client2.succeed("ip -details -json link show gre6Tunnel")) + assert links[0]['linkinfo']['info_data']['ttl'] == 255, "ttl not set for gre6Tunnel" ''; }; vlan = let @@ -864,7 +909,7 @@ let print(client.succeed("ip l add name foo type dummy")) print(client.succeed("stat /etc/systemd/network/50-foo.link")) client.succeed("udevadm settle") - assert "mtu 1442" in client.succeed("ip l show dummy0") + assert "mtu 1442" in client.succeed("ip l show dev foo") ''; }; wlanInterface = let diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index 34d3c345354c..b7b1c5c66002 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -18,4 +18,4 @@ foldl }; }) { } - [ 21 22 23 ] + [ 22 23 ] diff --git a/nixos/tests/nginx-modsecurity.nix b/nixos/tests/nginx-modsecurity.nix new file mode 100644 index 000000000000..8c53c0196d4c --- /dev/null +++ b/nixos/tests/nginx-modsecurity.nix @@ -0,0 +1,39 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "nginx-modsecurity"; + + machine = { config, lib, pkgs, ... }: { + services.nginx = { + enable = true; + additionalModules = [ pkgs.nginxModules.modsecurity-nginx ]; + virtualHosts.localhost = + let modsecurity_conf = pkgs.writeText "modsecurity.conf" '' + SecRuleEngine On + SecDefaultAction "phase:1,log,auditlog,deny,status:403" + SecDefaultAction "phase:2,log,auditlog,deny,status:403" + SecRule REQUEST_METHOD "HEAD" "id:100, phase:1, block" + SecRule REQUEST_FILENAME "secret.html" "id:101, phase:2, block" + ''; + testroot = pkgs.runCommand "testroot" {} '' + mkdir -p $out + echo "Hello World!" > $out/index.html + echo "s3cret" > $out/secret.html + ''; + in { + root = testroot; + extraConfig = '' + modsecurity on; + modsecurity_rules_file ${modsecurity_conf}; + ''; + }; + }; + }; + testScript = '' + machine.wait_for_unit("nginx") + + response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1/") + assert "Hello World!" in response + + machine.fail("curl -fvvv -X HEAD -s http://127.0.0.1/") + machine.fail("curl -fvvv -s http://127.0.0.1/secret.html") + ''; +}) diff --git a/nixos/tests/nix-ld.nix b/nixos/tests/nix-ld.nix new file mode 100644 index 000000000000..5c886182d969 --- /dev/null +++ b/nixos/tests/nix-ld.nix @@ -0,0 +1,20 @@ +import ./make-test-python.nix ({ lib, pkgs, ...} : +{ + name = "nix-ld"; + nodes.machine = { pkgs, ... }: { + programs.nix-ld.enable = true; + environment.systemPackages = [ + (pkgs.runCommand "patched-hello" {} '' + install -D -m755 ${pkgs.hello}/bin/hello $out/bin/hello + patchelf $out/bin/hello --set-interpreter ${pkgs.nix-ld.ldPath} + '') + ]; + }; + testScript = '' + start_all() + path = "${pkgs.stdenv.cc}/nix-support/dynamic-linker" + with open(path) as f: + real_ld = f.read().strip() + machine.succeed(f"NIX_LD={real_ld} hello") + ''; +}) diff --git a/nixos/tests/nixops/default.nix b/nixos/tests/nixops/default.nix index ec3d028aabae..f0834c51f0b4 100644 --- a/nixos/tests/nixops/default.nix +++ b/nixos/tests/nixops/default.nix @@ -9,7 +9,7 @@ let # - Alternatively, blocked on a NixOps 2 release # https://github.com/NixOS/nixops/issues/1242 # stable = testsLegacyNetwork { nixopsPkg = pkgs.nixops; }; - unstable = testsForPackage { nixopsPkg = pkgs.nixopsUnstable; }; + unstable = testsForPackage { nixopsPkg = pkgs.nixops_unstable; }; # inherit testsForPackage; }; @@ -23,7 +23,7 @@ let deployer = { config, lib, nodes, pkgs, ... }: { imports = [ ../../modules/installer/cd-dvd/channel.nix ]; environment.systemPackages = [ nixopsPkg ]; - nix.binaryCaches = lib.mkForce [ ]; + nix.settings.substituters = lib.mkForce [ ]; users.users.person.isNormalUser = true; virtualisation.writableStore = true; virtualisation.additionalPaths = [ diff --git a/nixos/tests/nixops/legacy/base-configuration.nix b/nixos/tests/nixops/legacy/base-configuration.nix index dba960f595c2..7f1c07a5c4a9 100644 --- a/nixos/tests/nixops/legacy/base-configuration.nix +++ b/nixos/tests/nixops/legacy/base-configuration.nix @@ -16,7 +16,7 @@ in (modulesPath + "/testing/test-instrumentation.nix") ]; virtualisation.writableStore = true; - nix.binaryCaches = lib.mkForce [ ]; + nix.settings.substituters = lib.mkForce [ ]; virtualisation.graphics = false; documentation.enable = false; services.qemuGuest.enable = true; diff --git a/nixos/tests/noto-fonts.nix b/nixos/tests/noto-fonts.nix new file mode 100644 index 000000000000..049dc766bd3b --- /dev/null +++ b/nixos/tests/noto-fonts.nix @@ -0,0 +1,44 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "noto-fonts"; + meta = { + maintainers = with lib.maintainers; [ nickcao midchildan ]; + }; + + machine = { + imports = [ ./common/x11.nix ]; + environment.systemPackages = [ pkgs.gnome.gedit ]; + fonts = { + enableDefaultFonts = false; + fonts = with pkgs;[ + noto-fonts + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-emoji + ]; + fontconfig.defaultFonts = { + serif = [ "Noto Serif" "Noto Serif CJK SC" ]; + sansSerif = [ "Noto Sans" "Noto Sans CJK SC" ]; + monospace = [ "Noto Sans Mono" "Noto Sans Mono CJK SC" ]; + emoji = [ "Noto Color Emoji" ]; + }; + }; + }; + + testScript = + # extracted from http://www.clagnut.com/blog/2380/ + let testText = builtins.toFile "test.txt" '' + the quick brown fox jumps over the lazy dog + 視野無限廣，窗外有藍天 + Eĥoŝanĝo ĉiuĵaŭde. + いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす + 다람쥐 헌 쳇바퀴에 타고파 + 中国智造，慧及全球 + ''; in + '' + machine.wait_for_x() + machine.succeed("gedit ${testText} >&2 &") + machine.wait_for_window(".* - gedit") + machine.sleep(10) + machine.screenshot("screen") + ''; +}) diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index c1e29b0f68b4..90375450fe1b 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -43,11 +43,11 @@ let # vda is a filesystem without partition table forceInstall = true; }; - nix.binaryCaches = lib.mkForce [ ]; - nix.extraOptions = '' - hashed-mirrors = - connect-timeout = 1 - ''; + nix.settings = { + substituters = lib.mkForce []; + hashed-mirrors = null; + connect-timeout = 1; + }; # save some memory documentation.enable = false; }; diff --git a/nixos/tests/pacemaker.nix b/nixos/tests/pacemaker.nix new file mode 100644 index 000000000000..684557614953 --- /dev/null +++ b/nixos/tests/pacemaker.nix @@ -0,0 +1,110 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: rec { + name = "pacemaker"; + meta = with pkgs.lib.maintainers; { + maintainers = [ astro ]; + }; + + nodes = + let + node = i: { + networking.interfaces.eth1.ipv4.addresses = [ { + address = "192.168.0.${toString i}"; + prefixLength = 24; + } ]; + + services.corosync = { + enable = true; + clusterName = "zentralwerk-network"; + nodelist = lib.imap (i: name: { + nodeid = i; + inherit name; + ring_addrs = [ + (builtins.head nodes.${name}.networking.interfaces.eth1.ipv4.addresses).address + ]; + }) (builtins.attrNames nodes); + }; + environment.etc."corosync/authkey" = { + source = builtins.toFile "authkey" + # minimum length: 128 bytes + "testtesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttest"; + mode = "0400"; + }; + + services.pacemaker.enable = true; + + # used for pacemaker resource + systemd.services.ha-cat = { + description = "Highly available netcat"; + serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l discard"; + }; + }; + in { + node1 = node 1; + node2 = node 2; + node3 = node 3; + }; + + # sets up pacemaker with resources configuration, then crashes a + # node and waits for service restart on another node + testScript = + let + resources = builtins.toFile "cib-resources.xml" '' + + + + + + + + + + ''; + in '' + import re + import time + + start_all() + + ${lib.concatMapStrings (node: '' + ${node}.wait_until_succeeds("corosync-quorumtool") + ${node}.wait_for_unit("pacemaker.service") + '') (builtins.attrNames nodes)} + + # No STONITH device + node1.succeed("crm_attribute -t crm_config -n stonith-enabled -v false") + # Configure the cat resource + node1.succeed("cibadmin --replace --scope resources --xml-file ${resources}") + + # wait until the service is started + while True: + output = node1.succeed("crm_resource -r cat --locate") + match = re.search("is running on: (.+)", output) + if match: + for machine in machines: + if machine.name == match.group(1): + current_node = machine + break + time.sleep(1) + + current_node.log("Service running here!") + current_node.crash() + + # pick another node that's still up + for machine in machines: + if machine.booted: + check_node = machine + # find where the service has been started next + while True: + output = check_node.succeed("crm_resource -r cat --locate") + match = re.search("is running on: (.+)", output) + # output will remain the old current_node until the crash is detected by pacemaker + if match and match.group(1) != current_node.name: + for machine in machines: + if machine.name == match.group(1): + next_node = machine + break + time.sleep(1) + + next_node.log("Service migrated here!") + ''; +}) diff --git a/nixos/tests/pgadmin4-standalone.nix b/nixos/tests/pgadmin4-standalone.nix new file mode 100644 index 000000000000..442570c5306b --- /dev/null +++ b/nixos/tests/pgadmin4-standalone.nix @@ -0,0 +1,43 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + # This is seperate from pgadmin4 since we don't want both running at once + + { + name = "pgadmin4-standalone"; + meta.maintainers = with lib.maintainers; [ mkg20001 ]; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ + curl + ]; + + services.postgresql = { + enable = true; + + authentication = '' + host all all localhost trust + ''; + + ensureUsers = [ + { + name = "postgres"; + ensurePermissions = { + "DATABASE \"postgres\"" = "ALL PRIVILEGES"; + }; + } + ]; + }; + + services.pgadmin = { + enable = true; + initialEmail = "bruh@localhost.de"; + initialPasswordFile = pkgs.writeText "pw" "bruh2012!"; + }; + }; + + testScript = '' + machine.wait_for_unit("postgresql") + machine.wait_for_unit("pgadmin") + + machine.wait_until_succeeds("curl -s localhost:5050") + ''; + }) diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix new file mode 100644 index 000000000000..658315d3ac0c --- /dev/null +++ b/nixos/tests/pgadmin4.nix @@ -0,0 +1,142 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + + let + pgadmin4SrcDir = "/pgadmin"; + pgadmin4Dir = "/var/lib/pgadmin"; + pgadmin4LogDir = "/var/log/pgadmin"; + + python-with-needed-packages = pkgs.python3.withPackages (ps: with ps; [ + selenium + testtools + testscenarios + flask + flask-babelex + flask-babel + flask-gravatar + flask_login + flask_mail + flask_migrate + flask_sqlalchemy + flask_wtf + flask-compress + passlib + pytz + simplejson + six + sqlparse + wtforms + flask-paranoid + psutil + psycopg2 + python-dateutil + sqlalchemy + itsdangerous + flask-security-too + bcrypt + cryptography + sshtunnel + ldap3 + gssapi + flask-socketio + eventlet + httpagentparser + user-agents + wheel + authlib + qrcode + pillow + pyotp + ]); + in + { + name = "pgadmin4"; + meta.maintainers = with lib.maintainers; [ gador ]; + + nodes.machine = { pkgs, ... }: { + imports = [ ./common/x11.nix ]; + environment.systemPackages = with pkgs; [ + pgadmin4 + postgresql + python-with-needed-packages + chromedriver + chromium + ]; + services.postgresql = { + enable = true; + authentication = '' + host all all localhost trust + ''; + ensureUsers = [ + { + name = "postgres"; + ensurePermissions = { + "DATABASE \"postgres\"" = "ALL PRIVILEGES"; + }; + } + ]; + }; + }; + + testScript = '' + machine.wait_for_unit("postgresql") + + # pgadmin4 needs its data and log directories + machine.succeed( + "mkdir -p ${pgadmin4Dir} \ + && mkdir -p ${pgadmin4LogDir} \ + && mkdir -p ${pgadmin4SrcDir}" + ) + + machine.succeed( + "tar xvzf ${pkgs.pgadmin4.src} -C ${pgadmin4SrcDir}" + ) + + machine.wait_for_file("${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/README.md") + + # set paths and config for tests + machine.succeed( + "cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \ + && cp -v web/regression/test_config.json.in web/regression/test_config.json \ + && sed -i 's|PostgreSQL 9.4|PostgreSQL|' web/regression/test_config.json \ + && sed -i 's|/opt/PostgreSQL/9.4/bin/|${pkgs.postgresql}/bin|' web/regression/test_config.json \ + && sed -i 's|\"headless_chrome\": false|\"headless_chrome\": true|' web/regression/test_config.json" + ) + + # adapt chrome config to run within a sandbox without GUI + # see https://stackoverflow.com/questions/50642308/webdriverexception-unknown-error-devtoolsactiveport-file-doesnt-exist-while-t#50642913 + # add chrome binary path. use spaces to satisfy python indention (tabs throw an error) + # this works for selenium 3 (currently used), but will need to be updated + # to work with "from selenium.webdriver.chrome.service import Service" in selenium 4 + machine.succeed( + "cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version} \ + && sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.binary_location = \"${pkgs.chromium}/bin/chromium\"' web/regression/runtests.py \ + && sed -i '\|options.add_argument(\"--no-sandbox\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--headless\")' web/regression/runtests.py \ + && sed -i '\|options.add_argument(\"--disable-infobars\")|a \ \ \ \ \ \ \ \ options.add_argument(\"--disable-dev-shm-usage\")' web/regression/runtests.py \ + && sed -i 's|(chrome_options=options)|(executable_path=\"${pkgs.chromedriver}/bin/chromedriver\", chrome_options=options)|' web/regression/runtests.py \ + && sed -i 's|driver_local.maximize_window()||' web/regression/runtests.py" + ) + + # don't bother to test LDAP authentification + with subtest("run browser test"): + machine.succeed( + 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ + && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg browser --exclude \ + browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login' + ) + + # fontconfig is necessary for chromium to run + # https://github.com/NixOS/nixpkgs/issues/136207 + with subtest("run feature test"): + machine.succeed( + 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ + && export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \ + && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg feature_tests' + ) + + with subtest("run resql test"): + machine.succeed( + 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ + && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg resql' + ) + ''; + }) diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index 31a79bb4dbe3..718a635a6c7c 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -17,7 +17,7 @@ import ../make-test-python.nix ({ pkgs, lib, php, ... }: { locations."~ \\.php$".extraConfig = '' fastcgi_pass unix:${config.services.phpfpm.pools.foobar.socket}; fastcgi_index index.php; - include ${pkgs.nginx}/conf/fastcgi_params; + include ${config.services.nginx.package}/conf/fastcgi_params; include ${pkgs.nginx}/conf/fastcgi.conf; ''; locations."/" = { diff --git a/nixos/tests/plausible.nix b/nixos/tests/plausible.nix index 45e11f0270e6..58c1dd5cf4a8 100644 --- a/nixos/tests/plausible.nix +++ b/nixos/tests/plausible.nix @@ -8,6 +8,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { 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"}"; diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix index bf3623fce38b..90a9a2511044 100644 --- a/nixos/tests/pleroma.nix +++ b/nixos/tests/pleroma.nix @@ -32,8 +32,7 @@ import ./make-test-python.nix ({ pkgs, ... }: # system one. Overriding this pretty bad default behaviour. export REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - export TOOT_LOGIN_CLI_PASSWORD="jamy-password" - toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test" + echo "jamy-password" | toot login_cli -i "pleroma.nixos.test" -e "jamy@nixos.test" echo "Login OK" # Send a toot then verify it's part of the public timeline @@ -168,21 +167,6 @@ import ./make-test-python.nix ({ pkgs, ... }: cp key.pem cert.pem $out ''; - /* Toot is preventing users from feeding login_cli a password non - interactively. While it makes sense most of the times, it's - preventing us to login in this non-interactive test. This patch - introduce a TOOT_LOGIN_CLI_PASSWORD env variable allowing us to - provide a password to toot login_cli - - If https://github.com/ihabunek/toot/pull/180 gets merged at some - point, feel free to remove this patch. */ - custom-toot = pkgs.toot.overrideAttrs(old:{ - patches = [ (pkgs.fetchpatch { - url = "https://github.com/NinjaTrappeur/toot/commit/b4a4c30f41c0cb7e336714c2c4af9bc9bfa0c9f2.patch"; - sha256 = "sha256-0xxNwjR/fStLjjUUhwzCCfrghRVts+fc+fvVJqVcaFg="; - }) ]; - }); - hosts = nodes: '' ${nodes.pleroma.config.networking.primaryIPAddress} pleroma.nixos.test ${nodes.client.config.networking.primaryIPAddress} client.nixos.test @@ -194,7 +178,7 @@ import ./make-test-python.nix ({ pkgs, ... }: security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; networking.extraHosts = hosts nodes; environment.systemPackages = with pkgs; [ - custom-toot + toot send-toot ]; }; diff --git a/nixos/tests/podman/default.nix b/nixos/tests/podman/default.nix index b52a7f060ad6..67c7823c5a31 100644 --- a/nixos/tests/podman/default.nix +++ b/nixos/tests/podman/default.nix @@ -126,7 +126,7 @@ import ../make-test-python.nix ( podman.succeed("docker network create default") podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") podman.succeed( - "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10" ) podman.succeed("docker ps | grep sleeping") podman.succeed("podman ps | grep sleeping") diff --git a/nixos/tests/podman/tls-ghostunnel.nix b/nixos/tests/podman/tls-ghostunnel.nix index c0bc47cc40b1..268a55701ccf 100644 --- a/nixos/tests/podman/tls-ghostunnel.nix +++ b/nixos/tests/podman/tls-ghostunnel.nix @@ -129,7 +129,7 @@ import ../make-test-python.nix ( podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") client.succeed( - "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10" ) client.succeed("docker ps | grep sleeping") podman.succeed("docker ps | grep sleeping") diff --git a/nixos/tests/powerdns.nix b/nixos/tests/powerdns.nix index d025934ad2b3..70060bad87b6 100644 --- a/nixos/tests/powerdns.nix +++ b/nixos/tests/powerdns.nix @@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { services.powerdns.extraConfig = '' launch=gmysql gmysql-user=pdns + zone-cache-refresh-interval=0 ''; services.mysql = { diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 036c037e426c..ce3b3fbf3bf3 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -672,7 +672,7 @@ let basicAuth.nextcloud-exporter = "snakeoilpw"; locations."/" = { root = "${pkgs.prometheus-nextcloud-exporter.src}/serverinfo/testdata"; - tryFiles = "/negative-space.xml =404"; + tryFiles = "/negative-space.json =404"; }; }; }; @@ -933,6 +933,27 @@ let ''; }; + pve = let + pveExporterEnvFile = pkgs.writeTextFile { + name = "pve.env"; + text = '' + PVE_USER="test_user@pam" + PVE_PASSWORD="hunter3" + PVE_VERIFY_SSL="false" + ''; + }; + in { + exporterConfig = { + enable = true; + environmentFile = pveExporterEnvFile; + }; + exporterTest = '' + wait_for_unit("prometheus-pve-exporter.service") + wait_for_open_port(9221) + wait_until_succeeds("curl localhost:9221") + ''; + }; + py-air-control = { nodeName = "py_air_control"; exporterConfig = { @@ -1156,6 +1177,10 @@ let systemd = { exporterConfig = { enable = true; + + extraFlags = [ + "--collector.enable-restart-count" + ]; }; metricProvider = { }; exporterTest = '' @@ -1166,6 +1191,11 @@ let 'systemd_unit_state{name="basic.target",state="active",type="target"} 1' ) ) + succeed( + "curl -sSf localhost:9558/metrics | grep '{}'".format( + 'systemd_service_restart_total{state="prometheus-systemd-exporter.service"} 0' + ) + ) ''; }; diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix new file mode 100644 index 000000000000..4c96f9eabc82 --- /dev/null +++ b/nixos/tests/retroarch.nix @@ -0,0 +1,49 @@ +import ./make-test-python.nix ({ pkgs, ... }: + + { + name = "retroarch"; + meta = with pkgs.lib.maintainers; { maintainers = [ j0hax ]; }; + + machine = { ... }: + + { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.desktopManager.retroarch = { + enable = true; + package = pkgs.retroarchFull; + }; + services.xserver.displayManager = { + sddm.enable = true; + defaultSession = "RetroArch"; + autoLogin = { + enable = true; + user = "alice"; + }; + }; + }; + + testScript = { nodes, ... }: + let + user = nodes.machine.config.users.users.alice; + xdo = "${pkgs.xdotool}/bin/xdotool"; + in '' + with subtest("Wait for login"): + start_all() + machine.wait_for_file("${user.home}/.Xauthority") + machine.succeed("xauth merge ${user.home}/.Xauthority") + + with subtest("Check RetroArch started"): + machine.wait_until_succeeds("pgrep retroarch") + machine.wait_for_window("^RetroArch ") + + with subtest("Check configuration created"): + machine.wait_for_file("${user.home}/.config/retroarch/retroarch.cfg") + + with subtest("Wait to get a screenshot"): + machine.execute( + "${xdo} key Alt+F1 sleep 10" + ) + machine.screenshot("screen") + ''; + }) diff --git a/nixos/tests/rstudio-server.nix b/nixos/tests/rstudio-server.nix index c7ac7670fbd4..dd5fe3e5b440 100644 --- a/nixos/tests/rstudio-server.nix +++ b/nixos/tests/rstudio-server.nix @@ -14,12 +14,6 @@ import ./make-test-python.nix ({ pkgs, ... }: }; }; - users.testuser = { - uid = 1000; - group = "testgroup"; - }; - groups.testgroup.gid = 1000; - testScript = '' machine.wait_for_unit("rstudio-server.service") machine.succeed("curl -f -vvv -s http://127.0.0.1:8787") diff --git a/nixos/tests/sfxr-qt.nix b/nixos/tests/sfxr-qt.nix new file mode 100644 index 000000000000..976b9b11fc66 --- /dev/null +++ b/nixos/tests/sfxr-qt.nix @@ -0,0 +1,32 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "sfxr-qt"; + meta = with pkgs.lib.maintainers; { + maintainers = [ fgaz ]; + }; + + machine = { config, pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + sound.enable = true; + environment.systemPackages = [ pkgs.sfxr-qt ]; + }; + + enableOCR = true; + + testScript = + '' + machine.wait_for_x() + # Add a dummy sound card, or the program won't start + machine.execute("modprobe snd-dummy") + + machine.execute("sfxr-qt >&2 &") + + machine.wait_for_window(r"sfxr") + machine.sleep(10) + machine.wait_for_text("requency") + machine.screenshot("screen") + ''; +}) diff --git a/nixos/tests/shiori.nix b/nixos/tests/shiori.nix index 418bee43c939..6c59c394009e 100644 --- a/nixos/tests/shiori.nix +++ b/nixos/tests/shiori.nix @@ -12,7 +12,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: authJSON = pkgs.writeText "auth.json" (builtins.toJSON { username = "shiori"; password = "gopher"; - remember = 1; # hour owner = true; }); diff --git a/nixos/tests/sourcehut.nix b/nixos/tests/sourcehut.nix index d1536c593225..55757e35f9b4 100644 --- a/nixos/tests/sourcehut.nix +++ b/nixos/tests/sourcehut.nix @@ -125,13 +125,18 @@ in virtualisation.memorySize = 2 * 1024; networking.domain = domain; networking.extraHosts = '' - ${config.networking.primaryIPAddress} meta.${domain} ${config.networking.primaryIPAddress} builds.${domain} + ${config.networking.primaryIPAddress} git.${domain} + ${config.networking.primaryIPAddress} meta.${domain} ''; services.sourcehut = { enable = true; - services = [ "meta" "builds" ]; + services = [ + "builds" + "git" + "meta" + ]; nginx.enable = true; nginx.virtualHost = { forceSSL = true; @@ -148,6 +153,8 @@ in #enableWorker = true; inherit images; }; + git.enable = true; + settings."sr.ht" = { global-domain = config.networking.domain; service-key = pkgs.writeText "service-key" "8b327279b77e32a3620e2fc9aabce491cc46e7d821fd6713b2a2e650ce114d01"; @@ -157,6 +164,10 @@ in oauth-client-secret = pkgs.writeText "buildsrht-oauth-client-secret" "2260e9c4d9b8dcedcef642860e0504bc"; oauth-client-id = "299db9f9c2013170"; }; + settings."git.sr.ht" = { + oauth-client-secret = pkgs.writeText "gitsrht-oauth-client-secret" "3597288dc2c716e567db5384f493b09d"; + oauth-client-id = "d07cb713d920702e"; + }; settings.webhooks.private-key = pkgs.writeText "webhook-key" "Ra3IjxgFiwG9jxgp4WALQIZw/BMYt30xWiOsqD0J7EA="; }; @@ -193,5 +204,9 @@ in machine.wait_for_open_port(5002) machine.succeed("curl -sL http://localhost:5002 | grep builds.${domain}") #machine.wait_for_unit("buildsrht-worker.service") + + # Testing gitsrht + machine.wait_for_unit("gitsrht.service") + machine.succeed("curl -sL http://git.${domain} | grep git.${domain}") ''; }) diff --git a/nixos/tests/ssh-keys.nix b/nixos/tests/ssh-keys.nix index 07d422196efa..df9ff38a3b22 100644 --- a/nixos/tests/ssh-keys.nix +++ b/nixos/tests/ssh-keys.nix @@ -10,6 +10,6 @@ pkgs: snakeOilPublicKey = pkgs.lib.concatStrings [ "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA" "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa" - "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= sakeoil" + "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil" ]; } diff --git a/nixos/tests/step-ca.nix b/nixos/tests/step-ca.nix index b22bcb060f2b..f21bd5366266 100644 --- a/nixos/tests/step-ca.nix +++ b/nixos/tests/step-ca.nix @@ -42,8 +42,8 @@ import ./make-test-python.nix ({ pkgs, ... }: caclient = { config, pkgs, ... }: { - security.acme.server = "https://caserver:8443/acme/acme/directory"; - security.acme.email = "root@example.org"; + security.acme.defaults.server = "https://caserver:8443/acme/acme/directory"; + security.acme.defaults.email = "root@example.org"; security.acme.acceptTerms = true; security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ]; diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix index ae9362ca70da..661fe9989e7a 100644 --- a/nixos/tests/sudo.nix +++ b/nixos/tests/sudo.nix @@ -28,6 +28,10 @@ in enable = true; wheelNeedsPassword = false; + extraConfig = '' + Defaults lecture="never" + ''; + extraRules = [ # SUDOERS SYNTAX CHECK (Test whether the module produces a valid output; # errors being detected by the visudo checks. diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix index 43b8c8473042..1e9e146c4b6c 100644 --- a/nixos/tests/sway.nix +++ b/nixos/tests/sway.nix @@ -1,6 +1,4 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: - -{ +import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "sway"; meta = { maintainers = with lib.maintainers; [ primeos synthetica ]; @@ -70,6 +68,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: enableOCR = true; testScript = { nodes, ... }: '' + import shlex + + def swaymsg(command: str, succeed=True): + with machine.nested(f"sending swaymsg {command!r}" + " (allowed to fail)" * (not succeed)): + (machine.succeed if succeed else machine.execute)( + f"su - alice -c {shlex.quote('swaymsg -- ' + command)}" + ) + start_all() machine.wait_for_unit("multi-user.target") @@ -81,9 +87,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: machine.wait_for_file("/tmp/sway-ipc.sock") # Test XWayland (foot does not support X): - machine.succeed( - "su - alice -c 'swaymsg exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty'" - ) + swaymsg("exec WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY=invalid alacritty") machine.wait_for_text("alice@machine") machine.send_chars("test-x11\n") machine.wait_for_file("/tmp/test-x11-exit-ok") @@ -107,9 +111,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: # Test gpg-agent starting pinentry-gnome3 via D-Bus (tests if # $WAYLAND_DISPLAY is correctly imported into the D-Bus user env): - machine.succeed( - "su - alice -c 'swaymsg -- exec gpg --no-tty --yes --quick-generate-key test'" - ) + swaymsg("exec gpg --no-tty --yes --quick-generate-key test") machine.wait_until_succeeds("pgrep --exact gpg") machine.wait_for_text("Passphrase") machine.screenshot("gpg_pinentry") @@ -121,8 +123,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: machine.wait_for_text("You pressed the exit shortcut.") machine.screenshot("sway_exit") + swaymsg("exec swaylock") + machine.wait_until_succeeds("pgrep -x swaylock") + machine.sleep(3) + machine.send_chars("${nodes.machine.config.users.users.alice.password}") + machine.send_key("ret") + machine.wait_until_fails("pgrep -x swaylock") + # Exit Sway and verify process exit status 0: - machine.succeed("su - alice -c 'swaymsg exit || true'") + swaymsg("exit", succeed=False) machine.wait_until_fails("pgrep -x sway") machine.wait_for_file("/tmp/sway-exit-ok") ''; diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 1c32bf6beb95..0198866b6ff8 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -1,6 +1,46 @@ # Test configuration switching. -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : let + + # Simple service that can either be socket-activated or that will + # listen on port 1234 if not socket-activated. + # A connection to the socket causes 'hello' to be written to the client. + socketTest = pkgs.writeScript "socket-test.py" /* python */ '' + #!${pkgs.python3}/bin/python3 + + from socketserver import TCPServer, StreamRequestHandler + import socket + import os + + + class Handler(StreamRequestHandler): + def handle(self): + self.wfile.write("hello".encode("utf-8")) + + + class Server(TCPServer): + def __init__(self, server_address, handler_cls): + listenFds = os.getenv('LISTEN_FDS') + if listenFds is None or int(listenFds) < 1: + print(f'Binding to {server_address}') + TCPServer.__init__( + self, server_address, handler_cls, bind_and_activate=True) + else: + TCPServer.__init__( + self, server_address, handler_cls, bind_and_activate=False) + # Override socket + print(f'Got activated by {os.getenv("LISTEN_FDNAMES")} ' + f'with {listenFds} FDs') + self.socket = socket.fromfd(3, self.address_family, + self.socket_type) + + + if __name__ == "__main__": + server = Server(("localhost", 1234), Handler) + server.serve_forever() + ''; + +in { name = "switch-test"; meta = with pkgs.lib.maintainers; { maintainers = [ gleber das_j ]; @@ -8,8 +48,15 @@ import ./make-test-python.nix ({ pkgs, ...} : { nodes = { machine = { pkgs, lib, ... }: { + environment.systemPackages = [ pkgs.socat ]; # for the socket activation stuff users.mutableUsers = false; + # For boot/switch testing + system.build.installBootLoader = lib.mkForce (pkgs.writeShellScript "install-dummy-loader" '' + echo "installing dummy bootloader" + touch /tmp/bootloader-installed + ''); + specialisation = rec { simpleService.configuration = { systemd.services.test = { @@ -18,10 +65,16 @@ import ./make-test-python.nix ({ pkgs, ...} : { Type = "oneshot"; RemainAfterExit = true; ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = "${pkgs.coreutils}/bin/true"; }; }; }; + simpleServiceDifferentDescription.configuration = { + imports = [ simpleService.configuration ]; + systemd.services.test.description = "Test unit"; + }; + simpleServiceModified.configuration = { imports = [ simpleService.configuration ]; systemd.services.test.serviceConfig.X-Test = true; @@ -45,6 +98,155 @@ import ./make-test-python.nix ({ pkgs, ...} : { systemd.services.test.restartIfChanged = false; }; + simpleServiceFailing.configuration = { + imports = [ simpleServiceModified.configuration ]; + systemd.services.test.serviceConfig.ExecStart = lib.mkForce "${pkgs.coreutils}/bin/false"; + }; + + autorestartService.configuration = { + # A service that immediately goes into restarting (but without failing) + systemd.services.autorestart = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + Restart = "always"; + RestartSec = "20y"; # Should be long enough + ExecStart = "${pkgs.coreutils}/bin/true"; + }; + }; + }; + + autorestartServiceFailing.configuration = { + imports = [ autorestartService.configuration ]; + systemd.services.autorestart.serviceConfig = { + ExecStart = lib.mkForce "${pkgs.coreutils}/bin/false"; + }; + }; + + simpleServiceWithExtraSection.configuration = { + imports = [ simpleServiceNostop.configuration ]; + systemd.packages = [ (pkgs.writeTextFile { + name = "systemd-extra-section"; + destination = "/etc/systemd/system/test.service"; + text = '' + [X-Test] + X-Test-Value=a + ''; + }) ]; + }; + + simpleServiceWithExtraSectionOtherName.configuration = { + imports = [ simpleServiceNostop.configuration ]; + systemd.packages = [ (pkgs.writeTextFile { + name = "systemd-extra-section"; + destination = "/etc/systemd/system/test.service"; + text = '' + [X-Test2] + X-Test-Value=a + ''; + }) ]; + }; + + simpleServiceWithInstallSection.configuration = { + imports = [ simpleServiceNostop.configuration ]; + systemd.packages = [ (pkgs.writeTextFile { + name = "systemd-extra-section"; + destination = "/etc/systemd/system/test.service"; + text = '' + [Install] + WantedBy=multi-user.target + ''; + }) ]; + }; + + simpleServiceWithExtraKey.configuration = { + imports = [ simpleServiceNostop.configuration ]; + systemd.services.test.serviceConfig."X-Test" = "test"; + }; + + simpleServiceWithExtraKeyOtherValue.configuration = { + imports = [ simpleServiceNostop.configuration ]; + systemd.services.test.serviceConfig."X-Test" = "test2"; + }; + + simpleServiceWithExtraKeyOtherName.configuration = { + imports = [ simpleServiceNostop.configuration ]; + systemd.services.test.serviceConfig."X-Test2" = "test"; + }; + + simpleServiceReloadTrigger.configuration = { + imports = [ simpleServiceNostop.configuration ]; + systemd.services.test.reloadTriggers = [ "/dev/null" ]; + }; + + simpleServiceReloadTriggerModified.configuration = { + imports = [ simpleServiceNostop.configuration ]; + systemd.services.test.reloadTriggers = [ "/dev/zero" ]; + }; + + simpleServiceReloadTriggerModifiedAndSomethingElse.configuration = { + imports = [ simpleServiceNostop.configuration ]; + systemd.services.test = { + reloadTriggers = [ "/dev/zero" ]; + serviceConfig."X-Test" = "test"; + }; + }; + + simpleServiceReloadTriggerModifiedSomethingElse.configuration = { + imports = [ simpleServiceNostop.configuration ]; + systemd.services.test.serviceConfig."X-Test" = "test"; + }; + + unitWithBackslash.configuration = { + systemd.services."escaped\\x2ddash" = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + }; + + unitWithBackslashModified.configuration = { + imports = [ unitWithBackslash.configuration ]; + systemd.services."escaped\\x2ddash".serviceConfig.X-Test = "test"; + }; + + unitWithRequirement.configuration = { + systemd.services.required-service = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + systemd.services.test-service = { + wantedBy = [ "multi-user.target" ]; + requires = [ "required-service.service" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + }; + + unitWithRequirementModified.configuration = { + imports = [ unitWithRequirement.configuration ]; + systemd.services.required-service.serviceConfig.X-Test = "test"; + systemd.services.test-service.reloadTriggers = [ "test" ]; + }; + + unitWithRequirementModifiedNostart.configuration = { + imports = [ unitWithRequirement.configuration ]; + systemd.services.test-service.unitConfig.RefuseManualStart = true; + }; + restart-and-reload-by-activation-script.configuration = { systemd.services = rec { simple-service = { @@ -68,6 +270,17 @@ import ./make-test-python.nix ({ pkgs, ...} : { no-restart-service = simple-service // { restartIfChanged = false; }; + + reload-triggers = simple-service // { + wantedBy = [ "multi-user.target" ]; + }; + + reload-triggers-and-restart-by-as = simple-service; + + reload-triggers-and-restart = simple-service // { + stopIfChanged = false; # easier to check for this + wantedBy = [ "multi-user.target" ]; + }; }; system.activationScripts.restart-and-reload-test = { @@ -76,19 +289,67 @@ import ./make-test-python.nix ({ pkgs, ...} : { text = '' if [ "$NIXOS_ACTION" = dry-activate ]; then f=/run/nixos/dry-activation-restart-list + g=/run/nixos/dry-activation-reload-list else f=/run/nixos/activation-restart-list + g=/run/nixos/activation-reload-list fi cat <> "$f" simple-service.service simple-restart-service.service simple-reload-service.service no-restart-service.service + reload-triggers-and-restart-by-as.service + EOF + + cat <> "$g" + reload-triggers.service + reload-triggers-and-restart-by-as.service + reload-triggers-and-restart.service EOF ''; }; }; + restart-and-reload-by-activation-script-modified.configuration = { + imports = [ restart-and-reload-by-activation-script.configuration ]; + systemd.services.reload-triggers-and-restart.serviceConfig.X-Modified = "test"; + }; + + simple-socket.configuration = { + systemd.services.socket-activated = { + description = "A socket-activated service"; + stopIfChanged = lib.mkDefault false; + serviceConfig = { + ExecStart = socketTest; + ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + systemd.sockets.socket-activated = { + wantedBy = [ "sockets.target" ]; + listenStreams = [ "/run/test.sock" ]; + socketConfig.SocketMode = lib.mkDefault "0777"; + }; + }; + + simple-socket-service-modified.configuration = { + imports = [ simple-socket.configuration ]; + systemd.services.socket-activated.serviceConfig.X-Test = "test"; + }; + + simple-socket-stop-if-changed.configuration = { + imports = [ simple-socket.configuration ]; + systemd.services.socket-activated.stopIfChanged = true; + }; + + simple-socket-stop-if-changed-and-reloadtrigger.configuration = { + imports = [ simple-socket.configuration ]; + systemd.services.socket-activated = { + stopIfChanged = true; + reloadTriggers = [ "test" ]; + }; + }; + mount.configuration = { systemd.mounts = [ { @@ -133,6 +394,31 @@ import ./make-test-python.nix ({ pkgs, ...} : { systemd.timers.test-timer.timerConfig.OnCalendar = lib.mkForce "Fri 2012-11-23 16:00:00"; }; + hybridSleepModified.configuration = { + systemd.targets.hybrid-sleep.unitConfig.X-Test = true; + }; + + target.configuration = { + systemd.targets.test-target.wantedBy = [ "multi-user.target" ]; + # We use this service to figure out whether the target was modified. + # This is the only way because targets are filtered and therefore not + # printed when they are started/stopped. + systemd.services.test-service = { + bindsTo = [ "test-target.target" ]; + serviceConfig.ExecStart = "${pkgs.coreutils}/bin/sleep infinity"; + }; + }; + + targetModified.configuration = { + imports = [ target.configuration ]; + systemd.targets.test-target.unitConfig.X-Test = true; + }; + + targetModifiedStopOnReconfig.configuration = { + imports = [ target.configuration ]; + systemd.targets.test-target.unitConfig.X-StopOnReconfiguration = true; + }; + path.configuration = { systemd.paths.test-watch = { wantedBy = [ "paths.target" ]; @@ -141,6 +427,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { systemd.services.test-watch = { serviceConfig = { Type = "oneshot"; + RemainAfterExit = true; ExecStart = "${pkgs.coreutils}/bin/touch /testpath-modified"; }; }; @@ -189,12 +476,13 @@ import ./make-test-python.nix ({ pkgs, ...} : { exec env -i "$@" | tee /dev/stderr ''; in /* python */ '' - def switch_to_specialisation(system, name, action="test"): + def switch_to_specialisation(system, name, action="test", fail=False): if name == "": stc = f"{system}/bin/switch-to-configuration" else: stc = f"{system}/specialisation/{name}/bin/switch-to-configuration" - out = machine.succeed(f"{stc} {action} 2>&1") + out = machine.fail(f"{stc} {action} 2>&1") if fail \ + else machine.succeed(f"{stc} {action} 2>&1") assert_lacks(out, "switch-to-configuration line") # Perl warnings return out @@ -215,13 +503,38 @@ import ./make-test-python.nix ({ pkgs, ...} : { raise Exception(f"Unexpected string '{needle}' was found") + machine.wait_for_unit("multi-user.target") + machine.succeed( "${stderrRunner} ${originalSystem}/bin/switch-to-configuration test" ) + # This tests whether the /etc/os-release parser works which is a fallback + # when /etc/NIXOS is missing. If the parser does not work, switch-to-configuration + # would fail. + machine.succeed("rm /etc/NIXOS") machine.succeed( "${stderrRunner} ${otherSystem}/bin/switch-to-configuration test" ) + + with subtest("actions"): + # boot action + machine.fail("test -f /tmp/bootloader-installed") + out = switch_to_specialisation("${machine}", "simpleService", action="boot") + assert_contains(out, "installing dummy bootloader") + assert_lacks(out, "activating the configuration...") # good indicator of a system activation + machine.succeed("test -f /tmp/bootloader-installed") + machine.succeed("rm /tmp/bootloader-installed") + + # switch action + machine.fail("test -f /tmp/bootloader-installed") + out = switch_to_specialisation("${machine}", "", action="switch") + assert_contains(out, "installing dummy bootloader") + assert_contains(out, "activating the configuration...") # good indicator of a system activation + machine.succeed("test -f /tmp/bootloader-installed") + + # test and dry-activate actions are tested further down below + with subtest("services"): switch_to_specialisation("${machine}", "") # Nothing happens when nothing is changed @@ -232,17 +545,16 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Start a simple service out = switch_to_specialisation("${machine}", "simpleService") + assert_lacks(out, "installing dummy bootloader") # test does not install a bootloader assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") assert_contains(out, "reloading the following units: dbus.service\n") # huh assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_contains(out, "the following new units were started: test.service\n") - assert_lacks(out, "as well:") # Not changing anything doesn't do anything out = switch_to_specialisation("${machine}", "simpleService") @@ -252,7 +564,15 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") + + # Only changing the description does nothing + out = switch_to_specialisation("${machine}", "simpleServiceDifferentDescription") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") # Restart the simple service out = switch_to_specialisation("${machine}", "simpleServiceModified") @@ -262,7 +582,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_contains(out, "\nstarting the following units: test.service\n") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Restart the service with stopIfChanged=false out = switch_to_specialisation("${machine}", "simpleServiceNostop") @@ -272,7 +591,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "\nrestarting the following units: test.service\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Reload the service with reloadIfChanged=true out = switch_to_specialisation("${machine}", "simpleServiceReload") @@ -282,7 +600,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Nothing happens when restartIfChanged=false out = switch_to_specialisation("${machine}", "simpleServiceNorestart") @@ -292,7 +609,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # Dry mode shows different messages out = switch_to_specialisation("${machine}", "simpleService", action="dry-activate") @@ -302,34 +618,306 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") assert_contains(out, "would start the following units: test.service\n") + # Ensure \ works in unit names + out = switch_to_specialisation("${machine}", "unitWithBackslash") + assert_contains(out, "stopping the following units: test.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: escaped\\x2ddash.service\n") + + out = switch_to_specialisation("${machine}", "unitWithBackslashModified") + assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: escaped\\x2ddash.service\n") + assert_lacks(out, "the following new units were started:") + + # Ensure units that require changed units are properly reloaded + out = switch_to_specialisation("${machine}", "unitWithRequirement") + assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: required-service.service, test-service.service\n") + + out = switch_to_specialisation("${machine}", "unitWithRequirementModified") + assert_contains(out, "stopping the following units: required-service.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: required-service.service, test-service.service\n") + assert_lacks(out, "the following new units were started:") + + # Unless the unit asks to be not restarted + out = switch_to_specialisation("${machine}", "unitWithRequirementModifiedNostart") + assert_contains(out, "stopping the following units: required-service.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: required-service.service\n") + assert_lacks(out, "the following new units were started:") + + with subtest("failing units"): + # Let the simple service fail + switch_to_specialisation("${machine}", "simpleServiceModified") + out = switch_to_specialisation("${machine}", "simpleServiceFailing", fail=True) + assert_contains(out, "stopping the following units: test.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: test.service\n") + assert_lacks(out, "the following new units were started:") + assert_contains(out, "warning: the following units failed: test.service\n") + assert_contains(out, "Main PID:") # output of systemctl + + # A unit that gets into autorestart without failing is not treated as failed + out = switch_to_specialisation("${machine}", "autorestartService") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: autorestart.service\n") + machine.systemctl('stop autorestart.service') # cancel the 20y timer + + # Switching to the same system should do nothing (especially not treat the unit as failed) + out = switch_to_specialisation("${machine}", "autorestartService") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: autorestart.service\n") + machine.systemctl('stop autorestart.service') # cancel the 20y timer + + # If systemd thinks the unit has failed and is in autorestart, we should show it as failed + out = switch_to_specialisation("${machine}", "autorestartServiceFailing", fail=True) + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + assert_contains(out, "warning: the following units failed: autorestart.service\n") + assert_contains(out, "Main PID:") # output of systemctl + + with subtest("unit file parser"): + # Switch to a well-known state + switch_to_specialisation("${machine}", "simpleServiceNostop") + + # Add a section + out = switch_to_specialisation("${machine}", "simpleServiceWithExtraSection") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: test.service\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + # Rename it + out = switch_to_specialisation("${machine}", "simpleServiceWithExtraSectionOtherName") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: test.service\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + # Remove it + out = switch_to_specialisation("${machine}", "simpleServiceNostop") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: test.service\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + # [Install] section is ignored + out = switch_to_specialisation("${machine}", "simpleServiceWithInstallSection") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + # Add a key + out = switch_to_specialisation("${machine}", "simpleServiceWithExtraKey") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: test.service\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + # Change its value + out = switch_to_specialisation("${machine}", "simpleServiceWithExtraKeyOtherValue") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: test.service\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + # Rename it + out = switch_to_specialisation("${machine}", "simpleServiceWithExtraKeyOtherName") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: test.service\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + # Remove it + out = switch_to_specialisation("${machine}", "simpleServiceNostop") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: test.service\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + # Add a reload trigger + out = switch_to_specialisation("${machine}", "simpleServiceReloadTrigger") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_contains(out, "reloading the following units: test.service\n") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + # Modify the reload trigger + out = switch_to_specialisation("${machine}", "simpleServiceReloadTriggerModified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_contains(out, "reloading the following units: test.service\n") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + # Modify the reload trigger and something else + out = switch_to_specialisation("${machine}", "simpleServiceReloadTriggerModifiedAndSomethingElse") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: test.service\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + # Remove the reload trigger + out = switch_to_specialisation("${machine}", "simpleServiceReloadTriggerModifiedSomethingElse") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + with subtest("restart and reload by activation script"): + switch_to_specialisation("${machine}", "simpleServiceNorestart") out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script") assert_contains(out, "stopping the following units: test.service\n") assert_lacks(out, "NOT restarting the following changed units:") assert_lacks(out, "reloading the following units:") assert_lacks(out, "restarting the following units:") - assert_contains(out, "\nstarting the following units: no-restart-service.service, simple-reload-service.service, simple-restart-service.service, simple-service.service\n") - assert_lacks(out, "as well:") + assert_contains(out, "\nstarting the following units: no-restart-service.service, reload-triggers-and-restart-by-as.service, simple-reload-service.service, simple-restart-service.service, simple-service.service\n") + assert_contains(out, "the following new units were started: no-restart-service.service, reload-triggers-and-restart-by-as.service, reload-triggers-and-restart.service, reload-triggers.service, simple-reload-service.service, simple-restart-service.service, simple-service.service\n") # Switch to the same system where the example services get restarted - # by the activation script + # and reloaded by the activation script out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script") assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") - assert_contains(out, "reloading the following units: simple-reload-service.service\n") - assert_contains(out, "restarting the following units: simple-restart-service.service, simple-service.service\n") + assert_contains(out, "reloading the following units: reload-triggers-and-restart.service, reload-triggers.service, simple-reload-service.service\n") + assert_contains(out, "restarting the following units: reload-triggers-and-restart-by-as.service, simple-restart-service.service, simple-service.service\n") assert_lacks(out, "\nstarting the following units:") - assert_lacks(out, "as well:") + assert_lacks(out, "the following new units were started:") + # Switch to the same system and see if the service gets restarted when it's modified + # while the fact that it's supposed to be reloaded by the activation script is ignored. + out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script-modified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_contains(out, "reloading the following units: reload-triggers.service, simple-reload-service.service\n") + assert_contains(out, "restarting the following units: reload-triggers-and-restart-by-as.service, reload-triggers-and-restart.service, simple-restart-service.service, simple-service.service\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") # The same, but in dry mode out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script", action="dry-activate") assert_lacks(out, "would stop the following units:") assert_lacks(out, "would NOT stop the following changed units:") - assert_contains(out, "would reload the following units: simple-reload-service.service\n") - assert_contains(out, "would restart the following units: simple-restart-service.service, simple-service.service\n") + assert_contains(out, "would reload the following units: reload-triggers.service, simple-reload-service.service\n") + assert_contains(out, "would restart the following units: reload-triggers-and-restart-by-as.service, reload-triggers-and-restart.service, simple-restart-service.service, simple-service.service\n") assert_lacks(out, "\nwould start the following units:") - assert_lacks(out, "as well:") + + with subtest("socket-activated services"): + # Socket-activated services don't get started, just the socket + machine.fail("[ -S /run/test.sock ]") + out = switch_to_specialisation("${machine}", "simple-socket") + # assert_lacks(out, "stopping the following units:") not relevant + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: socket-activated.socket\n") + machine.succeed("[ -S /run/test.sock ]") + + # Changing a non-activated service does nothing + out = switch_to_specialisation("${machine}", "simple-socket-service-modified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + machine.succeed("[ -S /run/test.sock ]") + # The unit is properly activated when the socket is accessed + if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": + raise Exception("Socket was not properly activated") # idk how that would happen tbh + + # Changing an activated service with stopIfChanged=false restarts the service + out = switch_to_specialisation("${machine}", "simple-socket") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: socket-activated.service\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + machine.succeed("[ -S /run/test.sock ]") + # Socket-activation of the unit still works + if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": + raise Exception("Socket was not properly activated after the service was restarted") + + # Changing an activated service with stopIfChanged=true stops the service and + # socket and starts the socket + out = switch_to_specialisation("${machine}", "simple-socket-stop-if-changed") + assert_contains(out, "stopping the following units: socket-activated.service, socket-activated.socket\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_contains(out, "\nstarting the following units: socket-activated.socket\n") + assert_lacks(out, "the following new units were started:") + machine.succeed("[ -S /run/test.sock ]") + # Socket-activation of the unit still works + if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": + raise Exception("Socket was not properly activated after the service was restarted") + + # Changing a reload trigger of a socket-activated unit only reloads it + out = switch_to_specialisation("${machine}", "simple-socket-stop-if-changed-and-reloadtrigger") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_contains(out, "reloading the following units: socket-activated.service\n") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units: socket-activated.socket") + assert_lacks(out, "the following new units were started:") + machine.succeed("[ -S /run/test.sock ]") + # Socket-activation of the unit still works + if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": + raise Exception("Socket was not properly activated after the service was restarted") with subtest("mounts"): switch_to_specialisation("${machine}", "mount") @@ -342,7 +930,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # It changed out = machine.succeed("mount | grep 'on /testmount'") assert_contains(out, "size=10240k") @@ -353,15 +940,64 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_contains(out, "OnCalendar=2014-03-25 02:59:56 UTC") out = switch_to_specialisation("${machine}", "timerModified") assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following units:") assert_lacks(out, "reloading the following units:") - assert_contains(out, "restarting the following units: test-timer.timer\n") + assert_contains(out, "\nrestarting the following units: test-timer.timer\n") assert_lacks(out, "\nstarting the following units:") assert_lacks(out, "the following new units were started:") - assert_lacks(out, "as well:") # It changed out = machine.succeed("systemctl show test-timer.timer") assert_contains(out, "OnCalendar=Fri 2012-11-23 16:00:00") + with subtest("targets"): + # Modifying some special targets like hybrid-sleep.target does nothing + out = switch_to_specialisation("${machine}", "hybridSleepModified") + assert_contains(out, "stopping the following units: test-timer.timer\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + # Adding a new target starts it + out = switch_to_specialisation("${machine}", "target") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: test-target.target\n") + + # Changing a target doesn't print anything because the unit is filtered + machine.systemctl("start test-service.service") + out = switch_to_specialisation("${machine}", "targetModified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + machine.succeed("systemctl is-active test-service.service") # target was not restarted + + # With X-StopOnReconfiguration, the target gets stopped and started + out = switch_to_specialisation("${machine}", "targetModifiedStopOnReconfig") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + machine.fail("systemctl is-active test-service.servce") # target was restarted + + # Remove the target by switching to the old specialisation + out = switch_to_specialisation("${machine}", "timerModified") + assert_contains(out, "stopping the following units: test-target.target\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: test-timer.timer\n") + with subtest("paths"): out = switch_to_specialisation("${machine}", "path") assert_contains(out, "stopping the following units: test-timer.timer\n") @@ -369,14 +1005,14 @@ import ./make-test-python.nix ({ pkgs, ...} : { assert_lacks(out, "reloading the following units:") assert_lacks(out, "\nrestarting the following units:") assert_lacks(out, "\nstarting the following units:") - assert_contains(out, "the following new units were started: test-watch.path") - assert_lacks(out, "as well:") + assert_contains(out, "the following new units were started: test-watch.path\n") machine.fail("test -f /testpath-modified") # touch the file, unit should be triggered machine.succeed("touch /testpath") machine.wait_until_succeeds("test -f /testpath-modified") machine.succeed("rm /testpath /testpath-modified") + machine.systemctl("stop test-watch.service") switch_to_specialisation("${machine}", "pathModified") machine.succeed("touch /testpath") machine.fail("test -f /testpath-modified") @@ -391,8 +1027,21 @@ import ./make-test-python.nix ({ pkgs, ...} : { with subtest("slices"): machine.succeed("echo 0 > /proc/sys/vm/panic_on_oom") # allow OOMing out = switch_to_specialisation("${machine}", "slice") + # assert_lacks(out, "stopping the following units:") not relevant + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") machine.fail("systemctl start testservice.service") + out = switch_to_specialisation("${machine}", "sliceModified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") machine.succeed("systemctl start testservice.service") machine.succeed("echo 1 > /proc/sys/vm/panic_on_oom") # disallow OOMing ''; diff --git a/nixos/tests/systemd-confinement.nix b/nixos/tests/systemd-confinement.nix index 8fafb11e1e8c..3181af309a6e 100644 --- a/nixos/tests/systemd-confinement.nix +++ b/nixos/tests/systemd-confinement.nix @@ -17,15 +17,19 @@ import ./make-test-python.nix { exit "''${ret:-1}" ''; - mkTestStep = num: { config ? {}, testScript }: { - systemd.sockets."test${toString num}" = { + mkTestStep = num: { + testScript, + config ? {}, + serviceName ? "test${toString num}", + }: { + systemd.sockets.${serviceName} = { description = "Socket for Test Service ${toString num}"; wantedBy = [ "sockets.target" ]; socketConfig.ListenStream = "/run/test${toString num}.sock"; socketConfig.Accept = true; }; - systemd.services."test${toString num}@" = { + systemd.services."${serviceName}@" = { description = "Confined Test Service ${toString num}"; confinement = (config.confinement or {}) // { enable = true; }; serviceConfig = (config.serviceConfig or {}) // { @@ -135,6 +139,16 @@ import ./make-test-python.nix { machine.succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" = eek') ''; } + { serviceName = "shipped-unitfile"; + config.confinement.mode = "chroot-only"; + testScript = '' + with subtest("check if shipped unit file still works"): + machine.succeed( + 'chroot-exec \'kill -9 $$ 2>&1 || :\' | ' + 'grep -q "Too many levels of symbolic links"' + ) + ''; + } ]; options.__testSteps = lib.mkOption { @@ -143,6 +157,15 @@ import ./make-test-python.nix { }; config.environment.systemPackages = lib.singleton testClient; + config.systemd.packages = lib.singleton (pkgs.writeTextFile { + name = "shipped-unitfile"; + destination = "/etc/systemd/system/shipped-unitfile@.service"; + text = '' + [Service] + SystemCallFilter=~kill + SystemCallErrorNumber=ELOOP + ''; + }); config.users.groups.chroot-testgroup = {}; config.users.users.chroot-testuser = { diff --git a/nixos/tests/systemd-escaping.nix b/nixos/tests/systemd-escaping.nix new file mode 100644 index 000000000000..7f93eb5e4f70 --- /dev/null +++ b/nixos/tests/systemd-escaping.nix @@ -0,0 +1,45 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +let + echoAll = pkgs.writeScript "echo-all" '' + #! ${pkgs.runtimeShell} + for s in "$@"; do + printf '%s\n' "$s" + done + ''; + # deliberately using a local empty file instead of pkgs.emptyFile to have + # a non-store path in the test + args = [ "a%Nything" "lang=\${LANG}" ";" "/bin/sh -c date" ./empty-file 4.2 23 ]; +in +{ + name = "systemd-escaping"; + + machine = { pkgs, lib, utils, ... }: { + systemd.services.echo = + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ [] ])).success; + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ {} ])).success; + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ null ])).success; + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ false ])).success; + assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ (_:_) ])).success; + { description = "Echo to the journal"; + serviceConfig.Type = "oneshot"; + serviceConfig.ExecStart = '' + ${echoAll} ${utils.escapeSystemdExecArgs args} + ''; + }; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.succeed("systemctl start echo.service") + # skip the first 'Starting ...' line + logs = machine.succeed("journalctl -u echo.service -o cat").splitlines()[1:] + assert "a%Nything" == logs[0] + assert "lang=''${LANG}" == logs[1] + assert ";" == logs[2] + assert "/bin/sh -c date" == logs[3] + assert "/nix/store/ij3gw72f4n5z4dz6nnzl1731p9kmjbwr-empty-file" == logs[4] + assert "4.2" in logs[5] # toString produces extra fractional digits! + assert "23" == logs[6] + ''; +}) diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix new file mode 100644 index 000000000000..4fc5864357c0 --- /dev/null +++ b/nixos/tests/systemd-machinectl.nix @@ -0,0 +1,85 @@ +import ./make-test-python.nix ( + let + + container = { + # We re-use the NixOS container option ... + boot.isContainer = true; + # ... and revert unwanted defaults + networking.useHostResolvConf = false; + + # use networkd to obtain systemd network setup + networking.useNetworkd = true; + networking.useDHCP = false; + + # systemd-nspawn expects /sbin/init + boot.loader.initScript.enable = true; + + imports = [ ../modules/profiles/minimal.nix ]; + }; + + containerSystem = (import ../lib/eval-config.nix { + modules = [ container ]; + }).config.system.build.toplevel; + + containerName = "container"; + containerRoot = "/var/lib/machines/${containerName}"; + + in + { + name = "systemd-machinectl"; + + machine = { lib, ... }: { + # use networkd to obtain systemd network setup + networking.useNetworkd = true; + networking.useDHCP = false; + services.resolved.enable = false; + + # open DHCP server on interface to container + networking.firewall.trustedInterfaces = [ "ve-+" ]; + + # do not try to access cache.nixos.org + nix.settings.substituters = lib.mkForce [ ]; + + virtualisation.additionalPaths = [ containerSystem ]; + }; + + testScript = '' + start_all() + machine.wait_for_unit("default.target"); + + # Install container + machine.succeed("mkdir -p ${containerRoot}"); + # Workaround for nixos-install + machine.succeed("chmod o+rx /var/lib/machines"); + machine.succeed("nixos-install --root ${containerRoot} --system ${containerSystem} --no-channel-copy --no-root-passwd"); + + # Allow systemd-nspawn to apply user namespace on immutable files + machine.succeed("chattr -i ${containerRoot}/var/empty"); + + # Test machinectl start + machine.succeed("machinectl start ${containerName}"); + machine.wait_until_succeeds("systemctl -M ${containerName} is-active default.target"); + + # Test systemd-nspawn network configuration + machine.succeed("ping -n -c 1 ${containerName}"); + + # Test systemd-nspawn uses a user namespace + machine.succeed("test `stat ${containerRoot}/var/empty -c %u%g` != 00"); + + # Test systemd-nspawn reboot + machine.succeed("machinectl shell ${containerName} /run/current-system/sw/bin/reboot"); + machine.wait_until_succeeds("systemctl -M ${containerName} is-active default.target"); + + # Test machinectl reboot + machine.succeed("machinectl reboot ${containerName}"); + machine.wait_until_succeeds("systemctl -M ${containerName} is-active default.target"); + + # Test machinectl stop + machine.succeed("machinectl stop ${containerName}"); + + # Show to to delete the container + machine.succeed("chattr -i ${containerRoot}/var/empty"); + machine.succeed("rm -rf ${containerRoot}"); + ''; + } +) diff --git a/nixos/tests/systemd-unit-path.nix b/nixos/tests/systemd-misc.nix similarity index 74% rename from nixos/tests/systemd-unit-path.nix rename to nixos/tests/systemd-misc.nix index 5998a187188a..e416baa8b5f5 100644 --- a/nixos/tests/systemd-unit-path.nix +++ b/nixos/tests/systemd-misc.nix @@ -29,10 +29,23 @@ let }; in { - name = "systemd-unit-path"; + name = "systemd-misc"; machine = { pkgs, lib, ... }: { boot.extraSystemdUnitPaths = [ "/etc/systemd-rw/system" ]; + + users.users.limited = { + isNormalUser = true; + uid = 1000; + }; + + systemd.units."user-1000.slice.d/limits.conf" = { + text = '' + [Slice] + TasksAccounting=yes + TasksMax=100 + ''; + }; }; testScript = '' @@ -43,5 +56,7 @@ in ) machine.succeed("systemctl start example.service") machine.succeed("systemctl status example.service | grep 'Active: active'") + + machine.succeed("systemctl show --property TasksMax --value user-1000.slice | grep 100") ''; }) diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index 68836c730729..37a89fc21e44 100644 --- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -36,19 +36,10 @@ import ./make-test-python.nix ({pkgs, ...}: { }; # Since we want to program the routes that we delegate to the "customer" - # into our routing table we must have a way to gain the required privs. - # This security wrapper will do in our test setup. - # - # DO NOT COPY THIS TO PRODUCTION AS IS. Think about it at least twice. - # Everyone on the "isp" machine will be able to add routes to the kernel. - security.wrappers.add-dhcpd-lease = { - owner = "root"; - group = "root"; - source = pkgs.writeShellScript "add-dhcpd-lease" '' - exec ${pkgs.iproute2}/bin/ip -6 route replace "$1" via "$2" - ''; - capabilities = "cap_net_admin+ep"; - }; + # into our routing table we must give dhcpd the required privs. + systemd.services.dhcpd6.serviceConfig.AmbientCapabilities = + [ "CAP_NET_ADMIN" ]; + services = { # Configure the DHCPv6 server # @@ -80,7 +71,7 @@ import ./make-test-python.nix ({pkgs, ...}: { set Prefix = pick-first-value(binary-to-ascii(16, 16, ":", suffix(option dhcp6.ia-pd, 16)), "n/a"); set PrefixLength = pick-first-value(binary-to-ascii(10, 8, ":", substring(suffix(option dhcp6.ia-pd, 17), 0, 1)), "n/a"); log(concat(IP, " ", Prefix, " ", PrefixLength)); - execute("/run/wrappers/bin/add-dhcpd-lease", concat(Prefix,"/",PrefixLength), IP); + execute("${pkgs.iproute2}/bin/ip", "-6", "route", "replace", concat(Prefix,"/",PrefixLength), "via", IP); } ''; }; diff --git a/nixos/tests/teeworlds.nix b/nixos/tests/teeworlds.nix index 17e9eeb869b0..ac2c996955c8 100644 --- a/nixos/tests/teeworlds.nix +++ b/nixos/tests/teeworlds.nix @@ -36,12 +36,12 @@ in { client1.wait_for_x() client2.wait_for_x() - client1.execute("teeworlds 'player_name Alice;connect server'&") + client1.execute("teeworlds 'player_name Alice;connect server' >&2 &") server.wait_until_succeeds( 'journalctl -u teeworlds -e | grep --extended-regexp -q "team_join player=\'[0-9]:Alice"' ) - client2.execute("teeworlds 'player_name Bob;connect server'&") + client2.execute("teeworlds 'player_name Bob;connect server' >&2 &") server.wait_until_succeeds( 'journalctl -u teeworlds -e | grep --extended-regexp -q "team_join player=\'[0-9]:Bob"' ) diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix new file mode 100644 index 000000000000..6ea0f1c18725 --- /dev/null +++ b/nixos/tests/terminal-emulators.nix @@ -0,0 +1,207 @@ +# Terminal emulators all present a pretty similar interface. +# That gives us an opportunity to easily test their basic functionality with a single codebase. +# +# There are two tests run on each terminal emulator +# - can it successfully execute a command passed on the cmdline? +# - can it successfully display a colour? +# the latter is used as a proxy for "can it display text?", without going through all the intricacies of OCR. +# +# 256-colour terminal mode is used to display the test colour, since it has a universally-applicable palette (unlike 8- and 16- colour, where the colours are implementation-defined), and it is widely supported (unlike 24-bit colour). +# +# Future work: +# - Wayland support (both for testing the existing terminals, and for testing wayland-only terminals like foot and havoc) +# - Test keyboard input? (skipped for now, to eliminate the possibility of race conditions and focus issues) + +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let tests = { + alacritty.pkg = p: p.alacritty; + + contour.pkg = p: p.contour; + contour.cmd = "contour $command"; + + cool-retro-term.pkg = p: p.cool-retro-term; + cool-retro-term.colourTest = false; # broken by gloss effect + + ctx.pkg = p: p.ctx; + ctx.pinkValue = "#FE0065"; + + darktile.pkg = p: p.darktile; + + eterm.pkg = p: p.eterm; + eterm.executable = "Eterm"; + eterm.pinkValue = "#D40055"; + + germinal.pkg = p: p.germinal; + + gnome-terminal.pkg = p: p.gnome.gnome-terminal; + + guake.pkg = p: p.guake; + guake.cmd = "SHELL=$command guake --show"; + guake.kill = true; + + hyper.pkg = p: p.hyper; + + kermit.pkg = p: p.kermit-terminal; + + kgx.pkg = p: p.kgx; + kgx.cmd = "kgx -e $command"; + kgx.kill = true; + + kitty.pkg = p: p.kitty; + kitty.cmd = "kitty $command"; + + konsole.pkg = p: p.plasma5Packages.konsole; + + lxterminal.pkg = p: p.lxterminal; + + mate-terminal.pkg = p: p.mate.mate-terminal; + mate-terminal.cmd = "SHELL=$command mate-terminal --disable-factory"; # factory mode uses dbus, and we don't have a proper dbus session set up + + mlterm.pkg = p: p.mlterm; + + mrxvt.pkg = p: p.mrxvt; + + qterminal.pkg = p: p.lxqt.qterminal; + qterminal.kill = true; + + roxterm.pkg = p: p.roxterm; + roxterm.cmd = "roxterm -e $command"; + + sakura.pkg = p: p.sakura; + + st.pkg = p: p.st; + st.kill = true; + + stupidterm.pkg = p: p.stupidterm; + stupidterm.cmd = "stupidterm -- $command"; + + terminator.pkg = p: p.terminator; + terminator.cmd = "terminator -e $command"; + + terminology.pkg = p: p.enlightenment.terminology; + terminology.cmd = "SHELL=$command terminology --no-wizard=true"; + terminology.colourTest = false; # broken by gloss effect + + termite.pkg = p: p.termite; + + termonad.pkg = p: p.termonad; + + tilda.pkg = p: p.tilda; + + tilix.pkg = p: p.tilix; + tilix.cmd = "tilix -e $command"; + + urxvt.pkg = p: p.rxvt-unicode; + + wayst.pkg = p: p.wayst; + wayst.pinkValue = "#FF0066"; + + wezterm.pkg = p: p.wezterm; + + xfce4-terminal.pkg = p: p.xfce.xfce4-terminal; + + xterm.pkg = p: p.xterm; + }; +in mapAttrs (name: { pkg, executable ? name, cmd ? "SHELL=$command ${executable}", colourTest ? true, pinkValue ? "#FF0087", kill ? false }: makeTest +{ + name = "terminal-emulator-${name}"; + meta = with pkgs.lib.maintainers; { + maintainers = [ jjjollyjim ]; + }; + + machine = { pkgsInner, ... }: + + { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + + # Hyper (and any other electron-based terminals) won't run as root + test-support.displayManager.auto.user = "alice"; + + environment.systemPackages = [ + (pkg pkgs) + (pkgs.writeShellScriptBin "report-success" '' + echo 1 > /tmp/term-ran-successfully + ${optionalString kill "pkill ${executable}"} + '') + (pkgs.writeShellScriptBin "display-colour" '' + # A 256-colour background colour code for pink, then spaces. + # + # Background is used rather than foreground to minimize the effect of anti-aliasing. + # + # Keep adding more in case the window is partially offscreen to the left or requires + # a change to correctly redraw after initialising the window (as with ctx). + + while : + do + echo -ne "\e[48;5;198m " + sleep 0.5 + done + sleep infinity + '') + (pkgs.writeShellScriptBin "run-in-this-term" "sudo -u alice run-in-this-term-wrapped $1") + + (pkgs.writeShellScriptBin "run-in-this-term-wrapped" "command=\"$(which \"$1\")\"; ${cmd}") + ]; + + # Helpful reminder to add this test to passthru.tests + warnings = if !((pkg pkgs) ? "passthru" && (pkg pkgs).passthru ? "tests") then [ "The package for ${name} doesn't have a passthru.tests" ] else [ ]; + }; + + # We need imagemagick, though not tesseract + enableOCR = true; + + testScript = { nodes, ... }: let + in '' + with subtest("wait for x"): + start_all() + machine.wait_for_x() + + with subtest("have the terminal run a command"): + # We run this command synchronously, so we can be certain the exit codes are happy + machine.${if kill then "execute" else "succeed"}("run-in-this-term report-success") + machine.wait_for_file("/tmp/term-ran-successfully") + ${optionalString colourTest '' + + import tempfile + import subprocess + + + def check_for_pink(final=False) -> bool: + with tempfile.NamedTemporaryFile() as tmpin: + machine.send_monitor_command("screendump {}".format(tmpin.name)) + + cmd = 'convert {} -define histogram:unique-colors=true -format "%c" histogram:info:'.format( + tmpin.name + ) + ret = subprocess.run(cmd, shell=True, capture_output=True) + if ret.returncode != 0: + raise Exception( + "image analysis failed with exit code {}".format(ret.returncode) + ) + + text = ret.stdout.decode("utf-8") + return "${pinkValue}" in text + + + with subtest("ensuring no pink is present without the terminal"): + assert ( + check_for_pink() == False + ), "Pink was present on the screen before we even launched a terminal!" + + with subtest("have the terminal display a colour"): + # We run this command in the background + machine.shell.send(b"(run-in-this-term display-colour |& systemd-cat -t terminal) &\n") + + with machine.nested("Waiting for the screen to have pink on it:"): + retry(check_for_pink) + ''}''; +} + + ) tests diff --git a/nixos/tests/tinywl.nix b/nixos/tests/tinywl.nix index b286cab77945..8fb87b533306 100644 --- a/nixos/tests/tinywl.nix +++ b/nixos/tests/tinywl.nix @@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: # Automatically login on tty1 as a normal user: imports = [ ./common/user-account.nix ]; services.getty.autologinUser = "alice"; + security.polkit.enable = true; environment = { systemPackages = with pkgs; [ tinywl foot wayland-utils ]; diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix new file mode 100644 index 000000000000..e383f224e3d1 --- /dev/null +++ b/nixos/tests/tomcat.nix @@ -0,0 +1,21 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +{ + name = "tomcat"; + + machine = { pkgs, ... }: { + services.tomcat.enable = true; + }; + + testScript = '' + machine.wait_for_unit("tomcat.service") + machine.wait_for_open_port(8080) + machine.wait_for_file("/var/tomcat/webapps/examples"); + machine.succeed( + "curl --fail http://localhost:8080/examples/servlets/servlet/HelloWorldExample | grep 'Hello World!'" + ) + machine.succeed( + "curl --fail http://localhost:8080/examples/jsp/jsp2/simpletag/hello.jsp | grep 'Hello, world!'" + ) + ''; +}) diff --git a/nixos/tests/tor.nix b/nixos/tests/tor.nix index c061f59226cf..71ec9df4641f 100644 --- a/nixos/tests/tor.nix +++ b/nixos/tests/tor.nix @@ -1,24 +1,19 @@ import ./make-test-python.nix ({ lib, ... }: with lib; -rec { +{ name = "tor"; meta.maintainers = with maintainers; [ joachifm ]; - common = - { ... }: - { boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ]; - networking.firewall.enable = false; - networking.useDHCP = false; - }; + nodes.client = { pkgs, ... }: { + boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ]; + networking.firewall.enable = false; + networking.useDHCP = false; - nodes.client = - { pkgs, ... }: - { imports = [ common ]; - environment.systemPackages = with pkgs; [ netcat ]; - services.tor.enable = true; - services.tor.client.enable = true; - services.tor.settings.ControlPort = 9051; - }; + environment.systemPackages = with pkgs; [ netcat ]; + services.tor.enable = true; + services.tor.client.enable = true; + services.tor.settings.ControlPort = 9051; + }; testScript = '' client.wait_for_unit("tor.service") diff --git a/nixos/tests/unifi.nix b/nixos/tests/unifi.nix index 34284811abfb..9dc7e5d04bd5 100644 --- a/nixos/tests/unifi.nix +++ b/nixos/tests/unifi.nix @@ -12,7 +12,7 @@ let makeAppTest = unifi: makeTest { name = "unifi-controller-${unifi.version}"; meta = with pkgs.lib.maintainers; { - maintainers = [ zhaofengli ]; + maintainers = [ patryk27 zhaofengli ]; }; nodes.server = { @@ -32,4 +32,5 @@ in with pkgs; { unifiLTS = makeAppTest unifiLTS; unifi5 = makeAppTest unifi5; unifi6 = makeAppTest unifi6; + unifi7 = makeAppTest unifi7; } diff --git a/nixos/tests/vscodium.nix b/nixos/tests/vscodium.nix index 66baea73ec62..688ddfe07e3e 100644 --- a/nixos/tests/vscodium.nix +++ b/nixos/tests/vscodium.nix @@ -3,11 +3,10 @@ let wayland = { pkgs, ... }: { imports = [ ./common/wayland-cage.nix ]; - services.cage.program = '' - ${pkgs.vscodium}/bin/codium \ - --enable-features=UseOzonePlatform \ - --ozone-platform=wayland - ''; + services.cage.program = "${pkgs.vscodium}/bin/codium"; + + environment.variables.NIXOS_OZONE_WL = "1"; + environment.variables.DISPLAY = "do not use"; fonts.fonts = with pkgs; [ dejavu_fonts ]; }; diff --git a/nixos/tests/vsftpd.nix b/nixos/tests/vsftpd.nix new file mode 100644 index 000000000000..4bea27f0eb10 --- /dev/null +++ b/nixos/tests/vsftpd.nix @@ -0,0 +1,42 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "vsftpd"; + + nodes = { + server = { + services.vsftpd = { + enable = true; + userlistDeny = false; + localUsers = true; + userlist = [ "ftp-test-user" ]; + writeEnable = true; + localRoot = "/tmp"; + }; + networking.firewall.enable = false; + + users = { + users.ftp-test-user = { + isSystemUser = true; + password = "ftp-test-password"; + group = "ftp-test-group"; + }; + groups.ftp-test-group = {}; + }; + }; + + client = {}; + }; + + testScript = '' + client.start() + server.wait_for_unit("vsftpd") + server.wait_for_open_port("21") + + client.succeed("curl -u ftp-test-user:ftp-test-password ftp://server") + client.succeed('echo "this is a test" > /tmp/test.file.up') + client.succeed("curl -v -T /tmp/test.file.up -u ftp-test-user:ftp-test-password ftp://server") + client.succeed("curl -u ftp-test-user:ftp-test-password ftp://server/test.file.up > /tmp/test.file.down") + client.succeed("diff /tmp/test.file.up /tmp/test.file.down") + assert client.succeed("cat /tmp/test.file.up") == server.succeed("cat /tmp/test.file.up") + assert client.succeed("cat /tmp/test.file.down") == server.succeed("cat /tmp/test.file.up") + ''; +}) diff --git a/nixos/tests/web-apps/mastodon.nix b/nixos/tests/web-apps/mastodon.nix new file mode 100644 index 000000000000..279a1c59169f --- /dev/null +++ b/nixos/tests/web-apps/mastodon.nix @@ -0,0 +1,170 @@ +import ../make-test-python.nix ({pkgs, ...}: +let + test-certificates = pkgs.runCommandLocal "test-certificates" { } '' + mkdir -p $out + echo insecure-root-password > $out/root-password-file + echo insecure-intermediate-password > $out/intermediate-password-file + ${pkgs.step-cli}/bin/step certificate create "Example Root CA" $out/root_ca.crt $out/root_ca.key --password-file=$out/root-password-file --profile root-ca + ${pkgs.step-cli}/bin/step certificate create "Example Intermediate CA 1" $out/intermediate_ca.crt $out/intermediate_ca.key --password-file=$out/intermediate-password-file --ca-password-file=$out/root-password-file --profile intermediate-ca --ca $out/root_ca.crt --ca-key $out/root_ca.key + ''; + + hosts = '' + 192.168.2.10 ca.local + 192.168.2.11 mastodon.local + ''; + +in +{ + name = "mastodon"; + meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin ]; + + nodes = { + ca = { pkgs, ... }: { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.10"; prefixLength = 24; } + ]; + }; + extraHosts = hosts; + }; + services.step-ca = { + enable = true; + address = "0.0.0.0"; + port = 8443; + openFirewall = true; + intermediatePasswordFile = "${test-certificates}/intermediate-password-file"; + settings = { + dnsNames = [ "ca.local" ]; + root = "${test-certificates}/root_ca.crt"; + crt = "${test-certificates}/intermediate_ca.crt"; + key = "${test-certificates}/intermediate_ca.key"; + db = { + type = "badger"; + dataSource = "/var/lib/step-ca/db"; + }; + authority = { + provisioners = [ + { + type = "ACME"; + name = "acme"; + } + ]; + }; + }; + }; + }; + + server = { pkgs, ... }: { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.11"; prefixLength = 24; } + ]; + }; + extraHosts = hosts; + firewall.allowedTCPPorts = [ 80 443 ]; + }; + + security = { + acme = { + acceptTerms = true; + defaults.server = "https://ca.local:8443/acme/acme/directory"; + defaults.email = "mastodon@mastodon.local"; + }; + pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ]; + }; + + services.redis.servers.mastodon = { + enable = true; + bind = "127.0.0.1"; + port = 31637; + }; + + services.mastodon = { + enable = true; + configureNginx = true; + localDomain = "mastodon.local"; + enableUnixSocket = false; + redis = { + createLocally = true; + host = "127.0.0.1"; + port = 31637; + }; + database = { + createLocally = true; + host = "/run/postgresql"; + port = 5432; + }; + smtp = { + createLocally = false; + fromAddress = "mastodon@mastodon.local"; + }; + extraConfig = { + EMAIL_DOMAIN_ALLOWLIST = "example.com"; + }; + }; + }; + + client = { pkgs, ... }: { + environment.systemPackages = [ pkgs.jq ]; + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.12"; prefixLength = 24; } + ]; + }; + extraHosts = hosts; + }; + + security = { + pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ]; + }; + }; + }; + + testScript = '' + start_all() + + ca.wait_for_unit("step-ca.service") + ca.wait_for_open_port(8443) + + server.wait_for_unit("nginx.service") + server.wait_for_unit("redis-mastodon.service") + server.wait_for_unit("postgresql.service") + server.wait_for_unit("mastodon-sidekiq.service") + server.wait_for_unit("mastodon-streaming.service") + server.wait_for_unit("mastodon-web.service") + server.wait_for_open_port(55000) + server.wait_for_open_port(55001) + + # Check Mastodon version from remote client + client.succeed("curl --fail https://mastodon.local/api/v1/instance | jq -r '.version' | grep '${pkgs.mastodon.version}'") + + # Check using admin CLI + # Check Mastodon version + server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl version' | grep '${pkgs.mastodon.version}'") + + # Manage accounts + server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl email_domain_blocks add example.com'") + server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl email_domain_blocks list' | grep 'example.com'") + server.fail("su - mastodon -s /bin/sh -c 'mastodon-env tootctl email_domain_blocks list' | grep 'mastodon.local'") + server.fail("su - mastodon -s /bin/sh -c 'mastodon-env tootctl accounts create alice --email=alice@example.com'") + server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl email_domain_blocks remove example.com'") + server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl accounts create bob --email=bob@example.com'") + server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl accounts approve bob'") + server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl accounts delete bob'") + + # Manage IP access + server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl ip_blocks add 192.168.0.0/16 --severity=no_access'") + server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl ip_blocks export' | grep '192.168.0.0/16'") + server.fail("su - mastodon -s /bin/sh -c 'mastodon-env tootctl p_blocks export' | grep '172.16.0.0/16'") + client.fail("curl --fail https://mastodon.local/about") + server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl ip_blocks remove 192.168.0.0/16'") + client.succeed("curl --fail https://mastodon.local/about") + + ca.shutdown() + server.shutdown() + client.shutdown() + ''; +}) diff --git a/nixos/tests/web-apps/peertube.nix b/nixos/tests/web-apps/peertube.nix index 38b31f6c3325..706c598338e8 100644 --- a/nixos/tests/web-apps/peertube.nix +++ b/nixos/tests/web-apps/peertube.nix @@ -120,6 +120,9 @@ import ../make-test-python.nix ({pkgs, ...}: # Check if PeerTube is running client.succeed("curl --fail http://peertube.local:9000/api/v1/config/about | jq -r '.instance.name' | grep 'PeerTube\ Test\ Server'") + # Check PeerTube CLI version + assert "${pkgs.peertube.version}" in server.succeed('su - peertube -s /bin/sh -c "peertube --version"') + client.shutdown() server.shutdown() database.shutdown() diff --git a/nixos/tests/web-servers/agate.nix b/nixos/tests/web-servers/agate.nix new file mode 100644 index 000000000000..e364e134cfda --- /dev/null +++ b/nixos/tests/web-servers/agate.nix @@ -0,0 +1,29 @@ +import ../make-test-python.nix ( + { pkgs, lib, ... }: + { + name = "agate"; + meta = with lib.maintainers; { maintainers = [ jk ]; }; + + nodes = { + geminiserver = { pkgs, ... }: { + services.agate = { + enable = true; + hostnames = [ "localhost" ]; + contentDir = pkgs.writeTextDir "index.gmi" '' + # Hello NixOS! + ''; + }; + }; + }; + + testScript = { nodes, ... }: '' + geminiserver.wait_for_unit("agate") + geminiserver.wait_for_open_port(1965) + + with subtest("check is serving over gemini"): + response = geminiserver.succeed("${pkgs.gmni}/bin/gmni -j once -i -N gemini://localhost:1965") + print(response) + assert "Hello NixOS!" in response + ''; + } +) diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix index 18ad759b5515..8135cb90a591 100644 --- a/nixos/tests/wine.nix +++ b/nixos/tests/wine.nix @@ -3,7 +3,7 @@ }: let - inherit (pkgs.lib) concatMapStrings listToAttrs; + inherit (pkgs.lib) concatMapStrings listToAttrs optionals optionalString; inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; hello32 = "${pkgs.pkgsCross.mingw32.hello}/bin/hello.exe"; @@ -17,7 +17,7 @@ let machine = { pkgs, ... }: { environment.systemPackages = [ pkgs."${packageSet}"."${variant}" ]; - virtualisation.diskSize = "800"; + virtualisation.diskSize = 800; }; testScript = '' @@ -27,6 +27,9 @@ let "bash -c 'wine ${exe} 2> >(tee wine-stderr >&2)'" ) assert 'Hello, world!' in greeting + '' + # only the full version contains Gecko, but the error is not printed reliably in other variants + + optionalString (variant == "full") '' machine.fail( "fgrep 'Could not find Wine Gecko. HTML rendering will be disabled.' wine-stderr" ) @@ -37,5 +40,9 @@ let variants = [ "base" "full" "minimal" "staging" "unstable" "wayland" ]; -in listToAttrs (map (makeWineTest "winePackages" [ hello32 ]) variants - ++ map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants) +in +listToAttrs ( + map (makeWineTest "winePackages" [ hello32 ]) variants + ++ optionals pkgs.stdenv.is64bit + (map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants) +) diff --git a/nixos/tests/without-nix.nix b/nixos/tests/without-nix.nix index 2fc00b04144f..b21e9f2844f5 100644 --- a/nixos/tests/without-nix.nix +++ b/nixos/tests/without-nix.nix @@ -4,14 +4,23 @@ import ./make-test-python.nix ({ lib, ... }: { maintainers = [ ericson2314 ]; }; - nixpkgs.overlays = [ - (self: super: { - nix = throw "don't want to use this"; - }) - ]; - nodes.machine = { ... }: { nix.enable = false; + nixpkgs.overlays = [ + (self: super: { + nix = throw "don't want to use pkgs.nix"; + nixVersions = lib.mapAttrs (k: throw "don't want to use pkgs.nixVersions.${k}") super.nixVersions; + # aliases, some deprecated + nix_2_3 = throw "don't want to use pkgs.nix_2_3"; + nix_2_4 = throw "don't want to use pkgs.nix_2_4"; + nix_2_5 = throw "don't want to use pkgs.nix_2_5"; + nix_2_6 = throw "don't want to use pkgs.nix_2_6"; + nixFlakes = throw "don't want to use pkgs.nixFlakes"; + nixStable = throw "don't want to use pkgs.nixStable"; + nixUnstable = throw "don't want to use pkgs.nixUnstable"; + nixStatic = throw "don't want to use pkgs.nixStatic"; + }) + ]; }; testScript = '' diff --git a/nixos/tests/wpa_supplicant.nix b/nixos/tests/wpa_supplicant.nix index 1d669d5016a7..40d934b8e1db 100644 --- a/nixos/tests/wpa_supplicant.nix +++ b/nixos/tests/wpa_supplicant.nix @@ -27,8 +27,19 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: enable = lib.mkOverride 0 true; userControlled.enable = true; interfaces = [ "wlan1" ]; + fallbackToWPA2 = true; networks = { + # test WPA2 fallback + mixed-wpa = { + psk = "password"; + authProtocols = [ "WPA-PSK" "SAE" ]; + }; + sae-only = { + psk = "password"; + authProtocols = [ "SAE" ]; + }; + # test network nixos-test.psk = "@PSK_NIXOS_TEST@"; @@ -64,8 +75,12 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: machine.succeed(f"grep -q @PSK_MISSING@ {config_file}") machine.succeed(f"grep -q P@ssowrdWithSome@tSymbol {config_file}") - # save file for manual inspection - machine.copy_from_vm(config_file) + with subtest("WPA2 fallbacks have been generated"): + assert int(machine.succeed(f"grep -c sae-only {config_file}")) == 1 + assert int(machine.succeed(f"grep -c mixed-wpa {config_file}")) == 2 + + # save file for manual inspection + machine.copy_from_vm(config_file) with subtest("Daemon is running and accepting connections"): machine.wait_for_unit("wpa_supplicant-wlan1.service") diff --git a/nixos/tests/xmpp/prosody-mysql.nix b/nixos/tests/xmpp/prosody-mysql.nix new file mode 100644 index 000000000000..40f3e308a04e --- /dev/null +++ b/nixos/tests/xmpp/prosody-mysql.nix @@ -0,0 +1,124 @@ +let + cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=uploads.example.com/CN=conference.example.com' -days 36500 + mkdir -p $out + cp key.pem cert.pem $out + ''; + createUsers = pkgs: pkgs.writeScriptBin "create-prosody-users" '' + #!${pkgs.bash}/bin/bash + set -e + + # Creates and set password for the 2 xmpp test users. + # + # Doing that in a bash script instead of doing that in the test + # script allow us to easily provision the users when running that + # test interactively. + + prosodyctl register cthon98 example.com nothunter2 + prosodyctl register azurediamond example.com hunter2 + ''; + delUsers = pkgs: pkgs.writeScriptBin "delete-prosody-users" '' + #!${pkgs.bash}/bin/bash + set -e + + # Deletes the test users. + # + # Doing that in a bash script instead of doing that in the test + # script allow us to easily provision the users when running that + # test interactively. + + prosodyctl deluser cthon98@example.com + prosodyctl deluser azurediamond@example.com + ''; +in import ../make-test-python.nix { + name = "prosody-mysql"; + nodes = { + client = { nodes, pkgs, config, ... }: { + security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; + console.keyMap = "fr-bepo"; + networking.extraHosts = '' + ${nodes.server.config.networking.primaryIPAddress} example.com + ${nodes.server.config.networking.primaryIPAddress} conference.example.com + ${nodes.server.config.networking.primaryIPAddress} uploads.example.com + ''; + environment.systemPackages = [ + (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) + ]; + }; + server = { config, pkgs, ... }: { + nixpkgs.overlays = [ + (self: super: { + prosody = super.prosody.override { + withExtraLuaPackages = p: [ p.luadbi-mysql ]; + }; + }) + ]; + security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; + console.keyMap = "fr-bepo"; + networking.extraHosts = '' + ${config.networking.primaryIPAddress} example.com + ${config.networking.primaryIPAddress} conference.example.com + ${config.networking.primaryIPAddress} uploads.example.com + ''; + networking.firewall.enable = false; + environment.systemPackages = [ + (createUsers pkgs) + (delUsers pkgs) + ]; + services.prosody = { + enable = true; + ssl.cert = "${cert pkgs}/cert.pem"; + ssl.key = "${cert pkgs}/key.pem"; + virtualHosts.example = { + domain = "example.com"; + enabled = true; + ssl.cert = "${cert pkgs}/cert.pem"; + ssl.key = "${cert pkgs}/key.pem"; + }; + muc = [ + { + domain = "conference.example.com"; + } + ]; + uploadHttp = { + domain = "uploads.example.com"; + }; + extraConfig = '' + storage = "sql" + sql = { + driver = "MySQL"; + database = "prosody"; + host = "mysql"; + port = 3306; + username = "prosody"; + password = "password123"; + }; + ''; + }; + }; + mysql = { config, pkgs, ... }: { + networking.firewall.enable = false; + services.mysql = { + enable = true; + initialScript = pkgs.writeText "mysql_init.sql" '' + CREATE DATABASE prosody; + CREATE USER 'prosody'@'server' IDENTIFIED BY 'password123'; + GRANT ALL PRIVILEGES ON prosody.* TO 'prosody'@'server'; + FLUSH PRIVILEGES; + ''; + package = pkgs.mariadb; + }; + }; + }; + + testScript = { nodes, ... }: '' + # Check with mysql storage + mysql.wait_for_unit("mysql.service") + server.wait_for_unit("prosody.service") + server.succeed('prosodyctl status | grep "Prosody is running"') + + server.succeed("create-prosody-users") + client.succeed("send-message") + server.succeed("delete-prosody-users") + ''; +} diff --git a/nixos/tests/xmpp/prosody.nix b/nixos/tests/xmpp/prosody.nix index c343b580879a..14eab56fb821 100644 --- a/nixos/tests/xmpp/prosody.nix +++ b/nixos/tests/xmpp/prosody.nix @@ -81,6 +81,7 @@ in import ../make-test-python.nix { }; testScript = { nodes, ... }: '' + # Check with sqlite storage server.wait_for_unit("prosody.service") server.succeed('prosodyctl status | grep "Prosody is running"') diff --git a/nixos/tests/xxh.nix b/nixos/tests/xxh.nix new file mode 100644 index 000000000000..3af8e53779e3 --- /dev/null +++ b/nixos/tests/xxh.nix @@ -0,0 +1,67 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + + let + inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; + xxh-shell-zsh = pkgs.stdenv.mkDerivation { + pname = "xxh-shell-zsh"; + version = ""; + src = pkgs.fetchFromGitHub { + owner = "xxh"; + repo = "xxh-shell-zsh"; + # gets rarely updated, we can then just replace the hash + rev = "91e1f84f8d6e0852c3235d4813f341230cac439f"; + sha256 = "sha256-Y1FrIRxTd0yooK+ZzKcCd6bLSy5E2fRXYAzrIsm7rIc="; + }; + + postPatch = '' + substituteInPlace build.sh \ + --replace "echo Install wget or curl" "cp ${zsh-portable-binary} zsh-5.8-linux-x86_64.tar.gz" \ + --replace "command -v curl" "command -v this-should-not-trigger" + ''; + + installPhase = '' + mkdir -p $out + mv * $out/ + ''; + }; + + zsh-portable-binary = pkgs.fetchurl { + # kept in sync with https://github.com/xxh/xxh-shell-zsh/tree/master/build.sh#L27 + url = "https://github.com/romkatv/zsh-bin/releases/download/v3.0.1/zsh-5.8-linux-x86_64.tar.gz"; + sha256 = "sha256-i8flMd2Isc0uLoeYQNDnOGb/kK3oTFVqQgIx7aOAIIo="; + }; + in + { + name = "xxh"; + meta = with lib.maintainers; { + maintainers = [ lom ]; + }; + + nodes = { + server = { ... }: { + services.openssh.enable = true; + users.users.root.openssh.authorizedKeys.keys = [ snakeOilPublicKey ]; + }; + + client = { ... }: { + programs.zsh.enable = true; + users.users.root.shell = pkgs.zsh; + environment.systemPackages = with pkgs; [ xxh git ]; + }; + }; + + testScript = '' + start_all() + + client.succeed("mkdir -m 700 /root/.ssh") + + client.succeed( + "cat ${snakeOilPrivateKey} > /root/.ssh/id_ecdsa" + ) + client.succeed("chmod 600 /root/.ssh/id_ecdsa") + + server.wait_for_unit("sshd") + + client.succeed("xxh server -i /root/.ssh/id_ecdsa +hc \'echo $0\' +i +s zsh +I xxh-shell-zsh+path+${xxh-shell-zsh} | grep -Fq '/root/.xxh/.xxh/shells/xxh-shell-zsh/build/zsh-bin/bin/zsh'") + ''; + }) diff --git a/nixos/tests/zammad.nix b/nixos/tests/zammad.nix new file mode 100644 index 000000000000..4e466f6e3b9b --- /dev/null +++ b/nixos/tests/zammad.nix @@ -0,0 +1,60 @@ +import ./make-test-python.nix ( + { lib, pkgs, ... }: + + { + name = "zammad"; + + meta.maintainers = with lib.maintainers; [ garbas taeer ]; + + nodes.machine = { config, ... }: { + services.zammad.enable = true; + services.zammad.secretKeyBaseFile = pkgs.writeText "secret" '' + 52882ef142066e09ab99ce816ba72522e789505caba224a52d750ec7dc872c2c371b2fd19f16b25dfbdd435a4dd46cb3df9f82eb63fafad715056bdfe25740d6 + ''; + + systemd.services.zammad-locale-cheat = + let cfg = config.services.zammad; in + { + serviceConfig = { + Type = "simple"; + Restart = "always"; + + User = "zammad"; + Group = "zammad"; + PrivateTmp = true; + StateDirectory = "zammad"; + WorkingDirectory = cfg.dataDir; + }; + wantedBy = [ "zammad-web.service" ]; + description = "Hack in the locale files so zammad doesn't try to access the internet"; + script = '' + mkdir -p ./config/translations + VERSION=$(cat ${cfg.package}/VERSION) + + # If these files are not in place, zammad will try to access the internet. + # For the test, we only need to supply en-us. + echo '[{"locale":"en-us","alias":"en","name":"English (United States)","active":true,"dir":"ltr"}]' \ + > ./config/locales-$VERSION.yml + echo '[{"locale":"en-us","format":"time","source":"date","target":"mm/dd/yyyy","target_initial":"mm/dd/yyyy"},{"locale":"en-us","format":"time","source":"timestamp","target":"mm/dd/yyyy HH:MM","target_initial":"mm/dd/yyyy HH:MM"}]' \ + > ./config/translations/en-us-$VERSION.yml + ''; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("postgresql.service") + machine.wait_for_unit("zammad-web.service") + machine.wait_for_unit("zammad-websocket.service") + machine.wait_for_unit("zammad-scheduler.service") + # wait for zammad to fully come up + machine.sleep(120) + + # without the grep the command does not produce valid utf-8 for some reason + with subtest("welcome screen loads"): + machine.succeed( + "curl -sSfL http://localhost:3000/ | grep 'Zammad Helpdesk'" + ) + ''; + } +) diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 44bee86880a7..2f9e40616d57 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -2,25 +2,23 @@ , lib , fetchFromGitLab , cairo -, dbus , desktop-file-utils , gettext , glib -, gtk3 -, libhandy_0 -, libsass +, gtk4 +, libadwaita , meson , ninja , pango , pkg-config , python3 , rustPlatform -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "contrast"; - version = "0.0.3"; + version = "0.0.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -28,13 +26,13 @@ stdenv.mkDerivation rec { owner = "design"; repo = "contrast"; rev = version; - sha256 = "0kk3mv7a6y258109xvgicmsi0lw0rcs00gfyivl5hdz7qh47iccy"; + sha256 = "cypSbqLwSmauOoWOuppWpF3hvrxiqmkLspxAWzvlUC0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-ePkPiWGn79PHrMsSEql5OXZW5uRMdTP+w0/DCcm2KG4="; + hash = "sha256-W4FyqwJpimf0isQRCq9TegpTQPQfsumx40AFQCFG5VQ="; }; nativeBuildInputs = [ @@ -47,29 +45,31 @@ stdenv.mkDerivation rec { rustPlatform.rust.cargo rustPlatform.cargoSetupHook rustPlatform.rust.rustc - wrapGAppsHook + wrapGAppsHook4 glib # for glib-compile-resources ]; buildInputs = [ cairo - dbus glib - gtk3 - libhandy_0 - libsass + gtk4 + libadwaita pango ]; postPatch = '' patchShebangs build-aux/meson_post_install.py + # https://gitlab.gnome.org/World/design/contrast/-/merge_requests/23 + substituteInPlace build-aux/meson_post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; meta = with lib; { description = "Checks whether the contrast between two colors meet the WCAG requirements"; homepage = "https://gitlab.gnome.org/World/design/contrast"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 18bcb04c65c9..94129d05288b 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , gnome +, gnome-desktop , glib , gtk3 , wayland @@ -19,14 +20,15 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "1.14.0"; + version = "1.16.0"; src = fetchFromGitLab { - domain = "source.puri.sm"; - owner = "Librem5"; + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "1ayap40pgzcpmfydk5pbf3gwhh26m3cmbk6lyly4jihr9qw7dgb0"; + sha256 = "sha256-51Grkn6NSR6azTRuq1vdbDg7d3HuQQ+ZJCsM2mSrSHk="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -35,18 +37,9 @@ stdenv.mkDerivation rec { cat Cargo.toml.in Cargo.deps > Cargo.toml ''; name = "${pname}-${version}"; - sha256 = "0148ynzmapxfrlccikf20ikmi0ssbkn9fl5wi6nh6azflv50pzzn"; + sha256 = "sha256-vQaiEENxaQxBGYP1br03wSkU7OGOYkJvMBUAOeb3jGk="; }; - patches = [ - # remove when updating from 1.14.0 - (fetchpatch { - name = "fix-rust-1.54-build.patch"; - url = "https://gitlab.gnome.org/World/Phosh/squeekboard/-/commit/9cd56185c59ace535a6af26384ef6beca4423816.patch"; - sha256 = "sha256-8rWcfhQmGiwlc2lpkRvJ95XQp1Xg7St+0K85x8nQ0mk="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -62,7 +55,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - gnome.gnome-desktop + gnome-desktop wayland wayland-protocols libxml2 diff --git a/pkgs/applications/audio/ChowCentaur/default.nix b/pkgs/applications/audio/ChowCentaur/default.nix new file mode 100644 index 000000000000..80f5768dc157 --- /dev/null +++ b/pkgs/applications/audio/ChowCentaur/default.nix @@ -0,0 +1,53 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, cairo, libxkbcommon +, xcbutilcursor, xcbutilkeysyms, xcbutil, libXrandr, libXinerama, libXcursor +, alsa-lib, libjack2, lv2, gcc-unwrapped }: + +stdenv.mkDerivation rec { + pname = "ChowCentaur"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "jatinchowdhury18"; + repo = "KlonCentaur"; + rev = "v${version}"; + sha256 = "0mrzlf4a6f25xd7z9xanpyq7ybb4al01dzpjsgi0jkmlmadyhc4h"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + cairo + libxkbcommon + xcbutilcursor + xcbutilkeysyms + xcbutil + libXrandr + libXinerama + libXcursor + alsa-lib + libjack2 + lv2 + ]; + + cmakeFlags = [ + "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + "-DCMAKE_NM=${gcc-unwrapped}/bin/gcc-nm" + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 $out/lib/vst3 + cd ChowCentaur/ChowCentaur_artefacts/Release + cp -r LV2/ChowCentaur.lv2 $out/lib/lv2 + cp -r VST3/ChowCentaur.vst3 $out/lib/vst3 + ''; + + meta = with lib; { + description = + "Digital emulation of the Klon Centaur guitar pedal using RNNs, Wave Digital Filters, and more"; + homepage = "https://github.com/jatinchowdhury18/KlonCentaur"; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 438159201de8..6ed488d7d643 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -3,7 +3,6 @@ }: let - version = "1.3.3"; airwave-src = fetchFromGitHub { @@ -38,7 +37,8 @@ let in multiStdenv.mkDerivation { - name = "airwave-${version}"; + pname = "airwave"; + inherit version; src = airwave-src; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index 00fde01859c8..9143b5f5b08a 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, alsa-lib, jack2, minixml, pkg-config }: stdenv.mkDerivation rec { - name = packageName + "-" + version ; - packageName = "aj-snapshot" ; + pname = "aj-snapshot" ; version = "0.9.9"; src = fetchurl { - url = "mirror://sourceforge/${packageName}/${name}.tar.bz2"; + url = "mirror://sourceforge/aj-snapshot/aj-snapshot-${version}.tar.bz2"; sha256 = "0z8wd5yvxdmw1h1rj6km9h01xd4xmp4d86gczlix7hsc7zrf0wil"; }; diff --git a/pkgs/applications/audio/ams/default.nix b/pkgs/applications/audio/ams/default.nix index 388d8b44dcf5..7b209994103e 100644 --- a/pkgs/applications/audio/ams/default.nix +++ b/pkgs/applications/audio/ams/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation rec { - name = "ams"; + pname = "ams"; version = "unstable-2019-04-27"; src = fetchgit { diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 0e4afa4af7cf..9d4c522edc1a 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -24,7 +24,7 @@ , expat , libid3tag , libopus -, ffmpeg +, ffmpeg_4 , soundtouch , pcre /*, portaudio - given up fighting their portaudio.patch */ @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat - ffmpeg + ffmpeg_4 file flac libid3tag diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix index 345750e9e2a9..0d93284e2942 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -2,7 +2,7 @@ pulseaudio }: bitwig-studio1.overrideAttrs (oldAttrs: rec { - name = "bitwig-studio-${version}"; + pname = "bitwig-studio"; version = "2.5"; src = fetchurl { diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 003608ea6020..7b527139e919 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.1.2"; + version = "4.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-fXrpTOA6Uh4DgGU+3A7SV23Sb+Z2Ud4rCPmMk5I1MnA="; + sha256 = "sha256-hIIEVj5sM/NdhBiwerFvyIXqj0R8EvcxwM6UZ0CE428="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix index bba86afcfc26..74f4b2de49ea 100644 --- a/pkgs/applications/audio/callaudiod/default.nix +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "callaudiod"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "mobian1"; repo = pname; rev = version; - sha256 = "sha256-VASBYx/SZo2GJ8znthFIdjtZKbYVssWO1xhYcZMz9hI="; + sha256 = "sha256-WZ23jacCsZiNeMJfnYMaGdHXY9OCIBbeU9dWGDroaHE="; }; strictDeps = true; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Daemon for dealing with audio routing during phone calls"; homepage = "https://gitlab.com/mobian1/callaudiod"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pacman99 ]; + maintainers = with maintainers; [ pacman99 tomfitzhenry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 45482c4de007..c5f3cfe5b68f 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -78,13 +78,13 @@ let in mkDerivation rec { pname = "cantata"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "CDrummond"; repo = "cantata"; rev = "v${version}"; - sha256 = "15qfx9bpfdplxxs08inwf2j8kvf7g5cln5sv1wj1l2l41vbf1mjr"; + sha256 = "sha256-UaZEKZvCA50WsdQSSJQQ11KTK6rM4ouCHDX7pn3NlQw="; }; patches = [ diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix new file mode 100644 index 000000000000..1e77ade6cdb4 --- /dev/null +++ b/pkgs/applications/audio/cardinal/default.nix @@ -0,0 +1,76 @@ +{ + stdenv +, fetchFromGitHub +, fetchpatch +, fetchurl +, fetchzip +, freetype +, jansson +, lib +, libGL +, libX11 +, libXcursor +, libXext +, libXrandr +, libarchive +, liblo +, libsamplerate +, mesa +, pkg-config +, python3 +, speexdsp +}: + +stdenv.mkDerivation rec { + pname = "cardinal"; + version = "22.02"; + + src = fetchurl { + url = + "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}.tar.xz"; + sha256 = "sha256-IVlAROFGFffTEU00NCmv74w1DRb7dNMp20FeBVoDrdM="; + }; + + patches = [ + # see https://github.com/DISTRHO/Cardinal/issues/151#issuecomment-1041886260 + (fetchpatch { + url = + "https://github.com/DISTRHO/Cardinal/commit/13e9ef37c5dd35d77a54b1cb006767be7a72ac69.patch"; + sha256 = "sha256-NYUYLbLeBX1WEzjPi0s/T1N+EXQKyi0ifbPxgBYDjRs="; + }) + ]; + + prePatch = '' + patchShebangs ./dpf/utils/generate-ttl.sh + ''; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + freetype + jansson + libGL + libX11 + libXcursor + libXext + libXrandr + libXrandr + libarchive + liblo + libsamplerate + mesa + python3 + speexdsp + ]; + + makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ]; + + meta = { + description = "Plugin wrapper around VCV Rack"; + homepage = "https://github.com/DISTRHO/cardinal"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 87ae31aed3bf..bebc0320bb02 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "sha256-faVLPHPQ4voR/RHiPpUwnZK+5Jx0u4rJWuH5zlydzwY="; + sha256 = "sha256-A0QmyphjsNU06kh2f9rXrR+GkDEI5HqXRA9J82E6qJU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/applications/audio/cider/default.nix new file mode 100644 index 000000000000..edab6d109ef5 --- /dev/null +++ b/pkgs/applications/audio/cider/default.nix @@ -0,0 +1,30 @@ +{ appimageTools, lib, fetchurl }: + +appimageTools.wrapType2 rec { + pname = "cider"; + version = "1.3.1308"; + + src = fetchurl { + url = "https://1308-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-${version}.AppImage"; + sha256 = "1lbyvn1c8155p039qfzx7jwad7km073phkmrzjm0w3ahdpwz3wgi"; + }; + + extraInstallCommands = + let contents = appimageTools.extract { inherit pname version src; }; + in '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${contents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "A new look into listening and enjoying Apple Music in style and performance."; + homepage = "https://github.com/ciderapp/Cider"; + license = licenses.agpl3; + maintainers = [ maintainers.cigrainger ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/audio/cmt/default.nix b/pkgs/applications/audio/cmt/default.nix index bb23f9b62bbd..1062d897c6bd 100644 --- a/pkgs/applications/audio/cmt/default.nix +++ b/pkgs/applications/audio/cmt/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "cmt"; + pname = "cmt"; version = "1.17"; src = fetchurl { - url = "http://www.ladspa.org/download/${name}_${version}.tgz"; + url = "http://www.ladspa.org/download/cmt_${version}.tgz"; sha256 = "07xd0xmwpa0j12813jpf87fr9hwzihii5l35mp8ady7xxfmxfmpb"; }; diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index 4cf91c698be7..17495ead355a 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -1,18 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, libnotify, gdk-pixbuf }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, libnotify +, gdk-pixbuf, libnotifySupport ? stdenv.isLinux, debug ? false }: + +stdenv.mkDerivation rec { + pname = "cmusfm"; + version = "0.4.1"; -stdenv.mkDerivation { - version = "2021-05-19"; - pname = "cmusfm-unstable"; src = fetchFromGitHub { owner = "Arkq"; - repo = "cmusfm"; - rev = "a1f9f37c5819ca8a5b48e6185c2ec7ad478b9f1a"; - sha256 = "19akgvh9gl99xvpmzgqv88w2mnnln7k6290dr5rn3h6a1ihvllaw"; + repo = pname; + rev = "v${version}"; + sha256 = "1px2is80jdxchg8cpn5cizg6jvcbzyxl0qzs3bn0k3d10qjvdww5"; }; - # building - configureFlags = [ "--enable-libnotify" ]; + + configureFlags = lib.optional libnotifySupport "--enable-libnotify" + ++ lib.optional debug "--enable-debug"; + nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ curl libnotify gdk-pixbuf ]; + + buildInputs = [ curl gdk-pixbuf ] + ++ lib.optional libnotifySupport libnotify; meta = with lib; { description = "Last.fm and Libre.fm standalone scrobbler for the cmus music player"; diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/applications/audio/cozy/default.nix index afceca2a54ba..9fe86550f0da 100644 --- a/pkgs/applications/audio/cozy/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { format = "other"; # no setup.py pname = "cozy"; - version = "1.1.2"; + version = "1.2.0"; # Temporary fix # See https://github.com/NixOS/nixpkgs/issues/57029 @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { owner = "geigi"; repo = pname; rev = version; - sha256 = "sha256-QENn8mFMk06/Uj8QJo0mJQ7frJNcv5RVNJwDB+H/LkI="; + sha256 = "0igqf9b77i13sxlk4ziw549h379hmz1slrb3vvf8irk94gxabsaw"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index ab3267eae7f9..ebcdb8f4290e 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "csound"; - version = "6.16.2"; + version = "6.17.0"; hardeningDisable = [ "format" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "csound"; repo = "csound"; rev = version; - sha256 = "sha256-1rcS3kOspU9ACx45yB8betph4G0hso1OSJQRiabX6tE="; + sha256 = "sha256-O19jm3JxHg4TcQzWQZu1uFjfYN2FR41fCRq5YGnTGD0="; }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; - homepage = "http://www.csounds.com/"; - license = licenses.gpl2; + homepage = "https://csound.com/"; + license = licenses.lgpl21Plus; maintainers = [maintainers.marcweber]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/cyanrip/default.nix b/pkgs/applications/audio/cyanrip/default.nix index 3338fe40bf17..4f3a5a08af2e 100644 --- a/pkgs/applications/audio/cyanrip/default.nix +++ b/pkgs/applications/audio/cyanrip/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation rec { pname = "cyanrip"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "cyanreg"; repo = pname; rev = "v${version}"; - sha256 = "0lgb92sfpf4w3nj5vlj6j7931mj2q3cmcx1app9snf853jk9ahmw"; + sha256 = "17bi2xhjv3f3i870whkyqckvjlg32wqkspash87zi0jw7m7jm229"; }; nativeBuildInputs = [ meson ninja pkg-config ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/cyanreg/cyanrip"; description = "Bule-ish CD ripper"; - license = licenses.lgpl3Plus; + license = licenses.lgpl21Plus; platforms = platforms.all; maintainers = [ maintainers.zane ]; }; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index c1cecc13ec56..e8b0ded4c00d 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -112,6 +112,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.abbradar ]; - repositories.git = "https://github.com/Alexey-Yakovenko/deadbeef"; }; } diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 97870c478ebb..cb2ac2b9e0bf 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -57,7 +57,7 @@ in mkDerivation rec { there are basic functionalities to align the signals in time and amplitude, this software does not aim to be an audio editor. ''; - homepage = "http://gillesdegottex.github.io/dfasma/"; + homepage = "https://gillesdegottex.gitlab.io/dfasma-website/"; license = [ licenses.gpl3Plus reaperFork.meta.license ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index e1366d38bafa..de4b7a3176f6 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -4,14 +4,15 @@ , fetchFromGitHub , calf , fftwFloat +, fmt , glib -, glibmm , gtk4 -, gtkmm4 , itstool +, libadwaita , libbs2b , libebur128 , libsamplerate +, libsigcxx30 , libsndfile , lilv , lsp-plugins @@ -26,6 +27,7 @@ , rnnoise , rubberband , speexdsp +, tbb , wrapGAppsHook4 , zam-plugins , zita-convolver @@ -33,13 +35,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.1.3"; + version = "6.2.4"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-1UfeqPJxY4YT98UdqTZtG+QUBOZlKfK+7WbszhO22A0="; + sha256 = "sha256-g/qN1Tafh71HdPLHW43Zva9MK6G+qxSnb1aRisuwdBw="; }; nativeBuildInputs = [ @@ -54,13 +56,14 @@ stdenv.mkDerivation rec { buildInputs = [ fftwFloat + fmt glib - glibmm gtk4 - gtkmm4 + libadwaita libbs2b libebur128 libsamplerate + libsigcxx30 libsndfile lilv lv2 @@ -69,14 +72,13 @@ stdenv.mkDerivation rec { rnnoise rubberband speexdsp + tbb zita-convolver ]; postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py - # https://github.com/wwmm/easyeffects/pull/1205 - substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; preFixup = diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix deleted file mode 100644 index ee95ce43ff52..000000000000 --- a/pkgs/applications/audio/eteroj.lv2/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libuv, lv2 }: - -stdenv.mkDerivation rec { - pname = "eteroj.lv2"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "OpenMusicKontrollers"; - repo = pname; - rev = version; - sha256 = "0lzdk7hlz3vqgshrfpj0izjad1fmsnzk2vxqrry70xgz8xglvnmn"; - }; - - buildInputs = [ libuv lv2 ]; - nativeBuildInputs = [ cmake pkg-config ]; - - meta = with lib; { - description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2"; - homepage = "https://open-music-kontrollers.ch/lv2/eteroj"; - license = licenses.artistic2; - maintainers = with maintainers; [ magnetophon ]; - }; -} diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index bb421886f5d3..8dc86cb8ccf5 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ lv2 python3 ]; meta = with lib; { - homepage = "http://drobilla.net/software/fomp/"; + homepage = "https://drobilla.net/software/fomp.html"; description = "An LV2 port of the MCP, VCO, FIL, and WAH plugins by Fons Adriaensen"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/freac/default.nix b/pkgs/applications/audio/freac/default.nix index 89c4847ededf..ef4a6bc21afc 100644 --- a/pkgs/applications/audio/freac/default.nix +++ b/pkgs/applications/audio/freac/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "freac"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "enzo1982"; repo = "freac"; rev = "v${version}"; - sha256 = "sha256-cRmN9D/+FLiXqZW/PYhw61EoZuL3y61YtQ/ZNjnhfmY="; + sha256 = "sha256-PDFc/RhxIe6M3lfVHE1QmJnu5Sy+q/yrXrXPV/8X51o="; }; buildInputs = [ diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 75e44d8c4fad..b7afb0d57a03 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gnutls, freetype, fluidsynth , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsa-lib, libjack2, libvorbis , libSM, libsndfile, libogg, libtool }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook libtool ]; buildInputs = [ - freetype SDL SDL_gfx SDL_ttf + freetype fluidsynth SDL SDL_gfx SDL_ttf liblo libxml2 libjack2 alsa-lib libvorbis libsndfile libogg libSM (gnutls.overrideAttrs (oldAttrs: { configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ]; diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix index 7918ea178917..bb92af2dd5c5 100644 --- a/pkgs/applications/audio/friture/default.nix +++ b/pkgs/applications/audio/friture/default.nix @@ -1,16 +1,16 @@ -{ lib, fetchFromGitHub, fetchpatch, python3Packages, wrapQtAppsHook }: +{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: let py = python3Packages; in py.buildPythonApplication rec { pname = "friture"; - version = "0.48"; + version = "0.49"; src = fetchFromGitHub { owner = "tlecomte"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oOH58jD49xAeSuP+l6tYUpwkYsnfeSGTt8x4DFzTY6g="; + sha256 = "sha256-xKgyBV/Qc+9PgXyxcT0xG1GXLC6KnjavJ/0SUE+9VSY="; }; nativeBuildInputs = (with py; [ numpy cython scipy ]) ++ @@ -28,15 +28,6 @@ in py.buildPythonApplication rec { rtmixer ]; - patches = [ - # Backported fix that resolves an issue with setuptools packaging - (fetchpatch { - name = "fix-setuptools-packaging.patch"; - url = "https://github.com/tlecomte/friture/commit/ea7210dae883edf17de8fec82f9428b18ee138b6.diff"; - sha256 = "sha256-Kv/vmC8kcqfOgfIPQyZN46sbV6bezhq6pyj8bvke6s8="; - }) - ]; - postPatch = '' # Remove version constraints from Python dependencies in setup.py sed -i -E "s/\"([A-Za-z0-9]+)(=|>|<)=[0-9\.]+\"/\"\1\"/g" setup.py diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 77c6f9935f59..7e0fcf2717eb 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.50"; + version = "1.52"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-OURD8k8DIa1DddDng55HrzgAN95srW4wm7RD7DbiJLQ="; + sha256 = "sha256-RyZ3PV7jaTN3DEYMT0BqKDHbb+7/IgiRaCra1xA0h1A="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix new file mode 100644 index 000000000000..841a65e541fc --- /dev/null +++ b/pkgs/applications/audio/furnace/default.nix @@ -0,0 +1,100 @@ +{ stdenv +, lib +, gitUpdater +, testVersion +, furnace +, fetchFromGitHub +, cmake +, pkg-config +, makeWrapper +, fmt_8 +, libsndfile +, SDL2 +, zlib +, withJACK ? stdenv.hostPlatform.isUnix +, libjack2 +, withGUI ? true +, Cocoa +}: + +stdenv.mkDerivation rec { + pname = "furnace"; + version = "0.5.8"; + + src = fetchFromGitHub { + owner = "tildearrow"; + repo = "furnace"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "103ymd3wa1sfsr6qg15vpcs53j350i7zidv3azlf7cynk6k28xim"; + }; + + postPatch = '' + # rtmidi is not used yet + sed -i -e '/add_subdirectory(extern\/rtmidi/d' -e '/DEPENDENCIES_LIBRARIES rtmidi/d' CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeWrapper + ]; + + buildInputs = [ + fmt_8 + libsndfile + SDL2 + zlib + ] ++ lib.optionals withJACK [ + libjack2 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Cocoa + ]; + + cmakeFlags = [ + "-DBUILD_GUI=${if withGUI then "ON" else "OFF"}" + "-DSYSTEM_FMT=ON" + "-DSYSTEM_LIBSNDFILE=ON" + "-DSYSTEM_ZLIB=ON" + "-DSYSTEM_SDL2=ON" + "-DWITH_JACK=${if withJACK then "ON" else "OFF"}" + "-DWARNINGS_ARE_ERRORS=ON" + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Normal CMake install phase on Darwin only installs the binary, the user is expected to use CPack to build a + # bundle. That adds alot of overhead for not much benefit (CPack is currently abit broken, and needs impure access + # to /usr/bin/hdiutil). So we'll manually assemble & install everything instead. + + mkdir -p $out/{Applications/Furnace.app/Contents/{MacOS,Resources},share/{,doc,licenses}/furnace} + mv $out/{bin,Applications/Furnace.app/Contents/MacOS}/furnace + makeWrapper $out/{Applications/Furnace.app/Contents/MacOS,bin}/furnace + + install -m644 {../res,$out/Applications/Furnace.app/Contents}/Info.plist + install -m644 ../res/icon.icns $out/Applications/Furnace.app/Contents/Resources/Furnace.icns + install -m644 {..,$out/share/licenses/furnace}/LICENSE + cp -r ../papers $out/share/doc/furnace/ + cp -r ../demos $out/share/furnace/ + ''; + + passthru = { + updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; + }; + tests.version = testVersion { + package = furnace; + # The command always exits with code 1 + command = "(furnace --version || [ $? -eq 1 ])"; + }; + }; + + meta = with lib; { + description = "Multi-system chiptune tracker compatible with DefleMask modules"; + homepage = "https://github.com/tildearrow/furnace"; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index a2aebc58a825..55f12fd3c64a 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz"; sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; }; - + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DENABLE_UBSAN=OFF" ]; nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 5eece77373f5..9739a88586ae 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "0dpwdjyy6phhr1jm1cabj2gc3rfsdan513mijbgnpzkq9w9jfb60"; + sha256 = "sha256-/BDK1PyRw4xOt+rzC9yX29aRQb1aDnDBIenSz+859OY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 5a4876a98ddf..ec927bdc5b03 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -2,6 +2,7 @@ , lib , rustPlatform , fetchFromGitLab +, fetchpatch , meson , ninja , gettext @@ -31,6 +32,16 @@ stdenv.mkDerivation rec { sha256 = "00vy1qkkpn76jdpybsq9qp8s6fh1ih10j73p2x43sl97m5g8944h"; }; + patches = [ + # Fix build with meson 0.61, can be removed on next release. + # podcasts-gtk/resources/meson.build:5:0: ERROR: Function does not take positional arguments. + # podcasts-gtk/resources/meson.build:30:0: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/World/podcasts/-/commit/6614bb62ecbec7c3b18ea7fe44beb50fe7942b27.patch"; + sha256 = "3TVKFV9V6Ofdajgkdc+j+yxsU21C4JWSc6GjLExSM00="; + }) + ]; + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix index 743417570c16..1fb848ae1eda 100644 --- a/pkgs/applications/audio/goattracker/default.nix +++ b/pkgs/applications/audio/goattracker/default.nix @@ -12,7 +12,6 @@ with lib; let pname = "goattracker" + optionalString isStereo "-stereo"; desktopItem = makeDesktopItem { - type = "Application"; name = pname; desktopName = "GoatTracker 2" + optionalString isStereo " Stereo"; genericName = "Music Tracker"; @@ -20,8 +19,8 @@ let then "gt2stereo" else "goattrk2"; icon = "goattracker"; - categories = "AudioVideo;AudioVideoEditing;"; - extraEntries = "Keywords=tracker;music;"; + categories = [ "AudioVideo" "AudioVideoEditing" ]; + keywords = [ "tracker" "music" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index cd5e476b8845..6db530a2c233 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.17"; + version = "3.10.21"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0wrk8d4q6ricbcjzlhk10vrk1qg9hi323kgyyd0c8nmh7a82h8pd"; + sha256 = "0n73jm5ypsj962gpr0dk10lqh83giqsczm63wchyhmrkyf1wgga1"; }; patches = [ @@ -42,7 +42,10 @@ python3Packages.buildPythonApplication rec { ]; checkInputs = with python3Packages; [ - coverage minimock + minimock + pytest + pytest-httpserver + pytest-cov ]; doCheck = true; @@ -51,6 +54,7 @@ python3Packages.buildPythonApplication rec { feedparser dbus-python mygpoclient + requests pygobject3 eyeD3 podcastparser @@ -69,7 +73,8 @@ python3Packages.buildPythonApplication rec { ''; installCheckPhase = '' - LC_ALL=C PYTHONPATH=./src:$PYTHONPATH python3 -m gpodder.unittests + LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest --ignore=tests --ignore=src/gpodder/utilwin32ctypes.py --doctest-modules src/gpodder/util.py src/gpodder/jsonconfig.py + LC_ALL=C PYTHONPATH=src/:$PYTHONPATH pytest tests --ignore=src/gpodder/utilwin32ctypes.py --ignore=src/mygpoclient --cov=gpodder ''; meta = with lib; { diff --git a/pkgs/applications/audio/gpodder/disable-autoupdate.patch b/pkgs/applications/audio/gpodder/disable-autoupdate.patch index 8f77518d03e5..c7c81761328b 100644 --- a/pkgs/applications/audio/gpodder/disable-autoupdate.patch +++ b/pkgs/applications/audio/gpodder/disable-autoupdate.patch @@ -11,41 +11,20 @@
-@@ -201,4 +197,4 @@ - - - -- -\ No newline at end of file -+ --- a/src/gpodder/config.py +++ b/src/gpodder/config.py -@@ -91,13 +91,6 @@ - 'retries': 3, # number of retries when downloads time out - }, +@@ -94,7 +94,7 @@ -- # Software updates from gpodder.org -- 'software_update': { + # Software updates from gpodder.org + 'software_update': { - 'check_on_startup': True, # check for updates on start -- 'last_check': 0, # unix timestamp of last update check -- 'interval': 5, # interval (in days) to check for updates -- }, -- - 'ui': { - # Settings for the Command-Line Interface - 'cli': { ++ 'check_on_startup': False, # check for updates on start + 'last_check': 0, # unix timestamp of last update check + 'interval': 5, # interval (in days) to check for updates + }, --- a/src/gpodder/gtkui/main.py +++ b/src/gpodder/gtkui/main.py -@@ -224,7 +224,7 @@ - util.idle_add(self.subscribe_to_url, self.options.subscribe) - elif not self.channels: - self.on_itemUpdate_activate() -- elif self.config.software_update.check_on_startup: -+ elif False and self.config.software_update.check_on_startup: - # Check for software updates from gpodder.org - diff = time.time() - self.config.software_update.last_check - if diff > (60 * 60 * 24) * self.config.software_update.interval: -@@ -3288,6 +3288,7 @@ +@@ -3445,6 +3445,7 @@ If silent=False, a message will be shown even if no updates are available (set silent=False when the check is manually triggered). """ diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix index 30dc359731f5..798af97ab32f 100644 --- a/pkgs/applications/audio/helvum/default.nix +++ b/pkgs/applications/audio/helvum/default.nix @@ -16,20 +16,20 @@ stdenv.mkDerivation rec { pname = "helvum"; - version = "0.3.2"; + version = "0.3.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; - owner = "ryuukyu"; + owner = "pipewire"; repo = pname; rev = version; - sha256 = "sha256-Kt6gnMRTOVXqjAjEZKlylcGhzl52ZzPNVbJhwzLhzkM="; + sha256 = "0nhv6zw2zzxz2bg2zj32w1brywnm5lv6j3cvmmvwshc389z2k5x1"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-kxJRY9GSPwnb431iYCfJdGcl5HjpFr2KkWrFDpGajp8="; + hash = "sha256-EIHO9qVPIXgezfFOaarlTU0an762nFmX1ELbQuAZ7rY"; }; nativeBuildInputs = [ @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc + rustPlatform.bindgenHook ]; buildInputs = [ @@ -49,23 +50,9 @@ stdenv.mkDerivation rec { pipewire ]; - LIBCLANG_PATH = "${libclang.lib}/lib"; - - patches = [ - # enables us to use gtk4-update-icon-cache instead of gtk3 one - (fetchpatch { - url = "https://gitlab.freedesktop.org/ryuukyu/helvum/-/merge_requests/24.patch"; - sha256 = "sha256-WmI6taBL/6t587j06n0mwByQ8x0eUA5ECvGNjg2/vtk="; - }) - ]; - - postPatch = '' - patchShebangs build-aux/cargo.sh - ''; - meta = with lib; { description = "A GTK patchbay for pipewire"; - homepage = "https://gitlab.freedesktop.org/ryuukyu/helvum"; + homepage = "https://gitlab.freedesktop.org/pipewire/helvum"; license = licenses.gpl3Only; maintainers = with maintainers; [ fufexan ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix index d281ec11c7d1..707deeb1a013 100644 --- a/pkgs/applications/audio/hybridreverb2/default.nix +++ b/pkgs/applications/audio/hybridreverb2/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://www2.ika.ruhr-uni-bochum.de/HybridReverb2"; + homepage = "https://github.com/jpcima/HybridReverb2"; description = "Reverb effect using hybrid impulse convolution"; license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/indicator-sound-switcher/default.nix b/pkgs/applications/audio/indicator-sound-switcher/default.nix index e3e28b70a31e..6326d7cc5630 100644 --- a/pkgs/applications/audio/indicator-sound-switcher/default.nix +++ b/pkgs/applications/audio/indicator-sound-switcher/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "indicator-sound-switcher"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "yktoo"; repo = pname; rev = "v${version}"; - sha256 = "APU8Y0xUhRd9RbMSG9TD0TBvFLu/VlLGauf56z8gZDw="; + sha256 = "sha256-agzU3Z3E6NvCnlsz9L719LqMTm8EmYg3TY/2lWTYgKs="; }; postPatch = '' diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix new file mode 100644 index 000000000000..16683564b2c7 --- /dev/null +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -0,0 +1,60 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, pipewire +, glibmm +, qmake +, makeDesktopItem +, pkg-config +, libarchive +, fetchpatch +}: + +mkDerivation rec{ + pname = "jamesdsp"; + version = "2.3"; + src = fetchFromGitHub rec{ + owner = "Audio4Linux"; + repo = "JDSP4Linux"; + fetchSubmodules = true; + rev = version; + hash = "sha256-Hkzurr+s+vvSyOMCYH9kHI+nIm6mL9yORGNzY2FXslc="; + }; + + patches = [ + # fixing /usr install assumption, remove on version bump + (fetchpatch { + url = "https://github.com/Audio4Linux/JDSP4Linux/commit/003c9e9fc426f83e269aed6e05be3ed55273931a.patch"; + hash = "sha256-crll/a7C9pUq9eL5diq8/YgC5bNC6SrdijZEBxZpJ8E="; + }) + ]; + + nativeBuildInputs = [ qmake pkg-config ]; + buildInputs = [ + glibmm + libarchive + pipewire + ]; + + desktopItems = [ + (makeDesktopItem { + name = "jamesdsp"; + desktopName = "JamesDSP"; + genericName = "Audio effects processor"; + exec = "jamesdsp"; + icon = "jamesdsp"; + comment = "JamesDSP for Linux"; + categories = [ "AudioVideo" "Audio" ]; + startupNotify = false; + keywords = [ "equalizer" "audio" "effect" ]; + }) + ]; + + meta = with lib;{ + description = "An audio effect processor for PipeWire clients"; + homepage = "https://github.com/Audio4Linux/JDSP4Linux"; + license = licenses.gpl3Only; + maintainers = with maintainers;[ pasqui23 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 325d115b5816..2bd23b821f13 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.95.0"; - name = "jamin-${version}"; + pname = "jamin"; src = fetchurl { url = "mirror://sourceforge/jamin/jamin-${version}.tar.gz"; diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index f30b188c3917..8c67c0fd7c15 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.8.1"; + version = "3.8.2"; src = fetchFromGitHub { owner = "jamulussoftware"; repo = "jamulus"; rev = "r${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-QtlvcKVqKgRAO/leHy4CgvjNW49HAyZLI2JtKERP7HQ="; + sha256 = "sha256-K2HznkntDhp+I8DHJk5Cuh5cR8yjwfzX+pGGzS8yVLQ="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix index 016f515ce13c..c13b38f7acd5 100644 --- a/pkgs/applications/audio/japa/default.nix +++ b/pkgs/applications/audio/japa/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, alsa-lib, libjack2, fftwFloat, libclthreads, libclxclient, libX11, libXft, zita-alsa-pcmi, }: stdenv.mkDerivation rec { - version = "0.9.2"; + version = "0.9.4"; pname = "japa"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "1zmi4wg23hwsypg3h6y3qb72cbrihqcs19qrbzgs5a67d13q4897"; + sha256 = "sha256-t9wlZr+pE5u6yTpATWDQseC/rf4TFbtG0X9tnTdkB8I="; }; buildInputs = [ alsa-lib libjack2 fftwFloat libclthreads libclxclient libX11 libXft zita-alsa-pcmi ]; diff --git a/pkgs/applications/audio/jellycli/default.nix b/pkgs/applications/audio/jellycli/default.nix new file mode 100644 index 000000000000..cfb9deb58726 --- /dev/null +++ b/pkgs/applications/audio/jellycli/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub, buildGoModule, alsa-lib }: + +buildGoModule rec { + pname = "jellycli"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "tryffel"; + repo = "jellycli"; + rev = "v${version}"; + sha256 = "1awzcxnf175a794rhzbmqxxjss77mfa1yrr0wgdxaivrlkibxjys"; + }; + + vendorSha256 = "02fwsnrhj09m0aa199plpqlsjrwpmrk4c80fszzm07s5vmjqvnfy"; + + patches = [ + # Fixes log file path for tests. + ./fix-test-dir.patch + ]; + + buildInputs = [ alsa-lib ]; + + meta = with lib; { + description = "Jellyfin terminal client"; + longDescription = '' + Terminal music player, works with Jellyfin (>= 10.6) , Emby (>= 4.4), and + Subsonic comptabile servers (API >= 1.16), e.g., Navidrome. + ''; + homepage = "https://github.com/tryffel/jellycli"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/pkgs/applications/audio/jellycli/fix-test-dir.patch b/pkgs/applications/audio/jellycli/fix-test-dir.patch new file mode 100644 index 000000000000..83cacfe9af0c --- /dev/null +++ b/pkgs/applications/audio/jellycli/fix-test-dir.patch @@ -0,0 +1,13 @@ +diff --git a/config/config_test.go b/config/config_test.go +index 9f63a7e..7e790b8 100644 +--- a/config/config_test.go ++++ b/config/config_test.go +@@ -110,7 +110,7 @@ func TestInitEmptyConfig(t *testing.T) { + Subsonic: Subsonic{}, + Player: Player{ + Server: "jellyfin", +- LogFile: "/tmp/jellycli.log", ++ LogFile: "/build/jellycli.log", + LogLevel: "info", + AudioBufferingMs: 150, + HttpBufferingS: 5, diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index 3bc06abcbffa..60df749a1426 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp $src $out/lib/JMusicBot makeWrapper ${jre}/bin/java $out/bin/JMusicBot \ - --add-flags "-Xmx1G -Dnogui=true -jar $out/lib/JMusicBot" + --add-flags "-Xmx1G -Dnogui=true -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -jar $out/lib/JMusicBot" ''; meta = with lib; { diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index ba3d921751b5..a29ddbb81508 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "kid3"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-d0Y+swzzGk1FzQ3EK8sN8i1Nf6CRIPMAYgTUYN71FXU="; + sha256 = "sha256-N/HDwfJn7Py4y/GZcIDbeoMEqG+SuRGO23ITZMot8cc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/lv2lint/default.nix b/pkgs/applications/audio/lv2lint/default.nix new file mode 100644 index 000000000000..ada996866c88 --- /dev/null +++ b/pkgs/applications/audio/lv2lint/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchurl, pkg-config, meson, ninja, lv2, lilv, curl, libelf }: + +stdenv.mkDerivation rec { + pname = "lv2lint"; + version = "0.14.0"; + + src = fetchurl { + url = "https://git.open-music-kontrollers.ch/lv2/${pname}/snapshot/${pname}-${version}.tar.xz"; + sha256 = "sha256-yPKM7RToLNBT+AXSjfxxpncESmv89/wcGCt//pnEGqI="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ lv2 lilv curl libelf ]; + + meta = with lib; { + description = "Check whether a given LV2 plugin is up to the specification"; + homepage = "https://open-music-kontrollers.ch/lv2/${pname}:"; + license = licenses.artistic2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/lyrebird/default.nix b/pkgs/applications/audio/lyrebird/default.nix index b40dbfe65bf8..81c792d95e2d 100644 --- a/pkgs/applications/audio/lyrebird/default.nix +++ b/pkgs/applications/audio/lyrebird/default.nix @@ -15,7 +15,7 @@ let icon = "${placeholder "out"}/share/lyrebird/icon.png"; desktopName = "Lyrebird"; genericName = "Voice Changer"; - categories = "AudioVideo;Audio;"; + categories = [ "AudioVideo" "Audio" ]; }; in python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index 7ea5fa753c81..fd55bae6fd61 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "faustCompressors-v${version}"; + pname = "faustCompressors"; version = "1.2"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix index 5db17b99d1c3..0a5aecfecb0f 100644 --- a/pkgs/applications/audio/mid2key/default.nix +++ b/pkgs/applications/audio/mid2key/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, fetchurl, alsa-lib, libX11, libXi, libXtst, xorgproto }: +{ lib, stdenv, fetchFromGitHub, alsa-lib, libX11, libXi, libXtst, xorgproto }: stdenv.mkDerivation rec { - name = "mid2key-r1"; + pname = "mid2key"; + version = "1"; - src = fetchurl { - url = "http://mid2key.googlecode.com/files/${name}.tar.gz"; + src = fetchFromGitHub { + owner = "dnschneid"; + repo = "mid2key"; + rev = "v${version}"; sha256 = "0j2vsjvdgx51nd1qmaa18mcy0yw9pwrhbv2mdwnf913bwsk4y904"; }; diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix index 93a215e46b1b..b58bd0b27572 100644 --- a/pkgs/applications/audio/midas/generic.nix +++ b/pkgs/applications/audio/midas/generic.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, lib, libX11, libXext, alsa-lib, freetype, brand, type, version, homepage, url, sha256, ... }: stdenv.mkDerivation rec { - inherit type; - baseName = "${type}-Edit"; - name = "${lib.toLower baseName}-${version}"; + pname = "${lib.toLower type}-edit"; + inherit version; src = fetchurl { inherit url; @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp ${baseName} $out/bin + cp ${pname} $out/bin ''; preFixup = let # we prepare our library path in the let clause to avoid it become part of the input of mkDerivation @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ - $out/bin/${baseName} + $out/bin/${pname} ''; meta = with lib; { diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 47fbd5794ea0..ea54a4a55d43 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk"; }; + postPatch = '' + # https://github.com/milkytracker/MilkyTracker/issues/262 + substituteInPlace CMakeLists.txt \ + --replace 'CMAKE_CXX_STANDARD 98' 'CMAKE_CXX_STANDARD 11' + ''; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ SDL2 alsa-lib libjack2 lhasa perl rtmidi zlib zziplib ]; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index bbd0e07a64a4..8b1acc9d0bcb 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -53,13 +53,13 @@ mkDerivation rec { pname = "mixxx"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = version; - sha256 = "sha256-6M1qaRyRYWTIKqclewuD+RUVDdxVbBHcfpw2qYgO6BA="; + sha256 = "sha256-EnOO5OGcaIITqfF9gpGktarzYOx128C1M2VmYNzdRsA="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -117,7 +117,7 @@ mkDerivation rec { # mixxx installs udev rules to DATADIR instead of SYSCONFDIR # let's disable this and install udev rules manually via postInstall - # see https://github.com/mixxxdj/mixxx/blob/2.3.1/CMakeLists.txt#L1381-L1392 + # see https://github.com/mixxxdj/mixxx/blob/2.3.2/CMakeLists.txt#L1381-L1392 cmakeFlags = [ "-DINSTALL_USER_UDEV_RULES=OFF" ]; diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index ecb8128032e5..386e372d7987 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -6,15 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mopidy-youtube"; - version = "3.4"; - - disabled = python3.pythonOlder "3.7"; + version = "3.5"; + format = "setuptools"; src = fetchFromGitHub { owner = "natumbri"; repo = pname; rev = "v${version}"; - sha256 = "0lm6nn926qkrwzvj64yracdixfrnv5zk243msjskrnlzkhgk01rk"; + hash = "sha256-hlokysFFgZZYY7flghgRq6wVG824kpcLkXxk6nMhxn4="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -39,8 +38,10 @@ python3.pkgs.buildPythonApplication rec { ]; disabledTestPaths = [ - # Fails with an import error + # Disable tests which interact with Youtube + "tests/test_api.py" "tests/test_backend.py" + "tests/test_youtube.py" ]; pythonImportsCheck = [ diff --git a/pkgs/applications/audio/mopidy/ytmusic.nix b/pkgs/applications/audio/mopidy/ytmusic.nix index 92b754147852..9f393a0e7520 100644 --- a/pkgs/applications/audio/mopidy/ytmusic.nix +++ b/pkgs/applications/audio/mopidy/ytmusic.nix @@ -2,24 +2,33 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-ytmusic"; - version = "0.3.2"; + version = "0.3.5"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-YTMusic"; - sha256 = "sha256-BZtW+qHsTnOMj+jdAFI8ZMwGxJc9lNosgPJZGbt4JgU="; + sha256 = "0pncyxfqxvznb9y4ksndbny1yf5mxh4089ak0yz86dp2qi5j99iv"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'ytmusicapi>=0.20.0,<0.21.0' 'ytmusicapi>=0.20.0' + ''; + propagatedBuildInputs = [ mopidy python3Packages.ytmusicapi python3Packages.pytube ]; + pythonImportsCheck = [ "mopidy_ytmusic" ]; + + # has no tests doCheck = false; meta = with lib; { description = "Mopidy extension for playing music from YouTube Music"; + homepage = "https://github.com/OzymandiasTheGreat/mopidy-ytmusic"; license = licenses.asl20; maintainers = [ maintainers.nickhu ]; }; diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix deleted file mode 100644 index 93a9ce258544..000000000000 --- a/pkgs/applications/audio/munt/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, mkDerivation -, stdenv -, fetchFromGitHub -, makeDesktopItem -, cmake -, pkg-config -, qtbase -, glib -, alsa-lib -, withJack ? stdenv.hostPlatform.isUnix, jack -}: - -let - mainProgram = "mt32emu-qt"; -in -mkDerivation rec { - pname = "munt"; - version = "2.5.0"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "munt_${lib.replaceChars [ "." ] [ "_" ] version}"; - sha256 = "1lknq2a72gv1ddhzr7f967wpa12lh805jj4gjacdnamgrc1h22yn"; - }; - - dontFixCmake = true; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ qtbase glib ] - ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optional withJack jack; - - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir $out/Applications - mv $out/bin/${mainProgram}.app $out/Applications/ - ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram} - ''; - - meta = with lib; { - inherit mainProgram; - description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; - homepage = "http://munt.sourceforge.net/"; - license = with licenses; [ lgpl21 gpl3 ]; - platforms = platforms.all; - maintainers = with maintainers; [ OPNA2608 ]; - }; -} diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/applications/audio/munt/libmt32emu.nix new file mode 100644 index 000000000000..f79a2667542f --- /dev/null +++ b/pkgs/applications/audio/munt/libmt32emu.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "libmt32emu"; + version = "2.5.3"; + + src = fetchFromGitHub { + owner = "munt"; + repo = "munt"; + rev = "${pname}_${lib.replaceChars [ "." ] [ "_" ] version}"; + hash = "sha256-n5VV5Swh1tOVQGT3urEKl64A/w7cY95/0y5wC5ZuLm4="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + cmake + ]; + + dontFixCmake = true; + + cmakeFlags = [ + "-Dmunt_WITH_MT32EMU_SMF2WAV=OFF" + "-Dmunt_WITH_MT32EMU_QT=OFF" + ]; + + meta = with lib; { + homepage = "http://munt.sourceforge.net/"; + description = "A library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; + license = with licenses; [ lgpl21Plus ]; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.unix; # Not tested on ReactOS yet :) + }; +} diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/applications/audio/munt/mt32emu-qt.nix new file mode 100644 index 000000000000..0c541885689e --- /dev/null +++ b/pkgs/applications/audio/munt/mt32emu-qt.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, alsa-lib +, cmake +, libpulseaudio +, libmt32emu +, pkg-config +, portaudio +, qtbase +, qtmultimedia +, withJack ? stdenv.hostPlatform.isUnix, libjack2 +}: + +mkDerivation rec { + pname = "mt32emu-qt"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "munt"; + repo = "munt"; + rev = "mt32emu_qt_${lib.replaceChars [ "." ] [ "_" ] version}"; + hash = "sha256-9vapBKpl1NC3mIDetuCb452IHV6c7c7NCzSyiBry5oo="; + }; + + postPatch = '' + sed -i -e '/add_subdirectory(mt32emu)/d' CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libmt32emu + portaudio + qtbase + qtmultimedia + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libpulseaudio + ] + ++ lib.optional withJack libjack2; + + dontFixCmake = true; + + cmakeFlags = [ + "-Dmt32emu-qt_USE_PULSEAUDIO_DYNAMIC_LOADING=OFF" + "-Dmunt_WITH_MT32EMU_QT=ON" + "-Dmunt_WITH_MT32EMU_SMF2WAV=OFF" + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir $out/Applications + mv $out/bin/${meta.mainProgram}.app $out/Applications/ + ln -s $out/{Applications/${meta.mainProgram}.app/Contents/MacOS,bin}/${meta.mainProgram} + ''; + + meta = with lib; { + homepage = "http://munt.sourceforge.net/"; + description = "A synthesizer application built on Qt and libmt32emu"; + longDescription = '' + mt32emu-qt is a synthesiser application that facilitates both realtime + synthesis and conversion of pre-recorded SMF files to WAVE making use of + the mt32emu library and the Qt framework. + ''; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + mainProgram = "mt32emu-qt"; + }; +} diff --git a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix new file mode 100644 index 000000000000..378b5dd8fb83 --- /dev/null +++ b/pkgs/applications/audio/munt/mt32emu-smf2wav.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, glib +, libmt32emu +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "mt32emu-smf2wav"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "munt"; + repo = "munt"; + rev = "mt32emu_smf2wav_${lib.replaceChars [ "." ] [ "_" ] version}"; + hash = "sha256-FnKlKJxe7P4Yqpv0oVGgV4253dMgSmgtb7EAa2FI+aI="; + }; + + postPatch = '' + sed -i -e '/add_subdirectory(mt32emu)/d' CMakeLists.txt + ''; + + dontFixCmake = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libmt32emu + glib + ]; + + cmakeFlags = [ + "-Dmunt_WITH_MT32EMU_QT=OFF" + "-Dmunt_WITH_MT32EMU_SMF2WAV=ON" + ]; + + meta = with lib; { + homepage = "http://munt.sourceforge.net/"; + description = "Produces a WAVE file from a Standard MIDI file (SMF)"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + mainProgram = "mt32emu-smf2wav"; + }; +} diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index 131417293207..2cf1b9ff68de 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.darwin; maintainers = []; - repositories.git = "https://github.com/musescore/MuseScore"; }; } diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 7662eadc4983..caa799c88f61 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -51,6 +51,5 @@ mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ vandenoever turion doronbehar ]; platforms = platforms.linux; - repositories.git = "https://github.com/musescore/MuseScore"; }; } diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix index 76e1bc3923a8..72027fe922b8 100644 --- a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix +++ b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix @@ -11,7 +11,6 @@ , wrapGAppsHook , fetchurl , fetchFromGitHub -, makeDesktopItem }: rustPlatform.buildRustPackage rec { pname = "netease-cloud-music-gtk"; diff --git a/pkgs/applications/audio/new-session-manager/default.nix b/pkgs/applications/audio/new-session-manager/default.nix index eedd193b2c54..78f71ed950f7 100644 --- a/pkgs/applications/audio/new-session-manager/default.nix +++ b/pkgs/applications/audio/new-session-manager/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "new-session-manager"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "linuxaudio"; repo = "new-session-manager"; rev = "v${version}"; - sha256 = "sha256-hcw+Fn5s1S786eqmR95RmkFcIaRzWaH38YE9DXVQJU0="; + sha256 = "sha256-dQE7kUoxqDtTrk5euHqpMVeApxniecWZWOARcCl573o="; }; nativeBuildInputs = [ meson pkg-config ninja ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with lib; { - homepage = "https://linuxaudio.github.io/new-session-manager/"; + homepage = "https://new-session-manager.jackaudio.org/"; description = "A session manager designed for audio applications."; maintainers = [ maintainers._6AA4FD ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 30011b2be3ea..50697c6c81a9 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.11.2"; + version = "3.11.7"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-kvmBOw8fQZSC1jC8FRVq4v+i7mM6ol2IrDTqfJtuZYc="; + sha256 = "sha256-fTeDRo7gCM1jXTQGm9MsmKu4KvTGDUogF3VSZWk91RM="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { rm -rf $out/opt # Create symlink bzip2 library - ln -s ${bzip2.out}/lib/libbz2.so.1 $out/libbz2.so.1.0 + ln -s ${bzip2.out}/lib/libbz2.so.1 $out/lib/libbz2.so.1.0 ''; meta = with lib; { diff --git a/pkgs/applications/audio/open-music-kontrollers/eteroj.nix b/pkgs/applications/audio/open-music-kontrollers/eteroj.nix new file mode 100644 index 000000000000..60de97ca3d0d --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/eteroj.nix @@ -0,0 +1,10 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "eteroj"; + version = "0.10.0"; + + sha256 = "18iv1sdwm0g6b53shsylj6bf3svmvvy5xadhfsgb4xg39qr07djz"; + + description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/generic.nix b/pkgs/applications/audio/open-music-kontrollers/generic.nix new file mode 100644 index 000000000000..a5ed7c41eb79 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/generic.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libGLU, lv2, serd, sord, libX11, libXext, glew, lv2lint +, pname, version, sha256, description +, url ? "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-${version}.tar.xz" +, additionalBuildInputs ? [] +, postPatch ? "" +, ... +}: + +stdenv.mkDerivation { + inherit pname; + + inherit version; + + inherit postPatch; + + src = fetchurl { + url = url; + sha256 = sha256; + }; + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ + lv2 + sord + libX11 + libXext + glew + lv2lint + ] ++ additionalBuildInputs; + + meta = with lib; { + description = description; + homepage = "https://open-music-kontrollers.ch/lv2/${pname}:"; + license = licenses.artistic2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/open-music-kontrollers/jit.nix b/pkgs/applications/audio/open-music-kontrollers/jit.nix new file mode 100644 index 000000000000..937a6446a8da --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/jit.nix @@ -0,0 +1,12 @@ +{ callPackage, lv2, fontconfig, libvterm-neovim, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "jit"; + version = "unstable-2021-08-15"; + url = "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-1f5d6935049fc0dd5a4dc257b84b36d2048f2d83.tar.xz"; + sha256 = "sha256-XGICowVb0JgLJpn2h9GtViobYTdmo1LJ7/JFEyVsIqU="; + + additionalBuildInputs = [ lv2 fontconfig libvterm-neovim ]; + + description = "A Just-in-Time C/Rust compiler embedded in an LV2 plugin"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/mephisto.nix b/pkgs/applications/audio/open-music-kontrollers/mephisto.nix new file mode 100644 index 000000000000..de707edd3d91 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/mephisto.nix @@ -0,0 +1,17 @@ +{ callPackage, faust, fontconfig, cmake, libvterm-neovim, libevdev, libglvnd, fira-code, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "mephisto"; + version = "0.16.0"; + + sha256 = "0vgr3rsvdj4w0xpc5iqpvyqilk42wr9zs8bg26sfv3f2wi4hb6gx"; + + additionalBuildInputs = [ faust fontconfig cmake libvterm-neovim libevdev libglvnd fira-code ]; + + # see: https://github.com/OpenMusicKontrollers/mephisto.lv2/issues/6 + postPatch = '' + sed -i 's/llvm-c-dsp/llvm-dsp-c/g' mephisto.c + ''; + + description = "A Just-in-time FAUST embedded in an LV2 plugin"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix b/pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix new file mode 100644 index 000000000000..cd431d1a1d3d --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix @@ -0,0 +1,10 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "midi_matrix"; + version = "0.30.0"; + + sha256 = "1nwmfxdzk4pvbwcgi3d7v4flqc10bmi2fxhrhrpfa7cafqs40ib6"; + + description = "An LV2 MIDI channel matrix patcher"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/moony.nix b/pkgs/applications/audio/open-music-kontrollers/moony.nix new file mode 100644 index 000000000000..6087e0553765 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/moony.nix @@ -0,0 +1,13 @@ +{ callPackage, cairo, libvterm-neovim, robodoc, cmake, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "moony"; + version = "0.40.0"; + + sha256 = "sha256-9a3gR3lV8xFFTDZD+fJPCALVztgmggzyIpsPZCOw/uY="; + + additionalBuildInputs = [ cairo libvterm-neovim robodoc cmake ]; + + description = "Realtime Lua as programmable glue in LV2"; + +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/orbit.nix b/pkgs/applications/audio/open-music-kontrollers/orbit.nix new file mode 100644 index 000000000000..930fc17760f9 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/orbit.nix @@ -0,0 +1,12 @@ +{ callPackage, zlib, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "orbit"; + version = "unstable-2021-04-13"; + url = "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-f4aa620fc8d77418856581a6a955192af15b3860.tar.xz"; + sha256 = "0z8d8h2w8fb2zx84n697jvy32dc0vf60jyiyh4gm22prgr2dvgkc"; + + additionalBuildInputs = [ zlib ]; + + description = "An LV2 time event manipulation plugin bundle"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/patchmatrix.nix b/pkgs/applications/audio/open-music-kontrollers/patchmatrix.nix new file mode 100644 index 000000000000..cc343e0330c3 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/patchmatrix.nix @@ -0,0 +1,13 @@ +{ callPackage, libjack2, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "patchmatrix"; + version = "0.26.0"; + + url = "https://git.open-music-kontrollers.ch/lad/${pname}/snapshot/${pname}-${version}.tar.xz"; + sha256 = "sha256-cqPHCnrAhHB6a0xmPUYOAsZfLsqnGpXEuGR1W6i6W7I="; + + additionalBuildInputs = [ libjack2 ]; + + description = "A JACK patchbay in flow matrix style"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/router.nix b/pkgs/applications/audio/open-music-kontrollers/router.nix new file mode 100644 index 000000000000..40d3a5e6fbcd --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/router.nix @@ -0,0 +1,11 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "router"; + version = "unstable-2021-04-13"; + + url = "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-7d754dd64c540d40b828166401617715dc235ca3.tar.xz"; + sha256 = "sha256-LjaW5Xdxfjzd6IJ2ptHzmHt7fhU1HQo7ubZ4USVqRE8="; + + description = "An atom/audio/CV router LV2 plugin bundle"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/sherlock.nix b/pkgs/applications/audio/open-music-kontrollers/sherlock.nix new file mode 100644 index 000000000000..c8ae0afd09a7 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/sherlock.nix @@ -0,0 +1,12 @@ +{ callPackage, sratom, flex, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "sherlock"; + version = "0.28.0"; + + sha256 = "07zj88s1593fpw2s0r3ix7cj2icfd9zyirsyhr2i8l6d30b6n6fb"; + + additionalBuildInputs = [ sratom flex ]; + + description = "Plugins for visualizing LV2 atom, MIDI and OSC events"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/synthpod.nix b/pkgs/applications/audio/open-music-kontrollers/synthpod.nix new file mode 100644 index 000000000000..9b7964e839bf --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/synthpod.nix @@ -0,0 +1,13 @@ +{ callPackage, lilv, libjack2, alsa-lib, zita-alsa-pcmi, libxcb, xcbutilxrm, sratom, gtk2, qt5, libvterm-neovim, robodoc, cmake,... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "synthpod"; + version = "unstable-2021-10-22"; + + url = "https://git.open-music-kontrollers.ch/lv2/synthpod/snapshot/synthpod-6f284bdad882037a522c120af92b96d8abf2de60.tar.xz"; + sha256 = "sha256-59WBlOKum5Pcmq2CfFfRHCNEa8uPCoBk0kSjFlIcypw="; + + additionalBuildInputs = [ lilv libjack2 alsa-lib zita-alsa-pcmi libxcb xcbutilxrm sratom gtk2 qt5.qtbase qt5.wrapQtAppsHook libvterm-neovim robodoc cmake ]; + + description = "Lightweight Nonlinear LV2 Plugin Container"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/vm.nix b/pkgs/applications/audio/open-music-kontrollers/vm.nix new file mode 100644 index 000000000000..8d432d356cf5 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/vm.nix @@ -0,0 +1,10 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "vm"; + version = "0.14.0"; + + sha256 = "013gq7jn556nkk1nq6zzh9nmp3fb36jd7ndzvyq3qryw7khzkagc"; + + description = "A programmable virtual machine LV2 plugin"; +}) diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/applications/audio/orca-c/default.nix index 420055884b45..be40def26441 100644 --- a/pkgs/applications/audio/orca-c/default.nix +++ b/pkgs/applications/audio/orca-c/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation { postPatch = '' patchShebangs tool + sed -i tool \ + -e 's@ncurses_dir=.*@ncurses_dir="${ncurses}"@' \ + -e 's@portmidi_dir=.*@portmidi_dir="${portmidi}"@' tool ''; installPhase = '' diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index f37cf8c5b32d..fffa05915a8e 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,24 +1,46 @@ -{ lib, stdenv, alsa-lib, boost, dbus-glib, fetchsvn, ganv, glibmm -, gtkmm2, libjack2, pkg-config, python2, wafHook +{ lib +, stdenv +, fetchFromGitLab +, alsa-lib +, boost +, dbus-glib +, ganv +, glibmm +, gtkmm2 +, libjack2 +, pkg-config +, python3 +, wafHook }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "patchage"; - version = "1.0.1"; - src = fetchsvn { - url = "http://svn.drobilla.net/lad/trunk/patchage/"; - rev = "5821"; - sha256 = "1ar64l0sg468qzxj7i6ppgfqjpm92awcp5lzskamrf3ln17lrgj7"; + version = "1.0.4"; + + src = fetchFromGitLab { + owner = "drobilla"; + repo = pname; + rev = "v${version}"; + hash = "sha256-feQXACsn2i2pJXs0EA9tIbtpl9Lxx5K4G7eG5VWuDV0="; + fetchSubmodules = true; }; buildInputs = [ - alsa-lib boost dbus-glib ganv glibmm gtkmm2 libjack2 - pkg-config python2 wafHook + alsa-lib + boost + dbus-glib + ganv + glibmm + gtkmm2 + libjack2 + pkg-config + python3 + wafHook ]; meta = { description = "Modular patch bay for Jack and ALSA systems"; - homepage = "http://non.tuxfamily.org"; + homepage = "https://drobilla.net/software/patchage.html"; license = lib.licenses.lgpl3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.nico202 ]; diff --git a/pkgs/applications/audio/patchmatrix/default.nix b/pkgs/applications/audio/patchmatrix/default.nix deleted file mode 100644 index a5d135ce9d45..000000000000 --- a/pkgs/applications/audio/patchmatrix/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, libjack2 -, lv2 -, meson -, ninja -, pkg-config -, glew -, xorg -}: - -stdenv.mkDerivation rec { - pname = "patchmatrix"; - version = "0.26.0"; - - src = fetchFromGitHub { - owner = "OpenMusicKontrollers"; - repo = pname; - rev = version; - hash = "sha256-rR3y5rGzmib//caPmhthvMelAdHRvV0lMRfvcj9kcCg="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - glew - libjack2 - lv2 - xorg.libX11 - xorg.libXext - ]; - - meta = with lib; { - description = "A JACK patchbay in flow matrix style"; - homepage = "https://github.com/OpenMusicKontrollers/patchmatrix"; - license = licenses.artistic2; - maintainers = with maintainers; [ pennae ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index c4c53de90f17..d86223dcdcb1 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "3.9.1"; + version = "4.1.0"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "uassNLdCXx3WLarUMJNhU8fbXugG7yTLMQacPAszLoRdmbMwcN6wT7ED26VhlNVhY3xr02GjZSDw4/LADZWqKw=="; + sha512 = "N+WkH6n7MWfRd2rsk/2b/rABL6pcjpKa1iBZSHslIOEc5fYWjGAxjwwTU0RgSaqptS1DyPeCUeWuphWPZJsQgw=="; }; appimageContents = appimageTools.extractType2 { @@ -33,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/37"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/42"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/plujain-ramp/default.nix b/pkgs/applications/audio/plujain-ramp/default.nix index 56f4d6da050a..d8f5357efdbe 100644 --- a/pkgs/applications/audio/plujain-ramp/default.nix +++ b/pkgs/applications/audio/plujain-ramp/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, lv2 }: stdenv.mkDerivation rec { - version = "v1.1.3"; + version = "1.1.3"; pname = "plujain-ramp"; src = fetchFromGitHub { diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 89d5370fd003..b4f450b31016 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.2.04"; + version = "6.2.09"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-xzEgj4pjW+y46CXtVq4myHKX6DImCibsUz8m0G6F+YQ="; + sha256 = "sha256-BhsbTFwxgWwMwe1ow0ppVsLjfMC7QMA/fq09Utwe+KA="; }; configurePhase = '' diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix new file mode 100644 index 000000000000..d2d4927c1135 --- /dev/null +++ b/pkgs/applications/audio/psst/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchFromGitHub, rustPlatform, alsa-lib, atk, cairo, dbus, gdk-pixbuf, glib, gtk3, pango, pkg-config }: + +rustPlatform.buildRustPackage rec { + pname = "psst"; + version = "unstable-2022-01-25"; + + src = fetchFromGitHub { + owner = "jpochyla"; + repo = pname; + rev = "1627cd4a301dd51e9ee3034294cd7b0d94d02ddc"; + sha256 = "sha256-kepvYhmieXx6Hj79aqaA7tYUnueaBsNx0U4lV7K6LuU="; + }; + + cargoSha256 = "sha256-DcdlQudGyWUUAacV7pAOLDvhd1fgAkEesdxDkHSYm4M="; + # specify the subdirectory of the binary crate to build from the workspace + buildAndTestSubdir = "psst-gui"; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsa-lib + atk + cairo + dbus + gdk-pixbuf + glib + gtk3 + pango + ]; + + meta = with lib; { + description = "Fast and multi-platform Spotify client with native GUI"; + homepage = "https://github.com/jpochyla/psst"; + license = licenses.mit; + maintainers = [ maintainers.vbrandl ]; + }; +} diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 0eaea39f2413..2577f61e8d51 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.39"; + version = "1.43"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-ZmgsNp2fRebbLxSzzCsLdM6/7kBKo+YFUCdWLSYfI5A="; + sha256 = "sha256-+sHGjgDqizv/9n0dDj8knsl+4MBfO3/pMkmD+MPsuNM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index 16ef4ed6e45e..e7e8c73c9c1b 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.5.0.3"; + version = "0.6.1.0"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "sha256-8bgi621psvUlhiLyZ15tKGmGOs6HTf5/6Ru2Z9l8QIo="; + sha256 = "sha256-zkDMZT1kKCLqNvvxZFKVuXFqZptX/LG/R9kRUcNJphw="; }; nativeBuildInputs = [ qmake pkg-config ]; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index efa1d9436100..701e6fffbbb8 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,26 +1,62 @@ -{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook, chromaprint }: +{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: +# As of 2.1, puddletag has started pinning versions of all dependencies that it +# was built against which is an issue as the chances of us having the exact same +# versions in nixpkgs are slim to none. +# +# There is a difference between explicit and implicit version requirements and +# we should be able to safely ignore the latter. Therefore use requirements.in +# which contains just the explicit version dependencies instead of +# requirements.txt. +# +# Additionally, we do need to override some of the explicit requirements through +# `overrideVersions`. While we technically run the risk of breaking something by +# ignoring the pinned versions, it's just something we will have to accept +# unless we want to vendor those versions. + +let + # NOTE: check if we can drop any of these overrides when bumping the version + overrideVersions = [ + "pyparsing" + "pyqt5" + ]; + +in python3Packages.buildPythonApplication rec { pname = "puddletag"; - version = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { - owner = "keithgg"; + owner = "puddletag"; repo = "puddletag"; rev = version; - sha256 = "sha256-9l8Pc77MX5zFkOqU00HFS8//3Bzd2OMnVV1brmWsNAQ="; + hash = "sha256-eilETaFvvPMopIbccV1uLbpD55kHX9KGTCcGVXaHPgM="; }; - sourceRoot = "source/source"; + postPatch = '' + substituteInPlace setup.py \ + --replace share/pixmaps share/icons + + cp requirements.in requirements.txt + '' + lib.concatMapStringsSep "\n" + (e: '' + sed -i requirements.txt -e 's/^${e}.*/${e}/' + '') + overrideVersions; nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ chromaprint ] ++ (with python3Packages; [ + propagatedBuildInputs = with python3Packages; [ + pyacoustid + chromaprint configobj + levenshtein + lxml mutagen pyparsing pyqt5 - ]); + rapidfuzz + ]; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") @@ -33,8 +69,8 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "An audio tag editor similar to the Windows program, Mp3tag"; homepage = "https://docs.puddletag.net"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ peterhoeg dschrempf ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index ebda772b9bd3..44f7b2613936 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.10"; + version = "0.8.9.16"; propagatedBuildInputs = with python3Packages; [ requests @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { owner = "coderholic"; repo = pname; rev = version; - sha256 = "1cvrvy5ll97yyrzakxr8lb25qxmzk9fvcabsgc98jf89ikxgax4w"; + sha256 = "sha256-uerQfyGHWhLbO6UkLSMA1tdfW/8fDQkcm6hYIdwwC7I="; }; checkPhase = '' diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix index 618062dc2f37..487f86cf660f 100644 --- a/pkgs/applications/audio/qmidiarp/default.nix +++ b/pkgs/applications/audio/qmidiarp/default.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { - name = "qmidiarp"; + pname = "qmidiarp"; version = "0.6.5"; src = fetchgit { url = "https://git.code.sf.net/p/qmidiarp/code"; sha256 = "1g2143gzfbihqr2zi3k2v1yn1x3mwfbb2khmcd4m4cq3hcwhhlx9"; - rev = "qmidiarp-0.6.5"; + rev = "qmidiarp-${version}"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 460b97479c6c..bed02f77e7b2 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -58,6 +58,5 @@ mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - repositories.svn = "https://svn.code.sf.net/p/qmmp-dev/code"; }; } diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index c92e9cf7a46b..860eca652e7a 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-SGx80fMFomNEa/jgH8Yeof+f7zXCDxx3Yqd0GxHZGMw="; + sha256 = "sha256-BBvF1L3IqkYqSghHxcbwOBizdu6GtxaWof3Q/bc+aTY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix index 96053d08d00f..af22a9dce67c 100644 --- a/pkgs/applications/audio/r128gain/default.nix +++ b/pkgs/applications/audio/r128gain/default.nix @@ -1,8 +1,7 @@ { lib , fetchFromGitHub -, genericUpdater +, gitUpdater , substituteAll -, common-updater-scripts , ffmpeg , python3Packages , sox @@ -33,12 +32,7 @@ python3Packages.buildPythonApplication rec { # sandbox to be disabled. doCheck = false; - passthru = { - updateScript = genericUpdater { - inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; - }; - }; + passthru.updateScript = gitUpdater { inherit pname version; }; meta = with lib; { description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)"; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index b7f6bb3ee373..820475be0c65 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.43"; + version = "6.47"; src = fetchurl { url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${stdenv.hostPlatform.qemuArch}.tar.xz"; hash = { - x86_64-linux = "sha256-VQ91px9YZWbrw31fFQxS+H/6fsjkLDrYU6FtI8eSq6E="; - aarch64-linux = "sha256-x6z5+H7ASWiuNL0maNGK05VmJptHdFGRiFf6DgwlZDw="; + x86_64-linux = "sha256-31HmIx/ohbrzu5uj8KOOZiHNCmXwng9h+fIGaJfYyqA="; + aarch64-linux = "sha256-CMmcBpaZ6BEZJ1144aQhOJ/o2NrGD7/8aq+ObLVMXYE="; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/audio/redux/default.nix b/pkgs/applications/audio/redux/default.nix new file mode 100644 index 000000000000..45ee78917ace --- /dev/null +++ b/pkgs/applications/audio/redux/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchurl +, libX11 +, alsa-lib +, autoPatchelfHook +, releasePath ? null +}: + +# To use the full release version (same as renoise): +# 1) Sign into https://backstage.renoise.com and download the release version to some stable location. +# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle. +# Note: Renoise creates an individual build for each license which screws somewhat with the +# use of functions like requireFile as the hash will be different for every user. + +stdenv.mkDerivation rec { + pname = "redux"; + version = "1.2.2"; + + src = if releasePath != null then releasePath + else fetchurl { + url = "https://files.renoise.com/demo/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux.tar.gz"; + sha256 = "0zbwsg7nh9x3q29jv2kpqb3vwi0ksdwybhb4m2qr95rxrpx1kxhm"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ libX11 alsa-lib stdenv.cc.cc.lib ]; + + installPhase = '' + runHook preInstall + + OUTDIR=$out/lib/vst2/RenoiseRedux.vst2 + mkdir -p $OUTDIR + cp -r ./renoise_redux_x86_64/* $OUTDIR + + runHook postInstall + ''; + + meta = with lib; { + description = "Sample-based instrument, with a powerful phrase sequencer"; + homepage = "https://www.renoise.com/products/redux"; + license = licenses.unfree; + maintainers = with maintainers; [ mihnea-s ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 4898648599c3..2f35f1fe65ca 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -10,6 +10,7 @@ , libnotify , libdmapsharing , gnome +, gobject-introspection , totem-pl-parser , tdb , json-glib @@ -65,6 +66,9 @@ in stdenv.mkDerivation rec { totem-pl-parser gnome.adwaita-icon-theme + gobject-introspection + python3.pkgs.pygobject3 + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -83,6 +87,12 @@ in stdenv.mkDerivation rec { "--with-libsecret" ]; + preFixup = '' + gappsWrapperArgs+=( + --prefix PYTHONPATH : "${python3.pkgs.pygobject3}/${python3.sitePackages}:$out/lib/rhythmbox/plugins/" + ) + ''; + enableParallelBuilding = true; passthru = { diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/applications/audio/roomeqwizard/default.nix index 9d4118a43915..b02ab65cd87c 100644 --- a/pkgs/applications/audio/roomeqwizard/default.nix +++ b/pkgs/applications/audio/roomeqwizard/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "roomeqwizard"; - version = "5.20.4"; + version = "5.20.5"; src = fetchurl { url = "https://www.roomeqwizard.com/installers/REW_linux_${lib.replaceChars [ "." ] [ "_" ] version}.sh"; - sha256 = "0m2b5hwazy4vyjk51cmayys250rircs3c0v7bv5mn28h7hyq29s8"; + sha256 = "NYTRiOZmwkni4k+jI2SV84z5umO7+l+eKpwPCdlDD3U="; }; dontUnpack = true; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "REW"; genericName = "Software for audio measurements"; - categories = "AudioVideo;"; + categories = [ "AudioVideo" ]; }; responseFile = writeTextFile { diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix index e8a275db98d8..0af80c991c2e 100644 --- a/pkgs/applications/audio/rubyripper/default.nix +++ b/pkgs/applications/audio/rubyripper/default.nix @@ -1,26 +1,38 @@ -{ lib, stdenv, fetchurl, ruby, cdparanoia, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, makeWrapper +, cdparanoia, cddiscid, ruby }: + stdenv.mkDerivation rec { - version = "0.6.2"; + version = "0.8.0rc3"; pname = "rubyripper"; - src = fetchurl { - url = "https://rubyripper.googlecode.com/files/rubyripper-${version}.tar.bz2"; - sha256 = "1fwyk3y0f45l2vi3a481qd7drsy82ccqdb8g2flakv58m45q0yl1"; + + src = fetchFromGitHub { + owner = "bleskodev"; + repo = pname; + rev = "v${version}"; + sha256 = "1qfwv8bgc9pyfh3d40bvyr9n7sjc2na61481693wwww640lm0f9f"; }; preConfigure = "patchShebangs ."; configureFlags = [ "--enable-cli" ]; + nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ruby cdparanoia ]; - postInstall = '' - wrapProgram "$out/bin/rrip_cli" \ - --prefix PATH : "${ruby}/bin" \ - --prefix PATH : "${cdparanoia}/bin" + + buildInputs = [ + cddiscid + cdparanoia + ruby + ]; + + postFixup = '' + wrapProgram $out/bin/rrip_cli \ + --prefix PATH : ${lib.makeBinPath [ cddiscid cdparanoia ruby ]} ''; meta = with lib; { description = "High quality CD audio ripper"; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; + homepage = "https://github.com/bleskodev/rubyripper"; }; } diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index ce55516a40d4..7439e566da26 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20211116"; + version = "20220125"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1kcw4rwphyqh0hwwjsydzwg484xj17rb5lc8pfsixsg77z50ayzz"; + sha256 = "sha256-Hqbm5+YyCde/6QuyIy4NE/jG4xNDzeNjEefMr60GEZM="; }; configureFlags = [ "--enable-dependency-tracking" ] diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix index bf8b826f544f..0ffd754c0476 100644 --- a/pkgs/applications/audio/sfxr-qt/default.nix +++ b/pkgs/applications/audio/sfxr-qt/default.nix @@ -1,26 +1,36 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , cmake , extra-cmake-modules , qtbase , qtquickcontrols2 , SDL , python3 +, callPackage +, nixosTests }: mkDerivation rec { pname = "sfxr-qt"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "agateau"; repo = "sfxr-qt"; rev = version; - sha256 = "sha256-Mn+wcwu70BwsTLFlc12sOOe6U1AJ8hR7bCIPlPnCooE="; + sha256 = "sha256-Ce5NJe1f+C4pPmtenHYvtkxste+nPuxJoB+N7K2nyRo="; fetchSubmodules = true; }; + # Remove on next release + patches = [(fetchpatch { + name = "sfxr-qr-missing-qpainterpath-include"; + url = "https://github.com/agateau/sfxr-qt/commit/ef051f473654052112b647df987eb263e38faf47.patch"; + sha256 = "sha256-bqMnxHUzdS5oG/2hfr5MvkpwrtZW+GTN5fS2WpV2W2c="; + })]; + nativeBuildInputs = [ cmake extra-cmake-modules @@ -33,6 +43,11 @@ mkDerivation rec { SDL ]; + passthru.tests = { + export-square-wave = callPackage ./test-export-square-wave {}; + sfxr-qt-starts = nixosTests.sfxr-qt; + }; + meta = with lib; { homepage = "https://github.com/agateau/sfxr-qt"; description = "A sound effect generator, QtQuick port of sfxr"; diff --git a/pkgs/applications/audio/sfxr-qt/test-export-square-wave/default.nix b/pkgs/applications/audio/sfxr-qt/test-export-square-wave/default.nix new file mode 100644 index 000000000000..eea0d0743e6a --- /dev/null +++ b/pkgs/applications/audio/sfxr-qt/test-export-square-wave/default.nix @@ -0,0 +1,6 @@ +{ runCommand, sfxr-qt }: + +runCommand "sfxr-qt-test-export-square-wave" '' + mkdir $out + ${sfxr-qt}/bin/sfxr-qt --export --output $out/output.wav ${./input.sfxj} +'' diff --git a/pkgs/applications/audio/sfxr-qt/test-export-square-wave/input.sfxj b/pkgs/applications/audio/sfxr-qt/test-export-square-wave/input.sfxj new file mode 100644 index 000000000000..5ffd33b93f97 --- /dev/null +++ b/pkgs/applications/audio/sfxr-qt/test-export-square-wave/input.sfxj @@ -0,0 +1,29 @@ +{ + "properties": { + "attackTime": 0, + "baseFrequency": 1, + "changeAmount": 0, + "changeSpeed": 0, + "decayTime": 1, + "deltaSlide": 0, + "dutySweep": 0, + "hpFilterCutoff": 0, + "hpFilterCutoffSweep": 0, + "lpFilterCutoff": 1, + "lpFilterCutoffSweep": 0, + "lpFilterResonance": 0, + "minFrequency": 0, + "phaserOffset": 0, + "phaserSweep": 0, + "repeatSpeed": 0, + "slide": 0, + "squareDuty": 0, + "sustainPunch": 0, + "sustainTime": 1, + "vibratoDepth": 0, + "vibratoSpeed": 0, + "volume": 1, + "waveForm": "Square" + }, + "version": 1 +} diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 73f1f650677c..9aef427f509f 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "sidplayfp"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${version}"; - sha256 = "sha256-DBZZf3A0AYkeQxQvHGyHHbsQ2EDuxsZnZPbxkWTNcHA="; + sha256 = "sha256-R60Dh19GYM157ysmN8EOJ47eO8a7sdkEEF1TObG1xzk="; }; nativeBuildInputs = [ autoreconfHook perl pkg-config ]; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index 3ecd4665f262..5aa407a15023 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, lv2, pkg-config, libGLU, libGL, cairo, pango, libjack2 }: let - name = "sisco.lv2-${version}"; version = "0.7.0"; robtkVersion = "80a2585253a861c81f0bfb7e4579c75f5c73af89"; @@ -22,7 +21,8 @@ let }; in stdenv.mkDerivation rec { - inherit name; + pname = "sisco.lv2"; + inherit version; srcs = [ src robtkSrc ]; sourceRoot = src.name; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index fa511837207a..01e8f5d23611 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "22.0"; + version = "22.2"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-QK5lq2ek1yn3G0Ecs+TFIG5ST3lAETiyxuXIic3v1ik="; + sha256 = "sha256-MZ8Vm/d+0r7YsXdySKcH5rqXBh4iFLyUe44LBOD58E0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/applications/audio/songrec/default.nix index 60fbd3a2888a..03cfae066b2c 100644 --- a/pkgs/applications/audio/songrec/default.nix +++ b/pkgs/applications/audio/songrec/default.nix @@ -6,24 +6,25 @@ , alsa-lib , pkg-config , ffmpeg +, dbus }: rustPlatform.buildRustPackage rec { pname = "songrec"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "marin-m"; repo = pname; rev = version; - sha256 = "sha256-pKHKM4XOuuZCr4neMe1AVqWMuZghwYNe+ifJCQhXG/c="; + sha256 = "sha256-aHZH3sQNUUPcMRySy8Di0XUoFo4qjGi2pi0phLwORaA="; }; - cargoSha256 = "sha256-J3ezXBOGJwzIPTHXujHpswsgh9PFy110AOQ2pPJNm10="; + cargoSha256 = "sha256-EpkB43rMUJO6ouUV9TmQ+RSnGhX32DZHpKic1E6lUyU="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib gtk3 openssl ffmpeg ]; + buildInputs = [ alsa-lib dbus gtk3 openssl ffmpeg ]; postInstall = '' mv packaging/rootfs/usr/share $out/share diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index f7a3e2e36744..e9d8f979e4ad 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -4,7 +4,11 @@ , fetchFromGitHub , fftwSinglePrec , ruby +, erlang , aubio +, alsa-lib +, rtmidi +, libsndfile , cmake , pkg-config , boost @@ -12,25 +16,43 @@ , jack2 , supercollider , qwt -, osmid }: let supercollider_single_prec = supercollider.override { fftw = fftwSinglePrec; }; + pname = "sonic-pi"; + version = "3.3.1"; + src = fetchFromGitHub { + owner = "sonic-pi-net"; + repo = "sonic-pi"; + rev = "v${version}"; + sha256 = "sha256-AE7iuSNnW1SAtBMplReGzXKcqD4GG23i10MIAWnlcPo="; + }; + + # sonic pi uses it's own aubioonset with hardcoded parameters but will compile a whole aubio for it + # let's just build the aubioonset instead and link against aubio from nixpkgs + aubioonset = mkDerivation { + name = "aubioonset"; + src = src; + sourceRoot = "source/app/external/aubio/examples"; + buildInputs = [jack2 aubio libsndfile]; + patchPhase = '' + sed -i "s@@@" jackio.c utils.h + ''; + buildPhase = '' + gcc -o aubioonset -laubio jackio.c utils.c aubioonset.c + ''; + installPhase = '' + install -D aubioonset $out/aubioonset + ''; + }; + in mkDerivation rec { - version = "3.2.2"; - pname = "sonic-pi"; - - src = fetchFromGitHub { - owner = "samaaron"; - repo = "sonic-pi"; - rev = "v${version}"; - sha256 = "1nlkpkpg9iz2hvf5pymvk6lqhpdpjbdrvr0hrnkc3ymj7llvf1cm"; - }; + inherit pname version src; buildInputs = [ bash @@ -42,42 +64,36 @@ mkDerivation rec { aubio supercollider_single_prec boost + erlang + alsa-lib + rtmidi ]; dontUseCmakeConfigure = true; - preConfigure = '' - patchShebangs . - substituteInPlace app/gui/qt/mainwindow.cpp \ - --subst-var-by ruby "${ruby}/bin/ruby" \ - --subst-var out + prePatch = '' + sed -i '/aubio/d' app/external/linux_build_externals.sh + sed -i '/aubio/d' app/linux-prebuild.sh + patchShebangs app + ''; + + configurePhase = '' + runHook preConfigure + + ./app/linux-prebuild.sh + ./app/linux-config.sh + + runHook postConfigure ''; buildPhase = '' - export SONIC_PI_HOME=$TMPDIR - export AUBIO_LIB=${aubio}/lib/libaubio.so - export OSMID_DIR=app/server/native/osmid + runHook preBuild - mkdir -p $OSMID_DIR - cp ${osmid}/bin/{m2o,o2m} $OSMID_DIR - - pushd app/server/ruby/bin - ./compile-extensions.rb - ./i18n-tool.rb -t + pushd app/build + cmake --build . --config Release popd - pushd app/gui/qt - cp -f utils/ruby_help.tmpl utils/ruby_help.h - ../../server/ruby/bin/qt-doc.rb -o utils/ruby_help.h - - lrelease lang/*.ts - - mkdir build - pushd build - cmake -G "Unix Makefiles" .. - make - popd - popd + runHook postBuild ''; installPhase = '' @@ -90,10 +106,14 @@ mkDerivation rec { mkdir -p $out/app cp -r app/server $out/app/ + # We didn't build this during linux-prebuild.sh so copy from the separate derivation + cp ${aubioonset}/aubioonset $out/app/server/native/ + # Copy only necessary files for the gui app. - mkdir -p $out/app/gui/qt/build + mkdir -p $out/app/gui/qt cp -r app/gui/qt/{book,fonts,help,html,images,image_source,info,lang,theme} $out/app/gui/qt/ - cp app/gui/qt/build/sonic-pi $out/app/gui/qt/build/sonic-pi + mkdir -p $out/app/build/gui/qt + cp app/build/gui/qt/sonic-pi $out/app/build/gui/qt/sonic-pi runHook postInstall ''; @@ -102,20 +122,18 @@ mkDerivation rec { dontWrapQtApps = true; preFixup = '' wrapQtApp "$out/bin/sonic-pi" \ - --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider ] } \ - --set AUBIO_LIB "${aubio}/lib/libaubio.so" + --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider erlang] } makeWrapper \ $out/app/server/ruby/bin/sonic-pi-server.rb \ $out/bin/sonic-pi-server \ - --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider ] } \ - --set AUBIO_LIB "${aubio}/lib/libaubio.so" + --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider erlang ] } ''; meta = { homepage = "https://sonic-pi.net/"; description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict ]; + maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict sohalt ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/sony-headphones-client/default.nix b/pkgs/applications/audio/sony-headphones-client/default.nix index 976c4ab5702c..e3e6573c4324 100644 --- a/pkgs/applications/audio/sony-headphones-client/default.nix +++ b/pkgs/applications/audio/sony-headphones-client/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { icon = "SonyHeadphonesClient"; desktopName = "Sony Headphones Client"; comment = "A client recreating the functionality of the Sony Headphones app"; - categories = "Audio;Mixer;"; + categories = [ "Audio" "Mixer" ]; }) ]; meta = with lib; { diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index c03b48c436bf..f162dcd045d8 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -28,6 +29,15 @@ stdenv.mkDerivation rec { sha256 = "08d5d81rz9sj3m5paw8fwbgxmhlbr7bcjdzpmzj832qvg8smydxf"; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:2:5: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/sound-juicer/-/commit/9f97ca1faca396099f52264a9729aa355f8d122e.patch"; + sha256 = "8JllVSQgI7KiBI5WP6QtXRiggYuD89NSJJp1hP4Dbao="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/applications/audio/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix new file mode 100644 index 000000000000..c0966e9ab3fd --- /dev/null +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -0,0 +1,85 @@ +{ lib, fetchurl +# Optional due to unfree license. +, faacSupport ? false +, glib, python3Packages, gtk3, wrapGAppsHook +, gsettings-desktop-schemas, intltool, xvfb-run +, gobject-introspection, gst_all_1, fdk-aac-encoder }: + +python3Packages.buildPythonApplication rec { + pname = "soundconverter"; + version = "4.0.3"; + + src = fetchurl { + url = "https://launchpad.net/soundconverter/trunk/${version}/+download/${pname}-${version}.tar.gz"; + sha256 = "sha256-hzIG/4LD3705erPYvXb7uoRwF9LtKKIKB3jrhpYMsZ0="; + }; + + buildInputs = [ + gtk3 + fdk-aac-encoder + gobject-introspection + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + (gst_all_1.gst-plugins-bad.override { inherit faacSupport; }) + ]; + + nativeBuildInputs = [ + intltool + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + python3Packages.gst-python + python3Packages.distutils_extra + python3Packages.setuptools + python3Packages.pygobject3 + ]; + + checkInputs = [ + xvfb-run + ]; + + postPatch = '' + substituteInPlace bin/soundconverter --replace \ + "DATA_PATH = os.path.join(SOURCE_PATH, 'data')" \ + "DATA_PATH = '$out/share/soundconverter'" + ''; + + preCheck = let + self = { outPath = "$out"; name = "${pname}-${version}"; }; + xdgPaths = lib.concatMapStringsSep ":" glib.getSchemaDataDirPath; + in '' + export HOME=$TMPDIR + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${xdgPaths [gtk3 gsettings-desktop-schemas self]} + # FIXME: Fails due to weird Gio.file_parse_name() behavior. + sed -i '49 a\ @unittest.skip("Gio.file_parse_name issues")' tests/testcases/names.py + '' + lib.optionalString (!faacSupport) '' + substituteInPlace tests/testcases/integration.py --replace \ + "for encoder in ['fdkaacenc', 'faac', 'avenc_aac']:" \ + "for encoder in ['fdkaacenc', 'avenc_aac']:" + ''; + + checkPhase = '' + runHook preCheck + xvfb-run python tests/test.py + runHook postCheck + ''; + + # Necessary to set GDK_PIXBUF_MODULE_FILE. + strictDeps = false; + + meta = with lib; { + homepage = "https://soundconverter.org/"; + description = "Leading audio file converter for the GNOME Desktop"; + longDescription = '' + SoundConverter reads anything the GStreamer library can read, + and writes WAV, FLAC, MP3, AAC and Ogg Vorbis files. + Uses Python and GTK+ GUI toolkit, and runs on X Window System. + ''; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ jakubgs ]; + }; +} diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index 1c1724fbce8b..d85367626416 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -45,7 +45,7 @@ let runtimeDeps = [] in mkDerivation rec { - name = "soundkonverter"; + pname = "soundkonverter"; version = "3.0.1"; src = fetchFromGitHub { owner = "dfaust"; diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index fa9860ab248c..3ec2cda4280b 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv -, fetchgit +{ lib +, stdenv +, fetchFromGitHub , autoreconfHook , help2man , pkg-config @@ -11,24 +12,25 @@ , boost , ecasound , glibcLocales -, libGLU, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL +, libGLU +, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL }: stdenv.mkDerivation { - pname = "soundscape-renderer-unstable"; + pname = "soundscape-renderer"; + version = "unstable-2016-11-03"; - version = "2016-11-03"; - - src = fetchgit { - url = "https://github.com/SoundScapeRenderer/ssr"; + src = fetchFromGitHub { + owner = "SoundScapeRenderer"; + repo = "ssr"; rev = "0dd0136dd24e47b63d8a4e05de467f5c7b047ec9"; - sha256 = "095x2spv9bmg6pi71mpajnghbqj58ziflg16f9854awx0qp9d8x7"; + sha256 = "sha256-9s+Elaxz9kX+Nle1CqBU/9r0hdI4dhsJ6GrNqvP5HIs="; }; # Without it doesn't find all of the boost libraries. - BOOST_LIB_DIR="${boost}/lib"; + BOOST_LIB_DIR = "${boost}/lib"; # uses the deprecated get_generic_category() in boost_system - NIX_CFLAGS_COMPILE="-DBOOST_SYSTEM_ENABLE_DEPRECATED=1"; + NIX_CFLAGS_COMPILE = "-DBOOST_SYSTEM_ENABLE_DEPRECATED=1"; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix index e91cc9cc0207..3fe3b0d06d31 100644 --- a/pkgs/applications/audio/spot/default.nix +++ b/pkgs/applications/audio/spot/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { pname = "spot"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "xou816"; repo = "spot"; rev = version; - hash = "sha256-An9PJsuXZkvJhP67cisWxFd2dpky53EY/xcR6StgWFY="; + hash = "sha256-uZzylK9imEazwC/ogsDO8ZBvByE5/SNSV+mIlp7Z9Ww="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-2qMmPIBoZS6WT06VzCmnYWaIfLzWN2HUvk7y9GKuuXg="; + hash = "sha256-v5xdlsI6OlEpCYOTFePTyI8BkIrAwT6FR2JwiRTGgOA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index f38bd678d9ef..aa04eba7fe8a 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -10,14 +10,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.1.72.439.gc253025e"; + version = "1.1.80.699.gc3dac750"; # 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 = "56"; + rev = "58"; deps = [ alsa-lib @@ -80,7 +80,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"; - sha512 = "b2bd3d49a18dfebaa4660f9c39d11d57fb80a4ef15ec7b7973e3cc07be74f74aebd2d8c66360d79fe778244c533ed02f9dfca4085f99aae0e5faae7c003ba4ef"; + sha512 = "91385a5a8de31d6e9f1945d23108447fd369c1cdc2e4d95cbb7cec5d403c3be14a1b0fabe3fb01aef809a39b033d289add1bcb307ab19c7fcb63689dbae57c53"; }; nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ]; diff --git a/pkgs/applications/audio/sptlrx/default.nix b/pkgs/applications/audio/sptlrx/default.nix new file mode 100644 index 000000000000..2ec9562c6202 --- /dev/null +++ b/pkgs/applications/audio/sptlrx/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "sptlrx"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "raitonoberu"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-b38DACSdnjwPsLMrkt0Ubpqpn/4SDAgrdSlp9iAcxfE="; + }; + + vendorSha256 = "sha256-/fqWnRQBpLNoTwqrFDKqQuv1r9do1voysBhLuj223S0="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Spotify lyrics in your terminal"; + homepage = "https://github.com/raitonoberu/sptlrx"; + license = licenses.mit; + maintainers = with maintainers; [ MoritzBoehme ]; + }; +} diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 31fe69b00de5..5fc0d6f4200f 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -1,39 +1,50 @@ -{ lib, stdenv, fetchFromGitHub -, alsa-lib, flac, libmad, libvorbis, mpg123 +{ lib +, stdenv +, fetchFromGitHub +, alsa-lib +, flac +, libmad +, libpulseaudio +, libvorbis +, mpg123 +, audioBackend ? "alsa" , dsdSupport ? true -, faad2Support ? true, faad2 -, ffmpegSupport ? true, ffmpeg -, opusSupport ? true, opusfile -, resampleSupport ? true, soxr -, sslSupport ? true, openssl +, faad2Support ? true +, faad2 +, ffmpegSupport ? true +, ffmpeg +, opusSupport ? true +, opusfile +, resampleSupport ? true +, soxr +, sslSupport ? true +, openssl }: let - concatStringsSep = lib.concatStringsSep; - optional = lib.optional; - opts = [ "-DLINKALL" ] - ++ optional dsdSupport "-DDSD" - ++ optional (!faad2Support) "-DNO_FAAD" - ++ optional ffmpegSupport "-DFFMPEG" - ++ optional opusSupport "-DOPUS" - ++ optional resampleSupport "-DRESAMPLE" - ++ optional sslSupport "-DUSE_SSL"; + inherit (lib) optional optionalString; -in stdenv.mkDerivation { - pname = "squeezelite"; + pulseSupport = audioBackend == "pulse"; + binName = "squeezelite${optionalString pulseSupport "-pulse"}"; + +in +stdenv.mkDerivation { + # the nixos module uses the pname as the binary name + pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "1.9.6.1196"; + version = "1.9.9.1401"; src = fetchFromGitHub { - owner = "ralph-irving"; - repo = "squeezelite"; - rev = "2b508464dce2cbdb2a3089c58df2a6fbc36328c0"; - sha256 = "024ypr1da2r079k3hgiifzd3d3wcfprhbl5zdm40zm0c7frzmr8i"; + owner = "ralph-irving"; + repo = "squeezelite"; + rev = "894df3ea80f66a27a9ae5fab918acf62a6798b8b"; + hash = "sha256-LIi+9vb0+56AGvVrLx4gQaUkUNjIi6PmqrLViLT1DSU="; }; - buildInputs = [ alsa-lib flac libmad libvorbis mpg123 ] + buildInputs = [ flac libmad libvorbis mpg123 ] + ++ lib.singleton (if pulseSupport then libpulseaudio else alsa-lib) ++ optional faad2Support faad2 ++ optional ffmpegSupport ffmpeg ++ optional opusSupport opusfile @@ -47,15 +58,22 @@ in stdenv.mkDerivation { --replace "" "" ''; - preBuild = '' - export OPTS="${concatStringsSep " " opts}" - ''; + EXECUTABLE = binName; + + OPTS = [ "-DLINKALL" ] + ++ optional dsdSupport "-DDSD" + ++ optional (!faad2Support) "-DNO_FAAD" + ++ optional ffmpegSupport "-DFFMPEG" + ++ optional opusSupport "-DOPUS" + ++ optional pulseSupport "-DPULSEAUDIO" + ++ optional resampleSupport "-DRESAMPLE" + ++ optional sslSupport "-DUSE_SSL"; installPhase = '' runHook preInstall - install -Dm755 -t $out/bin squeezelite - install -Dm644 -t $out/share/doc/squeezelite *.txt *.md + install -Dm555 -t $out/bin ${binName} + install -Dm444 -t $out/share/doc/squeezelite *.txt *.md runHook postInstall ''; @@ -63,7 +81,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Lightweight headless squeezebox client emulator"; homepage = "https://github.com/ralph-irving/squeezelite"; - license = with licenses; [ gpl3 ] ++ optional dsdSupport bsd2; + license = with licenses; [ gpl3Plus ] ++ optional dsdSupport bsd2; maintainers = with maintainers; [ samdoshi ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix index 4a7f819e2904..1d3bb0e0beeb 100644 --- a/pkgs/applications/audio/squishyball/default.nix +++ b/pkgs/applications/audio/squishyball/default.nix @@ -1,22 +1,34 @@ -{ lib, stdenv, autoreconfHook, fetchsvn, flac, libao, libvorbis, ncurses +{ lib, stdenv, autoreconfHook, fetchFromGitLab, fetchpatch, flac, libao, libvorbis, ncurses , opusfile, pkg-config }: stdenv.mkDerivation rec { - name = "squishyball-${rev}"; - rev = "19580"; + pname = "squishyball"; + version = "unstable-2020-11-23"; - src = fetchsvn { - url = "https://svn.xiph.org/trunk/squishyball"; - rev = rev; - sha256 = "013vq52q9z6kpg9iyc2jnb3m2gihcjblvwpg4yj4wy1q2c05pzqp"; + src = fetchFromGitLab { + domain = "gitlab.xiph.org"; + owner = "xiph"; + repo = "squishyball"; + rev = "27590fe6bac545e2dd3eacf048edbd969682263a"; + sha256 = "07zs8wx1ahf3q505fk9b6cgzlkhnayfsscch46yy9s1wgxgphj7s"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ flac libao libvorbis ncurses opusfile ]; - patches = [ ./gnu-screen.patch ]; + patches = [ + ./gnu-screen.patch + + # Patch pending upstream inclusion for ncurses-6.3 support: + # https://gitlab.xiph.org/xiph/squishyball/-/issues/1 + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://gitlab.xiph.org/xiph/squishyball/uploads/5609ceaf85ebb6dc297c0efe61b9a1b7/0001-mincurses.c-use-ncurses-API-to-enter-raw-mode-ncurse.patch"; + sha256 = "06llp7cd77f4vvhz8qdld551dnlpjxf98j7rmp3i1x1kng4f0iy3"; + }) + ]; postInstall = '' # Why doesn’t this happen automagically? @@ -40,7 +52,7 @@ stdenv.mkDerivation rec { comparisons of groups of up to ten samples; this is the default mode of operation. ''; - homepage = "https://svn.xiph.org/trunk/squishyball"; + homepage = "https://gitlab.xiph.org/xiph/squishyball"; license = licenses.gpl2Plus; maintainers = with maintainers; [ michalrus ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index e3200d8e43f1..fb440c6dc514 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -36,13 +36,13 @@ mkDerivation rec { pname = "strawberry"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "sha256-MlS1ShRXfsTMs97MeExW6sfpv40OcQLDIzIzOYGk7Rw="; + sha256 = "sha256-wa7r6maHAgCTD/TFjqtMuoRt1BqQ38T8KpbMUOoS2ZE="; }; buildInputs = [ @@ -72,6 +72,7 @@ mkDerivation rec { gstreamer gst-plugins-base gst-plugins-good + gst-plugins-bad gst-plugins-ugly ]) ++ lib.optional withVlc libvlc; diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 7c5c378d2faf..503079b9ed4b 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "SunVox"; - version = "1.9.6c"; + version = "2.0e"; src = fetchurl { - url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "10lqbm1grw0sqasx7i6528cishv5ksdf9zbb3ygxd8c1iwaxzhb9"; + url = "https://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; + sha256 = "sha256-v4dQnRr7pusOAHX8ytDChKixYxEIjg30vOTD6uA/S0o="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/audio/synaesthesia/default.nix b/pkgs/applications/audio/synaesthesia/default.nix new file mode 100644 index 000000000000..efdd6f7e73a7 --- /dev/null +++ b/pkgs/applications/audio/synaesthesia/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, lib +, fetchzip +, SDL +, pkg-config +, libSM +}: +stdenv.mkDerivation rec { + pname = "synaesthesia"; + version = "2.4"; + + src = fetchzip { + url = "https://logarithmic.net/pfh-files/synaesthesia/synaesthesia-${version}.tar.gz"; + sha256 = "0nzsdxbah0shm2vlziaaw3ilzlizd3d35rridkpg40nfxmq84qnx"; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + SDL + libSM + ]; + + meta = { + homepage = "https://logarithmic.net/pfh/synaesthesia"; + description = "Program for representing sounds visually"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.infinisil ]; + }; +} diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 8213aeb5fe50..d9effb3f1afe 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -5,6 +5,7 @@ , python3Packages , ffmpeg , flac +, librsvg , gobject-introspection , gtk3 , libnotify @@ -20,23 +21,22 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "6.7.1"; + version = "7.1.3"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "1hm82yfq7q2akrrvff3vmwrd3bz34d2dk8jzhnizhnhar6xc6fzp"; + sha256 = "sha256-UadE8qsQxRjE+POHLAUY1tRUInNXsMEqTAP02zSDSZ4="; }; postPatch = '' substituteInPlace tauon.py \ --replace 'install_mode = False' 'install_mode = True' \ - --replace 'install_directory = os.path.dirname(__file__)' 'install_directory = "${placeholder "out"}/share/tauon"' + --replace 'install_directory = os.path.dirname(os.path.abspath(__file__))' 'install_directory = "${placeholder "out"}/share/tauon"' substituteInPlace t_modules/t_main.py \ --replace 'install_mode = False' 'install_mode = True' \ - --replace 'install_directory = sys.path[0]' 'install_directory = "${placeholder "out"}/share/tauon"' \ --replace 'libopenmpt.so' '${lib.getLib libopenmpt}/lib/libopenmpt.so' \ --replace 'lib/libphazor.so' '../../lib/libphazor.so' @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { --replace 'lib/libphazor.so' '../../lib/libphazor.so' patchShebangs compile-phazor.sh + + substituteInPlace extra/tauonmb.desktop --replace 'Exec=/opt/tauon-music-box/tauonmb.sh' 'Exec=${placeholder "out"}/bin/tauon' ''; postBuild = '' @@ -61,6 +63,7 @@ stdenv.mkDerivation rec { gtk3 libnotify libopenmpt + librsvg libsamplerate libvorbis mpg123 @@ -70,11 +73,14 @@ stdenv.mkDerivation rec { ]; pythonPath = with python3Packages; [ + beautifulsoup4 + gst-python dbus-python isounidecode musicbrainzngs mutagen pillow + plexapi pulsectl pycairo pylast @@ -83,6 +89,7 @@ stdenv.mkDerivation rec { pysdl2 requests send2trash + setproctitle ] ++ lib.optional withDiscordRPC pypresence; makeWrapperArgs = [ @@ -98,7 +105,12 @@ stdenv.mkDerivation rec { cp -r assets input.txt t_modules theme $out/share/tauon wrapPythonPrograms - ''; + + mkdir -p $out/share/applications + install -Dm755 extra/tauonmb.desktop $out/share/applications/tauonmb.desktop + mkdir -p $out/share/icons/hicolor/scalable/apps + install -Dm644 extra/tauonmb{,-symbolic}.svg $out/share/icons/hicolor/scalable/apps +''; meta = with lib; { description = "The Linux desktop music player from the future"; diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix new file mode 100644 index 000000000000..4a0035aadf53 --- /dev/null +++ b/pkgs/applications/audio/termusic/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchCrate +, rustPlatform +, pkg-config +, alsa-lib }: + +rustPlatform.buildRustPackage rec { + pname = "termusic"; + version = "0.6.10"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-i+XxEPkLZK+JKDl88P8Nd7XBhsGhEzvUGovJtSWvRtg="; + }; + + cargoHash = "sha256-7nQzU1VvRDrtltVAXTX268vl9AbQhMOilPG4nNAJ+Xk="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsa-lib ]; + + meta = with lib; { + description = "Terminal Music Player TUI written in Rust"; + homepage = "https://github.com/tramhao/termusic"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ devhell ]; + }; +} diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/applications/audio/tonelib-gfx/default.nix index 108f39925b4f..a0b3cf2879e6 100644 --- a/pkgs/applications/audio/tonelib-gfx/default.nix +++ b/pkgs/applications/audio/tonelib-gfx/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "tonelib-gfx"; - version = "4.7.0"; + version = "4.7.5"; src = fetchurl { - url = "https://www.tonelib.net/download/0930/ToneLib-GFX-amd64.deb"; - hash = "sha256-BcbX0dz94B4mj6QeQsnuZmwXAaXH+yJjnrUPgEYVqkU="; + url = "https://www.tonelib.net/download/220214/ToneLib-GFX-amd64.deb"; + hash = "sha256-GUSyarqG1V5O6ayAedeGqmOA+UABQDpAZ+dsorh7das="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix index 1c0d51ed88be..17b3b1197f45 100644 --- a/pkgs/applications/audio/tonelib-jam/default.nix +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "tonelib-jam"; - version = "4.7.0"; + version = "4.7.5"; src = fetchurl { - url = "https://www.tonelib.net/download/0930/ToneLib-Jam-amd64.deb"; - sha256 = "sha256-xyBDp3DQVC+nK2WGnvrfUfD+9GvwtbldXgExTMmCGw0="; + url = "https://www.tonelib.net/download/220214/ToneLib-Jam-amd64.deb"; + sha256 = "sha256-alkdoEhN58o9IGZ8sB39ctTpouMSmvgn6tbrKFneKPI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/tonelib-metal/default.nix b/pkgs/applications/audio/tonelib-metal/default.nix new file mode 100644 index 000000000000..9acb6982c6a7 --- /dev/null +++ b/pkgs/applications/audio/tonelib-metal/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, dpkg +, alsa-lib +, freetype +, libglvnd +, mesa +, curl +, libXcursor +, libXinerama +, libXrandr +, libXrender +, libjack2 +}: + +stdenv.mkDerivation rec { + pname = "tonelib-metal"; + version = "1.1.0"; + + src = fetchurl { + url = "https://www.tonelib.net/download/220218/ToneLib-Metal-amd64.deb"; + sha256 = "sha256-F5EKwNQ9f/kdZLFI+QDZHvwevV/vDnxMdSmT/vnX6ug="; + }; + + nativeBuildInputs = [ autoPatchelfHook dpkg ]; + + buildInputs = [ + stdenv.cc.cc.lib + alsa-lib + freetype + libglvnd + mesa + ] ++ runtimeDependencies; + + runtimeDependencies = map lib.getLib [ + curl + libXcursor + libXinerama + libXrandr + libXrender + libjack2 + ]; + + unpackCmd = "dpkg -x $curSrc source"; + + installPhase = '' + mv usr $out + substituteInPlace $out/share/applications/ToneLib-Metal.desktop --replace /usr/ $out/ + ''; + + meta = with lib; { + description = "ToneLib Metal – Guitar amp simulator targeted at metal players"; + homepage = "https://tonelib.net/"; + license = licenses.unfree; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/audio/vgmstream/default.nix b/pkgs/applications/audio/vgmstream/default.nix index a3518f23984b..f696c5061864 100644 --- a/pkgs/applications/audio/vgmstream/default.nix +++ b/pkgs/applications/audio/vgmstream/default.nix @@ -1,26 +1,35 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config -, mpg123, ffmpeg, libvorbis, libao, jansson +, mpg123, ffmpeg, libvorbis, libao, jansson, speex }: +let + vgmstreamVersion = "r1702-5596-00bdb165b"; +in stdenv.mkDerivation rec { - pname = "vgmstream"; - version = "r1050-3448-g77cc431b"; + pname = "vgmstream"; + version = "unstable-2022-02-21"; src = fetchFromGitHub { - owner = "vgmstream"; - repo = "vgmstream"; - rev = version; - sha256 = "030q02c9li14by7vm00gn6v3m4dxxmfwiy9iyz3xsgzq1i7pqc1d"; + owner = "vgmstream"; + repo = "vgmstream"; + rev = "00bdb165ba6b55420bbd5b21f54c4f7a825d15a0"; + sha256 = "18g1yqlnf48hi2xn2z2wajnjljpdbfdqmcmi7y8hi1r964ypmfcr"; }; + passthru.updateScript = ./update.sh; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ mpg123 ffmpeg libvorbis libao jansson ]; + buildInputs = [ mpg123 ffmpeg libvorbis libao jansson speex ]; - # There's no nice way to build the audacious plugin without a circular dependency - cmakeFlags = [ "-DBUILD_AUDACIOUS=OFF" ]; + cmakeFlags = [ + # There's no nice way to build the audacious plugin without a circular dependency + "-DBUILD_AUDACIOUS=OFF" + # It always tries to download it, no option to use the system one + "-DUSE_CELT=OFF" + ]; - preConfigure = '' - echo "#define VERSION \"${version}\"" > cli/version.h + postConfigure = '' + echo "#define VGMSTREAM_VERSION \"${vgmstreamVersion}\"" > ../version.h ''; meta = with lib; { diff --git a/pkgs/applications/audio/vgmstream/update.sh b/pkgs/applications/audio/vgmstream/update.sh new file mode 100755 index 000000000000..5353480dd335 --- /dev/null +++ b/pkgs/applications/audio/vgmstream/update.sh @@ -0,0 +1,77 @@ +#!/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}' </dev/null \ + "$nixpkgs"/pkgs/common-updater/scripts/list-git-tags --url=https://github.com/$(getRepo) 2>/dev/null \ | sort -V | tail -1 | sed 's|^v||' } diff --git a/pkgs/applications/blockchains/oxen/default.nix b/pkgs/applications/blockchains/oxen/default.nix index 6fd91495b47d..773071c0499e 100644 --- a/pkgs/applications/blockchains/oxen/default.nix +++ b/pkgs/applications/blockchains/oxen/default.nix @@ -59,9 +59,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Private cryptocurrency based on Monero"; - homepage = "https://oxen.io/"; - license = licenses.bsd3; - platforms = platforms.all; + homepage = "https://oxen.io/"; + license = licenses.bsd3; + platforms = platforms.all; maintainers = [ maintainers.viric ]; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/oxen.x86_64-darwin }; } diff --git a/pkgs/applications/blockchains/pivx/default.nix b/pkgs/applications/blockchains/pivx/default.nix index fd562edf93f1..75d0aa7ebfc2 100644 --- a/pkgs/applications/blockchains/pivx/default.nix +++ b/pkgs/applications/blockchains/pivx/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; homepage = "https://pivx.org"; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index eddc2cd8a21e..8199504839a0 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -4,22 +4,44 @@ , llvmPackages , protobuf , rustPlatform +, writeShellScriptBin +, Security }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.14"; + version = "0.9.18"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-SCi+hpdMUTX1NLF1RUce0d/2G19sVfJ5IsmM1xcAUKo="; + sha256 = "sha256-pjHSiVspBV15jKUFv+Uf2l3tah40l55Pv8vwDuwgwjc="; + + # the build process of polkadot requires a .git folder in order to determine + # the git commit hash that is being built and add it to the version string. + # since having a .git folder introduces reproducibility issues to the nix + # build, we check the git commit hash after fetching the source and save it + # into a .git_commit file, and then delete the .git folder. we can then use + # this file to populate an environment variable with the commit hash, which + # is picked up by polkadot's build process. + leaveDotGit = true; + postFetch = '' + ( cd $out; git rev-parse --short HEAD > .git_commit ) + rm -rf $out/.git + ''; }; - cargoSha256 = "sha256-ZcIsbMI96qX0LLJXmkCRS9g40ccZOH/upPbAA7XEZIw="; + cargoSha256 = "sha256-Gc5WbayQUlsl7Fk8NyLPh2Zg2yrLl3WJqKorNZMLi94="; + + buildInputs = [ Security ]; nativeBuildInputs = [ clang ]; + preBuild = '' + export SUBSTRATE_CLI_GIT_COMMIT_HASH=$(cat .git_commit) + rm .git_commit + ''; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; PROTOC = "${protobuf}/bin/protoc"; @@ -37,6 +59,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://polkadot.network"; license = licenses.gpl3Only; maintainers = with maintainers; [ akru andresilva asymmetric FlorianFranzen RaghavSood ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix index e265d9de8ded..c52780c9564e 100644 --- a/pkgs/applications/blockchains/snarkos/default.nix +++ b/pkgs/applications/blockchains/snarkos/default.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "snarkos"; - version = "unstable-2021-01-21"; + version = "2.0.2"; src = fetchFromGitHub { owner = "AleoHQ"; repo = "snarkOS"; - rev = "7068dc0394139c887f5187288ca2af54bc729614"; - sha256 = "sha256-fgdIJX/Ep3amPAjo00BtNGSXhaItw41S1XliDXk6b7k="; + rev = "v${version}"; + sha256 = "sha256-sS8emB+uhWuoq5ISuT8FgSSzX7/WDoOY8hHzPE/EX3o="; }; - cargoSha256 = "sha256-bax7cnqVY49rdcWs73+KqW+dzPebKLlsbPvOM1d25zA="; + cargoSha256 = "sha256-XS6dw6BIoJdigEso/J1dUaAp7AIAda3HrKnCoBynRv8="; # buildAndTestSubdir = "cli"; diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 2075c95aad96..9c38a3f78615 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.12.2"; + version = "22.3.2"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-LzcTFSNN/loYaTDt+QpW8QpSgOTw2097IYdc7mC57Mn4NR/X2hycYZ9ZfZjBh9QFfVu/4R3UN2sA177v6Inomg=="; - x86_64-linux = "sha512-W/voBZrXaJVDN4eSUDD6lyBR9BqboD2k2/azI1pWm1NFUmDZFM+OGzyiPB3n+6SziAhca32Ot5Wy27sfmIjh3g=="; + aarch64-linux = "sha512-GW8wmfTjuWrXijyPKeDJgF+mas1pfEMgAASmlvCURfFwg+oSL0B/0Z2qm5QRXIHmyd7eg/Zd8nEZL7Fg2Lb9ww=="; + x86_64-linux = "sha512-/XQ/sI0TP++3KHlkBXLHe/SVGKcmyjT7vPkV0NCK4rlL70VE+wKLKQK6XKp4V81B5w2+3a/uPOWtmcVr5iVkSA=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 0b90fc10bbc1..f8e20f1a05db 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { desktopName = "Wasabi"; genericName = "Bitcoin wallet"; comment = meta.description; - categories = "Network;Utility;"; + categories = [ "Network" "Utility" ]; }; installPhase = '' diff --git a/pkgs/applications/blockchains/whirlpool-gui/default.nix b/pkgs/applications/blockchains/whirlpool-gui/default.nix deleted file mode 100644 index d36715bd3066..000000000000 --- a/pkgs/applications/blockchains/whirlpool-gui/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, callPackage, makeWrapper, makeDesktopItem -, nodejs, yarn, electron_7, jre8, tor }: - -let - system = stdenv.hostPlatform.system; - electron = electron_7; - -in stdenv.mkDerivation rec { - pname = "whirlpool-gui"; - version = "0.10.1"; - - src = fetchFromGitHub { - owner = "Samourai-Wallet"; - repo = pname; - rev = version; - sha256 = "ru6WJQRulhnQCPY2E0x9M6xXtFdj/pg2fu4HpQxhImU="; - }; - - yarnCache = stdenv.mkDerivation { - name = "${pname}-${version}-${system}-yarn-cache"; - inherit src; - dontInstall = true; - nativeBuildInputs = [ yarn ]; - buildPhase = '' - export HOME=$NIX_BUILD_ROOT - - yarn config set yarn-offline-mirror $out - yarn --frozen-lockfile --ignore-scripts --ignore-platform \ - --ignore-engines --no-progress --non-interactive - ''; - - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = { - x86_64-linux = "6fl4cSwHXWgQcYlqxCae0p1Ppcb9fI5fFrxm7y6wxTo="; - }.${system} or (throw "Unsupported platform ${system}"); - }; - - nativeBuildInputs = [ makeWrapper nodejs yarn ]; - - configurePhase = '' - # Yarn and bundler wants a real home directory to write cache, config, etc to - export HOME=$NIX_BUILD_ROOT - - # Make yarn install packages from our offline cache, not the registry - yarn config --offline set yarn-offline-mirror ${yarnCache} - ''; - - buildPhase = '' - yarn install --offline --ignore-scripts --frozen-lockfile --no-progress --non-interactive - - patchShebangs node_modules/ - - yarn build - ''; - - installPhase = '' - mkdir -p $out/{bin,share,libexec/whirlpool-gui/app} - - # install production dependencies - yarn install \ - --offline --frozen-lockfile --ignore-scripts \ - --no-progress --non-interactive \ - --production --no-bin-links \ - --modules-folder $out/libexec/whirlpool-gui/node_modules - - # copy application - cp -r app/{dist,app.html,main.prod.js,main.prod.js.map,img} $out/libexec/whirlpool-gui/app - cp -r package.json resources $out/libexec/whirlpool-gui - - # make desktop item - ln -s "${desktopItem}/share/applications" "$out/share/applications" - - # wrap electron - makeWrapper '${electron}/bin/electron' "$out/bin/whirlpool-gui" \ - --add-flags "$out/libexec/whirlpool-gui" \ - --prefix PATH : "${jre8}/bin:${tor}/bin" - ''; - - desktopItem = makeDesktopItem { - name = "whirlpool-gui"; - exec = "whirlpool-gui"; - icon = "whirlpool-gui"; - desktopName = "Whirlpool"; - genericName = "Whirlpool"; - comment = meta.description; - categories = "Network;"; - extraEntries = '' - StartupWMClass=whrilpool-gui - ''; - }; - - passthru.prefetchYarnCache = lib.overrideDerivation yarnCache (d: { - outputHash = lib.fakeSha256; - }); - - meta = with lib; { - description = "Desktop GUI for Whirlpool by Samourai-Wallet"; - homepage = "https://www.samouraiwallet.com/whirlpool"; - license = licenses.unlicense; - maintainers = [ maintainers.offline ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index ea7fc1375747..e84f305526b4 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter +{ lib, stdenv, fetchFromGitHub, pkg-config, linkFarm, lightdm-enso-os-greeter , dbus, pcre, libepoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: stdenv.mkDerivation { - version = "0.2.1"; pname = "lightdm-enso-os-greeter"; + version = "0.2.1"; - src = fetchgit { - url = "https://github.com/nick92/Enso-OS"; + src = fetchFromGitHub { + owner = "nick92"; + repo = "Enso-OS"; rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427"; - sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz"; + sha256 = "sha256-v79J5KyjeJ99ifN7nK/B+J7f292qDAEHsmsHLAMKVYY="; }; patches = [ diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 540c59586a6e..12324088b040 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -159,14 +159,14 @@ let }; desktopItem = makeDesktopItem { - name = drvName; + name = pname; exec = pname; - icon = drvName; + icon = pname; desktopName = "Android Studio (${channel} channel)"; comment = "The official Android IDE"; - categories = "Development;IDE;"; - startupNotify = "true"; - extraEntries="StartupWMClass=jetbrains-studio"; + categories = [ "Development" "IDE" ]; + startupNotify = true; + startupWMClass = "jetbrains-studio"; }; # Android Studio downloads prebuilt binaries as part of the SDK. These tools @@ -216,9 +216,9 @@ in runCommand # source-code itself). platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { - stable = [ meutraa fabianhjr ]; - beta = [ meutraa fabianhjr ]; - canary = [ meutraa fabianhjr ]; + stable = [ fabianhjr ]; + beta = [ fabianhjr ]; + canary = [ fabianhjr ]; dev = canary; }."${channel}"; }; @@ -229,6 +229,6 @@ in runCommand echo -n "$startScript" > $out/bin/${pname} chmod +x $out/bin/${pname} - ln -s ${androidStudio}/bin/studio.png $out/share/pixmaps/${drvName}.png + ln -s ${androidStudio}/bin/studio.png $out/share/pixmaps/${pname}.png ln -s ${desktopItem}/share/applications $out/share/applications '' diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index ec4f9b59e919..e7824cd93f1c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,16 +9,16 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "2020.3.1.26"; # "Android Studio Arctic Fox (2020.3.1)" - sha256Hash = "NE2FgjXtXTCVrCWRakqPhzAGn3blpf0OugJSKviPVBs="; + version = "2021.1.1.21"; # "Android Studio Bumblebee (2021.1.1 Patch 1)" + sha256Hash = "PeMJIILfaunTlpR4EV76qQlTlZDcWoKes61qe9W9oqQ="; }; betaVersion = { - version = "2021.1.1.18"; # "Android Studio Bumblebee (2021.1.1) Beta 5" - sha256Hash = "gWG8h3wTQDH84vSKlfTm3soUqLkwFYfSymJuAAFPDuQ="; + version = "2021.2.1.8"; # "Android Studio Chipmunk (2021.2.1) Beta 1" + sha256Hash = "bPfs4kw7czG9CbEgrzn0bQXdT03jyqPVqtaIuVBFSmc="; }; latestVersion = { # canary & dev - version = "2021.2.1.5"; # "Android Studio Chipmunk (2021.2.1) Canary 5" - sha256Hash = "PS45nu5g9qXNeolYnFEs//Z6p8eIZoD6kUo/0yfHQ6A="; + version = "2021.3.1.1"; # "Android Studio Dolphin (2021.3.1) Canary 1" + sha256Hash = "W3pNQBM7WdDScQo5b8q5Va5NTgl73uZu0ks/zDMb4aA="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index e5cfeb964bd7..1f9f64822f1b 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -13,14 +13,14 @@ let in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "2.5"; + version = "2.6.1"; src = fetchFromGitLab { owner = "World"; repo = pname; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "06yfiflmj3ip7ppcz41nb3xpgb5ggw5h74w0v87yaqqkq7qh31lp"; + sha256 = "awaXXSUiEIzOAj9Zw8K961HuIKsLFi3QKETUTTIaTjk="; }; nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils diff --git a/pkgs/applications/editors/bless/default.nix b/pkgs/applications/editors/bless/default.nix index e613747aeab1..f79d72792317 100644 --- a/pkgs/applications/editors/bless/default.nix +++ b/pkgs/applications/editors/bless/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , pkg-config , mono @@ -12,6 +13,7 @@ , libxslt , docbook_xsl , python3 +, itstool }: stdenv.mkDerivation rec { @@ -25,11 +27,6 @@ stdenv.mkDerivation rec { hash = "sha256-rS+vJX0y9v1TiPsRfABroHiTuENQKEOxNsyKwagRuHM="; }; - postPatch = '' - sed "s|get_option('tests')|false|g" -i meson.build - patchShebangs . - ''; - buildInputs = [ gtk-sharp-2_0 mono @@ -47,8 +44,17 @@ stdenv.mkDerivation rec { libxslt docbook_xsl python3 + itstool ]; + mesonFlags = [ + "-Dtests=false" # requires NUnit + ]; + + postPatch = '' + patchShebangs . + ''; + preFixup = '' MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gtk-sharp-2_0}/lib" wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH" --prefix PATH : ${lib.makeBinPath [ mono ]} diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix index 100178f7daf1..b8a651b2d44f 100644 --- a/pkgs/applications/editors/bluej/default.nix +++ b/pkgs/applications/editors/bluej/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bluej"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. url = "https://www.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb"; - sha256 = "sha256-9sWfVQF/wCiVDKBmesMpM+5BHjFUPszm6U1SgJNQ8lE="; + sha256 = "sha256-OarqmptxZc7xEEYeoCVqHXkAvfzfSYx5nUp/iWPyoqw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix index 5b1fc966dd9b..caa1d2ab79b9 100644 --- a/pkgs/applications/editors/bonzomatic/default.nix +++ b/pkgs/applications/editors/bonzomatic/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "bonzomatic"; - version = "2021-03-07"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "Gargaj"; repo = pname; rev = version; - sha256 = "0gbh7kj7irq2hyvlzjgbs9fcns9kamz7g5p6msv12iw75z9yi330"; + sha256 = "sha256-y0zNluIDxms+Lpg7yBiEJNNyxx5TLaSiWBKXjqXiVJg="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 3654a75fd8fc..d142551a1141 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.155.0"; + version = "1.159.2"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-k6ALTbA2PhMZscinXKceM7MSzgr759Y6GxMrQAXMgwM="; + sha256 = "sha256-dSZd+Dsln7xUfN/cqTZSdnpnINHsDCBrbNGcDLwqzzU="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 84f21e5ea20e..430061e0eb72 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -1,38 +1,38 @@ { "EncConv": { "owner": "Alexey-T", - "rev": "2021.01.01", - "sha256": "18fp7yz2rl80a6xw7v4bgc4092l74fb6p6z4yf312r7gw7b8naq6" + "rev": "2022.03.02", + "sha256": "sha256-fBN6Ix5CqhzMbNrWGn6nw6+JRDmEfqe6o8JGHERkiPE=" }, "ATBinHex-Lazarus": { "owner": "Alexey-T", - "rev": "2021.07.02", - "sha256": "sha256-XSt2XfHMiF/ZIf07M65u+k5FjacyToL0rWbpcflKcuY=" + "rev": "2021.11.17", + "sha256": "sha256-wdYH0sISFNx42zt07gLn9ANxcyrq3WrbRhWfTFgPQWw=" }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2021.11.11", - "sha256": "sha256-lbRRiA8CHWmosJefTHrP2cTgU8nlK1SmNcppG6Bl54I=" + "rev": "2022.03.17", + "sha256": "sha256-zpirFZcqIT53tZhgxQGdwVB6pA98SQLr1o3f+Lhq2QY=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.01.20", - "sha256": "sha256-4UJ6t8j8uHB27jprqnlsGB8ytOMQLe4ZzSaYKiw4y70=" + "rev": "2022.03.23", + "sha256": "sha256-D/pQ4TSWUaL97Nau3bGi7rc8MxnvuoDcD7HDNEDwmsk=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2021.12.28", - "sha256": "sha256-bXTjPdn0DIVTdoi30Ws5+M+UsC7F99IphMSTpI5ia/Q=" + "rev": "2022.01.21", + "sha256": "sha256-el5YtzewnHV0fRPgVhApZUVP7huSQseqrO2ibvm6Ctg=" }, "EControl": { "owner": "Alexey-T", - "rev": "2022.01.07", - "sha256": "sha256-dgkyXrFs2hzuFjt9GW+WNyrLIp/i/AbRsM/MyMbatdA=" + "rev": "2022.03.28", + "sha256": "sha256-jh3lqisiPNMxCapP6O5oJdUL3PLQ3JyomtgWix+bML0=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.01.20", - "sha256": "sha256-CaGo38NV+mbwekzkgw0DxM4TZf2xwHtYFnC6RbWH+ts=" + "rev": "2022.03.28", + "sha256": "sha256-TpAaL7/bhnrQgAq1mUTdEWXecSmznWy/iAw+TMMrQGo=" }, "Python-for-Lazarus": { "owner": "Alexey-T", @@ -41,8 +41,8 @@ }, "Emmet-Pascal": { "owner": "Alexey-T", - "rev": "2020.09.05", - "sha256": "0qfiirxnk5g3whx8y8hp54ch3h6gkkd01yf79m95bwar5qvdfybg" + "rev": "2022.01.17", + "sha256": "sha256-5yqxRW7xFJ4MwHjKnxYL8/HrCDLn30a1gyQRjGMx/qw=" }, "CudaText-lexers": { "owner": "Alexey-T", diff --git a/pkgs/applications/editors/cudatext/update.sh b/pkgs/applications/editors/cudatext/update.sh index 8389b3e8a7d4..f7aae6ff8b49 100755 --- a/pkgs/applications/editors/cudatext/update.sh +++ b/pkgs/applications/editors/cudatext/update.sh @@ -18,6 +18,6 @@ while IFS=$'\t' read repo owner rev; do url="https://github.com/${owner}/${repo}/archive/refs/tags/${latest}.tar.gz" hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url) sriHash=$(nix hash to-sri --type sha256 $hash) - jq ".${repo}.rev = \"${latest}\" | .${repo}.sha256 = \"${sriHash}\"" deps.json | sponge deps.json + jq ".\"${repo}\".rev = \"${latest}\" | .\"${repo}\".sha256 = \"${sriHash}\"" deps.json | sponge deps.json fi done <<< $(jq -r 'to_entries[]|[.key,.value.owner,.value.rev]|@tsv' deps.json) diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix index e17fb402ed38..3f84666fe029 100644 --- a/pkgs/applications/editors/deadpixi-sam/default.nix +++ b/pkgs/applications/editors/deadpixi-sam/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { CFLAGS = "-D_DARWIN_C_SOURCE"; makeFlags = [ "DESTDIR=$(out)" ]; buildInputs = [ libX11 libXi libXt libXft ]; + # build fails when run in parallel + enableParallelBuilding = false; postInstall = '' mkdir -p $out/share/applications diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 29c063633fce..3b497f34a439 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk +, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk , makeWrapper, perl, ... }: { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, productVersion }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { comment = "Integrated Development Environment"; desktopName = "Eclipse IDE"; genericName = "Integrated Development Environment"; - categories = "Development;"; + categories = [ "Development" ]; }; buildInputs = [ @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \ + --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration" diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index a6ab483a7b07..f5ed28cedf68 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (rec { pname = "ed"; - version = "1.17"; + version = "1.18"; src = fetchurl { url = "mirror://gnu/ed/${pname}-${version}.tar.lz"; - sha256 = "0m2yrkfjjraakxr98nsiakqrn351h99n706x9asgmdi57j43kpki"; + sha256 = "sha256-rKjvrZgAxYdySiC5eqj8R+a1pH34Fgb+q6gxsHRGK08="; }; nativeBuildInputs = [ lzip ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix index 3202e5f5ac5f..ad4f20956574 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/ebuild-mode/default.nix @@ -2,11 +2,11 @@ trivialBuild rec { pname = "ebuild-mode"; - version = "1.53"; + version = "1.55"; src = fetchurl { url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz"; - sha256 = "1l740qp71df9ids0c49kvp942rk8k1rfkg1hyv7ysfns5shk7b9l"; + sha256 = "1bs2s5g79vrbk8544lvp388cdbig0s121kwk0h10hif4kp56ka9w"; }; meta = with lib; { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index e7db1cb1cf5a..49c1b6248cac 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -234,10 +234,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.15"; + version = "13.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.15.tar"; - sha256 = "1rm8s02d1mx5sw7yj65zlr07xhimnmvqav7f45nz2h8bwka02c3c"; + url = "https://elpa.gnu.org/packages/auctex-13.1.1.tar"; + sha256 = "193sqq2wiq3lg99m8hifl9rjxdazpy638r99sqvmxmkfm98cr34r"; }; packageRequires = [ emacs ]; meta = { @@ -309,10 +309,10 @@ elpaBuild { pname = "bbdb"; ename = "bbdb"; - version = "3.2"; + version = "3.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bbdb-3.2.tar"; - sha256 = "1p56dg0mja2b2figy7yhdx714zd5j6njzn0k07zjka3jc06izvjx"; + url = "https://elpa.gnu.org/packages/bbdb-3.2.1.tar"; + sha256 = "01vsnifs47krq1srgdkk9agbv3p2fykl9nydr4nrfjxbqpnyh3ij"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -425,6 +425,21 @@ license = lib.licenses.free; }; }) {}; + buffer-env = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "buffer-env"; + ename = "buffer-env"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/buffer-env-0.3.tar"; + sha256 = "0h92pia258fndihnwmnak10ix00dmfanadnsnzbdah3q64416qhz"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/buffer-env.html"; + license = lib.licenses.free; + }; + }) {}; buffer-expose = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -459,6 +474,21 @@ license = lib.licenses.free; }; }) {}; + cape = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "cape"; + ename = "cape"; + version = "0.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cape-0.7.tar"; + sha256 = "1icgd5d55x7x7czw349v8m19mgq4yrx6j6zhbb666h2hdkbnykbg"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cape.html"; + license = lib.licenses.free; + }; + }) {}; capf-autosuggest = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "capf-autosuggest"; @@ -594,6 +624,21 @@ license = lib.licenses.free; }; }) {}; + code-cells = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "code-cells"; + ename = "code-cells"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/code-cells-0.2.tar"; + sha256 = "19v6a7l23646diazl0rzjxjsam12hm08hgyq8hdcc7l3xl840ghk"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/code-cells.html"; + license = lib.licenses.free; + }; + }) {}; coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "coffee-mode"; @@ -696,10 +741,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.14"; + version = "0.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.14.tar"; - sha256 = "0lb72j4nxvaar2vip6jlyn62b9z2p2vsmijk3m9nsrshbqnlf0rc"; + url = "https://elpa.gnu.org/packages/consult-0.16.tar"; + sha256 = "172w4d9hbzj98j1gyfhzw2zz4fpw90ak8ccg35fngwjlk9mjdrzk"; }; packageRequires = [ emacs ]; meta = { @@ -726,10 +771,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.17"; + version = "0.20"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.17.tar"; - sha256 = "13nmbyrsvglzv57n9srl0kz75y07v8imr6c99nbf1mssli3h6n7y"; + url = "https://elpa.gnu.org/packages/corfu-0.20.tar"; + sha256 = "03yycimbqs4ixz7lxp7f1b4fipq6kl2bbjnl87r0n9x8mzfslbdl"; }; packageRequires = [ emacs ]; meta = { @@ -741,10 +786,10 @@ elpaBuild { pname = "coterm"; ename = "coterm"; - version = "1.3"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/coterm-1.3.tar"; - sha256 = "078rrc776mdzb4nczp1h8p0pymzds76kz3g2h78ri95k3wpy5ksj"; + url = "https://elpa.gnu.org/packages/coterm-1.5.tar"; + sha256 = "1v8cl3bw5z0f36iw8x3gcgiizml74m1kfxfrasyfx8k01nbxcfs8"; }; packageRequires = [ emacs ]; meta = { @@ -906,10 +951,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.29"; + version = "0.31"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.29.tar"; - sha256 = "1bn21d9dr9pb3vdak3v07x056xafym89kdpxavjf4avy6bry6s4d"; + url = "https://elpa.gnu.org/packages/debbugs-0.31.tar"; + sha256 = "11vdjrn5m5g6pirw8jv0602fbwwgdhazfrrwxxplii8x02gqk0sr"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -936,10 +981,10 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/devdocs-0.3.tar"; - sha256 = "03asw26nsnnx7hmyqhksq165vpii0h8y6qjjn0x4sdkyyns16yp7"; + url = "https://elpa.gnu.org/packages/devdocs-0.4.tar"; + sha256 = "05xmxqpp1cpf03y7idpqdsmbj30cissscy80ng5hqc3028kr2jqm"; }; packageRequires = [ emacs ]; meta = { @@ -992,6 +1037,21 @@ license = lib.licenses.free; }; }) {}; + diminish = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "diminish"; + ename = "diminish"; + version = "0.46"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/diminish-0.46.tar"; + sha256 = "17lsm5khp7cqrva13kn252ab57lw28sibf14615wdjvfqwlwwha4"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/diminish.html"; + license = lib.licenses.free; + }; + }) {}; dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dired-du"; @@ -1082,16 +1142,31 @@ license = lib.licenses.free; }; }) {}; - dts-mode = callPackage ({ elpaBuild, fetchurl, lib }: + dtache = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "dtache"; + ename = "dtache"; + version = "0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dtache-0.5.tar"; + sha256 = "10gcnkajpw7szd41l6ykkysv00yp93y1z9ajhcmk4wzni93w21z2"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dtache.html"; + license = lib.licenses.free; + }; + }) {}; + dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dts-mode"; ename = "dts-mode"; - version = "0.1.1"; + version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dts-mode-0.1.1.tar"; - sha256 = "1hdbf7snfbg3pfg1vhbak1gq5smaklvaqj1y9mjcnxyipqi47q28"; + url = "https://elpa.gnu.org/packages/dts-mode-1.0.tar"; + sha256 = "0ihwqkv1ddysjgxh01vpayv3ia0vx55ny8ym0mi5b4iz95idj60s"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/dts-mode.html"; license = lib.licenses.free; @@ -1131,10 +1206,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.8"; + version = "0.8.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.8.tar"; - sha256 = "035xakji5vypdpc06qp9yhg8ny7qn80h8kax6cl80p0lljplzrnn"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.14.tar"; + sha256 = "0h7yva7p4b4lapi7pwcibf75nqmazjf3r67ibnkc8l9salfhml25"; }; packageRequires = [ emacs seq ]; meta = { @@ -1191,10 +1266,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20211226"; + version = "20220324"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20211226.tar"; - sha256 = "15ggg7sv4m5yc8ldyyffz7vgaj00xbw15zga0x2lpdfmahh6y2as"; + url = "https://elpa.gnu.org/packages/eev-20220324.tar"; + sha256 = "0x1fhjj7g96xmp8pnj3k23xi61nfzaj04bzx050qjc1dvdg8gpfa"; }; packageRequires = [ emacs ]; meta = { @@ -1214,10 +1289,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.7"; + version = "1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.7.tar"; - sha256 = "1zvs144hxq2mmq1h0ynx9hy7yyccb46f3pjg9mgq8v9cw5y678vk"; + url = "https://elpa.gnu.org/packages/eglot-1.8.tar"; + sha256 = "1n04jnf3wwpxafrzfd02l53wf90brjc8p835f84k0n0rjxin99k5"; }; packageRequires = [ eldoc emacs flymake jsonrpc project xref ]; meta = { @@ -1249,10 +1324,10 @@ elpaBuild { pname = "eldoc"; ename = "eldoc"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eldoc-1.11.0.el"; - sha256 = "1py9l1vl7s90y5kfpglhy11jswam2gcrqap09h6wb5ldnyb8cgq2"; + url = "https://elpa.gnu.org/packages/eldoc-1.11.1.tar"; + sha256 = "065clc07nrgp56cgynqhq3fmnwd64ccg2jxzikzb0f2zkn10vc90"; }; packageRequires = [ emacs ]; meta = { @@ -1264,10 +1339,10 @@ elpaBuild { pname = "eldoc-eval"; ename = "eldoc-eval"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eldoc-eval-0.1.el"; - sha256 = "1mnhxdsn9h43iq941yqmg92v3hbzwyg7acqfnz14q5g52bnagg19"; + url = "https://elpa.gnu.org/packages/eldoc-eval-0.2.tar"; + sha256 = "09g9y1w1dlq3s8sqzczgaj02y53x616ak9w3kynq53pwgaxq14j4"; }; packageRequires = []; meta = { @@ -1294,10 +1369,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.13"; + version = "1.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.13.tar"; - sha256 = "13gvljqj7k8qpyn9fcwa6gl3kqakiy5rqx5s3afdc2y356a06wr6"; + url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.14.tar"; + sha256 = "1n9p4kl4d5rcbjgl8yifv0nqnrzxsx937fm0d2j589gg28rzlqpb"; }; packageRequires = []; meta = { @@ -1309,10 +1384,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.14"; + version = "0.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-0.14.tar"; - sha256 = "12d4lza54sf493z9hx1fqlrhrx19girrdh560syi4gg03kg8s7nr"; + url = "https://elpa.gnu.org/packages/embark-0.16.tar"; + sha256 = "1fgsy4nqwl1cah287fbabpi9lwmbiyn36c4z918514iwr5hgrmfi"; }; packageRequires = [ emacs ]; meta = { @@ -1329,10 +1404,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.3"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-consult-0.3.tar"; - sha256 = "1l38bnphfq65r2fjy8zi7a8l4h361bfz756sswa3r7446jhd48rv"; + url = "https://elpa.gnu.org/packages/embark-consult-0.5.tar"; + sha256 = "1z4n5gm30yan3gg2aqwb1ygql56v9sg2px1dr0gdl32lgmn9kvg6"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -1349,10 +1424,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "8"; + version = "10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-8.tar"; - sha256 = "1iffh6n8q9xag25m9bgnpywa27bkdvvz2gr500hdgwwddgdm4pq8"; + url = "https://elpa.gnu.org/packages/emms-10.tar"; + sha256 = "1lgjw9p799sl7nqnl2sk4g67ra10z2ldygx9kb8pmxjrx64mi3qm"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -1549,10 +1624,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.2.1.tar"; - sha256 = "1j4j1mxqvkpdccrm5khykmdpm8z9p0pxvnsw4cz9b76xzfdzy5pz"; + url = "https://elpa.gnu.org/packages/flymake-1.2.2.tar"; + sha256 = "04pa6mayyqrhrijk0rmmrd7k7al9caqyrb5qzkzwbna9ykb1j4zp"; }; packageRequires = [ eldoc emacs project ]; meta = { @@ -1998,10 +2073,10 @@ elpaBuild { pname = "isearch-mb"; ename = "isearch-mb"; - version = "0.3"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/isearch-mb-0.3.tar"; - sha256 = "01yq1skc6rm9yp80vz2fhh9lbkdb9nhf57h424mrkycdky2w50mx"; + url = "https://elpa.gnu.org/packages/isearch-mb-0.5.tar"; + sha256 = "0fah8dmh9jv05i93ccn9dvl7qmfy32vwxqdzkf1v8gr1plsyjyx7"; }; packageRequires = [ emacs ]; meta = { @@ -2168,10 +2243,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.14"; + version = "1.0.15"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.14.el"; - sha256 = "069l0sqkambam4ikj9id36kdw1jdjna8v586d51m64hiz96rmvm6"; + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.15.tar"; + sha256 = "0biwvkvd48xqvigzs00yz4mk847xzyzm7p0lkns58fxph9nkg4h5"; }; packageRequires = [ emacs ]; meta = { @@ -2258,10 +2333,10 @@ elpaBuild { pname = "leaf"; ename = "leaf"; - version = "4.5.2"; + version = "4.5.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/leaf-4.5.2.tar"; - sha256 = "0i90shhhkpdcwmfi8zv0008qgmg4g3cqd2yvpycfv9n2axvhag54"; + url = "https://elpa.gnu.org/packages/leaf-4.5.5.tar"; + sha256 = "1rdbrf84ijapiqhq72gy8r5xgk54sf0jy31pgd3w4rl1wywh5cas"; }; packageRequires = [ emacs ]; meta = { @@ -2374,6 +2449,21 @@ license = lib.licenses.free; }; }) {}; + logos = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "logos"; + ename = "logos"; + version = "0.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/logos-0.2.0.tar"; + sha256 = "0cqmgvgyyn656rg60bbnxr2flmnw9h4z5i2w98bsf4krlp3s4i6x"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/logos.html"; + license = lib.licenses.free; + }; + }) {}; map = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "map"; @@ -2381,7 +2471,7 @@ version = "3.2.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/map-3.2.1.tar"; - sha256 = "1vy231m2fm5cgz5nib14ib7ifprajhnbmzf6x4id48h2491m1n24"; + sha256 = "1zj0y3nvkrd2v43za214xr3h9z6wyp7r5s6nf5g1pj272yb871d1"; }; packageRequires = [ emacs ]; meta = { @@ -2393,10 +2483,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.11"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.11.tar"; - sha256 = "0mri8awary11hwg6lib903q5jcv2isnf8mi62mgndiki5s9cgrbs"; + url = "https://elpa.gnu.org/packages/marginalia-0.13.tar"; + sha256 = "1d5y3d2plkxnmm4458l0gfpim6q3vzps3bsfakvnzf86hh5nm77j"; }; packageRequires = [ emacs ]; meta = { @@ -2438,10 +2528,10 @@ elpaBuild { pname = "mct"; ename = "mct"; - version = "0.3.0"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mct-0.3.0.tar"; - sha256 = "07wywk5zadcinjpx9hvag8ndzb426lq5jlg42rqdgrv92ka7n16b"; + url = "https://elpa.gnu.org/packages/mct-0.5.0.tar"; + sha256 = "0yv0hqkyh5vpmf5i50fdc2rw3ssvrd9pn3n65v3gmb195gzmn6r9"; }; packageRequires = [ emacs ]; meta = { @@ -2577,10 +2667,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-2.0.0.tar"; - sha256 = "16kvkm7hsdk6jfdjkzafwdkwwri7cqki29qxqqhzkpwwghqlissl"; + url = "https://elpa.gnu.org/packages/modus-themes-2.2.0.tar"; + sha256 = "1vgwr9q16d3hjwmqljmmzlpn177gvwbk3wg4l1fmgc5bpb7k78ky"; }; packageRequires = [ emacs ]; meta = { @@ -2751,10 +2841,10 @@ elpaBuild { pname = "nano-theme"; ename = "nano-theme"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-theme-0.2.1.tar"; - sha256 = "0m98kq40dhbrn55x4bp2x5d5j1gps4y7z4086mgnj8wr1y3w8kdl"; + url = "https://elpa.gnu.org/packages/nano-theme-0.3.0.tar"; + sha256 = "1nq5x46467vnsfg3fzb0qyg97xpnwsvbqg8frdjil5zq5fhsgmrz"; }; packageRequires = [ emacs ]; meta = { @@ -2916,6 +3006,21 @@ license = lib.licenses.free; }; }) {}; + orderless = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "orderless"; + ename = "orderless"; + version = "0.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/orderless-0.7.tar"; + sha256 = "0hvfqxpazan1djpn0qxh609r53jgddpcdih6chkn2zvx29mhdkgg"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/orderless.html"; + license = lib.licenses.free; + }; + }) {}; org = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "org"; @@ -2946,6 +3051,21 @@ license = lib.licenses.free; }; }) {}; + org-modern = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "org-modern"; + ename = "org-modern"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-modern-0.3.tar"; + sha256 = "14f5grai6k9xbpyc33pcpgi6ka8pgy7vcnqqi77nclzq2yxhl9c1"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-modern.html"; + license = lib.licenses.free; + }; + }) {}; org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-real"; @@ -2961,14 +3081,29 @@ license = lib.licenses.free; }; }) {}; + org-remark = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: + elpaBuild { + pname = "org-remark"; + ename = "org-remark"; + version = "1.0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-remark-1.0.4.tar"; + sha256 = "1mbsp92vw8p8l2pxs53r7wafrplrwfx0rmfk723cl9hpvghvl9vf"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-remark.html"; + license = lib.licenses.free; + }; + }) {}; org-transclusion = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-transclusion"; ename = "org-transclusion"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-transclusion-1.1.1.tar"; - sha256 = "12dp5fc7iw78qx2f501ch8mvhvw90bxg8hhvx0kz3y24gf2h8d4d"; + url = "https://elpa.gnu.org/packages/org-transclusion-1.2.0.tar"; + sha256 = "1q36nqxynzh8ygvgw5nmg49c4yq8pgp6lcb6mdqs9paw8pglxcjf"; }; packageRequires = [ emacs org ]; meta = { @@ -2980,10 +3115,10 @@ elpaBuild { pname = "org-translate"; ename = "org-translate"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-translate-0.1.3.el"; - sha256 = "0m52vv1961kf8f1gw8c4n02hxcvhdw3wgzmcxvjcdijfnjkarm33"; + url = "https://elpa.gnu.org/packages/org-translate-0.1.4.tar"; + sha256 = "0dvg3h8mmzlqfg60rwxjgy17sqv84p6nj2ngjdafkp9a4halv0g7"; }; packageRequires = [ emacs org ]; meta = { @@ -3021,6 +3156,21 @@ license = lib.licenses.free; }; }) {}; + osm = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "osm"; + ename = "osm"; + version = "0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/osm-0.6.tar"; + sha256 = "0p19qyx4gw1rn2f5hlxa7gx1sph2z5vjw7cnxwpjhbbr0430zzwb"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/osm.html"; + license = lib.licenses.free; + }; + }) {}; other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "other-frame-window"; @@ -3085,10 +3235,10 @@ elpaBuild { pname = "parser-generator"; ename = "parser-generator"; - version = "0.1.3"; + version = "0.1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/parser-generator-0.1.3.tar"; - sha256 = "13ssmdlni9ma6iafr4zwa2jlmq6rdlaafkdpli1a4jrk6ri6w996"; + url = "https://elpa.gnu.org/packages/parser-generator-0.1.5.tar"; + sha256 = "06cl9whk321l1q5xcjmgq5c59l10ybwcdsmmbrkrllnbpqxy23bj"; }; packageRequires = [ emacs ]; meta = { @@ -3145,10 +3295,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.13"; + version = "0.4.20"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.13.tar"; - sha256 = "03j5ck0pk88kdl7br1rkdqmnjd8418y9w9m27gk63hqbi3p8diy6"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.20.tar"; + sha256 = "0xb4i3s6yira1kfqwrs72ajvpqc6pw7gqlxmfmdhyyvib6p93l6m"; }; packageRequires = [ emacs ]; meta = { @@ -3190,10 +3340,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.1.5"; + version = "1.1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.1.5.tar"; - sha256 = "1kyd3r926hhs03mmpyvbjjyqcbvqrxk62rrscgfyl7rqi9ar56i0"; + url = "https://elpa.gnu.org/packages/posframe-1.1.7.tar"; + sha256 = "13i2wxx079gfq0vbq0iwmsig5b7x4aspd1q02yqc79846f1dsx4w"; }; packageRequires = [ emacs ]; meta = { @@ -3208,7 +3358,7 @@ version = "0.8.1"; src = fetchurl { url = "https://elpa.gnu.org/packages/project-0.8.1.tar"; - sha256 = "1x3zkbjsi04v5ny3yxqrb75vcacrj9kxmpm9mvkp0n07j5g34f68"; + sha256 = "0q2js8qihlhchpx2mx0f992ygslsqri2q4iv8kcl4fx31lpp7c1k"; }; packageRequires = [ emacs xref ]; meta = { @@ -3246,14 +3396,29 @@ license = lib.licenses.free; }; }) {}; + pulsar = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "pulsar"; + ename = "pulsar"; + version = "0.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/pulsar-0.2.0.tar"; + sha256 = "0vil6gv7w6d77hksc2pbrwjdd8dp3ka4kf5kihx04r95032pky62"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/pulsar.html"; + license = lib.licenses.free; + }; + }) {}; pyim = callPackage ({ async, elpaBuild, emacs, fetchurl, lib, xr }: elpaBuild { pname = "pyim"; ename = "pyim"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-4.0.3.tar"; - sha256 = "110d9d8xglnyv0cn0slwk3msgqq8rs01xq2qmx5ya7i2v77gd5ql"; + url = "https://elpa.gnu.org/packages/pyim-4.1.0.tar"; + sha256 = "1q4b3y72gbkl5z31brlnjqjl30lgqm2d1zlqrbkqnnfy5hjgazk9"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3283,7 +3448,7 @@ version = "0.28"; src = fetchurl { url = "https://elpa.gnu.org/packages/python-0.28.tar"; - sha256 = "1pvhsdjla1rvw223h7irmbzzsrixnpy1rsskiq9xmkpkc688b6pm"; + sha256 = "1kc596b8bbcp8y87kqyxsv3bblz8l0vyc0d645ayb1cmwwvk35d5"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3560,10 +3725,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.19"; + version = "1.20"; src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.19.tar"; - sha256 = "14z3i01pq5ljhjf5yfcjw7hxljcrwjnizkrdc1qyh9b6h3ic1bbi"; + url = "https://elpa.gnu.org/packages/relint-1.20.tar"; + sha256 = "0r20dim2r4a4bv0fmgbnq3graa7hhlai55h9qyknapqbr2j1v1h7"; }; packageRequires = [ emacs xr ]; meta = { @@ -3575,10 +3740,10 @@ elpaBuild { pname = "repology"; ename = "repology"; - version = "1.1.0"; + version = "1.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/repology-1.1.0.tar"; - sha256 = "031245rrhazj53bk1csa6x3ygzvg74w2hwjf08ficwvmdn97li90"; + url = "https://elpa.gnu.org/packages/repology-1.2.3.tar"; + sha256 = "1ngx23b7dilyps20nznrrn867kbxyn6nryf4p1sy5m576hkw18kn"; }; packageRequires = [ emacs ]; meta = { @@ -3620,10 +3785,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "2.4"; + version = "4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rt-liberation-2.4.tar"; - sha256 = "1qfd0dy4n04gf3vx0pbwfgmp4wm2a64sh3m6mlfhinqgmasajh6r"; + url = "https://elpa.gnu.org/packages/rt-liberation-4.tar"; + sha256 = "15vs982cxpc3g8cq2gj3a6dfn9i2r9b44x38ydvcmiy2brkd3psj"; }; packageRequires = []; meta = { @@ -3652,6 +3817,21 @@ license = lib.licenses.free; }; }) {}; + satchel = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: + elpaBuild { + pname = "satchel"; + ename = "satchel"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/satchel-0.2.tar"; + sha256 = "1ajsfrr988nglw2l4kqjbbdq9x8gidv0ymsrg3jm2b9nisfhnixv"; + }; + packageRequires = [ emacs project ]; + meta = { + homepage = "https://elpa.gnu.org/packages/satchel.html"; + license = lib.licenses.free; + }; + }) {}; scanner = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "scanner"; @@ -3884,7 +4064,7 @@ version = "1.1.2"; src = fetchurl { url = "https://elpa.gnu.org/packages/so-long-1.1.2.tar"; - sha256 = "053msvy2pyispwg4zzpaczfkl6rvnwfklm4jdsbjhqm0kx4vlcs9"; + sha256 = "0gb5ypl9phhv8sx7akw9xn7njfq86yqngixhxf8qj1fxp57gfpdb"; }; packageRequires = [ emacs ]; meta = { @@ -3892,16 +4072,20 @@ license = lib.licenses.free; }; }) {}; - soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + soap-client = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "soap-client"; ename = "soap-client"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/soap-client-3.2.0.tar"; - sha256 = "1s0bwnip22nj6kgjadd4zlj9j729hiyyjb66sr51i2mddnf9i95s"; + url = "https://elpa.gnu.org/packages/soap-client-3.2.1.tar"; + sha256 = "0v3aj059cvfv5yc9fx8naq8ygphlpbasc1nksgfim8iyk9wg7l3n"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/soap-client.html"; license = lib.licenses.free; @@ -4046,10 +4230,10 @@ elpaBuild { pname = "svg-lib"; ename = "svg-lib"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-lib-0.2.4.tar"; - sha256 = "0vcf3vbrzhgwssf6mi4xyic32yzjsrllp2zaqdk3c0qjvq9w4wxa"; + url = "https://elpa.gnu.org/packages/svg-lib-0.2.5.tar"; + sha256 = "022jp54w14sv0d71j0z76bnir9bgvysmcpcxpzpiiz77da6rg393"; }; packageRequires = [ emacs ]; meta = { @@ -4147,6 +4331,21 @@ license = lib.licenses.free; }; }) {}; + tempel = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "tempel"; + ename = "tempel"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tempel-0.3.tar"; + sha256 = "0aa3f3sfvibp3wl401fdlww70axl9hxasbza70i44vqq0y9csv40"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tempel.html"; + license = lib.licenses.free; + }; + }) {}; test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "test-simple"; @@ -4200,10 +4399,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.2"; + version = "2.5.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.2.tar"; - sha256 = "1j71x3q6x9xyf21capjxcp85b7z2x9khrqsd2sy2s3qwxz3jbg5n"; + url = "https://elpa.gnu.org/packages/tramp-2.5.2.2.tar"; + sha256 = "104nn6xdmcviqqv4cx5llhwj1sh4q04w3h9s8gimmi2kg0z8s36r"; }; packageRequires = [ emacs ]; meta = { @@ -4211,6 +4410,21 @@ license = lib.licenses.free; }; }) {}; + tramp-nspawn = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "tramp-nspawn"; + ename = "tramp-nspawn"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tramp-nspawn-1.0.tar"; + sha256 = "1si649vcj4md50p5nzvw431580rcl113rraj6fw636a394485hvx"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tramp-nspawn.html"; + license = lib.licenses.free; + }; + }) {}; tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tramp-theme"; @@ -4271,16 +4485,16 @@ license = lib.licenses.free; }; }) {}; - undo-tree = callPackage ({ elpaBuild, fetchurl, lib }: + undo-tree = callPackage ({ elpaBuild, emacs, fetchurl, lib, queue }: elpaBuild { pname = "undo-tree"; ename = "undo-tree"; - version = "0.7.5"; + version = "0.8.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/undo-tree-0.7.5.el"; - sha256 = "00admi87gqm0akhfqm4dcp9fw8ihpygy030955jswkha4zs7lw2p"; + url = "https://elpa.gnu.org/packages/undo-tree-0.8.2.tar"; + sha256 = "0fgir9pls9439zwyl3j2yvrwx9wigisj1jil4ijma27dfrpgm288"; }; - packageRequires = []; + packageRequires = [ emacs queue ]; meta = { homepage = "https://elpa.gnu.org/packages/undo-tree.html"; license = lib.licenses.free; @@ -4290,10 +4504,10 @@ elpaBuild { pname = "uni-confusables"; ename = "uni-confusables"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/uni-confusables-0.2.tar"; - sha256 = "1an2l7f8lqhp3hq511a371isv1q00nx431g2a7266pp6pn2sndj1"; + url = "https://elpa.gnu.org/packages/uni-confusables-0.3.tar"; + sha256 = "1grmppbyzvjjz0yiv5vvgpykhalisj9jnh6p9ip9vbnnll63iz4w"; }; packageRequires = []; meta = { @@ -4389,10 +4603,10 @@ elpaBuild { pname = "vc-got"; ename = "vc-got"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vc-got-1.0.tar"; - sha256 = "1lx52g261zr52gy63vjll8mvczcbdzbsx3wa47qdajrq9bwmj99j"; + url = "https://elpa.gnu.org/packages/vc-got-1.1.tar"; + sha256 = "1myck30ybq8ggf4yk3s2sqjqj8m1kfl8qxygkk3ynfa6jxxy4x1r"; }; packageRequires = [ emacs ]; meta = { @@ -4469,7 +4683,7 @@ version = "2021.10.14.127365406"; src = fetchurl { url = "https://elpa.gnu.org/packages/verilog-mode-2021.10.14.127365406.tar"; - sha256 = "0d842dwg98srv73nkg69c7x24rw20mxgqmb4k1qcbl02bwxkfmsm"; + sha256 = "1v0ld310rs86vzmlw7phv1b5p59faqs9wg4p8jpbnb9ap9lwidnl"; }; packageRequires = []; meta = { @@ -4481,10 +4695,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.19"; + version = "0.21"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.19.tar"; - sha256 = "1i9aqxsplmzyy7nv4czspa66a6v33lnng1d8zsgjf1m9sz0kyzxp"; + url = "https://elpa.gnu.org/packages/vertico-0.21.tar"; + sha256 = "0aw3hkr46zghvyp7s2b6ziqavsf1zpml4bbxcvs4kvm05qa0y1hv"; }; packageRequires = [ emacs ]; meta = { @@ -4501,10 +4715,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.4.8"; + version = "0.5.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-posframe-0.4.8.tar"; - sha256 = "1cvihfj59qycd3kifxbg9ndrmiihc62si8q5b8fxc1p20acw4f69"; + url = "https://elpa.gnu.org/packages/vertico-posframe-0.5.3.tar"; + sha256 = "12jcb4im1ys2s0wbv9nfmgpcrz037zagd677qjm8hz8fn29xdh6n"; }; packageRequires = [ emacs posframe vertico ]; meta = { @@ -4654,10 +4868,10 @@ elpaBuild { pname = "which-key"; ename = "which-key"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/which-key-3.5.1.tar"; - sha256 = "187cssvqpd0wj01rgd19pp1k6aj9m2n5fdqznkga6w1h6cb5cm2b"; + url = "https://elpa.gnu.org/packages/which-key-3.6.0.tar"; + sha256 = "05wy147734mlpzwwxdhidnsplrz2vzs1whczzs4jw1i7kp7jvy3v"; }; packageRequires = [ emacs ]; meta = { @@ -4749,10 +4963,10 @@ elpaBuild { pname = "xclip"; ename = "xclip"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xclip-1.10.el"; - sha256 = "0i3i9kwfg8qmhcmqhhnrb1kljgwkccv63s9q1mjwqfjldyfh8j8i"; + url = "https://elpa.gnu.org/packages/xclip-1.11.tar"; + sha256 = "0hgblj8ng7vfsdb7g1mm9m2qhzfprycdd77836l59prpak5kp55q"; }; packageRequires = []; meta = { @@ -4794,10 +5008,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.21"; + version = "1.22"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-1.21.tar"; - sha256 = "0mc10d33lsqs0ihcja8w78jzh2pk0dfm9m86kap6r3hi6wkr1cmi"; + url = "https://elpa.gnu.org/packages/xr-1.22.tar"; + sha256 = "1l3bqgzvbamfs4n628kg789g7vjn4v81q570gzbw2cwjgk4s6xbj"; }; packageRequires = [ emacs ]; meta = { @@ -4809,10 +5023,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.3.2"; + version = "1.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.3.2.tar"; - sha256 = "13bsaxdxwn14plaam0hsrswngh3rm2k29v5ybjgjyjy4d5vwz78j"; + url = "https://elpa.gnu.org/packages/xref-1.4.1.tar"; + sha256 = "1vbpplw0sngymmawi940nlqmncqznb5vp7zi0ib8v66g3y33ijrf"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index fd658aac5f44..fd8d17da60ea 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -2,10 +2,11 @@ # Updating -To update the list of packages from MELPA, +To update the list of packages from ELPA, 1. Run `./update-elpa`. 2. Check for evaluation errors: + # "../../../../../" points to the default.nix from root of Nixpkgs tree env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages 3. Run `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix` diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix index 20bb0efdd663..2873be1787fa 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix @@ -1,11 +1,12 @@ let pkgs = import ../../../../.. { }; - src = pkgs.fetchgit { - url = "https://github.com/nix-community/emacs2nix.git"; - fetchSubmodules = true; + src = pkgs.fetchFromGitHub { + owner = "nix-community"; + repo = "emacs2nix"; rev = "2e8d2c644397be57455ad32c2849f692eeac7797"; sha256 = "sha256-qnOYDYHAQ+r5eegKP9GqHz5R2ig96B2W7M+uYa1ti9M="; + fetchSubmodules = true; }; in pkgs.mkShell { diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix b/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix index 84d724c3518b..54805d43b248 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix @@ -45,7 +45,8 @@ stdenv.mkDerivation rec { find "$d" \( -type d -or \( -type f -executable \) \) -execdir chmod 755 {} + find "$d" -type f -not -executable -execdir chmod 644 {} + makeWrapper ${emacs}/bin/emacs $out/bin/emacspeak \ - --set DTK_PROGRAM "${espeak-ng}/bin/espeak" \ + --set DTK_PROGRAM "${placeholder "out"}/share/emacs/site-lisp/emacspeak/servers/espeak" \ + --set TCLLIBPATH "${tclx}/lib" \ --add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"' ''; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 9a81f25ec1b3..18c8549b9cca 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -6,6 +6,7 @@ To update the list of packages from MELPA, 1. Run `./update-melpa` 2. Check for evaluation errors: + # "../../../../../" points to the default.nix from root of Nixpkgs tree env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages 3. Run `git commit -m "melpa-packages $(date -Idate)" recipes-archive-melpa.json` diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index a6b732d6a054..dc2e87c30e60 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -45,6 +45,21 @@ license = lib.licenses.free; }; }) {}; + annotate = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "annotate"; + ename = "annotate"; + version = "1.5.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/annotate-1.5.1.tar"; + sha256 = "13xf8izl99y1aqwk9k9hgiwggibjycjh2lhwg0wk5hm7zp6gm8mx"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/annotate.html"; + license = lib.licenses.free; + }; + }) {}; anti-zenburn-theme = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "anti-zenburn-theme"; @@ -155,6 +170,21 @@ license = lib.licenses.free; }; }) {}; + bind-map = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "bind-map"; + ename = "bind-map"; + version = "1.1.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/bind-map-1.1.2.tar"; + sha256 = "1x98pgalnpl45h63yw6zz6q16x00phijyx2pf4jrf93s18lx33z5"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bind-map.html"; + license = lib.licenses.free; + }; + }) {}; bison-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "bison-mode"; @@ -228,10 +258,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.2.0.tar"; - sha256 = "1dkn5mcp4vyk6h4mqrn7fcqjs4h0dx1y1b1pcg2jpyx11mhdpjxf"; + url = "https://elpa.nongnu.org/nongnu/cider-1.3.0.tar"; + sha256 = "10kg30s0gb09l0z17v2hqxy9v5pscnpqp5dng62cjh0x3hdi4i7x"; }; packageRequires = [ clojure-mode @@ -251,10 +281,10 @@ elpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "5.13.0"; + version = "5.14.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.13.0.tar"; - sha256 = "16xll0sp7mqzwldfsihp7j3dlm6ps1l1awi122ff8w7xph7b0wfh"; + url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.14.0.tar"; + sha256 = "1lirhp6m5r050dm73nrslgzdgy6rdbxn02wal8n52q37m2armra2"; }; packageRequires = [ emacs ]; meta = { @@ -262,6 +292,21 @@ license = lib.licenses.free; }; }) {}; + coffee-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "coffee-mode"; + ename = "coffee-mode"; + version = "0.6.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/coffee-mode-0.6.3.tar"; + sha256 = "1yv1b5rzlj7cpz7gsv2j07mr8z6lkwxp1cldkrc6xlhcbqh8795a"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/coffee-mode.html"; + license = lib.licenses.free; + }; + }) {}; color-theme-tangotango = callPackage ({ color-theme , elpaBuild , fetchurl @@ -340,6 +385,21 @@ license = lib.licenses.free; }; }) {}; + dockerfile-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "dockerfile-mode"; + ename = "dockerfile-mode"; + version = "1.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.5.tar"; + sha256 = "0dz91i4ak3v0x1v75ibhjjz211k9g6qimz4lxn3x424j7dlpa9f3"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dockerfile-mode.html"; + license = lib.licenses.free; + }; + }) {}; dracula-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dracula-theme"; @@ -355,6 +415,21 @@ license = lib.licenses.free; }; }) {}; + drupal-mode = callPackage ({ elpaBuild, fetchurl, lib, php-mode }: + elpaBuild { + pname = "drupal-mode"; + ename = "drupal-mode"; + version = "0.7.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/drupal-mode-0.7.4.tar"; + sha256 = "1cglipmwx5v8vaqkkc7f5ka3dpxlrmmqrqhi885mm625kh2r27j1"; + }; + packageRequires = [ php-mode ]; + meta = { + homepage = "https://elpa.gnu.org/packages/drupal-mode.html"; + license = lib.licenses.free; + }; + }) {}; editorconfig = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -375,6 +450,36 @@ license = lib.licenses.free; }; }) {}; + elixir-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "elixir-mode"; + ename = "elixir-mode"; + version = "2.4.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.4.0.tar"; + sha256 = "0h3ypyxmcpfh8kcwd08rsild4jy8s4mr3zr8va03bbh81pd3nm1m"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/elixir-mode.html"; + license = lib.licenses.free; + }; + }) {}; + elpher = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "elpher"; + ename = "elpher"; + version = "3.3.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/elpher-3.3.2.tar"; + sha256 = "1w34agw5qfgbpk6s2bllvgkj4wm1rlcyn33yfgj2xr4a5gfcs30a"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/elpher.html"; + license = lib.licenses.free; + }; + }) {}; evil = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "evil"; @@ -405,6 +510,21 @@ license = lib.licenses.free; }; }) {}; + evil-args = callPackage ({ elpaBuild, evil, fetchurl, lib }: + elpaBuild { + pname = "evil-args"; + ename = "evil-args"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-args-1.1.tar"; + sha256 = "0lgwrhjsy098h2lhsiasm39kzkdfqcjnapc2q6f2gyf7zll37761"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.gnu.org/packages/evil-args.html"; + license = lib.licenses.free; + }; + }) {}; evil-exchange = callPackage ({ cl-lib ? null , elpaBuild , evil @@ -553,16 +673,51 @@ license = lib.licenses.free; }; }) {}; - geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, transient }: + forth-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "forth-mode"; + ename = "forth-mode"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/forth-mode-0.2.tar"; + sha256 = "0qk6kg8d38fcvbxa4gfsdyllzrrp9712w74sj29b90fppa11b530"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/forth-mode.html"; + license = lib.licenses.free; + }; + }) {}; + free-keys = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "free-keys"; + ename = "free-keys"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/free-keys-1.0.tar"; + sha256 = "1w0dslygz098bddap1shwa8pn55ggavz2jn131rmdnbfjy6plglv"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/free-keys.html"; + license = lib.licenses.free; + }; + }) {}; + geiser = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , project + , transient }: elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.22"; + version = "0.23.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.22.tar"; - sha256 = "0jcxjfn9d7cnsir2pva0axaz180d01sn0l9f175sj57ws8spj2h2"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.23.2.tar"; + sha256 = "1rdz13rjfp8j2ik3vbw1jvacjri3abghlq6aqfvkd7vwm21h30ih"; }; - packageRequires = [ emacs transient ]; + packageRequires = [ emacs project transient ]; meta = { homepage = "https://elpa.gnu.org/packages/geiser.html"; license = lib.licenses.free; @@ -617,10 +772,10 @@ elpaBuild { pname = "geiser-gambit"; ename = "geiser-gambit"; - version = "0.17"; + version = "0.18.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.17.tar"; - sha256 = "12r9h1dl0y9j421v0idvr9ljj93962xfrs0nff5lmx5z1cayq456"; + url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.18.1.tar"; + sha256 = "03cv51war65yrg5qswwlx755byn2nlm1qvbzqqminnidz64kfd3v"; }; packageRequires = [ emacs geiser ]; meta = { @@ -647,10 +802,10 @@ elpaBuild { pname = "geiser-guile"; ename = "geiser-guile"; - version = "0.21.1"; + version = "0.23.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.21.1.tar"; - sha256 = "1sm19jmaxzxkxd4jksgvc064jv90bc6q0yf8zz0s77y0aldw8sf5"; + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.23.2.tar"; + sha256 = "1z2khagg425y5cfja694zxrj3lyw3awsmqd86b2hpqhrylrb8jaa"; }; packageRequires = [ emacs geiser ]; meta = { @@ -814,6 +969,21 @@ license = lib.licenses.free; }; }) {}; + graphql-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "graphql-mode"; + ename = "graphql-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/graphql-mode-1.0.0.tar"; + sha256 = "11vn02vwiqbkzl9gxsm3gvybkbac13xnzzv2y227j3y8aq5kbwss"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/graphql-mode.html"; + license = lib.licenses.free; + }; + }) {}; gruvbox-theme = callPackage ({ autothemer, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gruvbox-theme"; @@ -889,6 +1059,36 @@ license = lib.licenses.free; }; }) {}; + helm = callPackage ({ elpaBuild, fetchurl, helm-core, lib, popup }: + elpaBuild { + pname = "helm"; + ename = "helm"; + version = "3.8.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/helm-3.8.5.tar"; + sha256 = "1h71qcik375zhkk4rgcxj6ffnzpns2lvzwq82yfhmmhzrrxhds0z"; + }; + packageRequires = [ helm-core popup ]; + meta = { + homepage = "https://elpa.gnu.org/packages/helm.html"; + license = lib.licenses.free; + }; + }) {}; + helm-core = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "helm-core"; + ename = "helm-core"; + version = "3.8.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.5.tar"; + sha256 = "0117y2gazm8h5fxj23166a53w4r68r1mscgardk0y6xd6lz73yz9"; + }; + packageRequires = [ async emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/helm-core.html"; + license = lib.licenses.free; + }; + }) {}; highlight-parentheses = callPackage ({ elpaBuild , emacs , fetchurl @@ -946,10 +1146,10 @@ elpaBuild { pname = "iedit"; ename = "iedit"; - version = "0.9.9.9"; + version = "0.9.9.9.9"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/iedit-0.9.9.9.tar"; - sha256 = "1kwm7pa1x5dbn9irdrz9vg5zivrqx1w2ywrbpglk2lgd9kff0nsj"; + url = "https://elpa.nongnu.org/nongnu/iedit-0.9.9.9.9.tar"; + sha256 = "1ic780gd7n2qrpbqr0vy62p7wsrskyvyr571m8m3j25fii8v8cxg"; }; packageRequires = []; meta = { @@ -991,6 +1191,21 @@ license = lib.licenses.free; }; }) {}; + jade-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "jade-mode"; + ename = "jade-mode"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/jade-mode-1.0.1.tar"; + sha256 = "1kkf5ayqzs1rs7b3jqwb21r2mikds3lillfrs3pkcca7lj76313n"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/jade-mode.html"; + license = lib.licenses.free; + }; + }) {}; jinja2-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "jinja2-mode"; @@ -1025,10 +1240,10 @@ elpaBuild { pname = "keycast"; ename = "keycast"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/keycast-1.1.3.tar"; - sha256 = "0b4vyaxqdw11ai81vnvif8i02jcaf5hk64kbb7bs90527zwz2fw0"; + url = "https://elpa.nongnu.org/nongnu/keycast-1.2.0.tar"; + sha256 = "0iiksz8lcz9y5yplw455v2zgvq2jz6jc2ic3ybax10v3wgxnhiad"; }; packageRequires = [ emacs ]; meta = { @@ -1036,6 +1251,21 @@ license = lib.licenses.free; }; }) {}; + kotlin-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "kotlin-mode"; + ename = "kotlin-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/kotlin-mode-1.0.0.tar"; + sha256 = "0ajnnsh6a8psfh7gd34d2wfii08jxr7x7k6na0assjldsxy7afwj"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/kotlin-mode.html"; + license = lib.licenses.free; + }; + }) {}; lua-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "lua-mode"; @@ -1115,10 +1345,10 @@ elpaBuild { pname = "markdown-mode"; ename = "markdown-mode"; - version = "2.4"; + version = "2.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.4.tar"; - sha256 = "002nvc2p7jzznr743znbml3vj8a3kvdd89rlbi28f5ha14g2567z"; + url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.5.tar"; + sha256 = "195p4bz2k5rs6222pfxv6rk2r22snx33gvc1x3rs020lacppbhik"; }; packageRequires = [ emacs ]; meta = { @@ -1259,6 +1489,26 @@ license = lib.licenses.free; }; }) {}; + nix-mode = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , magit-section + , transient }: + elpaBuild { + pname = "nix-mode"; + ename = "nix-mode"; + version = "1.4.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/nix-mode-1.4.4.tar"; + sha256 = "1nn74671273s5mjxzbdqvpwqx6w12zya21sxhzw51k2fs68vwh23"; + }; + packageRequires = [ emacs magit-section transient ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nix-mode.html"; + license = lib.licenses.free; + }; + }) {}; org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-contrib"; @@ -1314,10 +1564,10 @@ elpaBuild { pname = "org-mime"; ename = "org-mime"; - version = "0.2.4"; + version = "0.2.6"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-mime-0.2.4.tar"; - sha256 = "048psi5h8ln83pra4f24iq794w00b8p8pk67cylbd8afjdhh2x1r"; + url = "https://elpa.nongnu.org/nongnu/org-mime-0.2.6.tar"; + sha256 = "1l6mniyhmw3vbkvahw24038isd4ysbx505c3r0ar1rh7fbdf58cf"; }; packageRequires = [ emacs ]; meta = { @@ -1374,10 +1624,10 @@ elpaBuild { pname = "orgit"; ename = "orgit"; - version = "1.7.2"; + version = "1.8.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/orgit-1.7.2.tar"; - sha256 = "1kf72l8h3wqgnrchy6wvhm3nmc9drh82yw5211f4xgg2ckr60rn1"; + url = "https://elpa.nongnu.org/nongnu/orgit-1.8.0.tar"; + sha256 = "03qjhiv3smnpjciz5sfri7v5gzgcnk5g0lhgm06flqnarfrrkn1h"; }; packageRequires = [ emacs magit org ]; meta = { @@ -1410,10 +1660,10 @@ elpaBuild { pname = "parseclj"; ename = "parseclj"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/parseclj-1.0.6.tar"; - sha256 = "0cs6a394pll9sl8ybpsygg9mkznpz119f8hjgw3n7mgkwfc5a30k"; + url = "https://elpa.nongnu.org/nongnu/parseclj-1.1.0.tar"; + sha256 = "0h6fia59crqb1y83a04sjlhlpm6349s6c14zsiqsfi73m97dli6p"; }; packageRequires = [ emacs ]; meta = { @@ -1425,10 +1675,10 @@ elpaBuild { pname = "parseedn"; ename = "parseedn"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/parseedn-1.0.6.tar"; - sha256 = "1274pr91hcrvy4srdy2dw14hbcg2qy24z4klx6mashgzb1r42n3d"; + url = "https://elpa.nongnu.org/nongnu/parseedn-1.1.0.tar"; + sha256 = "1by9cy7pn12124vbg59c9qmn2k8v5dbqq4c8if81fclrccjqhrz4"; }; packageRequires = [ emacs map parseclj ]; meta = { @@ -1436,6 +1686,21 @@ license = lib.licenses.free; }; }) {}; + pcmpl-args = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "pcmpl-args"; + ename = "pcmpl-args"; + version = "0.1.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/pcmpl-args-0.1.3.tar"; + sha256 = "1p9y80k2rb9vlkqbmwdmzw279wlk8yk8ii5kqgkyr1yg224qpaw7"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/pcmpl-args.html"; + license = lib.licenses.free; + }; + }) {}; pdf-tools = callPackage ({ elpaBuild , emacs , fetchurl @@ -1531,6 +1796,21 @@ license = lib.licenses.free; }; }) {}; + raku-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "raku-mode"; + ename = "raku-mode"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/raku-mode-0.2.1.tar"; + sha256 = "01ygn20pbq18rciczbb0mkszr33pifs6i74rajxz03bcgx2j3q6f"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/raku-mode.html"; + license = lib.licenses.free; + }; + }) {}; request = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "request"; @@ -1565,10 +1845,10 @@ elpaBuild { pname = "rust-mode"; ename = "rust-mode"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.3.tar"; - sha256 = "1hg5hr5jma5v4rilchwyyw1fzm8lkfd3fxay0sb9dgzrgypvh5am"; + url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.4.tar"; + sha256 = "137z04h29cgy1dmkf2cnchlfzqs4f5v3cc9gv9qxisw9dswlvdvk"; }; packageRequires = [ emacs ]; meta = { @@ -1715,14 +1995,29 @@ license = lib.licenses.free; }; }) {}; + stylus-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "stylus-mode"; + ename = "stylus-mode"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/stylus-mode-1.0.1.tar"; + sha256 = "0vihp241msg8f0ph8w3w9fkad9b12pmpwg0q5la8nbw7gfy41mz5"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/stylus-mode.html"; + license = lib.licenses.free; + }; + }) {}; subatomic-theme = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "subatomic-theme"; ename = "subatomic-theme"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subatomic-theme-1.8.1.tar"; - sha256 = "0j496l7c2rwgxk2srcf1a70z63y48q5bs9cpx95212q7rl20zhip"; + url = "https://elpa.nongnu.org/nongnu/subatomic-theme-1.8.2.tar"; + sha256 = "0h2ln37ir6w4q44vznlkw4kzaisfpvkgs02dnb2x9b1wdg5qfqw4"; }; packageRequires = []; meta = { @@ -1734,10 +2029,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "0.0.3"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-0.0.3.tar"; - sha256 = "1qwpzj9j5fbis6vlgnqyilc49gbnxf48wcrjl8kljwzna3hsk7bx"; + url = "https://elpa.nongnu.org/nongnu/subed-1.0.3.tar"; + sha256 = "0wibakmp1lhfyr6sifb7f3jcqp2s5sy0z37ad9n1n9rhj5q8yhzg"; }; packageRequires = [ emacs ]; meta = { @@ -1826,6 +2121,21 @@ license = lib.licenses.free; }; }) {}; + textile-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "textile-mode"; + ename = "textile-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/textile-mode-1.0.0.tar"; + sha256 = "14ssqiw8x1pvjlw76h12vrk2w5qmhvp11v4h3cddqi96fddr95sq"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/textile-mode.html"; + license = lib.licenses.free; + }; + }) {}; toc-org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "toc-org"; @@ -1856,6 +2166,21 @@ license = lib.licenses.free; }; }) {}; + typescript-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "typescript-mode"; + ename = "typescript-mode"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/typescript-mode-0.4.tar"; + sha256 = "1102c35w2b66q5acvhsk6yigzhp6n3rl0s28xnvb74ansk4rz35k"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/typescript-mode.html"; + license = lib.licenses.free; + }; + }) {}; ujelly-theme = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ujelly-theme"; @@ -1905,10 +2230,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.0.4"; + version = "17.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.0.4.tar"; - sha256 = "0ji40fcw3y2n4dw0cklbvsybv04wmfqfnqnykgp05aai388rp3j1"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.0.tar"; + sha256 = "15m7rx7sz7f6h0x90811bcl8gdcpn216ia48nmkqhqrm85synlja"; }; packageRequires = [ emacs ]; meta = { @@ -1955,10 +2280,10 @@ elpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/with-editor-3.1.1.tar"; - sha256 = "175k68mr0n3v5l3gbv2fsdfznm9yjy32l3ay6hj0d4c53kw76hvn"; + url = "https://elpa.nongnu.org/nongnu/with-editor-3.2.0.tar"; + sha256 = "1rsggbhkngzbcmg3076jbi1sfkzz8p4s5i00sk0ywc6vkmsp6s1k"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix index dcd7e92c642d..cd32a8bd3975 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix @@ -6,7 +6,8 @@ To update the list of packages from nongnu (ELPA), 1. Run `./update-nongnu`. 2. Check for evaluation errors: - env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.nongnuPackages + # "../../../../../" points to the default.nix from root of Nixpkgs tree + env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../../ -A emacs.pkgs.nongnuPackages 3. Run `git commit -m "nongnu-packages $(date -Idate)" -- nongnu-generated.nix` */ diff --git a/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix b/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix index 9992fb877a9f..29f71d7f1580 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix @@ -2,21 +2,29 @@ trivialBuild { pname = "plz"; - version = "unstable-2021-08-22"; + version = "0.pre+date=2021-08-22"; src = fetchFromGitHub { owner = "alphapapa"; repo = "plz.el"; rev = "7e456638a651bab3a814e3ea81742dd917509cbb"; - sha256 = "sha256-8kn9ax1AVF6f9iCTqvVeJZihs03pYAhLjUDooG/ubxY="; + hash = "sha256-8kn9ax1AVF6f9iCTqvVeJZihs03pYAhLjUDooG/ubxY="; }; postPatch = '' - substituteInPlace ./plz.el --replace 'plz-curl-program "curl"' 'plz-curl-program "${curl}/bin/curl"' + substituteInPlace ./plz.el \ + --replace 'plz-curl-program "curl"' 'plz-curl-program "${curl}/bin/curl"' ''; meta = { - description = "plz is an HTTP library for Emacs"; + description = "An HTTP library for Emacs"; + longDescription = '' + plz is an HTTP library for Emacs. It uses curl as a backend, which avoids + some of the issues with using Emacs’s built-in url library. It supports + both synchronous and asynchronous requests. Its API is intended to be + simple, natural, and expressive. Its code is intended to be simple and + well-organized. Every feature is tested against httpbin.org. + ''; license = lib.licenses.gpl3Only; platforms = lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 6eadee0da226..1de739b5645c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -204,19 +204,19 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20211208, - 2116 + 20220301, + 1628 ], - "commit": "b1a436922ba06ab9e1a5cc222f1a4f25a7697231", - "sha256": "0alscwf2937ak2pzgl9jih7s9dya7kibl59qik4fy6xbq5h52v77" + "commit": "8ce591165e0bdc1a6ea76e78bc10c6b55bab9634", + "sha256": "0v9hw8rf5ypxn7bbwdvv5wrmvdghp691xkfc7kj2zihc0f7vyxak" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "3076cefea0f6ae9d7757f13c27b5602e007b58ec", - "sha256": "1psy6qpqxh6dm2ix7pwqdcq0rbiy6hyd830g76jk4wvj4spm5rpf" + "commit": "5d83f76823bc0b86d5270277b57a627f3af427a1", + "sha256": "0vw57jrjds4y37aryjx8lcxs6w6amn2gxhpxlr3ylwi1b6yimvhf" } }, { @@ -273,8 +273,8 @@ 20210923, 950 ], - "commit": "fc0eeb780d22aa1aac337f06cc9b479c51600243", - "sha256": "1vv3p6fkp352chrjm7jwc3frifzfral1jyrkx4m8pfq0cyj2g197" + "commit": "0d6aace2ffd184137618a0c6e7f29826cbd8d1f9", + "sha256": "1rf989ll07xqmamdigzqmamhfscx7wk0xh5yaqam1q3hj13yywm5" } }, { @@ -308,16 +308,16 @@ "repo": "abstools/abs-mode", "unstable": { "version": [ - 20210411, - 1013 + 20220316, + 921 ], "deps": [ "erlang", "flymake", "maude-mode" ], - "commit": "3b332ec1e941874f220897e5c0e0a6df762ca28d", - "sha256": "0m7v87w2akdpgr360gyjiw0p5sc6ms3y9bccwi9j4jz4gnlix6l5" + "commit": "d860ddbbd7cb93c7a77980c78c1a2a7634ef01e1", + "sha256": "03j70vk0gaf96cljkxxk2d1df85b968yn31wa13d465swcaq8wav" }, "stable": { "version": [ @@ -1035,8 +1035,8 @@ "auto-complete", "yasnippet" ], - "commit": "92d559309d0c7614e2ccc982002b7ff963f3c9dd", - "sha256": "0aidj0hz97qw8jpwcbdmhjqk8wsdls3jiq9j6bbrqh458j6p317h" + "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce", + "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc" }, "stable": { "version": [ @@ -1061,8 +1061,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20211220, - 219 + 20220120, + 754 ], "deps": [ "dash", @@ -1072,8 +1072,8 @@ "s", "xcscope" ], - "commit": "92d559309d0c7614e2ccc982002b7ff963f3c9dd", - "sha256": "0aidj0hz97qw8jpwcbdmhjqk8wsdls3jiq9j6bbrqh458j6p317h" + "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce", + "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc" }, "stable": { "version": [ @@ -1249,6 +1249,24 @@ "sha256": "0m32jpg6n0azz2f4y57y92zfvzm54ankx5cm06gli2zw2v1218fw" } }, + { + "ename": "accent", + "commit": "86fe3baa514cf81f4b031ab55d94555fba2c1a55", + "sha256": "191mhb57gj7zcgcb4h99jv8ac08l90wzsmy4aq22pz8sw56bvzpa", + "fetcher": "github", + "repo": "elias94/accent", + "unstable": { + "version": [ + 20220202, + 1312 + ], + "deps": [ + "popup" + ], + "commit": "6b502df6940587dae2dfbd349c22dfd44c803a86", + "sha256": "0q4cf4w0gm933ph4r2glw40vgfiz1v9r043w6lms3z2a0b3p6sdb" + } + }, { "ename": "ace-flyspell", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -1745,20 +1763,26 @@ "repo": "codesuki/add-node-modules-path", "unstable": { "version": [ - 20210305, - 312 + 20220315, + 340 ], - "commit": "7d9be65b3be062842b7ead862dec15d6f25db4a2", - "sha256": "0za0jjba2qdpqdkcp5bch6ma8crf0vsi7bxj2rasn2icqgxyn89m" + "deps": [ + "s" + ], + "commit": "63f047fd84b825876152743f66de7ee6f9ed203b", + "sha256": "09vf921dh6lawh14rk02gjsvz88x9vd1c68ilf2fzkap5dh61dy5" }, "stable": { "version": [ 1, - 2, - 0 + 3, + 1 ], - "commit": "6f7801b2c41e3711406b7e1654257ad5557f5bb3", - "sha256": "1pfgy1k7vp34k4zb9835y3x4jmf81na60vsf80wlgvfafwk170z6" + "deps": [ + "s" + ], + "commit": "63f047fd84b825876152743f66de7ee6f9ed203b", + "sha256": "09vf921dh6lawh14rk02gjsvz88x9vd1c68ilf2fzkap5dh61dy5" } }, { @@ -1869,25 +1893,25 @@ "repo": "minad/affe", "unstable": { "version": [ - 20211221, - 1304 + 20220308, + 1016 ], "deps": [ "consult" ], - "commit": "425e46cbc44d532b5bcacd90ad55b784834e536b", - "sha256": "0r51mf9s2cbh3qq4y04rc4b5x6b4qfqd5n5ix8xsq5x154ivmfcj" + "commit": "36d8654a8d7e862d2e64f6bece370e664218ab1a", + "sha256": "1wj63vqr5vf2mzwsx1j837ahjkj0p20zn4vkxl52rxdl8m01m2yv" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "consult" ], - "commit": "0ee5e2374339c1a57d36c06818247afeecadc2c5", - "sha256": "0r9ziscf2f4plp740ggd2vh73cgax31xsvzmc1f5w9cy88i9f8nn" + "commit": "0982fbfee5877b2492568cce2d746b263f198db3", + "sha256": "01hmhg3smjni8gpyap4wmqb4ax6dxfn6jnwlpdp76imbvb9m26ma" } }, { @@ -2387,6 +2411,40 @@ "sha256": "1gxw730b865zlaz0fdh95y7jhfwjpc3j2pkw0s3zz2xah9y0751b" } }, + { + "ename": "alert-toast", + "commit": "94d83975f0554ee1ce5fcc5a151cb859e0fcaefa", + "sha256": "1bw641qxq4vrnq9q0j7avzqhl988rds92gi5f858q49as5lf5yvr", + "fetcher": "github", + "repo": "gkowzan/alert-toast", + "unstable": { + "version": [ + 20220312, + 229 + ], + "deps": [ + "alert", + "f", + "s" + ], + "commit": "ba931529a266537783cfec2a28c2b8c058364ff2", + "sha256": "07g7ny45gy488iqxfna1mdyc7rq8jjm4zb8krk50bymk5rhnmyar" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "alert", + "f", + "s" + ], + "commit": "96c88c93c1084de681700f655223142ee0eb944a", + "sha256": "1jir8qh87faqlxq1g0yyp5zy3d60615agyddxhsmx6l9a8x91zkn" + } + }, { "ename": "align-cljlet", "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", @@ -2431,11 +2489,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20220117, - 108 + 20220325, + 1238 ], - "commit": "2c963ebb75f211d2f7ac3d2db5f4a9ee2f3e27da", - "sha256": "1gn5nyyhrvz8w1y5m8lg2khwfir0czjizmdzinr70gd7n8g1xqk9" + "commit": "65c496d3d1d1298345beb9845840067bffb2ffd8", + "sha256": "05n68r1f9g0xhffv8da5142c1771ma0lbwh44fqiraw80zjp5ybi" }, "stable": { "version": [ @@ -2473,14 +2531,14 @@ "repo": "wyuenho/all-the-icons-dired", "unstable": { "version": [ - 20211007, - 1729 + 20220304, + 1638 ], "deps": [ "all-the-icons" ], - "commit": "5e9b097f9950cc9f86de922b07903a4e5fefc733", - "sha256": "0p09rdq97hshg9gaivsqz9zvi2ba2p1a2ja1i8z6f896xv5jqs98" + "commit": "147ed0dfd1034a686795a08dc63e2c293128597e", + "sha256": "1vlwhnvgpjsvrlifczlnf4w02vpzp8rqkfw3mphhzxkfzvif5v53" }, "stable": { "version": [ @@ -2521,14 +2579,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20220104, - 1421 + 20220228, + 1513 ], "deps": [ "all-the-icons" ], - "commit": "df9822a782c409f7e19481921c985d4290882c65", - "sha256": "1906z26h84zz9f7zj1lzqgr92i05h2vgkx2mg5aa2k8kiv4v8p3j" + "commit": "66317e945dc63b7947b99162d8c482ffe936ff96", + "sha256": "0wdlcgr11yq0f8ld8fkks51fbf63d8ddm2firga0402g5gs8ybqc" }, "stable": { "version": [ @@ -2583,28 +2641,28 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220104, - 1420 + 20220324, + 317 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "f7d3d1bb69c86087f8b05fa672dd62e096370bfa", - "sha256": "0xnrhrc51hvjxn1mc53jdz868a7gbr6frkl2vgcdbbm2v41jqxlv" + "commit": "498ea281656569593b8fe4b47162447767daf408", + "sha256": "1zpqvzg76i5k48a2qvafls7fg3y0lrwfk9im0zhngczjy5gadldq" }, "stable": { "version": [ 1, - 6, - 3 + 7, + 0 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "66824c6468cbe256d7e5012f516f6840b5ab1de9", - "sha256": "19i7gnkwa7v6balx1qhd68rl1bxghl2fy442ymcaxl3yykc2hx9d" + "commit": "a866ed554932d4c52f802b2235e6d5c3382d8a67", + "sha256": "0id821qis6yqaicr0dv2cxyfdy8dh0m5xp7zbfrgnbzk1ah0npd5" } }, { @@ -2654,11 +2712,11 @@ "repo": "jcs-elpa/alt-codes", "unstable": { "version": [ - 20200723, - 1037 + 20220212, + 1526 ], - "commit": "2219a8326f8cd8ea5cd91583ba84cae7557b6fd7", - "sha256": "1sx8mp875dfbrir26fl33hql2ypjx2alqzn55qrkhyafyn6lmcmv" + "commit": "490f9b781d6aa2be376b01326b4ccdea756ff382", + "sha256": "1bp5rcqni80izky8mzg0bmf8q8n3niwhjix6jsa9w81584kmcaha" }, "stable": { "version": [ @@ -2735,25 +2793,6 @@ "sha256": "07207h1643amlairnmpf8lnnkgf69kc04z3ri9k6fm4gmh6c9dy0" } }, - { - "ename": "ammonite-term-repl", - "commit": "cf0ece0efb1fcf0ea7364df0d35fca69862f5e9a", - "sha256": "004cvhyh4afgpb31m1q31g98x8c9m6lmsb5fzc4a1r5pb4p3iimp", - "fetcher": "github", - "repo": "zwild/ammonite-term-repl", - "unstable": { - "version": [ - 20200416, - 559 - ], - "deps": [ - "s", - "scala-mode" - ], - "commit": "b552fe21977e005c1c460bf6607557e67241a6b6", - "sha256": "0g6ldvzcm6arm6hxiz1y168mj73kipgbjzxciif2b4sd3z7wpnp6" - } - }, { "ename": "ample-regexps", "commit": "6a5c72dfb52d55b2b22c91f115b32fff14f2f61e", @@ -2801,20 +2840,20 @@ }, { "ename": "amread-mode", - "commit": "2155dbd9bdf7b1f6f500c11ad1796c2ba2ddadec", - "sha256": "19wafb0aszphdmx9ayiazvq2avj9kqhanszh714n397810ak7k0v", - "fetcher": "github", - "repo": "stardiviner/amread-mode", + "commit": "b94f03b35acf501b2c4c638b5b0a745dbda804f2", + "sha256": "0xwqk4nd9hkq133l9b1n9lrv6nrfirpfzin53gb2a8v442s2anfc", + "fetcher": "git", + "url": "https://repo.or.cz/amread-mode.git", "unstable": { "version": [ - 20200623, - 1544 + 20220210, + 1354 ], "deps": [ "cl-lib" ], - "commit": "7b1ed6c8aea409e2dce4a3b59f304d716a8efab7", - "sha256": "12hcgkznf1l4db8y0q33v735b5iin8iycc5s0di46ichxcjr0b7x" + "commit": "a3358645582148e81bff54e18877451b747173bb", + "sha256": "0nl1w5ysq90bxl16jrdh87wyp6ffawbjc3c6zrbhsfmfd24jiq28" } }, { @@ -3190,20 +3229,20 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20211001, - 946 + 20220225, + 1955 ], - "commit": "b9c908f24c2119d99cd93c86a0920223ef0568e9", - "sha256": "169nwa7jfsdcjk6mbm3yabk3j8iwfixfkypwk5336dy2ncf90cjc" + "commit": "5bf59f80389d03f11bc0daa7b9cb24a0bc29f6c5", + "sha256": "0xkv0b8d8zywv86160bxhb5z7v401lzgqssagk08rzvb3vrrjf31" }, "stable": { "version": [ - 0, - 8, + 1, + 4, 3 ], - "commit": "4cc32fc2fb403dd0c501ffe7c23ba13fd23fd6ec", - "sha256": "0wjrmy2qsndfg7lwql6xw5b88j468cz365jx1sgpsplkgm25xsk2" + "commit": "b9c908f24c2119d99cd93c86a0920223ef0568e9", + "sha256": "169nwa7jfsdcjk6mbm3yabk3j8iwfixfkypwk5336dy2ncf90cjc" } }, { @@ -3232,8 +3271,8 @@ 20200914, 644 ], - "commit": "382861b1967b7ced0806343b8410709b2ce91df0", - "sha256": "05w4wmbdzg4j3nppix6gb2knf9wfyzqjcf0i1adbk7rawgcymq1x" + "commit": "724723ed0a6b179398f4105f5eb5ea088d1bac4a", + "sha256": "0qzg5qhf3p4ifspbz6l1yj4fl6sdgbi74kprql20sx9y58dyhamd" }, "stable": { "version": [ @@ -3588,8 +3627,8 @@ 20220114, 2329 ], - "commit": "75074a2f11e29aeca376b3004270a93ce44e59de", - "sha256": "07ngvm540x86fy07bg4pp5fm5f3qwqpmq5qk209gf4s7wqgign33" + "commit": "9ed3c9d72ada133426a40bac6f4a719706d99532", + "sha256": "1zg1yk6g7kx22vxg74srzkxgw4880lwf6aifxgz058v3fhk0zgks" }, "stable": { "version": [ @@ -3702,8 +3741,8 @@ 20210802, 1715 ], - "commit": "00c141bbff46c89a96598b605dee05dd1d89f624", - "sha256": "1d3ssyp90k26282p46c91wj1bvqxpvghcsicp14bnh78llwninvc" + "commit": "9b4b41cac699e85cb36bd0e4ef2cb39f7af1cf3d", + "sha256": "1khbqp8iqm6p5a83bvcvdiykd9qpa4c2545l3sbb5q3qg8js67cn" }, "stable": { "version": [ @@ -3745,11 +3784,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20220114, - 1444 + 20220323, + 1703 ], - "commit": "1761bf480cd62859e452ca492b69f09024bb308a", - "sha256": "1vhms80pdw46a16l9cjrh8sfyxwwrr8r28qpx1gkzh4bjqyszphx" + "commit": "7bcabbbbef2cb1dd12917f248402565b557d8f60", + "sha256": "1frlcjd82g0m3aj3wi45gv5gzqy16frj7as22v4c07b78xg1mzks" }, "stable": { "version": [ @@ -3847,17 +3886,17 @@ }, { "ename": "archive-rpm", - "commit": "e5f5653e62afdc022eac30bda3d21bd2d2625d2e", - "sha256": "0s53zbn71lb008gw3f0b5w4q0pw0vgiqbffgnyib24sh03ijl7z7", + "commit": "64c5ca910a8a887165a34d818fe464936df64606", + "sha256": "1s9w02w6crli7cq1082y1vrlj9qmgk2dq7smg21znmi5lch1y193", "fetcher": "github", - "repo": "legoscia/archive-rpm", + "repo": "nbarrientos/archive-rpm", "unstable": { "version": [ - 20180706, - 1232 + 20220314, + 1647 ], - "commit": "59f83caebbd2f92fd634f6968e6d17b50ffa3dc7", - "sha256": "11ssqaax4jl7r3z5agzmc74sjsfvl0m3xvp015ncqzpzysla47g3" + "commit": "379dddfbe4e801df6fdb81a55528fab6c7dbb78e", + "sha256": "1w505zv614xsc0bjc0539fw68x88vfxmd8k9mnp5364pvjfc7g87" }, "stable": { "version": [ @@ -3885,20 +3924,20 @@ }, { "ename": "arduino-mode", - "commit": "2db785f52c2facc55459e945ccb4d4b088506747", - "sha256": "1amqah0sx95866ikdlc7h7n9hmrwaqizc0rj0gliv15kjjggv55v", - "fetcher": "github", - "repo": "stardiviner/arduino-mode", + "commit": "eba5c2d5ea1316bf49cd9928c82b63efbe502708", + "sha256": "12lpcqmgklflbayp45wh7sdw4whywz4pxdb6fvlmnxzjc9lamdhc", + "fetcher": "git", + "url": "https://repo.or.cz/arduino-mode.git", "unstable": { "version": [ - 20211112, - 1223 + 20220210, + 1355 ], "deps": [ "spinner" ], - "commit": "3bc47bd7f75a7ccae409236dab43208ce8d41d51", - "sha256": "1jsifn9gfpb2rwhz9fr6r4qsmyydfd6rmz87iy7884nrnxkmdsci" + "commit": "652c6a328fa8f2db06534d5f231c6b6933be3edc", + "sha256": "16izwrk1dfsa14kylfhsxdwkx76g0jdk0znl1z7cypxh5q9ijy1x" } }, { @@ -4004,26 +4043,26 @@ "repo": "fizban007/arxiv-mode", "unstable": { "version": [ - 20211231, - 100 + 20220128, + 920 ], "deps": [ "hydra" ], - "commit": "209a026f528d5b8de0da996d46fddc47ce0749fd", - "sha256": "1kaikdh2mcp6qg45wlhi3ffq9ws2n07i26byxjvxbwwpd5f0335v" + "commit": "f550583d2da8bd9600bd26bb4028fe22a9744da2", + "sha256": "1hrrpll7yhqdf4jin28dnbv2a1yccn0f1a4hmay7f8yxmp42r1ln" }, "stable": { "version": [ 0, 3, - 0 + 1 ], "deps": [ "hydra" ], - "commit": "74105e665758bad77bd67c00435dbee95c83d791", - "sha256": "1d9aw5x2ypx6d5dyjrnmlrfdj0k5a6z6nqvrllb1n38a8gsr47ym" + "commit": "f550583d2da8bd9600bd26bb4028fe22a9744da2", + "sha256": "1hrrpll7yhqdf4jin28dnbv2a1yccn0f1a4hmay7f8yxmp42r1ln" } }, { @@ -4074,6 +4113,36 @@ "sha256": "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597" } }, + { + "ename": "asm-blox", + "commit": "78949c0632b01b70385947c69490097e9c3c5cc4", + "sha256": "0cgc6r3l2q4afdpwh632ykac6cpxcxs0lkazzbfd4bagzbl69jdz", + "fetcher": "github", + "repo": "zkry/asm-blox", + "unstable": { + "version": [ + 20220124, + 1430 + ], + "deps": [ + "yaml" + ], + "commit": "47aa63d320c39f8566a8d95c61f27383f561b001", + "sha256": "0rc0m0w8z5mz0mkyh05kjcnz9wzjvs92ygyh934zwl8a3lk566sk" + }, + "stable": { + "version": [ + 0, + 2, + 3 + ], + "deps": [ + "yaml" + ], + "commit": "8bc20ab442765dffc6c710c1922757c2df3675a4", + "sha256": "1b9iqbwc7g2z9k413mb01s1qzzshfmxs25pn2m0l1z26fc81dch0" + } + }, { "ename": "asn1-mode", "commit": "b694baceceb54810be8f8c7152b2ac0b4063f01c", @@ -4162,11 +4231,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20220104, - 1222 + 20220318, + 1342 ], - "commit": "0d52411d3accc3e11a2c64838703a8ce9755c77c", - "sha256": "0afjx74l0fywjr1gdf023prkbv9xglicjakbfbyw41m7vvlzcvk3" + "commit": "c78bab7506a70a735d2c3deab13fa87bf44a83d3", + "sha256": "1pa0cmphja9flib8m86rlsns7q53g06pn0m4ksdj0ig1xmzj4108" }, "stable": { "version": [ @@ -4217,11 +4286,11 @@ "url": "https://tildegit.org/contrapunctus/async-backup.git", "unstable": { "version": [ - 20211128, - 1603 + 20220131, + 1438 ], - "commit": "ba927feec1b568eb2b0a647b3eb7adf2d4a061e8", - "sha256": "0y88wj7p4amsqbj19rxxvhpffw43yganp1cxmzrmhbi5v66jikpr" + "commit": "6ddb39fe77d66cdef48b87cb0d0554ad7d132308", + "sha256": "14clnfjn4wwi0kza5d98d2iv9sjfnxs28cabm9psjvi239lx0f9d" } }, { @@ -4267,8 +4336,8 @@ 20201026, 339 ], - "commit": "411e9c943cf8ee966d7850c69b5e3c405e268246", - "sha256": "00977n8sp0bbpnbqwj2jfdvm9d9cqwfl4mn1wv1dj6bzfzxp68mc" + "commit": "3f4b12016bd1d0115207013ebc3f02fa7f50917b", + "sha256": "07gf5p6c78kxyji4q89gz2ffyixdccn5h610d7nidiiix1bwvh1p" }, "stable": { "version": [ @@ -4291,8 +4360,8 @@ 20210731, 609 ], - "commit": "7d6332093d2ad6963b2305ad3038f44b941a43c1", - "sha256": "01xdll1gyachgh9p9pc3c0pdki2h2xmiri9cslsaq48y9gklgaw2" + "commit": "7e07005dbbca6a5f409f37af37e5f5f81d057ded", + "sha256": "1mm9xfsk2kgqfy29k27b5z43j12nkpx1ssgp4y9k6bymrgbfx08v" }, "stable": { "version": [ @@ -4383,8 +4452,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20220113, - 823 + 20220124, + 1253 ], "deps": [ "dash", @@ -4392,8 +4461,8 @@ "flycheck", "s" ], - "commit": "70d15ebaf68d613134a1651bfb3118b57264a3db", - "sha256": "0p3d39d0vhb0c9lr6q4fz1g1jwvap5ym7kwfkk1m4dg16c2a0p60" + "commit": "19a520ecb99529790906a1fb5599acdf2b4f005f", + "sha256": "15jv6bng8xnkng005n1qbbg5lngjyq7mb5q6x3j77bkb3l8pnr9d" }, "stable": { "version": [ @@ -4585,15 +4654,15 @@ "repo": "emacs-grammarly/auth-source-keytar", "unstable": { "version": [ - 20210516, - 556 + 20220222, + 640 ], "deps": [ "keytar", "s" ], - "commit": "c9ce75de3784ba68b44a643e4d00e59e351d976a", - "sha256": "03pa44qhyyyv476gbpzshywr2yg6m48rq6kgzli3bajd4ysm9ism" + "commit": "f235a34306e230dcbf60f63e19fdc3b06425f7cf", + "sha256": "1pa4syiq7ds1hfpi268krlkyi8vl7hfr23md2x16zh0wlnsxnpm2" }, "stable": { "version": [ @@ -4735,8 +4804,8 @@ "cl-lib", "popup" ], - "commit": "57cb8f2ee32dff17ea1b4431fe5920272aa38d72", - "sha256": "185q90ibw17dh2nwdljapdw2747hzv32n4hkjfcfsgw5asy58r8z" + "commit": "d515059ea5316c81223f6d969e45b16b47365b5c", + "sha256": "07xp981b1j9igcai930pqfiz16idp9898bpdl623d9175i5dnrjl" }, "stable": { "version": [ @@ -5011,6 +5080,21 @@ "sha256": "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3" } }, + { + "ename": "auto-dark", + "commit": "5e0563fc10ad39c0bee64c91c02df54d4880491c", + "sha256": "1lh5jsqkx653p3xbpyg67jfi9n2x6nzlqh0szhawp9rahszjgwym", + "fetcher": "github", + "repo": "LionyxML/auto-dark-emacs", + "unstable": { + "version": [ + 20220320, + 1703 + ], + "commit": "c5dd3afa6771f4777db9e427f21bfcbe4883abaf", + "sha256": "0r4i664kybzzfmpn9w7pi1czjivq6kk1yqdym30c6kvdq1kv73d3" + } + }, { "ename": "auto-dictionary", "commit": "1711d710ac09fe407fde89ee351ccdcb78555d35", @@ -5042,11 +5126,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20211101, - 1155 + 20220209, + 2101 ], - "commit": "a1c67bf557277934f6dae9f2de6624d949ef2c8a", - "sha256": "0z5afn48w3p3i98zn81422khbl0k460spgqj60b9s7sqccbssg57" + "commit": "33b5f88b799a17947c266b04ad59462c5aeb4ed7", + "sha256": "17h9hh8n6ib1crap8jdgjhaszvlqb4gri1z821apyn66lqvix7x8" } }, { @@ -5057,14 +5141,14 @@ "repo": "elp-revive/auto-highlight-symbol", "unstable": { "version": [ - 20220103, - 1602 + 20220223, + 1622 ], "deps": [ "ht" ], - "commit": "5949aa269d3781985c3c9fc5e557bd82c3c1f7e4", - "sha256": "01qqdkd16zy5sqla821k2q3bh4gmlq5xp5wdar58rm7cww6r4w5x" + "commit": "939aa7f58c555a05451238e40c34bc8da0150870", + "sha256": "1rqphhfvi91vgqqxahgm2zkxk12dvqxvqgraqgagc75xpqsgw423" }, "stable": { "version": [ @@ -5213,8 +5297,8 @@ 20210805, 1344 ], - "commit": "77f66b75209628a267a5ced84cd85774e0e26b9a", - "sha256": "1n0b74zhj4v9gniy33im4cahxx33mhbkhjpb4ra4qahqdyl5a7c9" + "commit": "5551157ab81b55322e7787ce16ba84162933aece", + "sha256": "18zrh7s8xn9spr5lg5zasdb3rkldnvmhi31z08d4rxjfpfhikcql" }, "stable": { "version": [ @@ -5281,14 +5365,14 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20210522, - 612 + 20220209, + 554 ], "deps": [ "f" ], - "commit": "0dec9e632f1f3208f0da2f94b57efa1aae9ce2ab", - "sha256": "1isk9106lpdh45l41n2v8q8m9vcfb4biy9dv87rkks58nysrxy3z" + "commit": "df455f9723fbaab8ab550c7e7df79dc6b2d159c6", + "sha256": "14n77h7w69w0i845dbbq39nxnh1xw28kacp0cgf666r62vgdcvvj" }, "stable": { "version": [ @@ -5418,11 +5502,11 @@ "url": "https://git.sr.ht/~pkal/autocrypt", "unstable": { "version": [ - 20211218, - 1848 + 20220215, + 1204 ], - "commit": "222954754ace827a80999955f02008841b260325", - "sha256": "01xg2g7fr6l495yvxsrln4q1i6v626spdy2yw9jkbc2jzpx34v0q" + "commit": "00b87a82c4561b017052974eecd93c79b6790841", + "sha256": "1cnnw2cwhsrlp2nanvcgdpd90vpmzwxnr9sprwfgzldgk9651r58" } }, { @@ -5482,8 +5566,8 @@ 20190331, 2230 ], - "commit": "842ae4df222bbd6596068814ac1b1e505c2a6b7a", - "sha256": "19j76bgv5hca8i9385f1s66zj31y70fgppmvxdqrws4265zqc11d" + "commit": "09166f32d3ece2b297da036f0abbeba63329580e", + "sha256": "09j3mxa0803piywmfkvxg0jpgbx6qbvibsik8wsms898bg5n3s4d" } }, { @@ -5619,27 +5703,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20211020, - 111 + 20220221, + 1638 ], "deps": [ "avy", "embark" ], - "commit": "2f147726fef37b085e3f4ee2d94d953480544552", - "sha256": "10flx40bwkghziypp5spggcpjd731b150jvp9qri5vlaii98ays9" + "commit": "b80d96ce0ab79e73829322e46c6d7493eb2b8c34", + "sha256": "1jsynjl0y7w0jqxqlibg8m4rwzv9lxj443m6dlac6zncz8plnizp" }, "stable": { "version": [ 0, - 15 + 16 ], "deps": [ "avy", "embark" ], - "commit": "7814a7345067da31a1e7af682bb1f6f050527001", - "sha256": "08wj0p3plvblbmfmn4vsanhldr2csrnm1lhk3g1nic5v26yi5l64" + "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b", + "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv" } }, { @@ -6409,11 +6493,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20220114, - 1320 + 20220222, + 1616 ], - "commit": "57a28859258bc83f2cca62b8530221d228119655", - "sha256": "1vlg4b1k3jw2pssa7fpf9sx9bjb4gmswkcyv30ha4c8pm39byp79" + "commit": "e07a16666154c8ddc65ddaae599d58b25727350d", + "sha256": "0kdlhp3h2kkijxsmd7jhrbb1dgs6x5q3gpw4qv5ij89xrlxanz7d" } }, { @@ -6454,11 +6538,11 @@ "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { "version": [ - 20210108, - 38 + 20220224, + 403 ], - "commit": "03c9ab00642fd54d7fb601f95a094b8b7f0eefb0", - "sha256": "1nk4d3qb5ibdjp3jmlbf5751y8zd6gms9r19l3hk1ajkw94p43kn" + "commit": "00a003c9a3788c3a0fe8bd89b827b4e9bbdf2261", + "sha256": "0iskn78ynz24wdbq1ja24m0pqcbhb4dfipnxx0nijdsbf6xpj37r" }, "stable": { "version": [ @@ -6850,8 +6934,8 @@ 20210715, 1004 ], - "commit": "0be8e2ef7b40d9006b2812f103746799bc529828", - "sha256": "1grzlfa4dxf30yf7y40fw9fqm4fl74k5kcyxpffy3d876c7qdfnp" + "commit": "7183369a489a12f4a776f03c8e1a9bfe62d0ab3d", + "sha256": "1fg0w1c1fdvqjf5rki4zw2m8zwdxsc2g43s9vm635v6akb8ryqmy" }, "stable": { "version": [ @@ -7045,8 +7129,8 @@ "a", "pdf-tools" ], - "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", - "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" + "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2", + "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj" } }, { @@ -7528,8 +7612,8 @@ 20200404, 1550 ], - "commit": "8f7cd388abccdf25baeca99c07ef2dfe264e8f2f", - "sha256": "16c4scmc7csb34c237m04fc2w252lvqiwjcz65bjmf077g1ipd7q" + "commit": "c221fa2c8a204b4aff2e09c606f59be58b960b97", + "sha256": "1zzrmlxifplpskm3a7hbm4x6mpikr1nhgds10qaxqv0gfq312p1c" }, "stable": { "version": [ @@ -7548,26 +7632,26 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20211206, - 2137 + 20220302, + 1936 ], "deps": [ "a" ], - "commit": "9e7517cfee9272e9e4822b4efc3fac7e32d7bb38", - "sha256": "00b8pnm1990fjiznz568mf3680cb2wq2qphbd3h0kdbzzanfn1fl" + "commit": "0dc1328b8640207ac75a009c690d392f63c44f4d", + "sha256": "1sdgbwv3iiwcw5af7hdk04ab841nl8y8xm854b9qdh9n0micwx3a" }, "stable": { "version": [ 0, - 3, - 6 + 4, + 4 ], "deps": [ "a" ], - "commit": "d452006a31895a79216bf35a64482631a83cfc2d", - "sha256": "0gi0q60q9r5nx5wzavxywajmh9gw4nl20msgh9k9k9ilj4jy3a1b" + "commit": "0dc1328b8640207ac75a009c690d392f63c44f4d", + "sha256": "1sdgbwv3iiwcw5af7hdk04ab841nl8y8xm854b9qdh9n0micwx3a" } }, { @@ -7973,11 +8057,11 @@ "repo": "ideasman42/emacs-bookmark-in-project", "unstable": { "version": [ - 20220119, - 949 + 20220212, + 156 ], - "commit": "1033822db4ebf675bd55cfe490b39602e7c3c2d3", - "sha256": "1wkh084i62kssx47x154rlsmswqljj7k5nkj0icmdnxlf4ynx71a" + "commit": "70ae40b4c4cdf44999ee4c738f5a4ae34a2d8421", + "sha256": "1hidzm6yv5fqx93shfxx70xsjbyzkia00ylxd06jniqpydl3fydh" } }, { @@ -7988,11 +8072,11 @@ "repo": "minad/bookmark-view", "unstable": { "version": [ - 20211223, - 1106 + 20220216, + 2024 ], - "commit": "841750afb272a596f1536e6a5731d9de22c7c5cb", - "sha256": "0bgbmjbjq70q4zmdhaz9jnhi5gkzxwz9fbh60sgnm90hjmfrrr2d" + "commit": "314e74e11386af72ca282e228996321a8a6d4c9a", + "sha256": "1bqajd2slg5gh33q84ps9cpv0g04y5gz6m8gy55m01f2zrwxvyqc" }, "stable": { "version": [ @@ -8068,28 +8152,28 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20220111, - 1150 + 20220216, + 1925 ], "deps": [ "epkg", "magit" ], - "commit": "0161a03720f11eb7f0a326612e6e2fa3695bb369", - "sha256": "1m0afgr2dbhr2db33cd2s4r7b3ysk0ki44xsbfha2536qwzrkncb" + "commit": "378089e179e439a4999e14a410868743694cb911", + "sha256": "07wygkg94m5xr0r4yfcvcxdy3a9mh7pxfg3gzvy8dka6cax7fj25" }, "stable": { "version": [ 3, 3, - 0 + 1 ], "deps": [ "epkg", "magit" ], - "commit": "e4d54aac5c2307cafb5c509094701b9ca78cace8", - "sha256": "102qdb4581gfhrxv61pd6yw5xbyd3vs8ifq2wp9wq6bf19il2rm9" + "commit": "66f00318777a3530741535f64a420addc1ccf44a", + "sha256": "0w180am9p952j2iyidf5krivlx19mv1ji1f34cwm969mhb3652fy" } }, { @@ -8567,11 +8651,11 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20210520, - 1616 + 20220325, + 1659 ], - "commit": "32c1cfdf06dfa7bdbd79aba8066064212672e755", - "sha256": "1mbrsakg7mbrr4szi7ha5hcfr88i79p5bn59dh7v6ywa357brmky" + "commit": "ba1c9d24d3f1ba58445cbf1f762ba6859b66f6bf", + "sha256": "0davkvlyqj78i6njhkjyrv4l7qnscysimssbwjsnl4lbk7c1z85k" } }, { @@ -8769,8 +8853,8 @@ 20200924, 345 ], - "commit": "b48834a688e35b9966fa5a189781c7638092fd54", - "sha256": "1msg17qw6clld78jb40hd1fnsgswql57yw4kh37mn0v2ksa8a9s5" + "commit": "1734ee6cadaa8094e6b06876c57dbca5dbd289cf", + "sha256": "0h8da68hclfjrxpq3h84fanldm8vgkriljw0qn2vwpdd5yw5258v" }, "stable": { "version": [ @@ -9168,11 +9252,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20210105, - 2255 + 20220321, + 1903 ], - "commit": "1cb7afcb0b6d87a3e623dc26ffcb2c7d4d6dd280", - "sha256": "07f8lxcyi007qfhgq0yvpq1pg8hklzq94pfkzpqq2hb2cvyj2zb5" + "commit": "c365dae776f823aa7489bcf0f750ca748fefdb28", + "sha256": "1p7c6p33nk23jywwd9b7c7062chr8x0bjffgall9rxsyqczdqzxx" }, "stable": { "version": [ @@ -9517,11 +9601,11 @@ "repo": "unhammer/calendar-norway.el", "unstable": { "version": [ - 20210608, - 1136 + 20220211, + 1129 ], - "commit": "4dd8c38ef30ad45931c8ae7bcdfd720c3fcffffc", - "sha256": "02xf57dincpn7km1f3c9dnq2qv6lk07m9z5hilm3nnns0wwzqdyw" + "commit": "0db0ea63365f4ff5f7d18fb8335fa88af194a2cc", + "sha256": "0bhqr67w301fb74drnw6291bri9ga95946n7jg382jcp6sxn9cpg" }, "stable": { "version": [ @@ -9671,16 +9755,19 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20210603, - 323 + 20220305, + 1621 ], "deps": [ "dash", + "esxml", + "org", + "request", "s", "transient" ], - "commit": "cb93563d0ec9e0c653210bc574f9546d1e7db437", - "sha256": "10dymcd17ili5r6ydiz7bj0q81y5fh0s1d64m4acfa8xfsi7zx55" + "commit": "20337d39e3abe4baa38cc0ed5a6c65272df9af2d", + "sha256": "08ix2iq17xsl9dcnf0xik12ykpji77kb5xs91y23w1plfl1pl0zj" }, "stable": { "version": [ @@ -9705,18 +9792,19 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20210728, - 802 + 20220214, + 1251 ], "deps": [ "anaconda-mode", + "beacon", "cl-lib", "hierarchy", "ivy", "tree-mode" ], - "commit": "7a40f9ddb16a6ce9345e0bd632109b7e2048baa1", - "sha256": "18as7vq8cmhxkxgh0p8qlifyvza66n6xf9a2fi07wc4acp2gpn55" + "commit": "aa5ffb15cec39920012aa526e932d48e5c74bbb0", + "sha256": "12rsylxr9ls6br38vwq9h6fzqsqjxgqwyv76wf6qaazd4rp76m0y" }, "stable": { "version": [ @@ -9845,19 +9933,19 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220119, - 2013 + 20220313, + 58 ], - "commit": "e01162ab1007457aba788916c1d59de8d6083b25", - "sha256": "18w1xq3q9jc43krvmgc1ic3m09r7am0acwhcgc9xs1jyaxwcg5pi" + "commit": "79e8771c18c76a5bef5fdbf74718527e74b6d702", + "sha256": "1v5q066xppxf0crzcliqa2mya0x18qjmz5xp0mcr2szi1nps8z7s" }, "stable": { "version": [ 0, - 5 + 7 ], - "commit": "9567f1ca09a3867e50ef8f990b486e916460df9d", - "sha256": "0780qymlrg3glyxypizqzwicp5ly5xavxgpmayhx8cxlgp2zlkjh" + "commit": "51b9bf1276445faebfbad636d9b6a39dc57b22bc", + "sha256": "0731c55bb1vxdh8k7312z1bvf7g8jwr2n04q3ffpqp0fan6ra025" } }, { @@ -9871,8 +9959,8 @@ 20210707, 2310 ], - "commit": "82b29296f76c583856511f645d9ab4e427a6d218", - "sha256": "03s00fqsw4nxijkfpq0ysqi88d848lgy8xbj13aa4xfygnzx80x0" + "commit": "281aacc18003ae103b8a04ea83d7b6f814c97b8b", + "sha256": "0v245k0fv0dsg706v34rg91h36avfvl3yfddll1gp9h87df04hkp" }, "stable": { "version": [ @@ -9922,14 +10010,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20220102, - 1217 + 20220311, + 827 ], "deps": [ "markdown-mode" ], - "commit": "5589f9f46f3e1cdeb6261515ce314aab40f3d786", - "sha256": "133cj1qbb53hm3ffkvf80cyd6hj69l8kxklnig8ap1ymhha075g3" + "commit": "8335b5577dfa526c645f7c1839c473f99b9ad1a8", + "sha256": "0dw46rd1naz9z383bn3zzywz2955r4fw6a1v87m1scr3j42i6q4p" }, "stable": { "version": [ @@ -10031,8 +10119,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20211103, - 1654 + 20220316, + 1557 ], "deps": [ "ansi", @@ -10043,14 +10131,14 @@ "s", "shut-up" ], - "commit": "751435bd56c7123d8244d9d156309e21e63cd5c0", - "sha256": "0jxwsaam7hqvqbxrkzd7hy09l87yjsg7z89jikzs6vzc72h02g8x" + "commit": "218433b408b95efdc026081ee3f44e976a3aa36b", + "sha256": "08bniq7hba6438nfwfnmhkvm1yqln5f27239ndq1gbhc3wnnq61q" }, "stable": { "version": [ 0, 8, - 7 + 8 ], "deps": [ "ansi", @@ -10061,8 +10149,8 @@ "s", "shut-up" ], - "commit": "9600dd9a341c61ac006c0a44912e13f3810f3c54", - "sha256": "0aqc3p7i00rbdgj2cjil71c8wqq9ard637fnpdq1ny6wnb8kblm7" + "commit": "9347a4d4459722f0863167bd21001477d76f3dc8", + "sha256": "1i948z6q07mfibs1v7k1cl8hs299m5vlm2brlpz9hm0bkfmmwm2f" } }, { @@ -10241,8 +10329,8 @@ 20210501, 820 ], - "commit": "251df5b02c91311140d2375b019c1de836655fd0", - "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" + "commit": "5c209e0306364118abf9d9440d7b8b9613183072", + "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" } }, { @@ -10290,8 +10378,8 @@ 20200904, 1431 ], - "commit": "251df5b02c91311140d2375b019c1de836655fd0", - "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" + "commit": "5c209e0306364118abf9d9440d7b8b9613183072", + "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" } }, { @@ -10425,15 +10513,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20220112, - 1239 + 20220224, + 808 ], "deps": [ "cl-lib", "powerline" ], - "commit": "cde3469d77f83b0877f2a7c727ca101cfeb86401", - "sha256": "12msyfz54am5n9qwm2igjp0cfczm9h6z5phay5ya75cdm0bmxby4" + "commit": "f4cef95acbd2eb99c8db3b6cdde74a6e0a966a0a", + "sha256": "10vpy22g2ccrj00kycrjcywywc69hqf3dm7vcbmmw7ralh9vclbc" }, "stable": { "version": [ @@ -10471,11 +10559,11 @@ "repo": "anler/centered-window-mode", "unstable": { "version": [ - 20200426, - 1053 + 20220125, + 804 ], - "commit": "f50859941ab5c7cbeaee410f2d38716252b552ac", - "sha256": "1l7m3gfn7j1mxs0rj1pm5avknplw2f34dd2k24n5rldfm41pf8i8" + "commit": "80965f6c6afe8d918481433984b493de72af5399", + "sha256": "0zmq84gvkyj20l9gv5wwraa6zis2vk7hadagkmyqg1w6vs25n2mh" } }, { @@ -10560,8 +10648,8 @@ 20171115, 2108 ], - "commit": "ba547dafdcbc6492e4bcfa462942126b2d1b8457", - "sha256": "063pnr6l7ryviw24y0pdkx2sj3piijdard6lszwcr8h3h3k063fm" + "commit": "6bbfdf3109f044191750ac893aadbfc0d1b2fb0e", + "sha256": "0mz18pj1phxpjp54w4l7xcrm3lzp9jick4fws1wy8mk4566qiixm" }, "stable": { "version": [ @@ -10614,30 +10702,30 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20210129, - 2037 + 20220221, + 1029 ], "deps": [ "f", "s", "yaml-mode" ], - "commit": "a4ca40978e680f9edc86c141e696e0ae57c63533", - "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi" + "commit": "4cf56affe3035fda364109836e26499431095185", + "sha256": "1i9nqzk6nx4jdcn6q2yj2awb8rskblhnhqmxljd8bfv5s02fqr8z" }, "stable": { "version": [ 1, 0, - 2 + 3 ], "deps": [ "f", "s", "yaml-mode" ], - "commit": "f3462930067de8f79c3d2e8da14d1924f609d3ab", - "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi" + "commit": "4cf56affe3035fda364109836e26499431095185", + "sha256": "1i9nqzk6nx4jdcn6q2yj2awb8rskblhnhqmxljd8bfv5s02fqr8z" } }, { @@ -10679,39 +10767,55 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20211013, - 1802 + 20220129, + 1149 ], "deps": [ "dash", "posframe", "s" ], - "commit": "c1f639d7bfd3e728cf85dbe224b06a4be76158f4", - "sha256": "1bic67769xvjdhinq88jqxnb4dql8gssmnx1wvrl69338zjqqjzg" + "commit": "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121", + "sha256": "1vf5zm82sx3m1yvq73km8ajapv6rnz41b1jrsif7kh0ijh9vk3qi" }, "stable": { "version": [ 1, - 5, - 6 + 6, + 0 ], "deps": [ "dash", "posframe", "s" ], - "commit": "8e9b79e38306b11411543d31cb483201131ba42a", - "sha256": "1sa0klkyr55xmshzxm9hz3j5vdkisxg67w8q00z7zbsald0imxbx" + "commit": "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121", + "sha256": "1vf5zm82sx3m1yvq73km8ajapv6rnz41b1jrsif7kh0ijh9vk3qi" } }, { "ename": "cg", - "commit": "be27e728327016b819535ef8cae10020e5a07c2e", - "sha256": "1xffjilr9f2s3w7j8f3clq7qvsnr0lr8gadlybpzzy8x5fbmk4n3", - "error": "Not in archive", + "commit": "808b19a7c16fa977ecf22006c470cfb8b62b9e5d", + "sha256": "01aqh2xbg0bmj166lhxnl44qvwadsp2fcrm39w4hywccjpgvy94h", "fetcher": "github", - "repo": "emacsmirror/cg" + "repo": "GrammarSoft/cg3", + "unstable": { + "version": [ + 20220318, + 1007 + ], + "commit": "140a63995ca15d393c7e7003cf0e6edddcd4088c", + "sha256": "1ssl0nzm2bs3iyjak9x2gkl3206v5ihbzsspqrvrgijfv3h9yhzr" + }, + "stable": { + "version": [ + 1, + 3, + 6 + ], + "commit": "25afa64a35780b7d870a6c2467a404ea67d6d23f", + "sha256": "0jwyq878bayw4qx25ifc1gabsvg0xilsizg73lkwj06qzag2x0s9" + } }, { "ename": "challenger-deep-theme", @@ -11024,6 +11128,30 @@ "sha256": "0m97xr6lddy2jdmd4bl4kbp2568p4n110yfa9k7fqc20ihq8jkyd" } }, + { + "ename": "chezmoi", + "commit": "36f51f076004452aff618e401984f70750f2505a", + "sha256": "09mzv7pi849ad2mlk8r3dnwh51jvx6qyycwy6dx42faq06i9x1ci", + "fetcher": "github", + "repo": "tuh8888/chezmoi.el", + "unstable": { + "version": [ + 20220310, + 2014 + ], + "commit": "781783c483bc8fcdba3a230bb774c3a8a5ebe396", + "sha256": "0il36mnf4c13336sa4hpbfypdc983va5fcd5shcsp7slb9zwm69m" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "d493925f93d5e0badb04a5331bbc8741b0cb04ca", + "sha256": "13y3fvkw4vfiaibxgdvrxkca9lacfwfjddk8wrrind92q2p2ph2n" + } + }, { "ename": "chinese-conv", "commit": "a798158829f8fd84dd3e5e3ec5987d98ff54e641", @@ -11191,21 +11319,21 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20220113, - 1718 + 20220326, + 1439 ], "deps": [ "dash", "seq", "ts" ], - "commit": "fe9f2b494f7f78a21b54d43f2546a6da5818b3d3", - "sha256": "1d21y00c5nq6pj2rpbn0jmfghm2fpvq0n1jnq3vqqjy467jwzz2a" + "commit": "3f52469f31f0bc23dd63d0b3c29bc2040dfcd98a", + "sha256": "1mjvn02dwhnwq6x1llnlpxzvpfkl753mbs68dahd520fvyjglnrq" }, "stable": { "version": [ 0, - 9, + 10, 0 ], "deps": [ @@ -11213,8 +11341,8 @@ "seq", "ts" ], - "commit": "73e6d98612187aa64f4adacd26e058349cf131c6", - "sha256": "156hj3sxjcfpwimnrykh4n3krkbzas9jg8m6xzy42rnzhx28ja6k" + "commit": "2c1274147475b552716de7cecd7a9fd46e578e46", + "sha256": "0qpkpkipmac24m3ng4ahsml3vi15qcvmid3g02pbpgbpc113zfpl" } }, { @@ -11244,26 +11372,58 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20211118, - 1235 + 20220326, + 1439 ], "deps": [ "chronometrist" ], - "commit": "fe9f2b494f7f78a21b54d43f2546a6da5818b3d3", - "sha256": "1d21y00c5nq6pj2rpbn0jmfghm2fpvq0n1jnq3vqqjy467jwzz2a" + "commit": "3f52469f31f0bc23dd63d0b3c29bc2040dfcd98a", + "sha256": "1mjvn02dwhnwq6x1llnlpxzvpfkl753mbs68dahd520fvyjglnrq" }, "stable": { "version": [ 0, - 9, + 10, 0 ], "deps": [ "chronometrist" ], - "commit": "73e6d98612187aa64f4adacd26e058349cf131c6", - "sha256": "156hj3sxjcfpwimnrykh4n3krkbzas9jg8m6xzy42rnzhx28ja6k" + "commit": "2c1274147475b552716de7cecd7a9fd46e578e46", + "sha256": "0qpkpkipmac24m3ng4ahsml3vi15qcvmid3g02pbpgbpc113zfpl" + } + }, + { + "ename": "chronometrist-spark", + "commit": "14000772028841fc06aa3baf3545ea193d5705c6", + "sha256": "04gm5srg62zb80av5b5i2k1d790cf9xb6zn0bisf7l4i7cvjxafk", + "fetcher": "git", + "url": "https://tildegit.org/contrapunctus/chronometrist.git", + "unstable": { + "version": [ + 20220321, + 349 + ], + "deps": [ + "chronometrist", + "spark" + ], + "commit": "3f52469f31f0bc23dd63d0b3c29bc2040dfcd98a", + "sha256": "1mjvn02dwhnwq6x1llnlpxzvpfkl753mbs68dahd520fvyjglnrq" + }, + "stable": { + "version": [ + 0, + 10, + 0 + ], + "deps": [ + "chronometrist", + "spark" + ], + "commit": "2c1274147475b552716de7cecd7a9fd46e578e46", + "sha256": "0qpkpkipmac24m3ng4ahsml3vi15qcvmid3g02pbpgbpc113zfpl" } }, { @@ -11322,8 +11482,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220113, - 610 + 20220324, + 542 ], "deps": [ "clojure-mode", @@ -11333,26 +11493,25 @@ "sesman", "spinner" ], - "commit": "8bb67174ffa0cd7ae01f544926b4ed5a17965d76", - "sha256": "1fh95x4gabmm95ligy30lhqgay5snlp9d4m21l5zmk64klfyrpfb" + "commit": "36277802a47b0dbc9c1fd60f60908963c59c58d6", + "sha256": "0z05paq62aq520n3nqc089pyx58yn670r80cda896syqs7qrxpq9" }, "stable": { "version": [ 1, - 2, + 3, 0 ], "deps": [ "clojure-mode", "parseedn", - "pkg-info", "queue", "seq", "sesman", "spinner" ], - "commit": "7869c66f81d8a2b47f2e2d912fcb96934f5aa39a", - "sha256": "1c21hdrf6b7zc65nr7wqjhcyq5a0f4aa91wrxgzx374q81xym2rf" + "commit": "02ca53021682f426323dc7bb4e6b28e6c8f5eb30", + "sha256": "0mxlkxpzn7rzbzpzcw2z9x2ab2zvhrwr8h21kmfn3li3dha73gf1" } }, { @@ -11555,14 +11714,14 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20210717, - 1041 + 20220320, + 1811 ], "deps": [ "cl-lib" ], - "commit": "77e16de3b9fbaa0417b56a9acc70a9bca17c4ad0", - "sha256": "1ww04kfz4kkbhrbd78r4dpylhayb5hl72qcjv8wm0mhgfwmbb358" + "commit": "e4c5bb69e6f1338239bdbf66baf57bb610828b2e", + "sha256": "05ddgcgqribdwbph7qkz5r24h1xsbrnhlg4yqgnyyw5kfxayapzj" }, "stable": { "version": [ @@ -11633,8 +11792,8 @@ "repo": "bdarcus/citar", "unstable": { "version": [ - 20220119, - 2244 + 20220324, + 1539 ], "deps": [ "citeproc", @@ -11642,8 +11801,8 @@ "parsebib", "s" ], - "commit": "46da9225a852a8f37399462add58419346c09eb0", - "sha256": "0sf8sv1wasv4bbis2x8dz9d7g4d0rqbfsxa8knjqvcy6gqpssj1c" + "commit": "e97e33128051b5311d640492a3dfaf8dd7cdfcfd", + "sha256": "0yyb3gq140cl4dxlaagm8rwxf4cvv51g20sv5d3xfkhbkymbqjf6" }, "stable": { "version": [ @@ -11667,8 +11826,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20220118, - 2057 + 20220124, + 721 ], "deps": [ "dash", @@ -11679,8 +11838,8 @@ "s", "string-inflection" ], - "commit": "470ecfb761062cbb546293e21cd5aa56dd77f528", - "sha256": "0pn6f5hi3ldqzx2p53365arcixxqyrmhvqd2cl0nlz0g0q5wzwhm" + "commit": "ba49516265fa24b138346c4918d39d19b4de8a62", + "sha256": "1zxrzx537ar35i32g7y76k8w5z4x2nip2vw6lr4xwvzl6bwxnfqv" }, "stable": { "version": [ @@ -11746,11 +11905,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20211225, - 1020 + 20220324, + 1741 ], - "commit": "641f2f7f69de2c0f4f055efe55b3ecd899a60b24", - "sha256": "052b0zwxn7cnm9l9hb8nv794fbl9vds39f1a9xp0grg5q70qy3k3" + "commit": "8b51e58819e0a4b65c15f01177d1a154d9a9d153", + "sha256": "0yrcqypj1paszp2iwv0c67bh7vy1p3fj9n4h1ghn1y0pcqgbccb9" }, "stable": { "version": [ @@ -11815,11 +11974,11 @@ "url": "https://git.sr.ht/~pkal/clang-capf", "unstable": { "version": [ - 20211204, - 1351 + 20220122, + 1219 ], - "commit": "147be0e908f09ab2346443d48457f9624a404019", - "sha256": "1qwlafw28axrnhk9zrhpgww22964j9s0ys43dndmmh16ykyzaxgc" + "commit": "b1765719288a138e125cc5ce624ef561c80015bf", + "sha256": "1v8h916rqylz98v1xi1bqdcakgjjl3l1f51xcvyd41wn1kfiaxnf" }, "stable": { "version": [ @@ -12093,20 +12252,20 @@ }, { "ename": "clj-deps-new", - "commit": "733832bb1f0003cab6ca52ebba6cabc1bdf68659", - "sha256": "16jmdiavl7pg54kflfs1dkpislc6wbmnxxf0qh9idf584kkl1g1m", + "commit": "74d96277724fddaa7dbaa77795a02d4a97e499e6", + "sha256": "0q02wnv7i7bxz782yf5sk7lgisrh6064hagmyngpzx1dw1i29wcp", "fetcher": "github", - "repo": "jpe90/emacs-deps-new", + "repo": "jpe90/emacs-clj-deps-new", "unstable": { "version": [ - 20220109, - 1459 + 20220221, + 2235 ], "deps": [ "transient" ], - "commit": "a39214123ed46b62403b1b557dbdac0efc04546a", - "sha256": "0bs38sg6md06vzbj2w0j0ikd4cqqnn0cfdpy13mg6fd8xxmf5irw" + "commit": "183089e6d4ded90efff491916e1c87411ead0461", + "sha256": "0a4fz838mxcv42z3r5h1i7nlqpl1ipqc6ljlgbhvz5hw6bd0p96w" } }, { @@ -12117,8 +12276,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20220109, - 244 + 20220315, + 2251 ], "deps": [ "cider", @@ -12131,13 +12290,13 @@ "seq", "yasnippet" ], - "commit": "bfd83d142f1a05bad779fa7ccbaec8bd24dae177", - "sha256": "0010db9xagz5dykh377z9r6vn50wk9ffvgq8410ppcymdaq1syx9" + "commit": "f368c56c83843396b160440f472a661a3b639862", + "sha256": "0xp17gc5ipm7jzyx8smnq5z3hb7nb36c11f5c637chg3qdhw1r8m" }, "stable": { "version": [ 3, - 2, + 5, 2 ], "deps": [ @@ -12151,8 +12310,8 @@ "seq", "yasnippet" ], - "commit": "e0d83c845014a24c2604a08f9c9931c63ea809c4", - "sha256": "1iyivn7x5bcnp4g7k0k2b0jdcph84pbldlk83qqfzix6h4sp1k1f" + "commit": "f368c56c83843396b160440f472a661a3b639862", + "sha256": "0xp17gc5ipm7jzyx8smnq5z3hb7nb36c11f5c637chg3qdhw1r8m" } }, { @@ -12231,11 +12390,11 @@ "repo": "ataka/clmemo", "unstable": { "version": [ - 20160326, - 1623 + 20220204, + 1345 ], - "commit": "846a81b984d71edf8278a4d9f9b886e44d5b8365", - "sha256": "152qf7i5bf7xvr35gyawl8abkh7v5dsz957zxslrbbnc8bb1k6bz" + "commit": "f695c38c551f72f6ac5e1a82badc540c80d3b33b", + "sha256": "19lzrbkkabyw2pha005vpkgn42bs3b52nij1x2wr7v35bvpsck2q" } }, { @@ -12379,20 +12538,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20211119, - 1904 + 20220307, + 1903 ], - "commit": "e31186843d06ea86f3771244d1cde0112f9e2079", - "sha256": "0dlbwz0vkn2sf394r86s7vbc78jkq7wd3ldziqkwf57ci2068nyi" + "commit": "c339353f9e649b3af084f1bb6ce759e614a2f243", + "sha256": "062vkzp5y8f8afz0rbgagqrsmmfnwmhkg7n9ainqp7m2h52qqzbb" }, "stable": { "version": [ 5, - 13, + 14, 0 ], - "commit": "0e886656c83e6e8771f748ec698bb173adcb0968", - "sha256": "1ikl29rygr1habcsglz07m4ihd4ivi732kkzg8q676ihf367wa9i" + "commit": "b7d08b87f6a116ff47b33ee857926b60c66c3ab7", + "sha256": "0n7v6hx21f8x37gj388wnff38aqpzxxv5g8vxavp74vr3cbagsnn" } }, { @@ -12409,20 +12568,20 @@ "deps": [ "clojure-mode" ], - "commit": "e31186843d06ea86f3771244d1cde0112f9e2079", - "sha256": "0dlbwz0vkn2sf394r86s7vbc78jkq7wd3ldziqkwf57ci2068nyi" + "commit": "c339353f9e649b3af084f1bb6ce759e614a2f243", + "sha256": "062vkzp5y8f8afz0rbgagqrsmmfnwmhkg7n9ainqp7m2h52qqzbb" }, "stable": { "version": [ 5, - 13, + 14, 0 ], "deps": [ "clojure-mode" ], - "commit": "0e886656c83e6e8771f748ec698bb173adcb0968", - "sha256": "1ikl29rygr1habcsglz07m4ihd4ivi732kkzg8q676ihf367wa9i" + "commit": "b7d08b87f6a116ff47b33ee857926b60c66c3ab7", + "sha256": "0n7v6hx21f8x37gj388wnff38aqpzxxv5g8vxavp74vr3cbagsnn" } }, { @@ -12529,26 +12688,26 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20210927, - 2245 + 20220216, + 1906 ], "deps": [ "emacsql-sqlite" ], - "commit": "15f906c393db1a0fb6577afc3cf59466531eafef", - "sha256": "1xa9rzyfm6bfskm2mfckd7jwmjwcraky7vsp7yyrnrqfksrl5na8" + "commit": "1ba85ce9f7094aeddce25044689278eda6739531", + "sha256": "1s9riibws28xjn2bjn9qz3m2gvcmrn18b7g5y6am4sy7rgkx3nwx" }, "stable": { "version": [ 1, 2, - 0 + 1 ], "deps": [ "emacsql-sqlite" ], - "commit": "15f906c393db1a0fb6577afc3cf59466531eafef", - "sha256": "1xa9rzyfm6bfskm2mfckd7jwmjwcraky7vsp7yyrnrqfksrl5na8" + "commit": "1ba85ce9f7094aeddce25044689278eda6739531", + "sha256": "1s9riibws28xjn2bjn9qz3m2gvcmrn18b7g5y6am4sy7rgkx3nwx" } }, { @@ -12574,11 +12733,11 @@ "repo": "vallyscode/cloud-theme", "unstable": { "version": [ - 20211229, - 2131 + 20220205, + 1336 ], - "commit": "72f1f430c94b93701851567853097b2df7cdd19a", - "sha256": "14jqq522hdy2zy3iqh3r5ql5wgc5jh7mlz9m7h8pgcrwh9h7zjk2" + "commit": "16372ea1f527917102ac302afaec3ef09e289d24", + "sha256": "0wyrc532iqviq1r8pa3qnz10bd66qnvac3qcgcwvjhd5h772y0dh" } }, { @@ -12709,20 +12868,22 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20210104, - 1831 + 20220322, + 1258 ], - "commit": "410dd6cf611f31ebca74e1db4dc439e6fcaf34b4", - "sha256": "1qfpps3mw4gbi59kia89s0hn8snwsfx5vxbw548a2mncm1lmsml9" + "commit": "843d1d198d15f65781d71118573461fb03a3101c", + "sha256": "000ls9briydjr5akwm7zcia3ir9l9i7xwgn06qp3wl5j9wgasbh2" }, "stable": { "version": [ 3, - 22, - 1 + 23, + 0, + -1, + 5 ], - "commit": "aa6a33fe54918967f6ffcad30773e01664e8a2b2", - "sha256": "1b5afd4ryqmkdkwpr1xb6g31d8xlkbjg9ql191rvnp5rsmb9a75w" + "commit": "18b02cc127730e3b007c2b56c6e115d476f0d5e0", + "sha256": "0qglzmmy4kyylz5fxg25mhwg01d5x5dpblh4zm3vyvmydbrdik7r" } }, { @@ -12874,11 +13035,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20211014, - 738 + 20220305, + 1320 ], - "commit": "f5150fc213da470da2d4fedaa4b86f476167b235", - "sha256": "1p8a4ga6pysqd41frzzpi0a5bv1a0qmn136srfqqkkg60y5rlnl0" + "commit": "8660bdeedee360e5eb632f1eb1356eb09d7dfbee", + "sha256": "0mvfsdlhc3znc0d2p8vm7apkbpvbs688wmwvd0sms33qly53f546" } }, { @@ -12907,8 +13068,8 @@ "repo": "wandersoncferreira/code-review", "unstable": { "version": [ - 20220107, - 1355 + 20220318, + 1429 ], "deps": [ "a", @@ -12921,8 +13082,8 @@ "markdown-mode", "uuidgen" ], - "commit": "ccc3795a72554439f230969322c0e3239252c193", - "sha256": "17vn75v7hh5mj27g28m62xinv50f2h00kjyk84gk72j7ivymlcc9" + "commit": "6a10610826990e62c99486e30c0b3ef5869559e3", + "sha256": "0zajjm560vyjryr9yclda0j6f13w44mqzh1rz7kqxfl5sp6sv53m" }, "stable": { "version": [ @@ -13122,14 +13283,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20210607, - 1842 + 20220318, + 1558 ], "deps": [ "dash" ], - "commit": "fa42b60f9e84995a8109a49798c0b4c618fc1ed3", - "sha256": "12ybgh8yzi62lw0c7yakgvfdx45sr11szyqdlf58n2pbkz9sxkmv" + "commit": "05dfc97b004f1a962313710d81cffae3b2f9c98a", + "sha256": "161mn6b14kbpf4lyqw9ijxqir8qxbz9rr7ydx03z6shjfp7ciz54" }, "stable": { "version": [ @@ -13374,8 +13535,8 @@ "deps": [ "s" ], - "commit": "d4715c27815e41db8b489c860a470215b6098d02", - "sha256": "151cbiizw57l1n4c1bcdzx5rxg86wiqm7qmd8gn8l42prmh7iwm0" + "commit": "d4958edf2a4a8cbe55097320e191045d496847d8", + "sha256": "1yi1ha4iyfb0362x7wk65lksh6377mga0xyva65s035i75r4k05n" }, "stable": { "version": [ @@ -13703,17 +13864,17 @@ }, { "ename": "company", - "commit": "f42849df31122aa293edcbcbed834260d21037b2", - "sha256": "0fci8v7grd2c6vfky0fdsrxi0874jfkw52zba4ap43bbx1mb2166", + "commit": "7eadfd36ae9b7bd241c38d09a7203873538983fb", + "sha256": "1wxadzsf7vrnxj7zhnwrz0vva9zgr99s0lb677dllrj1zdryixwx", "fetcher": "github", "repo": "company-mode/company-mode", "unstable": { "version": [ - 20220110, - 2248 + 20220326, + 48 ], - "commit": "c25f1fbc3850e36e6521b77fa1641d5583365d8b", - "sha256": "1ski2dv8ndlrpad08xg1bz9fxy8lj3c27z8i0vlc96x40nc788bh" + "commit": "783287526a791590bea4f9a23992c2bfebdb4c8d", + "sha256": "1cxr4dc0yfnccjk3l3sc15ys0pzff0r133msq59nzk6r48ba9p0q" }, "stable": { "version": [ @@ -13953,8 +14114,8 @@ "repo": "cpitclaudel/company-coq", "unstable": { "version": [ - 20210708, - 2357 + 20220314, + 526 ], "deps": [ "cl-lib", @@ -13963,8 +14124,8 @@ "dash", "yasnippet" ], - "commit": "382db93374380e5db56f02934ee32bbe39159019", - "sha256": "1vlbw54a02qy77ad2qgd6sy7y3b6x1y1nm3bjxcd7f67hnncjg0p" + "commit": "a6e349e0131f676a885bd14c908fd26054b2df42", + "sha256": "1qws0a0ia039d6bv2sbjsdl1ry28y9jrv98qnp5jcm7jfb2jmvsp" }, "stable": { "version": [ @@ -14167,8 +14328,8 @@ "emojify", "ht" ], - "commit": "32cd04a1c2f692e6ece07cc3d3a7627240edaa8e", - "sha256": "0fb5zyp3cgv7iyjbxxm7bjqq0pmhlv212wnylldqwij647w22iia" + "commit": "34f33e4bd1fc11da306c1d159def96cd92e4c00f", + "sha256": "0v6j7xjl5gs513gydxj2hn5f17p6y6fqbf8ik8v5ac5lifhwcn6q" }, "stable": { "version": [ @@ -14263,21 +14424,21 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20211104, - 1200 + 20220325, + 1206 ], "deps": [ "company", "ht", "s" ], - "commit": "ca52f1bf0a2ad927d629274f648726769ce770de", - "sha256": "0wfryqkvj9xcka2j22mzxjr8cb9f2llyqkxjz9l2zvpijqfp1n49" + "commit": "4fd30469d50a5d49e035a02a29c6acf5fb72a494", + "sha256": "1qqdma87jvmybd0af5ls86v2k62586ijqkymg99w6dxvlsd8wj6w" }, "stable": { "version": [ 1, - 3, + 4, 0 ], "deps": [ @@ -14285,8 +14446,8 @@ "ht", "s" ], - "commit": "7067175ebf56c5110edf1475b03e2e242a00e66b", - "sha256": "1sfzj5qbpc1j1blg6rq5lmimgy1yfwyg7ixgp7psf53nq0cbq9jd" + "commit": "3aeb0bdcc15e969964b73e695aca8e0df60e3a1a", + "sha256": "1yfl1c92i0xn6imgvvj6h5zpadqp96akm69cmccxs7khfall5lmj" } }, { @@ -14502,8 +14663,8 @@ "lean-mode", "s" ], - "commit": "a4205749d20a09871f0951c34f919d4ee5fbdb55", - "sha256": "0jqfnwjwn5payjj1lfl1zvw8gpcdlc6k3lqbw6iwpzlyal7y0nyb" + "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df", + "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p" } }, { @@ -14677,27 +14838,27 @@ "company", "native-complete" ], - "commit": "20e1dceb459856c8c4f903e6d8562991069bb8c1", - "sha256": "11m3y6kbjm0nqmdqbcv4xrchcabh4x1w4gy1p8gp36k600s1h7zj" + "commit": "5f94022fc9168971c77f8c12f9efd569c45f4850", + "sha256": "0lfqvm71lxxga06pjzcdydjpgd3548rql7bsjdvbknkwx2p54w4g" } }, { "ename": "company-nginx", - "commit": "fb8843cddfa9133ea9e2790e8a1d8051cd4dabea", - "sha256": "15pxz0v3zpshwri0v15yh995k7ih9h46y81n4xywlyyh34wys3sj", - "fetcher": "github", - "repo": "stardiviner/company-nginx", + "commit": "8c91310797748b45a5f08c26f70f0715ba6dec50", + "sha256": "08ngwig4fb2qkmlrh36hx990jwafndaprv3wgqmd1lyizzi94ig1", + "fetcher": "git", + "url": "https://repo.or.cz/company-nginx.git", "unstable": { "version": [ - 20201020, - 2038 + 20220210, + 1411 ], "deps": [ "cl-lib", "company" ], - "commit": "82bdb730ad5971c594d9c99c069f3c7bb067897d", - "sha256": "0qrlqir7fa2zf97yfsg8phj5dqgjz2rzn5zspfk9qlys3j8i483d" + "commit": "8a9f1a5653fe2d9a5042bfb9377d54f37fcc64c8", + "sha256": "0ylblgf34zpmdmwmd1vp8z59p024f176a1m75kwj96in65y6b6b9" } }, { @@ -14801,8 +14962,8 @@ "cl-lib", "company" ], - "commit": "92d559309d0c7614e2ccc982002b7ff963f3c9dd", - "sha256": "0aidj0hz97qw8jpwcbdmhjqk8wsdls3jiq9j6bbrqh458j6p317h" + "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce", + "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc" }, "stable": { "version": [ @@ -14834,8 +14995,8 @@ "company", "phpactor" ], - "commit": "272217fbb6b7e7f70615fc518d77c6d75f33a44f", - "sha256": "0hm96i9vdbkcq6mypjpl94dn3gzyk23iql5zzy2d221vmjhqvn7d" + "commit": "34195f1533209e2ffd0f898a69c7db2bffd1eabe", + "sha256": "1xp4v5dm2x31xp5rq80jii2y8nprqd3jcmzpc0dp9xk3fq9hbq7l" }, "stable": { "version": [ @@ -14974,8 +15135,8 @@ "company", "prescient" ], - "commit": "3dbcef387502d309d130a518a18d48cd2f0e15b7", - "sha256": "024l7s0b6apbzanw3cnhjypxnxfinfb5b3nhaabrc138m5pis8j5" + "commit": "c5295a9eecbd2935bb57684a4422638e03bf738c", + "sha256": "1wfmynbqaqvrkjdncx0wmqxz6v8zlfmqlh5l3h6876jin97i5fbv" }, "stable": { "version": [ @@ -15056,8 +15217,8 @@ "company-quickhelp", "popup" ], - "commit": "d56b17f234232e739838891b958877511cfe73f1", - "sha256": "05sp0z6gsvfp0phkdhzpnh8q3r4rkrqlhlqxvlsdnyaw78872hlh" + "commit": "fe68967d901ec284022fd67d296866795476e60d", + "sha256": "1586vwl280z463h9yb5ijjhwi3dmizcmwxy54rh2pd8yljgxsjlm" }, "stable": { "version": [ @@ -15229,8 +15390,8 @@ "company", "solidity-mode" ], - "commit": "f0f68b038c5edf16c85fc8ca58537e1c6479738b", - "sha256": "0hfp07bg348ppkgp5wca1sqpcprhc6jyxkpb1pmsm0vrifb3261l" + "commit": "20fb77e089e10187b37ae1a94153017b82ed2a0a", + "sha256": "0lyfhb4lirk08jc73c2vhlskfb496vnh0h906a74wz2pwg84q4m5" }, "stable": { "version": [ @@ -15752,8 +15913,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20211123, - 357 + 20220315, + 1533 ], "deps": [ "dash", @@ -15761,8 +15922,8 @@ "pythonic", "s" ], - "commit": "7a34e06931515d46f9e22154762e06e66cfbc81c", - "sha256": "0n1w3gx7xv84nc5hz8w1ab2ml45g64jx05cwrflf5kqmx496phms" + "commit": "9c28d7a853b4b4bd00215cf7f07856c1563f2ad7", + "sha256": "03r9f2pvxxv6nlxgljnd5cmnlvsykypdl38cfi79iw3spr0lcrxn" }, "stable": { "version": [ @@ -15916,19 +16077,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20220115, - 1548 + 20220319, + 2221 ], - "commit": "a899e183d3f85741e6bf92a55a57afe9b9a4c7ae", - "sha256": "1rd4gfzn43g8gzv3v9fl7jbyj8wdn3nkz5l35qlqr0iyz5cd5bzz" + "commit": "47c4f405efdf4692c6b7e1dd2098573db9aeae6c", + "sha256": "1nph35a4q2a4sbsmh9hcxvwcr4pfshnmrc8ahk4qn825a7iny70w" }, "stable": { "version": [ 0, - 14 + 16 ], - "commit": "f9170bb75f9b4362b42cebee9cd8643b04093342", - "sha256": "051fjp03lj3b5kkzpdhk78g2lj37v973q0f012zld1n6937srj6h" + "commit": "800824601b610016066991d6e2dde198d4b0ad8f", + "sha256": "1mravx5aapy8bcgk6nvi1jvb5jgl7jsn7pd7br7v7fqadcp225m6" } }, { @@ -15967,6 +16128,18 @@ ], "commit": "08f543ae6acbfc1ffe579ba1d00a5414012d5c0b", "sha256": "1cff4ssrn1mw2s5n090pdmwdirnfih8idg5f0ll2bi2djc4hq5kn" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "consult", + "project" + ], + "commit": "08f543ae6acbfc1ffe579ba1d00a5414012d5c0b", + "sha256": "1cff4ssrn1mw2s5n090pdmwdirnfih8idg5f0ll2bi2djc4hq5kn" } }, { @@ -16032,6 +16205,24 @@ "sha256": "15lihfdjdp5ynmq0g8wkq8dhb2jdlvfcqbb2ap588igi5vax3glz" } }, + { + "ename": "consult-flyspell", + "commit": "1750efda60a7c884f89ef22ed00d89a41d245272", + "sha256": "0n1kby3hs1cn48z5qsc9dh1897rpd0paji8cyx7pssncaz8mzhfy", + "fetcher": "gitlab", + "repo": "OlMon/consult-flyspell", + "unstable": { + "version": [ + 20220227, + 2210 + ], + "deps": [ + "consult" + ], + "commit": "2e7b99dec6c51259d0bffbae3e863f4054dd2346", + "sha256": "1cj3ahxdihi4v4x5qsn1lgacl7dzswy79qli23zrkxaw78x8is0i" + } + }, { "ename": "consult-ghq", "commit": "513921c684fbab5ff57e47c509a89b15d7d3a5ce", @@ -16072,16 +16263,16 @@ "repo": "gagbo/consult-lsp", "unstable": { "version": [ - 20220109, - 937 + 20220320, + 1125 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "f4f195046b97be5ce0406e0723921b3393d9442e", - "sha256": "094i7g10m8702sxvgis46wnx492fq2kfv641a7255qs51l3y2r49" + "commit": "0dfc9d55876d4cf7c32f8a663fe6343927f78052", + "sha256": "15w586gp8x4d52wlf4b6lcmgsidav8slqr97yrj1jfhyri2sryx9" }, "stable": { "version": [ @@ -16105,27 +16296,57 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20211229, - 420 + 20220302, + 229 ], "deps": [ "consult", "notmuch" ], - "commit": "0b7fae73f51bc855078dca9593c8c7f67fe2ed98", - "sha256": "0kiwc7qbhkmaj5hlarxsv3gy3gikykvxklgqkq8f68jjfgb0hdag" + "commit": "883527072b56bb09dd921800bca13860caaa4ffe", + "sha256": "0xzpkpf2sb89qkbqcrwddp4pgnzdjp40bc5da22jq9r4pf67y7qs" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "consult", "notmuch" ], - "commit": "a5509cfd0c9f69327ab63fd18e548b7f39be16c8", - "sha256": "07qbm5p4cfrrwyp8a5sw0wkdhnqbappz4xjlnjil2krhj9g39q78" + "commit": "883527072b56bb09dd921800bca13860caaa4ffe", + "sha256": "0xzpkpf2sb89qkbqcrwddp4pgnzdjp40bc5da22jq9r4pf67y7qs" + } + }, + { + "ename": "consult-project-extra", + "commit": "c7df62c7b77134617aa018025736a37760fad471", + "sha256": "0s77hk2iq0q77cdw1j805a5w74hrcj6fvpwk1y9yy0bp0w4gcr4m", + "fetcher": "github", + "repo": "Qkessler/consult-project-extra", + "unstable": { + "version": [ + 20220228, + 843 + ], + "deps": [ + "consult", + "project" + ], + "commit": "897f2f71a94ce1b72c3bf823e14791a332befbb7", + "sha256": "1c0nllj6hhgvjf7zzy44iacnl29flg54ahb26r4bi9lip8aw65xs" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "consult" + ], + "commit": "fee931a63317bcc183c34a84b758db561db3f2dd", + "sha256": "1ybgwf56ydfgww1yhbxpipknvi01h2svpjh05b8x825qmplslidp" } }, { @@ -16136,15 +16357,15 @@ "repo": "OlMon/consult-projectile", "unstable": { "version": [ - 20211018, - 1718 + 20220310, + 1840 ], "deps": [ "consult", "projectile" ], - "commit": "655b328ce3fe51a8ff89d7b0a839bc8dfe9e51c0", - "sha256": "1gy6vg5vrd9i0y2sck20fbqrdz0bgcr6647rvnl2nvpv3shzlsbj" + "commit": "df85d0f83c323f4672221c9e78d84027bcb9d96f", + "sha256": "178405z6vasr44p1rg1n1ar4vwbvp04n5fnyma1j327lp8lbppmi" } }, { @@ -16155,25 +16376,25 @@ "url": "https://codeberg.org/jao/consult-recoll.git", "unstable": { "version": [ - 20211113, - 1958 + 20220227, + 2050 ], "deps": [ "consult" ], - "commit": "42dea1d40fedf7894e2515b4566a783b7b85486a", - "sha256": "0nzch4x58vgvmcjr6p622lkzms2gvjfdgpvi6bbj5qdzkln5q23a" + "commit": "228306eeda8c57db45609ca068f60ee433367c17", + "sha256": "0rxfxws0d65sdjph91g77a2sy1k90y9hgyps4da0a6kvbm3zprgg" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "consult" ], - "commit": "1b21fa157ba40fcfeecd0a10c5c82ecfb87aee53", - "sha256": "0bfvxzvyppkqfdj4cm5haqgkd72wrh5l7x8ldnpycapqyjpv9pip" + "commit": "228306eeda8c57db45609ca068f60ee433367c17", + "sha256": "0rxfxws0d65sdjph91g77a2sy1k90y9hgyps4da0a6kvbm3zprgg" } }, { @@ -16191,8 +16412,8 @@ "consult", "espotify" ], - "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293", - "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5" + "commit": "ea6d6021e5acc550560325db2f09198839ee702f", + "sha256": "1jlm7mka1ilaw8z1a91vy8k1hz27g4iyk33fpmiab7856j8ry32b" } }, { @@ -16479,6 +16700,24 @@ "sha256": "1rq0j6ds9snv21k2lzyja96qxxz8nrai5aj1k1si9zshld28mapx" } }, + { + "ename": "corfu-doc", + "commit": "78440eba5512b37243de24364afd5d7f46f8fcca", + "sha256": "0vi12khc9c9gcz8lagw75zkx377f7f6qdlgjr6rg37nd3ip4pkj0", + "fetcher": "github", + "repo": "galeo/corfu-doc", + "unstable": { + "version": [ + 20220318, + 1052 + ], + "deps": [ + "corfu" + ], + "commit": "95fdae5755e6c88cf77b409b555290c36961ec6c", + "sha256": "09lmvb88nj7ivsr6gh93xhbfav80pm69z3dgnifnn1g2gfjnjjka" + } + }, { "ename": "corral", "commit": "7b0d7e326f0401de0488b77d39af7bd7b8e8fdd4", @@ -16608,14 +16847,14 @@ "repo": "ideasman42/emacs-counsel-at-point", "unstable": { "version": [ - 20220113, - 455 + 20220211, + 548 ], "deps": [ "counsel" ], - "commit": "257f9457f60384eeaf29c1f458852b648eaf366c", - "sha256": "0llghbv6zqy9nl3iivk6pd2mmxw3xhlz6dkgn9j9srrabddzkfxk" + "commit": "28b26ecac676d6a3942f1b96d2916f4c23d9b3ab", + "sha256": "0dmr5aa74kziwmf8w1jr38lb23yir0mff2wjiidgpxm452pwwrqy" } }, { @@ -16795,14 +17034,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20211210, - 1127 + 20220213, + 1104 ], "deps": [ "counsel" ], - "commit": "bafd22a20c3328b0cf81aa9c35bfa37a095cf9c3", - "sha256": "1p651ykxbakzhwlrxcz4v62kj4f78l83f67qcghi58sq9cvwg1gi" + "commit": "80b5816c1fab8c0621601f7fbe7ba65b2c67e9cd", + "sha256": "10bprk9ixbsyfzrl7b23gc6wgwwyg4ksyw9w28071r2hpz2dssv7" }, "stable": { "version": [ @@ -16986,8 +17225,8 @@ "dash", "ivy" ], - "commit": "6ba0f2ac7e4e5b8c1baec90296d9f24407d8d632", - "sha256": "1kp83cql4gn9g3d8g5mw3mrmpfj407kzpsi5wmwl1jr1pmw3v3jc" + "commit": "0f790def6ac2b5a84d01eed47a7ee53619a8f5b9", + "sha256": "1p15g5bc1pgibvqv6akp4dmqzysws26dhpnxgswmclrq0hy0qwjx" } }, { @@ -17023,8 +17262,8 @@ "counsel", "projectile" ], - "commit": "e30150792a96968f55f34638cbfe63eaa30839cc", - "sha256": "1vp39r5njfzchkqv9g0w77whazp070anh9gmbkp3z4n3xxbik27f" + "commit": "40d1e1d4bb70acb00fddd6f4df9778bf2c52734b", + "sha256": "1qgm0c9s6lwwjqm137sicy9pl045rik24gy6g1imizr2s9r2b57c" }, "stable": { "version": [ @@ -17273,8 +17512,8 @@ 20210510, 1540 ], - "commit": "d8a72a311c6875f1aef6a30b3d23a1b02df75941", - "sha256": "0sczdlhpqs0pgka426ngvvcf01c6lvgk2aykajc5b2zgxywkfg40" + "commit": "683c23afa2a37272be54de822ad19f4e11dd86ba", + "sha256": "08sffa51f4p2la199hf6zb2r2hyvrpdcd2q6q4sig3gmyk75qlbm" } }, { @@ -18019,11 +18258,11 @@ "repo": "raxod502/ctrlf", "unstable": { "version": [ - 20211228, - 415 + 20220130, + 2307 ], - "commit": "282eaa836d2198bb5947dfd3c454ae5305f55efb", - "sha256": "04w708g7d1pnsc18h8fjyqkhk08jkq853alaidriamxyycvdwk0i" + "commit": "56021fd53efd775d91db2730e4ab4d5c157c513f", + "sha256": "093ximdpb9bzrnayc47is6i6jya8s5jkq7f8njnqd07hh5bm3l20" }, "stable": { "version": [ @@ -18383,6 +18622,24 @@ "sha256": "1d5i8sm1xrsp4v4myidfyb40hm3wp7hgva7dizg9gbb7prmn1p5w" } }, + { + "ename": "cycle-at-point", + "commit": "033260c71bef524da774f7b51e744b919f1a7145", + "sha256": "1h8ar6dhfk2irbk90hnbxp1l5lmb48rr6r7yj24c9yc8manxyxjn", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-cycle-at-point", + "unstable": { + "version": [ + 20220220, + 431 + ], + "deps": [ + "recomplete" + ], + "commit": "ea22b90f35f4cef73387047b3ef3fad83787d4e2", + "sha256": "100aziv6wwrkalx07sy8za6kvnj30pknj1shbymspw13bpp7wqxj" + } + }, { "ename": "cycle-resize", "commit": "8806af6662c8250c7533f643fe1c277ff0466651", @@ -18466,17 +18723,17 @@ 20211111, 1407 ], - "commit": "a448db45c9f638c384f869ec726ca8bc6e85a1ec", - "sha256": "0czdnpmzxq07rdqb5227y6p24ssh1vr7j6whi79mf46dnzd1p7zd" + "commit": "d85cbf676dd7bec80fbfc23d038575a21859ac87", + "sha256": "16ix9zxwmr0m8c6p61dddwmgs95jv942pr9alz9az7dw71d0flac" }, "stable": { "version": [ 0, 29, - 26 + 28 ], - "commit": "3028e8c7ac296bc848d996e397c3354b3dbbd431", - "sha256": "175k9f5dzrpg1xqc941n0xa1frxq8vnqlw6ccx59xf9p43ws9rc1" + "commit": "27b6709241461f620fb25756ef9f1192cc4f589a", + "sha256": "0k5wnrvnwq699mvvngraq5d93pyyiz77sn9dcqjrazc74b63sm8w" } }, { @@ -18618,11 +18875,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20211019, - 1630 + 20220316, + 1101 ], - "commit": "e74c5960eae3db90bf1b3ea7e71a2406c27554a8", - "sha256": "1vpfhiqwhdfa0w4akh6wfam88qkjy73i8yryfaz8a5qbm60nd43h" + "commit": "054c0b9bc9cefb53a4065096e66707d20885c461", + "sha256": "1bw9ng01d0y6ri67w42z8ql37kxxra59v4cnra94s00abc212lja" } }, { @@ -18674,8 +18931,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20211117, - 1555 + 20220325, + 1144 ], "deps": [ "bui", @@ -18687,8 +18944,8 @@ "posframe", "s" ], - "commit": "76cad34de8984f57c2b1e374e9c985cc7ec8dad0", - "sha256": "0q37nnxvb362pni0nralb6cpw7vvaj0kw63y8zpip8szwj9yqrki" + "commit": "f918c0580bd17105cbe50aa701a2375abca5a6ab", + "sha256": "12wnvj6bnz9xx9skzqjmldn9ak0pxm46b2g7ishj7q810fg5hzws" }, "stable": { "version": [ @@ -19038,11 +19295,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20220117, - 1613 + 20220326, + 725 ], - "commit": "c51d94778fd5806ff1b37339f97ec94cfd9d390a", - "sha256": "0cl9cnsw1gp6w1kv6bf719ykczzf41ck4vzzr3lpixn0jkv1q9cz" + "commit": "1d3fce6e8e8605f770f2b23184b055029128c477", + "sha256": "0kylaqz16xmc22xainarnwn31rlanw3ycapdxga0hgyg972p1z45" }, "stable": { "version": [ @@ -19084,14 +19341,14 @@ "repo": "emacs-dashboard/dashboard-ls", "unstable": { "version": [ - 20220117, - 1607 + 20220326, + 628 ], "deps": [ "dashboard" ], - "commit": "cde30ac64006f79be71c9e59eda2218d725e2bee", - "sha256": "0272j1wr7399zfpl0vdk397dmi1ll3bqrv5h6rrbwg8vvmfk01vj" + "commit": "73d280e029dfb68c2666dbc20130300439b170b7", + "sha256": "1rsv008hfk8v8wkhfqhhpyf5k7hhhh0aisa36ram6a3y5gwj0ac5" }, "stable": { "version": [ @@ -19371,15 +19628,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20210522, - 348 + 20220305, + 522 ], "deps": [ "ccc", "cdb" ], - "commit": "251df5b02c91311140d2375b019c1de836655fd0", - "sha256": "14cxh58rfc2dprb9grshfhwg0fggw469yk8l9dwhc4sy8bf9cd4v" + "commit": "5c209e0306364118abf9d9440d7b8b9613183072", + "sha256": "1p7mwlnhsblr9ilns4vbadlbr1bz7w81das54znw6cnv4yjjzdan" } }, { @@ -19421,16 +19678,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20211228, - 1756 + 20220209, + 719 ], "deps": [ "dash", "s", "spinner" ], - "commit": "aebaf72e35546fd235b4861399791814e4e4c7d8", - "sha256": "1qd60winrrpxmrjsx77i24921p6dad9halz5l5s6biwa421zcgr3" + "commit": "0a3ba239c458ffc4f63a180b43d0e70b81742a3e", + "sha256": "0xavp98da1hr0jsq5dr2h4rfs5y1qgnv3b3pnpc08rfj1h4x211b" }, "stable": { "version": [ @@ -19522,11 +19779,11 @@ "repo": "lifelike/decide-mode", "unstable": { "version": [ - 20211127, - 2248 + 20220319, + 1927 ], - "commit": "668fa559b95b50f140e73f26a21fad559c1ffa77", - "sha256": "1wbiy8lda6p888qf4ak8j02cp42h25y17xnz5bq5p032xgq731n0" + "commit": "b4feee9d5ad32c7b73ab3e1da5cfcdab532754c2", + "sha256": "0xwflq1k4x2br5dw8fhqbz6zq4hbwvknrnzd2c2b1l68l4y7rs3j" }, "stable": { "version": [ @@ -19564,11 +19821,11 @@ "repo": "sanel/declutter", "unstable": { "version": [ - 20210904, - 2039 + 20220310, + 2101 ], - "commit": "e08195e2f5691ad0ec9090d7edf550608e13fcfa", - "sha256": "1hjdjd0nmknv8yppda89hsgkyvk52zcwz92cdxsng87rlp9hwddv" + "commit": "8ac50a64dc3a12440d98bc1556b5c7727fdf51ed", + "sha256": "0kmkb5gfldim2nqkb4mnjllp1nvkr7c3j1zk84crfyxy45ln7lv4" }, "stable": { "version": [ @@ -19627,11 +19884,11 @@ "repo": "ideasman42/emacs-default-font-presets", "unstable": { "version": [ - 20220104, - 215 + 20220214, + 2326 ], - "commit": "6b6fe704ea233c65e50263dc0ff584409065e42f", - "sha256": "0ly7k6rkvhw1pwgmmn4cpgbizw2f2ry1swlaq0zf2k6ln7pyl96z" + "commit": "1727055b59e21e91a5b72356968232e31a92f743", + "sha256": "098s8s9j8gvzkkyx6ivd84bi0dmf2p6a3nlz215ljl43l97134pw" } }, { @@ -19700,8 +19957,8 @@ "s", "wiki-summary" ], - "commit": "e19fcc96c94a161289f97a64275c016920587a53", - "sha256": "10c140n5g18v3rq14dzq9n2c3xa5ibzz2zkyiawkjfl664802170" + "commit": "ba801ce1851a83bad2b962c47aef1f86f56286dd", + "sha256": "0psf7cnps4qkxz48cqvkgqcqyll825d5zdlw297v670rjjxbpclm" }, "stable": { "version": [ @@ -19845,6 +20102,30 @@ "sha256": "0qkkrjb4yai5qd6hdabkwsgh696dazahswsk674jqwn39c3b2d4c" } }, + { + "ename": "demap", + "commit": "3cede53ed6d8133241ea0a1949f4ba5ed51805c2", + "sha256": "1syza8lkph1p7wp40pcb46pziqbq7nw0jjh6563rcicngqyzhngc", + "fetcher": "gitlab", + "repo": "sawyerjgardner/demap.el", + "unstable": { + "version": [ + 20220322, + 2309 + ], + "commit": "c42ec4752544f80ca7c172ff65e705a56089bc96", + "sha256": "0nh0g7a6svwwp3hinc8c3x3ln76z8hgzddc4lx4z0dzzj6bwakz7" + }, + "stable": { + "version": [ + 1, + 4, + 0 + ], + "commit": "c42ec4752544f80ca7c172ff65e705a56089bc96", + "sha256": "0nh0g7a6svwwp3hinc8c3x3ln76z8hgzddc4lx4z0dzzj6bwakz7" + } + }, { "ename": "demo-it", "commit": "1dec5877db00c29d81d76be0ee2504399bad9cc4", @@ -20063,11 +20344,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20220107, - 1051 + 20220326, + 943 ], - "commit": "8abcac28030c0f770b214823b4a1a5024f121b30", - "sha256": "1717y9fkvppbd1cyf9bhr32cjy0n1zd0vrjs1ynal40ymrv9jnpp" + "commit": "be6cdf690a49d5bb39da7ea29c10cec660f7c60a", + "sha256": "0wq220bv7k2aqqsfc83akg6ygrwshn5haaqibpzgr05n8w4264v6" } }, { @@ -20144,10 +20425,10 @@ }, { "ename": "diary-manager", - "commit": "a014f4d862a2480f7edb1266f79ce0801cca13c2", - "sha256": "1sk0pvadx4jmv93dj796ysn3jh2wvywayd7dd20v22kdvnlii73d", + "commit": "0a4be0096baf0b451541376318d6fd7a50798c9d", + "sha256": "0i4mbp06g2zpiwq3x00np9yr81klbbvr28p7l4fsmg7dmmbd6kap", "fetcher": "github", - "repo": "raxod502/diary-manager", + "repo": "radian-software/diary-manager", "unstable": { "version": [ 20210404, @@ -20193,15 +20474,15 @@ "repo": "martenlienen/dictcc.el", "unstable": { "version": [ - 20211007, - 1016 + 20220219, + 1302 ], "deps": [ "cl-lib", "ivy" ], - "commit": "235841b19567b9c2e17727901ca041a22c096512", - "sha256": "0lsqf199gxsgdldmizf7frn8ngbn3fjj81lc8lx30l3ib7d40493" + "commit": "8ecb954fcf193cba138191f8947c8b0b60a1c6c5", + "sha256": "1alpycrazpk2lgsgmqspxjcpirsppn8zcwa4znsh7rxb2v3y1ih6" }, "stable": { "version": [ @@ -20272,6 +20553,21 @@ "sha256": "0a89bp9vz8lzg5klhmzpfmc0mhqmx667ivr86ckkjhiwr2mmzq0s" } }, + { + "ename": "diff-ansi", + "commit": "6bbfb72c3db4f774ffab9cf273b26e23fb027ee8", + "sha256": "0k25pfxm0w7i84z1qfzd87l75hv43m89ajaq7bl2ppq2h1fwf880", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-diff-ansi", + "unstable": { + "version": [ + 20220323, + 106 + ], + "commit": "39b39a7265c59e413ff32f1fccebe4dc1a7a966e", + "sha256": "1kw2fvkfydyc8fbwqf4r88qgzrl85qzypjwzklkpwsawdpp6vzs2" + } + }, { "ename": "diff-at-point", "commit": "d342698c94e145ecfebf204c1099dbe765b39c71", @@ -20280,11 +20576,11 @@ "repo": "ideasman42/emacs-diff-at-point", "unstable": { "version": [ - 20210921, - 603 + 20220211, + 548 ], - "commit": "63951d8236163d86d5261b35d6c9a3f3f280e876", - "sha256": "1l1smrb2xmnz4cyimyvhq9hl406w364gkvqsk32b1q4jcvqhmdz4" + "commit": "819da8d75762e1fb1a975d78c2b4666506048485", + "sha256": "1l3q7ks4ylr85ywyrg49hk0wvzlj97rznwmqsf74awgfcl1cy7nk" } }, { @@ -20295,14 +20591,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20211106, - 2353 + 20220124, + 323 ], "deps": [ "cl-lib" ], - "commit": "e628ba35b8fa6f9fe13dc2525bd82532dc9bd864", - "sha256": "1kpwivjr362iiwph8db6maxl1mbcd0xf8md61nbz73ndrbv9xkcv" + "commit": "4a08b02afec1fc6b1e84de46cc34f75f6c9c3bcc", + "sha256": "1c8v4c9cz9mcn70dws79yh1fd3nxkbb6mdrlqs5nwy7m3d2l567a" }, "stable": { "version": [ @@ -20403,11 +20699,11 @@ "repo": "mgalgs/diffview-mode", "unstable": { "version": [ - 20150929, - 511 + 20220322, + 2334 ], - "commit": "031b70913e755c5e55222680f80185032a7d1728", - "sha256": "0diw887x4q7kbgdvxbbnxdw51z33kqwxw3v9m45fczxbywyi4cxf" + "commit": "af2251a01f532efa819d236802cb3d942befe5a1", + "sha256": "1x4xgq964rxx6ngxclsvkil3g1rplrwd1dl3hy2613kacd1n5pjn" }, "stable": { "version": [ @@ -20616,8 +20912,8 @@ 20220104, 1539 ], - "commit": "fd486ef76e4c1d8211ae337a43b8bba106d4bca7", - "sha256": "1vlgn7swwfzy6yr880698h3qsmfcqprcb1jvffkzmbvhvf458szf" + "commit": "6b7e837b0cf0129e9d7d6abae48093cf599bb9e8", + "sha256": "0d944fmxnbcqpafcb419i6zv46lh78w9ailbxrzhxrb69ii3fnwh" }, "stable": { "version": [ @@ -20636,20 +20932,20 @@ "repo": "jcs-elpa/diminish-buffer", "unstable": { "version": [ - 20210715, - 1026 + 20220218, + 1541 ], - "commit": "5ea0f4da3b9ad863ce21503715fd62722e4cd6ec", - "sha256": "139dwggd97mbq1p5g1dqxaml6j0wbk2w0gcgy4wv8fb4xppzklkb" + "commit": "8f517bbb04411a125860ce4fb169bcea06b364e9", + "sha256": "0frffd2b7q22xdvk9li9vivd810sy6xkw001ajc0q7c70wxj0ksk" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], - "commit": "387858aaa23d5d1145c98dfa70bbd39bb8c3fa5f", - "sha256": "13a3jkc5yf1m2gqabvfxfzxgblyhyni9f2clqx9i0pvr9dvvb9r8" + "commit": "f5305840a5a09043f1d012cf50a55dc41317c080", + "sha256": "1129jgpfyh4b88rqjmsi2siyamqfrgmks5vqy0vvj9avsh2wkszc" } }, { @@ -21079,11 +21375,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20211205, - 712 + 20220317, + 1839 ], - "commit": "b4a5341e22efed3c1a261b9b5098d7c429d655d1", - "sha256": "1i0lc6sq87yyg1xzj2qqk3rld9j0mvbl7vhlpdpk75g7nlfi2w8w" + "commit": "72ebbe2b3d2e04dbfda636fa114d4f47835ce044", + "sha256": "0z53ymlbyan542mzsjkgab29czx2zk05qgady99kg40rik78599q" } }, { @@ -21306,15 +21602,15 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20210806, - 850 + 20220313, + 1533 ], "deps": [ "dash", "s" ], - "commit": "7940d9154d0a908693999b0e1ea351a6d365c93d", - "sha256": "0fhbpy9y89jm03hjqp317h0aj9iasbdan0h829rhjhga11x8rw2y" + "commit": "b327971d197e95e9b78e7ef92539bd4196a12797", + "sha256": "15bkjvrdyn1bpvj0lpxm370cl7phyypmpswc80qngx2axdqbr0a2" }, "stable": { "version": [ @@ -21337,14 +21633,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20210608, - 2340 + 20220317, + 1546 ], "deps": [ "dired-subtree" ], - "commit": "6be2dad2782e28dae2f50c0cbfd82042b2b6ba8d", - "sha256": "1lqnd64ga7g8dzzgfn2bw00y65hlvlgxnj3bk7j6qr5wzkz6qp52" + "commit": "aed7e44b5a4ef37fa7be6210ddfe73bb724bac6f", + "sha256": "1wc4lb7rpim4npjl7aszc1ddpsqf2an8v7j4dasxlvdq0n2zz6qn" }, "stable": { "version": [ @@ -21457,15 +21753,15 @@ "repo": "ShuguangSun/dired-view-data", "unstable": { "version": [ - 20210810, - 1533 + 20220129, + 339 ], "deps": [ "ess", "ess-view-data" ], - "commit": "75d5f961926392feb408049d416ed5c4c2213f07", - "sha256": "19ygbq9gibl0pj9663r77w3y00wpw7dpr1zh983w5nj57fa0im3p" + "commit": "96d4cb6569fd2be90a516dedd98263374bbc6ead", + "sha256": "1i1prpzp10irshv42lwv08lzwvm0r9amapbbki07qhmqd5q0av06" }, "stable": { "version": [ @@ -21682,11 +21978,20 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220120, - 504 + 20220325, + 1418 ], - "commit": "762db50fa84decf5ec2b87ea51f5c8b70680a0af", - "sha256": "06b32sgbnfadanarihgsffcqbbbz0ccrcf6v1p59a2kw432jx5kz" + "commit": "7d26d98df1a7af0266261e0e666a890a86a52bd0", + "sha256": "1yw1y5kdhs2213bvsmd65yhw3h2c7dzb70977bjd0pa083xddr0p" + }, + "stable": { + "version": [ + 1, + 2, + 0 + ], + "commit": "f03db6106adc61e050ea242dcfbd3fcae71dee23", + "sha256": "1aniq3lylc2fmw3snsjmbpzzgjspryjfq6vsc10daihnihnff0qg" } }, { @@ -21900,6 +22205,30 @@ "sha256": "0r560bpgw5p2pfcgkgcrlpp1bprv1f23dl4y5fjk06dg93fgaysa" } }, + { + "ename": "display-wttr", + "commit": "a60a6643b6d8a5691d48b47c31eb560e0f793d26", + "sha256": "1lhnv2cqff22z7d7n2sx7pqvskyg5fbiax2dhfznf2xjmqh22lzi", + "fetcher": "github", + "repo": "josegpt/display-wttr", + "unstable": { + "version": [ + 20220316, + 213 + ], + "commit": "2cb36df32b0ecf381185126a969b7282af5a0e01", + "sha256": "03lb0a9w9rgiqar93crh4h4q3m7d3yk9hn8y5h806h56lzrp54f2" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "commit": "2cb36df32b0ecf381185126a969b7282af5a0e01", + "sha256": "03lb0a9w9rgiqar93crh4h4q3m7d3yk9hn8y5h806h56lzrp54f2" + } + }, { "ename": "dispwatch", "commit": "580cee72ac9871f8f256069b371f7fb66367a048", @@ -21987,14 +22316,14 @@ "repo": "unhammer/dix", "unstable": { "version": [ - 20220105, - 1017 + 20220323, + 1046 ], "deps": [ "cl-lib" ], - "commit": "a2d924725380aca4d61df4a70825fc4b76185938", - "sha256": "1cg565l7iviis7888in7bf3v59b2a67jb552yshq6yb4d63v0b6f" + "commit": "5230c18456ab034f2fb69acdbef62c1abae6a8cf", + "sha256": "161ykw5p6wxy3dlx7f6zxg1cwl8hh411b7clzc5zhdpmq1wnqy0b" }, "stable": { "version": [ @@ -22024,8 +22353,8 @@ "dix", "evil" ], - "commit": "a2d924725380aca4d61df4a70825fc4b76185938", - "sha256": "1cg565l7iviis7888in7bf3v59b2a67jb552yshq6yb4d63v0b6f" + "commit": "5230c18456ab034f2fb69acdbef62c1abae6a8cf", + "sha256": "161ykw5p6wxy3dlx7f6zxg1cwl8hh411b7clzc5zhdpmq1wnqy0b" }, "stable": { "version": [ @@ -22064,20 +22393,20 @@ "repo": "muffinmad/emacs-django-commands", "unstable": { "version": [ - 20191107, - 1830 + 20220314, + 1545 ], - "commit": "bef7ca848d6d1721ebb22b181c50dcfbef16e434", - "sha256": "1zd98xkbxvikp4sf5nxf6vb2sk7a5s3q9ida0l5f4z4jc48xx5zm" + "commit": "7510c0f068bf214ad012c203d68e03ff4262efdf", + "sha256": "0d27cz3i78n5n4bhmkzr6yg2mz5hrpf0r25m71176d6v0ckq7pwh" }, "stable": { "version": [ 1, - 3, - 3 + 4, + 1 ], - "commit": "bef7ca848d6d1721ebb22b181c50dcfbef16e434", - "sha256": "1zd98xkbxvikp4sf5nxf6vb2sk7a5s3q9ida0l5f4z4jc48xx5zm" + "commit": "7510c0f068bf214ad012c203d68e03ff4262efdf", + "sha256": "0d27cz3i78n5n4bhmkzr6yg2mz5hrpf0r25m71176d6v0ckq7pwh" } }, { @@ -22313,11 +22642,11 @@ "repo": "ideasman42/emacs-doc-show-inline", "unstable": { "version": [ - 20220104, - 216 + 20220314, + 57 ], - "commit": "6bfea44e0b54c80255d34d15130940a09814e2a3", - "sha256": "0rkshqiy9msnsif9fxi484by76fl8zjyzijgxphqlv2h2bb3pbgd" + "commit": "42954390621f281930a70104162db1bb70532a1b", + "sha256": "0nvk10nh2mkw430zdr0m2cnqzvi48ah32k8zay4lh0qgz4jl2kdy" } }, { @@ -22365,10 +22694,11 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20211105, - 138 + 20220320, + 1935 ], "deps": [ + "aio", "dash", "docker-tramp", "json-mode", @@ -22376,16 +22706,17 @@ "tablist", "transient" ], - "commit": "8d64cf4f84d7da5f839a8248fdddfb635a63f803", - "sha256": "1ivyvgh24nadhiv9ffqxckwln8vc9c2l0bvrvrd53yf0w8i345yz" + "commit": "fbd896e3138f497b89a128d17b6f5e0e5286515b", + "sha256": "0d430ignd6yw117srysc8bxghlq0h8k533pl8k882q0mfgpnaqhw" }, "stable": { "version": [ + 2, 1, - 4, - 0 + 2 ], "deps": [ + "aio", "dash", "docker-tramp", "json-mode", @@ -22393,8 +22724,8 @@ "tablist", "transient" ], - "commit": "4fc69969b11687896b6c71b099de5d4c12c1c685", - "sha256": "0s57dq04d97dvrbxzicyk5z9f1mn8gf9w4nbgrxd9dnjqz335173" + "commit": "78881bea51c74ef171788fa989908cd51f5b3f8d", + "sha256": "0wgdabjkcwi9a3615imny8xysbrydnlcz9rmkavp22kypk6ydcjw" } }, { @@ -22481,25 +22812,26 @@ "repo": "emacs-pe/docker-tramp.el", "unstable": { "version": [ - 20210729, - 508 + 20220219, + 420 ], "deps": [ "cl-lib" ], - "commit": "7bfbb55417e7d2aac53adf92cb0e3fd329c495c1", - "sha256": "078hqc8rqw27v5li8dgmh9sspfrypha6h7hx4iagjwndb2llg2ix" + "commit": "930d7b46c180d8a13240a028c1b40af84f2a3219", + "sha256": "05966l3af9lg4nlsz6wrq282ipwxh19ggirfyabjrr1syw3v2crn" }, "stable": { "version": [ 0, + 1, 1 ], "deps": [ "cl-lib" ], - "commit": "d8b510365d8e65551f4f792f251e7212411708c3", - "sha256": "0lxvzmfg52fhxrhbvp92zwp7cv4i1rlxnkyyzgngj3sjm7y60yvg" + "commit": "930d7b46c180d8a13240a028c1b40af84f2a3219", + "sha256": "05966l3af9lg4nlsz6wrq282ipwxh19ggirfyabjrr1syw3v2crn" } }, { @@ -22510,19 +22842,19 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20211016, - 1545 + 20220220, + 1439 ], - "commit": "5db94549ce8b000ae35adf511c820ad228178052", - "sha256": "1qldv6zcayj8sqjdl16g9rwxa0dzyja2r5d6v7kch9559vif1nyb" + "commit": "b63a3d12b7dea0cb9efc7f78d7ad5672ceab2a3f", + "sha256": "0cnsm9xc5lqfx0vgv0fcqadwr8mnj3s9bqldrh1s6f26q9bapncd" }, "stable": { "version": [ 1, - 5 + 6 ], - "commit": "628315e2e4ab2f269548126444234caa057b2c75", - "sha256": "09pd8mfa45fy95mdg52fsafj3d1d5l52rskmw6q5np59dyzwch1b" + "commit": "11c43de04b128b7638cd98a1e80be2b661c18fbb", + "sha256": "0nmybfc9qch0jng06qgs2xb41dl9v52ckc9nc20d7hv3x36w555x" } }, { @@ -22533,8 +22865,8 @@ "repo": "r0man/docopt.el", "unstable": { "version": [ - 20201211, - 1008 + 20220319, + 1912 ], "deps": [ "dash", @@ -22543,14 +22875,14 @@ "s", "transient" ], - "commit": "2e49c2f4e9ee023d2a143086463bac47db914846", - "sha256": "0vkmgfgw8qica21hcqila62ivqxshkay2r2dyy4dxxj3xypk3083" + "commit": "a7f5b4a8b1a43552067ce27bce6080a509c92cff", + "sha256": "0dr0m5rrk0vhz1sq3d28pxijlkj030ckxc5mhqv3jpq2xfjwd2gv" }, "stable": { "version": [ 0, 1, - 1 + 2 ], "deps": [ "dash", @@ -22559,8 +22891,8 @@ "s", "transient" ], - "commit": "6e1105347decbf9b4b848d952858455f9b145c56", - "sha256": "0vkmgfgw8qica21hcqila62ivqxshkay2r2dyy4dxxj3xypk3083" + "commit": "a7f5b4a8b1a43552067ce27bce6080a509c92cff", + "sha256": "0dr0m5rrk0vhz1sq3d28pxijlkj030ckxc5mhqv3jpq2xfjwd2gv" } }, { @@ -22571,14 +22903,14 @@ "repo": "jcs-elpa/docstr", "unstable": { "version": [ - 20211004, - 722 + 20220214, + 1539 ], "deps": [ "s" ], - "commit": "b3f9e6c209c2c98de01211aa7a0a4cf6ee3cdf4f", - "sha256": "0ffnq0inxal39725amfv72yprynwx2hqrxhdb7pyx7x8z4zh8f4y" + "commit": "6267907a6b57c32b430b481fe129a6cae8792784", + "sha256": "1blgf4jw5crd4daidcnj5hv57hzvhqwhfsgxvxb8rlzaapk751wc" }, "stable": { "version": [ @@ -22601,11 +22933,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20220106, - 709 + 20220227, + 205 ], - "commit": "e92ccc084f164ed87b7ae325669ce5720044179e", - "sha256": "0r53f580grrxgl839l7lrhg8vcrjxy7n2qw10z9bkabmkvbcl20d" + "commit": "4033a8fd8681d3989550f7a2532d6b4e3c45bfe8", + "sha256": "1vfwxjn86rprfz3cfc6w6hw5lqnbh093kydv0lapgz508f5yjazg" } }, { @@ -22738,30 +23070,30 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20220104, - 1417 + 20220325, + 554 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "bd21ee28cc25da400fb32b1e9e65b09514fa7f57", - "sha256": "1k9addpiyk2x56b317awbrmj5d0wlc9fjzp02yicjqzsslakb7hf" + "commit": "edf18b93cceb5cf00e1006d0034663ef4d9fdc11", + "sha256": "0l0lb3in80p9hgqqbrjrnbcjb2vqxw4qxgxl42vz6kvx77fk77j7" }, "stable": { "version": [ 3, 2, - 1 + 2 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "b59802efba1215bb861621deba0030cfda2796ed", - "sha256": "1ji15n2rdp7bjg5iq9im6c4m12k24kqp85i3n1m9npihrb4arh54" + "commit": "1ecf8fcd779c3ef7472f532e0f7843b3ad9682c7", + "sha256": "08zvi1a6hiii3sw8fk0x26jv7vgzy04aal8zvcbwaaczl063vark" } }, { @@ -22791,14 +23123,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20220105, - 1406 + 20220222, + 2326 ], "deps": [ "cl-lib" ], - "commit": "56e8a93b2dd8f2c10a693f36c3317833211201f2", - "sha256": "0ph2slvcf5fncw3s6mc3hmgs02g8prljycqymqz813fcqrbdsmqb" + "commit": "83fd9545c2823b4b2610947802fa3a52995517b4", + "sha256": "0jrmmdz7s6jlq7h6dpxfgx1wvvzwam3rq5dgsqqcn383d9i7zbmb" }, "stable": { "version": [ @@ -23042,11 +23374,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20220118, - 748 + 20220209, + 724 ], - "commit": "a7a3becaf11488eee36d50c06a692f3fa4201297", - "sha256": "0v3yan01yhqz6k34x580j7q8xirgbv86ghsc153k175jc7ig0hi0" + "commit": "e725c9e790c9e9cdaccdb35faaae9d5cb16ddb89", + "sha256": "1hj40c203a5mj9xngsgw5yihd6pcvr91aggqa0kbd4j16fcsvw9j" }, "stable": { "version": [ @@ -23180,16 +23512,16 @@ "repo": "pavpanchekha/dropbox.el", "unstable": { "version": [ - 20190918, - 1629 + 20220314, + 1638 ], "deps": [ "json", "oauth", "request" ], - "commit": "5e0c954a6b819fd3a22b463cce3825984f9ef691", - "sha256": "0z1iw5rzdgipqhx4bvshjbrqqr3wyqy75frwmz34g7s6vll1ip0a" + "commit": "c048faad0be24e8fa31974f08b710a87cf5b668c", + "sha256": "1d43ynlqj60bhc5cc39b02440gdvvbw8hyppg7xs7wcljyb54jxd" } }, { @@ -23200,14 +23532,14 @@ "repo": "arnested/drupal-mode", "unstable": { "version": [ - 20220117, - 1142 + 20220125, + 1044 ], "deps": [ "php-mode" ], - "commit": "5b90a053f73849db77e4c89a030acd81b53712d1", - "sha256": "0pl00a0gr6xgyrf8fhdk6s79kr1l4fimszmwhr05zdya70jlav7i" + "commit": "17927723adc5921e8058f7c29e5e50e88b975639", + "sha256": "1j0zlcjrz0pswcc8wh476vx503qvlyzjscwh0gs3cfss8j6r6gd5" }, "stable": { "version": [ @@ -23261,6 +23593,29 @@ "sha256": "1bv4ivv9j5r0ax4vay1kmwv753y44qj6qprr38yh7ky0fpsml34c" } }, + { + "ename": "dtache", + "commit": "6e0f64b768c13fb873dc1dcb849770b7b401603d", + "sha256": "1sw5wciadijskzp4cczik36ak08xx7491bqgjhbg2vf2yyg09sbz", + "fetcher": "gitlab", + "repo": "niklaseklund/dtache", + "unstable": { + "version": [ + 20220320, + 1338 + ], + "commit": "e7d143df8a8f88cbbe0fa023cd1fc30219598d88", + "sha256": "02bpghhjcgfgcrlkvsrj652ki558pf9q5vj6j056lalfhcrckpvd" + }, + "stable": { + "version": [ + 0, + 5 + ], + "commit": "ecf4c57d96eda400d9b2d5cfeaa9244993ae3603", + "sha256": "1ii8zggw3db5nrkfnfhqsa7w7676bq3vl0z8larwhb34q6shi655" + } + }, { "ename": "dtb-mode", "commit": "0c33d49a8d79ee60571775fc224453a351b0ff48", @@ -23284,8 +23639,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20210926, - 541 + 20220309, + 759 ], "deps": [ "cl-lib", @@ -23293,8 +23648,8 @@ "s", "seq" ], - "commit": "f6a94d86263041f9a172cb7df90e00d1ec44604a", - "sha256": "1q29lpza8rd209zh0n04ia6n359p372czkm57hhmvcd9cmi91fc8" + "commit": "56b339bc76926defa775c406113e306ec6d31b36", + "sha256": "0g33sn95zk4fp1jyh472k3qyvbm062njbxkmnv0qavrbli097q80" } }, { @@ -23320,19 +23675,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20220111, - 1234 + 20220226, + 1354 ], - "commit": "926fc4260c3f71f5aac2e0becb9ee435a4124d5d", - "sha256": "1jq59zac8jwdkp5lc01ygi7f5wlx4bnzkmrsa4j57w0xn70lbkjv" + "commit": "66fc30af02901db023e464a24d2b5fb3ff472794", + "sha256": "0ihwmkxgbd0mgfvzisjiwvyypa9z21ckyxdnkf9y5lxywjyr39zh" }, "stable": { "version": [ 1, - 6 + 7 ], - "commit": "226581d667f11d69474aa4df3ce90f7ec69fe439", - "sha256": "1kad2inc9k2z65if26vfiw098yklzxdx9fw8a6yicb87jgc1cz36" + "commit": "66fc30af02901db023e464a24d2b5fb3ff472794", + "sha256": "0ihwmkxgbd0mgfvzisjiwvyypa9z21ckyxdnkf9y5lxywjyr39zh" } }, { @@ -23454,17 +23809,17 @@ 20210909, 1010 ], - "commit": "7333e33a3fa7d9be93d7e32b0d12a5940b803a4f", - "sha256": "08g5saf7cwiizkg4h75bqa1lgcq3vx5b8vrhy9rjilr45cim8gkm" + "commit": "33d625d08bcf596a6c309d791a2cab70f2b8abce", + "sha256": "1pak38z3bq35b21lz3wm0jvhjznffhi7i6h9nvs1qcf9s7frw2b6" }, "stable": { "version": [ 3, 0, - -3 + 3 ], - "commit": "3cb82b394cb8e13b2e1be32c57aff321e563c6ff", - "sha256": "1c04qk2k3v1m0wp6scsqh0bq3wwkmazfr9apzqsdhw0pm83z4kx0" + "commit": "68c36597dfb99187ccbadf578988deaf690c4e25", + "sha256": "1ndn560fg0fg8n3wplmkg5px69h0g38pyma9wik85cmmqfxry14k" } }, { @@ -24104,26 +24459,26 @@ "repo": "leoliu/easy-kill", "unstable": { "version": [ - 20181114, - 2330 + 20220311, + 1506 + ], + "deps": [ + "cl-lib" + ], + "commit": "f9b450a87c41e5ef616df565ed158cb236aa5189", + "sha256": "05drsb7kaksdsk1v0i5gip255rvlziirl4wcana08cpm9v9p4m21" + }, + "stable": { + "version": [ + 0, + 9, + 4 ], "deps": [ "cl-lib" ], "commit": "2a6309d98aa6b71df6bbbcdf15cab3187c521a6b", "sha256": "1j8hl0f52fqb21775xn94sf9g12yqyg6z0ibgmxzmnl02ir4xr86" - }, - "stable": { - "version": [ - 0, - 9, - 3 - ], - "deps": [ - "cl-lib" - ], - "commit": "e3b2442e2096cefff94ea8656e49af07fee58f47", - "sha256": "0r56nqrj6iaz57ys6hqdq5qkyliv7dj6dv274l228r7x0axrwd9m" } }, { @@ -24220,14 +24575,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20220118, - 739 + 20220314, + 2256 ], "deps": [ "parsebib" ], - "commit": "c854cd0ba979085178b797adb72ad42eed2f87f7", - "sha256": "05lihrrbflr63cbp342g8s2y2i0l3hd4z6q88yvwirfmdv9hlmz9" + "commit": "600b5e3d3dd98ba4017ad257470424b4507b4e59", + "sha256": "0mybyw2hh104z53lnp2pvcm9sg01wdad0hqyxl6msrq12n8pkr4x" }, "stable": { "version": [ @@ -24271,6 +24626,21 @@ "sha256": "0nx1blkvnzrxd2l7ckdihm9fvq5vkcghf6qccagkjzk4zbdalz30" } }, + { + "ename": "echo-bar", + "commit": "86a702ef21febcfc227c1f2b64a7e795403a81c6", + "sha256": "1zi6qnqmbscl36iafblhshz5hrm5z1phzzb6swz1ryw23808skyr", + "fetcher": "github", + "repo": "qaiviq/echo-bar.el", + "unstable": { + "version": [ + 20220222, + 214 + ], + "commit": "06cc8ef88f3b054f676b76815879bd6c71107591", + "sha256": "00cipip1zlfag1mrqi887qq2a3zf4n39a0z5h3vsv38zslq1rz7x" + } + }, { "ename": "eclim", "commit": "1e9d3075587fbd9ca188535fd945a7dc451c6d7e", @@ -24513,17 +24883,17 @@ }, { "ename": "edebug-inline-result", - "commit": "235b422e95ecce5671a16d44bc648379b6859bed", - "sha256": "036fpy7f748c8z7di94ya1dwz2ckri3qm6bsl809myr5wsghp2w1", - "fetcher": "github", - "repo": "stardiviner/edebug-inline-result", + "commit": "ba1a7a8fb085122021ce21e42e7834c35a949551", + "sha256": "0wfgwq5nkadlq3jbrlw9nabr1lqcl5y6bnb8xzj8l6glcryxazvb", + "fetcher": "git", + "url": "https://repo.or.cz/edebug-inline-result.git", "unstable": { "version": [ - 20210213, - 25 + 20220210, + 1357 ], - "commit": "86a9ed9e4f58c2e9870b8918dc898ccd78d2d3f8", - "sha256": "1zf09s03xkhpbhkj99ilzp679lhkyiaaa5kmyj4lb380di1nrw2w" + "commit": "9fb3c48434da24f800833a5ee3419452d5fb83cb", + "sha256": "09rqvs1vj6h8k93xi5h2r1vba2hj5dl7bk7x9ry6mcr3m0c2z6di" } }, { @@ -24541,6 +24911,24 @@ "sha256": "1zgiifi1k2d9g8sarfpjzamk8g1yx4ilgn60mqhy2pznp30b5qb2" } }, + { + "ename": "edit-as-format", + "commit": "1ae1d2ce5a4a6949af6b728bc112fde1be63d1b6", + "sha256": "1fppb6cpa2kbbk9warijkcij1ld5yirh7g2i338b71qppyaps4yr", + "fetcher": "github", + "repo": "etern/edit-as-format", + "unstable": { + "version": [ + 20220221, + 1312 + ], + "deps": [ + "edit-indirect" + ], + "commit": "59c6f439683846d994a7a2110b9b00cc16c08c40", + "sha256": "0r2whzb3pizagbhr7i03kjiplnfwr1x14bl9y1gdvp166vfif5x7" + } + }, { "ename": "edit-at-point", "commit": "2c01af1911a0c8856e3dee09b6d233f821d67814", @@ -24601,20 +24989,20 @@ "repo": "Fanael/edit-indirect", "unstable": { "version": [ - 20211201, - 1541 + 20220216, + 1812 ], - "commit": "7fffd87ac3b027d10a26e8492629da01a4cd7633", - "sha256": "18pbxl68bw33kr9vb1f7d9gra4wlndykv6vn7mj2h7d92p9pjcig" + "commit": "e3d86416bcf8ddca951d7d112e57ad30c5f9a081", + "sha256": "0f5vhppsjw63dkwka6xanmlliq44vf3kj1wp3dg8a6a837xx7z9x" }, "stable": { "version": [ 0, 1, - 6 + 8 ], - "commit": "bdc8f542fe8430ba55f9a24a7910639d4c434422", - "sha256": "189nvmlkki1jfszm9i0crbb1p4nzgmbly0wpvpg0i8vmw7vrpl40" + "commit": "e3d86416bcf8ddca951d7d112e57ad30c5f9a081", + "sha256": "0f5vhppsjw63dkwka6xanmlliq44vf3kj1wp3dg8a6a837xx7z9x" } }, { @@ -24670,8 +25058,8 @@ 20181016, 1125 ], - "commit": "1632acab5624637031326bd902e2ad7ccb6b4c90", - "sha256": "0m7gj224sqxjjw5sxky92fnrxg9jy4nf33kwf0aqxnfhqlgh545k" + "commit": "65a8e434547dcbe1df89dc3fd7aee075f8b06366", + "sha256": "0krf7n01wq2230qla3dn8jb1l9vmwhd5vvwjnn6xr889c9d4wyjc" }, "stable": { "version": [ @@ -24708,15 +25096,15 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20210830, - 1025 + 20220301, + 332 ], "deps": [ "cl-lib", "nadvice" ], - "commit": "2ab86dc9a8ed7a669ca348252d4af46522b5c411", - "sha256": "1ii93vw55vqik765sm79gvlhlnp9xgqzml2ibwwkrfgz7gip9i0m" + "commit": "1d4acc3ec73609990eabacb59c038708bc401003", + "sha256": "1blx38fyfl1zgfh5k1mgsnxxjlski7f0n890kiyjbaw2ba9zzmgr" }, "stable": { "version": [ @@ -24856,11 +25244,11 @@ "repo": "sinic/ednc", "unstable": { "version": [ - 20201122, - 25 + 20220226, + 1619 ], - "commit": "537e2e165984b53b45cf760ea9e4b86794b8a09d", - "sha256": "07cnp40rbl2p4mn40cib6mvby1svxqd8kb3dxb3a8idb736nzqrp" + "commit": "bf588399e241742962613ce2a96f0cffc86417f6", + "sha256": "0y0rxiqa1vxz4ylhagr9mnh1x4lghg1md3k1pqzciq9gnqgl3fpn" } }, { @@ -24871,8 +25259,8 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20210630, - 1626 + 20220312, + 2132 ], "deps": [ "auto-complete", @@ -24883,8 +25271,8 @@ "popup", "s" ], - "commit": "5564f5292eba339afa7760af9467c896ccd708da", - "sha256": "0dkpijsfprlckaggnzmarrbny2qn02927s0fh94dql2gqkvfxhd0" + "commit": "d815148f22ed194116dcde63a0150919e380ecd6", + "sha256": "11x1607fcpxzrf8kqi364qiiffbpwpwld0w9x0mjfsphyvdpg62g" } }, { @@ -25079,18 +25467,19 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20220119, - 2106 + 20220324, + 1606 ], "deps": [ "eldoc", "flymake", "jsonrpc", "project", + "seq", "xref" ], - "commit": "0fcab44367a362c1ddc73780b6a40eea6d1934b9", - "sha256": "1365zkilbqwah403j56lcw576ql61wai5xy51ny54i1hlck4bnak" + "commit": "03fc783c4b701fc8c19096b7167b73bd5d8f63a8", + "sha256": "1w2j3rrbgh1mffhzbjgm3hcvijmfdcfp06pkgnacfi9dydwcap62" }, "stable": { "version": [ @@ -25220,11 +25609,11 @@ "url": "https://forge.chapril.org/hjuvi/eide.git", "unstable": { "version": [ - 20220119, - 2125 + 20220316, + 619 ], - "commit": "b0aab3735f3333ba0b429e669730ff22c9d59da7", - "sha256": "0ms8a4wrkf98p0fjvy4fck0285gx1fdr8nwry0c2p4s1afj48kcn" + "commit": "23c78f4850f44d18eef66c694e7e05882d841ba6", + "sha256": "1icj34anks7f0cjdqc1kgj3bva3bnhily5xc5mzx21w0iciqvpk6" }, "stable": { "version": [ @@ -25259,8 +25648,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20211225, - 1355 + 20220324, + 204 ], "deps": [ "anaphora", @@ -25271,8 +25660,8 @@ "websocket", "with-editor" ], - "commit": "6063cee7fb0bdefa22fb05e4b17e58631f8187d6", - "sha256": "0kfl8jv9lkp92c811r1qdw1xw23pd8ga2v9j7bizx9hvvnh8nc7j" + "commit": "e04e1e19c63667e6847ae6341ab7fc7488f5eb8c", + "sha256": "16f1ka02n06li4griyrviv9bwzvj4s5fk7i2kqa5mkg0gibxmawc" } }, { @@ -25516,8 +25905,8 @@ 20220115, 34 ], - "commit": "abe86793f0684a51ed895c43775a964a6900504e", - "sha256": "01ixs3rksm4y66q27d69nkj87k1l214fkixkh6yr5rv3xfd7jr5b" + "commit": "83bd1378ce4a920ce708e15f1d2caafe30d41a79", + "sha256": "1xpk4c3m5d89n2v2xfn55mj2qv60pb0rpx8ghbcsdyd04ir1llp6" }, "stable": { "version": [ @@ -25543,8 +25932,8 @@ "hercules", "org-ql" ], - "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091", - "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna" + "commit": "dd7edc12568902561c8939e389626b3f0c7f6312", + "sha256": "0zc6d58plwnmmf0k0dgklfaya5k6ai6gmabpjl5n16r50x39jafs" } }, { @@ -25562,8 +25951,8 @@ "el-secretario", "elfeed" ], - "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091", - "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna" + "commit": "dd7edc12568902561c8939e389626b3f0c7f6312", + "sha256": "0zc6d58plwnmmf0k0dgklfaya5k6ai6gmabpjl5n16r50x39jafs" } }, { @@ -25581,8 +25970,8 @@ "el-secretario", "org-ql" ], - "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091", - "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna" + "commit": "dd7edc12568902561c8939e389626b3f0c7f6312", + "sha256": "0zc6d58plwnmmf0k0dgklfaya5k6ai6gmabpjl5n16r50x39jafs" } }, { @@ -25600,8 +25989,8 @@ "el-secretario", "notmuch" ], - "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091", - "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna" + "commit": "dd7edc12568902561c8939e389626b3f0c7f6312", + "sha256": "0zc6d58plwnmmf0k0dgklfaya5k6ai6gmabpjl5n16r50x39jafs" } }, { @@ -25620,8 +26009,8 @@ "el-secretario", "org-ql" ], - "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091", - "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna" + "commit": "dd7edc12568902561c8939e389626b3f0c7f6312", + "sha256": "0zc6d58plwnmmf0k0dgklfaya5k6ai6gmabpjl5n16r50x39jafs" } }, { @@ -25795,11 +26184,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20211218, - 1738 + 20220305, + 1234 ], - "commit": "eb4ae2e7e03a5fc26b054ba2fa9a1d308e239c76", - "sha256": "0wznxssmh2f0jx4c8mci5idzsixpzcxyaa7yxi9ip5h4qig73sqm" + "commit": "70fd716e673b724b30b921f4cfa0033f9c02d0f2", + "sha256": "043516j84q0jx558frk8afavdfr52pvwb23viyb8m54422z1psxl" } }, { @@ -25844,20 +26233,19 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20211219, - 1520 + 20220313, + 1510 ], - "commit": "bcfbef5062b54451171db56159e22765a25ec22a", - "sha256": "119qm2g3zwgmlrh82ydi343phmwvic5flppzm3ya4k8nklr2dlgk" + "commit": "bdc729893ccfc52b2b7369624111cc175e4ce0b9", + "sha256": "1yii555k43v94cqlxv2n9k1d6pz3mjg1sc1zgpbnx5gqhzfk7m5r" }, "stable": { "version": [ - 0, - 10, - 3 + 1, + 0 ], - "commit": "f111d19cda305e5e8fcb70a5675b87173041cb68", - "sha256": "1y8vz5grmlhln37lf93a3gxwh46ar0v3jj2dcvzkb36lqf1snq73" + "commit": "deaf16e832bbb4665fe5ccf825422566ce489ad6", + "sha256": "1y7ngdj2icn8zw5qpjxqj3j9dry4lb7ixgxa148ss5bgsl8pgqnd" } }, { @@ -25868,11 +26256,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20210608, - 2202 + 20220228, + 631 ], - "commit": "13d207d40863a041b84c34f075668c7931db5a78", - "sha256": "1cvwp01w0adgxwlsispmir4wgs73cl62n5rh7ri6rw6g4fribq1m" + "commit": "c0cbb8d9191a1df8a289aafc8cb94a3ebb515d6b", + "sha256": "102z9wl7d563x7i44zhlc81bi7k030rlzfgs5cm8vbmalgqv1c63" }, "stable": { "version": [ @@ -25924,21 +26312,21 @@ }, { "ename": "eldoc-overlay", - "commit": "f865b248002d6d3ba9653c2221072a4aa54cd740", - "sha256": "0nn6i89xbw8vkd5ybsnc1zpnf3ra4s8pf01jdj2i59ayjs64s28x", - "fetcher": "github", - "repo": "stardiviner/eldoc-overlay", + "commit": "0eeadba56dc484e771f400d32a875e392610f071", + "sha256": "18544jdv2n1ip4x2x04dm1xhna7k60hr5zs46ls6rgmnbgh5g8zl", + "fetcher": "git", + "url": "https://repo.or.cz/eldoc-overlay.git", "unstable": { "version": [ - 20210630, - 1345 + 20220210, + 1358 ], "deps": [ "inline-docs", "quick-peek" ], - "commit": "3edbfb23836bdef253f4a5fd125952e55877d2b2", - "sha256": "1r2fjdra4bav16c108jzzjd2qhng7493i7l7znbasialf40j3cbs" + "commit": "b96f5864a47407ec608c807e0d890f62b891ee03", + "sha256": "1rdpg18gffh7ss5di6f4l1wks904867r38w0ilpgb52p8j0pswa0" } }, { @@ -26032,14 +26420,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20211114, - 1153 + 20220313, + 911 ], "deps": [ "dash" ], - "commit": "1c51e88d5719e7b0dd022a4704c46b24e0c91348", - "sha256": "1zzy3y5vkdlb7wb3b4fgvm61zn3dj9n0ldi3153qvrgwn6w8m648" + "commit": "8bcc6b02722adb21d3698df46db2426718aebf70", + "sha256": "0xh658xwx5bbzak4axdrwx90zv9vmba8lwcma4m7scinzwhnjfx5" }, "stable": { "version": [ @@ -26063,11 +26451,11 @@ "repo": "xwl/electric-spacing", "unstable": { "version": [ - 20211025, - 1016 + 20220220, + 1540 ], - "commit": "859f4ab05eff9b00b3fd460b69010a03e010130e", - "sha256": "1s10sn14386dgjxkb7y6mlf5amcb5pq5p3akr0xjdh0dkdwy3db0" + "commit": "c37b2502512dd49a8311d7c34e9bfd1af3d4dbcd", + "sha256": "04p7bxlm82c7f28sskr044p1vyyffa3wir75b430d82by53b6yrj" } }, { @@ -26159,14 +26547,14 @@ }, { "ename": "elfeed", - "commit": "407ae027fcec444622c2a822074b95996df9e6af", - "sha256": "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9", + "commit": "25cd87f2f80a7228ae65ec26dc6c87f50fd2f9d0", + "sha256": "16f6y81n1kh9fhyl9950pfm0z3knv1ygam2cs41ydz6drnrvh119", "fetcher": "github", "repo": "skeeto/elfeed", "unstable": { "version": [ - 20210606, - 1130 + 20210822, + 2129 ], "commit": "162d7d545ed41c27967d108c04aa31f5a61c8e16", "sha256": "0v49l289wiral01pvgm30wyv79h5d3ly3i05dmcw1q93g4z4l56d" @@ -26221,10 +26609,10 @@ }, { "ename": "elfeed-dashboard", - "commit": "339127464845e86419c6a88004fc16b60d675f57", - "sha256": "1ykg8gcsl7gf1w2xvd1wm088fw1l1mbsamx7drrvkdnpwxx6xiga", + "commit": "40ba169fd28e3fee01bc51055a811ae78d4d6eab", + "sha256": "16r2nwlsjlfh48mbgyp3bqnqmxgaj5f4md1i2m8hvvhpyihq7969", "fetcher": "github", - "repo": "Manoj321/elfeed-dashboard", + "repo": "manojm321/elfeed-dashboard", "unstable": { "version": [ 20210727, @@ -26233,8 +26621,8 @@ "deps": [ "elfeed" ], - "commit": "b143f8453aed2053e8fc6f05cef6233797408546", - "sha256": "1yvr3fg5dx0z6h7jbv3fvn5ccw5grpcaj2ynp7zri5y388g160ql" + "commit": "26ff3573efce3cb66c8814854a2983a69683af09", + "sha256": "0wqv4r1s7py81cx4jcih0s6gqrg9xb8ycfkky32x0h64vq906c0y" } }, { @@ -26245,18 +26633,18 @@ "repo": "algernon/elfeed-goodies", "unstable": { "version": [ - 20220116, - 1609 + 20220306, + 2253 ], "deps": [ - "ace-jump-mode", "cl-lib", "elfeed", + "link-hint", "popwin", "powerline" ], - "commit": "8e4c1fbfb86226d867b524fd0f8ae78b4b602f1b", - "sha256": "1f8gyzzdfj0x078m8az2n4c4ihxyxg3yrhx5ry9fi0xsglzvrcn0" + "commit": "6711de66c22360f80fcfd9730293e5f3d419f787", + "sha256": "1c2wqa08wjmqq9kax1akyad23664h5cwdan9mcrn68w6pgqd9rv8" } }, { @@ -26289,15 +26677,15 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20210430, - 846 + 20220126, + 1404 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "c88bb246a40c2f8ec2cb36bc16690d1ed43f8b14", - "sha256": "0aq1rp46dr2hdkzm8aapb1xlcbdpa0nbrgb8b5avkihmyx7nkwkb" + "commit": "d2e22f5506bc75dbf4ca42ac87257fd1b259dd66", + "sha256": "0zmalhdd4xbn9wc5dmk4511ha955smrjpmzknwkwhqn8npgbj4m5" }, "stable": { "version": [ @@ -26321,26 +26709,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20211231, - 54 + 20220202, + 201 ], "deps": [ "elfeed" ], - "commit": "38988ebdbc335f990e9a90042141f18e3fc3ddb1", - "sha256": "19g98xpb0kk8i0js4syb2k7sfj0lia3xmywzn9dmrxkpslhfsyms" + "commit": "3448413280d5e8fce0d8098476d246c6c584771d", + "sha256": "0rkm3vyyklpcyaz7zs2a5azyf20bnbj9nd8ik3jgcg2lsd6jgj5m" }, "stable": { "version": [ 1, 2, - 1 + 2 ], "deps": [ "elfeed" ], - "commit": "dc9901aabf6f6659beef1c876bd3c9cc4c7d17b6", - "sha256": "10wsjq2zd6kz9182gnkjzlzywx16j29dgm1gzwynr79xmvgs4r2b" + "commit": "3448413280d5e8fce0d8098476d246c6c584771d", + "sha256": "0rkm3vyyklpcyaz7zs2a5azyf20bnbj9nd8ik3jgcg2lsd6jgj5m" } }, { @@ -26515,14 +26903,14 @@ "repo": "mtekman/elisp-depmap.el", "unstable": { "version": [ - 20200714, - 1630 + 20220223, + 1131 ], "deps": [ "dash" ], - "commit": "98676e6ffcc4efb70cc991e659c79cb599b01bc7", - "sha256": "0ybqbyv1jnjk25z6ys90d5lddd4qxqspn2xppkzvby21x634s2ry" + "commit": "15909462e3f7daf445d3cecf402ee16c7e3263ed", + "sha256": "0l08xy83b3avjjaydys7f25rr0l4ifh6awl8dyy6ww6wvrz7sd4c" } }, { @@ -26595,28 +26983,27 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20211009, - 1531 + 20220220, + 2305 ], "deps": [ "dash", "s" ], - "commit": "c06aec4486c034d0d4efae98cb7054749f9cc0ec", - "sha256": "0dhflhgc1px9kj2bhv9m646ab08a6qjcqdd1a6wd5psj047bkj9p" + "commit": "8f84280997d8b233d66fb9958a34b46078c58b03", + "sha256": "026nvkbyacdxdgn5c4c09r7hpwypcimqjvx9vx07klaw6m6s25ba" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "dash", - "loop", "s" ], - "commit": "0b6fcdee29d8156ef37477f4e128a148e295c62b", - "sha256": "0w7k91xf69zc0zkjrw8h8sjdjf9xq9qs5zhvajhd718lzf93564b" + "commit": "0d0318b3e80aa8d045ed6906111701153b797321", + "sha256": "03p95kwvwb3apb3lhhdlaxs952x7sdlxa2qc1c77cjwrm5xzdg9z" } }, { @@ -26671,11 +27058,11 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20211013, - 1408 + 20220314, + 1302 ], - "commit": "6f61e04c8537c2e9a807dc29908f619b5202b0f8", - "sha256": "1hcmb3n2av3zdxsh4wk9d1l2x9065mjjgzbf5i3lh3ij1qrgakcm" + "commit": "e0d0466d83ec80ddb412bb1473908a21baad1ec3", + "sha256": "1whi4ni2jcinwq68yrzcl0q23dhp0b5k3jy5j3m89s2kdv3rwsm9" }, "stable": { "version": [ @@ -26747,17 +27134,17 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20210525, - 152 + 20220227, + 931 ], "deps": [ - "dash", "f", "reformatter", - "s" + "s", + "seq" ], - "commit": "f2e2d0053f3272d9fc0c2e16c8d17d97724cf524", - "sha256": "1gaddxw63d5fna43d7kc3px9sbd2knbjga0lx2zz0lsbcjr54pzr" + "commit": "d4e434fa1857ba2f58d27c7520ebeac0515cd140", + "sha256": "0vqqi7g2xwsldmgffi1ygfv87qar6xyqk9r2j23hpyqjh9pzcvx5" }, "stable": { "version": [ @@ -27040,20 +27427,20 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20210614, - 302 + 20220123, + 1237 ], - "commit": "a3e5b974ca9a7004ed6cf72f9d831ba525432c67", - "sha256": "19hmvrck77pxxm2pq6a6hfdk2azl6nlhffwyzymr80rqcpx0hysx" + "commit": "3e0fe0f91d1c5798752c255b89950617f88b8d9e", + "sha256": "1vfhxbn9m3412hpgpnpf523lm9cl4lkbk1fgjvqldlknwks376jh" }, "stable": { "version": [ 2, - 1, - 6 + 2, + 0 ], - "commit": "abc8d7b7de12e4eb06efa2dbb1cc77a714f14479", - "sha256": "0p5jbdbl7bmx94fj7qyqqsy0clvkzjgczbgvhx4ay9wyq83wdaav" + "commit": "3e0fe0f91d1c5798752c255b89950617f88b8d9e", + "sha256": "1vfhxbn9m3412hpgpnpf523lm9cl4lkbk1fgjvqldlknwks376jh" } }, { @@ -27064,20 +27451,20 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20220117, - 1445 + 20220228, + 1307 ], - "commit": "a9137269875a8e79ce238280227297061d6e246f", - "sha256": "1665pmfi45x0jiccl9dhdi3rdv2mqyd8njiwvl7rn9jnjbwhsxqy" + "commit": "ecb5e17d37249bc38c25ee278094fb93b63b0a49", + "sha256": "0q2wmsxvcg6c98fbnldk64lc49zlzd42k8zisk03f8g91l12wxac" }, "stable": { "version": [ 3, - 2, + 3, 2 ], - "commit": "7b52709ddf798fe53db3855eef52ca8862e7700d", - "sha256": "0fzqm5gpadqzsl71r1bq72ki8dw8125v4nmhdd3b4rz9jy1rqm2g" + "commit": "6e3a8ef5af192eddcd834efac49866f84e2c73dd", + "sha256": "1p43x7mf14q84armxhp294xaclq5c6mpggq619ravia0kdrqij1w" } }, { @@ -27088,11 +27475,11 @@ "repo": "twlz0ne/elpl", "unstable": { "version": [ - 20200821, - 1052 + 20220314, + 1353 ], - "commit": "ca6a6237681c641d5137d58e52f884dec0da6349", - "sha256": "0nh300bn5wc753dpyi5p8ihgm173h07mg04fryz5w173xxqqhj8c" + "commit": "32eaec0fc7d20b8acbd4d459bfb8f8b72d75bb66", + "sha256": "1ggb7kx29pg6jph0xrkg00ybqasbak9bld2z2pl0vh1a61bv8vm4" } }, { @@ -27103,8 +27490,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20220113, - 430 + 20220322, + 41 ], "deps": [ "company", @@ -27113,8 +27500,8 @@ "s", "yasnippet" ], - "commit": "edea3321e6cd44e466c1b56672324ac7bd28f011", - "sha256": "1ws8pxh3djdfdarpii777fyjwphv5v67v5ch3l3gjmkgx7acz2sz" + "commit": "1746e7009000b7635c0ea6f1559018143aa61642", + "sha256": "120xzzaa8jxls3lri6d53zq6gafnkc6d9mlg09an334kkmh8k2fc" }, "stable": { "version": [ @@ -27178,17 +27565,18 @@ "repo": "emacs-elsa/Elsa", "unstable": { "version": [ - 20211129, - 38 + 20220223, + 2021 ], "deps": [ "cl-lib", "dash", "f", + "seq", "trinary" ], - "commit": "5b8848fd7d87ee4927adda12a6cf5ed2a7e0c186", - "sha256": "08h86wpgr71xbxpqgbv2jikyzfh1fm33kfb6nxir001inzj0h7aq" + "commit": "21ed4f46e2d02ffb48b3ae377b0c93732ccf3f4f", + "sha256": "0pfwi4xddxphanh83xzvbj3a04wv7x55xjs796i1h820hm7zhidq" } }, { @@ -27416,20 +27804,20 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20210918, - 1436 + 20220321, + 1200 ], - "commit": "a457a596401dc5caa9c9a2ebb627bd4af0607780", - "sha256": "0670dxmvy38rl3mh2gh2ab8hp4y7z90kg3w340mfgx50fbwbcfs4" + "commit": "fb5fe4e017d5a10a9ae4c9e17d6a9c8ac656530a", + "sha256": "1rhrvn9vmb00makvg2gdaaakg76wpsl7spn402hyzgg7jhmqhfgs" }, "stable": { "version": [ 1, 5, - 0 + 1 ], - "commit": "a457a596401dc5caa9c9a2ebb627bd4af0607780", - "sha256": "0670dxmvy38rl3mh2gh2ab8hp4y7z90kg3w340mfgx50fbwbcfs4" + "commit": "fb5fe4e017d5a10a9ae4c9e17d6a9c8ac656530a", + "sha256": "1rhrvn9vmb00makvg2gdaaakg76wpsl7spn402hyzgg7jhmqhfgs" } }, { @@ -27440,14 +27828,11 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20220117, - 1826 + 20220220, + 1404 ], - "deps": [ - "cl-lib" - ], - "commit": "9e24e4e8e81ac93c9e13748759a15436ea565966", - "sha256": "1r23l5i63h9k697bq199nzpyzifbrb7lph53w0yi6w6a54yy6dan" + "commit": "f23230e67c45536501d651ef6b93546b4ac9fe4f", + "sha256": "0x9kfrcf59l0ql9b71a4hbgxjl9lb5w0fwydxcyz5ib0yk5nca55" } }, { @@ -27500,8 +27885,8 @@ 20220101, 1820 ], - "commit": "c82a0e6b4d256a3743b718cfb640fa9efc045f6e", - "sha256": "016lnzdsrwrghnnm8ljmzbqrcdj77pmg23nh3k3ayrh5n20ssdli" + "commit": "374726060d74df0e2bcb9d0355ff41e2c400ed30", + "sha256": "0z382qksrwhkv0ayjp8nays65c3xwd4kylj41k1pc3nnqg6b2k45" }, "stable": { "version": [ @@ -27521,30 +27906,30 @@ "repo": "emacscollective/emacsql-libsqlite3", "unstable": { "version": [ - 20211209, - 1243 + 20220129, + 2241 ], "deps": [ "emacsql", "emacsql-sqlite", - "sqlite" + "sqlite3" ], - "commit": "d3e401750410979be50cab3fee0ec8d0d2a9998c", - "sha256": "07c9dc49sh1vh1rzw80sqk4nivc4mwkjq3amhx3knm8dpysa1208" + "commit": "2aca80a3869d4fd654e79c4a1e20b5227fc2ba39", + "sha256": "0x0fmxgjs17hckx2a32y96nlqdcsx42wcw4lpyc6nk98ikraipgq" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ "emacsql", "emacsql-sqlite", - "sqlite" + "sqlite3" ], - "commit": "d3e401750410979be50cab3fee0ec8d0d2a9998c", - "sha256": "07c9dc49sh1vh1rzw80sqk4nivc4mwkjq3amhx3knm8dpysa1208" + "commit": "2aca80a3869d4fd654e79c4a1e20b5227fc2ba39", + "sha256": "0x0fmxgjs17hckx2a32y96nlqdcsx42wcw4lpyc6nk98ikraipgq" } }, { @@ -27561,8 +27946,8 @@ "deps": [ "emacsql" ], - "commit": "c82a0e6b4d256a3743b718cfb640fa9efc045f6e", - "sha256": "016lnzdsrwrghnnm8ljmzbqrcdj77pmg23nh3k3ayrh5n20ssdli" + "commit": "374726060d74df0e2bcb9d0355ff41e2c400ed30", + "sha256": "0z382qksrwhkv0ayjp8nays65c3xwd4kylj41k1pc3nnqg6b2k45" }, "stable": { "version": [ @@ -27591,8 +27976,8 @@ "deps": [ "emacsql" ], - "commit": "c82a0e6b4d256a3743b718cfb640fa9efc045f6e", - "sha256": "016lnzdsrwrghnnm8ljmzbqrcdj77pmg23nh3k3ayrh5n20ssdli" + "commit": "374726060d74df0e2bcb9d0355ff41e2c400ed30", + "sha256": "0z382qksrwhkv0ayjp8nays65c3xwd4kylj41k1pc3nnqg6b2k45" }, "stable": { "version": [ @@ -27615,14 +28000,14 @@ "repo": "skeeto/emacsql", "unstable": { "version": [ - 20220101, - 1820 + 20220218, + 1543 ], "deps": [ "emacsql" ], - "commit": "c82a0e6b4d256a3743b718cfb640fa9efc045f6e", - "sha256": "016lnzdsrwrghnnm8ljmzbqrcdj77pmg23nh3k3ayrh5n20ssdli" + "commit": "374726060d74df0e2bcb9d0355ff41e2c400ed30", + "sha256": "0z382qksrwhkv0ayjp8nays65c3xwd4kylj41k1pc3nnqg6b2k45" }, "stable": { "version": [ @@ -27645,14 +28030,14 @@ "repo": "cireu/emacsql-sqlite3", "unstable": { "version": [ - 20200914, - 508 + 20220304, + 1014 ], "deps": [ "emacsql" ], - "commit": "209fd0c2649db0c7532e543ec12e7ba881a3325c", - "sha256": "0zr56gwn8rcgvaa9halhfxpxnn0x6yqc66z6r7vqzx5jbj7d6q46" + "commit": "2113618732665f2112cb932a66c0e89c404d8777", + "sha256": "0r8svrd0d4cflx8a8gkynnhafcpv3ksn9rds8dhyx5yibximbzsw" }, "stable": { "version": [ @@ -27771,19 +28156,19 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220115, - 1923 + 20220326, + 56 ], - "commit": "2f147726fef37b085e3f4ee2d94d953480544552", - "sha256": "10flx40bwkghziypp5spggcpjd731b150jvp9qri5vlaii98ays9" + "commit": "b80d96ce0ab79e73829322e46c6d7493eb2b8c34", + "sha256": "1jsynjl0y7w0jqxqlibg8m4rwzv9lxj443m6dlac6zncz8plnizp" }, "stable": { "version": [ 0, - 15 + 16 ], - "commit": "7814a7345067da31a1e7af682bb1f6f050527001", - "sha256": "08wj0p3plvblbmfmn4vsanhldr2csrnm1lhk3g1nic5v26yi5l64" + "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b", + "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv" } }, { @@ -27794,27 +28179,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220115, - 1540 + 20220321, + 239 ], "deps": [ "consult", "embark" ], - "commit": "2f147726fef37b085e3f4ee2d94d953480544552", - "sha256": "10flx40bwkghziypp5spggcpjd731b150jvp9qri5vlaii98ays9" + "commit": "b80d96ce0ab79e73829322e46c6d7493eb2b8c34", + "sha256": "1jsynjl0y7w0jqxqlibg8m4rwzv9lxj443m6dlac6zncz8plnizp" }, "stable": { "version": [ 0, - 15 + 16 ], "deps": [ "consult", "embark" ], - "commit": "7814a7345067da31a1e7af682bb1f6f050527001", - "sha256": "08wj0p3plvblbmfmn4vsanhldr2csrnm1lhk3g1nic5v26yi5l64" + "commit": "5faf1389162dd64bfe3511dfb8f52c18efb5140b", + "sha256": "04xxwhh577aam0fqfmprxqaw0v1l6yidikr6chajcf16mf1wd2gv" } }, { @@ -27950,28 +28335,28 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20220104, - 2105 + 20220315, + 1727 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "2c24a16fa2e57ccedf4b502c887213c8f4eeb872", - "sha256": "1qsshfnrkimpvz6w5hy1wrx9s70ffbfcqzrdlwcvaly66zna7zq1" + "commit": "dd1ee74db3325d6a27e14df7ae882b5cbd84989a", + "sha256": "0s50ap75wsjapxdby7x2gk85jnsr6aaf0l1vzpb6ax96ag92d4lm" }, "stable": { "version": [ - 8 + 10 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "32ff8a70ca9726dd0e3b8ad68430bc6fd66bf387", - "sha256": "127xvjsqqk1a5m5qf06ksr3y378fm5h2vyckvm38y3mgrx1kvxx0" + "commit": "6afe1b26d679357586380ecd69c9795985231013", + "sha256": "03cb4v50cxbprl695r9812zl35y5a8sdk7q8byflrlk6arihgrxy" } }, { @@ -28242,8 +28627,8 @@ "emojify", "request" ], - "commit": "91111bbec3f43f85b680de68d408919b33800200", - "sha256": "15j4cci54rgd3ic2g4k1jf4v2yiph8y92gpg76jvrikyjby9zfj5" + "commit": "8ebfc21d243fc17faf074b36dbc4be6141139906", + "sha256": "1mdh1f3lbng0nbwih3haf7wj4x4mmgviziv5fwki449495mw041q" }, "stable": { "version": [ @@ -28555,15 +28940,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20220103, - 1759 + 20220218, + 1627 ], "deps": [ "inheritenv", "seq" ], - "commit": "456c4100de41d2cb50813058a9e727b6e83c5d1e", - "sha256": "1l80sr74lb275i49xna5li64v2ip598xs0fdqcnhc449b1zpazm3" + "commit": "57d78f0138d9c676dff182e713249ad055ccf85d", + "sha256": "12bs9ywyf30qrmhibbdvcf5i24mvq8l2j3y0fv32fb2ydk4lpcmw" }, "stable": { "version": [ @@ -28700,26 +29085,26 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20220112, - 1745 + 20220216, + 1916 ], "deps": [ "closql" ], - "commit": "9b3fded4c6904268fbdf84fb457aa195b2c90cba", - "sha256": "0rlq18853q53nghinzk73xsrq38j4mm8yahgwlpkxycysnl99l0l" + "commit": "475bfb19e293edcdbeb23d30b2e4954ca7ab8f39", + "sha256": "0f4p5xrlsfmsn61xvh3mx9y84bklsyjz6jgkdajiyd7wrmhlyjzf" }, "stable": { "version": [ 3, 3, - 2 + 3 ], "deps": [ "closql" ], - "commit": "44bcdb03bb11891f5966b39be942d76a4a57f5cf", - "sha256": "18kjp0f5ch4mpd6yrd83p73pw7ykp2lv5686is8vcvyyys53jrf1" + "commit": "3075b621a56f13a93337e2f04aea3565b625b8de", + "sha256": "0d09ddlhvgp8rpybqmzvzpzdp1hjaq97wp2br4g90lpx2vclkgn7" } }, { @@ -28730,14 +29115,28 @@ "repo": "emacscollective/epkg-marginalia", "unstable": { "version": [ - 20210802, - 1740 + 20220131, + 1328 ], "deps": [ - "epkg" + "epkg", + "marginalia" ], - "commit": "0879f5b2cf87fff17dcfb74009d289d6a89c9816", - "sha256": "11sbf363qy3i87hppv4admqd2sy0kwpvjgih51hn3rbimbswkwab" + "commit": "d41cfe1a00d01a45938d2af2fb311fdb17d3c381", + "sha256": "0i295rr9fslhxrqh8967whq1h903i3a45c4x6ycff1fhrxb87frf" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "epkg", + "marginalia" + ], + "commit": "d41cfe1a00d01a45938d2af2fb311fdb17d3c381", + "sha256": "0i295rr9fslhxrqh8967whq1h903i3a45c4x6ycff1fhrxb87frf" } }, { @@ -29300,28 +29699,27 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20220104, - 2107 + 20220223, + 1148 ], "deps": [ "cl-lib" ], - "commit": "b0ede648b660cc7fe2b15abf6d85cf59ab01bc96", - "sha256": "0hhrd3fllmvjpl3kj96sv9k9qn2cb4wy74gz2czy712xj5bh0y4w" + "commit": "757475874a840f99b20c56182c7199257b6ae477", + "sha256": "1ipwzl0l26g5qvc1sgmz2ra5vn1j3hl0mnkgzpa3j4p8gsmxdiqr" }, "stable": { "version": [ 5, - 16, - 10, - 12 + 22, + 2, + 23 ], "deps": [ - "cl-lib", - "undo-tree" + "cl-lib" ], - "commit": "ac70b2563fb6e3d69ea382fddc87b5721c20c292", - "sha256": "0ydxyylijdd6da4n9by441352shphrpfyk2631ld5aq3gz27z9gi" + "commit": "757475874a840f99b20c56182c7199257b6ae477", + "sha256": "1ipwzl0l26g5qvc1sgmz2ra5vn1j3hl0mnkgzpa3j4p8gsmxdiqr" } }, { @@ -29354,8 +29752,8 @@ 20200914, 644 ], - "commit": "382861b1967b7ced0806343b8410709b2ce91df0", - "sha256": "05w4wmbdzg4j3nppix6gb2knf9wfyzqjcf0i1adbk7rawgcymq1x" + "commit": "724723ed0a6b179398f4105f5eb5ea088d1bac4a", + "sha256": "0qzg5qhf3p4ifspbz6l1yj4fl6sdgbi74kprql20sx9y58dyhamd" }, "stable": { "version": [ @@ -29376,19 +29774,21 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20220110, - 807 + 20220215, + 1844 ], - "commit": "41ef8097d2b6f891e5c3bd9e8084d9ffb9f7ed75", - "sha256": "1g460czxrjjv9sgnidrj6w6fnrmhfvj9l3g55ndpsxmnp9y2ps44" + "commit": "510b025db164ec18e49117d070f4e08ebe8f4da1", + "sha256": "1wliqzp5nw07qxmy9024i2dmbidn9216niz09299q9z447raisp3" }, "stable": { "version": [ - 24, + 25, + 0, + -1, 2 ], - "commit": "df48c260e74c3e9058ff8681ce9f554e6fa0fe34", - "sha256": "10s57v2i2qqyg3gddm85n3crzrkikl4zfwgzqmxjzdynsyb4xg68" + "commit": "85d0a8366e64f8272e332a63a2cba59afa3f7eb9", + "sha256": "0nln44fd5kxjsgr0k95xn46jshp035s66rna7gb0lsm2iggcfwy8" } }, { @@ -29541,8 +29941,8 @@ "s", "shut-up" ], - "commit": "c3969c86b5b00087d8b2fcb7147481d5be56f2f7", - "sha256": "0v3ry7aza86pzrjjy9qr07jxn3md1vx324cl0xq3b055mdp6dqv6" + "commit": "80cf4f60ec8c1f04f58054ed8ad2dcfacc17d8b5", + "sha256": "1zxhiy8hpyz1nbi238gnwvs2pyrl1h8pgfyqrjhqwni8bih4kzx7" }, "stable": { "version": [ @@ -29878,15 +30278,15 @@ "repo": "xuchunyang/eshell-git-prompt", "unstable": { "version": [ - 20210817, - 553 + 20220206, + 458 ], "deps": [ "cl-lib", "dash" ], - "commit": "f638ba32b661d15895e767305f59f41eb01197ae", - "sha256": "1hn05bgznc1az4fb4grg8d9acwpmwr4bp6ibch901c79hp79qlkv" + "commit": "1eb1fd56649f291cac482fbf06dd43ef867873bc", + "sha256": "1l3dlzzkx3k532ig2hmpky50zcz73p7vsnlxr24ichq5sn2lwfg2" }, "stable": { "version": [ @@ -29910,26 +30310,26 @@ "repo": "Phundrak/eshell-info-banner.el", "unstable": { "version": [ - 20220114, - 1021 + 20220326, + 933 ], "deps": [ "s" ], - "commit": "247d8bf4dd93d796c41c0f60947cc77b73b99e83", - "sha256": "02xni607801764pwnhj0g3mvl1pg5mr0kvg6mbgxxwjpjcv6cndf" + "commit": "9c17e92f0229c9002e071842a88396c3f2439d72", + "sha256": "08kqqlvia3hzl9yq5yia92a27rk3fsahdizlf7rpywkmj5aix43l" }, "stable": { "version": [ 0, 8, - 6 + 7 ], "deps": [ "s" ], - "commit": "d4033120c1259c454aaba21eb1c297b0507b34d4", - "sha256": "0f1zgbgzfc6djr3h5lkw9z614wcr5sfz77lfya31brpbiqpvqz6d" + "commit": "9c17e92f0229c9002e071842a88396c3f2439d72", + "sha256": "08kqqlvia3hzl9yq5yia92a27rk3fsahdizlf7rpywkmj5aix43l" } }, { @@ -30102,8 +30502,8 @@ 20211005, 221 ], - "commit": "636bf8d8797bdd58f1b543c9d3f4910e3ce879ab", - "sha256": "02hjm685fl4f33s5fi8nc088wwfzhyy6abx5g4i93b2dx3hr2lyi" + "commit": "0435d8e2864bb4f1be59ae548d0068c69fa31c7a", + "sha256": "1ggp122b0a93ji2khxg8kvklwvjxx4a45hayln725d5nsmf82wy6" }, "stable": { "version": [ @@ -30172,11 +30572,11 @@ "url": "https://codeberg.org/jao/espotify.git", "unstable": { "version": [ - 20211114, - 2251 + 20220121, + 2057 ], - "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293", - "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5" + "commit": "ea6d6021e5acc550560325db2f09198839ee702f", + "sha256": "1jlm7mka1ilaw8z1a91vy8k1hz27g4iyk33fpmiab7856j8ry32b" } }, { @@ -30288,11 +30688,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20220118, - 1855 + 20220225, + 1523 ], - "commit": "3a919560e701c3fc19dc7e03e49f0950eb120b6c", - "sha256": "0iizk76py74m9gm39x57dfjnaz745knmpddcwnh6xqmhsh4wgqar" + "commit": "39eba283000a7b0220303d7c5a4f3ee05efc1e9c", + "sha256": "1avzxbdj2ghzv94mjmikqdb6za4dxkby2pnyrz0519fs4sc17a06" }, "stable": { "version": [ @@ -30456,15 +30856,15 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20211206, - 916 + 20220124, + 1430 ], "deps": [ "csv-mode", "ess" ], - "commit": "05888711212f9a9d72ecd48904de0c66adf6575a", - "sha256": "1nm1vzjby8ind8pvqzyy5yjcf0la72azjf55pwr46rzrjgia0s1a" + "commit": "6277684e06d5c3a2cbd340f656b7ffca4046e45b", + "sha256": "1ijxrcfbk8l1jbij9nc7b9j2nk3k5imvjbs5319z85q10k5cz7f9" }, "stable": { "version": [ @@ -30487,15 +30887,15 @@ "repo": "jschaf/esup", "unstable": { "version": [ - 20200814, - 1400 + 20220202, + 2335 ], "deps": [ "cl-lib", "s" ], - "commit": "5169dd7fc8765a7377b0ab93aa63b7f0f934689a", - "sha256": "0mn9pffw7kzdzwv3jkhygdkmlqax9fsrbjznbck90ydiv095fmp6" + "commit": "4b49c8d599d4cc0fbf994e9e54a9c78e5ab62a5f", + "sha256": "1zyix297qpgx0l90afg1pxalsjph6yb7b2qxy2rxmbl9fkn4b774" }, "stable": { "version": [ @@ -30883,15 +31283,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220118, - 2201 + 20220309, + 2216 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "be97395e31861fa7b84e7440a87db455e2089107", - "sha256": "11mcf6461z1v7asaa7kxa88y0x16m51g1lixkx7ggjdls21nbwf6" + "commit": "3e41a823334abbba9cf16e482855699054d9dfe0", + "sha256": "1ir4ybrnylx9slyb7znrshfjf0gw1xi7f9nf6bryidqxspsn2ri5" }, "stable": { "version": [ @@ -30947,14 +31347,14 @@ "repo": "wcsmith/evil-args", "unstable": { "version": [ - 20180908, - 2157 + 20220125, + 1626 ], "deps": [ "evil" ], - "commit": "758ad5ae54ad34202064fec192c88151c08cb387", - "sha256": "0k35glgsirc3cph8v5hhjrqfh4ndwh8a28qbr03y3jl8s453xcj7" + "commit": "2671071a4a57eaee7cc8c27b9e4b6fc60fd2ccd3", + "sha256": "13avgl0whfp1xdsmp0j7qr5p2nh59swb2lyfpr7fz6bkgifrn212" }, "stable": { "version": [ @@ -31035,15 +31435,15 @@ "repo": "wbolster/emacs-evil-colemak-basics", "unstable": { "version": [ - 20211125, - 2021 + 20220222, + 1856 ], "deps": [ "evil", "evil-snipe" ], - "commit": "ddea4486de929c399745713a6e616df50b22dedd", - "sha256": "1ld9iv6ysk28ps6gx6jgrqyazyqk1xd17a4fhf94m2hy7jzakwaj" + "commit": "66648de206a7368013f28c0d053b1b32c3efe6c6", + "sha256": "1h9d9jicvc8kdw8yfpsasl038h7s6zpfh1gjfcxn3lwgfmfnjkh1" }, "stable": { "version": [ @@ -31085,15 +31485,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220118, - 49 + 20220314, + 1559 ], "deps": [ "annalist", "evil" ], - "commit": "5cc50418d0654c4dae1b312f327493e96724cd5e", - "sha256": "014isydh72wynk5pfbxv9yc9vgxmzzhn8iywqpd73jps42q7kn5x" + "commit": "e55718869252a8cd46e61e350bb514194a37f2f8", + "sha256": "0inq608gk9kn3383qni7ll93qhw3qqy7yi22ympv0y3279n8725b" }, "stable": { "version": [ @@ -31202,15 +31602,15 @@ "repo": "cute-jumper/evil-embrace.el", "unstable": { "version": [ - 20210418, - 2038 + 20220211, + 606 ], "deps": [ "embrace", "evil-surround" ], - "commit": "464e8ec52ff78edf3c9060143fc375f6ce5f275f", - "sha256": "1bga1idxj8mg5xpl7k4ymwaniyba2x13lf8yihyh713s5238fdmd" + "commit": "7b5a539cfe7db238d860122c793a0cb2d329cc6e", + "sha256": "03b53626ywq9qdqzsb92321lc0fzjqb674kwkssjrxlz6hhn5hlq" }, "stable": { "version": [ @@ -31421,8 +31821,8 @@ "deps": [ "evil" ], - "commit": "1b66053ea5f06b08a52bebdd42bffd8eff82032b", - "sha256": "1z0qdgvrjajf027zibvwwaa2ia1zczbw68mc67ihhdc2zdsmz5ik" + "commit": "8f20a16e74016f37ad76dc4f2230d9b00c6df3c2", + "sha256": "1g07vlqizsm9lfjibidbfb0krqx8qyxbvqrrccgqfmcsxqgyfyic" } }, { @@ -31433,27 +31833,27 @@ "repo": "syl20bnr/evil-iedit-state", "unstable": { "version": [ - 20200830, - 617 + 20220219, + 1432 ], "deps": [ "evil", "iedit" ], - "commit": "30fcfa96ceebed0191337c493f5c2efc8ae090ad", - "sha256": "0aqwjd7pmzxf7l768vyqqgjzmqdwlpznh30w5bdr7yh79r6xm6n1" + "commit": "6f7b502447ba35676375169d7707372ebad2791f", + "sha256": "0vjzjmp3ba0nzf0v04bhxvzgdwwm11vivxqjzgnvp3kq95kajr5h" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "evil", "iedit" ], - "commit": "f5573ddefc03309037bd98c4c649d517f4f8d659", - "sha256": "1i4kq34kghabkx0mp0asw2d0ybrrlv2ps50h8mgkm20sm5ha9lbh" + "commit": "44c64c71692e5b2f608ad3e3c537ec0a0e0ea0f8", + "sha256": "0kka4g4rkvxldif39n617llr95q9aaijchhbci85cj3qqp9sd9wb" } }, { @@ -31550,14 +31950,14 @@ "repo": "edkolev/evil-lion", "unstable": { "version": [ - 20170811, - 614 + 20220317, + 1030 ], "deps": [ "evil" ], - "commit": "6b03593f5dd6e7c9ca02207f9a73615cf94c93ab", - "sha256": "1a162hynp0jcsn50c1w5a02mrw9w3q05c7lkqzqd25px3d0p772q" + "commit": "4da660e124731ed65e7aaa6c067c30e876619429", + "sha256": "0akhw0a9qsk65lvanb57fqh7hf601xdzkbyi560ximfrsr7f94pi" } }, { @@ -31883,14 +32283,14 @@ "repo": "Somelauw/evil-org-mode", "unstable": { "version": [ - 20211117, - 2046 + 20220227, + 1024 ], "deps": [ "evil" ], - "commit": "26ad08b5f629370f57690315102140878891ef61", - "sha256": "0i36pc7kb5ysk8hm1ll6dq5y6xpl19nm3ap64gzi3b3p94wn6jl0" + "commit": "0d10ff7bb9a3a93d25cd91018b17f0a052b335f3", + "sha256": "15g47xgpswzc8lz7qdbbzfcq1n9m4474qa2jkg43l8d5ali8qa7z" }, "stable": { "version": [ @@ -32411,8 +32811,8 @@ "deps": [ "evil" ], - "commit": "be97395e31861fa7b84e7440a87db455e2089107", - "sha256": "11mcf6461z1v7asaa7kxa88y0x16m51g1lixkx7ggjdls21nbwf6" + "commit": "3e41a823334abbba9cf16e482855699054d9dfe0", + "sha256": "1ir4ybrnylx9slyb7znrshfjf0gw1xi7f9nf6bryidqxspsn2ri5" }, "stable": { "version": [ @@ -32442,8 +32842,8 @@ "auctex", "evil" ], - "commit": "a4b8a4769efb4cf38d91f51145b275f64bdd832e", - "sha256": "00mrxmf6s3fss6jb0aic09vk2sk6zpy367nzy8i4r4s7zlnv4wsh" + "commit": "0fa85c3fc88d96621002b5a1b79efcc06776642f", + "sha256": "0r38d1z7xdmiwxvpkzfbisd8scjj5i4v1y629j5n73f2xapk83df" }, "stable": { "version": [ @@ -32614,15 +33014,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20220116, - 1346 + 20220325, + 1401 ], "deps": [ "evil", "tree-sitter" ], - "commit": "1f1decd46d1cd6e1551c25101428966d8c4a87af", - "sha256": "1dsvivdyp75ivrhpsd7fwddx25p5vg7q4a7mijba68cns7x39bxr" + "commit": "d488792ee1ceadf3ae4a8b7b93ca3a88d36111cc", + "sha256": "0mwxv0al1i8vplsh2bl8y5vl9zga6zlz6f8mjbbm6gvcnzpbz5ff" } }, { @@ -32651,8 +33051,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20220120, - 123 + 20220319, + 1652 ], "deps": [ "avy", @@ -32661,8 +33061,8 @@ "tree-edit", "tree-sitter" ], - "commit": "ad5d3c5060d8cf43d2053c2bc74b0beda1e664a1", - "sha256": "0az5p42vhpbrqhgavfk3jyp1izillvqsik9rpwh5g48c3qm42bjh" + "commit": "63816d614e6e2112c2f26e65afd7440f022ba2ad", + "sha256": "1c0s9hsm5wisikgxzskmnkin0r2vs9yc5yhgkjrsrvaiiv05g9ip" } }, { @@ -33192,15 +33592,28 @@ "repo": "md-arif-shaikh/expenses", "unstable": { "version": [ - 20220109, - 1306 + 20220318, + 842 ], "deps": [ "dash", "ht" ], - "commit": "d8bbc3201a23f596418cbb0a316b446f0ab94585", - "sha256": "1shwdlzaf84mlf9gdxly43xwy6s7w48mbh5hqy8jbndq552zkzgh" + "commit": "e668666770858e92de83d8217c7e384de3ba1e34", + "sha256": "0hlm8c1sif4z8fl6k9k9akc26nzxby792ca6wkrqxcjsc65a65zv" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "dash", + "ht" + ], + "commit": "fb4349fb7dbddcebc189cce52dda25ab42d27b06", + "sha256": "18ihdfm8hbfl0nhk5k02m0f5dni5pmljnv0my87pmhqa4bzi1b38" } }, { @@ -33386,16 +33799,16 @@ "repo": "walseb/exwm-firefox-evil", "unstable": { "version": [ - 20200206, - 2212 + 20220318, + 1958 ], "deps": [ "evil", "exwm", "exwm-firefox-core" ], - "commit": "14643ee53a506ddcb5d2e06cb9f1be7310cd00b1", - "sha256": "12rhsy5f662maip1sma0vi364xb8swb7g59r4dmafjv3b52gxik8" + "commit": "a377326e2e4ac386a0abb3fc9b1b356a0d955b61", + "sha256": "0gn221al5sf6zcpgd7rl3d8kg8c8l6plf9v5ii0z6ib14g0wvpgb" } }, { @@ -33450,14 +33863,14 @@ "repo": "SqrtMinusOne/exwm-modeline", "unstable": { "version": [ - 20220109, - 804 + 20220131, + 1520 ], "deps": [ "exwm" ], - "commit": "4c77d4e3df851ea96eac627bfd580f313e2860f3", - "sha256": "1jdmmncmyhivn83xj7arapww5yp8iqcbfffhlbhl8aiq0dc8lgdg" + "commit": "3225ec1803c3da9aee3f53562278c3558c179c26", + "sha256": "1hnap58i90nsajp6a0ib5z96ifykw85p2g21vbij827v419mq1mw" }, "stable": { "version": [ @@ -33793,19 +34206,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20211124, - 1842 + 20220318, + 2213 ], - "commit": "c090f3d3a8a2ddedeffc1f5b5147cb7633dae79e", - "sha256": "1kiaqascf4lh1kpvp79yynjyncakq31xgx0h2bfinji8i7y32pg1" + "commit": "c58c162a2d1284033497feff4bfa8c3210685d9d", + "sha256": "0v5xn0zpc2khy97pbhvhja724hfc9y3rm9fmqf0xzpm6czbgi4xr" }, "stable": { "version": [ 3, - 0 + 1 ], - "commit": "c090f3d3a8a2ddedeffc1f5b5147cb7633dae79e", - "sha256": "1kiaqascf4lh1kpvp79yynjyncakq31xgx0h2bfinji8i7y32pg1" + "commit": "1385058dfe1db579cc5e08bd81ad9b15282f0650", + "sha256": "1ph7myinasxbamr7vpiijihqniq06ng4h58jgh04xb7vvi4b07nx" } }, { @@ -33859,14 +34272,14 @@ "repo": "jrosdahl/fancy-dabbrev", "unstable": { "version": [ - 20210909, - 752 + 20220211, + 633 ], "deps": [ "popup" ], - "commit": "9435ad63c1c4756f574ae98d2d63ecf1189ec832", - "sha256": "1qnh6ykmwvwk06rpi8pcvql5zq9gpiz2xiyl3j2imhmx1jiw4xdz" + "commit": "cf4a2f7e3e43e07ab9aa9db16532a21010e9fc8c", + "sha256": "04z9pwvl68hsisnyf9wlxmkwk8xag36jvcchwcwp4n9vp04z8745" } }, { @@ -33924,14 +34337,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20211211, - 201 + 20220310, + 358 ], "deps": [ "s" ], - "commit": "c328cdd1c5a0e734937125771279838e401fc5a8", - "sha256": "0kz6mv7awammgsi68vg6addkqry86sd3l8qrk3djwb77kw6rpvn6" + "commit": "b01cb24209d223ae0e7281c279daab87800ee7f4", + "sha256": "1jaw9xwh58p1n0x943f6fly0scxf6zd6czq87xrb3fnkmv8qdnhk" } }, { @@ -34287,17 +34700,17 @@ }, { "ename": "fennel-mode", - "commit": "cda0732050a17b2dc70b80afd6fc6bb9cf8bb60f", - "sha256": "0lg69rjvbg7zl4jxc88m12r4rgv2mg2xdyz591mdmgvxwr2hfrv9", - "fetcher": "gitlab", - "repo": "technomancy/fennel-mode", + "commit": "6f1dd5342562665d32308d2cf69527a0e491f269", + "sha256": "0fbwd932jvgn7aarv04pbla76ldpdn2gz0z6zjdcjsp5h507ngps", + "fetcher": "git", + "url": "https://git.sr.ht/~technomancy/fennel-mode", "unstable": { "version": [ - 20211126, - 1803 + 20220309, + 445 ], - "commit": "a622c110a2ae6ababfaab0506647a7fbc81e623a", - "sha256": "1bfd983zdhq097bb101k8p7x4jkmkgaxfj7s7aiyf4s3zq84v6xy" + "commit": "c55eecd7c731a18c40be98684370c4c6903d243d", + "sha256": "1cg21a2p9pqx9dif35k0p393ckz8f433qznwxgircajjmz65b7b2" }, "stable": { "version": [ @@ -34339,8 +34752,8 @@ "f", "s" ], - "commit": "7b961721f36bd23ac8fae6e6eaa490ac6e8527d0", - "sha256": "1kgjb8qjscs1a08w4qwynd6yb94hi6lai9lgf0mnwvvmv6rpzfwv" + "commit": "dd51ad1a5a0d85ab3c71e9bd31499d50ec8b1f74", + "sha256": "1qvi1z6w8j94pp71gwvjd8h14m6fnf0wg824iwk7pvfyhfmi3p91" }, "stable": { "version": [ @@ -34443,8 +34856,8 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20220120, - 630 + 20220312, + 1650 ], "deps": [ "dash", @@ -34452,8 +34865,8 @@ "seq", "transient" ], - "commit": "0187be7e538f89eacc06324a0e712cde2fe7d8a6", - "sha256": "1p0rpawqb0rc0fqg5yr4mnqiwi62frvlbkdfqv6xk3rmy4hsi0mz" + "commit": "9125e5b7ebbb99b8c007018fcfd5034e7ac6630d", + "sha256": "1gwx52498q6yg8vyfdw4mrxjj49cbcaf9r95rl2dcms9rb9s5rqv" } }, { @@ -34513,8 +34926,8 @@ 20210707, 354 ], - "commit": "9e076f56f58a195df9dd88f6541b63201bd5c38b", - "sha256": "0pffcv4nhwap85sx2rxxr4li3rg2bb5ykanaq6kg5wcliqck29hg" + "commit": "466b2314f48aee2bab17810eb4fd7f9b061c9a46", + "sha256": "1dmdmgmb7gw2p62p1i1ii1b4b6wvh0kg1vvvlfpx5jmv2ix01drc" }, "stable": { "version": [ @@ -34660,11 +35073,11 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20210924, - 952 + 20220125, + 726 ], - "commit": "a62eaa0b07d8d22f309ec07992283f0fc340ce17", - "sha256": "1bg3a840ifcyhs6n353zg3bfrd133s81kw1gnmi44bc2v4pwh1hi" + "commit": "204b3d489a606c6e7b83518e46be3bbcef1bcb3d", + "sha256": "0h22rh88i11sz0kh1pq9fc9w58lja00xrany6mcy1hr6l0wy2g5h" }, "stable": { "version": [ @@ -34707,11 +35120,11 @@ "repo": "muffinmad/emacs-find-file-rg", "unstable": { "version": [ - 20220109, - 2015 + 20220314, + 1540 ], - "commit": "86158409c59f0349e84fb31557cc41f93d2df5d8", - "sha256": "1aghs4411fbxdlfhgy3a2aiq5z2a5slgw5qjd2hs99iqll2zq84v" + "commit": "404b1cc97c2f700d3dc1c66b640f96ed5a268dc3", + "sha256": "18v3wdkh7ld6ap4nfc8p84i44gc99nrvk7v0gyq1zdg0yy20vwaq" } }, { @@ -34782,8 +35195,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20211130, - 1023 + 20220307, + 1527 ], "deps": [ "async", @@ -34794,8 +35207,8 @@ "s", "transient" ], - "commit": "b547ff8b81aa956d582c1c8edbf4c52ba017265d", - "sha256": "000szg9gg0ma61s0kx7ab1gnywbbi6w43csrprjyrhbgldb2bwbk" + "commit": "be1ae9bcb1b85d93f138c510dbc16c28af228916", + "sha256": "0jslc8j153sglagfjq5vrcnhgzjjxkf763h3md9735z231svvvk6" }, "stable": { "version": [ @@ -35309,27 +35722,27 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20211203, - 849 + 20220205, + 205 ], "deps": [ "buffer-manage", "dash" ], - "commit": "7d0421805e4a287358a5c188ff868bd93be2192a", - "sha256": "0hv9lp4ybcl7vn27cx3iq64rk0fydinq6sgyslhc2616kll6fdb7" + "commit": "2da0e5e791896810747c710276ff3a1d0465d843", + "sha256": "0xix6j99hb1l0ml8ry2zcz74n86572bnq5czr0xni8hvrgxa9b61" }, "stable": { "version": [ - 0, - 10 + 1, + 0 ], "deps": [ "buffer-manage", "dash" ], - "commit": "7d0421805e4a287358a5c188ff868bd93be2192a", - "sha256": "0hv9lp4ybcl7vn27cx3iq64rk0fydinq6sgyslhc2616kll6fdb7" + "commit": "c1c696433a650b0273f28da4f57bde7960395386", + "sha256": "0ls1ghh7j0lmp3l03d5pmczqs54rxwd8p5wpf28mvy0w28vw2m33" } }, { @@ -35523,11 +35936,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20210914, - 17 + 20220220, + 1423 ], - "commit": "81c524a43c46f4949ccde3b57e2a6ea359f712f4", - "sha256": "16j455iymwcnqh6zwwlk47x9jsdim4va9k4il3qqj8bwgjv30xmb" + "commit": "08138f8c95488aaf315a1f5d52c33deb8d28672b", + "sha256": "0h4r6m9yi5pvqlc4a3m2kc8jl1ywp4vv8bgmnkzy1aa7i8lb94c3" } }, { @@ -35538,15 +35951,15 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20200221, - 1415 + 20220213, + 1335 ], "deps": [ "flutter", "flycheck" ], - "commit": "81c524a43c46f4949ccde3b57e2a6ea359f712f4", - "sha256": "16j455iymwcnqh6zwwlk47x9jsdim4va9k4il3qqj8bwgjv30xmb" + "commit": "08138f8c95488aaf315a1f5d52c33deb8d28672b", + "sha256": "0h4r6m9yi5pvqlc4a3m2kc8jl1ywp4vv8bgmnkzy1aa7i8lb94c3" } }, { @@ -35656,8 +36069,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20210825, - 1804 + 20220314, + 27 ], "deps": [ "dash", @@ -35665,8 +36078,8 @@ "pkg-info", "seq" ], - "commit": "784f184cdd9f9cb4e3dbb997c09d93e954142842", - "sha256": "137zsivwh3i4b757hzwf5mhv5sg8j2jg7kg0cjphplwasqk70qm7" + "commit": "278d0810f05eb03600d835c2bdd67d6b55a58034", + "sha256": "1c722aapkqbkxqchpchd2id9kz4hv2dckyl851x4na3yd7k0dzky" }, "stable": { "version": [ @@ -35750,14 +36163,14 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20210618, - 920 + 20220128, + 1518 ], "deps": [ "flycheck" ], - "commit": "576e7f3e96ef8757a45106346a5f45831a8fee13", - "sha256": "1680qkn6n145ib0q039081k9iwgl81i81d1wmy1myifq8h9pgjzc" + "commit": "ffe905560bb917ae4bbbbb8ad2d7e2c70664225a", + "sha256": "1rk5vlw8c2d0jycp1i7r030gldwg0fikj23fj7z3sw5x254p7waq" } }, { @@ -35835,26 +36248,26 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20201120, - 2307 + 20220221, + 1029 ], "deps": [ "flycheck" ], - "commit": "a4ca40978e680f9edc86c141e696e0ae57c63533", - "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi" + "commit": "4cf56affe3035fda364109836e26499431095185", + "sha256": "1i9nqzk6nx4jdcn6q2yj2awb8rskblhnhqmxljd8bfv5s02fqr8z" }, "stable": { "version": [ 1, 0, - 0 + 2 ], "deps": [ "flycheck" ], - "commit": "b4ffad5cabea7e858c66dc824d545653b1cdcb70", - "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi" + "commit": "4cf56affe3035fda364109836e26499431095185", + "sha256": "1i9nqzk6nx4jdcn6q2yj2awb8rskblhnhqmxljd8bfv5s02fqr8z" } }, { @@ -36460,8 +36873,8 @@ "deps": [ "seq" ], - "commit": "6274e6d5391bcdca46164b3238b045ca21c353a2", - "sha256": "0dr52dqxsgswswbkdbv0dax57k41j58n5wf3gny6yz52626kv8n8" + "commit": "911ffb3498e411c538eebce20c6b20b39d725af6", + "sha256": "1b0g9lqg6kmvhvh4a6g6xmag4jmkx3br6b37z8kb7p7x3wb691f4" } }, { @@ -36582,8 +36995,8 @@ "deps": [ "flycheck" ], - "commit": "8b68168db13df4e393d65ca8c0464019dcc45745", - "sha256": "1fiycjznzpv0gm41xx8xgqkzsjg04zgg6v4prlaqx4vfzh069a2k" + "commit": "6b76fa9c43834fabe501c7ab1816797af4e4a7d1", + "sha256": "1l2lv9n159c04rk3z044ib5w1kpgld6j1i63106bmr3za3kkkqv6" }, "stable": { "version": [ @@ -36653,16 +37066,16 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20211231, - 914 + 20220228, + 731 ], "deps": [ "flycheck", "grammarly", "s" ], - "commit": "1352c1d970e42afbbb93d029636e17aa7b921cd0", - "sha256": "0m6zhqm0n3fhni5h7ky18zrcmmw3rwizq6wrpl1cnbyp38vljl7h" + "commit": "2b71f7708798aba0c766768eeb161bd2696d663d", + "sha256": "0vg9gpa4sifzdv6z5ax3cqgmqa1xzaq4g5fqpswsyr55jaxpi5r7" }, "stable": { "version": [ @@ -36784,14 +37197,14 @@ "repo": "DamienCassou/flycheck-hledger", "unstable": { "version": [ - 20210119, - 1000 + 20220323, + 726 ], "deps": [ "flycheck" ], - "commit": "0eeaa707b74f96761404daa2f807fbd7af904b75", - "sha256": "15xwnxvda3kj81q2rm8cz2qj17l9cwjqak4y6v02cv37nax0jmfh" + "commit": "87b275b9b3d476b5f458e85e760f3f7fa3e66775", + "sha256": "0l4xqrjzz2spld624zsnnx7bqsiyqhfd3wixcjh7rjshiaf5vhb5" }, "stable": { "version": [ @@ -37040,8 +37453,8 @@ "flycheck", "keg" ], - "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", - "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" + "commit": "944e36144d92a798e1fd0f3d83fc6347d57a976e", + "sha256": "1flri9jmhhhak2zx46sw86jm05mw4banyk1ag2354v1irsc81piv" } }, { @@ -37081,14 +37494,14 @@ "repo": "emacs-languagetool/flycheck-languagetool", "unstable": { "version": [ - 20211107, - 1001 + 20220228, + 737 ], "deps": [ "flycheck" ], - "commit": "4c22da6aa2878cbf490214b034f2ac25209f0fdc", - "sha256": "07qlaay65gs2v4zbawnfwf5ry2ag9dl0zzjrr8slqk7z6wy2c5wb" + "commit": "018b4e12b9b5e80e0169ce044fb2a898a747bd1f", + "sha256": "0v8wf6jax2gzqrsj8lijybc47bkz665mbw87a73iz6dcmlyrxsmy" }, "stable": { "version": [ @@ -37534,8 +37947,8 @@ "deps": [ "flycheck" ], - "commit": "5331235970e5bc7906e328b07e11ebc95b974d05", - "sha256": "1y54xg9faakcmajc5c0v6i1sq5fjxfhss2lshk895iql78xfjcxg" + "commit": "2d5b72903e69e1e5eec2d03b9006a62fbbf75233", + "sha256": "10s5v97sg0mb8wls9j0vvi626v2ay05f98xjxymfm7n6957k2wm6" }, "stable": { "version": [ @@ -38169,8 +38582,8 @@ "flycheck", "vdm-mode" ], - "commit": "89e7db6ee1a89b8c1f7ce36ce6800c32b5c4ba2d", - "sha256": "1vfqkfw39yg7379s6b28n8nyswv1jq7caljfbnyrndsag6z4j50k" + "commit": "56336930555df91787f196acac15680498d17d5e", + "sha256": "1xp6ngqd67jqrqvr5j9vmffrap6cbyiqbw1hbw8ciz27ivyqz6vx" }, "stable": { "version": [ @@ -38296,11 +38709,11 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20210411, - 2342 + 20220128, + 1518 ], - "commit": "576e7f3e96ef8757a45106346a5f45831a8fee13", - "sha256": "1680qkn6n145ib0q039081k9iwgl81i81d1wmy1myifq8h9pgjzc" + "commit": "ffe905560bb917ae4bbbbb8ad2d7e2c70664225a", + "sha256": "1rk5vlw8c2d0jycp1i7r030gldwg0fikj23fj7z3sw5x254p7waq" } }, { @@ -38375,8 +38788,8 @@ "deps": [ "flymake" ], - "commit": "0c9f3fa273cf1cea8fd64c2b3c20119e2d5c8f6e", - "sha256": "0vw21na55i7fxrls5b3frf2mml7nk8k6y39936r7gbnmn00dcmam" + "commit": "097c8754367f68ea84eac9f5f31664cecb95eeb9", + "sha256": "1nw2lib8c919bwiljqbj2b098frw6ciamyd66ms131pzm633iplc" }, "stable": { "version": [ @@ -38467,11 +38880,11 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20191129, - 1558 + 20220318, + 152 ], - "commit": "6e2d376f84ddf9af593072954c97e9c82ab85331", - "sha256": "1pkigdarkjk2gpqjrfavg68bwihaazjzf1rr9fmrqkgis5hz3zf7" + "commit": "bfcf28259c7d774b259a6ed122f1f0936a5b96b9", + "sha256": "18rvmvaw7jdlrc4xvl9nw9lawwqnd5ahnf7j95qlqfrr3fm2avmw" }, "stable": { "version": [ @@ -38491,14 +38904,14 @@ "repo": "purcell/flymake-flycheck", "unstable": { "version": [ - 20210404, - 2128 + 20220313, + 924 ], "deps": [ "flycheck" ], - "commit": "fd5e801b49a0dd085bc23fd6ea32b0e3be9edea7", - "sha256": "1rvrxnqplwxm2havrsfsv3nrfv0zgz574rh18dkz5ixlbscjcpx7" + "commit": "850a3f2f6908db5d4a3739e385b2c9fb3ad488f9", + "sha256": "1axr0wgmjr58fhhl2zwh5l4wd9x8h66rv2917ynxwq61p955wi87" } }, { @@ -38596,15 +39009,15 @@ "repo": "emacs-grammarly/flymake-grammarly", "unstable": { "version": [ - 20211231, - 914 + 20220222, + 638 ], "deps": [ "grammarly", "s" ], - "commit": "57d6d69b1b55eca484d643d180682a7e683b4b0e", - "sha256": "0a2azplyv9mp6xjjxdff35sz2r65h4svnrrsraib9jvz5hbqmny5" + "commit": "bb8bae85b0cd5a3d4603bbb35f9237bcd83d250f", + "sha256": "1a2mzmgp6sb0wylcasg764rczlqc0nj09wbxdfmdjghdcl679pr1" }, "stable": { "version": [ @@ -38850,8 +39263,8 @@ "deps": [ "s" ], - "commit": "a43fd0d92dbec5f1d4129b30ab0ed917e0864129", - "sha256": "03nfbdjfx5bnv5phs3fcysvfza9lcw32mai1a8gjdmm8p4cgc851" + "commit": "330a277f6469f3382fb758bd19117aa4ca5aabf9", + "sha256": "1sgcws103qbj259zi0qrpn5cgjiab36sl2w2nnfs96bky228byc9" }, "stable": { "version": [ @@ -38911,6 +39324,30 @@ "sha256": "1f4nigl65g1g5w15ddf33ypk2b07xph964pkdq1bw81451vmvzhn" } }, + { + "ename": "flymake-markdownlint", + "commit": "0cdb9c33a827d870da79a63d3c0b923fb5b02073", + "sha256": "1myfk8pk02svr6506ccgs4qhcgq89jhyf91hpwvf1jfc1icr1ph6", + "fetcher": "github", + "repo": "shaohme/flymake-markdownlint", + "unstable": { + "version": [ + 20220320, + 1208 + ], + "commit": "59e3520668d9394c573e07b7980a2d48d9f6086c", + "sha256": "1d51gfk0yw9hxr3i48v7b7g3zh2pdwlygxy2gdcjcy4a4ih1014s" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "commit": "59e3520668d9394c573e07b7980a2d48d9f6086c", + "sha256": "1d51gfk0yw9hxr3i48v7b7g3zh2pdwlygxy2gdcjcy4a4ih1014s" + } + }, { "ename": "flymake-nasm", "commit": "003b8973f810f771da88e30b4aa7457967f21364", @@ -38943,8 +39380,8 @@ "deps": [ "flymake" ], - "commit": "c70eb881d4fb27aeb72c0bf8de6707b9de49bd51", - "sha256": "1w7msjg4sa0h0a4ycl9382agv1bhzcr9z0i6hmhcg7333rd31ilh" + "commit": "dba854423933224f0d983bde8981f7c6b62a7865", + "sha256": "08j9zcj42zxwdlycqcivhh58rr1abafb66vbgcik9h2givnkx2ys" }, "stable": { "version": [ @@ -39032,8 +39469,8 @@ "deps": [ "flymake-easy" ], - "commit": "8e5ab5103c8f40a2ab6c86def6327e480ae93657", - "sha256": "19cggpaj14w3j3q6dgv7ybjqbr2pqbwhingz4yi7wkrr0w6s0lsa" + "commit": "8f6222324e4f205312b51c8a862b24562db0e02e", + "sha256": "1cpfif8v9qrcfiklfy0rvj31f8ixj6npydzkqsn2xjxd8j8266zb" }, "stable": { "version": [ @@ -39171,15 +39608,15 @@ "repo": "mohkale/flymake-rest", "unstable": { "version": [ - 20220109, - 15 + 20220313, + 1311 ], "deps": [ "flymake", "let-alist" ], - "commit": "fd9928801cf601a221cf45508e254f405d19c819", - "sha256": "1paiw6ax6zcqdr2gxj78d8by7glag0nnrp8y489qz6k2y7mwv9s8" + "commit": "6c0f39ae1e8b476b195adfe477b40cf6c4a162b6", + "sha256": "1qmzf49ags9ymdfi7q4mk4amp522ssq2hnrknkrx1sj0lfxkkypw" }, "stable": { "version": [ @@ -39289,11 +39726,11 @@ "repo": "federicotdn/flymake-shellcheck", "unstable": { "version": [ - 20210314, - 2048 + 20220308, + 2218 ], - "commit": "ac534e9ef15c82ac86ae65fe5004d29dbc8c92c7", - "sha256": "04yfb4sy41spjzk9mhm4gy0h8vnjx09p2g6nm1yzgd9a5ph9sqgl" + "commit": "688638177b4e23ecc192975e3062274ca904ada1", + "sha256": "1x5blblaf1h6jz4v6l10w2gy7xkbwzzw2a4s0afdicm0r1wc7v44" } }, { @@ -39373,11 +39810,20 @@ "repo": "shaohme/flymake-yamllint", "unstable": { "version": [ - 20211215, - 1416 + 20220311, + 636 ], - "commit": "22690dd862089f470980cceea06153682a397b7a", - "sha256": "1x3ivvwnbwpsavbypgkh1il7l7vmq8vp4w3y40f60zv3zz06nf16" + "commit": "a93bf9a6697566f0e29fb51a87c5cc7b2a972d2d", + "sha256": "0h1w5b2krdvvr73w2k54bxc3dbgs1kbgb2za0z7wc8w02cl8fg57" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "commit": "a93bf9a6697566f0e29fb51a87c5cc7b2a972d2d", + "sha256": "0h1w5b2krdvvr73w2k54bxc3dbgs1kbgb2za0z7wc8w02cl8fg57" } }, { @@ -39421,11 +39867,11 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20210724, - 1042 + 20220131, + 834 ], - "commit": "2e098db03cba74149257e31213097d043780e80a", - "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -39452,8 +39898,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "2e098db03cba74149257e31213097d043780e80a", - "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -39484,8 +39930,8 @@ "flyspell-correct", "helm" ], - "commit": "2e098db03cba74149257e31213097d043780e80a", - "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -39516,8 +39962,8 @@ "flyspell-correct", "ivy" ], - "commit": "2e098db03cba74149257e31213097d043780e80a", - "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -39548,8 +39994,8 @@ "flyspell-correct", "popup" ], - "commit": "2e098db03cba74149257e31213097d043780e80a", - "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7" + "commit": "e8027a412262bc04056a5b5440efdb7f370c3320", + "sha256": "15db543hnx2m5vcykd13gkxc6j52piyk4jab3wq46223qwpxi0xn" }, "stable": { "version": [ @@ -39893,8 +40339,8 @@ 20170305, 1356 ], - "commit": "a743f80bfd53767ca9ee32da34c5ca032172a480", - "sha256": "1mkyd2bbyd9avw2qaidkzkpv8i7lfiv9189bj49dxklg92823sip" + "commit": "b64edc9f350beef07168621933d3e287bce28434", + "sha256": "1yss4akandva0rg05g6vfwjk3q9yj6p0pg85nq5glv1qxdx1rvxn" }, "stable": { "version": [ @@ -39978,8 +40424,8 @@ 20191004, 1850 ], - "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", - "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" + "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2", + "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj" } }, { @@ -40056,8 +40502,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20220112, - 1745 + 20220326, + 908 ], "deps": [ "closql", @@ -40070,14 +40516,14 @@ "transient", "yaml" ], - "commit": "ab637b74d1a72432bba1f960f30d987a3dc07057", - "sha256": "18689lfsrvr6p11mkqrmkcnf9dmxn6npa4a8q30302hsxls14416" + "commit": "2aaf4462e868acf6eca95e5ca2c3693c3f059c2b", + "sha256": "16d3zcjwxhy18jhgcznwx643v9fc93yxb6fxgkasrzb0dlxrhhwq" }, "stable": { "version": [ 0, 3, - 0 + 1 ], "deps": [ "closql", @@ -40090,8 +40536,8 @@ "transient", "yaml" ], - "commit": "cdf34e7586a2d4edde7a6da38752741080b68233", - "sha256": "15zm5azgl8gyd91i40a00ih4s2iwg1r8007n2gcfnmi6m4b7s0ak" + "commit": "2cecef36f41dfe1edc6078690b0c0d05af6b35f5", + "sha256": "112mghydfzrbiwnzrb2f9d74y6ja702157p66ss94kqps0lj7rkp" } }, { @@ -40126,15 +40572,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20211119, - 1042 + 20220322, + 1003 ], "deps": [ "inheritenv", "language-id" ], - "commit": "6200b91d9151b3177a676d30edd948266292bcc1", - "sha256": "1d3mqajajr1jqkv4rnc3iwfdpipv9lk14hw4g7y8sli17l286k16" + "commit": "eb2a7fa6da15d23b57921218a36ac67d523e81f1", + "sha256": "1lf719fifgaci4hirz1bdnf918ijmkp017ynmlg1gq0lfx7ay7gj" }, "stable": { "version": [ @@ -40557,11 +41003,11 @@ "repo": "rnkn/freeze-it", "unstable": { "version": [ - 20210727, - 1535 + 20220301, + 148 ], - "commit": "151d264a0d0593b413b5a984b391023e905a190b", - "sha256": "04cv6p9df7h6w9h2ina3y3mmkp0y1rs6d9wmzari0cbm7q50hz4l" + "commit": "ad92e33a7ebd860905da60d194833516bf61cbf5", + "sha256": "0gvc6f8jdvrfwhm5rlvrjd6lbvw1j84z3pwcfajpgyr1a5y6gx49" }, "stable": { "version": [ @@ -40590,8 +41036,8 @@ "friendly-tramp-path", "with-shell-interpreter" ], - "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", - "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" + "commit": "e530e359848e8bdad09d26529f17eb25e5558b3e", + "sha256": "0n4p0682k6q7p4kn8khb87zbaa9by36gr7iz218p1bnv3v8c42b8" }, "stable": { "version": [ @@ -40617,16 +41063,16 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20201212, - 2302 + 20220309, + 1711 ], "deps": [ "cl-lib", "dash", "with-shell-interpreter" ], - "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", - "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" + "commit": "e530e359848e8bdad09d26529f17eb25e5558b3e", + "sha256": "0n4p0682k6q7p4kn8khb87zbaa9by36gr7iz218p1bnv3v8c42b8" }, "stable": { "version": [ @@ -40658,8 +41104,8 @@ "dash", "with-shell-interpreter" ], - "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", - "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" + "commit": "e530e359848e8bdad09d26529f17eb25e5558b3e", + "sha256": "0n4p0682k6q7p4kn8khb87zbaa9by36gr7iz218p1bnv3v8c42b8" }, "stable": { "version": [ @@ -40753,16 +41199,16 @@ "repo": "waymondo/frog-jump-buffer", "unstable": { "version": [ - 20210906, - 1634 + 20220129, + 539 ], "deps": [ "avy", "dash", "frog-menu" ], - "commit": "387fa2a61a9e4b50701aece19dd798361f51d366", - "sha256": "104nhnix34ymkkgdvxn612d1k4iy95swrmb5isknd48c5mys94gq" + "commit": "d82cc1a449d368f5a3dac61695400926da222a84", + "sha256": "0c8x5a0rlyys8dqxsliy4m35c338srffl5387bmyzj68dj43vbfh" } }, { @@ -40773,8 +41219,8 @@ "repo": "thefrontside/frontmacs", "unstable": { "version": [ - 20210515, - 1811 + 20220315, + 1057 ], "deps": [ "add-node-modules-path", @@ -40782,12 +41228,13 @@ "flycheck", "js2-mode", "js2-refactor", + "lsp-mode", "rjsx-mode", "tide", "web-mode" ], - "commit": "315d23d23b32f413ea5a4dcc6f4e270b7bef7b67", - "sha256": "08bhsad0fmlydl47iaqj10j1r815qiy3jnm29sk5v5xjzrpby65k" + "commit": "18816534a977fbd28848389b58c22b6538cfdeec", + "sha256": "1nhsjkp0dm9875a1w86vvfwd1gsssvcmk144wvflvw40br9ss7h1" } }, { @@ -40894,8 +41341,8 @@ "deps": [ "cl-lib" ], - "commit": "287587048730ab0e33c8682d381967e785fff74d", - "sha256": "1njg1lnyhjlmywbfandlqq6xf17hk9jlpg9bf8zd89fvrn7dxrk9" + "commit": "cd194eebbf3bfc8ab795b41f99613faae342df34", + "sha256": "1qj9wvggyakp0v1yyr2fkj13ddgjj67g0fad2yk1xma44d454xfm" }, "stable": { "version": [ @@ -41048,14 +41495,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20220104, - 1200 + 20220211, + 1009 ], "deps": [ "cl-lib" ], - "commit": "ea4b26bc5fbc074a011918172ea0c624a81c8092", - "sha256": "1i4gdascsjpvvks61wwwv0qmw0nbj6jy0slc95jymd2vnyz1p715" + "commit": "03c6ab09c8a580aaaab89709edcd999e66fca0e7", + "sha256": "12rf82ijlisvksq6jvkzgd73y3vgiwmprxfjssjzz8p5myp0m42i" } }, { @@ -41093,8 +41540,8 @@ 20211231, 1837 ], - "commit": "f63d6279a781cf9f33dd2f22826788d98d475961", - "sha256": "11dj0qg2411r2nby2nzi1i4s2v5wnz4594cl5c8gq9hws7cmp6q2" + "commit": "9c500225fc1e084935f4865e2117acef8e30c5f5", + "sha256": "1y7439ipgpj57asmxhdgnkjyakh7ijj2242al5ljpswqmb5404kk" }, "stable": { "version": [ @@ -41479,11 +41926,11 @@ "repo": "avendael/emacs-geeknote", "unstable": { "version": [ - 20160717, - 1249 + 20220213, + 612 ], - "commit": "8ed607c76864afcc9c338972ab093caf4501cbf8", - "sha256": "1dadsyvkzf0rg6immjdjkb0k7iaqh3hm1w9qhap94j54j7v75w2q" + "commit": "ce2738aebeeda35f9d31027e9b7bad0813b975c3", + "sha256": "18z0m2qlsr9bs1m5wp88p7snd25wxz8i829z8ybkny6ax1vfi0y1" } }, { @@ -41494,25 +41941,28 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20220118, - 2341 + 20220324, + 51 ], "deps": [ + "project", "transient" ], - "commit": "0f2cb17dd6cad1eb5c1447a1b5f80c933309a153", - "sha256": "11sl3bbnx10yjndszhr4fk3asjyz27fxf7igh2vi7vmahby52ckf" + "commit": "cbfab92584072ba0e1c4119612a8438db61ecbf6", + "sha256": "1gxa5ba5n7k169klg3zyrl8ywyljmcp006x2fql3s7awz0c98rw0" }, "stable": { "version": [ 0, - 22 + 23, + 2 ], "deps": [ + "project", "transient" ], - "commit": "e204771601e5c985bb0d6b373666be4bc22582f9", - "sha256": "0rg15hhf0yzcacyk1bx93fn4g60vgnzyi0a677dqgm240dasp02g" + "commit": "bc0dde310492de733f9ec528d7aeddd57093d05e", + "sha256": "1gxa5ba5n7k169klg3zyrl8ywyljmcp006x2fql3s7awz0c98rw0" } }, { @@ -41610,25 +42060,26 @@ "repo": "emacs-geiser/gambit", "unstable": { "version": [ - 20211204, - 1940 + 20220208, + 1356 ], "deps": [ "geiser" ], - "commit": "faff8bac11621228640a3107622fe23df4bb6e2c", - "sha256": "1v736wh19yma3vjpgb2s1n77rrl5i3n8x451kq3cadsch0wid31d" + "commit": "381d74ca5059b44fe3d8b5daf42214019c6d1a88", + "sha256": "1dcrhm1am2dam94a0m7pjkiygah1lw53y2hq0870x1ji4gzgnkl8" }, "stable": { "version": [ 0, - 17 + 18, + 1 ], "deps": [ "geiser" ], - "commit": "faff8bac11621228640a3107622fe23df4bb6e2c", - "sha256": "1v736wh19yma3vjpgb2s1n77rrl5i3n8x451kq3cadsch0wid31d" + "commit": "381d74ca5059b44fe3d8b5daf42214019c6d1a88", + "sha256": "1dcrhm1am2dam94a0m7pjkiygah1lw53y2hq0870x1ji4gzgnkl8" } }, { @@ -41665,26 +42116,26 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20220113, - 2232 + 20220323, + 2352 ], "deps": [ "geiser" ], - "commit": "de2260883726d23eb964050797fdcf48655f0dc4", - "sha256": "0fk5rr7mjmb4waiagi80dhddas5mrsgqr0flag5v5b0piblixxq6" + "commit": "c641fcc50b6b86ca95743122b5206cdcd475f96e", + "sha256": "18m5ldj4r4c2hxgvv5b4azl90r8az1kn5f3s913h971asyv4wx06" }, "stable": { "version": [ 0, - 21, - 1 + 23, + 2 ], "deps": [ "geiser" ], - "commit": "de2260883726d23eb964050797fdcf48655f0dc4", - "sha256": "0fk5rr7mjmb4waiagi80dhddas5mrsgqr0flag5v5b0piblixxq6" + "commit": "c641fcc50b6b86ca95743122b5206cdcd475f96e", + "sha256": "18m5ldj4r4c2hxgvv5b4azl90r8az1kn5f3s913h971asyv4wx06" } }, { @@ -41985,16 +42436,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20220109, - 2053 + 20220323, + 1105 ], "deps": [ "dash", "magit", "s" ], - "commit": "86b996061503aa7811d48fe27081bdc33afacb99", - "sha256": "0p9nhq5sv55dgrav9sjv335wwq2x9gbgg0qcji9qrc75r0b261rn" + "commit": "b7603d14f3869e1fba6265bd8255469a47be7357", + "sha256": "1hshq5bv3cmd04mkq8lckk9cnmjlhb4l34wapgpqrsyhfnz18zxw" } }, { @@ -42104,16 +42555,17 @@ "repo": "sigma/gh.el", "unstable": { "version": [ - 20201222, - 438 + 20220302, + 549 ], "deps": [ + "cl-lib", "logito", "marshal", "pcache" ], - "commit": "4b2dd0667ebe9c684c1de5bc96961c2ab0885c07", - "sha256": "11qjlwsiicnmgcy0yvpvagpcl31rrv5qzm18hlh16cyis4z3vngi" + "commit": "27ccc892e94f7e747e5b879eec71119965d9ed6e", + "sha256": "0biljpqw14kjv0njyrahfdgglaphghva0kpfjhiprfwbd0rmmi1k" }, "stable": { "version": [ @@ -42138,11 +42590,11 @@ "repo": "emacsorphanage/gh-md", "unstable": { "version": [ - 20151207, - 1740 + 20220316, + 1432 ], - "commit": "693cb0dcadff70e813e1a9d303d227aff7898557", - "sha256": "0g3bjpnwgqczw6ddh4mv7pby0zyqzqgywjrjz2ib6hwmdqzyp1s0" + "commit": "e721fd5e41e682f47f2dd4ce26ef2ba28c7fa0b5", + "sha256": "1xnfq6bbc5bgkd0mzkr7r66sd85qfn859swpsp6sr0xfl8cq12wm" } }, { @@ -42284,28 +42736,28 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20220101, - 1019 + 20220325, + 1028 ], "deps": [ "let-alist", "treepy" ], - "commit": "d36c2b2419b04d7bc559756d37d39d615add6395", - "sha256": "1029yzlimcbsxybwbajswh6ihy81wh4c7vbycnx2kzm7kjz4k4wv" + "commit": "fdf2e5bb9ba34216d6a76444c1889863db447b29", + "sha256": "03c1934gck19gmhmy1cv3m2fma7f9pxi9l7p1pcz7iy1x6cyi6bm" }, "stable": { "version": [ 3, 5, - 4 + 6 ], "deps": [ "let-alist", "treepy" ], - "commit": "192eff9da2c0f61813f3bc9c00913985c1804180", - "sha256": "1bc5z63ylb0ir5v9qngyl50svmlfd6hx9lv1ladwywncdpsslls8" + "commit": "2e1cf8c1410be8b1d5a81bff1cfac70a3f621b92", + "sha256": "1pw1rjrvvanlcxv3rb64s2p646zfaipp7h7v8djlrrnlgy6mwbqd" } }, { @@ -42650,16 +43102,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220101, - 841 + 20220222, + 1036 ], "deps": [ - "dash", "transient", "with-editor" ], - "commit": "2a7812705f5cf4b864bb162576415863f4116285", - "sha256": "02rnk0c3yc5ws7phiywkmak7d3zi9w4krxqalzbdhj22nhh0l7pq" + "commit": "b1702991eec2c068d282fc2f1bd665726a14e10d", + "sha256": "0gyvbhwm5x7wgm4cdp3v0h8vv5vkw066fmwsvlvgyqqppkq5pqz3" }, "stable": { "version": [ @@ -42756,7 +43207,7 @@ 20211222, 913 ], - "commit": "9174c74cd607e297d7f14c0595d4c20ebb53847d", + "commit": "abe65ed3937fe038123549b948f37a3bbf1c4029", "sha256": "1jkhvxlk4lkfjgd5vlfjy8z7w6n7j91rxqr48ricyzzl62p4v2wr" }, "stable": { @@ -42943,20 +43394,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20211208, - 312 + 20220217, + 2315 ], - "commit": "09961648e654ba0f7239eedf5cbaea0f0cc0ccf1", - "sha256": "0zwbcp2881n92nd0y40sw6id6qbidprzr0bsh9vn64gmvch6jlnd" + "commit": "f5691f8c66eb0f6050d9ab3834ab32661244b378", + "sha256": "1ifq9z4p0rbz2bpm6qz89xg5ycn5fflsyradzzxzsgyys0zc6szx" }, "stable": { "version": [ 0, 8, - 3 + 6 ], - "commit": "f76bffd42fb4ed8ffe09d48c084f6577b0b99fa6", - "sha256": "0l7xmvmj5s93hc39wjjv75f22zbhahnmcxpmvx3dfvsbig9pmk75" + "commit": "f5691f8c66eb0f6050d9ab3834ab32661244b378", + "sha256": "1ifq9z4p0rbz2bpm6qz89xg5ycn5fflsyradzzxzsgyys0zc6szx" } }, { @@ -43078,14 +43529,14 @@ "repo": "pidu/git-timemachine", "unstable": { "version": [ - 20210528, - 908 + 20220324, + 1057 ], "deps": [ "transient" ], - "commit": "3381797bcbf906b18dff654a2361032d2d01b4a3", - "sha256": "05pyjhi26charkjy0mhvigd72rvb4s1s8imycfynf0fmjy7f7n7x" + "commit": "ca09684e94767cc0b2339b77b778b4de4f9d104f", + "sha256": "13zs30sr8fkxar883va9xbfcl27m7jf02g63rq09gccjfw670r7z" }, "stable": { "version": [ @@ -43253,11 +43704,20 @@ "repo": "Justintime50/github-dark-vscode-emacs-theme", "unstable": { "version": [ - 20211122, - 1800 + 20220313, + 2033 ], - "commit": "092324ecb9c0909da2ba2751cb21a994b4e09536", - "sha256": "1zr116c9zphm5kgacqxmll7gzd1h5583xy0asg46dzyn4gn0bmhv" + "commit": "2123bcd08fe42094b07180632be2cd2af606ee21", + "sha256": "1n41px99cs6q53lfs2dn9h7ml6hc4yz7mbjlg30hp4l8a3j74lz3" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "commit": "2123bcd08fe42094b07180632be2cd2af606ee21", + "sha256": "1n41px99cs6q53lfs2dn9h7ml6hc4yz7mbjlg30hp4l8a3j74lz3" } }, { @@ -43302,23 +43762,60 @@ "repo": "TxGVNN/github-explorer", "unstable": { "version": [ - 20211216, - 749 + 20220305, + 1450 ], "deps": [ "graphql" ], - "commit": "069e25c3e72290adc5d32c380999840ba42ccd78", - "sha256": "1c8hsh2jb9670dwhnrcyk1jcbkji1zrgr5g9ra170ya5gi16cann" + "commit": "49e5c350169b556deaabdcb67e9440bd4d5b4f8b", + "sha256": "08d2s9a8sa6r67dirj5nn1hi1k5hivsjm4yz5gawww30v4w6cwil" }, "stable": { "version": [ 1, - 0, + 1, 0 ], - "commit": "e6bdc500dd9b580ed12a54d18600f5db541b38b8", - "sha256": "1a9hnmx1q7fxyyxn0ji2mcam6wz8rwxi7a71f5542l65ah20gg1r" + "deps": [ + "graphql" + ], + "commit": "d7198dd81afc4ee2001606be821707a9ff4f31da", + "sha256": "0gjzm4h813b065nvf4hvfji67jvygvfgzv5yhmpw5ddj1h6rz43m" + } + }, + { + "ename": "github-linguist", + "commit": "8876af18b9e797ab7521a087278a046e0cecb7bc", + "sha256": "0r77axj20qf4x2gf1c0n5xfia7sfyir9cm5kwkn85w4bgb2179dd", + "fetcher": "github", + "repo": "akirak/github-linguist.el", + "unstable": { + "version": [ + 20220324, + 548 + ], + "deps": [ + "async", + "map", + "project" + ], + "commit": "6e3fc58a465e6726dcba6da038f959028c62223b", + "sha256": "1zli3xzp44c61jrg0fn7h39ianxjp2r24sswm3i99hnx052pp8fp" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "async", + "map", + "project" + ], + "commit": "6e3fc58a465e6726dcba6da038f959028c62223b", + "sha256": "1zli3xzp44c61jrg0fn7h39ianxjp2r24sswm3i99hnx052pp8fp" } }, { @@ -43718,14 +44215,14 @@ "repo": "xuchunyang/gitter.el", "unstable": { "version": [ - 20180122, - 856 + 20220316, + 138 ], "deps": [ "let-alist" ], - "commit": "11cb9b4b45f67bdc24f055a9bfac21d2bd19ea1a", - "sha256": "14ri86kxqz9qfhcr0bkgfyggy4bgg9imk9akhw6dfzqkl90gn2gy" + "commit": "49327c91eb50cfea633af8fd32b0643691d75cb7", + "sha256": "0m8np2pxmgziirmprs70jbflilc98b7zlx1g07i6mhp39xw1sx98" }, "stable": { "version": [ @@ -43746,15 +44243,15 @@ "repo": "Kinneyzhang/gkroam", "unstable": { "version": [ - 20210914, - 1311 + 20220326, + 521 ], "deps": [ "company", "db" ], - "commit": "a9c9034a8fa3c08ec3097ae40e227d400d766db9", - "sha256": "1fc8srqvygiv3h2hw31vy20ip6kbm2m1aq5imx01fw9qig7xfv47" + "commit": "38f517ac2894b16e6cf983b93ee96762fffa152a", + "sha256": "1ag1cpyljid237ki91zq68chyaalskibadz7af3abaa00d4lvf9v" }, "stable": { "version": [ @@ -43902,11 +44399,11 @@ "repo": "cute-jumper/gmpl-mode", "unstable": { "version": [ - 20171031, - 2054 + 20220121, + 631 ], - "commit": "c5d362169819ee8b8e8954145daee7e260c54921", - "sha256": "00p2z6kbyc0bas21d1zygx7z49w6mf22y9kf1rcm9gqsnnadb4j9" + "commit": "97b103eea8b18f7e27b0f0be6cb4809a4156c032", + "sha256": "1592sn1wzlmg65wc05103dyklprrwn048qgfhlims9618zapk5yr" }, "stable": { "version": [ @@ -44061,17 +44558,17 @@ }, { "ename": "gnuplot", - "commit": "be594de074dc3513c773d78c38e823be53061612", - "sha256": "1cz3db40r72cfqazg0w85fx5249d98wkxvjjjcn8dhwnmqymqigi", + "commit": "f623c44a97048249e88401d9d75378ca0cce4ef2", + "sha256": "1n349cx2qv8j549ljiivq62agylb3rd1cxif7qprdz1js9c4c40j", "fetcher": "github", - "repo": "emacsorphanage/gnuplot", + "repo": "emacs-gnuplot/gnuplot", "unstable": { "version": [ 20220102, 1637 ], - "commit": "d1a6a606dcb389a7c91a6b0d9fb995434df561be", - "sha256": "1p1nbgr4ffpp7plllsimshjr9ykcz27afz6fq1xqpnbslryi0bag" + "commit": "57be3c7addec31e226a5a27aa553e996f9c684e3", + "sha256": "04w11gsg91mvr2bpa70rip8rn6ir9wmgpj6078hlx4dhx0fj7c00" }, "stable": { "version": [ @@ -44192,11 +44689,11 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20210920, - 902 + 20220324, + 2011 ], - "commit": "dfa0e687601e78d6be82530413cb00edb1a39889", - "sha256": "021rq3qp3544abqzr8cdsblpqh8yh2ss3f9gsf5sifckz7127h0s" + "commit": "a0ace8ea6e62a6b79a18149fbd560c6948a8103b", + "sha256": "0z1ad57kb0xbm8568cs6wwsgv9zbzs0skjvc12y83j5say3gwlgy" }, "stable": { "version": [ @@ -44414,26 +44911,26 @@ "repo": "benma/go-dlv.el", "unstable": { "version": [ - 20211015, - 816 + 20220126, + 1436 ], "deps": [ "go-mode" ], - "commit": "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b", - "sha256": "1h4p0i13fxsr4rgxh4grn5p24sbwb9c6mszwdajnlf8yjz65prf9" + "commit": "0a296bc3b7b4dcf0c140a78c5ca3e1a8c6b7ea1a", + "sha256": "0dql0c272n6zmfgbk30abipkhhdfncm4kj6wb9pslfi4fmrk7czq" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "go-mode" ], - "commit": "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b", - "sha256": "1h4p0i13fxsr4rgxh4grn5p24sbwb9c6mszwdajnlf8yjz65prf9" + "commit": "0a296bc3b7b4dcf0c140a78c5ca3e1a8c6b7ea1a", + "sha256": "0dql0c272n6zmfgbk30abipkhhdfncm4kj6wb9pslfi4fmrk7czq" } }, { @@ -44912,11 +45409,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20220114, - 328 + 20220321, + 210 ], - "commit": "8b635f07b3b77e84999eeea75b194d95b6457561", - "sha256": "06la461j3zv460dkyc2mhab3ha9zyb6wim3m4sms84dj2ifnzljf" + "commit": "2616a4c2e26827ecba0f2576d26b01a63546b452", + "sha256": "00bs8alcd2hj4c2yz1m6h1h0zddy9vicmhvipz5q1lsmnbaamwmr" }, "stable": { "version": [ @@ -44998,11 +45495,11 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20211031, - 1513 + 20220222, + 1514 ], - "commit": "3e48a56356991b3ff5228eced19b07862835cdcd", - "sha256": "0mkbra0a14rxh0716m6zxlkx05rhq1fn6n3yry29wwiabxa3w8ab" + "commit": "5d10b00b5f4ee686683c48804235f62d644ae2ef", + "sha256": "0q7vnvqr9283wg0gj7cwn8b540syhzyibjkhv3h81qi3cwk5a5fy" }, "stable": { "version": [ @@ -45071,20 +45568,20 @@ }, { "ename": "goldendict", - "commit": "af87026905478d9134a4a036e792f6afd9c10768", - "sha256": "0zvrlz169pg9bj1bmks4lh5zn8cygqzwiyzg49na2a7wf2sk9m1f", - "fetcher": "github", - "repo": "stardiviner/goldendict.el", + "commit": "e86bb7d511a5228c1e87d900993a2747b418bf03", + "sha256": "1hmycq4sv2pkjgqpryv7wd9zy5v4igbfz7d8ap4ah6g2v1r7jdxr", + "fetcher": "git", + "url": "https://repo.or.cz/goldendict.el.git", "unstable": { "version": [ - 20201108, - 201 + 20220210, + 1401 ], "deps": [ "cl-lib" ], - "commit": "700f60be192f4d46787e7f009637c15567064f2a", - "sha256": "0nn7ilprx465r5yx0q11vghq3cv0a269jzz3q1p1vwllwfj0f31x" + "commit": "f3fbe658a8d31dc1bd0ca69e4d2ebaab59e92791", + "sha256": "0x38j3wpyaxggihkw3g1qcf0phfrcic555xyqy3vskhvvf5xgc5v" } }, { @@ -45182,11 +45679,11 @@ "repo": "google/styleguide", "unstable": { "version": [ - 20180130, - 1736 + 20220210, + 1659 ], - "commit": "e6233c7428f061498e71827ccefe9d0c72084ad5", - "sha256": "0bx6rhmg2wii2kmf5lq1zbzqizlkff80iz8mjkkr8z6vq2iibf6w" + "commit": "af78b49ac4fef8083094d5105f72528ee7d09073", + "sha256": "00vryh0h5sc72f49172nxnxwkphw811k58ivkmal97zd2v3m6w7g" } }, { @@ -45349,16 +45846,16 @@ "repo": "nlamirault/gotest.el", "unstable": { "version": [ - 20210221, - 1905 + 20220209, + 1739 ], "deps": [ "f", "go-mode", "s" ], - "commit": "c9ccffd7dbb47274003d0bb1d0b017552b875109", - "sha256": "1y3n78q1ww1mqyrnnlrd2cmwh1lg2qlb1g4gpn7jm7bdn9h9dq2b" + "commit": "78be56c0f210224b1e3a7d58239e2a32f8f84bf4", + "sha256": "0xkvw0wy4p8viib2s7anh322lvwm8p30g4hsjr9x0j8sqiq838ds" }, "stable": { "version": [ @@ -45410,8 +45907,8 @@ 20210323, 332 ], - "commit": "08ac17dee21739edd16606273c35bc83de75fc7c", - "sha256": "0iwidx21lsrncz4kcd6zvpkx4ksmwrn7hp4p3lma62qw0327yh71" + "commit": "573a53f070c71e02d89866f4cdc2ba5ccdc9cecb", + "sha256": "1am0l056dyi71wwzv7viigia9qybdh9b19w4ql1fkrr80zr5m0v3" }, "stable": { "version": [ @@ -45497,8 +45994,8 @@ 20210323, 422 ], - "commit": "67e3d3d649240c048f4088bd9e18f614218c9fe7", - "sha256": "0zchmlngw4pjdfdfb7zj42vh3ngphc8d8436n8is9dd09f26l7y9" + "commit": "27fcc9e7062c9d672a513ba306fd32f7736dab78", + "sha256": "1zmpmv7121cv2v5sm3pg5jz7rfhikj8351isx2qa2z165b3ixssz" }, "stable": { "version": [ @@ -45527,14 +46024,14 @@ "magit-popup", "s" ], - "commit": "e4049844d2bd47baca207a87f49063255221f503", - "sha256": "05mmxdyvxdwfpmvwmijvxklqr47yvm6mlypcbi8vxbrcmvm8p5x4" + "commit": "fcb4f7ccee1a01bd759c3d4e7331d40c61a1feca", + "sha256": "1qdlmj8gpsc5365kplm0wif93y8bwfnya47y013nqjk748ins8vv" }, "stable": { "version": [ 0, 27, - 2 + 4 ], "deps": [ "dash", @@ -45542,8 +46039,8 @@ "magit-popup", "s" ], - "commit": "f04d77d687dcd5f2dbc546a92ab46a14b5c00d84", - "sha256": "1ig7ss0i4r7nsj1qffanlky17lka7328zx6386li0jikfz34jffv" + "commit": "285e80cd79d6daee7d5f0ac9555d885f368346f0", + "sha256": "004r3n3y019zvds45h6gk49gailvdy77ql49cmryajd2cifmw2sz" } }, { @@ -45702,8 +46199,8 @@ 20160504, 911 ], - "commit": "02670e1401c070e6ae3f50a8d79b210ca4f3a0ee", - "sha256": "13xlpmp2d96a9hzcwmyl6r9acmqdnvxfa239h00xn8ak0xpr17c0" + "commit": "bf732d367b16887f81d404481c11ed1a58671d4e", + "sha256": "1w7ly961mqb1396653ali52h0311f0dz3pbmlaxml67dshidjjci" }, "stable": { "version": [ @@ -45754,16 +46251,16 @@ "repo": "emacs-grammarly/grammarly", "unstable": { "version": [ - 20211231, - 919 + 20220222, + 638 ], "deps": [ "request", "s", "websocket" ], - "commit": "ed552610a59fdd2f8fe5bcbf50e3ebc3b5d383f7", - "sha256": "0jr1dxpsp33zi744rsk2djnix5lyqy8qfiqi9nyb37vzffpzdpgi" + "commit": "067c58d79a90071a0d70012fa1722c5c79abdc01", + "sha256": "1w3mj1izjs0y7xpbpy7vrkj7ljpbiz7ivkv4h17847q6w79y92wa" }, "stable": { "version": [ @@ -45956,11 +46453,11 @@ "repo": "ppareit/graphviz-dot-mode", "unstable": { "version": [ - 20220117, - 1537 + 20220309, + 1336 ], - "commit": "a1b7d66f5c20404a1e59c2ee5e841022622535b8", - "sha256": "1xzpj81zzasj4ys9zypl4svgcikz4d32fvmzxdp8gq67bkwdlb6h" + "commit": "6e96a89762760935a7dff6b18393396f6498f976", + "sha256": "04p8x4lwbp2qwlsr5xlzjn3a25bg0rsnk3nqfvvz66zv0srz62mn" }, "stable": { "version": [ @@ -46172,11 +46669,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20220104, - 1419 + 20220323, + 1519 ], - "commit": "9220a560b4ac8431067be9c25a4c7f19075dc525", - "sha256": "0vq5nj4a6v7736lif992c3pdrpflp6p3y4x9l96qhi5fvbga7pfz" + "commit": "3b06e0f594efc5d835eb30a4b89ad951e7b4d7a1", + "sha256": "026r6wh0plpwb6ag05ysfhcsw7l4001xwb7wqw1xchxh7jhvpmdy" }, "stable": { "version": [ @@ -46255,15 +46752,15 @@ "repo": "Groovy-Emacs-Modes/groovy-emacs-modes", "unstable": { "version": [ - 20220108, - 555 + 20220212, + 646 ], "deps": [ "dash", "s" ], - "commit": "02670e1401c070e6ae3f50a8d79b210ca4f3a0ee", - "sha256": "13xlpmp2d96a9hzcwmyl6r9acmqdnvxfa239h00xn8ak0xpr17c0" + "commit": "bf732d367b16887f81d404481c11ed1a58671d4e", + "sha256": "1w7ly961mqb1396653ali52h0311f0dz3pbmlaxml67dshidjjci" }, "stable": { "version": [ @@ -46468,15 +46965,15 @@ "repo": "kaiwk/gsnip", "unstable": { "version": [ - 20200928, - 357 + 20220206, + 1526 ], "deps": [ "aio", "log4e" ], - "commit": "c8bff61b10cd33de9d6f5fd84e4b27f48c772304", - "sha256": "0lw1psy1258vbvnl4j918hkzwqa65g94azbq84fvf2lgv4lbvgln" + "commit": "4d473b726b3f3b6bb7d1b5f66a9d368588ce0f86", + "sha256": "1slnvkpzhzffvnwyqr5bjgw84j0rapwr7mnaky9925l0rrv3fz6h" }, "stable": { "version": [ @@ -46795,14 +47292,14 @@ "repo": "abrochard/emacs-habitica", "unstable": { "version": [ - 20201210, - 1933 + 20220215, + 1758 ], "deps": [ "org" ], - "commit": "eeb0209fd638192f0b833526deb222f9f61361cb", - "sha256": "10z24hh1g9bf00maiwkjs324da55qqzxrz196rzs53i8lkli0xkd" + "commit": "9e1fde7f359f7f6a6976b857fbbdbc8dd4fd3327", + "sha256": "0xi0yvm4v2mjyml44jbprdl9lza7lhxmf2j177nbgvn8zgfjc7ac" } }, { @@ -47135,6 +47632,25 @@ "sha256": "0j9z46j777y3ljpai5czdlwl07f0irp4fsk4677n11ndyqm1amb5" } }, + { + "ename": "harpoon", + "commit": "1b8efde9e17f716c518a0cfe8e65ba57cf662b48", + "sha256": "006b5919zdjbzfl0jdagnmalz5zapp4bj9l2fxphzn6isyw807r0", + "fetcher": "github", + "repo": "otavioschwanck/harpoon.el", + "unstable": { + "version": [ + 20220301, + 607 + ], + "deps": [ + "f", + "hydra" + ], + "commit": "331eea2ed64e34cdbea024fa0fd6ba930b60d95f", + "sha256": "0clfdvsw08hb68iq9rhhlfb8rzp1dd81yx5k0d7zs0nqbldr71av" + } + }, { "ename": "harvest", "commit": "c97d3f653057eab35c612109792884334be556fe", @@ -47261,11 +47777,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20210908, - 1543 + 20220324, + 1803 ], - "commit": "8402caa341d90b4236f5c0a802751f9023ccfbe7", - "sha256": "05pp38r8gb94w8gxnm3rkrawa7d73538lpz7lwccmlr83pvpl0cb" + "commit": "b1505b727b1fb8ae352e59dc90ec6dd05369ce32", + "sha256": "1a2znlg42jg5v2ml1n6a5chrh4365kppfrrd2y6f8rk4x6jwr6mx" }, "stable": { "version": [ @@ -47431,8 +47947,8 @@ 20210108, 1835 ], - "commit": "6057c05154464bfb88d2ba119cdc8d4c7e767541", - "sha256": "0z1lpsvmkcxs3gcxkmi1vjgfa7wdfa42cp2i9rl2i17jq34j37yb" + "commit": "b6daf4c8bfd7fa6ba7b4bdbfe03c0be7704add04", + "sha256": "0g4xp5z6wqhfivyls6asjnqdxmafbyl24fvcqk2s5zd9j94x6649" }, "stable": { "version": [ @@ -47565,36 +48081,34 @@ }, { "ename": "helm", - "commit": "7e8bccffdf69479892d76b9336a4bec3f35e919d", - "sha256": "03la01d0syikjgsjq0krlp3p894djwfxqfmd2srddwks7ish6xjf", + "commit": "38cea79ddef23a10098b5f3f8509e5be1e59536c", + "sha256": "032ypri8p6q1xz65imd89xizm4gzxkg62zaqyyv5pb2kbbv1y2b0", "fetcher": "github", "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220114, - 1641 + 20220319, + 1850 ], "deps": [ - "async", "helm-core", "popup" ], - "commit": "837e5b8c99715791023dd47911f5f280808cb3c4", - "sha256": "17gb25yk04cc7vnpw9h3pj99bj1al9m1lw20gidg0mvdbq09sypz" + "commit": "5e035c9193bf1e1d4bb709794a154957544dcfc7", + "sha256": "1my6c87ia7h99dbbbw1yxcmgacwss1j36rf3swn3k2ab6k34hsf4" }, "stable": { "version": [ 3, 8, - 2 + 5 ], "deps": [ - "async", "helm-core", "popup" ], - "commit": "94cf15d64bd1dbc7dc3194ab323e0f0ef263ea77", - "sha256": "1xkxlbjpqhfhakmfi664cq7i5968941vpngq94napmhbgqydp4qn" + "commit": "5e035c9193bf1e1d4bb709794a154957544dcfc7", + "sha256": "1my6c87ia7h99dbbbw1yxcmgacwss1j36rf3swn3k2ab6k34hsf4" } }, { @@ -47680,8 +48194,8 @@ "deps": [ "helm" ], - "commit": "7cfed5d3e861717466ae6d3f76c759548a9fad04", - "sha256": "0j1l9ifssd2xmdiif0c922dsdii143kjp8ifygqigb9m4wbsz8ax" + "commit": "9109208978bc739fb8fdae760abcea4225048dd1", + "sha256": "0cm1r1qmmmvdmr0sshsndvi9s99n52y4nkirq7cs8alg86iyiyrk" }, "stable": { "version": [ @@ -48473,32 +48987,32 @@ }, { "ename": "helm-core", - "commit": "ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7", - "sha256": "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda", + "commit": "38cea79ddef23a10098b5f3f8509e5be1e59536c", + "sha256": "11h7fl7kisjzwpmwiaqjg2773jpif874w2wwk0n5jqvinpxyijmd", "fetcher": "github", "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220104, - 1344 + 20220319, + 1850 ], "deps": [ "async" ], - "commit": "837e5b8c99715791023dd47911f5f280808cb3c4", - "sha256": "17gb25yk04cc7vnpw9h3pj99bj1al9m1lw20gidg0mvdbq09sypz" + "commit": "5e035c9193bf1e1d4bb709794a154957544dcfc7", + "sha256": "1my6c87ia7h99dbbbw1yxcmgacwss1j36rf3swn3k2ab6k34hsf4" }, "stable": { "version": [ 3, 8, - 2 + 5 ], "deps": [ "async" ], - "commit": "94cf15d64bd1dbc7dc3194ab323e0f0ef263ea77", - "sha256": "1xkxlbjpqhfhakmfi664cq7i5968941vpngq94napmhbgqydp4qn" + "commit": "5e035c9193bf1e1d4bb709794a154957544dcfc7", + "sha256": "1my6c87ia7h99dbbbw1yxcmgacwss1j36rf3swn3k2ab6k34hsf4" } }, { @@ -48662,14 +49176,14 @@ "repo": "emacs-helm/helm-dictionary", "unstable": { "version": [ - 20201006, - 1511 + 20220319, + 955 ], "deps": [ "helm" ], - "commit": "b316a1d55e58645d59a84d33851d46fab3cd54b5", - "sha256": "0rggi6jd5f6dp50d08k9xba470drlhg9qa5a0y3cy4y2nlq0y7rn" + "commit": "69f1e5bf03d67c9e5cb0065e702e8c311ac9d3db", + "sha256": "0haq758rxayl4qwyxm44w7mq1s5g0gpfxspd0q9c546qvws4kwrr" } }, { @@ -48717,8 +49231,8 @@ "cl-lib", "helm" ], - "commit": "281523f9fc46cf00fafd670ba5cd16552a607212", - "sha256": "1bqavj5ljr350dckyf39i9plkb0rbhyd17ka94n2g6daapgpq0x6" + "commit": "06654656d3ad502742056d9030dd59e0da984764", + "sha256": "17647v4wqia35x90ph47cv76mr5c1vym1p61jmrmasdp0cm06bv3" }, "stable": { "version": [ @@ -48818,16 +49332,16 @@ "repo": "emacs-helm/helm-emms", "unstable": { "version": [ - 20201205, - 1635 + 20220314, + 1633 ], "deps": [ "cl-lib", "emms", "helm" ], - "commit": "43d387504a292b36e4e4246abdc9090c1717a561", - "sha256": "0pgrjqhw1xjl5xy329621idg517bfaafvqb3f5wxci6fhm4x46gc" + "commit": "aefa44ab77808626c4951be2df49a2eab7820805", + "sha256": "07ric1lghxdccq30jr3nfzkqa0mpx61kp4mjyi0zsxqcwfyz7zx3" }, "stable": { "version": [ @@ -49043,8 +49557,8 @@ "deps": [ "helm" ], - "commit": "85c1413dc28a5f5257eeebb6678dad503072b9ec", - "sha256": "1k96284xfsdashlaw1cv61md4fqhynhs674bzphs59h9k8g1vrf5" + "commit": "6a1d1fefad4b7f3723220da2edaef0b7d6f09a0e", + "sha256": "0wzq9pj1gbyv7cyar0r4hgmskwmksq7xfpjldibw30vzrpiqapas" }, "stable": { "version": [ @@ -49308,8 +49822,8 @@ "flx", "helm" ], - "commit": "bc2068dd0da7e77ac7b394544d703720913fa660", - "sha256": "0gd2z8b2blc3flnz196yqcxi2r66lrkm2z0pd5j0n7p5a9ajdfb4" + "commit": "e0cf739c0765c3f0186b9d5f691c2c7750a484c2", + "sha256": "1kkcnczk295aib8r37qfl0bcvrvki12wi0r5aqjc1g8vklaf9vbp" }, "stable": { "version": [ @@ -49655,8 +50169,8 @@ "deps": [ "helm" ], - "commit": "a15fe1dd272d252ad933d8129db1dce02fd41adb", - "sha256": "1kc1jzk10nfd2v20g8dwnb6a944afrwdwnkzl06w4ba8k4yim7gi" + "commit": "06255ec6347efb8f1884b4a844f40f94239137bb", + "sha256": "1yp1l6na6mf91wym28pnmc06zwbhg2i3p9i1z7kx9wf3mc3982gn" }, "stable": { "version": [ @@ -50041,8 +50555,8 @@ "helm", "lean-mode" ], - "commit": "a4205749d20a09871f0951c34f919d4ee5fbdb55", - "sha256": "0jqfnwjwn5payjj1lfl1zvw8gpcdlc6k3lqbw6iwpzlyal7y0nyb" + "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df", + "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p" } }, { @@ -50578,8 +51092,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20210922, - 615 + 20220318, + 1529 ], "deps": [ "dash", @@ -50587,13 +51101,14 @@ "org-ql", "s" ], - "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", - "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" + "commit": "46f523d94a376b168176c75bbd0e3e0d00e61170", + "sha256": "0vrk7lx4n4imvsnqv50w6fmqnndr48x89gcmm375fw6zgy2m90bl" }, "stable": { "version": [ 0, - 6 + 6, + 1 ], "deps": [ "dash", @@ -50601,8 +51116,8 @@ "org-ql", "s" ], - "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", - "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" + "commit": "f666fe150f1bf3c3ce43d0e15f90b20d43c2e772", + "sha256": "1mpq3v8lxqllnb4afqh7p9av0p9bha8ld7741zaw4hxb1252xgm2" } }, { @@ -51480,8 +51995,8 @@ "s", "searcher" ], - "commit": "0f89d04d322763a6db9ef58bbad747d41d9479ae", - "sha256": "03q6bs4zhyg7q5rpp1339h3dihl7fp0a16q8253nfr4k3b5qs79x" + "commit": "fedb0c735270764a0fd38cebcd2b3c32612fd455", + "sha256": "0jv8qbffr5wckblkdy2ka0rryczr72m8kgmg5y2is1jajnxsfwam" }, "stable": { "version": [ @@ -51961,8 +52476,8 @@ "deps": [ "helm-core" ], - "commit": "244121903650c2d25a233d12b378060cf8b010e7", - "sha256": "0ii70wn3vadx8a36q2frmsvrmlpz1w58qgn2w3knjivj195knliw" + "commit": "c1d5f9a2ccdb133aaf6122632166ba4b6fbc188b", + "sha256": "05vd7gxa21lg49hhs0pg0skpidav9qmhcijkjakzi4v8p29qjg72" }, "stable": { "version": [ @@ -52006,6 +52521,46 @@ "sha256": "19y97ia4zl50wd22gkb7kkhj713imd5jc92l2xnpw04b59b60di1" } }, + { + "ename": "helm-tree-sitter", + "commit": "866abc2f4ea48fbc1782ce40b0f16873825f65be", + "sha256": "11y7ssx0fj64r249g92a84ssyacf3ldkj6rd3zc0z3bk2zaznw5b", + "fetcher": "github", + "repo": "Giedriusj1/helm-tree-sitter", + "unstable": { + "version": [ + 20220124, + 2246 + ], + "deps": [ + "helm", + "tree-sitter" + ], + "commit": "1cace1f9a8c5c519b985f7ee542ba3375eabd0e1", + "sha256": "1ka0xq5ghhn4r82k1aq5v4scariwvpwbr7c179j36axxlyvr6zkn" + } + }, + { + "ename": "helm-twitch", + "commit": "a0079a6c9a2207906efcf1d63d5006c50295a9c8", + "sha256": "0rishxgk04y1axkcskxn1dj0m5z6rmm4khsx6x9v1vj9b8yvghd1", + "fetcher": "github", + "repo": "BenediktBroich/helm-twitch", + "unstable": { + "version": [ + 20220207, + 1314 + ], + "deps": [ + "dash", + "helm", + "streamlink", + "twitch-api" + ], + "commit": "533216a1add8acc2d6f2b4039c67528b97d06549", + "sha256": "14686l3idn34scz9a3bai2x42zsrbfazpv1am6j64y7mrp284p8g" + } + }, { "ename": "helm-unicode", "commit": "f720b9f9b667bf9ff3080938beab36aa0036dc92", @@ -52304,8 +52859,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20211226, - 1843 + 20220220, + 2308 ], "deps": [ "dash", @@ -52313,8 +52868,8 @@ "f", "s" ], - "commit": "f865f17ad04cd270685187b0a5331ec8eb06e541", - "sha256": "1vxjf2mgnnh0dkk727nm7gw4fajizl6c52y27bi6rs0ahhy4ybib" + "commit": "67cdd1030b3022d3dc4da2297f55349da57cde01", + "sha256": "064rnxcf1w7zrjr39a72hngyndj24wkmmyqrgr1bpgsl87zgvbrg" }, "stable": { "version": [ @@ -53029,8 +53584,8 @@ "deps": [ "cl-lib" ], - "commit": "e146d672ea4c00fe17018e7e76e49d59570eeb2b", - "sha256": "0bcrlw76nihbffm7p5jh9vf3r1756p6vwa7hbwp933r4caaiyqid" + "commit": "f7e7b12fd119e91c795cbe21bebf7b5af5d273b8", + "sha256": "1jdzd6r3x4dc03256y06dp747h2wp7hcm5jkb4n9ima8z2h3v3ck" }, "stable": { "version": [ @@ -53235,11 +53790,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20211029, - 602 + 20220211, + 548 ], - "commit": "0593a1a77db28503025d5c1850e6a99551c3bcbd", - "sha256": "1rkxm6ak1zaqzp6q6mqpng0k4qjnsshkwydfxfm63xfsgr4vwhwv" + "commit": "3dd29cfbf24fec16eaf3d47936338adb6b34f5c8", + "sha256": "0c0533id01lx0xf5dkkddd3gwb3k2jh55fa6z0d2xzrmc7p1971x" } }, { @@ -53286,11 +53841,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20211025, - 2138 + 20220324, + 16 ], - "commit": "121f24c12c6711f65157259d90cbe88a53c10336", - "sha256": "0mwhqhf84kf76wrqz6l9rp4majfl7dnxs1dg49qls32lv44ihs2x" + "commit": "3312497ddfc7b7bc0e773ae98fc02477a4b0c7a0", + "sha256": "1n436z6dg7c1vw6sl5bswny059d2629yx9cvlkf076xg8dmlhwdv" } }, { @@ -53323,20 +53878,20 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20210909, - 1114 + 20220323, + 1714 ], - "commit": "42f744ffb513cf2b95517144c64dbf3fc69f711a", - "sha256": "1f84d4wms8q2kcj5mb6ih6b5ni35fwqvckp2j3mcdznms759j7li" + "commit": "c0f0555a6b9f3818f29e6394db0b45d6d5675edf", + "sha256": "15sndz0dd8aasg23yp298rlrw17pn73irzn048fmvri8wl8951hv" }, "stable": { "version": [ 3, - 3, - 0 + 4, + 1 ], - "commit": "57378bd4511887a815725a7850e1ff2c6e9fda16", - "sha256": "0bdwdp8d0g7n0kv6l4h7alya3z6fsfi618dzw5x8f2az3r87yg8y" + "commit": "c0f0555a6b9f3818f29e6394db0b45d6d5675edf", + "sha256": "15sndz0dd8aasg23yp298rlrw17pn73irzn048fmvri8wl8951hv" } }, { @@ -53681,14 +54236,14 @@ "repo": "ericdallo/hover.el", "unstable": { "version": [ - 20201206, - 2227 + 20220129, + 1935 ], "deps": [ "dash" ], - "commit": "d0f03552c30e31193d3dcce7e927ce24b207cbf6", - "sha256": "0ynf26gaj7n6cg0vgykq80hg21lxlwffwcssk9ppin0rqmc74m06" + "commit": "4ca0638a14a8b304ac2b46e7b342b8d8732ad199", + "sha256": "1d0wi5dm3qri9b502nrbcra3b3gmikbqdbyzk87fccb4gf9k500v" }, "stable": { "version": [ @@ -53928,8 +54483,8 @@ 20200929, 559 ], - "commit": "40075bdd61cb0f839c26d2f86b67d22d04f21093", - "sha256": "05565ybwz4mkcfdqihphm47am842x8mibh7p95qg6y3myr3g4dl7" + "commit": "a221c1af3d0a2bdc849adabd4044bb3f63895b54", + "sha256": "1warqfy5gq56mxypkpzd29k280yka2zzi131rrm1j2rr49ipj6dq" }, "stable": { "version": [ @@ -54110,11 +54665,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20220112, - 1138 + 20220305, + 930 ], - "commit": "3871746b51772c95b4419e978af069570c914f95", - "sha256": "1gbhz35chwzy75l514niw3sih3hwj68sn3zavvw8yzsn5yfzqd7j" + "commit": "5828705bcc3eab9af9dd36fd7dc96d48c3020d85", + "sha256": "1aij86pi2p1dy0dakbnm0a8mwy5vffayfk8y05jx3v1cishp324s" }, "stable": { "version": [ @@ -54329,14 +54884,14 @@ "repo": "maxking/hyperkitty.el", "unstable": { "version": [ - 20200927, - 106 + 20220226, + 1951 ], "deps": [ "request" ], - "commit": "ad65766fee2675bf123491544707b056b89b52ce", - "sha256": "1h819sxbzpcnr6mkl6aw9qxhyhkydppwwwqsgyw9qfil9sk8hyff" + "commit": "2c1d22ff017d096c359aa151e6a29f7214a58118", + "sha256": "1ymrzy0l6r6kvrf6p6xwb8dlg4gj8h14xam56d94fbh6mhr53z50" }, "stable": { "version": [ @@ -54521,11 +55076,11 @@ "repo": "muffinmad/emacs-ibuffer-project", "unstable": { "version": [ - 20210205, - 1940 + 20220321, + 1312 ], - "commit": "2483d2dbd715c4bd892d1fbc968a17a01888cb2d", - "sha256": "165g2lsg8apdpn7i36h0x5j80clpjpf3d1d1l8g8ahf5280flcfw" + "commit": "bfc0ec1f27b02b8ab816dcfd9073e5d78dae1aed", + "sha256": "0x25xzlvqgpf2s00595vbgyk322h74n46x2dbcp2v3158b0cj86c" }, "stable": { "version": [ @@ -54821,11 +55376,11 @@ "repo": "ideasman42/emacs-idle-highlight-mode", "unstable": { "version": [ - 20220120, - 133 + 20220211, + 548 ], - "commit": "03b5de12a6414f6e4299fc166f1dcd7ce12b37fb", - "sha256": "0qhifxkz2kn4cnd9wyrvxy7784r47v233rsvr20xf80xzxdnf4a7" + "commit": "0a24f8e402383b0da1f956d946781317fba14bbc", + "sha256": "11mbm87rx4i093csdqrgin550wgkps69ysgy2ig56m3l1hs5pp78" } }, { @@ -55285,11 +55840,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20220119, - 658 + 20220216, + 717 ], - "commit": "44968bea9bff8fdd5bf9d227f53814c44bb9f619", - "sha256": "15l0dprhgfv948vlc05n91npb4331n4i3v1idd3zww6vrw85n9l6" + "commit": "27c61866b1b9b8d77629ac702e5f48e67dfe0d3b", + "sha256": "07z659w9m94h79wnvs2fg80f5impidqhsmg6awc3fxwd3ib0yzih" }, "stable": { "version": [ @@ -55683,20 +56238,20 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20211208, - 729 + 20220214, + 1859 ], - "commit": "1c576624758429118794db9407c9627dfff7c975", - "sha256": "0a704nk7ly4wy5nmgqkdrg3lp3lpyk701myp9b72dn6diiv9r4nd" + "commit": "ca82a1700cf7834b55ada36e53811f6effde6283", + "sha256": "1c9d895g4dw0jp1ipm1mlhs2ln5f61ng83rv294jh32nrl3wrs81" }, "stable": { "version": [ 0, - 7, - 1 + 9, + 0 ], - "commit": "b2b625f690e207bab7b60a23585eba9c2831607a", - "sha256": "173mw87hbr1hk0k859liba7sybsxpmdv0d7d97iyy2khhmn7xkn6" + "commit": "ca82a1700cf7834b55ada36e53811f6effde6283", + "sha256": "1c9d895g4dw0jp1ipm1mlhs2ln5f61ng83rv294jh32nrl3wrs81" } }, { @@ -55753,8 +56308,8 @@ "htmlize", "simple-httpd" ], - "commit": "cbddfd54242210df3e1c3b590fada5bb5423f5ed", - "sha256": "14jnni828ndl1sj92cy49r0aa6y8qwqbm2rrxc87j0yfn5sdckc7" + "commit": "479a2412596ff1dbdddeb7bdbba45482ce5b230c", + "sha256": "09ns4csq36x4jnja8ayla6j29c5pyw9psf534rd56d7l33sbgyvl" }, "stable": { "version": [ @@ -55784,8 +56339,8 @@ "deps": [ "impatient-mode" ], - "commit": "a57c628abb765a834c85f9299bf816e50ee35d23", - "sha256": "1j9lfxxvgg97l2cmdwyc9c82n09xvc9ybpqn31hm7i71y9l943w7" + "commit": "8376bcfc2bbb3762e26dfc1bb8866c452f7935fe", + "sha256": "01g5r3sh1qma3vpyzzhixpw62y0kvphznpnfd80w4a5a3gbwp5m2" }, "stable": { "version": [ @@ -55808,26 +56363,26 @@ "repo": "Galooshi/emacs-import-js", "unstable": { "version": [ - 20180709, - 1833 + 20220215, + 1948 ], "deps": [ "grizzl" ], - "commit": "fb1f167e33c388b09a2afd32fbda90a67bfb2e40", - "sha256": "0if117lia2ykd6ai0cf5z4ddhsm9icijigwbrn079v7m9s8yl43p" + "commit": "d2bbb53f96395415f9f01de4fa88d82c1f59ba63", + "sha256": "1r2in6zjhp0cywlyncnqblhb0k1bymhbhs7r974khrpf8byw69p9" }, "stable": { "version": [ - 2, + 3, 0, 0 ], "deps": [ "grizzl" ], - "commit": "0a1032894445062b87dbe4e2c8cdba35ac25c250", - "sha256": "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3" + "commit": "d2bbb53f96395415f9f01de4fa88d82c1f59ba63", + "sha256": "1r2in6zjhp0cywlyncnqblhb0k1bymhbhs7r974khrpf8byw69p9" } }, { @@ -55922,11 +56477,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20210508, - 309 + 20220227, + 653 ], - "commit": "208f21c7ece23acec6b2eb2b0c64928464f6863e", - "sha256": "0i5jhvsjjgfmpi4j9scv618sl0p26hpq7x3yp81s1f390brmf4dz" + "commit": "c6373bdfaf43255141983aea245571364f04d3cb", + "sha256": "0iphkl27ihnv2dmjaj1b3292xsx8g8m11r7hjikh421n9f1p5xy0" }, "stable": { "version": [ @@ -56131,14 +56686,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20211027, - 1611 + 20220315, + 1102 ], "deps": [ "clojure-mode" ], - "commit": "765653dc23dc2a2c1520a1e24332ab9d4b49dd47", - "sha256": "1hbylg5nsix65a85bibwgzcyjkf19rjvdkg04p9hnvsgh59x2d5l" + "commit": "f511dcad0e0684c9609c7526930e88d11da989ab", + "sha256": "1xxjqf3j2k92sj4zwhkjywc6yr5x183r8n33lba2v3w5hcfgahd0" }, "stable": { "version": [ @@ -56230,11 +56785,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20220118, - 125 + 20220228, + 208 ], - "commit": "d6aa7d32aee6665784766858e40b5e4e13190652", - "sha256": "08sizq24n2w6cr22hmnlprdvnvkslgj8rlv41zb9g75yjn5sd9gy" + "commit": "dbf4386bac12f1733257db6105e3f1fca05ffb79", + "sha256": "0sb72prfcglkjvpsgadyql5s9r28dbiihby3szl500lv7cfpc6ds" }, "stable": { "version": [ @@ -56511,11 +57066,11 @@ "repo": "zonuexe/init-open-recentf.el", "unstable": { "version": [ - 20210528, - 1902 + 20220220, + 2004 ], - "commit": "c019ea85a9c589815b0af60153858d09bcef130e", - "sha256": "12jwz0ssfxz1z55fb7v978xz8pwnclnqnzq5pqggzb06zkfxx7iv" + "commit": "51463effe54ca9390ec339b9678968f35a40dbfd", + "sha256": "1f1y3wafix0xvffkckbx3yh1sf548xvk6v3lshy859nbcbm4nbha" }, "stable": { "version": [ @@ -56582,11 +57137,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20211130, - 214 + 20220326, + 733 ], - "commit": "9afc537af6e56dda5a3ef60792f15ed391ba3b8b", - "sha256": "0mffhf0zzvlrc0kcvfj91p4q7wx9v4ih1v1spjad40h5790gn9an" + "commit": "a8d0d2ecd4855ba91e21d0481b02dff3755f8afd", + "sha256": "0qz91mzfp8ywk9ngaw60q0nczxykanl5sbgf42v9xfgm6fys8yal" } }, { @@ -56615,17 +57170,17 @@ }, { "ename": "inline-docs", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1imjcx4qgrs5llindgmnvkb73fagnlxfg04s72kckgcy47c4352p", - "fetcher": "github", - "repo": "stardiviner/inline-docs.el", + "commit": "9a2649839bd44bf3b2f0db55255f511685dce089", + "sha256": "0dih87jzwr4fwi79gf2hhamhw33vs3a04x2cajg5g31jclpwcz11", + "fetcher": "git", + "url": "https://repo.or.cz/inline-docs.git", "unstable": { "version": [ - 20170523, - 450 + 20220210, + 1402 ], - "commit": "b57f1681be6147f999cdc12abff414a0442e8897", - "sha256": "0ji8qgscs4fxp2i29l3v8z9y6i2glga6bysbcsn855pqsn00xkcv" + "commit": "cda596d9ff4c2aa5035692a97c430f6589eafbb1", + "sha256": "0kc73qv3986n7fv8qrxr81zyg5lk14266v4rpwrib4nv5qwhzjza" } }, { @@ -56693,11 +57248,11 @@ "url": "https://git.sr.ht/~pkal/insert-kaomoji", "unstable": { "version": [ - 20210707, - 1126 + 20220215, + 1204 ], - "commit": "e818845a99d418e04c1685f06fe25116916f6168", - "sha256": "0acyzysz04sd3rahymw6x3a8zy57sy84d36zp6prd62y4w0sw361" + "commit": "974bb7dc02059253e032c501b2c3c0ece448d472", + "sha256": "061809gl7dfz4mis5igz9aiis1gq4np3fk75ydmzm0j9isz4dc2q" } }, { @@ -57161,8 +57716,8 @@ "deps": [ "f" ], - "commit": "c1e3cc7971c278a95eda16ade7b68ad157481a5a", - "sha256": "0lppyr74bsq9dx2qm6cc34vg4i2i8dnrrlbm3xc3nzcsay85cbjx" + "commit": "1ccf7219c2f78485aa23174e46aa8cd77a98a6a0", + "sha256": "0bws8fiqysqjcyw1y1ng1dic7nv7g1syml9hldb9gf7b0xan35yz" }, "stable": { "version": [ @@ -57488,8 +58043,8 @@ "repo": "wpcarro/ivy-clipmenu.el", "unstable": { "version": [ - 20200302, - 1419 + 20220202, + 2122 ], "deps": [ "dash", @@ -57497,8 +58052,8 @@ "ivy", "s" ], - "commit": "ef25acf3f058fe1ede3a29fae2e9cdac8b08cd17", - "sha256": "1yzvaf95pncfi1r3xj8h6393dfvx291q3ahdwpp7qn3jh71kjx6k" + "commit": "7c200cd4732821187084fad23547ee3f58365062", + "sha256": "1zf0xx3j0mcyppx1a8dhx8h80xi3dxl4fsc6y9pkhrlimlz36qv6" } }, { @@ -57672,8 +58227,8 @@ "ivy", "s" ], - "commit": "cb7e0f03e1df90855b7cb1433706a8b46f5592aa", - "sha256": "0l2r32k6lzxsww245afddzfpwhy0k80kw0q3jkm5hfw3qgkwd864" + "commit": "eb358d8460b944bf764cb6c01f205e6af94c4861", + "sha256": "07lazz8ca9sshrgswl47zz8gvc0niwyi397m3x3vrn5738qd0bf9" }, "stable": { "version": [ @@ -57837,16 +58392,16 @@ "repo": "ROCKTAKEY/ivy-migemo", "unstable": { "version": [ - 20210425, - 613 + 20220309, + 605 ], "deps": [ "ivy", "migemo", "nadvice" ], - "commit": "b91f341d1b70175baf989f0c6eee6573bf781a27", - "sha256": "0svvh14zhym9ssc0dc7wyr1pw0rhiirn2s7a0xk43wl2r0c36cgj" + "commit": "f31a2b314b81e328ce0222d8796b808230ddaa0e", + "sha256": "07l6x4aysxzrwlva7df5mdmb8kir1w9jpk7jqc5823zd00dmd6hf" }, "stable": { "version": [ @@ -58001,8 +58556,8 @@ "ivy", "prescient" ], - "commit": "3dbcef387502d309d130a518a18d48cd2f0e15b7", - "sha256": "024l7s0b6apbzanw3cnhjypxnxfinfb5b3nhaabrc138m5pis8j5" + "commit": "c5295a9eecbd2935bb57684a4422638e03bf738c", + "sha256": "1wfmynbqaqvrkjdncx0wmqxz6v8zlfmqlh5l3h6876jin97i5fbv" }, "stable": { "version": [ @@ -58126,8 +58681,8 @@ "s", "searcher" ], - "commit": "b38ddcbce45f604948c4880cde224beab099b8da", - "sha256": "0719r16pwnvpq9qpa0d2pd2s5yzvawm5gycvxqzvlkgjw49h5rhv" + "commit": "63d55b3c333881d3c9d1e3f1ee50a72e79fd9e0e", + "sha256": "1mydy1akn25xb9wy8y08vmk997h2nvqdm48fnxldxbkli2d0zv1j" }, "stable": { "version": [ @@ -58160,8 +58715,8 @@ "espotify", "ivy" ], - "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293", - "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5" + "commit": "ea6d6021e5acc550560325db2f09198839ee702f", + "sha256": "1jlm7mka1ilaw8z1a91vy8k1hz27g4iyk33fpmiab7856j8ry32b" } }, { @@ -58275,8 +58830,8 @@ "ivy", "request" ], - "commit": "849b6db7ef02b080a86c1b887488e2935c31059a", - "sha256": "0f90dq8qhmsnm2hvnvzyb20nq0vmgnqzqa693scq69dv5rdjgwyj" + "commit": "273788e0d22a06cca1050eb1205d3fbc2245d001", + "sha256": "0w0aifinr8v0sdbj0gasqacwh5gmsb0rcg6jwi8ppga944wlkb2y" }, "stable": { "version": [ @@ -58391,11 +58946,11 @@ "url": "https://bitbucket.org/sbarbit/jack-connect", "unstable": { "version": [ - 20200519, - 1027 + 20220201, + 1417 ], - "commit": "fae8c5f9b383f7606f3883badfd1294e8affb0db", - "sha256": "0r6dihw5dar7w6h5xvif25fv9alwarb74mmaxq2ld8rbhv4il66c" + "commit": "1acaebfe8f37f0194e95c3e812c9515a6f688eee", + "sha256": "1f55fkmhs4vjjsvf4mvhmqp7qjjl0m2qdgz2gbrkgx45v8hzzyx0" } }, { @@ -58949,11 +59504,11 @@ "repo": "rymndhng/jest-test-mode", "unstable": { "version": [ - 20210615, - 41 + 20220131, + 304 ], - "commit": "73aebe62e8adf8e737c9a94361cce45063d05ae4", - "sha256": "1zagxpz598ssn88mch1mzc2aqa7sx29q7y1ifw4mrglsicgrxlv7" + "commit": "e08326a467ccb1ec9ddf99c1f5d53f55c50e52b4", + "sha256": "1rgi5qwrd9pfz6yqmfgmx2inlxqykq615aay5vi7wajdiss36i3f" } }, { @@ -58999,8 +59554,8 @@ 20210602, 1430 ], - "commit": "f57c359044ff1fa90db62a60b6691ff8d65c82f3", - "sha256": "17wd6yzhjdw5j3bpn6bnga5nkwdnqgk8nprqiavsir4ghkzw2h46" + "commit": "296e3ca6e0341d9882f4771131a386fe2991e913", + "sha256": "0algc4smi734r5p72k5csjz4kl5iwhrs4mk5h039wab915vjbbkl" }, "stable": { "version": [ @@ -59133,11 +59688,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20211027, - 1852 + 20220312, + 1945 ], - "commit": "647cae28087529d18367f895d7ef689c7f64c6bd", - "sha256": "086h53mmdjx30093zazwylx3fg7jvbcjy63q4ph63ybizsbiy5lg" + "commit": "44280538a2b780536c56ee2a51b7a5b03d376a2e", + "sha256": "1x5k9d1iq33ds8cszcyl2bhbr8hkldq6hph1b77zayqyg00pnly4" } }, { @@ -59503,14 +60058,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20211229, - 135 + 20220316, + 1506 ], "deps": [ "cl-lib" ], - "commit": "997cac4c80a03062145b541b006c51cc91ee0c24", - "sha256": "1wcz3xji7viqxa5is81jd7in7x1fya6rzybm8qj9rwgdc8camvyb" + "commit": "b9ed9e406d59661bb099cb2307dfbfcc1d47beae", + "sha256": "15c5smxfh2dgk6da012fsvjz9c075cxfp2q8fglbalazplzwv4zc" }, "stable": { "version": [ @@ -59725,14 +60280,14 @@ "repo": "taku0/json-par", "unstable": { "version": [ - 20211219, - 829 + 20220122, + 352 ], "deps": [ "json-mode" ], - "commit": "255e99ba789fc69f977129a1ea22e57334874cb8", - "sha256": "09674zsxlza4b1p6z2r73zhmfa08v2ywkn388qa7lkpyjvd0n09j" + "commit": "962e5a2221136aa07f512834925c381cfeed2d92", + "sha256": "0pxcya18gbgzx772sh68803dbhxpss4smh6ar9vlc87mqwg5cqnk" }, "stable": { "version": [ @@ -59833,20 +60388,20 @@ "repo": "jcaw/json-rpc-server.el", "unstable": { "version": [ - 20190714, - 1521 + 20220205, + 1503 ], - "commit": "2f41d292b87916f6989e7ff5dc94da18ae6a9e4e", - "sha256": "1z5v7z98dinlayxzik45gjja93daxym75mh2shsy4wz8yclkw22p" + "commit": "9bf7efd5c69f429acbac41f33a1c9fdaddcb9914", + "sha256": "1zpgc20b0rdfl7kr1smm8xww4j852w341hxl7awi4ixapgjpd0h0" }, "stable": { "version": [ 0, - 2, - 0 + 3, + 1 ], - "commit": "1623346b308dc8f593346dc947fdc4092d674834", - "sha256": "1kkn4xjn9i207x580902jfpcrhpkvpyzxk4jh1bclbryki9602zv" + "commit": "349e1f4722474bf1f75dbc8eb9d9c59d790b8083", + "sha256": "11911dk8nkacml6p29m5kpcxhjyas5ymarjsi802s426gpn8wj94" } }, { @@ -59896,14 +60451,14 @@ "repo": "tminor/jsonnet-mode", "unstable": { "version": [ - 20211228, - 1346 + 20220121, + 2109 ], "deps": [ "dash" ], - "commit": "440655734197472c9404a051edd8ea066b07c120", - "sha256": "0xmdkgyzx1mz3aqj8wxscdv26nddw42gdjvfcjfbhl8is8v9l9wx" + "commit": "7c9961b084b1ea352555317076bc27a512dd341f", + "sha256": "1x752dr3qzgmmzxf2lz77ikd44l1fc00qfds9nzkwxm9l4s48xhz" }, "stable": { "version": [ @@ -60019,14 +60574,14 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20211230, - 814 + 20220225, + 810 ], "deps": [ "s" ], - "commit": "e90b1ed2cc806262b0ee772dcc88f8da693d9210", - "sha256": "0jhfb2shz71kwfzmvlpzhldm2rms3wgwikrym2a2fr9hw91i2zy7" + "commit": "6c1d63511fb2b3b3f2e342eff6a375d78be6c12c", + "sha256": "07fl2bcl1drscp94gpy0v3n31rml8fffc7iv5v80qh8zwvn57d6h" }, "stable": { "version": [ @@ -60067,8 +60622,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20220117, - 2310 + 20220325, + 2038 ], "deps": [ "dash", @@ -60077,14 +60632,14 @@ "spinner", "vterm" ], - "commit": "ec9b332e78e146a6dbd348574190b2e7887133ab", - "sha256": "1gnzylfdp0n08g4psbrns6g3pki2m6kck6rsyf7d60ba0jpfyliw" + "commit": "80a2def11e444d8ba2b640d0ea76720cfefccb65", + "sha256": "1k5wqlxgijz73qscbdnkaia3ffw55x08xyqmfppvqv1w4gdvr0ya" }, "stable": { "version": [ 1, 1, - 4 + 5 ], "deps": [ "dash", @@ -60093,8 +60648,8 @@ "spinner", "vterm" ], - "commit": "5b95b278772de8339ac198fe6eaadb0427d680fb", - "sha256": "11spibld7dyggr38hzkrd05lmdf847d57cc9qyk01mb3bli21vxd" + "commit": "fc67e4d603907160766cf22e8ef16029238e78d3", + "sha256": "04nh37izz04lxkvkxhsig8khbrrgdl4p6pkjsv5bxymnp84zwlw7" } }, { @@ -60258,8 +60813,8 @@ "repo": "nnicandro/emacs-jupyter", "unstable": { "version": [ - 20220105, - 1943 + 20220212, + 210 ], "deps": [ "cl-lib", @@ -60267,8 +60822,8 @@ "websocket", "zmq" ], - "commit": "42a9765897ad36518b5371f558b36cdac3a0ec74", - "sha256": "09nrw32bmkcafbr69csz94lykpmbib7f22xa4y165szrd3va8qk9" + "commit": "0a7055d7b12cf98723110415b08ee91869fa7d94", + "sha256": "183313jlmfnbndczllkqm47y4495prw4ks2jav3pdwn5qqfmpznx" }, "stable": { "version": [ @@ -60318,8 +60873,8 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20210924, - 1138 + 20220312, + 1104 ], "deps": [ "f", @@ -60327,13 +60882,13 @@ "transient", "xterm-color" ], - "commit": "18604956b8f6ba58cba99470464c67f7b16ce329", - "sha256": "1d6y84gm5n9gkn7v9rhxhxsihabrdgx6mddam0pw75ka53q5s8wi" + "commit": "9f77366aaf2227bb0cbd3cdc0f78088032f2e873", + "sha256": "17l4lh9511dw4ri7csvp8258q59brhgrkir60kqmzxglrpmgjj6s" }, "stable": { "version": [ 0, - 3 + 7 ], "deps": [ "f", @@ -60341,8 +60896,8 @@ "transient", "xterm-color" ], - "commit": "db77f4ada0840dfb6080121f80249b11721ee779", - "sha256": "0250yayv136ypsy5gy814lv1schm1pza51lvsad7ayr3z1l812b3" + "commit": "9f77366aaf2227bb0cbd3cdc0f78088032f2e873", + "sha256": "17l4lh9511dw4ri7csvp8258q59brhgrkir60kqmzxglrpmgjj6s" } }, { @@ -60674,28 +61229,28 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20211023, - 1347 + 20220317, + 1238 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "ea6394619219b6d54b843836e3a6b2e7d8aaecec", - "sha256": "1awgh70g7k7bjjga8kd6rfd8k3fqzkswgxyf4qgrsjci80is8jcn" + "commit": "78df90fa411c0d24d884abd47bf63a167231a84c", + "sha256": "05z7w4ig17w5vxz3g4waghkq8ay9cdjc22aihn34h3q7h1vlv5dd" }, "stable": { "version": [ 1, 6, - 6 + 7 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "f17f29d63cfbe2c9203bff1877db983c5663825e", - "sha256": "1r6bi26c6hqx64s54vjzm86q7bdn6x7m03g07x8v7h9v3xvlpdpf" + "commit": "ff7f31b100421328b6b8c57a5b640a26b9d914c2", + "sha256": "066iqbyvapc7i41xlci2jlnvdkdhkv7c8rj4ambz8rbj6i2sjb5s" } }, { @@ -60718,10 +61273,10 @@ }, { "ename": "kapacitor", - "commit": "db1f8cfcda2fa2b9be74a6cd9f95608e8b3f50bb", - "sha256": "108b3y71p7s3lcwbqxp7hy2l304yj4hxm2nq8iv7ljr8av1q7kn6", + "commit": "afb7ebaf3b1b1b3ce0162de9b8d586d699fdeac9", + "sha256": "0yccmgzmhwjnnzlqhyq326adnxkf3s27gg67g1w1hba1ippg7l60", "fetcher": "github", - "repo": "Manoj321/kapacitor-el", + "repo": "manojm321/kapacitor-el", "unstable": { "version": [ 20190414, @@ -60824,11 +61379,11 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20211105, - 316 + 20220309, + 647 ], - "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", - "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" + "commit": "944e36144d92a798e1fd0f3d83fc6347d57a976e", + "sha256": "1flri9jmhhhak2zx46sw86jm05mw4banyk1ag2354v1irsc81piv" } }, { @@ -60839,11 +61394,11 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20200601, - 333 + 20220307, + 829 ], - "commit": "f0a719892aed5b1b4b644f1339d1ace99c656100", - "sha256": "0vk4fdkai0ssq31ycckkz4iwp35ip5d8lnyisv4m3b98jv3pb6k0" + "commit": "944e36144d92a798e1fd0f3d83fc6347d57a976e", + "sha256": "1flri9jmhhhak2zx46sw86jm05mw4banyk1ag2354v1irsc81piv" } }, { @@ -61013,20 +61568,20 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20220117, - 1747 + 20220211, + 2035 ], - "commit": "72d9add8ba16e0cae8cfcff7fc050fa75e493b4e", - "sha256": "07lwnz2i063v517lw739xpqgh04mq3ri060xni7qvvm3baiqjlry" + "commit": "a94f9839addabc2d491ee5c8927453ae2c5ce0fb", + "sha256": "0yxi1s4czkxhzl6dp3b9iaqds35gjccqgrghvfmqyyvmzi0lzss4" }, "stable": { "version": [ 1, - 1, - 3 + 2, + 0 ], - "commit": "b4965ff5db0e913e58c906c228042921b22335a0", - "sha256": "0s31b3kal4j08waa2fwz5d6269wsdywb60a7h4r5vzsrr238lks3" + "commit": "98c2dda1a2ca0fc95f7425847a36abad5b31a4c7", + "sha256": "01z20lsnjk8pwdsl4vx5dqdc4603bmb7fxan7n8j1fgvkvi63yzl" } }, { @@ -61245,11 +61800,11 @@ "repo": "emacs-grammarly/keytar", "unstable": { "version": [ - 20210523, - 403 + 20220222, + 639 ], - "commit": "f725c1113879bae4c04f2ccf59c6b1ced3bf7583", - "sha256": "0ipqqc4jsg43yv4626265478nd6gwy9am9ligx4jjn2vpwsrkjz9" + "commit": "33e5e50b795a48315d869d9545c650b7641eed0a", + "sha256": "12zkfsbsbf3s5ifyfrbv5xyyrif59rkk89in83ghys03qp5kmybs" }, "stable": { "version": [ @@ -61326,26 +61881,26 @@ "repo": "DamienCassou/khardel", "unstable": { "version": [ - 20201019, - 553 + 20220223, + 934 ], "deps": [ "yaml-mode" ], - "commit": "ca021fad32430e3f3a995d4158e73b5ee485258d", - "sha256": "0p210q71cn7a4sg82638mxc4v8b2lyi6yv888fjzwnxc804ahwxc" + "commit": "1436ec5ef1b5b26104a4735ee64c0afe148700de", + "sha256": "1pa7kl3d0hmgybbvsffhinn10qmqrkkzccprqcmwhc246yb4abqa" }, "stable": { "version": [ + 1, 0, - 2, 0 ], "deps": [ "yaml-mode" ], - "commit": "5ee835a4429c58dec3900e4fa3d7cc1e778c969b", - "sha256": "0k2q0m7g9bj4k5xc4cldhi7cfbb114g016abyzq3q3jaymja195z" + "commit": "1436ec5ef1b5b26104a4735ee64c0afe148700de", + "sha256": "1pa7kl3d0hmgybbvsffhinn10qmqrkkzccprqcmwhc246yb4abqa" } }, { @@ -61504,51 +62059,47 @@ 20210318, 2106 ], - "commit": "31308184cf2c127e77b3f61c100179f854d4df3f", - "sha256": "1mw883x1c6gngdajnycymyr7v4pqm1vqaa1429nf7y0wqh9xi3y3" + "commit": "06c15c1f7567c6dbc97248c85467bdfd2fcf3cf8", + "sha256": "0w36wggnmf7dq0kqkkm66zq9adq2r1f8zrdjw6qnbg7b9bdxwxik" }, "stable": { "version": [ 2, - 0, + 1, 0 ], - "commit": "dedcb6bcabe3d8d6758dcee607e8c33b174d782b", - "sha256": "1v3iqh13lcn9jvw8ldymyp35j1k44wrqnhdmki220q940mar5cgz" + "commit": "023bd79b90f9831b45bb8eb449346648aa5fe5f8", + "sha256": "0q0hn1q5l1pg3ma2x922m93vpfax7x9cmm8psy3qw7b5pf4cillk" } }, { "ename": "kiwix", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0x5ld557kxzx5s8ziy5axgvm1fxlq81l9gvinfgs8f257vjlki07", - "fetcher": "github", - "repo": "stardiviner/kiwix.el", + "commit": "6d33d35c4228eca53de36d14296bc3e8219a3169", + "sha256": "18sxrdccqvkd8w6pj4lwbps1d04dm55lx0f5hr7hyc454q4vbg80", + "fetcher": "git", + "url": "https://repo.or.cz/kiwix.el.git", "unstable": { "version": [ - 20220110, - 1542 + 20220316, + 847 ], "deps": [ "request" ], - "commit": "1645c5b659a74c7fe3cae364b967edd45f64d61c", - "error": [ - "exited abnormally with code 1\n", - "", - "error: unable to download 'https://github.com/stardiviner/kiwix.el/archive/1645c5b659a74c7fe3cae364b967edd45f64d61c.tar.gz': HTTP error 404 ('')\n\n response body:\n\n Not Found\n" - ] + "commit": "444f686a7f75db788d54f544b923a3532732eb8b", + "sha256": "1pdm69ghdfzv738c5y1b61d12cfafkvcmmjf0v4m3qai2xxqk4sn" }, "stable": { "version": [ 1, - 1, - 4 + 0, + 2 ], "deps": [ "request" ], - "commit": "6191d43e184e29de868a82331495ced9c9cc9be0", - "sha256": "1a8rcrln36brdik5rki7dkrm1syl8my7sjsv960fw45pfr1pkb5s" + "commit": "86c163cbc0515e9e516f05e809796087b1d3ba8d", + "sha256": "0fh5bx6c2jm492z70vq46b6fmsk4mqagxc75xcizl47s80wq6yvn" } }, { @@ -61581,6 +62132,21 @@ "sha256": "10a84q8ilzs5b8f8yf2awlyfa8v3s6gr1lz459nlnkq9fflxwdj1" } }, + { + "ename": "kmacro-x", + "commit": "207d9fb6f29a426ce1aeac517ae31d69aa1f4d8a", + "sha256": "06q9lv3a4jsn6a9xfp0aw980pl938h817bagqq5xkh0q169f34qm", + "fetcher": "github", + "repo": "vifon/kmacro-x.el", + "unstable": { + "version": [ + 20220323, + 2215 + ], + "commit": "429abd82c97031948b7681197551bb77708bd174", + "sha256": "07yxqcq84hlj3h3b66cwlmmk4cfnwb7pfr5lqvgaxywvziv2hqng" + } + }, { "ename": "know-your-http-well", "commit": "2ab50ae6278022281b2b7297c086089e5e669c7a", @@ -61808,8 +62374,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20220104, - 2320 + 20220318, + 2124 ], "deps": [ "dash", @@ -61817,8 +62383,8 @@ "transient", "yaml-mode" ], - "commit": "68d2925c7942039e3fb3eb6c113adec5369c6c72", - "sha256": "173ympabfa14rc6y4f3rjxapj7py0dsnzp8zg7q2gkyxv1iwhh55" + "commit": "6ce4a13b1de666a90f5acfdfd8c78f6ea2013c60", + "sha256": "16xam2yhj77mj388hrzbh2ah8y1k5sbfacavjmriaxrnn5c8v16d" }, "stable": { "version": [ @@ -61843,15 +62409,15 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20210922, - 2325 + 20220318, + 2124 ], "deps": [ "evil", "kubel" ], - "commit": "68d2925c7942039e3fb3eb6c113adec5369c6c72", - "sha256": "173ympabfa14rc6y4f3rjxapj7py0dsnzp8zg7q2gkyxv1iwhh55" + "commit": "6ce4a13b1de666a90f5acfdfd8c78f6ea2013c60", + "sha256": "16xam2yhj77mj388hrzbh2ah8y1k5sbfacavjmriaxrnn5c8v16d" }, "stable": { "version": [ @@ -61874,8 +62440,8 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20220111, - 1305 + 20220213, + 1809 ], "deps": [ "dash", @@ -61886,8 +62452,8 @@ "transient", "with-editor" ], - "commit": "16b60452e40b79dd35f40deeb61cc203a581a1c0", - "sha256": "1ghx9jk106f4m3wlk87g68ksm4cnwk84777kyf96riwhrs2bp88a" + "commit": "d52ad7dacf17b659060e52d5e3318cafd7946616", + "sha256": "05ibxsbfdaqdiabwl92j3mgcyf0gk5bzlwdlfms2f76wbrmpqw0l" }, "stable": { "version": [ @@ -61921,8 +62487,8 @@ "evil", "kubernetes" ], - "commit": "16b60452e40b79dd35f40deeb61cc203a581a1c0", - "sha256": "1ghx9jk106f4m3wlk87g68ksm4cnwk84777kyf96riwhrs2bp88a" + "commit": "d52ad7dacf17b659060e52d5e3318cafd7946616", + "sha256": "05ibxsbfdaqdiabwl92j3mgcyf0gk5bzlwdlfms2f76wbrmpqw0l" }, "stable": { "version": [ @@ -62004,6 +62570,30 @@ "sha256": "04av67q5841jli6rp39hav3a5gr2vcf3db4qsv553i23ffplb955" } }, + { + "ename": "kuronami-theme", + "commit": "f1fe04f11b3ab6ee00a36d2d171d7042aebe3115", + "sha256": "00f5lxhpqy1p7nlaw7nka90hy95dqrg7flfv5i9f8nrx9r3r7rpp", + "fetcher": "github", + "repo": "super3ggo/kuronami", + "unstable": { + "version": [ + 20220309, + 604 + ], + "commit": "910e8fa56a0cfe89dae888522f9fec4045d017fb", + "sha256": "0pghi50ffzlp7igvq81dmrbrwyj9ivl5kkxm47hff7qgb9rvx8n1" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "910e8fa56a0cfe89dae888522f9fec4045d017fb", + "sha256": "0pghi50ffzlp7igvq81dmrbrwyj9ivl5kkxm47hff7qgb9rvx8n1" + } + }, { "ename": "kv", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -62027,11 +62617,11 @@ "repo": "reactormonk/kwin-minor-mode", "unstable": { "version": [ - 20220115, - 1522 + 20220120, + 2125 ], - "commit": "ec1e794168692c71e5bf89e124981f790b2a726b", - "sha256": "1c9jq6msrvw9mh2rhcrr402k4c0hhn3d3i7cr1zmiz1r3nffmm5p" + "commit": "20fac6508e5535a26df783ba05f04d1800b7382c", + "sha256": "1zs0wn0ff5hbv4rgqa7137s3269dqi7fg9bam56rw5qrr72lq5a2" } }, { @@ -62072,29 +62662,29 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20220108, - 1536 + 20220301, + 1629 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "14c6cc2ff8c0c6b20b83fb075b94a8661a985249", - "sha256": "1vz0q7z3n6iv2m3xiw5m5f17ifig47c08zz2sm3svqwjq328pnwh" + "commit": "b372f9a44bea03cce09b20cd2409e3ae3fa2d651", + "sha256": "1f2cfvc4iz71x43z8f7v24cnfdvn249685qqz9lz16j2sga9f3y1" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "e9bc939237bed4ce50d3d403120f7206c835ea4a", - "sha256": "1z2r52x9fsjm1y2m8n0fm9ymd0dx798iw5b3x79fkhnrrw4wfq0s" + "commit": "b372f9a44bea03cce09b20cd2409e3ae3fa2d651", + "sha256": "1f2cfvc4iz71x43z8f7v24cnfdvn249685qqz9lz16j2sga9f3y1" } }, { @@ -62144,11 +62734,11 @@ "repo": "dingansichKum0/lacquer", "unstable": { "version": [ - 20211005, - 1517 + 20220321, + 720 ], - "commit": "3ef4c22982119674861ed61e3302ac3e0f05be2b", - "sha256": "0m05qyy0w5k9ycb2ywv222cy99brw2d1gmcan6b4311r04fv9k70" + "commit": "0d7d09f7fe22fb0241e91228ce44568ed3e3e798", + "sha256": "1xfh4yi5r96vfy0zmr09lkvgzf7v82cs03y3jvflpz75acmbiryh" }, "stable": { "version": [ @@ -62205,13 +62795,13 @@ "highlight", "math-symbol-lists" ], - "commit": "215a0e2434811f026c357f92ca15652e31a945a5", - "sha256": "026vp7h5i6yqvafap9n1g3sh0a3zz8pgbxy4nkhnfg7spdr29svm" + "commit": "c73645f35868bf436f9b50dc81a75b58c7e10806", + "sha256": "0bpyzm71b1fh48yp73m4vh99c7q4sd69lynkww6c8yrjdqlwbb27" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ @@ -62219,8 +62809,8 @@ "highlight", "math-symbol-lists" ], - "commit": "215a0e2434811f026c357f92ca15652e31a945a5", - "sha256": "026vp7h5i6yqvafap9n1g3sh0a3zz8pgbxy4nkhnfg7spdr29svm" + "commit": "0476fbec66e99750abe9d60c3aa9cb9a52189bea", + "sha256": "0bpyzm71b1fh48yp73m4vh99c7q4sd69lynkww6c8yrjdqlwbb27" } }, { @@ -62345,56 +62935,49 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20210916, - 831 + 20220321, + 638 ], - "deps": [ - "cl-lib" - ], - "commit": "906fac7d91994d02120cfb5f547c1d06cea1ad69", - "sha256": "1rgf90z6rl5g348s49w39ng7avq2s9qwi7mmpfxi3hjaslazn1jl" + "commit": "46a44793a2ac73c7b70f8b4c11818423aa1582e3", + "sha256": "0i3qww2lc7kcvw27iwwvi871k81s8jc2rbfbpcnrsy3cnrxx7smd" }, "stable": { "version": [ 0, - 16, - 1 + 18 ], - "deps": [ - "cl-lib" - ], - "commit": "906fac7d91994d02120cfb5f547c1d06cea1ad69", - "sha256": "1rgf90z6rl5g348s49w39ng7avq2s9qwi7mmpfxi3hjaslazn1jl" + "commit": "c945568a2e40e8d7e9738a534ce54e9ff59779c6", + "sha256": "0ny0sicma48snzyhh6xv1zv4vc87mmf4jyacpky3i6mk6gdwxfl8" } }, { "ename": "languagetool", - "commit": "ce91d4013963eacf1525809684e64ca52239fb73", - "sha256": "1cbhamz8yhfnyhzbn4j0kp9sbsycq1hi0j2kr3yhbf66fgi6x9f6", + "commit": "a13cea5ae978736cd2ab2752c5b49a360559f6fa", + "sha256": "0996wf63amacp7c73bxsysmkl7v536433ll61yd7h9zi2kysjzfd", "fetcher": "github", - "repo": "PillFall/Emacs-LanguageTool.el", + "repo": "PillFall/languagetool.el", "unstable": { "version": [ - 20210722, - 702 + 20220127, + 2215 ], "deps": [ "request" ], - "commit": "d3665a97cc87577f434a7476e1194b43f35408a8", - "sha256": "0gpnczvdwrcvvd162mi9nf55b0vzbpfmbhan1bqzc84rbjw0bzql" + "commit": "ea50c120ee3418489b43d51ed750288791d6eb95", + "sha256": "0xm6yh6aybz8mnf6lh0dx9qgbk05kr2chiw4pnk9w6n9apssx9xa" }, "stable": { "version": [ + 1, 0, - 4, - 3 + 0 ], "deps": [ "request" ], - "commit": "d3665a97cc87577f434a7476e1194b43f35408a8", - "sha256": "0gpnczvdwrcvvd162mi9nf55b0vzbpfmbhan1bqzc84rbjw0bzql" + "commit": "ea50c120ee3418489b43d51ed750288791d6eb95", + "sha256": "0xm6yh6aybz8mnf6lh0dx9qgbk05kr2chiw4pnk9w6n9apssx9xa" } }, { @@ -62881,8 +63464,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20211220, - 917 + 20220124, + 1813 ], "deps": [ "dash", @@ -62890,8 +63473,8 @@ "flycheck", "s" ], - "commit": "a4205749d20a09871f0951c34f919d4ee5fbdb55", - "sha256": "0jqfnwjwn5payjj1lfl1zvw8gpcdlc6k3lqbw6iwpzlyal7y0nyb" + "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df", + "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p" } }, { @@ -62987,11 +63570,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20211214, - 1449 + 20220307, + 854 ], - "commit": "3ec65b8931e8989ac590e95921e46f9e2fac6821", - "sha256": "10dxcwl94192yhilp9dimm2zrxpcz48rayd9w0vzk874qmn5mzz3" + "commit": "b55384d9cd14aa0ba3eb100660f929cfa6674558", + "sha256": "0wn9v7qarciq16hhcl8dy8yp1hcdhmircqkla59g5khv3qybjphs" }, "stable": { "version": [ @@ -63026,8 +63609,8 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20211005, - 1331 + 20220206, + 1515 ], "deps": [ "aio", @@ -63036,14 +63619,14 @@ "log4e", "spinner" ], - "commit": "e278b099173dced55e6e39f9924e90899542ebf1", - "sha256": "1cm6z3ad3c704y3n0f1h38fhqrd69mrf7f4x79l8v76f6fj8vdhh" + "commit": "b3103bd08c8943091f702c66d674f0f27ef7fe0b", + "sha256": "184dxfgsy1l6r1pn9c9jb22b8gw5hah1cnhl3sncd79mzv6gjhl0" }, "stable": { "version": [ 0, 1, - 23 + 24 ], "deps": [ "aio", @@ -63052,8 +63635,8 @@ "log4e", "spinner" ], - "commit": "e278b099173dced55e6e39f9924e90899542ebf1", - "sha256": "1cm6z3ad3c704y3n0f1h38fhqrd69mrf7f4x79l8v76f6fj8vdhh" + "commit": "b3103bd08c8943091f702c66d674f0f27ef7fe0b", + "sha256": "184dxfgsy1l6r1pn9c9jb22b8gw5hah1cnhl3sncd79mzv6gjhl0" } }, { @@ -63224,11 +63807,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20210602, - 709 + 20220203, + 947 ], - "commit": "fb8f971c1b1b9d413399ccd3be8685fc5ed0a4c5", - "sha256": "013krafi3ki4h1g7kcdykgjs9ccbx6ys3zl6dvgvnvlkgcn5wyb1" + "commit": "d7dd9188a65e2ab7cf73c2e575a830baae38cb0c", + "sha256": "0wvx4wcn845v1fh5jlljlh7l28nwycpivaay7flqb52zz47xj116" } }, { @@ -63269,11 +63852,11 @@ "repo": "tecosaur/lexic", "unstable": { "version": [ - 20210729, - 1808 + 20220211, + 1347 ], - "commit": "a49235c918d626f5053344604cb1c464960762af", - "sha256": "1b4k80bm2p7sqh33dx72qag7056nlxqv9s8czql2qfvi8vlnwzz0" + "commit": "6301a5ad00cf8eb74e7a522c84c7ccabbec16241", + "sha256": "1bh5x3zhcx0pdfbqr90dvh6b4q361z6nsmzzcry4pld093wji0dn" } }, { @@ -63306,8 +63889,8 @@ 20220102, 1653 ], - "commit": "c196a9ba1f052f4fee68610a25ba43699ec432cb", - "sha256": "0c9mcqf5hl1x5hjwxlcdv5sngc0cgxfywfp6mc24ylqkqvf730bd" + "commit": "fc5ae30f6738dfd0664864698bfebb5423241ff8", + "sha256": "1ici0jqx136vcqh3rzcg4xgqsh3kjg65d5hnpivvhmflbjhkbxzr" }, "stable": { "version": [ @@ -63483,19 +64066,19 @@ "repo": "buzztaiki/lice-el", "unstable": { "version": [ - 20200607, - 103 + 20220312, + 2215 ], - "commit": "482e58ab83fff86ed754b00be27b62a219597e7c", - "sha256": "0yxkjyhfk8kpr8yqz54gdx6xwkj4s8bnbz60162jh12crj0bs5n7" + "commit": "0b69ba54057146f1473e85c0760029e584e3eb13", + "sha256": "06plnrxj6kgnl9mjcbc48mgagpa60yyyyribwicmcgg9pgrs0wad" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "69f2d87984f3f3d469db35e241fbbe979384cd03", - "sha256": "0hi8s20vw4a5i5n5jlm5dzgsl1qpfyqbpskqszjls1xrrf3dd4zl" + "commit": "0b69ba54057146f1473e85c0760029e584e3eb13", + "sha256": "06plnrxj6kgnl9mjcbc48mgagpa60yyyyribwicmcgg9pgrs0wad" } }, { @@ -63530,8 +64113,8 @@ "deps": [ "request" ], - "commit": "a4273a6dcc45dabf237c4bfd780ec22420711c70", - "sha256": "0lj997453mywdnl6zf5fvdgw4j4k3i2q9ayi2rnhdaikn5a36nmd" + "commit": "52fcd8efc293694af1b23ea401a2991f8554dbbc", + "sha256": "1cp0301l3byhzd4gyil9p7iljfgkjn2c93ilc9b88b1kj7cvbp2z" }, "stable": { "version": [ @@ -63569,20 +64152,20 @@ "repo": "ligolang/ligo", "unstable": { "version": [ - 20211119, - 1813 + 20220209, + 755 ], - "commit": "6d6dacd08ca9fc691acbee8bfad76887dea8914c", - "sha256": "1a03vrfb1wn4qigkslflm21v0fpzdl8g4r3mprr0vgi2w84zs5b9" + "commit": "618d98641a4fc1c55d07de72c12754b85da27910", + "sha256": "1kvkbj4rpvilxl6w119xh7x9w8xdw4cgnw7gd3vl50krzj9s1ajz" }, "stable": { "version": [ - 0, - 34, - 0 + 1, + 2, + 3 ], - "commit": "48d3f23922bfd36177562988fe7d1c63e8f893ed", - "sha256": "1a03vrfb1wn4qigkslflm21v0fpzdl8g4r3mprr0vgi2w84zs5b9" + "commit": "8fcf8424cbfb06d3b5a89b2ce60826a5e4bf76f4", + "sha256": "0h81778qq5j18gq8vyynb4x41zczvvprvvnis0xjl1mhpi5z2l72" } }, { @@ -63593,29 +64176,31 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20220102, - 1539 + 20220309, + 848 + ], + "deps": [ + "fringe-helper", + "ht", + "indicators", + "ov" + ], + "commit": "d60c0d498f12d550200d505cd8b43f953eff2ae4", + "sha256": "1kx2k2fsygf9qq9wq9cs6h7c4lr58ip781l9yrffj2vhhhmrg5kj" + }, + "stable": { + "version": [ + 0, + 5, + 1 ], "deps": [ "fringe-helper", "ht", "indicators" ], - "commit": "ff58aceed180bb6bc0d4477620689c7656144055", - "sha256": "1sbvrnin5q178b72aaqpz47jf5gn3d3znjqs4j7ydv4g1pxj3960" - }, - "stable": { - "version": [ - 0, - 5, - 0 - ], - "deps": [ - "fringe-helper", - "indicators" - ], - "commit": "4d73b84a84227b01b7fbc6f717f6c380682cde2f", - "sha256": "0qkgmg60jfcwfsc693x9c066vgbclgqwzkqbmjrc32kcs57zhvni" + "commit": "8bf9e6d70347a99528bab56f90e0210f9a88dad8", + "sha256": "0f78dnz0qmmq2g4xsm3a9kqg4864lghv1nbz0hj2c8mz2c58laqs" } }, { @@ -63629,8 +64214,8 @@ 20180219, 1024 ], - "commit": "7f5f8d232a647e3966f84aaf35aca7cfb1ea15ca", - "sha256": "1bbqlgl955y24jsggzc763dagsv7vnlzcav98f15j9gh54p6h8ws" + "commit": "254ee815eb3fe77edea7c9da6f6f3839163735f3", + "sha256": "1q66yylmd9af3sjmlxs4l6lk6kvshg2fmalappj89c4gs9idcip8" }, "stable": { "version": [ @@ -63734,14 +64319,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20211224, - 1358 + 20220320, + 1727 ], "deps": [ "avy" ], - "commit": "676dac6621e321b33a8d396fa27dd0ea619d21e3", - "sha256": "1g9w2ymihs649cck3vm0pb4591jzsyf2b2jfpyrwcxipqw30rj63" + "commit": "44e98956e04dfa8e440951c6cc6cefb9e64f1658", + "sha256": "0fhs1ha2j4k1pkfhyvc3x2mp9r3xl7slj6y4hqfzgllmhzmr93g0" } }, { @@ -63846,8 +64431,8 @@ 20211004, 1429 ], - "commit": "5450cf3fae023cb652ef7391d96d9969eadf3866", - "sha256": "005s4p73zman1pnk46ajwj1m0b648i067frfg6i37wikryrcnz95" + "commit": "08e6da70e485307b7c5777caeb60737de183d228", + "sha256": "0d5vkm5cpnl38zfbjfhbl6wffmrlxx4bxkh4w4f04pr97i899n9z" }, "stable": { "version": [ @@ -63962,8 +64547,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20220110, - 1932 + 20220209, + 1138 ], "deps": [ "ace-window", @@ -63972,8 +64557,8 @@ "swiper", "zoutline" ], - "commit": "9c03f3be2bae318363f1a35a01ab9906124610c5", - "sha256": "1jxc4pmlmsd7mca4x62kxyf7ynzr094m04bywmazh6yypb7nri5l" + "commit": "df1b7e614fb0f73646755343e8892ddda310f427", + "sha256": "02pmnn9cqslahnvllqzawp2j5icmb3wgkrk4qrfxjds68jg7pjj4" }, "stable": { "version": [ @@ -64263,14 +64848,14 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20211101, - 948 + 20220215, + 1814 ], "deps": [ "s" ], - "commit": "ba7d22140a165b0fdd900a8d04916115ca6ab8ff", - "sha256": "1bdybw44pmhfpikdv1kg2sx88546xyncks5a4b2s0ak4p66r82k3" + "commit": "f5133e65d8ffdab918cdfc269ac0c067a0de5e9b", + "sha256": "0gvha2fl5macpwsp4fpa9nv14sg0yqr90s3v92f6imx89ll0rcya" } }, { @@ -64310,11 +64895,11 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20220103, - 717 + 20220322, + 133 ], - "commit": "bbbcda1aa32c6c59b63e9593dd3477bc4da5c34a", - "sha256": "0dzk6sx3hqhkd9axp594yfl47hh8jqkp9wyx6m4hycz85sp83ndw" + "commit": "dc4f9d64a8483aa6e394178087c589cdefc571e2", + "sha256": "08hhp74s56h9k3hlfqky68aiv4qy79gnci46r5nh4mbkrybsijnq" }, "stable": { "version": [ @@ -64324,7 +64909,7 @@ "deps": [ "cl-lib" ], - "commit": "2c91d49be2450650236638a8100d9373ccd59d70", + "commit": "af7256e46b42cb954e16f9dec3511687697d9704", "sha256": "0i9468rh61l4xq918fgwk6li93lpm6zbn0lkpxr7pbvkgrl5xsr6" } }, @@ -64343,6 +64928,36 @@ "sha256": "1v37bii372w2g3pl09n5dcrk6y7glhpg8qiv17zsk9jy3ps2xm1b" } }, + { + "ename": "litex-mode", + "commit": "7a4aec729e374988455cf454f3f067b2127449da", + "sha256": "1997v07hphs3icl2a8a2azm8iym64ylhnmyp85qf4xagxp7kwx8m", + "fetcher": "github", + "repo": "Atreyagaurav/litex-mode", + "unstable": { + "version": [ + 20220308, + 1707 + ], + "deps": [ + "cl-lib" + ], + "commit": "59ef93dca6618c42db1b61fe0a44bdc8faf04506", + "sha256": "08i5v97azfxkp4aqsg2kijyy2w5swxhkplvp40v1bswyy3kn176v" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "cl-lib" + ], + "commit": "bad847232a9453db76a9a1de024bdcf4ed1e97e2", + "sha256": "07sic5ihf4680kcyw34gm1hyli7p63778awn697555bnmbd7y5as" + } + }, { "ename": "live-code-talks", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -64407,20 +65022,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20220107, - 329 + 20220208, + 308 ], - "commit": "27c81c6a28cefeaf20d6f00284a7b14d3ebf1001", - "sha256": "16sgd951mnp7g7hs8v24c85asfcwccdf6yafkd9qxhd048ngzdz9" + "commit": "d3c813f90083ee1a146b3e2d96c8bc47b9e7ff7b", + "sha256": "18kak48a6zs065xx7q47kqs9hx5n0lbr0a2pvlh1wxhncnh8vgpj" }, "stable": { "version": [ 4, - 7, + 8, 0 ], - "commit": "a5f1953904ae6ad7d347f15975d905b7f74ef16a", - "sha256": "0kaf7gki5m351gipa92kqbp3jf74c2vjj7nm57vkq4gkxr4wmfi1" + "commit": "cc2adbd4455dcc70cc1366af5e0754a619e75242", + "sha256": "14n8cf020hpz9hrhf7pxcxszvbkp19s5j5cz3a42n4jh7jpacdzp" } }, { @@ -64806,8 +65421,8 @@ "ht", "s" ], - "commit": "40e3b873e91393a19bd3251615817166aa2f5d4b", - "sha256": "1c4fx533xbffj5hj2nnlr76v6l9a1ah3pwbhncw7w31dq5v6vzx7" + "commit": "b5ca8bd44a900fb85636fec9b326d0c117d3b8a6", + "sha256": "1ay81g4s02jkwwy62s2c3218b5z9z012nyrqihlx44fyglyi27b1" }, "stable": { "version": [ @@ -64979,11 +65594,11 @@ "repo": "petermao/look-mode", "unstable": { "version": [ - 20190212, - 2346 + 20220313, + 2103 ], - "commit": "d686e4cfafeac24e07e3efdb9763472f78d878f4", - "sha256": "1qh21z83qsvw1s9vhqcmwbvhd0q0lgj8hvpjb2rmn4kqkcvqbn2a" + "commit": "4ab32794b07f77b1d243dc07239c417f20cab7b8", + "sha256": "0k7mnwqkd07lwwbb7vn5bfncrp6alfggv9m07bzk7c1v4s9fqwhw" } }, { @@ -64997,8 +65612,8 @@ 20160813, 1407 ], - "commit": "e22807f83a0890dc8a904c51ee0742c34efccc6c", - "sha256": "1c89hsi0h783s96d322mvqwlf00ndm2qnrc165wpxrdbns38kbbv" + "commit": "9db6372791bbd0cf3fa907ed0ae3e6b7bcf6cc57", + "sha256": "0zvdbrr205p4wbm7zcs0f72w0jcs8zfyif9fl7x561nv2lylxnlw" }, "stable": { "version": [ @@ -65017,20 +65632,20 @@ "repo": "0x60df/loophole", "unstable": { "version": [ - 20220117, - 1522 + 20220311, + 1130 ], - "commit": "453ad37fee78ff033a10c234085609a8288ab2b1", - "sha256": "0jd7bggydgfas7gd0bmf4q8dhfkza86imp99jhkap87qxpylsbkk" + "commit": "bd93fcd42fc2db76bf6bc3fbb4eb7401444bd04d", + "sha256": "15q0y594k5k9n96dygscc4a6jyslwri5z8sf1kg1shpkwyj3bjyz" }, "stable": { "version": [ 0, - 7, - 6 + 8, + 2 ], - "commit": "3036a821193988ed5dba6fbcc0f5797c743856ec", - "sha256": "17wkp0hljpxj48bkjrg2ypwrgwrggd4asppyw8apbky9q8q2imgs" + "commit": "4d887f7695b48be92c4226faf683c9c328257481", + "sha256": "19iv3jvl5zb4i1q5fvn57xka93z9w6sfb1m0ry8mqb8g2bp5alnl" } }, { @@ -65041,15 +65656,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20220110, - 144 + 20220209, + 320 ], "deps": [ "map", "seq" ], - "commit": "e7a6bd15cebe94d7dfe2732187afb50bcd58088c", - "sha256": "0yz9xxah6jg1wrvk2g4slrl1vaxc99icfb62ic62gs54s1cz27qs" + "commit": "e3933cccbce289eef2591cd0bbd42de55a56cba7", + "sha256": "14wd16dkqcn8ip6ijhzchdm9i6i205lgin66g7amrqs26vx6wqw6" }, "stable": { "version": [ @@ -65080,8 +65695,8 @@ "dash", "loopy" ], - "commit": "e7a6bd15cebe94d7dfe2732187afb50bcd58088c", - "sha256": "0yz9xxah6jg1wrvk2g4slrl1vaxc99icfb62ic62gs54s1cz27qs" + "commit": "e3933cccbce289eef2591cd0bbd42de55a56cba7", + "sha256": "14wd16dkqcn8ip6ijhzchdm9i6i205lgin66g7amrqs26vx6wqw6" }, "stable": { "version": [ @@ -65161,8 +65776,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20220120, - 202 + 20220313, + 1835 ], "deps": [ "dap-mode", @@ -65172,8 +65787,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "d20fda0477da5740c916614dc6e07deefc8b5835", - "sha256": "12lrw9ybddzjrqchvrg8d63mpfsq8fjnkp63algndw9clfn8haqi" + "commit": "fda433671f38874f0ebe66c43c64fec14af3f492", + "sha256": "1zszzw0a58s1clsvhvqxymivrw2x6p96cxx9pygr8is8f9353hpg" }, "stable": { "version": [ @@ -65255,8 +65870,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20211120, - 1840 + 20220222, + 638 ], "deps": [ "grammarly", @@ -65265,8 +65880,8 @@ "request", "s" ], - "commit": "8b2368675ab820b48abed3a3d7b5208fdc88d94b", - "sha256": "0wx51wra4gg7i2bf0q0y42gmnm8nn5vrzhlya678g36pk2h48h2z" + "commit": "20112b40fd3f6cbd20c659ef43a6da6635e610df", + "sha256": "1p3f90f0gsa8mj9pv905f51zb1ymyfbhz20171hv69klz4hlqfsn" }, "stable": { "version": [ @@ -65293,15 +65908,14 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20211214, - 1110 + 20220307, + 2312 ], "deps": [ - "haskell-mode", "lsp-mode" ], - "commit": "001032265f8770fc6a88c1dcd8838cd2707f0b30", - "sha256": "1axjafwfacsy5rcxavd6jf28gxrks94mnf4jcdvy5b78nz9imkpq" + "commit": "7cf64944ab3a25ea5d6f8d5e0cd33124182df991", + "sha256": "037wcvan0185bhzzhi4phw9z245a28s29zvyfik04c27n0bhm2xf" } }, { @@ -65363,8 +65977,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20211124, - 605 + 20220325, + 547 ], "deps": [ "dap-mode", @@ -65376,8 +65990,8 @@ "request", "treemacs" ], - "commit": "ce03cb6574566e334c3ce5735458cc3ec1989486", - "sha256": "0z18b7xn9rgrs8w485bzw93g1nimfp0616d9xlrj0wc4k1i8vyd4" + "commit": "0968038b9aea52ef3bf499e597cf3800d913c059", + "sha256": "1rpssrv1avbfq47h23qiymzhzddcxgs77diwq3mavqkxkqrkj3vz" }, "stable": { "version": [ @@ -65518,16 +66132,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20211024, - 809 + 20220222, + 656 ], "deps": [ - "f", - "lsp-mode", - "s" + "lsp-mode" ], - "commit": "8e30ee2f9190921f9549620145e46961db273d39", - "sha256": "052jw0an51wj3y995cxf7mxdbjsx8140196siq87fkccvwry18sy" + "commit": "435128d5cdc8822ccf1bb58f45184cdd9fb8589f", + "sha256": "197drh6lwghdcf52hdk7kc315jlpxlaz8cj76b4q28s0g63bh8bc" }, "stable": { "version": [ @@ -65552,8 +66164,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20220107, - 1434 + 20220314, + 1111 ], "deps": [ "dap-mode", @@ -65565,8 +66177,8 @@ "scala-mode", "treemacs" ], - "commit": "743db8df15375ff9270424951d2dcc3a7e8e7a0b", - "sha256": "1251hkpjh0s51znpqhfg193c67fcyr9b7i9hfs8xfalivjpnj254" + "commit": "b7fe3ade85d020560947f1a4f4913130c9dd1809", + "sha256": "0dq18p5bqqyf36mqck0iprydjm77y29k8n2d25xz26i64s3pkykq" }, "stable": { "version": [ @@ -65596,8 +66208,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220115, - 1742 + 20220325, + 1415 ], "deps": [ "dash", @@ -65607,8 +66219,8 @@ "markdown-mode", "spinner" ], - "commit": "1d9da9f24fd477faa2a38b369842a27fe5bda160", - "sha256": "1p0jdfrn3v4qh0x29i5x6x5lkqd2y9wi6rx5w7kwbv5c5wfxcgw2" + "commit": "95a5270ff783af063392286e8f45cf338c5a9765", + "sha256": "1sbww4m1pm5n0y3gzsqdggv39ic39gy0l15va5m26pvz9ffd7367" }, "stable": { "version": [ @@ -65763,8 +66375,8 @@ "ht", "lsp-mode" ], - "commit": "d428dbcf1802fbe147271c8dc74b073bd9cd7403", - "sha256": "0y31dajhd6jfla4h137k78clvwsfj1pdmgd61ni83yl6ackpvm8c" + "commit": "fa6698a6e33880feb16d264172aa665d14cb8a6f", + "sha256": "10y3gsc4wawh4rjv25dr10wb65wmwmrz1wnf5qsaglq2c5svhxhy" } }, { @@ -65781,8 +66393,8 @@ "deps": [ "lsp-mode" ], - "commit": "abf4d89ecf2fa0871130df5fce6065b7cf0a2721", - "sha256": "1cad09y36bf97mhgg7xncf4m856ys8n7zlbsgag5h5rja1ha71nl" + "commit": "ab052be5c4347e909dbfeecc83d43b9d75ccedda", + "sha256": "1bdlkqkqssz56kskff2pm2bkdb0bscfbqbd1vk3li20036c5dq05" }, "stable": { "version": [ @@ -65805,15 +66417,15 @@ "repo": "jjlee/lsp-rescript", "unstable": { "version": [ - 20210519, - 1101 + 20220314, + 1957 ], "deps": [ "lsp-mode", "rescript-mode" ], - "commit": "aac9673855314a1f34037eb785bccbd3f66d7695", - "sha256": "0jyn471mdklhw1il6bbnv5drrl0raiyh17p1qi6rdn20ywi1dbx7" + "commit": "7baf9adf10234cf964feefae99050268e9bc5681", + "sha256": "09jh4q3i0b71srfpsr4w0jk5rn9rz359v8k1pk80636g7448k8gl" } }, { @@ -65882,8 +66494,8 @@ "deps": [ "lsp-mode" ], - "commit": "dc4d5246afe8620cdffaff1a362529f5d63b1ef5", - "sha256": "1sb7apaqxv3mf601v3wxnx3v9jb71avh5m0dw4r80wbkxcgi65f2" + "commit": "010318052021ec041727e58e41752af094c8827a", + "sha256": "1rwszx7qza3nshcwvgq0lq3bnrggyq45k4363bhcqf95fbjl5jxl" }, "stable": { "version": [ @@ -65942,16 +66554,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20220104, - 1635 + 20220311, + 1634 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "21ce926eedd41ef305c2d89412506ce59b1a7eac", - "sha256": "0v58imgrcgqs4fla1cncsd3wk6a8d5v7j014nn0pirypwfznyq0j" + "commit": "96b1ecbfbf87a775f05b5f0b55253376a3bd61e7", + "sha256": "0xjskdws354zbs906frcmx37862xldpai09sicdk8jy2sdwhamk6" }, "stable": { "version": [ @@ -66055,11 +66667,11 @@ "repo": "hawk/lux", "unstable": { "version": [ - 20210607, - 1130 + 20220121, + 913 ], - "commit": "d158bb78029705a6ee848f8e00c09ba1f3575564", - "sha256": "1dkx6xas7dg07pgk4h3f7cdr6hmccw00qv3fi8l2vj462nd7cr5w" + "commit": "4304c89b3c9cccb256655b7d1058d7619e926dc7", + "sha256": "1fynv13wv13dzl7s84x6b4sav1im3rhrzds38w4vl1nx2jvgiya4" } }, { @@ -66157,14 +66769,14 @@ "repo": "emacs-pe/lyrics.el", "unstable": { "version": [ - 20180812, - 1841 + 20220206, + 116 ], "deps": [ "seq" ], - "commit": "d0b920be634a5be81ad49418cfaada0f0a57d6cd", - "sha256": "0926avnlxi8qkr1faplk1aj4lji0ixa4lv81badi5zsmpyyrwmm7" + "commit": "c3d42f1e039941f32f49252e1b1610de337b4470", + "sha256": "02b0b68bh4jymx08zy2dsgs134mknk1ygb10mpqmyy1z88785ybd" } }, { @@ -66175,30 +66787,30 @@ "repo": "SqrtMinusOne/lyrics-fetcher.el", "unstable": { "version": [ - 20210828, - 813 + 20220207, + 1326 ], "deps": [ "emms", "f", "request" ], - "commit": "f0212bea838f0c284ea97e051c9c6c63f1b527ff", - "sha256": "03mnj12b7y597p77066c979d0pbyz4a092vgjyb830dhihms2x5y" + "commit": "06bd0293dfa759df48faefd73be60d43d1febd17", + "sha256": "10lifif5nbbn172l6dyifm00q3ak91bp143ng3p2j5518vah2cb2" }, "stable": { "version": [ 0, - 1, - 4 + 2, + 0 ], "deps": [ "emms", "f", "request" ], - "commit": "4545f5c5609166198b5f6f2e12de7309d294b629", - "sha256": "135qiprw4r03s1cjkq2hr8i4a6p2aapiz07cw697mhkr3rvvvbam" + "commit": "06bd0293dfa759df48faefd73be60d43d1febd17", + "sha256": "10lifif5nbbn172l6dyifm00q3ak91bp143ng3p2j5518vah2cb2" } }, { @@ -66438,11 +67050,11 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20210907, - 804 + 20220311, + 1219 ], - "commit": "6fe271f371ccb06b599a782839030bb8dee8535f", - "sha256": "178whq47zs055srly8wzdai5p0d0s1n3p349kb5wx2d9c2lg0pnm" + "commit": "86f1ca9f0f45e61a1ac7b96c809a85defc4ca665", + "sha256": "0scg4n7p9k7kj18w2v73f3w5f6xwf7fpjvf0sa253jwpdk6ln5b8" }, "stable": { "version": [ @@ -66462,8 +67074,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220116, - 1908 + 20220326, + 946 ], "deps": [ "dash", @@ -66472,8 +67084,8 @@ "transient", "with-editor" ], - "commit": "2a7812705f5cf4b864bb162576415863f4116285", - "sha256": "02rnk0c3yc5ws7phiywkmak7d3zi9w4krxqalzbdhj22nhh0l7pq" + "commit": "b1702991eec2c068d282fc2f1bd665726a14e10d", + "sha256": "0gyvbhwm5x7wgm4cdp3v0h8vv5vkw066fmwsvlvgyqqppkq5pqz3" }, "stable": { "version": [ @@ -66500,15 +67112,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20211004, - 2314 + 20220302, + 1725 ], "deps": [ "cl-lib", "magit" ], - "commit": "018e8eebd2b1e56e9e8c152c6fb249f4de52e2d8", - "sha256": "1amr2c08mq1nnn6k66mgz4rzyni4np7gxm96g4qyla2cbfbachgk" + "commit": "efe484644666c6b7c544b0fb7b87e30703fa9425", + "sha256": "1n2q9px8b3s3732a6yiz9gvfxbya7sa2qnxidzcn4gdp867l103c" }, "stable": { "version": [ @@ -66552,14 +67164,14 @@ "repo": "ideasman42/emacs-magit-commit-mark", "unstable": { "version": [ - 20211101, - 948 + 20220315, + 250 ], "deps": [ "magit" ], - "commit": "5b60f0c88c33b8dbf73a41b388f55bf8e73e1d8d", - "sha256": "03i4rjwdqw2hf6nl5vwgh5zm235svrrnrj0wq82yk25f58dgskb6" + "commit": "f0fff86ffb669357b0897132d386c4c19dbf300e", + "sha256": "0l9fg19izp4f4ph9by1zz6nwpxpvgdl77kcbxykphf22wx5j0jyr" } }, { @@ -66570,15 +67182,15 @@ "repo": "dandavison/magit-delta", "unstable": { "version": [ - 20210104, - 1541 + 20220125, + 50 ], "deps": [ "magit", "xterm-color" ], - "commit": "56cdffd377279589aa0cb1df99455c098f1848cf", - "sha256": "19q04y61hkzxkqw2xi1g7m4bwaxpfwza7if6cm41g72kdb8r68vb" + "commit": "5fc7dbddcfacfe46d3fd876172ad02a9ab6ac616", + "sha256": "1kph5r9dy21pgfknpcdzzqfn6rqig5nvp8ksh16y13k3axlzvkiw" } }, { @@ -66769,14 +67381,14 @@ "repo": "magit/magit-imerge", "unstable": { "version": [ - 20211004, + 20220306, 2311 ], "deps": [ "magit" ], - "commit": "1ee213d7fa1536c86c128d09946b44ededbfac9c", - "sha256": "1virc4ps25nwv8jkyvlb4ylxpcz676bfw449izaly97f2f2a91hk" + "commit": "37bca48218dc32cad964e01e0f9936a90f634fba", + "sha256": "064mq1xp970gk23l1rpshs1a4spqq4q61b8jjlc6jps7ls888v6j" }, "stable": { "version": [ @@ -66799,15 +67411,15 @@ "repo": "Ailrun/magit-lfs", "unstable": { "version": [ - 20210918, - 2000 + 20220314, + 1957 ], "deps": [ "dash", "magit" ], - "commit": "ee005580c1441cce4251734dd239c84d9e88639e", - "sha256": "1mv5rw65gn2rsk654q1ccp7hdg6jfap123b652cf9chwxy6c6nrk" + "commit": "8ebe246f20f4ab5c9f191c38137833c7f01a0432", + "sha256": "08ild7xc9m8pvkb23x5kxdc7ar7gz7470fng1f0zjlk4izbf1nh5" }, "stable": { "version": [ @@ -66831,15 +67443,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220101, - 841 + 20220130, + 2007 ], "deps": [ "libgit", "magit" ], - "commit": "2a7812705f5cf4b864bb162576415863f4116285", - "sha256": "02rnk0c3yc5ws7phiywkmak7d3zi9w4krxqalzbdhj22nhh0l7pq" + "commit": "b1702991eec2c068d282fc2f1bd665726a14e10d", + "sha256": "0gyvbhwm5x7wgm4cdp3v0h8vv5vkw066fmwsvlvgyqqppkq5pqz3" }, "stable": { "version": [ @@ -66901,14 +67513,14 @@ "repo": "dickmao/magit-patch-changelog", "unstable": { "version": [ - 20210910, - 1333 + 20220313, + 1229 ], "deps": [ "magit" ], - "commit": "875f8ace4c38d1f6f2126ab0f038687c42f1ab2b", - "sha256": "1mbh5qshaiv5x6rlklzx9l3icccb9kn3rvbdaq1xbqbgfdpfhfwd" + "commit": "96936d2bd92c8bbf87f65bc293f3246014bc2764", + "sha256": "1k0674f9c0h468nl791nrvngymgbdljnsrwapnki5b3zvaxglckc" } }, { @@ -66987,14 +67599,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220101, - 841 + 20220325, + 1720 ], "deps": [ "dash" ], - "commit": "2a7812705f5cf4b864bb162576415863f4116285", - "sha256": "02rnk0c3yc5ws7phiywkmak7d3zi9w4krxqalzbdhj22nhh0l7pq" + "commit": "b1702991eec2c068d282fc2f1bd665726a14e10d", + "sha256": "0gyvbhwm5x7wgm4cdp3v0h8vv5vkw066fmwsvlvgyqqppkq5pqz3" }, "stable": { "version": [ @@ -67057,26 +67669,26 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20210525, - 2329 + 20220306, + 2311 ], "deps": [ "magit" ], - "commit": "fef1b7772fe192c434089b67644ff93765e384d4", - "sha256": "1g5nsg6zb3jrm7w1ssawv109ai2l7dpnd1dqrjsry2dnx1mxd212" + "commit": "ae9345d867539a4c5c635be04df2e26468444da8", + "sha256": "1klns192jlp0ba9gklkkjjhl33k7dha0ircpm4d11y8vcy3c3zh3" }, "stable": { "version": [ 1, 1, - 0 + 1 ], "deps": [ "magit" ], - "commit": "fef1b7772fe192c434089b67644ff93765e384d4", - "sha256": "1g5nsg6zb3jrm7w1ssawv109ai2l7dpnd1dqrjsry2dnx1mxd212" + "commit": "ae9345d867539a4c5c635be04df2e26468444da8", + "sha256": "1klns192jlp0ba9gklkkjjhl33k7dha0ircpm4d11y8vcy3c3zh3" } }, { @@ -67087,8 +67699,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20210811, - 459 + 20220326, + 519 ], "deps": [ "async", @@ -67100,8 +67712,8 @@ "s", "transient" ], - "commit": "60152d5c4e4b73e72e15f23ca16e8cc7734906bc", - "sha256": "1ri53hnhamp3b9nh9dld6wxjvsxrk883kw900gglvw962ndimx5x" + "commit": "67fd80c2f10aec4d5b2a24b5d3d53c08cc1f05dc", + "sha256": "00hs3a9hpxmwsrd8xxwn9cpxk69x5ghmxq205aqpr7mjigcg7n2d" }, "stable": { "version": [ @@ -67192,8 +67804,8 @@ "repo": "vermiculus/magithub", "unstable": { "version": [ - 20190512, - 2316 + 20220315, + 117 ], "deps": [ "ghub+", @@ -67202,8 +67814,8 @@ "markdown-mode", "s" ], - "commit": "9fb9c653d0dad3da7ccff3ae321fa6e54c08f41b", - "sha256": "047dyiysdhf81qfcmmaxzixgxy35fjm9wyhwwv9630s5b83fh094" + "commit": "dd62c7057155c0a334e6d9087779a2923d2300b8", + "sha256": "1v8nsv1y4fa3y2skx1w3gbf438zlf00zlmsxkh692kmvbkx4sdf4" }, "stable": { "version": [ @@ -67332,22 +67944,21 @@ }, { "ename": "major-mode-icons", - "commit": "c8f551bec8bdc5dee4b31edea0c2f92b3c77ec56", - "sha256": "02p5h9q2j7z3wcmvkbqbbzzk3lyfdq43psppy9x9ypic9fij8j95", - "fetcher": "github", - "repo": "stardiviner/major-mode-icons", + "commit": "15057fc5b590c36f62b78243f301a288c85a6d3f", + "sha256": "1rl0b7k45y3gyip4n3wf1hpl94h5q0ndhm84f83k36w8q5pqhy29", + "fetcher": "git", + "url": "https://repo.or.cz/major-mode-icons.git", "unstable": { "version": [ - 20200127, - 512 + 20220210, + 1404 ], "deps": [ "all-the-icons", - "powerline", - "xpm" + "powerline" ], - "commit": "b36eae2e976bad3c431b082c64b1a724a2ba1fe6", - "sha256": "1jjmma9lx5g4qprmy71izgdp564lbdb0wsiysl1f6d8wipml78ys" + "commit": "b0214e0af13cd3691c4d28f03e3108bd98ec7a85", + "sha256": "04zhns2ziwkz67zlnh4qc7faqq751f9mc5b38zmkh6nidlhfhjj5" } }, { @@ -67570,8 +68181,8 @@ 20210108, 1832 ], - "commit": "f4b37fffec7b6608a597e6a3f6900634802807b4", - "sha256": "0shk5n4a88r347h1fhayn0gzi242mc5b7i6b4aw0s63kw2yd4h6r" + "commit": "3a8398de3a79ca03f9fe55f6f31f70f3f62f8999", + "sha256": "1788n96c5h2s0qmwc7xw9anhcw6l0qqfbgx8mrp2n95mdix04n18" }, "stable": { "version": [ @@ -67596,8 +68207,8 @@ "deps": [ "manage-minor-mode" ], - "commit": "67cac2f9e3804fa815490b305e98e37fa55023ea", - "sha256": "1a36fpl6qhby64cnpm359sgsdbn0qakfc7qc8nkb6dl0lmbkfxdg" + "commit": "492307c6c67c1b397084d85129e2b82cfd2c6556", + "sha256": "1di0m42hxi276a1axqayzvwqalw77zxy89qlnshldh373r5s20ax" }, "stable": { "version": [ @@ -67773,19 +68384,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20220114, - 2142 + 20220312, + 1357 ], - "commit": "c66d301dd12e0346cbc6756895c6cfcf17d3e8ae", - "sha256": "1hs37r1hr1mdzh9h9bgs5rmr3z95xlqglw2nwc72ys35k90yk27z" + "commit": "e63d27e6fb24ed16339de9d813c555d40aa1e4ca", + "sha256": "0pfl2h0xgd9jbpzw8b25pa601gad8p4l470yrkhzyzv5hs7774s4" }, "stable": { "version": [ 0, - 11 + 13 ], - "commit": "9229d88ae4757f3439e81f51799758c009838cb4", - "sha256": "0gaqybj52skqcmxcx6k3zmw6lznzlr1fjvlaraic9m6n85xkvzki" + "commit": "bd98c02720bc59a5c185c293f60595d06dfd7637", + "sha256": "1qk6j7l39z92h4kvvbwcs85ilyx3d6y0l8zm33iar2pjnyks1kq3" } }, { @@ -67893,19 +68504,19 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20220118, - 1509 + 20220212, + 728 ], - "commit": "541bd7b48a4b7586f3c419f9ee1bb24810e1f56d", - "sha256": "0m634gigg6ypns2j9ipf97jv659d6zdcdfff825kazb31hz9lms4" + "commit": "521658eb32e456681592443e04ae507c3a59ed07", + "sha256": "162xfchw2nxsx5a53kx15qlhr0vqqsn1vpqjnfp3ys7yngs3vvdm" }, "stable": { "version": [ 2, - 4 + 5 ], - "commit": "7b854c8e70b6d6edee12aec4194f4eb239586804", - "sha256": "0g0ja4h651yfabm3k6gbw4y8w7wibc9283fyfzb33kjj38ivl5d7" + "commit": "eecf2f20b097f9e6a0eaf938af967122fbec35dd", + "sha256": "02vw1zsbwa2hc3sxvbpvbldi5cf1xgd5b9l6fwg24d24j6b2af0j" } }, { @@ -68108,8 +68719,8 @@ 20200720, 1034 ], - "commit": "9c2fca7a7709d5ba4d83020669ab9d8b6d992624", - "sha256": "1frlnh73aygiz099r3dh7jlfr55ijplww3zyj4ig70mzd8qm08b9" + "commit": "9fb36834f151ff47ae4122cc18c341f366f035fc", + "sha256": "0yb4kr5986shjjd8j6sjvynh4ijmq38y4yjy2hmrzk7chd658qnc" }, "stable": { "version": [ @@ -68189,15 +68800,15 @@ "url": "https://codeberg.org/martianh/mastodon.el", "unstable": { "version": [ - 20220111, - 2155 + 20220216, + 1103 ], "deps": [ "request", "seq" ], - "commit": "6113fa77d1cceb5bfe06d016dc2c81850c4b498e", - "sha256": "00npr64vkc20w17hlcn6xcysj67m0ad8hk1nig0xjhg3mrb76z5v" + "commit": "f7de456e918fdde1c7728e6fe435d9d40d98dd4b", + "sha256": "0hk3w0z9qh5wn76rab6glb269s2fardcy82llg4azjp2vna4zb4l" }, "stable": { "version": [ @@ -68297,11 +68908,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20211122, - 833 + 20220311, + 1955 ], - "commit": "c945bf50251150e0d4ad7ee751c7e9615cb4b3e8", - "sha256": "0f0h73n5zg766aqhd8w0s2lbg71av4nyswzbcxprah7l57yr6kzi" + "commit": "45febb409c474417562f79e90387d3568b4fc024", + "sha256": "0sn4c8gbvf68sn3qh75lq499lqds1rcc7ccifj5zgzxcgaf2x2wf" } }, { @@ -68804,20 +69415,20 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20220119, - 1855 + 20220321, + 2047 ], - "commit": "371f6554acfa4ecb9fc121f23539f77064f97115", - "sha256": "1csw64pva8x63v233v2rb2iv99139hv7yprjsmchbrjlakvs1df4" + "commit": "979acca991cdada7438f360ef0fec573b20f4f96", + "sha256": "0m46nil2bbmks6d9zg18246xfwjyghdfsim5fvfhxq39amw5rp9j" }, "stable": { "version": [ 1, - 3, - 0 + 4, + 2 ], - "commit": "b01c6a968e8be9990b1306ee62737dbf13525177", - "sha256": "082f013f8gbd67s6q9636lqhlhwlbg6z6n7icrqfj9x6671phwgn" + "commit": "57656a69d3c29ddb0d18697491f80674e1097eaf", + "sha256": "11iz95lm25vpdc3plpm3h1zlmfmfz08xlman8iqk5fa13636v7hj" } }, { @@ -68828,11 +69439,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210720, - 950 + 20220318, + 2012 ], - "commit": "181a21085035a9b625021d8a79cb52cbdee7a7a4", - "sha256": "1vsckwj57rl6qxikmmps4yfj0s4vy8m3j3aj3y0d6707jaawrgia" + "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", + "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" }, "stable": { "version": [ @@ -68860,8 +69471,8 @@ "auto-complete", "merlin" ], - "commit": "181a21085035a9b625021d8a79cb52cbdee7a7a4", - "sha256": "1vsckwj57rl6qxikmmps4yfj0s4vy8m3j3aj3y0d6707jaawrgia" + "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", + "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" }, "stable": { "version": [ @@ -68893,8 +69504,8 @@ "company", "merlin" ], - "commit": "181a21085035a9b625021d8a79cb52cbdee7a7a4", - "sha256": "1vsckwj57rl6qxikmmps4yfj0s4vy8m3j3aj3y0d6707jaawrgia" + "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", + "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" }, "stable": { "version": [ @@ -68955,8 +69566,8 @@ "iedit", "merlin" ], - "commit": "181a21085035a9b625021d8a79cb52cbdee7a7a4", - "sha256": "1vsckwj57rl6qxikmmps4yfj0s4vy8m3j3aj3y0d6707jaawrgia" + "commit": "fb5cfc2a5091ffa77894629538efb0ec953fb6e7", + "sha256": "13g281pyfdid3kcd00x04k12f5b4zyx3xk19h636wah9hn27dyjn" }, "stable": { "version": [ @@ -69225,11 +69836,11 @@ "repo": "jagrg/metronome", "unstable": { "version": [ - 20200502, - 1748 + 20220210, + 147 ], - "commit": "18257ecdd7b3d816104e83a5f0f96e676cc9fbfc", - "sha256": "14qzb1i9l149nw4zhx8jlrrz7nvflc974zr5lbv7vv2zky0pya6w" + "commit": "1e1bd5234f3ecfb608041d423be7412c461ad3c2", + "sha256": "1igx3ajzgrrhc1bxzj24bf1r9ipm3pd4haq82wqdqskf60gidkac" } }, { @@ -69312,8 +69923,8 @@ 20210131, 2152 ], - "commit": "0652273fe1bfbeb165715613e00583b96ed07c2d", - "sha256": "1qr1zg0ppl6xlg91a21j4dlbysglwyjs8x139b2gyf95xlfkxpkw" + "commit": "0ab2406db9b4d5dac2348dd033d5fd37abd92a94", + "sha256": "0jdv58k2h90jr2a7sxkif4diwj3c0978ajyhaapk58icihfn66sa" }, "stable": { "version": [ @@ -70185,8 +70796,8 @@ "deps": [ "cl-lib" ], - "commit": "82cfba411c544c862a0854f682494a437642c957", - "sha256": "02rg73rnz9kp73f6c9vm7wihg3hp4x3x7bw6khx206qjwpy8pcfk" + "commit": "a5f978e84e07a1d79c6c8e35043ac93d8e5d50ed", + "sha256": "19xbr4vbr3d1wx0a19jplrb27bhnxb4w65avg3n0avi4dg734yy1" }, "stable": { "version": [ @@ -70256,11 +70867,11 @@ "repo": "ideasman42/emacs-mode-line-idle", "unstable": { "version": [ - 20210215, - 2345 + 20220211, + 548 ], - "commit": "8454a5ef404c6f4fe954a10da6ce4fd4311decfa", - "sha256": "01aq4bgris8v7q0yfyz1928q4rh9mba3b799zw2df8slqiigbf8i" + "commit": "ab45689351aa089c9fa82805b2cf34847d26b407", + "sha256": "08flayni445wfzkmzzvppw6ak03c0asipxdl3b8rwmwjjxglx9pd" } }, { @@ -70376,20 +70987,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20220120, - 804 + 20220325, + 617 ], - "commit": "e3bbb6293ba243a8e1bf9d0b7167641a9f3b4cd7", - "sha256": "1bp52pfpgc2w52l80vly18bz6nhfg0xa6y0sawsk05fy84qq9bdh" + "commit": "03f7046dff86c5342af778ad3f9850af7e950aed", + "sha256": "1ab0s4jqav3l66zzgxpx9gr6p0s3d6rhd98jkh3i3hba7qqsjn7x" }, "stable": { "version": [ 2, - 0, + 2, 0 ], - "commit": "e02480f0b0a56b8575351db6504bf0d0417719ad", - "sha256": "0fh9nw7gz3bqpk6r1v6rggajhqaymk6hyww7i3hfb34g74qhyq3i" + "commit": "7b203db9e4295903792d999c40eb912b107ad30c", + "sha256": "14sik5hf3k2p4p6h2qrr5cknfzmksxyhng4xb2fg2cxdvxw7s1aa" } }, { @@ -70403,8 +71014,8 @@ 20220111, 1220 ], - "commit": "0aad6ff44b9ee496d8c1053c3d7cbc59e11e3999", - "sha256": "0x9x7f53wv02a3i9sjhmkx0bhk93civgq52rfi2maawshh8cwwdd" + "commit": "edf3fe47fb986e283e3b04cba443dcb39fe8720e", + "sha256": "1wr6xd3hhgnqjrr2d8llbrdaagi4wz77zfxh1jg2f2mj28i52ksz" }, "stable": { "version": [ @@ -70723,20 +71334,20 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20220115, - 1428 + 20220120, + 1155 ], - "commit": "90503f872b42670d4dbe62ce033042cac7062aa4", - "sha256": "163lggazsic4ivxcky2k93l1qcax973yxd6594wx3s5gadkqsyv0" + "commit": "aa6666eb344947bf1eb9d14619f4249403048321", + "sha256": "09yyihx6cpa724z6cj2rqspajwj325ipgpmckklpgq6l4h5xnwy4" }, "stable": { "version": [ 0, 7, - 0 + 1 ], - "commit": "ee5df762d10e60cc19e771b1a64da9459c584cf3", - "sha256": "1xzi93hp4jrxqi3x31cpx4ff1yh2gq9y7qvv65gj19cfk9a0da88" + "commit": "aa6666eb344947bf1eb9d14619f4249403048321", + "sha256": "09yyihx6cpa724z6cj2rqspajwj325ipgpmckklpgq6l4h5xnwy4" } }, { @@ -70821,6 +71432,21 @@ "sha256": "04xv4v2n03axjlpm9pg3j4zjapqjb7is3anx6laa90zbw3z2iv9z" } }, + { + "ename": "morgentau-theme", + "commit": "4eaf2cdd0089bb115e68d82c1c91284d9a7c1c48", + "sha256": "1fa7rak2yyz1aqhgxli3idq99vp6rqds7va5n92lzg447jxp84mi", + "fetcher": "github", + "repo": "Melchizedek6809/morgentau-theme", + "unstable": { + "version": [ + 20220319, + 1049 + ], + "commit": "a8da5640b4a9b72a3136901d0a1a03071d9fcb00", + "sha256": "1ksfw4slhbwsvydb3qvdwlb5nh47zv420akrssavw7527c657rkj" + } + }, { "ename": "morlock", "commit": "b6ef53bbc80edda12a90a8a9705fe14415972833", @@ -70829,20 +71455,20 @@ "repo": "tarsius/morlock", "unstable": { "version": [ - 20180318, - 2023 + 20220223, + 1454 ], - "commit": "b883d48024ddfffebe2d0dd69f5ed54c617f8834", - "sha256": "0xns4f39x012n7piiv6kgb45n932wxs5fp4yyq44p1mnr0m8v4y8" + "commit": "ca6d72900392f1940914ee38ac3ebbce89f11373", + "sha256": "1bb1z1ycbafzyd3rq7mdr9akjcyfyvx3p0l68akkach1yj4gk137" }, "stable": { "version": [ 1, 0, - 2 + 3 ], - "commit": "b883d48024ddfffebe2d0dd69f5ed54c617f8834", - "sha256": "0xns4f39x012n7piiv6kgb45n932wxs5fp4yyq44p1mnr0m8v4y8" + "commit": "ca6d72900392f1940914ee38ac3ebbce89f11373", + "sha256": "1bb1z1ycbafzyd3rq7mdr9akjcyfyvx3p0l68akkach1yj4gk137" } }, { @@ -71011,8 +71637,8 @@ 20210306, 1053 ], - "commit": "273be57ac69667558efc9548c3b50531f0027efa", - "sha256": "0pg8zcxi84gccyk5v2mq7ypcp8qhlcq2vs8ad2v2w0a19ipk7m5g" + "commit": "1b950579e8a422ef3aaaa1e183db330a448f18e5", + "sha256": "1gay1s7kgpkml9bk6s9a2srp19g64m57q2cc6r42h89z128wgh0k" }, "stable": { "version": [ @@ -71407,22 +72033,22 @@ }, { "ename": "mu4e-alert", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0b74ky51nx75vcrrbabr5cj2cx4yax5kgaq479hjp5yc5mq2q46r", + "commit": "9f978bdf14e60dd049a8a0a59b3ef94b17bc1f3a", + "sha256": "0jnm0xfw0lnmkl3kcddkkdl11xk55bs7g6mzarcgl44j8mlbwizq", "fetcher": "github", - "repo": "iqbalansari/mu4e-alert", + "repo": "xzz53/mu4e-alert", "unstable": { "version": [ - 20190418, - 558 + 20220320, + 1917 ], "deps": [ "alert", "ht", "s" ], - "commit": "91f0657c5b245a9de57aa38391221fb5d141d9bd", - "sha256": "0qr5ww2xj8dibglh175qcq4bdgzs8lylv28hkbijykjshr3pkzn9" + "commit": "cfd8bf3edab29ba7babb7cbe75c67aeb15a8a386", + "sha256": "1wgfs61x2m9prjnmc0019km177p9ayzyhxxf8py97fckxn2hkwlz" }, "stable": { "version": [ @@ -71522,20 +72148,20 @@ }, { "ename": "mu4e-marker-icons", - "commit": "52f7c75f26eb02a58ed023a9d709fdcc09e11587", - "sha256": "1lyxcw7a842z4ss47sa8gzyh84p886d3qsszz9vl6978gy77i4al", - "fetcher": "github", - "repo": "stardiviner/mu4e-marker-icons", + "commit": "d1fb8cc83e74cf9993c3123213d195935c61aa13", + "sha256": "160ycz6bbnczhxz3zixjbqa0d4rb8240lwjvk7aijgypzbgn95il", + "fetcher": "git", + "url": "https://repo.or.cz/mu4e-marker-icons.git", "unstable": { "version": [ - 20210124, - 514 + 20220225, + 1137 ], "deps": [ "all-the-icons" ], - "commit": "e5c4f9b14eab69a0a28f108c6fee3390e19bd080", - "sha256": "1a3cinvi0j92j65qfgzmnx6z0xvq4l2jkvw9wydhm3bkmi3v6ni4" + "commit": "66674ee00dbf953e7d8c1696fb12e9b5b4b272bd", + "sha256": "0pswfq8apihjglysphq3g4la39hyhrms0g010rp691m2mgg1lp39" } }, { @@ -71585,16 +72211,16 @@ "repo": "lordpretzel/mu4e-views", "unstable": { "version": [ - 20211222, - 1457 + 20220214, + 358 ], "deps": [ "esxml", "ht", "xwidgets-reuse" ], - "commit": "a1d7268eb2b737ee69b5bdf45aacbc30e50204fe", - "sha256": "00yj0ldyxhzqdsbxr4jr4rd4j1njy1r0blh7py2nlxqia22c015g" + "commit": "fa47f35e56edcc84f00d622e415ae970cc5df0dd", + "sha256": "05pam9w057yfqaqy4y66zkdih3py2534pyawg5r4ph7154dr8d3m" }, "stable": { "version": [ @@ -71745,11 +72371,11 @@ "url": "https://hg.osdn.net/view/multi-project/multi-project", "unstable": { "version": [ - 20211230, - 2223 + 20220312, + 2321 ], - "commit": "81262345927d30571d2797a8fb8dbd9eeeb6ccf8", - "sha256": "1ps0dvbms7bgpgbrvy2yajy4xp3nxrscvw94krdxvnb8ycnvdqrk" + "commit": "c0a37d5ee969ca8a783bf6c4a9084c4efeace86d", + "sha256": "0rn0iixl37px4sbkqxrfnfkq6kmb9dsn4x83rbz335dwniqxx5iw" } }, { @@ -71937,13 +72563,13 @@ "version": [ 0, 4, - 11 + 14 ], "deps": [ "cl-lib" ], - "commit": "c34536186088f29d4e85631825e7c6d557a8d0fa", - "sha256": "0iqkgs3rrkhbj2mind4aa4qv7bf7vflnkdysd39b50jbwd7rv4fx" + "commit": "910f4c929e1d9c1844ddc467f72eef2e03aa3f97", + "sha256": "13lmhp2vm953s4phqdd119kp7s3p0kb3kqz4z6g3ga6m6py3gq3i" } }, { @@ -72610,6 +73236,21 @@ "sha256": "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax" } }, + { + "ename": "narumi", + "commit": "961a81f77cebaf9361699dec65b733bf33bc92b4", + "sha256": "1d81z6zxxlv2sih28ar6s93ic49z9qy4q03r115k0559bqy47gjh", + "fetcher": "github", + "repo": "nryotaro/narumi", + "unstable": { + "version": [ + 20220228, + 243 + ], + "commit": "5bfb114adc0e6a2d5aebcd6335d1e6850e3f9722", + "sha256": "1vacijawhk60jqxkyk3malv1z6hd4w5dvzfkpf9nivj1fvhps9f0" + } + }, { "ename": "nash-mode", "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", @@ -72657,11 +73298,11 @@ "repo": "CeleritasCelery/emacs-native-shell-complete", "unstable": { "version": [ - 20220103, - 1622 + 20220124, + 1806 ], - "commit": "20e1dceb459856c8c4f903e6d8562991069bb8c1", - "sha256": "11m3y6kbjm0nqmdqbcv4xrchcabh4x1w4gy1p8gp36k600s1h7zj" + "commit": "5f94022fc9168971c77f8c12f9efd569c45f4850", + "sha256": "0lfqvm71lxxga06pjzcdydjpgd3548rql7bsjdvbknkwx2p54w4g" } }, { @@ -72978,25 +73619,25 @@ "repo": "SpringHan/netease-cloud-music.el", "unstable": { "version": [ - 20211030, - 1339 + 20220305, + 1224 ], "deps": [ "request" ], - "commit": "d821e0359883ae5ccc12a1cb0f684909cbde98a3", - "sha256": "0p595lfwzzmjzxx4mdzp47bab07ypxkk3jk3yzvd1dcf2lgd0h9k" + "commit": "f238d1d45bbeee32e0a8d169f39de4360be908f4", + "sha256": "0i460vn7plvxrzbzlnfldx36aymy0x666r5w3mak3a5ksyqpbi1c" }, "stable": { "version": [ 2, - 0 + 1 ], "deps": [ "request" ], - "commit": "7cfa76d79b8432b0edb4c188c7a9b6634b78fe53", - "sha256": "0ikkg9llch1rh0infwcwf4104ahckxbsrhpbmy01p928rjkhvl3q" + "commit": "221d8705eab4b66b1a4fa42655ac38271dc7a6e4", + "sha256": "14cr4r360invcx0a7036gaa1dbrpxvsh1i7885nfkk9iwmnwjwbc" } }, { @@ -73404,8 +74045,8 @@ 20181024, 1439 ], - "commit": "e234b25bb51a4d3ce5376febb4ad9a11e77d5ca3", - "sha256": "0j0c4zdii67j6r69wjc726yjs5ad2nc75k93d6w9v9b7wxvjf4wb" + "commit": "25cdbae0ee1270a5c8dd6ba67696e29ad8076919", + "sha256": "1fwqvjg39l7321ykph3fd8dmkdy4q381jlg1jwr7ynmm285rfs9j" }, "stable": { "version": [ @@ -73503,14 +74144,15 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20211120, - 1627 + 20220228, + 1520 ], "deps": [ - "magit-section" + "magit-section", + "transient" ], - "commit": "3d04d92d9c3896d07bc9fed7e4f40032025fbe7b", - "sha256": "0rzgnr18gk37y8i4d7rgwjhrxwby0zpkam8k7rf4jq35jjhqr5a4" + "commit": "20ee8d88900b169831d6b0783bd82d2625e940c7", + "sha256": "0qv5cin9668pxm5cjhrl5sf170g62qqi954q4y2yj7zh3q0qhwpi" }, "stable": { "version": [ @@ -73685,8 +74327,8 @@ "repo": "dickmao/nndiscourse", "unstable": { "version": [ - 20210926, - 1845 + 20220210, + 1529 ], "deps": [ "anaphora", @@ -73694,8 +74336,8 @@ "json-rpc", "rbenv" ], - "commit": "168b5ff1d8d8c39ac2db31e56fbab0927d557d7f", - "sha256": "1vka4i3hsgvwiwqh06xsdrlf50q7mjzyvc4gdk28705gaxnzqmiy" + "commit": "1b7d7bfc99b104b7c4948af9f3394b416105e9d9", + "sha256": "0c38j3drf89f98b6h3xcky6alggszrr86325g72mlbkknszkhh95" } }, { @@ -73741,8 +74383,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20211116, - 1718 + 20220124, + 351 ], "deps": [ "anaphora", @@ -73752,8 +74394,8 @@ "s", "virtualenvwrapper" ], - "commit": "7347ad1f3db7351c2e7f9a06d2ca8873130dbbfb", - "sha256": "178sq7rsghqhmhjdxixrybls00g7mp6wbmsx9lzg8c0ywpr9n332" + "commit": "ddb59e309018416d1f867b6dddca44f17a1b6bb9", + "sha256": "1qj1yzpgcdn550lb1c9hqc3wb46pah6h00y3m3q3n2v6cks8lnmc" } }, { @@ -73764,16 +74406,16 @@ "repo": "dickmao/nntwitter", "unstable": { "version": [ - 20210911, - 1751 + 20220213, + 1654 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "a802ef9b589dda41bcb5d6cfce2faf8948c20c8c", - "sha256": "0fcskdyapz59cvik117vzj7hyv8kvvp6kh0aing2bgndwvai4apg" + "commit": "354781f9d2da04649823a6923ad372d801f10ca7", + "sha256": "0y6cniqjgyap95jq2crfwxa72f2ln4frn299p4b9p26n2q6a3rrh" } }, { @@ -73799,26 +74441,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20220109, - 1843 + 20220315, + 2232 ], "deps": [ "cl-lib" ], - "commit": "3c6601f7f45dd42c8f951c2b160470c8dd33c949", - "sha256": "17lg31ln2dgjvpm4il4ibyd7ii5dhkv0jwikxazvxd7jiyjah6xh" + "commit": "13414b7a294fa6f35bbeb535cdcab6b256e39da7", + "sha256": "1grc5fk7ng4d6i8fwfpm3cb2b19s9sbdjbdn8ybchk7cj45kkl24" }, "stable": { "version": [ 1, 2, - 4 + 7 ], "deps": [ "cl-lib" ], - "commit": "665e324abb690fb50e9d255bc656eb12bb83b0c6", - "sha256": "1gk1l5zk5r8alnzfbfsck5gxcwr55k04rd08sxmb4j9jds6w6zyv" + "commit": "13414b7a294fa6f35bbeb535cdcab6b256e39da7", + "sha256": "1grc5fk7ng4d6i8fwfpm3cb2b19s9sbdjbdn8ybchk7cj45kkl24" } }, { @@ -74066,6 +74708,29 @@ "sha256": "1p16vxai8dj1vy4ahflwij1ldx00jzrjcinpgpc7wgh6ka748v11" } }, + { + "ename": "norns", + "commit": "c40cac0da3033b1e18edd5813deed53c6c831594", + "sha256": "0zsfsg30smi0wi9854ibcakgr6wp9impy7kxdcghqvvs251sjfns", + "fetcher": "github", + "repo": "p3r7/norns.el", + "unstable": { + "version": [ + 20220315, + 1155 + ], + "deps": [ + "dash", + "f", + "osc", + "request", + "s", + "websocket" + ], + "commit": "b70ab2f9a58859243762c633628ad515f5563da8", + "sha256": "0cw0ry30im3b4b70n7rsp8pyv1567kl7byjck3rdlfrl7ll9bzr6" + } + }, { "ename": "northcode-theme", "commit": "25dcd4dd8189ad0fbf6c31874daa618bf1957863", @@ -74113,26 +74778,25 @@ }, { "ename": "notmuch", - "commit": "d05fbde3aabfec4efdd19a33fd2b1297905acb5a", - "sha256": "0pznpl0aqybdg4b2qypq6k4jac64sssqhgz6rvk9g2nkqhkds1x7", + "commit": "e3077f441b343d54d88490811eb2477e6ead87c4", + "sha256": "0n9qfr0qnb93ws3ys2qxlqyf1ardfa6phq1rsj57i1r8wkly5ddf", "fetcher": "git", "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20220114, - 2112 + 20220226, + 1200 ], - "commit": "87d5a5a8aa323077c0b79fce42d062839eb2ff2d", - "sha256": "0xlqw79ahqz37dhgzlma9gwnm93vsnqg1vjzmzkcvkq3fjkbklsq" + "commit": "8ed6a172b35708428f84f30af44fa81c12852e43", + "sha256": "1gknm711bfyvl7mrd0an1rjlw584vrxj8j922wy60j9mrka1wmgz" }, "stable": { "version": [ 0, - 34, - 3 + 35 ], - "commit": "51c287ead807b6e3830bc5d393a7e9a89f36db86", - "sha256": "03rivc1lg9bcggrz4y75nk3wz4s0mbyqwdpcy4bldka2c2kz9892" + "commit": "7b5921877e748338359a25dae578771f768183af", + "sha256": "1jkninm2ynavacmz835s0v5iy10fw7b3v6hrnhvk1yr7zyiwhy88" } }, { @@ -74292,15 +74956,15 @@ "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20211230, - 954 + 20220320, + 1009 ], "deps": [ "dash", "esxml" ], - "commit": "2b4a7231aff6211a5a2f28719d830887aec6cc57", - "sha256": "11lwhwiyvhcj0gk9ifdjjj9iw41j3b5rdhk0x3hl8mfibrpqg3fs" + "commit": "b6ea69a83fef6c4f547da3a4551ebed2cfe436a7", + "sha256": "1jxqwn8ybb61y59p7302ac9ph65xlqyrk8nqmswrr2czm1px7zjb" }, "stable": { "version": [ @@ -74363,15 +75027,15 @@ "repo": "shaneikennedy/npm.el", "unstable": { "version": [ - 20210930, - 703 + 20220222, + 1650 ], "deps": [ "jest", "transient" ], - "commit": "2bd544162cdfce69d70806446569d12ec27ad46c", - "sha256": "024p9wn365qdl7gmzljk6hp9snixqffg3vqqivndxbgykcjg4sar" + "commit": "45d8084aeafae415dc45ddc9c3a18b546315fcc6", + "sha256": "1iai69sdjfl9ynif7cbg654r8wdcjlkk8w8qzd2x4wxg72bfa2d2" }, "stable": { "version": [ @@ -74628,6 +75292,21 @@ "sha256": "0b4bgc4hkndia8zg4d23l1w78iwzj1l46ifrhz5z1p97qldalb0x" } }, + { + "ename": "numbex", + "commit": "127a0664d008e6a6219118d3e4852a46433b6147", + "sha256": "1kky6c5ff99byzmkash3kr1lh6fjq49ixy9769wmmqs2rmz1r3pk", + "fetcher": "github", + "repo": "enricoflor/numbex", + "unstable": { + "version": [ + 20220323, + 2011 + ], + "commit": "c1db2846cf7448307500fec718fab7a02b179c8b", + "sha256": "0kssw66g4hy5xs8map2vn3vygjhawp9jl0wx7nmjaaz8vagv8zca" + } + }, { "ename": "nummm-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -74651,27 +75330,27 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20220119, - 1655 + 20220304, + 1546 ], "deps": [ "dash", "s" ], - "commit": "7b803432ce62fc54a5c9d87294e3a499e55381ae", - "sha256": "0vmkfjd16v40gfh6w4lqn84jdljk5rz1rmh7sbb8dnfxfkvh9y9f" + "commit": "1b8c5ef3301fed5e5c1941817dbb7435188ff417", + "sha256": "0vd8hpirib67zx61zb4abxpm9fq7kahabcizananf4k207zmv66s" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "dash", "s" ], - "commit": "7b803432ce62fc54a5c9d87294e3a499e55381ae", - "sha256": "0vmkfjd16v40gfh6w4lqn84jdljk5rz1rmh7sbb8dnfxfkvh9y9f" + "commit": "1b8c5ef3301fed5e5c1941817dbb7435188ff417", + "sha256": "0vd8hpirib67zx61zb4abxpm9fq7kahabcizananf4k207zmv66s" } }, { @@ -74724,6 +75403,21 @@ "sha256": "11fa9g05gsh2yjvhy1xjc6hkby5z98mb2bmbshdp89fvlsdksv3i" } }, + { + "ename": "nxml-uxml", + "commit": "fe5ce2d30569e0e957e175346579409567bdb0bd", + "sha256": "1xjzrnq75syi6a555j3395z0ynfxy7ywg61xzrcirm5i1h5z7afl", + "fetcher": "gitlab", + "repo": "dpk/nxml-uxml", + "unstable": { + "version": [ + 20220130, + 1405 + ], + "commit": "94440741f7e8b83504d53991f26f63b4855cce27", + "sha256": "17k0d6ik2zj99kdvxdj5jg2kjj83lpy983mgcr3vv36axlw58wyr" + } + }, { "ename": "nyan-mode", "commit": "4d8c3000df5f2ee2493a54dee6f9b65008add753", @@ -74812,26 +75506,6 @@ "sha256": "0z9vkssdxkikwjcb3vrby5dfcixy4lw9r2jp7g9nls6w88l184jf" } }, - { - "ename": "ob-ammonite", - "commit": "508358506a6994baf120be2acba86762f5727c6c", - "sha256": "0wr7p3sfn9m8vz87lzas943zcm8vkzgfki9pbs3rh3fxvdc197lb", - "fetcher": "github", - "repo": "zwild/ob-ammonite", - "unstable": { - "version": [ - 20190813, - 59 - ], - "deps": [ - "ammonite-term-repl", - "s", - "xterm-color" - ], - "commit": "39937dff395e70aff76a4224fa49cf2ec6c57cca", - "sha256": "0aibvrhwj2swv9ixl6hx4b2yicbpi095mvs0fib7i1nhlg0zciqd" - } - }, { "ename": "ob-applescript", "commit": "23b075774be913539c3f057dcb7f24fbc05c37a4", @@ -75015,6 +75689,21 @@ "sha256": "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd" } }, + { + "ename": "ob-compile", + "commit": "7769e68ef350b3379e0523fe938b5c5ec270f8cb", + "sha256": "1kld4rcq2cwlllyf8wbp64yd7fsyarrxc28j4wh13942s34sh1zq", + "fetcher": "github", + "repo": "TxGVNN/ob-compile", + "unstable": { + "version": [ + 20220320, + 1343 + ], + "commit": "cbfad24503491ba2bb0fff7454c339e655968c90", + "sha256": "01jmyvan8f5p4v8yyafyvv6j6fm01y184b3y6wxfk4c80m2zh86f" + } + }, { "ename": "ob-crystal", "commit": "b9a7d43199a83ab6f672aaa69ef4e158c868f180", @@ -75448,8 +76137,8 @@ 20200320, 1504 ], - "commit": "cca09b64eff689d8bb15a77de9d4c7fe9845a1f9", - "sha256": "1wwmf14df2rnxlfs8bwb9p4q1a1plschbq2g9vqflphj6kv213m4" + "commit": "b4ce25699e3ebff054f523375d1cf5a17bd0dbaf", + "sha256": "0fhj3241gpj6qj2sawr8pgyn5b7320vjfb7idsy23kh4jvmj2wb8" } }, { @@ -75538,20 +76227,35 @@ }, { "ename": "ob-php", - "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", - "sha256": "0n6m6rpd0rsk6idhxs9qf5pb6p9ch2immczj5br7h5xf1bc7x2fp", - "fetcher": "github", - "repo": "stardiviner/ob-php", + "commit": "efb4e6d8540e6ca38c3aa0997116f5995ba1ea83", + "sha256": "09j53drzi2pkfzpjasmpfijsdlirh919vkg9yv9nhls2x3vgmrjb", + "fetcher": "git", + "url": "https://repo.or.cz/ob-php.git", "unstable": { "version": [ - 20211229, - 744 + 20220221, + 1254 ], "deps": [ "org" ], - "commit": "cff022a2aaaf1785e1937e232c31670d748b8c6e", - "sha256": "1g53j5wy7m3mkfbyk5m5rz49sacmx64j1xl5535fdc06cl2kcxjm" + "commit": "6ebf7799e9ded1d5114094f46785960a50000614", + "sha256": "1r99h49931xgqkw8hjyfw3agv8q9d87dkqnap973j4yjq36ddcw8" + } + }, + { + "ename": "ob-powershell", + "commit": "3490006379a8aaa3d6bd8d28b115475d3e2164f1", + "sha256": "0k7l2s2181mwz20sskgk3dxhxid861c7b9hmk2pgknb6dizi00hk", + "fetcher": "github", + "repo": "MoisMoshev/ob-powershell", + "unstable": { + "version": [ + 20220314, + 1359 + ], + "commit": "f351429590ed68b26a9c8f9847066ca4205e524b", + "sha256": "1lk3xikq4j5nw0z1mj1wq9p1i39zbjhznw0fn7s0wk0as7kd4nkn" } }, { @@ -75580,20 +76284,20 @@ }, { "ename": "ob-redis", - "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", - "sha256": "1xsz4cc8cqx03ckpcwi7dc3l6v4c5mdbby37a9i0n5q6wd4r92mm", - "fetcher": "github", - "repo": "stardiviner/ob-redis", + "commit": "baba2cef36a0e392b4df720d257642bcac67e724", + "sha256": "138q9405v5ihp9d24x4jkrmzrfhza2hjr31xhz7nfc2b63vh6mkg", + "fetcher": "git", + "url": "https://repo.or.cz/ob-redis.git", "unstable": { "version": [ - 20210527, - 1336 + 20220221, + 1249 ], "deps": [ "org" ], - "commit": "ad31bf482a081b9c595a02ee6053c1426e3d8faf", - "sha256": "1w8wbiwzi8b3gm376yyynvc833skkvgylmrn803pnqsa1ij77jni" + "commit": "44c83636ccbea0b3e9838b0180471905c30224c5", + "sha256": "0rm78qhjdfx1klv2gk04sm8h3vw3hdimaxfagrdc2j5nhbzxffib" } }, { @@ -75604,14 +76308,14 @@ "repo": "alf/ob-restclient.el", "unstable": { "version": [ - 20210718, - 2008 + 20220202, + 1609 ], "deps": [ "restclient" ], - "commit": "bfbc4d8e8a348c140f9328542daf5d979f0993e2", - "sha256": "0nq5w2gankvb7ix8rv33814j7qvhiawd9r15b9i6syn1i5k5pxhj" + "commit": "586f1fa07f76aaca13cb3f86945759f4b9fb8db7", + "sha256": "12cgjk3lpx8d0ms2j6b33s65jr4bg8g9cw9h2l82bm39nd6h5q9d" } }, { @@ -75680,21 +76384,21 @@ }, { "ename": "ob-smiles", - "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", - "sha256": "0d07ph6mlbcwmw0rd18yfd35bx9w3f5mb3nifczjg7xwlm8gd7jb", - "fetcher": "github", - "repo": "stardiviner/ob-smiles", + "commit": "b3335e721482d50f474dd7cb1650788036162145", + "sha256": "0zbs2camiqcc9mkpcw41mxdrsl2b551si1yiqpnhv3smvc2ppki6", + "fetcher": "git", + "url": "https://repo.or.cz/ob-smiles.git", "unstable": { "version": [ - 20210527, - 1401 + 20220221, + 1255 ], "deps": [ "org", "smiles-mode" ], - "commit": "9f1fed213eb194924ab7d12b9d6e1074578a791c", - "sha256": "1x0rq9l9j3khp47q2j9bnyhhj2xrs4zggw9p8rmmai165drh1i9r" + "commit": "d178f3d4a7e3c1ca9910f0a063d2a3cfd97d8609", + "sha256": "0p31nv4haqhnh7zbmj875sw547ach8wdybmfaqqsb4vk749wq7a4" } }, { @@ -75727,22 +76431,49 @@ } }, { - "ename": "ob-spice", - "commit": "a3ac7a1d9390785abbd006956846d4f67f89dd9f", - "sha256": "0nhdcvq7yvprz4323836k507w0g1lh3rdfr6dqrbj29yvsqfw0x2", + "ename": "ob-solidity", + "commit": "af4ad88a12fa74927ae7549d855917715132be96", + "sha256": "1bdl8wv8njq9lmwlj7sqzq6yrjc6b70v6p1a41dgjwvj55pjy6qb", "fetcher": "github", - "repo": "stardiviner/ob-spice", + "repo": "hrkrshnn/ob-solidity", "unstable": { "version": [ - 20210527, - 1355 + 20220213, + 1910 + ], + "deps": [ + "solidity-mode" + ], + "commit": "7e3e6cb2d7ec9269514e80248c7ec85c04dbbf89", + "sha256": "0zghs08558z8n7wx5r38szjhczvzyk3r7q8p107vh2v0adp0qz3d" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "d0ffe51b4fa02f5bff59e2e3c3f70f01255c28a9", + "sha256": "0fwhk7shjxxkdj1phmw60pagn3axfqjn7p0wibvaylplrnx2h7hp" + } + }, + { + "ename": "ob-spice", + "commit": "79b2eab8f2fc328df6c24661f35b246e46e6e5ec", + "sha256": "0sw5ffwbjlf2s0dbk883ljddh266p6crgvaf5ym8p5y0asijvp3d", + "fetcher": "git", + "url": "https://repo.or.cz/ob-spice.git", + "unstable": { + "version": [ + 20220210, + 1415 ], "deps": [ "org", "spice-mode" ], - "commit": "3c77144ecb059411441730bb47f6d5892b62d13d", - "sha256": "00cnym62hp0masikr3ndk2a0mpafjw0cjx0xavcq486w2xi7r8rm" + "commit": "6dc2c6b9391ea8dd8123224f6c282b673b89dc94", + "sha256": "15lnmqzpgaz8n6zh0x9dm6hynl7rf1pcyf5m3fk7bbinqbxclljn" }, "stable": { "version": [ @@ -76052,20 +76783,20 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20210923, - 1348 + 20220307, + 1315 ], - "commit": "7090b8dde4019fabef39cea329bc8e741f594aca", - "sha256": "07bn785bjl3s5d05mwyg5w1p940nbfvm1d2k9mgi7n76apj2q62a" + "commit": "f490dbb90052516e532b7cc2f4e6bce149e1cfb3", + "sha256": "141rd4a80vvf4hmlnfzprjg6hzgjs6g09rpy0wzxi1jsz7f0xc9j" }, "stable": { "version": [ 0, - 20, - 1 + 21, + 0 ], - "commit": "74668925ca977e252acb084bd139b3077cf95b58", - "sha256": "1q78gxsz763d6vbi1lyfmn7733l10qhq80bchdli9zw7sggs7nq1" + "commit": "63e478f1186a03c7e4dfeeb39b3d8fe2ef1cb429", + "sha256": "10vy102a0isd8cg94y61pm4qfgy74d6003dw0qn0bdmbd19r5071" } }, { @@ -76249,26 +76980,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20220117, - 1434 + 20220321, + 1632 ], "deps": [ "org-re-reveal" ], - "commit": "e8c43c843f97eb9fc4ffeb1e7758935a314d1cfe", - "sha256": "0baa27f60l4351h6m054hmzk48y838a5cppw0qp7bacbzv9d9qq6" + "commit": "8ac1829bbe3458a100ef7de1195a9714b59db98b", + "sha256": "0f75k0vvikvzlkd6yr7wl53lh167njfwd0hkfp8mkxfzls36rwxk" }, "stable": { "version": [ 4, - 1, - 2 + 3, + 0 ], "deps": [ "org-re-reveal" ], - "commit": "e8c43c843f97eb9fc4ffeb1e7758935a314d1cfe", - "sha256": "0baa27f60l4351h6m054hmzk48y838a5cppw0qp7bacbzv9d9qq6" + "commit": "8ac1829bbe3458a100ef7de1195a9714b59db98b", + "sha256": "0f75k0vvikvzlkd6yr7wl53lh167njfwd0hkfp8mkxfzls36rwxk" } }, { @@ -76996,11 +77727,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20220113, - 137 + 20220312, + 1944 ], - "commit": "ce462a63e32dd32bceea041f656bb79da953d62f", - "sha256": "1phqqhddsialm5ls0ab6jr4hwwj0isyks2l9pi1w1k9blkyqx994" + "commit": "f2c78c4a6059c5f892e48a3887d4368a547515ff", + "sha256": "1zr3pk1ifvn9j4f4n7g53q4wcd3r4zybjni8kyiil4jadmvsglfl" }, "stable": { "version": [ @@ -77158,30 +77889,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20220102, - 1248 + 20220302, + 1706 ], "deps": [ "dash", "promise", "request" ], - "commit": "400f472e7b2e45502cac2b96bdde33830b84ea60", - "sha256": "1qj07k5j6493n76q23f4llmbkv5chf9fr43c2b5a5a8cx8qpp48f" + "commit": "c1790b1cdd2e5733cf64c7507a89da0b6179cf7d", + "sha256": "10r8k14dlm017c4kahim2jv2nkx0898r0dc21z5szp4hw7l1z4n9" }, "stable": { "version": [ 0, 0, - 7 + 9 ], "deps": [ "dash", "promise", "request" ], - "commit": "e6221b1654d34bc3a06500ae4706419bc176b575", - "sha256": "1xnqih87sipqd6q5cvgvw2mpn5m4j605bxhlbmpr4kzhni9vd9sh" + "commit": "c1790b1cdd2e5733cf64c7507a89da0b6179cf7d", + "sha256": "10r8k14dlm017c4kahim2jv2nkx0898r0dc21z5szp4hw7l1z4n9" } }, { @@ -77192,26 +77923,41 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20220117, - 1642 + 20220211, + 727 ], "deps": [ "org" ], - "commit": "559a40dd036b6e8204b6a078ad4dc9439bc20e5c", - "sha256": "0y6fw53vasas7hcq9r711rvsjbc7p897pjrhqpzda8nyyvd673h4" + "commit": "ffbd742267ff81ba8433177fac5d7fe22b6d68a9", + "sha256": "0h1689mzkcgnrnpjwlh3a9ks9vb0a8sj60nlyn9x2nkcalg6vsw4" }, "stable": { "version": [ 0, - 2, - 4 + 3, + 0 ], "deps": [ "org" ], - "commit": "a1aa8496f2fd61305e43e03e6eeee2ff92aa9e24", - "sha256": "0sfz8rpvc9hidjj81wlc48vi7ii90mssgvfnp2z215phv67npbzp" + "commit": "303fcc8d5d85a4ebff2798dab50b2ccc0255ea5f", + "sha256": "1pdf16agcjfzpjvz8kv39abir35rip93nkawxcpjjh4ywsdsbnm6" + } + }, + { + "ename": "org-arbeitszeit", + "commit": "0d99045c0514613c6f3e3b0e167b5476fdaf6e43", + "sha256": "12w1yi3dzax0rywm83p7mkqj7fd05vg0lg2c9p20ckw7blxxk7xx", + "fetcher": "github", + "repo": "bkaestner/org-arbeitszeit", + "unstable": { + "version": [ + 20220127, + 754 + ], + "commit": "5b307ebc0db0d58ed6b94d4db30f2653b5782e41", + "sha256": "0dcawxni158af3jdhr22zkh39b39qvzsdk6kc5l8vjwjd37r1kks" } }, { @@ -78016,14 +78762,14 @@ "repo": "eschulte/org-ehtml", "unstable": { "version": [ - 20220110, - 1917 + 20220216, + 2054 ], "deps": [ "web-server" ], - "commit": "4db3756249b069310dabc0db43c7d9bbe55fb233", - "sha256": "05r4p1mxwy0a4xiyza3h2a7dy1w2px866pmvcg245xcsq77ikyz4" + "commit": "419932d6dbce193b0d90b1ccf9bf643169d21f52", + "sha256": "09cq6i2yzlpzmj5xcym6s8fji86kqcv7jy7r8d9p64fx74khh6jp" } }, { @@ -78192,8 +78938,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20220119, - 2142 + 20220324, + 1852 ], "deps": [ "alert", @@ -78202,8 +78948,8 @@ "request", "request-deferred" ], - "commit": "6e26ae75aea521ea5dae67e34265da534bdad2d1", - "sha256": "1814w5bgf9zwvsga4926i002q2xg2qgyrmb2jlkc7gzv0j86ccv9" + "commit": "554c48fb57dc46877202028019197b0699961ca0", + "sha256": "1l48dgzwwh230l5kxd17jdmjwhbkaqzmj95znxzhs9jrfm7jixyb" }, "stable": { "version": [ @@ -78311,8 +79057,8 @@ "repo": "Trevoke/org-gtd.el", "unstable": { "version": [ - 20220112, - 437 + 20220213, + 41 ], "deps": [ "f", @@ -78321,8 +79067,8 @@ "org-edna", "transient" ], - "commit": "835b316c7273e234383d1876d43ebc90a45ace59", - "sha256": "1wwx35smvnxdh3fq7077s98cmphfmwzcr1bcxawnnnh7dd9yxnrn" + "commit": "4e0fcf9a440e463d395f8f37efe8f1e691ed07dc", + "sha256": "0672pcklp743k8fz39hwf1zxb7f1sywdjsm8d8ha8r6h2rjbyl6k" }, "stable": { "version": [ @@ -78348,28 +79094,28 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20210714, - 1604 + 20220228, + 1653 ], "deps": [ "dash", "org" ], - "commit": "416c95fc9ad8551f1d9544f2504c866daac5477e", - "sha256": "189zzfi5a1qsjm8ayq5v58s5iagibv2vk6rb6zda4p0hrmnfz2ky" + "commit": "b6bf79465cd31d66b547704903b8ba5fcd6dd108", + "sha256": "0cs69fa36wdz8i6rvdslmr3nlwmaw74s8r5wcbjvh0kjzipyqdyp" }, "stable": { "version": [ 1, 7, - 0 + 1 ], "deps": [ "dash", "org" ], - "commit": "2cb87624238281b438cda67ed375c56403524489", - "sha256": "1xmbrrp1zyvij18v3rqmini6w9i6v7dl4fp103ph6wznav8x0jbl" + "commit": "b6bf79465cd31d66b547704903b8ba5fcd6dd108", + "sha256": "0cs69fa36wdz8i6rvdslmr3nlwmaw74s8r5wcbjvh0kjzipyqdyp" } }, { @@ -78404,16 +79150,16 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20211110, - 1423 + 20220228, + 1651 ], "deps": [ "dash", "org", "s" ], - "commit": "399020d435d296014f92fa5f632d7481ee002661", - "sha256": "01q8w49dh9fpr2sc70p92cxjm66fnrrgnk4ba321aq9dlfmly2zg" + "commit": "9671cf059b681fac39ce910dd8847b5c7bfad170", + "sha256": "1zygrmihzdsciqnm5kl3j4wgmm796q8ppv7nvgn3d8rv6xky5mx3" }, "stable": { "version": [ @@ -78516,16 +79262,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20211114, - 1616 + 20220225, + 158 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "01e6a7c17e210dac0608154dd69d637e9733498d", - "sha256": "19nljq73gnhjk7zz8y5wgap8j41jd7zifjcmfddrj27kmprw2h5z" + "commit": "96e92585ed6f510f87363be3cb10d804f67e1b52", + "sha256": "1n1h3xby4998hdv6j4gllznzbhh4gl2wr9bm4235n859zypq9b4l" }, "stable": { "version": [ @@ -78587,6 +79333,40 @@ "sha256": "0bcj9b7c4pyyvxlgnysl5lhs9ndp60xwizd85zrkd2mh2m8sbq9v" } }, + { + "ename": "org-journal-tags", + "commit": "11deda6e0bb96bf2e4542f18a40c16b874a512b9", + "sha256": "1j5zsm4lgqh3as0h74d759nldcb737lpwhw5dl77996y0ani5byf", + "fetcher": "github", + "repo": "SqrtMinusOne/org-journal-tags", + "unstable": { + "version": [ + 20220305, + 2019 + ], + "deps": [ + "magit-section", + "org-journal", + "transient" + ], + "commit": "b395f5c90aa06885aa9441217cc0abaaa53ccc11", + "sha256": "1kkf6sryj9xgplxpf69lz3wz1zaifarr1cwgq5if3yc1bb868ax2" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "magit-section", + "org-journal", + "transient" + ], + "commit": "16e7ad11ca3ff3085f3098f492c5cfb3f6ded253", + "sha256": "12l0r1ayi7qwczaaa9590rqfmib8rj0f287c0s7gphmvyds078j7" + } + }, { "ename": "org-kanban", "commit": "a9f3a10c126fa43a6fa60ee7f8e50c7a9661dbc1", @@ -78595,16 +79375,16 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20210315, - 28 + 20220218, + 1845 ], "deps": [ "dash", "org", "s" ], - "commit": "198ffa2066aadcdd9530dcc9b82cb5626c49e257", - "sha256": "1lh7hgzbkmhv7hqc0fvgvivkihg96c41ms1v7rcknnp3f1kj195h" + "commit": "5310e208d151f460f9b7e3961b4796842e91a3ae", + "sha256": "1d7v9vn9bli4lj59lbcldhplg46g79038j9avzicwgrysm74ybic" }, "stable": { "version": [ @@ -78623,21 +79403,21 @@ }, { "ename": "org-kindle", - "commit": "29d08205620d51d4d76e3a4a6124884b5a6b9db7", - "sha256": "17sxvyh3z5pn2353iz2v6xjxp98yxwd4n7wkqsa9nwihsw5mmrrw", - "fetcher": "github", - "repo": "stardiviner/org-kindle", + "commit": "f5a3cc21b619d420c84161c82fac70f1b37cdda3", + "sha256": "18bp1p8hyzfp7vp5yz374sg5487i0a752b7cnr40avnq44j48d5y", + "fetcher": "git", + "url": "https://repo.or.cz/org-kindle.git", "unstable": { "version": [ - 20210930, - 1008 + 20220210, + 1408 ], "deps": [ "cl-lib", "seq" ], - "commit": "fdba34a47b670226f46ad7b3a4db4edc7f7907e7", - "sha256": "17klypc5fk6v9ccnyixak9ixyvsfzv3ivm7j8aiv9dk3acjf4yrd" + "commit": "fadcfd62e254d0c45e87d63128a82a08ae21869a", + "sha256": "0f61xy0hv3pjbhx9wmhpbi43nis90rsx1ljw9kirp99h64gg0jgd" } }, { @@ -78657,26 +79437,26 @@ "posframe", "s" ], - "commit": "39f22dc98cb8268af67c6df71778ec5784d2b683", - "sha256": "14rjgdl941kja3hndc55q3c65fi7plviirxihffkw498h0vkbyhs" + "commit": "d18e73dbed8ae104699295143a44356fa1029358", + "sha256": "0387n6z3kyqvslv395wajmbsg3p05918wn1wgm2bi4d9kjw6y3qm" } }, { "ename": "org-link-beautify", - "commit": "ee5e68e4aeea824af0abef8b6552852a8436b178", - "sha256": "0s0hrq3pr3c7mdmnl69spn7k8905y3j75wkzncnq8dsia9s5q7xi", - "fetcher": "github", - "repo": "stardiviner/org-link-beautify", + "commit": "acd9bcc86c90e507fcd76f16e7ab57d64114f8b4", + "sha256": "1k1rczs3w3cxh9fryd1qr1dnr5v2hhxad1vcyjrqvyqpbm1dqnlh", + "fetcher": "git", + "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20211229, - 241 + 20220321, + 145 ], "deps": [ "all-the-icons" ], - "commit": "c755af07a9ca0c75e99ba06412d29829a7dfccc6", - "sha256": "1m0l864rw27myrdyby3706f8ir4znibkjyprpi83i5b04hkbyfbx" + "commit": "75a0f3bc427b9449f6f7ae3b2ac67e16e24153bd", + "sha256": "0p33n195xl6pgvyf7z47mq48fh8ihkq7wx70z1vn9js3xvig2ahm" } }, { @@ -78798,20 +79578,20 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20220117, - 438 + 20220204, + 42 ], - "commit": "b3932a64ca0d3017255fc99b9cde253eb17b08f5", - "sha256": "0456i9784pvqkxwdyrrkgair2y4i46r9svx67fz5qljxd1z4yjkx" + "commit": "a7bf07316f93015e4f853ea0fc5b8d05b4a7695d", + "sha256": "01f04xpqkgja34a0z4smh2kxzn3lvx2391fnbfxmq92pxqp3gk0j" }, "stable": { "version": [ 0, 2, - 4 + 6 ], - "commit": "d52a7b52b652bb87a82be02f66ba14d54dee0cb5", - "sha256": "0in83jlrwjn81qgw1i7n228sbf314bj8hkrl14ahfn0zmfll60sw" + "commit": "a7bf07316f93015e4f853ea0fc5b8d05b4a7695d", + "sha256": "01f04xpqkgja34a0z4smh2kxzn3lvx2391fnbfxmq92pxqp3gk0j" } }, { @@ -78885,6 +79665,29 @@ "sha256": "0qdgs965ppihsz2ihyykdinr4n7nbb89d384z7kn985b17263lvn" } }, + { + "ename": "org-modern", + "commit": "2e87a00dc3f61007db361015f4d3131cb265530c", + "sha256": "0ppc6ww3alzsc13jbqzjyrcci36f4r1kby0y4s8k1d3d1brqq0py", + "fetcher": "github", + "repo": "minad/org-modern", + "unstable": { + "version": [ + 20220325, + 1506 + ], + "commit": "dc19304f409259d1b258c51cedd2d362e0ff9b98", + "sha256": "1b0cis1n786c4lkrsi71ak2wv21mhgbfk3q2pp6qiqhddah0l1cg" + }, + "stable": { + "version": [ + 0, + 3 + ], + "commit": "64fa67a3e4cc7af4084bb879bd8a0e5380333bcf", + "sha256": "187fxw2rg0kw1d2binpa32ckp67r4v10j6ypr077g9qn6nkmyvvn" + } + }, { "ename": "org-movies", "commit": "ea06dc48003ba3c4f8e70fef4738cdb306362198", @@ -78927,8 +79730,8 @@ 20211029, 1147 ], - "commit": "454d317bf772a616cb76cf2212f111c7977016a2", - "sha256": "1bib2ch2grb7qlyhc7aq82ca1i16nqi8h84nfvlwgx45al8r3k4l" + "commit": "a74322f0cfd6e52151f9bb8d4f90833330f69120", + "sha256": "18kjj1125rbr6mppj9wamwlgi5hvv8h6p4c8z3bckl80y5f7r8rl" }, "stable": { "version": [ @@ -79072,8 +79875,8 @@ "repo": "fuxialexander/org-pdftools", "unstable": { "version": [ - 20210118, - 1611 + 20220320, + 300 ], "deps": [ "org", @@ -79081,8 +79884,8 @@ "org-pdftools", "pdf-tools" ], - "commit": "a5b61bca3f8c91b0859bb0df1a929f9a31a57b99", - "sha256": "18iy03hc7jb7qsfj25f6hmrwli6fyjbf14c1p5bhp5gwk49rm9p1" + "commit": "967f48fb5038bba32915ee9da8dc4e8b10ba3376", + "sha256": "0f47ww8r00b7lb1msybnmnqdhm9i2vwz5lrz9m9bn6gbh97mzhn8" } }, { @@ -79255,16 +80058,16 @@ "repo": "fuxialexander/org-pdftools", "unstable": { "version": [ - 20210118, - 1611 + 20220320, + 301 ], "deps": [ "org", "org-noter", "pdf-tools" ], - "commit": "a5b61bca3f8c91b0859bb0df1a929f9a31a57b99", - "sha256": "18iy03hc7jb7qsfj25f6hmrwli6fyjbf14c1p5bhp5gwk49rm9p1" + "commit": "967f48fb5038bba32915ee9da8dc4e8b10ba3376", + "sha256": "0f47ww8r00b7lb1msybnmnqdhm9i2vwz5lrz9m9bn6gbh97mzhn8" } }, { @@ -79310,15 +80113,15 @@ "repo": "marcinkoziej/org-pomodoro", "unstable": { "version": [ - 20190530, - 1445 + 20220318, + 1618 ], "deps": [ "alert", "cl-lib" ], - "commit": "aa07c11318f91219336197e62c47bc7a3d090479", - "sha256": "0nbprh2nhnmb7ngp9ndr6zr37ashcsvpi5slv7a37x1dl7j6w1k4" + "commit": "3f5bcfb80d61556d35fc29e5ddb09750df962cc6", + "sha256": "1x3ny357s0h73129mhah6rjipjd0jw6gh3msr6sahwx36nsdrp4m" }, "stable": { "version": [ @@ -79392,14 +80195,14 @@ "repo": "jakebox/org-preview-html", "unstable": { "version": [ - 20211126, - 2350 + 20220228, + 414 ], "deps": [ "org" ], - "commit": "14e39aec6e29dc15ff40b219b2b7284a9ec0af36", - "sha256": "0qza6ylknsd0d87dhwxk5hyqzs5107n2s8y189nr23lnyvpggn49" + "commit": "cb85524d5090b8189e965cc49d65be04650c17c4", + "sha256": "1ikcsn970pf5m30h6bqshykpnwpn7vwyyi9ymk3fv6pxh772x5wc" } }, { @@ -79504,8 +80307,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20210922, - 615 + 20220318, + 1534 ], "deps": [ "dash", @@ -79519,13 +80322,14 @@ "transient", "ts" ], - "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", - "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" + "commit": "46f523d94a376b168176c75bbd0e3e0d00e61170", + "sha256": "0vrk7lx4n4imvsnqv50w6fmqnndr48x89gcmm375fw6zgy2m90bl" }, "stable": { "version": [ 0, - 6 + 6, + 1 ], "deps": [ "dash", @@ -79539,8 +80343,8 @@ "transient", "ts" ], - "commit": "31aeb0a2505acf8044c07824888ddec7f3e529c1", - "sha256": "1jfm4ahh58x3a3njigrbfzd86fnbyybbcgca2mgmxddcy6bszfp1" + "commit": "f666fe150f1bf3c3ce43d0e15f90b20d43c2e772", + "sha256": "1mpq3v8lxqllnb4afqh7p9av0p9bha8ld7741zaw4hxb1252xgm2" } }, { @@ -79619,28 +80423,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20211119, - 624 + 20220315, + 1704 ], "deps": [ "htmlize", "org" ], - "commit": "55fca47c740c50fe04cbf2b8ae90e02174626c0c", - "sha256": "01h1vdg96ml8zxfi78j178w4m33n2rmwgcl6k2cisymcfijcp2c5" + "commit": "e5bae22b9ef63a9fcfbbaa000e087703751eaad0", + "sha256": "1njib0ah1913lk3ma18y8m5k8jqki17i9298cc03k7vvfw3l19wz" }, "stable": { "version": [ 3, 12, - 4 + 5 ], "deps": [ "htmlize", "org" ], - "commit": "ee0417aac3969ec2d776eba1ddc6434d4c61a10d", - "sha256": "0j7394zcbzqfk33g2xdyb3fmw3brxy8v66vvf1j9nqlskfddh7bn" + "commit": "e5bae22b9ef63a9fcfbbaa000e087703751eaad0", + "sha256": "1njib0ah1913lk3ma18y8m5k8jqki17i9298cc03k7vvfw3l19wz" } }, { @@ -79795,8 +80599,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20220110, - 2258 + 20220318, + 2105 ], "deps": [ "avy", @@ -79806,11 +80610,12 @@ "f", "htmlize", "hydra", + "org", "parsebib", "s" ], - "commit": "1ebe9997a82554466ca4d3a8c8b05e1bc77423ce", - "sha256": "03f2xhs7dfzdpf173c5cklmvlz82wkgjj677w3nh2cxkxdm820bq" + "commit": "ec449195438f815698241f0b01a5395221b3306e", + "sha256": "19hf4lp1z14gczs0d39vi8lcl67bbraz2wkimshk8fwhjc14wf4l" }, "stable": { "version": [ @@ -79886,28 +80691,28 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20220119, - 1444 + 20220310, + 1646 ], "deps": [ "dash", "org" ], - "commit": "eac6aa8694b37623cef14d208ed88415499072a1", - "sha256": "01ri6h144s0bgf45azbqzkm2h4x0jlz9n2azxq27dk2n7k3lzv6l" + "commit": "c42078f8601b7f600135f66e75246a53c5f9975f", + "sha256": "1afmv6ncjbm6dalgz459lhh0rif8rlag23n05jwdv7izibwb1dm2" }, "stable": { "version": [ 0, 3, - 6 + 10 ], "deps": [ "dash", "org" ], - "commit": "4162756a7f0fb6f4734527ad5d6b879c3523ff70", - "sha256": "1jrbz367m3ss62kl9bq86piim9czvi8nky5g8iwb0hs3m9h9j3m7" + "commit": "c42078f8601b7f600135f66e75246a53c5f9975f", + "sha256": "1afmv6ncjbm6dalgz459lhh0rif8rlag23n05jwdv7izibwb1dm2" } }, { @@ -79933,11 +80738,11 @@ "repo": "unhammer/org-rich-yank", "unstable": { "version": [ - 20201115, - 823 + 20220227, + 2154 ], - "commit": "56d698c2614025538f456479c79073ef40399bc3", - "sha256": "0l20a8ljpg8bk6hw4py5g9wv6kyv6y4nrc06l1w0lr0l808w5gqd" + "commit": "4bcd030f0d736d77c647955739b61fae541417e9", + "sha256": "11j7ywvhsi4a4ayapxqccvag8sraw168pwwq4s3a0f98yzknd9h9" }, "stable": { "version": [ @@ -79957,8 +80762,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220120, - 257 + 20220319, + 1902 ], "deps": [ "dash", @@ -79967,25 +80772,24 @@ "magit-section", "org" ], - "commit": "817d8036fbf028d2c5c386720fbf9946d03fe891", - "sha256": "18rma7hm43zm7s8c0fjrdaphmbzsjryly7g46hgf3qwrn55n0y8m" + "commit": "d71675fb479d11da3ae597bb13bc1c96256ff0b0", + "sha256": "056gkk7fxla2rm8lzzig1rq8brhznciifdn0pqfxwwyvpa6sy1i5" }, "stable": { "version": [ 2, 2, - 0 + 1 ], "deps": [ "dash", "emacsql", "emacsql-sqlite", - "f", "magit-section", "org" ], - "commit": "6170cc99288e75b8e3f3fd3101b66acc12a9613a", - "sha256": "0q3nhw05wnqh1qgggxsj8wki4ihciqlkic2x7qbcsskjqm73j1r7" + "commit": "3782e88d50f83c5b9fbb4b10df71df3f37e27156", + "sha256": "0c5vxz423lz386dxa9nqyf396jmyb36q79paxf27is1dhq1vwd5w" } }, { @@ -79996,15 +80800,15 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20220117, - 801 + 20220213, + 1609 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "3ac2445f431bc39aa0ca5abfc80e28c0c06f0738", - "sha256": "07qiis3c7ypfvy6v6b6wsj993yp41cw8yi66gc0ssmg053vymz5p" + "commit": "efdac6fe4134c33f50b06a0a6d192003d0e5094c", + "sha256": "13hin77krfwaxfc7bh9bkp2h1kzn1ksng46j129yz3996gv55k1r" }, "stable": { "version": [ @@ -80046,16 +80850,31 @@ "repo": "org-roam/org-roam-ui", "unstable": { "version": [ - 20220104, - 1733 + 20220225, + 2151 ], "deps": [ "org-roam", "simple-httpd", "websocket" ], - "commit": "5ecd418060bf606924ac86faa1aa4036d4c785fb", - "sha256": "1gj8bca7y8zjjnqjs0mg6vv2nvjrkqbqrj055zwkhz9sj36q5s5h" + "commit": "9474a254390b1e42488a1801fed5826b32a8030b", + "sha256": "0v54vxh95izch74wz2dl2dkdqicbvshra55l6qvd4xl5qmfhpjdc" + } + }, + { + "ename": "org-ros", + "commit": "a7b6aff1afbd525b43a53229be4e6faf166c6968", + "sha256": "10jfdrrqqk0y43z32w0hsiih1l3rb6yafkqwxj64dgfd0iz4szsx", + "fetcher": "github", + "repo": "LionyxML/ros", + "unstable": { + "version": [ + 20220320, + 1705 + ], + "commit": "70e0f33ee027ca1dce68351ad14a9e47a452fc17", + "sha256": "0qjfb2fllzkh1d0jprxdsvg6fcrrhc7wc2lg0kffp5vwmfv7m3db" } }, { @@ -80130,10 +80949,10 @@ }, { "ename": "org-seek", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "04ay4abm03kn15cn45ldrzh2rw6gr6ia3qrj7hn5crd75ppwvln7", - "fetcher": "github", - "repo": "stardiviner/org-seek.el", + "commit": "7b9ce2952ee260d769d247ab20f7c7909042a812", + "sha256": "1nck8j65zchaqxq4vkq1flaw04jwv554cfnha2gmx3c9j47af3bi", + "fetcher": "git", + "url": "https://repo.or.cz/org-seek.el.git", "unstable": { "version": [ 20161217, @@ -80232,17 +81051,20 @@ "repo": "alhassy/org-special-block-extras", "unstable": { "version": [ - 20210909, - 2032 + 20220326, + 1432 ], "deps": [ + "dad-joke", "dash", "lf", + "lolcat", "org", - "s" + "s", + "seq" ], - "commit": "1e9731dfd79b0605ee88c8cc891d4b5106c9e0f4", - "sha256": "0lp0gn7p5d0fkm3wy27xhj2q6snhl1ssqqhyl52hw06jhifamm8l" + "commit": "2e397dac372ff75ea6ee6eed9ae3a0540a082af8", + "sha256": "0i838ph9p92vfirf6q145m22nydzrans2ss6aj80m4g0b2mprq2z" }, "stable": { "version": [ @@ -80302,27 +81124,26 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20211230, - 1606 + 20220326, + 1106 ], "deps": [ "dash" ], - "commit": "6b1b3b045390bf1cff8214ece54da07c7a0aa8ad", - "sha256": "0zih4bfncjkkrx9v4f88a26kz41vgd7wvvfm2is5wk93nbcrazz4" + "commit": "cd9c5c0402de941299d1c8901f26a8f24d755022", + "sha256": "07z17r2ny9m4cddr87v636vgvcfgv1j5qkvhckms0xnfh9wcs9j3" }, "stable": { "version": [ 0, 2, - 9 + 10 ], "deps": [ - "dash", - "dash-functional" + "dash" ], - "commit": "49237ef8d174a15a594d984438cebe23ffcf54df", - "sha256": "0rqxb2ndym6pr7pzszbvsd04h0gnyw299vh15kr6rd5bbikfqxwm" + "commit": "cd9c5c0402de941299d1c8901f26a8f24d755022", + "sha256": "07z17r2ny9m4cddr87v636vgvcfgv1j5qkvhckms0xnfh9wcs9j3" } }, { @@ -80340,21 +81161,21 @@ "org-starter", "swiper" ], - "commit": "6b1b3b045390bf1cff8214ece54da07c7a0aa8ad", - "sha256": "0zih4bfncjkkrx9v4f88a26kz41vgd7wvvfm2is5wk93nbcrazz4" + "commit": "cd9c5c0402de941299d1c8901f26a8f24d755022", + "sha256": "07z17r2ny9m4cddr87v636vgvcfgv1j5qkvhckms0xnfh9wcs9j3" }, "stable": { "version": [ 0, 2, - 9 + 10 ], "deps": [ "org-starter", "swiper" ], - "commit": "49237ef8d174a15a594d984438cebe23ffcf54df", - "sha256": "0rqxb2ndym6pr7pzszbvsd04h0gnyw299vh15kr6rd5bbikfqxwm" + "commit": "cd9c5c0402de941299d1c8901f26a8f24d755022", + "sha256": "07z17r2ny9m4cddr87v636vgvcfgv1j5qkvhckms0xnfh9wcs9j3" } }, { @@ -80428,8 +81249,8 @@ "s", "ts" ], - "commit": "fb5e2ef277bc811a3b061106c99e4c47b6b86f80", - "sha256": "1sjx5ahyjpxv5xkxaf1x0p64bjls8ralv9knf80w17nb87dk3p91" + "commit": "3108bc3f725818f0e868520d2c243abe9acbef4e", + "sha256": "172kjz03byizc972h8qh5hp5lrjqxp8x7cpcqykzj5j4db670ym1" }, "stable": { "version": [ @@ -80528,6 +81349,21 @@ "sha256": "1ggn4y6sczl08mzbnzgjixgl685c71wqqffmng4gl67fs6wr6lrv" } }, + { + "ename": "org-table-color", + "commit": "06a6b1a123be2e653a09ed297a777b955ecd235f", + "sha256": "0hb40k9dly4kj15b4bin10szm1rvfl6dx638a29fv4cv3h90yqqj", + "fetcher": "github", + "repo": "fosskers/org-table-color", + "unstable": { + "version": [ + 20220311, + 1927 + ], + "commit": "2022f301ef323953c3a0e087a1b601da85e06da1", + "sha256": "18bbsi79i0xf8kzzbpr6v4sh150m1qip7m74ighbb9as3kx07r0f" + } + }, { "ename": "org-table-comment", "commit": "2c1f08c41969bc8a7104fb914564b4f6cab667e2", @@ -80584,25 +81420,21 @@ }, { "ename": "org-tag-beautify", - "commit": "faa48723cbc4486c2d8262d00aa9967bfad81738", - "sha256": "1dn164z53c38bfzx8m22dynfx2wlw8cgcm63q6kvz5xsxqqwwsmp", - "fetcher": "github", - "repo": "stardiviner/org-tag-beautify", + "commit": "e06ae4c7cd46c2aa88782726e3637842f23932ca", + "sha256": "1rhmg2ff7sk1drzgfzibadin2kd1hlwmxy2d71rcy9ibmzhk8x0f", + "fetcher": "git", + "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20220111, - 826 + 20220315, + 1159 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "98f419d81fb71d39c097c1a58f14923e9c705ba0", - "error": [ - "exited abnormally with code 1\n", - "", - "error: unable to download 'https://github.com/stardiviner/org-tag-beautify/archive/98f419d81fb71d39c097c1a58f14923e9c705ba0.tar.gz': HTTP error 404 ('')\n\n response body:\n\n Not Found\n" - ] + "commit": "aad66c775e3010f7af2ebd3e0914aa6a57127f1b", + "sha256": "01y53nh9z7y77gns28dg5s2sr672i3sb39vpflx7mhfcijkribzj" } }, { @@ -80972,11 +81804,11 @@ "repo": "cadadr/elisp", "unstable": { "version": [ - 20210414, - 1844 + 20220220, + 1757 ], - "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", - "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" + "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2", + "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj" } }, { @@ -80987,11 +81819,11 @@ "repo": "flexibeast/org-vcard", "unstable": { "version": [ - 20220119, - 248 + 20220206, + 1209 ], - "commit": "74fc34319ce26455f58c7ae476b482d323796276", - "sha256": "0s0bx2vgn2rzcda9sfcfds3x68d2gnz90qviphpf6bi27ab83a20" + "commit": "bdaebcb4ef44c155a92d9c89a21a1d29019ee026", + "sha256": "1djpjs0v0w6drqpi39y58hs563rqszcfwmldnwcmyp3f3cgqd8k3" }, "stable": { "version": [ @@ -81003,6 +81835,21 @@ "sha256": "14l3xqahqmnfl3sskqcr33xpcsic8dm9cr9wmbv5la3xv14n10k7" } }, + { + "ename": "org-view-mode", + "commit": "330276d0ed7b053a96f428824c8746abe6999518", + "sha256": "1zijkjp1iszsjfbiclncqh6wsp9nfql109c4171pqsr55xwx0n3x", + "fetcher": "github", + "repo": "amno1/org-view-mode", + "unstable": { + "version": [ + 20220218, + 2106 + ], + "commit": "88321917b095a8cbabfa8327c915bd46eb741750", + "sha256": "05yll158r3zxs45z3radpvnwqz0vak07l26g6595crpigjay3q03" + } + }, { "ename": "org-visibility", "commit": "74651e72ddac645b792786d7c590180298201da7", @@ -81011,20 +81858,20 @@ "repo": "nullman/emacs-org-visibility", "unstable": { "version": [ - 20220109, - 2003 + 20220227, + 1536 ], - "commit": "6b5acc29867787660d46f13fe1555e49ef0ddc2a", - "sha256": "1la2gg39s5xjw3v75y19hvmw9cyhg6z3lmaggh9qpbd80cm1xyyw" + "commit": "623d596ff02e54d7e090fa30c67a4d0dd4e7fe72", + "sha256": "0cnwrjhbp8jfsbax7v46xiq6xzcp4by73dbkkgw19bjj5mywiqc9" }, "stable": { "version": [ 1, 1, - 1 + 4 ], - "commit": "6b5acc29867787660d46f13fe1555e49ef0ddc2a", - "sha256": "1la2gg39s5xjw3v75y19hvmw9cyhg6z3lmaggh9qpbd80cm1xyyw" + "commit": "623d596ff02e54d7e090fa30c67a4d0dd4e7fe72", + "sha256": "0cnwrjhbp8jfsbax7v46xiq6xzcp4by73dbkkgw19bjj5mywiqc9" } }, { @@ -81088,16 +81935,16 @@ "repo": "akhramov/org-wild-notifier.el", "unstable": { "version": [ - 20210330, - 304 + 20220221, + 928 ], "deps": [ "alert", "async", "dash" ], - "commit": "772806f9d46fb93cabe9409c7a559eb7b9cda3d3", - "sha256": "0cp7gr0b83s830q1fzd4gwwz4x1n5cyh4r4v73w2cfml3kqf8nz1" + "commit": "860392e309e75474ae03128ce52b6592bd28027a", + "sha256": "1npl118j457zcsmn2b4vsx6kmz8v6k8czrqgmi2fl7aql5xhvp6j" }, "stable": { "version": [ @@ -81123,30 +81970,30 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20211112, - 1600 + 20220228, + 1652 ], "deps": [ "dash", "org", "s" ], - "commit": "729445496d94ea0050706007391817ef84dc0226", - "sha256": "0xa545wbh7kjbpry74x2bkw6rs9dshlajb5i17zc6v8zf400ds4r" + "commit": "25ddd0169eafece581bbb4919427a4d64dab8ae8", + "sha256": "08s9rf57yci4xla6dlkb9av9qd2nwls487vxr4zfyb932j8vdp4h" }, "stable": { "version": [ 2, - 5, - 4 + 6, + 1 ], "deps": [ "dash", "org", "s" ], - "commit": "f5512304dccc152816f9957f5627c814bcb0f683", - "sha256": "0kg2bjwp66fml3836zfr15aadh5d7srg8ai69g0nxk1kmalbxkdv" + "commit": "25ddd0169eafece581bbb4919427a4d64dab8ae8", + "sha256": "08s9rf57yci4xla6dlkb9av9qd2nwls487vxr4zfyb932j8vdp4h" } }, { @@ -81306,8 +82153,8 @@ "dash", "s" ], - "commit": "a228ebcf408de7096e5cd3a62b14087432e0afb1", - "sha256": "146xp2jsk7a973g0dn8in1sad6lp1ks7s5ma6jld4h26anprvj1g" + "commit": "32f6cfc7265cf24ebb5361264e8c1b61a07e74df", + "sha256": "0dja2mwzzrn64c2qxvf325x88bwch7s29qhpv6jb4rn1143d4qyf" }, "stable": { "version": [ @@ -81399,8 +82246,8 @@ "ht", "s" ], - "commit": "8d90885d5a0cb5ad57b5202e2046bd3a0f3ce1f4", - "sha256": "1rp4dqm1qr6ndhrs7b06jhsy2ch8n9a82yma7abaz9hjdx6a6gz3" + "commit": "3cdd1985ec06fe42b81f3029512c7530a33f15c8", + "sha256": "0xg4vikw8k3kzn5vlqcf1jagalnq2xwd4wps8l37fr1iqkpr7wqb" }, "stable": { "version": [ @@ -81458,28 +82305,28 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20220107, - 1206 + 20220211, + 25 ], "deps": [ "magit", "org" ], - "commit": "66367d6bfc5e00726fb74f7cd20c32175ab8521b", - "sha256": "0lc2lk9c7b92c1cna2pyb88x9fa4bydcqkp4zcn0khpdv54fmszq" + "commit": "42b7f682b3e4e487ff209a44221a729921241133", + "sha256": "0vns8fbavfgyazlhbvwgc17w3v5iaf7ng92na2sl4lvc33rk941j" }, "stable": { "version": [ 1, - 7, - 2 + 8, + 0 ], "deps": [ "magit", "org" ], - "commit": "66367d6bfc5e00726fb74f7cd20c32175ab8521b", - "sha256": "0lc2lk9c7b92c1cna2pyb88x9fa4bydcqkp4zcn0khpdv54fmszq" + "commit": "0b49d7a869b8fef3537a75df4db693ca3e3935a3", + "sha256": "1hjfsj12qx06m8ji4l2sg502a55sabar4h6c2b2i9nmp1xf5889l" } }, { @@ -81490,8 +82337,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20210615, - 1516 + 20220211, + 26 ], "deps": [ "forge", @@ -81499,14 +82346,14 @@ "org", "orgit" ], - "commit": "365b75609a9454dccf5681eb6075ca53bd32af85", - "sha256": "1y7rywlqhsvkism9dmzlb3sijd8isp6qqhgba79aqgk9wz593rkv" + "commit": "36e57a0359992e02312f453b8086512e77beb150", + "sha256": "0mrq7mrgvj5r0bmxa4365xycfwp6m42mdqi5l5pljr5xz6k3rnc4" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ "forge", @@ -81514,8 +82361,8 @@ "org", "orgit" ], - "commit": "365b75609a9454dccf5681eb6075ca53bd32af85", - "sha256": "1y7rywlqhsvkism9dmzlb3sijd8isp6qqhgba79aqgk9wz593rkv" + "commit": "e11df20bfe500220bf48423fcc1529cd3ccb6bf2", + "sha256": "1s87svins72m9cj89xxpmkws85670djkx57pd90zqcs20qb788f2" } }, { @@ -81620,11 +82467,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20220109, - 1727 + 20220127, + 1502 ], - "commit": "b46158737eb6fb409ecef1a072184c5f7ae4b85d", - "sha256": "0wwlvc1nl5w3987wql3fp7j5qqxzjx0h5df84zbr77qjx637cs4d" + "commit": "36d7aec5549655174467db45d1dba6647b9e19b1", + "sha256": "0cg8rxl8wrcgm910jm0m61wbxk5i9f8cxcb289p7ip5bjbijmic9" } }, { @@ -81650,14 +82497,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20220109, - 1733 + 20220127, + 1516 ], "deps": [ "cl-lib" ], - "commit": "3e99ebc8ad013d846d9d987a7dce54dd6f83e52a", - "sha256": "1aj4g7gh498xccq0hb6gxvxm20124754cnhp98pn7yaz5a56967b" + "commit": "f5254db6ae78e30c2786c53991e98e86ed344ac6", + "sha256": "1l63bcvlnqnj5z10cyanybc5jz9yimf53vffycf9wbsph5lpfs12" } }, { @@ -81808,6 +82655,29 @@ "sha256": "03y0c3yfaqlw4m1k5aya32s8bxmqs3h8lii04pkg7mcw09iyqzn8" } }, + { + "ename": "osm", + "commit": "6836bd94e02dd18c0a865824e1b3f285905aefc4", + "sha256": "12zlr5l8x98gzasz79f1d1i8f486c3djx46v5p0zzabmm06vfhai", + "fetcher": "github", + "repo": "minad/osm", + "unstable": { + "version": [ + 20220325, + 2356 + ], + "commit": "881b1c969fcf3dae5c020ce520e5a16f8f2b6f18", + "sha256": "06ryshf804m6npygf8546kxg1xsjsl52kgbzr147h2ay5kq90q06" + }, + "stable": { + "version": [ + 0, + 6 + ], + "commit": "f76decfd0e94d5fc030a1d5c3230c213c87b47ef", + "sha256": "0aiq2z9vv4jsl0s0x9vpjgp0mnn27wanhirzj3h80ivgiphzs7l5" + } + }, { "ename": "osx-browse", "commit": "081aa3e1d50c2c9e5a9b9ce0716258a93279f605", @@ -82157,11 +83027,11 @@ "repo": "articuluxe/outrespace", "unstable": { "version": [ - 20190724, - 1553 + 20220218, + 1936 ], - "commit": "d8c1619ec81fd3f4e728212a3526cd13bc2b0147", - "sha256": "0rcr85slklpaqhx5j8agd8yz6lg66qisniqlbz6zm4vvszqh0r4a" + "commit": "4b6f8a103b2ce76bb0638eac9356c462402b0665", + "sha256": "0dsiid2g93cc9k1385igbn26rqmdn1nr11l3gfaikcqbrh93pdgw" } }, { @@ -82172,15 +83042,15 @@ "repo": "alphapapa/outshine", "unstable": { "version": [ - 20191112, - 1414 + 20220326, + 540 ], "deps": [ "cl-lib", "outorg" ], - "commit": "9334b555aaf1426a9e405a57b80809a1615627b3", - "sha256": "11r6advraz5rkrxr25mj0wpfgzxcvn5gzppsc7ma51zqfmijg7dk" + "commit": "bf1eed10dd7a89b63d0fc014944033db397c1e23", + "sha256": "19ni7j84361if3kyap1jf2xj0w3myp9iiz52gjcmbgk1g1g9ycdc" }, "stable": { "version": [ @@ -82566,14 +83436,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20220119, - 1939 + 20220322, + 137 ], "deps": [ "org" ], - "commit": "5fd3bdcb0f3d49748302aeaf28b61fac9975eda9", - "sha256": "1sw7hr5h6lzamhw9zrqlahdn40dqpmnl8cg3sm8sw73g62pj85k2" + "commit": "d04f41af6d128ccb9421c9bcd83b5fb12d14f440", + "sha256": "0qqaqykcm3pzc8a3ap4jnspn2p1034f6qhv6xyf43iqy8nhvrl03" }, "stable": { "version": [ @@ -82662,14 +83532,14 @@ "repo": "stig/ox-jira.el", "unstable": { "version": [ - 20201202, - 1658 + 20220121, + 1015 ], "deps": [ "org" ], - "commit": "0bd966ba241a2458d5097e256543eceee50d462c", - "sha256": "1a1cwq8gaq3q6g7lfm2finz4srla5iyg8s81k2991fz2fh1iir9k" + "commit": "a8019237a8f5e016a7c952fc2f673a2498a0e779", + "sha256": "0pa7pwk0yjcgak3f9w9jggj3ghlig1azf15ng954r646810j9i4v" } }, { @@ -82687,8 +83557,8 @@ "org", "s" ], - "commit": "4d2e0aa7f92d07e16cea2dd5e1d250a3f243c3cf", - "sha256": "1h5930953nnddg7ysr87m5r6gm517zbfi7jbc77hmrywgibqvpik" + "commit": "fc6b2594706c44d266d0863c323b1b58ab9d18ba", + "sha256": "01kydlzrc2qi4hrklzqc89fk9wpkc52slsslbv42ifsimlj2bnkq" }, "stable": { "version": [ @@ -82925,14 +83795,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20211128, - 1509 + 20220216, + 1506 ], "deps": [ "org" ], - "commit": "ec6092d2d5ed0693413a86ad83a2c0936861d130", - "sha256": "0xbk5q9vcy4n814a077kgsvhsbbr51v5lyqdpyy9j4sakh1sxw3k" + "commit": "fed9be1f4c317c08ca2372bd45cb9d1bcf8a3f7e", + "sha256": "1vmkj60lmah79r62k2gigkblilkw21ciyj324iwvk6hqmaahw6km" } }, { @@ -82943,14 +83813,14 @@ "repo": "choppsv1/org-rfc-export", "unstable": { "version": [ - 20201218, - 1356 + 20220206, + 1046 ], "deps": [ "org" ], - "commit": "1a49535cf927cd52ffa05c815b890888c4addf86", - "sha256": "001dv3zxsvh5zgrwn5jmib82bns4phbbd5kcy5mvmk7nyayrmq9p" + "commit": "0849028a2e4a274bfb0fc85d9538203ddf72a9e8", + "sha256": "1syzqc1lhnpkrzzd2hwxmaqr31dn44gcqwy5db44y8fr6nkrj6n0" } }, { @@ -83067,11 +83937,20 @@ "repo": "jjuliano/org-simple-timeline", "unstable": { "version": [ - 20210118, - 536 + 20220321, + 2115 ], - "commit": "238e05b01dde37fa27a3a8943cc04dcc9b9b83b2", - "sha256": "0949gabr0wfsrzzaf217jsaawkc3gj1lxkrzwp3bigmxngsn4ykn" + "commit": "b28bd4ccd5fa114c0f51b9766f0b9be7fe05fdd8", + "sha256": "0l71bhbgs2g0gbfl8lf6p2hnnyma26qk67q59x935hkgjbb4vx1z" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "b28bd4ccd5fa114c0f51b9766f0b9be7fe05fdd8", + "sha256": "0l71bhbgs2g0gbfl8lf6p2hnnyma26qk67q59x935hkgjbb4vx1z" } }, { @@ -83362,14 +84241,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20220114, - 2049 + 20220210, + 1334 ], "deps": [ "cl-lib" ], - "commit": "61589823b393d0fe7d9bd6627571f6985f65537d", - "sha256": "16v7wjh45qg1hx5vw00irmf35g08kdqlx2g9pnic4ch403sd62y6" + "commit": "032e9bd086029b2fdff09c3c2e606e29682e1fb1", + "sha256": "0jjb1gl6qqkrvf4v03fp9sv69xc6qh3lc65blms46zkx64995c6r" }, "stable": { "version": [ @@ -83406,27 +84285,27 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20211122, - 1152 + 20220213, + 1457 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "b5f5554ec38ec2a4d5ef49a0ad9f57f6825d9af9", - "sha256": "1ic1a0j8gj930ssc623vi55jflyfw52gb9zkf3yg51w43cw4isfn" + "commit": "873025ffc85b5e40ec361e953218fa09c6ebd621", + "sha256": "10sinzpnk41xvdb1va9vv6nnwyyryvmyrvxxwq6xska9ab580g6y" }, "stable": { "version": [ 0, - 15 + 16 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "cfe5aa2c8eeb2f6df38cf97a2315ac8f8ae41696", - "sha256": "1cn713g90zyjfq225yvg14c1qshslpi4466m3w102l5g57p8xv44" + "commit": "7a83a138e6546f4c4a9988ba6dddc5339fbe7272", + "sha256": "0srqcrhbdmd39jdsvh8k3nbrkqrl4nlic59dp5bal5vj495j7126" } }, { @@ -83443,19 +84322,19 @@ "deps": [ "package-lint" ], - "commit": "b5f5554ec38ec2a4d5ef49a0ad9f57f6825d9af9", - "sha256": "1ic1a0j8gj930ssc623vi55jflyfw52gb9zkf3yg51w43cw4isfn" + "commit": "873025ffc85b5e40ec361e953218fa09c6ebd621", + "sha256": "10sinzpnk41xvdb1va9vv6nnwyyryvmyrvxxwq6xska9ab580g6y" }, "stable": { "version": [ 0, - 15 + 16 ], "deps": [ "package-lint" ], - "commit": "cfe5aa2c8eeb2f6df38cf97a2315ac8f8ae41696", - "sha256": "1cn713g90zyjfq225yvg14c1qshslpi4466m3w102l5g57p8xv44" + "commit": "7a83a138e6546f4c4a9988ba6dddc5339fbe7272", + "sha256": "0srqcrhbdmd39jdsvh8k3nbrkqrl4nlic59dp5bal5vj495j7126" } }, { @@ -83466,11 +84345,11 @@ "repo": "tttuuu888/package-loading-notifier", "unstable": { "version": [ - 20210724, - 1700 + 20220130, + 318 ], - "commit": "895ab23f970f954349ccb6c89d397ad7d86087f8", - "sha256": "0maa3w06wx54f482z2k6d0vq8mr01j75nnbb7d0mjw15d6qi7pbk" + "commit": "bc06ba97a0537aa202f277e5597ac96ca39307ab", + "sha256": "0wp3jdbzcjpbx4720nd31fzs5app6phdrbcwisw89361wvmmnhkj" } }, { @@ -83672,6 +84551,50 @@ "sha256": "11msqs8v9wn8sj45dw1fl0ldi3sw33v0xclynbxgmawyabfq3bqm" } }, + { + "ename": "paimon", + "commit": "bb634388ab592171fbe2b9066d52e1f0f31ebbf7", + "sha256": "1rqhi45m4pz1vjm6q9h91p5z00751q9dkrd845rl6cpdr2nsr270", + "fetcher": "github", + "repo": "r0man/paimon.el", + "unstable": { + "version": [ + 20220325, + 1032 + ], + "deps": [ + "aio", + "closql", + "emacsql", + "emacsql-sqlite", + "f", + "ht", + "request", + "transient" + ], + "commit": "8e28efe96a171b04b1fd83f763ca26e939dd44ed", + "sha256": "1d3bcy1wb7wsw6qqihwdy835z32pibz9d8ia8xcarzcg5c983is8" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "deps": [ + "aio", + "closql", + "emacsql", + "emacsql-sqlite", + "f", + "ht", + "request", + "transient" + ], + "commit": "b29ccfcedefd03cc05d98cd06a5935ecf4bd6917", + "sha256": "1wd1z2l0jyx20y2h95w6ybjabjn613m09gmrp6bj13ry4355sfvs" + } + }, { "ename": "pair-tree", "commit": "ca9422233229d8703641d87d9250ad3f38c11fd7", @@ -83888,8 +84811,8 @@ 20200510, 5 ], - "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", - "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" + "commit": "350af0e5d53307c900e4f8b2617f3852f51a74d2", + "sha256": "097pd9ihnzjiaxbzrabcw0016wdwrljs9b5s6cbkrrbgicngb8vj" } }, { @@ -84070,20 +84993,20 @@ "repo": "tarsius/paren-face", "unstable": { "version": [ - 20210127, - 1749 + 20220129, + 2216 ], - "commit": "6790c7fdec490a69e7d460c0bea36ad343776f9b", - "sha256": "1zyrrrr8rmksr3rfsv96psk1z15wbbx1bvcfp3hf5ciyc2n79000" + "commit": "4f6ad761a7d508bb6b3e6539559929d2706caa10", + "sha256": "13d8psgd2j3vqmgwwf62gwyq7h6qlj8rrs31fxwjqmzzdblwqy1y" }, "stable": { "version": [ 1, 0, - 7 + 8 ], - "commit": "6790c7fdec490a69e7d460c0bea36ad343776f9b", - "sha256": "1zyrrrr8rmksr3rfsv96psk1z15wbbx1bvcfp3hf5ciyc2n79000" + "commit": "4f6ad761a7d508bb6b3e6539559929d2706caa10", + "sha256": "13d8psgd2j3vqmgwwf62gwyq7h6qlj8rrs31fxwjqmzzdblwqy1y" } }, { @@ -84180,14 +85103,14 @@ "repo": "jcs-elpa/parse-it", "unstable": { "version": [ - 20210306, - 821 + 20220214, + 1531 ], "deps": [ "s" ], - "commit": "b9b77285fdef7936baea5447b37651f67c51f041", - "sha256": "1xg829a0wjrjh64lzccr65j5sr1zh9wzvbid65f0c733nyizcy0f" + "commit": "c6330d9fc28fe92c83415c2a56e675a6e04841fa", + "sha256": "1bgpbc38f37ja6xsny7q28wwvg0m6hs34zgqk3q39zadq595q6iy" }, "stable": { "version": [ @@ -84263,20 +85186,20 @@ "repo": "clojure-emacs/parseclj", "unstable": { "version": [ - 20211013, - 453 + 20220313, + 1649 ], - "commit": "a8c4cf30fb68b66ae51541462a8b21753229a6e5", - "sha256": "0n0m3xc2dawgdhb68zznpsbzbbvf9fwgf9v8pzzwa2jncgi1yhh0" + "commit": "f32c041f2b301e790429fd16677c8cab11645702", + "sha256": "1i3xrhfhdjadq6qyn492r37ayd88cna1yih87b9n3iky1ziryljj" }, "stable": { "version": [ 1, - 0, - 6 + 1, + 0 ], - "commit": "a8c4cf30fb68b66ae51541462a8b21753229a6e5", - "sha256": "0n0m3xc2dawgdhb68zznpsbzbbvf9fwgf9v8pzzwa2jncgi1yhh0" + "commit": "90595049634549e6d8872f719b13e9555897d17b", + "sha256": "0ifc9gyp7hr97ssnsqxiwrzmldqysz874crlg6jm4iy5l9fyls22" } }, { @@ -84287,28 +85210,28 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20211013, - 452 + 20220207, + 1352 ], "deps": [ "map", "parseclj" ], - "commit": "e5ba280d1fb7b408d54062d4eac545326e850172", - "sha256": "1xp2d42yvqkimb7a15bv89bj0124lljw9cb36g49m13d7ny4fafn" + "commit": "ea7b5281ec80aca0bd1cc93a348aebb302497339", + "sha256": "01j8nrkcm2s0ps277b5zb4pys29lk4cq49rlcqpj19gbfpkwcvdv" }, "stable": { "version": [ 1, - 0, - 6 + 1, + 0 ], "deps": [ "map", "parseclj" ], - "commit": "e5ba280d1fb7b408d54062d4eac545326e850172", - "sha256": "1xp2d42yvqkimb7a15bv89bj0124lljw9cb36g49m13d7ny4fafn" + "commit": "ea7b5281ec80aca0bd1cc93a348aebb302497339", + "sha256": "01j8nrkcm2s0ps277b5zb4pys29lk4cq49rlcqpj19gbfpkwcvdv" } }, { @@ -84412,11 +85335,11 @@ "repo": "juergenhoetzel/password-mode", "unstable": { "version": [ - 20210323, - 1816 + 20220222, + 1757 ], - "commit": "114b721ebbf384b6af6fd46797e83896a9e14aca", - "sha256": "1zwc3wk770plfwlywqwiviqv9hiskf3fsl2nv9zp4gmvphzrqvql" + "commit": "456a01e959140cb070e77bce5032a6885c7b7ae0", + "sha256": "08achm8xxpadkqk0jk6nk0x8zk25xwn59xmvybj1rsmm4apnqsqx" } }, { @@ -84427,16 +85350,16 @@ "repo": "zx2c4/password-store", "unstable": { "version": [ - 20200328, - 1214 + 20220306, + 2230 ], "deps": [ "auth-source-pass", "s", "with-editor" ], - "commit": "eea24967a002a2a81ae9b97a1fe972b5287f3a09", - "sha256": "0vsdy989b69widmvaj2hzkmraddwzkpbbnj16gv95bhl51av2582" + "commit": "c4d8a1d815e79ddd89a85d3e36a41d29f0475771", + "sha256": "1gcpnh34ra7ahzmkh6rh4wkp745f8n14jbrdq2mhgg4zvxc2w83w" }, "stable": { "version": [ @@ -84461,15 +85384,15 @@ "repo": "volrath/password-store-otp.el", "unstable": { "version": [ - 20190713, - 1748 + 20220128, + 1320 ], "deps": [ "password-store", "s" ], - "commit": "04998c8578a060ab4a4e8f46f2ee0aafad4ab4d5", - "sha256": "1c9lvxi0yf0x3ywciv58zkn9ss6n41305g5rp4l32a33sq51s567" + "commit": "be3a00a981921ed1b2f78012944dc25eb5a0beca", + "sha256": "0hqfxdpis2if5fl5avar93mr2gfqqnd87s835hiibqq0800dv3v7" }, "stable": { "version": [ @@ -84487,20 +85410,20 @@ }, { "ename": "password-vault", - "commit": "71ad3fa96afa18b5002faf9272732c7d09826493", + "commit": "1a054aba2409fb8ae12a634952f3d1336a14eb70", "sha256": "17i556xwq6yaxv9v18l1abcpbaz6hygsa4vf4b68fc98vcy7396a", "fetcher": "github", "repo": "PuercoPop/password-vault", "unstable": { "version": [ - 20160126, - 1820 + 20220321, + 1521 ], "deps": [ "cl-lib" ], - "commit": "dc56e6c2f5da66f1ab63736cecf08fb2c6c2b30f", - "sha256": "0921xwg3d3345hiqz4c1iyqwvfyg8rv0wggcnig7xh9qivspag4c" + "commit": "763750e2fbdd3bc96dfd256215b5e49394b7bef3", + "sha256": "0zwnk5ljack42f3nmjwrhsx7f7cr52r3w5y414c5bg9yk3y47dda" } }, { @@ -84783,11 +85706,11 @@ "repo": "JonWaltman/pcmpl-args.el", "unstable": { "version": [ - 20210805, - 1537 + 20220131, + 2316 ], - "commit": "5f2943fd70d94065496c52d21f05eb89028637cc", - "sha256": "19xwwpfcf0l9jh7xixyjd5adivj27jw00zvxb7n1240k5p332pzi" + "commit": "94a19b693a226aa11b15627e01f9f4c9af752bab", + "sha256": "0y0mnm2fhshvvc9iz4mgzvxhvhj0xriinn155dilnm4skglzgxk1" }, "stable": { "version": [ @@ -84969,16 +85892,16 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20220107, - 1241 + 20220214, + 344 ], "deps": [ "let-alist", "nadvice", "tablist" ], - "commit": "4e6c778194bea39d81871a3caa0b72539fdb6868", - "sha256": "076597i0c3s8l010m6xirass0grcs3pjxs7l19xj8219x9lkf8l5" + "commit": "326552eef71ae6d53e215c46be5bf532575b7abb", + "sha256": "1gvaw0684svv9v294f8zgmqa2ym2wa3gymn9y9v2slhamf51r4vk" }, "stable": { "version": [ @@ -85197,20 +86120,20 @@ "repo": "Fanael/persistent-scratch", "unstable": { "version": [ - 20200921, - 2309 + 20220218, + 810 ], - "commit": "57221e5fdff22985c0ea2f3e7c282ce823ea5932", - "sha256": "0fp9kqpbphzafd28xd30n7j4mibki56fg4xmfv13pbs459awrzdh" + "commit": "4e159967801b75d07303221c4e5a2b89039c6a11", + "sha256": "1f4s2rjgylqxjnx2885hc58215k3j162v0qlk2agq6m0hk9nn6fb" }, "stable": { "version": [ 0, 3, - 5 + 6 ], - "commit": "57221e5fdff22985c0ea2f3e7c282ce823ea5932", - "sha256": "0fp9kqpbphzafd28xd30n7j4mibki56fg4xmfv13pbs459awrzdh" + "commit": "4e159967801b75d07303221c4e5a2b89039c6a11", + "sha256": "1f4s2rjgylqxjnx2885hc58215k3j162v0qlk2agq6m0hk9nn6fb" } }, { @@ -85285,11 +86208,11 @@ "repo": "Bad-ptr/persp-mode.el", "unstable": { "version": [ - 20201128, - 2015 + 20220206, + 1742 ], - "commit": "298df111f081b5925f0aa0126a1b8d334117e0a2", - "sha256": "0r2j8zs6hwpfvwd6av35izlyd3kplnvc4c941vjjq7sm6j95q6k8" + "commit": "7a594a3d8f1c4ba9234dcd831a589e87f3f4ae86", + "sha256": "0ckcnqg2fn4m5zp06jlw5cj81clizrm8cxjiwz5rd4d9m9lwdrgd" }, "stable": { "version": [ @@ -85381,14 +86304,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20211213, - 435 + 20220320, + 437 ], "deps": [ "cl-lib" ], - "commit": "d8211a80fbc2cc0d9e163ef6a3e1d0a693b4e00e", - "sha256": "1p7il5s5r582w7if3v3cwkvdb6myszkf2fr2f3sw0x70x644bq2z" + "commit": "d3afc52ed098b713b6607943bd1ee0ef899db267", + "sha256": "0bbpmrjyz0zfgbfhf340axnx93ln39ml58frpqiiablz9n1xvj0j" }, "stable": { "version": [ @@ -85410,16 +86333,16 @@ "repo": "SqrtMinusOne/perspective-exwm.el", "unstable": { "version": [ - 20220103, - 909 + 20220125, + 1939 ], "deps": [ "burly", "exwm", "perspective" ], - "commit": "3a4d382a744149b8bdbea5b62f66f6705fd5e2c7", - "sha256": "1kpciigv0lxdxswnqjdbqlk30jlzvzy9li21z1kbnr5plflj3ffb" + "commit": "8afdbf894a888854ce9dfbe0ad2a5dc41f75ecb8", + "sha256": "191xm4l5id480bcf2nlliacrn2a9qrxs18pfkd4sk4bn9xxz74dx" }, "stable": { "version": [ @@ -85876,11 +86799,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20220109, - 247 + 20220120, + 1959 ], - "commit": "010d0f6987ab7336ac9475e8e2298caa56981085", - "sha256": "0z0cskqg9mjk7v2631pir3bmgyp2clmhq432blirfla269bry30c" + "commit": "5f26bec865ee159dc30d3922f17bc42adfcfed50", + "sha256": "0132az773sk6w1wdz4a1wxmxy5w69x4h2jrgd67h94k845nyl348" }, "stable": { "version": [ @@ -85992,8 +86915,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20210619, - 1706 + 20220310, + 1511 ], "deps": [ "async", @@ -86001,8 +86924,8 @@ "f", "php-runtime" ], - "commit": "272217fbb6b7e7f70615fc518d77c6d75f33a44f", - "sha256": "0hm96i9vdbkcq6mypjpl94dn3gzyk23iql5zzy2d221vmjhqvn7d" + "commit": "34195f1533209e2ffd0f898a69c7db2bffd1eabe", + "sha256": "1xp4v5dm2x31xp5rq80jii2y8nprqd3jcmzpc0dp9xk3fq9hbq7l" }, "stable": { "version": [ @@ -86339,8 +87262,8 @@ 20210629, 1257 ], - "commit": "1959d2d5e09fde5244f9f945fec043cdffd5d37e", - "sha256": "00iyyvqs28l0qgzwm57r6qibdk98w4sdr4ilxsb1f2lrir75q6ir" + "commit": "d8ce5dc595a053e80debf6c1e330995c739a8b05", + "sha256": "03m9mnl19rwkpk7yi86g39wfnngz377kj8ihd49xxscgi4k1nd55" }, "stable": { "version": [ @@ -86492,15 +87415,15 @@ "repo": "arifer612/pippel", "unstable": { "version": [ - 20211205, - 1711 + 20220225, + 1128 ], "deps": [ "dash", "s" ], - "commit": "1e96053ffdcbf64e4c8a0a622feddc3cb0a82ded", - "sha256": "00rnzy7r397k6dwsflnv5lc7x5hcnkr4g784zj3bs8rq64h7dcz0" + "commit": "682a40af266f395cf39862ad0bfb30152ddee204", + "sha256": "1gb7nf047gm57jdggj49ri46hgz8gphqy58abniqlqxjcx9zp4z7" } }, { @@ -86598,11 +87521,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20210123, - 1507 + 20220312, + 1316 ], - "commit": "8a5e95c8514315cb40c47f1acdb68a4ace921497", - "sha256": "1p903a3jbw1jp5l6d6mb50dq5zd8951qxh2b97vy30p3nnl8i0lj" + "commit": "3cbf38c22d783ac77d5dbc69a38afa04e0aa4803", + "sha256": "14ll9z57jlnbvsnzarqi0k0a0bxnkc9y4r52xah1h09v5fmcyi8a" }, "stable": { "version": [ @@ -86633,10 +87556,10 @@ }, { "ename": "plain-theme", - "commit": "e170913006b93f4c235c403c5cde64d274b91e1f", - "sha256": "11hafn2wsj5dskf18q3jd6vqj20nhzii067ll8l38977c070qqlh", + "commit": "c06b0212e521aa168ad4c34c312235d6ad38b004", + "sha256": "0ij63lfpmligzp9m6lvww7jri9cs6gkzhy49wdjqhi5dy63y2xpv", "fetcher": "github", - "repo": "alpakido/plain-theme", + "repo": "sowelisuwi/plain-theme", "unstable": { "version": [ 20171124, @@ -87239,14 +88162,14 @@ "repo": "wailo/emacs-poet", "unstable": { "version": [ - 20190124, - 654 + 20190403, + 708 ], "deps": [ "request" ], - "commit": "32382057b3e4b8a02ec5ac3190dbe4b93d058741", - "sha256": "1p8x7g3hg6yw51c67kznvldrvwnp67l9b6drnmck8glwx0nxb6zr" + "commit": "38a9635cab4799224153f89ff47cf1b060fb3939", + "sha256": "1h8svmh2pmg822jpag33ahmhpvdc77fbxxn205kx8p3vk362vbvi" } }, { @@ -87540,14 +88463,14 @@ "repo": "polymode/poly-org", "unstable": { "version": [ - 20220119, - 910 + 20220201, + 1514 ], "deps": [ "polymode" ], - "commit": "e8e5375f82c1d1a6b4b0ba6ae7ea181ff6f49e3e", - "sha256": "1v1k0aah4c6b1zrswjgcfnsaypxxgiyai33j4slxvalbj4nsa5g5" + "commit": "01fd0f4b7eaeabf070af831f4825993210f64f2e", + "sha256": "1cp017g5a7mk61mw1dhykqlyc1nzk50diw8ykf4napbky643c803" }, "stable": { "version": [ @@ -87700,11 +88623,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20220119, - 1503 + 20220322, + 824 ], - "commit": "d0913ed53d27ee90b8a31b7a78a29502a5314087", - "sha256": "0h4xndlgyqv1ywqnvl6zb08brviiznmarnn56sikmjzkh9i64zdh" + "commit": "2094c92403fe395dfb2b8b2521da1012a966e9ab", + "sha256": "0fgg6vw81cqp4ixm9iwh9r1dw6l4pimpdxjcvvpmfff6ia4pqqws" }, "stable": { "version": [ @@ -87743,16 +88666,16 @@ "repo": "SqrtMinusOne/pomm.el", "unstable": { "version": [ - 20211219, - 728 + 20220315, + 2038 ], "deps": [ "alert", "seq", "transient" ], - "commit": "596eed778fa30e7b33910f015543eda13abd1888", - "sha256": "0arhl9x9d4d1s4x5qcf1kn9hkwgsrs6sjn0rky10pgja7gqh6214" + "commit": "2a2673bdc8e2c2af99040b14e97b39271806bf79", + "sha256": "09w3m2gb0qv3cr3kklv37rgpcaxvyp21sdjmb15c26cf0i8rc86c" }, "stable": { "version": [ @@ -87813,8 +88736,8 @@ "deps": [ "yasnippet" ], - "commit": "115a0d5066f89554bee9cb1045bcda5a18ebd441", - "sha256": "1g11w52bf724zwwsvrcylk3ndjci2cnbzing77c91psz6d7zjkvw" + "commit": "81a1348f81b0d8a3097d1ca3f2fb2f57964d56d6", + "sha256": "0p2lnvcfjs8v012xrdphjbbdz1nkw9cqhiznadrgd3r0h49r13ys" }, "stable": { "version": [ @@ -87850,8 +88773,8 @@ "yafolding", "yasnippet" ], - "commit": "61f54d0620229afdd049dfe75681942bcf52e53d", - "sha256": "1z04y3kxbj2lisawl5yxwg7q8qry02fhmv0is6wwv3gmgnbk1kns" + "commit": "4bdffa94cd89da91b75e9edc56e9e2197ce072a3", + "sha256": "0vr4w7923g3a5sikw4px82plgjk9b3wki8ciqamp7i1p5i5lxbhz" }, "stable": { "version": [ @@ -87928,11 +88851,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20211226, - 2111 + 20220309, + 457 ], - "commit": "527a85c49174e6e79220f0ed0761c204a979eae6", - "sha256": "1l9n67jsj1y5q9hhkrmsxcjw1q3ychk7npl8fd1gbzxy2csc7vi2" + "commit": "60297066e31e012b8087b1b7818febd73e02d2cf", + "sha256": "1ivj61hjg5gqlivb04ynnk2mry8bac9mmf9f473naplzwnd741p1" }, "stable": { "version": [ @@ -87954,8 +88877,8 @@ 20211231, 1823 ], - "commit": "ec3d3169a4d60b0374198580e31b6c59f51ab08a", - "sha256": "12ymj71fsps0q4rk2hcj80nf93i5iq93sg0fw6dkn8swdvmhp1lz" + "commit": "e112ef1cc6c86151ea97a0bad49026fbbacc768c", + "sha256": "1iwq7p7f1xpiwzlizqqm2jzf2ly0cgaj8zskjrya0lymfz8rw7dx" }, "stable": { "version": [ @@ -88098,8 +89021,8 @@ 20210215, 1849 ], - "commit": "1184368d3610bd0d0ca4a3db4068048c562c2b50", - "sha256": "0inm6wbfkw6b9bwikd77d0zmk6ma9fzfs11acblp5imq202v76ra" + "commit": "8f90c6faeecd77c88883cafc03c37a5cce4b1982", + "sha256": "0zs4z22ib34jg1lblqr5b0gdywb88fp769dk2x53s6sq1gi7cvkp" }, "stable": { "version": [ @@ -88146,8 +89069,8 @@ "json-rpc-server", "web-server" ], - "commit": "9e68b419acf9245208f8094e10041b7f04511473", - "sha256": "0kaf00924jg50l2zdhyf1lxsh44nfp4zbc23wxbir45xdx9rzl3z" + "commit": "21af54b2fc9fd8876664c8e6c2ff2e4ffbbad249", + "sha256": "1x117hnsn88gj7m0kwrl8gps5qrzzjmx9ki045ndgfpqayyfyplp" }, "stable": { "version": [ @@ -88196,11 +89119,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20220110, - 422 + 20220124, + 859 ], - "commit": "6c0e63d6b3b6638c11729c5db28019a38ff44f5b", - "sha256": "0l3c7d24lirks8i4s715cdv2x022h4l6p5kg81ramqzd843335qf" + "commit": "c91d4d53fa479ceb604071008ce0a901770eff57", + "sha256": "15h809mf8d8w8axbfzjs40j8yrh5ms88x4pmlx1qlcac8j6qrilf" }, "stable": { "version": [ @@ -88291,14 +89214,14 @@ "repo": "milkypostman/powerline", "unstable": { "version": [ - 20211022, - 655 + 20220122, + 1904 ], "deps": [ "cl-lib" ], - "commit": "390a95fe5b71cfc20e18d034b4b35b5c159a83fc", - "sha256": "0n5fd38qqsj2m6m6dkm11ndk0blxnn5z5rdpb9blrni7p45d6z8b" + "commit": "566c77844f053cb39fa7acdfbc143a855450f0b5", + "sha256": "0nhh2bq35s8rgz6g38i97759d92d6z5yak66687lnk481wca3x4l" }, "stable": { "version": [ @@ -88354,15 +89277,15 @@ "repo": "SavchenkoValeriy/emacs-powerthesaurus", "unstable": { "version": [ - 20211127, - 1502 + 20220221, + 1004 ], "deps": [ "request", "s" ], - "commit": "02c9d11a3f407023aa7c7b080bb9f8a5f5e7cd7a", - "sha256": "134m24v9xxnnsr180sx9li938jn5lx7kny2095fpl90qgpn3jd5q" + "commit": "810a25056c623f304de6a72123652d9c35936718", + "sha256": "13pzfqjh734lma8yfmp6a7r0j4a8jk3r0dc38hlx1vxwp0pw5ags" } }, { @@ -88405,14 +89328,11 @@ "repo": "conao3/ppp.el", "unstable": { "version": [ - 20200812, - 844 + 20220211, + 1529 ], - "deps": [ - "leaf" - ], - "commit": "86dad69c3a7dae770f6b99285647dff2aad81930", - "sha256": "01c82h5j7yggsbhbrlbcwl562mpd79c0i878129r4ivvhka3nha3" + "commit": "d5d854c3006dfd268e62c7f91c2aad6f86a505b5", + "sha256": "1brx3fz2amsrir6qzxwj4w8v0hhib5zcnyc5l00y5k7mrnaklh86" }, "stable": { "version": [ @@ -88432,8 +89352,8 @@ "repo": "blahgeek/emacs-pr-review", "unstable": { "version": [ - 20211219, - 224 + 20220213, + 1524 ], "deps": [ "ghub", @@ -88441,8 +89361,8 @@ "magit-section", "markdown-mode" ], - "commit": "bae2d8aff61cbe05da6f3f41e6cf854ece4a41f0", - "sha256": "1p9vbhsal667cjh36wmww95c6c3srp3hqi2yfq9srmplma7ffc5n" + "commit": "5c44b06e314a43a30de8323cae75b1e87594f991", + "sha256": "1f2lrwbb85i31vcjin9b0gi89m2zn9w2npwi1sqp0bjd0ndimwp5" } }, { @@ -88468,6 +89388,38 @@ "sha256": "1agghimrmh4kh71y51l6lzampjl15ac6jxrrhdviw95c3rxfll4x" } }, + { + "ename": "prefab", + "commit": "15837c8aca3dcdf55cebdbf1bc1d69d840056742", + "sha256": "198scgrwhiwyi6cbr3agh8q23m92aybvmvrf3fah4dqz35iay6yg", + "fetcher": "github", + "repo": "LaurenceWarne/prefab.el", + "unstable": { + "version": [ + 20220314, + 2005 + ], + "deps": [ + "f", + "transient" + ], + "commit": "4d9cac415a4ee86bb5793ce18a350a30f562c2fd", + "sha256": "0f4cm5kvsa14yl93vw750ll51vf1g4b04vl6zivq1nzrb8gjj6zr" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "f", + "transient" + ], + "commit": "70c20db8423e39e9889222531ba52715c6d5ce87", + "sha256": "1f4qikrs9zdnnr6f1a5vwb0f9kqn1b7fb5n5n9r14h1wc6pn6y48" + } + }, { "ename": "preproc-font-lock", "commit": "582692267795c91bb7f2ec3bffc2b9c2be9f2a32", @@ -88494,8 +89446,8 @@ 20211228, 417 ], - "commit": "3dbcef387502d309d130a518a18d48cd2f0e15b7", - "sha256": "024l7s0b6apbzanw3cnhjypxnxfinfb5b3nhaabrc138m5pis8j5" + "commit": "c5295a9eecbd2935bb57684a4422638e03bf738c", + "sha256": "1wfmynbqaqvrkjdncx0wmqxz6v8zlfmqlh5l3h6876jin97i5fbv" }, "stable": { "version": [ @@ -88598,6 +89550,36 @@ "sha256": "0hj4fv3fgc60i6jrsx4a81s5c9fsxxafhhs3q2q1dypsscjci9ph" } }, + { + "ename": "prettier-rc", + "commit": "9511d2926f50ac20b9c5b99c14cf2d51e377c981", + "sha256": "0gkyws3pmnswc07yzvr39w439f5pcwfja0sg4460shkrmqqcwv8b", + "fetcher": "github", + "repo": "jjuliano/prettier-rc-emacs", + "unstable": { + "version": [ + 20220321, + 1516 + ], + "deps": [ + "prettier-js" + ], + "commit": "f2aa1a7469d62a11479a3abb826c8fb96dd00082", + "sha256": "1rlfh2c680nl2bbv82mp4y6k6cp7qwp2axi0v998zb62ymw6p1bv" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "prettier-js" + ], + "commit": "eaef4cd76094c7351a2da508b4bc3b25966d0da6", + "sha256": "1ylaikaqpd4f1p8ir5y271dy6xv8jvdzs7ail5ac0lxk3m8gl4ki" + } + }, { "ename": "prettify-greek", "commit": "23c8f10205187babb17e3abc3dc40eb1938e6640", @@ -88707,6 +89689,21 @@ "sha256": "1n0594msgy53ia58gjfkm3z3cnmq52wrq5992fm28s4jgazbgdfd" } }, + { + "ename": "pretty-speedbar", + "commit": "f91b1b66d4c9b7c47bc83e8c22b295b8804d3283", + "sha256": "14rd1h5pc31yv7rycpqdq5yhwif1b941fknr86qm055dlnrqqqa8", + "fetcher": "github", + "repo": "kcyarn/pretty-speedbar", + "unstable": { + "version": [ + 20220303, + 1726 + ], + "commit": "56dc9f114fcc55843e182cde1fc9d7a14c261c6a", + "sha256": "1hz67jhvg9n9d07lil6zqciqhh512k0fv54dl605p7vi704ma2ir" + } + }, { "ename": "pretty-symbols", "commit": "ed01ef6333e4558877b0e357ff8bf601fb88b757", @@ -89012,8 +90009,8 @@ 20210715, 1213 ], - "commit": "8c76f26c667a9748835a86ded0c7fc8f1c558b4c", - "sha256": "05fxlia6bqf9jcx963fa0kn06va256dj7hmdli04vlp8h748sljj" + "commit": "7bd4d77808e15bc3845b0ab2421bb31c20e981cc", + "sha256": "16ybwsqlw5j92bynm9x56s351y4mh2s51ycbcfcl3460b9adqsxl" }, "stable": { "version": [ @@ -89169,11 +90166,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20211220, - 1144 + 20220313, + 1334 ], - "commit": "4e6f66c329e57d66269b4bd3fc02518eb0c677bc", - "sha256": "10imlg3qmyskpzbw5i1ac1chn5yiyl3wi3wx9l3sn4kkjgggiicl" + "commit": "20df208385ce7b80207602c9931e31094eca85fb", + "sha256": "15nnmnapyclk6v69l2l0vhy5k5x682l0kj9nj454nmdqqh4lmkwy" }, "stable": { "version": [ @@ -89290,8 +90287,8 @@ "projectile", "ripgrep" ], - "commit": "40e871dcc4519a70981e9f28acea304692a60978", - "sha256": "0snn12iibz5frsx6yk6c31hb8knvsd568ghw9jjka5vxdjzap7p9" + "commit": "4ed5c741233a81d96115f556784269042070901e", + "sha256": "1bz9srlimpr5lzsjd02jq23h0vg2lnk921m24g0wsrdrccvmfxi2" }, "stable": { "version": [ @@ -89569,17 +90566,17 @@ }, { "ename": "proof-general", - "commit": "135c8f2a04739145b500b8742a697907e398d270", - "sha256": "10zif9ax4d3m8sa9y2xqz7g24xa2r3m2x5l0zqa06wm4afq29p87", + "commit": "5bab170dd89e99f7c8430a11e6a2d8191b60f746", + "sha256": "0fx1avmkwi8ilmv0lxk6pp91hd6saycggca52z8rvjz66h9rmq3c", "fetcher": "github", "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20211217, - 1753 + 20220310, + 2253 ], - "commit": "a61a1d8e5ffa610b794535995d58adf18e9ec47b", - "sha256": "1c6216yz2wb9c5yn5rq6jr9pwxb44vhvgnsi0wsh0rcccm24mdp8" + "commit": "f34a4938399e6b863f14315ba5eeefb5ce047c50", + "sha256": "1cgnjpxjrdwf1sk8a7b76gsdvlsl8p0cwb4yhizvafm5p4276v5s" } }, { @@ -89671,20 +90668,20 @@ "repo": "google/protobuf", "unstable": { "version": [ - 20211013, - 1726 + 20220303, + 1716 ], - "commit": "41e22cde8d8a44c35127a26c19e08b180e0b30a4", - "sha256": "12ixcl6983q1l3qgrxq9fs1v1v7ihc74k6xy52f63vm48z580lrr" + "commit": "b5a35bcc7e4cc4ff00eb105449b300fca3a8b0d2", + "sha256": "1gydvww2n64gsa2nyi5150jwsgxg0mdpxr3h9kpzdd4rqxab07z7" }, "stable": { "version": [ 3, - 19, - 3 + 20, + 0 ], - "commit": "cc7b1b53234cd7a8f50d90ac3933b240dcf4cd97", - "sha256": "115mdsx8jck4202hhnnirq60y3ya6swhh31f9bwj7fqcmv9qn3lw" + "commit": "bc799d78f81115940eec953e2937245c70e3e6e4", + "sha256": "0qnr8dp0cc2sfhacgjws1kc3s5c1xvbcrn5pi83p0axj0kdhjdbm" } }, { @@ -89718,17 +90715,17 @@ }, { "ename": "proxy-mode", - "commit": "25224d3bcdb625314e931d5acc22f60c7192a84b", - "sha256": "0ldjfmxn8k8bzvdrlsfpijsmgn754aza54by5d59k7a1xn6d37mp", - "fetcher": "github", - "repo": "stardiviner/proxy-mode", + "commit": "6f61331b1d9ca910f01bded48023bea5f8baeb25", + "sha256": "14g6r3vvv56h9b84cc1lcri2xavifc6n0gq1qyi9k9qjls1mnijl", + "fetcher": "git", + "url": "https://repo.or.cz/proxy-mode.git", "unstable": { "version": [ - 20201214, - 727 + 20220210, + 1410 ], - "commit": "dbf163413e9e404c652cc0ea7185c623016a38e1", - "sha256": "1c5m0gb4qms28vahvi5kam1qf1hnpd9v1f6cwxiqdj8aka9ll8sd" + "commit": "620e48c6afaf760d0ee9f5bdf583fd91cd9d0ec6", + "sha256": "0xlla1ymqgpb15bycxl4xijlgcwir01krcvsyhxl4anmrpj2c0hm" } }, { @@ -89827,15 +90824,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20211228, - 839 + 20220318, + 1129 ], "deps": [ "async", "cl-lib" ], - "commit": "97f6fb308fcb007e53c7277fb4603a6faef99c79", - "sha256": "0k2myrd1ar2nlgnavsvbawiff7x27fr72921xnzp7rwnl07klyji" + "commit": "328c64804c4c9e15b373c7ba3bc82bfdfb27971a", + "sha256": "1mmn5qmjn77jh0zjfgl6w87yxxq116cb7rj3an0svmaabqsmwpjj" }, "stable": { "version": [ @@ -90086,11 +91083,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20211204, - 1256 + 20220204, + 1645 ], - "commit": "e147a72f3c6b7bb40ef7fa37d12ea54afa09cd7e", - "sha256": "06lkpzz6ri092awgba575vq4qy3ym4qbk6hrwfpvmy81n26v7wsw" + "commit": "e6681214afc6b5ae06e4813492633bb4ad9b2b1b", + "sha256": "0jqii5ijbnppayawrl27b22accpxayf5i4h15zx1s0wpb77km0s8" } }, { @@ -90580,15 +91577,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20220112, - 157 + 20220130, + 722 ], "deps": [ "async", "xr" ], - "commit": "75ead11eeaaf801e342bb18d7c0ff93ed1c123ff", - "sha256": "1wlvgh214fn2d4h7wiq68hwshncq85qp9j5agkvh7avla56vi97j" + "commit": "028e443527166e8cd6ecc903e635fbe89aca9c91", + "sha256": "1qpskp8jqxwfbg274lkl95fmilygzxqpy2i7vv0vdl7pdknvbkgk" }, "stable": { "version": [ @@ -90765,17 +91762,17 @@ 20210411, 1931 ], - "commit": "ccd9aee3c0a64c8a9de52be03daa0fcb7a6dd84b", - "sha256": "0024ppkkk9saj86ncld39qgxf365yfqx264hbad0k4xp0qrlig9k" + "commit": "556304eb1e54c67940d0f9d0497ffa368b50a22a", + "sha256": "0j6vwjw83wyhalwzic94pimjvjwsxyyz6mh6zsic44hc80ycnrj0" }, "stable": { "version": [ 2, - 12, - 2 + 13, + 1 ], - "commit": "eec287fae66f8fc514d5daa9caee46fd0e0cb6d9", - "sha256": "0spmy7j1vvh55shzgma80q61y0d1cj45dcgslb4g5w3y602miq5i" + "commit": "0e1ca11ac65cbe5a65437518fca1e25f1ad0e48e", + "sha256": "049mfnlwan1qq0awnxriw29v285ly4d3r8a8xgxhzpwg3k2z3sdn" } }, { @@ -90976,11 +91973,11 @@ "repo": "glyph/python-docstring-mode", "unstable": { "version": [ - 20190716, - 921 + 20220308, + 22 ], - "commit": "ec253711f2bdcb3848046bb68f6405a7bf9eb0fb", - "sha256": "0m27h2ycjz212r012wh4wsahidclmb74gk9g3v6ym9a2120bk0dh" + "commit": "01d0470498d08ce9d99dd4ce709c567229f857d2", + "sha256": "1573qiqllckd5xbdbll8h786v5znahd0l5hipda9i6ppb1vj3vwg" } }, { @@ -91089,20 +92086,20 @@ "repo": "jdtsmith/python-mls", "unstable": { "version": [ - 20220118, - 300 + 20220128, + 1953 ], - "commit": "049bd0a118e0ea133b777b40af1728734c4bf481", - "sha256": "13x6vvzxwmcjs6gd3xmhszy139dxa4vylvn9bq4677cj62yf5xpl" + "commit": "97e58c6b785f7096c0e02f6c1d12b008cc0219c1", + "sha256": "0nhk2jwzlnc0c1fzzdbc7dwil9wwk2ghizgynvdp9b2kg3jyd76n" }, "stable": { "version": [ 0, 1, - 0 + 1 ], - "commit": "152c4355ca315b1e5861496d5abed9365d856e57", - "sha256": "1d2ymwfdsdqii0drpypbl4mla2mq4a8avch4j4zj7g9h8z7h6wq5" + "commit": "97e58c6b785f7096c0e02f6c1d12b008cc0219c1", + "sha256": "0nhk2jwzlnc0c1fzzdbc7dwil9wwk2ghizgynvdp9b2kg3jyd76n" } }, { @@ -91113,11 +92110,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20211229, - 1002 + 20220315, + 1118 ], - "commit": "dcb376044d020dfe30f8e4273e61863b7d9615ce", - "sha256": "1638zl7aa2rf74d7rc396b5hda9fvlndapnivv3axc06mnf86rkk" + "commit": "29c6815c585c200eda2541b678e499d06c3e14d2", + "sha256": "1b146lq5hwr76fl1abg189xsjdvz8ggaas18n8d3yx4zvjskiqs9" }, "stable": { "version": [ @@ -91146,7 +92143,7 @@ "s", "transient" ], - "commit": "b603c5c7f21d351364deeb78e503d3a54d08a152", + "commit": "ea53891a219659d9339220d5db50a8c525f199af", "sha256": "176c4banbgd474iw49cw17wbvncr13xwgqjsfpvvakd0awpyvzw1" }, "stable": { @@ -91282,6 +92279,24 @@ "sha256": "055sgk8zf4wb5nqsf3qasf5gg861zlb1831733f1qcrd2ij5gzxx" } }, + { + "ename": "pyvenv-auto", + "commit": "ddf36d8974cc527db81d02c4f3792e16d1e5d80a", + "sha256": "141fjkrncmyls064w6kjxgj45zxip71p50scnrf74fizdbw2kn6d", + "fetcher": "github", + "repo": "nryotaro/pyvenv-auto", + "unstable": { + "version": [ + 20220315, + 1606 + ], + "deps": [ + "pyvenv" + ], + "commit": "59ece8554bf249f30984c81c103a5704d2fb27bf", + "sha256": "1f599q5bd89k68s0m9mq08a2f3465j00hklnmbyv0cm3j0majwzm" + } + }, { "ename": "q-mode", "commit": "fff65433eff01d6239809df4c047f0e4349cc4a9", @@ -91290,11 +92305,11 @@ "repo": "psaris/q-mode", "unstable": { "version": [ - 20211126, - 1944 + 20220123, + 1721 ], - "commit": "43e509ed323c105f9b312813a1ae953d1a2efe3e", - "sha256": "1b6prwdy3dnkdsxy1lwws1jmq5r80g729z18np8ylp9j3pzz0nrh" + "commit": "0bc3cdb32636278b1dc0bcc55741b147441347f6", + "sha256": "0dyf35fhm2wzq6p2wcgdhf81y4rs92j5np7jvrwp9ic9xzw51cx5" } }, { @@ -91331,8 +92346,8 @@ 20211010, 1334 ], - "commit": "a2c51cd1d54d507ec1902bc5c7bc888fe5a23c8d", - "sha256": "0zikg9gbcdzjlm6kdg71i28zxic4k22iijfvf7x4dvx5pc8pw8f6" + "commit": "fe3a99ff8cbddcf5391458f356cecf2e8c3a2b84", + "sha256": "07ssxr563lw748qwvdmp64dc0hlb1pf9kiv062xy2bp8hkxr0y9z" }, "stable": { "version": [ @@ -91397,6 +92412,27 @@ "sha256": "005wkji4wjqqilgmqy81rjqr8zx4gl39mari2ahvr9mfps2ypmjz" } }, + { + "ename": "quarto-mode", + "commit": "9534fae4c021b7f9c55175a189156c8658084821", + "sha256": "1cg26blid1kbnk7r1gzlpsd5gqgiqyr63kld0hqpih066xx5kaj5", + "fetcher": "github", + "repo": "quarto-dev/quarto-emacs", + "unstable": { + "version": [ + 20220306, + 2243 + ], + "deps": [ + "markdown-mode", + "poly-markdown", + "polymode", + "request" + ], + "commit": "9250975a4602d7a78efa2b0e477088aa2df5659c", + "sha256": "0n0cqcfmq9d36vdqa47scpny8hpdr975ykw01nf7924zacwgnjfb" + } + }, { "ename": "quasi-monochrome-theme", "commit": "a9c8498e4bcca19c4c24b2fd0db035c3da477e2a", @@ -91597,8 +92633,8 @@ 20210904, 1553 ], - "commit": "78317951cd3db986d811de616b7035559831749b", - "sha256": "0z7zpsmhfhnzvf1vqpsj5wsnlxmyxgc1z6599xsbvl30fw589y1r" + "commit": "c680f5137c49e352ff3779f9c82a3f1bd4a2d9b6", + "sha256": "1jjvjdig87krjmnwlxmlal56ks0nx4pgwrb5836srkd3aqlir90b" }, "stable": { "version": [ @@ -91756,11 +92792,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20220118, - 1424 + 20220325, + 1342 ], - "commit": "e9b40d2902e2fe7a46757a4fc64c780a18c94169", - "sha256": "1b97q81qhn3v42ivfzckqv7rc1k3j060gzp90p7qg73nslxiz1vg" + "commit": "c1774ad168bd0857cf695ad39ae4d61cd668f6d9", + "sha256": "1rksxymhadsj6zikhbn68j9iq0b01m9ajdddkk4kbaczh35vwyx5" } }, { @@ -91771,15 +92807,15 @@ "repo": "otavioschwanck/rails-i18n.el", "unstable": { "version": [ - 20220111, - 1811 + 20220126, + 1643 ], "deps": [ "dash", "yaml" ], - "commit": "b2048154beb384e9a732d3b4054dd18d974e9675", - "sha256": "1ci7an9jjnnl25gly1bg4njhcs20nvavpgbk34z9kvahpy12df48" + "commit": "8e87e4e48e31902b8259ded28a208c2e7efea6e9", + "sha256": "0mddr1gjhaxgc9rqmbkw2fymz3blvm0cvg15c9lrary1z1almj64" } }, { @@ -91805,15 +92841,14 @@ "repo": "otavioschwanck/rails-routes.el", "unstable": { "version": [ - 20220111, - 1811 + 20220126, + 1631 ], "deps": [ - "inflections", - "projectile" + "inflections" ], - "commit": "9df7e0499e093463267d210f14e96cb7f2263387", - "sha256": "1njw56h8w2pq8za1cg1s2jj06ryfaxpk694ab4jgmf4dyny5qw91" + "commit": "eab995a9297ca5bd9bd4f4c2737f2fecfc36def0", + "sha256": "0109mfxz7h7423yri1g0l4fr911iw7n6wkivpjcv09f0nq82jxch" } }, { @@ -91905,20 +92940,20 @@ }, { "ename": "rainbow-fart", - "commit": "cdcc8091357c42f5edbc1a13886253130f104242", - "sha256": "0zi1r8bgzd3g1dvginlp5nywyjk3lh495j6j3girgjqhsblnhfrx", - "fetcher": "github", - "repo": "stardiviner/emacs-rainbow-fart", + "commit": "c8de127d69c03addc9d93b712e2059f065a757f5", + "sha256": "0r9v9laaga02mzh1ch45a6y89bsmdr8433kz71fzrx6mam208i32", + "fetcher": "git", + "url": "https://repo.or.cz/emacs-rainbow-fart.git", "unstable": { "version": [ - 20211114, - 905 + 20220210, + 1359 ], "deps": [ "flycheck" ], - "commit": "aaaec8e20b3bde3a567baa501623c451f796a46a", - "sha256": "1mrq585wq4c23jv6fvphh03y4s8wjrh02dhd0l2369axl6bdslz7" + "commit": "4e5d3cca6cdc667e5da3300c04e1b3d1b00664a8", + "sha256": "06874ymiqpmx2isys0bf1fxw83xfzx64sxjq01xjzb3zv5ydy13w" } }, { @@ -91953,30 +92988,30 @@ "repo": "asok/rake", "unstable": { "version": [ - 20180212, - 1008 + 20220211, + 827 ], "deps": [ "cl-lib", "dash", "f" ], - "commit": "9c204334b03b4e899fadae6e59c20cf105404128", - "sha256": "09k2fqkmqr6g19rvqr5x2kpj1cn3wkncxg50hz02vmsrbgmzmnja" + "commit": "452ea0caca33376487103c64177c295ed2960cca", + "sha256": "13wi9mkj1qhypii8zagxg0cly2pp8kvj3h76iij6yfizdhxq026r" }, "stable": { "version": [ 0, 4, - 1 + 3 ], "deps": [ "cl-lib", "dash", "f" ], - "commit": "e680f1a8f2591af7c80cad188340601b101b5ddc", - "sha256": "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n" + "commit": "452ea0caca33376487103c64177c295ed2960cca", + "sha256": "13wi9mkj1qhypii8zagxg0cly2pp8kvj3h76iij6yfizdhxq026r" } }, { @@ -92761,11 +93796,11 @@ "repo": "xendk/reaper", "unstable": { "version": [ - 20220109, - 1305 + 20220211, + 1223 ], - "commit": "18a2bdb3f6a5934cf39dbeea5899f10f55e753a9", - "sha256": "0qlcl0dp1ggydz0jcyxzph2vjj8f457jyb81c1a6ds5bvybv8m28" + "commit": "d073fa8d00411af58fced861b7236aaa23b0692d", + "sha256": "0qg81yasilwk15jpxm0177slh9byihni9kc217m44pn0fxgpnsmi" }, "stable": { "version": [ @@ -92951,11 +93986,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20211108, - 2240 + 20220211, + 548 ], - "commit": "9d64b65855464bd92ccecf93c19db8b1fc12d7a3", - "sha256": "1fixdmrpa9jbjmpqf201420lpg6wcgngzddz7h5c4j68gw1a7jd0" + "commit": "d0d380929460ff35534900e34ababad43d23c966", + "sha256": "178415wsvjvji4caz72mksrv4krr7aykh02cggnp41w66chm503y" } }, { @@ -93066,11 +94101,11 @@ "repo": "minad/recursion-indicator", "unstable": { "version": [ - 20220102, - 1257 + 20220224, + 1333 ], - "commit": "c5ad65274f8e20fbf7a4485a5b51b50a5cc6b4c9", - "sha256": "0vnnkz5fgbdkr44yfyhv8w8vyzj4pfvi7858rgxw4sgj3zbj3x3p" + "commit": "e9bca04318fef45badd487cda002ff9617429f6b", + "sha256": "0cjn61dn67vxz3495h7klszqwkjv17bmlfv01adj8d2cibc5wqi3" }, "stable": { "version": [ @@ -93119,8 +94154,8 @@ "repo": "thanhvg/emacs-reddigg", "unstable": { "version": [ - 20210603, - 2305 + 20220312, + 1339 ], "deps": [ "ht", @@ -93128,8 +94163,8 @@ "promise", "request" ], - "commit": "1a6eaf3d1a5e44205399526c0f425281b8d9ccc3", - "sha256": "070zghnrh4ywndk6bz1vd750g2nxj4rd42gphymyz8x7kazqqh1j" + "commit": "911a1c6310b42226392fd03dc1746a4c6fc4eb95", + "sha256": "0zljjqd1qyxh0p5rjphkljbl4b1kpmjw279axxp8y4hd67rk8fc2" } }, { @@ -93249,8 +94284,8 @@ 20181121, 21 ], - "commit": "49783bd5d83c1d1989838b5ecf4a240bcc994243", - "sha256": "163kj0hmvn7vgd86q0dhz3zimkiqabzylyvchnzaqc2y1mp4qhfk" + "commit": "ae76658873a647eb43d8cf84365a9d68e9a3273c", + "sha256": "1nqpiy0aw43acrrg8aa1sd0880ilychysk2r2c7kwk5dbnip3f29" } }, { @@ -93319,11 +94354,11 @@ "repo": "alk/elisp-regex-dsl", "unstable": { "version": [ - 20100124, - 1028 + 20220125, + 506 ], - "commit": "ac89ab8b7691a165ef3007cb84417125cfc0632e", - "sha256": "1d34jd7is979vfgdy56zkd1m15ng3waiabfpak6dv6ak3cdh5fgx" + "commit": "8802555ecdab8b50bb64181798497c10cdb5034b", + "sha256": "0a3jyxrgr2sqigv86zr9irf0g8rvvc2bwjc3z2m8pbk75hm00k50" } }, { @@ -93786,8 +94821,8 @@ 20211107, 1907 ], - "commit": "3336eaa97de923f74b90dda3e35985e122d40805", - "sha256": "0jckwy5zhz95d6l3lz8b9b34pppcjjzy97fg1wn8mqzhf3h460ac" + "commit": "c769cf33f2ac0a1a9798b508935c4b260e856ab5", + "sha256": "0dqcg1dlzirmgsgg8ar2csn5mnlpr64y6n5skrqc6wcshzyzp038" }, "stable": { "version": [ @@ -93814,8 +94849,8 @@ "deferred", "request" ], - "commit": "3336eaa97de923f74b90dda3e35985e122d40805", - "sha256": "0jckwy5zhz95d6l3lz8b9b34pppcjjzy97fg1wn8mqzhf3h460ac" + "commit": "c769cf33f2ac0a1a9798b508935c4b260e856ab5", + "sha256": "0dqcg1dlzirmgsgg8ar2csn5mnlpr64y6n5skrqc6wcshzyzp038" }, "stable": { "version": [ @@ -93893,8 +94928,8 @@ 20210902, 2140 ], - "commit": "4bd88e4e835af2f9f7c0b65cf4488570126d4fef", - "sha256": "0k1h53kc2xmh5kc461rlac81mam8srkasc1jfb52a6qbscj3lspd" + "commit": "9c32dc6fcd05c72177ec1659c33f3b834233b890", + "sha256": "0vpxk1hmic9r1z7z2yxh1pff2m7zlvrh3j27bdcc0q3xnbzkmh7m" } }, { @@ -94066,8 +95101,8 @@ "f", "s" ], - "commit": "8d4dd03f8c12ea4b40fea90d0ae1de122caa5451", - "sha256": "1clgdhjspa613fhqn03didq78yz4nn2i7baf4nlq86b55g6ql206" + "commit": "4ff5fd1660eabaccca1fdbec8bdfbe0ad84eeb6a", + "sha256": "18c5gg6cgxg6dijrc6ijiw0mkxfkyb6pw3dd8vzipz17pszf2bjf" }, "stable": { "version": [ @@ -94115,14 +95150,14 @@ "repo": "a13/reverse-im.el", "unstable": { "version": [ - 20211005, - 2158 + 20220309, + 1919 ], "deps": [ "seq" ], - "commit": "380cce8deb1ea7ad79a8b1aaec4a753bd300b6fa", - "sha256": "039y306py7fb3pn4nhlq2mb7rznd6kv2m9bfpd7hbxpfysj7kmi5" + "commit": "50b8376f152916bc200635a112db9439bc3cc9b5", + "sha256": "12lk6k0jwz3y9bjyxyl14g8qys4zcacb80mkc0hgz0bb7797hp3z" }, "stable": { "version": [ @@ -94165,11 +95200,11 @@ "repo": "ideasman42/emacs-revert-buffer-all", "unstable": { "version": [ - 20211004, - 1321 + 20220211, + 548 ], - "commit": "947f2471acaf1b9d5162f8a886aed6a211dd8fca", - "sha256": "19nmz7nw8v2i395wzyva96y5sm5z6h01jh1fl6n9dpavq12s934a" + "commit": "0343c04a4408ff6cb3c8a9dff7d1ffee8256aa70", + "sha256": "16ws4j2fpnv96338z7vcibhscjrjmym910hsxc137lqrkavqhm19" } }, { @@ -94180,11 +95215,11 @@ "repo": "kmuto/review-el", "unstable": { "version": [ - 20210516, - 503 + 20220215, + 842 ], - "commit": "4f64f0ce1fe3a59389a1462dc26d6ba89d44d51c", - "sha256": "05w3n8hv5wclgwy58wbnximkf7xi6anp8vpxh523dplzxd77b5q6" + "commit": "f08ef20d9ff4f03a00a8c24dae9ce416da0d9d1c", + "sha256": "0wyjh9ymj62rlvvhahcqy48xjw768x6pkvhrwp8sp8pyb64ghkj3" } }, { @@ -94237,28 +95272,52 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20220116, - 1228 + 20220319, + 1216 ], "deps": [ "transient", "wgrep" ], - "commit": "dcbaa48689d3d73f8a142a1ab5f1e722d7434ff9", - "sha256": "1djccv9fdl0a3jlv3xsflds1hx5kam2n2ghhv7hr2whivlh9wkrb" + "commit": "5673681708685cce34521a1af48609b00a642b15", + "sha256": "0b1lq45vsn6fylwn1wmmfwc8mzwg4mgmj0kfqic039yagf9rvnpv" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ "transient", "wgrep" ], - "commit": "0fa6d33d2f3123aecd0b0dbc5fa3d884edf10a92", - "sha256": "17f11znjyfnxs5y0zafcx9aa055wkw3igzk9gy0cipnyp42yb4v7" + "commit": "77a709626609e7069f457e1b1885b76ebb98a354", + "sha256": "0a16g9phyy6c6vn5zfkpcpi90ixbx1ivp4wapwg189v77k2810by" + } + }, + { + "ename": "rhq", + "commit": "7538e3b243c20552f73d9a3c7524f0a106a62cb7", + "sha256": "1nv7hxw2yc8p5s95mf2lw50z69wpkcw63rq2k8x38r87bxfrifnh", + "fetcher": "github", + "repo": "ROCKTAKEY/rhq", + "unstable": { + "version": [ + 20220308, + 1254 + ], + "commit": "9cd8c2d61c3b8d4c92542a8c7f7493f61a850dc0", + "sha256": "0pj9900jmlid6ygwv5r8nnz1j4axcspyk73hl2vi1xvlna93yxdr" + }, + "stable": { + "version": [ + 0, + 6, + 0 + ], + "commit": "32d801fb79d45ef895c4e009884dd82ea3a6e466", + "sha256": "0nfi6mgar27qqf9hr9cnzq9asdisbkrwdlfjq9fzhgdb984xn22x" } }, { @@ -94417,8 +95476,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20211210, - 1806 + 20220222, + 228 ], "deps": [ "cl-lib", @@ -94426,8 +95485,8 @@ "popup", "posframe" ], - "commit": "5c2ade217134f6f20cd405447af20825e5b44513", - "sha256": "1yp92sfirvcz3s2q8j8g6qlcmb7pn30m9ww4nc332m1axah7l05n" + "commit": "e5727c5218a4345adb9b960cf6f4202246aea70c", + "sha256": "14vifq3ksmr0dg4lp293pgr70j76ajasvrm9j9hf3jspq7hbxb0x" }, "stable": { "version": [ @@ -94518,11 +95577,11 @@ "repo": "nlamirault/ripgrep.el", "unstable": { "version": [ - 20190215, - 841 + 20220309, + 1746 ], - "commit": "40e871dcc4519a70981e9f28acea304692a60978", - "sha256": "0snn12iibz5frsx6yk6c31hb8knvsd568ghw9jjka5vxdjzap7p9" + "commit": "4ed5c741233a81d96115f556784269042070901e", + "sha256": "1bz9srlimpr5lzsjd02jq23h0vg2lnk921m24g0wsrdrccvmfxi2" }, "stable": { "version": [ @@ -94617,11 +95676,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20210920, - 1617 + 20220325, + 1526 ], - "commit": "54bdd5090e0e3ae907d3f9075eb3a3fab0ba497a", - "sha256": "0i11kmqnbb201x9gmai279lni7csgq6isi1klpzch2c6y6pw01n0" + "commit": "2e1ff0653e5355a2214e735f0ada287071457c6a", + "sha256": "1ra2q2wnman6zdfmky296r8h73zhjwkika8r3czjx5nsg24464vi" } }, { @@ -94779,11 +95838,11 @@ "repo": "DerBeutlin/ros.el", "unstable": { "version": [ - 20220119, - 1543 + 20220314, + 2026 ], - "commit": "815a985d7426d716e9f588f6bbd3a12327c3acdb", - "sha256": "01hsnnxmvmk5vqga9781g1sff1fv2x77a4cmm3v5n94sv29jky4k" + "commit": "5e2bcd808f301b1a92cd583f2799d520bd802480", + "sha256": "0gb5bk1c10n4hr9dbwpgyk17qmd6bfqj9v9l0bmrbdvxafmnii8p" } }, { @@ -94857,15 +95916,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20201228, - 1319 + 20220203, + 211 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "92ef785010f6a68cbf73861e75ac6cf4e1832291", - "sha256": "1di1b9psmaqzhp0ik3niwgy43i0vj16m5fx7xnsyi0bvwv45cab8" + "commit": "4215ff1f2d1cee24a144ff08297276dc7b971c25", + "sha256": "11bada87rji78pw0d3l9g70vz2i1cvdlwxl4ixxcyc6whlfbff3f" }, "stable": { "version": [ @@ -95355,6 +96414,27 @@ "sha256": "132gsmgqnfzx8q0f4gchjzhm3wqm5frjrsb8q9cmqsa5y2g7qjmf" } }, + { + "ename": "run-command-recipes", + "commit": "797acbc65d7043abd094604ac7840dfaab0ef2c7", + "sha256": "1ifj1rk2yx379fkbagn90idhzglc0wgq749ab1w65yj00fmybz05", + "fetcher": "github", + "repo": "semenInRussia/emacs-run-command-recipes", + "unstable": { + "version": [ + 20220301, + 2010 + ], + "deps": [ + "dash", + "f", + "run-command", + "s" + ], + "commit": "02a4d366e309b7dd6a45f8a94669a25d6fe80ea1", + "sha256": "0j634n2v8sqpybbmd62jayyamz28dzlmvr45bsijbwxn6b4pa8k0" + } + }, { "ename": "run-stuff", "commit": "68b7cb0ffe90cd56e2ca6e91e33668be586a1da7", @@ -95363,11 +96443,11 @@ "repo": "ideasman42/emacs-run-stuff", "unstable": { "version": [ - 20211007, - 304 + 20220211, + 548 ], - "commit": "db66c1ca0f6a090f8c9ae17f80f99c878047778e", - "sha256": "1kfnk3pa3p50nfylhxhcngxa4n8ilqwna1k179w4abmnsm0r4xz8" + "commit": "3723346dc6d867bdc3fd86ca11c32efc43704d7c", + "sha256": "0082mv45a8ybfrrvw8jnc52rk2zw80i52gid1387q2hxsdil0csm" } }, { @@ -95454,20 +96534,20 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20220108, - 1844 + 20220217, + 2009 ], - "commit": "49ff6cceba7a546595c5b0cc18c7501b22e0c9e9", - "sha256": "1cj59mwrp4igfcrsya3nlrgp465r0gmnyzglmgsg24pyna3rycwz" + "commit": "26ecc903c50b2ffd289bbe981f9ad03626fc0057", + "sha256": "0jr7i85zacpwx3kqg7yb7mbz0ap8w3ydzb8rlf0syccqjiqwslnl" }, "stable": { "version": [ 1, 0, - 3 + 4 ], - "commit": "b017f746503df27ccdca8ee6d2627529d64d76e1", - "sha256": "11fdxbv51anrjfdqqpgrqz2md9qkcn5y3524lzjippqi9i31lnjn" + "commit": "e35a1800fc0f9ed178539d6fb82ed885c1014fb5", + "sha256": "10972zw2h1dijx08j5h7aa4d717vhrmahzkslisy3dk2gd8y2v0q" } }, { @@ -95501,8 +96581,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220116, - 2233 + 20220323, + 1159 ], "deps": [ "dash", @@ -95516,13 +96596,13 @@ "spinner", "xterm-color" ], - "commit": "f92e9cdfa44c7948417093d6f275a2a8241cae8f", - "sha256": "00i500k8cjc4vskvqlcn095vidyklc61np2i8nh8bazqh1k9d15g" + "commit": "6eec9713876d698510ee3715698fd42c1571e307", + "sha256": "17lcys2sm56c8bnj9vjs9mz6liir8cnybax0fxgcrjgfp38wxc48" }, "stable": { "version": [ - 2, - 5 + 3, + 0 ], "deps": [ "dash", @@ -95536,8 +96616,8 @@ "spinner", "xterm-color" ], - "commit": "513845b99a61e1137049a2157a122bcfd8a13c2c", - "sha256": "1jx8gzcm9ka2chpq51jx4mfa12wqrj2dsrpxwylfcb9qkqjncbn5" + "commit": "b3f4442f7198eee758958196f89a150f8de8963a", + "sha256": "18br5yfakfwcbw3vkawhw5sm41xg78cz4bimz36x5xcgbwi88k3p" } }, { @@ -96026,8 +97106,8 @@ 20200830, 301 ], - "commit": "51e17a6fecad2dd35e02518934597b3b43273a3f", - "sha256": "1aclnsa72pazi1xagymgpfc998sring4xaflg3ha6f9lbdn2qkqq" + "commit": "e34e756d264800b701c07414ceffd9dd768cdf84", + "sha256": "0v6njsp1g7m0qjss4rhmbnrg8yccxyk7dy477cbpdijxw3fdi2yv" } }, { @@ -96072,25 +97152,6 @@ "sha256": "1072lsin7dxadc0xyhy42wd0cw549axbbd4dy95wfmfcc1xbzjwv" } }, - { - "ename": "scalariform", - "commit": "1912f795e5842be534160e3879bfb96f3440e163", - "sha256": "096y63j91910hqsy6qvz16c9lzyi7ni3r7h039z5zw2v97aggh9i", - "fetcher": "github", - "repo": "zwild/scalariform", - "unstable": { - "version": [ - 20190114, - 215 - ], - "deps": [ - "f", - "s" - ], - "commit": "478a15ccb4f825aba73262bccd3e61ce7017f64b", - "sha256": "1c76jnj35bkcq2rhdq6d57b7vf6rvn8rpzpx49ywkxz4cx36svv6" - } - }, { "ename": "scf-mode", "commit": "376be7f8903dbea69643600ae14e934ee5e2a11b", @@ -96156,8 +97217,8 @@ 20211020, 420 ], - "commit": "d96c462e7f340f142ce3c5ffd31fa267223fd854", - "sha256": "0w8xlnpawkq580gc6cvxzln29x9v5g05ab7i8wwg1r5jhw9bjvgs" + "commit": "aac29628d4eea2d6ec0bfda39503c1f71a379bc9", + "sha256": "0pa054hanclapkj73wwwwwjmk2b3p36w2p44d1fz3w3lfjkf852v" } }, { @@ -96239,19 +97300,19 @@ "repo": "ieure/scratch-el", "unstable": { "version": [ - 20190314, - 614 + 20220319, + 1705 ], - "commit": "4813d82b39a451f2a6d5b730cd7ec49a9bdabcca", - "sha256": "0yiwq2gc4gdgfhaagpawhb7yrzc4fsnyb10w5d0q4whv64cj8555" + "commit": "f000648c9663833a76a8de9b1e78c99a9d698e48", + "sha256": "174d8ancnkgb7q62196kd6nrfib6rnwxw4visgbk1c6yd1w8kray" }, "stable": { "version": [ 1, - 3 + 4 ], - "commit": "4813d82b39a451f2a6d5b730cd7ec49a9bdabcca", - "sha256": "0yiwq2gc4gdgfhaagpawhb7yrzc4fsnyb10w5d0q4whv64cj8555" + "commit": "f000648c9663833a76a8de9b1e78c99a9d698e48", + "sha256": "174d8ancnkgb7q62196kd6nrfib6rnwxw4visgbk1c6yd1w8kray" } }, { @@ -96398,11 +97459,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20211127, - 1220 + 20220211, + 548 ], - "commit": "97741be699f08952c79a630869f5772918b378aa", - "sha256": "01y34ghp02znckafq51cvzahlbqbnpxdwpdrcgg1insq3qv658wb" + "commit": "d93b69eed6947cabdfde53dfbcf4bd919cb1f154", + "sha256": "0r1c3b7w1mh7hpi7pi1szdac297w1ig0i1a9c1r7qs41id2bvw51" } }, { @@ -96413,11 +97474,11 @@ "repo": "ideasman42/emacs-scroll-on-jump", "unstable": { "version": [ - 20220117, - 606 + 20220211, + 548 ], - "commit": "556e9a7a8119e24503f54b25f5c2a8084752d64d", - "sha256": "086p847snpz62b6g7k8sz7izfrbkza1g178q3lj4vysdg8w1fhf7" + "commit": "99386fc01b3c7bc2e75458efca408a23220a5f87", + "sha256": "0b3d5bw635jjirkmym4w0y5x450zd88ic3k74jmmgf4fw0fl1q0z" } }, { @@ -96514,32 +97575,32 @@ "repo": "t-e-r-m/sculpture-themes", "unstable": { "version": [ - 20210828, - 1634 + 20220311, + 2122 ], - "commit": "cce59d2bcc48d622f3978c583108cf853f21789c", - "sha256": "0f8aqq026j0wxkgs0p3yjq3r1jd30lk79199wrdk58x9120pp6z6" + "commit": "407cbed4145af8feb5232b1161a5f79b6a9878fb", + "sha256": "0x15fwrc53z1g517jrqyjdd8diil8sjdp9qhbhnbm2nsp97f07yk" }, "stable": { "version": [ 1, - 2, - 2 + 3, + 0 ], - "commit": "57fb0022daf5ca753dc77ee9178267c710c318db", - "sha256": "01xw04v22dh60w49i8h72wa2hvhwpqgriv0chy90m8vmn2fz40wz" + "commit": "07d74b29908447ff33365c23686682066549d671", + "sha256": "1azfr5np6m2zg7r3ga172mls3x64gb3m57lcfzwxgb9l8pmjy3an" } }, { "ename": "sdcv", - "commit": "173e233b2dacaaf54d92f3bcc06e54d068520dd4", - "sha256": "1bj3b17sjd9fha686g6w191l4p8a1p8sb9br65xf54n6nd9bmv7a", - "fetcher": "github", - "repo": "stardiviner/sdcv.el", + "commit": "97663b3f4e6615f629571791f66d9bc3afeea7b7", + "sha256": "1y56jb5jy68ic1wwrwhqk2jwk49p90icbwrg80pxv1s6xigk2f02", + "fetcher": "git", + "url": "https://repo.or.cz/sdcv.el.git", "unstable": { "version": [ - 20190610, - 732 + 20220210, + 1412 ], "deps": [ "cl-lib", @@ -96547,8 +97608,8 @@ "pos-tip", "showtip" ], - "commit": "943ae3e90cc9a0a88a37cc710acd7424fd4defc4", - "sha256": "0i1ylvw7p46pkf3yyyzcdmdhsspzymnnnvx8s0i7vynngr5x0vzh" + "commit": "98e239c7380c63282845d5bc55ea6d605f5a33b8", + "sha256": "17jxnc8z2a5rdfrjxw6gfkijp06jkjpsvj0pyxrhmg94gimfprxa" } }, { @@ -96604,8 +97665,8 @@ "dash", "f" ], - "commit": "bdef718d17a09ba56b1bda7f6718588b4a33e06b", - "sha256": "0cd2lzb2z6cp3hlmwbmp98640q26875k3w5j0hqqg64rncxqx8yk" + "commit": "09ae519ce825affeb6a033dac81bf7af946127ad", + "sha256": "1gprpjnm7r2faj53qcnch7s05s4jjrsh94hiji50kdi3lrwf2rs3" }, "stable": { "version": [ @@ -96842,11 +97903,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20220119, - 50 + 20220323, + 10 ], - "commit": "823eec0246388e8dcf5581533dac96c2626d51f3", - "sha256": "1h6a5mvfcyz3x0s15g4mi503fg3mqbwajns9y20148gydvfjbxjl" + "commit": "7da932eeb89f1aa8060a73ddd040f95bbb127343", + "sha256": "14hplki838svbjpasmm9ik8c5xm0ji2xxrp61cq82dc6r0axg5w9" }, "stable": { "version": [ @@ -96872,8 +97933,8 @@ "prescient", "selectrum" ], - "commit": "3dbcef387502d309d130a518a18d48cd2f0e15b7", - "sha256": "024l7s0b6apbzanw3cnhjypxnxfinfb5b3nhaabrc138m5pis8j5" + "commit": "c5295a9eecbd2935bb57684a4422638e03bf738c", + "sha256": "1wfmynbqaqvrkjdncx0wmqxz6v8zlfmqlh5l3h6876jin97i5fbv" }, "stable": { "version": [ @@ -97050,15 +98111,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20211116, - 326 + 20220226, + 1344 ], "deps": [ "dash", "edit-indirect" ], - "commit": "59c4e3718943dbe8d14bdbba5de24fe2c80f0b56", - "sha256": "06wx9nz688x15rz1mcl3jcbaa3pn6xls7my2srn5id1rdbwyl52x" + "commit": "a33a04479fc1d4fa0ee618833965ce9914b9c1f4", + "sha256": "1llvhm9kwv67rng7zd91j5cfx34aklx64drs3hrm5nlxpjass7sm" }, "stable": { "version": [ @@ -97127,15 +98188,15 @@ "repo": "MaximeWack/seriestracker", "unstable": { "version": [ - 20210629, - 2303 + 20220212, + 304 ], "deps": [ "dash", "transient" ], - "commit": "a5ce1bfd06ed90bba9947a9045659d13f3362a96", - "sha256": "0gjwp0h9ip58da1p8q9s9pjfh0g6pav4gam9s51xnx8mv0vbgb68" + "commit": "4706db081bd214b272e0bcaabb66887e4b5b0968", + "sha256": "0ghnxli8xjlr5yb0c1jlax42dc4bjhz49x6mjm7m2jz94sa397ls" } }, { @@ -97303,14 +98364,14 @@ "url": "https://codeberg.org/FelipeLema/session-async.el.git", "unstable": { "version": [ - 20211227, - 1609 + 20220302, + 2008 ], "deps": [ "jsonrpc" ], - "commit": "589eb5a1c6dee345880a9735c37b8b8f5de1813c", - "sha256": "0yj4r6y74w4b8axvljrm4xmd8n4v28s83wkbafsz8k25i1vrm2pj" + "commit": "427238bdfde880106dd39cf5845b559975e52f4f", + "sha256": "0zrcfycfgy87bpfm3jcfzp72ky5marbd5w4xf4rqvnw9spml6sya" } }, { @@ -97566,14 +98627,14 @@ "repo": "sebasmonia/sharper", "unstable": { "version": [ - 20210523, - 1821 + 20220321, + 422 ], "deps": [ "transient" ], - "commit": "08277b6c30568adfbe438c9f2a1d6c3db4b7ebeb", - "sha256": "1n0nc3g57kl5d4zh0k0gis70kd05yb2pv7kw8akmdp9q7hxs6m93" + "commit": "96edd4a1dbc267afdff0cb97298d1b05b7c2080c", + "sha256": "0pprbp9n43g1ijap96fjiz6sckplryi198gci0ywpyglx6illllg" } }, { @@ -97785,11 +98846,11 @@ "repo": "Overdr0ne/shelldon", "unstable": { "version": [ - 20211118, - 1811 + 20220325, + 1305 ], - "commit": "df8ab901c7f47c760879e5ccc26ee0b5195946c2", - "sha256": "1xkv0c2hzjccn73wl8x789cqwckbvkwgp80x8fagwswvg6ngzdcx" + "commit": "8d073ce580e7782ed863fc6e19dc33b4f73c0d79", + "sha256": "07ka7nd1apyjdf9cljs4zbcyv0bfbn1z4arhq2m2kdinjqpr6mbq" } }, { @@ -97846,11 +98907,11 @@ "repo": "redguardtoo/shenshou", "unstable": { "version": [ - 20211103, - 1010 + 20220324, + 1137 ], - "commit": "5b9a400cafbf4778cdb4ab26f7718f8cb0c84705", - "sha256": "143b5np4d8vmpdyw1pzxl6xgh6pzfp0phhli0j4wsly83ivcf7w2" + "commit": "bc16a637edaaca831a5147b6f479ba1dbdc02454", + "sha256": "0mli3h3i511vq8g69b2y8hq9591bv5yjblvx7cnh1nrjpb4flak0" }, "stable": { "version": [ @@ -98020,8 +99081,8 @@ 20210715, 1227 ], - "commit": "c952c072e210c605b08aa5d2a917bfa3f92dfe8b", - "sha256": "13abir9kr4h63krnn206gnjfln895zzjidcaidrjc8zwnysaa8k3" + "commit": "ff41a9988523891de92379b611f8c00b44d4127e", + "sha256": "0k29xx6ym2mqcn6rszxl4p05zqfpfvhcwvc3h3cx0bf5b8pnxd3j" }, "stable": { "version": [ @@ -98394,11 +99455,11 @@ "repo": "ideasman42/emacs-sidecar-locals", "unstable": { "version": [ - 20220104, - 217 + 20220211, + 548 ], - "commit": "c90ccd6a02538c7263f6499ca7bd4456ec06791e", - "sha256": "02nnvf4c78grdzcd62611qvlq93vspd09ffk4jvc047l2jb8nw6l" + "commit": "b69943575bfa7f13ee99c8b8871d3216ad24c85f", + "sha256": "0bfl4py2s3mxpzc60l9qmmdy079li0llzd6gsczwbmvfnrs1189q" } }, { @@ -98558,6 +99619,25 @@ "sha256": "0dpn92rg813c4pq7a1vzj3znyxzp2lmvxqz6pzcqi0l2xn5r3wvb" } }, + { + "ename": "simple-indentation", + "commit": "9e9dc1f3efcf5e816474958d6c42a36b4fc9aa40", + "sha256": "1s51a055abfbv0x0k008qlrar054jwcyy4bf0h6ashk7gnkrvvg6", + "fetcher": "github", + "repo": "semenInRussia/simple-indentation.el", + "unstable": { + "version": [ + 20220215, + 1745 + ], + "deps": [ + "dash", + "s" + ], + "commit": "e7c8238af9e1a6b1fc4dab8014d779ac178fc249", + "sha256": "03abad2hgkq5k5q7v4mb7ykd55wa6zg5a8ss62gsdwi373a9mkhh" + } + }, { "ename": "simple-modeline", "commit": "054a7c164fae0c76ad2b3c6891d37a03f3e08823", @@ -98589,14 +99669,14 @@ "repo": "jorenvo/simple-mpc", "unstable": { "version": [ - 20200523, - 1804 + 20220216, + 102 ], "deps": [ "s" ], - "commit": "ce731fa390b7e4edfc461a9cfb4443c1aab4b011", - "sha256": "14fb52r5fzdcqqbh5kkajaz43iqq8g64g0rsswwwv6g1j23y93k3" + "commit": "57ee14ada8aec477ddde5e4f632c8d3d99a66535", + "sha256": "1gij7kjidi21p8sbywlj9734s5cq1h31h6mv71drcj3cna9n06pb" } }, { @@ -98607,14 +99687,14 @@ "repo": "andreas-roehler/simple-paren", "unstable": { "version": [ - 20210806, - 1022 + 20220207, + 2007 ], "deps": [ "cl-lib" ], - "commit": "7eec13672c2b6d0226d56de8b8b1e12a1f78aa57", - "sha256": "03mxy2f4i8pjmb1d9s6llaa4pmzrsigxaf1srfdwzc8ccaj1qi5n" + "commit": "a454901635dfe4142d8c4f0153e737ddc778d708", + "sha256": "0b0ix9h5in324bbyv9q9l9xrifpfhjs6zhr6r5cadd36iip40r6g" } }, { @@ -98750,6 +99830,21 @@ "sha256": "1p1771qm3jndnf4rdhb1bri5cjiksvxizagi7vfb7mjmsmx18w61" } }, + { + "ename": "simplicity-theme", + "commit": "d90f310efac200b31d90b29261f74932ba06756c", + "sha256": "0f2ixpnil14509skicaf7rm5062d1w1429jsflack14niba41d1a", + "fetcher": "github", + "repo": "smallwat3r/emacs-simplicity-theme", + "unstable": { + "version": [ + 20220217, + 1928 + ], + "commit": "2a0aaf19cf1e99c50df0d2e6225a2d2931a203d2", + "sha256": "0xv1gf0a9i3ajxd6cprr7b62xvar6r6ia5qd4sjvr8pnaw3cav45" + } + }, { "ename": "siri-shortcuts", "commit": "f3a67195c63059fbc2d2714b540505bb9cde49d1", @@ -98821,6 +99916,24 @@ "sha256": "101xn4glqi7b5vhdqqahj2ib4pm30pzq8sad7zagxw9csihcri3q" } }, + { + "ename": "skerrick", + "commit": "bf90740eac9231fe9c1a71f302614b3ed4d1f464", + "sha256": "1y2v9rnlj4hidp1vr4ivsxg90l0cjbwkw6fayh5dgfnk1brck6iq", + "fetcher": "github", + "repo": "anonimitoraf/skerrick", + "unstable": { + "version": [ + 20220306, + 2139 + ], + "deps": [ + "request" + ], + "commit": "fc88e82aa4b0a71b1fbe0217df4020538ebd8cd5", + "sha256": "0cjch25ljjw0pqj69rckp9b0lw1iz41dd1nl794gfagvl86gl92f" + } + }, { "ename": "sketch-themes", "commit": "d1b2026ff5fe7a2893dd4c71d9089e97c4fd48f1", @@ -99048,28 +100161,27 @@ "repo": "slime/slime", "unstable": { "version": [ - 20220115, - 2013 + 20220302, + 1215 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "fad4f25ff0eb7e2df2ab587976f569d8694f641d", - "sha256": "0p5c54c1l5a4k41ji92ykcl9mlggcv0f7rlf5830v4967qfgww2r" + "commit": "6ef28864d4a6b4d9390dbd0cac64f2a56582682d", + "sha256": "0pscgg31slqggdzrjfmkg721lwvqph9qrp833p1j4b7wcc1j8xvv" }, "stable": { "version": [ 2, - 26, - 1 + 27 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "15cf0609d30255405957bf0612fd6291fea438bc", - "sha256": "11zb8aaay1yirql638ssbap4rnxdf6a4lwmqm761grgssk44rqpd" + "commit": "cf30941e5858e93eb91574ad91499075222a447b", + "sha256": "0wrq7s39lwca9wi01fj0wa2z6n0yyrv17c471kdkxxqppl4whi8m" } }, { @@ -99288,11 +100400,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20211222, - 1234 + 20220302, + 1053 ], - "commit": "2e00c3bd4bdf6658f258cc78b3254f0ec24591e5", - "sha256": "0qlc5ny85dd03i0fj10ypjxkziih23k031m1wlvhjsdjg2ibs0f7" + "commit": "4513c382f07a2a2cedb3c046231b69eae2f5e6f0", + "sha256": "10bzxhi5d7h18hqclxqy2z857d0sfbsnyxvrhmfkdi0h75zz7m4n" } }, { @@ -99787,15 +100899,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20211101, - 1101 + 20220204, + 1134 ], "deps": [ "cl-lib", "dash" ], - "commit": "f59a40d54f35299007c396bd667ce3e9ec4714e3", - "sha256": "0n0c2knva2c6ajdhqglr2yzhr53sgqr4bscsd1lwmwajgb0iyrw3" + "commit": "37f77bf2e2199be9fe27e981317b02cfd0e8c70e", + "sha256": "095aqr4mz6yx8xa2gr7k5nf6a82qxdrjh8qv47hfhbc3832gy8jk" }, "stable": { "version": [ @@ -99960,17 +101072,17 @@ }, { "ename": "smiles-mode", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0wf02aj9bhl2m861342f5jfkx3xws1ggcyszfp9jphlykw6r0v9k", - "fetcher": "github", - "repo": "stardiviner/smiles-mode", + "commit": "67901d48323deba9311b32100574972c7476ad7b", + "sha256": "1j3dpq5yw1g3cdalgrbnsw5429r64jiz4krh19zr1w86lh148pdr", + "fetcher": "git", + "url": "https://repo.or.cz/smiles-mode.git", "unstable": { "version": [ - 20160717, - 1120 + 20220210, + 1413 ], - "commit": "fbb381758adcb000a0c304be1b797f985f00e2de", - "sha256": "07lzr1p58v95a4n6zad8y0dpj7chbxlcmb6s144pvcxx8kjwd4dr" + "commit": "950a8b3224f8f069c82faeb0282d041f872d5550", + "sha256": "1pvbxmxhkmzhimvvzw2gmwhzkssgg8hs765vl0ly9jcdgqc46lgq" } }, { @@ -100192,28 +101304,26 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20201224, - 1744 + 20220223, + 218 ], "deps": [ - "cl-lib", - "magit-popup" + "transient" ], - "commit": "592901893f297099ffb759b4d1359bcd3411d1a9", - "sha256": "0rmvzrkx56zrlziln9cbq9p7lpm7jlv6i1mfrzrqhri239xlybn4" + "commit": "0dfeaff6079558c39081c2c078c41369da01903b", + "sha256": "0mir9ic4ywhyhhsn7y2qwy2s5h4qlrxz11mrs6680d2ki1bnyc81" }, "stable": { "version": [ - 1, - 8, + 2, + 0, 0 ], "deps": [ - "cl-lib", - "magit-popup" + "transient" ], - "commit": "0e4ef118ca3af4a6851fe670cf8fe7472ba18393", - "sha256": "0cl956wav9vnsxz0ky0ykcjxa3m43zld8ybn24r5yy54kr00nicm" + "commit": "78abd82f34a71b3fff7aa869de1b07a082f1f351", + "sha256": "1621pvbwq5b0kgk735w4dnpar30x3ckbhx18bdwv03rc7ngdnj8r" } }, { @@ -100299,15 +101409,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20210826, - 832 + 20220210, + 1654 ], "deps": [ "dash", "s" ], - "commit": "4d921b6e9c98fa208578b2b409e627580d1ab8c2", - "sha256": "0bh9brzqsvm6dj961smp4592bgjrhhq600qbqbgps8rnbbcjnl3r" + "commit": "5824a3c33ee51acc1d3cba36ef6892ebb3a8df1c", + "sha256": "0svjaid3x3l7c59g7ckpgsnmgh7j118rakmfs0qhjh5xla60bglm" } }, { @@ -100543,11 +101653,11 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20211114, - 807 + 20220324, + 445 ], - "commit": "f34a171ff0e39549972edf533120f0b556f0b5ad", - "sha256": "07zxrf4xbh85d4sfxch6mcjgd6ga4a079k5fwqdm72pmi07659hf" + "commit": "86e5f94ea033c8b2a21084774063a493b62a4e81", + "sha256": "17z6cj8ids88xj2i6zs1s0mxs0fhn3gr7g5nhhy8s8khnzmyy2vj" }, "stable": { "version": [ @@ -100579,8 +101689,8 @@ "flycheck", "solidity-mode" ], - "commit": "f0f68b038c5edf16c85fc8ca58537e1c6479738b", - "sha256": "0hfp07bg348ppkgp5wca1sqpcprhc6jyxkpb1pmsm0vrifb3261l" + "commit": "20fb77e089e10187b37ae1a94153017b82ed2a0a", + "sha256": "0lyfhb4lirk08jc73c2vhlskfb496vnh0h906a74wz2pwg84q4m5" }, "stable": { "version": [ @@ -100604,11 +101714,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20220106, - 1055 + 20220308, + 1517 ], - "commit": "f0f68b038c5edf16c85fc8ca58537e1c6479738b", - "sha256": "0hfp07bg348ppkgp5wca1sqpcprhc6jyxkpb1pmsm0vrifb3261l" + "commit": "20fb77e089e10187b37ae1a94153017b82ed2a0a", + "sha256": "0lyfhb4lirk08jc73c2vhlskfb496vnh0h906a74wz2pwg84q4m5" }, "stable": { "version": [ @@ -100726,11 +101836,11 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20211025, - 1535 + 20220127, + 1004 ], - "commit": "a111e7169405778d95f7a1e61a7d197ca1217edf", - "sha256": "130sz27mq3w0svv114qnwqjdbvrnljprab7v0acp5zwj9gqgwkk5" + "commit": "2db1859743fe9fc58eab4e6f6c1e37825ad7b69c", + "sha256": "0vikil31dwpmnd5iv3iwb8wrnny2xibydvc2mlgsvxjqjw7d40ng" }, "stable": { "version": [ @@ -100830,8 +101940,8 @@ "cl-lib", "deferred" ], - "commit": "8a18f8a62f4fdde80dfa069986aa959091a42472", - "sha256": "18iahla8m9b6bdn63x2yrvr3rzyw5ybipf44q9avyy6s1pqsby2a" + "commit": "323a364d2c220873f935ad46142c05c4fd1dea1d", + "sha256": "1dsb6j2kli0a0y06yn7gj5c72f6qz9fpwqhnvh9glcbqf6vv068r" }, "stable": { "version": [ @@ -101089,11 +102199,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20220114, - 1455 + 20220128, + 1519 ], - "commit": "45ba182eabeaf80b7c6c4bec192d8380023ab0d5", - "sha256": "0crwjad4ccnb76pwlg03yj5rmf1rhijk1sllij9n054in6ichk02" + "commit": "a09347a354a14f5407e99fa730e01345d03e03fd", + "sha256": "0nnc6pk5jjx4yhadcph9q9aqb0ks8gs9ybhd32wm32653518hmv4" }, "stable": { "version": [ @@ -101202,11 +102312,11 @@ "repo": "ideasman42/emacs-spatial-navigate", "unstable": { "version": [ - 20211007, - 307 + 20220211, + 548 ], - "commit": "03bc1255dfaa87fb6cb62a850877445bd7a14455", - "sha256": "0xyyc89205qc3i9q96jp1in3y3ravcfia9pc5s2smam01kqvipld" + "commit": "0365544483f957db79b8e617fb0bd8160134a655", + "sha256": "0c52dfy1jqmbkl8ml06xif166kxbyy9q8z33cpvkljh36ia23y1z" } }, { @@ -101217,11 +102327,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20211202, - 1925 + 20220325, + 106 ], - "commit": "4d1ce0ca8a4c84667301b3e347fe594989c25e60", - "sha256": "0fmaxsx6yn3j9i4k6kzap0s2fc5899j623sz9v71g5pjg4pfwmyy" + "commit": "914df7fa483825d813e7aaeb9dffce629aae2a52", + "sha256": "0ccw0wmc5kx9x31x0ycw74ngh6zdkjqm10my9ypfc97rfv2q6bh1" } }, { @@ -101348,11 +102458,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20220119, - 2344 + 20220213, + 1215 ], - "commit": "50be652a6ec8590c3098f46094a92213623349c1", - "sha256": "0n7qwnirvkh2aprb7l1wj9rywdsn33a7s32716m3afcvy7z9pyh4" + "commit": "8185467b24f05bceb428a0e9909651ec083cc54e", + "sha256": "0ka7i2jl9vbr5071pbb3n8ckc9nqgpxrbfgij7wn33g01dpn2zjn" } }, { @@ -101437,17 +102547,17 @@ }, { "ename": "spice-mode", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1my6dbdnf4scshjf299d4n7vsdq3cxhq9kmqvirs45y3qjm7pgpg", - "fetcher": "github", - "repo": "stardiviner/spice-mode", + "commit": "ae5f7b427e85726e4b4f2030a713c88d2e559f4a", + "sha256": "0qv691x5fcmb9xcx3pd0jqhl918qim0h9fg4r2mscccqnricshj4", + "fetcher": "git", + "url": "https://repo.or.cz/spice-mode.git", "unstable": { "version": [ - 20190608, - 1033 + 20220210, + 1414 ], - "commit": "e5e0644f03f9696f56dd69e2b6979da7f30ed600", - "sha256": "01905cdplj9icbxzr7sqb62x5qchzgvs8qjf5s4qga4x3vjh1dc4" + "commit": "f55c2b6dd35caace0ec7250b5c7b5d119235a23d", + "sha256": "1jkqwclk65rcyv5qj2vq7qpiimlrqij7c7fbjvxv4pf4zd2wx0k8" } }, { @@ -101831,11 +102941,11 @@ "repo": "pekingduck/emacs-sqlite3-api", "unstable": { "version": [ - 20200916, - 132 + 20220202, + 728 ], - "commit": "95abc25cc67d652ce2ba79907224e581aef62e93", - "sha256": "1kx2ik7k0ads71r2xq4c8jkk460m44prggiiskj1g88yxx0rnqkj" + "commit": "88dfeae8f9612cb3564a7393aa8a5c867aacbaf8", + "sha256": "0sj1fsgcgfzz6dfpmp8r5gmdwpbdzpk5g5lm8j7c3nqj6wqgg7g6" } }, { @@ -101931,11 +103041,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20220108, - 212 + 20220321, + 2152 ], - "commit": "a47c0df8b5df36f5a8ca41f3f5dc60e1fbd09924", - "sha256": "1if3xyma26vzsivpvyf9vxsy0yv64vbl1kkd5rvnx48ly4axqk3a" + "commit": "5efe17755c04dedb62033c1c53eda3c28c3a5f65", + "sha256": "0yxjzp1wxyggjk15d84b0399z5d5xspphdsy4m8r52aqcfxaqnd6" }, "stable": { "version": [ @@ -102063,11 +103173,11 @@ "repo": "cjohansson/emacs-ssh-deploy", "unstable": { "version": [ - 20210626, - 2228 + 20220126, + 658 ], - "commit": "7c5fe8af2d62d8f6d32ebe2d3bfc53051a9432d1", - "sha256": "1ca1ai742g2901pni08clk37h1ls4n65pzxpsfzsxnr7i46yh989" + "commit": "9311f9b4f8d25ce54fb7da9bf59d955fed366a4d", + "sha256": "1wgm4q46nja71grwbdnacnlazj3cgfr6r1glpkyx8y3dn9amdhip" }, "stable": { "version": [ @@ -102219,6 +103329,21 @@ "sha256": "1zpvbsrmcz9zhlchfsbsfbi3g9z1wxhkhbpg2zp2dpk4czqy76lk" } }, + { + "ename": "starlit-theme", + "commit": "4b695ee03d16e9253674cedaef785c2545113b67", + "sha256": "02qb70fgnp7r35hz2g53rpc792rh568ddxgxxsbfw5jg9f429z9x", + "fetcher": "github", + "repo": "SFTtech/starlit-emacs", + "unstable": { + "version": [ + 20220325, + 1418 + ], + "commit": "9a76710497482110f5cba6e86aea66d94f5dbb50", + "sha256": "16nswflx3ccqkc64ijy4wvq0qqikijqh5dvj0j2ylf8bydnv4xqb" + } + }, { "ename": "start-menu", "commit": "88d965f6789d3f5ba3856cbf10edbc46e37b12ae", @@ -102308,14 +103433,14 @@ "repo": "Kungsgeten/steam.el", "unstable": { "version": [ - 20210404, - 1658 + 20220218, + 1707 ], "deps": [ "cl-lib" ], - "commit": "2b24198844e7296c68f870490fabe896ed101baa", - "sha256": "0vcqpsz843djc2blkbjwqhr8km8chckfl8fgr78ii5zg9wdlvbrp" + "commit": "20aa58c5ccd85f6c4f288a14e79adc66e691cd23", + "sha256": "0hghcfvj5pr8hvrrqfka91yghaf1gzhc3jhv68dwaq01lbqnszqz" } }, { @@ -102359,16 +103484,16 @@ 20200606, 1308 ], - "commit": "8254ffb2eee53f97e9c6210078db55c15340ead3", - "sha256": "1saj40x6gj3w261g7792h92m2wy9fa7klf4s8xya778j3yvy62n1" + "commit": "03fc757c4255bfd445cdbc2a62ca3b02a65beba5", + "sha256": "1p6lcc2xnslkcm2d3pg5zd6nvbdy1y9m3ymrcv1kz0xj33cnphjf" }, "stable": { "version": [ 1, - 4 + 5 ], - "commit": "262b2fc5b533f6f609c43a6f543c9d0d185b8f55", - "sha256": "0g0jnry8y858dl3z5w4zd02s0lq9qvha848xb8i1xpsx8xh8plf9" + "commit": "03fc757c4255bfd445cdbc2a62ca3b02a65beba5", + "sha256": "1p6lcc2xnslkcm2d3pg5zd6nvbdy1y9m3ymrcv1kz0xj33cnphjf" } }, { @@ -102409,11 +103534,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20210920, - 1345 + 20220326, + 1241 ], - "commit": "caf1c099ee5da59c6686af99c36eb846ebb7a610", - "sha256": "112l5g5s71r8krbcx03xgm18v5lm3r4dz10a3qss27s2m6a1y8i5" + "commit": "659d5814c5f9b21b159778ffab30aa9d8fb2cb96", + "sha256": "0skvns8x15cffwmv904sfgqz5rh4kv84aflwk547p7j1fcz8pja2" } }, { @@ -102476,11 +103601,11 @@ "repo": "fosskers/streak", "unstable": { "version": [ - 20211004, - 2025 + 20220311, + 1929 ], - "commit": "32d6e3814df50284466d6d3a69f7f236e3746699", - "sha256": "0a3cn9kqkln4nxln78wjzr2zph3aa5y3hp0kxymniqz26dga29cn" + "commit": "b2206de2fe43f97e754bbcb0abe9b078a419e787", + "sha256": "0v2yvwgkc48kbqh2lx52044b5d7yvg7d24vivqbri1wny5zpriqr" }, "stable": { "version": [ @@ -102650,11 +103775,11 @@ "repo": "stepnem/stripes-el", "unstable": { "version": [ - 20211022, - 2144 + 20220310, + 2237 ], - "commit": "5e7adbd6e19a2d362ba818fdb44ad7744d757df2", - "sha256": "0ikhgqwwfbx1zmbx2scvi9cx7wlzwq91pwjydj2vxsg7c03iadd8" + "commit": "618e40e0a9cf80decea32c8daecb1c9f6eae2991", + "sha256": "0yb8mnix056n6ll17w13afr9rap53bb542xqy5ywcg9ajc1gd4jz" }, "stable": { "version": [ @@ -102771,11 +103896,11 @@ "repo": "cryon/subatomic-theme", "unstable": { "version": [ - 20190607, - 1022 + 20220128, + 1615 ], - "commit": "a13cdac97a6d0488b13bc36d4c2f4d4102ff6a31", - "sha256": "1l7yvplvjfcv1d1ij0inijm47nx42d3r00w43xjqnyhk9rrvazh1" + "commit": "9d0ac6aa5272d0285965a48505eb35658c5472b0", + "sha256": "0fs1y53b025fwd690dl5iipsh3nz5g0jvj8ny1az614697yx90xw" }, "stable": { "version": [ @@ -102984,8 +104109,8 @@ "repo": "Wilfred/suggest.el", "unstable": { "version": [ - 20180916, - 1859 + 20190807, + 851 ], "deps": [ "dash", @@ -102994,8 +104119,8 @@ "s", "spinner" ], - "commit": "83a2679baf661ee834e9e75921fd546243a6d919", - "sha256": "11jqglwqi5q14rk44z02dffk6cqmhjgdda0y63095g8n1ll71jsb" + "commit": "7b1c7fd38cd9389e58f672bfe58d9e88aeb898c7", + "sha256": "04cabm1wn1cy78a47rhn1kh8vd6dclsr2js8plvldbgq2qfq7l4q" }, "stable": { "version": [ @@ -103433,14 +104558,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20211031, - 543 + 20220313, + 542 ], "deps": [ "seq" ], - "commit": "4777c409ba0cd0d02b9a8397ba810e449b5ac213", - "sha256": "0dmrshlkhavzlfxhm2fi37x7rf1h203iiamdqvqb7dqq0axah5r7" + "commit": "0d1ef0ef183398143b13fb8c76c1284df0d5e616", + "sha256": "0s7y6xkvy2lg3bs4508dh7szsfrvmxrihbf22ysijaqgzd69s86j" }, "stable": { "version": [ @@ -103784,14 +104909,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20220103, - 1747 + 20220304, + 917 ], "deps": [ "seq" ], - "commit": "d08c33dc85a118b199415e71bba0e7c330f87c5b", - "sha256": "1k9x39hv07wxk4hv60ai5gc9rbx0h423zcgj23cvqxj34knklzgi" + "commit": "c439b73a5f9713bb3dce98986b589bb901e22130", + "sha256": "0n2yknbhwbgbrvmgxk2j2hm5gkdh6m9p5y8vpq758bxf5xk6npzm" }, "stable": { "version": [ @@ -103854,8 +104979,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20220112, - 1901 + 20220323, + 1808 ], "deps": [ "evil", @@ -103867,8 +104992,8 @@ "seq", "undo-tree" ], - "commit": "d0fb945e5978b1ee2fe164b6bb30900969762193", - "sha256": "0c2iw3p1jw7hk8dxni7c4b3l23x8x406k94xgaj7h7mk6y36p0x0" + "commit": "8ab435c2866869977c92ad64c3706f626acfb4d3", + "sha256": "1jc9a27cpdldigyna3spdmx7ad0pcxfgl27xk1ikh74cbvry0ir4" }, "stable": { "version": [ @@ -104078,6 +105203,24 @@ "sha256": "12jk28jbkq1pcpgsbknk8xzzghjh2dhwb54kag2hynldn4qgfkrz" } }, + { + "ename": "syntree", + "commit": "765e71a13aab2829d02e9567654aaf9a3de64098", + "sha256": "0ck61zjqqv1yqlvmq165avhn9ck3x1a7myldmqpy3q7gg4qcz71z", + "fetcher": "github", + "repo": "enricoflor/syntree", + "unstable": { + "version": [ + 20220122, + 2341 + ], + "deps": [ + "transient" + ], + "commit": "45d010b071c32cab4a3a5d336d6c01cde49657f8", + "sha256": "0dlq1z4d1sfhzv14y8b3xk9ixjsjd9wl66nbd18aqkm86rx0320f" + } + }, { "ename": "sysctl", "commit": "72ab5a8c1bc5901477b888a1abf8835a5af7cb41", @@ -104653,11 +105796,11 @@ "repo": "kanchoku/tc", "unstable": { "version": [ - 20201022, - 1646 + 20220122, + 1443 ], - "commit": "5c6bbb0ff08e5d81e905198156ae5600df7ff7ab", - "sha256": "0n78aiwdkb7k8hj1cxg2gawlgq228vi2v0fyjicry6l4i1p4d1ds" + "commit": "d0adf22f5aed4d9608778108b60a06c9ea58b289", + "sha256": "19wbpa06bfydsgik28c8j9irvsax4drv9hy5ci3ph7sgwnq692nv" } }, { @@ -104731,28 +105874,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20220119, - 6 + 20220319, + 955 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "5739794d2d0c8a4e7b77c2e37a097e19f80ac9f0", - "sha256": "1am0b2bjjkw7zd0yq39v015a08dcbk43j4d4h8y2q8hj53ryfk5a" + "commit": "500b7b42d81b77920f40a2f461dff7b6367e8326", + "sha256": "1j7gdc5ib1f63lw1cmbv937yx46mzmvh8r8h47z3m2pdx3drfsc0" }, "stable": { "version": [ 0, 8, - 1 + 3 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "7b1107bc11285ef3ed182f638980fba6d7ab2508", - "sha256": "1f9asfgjxq73h203cii86irlz4zg29xkr9f5sl59l70bhzchfyx9" + "commit": "ac3634e2e7efe9c29c4311196e0ed67085d58f11", + "sha256": "1ffy17i5fi1bw5r5m6x372c52hc1k83wxdxvi4z0hixyklj48nsv" } }, { @@ -104786,16 +105929,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20220108, - 2147 + 20220313, + 2218 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "4fd47989c499ccc973f0e904cf1649c037ff1626", - "sha256": "1wm10pb9k9s7mzswsqynm80cnh9wbndw4f9cw9h4z1rw28p1hvc5" + "commit": "7a0ba06db860dfe9a9ca012c2750b13deec385c6", + "sha256": "1w7b5qhg4nd92hl9whvbzz6nx2cb09m84ixkqqzygmjnrxknqsdl" }, "stable": { "version": [ @@ -104852,19 +105995,19 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20220116, - 2206 + 20220310, + 2211 ], - "commit": "17f3020b8ecd7fdd16b34aeb11c91a620ac42c3a", - "sha256": "0ddjkxxg6f998p87b7dpdmxyj14x542p455321y4kra420n0lmzi" + "commit": "56ee3bf1462efeb40caf7008ac93a3ea25866453", + "sha256": "1rd2w6j8yrv1d7fcxj39lgqdms2r6wsm4szqcd3fya216cmblyqd" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "91d19e22f9f77f897c97177601d7f870fbf807cb", - "sha256": "16972j2qq03q65qszgjjkzl52f79hk007kyi249wg1bqhvfa59b6" + "commit": "ee964c24b69579fcd5ec3c7d3d1d84d1ca3d90e4", + "sha256": "1cq7gg4fh105229my57wbb7v72l8mx957pvsg8k3zc1l0hbc796i" } }, { @@ -105546,11 +106689,11 @@ "repo": "Dspil/text-categories", "unstable": { "version": [ - 20211130, - 1719 + 20220310, + 1053 ], - "commit": "b6afe804e23c624eec2af0f2a5c04bdcdfd833b5", - "sha256": "0p63ypxfd4s0ywmja3ynyn0i9mirgv8kyr2wj4a0i20havxd29gz" + "commit": "f046a0e3da5283fdf3046b2f4cf3689a520ae552", + "sha256": "0amx3wa5vr913vvvz7vlyajvg8d5nagjfnc9gmi842nzqcm2699j" } }, { @@ -105693,11 +106836,11 @@ "repo": "GongYiLiao/theme-anchor", "unstable": { "version": [ - 20211224, - 2042 + 20220204, + 321 ], - "commit": "aad9c0c0c888325cf6f9bb2310677d667b364f21", - "sha256": "1cpr11kasmskwx3b5v5x5j6mndlz0dm854p4d793m3m9fwdk3303" + "commit": "c6f715d4ccd30e83922e39cab856578ce19224bb", + "sha256": "1k6vb1r1lzksnki4rxjjcbvcpc59q76vhc3dq7kmi5d20fdgrm9v" } }, { @@ -105875,18 +107018,18 @@ 20200212, 1903 ], - "commit": "68c1c9216dfed14d37cb84f62e526ad817349cd3", - "sha256": "0xvk3m3asiy648zxsr1zdvar7dzxa3xmiw8sprix32djvfrwcllk" + "commit": "9cdad0dbf6fdc6078b3c04c3941fd4e87fe40d2c", + "sha256": "1irfw968wsryry9sf9bs3n1854wa6m2xprb2pkk7wgj0z1701mx8" }, "stable": { "version": [ 2022, - 1, - 17, + 3, + 21, 0 ], - "commit": "ef52e26081223b80bdc2d8bfadc628c4dead17b6", - "sha256": "1rpimfpgxhbxri6zh1n5m218ln20xkn9y3qmjqahr78rxy9hsbni" + "commit": "5e4ce0994de546bc7e17a0ba588518cabd01f303", + "sha256": "1fj5zgpwvw6ybs72f09r3zf72glwjg4930mggwpl3ki1fql81g6w" } }, { @@ -105942,8 +107085,8 @@ "deps": [ "haskell-mode" ], - "commit": "9f86bc9aa03251065de988e57ffd209665a3acff", - "sha256": "11q86l6c82isb07al8lif96a8xsfih4zjxnamx9f76xxq0hxskqb" + "commit": "9dbd4c9b4dd4adb550323376a25a50917c971b00", + "sha256": "1pb93a7c29xz9ni4q71hclhpsh36bap3rb502lw4a8acsfim7jxq" }, "stable": { "version": [ @@ -105966,8 +107109,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20220102, - 441 + 20220314, + 930 ], "deps": [ "cl-lib", @@ -105976,8 +107119,8 @@ "s", "typescript-mode" ], - "commit": "4bd7f35d8aae160b16642aef3ca205adc71539a9", - "sha256": "0zrapfxdarakp3kwp73c2ymjx51fsnfk6azi2y1wb2kgsdxl2yim" + "commit": "b93e555858edc331ba33d1d8bd4582d578c7ca31", + "sha256": "0il0rdg6qk4bdpq86hxzwbv1rgwn028v72i3xh2kg6xsmpil4f0z" }, "stable": { "version": [ @@ -106191,19 +107334,19 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20220119, - 2057 + 20220316, + 2014 ], - "commit": "8e28f7ba737a53cb304a4d4c5317f36d2273cc60", - "sha256": "135igyyhl1f4kmlcr05x6srwrx98v6m6750migi7dsmga00ragpg" + "commit": "3be10cb5c3e17d9babb67190f63500ee68df267c", + "sha256": "04n31pgzn53cnlcs6qagdbspjy85w4dxm3iz6gynwnp50g4y16cv" }, "stable": { "version": [ 1, - 8 + 9 ], - "commit": "3da96d529c09dc1000de425f937380895ab9efa6", - "sha256": "0k2l15lkk3b5y7qfzhjid8l1clam5j9nhm635a1qmhjgcdln18x3" + "commit": "d623d3fba1a3a50bd677b4b4a22b1e13bdf86e68", + "sha256": "1rhr7j0gfcxvcgl5dfr4fidyx9m9lxwqyi8vcnvwcz0vnfxbr8x1" } }, { @@ -106295,11 +107438,11 @@ "repo": "duckwork/titlecase.el", "unstable": { "version": [ - 20220118, - 604 + 20220227, + 1900 ], - "commit": "d82f3d23c166db1c3ea9ae25adaf43d1eeb748dc", - "sha256": "1m1zn8fh68jvh3n7x89bj2v0wgdj0323vrxp7251n9vj3fffnchi" + "commit": "157b2943f4aa5745d64c77c1ac4b76ce6e60c47b", + "sha256": "1bcj3k5gb28dkk8mcyqvm7scdszzf7ydp23piwsmavw0rdfqfhsd" }, "stable": { "version": [ @@ -106422,16 +107565,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20210922, - 2254 + 20220318, + 2120 ], "deps": [ "dash", "org", "transient" ], - "commit": "3662c323f02e89d48c206103b43a185b930220e7", - "sha256": "02wwsaj7vc5vs8xij6kzgqqdwigy0qcvridbp8zsjmhy2rgq4w3w" + "commit": "383d139a4627f4199cdda99f08551ed3237595a2", + "sha256": "1wvf1mq0j7bnjswssvnn2b4vqfxd19hw15v2ch6c7zai0jrqylzh" } }, { @@ -106442,11 +107585,11 @@ "repo": "rpdillon/todotxt.el", "unstable": { "version": [ - 20200530, - 2337 + 20220204, + 1903 ], - "commit": "b51f7fa1357d2cbc1b72b10d15f8c6f009ce5a46", - "sha256": "1asf33na834mc4ppvfyjxa70v4r80dnq641si5kd86gjfzjjjfmi" + "commit": "ddb25fb931b4bbc1af14c4c712d412af454794c4", + "sha256": "1mb7cp0czhfzq0wb69lcihblr77f4fvq7ffcl64kkddnlp1ychr3" } }, { @@ -106496,8 +107639,8 @@ "deps": [ "cl-lib" ], - "commit": "842ae4df222bbd6596068814ac1b1e505c2a6b7a", - "sha256": "19j76bgv5hca8i9385f1s66zj31y70fgppmvxdqrws4265zqc11d" + "commit": "09166f32d3ece2b297da036f0abbeba63329580e", + "sha256": "09j3mxa0803piywmfkvxg0jpgbx6qbvibsik8wsms898bg5n3s4d" } }, { @@ -106553,11 +107696,11 @@ "repo": "topikettunen/tok-theme", "unstable": { "version": [ - 20220118, - 2058 + 20220222, + 1140 ], - "commit": "763c141ee79d67d8f57bfe8960f4691a357067c6", - "sha256": "1dknbml53m2n7ajm36dj118lxbky9lhlv4yj50dhrbxffgwrjmdd" + "commit": "b21fe53b70fa2936b052b9db8e2d4704ac40d9f6", + "sha256": "08si1qbdcy36h08256a9fgybifbx3bghx3z9l6j6j1kyz6s1w6gy" } }, { @@ -106650,6 +107793,30 @@ "sha256": "05pg1qddsl0m4r73smrxpcvyiwa18d9jl6i8nfanlydwmmjqblb9" } }, + { + "ename": "topspace", + "commit": "c980427ea621340ed8a50c4fff310aa6bca23bfd", + "sha256": "1fypf1zcf3f1fq9fg763k887j1vnj6kmr1qf43g9dnk3b9d9zwhg", + "fetcher": "github", + "repo": "trevorpogue/topspace", + "unstable": { + "version": [ + 20220323, + 2050 + ], + "commit": "1daae45343622c65fdfc9abe456020fd17e9168d", + "sha256": "1gwv7r6xaxkpnd7nyyj1v6xh4pd8lrnh3crlbf2d1sz49c5rf1zd" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "commit": "270b4ace5151f38ee5145689437d2b7a2d52cd96", + "sha256": "1mj5fd7kqmaz7qdx8rdqlri4999np8fd492hgpwli98zr6ha8spc" + } + }, { "ename": "topsy", "commit": "89d455ee48c4567e098bb733396fa2729bec58c6", @@ -106910,8 +108077,8 @@ 20210713, 1609 ], - "commit": "77e16de3b9fbaa0417b56a9acc70a9bca17c4ad0", - "sha256": "1ww04kfz4kkbhrbd78r4dpylhayb5hl72qcjv8wm0mhgfwmbb358" + "commit": "e4c5bb69e6f1338239bdbf66baf57bb610828b2e", + "sha256": "05ddgcgqribdwbph7qkz5r24h1xsbrnhlg4yqgnyyw5kfxayapzj" }, "stable": { "version": [ @@ -107014,11 +108181,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20220117, - 1122 + 20220325, + 1619 ], - "commit": "a19faa1c71428e1f5b2bb548b966e9f9b1a9eca2", - "sha256": "07vn0j3vk62w8rai8lwr7i16qqnx4zvzh0li20bfzgyi81za6md8" + "commit": "270eff1c7cc910dfe9882e97df608627028eaa40", + "sha256": "197j1jih73vjd3awycbiyfkj1fxmizaqs8h3id0kd1gyyjq4anck" }, "stable": { "version": [ @@ -107147,8 +108314,8 @@ 20200910, 1636 ], - "commit": "090677c53a2127d0960204b7b6d3e39f6bf2c7fd", - "sha256": "1b6g83gcjars06vcq7pbrwaw0cn7yqpny162iaf0rqaazr5wggx6" + "commit": "8cf1c0d52509fa789870b300f2a7b3564e021104", + "sha256": "0kq5piwrby9xdx4xmqm63nsbg597xa46lzh4v59irkf89irsay49" }, "stable": { "version": [ @@ -107258,8 +108425,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20220120, - 122 + 20220319, + 1652 ], "deps": [ "dash", @@ -107269,8 +108436,8 @@ "tree-sitter-langs", "tsc" ], - "commit": "ad5d3c5060d8cf43d2053c2bc74b0beda1e664a1", - "sha256": "0az5p42vhpbrqhgavfk3jyp1izillvqsik9rpwh5g48c3qm42bjh" + "commit": "63816d614e6e2112c2f26e65afd7440f022ba2ad", + "sha256": "1c0s9hsm5wisikgxzskmnkin0r2vs9yc5yhgkjrsrvaiiv05g9ip" } }, { @@ -107296,26 +108463,26 @@ "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20211211, - 1220 + 20220212, + 1632 ], "deps": [ "tsc" ], - "commit": "48b06796a3b2e76ce004972d929de38146eafaa0", - "sha256": "04dlwpi5w1g9v62l51zwa6idsajk6km39ljk2k9z3jrcs0fj22ml" + "commit": "5e1091658d625984c6c5756e3550c4d2eebd73a1", + "sha256": "08favjzk53cgz96k3xfcvi7g7y8gbssw03pbjk0fxfmcqqpps1j1" }, "stable": { "version": [ 0, - 16, - 1 + 18, + 0 ], "deps": [ "tsc" ], - "commit": "48b06796a3b2e76ce004972d929de38146eafaa0", - "sha256": "04dlwpi5w1g9v62l51zwa6idsajk6km39ljk2k9z3jrcs0fj22ml" + "commit": "909717c685ff5a2327fa2ca8fb8a25216129361c", + "sha256": "1sdvz827v436qijs6xafakkfw2d16bvp8frymd818rppjc7a9dif" } }, { @@ -107326,15 +108493,15 @@ "url": "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git", "unstable": { "version": [ - 20211128, - 2236 + 20220305, + 1919 ], "deps": [ "seq", "tree-sitter" ], - "commit": "5f80e89b7da2074ea7f083b769448eb7026865dc", - "sha256": "14pi0vv193vpbwd4kb86hsnv1h8j9pcclvipp1wllv3nxw8k2ypk" + "commit": "785b8cb8ab17bffec958e421260746e16b438727", + "sha256": "03c7lbig8rflny20v85w7bpla2x9653dk4azjifcs0m0vpjjghma" }, "stable": { "version": [ @@ -107357,26 +108524,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20211228, - 1446 + 20220319, + 356 ], "deps": [ "tree-sitter" ], - "commit": "3c0c82f9fb0a796f5ebd7e1e4c89f13d5ab6ef58", - "sha256": "0jijx5l4wx03wnq5v3qlfw3kwzssiv5glqxz9clr827qdzgpxnlb" + "commit": "f4effc81fcac3592bce7072619a0e17043412cf4", + "sha256": "01bzlhnz7n781gp9d48973gxkcc95rscjs0c24am73505srl38jz" }, "stable": { "version": [ 0, - 10, - 14 + 11, + 4 ], "deps": [ "tree-sitter" ], - "commit": "53fb0fb0c00f622a4661721ce04b8b5f73eb80f0", - "sha256": "1xv3pfbddyky68bc3ckxz5gji54ysl1frazlw6pn74xmr62y99xq" + "commit": "f4effc81fcac3592bce7072619a0e17043412cf4", + "sha256": "01bzlhnz7n781gp9d48973gxkcc95rscjs0c24am73505srl38jz" } }, { @@ -107423,8 +108590,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220119, - 1620 + 20220216, + 1950 ], "deps": [ "ace-window", @@ -107436,8 +108603,8 @@ "pfuture", "s" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -107467,15 +108634,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211107, - 1818 + 20220124, + 1914 ], "deps": [ "all-the-icons", "treemacs" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -107506,8 +108673,8 @@ "evil", "treemacs" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -107537,8 +108704,8 @@ "deps": [ "treemacs" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -107569,8 +108736,8 @@ "pfuture", "treemacs" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -107595,16 +108762,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211229, - 1448 + 20220209, + 2117 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -107629,16 +108796,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211229, - 1448 + 20220209, + 2117 ], "deps": [ "dash", "perspective", "treemacs" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -107670,8 +108837,8 @@ "projectile", "treemacs" ], - "commit": "410277b60282fc4b400e34cd87008a1183b1151d", - "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w" + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" }, "stable": { "version": [ @@ -107687,6 +108854,25 @@ "sha256": "01qrprxfwmdzak77k2qa9fc2kb4hxddbvj30avqglj9sjaid9wmq" } }, + { + "ename": "treemacs-tab-bar", + "commit": "fd08b4b2dc7476e39c210207313431e554de9bb9", + "sha256": "1j5ch9jki388dhjnc7lsi6drvrsajjrdhxhqr55hq8ns1dhm8gl9", + "fetcher": "github", + "repo": "Alexander-Miller/treemacs", + "unstable": { + "version": [ + 20220221, + 2038 + ], + "deps": [ + "dash", + "treemacs" + ], + "commit": "b18a05b1f62074a40e6011d83cd4c92cbee040dd", + "sha256": "0975n5d1rl9dqi9qwsg724cjxl753rw30xxngg7qs6338mp77c1y" + } + }, { "ename": "treepy", "commit": "63c94a703841f8c11948200d86d98145bc62162c", @@ -107757,8 +108943,8 @@ 20180904, 2313 ], - "commit": "886232c6d7e92a8e9fe573eef46754ebe321f90d", - "sha256": "10h6p2dwl2k2p35pi3n8y85qh5y0zrr9nhfr4sviwzj1nbqdrvdr" + "commit": "f7cbd4f9283dbb0528445a3ea6d3b291d97065f6", + "sha256": "08l88w680jcl609wnsalydgfjnhrvbwiasgss7sv5r1xa16as942" }, "stable": { "version": [ @@ -107778,11 +108964,11 @@ "repo": "ianyepan/tron-legacy-emacs-theme", "unstable": { "version": [ - 20210420, - 1201 + 20220312, + 1645 ], - "commit": "e7d16ebe4a824e7d7766fb34ffe4ea3b002f3d23", - "sha256": "15njpd9923rl07lq4mxs611glgnw3qyr21wk6xak6n1cminvy81g" + "commit": "d775d9f348a942230ea57b6520e1eb56a5d67569", + "sha256": "03v8izw95ksl104w4zgacy0wpcvl4x3kwzamvd11d7ndlzn3jqpy" }, "stable": { "version": [ @@ -107927,20 +109113,20 @@ "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20211211, - 1220 + 20220212, + 1632 ], - "commit": "48b06796a3b2e76ce004972d929de38146eafaa0", - "sha256": "04dlwpi5w1g9v62l51zwa6idsajk6km39ljk2k9z3jrcs0fj22ml" + "commit": "5e1091658d625984c6c5756e3550c4d2eebd73a1", + "sha256": "08favjzk53cgz96k3xfcvi7g7y8gbssw03pbjk0fxfmcqqpps1j1" }, "stable": { "version": [ 0, - 16, - 1 + 18, + 0 ], - "commit": "48b06796a3b2e76ce004972d929de38146eafaa0", - "sha256": "04dlwpi5w1g9v62l51zwa6idsajk6km39ljk2k9z3jrcs0fj22ml" + "commit": "909717c685ff5a2327fa2ca8fb8a25216129361c", + "sha256": "1sdvz827v436qijs6xafakkfw2d16bvp8frymd818rppjc7a9dif" } }, { @@ -108040,14 +109226,14 @@ "repo": "smallwat3r/tubestatus.el", "unstable": { "version": [ - 20210801, - 1522 + 20220303, + 1736 ], "deps": [ "request" ], - "commit": "eeda4c2647cfdb910de776398037183f48e3fa72", - "sha256": "1fn405rmwcy8y5sa8lh5grq87n5zxbln2b9agxyilfx4jm6rcnpl" + "commit": "c81373f1bc32cbd2e2d642ee10ee1cb31915acb0", + "sha256": "1ili2jfp8ycigq022ws92x6x91k0myq34ipq318b461shd1by4yq" } }, { @@ -108224,6 +109410,24 @@ "sha256": "0d7vd1h0rwwgrh7f9kmdgy2ni0p20da9c8ylwlg33nsb26345wfs" } }, + { + "ename": "twitch-api", + "commit": "d68bb5cb21fdc7d91ba5548354a8214a6b603b3d", + "sha256": "1zsqm8nwjfsdbwkylxf2dc26zh4dy4ni6yv48yvk20nvcsi8sz80", + "fetcher": "github", + "repo": "BenediktBroich/twitch-api", + "unstable": { + "version": [ + 20220207, + 813 + ], + "deps": [ + "dash" + ], + "commit": "e48b0b350516e20eaf85514e8855c2fbfbf09c11", + "sha256": "1pfrqa7lc85b9ww54w15liwi0swj3h9vx41fcmv7w0b31fijmzjd" + } + }, { "ename": "twittering-mode", "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", @@ -108248,24 +109452,6 @@ "sha256": "193v98i84xybm3n0f30jin5q10i87vbcnbdhl4zqi7jij9p5v98z" } }, - { - "ename": "twtxt", - "commit": "4627ee00b9439d9dac9971ad1060af4bcf31446c", - "sha256": "0fpq3nz30v0g355xq0pcwf8iqykvn9af1wdx76v5fgzimlrpwy7l", - "fetcher": "github", - "repo": "deadblackclover/twtxt-el", - "unstable": { - "version": [ - 20200824, - 1323 - ], - "deps": [ - "request" - ], - "commit": "e7bafaf92124bb4f2a0be5c1a635b80f9b3a8c87", - "sha256": "1qqc6ykrpq311fwn5mvzc3yl6z48v1c3yq3vi8g9zv63ywj33bbk" - } - }, { "ename": "typescript-mode", "commit": "94455323364d5a6b00e2786d577134eb350826b4", @@ -108274,11 +109460,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20211130, - 1332 + 20220223, + 1506 ], - "commit": "e82416205158d4b21d42d6b60c4385f68f0ae1b1", - "sha256": "1gidnpwk4n9zsrv9jxb7fmn3i46sggncv62w1aaw6g6v8h3yj5ad" + "commit": "88f317f0b6aef8f8d232e912fdbc679799580c56", + "sha256": "0qkqxvam3r21philap71dy4980sbadx32176rz20wwrs10szqnck" }, "stable": { "version": [ @@ -108418,11 +109604,11 @@ "repo": "md-arif-shaikh/tzc", "unstable": { "version": [ - 20220118, - 557 + 20220126, + 604 ], - "commit": "d1f08fff5d4f9c2584a3b405464c6a92000f62b3", - "sha256": "108920snw6i0lbdy7ky336n5lkf44bv1cfn0an12amfa3jb5w1wg" + "commit": "3af821d2125a67786f93d50d532a71f681f381cc", + "sha256": "0zd0g5qdm4w0jj37n0ijcknz74xgb3f9s0w72qz8zapf5n8q9mbp" } }, { @@ -108696,8 +109882,8 @@ 20200719, 618 ], - "commit": "70b287aad04d97ec902ea2aa71cf9ff4b7d701ec", - "sha256": "0api91jqkafqglq6f1fqb0lac81dq7xr2czdwrb4m0lgkxv325sj" + "commit": "b9069b8af1bfa360d3b7197a7101fe0233c92750", + "sha256": "05873v76z7f7jrhkc78bmkgmqjvbidyaf1dymcccc8cgsc7bixp1" }, "stable": { "version": [ @@ -108740,11 +109926,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20211030, - 612 + 20220211, + 548 ], - "commit": "ab8bc10e424bccc847800c31ab41888db789d55d", - "sha256": "1vdaysc328gwqi57fp4cfbl96g76m8wc2qr53wgb3l89m9kx5sgg" + "commit": "e81c8da4416b15cac9d5ac7574e11471417a65ca", + "sha256": "1f25h3rx09ci56gkpypsscp8bkqmj7fr2yfniki0y92czix9x70s" } }, { @@ -108755,11 +109941,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20220117, - 2256 + 20220326, + 622 ], - "commit": "edf050d6133478d04fc06cc65914517b18d6bcc6", - "sha256": "1sbd5fmpc3kcw9w566aqx7css2bjbca503j9y8aj6h08hpais561" + "commit": "7bbc89a42f6bb4abcd4513488bd45784cf4041e4", + "sha256": "1is1ywsr78k9fil44psb8hqhm8b2a8hmv1pf6a8h04hwv3svpf3q" } }, { @@ -108785,14 +109971,14 @@ "repo": "emacsorphanage/undohist", "unstable": { "version": [ - 20210517, - 411 + 20220219, + 634 ], "deps": [ "cl-lib" ], - "commit": "56c6f58873f8ebb743e4dc5aff143744720375bd", - "sha256": "1ayf2rgw0y0qa65s585408nxdqpq6vgyz8l015crk72l6hv35l8n" + "commit": "efb8ac3935635ad0fd731de0ef64b14a23f50b42", + "sha256": "0mvj2jhj2dl4pr4gh7rh3042lawxik9myvvnvqc25zjqa5n4jp8c" }, "stable": { "version": [ @@ -108989,11 +110175,11 @@ "repo": "astoff/unicode-math-input.el", "unstable": { "version": [ - 20210612, - 847 + 20220302, + 1231 ], - "commit": "2788d7824d23749a6e5b33f653c47471455da187", - "sha256": "1kqaqzlgf9gqxf3fzy41m606h7ridp5iik1w5a0dpq86ni23r77c" + "commit": "06bf37d649fc3b41fcd5fa29c0b0eda555aaf8bb", + "sha256": "0i6qyc5jl1151dyp95wjx7f7fs4m0pb7qnlb6skr33rrfl1icmpn" } }, { @@ -109243,6 +110429,30 @@ "sha256": "0fgipv93x47cvyww07cqx8xa95jz36y6fy5rmaq40jnnmdkgq862" } }, + { + "ename": "unmodified-buffer", + "commit": "0a8d1d4a74ceed49d0506c19715e1dcf33ba90bd", + "sha256": "105vgslgjfwhdvmmwxrz32mz8rpz74gvxkylvvb2jrfddfx575hq", + "fetcher": "github", + "repo": "arthurcgusmao/unmodified-buffer", + "unstable": { + "version": [ + 20220129, + 2013 + ], + "commit": "9095a3f870aa570804a11d75aba0952294199715", + "sha256": "1b78m66i00fg4f84kvwd82w3pb2rr3skf6cgckb0g1fsdzzhrjb8" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "9095a3f870aa570804a11d75aba0952294199715", + "sha256": "1b78m66i00fg4f84kvwd82w3pb2rr3skf6cgckb0g1fsdzzhrjb8" + } + }, { "ename": "unobtrusive-magit-theme", "commit": "6dd57561738c2dc3ed6dc03f57d2487ce949f035", @@ -109613,11 +110823,11 @@ "repo": "jcs-elpa/use-ttf", "unstable": { "version": [ - 20220111, - 743 + 20220220, + 150 ], - "commit": "bf64ea24fd1fdf5ed7e4ed14bc5f84303fa17a58", - "sha256": "0mhz64hsml6fp4lfwrx3w5i85finn0s417r6ccfyk911zm70fm9x" + "commit": "fb82a02b6c86e6224482b27caa08662b023b40a1", + "sha256": "1lncgprxmir4czq8iiww9cmpd4si77vipkgksjrv37r9xz5hgyr4" }, "stable": { "version": [ @@ -109637,11 +110847,11 @@ "repo": "ideasman42/emacs-utimeclock", "unstable": { "version": [ - 20211008, - 454 + 20220211, + 548 ], - "commit": "e6e3dd50fb7e3b20e38db555950b2f417a12c993", - "sha256": "0iri2836zxadqdvivkmm0rz2ai4wxb1khnfxjmk8k8q274w1lslf" + "commit": "0e36664ffe9f278bb008107d1b743edfcfba60f1", + "sha256": "1ninhp8z9lr705k8a5pd8cvm3nwrml9wp2hvrv3lilmdr9879h0y" } }, { @@ -109658,8 +110868,8 @@ "deps": [ "tuareg" ], - "commit": "676e2cd6545fd327e02330d1ccb20c02d6b26eab", - "sha256": "1mdpqc1b67p5rm2jsbwy0gjjgdlfqcakjyh1cwdj959ykz4zy9ld" + "commit": "d5dbad6b807f09731d87344ea778b29c432b76e2", + "sha256": "0lndsas27h9mmrjv1g2r5jhwjip1si6xrinp58w04kvzcvgypp2w" }, "stable": { "version": [ @@ -109712,6 +110922,21 @@ "sha256": "1nzf7cllyvx7kwdzpf0nl3g5a8mn6qgifa60aw68h0sx9a80xp01" } }, + { + "ename": "uwu-theme", + "commit": "32b645e4304be3340c29e466f9b082a4e4855631", + "sha256": "1iq7rm53ds6yqrdj1drjy26dxdcsh29bz5ab7200yx1fjn114qzl", + "fetcher": "github", + "repo": "kborling/uwu-theme", + "unstable": { + "version": [ + 20220324, + 1828 + ], + "commit": "a40f96f35cd6dafe0fc98bd19c9783f6b265173c", + "sha256": "1ppar0fz98xsbdl9yvh3rk09i1zk9170n4j7rlnvj3a9gnp9bdvq" + } + }, { "ename": "v-mode", "commit": "247cab604cf0ef6078f5b0f5887526bcbbcefb70", @@ -110229,8 +111454,8 @@ "deps": [ "vdm-mode" ], - "commit": "89e7db6ee1a89b8c1f7ce36ce6800c32b5c4ba2d", - "sha256": "1vfqkfw39yg7379s6b28n8nyswv1jq7caljfbnyrndsag6z4j50k" + "commit": "56336930555df91787f196acac15680498d17d5e", + "sha256": "1xp6ngqd67jqrqvr5j9vmffrap6cbyiqbw1hbw8ciz27ivyqz6vx" }, "stable": { "version": [ @@ -110256,8 +111481,8 @@ 20190328, 1408 ], - "commit": "89e7db6ee1a89b8c1f7ce36ce6800c32b5c4ba2d", - "sha256": "1vfqkfw39yg7379s6b28n8nyswv1jq7caljfbnyrndsag6z4j50k" + "commit": "56336930555df91787f196acac15680498d17d5e", + "sha256": "1xp6ngqd67jqrqvr5j9vmffrap6cbyiqbw1hbw8ciz27ivyqz6vx" }, "stable": { "version": [ @@ -110283,8 +111508,8 @@ "deps": [ "yasnippet" ], - "commit": "89e7db6ee1a89b8c1f7ce36ce6800c32b5c4ba2d", - "sha256": "1vfqkfw39yg7379s6b28n8nyswv1jq7caljfbnyrndsag6z4j50k" + "commit": "56336930555df91787f196acac15680498d17d5e", + "sha256": "1xp6ngqd67jqrqvr5j9vmffrap6cbyiqbw1hbw8ciz27ivyqz6vx" }, "stable": { "version": [ @@ -110350,11 +111575,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20211103, - 1927 + 20220214, + 943 ], - "commit": "6250360b3b06f590dd37885f3c33a451a3eab5d3", - "sha256": "07xdl2ng435iy9zqrq1wgrmwygarc91kqmz6ck1ngvn4mh86ndxk" + "commit": "f6fd85d913c39603695e52d258d02e6030e3d42d", + "sha256": "032s7i4gg7cc35cqa816sji8bhww2wzlihizvvbbzplsz435mdbs" }, "stable": { "version": [ @@ -110746,11 +111971,11 @@ "repo": "thanhvg/emacs-virtual-comment", "unstable": { "version": [ - 20211103, - 209 + 20220301, + 430 ], - "commit": "4effa95c7d6243fc5696597f488653f9d2a5d4a6", - "sha256": "164yiiqqxk2fpjk65y72fr71j05b1330zmvbaxh0w3ww2axkjz68" + "commit": "5205379bcfa1774a745e3dcbaa4ea861ff6a9ad2", + "sha256": "1blgy286id63mqr2gan7xkg88rn2nwj36vqdsyyxq8w2p3f5qh54" } }, { @@ -111066,11 +112291,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20220119, - 1100 + 20220319, + 1730 ], - "commit": "be9e32f04ea7f190c57d18e59eb4fdd53e89e542", - "sha256": "0bc5n14xzdlwyxx2h4pw4ffzb16jzsmm4a3pr99i5di8gr57d5rh" + "commit": "94021437d4dded5039e75c236b4a230d9fbdf7d6", + "sha256": "09q43zpx010jmwiz3wbsfwy4kmfz23z1xy7ka7a9nymd97kjnq9p" }, "stable": { "version": [ @@ -111089,11 +112314,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20220119, - 1101 + 20220319, + 1729 ], - "commit": "0198d598657ce02c95a977eb27b681a5cc7604a7", - "sha256": "1zvhiz45nnzh5k1pki4j6mx5vr3nyqp7q5vb5816f646j8kf7lby" + "commit": "a1a6708419944c95fd36bdc8f8771fb8746a698b", + "sha256": "04jccdrsx5r7q067sfyx5qcamlb3df1lx2v04zc436v7cxmj9s9z" }, "stable": { "version": [ @@ -111127,11 +112352,11 @@ "repo": "ianyepan/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20210925, - 1940 + 20220320, + 530 ], - "commit": "2b86fe42b85b602ba97ea7f757676d623cfbb8d0", - "sha256": "0dgg8qmpfwb2z7yzvl5hj298lx1dk056wdbyr74vvwgn450x77sd" + "commit": "cec18a9d816fef372a4e70f6ad1e16a42aa93b06", + "sha256": "1byssa2rv2j9s3m10v7ihi1avqkjc5wqj62393wkp85k73z9v3dq" }, "stable": { "version": [ @@ -111181,14 +112406,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20210902, - 828 + 20220202, + 1722 ], "deps": [ "vterm" ], - "commit": "ea0bfeaa200d9ed02b51bbbd83222657b02637e7", - "sha256": "0bwgzpf2wyzdj9smwys06zx4yha72pw50wzdh4zld45ph40pb6qw" + "commit": "2a6861ef6af91dad4be082139214a30116b50acf", + "sha256": "19rr03fqicykw73wbpw2nzz0b0dc62qpqh7gddmgz8lv39d6xmfb" } }, { @@ -111272,8 +112497,8 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20211116, - 1109 + 20220218, + 1024 ], "deps": [ "bind-key", @@ -111282,8 +112507,8 @@ "s", "versuri" ], - "commit": "ddfd4be99b46ddc042139028980ad8dd616b7d45", - "sha256": "10wjzx8vq8k16dwcjppnr28pkiilxl2ak78h60h68flakmdzibmg" + "commit": "aed3272b95fc73fd78712ff7dcfc05916f382fed", + "sha256": "0faxcgvi8r6nchvgh2dzmnawbv5qzsf1aiyfg3f39pskcrnip62v" }, "stable": { "version": [ @@ -111309,16 +112534,16 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20211118, - 734 + 20220204, + 936 ], "deps": [ "org", "org-roam", "s" ], - "commit": "398ca17f83ea59f54f61898fefdb55332cd3ba46", - "sha256": "0qa49s0nhqbh9bmxi1zglnx3yajqcdx8j7yiy23lxbya2fpl557i" + "commit": "ba44342aea6a81c7b7ca6fcaae9a537701789b5e", + "sha256": "0avqxd264dpbyh8cza0pv8miflyaaqlx27xdjix4xj42wq8k6rzm" }, "stable": { "version": [ @@ -111343,14 +112568,14 @@ "repo": "embed-me/vunit-mode", "unstable": { "version": [ - 20220118, - 1929 + 20220316, + 1812 ], "deps": [ "hydra" ], - "commit": "7f36752161b1a172ff74b3fd9f1289f89471e002", - "sha256": "1na722d9mgcmsqf0pdwnr7wy4zl8d4f3yj1ckpi4rmh5mj0g1blp" + "commit": "5643460a7011d6bc13c2d4762f329d19f6c7d46b", + "sha256": "1zzlfscnzvck658ylsmqwk30jdf9qnrnmhvghd3xinlhglnmwrp7" } }, { @@ -111514,11 +112739,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20211217, - 1406 + 20220211, + 1304 ], - "commit": "cb65d5e32fae0da77118db492cd40b58585d5cf2", - "sha256": "0ai5kw8v3778h5ry9191xb7bcmqp3j92h800223aiclh3hrfdc3b" + "commit": "ed86134f91c532a38d2739dd15ea6cec879cbd8a", + "sha256": "1p23jr4h6hhalvsi3mk3kcf6dbph6di2h3h92ym86fxry4jjxlzh" } }, { @@ -111548,16 +112773,16 @@ "repo": "abrochard/walkman", "unstable": { "version": [ - 20201229, - 1811 + 20220318, + 2122 ], "deps": [ "json-mode", "org", "transient" ], - "commit": "0cb9c2fef6e611b4389f7df7fcccc17744053e9b", - "sha256": "1fv4bn6c04kv39jv25r09pvxc5hz5gwwbj16fhxs5930rf77ikqb" + "commit": "3118dd4f493caffcc2849058833572dfc0c0e0a9", + "sha256": "03hyz3bhbisymm0gzqzsrmvyzkkgh73zbqgra6m70jka8sv065xs" }, "stable": { "version": [ @@ -111588,6 +112813,21 @@ "sha256": "0k6jysr9sdz3x8h0pslpssjr23hwp358472vmgd2jmfzvjk3m21i" } }, + { + "ename": "wallpreview", + "commit": "8822842e06fb8bce3b62847ed1ea7c9d64f4d7d3", + "sha256": "00i4j7ki84yw2sihd9xjwh6gvp0xi5yql7nmsgdqkhp91qcmkn8k", + "fetcher": "github", + "repo": "nryotaro/wallpreview", + "unstable": { + "version": [ + 20220220, + 427 + ], + "commit": "b1b8f19ae82b344a9577cea7b883ad513ec52222", + "sha256": "11s37l15g9sgvk0blvvw22griy1h51q14c42290yms8whnbp001z" + } + }, { "ename": "wand", "commit": "38be840bbb32094b753ec169b717a70817006655", @@ -111893,11 +113133,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20220119, - 1026 + 20220319, + 653 ], - "commit": "d95e0db1bd042d1a8c9bb6bf744eb07ecbf62d73", - "sha256": "0mw2ws23fvxc5lnpic8kbqii0rvjamdvff5xa7rywd9yiwv3yfm8" + "commit": "efa853e5cfff8e0bcacbda9d1c6696b33da91b03", + "sha256": "1hpdr9r1wvvh44iqkv1lcfnjlvn16yrsgdq2ald2p6sxh9hkvn66" }, "stable": { "version": [ @@ -112070,14 +113310,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210919, - 1547 + 20220312, + 2008 ], "deps": [ "templatel" ], - "commit": "0f8ec7e9065b2962c93209ee30b46f91843e2815", - "sha256": "0jiq879m74ysl0gb9wh1qmxyxi79nhnr2b1slq33mwf98r1nzcbg" + "commit": "b2bb79ed2c532cad5b03455d8cae887ddb803db3", + "sha256": "0xz9f7vz3h82hksz0swf5ykdh1fwh6dyk7dadjvral7iqjz4pjmf" }, "stable": { "version": [ @@ -112138,8 +113378,8 @@ "deps": [ "cl-lib" ], - "commit": "fda4455333309545c0787a79d73c19ddbeb57980", - "sha256": "1ga4m9xgiczb6sv7dhmy4841rd9wxsirrvi8va34srpzlq51iq65" + "commit": "82b370602fa0158670b1c6c769f223159affce9b", + "sha256": "0bl1hwdy6ign624lhb8dncvahvrs8j96dss4kl5rfxzy5rpva0jp" }, "stable": { "version": [ @@ -112430,20 +113670,20 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20220102, - 1433 + 20220214, + 1818 ], - "commit": "9f64733e4ac563c0cda3685acf4e1c2cf600319b", - "sha256": "086jcw31jl3cb6ahgrgf40s7ydp7gv58pah2ai12j7j3g6vvdjnj" + "commit": "1217db8c6356659e67b35dedd9f5f260c06f6e99", + "sha256": "0ph5mrzz3r7x4dmy93v6affl4jznvic97a30mrs3kvhwyr2v4mby" }, "stable": { "version": [ 3, - 5, - 4 + 6, + 0 ], - "commit": "1bb1f723dab2fc8b88b7f7273d0a7fa11134b936", - "sha256": "0wz3bb7vzxqi3wqpn46z6ps00m9wjcpv9cfvqi7lyvm920sxzlv7" + "commit": "1217db8c6356659e67b35dedd9f5f260c06f6e99", + "sha256": "0ph5mrzz3r7x4dmy93v6affl4jznvic97a30mrs3kvhwyr2v4mby" } }, { @@ -112633,6 +113873,21 @@ "sha256": "09jy46qxq5whk8l6znkvghjyc55cmi6z734aagmhiw33wmiyadm4" } }, + { + "ename": "why-this", + "commit": "f45e4eabb023673be2dd3c6c46e752085587c0e2", + "sha256": "1pb73qc67w73p664kfd0na1qmzbz00dmjz468smrpjjscqmazmp3", + "fetcher": "git", + "url": "https://codeberg.org/akib/emacs-why-this.git", + "unstable": { + "version": [ + 20220314, + 1329 + ], + "commit": "ca4cf46d6e7b961a0c0fa39ac084fdca3c8c93b2", + "sha256": "14zb4abakpy2s05lfry097i0gg2d3njj0847a62dnwv8hgypsk6c" + } + }, { "ename": "wide-column", "commit": "8d29def44ae42dc4b60c1d254a57572bd09faf51", @@ -112727,11 +113982,11 @@ "repo": "progfolio/wikinfo", "unstable": { "version": [ - 20210711, - 249 + 20220121, + 2017 ], - "commit": "c75c588a3ebf4cf155c33ca018c56ac914092860", - "sha256": "0vrbqaby2q34350mkpykxqw5kfagrdsz12l3fbmdpqvwh1vhjwdm" + "commit": "b149228023d4abb29555ce69877df521887cafe9", + "sha256": "153jmq14x4bim9v5xhd4zd100bqy2amj62sqjlmxf60pmd6xqc69" } }, { @@ -112742,15 +113997,15 @@ "repo": "progfolio/wikinforg", "unstable": { "version": [ - 20211210, - 2116 + 20220322, + 946 ], "deps": [ "org", "wikinfo" ], - "commit": "62842806fee863eb43c3015c3d86f5a7f0bf858f", - "sha256": "1rzxswfzg8lpwn1r7lq08rz7mrbrs5vr587phh60l26qpz6960c2" + "commit": "9a5bfe36d59dc845b8da1951bed327f3a9071534", + "sha256": "16vcqf6f44jbyr5plkppd9s3p7i920nv2pvcqazc4g954h6582nl" } }, { @@ -113117,11 +114372,11 @@ "url": "https://hg.sr.ht/~arnebab/wisp", "unstable": { "version": [ - 20210405, - 1410 + 20220208, + 636 ], - "commit": "c15e50edbfadf6cc46b8ed22a13438ecdb6757ee", - "sha256": "0jg9r9ykad05ng1y12mcva52bi8apid9vxaxxww262hgl647cl2v" + "commit": "d266109b95e73281ae3aa1ed9a023346b6d39d28", + "sha256": "0fr3p6cfqxxj01bix9aiglfb2ls2grr62l735wdkn2r7lfvf5hjx" } }, { @@ -113162,20 +114417,20 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20220107, - 1056 + 20220318, + 1640 ], - "commit": "a4e720b12a0946a271a274bbe0b45ae07f83520b", - "sha256": "06a66119rp5vfqdzqk10df3qyh9jvjl6j3pqm03jy0b110v2bfa8" + "commit": "e8569e027ff5c9bef8d9ff0734e3293e1c0574a2", + "sha256": "1q5c46kinh0s3pyms64nbzzbzgfq5a29qjzw4khsh0b73p8245gf" }, "stable": { "version": [ 3, - 1, - 1 + 2, + 0 ], - "commit": "a4e720b12a0946a271a274bbe0b45ae07f83520b", - "sha256": "06a66119rp5vfqdzqk10df3qyh9jvjl6j3pqm03jy0b110v2bfa8" + "commit": "a762199d9bb8ee60311eaabf791b3dd64140effd", + "sha256": "1d98hagpm6h5vgx80qlh3zrfcb6z000rfc707w9zzmh634dkg3xx" } }, { @@ -113405,6 +114660,21 @@ "sha256": "018r35dz8z03wcrx9s28pjisayy21549i232mp6wy9mxkrkxbzpc" } }, + { + "ename": "wordel", + "commit": "a0186cd951d0d4a6eb5b1f872d7114e24ce479a2", + "sha256": "0xdj3fqkq1cixmr7nnzl0ch4zl9mpd0x1y8svdcqz0a1ncg6pg9g", + "fetcher": "github", + "repo": "progfolio/wordel", + "unstable": { + "version": [ + 20220225, + 1907 + ], + "commit": "5a1f9a45c3d1fa58c3de5183c4456572ae861d49", + "sha256": "0jd7lbb7mbjfk66mkzxnhffh3dlj28xma5a8km5hc4lclqlm74sx" + } + }, { "ename": "wordgen", "commit": "5cfdc64a9aa79575dad8057c4cd747d2cdd460aa", @@ -113532,11 +114802,11 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20220106, - 249 + 20220308, + 1314 ], - "commit": "d2e1f33001f1777767a7c6e862d5e6a37e688f42", - "sha256": "03lbfbi05g03w1cnys6smaf0yxm6168ckmdbcvkxy0k519ngzyd1" + "commit": "b2c457a720e98dd1c560860e44a6a80372ef07ef", + "sha256": "198bm8l8jf6xvc7djy3d9z7xm437pkabmi9i30pd79g5l2dikj8f" }, "stable": { "version": [ @@ -114316,11 +115586,11 @@ "repo": "ideasman42/emacs-xref-rst", "unstable": { "version": [ - 20211006, - 2319 + 20220211, + 548 ], - "commit": "4ca1c15e9fe98fadfb13098dd0ee104d5ca6abf2", - "sha256": "0rawl98fsx1rrhq051d77wmz1xp82m9yr9rgb8k3p5g0yacyfkfv" + "commit": "f07722ac9c2952e86d9e84546c3c5eb1a768247e", + "sha256": "1wq815c2bs1fqjkl7kjpzmhdlw95dsayvcgclnkk1bb70xgzsivg" } }, { @@ -114600,11 +115870,11 @@ "repo": "drdv/yahtzee", "unstable": { "version": [ - 20200511, - 2005 + 20220221, + 803 ], - "commit": "c3218914269ec1ac97336fee3a88816b73437b39", - "sha256": "163y4a6hp3b150zwjgfxi9vs04sw2lcr3izmfa69yjj84nwcx9z3" + "commit": "9b42ba4612d3043464414c08a3d60f6ad594566c", + "sha256": "1552a71nn60h351i6kal25py2l41vhnk4nlvcc53fg6hx7pkrwg6" } }, { @@ -114630,11 +115900,11 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20210730, - 143 + 20220311, + 332 ], - "commit": "84b88c9ed178af16da18b230c1f61c57cefedf28", - "sha256": "13fjxrr7iyfagbm21p5is5jw1zv56ns2mnac145v8lqli6mrr5gx" + "commit": "34c300b08579b72c7c92aefee1f4b500913f0c85", + "sha256": "1lwhm3c7xmx1j9ggf9ka0whpm7g5p6b11gfv1bxkdx1j8ypvxn0m" }, "stable": { "version": [ @@ -114750,11 +116020,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20210811, - 1934 + 20220201, + 2104 ], - "commit": "6562d021cfc76b88a7b39b49adc44fcad835bd3f", - "sha256": "1xh36s2vy521hni9993ajnqv3apinqsiq09yfhfkz4skw22p891g" + "commit": "927e6d26956ac7219b8a69d641acf486854fba16", + "sha256": "17zz614fy7r2azgqfwiyl9gr9y3fxls65b0nahdb5dlsr9gsjiw5" }, "stable": { "version": [ @@ -114797,11 +116067,11 @@ "repo": "binjo/yara-mode", "unstable": { "version": [ - 20210520, - 1318 + 20220317, + 935 ], - "commit": "345cf782926414f92f57d7f1b129974dc38a545b", - "sha256": "0n3cnxxwm3rgzpgqy1kkv6fhqzqw3gnj1p9anp5vdhss8fdad7s3" + "commit": "4c959b300ce52665c92e04e524dda5ed051c34f3", + "sha256": "0kb2a4hcmaczn279hbgk0jv88hsjznv1kqpkgkadszd02q53n0cl" } }, { @@ -114873,11 +116143,11 @@ "repo": "emacsorphanage/yascroll", "unstable": { "version": [ - 20220116, - 2241 + 20220212, + 1742 ], - "commit": "a5920d660f660ed05f4ca63bfd5e70f912baf9d2", - "sha256": "1dbqjxyxl5p7hg2z249nlw06cx2hn4sciv7fvxlnyhcdnhhv2bhd" + "commit": "82772ac2508a4549c75f2aa31d901caea468a0fb", + "sha256": "1ccyf0y9886vq4007xr4g8w05jnw3v8pfzlqxdk7j4babj8kyjw9" }, "stable": { "version": [ @@ -114945,14 +116215,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20210910, - 1959 + 20220221, + 1234 ], "deps": [ "yasnippet" ], - "commit": "f50b4c16ca2a73fd04ebd301f0bf2f5ab6107d88", - "sha256": "0iglhbwnx2pk2p05ym43fh3p4vwd77kch6f8aw63jz77ia05cba4" + "commit": "b7c09f1ad7e1a62da6f6042bfaa2b26d111c7e81", + "sha256": "0r4rjsgd13n8k0ijypwh3ky0dzzmz0p08lfaalpbqk3w555mkzyf" }, "stable": { "version": [ @@ -115460,11 +116730,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20220115, - 1539 + 20220221, + 2005 ], - "commit": "e519713330fd2eebf9ee9d3ec695a32b567c587d", - "sha256": "1z26w72g4ckfa7gid6rb89fv08k76aqk5n8474zqs3sagrjjgqbr" + "commit": "cef1e26146c1b8b32fc5ce346f2cfa9861eb67d4", + "sha256": "198n2pikpvk65bqivw7f8bvy9j9mpc2149zxzqc16m2868l9ngsx" }, "stable": { "version": [ @@ -115783,6 +117053,39 @@ "sha256": "1vx4j9n5q4gmc63lk1l4gbz5j5qn2423cyfibqcbynkkbwgas11z" } }, + { + "ename": "zk", + "commit": "4ae4dee35fd931915f6162a8c2f46df21dd07c09", + "sha256": "0b8kcz415c5vl6cyw2ygi8znd6sq449rsba12znvlgc9gg3rhx05", + "fetcher": "github", + "repo": "localauthor/zk", + "unstable": { + "version": [ + 20220321, + 2050 + ], + "commit": "4c6426e5e26e6a4d375442660d4f78aaea1691f7", + "sha256": "056xx1xlq9hwfjbympkl517544n1gfs605q0c7jkixh2vs6ipydr" + } + }, + { + "ename": "zk-index", + "commit": "01d387bc059e5d81d59ab5705082c56971a80b34", + "sha256": "1rd4wpisrjc7ahyv3hinmv7nmma7xnacq1q35bnyyhsc0vv6rxs8", + "fetcher": "github", + "repo": "localauthor/zk", + "unstable": { + "version": [ + 20220312, + 2211 + ], + "deps": [ + "zk" + ], + "commit": "4c6426e5e26e6a4d375442660d4f78aaea1691f7", + "sha256": "056xx1xlq9hwfjbympkl517544n1gfs605q0c7jkixh2vs6ipydr" + } + }, { "ename": "zlc", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", @@ -116005,8 +117308,8 @@ 20201205, 1038 ], - "commit": "474ca4723517d95356145950b134652d5dc0c7f7", - "sha256": "0syr88kqzh27ap57v97prk2z0l9wkaysqf1263j7nn9pl4jswppd" + "commit": "1823f8431b36beae112a67f5b102e06afaaa52bf", + "sha256": "0mqz10ngfn2kyhm918gwx185zmmvzj47vha5dvwwkqxx28xcsfq6" }, "stable": { "version": [ @@ -116170,20 +117473,20 @@ "repo": "Vonfry/zoxide.el", "unstable": { "version": [ - 20211223, - 245 + 20220302, + 522 ], - "commit": "29508e94255c34174bc07c93749cad5d04700063", - "sha256": "12y0vqibb5sn9l42aiy1lm0cp0nl8d27zgql86va28glwzpma6s9" + "commit": "ecdcb62847b5e54ccd477d740e4974f28c8f5809", + "sha256": "1f4j53a1bm4kpgmlpfxnqb9zm8q0qxl7frxd8a0nqwfrxrzkqp8p" }, "stable": { "version": [ 1, - 1, + 2, 0 ], - "commit": "29508e94255c34174bc07c93749cad5d04700063", - "sha256": "12y0vqibb5sn9l42aiy1lm0cp0nl8d27zgql86va28glwzpma6s9" + "commit": "1ec22ca486aaa838828ec516e91f8880b478bd19", + "sha256": "1f4j53a1bm4kpgmlpfxnqb9zm8q0qxl7frxd8a0nqwfrxrzkqp8p" } }, { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index b6d556b445a0..82a1d6af8329 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -25,6 +25,8 @@ , srcRepo ? false, autoreconfHook ? null, texinfo ? null , siteStart ? ./site-start.el , nativeComp ? false +, withAthena ? false +, withToolkitScrollBars ? true , withPgtk ? false , withXinput2 ? false , withImageMagick ? lib.versionOlder version "27" && (withX || withNS) @@ -32,6 +34,7 @@ if withGTK2 then "gtk2" else if withGTK3 then "gtk3" else if withMotif then "motif" + else if withAthena then "athena" else "lucid") }: @@ -50,7 +53,8 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; } // { - inherit pname version; + pname = pname + lib.optionalString ( !withX && !withNS && !withGTK2 && !withGTK3 ) "-nox"; + inherit version; patches = patches fetchpatch; @@ -154,6 +158,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optional withImageMagick "--with-imagemagick" ++ lib.optional withPgtk "--with-pgtk" ++ lib.optional withXinput2 "--with-xinput2" + ++ lib.optional (!withToolkitScrollBars) "--without-toolkit-scroll-bars" ; installTargets = [ "tags" "install" ]; diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 7d060a972cdc..dfdf75627bff 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = version; - hash = "sha256-w4qCJgfBnN1PpPfhdsLdBpCRAWai9RrwU3LZl8DdEcw="; + hash = "sha256-NpgtxYqxMWMZXZRZjujob40Nn6hirsSzcjoqRJR6Rws="; }; nativeBuildInputs = [ qmake pkg-config qttools ]; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 0e2ffe46d208..8fd9f56a9d22 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -18,6 +18,7 @@ , json-glib , jsonrpc-glib , libdazzle +, libhandy , libpeas , libportal-gtk3 , libxml2 @@ -40,21 +41,20 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "41.3"; + version = "42.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "4iUPyOnp8gAsRS5ZUNgmhXNNPESAs1Fnq1CKyHAlCeE="; + sha256 = "Uu/SltaLL/GCNBwEgdz9cGVMQIvbZ5/Ot225cDwiQo8="; }; patches = [ - # Fix build with latest libportal - # https://gitlab.gnome.org/GNOME/gnome-builder/-/merge_requests/486 + # Fix appstream validation (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/b3bfa0df53a3749c3b73cb6c4bad5cab3fa549a1.patch"; - sha256 = "B/uCcYavFvOAPhLHZ4MRNENDd6VytILiGYwDZRUSxTE="; + url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/d7151679e0c925d27216256dc32fe67fb298d059.patch"; + sha256 = "vdNJawkqSBaFGRZvxzvjOryQpBL4jcN7tr1t3ihD7LA="; }) ]; @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { json-glib jsonrpc-glib libdazzle + libhandy libxml2 ostree pcre @@ -103,10 +104,6 @@ stdenv.mkDerivation rec { xvfb-run ]; - prePatch = '' - patchShebangs build-aux/meson/post_install.py - ''; - mesonFlags = [ "-Ddocs=true" @@ -122,6 +119,10 @@ stdenv.mkDerivation rec { # understand why. Somebody should look into fixing this. doCheck = true; + postPatch = '' + patchShebangs build-aux/meson/post_install.py + ''; + checkPhase = '' export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix deleted file mode 100644 index 7d1830c842b6..000000000000 --- a/pkgs/applications/editors/heme/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, lib, fetchurl, ncurses }: - -stdenv.mkDerivation rec { - pname = "heme"; - version = "0.4.2"; - src = fetchurl { - url = "mirror://sourceforge/project/heme/heme/heme-${version}/heme-${version}.tar.gz"; - sha256 = "0wsrnj5mrlazgqs4252k30aw8m86qw0z9dmrsli9zdxl7j4cg99v"; - }; - postPatch = '' - substituteInPlace Makefile \ - --replace "/usr/local" "$out" \ - --replace "CFLAGS = " "CFLAGS = -I${ncurses.dev}/include " \ - --replace "LDFLAGS = " "LDFLAGS = -L${ncurses.out}/lib " \ - --replace "-lcurses" "-lncurses" - ''; - buildInputs = [ ncurses ]; - preBuild = '' - mkdir -p $out/bin - mkdir -p $out/man/man1 - ''; - meta = with lib; { - description = "Portable and fast console hex editor for unix operating systems"; - homepage = "http://heme.sourceforge.net/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; - }; -} diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix index 82119ae91d18..424295b12c98 100644 --- a/pkgs/applications/editors/hexdino/default.nix +++ b/pkgs/applications/editors/hexdino/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform, ncurses }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "hexdino"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "Luz"; - repo = "hexdino"; - rev = "de5b5d7042129f57e0ab36416a06476126bce389"; - sha256 = "11mz07735gxqfamjcjjmxya6swlvr1p77sgd377zjcmd6z54gwyf"; + repo = pname; + rev = version; + sha256 = "1n8gizawx8h58hpyyqivp7vwy7yhn6scipl5rrbvkpnav8qpmk1r"; }; - cargoSha256 = "1hpndmpk1zlfvb4r95m13yvnsbjkwgw4pb9ala2d5yzfp38225nm"; + cargoSha256 = "01869b1d7gbsprcxxj7h9z16pvnzb02j2hywh97gfq5x96gnmkz3"; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/editors/jetbrains/darwin.nix b/pkgs/applications/editors/jetbrains/darwin.nix new file mode 100644 index 000000000000..f771894f533d --- /dev/null +++ b/pkgs/applications/editors/jetbrains/darwin.nix @@ -0,0 +1,36 @@ +{ lib +, stdenvNoCC +, undmg +, ... +}: + +{ meta +, pname +, product +, productShort ? product +, src +, version +, ... +}: + +let + loname = lib.toLower productShort; +in + stdenvNoCC.mkDerivation { + inherit pname meta src version; + desktopName = product; + installPhase = '' + runHook preInstall + APP_DIR="$out/Applications/${product}.app" + mkdir -p "$APP_DIR" + cp -Tr "${product}.app" "$APP_DIR" + mkdir -p "$out/bin" + cat << EOF > "$out/bin/${loname}" + open -na '$APP_DIR' --args "\$@" + EOF + chmod +x "$out/bin/${loname}" + runHook postInstall + ''; + nativeBuildInputs = [ undmg ]; + sourceRoot = "."; + } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 4922322f5589..f0ee51dde3c6 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -10,22 +10,32 @@ with lib; let - mkJetBrainsProduct = callPackage ./common.nix { inherit vmopts; }; + platforms = lib.platforms.linux ++ [ "x86_64-darwin" "aarch64-darwin" ]; + ideaPlatforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" "aarch64-darwin" ]; + + inherit (stdenv.hostPlatform) system; + + versions = builtins.fromJSON (readFile (./versions.json)); + versionKey = if stdenv.isLinux then "linux" else system; + products = versions.${versionKey} or (throw "Unsupported system: ${system}"); + + package = if stdenv.isDarwin then ./darwin.nix else ./linux.nix; + mkJetBrainsProduct = callPackage package { inherit vmopts; }; + # Sorted alphabetically - buildClion = { name, version, src, license, description, wmClass, ... }: + buildClion = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "CLion"; meta = with lib; { homepage = "https://www.jetbrains.com/clion/"; - inherit description license; + inherit description license platforms; longDescription = '' Enhancing productivity for every C and C++ developer on Linux, macOS and Windows. ''; maintainers = with maintainers; [ edwtjo mic92 ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ optionals (stdenv.isLinux) [ @@ -52,30 +62,29 @@ let ''; }); - buildDataGrip = { name, version, src, license, description, wmClass, ... }: + buildDataGrip = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "DataGrip"; meta = with lib; { homepage = "https://www.jetbrains.com/datagrip/"; - inherit description license; + inherit description license platforms; longDescription = '' DataGrip is a new IDE from JetBrains built for database admins. It allows you to quickly migrate and refactor relational databases, construct efficient, statically checked SQL queries and much more. ''; maintainers = with maintainers; [ ]; - platforms = platforms.linux; }; }); - buildGoland = { name, version, src, license, description, wmClass, ... }: + buildGoland = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "Goland"; meta = with lib; { homepage = "https://www.jetbrains.com/go/"; - inherit description license; + inherit description license platforms; longDescription = '' Goland is the codename for a new commercial IDE by JetBrains aimed at providing an ergonomic environment for Go development. @@ -83,10 +92,9 @@ let and tool integrations specific for the Go language ''; maintainers = [ maintainers.miltador ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { - postFixup = (attrs.postFixup or "") + '' + postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv @@ -98,10 +106,10 @@ let ''; }); - buildIdea = { name, version, src, license, description, wmClass, ... }: + buildIdea = { pname, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; - product = "IDEA"; + inherit pname version src wmClass jdk product; + productShort = "IDEA"; extraLdPath = [ zlib ]; extraWrapperArgs = [ ''--set M2_HOME "${maven}/maven"'' @@ -116,18 +124,18 @@ let with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ. ''; - maintainers = with maintainers; [ edwtjo gytis-ivaskevicius ]; - platforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ edwtjo gytis-ivaskevicius steinybot ]; + platforms = ideaPlatforms; }; }); - buildMps = { name, version, src, license, description, wmClass, ... }: + buildMps = { pname, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct rec { - inherit name version src wmClass jdk; - product = "MPS"; + inherit pname version src wmClass jdk product; + productShort = "MPS"; meta = with lib; { homepage = "https://www.jetbrains.com/mps/"; - inherit license description; + inherit license description platforms; longDescription = '' A metaprogramming system which uses projectional editing which allows users to overcome the limits of language @@ -135,34 +143,32 @@ let diagrams. ''; maintainers = with maintainers; [ rasendubi ]; - platforms = platforms.linux; }; }); - buildPhpStorm = { name, version, src, license, description, wmClass, ... }: + buildPhpStorm = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "PhpStorm"; meta = with lib; { homepage = "https://www.jetbrains.com/phpstorm/"; - inherit description license; + inherit description license platforms; longDescription = '' PhpStorm provides an editor for PHP, HTML and JavaScript with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code. ''; maintainers = with maintainers; [ schristo ma27 ]; - platforms = platforms.linux; }; }); - buildPycharm = { name, version, src, license, description, wmClass, ... }: + buildPycharm = { pname, version, src, license, description, wmClass, product, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; - product = "PyCharm"; + inherit pname version src wmClass jdk product; + productShort = "PyCharm"; meta = with lib; { homepage = "https://www.jetbrains.com/pycharm/"; - inherit description license; + inherit description license platforms; longDescription = '' Python IDE with complete set of tools for productive development with Python programming language. In addition, the @@ -177,19 +183,16 @@ let and productive development! ''; maintainers = with maintainers; [ ]; - platforms = platforms.linux; }; - }).override { - propagatedUserEnvPkgs = [ python3 ]; - }; + }); - buildRider = { name, version, src, license, description, wmClass, ... }: + buildRider = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "Rider"; meta = with lib; { homepage = "https://www.jetbrains.com/rider/"; - inherit description license; + inherit description license platforms; longDescription = '' JetBrains Rider is a new .NET IDE based on the IntelliJ platform and ReSharper. Rider supports .NET Core, @@ -199,7 +202,6 @@ let ASP.NET Core web applications. ''; maintainers = [ maintainers.miltador ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' @@ -209,33 +211,31 @@ let ''); }); - buildRubyMine = { name, version, src, license, description, wmClass, ... }: + buildRubyMine = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "RubyMine"; meta = with lib; { homepage = "https://www.jetbrains.com/ruby/"; - inherit description license; + inherit description license platforms; longDescription = description; maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; }; }); - buildWebStorm = { name, version, src, license, description, wmClass, ... }: + buildWebStorm = { pname, version, src, license, description, wmClass, ... }: (mkJetBrainsProduct { - inherit name version src wmClass jdk; + inherit pname version src wmClass jdk; product = "WebStorm"; meta = with lib; { homepage = "https://www.jetbrains.com/webstorm/"; - inherit description license; + inherit description license platforms; longDescription = '' WebStorm provides an editor for HTML, JavaScript (incl. Node.js), and CSS with on-the-fly code analysis, error prevention and automated refactorings for JavaScript code. ''; maintainers = with maintainers; [ abaldeau ]; - platforms = platforms.linux; }; }).overrideAttrs (attrs: { postPatch = (attrs.postPatch or "") + optionalString (stdenv.isLinux) '' @@ -244,163 +244,168 @@ let rm -r jbr ''; }); + in { # Sorted alphabetically clion = buildClion rec { - name = "clion-${version}"; - version = "2021.3.2"; /* updated by script */ + pname = "clion"; + version = products.clion.version; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "029xim3a6ijqdbzwxan189ydcy5b0ry2qqc70fipp8ic5z5iai3b"; /* updated by script */ + url = products.clion.url; + sha256 = products.clion.sha256; }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml }; datagrip = buildDataGrip rec { - name = "datagrip-${version}"; - version = "2021.3.3"; /* updated by script */ + pname = "datagrip"; + version = products.datagrip.version; description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0wbr7hjbj9zvxn4j7nrp7sdzjk78hcg7ssz430y35x9isfiqv5py"; /* updated by script */ + url = products.datagrip.url; + sha256 = products.datagrip.sha256; }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; }; goland = buildGoland rec { - name = "goland-${version}"; - version = "2021.3.2"; /* updated by script */ + pname = "goland"; + version = products.goland.version; description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0csc52wwqggdxc61qkmbs84hdvyj3x60rcv5jrxcwp3bjq94kskw"; /* updated by script */ + url = products.goland.url; + sha256 = products.goland.sha256; }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; }; idea-community = buildIdea rec { - name = "idea-community-${version}"; - version = "2021.3.1"; /* updated by script */ + pname = "idea-community"; + product = "IntelliJ IDEA CE"; + version = products.idea-community.version; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "19xxbjcn17n3fk1vdb31nihn9cv5q65wfxdan6dx7z0wq5c4x9zd"; /* updated by script */ + url = products.idea-community.url; + sha256 = products.idea-community.sha256; }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; }; idea-ultimate = buildIdea rec { - name = "idea-ultimate-${version}"; - version = "2021.3.1"; /* updated by script */ + pname = "idea-ultimate"; + product = "IntelliJ IDEA"; + version = products.idea-ultimate.version; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "0ys8f2h0qaj8s9ga94hg73vah552a6al4r1ypdp05f7j1m7lzajf"; /* updated by script */ + url = products.idea-ultimate.url; + sha256 = products.idea-ultimate.sha256; }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; }; mps = buildMps rec { - name = "mps-${version}"; - version = "2021.2.3"; /* updated by script */ - versionMajorMinor = "2021.2"; /* updated by script */ + pname = "mps"; + product = "MPS ${products.mps.version-major-minor}"; + version = products.mps.version; description = "Create your own domain-specific language"; license = lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/mps/${versionMajorMinor}/MPS-${version}.tar.gz"; - sha256 = "1j33b48ki1xw7xb1hr8k2jz7d78h0qcr1b5gql7i40d7szq0iy10"; /* updated by script */ + url = products.mps.url; + sha256 = products.mps.sha256; }; wmClass = "jetbrains-mps"; update-channel = "MPS RELEASE"; }; phpstorm = buildPhpStorm rec { - name = "phpstorm-${version}"; - version = "2021.3.1"; /* updated by script */ + pname = "phpstorm"; + version = products.phpstorm.version; description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "011i3jgfnb2h64ikbm3wi1vfhzm50mwwy9nksl71nzllj3kz111x"; /* updated by script */ + url = products.phpstorm.url; + sha256 = products.phpstorm.sha256; }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; }; pycharm-community = buildPycharm rec { - name = "pycharm-community-${version}"; - version = "2021.3.1"; /* updated by script */ + pname = "pycharm-community"; + product = "PyCharm CE"; + version = products.pycharm-community.version; description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1xd88rd1w3ghkm6jq8ilhhjy972qfm57si581rnsjpz65rj6xpgm"; /* updated by script */ + url = products.pycharm-community.url; + sha256 = products.pycharm-community.sha256; }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; }; pycharm-professional = buildPycharm rec { - name = "pycharm-professional-${version}"; - version = "2021.3.1"; /* updated by script */ + pname = "pycharm-professional"; + product = "PyCharm"; + version = products.pycharm-professional.version; description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0639mzjh1hw158gmf4qqld03371z60k3xyca21l1pnv3551svd6d"; /* updated by script */ + url = products.pycharm-professional.url; + sha256 = products.pycharm-professional.sha256; }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; }; rider = buildRider rec { - name = "rider-${version}"; - version = "2021.3.2"; /* updated by script */ + pname = "rider"; + version = products.rider.version; description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "0arnh9wlw874jqlgad00q0nf1kjp7pvb4xixwrb6v1l9fbr9nsan"; /* updated by script */ + url = products.rider.url; + sha256 = products.rider.sha256; }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; }; ruby-mine = buildRubyMine rec { - name = "ruby-mine-${version}"; - version = "2021.3.1"; /* updated by script */ + pname = "ruby-mine"; + version = products.ruby-mine.version; description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1xax3738myxjzm0p8zm8aaa2nw0336h80nrm9dqby2j7dass2jnm"; /* updated by script */ + url = products.ruby-mine.url; + sha256 = products.ruby-mine.sha256; }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; }; webstorm = buildWebStorm rec { - name = "webstorm-${version}"; - version = "2021.3.1"; /* updated by script */ + pname = "webstorm"; + version = products.webstorm.version; description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1f918cj76b79x0d2hhv78mvmki5d1dps8nsx7i50wn2qzdml4kc6"; /* updated by script */ + url = products.webstorm.url; + sha256 = products.webstorm.sha256; }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/linux.nix similarity index 61% rename from pkgs/applications/editors/jetbrains/common.nix rename to pkgs/applications/editors/jetbrains/linux.nix index b3145f342c9b..55ed0e6829e5 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -3,42 +3,37 @@ , vmopts ? null }: -{ name, product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: +{ pname, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: with lib; -let loName = toLower product; - hiName = toUpper product; - mainProgram = concatStringsSep "-" (init (splitString "-" name)); +let loName = toLower productShort; + hiName = toUpper productShort; vmoptsName = loName - + ( if (with stdenv.hostPlatform; (is32bit || isDarwin)) - then "" - else "64" ) + + lib.optionalString stdenv.hostPlatform.is64bit "64" + ".vmoptions"; in with stdenv; lib.makeOverridable mkDerivation (rec { - inherit name src; - meta = args.meta // { inherit mainProgram; }; + inherit pname version src; + meta = args.meta // { mainProgram = pname; }; desktopItem = makeDesktopItem { - name = mainProgram; - exec = mainProgram; + name = pname; + exec = pname; comment = lib.replaceChars ["\n"] [" "] meta.longDescription; desktopName = product; genericName = meta.description; - categories = "Development;"; - icon = mainProgram; - extraEntries = '' - StartupWMClass=${wmClass} - ''; + categories = [ "Development" ]; + icon = pname; + startupWMClass = wmClass; }; vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts); nativeBuildInputs = [ makeWrapper patchelf unzip ]; - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = '' get_file_size() { local fname="$1" echo $(ls -l $fname | cut -d ' ' -f5) @@ -66,26 +61,26 @@ with stdenv; lib.makeOverridable mkDerivation (rec { installPhase = '' runHook preInstall - mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}} - cp -a . $out/$name - ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png - mv bin/fsnotifier* $out/libexec/${name}/. + mkdir -p $out/{bin,$pname,share/pixmaps,libexec/${pname}} + cp -a . $out/$pname + ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png + mv bin/fsnotifier* $out/libexec/${pname}/. jdk=${jdk.home} item=${desktopItem} - makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${mainProgram}" \ - --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + makeWrapper "$out/$pname/bin/${loName}.sh" "$out/bin/${pname}" \ + --prefix PATH : "$out/libexec/${pname}:${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([ # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret e2fsprogs libnotify ] ++ extraLdPath)}" \ ${lib.concatStringsSep " " extraWrapperArgs} \ - --set JDK_HOME "$jdk" \ + --set-default JDK_HOME "$jdk" \ + --set-default ANDROID_JAVA_HOME "$jdk" \ + --set-default JAVA_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ - --set ANDROID_JAVA_HOME "$jdk" \ - --set JAVA_HOME "$jdk" \ --set ${hiName}_VM_OPTIONS ${vmoptsFile} ln -s "$item/share/applications" $out/share diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl deleted file mode 100755 index 201c51094dc3..000000000000 --- a/pkgs/applications/editors/jetbrains/update.pl +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i perl -p perl perlPackages.LWPProtocolHttps perlPackages.FileSlurp - -use strict; -use List::Util qw(reduce); -use File::Slurp; -use LWP::Simple; - -my $only_free = grep { $_ eq "--only-free" } @ARGV; - -sub semantic_less { - my ($a, $b) = @_; - $a =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg; - $b =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg; - return $a lt $b; -} - -sub get_latest_versions { - my @channels = get("https://www.jetbrains.com/updates/updates.xml") =~ /()/gs; - my %h = {}; - for my $ch (@channels) { - my ($id) = $ch =~ /^)/gs; - my $latest_build = reduce { - my ($aversion) = $a =~ /^]*version="([^"]+)"/; die "no version in $a" unless $aversion; - my ($bversion) = $b =~ /^]*version="([^"]+)"/; die "no version in $b" unless $bversion; - semantic_less($aversion, $bversion) ? $b : $a; - } @builds; - next unless $latest_build; - - # version as in download url - my ($version) = $latest_build =~ /^]*version="([^"]+)"/; - my ($fullNumber) = $latest_build =~ /^]*fullNumber="([^"]+)"/; - my $latest_version_full1 = "$version-$fullNumber"; - $latest_version_full1 =~ s/\s*EAP//; - - my ($latest_version) = $latest_build =~ /^]*version="([^"]+)"/; - ($latest_version) = $latest_build =~ /^]*fullNumber="([^"]+)"/ if $latest_version =~ / /; - - $h{$id} = $latest_version; - $h{"full1_" . $id} = $latest_version_full1; - } - return %h; -} - -my %latest_versions = get_latest_versions(); -# for my $ch (sort keys %latest_versions) { -# print("$ch $latest_versions{$ch}\n"); -# } - -sub update_nix_block { - my ($block) = @_; - my ($channel) = $block =~ /update-channel\s*=\s*"([^"]+)"/; - if ($channel) { - if ($latest_versions{$channel}) { - my ($version) = $block =~ /version\s*=\s*"([^"]+)"/; - die "no version in $block" unless $version; - if ($version eq $latest_versions{$channel}) { - print("$channel is up to date at $version\n"); - } elsif ($only_free && $block =~ /licenses\.unfree/) { - print("$channel is unfree, skipping\n"); - } else { - my $version_string = $latest_versions{$channel}; - my $versionMajorMinor = $version_string =~ s/^([0-9]+[.][0-9]+).*/$1/r; - - print("updating $channel: $version -> $version_string\n"); - my ($url) = $block =~ /url\s*=\s*"([^"]+)"/; - # try to interpret some nix - my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; - $name =~ s/\$\{version\}/$version_string/; - # Some url pattern contain variables more than once - $url =~ s/\$\{name\}/$name/g; - $url =~ s/\$\{version\}/$version_string/g; - $url =~ s/\$\{versionMajorMinor\}/$versionMajorMinor/g; - die "$url still has some interpolation" if $url =~ /\$/; - my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; - unless ( $sha256 ) { - my $full_version = $latest_versions{"full1_" . $channel}; - $url =~ s/$version_string/$full_version/; - ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; - $version_string = $full_version; - } - die "invalid sha256 in $url.sha256" unless $sha256; - my ($sha256Base32) = readpipe("nix-hash --type sha256 --to-base32 $sha256"); - chomp $sha256Base32; - print "Jetbrains published SHA256: $sha256\n"; - print "Conversion into base32 yields: $sha256Base32\n"; - $block =~ s#version\s*=\s*"([^"]+)".+$#version = "$version_string"; /* updated by script */#m; - $block =~ s#versionMajorMinor\s*=\s*"([^"]+)".+$#versionMajorMinor = "$versionMajorMinor"; /* updated by script */#m; - $block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256Base32"; /* updated by script */#m; - } - } else { - warn "unknown update-channel $channel"; - } - } - return $block; -} - -my $nix = read_file 'default.nix'; -$nix =~ s/(= build\w+ rec \{.+?\n \};\n)/update_nix_block($1)/gse; -write_file 'default.nix', $nix; diff --git a/pkgs/applications/editors/jetbrains/update.py b/pkgs/applications/editors/jetbrains/update.py new file mode 100755 index 000000000000..5301a85ba9a2 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/update.py @@ -0,0 +1,97 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 python3.pkgs.packaging python3.pkgs.requests python3.pkgs.xmltodict +import hashlib +import json +import pathlib +import logging +import requests +import sys +import xmltodict +from packaging import version + +updates_url = "https://www.jetbrains.com/updates/updates.xml" +versions_file_path = pathlib.Path(__file__).parent.joinpath("versions.json").resolve() + +logging.basicConfig(stream=sys.stdout, level=logging.DEBUG) + + +def one_or_more(x): + return x if isinstance(x, list) else [x] + + +def download_channels(): + logging.info("Checking for updates from %s", updates_url) + updates_response = requests.get(updates_url) + updates_response.raise_for_status() + root = xmltodict.parse(updates_response.text) + products = root["products"]["product"] + return { + channel["@name"]: channel + for product in products + for channel in one_or_more(product["channel"]) + } + + +def build_version(build): + return version.parse(build["@version"]) + + +def latest_build(channel): + builds = one_or_more(channel["build"]) + latest = max(builds, key=build_version) + return latest + + +def download_sha256(url): + download_response = requests.get(url) + download_response.raise_for_status() + h = hashlib.sha256() + h.update(download_response.content) + return h.hexdigest() + + +channels = download_channels() + + +def update_product(name, product): + update_channel = product["update-channel"] + logging.info("Updating %s", name) + channel = channels.get(update_channel) + if channel is None: + logging.error("Failed to find channel %s.", update_channel) + logging.error("Check that the update-channel in %s matches the name in %s", versions_file_path, updates_url) + else: + try: + build = latest_build(channel) + version = build["@version"] + parsed_version = build_version(build) + version_major_minor = f"{parsed_version.major}.{parsed_version.minor}" + download_url = product["url-template"].format(version = version, versionMajorMinor = version_major_minor) + product["url"] = download_url + product["version-major-minor"] = version_major_minor + if "sha256" not in product or product.get("version") != version: + logging.info("Found a newer version %s.", version) + product["version"] = version + product["sha256"] = download_sha256(download_url) + else: + logging.info("Already at the latest version %s.", version) + except Exception as e: + logging.exception("Update failed:", exc_info=e) + logging.warning("Skipping %s due to the above error.", name) + logging.warning("It may be out-of-date. Fix the error and rerun.") + + +def update_products(products): + for name, product in products.items(): + update_product(name, product) + + +with open(versions_file_path, "r") as versions_file: + versions = json.load(versions_file) + +for products in versions.values(): + update_products(products) + +with open(versions_file_path, "w") as versions_file: + json.dump(versions, versions_file, indent=2) + versions_file.write("\n") diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json new file mode 100644 index 000000000000..83f486edfcf9 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -0,0 +1,296 @@ +{ + "linux": { + "clion": { + "update-channel": "CLion RELEASE", + "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", + "version": "2021.3.3", + "sha256": "35986be8adfe0a291a0d2d550c1bf4861ae6c33ecbc71198a472e0ac01a0f10d", + "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.tar.gz", + "version-major-minor": "2021.3" + }, + "datagrip": { + "update-channel": "DataGrip RELEASE", + "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", + "version": "2021.3.4", + "sha256": "a34670f1a6c77e00237302a70f22fb5bf089dfe128341fd89b2f25bb8becb325", + "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.tar.gz", + "version-major-minor": "2021.3" + }, + "goland": { + "update-channel": "GoLand RELEASE", + "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", + "version": "2021.3.3", + "sha256": "9d2b709703516eddeb7f4d6568a7de2e268de4258c7bc7787baee806fbaee4a3", + "url": "https://download.jetbrains.com/go/goland-2021.3.3.tar.gz", + "version-major-minor": "2021.3" + }, + "idea-community": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "99e2225846d118e3190023abc65c8b2c62a1d1463f601c79a20b9494c54a08c9", + "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "idea-ultimate": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz", + "version": "2021.3.2", + "sha256": "face5d154a2c9244b278bfc6dca37218ae3344090526a0679086eff9b0c56670", + "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2-no-jbr.tar.gz", + "version-major-minor": "2021.3" + }, + "mps": { + "update-channel": "MPS RELEASE", + "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", + "version": "2021.3", + "sha256": "e9aeb62f0d667dd285f808e3ba308f572797dbf11d51e9aa06cf49481bee857f", + "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3.tar.gz", + "version-major-minor": "2021.3" + }, + "phpstorm": { + "update-channel": "PhpStorm RELEASE", + "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "761b347142035e8b74cc5a9939100af9d45f1f6ee29de1e78cd6b1ff06fe20e2", + "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "pycharm-community": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "f1ae01f471d01c6f09aab0a761c6dea9834ef584f2aaf6d6ebecdce6b55a66e8", + "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "pycharm-professional": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "6bd9573a84c1f2ae6b9b6612f0859aee21133f479ace43602dc0af879f9d9e67", + "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "rider": { + "update-channel": "Rider RELEASE", + "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", + "version": "2021.3.3", + "sha256": "1dc57d5d7932d4a8dea51fc5cbdaa52f9626490092978f02fa15bb41cb84068f", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.tar.gz", + "version-major-minor": "2021.3" + }, + "ruby-mine": { + "update-channel": "RubyMine RELEASE", + "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "697510ee2401bb7cbe75193f015d8c2dd1677117defbc2a6f5f3c1443f20dea2", + "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + }, + "webstorm": { + "update-channel": "WebStorm RELEASE", + "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", + "version": "2021.3.2", + "sha256": "18a53c1b1b92e9b7e516b425a390f23f46b880a704d1cb223d1ba64410b15060", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.tar.gz", + "version-major-minor": "2021.3" + } + }, + "x86_64-darwin": { + "clion": { + "update-channel": "CLion RELEASE", + "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", + "version": "2021.3.3", + "sha256": "342a4d8549ae4623a5edfa7f9737887cf0a25c1a61bb414b54b742b1c5a1a84d", + "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3.dmg", + "version-major-minor": "2021.3" + }, + "datagrip": { + "update-channel": "DataGrip RELEASE", + "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", + "version": "2021.3.4", + "sha256": "27e709d2ced66d37a615d8c56885828e49a08962708e28df1a20f324c626bf52", + "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4.dmg", + "version-major-minor": "2021.3" + }, + "goland": { + "update-channel": "GoLand RELEASE", + "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", + "version": "2021.3.3", + "sha256": "4b245b6fe0cf588adbf36e68f12397d5fd311b0b6d49f17ba374ebaa10d207c9", + "url": "https://download.jetbrains.com/go/goland-2021.3.3.dmg", + "version-major-minor": "2021.3" + }, + "idea-community": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", + "version": "2021.3.2", + "sha256": "20d8cee2bbedaeb0ea388f795e13d08eca5b59e59d4e980ac2d8bc07c9fed3e9", + "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "idea-ultimate": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", + "version": "2021.3.2", + "sha256": "9f574562b866e6ccc3d2f9b4c245c45844d1d0fd54be3dbdcc893d40ba1cf54a", + "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "mps": { + "update-channel": "MPS RELEASE", + "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", + "version": "2021.3", + "sha256": "2c5517518fec31ac960e4309fa848ad831f9048ef15df1b362e12aa8f41d9dbd", + "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3-macos.dmg", + "version-major-minor": "2021.3" + }, + "phpstorm": { + "update-channel": "PhpStorm RELEASE", + "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", + "version": "2021.3.2", + "sha256": "596a9d5fdc30d5fba65ddd482da90f9d555fed748b930587562022bfe7df4e14", + "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-community": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", + "version": "2021.3.2", + "sha256": "b8f41f5dddeda0ed5f5c81ba57d2560ccc6e227987882fb6bf305b5d1d8c6909", + "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-professional": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", + "version": "2021.3.2", + "sha256": "188b998660e7cfb7ac1364c818c008a5608ab2aeb17c6cc19d1d9dda547d3775", + "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "rider": { + "update-channel": "Rider RELEASE", + "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", + "version": "2021.3.3", + "sha256": "41a0939cb6258a0fb303268c5a466a663cf3588af14bcbb351be4c3a1d158094", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3.dmg", + "version-major-minor": "2021.3" + }, + "ruby-mine": { + "update-channel": "RubyMine RELEASE", + "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", + "version": "2021.3.2", + "sha256": "ba27c14b21d66ca96a64ceb7dc5d9f0952254a5f405b3201f51d2ad3cc749a96", + "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2.dmg", + "version-major-minor": "2021.3" + }, + "webstorm": { + "update-channel": "WebStorm RELEASE", + "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", + "version": "2021.3.2", + "sha256": "932d4920f831d1ceae68a474444c37d986277d8d3288d3aab93dd43d99336a36", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2.dmg", + "version-major-minor": "2021.3" + } + }, + "aarch64-darwin": { + "clion": { + "update-channel": "CLion RELEASE", + "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", + "version": "2021.3.3", + "sha256": "fbf651fa4a5925fe729be30ca8a6fa3be84dc4d7827dbcf74f4d28c52b903cc2", + "url": "https://download.jetbrains.com/cpp/CLion-2021.3.3-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "datagrip": { + "update-channel": "DataGrip RELEASE", + "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", + "version": "2021.3.4", + "sha256": "7a77ba9fce56c781ae6a4fc65eaab4bcc10780b6bd679b04d74146719e42890a", + "url": "https://download.jetbrains.com/datagrip/datagrip-2021.3.4-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "goland": { + "update-channel": "GoLand RELEASE", + "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", + "version": "2021.3.3", + "sha256": "54397d48e20fb534206e13f84b35868b1eaea13175176487b1239b23db4e13db", + "url": "https://download.jetbrains.com/go/goland-2021.3.3-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "idea-community": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "79e540fb0cd480837b3a954e4802f4f252073955393e8927c9c1b28c37112d51", + "url": "https://download.jetbrains.com/idea/ideaIC-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "idea-ultimate": { + "update-channel": "IntelliJ IDEA RELEASE", + "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "511c6aed9c5cd4c7665a9bac9ba94582977013244cbe88b820eb5464fce91a1c", + "url": "https://download.jetbrains.com/idea/ideaIU-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "mps": { + "update-channel": "MPS RELEASE", + "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", + "version": "2021.3", + "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3-macos-aarch64.dmg", + "sha256": "3ace6d45db718dffd80bf126a76735fb65099de292112a01cc078aa61c475a70", + "version-major-minor": "2021.3" + }, + "phpstorm": { + "update-channel": "PhpStorm RELEASE", + "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "ba15c3f843c85141a9adaec1c4611224a853bd98649148751e34ac304591a314", + "url": "https://download.jetbrains.com/webide/PhpStorm-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-community": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "407bf395cfb6d61f1c0861c7679b197238780e82a019e10162b8cd7130edb15a", + "url": "https://download.jetbrains.com/python/pycharm-community-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "pycharm-professional": { + "update-channel": "PyCharm RELEASE", + "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "12fa34d1e60a555bac230acea9cd46c7adfe9ca42ff3e458c79d33e5b88eb8db", + "url": "https://download.jetbrains.com/python/pycharm-professional-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "rider": { + "update-channel": "Rider RELEASE", + "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", + "version": "2021.3.3", + "sha256": "65603860d1fd3134c5659f5a06de7cac17f3183a01056b79cfe72242b99adb37", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2021.3.3-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "ruby-mine": { + "update-channel": "RubyMine RELEASE", + "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "33773222b2fa14300de5ed12ca96c3442b933f66cef67cebc9610e5cef51c75e", + "url": "https://download.jetbrains.com/ruby/RubyMine-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + }, + "webstorm": { + "update-channel": "WebStorm RELEASE", + "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", + "version": "2021.3.2", + "sha256": "f4788ec0c55123b1f4e14934792f65bf8040e2a2ee673e985b50b8feded60408", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2021.3.2-aarch64.dmg", + "version-major-minor": "2021.3" + } + } +} diff --git a/pkgs/applications/editors/jove/default.nix b/pkgs/applications/editors/jove/default.nix index 0faf03659c77..2280c6d9e617 100644 --- a/pkgs/applications/editors/jove/default.nix +++ b/pkgs/applications/editors/jove/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Jonathan's Own Version or Emacs"; + description = "Jonathan's Own Version of Emacs"; homepage = "https://github.com/jonmacs/jove"; license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index 9db38d144489..7a1c997a7c53 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -32,7 +32,8 @@ rec { ''; sizedLogo = size: stdenv.mkDerivation { - name = ''octave-logo-${octave.version}-${size}x${size}.png''; + pname = "octave-logo-${size}x${size}.png"; + inherit (octave) version; src = octave.src; diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py index 9f5f64f9e5b3..dd8765db28a4 100755 --- a/pkgs/applications/editors/kakoune/plugins/update.py +++ b/pkgs/applications/editors/kakoune/plugins/update.py @@ -15,7 +15,7 @@ from typing import List, Tuple from pathlib import Path # Import plugin update library from maintainers/scripts/pluginupdate.py -ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) +ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # type: ignore sys.path.insert( 0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts") ) @@ -42,7 +42,7 @@ HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/ class KakouneEditor(pluginupdate.Editor): - def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): + def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) with open(outfile, "w+") as f: diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 7a9b030e8217..8308830efccc 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -1,14 +1,12 @@ -{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: stdenv.mkDerivation rec { pname = "kdev-php"; version = "5.6.2"; - src = fetchFromGitHub { - owner = "KDE"; - repo = "kdev-php"; - rev = "v${version}"; - sha256 = "sha256-hEumH7M6yAuH+jPShOmbKjHmuPRg2djaVy9Xt28eK38="; + src = fetchurl { + url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz"; + hash = "sha256-8Qg9rsK4x1LeGgRB0Pn3InSx4tKccjAF7Xjc+Lpxfgw="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 03d3fce67e76..374b4224ca6b 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -1,14 +1,12 @@ -{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: stdenv.mkDerivation rec { pname = "kdev-python"; version = "5.6.2"; - src = fetchFromGitHub { - owner = "KDE"; - repo = "kdev-python"; - rev = "v${version}"; - sha256 = "sha256-xYElqpJjRtBRIyZGf6JaCvurQ+QrGrdLHxtuANYfCds="; + src = fetchurl { + url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz"; + hash = "sha256-IPm3cblhJi3tmGpPMrjSWa2fe8SLsp6sCl1YU74dkX8="; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index 38fb55ecf7bf..e975678591c7 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -39,7 +39,7 @@ in comment = "Kode Studio is an IDE for Kha based on Visual Studio Code"; desktopName = "Kode Studio"; genericName = "Text Editor"; - categories = "GNOME;GTK;Utility;TextEditor;Development;"; + categories = [ "GNOME" "GTK" "Utility" "TextEditor" "Development" ]; }; sourceRoot = "."; diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix new file mode 100644 index 000000000000..2653806a14f3 --- /dev/null +++ b/pkgs/applications/editors/lapce/default.nix @@ -0,0 +1,83 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, cmake +, pkg-config +, python3 +, perl +, freetype +, fontconfig +, libxkbcommon +, xcbutil +, libX11 +, libXcursor +, libXrandr +, libXi +, vulkan-loader +, copyDesktopItems +, makeDesktopItem +}: + +rustPlatform.buildRustPackage rec { + pname = "lapce"; + version = "0.0.10"; + + src = fetchFromGitHub { + owner = "lapce"; + repo = pname; + rev = "v${version}"; + sha256 = "tOVFm4DFQurFU4DtpPwxXQLbTGCZnrV1FfYKtvkRxRE="; + }; + + cargoPatches = [ ./fix-version.patch ]; + + cargoSha256 = "BwB3KgmI5XnZ5uHv6f+kGKBzpyxPWcoKvF7qw90eorI="; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + perl + copyDesktopItems + ]; + + buildInputs = [ + freetype + fontconfig + libxkbcommon + xcbutil + libX11 + libXcursor + libXrandr + libXi + vulkan-loader + ]; + + # Add missing vulkan dependency to rpath + preFixup = '' + patchelf --add-needed ${vulkan-loader}/lib/libvulkan.so.1 $out/bin/lapce + ''; + + postInstall = '' + install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/lapce.svg + ''; + + desktopItems = [ (makeDesktopItem { + name = "lapce"; + exec = "lapce %F"; + icon = "lapce"; + desktopName = "Lapce"; + comment = meta.description; + genericName = "Code Editor"; + categories = [ "Development" "Utility" "TextEditor" ]; + }) ]; + + meta = with lib; { + description = "Lightning-fast and Powerful Code Editor written in Rust"; + homepage = "https://github.com/lapce/lapce"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ elliot ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/editors/lapce/fix-version.patch b/pkgs/applications/editors/lapce/fix-version.patch new file mode 100644 index 000000000000..2a8d96be1696 --- /dev/null +++ b/pkgs/applications/editors/lapce/fix-version.patch @@ -0,0 +1,31 @@ +diff --git a/Cargo.lock b/Cargo.lock +index bc9a0f8..45a74ad 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2165,7 +2165,7 @@ dependencies = [ + + [[package]] + name = "lapce" +-version = "0.0.9" ++version = "0.0.10" + dependencies = [ + "lapce-core", + "lapce-proxy", +@@ -2173,7 +2173,7 @@ dependencies = [ + + [[package]] + name = "lapce-core" +-version = "0.0.9" ++version = "0.0.10" + dependencies = [ + "Inflector", + "alacritty_terminal 0.15.0", +@@ -2233,7 +2233,7 @@ dependencies = [ + + [[package]] + name = "lapce-proxy" +-version = "0.0.9" ++version = "0.0.10" + dependencies = [ + "alacritty_terminal 0.16.0-rc2", + "anyhow", diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index ee22c591ad77..efe431c33966 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.5"; + version = "6.6-b2"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-f237oXhnu6OtGVhIFDswFwfjcLgYWvLNRtVW4SChFzU="; + sha256 = "sha256-oUOsAYcxknG+bao76bzPhStO1m08pMWTEEiG2rLkklA="; }; dontBuild = true; @@ -24,11 +24,9 @@ mkDerivation rec { comment = meta.description; desktopName = "Leo"; genericName = "Text Editor"; - categories = lib.concatStringsSep ";" [ - "Application" "Development" "IDE" - ]; - startupNotify = "false"; - mimeType = lib.concatStringsSep ";" [ + categories = [ "Application" "Development" "IDE" ]; + startupNotify = false; + mimeTypes = [ "text/plain" "text/asp" "text/x-c" "text/x-script.elisp" "text/x-fortran" "text/html" "application/inf" "text/x-java-source" "application/x-javascript" "application/javascript" "text/ecmascript" "application/x-ksh" "text/x-script.ksh" diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index a468e34393cd..b19c3f531b7a 100644 --- a/pkgs/applications/editors/lite-xl/default.nix +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lite-xl"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "lite-xl"; repo = "lite-xl"; rev = "v${version}"; - sha256 = "sha256-yMdfJ8qE2Tv+CtvbPN6todzY/pDrYo+vaBeppuUt5F4="; + sha256 = "sha256-7ppO5ITijhJ37OL6xlQgu1SaQ/snXDH5xJOwuXZNUVA="; }; patches = [ diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index c3c42ac24cba..d9805cbb36a9 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, callPackage }: buildGoModule rec { pname = "micro"; @@ -24,6 +24,8 @@ buildGoModule rec { install -Dt $out/share/applications assets/packaging/micro.desktop ''; + passthru.tests.expect = callPackage ./test-with-expect.nix {}; + meta = with lib; { homepage = "https://micro-editor.github.io"; description = "Modern and intuitive terminal-based text editor"; diff --git a/pkgs/applications/editors/micro/test-with-expect.nix b/pkgs/applications/editors/micro/test-with-expect.nix new file mode 100644 index 000000000000..d3e1d60e0874 --- /dev/null +++ b/pkgs/applications/editors/micro/test-with-expect.nix @@ -0,0 +1,30 @@ +{ micro, expect, runCommand, writeScript, runtimeShell }: + +let expect-script = writeScript "expect-script" '' + #!${expect}/bin/expect -f + + spawn micro file.txt + expect "file.txt" + + send "Hello world!" + expect "Hello world!" + + # Send ctrl-q (exit) + send "\021" + + expect "Save changes to file.txt before closing?" + send "y" + + expect eof +''; in +runCommand "micro-test-expect" +{ + nativeBuildInputs = [ micro expect ]; + passthru = { inherit expect-script; }; +} '' + # Micro really wants a writable $HOME for its config directory. + export HOME=$(pwd) + expect -f ${expect-script} + grep "Hello world!" file.txt + touch $out +'' diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix index 4365c172f48f..79595a00c262 100644 --- a/pkgs/applications/editors/moe/default.nix +++ b/pkgs/applications/editors/moe/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "moe"; - version = "1.11"; + version = "1.12"; src = fetchurl { url = "mirror://gnu/moe/${pname}-${version}.tar.lz"; - sha256 = "sha256-DvvLz1pKjZZlQcbLCZugq2QWeANm286C2f+ZWoWl4vk="; + sha256 = "sha256-iohfK+Qm+OBK05yWASvYYJVAhaI3RPJFFmMWiCbXoeg="; }; prePatch = '' diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix deleted file mode 100644 index 12b66370d506..000000000000 --- a/pkgs/applications/editors/monodevelop/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib, stdenv, fetchurl -, autoconf, automake, pkg-config, shared-mime-info, intltool -, glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip -, dotnetPackages -}: - -stdenv.mkDerivation rec { - version = "5.9.4.5"; - revision = "8010a90f6e246b32364e3fb46ef2c9d1be9c9a2b"; - pname = "monodevelop"; - - src = fetchurl { - url = "https://download.mono-project.com/sources/monodevelop/${pname}-${version}.tar.bz2"; - sha256 = "0bim4bfv3zwijafl9g0cx3159zq43dlcv74mnyrda41j4p52w5ji"; - }; - - nunit2510 = fetchurl { - url = "https://launchpad.net/nunitv2/2.5/2.5.10/+download/NUnit-2.5.10.11092.zip"; - sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc"; - }; - - postPatch = '' - # From https://bugzilla.xamarin.com/show_bug.cgi?id=23696#c19 - - # cecil needs NUnit 2.5.10 - this is also missing from the tar - unzip -j ${nunit2510} -d external/cecil/Test/libs/nunit-2.5.10 NUnit-2.5.10.11092/bin/net-2.0/framework/\* - - # the tar doesn't include the nuget binary, so grab it from github and copy it - # into the right place - cp -vfR "$(dirname $(pkg-config NuGet.Core --variable=Libraries))"/* external/nuget-binary/ - ''; - - # Revert this commit which broke the ability to use pkg-config to locate dlls - patchFlags = [ "-p2" ]; - patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ]; - - nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ - autoconf automake shared-mime-info intltool - mono gtk-sharp-2_0 gnome-sharp - dotnetPackages.NUnit - dotnetPackages.NUnitRunners - dotnetPackages.Nuget - ]; - - preConfigure = "patchShebangs ./configure"; - - preBuild = '' - cat > ./buildinfo < export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX - > export PATH=${mono}/bin:\$PATH - > export LD_LIBRARY_PATH=${lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH - > - EOF - done - - # Without this, you get a missing DLL error any time you install an addin.. - ln -sv `pkg-config nunit.core --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit - ln -sv `pkg-config nunit.core.interfaces --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit - ln -sv `pkg-config nunit.framework --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit - ln -sv `pkg-config nunit.util --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit - ''; - - dontStrip = true; - - meta = with lib; { - platforms = platforms.linux; - maintainers = with maintainers; [ obadz ]; - broken = true; # 2018-09-21, build has failed since 2018-03-08 - }; -} diff --git a/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch b/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch deleted file mode 100644 index 969aad33ec0b..000000000000 --- a/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj -index 02d3a01..c6daaad 100644 ---- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj -+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj -@@ -452,34 +452,6 @@ - - PreserveNewest - -- -- System.Web.Mvc.dll -- PreserveNewest -- -- -- System.Web.Razor.dll -- PreserveNewest -- -- -- System.Web.Helpers.dll -- PreserveNewest -- -- -- System.Web.WebPages.Deployment.dll -- PreserveNewest -- -- -- System.Web.WebPages.dll -- PreserveNewest -- -- -- System.Web.WebPages.Razor.dll -- PreserveNewest -- -- -- Microsoft.Web.Infrastructure.dll -- PreserveNewest -- - - - -diff --git a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml -index eab7c32..4a75311 100644 ---- a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml -+++ b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml -@@ -1,13 +1,6 @@ - - - -- -- -- -- -- -- -- - - - diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index b76e4fa0a7b5..3605f6c6e4e2 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -2,11 +2,11 @@ let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; if stdenv.hostPlatform.system == "i686-linux" then - { arch = "x86"; sha256 = "afa4b1116aee18e3ddd93132467809d0bcf03715cf9ad55b895f021a13e1cb8a"; } + { arch = "x86"; sha256 = "sha256-k4FQrt72VNb5FdYMzxskcVhKlvx8MZelUlLCItxDB7c="; } else - { arch = "x86_64"; sha256 = "55ab653c601727a2077080e7ea4d76fe7a897379934ed9a5b544e20d490f53f9"; }; + { arch = "x86_64"; sha256 = "sha256-mj5wVQlY2xFzdulvMdb5Qb5HGwr7RElzIkpOLjaAfGA="; }; in stdenv.mkDerivation rec { - version = "1.5.4"; + version = "1.5.5"; pname = "tuxguitar"; src = fetchurl { diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index ffef9c5988bc..658c18e5cb5c 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript -, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, nixosTests +, common-updater-scripts, git, nix, nixfmt, coreutils, gnused, callPackage , gettext ? null, enableNls ? true, enableTiny ? false }: assert enableNls -> (gettext != null); @@ -16,11 +16,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "6.0"; + version = "6.2"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "k6yMtotK0Q4KrrgKLdFcW7ietmWkhE960Bxn78sWnqI="; + sha256 = "K8oYBL6taq9K15H3VuR0m7Ve2GDuwQWpf7qGS8anfLM="; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; @@ -41,7 +41,9 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - tests = { inherit (nixosTests) nano; }; + tests = { + expect = callPackage ./test-with-expect.nix {}; + }; updateScript = writeScript "update.sh" '' #!${stdenv.shell} diff --git a/pkgs/applications/editors/nano/test-with-expect.nix b/pkgs/applications/editors/nano/test-with-expect.nix new file mode 100644 index 000000000000..bd48eba4324b --- /dev/null +++ b/pkgs/applications/editors/nano/test-with-expect.nix @@ -0,0 +1,35 @@ +{ nano, expect, runCommand, writeScriptBin, runtimeShell }: + +let expect-script = writeScriptBin "expect-script" '' + #!${expect}/bin/expect -f + + # Load nano + spawn nano file.txt + expect "GNU nano ${nano.version}" + + # Add some text to the buffer + send "Hello world!" + expect "Hello world!" + + # Send ctrl-x (exit) + send "\030" + expect "Save modified buffer?" + + # Answer "yes" + send "y" + expect "File Name to Write" + + # Send "return" to accept the file path. + send "\r" + sleep 1 + exit +''; in +runCommand "nano-test-expect" +{ + nativeBuildInputs = [ nano expect ]; + passthru = { inherit expect-script; }; +} '' + expect -f ${expect-script}/bin/expect-script + grep "Hello world!" file.txt + touch $out +'' diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index c2a696cd425b..2c0a50bfed6b 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -7,6 +7,7 @@ , makeWrapper , pkg-config , python2 +, python3 , openssl , SDL2 , fontconfig @@ -24,16 +25,16 @@ }: rustPlatform.buildRustPackage rec { pname = "neovide"; - version = "unstable-2021-10-09"; + version = "unstable-2022-02-04"; src = fetchFromGitHub { owner = "Kethku"; repo = "neovide"; - rev = "7f76ad4764197ba75bb9263d25b265d801563ccf"; - sha256 = "sha256-kcP0WSk3quTaWCGQYN4zYlDQ9jhx/Vu6AamSLGFszwQ="; + rev = "92bc1725f1733547eb0ae25b740425f03f358c2a"; + sha256 = "sha256-bKTteaj6gddp0NuV5Y0pfHotezU9Hmb136xOC9zkJ/M="; }; - cargoSha256 = "sha256-TQEhz9FtvIb/6Qtyz018dPle0+nub1oMZMFtKAqYcoI="; + cargoSha256 = "sha256-TaZN49ou6bf1vW0mEsmaItp1c73d0M826MMrSGXpnGE="; SKIA_SOURCE_DIR = let @@ -41,8 +42,8 @@ rustPlatform.buildRustPackage rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - rev = "m91-0.39.4"; - sha256 = "sha256-ovlR1vEZaQqawwth/UYVUSjFu+kTsywRpRClBaE1CEA="; + rev = "m93-0.42.0"; + sha256 = "sha256-F1DWLm7bdKnuCu5tMMekxSyaGq8gPRNtZwcRVXJxjZQ="; }; # The externals for skia are taken from skia/DEPS externals = lib.mapAttrs (n: v: fetchgit v) (lib.importJSON ./skia-externals.json); @@ -72,6 +73,7 @@ rustPlatform.buildRustPackage rec { pkg-config makeWrapper python2 # skia-bindings + python3 # rust-xcb llvmPackages.clang # skia ]; diff --git a/pkgs/applications/editors/neovim/neovide/skia-externals.json b/pkgs/applications/editors/neovim/neovide/skia-externals.json index 3c0de3008d72..d0553830a6be 100644 --- a/pkgs/applications/editors/neovim/neovide/skia-externals.json +++ b/pkgs/applications/editors/neovim/neovide/skia-externals.json @@ -1,18 +1,18 @@ { "expat": { "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "e976867fb57a0cd87e3b0fe05d59e0ed63c6febb", - "sha256": "sha256-akSh/Vo7s7m/7qePamGA7oiHEHT3D6JhCFMc27CgDFI=" + "rev": "a28238bdeebc087071777001245df1876a11f5ee", + "sha256": "sha256-TSaVtKEk7J0fckDvpI6/U5Aq7d37nsixp0Ft7sMHi8w=" }, "libjpeg-turbo": { "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "64fc43d52351ed52143208ce6a656c03db56462b", - "sha256": "sha256-rk22wE83hxKbtZLhGwUIF4J816jHvWovgICdrKZi2Ig=" + "rev": "24e310554f07c0fdb8ee52e3e708e4f3e9eb6e20", + "sha256": "sha256-bhbUnA36rKYLJSLpElmXJqccXQDjjbMcNMsVM4Eekrs=" }, "icu": { "url": "https://chromium.googlesource.com/chromium/deps/icu.git", - "rev": "dbd3825b31041d782c5b504c59dcfb5ac7dda08c", - "sha256": "sha256-voMH+TdNx3dBHeH5Oky5OYmmLGJ2u+WrMrmAkjXJRTE=" + "rev": "a0718d4f121727e30b8d52c7a189ebf5ab52421f", + "sha256": "sha256-BI3f/gf9GNDvSfXWeRHKBvznSz4mjXY8rM24kK7QvOM=" }, "zlib": { "url": "https://chromium.googlesource.com/chromium/src/third_party/zlib", diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 2b1281ae21be..52c3c08ea847 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,8 +4,6 @@ , neovim }: -with lib; - with python3.pkgs; buildPythonApplication rec { pname = "neovim-remote"; version = "2.4.0"; @@ -35,11 +33,12 @@ with python3.pkgs; buildPythonApplication rec { "test_escape_double_quotes_in_filenames" ]; - meta = { + meta = with lib; { description = "A tool that helps controlling nvim processes from a terminal"; homepage = "https://github.com/mhinz/neovim-remote/"; license = licenses.mit; maintainers = with maintainers; [ edanaher ]; platforms = platforms.unix; + mainProgram = "nvr"; }; } diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index f7614e76ef54..2282e583683d 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,14 +3,14 @@ }: let - version = "12.6"; + version = "13"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; comment = "Integrated Development Environment"; desktopName = "Apache NetBeans IDE"; genericName = "Integrated Development Environment"; - categories = "Development;"; + categories = [ "Development" ]; icon = "netbeans"; }; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - hash = "sha512-K0HjEO/yw9h+2+Y5CvxyYG1+kx+KH9NSn+QsKCsvh/rG/ilYLYyy93iZfx+wzwrgEfRtfMpZGtDAxd6nyUSnCA=="; + hash = "sha512-Xnh2OhnHOo++gGPx1o/WmcTHV7KNVeeT6ut9xH2Zo0EFtt43GFi2+HLOXm3u/IcjAzWlbGvIp9+TVUnwDusDoA=="; }; buildCommand = '' diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index 38aea982633c..c749000533e2 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { description = "The Berkeley Vi Editor"; license = licenses.free; platforms = platforms.unix; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/nvi.x86_64-darwin }; } diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 96256e7ef346..c775a493f167 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.6"; + version = "0.26.7"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-xWnNW1VQPkbfGltckWKwiIjEJqpSxvPy+SbGWL7gFEw="; + sha256 = "sha256-8SO1VpDWz19UfppdtziiZymoLnvQLMAAIjjOTZ/VMOM="; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix new file mode 100644 index 000000000000..1f069024eb9e --- /dev/null +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -0,0 +1,75 @@ +{ stdenv +, lib +, fetchurl +, unzip +, udev +, nwjs +, gcc-unwrapped +, autoPatchelfHook +, gsettings-desktop-schemas +, gtk3 +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "pinegrow"; + version = "6.5"; + + src = fetchurl { + url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip"; + sha256 = "1l7cf5jgidpykaf68mzf92kywl1vxwl3fg43ibgr2rg4cnl1g82b"; + }; + + nativeBuildInputs = [ + unzip + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ + udev + nwjs + gcc-unwrapped + gsettings-desktop-schemas + gtk3 + ]; + + wrapProgramFlags = [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib gtk3 udev ]}" + "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}" + ]; + + sourceRoot = "."; + + dontUnpack = true; + + # Extract and copy executable in $out/bin + installPhase = '' + runHook preInstall + + mkdir -p $out/share/applications $out/bin $out/opt/bin + # we can't unzip it in $out/lib, because nw.js will start with + # an empty screen. Therefore it will be unzipped in a non-typical + # folder and symlinked. + unzip $src -d $out/opt/pinegrow + substituteInPlace $out/opt/pinegrow/Pinegrow.desktop \ + --replace 'Exec=sh -c "$(dirname %k)/PinegrowLibrary"' 'Exec=sh -c "$out/bin/Pinegrow"' + mv $out/opt/pinegrow/Pinegrow.desktop $out/share/applications/Pinegrow.desktop + ln -s $out/opt/pinegrow/PinegrowLibrary $out/bin/Pinegrow + + runHook postInstall + ''; + + preFixup = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + wrapProgram "$out/opt/pinegrow/PinegrowLibrary" ''${wrapProgramFlags[@]} + ''; + + meta = with lib; { + homepage = "https://pinegrow.com"; + description = "UI Web Editor"; + platforms = platforms.linux; + license = with licenses; [ unfreeRedistributable ]; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index cdfacaf92ede..e05008613910 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -13,17 +13,20 @@ , nbdSupport ? !stdenv.isDarwin, libnbd , textStylingSupport ? true , dejagnu + +# update script only +, writeScript }: let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation rec { pname = "poke"; - version = "1.4"; + version = "2.1"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-zgVN8pVgySEjATJwPuRJ/hMLbiWrA6psx5a7QBUGqiQ="; + sha256 = "sha256-zVKObBu8VAw7YpwrTza3hLMKAmsAWji5koNCJZlEJnA="; }; outputs = [ "out" "dev" "info" "lib" "man" ]; @@ -65,6 +68,20 @@ in stdenv.mkDerivation rec { moveToOutput share/emacs "$out" ''; + passthru = { + updateScript = writeScript "update-poke" '' + #!/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 'poke 2.0' + new_version="$(curl -s https://www.jemarch.net/poke | + pcregrep -o1 '>poke ([0-9.]+)')" + update-source-version ${pname} "$new_version" + ''; + }; + meta = with lib; { description = "Interactive, extensible editor for binary data"; homepage = "http://www.jemarch.net/poke"; diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 773b1f278e0f..5a790e78090d 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -10,7 +10,7 @@ let icon = "quartus"; desktopName = "Quartus"; genericName = "Quartus Prime"; - categories = "Development;"; + categories = [ "Development" ]; }; # I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf` in buildFHSUserEnv rec { @@ -25,6 +25,7 @@ in buildFHSUserEnv rec { # qsys requirements xorg.libXtst xorg.libXi + libudev0-shim ]; multiPkgs = pkgs: with pkgs; let # This seems ugly - can we override `libpng = libpng12` for all `pkgs`? diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index d2aea1344da8..35c5f644ffa4 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -2,7 +2,7 @@ qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml, qtquick1, libGLU }: stdenv.mkDerivation rec { - name = "qxmledit-${version}" ; + pname = "qxmledit" ; version = "0.9.15" ; src = fetchFromGitHub ( lib.importJSON ./qxmledit.json ) ; nativeBuildInputs = [ qmake ] ; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 4e4835783e46..76c94693d24b 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.22"; + version = "2.24"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "v${version}"; - sha256 = "11n970ad0j57vlll5j30ngkrfyil23v1b29ickbnblcldvjbgwa5"; + sha256 = "sha256-nTFyRNJAhTrVlKdLd2F0jv7VcNn2pGTAegvfMjfHY84="; }; # We have not packaged tests. @@ -36,8 +36,9 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://rednotebook.sourceforge.io/"; + changelog = "https://github.com/jendrikseipp/rednotebook/blob/v${version}/CHANGELOG.md"; description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ orivej tstrobel ]; }; } diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index 533e353a43e6..afb48ad65f4f 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -1,29 +1,44 @@ -{ lib, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts -# Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries -# available. +{ lib +, python3 +, fetchFromGitHub +, wrapQtAppsHook +, buildEnv +, aspellDicts + # Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries + # available. , enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ] }: -let - version = "7.0.4"; - pythonEnv = python3.withPackages (ps: with ps; [ - pyqt5 docutils pyenchant Markups markdown pygments chardet - ]); -in python3.pkgs.buildPythonApplication { - inherit version; +python3.pkgs.buildPythonApplication rec { pname = "retext"; + version = "7.2.3"; + format = "setuptools"; src = fetchFromGitHub { owner = "retext-project"; repo = "retext"; rev = version; - sha256 = "1zcapywspc9v5zf5cxqkcy019np9n41gmryqixj66zsvd544c6si"; + hash = "sha256-EwaJFODnkZGbqVw1oQrTrx2ME4vRttVW4CMPkWvMtHA="; }; - doCheck = false; + nativeBuildInputs = [ + wrapQtAppsHook + ]; - nativeBuildInputs = [ wrapQtAppsHook ]; - propagatedBuildInputs = [ pythonEnv ]; + propagatedBuildInputs = with python3.pkgs; [ + chardet + docutils + markdown + markups + pyenchant + pygments + pyqt5 + ]; + + postPatch = '' + # Remove wheel check + sed -i -e '31,36d' setup.py + ''; postInstall = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") @@ -39,10 +54,16 @@ in python3.pkgs.buildPythonApplication { --replace "Icon=ReText-${version}.data/data/share/retext/icons/retext.svg" "Icon=$out/share/retext/icons/retext.svg" ''; + doCheck = false; + + pythonImportsCheck = [ + "ReText" + ]; + meta = with lib; { + description = "Editor for Markdown and reStructuredText"; homepage = "https://github.com/retext-project/retext/"; - description = "Simple but powerful editor for Markdown and reStructuredText"; - license = licenses.gpl3; + license = licenses.gpl2Plus; maintainers = with maintainers; [ klntsky ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 04b688622be0..eada77eea843 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -227,8 +227,13 @@ in desktopName = "RStudio"; genericName = "IDE"; comment = description; - categories = "Development;"; - mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; + categories = [ "Development" ]; + mimeTypes = [ + "text/x-r-source" "text/x-r" "text/x-R" "text/x-r-doc" "text/x-r-sweave" "text/x-r-markdown" + "text/x-r-html" "text/x-r-presentation" "application/x-r-data" "application/x-r-project" + "text/x-r-history" "text/x-r-profile" "text/x-tex" "text/x-markdown" "text/html" + "text/css" "text/javascript" "text/x-chdr" "text/x-csrc" "text/x-c++hdr" "text/x-c++src" + ]; }) ]; }) diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 6b380e32bc69..3cfc37b36a03 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - sha256 = "sha256-uh6mXXJP/EpfvHTXL7PH+Yd1F5Q+6B01ns4vRr/2Xqo="; + hash = "sha256-y39u1eSX7vzcIJzoykU7Y7FTmeZnBW/IlvJLzKHfz8Y="; }; format = "other"; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 6b314dff93a4..b93fbd6110f1 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.8.0"; + version = "1.9.2"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-luX4/KERB4GwpID7zVnd6F/mN8SHTy9zmqSUzJ1CYPk="; + sha256 = "sha256-LfP3qUzoHuYSpkTz1queVGTWOP9v9kbgbgvvtiMK6Eo="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 4191f6fbd20c..6e478693d409 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -2,7 +2,7 @@ , fetchurl, libsecret, gtk3, gsettings-desktop-schemas }: let - version = "3.9.5"; + version = "3.11.1"; pname = "standardnotes"; name = "${pname}-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -13,8 +13,8 @@ let }.${stdenv.hostPlatform.system} or throwSystem; sha256 = { - i686-linux = "sha256-7Mo8ELFV6roZ3IYWBtB2rRDAzJrq4ht9f1v6uohsauw="; - x86_64-linux = "sha256-9VPYII9E8E3yL7UuU0+GmaK3qxWX4bwfACDl7F7sngo="; + i686-linux = "3e83a7eef5c29877eeffefb832543b21627cf027ae6e7b4f662865b6b842649a"; + x86_64-linux = "fd461e98248a2181afd2ef94a41a291d20f7ffb20abeaf0cfcf81a9f94e27868"; }.${stdenv.hostPlatform.system} or throwSystem; src = fetchurl { diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index 7f14bf8ae14b..074584e3360e 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Sublime Text"; genericName = "Text Editor"; - categories = "TextEditor;Development;"; + categories = [ "TextEditor" "Development" ]; icon = "sublime_text"; }; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 06876d37eee0..4e7bfc2cff7d 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "4.2.0"; + version = "4.2.2"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "sha256-L3r71srvdSsCc1HZcu6lsH+oTJQ7TatVd2Oy3meAVYk="; + sha256 = "sha256-MZz8DQT1f6RU+euEED1bbg2MsaqC6+W3RoMk2qfIjr4="; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix index 9db68f71ea8e..67374b9b40b0 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/applications/editors/texworks/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "texworks"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "TeXworks"; repo = "texworks"; rev = "release-${version}"; - sha256 = "0l8jl1b8lpas7yz6m0qc2nikyn54lx2ljzmjjz3zgxgd6l502006"; + sha256 = "sha256-v0UukFM5brPtgq+zH5H1KfUc0eL0hjTC9z0tVQRqu2Q="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index 20d25bb616ff..eb6ba73b2e0b 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { icon = "thonny"; desktopName = "Thonny"; comment = "Python IDE for beginners"; - categories = "Development;IDE"; + categories = [ "Development" "IDE" ]; }) ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 2c3ddbf80b88..d381e89e75af 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,19 +1,19 @@ { lib, mkDerivation, fetchFromGitHub, pkg-config, qmake -, python2, qtbase, qttools }: +, python3, qtbase, qttools }: mkDerivation rec { pname = "tiled"; - version = "1.7.2"; + version = "1.8.2"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yQWe27zLWOnRQk+MEpuWs8CFP/le3PQ+yziB0ikNang="; + sha256 = "sha256-5yh0+Z6SbHEFKvCJjQY9BS8vUihBspGhFjfhrUOfiIo="; }; nativeBuildInputs = [ pkg-config qmake ]; - buildInputs = [ python2 qtbase qttools ]; + buildInputs = [ python3 qtbase qttools ]; meta = with lib; { description = "Free, easy to use and flexible tile map editor"; diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 51a9b9af5bfd..13c5c49db482 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.4186"; + version = "8.2.4350"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "0g276mbmq69z7c4kgj59r0azxmx9ih2sd8v83dx2gfph6wgw65ph"; + sha256 = "sha256-+fCyLZi9+9r7tYoRQsVESkcoHHtM7vrVuOGdJi/9iF0="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 01561f4c2722..bc317b91597e 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -3,7 +3,7 @@ , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE , vimPlugins -, makeWrapper +, makeWrapper, makeBinaryWrapper , wrapGAppsHook , runtimeShell @@ -25,7 +25,6 @@ , ximSupport ? config.vim.xim or true # less than 15KB, needed for deadkeys , darwinSupport ? config.vim.darwin or false # Enable Darwin support , ftNixSupport ? config.vim.ftNix or true # Add .nix filetype detection and minimal syntax highlighting support -, ... }: @@ -134,7 +133,9 @@ in stdenv.mkDerivation rec { ++ lib.optional wrapPythonDrv makeWrapper ++ lib.optional nlsSupport gettext ++ lib.optional perlSupport perl - ++ lib.optional (guiSupport == "gtk3") wrapGAppsHook + # Make the inner wrapper binary to avoid double wrapping issues with wrapPythonDrv + # (https://github.com/NixOS/nixpkgs/pull/164163) + ++ lib.optional (guiSupport == "gtk3") (wrapGAppsHook.override { makeWrapper = makeBinaryWrapper; }) ; buildInputs = [ @@ -174,40 +175,12 @@ in stdenv.mkDerivation rec { postInstall = '' ln -s $out/bin/vim $out/bin/vi '' + lib.optionalString stdenv.isLinux '' - patchelf --set-rpath \ - "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ - "$out"/bin/vim - if [[ -e "$out"/bin/gvim ]]; then - patchelf --set-rpath \ - "$(patchelf --print-rpath $out/bin/vim):${lib.makeLibraryPath buildInputs}" \ - "$out"/bin/gvim - fi - ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc - '' + lib.optionalString wrapPythonDrv '' + ''; + + postFixup = lib.optionalString wrapPythonDrv '' wrapProgram "$out/bin/vim" --prefix PATH : "${python3}/bin" \ --set NIX_PYTHONPATH "${python3}/${python3.sitePackages}" - '' + lib.optionalString (guiSupport == "gtk3") '' - - rewrap () { - rm -f "$out/bin/$1" - echo -e '#!${runtimeShell}\n"'"$out/bin/vim"'" '"$2"' "$@"' > "$out/bin/$1" - chmod a+x "$out/bin/$1" - } - - rewrap ex -e - rewrap view -R - rewrap gvim -g - rewrap gex -eg - rewrap gview -Rg - rewrap rvim -Z - rewrap rview -RZ - rewrap rgvim -gZ - rewrap rgview -RgZ - rewrap evim -y - rewrap eview -yR - rewrap vimdiff -d - rewrap gvimdiff -gd ''; dontStrip = true; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index c71f057fe0f8..806e2f9d4fd0 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation { pname = "macvim"; - version = "8.2.1719"; + version = "8.2.3455"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "snapshot-166"; - sha256 = "1p51q59l1dl5lnf1ms960lm8zfg39p8xq0pdjw6wdyypjj3r8v3v"; + rev = "snapshot-172"; + sha256 = "sha256-LLLQ/V1vyKTuSXzHW3SOlOejZD5AV16NthEdMoTnfko="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index 49354aa9a8d1..6af3e384a63c 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -1,10 +1,10 @@ diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc -index af43549..dfb10fe 100644 +index 32c89b387..c2af70127 100644 --- a/src/MacVim/vimrc +++ b/src/MacVim/vimrc -@@ -14,35 +14,5 @@ set backspace+=indent,eol,start - " translated to English). - set langmenu=none +@@ -9,35 +9,5 @@ set nocompatible + " more sensible value. Add "set backspace&" to your ~/.vimrc to reset it. + set backspace+=indent,eol,start -" Python2 -" MacVim is configured by default to use the pre-installed System python2 @@ -29,22 +29,22 @@ index af43549..dfb10fe 100644 -" or an installation from python.org: -if exists("&pythonthreedll") && exists("&pythonthreehome") && - \ !filereadable(&pythonthreedll) -- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python") -- " MacPorts python 3.8 -- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.8/Python -- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.8/Python") +- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python") +- " MacPorts python 3.9 +- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python +- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.9/Python") - " https://www.python.org/downloads/mac-osx/ -- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.8/Python +- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.9/Python - endif -endif - +" Default cscopeprg to the Nix-installed path +set cscopeprg=@CSCOPE@ diff --git a/src/Makefile b/src/Makefile -index fd2d5e1..37a6d6a 100644 +index c4a3ada37..06ee3de44 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -1397,7 +1397,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ +@@ -1402,7 +1402,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ MacVim/MacVim.m MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o @@ -52,12 +52,12 @@ index fd2d5e1..37a6d6a 100644 +MACVIMGUI_DEFS = -DMACOS_X_DARWIN -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe MACVIMGUI_IPATH = MACVIMGUI_LIBS_DIR = - MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon + MACVIMGUI_LIBS1 = diff --git a/src/auto/configure b/src/auto/configure -index 06257a5..68437df 100755 +index 39ef81449..d8fa7ec2f 100755 --- a/src/auto/configure +++ b/src/auto/configure -@@ -5872,10 +5872,7 @@ $as_echo "not found" >&6; } +@@ -5896,10 +5896,7 @@ $as_echo "not found" >&6; } for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do if test "X$path" != "X"; then @@ -69,7 +69,7 @@ index 06257a5..68437df 100755 MZSCHEME_LIBS="${path}/libmzscheme3m.a" MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" elif test -f "${path}/libracket3m.a"; then -@@ -6260,23 +6257,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } +@@ -6287,23 +6284,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi if test "x$MACOS_X" = "xyes"; then @@ -93,7 +93,7 @@ index 06257a5..68437df 100755 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` fi -@@ -6499,13 +6479,7 @@ __: +@@ -6526,13 +6506,6 @@ __: eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" @@ -104,11 +104,10 @@ index 06257a5..68437df 100755 - vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" - fi - else -+ vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` -@@ -6520,7 +6494,6 @@ eof +@@ -6547,7 +6520,6 @@ eof fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` @@ -116,7 +115,7 @@ index 06257a5..68437df 100755 fi -@@ -6599,13 +6572,6 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -6626,13 +6598,6 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "no" >&6; } fi @@ -130,7 +129,7 @@ index 06257a5..68437df 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS -@@ -7499,11 +7465,7 @@ $as_echo "$tclver - OK" >&6; }; +@@ -7557,11 +7522,7 @@ $as_echo "$tclver - OK" >&6; }; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 $as_echo_n "checking for location of Tcl include... " >&6; } @@ -142,7 +141,7 @@ index 06257a5..68437df 100755 TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then -@@ -7521,13 +7483,8 @@ $as_echo "" >&6; } +@@ -7579,13 +7540,8 @@ $as_echo "" >&6; } if test -z "$SKIP_TCL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 $as_echo_n "checking for location of tclConfig.sh script... " >&6; } @@ -156,9 +155,9 @@ index 06257a5..68437df 100755 for try in $tclcnf; do if test -f "$try/tclConfig.sh"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -@@ -7717,10 +7674,6 @@ $as_echo "$rubyhdrdir" >&6; } - if test -f "$rubylibdir/$librubya"; then - librubyarg="$librubyarg" +@@ -7774,10 +7730,6 @@ $as_echo "$rubyhdrdir" >&6; } + rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"` + if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" - elif test "$vi_cv_path_ruby" = "/usr/bin/ruby" -a -d "/System/Library/Frameworks/Ruby.framework"; then - RUBY_LIBS="-framework Ruby" @@ -168,7 +167,7 @@ index 06257a5..68437df 100755 if test "X$librubyarg" != "X"; then diff --git a/src/vim.h b/src/vim.h -index bbc01ee..5a93591 100644 +index 4ff59f201..f91cb9836 100644 --- a/src/vim.h +++ b/src/vim.h @@ -244,17 +244,6 @@ @@ -190,15 +189,14 @@ index bbc01ee..5a93591 100644 # include "os_amiga.h" #endif diff --git a/src/vimtutor b/src/vimtutor -index 1e8769b..47078b0 100755 +index 3b154f288..e89f26060 100755 --- a/src/vimtutor +++ b/src/vimtutor -@@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" - if test "$1" = "-g"; then - # Try to use the GUI version of Vim if possible, it will fall back - # on Vim if Gvim is not installed. -- seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" -+ seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" - shift +@@ -16,6 +16,6 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" + if test "$1" = "-g"; then + # Try to use the GUI version of Vim if possible, it will fall back + # on Vim if Gvim is not installed. +- seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" ++ seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" + shift fi - diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix similarity index 98% rename from pkgs/misc/vim-plugins/aliases.nix rename to pkgs/applications/editors/vim/plugins/aliases.nix index 8f3308a122be..955590cafe31 100644 --- a/pkgs/misc/vim-plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -94,7 +94,6 @@ mapAliases (with prev; { neosnippet = neosnippet-vim; The_NERD_Commenter = nerdcommenter; The_NERD_tree = nerdtree; - onedark-nvim = onedarkpro-nvim; # added 2021-10-22 open-browser = open-browser-vim; pathogen = vim-pathogen; polyglot = vim-polyglot; diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix similarity index 100% rename from pkgs/misc/vim-plugins/build-vim-plugin.nix rename to pkgs/applications/editors/vim/plugins/build-vim-plugin.nix diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix similarity index 100% rename from pkgs/misc/vim-plugins/default.nix rename to pkgs/applications/editors/vim/plugins/default.nix diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json similarity index 100% rename from pkgs/misc/vim-plugins/deprecated.json rename to pkgs/applications/editors/vim/plugins/deprecated.json diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix similarity index 85% rename from pkgs/misc/vim-plugins/generated.nix rename to pkgs/applications/editors/vim/plugins/generated.nix index c3599c908ade..92578520b98e 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1,4 +1,4 @@ -# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit! +# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit! { lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }: final: prev: @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-01-19"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "845a1052f7d8c084eab15d190b62d87350f6fa37"; - sha256 = "0k16c83qn8rcg0gfmwlwlj27apj1k081yy4aqgyrkn485fdlv3sl"; + rev = "b9f6067529ef123b8ace705ea356869f66aad320"; + sha256 = "1wcdshvq2nw1dx8xxzplvq519bzzb3qgf7lh0sqafjd19nzgwiji"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-01-07"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "5087246c8223712fa0097098e910951aba8603fb"; - sha256 = "0szp3iy0ljzxkahz7bwz1h135isaqngg4861zl1p22ddylnaxnwq"; + rev = "80dcd648d389965603246c2c5a4554e3e4aa184c"; + sha256 = "1a38q83sgv13aw3iy40mjzkg1wsc5zmf5mmkjqpdcgv5aixyb8m5"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -101,24 +101,24 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-12-23"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "7968693e841ea9d2b4809e23e8ec5c561854b6d6"; - sha256 = "0jayi96r6khkqm3khbmb83ygb41azxc3gq05ykkiy44405ri7k04"; + rev = "bd79727af8a21037222a08ec9bcaf1c85488aaa4"; + sha256 = "0l4hvhmf9cgw921956rh97x6aqhjzs2jxsdnk2m38a9fr738hknk"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2022-01-08"; + version = "2022-02-11"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "f8c503ceb2d710b7a94814f56010dd3f5efe8ab1"; - sha256 = "1v9d1y7wk1zkd7wmj9lfqa448mlfw26yrbx6di5p7azhp60d21bi"; + rev = "93798e8c89c441d29d4678da0c0d5e1429eb43b0"; + sha256 = "0r2q7iyw0y7zaf33k6ka5ca9v6g7zlmya5x0ph5xgsylmglq6jca"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -171,6 +171,18 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/async.vim/"; }; + asyncomplete-lsp-vim = buildVimPluginFrom2Nix { + pname = "asyncomplete-lsp.vim"; + version = "2021-12-17"; + src = fetchFromGitHub { + owner = "prabirshrestha"; + repo = "asyncomplete-lsp.vim"; + rev = "f6d6a6354ff279ba707c20292aef0dfaadc436a3"; + sha256 = "1y0wpq982nw0ibqhvcvb7md58jvadygkxc1ibg99zxw1kznfpla6"; + }; + meta.homepage = "https://github.com/prabirshrestha/asyncomplete-lsp.vim/"; + }; + asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete.vim"; version = "2021-12-06"; @@ -183,6 +195,30 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; + asyncrun-vim = buildVimPluginFrom2Nix { + pname = "asyncrun.vim"; + version = "2022-03-08"; + src = fetchFromGitHub { + owner = "skywind3000"; + repo = "asyncrun.vim"; + rev = "9f8e50033cb724d8856907a5fbf4685eb3efda24"; + sha256 = "00j0fp57lqcn3qvkb392shj1mqfv9vmn5wjcsibf0y6vbcq17xxh"; + }; + meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; + }; + + asynctasks-vim = buildVimPluginFrom2Nix { + pname = "asynctasks.vim"; + version = "2022-01-12"; + src = fetchFromGitHub { + owner = "skywind3000"; + repo = "asynctasks.vim"; + rev = "dfecf57c79ded5ead2911e32caff46d8cede8c5c"; + sha256 = "1w58y2ccgry47nhidqv4vg1wag7saphs2xad9wfpq65sj8vva3kk"; + }; + meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; + }; + ats-vim = buildVimPluginFrom2Nix { pname = "ats-vim"; version = "2020-09-04"; @@ -197,12 +233,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2021-11-29"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "1607b4c100f9c466fc0208e936421a0202025457"; - sha256 = "1rx1ggy54j71pp5ihv8zb3wqq69b26v65q1snv6hlabar02hrl1r"; + rev = "d11266046077968bbc3d6ac37d81e069618cdedd"; + sha256 = "1hdycb9rc7kpcppwv332hmrnzx5g2jy5r0ckaynahwwbwbjiyjqh"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -233,12 +269,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-01-15"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "486e23f024a21c952758726497244e27aa3b9f0e"; - sha256 = "1sxg9gr329zlccm8xh8zv3n26s72mikqh4aik5l1hdx663afqc0d"; + rev = "ba1606202588a1d4cc68360d6ef9549f0fc464a1"; + sha256 = "029pwryrsc1hzxsc6jvin7vxx21rj2270kw2hqj0dj74qn8b8dg5"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -281,12 +317,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2021-10-05"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "6e638309efcad2f308eb9c5eaccf6f62b794bbab"; - sha256 = "0kvhwn3gr5x5vf2cgjda22naf8cvgkc43zalvxvr99s9jcjyynki"; + rev = "be65945626fb6bf6058cae61d5176d156f923c11"; + sha256 = "165ffjrwhhjdyssj96z4qn3fjys0dxwckpvjyzrpca2b2fag0cx2"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -329,12 +365,12 @@ final: prev: better-escape-nvim = buildVimPluginFrom2Nix { pname = "better-escape.nvim"; - version = "2022-01-14"; + version = "2022-03-14"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "2bee35e435310c7cc1333fff983268ae3f17b06f"; - sha256 = "1y6q2r462l7p4y9x5fn04902s41n4rr0xrwnry6vwp4rdlzldw8c"; + rev = "d2efbf0093235525e81f537f8f4e63f23acedf06"; + sha256 = "1xx23v9jgpzdhyp1diyq0vc36vlxzljx36qnax2cms36kfnc398l"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -401,36 +437,36 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2021-12-18"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "1c59b784c53afaf7b9ca63186da99e5d46e3e429"; - sha256 = "0zq261nv2jzhqqzaldr5l6dlriyy23zv8rsn3k7fg91q3vjawn4i"; + rev = "05f9b2831abc693996b335494337b88e616e9eed"; + sha256 = "09a5r51k8926v51ma45jfqqwwjnk52yy5ql9swmrxnvnrdsjah3p"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; - version = "2022-01-06"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "4d46f80734a1f6854942f78fcbf2163b959b8ab0"; - sha256 = "1hzbxpz3yz3z7fxj7imd4l3aznrxcx1fnhf39gg2xqzk8j1yspwx"; + rev = "a81eb31192e3033eccedb61c842e274252038a04"; + sha256 = "06b0mfmys2ah1hkyfipv0chv138mmdlixc2l0377zhq8409i3k3c"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-01-16"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "7451dfc97d28e6783dbeb1cdcff12619a9323c98"; - sha256 = "0w0ww4x6il3g7623rdnzdm82dg6484liglxzzd8rff5av6sx3ja8"; + rev = "e1202c6569353d03ef0cb3da11b839dba26854dd"; + sha256 = "1nd5pvbg0yw8jl4rn56dzhabmiwkvlzb8iv595rrkqdb2msdl4qx"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -449,12 +485,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2021-09-18"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "eebee3aa5da63188b70c4fd75509dcfce77e2030"; - sha256 = "0n8i5jg3hvx6mj6grxcvdsanbyvg67gjiq18aq6kpdb1rcip0270"; + rev = "896360bfd9d5347b2726dd247df2d2cbdb8cf1d6"; + sha256 = "06xvggyq0saf9mj330vnlh0q4176w46w09335iwhc3fp999vl07p"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -473,12 +509,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-01-23"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "c63ad901576729c46f443630a1fb61e4a7e93a0f"; - sha256 = "1w90zb46fdvpp0b1i559yj3dvijfskl9dlqjkgn7fr8513fgblrz"; + rev = "f079dda3dc23450d69b4bad11bfbd9af2c77f6f3"; + sha256 = "1w0n96fbrkm3vdl64v1yzkly8wpcn5g9qflmpb8r1ww9hhig7a38"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -497,12 +533,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-01-24"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "7f1b916fabbae134b37c0a5ac09f0bfc555ab010"; - sha256 = "0xmm0fikqj95m836nv8y6cyvqkn3p0iklqhqj32cxqfrvh0mbnb6"; + rev = "e9606bfa350f277d54a61742d560e6122dc4d32c"; + sha256 = "1vyg48ghr8fd15fh41pk5qlgngdqkw8gwhkkyq9hbvs2mxw8x80c"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -545,12 +581,12 @@ final: prev: ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2021-08-21"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "yunlingz"; repo = "ci_dark"; - rev = "a2fb69aabbe2bbbf1fd08d34c168f2348a4af493"; - sha256 = "1fd6pk0vl8il42d53rzddlbbk5r4k0gz95bk964pc81z38bmskcw"; + rev = "3acf3a52921708c4c7c6c8ca8590e63bf86d0eff"; + sha256 = "1x2242mzv3vflaq6k7xdp5xc52hsykw9693szmnvfb72i0mhrf4c"; }; meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; @@ -605,24 +641,24 @@ final: prev: cmd-parser-nvim = buildVimPluginFrom2Nix { pname = "cmd-parser.nvim"; - version = "2021-05-30"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "winston0410"; repo = "cmd-parser.nvim"; - rev = "70813af493398217cb1df10950ae8b99c58422db"; - sha256 = "0rfa8cpykarcal8qcfp1dax1kgcbq7bv1ld6r1ia08n9vnqi5vm6"; + rev = "6363b8bddef968c3ec51a38172af44f675f01ef3"; + sha256 = "11vi9fwgbcvrb8jnicsnwmggayn0586glfdknlkg43smz2cay3f1"; }; meta.homepage = "https://github.com/winston0410/cmd-parser.nvim/"; }; cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2022-01-04"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "f83773e2f433a923997c5faad7ea689ec24d1785"; - sha256 = "0z1c0x60hz3khgpp7nfj0i579sgi4vsnhhcqb02i7a8jx685qwrd"; + rev = "d66c4c2d376e5be99db68d2362cd94d250987525"; + sha256 = "0n9mqrf4rzj784zhshxr2wqyhm99d9mzalxqnik7srkghjvc9l4a"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; @@ -641,12 +677,12 @@ final: prev: cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; - version = "2021-12-01"; + version = "2022-02-13"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-cmdline"; - rev = "29ca81a6f0f288e6311b3377d9d9684d22eac2ec"; - sha256 = "0yzh0jdys1bn1c2mqm410c0ndyyyxpmigzdrkhnkv78b16vjyhq6"; + rev = "f4beb74e8e036f9532bedbcac0b93c7a55a0f8b0"; + sha256 = "0spc5vhrcz2ld1cxf9n27mhhfdwm0v89xbbyzbi9hshzfssndagh"; }; meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; @@ -701,12 +737,12 @@ final: prev: cmp-nvim-lsp-document-symbol = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp-document-symbol"; - version = "2021-10-28"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp-document-symbol"; - rev = "29d12e55cf49ee07b829114ad39b161cad2544ab"; - sha256 = "0w4m34467j3cg4dj69r12115p5k1i2lbjzmwx5hmd5x6xzb5qycb"; + rev = "c3f0086ed9882e52e0ae38dd5afa915f69054941"; + sha256 = "1jprb86z081kpxyb2dhw3n1pq15dzcc9wlwmpb6k43mqd7k8q11l"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/"; }; @@ -723,6 +759,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; + cmp-nvim-ultisnips = buildVimPluginFrom2Nix { + pname = "cmp-nvim-ultisnips"; + version = "2022-03-19"; + src = fetchFromGitHub { + owner = "quangnguyen30192"; + repo = "cmp-nvim-ultisnips"; + rev = "f90ebb220306e39766ad0ec1f094e4e12bb2fdd4"; + sha256 = "1pfa3fpjna1969a9ij40b4rmss413mzr5m27i2lhq21xw2f0fi6a"; + }; + meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/"; + }; + cmp-omni = buildVimPluginFrom2Nix { pname = "cmp-omni"; version = "2022-01-08"; @@ -737,24 +785,24 @@ final: prev: cmp-pandoc-references = buildVimPluginFrom2Nix { pname = "cmp-pandoc-references"; - version = "2021-10-11"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "jc-doyle"; repo = "cmp-pandoc-references"; - rev = "9f27411d118194fc9ee6e1f86574ad8077de54be"; - sha256 = "02g6rf2pzx1syhhbhrkxzygz27q2i1hsrymjcyj9q5h31wz0qzhq"; + rev = "13e6c080fb16836f52c7fc498eecaae51adb4d54"; + sha256 = "10pyzv4pdis05ap9jrz6wszxjha0m3bdjv6pd7xqm1hqahsyf4qs"; }; meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/"; }; cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2022-01-17"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "c5230cb439df9547294678d0f1c1465ad7989e5f"; - sha256 = "0ya68crpc78fb5zn34s06rl77gsm956pjpsjfk1dv2cddwwxi8x8"; + rev = "466b6b8270f7ba89abd59f402c73f63c7331ff6e"; + sha256 = "15ksxnwxssv1yr1ss66mbl5w0layq0f4baisd9ki192alnkd7365"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; @@ -773,12 +821,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-01-20"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "276f3a5e43465c479164f00258f7454ff0b4d3a1"; - sha256 = "145gpizsa28g3rd872hxflnw644k9ki5qvw9012yjrfm5n8mmfcp"; + rev = "2a051347190a22b738e9784426199b9db745e1da"; + sha256 = "1z3imhw4jgswd957aqhf1yf5dihb1k9dfd22abshziv45fb0fggy"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -833,12 +881,12 @@ final: prev: cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; - version = "2022-01-02"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "d6f837f4e8fe48eeae288e638691b91b97d1737f"; - sha256 = "0cmfjqps7j3056y8avkrfz40kx8qcdxf4v1xvfv03nrw9xdwwh5y"; + rev = "85f2767842a35064f61128b71b8dab1e38c413c4"; + sha256 = "13s04x9vx3n854q9abb0knls5aycxigbwqgllfmp2xgaycgxqksa"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; @@ -881,12 +929,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-01-14"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "eae915d529503a7a281e2e80aaa0bcb7ef04a576"; - sha256 = "18pfamaczbcpf35dh2sn9cp1wd6fha882qpbzvhx8qrvhjdz0n2a"; + rev = "5581530535bc10c42f84c16665d79fbaf7d49806"; + sha256 = "1qf8gihw8bdn6253qly2d9d60ng95r20fy8v8l2vv5lfmzdaaz27"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -915,38 +963,62 @@ final: prev: meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; + coc-svelte = buildVimPluginFrom2Nix { + pname = "coc-svelte"; + version = "2022-03-14"; + src = fetchFromGitHub { + owner = "coc-extensions"; + repo = "coc-svelte"; + rev = "7dda98527c0831e287ae8cd1c85cfc958c949d4a"; + sha256 = "0ci35dph7zz53hiw65xp79g6i8h5yk1zlcbinljfcdn5635wsjbn"; + }; + meta.homepage = "https://github.com/coc-extensions/coc-svelte/"; + }; + + coc-tailwindcss = buildVimPluginFrom2Nix { + pname = "coc-tailwindcss"; + version = "2020-08-19"; + src = fetchFromGitHub { + owner = "iamcco"; + repo = "coc-tailwindcss"; + rev = "5f41aa1feb36e39b95ccd83be6a37ee8c475f9fb"; + sha256 = "189abl36aj862m5nz8jjdgdfc4s6xbag030hi9m13yd6fbg99f85"; + }; + meta.homepage = "https://github.com/iamcco/coc-tailwindcss/"; + }; + coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-01-22"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "5b8cc589540e82e6862b2948924f06461261a09a"; - sha256 = "0j1v9nckv86b4z2pz6b9kssp59fl3da9hyadjplnqgilbbcqplxm"; + rev = "16e74f9b31d20b8dfc8933132beed4c175d824ea"; + sha256 = "0nrfm8517fz31qrg0gfh888q7wcbxxkbpcp39ycvwkdfxpq1bzwr"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; codi-vim = buildVimPluginFrom2Nix { pname = "codi.vim"; - version = "2021-01-11"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "cf62681a4962ce1873e4b2a5e0bf401dcd42890f"; - sha256 = "15j08qa7sklm0pilfn3ljgq75hrv8y9h8xzj8ibrafp29640gkfl"; + rev = "7d2604c8ef8bf2154e191746692477da39aed399"; + sha256 = "0na5nlzi9rz1gx1p98wksy6axmxkq4mmhxq3dzg0pv0m0137vi1g"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; colorbuddy-nvim = buildVimPluginFrom2Nix { pname = "colorbuddy.nvim"; - version = "2021-12-01"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "tjdevries"; repo = "colorbuddy.nvim"; - rev = "c678edd8113274574f9d9ef440773d1123e1431d"; - sha256 = "095347cz5idcb09l4sl236agzi89lyr9r40nix2c8vk5pbskvp8f"; + rev = "cdb5b0654d3cafe61d2a845e15b2b4b0e78e752a"; + sha256 = "1gjwgh77xgpdpzlz51c7gxnbpqyzm4hy9baspgjf9j5ny4yisn03"; }; meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/"; }; @@ -977,12 +1049,12 @@ final: prev: command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2021-06-07"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "6a00a2cabfb5ee3f49ff556ceea56892825c0397"; - sha256 = "0z2zr2mfc5m4xn8b0j0br7q96hs42md5wd53viv0zmw67i2pnbcs"; + rev = "c797e8b76155e24ebdf180cef28e1a409604492e"; + sha256 = "0903l7q223id6b91sji8cxk22fmpj1shv3dgxjka8av0wgz7v93w"; fetchSubmodules = true; }; meta.homepage = "https://github.com/wincent/command-t/"; @@ -990,12 +1062,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-01-02"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "90df2f87c0b17193d073d1f72cea2e528e5b162d"; - sha256 = "1zrmcmz7vr74pamr8ig7a4r0y9jqjs2rh4zd66gx67ccf4bjapsy"; + rev = "03b2a8f81102f2994f4888760e0f08385d841c3f"; + sha256 = "1ilzpdyis41p1x6wbkavjpva5hvxclagw6hjn76vpmwibnz99pfy"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1134,12 +1206,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2022-01-22"; + version = "2022-02-15"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "93a668527b203a3353ef2bd5337f6c55119bb7e6"; - sha256 = "1a5w1wmc5vx3y32rci5km73wj6vq6cjgc4ss4w0w95s7sk8kaggn"; + rev = "6c53d863c0843be0f68a138def146d6b8f725b22"; + sha256 = "1f5z99ac72433f2nj714fk6xd76mq7yr5i5z1afwgrhx61zbwn5h"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1158,12 +1230,12 @@ final: prev: copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2021-12-07"; + version = "2022-02-15"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "c01314840b94da0b9767b52f8a4bbc579214e509"; - sha256 = "10vw2hjrg20i8id5wld8c5b1m96fnxvkb5qhbdf9w5sagawn4wc2"; + rev = "47eb231463d3654de1a205c4e30567fbd006965d"; + sha256 = "06znz1869h7cdh9xc0b54mysslgpf3qdwsj5zvnzrzk6fnfin03q"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -1182,24 +1254,24 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-01-24"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "c878e9f1886f86a0210753fa9c146b2e863d84bc"; - sha256 = "1nhzj0pslfzzski3z0synv5vpacfbx359ggsq1z5d9cyapsxchkx"; + rev = "ad255350b66809d4af3aae75f4fb4dd576a06ab4"; + sha256 = "17l6ajaj03d5v8abi8m754ypqwhz1nw232n15y8av15ll0pb7gk0"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-01-23"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "a036b5e3c15baeda71bd76f4b7e9d3de9a057e42"; - sha256 = "1i2yygw4j6g7zihcbja58k2qh0sdn3mqbx277k91bdkf4y1hjdxd"; + rev = "7a1cb8fb1cbdf136bba50a22ddcc056e83dc435c"; + sha256 = "0jj966bansbfzbhbfgyqciis36s7z46n9n8ihy2m7vxynibbf9yp"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1230,12 +1302,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-01-19"; + version = "2022-02-27"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "edf3b7aafa334d72b80d502dcca55b36a5b5ba79"; - sha256 = "1szmnagv2f8ik4ypzgvf68y39243f3877yah6msvfrm44qzh9bf6"; + rev = "6f0837b598d9bf0a30bc30dff39114b2e0cb79f3"; + sha256 = "1vr3p2yqdhf9515y4203h5vjgrc8gnjk1yl9lb4d83ywbbpgcxi0"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1302,24 +1374,24 @@ final: prev: ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp.vim"; - version = "2022-01-14"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "ed04d2ec91c78748f0d8ddf69df2f6e5cffa7bb8"; - sha256 = "1336bk2w4ll1vq6vwd0pq77021i13hcrm3mqzynznvhxwwxrk4dy"; + rev = "40ee62ef9b415da647618b08d1b28d19180a22eb"; + sha256 = "1f73gfbc59lx36xfdh2y6fcan2ia59m9vx1bjq32hj987iw2wxhy"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2021-08-17"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "08764627ce85fc0c0bf9d8fd11b3cf5fc05d58ba"; - sha256 = "0fqjgnpc6zajqr4pd3hf73fg0cjx7cnkhz6cjdf5mvjwllgv92gp"; + rev = "42e6f57f2404b882cb7e491d50e525f8a8eb7f1f"; + sha256 = "1lla0ldgayryib0868zl10dz6yy9dxa0k86fxl5sr6y0csfpi23z"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; @@ -1362,12 +1434,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2022-01-03"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "10fa80481a9489be1ad38ceff84e357a5a4c416b"; - sha256 = "10nqgha8p25n79sgi5arw79pr59q6wldm6s8c876l6al3111971n"; + rev = "6d97ad7fae49f7c00644dd96da64e14c3e23c835"; + sha256 = "0vyahlli5jg1a8m3dnln16n93jlzyimj0jx76dlbg7x906hkjd91"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1410,24 +1482,24 @@ final: prev: denite-nvim = buildVimPluginFrom2Nix { pname = "denite.nvim"; - version = "2022-01-15"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "f88be9be638fd93c8159d3d0434c6e0576bec6d1"; - sha256 = "1xkgbb1av95bi5svl15909mkbb0jhwb15x9fnvbypjzz1i4mvb82"; + rev = "fbee9c1d2ff6d58b6b24c079fbb221414857cb9e"; + sha256 = "1i0adlg0qldygy60ca1z5m7bh0mv4jj5alcd43m8n6inkr0yzsnm"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2022-01-03"; + version = "2022-03-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "e7c9569ad3e8223894872ab7f47b53c5fbffdfa5"; - sha256 = "0ps08viz39476dz31qzssp5xmhhaw5szvr5yj1k58nx912hn9d17"; + rev = "4ecffa4502a65f90397c2194ae308dac49194a65"; + sha256 = "1h23nmqpf5782r3fj945ck0dn0sa6vb0m03sbb4fzd707k6xwnl9"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1544,12 +1616,12 @@ final: prev: deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2021-10-07"; + version = "2022-03-12"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "f3d1f14fa8a8cf882be39605fb037ee982c3f37c"; - sha256 = "0qngyypp8md9rq06xvmwy5qwpa5al6kscj9ivad9mg3wzw6rmya6"; + rev = "c466c955e85d995984a8135e16da71463712e5e5"; + sha256 = "0s14m5k1vw5pfgi9wc9jhvwfwv57hdcrji24vspid8yjzgfjf5yd"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -1700,36 +1772,36 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2021-12-17"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "eef47458679a922ef101c1e4c07fb7b36d701385"; - sha256 = "1k1zsxiq034x72w98117h5cakxxhxak7zq0gwlq812j4gqz8011h"; + rev = "cf32c3fcdbc2f6855f6bb883302c9f290e9c3d88"; + sha256 = "0vikawxr40pkprsn8yzpacs33hfakpb98j5lmpf7sjmvyzkb1x8b"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; direnv-vim = buildVimPluginFrom2Nix { pname = "direnv.vim"; - version = "2020-11-20"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv.vim"; - rev = "ff37d76da391e1ef299d2f5eb84006cb27a67799"; - sha256 = "136z8axjd66l4yy6rkjr6gqm86zxnqpbw9pzkvii0lsaz11w9wak"; + rev = "451e3637a15af7d4a206ac761af7a2247f139e0e"; + sha256 = "0bynm225is7xkzkllx7d95cjarpxaj2yq1p0g2svgwxgqjhb6yhx"; }; meta.homepage = "https://github.com/direnv/direnv.vim/"; }; doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2022-01-04"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "5183d43fd2b3ccbb7747f85275a94aadc84c1b11"; - sha256 = "13mmc7wb4ngxwyjb7i990mf3lgvn2n90m0cy4y0zpmyghrxa2k9z"; + rev = "fe7112ce7db0c8c65420e82aabfe7a98be2b538b"; + sha256 = "07vy5kf7pqsdqsz5jmqj6lm2aizcncfi4j1vmkpnjw9rpp3c733r"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; @@ -1748,24 +1820,24 @@ final: prev: dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2022-01-18"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "210e0961b9bd765b5b46a84d0631271ee8e6af64"; - sha256 = "0f4kf6853wynhdc30hmc9avk1k6inw8jxp9w0sgkgp6958s3ksfh"; + rev = "d7723a842a6cfa2f62cf85530ab66eb418521dc2"; + sha256 = "1qzil8rwpdzf64gq63ds0cf509ldam77l3fz02g1mia5dry75r02"; }; meta.homepage = "https://github.com/dracula/vim/"; }; dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-01-18"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "3f23266f0c623415ab8051c6e05c35e0981025b5"; - sha256 = "0khdg2wn204f0rrh5m26iaymf4ic73lk5h5z0zkc1ahdhfy3alsv"; + rev = "31f12fff6e71a14ddce30bfc7ec9b29a2137ccde"; + sha256 = "0kjx04q2hnbvw68wh3d9li9p9s5d07j308kfhawpnhnmv6g57nzw"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -1784,12 +1856,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-01-24"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "840bbfd5158976ae6e0f0b79d110e40bdabd084c"; - sha256 = "16gs2jfqwn081f12gmdgzkjxxha278rm57p95dsf752374gkn5v5"; + rev = "36c08622c4420129fa576ceafa4ed3388d3beb56"; + sha256 = "0hai4ns9chvqb8x7vgcl0i0lxqvqwxwhpa489zsqsp1lb436bwqc"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1809,12 +1881,12 @@ final: prev: editorconfig-nvim = buildVimPluginFrom2Nix { pname = "editorconfig.nvim"; - version = "2021-12-12"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "gpanders"; repo = "editorconfig.nvim"; - rev = "fd56950ca2427114f7d2e34aba312df3c2788cdb"; - sha256 = "1hns2sahc6yy8k3fkbpyd94sm3ywfcz3hndmijz5b1qnr5xhcvf2"; + rev = "495d3e2f56ee392de0d55902c82849f94b6fc86b"; + sha256 = "1m80hjm1m04dsivwqhxk5753gd8yzww62130wvgdsac3z394zzrn"; }; meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; @@ -1845,12 +1917,12 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2022-01-10"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "2740b2f15708dee3a5b390709e07a69255f75d75"; - sha256 = "1y1i5wzs1w20k6yyr6l8861bph7xj50ks66yxy7kc97f18jrpra6"; + rev = "3f7f03aa2ae0d4185792aaf9b960bca0d22c48fd"; + sha256 = "0gv2ivrwsrhnsr2kh56yj3m1l4ydwq27vllzxa5vkpbb11jydf3d"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -1880,6 +1952,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/emodeline/"; }; + everforest = buildVimPluginFrom2Nix { + pname = "everforest"; + version = "2022-03-21"; + src = fetchFromGitHub { + owner = "sainnhe"; + repo = "everforest"; + rev = "764e36cf49a5845217ef09281adf708ab5abd9e3"; + sha256 = "03byh70krkcgcj6yis7x73bzs8b21qic5qhi01az057rp7mx462l"; + }; + meta.homepage = "https://github.com/sainnhe/everforest/"; + }; + falcon = buildVimPluginFrom2Nix { pname = "falcon"; version = "2021-12-19"; @@ -1906,12 +1990,12 @@ final: prev: fastfold = buildVimPluginFrom2Nix { pname = "fastfold"; - version = "2021-09-30"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "konfekt"; repo = "fastfold"; - rev = "eee93cca626fdcdfae0ddcc6f8a956c85455acd3"; - sha256 = "1jm8dnr7p8k9ilc97vqrr5cx1adfhla0rc679iajg2h5ydxngfxk"; + rev = "e4a51e0f6763720ab1d1889e1ce3fa3beaaf00d3"; + sha256 = "11v3jh8qrpwpnvjj1r9z522v9bsyvxwxb8s8856a2zl6vn9caqml"; }; meta.homepage = "https://github.com/konfekt/fastfold/"; }; @@ -1930,12 +2014,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2021-12-28"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "e54e0cc5338b44d97dcaab83dd67d5a522656774"; - sha256 = "10xqjh8dj470iikhpksbk0w767s3i73s4p4qnvpznr4lqkg7ckr7"; + rev = "290bea8e8a782586de32bb8d0bfb056ff8acdb9c"; + sha256 = "0sjg8hb6z9c7kscx26jkdxl31qy244w76iywy8xp7143kb9p0qx1"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -1954,12 +2038,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-01-11"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "b6204ec4e04732d7b4ba73a3e4af48cba3576d67"; - sha256 = "0ndddww8ciwil7bpn77yahb7fcn5i59sq91syqy3qr0wwmfc7mwc"; + rev = "45950d39965150a6c6bff1979303e735460379d0"; + sha256 = "067aild4sr5zd08fn2dna9ndycf5i4w524kkz88yzhyr7h5rc0w4"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1976,6 +2060,18 @@ final: prev: meta.homepage = "https://github.com/wincent/ferret/"; }; + fidget-nvim = buildVimPluginFrom2Nix { + pname = "fidget.nvim"; + version = "2022-03-20"; + src = fetchFromGitHub { + owner = "j-hui"; + repo = "fidget.nvim"; + rev = "d47f2bbf7d984f69dc53bf2d37f9292e3e99ae8a"; + sha256 = "0nw05yzy1a9yq8jvjgzq1y2wbq1x8rski6brmz3pn4rdmpkzqvsd"; + }; + meta.homepage = "https://github.com/j-hui/fidget.nvim/"; + }; + file-line = buildVimPluginFrom2Nix { pname = "file-line"; version = "2016-10-21"; @@ -1990,12 +2086,12 @@ final: prev: FixCursorHold-nvim = buildVimPluginFrom2Nix { pname = "FixCursorHold.nvim"; - version = "2021-11-02"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "FixCursorHold.nvim"; - rev = "0e4e22d21975da60b0fd2d302285b3b603f9f71e"; - sha256 = "1qrf6ig1gbrbq6wrxqkabnqx6zqwjw7wqacl7q2ckw4sy6sam7mz"; + rev = "1bfb32e7ba1344925ad815cb0d7f901dbc0ff7c1"; + sha256 = "0b1iffk6pa2zwd9fvlgqli72r8qj74b7hqkhlw6awhc7r1qj8m1q"; }; meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/"; }; @@ -2051,12 +2147,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2021-11-03"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "0cdce2da8762ee01ee7d8df047b6e569d58c1ba3"; - sha256 = "1169xj5k04l7gfhxqa4afq9khf6yv5bcihir21sgzpym4z69axh7"; + rev = "cc42c16a793cba102ac75574ab187a77995ba06b"; + sha256 = "1qz87l2da378wcbbck6n9p82apl594x2kxldl4sxhy88rbbqi2vb"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -2075,12 +2171,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-01-23"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "a8efb538f4be58b4f4586bc964f9f10496c05e31"; - sha256 = "0yj7ijr091jsd8rny4zx34427w8v87iywysig5pgrz7iz421wib4"; + rev = "e302658e765cf20e6af5a1be8cc07a996d6ee2cc"; + sha256 = "15s2k776wf4qs3w101q6dwip8abqhsxb1f7xnx41zq7j1r09i20r"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2099,12 +2195,12 @@ final: prev: FTerm-nvim = buildVimPluginFrom2Nix { pname = "FTerm.nvim"; - version = "2022-01-04"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "numToStr"; repo = "FTerm.nvim"; - rev = "eabb65f23ba48ec9e8abb9a2514f99b77b3bc6f2"; - sha256 = "0bk1lh9i584ysj5yvmb7945nkighrc8blw28y6npqaf6mvma31n6"; + rev = "233633a5f6fe8398187a4eba93eba0828ef3d5f3"; + sha256 = "0sxnii921xia4mrf67qz7ichi9xqr9zf193hb9dx199l7hl6k1p8"; }; meta.homepage = "https://github.com/numToStr/FTerm.nvim/"; }; @@ -2159,72 +2255,72 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2022-01-23"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "74a8b7d3f39dbcbcb920a99b63adc4867363e8c3"; - sha256 = "0c80shgzxz90213qhx7bvd1fkzkdq9g79m157dnwvzh121jmpdap"; + rev = "b02056f3c4b9d64d876bbf0a58d20791345a9364"; + sha256 = "16n78ylicrd7lh41g5hvd9vnnhkwbvj28c190k5zvrblyyhipn93"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2022-01-24"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "91332acb1c48e7080539c5b5cd131816341c738c"; - sha256 = "0s8695m25v2j5hpp80g3hd28g7ja17yxih5cd71jqmqvl3zwmqrg"; + rev = "b23e4bb8f853cb9641a609c5c8545751276958b0"; + sha256 = "02gz5j1pa8d7sgksjfikv8vf3gz41r6z33qwhiy9nvgnrwwmckwf"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline.nvim"; - version = "2021-04-25"; + version = "2022-01-21"; src = fetchFromGitHub { - owner = "glepnir"; + owner = "NTBBloodbath"; repo = "galaxyline.nvim"; - rev = "d544cb9d0b56f6ef271db3b4c3cf19ef665940d5"; - sha256 = "1390lqsqdcj1q89zn6y5qrm1id7p8fnpy07vlz6mm4cki47211mb"; + rev = "4d4f5fc8e20a10824117e5beea7ec6e445466a8f"; + sha256 = "0xgk64d7dyihrjir8mxchwzi65nimm9w23r24m99w6p0f9qr56gk"; }; - meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; + meta.homepage = "https://github.com/NTBBloodbath/galaxyline.nvim/"; }; gen_tags-vim = buildVimPluginFrom2Nix { pname = "gen_tags.vim"; - version = "2020-10-12"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "jsfaint"; repo = "gen_tags.vim"; - rev = "f888a2f8732e08d9f2b638b144c5c826a30953a3"; - sha256 = "16gkczlaani0c0v3hkklriabhkgcs0mg9mrbn8jzfsap15cnkgk5"; + rev = "a7221d8edc3ca2d8616e3f57624b2248f390c34f"; + sha256 = "17gn7k835181cmd49i16yw22z2861wgk5y3la1la7cx1az2h83f4"; }; meta.homepage = "https://github.com/jsfaint/gen_tags.vim/"; }; gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2021-12-10"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "b6027756f5bdfaaa24b26c5472f8904f78e86c3e"; - sha256 = "0w0nvf1ha065d16zlgqf77rvf52qs350zzy2rb4b741h1fk34v59"; + rev = "cf5f268f8b19262515105739bdcc112cd2a6cdbc"; + sha256 = "1pbvr1yirn17fxw8zlzp8j5brj0n2sdm3ampjryirdxknli93685"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2022-01-05"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "0901c07f33164378cb9f21156d52661abc2158f5"; - sha256 = "11rzkw19m3nazsc202a8qrl11kb77nrhl8fbb076nf7s9l97lwkh"; + rev = "f48626bf5b64067a84b644bcc56afac686046966"; + sha256 = "0v2m05980r5zq77b11nghjgz0yr70a88gd7jv0d0iy2z6ah63sxv"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -2255,12 +2351,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-01-19"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "d0c1ad8cdb6ad9455f9e084e55c6e411bdb03b49"; - sha256 = "0mavqgxf4ryd5p101c7nzzaxhpcpxlrzlr2mznfg23i1a36ibzxy"; + rev = "e60bfbc314476777a5ce200e533699691a5cdfa5"; + sha256 = "1nh54hfc0cvz3a9znrp32ialpbqqwlgbyw45m9b489g9kndf3y2k"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -2303,24 +2399,24 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2022-01-10"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "e83ebb3465fb224df394477a0d68a61094d3f7b9"; - sha256 = "0442yi5j1fdzh2wmyn59z9mzyzsja0j0dkialj4gzlsglg6ndbai"; + rev = "ff33d07bb64e104b387fff7d91650a35274f81ea"; + sha256 = "1sxhcbww0f780lp0zda1iaiyp89c6cirs0ncihjxr106a47zpya4"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-01-22"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f43cee333fdfeb27aae86bab73a38c5885d5c7f4"; - sha256 = "1rxx8abg4kx6n6xbg2fyw3cjixcnynkg4l00xjh4yk44bi0f65f8"; + rev = "2a107231d92fa37224efdbc475abfba71f94b5ee"; + sha256 = "0i17r2c48csff7pl0k1vvc5j61xh3qv4xq6v75raz937w0kj6hfg"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2351,12 +2447,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-01-20"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "df202bd09bab4b63f5f64857eb8f3411d46fdf11"; - sha256 = "1ndgrrlhw87vwy12fzvf5fhnjdsl9na1a3j4hj6slq9v48rkv87f"; + rev = "64052ad16286281861de9281dc0695c80cc9ccc4"; + sha256 = "0ykd5ps6i7256w6yxvpjp6yia85ds9ln8icd29lzddf1qpza4rnr"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -2435,12 +2531,12 @@ final: prev: gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2022-01-19"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "118f3b5576bed4cd345475aed0d61f63c6b20809"; - sha256 = "1n7sj5ia40x0lpf6q1s39zz46578wwb9v1z3vaxqwxdwrncrnn15"; + rev = "b6f47ae7031f6746a1f1918c17574aa12c474ef0"; + sha256 = "0m8rrm5v542a2c30sg7hlgm7r6gs4ah1n6nr5dc101l2064kg97g"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -2459,24 +2555,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-01-24"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "d043cd49c344e41cd07b19c5252ee31e356c8ebf"; - sha256 = "10m7wk8p6kwc8zgfl64r901vkxrsfv9bwnzxi4cx3s03vvkq1c00"; + rev = "b8b63c81637c845e8a7c2dff4c206b714f7b93e4"; + sha256 = "0ds72yyca1sgrr5b7i683i0lpfz6n75vrij94vc8z07ivn33qy2r"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-01-10"; + version = "2022-02-12"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "ba2a3592174c19d6f3231d06723606f6ca33fc23"; - sha256 = "0qcc0f4lky8if91faw6923sdpgvr67nsfgfb1mqmhriwvq02l46y"; + rev = "dc6bae93ded04ac542d429ff5cc87189dde44294"; + sha256 = "06mvdxi1pf9mw0zrk0cib3bi9p82ymdc3acm4r2rr4rqww8mrq4x"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2507,12 +2603,12 @@ final: prev: harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2021-12-04"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "6948a402c2d7b1a66826d28d50ad86c0b2c8a6cf"; - sha256 = "0bg5ax66fsrqbr4385fh1klljrmh3ycrda8fzk3lm9wggf0z93js"; + rev = "b2bb0d6f2b8a55895afda53f0ad04527998d3411"; + sha256 = "0izsscglfk6lpisxvarr0qw4m9br8854wi6jhyp2msd8r9gcrzi7"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; @@ -2567,40 +2663,52 @@ final: prev: hologram-nvim = buildVimPluginFrom2Nix { pname = "hologram.nvim"; - version = "2021-11-14"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "edluffy"; repo = "hologram.nvim"; - rev = "1d1acf102de7a5eed7de62691250b064d6db9d8a"; - sha256 = "0ihr85iisjc3xr9jhm4fdgzhrjr1krnvinzb2x8cgmk7zsl5l194"; + rev = "7bd3ffb073dde94c8d86c1b49c47ef9d2f2bc605"; + sha256 = "0hld4cr09bd0y4k9yz1lls5dqdak605zf5rnv75zi5scbgwly19c"; }; meta.homepage = "https://github.com/edluffy/hologram.nvim/"; }; hoon-vim = buildVimPluginFrom2Nix { pname = "hoon.vim"; - version = "2020-11-09"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "urbit"; repo = "hoon.vim"; - rev = "91b1922f8627bb0a55341bb088f2526d0f43a6ac"; - sha256 = "0h87r7r74iljwvfc6mb1maa08cxwnk6k89gc6vnwqm1zx6qxw1js"; + rev = "233d48ab2621877d8899b7a75b70f379ce36a066"; + sha256 = "0bq8vd6dnf39y3686snaywp8krmjghfsxnnm0k1cyv20g1mf54s5"; }; meta.homepage = "https://github.com/urbit/hoon.vim/"; }; hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-01-09"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "f418a3750ed3a7f321287a39d2c9a56d8ad630aa"; - sha256 = "0imscbnaw02cgxn1qh42zz8divnv43mgccaq4hrancnhixr44lw9"; + rev = "e2f978b50c2bd9ae2c6a4ebdf2222c0f299c85c3"; + sha256 = "1si2ibxidjn0l565vhr77949s16yjv46alq145b19h15amwgq3g2"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; + hotpot-nvim = buildVimPluginFrom2Nix { + pname = "hotpot.nvim"; + version = "2022-03-23"; + src = fetchFromGitHub { + owner = "rktjmp"; + repo = "hotpot.nvim"; + rev = "72704e1914648774a4fb42f57ca411d689e08ae6"; + sha256 = "1dh6i2asqrhxc1irnhr46drn8ksj7xq81m6ankvy1gj8bkc74dmp"; + }; + meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; + }; + i3config-vim = buildVimPluginFrom2Nix { pname = "i3config.vim"; version = "2021-06-23"; @@ -2651,12 +2759,12 @@ final: prev: impatient-nvim = buildVimPluginFrom2Nix { pname = "impatient.nvim"; - version = "2022-01-18"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "lewis6991"; repo = "impatient.nvim"; - rev = "4df4e9360975a8be6e7a7270466fedfd1adcc5b6"; - sha256 = "082ir4kslphx06x1fgyw31nc2yifx3x3p2233sjqibjjjzj0qafh"; + rev = "989eefca3539b9958df100e8e3130f55eafe1709"; + sha256 = "0cypb6nm0jlgf4cbsazwplvniiqrnda32nk2nkaqm0dbprs920sv"; }; meta.homepage = "https://github.com/lewis6991/impatient.nvim/"; }; @@ -2711,24 +2819,24 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-01-22"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "2e35f7dcdc72f39b37c21e43cdb538d7a41c7e07"; - sha256 = "1hgj7k3ml7n11nqn7cmn7bpls0rm6xh5z4sgrsgjyvrdnw6wckla"; + rev = "ebedbed53690a53cd15b53c124eb29f9faffc1d2"; + sha256 = "1wsxvlpq78vyvgz6g0ji07dy1b10bsfr1qk9qdpj2n5592zp8zlk"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2021-01-28"; + version = "2022-02-15"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "5617a1cf7d315e6e6f84d825c85e3b669d220bfa"; - sha256 = "1ns3v4r5m6ckchmkaqkpk8dymh7hwj22d7x23hagmk4zv4hc2mhq"; + rev = "7753505f3c500ec88d11e9373d05250f49c1d900"; + sha256 = "1lh6d3ljz1rmj3xa4f0n687fyxxc30dnmsq8mgd77v27f7lj62p5"; }; meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; @@ -2819,12 +2927,12 @@ final: prev: jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2022-01-17"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "08ad42efed82dbb7547fdebe2acc194f50e07854"; - sha256 = "16acd976d44whpkl5bypskpf15a6mjf72pijjbg6j0jjnd2mm9qw"; + rev = "32d05f7742dfb0ef84bee99e059ac3b7cb9526eb"; + sha256 = "19z9i07w3wgf939fiy6kh7mq5pvlay3w37sm0sv4bmrdi42p8b4z"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -2832,12 +2940,12 @@ final: prev: jellybeans-nvim = buildVimPluginFrom2Nix { pname = "jellybeans-nvim"; - version = "2021-04-07"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "metalelf0"; repo = "jellybeans-nvim"; - rev = "cef41133874073b35bf7e8061d97a5214623770d"; - sha256 = "1hd21h48mwsixbx4iw8r86pmml2z79wpc0p0wb8d50jjxlyphgv4"; + rev = "f77b75443adf6461ded30de0243f49771f933d06"; + sha256 = "187xvsfg9ac04006bzcwdi03l5cnzg3rg7ak1s9n8wb66s25vrpx"; }; meta.homepage = "https://github.com/metalelf0/jellybeans-nvim/"; }; @@ -2892,36 +3000,36 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-12-08"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "e4972997fb5aee1c180e9840586a09553865cc20"; - sha256 = "11v9fhd7i9si5psnsrvdgrih64rgjjy7ypjlfz9ys74rcryfyy5x"; + rev = "a2c96eda9d5b0dde03d2e22d0888e40426cd38dd"; + sha256 = "1x9f3gd4bgj3f1c75bp58mvaxll4rw55vznqckc0w0p1bcwq9faw"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-01-23"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "7a3442f416174665e9114d617a9a366438bc9f3b"; - sha256 = "12nilfk56va7y93yvi6nkh2fqw1a4w7bhzh085ir0kss66nma1bp"; + rev = "f5881a688b951cb35a7f36628b23ee4393d96daf"; + sha256 = "1h4m0mcgvpdxh6pzkg2k5am9g31w8xpq84rcpqchvql7yhyjv4g7"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; kommentary = buildVimPluginFrom2Nix { pname = "kommentary"; - version = "2022-01-21"; + version = "2022-02-15"; src = fetchFromGitHub { owner = "b3nj5m1n"; repo = "kommentary"; - rev = "a190d052fca4ce74ffddb1c87c87ccf15f9111d5"; - sha256 = "0p2hyqv73gn1lrzf8yi84cfj199jx8ix0llm4jykkxlyx3qprwq2"; + rev = "12ecde4ed3ecb39964000a5fd034ae4c1d307388"; + sha256 = "0zf9p181rlkn0d0d53ckg4992wgdgnxpkgmn9hv2sajsrih4m0z9"; }; meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; @@ -3000,36 +3108,36 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit.nvim"; - version = "2022-01-15"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "2ee9f4d0fcba6c3645a2cb52eb5fb2f23c7607eb"; - sha256 = "199fh056ks1p8l2jahwzr5azq3rihbzqrbk6pay32qh0ixk462qv"; + rev = "ca8ea75e5a1d838635fd2fcc5c3467a5bb33c4ec"; + sha256 = "1h09yp9kmzbcraw88gdkzlv834p0yi5xacpmx4ksmp4yh4an6h5d"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-12-21"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "5626a1f71bcc2dd7a74156f22c53734621c12433"; - sha256 = "0xr76yf5wm4mggf5993m5sywim08dg3qsgx84xck5zcqiz84i3q9"; + rev = "60e14a5bbd52a22578d6335c606d0539067b9327"; + sha256 = "05bx5wm8r5rs4y51pkgb2m6bxzddacn7f3bdsgnmbvxz0rxyq8dp"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-01-24"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "4d613c6aea73be9b8882d5710b11f502ef8692db"; - sha256 = "16lcr9bbiq33agd9p1cwrrxmzsj3xmva1lva8ay4zrm1v2v45jn5"; + rev = "c22a0a6d288488a05a74aaa53dac4d2d71f7a30d"; + sha256 = "0rb1gw3ndrjw5k1l2ckm936xp83krrwi3ylr27il8mdf4xllw3y8"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3072,12 +3180,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2022-01-12"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "22d6495d6c3c1e6cdb26ea2e541e285a5651a98a"; - sha256 = "1aqzsckhh7abl41zh816w327f28ly8i2fh24qdgdjjmx4cpxbaxc"; + rev = "fbc05de53ca98b7f36a82f566db1df49864e58ef"; + sha256 = "1gyxa9larwz8brfs47ivxcrx03fa52pvc6kw31c7nl03j5p91f8m"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -3132,12 +3240,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2021-10-05"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "61c7c8668b80537aefa69654a6e5a5e63095be61"; - sha256 = "0aa7cwzaqzma1w5xyvppj6g3i8kc7199zwd4nhc9ydx9isn885sh"; + rev = "59b2c6b0ab5ad41ce42db89f05c8ea67020099ff"; + sha256 = "0laz118k20sm3bn6r81f8pg9n77k5038c0vhgpbj349k3zraygjq"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -3154,26 +3262,38 @@ final: prev: meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/"; }; + lightline-lsp = buildVimPluginFrom2Nix { + pname = "lightline-lsp"; + version = "2022-01-09"; + src = fetchFromGitHub { + owner = "spywhere"; + repo = "lightline-lsp"; + rev = "78a8f6880c1d979b7c682e1b37299d970506f480"; + sha256 = "00zkpri1pi6r0m0v91361zixqsfrf05hyml61k4s0i3yabfv84w8"; + }; + meta.homepage = "https://github.com/spywhere/lightline-lsp/"; + }; + lightline-vim = buildVimPluginFrom2Nix { pname = "lightline.vim"; - version = "2021-11-21"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "a29b8331e1bb36b09bafa30c3aa77e89cdd832b2"; - sha256 = "0n3wrfcw6k95cmwg8jpxh0y9jy6y2bjgvszjgal9yha7y8gv6a9v"; + rev = "11931e2de42cb1a14887a002a874f0b2daf12bc2"; + sha256 = "1iyns1bm3wjr6z2hmc0p9j61vhprhax4f9qdqaf3w7vvgkhx1xj6"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-01-21"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "428051b2e5212cea914510eb9eb979ec06d5b2e1"; - sha256 = "01s3v3jfmgyrmwkifnyfh0wlm1d5fdvfvya0564y76bj4sh2lpzw"; + rev = "58c9e321b188e040703b01f16922623911f11117"; + sha256 = "1x9w6nk69a6xzhr9jpcvnw3jby09k49y7gikasxyq5gpq6rp9dfs"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3204,12 +3324,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2022-01-10"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "ca02a1031a2393ec6bf8967657daf06e4d402523"; - sha256 = "1r5dp40iwh227whbdizdgzkjbj5zzs1s0ryp64id3gn5vl1pfmbd"; + rev = "00c30733467be30a72311e08030bba34ceb4f6df"; + sha256 = "1psyvz4qb28mlkbxjs5xy6l4vhw9jyzc0j460xx2phiiz7raq852"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -3228,48 +3348,48 @@ final: prev: litee-calltree-nvim = buildVimPluginFrom2Nix { pname = "litee-calltree.nvim"; - version = "2022-01-20"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "be1c8d67ef80dc4cdfc164d3a95a45d8d551b3eb"; - sha256 = "0qqyws79a4d4kn1vgb7p8iw7vlx2flb3ra2y2xvjilyvzz4ppqrq"; + rev = "3f3c25e584558949b1eda38ded76eade28fa5fd6"; + sha256 = "1k1i4c8rydnhk36pcwa9dhvlbawda0dbwh6ppgypm1xnda10hv3h"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-01-24"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "15014fe3855848ebe48431c789d8e8ec2e9efe34"; - sha256 = "1xwysily6lh8z9wd8g983102lfj4543dpqzfk7cr7zqd864qj951"; + rev = "4f54ff9708c59385dd2f08aad1ba7df879e638fc"; + sha256 = "076wyp90mr43xniv0zc7wh6rfk1wr50cpfw5lvaj6ai7dyys466n"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; litee-symboltree-nvim = buildVimPluginFrom2Nix { pname = "litee-symboltree.nvim"; - version = "2022-01-13"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-symboltree.nvim"; - rev = "9baa027c79abdadc0a63bdd14d248241a1333b99"; - sha256 = "0lr203px4ydakqnqavymd2f08gj5mid1nhb63rww72i7i959hz7v"; + rev = "ab90e26d68157d3f016f9a5d5c1d3a46a174618c"; + sha256 = "07cfcmly1xdy4vmng8l2q2cpc99nvpdyihnl8x5xs2i7n1zakmdh"; }; meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; }; litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-01-19"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "54b3bcfd70250b5a5dc1d51d0f3653a4e6892555"; - sha256 = "0z4y7iis1fkm76ibkfln70fasywwrlrf25r3si6ns0s3wq9q849v"; + rev = "c9fd775aebf702c81e2077693336584a0027d496"; + sha256 = "1zbxn3hzss41zwp0b1cwhh31zj0443xfpxjkchml9sq4f0hklkvd"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -3335,38 +3455,38 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-01-23"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "64eb5cc8961e54b2888d363bb94d551203080b45"; - sha256 = "0v3dza9mp351715i87x75zxkm0d5i7v77a5zq8c8mlhz1v31z0vx"; + rev = "e4f7dad45a1a3bb390977b4e69a528993bcefeac"; + sha256 = "0smxcvgyc575kmz9aw20k47awh5j11ywnc1lpq1hdgkppxm7lnm2"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; lspkind-nvim = buildVimPluginFrom2Nix { pname = "lspkind-nvim"; - version = "2021-12-30"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind-nvim"; - rev = "f0d1552890e384f15b47ea88bd1b8a077cddc24a"; - sha256 = "0wnkwh132cxnp9ppxlxrx87lykizx9mc00hg0zdvgys2h51kh050"; + rev = "93e98a0c900327ce7e9be1cbf24aebbe7170e375"; + sha256 = "1c13ll09v16prhzgmv8pappck4x3ahhc5sizp6r61kb7k4mkfpfk"; }; meta.homepage = "https://github.com/onsails/lspkind-nvim/"; }; lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2021-04-25"; + version = "2022-03-14"; src = fetchFromGitHub { - owner = "glepnir"; + owner = "tami5"; repo = "lspsaga.nvim"; - rev = "cb0e35d2e594ff7a9c408d2e382945d56336c040"; - sha256 = "0ywhdgh6aqs0xlm8a4d9jhkik254ywagang12r5nyqxawjsmjnib"; + rev = "5309d75bd90ce5b1708331df3af1e971fa83a2b9"; + sha256 = "0xvlpjv69wf18nw5hbmmgbhs8ws4gfq5ny2vrncqaxcikr3gdmms"; }; - meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; + meta.homepage = "https://github.com/tami5/lspsaga.nvim/"; }; lua-dev-nvim = buildVimPluginFrom2Nix { @@ -3395,24 +3515,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-01-24"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "9208bae98fd5d1ab6145868a8c48bfee53c1a499"; - sha256 = "1dz4kg3l79d128jgqs6cs8ikvr108z46ijv36wq7pw3dam4ybnaw"; + rev = "f14175e142825c69c5b39e8f1564b9945a97d4aa"; + sha256 = "0x6f88ixb6xd5nh3d8y5sql8yfyqs5fnpvdkdv9ywp7swzaydgqc"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-01-24"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "59576a5cf28556a393eedfe38467e998288fc905"; - sha256 = "1bwmzvsm9d6ilq616697rwk3j29i0q3nzwdyapjyxdyhp9rivgsj"; + rev = "d03f0c32b2aa763915401421f6b084315936590f"; + sha256 = "0qrryj40v70wl1mwn3jc0f50ygslc0848gppki5sxv1aq56a58ps"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3431,12 +3551,12 @@ final: prev: lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2021-11-06"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "57e9f310b7ddde27664c3e1a5ec3517df235124b"; - sha256 = "0y38id1dj15snx79sazh0kvs2c3jb1h6kyzr90zhm0130m7x6nri"; + rev = "fa7694fe221ca595d6f8c4f1aab531b4c1d48d7b"; + sha256 = "14cs574nk0hr6mbf80gcjdarwbngbgj73s1grn6yczr2gqqqmhwk"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3467,12 +3587,12 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2021-12-28"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "chentau"; repo = "marks.nvim"; - rev = "4b0aad42e72a653ca1afe31d2942f8aa5ab633e1"; - sha256 = "1qvgaf353aaq3aw8q251vx8llvm30c4yj1lyvnh43r5h8kxawc6x"; + rev = "74885b10abf792f61a612f5724030678b9704dab"; + sha256 = "12653fd7h1s0hf55399vdk2w3aqyx8n8v62kgpvb62mywbg37bam"; }; meta.homepage = "https://github.com/chentau/marks.nvim/"; }; @@ -3501,14 +3621,26 @@ final: prev: meta.homepage = "https://github.com/Valloric/MatchTagAlways/"; }; + material-nvim = buildVimPluginFrom2Nix { + pname = "material.nvim"; + version = "2022-03-25"; + src = fetchFromGitHub { + owner = "marko-cerovac"; + repo = "material.nvim"; + rev = "82f74e8ec5d21a8ec9ebe1175c330a0b6e490212"; + sha256 = "0hgcgj84d92js6i6skwzznz0ym8cgzwr4pz5aqi038g8ldpcx0ki"; + }; + meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; + }; + mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; - version = "2021-09-13"; + version = "2022-02-10"; src = fetchFromGitHub { owner = "mattn"; repo = "calendar-vim"; - rev = "6595a540a3fdf3d2a65ff18b3bf157540dc2602b"; - sha256 = "1186fbfhpb9n8cp79xbgq7q6a5sgndaldadrhshlq0nm3ajwv6v9"; + rev = "2083a41e2d310f9bbbbf644517f30e901f1fb04d"; + sha256 = "13wakcprkh93i7afykkpavxqvxssjh573pjjljsgip3y3778ms5q"; }; meta.homepage = "https://github.com/mattn/calendar-vim/"; }; @@ -3527,24 +3659,24 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-01-23"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "a89d87667eec94915121d8f5caf199f63f9ff81d"; - sha256 = "0l6k5djgvhkl7y86g7wmaxs0yq5nv0g6aa46kjjc81lvycj9qg3m"; + rev = "b0763e58ccb8b203f87fcd58fe2fecb095119f96"; + sha256 = "0qbyvz7l9p9iia7mh41119zdgz2v8xrkp8wcxl6hyxqri18j49yn"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2022-01-12"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "e5707899509be893a530d44b9bed8cff4cda65e1"; - sha256 = "0kx5xdakwv9g8fhhc40rz2c0as5pjx46ymdw09bc5h1nnhwkgp8x"; + rev = "c8ea2a5550b95b007631bc83908c48a3368eb57c"; + sha256 = "08amdbn4xcdl7d09w3iqgrlyfmqnxlwmnild9q5mpqh5z372y6i0"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3563,24 +3695,24 @@ final: prev: mkdir-nvim = buildVimPluginFrom2Nix { pname = "mkdir.nvim"; - version = "2021-06-20"; + version = "2022-03-12"; src = fetchFromGitHub { owner = "jghauser"; repo = "mkdir.nvim"; - rev = "caa4178dae081850230f2f05699fef8e83b59ded"; - sha256 = "0s87hmna6bl9zy12ni2ih4i7aml009slmsk1pkpr93lmh2mspms7"; + rev = "01261650382bef195dab8ac39344234b57914f09"; + sha256 = "1irpi2aqi2pr0ydxsw2d4m2lkhzkqcs6gvz15snvnsckvk03j3v7"; }; meta.homepage = "https://github.com/jghauser/mkdir.nvim/"; }; mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2021-12-06"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "a6fc41f7630e675ca5f0aeb829ad1b88c73a7c63"; - sha256 = "08lls5zzlzglxx7hw19vid4kiqdsdnwahgw306vhqlhhx8wc00w3"; + rev = "e3f0718d53347e884f9f2282c35df0063ec6f9b1"; + sha256 = "13j611r2hzz2ldbvir89bxab4cicy5nrg9s780dsriz2g4slj5hg"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -3609,26 +3741,38 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; }; + mru = buildVimPluginFrom2Nix { + pname = "mru"; + version = "2022-03-12"; + src = fetchFromGitHub { + owner = "yegappan"; + repo = "mru"; + rev = "2698dc2622450645618e6457a81d325954ba725f"; + sha256 = "06w4rmdn48h21wl9mn5v9mfkaaypd1fxhdjiv7ng5zj7jgi1qnsd"; + }; + meta.homepage = "https://github.com/yegappan/mru/"; + }; + Navigator-nvim = buildVimPluginFrom2Nix { pname = "Navigator.nvim"; - version = "2021-11-18"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "numToStr"; repo = "Navigator.nvim"; - rev = "f7b689d72649e1d5132116c76ac2ad8b97c210d4"; - sha256 = "17yfc7ss9yslf8dvwl0vi3mdpcxp5j1g6dc8qrz20v2dx8hjxd1q"; + rev = "58d07e658c15b61ef7b6e375073b1f06934bc28f"; + sha256 = "0d40rilwcxi7q36fnk4xpyx1cq3nb4yf22j8k8zq6mwg5h4j648r"; }; meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; - version = "2021-10-08"; + version = "2022-03-17"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "d2d8cc430232f385d8468f44da8635febb9a92ad"; - sha256 = "1zkl8g7kf95rbyk9zs1xwr0n76l1f9vvwc2432rsmgj2bdly8vby"; + rev = "24d77cd5206438a6670ff1cf8d1628532910e14e"; + sha256 = "1avxqqajkd1rhz61c066n4qxv5955yl6w5mgm15z3disgi68kvb2"; }; meta.homepage = "https://github.com/ncm2/ncm2/"; }; @@ -3851,12 +3995,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2021-10-25"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "ac084414cf1e0de86f5abaab6269b940806e8c6e"; - sha256 = "0456mvm8yzpfcfqrn9affj8s70bc2r13q07hkrlmix7d0g8mwlg7"; + rev = "4b537fa01c28f2f7cf249722530561d2e477b49f"; + sha256 = "09lkbwijvl34ff2pagra383n517k1b1nw2lpjv2jlik0970sbcbv"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -3887,24 +4031,24 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-01-17"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "d31b4251cb9985a2c21e6c6dc53decdc48954680"; - sha256 = "1j8h9gv3ilx42gm36xh9z2br3hzakf99z49s08cwfy5xvfwbm2ds"; + rev = "bccf41d62e874fd614d83c8b0e942cdda6b98012"; + sha256 = "163pfqa33n1hzz3wb02ymisvl070lz1apcgyn349xbq4fz7ry3b9"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-01-16"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "3086635873ae37fc8e28d7de55c2969682104a7d"; - sha256 = "1kff4hzgvp5fplzzi4gkmjc99mn5h414c5g1i6i0kddk4cpmhh2z"; + rev = "9987421e0724ce704d0035f50a7080c677a85d71"; + sha256 = "14sbbih38494ybhs5khsd07rq0136gdacjchfz8bx3sq05l0blmf"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3923,12 +4067,12 @@ final: prev: neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2021-09-17"; + version = "2022-03-19"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "8df876172fd9b8f6c023fcd5b84728a675cbdf91"; - sha256 = "0dqr9b2h0f2rxiw4lvws2gamwxdmnqb2qsk2ish47v7lnc772l2l"; + rev = "0556893d7fbc1948ac1a82cd0f41023d76a234b2"; + sha256 = "0dw6miyxbbi71na8qb7nqk20vni1q46lmg51r0h354xcnxn4hyms"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -3959,12 +4103,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-01-24"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "02b185ff04083df22d8d1f957eaee9d1d50c6684"; - sha256 = "1kqcnyk8hb80w4ngggjmhnqnpmks3bzb8l0sqh3vdxzpz2d8bpj1"; + rev = "8f8c1ae889ffe666423a89271933272ebffec3ef"; + sha256 = "10fgkrr9wn6jj35qa42c353k4rnys9a2wrckjk0kwrx6kvx7m6l6"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -3995,12 +4139,12 @@ final: prev: neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet.vim"; - version = "2021-09-20"; + version = "2022-02-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "0ab419e93f4256baed77229548195402e170afa8"; - sha256 = "1gsf5d610slh9cdy6i52fh0k98m5b7xvzp35l6cq008acgsvh575"; + rev = "5973e801e7ad38a01e888cb794d74e076a35ea9b"; + sha256 = "1mbx2iw4s0ny89siic156y7lwypw55abkvskmzzjjf7y4h8g9rsv"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -4031,12 +4175,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-01-21"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "0bca6a4382e7cc5e26da8dce49e7f69abfb0e998"; - sha256 = "0pfrmzcs4vkxg74hzrp8g4kwb33m1r503c0b1yq25z33scqwc6hp"; + rev = "88bee216a0b1429d6301faa733712da84cf0e650"; + sha256 = "069y6ji6xnanzy3ad70lcgn5g3p2nxr62qn08fdhdrq6a75iz3ys"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -4079,12 +4223,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2022-01-15"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "f9c5f0fbda3be77dce5bb4b06b49d9f11b3b6c20"; - sha256 = "040a2nq4piqzc7jdgzxcd495yc7d5a52lwjg9c4m6j91ykz3f0jb"; + rev = "f8671f783baeb0739f556d9b6c440ae1767340d6"; + sha256 = "1j0fxxprxw12b70isnfqixnvz2xd657rr1jphjz8277yfqpdnh2i"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -4115,12 +4259,12 @@ final: prev: neuron-nvim = buildVimPluginFrom2Nix { pname = "neuron.nvim"; - version = "2021-12-04"; + version = "2022-02-27"; src = fetchFromGitHub { owner = "oberblastmeister"; repo = "neuron.nvim"; - rev = "d89a2f701eceae882dca1f9bbb754d2a89b0beda"; - sha256 = "0xjf5wiwy57g1rpq08lw32xyk0yx27p6z1m1bycq4wnxd1faqm8s"; + rev = "c44032ece3cb71a9ce45043d246828cd1cef002c"; + sha256 = "0r8qybg1pikp49v9v0zh79q7fxx8kh8rwafvyqghf5yb0ixcjiis"; }; meta.homepage = "https://github.com/oberblastmeister/neuron.nvim/"; }; @@ -4151,12 +4295,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-01-06"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "9c536aa95f80dd9f5eb08da8499fc5f6145407aa"; - sha256 = "1hcbzwyqr5zypl6v9q6b2c2y7zjvql84mc2ip07066090v6l3qx7"; + rev = "2b19e2ad758f078b607408b15bdaf39f3beafac6"; + sha256 = "0xn78z74wldjq7p5xzlbv4562b6i5nha3lj0bc2hv6w9n3m7q494"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4211,36 +4355,36 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-01-20"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "2ec29eda54f5bbc8856794361847729b0f724095"; - sha256 = "1fz30h6nvgy71yc6ccn6m8wbc18kz29xm11zmsxc1qlp0a6j7c59"; + rev = "1fdad275596f85bdc36c525b14697ff3a4f08bdf"; + sha256 = "1pq32gnpmkyqaxq0j5bqf6ik9vkrf2zkayvcvb6fv4vxaiv7w7hr"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-01-14"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "b97cc5faafb10edd8fb5b261423b2f917ba43e1b"; - sha256 = "0b1643j492v7pm9b1z6ana3pjvaf4dqz1zvbqnl5r0bmkl2bb4m4"; + rev = "612f7db0b904d11eeddd41474e71e4bf67acc453"; + sha256 = "000s48f80gpwsqfgxcsafifd10ii99w8kw237i9afa2msrk9w1fs"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; NrrwRgn = buildVimPluginFrom2Nix { pname = "NrrwRgn"; - version = "2021-12-01"; + version = "2022-02-13"; src = fetchFromGitHub { owner = "chrisbra"; repo = "NrrwRgn"; - rev = "be7f06308bddd493d436372ee71d6b366af97fbb"; - sha256 = "15f5alvp8lybyijpjp0h4ma7wyy5pgki4i3v88dwlkvd7gznjkqx"; + rev = "e027db9d94f94947153cd7b5ac9abd04371ab2b0"; + sha256 = "0mcwyqbfc2m865w44s96ra2k0v1mn5kkkxf8i71iqhvc7fvnrfah"; }; meta.homepage = "https://github.com/chrisbra/NrrwRgn/"; }; @@ -4259,36 +4403,36 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-01-23"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "0d603c19171fb2e127bc128e9229d48340a6beeb"; - sha256 = "1d6j3syv86afj0cpfqy8jcwj8pxm53wa1xjl76f1j5h7y6ba1237"; + rev = "513ff9bbdde7da53e209232d4328e734ea2bd96a"; + sha256 = "08r2ifkj9zj8c771ahl2i0b8crp3cw2cdshkpq26ci14ypdq0304"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-01-23"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "0adceda4fb3fdd25ff015e68ebe176268b12bb2c"; - sha256 = "1nczxn4mxnl5qylzg0kmd7jbybf856x554xv83kwhjv4zzwpaj84"; + rev = "7253974f8bd8c805a2a1cf7456b4d47913f4a094"; + sha256 = "0xy80c1wra3ir8v0ywrrmyswprbzknlwf69q9g33g29zsmgfx9dr"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; numb-nvim = buildVimPluginFrom2Nix { pname = "numb.nvim"; - version = "2021-07-12"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "nacro90"; repo = "numb.nvim"; - rev = "c8b128230adb22727256fd24a221f4c5a1b41e93"; - sha256 = "0dg5cym0rcjy198rhkd61mhq1mg7lw5z4vprik8aimgnlqdzgqad"; + rev = "453c50ab921fa066fb073d2fd0f826cb036eaf7b"; + sha256 = "0pkssmd29r2d5f0s770ppj0z4rv0qj5szd43jh16wxknwwjmqi9n"; }; meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; @@ -4319,36 +4463,36 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-01-14"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "97e454ce9b1371373105716d196c1017394bc947"; - sha256 = "1qdnrrchs463bjsrx5rg61527b0az2f1b929ak9lm0p1r11wgzsw"; + rev = "f3ebca37d6ef1ff22d1f2c764a9e619d1fe5f3c7"; + sha256 = "0w5xsj55iz30khiw4y47h43i40z2ly607bm8hvddpvrd50i5vcz1"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2022-01-16"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "3720bdf0d651bb579ab0f24f889246862fdf8b00"; - sha256 = "0x9agiyh5zjsa462bw3xqx2vnmax8qpidwd7w72zjig0hmhy34hs"; + rev = "9893a06a11b448e05c0bd1f44970acbb7712e8ba"; + sha256 = "0hhlyw9nacyc4pyx2537y145lm9p3s4m4ckh8cwbambp5ypnn8kl"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-01-20"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "88ad98547aee3ac7c026c9e3654532e62cc7f1b3"; - sha256 = "0mcwzp7g631cg40gn8zy5rblqdwwrdrzgp3byaws47cgsmldb3w1"; + rev = "7d3630f1616c2e5cf9f1c8efc1cf186b9249ce7b"; + sha256 = "0y9kp05qgs7mmivs52ab26jhiqj1izz4jhj1n4x26zmaqbpw4viw"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4379,24 +4523,24 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-01-24"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "27123b1297e37109bdb2fd0cd4638621b0eab65a"; - sha256 = "0wn1jb9pfq541k7lq6qm6434p5vgd6bj7f374rn56x93nxlll1g1"; + rev = "272cbdca3e327bf43e8df85c6f4f00921656c4e4"; + sha256 = "1z3nsrkla35sl6d66bjnk0qvqn1a5m8vn670qyb8y9nqs344fy8d"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2021-12-19"; + version = "2022-03-17"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "796d45f0ac89b9e5b6d41fb2c1fada25c1aba870"; - sha256 = "1aadind1zxca5grs9jsawqsvkn9ijvxiqdw9v9jsq861xihsw9wl"; + rev = "a864a79c8e024d4f5d95915210188c9c3430b160"; + sha256 = "14m95sp0a6ss71s9ljg1b2m2sz4fyh0rxv9l4mj6brjywsx6agvw"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; @@ -4415,12 +4559,12 @@ final: prev: nvim-comment = buildVimPluginFrom2Nix { pname = "nvim-comment"; - version = "2022-01-04"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "terrortylor"; repo = "nvim-comment"; - rev = "f670649da497de12aa3d5afc0a693d5d50b17d85"; - sha256 = "0j3pay000yf79lz5plcnfp068fychnf7xa08cg7h5s0nx5cp5bgh"; + rev = "861921706a39144ea528a6200a059a549b02d8f0"; + sha256 = "0r1yb20r8p53y5dli81sm5ycgs76vpwdwcggcwadgiv2rq78ax90"; }; meta.homepage = "https://github.com/terrortylor/nvim-comment/"; }; @@ -4463,36 +4607,36 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-01-22"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c9a58267524f560112ecb6faa36ab2b5bc2f78a3"; - sha256 = "0sga5dv5zrm5cyxk0s3dp9avpx7j9nag8d8jv6bgzbq772szbfwf"; + rev = "e6d7ba5847fbe5f33ba211cf28d3cea72cfa9865"; + sha256 = "0w57cxj07law5igbxvblfk59pv5c8z714dm80njb168ldgy26kz6"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-01-11"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "ae3b003af6c6646832dfe704a1137fd9110ab064"; - sha256 = "0fyqhmm0l6hil2hdfwrhsabf5k8c3r5ivghgdv4g5hd8hpcncnj8"; + rev = "45805d69273f1ca0753a096abd419e89af8e5f8a"; + sha256 = "03jjhsdl0w5w0s7d9a64fmvwdpm1pkvjvd5gh1hgsavbpf0w71mb"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2021-12-02"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "fb176ca8cf666331fcfa75b7dcc238116d66f801"; - sha256 = "1ksn4k2bhrc588wximrgc6z9pghvwmbkvls1999nvykzrkcpggmd"; + rev = "7f82fec9a1c7fce292c9a9a7310e7d121607db93"; + sha256 = "1x9y74nvcvbwakvlzz4k7h1azkldphmdygwgs5cz7qf9pxbx67lq"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -4547,156 +4691,168 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2022-01-19"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "3c0a1b7fddd63620ffe6d25fb85cb71ef68e0bd3"; - sha256 = "1h7h8r6sfi6kzlr0n5wwrlda3whraw4128jr0djh9jjfywhnlls0"; + rev = "1ad35eada2972c055b181c73852438a6ea51b484"; + sha256 = "1kv7p2lcilvkvzl9whdkxgg94vk9fa9d1bikwhahxv2zxzk10qkz"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-01-06"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "1c52ff7e3dcc2b89897a16bea7b9903888656154"; - sha256 = "03x39hdnnf81qmlhwg9czd9dda6j2df6w685n2x15x01ghg86h1h"; + rev = "925167117f5de9702781af9e43a9d86318a20329"; + sha256 = "1a87ry1rl86xbqhd76bgqxxavq7qmsh9ds2crmlgd9f3wgsk4bxn"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-01-14"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "da8afe575527af4c0b43c2ada8070814f79b143a"; - sha256 = "1162n135997ph18d7j1zk6a2nd82g17a5vf4izzrcm7dfqg9xx9i"; + rev = "22f7df73283c6f947a56fef0355f5a3ee2971152"; + sha256 = "1qjy4n0ly5vmkpfyjanqb76jvh6qa5ldqvhgfgxk91b9l35ca95l"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; nvim-hs-vim = buildVimPluginFrom2Nix { pname = "nvim-hs.vim"; - version = "2020-08-29"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "neovimhaskell"; repo = "nvim-hs.vim"; - rev = "30baacd3c7a10625cb2d4dd64ae3bbfc4fe3f8c6"; - sha256 = "1w6cr6j77nwxszm1d0y4phvjsz9q4aw214xkscw6izakfmk06h1x"; + rev = "d4a6b7278ae6a1fdc64e300c3ebc1e24719af342"; + sha256 = "0a4sc2ff67xdqy5wj1j384vrsbnvhcd15mmwv7yygd7rccc2wsxs"; }; meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-01-13"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "2cceff656f2bfac38da784f2cd4b202a64a2faf3"; - sha256 = "13sx0rwz53rf8yg4ndc4m9fgvxa2xs46y92yn8rbgrjgf4xv18xi"; + rev = "dd1e8dc1daac110cd86dccc159007deac856a89b"; + sha256 = "1hzbn9v42z0m8s6fnf2r5navcshclsfpc88sasack5c1nvsvv43s"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; nvim-jqx = buildVimPluginFrom2Nix { pname = "nvim-jqx"; - version = "2021-12-03"; + version = "2022-02-10"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-jqx"; - rev = "03b678e5cb293d0e952a649fce3cdba02424bf57"; - sha256 = "1bfw8s3z9nj1zxixrmnqgcqbgjil00y8isiq2ipw3rrcprxgkmix"; + rev = "26bf7cc5e1942dac9f825dff90e180620c264fe7"; + sha256 = "0r45lda81khhkkqk6nrdqw6y3hdzc0w5jirz1yn1n51b7vxjm1dy"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-11-13"; + version = "2022-02-24"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "cd5267d2d708e908dbd668c7de74e1325eb1e1da"; - sha256 = "1ans2kzg750d4a83hk5p9x5h51m9ywxgk6bxrcj1pwnpkhl5h75z"; + rev = "29ca81408119ba809d1f922edc941868af97ee86"; + sha256 = "04c5wqh42648wzrnwcgwdmwwwqvwk5qn3ncrfjl0827xnpc8049g"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; + nvim-lightline-lsp = buildVimPluginFrom2Nix { + pname = "nvim-lightline-lsp"; + version = "2022-01-06"; + src = fetchFromGitHub { + owner = "josa42"; + repo = "nvim-lightline-lsp"; + rev = "d9e61801f54c8824b59e93068865e3bc4f1ca0b8"; + sha256 = "0sd38c4cp7i6prgr86b5nq9fhpi2h1yrn3ggs3d7my65ayz759m6"; + }; + meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/"; + }; + nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-01-24"; + version = "2022-03-09"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "e83f80295737e8f470329d768f6ae325bcd0bb23"; - sha256 = "12b78p8lw94ixwgcl71chwssi6li7q46aj0ahdna9v77hk2mlvc8"; + rev = "8cc31931859dc3cc187fd68509f8649599f72cba"; + sha256 = "006d9l0p86s08vhr5jjm6gi2j27wjbk3c3vfdbq9yi3bz974hgf1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2022-01-11"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "fb2f9d86c036b52eaf6b7901e36a71632ceea264"; - sha256 = "13ddy2g3dlg1b9wy08bxkrq2bjmqmi4xdddrwad7jv47fwpmwgrb"; + rev = "1d2c585cb69a91cf53f17a90d2544ed10eb03193"; + sha256 = "07vf3xzcld2h3j6hnrrib60p2gnjkcb96h33sm8kfdvaj1578pbd"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-01-24"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "12a0d3a81af173a330c957ca51b81e5f66144ef8"; - sha256 = "06qxdr8dzc7i9fvn9yyjnb1yypdgj35dppivx8752c8czd5bmshw"; + rev = "7d5a6dc46dd2ebaeb74b573922f289ae33089fe7"; + sha256 = "1dz2q6n2ibq9l2js088wfp2y5md6z8lqs6hy02xajglvb0d9g3fg"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-09-28"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "aaaf8c12771e905e5abf68470d8bda3e80536a0d"; - sha256 = "1iag2ynp2yba5xaw4z0hnp9q6hfcrvjmkhl4js9hqhhsrm42c2vh"; + rev = "ae1a4a62449863ad82c70713d5b6108f3a07917c"; + sha256 = "0xl3crhgkzmas8zdcycgk11am3wx0az4jh7fh5n4lsjip8895p4s"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-01-19"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "a07ddfb8bc6fd3626b0441ff7fe52be7221044d3"; - sha256 = "0kmpkkqvl5x3wi4byq8cfn4y9lvwdkrj2qwzmf1drm0sqhaqrs95"; + rev = "3312490ef74ea149121a82fde578a13b1921cef9"; + sha256 = "0xi13qji716kdbbq579pj7rxbjfkwjrsdp3qvfb937spwzbak2jc"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-01-09"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "bfd6503ce5e2949e17e4053ca00b9e6836fe94e7"; - sha256 = "07qw00rk087p2ipp4p6k2wanqca0zhwd050n103lld42kd1lqci0"; + rev = "d859891e4bff9729ad6e63bd4aebc51946de8786"; + sha256 = "17dbvr1y7hzrv04c89b4nmgmgg0qccrkz6qsh7vsava0lvjs4zm5"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -4715,12 +4871,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-12-30"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "15f52efacd169ea26b0f4070451d3ea53f98cd5a"; - sha256 = "1ixdckbmz6c54mm3mhkvh59ahfg5wc3h0ybnrp64d0bzsi3jngjh"; + rev = "da1030208347ad8937fdad1d4f8092b578e3ea2f"; + sha256 = "0myrcm6170ncff7ymdlaiahh9230yff794f4dc2lzwv5igkxxiha"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4739,12 +4895,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2022-01-20"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "f9b4b79a20b802b46049dc9cbf19ef6493b551d4"; - sha256 = "0mx5l7vaj99ibzsvk2nmr17g43jyql6jqfwkmfn77h15xyjdp1sy"; + rev = "f1cdec5869de70359c8dff06e9057b99a56a0e48"; + sha256 = "028wvmdbj2fllkw6nr2sasxpamqpl3gmrzdn8lw2bjfzy5xf88x1"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -4763,12 +4919,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2022-01-06"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "4a4cf2c981b077055ef7725959d13007e366ba23"; - sha256 = "1aa062r2p69kn2xr9d2mbbrs8qdlv0q86lah2q9h6jhzxfi5ccdp"; + rev = "3bbf9cb2e36200d67c150d71d49011c133d3bbb8"; + sha256 = "1jif3knz78mqf6sgckfwin1wx6ad4wppdc2y0hcxlj2kwm17xqzk"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -4787,24 +4943,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-01-21"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "2dfed89af7724f9e71d2fdbe3cde791a93e9b9e0"; - sha256 = "1842c6s3q8hd8cnnyniwjxkkl48zzdy7v2gx20fiacnf365vgzpc"; + rev = "524758a207f9c5bf3888b446d9f93192a837b8a7"; + sha256 = "0kz7qhirm7gkklmyysanndm4pimvfm0p0qzz3q96hv01hpm3d17y"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-01-24"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "91fdda9b5c3896b4b630d98292d657afa00bba2d"; - sha256 = "0qknkalnsjbyqfi9kgmscswwwck40vpwwx6cbrrk4pgkwykabi21"; + rev = "b995eebe84df88092a41cbfd591bfc1565f70d8e"; + sha256 = "1738mssq22n1njrpi004apgfv00fxn7yx00r3175qn57bjw9bks9"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4823,12 +4979,12 @@ final: prev: nvim-treesitter-pyfold = buildVimPluginFrom2Nix { pname = "nvim-treesitter-pyfold"; - version = "2021-05-22"; + version = "2022-03-14"; src = fetchFromGitHub { owner = "eddiebergman"; repo = "nvim-treesitter-pyfold"; - rev = "01185457e9c0a118d5807998de624179bc605a2a"; - sha256 = "13dhix449mvbfsmg8j1554nv6i7gdr8d6143gdy3ihp8sx66bg6k"; + rev = "46e0c3ebed0934fffcc2a23b52393059b76bff3f"; + sha256 = "1fwmwkpnr0cy663cy5yx5spm5hrv8xhsgvk891dqbm1pydxbpa1z"; }; meta.homepage = "https://github.com/eddiebergman/nvim-treesitter-pyfold/"; }; @@ -4847,60 +5003,60 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-01-23"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "1ce9933a1be6e16f788d51dcaa9602accfa25030"; - sha256 = "120gqzh205sx26gadilwawx761s6ibyzkbhwybfdd2f1fq832pag"; + rev = "2885b60e9f9b90b4e2a32b0f8adf8571bf1f390e"; + sha256 = "0q1dph3pz2ygz1wccjgcdfqyb4faj47rv2v9a4p4ngw2vd00qjgy"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-ts-autotag = buildVimPluginFrom2Nix { pname = "nvim-ts-autotag"; - version = "2022-01-04"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "32bc46ee8b21f88f87d97b976ae6674595b311b5"; - sha256 = "1daqlkr7a53g3rcmjdw2z2fnaqb0iz6dh5g1laddv4ni27ifm5rg"; + rev = "57035b5814f343bc6110676c9ae2eacfcd5340c2"; + sha256 = "06fj3bpfakbzbb4saqa2dss0wz6z98farljv3xmih162qbybr2c1"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2021-12-13"; + version = "2022-03-18"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "097df33c9ef5bbd3828105e4bee99965b758dc3f"; - sha256 = "1q6n98kfhi4ra2rgijv32z0m63r6waih8j8zdy0g4ffk4ycqxsf0"; + rev = "7810f1fe706092290dd338f40e5e857bac4a03cf"; + sha256 = "0hl3fivd0yn9g1di2545inz92szsqxq0svwhr8ymyg5sgx465rfc"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-01-24"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "38eb126412723fa4c3bfd137c1a3a811faf67eb5"; - sha256 = "13igbd268z0533bsrz0r8s69lbryh0h4w33cpywmacghxy672jjl"; + rev = "af1a18d2577ba0be5b59bc4b32aebd2569ff085e"; + sha256 = "1z100akjipzp3zyr7d54vbwwf53dj4f8y8qzf7fv32la142a7idq"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-01-18"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "634e26818f2bea9161b7efa76735746838971824"; - sha256 = "1pfhaa7xx3r4nq9bz3zj8hb1qbh5rjhmlxn1f8l7ihvbhb0s0f6z"; + rev = "09e62319974d7d7ec7e53b974724f7942470ef78"; + sha256 = "0f64alh5mf6zjnbxqsx21m3dcldqshx7a7z46qg0pfbnn9fx7swq"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -4931,24 +5087,24 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2022-01-22"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "47afb03249e36cd740bda79907c0f279f4e28544"; - sha256 = "18pbdp7ci5gb7i0als4rgcr151rbm8j3mc0pxc9h4x9cvxdl8x5f"; + rev = "3fa6223a21528f0f5528469f33f7f0e237ca9e8b"; + sha256 = "0j7m976iyw0rw7hry0sb86jc2vyrsmnpiyj7nn353hbkwazxi2lh"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2019-10-09"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "994ff5daf571ad02cc96436002411b4fb235c91f"; - sha256 = "07dx6qkxqpakl1hrqwhfjgdzcnl4j3j9qih0l20qn8p6askj3b2j"; + rev = "cb0fcc1cdbe3864554a7b1ecbe706eb4de4ec680"; + sha256 = "063fyzawn6i67cv3221s282ln5gpms3qw97blrd80l18syykj2b9"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -4979,12 +5135,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-01-23"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "33224362e20e1b3e87eb7ef2d669de6c60e727db"; - sha256 = "0z163sfxly71bypskxnph9rwqamgp3h01i24va9n41wbbfvr0pw3"; + rev = "5e461b944fbf9b6207cf06102ca09fd7778854f7"; + sha256 = "0s04m3xg98sj74fhhvdmafijmjhpa70hgcylg43yxlgdcscqbd72"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -5003,36 +5159,36 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2022-01-11"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "e5f6772b61b4aea429db1d8cc61b8a91f467611b"; - sha256 = "0nlr29ymv5hqiqblmlyac17w26s2y58jlaxmva4ms62x0wq4mxx0"; + rev = "e520a0c81a5a1997ecffd846ccd9c6e63b7859c6"; + sha256 = "1xvh5mmjc4w4rkp8h1qwxfqz3kcrqvhxnl66x19j098d1h7aqsb6"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; onedark-vim = buildVimPluginFrom2Nix { pname = "onedark.vim"; - version = "2021-10-15"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "e86ce939d85576fb7ce6c1c45fd49c8a570c24cc"; - sha256 = "19wq5xg1yvk5153c1b0zbhdzaga0ja45m3zm6a1wqb437wcqdqlx"; + rev = "7db2ed5b825a311d0f6d12694d4738cf60106dc8"; + sha256 = "0jxnymbj83y0wfwv6ixxzlx1zyh9mlv1krq5g9wqhz4w6n9rkmqx"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-01-16"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "55846471df3c6257cc2b4c7ad6001a55d52e2c34"; - sha256 = "179wwb7b65yyh345a5hnhdc10kxchddzicdlpiqkvy77rbrxc65a"; + rev = "46b0ffb97f3778a1f6f5da6471a42f3f64bbf238"; + sha256 = "13gyfz9fxgzvmcwwv19f8csmanv52144gvr5xdgvcg5nygkmydcp"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5075,36 +5231,36 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-01-19"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "27c4083e29702c8b4fa5e314926ae054eb4c0dc2"; - sha256 = "0vl95ywln1njxi7593gf2jp8y12fi6mwz3xmc8v6vd012vj4lbnk"; + rev = "e1f3054987ce054525258d9a3cc5837bf6e75212"; + sha256 = "0hwsajd7lhc04da7yzx770f3bgn2jsibcg1pjhxyib1prr17mpy0"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2022-01-06"; + version = "2022-02-18"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "c862335f303c631f53a642a1ea60f15634c720fa"; - sha256 = "05n17r2grh25d6srb5lwazj790xp00l3jsyjc0drf4npyd1m424r"; + rev = "10de4d0d50ec1d4d26118c4aa067a9d09e370c9c"; + sha256 = "1mhhff6knqqq6pgmd3w6vfljcig37yyxvmrvhb205y67igy3vcr2"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-01-19"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "7182f0ddbca2dd6f6723633a84d47f4d26518191"; - sha256 = "1v9d6r94hgki1i8dq605w03d8kqfdqk589xsaxxfj4l4g6jmrsxn"; + rev = "4dedd3b08f8c6e3f84afbce0c23b66320cd2a8f2"; + sha256 = "09sqfak384lhqr37003bq4wm9v0hi690ilag89z6cw5c0fnsysbl"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -5123,12 +5279,12 @@ final: prev: papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2021-10-14"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "d0d32dc5e92564b63ec905a9423984b5d503c24a"; - sha256 = "1h9ql0ryqblnmiksskh4phah1br1gbfc3zyylc8gczppgnxvgq5p"; + rev = "afde171829b1416125bf07a81fc28e4490aa91b2"; + sha256 = "1iz8aqmwbnfha2agcxy7cd2v0znz8vzpz7iyvd15hxx7zbqlwz1d"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -5195,36 +5351,36 @@ final: prev: plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2021-12-25"; + version = "2022-02-20"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "dbe57599bc340d7726938b624438779fa0ec2929"; - sha256 = "095j1an00187ampxklwd6hhy05xzz7ssjwkgdsv06ydx7a1kn8xk"; + rev = "660bbb1ece1e654b2176f76ce0689304c5a4a025"; + sha256 = "05xf36np8y0gdcd05nzmkawh131lp4mm5cjgjr1byr8cjyl1idr3"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-09-15"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "787a7a8d4444e58467d6b3d4b88a497e7d494643"; - sha256 = "1y4dwbs40qn942x0hd93yrk04yiphy73b45vcjrknmxq9szhvhk0"; + rev = "9df82a27a49e1c14e9d7416b537517a79d675086"; + sha256 = "1hhrcsrgcy3vqxn9gsm68r77n6z5bw4cr0r47darffan5rxykz21"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-01-05"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "563d9f6d083f0514548f2ac4ad1888326d0a1c66"; - sha256 = "1i4sj56fral52xa2wqzx331a6xza4ksi0n6092g6q93kxx202xwq"; + rev = "0d660152000a40d52158c155625865da2aa7aa1b"; + sha256 = "0r8amnlaqxg9jpqk6v4rzlfrc8q161jy1bpy35jrk7gva76kp9hm"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5268,12 +5424,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence.nvim"; - version = "2022-01-18"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "a579a3906ed2cfc980aed6046047ed2ebe4fbd74"; - sha256 = "1q2gkdng7r386i8f04py3nhh5hy9vl8mj59c01v2i3iwix78rvf8"; + rev = "ebdf23b9b180c7f162e3afb4a250c313ca2b7271"; + sha256 = "0wygl17k2adbsy3pjyyb6amsrx14r11ldbqj21kmkjq289n58f6n"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -5352,12 +5508,12 @@ final: prev: python-mode = buildVimPluginFrom2Nix { pname = "python-mode"; - version = "2022-01-19"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "python-mode"; repo = "python-mode"; - rev = "6d81349723fdb6a7ce03b27afa8ea88819f3c0d5"; - sha256 = "1cpmjg8867qmir79pd1zay63ihp2jzd8f1igxq2954q354bk08br"; + rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603"; + sha256 = "0jk8pssliyar4qs42x9m1jgri446cr4yc7iv8l9wc9xn6r3qnm29"; fetchSubmodules = true; }; meta.homepage = "https://github.com/python-mode/python-mode/"; @@ -5375,6 +5531,19 @@ final: prev: meta.homepage = "https://github.com/vim-python/python-syntax/"; }; + pywal-nvim = buildVimPluginFrom2Nix { + pname = "pywal.nvim"; + version = "2022-02-20"; + src = fetchFromGitHub { + owner = "AlphaTechnolog"; + repo = "pywal.nvim"; + rev = "bd58195939d31dd0f15a720fba2956e91598cefe"; + sha256 = "10fs5assp96rvlcxckd8cwnkfwfckjmf0j8cqq91vb2wx8knxc8g"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/"; + }; + QFEnter = buildVimPluginFrom2Nix { pname = "QFEnter"; version = "2020-10-09"; @@ -5389,24 +5558,24 @@ final: prev: quick-scope = buildVimPluginFrom2Nix { pname = "quick-scope"; - version = "2021-12-28"; + version = "2022-01-29"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "4371a23bbb3b687e49c42a2a4379d17fc5c6a9a3"; - sha256 = "0f625gmrs8zk622b1a8hhdxwx3c7hnxxznr98aqbxik6924rmr8g"; + rev = "5e2373e36d774e1cebd58b318346db32c52db21a"; + sha256 = "1dqygvc1gr35niqqdqivz5vgqpca9yj68incq3z73rl9qya96pvx"; }; meta.homepage = "https://github.com/unblevable/quick-scope/"; }; quickfix-reflector-vim = buildVimPluginFrom2Nix { pname = "quickfix-reflector.vim"; - version = "2019-12-11"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "stefandtw"; repo = "quickfix-reflector.vim"; - rev = "8e9c05a110b80ab66fc8bc3d5fe9e6fa168aada6"; - sha256 = "1i8453z3s0xmbmbzk3kpxwvd42ar9v2m2gjqic9k7njpxw87czvs"; + rev = "6a6a9e28e1713b9e9db99eec1e6672e5666c01b9"; + sha256 = "0rm3vks354g36rc7lr721j7s0x0vpnqhyvc1nhchkhbn1h1yd1ry"; }; meta.homepage = "https://github.com/stefandtw/quickfix-reflector.vim/"; }; @@ -5521,24 +5690,24 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-01-21"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "4f63e903fbcfa5d17fdbe6ae9b03e0b09ab5af89"; - sha256 = "0krvp2q20f6iwk33www097c2i8ah9pls6j1lmbx92n437k6sj5gj"; + rev = "93967110eb45d7234802c0c0e2ef909968e8461e"; + sha256 = "1mphqq650d3x0g2nl4pkgflp3hsi68agzj807r64x82p3266abzs"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-01-03"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "3a8b22157ad5b68380ee1b751bd87edbd6d46471"; - sha256 = "07adb9rrcy4vr0bhjn4h8r1si0xq31gdpwr4l9lypfr23b2pdm10"; + rev = "c66458fe5f83b57d40b678058a8eeb6340f9275c"; + sha256 = "0zf4w1ahg9dfvrw6b394asy8pyc0yjjffs73nf1mwp0bkk3hdvzh"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -5579,6 +5748,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/ReplaceWithRegister/"; }; + rest-nvim = buildVimPluginFrom2Nix { + pname = "rest.nvim"; + version = "2022-01-26"; + src = fetchFromGitHub { + owner = "NTBBloodbath"; + repo = "rest.nvim"; + rev = "2826f6960fbd9adb1da9ff0d008aa2819d2d06b3"; + sha256 = "0lb3rcc41rb9yhylmkpsj141yfk1kki1xkd4q2i9y0ld0mlwjjv8"; + }; + meta.homepage = "https://github.com/NTBBloodbath/rest.nvim/"; + }; + riv-vim = buildVimPluginFrom2Nix { pname = "riv.vim"; version = "2021-08-09"; @@ -5593,12 +5774,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-01-10"; + version = "2022-03-16"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "86da77b6861a21aef04d644b7ad41751d9b66240"; - sha256 = "06qarvvkxiz126446dd486zwi9yr7qxlgy4vwi38y2gyn793rv0q"; + rev = "26dc0949680b77216ab4de7ae909b324944a493c"; + sha256 = "1ci10s7kcpvg1g9k33ydn4zp8bnm69271mbhys5k9lc50qky2cp2"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -5653,12 +5834,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-01-24"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "876089969aa8ccf8784039f7d6e6b4cab6d4a2b1"; - sha256 = "0j3gi150gpj5m0i4kklcwjgrqk6fqv1ha8wh9mlhpjp26i68ylb6"; + rev = "9f89fe6d9762ef89973bbb698c750dd21b94ec44"; + sha256 = "0r1k71rjlcly5pyi1vdzr22xdssikzsm5q4g2xzjp9v497fycg1h"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5691,22 +5872,22 @@ final: prev: pname = "salt-vim"; version = "2017-07-01"; src = fetchFromGitHub { - owner = "saltstack"; + owner = "vmware-archive"; repo = "salt-vim"; rev = "6ca9e3500cc39dd417b411435d58a1b720b331cc"; sha256 = "0r79bpl98xcsmkw6dg83cf1ghn89rzsr011zirk3v1wfxclri2c4"; }; - meta.homepage = "https://github.com/saltstack/salt-vim/"; + meta.homepage = "https://github.com/vmware-archive/salt-vim/"; }; SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-01-23"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "c9d7de2dc3dc23d2bd6d3f1d147f40ee4c016f79"; - sha256 = "1va0zbhr7j2hym6arg4nfdgk30ypsw2k8nb6j3lfi1fj41l3lmr4"; + rev = "f665a87f88b7b891aa5e1f91236b5bab29c2faaf"; + sha256 = "1i90yyrm7ji8wf3if431al9ggcnps37k3lsnga3ixqa5pr7xsrg9"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -5797,12 +5978,12 @@ final: prev: Shade-nvim = buildVimPluginFrom2Nix { pname = "Shade.nvim"; - version = "2021-04-29"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "sunjon"; repo = "Shade.nvim"; - rev = "0196387bba50b8d36cec99cd6483583ff2dedb42"; - sha256 = "0831k71gm8rpl54x63v7mgp9i1fgxydp2wig3yyd98dc7z9d8f48"; + rev = "4286b5abc47d62d0c9ffb22a4f388b7bf2ac2461"; + sha256 = "0mb0cnf8065qmjq85hlgb4a1mqk1nwl7966l1imb54hpzw828rzl"; }; meta.homepage = "https://github.com/sunjon/Shade.nvim/"; }; @@ -5821,12 +6002,12 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways.vim"; - version = "2021-09-18"; + version = "2022-02-12"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "56296bd82973139e6fc394689854b959e35c7cdd"; - sha256 = "1x93bnrywypqlywj5f70y5aaici5yqlpky456w15psfs84piyil7"; + rev = "ab20cc8a6a7cb95679f99bc4ec724544f9b94c62"; + sha256 = "01slcxzw485ik7mszj97x67576yw1l7i6imv3rfdn3cv7d216rj8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -5870,12 +6051,12 @@ final: prev: slimv = buildVimPluginFrom2Nix { pname = "slimv"; - version = "2021-08-24"; + version = "2022-02-11"; src = fetchFromGitHub { owner = "kovisoft"; repo = "slimv"; - rev = "1c1ef6dad577e8c5fb7d94ec3b6d698b68e7730d"; - sha256 = "03wy3apmzbrjxypq2xv1z71xnx7bkvhyarw5w1y3l8gl430vjmgi"; + rev = "1b88c3a67948b446720883ed8eadb8c2b83a21ef"; + sha256 = "0m0kkc75ifg7lvk8p3vgq5iy8hr254ywj7hhjgxwzm2zbrwkr04s"; }; meta.homepage = "https://github.com/kovisoft/slimv/"; }; @@ -5918,12 +6099,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-01-24"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "9a2ac50100b22599ac625484a76f192dfd80e2ce"; - sha256 = "09qn6f898qvpxpn3xy0z4l7j5b84v7pd1b237g1xh3lkyy3xvmzg"; + rev = "774ccdb95a04539530be34fa17a34c0f64139aca"; + sha256 = "1myz05j6i7h0yyffbip6a2gpfb61y35w48aa1wlh8i3m9bhy7g4a"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -5940,6 +6121,18 @@ final: prev: meta.homepage = "https://github.com/chikatoike/sourcemap.vim/"; }; + space-vim = buildVimPluginFrom2Nix { + pname = "space-vim"; + version = "2022-02-15"; + src = fetchFromGitHub { + owner = "liuchengxu"; + repo = "space-vim"; + rev = "637390b17a8cd7d154a0d90a5c07612f1538a28e"; + sha256 = "0f43mspfnch1ifqa9rgvc64dmk0hz3cirz8iicpszmdr0fphq3xs"; + }; + meta.homepage = "https://github.com/liuchengxu/space-vim/"; + }; + SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; version = "2021-04-07"; @@ -5976,6 +6169,18 @@ final: prev: meta.homepage = "https://github.com/ctjhoa/spacevim/"; }; + SpaceVim = buildVimPluginFrom2Nix { + pname = "SpaceVim"; + version = "2022-03-27"; + src = fetchFromGitHub { + owner = "SpaceVim"; + repo = "SpaceVim"; + rev = "a8d183fdd97de3c1ee54c0e5f0efe9e95a19d866"; + sha256 = "0rhpasj5jw7jhij6pqjrsb48gwf4hrpadh8ab9d611v6akkkxlvv"; + }; + meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; + }; + sparkup = buildVimPluginFrom2Nix { pname = "sparkup"; version = "2012-06-11"; @@ -6026,12 +6231,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2022-01-08"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "452d1359fb14731a316be49fb446a05d2c7d2f71"; - sha256 = "0idp98hm8qbamfdav97c94b1fj6an9vha5rpkc4727n47fj5hvlq"; + rev = "c32b18751a81715e3c13cff22fea9fb5ce31ef35"; + sha256 = "12kp185ndag507b7l4qvhr369zyikwgh0wyi9lrjyr2ar5impjqc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -6039,24 +6244,24 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2021-12-20"; + version = "2022-03-03"; src = fetchFromGitHub { owner = "tami5"; repo = "sqlite.lua"; - rev = "3855b4ae6f20b73f8694f48b82ccc73a99d45b39"; - sha256 = "1ymzmlkh0hhhvsgbzim91yr9ga8j1dgmfi2mmwpnhvvmf2ycr5xz"; + rev = "9ccd2a6538d8a201d1ea08784bd866950e1b4130"; + sha256 = "16yq3zi8zvr39ihpw8zik7frplpmgcc3a6xf424rsxfzshn92k9f"; }; meta.homepage = "https://github.com/tami5/sqlite.lua/"; }; srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2022-01-05"; + version = "2022-03-02"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "824de25ed4b115922190838d7ad40e2f933f8392"; - sha256 = "0p03535njy5c3cik2l8ajfrrmi8pjr0vj53ydbay9bjb97mrnxfg"; + rev = "15bada8f887d69ed3a3d10330b4ff7f089596464"; + sha256 = "0qix7c1z8r0gkf9g0cffymw5qk2h1bil063ddxf36bwdhpjx433s"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -6075,12 +6280,12 @@ final: prev: stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; - version = "2021-12-22"; + version = "2022-03-11"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "stabilize.nvim"; - rev = "16d1d235f0b05beb423d8b5e4a32044441e7e8ff"; - sha256 = "00vaxyrji34xr0lhlanrd1sbbnrnvx93k6mwff0hmxq05m4r665x"; + rev = "786c818d7258b783afc192ac287b4365c5596dcf"; + sha256 = "07fd72p0qch0gfg92vcw3mlh7f8f1dii681qzpngnlk73ghq4ffw"; }; meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; @@ -6111,12 +6316,12 @@ final: prev: suda-vim = buildVimPluginFrom2Nix { pname = "suda.vim"; - version = "2021-09-01"; + version = "2022-02-10"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "suda.vim"; - rev = "0290c93c148a14eab2b661a1933003d86436f6ec"; - sha256 = "0n4axfzb6wngklygwbfi1l1qv1d1zgkxhn1wp9fcb8mxg869iwv1"; + rev = "6bffe36862faa601d2de7e54f6e85c1435e832d0"; + sha256 = "147ql1wpg543lyglhx47d79qii6d0dxw0vjwpwzvbxzrnwi50d56"; }; meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; @@ -6147,14 +6352,14 @@ final: prev: surround-nvim = buildVimPluginFrom2Nix { pname = "surround.nvim"; - version = "2022-01-23"; + version = "2022-02-22"; src = fetchFromGitHub { - owner = "blackCauldron7"; + owner = "ur4ltz"; repo = "surround.nvim"; - rev = "b0105011437ab148261b5c4ed6b84c735c54cd61"; - sha256 = "1bs0ba29pfxvvz8j5qpam6mxch4b40idlpq7l39rsanrxyxl81yf"; + rev = "633068182cf894480341b992445f0f0d2883721d"; + sha256 = "0mqg4vki23rs0rj6zyfkd1ki9wndjifp0lmnnw99x3i1qc0ba47i"; }; - meta.homepage = "https://github.com/blackCauldron7/surround.nvim/"; + meta.homepage = "https://github.com/ur4ltz/surround.nvim/"; }; sved = buildVimPluginFrom2Nix { @@ -6171,12 +6376,12 @@ final: prev: swift-vim = buildVimPluginFrom2Nix { pname = "swift.vim"; - version = "2021-09-10"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "3278cf3b0522e6f08eaf11275fedce619beffe9a"; - sha256 = "0hhi49iwkgzxhdixj0jbc4mbgad1irb056ijf7l5022r4k4gs2n8"; + rev = "64256d0f2c410d35ac1752aa2a2f7ade3a04695e"; + sha256 = "0nljkn8wg515kdh4yrs5nss0c8jmqcdnhi3hwjd1jgkxd6wsh2al"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; @@ -6196,24 +6401,24 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2021-12-09"; + version = "2022-03-05"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "034792838579c4b1515c8a5037aba58ecd1d9b35"; - sha256 = "0h5n03sk89pv4cnlyfvf1sfdp2d7ja43nbdcd52s6lrazkqz204g"; + rev = "1361738c47892c3cee0d0b7a3b3bc7a8b48139c2"; + sha256 = "00a1x5dlns2n1wpf8hnh8brf6bwhbifsg4dlzjq51v4kj35hzjmd"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2021-11-11"; + version = "2022-03-17"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "2c4b33f6e6679fb5f3824d9cd38d4813c71a19a3"; - sha256 = "18lb4rs9zrgn35b2x6b7pycd3h64virkadlidcy3xhzhsynlvwgr"; + rev = "b7f4f71539038d33f173bfa72631737da049575a"; + sha256 = "0f9nbq4p51624xkdb6a1xvfbvr0ylcr2bxv7gdssyahjr2g45bvy"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -6244,12 +6449,12 @@ final: prev: tabnine-vim = buildVimPluginFrom2Nix { pname = "tabnine-vim"; - version = "2022-01-20"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "codota"; repo = "tabnine-vim"; - rev = "251ab5f24cc376daf488b68e2d46a219854dcf5f"; - sha256 = "0v7jdrsyx754y13zwc6cjwqmwc4ic63ala55sxpa0bvsyx63cvdh"; + rev = "e27face391a4d9a3e43ff251010f77deddf0c88d"; + sha256 = "1y5haygvixnav9cck49yvvm14afyy5gyq8rwiybqvkd6vfxlv99f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -6305,12 +6510,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2022-01-20"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "88242397b4d2fc03d20db189da84869ffbc31b64"; - sha256 = "0x40nvkm64zwpifbm85ir4n96pyqwv6rrkdrl4a4k2rg4k0b24d1"; + rev = "69659cfc9d081caf31c8d548dd4c19593839317b"; + sha256 = "1wdrn0zvqhz7pd0rgl5z3zri3sy4hb947nmw9imvwi62mpdhsh7d"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -6363,6 +6568,18 @@ final: prev: meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; + telescope-asynctasks-nvim = buildVimPluginFrom2Nix { + pname = "telescope-asynctasks.nvim"; + version = "2021-10-22"; + src = fetchFromGitHub { + owner = "GustavoKatel"; + repo = "telescope-asynctasks.nvim"; + rev = "80bd6570e5423d14ad1e6fd56a199955ac1b895f"; + sha256 = "1vhjdj0jqxlyj6lmysjalnsbh5365fm2irs733hwycicd95f43iv"; + }; + meta.homepage = "https://github.com/GustavoKatel/telescope-asynctasks.nvim/"; + }; + telescope-cheat-nvim = buildVimPluginFrom2Nix { pname = "telescope-cheat.nvim"; version = "2021-12-05"; @@ -6377,12 +6594,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-01-14"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "9d1740d335a4ca1da0892369c02537a8523fd8f4"; - sha256 = "0vkakb7xf6y6yk3bhfaj61ayldsxrn3mqnch4qind2vvbnjsr9si"; + rev = "33a8785dc0d0a5fdd243875eba48bfec95e2cebc"; + sha256 = "1zf4x7jwy0p52nq2yhzap9bi8kc4npbdvxs6gbwy9kd1ddidfrkb"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -6401,12 +6618,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-01-20"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "e65a5674986dcaf27c0fd852b73f5fc66fa78181"; - sha256 = "0h76cc7mn7wmdhqk5bdgkaz3abvk15687mqkkp049xsqyjkfjzb2"; + rev = "c6f5104ff309649ebbaec283bbd1ab54511dd109"; + sha256 = "1b3z4i5jlxjk44x245b5sqnzcn5k1jww8viy0394hj6zqf7ink2w"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -6425,12 +6642,12 @@ final: prev: telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2021-11-24"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "b8662b076175e75e6497c59f3e2799b879d7b954"; - sha256 = "0wj7ip9c17m4ij9sw5rq1bqy5hb367b32iz9b14pgg110cvfgpw1"; + rev = "8ec164b541327202e5e74f99bcc5fe5845720e18"; + sha256 = "0n2f5zdpxasswdkmci56n0avwcrwsdyp8csq3mzhzf7696vppli1"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -6462,12 +6679,12 @@ final: prev: telescope-github-nvim = buildVimPluginFrom2Nix { pname = "telescope-github.nvim"; - version = "2022-01-21"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-github.nvim"; - rev = "36df6b281eb3cb47494933a3dc44c874086fa688"; - sha256 = "1lra7c38m3amqgdlb4gnl3rnvszwzn0yv624v2h4lhax8nzzq85j"; + rev = "b46686fd5a928aaf5d433dc9e2aae7d26453f530"; + sha256 = "1dv4m8xycqq1npc99m5mdv4vh6dwcgf6p7nh1lk82kwyhz1rcw8l"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/"; }; @@ -6508,6 +6725,30 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/"; }; + telescope-ui-select-nvim = buildVimPluginFrom2Nix { + pname = "telescope-ui-select.nvim"; + version = "2022-03-20"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-ui-select.nvim"; + rev = "186a124a01d7f19e6fcf608d4e1cc61d61ebe939"; + sha256 = "1lx11d4m0gcbvbb3bvxaciihnlsj1gi30ja1p0i9w7dm748d57zb"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/"; + }; + + telescope-ultisnips-nvim = buildVimPluginFrom2Nix { + pname = "telescope-ultisnips.nvim"; + version = "2021-09-26"; + src = fetchFromGitHub { + owner = "fhill2"; + repo = "telescope-ultisnips.nvim"; + rev = "f48b6d4f53b31507d3fd514905c6940409e8ada8"; + sha256 = "0333k3m0fygc4r7w56csf0h282gf2wqrykl52n6310i9vardyqw7"; + }; + meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim/"; + }; + telescope-vim-bookmarks-nvim = buildVimPluginFrom2Nix { pname = "telescope-vim-bookmarks.nvim"; version = "2021-08-12"; @@ -6532,14 +6773,26 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/"; }; + telescope-zoxide = buildVimPluginFrom2Nix { + pname = "telescope-zoxide"; + version = "2021-10-21"; + src = fetchFromGitHub { + owner = "jvgrootveld"; + repo = "telescope-zoxide"; + rev = "b51b7f4ba0e2a08bc764fb2ee39e0bc68eec79b5"; + sha256 = "0dm7h00hz2qh73gfzypv1lm2vzk7nawp7wz1y1ar5nh6gg4zf2rl"; + }; + meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; + }; + telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-01-18"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "0011b1148d3975600f5a9f0be8058cdaac4e30d9"; - sha256 = "129cha5pwr1blnkyvkl59ildap0zdvk2khajmvd79fkcncgffvfi"; + rev = "cf2d6d34282afd90f0f5d2aba265a23b068494c2"; + sha256 = "042w0l8hdcxaj3pmbp0w1mqmivfm48pv3vlcz6d423qiljbkrk9k"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6592,26 +6845,38 @@ final: prev: meta.homepage = "https://github.com/ternjs/tern_for_vim/"; }; + tex-conceal-vim = buildVimPluginFrom2Nix { + pname = "tex-conceal.vim"; + version = "2022-01-15"; + src = fetchFromGitHub { + owner = "KeitaNakamura"; + repo = "tex-conceal.vim"; + rev = "93ae39d9222b0892684d02324b85ee9d3647bf8e"; + sha256 = "05nqqfxkxd8f9xky9mnfxw9g16z1005ka8zxaw52i0n35dg4gg8y"; + }; + meta.homepage = "https://github.com/KeitaNakamura/tex-conceal.vim/"; + }; + thesaurus_query-vim = buildVimPluginFrom2Nix { pname = "thesaurus_query.vim"; - version = "2021-07-08"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "ron89"; repo = "thesaurus_query.vim"; - rev = "65e67a2dc3290d1fbed59db2a3f58944a73e7251"; - sha256 = "1hak0ncsq43j0vblcgy9y4ylx2lazhij71sm3471cgini42klmgp"; + rev = "23d8aa3f7d1a785e31e760e1b6b3b4c18abf8332"; + sha256 = "0mh87m2jimblmdkfw5hr07li3zh2zmvgp23izc79k1i41v4yffsi"; }; meta.homepage = "https://github.com/ron89/thesaurus_query.vim/"; }; thumbnail-vim = buildVimPluginFrom2Nix { pname = "thumbnail.vim"; - version = "2021-01-11"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "itchyny"; repo = "thumbnail.vim"; - rev = "bfd408a3210c305aaf51e6ce31ac99497e6ab1ec"; - sha256 = "1kh12d0dg932j9drby27fhg8vbjm8rwih33rm4yjba0316i8wcyv"; + rev = "01e4f648b99aa3799502b35682c2948794ccb238"; + sha256 = "083xd3mwbv89k7vdwm7x3ww6xsjarphr0znfda47dam5r4vk41nz"; }; meta.homepage = "https://github.com/itchyny/thumbnail.vim/"; }; @@ -6676,6 +6941,18 @@ final: prev: meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; + todo-nvim = buildVimPluginFrom2Nix { + pname = "todo.nvim"; + version = "2022-02-23"; + src = fetchFromGitHub { + owner = "AmeerTaweel"; + repo = "todo.nvim"; + rev = "6bd31dfd64b2730b33aad89423a1055c22fe276a"; + sha256 = "1887d1bjzixrdinr857cqq4x84760scik04r9mz9zmwdf8nfgh6b"; + }; + meta.homepage = "https://github.com/AmeerTaweel/todo.nvim/"; + }; + todo-txt-vim = buildVimPluginFrom2Nix { pname = "todo.txt-vim"; version = "2021-03-20"; @@ -6691,12 +6968,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-01-13"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "f23866b8fbb0703be4e15d50c814ffe496242a67"; - sha256 = "0rvsba0zr3d35dxyjk99shgn7h15r93diwnga1k4s9mcxg07fsmm"; + rev = "9f969e7f72d19966756318d61f2562f67dbb1f9c"; + sha256 = "118hwkn9cw2wsqigqvbpvbhbag6ywc325lvn088dfpzbn9k7vfmr"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -6751,12 +7028,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2021-12-31"; + version = "2022-03-18"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "20469be985143d024c460d95326ebeff9971d714"; - sha256 = "00g1w1ry2gzklxvmvgy3dpig8njaziqz64yf7bqr9vqf0nxcvb5p"; + rev = "691d490cc4eadc430d226fa7d77aaa84e2e0a125"; + sha256 = "1d218xxz936q53aknazhnfxhy9ncjyq76dna6y5n87kxn9hzqix1"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -6811,36 +7088,36 @@ final: prev: typescript-vim = buildVimPluginFrom2Nix { pname = "typescript-vim"; - version = "2020-12-08"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "67e81e4292186889a1a519e1bf3a600d671237eb"; - sha256 = "1mpp4n7qgz3yq4vka8h5sbngc14w5bzd9s9c2csbv9ds8w0lpi0g"; + rev = "52f3ca3474d51f5021696ffb7297d989e49121ac"; + sha256 = "12qcp82jkaa6nmdb0s4an29bfp9mzkkkxz2sfhm93x5506g8gk4l"; }; meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-01-24"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "e12dd76d4a4d9d18c985bbafe8b6a55f7f8ea917"; - sha256 = "0i64rrg3q8w80hskwxsbs1a1nzbkbbwz5vs62dpd6vbi02ghkkzg"; + rev = "ca21d30c7a72e0e18ad95f25ded5a5f820052685"; + sha256 = "1zn97bjlhz3izs7dh97w528zlfi91k0pl95lrmr5cz2px65icsry"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPluginFrom2Nix { pname = "undotree"; - version = "2021-12-24"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "c4984fc6dcc6c4e190f2f8cd5fffb65b0aaa51d2"; - sha256 = "16ga9blahchln019nxf6iv391qf46rrcc51v9azvr3xq7k53a7fz"; + rev = "08e259be24d4476c1ee745dc735eefd44f90efdc"; + sha256 = "154k5wrs0lhx8dj2pqkhfgqk11csa1iw1dshn7n07iq0ab2wkimy"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -6869,6 +7146,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/unite.vim/"; }; + urlview-nvim = buildVimPluginFrom2Nix { + pname = "urlview.nvim"; + version = "2022-03-29"; + src = fetchFromGitHub { + owner = "axieax"; + repo = "urlview.nvim"; + rev = "4ca1b22d914ff3187acd5a9486421769928c9d8f"; + sha256 = "1vy977y7favs76mpk6v3x18ph40y0d20kmm6bssvnlql1nh3ihbd"; + }; + meta.homepage = "https://github.com/axieax/urlview.nvim/"; + }; + utl-vim = buildVimPluginFrom2Nix { pname = "utl.vim"; version = "2010-10-18"; @@ -6931,12 +7220,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-01-18"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "c4985dc3990e565ec8bcd82b3eda0609cdf5bcc7"; - sha256 = "07yi58iidmagjpa3adbc767dirhdpk87pz1gza8i9ysj95jpnqjn"; + rev = "11d8fb106515a4c4e6016742053356c9f0434fed"; + sha256 = "1gjaqmkrxg5x6mpb7dnznbbzrv3iadcw7snxjx7bzmr0b24mddcp"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -7195,12 +7484,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-01-12"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "95935e66b9a3cd802900ac2d23ccaaf70145d857"; - sha256 = "1frp3al8jzcmjhcz13drw1gh0nsany5vpqnhcihl8mqd04g638ax"; + rev = "a306a7abfd8b4450fcfdc0384dadb996148d2c1b"; + sha256 = "0qvz41rpdbcsszh0n4jhjrw9anyzsh4r1j694a3ryjj58gg9smjy"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7243,12 +7532,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2021-09-01"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "ab784d414148e16c8f6c737c14d115783da72c30"; - sha256 = "0ihw5v9rm32351ydfvsrmkq15hls7rri9d54xqfrzhrdmygyicjf"; + rev = "e9d03b12378b173b39d416df6469ca417b9cac9d"; + sha256 = "1r7jcd8q41v1v0syy097qd34ydx0bczgad9ihsmsz83bdbx51dbl"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -7291,12 +7580,12 @@ final: prev: vim-argwrap = buildVimPluginFrom2Nix { pname = "vim-argwrap"; - version = "2021-12-16"; + version = "2022-02-08"; src = fetchFromGitHub { owner = "FooSoft"; repo = "vim-argwrap"; - rev = "c5de0769d8c00817d42ed6f1b2e7ea4cca2cbc8d"; - sha256 = "1qp21k9dlgh5gvd4x393xkalzfj36rchn17rg9jy3gij88p2xmbn"; + rev = "0faba07179f96cae2ab49cf2cc22ebeb922c1532"; + sha256 = "1lb1rjp1q25gqpzbjix9anjxvx7cqw1qlacvc693f59gl8s8nbf4"; }; meta.homepage = "https://github.com/FooSoft/vim-argwrap/"; }; @@ -7433,14 +7722,26 @@ final: prev: meta.homepage = "https://github.com/MattesGroeger/vim-bookmarks/"; }; + vim-boxdraw = buildVimPluginFrom2Nix { + pname = "vim-boxdraw"; + version = "2021-01-28"; + src = fetchFromGitHub { + owner = "gyim"; + repo = "vim-boxdraw"; + rev = "b7f789f305b1c5b0b4623585e0f10adb417f2966"; + sha256 = "0zr3r4dgpdadaz3g9hzn7vyv0rids0k1wdywk9yywfp6q9m0ygj8"; + }; + meta.homepage = "https://github.com/gyim/vim-boxdraw/"; + }; + vim-bracketed-paste = buildVimPluginFrom2Nix { pname = "vim-bracketed-paste"; - version = "2018-05-22"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "ConradIrwin"; repo = "vim-bracketed-paste"; - rev = "c4c639f3cacd1b874ed6f5f196fac772e089c932"; - sha256 = "1hhi7ab36iscv9l7i64qymckccnjs9pzv0ccnap9gj5xigwz6p9h"; + rev = "45411da73cc159e4fc2138d930553d247bbfbcdc"; + sha256 = "1bz40p7zr439ziy7mfks4jcs5rdnw4zinp81fw6wsm5knrx1r5qy"; }; meta.homepage = "https://github.com/ConradIrwin/vim-bracketed-paste/"; }; @@ -7517,6 +7818,18 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-carbon-now-sh/"; }; + vim-ccls = buildVimPluginFrom2Nix { + pname = "vim-ccls"; + version = "2022-01-29"; + src = fetchFromGitHub { + owner = "m-pilia"; + repo = "vim-ccls"; + rev = "93ac5dbdeaaaed8fdfd6d850f1e57fb28d204886"; + sha256 = "15dr487baghlhl559a4zqpm8vnpm77aci4gw9x95v4kds9g4g51k"; + }; + meta.homepage = "https://github.com/m-pilia/vim-ccls/"; + }; + vim-choosewin = buildVimPluginFrom2Nix { pname = "vim-choosewin"; version = "2021-04-22"; @@ -7543,12 +7856,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-01-21"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "7aa3959cad43302601d530671808f1b9cd1b5233"; - sha256 = "07298d5fzsg1jyvwiqpphn9add0ihvk0cdhmsvz3zvabh32mx8lz"; + rev = "6fd4fecaf8b1da31c625e5f02822778d4a2a08b5"; + sha256 = "0h9z49r20wyqwvj4dr5grq0zdaz2d728jxc29l5q3rb1nh9nqbfi"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7579,12 +7892,12 @@ final: prev: vim-closer = buildVimPluginFrom2Nix { pname = "vim-closer"; - version = "2021-03-28"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "rstacruz"; repo = "vim-closer"; - rev = "26bba80f4d987f12141da522d69aa1fa4aff4436"; - sha256 = "1pyi5akzvvkdngm577m1c1210r0yypdwsvp1y7ag6gdfnls75xws"; + rev = "43acc7c59fca861cb92cc47f01f184d9d342a73b"; + sha256 = "1q03kz5ffyz8ifxdn7bgf3r7jlqa8vya13pnjyqda15wly1fl0k8"; }; meta.homepage = "https://github.com/rstacruz/vim-closer/"; }; @@ -7615,12 +7928,12 @@ final: prev: vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2021-12-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "605dc002cabfec67eded553298aba21ab392ea78"; - sha256 = "1zlmibs23nyxkaj95h7z2m2p8xizvdr0i3477zs4y3lm6g0rqs23"; + rev = "27e5ac299a0714025cc46fc1da11694a8662b058"; + sha256 = "06zp45w1mxq075lrw1x2p87l4gdc5fijgag4mj7j61jd2x92xsx7"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -7687,12 +8000,12 @@ final: prev: vim-commentary = buildVimPluginFrom2Nix { pname = "vim-commentary"; - version = "2021-09-14"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-commentary"; - rev = "627308e30639be3e2d5402808ce18690557e8292"; - sha256 = "0d056h2vh3bzc3mcijq90y5c7rvg01zzxyfc826h4f79y1fz8jnp"; + rev = "3654775824337f466109f00eaf6759760f65be34"; + sha256 = "09iv58r0z3dv5fd6g8zq542rc5hz81gd5h0ncnvhx9drrl6f86ip"; }; meta.homepage = "https://github.com/tpope/vim-commentary/"; }; @@ -7769,6 +8082,18 @@ final: prev: meta.homepage = "https://github.com/ap/vim-css-color/"; }; + vim-CtrlXA = buildVimPluginFrom2Nix { + pname = "vim-CtrlXA"; + version = "2021-08-09"; + src = fetchFromGitHub { + owner = "Konfekt"; + repo = "vim-CtrlXA"; + rev = "404ea1e055921db5679b3734108d72850d6faa76"; + sha256 = "10bgyqnwcqly3sxl27np1b690hnj1snqbcvg8pzh4zgdysfgy9xg"; + }; + meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/"; + }; + vim-cue = buildVimPluginFrom2Nix { pname = "vim-cue"; version = "2021-06-18"; @@ -7807,36 +8132,36 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2021-09-20"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "8fcde4c500440757f04e38c039005319476d1471"; - sha256 = "1b6759y9s8sl6d96xzc2lx5qqh0x5sabls12hz0zj6s1736hs3sk"; + rev = "d6b9957a1e13f34fb66795fad729c611b2513922"; + sha256 = "14a0mbhcw10400g6ybj6h8nq5bis9hba76qvjx5mph7vbb3rhjwn"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; vim-dadbod-completion = buildVimPluginFrom2Nix { pname = "vim-dadbod-completion"; - version = "2021-12-21"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "10064d526001d98b6454235644e3e586b566f26d"; - sha256 = "07vlg4w9x0xs4xag02pyxram94mvizipwya7p6vg7s3rznj0bipd"; + rev = "1c60988abf17f426b87a1ce2de6b6eabfd5d6b2b"; + sha256 = "0b6mgmaak6vh2adkzdh9s5b5js362hv2hg14zwrb5846cjpbs21i"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-01-03"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "a4a9051044876656fe4f22a188b084258727997d"; - sha256 = "1z16csn6ql0vnmy9646006ri9d1gxw2r7wqi9bh8sgfl2il388lp"; + rev = "d9db8d8ae99500e4df6b22a73e30a411936dca37"; + sha256 = "1gpsnx2s6wk473547h7fjf21cgzkfx2b2d3hwk1q2m7gjpsg0j3q"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -7855,12 +8180,12 @@ final: prev: vim-DetectSpellLang = buildVimPluginFrom2Nix { pname = "vim-DetectSpellLang"; - version = "2020-01-13"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "konfekt"; repo = "vim-DetectSpellLang"; - rev = "d8b545ef138a9ff013f8243f85c79b277b26f5e1"; - sha256 = "0c1bxryw4rg4cyql7vfp2gwhkl2d0b8inc6shmgfy7jg4svhzs0w"; + rev = "d5b55e3307e72e45f8d736818c76884016583538"; + sha256 = "0l9bdgqaxfpndpf4v5kxn34zx5pnhf62chp4flzyyhhzlz52dqjw"; }; meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/"; }; @@ -7915,12 +8240,12 @@ final: prev: vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2021-10-08"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "f297b2effb0ec879f33a8539b9701d048d44f295"; - sha256 = "02fag2mar06845dricviqb3jfc05f13na3svhcpddw7gdpimsdmv"; + rev = "9dde0c97cc39ca1cf49cbe7ecd350d153a0426c3"; + sha256 = "0ba2lsc2jwgplgqsnq69dngiybcs4ad0il19xlk250msxpr5l8xq"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -8059,12 +8384,12 @@ final: prev: vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2021-10-06"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "8ace05a9a4e225d103a9c06f6d5148d0e07408df"; - sha256 = "0b3lk6z5l3bmxkh4syk8jrqh9s0d4kikna23990f3j06k141k6gp"; + rev = "ff7a1223dfc5386c41bb582039a90a262d488607"; + sha256 = "0a82c6vmdjfq1cjiakdxd9mz0ivqivrjcrppqpwch9rzp98qspag"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -8095,12 +8420,12 @@ final: prev: vim-endwise = buildVimPluginFrom2Nix { pname = "vim-endwise"; - version = "2021-03-06"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "4289889a2622f9bc7c594a6dd79763781f63dfb5"; - sha256 = "0sixr3rpcgqbaiyk7w6ghcrvllh35cb3gq9isdlwkww3dz4jyyxc"; + rev = "8faf48b69b04af120e162ce113ea21eac322e3b4"; + sha256 = "0zfgsqs2mal1yh8x4lj1kx2ib80clsh9s9swh44cq5ga5glfkyn8"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; }; @@ -8155,12 +8480,12 @@ final: prev: vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2022-01-13"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "e2c9e01abd2734919e65dd6fe6c84ca2a9b65a7d"; - sha256 = "02ilz95fmp2j9azpxia38hka2n81x5x3b1knaidiaf1pifl0c7zn"; + rev = "01aa41b276b45e2df2cb680ab38e78ea7e5786c1"; + sha256 = "149hnk9ja9vnw5vr7axliyqh0l2xz6i4l3lngdlzi1xic0xfwxf5"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -8215,12 +8540,12 @@ final: prev: vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2021-12-09"; + version = "2022-03-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "b2fffb38988747e6891bf3bedf3921783e5659df"; - sha256 = "023vj0bsg3vp9s7ldhidlzd40117fbp0xripvzrz364xy22ikn1c"; + rev = "49f213283ffd79e1a397a30ce9e11849eaacf8e1"; + sha256 = "0lk6xxbf111p1d75vagfhf1qydm1mzm4xycmyydfr46acy6a8hbk"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -8251,12 +8576,12 @@ final: prev: vim-flake8 = buildVimPluginFrom2Nix { pname = "vim-flake8"; - version = "2021-07-06"; + version = "2022-02-17"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "ddceec6c457fd59bc2a9321cbf817e42aa4bfd86"; - sha256 = "0w0g0wjikvvah6fckay2slrcl7zh9f199safhfs875g6f8halj6g"; + rev = "a99054ef98e8fdaefa1315af4649138bcadbfdf7"; + sha256 = "1ila8z90rxsdxgp44n5wms5s3vlx0j0b7svhx0nff66ylfqy3s4x"; }; meta.homepage = "https://github.com/nvie/vim-flake8/"; }; @@ -8275,24 +8600,24 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-01-18"; + version = "2022-02-15"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "e4166b0586efdc3ad1221afe74fa1e5135e0ad1c"; - sha256 = "18a855hhibyndfypiryl2mcz0w3jwncg35grwh4rinpl14hh4193"; + rev = "6244d1739aad6682c6c1d5db18c846c342af6e3e"; + sha256 = "1w0d93wm0xwg8wyvyzdibjmnd1py343mvvzj911byvnm1b52zp7h"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2022-01-02"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "2358b199117900d3e36eada1de1f2a12556a5506"; - sha256 = "1q5ralkkgl81cnnxvz4sm06xzh85zj0pixfl9zirfz4djjab3h82"; + rev = "47123282f501fc77965e1d3c08357209d991c7f4"; + sha256 = "18fs6pgadffdxl6r03daqnz6v65m7jap3yanx7rzp5g25c0461ps"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -8347,12 +8672,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-01-13"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "a93ceff61f070a095c3c712c389247a80897e3b0"; - sha256 = "0shf5l5rax465hsppswf58lypz9x80jaz74g93jlrx4xfs9k1agl"; + rev = "321328c6c5901a597348155fc0e83b800544dcb0"; + sha256 = "11sd87c9vw1gs9pkvv0y24yqhkack0yxv5mg50ss6v7mjjdngv66"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -8443,36 +8768,36 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-09-07"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "256702dd1432894b3607d3de6cd660863b331818"; - sha256 = "0zpa7cs59a8sq0k3frlf9flpf30jcn239yrpmv40r7nqvxzglbpl"; + rev = "18d12985ea6cb7ede59755ff4fd0a9fa1e6bf835"; + sha256 = "1gs7vaf9pyd8ji0vc9iafd46g4iqy8rpa2jif0k56wxzcrjw4r22"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; vim-github-dashboard = buildVimPluginFrom2Nix { pname = "vim-github-dashboard"; - version = "2018-09-03"; + version = "2022-01-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-github-dashboard"; - rev = "8012a2016a9e39a50081c9d5db2deb09ae4a6010"; - sha256 = "0jkr6mz5zcpbyswmiyprcbm8l93lkg5sr46r8kyds1n2vz19cf7x"; + rev = "a639ab203418210eff3e09cea820102a53e15f5b"; + sha256 = "10dw9lmii3li5hw9sfbam8b2hv19dz6cxfkadmv1xz12cqwfdlwi"; }; meta.homepage = "https://github.com/junegunn/vim-github-dashboard/"; }; vim-glsl = buildVimPluginFrom2Nix { pname = "vim-glsl"; - version = "2021-11-13"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "tikhomirov"; repo = "vim-glsl"; - rev = "25f9a7dfca64787313fb4339866ff941b8974d61"; - sha256 = "0dm0nmglf7sr9rkxq4ya14pg1wrqfbv6pigj2f1hb0gf1n9bd6rz"; + rev = "28a6dfbcd96095226bee90985b7f12c5679dbbb6"; + sha256 = "051f0q5bkgp77pz0izh5mvqsmxy0rzlvriwq4j7qzslqk7i850p2"; }; meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; @@ -8491,12 +8816,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-01-20"; + version = "2022-03-19"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "8dfedede1c6e27e4339411b1071fee6a40663f11"; - sha256 = "0micmffcbw70bbxcx03isrf4b4s6plz3drfjbbls7dvalws0z5pa"; + rev = "dcefd64ba251ffc3d497f8758036735c8f6cc824"; + sha256 = "1j5jrs7kk59ilqsjs0qk5213psv33xnnifsqrjc7h63p28sv3pnw"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -8515,12 +8840,12 @@ final: prev: vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2021-09-18"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "9a9fe186a73fce636398ee7f851466ef60c9fde5"; - sha256 = "0npqcpciq1pwm1ac6ldlyvrg7mhjg4ybrpmmld9b4nysiws97cnq"; + rev = "15c5937688490af8dde09e90c9a5585c840ba81c"; + sha256 = "07j704ysc2klqfjk3918b1kjq16pw1yb1fykdsi2a0lamndn9l04"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -8539,12 +8864,12 @@ final: prev: vim-gruvbox8 = buildVimPluginFrom2Nix { pname = "vim-gruvbox8"; - version = "2021-08-04"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "1e205910e67003ff9efb77e7730f1e49d8aae29c"; - sha256 = "1z7vx4x4flx6853a70vk2bcnv52ra3z275g1i30pjzc5blsbw6hw"; + rev = "f94afba273ec544e1e73e82c78674eed4ccb1c8c"; + sha256 = "1gjnp05a10bad1f12xc5pb1m54jzkq3hh8a83l8aq6377a1z9bky"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; @@ -8575,12 +8900,12 @@ final: prev: vim-hardtime = buildVimPluginFrom2Nix { pname = "vim-hardtime"; - version = "2021-06-11"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "takac"; repo = "vim-hardtime"; - rev = "00fde0a5e3fe15e329bdeac5331e4b439b6972a8"; - sha256 = "1c66q7bcg0m19zjd3yz5ywhm094cr48yr6rxp8zhlavaswwx8wz7"; + rev = "5603072377d1f1f26a1561eda9e1884bb5f028ef"; + sha256 = "13279v9vd083xg6820gh15qxsyhbr7gjf7lzgy8w52xya852xsks"; }; meta.homepage = "https://github.com/takac/vim-hardtime/"; }; @@ -8623,12 +8948,12 @@ final: prev: vim-hcl = buildVimPluginFrom2Nix { pname = "vim-hcl"; - version = "2022-01-12"; + version = "2022-02-25"; src = fetchFromGitHub { owner = "jvirtanen"; repo = "vim-hcl"; - rev = "80a497d14d8ca72ae5ee4b9cc6b17fc57b46a407"; - sha256 = "18gw4iq84lkzmczfqr2yn31lh7kfnbm085h0vvq079c4fc2qa454"; + rev = "1e1116c17a5774851360ea8077f349e36fc733c1"; + sha256 = "07kwrkxpgjfi2cih31cxnjaiypxy2ddwan2sr66gvamixfrpixav"; }; meta.homepage = "https://github.com/jvirtanen/vim-hcl/"; }; @@ -8684,12 +9009,12 @@ final: prev: vim-highlightedyank = buildVimPluginFrom2Nix { pname = "vim-highlightedyank"; - version = "2022-01-15"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-highlightedyank"; - rev = "9669226c6db7da5fe96f9ea069f9db254a299796"; - sha256 = "079mhfiqkgn789wl18xd03307k28ixyz37rx6vd2nh0gsfscwf25"; + rev = "ff16bf3bac23fb4e17c976f4e1ff7941cd686c8d"; + sha256 = "0slnykqkbqnncz0vjwhf9p9x8wi5p8xfv485wbip1njd6vqhd965"; }; meta.homepage = "https://github.com/machakann/vim-highlightedyank/"; }; @@ -8792,12 +9117,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2022-01-13"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "db98338285574265a6ce54370b54d9f939e091bb"; - sha256 = "1inhds5za9v7nja3xv1s7iwcpzd91diixq95bhknp758np6z6yj2"; + rev = "487563de7ed6195fd46da178cb38dc1ff110c1ce"; + sha256 = "1k4pzq1gxqpcrx828ywypff1cjrns34rh8q7yz1j8nhlqvgrda9s"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -8900,12 +9225,12 @@ final: prev: vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2021-11-15"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "b5c8d305df52e0cb85b3436ca1e958c22c6e2d79"; - sha256 = "1zv6k8ld938zg000svi9q6c5jkbmvlyllxzkl41jcsx2zhqkwdiw"; + rev = "e461476ccc931eed1d439984dd98a26ab56eecee"; + sha256 = "0kpifkb03aw3dq6x6vlai0ivdmwxs32v0ajzcym1f005b1n1rydy"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -9021,12 +9346,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2022-01-12"; + version = "2022-02-04"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "38e491ebca229b7520480a334bb398719c8e62fc"; - sha256 = "1qsy474c2wily49lyjn34j5sin4jk2gj5pkz2cnrw6yd7nm1w9v8"; + rev = "8d9af030c8a74cdda6ab9a510d9a13bca80e8f9b"; + sha256 = "03rf49w3x67aayfn6hl0jhf4gik1scq4khhnvicp1zabdn8cq175"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -9045,12 +9370,12 @@ final: prev: vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; - version = "2021-08-14"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "d522829d810f3254ca09da368a896c962d4a3d61"; - sha256 = "04x6y9yp5xlds37bswmrc3xlhhjfln9nzrkippvvhl48b0kfnpj8"; + rev = "cef9d62165cd26c3c2b881528a5290a84347059e"; + sha256 = "0wkjyqx427vvjhj0v3vfrg4hfb5ax5qq5ilfqas9h94w1cngiz5c"; }; meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; }; @@ -9105,12 +9430,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2021-09-22"; + version = "2022-02-10"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "5461c6911ee4d61d1f729c66cd3514905203be34"; - sha256 = "0k2l8z8qkjqj4swwzlc0mf1r77n1rxi5skxwlvvwcldx0gh0mv4r"; + rev = "9a2120d9f98b13b3aa37b577a7e769bfdd046130"; + sha256 = "01myc1pbc1q2fkxcy40pibbqszjxvkc9diwjmixfn4a6qmf8n1gp"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -9165,24 +9490,24 @@ final: prev: vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2021-11-01"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "f09bf7c61e4aa03293622792eaeadb315b91e77f"; - sha256 = "0rskyxi507b339ipgam3kbf4ymj6bcbw75xpc2cf32xzdlpairln"; + rev = "4c768d215a0654d61ea72eeec423716bd971948e"; + sha256 = "0q2c8n1kbqsx005cn0p1f5334qgslkla2zag03q0vy57g3yhydv4"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; vim-logreview = buildVimPluginFrom2Nix { pname = "vim-logreview"; - version = "2017-07-08"; + version = "2022-02-28"; src = fetchFromGitHub { owner = "andreshazard"; repo = "vim-logreview"; - rev = "b7b66ab338e904127d796af49235b8c29742f18f"; - sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; + rev = "de67c14943219c12b727dfef5687d938597af31b"; + sha256 = "0c50m5x6mds4bryaphf770qmxqdm12kcrrm92l4ph86zi0v8ik4w"; }; meta.homepage = "https://github.com/andreshazard/vim-logreview/"; }; @@ -9213,12 +9538,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-01-15"; + version = "2022-03-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "66b56c026fa24f76f38d3bc99bd478eff9aa4be3"; - sha256 = "0bq0h3wla97jfvvkgw5ylmfyj4jbxml6y8gl2abnanwb3ympy3mb"; + rev = "bfb7541eb88eb9804287af39aca70102e60d2bf0"; + sha256 = "1kaa92ylw5i8ysb2yxyqf666194wwcixgagi7gq3apkddr35a6g0"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -9261,12 +9586,12 @@ final: prev: vim-manpager = buildVimPluginFrom2Nix { pname = "vim-manpager"; - version = "2020-10-28"; + version = "2022-01-28"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-manpager"; - rev = "c23c02dd79b0a5cabe140d1f10f9aa2591cf55ed"; - sha256 = "0g61qbp4vl010isigp6j3jjb3vb2kxalcbb56xzfa6c9k5zap5j9"; + rev = "194607a8d1bd122ad811ef601eb04a3df7786d59"; + sha256 = "0qnm4k0frki3p9fpb6h4xnv1dxijk9aqcd7glq28c216gh395a5d"; }; meta.homepage = "https://github.com/lambdalisue/vim-manpager/"; }; @@ -9285,12 +9610,12 @@ final: prev: vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; - version = "2022-01-24"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "9156bba66350d4c0c32b4ac783550c3e132d6a88"; - sha256 = "0ghlswpc0qdxidc38y9xy22293nf0hjxqwvln71gzmxjlxj3rdgk"; + rev = "95e90840c45911b62261bae02e3ba2777877eaf5"; + sha256 = "1jrj3419ar7lnj6mriq3pvffsg6g3kxg36jrixi96a0cl2aqrs8b"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -9310,24 +9635,24 @@ final: prev: vim-markdown-toc = buildVimPluginFrom2Nix { pname = "vim-markdown-toc"; - version = "2022-01-17"; + version = "2022-02-11"; src = fetchFromGitHub { owner = "mzlogin"; repo = "vim-markdown-toc"; - rev = "ca8dbd38bc5c113b1dde0396cd1dae0ccb992f14"; - sha256 = "17giwfyda3clr01f29smgkkfylqc5k9ph3a4ff9bkqpf7mwf793x"; + rev = "31aa38e58334f1321ae8ec6f38d05303f3226698"; + sha256 = "0kv7miavs4xfiaj7yj0hi7cr65m7mn6rvd6dykmbr8j7w0pra7fr"; }; meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-01-19"; + version = "2022-02-18"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "43483d27bc7abdd8f7c8c71f4d0bbf56d62e0461"; - sha256 = "0py53inwl5csh8aa0cnldqjq73m5yl46frgylcawkx1n99q350v6"; + rev = "7fd8806138f404498db7a3e848d8fa55ad61e7cf"; + sha256 = "061jvw0rdwz7s4yaiq7s32cx0y1vkknsc80gh2gj53jsbcpk30zp"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -9406,12 +9731,12 @@ final: prev: vim-move = buildVimPluginFrom2Nix { pname = "vim-move"; - version = "2021-12-14"; + version = "2022-03-14"; src = fetchFromGitHub { owner = "matze"; repo = "vim-move"; - rev = "d4fbf3b9d794d20a36aef729ecdfa56ce097986e"; - sha256 = "0dkn6ssqhxdp52cg1hk104n3d3fac48yklmnx6sl7i7lx8hpjshc"; + rev = "97fc86064eaa95384b5b00f6253e339fba44da5d"; + sha256 = "0h2f47q5dvl5myk5vif9ya4n308i4h5sb9rrg86v0inpbwzjpyas"; }; meta.homepage = "https://github.com/matze/vim-move/"; }; @@ -9442,12 +9767,12 @@ final: prev: vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2021-11-09"; + version = "2022-01-30"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "e193f185bad3aa58446e771f8f2739abf11d3262"; - sha256 = "1q2j88rcg0slvm2bfdri4fy42h5a2md9bbqsspb3kzx5yrhgawhp"; + rev = "595ee332719f397c2441d85f79608113957cc78f"; + sha256 = "0kwiw877izpjqfj4gp4km8ivj6iy2c2jxyiqgxrvjqna62kic0ap"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -9536,6 +9861,18 @@ final: prev: meta.homepage = "https://github.com/LnL7/vim-nix/"; }; + vim-nixhash = buildVimPluginFrom2Nix { + pname = "vim-nixhash"; + version = "2022-02-06"; + src = fetchFromGitHub { + owner = "symphorien"; + repo = "vim-nixhash"; + rev = "d6e3c5161ef2e3fbc4a4b68a785d958d97e25b7e"; + sha256 = "1mrprl6mqapjzcya643nzvwaf01r38knjg9xnfbpvlidfq38d3cw"; + }; + meta.homepage = "https://github.com/symphorien/vim-nixhash/"; + }; + vim-noctu = buildVimPluginFrom2Nix { pname = "vim-noctu"; version = "2015-06-27"; @@ -9574,24 +9911,24 @@ final: prev: vim-obsession = buildVimPluginFrom2Nix { pname = "vim-obsession"; - version = "2021-03-22"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-obsession"; - rev = "82c9ac5e130c92a46e043dd9cd9e5b48d15e286d"; - sha256 = "0lfcba8sk25l5yp3agh6pwniddf8jx627ikpr8i2z9ary2fqsj98"; + rev = "d2818a614ec3a5d174c6bb19e87e2eeb207f4900"; + sha256 = "08scgvpc5rmcc6xwbqir1b8y4fx58im5gn55fpg33s5346lxwd62"; }; meta.homepage = "https://github.com/tpope/vim-obsession/"; }; vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2022-01-24"; + version = "2022-02-09"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "9485f5aa3aa8e3d8505fce9a70efecc38dfee329"; - sha256 = "13lwc63iavqpwr25knrzs5f5mn7yrq8lhmm8p1d99vd5j7ngyy5x"; + rev = "335ebc6e433afb972aa797be0587895a11dddab5"; + sha256 = "079pfc897zz36mb36as7vq38b9njy42phjvmgarqlyqrwgjc0win"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -9694,12 +10031,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2021-09-04"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "5d152a9e03ca1c975c1f439456376e01561a02b5"; - sha256 = "0zdjj4mhw27jbdw8xrjc2gj3mx65p02c6nnyp7gci78fzxcv7slr"; + rev = "23b0846e26d946bda9ebcd267839fea83435aff2"; + sha256 = "0fydc0xs7pfx681s6v2l4w7z6c7ldajhsaffi23a0p9g5k0vchk6"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -9766,12 +10103,12 @@ final: prev: vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2021-07-06"; + version = "2022-02-16"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "5056e635ecf406e65d7d28651bab55600dd18741"; - sha256 = "0mzvknzk42x5h2p3l9gmmxhbardfkrirr8wzfx460cm5daps6j2q"; + rev = "7bea0ba8929749b2a471520af87635163fb28bdf"; + sha256 = "1dqd11qmb5jlkmalp10niysz1c2rv2pzwq332i3incq1v1l5146j"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; @@ -9826,12 +10163,12 @@ final: prev: vim-pencil = buildVimPluginFrom2Nix { pname = "vim-pencil"; - version = "2021-06-19"; + version = "2022-02-13"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-pencil"; - rev = "942e02e53cc2d914f215a2c69707fbdbdd137f86"; - sha256 = "098agz8kiycn6nhv42r43dmbc5hng3d7nwk0zgiws7cz8si4kf0s"; + rev = "5b4110dadebb756aae3d852caafbc963bb3c9a5e"; + sha256 = "0f21dabn586643vzkdxcp86ap803vsm60lx2lifbaicrxkf3s7ri"; }; meta.homepage = "https://github.com/preservim/vim-pencil/"; }; @@ -9886,12 +10223,12 @@ final: prev: vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2022-01-23"; + version = "2022-02-20"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "2c5af8f89d3e61e04e761c07a1f043b0f35203c6"; - sha256 = "1aajyfcxw7d9dfhakz6jzkhc6dvb6dckwv3q77f5cfnc5s6rfnz3"; + rev = "83422e0a1fcfc88f3475104b0e0674e8dbe3130e"; + sha256 = "1fj2avq18qx6rkghqiyp14qg166889kfpj7hzy5a1n71n5c8lh2j"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -9958,24 +10295,24 @@ final: prev: vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2021-12-30"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "ad9e7ed29a27ac03d1f6ceaa099457e2a60ae6a4"; - sha256 = "1inr4c6vr28vkx1z67n5l4w83zsfh2g06vb25n6g7xdihdlm549j"; + rev = "93b2af188fe0937edea414b8e05a362b74f4b31d"; + sha256 = "13x66y0dp70s2wcz5jkcqyp1r44sn3xdn70khzgl3jlv94ij3s1y"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; vim-prosession = buildVimPluginFrom2Nix { pname = "vim-prosession"; - version = "2022-01-20"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "8f3519a8c274767ae04134377abf144c75ebf534"; - sha256 = "1cxcnv2y5hmj1a5prddq3909xln26gfh8lhv62yqi5ckmrpzn64v"; + rev = "68d7c1682b1ec787905294cd980dc86c0398b7c8"; + sha256 = "0w5x4p7267yi2fs653pyw56jy8az0xd3jyyq5yw8xwk4gjr0131m"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -10018,12 +10355,12 @@ final: prev: vim-puppet = buildVimPluginFrom2Nix { pname = "vim-puppet"; - version = "2021-08-04"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "980147f64d708652aad1e67d8b39c17b2dd07702"; - sha256 = "0851b22an00p6i2xbc18zx3z5ik5k8nfr6is2fcbsqhlks0g7cgf"; + rev = "0385ccda67fe8bdd1fc12cd62a88ec38af303520"; + sha256 = "1vvx1n3fkqkz7zd5b9n8q82m7ar3fskxlhgavg3qycvvnbrniff8"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -10114,12 +10451,12 @@ final: prev: vim-ragtag = buildVimPluginFrom2Nix { pname = "vim-ragtag"; - version = "2021-02-22"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-ragtag"; - rev = "b8966c4f6503a8baaec39e17bd0bf38b2aadc9b2"; - sha256 = "0q4blsgnl4l2bkhgjry6xnszhsswdand52gc6gdjffwlzwa9jczy"; + rev = "51b313e8a2e3a44f37b9d625bc0d461e9066b7e9"; + sha256 = "0rd6p1c071dny90n0ph9l61zcbkln24lpjsjyrvlpna0lp1dx81q"; }; meta.homepage = "https://github.com/tpope/vim-ragtag/"; }; @@ -10222,12 +10559,12 @@ final: prev: vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2021-12-31"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "3b0c329d823b4736b8f5bae8ab546fb690fc0aa2"; - sha256 = "1r10l7q1wy84insjpzkqg2z4dxv8qja0fgpnwldh6rgh3bz60q0a"; + rev = "f3236767d2e74d736d98efd8da44013d1e95bfc1"; + sha256 = "0mlllnykdmcxf4yx2nkp74rm4wx2qwcly3m711a6pq7w87fgh6jz"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -10246,12 +10583,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2022-01-18"; + version = "2022-03-12"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "6ab5f16a56f5b2361ba17a41d8644631d2b43647"; - sha256 = "1z36b9vdl8zr1r08jm43p2qys598lbxplbjdqmywkx5y78dm4hhr"; + rev = "7bdd7fc4b4c9f0342e8cbac617b7e5299bd056a1"; + sha256 = "1c10gcfb43f0zq48kmlmhdvmpmgr8likkl7xbjqhkjcsj520qlj5"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -10294,12 +10631,12 @@ final: prev: vim-scriptease = buildVimPluginFrom2Nix { pname = "vim-scriptease"; - version = "2021-11-05"; + version = "2022-03-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-scriptease"; - rev = "710fe7c2f3c636fae0b5cac041ff8da028a0777f"; - sha256 = "0m3nsy0ks3rljwmaiygb4v3m58a2xnhavawzmms0fh1lsyyzcp1d"; + rev = "74bd5bf46a63b982b100466f9fd47d2d0597fcdd"; + sha256 = "1m9zpxlk1iz1wxylq4nrrlyv111f4my11jf1h5ff25l1acbgxvrw"; }; meta.homepage = "https://github.com/tpope/vim-scriptease/"; }; @@ -10402,12 +10739,12 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-01-18"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "b14a41a070d774c562eba7ff63e5f5f6968812fc"; - sha256 = "1997ipivg7y712z2pmaqzgav6irff3gcc5vw809k8syds618w0hh"; + rev = "edffd9ee2cfafa3aba291f105a1d4f9f0e2d5701"; + sha256 = "1rkn4qawz3p0h1pz0g712k3iz72qvapqd8k1f05kbabxymw6yqd7"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; @@ -10462,12 +10799,12 @@ final: prev: vim-smt2 = buildVimPluginFrom2Nix { pname = "vim-smt2"; - version = "2021-09-25"; + version = "2022-03-08"; src = fetchFromGitHub { owner = "bohlender"; repo = "vim-smt2"; - rev = "66d206292bd2e556bbf729ef808f0fffbab92c88"; - sha256 = "1431dk1ffcvgjj0zm4sj7z6csmw8hvmf05pxl5p45jj15xbqikzh"; + rev = "b9e4cbb85e880cd32f90c2dd9853ee7c592b3528"; + sha256 = "12g2ia7yqsh98nlr4z0ij67x0xamgizv0gbmg221if7ycn222xlm"; }; meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; @@ -10498,12 +10835,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-01-22"; + version = "2022-03-27"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "cbad57e5d0304198503648b5416ea28d2d1d437a"; - sha256 = "08ayp2p840fri3yc0lydic2w9gzjxvnpydrr9fifmmf3sw9fbdcd"; + rev = "57d23f6f44203374edcbb7d41903a491ec8cbed7"; + sha256 = "0371pv4pl99icxhbqbqfx7ds1i1kwv1k9p28i5pxayngkyhd7l39"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -10582,24 +10919,24 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-01-02"; + version = "2022-03-17"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "5518103a7a5e4d761d7ca9dd8fdc6f1aed669402"; - sha256 = "19286aa4vsif684wfywagfibzbxvq7sf62z6rmci5shvd5zsrpfi"; + rev = "61f122ebc41e9bcf1793c752a728db59feee77bb"; + sha256 = "1p9b2xgfcfbikadb2250ja0zbz1hcj02knqj5jw5kr3fp170100h"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; vim-strip-trailing-whitespace = buildVimPluginFrom2Nix { pname = "vim-strip-trailing-whitespace"; - version = "2021-01-03"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "axelf4"; repo = "vim-strip-trailing-whitespace"; - rev = "9a93dd653806ba3f886b2cf92111b663ce8d44bd"; - sha256 = "1pvirqj21xl2qbs9ycdp7n3lnf4n8b2bz1y90nphnvda4dfaac8l"; + rev = "59385775cbe416b2797ec5e2c7eb445a3398dd46"; + sha256 = "04v3hnljl9lxil6nqnrfsldyyhaz50l3sppifmpa27c2gd1w1v0y"; }; meta.homepage = "https://github.com/axelf4/vim-strip-trailing-whitespace/"; }; @@ -10630,28 +10967,40 @@ final: prev: vim-subversive = buildVimPluginFrom2Nix { pname = "vim-subversive"; - version = "2020-05-23"; + version = "2022-01-26"; src = fetchFromGitHub { owner = "svermeulen"; repo = "vim-subversive"; - rev = "5695f97fc803767bf657a5e512daec19dd1fd786"; - sha256 = "0lksvgk3g2yqbm8pw8ba5f8594djh5cj795hwjhnxc8rrhl29qpq"; + rev = "6286cda3f9222bfd490fe34a00a2d8cd4925adec"; + sha256 = "1lsfxrdxqzk0pqrv6him2s4j0vl1khxa5njknsbn8bvmshv8grap"; }; meta.homepage = "https://github.com/svermeulen/vim-subversive/"; }; vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2021-10-12"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "aeb933272e72617f7c4d35e1f003be16836b948d"; - sha256 = "1b0bd5m5lv1p4d299mrwjfs2gk0zqwyaqdaid9hs9yqlxnr8s5nf"; + rev = "9857a874632d1b983a7f4b1c85e3d15990c8b101"; + sha256 = "0ihcqrgvrllnrll9vgg1ywmhsvf43dwdpqv89r8mi70wsnzbgk3v"; }; meta.homepage = "https://github.com/tpope/vim-surround/"; }; + vim-svelte = buildVimPluginFrom2Nix { + pname = "vim-svelte"; + version = "2022-02-17"; + src = fetchFromGitHub { + owner = "evanleck"; + repo = "vim-svelte"; + rev = "1080030d6a1bc6582389c133a07552ba0a442410"; + sha256 = "0kwx0rkb6879v5c3jyavzh1hklxl2q1qwnm28x1p32kdcwqkccjp"; + }; + meta.homepage = "https://github.com/evanleck/vim-svelte/"; + }; + vim-swap = buildVimPluginFrom2Nix { pname = "vim-swap"; version = "2021-08-08"; @@ -10678,12 +11027,12 @@ final: prev: vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2022-01-21"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "9191af46b6bee8d3e3474c7f8ea134c800e55985"; - sha256 = "0szp8n82qmjwpm8skq3zqbmk0j9b269h86v7p6qlwdjnvr39hnis"; + rev = "698ff3074c45d4292ed6a2f629e6114fdaf4420b"; + sha256 = "0a8lzjp0mj2ml82sql44qbq1dwxmrxjp5h3snzclw4y64919yf21"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -10739,12 +11088,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-01-22"; + version = "2022-03-26"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "2ace9a12253140f1bdf4318a46ca9076658dd147"; - sha256 = "04bnymydy84z4gqnyjkkddvacmsqccbxiwm8p5hinlnyp6ahjjjd"; + rev = "56bbfa295fe62123d2ebe8ed57dd002afab46097"; + sha256 = "0ggk1c5767hjjfg1nwdm880bj9cgj6bgvf25dgjhwx83xxhzpp6d"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -10907,24 +11256,24 @@ final: prev: vim-toml = buildVimPluginFrom2Nix { pname = "vim-toml"; - version = "2021-12-06"; + version = "2022-02-23"; src = fetchFromGitHub { owner = "cespare"; repo = "vim-toml"; - rev = "2c8983cc391287e5e26e015c3ab9c38de9f9b759"; - sha256 = "1mxn2z3p3lnk3ibwxhqb3dih25qalpqfwy0rx7i393vpjbkn79py"; + rev = "89bcca8a3aeab360f6dfe5ce70999fc928669411"; + sha256 = "0lw45cchgmank2w0y864qwhzw5cjbggk1p46vgjgs7cn1jsdhvr0"; }; meta.homepage = "https://github.com/cespare/vim-toml/"; }; vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-01-24"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "72b956f668237a4cd9b020b2c173d013699b38b5"; - sha256 = "1f0kkxclpa9x3qc81yzagl1qili13ihbicb6d84pnpycy482k0sj"; + rev = "1da5d790a7b5c073453bcddf34da8145df04b32f"; + sha256 = "1x2hlfy3r4qsgshhlz73qdjrjrnzj88z5h9vhnvml4sljf5y9r2d"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -10979,12 +11328,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-01-21"; + version = "2022-03-19"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "00da9eacaf4396bdc11817f987c35e5d09486eb4"; - sha256 = "1r5zdwm20110mzwawxik563l4bw5zxhrpdsn0cgq04icp5gbbxrc"; + rev = "2a35653111b023660b519f6dbd95c97996ce8b02"; + sha256 = "1b840fnfqh19p2gzhc1xxisn0gyw756miian4znk0zzj2wlja151"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -11003,12 +11352,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2021-10-18"; + version = "2022-02-02"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "e4006d68cd4f390efef935bc09be0ce3bd022e72"; - sha256 = "048n8p7bjpcwdk924glqkwkp10fl813ffrjsagwwzsnakax3da5f"; + rev = "f992923d336e93c7f50fe9b35a07d5a92660ecaf"; + sha256 = "04l0v2jgkvhkfjj7j5r7x81gq2zwbjh5vh4p860p38razq6aixpl"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -11051,12 +11400,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-08-31"; + version = "2022-03-25"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "e20908963d9b0114e5da1eacbc516e4b09cf5803"; - sha256 = "02y91annhsrq6m9lnnvrla08g3z4chmpdrfrlzf252s26062mwdv"; + rev = "4fcd3797e380f2e4c8ea8be31ec6469e6f86f971"; + sha256 = "135jggj34pdczjby1p2vpr1b30whcabsfxjgvyrra45hlg45kzgn"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -11075,12 +11424,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-01-06"; + version = "2022-02-26"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "7fde9c0b6878a62bcc6d2d29f9a85a6616032f02"; - sha256 = "1f0p9pk2a2fxcdf4p35vm0jyrxkkxkqgn1v8fyd622vmcrbrj860"; + rev = "70a1131d64d75150ece513b983b0f42939bcb03c"; + sha256 = "042cnznm1p5x3ky7m81q62n3nlgab9fq734hlfwsbwrcdqa849l2"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -11111,12 +11460,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2022-01-21"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "e7f67547956667dd87c4c74bff2760567c3e3ab1"; - sha256 = "0v6kyjsw8ridyvvlwncprfz56iyk9rlsiva5k6sn5ir62cdwhipj"; + rev = "f922f82954cb68fccfd20ad3eacc78fb2559a937"; + sha256 = "1inb0vh1mfg6ihasd317ykw0dsnx8z16jvm6f6i8ldy3fw79y9wg"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -11135,12 +11484,12 @@ final: prev: vim-wayland-clipboard = buildVimPluginFrom2Nix { pname = "vim-wayland-clipboard"; - version = "2021-05-01"; + version = "2022-02-19"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "722aaf34486ffee924ccbc34eb22553642c1c153"; - sha256 = "1vg242139r1arz4kia4bbpmvzr4v5rp7gzy063f61xbvkdjwjx4q"; + rev = "7dcfcc17094eab71fd5fb467eb73c34abdde586c"; + sha256 = "1rs2zhr500ib1drvnk63yciw4g3z1jsfksm6s2a0ywsxv1b240n2"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; @@ -11157,6 +11506,18 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; + vim-windowswap = buildVimPluginFrom2Nix { + pname = "vim-windowswap"; + version = "2018-05-16"; + src = fetchFromGitHub { + owner = "wesQ3"; + repo = "vim-windowswap"; + rev = "15db3f697aa1fa696d99fcdc920c90cd2cec855e"; + sha256 = "1zzgwxv0a4i1qlig1c3n6n9ns2fqkkv6jqc2qxcipn6v6v88sl2b"; + }; + meta.homepage = "https://github.com/wesQ3/vim-windowswap/"; + }; + vim-wordmotion = buildVimPluginFrom2Nix { pname = "vim-wordmotion"; version = "2021-12-28"; @@ -11171,12 +11532,12 @@ final: prev: vim-wordy = buildVimPluginFrom2Nix { pname = "vim-wordy"; - version = "2020-10-24"; + version = "2022-02-13"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-wordy"; - rev = "667426a0171787b2620dffa5b2d7c01c9040237f"; - sha256 = "1lcrisv2wcd8iw76prql03wd11jgmknm3rvbcw7vv4v5r2s9rv5z"; + rev = "590927f57277666e032702b26e4e0c82717cc3cb"; + sha256 = "13ky8zlqalbvamhjvici7nvybansfzhrk8h203ayi2s5id9dai6m"; }; meta.homepage = "https://github.com/preservim/vim-wordy/"; }; @@ -11195,24 +11556,24 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2021-12-29"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "17aaeece90075ee4990da21ef662107a243fdbc9"; - sha256 = "0mvx5im6ryrnqq0mq0z4lfks20cryz8rnrl8347nrhw9vsb1sb2v"; + rev = "d6c9b8e06c1e7b3f14abc772ad61d73e687eede6"; + sha256 = "015jr832zwa7gcakbllifh3r45iyfywraswsm70vvbam165wwxph"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; vim-xtabline = buildVimPluginFrom2Nix { pname = "vim-xtabline"; - version = "2021-10-15"; + version = "2022-02-03"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-xtabline"; - rev = "2797c6c9d5278241a5932b5b31168fe2daa894de"; - sha256 = "1rvnm0xk8s9m6s9aycbzlnxbl8f03c3dqn74qrz5pw0r0vclfsv5"; + rev = "ccfa687d4f8d34bc2e23facc9b92c3abb90e5f93"; + sha256 = "0hrzwnnfdlb21wi3rj91k739v8dwi51w4llip669sw22ad0xz9la"; }; meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; @@ -11279,12 +11640,12 @@ final: prev: vimade = buildVimPluginFrom2Nix { pname = "vimade"; - version = "2022-01-12"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "fd3d3eb4bf6e5bdb643353f9d4bdae70faa16768"; - sha256 = "046w99vqk0lmxiwnsw57yvz6xgs64wmqwfm3iymxygqz828c8n3s"; + rev = "b0ce0820240e72a330bd388caa48baf434f1a0e3"; + sha256 = "1yknp4fjdwkc5sfw8f6rkhffa1k7lz3pa9q62v9ifj27a0gykwsd"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -11301,6 +11662,18 @@ final: prev: meta.homepage = "https://github.com/jreybert/vimagit/"; }; + VimCompletesMe = buildVimPluginFrom2Nix { + pname = "VimCompletesMe"; + version = "2022-02-18"; + src = fetchFromGitHub { + owner = "ackyshake"; + repo = "VimCompletesMe"; + rev = "9adf692d7ae6424038458a89d4a411f0a27d1388"; + sha256 = "1sndgb3291dyifaa8adri2mb8cgbinbar3nw1fnf67k9ahwycaz0"; + }; + meta.homepage = "https://github.com/ackyshake/VimCompletesMe/"; + }; + vimelette = buildVimPluginFrom2Nix { pname = "vimelette"; version = "2019-05-02"; @@ -11363,12 +11736,12 @@ final: prev: vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc.vim"; - version = "2020-06-23"; + version = "2022-02-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "8f40d86ab938d5df8c1c9824320621ae9f0d5609"; - sha256 = "11k59lc31056lk9ndkmi9a4459lnv6hdhvw3y4gpin40xchl6d61"; + rev = "3ba46c01109bc590c6740c1133f53584751924b2"; + sha256 = "05m34kbpi6y4rkcrxz785jikj37y5q44k0wfjdhklr49fgw08vra"; }; meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; @@ -11399,12 +11772,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-01-22"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "f0b135d091a2b78945ea46695fd8c667a92457c0"; - sha256 = "01lsplkqv6h71z09p5sy0xmadd0gwn20nl94az7hb1igvlrangc4"; + rev = "99ce7a74699f12e05bf6059125d767b05ceb212b"; + sha256 = "0hj26vyq8cbw5zsq94i4hay27fs9z5xxyniflz975ddii8189qa9"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -11412,12 +11785,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-01-22"; + version = "2022-03-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c7c084a5215c9402f1cdfdaa662a7eaa9b67d81b"; - sha256 = "0mcd8wzq9xhidfyyir689050j2nfvwhgjp1ypnp3nib0m10n7kb8"; + rev = "4eccec4e9fc46a52ba832ac2f8ab749ea33d6790"; + sha256 = "07mydwxqhk9l0ciqpczd51x4s58asmqa3f0bznw7cdvp9qa6a6sn"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11436,12 +11809,12 @@ final: prev: vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2020-05-26"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "619f04f89861c58e5a6415a4f83847752928252d"; - sha256 = "03dic4vjl3bwd7s6jj3vrz6xicf3a3bccaqgx635hn01ha6vw1jw"; + rev = "63af6e72dd3fa840bffb3ebcb8c96970c02e0913"; + sha256 = "1cvi3bb9kqfwjh3d4biwxgavankj2ljiyss36q8z96czzaz2w40v"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -11508,36 +11881,36 @@ final: prev: webapi-vim = buildVimPluginFrom2Nix { pname = "webapi-vim"; - version = "2021-06-04"; + version = "2022-03-11"; src = fetchFromGitHub { owner = "mattn"; repo = "webapi-vim"; - rev = "b09cbd3a27157a5baf0468403b392f577adefe45"; - sha256 = "17vlzg5dm5phirwyk8xkqnrkplybd8d5rj9kdx7rgla3h7rqn4wg"; + rev = "e9fdce27dc542f491c034a288bce5d74a79fb92d"; + sha256 = "09shpfr42h96qv4s9z3csjk39ppqmyxi183kpnli4479mc4z4df4"; }; meta.homepage = "https://github.com/mattn/webapi-vim/"; }; which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2022-01-19"; + version = "2022-03-18"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "28d2bd129575b5e9ebddd88506601290bb2bb221"; - sha256 = "13k1q7zkwr5bfc2lj97nk4npy0gk49r1qbac49aib7fyzirkagkg"; + rev = "a3c19ec5754debb7bf38a8404e36a9287b282430"; + sha256 = "00kkl785ifx5sg49q65d4yzdgf08gyriqrils5n4zhz4pksd5z1a"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder.nvim"; - version = "2022-01-09"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "f50d79a3f9ef07be3c0c8a0f49faaeea803a8c0c"; - sha256 = "0188kmh2ck1a5254i3gdk1p6p2z7wdq3prj66lslbhyard8gzxjq"; + rev = "b59648ad8588bcba377f4eecdea317796ebd1f9d"; + sha256 = "0aic96isjssgmlqkr30m9j3895v27f3hgkgsqbl3zwkvjqa218d6"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; @@ -11554,6 +11927,18 @@ final: prev: meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; + winshift-nvim = buildVimPluginFrom2Nix { + pname = "winshift.nvim"; + version = "2021-11-15"; + src = fetchFromGitHub { + owner = "sindrets"; + repo = "winshift.nvim"; + rev = "aaa04b97640165eb0877bfc04943f4282887470b"; + sha256 = "0rg7ci0m1hm9jbhjwckvjnfl0w3bl2wfr7wq67k0wdj5vnlzz6w3"; + }; + meta.homepage = "https://github.com/sindrets/winshift.nvim/"; + }; + wmgraphviz-vim = buildVimPluginFrom2Nix { pname = "wmgraphviz.vim"; version = "2018-04-26"; @@ -11653,12 +12038,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-01-11"; + version = "2022-03-23"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "7684b6c6b49f8d3bdbd17ecdc9ee7d228039808e"; - sha256 = "1g84g4lgpxgyb7cicdz6dxgmp4gliq0633lblcwsya7m35r8c7ls"; + rev = "89bba25c96866662ca38c2428f73eb64b0351ba3"; + sha256 = "0yrhvd9c0g6ay02b77sr657hn7ambcifwjfqsjywmnirr4zja45p"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -11688,6 +12073,18 @@ final: prev: meta.homepage = "https://github.com/KabbAmine/zeavim.vim/"; }; + zen-mode-nvim = buildVimPluginFrom2Nix { + pname = "zen-mode.nvim"; + version = "2021-11-07"; + src = fetchFromGitHub { + owner = "folke"; + repo = "zen-mode.nvim"; + rev = "f1cc53d32b49cf962fb89a2eb0a31b85bb270f7c"; + sha256 = "1fxkrny1xk69w8rlmz4x5msvqb8i8xvvl9csndpplxhkn8wzirdp"; + }; + meta.homepage = "https://github.com/folke/zen-mode.nvim/"; + }; + zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; version = "2021-09-15"; @@ -11714,12 +12111,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-01-17"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "29ceb12298015dfb59a6e06706c9005f76153238"; - sha256 = "1i5h6lk0ikwhda4h368m4nn0shb6xciaqhxpag109l9xijgm3yap"; + rev = "dd5e2c2384d42eaffadd5a8fd749b0499a90a7ac"; + sha256 = "0qbjnmjf057phxkzhsyys9x0620szbgr3awqzgxr3cflyd1zhrf4"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; @@ -11736,4 +12133,16 @@ final: prev: meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; + zoxide-vim = buildVimPluginFrom2Nix { + pname = "zoxide.vim"; + version = "2021-12-10"; + src = fetchFromGitHub { + owner = "nanotee"; + repo = "zoxide.vim"; + rev = "c4e96f34b1b3160d6b6a6519588024412df27cd7"; + sha256 = "0zisr1r1z9ys0jkab1lvwy4klwkay07p0095f03r9qydnig8jgsm"; + }; + meta.homepage = "https://github.com/nanotee/zoxide.vim/"; + }; + } diff --git a/pkgs/misc/vim-plugins/markdown-preview-nvim/fix-node-paths.patch b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch similarity index 100% rename from pkgs/misc/vim-plugins/markdown-preview-nvim/fix-node-paths.patch rename to pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch diff --git a/pkgs/misc/vim-plugins/markdown-preview-nvim/package.json b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json similarity index 100% rename from pkgs/misc/vim-plugins/markdown-preview-nvim/package.json rename to pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix similarity index 90% rename from pkgs/misc/vim-plugins/overrides.nix rename to pkgs/applications/editors/vim/plugins/overrides.nix index db4f0057d684..f3e1a5f12c33 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -34,10 +34,12 @@ , statix , stylish-haskell , tabnine +, tup , vim , which , xkb-switch , ycmd +, zoxide , nodejs # test dependencies @@ -65,8 +67,16 @@ , gobject-introspection , wrapGAppsHook - # vim-clap dependencies + # sniprun dependencies +, bashInteractive +, coreutils , curl +, gnugrep +, gnused +, makeWrapper +, procps + + # vim-clap dependencies , libgit2 , libiconv , openssl @@ -76,7 +86,6 @@ , asmfmt , delve , errcheck -, gnused , go-motion , go-tools , gocode @@ -406,7 +415,7 @@ self: super: { markdown-preview-nvim = super.markdown-preview-nvim.overrideAttrs (old: let # We only need its dependencies `node-modules`. - nodeDep = nodePackages."markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim".overrideAttrs (old: { + nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs (old: { dontNpmInstall = true; }); in { @@ -526,6 +535,11 @@ self: super: { dependencies = with self; [ nvim-treesitter plenary-nvim ]; }); + # needs "http" and "json" treesitter grammars too + rest-nvim = super.rest-nvim.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim ]; + }); + skim = buildVimPluginFrom2Nix { pname = "skim"; version = skim.version; @@ -536,6 +550,43 @@ self: super: { dependencies = with self; [ skim ]; }); + sniprun = + let + version = "1.1.2"; + src = fetchFromGitHub { + owner = "michaelb"; + repo = "sniprun"; + rev = "v${version}"; + sha256 = "sha256-WL0eXwiPhcndI74wtFox2tSnZn1siE86x2MLkfpxxT4="; + }; + sniprun-bin = rustPlatform.buildRustPackage { + pname = "sniprun-bin"; + inherit version src; + + cargoSha256 = "sha256-1WbgnsjoFdvko6VRKY+IjafMNqvJvyIZCDk8I9GV3GM="; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/sniprun \ + --prefix PATH ${lib.makeBinPath [ bashInteractive coreutils curl gnugrep gnused procps ]} + ''; + + doCheck = false; + }; + in + buildVimPluginFrom2Nix { + pname = "sniprun"; + inherit version src; + + patches = [ ./patches/sniprun/fix-paths.patch ]; + postPatch = '' + substituteInPlace lua/sniprun.lua --replace '@sniprun_bin@' ${sniprun-bin} + ''; + + propagatedBuildInputs = [ sniprun-bin ]; + }; + sqlite-lua = super.sqlite-lua.overrideAttrs (old: { postPatch = let libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"; @@ -643,6 +694,35 @@ self: super: { dependencies = with self; [ telescope-nvim ]; }); + telescope-zoxide = super.telescope-zoxide.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + + buildInputs = [ zoxide ]; + + postPatch = '' + substituteInPlace lua/telescope/_extensions/zoxide/config.lua \ + --replace "zoxide query -ls" "${zoxide}/bin/zoxide query -ls" + ''; + }); + + tup = + let + # Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim + ftdetect = builtins.toFile "tup.vim" '' + au BufNewFile,BufRead Tupfile,*.tup setf tup + ''; + in + buildVimPluginFrom2Nix { + inherit (tup) pname version src; + preInstall = '' + mkdir -p vim-plugin/syntax vim-plugin/ftdetect + cp contrib/syntax/tup.vim vim-plugin/syntax/tup.vim + cp "${ftdetect}" vim-plugin/ftdetect/tup.vim + cd vim-plugin + ''; + meta.maintainers = with lib.maintainers; [enderger]; + }; + unicode-vim = let unicode-data = fetchurl { @@ -752,7 +832,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-4VXXQjGmGGQXgfzSOvFnQS+iQjidj0FjaNKZ3VzBqw0="; + cargoSha256 = "035v8mm8v7aj8qwhvxsp6k0afn05gi2xb1achzsvm0m4a8a9xs65"; }; in '' @@ -766,6 +846,16 @@ self: super: { dependencies = with self; [ vim-maktaba ]; }); + # Due to case-sensitivety issues, the hash differs on Darwin systems, see: + # https://github.com/NixOS/nixpkgs/issues/157609 + vim-colorschemes = super.vim-colorschemes.overrideAttrs (old: { + src = old.src.overrideAttrs (srcOld: { + postFetch = (srcOld.postFetch or "") + lib.optionalString (!stdenv.isDarwin) '' + rm $out/colors/darkBlue.vim + ''; + }); + }); + vim-dasht = super.vim-dasht.overrideAttrs (old: { preFixup = '' substituteInPlace $out/autoload/dasht.vim \ @@ -1008,6 +1098,15 @@ self: super: { }; }); + zoxide-vim = super.zoxide-vim.overrideAttrs (old: { + buildInputs = [ zoxide ]; + + postPatch = '' + substituteInPlace autoload/zoxide.vim \ + --replace "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'" + ''; + }); + } // ( let nodePackageNames = [ diff --git a/pkgs/misc/vim-plugins/patches/fruzzy/get_version.patch b/pkgs/applications/editors/vim/plugins/patches/fruzzy/get_version.patch similarity index 100% rename from pkgs/misc/vim-plugins/patches/fruzzy/get_version.patch rename to pkgs/applications/editors/vim/plugins/patches/fruzzy/get_version.patch diff --git a/pkgs/misc/vim-plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch b/pkgs/applications/editors/vim/plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch similarity index 100% rename from pkgs/misc/vim-plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch rename to pkgs/applications/editors/vim/plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch diff --git a/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch new file mode 100644 index 000000000000..f3203e007576 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch @@ -0,0 +1,36 @@ +diff --git a/lua/sniprun.lua b/lua/sniprun.lua +index aa39e0b..188d54a 100644 +--- a/lua/sniprun.lua ++++ b/lua/sniprun.lua +@@ -4,9 +4,7 @@ M.custom_highlight=false + M.info_floatwin = {} + + -- See https://github.com/tjdevries/rofl.nvim/blob/632c10f2ec7c56882a3f7eda8849904bcac6e8af/lua/rofl.lua +-local binary_path = vim.fn.fnamemodify( +- vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h") +- .. "/target/release/sniprun" ++local binary_path = "@sniprun_bin@/bin/sniprun" + + local sniprun_path = vim.fn.fnamemodify( vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.." + +diff --git a/ressources/init_repl.sh b/ressources/init_repl.sh +index 2e6264d..0eab1c6 100644 +--- a/ressources/init_repl.sh ++++ b/ressources/init_repl.sh +@@ -23,7 +23,7 @@ mkfifo $working_dir/$pipe + touch $working_dir/$out + sleep 36000 > $working_dir/$pipe & + +-echo "/bin/cat " $working_dir/$pipe " | " $repl > $working_dir/real_launcher.sh ++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 +diff --git a/ressources/launcher_repl.sh b/ressources/launcher_repl.sh +index feaa91e..749c55e 100755 +--- a/ressources/launcher_repl.sh ++++ b/ressources/launcher_repl.sh +@@ -1,2 +1,2 @@ + #!/bin/bash +-/bin/cat $1 > $2 ++cat $1 > $2 diff --git a/pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch b/pkgs/applications/editors/vim/plugins/patches/vim-grammarous/set_default_languagetool.patch similarity index 100% rename from pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch rename to pkgs/applications/editors/vim/plugins/patches/vim-grammarous/set_default_languagetool.patch diff --git a/pkgs/misc/vim-plugins/readme.md b/pkgs/applications/editors/vim/plugins/readme.md similarity index 100% rename from pkgs/misc/vim-plugins/readme.md rename to pkgs/applications/editors/vim/plugins/readme.md diff --git a/pkgs/misc/vim-plugins/update-shell.nix b/pkgs/applications/editors/vim/plugins/update-shell.nix similarity index 60% rename from pkgs/misc/vim-plugins/update-shell.nix rename to pkgs/applications/editors/vim/plugins/update-shell.nix index e1b727c49e04..52a9e741af21 100644 --- a/pkgs/misc/vim-plugins/update-shell.nix +++ b/pkgs/applications/editors/vim/plugins/update-shell.nix @@ -1,5 +1,6 @@ -{ pkgs ? import ../../.. { } }: +{ pkgs ? import ../../../../.. { } }: +# Ideally, pkgs points to default.nix file of Nixpkgs official tree with pkgs; let pyEnv = python3.withPackages (ps: [ ps.GitPython ]); diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py similarity index 87% rename from pkgs/misc/vim-plugins/update.py rename to pkgs/applications/editors/vim/plugins/update.py index d9adc6667482..ad1c38cb375f 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -13,6 +13,9 @@ # refer to: # # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/vim.section.md#updating-plugins-in-nixpkgs-updating-plugins-in-nixpkgs +# +# (or the equivalent file /doc/languages-frameworks/vim.section.md from Nixpkgs master tree). +# import inspect import os @@ -27,7 +30,8 @@ log.addHandler(logging.StreamHandler()) # Import plugin update library from maintainers/scripts/pluginupdate.py ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) -sys.path.insert(0, os.path.join(ROOT.parent.parent.parent, "maintainers", "scripts")) +# Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree +sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")) import pluginupdate GET_PLUGINS = f"""(with import {{}}; @@ -47,7 +51,7 @@ let in lib.filterAttrs (n: v: v != null) checksums)""" HEADER = ( - "# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!" + "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!" ) diff --git a/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh b/pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh similarity index 100% rename from pkgs/misc/vim-plugins/vim-gen-doc-hook.sh rename to pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names similarity index 96% rename from pkgs/misc/vim-plugins/vim-plugin-names rename to pkgs/applications/editors/vim/plugins/vim-plugin-names index d836b5247b86..f138c6d42d9c 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -3,6 +3,7 @@ aca/completion-tabnine AckslD/nvim-neoclip.lua AckslD/nvim-whichkey-setup.lua ackyshake/Spacegray.vim +ackyshake/VimCompletesMe ahmedkhalf/lsp-rooter.nvim ahmedkhalf/project.nvim airblade/vim-gitgutter @@ -12,11 +13,13 @@ akinsho/bufferline.nvim akinsho/toggleterm.nvim aklt/plantuml-syntax allendang/nvim-expand-expr +AlphaTechnolog/pywal.nvim altercation/vim-colors-solarized alvan/vim-closetag alvarosevilla95/luatab.nvim alx741/vim-hindent alx741/vim-stylishask +AmeerTaweel/todo.nvim amiorin/ctrlp-z andersevenrud/cmp-tmux andersevenrud/nordic.nvim @@ -40,6 +43,7 @@ arthurxavierx/vim-unicoder artur-shaik/vim-javacomplete2 autozimu/LanguageClient-neovim axelf4/vim-strip-trailing-whitespace +axieax/urlview.nvim ayu-theme/ayu-vim b0o/SchemaStore.nvim b3nj5m1n/kommentary @@ -51,7 +55,6 @@ benizi/vim-automkdir bhurlow/vim-parinfer bitc/vim-hdevtools bkad/camelcasemotion -blackCauldron7/surround.nvim bling/vim-bufferline blueballs-theme/blueballs-neovim blueyed/vim-diminactive @@ -90,6 +93,7 @@ ckarnell/antonys-macro-repeater clojure-vim/vim-jack-in cloudhead/neovim-fuzzy CoatiSoftware/vim-sourcetrail +coc-extensions/coc-svelte cocopon/iceberg.vim codota/tabnine-vim cohama/lexima.vim @@ -157,6 +161,7 @@ ervandew/supertab esneider/YUNOcommit.vim euclidianAce/BetterLua.vim euclio/vim-markdown-composer +evanleck/vim-svelte f-person/git-blame.nvim f3fora/cmp-spell famiu/bufdelete.nvim @@ -168,6 +173,7 @@ FelikZ/ctrlp-py-matcher feline-nvim/feline.nvim fenetikm/falcon fhill2/floating.nvim +fhill2/telescope-ultisnips.nvim fiatjaf/neuron.vim filipdutescu/renamer.nvim fisadev/vim-isort @@ -180,6 +186,7 @@ folke/tokyonight.nvim folke/trouble.nvim folke/twilight.nvim folke/which-key.nvim +folke/zen-mode.nvim FooSoft/vim-argwrap freitass/todo.txt-vim frigoeu/psc-ide-vim @@ -202,8 +209,6 @@ gioele/vim-autoswap github/copilot.vim gleam-lang/gleam.vim glepnir/dashboard-nvim -glepnir/galaxyline.nvim -glepnir/lspsaga.nvim glepnir/oceanic-material glepnir/zephyr-nvim glts/vim-textobj-comment @@ -223,6 +228,8 @@ guns/vim-clojure-highlight guns/vim-clojure-static guns/vim-sexp guns/xterm-color-table.vim +GustavoKatel/telescope-asynctasks.nvim +gyim/vim-boxdraw haringsrob/nvim_context_vt hashivim/vim-packer hashivim/vim-terraform @@ -258,6 +265,7 @@ hsitz/VimOrganizer https://git.sr.ht/~whynothugo/lsp_lines.nvim hura/vim-asymptote iamcco/coc-spell-checker +iamcco/coc-tailwindcss iamcco/markdown-preview.nvim ianks/vim-tsx idanarye/vim-merginal @@ -277,6 +285,7 @@ itchyny/vim-gitbranch itspriddle/vim-shellcheck ivalkeen/vim-simpledb ivanov/vim-ipython +j-hui/fidget.nvim jackguo380/vim-lsp-cxx-highlight jacoborus/tender.vim jakwings/vim-pony @@ -310,6 +319,7 @@ joonty/vim-xdebug joosepalviste/nvim-ts-context-commentstring jordwalke/vim-reasonml josa42/coc-lua +josa42/nvim-lightline-lsp josa42/vim-lightline-coc jose-elias-alvarez/minsnip.nvim jose-elias-alvarez/null-ls.nvim @@ -342,6 +352,7 @@ justincampbell/vim-eighties justinj/vim-pico8-syntax justinmk/vim-dirvish justinmk/vim-sneak +jvgrootveld/telescope-zoxide jvirtanen/vim-hcl jvoorhis/coq.vim KabbAmine/vCoolor.vim @@ -362,6 +373,7 @@ kdheepak/cmp-latex-symbols kdheepak/lazygit.nvim kdheepak/tabline.nvim KeitaNakamura/neodark.vim +KeitaNakamura/tex-conceal.vim keith/investigate.vim keith/rspec.vim keith/swift.vim @@ -372,6 +384,7 @@ kien/rainbow_parentheses.vim knubie/vim-kitty-navigator konfekt/fastfold Konfekt/vim-alias +Konfekt/vim-CtrlXA konfekt/vim-DetectSpellLang kosayoda/nvim-lightbulb kovisoft/slimv @@ -415,6 +428,7 @@ lighttiger2505/deoplete-vim-lsp lilydjwg/colorizer lilydjwg/fcitx.vim@fcitx5 liuchengxu/graphviz.vim +liuchengxu/space-vim liuchengxu/vim-clap liuchengxu/vim-which-key liuchengxu/vista.vim @@ -432,6 +446,7 @@ lumiliet/vim-twig luochen1990/rainbow luukvbaal/stabilize.nvim lyokha/vim-xkbswitch +m-pilia/vim-ccls machakann/vim-highlightedyank machakann/vim-sandwich machakann/vim-swap @@ -455,6 +470,7 @@ MarcWeber/vim-addon-sql MarcWeber/vim-addon-syntax-checker MarcWeber/vim-addon-toggle-buffer MarcWeber/vim-addon-xdebug +marko-cerovac/material.nvim markonm/traces.vim martinda/Jenkinsfile-vim-syntax MattesGroeger/vim-bookmarks @@ -510,6 +526,7 @@ mzlogin/vim-markdown-toc mzlogin/vim-smali nacro90/numb.nvim nanotech/jellybeans.vim +nanotee/zoxide.vim natebosch/vim-lsc nathanaelkane/vim-indent-guides nathangrigg/vim-beancount @@ -557,6 +574,8 @@ noc7c9/vim-iced-coffee-script norcalli/nvim-colorizer.lua norcalli/nvim-terminal.lua norcalli/snippets.nvim +NTBBloodbath/galaxyline.nvim +NTBBloodbath/rest.nvim ntpeters/vim-better-whitespace numirias/semshi numtostr/comment.nvim @@ -583,6 +602,7 @@ nvim-telescope/telescope-fzy-native.nvim nvim-telescope/telescope-github.nvim nvim-telescope/telescope-project.nvim nvim-telescope/telescope-symbols.nvim +nvim-telescope/telescope-ui-select.nvim nvim-telescope/telescope-z.nvim nvim-telescope/telescope.nvim nvim-treesitter/completion-treesitter @@ -627,6 +647,7 @@ posva/vim-vue powerman/vim-plugin-AnsiEsc PProvost/vim-ps1 prabirshrestha/async.vim +prabirshrestha/asyncomplete-lsp.vim prabirshrestha/asyncomplete.vim prabirshrestha/vim-lsp preservim/nerdcommenter @@ -646,6 +667,7 @@ pwntester/octo.nvim python-mode/python-mode qnighy/lalrpop.vim qpkorr/vim-bufkill +quangnguyen30192/cmp-nvim-ultisnips Quramy/tsuquyomi racer-rust/vim-racer radenling/vim-dispatch-neovim @@ -677,6 +699,7 @@ rhysd/vim-operator-surround RishabhRD/nvim-lsputils RishabhRD/popfix rktjmp/fwatch.nvim +rktjmp/hotpot.nvim rktjmp/lush.nvim rmagatti/auto-session rmagatti/goto-preview @@ -706,10 +729,10 @@ ryvnf/readline.vim saadparwaiz1/cmp_luasnip saecki/crates.nvim sainnhe/edge +sainnhe/everforest sainnhe/gruvbox-material sainnhe/sonokai sakhnik/nvim-gdb -saltstack/salt-vim samoshkin/vim-mergetool sbdchd/neoformat sblumentritt/bitbake.vim @@ -748,16 +771,21 @@ simnalamburt/vim-mundo simrat39/rust-tools.nvim simrat39/symbols-outline.nvim sindrets/diffview.nvim +sindrets/winshift.nvim SirVer/ultisnips sjl/gundo.vim sjl/splice.vim sk1418/last256 +skywind3000/asyncrun.vim +skywind3000/asynctasks.vim slashmili/alchemist.vim smiteshp/nvim-gps sodapopcan/vim-twiggy solarnz/arcanist.vim sonph/onehalf sotte/presenting.vim +SpaceVim/SpaceVim +spywhere/lightline-lsp srcery-colors/srcery-vim steelsojka/completion-buffers steelsojka/pears.nvim @@ -770,6 +798,7 @@ sudormrfbin/cheatsheet.nvim sunaku/vim-dasht sunjon/Shade.nvim svermeulen/vim-subversive +symphorien/vim-nixhash t9md/vim-choosewin t9md/vim-smalls TaDaa/vimade @@ -778,6 +807,7 @@ tamago324/compe-zsh tamago324/lir.nvim tami5/compe-conjure tami5/lispdocs.nvim +tami5/lspsaga.nvim tami5/sqlite.lua tbastos/vim-lua tbodt/deoplete-tabnine @@ -871,6 +901,7 @@ uarun/vim-protobuf udalov/kotlin-vim ujihisa/neco-look unblevable/quick-scope +ur4ltz/surround.nvim urbit/hoon.vim Valloric/MatchTagAlways Valodim/deoplete-notmuch @@ -932,6 +963,7 @@ vimwiki/vimwiki vito-c/jq.vim vmchale/ats-vim vmchale/dhall-vim +vmware-archive/salt-vim vn-ki/coc-clap voldikss/vim-floaterm vuki656/package-info.nvim @@ -943,6 +975,7 @@ wbthomason/packer.nvim weilbith/nvim-code-action-menu wellle/targets.vim wellle/tmux-complete.vim +wesQ3/vim-windowswap wfxr/minimap.vim whonore/Coqtail will133/vim-dirdiff @@ -964,6 +997,7 @@ Xuyuanp/scrollbar.nvim yamatsum/nvim-cursorline yamatsum/nvim-nonicons ycm-core/YouCompleteMe +yegappan/mru Yggdroot/hiPairs Yggdroot/indentLine Yggdroot/LeaderF diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix similarity index 83% rename from pkgs/misc/vim-plugins/vim-utils.nix rename to pkgs/applications/editors/vim/plugins/vim-utils.nix index 128b969c3575..b291928f25aa 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -1,5 +1,6 @@ # tests available at pkgs/test/vim -{ lib, stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin +{ lib, stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText +, runCommand, makeWrapper , nix-prefetch-hg, nix-prefetch-git , fetchFromGitHub, runtimeShell , hasLuaModule @@ -16,7 +17,7 @@ Install Vim like this eg using nixos option environment.systemPackages which wil vim-with-plugins in PATH: vim_configurable.customize { - name = "vim-with-plugins"; + name = "vim-with-plugins"; # optional # add custom .vimrc lines like this: vimrcConfig.customRC = '' @@ -82,7 +83,8 @@ See vimHelpTags sample code below. CONTRIBUTING AND CUSTOMIZING ============================ -The example file pkgs/misc/vim-plugins/default.nix provides both: +The example file pkgs/applications/editors/vim/plugins/default.nix provides +both: * manually mantained plugins * plugins created by VAM's nix#ExportPluginsForNix implementation @@ -403,64 +405,81 @@ rec { inherit vimrcContent; inherit packDir; - # shell script with custom name passing [-u vimrc] [-U gvimrc] to vim - vimWithRC = { - vimExecutable, - gvimExecutable, - vimManPages, - wrapManual, - wrapGui, - name ? "vim", - vimrcFile ? null, - gvimrcFile ? null, - vimExecutableName, - gvimExecutableName, - }: - let - rcOption = o: file: lib.optionalString (file != null) "-${o} ${file}"; - vimWrapperScript = writeScriptBin vimExecutableName '' - #!${runtimeShell} - exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" - ''; - gvimWrapperScript = writeScriptBin gvimExecutableName '' - #!${stdenv.shell} - exec ${gvimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" - ''; - in - buildEnv { - inherit name; - paths = [ - vimWrapperScript - ] ++ lib.optional wrapGui gvimWrapperScript - ++ lib.optional wrapManual vimManPages - ; - }; + makeCustomizable = let + mkVimrcFile = vimrcFile; # avoid conflict with argument name + in vim: vim // { + # Returns a customized vim that uses the specified vimrc configuration. + customize = + { # The name of the derivation. + name ? "vim" + , # A shell word used to specify the names of the customized executables. + # The shell variable $exe can be used to refer to the wrapped executable's name. + # Examples: "my-$exe", "$exe-with-plugins", "\${exe/vim/v1m}" + executableName ? + if lib.hasInfix "vim" name then + lib.replaceStrings [ "vim" ] [ "$exe" ] name + else + "\${exe/vim/${lib.escapeShellArg name}}" + , # A custom vimrc configuration, treated as an argument to vimrcContent (see the documentation in this file). + vimrcConfig ? null + , # A custom vimrc file. + vimrcFile ? null + , # A custom gvimrc file. + gvimrcFile ? null + , # If set to true, return the *vim wrappers only. + # If set to false, overlay the wrappers on top of the original vim derivation. + # This ensures that things like man pages and .desktop files are available. + standalone ? name != "vim" && wrapManual != true - # add a customize option to a vim derivation - makeCustomizable = vim: vim // { - customize = { - name, - vimrcConfig, - wrapManual ? true, - wrapGui ? false, - vimExecutableName ? name, - gvimExecutableName ? (lib.concatStrings [ "g" name ]), - }: vimWithRC { - vimExecutable = "${vim}/bin/vim"; - gvimExecutable = "${vim}/bin/gvim"; - inherit name wrapManual wrapGui vimExecutableName gvimExecutableName; - vimrcFile = vimrcFile vimrcConfig; - vimManPages = buildEnv { - name = "vim-doc"; - paths = [ vim ]; - pathsToLink = [ "/share/man" ]; - }; - }; + , # deprecated arguments (TODO: remove eventually) + wrapManual ? null, wrapGui ? null, vimExecutableName ? null, gvimExecutableName ? null, + }: + lib.warnIf (wrapManual != null) '' + vim.customize: wrapManual is deprecated: the manual is now included by default if `name == "vim"`. + ${if wrapManual == true && name != "vim" then "Set `standalone = false` to include the manual." + else if wrapManual == false && name == "vim" then "Set `standalone = true` to get the *vim wrappers only." + else ""}'' + lib.warnIf (wrapGui != null) + "vim.customize: wrapGui is deprecated: gvim is now automatically included if present" + lib.throwIfNot (vimExecutableName == null && gvimExecutableName == null) + "vim.customize: (g)vimExecutableName is deprecated: use executableName instead (see source code for examples)" + (let + vimrc = + if vimrcFile != null then vimrcFile + else if vimrcConfig != null then mkVimrcFile vimrcConfig + else throw "at least one of vimrcConfig and vimrcFile must be specified"; + bin = runCommand "${name}-bin" { buildInputs = [ makeWrapper ]; } '' + vimrc=${lib.escapeShellArg vimrc} + gvimrc=${if gvimrcFile != null then lib.escapeShellArg gvimrcFile else ""} + + mkdir -p "$out/bin" + for exe in ${ + if standalone then "{,g,r,rg,e}vim {,g}vimdiff" + else "{,g,r,rg,e}{vim,view} {,g}vimdiff ex" + }; do + if [[ -e ${vim}/bin/$exe ]]; then + dest="$out/bin/${executableName}" + if [[ -e $dest ]]; then + echo "ambiguous executableName: ''${dest##*/} already exists" + continue + fi + makeWrapper ${vim}/bin/"$exe" "$dest" \ + --add-flags "-u ''${vimrc@Q} ''${gvimrc:+-U ''${gvimrc@Q}}" + fi + done + ''; + in if standalone then bin else + buildEnv { + inherit name; + paths = [ (lib.lowPrio vim) bin ]; + }); override = f: makeCustomizable (vim.override f); overrideAttrs = f: makeCustomizable (vim.overrideAttrs f); }; + vimWithRC = throw "vimWithRC was removed, please use vim.customize instead"; + pluginnames2Nix = {name, namefiles} : vim_configurable.customize { inherit name; vimrcConfig.vam.knownPlugins = vimPlugins; diff --git a/pkgs/misc/vim-plugins/vim2nix/README.txt b/pkgs/applications/editors/vim/plugins/vim2nix/README.txt similarity index 100% rename from pkgs/misc/vim-plugins/vim2nix/README.txt rename to pkgs/applications/editors/vim/plugins/vim2nix/README.txt diff --git a/pkgs/misc/vim-plugins/vim2nix/addon-info.json b/pkgs/applications/editors/vim/plugins/vim2nix/addon-info.json similarity index 100% rename from pkgs/misc/vim-plugins/vim2nix/addon-info.json rename to pkgs/applications/editors/vim/plugins/vim2nix/addon-info.json diff --git a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim b/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim similarity index 100% rename from pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim rename to pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index a658f95ac014..b9fcfe10221e 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -50,14 +50,10 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "vis"; genericName = "Text editor"; - categories = lib.concatStringsSep ";" [ - "Application" "Development" "IDE" - ]; - mimeType = lib.concatStringsSep ";" [ - "text/plain" "application/octet-stream" - ]; - startupNotify = "false"; - terminal = "true"; + categories = [ "Application" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "application/octet-stream" ]; + startupNotify = false; + terminal = true; }; meta = with lib; { diff --git a/pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh b/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh similarity index 91% rename from pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh rename to pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh index f3058755d6a2..e3d1e5fb1397 100755 --- a/pkgs/misc/vscode-extensions/_maintainers/update-bin-srcs-lib.sh +++ b/pkgs/applications/editors/vscode/extensions/_maintainers/update-bin-srcs-lib.sh @@ -105,11 +105,15 @@ formatExtRuntimeDeps() { jsonStorePath="$(echo "$jsonShaWStorePath" | tail -n1)" 1>&2 echo "jsonStorePath='$jsonStorePath'" + # Assume packages without an architectures are for x86_64 and remap arm64 to aarch64. declare jqQuery jqQuery=$(cat <<'EOF' .runtimeDependencies -| map(select(.platforms[] | in({"linux": null}))) -| map(select(.architectures[] | in({"x86_64": null}))) +| map(select(.platforms[] | in({"linux": null, "darwin": null}))) +| map(select(.architectures == null).architectures |= ["x86_64"]) +| map(del(.architectures[] | select(. | in({"x86_64": null, "arm64": null}) | not))) +| map((.architectures[] | select(. == "arm64")) |= "aarch64") +| map(select(.architectures != [])) | .[] | { (.id + "__" + (.architectures[0]) + "-" + (.platforms[0])): {installPath, binaries, urls: [.url, .fallbackUrl] | map(select(. != null))} diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/cpptools/default.nix similarity index 87% rename from pkgs/misc/vscode-extensions/cpptools/default.nix rename to pkgs/applications/editors/vscode/extensions/cpptools/default.nix index 077c3807ecaa..cc935876ded3 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/cpptools/default.nix @@ -47,15 +47,27 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "1.7.1"; + version = "1.9.1"; }; vsix = fetchurl { - name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; - url = "https://github.com/microsoft/vscode-cpptools/releases/download/${mktplcRef.version}/cpptools-linux.vsix"; - sha256 = "sha256-LqndG/vv8LgVPEX6dGkikDB6M6ISneo2UJ78izXVFbk="; + name = "${mktplcRef.publisher}-${mktplcRef.name}.gz"; + url = "https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${mktplcRef.publisher}/vsextensions/${mktplcRef.name}/${mktplcRef.version}/vspackage?targetPlatform=linux-x64"; + sha256 = "sha256-BtTl9DR8hnwNpO5k99M4dtqcTQ2hTzVbjR8VZh+tdDI="; }; + unpackPhase = '' + runHook preUnpack + + gzip -d $src --stdout &> temporary.zip + unzip temporary.zip + rm temporary.zip + + cd extension/ + + runHook postUnpack + ''; + buildInputs = [ jq ]; diff --git a/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh b/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh similarity index 100% rename from pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh rename to pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json b/pkgs/applications/editors/vscode/extensions/cpptools/package-activation-events.json similarity index 100% rename from pkgs/misc/vscode-extensions/cpptools/package-activation-events.json rename to pkgs/applications/editors/vscode/extensions/cpptools/package-activation-events.json diff --git a/pkgs/misc/vscode-extensions/cpptools/update_helper.sh b/pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh similarity index 100% rename from pkgs/misc/vscode-extensions/cpptools/update_helper.sh rename to pkgs/applications/editors/vscode/extensions/cpptools/update_helper.sh diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix similarity index 83% rename from pkgs/misc/vscode-extensions/default.nix rename to pkgs/applications/editors/vscode/extensions/default.nix index 307003025ccc..a5c8dcfb50f5 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5,6 +5,7 @@ , vscode-utils , asciidoctor , nodePackages +, python3Packages , jdk , llvmPackages_8 , nixpkgs-fmt @@ -14,6 +15,7 @@ , moreutils , racket-minimal , clojure-lsp +, alejandra }: let @@ -93,8 +95,8 @@ let mktplcRef = { name = "vscode-tlaplus"; publisher = "alygin"; - version = "1.5.3"; - sha256 = "1cy0qn8iyjrinscn9p5ckpsa2hyryapxfi7is6s2zk2mpligbb1d"; + version = "1.5.4"; + sha256 = "0mf98244z6wzb0vj6qdm3idgr2sr5086x7ss2khaxlrziif395dx"; }; meta = { license = lib.licenses.mit; @@ -193,6 +195,18 @@ let }; }; + Arjun.swagger-viewer = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "Arjun"; + name = "swagger-viewer"; + version = "3.1.2"; + sha256 = "1cjvc99x1q5w3i2vnbxrsl5a1dr9gb3s6s9lnwn6mq5db6iz1nlm"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + arrterian.nix-env-selector = buildVscodeMarketplaceExtension { mktplcRef = { name = "nix-env-selector"; @@ -243,8 +257,8 @@ let mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2020.11.2"; - sha256 = "0n2dm21vgzir3hx1m3pmx7jq4zy3hdxfsandd2wv5da4fs9b5g50"; + version = "2022.1.5"; + sha256 = "1b5ihrac9xsq35a39vlq7krr1ffqpdjxdlhv9s056hs033kayazl"; }; buildInputs = [ nodePackages.pyright ]; @@ -275,8 +289,8 @@ let mktplcRef = { name = "scaladex-search"; publisher = "baccata"; - version = "0.0.1"; - sha256 = "1y8p4rr8qq5ng52g4pbx8ayq04gi2869wrx68k69rl7ga7bzcyp9"; + version = "0.2.0"; + sha256 = "0xbikwlrascmn9nzyl4fxb2ql1dczd00ragp30a3yv8bax173bnz"; }; meta = { license = lib.licenses.asl20; @@ -295,6 +309,18 @@ let }; }; + benfradet.vscode-unison = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-unison"; + publisher = "benfradet"; + version = "0.3.0"; + sha256 = "1x80s8l8djchg17553aiwaf4b49hf6awiayk49wyii0i26hlpjk1"; + }; + meta = with lib; { + license = licenses.asl20; + }; + }; + betterthantomorrow.calva = buildVscodeMarketplaceExtension { mktplcRef = { name = "calva"; @@ -324,6 +350,42 @@ let }; }; + bierner.emojisense = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "emojisense"; + publisher = "bierner"; + version = "0.9.0"; + sha256 = "0gpcpwh57lqlynsrkv3smykndb46xjh7r85lb291wdklq5ahmb2j"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + + bierner.markdown-checkbox = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-checkbox"; + publisher = "bierner"; + version = "0.3.1"; + sha256 = "0x57dnr6ksqxi28g1c392k04vxy0vdni9nl4xps3i5zh0pyxizhw"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + + bierner.markdown-emoji = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "markdown-emoji"; + publisher = "bierner"; + version = "0.2.1"; + sha256 = "1lcg2b39jydl40wcfrbgshl2i1r58k92c7dipz0hl1fa1v23vj4v"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + bradlc.vscode-tailwindcss = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tailwindcss"; @@ -399,8 +461,8 @@ let mktplcRef = { name = "gitignore"; publisher = "codezombiech"; - version = "0.6.0"; - sha256 = "0gnc0691pwkd9s8ldqabmpfvj0236rw7bxvkf0bvmww32kv1ia0b"; + version = "0.7.0"; + sha256 = "0fm4sxx1cb679vn4v85dw8dfp5x0p74m9p2b56gqkvdap0f2q351"; }; meta = with lib; { license = licenses.mit; @@ -475,12 +537,25 @@ let }; }; + daohong-emilio.yash = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "daohong-emilio"; + name = "yash"; + version = "0.2.8"; + sha256 = "ummOEBSXUI78hBb1AUh+x339T7ocB/evOVaz79geHRM="; + }; + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kamadorueda ]; + }; + }; + davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.45.0"; - sha256 = "sha256-L7y+Lsx1DMS12JtxSl7WkT8jGQLipebNKxknF/Y1ke0="; + version = "0.46.0"; + sha256 = "sha256-2FvE+6fnZPtR0At4NjLKSMCbPu8T7o8xtpvYiEjh7ck="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -545,6 +620,16 @@ let meta = { license = lib.licenses.mit; }; }; + disneystreaming.smithy = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "disneystreaming"; + name = "smithy"; + version = "0.0.2"; + sha256 = "0rdh7b5s7ynsyfrq1r1170g65q9vvvfl3qbfvbh1b38ndvj2f0yq"; + }; + meta = { license = lib.licenses.asl20; }; + }; + divyanshuagrawal.competitive-programming-helper = buildVscodeMarketplaceExtension { mktplcRef = { name = "competitive-programming-helper"; @@ -613,8 +698,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "11.7.0"; - sha256 = "0apjjlfdwljqih394ggz2d8m599pyyjrb0b4cfcz83601b7hk3x6"; + version = "12.0.3"; + sha256 = "sha256-PHQXfk0JggkEBRflHp+OAUOCVuymCubaszfDCYbpfG0="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -652,8 +737,20 @@ let mktplcRef = { name = "vscode-command-runner"; publisher = "edonet"; - version = "0.0.116"; - sha256 = "0fxvplyk080m0cdsvzynp6wjillrd4flr5qz7af7fibb2jbmfdkn"; + version = "0.0.122"; + sha256 = "1lvwvcs18azqhkzyvhf83ckfhfdgcqrw2gxb2myspqj59783hfpg"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + eg2.vscode-npm-script = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-npm-script"; + publisher = "eg2"; + version = "0.3.24"; + sha256 = "sha256-XgdMLecyZQXsgQAUh8V4eFLKaUF4WVlgy9iIGNDnR/I="; }; meta = { license = lib.licenses.mit; @@ -664,8 +761,8 @@ let mktplcRef = { name = "elm-ls-vscode"; publisher = "Elmtooling"; - version = "2.0.1"; - sha256 = "06x5ld2r1hzns2s052mvhmfiaawjzcn0jf5lkfprhmrkxnmfdd43"; + version = "2.4.0"; + sha256 = "sha256-5hYlkx8hlwS8iWTlfupX8XjTLAY/KUi0bd3jf/tm92o="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Elmtooling.elm-ls-vscode/changelog"; @@ -693,8 +790,8 @@ let mktplcRef = { name = "prettier-vscode"; publisher = "esbenp"; - version = "9.1.0"; - sha256 = "sha256-lR5BDbDYURCF1Gq5JIm7BcXVvKXPdNBYom0BiVX/3u0="; + version = "9.3.0"; + sha256 = "sha256-hJgPjWf7a8+ltjmXTK8U/MwqgIZqBjmcCfHsAk2G3PA="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog"; @@ -749,7 +846,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=faustinoaq.lex-flex-yacc-bison"; homepage = "https://github.com/faustinoaq/vscode-lex-flex-yacc-bison"; license = licenses.mit; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; }; @@ -791,8 +888,8 @@ let mktplcRef = { name = "auto-close-tag"; publisher = "formulahendry"; - version = "0.5.13"; - sha256 = "0swyxhcibv6cl54gmfpnbz6bqidjzc77nx369wndhlq264idnwkw"; + version = "0.5.14"; + sha256 = "sha256-XYYHS2QTy8WYjtUYYWsIESzmH4dRQLlXQpJq78BolMw="; }; meta = { license = lib.licenses.mit; @@ -803,8 +900,8 @@ let mktplcRef = { name = "auto-rename-tag"; publisher = "formulahendry"; - version = "0.1.9"; - sha256 = "1xk8rzda16qgdxhq8bz6f8w09fd9044qczx1wfhszd6w3r4q9262"; + version = "0.1.10"; + sha256 = "sha256-uXqWebxnDwaUVLFG6MUh4bZ7jw5d2rTHRm5NoR2n0Vs="; }; meta = { license = lib.licenses.mit; @@ -855,6 +952,18 @@ let }; }; + humao.rest-client = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "humao"; + name = "rest-client"; + version = "0.24.6"; + sha256 = "196pm7gv0488bpv1lklh8hpwmdqc4yimz389gad6nsna368m4m43"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + jkillian.custom-local-formatters = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "jkillian"; @@ -885,8 +994,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.7.4421"; - sha256 = "1wvzf8rq8ligj079f1m74zzna2mfmhcbgvvrsw6w0wxw9x8fn4wy"; + version = "1.7.4812"; + sha256 = "1yl7m90m38pv8nz4dwcszjsa1sf253459xln17mngmc8z9wd3d3a"; }; meta = { license = lib.licenses.unfree; }; }; @@ -912,8 +1021,8 @@ let mktplcRef = { name = "vscode-pull-request-github"; publisher = "github"; - version = "0.35.2022010609"; - sha256 = "06ryx8b605fd1q2zz8jps7j8r506qwym93x1ra1kc0h9g8a8r7sa"; + version = "0.37.2022030309"; + sha256 = "1icmg2ssdkxvwp8mn8zzakwn42hrdglsdgfnaf8va4vd9mqixl1v"; }; meta = { license = lib.licenses.mit; }; }; @@ -935,8 +1044,8 @@ let mktplcRef = { name = "vscode-graphql"; publisher = "GraphQL"; - version = "0.3.13"; - sha256 = "sha256-JjEefVHQUYidUsr8Ce/dh7hLDm21WkyS+2RwsXHoY04="; + version = "0.3.50"; + sha256 = "1yf6v2vsgmq86ysb6vxzbg2gh6vz03fsz0d0rhpvpghayrjlk5az"; }; meta = { license = lib.licenses.mit; @@ -1072,10 +1181,14 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "8.2.0"; - sha256 = "1ai16aam4v5jzhxgms589q0l24kyk1a9in6z4i7g05b3sahyxab2"; + version = "8.23.0"; + sha256 = "sha256-IHLsAuTi+GBZViL2KozudebNY745RiOYNATzabQfnOY="; }; meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; + description = "LaTeX Workshop Extension"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop"; + homepage = "https://github.com/James-Yu/LaTeX-Workshop"; license = licenses.mit; }; }; @@ -1100,8 +1213,8 @@ let mktplcRef = { name = "nix-ide"; publisher = "jnoortheen"; - version = "0.1.18"; - sha256 = "sha256-dmmx/u+hRQfY/MCIaSdcVtbYnf5cLCDUwr75heQxcuw="; + version = "0.1.19"; + sha256 = "1ms96ij6z4bysdhqgdaxx2znvczyhzx57iifbqws50m1c3m7pkx7"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; @@ -1117,8 +1230,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.15"; - sha256 = "0a5w6qxvsdzcmgc0yfiagpmz25y90pmzgrxz9899na5qy3pjcbmz"; + version = "1.4.17"; + sha256 = "sha256-CDxh/YRyDGocxG4qOcyLXA0zHCg0YJ7XUu3OjFFjleI="; }; meta = with lib; { license = licenses.mit; @@ -1173,12 +1286,79 @@ let }; }; + kamadorueda.alejandra = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "alejandra"; + publisher = "kamadorueda"; + version = "1.0.0"; + sha256 = "sha256-COlEjKhm8tK5XfOjrpVUDQ7x3JaOLiYoZ4MdwTL8ktk="; + }; + nativeBuildInputs = [ jq moreutils ]; + postInstall = '' + cd "$out/$installPrefix" + + jq -e ' + .contributes.configuration.properties."alejandra.program".default = + "${alejandra}/bin/alejandra" | + .contributes.configurationDefaults."alejandra.program" = + "${alejandra}/bin/alejandra" + ' \ + < package.json \ + | sponge package.json + ''; + meta = with lib; { + description = "The Uncompromising Nix Code Formatter"; + homepage = "https://github.com/kamadorueda/alejandra"; + license = licenses.unlicense; + maintainers = with maintainers; [ kamadorueda ]; + }; + }; + + kddejong.vscode-cfn-lint = let + inherit (python3Packages) cfn-lint; + in buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-cfn-lint"; + publisher = "kddejong"; + version = "0.21.0"; + sha256 = "sha256-IueXiN+077tiecAsVCzgYksWYTs00mZv6XJVMtRJ/PQ="; + }; + + nativeBuildInputs = [ jq moreutils ]; + + buildInputs = [ cfn-lint ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."cfnLint.path".default = "${cfn-lint}/bin/cfn-lint"' package.json | sponge package.json + ''; + + meta = with lib; { + description = "CloudFormation Linter IDE integration, autocompletion, and documentation"; + homepage = "https://github.com/aws-cloudformation/cfn-lint-visual-studio-code"; + license = lib.licenses.asl20; + maintainers = with maintainers; [ wolfangaukang ]; + }; + }; + + kubukoz.nickel-syntax = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nickel-syntax"; + publisher = "kubukoz"; + version = "0.0.1"; + sha256 = "010zn58j9kdb2jpxmlfyyyais51pwn7v2c5cfi4051ayd02b9n3s"; + }; + meta = { + license = lib.licenses.asl20; + }; + }; + llvm-vs-code-extensions.vscode-clangd = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-clangd"; publisher = "llvm-vs-code-extensions"; - version = "0.1.13"; - sha256 = "/MpwbM+obcD3uqk8hnDrnbEK9Jot4fMe4sNzLt6mVGI="; + version = "0.1.15"; + sha256 = "0skasnc490wp0l5xzpdmwdzjr4qiy63kg2qi27060m5yqkq3h8xn"; }; meta = { license = lib.licenses.mit; @@ -1222,6 +1402,18 @@ let }; }; + marp-team.marp-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "marp-vscode"; + publisher = "marp-team"; + version = "1.5.0"; + sha256 = "0wqsj8rp58vl3nafkjvyw394h5j4jd7d24ra6hkvfpnlzrgv4yhs"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + mikestead.dotenv = buildVscodeMarketplaceExtension { mktplcRef = { name = "dotenv"; @@ -1238,8 +1430,8 @@ let mktplcRef = { name = "goto-next-previous-member"; publisher = "mishkinf"; - version = "0.0.5"; - sha256 = "0kgzap1k924i95al0a63hxcsv8skhaapgfpi9d7vvaxm0fc10l1i"; + version = "0.0.6"; + sha256 = "07rpnbkb51835gflf4fpr0v7fhj8hgbhsgcz2wpag8wdzdxc3025"; }; meta = { license = lib.licenses.mit; @@ -1274,8 +1466,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.19.0"; - sha256 = "sha256-buIAbsyKUvX3blO1AbCq/tJ1KAcqaFpciqQovmOZ5GE="; + version = "1.20.0"; + sha256 = "sha256-i3gYTP76YEDItG2oXR9pEXuGv0qmyf1Xv6HQvDBEOyg="; }; meta = { license = lib.licenses.mit; @@ -1302,6 +1494,39 @@ let ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { }; + ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "Theme-TomorrowKit"; + publisher = "ms-vscode"; + version = "0.1.4"; + sha256 = "sha256-qakwJWak+IrIeeVcMDWV/fLPx5M8LQGCyhVt4TS/Lmc="; + }; + meta = with lib; { + description = "Additional Tomorrow and Tomorrow Night themes for VS Code. Based on the TextMate themes."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.Theme-TomorrowKit"; + homepage = "https://github.com/microsoft/vscode-themes"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; + }; + }; + + ms-pyright.pyright = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pyright"; + publisher = "ms-pyright"; + version = "1.1.222"; + sha256 = "sha256-QMX/SawDEnG1xVrug8mvN7EvRrRDkJffcXBUFpQi1XE="; + }; + meta = with lib; { + description = "VS Code static type checking for Python"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-pyright.pyright"; + homepage = "https://github.com/Microsoft/pyright#readme"; + changelog = "https://marketplace.visualstudio.com/items/ms-pyright.pyright/changelog"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; + }; + }; + ms-python.python = callPackage ./python { extractNuGet = callPackage ./python/extract-nuget.nix { }; }; @@ -1332,6 +1557,18 @@ let }; }; + ms-vscode.anycode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "anycode"; + publisher = "ms-vscode"; + version = "0.0.57"; + sha256 = "sha256-XwL7I+vwZJ6zx5IDZdfOUbq6M9IH/gi7MBe92cG1kDs="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + mvllow.rose-pine = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "mvllow"; @@ -1393,8 +1630,8 @@ let mktplcRef = { name = "java"; publisher = "redhat"; - version = "1.2.0"; - sha256 = "sha256-YmR3FWhPZSU2gE6NIVoA1HZBzaYaTNYFXC/uNwbDEdQ="; + version = "1.4.0"; + sha256 = "sha256-9q3ilNukx3sQ6Fr1LhuQdjHHS251SDoHxC33w+qrfAI="; }; buildInputs = [ jdk ]; meta = { @@ -1407,8 +1644,8 @@ let mktplcRef = { name = "vscode-yaml"; publisher = "redhat"; - version = "1.3.0"; - sha256 = "sha256-Tz6bLcBUATn8cYIzGoLJwgaJZGbBVr1CISmJHz+iM60="; + version = "1.5.1"; + sha256 = "sha256-JXhmgBFZdKNjgX6K7U+M/T7HEmIOBQOzQEJ5957TUuM="; }; meta = { license = lib.licenses.mit; @@ -1448,13 +1685,13 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform"; homepage = "https://github.com/ocamllabs/vscode-ocaml-platform"; license = licenses.isc; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ratsclub ]; }; mktplcRef = { name = "ocaml-platform"; publisher = "ocamllabs"; - version = "1.5.1"; - sha256 = "0jkxpcrbr8xmwfl8jphmarjz2jk54hvmc24ww89d4bgx1awayqfh"; + version = "1.8.4"; + sha256 = "sha256-T1eYAuYMv4B7rdECxYzNfIpydjzCDjeo7gmb1uhr6VM="; }; }; @@ -1462,8 +1699,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.11.0"; - sha256 = "1l2s8j645riqjmj09i3v71s8ycin5vd6brdp35z472fnk6wyi1y6"; + version = "4.14.1"; + sha256 = "sha256-OHXi0EfeyKMeFiMU5yg0aDoWds4ED0lb+l6T12XZ3LQ="; }; meta = { license = lib.licenses.mit; @@ -1482,6 +1719,18 @@ let }; }; + richie5um2.snake-trail = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "snake-trail"; + publisher = "richie5um2"; + version = "0.6.0"; + sha256 = "0wkpq9f48hplrgabb0v1ij6fc4sb8h4a93dagw4biprhnnm3qx49"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + ritwickdey.liveserver = buildVscodeMarketplaceExtension { mktplcRef = { name = "liveserver"; @@ -1494,6 +1743,18 @@ let }; }; + roman.ayu-next = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "ayu-next"; + publisher = "roman"; + version = "1.2.9"; + sha256 = "sha256-rwZnqvHRmMquNq9PnU176vI4g8PtS6wSNvQaZ1BMa4I="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + rubbersheep.gi = buildVscodeMarketplaceExtension { mktplcRef = { name = "gi"; @@ -1534,8 +1795,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.12.0"; - sha256 = "13zwjnrmkrs3wxh8c9nz9zxxs3p6lkj41q30v4a1md5pscfa1s44"; + version = "1.12.18"; + sha256 = "104h3qfdn0y4138g3mdw1209qqh3mj3jsdsbzpnw2plk1cmr3nx5"; }; meta = { license = lib.licenses.asl20; @@ -1579,6 +1840,35 @@ let }; }; + silvenon.mdx = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "mdx"; + publisher = "silvenon"; + version = "0.1.0"; + sha256 = "1mzsqgv0zdlj886kh1yx1zr966yc8hqwmiqrb1532xbmgyy6adz3"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + + skellock.just = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "just"; + publisher = "skellock"; + version = "2.0.0"; + sha256 = "sha256-FOp/dcW0+07rADEpUMzx+SGYjhvE4IhcCOqUQ38yCN4="; + }; + meta = with lib; { + changelog = "https://github.com/skellock/vscode-just/blob/master/CHANGELOG.md"; + description = "Provides syntax and recipe launcher for Just scripts"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=skellock.just"; + homepage = "https://github.com/skellock/vscode-just"; + license = licenses.mit; + maintainers = with maintainers; [ maximsmol ]; + }; + }; + skyapps.fish-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "fish-vscode"; @@ -1636,8 +1926,8 @@ let mktplcRef = { publisher = "stkb"; name = "rewrap"; - version = "1.16.0"; - sha256 = "sha256-351zYmMupAv/8fQ+lOc0pYzy/wsE3JqTuxfKD+AdBAc="; + version = "1.16.1"; + sha256 = "sha256-OTPNbwoQmKd73g8IwLKMIbe6c7E2jKNkzwuBU/f8dmY="; }; meta = with lib; { changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md"; @@ -1653,8 +1943,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.1.4"; - sha256 = "sha256-V8ug/EtDczjiofuL7HhpN1B+qbedpnvIlXnwiXJzD/g="; + version = "2.1.7"; + sha256 = "sha256-C0jYDIDBK1JH8eFaFmCUilBXCbU5y2TRF3OZAw9ijoY="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -1682,8 +1972,8 @@ let mktplcRef = { name = "markdown-memo"; publisher = "svsool"; - version = "0.3.9"; - sha256 = "sha256-BsKFHR3wkSRHS8QOi63vLwGj3T2CPzvqXhgtEOq6gJM="; + version = "0.3.18"; + sha256 = "sha256-ypYqVH1ViJE7+mAJnxmpvUSmiImOo7rE7m+ijTEpmwg="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/svsool.markdown-memo/changelog"; @@ -1711,8 +2001,8 @@ let mktplcRef = { publisher = "takayama"; name = "vscode-qq"; - version = "1.4.0"; - sha256 = "sha256-DYjNWSKOrDYvdiV7G24uKz6w4ggeYUMkQIiOGZAbMSI="; + version = "1.4.2"; + sha256 = "sha256-koeiFXUFI/i8EGCRDTym62m7JER18J9MKZpbAozr0Ng="; }; meta = { license = lib.licenses.mpl20; @@ -1748,8 +2038,8 @@ let mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.14.4"; - sha256 = "05z314sw9nqym3qlj7dcwm0fz1hb23xppzqn3nr2wcj17hs8zz4m"; + version = "0.18.4"; + sha256 = "00cii58md6v028h0xfvbdjvg3r44451mi0lfmjwiwif5xcw3wnlx"; }; nativeBuildInputs = [ jq moreutils ]; postInstall = '' @@ -1863,11 +2153,12 @@ let mktplcRef = { name = "vscode-pitch-black-theme"; publisher = "ViktorQvarfordt"; - version = "1.2.4"; - sha256 = "sha256-HTXToZv0WWFjuQiofEJuaZNSDTmCUcZ0B3KOn+CVALw="; + version = "1.3.0"; + sha256 = "sha256-1JDm/cWNWwxa1gNsHIM/DIvqjXsO++hAf0mkjvKyi4g="; }; - meta = { - license = lib.licenses.mit; + meta = with lib; { + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; }; }; @@ -1987,8 +2278,8 @@ let mktplcRef = { name = "material-theme"; publisher = "zhuangtongfa"; - version = "3.9.12"; - sha256 = "017h9hxplf2rhmlhn3vag0wypcx6gxi7p9fgllj5jzwrl2wsjl0g"; + version = "3.13.17"; + sha256 = "100riqnvc2j315i1lvnwxmgga17s369xxvds5skgnk2yi2xnm2g9"; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/misc/vscode-extensions/language-packs.nix b/pkgs/applications/editors/vscode/extensions/language-packs.nix similarity index 100% rename from pkgs/misc/vscode-extensions/language-packs.nix rename to pkgs/applications/editors/vscode/extensions/language-packs.nix diff --git a/pkgs/misc/vscode-extensions/mktplcExtRefToFetchArgs.nix b/pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix similarity index 100% rename from pkgs/misc/vscode-extensions/mktplcExtRefToFetchArgs.nix rename to pkgs/applications/editors/vscode/extensions/mktplcExtRefToFetchArgs.nix diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix similarity index 84% rename from pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix index 393ea0f44502..d91cbccb8083 100644 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix @@ -38,7 +38,13 @@ let rtDepsBinSrcs."${bSrcName}__${stdenv.targetPlatform.system}"; omnisharp = rtDepBinSrcByName "OmniSharp"; - vsdbg = rtDepBinSrcByName "Debugger"; + vsdbgs = [ + (rtDepBinSrcByName "Debugger") + ] ++ lib.optionals (stdenv.isDarwin) [ + # Include the aarch64-darwin debugger binaries on x86_64-darwin. Even though OmniSharp will be + # running under Rosetta 2, debugging will fail to start if both sets of binaries are not present. + (rtDepsBinSrcs."Debugger__aarch64-darwin") + ]; razor = rtDepBinSrcByName "Razor"; in @@ -46,8 +52,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "csharp"; publisher = "ms-dotnettools"; - version = "1.23.15"; - sha256 = "0b74jr45zl7lzirjgj8s2lbf3viy9pbwlgjh055rcwmy77wcml1x"; + version = "1.23.16"; + sha256 = "sha256-fM4vcSMi2tEjIox9Twh2sRiFhXgAeRwAM9to3vtcSqI="; }; nativeBuildInputs = [ @@ -112,20 +118,28 @@ vscode-utils.buildVscodeMarketplaceExtension { chmod a+x "$omnisharp_dir/run" touch "$omnisharp_dir/install.Lock" + '' + builtins.concatStringsSep "\n" (map (vsdbg: '' declare vsdbg_dir="$PWD/${vsdbg.installPath}" unzip_to "${vsdbg.bin-src}" "$vsdbg_dir" chmod a+x "$vsdbg_dir/vsdbg-ui" chmod a+x "$vsdbg_dir/vsdbg" touch "$vsdbg_dir/install.complete" touch "$vsdbg_dir/install.Lock" - patchelf_common "$vsdbg_dir/vsdbg" - patchelf_common "$vsdbg_dir/vsdbg-ui" + '') vsdbgs) + '' declare razor_dir="$PWD/${razor.installPath}" unzip_to "${razor.bin-src}" "$razor_dir" chmod a+x "$razor_dir/rzls" touch "$razor_dir/install.Lock" + + '' + lib.optionalString stdenv.isLinux '' + patchelf_common "$vsdbg_dir/vsdbg" + patchelf_common "$vsdbg_dir/vsdbg-ui" patchelf_common "$razor_dir/rzls" + + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace $omnisharp_dir/etc/config \ + --replace "libmono-native-compat.dylib" "libmono-native.dylib" ''; meta = with lib; { @@ -133,6 +147,6 @@ vscode-utils.buildVscodeMarketplaceExtension { homepage = "https://github.com/OmniSharp/omnisharp-vscode"; license = licenses.mit; maintainers = [ maintainers.jraygauthier ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json new file mode 100644 index 000000000000..13678d1097e0 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json @@ -0,0 +1,94 @@ +{ + "OmniSharp__x86_64-darwin": { + "installPath": ".omnisharp/1.37.16", + "binaries": [ + "./mono.osx", + "./run" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/0ea1ea1eae48552a1992ed6df782353a/omnisharp-osx-1.37.16.zip", + "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-osx-1.37.16.zip" + ], + "sha256": "0hhgfx7zs1rljhn3n9c7lci7j15yp2448z3f1d3c47a95l1hmlip" + }, + "OmniSharp__x86_64-linux": { + "installPath": ".omnisharp/1.37.16", + "binaries": [ + "./mono.linux-x86_64", + "./run" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/9ae3ed99fc0c41c7139751dde6f2bc78/omnisharp-linux-x64-1.37.16.zip", + "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-linux-x64-1.37.16.zip" + ], + "sha256": "0a2basc6dw42fnjv9zz93ff0bsw2i3446gvcjx5mn5d8dasi483i" + }, + "Debugger__x86_64-darwin": { + "installPath": ".debugger/x86_64", + "binaries": [ + "./vsdbg-ui", + "./vsdbg" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/c1122f7141735472d9583c1124024c55/coreclr-debug-osx-x64.zip", + "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-osx-x64.zip" + ], + "sha256": "08z3k0h25gdsbmlxwayd94672hp2z7zmwdmd0nyr9j82izj3ci2m" + }, + "Debugger__aarch64-darwin": { + "installPath": ".debugger/arm64", + "binaries": [ + "./vsdbg-ui", + "./vsdbg" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/96a88189c7904a517f3bb59b2dba8bd1/coreclr-debug-osx-arm64.zip", + "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-osx-arm64.zip" + ], + "sha256": "113kz02ihvb4y5fj01wamqz2jsql2q7n7f55s9kzs9dsrmq5ffa0" + }, + "Debugger__aarch64-linux": { + "installPath": ".debugger", + "binaries": [ + "./vsdbg-ui", + "./vsdbg" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/7a723bfbda6d196c52084226b6835b36/coreclr-debug-linux-arm64.zip", + "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-arm64.zip" + ], + "sha256": "1d4a5q3f7qfk3jq2i4f6g50i9i4z8z7g8ss083y9n5c1yj3629kw" + }, + "Debugger__x86_64-linux": { + "installPath": ".debugger", + "binaries": [ + "./vsdbg-ui", + "./vsdbg" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/dd019b4c839f458596e26bfcfe6a3e7f/coreclr-debug-linux-x64.zip", + "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-x64.zip" + ], + "sha256": "0c5y0035sa07bl3m3iiqccqd92xjwpcfjrqhmi5xligk40q2i2gk" + }, + "Razor__x86_64-linux": { + "installPath": ".razor", + "binaries": [ + "./rzls" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/b8678010-2cd7-4201-a5e7-ba57920607d5/b846e9c7d7afdba54a72fae1dcb6c42c/razorlanguageserver-linux-x64-6.0.0-preview.5.21358.6.zip" + ], + "sha256": "0gb36nlb7fgcv03a0awna1qyrsky6ys5gkpsmvxc5j35f1yq337b" + }, + "Razor__x86_64-darwin": { + "installPath": ".razor", + "binaries": [ + "./rzls" + ], + "urls": [ + "https://download.visualstudio.microsoft.com/download/pr/b8678010-2cd7-4201-a5e7-ba57920607d5/ad846449769eb2ae810d0236823a6aaa/razorlanguageserver-osx-x64-6.0.0-preview.5.21358.6.zip" + ], + "sha256": "0iqinpwwlqwajdq4i1qbb9hfpfmgy17av95bpw02ad2f9fnyh572" + } +} diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs similarity index 93% rename from pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs rename to pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs index 83230915d0b1..8c43231b1a7f 100755 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/update-bin-srcs +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs @@ -10,7 +10,7 @@ scriptDir=$(cd "$(dirname "$0")"; pwd) declare extPublisher="ms-dotnettools" declare extName="csharp" -declare defaultExtVersion="1.23.15" +declare defaultExtVersion="1.23.16" declare extVersion="${1:-$defaultExtVersion}" formatExtRuntimeDeps \ diff --git a/pkgs/misc/vscode-extensions/ms-toolsai-jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/ms-toolsai-jupyter/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix rename to pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/noop-syslog.c b/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/noop-syslog.c similarity index 100% rename from pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/noop-syslog.c rename to pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/noop-syslog.c diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/applications/editors/vscode/extensions/python/default.nix similarity index 91% rename from pkgs/misc/vscode-extensions/python/default.nix rename to pkgs/applications/editors/vscode/extensions/python/default.nix index beaa8d557a75..8d6834dceebf 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/python/default.nix @@ -59,26 +59,28 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2021.11.1422169775"; + version = "2022.0.1814523869"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; - sha256 = "sha256-Y8Wbpuieca/edIWqgq+lGSUMABOGvO/GuujGlEGmoKs="; + sha256 = "sha256-JDaimcOUDo9GuFA3mhbbGLwqZE9ejk8pWYc+9PrRhVk="; }; buildInputs = [ icu curl openssl + ] ++ lib.optionals stdenv.isLinux [ lttng-ust-2-10 musl ]; nativeBuildInputs = [ - autoPatchelfHook python3.pkgs.wrapPython + ] ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook ]; pythonPath = with python3.pkgs; [ @@ -101,6 +103,8 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { cd pythonFiles/lib/python/debugpy/_vendored/pydevd/pydevd_attach_to_process declare kept_aside="${{ "x86_64-linux" = "attach_linux_amd64.so"; + "aarch64-darwin" = "attach_x86_64.dylib"; + "x86_64-darwin" = "attach_x86_64.dylib"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")}" mv "$kept_aside" "$kept_aside.hidden" rm *.so *.dylib *.dll *.exe *.pdb @@ -118,7 +122,7 @@ in vscode-utils.buildVscodeMarketplaceExtension rec { meta = with lib; { license = licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.jraygauthier ]; + platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; + maintainers = with maintainers; [ jraygauthier jfchevrette ]; }; } diff --git a/pkgs/misc/vscode-extensions/python/extract-nuget.nix b/pkgs/applications/editors/vscode/extensions/python/extract-nuget.nix similarity index 100% rename from pkgs/misc/vscode-extensions/python/extract-nuget.nix rename to pkgs/applications/editors/vscode/extensions/python/extract-nuget.nix diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/remote-ssh/default.nix rename to pkgs/applications/editors/vscode/extensions/remote-ssh/default.nix diff --git a/pkgs/misc/vscode-extensions/rescript/default.nix b/pkgs/applications/editors/vscode/extensions/rescript/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/rescript/default.nix rename to pkgs/applications/editors/vscode/extensions/rescript/default.nix diff --git a/pkgs/misc/vscode-extensions/rescript/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix similarity index 100% rename from pkgs/misc/vscode-extensions/rescript/rescript-editor-analysis.nix rename to pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json b/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json new file mode 100644 index 000000000000..f12db30a6a3d --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/rust-analyzer/build-deps/package.json @@ -0,0 +1,19 @@ +{ + "name": "rust-analyzer", + "version": "0.2.975", + "dependencies": { + "vscode-languageclient": "8.0.0-next.8", + "d3": "^7.3.0", + "d3-graphviz": "^4.0.0", + "@types/node": "~14.17.5", + "@types/vscode": "~1.63.0", + "@typescript-eslint/eslint-plugin": "^5.10.0", + "@typescript-eslint/parser": "^5.10.0", + "@vscode/test-electron": "^2.1.1", + "eslint": "^8.7.0", + "tslib": "^2.3.0", + "typescript": "^4.5.5", + "typescript-formatter": "^7.2.2", + "vsce": "^2.6.7" + } +} diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix similarity index 91% rename from pkgs/misc/vscode-extensions/rust-analyzer/default.nix rename to pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix index fa08acb84c60..c11add5021ca 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-analyzer/default.nix @@ -20,16 +20,16 @@ let # Use the plugin version as in vscode marketplace, updated by update script. inherit (vsix) version; - releaseTag = "2021-11-29"; + releaseTag = "2022-03-07"; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = releaseTag; - sha256 = "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw="; + sha256 = "sha256-/qKh4utesAjlyG8A3hEmSx+HBgh48Uje6ZRtUGz5f0g="; }; - build-deps = nodePackages."rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps"; + build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps"; # FIXME: Making a new derivation to link `node_modules` and run `npm run package` # will cause a build failure. vsix = build-deps.override { diff --git a/pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh b/pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh new file mode 100755 index 000000000000..0c06f903dfb4 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/rust-analyzer/update.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq libarchive +#shellcheck shell=bash +set -euo pipefail +cd "$(dirname "$0")" +nixpkgs=../../../../../../ +node_packages="$nixpkgs/pkgs/development/node-packages" +owner=rust-analyzer +repo=rust-analyzer +ver=$( + curl -s "https://api.github.com/repos/$owner/$repo/releases" | + jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output +) +node_src="$(nix-build "$nixpkgs" -A rust-analyzer.src --no-out-link)/editors/code" + +# Check vscode compatibility +req_vscode_ver="$(jq '.engines.vscode' "$node_src/package.json" --raw-output)" +req_vscode_ver="${req_vscode_ver#^}" +cur_vscode_ver="$(nix-instantiate --eval --strict "$nixpkgs" -A vscode.version | tr -d '"')" +if [[ "$(nix-instantiate --eval --strict -E "(builtins.compareVersions \"$req_vscode_ver\" \"$cur_vscode_ver\")")" -gt 0 ]]; then + echo "vscode $cur_vscode_ver is incompatible with the extension requiring ^$req_vscode_ver" + exit 1 +fi + +extension_ver=$(curl "https://github.com/rust-analyzer/rust-analyzer/releases/download/$ver/rust-analyzer-linux-x64.vsix" -L | + bsdtar -xf - --to-stdout extension/package.json | # Use bsdtar to extract vsix(zip). + jq --raw-output '.version') +echo "Extension version: $extension_ver" + +# We need devDependencies to build vsix. +# `esbuild` is a binary package an is already in nixpkgs so we omit it here. +jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies | del(.esbuild)) }' "$node_src/package.json" \ + --arg ver "$extension_ver" \ + >"build-deps/package.json.new" + +old_deps="$(jq '.dependencies' build-deps/package.json)" +new_deps="$(jq '.dependencies' build-deps/package.json.new)" +if [[ "$old_deps" == "$new_deps" ]]; then + echo "package.json dependencies not changed, do simple version change" + + sed -E '/^ "rust-analyzer-build-deps/,+3 s/version = ".*"/version = "'"$extension_ver"'"/' \ + --in-place "$node_packages"/node-packages.nix + mv build-deps/package.json{.new,} +else + echo "package.json dependencies changed, updating nodePackages" + mv build-deps/package.json{.new,} + + ./"$node_packages"/generate.sh +fi diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/applications/editors/vscode/extensions/terraform/default.nix similarity index 100% rename from pkgs/misc/vscode-extensions/terraform/default.nix rename to pkgs/applications/editors/vscode/extensions/terraform/default.nix diff --git a/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch similarity index 100% rename from pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch rename to pkgs/applications/editors/vscode/extensions/terraform/fix-terraform-ls.patch diff --git a/pkgs/misc/vscode-extensions/updateSettings.nix b/pkgs/applications/editors/vscode/extensions/updateSettings.nix similarity index 100% rename from pkgs/misc/vscode-extensions/updateSettings.nix rename to pkgs/applications/editors/vscode/extensions/updateSettings.nix diff --git a/pkgs/misc/vscode-extensions/updateSettingsTest.nix b/pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix similarity index 100% rename from pkgs/misc/vscode-extensions/updateSettingsTest.nix rename to pkgs/applications/editors/vscode/extensions/updateSettingsTest.nix diff --git a/pkgs/misc/vscode-extensions/update_installed_exts.sh b/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh similarity index 93% rename from pkgs/misc/vscode-extensions/update_installed_exts.sh rename to pkgs/applications/editors/vscode/extensions/update_installed_exts.sh index 5af747605f59..6fff7454493a 100755 --- a/pkgs/misc/vscode-extensions/update_installed_exts.sh +++ b/pkgs/applications/editors/vscode/extensions/update_installed_exts.sh @@ -4,7 +4,7 @@ set -eu -o pipefail # can be added to your configuration with the following command and snippet: -# $ ./pkgs/misc/vscode-extensions/update_installed_exts.sh > extensions.nix +# $ ./pkgs/applications/editors/vscode/extensions/update_installed_exts.sh > extensions.nix # # packages = with pkgs; # (vscode-with-extensions.override { @@ -40,7 +40,7 @@ function get_vsixpkg() { URL="https://$1.gallery.vsassets.io/_apis/public/gallery/publisher/$1/extension/$2/latest/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage" # Quietly but delicately curl down the file, blowing up at the first sign of trouble. - curl --silent --show-error --fail -X GET -o "$EXTTMP/$N.zip" "$URL" + curl --silent --show-error --retry 3 --fail -X GET -o "$EXTTMP/$N.zip" "$URL" # Unpack the file we need to stdout then pull out the version VER=$(jq -r '.version' <(unzip -qc "$EXTTMP/$N.zip" "extension/package.json")) # Calculate the SHA diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/package.json similarity index 100% rename from pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json rename to pkgs/applications/editors/vscode/extensions/vscode-lldb/build-deps/package.json diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch b/pkgs/applications/editors/vscode/extensions/vscode-lldb/cmake-build-extension-only.patch similarity index 100% rename from pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch rename to pkgs/applications/editors/vscode/extensions/vscode-lldb/cmake-build-extension-only.patch diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix similarity index 88% rename from pkgs/misc/vscode-extensions/vscode-lldb/default.nix rename to pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix index 2bc9321353d2..c9d4deebdfd8 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-lldb/default.nix @@ -5,7 +5,7 @@ assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; pname = "vscode-lldb"; - version = "1.6.8"; + version = "1.6.10"; vscodeExtUniqueId = "${publisher}.${pname}"; @@ -13,7 +13,7 @@ let owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "sha256-/2iyWJfNjvk5n7KwWIu2gc24/21KWibU6IAPN/tJ8Q4="; + sha256 = "sha256-4PM/818UFHRZekfbdhS/Rz0Pu6HOjJEldi4YuBWECnI="; }; lldb = callPackage ./lldb.nix {}; @@ -25,7 +25,7 @@ let # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; - cargoSha256 = "sha256-rG+Qw8ac9cCgCjfLFXLlohLk+zV5s1OaqzU0/nXiqgU="; + cargoSha256 = "sha256-Ch1X2vN+p7oCqSs/GIu5IzG+pcSKmQ+VwP2T8ycRhos="; nativeBuildInputs = [ makeWrapper ]; @@ -42,7 +42,7 @@ let doCheck = false; }; - nodeDeps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps"; + nodeDeps = nodePackages."vscode-lldb-build-deps-../../applications/editors/vscode/extensions/vscode-lldb/build-deps"; in stdenv.mkDerivation { pname = "vscode-extension-${publisher}-${pname}"; @@ -98,7 +98,7 @@ in stdenv.mkDerivation { description = "A native debugger extension for VSCode based on LLDB"; homepage = "https://github.com/vadimcn/vscode-lldb"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ oxalica ]; + maintainers = with maintainers; [ nigelgbanks ]; platforms = platforms.all; }; } diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix b/pkgs/applications/editors/vscode/extensions/vscode-lldb/lldb.nix similarity index 100% rename from pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix rename to pkgs/applications/editors/vscode/extensions/vscode-lldb/lldb.nix diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch b/pkgs/applications/editors/vscode/extensions/vscode-lldb/reset-cargo-config.patch similarity index 100% rename from pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch rename to pkgs/applications/editors/vscode/extensions/vscode-lldb/reset-cargo-config.patch diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh b/pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh similarity index 90% rename from pkgs/misc/vscode-extensions/vscode-lldb/update.sh rename to pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh index 2fe0cc5cf297..0dc38c6fdb71 100755 --- a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh +++ b/pkgs/applications/editors/vscode/extensions/vscode-lldb/update.sh @@ -1,5 +1,6 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p jq nix-prefetch +#! /usr/bin/env nix-shell +#! nix-shell ../../update-shell.nix -i bash + set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" if [[ $# -ne 1 ]]; then @@ -12,7 +13,8 @@ FIXME: This script doesn't update patched lldb. Please manually check branches of https://github.com/vadimcn/llvm-project and update lldb with correct version of LLVM. " -nixpkgs=../../../.. +# Ideally, nixpkgs points to default.nix file of Nixpkgs official tree +nixpkgs=../../../../../.. nixFile=./default.nix owner=vadimcn repo=vscode-lldb diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix similarity index 100% rename from pkgs/misc/vscode-extensions/vscode-utils.nix rename to pkgs/applications/editors/vscode/extensions/vscode-utils.nix diff --git a/pkgs/misc/vscode-extensions/vscodeEnv.nix b/pkgs/applications/editors/vscode/extensions/vscodeEnv.nix similarity index 100% rename from pkgs/misc/vscode-extensions/vscodeEnv.nix rename to pkgs/applications/editors/vscode/extensions/vscodeEnv.nix diff --git a/pkgs/misc/vscode-extensions/vscodeEnvTest.nix b/pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix similarity index 100% rename from pkgs/misc/vscode-extensions/vscodeEnvTest.nix rename to pkgs/applications/editors/vscode/extensions/vscodeEnvTest.nix diff --git a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix b/pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix similarity index 100% rename from pkgs/misc/vscode-extensions/vscodeExts2nix.nix rename to pkgs/applications/editors/vscode/extensions/vscodeExts2nix.nix diff --git a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix b/pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix similarity index 100% rename from pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix rename to pkgs/applications/editors/vscode/extensions/vscodeWithConfiguration.nix diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/wakatime/default.nix similarity index 81% rename from pkgs/misc/vscode-extensions/wakatime/default.nix rename to pkgs/applications/editors/vscode/extensions/wakatime/default.nix index 9832b16f7473..554b2bddb6ca 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/wakatime/default.nix @@ -8,8 +8,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "17.1.0"; - sha256 = "177q8angrn702pxrrpk1fzggzlnnaymq32v55qpjgjb74rhg4dzw"; + version = "18.0.5"; + sha256 = "sha256-vWqGxMbxKqd4UgKK0sOKadMTDf6Y3TQxfWsc93MHjFs="; }; meta = with lib; { diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index f2c262ece95d..d704497b4f0c 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,6 +1,6 @@ { stdenv, lib, makeDesktopItem , unzip, libsecret, libXScrnSaver, libxshmfence, wrapGAppsHook -, gtk2, atomEnv, at-spi2-atk, autoPatchelfHook +, atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu, glib, buildFHSUserEnvBubblewrap , writeShellScriptBin @@ -37,19 +37,16 @@ let genericName = "Text Editor"; exec = "${executableName} %F"; icon = "code"; - startupNotify = "true"; - categories = "Utility;TextEditor;Development;IDE;"; - mimeType = "text/plain;inode/directory;"; - extraEntries = '' - StartupWMClass=${shortName} - Actions=new-empty-window; - Keywords=vscode; - - [Desktop Action new-empty-window] - Name=New Empty Window - Exec=${executableName} --new-window %F - Icon=code - ''; + 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 = "code"; + }; }; urlHandlerDesktopItem = makeDesktopItem { @@ -59,17 +56,15 @@ let genericName = "Text Editor"; exec = executableName + " --open-url %U"; icon = "code"; - startupNotify = "true"; - categories = "Utility;TextEditor;Development;IDE;"; - mimeType = "x-scheme-handler/vscode;"; - extraEntries = '' - NoDisplay=true - Keywords=vscode; - ''; + startupNotify = true; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "x-scheme-handler/vscode" ]; + keywords = [ "vscode" ]; + noDisplay = true; }; buildInputs = [ libsecret libXScrnSaver libxshmfence ] - ++ lib.optionals (!stdenv.isDarwin) ([ gtk2 at-spi2-atk ] ++ atomEnv.packages); + ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk ] ++ atomEnv.packages); runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib libdbusmenu ]; @@ -77,6 +72,7 @@ let dontBuild = true; dontConfigure = true; + noDumpEnvVars = true; installPhase = '' runHook preInstall @@ -108,6 +104,7 @@ let 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:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ) ''; @@ -124,7 +121,7 @@ let rm -rf "$packed" # this fixes bundled ripgrep - chmod +x resources/app/node_modules/vscode-ripgrep/bin/rg + chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg ''; inherit meta; @@ -160,12 +157,9 @@ let krb5 ]) ++ additionalPkgs pkgs; - # restore desktop item icons + # symlink shared assets, including icons and desktop entries extraInstallCommands = '' - mkdir -p "$out/share/applications" - for item in ${unwrapped}/share/applications/*.desktop; do - ln -s "$item" "$out/share/applications/" - done + ln -s "${unwrapped}/share" "$out/" ''; runScript = "${unwrapped}/bin/${executableName}"; diff --git a/pkgs/applications/editors/vscode/update-shell.nix b/pkgs/applications/editors/vscode/update-shell.nix new file mode 100644 index 000000000000..aa9488c217f4 --- /dev/null +++ b/pkgs/applications/editors/vscode/update-shell.nix @@ -0,0 +1,18 @@ +{ pkgs ? import ../../../.. { } }: + +# Ideally, pkgs points to default.nix file of Nixpkgs official tree +with pkgs; + +mkShell { + packages = [ + bash + curl + gawk + gnugrep + gnused + jq + nix + nix-prefetch + nix-prefetch-scripts + ]; +} diff --git a/pkgs/applications/editors/vscode/update-vscode.sh b/pkgs/applications/editors/vscode/update-vscode.sh index 709fbe1c7517..67ec7a21b346 100755 --- a/pkgs/applications/editors/vscode/update-vscode.sh +++ b/pkgs/applications/editors/vscode/update-vscode.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq gnused +#! /usr/bin/env nix-shell +#! nix-shell update-shell.nix -i bash # Update script for the vscode versions and hashes. # Usually doesn't need to be called by hand, diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index 79c6b497ecc6..377068c08214 100755 --- a/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnugrep gnused gawk +#! /usr/bin/env nix-shell +#! nix-shell update-shell.nix -i bash # Update script for the vscode versions and hashes. # Usually doesn't need to be called by hand, diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 8990ef75a850..370647de1fcf 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1bglf1a8b5whv9pk811fdnx0mvfcfasjxbik73p67msp4yy68lm4"; - x86_64-darwin = "0cv6i2i69xf6hn0vrfl3gk3ky7r5yvp4k7zx2k695gzck5s9bx8y"; - aarch64-linux = "1jggspj5q4vfgs4xdvx5p8qsfm98wf17jmxqzs68lmlhmhadyh22"; - aarch64-darwin = "0c1nz7a54xq20a2a4fqcmlhry6gqwz5f1ys7dx0x5whaxbybh8my"; - armv7l-linux = "0p2rdxbqpzk79ra7br7wfs8kr0hnh3l022mqb7y16gc426xjlfn4"; + x86_64-linux = "0x8vc6gj83mn767wi285k0hxhlh5gh1lcvq63na89vglja4ipna4"; + x86_64-darwin = "1x47xfq0fgd10wq6aa8gq55aqrl1ir1f6v1mm6324yny16pf20k2"; + aarch64-linux = "1ibg2qvpnwfwwzgby2xva9xz138b13x9q8vf1xf6plazv0arla1l"; + aarch64-darwin = "100834mqix7b46frlqf0jz4qs673lavxm8sizfjm7c9y0xxy4ld3"; + armv7l-linux = "100yfkzvnjccp1g3p353jr2vicvkjc0skiwmmzgad6i8j1m9js62"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.63.2"; + version = "1.65.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 0ca39a728424..a91227d9db40 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0pczrbifjgm905371i8c6bk90ka291cmny6hr1nzfix7bn5psjx0"; - x86_64-darwin = "12g2jlrhng3i56a4v9jf7nrj045jivnfdx4dhka1fiv60nn4gc46"; - aarch64-linux = "1bhhz4yvmk3zqljy3b77hlsxbwm2l675pslhwr44p6fb4hmn8fai"; - armv7l-linux = "15nbskq92b85zdyg7pgagi9mqhnbyisfkipqb3brc2rvmyxpzclb"; + x86_64-linux = "1sh2f7hwhilwmlgy11kl0s2n3phpcir15wyl2fkyhsr2kdj4jz9r"; + x86_64-darwin = "1s04d91f08982wi8hb4dw0j57d6zqrdgns16ihrgsvahrzksgq4b"; + aarch64-linux = "1a97lk1qz2lz0lk5lpja32zy07iwdbskp6baf429iz7fz232rshm"; + armv7l-linux = "0vjqxqcr7fq3ncx1nl6ny7qcqm4vlsn33c074hhcg5292blg2a0p"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.63.2"; + version = "1.65.2"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index b2539e7dac5d..7e36aeccdec7 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.0.2"; + version = "3.2.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-VIudVgENibOz8RK0oK80U74wy592q3vKEnl3zuS7oSI="; + sha256 = "sha256-PW7y3+Sa9FH5r5xvziysvxM08RJCPvnLs3wsm5IqToQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/xxe-pe/default.nix b/pkgs/applications/editors/xxe-pe/default.nix index e7cfe6284e35..8734f4d31c82 100644 --- a/pkgs/applications/editors/xxe-pe/default.nix +++ b/pkgs/applications/editors/xxe-pe/default.nix @@ -19,7 +19,7 @@ let icon = "xxe"; desktopName = "xxe"; genericName = "XML Editor"; - categories = "Development;IDE;TextEditor;Java"; + categories = [ "Development" "IDE" "TextEditor" "Java" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index 4fd6ca0ad864..d00be198c8ff 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1303"; + version = "1400"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "BWy/icQs8hVtNeM/mCi6LOah1UG0elU/DgCmfaIPD64="; + sha256 = "sha256-qF+fMFHfY1fdWPAFEoCxcKHB++sFNwOaHeaMv+6gakg="; }; installPhase = '' diff --git a/pkgs/misc/emulators/ares/default.nix b/pkgs/applications/emulators/ares/default.nix similarity index 100% rename from pkgs/misc/emulators/ares/default.nix rename to pkgs/applications/emulators/ares/default.nix diff --git a/pkgs/misc/emulators/ares/fix-ruby.patch b/pkgs/applications/emulators/ares/fix-ruby.patch similarity index 100% rename from pkgs/misc/emulators/ares/fix-ruby.patch rename to pkgs/applications/emulators/ares/fix-ruby.patch diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/applications/emulators/atari++/default.nix similarity index 100% rename from pkgs/misc/emulators/atari++/default.nix rename to pkgs/applications/emulators/atari++/default.nix diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/applications/emulators/atari800/default.nix similarity index 100% rename from pkgs/misc/emulators/atari800/default.nix rename to pkgs/applications/emulators/atari800/default.nix diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/applications/emulators/attract-mode/default.nix similarity index 89% rename from pkgs/misc/emulators/attract-mode/default.nix rename to pkgs/applications/emulators/attract-mode/default.nix index 7a3f61fd8dc2..4f560e64a1ab 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/applications/emulators/attract-mode/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "attract-mode"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "mickelson"; repo = "attract"; rev = "v${version}"; - sha256 = "16p369j0hanm0l2fiy6h9d9pn0f3qblcy9l39all6h7rfxnhp9ii"; + sha256 = "sha256-gKxUU2y6Gtm5a/tXYw/fsaTBrriNh5vouPGICs3Ph3c="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/emulators/bochs/default.nix similarity index 100% rename from pkgs/applications/virtualization/bochs/default.nix rename to pkgs/applications/emulators/bochs/default.nix diff --git a/pkgs/misc/emulators/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes-hd/default.nix similarity index 100% rename from pkgs/misc/emulators/bsnes-hd/default.nix rename to pkgs/applications/emulators/bsnes-hd/default.nix diff --git a/pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch b/pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch similarity index 100% rename from pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch rename to pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch diff --git a/pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch b/pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch similarity index 100% rename from pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch rename to pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/applications/emulators/caprice32/default.nix similarity index 100% rename from pkgs/misc/emulators/caprice32/default.nix rename to pkgs/applications/emulators/caprice32/default.nix diff --git a/pkgs/misc/emulators/caprice32/string.patch b/pkgs/applications/emulators/caprice32/string.patch similarity index 100% rename from pkgs/misc/emulators/caprice32/string.patch rename to pkgs/applications/emulators/caprice32/string.patch diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/applications/emulators/ccemux/default.nix similarity index 98% rename from pkgs/misc/emulators/ccemux/default.nix rename to pkgs/applications/emulators/ccemux/default.nix index 11f24d59e5c3..8b7b1c32628a 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/applications/emulators/ccemux/default.nix @@ -29,7 +29,7 @@ let comment = "A modular ComputerCraft emulator"; desktopName = "CCEmuX"; genericName = "ComputerCraft Emulator"; - categories = "Emulator;"; + categories = [ "Emulator" ]; }; in diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/applications/emulators/cdemu/analyzer.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/analyzer.nix rename to pkgs/applications/emulators/cdemu/analyzer.nix diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/applications/emulators/cdemu/base.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/base.nix rename to pkgs/applications/emulators/cdemu/base.nix diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/applications/emulators/cdemu/client.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/client.nix rename to pkgs/applications/emulators/cdemu/client.nix diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/daemon.nix rename to pkgs/applications/emulators/cdemu/daemon.nix diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/applications/emulators/cdemu/gui.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/gui.nix rename to pkgs/applications/emulators/cdemu/gui.nix diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/libmirage.nix rename to pkgs/applications/emulators/cdemu/libmirage.nix diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix similarity index 81% rename from pkgs/misc/emulators/cdemu/vhba.nix rename to pkgs/applications/emulators/cdemu/vhba.nix index aeadcf5c1c1d..40792c81ac1c 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/applications/emulators/cdemu/vhba.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-csWowcRSgF5M74yv787MLSXOGXrkxnODCCgC5a3Nd7Y="; }; - makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; + makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; nativeBuildInputs = kernel.moduleBuildDependencies; meta = with lib; { diff --git a/pkgs/misc/emulators/cen64/default.nix b/pkgs/applications/emulators/cen64/default.nix similarity index 100% rename from pkgs/misc/emulators/cen64/default.nix rename to pkgs/applications/emulators/cen64/default.nix diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/applications/emulators/citra/default.nix similarity index 100% rename from pkgs/misc/emulators/citra/default.nix rename to pkgs/applications/emulators/citra/default.nix diff --git a/pkgs/applications/emulators/collapseos-cvm/default.nix b/pkgs/applications/emulators/collapseos-cvm/default.nix new file mode 100644 index 000000000000..798d58467af6 --- /dev/null +++ b/pkgs/applications/emulators/collapseos-cvm/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + pname = "collapseos-cvm"; + version = "20220316"; + src = fetchurl { + url = "http://collapseos.org/files/collapseos-${version}.tar.gz"; + hash = "sha256-8bt6wj93T82K9fqtuC/mctkMCzfvW0taxv6QAKeJb5g="; + }; + buildInputs = [ ncurses ]; + sourceRoot = "cvm"; + postPatch = '' + substituteInPlace common.mk \ + --replace "-lcurses" "-lncurses" + ''; + installPhase = '' + runHook preInstall; + find . -type f -executable -exec install -Dt $out/bin {} \; + runHook postInstall; + ''; + meta = { + description = "Virtual machine for Collapse OS (Forth operating system)"; + changelog = "http://collapseos.org/files/CHANGES.txt"; + downloadPage = "http://collapseos.org/files/"; + homepage = "http://collapseos.org/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ehmry ]; + mainProgram = "cos-serial"; + }; +} diff --git a/pkgs/misc/emulators/commanderx16/emulator.nix b/pkgs/applications/emulators/commanderx16/emulator.nix similarity index 100% rename from pkgs/misc/emulators/commanderx16/emulator.nix rename to pkgs/applications/emulators/commanderx16/emulator.nix diff --git a/pkgs/misc/emulators/commanderx16/rom.nix b/pkgs/applications/emulators/commanderx16/rom.nix similarity index 100% rename from pkgs/misc/emulators/commanderx16/rom.nix rename to pkgs/applications/emulators/commanderx16/rom.nix diff --git a/pkgs/misc/emulators/commanderx16/run.nix b/pkgs/applications/emulators/commanderx16/run.nix similarity index 100% rename from pkgs/misc/emulators/commanderx16/run.nix rename to pkgs/applications/emulators/commanderx16/run.nix diff --git a/pkgs/misc/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix similarity index 100% rename from pkgs/misc/emulators/craftos-pc/default.nix rename to pkgs/applications/emulators/craftos-pc/default.nix diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/applications/emulators/darcnes/default.nix similarity index 100% rename from pkgs/misc/emulators/darcnes/default.nix rename to pkgs/applications/emulators/darcnes/default.nix diff --git a/pkgs/misc/emulators/darcnes/label.patch b/pkgs/applications/emulators/darcnes/label.patch similarity index 100% rename from pkgs/misc/emulators/darcnes/label.patch rename to pkgs/applications/emulators/darcnes/label.patch diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/applications/emulators/desmume/default.nix similarity index 100% rename from pkgs/misc/emulators/desmume/default.nix rename to pkgs/applications/emulators/desmume/default.nix diff --git a/pkgs/misc/emulators/dgen-sdl/default.nix b/pkgs/applications/emulators/dgen-sdl/default.nix similarity index 100% rename from pkgs/misc/emulators/dgen-sdl/default.nix rename to pkgs/applications/emulators/dgen-sdl/default.nix diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/applications/emulators/dlx/default.nix similarity index 100% rename from pkgs/misc/emulators/dlx/default.nix rename to pkgs/applications/emulators/dlx/default.nix diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix similarity index 100% rename from pkgs/misc/emulators/dolphin-emu/default.nix rename to pkgs/applications/emulators/dolphin-emu/default.nix diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix similarity index 93% rename from pkgs/misc/emulators/dolphin-emu/master.nix rename to pkgs/applications/emulators/dolphin-emu/master.nix index 1afa97611719..be3e7f555f8f 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-15445"; + version = "5.0-16101"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "db02b50d2ecdfbbc21e19aadc57253c353069f77"; - sha256 = "l2vbTZOcjfyZjKOI3n5ig2f7cDYR22GcqKS479LMtP8="; + rev = "8ecfa537a242de74d2e372e30d9d79b14584b2fb"; + sha256 = "3jLGVzTDzEtHWvIb9DFTbJiA9dE9Pm14vYER998Zln0="; fetchSubmodules = true; }; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { homepage = "https://dolphin-emu.org"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ MP2E ashkitten ]; + maintainers = with maintainers; [ MP2E ashkitten xfix ]; branch = "master"; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. diff --git a/pkgs/misc/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix similarity index 100% rename from pkgs/misc/emulators/dolphin-emu/primehack.nix rename to pkgs/applications/emulators/dolphin-emu/primehack.nix diff --git a/pkgs/applications/emulators/dosbox-staging/default.nix b/pkgs/applications/emulators/dosbox-staging/default.nix new file mode 100644 index 000000000000..c1820646dc62 --- /dev/null +++ b/pkgs/applications/emulators/dosbox-staging/default.nix @@ -0,0 +1,112 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, SDL2_net +, alsa-lib +, copyDesktopItems +, fluidsynth +, gtest +, libGL +, libGLU +, libogg +, libpng +, libslirp +, makeDesktopItem +, makeWrapper +, meson +, libmt32emu +, ninja +, opusfile +, pkg-config +, libpulseaudio +, glib +, libjack2 +, libsndfile +}: + +stdenv.mkDerivation rec { + pname = "dosbox-staging"; + version = "0.78.1"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-gozFZcJorZtbEK0joksig6qWmAMy03hmBHiyJMONfpk="; + }; + + nativeBuildInputs = [ + copyDesktopItems + gtest + makeWrapper + meson + ninja + pkg-config + ]; + + buildInputs = [ + SDL2 + SDL2_net + alsa-lib + fluidsynth + glib + libGL + libGLU + libjack2 + libmt32emu + libogg + libpng + libpulseaudio + libslirp + libsndfile + opusfile + ]; + + NIX_CFLAGS_COMPILE = [ + "-I${SDL2_net}/include/SDL2" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "dosbox-staging"; + exec = "dosbox-staging"; + icon = "dosbox-staging"; + comment = "x86 dos emulator enhanced"; + desktopName = "DosBox-Staging"; + genericName = "DOS emulator"; + categories = [ "Emulator" "Game" ]; + }) + ]; + + postFixup = '' + # Rename binary, add a wrapper, and copy manual to avoid conflict with + # original dosbox. Doing it this way allows us to work with frontends and + # launchers that expect the binary to be named dosbox, but get out of the + # way of vanilla dosbox if the user desires to install that as well. + mv $out/bin/dosbox $out/bin/${pname} + makeWrapper $out/bin/dosbox-staging $out/bin/dosbox + + # Create a symlink to dosbox manual instead of merely copying it + pushd $out/share/man/man1/ + mv dosbox.1.gz ${pname}.1.gz + ln -s ${pname}.1.gz dosbox.1.gz + popd + ''; + + meta = with lib; { + homepage = "https://dosbox-staging.github.io/"; + description = "A modernized DOS emulator"; + longDescription = '' + DOSBox Staging is an attempt to revitalize DOSBox's development + process. It's not a rewrite, but a continuation and improvement on the + existing DOSBox codebase while leveraging modern development tools and + practices. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ joshuafern AndersonTorres ]; + platforms = platforms.unix; + priority = 101; + }; +} +# TODO: report upstream about not finding SDL2_net diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix new file mode 100644 index 000000000000..87ac444ae491 --- /dev/null +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, fetchurl +, SDL +, SDL_net +, SDL_sound +, copyDesktopItems +, graphicsmagick +, libGL +, libGLU +, libpng +, makeDesktopItem +}: + +stdenv.mkDerivation rec { + pname = "dosbox"; + version = "0.74-3"; + + src = fetchurl { + url = "mirror://sourceforge/dosbox/dosbox-${version}.tar.gz"; + hash = "sha256-wNE91+0u02O2jeYVR1eB6JHNWC6BYrXDZpE3UCIiJgo="; + }; + + nativeBuildInputs = [ + copyDesktopItems + graphicsmagick + ]; + + buildInputs = [ + SDL + SDL_net + SDL_sound + libGL + libGLU + libpng + ]; + + hardeningDisable = [ "format" ]; + + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + + desktopItems = [ + (makeDesktopItem { + name = "dosbox"; + exec = "dosbox"; + icon = "dosbox"; + comment = "x86 dos emulator"; + desktopName = "DOSBox"; + genericName = "DOS emulator"; + categories = [ "Emulator" "Game" ]; + }) + ]; + + postInstall = '' + mkdir -p $out/share/icons/hicolor/256x256/apps + gm convert src/dosbox.ico $out/share/icons/hicolor/256x256/apps/dosbox.png + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "http://www.dosbox.com/"; + description = "A DOS emulator"; + longDescription = '' + DOSBox is an emulator that recreates a MS-DOS compatible environment + (complete with Sound, Input, Graphics and even basic networking). This + environment is complete enough to run many classic MS-DOS games completely + unmodified. In order to utilize all of DOSBox's features you need to first + understand some basic concepts about the MS-DOS environment. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/misc/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix similarity index 93% rename from pkgs/misc/emulators/duckstation/default.nix rename to pkgs/applications/emulators/duckstation/default.nix index bbe4819246a2..8e4d909a724a 100644 --- a/pkgs/misc/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "duckstation"; - version = "0.pre+date=2021-12-16"; + version = "0.pre+date=2022-01-18"; src = fetchFromGitHub { owner = "stenzek"; repo = pname; - rev = "59cb7c03432f5f8d9f6283c71a34825d05e118c6"; - sha256 = "sha256-vF3YEpicbwCtR6QW2huNk0+pJ7BBjn/x9/Ae1c00gN4="; + rev = "51041e47f70123eda41d999701f5651830a0a95e"; + sha256 = "sha256-nlF6ctDU8KCK7MN2pniPLLqUbPUygX9rl0hjzVQ+mPo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/emulators/dynamips/default.nix similarity index 83% rename from pkgs/applications/virtualization/dynamips/default.nix rename to pkgs/applications/emulators/dynamips/default.nix index 7f3320101530..26ff779ba05a 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/emulators/dynamips/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libelf, libpcap }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libelf +, libpcap +}: stdenv.mkDerivation rec { pname = "dynamips"; @@ -8,7 +14,7 @@ stdenv.mkDerivation rec { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "0pvdqs6kjz0x0wqb5f1k3r25dg82wssm7wz4psm0m6bxsvf5l0i5"; + hash = "sha256-JQJa3NZ9mQqqvuTzU7XmAr1WRB4zuLIwBx18OY3GbV8="; }; nativeBuildInputs = [ cmake ]; @@ -17,12 +23,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ]; meta = with lib; { + inherit (src.meta) homepage; description = "A Cisco router emulator"; longDescription = '' Dynamips is an emulator computer program that was written to emulate Cisco routers. ''; - inherit (src.meta) homepage; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/misc/emulators/emu2/default.nix b/pkgs/applications/emulators/emu2/default.nix similarity index 100% rename from pkgs/misc/emulators/emu2/default.nix rename to pkgs/applications/emulators/emu2/default.nix diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/applications/emulators/emulationstation/default.nix similarity index 100% rename from pkgs/misc/emulators/emulationstation/default.nix rename to pkgs/applications/emulators/emulationstation/default.nix diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/applications/emulators/epsxe/default.nix similarity index 100% rename from pkgs/misc/emulators/epsxe/default.nix rename to pkgs/applications/emulators/epsxe/default.nix diff --git a/pkgs/misc/emulators/fakenes/build.patch b/pkgs/applications/emulators/fakenes/build.patch similarity index 100% rename from pkgs/misc/emulators/fakenes/build.patch rename to pkgs/applications/emulators/fakenes/build.patch diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/applications/emulators/fakenes/default.nix similarity index 100% rename from pkgs/misc/emulators/fakenes/default.nix rename to pkgs/applications/emulators/fakenes/default.nix diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/applications/emulators/fceux/default.nix similarity index 88% rename from pkgs/misc/emulators/fceux/default.nix rename to pkgs/applications/emulators/fceux/default.nix index 3552a4a8d04b..e48f1cf7d56c 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/applications/emulators/fceux/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fceux"; - version = "2.6.1"; + version = "2.6.4"; src = fetchFromGitHub { owner = "TASEmulators"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-LlGM6sOjcpyHApUvSr5etKIqwDoheuiW53DSHs19W6Q="; + sha256 = "sha256-Q6r/iBlmi0z40+U6OLZCahS0io4IBBGZMP1mJH7szRM="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/applications/emulators/firebird-emu/default.nix similarity index 100% rename from pkgs/misc/emulators/firebird-emu/default.nix rename to pkgs/applications/emulators/firebird-emu/default.nix diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/applications/emulators/flycast/default.nix new file mode 100644 index 000000000000..67ba4590db62 --- /dev/null +++ b/pkgs/applications/emulators/flycast/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, alsa-lib +, libX11 +, libevdev +, udev +, libpulseaudio +, SDL2 +, libzip +, miniupnpc +}: + +stdenv.mkDerivation rec { + pname = "flycast"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "flyinghead"; + repo = "flycast"; + rev = "v${version}"; + sha256 = "sha256-MzHAGK++oukIs84OR/l6gBwCJssdi8Iyte5Rtro2+Q0="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + alsa-lib + libX11 + libevdev + udev + libpulseaudio + SDL2 + libzip + miniupnpc + ]; + + meta = with lib; { + homepage = "https://github.com/flyinghead/flycast"; + changelog = "https://github.com/flyinghead/flycast/releases/tag/v${version}"; + description = "A multi-platform Sega Dreamcast, Naomi and Atomiswave emulator"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/applications/emulators/fs-uae/default.nix similarity index 100% rename from pkgs/misc/emulators/fs-uae/default.nix rename to pkgs/applications/emulators/fs-uae/default.nix diff --git a/pkgs/misc/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix similarity index 100% rename from pkgs/misc/emulators/fs-uae/launcher.nix rename to pkgs/applications/emulators/fs-uae/launcher.nix diff --git a/pkgs/misc/emulators/fuse-emulator/default.nix b/pkgs/applications/emulators/fuse-emulator/default.nix similarity index 100% rename from pkgs/misc/emulators/fuse-emulator/default.nix rename to pkgs/applications/emulators/fuse-emulator/default.nix diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/applications/emulators/gens-gs/default.nix similarity index 100% rename from pkgs/misc/emulators/gens-gs/default.nix rename to pkgs/applications/emulators/gens-gs/default.nix diff --git a/pkgs/applications/emulators/goldberg-emu/default.nix b/pkgs/applications/emulators/goldberg-emu/default.nix new file mode 100644 index 000000000000..4a8d3e3b85ec --- /dev/null +++ b/pkgs/applications/emulators/goldberg-emu/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, protobuf + }: + +stdenv.mkDerivation rec { + pname = "goldberg-emu"; + version = "0.2.5"; + + src = fetchFromGitLab { + owner = "mr_goldberg"; + repo = "goldberg_emulator"; + rev = version; + sha256 = "sha256-goOgMNjtDmIKOAv9sZwnPOY0WqTN90LFJ5iEp3Vkzog="; + }; + + # It attempts to install windows-only libraries which we never build + patches = [ ./dont-install-unsupported.patch ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ protobuf ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/share/goldberg" + ]; + + preFixup = '' + mkdir -p $out/{bin,lib} + chmod +x $out/share/goldberg/tools/find_interfaces.sh + + ln -s $out/share/goldberg/libsteam_api.so $out/lib + ln -s $out/share/goldberg/lobby_connect/lobby_connect $out/bin + ln -s $out/share/goldberg/tools/generate_interfaces_file $out/bin + ln -s $out/share/goldberg/tools/find_interfaces.sh $out/bin/find_interfaces + ''; + + meta = with lib; { + homepage = "https://gitlab.com/Mr_Goldberg/goldberg_emulator"; + changelog = "https://gitlab.com/Mr_Goldberg/goldberg_emulator/-/releases"; + description = "Program that emulates steam online features"; + longDescription = '' + Steam emulator that emulates steam online features. Lets you play games that + use the steam multiplayer apis on a LAN without steam or an internet connection. + ''; + mainProgram = "lobby_connect"; + license = licenses.lgpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch b/pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch new file mode 100644 index 000000000000..7dba7e25b970 --- /dev/null +++ b/pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index abaace2..5e3465c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -182,10 +182,10 @@ if(WIN32) + RUNTIME DESTINATION ./ + ) + else() +- install(TARGETS +- ${LIB_STEAMCLIENT} +- LIBRARY DESTINATION ./ +- ) ++ # install(TARGETS ++ #${LIB_STEAMCLIENT} ++ #LIBRARY DESTINATION ./ ++ #) + endif() + + if(NOT WIN32) +@@ -220,10 +220,10 @@ if(WIN32) + RUNTIME DESTINATION ./ + ) + else() +- install(TARGETS +- ${LIB_STEAMNETWORKINGSOCKETS} +- LIBRARY DESTINATION ./ +- ) ++ # install(TARGETS ++ # ${LIB_STEAMNETWORKINGSOCKETS} ++ # LIBRARY DESTINATION ./ ++ # ) + endif() + + if(NOT WIN32) diff --git a/pkgs/misc/emulators/gxemul/0001-fix-attributes.patch b/pkgs/applications/emulators/gxemul/0001-fix-attributes.patch similarity index 100% rename from pkgs/misc/emulators/gxemul/0001-fix-attributes.patch rename to pkgs/applications/emulators/gxemul/0001-fix-attributes.patch diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/applications/emulators/gxemul/default.nix similarity index 100% rename from pkgs/misc/emulators/gxemul/default.nix rename to pkgs/applications/emulators/gxemul/default.nix diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/applications/emulators/hatari/default.nix similarity index 100% rename from pkgs/misc/emulators/hatari/default.nix rename to pkgs/applications/emulators/hatari/default.nix diff --git a/pkgs/applications/virtualization/hercules/default.nix b/pkgs/applications/emulators/hercules/default.nix similarity index 57% rename from pkgs/applications/virtualization/hercules/default.nix rename to pkgs/applications/emulators/hercules/default.nix index f33055baacbc..67506d36b63c 100644 --- a/pkgs/applications/virtualization/hercules/default.nix +++ b/pkgs/applications/emulators/hercules/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation rec { pname = "hercules"; @@ -10,8 +13,14 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "IBM mainframe emulator"; homepage = "http://www.hercules-390.eu"; + description = "IBM mainframe emulator"; + longDescription = '' + Hercules is an open source software implementation of the mainframe + System/370 and ESA/390 architectures, in addition to the latest 64-bit + z/Architecture. Hercules runs under Linux, Windows, Solaris, FreeBSD, and + Mac OS X. + ''; license = licenses.qpl; maintainers = [ maintainers.anna328p ]; }; diff --git a/pkgs/misc/emulators/higan/001-include-cmath.patch b/pkgs/applications/emulators/higan/001-include-cmath.patch similarity index 100% rename from pkgs/misc/emulators/higan/001-include-cmath.patch rename to pkgs/applications/emulators/higan/001-include-cmath.patch diff --git a/pkgs/misc/emulators/higan/002-sips-to-png2icns.patch b/pkgs/applications/emulators/higan/002-sips-to-png2icns.patch similarity index 100% rename from pkgs/misc/emulators/higan/002-sips-to-png2icns.patch rename to pkgs/applications/emulators/higan/002-sips-to-png2icns.patch diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/applications/emulators/higan/default.nix similarity index 100% rename from pkgs/misc/emulators/higan/default.nix rename to pkgs/applications/emulators/higan/default.nix diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix similarity index 100% rename from pkgs/misc/emulators/kega-fusion/default.nix rename to pkgs/applications/emulators/kega-fusion/default.nix diff --git a/pkgs/misc/emulators/lambda-delta/default.nix b/pkgs/applications/emulators/lambda-delta/default.nix similarity index 100% rename from pkgs/misc/emulators/lambda-delta/default.nix rename to pkgs/applications/emulators/lambda-delta/default.nix diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/applications/emulators/libdsk/default.nix similarity index 83% rename from pkgs/misc/emulators/libdsk/default.nix rename to pkgs/applications/emulators/libdsk/default.nix index 9ad20275489b..247aef118e8e 100644 --- a/pkgs/misc/emulators/libdsk/default.nix +++ b/pkgs/applications/emulators/libdsk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdsk"; - version = "1.5.15"; + version = "1.5.18"; src = fetchurl { url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz"; - sha256 = "sha256-7VjVgGRy3+SE+9mdPpBKiNzv1tg2akXpkHfv2dVoODs="; + sha256 = "sha256-43HUMQ35nwOwaQP8F1vO7zFccxHrQqJhZ6D5zzYhB5A="; }; meta = with lib; { diff --git a/pkgs/misc/emulators/maiko/default.nix b/pkgs/applications/emulators/maiko/default.nix similarity index 100% rename from pkgs/misc/emulators/maiko/default.nix rename to pkgs/applications/emulators/maiko/default.nix diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix similarity index 98% rename from pkgs/misc/emulators/mame/default.nix rename to pkgs/applications/emulators/mame/default.nix index e0915703003a..ce3fb3d06aed 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -26,7 +26,7 @@ let exec = "mame${lib.optionalString stdenv.is64bit "64"}"; desktopName = "MAME"; genericName = "MAME is a multi-purpose emulation framework"; - categories = "System;Emulator;"; + categories = [ "System" "Emulator" ]; }; dest = "$out/opt/mame"; diff --git a/pkgs/misc/emulators/mame/emuopts.patch b/pkgs/applications/emulators/mame/emuopts.patch similarity index 100% rename from pkgs/misc/emulators/mame/emuopts.patch rename to pkgs/applications/emulators/mame/emuopts.patch diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/applications/emulators/mednafen/default.nix similarity index 76% rename from pkgs/misc/emulators/mednafen/default.nix rename to pkgs/applications/emulators/mednafen/default.nix index f76ddb78bd56..bcc58ccb76a0 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/applications/emulators/mednafen/default.nix @@ -1,32 +1,56 @@ -{ lib, stdenv, fetchurl, pkg-config, freeglut, libGLU, libGL, libcdio, libjack2 -, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsa-lib }: +{ lib +, stdenv +, fetchurl +, SDL2 +, SDL2_net +, alsa-lib +, flac +, freeglut +, libGL +, libGLU +, libX11 +, libcdio +, libjack2 +, libsamplerate +, libsndfile +, pkg-config +, zlib +, libiconv +}: stdenv.mkDerivation rec { pname = "mednafen"; - version = "1.26.1"; + version = "1.29.0"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; - sha256 = "1x7xhxjhwsdbak8l0iyb497f043xkhibk73w96xck4j2bk10fac4"; + hash = "sha256-2j+88Ch3+b4PAov6XRy1npU6QEm5D+fjk4ijOG2fNi4="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - freeglut - libGLU libGL - libcdio - libjack2 - alsa-lib - libsamplerate - libsndfile - libX11 SDL2 SDL2_net + flac + freeglut + libcdio + libjack2 + libsamplerate + libsndfile zlib + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libGL + libGLU + libX11 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv ]; - hardeningDisable = [ "pic" ]; + hardeningDisable = [ "pic" "format" ]; + + enableParallelBuilding = true; postInstall = '' mkdir -p $out/share/doc @@ -34,6 +58,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://mednafen.github.io/"; description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; longDescription = '' Mednafen is a portable, utilizing OpenGL and SDL, @@ -66,9 +91,8 @@ stdenv.mkDerivation rec { - Sega Saturn (experimental, x86_64 only) - Sony PlayStation ''; - homepage = "https://mednafen.github.io/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/applications/emulators/mednafen/server.nix similarity index 100% rename from pkgs/misc/emulators/mednafen/server.nix rename to pkgs/applications/emulators/mednafen/server.nix diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/applications/emulators/mednaffe/default.nix similarity index 86% rename from pkgs/misc/emulators/mednaffe/default.nix rename to pkgs/applications/emulators/mednaffe/default.nix index 4874d5efee7a..32bb06b27042 100644 --- a/pkgs/misc/emulators/mednaffe/default.nix +++ b/pkgs/applications/emulators/mednaffe/default.nix @@ -20,11 +20,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + buildInputs = [ gtk3 mednafen ]; - postInstall = '' - wrapProgram $out/bin/mednaffe \ + enableParallelBuilding = true; + + preFixup = '' + gappsWrapperArgs+=( --prefix PATH ':' "${mednafen}/bin" + ) ''; meta = with lib; { @@ -32,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/AmatCoder/mednaffe"; license = licenses.gpl3Plus; maintainers = with maintainers; [ sheenobu yana AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix similarity index 89% rename from pkgs/misc/emulators/melonDS/default.nix rename to pkgs/applications/emulators/melonDS/default.nix index 3e30be8c2a3f..6e389b8daf64 100644 --- a/pkgs/misc/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "melonDS"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "Arisotura"; repo = pname; rev = version; - sha256 = "1v8a060gbpx7rdkk2w4hym361l2wip7yjjn8wny1gfsa273k3zy5"; + sha256 = "sha256-FSacau7DixU6R4eKNIYVRZiMb/GhijTzHbcGlZ6WG/I="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix similarity index 95% rename from pkgs/misc/emulators/mgba/default.nix rename to pkgs/applications/emulators/mgba/default.nix index f6b9c11ffe39..4424bedc6f23 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix @@ -4,7 +4,7 @@ , SDL2 , cmake , libepoxy -, ffmpeg +, ffmpeg_4 , imagemagick , libedit , libelf @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 libepoxy - ffmpeg + ffmpeg_4 imagemagick libedit libelf @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { comment = "A Game Boy Advance Emulator"; desktopName = "mgba"; genericName = "Game Boy Advance Emulator"; - categories = "Game;Emulator;"; - startupNotify = "false"; + categories = [ "Game" "Emulator" ]; + startupNotify = false; }) ]; diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/applications/emulators/mupen64plus/default.nix similarity index 100% rename from pkgs/misc/emulators/mupen64plus/default.nix rename to pkgs/applications/emulators/mupen64plus/default.nix diff --git a/pkgs/misc/emulators/nestopia/build-fix.patch b/pkgs/applications/emulators/nestopia/build-fix.patch similarity index 100% rename from pkgs/misc/emulators/nestopia/build-fix.patch rename to pkgs/applications/emulators/nestopia/build-fix.patch diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/applications/emulators/nestopia/default.nix similarity index 100% rename from pkgs/misc/emulators/nestopia/default.nix rename to pkgs/applications/emulators/nestopia/default.nix diff --git a/pkgs/misc/emulators/nestopia/gcc6.patch b/pkgs/applications/emulators/nestopia/gcc6.patch similarity index 100% rename from pkgs/misc/emulators/nestopia/gcc6.patch rename to pkgs/applications/emulators/nestopia/gcc6.patch diff --git a/pkgs/misc/emulators/np2kai/default.nix b/pkgs/applications/emulators/np2kai/default.nix similarity index 100% rename from pkgs/misc/emulators/np2kai/default.nix rename to pkgs/applications/emulators/np2kai/default.nix diff --git a/pkgs/misc/emulators/oberon-risc-emu/default.nix b/pkgs/applications/emulators/oberon-risc-emu/default.nix similarity index 100% rename from pkgs/misc/emulators/oberon-risc-emu/default.nix rename to pkgs/applications/emulators/oberon-risc-emu/default.nix diff --git a/pkgs/misc/emulators/openmsx/custom-nix.mk b/pkgs/applications/emulators/openmsx/custom-nix.mk similarity index 100% rename from pkgs/misc/emulators/openmsx/custom-nix.mk rename to pkgs/applications/emulators/openmsx/custom-nix.mk diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/applications/emulators/openmsx/default.nix similarity index 100% rename from pkgs/misc/emulators/openmsx/default.nix rename to pkgs/applications/emulators/openmsx/default.nix diff --git a/pkgs/misc/emulators/pcem/default.nix b/pkgs/applications/emulators/pcem/default.nix similarity index 100% rename from pkgs/misc/emulators/pcem/default.nix rename to pkgs/applications/emulators/pcem/default.nix diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix similarity index 100% rename from pkgs/misc/emulators/pcsx2/default.nix rename to pkgs/applications/emulators/pcsx2/default.nix diff --git a/pkgs/misc/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch b/pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch similarity index 100% rename from pkgs/misc/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch rename to pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix similarity index 100% rename from pkgs/misc/emulators/pcsxr/default.nix rename to pkgs/applications/emulators/pcsxr/default.nix diff --git a/pkgs/misc/emulators/pcsxr/uncompress2.patch b/pkgs/applications/emulators/pcsxr/uncompress2.patch similarity index 100% rename from pkgs/misc/emulators/pcsxr/uncompress2.patch rename to pkgs/applications/emulators/pcsxr/uncompress2.patch diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix similarity index 100% rename from pkgs/misc/emulators/ppsspp/default.nix rename to pkgs/applications/emulators/ppsspp/default.nix diff --git a/pkgs/misc/emulators/proton-caller/default.nix b/pkgs/applications/emulators/proton-caller/default.nix similarity index 100% rename from pkgs/misc/emulators/proton-caller/default.nix rename to pkgs/applications/emulators/proton-caller/default.nix diff --git a/pkgs/misc/emulators/punes/default.nix b/pkgs/applications/emulators/punes/default.nix similarity index 75% rename from pkgs/misc/emulators/punes/default.nix rename to pkgs/applications/emulators/punes/default.nix index 9b147de4fa93..dba83f41305d 100644 --- a/pkgs/misc/emulators/punes/default.nix +++ b/pkgs/applications/emulators/punes/default.nix @@ -20,25 +20,15 @@ mkDerivation rec { pname = "punes"; - version = "0.108"; + version = "0.109"; src = fetchFromGitHub { owner = "punesemu"; repo = "puNES"; rev = "v${version}"; - sha256 = "0inkwmvbr2w4addmgk9r4f13yismang9ylfgflhh9352lf0lirv8"; + sha256 = "sha256-6aRtR/d8nhzmpN9QKSZ62jye7qjfO+FpRMCXkX4Yubk="; }; - patches = [ - # Drop when version > 0.108 - # https://github.com/punesemu/puNES/issues/185 - (fetchpatch { - name = "0001-punes-Fixed-make-install.patch"; - url = "https://github.com/punesemu/puNES/commit/902434f50398ebcda0786ade4b28a0496084810e.patch"; - sha256 = "1a3052n3n1qipi4bd7f7gq4zl5jjjzzzpbijdisis2vxvhnfvcim"; - }) - ]; - postPatch = '' substituteInPlace configure.ac \ --replace '`$PKG_CONFIG --variable=host_bins Qt5Core`/lrelease' '${qttools.dev}/bin/lrelease' diff --git a/pkgs/misc/emulators/py65/default.nix b/pkgs/applications/emulators/py65/default.nix similarity index 100% rename from pkgs/misc/emulators/py65/default.nix rename to pkgs/applications/emulators/py65/default.nix diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/applications/emulators/qmc2/default.nix similarity index 100% rename from pkgs/misc/emulators/qmc2/default.nix rename to pkgs/applications/emulators/qmc2/default.nix diff --git a/pkgs/misc/emulators/resim/default.nix b/pkgs/applications/emulators/resim/default.nix similarity index 100% rename from pkgs/misc/emulators/resim/default.nix rename to pkgs/applications/emulators/resim/default.nix diff --git a/pkgs/misc/emulators/retroarch/0001-Disable-menu_show_core_updater.patch b/pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/0001-Disable-menu_show_core_updater.patch rename to pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch diff --git a/pkgs/misc/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch b/pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch rename to pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix similarity index 100% rename from pkgs/misc/emulators/retroarch/cores.nix rename to pkgs/applications/emulators/retroarch/cores.nix diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix similarity index 97% rename from pkgs/misc/emulators/retroarch/default.nix rename to pkgs/applications/emulators/retroarch/default.nix index f0dba9058d10..2c49874e5446 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -6,7 +6,7 @@ , alsa-lib , AppKit , fetchFromGitHub -, ffmpeg +, ffmpeg_4 , Foundation , freetype , gamemode @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { lib.optional stdenv.isLinux wayland ++ lib.optional (runtimeLibs != [ ]) makeWrapper; - buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] ++ + buildInputs = [ ffmpeg_4 freetype libxml2 libGLU libGL python3 SDL2 which ] ++ lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ lib.optional withVulkan vulkan-loader ++ lib.optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++ diff --git a/pkgs/misc/emulators/retroarch/disable-menu-show-core-updater.patch b/pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/disable-menu-show-core-updater.patch rename to pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch diff --git a/pkgs/misc/emulators/retroarch/fix-config.patch b/pkgs/applications/emulators/retroarch/fix-config.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/fix-config.patch rename to pkgs/applications/emulators/retroarch/fix-config.patch diff --git a/pkgs/misc/emulators/retroarch/fix-libretro-paths.patch b/pkgs/applications/emulators/retroarch/fix-libretro-paths.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/fix-libretro-paths.patch rename to pkgs/applications/emulators/retroarch/fix-libretro-paths.patch diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json similarity index 100% rename from pkgs/misc/emulators/retroarch/hashes.json rename to pkgs/applications/emulators/retroarch/hashes.json diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/applications/emulators/retroarch/kodi-advanced-launchers.nix similarity index 100% rename from pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix rename to pkgs/applications/emulators/retroarch/kodi-advanced-launchers.nix diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/applications/emulators/retroarch/update.py similarity index 100% rename from pkgs/misc/emulators/retroarch/update.py rename to pkgs/applications/emulators/retroarch/update.py diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/applications/emulators/retroarch/wrapper.nix similarity index 78% rename from pkgs/misc/emulators/retroarch/wrapper.nix rename to pkgs/applications/emulators/retroarch/wrapper.nix index e667afdf079c..b3797c9e9e36 100644 --- a/pkgs/misc/emulators/retroarch/wrapper.nix +++ b/pkgs/applications/emulators/retroarch/wrapper.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation { preferLocalBuild = true; meta = with retroarch.meta; { - inherit changelog license homepage platforms maintainers; - description = description - + " (with cores: " + inherit changelog description homepage license maintainers platforms; + longDescription = + "RetroArch is the reference frontend for the libretro API. The following cores are included: " + lib.concatStringsSep ", " (map (x: "${x.name}") cores) - + ")"; + + "."; }; } diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/applications/emulators/retrofe/default.nix similarity index 100% rename from pkgs/misc/emulators/retrofe/default.nix rename to pkgs/applications/emulators/retrofe/default.nix diff --git a/pkgs/misc/emulators/retrofe/include-paths.patch b/pkgs/applications/emulators/retrofe/include-paths.patch similarity index 100% rename from pkgs/misc/emulators/retrofe/include-paths.patch rename to pkgs/applications/emulators/retrofe/include-paths.patch diff --git a/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch b/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch new file mode 100644 index 000000000000..dccf06fc0786 --- /dev/null +++ b/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch @@ -0,0 +1,62 @@ +From 9866ce8f538e1ab1f0902408b7575013b768f365 Mon Sep 17 00:00:00 2001 +From: Zane van Iperen +Date: Wed, 2 Feb 2022 23:41:59 +1000 +Subject: [PATCH] llvm/ExecutionEngine/IntelJITEvents: only use + ITTAPI_SOURCE_DIR + +--- + .../IntelJITEvents/CMakeLists.txt | 32 ++----------------- + 1 file changed, 2 insertions(+), 30 deletions(-) + +diff --git a/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt b/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt +index 0c5017c3..d20c35f3 100644 +--- a/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt ++++ b/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt +@@ -1,34 +1,6 @@ + include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ) + +-if(NOT DEFINED ITTAPI_GIT_REPOSITORY) +- set(ITTAPI_GIT_REPOSITORY https://github.com/intel/ittapi.git) +-endif() +- +-if(NOT DEFINED ITTAPI_GIT_TAG) +- set(ITTAPI_GIT_TAG v3.18.12) +-endif() +- +-if(NOT DEFINED ITTAPI_SOURCE_DIR) +- set(ITTAPI_SOURCE_DIR ${PROJECT_BINARY_DIR}) +-endif() +- +-if(NOT EXISTS ${ITTAPI_SOURCE_DIR}/ittapi) +- execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ITTAPI_GIT_REPOSITORY} +- WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR} +- RESULT_VARIABLE GIT_CLONE_RESULT) +- if(NOT GIT_CLONE_RESULT EQUAL "0") +- message(FATAL_ERROR "git clone ${ITTAPI_GIT_REPOSITORY} failed with ${GIT_CLONE_RESULT}, please clone ${ITTAPI_GIT_REPOSITORY}") +- endif() +-endif() +- +-execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${ITTAPI_GIT_TAG} +- WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}/ittapi +- RESULT_VARIABLE GIT_CHECKOUT_RESULT) +-if(NOT GIT_CHECKOUT_RESULT EQUAL "0") +- message(FATAL_ERROR "git checkout ${ITTAPI_GIT_TAG} failed with ${GIT_CHECKOUT_RESULT}, please checkout ${ITTAPI_GIT_TAG} at ${ITTAPI_SOURCE_DIR}/ittapi") +-endif() +- +-include_directories( ${ITTAPI_SOURCE_DIR}/ittapi/include/ ) ++include_directories( ${ITTAPI_SOURCE_DIR}/include/ ) + + if( HAVE_LIBDL ) + set(LLVM_INTEL_JIT_LIBS ${CMAKE_DL_LIBS}) +@@ -40,7 +12,7 @@ set(LLVM_INTEL_JIT_LIBS ${LLVM_PTHREAD_LIB} ${LLVM_INTEL_JIT_LIBS}) + add_llvm_component_library(LLVMIntelJITEvents + IntelJITEventListener.cpp + jitprofiling.c +- ${ITTAPI_SOURCE_DIR}/ittapi/src/ittnotify/ittnotify_static.c ++ ${ITTAPI_SOURCE_DIR}/src/ittnotify/ittnotify_static.c + + LINK_LIBS ${LLVM_INTEL_JIT_LIBS} + +-- +2.34.1 + diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix similarity index 72% rename from pkgs/misc/emulators/rpcs3/default.nix rename to pkgs/applications/emulators/rpcs3/default.nix index 25a6d6befad1..74c5b8ee6b35 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -8,26 +8,38 @@ }: let - majorVersion = "0.0.19"; - gitVersion = "12975-37383f421"; + # Keep these separate so the update script can regex them + rpcs3GitVersion = "13352-e58906cb4"; + rpcs3Version = "0.0.21-13352-e58906cb4"; + rpcs3Revision = "e58906cb4df26c14fcade07d7c15ab432dae6882"; + rpcs3Sha256 = "1bzx6af77z5l6jdgazw8x59pi2xhwkz0knynmf5kzww39m6npx0a"; + + ittapi = fetchFromGitHub { + owner = "intel"; + repo = "ittapi"; + rev = "v3.18.12"; + sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz"; + }; in gcc11Stdenv.mkDerivation { pname = "rpcs3"; - version = "${majorVersion}-${gitVersion}"; + version = rpcs3Version; src = fetchFromGitHub { owner = "RPCS3"; repo = "rpcs3"; - rev = "37383f4217e1c510a543e100d0ca495800b3361a"; + rev = rpcs3Revision; fetchSubmodules = true; - sha256 = "1pm1r4j4cdcmr8xmslyv2n6iwcjldnr396by4r6lgf4mdlnwahhm"; + sha256 = rpcs3Sha256; }; + patches = [ ./0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch ]; + passthru.updateScript = ./update.sh; preConfigure = '' cat > ./rpcs3/git-version.h < $NEW_VERSION" +if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then + echo "Already up to date! Doing nothing" + exit 0 +fi + +SHA="$(nix-prefetch-git https://github.com/ryujinx/ryujinx --rev "$COMMIT" --quiet | jq -r '.sha256')" + +cd ../../../.. +update-source-version ryujinx "$NEW_VERSION" "$SHA" --rev="$COMMIT" + +echo "building Nuget lockfile" + +STORE_SRC="$(nix-build . -A ryujinx.src --no-out-link)" +SRC="$(mktemp -d /tmp/ryujinx-src.XXX)" +cp -rT "$STORE_SRC" "$SRC" +chmod -R +w "$SRC" +pushd "$SRC" + +mkdir nuget_tmp.packages +DOTNET_CLI_TELEMETRY_OPTOUT=1 dotnet restore Ryujinx.sln --packages nuget_tmp.packages + +nuget-to-nix ./nuget_tmp.packages >"$DEPS_FILE" + +popd +rm -r "$SRC" diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix similarity index 100% rename from pkgs/misc/emulators/sameboy/default.nix rename to pkgs/applications/emulators/sameboy/default.nix diff --git a/pkgs/misc/emulators/simh/default.nix b/pkgs/applications/emulators/simh/default.nix similarity index 100% rename from pkgs/misc/emulators/simh/default.nix rename to pkgs/applications/emulators/simh/default.nix diff --git a/pkgs/misc/emulators/simplenes/default.nix b/pkgs/applications/emulators/simplenes/default.nix similarity index 100% rename from pkgs/misc/emulators/simplenes/default.nix rename to pkgs/applications/emulators/simplenes/default.nix diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/applications/emulators/snes9x-gtk/default.nix similarity index 73% rename from pkgs/misc/emulators/snes9x-gtk/default.nix rename to pkgs/applications/emulators/snes9x-gtk/default.nix index 27f3400cc0b1..ff7df4b09440 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/applications/emulators/snes9x-gtk/default.nix @@ -1,19 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsHook -, SDL2, zlib, gtk3, libxml2, libXv, libepoxy, minizip, pulseaudio, portaudio }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wrapGAppsHook, alsa-lib +, SDL2, zlib, gtkmm3, libXv, libepoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { pname = "snes9x-gtk"; - version = "1.60"; + version = "1.61"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; rev = version; - sha256 = "12hpn7zcdvp30ldpw2zf115yjqv55n1ldjbids7vx0lvbpr06dm1"; + fetchSubmodules = true; + sha256 = "1kay7aj30x0vn8rkylspdycydrzsc0aidjbs0dd238hr5hid723b"; }; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; - buildInputs = [ SDL2 zlib gtk3 libxml2 libXv libepoxy minizip pulseaudio portaudio ]; + buildInputs = [ alsa-lib SDL2 zlib gtkmm3 libXv libepoxy minizip pulseaudio portaudio ]; preConfigure = "cd gtk"; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { # see https://github.com/snes9xgit/snes9x/blob/master/LICENSE for exact details license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ qknight ]; + maintainers = with maintainers; [ qknight xfix ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/applications/emulators/stella/default.nix similarity index 100% rename from pkgs/misc/emulators/stella/default.nix rename to pkgs/applications/emulators/stella/default.nix diff --git a/pkgs/misc/emulators/termtekst/default.nix b/pkgs/applications/emulators/termtekst/default.nix similarity index 100% rename from pkgs/misc/emulators/termtekst/default.nix rename to pkgs/applications/emulators/termtekst/default.nix diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/applications/emulators/tilem/default.nix similarity index 100% rename from pkgs/misc/emulators/tilem/default.nix rename to pkgs/applications/emulators/tilem/default.nix diff --git a/pkgs/applications/virtualization/tiny8086/default.nix b/pkgs/applications/emulators/tiny8086/default.nix similarity index 83% rename from pkgs/applications/virtualization/tiny8086/default.nix rename to pkgs/applications/emulators/tiny8086/default.nix index 60d69432cde6..a0cc6bd7929b 100644 --- a/pkgs/applications/virtualization/tiny8086/default.nix +++ b/pkgs/applications/emulators/tiny8086/default.nix @@ -24,32 +24,33 @@ stdenv.mkDerivation rec { makeFlags = [ "8086tiny" ]; postBuild = lib.optionalString localBios '' - ( - cd bios_source - nasm -f bin bios.asm -o bios - ) + pushd bios_source + nasm -f bin bios.asm -o bios + popd ''; installPhase = '' - mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images + runHook preInstall + mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images install -m 755 8086tiny $out/bin install -m 644 fd.img $out/share/8086tiny/8086tiny-floppy.img install -m 644 bios_source/bios.asm $out/share/8086tiny/8086tiny-bios-src.asm install -m 644 docs/8086tiny.css $out/share/doc/8086tiny install -m 644 docs/doc.html $out/share/doc/$name - for i in docs/images/\*.gif; do - install -m 644 $i $out/share/doc/8086tiny/images + for image in docs/images/\*.gif; do + install -m 644 $image $out/share/doc/8086tiny/images done - ${if localBios then - "install -m 644 bios_source/bios $out/share/8086tiny/8086tiny-bios" - else - "install -m 644 bios $out/share/8086tiny/8086tiny-bios"} + install -m 644 ${lib.optionalString localBios "bios_source/"}bios \ + $out/share/8086tiny/8086tiny-bios + + runHook postInstall ''; meta = with lib; { + homepage = "https://github.com/adriancable/8086tiny"; description = "An open-source small 8086 emulator"; longDescription = '' 8086tiny is a tiny, open-source (MIT), portable (little-endian hosts) @@ -60,7 +61,6 @@ stdenv.mkDerivation rec { 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) ''; - homepage = "https://github.com/adriancable/8086tiny"; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/emulators/tinyemu/default.nix b/pkgs/applications/emulators/tinyemu/default.nix new file mode 100644 index 000000000000..c32fd24fe477 --- /dev/null +++ b/pkgs/applications/emulators/tinyemu/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchurl +, SDL +, curl +, openssl +}: + +stdenv.mkDerivation rec { + pname = "tinyemu"; + version = "2019-12-21"; + + src = fetchurl { + url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz"; + hash = "sha256-voNR8hIYGbMXL87c5csYJvoSyH2ht+2Y8mnT6AKgVVU="; + }; + + buildInputs = [ + SDL + curl + openssl + ]; + + makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; + + preInstall = '' + mkdir -p "$out/bin" + ''; + + meta = with lib; { + homepage = "https://bellard.org/tinyemu/"; + description = "A system emulator for the RISC-V and x86 architectures"; + longDescription = '' + TinyEMU is a system emulator for the RISC-V and x86 architectures. Its + purpose is to be small and simple while being complete. + ''; + license = with licenses; [ mit bsd2 ]; + maintainers = with maintainers; [ jhhuh AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/applications/emulators/uae/default.nix similarity index 100% rename from pkgs/misc/emulators/uae/default.nix rename to pkgs/applications/emulators/uae/default.nix diff --git a/pkgs/misc/emulators/uxn/default.nix b/pkgs/applications/emulators/uxn/default.nix similarity index 100% rename from pkgs/misc/emulators/uxn/default.nix rename to pkgs/applications/emulators/uxn/default.nix diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix similarity index 100% rename from pkgs/misc/emulators/vbam/default.nix rename to pkgs/applications/emulators/vbam/default.nix diff --git a/pkgs/applications/emulators/vice/default.nix b/pkgs/applications/emulators/vice/default.nix new file mode 100644 index 000000000000..45fb03f1ac42 --- /dev/null +++ b/pkgs/applications/emulators/vice/default.nix @@ -0,0 +1,187 @@ +{ lib +, stdenv +, fetchurl +, bison +, flex +, perl +, libpng +, giflib +, libjpeg +, alsa-lib +, readline +, libGLU +, libGL +, libXaw +, pkg-config +, gtk2 +, SDL +, SDL_image +, autoreconfHook +, makeDesktopItem +, dos2unix +, xa +, file +}: + +let + desktopItems = [ + (makeDesktopItem { + name = "x128"; + exec = "x128"; + comment = "VICE: C128 Emulator"; + desktopName = "VICE: C128 Emulator"; + genericName = "Commodore 128 emulator"; + categories = [ "System" ]; + }) + + (makeDesktopItem { + name = "x64"; + exec = "x64"; + comment = "VICE: C64 Emulator"; + desktopName = "VICE: C64 Emulator"; + genericName = "Commodore 64 emulator"; + categories = [ "System" ]; + }) + + (makeDesktopItem { + name = "x64dtv"; + exec = "x64dtv"; + comment = "VICE: C64 DTV Emulator"; + desktopName = "VICE: C64 DTV Emulator"; + genericName = "Commodore 64 DTV emulator"; + categories = [ "System" ]; + }) + + (makeDesktopItem { + name = "x64sc"; + exec = "x64sc"; + comment = "VICE: C64 SC Emulator"; + desktopName = "VICE: C64 SC Emulator"; + genericName = "Commodore 64 SC emulator"; + categories = [ "System" ]; + }) + + (makeDesktopItem { + name = "xcbm2"; + exec = "xcbm2"; + comment = "VICE: CBM-II B-Model Emulator"; + desktopName = "VICE: CBM-II B-Model Emulator"; + genericName = "CBM-II B-Model Emulator"; + categories = [ "System" ]; + }) + + (makeDesktopItem { + name = "xcbm5x0"; + exec = "xcbm5x0"; + comment = "VICE: CBM-II P-Model Emulator"; + desktopName = "VICE: CBM-II P-Model Emulator"; + genericName = "CBM-II P-Model Emulator"; + categories = [ "System" ]; + }) + + (makeDesktopItem { + name = "xpet"; + exec = "xpet"; + comment = "VICE: PET Emulator"; + desktopName = "VICE: PET Emulator"; + genericName = "Commodore PET Emulator"; + categories = [ "System" ]; + }) + + (makeDesktopItem { + name = "xplus4"; + exec = "xplus4"; + comment = "VICE: PLUS4 Emulator"; + desktopName = "VICE: PLUS4 Emulator"; + genericName = "Commodore PLUS4 Emulator"; + categories = [ "System" ]; + }) + + (makeDesktopItem { + name = "xscpu64"; + exec = "xscpu64"; + comment = "VICE: SCPU64 Emulator"; + desktopName = "VICE: SCPU64 Emulator"; + genericName = "Commodore SCPU64 Emulator"; + categories = [ "System" ]; + }) + + (makeDesktopItem { + name = "xvic"; + exec = "xvic"; + comment = "VICE: VIC-20 Emulator"; + desktopName = "VICE: VIC-20 Emulator"; + genericName = "Commodore VIC-20 Emulator"; + categories = [ "System" ]; + }) + + (makeDesktopItem { + name = "vsid"; + exec = "vsid"; + comment = "VSID: The SID Emulator"; + desktopName = "VSID: The SID Emulator"; + genericName = "SID Emulator"; + categories = [ "System" ]; + }) + ]; +in +stdenv.mkDerivation rec { + pname = "vice"; + version = "3.6.1"; + + src = fetchurl { + url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz"; + sha256 = "sha256-IN+EyFGq8vUABRCSf20xsy8mmRbTUUZcNm3Ar8ncFQw="; + }; + + nativeBuildInputs = [ + autoreconfHook + bison + dos2unix + file + flex + pkg-config + ]; + + buildInputs = [ + alsa-lib + giflib + gtk2 + libGL + libGLU + libXaw + libjpeg + libpng + perl + readline + SDL + SDL_image + xa + ]; + dontDisableStatic = true; + configureFlags = [ "--enable-fullscreen" "--enable-gnomeui" "--disable-pdf-docs" ]; + + preBuild = '' + for i in src/resid src/resid-dtv + do + mkdir -pv $i/src + ln -sv ../../wrap-u-ar.sh $i/src + done + ''; + + postInstall = '' + for app in ${toString desktopItems} + do + mkdir -p $out/share/applications + cp $app/share/applications/* $out/share/applications + done + ''; + + meta = { + description = "Emulators for a variety of 8-bit Commodore computers"; + homepage = "https://vice-emu.sourceforge.io/"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.sander ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix similarity index 76% rename from pkgs/misc/emulators/wine/base.nix rename to pkgs/applications/emulators/wine/base.nix index 6e041b4e1471..7788b13b4ecb 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -1,10 +1,11 @@ -{ stdenv, lib, pkgArches, callPackage, - name, version, src, mingwGccs, monos, geckos, platforms, +{ stdenv, lib, pkgArches, callPackage, makeSetupHook, + pname, version, src, mingwGccs, monos, geckos, platforms, bison, flex, fontforge, makeWrapper, pkg-config, autoconf, hexdump, perl, nixosTests, supportFlags, patches, vkd3dArches, + moltenvk, buildScript ? null, configureFlags ? [] }: @@ -12,16 +13,38 @@ with import ./util.nix { inherit lib; }; let patches' = patches; - prevName = name; + prevName = pname; prevPlatforms = platforms; prevConfigFlags = configureFlags; + setupHookDarwin = makeSetupHook { + name = "darwin-mingw-hook"; + substitutions = { + darwinSuffixSalt = stdenv.cc.suffixSalt; + mingwGccsSuffixSalts = map (gcc: gcc.suffixSalt) mingwGccs; + }; + } ./setup-hook-darwin.sh; in stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { builder = buildScript; +}) // (lib.optionalAttrs stdenv.isDarwin { + postConfigure = '' + # dynamic fallback, so this shouldn’t cause problems for older versions of macOS and will + # provide additional functionality on newer ones. This can be removed once the x86_64-darwin + # SDK is updated. + sed 's|/\* #undef HAVE_MTLDEVICE_REGISTRYID \*/|#define HAVE_MTLDEVICE_REGISTRYID 1|' \ + -i include/config.h + ''; + postBuild = '' + # The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link + # to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and + # rebuild it with empty NIX_LDFLAGS. + rm loader/wine64-preloader + make loader/wine64-preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" + ''; }) // rec { - inherit src; + inherit version src; - name = if supportFlags.waylandSupport then "${prevName}-wayland" else prevName; + pname = prevName + lib.optionalString supportFlags.waylandSupport "wayland"; # Fixes "Compiler cannot create executables" building wineWow with mingwSupport strictDeps = true; @@ -38,21 +61,18 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { hexdump perl ] - ++ lib.optionals supportFlags.mingwSupport mingwGccs; + ++ lib.optionals supportFlags.mingwSupport (mingwGccs + ++ lib.optional stdenv.isDarwin setupHookDarwin); buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs: - [ pkgs.freetype pkgs.perl ] + [ pkgs.freetype pkgs.perl pkgs.libunwind ] ++ lib.optional stdenv.isLinux pkgs.libcap - ++ lib.optional pngSupport pkgs.libpng - ++ lib.optional jpegSupport pkgs.libjpeg + ++ lib.optional stdenv.isDarwin pkgs.libinotify-kqueue ++ lib.optional cupsSupport pkgs.cups - ++ lib.optional colorManagementSupport pkgs.lcms2 ++ lib.optional gettextSupport pkgs.gettext ++ lib.optional dbusSupport pkgs.dbus - ++ lib.optional mpg123Support pkgs.mpg123 ++ lib.optional openalSupport pkgs.openal ++ lib.optional cairoSupport pkgs.cairo - ++ lib.optional tiffSupport pkgs.libtiff ++ lib.optional odbcSupport pkgs.unixODBC ++ lib.optional netapiSupport pkgs.samba4 ++ lib.optional cursesSupport pkgs.ncurses @@ -60,24 +80,23 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional pcapSupport pkgs.libpcap ++ lib.optional v4lSupport pkgs.libv4l ++ lib.optional saneSupport pkgs.sane-backends - ++ lib.optional gsmSupport pkgs.gsm ++ lib.optional gphoto2Support pkgs.libgphoto2 + ++ lib.optional krb5Support pkgs.libkrb5 ++ lib.optional ldapSupport pkgs.openldap ++ lib.optional fontconfigSupport pkgs.fontconfig ++ lib.optional alsaSupport pkgs.alsa-lib ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional (xineramaSupport && !waylandSupport) pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev - ++ lib.optional vulkanSupport pkgs.vulkan-loader + ++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader) ++ lib.optional sdlSupport pkgs.SDL2 - ++ lib.optional faudioSupport pkgs.faudio + ++ lib.optional usbSupport pkgs.libusb1 ++ vkd3dArches ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav (gst-plugins-bad.override { enableZbar = false; }) ]) ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] - ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] ++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ @@ -91,12 +110,17 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev ]))); - patches = [ ] ++ patches'; + patches = [ ] + # Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available + # in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax. + ++ lib.optional stdenv.isDarwin ./darwin-metal-compat.patch + ++ patches'; configureFlags = prevConfigFlags ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ] ++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ] - ++ lib.optionals supportFlags.vkd3dSupport [ "--with-vkd3d" ]; + ++ lib.optionals supportFlags.vkd3dSupport [ "--with-vkd3d" ] + ++ lib.optionals (stdenv.isDarwin && !supportFlags.xineramaSupport) [ "--without-x" ]; # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/applications/emulators/wine/builder-wow.sh similarity index 100% rename from pkgs/misc/emulators/wine/builder-wow.sh rename to pkgs/applications/emulators/wine/builder-wow.sh diff --git a/pkgs/misc/emulators/wine/cert-path.patch b/pkgs/applications/emulators/wine/cert-path.patch similarity index 100% rename from pkgs/misc/emulators/wine/cert-path.patch rename to pkgs/applications/emulators/wine/cert-path.patch diff --git a/pkgs/applications/emulators/wine/darwin-metal-compat.patch b/pkgs/applications/emulators/wine/darwin-metal-compat.patch new file mode 100644 index 000000000000..aeee7533bbd4 --- /dev/null +++ b/pkgs/applications/emulators/wine/darwin-metal-compat.patch @@ -0,0 +1,31 @@ +diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m +index f64a6c0f6ad..6da0391e3fa 100644 +--- a/dlls/winemac.drv/cocoa_display.m ++++ b/dlls/winemac.drv/cocoa_display.m +@@ -289,7 +289,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) + * the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps + * using the integrated GPU. This is the behavior of Windows on a Mac. */ + primary_device = [MTLCreateSystemDefaultDevice() autorelease]; +- if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID)) ++ if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, (uint64_t)[primary_device registryID])) + goto done; + + /* Hide the integrated GPU if the system default device is a dedicated GPU */ +@@ -301,7 +301,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) + + for (i = 0; i < devices.count; i++) + { +- if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID)) ++ if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], (uint64_t)[devices[i] registryID])) + goto done; + + if (hide_integrated && devices[i].isLowPower) +@@ -354,7 +354,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp + + device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; + if (device && [device respondsToSelector:@selector(registryID)]) +- ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); ++ ret = macdrv_get_gpu_info_from_registry_id(gpu, (uint64_t)[device registryID]); + + done: + [pool release]; diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix similarity index 62% rename from pkgs/misc/emulators/wine/default.nix rename to pkgs/applications/emulators/wine/default.nix index 52b571a61255..37953f73c5dc 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -6,12 +6,9 @@ # }; # Make additional configurations on demand: # wine.override { wineBuild = "wine32"; wineRelease = "staging"; }; -{ lib, stdenv, callPackage, +{ lib, stdenv, callPackage, darwin, wineRelease ? "stable", wineBuild ? if stdenv.hostPlatform.system == "x86_64-linux" then "wineWow" else "wine32", - pngSupport ? false, - jpegSupport ? false, - tiffSupport ? false, gettextSupport ? false, fontconfigSupport ? false, alsaSupport ? false, @@ -20,9 +17,7 @@ tlsSupport ? false, gstreamerSupport ? false, cupsSupport ? false, - colorManagementSupport ? false, dbusSupport ? false, - mpg123Support ? false, openalSupport ? false, openclSupport ? false, cairoSupport ? false, @@ -33,34 +28,35 @@ pcapSupport ? false, v4lSupport ? false, saneSupport ? false, - gsmSupport ? false, gphoto2Support ? false, + krb5Support ? false, ldapSupport ? false, pulseaudioSupport ? false, udevSupport ? false, xineramaSupport ? false, - xmlSupport ? false, vulkanSupport ? false, sdlSupport ? false, - faudioSupport ? false, vkd3dSupport ? false, + usbSupport ? false, mingwSupport ? wineRelease != "stable", waylandSupport ? wineRelease == "wayland", - embedInstallers ? false # The Mono and Gecko MSI installers + embedInstallers ? false, # The Mono and Gecko MSI installers + moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily }: let wine-build = build: release: lib.getAttr build (callPackage ./packages.nix { wineRelease = release; supportFlags = { - inherit pngSupport jpegSupport cupsSupport colorManagementSupport gettextSupport - dbusSupport mpg123Support openalSupport cairoSupport tiffSupport odbcSupport - netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport - gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport - pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport - openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport faudioSupport - vkd3dSupport mingwSupport waylandSupport embedInstallers; + inherit + cupsSupport gettextSupport dbusSupport openalSupport cairoSupport + odbcSupport netapiSupport cursesSupport vaSupport pcapSupport + v4lSupport saneSupport gphoto2Support krb5Support ldapSupport fontconfigSupport + alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport + tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport + sdlSupport usbSupport vkd3dSupport mingwSupport waylandSupport embedInstallers; }; + inherit moltenvk; }); in if wineRelease == "staging" then diff --git a/pkgs/misc/emulators/wine/fonts.nix b/pkgs/applications/emulators/wine/fonts.nix similarity index 100% rename from pkgs/misc/emulators/wine/fonts.nix rename to pkgs/applications/emulators/wine/fonts.nix diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix similarity index 76% rename from pkgs/misc/emulators/wine/packages.nix rename to pkgs/applications/emulators/wine/packages.nix index cb857daef0a6..c119feb783d3 100644 --- a/pkgs/misc/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -1,16 +1,16 @@ -{ stdenv_32bit, lib, pkgs, pkgsi686Linux, pkgsCross, callPackage, +{ stdenv_32bit, lib, pkgs, pkgsi686Linux, pkgsCross, callPackage, moltenvk, wineRelease ? "stable", supportFlags }: let src = lib.getAttr wineRelease (callPackage ./sources.nix {}); - vkd3d = pkgs.callPackage ./vkd3d.nix {}; - vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix {}; + vkd3d = pkgs.callPackage ./vkd3d.nix { inherit moltenvk; }; + vkd3d_i686 = pkgsi686Linux.callPackage ./vkd3d.nix { inherit moltenvk; }; in with src; { wine32 = pkgsi686Linux.callPackage ./base.nix { - name = "wine-${version}"; - inherit src version supportFlags patches; + pname = "wine"; + inherit src version supportFlags patches moltenvk; pkgArches = [ pkgsi686Linux ]; vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d_i686 ]; geckos = [ gecko32 ]; @@ -19,8 +19,8 @@ in with src; { platforms = [ "i686-linux" "x86_64-linux" ]; }; wine64 = callPackage ./base.nix { - name = "wine64-${version}"; - inherit src version supportFlags patches; + pname = "wine64"; + inherit src version supportFlags patches moltenvk; pkgArches = [ pkgs ]; vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d ]; mingwGccs = with pkgsCross; [ mingwW64.buildPackages.gcc ]; @@ -30,8 +30,8 @@ in with src; { platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; wineWow = callPackage ./base.nix { - name = "wine-wow-${version}"; - inherit src version supportFlags patches; + pname = "wine-wow"; + inherit src version supportFlags patches moltenvk; stdenv = stdenv_32bit; pkgArches = [ pkgs pkgsi686Linux ]; vkd3dArches = lib.optionals supportFlags.vkd3dSupport [ vkd3d vkd3d_i686 ]; diff --git a/pkgs/applications/emulators/wine/setup-hook-darwin.sh b/pkgs/applications/emulators/wine/setup-hook-darwin.sh new file mode 100644 index 000000000000..39eee193ded6 --- /dev/null +++ b/pkgs/applications/emulators/wine/setup-hook-darwin.sh @@ -0,0 +1,37 @@ + +fixupCFlagsForDarwin() { + # Because it’s getting called from a Darwin stdenv, MinGW will pick up on Darwin-specific + # flags, and the ./configure tests will fail to consider it a working cross-compiler. + # Strip them out, so Wine can use MinGW to build its DLLs instead of trying to use Clang. + # Ideally, it would be possible to build the DLLs on Windows (i.e., as part of `pkgsCross``), + # but that is not the case currently with Wine’s build system. + cflagsFilter='s|-F[^ ]*||g;s|-iframework [^ ]*||g;s|-isystem [^ ]*||g;s| *| |g' + + # libiconv and libintl aren’t needed by Wine, and having them causes linking to fail. + # The `CoreFoundation` reference is added by `linkSystemCoreFoundationFramework` in the + # Apple SDK’s setup hook. Remove that because MingW will fail due to file not found. + ldFlagsFilter='s|-lintl||g;s|-liconv||g;s|/nix/store/[^-]*-apple-framework-CoreFoundation[^ ]*||g' + + # `cc-wrapper.sh`` supports getting flags from a system-specific salt. While it is currently a + # tuple, that’s not considered a stable interface, so the Wine derivation will provide them: + # - for Darwin: The source is `stdenv.cc.suffixSalt`; and + # - for MinGW: The source is the `suffixSalt`` attribute of each of the `mingwGccs`. + export NIX_CFLAGS_COMPILE_@darwinSuffixSalt@=${NIX_CFLAGS_COMPILE-} + export NIX_LDFLAGS_@darwinSuffixSalt@=${NIX_LDFLAGS-} + for mingwSalt in @mingwGccsSuffixSalts@; do + echo removing @darwinSuffixSalt@-specific flags from NIX_CFLAGS_COMPILE for $mingwSalt + export NIX_CFLAGS_COMPILE_$mingwSalt+="$(sed "$cflagsFilter" <<< "$NIX_CFLAGS_COMPILE")" + echo removing @darwinSuffixSalt@-specific flags from NIX_LDFLAGS for $mingwSalt + export NIX_LDFLAGS_$mingwSalt+="$(sed "$ldFlagsFilter;$cflagsFilter" <<< "$NIX_LDFLAGS")" + done + + # Make sure the global flags aren’t accidentally influencing the platform-specific flags. + export NIX_CFLAGS_COMPILE="" + export NIX_LDFLAGS="" +} + +# This is pretty hacky, but this hook _must_ run after `linkSystemCoreFoundationFramework`. +function runFixupCFlagsForDarwinLast() { + preConfigureHooks+=(fixupCFlagsForDarwin) +} +postUnpackHooks+=(runFixupCFlagsForDarwinLast) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix similarity index 81% rename from pkgs/misc/emulators/wine/sources.nix rename to pkgs/applications/emulators/wine/sources.nix index 2c74975fae24..23538a237e4a 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -44,12 +44,24 @@ in rec { ]; }; - unstable = stable; + unstable = fetchurl rec { + # NOTE: Don't forget to change the SHA256 for staging as well. + version = "7.4"; + url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; + sha256 = "sha256-co6GbW5JzpKioMUUMz6f8Ivb9shvXvTmGAFDuNK31BY="; + inherit (stable) gecko32 gecko64 patches; + + mono = fetchurl rec { + version = "7.1.1"; + url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; + sha256 = "sha256-ncjlYDt7xkNU65SuTqD2ghQkdno/9E/w0Z40akkMEeo="; + }; + }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-2gBfsutKG0ok2ISnnAUhJit7H2TLPDpuP5gvfMVE44o="; + sha256 = "0vlj3b8bnidyhlgkjrnlbah3878zjy3s557vbp16qka42zjaa51q"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/applications/emulators/wine/staging.nix similarity index 100% rename from pkgs/misc/emulators/wine/staging.nix rename to pkgs/applications/emulators/wine/staging.nix diff --git a/pkgs/misc/emulators/wine/util.nix b/pkgs/applications/emulators/wine/util.nix similarity index 100% rename from pkgs/misc/emulators/wine/util.nix rename to pkgs/applications/emulators/wine/util.nix diff --git a/pkgs/misc/emulators/wine/vkd3d.nix b/pkgs/applications/emulators/wine/vkd3d.nix similarity index 54% rename from pkgs/misc/emulators/wine/vkd3d.nix rename to pkgs/applications/emulators/wine/vkd3d.nix index 303d33df217d..4f06b886e231 100644 --- a/pkgs/misc/emulators/wine/vkd3d.nix +++ b/pkgs/applications/emulators/wine/vkd3d.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchurl, vulkan-headers, spirv-headers, vulkan-loader }: +{ lib, stdenv, fetchurl, moltenvk, vulkan-headers, spirv-headers, vulkan-loader, flex, bison }: -#TODO: MoltenVK #TODO: unstable stdenv.mkDerivation rec { pname = "vkd3d"; - version = "1.2"; + version = "1.3"; src = fetchurl { url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"; - sha256 = "0szr1lw3xbgi9qjm13d1q4gyzzwv8i5wfxiwjg6dmwphrc7h6jxh"; + sha256 = "134b347806d34a4d2b39ea29ff1c2b38443793803a3adc50800855bb929fb8b2"; }; - buildInputs = [ vulkan-headers spirv-headers vulkan-loader ]; + nativeBuildInputs = [ flex bison ]; + + buildInputs = [ vulkan-headers spirv-headers ] + ++ [ (if stdenv.isDarwin then moltenvk else vulkan-loader) ]; enableParallelBuilding = true; @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { description = "A 3d library build on top on Vulkan with a similar api to DirectX 12"; homepage = "https://source.winehq.org/git/vkd3d.git"; license = licenses.lgpl21; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.marius851000 ]; }; } diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/applications/emulators/wine/winetricks.nix similarity index 100% rename from pkgs/misc/emulators/wine/winetricks.nix rename to pkgs/applications/emulators/wine/winetricks.nix diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/applications/emulators/xcpc/default.nix similarity index 100% rename from pkgs/misc/emulators/xcpc/default.nix rename to pkgs/applications/emulators/xcpc/default.nix diff --git a/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch b/pkgs/applications/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch similarity index 100% rename from pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch rename to pkgs/applications/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/applications/emulators/yabause/default.nix similarity index 100% rename from pkgs/misc/emulators/yabause/default.nix rename to pkgs/applications/emulators/yabause/default.nix diff --git a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch b/pkgs/applications/emulators/yabause/linkage-rwx-linux-elf.patch similarity index 100% rename from pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch rename to pkgs/applications/emulators/yabause/linkage-rwx-linux-elf.patch diff --git a/pkgs/misc/emulators/yapesdl/default.nix b/pkgs/applications/emulators/yapesdl/default.nix similarity index 100% rename from pkgs/misc/emulators/yapesdl/default.nix rename to pkgs/applications/emulators/yapesdl/default.nix diff --git a/pkgs/misc/emulators/yuzu/base.nix b/pkgs/applications/emulators/yuzu/base.nix similarity index 97% rename from pkgs/misc/emulators/yuzu/base.nix rename to pkgs/applications/emulators/yuzu/base.nix index 4bee17c6954e..aff09134fae9 100644 --- a/pkgs/misc/emulators/yuzu/base.nix +++ b/pkgs/applications/emulators/yuzu/base.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { # Icons cc-by-nd-30 cc0 ]; - maintainers = with maintainers; [ ivar joshuafern ]; + maintainers = with maintainers; [ ivar joshuafern sbruder ]; platforms = platforms.linux; broken = stdenv.isAarch64; # Currently aarch64 is not supported. }; diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix similarity index 76% rename from pkgs/misc/emulators/yuzu/default.nix rename to pkgs/applications/emulators/yuzu/default.nix index 108da20f4a23..f212abb448a6 100644 --- a/pkgs/misc/emulators/yuzu/default.nix +++ b/pkgs/applications/emulators/yuzu/default.nix @@ -4,25 +4,25 @@ let in { mainline = libsForQt5.callPackage ./base.nix rec { pname = "yuzu-mainline"; - version = "882"; + version = "953"; branchName = branch; src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${version}"; - sha256 = "17j845laxnaq50icwl32yisdivwcnwa59fxdr297yxrz4hmfzhxq"; + sha256 = "0p07gybyhr6flzmhz92qlrwcq7l37c2wmcxw8sbrvhj2pgaaw9ic"; fetchSubmodules = true; }; }; early-access = libsForQt5.callPackage ./base.nix rec { pname = "yuzu-ea"; - version = "2156"; + version = "2557"; branchName = branch; src = fetchFromGitHub { owner = "pineappleEA"; repo = "pineapple-src"; rev = "EA-${version}"; - sha256 = "1x8x808x3i8jr9zghx01vakb6q6hkwnarawr9arxvqnd9x79j8ga"; + sha256 = "013xxgyn8y5fv0xbrm0zfl9xmi0gx4hpflrbjskg1hcvb2bjqyvj"; }; }; }.${branch} diff --git a/pkgs/misc/emulators/zesarux/default.nix b/pkgs/applications/emulators/zesarux/default.nix similarity index 100% rename from pkgs/misc/emulators/zesarux/default.nix rename to pkgs/applications/emulators/zesarux/default.nix diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix similarity index 98% rename from pkgs/misc/emulators/zsnes/default.nix rename to pkgs/applications/emulators/zsnes/default.nix index ba2f5d6bdc1c..a14109bc8572 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/applications/emulators/zsnes/default.nix @@ -9,7 +9,7 @@ let comment = "A SNES emulator"; desktopName = "zsnes"; genericName = "zsnes"; - categories = "Game;"; + categories = [ "Game" ]; }; in stdenv.mkDerivation { diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/applications/finance/irpf/default.nix new file mode 100644 index 000000000000..e7ac78da18ef --- /dev/null +++ b/pkgs/applications/finance/irpf/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenvNoCC +, fetchzip +, copyDesktopItems +, jdk11 +, makeDesktopItem +, makeWrapper +, unzip +}: + +stdenvNoCC.mkDerivation rec { + pname = "irpf"; + version = "2022-1.0"; + + src = let + year = lib.head (lib.splitVersion version); + in fetchzip { + url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip"; + sha256 = "0h8f51ilvg7m6hlx0y5mpxhac90p32ksbrffw0hxdqbilgjz1s68"; + }; + + nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem rec { + name = pname; + exec = pname; + icon = "rfb64"; + desktopName = "Imposto de Renda Pessoa Física"; + comment = "Programa Oficial da Receita para elaboração do IRPF"; + categories = [ "Office" ]; + }) + ]; + + installPhase = '' + runHook preInstall + + BASEDIR="$out/share/${pname}" + mkdir -p "$BASEDIR" + + cp -r help lib lib-modulos "$BASEDIR" + + install -Dm755 irpf.jar "$BASEDIR/${pname}.jar" + install -Dm644 Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR" + + makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ + --add-flags "-Dawt.useSystemAAFontSettings=on" \ + --add-flags "-Dswing.aatext=true" \ + --add-flags "-jar $BASEDIR/${pname}.jar" \ + --set _JAVA_AWT_WM_NONREPARENTING 1 \ + --set AWT_TOOLKIT MToolkit + + mkdir -p $out/share/pixmaps + unzip -j lib/ppgd-icones-4.0.jar icones/rfb64.png -d $out/share/pixmaps + + runHook postInstall + ''; + + meta = with lib; { + description = "Programa Oficial da Receita para elaboração do IRPF"; + homepage = "https://www.gov.br/receitafederal/pt-br"; + license = licenses.unfree; + platforms = platforms.all; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index c2f201774fea..66b1bb0f97fe 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -5,16 +5,21 @@ , python3Packages , nodePackages , wkhtmltopdf +, callPackage }: with python3Packages; +let + werkzeug = python3Packages.callPackage ../../../development/python-modules/werkzeug/1.nix {}; +in + buildPythonApplication rec { pname = "odoo"; major = "15"; minor = "0"; - patch = "20211029"; + patch = "20220126"; version = "${major}.${minor}.${patch}"; @@ -22,7 +27,7 @@ buildPythonApplication rec { src = fetchurl { url = "https://nightly.odoo.com/${major}.${minor}/nightly/src/odoo_${version}.tar.gz"; name = "${pname}-${version}"; - sha256 = "sha256-/E+bLBbiz7fRyTwP+0AMpqbuRkOpE4B4P6kREIB4m1Q="; + hash = "sha256-mofV0mNCdyzJecp0XegZBR/5NzHjis9kbpsUA/KJbZg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/applications/gis/gmt/dcw.nix index 627ca8088957..a31932dd2760 100644 --- a/pkgs/applications/gis/gmt/dcw.nix +++ b/pkgs/applications/gis/gmt/dcw.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "dcw-gmt"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz"; - sha256 = "sha256-KzAPAco1DbF6rdAmCuM7823GthvkFQ5mgpAzzsPWXDw="; + sha256 = "sha256-6BBWfNR01a+dhHUZOKy0R6hhI5HtZhkNYNeJl0ofnik="; }; installPhase = '' diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index a894d121bd3d..0420619e8779 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { pname = "gmt"; - version = "6.2.0"; + version = "6.3.0"; src = fetchurl { url = "https://github.com/GenericMappingTools/gmt/releases/download/${version}/gmt-${version}-src.tar.gz"; - sha256 = "sha256-q3BikSrurRAhdw+tR1bgqZhg/ejqm0KPsAwi+hWju/w="; + sha256 = "sha256-LNBz2LHxG4elmziqeq+OOceUDStVpGoyZ+I4AuyKCNE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 09c1fddbda21..36664a2d49cd 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,24 +1,29 @@ { lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw -, cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas -, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid +, cairo, readline, ffmpeg, makeWrapper, wxGTK30, wxmac, netcdf, blas +, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python3Packages, libLAS, proj-datumgrid +, zstd, pdal, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "grass"; - version = "7.6.1"; + pname = "grass"; + version = "7.8.6"; src = with lib; fetchFromGitHub { owner = "OSGeo"; repo = "grass"; - rev = "${name}_${replaceStrings ["."] ["_"] version}"; - sha256 = "1amjk9rz7vw5ha7nyl5j2bfwj5if9w62nlwx5qbp1x7spldimlll"; + rev = version; + sha256 = "sha256-zvZqFWuxNyA+hu+NMiRbQVdzzrQPsZrdGdfVB17+SbM="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj - readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas - libLAS proj-datumgrid ] - ++ (with python2Packages; [ python python-dateutil wxPython30 numpy ]); + buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite + readline ffmpeg makeWrapper netcdf geos postgresql libmysqlclient blas + libLAS proj-datumgrid zstd wrapGAppsHook ] + ++ lib.optionals stdenv.isLinux [ cairo pdal wxGTK30 ] + ++ lib.optional stdenv.isDarwin wxmac + ++ (with python3Packages; [ python python-dateutil numpy ] + ++ lib.optional stdenv.isDarwin wxPython_4_0 + ++ lib.optional stdenv.isLinux wxPython_4_1); # On Darwin the installer tries to symlink the help files into a system # directory @@ -32,7 +37,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-proj-share=${proj}/share/proj" "--with-proj-includes=${proj.dev}/include" - "--with-proj-lib=${proj}/lib" + "--with-proj-libs=${proj}/lib" "--without-opengl" "--with-readline" "--with-wxwidgets" @@ -46,6 +51,15 @@ stdenv.mkDerivation rec { "--with-mysql-libs=${libmysqlclient}/lib/mysql" "--with-blas" "--with-liblas=${libLAS}/bin/liblas-config" + "--with-zstd" + "--with-fftw" + "--with-pthread" + ] ++ lib.optionals stdenv.isLinux [ + "--with-pdal" + ] ++ lib.optionals stdenv.isDarwin [ + "--without-cairo" + "--without-freetype" + "--without-x" ]; # Otherwise a very confusing "Can't load GDAL library" error @@ -62,6 +76,7 @@ stdenv.mkDerivation rec { scripts/g.extension.all/g.extension.all.py \ scripts/r.drain/r.drain.py \ scripts/r.pack/r.pack.py \ + scripts/r.import/r.import.py \ scripts/r.tileset/r.tileset.py \ scripts/r.unpack/r.unpack.py \ scripts/v.clip/v.clip.py \ @@ -79,18 +94,17 @@ stdenv.mkDerivation rec { temporal/t.rast.algebra/t.rast.algebra.py \ temporal/t.rast3d.algebra/t.rast3d.algebra.py \ temporal/t.vect.algebra/t.vect.algebra.py \ + temporal/t.downgrade/t.downgrade.py \ temporal/t.select/t.select.py for d in gui lib scripts temporal tools; do patchShebangs $d done ''; - NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"; - postInstall = '' - wrapProgram $out/bin/grass76 \ + wrapProgram $out/bin/grass78 \ --set PYTHONPATH $PYTHONPATH \ - --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \ + --set GRASS_PYTHON ${python3Packages.python.interpreter} \ --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' ln -s $out/grass*/lib $out/lib ln -s $out/grass*/include $out/include diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index f272fd04dd0d..b3220f8d7081 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,17 +1,21 @@ { lib, makeWrapper, symlinkJoin -, qgis-unwrapped, extraPythonPackages ? (ps: [ ]) +, extraPythonPackages ? (ps: [ ]) +, libsForQt5 }: with lib; -symlinkJoin rec { +let + qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix { }; +in symlinkJoin rec { + inherit (qgis-unwrapped) version; name = "qgis-${version}"; paths = [ qgis-unwrapped ]; - nativeBuildInputs = [ makeWrapper qgis-unwrapped.python3Packages.wrapPython ]; + nativeBuildInputs = [ makeWrapper qgis-unwrapped.py.pkgs.wrapPython ]; # extend to add to the python environment of QGIS without rebuilding QGIS application. - pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.python3Packages); + pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.py.pkgs); postBuild = '' # unpackPhase @@ -23,5 +27,7 @@ symlinkJoin rec { --set PYTHONPATH $program_PYTHONPATH ''; + passthru.unwrapped = qgis-unwrapped; + meta = qgis-unwrapped.meta; } diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix new file mode 100644 index 000000000000..5db9a26ae758 --- /dev/null +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -0,0 +1,32 @@ +{ lib, makeWrapper, symlinkJoin +, extraPythonPackages ? (ps: [ ]) +, libsForQt5 +}: +with lib; +let + qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix { }; +in symlinkJoin rec { + + inherit (qgis-ltr-unwrapped) version; + name = "qgis-${version}"; + + paths = [ qgis-ltr-unwrapped ]; + + nativeBuildInputs = [ makeWrapper qgis-ltr-unwrapped.py.pkgs.wrapPython ]; + + # extend to add to the python environment of QGIS without rebuilding QGIS application. + pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs); + + postBuild = '' + + buildPythonPath "$pythonInputs" + + wrapProgram $out/bin/qgis \ + --prefix PATH : $program_PATH \ + --set PYTHONPATH $program_PYTHONPATH + ''; + + passthru.unwrapped = qgis-ltr-unwrapped; + + inherit (qgis-ltr-unwrapped) meta; +} diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix new file mode 100644 index 000000000000..5a4f059e91ef --- /dev/null +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -0,0 +1,153 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, ninja +, flex +, bison +, proj +, geos +, xlibsWrapper +, sqlite +, gsl +, qwt +, fcgi +, python3 +, libspatialindex +, libspatialite +, postgresql +, txt2tags +, openssl +, libzip +, hdf5 +, netcdf +, exiv2 +, protobuf +, qtbase +, qtsensors +, qca-qt5 +, qtkeychain +, qt3d +, qscintilla +, qtserialport +, qtxmlpatterns +, withGrass ? true +, grass +, withWebKit ? true +, qtwebkit +, pdal +, zstd +, makeWrapper +}: + +let + + py = python3.override { + packageOverrides = self: super: { + pyqt5 = super.pyqt5.override { + withLocation = true; + }; + }; + }; + + pythonBuildInputs = with py.pkgs; [ + qscintilla-qt5 + gdal + jinja2 + numpy + psycopg2 + chardet + python-dateutil + pyyaml + pytz + requests + urllib3 + pygments + pyqt5 + sip_4 + owslib + six + ]; +in mkDerivation rec { + version = "3.22.5"; + pname = "qgis-ltr-unwrapped"; + + src = fetchFromGitHub { + owner = "qgis"; + repo = "QGIS"; + rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "sha256-G7ckAj0vb6030L2gL11+e5pp0OK1NxwECQ295B9sI4o="; + }; + + passthru = { + inherit pythonBuildInputs; + inherit py; + }; + + buildInputs = [ + openssl + proj + geos + xlibsWrapper + sqlite + gsl + qwt + exiv2 + protobuf + fcgi + libspatialindex + libspatialite + postgresql + txt2tags + libzip + hdf5 + netcdf + qtbase + qtsensors + qca-qt5 + qtkeychain + qscintilla + qtserialport + qtxmlpatterns + qt3d + pdal + zstd + ] ++ lib.optional withGrass grass + ++ lib.optional withWebKit qtwebkit + ++ pythonBuildInputs; + + nativeBuildInputs = [ makeWrapper cmake flex bison ninja ]; + + # Force this pyqt_sip_dir variable to point to the sip dir in PyQt5 + # + # TODO: Correct PyQt5 to provide the expected directory and fix + # build to use PYQT5_SIP_DIR consistently. + postPatch = '' + substituteInPlace cmake/FindPyQt5.py \ + --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"' + ''; + + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + "-DWITH_3D=True" + "-DWITH_PDAL=TRUE" + "-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" + "-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" + ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" + ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + + postFixup = lib.optionalString withGrass '' + # grass has to be availble on the command line even though we baked in + # the path at build time using GRASS_PREFIX + wrapProgram $out/bin/qgis \ + --prefix PATH : ${lib.makeBinPath [ grass ]} + ''; + + meta = { + description = "A Free and Open Source Geographic Information System"; + homepage = "https://www.qgis.org"; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ lsix sikmir erictapen willcohen ]; + }; +} diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 14bafb6c51bc..ca73dcdbfaaf 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -12,7 +12,7 @@ , gsl , qwt , fcgi -, python3Packages +, python3 , libspatialindex , libspatialite , postgresql @@ -27,6 +27,7 @@ , qtsensors , qca-qt5 , qtkeychain +, qt3d , qscintilla , qtserialport , qtxmlpatterns @@ -34,10 +35,22 @@ , grass , withWebKit ? true , qtwebkit +, pdal +, zstd +, makeWrapper }: let - pythonBuildInputs = with python3Packages; [ + + py = python3.override { + packageOverrides = self: super: { + pyqt5 = super.pyqt5.override { + withLocation = true; + }; + }; + }; + + pythonBuildInputs = with py.pkgs; [ qscintilla-qt5 gdal jinja2 @@ -56,19 +69,19 @@ let six ]; in mkDerivation rec { - version = "3.16.14"; + version = "3.24.1"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-3FUGSBdlhJhhpTPtYuzKOznsC7PJV3kRL9Il2Yryi1Q="; + sha256 = "sha256-3dAwFR7L6NNDkDqNg9MzOJOGh1CDEJfckwo72dQECDg="; }; passthru = { inherit pythonBuildInputs; - inherit python3Packages; + inherit py; }; buildInputs = [ @@ -96,11 +109,14 @@ in mkDerivation rec { qscintilla qtserialport qtxmlpatterns + qt3d + pdal + zstd ] ++ lib.optional withGrass grass ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; - nativeBuildInputs = [ cmake flex bison ninja ]; + nativeBuildInputs = [ makeWrapper cmake flex bison ninja ]; # Force this pyqt_sip_dir variable to point to the sip dir in PyQt5 # @@ -108,21 +124,30 @@ in mkDerivation rec { # build to use PYQT5_SIP_DIR consistently. postPatch = '' substituteInPlace cmake/FindPyQt5.py \ - --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings"' + --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"' ''; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" - "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" - "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" + "-DWITH_3D=True" + "-DWITH_PDAL=TRUE" + "-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" + "-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" - ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; + ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + + postFixup = lib.optionalString withGrass '' + # grass has to be availble on the command line even though we baked in + # the path at build time using GRASS_PREFIX + wrapProgram $out/bin/qgis \ + --prefix PATH : ${lib.makeBinPath [ grass ]} + ''; meta = { description = "A Free and Open Source Geographic Information System"; homepage = "https://www.qgis.org"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ lsix sikmir erictapen ]; + maintainers = with lib.maintainers; [ lsix sikmir erictapen willcohen ]; }; } diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 3b215ea24fc7..7a8cae9bf81a 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,9 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libtool -, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre -, lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libtool +, bzip2 +, zlib +, libX11 +, libXext +, libXt +, fontconfig +, freetype +, ghostscript +, libjpeg +, djvulibre +, lcms2 +, openexr +, libjxl +, libpng +, liblqr1 +, libraw +, librsvg +, libtiff +, libxml2 +, openjpeg +, libwebp +, libheif +, potrace +, curl , ApplicationServices , Foundation -, testVersion, imagemagick +, testVersion +, imagemagick }: let @@ -11,20 +38,20 @@ let if stdenv.hostPlatform.system == "i686-linux" then "i686" else if stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin" then "x86-64" else if stdenv.hostPlatform.system == "armv7l-linux" then "armv7l" - else if stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin" then "aarch64" + else if stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin" then "aarch64" else if stdenv.hostPlatform.system == "powerpc64le-linux" then "ppc64le" else null; in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-20"; + version = "7.1.0-26"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "0r8zmk2cfmf09l94hqzfz4aspnzn178ggdbgm7w4hr0p864cbvc3"; + hash = "sha256-q1CL64cfyb5fN9aVYJfls+v0XRFd4jH+B8n+UJqPE1I="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -41,18 +68,30 @@ stdenv.mkDerivation rec { # let's disable it for now to unbreak the imagemagick build. ++ lib.optional (libjxl != null && !stdenv.isAarch64) "--with-jxl" ++ lib.optionals (ghostscript != null) - [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" + [ + "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" "--with-gslib" ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM - ; + ; nativeBuildInputs = [ pkg-config libtool ]; buildInputs = - [ zlib fontconfig freetype ghostscript - liblqr1 libpng libraw libtiff libxml2 libheif djvulibre + [ + zlib + fontconfig + freetype + ghostscript + potrace + liblqr1 + libpng + libraw + libtiff + libxml2 + libheif + djvulibre ] # libjxl is broken on aarch64 (see meta.broken in libjxl) for now, # let's disable it for now to unbreak the imagemagick build. @@ -66,10 +105,10 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = - [ bzip2 freetype libjpeg lcms2 ] + [ bzip2 freetype libjpeg lcms2 curl ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ libX11 libXext libXt libwebp ] - ; + ; postInstall = '' (cd "$dev/include" && ln -s ImageMagick* ImageMagick) diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 8b482626c91a..0b70d67b2719 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -48,13 +48,9 @@ in genericName = "CAD Application"; exec = "antimony %f"; icon = "antimony"; - terminal = "false"; - categories = "Graphics;Science;Engineering"; - mimeType = "application/x-extension-sb;application/x-antimony;"; - extraEntries = '' - StartupWMClass=antimony - Version=1.0 - ''; + categories = [ "Graphics" "Science" "Engineering" ]; + mimeTypes = [ "application/x-extension-sb" "application/x-antimony" ]; + startupWMClass = "antimony"; }) ]; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index fede2c9bb51a..4d2db993b8d1 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.15.5"; + version = "4.15.6"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "sha256-vPS2hTaWjundVjtguy/1eH1qBaipN2Ij8PQODka+IGg="; + sha256 = "sha256-vNQT4jyMIIAk1pV3Hrp40nawFutWCv7xtwg2gU6ejy0="; }; libPath = lib.makeLibraryPath (with xorg; [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { icon = "avocode"; desktopName = "Avocode"; genericName = "Design Inspector"; - categories = "Development;"; + categories = [ "Development" ]; comment = "The bridge between designers and developers"; }; diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index 74dc55fc5e13..0e61da0041b6 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -1,31 +1,40 @@ -{ lib, stdenv, fetchFromGitHub -, libX11, libXext, libXi +{ lib, stdenv, fetchFromGitLab +, desktop-file-utils, shared-mime-info +, libiconv +, libX11, libXcursor, libXext, libXi , freetype, fontconfig -, libpng, libjpeg +, libjpeg, libpng, libtiff, libwebp , zlib }: stdenv.mkDerivation rec { pname = "azpainter"; - version = "2.1.6"; + version = "3.0.4"; - src = fetchFromGitHub { - owner = "Symbian9"; + src = fetchFromGitLab { + owner = "azelpg"; repo = pname; rev = "v${version}"; - sha256 = "0i5g67s4ysnvbaxmi7dhan0hfcfk8an14xykkafl47pqfx33npva"; + hash = "sha256-2gTTF1ti9bO24d75mhwyvJISSgMKdmp+oJVmgzEQHdY="; }; - buildInputs = [ - libX11 libXext libXi - freetype fontconfig - libpng libjpeg - zlib + nativeBuildInputs = [ + desktop-file-utils # for update-desktop-database + shared-mime-info # for update-mime-info ]; + buildInputs = [ + libX11 libXcursor libXext libXi + freetype fontconfig + libjpeg libpng libtiff libwebp + zlib + ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + + enableParallelBuilding = true; + meta = with lib; { description = "Full color painting software for illustration drawing"; - homepage = "https://osdn.net/projects/azpainter"; + homepage = "http://azsky2.html.xdomain.jp/soft/azpainter.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dtzWill ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index d62addea4fea..e950d5e36f5c 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -52,17 +52,16 @@ , libaom , portmidi , fetchpatch -, lua5_4 -, ... +, lua }: stdenv.mkDerivation rec { - version = "3.8.0"; + version = "3.8.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "01gp9dg5wr2rg1k8cqs0l3s7ism8a4q8qypgwccd4jh7ip3wfr9f"; + sha256 = "1xmyn9haagizh8qqg91bm1lx3dq1v8failxj943mipnvaj80dvl1"; }; nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; @@ -104,7 +103,7 @@ stdenv.mkDerivation rec { libheif libaom portmidi - lua5_4 + lua ] ++ lib.optionals stdenv.isLinux [ colord colord-gtk @@ -120,15 +119,6 @@ stdenv.mkDerivation rec { "-DUSE_KWALLET=OFF" ]; - patches = [ - (fetchpatch { - # This is merged in darktable master and will hopefully be in 3.8.1 - name = "cmake-fix.patch"; - url = "https://github.com/darktable-org/darktable/commit/58d247f7ebea76c55fa2525beb9f5ce092c6670d.patch"; - sha256 = "11fn6d2mwlapbf1zbyv6bhgv29kxcwrs7cnbway0rnl9nj8wimf2"; - }) - ]; - # darktable changed its rpath handling in commit # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/applications/graphics/deskew/default.nix index 66309ebf7acf..c19b5de2b69c 100644 --- a/pkgs/applications/graphics/deskew/default.nix +++ b/pkgs/applications/graphics/deskew/default.nix @@ -3,33 +3,35 @@ stdenv.mkDerivation rec { pname = "deskew"; - version = "1.25"; + version = "1.30"; src = fetchFromGitHub { owner = "galfar"; repo = pname; rev = "v${version}"; - sha256 = "0zjjj66qhgqkmfxl3q7p78dv4xl4ci918pgl4d5259pqdj1bfgc8"; + hash = "sha256-xghVOEMkQ/mXpOzJqMaT3SII7xneMNoFqRlqjtzmDnA="; }; nativeBuildInputs = [ fpc ]; buildInputs = [ libtiff ]; buildPhase = '' - rm -r Bin # Remove pre-compiled binary - mkdir Bin - chmod +x compile.sh - ./compile.sh + runHook preBuild + patchShebangs ./Scripts + pushd Scripts && ./compile.sh && popd + runHook postBuild ''; installPhase = '' - install -Dt $out/bin Bin/* + runHook preInstall + install -Dt $out/bin Bin/deskew + runHook postInstall ''; meta = with lib; { description = "A command line tool for deskewing scanned text documents"; - homepage = "https://bitbucket.org/galfar/app-deskew/overview"; - license = licenses.mit; + homepage = "https://galfar.vevb.net/deskew"; + license = with licenses; [ mit mpl11 ]; maintainers = with maintainers; [ryantm]; platforms = platforms.all; }; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 54efd0bf1369..e53030428e61 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "16.4.0"; + version = "17.2.4"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "624f776478b6960adb1be565077f79aed72c95de5e995fc1216b78978c9c6857"; + sha256 = "sha256-dKl7DxNneoQEL+QhZmpfQCd15RoeDRnkZt3sv8t2KM4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix index 4c47283c42ac..be8e00b5154a 100644 --- a/pkgs/applications/graphics/evilpixie/default.nix +++ b/pkgs/applications/graphics/evilpixie/default.nix @@ -16,8 +16,8 @@ let exec = "evilpixie %F"; icon = "evilpixie"; genericName = "Image Editor"; - categories = "Graphics;2DGraphics;RasterGraphics;"; - mimeType = "image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/x-pcx;image/x-targa;image/x-tga;"; + categories = [ "Graphics" "2DGraphics" "RasterGraphics" ]; + mimeTypes = [ "image/bmp" "image/gif" "image/jpeg" "image/jpg" "image/png" "image/x-pcx" "image/x-targa" "image/x-tga" ]; }; in mkDerivation rec { @@ -49,9 +49,9 @@ in mkDerivation rec { meta = with lib; { description = "Pixel-oriented paint program, modelled on Deluxe Paint"; - homepage = "http://evilpixie.scumways.com/"; + homepage = "https://github.com/bcampbell/evilpixie"; # http://evilpixie.scumways.com/ is gone downloadPage = "https://github.com/bcampbell/evilpixie/releases"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 899495db9317..9c75742d52ba 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -3,8 +3,6 @@ , curl, libexif, jpegexiforient, perl , enableAutoreload ? !stdenv.hostPlatform.isDarwin }: -with lib; - stdenv.mkDerivation rec { pname = "feh"; version = "3.8"; @@ -22,22 +20,24 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" "exif=1" - ] ++ optional stdenv.isDarwin "verscmp=0" - ++ optional enableAutoreload "inotify=1"; + ] ++ lib.optional stdenv.isDarwin "verscmp=0" + ++ lib.optional enableAutoreload "inotify=1"; installTargets = [ "install" ]; postInstall = '' - wrapProgram "$out/bin/feh" --prefix PATH : "${makeBinPath [ libjpeg jpegexiforient ]}" \ + wrapProgram "$out/bin/feh" --prefix PATH : "${lib.makeBinPath [ libjpeg jpegexiforient ]}" \ --add-flags '--theme=feh' ''; checkInputs = lib.singleton (perl.withPackages (p: [ p.TestCommand ])); doCheck = true; - meta = { + meta = with lib; { description = "A light-weight image viewer"; homepage = "https://feh.finalrewind.org/"; - license = licenses.mit; + # 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 ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index 8fa85803bfd8..984d67f6ba7b 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { GSEXE="${ghostscript}/bin/gs"; + configureFlags = [ "--enable-transfig" ]; + postInstall = '' wrapProgram $out/bin/fig2ps2tex \ --set PATH ${lib.makeBinPath [ coreutils bc gnugrep gawk ]} @@ -36,7 +38,7 @@ stdenv.mkDerivation rec { description = "Tool to convert Xfig files to other formats"; homepage = "http://mcj.sourceforge.net/"; license = licenses.xfig; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ lesuisse ]; }; } diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix index 18fdc2c55ac1..77ffc4b44c86 100644 --- a/pkgs/applications/graphics/fiji/default.nix +++ b/pkgs/applications/graphics/fiji/default.nix @@ -26,20 +26,15 @@ stdenv.mkDerivation rec { (makeDesktopItem { name = "fiji"; exec = "fiji %F"; + tryExec = "fiji"; icon = "fiji"; - mimeType = "image/*;"; + mimeTypes = [ "image/*" ]; comment = "Scientific Image Analysis"; desktopName = "Fiji Is Just ImageJ"; genericName = "Fiji Is Just ImageJ"; - categories = "Education;Science;ImageProcessing;"; - terminal = false; + categories = [ "Education" "Science" "ImageProcessing" ]; startupNotify = true; - extraEntries = '' - Version=1.0 - TryExec=fiji - X-GNOME-FullName=Fiji Is Just ImageJ - StartupWMClass=fiji-Main - ''; + startupWMClass = "fiji-Main"; }) ]; diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index cd4972de4550..39fb78b317f1 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { pname = "foxotron"; - version = "2021-08-13"; + version = "2022-03-06"; src = fetchFromGitHub { owner = "Gargaj"; repo = "Foxotron"; rev = version; fetchSubmodules = true; - sha256 = "sha256-0cnLHTZMeh8ilP0iXaMpFgKQAkizy/FimxXFDbH0b2w="; + sha256 = "sha256-w66wi+aMwQa9akfNA/1cS6UmDXPWC4OPK9BIa9Kt47A="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 4ed4d257ba52..037cf7c8ed62 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , wrapGAppsHook, fetchpatch, bash, doxygen +, nix-update-script }: stdenv.mkDerivation rec { pname = "geeqie"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - sha256 = "sha256-0E1TeAhkiK+hFJ4oMoeZLvfRehTzdGF3AtEVwf/MaF8="; + sha256 = "sha256-Abr7trlms6bxOAqE6xNKRv51TBGNilNdBhUZUg7OTKY="; }; patches = [ @@ -47,6 +48,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "Lightweight GTK based image viewer"; diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 9a91e5f8c6e9..55c95c95cf73 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -180,5 +180,6 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ jtojnar ]; license = licenses.gpl3Plus; platforms = platforms.unix; + mainProgram = "gimp"; }; } diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 679e9136c44a..353990ca3a95 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -26,4 +26,6 @@ in symlinkJoin { ln -sf "$each-${versionBranch}" $out/bin/$each done ''; + + inherit (gimp) meta; } diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index c2ce2840379c..fdf6831b974e 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create labels and business cards"; - homepage = "https://glabels.org/"; + homepage = "https://github.com/jimevins/glabels"; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.unix; maintainers = [ maintainers.nico202 ]; diff --git a/pkgs/applications/graphics/glimpse/default.nix b/pkgs/applications/graphics/glimpse/default.nix index 01271f53b572..09e58fccf9d1 100644 --- a/pkgs/applications/graphics/glimpse/default.nix +++ b/pkgs/applications/graphics/glimpse/default.nix @@ -195,5 +195,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ashkitten erictapen ]; license = licenses.gpl3Plus; platforms = platforms.unix; + mainProgram = "glimpse"; }; } diff --git a/pkgs/applications/graphics/glimpse/wrapper.nix b/pkgs/applications/graphics/glimpse/wrapper.nix index 361b2ba38b6e..63697a9bb66b 100644 --- a/pkgs/applications/graphics/glimpse/wrapper.nix +++ b/pkgs/applications/graphics/glimpse/wrapper.nix @@ -27,4 +27,6 @@ symlinkJoin { ln -sf "$each-${versionBranch}" $out/bin/$each done ''; + + inherit (glimpse) meta; } diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix new file mode 100644 index 000000000000..8cb4208e2672 --- /dev/null +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchFromGitLab + +, gettext +, meson +, ninja +, pkg-config +, python3 +, rustPlatform +, wrapGAppsHook + +, appstream-glib +, desktop-file-utils +, glib +, gtk4 +, libadwaita +}: + +stdenv.mkDerivation rec { + pname = "gnome-obfuscate"; + version = "0.0.4"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Obfuscate"; + rev = version; + sha256 = "sha256-P8Y2Eizn1BMZXuFjGMXF/3oAUzI8ZNTrnbLyU+V6uk4="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "sha256-5MzWz5NH2sViIfaP8xOQLreEal5TYkji11VaUgieT3U="; + }; + + nativeBuildInputs = [ + gettext + glib + meson + ninja + pkg-config + python3 + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + wrapGAppsHook + ]; + + buildInputs = [ + appstream-glib + desktop-file-utils + glib + gtk4 + libadwaita + ]; + + postPatch = '' + patchShebangs build-aux/meson_post_install.py + ''; + + meta = with lib; { + description = "Censor private information"; + homepage = "https://gitlab.gnome.org/World/obfuscate"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 9dc318a0674c..774e377ca031 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "40.0"; + version = "42.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1bzi79plw6ji6qlckhxnwfnswy6jpnhzmmyanml2i2xg73hp6bg0"; + sha256 = "JcsoFCUZnex7BF8T8y+PlgNMsMuLlNlvnf+vT1vmhVE="; }; patches = [ diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index edafa5612a2d..ae1e64297bd5 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple and fast image viewer for X"; homepage = "http://lxde.sourceforge.net/gpicview/"; - repositories.git = "git://lxde.git.sourceforge.net/gitroot/lxde/gpicview"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index fe387ddc273b..f92f3686611f 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,6 +1,9 @@ { lib, stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 -, libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences }: +, libwebp, quantumdepth ? 8, fixDarwinDylibNames, nukeReferences +, runCommand +, graphicsmagick # for passthru.tests +}: stdenv.mkDerivation rec { pname = "graphicsmagick"; @@ -33,13 +36,23 @@ stdenv.mkDerivation rec { # Remove CFLAGS from the binaries to avoid closure bloat. # In the past we have had -dev packages in the closure of the binaries soley due to the string references. postConfigure = '' - nuke-refs ./magick/magick_config.h + nuke-refs -e $out ./magick/magick_config.h ''; postInstall = '' sed -i 's/-ltiff.*'\'/\'/ $out/bin/* ''; + passthru = { + tests = { + issue-157920 = runCommand "issue-157920-regression-test" { + buildInputs = [ graphicsmagick ]; + } '' + gm convert ${graphviz}/share/graphviz/doc/pdf/neatoguide.pdf jpg:$out + ''; + }; + }; + meta = { homepage = "http://www.graphicsmagick.org"; description = "Swiss army knife of image processing"; diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index e9c624d3c965..9d8ae0c8d35f 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.12.4"; + version = "2.12.5"; src = fetchurl { - url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-UrBt0QkSk7IP4mZYFoxFNJQ1Qmcb53CemvlYfsxjZ/s="; + url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz"; + sha256 = "sha256-MFWW9DTJ/svtgN3fbw+zeGpgg3pgIoC9jZ1HkG5p6sc="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index d412c6fded87..e680554a711e 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.12.0"; + version = "3.12.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Pe/8AwOE5ktXNhxDfHm0ga4Uie9EyHroVugbsQ2OOD8="; + sha256 = "sha256-ZDBmOgAHBpbGgeXru4AQc/1GpG1oEsKeL5pPgRr6Gfw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/hdrmerge/default.nix b/pkgs/applications/graphics/hdrmerge/default.nix new file mode 100644 index 000000000000..b0e346331bce --- /dev/null +++ b/pkgs/applications/graphics/hdrmerge/default.nix @@ -0,0 +1,76 @@ +{ lib +, mkDerivation +, fetchpatch +, fetchFromGitHub +, cmake +, extra-cmake-modules +, qtbase +, wrapQtAppsHook +, libraw +, exiv2 +, zlib +, alglib +, pkg-config +, makeDesktopItem +, copyDesktopItems +}: + +mkDerivation rec { + pname = "hdrmerge"; + version = "unstable-2020-11-12"; + src = fetchFromGitHub { + owner = "jcelaya"; + repo = "hdrmerge"; + rev = "f5a2538cffe3e27bd9bea5d6a199fa211d05e6da"; + sha256 = "1bzf9wawbdvdbv57hnrmh0gpjfi5hamgf2nwh2yzd4sh1ssfa8jz"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + copyDesktopItems + ]; + + buildInputs = [ qtbase libraw exiv2 zlib alglib ]; + + cmakeFlags = [ + "-DALGLIB_DIR:PATH=${alglib}" + ]; + + patches = [ + (fetchpatch { + # patch FindAlglib.cmake to respect ALGLIB_DIR + # see https://github.com/jcelaya/hdrmerge/pull/213 + name = "patch-hdrmerge-CMake.patch"; + url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch"; + sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi"; + }) + ]; + + desktopItems = [ + (makeDesktopItem { + name = "HDRMerge"; + genericName = "HDR raw image merge"; + desktopName = "HDRMerge"; + comment = meta.description; + icon = "hdrmerge"; + exec = "hdrmerge %F"; + categories = [ "Graphics" ]; + mimeTypes = [ "image/x-dcraw" "image/x-adobe-dng" ]; + terminal = false; + }) + ]; + + postInstall = '' + install -Dm444 ../data/images/icon.png $out/share/icons/hicolor/128x128/apps/hdrmerge.png + ''; + + meta = with lib; { + homepage = "https://github.com/jcelaya/hdrmerge"; + description = "Combines two or more raw images into an HDR"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.paperdigits ]; + }; +} diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index ec2ac709f868..3e68a4b9467d 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -5,7 +5,6 @@ , gnumake , makeWrapper , pkg-config -, fetchpatch , autopanosiftc , boost , cairo @@ -37,21 +36,13 @@ stdenv.mkDerivation rec { pname = "hugin"; - version = "2019.0.0"; + version = "2021.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; - sha256 = "1l925qslp98gg7yzmgps10h6dq0nb60wbfk345anlxsv0g2ifizr"; + sha256 = "sha256-BHrqin+keESzTvJ8GdO2l+hJOdyx/bvrLCBGIbZu6tk="; }; - patches = [ - # Fixes build with exiv2 0.27.1 - (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/0467d8ba362b9c196e4c1dc4be7de0c1b336335b/hugin/trunk/hugin-exiv2-0.27.1.patch"; - sha256 = "1yxvlpvrhyrfd2w6kwx1w3mncsvlzdhp0w7xchy8q6kc2kd5nf7r"; - }) - ]; - buildInputs = [ boost cairo diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 08293f748de7..1d0cf4bec7d0 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,22 +10,24 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "470b"; + version = "478"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "0v52krjcqykrm3zqj6idzvbpjv4fhbgvq2jr8k0g63f7db7p08h9"; + sha256 = "sha256-ZsQzKc2fOFTzI/kBS8ws2+XT9kRAn4L55n1EZgVy4Kk="; }; nativeBuildInputs = [ wrapQtAppsHook + python3Packages.mkdocs-material ]; propagatedBuildInputs = with python3Packages; [ beautifulsoup4 + cbor2 chardet cloudscraper html5lib @@ -85,6 +87,7 @@ python3Packages.buildPythonPackage rec { # Move the hydrus module and related directories mkdir -p $out/${python3Packages.python.sitePackages} mv {hydrus,static} $out/${python3Packages.python.sitePackages} + mkdocs build -d help mv help $out/doc/ # install the hydrus binaries diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix index 276ccb512746..4dd97d92217d 100644 --- a/pkgs/applications/graphics/icon-library/default.nix +++ b/pkgs/applications/graphics/icon-library/default.nix @@ -1,25 +1,21 @@ { lib, stdenv, fetchurl, wrapGAppsHook -, cargo, desktop-file-utils, meson, ninja, pkg-config, python3, rustc -, dbus, gdk-pixbuf, glib, gtk3, gtksourceview4, libhandy +, cargo, desktop-file-utils, meson, ninja, pkg-config, rustc +, gdk-pixbuf, glib, gtk4, gtksourceview5, libadwaita }: stdenv.mkDerivation rec { pname = "icon-library"; - version = "0.0.8"; + version = "0.0.11"; src = fetchurl { - url = "https://gitlab.gnome.org/World/design/icon-library/uploads/fdf890706e0eef2458a5285e3bf65dd5/icon-library-${version}.tar.xz"; - sha256 = "0807b56bgm8j1gpq4nf8x31gq9wqhcmpzpkqw6s4wissw3cb7q96"; + url = "https://gitlab.gnome.org/World/design/icon-library/uploads/93d183b17d216bbed7b03b2f3698059c/icon-library-${version}.tar.xz"; + sha256 = "1zrcnc5dn5fgcl3vklfpbp3m0qzi2n2viw59vw5fhwkysvp670y7"; }; nativeBuildInputs = [ - cargo desktop-file-utils meson ninja pkg-config python3 rustc wrapGAppsHook + cargo desktop-file-utils meson ninja pkg-config rustc wrapGAppsHook ]; - buildInputs = [ dbus gdk-pixbuf glib gtk3 gtksourceview4 libhandy ]; - - postPatch = '' - patchShebangs build-aux/meson_post_install.py - ''; + buildInputs = [ gdk-pixbuf glib gtk4 gtksourceview5 libadwaita ]; meta = with lib; { homepage = "https://gitlab.gnome.org/World/design/icon-library"; diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 4af139b08443..f21f658ace30 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { name = "ImageJ"; desktopName = "ImageJ"; icon = "imagej"; - categories = "Science;Utility;Graphics;"; + categories = [ "Science" "Utility" "Graphics" ]; exec = "imagej"; }) ]; diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index d3640a656f13..110a7e513e32 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -9,20 +9,27 @@ stdenv.mkDerivation { }; buildInputs = [ libX11 imlib2 libXinerama ]; + buildPhase = '' - gcc -g imlibsetroot.c -o imlibsetroot \ - `imlib2-config --cflags` `imlib2-config --libs` \ - -I/include/X11/extensions -lXinerama -lX11 + runHook preBuild + + gcc -g imlibsetroot.c -o imlibsetroot \ + -I${imlib2.dev}/include -L${imlib2}/lib -lImlib2 \ + -I${libX11.dev}/include -lXinerama -lX11 + + runHook postBuild ''; + installPhase = '' - mkdir -p $out/bin - install -m 755 imlibsetroot $out/bin + runHook preInstall + install -D -m 0755 imlibsetroot -t $out/bin + runHook postInstall ''; meta = with lib; { description = "A Xinerama Aware Background Changer"; homepage = "http://robotmonkeys.net/2010/03/30/imlibsetroot/"; - license = licenses.gpl2; + license = licenses.mitAdvertising; platforms = platforms.linux; maintainers = with maintainers; [ dwarfmaster ]; }; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 24f3a555fd5a..0958676cc99b 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -52,11 +52,11 @@ let in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz"; - sha256 = "sha256-rsoLnTO1sc+pqnBDO97mqMPQIP+vwubwyaYO7Xp5eK8="; + sha256 = "sha256-P/5UoG0LJaTNi260JFNu8e0gW+E0Q6Oc1DfIx7ibltE="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -73,27 +73,11 @@ stdenv.mkDerivation rec { python3 = "${python3Env}/bin/python"; }) - # Fix parsing paths by Python extensions. - # https://gitlab.com/inkscape/extensions/-/merge_requests/342 + # Fix build with poppler 22.03 + # https://gitlab.com/inkscape/inkscape/-/merge_requests/4187 (fetchpatch { - url = "https://gitlab.com/inkscape/extensions/-/commit/a82c382c610d37837c8f3f5b13224bab8fd3667e.patch"; - sha256 = "YWrgjCnQ9q6BUsxSLQojIXnDzPxM/SgrIfj1gxQ/JKM="; - stripLen = 1; - extraPrefix = "share/extensions/"; - }) - # Remove mandatory break from end of paragraphs, added in Pango 1.49 - # https://gitlab.com/inkscape/inkscape/-/merge_requests/3630 - # TODO: Remove in Inkscape 1.1.2 - (fetchpatch { - url = "https://gitlab.com/inkscape/inkscape/-/commit/b3dabef2245d4e4e977ee9d6776be9a134493515.patch"; - sha256 = "YhqUlRBKL1vJ/iCM/DvdwbmPIsAHQpcgf4TPpjlnBng="; - }) - # Fix build against gcc-12 - # https://gitlab.com/inkscape/inkscape/-/merge_requests/3683 - (fetchpatch { - name = "gcc-12.patch"; - url = "https://gitlab.com/inkscape/inkscape/-/commit/3825abc637ac2d3bc6ff997503b0631ac14e16b5.patch"; - sha256 = "sha256-VzKrWCkcVA1Co/xBTyh28Zhm2zFE/2jfZ3LveK0raO4="; + url = "https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch"; + sha256 = "UZb8ZTtfA5667uo5ZlVQ5vPowiSgd4ItAJ9U1BOsRQg="; }) ]; diff --git a/pkgs/applications/graphics/inkscape/extensions.nix b/pkgs/applications/graphics/inkscape/extensions.nix index 63010a19f14d..08260c968cfb 100644 --- a/pkgs/applications/graphics/inkscape/extensions.nix +++ b/pkgs/applications/graphics/inkscape/extensions.nix @@ -9,8 +9,8 @@ applytransforms = callPackage ./extensions/applytransforms { }; hexmap = stdenv.mkDerivation { - name = "hexmap"; - version = "2020-06-06"; + pname = "hexmap"; + version = "unstable-2020-06-06"; src = fetchFromGitHub { owner = "lifelike"; diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index c454ed0422d1..d4d00ad9c6ff 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -60,12 +60,10 @@ mkDerivation rec { comment = "A drawing editor for creating figures in PDF format"; exec = "ipe"; icon = "ipe"; - mimeType = "text/xml;application/pdf"; - categories = "Graphics;Qt;"; - extraDesktopEntries = { - StartupWMClass = "ipe"; - StartupNotify = "true"; - }; + mimeTypes = [ "text/xml" "application/pdf" ]; + categories = [ "Graphics" "Qt" ]; + startupNotify = true; + startupWMClass = "ipe"; }) ]; diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 4dc5506aed65..05a99527e5f7 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "1.0.06"; + version = "1.1.03"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-2Wlyt9Xw/FNaFkN1Q6utXdGzp42piebESQARhfpvRhM="; + sha256 = "sha256-X7hAkzVqIABpyFokiYaMGZqSda69cKhKghFDWDEVOow="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix index a113136c248a..8dc057a17c5b 100644 --- a/pkgs/applications/graphics/mandelbulber/default.nix +++ b/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.26"; + version = "2.27"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "sha256-RKpg7LBsrBFOlFozoDcALwGeZ9whPiCpFMZF5ljsp7Q="; + sha256 = "sha256-CNIt+DC3ZYyT8EY1t641y7jW7vn7Rr1PLOsy9bjKaDk="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ mkDerivation rec { description = "A 3D fractal rendering engine"; longDescription = "Mandelbulber creatively generates three-dimensional fractals. Explore trigonometric, hyper-complex, Mandelbox, IFS, and many other 3D fractals."; homepage = "https://mandelbulber.com"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ kovirobi ]; }; diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index afaa681437cc..296c9d206548 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "menyoki"; - version = "1.5.5"; + version = "1.6.0"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wEPt96z/odQ05hosN+GB5KLsCu8onR9WWamofJayhwU="; + sha256 = "sha256-7dqV18+Q0M1PrSXfMro5bUqSeA72Stj5JfP4MsTlrjM="; }; - cargoSha256 = "sha256-nwxBreouL3Z47zHSH+Y/ej7KU2/bXyMQ+Tb7R4U+yKk="; + cargoSha256 = "sha256-c3VpHr/X2tKh7mY4dOQac0lS7oem0GGqjzv7feNwc24="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux pkg-config; diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index dcdfd364b5a8..dccfad949633 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -22,13 +22,13 @@ mkDerivation rec { pname = "meshlab"; - version = "2021.10"; + version = "2022.02"; src = fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "meshlab"; rev = "Meshlab-${version}"; - sha256 = "14rrd8qrf91k89y6w2mn1r9zcfnwd0mir6g4dlgvr04i77hj4lk4"; + sha256 = "sha256-MP+jkiV6yS1T1eWClxM56kZWLXwu0g4w/zBHy6CSL6Y="; fetchSubmodules = true; # for vcglib }; diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 3565173285b4..0acc873b3968 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -4,14 +4,12 @@ }: stdenv.mkDerivation rec { - p_name = "mtPaint"; - ver_maj = "3.50"; - ver_min = "01"; - name = "${p_name}-${ver_maj}.${ver_min}"; + pname = "mtPaint"; + version = "3.50.01"; src = fetchFromGitHub { owner = "wjaguar"; - repo = p_name; + repo = "mtPaint"; rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f"; sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y"; }; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 9f3c1e453f8d..29b049ac55be 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -66,7 +66,6 @@ mkDerivation rec { description = "Qt-based image viewer"; maintainers = with lib.maintainers; [ mindavi ]; license = licenses.gpl3Plus; - repositories.git = "https://github.com/nomacs/nomacs.git"; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/graphics/nsxiv/default.nix b/pkgs/applications/graphics/nsxiv/default.nix new file mode 100644 index 000000000000..c1ebbd57c0d6 --- /dev/null +++ b/pkgs/applications/graphics/nsxiv/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, giflib +, imlib2 +, libXft +, libexif +, libwebp +, conf ? null +}: + +stdenv.mkDerivation rec { + pname = "nsxiv"; + version = "29"; + + src = fetchFromGitHub { + owner = "nsxiv"; + repo = pname; + rev = "v${version}"; + hash = "sha256-JUF2cF6QeAXk6G76uMu3reaMgxp2RcqHDbamkNufwqE="; + }; + + buildInputs = [ + giflib + imlib2 + libXft + libexif + libwebp + ]; + + preBuild = lib.optionalString (conf!=null) '' + cp ${(builtins.toFile "config.def.h" conf)} config.def.h + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + homepage = "https://nsxiv.github.io/nsxiv/"; + description = "New Suckless X Image Viewer"; + longDescription = '' + nsxiv is a fork of now unmaintained sxiv with the purpose of being a + drop-in replacement of sxiv, maintaining it and adding simple, sensible + features, like: + + - Basic image operations, e.g. zooming, panning, rotating + - Customizable key and mouse button mappings (in config.h) + - Script-ability via key-handler + - Thumbnail mode: grid of selectable previews of all images + - Ability to cache thumbnails for fast re-loading + - Basic support for animated/multi-frame images (GIF/WebP) + - Display image information in status bar + - Display image name/path in X title + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index b30dbab1570a..084787d6315b 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, qmake +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, copyDesktopItems, makeDesktopItem, qmake , qtbase, qtxmlpatterns, qttools, qtwebkit, libGL, fontconfig, openssl, poppler , ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg , libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }: @@ -32,6 +32,15 @@ in mkDerivation rec { sha256 = "sha256-OlGXGIMghil/GG6eso20+CWo/hCjarXGs6edXX9pc/M="; }; + patches = [ + # Poppler requires at least C++17 + (fetchpatch { + name = "use-c-17-for-pdf-on-linux-builds"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/use-c-17-for-pdf-on-linux-builds.patch?h=openboard"; + sha256 = "sha256-M6HigpOo8ul7qaub4cd7/ATUc85HezEyKyDuzsrZvC8="; + }) + ]; + postPatch = '' substituteInPlace OpenBoard.pro \ --replace '/usr/include/quazip' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ @@ -79,8 +88,8 @@ in mkDerivation rec { icon = "OpenBoard"; comment = "OpenBoard, an interactive white board application"; desktopName = "OpenBoard"; - mimeType = "application/ubz"; - categories = "Education;"; + mimeTypes = [ "application/ubz" ]; + categories = [ "Education" ]; startupNotify = true; }) ]; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index be079b6bdb20..413e16718216 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -57,8 +57,7 @@ mkDerivation rec { "SPNAV_LIBPATH=${libspnav}/lib" ]; - # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory - enableParallelBuilding = false; # true by default due to qmake + enableParallelBuilding = true; postInstall = lib.optionalString stdenv.isDarwin '' mkdir $out/Applications diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 1a761de6ec08..cd16fe1de089 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ }: let - version = "5.9.1"; + version = "5.10.0"; docFiles = [ (fetchurl { @@ -35,7 +35,7 @@ in mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - sha256 = "0pzic95br0vr785jnpxqmfxcljw3wk7bhm2xy0jfmwm1dh2b7xac"; + sha256 = "0ipx6zq44hpic7gvv0s2jvjncak6vlmrz5sp9ypc15b15bna0gs2"; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index f2ffa143aebb..4952ecf84f23 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-CFKo8YEAXAniX+jL2A0naJUOn3KAWwcrPsabdiZevhI="; }; - vendorSha256 = "sha256-p/2Bu5h2P3ebgvSC12jdR2Zpd27xCFwtB/KZV0AULAM="; + vendorSha256 = "sha256-3y42rbhurGhCI9PuSayxmLem0tv/nTjBwYxF3Dk6/yM="; # No tests doCheck = false; diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index ed2aae72d47a..b598c53b8947 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -63,6 +63,10 @@ buildDotnetModule rec { # Rename the binary mv "$out/bin/Pinta" "$out/bin/pinta" + # Copy runtime icons + mkdir -p $out/share/icons/hicolor/16x16/ + cp -r Pinta.Resources/icons/hicolor/16x16/* $out/share/icons/hicolor/16x16/ + # Install dotnet build installer/linux/install.proj \ -target:Install \ diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix new file mode 100644 index 000000000000..8e864b640968 --- /dev/null +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -0,0 +1,132 @@ +{ stdenv, lib, requireFile, wrapQtAppsHook, autoPatchelfHook, makeWrapper, unixtools, fakeroot +, mailcap, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig +, dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim +# Qt 5 subpackages +, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qtwebkit, qt3d, mlt +}: + +stdenv.mkDerivation rec { + pname = "pixinsight"; + version = "1.8.9"; + + src = requireFile rec { + name = "PI-linux-x64-${version}-20220313-c.tar.xz"; + url = "https://pixinsight.com/"; + sha256 = "sha256-LvrTB8fofuysxR3OoZ2fkkOQU62yUAu8ePOczJG2uqU="; + message = '' + PixInsight is available from ${url} and requires a commercial (or trial) license. + After a license has been obtained, PixInsight can be downloaded from the software distribution + (choose Linux 64bit). + The PixInsight tarball must be added to the nix-store, i.e. via + nix-prefetch-url --type sha256 file:///path/to/${name} + ''; + }; + sourceRoot = "."; + + nativeBuildInputs = [ + unixtools.script + fakeroot + wrapQtAppsHook + autoPatchelfHook + mailcap + libudev0-shim + ]; + + buildInputs = [ + stdenv.cc.cc.lib + stdenv.cc + libGL + libpulseaudio + alsa-lib + nss + gd + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + nspr + expat + fontconfig + dbus + glib + zlib + openssl + libdrm + wayland + cups + avahi-compat + # Qt stuff + qt3d + mlt + qtbase + qtgamepad + qtserialport + qtserialbus + qtvirtualkeyboard + qtmultimedia + qtwebkit + ] ++ (with xorg; [ + libX11 + libXdamage + xrandr + libXtst + libXcomposite + libXext + libXfixes + libXrandr + ]); + + postPatch = '' + patchelf ./installer \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.cc.cc.lib}/lib + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin $out/opt/PixInsight $out/share/{applications,mime/packages,icons/hicolor} + + fakeroot script -ec "./installer \ + --yes \ + --install-dir=$out/opt/PixInsight \ + --install-desktop-dir=$out/share/applications \ + --install-mime-dir=$out/share/mime \ + --install-icons-dir=$out/share/icons/hicolor \ + --no-bin-launcher \ + --no-remove" + + rm -rf $out/opt/PixInsight-old-0 + ln -s $out/opt/PixInsight/bin/PixInsight $out/bin/. + ''; + + # Some very exotic Qt libraries are not available in nixpkgs + autoPatchelfIgnoreMissingDeps = true; + + # This mimics what is happening in PixInsight.sh and adds on top the libudev0-shim, which + # without PixInsight crashes at startup. + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${libudev0-shim}/lib" + "--set LC_ALL en_US.utf8" + "--set AVAHI_COMPAT_NOWARN 1" + "--set QT_PLUGIN_PATH $out/opt/PixInsight/bin/lib/qt-plugins" + "--set QT_QPA_PLATFORM_PLUGIN_PATH $out/opt/PixInsight/bin/lib/qt-plugins/platforms" + "--set QT_AUTO_SCREEN_SCALE_FACTOR 0" + "--set QT_ENABLE_HIGHDPI_SCALING 0" + "--set QT_SCALE_FACTOR 1" + "--set QT_LOGGING_RULES '*=false'" + "--set QTWEBENGINEPROCESS_PATH $out/opt/PixInsight/bin/libexec/QtWebEngineProcess" + ]; + dontWrapQtApps = true; + postFixup = '' + wrapProgram $out/opt/PixInsight/bin/PixInsight ${builtins.toString qtWrapperArgs} + ''; + + meta = with lib; { + description = "Scientific image processing program for astrophotography"; + homepage = "https://pixinsight.com/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.sheepforce ]; + mainProgram = "PixInsight"; + }; +} diff --git a/pkgs/applications/graphics/qiv/default.upstream b/pkgs/applications/graphics/qiv/default.upstream deleted file mode 100644 index e6c7ef2408e8..000000000000 --- a/pkgs/applications/graphics/qiv/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url http://spiegl.de/qiv/download/ -version_link '[.]tgz$' -do_overwrite() { do_overwrite_just_version; } diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 30731afebfe7..e44c49ac6bb8 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -32,13 +32,13 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.17"; + version = "1.18"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "sha256-Zr7Av49mK48B4N+Ca2vPIgKuVNP4YLVEs4EQepukSs8="; + sha256 = "sha256-nwERwdNQYY1Fd7llwZHrJBzWDJNdsySRQ3ZvXZjB7YY="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix new file mode 100644 index 000000000000..624959ffa9ee --- /dev/null +++ b/pkgs/applications/graphics/rnote/default.nix @@ -0,0 +1,76 @@ +{ lib +, stdenv +, fetchFromGitHub +, desktop-file-utils +, gio-sharp +, glib +, gstreamer +, gtk4 +, libadwaita +, libxml2 +, meson +, ninja +, pkg-config +, poppler +, python3 +, rustPlatform +, shared-mime-info +, wrapGAppsHook4 +}: + +stdenv.mkDerivation rec { + pname = "rnote"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "flxzt"; + repo = "rnote"; + rev = "v${version}"; + sha256 = "5g5SQJc5aopYxtHNP5T85TtcazovrveUCnMhJ90p2t4="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-vnLesWXdqNzlWNQsUVy03kfmcDNazQ1BbizQDoG1kgM="; + }; + + nativeBuildInputs = [ + desktop-file-utils # For update-desktop-database + meson + ninja + pkg-config + python3 # For the postinstall script + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + shared-mime-info # For update-mime-database + wrapGAppsHook4 + ]; + + buildInputs = [ + gio-sharp + glib + gstreamer + gtk4 + libadwaita + libxml2 + poppler + ]; + + postPatch = '' + pushd build-aux + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + popd + ''; + + meta = with lib; { + homepage = "https://github.com/flxzt/rnote"; + description = "Simple drawing application to create handwritten notes"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dotlambda yrd ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index 9771384a5d1a..9f76a0dd0b7d 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -5,21 +5,22 @@ let ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ ${file} ''; + system = stdenv.hostPlatform.system; in stdenv.mkDerivation rec { pname = "brscan5"; - version = "1.2.7-0"; + version = "1.2.9-0"; src = { "i686-linux" = fetchurl { url = "https://download.brother.com/welcome/dlf104034/${pname}-${version}.i386.deb"; - sha256 = "647d06f629c22408d25be7c0bf49a4b1c7280bf78a27aa2cde6c3e3fa8b6807a"; + sha256 = "ac23c9a435818955e7882ab06380adf346203ff4e45f384b40e84b8b29642f07"; }; "x86_64-linux" = fetchurl { url = "https://download.brother.com/welcome/dlf104033/${pname}-${version}.amd64.deb"; - sha256 = "867bd88ab0d90f8e9391dc8127385095127e533cb6bd2d5d13449df602b165ae"; + sha256 = "4ec23ff4b457323ae778e871a0f1abcc1848ea105af17850b57f7dcaddcfd96d"; }; - }."${stdenv.hostPlatform.system}"; + }."${system}" or (throw "Unsupported system: ${system}"); unpackPhase = '' ar x $src @@ -30,21 +31,28 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 avahi-compat stdenv.cc.cc glib ]; dontBuild = true; - postPatch = '' - ${myPatchElf "opt/brother/scanner/brscan5/brsaneconfig5"} - ${myPatchElf "opt/brother/scanner/brscan5/brscan_cnetconfig"} - ${myPatchElf "opt/brother/scanner/brscan5/brscan_gnetconfig"} + postPatch = + let + patchOffsetBytes = + if system == "x86_64-linux" then 84632 + else if system == "i686-linux" then 77396 + else throw "Unsupported system: ${system}"; + in + '' + ${myPatchElf "opt/brother/scanner/brscan5/brsaneconfig5"} + ${myPatchElf "opt/brother/scanner/brscan5/brscan_cnetconfig"} + ${myPatchElf "opt/brother/scanner/brscan5/brscan_gnetconfig"} - for a in opt/brother/scanner/brscan5/*.so.* opt/brother/scanner/brscan5/brscan_[cg]netconfig; do - if ! test -L $a; then - patchelf --set-rpath ${lib.makeLibraryPath buildInputs} $a - fi - done + for file in opt/brother/scanner/brscan5/*.so.* opt/brother/scanner/brscan5/brscan_[cg]netconfig; do + if ! test -L $file; then + patchelf --set-rpath ${lib.makeLibraryPath buildInputs} $file + fi + done - # driver is hardcoded to look in /opt/brother/scanner/brscan5/models for model metadata. - # patch it to look in /etc/opt/brother/scanner/models instead, so nixos environment.etc can make it available - printf '/etc/opt/brother/scanner/models\x00' | dd of=opt/brother/scanner/brscan5/libsane-brother5.so.1.0.7 bs=1 seek=84632 conv=notrunc - ''; + # driver is hardcoded to look in /opt/brother/scanner/brscan5/models for model metadata. + # patch it to look in /etc/opt/brother/scanner/models instead, so nixos environment.etc can make it available + printf '/etc/opt/brother/scanner/models\x00' | dd of=opt/brother/scanner/brscan5/libsane-brother5.so.1.0.7 bs=1 seek=${toString patchOffsetBytes} conv=notrunc + ''; installPhase = with lib; '' runHook preInstall diff --git a/pkgs/applications/graphics/skanpage/default.nix b/pkgs/applications/graphics/skanpage/default.nix new file mode 100644 index 000000000000..17a228808972 --- /dev/null +++ b/pkgs/applications/graphics/skanpage/default.nix @@ -0,0 +1,36 @@ +{ lib +, mkDerivation +, fetchurl +, extra-cmake-modules +, kirigami2 +, ktextwidgets +, libksane +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "skanpage"; + version = "1.0.0"; + + src = fetchurl { + url = "mirror://kde/stable/skanpage/${version}/${pname}-${version}.tar.xz"; + hash = "sha256-kPVAG64oPkKF3ztHB4V7M2xc1AcvwiHnYpMMLMQNYGA="; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ + kirigami2 + ktextwidgets + libksane + qtquickcontrols2 + ]; + + meta = with lib; { + description = "KDE utility to scan images and multi-page documents"; + homepage = "https://apps.kde.org/skanpage"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ samuelgrf ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 73c5a038aab6..68744831538c 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,27 +1,77 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, libpng, cairo, freetype -, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xorg, pcre, wrapGAppsHook +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, wrapGAppsHook +, at-spi2-core +, cairo +, dbus +, freetype +, fontconfig +, glew +, gtkmm3 +, json_c +, libdatrie +, libepoxy +, libGLU +, libpng +, libselinux +, libsepol +, libthai +, libxkbcommon +, pangomm +, pcre +, util-linuxMinimal # provides libmount +, xorg +, zlib }: + stdenv.mkDerivation rec { pname = "solvespace"; - version = "v3.0"; + version = "3.0"; + src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "04aympdsjp37vp0p13mb8nwkc080hp9cdrjpyy5m1mhwkm8jm9k9"; + rev = "v${version}"; + hash = "sha256-aaYqUZ0c1lCL91fmxtKFAAE2uUWrjnDB3WdcqdutXhE="; fetchSubmodules = true; }; nativeBuildInputs = [ - pkg-config cmake wrapGAppsHook - ]; - buildInputs = [ - zlib libpng cairo freetype - json_c fontconfig gtkmm3 pangomm glew libGLU - xorg.libpthreadstubs xorg.libXdmcp pcre + cmake + pkg-config + wrapGAppsHook ]; - preConfigure = '' + buildInputs = [ + at-spi2-core + cairo + dbus + freetype + fontconfig + glew + gtkmm3 + json_c + libdatrie + libepoxy + libGLU + libpng + libselinux + libsepol + libthai + libxkbcommon + pangomm + pcre + util-linuxMinimal + xorg.libpthreadstubs + xorg.libXdmcp + xorg.libXtst + zlib + ]; + + postPatch = '' patch CMakeLists.txt <> $out/bin/superposition + chmod +x $out/bin/superposition + wrapProgram $out/lib/unigine/superposition/Superposition \ + --set QT_XKB_CONFIG_ROOT ${xkeyboard_config} \ + --run "cd $out/lib/unigine/superposition/" + ''; + + dontUnpack = true; + dontWrapQtApps = true; + + postPatchMkspecs = '' + cp -f $name/bin/superposition $out/lib/unigine/superposition/bin/superposition + ''; + }; + + desktopItem = makeDesktopItem { + name = "Superposition"; + exec = "Superposition"; + genericName = "A GPU Stress test tool from the UNIGINE"; + icon = "Superposition"; + desktopName = "Superposition Benchmark"; + }; + +in + +# We can patch the "/bin/superposition", but "/bin/launcher" checks it for changes. +# For that we need use a buildFHSUserEnv. + +buildFHSUserEnv { + name = "Superposition"; + + targetPkgs = pkgs: [ + superposition + glib + stdenv.cc.cc + dbus + freetype + fontconfig + zlib + qtquickcontrols2 + libXinerama + libxcb + libSM + libXi + libglvnd + libXext + libXrandr + mailspring + libX11 + libICE + libXrender + openal + ]; + runScript = "superposition"; + + extraInstallCommands = '' + # create directories + mkdir -p $out/share/icons/hicolor $out/share/applications + # create .desktop file + ln -s ${desktopItem}/share/applications/* $out/share/applications + # install Superposition.desktop and icon + cp ${superposition}/lib/unigine/superposition/Superposition.png $out/share/icons/ + for RES in 16 24 32 48 64 128 256; do + mkdir -p $out/share/icons/hicolor/"$RES"x"$RES"/apps + cp ${superposition}/lib/unigine/superposition/icons/superposition_icon_$RES.png $out/share/icons/hicolor/"$RES"x"$RES"/apps/Superposition.png + done + ''; + + meta = { + description = "The Unigine Superposition GPU benchmarking tool"; + homepage = "https://benchmark.unigine.com/superposition"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.BarinovMaxim ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 00b3d80adf04..eb5033a4a97c 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, fetchurl +, writeText , cmake , pkg-config @@ -18,6 +18,7 @@ , libuuid , wayland-protocols , Carbon +, CoreServices # optionals , opencl-headers , OpenCL @@ -26,30 +27,19 @@ , nixosTests }: -# cmake 3.21 inserts invalid `ldd` and `-Wl,--no-as-needed` calls, apparently -# related to -# https://cmake.org/cmake/help/v3.21/prop_tgt/LINK_WHAT_YOU_USE.html -let cmake3_22 = cmake.overrideAttrs (old: { - version = "3.22.0"; - src = fetchurl { - url = "https://cmake.org/files/v3.22/cmake-3.22.0.tar.gz"; - sha256 = "sha256-mYx7o0d40t/bPfimlUaeJLEeK/oh++QbNho/ReHJNF4="; - }; -}); - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.14"; + version = "0.0.18"; src = fetchFromGitHub { owner = "mgerhardy"; - repo = "engine"; + repo = "vengi"; rev = "v${version}"; - sha256 = "sha256-v82hKskTSwM0NDgLVHpHZNRQW6tWug4pPIt91MrUwUo="; + sha256 = "sha256-Ur1X5FhOa87jbjWBXievBfCHW+qP/8bqLiyKAC8+KU4="; }; nativeBuildInputs = [ - cmake3_22 + cmake pkg-config ninja python3 @@ -69,7 +59,7 @@ in stdenv.mkDerivation rec { #libpqxx #mosquitto ] ++ lib.optional stdenv.isLinux wayland-protocols - ++ lib.optionals stdenv.isDarwin [ Carbon OpenCL ] + ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices OpenCL ] ++ lib.optional (!stdenv.isDarwin) opencl-headers; cmakeFlags = [ @@ -82,7 +72,7 @@ in stdenv.mkDerivation rec { "-DGAMES=OFF" "-DMAPVIEW=OFF" "-DAIDEBUG=OFF" - ]; + ] ++ lib.optional stdenv.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; # Set the data directory for each executable. We cannot set it at build time # with the PKGDATADIR cmake variable because each executable needs a specific @@ -98,6 +88,7 @@ in stdenv.mkDerivation rec { passthru.tests = { voxconvert-roundtrip = callPackage ./test-voxconvert-roundtrip.nix {}; + voxconvert-all-formats = callPackage ./test-voxconvert-all-formats.nix {}; run-voxedit = nixosTests.vengi-tools; }; @@ -110,10 +101,12 @@ in stdenv.mkDerivation rec { filemanager and a command line tool to convert between several voxel formats. ''; - homepage = "https://mgerhardy.github.io/engine/"; - downloadPage = "https://github.com/mgerhardy/engine/releases"; + homepage = "https://mgerhardy.github.io/vengi/"; + downloadPage = "https://github.com/mgerhardy/vengi/releases"; license = [ licenses.mit licenses.cc-by-sa-30 ]; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + # Requires SDK 10.14 https://github.com/NixOS/nixpkgs/issues/101229 + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix b/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix new file mode 100644 index 000000000000..00cdf8ae6f07 --- /dev/null +++ b/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix @@ -0,0 +1,15 @@ +{ stdenv +, vengi-tools +}: + +stdenv.mkDerivation { + name = "vengi-tools-test-voxconvert-all-formats"; + meta.timeout = 10; + buildCommand = '' + mkdir $out + for format in vox qef qbt qb vxm vxr binvox gox cub vxl csv; do + echo Testing $format export + ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools}/share/vengi-voxedit/chr_knight.qb --output $out/chr_knight.$format + done + ''; +} diff --git a/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix b/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix index 27b0305615a8..3d324d2c38d4 100644 --- a/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix +++ b/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix @@ -6,9 +6,9 @@ stdenv.mkDerivation { name = "vengi-tools-test-voxconvert-roundtrip"; meta.timeout = 10; buildCommand = '' - ${vengi-tools}/bin/vengi-voxconvert ${vengi-tools}/share/vengi-voxedit/chr_knight.qb chr_knight.vox - ${vengi-tools}/bin/vengi-voxconvert chr_knight.vox chr_knight.qb - ${vengi-tools}/bin/vengi-voxconvert chr_knight.qb chr_knight1.vox + ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools}/share/vengi-voxedit/chr_knight.qb --output chr_knight.vox + ${vengi-tools}/bin/vengi-voxconvert --input chr_knight.vox --output chr_knight.qb + ${vengi-tools}/bin/vengi-voxconvert --input chr_knight.qb --output chr_knight1.vox diff chr_knight.vox chr_knight1.vox touch $out ''; diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 092366652d4f..7965f8241253 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -1,64 +1,80 @@ { lib -, dbus , stdenv +, rustPlatform +, fetchFromGitHub +, dbus +, ffmpeg +, x264 +, libva , gst_all_1 , xorg , libdrm -, libva -, fetchzip -, copyDesktopItems -, fontconfig -, libpng -, pipewire -, makeWrapper -, autoPatchelfHook +, pkg-config +, pango +, cmake +, autoconf +, libtool +, nodePackages +, ApplicationServices +, Carbon +, Cocoa +, VideoToolbox }: -stdenv.mkDerivation rec { +rustPlatform.buildRustPackage rec { pname = "weylus"; version = "0.11.4"; - src = fetchzip { - url = "https://github.com/H-M-H/Weylus/releases/download/v${version}/linux.zip"; - sha256 = "sha256-EW3TdI4F4d4X/BeSqI05QtS77ym1U5jdswFfNtSFyFk="; - stripRoot = false; + src = fetchFromGitHub { + owner = "H-M-H"; + repo = pname; + rev = "v${version}"; + sha256 = "0gq2czxvahww97j4i3k18np29zl6wx85f8253wn3ibqrpfnklz6l"; }; - installPhase = '' - runHook preInstall - - install -Dm755 ./weylus $out/bin/weylus - copyDesktopItems ./weylus.desktop - - runHook postInstall - ''; - buildInputs = [ - libpng + ffmpeg + x264 + ] ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + Carbon + Cocoa + VideoToolbox + ] ++ lib.optionals stdenv.isLinux [ dbus - libdrm - fontconfig libva gst_all_1.gst-plugins-base - pipewire - # autoPatchelfHook complains if these are missing, even on wayland + xorg.libXext xorg.libXft xorg.libXinerama xorg.libXcursor + xorg.libXrender + xorg.libXfixes + xorg.libXtst xorg.libXrandr xorg.libXcomposite - xorg.libXtst + xorg.libXi + xorg.libXv + pango + libdrm ]; - nativeBuildInputs = [ copyDesktopItems autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ + cmake + nodePackages.typescript + ] ++ lib.optionals stdenv.isLinux [ + pkg-config + autoconf + libtool + ]; - postFixup = let - GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ - gst_all_1.gst-plugins-base - pipewire - ]; - in '' - wrapProgram $out/bin/weylus --prefix GST_PLUGIN_PATH : ${GST_PLUGIN_PATH} + cargoSha256 = "1pigmch0sy9ipsafd83b8q54xwqjxdaif363n1q8n46arq4v81j0"; + + cargoBuildFlags = [ "--features=ffmpeg-system" ]; + cargoTestFlags = [ "--features=ffmpeg-system" ]; + + postInstall = '' + install -vDm755 weylus.desktop $out/share/applications/weylus.desktop ''; meta = with lib; { @@ -66,6 +82,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/H-M-H/Weylus"; license = with licenses; [ agpl3Only ]; maintainers = with maintainers; [ lom ]; - platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index 65f6c46f7daf..ca8cebb2ec0c 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -7,7 +7,7 @@ let icon = "write_stylus"; desktopName = "Write"; genericName = "Write"; - categories = "Office;Graphics"; + categories = [ "Office" "Graphics" ]; }; in mkDerivation rec { diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index dc98d761bf08..23d56c8ec727 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -3,6 +3,7 @@ , fetchurl , xlibsWrapper , makeWrapper +, imagemagick , libXpm , libXmu , libXi @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "0fndgbm1mkqb1sn2v2kj3nx9mxj70jbp31y2bjvzcmmkry0q3k5j"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ imagemagick makeWrapper ]; buildInputs = [ xlibsWrapper @@ -34,7 +35,8 @@ stdenv.mkDerivation rec { ]; postPatch = '' - sed -i 's:"fig2dev":"${fig2dev}/bin/fig2dev":' src/main.c + substituteInPlace src/main.c --replace '"fig2dev"' '"${fig2dev}/bin/fig2dev"' + substituteInPlace xfig.desktop --replace "/usr/bin/" "$out/bin/" ''; postInstall = '' @@ -43,6 +45,15 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/xfig \ --set XAPPLRESDIR $out/share/X11/app-defaults + + mkdir -p $out/share/icons/hicolor/{16x16,22x22,48x48,64x64}/apps + + for dimension in 16x16 22x22 48x48; do + convert doc/html/images/xfig-logo.png -geometry $dimension\ + $out/share/icons/hicolor/16x16/apps/xfig.png + done + install doc/html/images/xfig-logo.png \ + $out/share/icons/hicolor/64x64/apps/xfig.png ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 7d9ab53bef8b..47a47ae4f25d 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -10,9 +10,9 @@ in stdenv.mkDerivation rec { version = "0.4.8.2016"; - name = "xournal-" + version; + pname = "xournal"; src = fetchurl { - url = "mirror://sourceforge/xournal/${name}.tar.gz"; + url = "mirror://sourceforge/xournal/xournal-${version}.tar.gz"; sha256 = "09i88v3wacmx7f96dmq0l3afpyv95lh6jrx16xzm0jd1szdrhn5j"; }; @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { + lib.optionalString (!isGdkQuartzBackend) " -lX11"; desktopItem = makeDesktopItem { - name = name; + name = "xournal-${version}"; exec = "xournal"; icon = "xournal"; desktopName = "Xournal"; comment = meta.description; - categories = "Office;Graphics;"; - mimeType = "application/pdf;application/x-xoj"; + categories = [ "Office" "Graphics" ]; + mimeTypes = [ "application/pdf" "application/x-xoj" ]; genericName = "PDF Editor"; }; diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 16544c85650a..5fd139b8de4a 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; - rev = version; - sha256 = "sha256-FIIpWgWvq1uo/lIQXpOkUTZ6YJPtOtxKF8VjXSgqrlE="; + rev = "v${version}"; + sha256 = "sha256-AzLkXGcTjtfBaPOZ/Tc+TwL63vm08G2tZw3pGzoo7po="; }; nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; homepage = "https://xournalpp.github.io/"; + changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ andrew-d sikmir ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/xrgears/default.nix b/pkgs/applications/graphics/xrgears/default.nix index 20e01a1701da..ac73412117cf 100644 --- a/pkgs/applications/graphics/xrgears/default.nix +++ b/pkgs/applications/graphics/xrgears/default.nix @@ -9,18 +9,22 @@ , vulkan-headers , vulkan-loader , xxd +, SDL2 +, makeWrapper +, libGL +, glib }: stdenv.mkDerivation rec { pname = "xrgears"; - version = "unstable-2020-04-15"; + version = "unstable-2021-06-19"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "demos/xrgears"; - rev = "d0bee35fbf8f181e8313f1ead13d88c4fb85c154"; - sha256 = "1k0k8dkclyiav99kf0933kyd2ymz3hs1p0ap2wbciq9s62jgz29i"; + rev = "6331b98e065494995c9cc4b48ccdd9d5ccaef461"; + sha256 = "sha256-buw2beTPIWScq+3VQjUyF+uOwS6VF+mnAPHZ2eFGZjc="; }; nativeBuildInputs = [ @@ -29,6 +33,7 @@ stdenv.mkDerivation rec { ninja pkg-config xxd + makeWrapper ]; buildInputs = [ @@ -36,8 +41,14 @@ stdenv.mkDerivation rec { openxr-loader vulkan-headers vulkan-loader + glib ]; + fixupPhase = '' + wrapProgram $out/bin/xrgears \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ SDL2 libGL ]} + ''; + meta = with lib; { homepage = "https://gitlab.freedesktop.org/monado/demos/xrgears"; description = "An OpenXR example using Vulkan for rendering"; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 9bfe71e196e0..d8838587d766 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -186,6 +186,7 @@ let kteatime = callPackage ./kteatime.nix {}; ktimer = callPackage ./ktimer.nix {}; ktnef = callPackage ./ktnef.nix {}; + ktorrent = callPackage ./ktorrent.nix {}; ktouch = callPackage ./ktouch.nix {}; kturtle = callPackage ./kturtle.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; @@ -203,6 +204,7 @@ let libkomparediff2 = callPackage ./libkomparediff2.nix {}; libksane = callPackage ./libksane.nix {}; libksieve = callPackage ./libksieve.nix {}; + libktorrent = callPackage ./libktorrent.nix {}; mailcommon = callPackage ./mailcommon.nix {}; mailimporter = callPackage ./mailimporter.nix {}; marble = callPackage ./marble.nix {}; @@ -216,8 +218,10 @@ let pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; print-manager = callPackage ./print-manager.nix {}; rocs = callPackage ./rocs.nix {}; + skanlite = callPackage ./skanlite.nix {}; spectacle = callPackage ./spectacle.nix {}; yakuake = callPackage ./yakuake.nix {}; + zanshin = callPackage ./zanshin.nix {}; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 3305fd7dd982..72b76131f64a 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.1/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/21.12.2/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index 4a41493a525c..29a3bdc97bb8 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -19,5 +19,12 @@ mkDerivation { kpty syntax-highlighting libmtp libssh openexr openslp phonon qtsvg samba solid gperf ]; + + # org.kde.kmtpd5 DBUS service launches kiod5 binary from kio derivation, not from kio-extras + postInstall = '' + substituteInPlace $out/share/dbus-1/services/org.kde.kmtpd5.service \ + --replace Exec=$out Exec=${kio} + ''; + CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ]; } diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix index f69e705bb2f9..83763ba965af 100644 --- a/pkgs/applications/kde/kitinerary.nix +++ b/pkgs/applications/kde/kitinerary.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, extra-cmake-modules +{ mkDerivation, fetchpatch, lib, extra-cmake-modules , qtdeclarative, ki18n, kmime, kpkpass , poppler, kcontacts, kcalendarcore , shared-mime-info @@ -10,6 +10,15 @@ mkDerivation { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; }; + + patches = [ + # Fix build with poppler 22.03 + (fetchpatch { + url = "https://github.com/KDE/kitinerary/commit/e21d1ffc5fa81a636245f49c97fe7cda63abbb1d.patch"; + sha256 = "1/zgq9QIOCPplqplDqgpoqzuYFf/m1Ixxawe50t2F04="; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info # for update-mime-database diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 098001ef4c23..23cbdf28477d 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, nixosTests, extra-cmake-modules, kdoctools, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, ki18n, kiconthemes, kinit, kio, knotifications, @@ -22,5 +22,7 @@ mkDerivation { kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff ]; + passthru.tests.test = nixosTests.terminal-emulators.konsole; + propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; } diff --git a/pkgs/applications/kde/ktorrent.nix b/pkgs/applications/kde/ktorrent.nix new file mode 100644 index 000000000000..f63865d30303 --- /dev/null +++ b/pkgs/applications/kde/ktorrent.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + karchive, kcmutils, kcrash, kdnssd, ki18n, knotifications, knotifyconfig, + kplotting, kross, libgcrypt, libktorrent, taglib +}: + +mkDerivation { + pname = "ktorrent"; + meta = with lib; { + description = "KDE integrated BtTorrent client"; + homepage = "https://apps.kde.org/ktorrent/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ eelco ]; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + karchive kcmutils kcrash kdnssd ki18n knotifications knotifyconfig kplotting + kross libgcrypt libktorrent taglib + ]; +} diff --git a/pkgs/applications/kde/libktorrent.nix b/pkgs/applications/kde/libktorrent.nix new file mode 100644 index 000000000000..3b4ae5f72f7f --- /dev/null +++ b/pkgs/applications/kde/libktorrent.nix @@ -0,0 +1,22 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + karchive, kcrash, ki18n, kio, libgcrypt, qca-qt5, solid, + boost, gmp +}: + +mkDerivation { + pname = "libktorrent"; + meta = with lib; { + description = "A BitTorrent library used by KTorrent"; + homepage = "https://apps.kde.org/ktorrent/"; + maintainers = with maintainers; [ eelco ]; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ karchive kcrash ki18n kio libgcrypt qca-qt5 solid ]; + propagatedBuildInputs = [ boost gmp ]; + outputs = [ "out" "dev" ]; + + dontWrapQtApps = true; +} diff --git a/pkgs/applications/kde/skanlite.nix b/pkgs/applications/kde/skanlite.nix new file mode 100644 index 000000000000..30ceba645b7e --- /dev/null +++ b/pkgs/applications/kde/skanlite.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kio, libksane +}: + +mkDerivation { + pname = "skanlite"; + meta = with lib; { + description = "KDE simple image scanning application"; + homepage = "https://apps.kde.org/skanlite"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ polendri ]; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kio libksane ]; +} diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 95896626f256..af8e47dd7493 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1843 +4,1843 @@ { akonadi = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-21.12.1.tar.xz"; - sha256 = "1ih83d8rs1frzhx1i2fgd5ndq259xqqp8aylirswpal7wpqk6f6l"; - name = "akonadi-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-21.12.2.tar.xz"; + sha256 = "1i1q8zda3hl564w02478wyqv35wj8npkqayy7b13shkq9b9j3nj8"; + name = "akonadi-21.12.2.tar.xz"; }; }; akonadi-calendar = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-calendar-21.12.1.tar.xz"; - sha256 = "0371mda45nh49l9mmwz64s6qh1yv36khnvll2g2krj8955y7jhz7"; - name = "akonadi-calendar-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-calendar-21.12.2.tar.xz"; + sha256 = "001ndvgqn6x70s7gdya1f1vr080mfkypam3k6z0i2ivlpymc3wly"; + name = "akonadi-calendar-21.12.2.tar.xz"; }; }; akonadi-calendar-tools = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-calendar-tools-21.12.1.tar.xz"; - sha256 = "1ksagjidqs5ja145wkrn3xq9hk9wc4v7n1747bin0c3ks2s685ri"; - name = "akonadi-calendar-tools-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-calendar-tools-21.12.2.tar.xz"; + sha256 = "0f0l6wj3h2afbmvnq60cg0x03a412849dg4l9dwgdn8yxvnxkhw6"; + name = "akonadi-calendar-tools-21.12.2.tar.xz"; }; }; akonadi-contacts = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-contacts-21.12.1.tar.xz"; - sha256 = "1yh3b5q7dkgg57048lm1lyy9yxs9fwia7m6d1359fck1flh8lna3"; - name = "akonadi-contacts-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-contacts-21.12.2.tar.xz"; + sha256 = "1aq81569kz529n66dl5jjzamy6kxw0xk5bcmjfvb3wpxznhiigqm"; + name = "akonadi-contacts-21.12.2.tar.xz"; }; }; akonadi-import-wizard = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-import-wizard-21.12.1.tar.xz"; - sha256 = "09dzs9sk2baa5xgb81qxswvfmm23v3w02w9b9yyxgs38xrwqjf2p"; - name = "akonadi-import-wizard-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-import-wizard-21.12.2.tar.xz"; + sha256 = "0b4mphxbqzf3akhafxc4fvil83l3z4qcf8xnblw23ficqqs8s0di"; + name = "akonadi-import-wizard-21.12.2.tar.xz"; }; }; akonadi-mime = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-mime-21.12.1.tar.xz"; - sha256 = "1jigq9rdxz5s6sl72ms06y7516hpmsm637zpqdrrg2gsb2f6y0d6"; - name = "akonadi-mime-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-mime-21.12.2.tar.xz"; + sha256 = "1nd6bf26lb5wfhzh4kn37iwmb6savcq9wsaph5c7jg6m0bdix1fn"; + name = "akonadi-mime-21.12.2.tar.xz"; }; }; akonadi-notes = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-notes-21.12.1.tar.xz"; - sha256 = "1l9cmb7jhqx5r6zyz21dzqfydisjjs23qcb0bp83byb3mqsq8jnv"; - name = "akonadi-notes-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-notes-21.12.2.tar.xz"; + sha256 = "1s3bxnqsjnlgsnia0nvqyc3m1ppzanzna9598lgwbmz053rgn7ck"; + name = "akonadi-notes-21.12.2.tar.xz"; }; }; akonadi-search = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadi-search-21.12.1.tar.xz"; - sha256 = "0b8lz4l2iq5ihfwyccaxjiw9yykxi0z240lmd9aiq4rv1wxzy22n"; - name = "akonadi-search-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadi-search-21.12.2.tar.xz"; + sha256 = "1hp2x8y59azl59znrqhrjn4n1bs2iqnkdsldv1f2k1ima6z5f4qy"; + name = "akonadi-search-21.12.2.tar.xz"; }; }; akonadiconsole = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akonadiconsole-21.12.1.tar.xz"; - sha256 = "1d2wclbjpbx0jr2r7nz0m4wxls9763vbpnbbidprwbap5p5njl9z"; - name = "akonadiconsole-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akonadiconsole-21.12.2.tar.xz"; + sha256 = "1rqfmhi1mzh6yzjg7jf6adf1xqvpbhcxgld2pp4rd9g5mi9rlxlk"; + name = "akonadiconsole-21.12.2.tar.xz"; }; }; akregator = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/akregator-21.12.1.tar.xz"; - sha256 = "1yf7631v1qc2a3j4b8bm0997cpg04vr0cgkdfqd3gazm2b367vf4"; - name = "akregator-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/akregator-21.12.2.tar.xz"; + sha256 = "1srsm25qvbww0hl7r878n32b71g0p222zxyys7chzrg8izrh12b8"; + name = "akregator-21.12.2.tar.xz"; }; }; analitza = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/analitza-21.12.1.tar.xz"; - sha256 = "0dldw4zg14ih4fj90xbl3x57wzmqjf0wayi78p95lzm323rxkyvm"; - name = "analitza-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/analitza-21.12.2.tar.xz"; + sha256 = "1ak2wyfx67cwx85d5053f6flxwas973mhnm25mf4jw0qll72vid4"; + name = "analitza-21.12.2.tar.xz"; }; }; ark = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ark-21.12.1.tar.xz"; - sha256 = "1mkqp6pn259aadwcnw7nmsrn4kx957m6axq2hnj18xrxbapm8xm0"; - name = "ark-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ark-21.12.2.tar.xz"; + sha256 = "1g05lyv8ll85myw0i62bxr4kmfd3dhldvmbgpgym9r1rgan12q90"; + name = "ark-21.12.2.tar.xz"; }; }; artikulate = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/artikulate-21.12.1.tar.xz"; - sha256 = "044xm6aqy7mnnm4hy2cczjrgfkwghsm4pdif66hyk2mlybs78g5x"; - name = "artikulate-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/artikulate-21.12.2.tar.xz"; + sha256 = "1g0h0dqqsf3x8q292hfhrizl9dlqzm8gjynzcyrzx0gvbfadj2l1"; + name = "artikulate-21.12.2.tar.xz"; }; }; audiocd-kio = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/audiocd-kio-21.12.1.tar.xz"; - sha256 = "0j22dk41mc26g4qwy2f7xq32d17v03nk8f49a9v8afzpka6dmyfv"; - name = "audiocd-kio-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/audiocd-kio-21.12.2.tar.xz"; + sha256 = "07nk060vkyn94ihs9v054zhsckfwpn8z911gy3hnyf1wdmnpfh2n"; + name = "audiocd-kio-21.12.2.tar.xz"; }; }; baloo-widgets = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/baloo-widgets-21.12.1.tar.xz"; - sha256 = "01kbg9biyrjc9704g6wnvgcq08ry7idsfxh5sv2y4ncsidgb3l4i"; - name = "baloo-widgets-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/baloo-widgets-21.12.2.tar.xz"; + sha256 = "1ax7pak9qb60yzdca8frkb8qs4khs6f2wbkwyb48s7zmdxqyw1bj"; + name = "baloo-widgets-21.12.2.tar.xz"; }; }; blinken = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/blinken-21.12.1.tar.xz"; - sha256 = "06v2d9l2c4p7n1vmaz86hmdb4lancfm4244sczykygjkcd7qiy6f"; - name = "blinken-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/blinken-21.12.2.tar.xz"; + sha256 = "0h0nw79zr891f54y2r3d3n837bzn24pfvkxsab1f0a228kjakw09"; + name = "blinken-21.12.2.tar.xz"; }; }; bomber = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/bomber-21.12.1.tar.xz"; - sha256 = "18ymdm1qb0k9vq7r27dlv146xjgp6gxb86nxhpcrgm18xicbidah"; - name = "bomber-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/bomber-21.12.2.tar.xz"; + sha256 = "1348mdiykfg1c3gr5fkcf71mxf7lyapwg5ym3jqp9vyc56vhwfjs"; + name = "bomber-21.12.2.tar.xz"; }; }; bovo = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/bovo-21.12.1.tar.xz"; - sha256 = "035pyyvdmbagpqnlf7ngvjzssiy0y9f87vj9wdxdnyglcvhycrf4"; - name = "bovo-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/bovo-21.12.2.tar.xz"; + sha256 = "0i2i5ici9v402lrh83mhfsrxmqi0fs75rkfvhsbza3wab7b165kc"; + name = "bovo-21.12.2.tar.xz"; }; }; calendarsupport = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/calendarsupport-21.12.1.tar.xz"; - sha256 = "0glb8s5byaywvk66428pkq0lq0myhf8dlpg52i9ysq5ph3qjijyh"; - name = "calendarsupport-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/calendarsupport-21.12.2.tar.xz"; + sha256 = "021rr06ln7l0v2xjzsij4r71jwpy1w1r761bjad0ywprwkdc93bm"; + name = "calendarsupport-21.12.2.tar.xz"; }; }; cantor = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/cantor-21.12.1.tar.xz"; - sha256 = "0l4vlx2w8bv53j1pd0fbwkgzv1p4m24apinxv4z4ia4f93h93vg1"; - name = "cantor-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/cantor-21.12.2.tar.xz"; + sha256 = "0vq8yvdglf43y5r2f9bvamm9bp82q92hw9sr8xmgb5hqz5mkap78"; + name = "cantor-21.12.2.tar.xz"; }; }; cervisia = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/cervisia-21.12.1.tar.xz"; - sha256 = "1q9pwqz9ps7dq29ywxyzbnbvy6676bd4q52d4jpq3aff4g2l9p98"; - name = "cervisia-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/cervisia-21.12.2.tar.xz"; + sha256 = "1vpm3cjknpa4s9mjdfngpvidqihfh5sb427yhnydr1q2dmllr9nn"; + name = "cervisia-21.12.2.tar.xz"; }; }; dolphin = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/dolphin-21.12.1.tar.xz"; - sha256 = "0k15mxrxplfghya8mv42w53v06ag9msnrd2yqdxlnmri5db1cjva"; - name = "dolphin-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/dolphin-21.12.2.tar.xz"; + sha256 = "0c0gk1djgl1d1qzibw5f1w29cnlxl6kan8pkg0izaqvnbmmx53wn"; + name = "dolphin-21.12.2.tar.xz"; }; }; dolphin-plugins = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/dolphin-plugins-21.12.1.tar.xz"; - sha256 = "0y920vvybdsvnrngjsf9ikblmmzmlshrg1zrn44ikyz15b4ar8bw"; - name = "dolphin-plugins-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/dolphin-plugins-21.12.2.tar.xz"; + sha256 = "1mrsampq1zq5rri1kx77dz0afz4a6s8pvb1255q0pl7imgxhiaqc"; + name = "dolphin-plugins-21.12.2.tar.xz"; }; }; dragon = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/dragon-21.12.1.tar.xz"; - sha256 = "04rz1pm6azrqy4nzs20g8wj4knd4yvd10alcypyxbcb08npwx51z"; - name = "dragon-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/dragon-21.12.2.tar.xz"; + sha256 = "07zn4ishffh9g8hvkpfgm7j9cimw3plcabzk9p157nhgxr62z4sb"; + name = "dragon-21.12.2.tar.xz"; }; }; elisa = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/elisa-21.12.1.tar.xz"; - sha256 = "1n4hga9g4kqnn016mm4dnq5wslxy9yaxdgazf9n3119i4mi4mjhs"; - name = "elisa-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/elisa-21.12.2.tar.xz"; + sha256 = "0zwy0bi4s25y6adgjhrhw992i2c1kjwpgvp9yg902h8zpsdynwh5"; + name = "elisa-21.12.2.tar.xz"; }; }; eventviews = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/eventviews-21.12.1.tar.xz"; - sha256 = "1g6bhp869ic12jz3dzjx2hsc435i9zfxbrys34sxsa0448kk3wd3"; - name = "eventviews-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/eventviews-21.12.2.tar.xz"; + sha256 = "1v3bpd0b3ph7v0kg8pyp4rr4j8cxy7y4csym5dlqn6l81db7d3gr"; + name = "eventviews-21.12.2.tar.xz"; }; }; ffmpegthumbs = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ffmpegthumbs-21.12.1.tar.xz"; - sha256 = "1mg10gxyirjglxd0hcayyddi2z0kbig1k24ms77aqwaiy66z77g3"; - name = "ffmpegthumbs-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ffmpegthumbs-21.12.2.tar.xz"; + sha256 = "17cyrimlnf1npffmxinnj3q5ynqg3agx35b55iqnw3xixrz4snzr"; + name = "ffmpegthumbs-21.12.2.tar.xz"; }; }; filelight = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/filelight-21.12.1.tar.xz"; - sha256 = "0rky4nmnlqzpf820kx2w3g9qi2x77x1advqzc21la2yc6f27m83z"; - name = "filelight-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/filelight-21.12.2.tar.xz"; + sha256 = "0khhwnms2ysy9ijpmmagm68w1zixmxs7svaaldd30xb3w52f78v2"; + name = "filelight-21.12.2.tar.xz"; }; }; granatier = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/granatier-21.12.1.tar.xz"; - sha256 = "0dbhf6p0c2yihzkzn5ns4bq2n209c2234i6a9p8rffdd7x5n9pmm"; - name = "granatier-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/granatier-21.12.2.tar.xz"; + sha256 = "0j7yizbljqx1a4wd4prmb3463r67f3lk5gv5x8j1yx2zmiaq0qki"; + name = "granatier-21.12.2.tar.xz"; }; }; grantlee-editor = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/grantlee-editor-21.12.1.tar.xz"; - sha256 = "1r3qh8z1f2ywm7qgqv9jca4l39p53nsc4i08rvdxhc85j1jj8cwb"; - name = "grantlee-editor-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/grantlee-editor-21.12.2.tar.xz"; + sha256 = "0wxkg56s83i61i17cb2y6ziminaq2gammynrwm5jvkpi5vqwvi2s"; + name = "grantlee-editor-21.12.2.tar.xz"; }; }; grantleetheme = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/grantleetheme-21.12.1.tar.xz"; - sha256 = "0ij225hva80983b4sbl5apfh5jfq9ppy8db5rfi2514crkmva8p2"; - name = "grantleetheme-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/grantleetheme-21.12.2.tar.xz"; + sha256 = "0z1p0s7fakfbscppmrgp1irf3dm2ayadyd3yb5zdsr9xahs0b9md"; + name = "grantleetheme-21.12.2.tar.xz"; }; }; gwenview = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/gwenview-21.12.1.tar.xz"; - sha256 = "1gm86h5srjym8ig1vbfyshnrpf7vwb9bvl6hb8nhfqhcmldawlnb"; - name = "gwenview-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/gwenview-21.12.2.tar.xz"; + sha256 = "1jkv34llga981dq08npk8alrg9h27prdpffcxkm368i77mvp9hv6"; + name = "gwenview-21.12.2.tar.xz"; }; }; incidenceeditor = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/incidenceeditor-21.12.1.tar.xz"; - sha256 = "1iam11jmp6q2k7r558dawcqrq5f9sixixdnvhywxj8fnvkjs005k"; - name = "incidenceeditor-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/incidenceeditor-21.12.2.tar.xz"; + sha256 = "151jhn84d5amv3abvp6cd2q10mf4mmv3q5hn0inqrmapy3v6bn8i"; + name = "incidenceeditor-21.12.2.tar.xz"; }; }; itinerary = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/itinerary-21.12.1.tar.xz"; - sha256 = "17xy62bcjrbf75hbjj417k7hbs9m1874bwi3h6iii848c3j98ppn"; - name = "itinerary-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/itinerary-21.12.2.tar.xz"; + sha256 = "02w6696kdzgz2r9677nr1jyhd9mfhc2zhmasy70nblz0jn22bcq7"; + name = "itinerary-21.12.2.tar.xz"; }; }; juk = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/juk-21.12.1.tar.xz"; - sha256 = "00kvx7yj45cm4fzdni6sd1csb09f1xm92hpx3ii1dmdm7cy1rg17"; - name = "juk-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/juk-21.12.2.tar.xz"; + sha256 = "1qgxpy1ksrgvdik69vppzdl1crscn69284q4wvwc5qh9v6rhv1xn"; + name = "juk-21.12.2.tar.xz"; }; }; k3b = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/k3b-21.12.1.tar.xz"; - sha256 = "03swyl3hxzwa73hsc223a7wcf3hq5p0wws7rjrzbazvy7pcac436"; - name = "k3b-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/k3b-21.12.2.tar.xz"; + sha256 = "0rjg3zs85gw62r3z3msp438jnf0ghc6y577br59ig19m10x33rz9"; + name = "k3b-21.12.2.tar.xz"; }; }; kaccounts-integration = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kaccounts-integration-21.12.1.tar.xz"; - sha256 = "15j9778r07zvqhv0hkh18h6fqq97is04sii0pxss6w2nqfghxzr8"; - name = "kaccounts-integration-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kaccounts-integration-21.12.2.tar.xz"; + sha256 = "0c4yxrhbas0wsmrxr0pwkpgw9gzdvvf5r5nxd15f656bwwhmqlwy"; + name = "kaccounts-integration-21.12.2.tar.xz"; }; }; kaccounts-providers = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kaccounts-providers-21.12.1.tar.xz"; - sha256 = "12ll5nilk3adw6ia23n7rcy4wz0sg59is5kkxiarl8mjzd9vw4v4"; - name = "kaccounts-providers-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kaccounts-providers-21.12.2.tar.xz"; + sha256 = "1srz43xf6kz7xfz8np94pdnhmvashk7y2f2a275rwpnlrl0yw1yd"; + name = "kaccounts-providers-21.12.2.tar.xz"; }; }; kaddressbook = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kaddressbook-21.12.1.tar.xz"; - sha256 = "1nv23wvka273a6d63gz0s0rxsp4ck3nx6fvvgg5ba1wzdcgjfd16"; - name = "kaddressbook-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kaddressbook-21.12.2.tar.xz"; + sha256 = "04ac5z9603lxylc6x55chnc0w59mx3z92nyvfnvjvp1ga77si36b"; + name = "kaddressbook-21.12.2.tar.xz"; }; }; kajongg = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kajongg-21.12.1.tar.xz"; - sha256 = "0z5npbvl0hn1gld60nfy1n8qk60gfxjh1a74s5y6vc4zvqmscl5q"; - name = "kajongg-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kajongg-21.12.2.tar.xz"; + sha256 = "04s3f8nj0rh1zy7sfa5kq0smbfsyylz9w3lxm2z69g7x5sb08k53"; + name = "kajongg-21.12.2.tar.xz"; }; }; kalarm = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kalarm-21.12.1.tar.xz"; - sha256 = "167xv38rj8pidbqqbfygkxcsr4wyd6j1437i93fb6v2b87h6ixx1"; - name = "kalarm-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kalarm-21.12.2.tar.xz"; + sha256 = "0f3hcsql20lim9nqb0ha5lpsrbh131rwcla9i6aax5sgw4m6nyfh"; + name = "kalarm-21.12.2.tar.xz"; }; }; kalarmcal = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kalarmcal-21.12.1.tar.xz"; - sha256 = "1r7pxy4fc5w3j0bwi79370rvmsl919swny48176fg7kwvmjdv3z5"; - name = "kalarmcal-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kalarmcal-21.12.2.tar.xz"; + sha256 = "15l893iv4smlppk7k682m9hwrph84p5chx5mgxixjxl28c1blcc8"; + name = "kalarmcal-21.12.2.tar.xz"; }; }; kalgebra = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kalgebra-21.12.1.tar.xz"; - sha256 = "1scqqrlznjl8j59fy24wfk84ysk3gvxw87cpl4wa4qhgb0q64m4b"; - name = "kalgebra-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kalgebra-21.12.2.tar.xz"; + sha256 = "0w1h3as6dip4hrp2ay61sz9gixf4s887jp42v7zjajwwhjs6xs1m"; + name = "kalgebra-21.12.2.tar.xz"; }; }; kalzium = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kalzium-21.12.1.tar.xz"; - sha256 = "0sx10g2qmmvfm1ilmxr2xyf04mhcyr0ysjn6nw5c3rfnv8l42zh0"; - name = "kalzium-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kalzium-21.12.2.tar.xz"; + sha256 = "0kvrmvd2vgl6fklxq9sr46p6nnh0fk0l6licj9b5q9rz82xwbr50"; + name = "kalzium-21.12.2.tar.xz"; }; }; kamera = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kamera-21.12.1.tar.xz"; - sha256 = "0hzsip822dsddf42x5lk88nlz4kr4khlh240wbvxrxz0hasgjxbc"; - name = "kamera-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kamera-21.12.2.tar.xz"; + sha256 = "07n1xlmg7m6p5ca0i4hjjyv564cqrn4p6h5yqx4pw3pcq8nizqfz"; + name = "kamera-21.12.2.tar.xz"; }; }; kamoso = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kamoso-21.12.1.tar.xz"; - sha256 = "0a3lvqmm4kjj9v56mvzf2rfdmijahd32n7lc9agjca9hll59y31q"; - name = "kamoso-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kamoso-21.12.2.tar.xz"; + sha256 = "09qn1px0mmcjhw9ikaz8xcjbdabh657ij3sa4ps37jbfzyyv45fb"; + name = "kamoso-21.12.2.tar.xz"; }; }; kanagram = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kanagram-21.12.1.tar.xz"; - sha256 = "00nyb23fyjxqxqin962j8av88xb2kcnhga9nd3l36i5mndh3axrm"; - name = "kanagram-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kanagram-21.12.2.tar.xz"; + sha256 = "1l4j2fy8mwdywp0prswng1f06rpwkfi54dc8z5z02b13p47hz5cy"; + name = "kanagram-21.12.2.tar.xz"; }; }; kapman = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kapman-21.12.1.tar.xz"; - sha256 = "064qiza0zjjm9skclfzksnfhmk21d6zn221jbx3zc9s11c0ba81l"; - name = "kapman-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kapman-21.12.2.tar.xz"; + sha256 = "0n1iz9jfgzpcpavb4ijfqp3hym7z53wzp5a5hiad8i6nws408grn"; + name = "kapman-21.12.2.tar.xz"; }; }; kapptemplate = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kapptemplate-21.12.1.tar.xz"; - sha256 = "16d0iwymxssxhj90dyrxp4yl3w15xzs4hrs9ryxqxf1n733b5zjq"; - name = "kapptemplate-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kapptemplate-21.12.2.tar.xz"; + sha256 = "1sjyji533x9ph9l63zf0llsb0m5fzb1lka03h5blm7fdyw570bad"; + name = "kapptemplate-21.12.2.tar.xz"; }; }; kate = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kate-21.12.1.tar.xz"; - sha256 = "04d00nihzg05yfp1aahfys5cimhnvdiz5mmmcqjjahcanpywqj3y"; - name = "kate-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kate-21.12.2.tar.xz"; + sha256 = "0r59rfyrbs50w9brl4rrq1wdfmrr3sz7plw2pqlc5xpzngrdlhs1"; + name = "kate-21.12.2.tar.xz"; }; }; katomic = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/katomic-21.12.1.tar.xz"; - sha256 = "0yblg7j3y67wkzjbsyr4q3h88h9jbv4ndkkwcg45g2f1vvkc9ny1"; - name = "katomic-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/katomic-21.12.2.tar.xz"; + sha256 = "123ls2p6az9bpy741xg85azs0p1qbssgcg4fh8cqazkz0kgzr0hf"; + name = "katomic-21.12.2.tar.xz"; }; }; kbackup = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kbackup-21.12.1.tar.xz"; - sha256 = "1nxq1l8smrhgvay08xsr68nw2x6fkv2ms5pvqp6wws0zb7gy7df9"; - name = "kbackup-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kbackup-21.12.2.tar.xz"; + sha256 = "1yadxlqfz2a4lirxf2xmivggvdpbjiaw5zn7aw72jb3yjs7x6j03"; + name = "kbackup-21.12.2.tar.xz"; }; }; kblackbox = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kblackbox-21.12.1.tar.xz"; - sha256 = "159y83ljw5m231n9xnjq41c0q1jk6h27xpb0h9rngdz98rkrh1xi"; - name = "kblackbox-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kblackbox-21.12.2.tar.xz"; + sha256 = "1y5l5l5p3s2gf69rih3mjdv42h9ydfk66v10ad5na3b4sqbi2qi7"; + name = "kblackbox-21.12.2.tar.xz"; }; }; kblocks = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kblocks-21.12.1.tar.xz"; - sha256 = "0ac9yykql8rhq07has2dz7b93z9vj69qdk42r28nnpc117ncki5d"; - name = "kblocks-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kblocks-21.12.2.tar.xz"; + sha256 = "13anvyy3br7ybl74jcrnjmw5qjfyk4z6s7ncziw8l37ggg4k7n91"; + name = "kblocks-21.12.2.tar.xz"; }; }; kbounce = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kbounce-21.12.1.tar.xz"; - sha256 = "1x2d8l8gxb2fj6sdwb9whl9360qmn895yzg3bc6q9zjbpn8rwq8m"; - name = "kbounce-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kbounce-21.12.2.tar.xz"; + sha256 = "07k5vmfkh9l4b4sb4an5qlnq0b9hmhh6dax0bjgia0ng9vxd011q"; + name = "kbounce-21.12.2.tar.xz"; }; }; kbreakout = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kbreakout-21.12.1.tar.xz"; - sha256 = "0kcr39ylq3axzjh9r5zy7dhv0q3a8m7pimg1l5vjlpgffnhhlvk5"; - name = "kbreakout-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kbreakout-21.12.2.tar.xz"; + sha256 = "08rykfi82hgzg5l2bhs8nvh8si06nisy60653n6r7m8g327yyn1m"; + name = "kbreakout-21.12.2.tar.xz"; }; }; kbruch = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kbruch-21.12.1.tar.xz"; - sha256 = "0b84a4k4ahi3xwc9h3qivbfi2is7vd0ng7rd1nk25135yfqwz5j0"; - name = "kbruch-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kbruch-21.12.2.tar.xz"; + sha256 = "0vvl2rk636zpg27hj2jly1awg4z3fm6mk75qrda3hl6gm8rddw1v"; + name = "kbruch-21.12.2.tar.xz"; }; }; kcachegrind = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kcachegrind-21.12.1.tar.xz"; - sha256 = "0ix589lsrv71akmnln71brl2878kgiybgsbjgch1kn1k1pz6jmij"; - name = "kcachegrind-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kcachegrind-21.12.2.tar.xz"; + sha256 = "1fg7fn8a3bjbjr6bi298gqr4mr838v96bz9773pd7rnhffvvip8z"; + name = "kcachegrind-21.12.2.tar.xz"; }; }; kcalc = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kcalc-21.12.1.tar.xz"; - sha256 = "0p7lxja6hhsnjihc94s9j7f210ag7i50gslifjh9cfk2ry1nqpnn"; - name = "kcalc-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kcalc-21.12.2.tar.xz"; + sha256 = "037xk57gjfbjpw1q4gm9k1xkc3x5xxjr4d8xmnrnc6ni090648q4"; + name = "kcalc-21.12.2.tar.xz"; }; }; kcalutils = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kcalutils-21.12.1.tar.xz"; - sha256 = "1ikwkgr2nki8vxvmv0vggm9x3900piq1wx6zps2zi6wqrs4d1hrm"; - name = "kcalutils-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kcalutils-21.12.2.tar.xz"; + sha256 = "0i474by8pyv64b7i807kym2q4wkhnyyn21vn56dbgp1awpi198i8"; + name = "kcalutils-21.12.2.tar.xz"; }; }; kcharselect = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kcharselect-21.12.1.tar.xz"; - sha256 = "10vrkaisim24mdqa9vz0i7gkm0qgshjcnbdqkgprnkx5xnsp30dm"; - name = "kcharselect-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kcharselect-21.12.2.tar.xz"; + sha256 = "1czkni7wrl2l5v0zpvxfwdaqd5i0x6knzbjhzh8shdg3h19sgqrm"; + name = "kcharselect-21.12.2.tar.xz"; }; }; kcolorchooser = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kcolorchooser-21.12.1.tar.xz"; - sha256 = "1cmyr94kxl6kmzx10w6ixi3q3czpc1wsspwsz5j5chwrwqzlrcx3"; - name = "kcolorchooser-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kcolorchooser-21.12.2.tar.xz"; + sha256 = "12s2vfa3i7b5dh8c10xbqsy1xi9pq13vdj2xcpm5chkgw22595hv"; + name = "kcolorchooser-21.12.2.tar.xz"; }; }; kcron = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kcron-21.12.1.tar.xz"; - sha256 = "095wwvm4b24d7nbx4mqlysiwpdjqs3f3qvv54adaj507z5b3wac7"; - name = "kcron-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kcron-21.12.2.tar.xz"; + sha256 = "0ddgl61vw4mj8sa6zg1m4s6qagwygdkvw9pjmfs8fsa1anhlillk"; + name = "kcron-21.12.2.tar.xz"; }; }; kde-dev-scripts = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kde-dev-scripts-21.12.1.tar.xz"; - sha256 = "00gsvra8gvfv6mwrvvna9rskh264svclr8h7zjspwvch0qgq0pqa"; - name = "kde-dev-scripts-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kde-dev-scripts-21.12.2.tar.xz"; + sha256 = "1vdssqwyi25j3saz5cw8n40y2i6bhq5l0rxbarh8m3iwcvx4ki3c"; + name = "kde-dev-scripts-21.12.2.tar.xz"; }; }; kde-dev-utils = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kde-dev-utils-21.12.1.tar.xz"; - sha256 = "1pcxbyaz700jicahccpsy7kjrp30nmjf5cqqk7nyqaf07spbrd9i"; - name = "kde-dev-utils-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kde-dev-utils-21.12.2.tar.xz"; + sha256 = "0flzc0kl252imng2mpg9mp71k8jrxc3yy7dzqlfdnpjz36dwpaqf"; + name = "kde-dev-utils-21.12.2.tar.xz"; }; }; kdebugsettings = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdebugsettings-21.12.1.tar.xz"; - sha256 = "12axjffxg5ap7yh9s573vyz4q7xi9nr4ggibvk8mxawwczmg9xyj"; - name = "kdebugsettings-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdebugsettings-21.12.2.tar.xz"; + sha256 = "0cimipq45c36nwk3alg738jl93zxja3xi77zjqk0k28ffn6qn7c2"; + name = "kdebugsettings-21.12.2.tar.xz"; }; }; kdeconnect-kde = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdeconnect-kde-21.12.1.tar.xz"; - sha256 = "1mw1nihy9b47msw23cr1chyrgwcm3cbf5sv90nmd9cc1ypnblw2c"; - name = "kdeconnect-kde-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdeconnect-kde-21.12.2.tar.xz"; + sha256 = "0crw0navhdsix0rpsya4vhffj35vlascpcflrs04vyws3v8xr026"; + name = "kdeconnect-kde-21.12.2.tar.xz"; }; }; kdeedu-data = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdeedu-data-21.12.1.tar.xz"; - sha256 = "1kbxhrlc64aqr0shik9p22fm6ldvy5jpk50x2nh5zkw4jylc8zh3"; - name = "kdeedu-data-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdeedu-data-21.12.2.tar.xz"; + sha256 = "1cpbi5gkbq7xrv276vm0jlcjc5y9x1kw8l8x0z7syy06s4s3pvg9"; + name = "kdeedu-data-21.12.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdegraphics-mobipocket-21.12.1.tar.xz"; - sha256 = "0m8clh313186nc3pmlii0020gv7612236nwww8sgqc3fsd4va91x"; - name = "kdegraphics-mobipocket-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdegraphics-mobipocket-21.12.2.tar.xz"; + sha256 = "0zbiz47mqa176gcina8v03fw2qqrc5v1l8mg2fcpnl5dxc9d56c4"; + name = "kdegraphics-mobipocket-21.12.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdegraphics-thumbnailers-21.12.1.tar.xz"; - sha256 = "0y2619lcins553pmvigmgajfkrrvy2kqc2sbvacpl4r74qsdhax6"; - name = "kdegraphics-thumbnailers-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdegraphics-thumbnailers-21.12.2.tar.xz"; + sha256 = "09adinkdfbn5hfic92zbdhq9ldxpnbgf9pybsp4ibpw2097l2k5f"; + name = "kdegraphics-thumbnailers-21.12.2.tar.xz"; }; }; kdenetwork-filesharing = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdenetwork-filesharing-21.12.1.tar.xz"; - sha256 = "04z720q8nmylrh2rx1q8scaklcf7xaxiqvghkn0pfr0dd3vci3cy"; - name = "kdenetwork-filesharing-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdenetwork-filesharing-21.12.2.tar.xz"; + sha256 = "0q7gndwvki3r9vhkxmwr8xzc54cjpk9nzhk2665wsk1msfp3xqw6"; + name = "kdenetwork-filesharing-21.12.2.tar.xz"; }; }; kdenlive = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdenlive-21.12.1.tar.xz"; - sha256 = "1r3gxyx45531v79644q17lbl2ribiij4m5v39jfpys6vn8c6gmfw"; - name = "kdenlive-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdenlive-21.12.2.tar.xz"; + sha256 = "1h668q91pcq3km7pq75krgq06x8gglmp8al52b0imyc9g9wy28z6"; + name = "kdenlive-21.12.2.tar.xz"; }; }; kdepim-addons = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdepim-addons-21.12.1.tar.xz"; - sha256 = "1ksf05wagka9hr6p35j9r6r9hdmfx83mkv1v5blxbk9zq9mx3lhq"; - name = "kdepim-addons-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdepim-addons-21.12.2.tar.xz"; + sha256 = "00j67rvkvm1sri6ij5ziqjh340cmpsyfwwmw8hr1dsi3vlva4gk1"; + name = "kdepim-addons-21.12.2.tar.xz"; }; }; kdepim-runtime = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdepim-runtime-21.12.1.tar.xz"; - sha256 = "1pv9z0l3aafpcxgs98lc2dr4il8sp9v3p8xpqdi0ags478gi3x1x"; - name = "kdepim-runtime-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdepim-runtime-21.12.2.tar.xz"; + sha256 = "0y1hgab16h9ypqh9isabbb4km2907vzdydfkd1m5b63vfbambz0j"; + name = "kdepim-runtime-21.12.2.tar.xz"; }; }; kdesdk-kioslaves = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdesdk-kioslaves-21.12.1.tar.xz"; - sha256 = "0xxz9f9m5pxfmxnwqz1ygjz4m7gsrmh6jj54ha0k70jj4r43vq8i"; - name = "kdesdk-kioslaves-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdesdk-kioslaves-21.12.2.tar.xz"; + sha256 = "0vz6dk5an0bhnyglyqdgf3lqxdlc61k4vsbh8a4fky1zpvpwya84"; + name = "kdesdk-kioslaves-21.12.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdesdk-thumbnailers-21.12.1.tar.xz"; - sha256 = "0snncw0fgh5z1y6dkaaj45sf1r404123vxp4p16i06c8imbg50w5"; - name = "kdesdk-thumbnailers-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdesdk-thumbnailers-21.12.2.tar.xz"; + sha256 = "1w90zjnwnqh1a47kgmijr8xp6z096f6ij250qfcl3bwvhxqmsrb0"; + name = "kdesdk-thumbnailers-21.12.2.tar.xz"; }; }; kdev-php = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdev-php-21.12.1.tar.xz"; - sha256 = "1p1aq10613jifspnzmc92sq7bsyxc3z21dffrmz2a18iqharmgzv"; - name = "kdev-php-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdev-php-21.12.2.tar.xz"; + sha256 = "0ghxfllh8pkyrvsaz4iwc9bm98mkq6z3wr558w4wjykgjp69r08j"; + name = "kdev-php-21.12.2.tar.xz"; }; }; kdev-python = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdev-python-21.12.1.tar.xz"; - sha256 = "1d97bz06vncs15dclhclwqwc6da63c38qkla2z7yhf0iv3byb8kq"; - name = "kdev-python-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdev-python-21.12.2.tar.xz"; + sha256 = "05jj7q7agkgpbrxzwh0n2ipc854cgm8skjyjkqmxp2kdf3fdm8lj"; + name = "kdev-python-21.12.2.tar.xz"; }; }; kdevelop = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdevelop-21.12.1.tar.xz"; - sha256 = "1a2j79hw16ia1j6s6gs23d7jzkpx14hjgygsggxnjb0pxamyvxw7"; - name = "kdevelop-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdevelop-21.12.2.tar.xz"; + sha256 = "13kgkxvbjcb60ckapqrcr4m0y5kyag948xx6gwrvzhrhn46ynfgz"; + name = "kdevelop-21.12.2.tar.xz"; }; }; kdf = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdf-21.12.1.tar.xz"; - sha256 = "191gpfpd4x86vcx8g6yhz90xshfgsiw1374f06fn02mbd6fpswni"; - name = "kdf-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdf-21.12.2.tar.xz"; + sha256 = "1fs8bab6q7imfpqqgasvr98k57nm68ignfch2i76rdcywhx3q268"; + name = "kdf-21.12.2.tar.xz"; }; }; kdialog = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdialog-21.12.1.tar.xz"; - sha256 = "171aghc4fqkc5ac851wcpb6c49k53n9ba0g0ka6pr3k00jh4vsws"; - name = "kdialog-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdialog-21.12.2.tar.xz"; + sha256 = "1k6zlh1gbpj0y40h1i8pan28d8chqjsnhd6pvsvr95b91d0pj2xn"; + name = "kdialog-21.12.2.tar.xz"; }; }; kdiamond = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kdiamond-21.12.1.tar.xz"; - sha256 = "1hx9c7a5kqaqpk89dfb2m8bqzvpar1ra7pfavxsqbxqyy9rvhiv1"; - name = "kdiamond-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kdiamond-21.12.2.tar.xz"; + sha256 = "08b2a13bmxw3h6rhip619jvzgjrjgpz2v83i2azbqccfynisjnyh"; + name = "kdiamond-21.12.2.tar.xz"; }; }; keditbookmarks = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/keditbookmarks-21.12.1.tar.xz"; - sha256 = "1xbl9bp1blvhjhdsdc2w4smxz6pysh09ad9rjprm7mfx9sfwzlm1"; - name = "keditbookmarks-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/keditbookmarks-21.12.2.tar.xz"; + sha256 = "1fxm0mm3sqp2frk2fcs2jw86wjxb2j5z9vyb34x7g80k5j17j57m"; + name = "keditbookmarks-21.12.2.tar.xz"; }; }; kfind = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kfind-21.12.1.tar.xz"; - sha256 = "1366l63q476ch1f3mvfk20m3j90ili4l3r7dzxmsnivl0im1s1qh"; - name = "kfind-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kfind-21.12.2.tar.xz"; + sha256 = "0kx6p4hyyalx5i8g4aq81aj30c9ac0380xvia9130g95pgkzd96c"; + name = "kfind-21.12.2.tar.xz"; }; }; kfloppy = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kfloppy-21.12.1.tar.xz"; - sha256 = "0vxzhzk9jmrlxqn6pnnb5mvml6jr9q5dyh5dr8568i1bc08dcfwp"; - name = "kfloppy-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kfloppy-21.12.2.tar.xz"; + sha256 = "10245c87379576n11xcjkll3rkvzv815qsavr4alsj1jr8w6zyg8"; + name = "kfloppy-21.12.2.tar.xz"; }; }; kfourinline = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kfourinline-21.12.1.tar.xz"; - sha256 = "17lq16z97kzq4fnwarfz5d5m5n1jb2vzn7aizmw3p4ddqmg214sb"; - name = "kfourinline-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kfourinline-21.12.2.tar.xz"; + sha256 = "1kz7ff31h8lvz7snqmjs6cma9i3py7dyd91i6ik2pwiar80sin1x"; + name = "kfourinline-21.12.2.tar.xz"; }; }; kgeography = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kgeography-21.12.1.tar.xz"; - sha256 = "1frx4d3zga8pk56hpb7r13kd466iy7ihdda4gk98j59n4blvrqmx"; - name = "kgeography-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kgeography-21.12.2.tar.xz"; + sha256 = "09h5zp8pxzr47s7j50l6xfssvk9zk56cqgnsjx75yh1n077z1d0j"; + name = "kgeography-21.12.2.tar.xz"; }; }; kget = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kget-21.12.1.tar.xz"; - sha256 = "1jbnyx0bnvvgbglwnhv0y3lh12id7d80aixrxp6w13pcm3k21s3v"; - name = "kget-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kget-21.12.2.tar.xz"; + sha256 = "0jmy2yxzrgq592dq075k7gp7ynk42i899jsbw0gbn79x69cxlkmv"; + name = "kget-21.12.2.tar.xz"; }; }; kgoldrunner = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kgoldrunner-21.12.1.tar.xz"; - sha256 = "01may4xghilyk6vkv8g2n9bfvb2binyfv7qpm0fv0b4aqbv90ql8"; - name = "kgoldrunner-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kgoldrunner-21.12.2.tar.xz"; + sha256 = "0by6cq31jsls3qaqn4agrdhvd9jqg84plm6nbgh3rc85pnj5h22p"; + name = "kgoldrunner-21.12.2.tar.xz"; }; }; kgpg = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kgpg-21.12.1.tar.xz"; - sha256 = "0qxd1pfm4fx37xc6v06j0k5ykqxs2p2x4r4ip4l95yhvgxixhy0i"; - name = "kgpg-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kgpg-21.12.2.tar.xz"; + sha256 = "1f193fyn1azwhm7b8gd5ffyb11acg1269mh1d2ly60ax83qjs48c"; + name = "kgpg-21.12.2.tar.xz"; }; }; khangman = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/khangman-21.12.1.tar.xz"; - sha256 = "11acf9i65jqi1cmqbc13wfpdnnwws7srzzdq35np9hpghiw2rj1l"; - name = "khangman-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/khangman-21.12.2.tar.xz"; + sha256 = "0xih54w33vigvm3x2xp5lf29k4aga4yil0qv263965nxn9djnlaw"; + name = "khangman-21.12.2.tar.xz"; }; }; khelpcenter = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/khelpcenter-21.12.1.tar.xz"; - sha256 = "0nc555ap4nk7xijxz46cx7v0li3g8k5hxymlyqlw7lcapsk7l98l"; - name = "khelpcenter-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/khelpcenter-21.12.2.tar.xz"; + sha256 = "09ddkc7kiayx852mpgdmv04l19vrrc0yrf30hnyzkci58kbavvcq"; + name = "khelpcenter-21.12.2.tar.xz"; }; }; kidentitymanagement = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kidentitymanagement-21.12.1.tar.xz"; - sha256 = "1r3aac6k1dd85gc1qbzr1k1l7bj9kgmf0mmns2ba1g6zshnicdww"; - name = "kidentitymanagement-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kidentitymanagement-21.12.2.tar.xz"; + sha256 = "00fwjax3kfvr8jsy04hp1jyihvskvprbg83z2avhcy6lvr7g25kk"; + name = "kidentitymanagement-21.12.2.tar.xz"; }; }; kig = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kig-21.12.1.tar.xz"; - sha256 = "0245xlplgfc0nbxn5ppjg16gbcbdlkzyc600bngwjjhcw0psqqls"; - name = "kig-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kig-21.12.2.tar.xz"; + sha256 = "100ds4728lfnb6r6c52rdzk2n4rcpc5jiv35q5qd7d6cszmxvhvx"; + name = "kig-21.12.2.tar.xz"; }; }; kigo = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kigo-21.12.1.tar.xz"; - sha256 = "0a9fwbnr1z56lcmv2cgkv1l1spfr5kc4flf9xi1223xjzi31mkmx"; - name = "kigo-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kigo-21.12.2.tar.xz"; + sha256 = "0g1sl7bw9aln7fm2786sgh0m44da6vfxc9g0rizw31ff8papnyb8"; + name = "kigo-21.12.2.tar.xz"; }; }; killbots = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/killbots-21.12.1.tar.xz"; - sha256 = "0szy101shr2zir1alc21ylv746w2pgczh2cl9hg9g9gg9fkj4f06"; - name = "killbots-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/killbots-21.12.2.tar.xz"; + sha256 = "1qryy2g2i6iqc6rsw8jz4c14x67glpm3zvcx2dghyll6q9hns43z"; + name = "killbots-21.12.2.tar.xz"; }; }; kimagemapeditor = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kimagemapeditor-21.12.1.tar.xz"; - sha256 = "1rgd3qsfsf1kdlidhp43kvkqjlfnjr7vdzl8wdgsl4z01xb3yy59"; - name = "kimagemapeditor-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kimagemapeditor-21.12.2.tar.xz"; + sha256 = "11j55jvfxdpam3gkfv7355av9d6mz8z6djhplhmfd56llkmvw4n2"; + name = "kimagemapeditor-21.12.2.tar.xz"; }; }; kimap = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kimap-21.12.1.tar.xz"; - sha256 = "1wkygpxdz6407pdllcdw36p83p6jk0j8jf3jzqak9ksql5qdg04p"; - name = "kimap-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kimap-21.12.2.tar.xz"; + sha256 = "0sdas8knk6wa8hhgc3w62famdpq6pcxfhl4vmpw0r3aqskaci4q3"; + name = "kimap-21.12.2.tar.xz"; }; }; kio-extras = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kio-extras-21.12.1.tar.xz"; - sha256 = "0pshm9pjssj5drzg2q5351442h9izbmp41d3fxjx431cc1jm8zfc"; - name = "kio-extras-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kio-extras-21.12.2.tar.xz"; + sha256 = "0133cww4k2svn7cvw0fbdcwwv0zg09d27gz59gkpfswjmpsxdqj4"; + name = "kio-extras-21.12.2.tar.xz"; }; }; kio-gdrive = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kio-gdrive-21.12.1.tar.xz"; - sha256 = "018lr2mp1km5ki650bmmkjm94a6i0h5a898vhwxgl9a7yfpr52j6"; - name = "kio-gdrive-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kio-gdrive-21.12.2.tar.xz"; + sha256 = "1n3khrx5fczffwzg4bzxjhzy2kxf72dmb7fqs9hqfn1qkaahfv49"; + name = "kio-gdrive-21.12.2.tar.xz"; }; }; kipi-plugins = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kipi-plugins-21.12.1.tar.xz"; - sha256 = "1dadrg8dd1plawsq3h3vn4g7a640qh6pb1wp3l8vcsmiqkabrfkh"; - name = "kipi-plugins-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kipi-plugins-21.12.2.tar.xz"; + sha256 = "11f3qmgqxdlzvv2zldjawn7a3kdigj5pb535rc9v9a8fp8mjvk88"; + name = "kipi-plugins-21.12.2.tar.xz"; }; }; kirigami-gallery = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kirigami-gallery-21.12.1.tar.xz"; - sha256 = "0s5pj18sc2hm2nggwbqp4x6f56ca1dqx1nbcspwfq287i0csl82k"; - name = "kirigami-gallery-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kirigami-gallery-21.12.2.tar.xz"; + sha256 = "0rg9lg4iqxycfbhs62qs4ms4qadz1ii1dcv3ykkgn3w2brx77wad"; + name = "kirigami-gallery-21.12.2.tar.xz"; }; }; kiriki = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kiriki-21.12.1.tar.xz"; - sha256 = "09r40sq0sa6w4pwc6fl13dfxlc0nns7j5d4fdnv8i2wiqx6jc1cg"; - name = "kiriki-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kiriki-21.12.2.tar.xz"; + sha256 = "1blj3vl87jdrr8qv2cyng20nr4d54gbk7w72z9rl02l62c9gkw5j"; + name = "kiriki-21.12.2.tar.xz"; }; }; kiten = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kiten-21.12.1.tar.xz"; - sha256 = "091l4r97ps9xmca499y9c95qihdcf2jcrfgahgzp4mkcps09w5ac"; - name = "kiten-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kiten-21.12.2.tar.xz"; + sha256 = "18kxqrhfgch32583ra4422h7csd5ajijf9989bxz9hwi9mn3r2vl"; + name = "kiten-21.12.2.tar.xz"; }; }; kitinerary = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kitinerary-21.12.1.tar.xz"; - sha256 = "0dirkp2qd2ihyjj0nwqpakwvh3par0m3z5q2z7qjz1527k0k00ww"; - name = "kitinerary-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kitinerary-21.12.2.tar.xz"; + sha256 = "0g7z6408nhrv54h6xxd2rd9wj2hmwzc3lg5risyqbg2zii9j0sp2"; + name = "kitinerary-21.12.2.tar.xz"; }; }; kjumpingcube = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kjumpingcube-21.12.1.tar.xz"; - sha256 = "0bnvvhnqcx767j6kmi19mgvab8srrzbw8y6w1qbqj85lq91wq1dr"; - name = "kjumpingcube-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kjumpingcube-21.12.2.tar.xz"; + sha256 = "1abv3yi716n88b19rmimhw0vnnwyw28ab6fbcy9g1lgpbi69g5ax"; + name = "kjumpingcube-21.12.2.tar.xz"; }; }; kldap = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kldap-21.12.1.tar.xz"; - sha256 = "12hcls5g80s0y0nlnp0jcd7q0bxx9wq39v44x5a011rivkab8qbx"; - name = "kldap-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kldap-21.12.2.tar.xz"; + sha256 = "1xda42f1q5ih3hdhmcbdz0fx2nchirlwips3gq0jb6lfzi5dbqpl"; + name = "kldap-21.12.2.tar.xz"; }; }; kleopatra = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kleopatra-21.12.1.tar.xz"; - sha256 = "0hk7af4gsy63vjbn16lp7b6qr15cnygxjic6p98bd5zajnx77899"; - name = "kleopatra-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kleopatra-21.12.2.tar.xz"; + sha256 = "1b2nq823gq1v20dnh3hm298fva7cmbn9hh0kmbq22kh98kv8chhh"; + name = "kleopatra-21.12.2.tar.xz"; }; }; klettres = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/klettres-21.12.1.tar.xz"; - sha256 = "04mwl6n0361vgyb6p9xp5m3223h7f09w6sr90998smws98bmgpd4"; - name = "klettres-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/klettres-21.12.2.tar.xz"; + sha256 = "1wi1byr36x7z9scsy1gffna36m8x9vyfcqzndvx6042i2y0smhwz"; + name = "klettres-21.12.2.tar.xz"; }; }; klickety = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/klickety-21.12.1.tar.xz"; - sha256 = "1mzvgjdxm2y34w37s548cg7ri2yjqn49rmqyaafw7bnv9qfyky3v"; - name = "klickety-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/klickety-21.12.2.tar.xz"; + sha256 = "19rn9p7cbxhn471b65nhwhpnfnhykjwj6n5lrsd431391dyhvshc"; + name = "klickety-21.12.2.tar.xz"; }; }; klines = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/klines-21.12.1.tar.xz"; - sha256 = "18lbnfsx05vnmzjw9iqdi5kck9zrkrdknk6bysa5pc16cgmai9z8"; - name = "klines-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/klines-21.12.2.tar.xz"; + sha256 = "1r004rsy98lxh5vd3r4bc0l4d7ymija13barg9xglj53xzbyij3k"; + name = "klines-21.12.2.tar.xz"; }; }; kmag = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmag-21.12.1.tar.xz"; - sha256 = "1v5zmy3q3ipi9nd8yrrv84x1mk4mpb770r833pwwn6bwdfr8xq8h"; - name = "kmag-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmag-21.12.2.tar.xz"; + sha256 = "03kzahsr80wnbx6ky112ka3zm01pnc5h85l28a4186617swx344l"; + name = "kmag-21.12.2.tar.xz"; }; }; kmahjongg = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmahjongg-21.12.1.tar.xz"; - sha256 = "02nfgqlhzph1svf54ph3avhx7wvplqgzqhazvrrsz7ikj5qcq9pl"; - name = "kmahjongg-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmahjongg-21.12.2.tar.xz"; + sha256 = "1w8v6fchrkvsbyvnx8vvs801cvg52pr78ihvdjv6c0vpd0q7z9rz"; + name = "kmahjongg-21.12.2.tar.xz"; }; }; kmail = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmail-21.12.1.tar.xz"; - sha256 = "17wyrdl6lxcds4whh2nlacq0m6mmw13z6a79j8047svmnpz97nrx"; - name = "kmail-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmail-21.12.2.tar.xz"; + sha256 = "003bnp00figa09qcp2hl45sivdk3d0j3amxdidyrn47q9vy40554"; + name = "kmail-21.12.2.tar.xz"; }; }; kmail-account-wizard = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmail-account-wizard-21.12.1.tar.xz"; - sha256 = "1i2jd50c5scd6vxfxc975lvyqxifmjz4a1cz0hk67smcdh8nbqkn"; - name = "kmail-account-wizard-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmail-account-wizard-21.12.2.tar.xz"; + sha256 = "1nmg8qns3iglcc4l4g5nffnji1vgg43a9fa9rz1hacvlkarm98m4"; + name = "kmail-account-wizard-21.12.2.tar.xz"; }; }; kmailtransport = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmailtransport-21.12.1.tar.xz"; - sha256 = "0mng5q0xvlbj9cx5myf65i0056s2l5mhsqycp13x6b2kyvna5bd2"; - name = "kmailtransport-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmailtransport-21.12.2.tar.xz"; + sha256 = "0rs6qihzy8q2n204zkhakgnjxwqy9pz9i0kv1j3amw2xv3f51rvw"; + name = "kmailtransport-21.12.2.tar.xz"; }; }; kmbox = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmbox-21.12.1.tar.xz"; - sha256 = "1d5wwb1m0zic8lhnn6aiyhwihzh527xpjswdriq4ngkil95y994a"; - name = "kmbox-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmbox-21.12.2.tar.xz"; + sha256 = "1mfwaw4d480kbb60wb0kvl5z35ly2hn6h73kx9wdb5y7mz05rvn1"; + name = "kmbox-21.12.2.tar.xz"; }; }; kmime = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmime-21.12.1.tar.xz"; - sha256 = "0821zvgsfmv5ijjz1ih9irik46j1yaqwzccmfggdvd7nc5nc1x61"; - name = "kmime-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmime-21.12.2.tar.xz"; + sha256 = "0qxb0gf4pqfa0540fsbnf24nh9qwiamwl65q7vaanb80b211qp2g"; + name = "kmime-21.12.2.tar.xz"; }; }; kmines = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmines-21.12.1.tar.xz"; - sha256 = "1pp1ynj7i4859r4rab5xph4glrlihn9ig465jlqh5jz0cg8w58zc"; - name = "kmines-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmines-21.12.2.tar.xz"; + sha256 = "0dsqlqmbaggab38zzjyhnx318sn2mw6y51k52c7blm2l53a8zp3j"; + name = "kmines-21.12.2.tar.xz"; }; }; kmix = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmix-21.12.1.tar.xz"; - sha256 = "1c9ing19g27d7qqm5m171lff0a35vcn3yn4spwx1bm7y9md44964"; - name = "kmix-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmix-21.12.2.tar.xz"; + sha256 = "0fyjzzv6x9xf0g222jjsvrywnm3blhbzm2zwhxagrfkjvjpb2cvk"; + name = "kmix-21.12.2.tar.xz"; }; }; kmousetool = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmousetool-21.12.1.tar.xz"; - sha256 = "0ivk9rdwy7hgi4j4bxm5padlw6w0ldij29yjcpc0501ld9jjkyzx"; - name = "kmousetool-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmousetool-21.12.2.tar.xz"; + sha256 = "1hh7sql04hpwvb8hbi7snvh2d6922a2yraah9hd1jiwniv3cv175"; + name = "kmousetool-21.12.2.tar.xz"; }; }; kmouth = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmouth-21.12.1.tar.xz"; - sha256 = "1mkdgidyvfci9hilfnilvc3ymzyzknib5bbqf4bn87xjnhkv68sy"; - name = "kmouth-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmouth-21.12.2.tar.xz"; + sha256 = "0vxssxchh23bl237qw9pznbrkwyqx1bhbnp2fq9baw1bn88d18i5"; + name = "kmouth-21.12.2.tar.xz"; }; }; kmplot = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kmplot-21.12.1.tar.xz"; - sha256 = "1dn3sxqi8k3p28q4076bjsxb0qlmrvw8jk045axi2q7yc1f343r5"; - name = "kmplot-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kmplot-21.12.2.tar.xz"; + sha256 = "025n51s7i5nr63knsd78pg48wfs4cldhplr68jmwv2k8pb5w9kxs"; + name = "kmplot-21.12.2.tar.xz"; }; }; knavalbattle = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/knavalbattle-21.12.1.tar.xz"; - sha256 = "1a5gpy601842kd9ybwbsxajmj09pmmna6k6wq6crbhzca0i4hgby"; - name = "knavalbattle-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/knavalbattle-21.12.2.tar.xz"; + sha256 = "1z1qqr5jjinm49p7rhr0pzf8ir2nvdq157zqxnnr6i11xqk2mnkj"; + name = "knavalbattle-21.12.2.tar.xz"; }; }; knetwalk = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/knetwalk-21.12.1.tar.xz"; - sha256 = "1ifgc89sfjd98g34vg2aqwhmpb63w75kh9yi7dkb9vlv8c90v46h"; - name = "knetwalk-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/knetwalk-21.12.2.tar.xz"; + sha256 = "1gnir7h1iam51frdajp4h6xw4biz545nljdfcck17jiw6ad9py4j"; + name = "knetwalk-21.12.2.tar.xz"; }; }; knights = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/knights-21.12.1.tar.xz"; - sha256 = "1nfb096859r47c1n7bifsc23qfqx7xvl9wdhp8lgyc7hv85mz10j"; - name = "knights-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/knights-21.12.2.tar.xz"; + sha256 = "0k9hqgz3zw7vhrgbwnmy0v3j9kflz6wx8wavckg1i2l4qadprc1y"; + name = "knights-21.12.2.tar.xz"; }; }; knotes = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/knotes-21.12.1.tar.xz"; - sha256 = "15yvddywsfybdyqhv90hs2c51vn9vcvdp79wfcz197hn98pswidw"; - name = "knotes-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/knotes-21.12.2.tar.xz"; + sha256 = "0f8ra6nkgndgkfnw194y5976kkrm7qdj1w7l27znwalzaydnxvjg"; + name = "knotes-21.12.2.tar.xz"; }; }; kolf = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kolf-21.12.1.tar.xz"; - sha256 = "073kzsr561fs2kf98chbkhzp84c9fpgr9wja5bq3d9xm937bad69"; - name = "kolf-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kolf-21.12.2.tar.xz"; + sha256 = "0as18rc45daak3xsmwn6k789yni46nsdkv83bfmbj3jcjhzv9x5k"; + name = "kolf-21.12.2.tar.xz"; }; }; kollision = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kollision-21.12.1.tar.xz"; - sha256 = "11z65wcxqz7mczy4h6yyfafd1d8cl4cvh2hv3i3vwnvks21853cy"; - name = "kollision-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kollision-21.12.2.tar.xz"; + sha256 = "1ycim9gjn9p6w6yyzsipqn7zpvi946s287mp4br35zavsf25gzn0"; + name = "kollision-21.12.2.tar.xz"; }; }; kolourpaint = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kolourpaint-21.12.1.tar.xz"; - sha256 = "0k3whydhkgwjk3rs9jjcxphdb6p1yc1crjb5sn3izhr2xmnvinsr"; - name = "kolourpaint-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kolourpaint-21.12.2.tar.xz"; + sha256 = "0z53hp31sq4ksarvpzqmx9f3gac8ygrcj0ncppgbwwjkq63wr6v1"; + name = "kolourpaint-21.12.2.tar.xz"; }; }; kompare = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kompare-21.12.1.tar.xz"; - sha256 = "0zd7hnsvx4mnnva6lvffmlgawnvjqzyz06hy466wlwckn08hrap1"; - name = "kompare-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kompare-21.12.2.tar.xz"; + sha256 = "0ps6ng77kzcqf6b2sh8xmqh5d4jwkmj3qnbyxh4v4xxjbwy0mrwm"; + name = "kompare-21.12.2.tar.xz"; }; }; konqueror = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/konqueror-21.12.1.tar.xz"; - sha256 = "1v0f1snxc3i7pabn53dyzw7zpc2hjqj64xdqyfz0fy79myfrpx39"; - name = "konqueror-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/konqueror-21.12.2.tar.xz"; + sha256 = "0ia8qqas9x261ixa6jzih273ypqhdv5hijk042bcdmqd1z1s4n55"; + name = "konqueror-21.12.2.tar.xz"; }; }; konquest = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/konquest-21.12.1.tar.xz"; - sha256 = "0515wkdpw4cxxsddw4a7n5hl7n2qw487qalpzjrsmm5vfn0sjzay"; - name = "konquest-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/konquest-21.12.2.tar.xz"; + sha256 = "1arxp4x8pcmv8yqg1xy5b23avh5a7x660vvh6kaviimysad5wmc5"; + name = "konquest-21.12.2.tar.xz"; }; }; konsole = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/konsole-21.12.1.tar.xz"; - sha256 = "0pasxvvjhgg2cl3nfsd6wrpd40jw3rjfcgzgzsr5npflkpqnhszl"; - name = "konsole-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/konsole-21.12.2.tar.xz"; + sha256 = "00gyzhcacd3467sv5ijihqva7pnvcy1chywfpy8qh2hcdkkvyfxa"; + name = "konsole-21.12.2.tar.xz"; }; }; kontact = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kontact-21.12.1.tar.xz"; - sha256 = "0dhnrw87z80xf801mq1cm2slbqrhsfnkd0xfbfaan3vc1h5gsw0x"; - name = "kontact-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kontact-21.12.2.tar.xz"; + sha256 = "16ld08sx5lvrm9r0ync7r8bpd540gxsssvhxj5p43chq6b9hr5lm"; + name = "kontact-21.12.2.tar.xz"; }; }; kontactinterface = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kontactinterface-21.12.1.tar.xz"; - sha256 = "04zp5kz8l3dbxzdxaw3s11hqn3lg01n6saijp1l2sivkgf80wpna"; - name = "kontactinterface-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kontactinterface-21.12.2.tar.xz"; + sha256 = "1qvjm27v797hcdqbr6jwdkwn3vpsy3f1i92slrwks03zj498ydlj"; + name = "kontactinterface-21.12.2.tar.xz"; }; }; kontrast = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kontrast-21.12.1.tar.xz"; - sha256 = "16gry5mq7qkwdhwqrhd1hwf6q8v4j76di37kyphxzhsf6csx5zsz"; - name = "kontrast-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kontrast-21.12.2.tar.xz"; + sha256 = "0mk2i2x1yz0ykbnqvdbdpi9kplyzjxlwhhsvl4rbq0726g3q6pas"; + name = "kontrast-21.12.2.tar.xz"; }; }; konversation = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/konversation-21.12.1.tar.xz"; - sha256 = "0scc7xy4clicd6y037fv5cvifankam415cdbn3z56l10bg4h1f1f"; - name = "konversation-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/konversation-21.12.2.tar.xz"; + sha256 = "0lpkah6z12c4f77z6r5z31q5np3xwyb3y6xnsv1iq1rdzj0daxch"; + name = "konversation-21.12.2.tar.xz"; }; }; kopeninghours = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kopeninghours-21.12.1.tar.xz"; - sha256 = "1i1s6xafnna87qn9asnkvaqq22b33jwcdh3s8d8ymvzcd9nch9ck"; - name = "kopeninghours-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kopeninghours-21.12.2.tar.xz"; + sha256 = "1s4wcnk7p0vjqdhyf8131l3s6bn86gfkwl45zwpi7lpyacwgdf6k"; + name = "kopeninghours-21.12.2.tar.xz"; }; }; kopete = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kopete-21.12.1.tar.xz"; - sha256 = "13bc63xaq65bpa3dxjxhg96dvd6kvzj3dis8270saj8cw9kjxhv7"; - name = "kopete-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kopete-21.12.2.tar.xz"; + sha256 = "1py45nk6bv5x2hnfzh5srq17lprkqrmpqr2h0fpmkmffx66njz5q"; + name = "kopete-21.12.2.tar.xz"; }; }; korganizer = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/korganizer-21.12.1.tar.xz"; - sha256 = "0r61v3vis7accnd6irap9ifcld0cd49qfk5h7ajc7vywq1vwjg6d"; - name = "korganizer-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/korganizer-21.12.2.tar.xz"; + sha256 = "1kablp0x65jmdz5n3y19rgplcvvmq8vxz0ljw7lkrwr3pvvhyv3q"; + name = "korganizer-21.12.2.tar.xz"; }; }; kosmindoormap = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kosmindoormap-21.12.1.tar.xz"; - sha256 = "0zrj0cigyy4hgq8lz1kbs7xyjz9b63c37h3r4avq0fpvfqgqzx8k"; - name = "kosmindoormap-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kosmindoormap-21.12.2.tar.xz"; + sha256 = "0max3mfwd5x8m3kqybnkrb4v93rdk1r007xw31l52j2rq2gh8pj2"; + name = "kosmindoormap-21.12.2.tar.xz"; }; }; kpat = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kpat-21.12.1.tar.xz"; - sha256 = "14jx595y3r19g4szks5jkxgl307qicdvwqc594k3xwghn1xcajy2"; - name = "kpat-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kpat-21.12.2.tar.xz"; + sha256 = "0vra8n9xsba67as0ybmbjy235v3s7dmrwlf18avnb3ygxy0h8swf"; + name = "kpat-21.12.2.tar.xz"; }; }; kpimtextedit = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kpimtextedit-21.12.1.tar.xz"; - sha256 = "1ljs4cs8ld9bv7xkw6jlbrhrl3f908pcj4z8g1i0rd1q9ygcwanr"; - name = "kpimtextedit-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kpimtextedit-21.12.2.tar.xz"; + sha256 = "06d42k433dvkfrnzfdx0b1qarrnmhnb4gyq7vgy6251ah8smild8"; + name = "kpimtextedit-21.12.2.tar.xz"; }; }; kpkpass = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kpkpass-21.12.1.tar.xz"; - sha256 = "0ah5gc8d9j3x7y7l93ga63yqp9v77xwmnrx9xs45jlq07vzwcnbw"; - name = "kpkpass-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kpkpass-21.12.2.tar.xz"; + sha256 = "0p2l1z4blfq1iz3x9cnwwx2p9cs6bb4vw1csj29s09i6237ippzx"; + name = "kpkpass-21.12.2.tar.xz"; }; }; kpmcore = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kpmcore-21.12.1.tar.xz"; - sha256 = "16kk135bdlbi897ly5spjmqvkx9ikps002lcij98n89k95c8qzkp"; - name = "kpmcore-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kpmcore-21.12.2.tar.xz"; + sha256 = "1iyirvf04br0r8vclcpx0qrlm8wgqm9ww6xds3h9qjyqj1w8ng41"; + name = "kpmcore-21.12.2.tar.xz"; }; }; kpublictransport = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kpublictransport-21.12.1.tar.xz"; - sha256 = "1vjgzrli8h5h9kykj2lz4la3k4cm45bvvar3qky8p1x21d4snmzf"; - name = "kpublictransport-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kpublictransport-21.12.2.tar.xz"; + sha256 = "02ffpgki4mdyczxa5bqb9wmg2c6anwxnsmlfdn1k47ry7ny2k9sl"; + name = "kpublictransport-21.12.2.tar.xz"; }; }; kqtquickcharts = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kqtquickcharts-21.12.1.tar.xz"; - sha256 = "0dh14ajprxxk7w2bi8hiqs5a7mdf6fvhdzipz608ic9bjg845avs"; - name = "kqtquickcharts-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kqtquickcharts-21.12.2.tar.xz"; + sha256 = "1sjm1vaksvp73866w09xadd1d0lakh00fwiic498siws4dvhhpif"; + name = "kqtquickcharts-21.12.2.tar.xz"; }; }; krdc = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/krdc-21.12.1.tar.xz"; - sha256 = "0azm1jwqlf2dz8kd8zi0iasy84kdy87p6r7896nsxlhqc4igcz2l"; - name = "krdc-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/krdc-21.12.2.tar.xz"; + sha256 = "005i3a7l9aq63nxsivj28kzjy2zdl759snwm56cgwq9rgc6sc003"; + name = "krdc-21.12.2.tar.xz"; }; }; kreversi = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kreversi-21.12.1.tar.xz"; - sha256 = "1wdzf8zdhxy7azbainvq69wjc847ixd2lmqvnhfdrvgz66flrzsg"; - name = "kreversi-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kreversi-21.12.2.tar.xz"; + sha256 = "03b4c28297dzdzplmg818r27r9gpqj48rha9884h22fz9davgmhw"; + name = "kreversi-21.12.2.tar.xz"; }; }; krfb = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/krfb-21.12.1.tar.xz"; - sha256 = "0l7g43scycr95b9rfm5rqidqz8f15mhadp1avgr6nr0r86h2pgvy"; - name = "krfb-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/krfb-21.12.2.tar.xz"; + sha256 = "1989q0mig516hz0lbq2m8p85x8ikpyrhj36cvq4c32sd2nasxkvc"; + name = "krfb-21.12.2.tar.xz"; }; }; kross-interpreters = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kross-interpreters-21.12.1.tar.xz"; - sha256 = "08gdfrf2g9z74zlp3mnqsl0x47a173ibzfxy80kar1hzf0r87gkm"; - name = "kross-interpreters-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kross-interpreters-21.12.2.tar.xz"; + sha256 = "14j7z6lwl0j7zdz29c1kjyhw0my6qfgnyxibwn9z87paxl8nv6z0"; + name = "kross-interpreters-21.12.2.tar.xz"; }; }; kruler = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kruler-21.12.1.tar.xz"; - sha256 = "09cypq0yrrm5075p1y9js26qcy582w9gx2xzif2sr8fi77fsxfd2"; - name = "kruler-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kruler-21.12.2.tar.xz"; + sha256 = "1w5dw3qda69d4ycbiaj18gfn6w28dj2lc37x2d86kx5skv8adxbw"; + name = "kruler-21.12.2.tar.xz"; }; }; kshisen = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kshisen-21.12.1.tar.xz"; - sha256 = "0nh25l9prhq1lzh2dafj84pry726441m6iqhbcyswr5g0cbl16qf"; - name = "kshisen-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kshisen-21.12.2.tar.xz"; + sha256 = "0wjr9fnkmbylfq13zy3hifr4byj4y46f8cwh0w61ypgc0wjxnhhg"; + name = "kshisen-21.12.2.tar.xz"; }; }; ksirk = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ksirk-21.12.1.tar.xz"; - sha256 = "1qx0s2svvb3db9724pvm9cpqby5mqhyfl138q67qr9sr4bg10znm"; - name = "ksirk-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ksirk-21.12.2.tar.xz"; + sha256 = "1lif8n8n2pj4vaf7zifqj7mjv5dbhki75wbwjd4q061wpr434vfj"; + name = "ksirk-21.12.2.tar.xz"; }; }; ksmtp = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ksmtp-21.12.1.tar.xz"; - sha256 = "128c6bfqpmaqaz95vlrhszavyp0dyk0bvakj2v5aliwgzzpp64lq"; - name = "ksmtp-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ksmtp-21.12.2.tar.xz"; + sha256 = "0hg5g401map67kjcgrd1a07iwyss5jnryhpsajffwz19sra855jp"; + name = "ksmtp-21.12.2.tar.xz"; }; }; ksnakeduel = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ksnakeduel-21.12.1.tar.xz"; - sha256 = "08wb50ryrygggc0hhk8nsb8bqh8i4r0p90g8mq4698pnjzkwxmdl"; - name = "ksnakeduel-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ksnakeduel-21.12.2.tar.xz"; + sha256 = "0rdbsyfd3bink5cb0k5l713jw4syhz82kchn95cbg5zgc2iclfw4"; + name = "ksnakeduel-21.12.2.tar.xz"; }; }; kspaceduel = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kspaceduel-21.12.1.tar.xz"; - sha256 = "1qnqs0vn469syhxjw811s1r9nk803ilprfmhz64d9hzr2vjj75jc"; - name = "kspaceduel-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kspaceduel-21.12.2.tar.xz"; + sha256 = "1kmwn55a4555g5m21jcr88k3f9aj87yifgrab6sx6gcw5q51d7vz"; + name = "kspaceduel-21.12.2.tar.xz"; }; }; ksquares = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ksquares-21.12.1.tar.xz"; - sha256 = "011xgs4fjf05sa268jx1026xxfkhn5gv3nzzcdp5b7gjz3ml8imv"; - name = "ksquares-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ksquares-21.12.2.tar.xz"; + sha256 = "12k09lasxyaxq4bp4fhczj8bpi8l6h1gn4nj6ka3zbc4mxxz34yc"; + name = "ksquares-21.12.2.tar.xz"; }; }; ksudoku = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ksudoku-21.12.1.tar.xz"; - sha256 = "05annym6898p2db209zdvs8y1an5mdj4750166wbki2kwblbmy2s"; - name = "ksudoku-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ksudoku-21.12.2.tar.xz"; + sha256 = "1din2i3d9lhca5kw06ivixgk2prh1kfy8ikm0byl8qaqj4v89lji"; + name = "ksudoku-21.12.2.tar.xz"; }; }; ksystemlog = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ksystemlog-21.12.1.tar.xz"; - sha256 = "1rq99fy5c3asvrldwvbg2qblicij3jswbj3vddbqs1zfdcxfy55l"; - name = "ksystemlog-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ksystemlog-21.12.2.tar.xz"; + sha256 = "0cvx13859bm4kfz75iia3chzi5pbbv70lkmspvjpa6cpsn05zy53"; + name = "ksystemlog-21.12.2.tar.xz"; }; }; kteatime = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kteatime-21.12.1.tar.xz"; - sha256 = "13apl34vz40gh8h3p7l8a3hmlc19gil5kkfayg5lnzbikmzvc82y"; - name = "kteatime-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kteatime-21.12.2.tar.xz"; + sha256 = "1m7ni3w82lqykgs5qfi0a43p9973244k8lr6rk30x7w551rc7yyw"; + name = "kteatime-21.12.2.tar.xz"; }; }; ktimer = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktimer-21.12.1.tar.xz"; - sha256 = "0rmji8z5skj73rnibicy4awa12iylhy1j63c9rf31l3sqvc6dbdm"; - name = "ktimer-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktimer-21.12.2.tar.xz"; + sha256 = "0jprayxn54pw7brrcb1b70y5sal9j6pfpwrphd2nyw5rkb2a484l"; + name = "ktimer-21.12.2.tar.xz"; }; }; ktnef = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktnef-21.12.1.tar.xz"; - sha256 = "0iql7nxh1hlpv8f5qa0w566jibvbfhzmc7qzcady06i6wzvbvivs"; - name = "ktnef-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktnef-21.12.2.tar.xz"; + sha256 = "0cl589z0v6h1z3aszk4160y99gpihpk203rn73dmb7c6qsk11cbl"; + name = "ktnef-21.12.2.tar.xz"; }; }; ktorrent = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktorrent-21.12.1.tar.xz"; - sha256 = "0bldsl3ikdypis2vjzzk137spy9hsqj74vkq376klzyn3pjnnxj7"; - name = "ktorrent-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktorrent-21.12.2.tar.xz"; + sha256 = "1zwakqp5j2795j4pln4sq595bc2zlw8cy8qdzwj365clfbpcbyc3"; + name = "ktorrent-21.12.2.tar.xz"; }; }; ktouch = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktouch-21.12.1.tar.xz"; - sha256 = "0875iiaa7c3ij1cgdd5lyj69rzpgwhvwm19iycjbq7pn4254qz3l"; - name = "ktouch-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktouch-21.12.2.tar.xz"; + sha256 = "1rq2n8395sb17rqd295axv2pbwzhqs8ikjqx5ryn4lv1713alabl"; + name = "ktouch-21.12.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-accounts-kcm-21.12.1.tar.xz"; - sha256 = "06zakwv6vxs5my79n4gxq0m2ha5358kpp8s57zyh59cfsz42gi0b"; - name = "ktp-accounts-kcm-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-accounts-kcm-21.12.2.tar.xz"; + sha256 = "14niidb9kza6sms9rhhnvrba6rdwhc890b5inmlhdllnqbdrrcbl"; + name = "ktp-accounts-kcm-21.12.2.tar.xz"; }; }; ktp-approver = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-approver-21.12.1.tar.xz"; - sha256 = "0dkqd3apzmip5kilws9zx922skz31g1rz158ayxnf64mw1wqbb9g"; - name = "ktp-approver-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-approver-21.12.2.tar.xz"; + sha256 = "11scv978silxrprkyd66b4xkdww05xpgk8kvrknlwp33rmhm05sn"; + name = "ktp-approver-21.12.2.tar.xz"; }; }; ktp-auth-handler = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-auth-handler-21.12.1.tar.xz"; - sha256 = "1i83rzv7f581ly4baqqfgn6hnvyq7a8pp5wpwz6fqk8nhqsk1fi0"; - name = "ktp-auth-handler-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-auth-handler-21.12.2.tar.xz"; + sha256 = "006an8bva8zawnirv3ai3kjb59ffgany124ip546r5wg06zkk069"; + name = "ktp-auth-handler-21.12.2.tar.xz"; }; }; ktp-call-ui = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-call-ui-21.12.1.tar.xz"; - sha256 = "0wlyrdn55zwpfxm9mdf8w01z2v2j35va9k35bg8ih4rq4dq4dgrz"; - name = "ktp-call-ui-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-call-ui-21.12.2.tar.xz"; + sha256 = "0n8yirlsig37839rl73azg8vf8ppdxlf1dqgkf5bz8g3jcs92gcm"; + name = "ktp-call-ui-21.12.2.tar.xz"; }; }; ktp-common-internals = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-common-internals-21.12.1.tar.xz"; - sha256 = "0lsa2fsd84pq14xlij5951j9szwq7afffx2zkmx4ssfaiqhm048b"; - name = "ktp-common-internals-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-common-internals-21.12.2.tar.xz"; + sha256 = "0c7kfrgf8bqm7q9hp9fd8q49vakiihzl0dgdklpvgly48zfa2yan"; + name = "ktp-common-internals-21.12.2.tar.xz"; }; }; ktp-contact-list = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-contact-list-21.12.1.tar.xz"; - sha256 = "1w42pm6k5sil1ylmzsl615q7kkw7kjl3bjj5xcz8ysf2m9w6c3xc"; - name = "ktp-contact-list-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-contact-list-21.12.2.tar.xz"; + sha256 = "0pw5kl0lh0ph3y9hyws7h7phh475lw07gydxxjsfxsd4nb70hkz8"; + name = "ktp-contact-list-21.12.2.tar.xz"; }; }; ktp-contact-runner = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-contact-runner-21.12.1.tar.xz"; - sha256 = "0rlvavvdpa8bqv494b7dsrdib1f2xvic4l67v4z07bj9c53dj4x2"; - name = "ktp-contact-runner-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-contact-runner-21.12.2.tar.xz"; + sha256 = "0as41gba7ra65i6ml8j8fqh70x165cnmp9ry13ijrdf9vx21a45k"; + name = "ktp-contact-runner-21.12.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-desktop-applets-21.12.1.tar.xz"; - sha256 = "1aig58wv6lrz9x2rmjd2qk9hff91bkjqw6ixn9f12yh7vgckp1ba"; - name = "ktp-desktop-applets-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-desktop-applets-21.12.2.tar.xz"; + sha256 = "0675hlcjq6xyzl1sz3a45inc3g69z5ilxyhhicxns8by3ydmb82x"; + name = "ktp-desktop-applets-21.12.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-filetransfer-handler-21.12.1.tar.xz"; - sha256 = "16h0ysg7y71sxdg0n535dhh9gsb32bbgjdizmpqn3cwcr75z9h9c"; - name = "ktp-filetransfer-handler-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-filetransfer-handler-21.12.2.tar.xz"; + sha256 = "1cw2y06zcdfm9vixw99gbipgkl63vpkf73giq5ibal2g2yq9c2r5"; + name = "ktp-filetransfer-handler-21.12.2.tar.xz"; }; }; ktp-kded-module = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-kded-module-21.12.1.tar.xz"; - sha256 = "0a0khk48whf2cmxsjfc5lajnbrz3m9gpcvdgqlyyi21v2z4rshj5"; - name = "ktp-kded-module-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-kded-module-21.12.2.tar.xz"; + sha256 = "1mwmdnr2c6ilhhjlq8bwd7gwvjmiq1k3lph5vlb5hy8nrp9x2p1r"; + name = "ktp-kded-module-21.12.2.tar.xz"; }; }; ktp-send-file = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-send-file-21.12.1.tar.xz"; - sha256 = "03k9mylyhanxbkzzcsv8z2mjx98qzghvbcwy8193259xrxshmlix"; - name = "ktp-send-file-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-send-file-21.12.2.tar.xz"; + sha256 = "0083z5al3jgl1szmzddzkjln9ci37906mmnrcy9f0yxfq5v2gr44"; + name = "ktp-send-file-21.12.2.tar.xz"; }; }; ktp-text-ui = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktp-text-ui-21.12.1.tar.xz"; - sha256 = "1n075fhqwk2522a7xc8z30j12d2sqkyybflidbs4kmbr915xh1zi"; - name = "ktp-text-ui-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktp-text-ui-21.12.2.tar.xz"; + sha256 = "0lhbsmhp23sil3rckk51156qhz15hjyp943mgh4s3w49lwxgjpc8"; + name = "ktp-text-ui-21.12.2.tar.xz"; }; }; ktuberling = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/ktuberling-21.12.1.tar.xz"; - sha256 = "0q6jm8m97zfj10q90s44a19x1aijbnysmnm0am26hzh84r3d1mq6"; - name = "ktuberling-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/ktuberling-21.12.2.tar.xz"; + sha256 = "0w9gx0i895vd0gi8wgd6hqikqjz5ir4li14i15k4akc7i7niy46r"; + name = "ktuberling-21.12.2.tar.xz"; }; }; kturtle = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kturtle-21.12.1.tar.xz"; - sha256 = "053bf9w5isqmi95spyy1a88iaw2f3zfr6xh5axwdycni4fnax9hx"; - name = "kturtle-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kturtle-21.12.2.tar.xz"; + sha256 = "0xkl12albs66vnsbilkwpnw5qaqx2ss8wldsnigmf0x5d5hd554k"; + name = "kturtle-21.12.2.tar.xz"; }; }; kubrick = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kubrick-21.12.1.tar.xz"; - sha256 = "1gwa8r7jy132zxzdr24shkpq7c7rawirrs7np7khhavm0g0nmk21"; - name = "kubrick-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kubrick-21.12.2.tar.xz"; + sha256 = "1sd8biyndnc7y4d3zsy4bmi409js9viyd4q5ql6fd2wcz656y1im"; + name = "kubrick-21.12.2.tar.xz"; }; }; kwalletmanager = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kwalletmanager-21.12.1.tar.xz"; - sha256 = "1qf8sizzdszvfskg8i0qmzb81292qm5jpcryl43b1bzh3yc6wx8c"; - name = "kwalletmanager-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kwalletmanager-21.12.2.tar.xz"; + sha256 = "0d2ma7dzn0nc25fj7lwaysfjfgqfl5nsisc01lp42n9k1bg0s0i5"; + name = "kwalletmanager-21.12.2.tar.xz"; }; }; kwave = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kwave-21.12.1.tar.xz"; - sha256 = "0qc8l72nly01pyn7sk3c3hm1a1iia733gam4jzf04dcs0x3l3iw5"; - name = "kwave-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kwave-21.12.2.tar.xz"; + sha256 = "01bjsm3aj7m1mq3nr6iwmcxswq8sxdxhhdyc5zlgffifpym53dc5"; + name = "kwave-21.12.2.tar.xz"; }; }; kwordquiz = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/kwordquiz-21.12.1.tar.xz"; - sha256 = "083r0n1x75bh82aysi5n7lk3x7r3in93fcavjpklxr4dvzl28qs5"; - name = "kwordquiz-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/kwordquiz-21.12.2.tar.xz"; + sha256 = "1na113adrd9djxk016riz3ajwrn9rbpc0ib34adfvp6nw48d9snp"; + name = "kwordquiz-21.12.2.tar.xz"; }; }; libgravatar = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libgravatar-21.12.1.tar.xz"; - sha256 = "0lhlxxg2il435sz3j0sa8x4ydr0fz7idvzp27qqjgrjsxfqn1gbf"; - name = "libgravatar-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libgravatar-21.12.2.tar.xz"; + sha256 = "0xj3v0cknkvr8ac5iipxpz1azr0hk42zgaaip5ivn7qjfhp0zvv0"; + name = "libgravatar-21.12.2.tar.xz"; }; }; libkcddb = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkcddb-21.12.1.tar.xz"; - sha256 = "02j6j44dgsyxdj83qhf2lr4l297184v63s8qwn0pxqjxjidcsajb"; - name = "libkcddb-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkcddb-21.12.2.tar.xz"; + sha256 = "07bcbmf3z5l0v5b6ra1h36yvbjpim1kzz1npd2h30iq09ibx6dr8"; + name = "libkcddb-21.12.2.tar.xz"; }; }; libkcompactdisc = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkcompactdisc-21.12.1.tar.xz"; - sha256 = "1am11g39jafy77av7ddc5yimfd07yvh7czaipamydw7lshcscjrq"; - name = "libkcompactdisc-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkcompactdisc-21.12.2.tar.xz"; + sha256 = "08abnybd0fa0vvpaixi18ljfz0s8a5pmbblzpcc8rvwzdjc7az6q"; + name = "libkcompactdisc-21.12.2.tar.xz"; }; }; libkdcraw = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkdcraw-21.12.1.tar.xz"; - sha256 = "1g2fgw1dx4wvb7x1d5z5qqys348jnrjyvs2iad4ls54l1ci20sws"; - name = "libkdcraw-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkdcraw-21.12.2.tar.xz"; + sha256 = "0mzq0nha7mq5v3lb03xbspc0y2a7mg1mzlwbp3706ph6jp4m7mwa"; + name = "libkdcraw-21.12.2.tar.xz"; }; }; libkdegames = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkdegames-21.12.1.tar.xz"; - sha256 = "0h5d7yf56x52ibm4yq14rbq8ha65x0isgpnw0jxgw5mrfz9m4wcy"; - name = "libkdegames-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkdegames-21.12.2.tar.xz"; + sha256 = "1m1qz59fb82bsj9ri3b8a1ph2ihgs97wlqq91pbgqw0kgvyvka1j"; + name = "libkdegames-21.12.2.tar.xz"; }; }; libkdepim = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkdepim-21.12.1.tar.xz"; - sha256 = "0g5vb2iwqclbrbl19vlzx1ppra6mj454574nakw900qkzrp6rbfn"; - name = "libkdepim-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkdepim-21.12.2.tar.xz"; + sha256 = "0qqz9b17fz3kgh3gcyq30ds8fq7zkm14k85g4mywsn3lnn8bj6z9"; + name = "libkdepim-21.12.2.tar.xz"; }; }; libkeduvocdocument = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkeduvocdocument-21.12.1.tar.xz"; - sha256 = "1wa81hh607hk0h930rr95zff8pzpsvjz1vaygfcfpf8h3gcwc418"; - name = "libkeduvocdocument-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkeduvocdocument-21.12.2.tar.xz"; + sha256 = "16vh1bycq92bh47phv7nk62r5vjaiv1p8fvq5p5idsz9ipzb1wzp"; + name = "libkeduvocdocument-21.12.2.tar.xz"; }; }; libkexiv2 = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkexiv2-21.12.1.tar.xz"; - sha256 = "1yxa28hawyqm9s94p5qrcb2g9ly68i4cfj99xbzg3yl9simbhc5b"; - name = "libkexiv2-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkexiv2-21.12.2.tar.xz"; + sha256 = "1j1p1pw2l32q7lk8kp6r0nz9mzjdw6mxr2gi0p770k3k0arrsg87"; + name = "libkexiv2-21.12.2.tar.xz"; }; }; libkgapi = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkgapi-21.12.1.tar.xz"; - sha256 = "0rwr37fy21d3jx35yv06kl29wd64sp21yg3rdhhv1bnbpsipk51k"; - name = "libkgapi-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkgapi-21.12.2.tar.xz"; + sha256 = "0n6x0vdirv5qbi9qmd8956i307dz0lp80bw5cqxgk4gr4f8hzi8w"; + name = "libkgapi-21.12.2.tar.xz"; }; }; libkipi = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkipi-21.12.1.tar.xz"; - sha256 = "06p53h72d7mbqdv5zsrbwc7k4xjxmbirqvfyxgc5h7y46lcr5dby"; - name = "libkipi-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkipi-21.12.2.tar.xz"; + sha256 = "0zlga9gy45cs3icx56gvq2nab7i3z5ydrmisa46vpca63w8swmys"; + name = "libkipi-21.12.2.tar.xz"; }; }; libkleo = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkleo-21.12.1.tar.xz"; - sha256 = "0f5nwc7w3m204j8a2cf0nclxak12l2vrssd1wnnv1r4a7pp33w4p"; - name = "libkleo-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkleo-21.12.2.tar.xz"; + sha256 = "0vqgycmj2v91car7ckksnjxbq3b5nzk31p4x3577dgck9jmi30zd"; + name = "libkleo-21.12.2.tar.xz"; }; }; libkmahjongg = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkmahjongg-21.12.1.tar.xz"; - sha256 = "0255mfa15v2mawvhrhv2yr1lmv5vfnil3nqxwv85l67m8d227y84"; - name = "libkmahjongg-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkmahjongg-21.12.2.tar.xz"; + sha256 = "10fgk8nhcr3rbdnh8az46jvl6w6xankdxzw4djj3qs4dpkl52vk4"; + name = "libkmahjongg-21.12.2.tar.xz"; }; }; libkomparediff2 = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libkomparediff2-21.12.1.tar.xz"; - sha256 = "03wcfhnb4q72140rgkf1rpsa6chhz55jpjj1dfhjxzjfh2pd0r5w"; - name = "libkomparediff2-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libkomparediff2-21.12.2.tar.xz"; + sha256 = "07yzzc6ns1yx92gpcvhnxw0xna6ly1j4l4lx1rbw3d94z796694z"; + name = "libkomparediff2-21.12.2.tar.xz"; }; }; libksane = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libksane-21.12.1.tar.xz"; - sha256 = "1jlc04jx66rkip723szwl38r61n2rwg07d20yx6ahx6bmsdgznwx"; - name = "libksane-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libksane-21.12.2.tar.xz"; + sha256 = "1iksfjwkibn1i8n541nngalrp8krc94qy9in801q10d291clwz9i"; + name = "libksane-21.12.2.tar.xz"; }; }; libksieve = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libksieve-21.12.1.tar.xz"; - sha256 = "1d1aibkcn1xagmr03sadffvwz3q8idpva6dbgngwyyanj9hjs74i"; - name = "libksieve-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libksieve-21.12.2.tar.xz"; + sha256 = "03aaqqb5g9iv49crrf7zbmsri8jjszn5wfvmcw559swalmmyzb4i"; + name = "libksieve-21.12.2.tar.xz"; }; }; libktorrent = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/libktorrent-21.12.1.tar.xz"; - sha256 = "02bkwypfrfx114yh9hjxy6kwb2crbl9xvk61287yg4ww0zdprdgv"; - name = "libktorrent-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/libktorrent-21.12.2.tar.xz"; + sha256 = "06ak3bsy5x6a0r3l9hbfih9m41y3l357rpd42x8qp08djbs11xbf"; + name = "libktorrent-21.12.2.tar.xz"; }; }; lokalize = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/lokalize-21.12.1.tar.xz"; - sha256 = "08ipsp09d14vqk25jrv690757h9iy6d0mysgcv9jss5jacng6c3z"; - name = "lokalize-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/lokalize-21.12.2.tar.xz"; + sha256 = "1x6sb1fw0fqvk3vg299xvih1v2xm9hviv5h1b624maasw071nfyy"; + name = "lokalize-21.12.2.tar.xz"; }; }; lskat = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/lskat-21.12.1.tar.xz"; - sha256 = "1hxpb4p39mnfs6z7s9a2yq7qjs9lr1kxxdw3a8as7xqahhw1b1jz"; - name = "lskat-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/lskat-21.12.2.tar.xz"; + sha256 = "0v16rg6d2l41xgkrkj8ibh5a0zjyb4jn7am6rbgl6k9g9mfqwdx7"; + name = "lskat-21.12.2.tar.xz"; }; }; mailcommon = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/mailcommon-21.12.1.tar.xz"; - sha256 = "04kyli2f684wbq7n1zjrajqlvdzz058klpa9wxad73l7xni9sa33"; - name = "mailcommon-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/mailcommon-21.12.2.tar.xz"; + sha256 = "01kirl4lk1xq7y474438jv0av3ccg18krlchllcigd9c0vcp67qj"; + name = "mailcommon-21.12.2.tar.xz"; }; }; mailimporter = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/mailimporter-21.12.1.tar.xz"; - sha256 = "14kb4wdgs2snmni87zdah4l8ga67bg06wiqx0y2gv2yhibgap7p3"; - name = "mailimporter-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/mailimporter-21.12.2.tar.xz"; + sha256 = "1ng8w4byq4iiwfzh4acl2glndlr7r9hr62qpj10kpn4fi0qblakb"; + name = "mailimporter-21.12.2.tar.xz"; }; }; marble = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/marble-21.12.1.tar.xz"; - sha256 = "0j8whcbiwaal7wrqg99wn5zdnrnayjm8v9sfraigd0wnnfd6v2sn"; - name = "marble-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/marble-21.12.2.tar.xz"; + sha256 = "093drig77dyxwfavx30h2nzdqkn52h6pjn54j7fnwygz4742qv7n"; + name = "marble-21.12.2.tar.xz"; }; }; markdownpart = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/markdownpart-21.12.1.tar.xz"; - sha256 = "02w137hqjsryb4dv5h1vmbd1c55imkwcy5r7ax5zvisclr4ylxfz"; - name = "markdownpart-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/markdownpart-21.12.2.tar.xz"; + sha256 = "0g7j15s15blqr0lfagmhvxxggdplvmnkf8g2b9ysjkrr49lgk7b6"; + name = "markdownpart-21.12.2.tar.xz"; }; }; mbox-importer = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/mbox-importer-21.12.1.tar.xz"; - sha256 = "0y10pd8sjn0j4cdl7z773y5cral8lbmw42czzp4ig8yrlpbfs71j"; - name = "mbox-importer-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/mbox-importer-21.12.2.tar.xz"; + sha256 = "0qakmg86978zjm2m98602zbaiyiryrmlx2vk93yyv5xg352gphjb"; + name = "mbox-importer-21.12.2.tar.xz"; }; }; messagelib = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/messagelib-21.12.1.tar.xz"; - sha256 = "1aywrhxw1ibx5dk68rv66h55fqipdcs0mdxw0jvfyrpfsvq4nbdc"; - name = "messagelib-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/messagelib-21.12.2.tar.xz"; + sha256 = "0ln473gdwsscjpsh50h2cbazxbc8qy1mmll9lsfngfw1qq49dwsp"; + name = "messagelib-21.12.2.tar.xz"; }; }; minuet = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/minuet-21.12.1.tar.xz"; - sha256 = "1pqik8mp3p628xz0q1pd82f8l1g3wrlz5lzsh1fnyj2mc8fwi4nw"; - name = "minuet-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/minuet-21.12.2.tar.xz"; + sha256 = "050pmw3srfb800h91x6pqn1vz7s6458w94r2innwc1j04pr8jaxv"; + name = "minuet-21.12.2.tar.xz"; }; }; okular = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/okular-21.12.1.tar.xz"; - sha256 = "189b47ysmvykpyjdh5jpzk7ahy3pvg2gf71qyvhcr55pqb763g84"; - name = "okular-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/okular-21.12.2.tar.xz"; + sha256 = "1k0bwyhk73gshc7f0j6mply2m9ykfd07mhkxwnzj874sby5rxhv9"; + name = "okular-21.12.2.tar.xz"; }; }; palapeli = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/palapeli-21.12.1.tar.xz"; - sha256 = "032702k31psyr7fy5i6f2r4a56f4m9zawjamyr0jwwq4faydj6y6"; - name = "palapeli-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/palapeli-21.12.2.tar.xz"; + sha256 = "0v5456hm56c7f9d49l5zjql6f4ap72wmkf8in8s95lqmpn42dl17"; + name = "palapeli-21.12.2.tar.xz"; }; }; parley = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/parley-21.12.1.tar.xz"; - sha256 = "1h9jasmi96i1rmxqg7gps8fy03al4042x89h9yca57sfj3966iy0"; - name = "parley-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/parley-21.12.2.tar.xz"; + sha256 = "1cwnlv57yqjm52i0jwl33pz4h9h448h0ljrg598ghby8p3b2i5w7"; + name = "parley-21.12.2.tar.xz"; }; }; partitionmanager = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/partitionmanager-21.12.1.tar.xz"; - sha256 = "1szidy2vwcqzygkw232k5bvk6zr0h0z8349is69q4zvrbamcwawf"; - name = "partitionmanager-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/partitionmanager-21.12.2.tar.xz"; + sha256 = "0rr7ic2ivm7lp3lj20b8rfbx1sr91s24fzxfzfwnw9znl9vj410q"; + name = "partitionmanager-21.12.2.tar.xz"; }; }; picmi = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/picmi-21.12.1.tar.xz"; - sha256 = "0jdadh33f9byljwlxxs268j8crhagg2xx6wsyb2ssyms95qmfd50"; - name = "picmi-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/picmi-21.12.2.tar.xz"; + sha256 = "0qp8b1di3qnv4xrnpcmyi6myrrwzdlijhvxmacx4ijv7b7wlg4r7"; + name = "picmi-21.12.2.tar.xz"; }; }; pim-data-exporter = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/pim-data-exporter-21.12.1.tar.xz"; - sha256 = "1l748ndf4jgn39ij4g2dm54599ygnz3492fpd8i02d2bgm5d3339"; - name = "pim-data-exporter-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/pim-data-exporter-21.12.2.tar.xz"; + sha256 = "0m4dq3x5kbncnvixjigb85j6siws6q600piw53qabiwd6w6rp1xy"; + name = "pim-data-exporter-21.12.2.tar.xz"; }; }; pim-sieve-editor = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/pim-sieve-editor-21.12.1.tar.xz"; - sha256 = "0cnlbalmabycpiy3cmq7j6jz9h3fdfq0md25rr6ri2gvvx1gp0if"; - name = "pim-sieve-editor-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/pim-sieve-editor-21.12.2.tar.xz"; + sha256 = "1cpazs6q6hv15ib6isif5syvpywxfdi7d3w8vc4pnfj94wkcq3gm"; + name = "pim-sieve-editor-21.12.2.tar.xz"; }; }; pimcommon = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/pimcommon-21.12.1.tar.xz"; - sha256 = "1rg4c8bvfrr7rzpxwvjw07phalmxvj592cjcxywnbb4i3hlr9c8g"; - name = "pimcommon-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/pimcommon-21.12.2.tar.xz"; + sha256 = "1pnhjhnjx98wdc3dg71qgjjj3dsncl56d86cagkk2spicv901p69"; + name = "pimcommon-21.12.2.tar.xz"; }; }; poxml = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/poxml-21.12.1.tar.xz"; - sha256 = "1pnqhv059q79g8gwkln9lrvwby96262vamyblrjq1qx2bb4y1038"; - name = "poxml-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/poxml-21.12.2.tar.xz"; + sha256 = "1zzw9jwwd5nx12ma2ihffj6nhr3zlpahnj8k0r8mxcyn99j51kyn"; + name = "poxml-21.12.2.tar.xz"; }; }; print-manager = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/print-manager-21.12.1.tar.xz"; - sha256 = "0yxivldalzharaq2ghrz2j8vlkylp91la36aaqwly396jxaij3w3"; - name = "print-manager-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/print-manager-21.12.2.tar.xz"; + sha256 = "0xqv7f9p27maa0p20nc92g6240qkcin9s3dldr5b5q944hkkxizq"; + name = "print-manager-21.12.2.tar.xz"; }; }; rocs = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/rocs-21.12.1.tar.xz"; - sha256 = "0m4l2sm3mgkici2jvsvzi8pv3cx3i7a7yvh5c0w1ajs34vx0y6ki"; - name = "rocs-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/rocs-21.12.2.tar.xz"; + sha256 = "1mjrgh0vfc1kvici5m1dx23s1c7qpvfx1br91yglgll1biajzqlq"; + name = "rocs-21.12.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/signon-kwallet-extension-21.12.1.tar.xz"; - sha256 = "09j2i1kwinskylww78nhnrkh31p5yizv6jp5lf2igvhd4dpfgxxk"; - name = "signon-kwallet-extension-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/signon-kwallet-extension-21.12.2.tar.xz"; + sha256 = "0qfim8ahklwkixpxcm9sj1w49cmb0wz5r8np6ga3r2rh4vlqdxbf"; + name = "signon-kwallet-extension-21.12.2.tar.xz"; }; }; skanlite = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/skanlite-21.12.1.tar.xz"; - sha256 = "0s53wcm80xp9p5cli9bkharwv4qvhlc10pdb0aysgg76jlqrj78x"; - name = "skanlite-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/skanlite-21.12.2.tar.xz"; + sha256 = "1fvdrzyvps0iqb9irnpdn81gmlmfhgfsfb5mg4i259sms6rq3h8m"; + name = "skanlite-21.12.2.tar.xz"; }; }; spectacle = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/spectacle-21.12.1.tar.xz"; - sha256 = "13qpsxy2v51xvdxml0c9zp62d9lasg76m0ff86kqavwklywc9h72"; - name = "spectacle-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/spectacle-21.12.2.tar.xz"; + sha256 = "1966ynfdkaya1iydi2hfmcr13adk7agjr9ndz2hjrwgjagd29pyr"; + name = "spectacle-21.12.2.tar.xz"; }; }; step = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/step-21.12.1.tar.xz"; - sha256 = "1vh2yw5zyy42jfn9i326x01v34xgnq5d5wyxy6k75v5p5hwsbr64"; - name = "step-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/step-21.12.2.tar.xz"; + sha256 = "1paq5wpya82s92zwacwbjf96nj52gy1sydk0gndyqi8jdplhlnps"; + name = "step-21.12.2.tar.xz"; }; }; svgpart = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/svgpart-21.12.1.tar.xz"; - sha256 = "03ivjg1n1g4bqwrdq38hw2pvh1gk1s00azmnlz3x40fd1xcg3mww"; - name = "svgpart-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/svgpart-21.12.2.tar.xz"; + sha256 = "15624gfcn85xkh6lypkw73iidnclprhqhpxrjggbng1x22jg2iwc"; + name = "svgpart-21.12.2.tar.xz"; }; }; sweeper = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/sweeper-21.12.1.tar.xz"; - sha256 = "0m8k17x90avbw4zay1zkbkpdw809axhvl3c0kjiymyan4a3mi86y"; - name = "sweeper-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/sweeper-21.12.2.tar.xz"; + sha256 = "07rqshzjjzqgmm5z0fn1hjd09prcwlnyilp3s61nl5fciby6m8fh"; + name = "sweeper-21.12.2.tar.xz"; }; }; umbrello = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/umbrello-21.12.1.tar.xz"; - sha256 = "0z4hnrd055f1i7hasrgrqv7chzyy7cscmi0lvjak12mngykckrs9"; - name = "umbrello-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/umbrello-21.12.2.tar.xz"; + sha256 = "07bp3rf31x5c1vag6pw0lal9b6zmvsqa8wg8a30kj7k9wabvjprb"; + name = "umbrello-21.12.2.tar.xz"; }; }; yakuake = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/yakuake-21.12.1.tar.xz"; - sha256 = "1nr28w01bcnhw33s17daps8g040hwnvwxjz4p1gv3xngapqrf6zl"; - name = "yakuake-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/yakuake-21.12.2.tar.xz"; + sha256 = "1xkdyn944ga1xvwbbblnffvlnwgypspr909yvdy6xf5j0qaldsdk"; + name = "yakuake-21.12.2.tar.xz"; }; }; zanshin = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/zanshin-21.12.1.tar.xz"; - sha256 = "0z54w5c5mdmfw4cv6099jlf4kz40b3gxl4wi5z92zxn3d71ck1l5"; - name = "zanshin-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/zanshin-21.12.2.tar.xz"; + sha256 = "1ilgswm4jbjk1mbvcrdi451f1w4vwx3ah6y32a3y5a9blbh9bh6c"; + name = "zanshin-21.12.2.tar.xz"; }; }; zeroconf-ioslave = { - version = "21.12.1"; + version = "21.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/21.12.1/src/zeroconf-ioslave-21.12.1.tar.xz"; - sha256 = "16by90pdmbn7kw7aq2jf9sl67r2ydhp8i9drpznvfxmq99qsk7b6"; - name = "zeroconf-ioslave-21.12.1.tar.xz"; + url = "${mirror}/stable/release-service/21.12.2/src/zeroconf-ioslave-21.12.2.tar.xz"; + sha256 = "0b59npqhmf3yvp9x0jm29bwzlyl0vm9l56jlsgwgiq7pwis5njwd"; + name = "zeroconf-ioslave-21.12.2.tar.xz"; }; }; } diff --git a/pkgs/applications/kde/zanshin.nix b/pkgs/applications/kde/zanshin.nix new file mode 100644 index 000000000000..a43632ce362c --- /dev/null +++ b/pkgs/applications/kde/zanshin.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + akonadi-calendar, boost, kontactinterface, krunner +}: + +mkDerivation { + pname = "zanshin"; + meta = with lib; { + description = "A powerful yet simple application to manage your day to day actions, getting your mind like water"; + homepage = "https://zanshin.kde.org/"; + maintainers = with maintainers; [ zraexy ]; + license = licenses.gpl2Plus; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ akonadi-calendar boost kontactinterface krunner ]; +} diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index ac3922e17d4b..311ef3037bb8 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -30,14 +30,23 @@ , systemd , udev , xdg-utils + + # The 1Password polkit file requires a list of users for whom polkit + # integrations should be enabled. This should be a list of strings that + # correspond to usernames. +, polkitPolicyOwners ? [] }: -stdenv.mkDerivation rec { +let + # Convert the polkitPolicyOwners variable to a polkit-compatible string for the polkit file. + policyOwners = lib.concatStringsSep " " (map (user: "unix-user:${user}") polkitPolicyOwners); + +in stdenv.mkDerivation rec { pname = "1password"; - version = "8.3.0"; + version = "8.6.0"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "1cakv316ipwyw6s3x4a6qhl0nmg17bxhh08c969gma3svamh1grw"; + sha256 = "AgmLbf2YHZr8McSIL5dxp5HxOC7gLrZWIopuA7aL0JI="; }; nativeBuildInputs = [ makeWrapper ]; @@ -86,8 +95,12 @@ stdenv.mkDerivation rec { substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=/opt/1Password/${pname}' 'Exec=${pname}' + '' + (lib.optionalString (polkitPolicyOwners != [ ]) + '' # Polkit file - install -Dm 0644 -t $out/share/polkit-1/actions com.1password.1Password.policy + mkdir -p $out/share/polkit-1/actions + substitute com.1password.1Password.policy.tpl $out/share/polkit-1/actions/com.1password.1Password.policy --replace "\''${POLICY_OWNERS}" "${policyOwners}" + '') + '' # Icons cp -a resources/icons $out/share diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 9dd439fe8e93..25685b2e125e 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,28 +1,38 @@ -{ lib, stdenv, fetchzip, autoPatchelfHook, fetchurl, xar, cpio }: +{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar }: -stdenv.mkDerivation rec { - pname = "1password"; - version = "1.12.2"; +let + inherit (stdenv.hostPlatform) system; + fetch = srcPlatform: sha256: extension: + let + args = { + url = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_${srcPlatform}_v${version}.${extension}"; + inherit sha256; + } // lib.optionalAttrs (extension == "zip") { stripRoot = false; }; + in + if extension == "zip" then fetchzip args else fetchurl args; + + pname = "1password-cli"; + version = "2.0.0"; + sources = rec { + aarch64-linux = fetch "linux_arm64" "sha256-NhCs68on8LzoeOmM5eP8LwmFaVWz6aghqtHzfUlACiA=" "zip"; + i686-linux = fetch "linux_386" "sha256-vCxgEBq4YVfljq2zUpvBdZUbIiam4z64P1m9OMWq1f4=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-CDwrJ5ksXf9kwHobw4jvRUi1hLQzq4/yRlk+kHPN7UE=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-DC9hdzRjQ9iNjbe6PfRpMXzDeInq4rYSAa2nDHQMTRo=" "pkg"; + x86_64-darwin = aarch64-darwin; + }; + platforms = builtins.attrNames sources; + mainProgram = "op"; +in + +stdenv.mkDerivation { + inherit pname version; src = - if stdenv.isLinux then - fetchzip - { - url = { - "i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm_v${version}.zip"; - }.${stdenv.hostPlatform.system}; - sha256 = { - "i686-linux" = "tCm/vDBASPN9FBSVRJ6BrFc7hdtZWPEAgvokJhjazPg="; - "x86_64-linux" = "3VkVMuTAfeEowkguJi2fd1kG7GwO1VN5GBPgNaH3Zv4="; - "aarch64-linux" = "vWoA/0ZfdwVniHmxC4nH1QIc6bjdb00+SwlkIWc9BPs="; - }.${stdenv.hostPlatform.system}; - stripRoot = false; - } else - fetchurl { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_apple_universal_v${version}.pkg"; - sha256 = "xG/6YZdkJxr5Py90rkIyG4mK40yFTmNSfih9jO2uF+4="; - }; + if (builtins.elem system platforms) then + sources.${system} + else + throw "Source for ${pname} is not available for ${system}"; + + nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux autoPatchelfHook; buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; @@ -32,25 +42,27 @@ stdenv.mkDerivation rec { ''; installPhase = '' - install -D op $out/bin/op + install -D ${mainProgram} $out/bin/${mainProgram} + runHook postInstall ''; - dontStrip = stdenv.isDarwin; + postInstall = "installShellCompletion --cmd ${mainProgram}" + lib.concatMapStrings + (s: " --${s} <($out/bin/${mainProgram} completion ${s})") [ "bash" "fish" "zsh" ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + dontStrip = stdenv.isDarwin; doInstallCheck = true; installCheckPhase = '' - $out/bin/op --version + $out/bin/${mainProgram} --version ''; meta = with lib; { description = "1Password command-line tool"; - homepage = "https://support.1password.com/command-line/"; - downloadPage = "https://app-updates.agilebits.com/product_history/CLI"; + homepage = "https://developer.1password.com/docs/cli/"; + downloadPage = "https://app-updates.agilebits.com/product_history/CLI2"; maintainers = with maintainers; [ joelburget marsam ]; license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + inherit mainProgram platforms; }; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 697caed6627b..7587a6ee1241 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "archisteamfarm"; - version = "5.2.1.5"; + version = "5.2.2.4"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-fjRf+9m1VGRq2ylqp5CP+FCPepUPyHjknSmJaei2yyE="; + sha256 = "sha256-Q5gR+CbqoE9QwFjDpnKOzVZuRPUDBukJ0EpqhN5cAws="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix index d3572515ec15..db2f33332806 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix @@ -55,12 +55,12 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.13.14"; sha256 = "07xsdx8j1rhp712kwy8jx9ang6f9zljqrvaggf0ssj5zqbliz93p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.26.0"; sha256 = "1giwdvmy6n4vfb0g7sxmdf9bklb4r2vdfhm1xfxvqys8rfm15d4z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.0"; sha256 = "0np2x73x2g3145qnd4ibkxlz535g19lansmaqkjplf0xc6qi5zsg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.0"; sha256 = "1315hycfqlalh6k4zvvz7pz3dylpp0sr45j1v9avcb143hjqnav6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0r6jyxl3h1asj30la78skd5gsxgwjpvkspmkw1gglxfg85hnqc8w"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.0"; sha256 = "1x254v25wilx4nh4dnjij4p9g0wsrqn9jyf4z48fa1bw1q3j3rba"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1hnqhvgjp342nx9s47w5sknmlpkfxbcfi50pa4vary2r7sv8ka2w"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "1j8cn97swc67ly7ca7m05akczrswbg0gjsk7473vad6770ph79vm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0s874cs94p1rxdy6n22ch3vr1ad1w0nkh7cnjxvxcjim2b4lfvln"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "1jpw4s862j4aa7b7wchi03gxcy02j6hhpbsfbcayiyx6ry788i15"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "0s0xpqd0nc9kldfay5j1krbc1nyfasxw4xxjx1mwpnbr7n99wbms"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) @@ -74,24 +74,25 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.0"; sha256 = "0m4q75iz6nj76sakab3265rzz969gk1rm2qwbvn0v60h3hflkqgb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.0"; sha256 = "07fgwhgnwcf58dkrfpmfyzqvd33x6ir25qn3v96j8bl4x9dn4sij"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.0"; sha256 = "0z2whbviiw6kjqa7c2gj3j7fqq31m28iww66n7hvy3cnqcn3471k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.0"; sha256 = "188cbx99ahvksap9w20943p62fmzxa6fl133w4r7c6bjpsrm29a4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.0"; sha256 = "1016ld3kg4dav2yxxh0i32cy0ixv7s0wl9czydbhkbs2d8669kfx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.0"; sha256 = "159hq4fn2n5n2mkxw6wi4nhj0ifclpn7gxspqljlgczlhkm1vxqb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.0"; sha256 = "146rbmk0svvqaf0c4msg67h17x4k4gd5kzsbb3iqvs14xfkli2xw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0qaylw18flrfl3vxnbp8wsiz29znidmn6dhv7k4v4jj2za16wmji"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.0"; sha256 = "1ywkycp9llrfk4jcd7agaivlhn9pig70cj65xkfhjw1wx51756jc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1njh3iky5wyxdrisz8xfpy7kzbsrvzfhpdl01xbavvz189x4ajqp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "13x1nkigy3nhbr8gxalij7krmzxpciyq4i8k7jdy9278zs1lm5a6"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.3"; sha256 = "14lypnhdby9939l75y6i077x4ccb22yakzjrbapl8an438h09yf8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.3"; sha256 = "1swbrmpsayy99ycwaq68dx9ydd5h3qv9brwig6ryff1xfn1llndq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.3"; sha256 = "1py3nrfvllqlnb9mhs0qwgy7c14n33b2hfb0qc49rx22sqv8ylbp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.3"; sha256 = "0rshhsygm3id8wig8mqs846l8dck65drszpzjh1d00d1fk2bxzs4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.3"; sha256 = "0k9gc94cvn36p0v3pj296asg2sq9a8ah6lfw0xvvmd4hq2k72s79"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.3"; sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0ws9vxias9iynhcajkl9lz4c8f6hc4b5spypxd0ha33lcjaj408a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "0gjj6p2nnxzhyrmmmwiyrll782famhll9lbgj8cji1i93amxq1pb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "003s3x2ffk4g76jy4b60n6vizly03amjbli4lngsy0wzc86c0ij1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "0180ipzzz9pc6f6l17rg5bxz1ghzbapmiqq66kdl33bmbny6vmm9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "1rjkzs2013razi2xs943q62ys1jh8blhjcnj75qkvirf859d11qw"; }) (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 = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (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.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.0.0"; sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.0.0"; sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; }) @@ -161,7 +162,7 @@ (fetchNuGet { pname = "runtime.win.System.Net.Primitives"; version = "4.3.0"; sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; }) (fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) - (fetchNuGet { pname = "SteamKit2"; version = "2.4.0"; sha256 = "14hi47zyp3nc21zjc4a7g6cg8zyq41y9gv35vb96yp1lab6kwa9r"; }) + (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.2.3"; sha256 = "1kx50vliqcqw72aygkm2cs2q82pxdxz17gvz4chz6k858qj4gv0l"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.2.3"; sha256 = "189i1ziv3xkdxpxhkpfx3xfji3iw124s88sqn3ga2vh04fbdak8x"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.2.3"; sha256 = "1r4z1mmgihnmcqb8zd1q6jbz1g72y5ggl833qhmd1q0wnq8awbs8"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix index cc665490a1ac..db2f33332806 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix @@ -55,12 +55,12 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.13.14"; sha256 = "07xsdx8j1rhp712kwy8jx9ang6f9zljqrvaggf0ssj5zqbliz93p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.26.0"; sha256 = "1giwdvmy6n4vfb0g7sxmdf9bklb4r2vdfhm1xfxvqys8rfm15d4z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.0"; sha256 = "0np2x73x2g3145qnd4ibkxlz535g19lansmaqkjplf0xc6qi5zsg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.0"; sha256 = "1315hycfqlalh6k4zvvz7pz3dylpp0sr45j1v9avcb143hjqnav6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0r6jyxl3h1asj30la78skd5gsxgwjpvkspmkw1gglxfg85hnqc8w"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.0"; sha256 = "1x254v25wilx4nh4dnjij4p9g0wsrqn9jyf4z48fa1bw1q3j3rba"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1hnqhvgjp342nx9s47w5sknmlpkfxbcfi50pa4vary2r7sv8ka2w"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "1j8cn97swc67ly7ca7m05akczrswbg0gjsk7473vad6770ph79vm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0s874cs94p1rxdy6n22ch3vr1ad1w0nkh7cnjxvxcjim2b4lfvln"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "1jpw4s862j4aa7b7wchi03gxcy02j6hhpbsfbcayiyx6ry788i15"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "0s0xpqd0nc9kldfay5j1krbc1nyfasxw4xxjx1mwpnbr7n99wbms"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "09whyl3i9mzy10n5zxlq66lj3l4p29hm75igmdip2fb376zxyam3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) @@ -74,24 +74,25 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.0"; sha256 = "0m4q75iz6nj76sakab3265rzz969gk1rm2qwbvn0v60h3hflkqgb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.0"; sha256 = "0aska6s99rfg13ngsaxr151a6sk8r68lv3mj8yv0bhvwcpln4342"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.0"; sha256 = "0z2whbviiw6kjqa7c2gj3j7fqq31m28iww66n7hvy3cnqcn3471k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.0"; sha256 = "188cbx99ahvksap9w20943p62fmzxa6fl133w4r7c6bjpsrm29a4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.0"; sha256 = "1016ld3kg4dav2yxxh0i32cy0ixv7s0wl9czydbhkbs2d8669kfx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.0"; sha256 = "159hq4fn2n5n2mkxw6wi4nhj0ifclpn7gxspqljlgczlhkm1vxqb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.0"; sha256 = "146rbmk0svvqaf0c4msg67h17x4k4gd5kzsbb3iqvs14xfkli2xw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0qaylw18flrfl3vxnbp8wsiz29znidmn6dhv7k4v4jj2za16wmji"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.0"; sha256 = "1ywkycp9llrfk4jcd7agaivlhn9pig70cj65xkfhjw1wx51756jc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.0"; sha256 = "1njh3iky5wyxdrisz8xfpy7kzbsrvzfhpdl01xbavvz189x4ajqp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.0"; sha256 = "13x1nkigy3nhbr8gxalij7krmzxpciyq4i8k7jdy9278zs1lm5a6"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.3"; sha256 = "14lypnhdby9939l75y6i077x4ccb22yakzjrbapl8an438h09yf8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.3"; sha256 = "1swbrmpsayy99ycwaq68dx9ydd5h3qv9brwig6ryff1xfn1llndq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.3"; sha256 = "1py3nrfvllqlnb9mhs0qwgy7c14n33b2hfb0qc49rx22sqv8ylbp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.3"; sha256 = "0rshhsygm3id8wig8mqs846l8dck65drszpzjh1d00d1fk2bxzs4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.3"; sha256 = "0k9gc94cvn36p0v3pj296asg2sq9a8ah6lfw0xvvmd4hq2k72s79"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.3"; sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.3"; sha256 = "0ws9vxias9iynhcajkl9lz4c8f6hc4b5spypxd0ha33lcjaj408a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "0gjj6p2nnxzhyrmmmwiyrll782famhll9lbgj8cji1i93amxq1pb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.3"; sha256 = "003s3x2ffk4g76jy4b60n6vizly03amjbli4lngsy0wzc86c0ij1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.3"; sha256 = "0180ipzzz9pc6f6l17rg5bxz1ghzbapmiqq66kdl33bmbny6vmm9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.3"; sha256 = "1rjkzs2013razi2xs943q62ys1jh8blhjcnj75qkvirf859d11qw"; }) (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 = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (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.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.0.0"; sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.0.0"; sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; }) @@ -161,7 +162,7 @@ (fetchNuGet { pname = "runtime.win.System.Net.Primitives"; version = "4.3.0"; sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; }) (fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) - (fetchNuGet { pname = "SteamKit2"; version = "2.4.0"; sha256 = "14hi47zyp3nc21zjc4a7g6cg8zyq41y9gv35vb96yp1lab6kwa9r"; }) + (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.2.3"; sha256 = "1kx50vliqcqw72aygkm2cs2q82pxdxz17gvz4chz6k858qj4gv0l"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.2.3"; sha256 = "189i1ziv3xkdxpxhkpfx3xfji3iw124s88sqn3ga2vh04fbdak8x"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.2.3"; sha256 = "1r4z1mmgihnmcqb8zd1q6jbz1g72y5ggl833qhmd1q0wnq8awbs8"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 5708bee7698f..98049237b771 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -11,8 +11,8 @@ let repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "e292b5e3c37b0540d398fb4a04b10dd730976a5a"; - sha256 = "1sxv2xkps2fln7di0i406nnhdqg4wd2yzgvwm5nfhawsq941g19z"; + rev = "156992e88d5c695375e9f69c29f2c68bec24d2b1"; + sha256 = "0zqiaj0957rr4kzw8q8zkxvd88nqw5ssym81dsd3pa0ypr4vqb4w"; }; in diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix index d6e5b8d1bd16..b36151857a8c 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix @@ -4,31 +4,31 @@ let sources = { - "@babel/code-frame-7.16.0" = { + "@babel/code-frame-7.16.7" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz"; - sha512 = "IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"; + sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; }; - "@babel/compat-data-7.16.4" = { + "@babel/compat-data-7.16.8" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.16.4"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz"; - sha512 = "1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz"; + sha512 = "m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q=="; }; }; - "@babel/core-7.16.5" = { + "@babel/core-7.16.12" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.16.5"; + version = "7.16.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.16.5.tgz"; - sha512 = "wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz"; + sha512 = "dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg=="; }; }; "@babel/eslint-parser-7.16.5" = { @@ -40,58 +40,58 @@ let sha512 = "mUqYa46lgWqHKQ33Q6LNCGp/wPR3eqOYTUixHFsfrSQqRxH0+WOzca75iEjFr5RDGH1dDz622LaHhLOzOuQRUA=="; }; }; - "@babel/generator-7.16.5" = { + "@babel/generator-7.16.8" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz"; - sha512 = "kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz"; + sha512 = "1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw=="; }; }; - "@babel/helper-annotate-as-pure-7.16.0" = { + "@babel/helper-annotate-as-pure-7.16.7" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz"; - sha512 = "ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz"; + sha512 = "s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.5.tgz"; - sha512 = "3JEA9G5dmmnIWdzaT9d0NmFRgYnWUThLsDaL7982H0XqqWr56lRrsmwheXFMjR+TMl7QMBb6mzy9kvgr1lRLUA=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz"; + sha512 = "C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA=="; }; }; - "@babel/helper-compilation-targets-7.16.3" = { + "@babel/helper-compilation-targets-7.16.7" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.16.3"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz"; - sha512 = "vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz"; + sha512 = "mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA=="; }; }; - "@babel/helper-create-class-features-plugin-7.16.5" = { + "@babel/helper-create-class-features-plugin-7.16.10" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.16.5"; + version = "7.16.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.5.tgz"; - sha512 = "NEohnYA7mkB8L5JhU7BLwcBdU3j83IziR9aseMueWGeAjblbul3zzb8UvJ3a1zuBiqCMObzCJHFqKIQE6hTVmg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz"; + sha512 = "wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.16.0" = { + "@babel/helper-create-regexp-features-plugin-7.16.7" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz"; - sha512 = "3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz"; + sha512 = "fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g=="; }; }; "@babel/helper-define-polyfill-provider-0.3.0" = { @@ -103,130 +103,121 @@ let sha512 = "7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg=="; }; }; - "@babel/helper-environment-visitor-7.16.5" = { + "@babel/helper-environment-visitor-7.16.7" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz"; - sha512 = "ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"; + sha512 = "SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag=="; }; }; - "@babel/helper-explode-assignable-expression-7.16.0" = { + "@babel/helper-explode-assignable-expression-7.16.7" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz"; - sha512 = "Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz"; + sha512 = "KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ=="; }; }; - "@babel/helper-function-name-7.16.0" = { + "@babel/helper-function-name-7.16.7" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz"; - sha512 = "BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"; + sha512 = "QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA=="; }; }; - "@babel/helper-get-function-arity-7.16.0" = { + "@babel/helper-get-function-arity-7.16.7" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz"; - sha512 = "ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"; + sha512 = "flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw=="; }; }; - "@babel/helper-hoist-variables-7.16.0" = { + "@babel/helper-hoist-variables-7.16.7" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz"; - sha512 = "1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"; + sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg=="; }; }; - "@babel/helper-member-expression-to-functions-7.16.5" = { + "@babel/helper-member-expression-to-functions-7.16.7" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.5.tgz"; - sha512 = "7fecSXq7ZrLE+TWshbGT+HyCLkxloWNhTbU2QM1NTI/tDqyf0oZiMcEfYtDuUDCo528EOlt39G1rftea4bRZIw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz"; + sha512 = "VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q=="; }; }; - "@babel/helper-module-imports-7.16.0" = { + "@babel/helper-module-imports-7.16.7" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz"; - sha512 = "kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"; + sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; }; }; - "@babel/helper-module-transforms-7.16.5" = { + "@babel/helper-module-transforms-7.16.7" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz"; - sha512 = "CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz"; + sha512 = "gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng=="; }; }; - "@babel/helper-optimise-call-expression-7.16.0" = { + "@babel/helper-optimise-call-expression-7.16.7" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz"; - sha512 = "SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz"; + sha512 = "EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w=="; }; }; - "@babel/helper-plugin-utils-7.16.5" = { + "@babel/helper-plugin-utils-7.16.7" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz"; - sha512 = "59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz"; + sha512 = "Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="; }; }; - "@babel/helper-plugin-utils-7.8.0" = { - name = "_at_babel_slash_helper-plugin-utils"; - packageName = "@babel/helper-plugin-utils"; - version = "7.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.0.tgz"; - sha512 = "+hAlRGdf8fHQAyNnDBqTHQhwdLURLdrCROoWaEQYiQhk2sV9Rhs+GoFZZfMJExTq9HG8o2NX3uN2G90bFtmFdA=="; - }; - }; - "@babel/helper-remap-async-to-generator-7.16.5" = { + "@babel/helper-remap-async-to-generator-7.16.8" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.5.tgz"; - sha512 = "X+aAJldyxrOmN9v3FKp+Hu1NO69VWgYgDGq6YDykwRPzxs5f2N+X988CBXS7EQahDU+Vpet5QYMqLk+nsp+Qxw=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz"; + sha512 = "fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw=="; }; }; - "@babel/helper-replace-supers-7.16.5" = { + "@babel/helper-replace-supers-7.16.7" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.5.tgz"; - sha512 = "ao3seGVa/FZCMCCNDuBcqnBFSbdr8N2EW35mzojx3TwfIbdPmNK+JV6+2d5bR0Z71W5ocLnQp9en/cTF7pBJiQ=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz"; + sha512 = "y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw=="; }; }; - "@babel/helper-simple-access-7.16.0" = { + "@babel/helper-simple-access-7.16.7" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz"; - sha512 = "o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz"; + sha512 = "ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.16.0" = { @@ -238,220 +229,220 @@ let sha512 = "+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw=="; }; }; - "@babel/helper-split-export-declaration-7.16.0" = { + "@babel/helper-split-export-declaration-7.16.7" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz"; - sha512 = "0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"; + sha512 = "xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw=="; }; }; - "@babel/helper-validator-identifier-7.15.7" = { + "@babel/helper-validator-identifier-7.16.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.15.7"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; - sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; + sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; }; }; - "@babel/helper-validator-option-7.14.5" = { + "@babel/helper-validator-option-7.16.7" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.14.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; - sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz"; + sha512 = "TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="; }; }; - "@babel/helper-wrap-function-7.16.5" = { + "@babel/helper-wrap-function-7.16.8" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.5.tgz"; - sha512 = "2J2pmLBqUqVdJw78U0KPNdeE2qeuIyKoG4mKV7wAq3mc4jJG282UgjZw4ZYDnqiWQuS3Y3IYdF/AQ6CpyBV3VA=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz"; + sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; }; }; - "@babel/helpers-7.16.5" = { + "@babel/helpers-7.16.7" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.5.tgz"; - sha512 = "TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz"; + sha512 = "9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw=="; }; }; - "@babel/highlight-7.16.0" = { + "@babel/highlight-7.16.7" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz"; - sha512 = "t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz"; + sha512 = "aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw=="; }; }; - "@babel/parser-7.16.5" = { + "@babel/parser-7.16.12" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.16.5"; + version = "7.16.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.5.tgz"; - sha512 = "+Ce7T5iPNWzfu9C1aB5tN3Lyafs5xb3Ic7vBWyZL2KXT3QSdD1dD3CvgOzPmQKoNNRt6uauc0XwNJTQtXC2/Mw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz"; + sha512 = "VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A=="; }; }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" = { + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" = { 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.16.2"; + version = "7.16.7"; 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.16.2.tgz"; - sha512 = "h37CvpLSf8gb2lIJ2CgC3t+EjFbi0t8qS7LCS1xcJIlEXE4czlofwaW7W1HA8zpgOCzI9C1nmoqNR1zWkk0pQg=="; + 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.16.7.tgz"; + sha512 = "anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.16.0"; + version = "7.16.7"; 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.16.0.tgz"; - sha512 = "4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz"; + sha512 = "di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.16.5" = { + "@babel/plugin-proposal-async-generator-functions-7.16.8" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.5.tgz"; - sha512 = "C/FX+3HNLV6sz7AqbTQqEo1L9/kfrKjxcVtgyBCmvIgOjvuBVUWooDoi7trsLxOzCEo5FccjRvKHkfDsJFZlfA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz"; + sha512 = "71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ=="; }; }; - "@babel/plugin-proposal-class-properties-7.16.5" = { + "@babel/plugin-proposal-class-properties-7.16.7" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.5.tgz"; - sha512 = "pJD3HjgRv83s5dv1sTnDbZOaTjghKEz8KUn1Kbh2eAIRhGuyQ1XSeI4xVXU3UlIEVA3DAyIdxqT1eRn7Wcn55A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz"; + sha512 = "IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww=="; }; }; - "@babel/plugin-proposal-class-static-block-7.16.5" = { + "@babel/plugin-proposal-class-static-block-7.16.7" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.5.tgz"; - sha512 = "EEFzuLZcm/rNJ8Q5krK+FRKdVkd6FjfzT9tuSZql9sQn64K0hHA2KLJ0DqVot9/iV6+SsuadC5yI39zWnm+nmQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz"; + sha512 = "dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.16.5" = { + "@babel/plugin-proposal-dynamic-import-7.16.7" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.5.tgz"; - sha512 = "P05/SJZTTvHz79LNYTF8ff5xXge0kk5sIIWAypcWgX4BTRUgyHc8wRxJ/Hk+mU0KXldgOOslKaeqnhthcDJCJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz"; + sha512 = "I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.16.5" = { + "@babel/plugin-proposal-export-namespace-from-7.16.7" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.5.tgz"; - sha512 = "i+sltzEShH1vsVydvNaTRsgvq2vZsfyrd7K7vPLUU/KgS0D5yZMe6uipM0+izminnkKrEfdUnz7CxMRb6oHZWw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz"; + sha512 = "ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA=="; }; }; - "@babel/plugin-proposal-json-strings-7.16.5" = { + "@babel/plugin-proposal-json-strings-7.16.7" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.5.tgz"; - sha512 = "QQJueTFa0y9E4qHANqIvMsuxM/qcLQmKttBACtPCQzGUEizsXDACGonlPiSwynHfOa3vNw0FPMVvQzbuXwh4SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz"; + sha512 = "lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.16.5" = { + "@babel/plugin-proposal-logical-assignment-operators-7.16.7" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.5.tgz"; - sha512 = "xqibl7ISO2vjuQM+MzR3rkd0zfNWltk7n9QhaD8ghMmMceVguYrNDt7MikRyj4J4v3QehpnrU8RYLnC7z/gZLA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz"; + sha512 = "K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.5.tgz"; - sha512 = "YwMsTp/oOviSBhrjwi0vzCUycseCYwoXnLiXIL3YNjHSMBHicGTz7GjVU/IGgz4DtOEXBdCNG72pvCX22ehfqg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz"; + sha512 = "aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.16.5" = { + "@babel/plugin-proposal-numeric-separator-7.16.7" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.5.tgz"; - sha512 = "DvB9l/TcsCRvsIV9v4jxR/jVP45cslTVC0PMVHvaJhhNuhn2Y1SOhCSFlPK777qLB5wb8rVDaNoqMTyOqtY5Iw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz"; + sha512 = "vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.16.5" = { + "@babel/plugin-proposal-object-rest-spread-7.16.7" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.5.tgz"; - sha512 = "UEd6KpChoyPhCoE840KRHOlGhEZFutdPDMGj+0I56yuTTOaT51GzmnEl/0uT41fB/vD2nT+Pci2KjezyE3HmUw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz"; + sha512 = "3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.16.5" = { + "@babel/plugin-proposal-optional-catch-binding-7.16.7" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.5.tgz"; - sha512 = "ihCMxY1Iljmx4bWy/PIMJGXN4NS4oUj1MKynwO07kiKms23pNvIn1DMB92DNB2R0EA882sw0VXIelYGdtF7xEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz"; + sha512 = "eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.16.5" = { + "@babel/plugin-proposal-optional-chaining-7.16.7" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.5.tgz"; - sha512 = "kzdHgnaXRonttiTfKYnSVafbWngPPr2qKw9BWYBESl91W54e+9R5pP70LtWxV56g0f05f/SQrwHYkfvbwcdQ/A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz"; + sha512 = "eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA=="; }; }; - "@babel/plugin-proposal-private-methods-7.16.5" = { + "@babel/plugin-proposal-private-methods-7.16.11" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.16.5"; + version = "7.16.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.5.tgz"; - sha512 = "+yFMO4BGT3sgzXo+lrq7orX5mAZt57DwUK6seqII6AcJnJOIhBJ8pzKH47/ql/d426uQ7YhN8DpUFirQzqYSUA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz"; + sha512 = "F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.16.5" = { + "@babel/plugin-proposal-private-property-in-object-7.16.7" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.5.tgz"; - sha512 = "+YGh5Wbw0NH3y/E5YMu6ci5qTDmAEVNoZ3I54aB6nVEOZ5BQ7QJlwKq5pYVucQilMByGn/bvX0af+uNaPRCabA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz"; + sha512 = "rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.16.5" = { + "@babel/plugin-proposal-unicode-property-regex-7.16.7" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.5.tgz"; - sha512 = "s5sKtlKQyFSatt781HQwv1hoM5BQ9qRH30r+dK56OLDsHmV74mzwJNX7R1yMuE7VZKG5O6q/gmOGSAO6ikTudg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz"; + sha512 = "QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -580,301 +571,301 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.16.5" = { + "@babel/plugin-transform-arrow-functions-7.16.7" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.5.tgz"; - sha512 = "8bTHiiZyMOyfZFULjsCnYOWG059FVMes0iljEHSfARhNgFfpsqE92OrCffv3veSw9rwMkYcFe9bj0ZoXU2IGtQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz"; + sha512 = "9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.16.5" = { + "@babel/plugin-transform-async-to-generator-7.16.8" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.5.tgz"; - sha512 = "TMXgfioJnkXU+XRoj7P2ED7rUm5jbnDWwlCuFVTpQboMfbSya5WrmubNBAMlk7KXvywpo8rd8WuYZkis1o2H8w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz"; + sha512 = "MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.16.5" = { + "@babel/plugin-transform-block-scoped-functions-7.16.7" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.5.tgz"; - sha512 = "BxmIyKLjUGksJ99+hJyL/HIxLIGnLKtw772zYDER7UuycDZ+Xvzs98ZQw6NGgM2ss4/hlFAaGiZmMNKvValEjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz"; + sha512 = "JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg=="; }; }; - "@babel/plugin-transform-block-scoping-7.16.5" = { + "@babel/plugin-transform-block-scoping-7.16.7" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.5.tgz"; - sha512 = "JxjSPNZSiOtmxjX7PBRBeRJTUKTyJ607YUYeT0QJCNdsedOe+/rXITjP08eG8xUpsLfPirgzdCFN+h0w6RI+pQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz"; + sha512 = "ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ=="; }; }; - "@babel/plugin-transform-classes-7.16.5" = { + "@babel/plugin-transform-classes-7.16.7" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.5.tgz"; - sha512 = "DzJ1vYf/7TaCYy57J3SJ9rV+JEuvmlnvvyvYKFbk5u46oQbBvuB9/0w+YsVsxkOv8zVWKpDmUoj4T5ILHoXevA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz"; + sha512 = "WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ=="; }; }; - "@babel/plugin-transform-computed-properties-7.16.5" = { + "@babel/plugin-transform-computed-properties-7.16.7" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.5.tgz"; - sha512 = "n1+O7xtU5lSLraRzX88CNcpl7vtGdPakKzww74bVwpAIRgz9JVLJJpOLb0uYqcOaXVM0TL6X0RVeIJGD2CnCkg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz"; + sha512 = "gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw=="; }; }; - "@babel/plugin-transform-destructuring-7.16.5" = { + "@babel/plugin-transform-destructuring-7.16.7" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.5.tgz"; - sha512 = "GuRVAsjq+c9YPK6NeTkRLWyQskDC099XkBSVO+6QzbnOnH2d/4mBVXYStaPrZD3dFRfg00I6BFJ9Atsjfs8mlg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz"; + sha512 = "VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A=="; }; }; - "@babel/plugin-transform-dotall-regex-7.16.5" = { + "@babel/plugin-transform-dotall-regex-7.16.7" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.5.tgz"; - sha512 = "iQiEMt8Q4/5aRGHpGVK2Zc7a6mx7qEAO7qehgSug3SDImnuMzgmm/wtJALXaz25zUj1PmnNHtShjFgk4PDx4nw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz"; + sha512 = "Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.16.5" = { + "@babel/plugin-transform-duplicate-keys-7.16.7" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.5.tgz"; - sha512 = "81tijpDg2a6I1Yhj4aWY1l3O1J4Cg/Pd7LfvuaH2VVInAkXtzibz9+zSPdUM1WvuUi128ksstAP0hM5w48vQgg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz"; + sha512 = "03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.16.5" = { + "@babel/plugin-transform-exponentiation-operator-7.16.7" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.5.tgz"; - sha512 = "12rba2HwemQPa7BLIKCzm1pT2/RuQHtSFHdNl41cFiC6oi4tcrp7gjB07pxQvFpcADojQywSjblQth6gJyE6CA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz"; + sha512 = "8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA=="; }; }; - "@babel/plugin-transform-for-of-7.16.5" = { + "@babel/plugin-transform-for-of-7.16.7" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.5.tgz"; - sha512 = "+DpCAJFPAvViR17PIMi9x2AE34dll5wNlXO43wagAX2YcRGgEVHCNFC4azG85b4YyyFarvkc/iD5NPrz4Oneqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz"; + sha512 = "/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg=="; }; }; - "@babel/plugin-transform-function-name-7.16.5" = { + "@babel/plugin-transform-function-name-7.16.7" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.5.tgz"; - sha512 = "Fuec/KPSpVLbGo6z1RPw4EE1X+z9gZk1uQmnYy7v4xr4TO9p41v1AoUuXEtyqAI7H+xNJYSICzRqZBhDEkd3kQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz"; + sha512 = "SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA=="; }; }; - "@babel/plugin-transform-literals-7.16.5" = { + "@babel/plugin-transform-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.5.tgz"; - sha512 = "B1j9C/IfvshnPcklsc93AVLTrNVa69iSqztylZH6qnmiAsDDOmmjEYqOm3Ts2lGSgTSywnBNiqC949VdD0/gfw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz"; + sha512 = "6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.16.5" = { + "@babel/plugin-transform-member-expression-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.5.tgz"; - sha512 = "d57i3vPHWgIde/9Y8W/xSFUndhvhZN5Wu2TjRrN1MVz5KzdUihKnfDVlfP1U7mS5DNj/WHHhaE4/tTi4hIyHwQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz"; + sha512 = "mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw=="; }; }; - "@babel/plugin-transform-modules-amd-7.16.5" = { + "@babel/plugin-transform-modules-amd-7.16.7" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.5.tgz"; - sha512 = "oHI15S/hdJuSCfnwIz+4lm6wu/wBn7oJ8+QrkzPPwSFGXk8kgdI/AIKcbR/XnD1nQVMg/i6eNaXpszbGuwYDRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz"; + sha512 = "KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.16.5" = { + "@babel/plugin-transform-modules-commonjs-7.16.8" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.5.tgz"; - sha512 = "ABhUkxvoQyqhCWyb8xXtfwqNMJD7tx+irIRnUh6lmyFud7Jln1WzONXKlax1fg/ey178EXbs4bSGNd6PngO+SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz"; + sha512 = "oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.16.5" = { + "@babel/plugin-transform-modules-systemjs-7.16.7" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.5.tgz"; - sha512 = "53gmLdScNN28XpjEVIm7LbWnD/b/TpbwKbLk6KV4KqC9WyU6rq1jnNmVG6UgAdQZVVGZVoik3DqHNxk4/EvrjA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz"; + sha512 = "DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw=="; }; }; - "@babel/plugin-transform-modules-umd-7.16.5" = { + "@babel/plugin-transform-modules-umd-7.16.7" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.5.tgz"; - sha512 = "qTFnpxHMoenNHkS3VoWRdwrcJ3FhX567GvDA3hRZKF0Dj8Fmg0UzySZp3AP2mShl/bzcywb/UWAMQIjA1bhXvw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz"; + sha512 = "EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.16.5" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.16.8" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.5.tgz"; - sha512 = "/wqGDgvFUeKELW6ex6QB7dLVRkd5ehjw34tpXu1nhKC0sFfmaLabIswnpf8JgDyV2NeDmZiwoOb0rAmxciNfjA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz"; + sha512 = "j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw=="; }; }; - "@babel/plugin-transform-new-target-7.16.5" = { + "@babel/plugin-transform-new-target-7.16.7" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.5.tgz"; - sha512 = "ZaIrnXF08ZC8jnKR4/5g7YakGVL6go6V9ql6Jl3ecO8PQaQqFE74CuM384kezju7Z9nGCCA20BqZaR1tJ/WvHg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz"; + sha512 = "xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg=="; }; }; - "@babel/plugin-transform-object-super-7.16.5" = { + "@babel/plugin-transform-object-super-7.16.7" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.5.tgz"; - sha512 = "tded+yZEXuxt9Jdtkc1RraW1zMF/GalVxaVVxh41IYwirdRgyAxxxCKZ9XB7LxZqmsjfjALxupNE1MIz9KH+Zg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz"; + sha512 = "14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw=="; }; }; - "@babel/plugin-transform-parameters-7.16.5" = { + "@babel/plugin-transform-parameters-7.16.7" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.5.tgz"; - sha512 = "B3O6AL5oPop1jAVg8CV+haeUte9oFuY85zu0jwnRNZZi3tVAbJriu5tag/oaO2kGaQM/7q7aGPBlTI5/sr9enA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz"; + sha512 = "AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw=="; }; }; - "@babel/plugin-transform-property-literals-7.16.5" = { + "@babel/plugin-transform-property-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.5.tgz"; - sha512 = "+IRcVW71VdF9pEH/2R/Apab4a19LVvdVsr/gEeotH00vSDVlKD+XgfSIw+cgGWsjDB/ziqGv/pGoQZBIiQVXHg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz"; + sha512 = "z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw=="; }; }; - "@babel/plugin-transform-regenerator-7.16.5" = { + "@babel/plugin-transform-regenerator-7.16.7" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.5.tgz"; - sha512 = "2z+it2eVWU8TtQQRauvGUqZwLy4+7rTfo6wO4npr+fvvN1SW30ZF3O/ZRCNmTuu4F5MIP8OJhXAhRV5QMJOuYg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz"; + sha512 = "mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q=="; }; }; - "@babel/plugin-transform-reserved-words-7.16.5" = { + "@babel/plugin-transform-reserved-words-7.16.7" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.5.tgz"; - sha512 = "aIB16u8lNcf7drkhXJRoggOxSTUAuihTSTfAcpynowGJOZiGf+Yvi7RuTwFzVYSYPmWyARsPqUGoZWWWxLiknw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz"; + sha512 = "KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.16.5" = { + "@babel/plugin-transform-shorthand-properties-7.16.7" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.5.tgz"; - sha512 = "ZbuWVcY+MAXJuuW7qDoCwoxDUNClfZxoo7/4swVbOW1s/qYLOMHlm9YRWMsxMFuLs44eXsv4op1vAaBaBaDMVg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz"; + sha512 = "hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg=="; }; }; - "@babel/plugin-transform-spread-7.16.5" = { + "@babel/plugin-transform-spread-7.16.7" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.5.tgz"; - sha512 = "5d6l/cnG7Lw4tGHEoga4xSkYp1euP7LAtrah1h1PgJ3JY7yNsjybsxQAnVK4JbtReZ/8z6ASVmd3QhYYKLaKZw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz"; + sha512 = "+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg=="; }; }; - "@babel/plugin-transform-sticky-regex-7.16.5" = { + "@babel/plugin-transform-sticky-regex-7.16.7" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.5.tgz"; - sha512 = "usYsuO1ID2LXxzuUxifgWtJemP7wL2uZtyrTVM4PKqsmJycdS4U4mGovL5xXkfUheds10Dd2PjoQLXw6zCsCbg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz"; + sha512 = "NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw=="; }; }; - "@babel/plugin-transform-template-literals-7.16.5" = { + "@babel/plugin-transform-template-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.5.tgz"; - sha512 = "gnyKy9RyFhkovex4BjKWL3BVYzUDG6zC0gba7VMLbQoDuqMfJ1SDXs8k/XK41Mmt1Hyp4qNAvGFb9hKzdCqBRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz"; + sha512 = "VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.16.5" = { + "@babel/plugin-transform-typeof-symbol-7.16.7" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.5.tgz"; - sha512 = "ldxCkW180qbrvyCVDzAUZqB0TAeF8W/vGJoRcaf75awm6By+PxfJKvuqVAnq8N9wz5Xa6mSpM19OfVKKVmGHSQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz"; + sha512 = "p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.16.5" = { + "@babel/plugin-transform-unicode-escapes-7.16.7" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.5.tgz"; - sha512 = "shiCBHTIIChGLdyojsKQjoAyB8MBwat25lKM7MJjbe1hE0bgIppD+LX9afr41lLHOhqceqeWl4FkLp+Bgn9o1Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz"; + sha512 = "TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q=="; }; }; - "@babel/plugin-transform-unicode-regex-7.16.5" = { + "@babel/plugin-transform-unicode-regex-7.16.7" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.5.tgz"; - sha512 = "GTJ4IW012tiPEMMubd7sD07iU9O/LOo8Q/oU4xNhcaq0Xn8+6TcUQaHtC8YxySo1T+ErQ8RaWogIEeFhKGNPzw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz"; + sha512 = "oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q=="; }; }; - "@babel/preset-env-7.16.5" = { + "@babel/preset-env-7.16.11" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.16.5"; + version = "7.16.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.5.tgz"; - sha512 = "MiJJW5pwsktG61NDxpZ4oJ1CKxM1ncam9bzRtx9g40/WkLRkxFP6mhpkYV0/DxcciqoiHicx291+eUQrXb/SfQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz"; + sha512 = "qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -895,31 +886,31 @@ let sha512 = "/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg=="; }; }; - "@babel/template-7.16.0" = { + "@babel/template-7.16.7" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz"; - sha512 = "MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz"; + sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; }; - "@babel/traverse-7.16.5" = { + "@babel/traverse-7.16.10" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.16.5"; + version = "7.16.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.5.tgz"; - sha512 = "FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz"; + sha512 = "yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw=="; }; }; - "@babel/types-7.16.0" = { + "@babel/types-7.16.8" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.16.0"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz"; - sha512 = "PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz"; + sha512 = "smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg=="; }; }; "@discoveryjs/json-ext-0.5.5" = { @@ -1048,13 +1039,13 @@ let sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; }; }; - "@types/bonjour-3.5.9" = { + "@types/bonjour-3.5.10" = { name = "_at_types_slash_bonjour"; packageName = "@types/bonjour"; - version = "3.5.9"; + version = "3.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.9.tgz"; - sha512 = "VkZUiYevvtPyFu5XtpYw9a8moCSzxgjs5PAFF4yXjA7eYHvzBlXe+eJdqBBNWWVzI1r7Ki0KxMYvaQuhm+6f5A=="; + url = "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz"; + sha512 = "p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw=="; }; }; "@types/connect-3.4.35" = { @@ -1075,22 +1066,22 @@ let sha512 = "h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw=="; }; }; - "@types/eslint-8.2.1" = { + "@types/eslint-8.2.2" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.1.tgz"; - sha512 = "UP9rzNn/XyGwb5RQ2fok+DzcIRIYwc16qTXse5+Smsy8MOIccCChT15KAwnsgQx4PzJkaMq4myFyZ4CL5TjhIQ=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.2.tgz"; + sha512 = "nQxgB8/Sg+QKhnV8e0WzPpxjIGT3tuJDDzybkDi8ItE/IgTlHo07U0shaIjzhcvQxlq9SDRE42lsJ23uvEgJ2A=="; }; }; - "@types/eslint-scope-3.7.1" = { + "@types/eslint-scope-3.7.3" = { name = "_at_types_slash_eslint-scope"; packageName = "@types/eslint-scope"; - version = "3.7.1"; + version = "3.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz"; - sha512 = "SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g=="; + url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz"; + sha512 = "PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g=="; }; }; "@types/estree-0.0.50" = { @@ -1111,13 +1102,13 @@ let sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; - "@types/express-serve-static-core-4.17.26" = { + "@types/express-serve-static-core-4.17.27" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.26"; + version = "4.17.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.26.tgz"; - sha512 = "zeu3tpouA043RHxW0gzRxwCHchMgftE8GArRsvYT0ByDMbn19olQHx5jLue0LxWY6iYtXb7rXmuVtSkhy9YZvQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.27.tgz"; + sha512 = "e/sVallzUTPdyOTiqi8O8pMdBBphscvI6E4JYaKlja4Lm+zh7UFSSdW5VMkRbhDtmrONqOUHOXRguPsDckzxNA=="; }; }; "@types/glob-7.1.4" = { @@ -1147,15 +1138,6 @@ let sha512 = "5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA=="; }; }; - "@types/json-schema-7.0.8" = { - name = "_at_types_slash_json-schema"; - packageName = "@types/json-schema"; - version = "7.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz"; - sha512 = "YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg=="; - }; - }; "@types/json-schema-7.0.9" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -1480,13 +1462,13 @@ let sha512 = "yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q=="; }; }; - "acorn-8.6.0" = { + "acorn-8.7.0" = { name = "acorn"; packageName = "acorn"; - version = "8.6.0"; + version = "8.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz"; - sha512 = "U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz"; + sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; }; }; "acorn-import-assertions-1.8.0" = { @@ -1561,6 +1543,15 @@ let sha512 = "x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw=="; }; }; + "ajv-8.9.0" = { + name = "ajv"; + packageName = "ajv"; + version = "8.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz"; + sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ=="; + }; + }; "ajv-formats-2.1.1" = { name = "ajv-formats"; packageName = "ajv-formats"; @@ -1588,15 +1579,6 @@ let sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; }; }; - "ansi-colors-4.1.1" = { - name = "ansi-colors"; - packageName = "ansi-colors"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"; - sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; - }; - }; "ansi-html-community-0.0.8" = { name = "ansi-html-community"; packageName = "ansi-html-community"; @@ -1741,13 +1723,13 @@ let sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; }; }; - "axios-0.24.0" = { + "axios-0.25.0" = { name = "axios"; packageName = "axios"; - version = "0.24.0"; + version = "0.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; + url = "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz"; + sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g=="; }; }; "babel-loader-8.2.3" = { @@ -1777,13 +1759,13 @@ let sha512 = "wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA=="; }; }; - "babel-plugin-polyfill-corejs3-0.4.0" = { + "babel-plugin-polyfill-corejs3-0.5.0" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz"; - sha512 = "YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.0.tgz"; + sha512 = "Hcrgnmkf+4JTj73GbK3bBhlVPiLL47owUAnoJIf69Hakl3q+KfodbDXiZWGMM7iqCZTxCG3Z2VRfPNYES4rXqQ=="; }; }; "babel-plugin-polyfill-regenerator-0.3.0" = { @@ -1894,22 +1876,13 @@ let sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; - "browserslist-4.16.6" = { + "browserslist-4.19.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.16.6"; + version = "4.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz"; - sha512 = "Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ=="; - }; - }; - "browserslist-4.18.1" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz"; - sha512 = "8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz"; + sha512 = "u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A=="; }; }; "buffer-from-1.1.1" = { @@ -1984,22 +1957,31 @@ let sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; }; }; - "caniuse-lite-1.0.30001234" = { + "caniuse-lite-1.0.30001294" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001234"; + version = "1.0.30001294"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001234.tgz"; - sha512 = "a3gjUVKkmwLdNysa1xkUAwN2VfJUJyVW47rsi3aCbkRCtbHAfo+rOsCqVw29G6coQ8gzAPb5XBXwiGHwme3isA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001294.tgz"; + sha512 = "LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g=="; }; }; - "caniuse-lite-1.0.30001286" = { + "caniuse-lite-1.0.30001298" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001286"; + version = "1.0.30001298"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz"; - sha512 = "zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001298.tgz"; + sha512 = "AcKqikjMLlvghZL/vfTHorlQsLDhGRalYf1+GmWCf5SCMziSGjRYQW/JEksj14NaYHIR6KIhrFAy0HV5C25UzQ=="; + }; + }; + "caniuse-lite-1.0.30001299" = { + name = "caniuse-lite"; + packageName = "caniuse-lite"; + version = "1.0.30001299"; + src = fetchurl { + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001299.tgz"; + sha512 = "iujN4+x7QzqA2NCSrS5VUy+4gLmRd4xv6vbBBsmfVqTx8bLAD8097euLqQgKxSVLvxjSDcvF1T/i9ocgnUFexw=="; }; }; "chalk-2.4.2" = { @@ -2110,15 +2092,6 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "colorette-1.2.2" = { - name = "colorette"; - packageName = "colorette"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz"; - sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; - }; - }; "colorette-2.0.16" = { name = "colorette"; packageName = "colorette"; @@ -2272,22 +2245,22 @@ let sha512 = "i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw=="; }; }; - "copy-webpack-plugin-10.2.0" = { + "copy-webpack-plugin-10.2.1" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "10.2.0"; + version = "10.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.0.tgz"; - sha512 = "my6iXII95c78w14HzYCNya5TlJYa44lOppAge5GSTMM1SyDxNsVGCJvhP4/ld6snm8lzjn3XOonMZD6s1L86Og=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.1.tgz"; + sha512 = "nr81NhCAIpAWXGCK5thrKmfCQ6GDY0L5RN0U+BnIn/7Us55+UCex5ANNsNKmIVtDRnk0Ecf+/kzp9SUVrrBMLg=="; }; }; - "core-js-compat-3.19.3" = { + "core-js-compat-3.20.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.19.3"; + version = "3.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.3.tgz"; - sha512 = "59tYzuWgEEVU9r+SRgceIGXSSUn47JknoiXW6Oq7RW8QHjXWz3/vp8pa7dbtuVu40sewz3OP3JmQEcDdztrLhA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.2.tgz"; + sha512 = "qZEzVQ+5Qh6cROaTPFLNS4lkvQ6mBzE3R6A6EEpssj7Zr2egMHgsy4XapdifqJDGC9CBiNv7s+ejI96rLNQFdg=="; }; }; "core-util-is-1.0.3" = { @@ -2614,22 +2587,31 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.3.749" = { + "electron-to-chromium-1.4.30" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.749"; + version = "1.4.30"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.749.tgz"; - sha512 = "F+v2zxZgw/fMwPz/VUGIggG4ZndDsYy0vlpthi3tjmDZlcfbhN5mYW0evXUsBr2sUtuDANFtle410A9u/sd/4A=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.30.tgz"; + sha512 = "609z9sIMxDHg+TcR/VB3MXwH+uwtrYyeAwWc/orhnr90ixs6WVGSrt85CDLGUdNnLqCA7liv426V20EecjvflQ=="; }; }; - "electron-to-chromium-1.4.17" = { + "electron-to-chromium-1.4.39" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.17"; + version = "1.4.39"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.17.tgz"; - sha512 = "zhk1MravPtq/KBhmGB7TLBILmXTgRG9TFSI3qS3DbgyfHzIl72iiTE37r/BHIbPCJJlWIo5rySyxiH4vWhu2ZA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.39.tgz"; + sha512 = "bFH3gdRq/l7WlzSleiO6dwpZH3RhiJ8vlMq0tOJMfT+5nb+x397eJn2RHF6Ho/9GCKv+BkimNlUMHl9+Yh+Qcg=="; + }; + }; + "electron-to-chromium-1.4.43" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.4.43"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.43.tgz"; + sha512 = "PO3kEfcxPrti/4STbXvCkNIF4fgWvCKl2508e6UI7KomCDffpIfeBZLXsh5DK/XGsjUw3kwq6WEsi0MJTlGAdg=="; }; }; "emojis-list-3.0.0" = { @@ -2659,15 +2641,6 @@ let sha512 = "EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA=="; }; }; - "enquirer-2.3.6" = { - name = "enquirer"; - packageName = "enquirer"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"; - sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; - }; - }; "entities-2.2.0" = { name = "entities"; packageName = "entities"; @@ -2749,13 +2722,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.5.0" = { + "eslint-8.7.0" = { name = "eslint"; packageName = "eslint"; - version = "8.5.0"; + version = "8.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.5.0.tgz"; - sha512 = "tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.7.0.tgz"; + sha512 = "ifHYzkBGrzS2iDU7KjhCAVMGCvF6M3Xfs8X8b37cgrUlDt6bWRTpRh6T/gtSXv1HJ/BUGgmjvNvOEGu85Iif7w=="; }; }; "eslint-config-airbnb-base-15.0.0" = { @@ -2776,22 +2749,22 @@ let sha512 = "0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw=="; }; }; - "eslint-module-utils-2.7.1" = { + "eslint-module-utils-2.7.2" = { name = "eslint-module-utils"; packageName = "eslint-module-utils"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz"; - sha512 = "fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ=="; + url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz"; + sha512 = "zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg=="; }; }; - "eslint-plugin-import-2.25.3" = { + "eslint-plugin-import-2.25.4" = { name = "eslint-plugin-import"; packageName = "eslint-plugin-import"; - version = "2.25.3"; + version = "2.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz"; - sha512 = "RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg=="; + url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz"; + sha512 = "/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA=="; }; }; "eslint-plugin-vue-7.20.0" = { @@ -2812,15 +2785,6 @@ let sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; }; - "eslint-scope-6.0.0" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-6.0.0.tgz"; - sha512 = "uRDL9MWmQCkaFus8RF5K9/L/2fn+80yoW3jkD53l4shjCh26fCtvJGasxjUqP5OT87SYTxCVA3BwTUzuELx9kA=="; - }; - }; "eslint-scope-7.1.0" = { name = "eslint-scope"; packageName = "eslint-scope"; @@ -2866,15 +2830,6 @@ let sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; }; - "eslint-visitor-keys-3.0.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz"; - sha512 = "mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q=="; - }; - }; "eslint-visitor-keys-3.1.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -2884,6 +2839,15 @@ let sha512 = "yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA=="; }; }; + "eslint-visitor-keys-3.2.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz"; + sha512 = "IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ=="; + }; + }; "espree-6.2.1" = { name = "espree"; packageName = "espree"; @@ -2893,22 +2857,13 @@ let sha512 = "ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw=="; }; }; - "espree-9.0.0" = { + "espree-9.3.0" = { name = "espree"; packageName = "espree"; - version = "9.0.0"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.0.0.tgz"; - sha512 = "r5EQJcYZ2oaGbeR0jR0fFVijGOcwai07/690YRXLINuhmVeRY4UKSAsQPe/0BNuDgwP7Ophoc1PRsr2E3tkbdQ=="; - }; - }; - "espree-9.2.0" = { - name = "espree"; - packageName = "espree"; - version = "9.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.2.0.tgz"; - sha512 = "oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg=="; + url = "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz"; + sha512 = "d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ=="; }; }; "esquery-1.4.0" = { @@ -3019,6 +2974,15 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; + "fast-glob-3.2.10" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.10.tgz"; + sha512 = "s9nFhFnvR63wls6/kM88kQqDhMu0AfdjqouE2l5GVQPbqLgyFjjU5ry/r2yKsJxpb9Py1EYNqieFrmMaX4v++A=="; + }; + }; "fast-glob-3.2.7" = { name = "fast-glob"; packageName = "fast-glob"; @@ -3163,13 +3127,13 @@ let sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; }; }; - "follow-redirects-1.14.4" = { + "follow-redirects-1.14.7" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.4"; + version = "1.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz"; - sha512 = "zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz"; + sha512 = "+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="; }; }; "forwarded-0.2.0" = { @@ -3334,22 +3298,22 @@ let sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; }; }; - "globby-11.0.4" = { + "globby-11.1.0" = { name = "globby"; packageName = "globby"; - version = "11.0.4"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz"; - sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; + url = "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"; + sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; - "globby-12.0.2" = { + "globby-12.2.0" = { name = "globby"; packageName = "globby"; - version = "12.0.2"; + version = "12.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-12.0.2.tgz"; - sha512 = "lAsmb/5Lww4r7MM9nCCliDZVIKbZTavrsunAsHLr9oHthrZP1qi7/gAnHOsUs9bLvEt2vKVJhHmxuL7QbDuPdQ=="; + url = "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz"; + sha512 = "wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA=="; }; }; "globby-6.1.0" = { @@ -3361,13 +3325,13 @@ let sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; }; }; - "graceful-fs-4.2.8" = { + "graceful-fs-4.2.9" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.8"; + version = "4.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; }; }; "gzip-size-6.0.0" = { @@ -3622,13 +3586,13 @@ let sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; }; - "ignore-5.1.8" = { + "ignore-5.2.0" = { name = "ignore"; packageName = "ignore"; - version = "5.1.8"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; - sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; + sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; }; }; "immutable-4.0.0" = { @@ -4045,13 +4009,13 @@ let sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; }; }; - "jest-worker-27.4.2" = { + "jest-worker-27.4.6" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.2.tgz"; - sha512 = "0QMy/zPovLfUPyHuOuuU4E+kGACXXE84nRnq6lBVI9GJg5DCBiA97SATi+ZP8CpiJwEQy1oCPjRBf8AnLjN+Ag=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.6.tgz"; + sha512 = "gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw=="; }; }; "js-tokens-4.0.0" = { @@ -4180,13 +4144,13 @@ let sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; }; - "linkifyjs-3.0.4" = { + "linkifyjs-3.0.5" = { name = "linkifyjs"; packageName = "linkifyjs"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/linkifyjs/-/linkifyjs-3.0.4.tgz"; - sha512 = "JWw1HHMx54g8mEsG7JwI8I/xh7qeJbF6L9u1dQOYW91RdRqDYpnTn1UaNXYkmLD967Vk0xGuyHzuRnkSApby3w=="; + url = "https://registry.npmjs.org/linkifyjs/-/linkifyjs-3.0.5.tgz"; + sha512 = "1Y9XQH65eQKA9p2xtk+zxvnTeQBG7rdAXSkUG97DmuI/Xhji9uaUzaWxRj6rf9YC0v8KKHkxav7tnLX82Sz5Fg=="; }; }; "loader-runner-4.2.0" = { @@ -4315,13 +4279,13 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "memfs-3.4.0" = { + "memfs-3.4.1" = { name = "memfs"; packageName = "memfs"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-3.4.0.tgz"; - sha512 = "o/RfP0J1d03YwsAxyHxAYs2kyJp55AFkMazlFAZFR2I2IXkxiUTXRabJ6RmNNCQ83LAD2jy52Khj0m3OffpNdA=="; + url = "https://registry.npmjs.org/memfs/-/memfs-3.4.1.tgz"; + sha512 = "1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw=="; }; }; "merge-descriptors-1.0.1" = { @@ -4567,22 +4531,13 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-forge-0.10.0" = { + "node-forge-1.2.0" = { name = "node-forge"; packageName = "node-forge"; - version = "0.10.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"; - sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; - }; - }; - "node-releases-1.1.72" = { - name = "node-releases"; - packageName = "node-releases"; - version = "1.1.72"; - src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz"; - sha512 = "LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw=="; + url = "https://registry.npmjs.org/node-forge/-/node-forge-1.2.0.tgz"; + sha512 = "M4AsdaP0bGNaSPtatd/+f76asocI0cFaURRdeQVZvrJBrYp2Qohv5hDbGHykuNqCb1BYjWHjdS6HlN50qbztwA=="; }; }; "node-releases-2.0.1" = { @@ -5017,15 +4972,6 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pkg-dir-2.0.0" = { - name = "pkg-dir"; - packageName = "pkg-dir"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz"; - sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; - }; - }; "pkg-dir-4.2.0" = { name = "pkg-dir"; packageName = "pkg-dir"; @@ -5179,15 +5125,6 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; - "progress-2.0.3" = { - name = "progress"; - packageName = "progress"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"; - sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; - }; - }; "proxy-addr-2.0.7" = { name = "proxy-addr"; packageName = "proxy-addr"; @@ -5530,13 +5467,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.45.1" = { + "sass-1.49.0" = { name = "sass"; packageName = "sass"; - version = "1.45.1"; + version = "1.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.45.1.tgz"; - sha512 = "pwPRiq29UR0o4X3fiQyCtrESldXvUQAAE0QmcJTpsI4kuHHcLzZ54M1oNBVIXybQv8QF2zfkpFcTxp8ta97dUA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz"; + sha512 = "TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw=="; }; }; "sass-loader-12.4.0" = { @@ -5593,13 +5530,13 @@ let sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; }; }; - "selfsigned-1.10.11" = { + "selfsigned-2.0.0" = { name = "selfsigned"; packageName = "selfsigned"; - version = "1.10.11"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz"; - sha512 = "aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA=="; + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.0.tgz"; + sha512 = "cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ=="; }; }; "semver-6.3.0" = { @@ -5971,13 +5908,13 @@ let sha512 = "h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ=="; }; }; - "terser-webpack-plugin-5.2.5" = { + "terser-webpack-plugin-5.3.0" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "5.2.5"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.5.tgz"; - sha512 = "3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz"; + sha512 = "LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ=="; }; }; "text-table-0.2.0" = { @@ -6043,13 +5980,13 @@ let sha512 = "gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g=="; }; }; - "tsconfig-paths-3.11.0" = { + "tsconfig-paths-3.12.0" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; - version = "3.11.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz"; - sha512 = "7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA=="; + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz"; + sha512 = "e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg=="; }; }; "tslib-2.3.1" = { @@ -6259,13 +6196,13 @@ let sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg=="; }; }; - "vue-eslint-parser-8.0.1" = { + "vue-eslint-parser-8.1.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.0.1.tgz"; - sha512 = "lhWjDXJhe3UZw2uu3ztX51SJAPGPey1Tff2RK3TyZURwbuI4vximQLzz4nQfCv8CZq4xx7uIiogHMMoSJPr33A=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.1.0.tgz"; + sha512 = "R8Pl6MSvuU81JKyUguexcABQxfM51Q2ZJVBX0TrKiLltPB+haVLp4hfuR5msiu9oqpsQkaV+TF18r4CBw9c9qg=="; }; }; "vue-hot-reload-api-2.3.4" = { @@ -6385,13 +6322,13 @@ let sha512 = "O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA=="; }; }; - "webpack-5.65.0" = { + "webpack-5.67.0" = { name = "webpack"; packageName = "webpack"; - version = "5.65.0"; + version = "5.67.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.65.0.tgz"; - sha512 = "Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz"; + sha512 = "LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw=="; }; }; "webpack-bundle-analyzer-4.5.0" = { @@ -6421,13 +6358,13 @@ let sha512 = "MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg=="; }; }; - "webpack-dev-server-4.7.1" = { + "webpack-dev-server-4.7.3" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.7.1"; + version = "4.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.1.tgz"; - sha512 = "bkoNgFyqlF/CT726Axtf/ELHHYsTZJWz3QJ6HqstWPbalhjAPunlPH9bwt/Lr5cLb+uoLmsta6svVplVzq8beA=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz"; + sha512 = "mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q=="; }; }; "webpack-merge-5.8.0" = { @@ -6439,22 +6376,22 @@ let sha512 = "/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q=="; }; }; - "webpack-sources-3.2.2" = { + "webpack-sources-3.2.3" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz"; - sha512 = "cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"; + sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; }; }; - "webpack-subresource-integrity-5.0.0" = { + "webpack-subresource-integrity-5.1.0" = { name = "webpack-subresource-integrity"; packageName = "webpack-subresource-integrity"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.0.0.tgz"; - sha512 = "x9514FpLRydO+UAQ8DY4aLtCjxmdLkuQVcDFN1kGzuusREYJ1B0rzk/iIlWiL6dnvrhEGFj2+UsdxDkP8Z4UKg=="; + url = "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz"; + sha512 = "sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q=="; }; }; "websocket-driver-0.7.4" = { @@ -6563,9 +6500,9 @@ let version = "0.0.0"; src = ./.; dependencies = [ - sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.4" - (sources."@babel/core-7.16.5" // { + sources."@babel/code-frame-7.16.7" + sources."@babel/compat-data-7.16.8" + (sources."@babel/core-7.16.12" // { dependencies = [ sources."debug-4.3.3" sources."json5-2.2.0" @@ -6579,351 +6516,133 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.16.5" - sources."@babel/helper-annotate-as-pure-7.16.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" - (sources."@babel/helper-compilation-targets-7.16.3" // { + sources."@babel/generator-7.16.8" + sources."@babel/helper-annotate-as-pure-7.16.7" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" + (sources."@babel/helper-compilation-targets-7.16.7" // { dependencies = [ - sources."browserslist-4.18.1" - sources."caniuse-lite-1.0.30001286" - sources."electron-to-chromium-1.4.17" + sources."browserslist-4.19.1" + sources."caniuse-lite-1.0.30001294" + sources."electron-to-chromium-1.4.30" sources."node-releases-2.0.1" sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.5" - sources."@babel/helper-create-regexp-features-plugin-7.16.0" + sources."@babel/helper-create-class-features-plugin-7.16.10" + sources."@babel/helper-create-regexp-features-plugin-7.16.7" (sources."@babel/helper-define-polyfill-provider-0.3.0" // { dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" sources."debug-4.3.3" sources."ms-2.1.2" sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.16.5" - sources."@babel/helper-explode-assignable-expression-7.16.0" - sources."@babel/helper-function-name-7.16.0" - sources."@babel/helper-get-function-arity-7.16.0" - sources."@babel/helper-hoist-variables-7.16.0" - sources."@babel/helper-member-expression-to-functions-7.16.5" - sources."@babel/helper-module-imports-7.16.0" - sources."@babel/helper-module-transforms-7.16.5" - sources."@babel/helper-optimise-call-expression-7.16.0" - sources."@babel/helper-plugin-utils-7.8.0" - sources."@babel/helper-remap-async-to-generator-7.16.5" - sources."@babel/helper-replace-supers-7.16.5" - sources."@babel/helper-simple-access-7.16.0" + sources."@babel/helper-environment-visitor-7.16.7" + sources."@babel/helper-explode-assignable-expression-7.16.7" + sources."@babel/helper-function-name-7.16.7" + sources."@babel/helper-get-function-arity-7.16.7" + sources."@babel/helper-hoist-variables-7.16.7" + sources."@babel/helper-member-expression-to-functions-7.16.7" + sources."@babel/helper-module-imports-7.16.7" + sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-optimise-call-expression-7.16.7" + sources."@babel/helper-plugin-utils-7.16.7" + sources."@babel/helper-remap-async-to-generator-7.16.8" + sources."@babel/helper-replace-supers-7.16.7" + sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.0" - sources."@babel/helper-validator-identifier-7.15.7" - sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.16.5" - sources."@babel/helpers-7.16.5" - sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.5" - (sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-async-generator-functions-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-class-properties-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-class-static-block-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-dynamic-import-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-export-namespace-from-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-json-strings-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-logical-assignment-operators-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-numeric-separator-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-object-rest-spread-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-optional-catch-binding-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-optional-chaining-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-private-methods-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-private-property-in-object-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-proposal-unicode-property-regex-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) + sources."@babel/helper-split-export-declaration-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + sources."@babel/helper-validator-option-7.16.7" + sources."@babel/helper-wrap-function-7.16.8" + sources."@babel/helpers-7.16.7" + sources."@babel/highlight-7.16.7" + sources."@babel/parser-7.16.12" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-async-generator-functions-7.16.8" + sources."@babel/plugin-proposal-class-properties-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-dynamic-import-7.16.7" + sources."@babel/plugin-proposal-export-namespace-from-7.16.7" + sources."@babel/plugin-proposal-json-strings-7.16.7" + sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" + sources."@babel/plugin-proposal-numeric-separator-7.16.7" + sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" + sources."@babel/plugin-proposal-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-private-methods-7.16.11" + sources."@babel/plugin-proposal-private-property-in-object-7.16.7" + sources."@babel/plugin-proposal-unicode-property-regex-7.16.7" sources."@babel/plugin-syntax-async-generators-7.8.4" - (sources."@babel/plugin-syntax-class-properties-7.12.13" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-syntax-class-static-block-7.14.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) + sources."@babel/plugin-syntax-class-properties-7.12.13" + 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" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) + sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" - (sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) + 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" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) + sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - (sources."@babel/plugin-syntax-private-property-in-object-7.14.5" // { + sources."@babel/plugin-syntax-private-property-in-object-7.14.5" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.16.7" + sources."@babel/plugin-transform-async-to-generator-7.16.8" + sources."@babel/plugin-transform-block-scoped-functions-7.16.7" + sources."@babel/plugin-transform-block-scoping-7.16.7" + sources."@babel/plugin-transform-classes-7.16.7" + sources."@babel/plugin-transform-computed-properties-7.16.7" + sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-dotall-regex-7.16.7" + sources."@babel/plugin-transform-duplicate-keys-7.16.7" + sources."@babel/plugin-transform-exponentiation-operator-7.16.7" + sources."@babel/plugin-transform-for-of-7.16.7" + sources."@babel/plugin-transform-function-name-7.16.7" + sources."@babel/plugin-transform-literals-7.16.7" + sources."@babel/plugin-transform-member-expression-literals-7.16.7" + sources."@babel/plugin-transform-modules-amd-7.16.7" + sources."@babel/plugin-transform-modules-commonjs-7.16.8" + sources."@babel/plugin-transform-modules-systemjs-7.16.7" + sources."@babel/plugin-transform-modules-umd-7.16.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" + sources."@babel/plugin-transform-new-target-7.16.7" + sources."@babel/plugin-transform-object-super-7.16.7" + sources."@babel/plugin-transform-parameters-7.16.7" + sources."@babel/plugin-transform-property-literals-7.16.7" + sources."@babel/plugin-transform-regenerator-7.16.7" + sources."@babel/plugin-transform-reserved-words-7.16.7" + sources."@babel/plugin-transform-shorthand-properties-7.16.7" + sources."@babel/plugin-transform-spread-7.16.7" + sources."@babel/plugin-transform-sticky-regex-7.16.7" + sources."@babel/plugin-transform-template-literals-7.16.7" + sources."@babel/plugin-transform-typeof-symbol-7.16.7" + sources."@babel/plugin-transform-unicode-escapes-7.16.7" + sources."@babel/plugin-transform-unicode-regex-7.16.7" + (sources."@babel/preset-env-7.16.11" // { dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-syntax-top-level-await-7.14.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-arrow-functions-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-async-to-generator-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-block-scoped-functions-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-block-scoping-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-classes-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-computed-properties-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-destructuring-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-dotall-regex-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-duplicate-keys-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-exponentiation-operator-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-for-of-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-function-name-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-literals-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-member-expression-literals-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-modules-amd-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-modules-commonjs-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-modules-systemjs-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-modules-umd-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.5" - (sources."@babel/plugin-transform-new-target-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-object-super-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-parameters-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-property-literals-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - sources."@babel/plugin-transform-regenerator-7.16.5" - (sources."@babel/plugin-transform-reserved-words-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-shorthand-properties-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-spread-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-sticky-regex-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-template-literals-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-typeof-symbol-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-unicode-escapes-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/plugin-transform-unicode-regex-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" - ]; - }) - (sources."@babel/preset-env-7.16.5" // { - dependencies = [ - sources."@babel/helper-plugin-utils-7.16.5" sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.14.6" - sources."@babel/template-7.16.0" - (sources."@babel/traverse-7.16.5" // { + sources."@babel/template-7.16.7" + (sources."@babel/traverse-7.16.10" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.16.0" + sources."@babel/types-7.16.8" sources."@discoveryjs/json-ext-0.5.5" (sources."@eslint/eslintrc-1.0.5" // { dependencies = [ - sources."acorn-8.6.0" + sources."acorn-8.7.0" sources."debug-4.3.3" sources."eslint-visitor-keys-3.1.0" - sources."espree-9.2.0" + sources."espree-9.3.0" sources."globals-13.12.0" sources."ignore-4.0.6" sources."ms-2.1.2" @@ -6946,18 +6665,18 @@ let sources."@nodelib/fs.walk-1.2.6" sources."@polka/url-1.0.0-next.21" sources."@types/body-parser-1.19.2" - sources."@types/bonjour-3.5.9" + sources."@types/bonjour-3.5.10" sources."@types/connect-3.4.35" sources."@types/connect-history-api-fallback-1.3.5" - sources."@types/eslint-8.2.1" - sources."@types/eslint-scope-3.7.1" + sources."@types/eslint-8.2.2" + sources."@types/eslint-scope-3.7.3" sources."@types/estree-0.0.50" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.26" + sources."@types/express-serve-static-core-4.17.27" sources."@types/glob-7.1.4" sources."@types/html-minifier-terser-6.0.0" sources."@types/http-proxy-1.17.8" - sources."@types/json-schema-7.0.8" + sources."@types/json-schema-7.0.9" sources."@types/json5-0.0.29" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" @@ -7008,7 +6727,6 @@ let ]; }) sources."ajv-keywords-3.5.2" - sources."ansi-colors-4.1.1" sources."ansi-html-community-0.0.8" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -7032,7 +6750,7 @@ let ]; }) sources."async-2.6.3" - sources."axios-0.24.0" + sources."axios-0.25.0" (sources."babel-loader-8.2.3" // { dependencies = [ sources."schema-utils-2.7.1" @@ -7044,7 +6762,7 @@ let sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.4.0" + sources."babel-plugin-polyfill-corejs3-0.5.0" sources."babel-plugin-polyfill-regenerator-0.3.0" sources."balanced-match-1.0.0" sources."batch-0.6.1" @@ -7061,18 +6779,14 @@ let sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - (sources."browserslist-4.16.6" // { - dependencies = [ - sources."colorette-1.2.2" - ]; - }) + sources."browserslist-4.19.1" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" sources."bytes-3.0.0" sources."call-bind-1.0.0" sources."callsites-3.1.0" sources."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001234" + sources."caniuse-lite-1.0.30001299" sources."chalk-2.4.2" (sources."chokidar-3.5.2" // { dependencies = [ @@ -7113,24 +6827,23 @@ let sources."cookie-0.4.1" sources."cookie-signature-1.0.6" sources."copy-to-clipboard-3.3.1" - (sources."copy-webpack-plugin-10.2.0" // { + (sources."copy-webpack-plugin-10.2.1" // { dependencies = [ - sources."@types/json-schema-7.0.9" - sources."ajv-8.8.2" + sources."ajv-8.9.0" sources."ajv-keywords-5.1.0" sources."array-union-3.0.1" sources."glob-parent-6.0.2" - sources."globby-12.0.2" + sources."globby-12.2.0" sources."json-schema-traverse-1.0.0" sources."schema-utils-4.0.0" sources."slash-4.0.0" ]; }) - (sources."core-js-compat-3.19.3" // { + (sources."core-js-compat-3.20.2" // { dependencies = [ - sources."browserslist-4.18.1" - sources."caniuse-lite-1.0.30001286" - sources."electron-to-chromium-1.4.17" + sources."browserslist-4.19.1" + sources."caniuse-lite-1.0.30001298" + sources."electron-to-chromium-1.4.39" sources."node-releases-2.0.1" sources."semver-7.0.0" ]; @@ -7183,11 +6896,10 @@ let sources."dot-case-3.0.4" sources."duplexer-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.749" + sources."electron-to-chromium-1.4.43" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."enhanced-resolve-5.8.3" - sources."enquirer-2.3.6" sources."entities-2.2.0" sources."envinfo-7.8.1" (sources."es-abstract-1.19.1" // { @@ -7207,9 +6919,9 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.5.0" // { + (sources."eslint-8.7.0" // { dependencies = [ - sources."acorn-8.6.0" + sources."acorn-8.7.0" sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" @@ -7222,13 +6934,12 @@ let sources."eslint-visitor-keys-2.1.0" ]; }) - sources."eslint-visitor-keys-3.1.0" - sources."espree-9.2.0" + sources."eslint-visitor-keys-3.2.0" + sources."espree-9.3.0" sources."estraverse-5.3.0" sources."glob-parent-6.0.2" sources."globals-13.12.0" sources."has-flag-4.0.0" - sources."ignore-4.0.6" sources."ms-2.1.2" sources."supports-color-7.2.0" ]; @@ -7245,13 +6956,13 @@ let sources."resolve-1.20.0" ]; }) - (sources."eslint-module-utils-2.7.1" // { + (sources."eslint-module-utils-2.7.2" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" ]; }) - (sources."eslint-plugin-import-2.25.3" // { + (sources."eslint-plugin-import-2.25.4" // { dependencies = [ sources."doctrine-2.1.0" sources."resolve-1.20.0" @@ -7326,7 +7037,7 @@ let sources."flat-5.0.2" sources."flat-cache-3.0.4" sources."flatted-3.2.4" - sources."follow-redirects-1.14.4" + sources."follow-redirects-1.14.7" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-monkey-1.0.3" @@ -7361,7 +7072,7 @@ let sources."pify-2.3.0" ]; }) - sources."graceful-fs-4.2.8" + sources."graceful-fs-4.2.9" sources."gzip-size-6.0.0" sources."handle-thing-2.0.1" sources."has-1.0.3" @@ -7401,7 +7112,7 @@ let sources."humanize-duration-3.27.1" sources."iconv-lite-0.4.24" sources."icss-utils-5.1.0" - sources."ignore-5.1.8" + sources."ignore-5.2.0" sources."immutable-4.0.0" (sources."import-fresh-3.3.0" // { dependencies = [ @@ -7478,7 +7189,7 @@ let sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."jest-worker-27.4.2" // { + (sources."jest-worker-27.4.6" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" @@ -7494,7 +7205,7 @@ let sources."kind-of-6.0.3" sources."klona-2.0.5" sources."levn-0.4.1" - sources."linkifyjs-3.0.4" + sources."linkifyjs-3.0.5" sources."loader-runner-4.2.0" (sources."loader-utils-1.4.0" // { dependencies = [ @@ -7514,7 +7225,7 @@ let ]; }) sources."media-typer-0.3.0" - sources."memfs-3.4.0" + sources."memfs-3.4.1" sources."merge-descriptors-1.0.1" (sources."merge-source-map-1.1.0" // { dependencies = [ @@ -7545,8 +7256,8 @@ let sources."negotiator-0.6.2" sources."neo-async-2.6.2" sources."no-case-3.0.4" - sources."node-forge-0.10.0" - sources."node-releases-1.1.72" + sources."node-forge-1.2.0" + sources."node-releases-2.0.1" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."nth-check-2.0.1" @@ -7607,7 +7318,6 @@ let sources."picomatch-2.2.2" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pkg-dir-2.0.0" sources."plurals-cldr-2.0.1" sources."popper.js-1.16.1" (sources."portfinder-1.0.28" // { @@ -7641,7 +7351,6 @@ let sources."prettier-1.19.1" sources."pretty-error-4.0.0" sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" (sources."proxy-addr-2.0.7" // { dependencies = [ sources."ipaddr.js-1.9.1" @@ -7693,11 +7402,11 @@ let sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sass-1.45.1" + sources."sass-1.49.0" sources."sass-loader-12.4.0" sources."schema-utils-3.1.1" sources."select-hose-2.0.0" - sources."selfsigned-1.10.11" + sources."selfsigned-2.0.0" (sources."semver-7.3.5" // { dependencies = [ sources."lru-cache-6.0.0" @@ -7765,7 +7474,7 @@ let }) ]; }) - (sources."terser-webpack-plugin-5.2.5" // { + (sources."terser-webpack-plugin-5.3.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -7777,7 +7486,7 @@ let sources."toggle-selection-1.0.6" sources."toidentifier-1.0.1" sources."totalist-1.1.0" - sources."tsconfig-paths-3.11.0" + sources."tsconfig-paths-3.12.0" sources."tslib-2.3.1" sources."type-check-0.4.0" sources."type-fest-0.20.2" @@ -7815,13 +7524,13 @@ let sources."v8-compile-cache-2.3.0" sources."vary-1.1.2" sources."vue-2.6.14" - (sources."vue-eslint-parser-8.0.1" // { + (sources."vue-eslint-parser-8.1.0" // { dependencies = [ - sources."acorn-8.5.0" - sources."debug-4.3.2" - sources."eslint-scope-6.0.0" - sources."eslint-visitor-keys-3.0.0" - sources."espree-9.0.0" + sources."acorn-8.7.0" + sources."debug-4.3.3" + sources."eslint-scope-7.1.0" + sources."eslint-visitor-keys-3.2.0" + sources."espree-9.3.0" sources."estraverse-5.3.0" sources."ms-2.1.2" ]; @@ -7839,9 +7548,9 @@ let sources."vuex-3.6.2" sources."watchpack-2.3.1" sources."wbuf-1.7.3" - (sources."webpack-5.65.0" // { + (sources."webpack-5.67.0" // { dependencies = [ - sources."acorn-8.6.0" + sources."acorn-8.7.0" ]; }) (sources."webpack-bundle-analyzer-4.5.0" // { @@ -7864,7 +7573,6 @@ let }) (sources."webpack-dev-middleware-5.3.0" // { dependencies = [ - sources."@types/json-schema-7.0.9" sources."ajv-8.8.2" sources."ajv-keywords-5.1.0" sources."json-schema-traverse-1.0.0" @@ -7873,15 +7581,15 @@ let sources."schema-utils-4.0.0" ]; }) - (sources."webpack-dev-server-4.7.1" // { + (sources."webpack-dev-server-4.7.3" // { dependencies = [ - sources."@types/json-schema-7.0.9" sources."ajv-8.8.2" sources."ajv-keywords-5.1.0" sources."ansi-regex-6.0.1" sources."array-union-2.1.0" sources."del-6.0.0" - sources."globby-11.0.4" + sources."fast-glob-3.2.10" + sources."globby-11.1.0" sources."is-path-inside-3.0.3" sources."json-schema-traverse-1.0.0" sources."p-map-4.0.0" @@ -7890,8 +7598,8 @@ let ]; }) sources."webpack-merge-5.8.0" - sources."webpack-sources-3.2.2" - sources."webpack-subresource-integrity-5.0.0" + sources."webpack-sources-3.2.3" + sources."webpack-subresource-integrity-5.1.0" sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" sources."which-2.0.2" diff --git a/pkgs/applications/misc/OSCAR/default.nix b/pkgs/applications/misc/OSCAR/default.nix index 92eeeb142cc0..9b5d2e68ad92 100644 --- a/pkgs/applications/misc/OSCAR/default.nix +++ b/pkgs/applications/misc/OSCAR/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }: mkDerivation rec { pname = "OSCAR"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitLab { owner = "pholy"; repo = "OSCAR-code"; rev = "v${version}"; - sha256 = "sha256-oKKwX5HiT8RACiqzZegOxH6IHQn/u0N4ih/ubH6YYjg="; + sha256 = "sha256-/70NoyiQ33RFdSTBAyi5c/JPZ2AV1/iRvkAZ6VjpUXw="; }; buildInputs = [ qtbase qttools qtserialport libGLU ]; @@ -19,6 +19,7 @@ mkDerivation rec { qmakeFlags = [ "OSCAR_QT.pro" ]; installPhase = '' + runHook preInstall install -d $out/bin install -d $out/share/OSCAR/Help install -d $out/share/OSCAR/Html @@ -32,15 +33,16 @@ mkDerivation rec { install oscar/Translations/* $out/share/OSCAR/Translations install -T Building/Linux/OSCAR.png $out/share/icons/OSCAR/OSCAR.png install -T Building/Linux/OSCAR.desktop $out/share/applications/OSCAR.desktop + runHook postInstall ''; meta = with lib; { homepage = "https://www.sleepfiles.com/OSCAR/"; description = "Software for reviewing and exploring data produced by CPAP and related machines used in the treatment of sleep apnea"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = [ maintainers.roconnor ]; # Someone needs to create a suitable installPhase for Darwin and Windows. # See https://gitlab.com/pholy/OSCAR-code/-/tree/master/Building. - broken = !stdenv.hostPlatform.isLinux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/applications/misc/ablog/default.nix new file mode 100644 index 000000000000..b6a3a1dfdb56 --- /dev/null +++ b/pkgs/applications/misc/ablog/default.nix @@ -0,0 +1,36 @@ +{ lib +, python3 +}: + +with python3.pkgs; + +buildPythonApplication rec { + pname = "ablog"; + version = "0.10.23"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-fqqB17dNzcDZmFw3nj85T5zvMzY6SN/JxbB3IASOas8="; + }; + + propagatedBuildInputs = [ + feedgen + sphinx + invoke + watchdog + python-dateutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + nativeBuildInputs = [ setuptools-scm ]; + + meta = with lib; { + description = "ABlog for blogging with Sphinx"; + homepage = "https://ablog.readthedocs.io/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ rgrinberg ]; + }; +} diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index de463cfd6665..e822f869619b 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Text-based addressbook program designed to use with mutt mail client"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.edwtjo ]; - platforms = with lib.platforms; linux; + platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index a4ef9b34318c..5e4f44823548 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , atk , cairo , desktop-file-utils @@ -32,6 +34,16 @@ stdenv.mkDerivation rec { sha256 = "lMpDQOxlGljP66APR49aPbTZnfrGakbQ2ZcFvmiPMFo="; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:2:5: ERROR: Function does not take positional arguments. + # Patch taken from https://gitlab.gnome.org/GNOME/almanah/-/merge_requests/13 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/almanah/-/commit/8c42a67695621d1e30cec933a04e633e6030bbaf.patch"; + sha256 = "qyqFgYSu4emFDG/Mjwz1bZb3v3/4gwQSKmGCoPPNYCQ="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index 9998b2b55950..5f09fba4cb7a 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.23.0"; + version = "0.24.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-53DyT8tunk0s1VGrlj6qQLOKNPN4Haqdyd8ozPi5z8w="; + sha256 = "sha256-QyexUZNn7QGHjXYO/+1kUebTmAzdVpwG9Ile8Uh3i8Q="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index cf1303422d27..9e38a208e179 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { ]; postPatch = '' + # Fix build with vala 0.56 + # https://github.com/donadigo/appeditor/pull/122 + substituteInPlace src/Application.vala \ + --replace "private static string? create_exec_filename;" "public static string? create_exec_filename;" + chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/applications/misc/archivebox/default.nix index c5c7187f0139..b70cf4407501 100644 --- a/pkgs/applications/misc/archivebox/default.nix +++ b/pkgs/applications/misc/archivebox/default.nix @@ -1,42 +1,34 @@ { lib -, buildPythonApplication -, fetchPypi -, requests -, mypy-extensions -, django_3 -, django-extensions -, dateparser -, youtube-dl -, python-crontab -, croniter -, w3lib -, ipython +, python3 }: let - django_3' = django_3.overridePythonAttrs (old: rec { - pname = "Django"; - version = "3.1.7"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-Ms55Lum2oMu+w0ASPiKayfdl3/jCpK6SR6FLK6OjZac="; + python = python3.override { + packageOverrides = self: super: { + django = super.django_3.overridePythonAttrs (old: rec { + version = "3.1.7"; + src = old.src.override { + inherit version; + sha256 = "sha256-Ms55Lum2oMu+w0ASPiKayfdl3/jCpK6SR6FLK6OjZac="; + }; + }); }; - }); + }; in -buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { pname = "archivebox"; version = "0.6.2"; - src = fetchPypi { + src = python.pkgs.fetchPypi { inherit pname version; sha256 = "sha256-zHty7lTra6yab9d0q3EqsPG3F+lrnZL6PjQAbL1A2NY="; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python.pkgs; [ requests mypy-extensions - django_3' + django django-extensions dateparser youtube-dl diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index 6da5d46f8816..2f07b6dbf959 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -3,31 +3,15 @@ let defaultOverrides = [ (self: super: { - flask = super.flask.overridePythonAttrs (oldAttrs: rec { - version = "1.1.2"; - pname = "Flask"; + wtforms = super.wtforms.overridePythonAttrs (oldAttrs: rec { + version = "2.3.1"; + pname = "WTForms"; src = super.fetchPypi { inherit pname version; - sha256 = "sha256-Tvoa4tfJhlr0iYbeiuuFBL8yx/PW/ck1PTSyH0sScGA="; + sha256 = "sha256-hhoTs65SHWcA2sOydxlwvTVKY7pwQ+zDqCtSiFlqGXI="; }; - checkInputs = [ self.pytest ]; - propagatedBuildInputs = with self; [ itsdangerous click werkzeug jinja2 ]; - - doCheck = false; - }); - }) - - (self: super: { - flask_login = super.flask_login.overridePythonAttrs (oldAttrs: rec { - pname = "Flask"; - version = "0.5.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b"; - }; doCheck = false; }); }) @@ -45,7 +29,7 @@ let py = python3.override { # Put packageOverrides at the start so they are applied after defaultOverrides - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) (defaultOverrides); + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides; }; in @@ -53,11 +37,11 @@ with py.pkgs; buildPythonApplication rec { pname = "archivy"; - version = "1.6.1"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nwpH3V6hkPC8G3df+0hTZqvIbvT1Z796uOI/iKnXS1w="; + sha256 = "sha256-UNGl5Dl/E3+uQ4HIxzHYliHF4lqD3GYdeoL+DtqUwCo="; }; # Relax some dependencies @@ -72,7 +56,7 @@ buildPythonApplication rec { --replace 'validators ==' 'validators >=' \ --replace 'tinydb ==' 'tinydb >=' \ --replace 'Flask_WTF == 0.14.3' 'Flask_WTF' \ - --replace 'Werkzeug ==' 'Werkzeug >=' + --replace 'Flask ==' 'Flask >=' ''; propagatedBuildInputs = [ @@ -87,11 +71,11 @@ buildPythonApplication rec { html2text python-dotenv python-frontmatter + readability-lxml requests setuptools tinydb validators - werkzeug wtforms ]; diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 29a932f40d58..d82658f529e4 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,7 +1,9 @@ { config , lib , stdenv -, fetchurl +, fetchzip +, autoreconfHook +, autoconf-archive , pkg-config , CoreAudio , enableAlsa ? true @@ -35,15 +37,20 @@ stdenv.mkDerivation rec { pname = "sox"; - version = "14.4.2"; + version = "unstable-2021-05-09"; - src = fetchurl { - url = "mirror://sourceforge/sox/sox-${version}.tar.gz"; - sha256 = "0v2znlxkxxcd3f48hf3dx9pq7i6fdhb62kgj7wv8xggz8f35jpxl"; + src = fetchzip { + url = "https://sourceforge.net/code-snapshots/git/s/so/sox/code.git/sox-code-42b3557e13e0fe01a83465b672d89faddbe65f49.zip"; + hash = "sha256-9cpOwio69GvzVeDq79BSmJgds9WU5kA/KUlAkHcpN5c="; }; - # configure.ac uses pkg-config only to locate libopusfile - nativeBuildInputs = lib.optional enableOpusfile pkg-config; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + ] ++ lib.optional enableOpusfile [ + # configure.ac uses pkg-config only to locate libopusfile + pkg-config + ]; patches = [ ./0001-musl-rewind-pipe-workaround.patch ]; diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 60e4504cc501..9f3c1c82b5e0 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.22.3"; + version = "1.22.4"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-Zh1rWMdRXPj/+80Sqvp9cbV5sDrNVBebPRGTTWM1DLk="; + sha256 = "sha256-Mms7Vibq1Rlb2XbxiV4o1UsjDRJcwG5ZZdPOWHjnW2A="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index 174d6e22ccb3..d8db5441df5e 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/auto-multiple-choice \ ''${makeWrapperArgs[@]} \ - --prefix PERL5LIB : "${with perlPackages; makePerlPath [ + --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ArchiveZip DBDSQLite Cairo @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { GlibObjectIntrospection Gtk3 LocaleGettext + OpenOfficeOODoc PerlMagick TextCSV XMLParser diff --git a/pkgs/applications/misc/avizo/default.nix b/pkgs/applications/misc/avizo/default.nix index 7325e29f682b..d4808829586b 100644 --- a/pkgs/applications/misc/avizo/default.nix +++ b/pkgs/applications/misc/avizo/default.nix @@ -7,26 +7,19 @@ stdenv.mkDerivation rec { pname = "avizo"; - # Note: remove the 'use-sysconfig' patch on the next update - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "misterdanb"; repo = "avizo"; rev = version; - sha256 = "sha256-0BJodJ6WaHhuSph2D1AC+DMafctgiSCyaZ8MFn89AA8="; + sha256 = "sha256-BRtdCOBFsKkJif/AlnF7N9ZDcmA+878M9lDQld+SAgo="; }; nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ]; buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 librsvg ]; - patches = [ - # Remove on next update - # See https://github.com/misterdanb/avizo/pull/30 - ./use-sysconfdir-instead-of-etc.patch - ]; - postInstall = '' substituteInPlace "$out"/bin/volumectl \ --replace 'avizo-client' "$out/bin/avizo-client" diff --git a/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch b/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch deleted file mode 100644 index 947559760cbc..000000000000 --- a/pkgs/applications/misc/avizo/use-sysconfdir-instead-of-etc.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/meson.build b/meson.build -index 1c789be..cd4b07a 100644 ---- a/meson.build -+++ b/meson.build -@@ -12,7 +12,9 @@ app_resources_service = gnome.compile_resources( - source_dir : '.', - c_name : 'avizo_resources') - --install_data('config.ini', install_dir: '/etc/xdg/avizo') -+sysconfdir = get_option('sysconfdir') -+ -+install_data('config.ini', install_dir: join_paths(sysconfdir, 'xdg/avizo')) - install_data('volumectl', install_dir: 'bin') - install_data('lightctl', install_dir: 'bin') - diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 0a42e6f5e2cd..56ee5fa52801 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "avrdudess"; - version = "2.2.20140102"; + version = "2.13"; src = fetchurl { - url = "http://blog.zakkemble.co.uk/download/avrdudess_20140102.zip"; - sha256 = "18llpvjsfhypzijrvfbzmcg3g141f307mzsrg11wcdxh9syxqak6"; + url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.13/AVRDUDESS-2.13-portable.zip"; + sha256 = "0fpvc19fb14ppqfb2yg821szmhyanxcp5chfldf8yh51f64zihv9"; }; nativeBuildInputs = [ unzip ]; @@ -36,7 +36,8 @@ stdenv.mkDerivation { meta = with lib; { description = "GUI for AVRDUDE (AVR microcontroller programmer)"; - homepage = "https://github.com/zkemble/AVRDUDESS"; + homepage = "https://blog.zakkemble.net/avrdudess-a-gui-for-avrdude/"; + changelog = "https://github.com/ZakKemble/AVRDUDESS/blob/v${version}/Changelog.txt"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 378a04bada9a..458b0484af0b 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -32,19 +32,16 @@ let genericName = "Text Editor"; exec = "azuredatastudio --no-sandbox --unity-launch %F"; icon = "azuredatastudio"; - startupNotify = "true"; - categories = "Utility;TextEditor;Development;IDE;"; - mimeType = "text/plain;inode/directory;application/x-azuredatastudio-workspace;"; - extraEntries = '' - StartupWMClass=azuredatastudio - Actions=new-empty-window; - Keywords=azuredatastudio; - - [Desktop Action new-empty-window] - Name=New Empty Window - Exec=azuredatastudio --no-sandbox --new-window %F - Icon=azuredatastudio - ''; + startupNotify = true; + startupWMClass = "azuredatastudio"; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "text/plain" "inode/directory" "application/x-azuredatastudio-workspace" ]; + keywords = [ "azuredatastudio" ]; + actions.new-empty-window = { + name = "New Empty Window"; + exec = "azuredatastudio --no-sandbox --new-window %F"; + icon = "azuredatastudio"; + }; }; urlHandlerDesktopItem = makeDesktopItem { @@ -54,13 +51,12 @@ let genericName = "Text Editor"; exec = "azuredatastudio --no-sandbox --open-url %U"; icon = "azuredatastudio"; - startupNotify = "true"; - categories = "Utility;TextEditor;Development;IDE;"; - mimeType = "x-scheme-handler/azuredatastudio;"; - extraEntries = '' - NoDisplay=true - Keywords=azuredatastudio; - ''; + startupNotify = true; + startupWMClass = "azuredatastudio"; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "x-scheme-handler/azuredatastudio" ]; + keywords = [ "azuredatastudio" ]; + noDisplay = true; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index d09eab0f85b2..c998309bdd33 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.3.2"; + version = "1.3.5"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-+5yAwBUyhqmoV8l8VwIQMxnSgjNZNbGfGajPhA+IFwA="; + sha256 = "sha256-bBa3eKBT43G/Q8gYluW2gH5qcmp/SsrF06onyGlg+UI="; }; buildInputs = [ libnotify glib ]; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index c4c013235942..e92bd4b82ad0 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.4"; + version = "0.6.7"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "5xRM3NQfomG0vJheNEBLy3OaS6UEwabNKYa96u2md6M="; + sha256 = "sha256-cUkSXEB92I0UYTobQzUb2so1MUXJkryAqrmASx9RMF0="; }; nativeBuildInputs = [ pkg-config pcre ]; diff --git a/pkgs/applications/misc/bicon/default.nix b/pkgs/applications/misc/bicon/default.nix index 72f5a639f11f..0b3ca09c6d04 100644 --- a/pkgs/applications/misc/bicon/default.nix +++ b/pkgs/applications/misc/bicon/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "A bidirectional console"; homepage = "https://github.com/behdad/bicon"; license = [ licenses.lgpl21 licenses.psfl licenses.bsd0 ]; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 31c1d4a19937..a0467b817142 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,11 +1,11 @@ { config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile -, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python39Packages +, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python310Packages , openvdb, libXxf86vm, tbb, alembic -, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath +, zlib, zstd, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 -, cudaSupport ? config.cudaSupport or false, cudatoolkit +, cudaSupport ? config.cudaSupport or false, cudatoolkit_11 , colladaSupport ? true, opencollada , spaceNavSupport ? stdenv.isLinux, libspnav , makeWrapper @@ -17,30 +17,31 @@ with lib; let - python = python39Packages.python; + python = python310Packages.python; optix = fetchzip { - url = "https://developer.download.nvidia.com/redist/optix/v7.0/OptiX-7.0.0-include.zip"; - sha256 = "1b3ccd3197anya2bj3psxdrvrpfgiwva5zfv2xmyrl73nb2dvfr7"; + # url taken from the archlinux blender PKGBUILD + url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip"; + sha256 = "0max1j4822mchj0xpz9lqzh91zkmvsn4py0r174cvqfz8z8ykjk8"; }; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.93.5"; + version = "3.1.0"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "1fsw8w80h8k5w4zmy659bjlzqyn5i198hi1kbpzfrdn8psxg2bfj"; + sha256 = "1d0476bzcz86lwdnyjn7hyzkmhfiqh47ls5h09jlbm7v7k9x69hw"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; - nativeBuildInputs = [ cmake makeWrapper python39Packages.wrapPython llvmPackages.llvm.dev ] + nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev ] ++ optionals cudaSupport [ addOpenGLRunpath ]; buildInputs = [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff - opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc + opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib zstd fftw jemalloc alembic (opensubdiv.override { inherit cudaSupport; }) tbb @@ -62,10 +63,10 @@ stdenv.mkDerivation rec { llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL ]) ++ optional jackaudioSupport libjack2 - ++ optional cudaSupport cudatoolkit + ++ optional cudaSupport cudatoolkit_11 ++ optional colladaSupport opencollada ++ optional spaceNavSupport libspnav; - pythonPath = with python39Packages; [ numpy requests ]; + pythonPath = with python310Packages; [ numpy requests ]; postPatch = '' # allow usage of dynamically linked embree @@ -84,7 +85,7 @@ stdenv.mkDerivation rec { --replace '${"$"}{LIBDIR}/opencollada' \ '${opencollada}' \ --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ - '${python39Packages.numpy}/${python.sitePackages}/numpy' + '${python310Packages.numpy}/${python.sitePackages}/numpy' '' else '' substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' ''); @@ -106,8 +107,8 @@ stdenv.mkDerivation rec { "-DPYTHON_VERSION=${python.pythonVersion}" "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" - "-DPYTHON_NUMPY_PATH=${python39Packages.numpy}/${python.sitePackages}" - "-DPYTHON_NUMPY_INCLUDE_DIRS=${python39Packages.numpy}/${python.sitePackages}/numpy/core/include" + "-DPYTHON_NUMPY_PATH=${python310Packages.numpy}/${python.sitePackages}" + "-DPYTHON_NUMPY_INCLUDE_DIRS=${python310Packages.numpy}/${python.sitePackages}/numpy/core/include" "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" "-DWITH_OPENVDB=ON" "-DWITH_TBB=ON" diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 85d801e2ec3c..b0b1718c87b5 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -2,20 +2,34 @@ , meson, ninja, pkg-config, wrapGAppsHook , desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy, webkitgtk , python3Packages, gettext -, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3, gnome -, steam-run, xdg-utils, pciutils, cabextract, wineWowPackages -, freetype, p7zip, gamemode +, appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3, gtksourceview4, gnome +, steam, xdg-utils, pciutils, cabextract, wineWowPackages +, freetype, p7zip, gamemode, mangohud +, bottlesExtraLibraries ? pkgs: [ ] # extra packages to add to steam.run multiPkgs +, bottlesExtraPkgs ? pkgs: [ ] # extra packages to add to steam.run targetPkgs }: +let + steam-run = (steam.override { + # required by wine runner `caffe` + extraLibraries = pkgs: with pkgs; [ libunwind libusb1 gnutls ] + ++ bottlesExtraLibraries pkgs; + extraPkgs = pkgs: [ ] + ++ bottlesExtraPkgs pkgs; + }).run; +in python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2021.12.28-treviso"; + version = "2022.3.14-trento-3"; + sha256 = "0wdqj9l69a9pnray2zcfgl2yw0hmrh23njbgwgqccimch014ckdq"; + # Note: Update via pkgs/applications/misc/bottles/update.py + # mostly copypasted from pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "lZbSLLBg7XM6PuOmu5rJ15dg+QHHRcjijRYE6u3WT9Y="; + inherit sha256; }; postPatch = '' @@ -40,6 +54,7 @@ python3Packages.buildPythonApplication rec { gsettings-desktop-schemas gspell gtk3 + gtksourceview4 libhandy libnotify webkitgtk @@ -67,6 +82,7 @@ python3Packages.buildPythonApplication rec { freetype p7zip gamemode # programs.gamemode.enable + mangohud ]; format = "other"; @@ -75,19 +91,26 @@ python3Packages.buildPythonApplication rec { preConfigure = '' patchShebangs build-aux/meson/postinstall.py - substituteInPlace src/backend/runner.py \ - --replace "{Paths.runners}" "${steam-run}/bin/steam-run {Paths.runners}" + substituteInPlace src/backend/wine/winecommand.py \ + --replace \ + 'self.__get_runner()' \ + '(lambda r: (f"${steam-run}/bin/steam-run {r}", r)[r == "wine" or r == "wine64"])(self.__get_runner())' ''; preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru = { + updateScript = ./update.py; + }; + meta = with lib; { description = "An easy-to-use wineprefix manager"; homepage = "https://usebottles.com/"; + downloadPage = "https://github.com/bottlesdevs/Bottles/releases"; license = licenses.gpl3Only; - maintainers = with maintainers; [ bloomvdomino shamilton ]; + maintainers = with maintainers; [ bloomvdomino psydvl shamilton ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/bottles/update.py b/pkgs/applications/misc/bottles/update.py new file mode 100755 index 000000000000..6adacd7d0e07 --- /dev/null +++ b/pkgs/applications/misc/bottles/update.py @@ -0,0 +1,65 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 nix nix-prefetch-git + +import fileinput +import json +import os +import re +import subprocess + +from datetime import datetime +from urllib.request import urlopen, Request + + +DIR = os.path.dirname(os.path.abspath(__file__)) +HEADERS = {'Accept': 'application/vnd.github.v3+json'} + + +def github_api_request(endpoint): + base_url = 'https://api.github.com/' + request = Request(base_url + endpoint, headers=HEADERS) + with urlopen(request) as http_response: + return json.loads(http_response.read().decode('utf-8')) + + +def get_commit_date(repo, sha): + url = f'https://api.github.com/repos/{repo}/commits/{sha}' + request = Request(url, headers=HEADERS) + with urlopen(request) as http_response: + commit = json.loads(http_response.read().decode()) + date = commit['commit']['committer']['date'].rstrip('Z') + date = datetime.fromisoformat(date).date().isoformat() + return 'unstable-' + date + + +def nix_prefetch_git(url, rev): + """Prefetches the requested Git revision (incl. submodules) of the given repository URL.""" + print(f'nix-prefetch-git {url} {rev}') + out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev, '--fetch-submodules']) + return json.loads(out)['sha256'] + + +def nix_prefetch_url(url, unpack=False): + """Prefetches the content of the given URL.""" + print(f'nix-prefetch-url {url}') + options = ['--type', 'sha256'] + if unpack: + options += ['--unpack'] + out = subprocess.check_output(['nix-prefetch-url'] + options + [url]) + return out.decode('utf-8').rstrip() + + +def update_file(relpath, version, sha256): + file_path = os.path.join(DIR, relpath) + with fileinput.FileInput(file_path, inplace=True) as f: + for line in f: + result = line + result = re.sub(r'^ version = ".+";', f' version = "{version}";', result) + result = re.sub(r'^ sha256 = ".+";', f' sha256 = "{sha256}";', result) + print(result, end='') + + +if __name__ == "__main__": + bottles_version = github_api_request('repos/bottlesdevs/Bottles/releases/latest')['tag_name'] + bottles_hash = nix_prefetch_git('https://github.com/bottlesdevs/Bottles.git', bottles_version) + update_file('default.nix', bottles_version, bottles_hash) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 1d6af843e2fd..b3754fed1796 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -23,15 +23,16 @@ , xdg-utils , removeReferencesTo , libstemmer +, wrapGAppsHook }: mkDerivation rec { pname = "calibre"; - version = "5.34.0"; + version = "5.37.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-1NQB7vrcU0hR308/8keUn/rHhdvJk5Ab0pOMPyiU1+M="; + hash = "sha256-x2u4v0k05WMATSsuo76NnqChIz8BcTuZfPkZa0uLnMY="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 @@ -62,7 +63,7 @@ mkDerivation rec { dontUseQmakeConfigure = true; - nativeBuildInputs = [ pkg-config qmake removeReferencesTo ]; + nativeBuildInputs = [ pkg-config qmake removeReferencesTo wrapGAppsHook ]; buildInputs = [ chmlib @@ -95,7 +96,6 @@ mkDerivation rec { feedparser html2text html5-parser - jeepney lxml markdown mechanize @@ -154,7 +154,6 @@ mkDerivation rec { # Wrap manually dontWrapQtApps = true; - dontWrapGApps = true; # Remove some references to shrink the closure size. This reference (as of # 2018-11-06) was a single string like the following: @@ -166,7 +165,6 @@ mkDerivation rec { for program in $out/bin/*; do wrapProgram $program \ ''${qtWrapperArgs[@]} \ - ''${gappsWrapperArgs[@]} \ --prefix PYTHONPATH : $PYTHONPATH \ --prefix PATH : ${poppler_utils.out}/bin done diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index 482bec9d0549..0440e806c0c1 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cbatticon"; - version = "1.6.10"; + version = "1.6.12"; src = fetchFromGitHub { owner = "valr"; repo = pname; rev = version; - sha256 = "0ivm2dzhsa9ir25ry418r2qg2llby9j7a6m3arbvq5c3kaj8m9jr"; + sha256 = "sha256-FGCT3gP+KL71Am4cd+f71iY8EwDPRZJ4+FDgQqjZK1M="; }; nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 204a090136de..907bc7a53e05 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.9.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "sha256-5WNkD+YfmQHGAWWfD9/ZEHnHPT0Ejm9Nz+/mn8xvU4U="; + sha256 = "sha256-7WdSIpmpN8Zz2k5PveYZoCueQo5sLxLLZvZdzxRlkaE="; }; - vendorSha256 = "sha256-TncVMDeZ8+Wuv1o0Cjks3Ve1OsO+WXH9mClC6GNaSas="; + vendorSha256 = "sha256-5cqZxh2uvmJV7DtAGzQwt//heF3kF9mjyB0KAs8nWZY="; doCheck = false; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 15faa7a32d75..067ad872f640 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.44"; + version = "0.99.46"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "sha256-13wZb+PxeCrQ3MpewMnqBHO8QnoCRFhKU4awTdYtFd4="; + sha256 = "sha256-yX9USGiiCwtBcg055D8xBHoiCafQWtQFqf5i5bsi13U="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index 7b52145f794b..b9df45b482d5 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "5.4"; + version = "5.6"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "sha256-ppaxfnZB3+aOzvc/wk1f8D2mFYngQspEOl9XArNMdBE="; + sha256 = "sha256-PxYOI/2ZOz3JSGCPIXfm3WfGZ19D8JhhdNS3FVuXus8="; }; # dbus-1.pc has datadir=/etc diff --git a/pkgs/applications/misc/cloak/default.nix b/pkgs/applications/misc/cloak/default.nix index 7b2501841262..7c362961b4be 100644 --- a/pkgs/applications/misc/cloak/default.nix +++ b/pkgs/applications/misc/cloak/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cloak"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "evansmurithi"; repo = pname; rev = "v${version}"; - sha256 = "139z2ga0q7a0vwfnn5hpzsz5yrrrr7rgyd32yvfj5sxiywkmczs7"; + hash = "sha256-Pd2aorsXdHB1bs609+S5s+WV5M1ql48yIKaoN8SEvsg="; }; - cargoSha256 = "0af38wgwmsamnx63dwfm2nrkd8wmky3ai7zwy0knmifgkn4b7yyj"; + cargoHash = "sha256-m11A5fcJzWoDZglrr2Es1V5ZJNepEkGeIRVhexJ7jws="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch b/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch new file mode 100644 index 000000000000..d3c32cf96407 --- /dev/null +++ b/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch @@ -0,0 +1,31 @@ +From 324a267b0e5505c9124874581bc48fb174fb2542 Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" +Date: Fri, 4 Mar 2022 07:03:17 -0600 +Subject: [PATCH] Pillow update + +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 5dc25e0..b3ba397 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -11,7 +11,7 @@ readme = "README.rst" + [tool.poetry.dependencies] + python = "^3.7" + logbook = "^1.5.3" +-Pillow = "^8.2.0" ++Pillow = "^9.0.0" + requests = "^2.24.0" + kiss-headers = "^2.2.3" + single-version = "^1.5.1" +@@ -33,4 +33,4 @@ skip-string-normalization = true + + [build-system] + requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++build-backend = "poetry.core.masonry.api" +-- +2.35.1 + diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix new file mode 100644 index 000000000000..1401a7a8df28 --- /dev/null +++ b/pkgs/applications/misc/cobang/default.nix @@ -0,0 +1,102 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, wrapGAppsHook +, atk +, gdk-pixbuf +, gobject-introspection +, gtk3 +, gst-plugins-good +, libhandy +, librsvg +, networkmanager +, pango +, gst-python +, kiss-headers +, Logbook +, pillow +, poetry-core +, pygobject3 +, python +, python-zbar +, requests +, single-version +, pytestCheckHook }: + +buildPythonApplication rec { + pname = "cobang"; + version = "0.9.6"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hongquan"; + repo = "CoBang"; + rev = "v${version}"; + sha256 = "sha256-YcXQ2wAgFSsJEqcaDQotpX1put4pQaF511kwq/c2yHw="; + }; + + patches = [ + ./0001-Poetry-core-and-pillow-9.patch + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + propagatedBuildInputs = [ + gst-python + kiss-headers + Logbook + pillow + poetry-core + pygobject3 + python-zbar + requests + single-version + ]; + + buildInputs = [ + atk + gdk-pixbuf + # Needed to detect namespaces + gobject-introspection + gst-plugins-good + libhandy + networkmanager + pango + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # Wrapping this manually for SVG recognition + dontWrapGApps = true; + + postInstall = '' + # Needed by the application + cp -R data $out/${python.sitePackages}/ + + # Icons and applications + install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.svg -t $out/share/pixmaps/ + install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop -t $out/share/applications/ + substituteInPlace $out/share/applications/vn.hoabinh.quan.CoBang.desktop \ + --replace "Exec=" "Exec=$out/bin/" + ''; + + preFixup = '' + wrapProgram $out/bin/cobang \ + ''${gappsWrapperArgs[@]} \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" + ''; + + meta = with lib; { + description = "A QR code scanner desktop app for Linux"; + homepage = "https://github.com/hongquan/CoBang"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 209e9f9e3bea..a0ceabf9d105 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "cointop"; version = "1.6.10"; diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 8ec80e995228..b976ea890747 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "1zp523cgvmfjc42wx1f1jh5q3jnsnm833m2xnbbwmfrmhrzh5269"; + sha256 = "sha256-vMSIo4tfvEO6SVxB5aNBnHEn+PXN6wUfRAgUCwZEHKQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index 8f68a512c211..9d64a31dded9 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cpu-x"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "sha256-LWIcE86o+uU8G9DtumiH6iTqHhvq4y/QyQX7J3FhKEc="; + sha256 = "sha256-pYinePs7WFVfRMNYTY+Is8B+cv5w6IF7Ce+9v/mLRYg="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 71142727a83e..8505c97e1bc1 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -34,8 +34,8 @@ let qonlinetranslator = fetchFromGitHub { owner = "crow-translate"; repo = "QOnlineTranslator"; - rev = "1.5.2"; - sha256 = "sha256-iGi25aKwff2hNNx6o4kHZV8gVbEQcMgpTTvop3CoLjM="; + rev = "1.5.3"; + sha256 = "sha256-L8y4vazbWD5SC7itxQOjEcX10w0laewxTOGz+Yd+kVM="; }; circleflags = fetchFromGitHub { owner = "HatScripts"; @@ -52,13 +52,13 @@ let in mkDerivation rec { pname = "crow-translate"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "crow-translate"; repo = pname; rev = version; - sha256 = "sha256-7Zb6PZO8eLeGPEZD37ja+LZydIQdsgy5gMAMtlS4k5Y="; + sha256 = "sha256-cxfBdoqGVmtCaXyw6QzXj2V44wKyVal/uqsddwIdvjw="; }; patches = [ diff --git a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch index 1eb1f464e55f..0bfdc9ef2f74 100644 --- a/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch +++ b/pkgs/applications/misc/crow-translate/dont-fetch-external-libs.patch @@ -46,7 +46,7 @@ index c92e745..f265f03 100644 FetchContent_Declare(QOnlineTranslator - GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator -- GIT_TAG 1.5.2 +- GIT_TAG 1.5.3 + SOURCE_DIR @qonlinetranslator@ ) diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index f8f7fb8491c8..18b61bc8a9bc 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "1.12.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-F0c6gMQKu35iBNRw+wpoxSUOhRUbPRKIXSNDDNZsfPE="; + sha256 = "sha256-6XPgSreWcRXN8ymP7zS5a7Cfl9wSLMxjmiugJPp6l+g="; fetchSubmodules = true; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { desktopName = "Cubiomes Viewer"; exec = pname; icon = pname; - categories = "Game"; + categories = [ "Game" ]; comment = meta.description; }) ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { cp cubiomes-viewer $out/bin mkdir -p $out/share/pixmaps - cp icons/map.png $out/share/pixmaps/cubiomes-viewer.png + cp rc/icons/map.png $out/share/pixmaps/cubiomes-viewer.png runHook postInstall ''; diff --git a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix index f17730cc7e95..a3a8c1dcf6cf 100644 --- a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix @@ -1,24 +1,16 @@ -{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, cmake, ninja, libcprime, libcsys }: +{ mkDerivation, lib, fetchFromGitLab, qtsvg, qtbase, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "coreaction"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5qEZNLvbgLoAOXij0wXoVw2iyvytsYZikSJDm6F6ddc="; + sha256 = "sha256-XQ/GcSjGSe+3d0dJxjmmcBFoDzrmM6zsHMfbDdzmpPs="; }; - patches = [ - ## Fix Plugin Error: "The shared library was not found." "libbatery.so" - (fetchpatch { - url = "https://gitlab.com/cubocore/coreapps/coreaction/-/commit/1d1307363614a117978723eaad2332e6e8c05b28.patch"; - sha256 = "039x19rsm23l9vxd5mnbl6gvc3is0igahf47kv54v6apz2q72l3f"; - }) - ]; - nativeBuildInputs = [ cmake ninja diff --git a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix index 56a05bc434ec..7549ef20b112 100644 --- a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corearchiver"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FJGsQp1lbsrvlzKPiTv/FC9RH2+JRwwIvkLDTFW8t5s="; + sha256 = "sha256-EUcUivUuuUApIC9daS6BFA1YoE4yO3Kc8jG0VIks/Y0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix index 3ec918db7af9..a3314dface43 100644 --- a/pkgs/applications/misc/cubocore-packages/corefm/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corefm"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PczKIKY9uCD+cAzAC6Gkb+g+cn9KKCQYd3epoZK8bvA="; + sha256 = "sha256-uScM6cVRwYopZ6NY3PSAAyxNNyX3hVnFs6hkAyF29PA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix index 719047c8de7b..f416f21c419a 100644 --- a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coregarage"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2pOQwSj+QKwpHVJp7VCyq6QpVW5wLUf/BE7ReXrJ78s="; + sha256 = "sha256-Jq0lIXfw/1Ixd+QIY7D1ErBCOSKmwkWBupcDxUUEliM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix index fb9bcd5e8ef4..7da5ebe081fd 100644 --- a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corehunt"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KnIqLI8MtLirFycW2YNHAjS7EDfU3dpqb6vVq9Tl6Ow="; + sha256 = "sha256-zhJadrdOXpl0bXxEPWjQ59Pzjg4MfIZXtYzCnJbh+pI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix index 224c946d1175..6078d04be7a7 100644 --- a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreimage"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dxRHzSG5ea1MhpTjgZbFztV9mElEaeOK4NsmieSgf5Q"; + sha256 = "sha256-uG9/8sQK0G3f7O59OHEHqNHP8cUC73hmjsfpOnj0kFM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix index d8df86abd870..c5f7e49d4521 100644 --- a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreinfo"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kLBOvvulHE1+4TyZVEVZwEA+Id7+w8fI3ll+QL2ukr0="; + sha256 = "sha256-KoX2U07giVF2xZR1diM6teiNfKYRiqjowTJgnsMlaN0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/0001-fix-installPhase.patch b/pkgs/applications/misc/cubocore-packages/corekeyboard/0001-fix-installPhase.patch new file mode 100644 index 000000000000..084a650c610e --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/0001-fix-installPhase.patch @@ -0,0 +1,8 @@ +--- a/corekeyboard/CMakeLists.txt 2022-01-29 14:03:28.149607341 +0700 ++++ b/CMakeLists.txt 2022-01-29 14:04:00.178733700 +0700 +@@ -55,5 +55,4 @@ + + install( TARGETS corekeyboard DESTINATION bin ) + install( FILES org.cubocore.CoreKeyboard.desktop DESTINATION share/applications ) +-install( FILES org.cubocore.CoreKeyboard-Tray.desktop DESTINATION /etc/xdg/autostart ) + install( FILES org.cubocore.CoreKeyboard.svg DESTINATION share/icons/hicolor/scalable/apps/ ) diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix index 3d4e6ddc3010..5116f80f4cb2 100644 --- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -2,15 +2,20 @@ mkDerivation rec { pname = "corekeyboard"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0CbQ43BN4ORvtxs6FwNkgk/0jcVdFJq/tqvjUGYanM4="; + sha256 = "sha256-yJOcuE6HknDhXCr1qW/NJkerjvBABYntXos0owDDwcw="; }; + patches = [ + # Remove autostart + ./0001-fix-installPhase.patch + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix index fcd1bfa4a4ff..bdded6e8f1fe 100644 --- a/pkgs/applications/misc/cubocore-packages/corepad/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepad"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2bGHVv0+0NlkIqnvWm014Kr20uARWnOS5xSuNmCt/bQ="; + sha256 = "sha256-19qR08QhWeeXnJAQHe1SJjT0xnQLlbkXlzmd9uiMp14="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix index 6410da3ba607..228b0175a7d2 100644 --- a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepaint"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nATraYm7FZEXoNWgXt1G86KdrAvRgM358F+YdfWcnkg="; + sha256 = "sha256-uAFV3NKtgNri8GQLD+MRacl9WYMfkMVZcoVML+oSX78="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix index bb93391c2af8..42f8fd0dd0fd 100644 --- a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix @@ -1,14 +1,14 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, poppler, cmake, ninja, libcprime, libcsys }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, poppler, qtwebengine, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "corepdf"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HeOklgCwJ5h3DeelJOZqasG+eC9DGG3R0Cqg2yPKYhM="; + sha256 = "sha256-VwJ3H/jNP3u5C+LATPUSftiWm89upx77fN3NqzTnU7Y="; }; nativeBuildInputs = [ @@ -19,6 +19,7 @@ mkDerivation rec { buildInputs = [ qtbase poppler + qtwebengine libcprime libcsys ]; diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix index 80d3a096ffe6..7b5ba0ad7a60 100644 --- a/pkgs/applications/misc/cubocore-packages/corepins/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepins"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H/l/MHHrTmkfznVKUHFAhim8b/arT5SNK5fxTvjsTE4="; + sha256 = "sha256-CVToPF8/Tw+n31/A0bzyBbwF7xPBVirsqVOUsM8QtH0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix index f92d532ba4a5..e13485619d9a 100644 --- a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corerenamer"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OI7M7vV0CA42J5cWCqgGKEzUUHSgIJCWRTXmKRD6Jb0="; + sha256 = "sha256-WrMyz8Noq0EeBIxL4mSl6e+8wrivmwfoa1yKBrSgrRI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix index bf9f5e49aea6..18d773e904bf 100644 --- a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreshot"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HKgGeuM3CKGXwnFwSw6a0AB0klZKY5YS9C4q2UT6TN8="; + sha256 = "sha256-wEpo/YINtKAYHqlGYytUPh9ndkvQBw3tRIlyjnKJaf8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix index a6d71eaa6cb6..ac3f7280aa76 100644 --- a/pkgs/applications/misc/cubocore-packages/corestats/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corestats"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/WBetvbd8e4v+j6e2xbGtSLwNMdLlaahSIks6r889B4="; + sha256 = "sha256-154BZIKb6QDrTC4DXh4dbFtN/Lq0ok/qOrqTkXa+rAo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch b/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch new file mode 100644 index 000000000000..d1db6a0a0a2e --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch @@ -0,0 +1,11 @@ +--- a/corestuff/CMakeLists.txt 2022-01-29 14:09:02.699700817 +0700 ++++ b/CMakeLists.txt 2022-01-29 14:09:23.211754633 +0700 +@@ -120,8 +120,3 @@ + install( FILES org.cubocore.CoreStuff.desktop DESTINATION share/applications ) + install( FILES org.cubocore.CoreStuff.svg DESTINATION share/icons/hicolor/scalable/apps/ ) + install( FILES background/default.svg DESTINATION share/coreapps/background ) +- +-if ( DEFINED ADD_AUTOSTART ) +- message("INSTALLING TO AUTOSTART LOCATION") +- install( FILES org.cubocore.CoreStuff.desktop DESTINATION /etc/xdg/autostart ) +-endif() diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix index 57216f4710da..04c6d82d4b27 100644 --- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -2,15 +2,20 @@ mkDerivation rec { pname = "corestuff"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/mmCIHZXn/Jpjr37neI6owWuU1VO6o7wmRj6ZH8tUbo="; + sha256 = "sha256-snzW6cqxIyiXJLOD5MoEqmzen1aZN4IALESaIWIOMro="; }; + patches = [ + # Remove autostart + ./0001-fix-installPhase.patch + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix index c2085686aab8..1203706a62e6 100644 --- a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "coreterminal"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YXs6VTem3AaK4n1DYwKP/jqNuf09Srn2THHyJJnArlc="; + sha256 = "sha256-0gxcbfDD43BnkxYWSdViK3hjzfgPGFruwzF4hCxFZ7c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix index af33d474e350..41fe2698e4eb 100644 --- a/pkgs/applications/misc/cubocore-packages/coretime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coretime"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b7oqHhsuHsy96IAXPUtw+WqneEHgn/nUDgHiJt2aXXM="; + sha256 = "sha256-MIcmgBfgyjEyJxXCq6IbQ/i6IdtL5cWVGpV2YZbzK58="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch index 8a8b0ae40109..3c0c942ee43a 100644 --- a/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch @@ -1,8 +1,8 @@ ---- a/corepkit/CMakeLists.txt -+++ b/corepkit/Cmakelists.txt +--- a/corepkit/CMakeLists.txt 2021-12-25 17:52:20.000000000 +0700 ++++ b/corepkit/CMakeLists.txt 2021-12-29 17:58:09.298024297 +0700 @@ -32,4 +32,4 @@ target_link_libraries( corepkit Qt5::Core ) install( TARGETS corepkit DESTINATION libexec/coreapps/ ) --install( FILES org.cubocore.coreapps.policy DESTINATION /usr/share/polkit-1/actions/ ) +-install( FILES org.cubocore.coreapps.policy DESTINATION share/polkit-1/actions/ ) +install( FILES org.cubocore.coreapps.policy DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/polkit-1/actions/ ) diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix index 154f4a389948..b72008cd43ad 100644 --- a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -30,13 +30,13 @@ mkDerivation rec { pname = "coretoppings"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DpmzGqjW1swLirRLzd5nblAb40LHAmf8nL+VykQNL3E="; + sha256 = "sha256-Yq57dY1zIuQN2Gj9haxJMomafL32B+/9v3lWlY9fvcc="; }; patches = [ diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix index 0a6ccaf72142..5e72458dad45 100644 --- a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreuniverse"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YZCMyYMAvd/xQYNUnURIvmQwaM+X+Ql93OS4ZIyAZLY="; + sha256 = "sha256-KNjXrsm4OfBxida8mcAlKgomcpg0xJg51ZxEdhaiL84="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix index 00e297bf276a..f100a3a10403 100644 --- a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libcprime"; - version = "4.2.2"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI="; + sha256 = "sha256-+z5dXKaV2anN6OLMycEz87kDqQScgHHEKwGhDAdHSd4="; }; patches = [ diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix index d1dde9942e92..395a40ddfc66 100644 --- a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libcsys"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { owner = "cubocore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9LH95uJJIn4FHfnikGi5UCI6nUNW+1cSZnJ/KpZDI5Y="; + sha256 = "sha256-/iRFppe08+rMQNFjWSyxo3Noy0iNaelg0JAczg/BYBs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix index a2ec91193ea4..d330a8a5ae28 100644 --- a/pkgs/applications/misc/cura/stable.nix +++ b/pkgs/applications/misc/cura/stable.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { comment = "Cura"; desktopName = "Cura"; genericName = "3D printing host software"; - categories = "GNOME;GTK;Utility;"; + categories = [ "GNOME" "GTK" "Utility" ]; }; python_deps = with python27Packages; [ pyopengl pyserial numpy wxPython30 power setuptools ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index c6af30b78552..085fcab1475c 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.12.1"; + version = "4.13.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "sha256-+sjysxOaNLq6p3yCoB1qKosBO5Cg2/1o7xmUtZ15wkE="; + sha256 = "sha256-dx0Q6cuA66lG4nwR7quW5Tvs9sdxjdV4gtpxXirI4nY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 870d3cceb0ba..d8fd18f9de4e 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "1.22.1"; + version = "1.24.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "091s3hyz9p892garanm9zmkbsn6hn3bnnrz7h3dqsyi58806d5yr"; + sha256 = "sha256-Em+WAI8G492h7FJTnTHFj5L7M4xBZhW4qC0MMc2JRUU="; }; - vendorSha256 = "1psyx8nqzpx3p1ya9y3q9h0hhfx4iqmix089b2h6bp9lgqbj5zn8"; + vendorSha256 = "sha256-NP+Is7Dxz4LGzx5vpv8pJOJhodAYHia1JXYfhJD54as="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 3f62ffe7dfb4..bcb6f87ab1d3 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -16,44 +16,24 @@ , maven , webkitgtk , glib-networking +, javaPackages }: -stdenv.mkDerivation rec { +(javaPackages.mavenfod.override { + inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) +}) rec { pname = "dbeaver"; - version = "21.3.2"; # When updating also update fetchedMavenDeps.sha256 + version = "22.0.1"; # When updating also update mvnSha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "SifnnzuETFKtnEwLjJtB7CV2QZaToex3MjKGuiShlwo="; + sha256 = "sha256-IG5YWwq3WVzQBvAslQ9Z2Ou6ADzf4n9NkQCtH4Jgkac="; }; - fetchedMavenDeps = stdenv.mkDerivation { - name = "dbeaver-${version}-maven-deps"; - inherit src; - - buildInputs = [ - maven - ]; - - buildPhase = "mvn package -Dmaven.repo.local=$out/.m2 -P desktop,all-platforms"; - - # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside - installPhase = '' - find $out -type f \ - -name \*.lastUpdated -or \ - -name resolver-status.properties -or \ - -name _remote.repositories \ - -delete - ''; - - # don't do any fixup - dontFixup = true; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "grSFtkohTlLtK8qE4A4wVppC6UHcyaXRQlGnrOmQDC4="; - }; + mvnSha256 = "WAB15d4UvUOkBXT7K/hvAZWOE3V1Lpl/tr+AFNBM4FI="; + mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ copyDesktopItems @@ -84,18 +64,10 @@ stdenv.mkDerivation rec { desktopName = "dbeaver"; comment = "SQL Integrated Development Environment"; genericName = "SQL Integrated Development Environment"; - categories = "Development;"; + categories = [ "Development" ]; }) ]; - buildPhase = '' - runHook preBuild - - mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 -P desktop,all-platforms - - runHook postBuild - ''; - installPhase = let productTargetPath = "product/community/target/products/org.jkiss.dbeaver.core.product"; diff --git a/pkgs/applications/misc/ddcui/default.nix b/pkgs/applications/misc/ddcui/default.nix index ebc220e4029f..1e83a16659af 100644 --- a/pkgs/applications/misc/ddcui/default.nix +++ b/pkgs/applications/misc/ddcui/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "ddcui"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcui"; rev = "v${version}"; - sha256 = "sha256-dp6D5GHpo0PJILnzZDKLnEPgQQ7980dI/6RV5ws3RTU="; + sha256 = "sha256-a8UGdVLi+i8hvWE3M5d92vnm3VryxRR56jXeBtB2PSk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index 850bca3320ea..dee6f5c663f7 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3, installShellFiles }: stdenv.mkDerivation rec { - version = "1.9"; + version = "2.0"; pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "0qbdq7k0mmvkjp6qzz88n7vf29liqn6y5w4y39ldqdc8hzw5sld7"; + sha256 = "sha256-otfa2t/tfpYKqQu+VQxRKryUsIxM3JKILc3zseTC2KM="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 42bc05998667..7c76b22dc99c 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dmenu"; - version = "5.0"; + version = "5.1"; src = fetchurl { url = "https://dl.suckless.org/tools/dmenu-${version}.tar.gz"; - sha256 = "1lvfxzg3chsgcqbc2vr0zic7vimijgmbvnspayx73kyvqi1f267y"; + sha256 = "sha256-H01wnrujfrcybroOZl4PE75Pok7jXJWw15ww8Uo0j9U="; }; buildInputs = [ libX11 libXinerama zlib libXft ]; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 4f1d68774de2..116d5430c2a8 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dunst"; - version = "1.7.3"; + version = "1.8.1"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "sha256-8s8g1J8vEogCp29tSwX5eqYTDf1dLoyBznnwAlCMQOU="; + sha256 = "sha256-aMla5mzQpN9CNDc4QSxjcKR+Ufej+8WLBYxCntApcKU="; }; nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 7612153fe563..6bc290809832 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -1,8 +1,8 @@ -{lib, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}: +{lib, python3Packages, gettext, qt5, fetchFromGitHub}: python3Packages.buildPythonApplication rec { pname = "dupeguru"; - version = "4.0.4"; + version = "4.1.1"; format = "other"; @@ -10,19 +10,10 @@ python3Packages.buildPythonApplication rec { owner = "arsenetar"; repo = "dupeguru"; rev = version; - sha256 = "0ma4f1c6vmpz8gi4sdy43x1ik7wh42wayvk1iq520d3i714kfcpy"; + sha256 = "sha256-0lJocrNQHTrpslbPE6xjZDWhzza8cAt2js35LvicZKg="; fetchSubmodules = true; }; - patches = [ - # already merged to master, remove next version bump - (fetchpatch { - name = "remove-m-from-so-var.patch"; - url = "https://github.com/arsenetar/dupeguru/commit/bd0f53bcbe463c48fe141b73af13542da36d82ba.patch"; - sha256 = "07iisz8kcr7v8lb21inzj1avlpfhh9k8wcivbd33w49cr3mmnr26"; - }) - ]; - nativeBuildInputs = [ gettext python3Packages.pyqt5 @@ -31,6 +22,7 @@ python3Packages.buildPythonApplication rec { pythonPath = with python3Packages; [ pyqt5 + pyqt5_sip send2trash sphinx polib @@ -42,9 +34,12 @@ python3Packages.buildPythonApplication rec { "NO_VENV=1" ]; - # TODO: package pytest-monkeyplus for running tests - # https://github.com/NixOS/nixpkgs/pull/75054/files#r357690123 - doCheck = false; + checkInputs = with python3Packages; [ + pytestCheckHook + ]; + preCheck = '' + export HOME="$(mktemp -d)" + ''; # Avoid double wrapping Python programs. dontWrapQtApps = true; @@ -66,6 +61,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/arsenetar/dupeguru"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = [ maintainers.novoxudonoser ]; + maintainers = [ maintainers.novoxd ]; }; } diff --git a/pkgs/applications/misc/edgetx/default.nix b/pkgs/applications/misc/edgetx/default.nix new file mode 100644 index 000000000000..4dfb5b6422fe --- /dev/null +++ b/pkgs/applications/misc/edgetx/default.nix @@ -0,0 +1,47 @@ +{ lib, mkDerivation, fetchFromGitHub +, cmake, gcc-arm-embedded, python3Packages +, qtbase, qtmultimedia, qttranslations, SDL, gtest +, dfu-util +}: + +mkDerivation rec { + pname = "edgetx"; + version = "2.6.0"; + + src = fetchFromGitHub { + owner = "EdgeTX"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-TffHFgr3g7v4VnNSSlLITz4cYjHM6wE0aI85W1g4IFA="; + }; + + nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; + + buildInputs = [ qtbase qtmultimedia qttranslations SDL ]; + + postPatch = '' + sed -i companion/src/burnconfigdialog.cpp \ + -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' + ''; + + cmakeFlags = [ + "-DGTEST_ROOT=${gtest.src}/googletest" + "-DQT_TRANSLATIONS_DIR=${qttranslations}/translations" + "-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" + ]; + + meta = with lib; { + description = "EdgeTX Companion transmitter support software"; + longDescription = '' + EdgeTX Companion is used for many different tasks like loading EdgeTX + firmware to the radio, backing up model settings, editing settings and + running radio simulators. + ''; + homepage = "https://edgetx.org/"; + license = licenses.gpl2Only; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ elitak lopsided98 wucke13 ]; + }; + +} diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 16f5673bed1b..7fe091cf7732 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.2.5"; + version = "4.2.7"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = version; - sha256 = "sha256-ALIrNnhpX46xdQdfJdx/9e/QtdyBEgi5xLrbuOBJR7o="; + sha256 = "sha256-m8a3x5fPSrnrCH30MToT3aKtX35nFUbeerR7ubWgOOI="; }; propagatedBuildInputs = with python3Packages; [ @@ -40,6 +40,7 @@ python3Packages.buildPythonApplication rec { keepkey btchip hidapi + pyopenssl pyscard pysatochip ]; diff --git a/pkgs/applications/misc/electrum-grs/default.nix b/pkgs/applications/misc/electrum-grs/default.nix new file mode 100644 index 000000000000..c8fb9f84ad19 --- /dev/null +++ b/pkgs/applications/misc/electrum-grs/default.nix @@ -0,0 +1,129 @@ +{ lib +, stdenv +, fetchFromGitHub +, wrapQtAppsHook +, python3 +, zbar +, secp256k1 +, enableQt ? true +}: + +let + version = "4.1.5"; + + libsecp256k1_name = + if stdenv.isLinux then "libsecp256k1.so.0" + else if stdenv.isDarwin then "libsecp256k1.0.dylib" + else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; + + libzbar_name = + if stdenv.isLinux then "libzbar.so.0" + else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; + + py = python3.override { + packageOverrides = self: super: { + + aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec { + version = "0.18.7"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0"; + }; + }); + }; + }; + +in + +python3.pkgs.buildPythonApplication { + pname = "electrum-grs"; + inherit version; + + src = fetchFromGitHub { + owner = "Groestlcoin"; + repo = "electrum-grs"; + rev = "refs/tags/v${version}"; + sha256 = "0wvbjj80r1zxpz24adkicxsdjnv3nciga6rl1wfmky463w03rca2"; + }; + + postPatch = '' + substituteInPlace contrib/requirements/requirements.txt \ + --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" + ''; + + nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; + + propagatedBuildInputs = with py.pkgs; [ + aiohttp + aiohttp-socks + aiorpcx + attrs + bitstring + cryptography + dnspython + groestlcoin_hash + jsonrpclib-pelix + matplotlib + pbkdf2 + protobuf + pysocks + qrcode + requests + tlslite-ng + # plugins + btchip + ckcc-protocol + keepkey + trezor + ] ++ lib.optionals enableQt [ + pyqt5 + qdarkstyle + ]; + + preBuild = '' + sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py + substituteInPlace ./electrum_grs/ecc_fast.py \ + --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} + '' + (if enableQt then '' + substituteInPlace ./electrum_grs/qrscanner.py \ + --replace ${libzbar_name} ${zbar.lib}/lib/libzbar${stdenv.hostPlatform.extensions.sharedLibrary} + '' else '' + sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt + ''); + + postInstall = lib.optionalString stdenv.isLinux '' + # Despite setting usr_share above, these files are installed under $out/nix ... + mv $out/${python3.sitePackages}/nix/store/*/share $out + rm -rf $out/${python3.sitePackages}/nix + + substituteInPlace $out/share/applications/electrum-grs.desktop \ + --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum-grs %u"' \ + "Exec=$out/bin/electrum-grs %u" \ + --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum-grs --testnet %u"' \ + "Exec=$out/bin/electrum-grs --testnet %u" + + ''; + + postFixup = lib.optionalString enableQt '' + wrapQtApp $out/bin/electrum-grs + ''; + + postCheck = '' + $out/bin/electrum-grs help >/dev/null + ''; + + meta = with lib; { + description = "Lightweight Groestlcoin wallet"; + longDescription = '' + An easy-to-use Groestlcoin client featuring wallets generated from + mnemonic seeds (in addition to other, more advanced, wallet options) + and the ability to perform transactions without downloading a copy + of the blockchain. + ''; + homepage = "https://groestlcoin.org/"; + downloadPage = "https://github.com/Groestlcoin/electrum-grs/releases/tag/v{version}"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ gruve-p ]; + }; +} diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 841b943e8634..f9ef802ce422 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -21,7 +21,7 @@ }: let - version = "4.1.5"; + version = "4.2.1"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -37,7 +37,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1ps8yaps5kfd7yv7bpdvssbwm6f5qivxcvhwn17cpddc2760a7nk"; + sha256 = "sha256-BoikYSsQZAv8WswIr5nmBsGmjZbTXaLAbdO2QtPvc7c="; extraPostFetch = '' mv $out ./all @@ -45,19 +45,6 @@ let ''; }; - py = python3.override { - packageOverrides = self: super: { - - aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec { - version = "0.18.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0"; - }; - }); - }; - }; - in python3.pkgs.buildPythonApplication { @@ -66,7 +53,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "188r4zji985z8pm9b942xhmvv174yndk6jxagxl7ljk03wl2wiwi"; + sha256 = "sha256-2SxSTH9P380j2KaCbkXjgmQO7K2z81AG6PMA/EMggXA="; }; postUnpack = '' @@ -74,22 +61,9 @@ python3.pkgs.buildPythonApplication { cp -ar ${tests} $sourceRoot/electrum/tests ''; - prePatch = '' - substituteInPlace contrib/requirements/requirements.txt \ - --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" - ''; - - patches = [ - # trezorlib 0.13 compatibility - (fetchpatch { - url = "https://github.com/spesmilo/electrum/commit/97e61cfacdca374103e4184f0f9a07a0c5757afb.patch"; - sha256 = "sha256-RGVBO9IskC+lQOHNGjrqH6EM/inNPJlcD9sSWedyT5E="; - }) - ]; - nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiohttp aiohttp-socks aiorpcx diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index a070bc321b74..416adbe60c88 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -76,6 +76,11 @@ python3.pkgs.buildPythonApplication { prePatch = '' substituteInPlace contrib/requirements/requirements.txt \ --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" + + # according to upstream, this is fine + # https://github.com/spesmilo/electrum/issues/7361 + substituteInPlace contrib/requirements/requirements.txt \ + --replace "qdarkstyle<2.9" "qdarkstyle>=2.7" ''; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/emojipick/default.nix b/pkgs/applications/misc/emojipick/default.nix new file mode 100644 index 000000000000..9c28c98bf047 --- /dev/null +++ b/pkgs/applications/misc/emojipick/default.nix @@ -0,0 +1,71 @@ +{ stdenvNoCC +, fetchFromGitHub +, lib +, python3 +, xclip +, libnotify +, dmenu +, rofi +, emojipick-use-rofi ? false +, emojipick-copy-to-clipboard ? true +, emojipick-show-notifications ? true +, emojipick-print-emoji ? true +, emojipick-font-family ? "Noto Color Emoji" +, emojipick-font-size ? "18" +}: + +let + boolToInt = b: if b then "1" else "0"; # Convert boolean to integer string +in +stdenvNoCC.mkDerivation { + pname = "emojipick"; + version = "2021-01-27"; + + src = fetchFromGitHub { + owner = "thingsiplay"; + repo = "emojipick"; + rev = "20210127"; + sha256 = "1kib3cyx6z9v9qw6yrfx5sklanpk5jbxjc317wi7i7ljrg0vdazp"; + }; + + dontConfigure = true; + dontBuild = true; + + # Patch configuration + # notify-send has to be patched in a bash file + postPatch = '' + substituteInPlace emojipick \ + --replace "use_rofi=0" "use_rofi=${boolToInt emojipick-use-rofi}" \ + --replace "copy_to_clipboard=1" "copy_to_clipboard=${boolToInt emojipick-copy-to-clipboard}" \ + --replace "show_notification=1" "show_notification=${boolToInt emojipick-show-notifications}" \ + --replace "print_emoji=1" "print_emoji=${boolToInt emojipick-print-emoji}" \ + --replace "font_family='\"Noto Color Emoji\"'" "font_family='\"${emojipick-font-family}\"'" \ + --replace 'font_size="18"' 'font_size="${emojipick-font-size}"' \ + ${lib.optionalString emojipick-use-rofi "--replace 'rofi ' '${rofi}/bin/rofi '"} \ + --replace notify-send ${libnotify}/bin/notify-send + ''; + + buildInputs = [ + python3 + xclip + libnotify + ] ++ (if emojipick-use-rofi then [rofi] else [dmenu]); + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp ./emojipick $out/bin + cp ./emojiget.py $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Get a selection of emojis with dmenu or rofi"; + homepage = "https://github.com/thingsiplay/emojipick"; + license = licenses.mit; + maintainers = with maintainers; [ alexnortung ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/eos-installer/default.nix b/pkgs/applications/misc/eos-installer/default.nix new file mode 100644 index 000000000000..8234a77ba145 --- /dev/null +++ b/pkgs/applications/misc/eos-installer/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchFromGitHub +, autoconf, autoconf-archive, automake, glib, intltool, libtool, pkg-config +, gnome-desktop, gnupg, gtk3, udisks +}: + +stdenv.mkDerivation rec { + pname = "eos-installer"; + version = "4.0.3"; + + src = fetchFromGitHub { + owner = "endlessm"; + repo = "eos-installer"; + rev = "Release_${version}"; + sha256 = "1nl6vim5dd83kvskmf13xp9d6zx39fayz4z0wqwf7xf4nwl07gwz"; + fetchSubmodules = true; + }; + + strictDeps = true; + nativeBuildInputs = [ + autoconf autoconf-archive automake glib intltool libtool pkg-config + ]; + buildInputs = [ gnome-desktop gtk3 udisks ]; + + preConfigure = '' + ./autogen.sh + ''; + + configureFlags = [ + "--libexecdir=${placeholder "out"}/bin" + "--localstatedir=/var" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ]; + + # These are for runtime, so can't be discovered from PATH, which + # is constructed from nativeBuildInputs. + GPG_PATH = "${gnupg}/bin/gpg"; + GPGCONF_PATH = "${gnupg}/bin/gpgconf"; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/endlessm/eos-installer"; + description = "Installer UI which writes images to disk"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 3acb493c1c04..aa290632748e 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -1,20 +1,36 @@ -{ lib, stdenv, python3Packages, radicale3 }: +{ lib +, stdenv +, python3 +, radicale3 +}: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + flask_wtf = super.flask_wtf.overridePythonAttrs (old: rec { + version = "0.15.1"; + src = old.src.override { + inherit version; + sha256 = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc"; + }; + }); + }; + }; +in python.pkgs.buildPythonApplication rec { pname = "etesync-dav"; - version = "0.30.8"; + version = "0.32.1"; - src = python3Packages.fetchPypi { + src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-HBLQsq3B6TMdcnUt8ukbk3+S0Ed44+gePkpuGZ2AyC4="; + sha256 = "a4e2ee83932755d29ac39c1e74005ec289880fd2d4d2164f09fe2464a294d720"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ etebase etesync flask flask_wtf - radicale3 + (python.pkgs.toPythonModule (radicale3.override { python3 = python; })) ]; doCheck = false; diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix index 2e70beb6173c..8828b6e38e18 100644 --- a/pkgs/applications/misc/eureka-editor/default.nix +++ b/pkgs/applications/misc/eureka-editor/default.nix @@ -1,25 +1,21 @@ -{ lib, stdenv, fetchzip, fltk, zlib, xdg-utils, xorg, libjpeg, libGL }: +{ lib, stdenv, fetchzip, fltk, zlib, xdg-utils, xorg, libjpeg, libGLU }: stdenv.mkDerivation rec { pname = "eureka-editor"; - version = "1.21"; - shortver = "121"; + version = "1.27b"; src = fetchzip { - url = "mirror://sourceforge/eureka-editor/Eureka/${version}/eureka-${shortver}-source.tar.gz"; - sha256 = "0fpj13aq4wh3f7473cdc5jkf1c71jiiqmjc0ihqa0nm3hic1d4yv"; + url = "mirror://sourceforge/eureka-editor/Eureka/${lib.versions.majorMinor version}/eureka-${version}-source.tar.gz"; + sha256 = "075w7xxsgbgh6dhndc1pfxb2h1s5fhsw28yl1c025gmx9bb4v3bf"; }; - buildInputs = [ fltk zlib xdg-utils libjpeg xorg.libXinerama libGL ]; + buildInputs = [ fltk zlib xdg-utils libjpeg xorg.libXinerama libGLU ]; enableParallelBuilding = true; - preBuild = '' - substituteInPlace src/main.cc \ - --replace /usr/local $out - substituteInPlace Makefile \ - --replace /usr/local $out \ - --replace "-o root " "" + postPatch = '' + substituteInPlace src/main.cc --replace /usr/local $out + substituteInPlace Makefile --replace /usr/local $out ''; preInstall = '' @@ -32,9 +28,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://eureka-editor.sourceforge.net"; description = "A map editor for the classic DOOM games, and a few related games such as Heretic and Hexen"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; - broken = stdenv.isDarwin; + badPlatforms = platforms.darwin; maintainers = with maintainers; [ neonfuz ]; }; } diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix index 2c31f24b6b1b..e838bd3eda2a 100644 --- a/pkgs/applications/misc/expenses/default.nix +++ b/pkgs/applications/misc/expenses/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-sqsogF2swMvYZL7Kj+ealrB1AAgIe7ZXXDLRdHL6Q+0="; }; - vendorSha256 = "sha256-Ac3f17Ws3Ne8Zo0vT+qlaMm/rhak9ua2jh5jlT6jF2Y="; + vendorSha256 = "sha256-rIcwZUOi6bdfiWZEsRF4kl1reNPPQNuBPHDOo7RQgYo="; # package does not contain any tests as of v0.2.3 doCheck = false; diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix new file mode 100644 index 000000000000..4486381b8b34 --- /dev/null +++ b/pkgs/applications/misc/faircamp/default.nix @@ -0,0 +1,56 @@ +{ lib +, rustPlatform +, fetchgit +, makeWrapper +, ffmpeg +, callPackage +, unstableGitUpdater +}: + +rustPlatform.buildRustPackage { + pname = "faircamp"; + version = "unstable-2022-01-19"; + + # 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 = "f8ffc7a35a12251b83966b35c63f72b4912f75a9"; + sha256 = "sha256-9t42+813IPLUChbLkcwzoCr7FXSL1g+ZG6I3d+7pmec="; + }; + + cargoHash = "sha256-24ALBede3W8rjlBRdtL0aazRyK1RmNLdHF/bt5i4S5Y="; + + nativeBuildInputs = [ + makeWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/faircamp \ + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} + ''; + + passthru.tests.wav = callPackage ./test-wav.nix { }; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + description = "A self-hostable, statically generated bandcamp alternative"; + longDescription = '' + Faircamp takes a directory on your disk - your Catalog - and from it + produces a fancy-looking (and technically simple and completely static) + website, which presents your music in a way similar to how popular + commercial service bandcamp does it. + + You can upload the files faircamp generates to any webspace - no database + and no programming language support (PHP or such) is required. If your + webspace supports SSH access, faircamp can be configured to upload your + website for you automatically, otherwise you can use FTP or whichever + means you prefer to do that manually. + ''; + homepage = "https://codeberg.org/simonrepp/faircamp"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/faircamp/test-wav.nix b/pkgs/applications/misc/faircamp/test-wav.nix new file mode 100644 index 000000000000..8a9d2eaa2f35 --- /dev/null +++ b/pkgs/applications/misc/faircamp/test-wav.nix @@ -0,0 +1,14 @@ +{ stdenv +, faircamp +, ffmpeg +}: + +stdenv.mkDerivation { + name = "faircamp-test-wav"; + meta.timeout = 60; + buildCommand = '' + mkdir album + ${ffmpeg}/bin/ffmpeg -f lavfi -i "sine=frequency=440:duration=1" album/track.wav + ${faircamp}/bin/faircamp --build-dir $out + ''; +} diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 4cdf3399135a..21b92f3823ec 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -17,11 +17,20 @@ , dbus }: +let + themes = fetchFromGitLab { + domain = "source.puri.sm"; + owner = "Librem5"; + repo = "feedbackd-device-themes"; + rev = "v0.0.20210909"; + sha256 = "1d041wnq39sa0sl08xya4yp3n7j6aw560i38chl10vgpmwk9mmhr"; + }; +in stdenv.mkDerivation rec { pname = "feedbackd"; # Not an actual upstream project release, # only a Debian package release that is tagged in the upstream repo - version = "0.0.0+git20210426"; + version = "0.0.0+git20211018"; outputs = [ "out" "dev" "devdoc" ]; @@ -30,7 +39,7 @@ stdenv.mkDerivation rec { owner = "Librem5"; repo = "feedbackd"; rev = "v${version}"; - sha256 = "12kdchv11c5ynpv6fbagcx755x5p2kd7acpwjxi9khwdwjsqxlmn"; + hash = "sha256-jqKRHcxISK54xq/tQm6zV+J+U71eKh04OVTNHDDy65E="; }; nativeBuildInputs = [ @@ -63,13 +72,14 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/lib/udev/rules.d sed "s|/usr/libexec/|$out/libexec/|" < $src/debian/feedbackd.udev > $out/lib/udev/rules.d/90-feedbackd.rules + cp ${themes}/data/* $out/share/feedbackd/themes/ ''; meta = with lib; { description = "A daemon to provide haptic (and later more) feedback on events"; homepage = "https://source.puri.sm/Librem5/feedbackd"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pacman99 ]; + maintainers = with maintainers; [ pacman99 tomfitzhenry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 3a5ec81e9835..1f67c40561f5 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.4.25"; + version = "6.4.27"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-fr776JFy/Vnw/YMX2HQ6hDbzdczcqzkA5MPsBqj78n8="; + sha256 = "sha256-nmT55x95jPH+Ini4Ti9YgLgGUnwMAgaSXAhszReRE9w="; }; buildInputs = [ openssl ]; diff --git a/pkgs/applications/misc/firefly-desktop/default.nix b/pkgs/applications/misc/firefly-desktop/default.nix index 2ae01332b9fa..34c0e857a448 100644 --- a/pkgs/applications/misc/firefly-desktop/default.nix +++ b/pkgs/applications/misc/firefly-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "firefly-desktop"; - version = "1.2.0"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/iotaledger/firefly/releases/download/desktop-${version}/${pname}-${version}.AppImage"; - sha256 = "f3162efcf0407614fd1351af50e95ef180400b747a5cc6b82bc840828a15548d"; + sha256 = "a052efa29aa692eeafc921a2be4a5cbf71ae0b4216bd4759ea179086fb44c6d6"; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index eee466650e3d..766b05b2e145 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.16.2"; + version = "1.17.1"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "1qwj25xvvxvm1fxx216nn2gp7js4d682mm3l4s7ns90fc5ygvc8i"; + sha256 = "sha256-F4hAFLsZmRg/zeTHo9eYoT0BasorynGaSzNSbKr2/JE="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix deleted file mode 100644 index 03a9f875a793..000000000000 --- a/pkgs/applications/misc/fme/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoconf -, automake -, bc -, fluxbox -, gettext -, glibmm -, gtkmm2 -, libglademm -, libsigcxx -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "fme"; - version = "1.1.3"; - - src = fetchFromGitHub { - owner = "rdehouss"; - repo = "fme"; - rev = "v${version}"; - sha256 = "sha256-P67OmExBdWM6NZhDyYceVJOZiy8RC+njk/QvgQcWZeQ="; - }; - - nativeBuildInputs = [ - autoconf - automake - gettext - pkg-config - ]; - buildInputs = [ - bc - fluxbox - glibmm - gtkmm2 - libglademm - libsigcxx - ]; - - preConfigure = '' - ./autogen.sh - ''; - - meta = with lib; { - homepage = "https://github.com/rdehouss/fme/"; - description = "Editor for Fluxbox menus"; - longDescription = '' - Fluxbox Menu Editor is a menu editor for the Window Manager Fluxbox - written in C++ with the libraries Gtkmm, Glibmm, libglademm and gettext - for internationalization. Its user-friendly interface will help you to - edit, delete, move (Drag and Drop) a row, a submenu, etc very easily. - ''; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index 93886b3a2c21..14de4af2c85b 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "fnott"; - version = "1.1.2"; + version = "1.2.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fnott"; rev = version; - sha256 = "sha256-+x3uN7Uj0fqO0kpHlOVnsshgEJA1z/6ZElKSTyLzfG4="; + sha256 = "sha256-Ni1LwsBkh+XekHEAPxoAkE3tjgUByvpLUGpx7WC54Jw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index bd6ae3d74780..e90c0a4ec18e 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , meson -, fetchpatch , ninja , gettext , python3 @@ -26,24 +25,15 @@ stdenv.mkDerivation rec { pname = "font-manager"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = "FontManager"; repo = "master"; rev = version; - sha256 = "lqXjGSsiWaMJGyr1c2Wt/bs4F8q51mQ1+f6vbZRQzVs="; + sha256 = "sha256-M13Q9d2cKhc0tudkvw0zgqPAFTlmXwK+LltXeuDPWxo="; }; - patches = [ - # Fix compilation with latest Vala. - # https://github.com/FontManager/font-manager/issues/240 - (fetchpatch { - url = "https://github.com/FontManager/font-manager/commit/f9c4621389dae5999ca9d2f3c8402c2512a9ea60.patch"; - sha256 = "ZEJZSUYFLKmiHpVusO3ZUXMLUzJbbbCSqMjCtwlzPRY="; - }) - ]; - nativeBuildInputs = [ pkg-config meson diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index 14351990e72b..e793618f9d2d 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -74,8 +74,7 @@ stdenv.mkDerivation rec { exec = "free42bin"; type = "Application"; comment = meta.description; - categories = "Utility;Calculator;"; - terminal = "false"; + categories = [ "Utility" "Calculator" ]; }) (makeDesktopItem { name = "com.thomasokken.free42dec"; @@ -84,8 +83,7 @@ stdenv.mkDerivation rec { exec = "free42dec"; type = "Application"; comment = meta.description; - categories = "Utility;Calculator;"; - terminal = "false"; + categories = [ "Utility" "Calculator" ]; }) ]; diff --git a/pkgs/applications/misc/freeplane/default.nix b/pkgs/applications/misc/freeplane/default.nix index 37c4abb37646..e2931698d1ac 100644 --- a/pkgs/applications/misc/freeplane/default.nix +++ b/pkgs/applications/misc/freeplane/default.nix @@ -1,24 +1,31 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, makeWrapper, writeText, runtimeShell, jdk11, perl, gradle_5, which }: +{ stdenv, lib, fetchpatch, fetchFromGitHub, makeWrapper, writeText, runtimeShell, jdk11, perl, gradle_6, which }: let pname = "freeplane"; - version = "1.9.5"; + version = "1.9.14"; + + src_sha256 = "UiXtGJs+hibB63BaDDLXgjt3INBs+NfMsKcX2Q/kxKw="; + deps_outputHash = "tHhRaMIQK8ERuzm+qB9tRe2XSesL0bN3rComB9/qWgg="; + emoji_outputHash = "w96or4lpKCRK8A5HaB4Eakr7oVSiQALJ9tCJvKZaM34="; + + jdk = jdk11; + gradle = gradle_6; src = fetchFromGitHub { owner = pname; repo = pname; rev = "release-${version}"; - sha256 = "qfhhmF3mePxcL4U8izkEmWaiaOLi4slsaymVnDoO3sY="; + sha256 = src_sha256; }; deps = stdenv.mkDerivation { name = "${pname}-deps"; inherit src; - nativeBuildInputs = [ jdk11 perl gradle_5 ]; + nativeBuildInputs = [ jdk perl gradle ]; buildPhase = '' - GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon jar + GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon jar ''; # Mavenize dependency paths @@ -31,7 +38,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "xphTzaSXTGpP7vI/t4oIiv1ZpbekG2dFRzyl3ub6qnA="; + outputHash = deps_outputHash; }; # Point to our local deps repo @@ -60,16 +67,14 @@ let } ''; - # downloaded from unicode.org and twemoji.maxcdn.com by code in freeplane/emoji.gradle - # the below hash is for versions of freeplane that use twemoji 12.1.4, and emoji 12.1 emoji = stdenv.mkDerivation rec { name = "${pname}-emoji"; inherit src; - nativeBuildInputs = [ jdk11 gradle_5 ]; + nativeBuildInputs = [ jdk gradle ]; buildPhase = '' - GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon --offline --init-script ${gradleInit} emojiGraphicsClasses emojiListClasses + GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon --offline --init-script ${gradleInit} :freeplane:downloadEmoji ''; installPhase = '' @@ -80,19 +85,19 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0zikbakbr2fhyv4h4h52ajhznjka0hg6hiqfy1528a39i6psipn3"; + outputHash = emoji_outputHash; }; in stdenv.mkDerivation rec { inherit pname version src; - nativeBuildInputs = [ makeWrapper jdk11 gradle_5 ]; + nativeBuildInputs = [ makeWrapper jdk gradle ]; buildPhase = '' mkdir -p -- ./freeplane/build/emoji/{txt,resources/images} cp ${emoji}/emoji/txt/emojilist.txt ./freeplane/build/emoji/txt/emojilist.txt cp -r ${emoji}/resources/images/emoji ./freeplane/build/emoji/resources/images/emoji - GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk11} --no-daemon --offline --init-script ${gradleInit} -x test -x :freeplane:downloadEmoji build + GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon --offline --init-script ${gradleInit} -x test -x :freeplane:downloadEmoji build ''; installPhase = '' @@ -102,8 +107,8 @@ in stdenv.mkDerivation rec { cp -a ./BIN/. $out/share/${pname} makeWrapper $out/share/${pname}/${pname}.sh $out/bin/${pname} \ --set FREEPLANE_BASE_DIR $out/share/${pname} \ - --set JAVA_HOME ${jdk11} \ - --prefix PATH : ${lib.makeBinPath [ jdk11 which ]} + --set JAVA_HOME ${jdk} \ + --prefix PATH : ${lib.makeBinPath [ jdk which ]} runHook postInstall ''; diff --git a/pkgs/applications/misc/fslint/default.nix b/pkgs/applications/misc/fslint/default.nix deleted file mode 100644 index 1f2ec2805490..000000000000 --- a/pkgs/applications/misc/fslint/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: - -let pythonEnv = python2.withPackages(ps: [ ps.pyGtkGlade]); -in stdenv.mkDerivation rec { - pname = "fslint"; - version = "2.46"; - - src = fetchFromGitHub { - owner = "pixelb"; - repo = "fslint"; - rev = version; - sha256 = "048pc1rsslbsrfchl2wmdd4hpa2gycglib7kdx8vqs947zcm0sfv"; - }; - - buildInputs = [ - pythonEnv makeWrapper - ]; - - prePatch = '' - substituteInPlace fslint-gui --replace "liblocation=os.path.dirname(os.path.abspath(sys.argv[0]))" "liblocation='$out'" - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cp * -R $out/ - cp fslint-gui $out/bin/fslint - - wrapProgram "$out/bin/fslint" \ - --prefix PYTHONPATH : "${pythonEnv.interpreter}" - runHook postInstall - ''; - - meta = with lib; { - description = "A utility to find and clean various forms of lint on a filesystem"; - homepage = "https://www.pixelbeat.org/fslint/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.dasj19 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index dbc66458a315..5668006dfd3f 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.6.5"; + version = "1.7.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fuzzel"; rev = version; - sha256 = "SWt46YSXI6Dsv0ed3H4sN8kbEzQDL4U6jxFSbMyspJ0="; + sha256 = "1261gwxiky37pvzmmbrpml1psa22kkglb141ybj1fbnwg6j7jvlf"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index 2e1afa8053b9..f570a044309e 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "gImageReader"; - version = "3.3.1"; + version = "3.4.0"; src = fetchFromGitHub { owner= "manisandro"; repo = "gImageReader"; rev = "v${version}"; - sha256 = "17hz2dgxx2j7hsk0lx3riidqvlsg0ylnicjd2gphsi3yp7w20zdj"; + sha256 = "sha256-lJ4wPLxVN3NERnru8vLreiWMEUip6xeCXAfoT8DcfiQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 26c76988169e..dc5dedbd1ad9 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.20.1"; + version = "1.21.0"; src = fetchPypi { inherit pname version; - sha256 = "a1c06625381485f82aa14a038a622d40ab9cc2c8d150dd65c66df96dbf427f62"; + sha256 = "sha256-D/K+C7IX4VGv+FFYuPQEqwVYSjiDcSeElVunVMiFWI8="; }; propagatedBuildInputs = [ requests yt-dlp ]; diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 76a19f5188c8..694665727414 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { desktopName = "GanttProject"; genericName = "Shedule and manage projects"; comment = meta.description; - categories = "Office;"; + categories = [ "Office" ]; }; javaOptions = [ diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index 44e4bd2a0b38..ebed42852b70 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "genact"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "1hc4jwk5rr1yw3pfvriash7b03j181k8c9y7m3sglkk8xnff219c"; + sha256 = "sha256-ouDaOs72vivJBZVwcJhv4YoPKQOEBctUTqubvrpoBtI="; }; - cargoSha256 = "0a5ic6c7fvmg2kh3qprzffnpw40cmrgbscrlhxxs3m7nxfjdh7bc"; + cargoSha256 = "sha256-csubycZaBUHPp8XJ1C+nWw7DzVGVJm38/Dgw41qUMYQ="; meta = with lib; { description = "A nonsense activity generator"; diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index d92c4d049135..26d729fe8a79 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "geoipupdate"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "sha256-fcz1g17JR6jOpq5zOpCmnI00hyXSYYGHfoFRE8/c8dk="; + sha256 = "sha256-AqA0hzZGn5XU2Pyoj1vaP+ht7r3dpDhuang4KCXaSgs="; }; - vendorSha256 = "sha256-YawWlPZV4bBOsOFDo2nIXKWwcxb5hWy5OiB99MG0HcY="; + vendorSha256 = "sha256-S+CnIPoyGM7dEQICOIlAWBIC24Fyt7q+OY382evDgQc="; + + ldflags = [ "-X main.version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 802c1532979b..02f0a09e0df1 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "girara"; - version = "0.3.6"; + version = "0.3.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-GPECj0CVxKh+gTfAkkvs13tdiy93il97iqbSTxLQSiM="; + sha256 = "sha256-QTQiE/jnRSWPHbKMu2zMJ6YwCaXgAb95G74BzkNtTbc="; }; nativeBuildInputs = [ meson ninja pkg-config gettext check dbus ]; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 0a62ce4ea518..523ba837f3a1 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { desktopName = "GKrellM"; genericName = "System monitor"; comment = "The GNU Krell Monitors"; - categories = "System;Monitor;"; + categories = [ "System" "Monitor" ]; }) ]; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix deleted file mode 100644 index c1a4ea2b6789..000000000000 --- a/pkgs/applications/misc/gksu/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome, libgksu, - intltool, libstartup_notification, gtk-doc, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - version = "2.0.2"; - pname = "gksu"; - - src = fetchurl { - url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz"; - sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1"; - }; - - nativeBuildInputs = [ - pkg-config intltool gtk-doc wrapGAppsHook - ]; - - buildInputs = [ - gtk2 gnome2.GConf libstartup_notification gnome.libgnome-keyring - ]; - - propagatedBuildInputs = [ - libgksu - ]; - - hardeningDisable = [ "format" ]; - - patches = [ - # https://savannah.nongnu.org/bugs/index.php?36127 - ./gksu-2.0.2-glib-2.31.patch - ]; - - postPatch = '' - sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop - ''; - - configureFlags = [ "--disable-nautilus-extension" ]; - - meta = { - description = "A graphical frontend for libgksu"; - longDescription = '' - GKSu is a library that provides a GTK frontend to su and sudo. - It supports login shells and preserving environment when acting as - a su frontend. It is useful to menu items or other graphical - programs that need to ask a user's password to run another program - as another user. - ''; - homepage = "https://www.nongnu.org/gksu/"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.romildo ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch b/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch deleted file mode 100644 index fd711a321acf..000000000000 --- a/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 10c7e67e11a56e2fe1acf9b085772bc995d35bc0 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sat, 7 Apr 2012 17:57:36 -0400 -Subject: [PATCH] Fix glib includes for building with >=glib-2.31 - -glib-2.31 and newer no longer allow most glib subheaders to be included -directly. - -https://savannah.nongnu.org/bugs/index.php?36127 ---- - nautilus-gksu/libnautilus-gksu.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/nautilus-gksu/libnautilus-gksu.c b/nautilus-gksu/libnautilus-gksu.c -index 8e44d29..4acf3f8 100644 ---- a/nautilus-gksu/libnautilus-gksu.c -+++ b/nautilus-gksu/libnautilus-gksu.c -@@ -5,7 +5,7 @@ - #include - #include - --#include -+#include - #include - #include - #include --- -1.7.8.5 - diff --git a/pkgs/applications/misc/globe-cli/default.nix b/pkgs/applications/misc/globe-cli/default.nix new file mode 100644 index 000000000000..e7ec63f97844 --- /dev/null +++ b/pkgs/applications/misc/globe-cli/default.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "globe-cli"; + version = "0.2.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-Np1f/mSMIMZU3hE0Fur8bOHhOH3rZyroGiVAqfiIs7g="; + }; + + cargoHash = "sha256-qoCOYk7hyjMx07l48IkxE6zsG58NkF72E3OvoZHz5d0="; + + meta = with lib; { + description = "Display an interactive ASCII globe in your terminal"; + homepage = "https://github.com/adamsky/globe"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ devhell ]; + }; +} diff --git a/pkgs/applications/misc/gnome-passwordsafe/default.nix b/pkgs/applications/misc/gnome-secrets/default.nix similarity index 69% rename from pkgs/applications/misc/gnome-passwordsafe/default.nix rename to pkgs/applications/misc/gnome-secrets/default.nix index e7a413e63b46..00e55b9e7a8b 100644 --- a/pkgs/applications/misc/gnome-passwordsafe/default.nix +++ b/pkgs/applications/misc/gnome-secrets/default.nix @@ -5,19 +5,19 @@ , gettext , fetchFromGitLab , python3Packages -, libhandy , libpwquality -, wrapGAppsHook -, gtk3 +, wrapGAppsHook4 +, gtk4 , glib , gdk-pixbuf , gobject-introspection , desktop-file-utils -, appstream-glib }: +, appstream-glib +, libadwaita }: python3Packages.buildPythonApplication rec { - pname = "gnome-passwordsafe"; - version = "5.1"; + pname = "gnome-secrets"; + version = "6.1"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "secrets"; rev = version; - sha256 = "sha256-RgpkLoqhwCdaPZxC1Qe0MpLtYLevNCOxbvwEEI0cpE0="; + sha256 = "sha256-TBGNiiR0GW8s/Efi4/Qqvwd87Ir0gCLGPfBmmqqSwQ8="; }; nativeBuildInputs = [ @@ -34,27 +34,39 @@ python3Packages.buildPythonApplication rec { ninja gettext pkg-config - wrapGAppsHook + wrapGAppsHook4 desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = [ - gtk3 + gtk4 glib gdk-pixbuf - libhandy + libadwaita ]; propagatedBuildInputs = with python3Packages; [ pygobject3 construct pykeepass + pyotp ] ++ [ libpwquality # using the python bindings ]; + postPatch = '' + substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"; + ''; + + # Prevent double wrapping, let the Python wrapper use the args in preFixup. + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { broken = stdenv.hostPlatform.isStatic; # libpwquality doesn't provide bindings when static description = "Password manager for GNOME which makes use of the KeePass v.4 format"; diff --git a/pkgs/applications/misc/gnome-solanum/default.nix b/pkgs/applications/misc/gnome-solanum/default.nix new file mode 100644 index 000000000000..8ad1267afa93 --- /dev/null +++ b/pkgs/applications/misc/gnome-solanum/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchFromGitLab +, rustPlatform +, desktop-file-utils +, meson +, ninja +, pkg-config +, wrapGAppsHook +, python3 +, git +, glib +, gtk4 +, gst_all_1 +, libadwaita +}: + +stdenv.mkDerivation rec { + pname = "solanum"; + version = "3.0.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Solanum"; + rev = "v${version}"; + sha256 = "0cga6cz6jfbipzp008rjznkz7844licdc34lk133fcyqil0cg0ap"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "10kzv98b2fiql9f6n2fv6lrgq4fdzxq0h4nzcq9jrw3fsggzl0wb"; + }; + + postPatch = '' + patchShebangs build-aux + ''; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + python3 + git + desktop-file-utils + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ + glib + gtk4 + libadwaita + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad + ]; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/World/Solanum"; + description = "A pomodoro timer for the GNOME desktop"; + maintainers = with maintainers; [ linsui ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index b2a858d8d3e9..7f796a2bb0c2 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -12,7 +12,7 @@ let desktopName = "GoldenCheetah"; genericName = "GoldenCheetah"; comment = "Performance software for cyclists, runners and triathletes"; - categories = "Utility;"; + categories = [ "Utility" ]; }; in mkDerivation rec { pname = "golden-cheetah"; diff --git a/pkgs/applications/misc/gometer/default.nix b/pkgs/applications/misc/gometer/default.nix new file mode 100644 index 000000000000..9b335b1aedae --- /dev/null +++ b/pkgs/applications/misc/gometer/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchurl, rpmextract, wrapGAppsHook, nwjs }: + +stdenv.mkDerivation rec { + pname = "gometer"; + version = "5.2.0"; + + src = fetchurl { + url = "https://gometer-prod-new-apps.s3-accelerate.amazonaws.com/${version}/goMeter-linux64.rpm"; + sha256 = "sha256-E53sVvneW2EMPz9HNCgbGuHnDlVihE+Lf+DkFIP+j28="; + }; + + nativeBuildInputs = [ + rpmextract + wrapGAppsHook + ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + rpmextract ${src} + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + + mkdir $out/share/applications + mv $out/opt/goMeter/goMeter.desktop $out/share/applications/gometer.desktop + substituteInPlace $out/share/applications/gometer.desktop \ + --replace '/opt/goMeter/' "" + + makeWrapper ${nwjs}/bin/nw $out/bin/goMeter \ + --add-flags $out/opt/goMeter/package.nw + + runHook postInstall + ''; + + meta = with lib; { + description = "Analytic-Tracking tool for GoLance"; + homepage = "https://golance.com/download-gometer"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 854fec8642a8..bd87e7b4aeb6 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchsvn, libxml2, gtk2, curl, pkg-config } : -let +stdenv.mkDerivation rec { + pname = "gosmore"; version = "31801"; -in -stdenv.mkDerivation { - name = "gosmore-r${version}"; # the gosmore svn repository does not lock revision numbers of its externals # so we explicitly disable them to avoid breaking the hash # especially as the externals appear to be unused diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 839bcc281bac..1c898fa343ce 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "21"; + version = "21.1"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-FS6nf8K+qfEWDCQwmoxH1laJIONMtwmb/H89SVJtV1E="; + sha256 = "sha256-WyI9IKzUmKGiqiYs6SSuGhVUdO2UCsPSSL/IjPLykiM="; }; dontUnpack = true; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { desktopName = "GpsPrune"; genericName = "GPS Data Editor"; comment = meta.description; - categories = "Education;Geoscience;"; + categories = [ "Education" "Geoscience" ]; }) ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 75079967dbeb..ac9b56f48c11 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gpxsee"; - version = "10.1"; + version = "10.4"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-tU37dKBxzz+sxe4R7xbscpD28if8QOm6xpZEOdhK8lE="; + sha256 = "sha256-3AwUfx8IIWJO4uVAhXJE5Oola+60VUpXUwmALqJo2vw="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 531ce4237371..7365d297e3b8 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -55,6 +55,10 @@ in buildPythonApplication rec { runHook postInstall ''; + # https://github.com/NixOS/nixpkgs/issues/149812 + # https://nixos.org/manual/nixpkgs/stable/#ssec-gnome-hooks-gobject-introspection + strictDeps = false; + meta = with lib; { description = "Genealogy software"; homepage = "https://gramps-project.org"; diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 69024e581e0a..8c596b06fd0f 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.5.1"; + version = "3.5.2"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-66krBK5mSMT0scCgMmiaigT/9nmYfItxe1OTzSbX+kE="; + sha256 = "sha256-PCr8lDQzypgozKCzD8FV4X4ls5lYZRMey1vfcFzo+Uc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/gremlin-server/default.nix b/pkgs/applications/misc/gremlin-server/default.nix new file mode 100644 index 000000000000..70068ec21f88 --- /dev/null +++ b/pkgs/applications/misc/gremlin-server/default.nix @@ -0,0 +1,33 @@ +{ fetchzip, lib, stdenv, makeWrapper, openjdk }: +stdenv.mkDerivation rec { + pname = "gremlin-server"; + version = "3.5.2"; + src = fetchzip { + url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-server-${version}-bin.zip"; + sha256 = "sha256-XFI2PQnvIPYjkJhm73TPSpMqH4+/Qv5RxS5iWkfuBg0="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + # Note you'll want to prefix any commands with LOG_DIR, PID_DIR, and RUN_DIR + # environment variables set to a writable director(y/ies). + + installPhase = '' + runHook preInstall + mkdir -p $out/opt + cp -r conf ext lib scripts $out/opt/ + install -D bin/gremlin-server.sh $out/opt/bin/gremlin-server + makeWrapper $out/opt/bin/gremlin-server $out/bin/gremlin-server \ + --prefix PATH ":" "${openjdk}/bin/" \ + --set CLASSPATH "$out/opt/lib/" + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://tinkerpop.apache.org/"; + description = "Server of the Apache TinkerPop graph computing framework"; + license = licenses.asl20; + maintainers = [ maintainers.jrpotter ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index 15d8b9663960..95a909c29a97 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -1,18 +1,23 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gsctl"; - version = "0.15.4"; - - goPackagePath = "github.com/giantswarm/gsctl"; + version = "1.1.4"; src = fetchFromGitHub { owner = "giantswarm"; repo = pname; - rev = version; - sha256 = "0s5bli08wfd9xszx3kc90k51vlgjc00r0qg4mikb6qdc4pxpgsxj"; + rev = version; + sha256 = "sha256-uCNWgaLZMm1vPxFduj8mpjKYuYlp1ChF6bK+bmAWy50="; }; + vendorSha256 = "sha256-lZgHrQYqoyoM1Iv6vCqTMcv62zSKyxaAsq56kUXHrIA="; + + ldflags = + [ "-s" "-w" "-X github.com/giantswarm/gsctl/buildinfo.Version=${version}" ]; + + doCheck = false; + meta = with lib; { description = "The Giant Swarm command line interface"; homepage = "https://github.com/giantswarm/gsctl"; diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index 9f09e3d978e0..f7c5714f1262 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "3.4.3"; src = fetchurl { - url = "http://homepages.ihug.co.nz/~trmusson/stuff/${pname}-${version}.tar.gz"; + url = "https://trmusson.dreamhosters.com/stuff/${pname}-${version}.tar.gz"; sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; }; @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = { description = "A GTK enabled dropin replacement for xmessage"; - homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; - license = lib.licenses.gpl3; + homepage = "https://trmusson.dreamhosters.com/programs.html#gxmessage"; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [jfb]; platforms = with lib.platforms; linux; }; diff --git a/pkgs/applications/misc/hcl2json/default.nix b/pkgs/applications/misc/hcl2json/default.nix new file mode 100644 index 000000000000..236af7c446d9 --- /dev/null +++ b/pkgs/applications/misc/hcl2json/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "hcl2json"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "tmccombs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Xr94Bq3w2j+hUoGy1mSLy3WCQiwrfS/5IL6i6CwKiPs="; + }; + + vendorSha256 = "sha256-Mz97GBxx/7oFjW6u5DG6JhvPRzn+hqtfqHdYv47L898="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Convert hcl2 to json"; + homepage = "https://github.com/tmccombs/hcl2json"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 9f1e89c0df6b..ce49cfd69ca8 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "hello"; - version = "2.10"; + version = "2.12"; src = fetchurl { url = "mirror://gnu/hello/${pname}-${version}.tar.gz"; - sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"; + sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g"; }; doCheck = true; diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix index 6ada1fd749bd..0562e1d52d9f 100644 --- a/pkgs/applications/misc/hivemind/default.nix +++ b/pkgs/applications/misc/hivemind/default.nix @@ -1,9 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitHub, runtimeShell }: +{ lib, buildGoModule, fetchFromGitHub, runtimeShell }: -buildGoPackage rec { +buildGoModule rec { pname = "hivemind"; - version = "1.0.6"; - goPackagePath = "github.com/DarthSim/hivemind"; + version = "1.1.0"; postPatch = '' substituteInPlace process.go --replace \"/bin/sh\" \"${runtimeShell}\" @@ -13,8 +12,9 @@ buildGoPackage rec { owner = "DarthSim"; repo = "hivemind"; rev = "v${version}"; - sha256 = "0afcnd03wsdphbbpha65rv5pnv0x6ldnnm6rnv1m6xkkywgnzx95"; + sha256 = "YUR9OwRuH1xSPs8iTsSIjLCt2TyYH357IAYULGTyYUc="; }; + vendorSha256 = "KweFhT8Zueg45Q/vw3kNET35hB+0WbUPfz0FYaAiIA8="; meta = with lib; { homepage = "https://github.com/DarthSim/"; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 5110815023a0..a164654b1a67 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.4-6681f81d/Hubstaff-1.6.4-6681f81d.sh"; - version = "1.6.4-6681f81d"; - sha256 = "1j0rzyqm9zm2w44zwxq61fy19m27ghlv11mbfl7yzh2ccmxljxjm"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.5-31be26f1/Hubstaff-1.6.5-31be26f1.sh"; + version = "1.6.5-31be26f1"; + sha256 = "1z1binnqppyxavmjg0l1cvy64ylzy2v454sws2x1am2qhhbnycjm"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 264b4ba53dd8..81ee786aec6f 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.92.0"; + version = "0.92.2"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rzAt6jGj1MJ5AvkEKjAH91mKnUcLOPgHgiDkzkdibks="; + sha256 = "sha256-kwqN/9H/ZI2eL09K/9bOMBWW9bow8LtKpbfxyfxIucA="; }; - vendorSha256 = "sha256-ftA7ktZ6dEownEwJC4tK5/V3fl8toACiFiq9xTa7NE4="; + vendorSha256 = "sha256-7dJUl0IxsLj0ds2jqtChNCQEBiK9PahG159IhyFxwdM="; doCheck = false; diff --git a/pkgs/applications/misc/ideamaker/default.nix b/pkgs/applications/misc/ideamaker/default.nix index 1996ba5c1ea0..1e20a0d6faf0 100644 --- a/pkgs/applications/misc/ideamaker/default.nix +++ b/pkgs/applications/misc/ideamaker/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "Ideamaker"; genericName = meta.description; - categories = "Utility;Viewer;Engineering;"; - mimeType = "application/sla"; + categories = [ "Utility" "Viewer" "Engineering" ]; + mimeTypes = [ "application/sla" ]; }; meta = with lib; { diff --git a/pkgs/applications/misc/index-fm/default.nix b/pkgs/applications/misc/index-fm/default.nix index 14139f7ed665..4ab933aefe07 100644 --- a/pkgs/applications/misc/index-fm/default.nix +++ b/pkgs/applications/misc/index-fm/default.nix @@ -17,14 +17,14 @@ mkDerivation rec { pname = "index-fm"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "index-fm"; rev = "v${version}"; - sha256 = "sha256-Os/5igKGYBeY/FxO6I+7mpFohuk3yHGLd7vE2GewFpU="; + hash = "sha256-F4qgewkPxkbAbeR+MaeRDiw9KIsd/Xx4C0cYEYDkPOE="; }; postPatch = '' diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix index e8bfa00406e2..0fd6e72a57ec 100644 --- a/pkgs/applications/misc/inherd-quake/default.nix +++ b/pkgs/applications/misc/inherd-quake/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "inherd-quake"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "phodal"; repo = "quake"; rev = "v${version}"; - sha256 = "UujcsvjbXda1DdV4hevUP4PbdbOKHQ3O/FBDlhAjfq0="; + sha256 = "sha256-OkgrkjO6IS6P2ZyFFbOprROPzDfQcHYCwaTKFsjjVo8="; }; - cargoSha256 = "HkdF7hLgThOWExociNgxvTxF4qL3F5CPK/j/ZKLg/m4="; + cargoSha256 = "sha256-EMRaChFwjMYZKSX5OvXYLSiwWo1m1H/tHVqc8RXX52A="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 92491f4508e7..4c01e52aa5db 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { exec = "IPMIView"; desktopName = name; genericName = "Supermicro BMC manager"; - categories = "Network"; + categories = [ "Network" ]; }; installPhase = '' diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 2003e0d7e76c..42d87b41fc99 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.6.10"; + version = "2.7.13"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-2/QYEzQjB9n/4k5I/fry3ol8Fpsb5+tc1ttVdf2ID+4="; - x86_64-darwin = "sha256-BwBpq78hYJVUItUgs9lonBTV4YWJ+qvML6VTj5M4BQ4="; + x86_64-linux = "sha256-ObuBcFV5fq2sryC+ETTAH+S19EW+nVlxdVOtOpiBeDs="; + x86_64-darwin = "sha256-f0+/kUukP+zIzTSSGO1ctUBd/uCSrAKz+uBnrzpPy5k="; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/joshuto/default.nix b/pkgs/applications/misc/joshuto/default.nix index 7d4ec87b9f4b..32018d7151db 100644 --- a/pkgs/applications/misc/joshuto/default.nix +++ b/pkgs/applications/misc/joshuto/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "joshuto"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "kamiyaa"; repo = pname; rev = version; - sha256 = "sha256-9TGHSGYCzU6uAIO4zZ/6+B4oVPE6SD9Phl4dShylW5o="; + sha256 = "sha256-RbA7MM/3u2LJG6QD5f15E/XoLwHMkPasx0ht4PqV/jc="; }; - cargoSha256 = "sha256-g8YYOk2RW4GPdkWlvAxd5KFdV4S1l5yKEzNm9OAc8RI="; + cargoSha256 = "sha256-vhTfAoAwDJ9BjhgUEkV2H+KAetJR1YqwaZ7suF6yMXA="; buildInputs = lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index d1a8bd1077a3..cc6d4e33fb24 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18360"; + version = "18387"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-1OMEPMtUGkxQCgpmyVP1h25gSDa2MKF7l1rodr61O5s="; + sha256 = "sha256-zkEWZjjSy0ajG5X1/dIgLPZ7zr0BiaJJcHaN8sv/3yc="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-ZCybgaLwPfQVG2gJ+dtElIY7bGZUe9R8a/0B6QK8yK8="; + sha256 = "sha256-xOVnnQ+eUkboT8Tq5F4QJEou1wAaHwiEdyiEKDR/fUk="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index 832c6e93c500..e6cadec469bc 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.12.51202"; + version = "0.13.55213"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-B7Rn/0hFVUsEK2Wo8KbqAnzOwQmMKkAssfmaN3dPAUY="; + sha256 = "sha256-u5DmpKvmgTqwtXLFMdz0dhtPc/2rzEX492OKxyFBqzY="; stripRoot = false; }; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 494329ecabe7..4aecdec4de9d 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -1,26 +1,20 @@ { lib , fetchFromGitHub -, fetchpatch , python3 }: python3.pkgs.buildPythonApplication rec { pname = "jrnl"; - version = "2.8.3"; + version = "2.8.4"; format = "pyproject"; src = fetchFromGitHub { owner = "jrnl-org"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+kPr7ndY6u1HMw6m0UZJ5jxVIPNjlTfQt7OYEdZkHBE="; + sha256 = "sha256-Edu+GW/D+R5r0R750Z1f8YUVPMYbm9PK4D73sTDzDEc="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"' - ''; - nativeBuildInputs = with python3.pkgs; [ poetry-core ]; @@ -45,14 +39,10 @@ python3.pkgs.buildPythonApplication rec { toml ]; - patches = [ - # Switch to poetry-core, https://github.com/jrnl-org/jrnl/pull/1359 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/jrnl-org/jrnl/commit/a55a240eff7a167af5974a03e9de6f7b818eafd9.patch"; - sha256 = "1w3gb4vasvh51nggf89fsqsm4862m0g7hr36qz22n4vg9dds175m"; - }) - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"' + ''; preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/applications/misc/k40-whisperer/default.nix b/pkgs/applications/misc/k40-whisperer/default.nix new file mode 100644 index 000000000000..b50a1751510e --- /dev/null +++ b/pkgs/applications/misc/k40-whisperer/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, makeWrapper +, writeText +, python3 +, fetchzip +, inkscape +, lib +, udevGroup ? "k40" +}: + +let + pythonEnv = python3.withPackages (ps: with ps; [ + lxml + pyusb + pillow + pyclipper + tkinter + ]); + + udevRule = writeText "k40-whisperer.rules" '' + SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="5512", ENV{DEVTYPE}=="usb_device", MODE="0664", GROUP="${udevGroup}" + ''; + +in stdenv.mkDerivation rec { + pname = "k40-whisperer"; + version = "0.59"; + + src = fetchzip { + url = "https://www.scorchworks.com/K40whisperer/K40_Whisperer-${version}_src.zip"; + stripRoot = true; + sha256 = "0r8rhaksk87l44pwwpvrfnck2lyic3lgcbh3pi7ib6mrwbsyhlni"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + patchPhase = '' + substituteInPlace svg_reader.py \ + --replace '"/usr/bin/inkscape"' '"${inkscape}/bin/inkscape"' + ''; + + buildPhase = ""; + + installPhase = '' + mkdir -p $out + cp -p * $out + + mkdir -p $out/bin + mkdir -p $out/lib/udev/rules.d + + ln -s ${udevRule} $out/lib/udev/rules.d/97-k40-whisperer.rules + + makeWrapper '${pythonEnv.interpreter}' $out/bin/k40-whisperer \ + --add-flags $out/k40_whisperer.py \ + --prefix PYTHONPATH : $out + ''; + + meta = with lib; { + description = '' + Control software for the stock K40 Laser controller + ''; + mainProgram = "k40-whisperer"; + longDescription = '' + K40 Whisperer is an alternative to the the Laser Draw (LaserDRW) program that comes with the cheap Chinese laser cutters available on E-Bay and Amazon. + K40 Whisperer reads SVG and DXF files, interprets the data and sends commands to the K40 controller to move the laser head and control the laser accordingly. + K40 Whisperer does not require a USB key (dongle) to function. + ''; + homepage = "https://www.scorchworks.com/K40whisperer/k40whisperer.html"; + downloadPage = "https://www.scorchworks.com/K40whisperer/k40whisperer.html#download"; + license = licenses.gpl3; + maintainers = with maintainers; [ fooker ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index 9c2424602de1..c67a64df50e0 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.21"; + version = "1.2.22"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "sha256-0CIemSdgNnYfpwZqfTerd/RZ+mYeFUWTE+v2hwu+9gI="; + sha256 = "sha256-pLxCm+T9jdn0FFqbTFe1tsIPTaVTT+QDeLHDxrbpGBg="; }; dontBuild = true; diff --git a/pkgs/applications/misc/kchmviewer/default.nix b/pkgs/applications/misc/kchmviewer/default.nix new file mode 100644 index 000000000000..4d703bff0c22 --- /dev/null +++ b/pkgs/applications/misc/kchmviewer/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, qmake, wrapQtAppsHook, chmlib, libzip, qtwebengine }: + +stdenv.mkDerivation rec { + pname = "kchmviewer"; + version = "8.0"; + + src = fetchFromGitHub { + owner = "gyunaev"; + repo = pname; + rev = "RELEASE_${lib.replaceStrings [ "." ] [ "_" ] version}"; + sha256 = "sha256-YNpiBf6AFBCRbAZRPODvqGbQQedJJJrZFQIQyzIeBlw="; + }; + + patches = [ + # remove unused webkit + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/a4a3984465cb635822953350c571950ae726b539.patch"; + sha256 = "sha256-nHW18a4SrTG4fETJmKS4ojHXwnX1d1uN1m4H0GIuI28="; + }) + # QtWebengine fixes + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/9ac73e7ad15de08aab6b1198115be2eb44da7afe.patch"; + sha256 = "sha256-qg2ytqA2On7jg19WZmHIOU7vLQI2hoyqItySLEA64SY="; + }) + (fetchpatch { + url = "https://github.com/gyunaev/kchmviewer/commit/99a6d94bdfce9c4578cce82707e71863a71d1453.patch"; + sha256 = "sha256-o8JkaMmcJObmMt+o/6ooCAPCi+yRAWDAgxV+tR5eHfY="; + }) + ]; + + buildInputs = [ chmlib libzip qtwebengine ]; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + + postInstall = '' + install -Dm755 bin/kchmviewer -t $out/bin + install -Dm644 packages/kchmviewer.png -t $out/share/pixmaps + install -Dm644 packages/kchmviewer.desktop -t $out/share/applications + ''; + + meta = with lib; { + description = "CHM (Winhelp) files viewer"; + homepage = "http://www.ulduzsoft.com/linux/kchmviewer/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 4276ce8a8418..bc281bea16ac 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -69,11 +69,8 @@ with builtins; buildDotnetPackage rec { icon = "keepass"; desktopName = "Keepass"; genericName = "Password manager"; - categories = "Utility;"; - mimeType = lib.concatStringsSep ";" [ - "application/x-keepass2" - "" - ]; + categories = [ "Utility" ]; + mimeTypes = [ "application/x-keepass2" ]; }; outputFiles = [ diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index a8548f2c5c00..c2e7ae58eb3c 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -22,6 +22,7 @@ , qtx11extras , quazip , readline +, wrapGAppsHook , wrapQtAppsHook , yubikey-personalization , zlib @@ -90,7 +91,7 @@ stdenv.mkDerivation rec { runHook postCheck ''; - nativeBuildInputs = [ asciidoctor cmake wrapQtAppsHook qttools pkg-config ]; + nativeBuildInputs = [ asciidoctor cmake wrapGAppsHook wrapQtAppsHook qttools pkg-config ]; buildInputs = [ curl diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 2d75a9da818d..9ed678173473 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -1,17 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub, fetchpatch +{ lib, mkDerivation, fetchFromGitHub , python3, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns -, which, perl, makeWrapper +, which, perl }: mkDerivation rec { pname = "klayout"; - version = "0.27.3"; + version = "0.27.8"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "sha256-6g/QoR16rhUfxhH4JxL6EERcoPVG/6MOxUlo6K/WoE0="; + hash = "sha256-t/nd7m8XpB026q/kyH16rKkw3qza19ISalB0Juzx4NU="; }; postPatch = '' @@ -21,6 +21,7 @@ mkDerivation rec { nativeBuildInputs = [ which + perl python3 ruby ]; @@ -35,7 +36,7 @@ mkDerivation rec { buildPhase = '' runHook preBuild mkdir -p $out/lib - ./build.sh -qt5 -prefix $out/lib -j$NIX_BUILD_CORES + ./build.sh -qt5 -prefix $out/lib -option -j$NIX_BUILD_CORES runHook postBuild ''; @@ -54,8 +55,9 @@ mkDerivation rec { meta = with lib; { description = "High performance layout viewer and editor with support for GDS and OASIS"; - license = with licenses; [ gpl3 ]; + license = with licenses; [ gpl2Plus ]; homepage = "https://www.klayout.de/"; + changelog = "https://www.klayout.de/development.html#${version}"; platforms = platforms.linux; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 38ad131bc146..0a082cce3274 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -13,12 +13,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2022.01"; + version = "2022.03.1"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-XuIYNvGhzJ649LxVPit2AOmb+YOHtZA4AhDyxjaB5OE="; + sha256 = "sha256-ZoqITWPR60G4xY9InrtIY9rCWUk0PidGFZokHLWl5ps="; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix index a0b67042ecac..043f607c010d 100644 --- a/pkgs/applications/misc/kratos/default.nix +++ b/pkgs/applications/misc/kratos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kratos"; - version = "0.8.0-alpha.3"; + version = "0.8.3-alpha.1.pre.0"; src = fetchFromGitHub { owner = "ory"; repo = "kratos"; rev = "v${version}"; - sha256 = "0ihq2kxjackicxg0hrpmx6bsgz056xbaq3j8py37z2w6mwszarcg"; + sha256 = "1225paf0x6lb6cb3q5f4lyz0r426ifx4x8145q7nsc6v64srck2y"; }; - vendorSha256 = "175pckj30cm5xkbvsdvwzarvwapsylyjgj4ss8v5r1sa0fjpj008"; + vendorSha256 = "10zhxbccjsp6hbmk2lnvbag6c92hz703mcaigaj4wvlf7glpldm6"; subPackages = [ "." ]; @@ -25,7 +25,7 @@ buildGoModule rec { test/e2e/run.sh script/testenv.sh script/test-envs.sh - persistence/sql/migratest/update_fixtures.sh + script/debug-entrypoint.sh ) patchShebangs "''${files[@]}" diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix new file mode 100644 index 000000000000..03f25588682d --- /dev/null +++ b/pkgs/applications/misc/leetcode-cli/default.nix @@ -0,0 +1,41 @@ +{ lib +, fetchCrate +, rustPlatform +, pkg-config +, openssl +, dbus +, sqlite +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "leetcode-cli"; + version = "0.3.10"; + + src = fetchCrate { + inherit pname version; + sha256 = "SkJLA49AXNTpiWZByII2saYLyN3bAAJTlCvhamlOEXA="; + }; + + cargoSha256 = "xhKF4qYOTdt8iCSPY5yT8tH3l54HdkOAIS2SBGzqsdo="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + dbus + sqlite + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + + meta = with lib; { + description = "May the code be with you 👻"; + longDescription = "Use leetcode.com in command line"; + homepage = "https://github.com/clearloop/leetcode-cli"; + license = licenses.mit; + maintainers = with maintainers; [ congee ]; + mainProgram = "leetcode"; + }; +} diff --git a/pkgs/applications/misc/lemonade/default.nix b/pkgs/applications/misc/lemonade/default.nix new file mode 100644 index 000000000000..797b9e7b2ae7 --- /dev/null +++ b/pkgs/applications/misc/lemonade/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +}: + +buildGoModule rec { + pname = "lemonade"; + version = "unstable-2021-06-18"; + + src = fetchFromGitHub { + owner = "lemonade-command"; + repo = pname; + rev = "97ad2f7d63cbe6c696af36a754d399b4be4553bc"; + sha256 = "sha256-77ymkpO/0DE4+m8fnpXGdnLLFxWMnKu2zsqCpQ3wEPM="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/lemonade-command/lemonade/commit/2b292b0c9d8dc57f73c30a58b3f0f790a953b212.patch"; + sha256 = "sha256-jUcOfsKu1IYa7arZuAvhuD0vw7JTmhzA/VLxOtAnbmI="; + }) + ]; + + vendorSha256 = "sha256-wjQfTKVNmehu4aU5425gS0YWKj53dosVSTLgdu9KjKc="; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Remote utility tool that to copy, paste and open browsers over TCP"; + homepage = "https://github.com/lemonade-command/lemonade/"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 05d5f93162c0..54ed6c10f42a 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,6 +1,7 @@ { lib , boost , fetchFromGitHub +, fetchpatch , installShellFiles , mkDerivation , muparser @@ -23,6 +24,14 @@ mkDerivation rec { sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE="; }; + patches = [ + (fetchpatch { + url = "https://github.com/LibreCAD/LibreCAD/pull/1465/commits/4edcbe72679f95cb60979c77a348c1522a20b0f4.patch"; + sha256 = "sha256-P0G2O5sL7Ip860ByxFQ87TfV/lq06wCQnzPxADGqFPs="; + name = "CVE-2021-45342.patch"; + }) + ]; + postPatch = '' substituteInPlace scripts/postprocess-unix.sh \ --replace /bin/sh ${runtimeShell} diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix index e9aa79dcdd83..01ffb7a9ffe8 100644 --- a/pkgs/applications/misc/lighthouse/default.nix +++ b/pkgs/applications/misc/lighthouse/default.nix @@ -3,8 +3,8 @@ }: stdenv.mkDerivation rec { - name = "lighthouse-${date}"; - date = "2016-07-20"; + pname = "lighthouse"; + version = "unstable-2016-07-20"; src = fetchFromGitHub { owner = "emgram769"; diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index d7f0624ad3f3..73c8abaa13fe 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "limesctl"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E6LwNiCykBqjkifUSi6oBWqCEhkRO+03HSKn4p45kh0="; + sha256 = "sha256-52Tq6gKozM/IFUyAy8N+YDqlbcFNQw6b2tc268Zco6g="; }; - vendorSha256 = "sha256-9MlymY5gM9/K2+7/yTa3WaSIfDJ4gRf33vSCwdIpNqw="; + vendorSha256 = "sha256-7QEb5J5IaxisKjbulyHq5PGVeKAX022Pz+5OV5qD7Uo="; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/llama/default.nix b/pkgs/applications/misc/llama/default.nix index 60598afcc4e1..f1822c674116 100644 --- a/pkgs/applications/misc/llama/default.nix +++ b/pkgs/applications/misc/llama/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-6Xuwl4IpzbVfJ2MhHeImPFWxL/Y6rhnBExlh64PeGdk="; }; - vendorSha256 = "sha256-J/2R3XhGNmejc3jstJ0NWmJm/a1Re6UK6AuQb5gzh4E="; + vendorSha256 = "sha256-zbfQtTDbVWFVGQyjqlkv3mTvEPkKImzXAIXcmkh4wqk="; meta = with lib; { description = "Terminal file manager"; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 741a17be9ee4..153e50f9a873 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, autoPatchelfHook, electron, curl, expat, gcc, openssl, zlib }: stdenv.mkDerivation rec { pname = "logseq"; - version = "0.5.4"; + version = "0.6.5"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "PGrx2JBYmp5vQ8jLpOfiT1T1+SNeRt0W5oHUjHNKuBE="; + sha256 = "WKROcCv0IzRnQd74j5Iget5jlfyDbeJ/PXgZmSNrSsQ="; name = "${pname}-${version}.AppImage"; }; @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc curl expat openssl zlib ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index 70804ef1fddb..cdbc1c23d236 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.8.1"; + version = "0.9.0"; src = fetchCrate { inherit version pname; - sha256 = "sha256-74KNnERhyiZamVyS9yzDNVf33KMqDiSfPb5BCTKFuHA="; + sha256 = "sha256-8r1MTc6sSgHXuioagj7K4f6Kf4WYnnpie17tvzhz7+M="; }; - cargoSha256 = "sha256-mjGZ/q9BByndwfnFGk6k5KD9ctY0X0/oaEugiOJY8Ms="; + cargoSha256 = "sha256-GsrQKv34EWepq0ihRmINMkShl8nyGQ1Q2De+1Y53TUo="; # setid is not allowed in the sandbox checkFlags = [ "--skip=tests::style_for_setid" ]; diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/applications/misc/lsd2dsl/default.nix index 2dfbaeb9941a..eceb9308fc0a 100644 --- a/pkgs/applications/misc/lsd2dsl/default.nix +++ b/pkgs/applications/misc/lsd2dsl/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { desktopName = "lsd2dsl"; genericName = "lsd2dsl"; comment = meta.description; - categories = "Dictionary;FileTools;Qt;"; + categories = [ "Dictionary" "FileTools" "Qt" ]; }); installPhase = '' diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 88b3d253114d..0ff5b4a6a625 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -7,7 +7,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome.gnome-desktop gnome.libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome-desktop gnome.libgnome-keyring webkitgtk ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix index b5ec8424e204..08c2c7afc45f 100644 --- a/pkgs/applications/misc/mapproxy/default.nix +++ b/pkgs/applications/misc/mapproxy/default.nix @@ -6,10 +6,10 @@ with python3.pkgs; buildPythonApplication rec { pname = "MapProxy"; - version = "1.13.2"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "1c2ba9424f600f35b7b883366296089cf61ac7c803da5d411a334c7a39ccf84b"; + sha256 = "dd36278d60cdcaaf31f7f9bbc50e90e770f3feb65cf4b3eff287215ee85f018d"; }; prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" diff --git a/pkgs/applications/misc/markets/default.nix b/pkgs/applications/misc/markets/default.nix index d1d16a7c8cbd..ccf56da05a24 100644 --- a/pkgs/applications/misc/markets/default.nix +++ b/pkgs/applications/misc/markets/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "markets"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "bitstower"; repo = "markets"; rev = version; - sha256 = "0sfdmz7cp8i2bymippp8jyxsidxjn69v9cqm40q77j81kfm84bfv"; + sha256 = "sha256-/g/r/1i69PmPND40zIID3Nun0I4ZFT1EFoNf1qprBjI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix index 0688c189e45e..168863908372 100644 --- a/pkgs/applications/misc/marktext/default.nix +++ b/pkgs/applications/misc/marktext/default.nix @@ -2,12 +2,12 @@ let pname = "marktext"; - version = "v0.16.3"; + version = "v0.17.1"; name = "${pname}-${version}-binary"; src = fetchurl { url = "https://github.com/marktext/marktext/releases/download/${version}/marktext-x86_64.AppImage"; - sha256 = "0s93c79vy2vsi7b6xq4hvsvjjad8bdkhl1q135vp98zmbf7bvm9b"; + sha256 = "2e2555113e37df830ba3958efcccce7020907b12fd4162368cfd906aeda630b7"; }; appimageContents = appimageTools.extractType2 { @@ -48,7 +48,7 @@ appimageTools.wrapType2 rec { description = "A simple and elegant markdown editor, available for Linux, macOS and Windows"; homepage = "https://marktext.app"; license = licenses.mit; - maintainers = with maintainers; [ nh2 ]; + maintainers = with maintainers; [ nh2 eduarrrd ]; platforms = [ "x86_64-linux" ]; mainProgram = "marktext"; }; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index a1788587d701..cab136d55dc9 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "masterpdfeditor"; - version = "5.8.20"; + version = "5.8.33"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz"; - sha256 = "sha256-2YfjTRTC/ZvgnV4tEY4wwoqUeUG8+0SCYuRPBzQ8ba4="; + sha256 = "sha256-sgLF/NpaNlkL5iA1l7QzMiYKwRcMDu2DHdTIaeHOtfI="; }; nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index f4d242346e9e..3144f59476b5 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdzk"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "mdzk-rs"; repo = "mdzk"; rev = version; - sha256 = "sha256-NkoKQKcww5ktEbxbOY6WP8OemCB+rvXbuN9oSPjLE3Y="; + sha256 = "sha256-V//tVcIzhCh03VjwMC+R2ynaOFm+dp6qxa0oqBfvGUs="; }; - cargoSha256 = "sha256-uJ00tGiKtcYghFUh0fcYg4nZc/o8yhvlVs+6/aRNY5s="; + cargoSha256 = "sha256-2lPckUhnyfHaVWXzZXKliolDZiPtNl9UBZIKs6tUaNQ="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index f39b88f27d7d..2381e89640af 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -1,7 +1,10 @@ { lib , mkDerivation , fetchFromGitHub + , qmake +, qttools + , curl , ffmpeg , libmediainfo @@ -10,29 +13,38 @@ , qtdeclarative , qtmultimedia , qtsvg -, qttools +, quazip }: mkDerivation rec { pname = "mediaelch"; - version = "2.8.12"; + version = "2.8.16"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - sha256 = "1gx4m9cf81d0b2nk2rlqm4misz67f5bpkjqx7d1l76rw2pwc6azf"; + sha256 = "sha256-83bHfIRVAC+3RkCYmV+TBjjQxaFMHfVyxt5Jq44dzeI="; fetchSubmodules = true; }; nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ curl libmediainfo libzen ffmpeg qtbase qtdeclarative qtmultimedia qtsvg ]; + buildInputs = [ curl ffmpeg libmediainfo libzen qtbase qtdeclarative qtmultimedia qtsvg ]; - prePatch = '' + qmakeFlags = [ + "USE_EXTERN_QUAZIP=${quazip}/include/quazip5" + ]; + + postPatch = '' substituteInPlace MediaElch.pro --replace "/usr" "$out" ''; + qtWrapperArgs = [ + # libmediainfo.so.0 is loaded dynamically + "--prefix LD_LIBRARY_PATH : ${libmediainfo}/lib" + ]; + meta = with lib; { homepage = "https://mediaelch.de/mediaelch/"; description = "Media Manager for Kodi"; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 3e206730c4e2..8ca4ec418957 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , autoconf -, automake115x +, automake , c-ares , cryptopp , curl @@ -25,22 +25,17 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-Q1SZSDTPGgBA/W/ZVYfTQsiP41RE1LJ+esQ3PK9EjIc="; + sha256 = "Y/FkbN9mTuBpcKCSQg0M+3/IPzJ58X4iZhX2kMVDv7A="; fetchSubmodules = true; }; - nativeBuildInputs = [ - autoconf - automake115x - libtool - pkg-config - ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ c-ares @@ -82,7 +77,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MEGA Command Line Interactive and Scriptable Application"; - homepage = "https://mega.nz/cmd"; + homepage = "https://mega.io/cmd"; license = with licenses; [ bsd2 gpl3Only ]; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ lunik1 ]; diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 4b273981fa9a..15b7060ff264 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -28,13 +28,13 @@ }: mkDerivation rec { pname = "megasync"; - version = "4.6.1.0"; + version = "4.6.3.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "0v2fvji9hs7valya0wx5qjx01c7yjld6nnp6m9gpxfkr30h5s5wb"; + sha256 = "1j86vr8n2a17my61vkmx83cay1ibllzjprl5bfwaby5ibh4zclz4"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/mepo/default.nix b/pkgs/applications/misc/mepo/default.nix index e65a5219ab7f..72e05d19bbda 100644 --- a/pkgs/applications/misc/mepo/default.nix +++ b/pkgs/applications/misc/mepo/default.nix @@ -5,32 +5,28 @@ , zig , curl , SDL2 +, SDL2_gfx , SDL2_image , SDL2_ttf }: stdenv.mkDerivation rec { pname = "mepo"; - version = "0.2"; + version = "0.3"; src = fetchFromSourcehut { owner = "~mil"; repo = pname; rev = version; - hash = "sha256-ECq748GpjOjvchzAWlGA7H7HBvKNxY9d43+PTOWopiM="; + hash = "sha256-B7BOAFhiOTILUdzh49hTMrNNHZpCNRDLW2uekXyptqQ="; }; nativeBuildInputs = [ pkg-config zig ]; - buildInputs = [ curl SDL2 SDL2_image SDL2_ttf ]; - - buildPhase = '' - runHook preBuild + buildInputs = [ curl SDL2 SDL2_gfx SDL2_image SDL2_ttf ]; + preBuild = '' export HOME=$TMPDIR - zig build -Drelease-safe=true -Dcpu=baseline - - runHook postBuild ''; doCheck = true; @@ -45,8 +41,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm755 zig-out/bin/mepo -t $out/bin - install -Dm755 scripts/mepo_* $out/bin + zig build -Drelease-safe=true -Dcpu=baseline --prefix $out install runHook postInstall ''; diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 4412af583b3e..9602fee5b5c0 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.1.4"; + version = "2.1.5"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = "metadata-cleaner"; rev = "v${version}"; - hash = "sha256-46J0iLXzZX5tww4CK8WhrADql023rauO0fpW7Asn5ZY="; + hash = "sha256-G7Azeh8+OQILoYEmlIeacoDzN0NRt5NTGavYM9CH8WA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/michabo/default.nix b/pkgs/applications/misc/michabo/default.nix index 015a326fdc9b..c356dc19786d 100644 --- a/pkgs/applications/misc/michabo/default.nix +++ b/pkgs/applications/misc/michabo/default.nix @@ -10,7 +10,6 @@ let desktopItem = makeDesktopItem { - type = "Application"; name = "Michabo"; desktopName = "Michabo"; exec = "Michabo"; diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index 6a1f14cbd44a..2786492d47a5 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -8,7 +8,7 @@ , gtk3 , python3 , python3Packages -, steam-run-native +, steam-run , unzip , webkitgtk , wrapGAppsHook @@ -54,14 +54,14 @@ python3Packages.buildPythonApplication rec { python3.pkgs.requests python3.pkgs.setuptools python3.pkgs.simplejson - steam-run-native + steam-run unzip webkitgtk ]; # Run Linux games using the Steam Runtime by using steam-run in the wrapper postFixup = '' - sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run-native}/bin/steam-run#' -i $out/bin/minigalaxy + sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run}/bin/steam-run#' -i $out/bin/minigalaxy ''; meta = with lib; { diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 5c24ff633af2..976c3c7978a9 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4855"; + version = "4897"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "isWweNCL/oslPtO3chtbLmf4aK5Z8ArGpcesqeZCEuE="; + sha256 = "RR8o8stOnL6nnEkCtRT9tgo8foSxd6ASTsRcGDgbQRk="; }; patches = [ diff --git a/pkgs/applications/misc/mkgmap/splitter/default.nix b/pkgs/applications/misc/mkgmap/splitter/default.nix index db89e538d51f..97f74becede7 100644 --- a/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "splitter"; - version = "645"; + version = "647"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; - sha256 = "Y9feRNDjmwUbSOwxfMIaYIycCvOBMihq5LkuKbALVDY="; + sha256 = "j9TJ+9WuItueztWjYoD9s9x8wfsga2QCIY5X2+s3Z1c="; }; patches = [ diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 15a7275bd80d..2b9c847bac8f 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -1,21 +1,21 @@ { lib , buildGoPackage , fetchFromGitHub - -, withSpeech ? true +, stdenv +, withSpeech ? !stdenv.isDarwin , makeWrapper , espeak-ng }: buildGoPackage rec { pname = "mob"; - version = "2.2.1"; + version = "2.6.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "sha256-1yE3KFGY51m6OL4LYrz+BSCHQSnbQRSpB3EUqAzSr+M="; + sha256 = "sha256-GJ4V4GQRUoXelk0ksHPoFL4iB1W7pe2UydK2AhYjysg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/mobilecoin-wallet/default.nix b/pkgs/applications/misc/mobilecoin-wallet/default.nix index 0ef26eea45a3..3d0cbdcefa17 100644 --- a/pkgs/applications/misc/mobilecoin-wallet/default.nix +++ b/pkgs/applications/misc/mobilecoin-wallet/default.nix @@ -2,11 +2,11 @@ let pname = "mobilecoin-wallet"; - version = "1.4.1"; + version = "1.5.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin-Wallet-${version}.AppImage"; - sha256 = "sha256-x5frHgkEz77pqSB6YANRtZmCzaK/RxRzMElLu49lxPk="; + sha256 = "sha256-zSTtnKvgcDSiicEDuVK2LN2d8WHiGReYI3XLBmm3Fbo="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 11f6e7bbc048..7097f584f54a 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -28,14 +28,14 @@ mkDerivation rec { preInstall = '' mkdir -p $udev/lib/udev/rules.d - sed -n '/^ \+cat > "$tmpfile" <<- EOF$/,/^EOF$/p' ../data/moolticute.sh | + sed -n '/^UDEV_RULE=="\$(cat <<-EOF$/,/^EOF$/p' ../data/moolticute.sh | sed '1d;$d' > $udev/lib/udev/rules.d/50-mooltipass.rules ''; meta = with lib; { description = "GUI app and daemon to work with Mooltipass device via USB"; longDescription = '' - To install udev rules, add `services.udev.packages == [ moolticute.udev ]` + To install udev rules, add `services.udev.packages = [ pkgs.moolticute.udev ]` into `nixos/configuration.nix`. ''; homepage = "https://github.com/mooltipass/moolticute"; diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix index 0845299c55b7..c29813517496 100644 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ b/pkgs/applications/misc/moonlight-qt/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "moonlight-qt"; - version = "3.1.4"; + version = "3.2.0"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = pname; rev = "v${version}"; - sha256 = "1sg8svb6xvkczp9slqnlm0b6k0z3bzdi4zzvwzzy21kpj6im9002"; + sha256 = "sha256-nvVBjBcuHKSn66Q7iTzslGOCkH6zMFf62zx5dDXSosI="; fetchSubmodules = true; }; @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ luc65r ]; platforms = platforms.all; + mainProgram = "moonlight"; }; } diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index f31b79c9ddf4..105728b7f044 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -1,9 +1,15 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "mop"; version = "0.2.0"; - rev = "bc666ec165d08b43134f7ec0bf29083ad5466243"; + + src = fetchFromGitHub { + owner = "mop-tracker"; + repo = "mop"; + rev = "bc666ec165d08b43134f7ec0bf29083ad5466243"; + sha256 = "sha256-fX7G4M3gfv31Eb2HChTY4RfVF2U92000U4ZnFNML5X4="; + }; goPackagePath = "github.com/michaeldv/mop"; goDeps = ./deps.nix; @@ -16,12 +22,6 @@ buildGoPackage rec { mv cmd mop ''; - src = fetchgit { - inherit rev; - url = "https://github.com/mop-tracker/mop"; - sha256 = "0zp51g9i8rw6acs4vnrxclbxa5z1v0a0m1xx27szszp0rphcczkx"; - }; - meta = with lib; { description = "Simple stock tracker implemented in go"; homepage = "https://github.com/mop-tracker/mop"; diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix index 648b4951504f..681e2d3eb4e6 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/misc/mucommander/default.nix @@ -2,7 +2,6 @@ let version = "0.9.3-3"; - name = "mucommander-${version}"; src = fetchFromGitHub { owner = "mucommander"; @@ -34,8 +33,8 @@ let # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { - name = "${name}-deps"; - inherit src postPatch; + pname = "mucommander-deps"; + inherit version src postPatch; nativeBuildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -53,7 +52,8 @@ let }; in stdenv.mkDerivation { - inherit name src postPatch; + pname = "mucommander"; + inherit version src postPatch; nativeBuildInputs = [ gradle_6 perl makeWrapper ]; buildPhase = '' diff --git a/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch b/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch new file mode 100644 index 000000000000..26ed3aec9fb7 --- /dev/null +++ b/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch @@ -0,0 +1,25 @@ +From b2935ed7e2962d73f3b493c38c0bb1e8659c0a60 Mon Sep 17 00:00:00 2001 +From: toonn +Date: Tue, 8 Mar 2022 23:59:19 +0100 +Subject: [PATCH 1/2] Use command -v in favor of which + +--- + Makerules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makerules b/Makerules +index 0fdaecb..6d52cca 100644 +--- a/Makerules ++++ b/Makerules +@@ -145,7 +145,7 @@ else ifeq ($(OS),MACOS) + LD = xcrun ld + RANLIB = xcrun ranlib + +- ifeq (, $(shell which pkg-config)) ++ ifeq (, $(shell command -v pkg-config)) + $(warning "No pkg-config found, install it for proper integration of libcrypto") + else + HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch b/pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch new file mode 100644 index 000000000000..2fe1a4afd9fd --- /dev/null +++ b/pkgs/applications/misc/mupdf/0002-Add-Darwin-deps.patch @@ -0,0 +1,57 @@ +From 0f0ccfc01cfe72d96eafee57ec6c5107f09c7238 Mon Sep 17 00:00:00 2001 +From: toonn +Date: Wed, 9 Mar 2022 00:08:28 +0100 +Subject: [PATCH 2/2] Add Darwin deps + +--- + Makerules | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +diff --git a/Makerules b/Makerules +index 6d52cca..a6bd0ed 100644 +--- a/Makerules ++++ b/Makerules +@@ -153,6 +153,40 @@ else ifeq ($(OS),MACOS) + LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO + LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto) + endif ++ # Required for mupdf-gl ++ ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes) ++ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) ++ SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz) ++ endif ++ ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes) ++ SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2) ++ SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2) ++ endif ++ ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) ++ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) ++ SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2) ++ endif ++ ifeq ($(shell pkg-config --exists gumbo && echo yes),yes) ++ SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo) ++ SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo) ++ endif ++ # Required for mupdf-x11 ++ HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) ++ ifeq ($(HAVE_X11),yes) ++ X11_CFLAGS := $(shell pkg-config --cflags x11 xext) ++ X11_LIBS := $(shell pkg-config --libs x11 xext) ++ endif ++ # Required for mupdf-x11-curl ++ HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes) ++ ifeq ($(HAVE_SYS_CURL),yes) ++ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) ++ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) ++ endif ++ HAVE_PTHREAD := yes ++ ifeq ($(HAVE_PTHREAD),yes) ++ PTHREAD_CFLAGS := ++ PTHREAD_LIBS := -lpthread ++ endif + endif + + else ifeq ($(OS),Linux) +-- +2.17.2 (Apple Git-113) + diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/applications/misc/mupdf/1.17.nix index 95e9c7c3307a..ec978b9fc3a2 100644 --- a/pkgs/applications/misc/mupdf/1.17.nix +++ b/pkgs/applications/misc/mupdf/1.17.nix @@ -82,7 +82,6 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://mupdf.com"; - repositories.git = "git://git.ghostscript.com/mupdf.git"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra fpletz ]; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index f23ca82074f6..99812bcdc8c9 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -2,6 +2,9 @@ , lib , fetchurl , fetchpatch +, copyDesktopItems +, makeDesktopItem +, desktopToDarwinBundle , pkg-config , freetype , harfbuzz @@ -10,7 +13,7 @@ , libjpeg , darwin , gumbo -, enableX11 ? true +, enableX11 ? (!stdenv.isDarwin) , libX11 , libXext , libXi @@ -21,6 +24,7 @@ , enableGL ? true , freeglut , libGLU +, xcbuild }: let @@ -31,41 +35,17 @@ let in stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.19.0"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "0rljl44y8p8hgaqializlyrgpij1wbnrzyp0ll5kcg7w05nylq48"; + sha256 = "1vfyhlqq1a0k0drcggly4bgsjasmf6lmpfbdi5xcrwdbzkagrbr1"; }; - patches = lib.optional stdenv.isDarwin ./darwin.patch ++ [ - (fetchpatch { - name = "pdfocr.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a507b139adf37d2c742e039815601cdc2aa00a84"; - sha256 = "1fx6pdgwrbk3bqsx53764d61llfj9s5q8lxqkna7mjnp7mg4krj3"; - }) - (fetchpatch { - name = "pdf-layer.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54"; - sha256 = "0ma8jq8d9a0mf26qjklgi4gdaflpjik1br1nhafzvjz7ccl56ksm"; - }) - (fetchpatch { - name = "pixmap.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=32e4e8b4bcbacbf92af7c88337efae21986d9603"; - sha256 = "1zqkxgwrhcwsdya98pcmpq2815jjmv3fwsp0sba9f5nq5xi6whbj"; - }) - (fetchpatch { - name = "CVE-2021-3407.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=cee7cefc610d42fd383b3c80c12cbc675443176a"; - sha256 = "18g9jsj90jnqibaff8pqi70a7x8ygc3sh4jl4xnvlv8vr7fxxbh6"; - }) - (fetchpatch { - name = "CVE-2021-37220.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=f5712c9949d026e4b891b25837edd2edc166151f"; - sha256 = "1zyw6w6zr7k2akpzkyycj2zzw3y5qc7afsn1ysklfj2rvb6cnsx3"; - }) - ]; + patches = [ ./0001-Use-command-v-in-favor-of-which.patch + ./0002-Add-Darwin-deps.patch + ]; postPatch = '' sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c @@ -78,8 +58,12 @@ stdenv.mkDerivation rec { ++ lib.optionals (!enableX11) [ "HAVE_X11=no" ] ++ lib.optionals (!enableGL) [ "HAVE_GLUT=no" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config ] + ++ lib.optional (enableGL || enableX11) copyDesktopItems + ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ] + ++ lib.optional stdenv.isDarwin xcbuild ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( @@ -96,6 +80,30 @@ stdenv.mkDerivation rec { rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib} ''; + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = pname; + comment = meta.description; + icon = "mupdf"; + exec = "${pname} %f"; + terminal = false; + mimeTypes = [ + "application/epub+zip" + "application/oxps" + "application/pdf" + "application/vnd.ms-xpsdocument" + "application/x-cbz" + "application/x-pdf" + ]; + categories = [ "Graphics" "Viewer" ]; + keywords = [ + "mupdf" "comic" "document" "ebook" "viewer" + "cbz" "epub" "fb2" "pdf" "xps" + ]; + }) + ]; + postInstall = '' mkdir -p "$out/lib/pkgconfig" cat >"$out/lib/pkgconfig/mupdf.pc" < $bin/share/applications/mupdf.desktop <2GB without it src = fetchFromGitHub { - owner = "betaboon"; - repo = "nerd-fonts-patcher"; - rev = "180684d7a190f75fd2fea7ca1b26c6540db8d3c0"; - sha256 = "sha256-FAbdLf0XiUXGltAgmq33Wqv6PFo/5qCv62UxXnj3SgI="; + owner = "ryanoasis"; + repo = "nerd-fonts"; + rev = "v${version}"; + sparseCheckout = '' + font-patcher + /src/glyphs + ''; + sha256 = "sha256-ePBlEVjzAJ7g6iAGIqPfgZ8bwtNILmyEVm0zD+xNN6k="; }; propagatedBuildInputs = with python3Packages; [ fontforge ]; diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index 57b1b6256906..b7485255b8a8 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -1,34 +1,50 @@ -{ lib, stdenv, fetchgit, electron, runtimeShell } : +{ lib +, stdenv +, fetchFromGitHub +, electron +, runtimeShell +, makeWrapper +, copyDesktopItems +, makeDesktopItem +}: stdenv.mkDerivation rec { pname = "nix-tour"; - version = "0.0.1"; + version = "unstable-2022-01-03"; - buildInputs = [ electron ]; - - src = fetchgit { - url = "https://github.com/nixcloud/tour_of_nix"; - rev = "v${version}"; - sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb"; + src = fetchFromGitHub { + owner = "nixcloud"; + repo = "tour_of_nix"; + rev = "6a6784983e6dc121574b97eb9b1d03592c8cb9a7"; + sha256 = "sha256-BhQz59wkwwY0ShXzqUD6MQl4NE/jUik5RbLzseEc5Bc="; }; + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + buildInputs = [ electron ]; + installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share - cp -R * $out/share - chmod 0755 $out/share/ -R - echo "#!${runtimeShell}" > $out/bin/nix-tour - echo "cd $out/share/" >> $out/bin/nix-tour - echo "${electron}/bin/electron $out/share/electron-main.js" >> $out/bin/nix-tour - chmod 0755 $out/bin/nix-tour + install -d $out/bin $out/share/nix-tour + cp -R * $out/share/nix-tour + makeWrapper ${electron}/bin/electron $out/bin/nix-tour \ + --add-flags $out/share/nix-tour/electron-main.js ''; + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Tour of Nix"; + genericName = "Tour of Nix"; + comment = + "Interactive programming guide dedicated to the nix programming language"; + categories = [ "Development" "Documentation" ]; + exec = "nix-tour"; + }) + ]; + meta = with lib; { description = "'the tour of nix' from nixcloud.io/tour as offline version"; homepage = "https://nixcloud.io/tour"; license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ qknight ]; + maintainers = with maintainers; [ qknight yuu ]; }; - } diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 245254439355..deda8b07f475 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -17,24 +17,12 @@ stdenv.mkDerivation rec { pname = "notejot"; - version = "3.3.3"; # make sure to recheck src.rev + version = "3.4.9"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; - # Note from Fedora spec file: - # https://src.fedoraproject.org/rpms/notejot/blob/bbe621cef4d5a2c27eed029063b8e8cfd7c8d400/f/notejot.spec - # Upstream confusingly made several bugfix post-releases of version 3.3.3, - # tagged as 3.4.x, but with prominent notices like "This is still 3.3.3". We - # respect upstream’s wishes (and the version numbers inside the source tarball) - # by packaging these releases as 3.3.3 with appropriate snapshot info. - # https://github.com/lainsce/notejot/releases/tag/3.4.9 - # - # Note that sometimes upstream don't update their version in meson.build - # (https://github.com/lainsce/notejot/issues/236), always follow the version - # from Fedora Rawhide. - # https://github.com/lainsce/notejot/blob/3.4.9/meson.build#L1 - rev = "3.4.9"; + rev = version; hash = "sha256-42k9CAnXAb7Ic580SIa95MDCkCWtso1F+0eD69HX8WI="; }; @@ -66,9 +54,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/lainsce/notejot"; - description = "Stupidly-simple sticky notes applet"; + description = "Stupidly-simple notes app"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; mainProgram = "io.github.lainsce.Notejot"; }; diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index 41467e0c58de..af50644f1f71 100644 --- a/pkgs/applications/misc/numberstation/default.nix +++ b/pkgs/applications/misc/numberstation/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "numberstation"; - version = "1.0.1"; + version = "1.1.0"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "~martijnbraam"; repo = "numberstation"; rev = version; - sha256 = "sha256-8q5cEpQRnevY98PKaTUW10bqRAr5NVG/rU24+nx27rw="; + hash = "sha256-A6qwsbeNZXfSOZwHp19/4JQ8dZgjsK7Y2zho6vJXsGA="; }; postPatch = '' diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 4694c243b391..41f46ff1c003 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { It uses a layered approach to connect all of the parts. ''; homepage = "https://networkupstools.org/"; - repositories.git = "https://github.com/networkupstools/nut.git"; platforms = platforms.linux; maintainers = [ maintainers.pierron ]; license = with licenses; [ gpl1Plus gpl2Plus gpl3Plus ]; diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index b822a7ed117d..1aa4a3660c2e 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -1,29 +1,43 @@ { lib , buildGoModule , fetchFromGitHub -, pkg-config , cairo , gobject-introspection , gtk3 , gtk-layer-shell -}: +, pkg-config +, wrapGAppsHook +, xdg-utils }: buildGoModule rec { pname = "nwg-drawer"; - version = "0.1.11"; + version = "0.2.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aUn9zvlNUuvm7Uo0wyzbkSLXfUDcKn1uxAu3pVwq0FA="; + sha256 = "sha256-YhCMOktfsSb7GrKA8reZb+QHcNS/Lpd0hCaPqnWvL7w="; }; - vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; - - nativeBuildInputs = [ pkg-config ]; + vendorSha256 = "sha256-Twipdrt3XZVrzJvElEGbKaJRMnop8fIFMFnriPTSS14="; buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + + doCheck = false; + + preInstall = '' + mkdir -p $out/share/nwg-drawer + cp -r desktop-directories drawer.css $out/share/nwg-drawer + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${xdg-utils}/bin + --prefix XDG_DATA_DIRS : $out/share + ) + ''; meta = with lib; { description = "Application drawer for sway Wayland compositor"; diff --git a/pkgs/applications/misc/nwg-menu/default.nix b/pkgs/applications/misc/nwg-menu/default.nix index 61e7f5ad54f0..98609665c4fe 100644 --- a/pkgs/applications/misc/nwg-menu/default.nix +++ b/pkgs/applications/misc/nwg-menu/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-M948RGU9/PwUtFRmf1Po7KlrGxqRPiOZKfS1Vv3vqW8="; }; - vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk"; + vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; doCheck = false; diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 6798e73c9314..488f5cd997d0 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -13,13 +13,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.5.4"; + version = "0.5.7"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - sha256 = "0vl9vfgpa1byf9vxn03j58h9zcbjd1y83b0kgv97cxm2mhqz12dg"; + sha256 = "1d3qh42cwayb5d9ymhfs2vrbg5x5x6x73hw77m3xb9y4vyhji85x"; }; # No tests diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix index 664b2bf03ac0..973a05ad1d76 100644 --- a/pkgs/applications/misc/obinskit/default.nix +++ b/pkgs/applications/misc/obinskit/default.nix @@ -15,7 +15,7 @@ let icon = "obinskit"; desktopName = "Obinskit"; genericName = "Obinskit keyboard configurator"; - categories = "Utility"; + categories = [ "Utility" ]; }; electron = electron_13; in diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 290553b8d345..3dad5c846952 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -1,75 +1,89 @@ -{ stdenv, fetchurl, lib, makeWrapper, electron_13, makeDesktopItem, graphicsmagick -, writeScript }: - +{ stdenv +, fetchurl +, lib +, makeWrapper +, electron_16 +, makeDesktopItem +, graphicsmagick +, writeScript +, undmg +, unzip +}: let - electron = electron_13; - icon = fetchurl { - url = - "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; - sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2"; - }; - - desktopItem = makeDesktopItem { - name = "obsidian"; - desktopName = "Obsidian"; - comment = "Knowledge base"; - icon = "obsidian"; - exec = "obsidian"; - categories = "Office"; - }; - - updateScript = writeScript "obsidian-updater" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - - set -eu -o pipefail - - latestVersion="$(curl -sS https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json | jq -r '.latestVersion')" - - update-source-version obsidian "$latestVersion" - ''; - -in stdenv.mkDerivation rec { + inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "0.13.19"; - - src = fetchurl { - url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "1jx1raynr0dgffqwya7cp4yr3szdn9bfwrhzk09bkmn8ys7d426r"; - }; - - nativeBuildInputs = [ makeWrapper graphicsmagick ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - - makeWrapper ${electron}/bin/electron $out/bin/obsidian \ - --add-flags $out/share/obsidian/app.asar - - install -m 444 -D resources/app.asar $out/share/obsidian/app.asar - install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar - - install -m 444 -D "${desktopItem}/share/applications/"* \ - -t $out/share/applications/ - - for size in 16 24 32 48 64 128 256 512; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png - done - - runHook postInstall - ''; - - passthru.updateScript = updateScript; - + version = "0.14.2"; meta = with lib; { - description = - "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; + description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; + downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; license = licenses.obsidian; - maintainers = with maintainers; [ conradmearns zaninime ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ conradmearns zaninime opeik ]; }; -} + + 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}"; + sha256 = if stdenv.isDarwin then "128kgqkf54ljkglwqa6i0qnfqhhmsv7hwbaqnml95n5dzyxrbm4s" else "00gip6pvkbywywlx71j87sxyh8yhkd36i1ydncbpnhsplr6smsq3"; + }; + + linux = stdenv.mkDerivation rec { + icon = fetchurl { + url = "https://forum.obsidian.md/uploads/default/original/1X/bf119bd48f748f4fd2d65f2d1bb05d3c806883b5.png"; + sha256 = "18ylnbvxr6k4x44c4i1d55wxy2dq4fdppp43a4wl6h6zar0sc9s2"; + }; + + desktopItem = makeDesktopItem { + name = "obsidian"; + desktopName = "Obsidian"; + comment = "Knowledge base"; + icon = "obsidian"; + exec = "obsidian %u"; + categories = [ "Office" ]; + mimeTypes = [ "x-scheme-handler/obsidian" ]; + }; + + inherit pname version src; + meta.platforms = [ "x86_64-linux" ]; + nativeBuildInputs = [ makeWrapper graphicsmagick ]; + installPhase = '' + runHook preInstall + mkdir -p $out/bin + makeWrapper ${electron_16}/bin/electron $out/bin/obsidian \ + --add-flags $out/share/obsidian/app.asar + install -m 444 -D resources/app.asar $out/share/obsidian/app.asar + install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar + install -m 444 -D "${desktopItem}/share/applications/"* \ + -t $out/share/applications/ + for size in 16 24 32 48 64 128 256 512; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + gm convert -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/obsidian.png + done + runHook postInstall + ''; + + passthru.updateScript = writeScript "updater" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + set -eu -o pipefail + latestVersion="$(curl -sS https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json | jq -r '.latestVersion')" + update-source-version obsidian "$latestVersion" + ''; + }; + + darwin = stdenv.mkDerivation rec { + appname = "Obsidian"; + inherit pname version src; + meta.platforms = [ "x86_64-darwin" "aarch64-darwin" ]; + sourceRoot = "${appname}.app"; + nativeBuildInputs = [ makeWrapper undmg unzip ]; + installPhase = '' + runHook preInstall + mkdir -p $out/{Applications/${appname}.app,bin} + cp -R . $out/Applications/${appname}.app + makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} + runHook postInstall + ''; + }; +in +if stdenv.isDarwin then darwin else linux diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index a38421b31789..4dc6f8763189 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -6,24 +6,24 @@ , substituteAll , nix-update-script # To include additional plugins, pass them here as an overlay. -, packageOverrides ? self: super: {} +, packageOverrides ? self: super: { } }: let mkOverride = attrname: version: sha256: - self: super: { - ${attrname} = super.${attrname}.overridePythonAttrs ( - oldAttrs: { - inherit version; - src = oldAttrs.src.override { - inherit version sha256; - }; - } - ); - }; + self: super: { + ${attrname} = super.${attrname}.overridePythonAttrs ( + oldAttrs: { + inherit version; + src = oldAttrs.src.override { + inherit version sha256; + }; + } + ); + }; py = python3.override { self = py; - packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) ( + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ( [ # the following dependencies are non trivial to update since later versions introduce backwards incompatible # changes that might affect plugins, or due to other observed problems @@ -34,6 +34,47 @@ let (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") (mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b") + # black uses hash, not sha256 identifier. Newer black version requires newer click version + ( + self: super: { + black = super.black.overridePythonAttrs (oldAttrs: rec { + version = "21.12b0"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-d7gPaTpWni5SeVhFljTxjfmwuiYluk4MLV2lvkLm8rM="; + }; + doCheck = false; + }); + } + ) + + # tests need network + ( + self: super: { + curio = super.curio.overridePythonAttrs (oldAttrs: rec { + disabledTests = [ + "test_timeout" + "test_ssl_outgoing" + ]; + }); + } + ) + + # tests need network + ( + self: super: { + trio = super.trio.overridePythonAttrs (oldAttrs: rec { + disabledTests = [ + "test_local_address_real" + ]; + disabledTestPaths = [ + "trio/tests/test_exports.py" + "trio/tests/test_socket.py" + ]; + }); + } + ) + # Requires flask<2, cannot mkOverride because tests need to be disabled ( self: super: { @@ -57,7 +98,7 @@ let inherit version; sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; }; - doCheck= false; + doCheck = false; }); } ) @@ -92,7 +133,7 @@ let pysocks ]; disabledTests = [ - "testConnect" # requires network access + "testConnect" # requires network access ]; } ); @@ -154,10 +195,60 @@ let disabledTests = [ "test_apply_simulates_delivery_info" "test_auto_enabling_integrations_catches_import_error" + "test_leaks" ]; disabledTestPaths = [ # Don't test integrations "tests/integrations" + # test crashes on aarch64 + "tests/test_transport.py" + ]; + }); + } + ) + + # Octoprint fails due to a newly added test in pytest-httpbin + # see https://github.com/NixOS/nixpkgs/issues/159864 + ( + self: super: { + pytest-httpbin = super.pytest-httpbin.overridePythonAttrs (oldAttrs: rec { + disabledTests = [ + "test_redirect_location_is_https_for_secure_server" + ]; + }); + } + ) + + # All test fail on aarch64 + ( + self: super: { + azure-core = super.azure-core.overridePythonAttrs (oldAttrs: rec { + doCheck = stdenv.buildPlatform == "x86_64-linux"; + }); + } + ) + + # needs network + ( + self: super: { + falcon = super.falcon.overridePythonAttrs (oldAttrs: rec { + #pytestFlagsArray = [ "-W ignore::DeprecationWarning" ]; + disabledTestPaths = oldAttrs.disabledTestPaths ++ [ + "tests/asgi/test_asgi_servers.py" + ]; + }); + } + ) + + # update broke some tests + ( + self: super: { + sanic = super.sanic.overridePythonAttrs (oldAttrs: rec { + disabledTestPaths = oldAttrs.disabledTestPaths ++ [ + "test_cli.py" + "test_cookies.py" + # requires network + "test_worker.py" ]; }); } @@ -223,13 +314,13 @@ let self: super: { octoprint = self.buildPythonPackage rec { pname = "OctoPrint"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "OctoPrint"; repo = "OctoPrint"; rev = version; - sha256 = "sha256-jCfzUx3LQ7TlXKQU8qbhyS1P4Wew/SSgJHVSc1VLdx4="; + sha256 = "sha256-U6g7WysHHOlZ4p5BM4tw3GGAxQmxv6ltYgAp1rO/eCg="; }; propagatedBuildInputs = with super; [ @@ -302,29 +393,30 @@ let }) ]; - postPatch = let - ignoreVersionConstraints = [ - "cachelib" - "colorlog" - "emoji" - "immutabledict" - "PyYAML" - "sarge" - "sentry-sdk" - "watchdog" - "wrapt" - "zeroconf" - ]; - in + postPatch = + let + ignoreVersionConstraints = [ + "cachelib" + "colorlog" + "emoji" + "immutabledict" + "PyYAML" + "sarge" + "sentry-sdk" + "watchdog" + "wrapt" + "zeroconf" + ]; + in '' - sed -r -i \ - ${lib.concatStringsSep "\n" ( - map ( - e: - ''-e 's@${e}[<>=]+.*@${e}",@g' \'' - ) ignoreVersionConstraints - )} - setup.py + sed -r -i \ + ${lib.concatStringsSep "\n" ( + map ( + e: + ''-e 's@${e}[<>=]+.*@${e}",@g' \'' + ) ignoreVersionConstraints + )} + setup.py ''; dontUseSetuptoolsCheck = true; @@ -349,7 +441,7 @@ let homepage = "https://octoprint.org/"; description = "The snappy web interface for your 3D printer"; license = licenses.agpl3Only; - maintainers = with maintainers; [ abbradar gebner WhittlesJr ]; + maintainers = with maintainers; [ abbradar gebner WhittlesJr gador ]; }; }; } @@ -360,4 +452,4 @@ let ); }; in - with py.pkgs; toPythonApplication octoprint +with py.pkgs; toPythonApplication octoprint diff --git a/pkgs/applications/misc/oil-buku/default.nix b/pkgs/applications/misc/oil-buku/default.nix new file mode 100644 index 000000000000..e0c054882886 --- /dev/null +++ b/pkgs/applications/misc/oil-buku/default.nix @@ -0,0 +1,44 @@ +{ stdenvNoCC, lib, fetchFromGitHub, jq, gawk, peco, makeWrapper }: + +stdenvNoCC.mkDerivation rec { + pname = "oil-buku"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "AndreiUlmeyda"; + repo = "oil"; + rev = version; + sha256 = "12g0fd7h11hh94b2pyg3pqwbf8bc7gcnrnm1qqbf18s6z02b6ixr"; + }; + + postPatch = '' + substituteInPlace src/oil --replace \ + "LIBDIR=/usr/local/lib/oil" "LIBDIR=${placeholder "out"}/lib" + + substituteInPlace src/json-to-line.jq --replace \ + "/usr/bin/env -S jq" "${jq}/bin/jq" + + substituteInPlace src/format-columns.awk --replace \ + "/usr/bin/env -S awk" "${gawk}/bin/awk" + ''; + + makeFlags = [ + "BINDIR=${placeholder "out"}/bin" + "LIBDIR=${placeholder "out"}/lib" + ]; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/oil \ + --prefix PATH : ${lib.makeBinPath [ peco ]} + ''; + + meta = with lib; { + description = "Search-as-you-type cli frontend for the buku bookmarks manager using peco"; + homepage = "https://github.com/AndreiUlmeyda/oil"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/applications/misc/openlp/default.nix b/pkgs/applications/misc/openlp/default.nix index 1ee482564747..a075a9bec6f5 100644 --- a/pkgs/applications/misc/openlp/default.nix +++ b/pkgs/applications/misc/openlp/default.nix @@ -37,7 +37,8 @@ let # base pkg/lib baseLib = python3Packages.callPackage ./lib.nix { }; in mkDerivation { - inherit (baseLib) pname version src; + pname = baseLib.pname + lib.optionalString (pdfSupport && presentationSupport && vlcSupport && gstreamerSupport) "-full"; + inherit (baseLib) version src; nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ]; buildInputs = [ qtbase ] ++ optionals gstreamerSupport diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index 284339b13ee5..6de5736e9ac8 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -26,6 +26,9 @@ mkDerivation rec { mkdir -p $out/etc/udev/rules.d cp 60-openrgb.rules $out/etc/udev/rules.d + install -Dm444 -t "$out/share/applications" qt/OpenRGB.desktop + install -Dm444 -t "$out/share/icons/hicolor/128x128/apps" qt/OpenRGB.png + runHook postInstall ''; diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix index 9bef85c2b249..009633f32734 100644 --- a/pkgs/applications/misc/opentrack/default.nix +++ b/pkgs/applications/misc/opentrack/default.nix @@ -45,7 +45,7 @@ in mkDerivation { }; desktopName = name; genericName = "Head tracking software"; - categories = "Utility;"; + categories = [ "Utility" ]; }) ]; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index a558ac67f7d1..63923188db7b 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "41.1"; + version = "42.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "H9ArmQlPCfbnLfd54actzkFCfsguJFpOqDIzqX7tonE="; + sha256 = "LCUXmrQbJgsY8f+Jm+uv5olDi0nf/SEd78l2olCT9zo="; }; patches = [ diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix new file mode 100644 index 000000000000..7e320e5f367a --- /dev/null +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -0,0 +1,91 @@ +{ lib +, mkDerivation +, stdenv +, fetchFromGitHub +, cmake +, ninja +, pkg-config +, which +, python3 +, rsync +, makeWrapper +, qtbase +, qtsvg +, libGLU +, libGL +, zlib +, icu +, freetype +}: + +mkDerivation rec { + pname = "organicmaps"; + version = "2022.03.23-4-android"; + + src = fetchFromGitHub { + owner = "organicmaps"; + repo = "organicmaps"; + rev = version; + sha256 = "sha256-4VBsHq8z/odD7Nrk9e0sYMEBBLeTAHsWsdgPIN1KVZo="; + fetchSubmodules = true; + }; + + postPatch = '' + # Disable certificate check. It's dependent on time + echo "exit 0" > tools/unix/check_cert.sh + + # crude fix for https://github.com/organicmaps/organicmaps/issues/1862 + echo "echo ${lib.replaceStrings ["." "-" "android"] ["" "" ""] version}" > tools/unix/version.sh + ''; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + which + python3 + rsync + makeWrapper + ]; + + # Most dependencies are vendored + buildInputs = [ + qtbase + qtsvg + libGLU + libGL + zlib + icu + freetype + ]; + + # Yes, this is PRE configure. The configure phase uses cmake + preConfigure = '' + bash ./configure.sh + ''; + + postInstall = '' + install -Dm755 OMaps $out/bin/OMaps + # Tell the program that the read-only and the read-write data locations + # are different, and create the read-write one. + wrapProgram $out/bin/OMaps \ + --add-flags "-resources_path $out/share/organicmaps/data" \ + --add-flags '-data_path "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' \ + --run 'mkdir -p "''${XDG_DATA_HOME:-''${HOME}/.local/share}/OMaps"' + + mkdir -p $out/share/organicmaps + cp -r ../data $out/share/organicmaps/data + install -Dm644 ../qt/res/logo.png $out/share/icons/hicolor/96x96/apps/organicmaps.png + install -Dm644 ../qt/res/OrganicMaps.desktop $out/share/applications/OrganicMaps.desktop + ''; + + meta = with lib; { + homepage = "https://organicmaps.app/"; + description = "Detailed Offline Maps for Travellers, Tourists, Hikers and Cyclists"; + license = licenses.asl20; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + mainProgram = "OMaps"; + broken = stdenv.isDarwin; # "invalid application of 'sizeof' to a function type" + }; +} diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 7e63bf04eef2..a2f2a676aba1 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.13.2"; + version = "1.14.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "sha256-dLYmY2bS+DycYBLZdLw8CsRIIE8EfDJEx6RZ/r9yMS8="; + sha256 = "sha256-xedunFzar44o+b/45isXWacDcC81wWkxgGwnpLPH/n0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 364bb6c80deb..1f5f3d187290 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "2.4.7"; + version = "2.4.9.1"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UR7h+btmOSnpjkrQMiABcM1tOFjOhNVWuKYDF9qXfFo="; + sha256 = "sha256-QcdPyuwbGK12Kul+gGTfRGmXfghr0qugpBEcrgATOT4="; }; buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 0776cc6572cb..f888d162fc44 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -6,6 +6,7 @@ , lib , libsodium , libuv +, nix-update-script , openssl , pkg-config , zeromq @@ -13,13 +14,13 @@ stdenv.mkDerivation rec { pname = "p2pool"; - version = "1.4"; + version = "1.8"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-syeVRweQJTNzKVl9FuIQl36WwzoI/oV2ULZbSGiDkv0="; + sha256 = "sha256-cQd3dtih7C+pEmkvlrsYTJtQWBVVMiFbtNQUM0Ck3tg="; fetchSubmodules = true; }; @@ -34,6 +35,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "Decentralized pool for Monero mining"; homepage = "https://github.com/SChernykh/p2pool"; diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix index 20a953384971..e21b06bf25ca 100644 --- a/pkgs/applications/misc/pdfdiff/default.nix +++ b/pkgs/applications/misc/pdfdiff/default.nix @@ -1,9 +1,7 @@ { lib, python2Packages, fetchurl, xpdf }: -let - py = python2Packages; -in -py.buildPythonApplication rec { - name = "pdfdiff-${version}"; + +python2Packages.buildPythonApplication rec { + pname = "pdfdiff"; version = "0.92"; src = fetchurl { diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix deleted file mode 100644 index da9340f30759..000000000000 --- a/pkgs/applications/misc/pdfmod/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, pkg-config, gnome-doc-utils, intltool, lib -, mono, gtk-sharp-2_0, gnome-sharp, hyena -, which, makeWrapper, glib, gnome2, poppler, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "pdfmod"; - version = "0.9.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "eb7c987514a053106ddf03f26544766c751c801d87762909b36415d46bc425c9"; - }; - - patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/City-busz/Arch-Linux-Repository" - + "/master/gnome/pdfmod/pdfmod/pdfmod-mono-2.10.patch"; - sha256 = "0fpz9ifr6476lqhd5rkb94dm68vlrwdq5w1aaxzgyjgdax9hxx81"; - }) ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - gnome-doc-utils intltool mono gtk-sharp-2_0 gnome-sharp - hyena which makeWrapper wrapGAppsHook - ]; - - preConfigure = '' - substituteInPlace lib/poppler-sharp/poppler-sharp/poppler-sharp.dll.config \ - --replace libpoppler-glib.so.4 libpoppler-glib.so - ''; - - postInstall = '' - makeWrapper "${mono}/bin/mono" "$out/bin/pdfmod" \ - --add-flags "$out/lib/pdfmod/PdfMod.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ - --prefix MONO_GAC_PREFIX : ${gnome-sharp} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome2.GConf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]} - ''; - - dontStrip = true; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Attic/PdfMod"; - description = "A simple application for modifying PDF documents"; - platforms = platforms.all; - maintainers = with maintainers; [ obadz ]; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index ec78c43dbe04..9bf5907a23be 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -3,13 +3,12 @@ , webkitgtk, discount, json-glib }: stdenv.mkDerivation rec { - name = "${product}-${version}"; - product = "pdfpc"; + pname = "pdfpc"; version = "4.5.0"; src = fetchFromGitHub { - repo = product; - owner = product; + repo = "pdfpc"; + owner = "pdfpc"; rev = "v${version}"; sha256 = "0bmy51w6ypz927hxwp5g7wapqvzqmsi3w32rch6i3f94kg1152ck"; }; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 782fc30f4d69..745796098e8c 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.2.10"; + version = "4.2.12"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "sha256-YxUozMrsR65A7+xeerMaYxkGALobG1wLguWGZnoQYcU="; + sha256 = "sha256-B9V3dw5A52yPoNfROI3+wAql+Y0hY4T3sTm9uN70TQQ="; }; unpackPhase = '' @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "PDFsam Basic"; genericName = "PDF Split and Merge"; - mimeType = "application/pdf;"; - categories = "Office;"; + mimeTypes = [ "application/pdf" ]; + categories = [ "Office" ]; }; meta = with lib; { diff --git a/pkgs/applications/misc/pdfstudio/common.nix b/pkgs/applications/misc/pdfstudio/common.nix index 7240e8a026e2..8c034d6636b3 100644 --- a/pkgs/applications/misc/pdfstudio/common.nix +++ b/pkgs/applications/misc/pdfstudio/common.nix @@ -40,10 +40,8 @@ let exec = "${pname} %f"; icon = "${pname}${year}"; comment = "Views and edits PDF files"; - mimeType = "application/pdf"; - categories = "Office"; - type = "Application"; - terminal = false; + mimeTypes = [ "application/pdf" ]; + categories = [ "Office" ]; }) ]; diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index 18e8136eb7b4..c91f6f64cf74 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -4,6 +4,10 @@ , callPackage }: +let makeurl = { pname, year, version }: "https://download.qoppa.com/${pname}/v${year}/${ + builtins.replaceStrings [ "pdfstudio" "viewer" "." ] [ "PDFStudio" "Viewer" "_" ] "${pname}_v${version}" + }_linux64.deb"; +in { pdfstudio = callPackage ./common.nix rec { pname = program; @@ -17,9 +21,7 @@ libgccjit #for libstdc++.so.6 and libgomp.so.1 ]; src = fetchurl { - url = "https://download.qoppa.com/${pname}/v${year}/PDFStudio_v${ - builtins.replaceStrings [ "." ] [ "_" ] version - }_linux64.deb"; + url = makeurl { inherit pname year version; }; sha256 = "1188ll2qz58rr2slavqxisbz4q3fdzidpasb1p33926z0ym3rk45"; }; }; @@ -33,9 +35,7 @@ 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/${pname}/v${year}/PDFStudioViewer_v${ - builtins.replaceStrings [ "." ] [ "_" ] version - }_linux64.deb"; + url = makeurl { inherit pname year version; }; sha256 = "128k3fm8m8zdykx4s30g5m2zl7cgmvs4qinf1w525zh84v56agz6"; }; }; diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 67e7407225b8..ee6c213fbf2c 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -9,6 +9,7 @@ , wrapGAppsHook , libinput , gnome +, gnome-desktop , glib , gtk3 , wayland @@ -33,6 +34,12 @@ let url = "https://github.com/swaywm/wlroots/commit/66593071bc90a1cccaeedc636eb6f33c973f5362.patch"; sha256 = "sha256-yKf/twdUzrII5IakH7AH6LGyPDo9Nl/gIB0pTThSTfY="; }) + # xdg-activation: Allow to submit tokens + (fetchpatch { + name = "allow-to-submit-tokens.patch"; + url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/4c59f7d46a949548caa55805b00922f846d58525.patch"; + sha256 = "sha256-1kUIt6lV3HXN2BBBER8sjYVLTvgqELdSeFullJjNGo8="; + }) # xwayland: Allow to retrieve startup-id via _NET_STARTUP_INFO (fetchpatch { name = "allow-to-retrieve-startup-id-via-net-startup-info.patch"; @@ -43,7 +50,7 @@ let }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.11.0"; + version = "0.13.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -51,7 +58,7 @@ in stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oUZtJzclVRSbLG3flF3ryLuvp1kPUtYNsmCG0csSC2A="; + sha256 = "sha256-65u59S6ntvkoQUO5BvkHZVcbj6cHIU4CgHWjzFo6s94="; }; nativeBuildInputs = [ @@ -68,7 +75,7 @@ in stdenv.mkDerivation rec { libinput glib gtk3 - gnome.gnome-desktop + gnome-desktop # For keybindings settings schemas gnome.mutter wayland diff --git a/pkgs/applications/misc/plasma-theme-switcher/default.nix b/pkgs/applications/misc/plasma-theme-switcher/default.nix new file mode 100644 index 000000000000..fb8d407ef12f --- /dev/null +++ b/pkgs/applications/misc/plasma-theme-switcher/default.nix @@ -0,0 +1,42 @@ +{ + stdenv, lib, cmake, extra-cmake-modules, fetchFromGitHub, qtbase, kdeFrameworks +}: + +stdenv.mkDerivation rec { + pname = "plasma-theme-switcher"; + version = "0.1"; + dontWrapQtApps = true; + + src = fetchFromGitHub { + owner = "maldoinc"; + repo = "plasma-theme-switcher"; + rev = "v${version}"; + sha256 = "sdcJ6K5QmglJEDIEl4sd8x7DuCPCqMHRxdYbcToM46Q="; + }; + + buildInputs = [ + qtbase + kdeFrameworks.plasma-framework + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp plasma-theme $out/bin + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/maldoinc/plasma-theme-switcher/"; + description = "A KDE Plasma theme switcher"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ kevink ]; + }; +} diff --git a/pkgs/applications/misc/plater/default.nix b/pkgs/applications/misc/plater/default.nix index 9b034f9f904e..e2e1906926a7 100644 --- a/pkgs/applications/misc/plater/default.nix +++ b/pkgs/applications/misc/plater/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { icon = pname; desktopName = "Ideamaker"; genericName = meta.description; - categories = "Utility;Engineering;"; + categories = ["Utility" "Engineering"]; }; postInstall = '' diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 320d771bc67c..58d45d19bee5 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -22,9 +22,12 @@ , jq , xorg , libGL -, steam-run-native +, steam-run # needed for avoiding crash on file selector , gsettings-desktop-schemas +, glib +, wrapGAppsHook +, hicolor-icon-theme }: let @@ -76,16 +79,19 @@ in stdenv.mkDerivation { ./0001-fix-locale.patch ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; preBuild = '' makeFlagsArray+=(PYTHON="python -m py_compile") ''; buildInputs = [ + glib xorg.libX11 libGL python + gsettings-desktop-schemas + hicolor-icon-theme ]; postPatch = '' @@ -107,7 +113,7 @@ in stdenv.mkDerivation { mkdir -p $out/bin cat > $out/bin/playonlinux < doc/Makefile.am - # substituteInPlace doc/Makefile --replace "docbook2man" "docbook2man --sgml" # Will be needed once sgmltools-lite is packaged. - for perltool in './extract-msgs.pl' './gettexttomsg.pl' '$(srcdir)/gdtconvert' '$(srcdir)/gen_img2aven'; do - substituteInPlace src/Makefile.am \ - --replace "$perltool" "${perlenv}/bin/perl $perltool" - done - substituteInPlace lib/Makefile.am \ - --replace '$(srcdir)/make-pixel-font' '${perlenv}/bin/perl $(srcdir)/make-pixel-font' - substituteInPlace lib/make-pixel-font --replace /usr/share/unifont/unifont.hex ${unscii.extra}/share/fonts/misc/unifont.hex ''; + enableParallelBuilding = true; + doCheck = (!stdenv.isDarwin); # times out + enableParallelChecking = false; + meta = with lib; { description = "Free Software/Open Source software package for mapping caves"; longDescription = '' @@ -71,7 +64,7 @@ stdenv.mkDerivation rec { variety of platforms, including Linux/Unix, macOS, and Microsoft Windows. ''; homepage = "https://survex.com/"; - changelog = "https://github.com/ojwb/survex/blob/${version}/NEWS"; + changelog = "https://github.com/ojwb/survex/raw/v${version}/NEWS"; license = licenses.gpl2Plus; maintainers = [ maintainers.matthewcroughan ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix new file mode 100644 index 000000000000..fdae9753edbc --- /dev/null +++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, pkgs, fzf, gawk, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "sway-launcher-desktop"; + version = "1.5.4"; + + src = fetchFromGitHub { + owner = "Biont"; + repo = "sway-launcher-desktop"; + rev = "v${version}"; + sha256 = "0i19igj30jyszqb63ibq0b0zxzvjw3z1zikn9pbk44ig1c0v61aa"; + }; + + postPatch = '' + patchShebangs ${pname}.sh + ''; + + buildInputs = [ fzf gawk ]; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -d $out/bin + install ${pname}.sh $out/bin/${pname} + wrapProgram $out/bin/${pname} \ + --prefix PATH : ${lib.makeBinPath [ gawk fzf ]} + ''; + + meta = with lib; { + description = "TUI Application launcher with Desktop Entry support."; + longDescription = '' + This is a TUI-based launcher menu made with bash and the amazing fzf. + Despite its name, it does not (read: no longer) depend on the Sway window manager + in any way and can be used with just about any WM. + ''; + homepage = "https://github.com/Biont/sway-launcher-desktop"; + changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.mrhedgehog ]; + mainProgram = "${pname}"; + }; +} diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix new file mode 100644 index 000000000000..a93436362adf --- /dev/null +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, vala +, gtk3 +, glib +, gtk-layer-shell +, dbus +, dbus-glib +, json-glib +, librsvg +, libhandy +, gobject-introspection +, gdk-pixbuf +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "SwayNotificationCenter"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "ErikReider"; + repo = "SwayNotificationCenter"; + rev = "v${version}"; + hash = "sha256-gXo/V2FHkHZBRmaimqJCzi0BqS4tP9IniIlubBmK5u0="; + }; + + nativeBuildInputs = [ gobject-introspection meson ninja pkg-config vala wrapGAppsHook ]; + + buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 json-glib libhandy librsvg ]; + + meta = with lib; { + description = "Simple notification daemon with a GUI built for Sway"; + homepage = "https://github.com/ErikReider/SwayNotificationCenter"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.berbiche ]; + }; +} diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index bfe9af768412..f2c8e6075d9d 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -37,7 +37,7 @@ let icon = pname; comment = description; genericName = "Computer Aided (Interior) Design"; - categories = "Graphics;2DGraphics;3DGraphics;"; + categories = [ "Graphics" "2DGraphics" "3DGraphics" ]; }; postPatch = '' diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index d6ea3fccfa66..9ef9fd0f7f44 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -40,7 +40,7 @@ let name = pname; comment = description; genericName = "Computer Aided (Interior) Design"; - categories = "Graphics;2DGraphics;3DGraphics;"; + categories = [ "Graphics" "2DGraphics" "3DGraphics" ]; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/applications/misc/systembus-notify/default.nix index 6e5405ce988e..770cd8584010 100644 --- a/pkgs/applications/misc/systembus-notify/default.nix +++ b/pkgs/applications/misc/systembus-notify/default.nix @@ -1,5 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, systemd }: +{ lib +, stdenv +, fetchFromGitHub +, formats +, systemd +}: +let + ini = formats.ini { }; + + unit = ini.generate "systembus-notify.service" { + Unit = { + Description = "system bus notification daemon"; + }; + + Service = { + Type = "exec"; + ExecStart = "@out@/bin/systembus-notify"; + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "strict"; + Restart = "on-failure"; + Slice = "background.slice"; + }; + }; + +in stdenv.mkDerivation rec { pname = "systembus-notify"; version = "1.1"; @@ -8,23 +33,32 @@ stdenv.mkDerivation rec { owner = "rfjakob"; repo = "systembus-notify"; rev = "v${version}"; - sha256 = "1pdn45rfpwhrf20hs87qmk2j8sr7ab8161f81019wnypnb1q2fsv"; + sha256 = "sha256-WzuBw7LXW54CCMgFE9BSJ2skxaz4IA2BcBny63Ihtt0="; }; buildInputs = [ systemd ]; installPhase = '' runHook preInstall - install -Dm755 systembus-notify -t $out/bin - install -Dm644 systembus-notify.desktop -t $out/etc/xdg/autostart + + install -Dm555 -t $out/bin systembus-notify + install -Dm444 -t $out/share/systembus-notify systembus-notify.desktop + + install -d $out/lib/systemd/user + substitute ${unit} $out/lib/systemd/user/${unit.name} \ + --subst-var out + runHook postInstall ''; + # requires a running dbus instance + doCheck = false; + meta = with lib; { description = "System bus notification daemon"; homepage = "https://github.com/rfjakob/systembus-notify"; license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; - maintainers = with maintainers; []; }; } diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index ae25ce358deb..7d730421398c 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.13.35"; + version = "0.21.1"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-sXJto2YygPz2B5y7m8uUfOhuRCbKkZGoCmzHOhvH2MU="; + sha256 = "sha256-fgoK7Y+3h2VFfP8yiR8JM8Xf7UJbkX9PO1RoJRoYLW4="; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "sha256-mUlwpH2XhVDtjV7ChEqlEUXffOIbips4FzQyGejFvWk="; + cargoSha256 = "sha256-3rDvla1mCcQclALbomUTvE3aLzsMeIjcIbEv4KfCKZE="; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/pkgs/applications/misc/teleprompter/default.nix b/pkgs/applications/misc/teleprompter/default.nix index 96265356ead7..7e4ac3a5701a 100644 --- a/pkgs/applications/misc/teleprompter/default.nix +++ b/pkgs/applications/misc/teleprompter/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "teleprompter"; exec = "teleprompter"; - type = "Application"; desktopName = "Teleprompter"; }; diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index 62a4151010aa..2b4db0a7a30c 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ticker"; - version = "4.4.4"; + version = "4.5.1"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KICxcfZLBwCo12p5R9wt7Tk440wkUIE7G6lGfWIdxR8="; + sha256 = "sha256-LY9js3ckkSTsE5td3VV4DPXeoxhw9MjOa35SdxMlUqk="; }; - vendorSha256 = "sha256-aPL3npryiCv+SiSyEUNhdPCDmM/hJDMspCbSNy+SuoA="; + vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; ldflags = [ "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" diff --git a/pkgs/applications/misc/tiv/default.nix b/pkgs/applications/misc/tiv/default.nix index 1ee176166ea4..3a46d2db9be8 100644 --- a/pkgs/applications/misc/tiv/default.nix +++ b/pkgs/applications/misc/tiv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tiv"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "stefanhaustein"; repo = "TerminalImageViewer"; rev = "v${version}"; - sha256 = "17zqbwj2imk6ygyc142mw6v4fh7h4rd5vzn5wxr9gs0g8qdc6ixn"; + sha256 = "sha256-mCgybL4af19zqECN1pBV+WnxMq2ZtlK5GDTQO3u9CK0="; }; buildInputs = [ imagemagick ]; diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index bcd277cad4aa..fa77f3b52993 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, libsecret }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_15, libsecret }: stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { url = "https://electron-dl.todoist.com/linux/Todoist-${version}.AppImage"; - sha256 = "1c4qmfyfi4hm3fs5bkxjbq1hxs5sgyp531xi5z5vpnzzi5z7dw0k"; + sha256 = "sha256-bHX/RWDfe+ht66U7xg4HBZxeWlNBu4gYlIVd+9OuMNU="; }; appimageContents = appimageTools.extractType2 { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_15}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" ''; diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix index 6623a8775a93..910f92a849e2 100644 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -133,7 +133,7 @@ let ''; desktopItem = makeDesktopItem rec { - categories = "Utility;"; + categories = [ "Utility" ]; desktopName = "Toggl"; genericName = desktopName; name = "toggldesktop"; diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix deleted file mode 100644 index 5aaec7a1e600..000000000000 --- a/pkgs/applications/misc/tomboy/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, itstool, intltool, pkg-config -, libxml2, gnome2, atk, gtk2, glib -, mono, mono-addins, dbus-sharp-2_0, dbus-sharp-glib-2_0, gnome-sharp, gtk-sharp-2_0 -, makeWrapper, lib}: - -let - version = "1.15.9"; -in - -stdenv.mkDerivation { - pname = "tomboy"; - inherit version; - - src = fetchurl { - url = "https://github.com/tomboy-notes/tomboy/releases/download/${version}/tomboy-${version}.tar.xz"; - sha256 = "0j5jmd079bm2fydqaic5ymbfdxna3qlx6fkp2mqhgcdr7prsbl3q"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ itstool intltool - libxml2 gnome2.GConf atk gtk2 - mono mono-addins dbus-sharp-2_0 dbus-sharp-glib-2_0 gnome-sharp gtk-sharp-2_0 - makeWrapper ]; - - postInstall = '' - makeWrapper "${mono}/bin/mono" "$out/bin/tomboy" \ - --add-flags "$out/lib/tomboy/Tomboy.exe" \ - --prefix MONO_GAC_PREFIX : ${dbus-sharp-2_0} \ - --prefix MONO_GAC_PREFIX : ${dbus-sharp-glib-2_0} \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ - --prefix MONO_GAC_PREFIX : ${gnome-sharp} \ - --prefix MONO_GAC_PREFIX : ${mono-addins} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk-sharp-2_0 gtk-sharp-2_0.gtk gnome2.GConf ]} - ''; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Tomboy"; - description = "A simple note-taking application with synchronization"; - platforms = platforms.linux; - license = lib.licenses.lgpl2; - maintainers = with maintainers; [ stesie ]; - }; -} diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index f29c471d04b0..c11ad8d1e981 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -68,6 +68,11 @@ stdenv.mkDerivation rec { ]; postPatch = '' + # Fix build with vala 0.56 + # https://github.com/bleakgrey/tootle/pull/346 + substituteInPlace src/Application.vala \ + --replace "public const GLib.ActionEntry[] app_entries" "private const GLib.ActionEntry[] app_entries" + chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index b2839a97efcc..a94363f4600c 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, qt4, qmake4Hook, trousers }: +{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, trousers }: stdenv.mkDerivation rec { version = "0.8.1"; pname = "tpmmanager"; - src = fetchgit { - url = "https://github.com/Sirrix-AG/TPMManager"; - rev = "9f989206635a6d2c1342576c90fa73eb239519cd"; - sha256 = "24a606f88fed67ed0d0e61dc220295e9e1ab8db3ef3d028fa34b04ff30652d8e"; + src = fetchFromGitHub { + owner = "Rohde-Schwarz"; + repo = "TPMManager"; + rev = "v${version}"; + sha256 = "sha256-JKYG+I/tZ+0NDmHcIgKV6eGrjbPvPQKPo0sE/zBlLY4="; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/applications/misc/trenchbroom/default.nix b/pkgs/applications/misc/trenchbroom/default.nix index b6ff02116914..8a7025060607 100644 --- a/pkgs/applications/misc/trenchbroom/default.nix +++ b/pkgs/applications/misc/trenchbroom/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { desktopName = "TrenchBroom level editor"; icon = "trenchbroom"; comment = meta.description; - categories = "Development"; + categories = [ "Development" ]; exec = "trenchbroom"; }) ]; diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix index 08c88e376bb6..a1adc152349b 100644 --- a/pkgs/applications/misc/tty-share/default.nix +++ b/pkgs/applications/misc/tty-share/default.nix @@ -1,18 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -# Upstream has a `./vendor` directory with all deps which we rely upon. -buildGoPackage rec { +buildGoModule rec { pname = "tty-share"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "elisescu"; repo = "tty-share"; rev = "v${version}"; - sha256 = "sha256-+bdQ7KyGEdJJAopzGnDOcLvFNyiKqpagPR1EoU1VR5E="; + sha256 = "sha256-aAqKfi0ZX0UB07yGY6x0HcMspvq4rcJXKHSONxAwMlc="; }; - goPackagePath = "github.com/elisescu/tty-share"; + # Upstream has a `./vendor` directory with all deps which we rely upon. + vendorSha256 = null; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://tty-share.com"; diff --git a/pkgs/applications/misc/tuhi/default.nix b/pkgs/applications/misc/tuhi/default.nix index 4bd0c914d3a1..bf939cfa1758 100644 --- a/pkgs/applications/misc/tuhi/default.nix +++ b/pkgs/applications/misc/tuhi/default.nix @@ -13,15 +13,15 @@ }: python3Packages.buildPythonApplication rec { - name = "tuhi"; + pname = "tuhi"; version = "0.5"; format = "other"; src = fetchFromGitHub { owner = "tuhiproject"; - repo = name; - rev = "${version}"; + repo = "tuhi"; + rev = version; sha256 = "17kggm9c423vj7irxx248fjc8sxvkp9w1mgawlx1snrii817p3db"; }; diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix index fa08b5f555a7..bd8fdf5e48c5 100644 --- a/pkgs/applications/misc/tvbrowser/bin.nix +++ b/pkgs/applications/misc/tvbrowser/bin.nix @@ -8,11 +8,9 @@ let comment = "Themeable and easy to use TV Guide"; desktopName = "TV-Browser"; genericName = "Electronic TV Program Guide"; - categories = "AudioVideo;TV;Java;"; - startupNotify = "true"; - extraEntries = '' - StartupWMClass=tvbrowser-TVBrowser - ''; + categories = [ "AudioVideo" "TV" "Java" ]; + startupNotify = true; + startupWMClass = "tvbrowser-TVBrowser"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 5543b3442bd2..dc50a3b95678 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.6.10.0"; + version = "5.6.10.1"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_0_b124e6f3a4944b32/${pname}_${version}_amd64.deb"; - sha256 = "fd201ce817abe32e1b582bb4b55fef85ac8132806f5ddf0548fd25bbfd48833c"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_1_de501d28cc034306/${pname}_${version}_amd64.deb"; + sha256 = "8faf896d2570d1d210793f46a3860e934d03498c1f11640d43721b6eb2b56860"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 6ccaa8ff2e26..690f2148e5ff 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "sha256-KQXEiDg5KRCMFFyDlR8D6CQTxRdIZx4/U1csTFCr0sU="; + sha256 = "sha256-ZJdmsb+2ElgLFWsicc0S8EQAZhF+gnn+ARgdAyaFDgc="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index 0374fb91844d..2eca4cfccb31 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchurl, ncurses, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.9"; + pname = "urlview"; + _version = "0.9"; patchLevel = "19"; - - name = "urlview-${version}-${patchLevel}"; + version = "${_version}-${patchLevel}"; urlBase = "mirror://debian/pool/main/u/urlview/"; src = fetchurl { - url = urlBase + "urlview_${version}.orig.tar.gz"; + url = urlBase + "urlview_${_version}.orig.tar.gz"; sha256 = "746ff540ccf601645f500ee7743f443caf987d6380e61e5249fc15f7a455ed42"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; debianPatches = fetchurl { - url = urlBase + "urlview_${version}-${patchLevel}.diff.gz"; + url = urlBase + "urlview_${_version}-${patchLevel}.diff.gz"; sha256 = "056883c17756f849fb9235596d274fbc5bc0d944fcc072bdbb13d1e828301585"; }; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 2765cd5ad7aa..e3f2e80c47a5 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -38,7 +38,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2; downloadPage = "https://vifm.info/downloads.shtml"; homepage = "https://vifm.info/"; - updateWalker = true; changelog = "https://github.com/vifm/vifm/blob/v${version}/ChangeLog"; }; } diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 5e5e1bead5a1..01b7af16409d 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.9"; + version = "0.9.12"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "sha256-yXvT9NMXtUxr9VVLADoL6PUOMko5yFFc51zNsfHz6S4="; + sha256 = "sha256-NQ/d+eXmc+GRxl5zby97S4U/YQnsRWGpwNZZL0Sqby8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 4c5c5e3a8406..6149c52e7753 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages, installShellFiles }: +{ lib, stdenv, fetchurl, python3, installShellFiles }: stdenv.mkDerivation rec { version = "2.4.2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles - python2Packages.wrapPython + python3.pkgs.wrapPython ]; dontConfigure = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Upstream doesn't provide a setup.py or alike, so we follow: # http://fungi.yuggoth.org/weather/doc/install.rst#id3 installPhase = '' - site_packages=$out/${python2Packages.python.sitePackages} + site_packages=$out/${python3.sitePackages} install -Dt $out/bin -m 755 weather install -Dt $site_packages weather.py install -Dt $out/share/weather-util \ diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 4bbd0289a156..d446e057174d 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -1,23 +1,21 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "wego"; - version = "unstable-2019-02-11"; - rev = "994e4f141759a1070d7b0c8fbe5fad2cc7ee7d45"; + version = "2.1"; - goPackagePath = "github.com/schachmat/wego"; - - src = fetchgit { - inherit rev; - url = "https://github.com/schachmat/wego"; - sha256 = "1affzwi5rbp4zkirhmby8bvlhsafw7a4rs27caqwyj8g3jhczmhy"; + src = fetchFromGitHub { + owner = "schachmat"; + repo = pname; + rev = version; + sha256 = "sha256-lMcrFwYtlnivNjSbzyiAEAVX6ME87yB/Em8Cxb1LUS4="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-kv8c0TZdxCIfmkgCLDiNyoGqQZEKUlrNLEbjlG9rSPs="; - meta = { - license = lib.licenses.isc; + meta = with lib; { homepage = "https://github.com/schachmat/wego"; description = "Weather app for the terminal"; + license = licenses.isc; }; } diff --git a/pkgs/applications/misc/wego/deps.nix b/pkgs/applications/misc/wego/deps.nix deleted file mode 100644 index 133315cd0222..000000000000 --- a/pkgs/applications/misc/wego/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "98ec13f34aabf44cc914c65a1cfb7b9bc815aef1"; - sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "31745d66dd679ac0ac4f8d3ecff168fce6170c6a"; - sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "18c3d09a134a52720932bbaa92c798a0ab111004"; - sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66"; - }; - } - { - goPackagePath = "github.com/schachmat/ingo"; - fetch = { - type = "git"; - url = "https://github.com/schachmat/ingo"; - rev = "a4bdc0729a3fda62cc4069b6e490fc657fd54e33"; - sha256 = "1gw0kddy7jh3467imsqni86cf9yq7k6vpfc0ywkbwj0zsjsdgd49"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b016eb3dc98ea7f69ed55e8216b87187067ae621"; - sha256 = "1k0qr26046d228gi6ngkfxp4m1rjgxk4jj75h0kh1cpyp91n5rja"; - }; - } -] diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index bb1b9213fde5..3920a3a86554 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.5.0"; + version = "4.5.2"; src = fetchurl { url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; - sha256 = "sha256-yl4R/1flm2Lfvyh9PXlJcZ1VtnP8nBQC0i7zs4U+g7g="; + sha256 = "sha256-4ksKXVeUGICHfx014s5g9mapS751dbexBjzyqNvk02M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix index ef4a0ab7e59d..c3e5a505722c 100644 --- a/pkgs/applications/misc/wike/default.nix +++ b/pkgs/applications/misc/wike/default.nix @@ -7,20 +7,18 @@ , libhandy, webkitgtk, glib-networking , gnome, dconf }: -let - pythonEnv = python3.withPackages (p: with p; [ - pygobject3 - requests - ]); -in stdenv.mkDerivation rec { + +python3.pkgs.buildPythonApplication rec { pname = "wike"; - version = "1.7.0"; + version = "1.7.1"; + format = "other"; + strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchFromGitHub { owner = "hugolabe"; repo = "Wike"; rev = version; - sha256 = "sha256-Cv4gmAUqViHJEAgueLOUX+cI775QopfRA6vmHgQvCUY="; + sha256 = "sha256-QLhfzGRrc2En0Hu+UdtPM572PdtXqOFL0W3LoAki4jI="; }; nativeBuildInputs = [ @@ -35,7 +33,6 @@ in stdenv.mkDerivation rec { buildInputs = [ glib - pythonEnv gtk3 libhandy webkitgtk @@ -44,10 +41,13 @@ in stdenv.mkDerivation rec { dconf ]; + propagatedBuildInputs = with python3.pkgs; [ + requests + pygobject3 + ]; + postPatch = '' patchShebangs build-aux/meson/postinstall.py - substituteInPlace src/wike.in --replace "@PYTHON@" "${pythonEnv}/bin/python" - substituteInPlace src/wike-sp.in --replace "@PYTHON@" "${pythonEnv}/bin/python" ''; meta = with lib; { diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 6fdfe92da253..e29d58039a04 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0hd5gnydxfncsmm7c58lvhkpnyxknvicc8f58xfh74azf363wcvm"; + sha256 = "sha256-Y8Vdh6sMMX8pS4zIuOfcejfsOB5z5mXEpRskJXQgU1Y="; }; - vendorSha256 = "1pkdfg042kg3b6m5rf044gz5yg6vp3bbsay1mrrbaysnb3gs51dq"; + vendorSha256 = "sha256-UE7BYal8ycU7mM1TLJMhoNxQKZjtsO9rJ+YXmLiOSk0="; doCheck = false; diff --git a/pkgs/applications/misc/xdg-launch/default.nix b/pkgs/applications/misc/xdg-launch/default.nix index 973acbbf65a5..bf5b0484c867 100644 --- a/pkgs/applications/misc/xdg-launch/default.nix +++ b/pkgs/applications/misc/xdg-launch/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation rec { pname = "xdg-launch"; - version = "1.11"; + version = "1.12"; postPatch = '' # fix gettext configuration @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "bbidulock"; repo = pname; rev = version; - sha256 = "sha256-qrBxyJ3dUNdnE1nANLKKL0cXw/Hc4qxDoY1anIRN+VA="; + sha256 = "sha256-S/0Wn1T5MSOPN6QXkzfmygHL6XTAnnMJr5Z3fBzsHEw="; }; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index 5f71f9099266..bcc4fca33b13 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { icon = "xmind"; desktopName = "XMind"; comment = meta.description; - categories = "Office;"; - mimeType = "application/xmind;x-scheme-handler/xmind"; + categories = [ "Office" ]; + mimeTypes = [ "application/xmind" "x-scheme-handler/xmind" ]; }; installPhase = let diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index cb4233be8ec3..91c8c69fe930 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -11,7 +11,7 @@ let in stdenv'.mkDerivation rec { - name = "xmr-stak-${version}"; + pname = "xmr-stak"; version = "2.10.8"; src = fetchFromGitHub { diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index dc3415ac7699..e40a0d7e5ade 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.16.2"; + version = "6.16.4"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-RbpvEPjRwwGbjt4+A4tbnvEdLc+hH1VszE36xXnIxPE="; + sha256 = "sha256-hfdKhTUGoVN4DIURO+e3MOSpsL6GWxOV3LItd0nA51Y="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 94af6d130b98..25f27bd5063a 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.16.2-mo2"; + version = "6.16.4-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-o2TtkoKa4DQ6tM1GdKVEmkWoJvnvxQc514wwgsfTDnE="; + sha256 = "sha256-OnKz/Sl/b0wpZ1tqeEXhNxNNmQJXBhv5YNnKu9aOVZA="; }; meta = with lib; { diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index eb5ebf3a7177..927b04d5e210 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -42,8 +42,7 @@ stdenv.mkDerivation rec { comment = "Views Adobe PDF files"; icon = "xpdf"; exec = "xpdf %f"; - categories = "Office;"; - terminal = "false"; + categories = [ "Office" ]; }; postInstall = lib.optionalString (!stdenv.isDarwin) '' diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 5b6a5dee9b01..db28952c31f2 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.17.1"; + version = "0.17.3"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eRA9v5C6FFYs01a8cwnaVGliuNj026/ANSPC2FxEUws="; + sha256 = "sha256-BbD0Z/WGNaqpPowZqc4kmFLbL9/+JotKm7dWIgS3NjM="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-xali/nvYVpvKIFRlOZpDNE/rv7iUHJCU9QV6RctJSO8="; + cargoSha256 = "sha256-qsicWf15U5b4xMqkXDOrhGNrQmiZkoxBQwV58asQa8k="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix index 45dba0a93125..88b5046d1797 100644 --- a/pkgs/applications/misc/yambar/default.nix +++ b/pkgs/applications/misc/yambar/default.nix @@ -27,18 +27,19 @@ let # Courtesy of sternenseemann and FRidh - mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; + mesonFeatureFlag = feature: flag: + "-D${feature}=${if flag then "enabled" else "disabled"}"; in stdenv.mkDerivation rec { pname = "yambar"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "yambar"; rev = version; - sha256 = "sha256-NzJrlPOkzstMbw37yBTah/uFYezlPB/1hrxCiXduSmc="; + hash = "sha256-zXhIXT3JrVSllnYheDU2KK3NE2VYa+xuKufIXjdMFjU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix deleted file mode 100644 index d031f63a097a..000000000000 --- a/pkgs/applications/misc/yarssr/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ fetchFromGitHub, stdenv, lib, gettext, gtk2, makeWrapper, perlPackages, gnome2 }: - -let - perlDeps = with perlPackages; [ - Glib - Gtk2 - Gnome2 - Pango - Cairo - Gnome2Canvas - Gnome2VFS - Gtk2GladeXML - Gtk2TrayIcon - XMLLibXML - XMLSAXBase - XMLParser - XMLRSS - HTMLParser - DateTime - DateTimeFormatMail - DateTimeFormatW3CDTF - DateTimeLocale - DateTimeTimeZone - ParamsValidate - ModuleImplementation - ModuleRuntime - TryTiny - ClassSingleton - URI - AnyEvent - AnyEventHTTP - commonsense - FileSlurp - JSON - Guard - LocaleGettext - ]; - libs = [ - stdenv.cc.cc.lib - gtk2 - ]; -in -stdenv.mkDerivation { - version = "unstable-2017-12-01"; - pname = "yarssr"; - - src = fetchFromGitHub { - owner = "JGRennison"; - repo = "yarssr"; - rev = "e70eb9fc6563599bfb91c6de6a79654de531c18d"; - sha256 = "0x7hz8x8qyp3i1vb22zhcnvwxm3jhmmmlr22jqc5b09vpmbw1l45"; - }; - - nativeBuildInputs = [ perlPackages.perl gettext makeWrapper ]; - buildInputs = perlDeps ++ [ gnome2.libglade ]; - propagatedBuildInputs = libs ++ perlDeps; - - installPhase = '' - DESTDIR=$out make install - mv $out/usr/* $out/ - rm -R $out/usr - sed -i -r "s!use lib [^;]+;!use lib '$out/share/yarssr';!" $out/bin/yarssr - sed -i -r "s!$Yarssr::PREFIX = [^;]+;!$Yarssr::PREFIX = '$out';!" $out/bin/yarssr - sed -i -r "s!use Yarssr::Browser;!!" $out/share/yarssr/Yarssr/GUI.pm - chmod a+x $out/bin/yarssr - ''; - - postFixup = '' - wrapProgram $out/bin/yarssr \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath libs} \ - --set PERL5LIB "${perlPackages.makePerlPath perlDeps}" - ''; - - meta = with lib; { - homepage = "https://github.com/tsyrogit/zxcvbn-c"; - description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes"; - license = licenses.gpl1; - platforms = platforms.linux; - maintainers = with maintainers; [ xurei ]; - }; -} diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index 3046638ec4a6..bffe67491c35 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yate"; - version = "6.1.0-1"; + version = "6.4.0-1"; src = fetchurl { url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "0xx3i997nsf2wzbv6m5n6adsym0qhgc6xg4rsv0fwqrgisf5327d"; + hash = "sha256-jCPca/+/jUeNs6hZZLUBl3HI9sms9SIPNGVRanSKA7A="; }; # TODO zaptel ? postgres ? @@ -14,12 +14,14 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 openssl ]; # /dev/null is used when linking which is a impure path for the wrapper - preConfigure = + postPatch = '' - sed -i 's@,/dev/null@@' configure patchShebangs configure + substituteInPlace configure --replace ",/dev/null" "" ''; + enableParallelBuilding = false; # fails to build if true + # --unresolved-symbols=ignore-in-shared-libs makes ld no longer find --library=yate? Why? preBuild = '' @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { homepage = "http://yate.null.ro/"; # Yate's license is GPL with an exception for linking with # OpenH323 and PWlib (licensed under MPL). - license = ["GPL" "MPL"]; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.marcweber ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 1548b0581b65..67fe3032d05c 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -30,4 +30,4 @@ let }; }; -in self.zathuraWrapper +in self diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index ccbde19d2aa3..60ff0bd68854 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -11,7 +11,7 @@ symlinkJoin { in '' makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \ --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ - --add-flags --plugins-dir="$out/lib/zathura" + --prefix ZATHURA_PLUGINS_PATH : "$out/lib/zathura" # zathura fish completion references the zathura_core derivation to # check for supported plugins which live in the wrapper derivation, diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 3006d5022ebc..b0d1b79509a6 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "2.1.2"; + version = "2.2.4"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-gfq5eXSoEfOb3FVAv/iDDSGeEeZxFRp4BFtwf87WQGE="; + sha256 = "sha256-lzXciToyUsHl8WV0IvdP6R2pYegL7/G04YPLb6gbCgQ="; }; appimageContents = appimageTools.extractType2 { inherit name src; diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index 3acac8b3c68d..d3424938dd9b 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -1,9 +1,9 @@ { lib, python3, python3Packages, fetchFromGitHub }: -let version = "1.0"; in +python3Packages.buildPythonApplication rec { + pname = "zscroll"; + version = "1.0"; -python3Packages.buildPythonApplication { - name = "zscroll-${version}"; # don't prefix with python version namePrefix = ""; diff --git a/pkgs/applications/networking/aether/default.nix b/pkgs/applications/networking/aether/default.nix index ddb137137cf3..5f78b244ca41 100644 --- a/pkgs/applications/networking/aether/default.nix +++ b/pkgs/applications/networking/aether/default.nix @@ -9,31 +9,27 @@ 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"; - srcs = [ - (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"; - }) - (fetchFromGitHub { - owner = "aethereans"; - repo = "aether-app"; - rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d"; - sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r"; - }) - ]; - - sourceRoot = "Aether-${version}+2011262249.19338c93"; + 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 ../source/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png + convert ${aether-app-git}/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png ''; dontWrapGApps = true; @@ -67,8 +63,8 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "Aether"; genericName = meta.description; - categories = "Network;"; - mimeType = "x-scheme-handler/aether"; + categories = [ "Network" ]; + mimeTypes = [ "x-scheme-handler/aether" ]; }) ]; diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index d9fe26fdbdc4..8b20c1aac6b0 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { comment = "Eclipse-based LDAP browser and directory client"; desktopName = "Apache Directory Studio"; genericName = "Apache Directory Studio"; - categories = "Java;Network"; + categories = [ "Java" "Network" ]; }; buildInputs = [ glib libsecret ]; diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index bfe71ce72155..987f6e0c1ca2 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -87,11 +87,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "5.5.2"; + version = "5.5.3"; src = fetchurl { url = "https://bin.appgate-sdp.com/${versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-8K7RqkxpyRsQ3QHGIfTchLaZ7/+k0hbiJdl7uc++vYs="; + sha256 = "sha256-qSo4JX/Jj+JkeetZIMw88MK7SzOgT8aNbQby2kJ91oo="; }; # just patch interpreter diff --git a/pkgs/applications/networking/blocky/default.nix b/pkgs/applications/networking/blocky/default.nix index 8bc0963338fb..2f2a708455e1 100644 --- a/pkgs/applications/networking/blocky/default.nix +++ b/pkgs/applications/networking/blocky/default.nix @@ -1,24 +1,25 @@ { buildGoModule , fetchFromGitHub , lib +, nixosTests }: buildGoModule rec { pname = "blocky"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "0xERR0R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vG6QAI8gBI2nLRQ0nOFWQHihyzgmJu69rgkWlg3iW3E="; + sha256 = "sha256-rFHDoNrEmMSNEc3RLdSeRk9mF05drUYfJFQKHAk5alE="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorSha256 = "sha256-+mpNPDejK9Trhw41SUXJPL/OX5wQR0QfA2+BXSlE0Jk="; + vendorSha256 = "sha256-rrqDjh5e3KX5+saYjnMPG0bhr5YEOPfz0QCRf6omNZI="; meta = with lib; { description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features."; @@ -27,4 +28,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ ratsclub ]; }; + + passthru.tests = { inherit (nixosTests) blocky; }; } diff --git a/pkgs/applications/networking/breitbandmessung/default.nix b/pkgs/applications/networking/breitbandmessung/default.nix new file mode 100644 index 000000000000..31f33be38670 --- /dev/null +++ b/pkgs/applications/networking/breitbandmessung/default.nix @@ -0,0 +1,153 @@ +{ lib +, stdenv +, alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, autoPatchelfHook +, cairo +, cups +, dbus +, dpkg +, expat +, fetchurl +, gdk-pixbuf +, glib +, gtk3 +, libdrm +, libxkbcommon +, makeWrapper +, mesa +, nixosTests +, nspr +, nss +, pango +, pciutils +, systemd +, undmg +, writeShellScriptBin +, xorg +}: + +let + inherit (stdenv.hostPlatform) system; + + version = "3.1.0"; + + # At first start, the program checks for supported operating systems by calling `lsb_release -a` + # and only runs when it finds Debian/Ubuntu. So we present us as Debian an make it happy. + fake-lsb-release = writeShellScriptBin "lsb_release" '' + echo "Distributor ID: Debian" + echo "Description: Debian GNU/Linux 10 (buster)" + echo "Release: 10" + echo "Codename: buster" + ''; + + binPath = lib.makeBinPath [ + fake-lsb-release + ]; + + systemArgs = rec { + x86_64-linux = rec { + src = fetchurl { + url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${version}-linux.deb"; + sha256 = "sha256-jSP+H9ej9Wd+swBZSy9uMi2ExSTZ191FGZhqaocTl7w="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + ]; + + buildInputs = runtimeDependencies; + + runtimeDependencies = [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libdrm + libxkbcommon + mesa + nspr + nss + pango + pciutils + systemd + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxcb + xorg.libxshmfence + ]; + + installPhase = '' + dpkg-deb -x $src $out + mkdir -p $out/bin + + chmod -R g-w $out + + addAutoPatchelfSearchPath --no-recurse $out/opt/Breitbandmessung + autoPatchelfFile $out/opt/Breitbandmessung/breitbandmessung + + makeWrapper $out/opt/Breitbandmessung/breitbandmessung $out/bin/breitbandmessung \ + --prefix PATH : ${binPath} + + mv $out/usr/share $out/share + rmdir $out/usr + + # Fix the desktop link + substituteInPlace $out/share/applications/breitbandmessung.desktop \ + --replace /opt/Breitbandmessung $out/bin + ''; + + dontAutoPatchelf = true; + dontPatchELF = true; + }; + + x86_64-darwin = { + src = fetchurl { + url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${version}-mac.dmg"; + sha256 = "sha256-2c8mDKJuHDSw7p52EKnJO5vr2kNTLU6r9pmGPANjE20="; + }; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications/Breitbandmessung.app + cp -R . $out/Applications/Breitbandmessung.app + runHook postInstall + ''; + }; + + aarch64-darwin = x86_64-darwin; + }.${system} or { src = throw "Unsupported system: ${system}"; }; +in +stdenv.mkDerivation ({ + pname = "breitbandmessung"; + inherit version; + + passthru.tests = { inherit (nixosTests) breitbandmessung; }; + + meta = with lib; { + description = "Broadband internet speed test app from the german Bundesnetzagentur"; + homepage = "https://www.breitbandmessung.de"; + license = licenses.unfree; + maintainers = with maintainers; [ b4dm4n ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + }; +} // systemArgs) diff --git a/pkgs/applications/networking/browsers/bombadillo/default.nix b/pkgs/applications/networking/browsers/bombadillo/default.nix index b07c526c0d51..983f8ac1ee39 100644 --- a/pkgs/applications/networking/browsers/bombadillo/default.nix +++ b/pkgs/applications/networking/browsers/bombadillo/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "bombadillo"; - version = "2.3.3"; + version = "2.4.0"; src = fetchgit { url = "https://tildegit.org/sloum/bombadillo.git"; rev = version; - sha256 = "02w6h44sxzmk3bkdidl8xla0i9rwwpdqljnvcbydx5kyixycmg0q"; + sha256 = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 3c0690861134..65627a490d10 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -12,7 +12,6 @@ , freetype , gdk-pixbuf , glib -, gnome2 , gnome , gsettings-desktop-schemas , gtk3 @@ -60,7 +59,6 @@ rpath = lib.makeLibraryPath [ freetype gdk-pixbuf glib - gnome2.GConf gtk3 libdrm libpulseaudio @@ -93,11 +91,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.34.81"; + version = "1.36.122"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "bMNk1l3MguQho0vck78U1e3A+/571DyoWSKKerQVE7s="; + sha256 = "aBHoEu1egRPMpeUBgRl2V5J3op1Ju+CvprG14dIWc8M="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 74133a9d47e9..6dd6d98c0efd 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -23,7 +23,7 @@ , libusb1, re2 , ffmpeg, libxslt, libxml2 , nasm -, nspr, nss, systemd +, nspr, nss , util-linux, alsa-lib , bison, gperf, libkrb5 , glib, gtk3, dbus-glib @@ -47,6 +47,8 @@ , ungoogled ? false, ungoogled-chromium # Optional dependencies: , libgcrypt ? null # gnomeSupport || cupsSupport +, systemdSupport ? stdenv.isLinux +, systemd }: buildFun: @@ -96,7 +98,7 @@ let "libpng" "libwebp" "libxslt" - "opus" + # "opus" ]; opusWithCustomModes = libopus.override { @@ -114,7 +116,7 @@ let }; base = rec { - name = "${packageName}-unwrapped-${version}"; + pname = "${packageName}-unwrapped"; inherit (upstream-info) version; inherit packageName buildType buildPath; @@ -139,7 +141,7 @@ let libusb1 re2 ffmpeg libxslt libxml2 nasm - nspr nss systemd + nspr nss util-linux alsa-lib bison gperf libkrb5 glib gtk3 dbus-glib @@ -151,7 +153,8 @@ let libdrm wayland mesa.drivers libxkbcommon curl libepoxy - ] ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] + ] ++ optional systemdSupport systemd + ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; @@ -161,28 +164,6 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch - ] ++ lib.optionals (versionRange "97" "98") [ - # A critical Ozone/Wayland fix: - # (Note: The patch for surface_augmenter.cc doesn't apply on M97 so we extract that part.) - (fetchpatch { - # [linux/wayland] Fixed terminate caused by binding to wrong version. - url = "https://github.com/chromium/chromium/commit/dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d.patch"; - excludes = [ "ui/ozone/platform/wayland/host/surface_augmenter.cc" ]; - sha256 = "sha256-lp4kxPNAkafdE9NfD3ittTCpomRpX9Hqhtt9GFf4Ntw="; - }) - ./patches/m97-ozone-wayland-fix-surface_augmenter.patch - ] ++ lib.optionals (versionRange "98" "99") [ - (githubPatch { - # [linux/wayland] Fixed terminate caused by binding to wrong version. - commit = "dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d"; - sha256 = "sha256-FH7lBQTruMzkBT2XQ+kgADmJA0AxJfaV/gvtoqfQ4a4="; - }) - ] ++ lib.optionals (versionRange "97" "99") [ - (githubPatch { - # [linux/wayland] Fixed terminate caused by binding to wrong version. (fixup) - commit = "a84b79daa8897b822336b8f348ef4daaae07af37"; - sha256 = "sha256-2x6/rGGzTC6lKLMkVyD9RNCTsMVrtRQyr/NjSpaj2is="; - }) ]; postPatch = '' @@ -226,9 +207,10 @@ let sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc + '' + lib.optionalString systemdSupport '' 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 @@ -242,7 +224,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}/bin/java" third_party/jdk/current/bin/ + ln -s "${pkgsBuildHost.jre8_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 @@ -288,7 +270,7 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; # Optional features: - use_gio = gnomeSupport || chromiumVersionAtLeast "99"; + use_gio = true; use_gnome_keyring = gnomeKeyringSupport; use_cups = cupsSupport; @@ -309,25 +291,8 @@ let } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; - } // optionalAttrs ungoogled { - chrome_pgo_phase = 0; - enable_hangout_services_extension = false; - enable_js_type_check = false; - enable_mdns = false; - enable_nacl_nonsfi = false; - enable_one_click_signin = false; - enable_reading_list = false; - enable_remoting = false; - enable_reporting = false; - enable_service_discovery = false; - exclude_unwind_tables = true; - google_api_key = ""; - google_default_client_id = ""; - google_default_client_secret = ""; - safe_browsing_mode = 0; - use_official_google_api_keys = false; - use_unofficial_version_number = false; - } // (extraAttrs.gnFlags or {})); + } // optionalAttrs ungoogled (importTOML ./ungoogled-flags.toml) + // (extraAttrs.gnFlags or {})); configurePhase = '' runHook preConfigure diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c4521c89caa6..e8d9a13f9ac7 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , gcc, nspr, nss, runCommand @@ -19,7 +19,7 @@ }: let - llvmPackages = llvmPackages_13; + llvmPackages = llvmPackages_14; stdenv = llvmPackages.stdenv; upstream-info = (lib.importJSON ./upstream-info.json).${channel}; @@ -157,8 +157,8 @@ let else browser; in stdenv.mkDerivation { - name = lib.optionalString ungoogled "ungoogled-" - + "chromium${suffix}-${version}"; + pname = lib.optionalString ungoogled "ungoogled-" + + "chromium${suffix}"; inherit version; nativeBuildInputs = [ @@ -182,8 +182,9 @@ in stdenv.mkDerivation { in with lib; '' mkdir -p "$out/bin" - eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ - --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} + makeWrapper "${browserBinary}" "$out/bin/chromium" \ + --add-flags ${escapeShellArg commandLineArgs} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ed -v -s "$out/bin/chromium" << EOF 2i @@ -206,8 +207,8 @@ in stdenv.mkDerivation { export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS - # Mainly for xdg-open but also other xdg-* tools: - export PATH="${xdg-utils}/bin\''${PATH:+:}\$PATH" + # Mainly for xdg-open but also other xdg-* tools (this is only a fallback; \$PATH is suffixed so that other implementations can be used): + export PATH="\$PATH\''${PATH:+:}${xdg-utils}/bin" . w diff --git a/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch b/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch deleted file mode 100644 index e63000fabc1c..000000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/ui/ozone/platform/wayland/host/surface_augmenter.cc b/ui/ozone/platform/wayland/host/surface_augmenter.cc -index d971d15e71426..6e5408398bcea 100644 ---- a/ui/ozone/platform/wayland/host/surface_augmenter.cc -+++ b/ui/ozone/platform/wayland/host/surface_augmenter.cc -@@ -13,7 +13,8 @@ - namespace ui { - - namespace { --constexpr uint32_t kMaxSurfaceAugmenterVersion = 1; -+constexpr uint32_t kMinVersion = 1; -+constexpr uint32_t kMaxVersion = 1; - } - - // static -@@ -27,11 +28,13 @@ void SurfaceAugmenter::Instantiate(WaylandConnection* connection, - uint32_t version) { - DCHECK_EQ(interface, kInterfaceName); - -- if (connection->surface_augmenter_) -+ if (connection->surface_augmenter_ || -+ !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) { - return; -+ } - -- auto augmenter = wl::Bind( -- registry, name, std::min(version, kMaxSurfaceAugmenterVersion)); -+ auto augmenter = wl::Bind(registry, name, -+ std::min(version, kMaxVersion)); - if (!augmenter) { - LOG(ERROR) << "Failed to bind surface_augmenter"; - return; diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml new file mode 100644 index 000000000000..f2bf29cda24b --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml @@ -0,0 +1,23 @@ +build_with_tflite_lib=false +chrome_pgo_phase=0 +clang_use_chrome_plugins=false +disable_fieldtrial_testing_config=true +enable_hangout_services_extension=false +enable_js_type_check=false +enable_mdns=false +enable_mse_mpeg2ts_stream_parser=true +enable_nacl=false +enable_one_click_signin=false +enable_reading_list=false +enable_remoting=false +enable_reporting=false +enable_service_discovery=false +enable_widevine=true +exclude_unwind_tables=true +google_api_key="" +google_default_client_id="" +google_default_client_secret="" +safe_browsing_mode=0 +treat_warnings_as_errors=false +use_official_google_api_keys=false +use_unofficial_version_number=false diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 3ea5dea50cd6..8341f2c6ee22 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -24,6 +24,7 @@ DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g' BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official' JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json' +UNGOOGLED_FLAGS_PATH = dirname(abspath(__file__)) + '/ungoogled-flags.toml' COMMIT_MESSAGE_SCRIPT = dirname(abspath(__file__)) + '/get-commit-message.py' @@ -108,6 +109,12 @@ def get_latest_ungoogled_chromium_build(): } +def get_ungoogled_chromium_gn_flags(revision): + """Returns ungoogled-chromium's GN build flags for the given revision.""" + gn_flags_url = f'https://raw.githubusercontent.com/Eloston/ungoogled-chromium/{revision}/flags.gn' + return urlopen(gn_flags_url).read().decode() + + def channel_name_to_attr_name(channel_name): """Maps a channel name to the corresponding main Nixpkgs attribute name.""" if channel_name == 'stable': @@ -208,6 +215,8 @@ with urlopen(HISTORY_URL) as resp: 'rev': build['ungoogled_tag'], 'sha256': nix_prefetch_git(ungoogled_repo_url, build['ungoogled_tag'])['sha256'] } + with open(UNGOOGLED_FLAGS_PATH, 'w') as out: + out.write(get_ungoogled_chromium_gn_flags(build['ungoogled_tag'])) channels[channel_name] = channel @@ -227,6 +236,8 @@ if len(sys.argv) == 2 and sys.argv[1] == '--commit': if channel_name == 'stable': body = subprocess.check_output([COMMIT_MESSAGE_SCRIPT, version_new]).decode('utf-8') commit_message += '\n\n' + body + elif channel_name == 'ungoogled-chromium': + subprocess.run(['git', 'add', UNGOOGLED_FLAGS_PATH], check=True) subprocess.run(['git', 'add', JSON_PATH], check=True) subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True) else: diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 981861d6a2fa..78377193eb35 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,63 +1,63 @@ { "stable": { - "version": "97.0.4692.99", - "sha256": "1fpc07zvashaqqalwn7wxnswxclrxvhjrxy1rzr6gcq5awhaw6y9", - "sha256bin64": "18afashha667rzcscq3frkp5ixa7nrirs7i3061njqi4z9ql0cs8", + "version": "100.0.4896.60", + "sha256": "1p7zggnhsz9gj3zil0nyas4ym5bd94vs0z6mdg7r1l0s0vrsaphf", + "sha256bin64": "07wavs9r6ilwx5rzyqvydcjskg6sml5b8m6mw7qzykvhs8bnvfh5", "deps": { "gn": { - "version": "2021-11-03", + "version": "2022-01-21", "url": "https://gn.googlesource.com/gn", - "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", - "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" + "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", + "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" } }, "chromedriver": { - "version": "97.0.4692.71", - "sha256_linux": "0lw74ycw8vh3qz4nxynnvrw8sngy3g0vcaana15y4b2ks73gcvci", - "sha256_darwin": "1zv1ndv1d7a29yvg0b242g8dw5f8s9vxhr454zd9vahn0ar4ksbs", - "sha256_darwin_aarch64": "0jzn75rrjw3y1bqg0ywfjcm2zn9dd2h3lswih51glvdrlcz3vw2a" + "version": "100.0.4896.20", + "sha256_linux": "1d3g43s5adn1vs7iv5ccp0f376qvnvf67mhid7kxkysnqv55bxdw", + "sha256_darwin": "129vw1ablb6xyr7j30zxkh7n835wi82ksd8c5m11mmdnrmrcdabv", + "sha256_darwin_aarch64": "0zgnisvdvcc726q22jn1cyfg41zz1af5l3fy3m81jlfhph2ibbra" } }, "beta": { - "version": "98.0.4758.66", - "sha256": "06hdd2cy6mdiiwbrn2jawmcidxbf46z9wyklkm3mmzbrj1xrh0gd", - "sha256bin64": "0r1lmgvvxb1h6p20gzp8qwdfs4czvqyg6bgp4wb2aax1n0448rbr", + "version": "100.0.4896.60", + "sha256": "1p7zggnhsz9gj3zil0nyas4ym5bd94vs0z6mdg7r1l0s0vrsaphf", + "sha256bin64": "059zrf3mm04iyzmgp594m3m7pw4458vym3wpawmdn94h5zi705i7", "deps": { "gn": { - "version": "2021-12-07", + "version": "2022-01-21", "url": "https://gn.googlesource.com/gn", - "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", - "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" + "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", + "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" } } }, "dev": { - "version": "99.0.4840.0", - "sha256": "0l1azyd7an8nw2gjnn313gn6sljvw6lbd9g59s7d59lpn2bmbc7j", - "sha256bin64": "145qjhdmi39aaw0a3sarlgi67rjhik1xbm62rw7ba0wgnrbvvrjb", + "version": "101.0.4951.7", + "sha256": "0xnvbiqi50hgky35qaivcyzfp05nnwfwqrd50dksqkzycl8avb4z", + "sha256bin64": "19my3zr9d3w2ypl9cm1xa15vhyv9add1f283alb9fmh2qwhl4scg", + "deps": { + "gn": { + "version": "2022-03-14", + "url": "https://gn.googlesource.com/gn", + "rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb", + "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3" + } + } + }, + "ungoogled-chromium": { + "version": "99.0.4844.84", + "sha256": "05bma8lsm5lad58mlfiv8bg0fw5k5mxh0v6g1ik7xp2bsd71iv10", + "sha256bin64": "0sdnsnp7hnpip91hwbz3hiw2727g0a3ydf55ldqv9bgik3vn1wln", "deps": { "gn": { "version": "2022-01-10", "url": "https://gn.googlesource.com/gn", "rev": "80a40b07305373617eba2d5878d353532af77da3", "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" - } - } - }, - "ungoogled-chromium": { - "version": "97.0.4692.99", - "sha256": "1fpc07zvashaqqalwn7wxnswxclrxvhjrxy1rzr6gcq5awhaw6y9", - "sha256bin64": "18afashha667rzcscq3frkp5ixa7nrirs7i3061njqi4z9ql0cs8", - "deps": { - "gn": { - "version": "2021-11-03", - "url": "https://gn.googlesource.com/gn", - "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", - "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" }, "ungoogled-patches": { - "rev": "97.0.4692.99-1", - "sha256": "1jgxpp3wl24hq39291mgmdwcxbarxg4rpa6il53k8z3rf6gd2s4i" + "rev": "99.0.4844.84-1", + "sha256": "1j02zcam09mdw7wg30r1mx27b8bw0s9dvk4qjl6vrhp24rbmscs7" } } } diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index f39ae2f16691..6b525fbca9f7 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -8,23 +8,15 @@ mkDerivation rec { pname = "falkon"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "KDE"; repo = "falkon"; rev = "v${version}"; - sha256 = "1w64slh9wpcfi4v7ds9wci1zvwh0dh787ndpi6hd4kmdgnswvsw7"; + sha256 = "sha256-esi9YWd1PtQpDBhI1NtWEjZIoMoNUpAF+kQad67mLzE="; }; - patches = [ - # fixes build with qt5 5.14 - (fetchpatch { - url = "https://github.com/KDE/falkon/commit/bbde5c6955c43bc744ed2c4024598495de908f2a.diff"; - sha256 = "0f7qcddvvdnij3di0acg7jwvwfwyd0xizlav4wccclbj8x7qp5ld"; - }) - ]; - preConfigure = '' export NONBLOCK_JS_DIALOGS=true export KDE_INTEGRATION=true diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 5a38d9d8d7a0..ab3cfb9ef52b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "96.0b3"; + version = "99.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ach/firefox-99.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "780a8e746a4a638ab9cfb69b1dca27135cdf64809883551c0e79e0409487660a"; + sha256 = "a540c52dbb973a85ee0f9fb116f7812e624d925dce77fe14a310f4bf5e6a0b58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/af/firefox-99.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "44b86759ab9a5bb675d9d05029cef6e0be17eecbe140ad1ce5d0fc554a8dcf36"; + sha256 = "0f15edf10fc6ccb9f8bfba5cd6bbe83ac11df1b01fe9d5a1888f9b83a20b6d49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/an/firefox-99.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "e4d73a06f2a918395c0428c4190cc080dd03a29a74f1677f297b6bd65ad488b3"; + sha256 = "769c936702fd344395e2fb949ddd2782f0e35096889c7c84027edfd9f08f5790"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ar/firefox-99.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "256f2b6d21cccddcaed24b511f71ca4bafdfc08ce989ad1eef45ab9bc009611f"; + sha256 = "401b84fb1ce243e657018b0f6c98acc7838c7abcb0ed93772d56b1082135b479"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ast/firefox-99.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "bba26f8b77d27c03a969e08d8974ec9f7a85e0237ca3acacc884f945a9b18832"; + sha256 = "2876d7dc456ead1a0efd867e3f683ea432589049ad85adf7ca5e7824f9dcfe66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/az/firefox-99.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "da1c22e87189c991ce27929abe2172ccce6f4a25c44e836ee865550e259e6218"; + sha256 = "c83d7bf96d74241657ae84dcd0b63328dc521cdb4be639577473305bc0d024b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/be/firefox-99.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "183bce430aa7ed98b72eb4492c5a9cf76a2e9961069140f272e438a5d20debc3"; + sha256 = "35942f40d0604f382a383a9f737d59bdd6141ec6066d7da54422fe02928c46f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/bg/firefox-99.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "145c856566f9063ba861ade8220071623df793b279bf2a3821742f9e0023af74"; + sha256 = "f55d30618fd8eccfba51fc82fbcf37fa3eed550b168ed603a14a69511ee4955c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/bn/firefox-99.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "dce9827d70a5a7d182316d7286bc6cb4b5442d65bb5c3573d04b235b4a18616a"; + sha256 = "462741a2dd135d7f0cbe12ca93bba398a621613af5611f1cae364a281863388f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/br/firefox-99.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "0df80c30b78cde55015fab74763c7606f75eff72804166b5095eb321b51fa4da"; + sha256 = "2f08c5b70e49b9151757a80821011cc6ac8bb9d68b282aeb33b9928bec2609f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/bs/firefox-99.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "1df386c5001327bea3f5675acd52946dab3d0d8ff0bbcf65f8b291ac26a565d0"; + sha256 = "08802aa569f3e4c9307dbdf0216cc96e851ee88d663d52f22559bae99df3c551"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ca-valencia/firefox-99.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c271c6d047c4dee3ea806caec31e2719acaa55aaa608ad86283de45e22cd05f5"; + sha256 = "49fc70e96542fb26e536570395f6f8302e4271306f0298739c537a7d03af3585"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ca/firefox-99.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "30a2deb4dd1bb82406731f71001950d01ffbb9aa7a24f333e8f322fb23032f6a"; + sha256 = "c1a1ae01536b9b885ee66033f8d828ef63cf3211fa3ec52ad8cd8c688e8bb1cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/cak/firefox-99.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "cbf31b80937ae4a425f4d5507a7f654958e7e93a6c12683c08982a3d14d2ba9a"; + sha256 = "536ebd5224b5a53b4660d9113172fcd73862307da6c41f007a2cdb71b35a6dc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/cs/firefox-99.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "72c098b2512a40ce3437f7d329b46e648e4fd6e2d2b7ecdd1e3478b090cd50fc"; + sha256 = "3d25003533ce79e9a32e4dccb92235994b076dce620a73b4f3efac2c04887596"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/cy/firefox-99.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0c05717640e8ff2e0fb52a510dcf3a35db34b911cbc85d2721e7e7e6307f0083"; + sha256 = "04e5c7f3195ee0a55b3c2c27cf030a1cebeabfcb833e77a2b099916bfac07b8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/da/firefox-99.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c29f815b19cc03e7d628fef8c86e4f06862e268b760e230cc7bdd04c2618a852"; + sha256 = "707a9d7991c925989af516681542ba7cf1f4cabeaa3eea7d8be44a76184ae440"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/de/firefox-99.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6968c6d591a3b43e169dca16628eb4675b8803b90aaa8f605ae35f2115a75d3e"; + sha256 = "e2601df88ee67fc7d4d0d675f53dfb96f34a2c2e3dffdf1ee811561e3ddfa7a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/dsb/firefox-99.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "47a8cac44c7d813f23ce263e698dad6dad44181c570055973879e57beeb82ee1"; + sha256 = "479ec9ec8fc128dc971976611b31d12ea58b1a3119c9019c8fcf4e224486b8dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/el/firefox-99.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "476fcbf047743ea61d6e68d37a1bf1203d239667faf98abf5192f15e1b13b927"; + sha256 = "fc0075428e18c918bbeb1b25e367e7bf0a4aacc7a27c6acd382f326dfefa65d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/en-CA/firefox-99.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "26abc7c1e8aeef3e4898e1dcd120651dd30400a6da9a1c2af5ff02b1b406573d"; + sha256 = "1f1f10900d3c3ecfc1ec55e06d38bbe89462abc25bf2aa97bad2a785970b52fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/en-GB/firefox-99.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "66b299656f71875f59287c8da5a3c2b0bca53fb69ca9b0f7a0402ad1eeb1aa87"; + sha256 = "36ec8955482e37178f6b333681ae3e998a65701b90541ed6f98b452d04515b27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/en-US/firefox-99.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "37c37849f3d7125da14e3a71c8a9fa522b8756fea7e3e3f8a5792ef7c3285466"; + sha256 = "e316f005fbefcec2c55d9dd2452392c82155b080abb51d36eddcccfead742ca8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/eo/firefox-99.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "cd3ea6fbcbc947acbe1767be78a14fdce4c03b0b44d53e3670a0ffc5ba14dc68"; + sha256 = "0fab5a6ed664f3be18c9aa81c51015b75b3cb9a8bed5bae3322eca57d76fa0b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/es-AR/firefox-99.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "f661d48a11f66fc326e86126aa5c0de37311042a454719cc609a1c7ff102e423"; + sha256 = "e24a821243c0f2ba758c00334ee40900b3d8eec2d137db774512a1b5907dd0e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/es-CL/firefox-99.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "056f25729222d95316034f0365679ff449a58e4d77624687cf9417e10b52085f"; + sha256 = "5ba1376f6c47b8afb320f7aa36ae1bc6a6dd45350a843f641889fa0f9bd6d4f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/es-ES/firefox-99.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "64da785531a3e2f4b8179f3e9b551723bcce4c1210e184a03c98ec3e2ff1e220"; + sha256 = "73d3f8a7ad44d175fc73993ad1ddf2115cda48d33422493e80f5f5fcb0805f13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/es-MX/firefox-99.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "34af4d1a91b7e09e80d2f89730851c508521d6518b0aa2d3ff1924a34f7efba6"; + sha256 = "cd3267b82d6a02a1f2797069373e95726262c603902a655fb138699b5546e34b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/et/firefox-99.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a1b50e3ba15ae806ffd89ef22e12ee85ceda1eb17f458fb7e8abd6c4355a75d3"; + sha256 = "07f95fc1bef61d7c1f8b85ae9e774cab7c79c8d8e2d1d82fe80ea6b8f33e7a6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/eu/firefox-99.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "90ec59ce7774bade28052f4f8b5861476e3fb52878e48c8909d250fb6b6e17ad"; + sha256 = "da979dfebd9e18d524e20f05c04dcb9abf42eced67d0d59b2e2b8fd0f2860d4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/fa/firefox-99.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "3f09ea9568982a451798dece61a8f19131c4c88e98e2c03b1808503051873e73"; + sha256 = "7afddd9ca0568fc844e68f67325ceb2f5a4bf8ed35095076b60e98e334001575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ff/firefox-99.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "a483b0aaf523fe404a6b3ec07611812a5160cf8a5c05b0fee1afa6838e1949a6"; + sha256 = "291a80a59157da3eee5f8f8c4c4647713fa639e940200dee7a6f2ff6d44dc55a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/fi/firefox-99.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "12e17583c8932cfa6622ff68490e29d9e09d6862e8443ee1cd1d72f21f6516a7"; + sha256 = "b5d42423703cbf205fab56d64125d5d68c5466553dbdf47d05e29c98a1bf4c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/fr/firefox-99.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ac3809a3344ac239183a68551eebe5689c53c11c0a399ff4a94452a35ad86c81"; + sha256 = "95ac9b6b2be9e5996dd3ed3a84c62bf1f29715063c0af3475c02fe5614436800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/fy-NL/firefox-99.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "9385c2bed2d3aa9b65651f396d9a2c6f8762dc4295319757f949fc9f04a6c717"; + sha256 = "d4b0eaa62170cf651d92b3feb361632a2a202b971661e1111cd343c54abfe98c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ga-IE/firefox-99.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "f65df6f4d93a39b5bbb1c4c7827eb094a632dff7255b78affc7cc9794a28d3fa"; + sha256 = "01e383677c6fe5d3c73b29339d62b8cc5e8fa6120a6c1f31509eac9020eb7a42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/gd/firefox-99.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3cbbd914559e96205e665ad46cd9ba193428cd8d83df90c4fd4849cc11db13be"; + sha256 = "ba0c05f8ccb21224781824178b41794f04585dc22c60bb4b3db3a230be304eaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/gl/firefox-99.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "7b27f83190cdb84d2d9fca9bcb37bd1128086adfe772e676141fd9960c0de872"; + sha256 = "540cf483ba69cb35eb0878d07af059f023e453359962217fa4f91ed6e9ceeb8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/gn/firefox-99.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "0194000216bb517390d301166c37228e2128f3b15280cf21629fe13de5f536da"; + sha256 = "222de0e732642bb0ab30687312bbd2fe83b0ca42497a1e8aab2a56658b1f3fa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/gu-IN/firefox-99.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "24c92df984f7eff4f294e27324420b0350c4069acade0a304a3e433ea11fadd7"; + sha256 = "c2d5751f5b5d3c419c4a5bc61ecf900638f2f4f93e44dfe4b888c467e17ae368"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/he/firefox-99.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5a006adead9f8e647eaebbef8ca56a47116ad2fd1c308c4986aa81bf7618f815"; + sha256 = "00e4b80dbe25ff5daee56b2eeca471b5bda4186b50a676b72ee3b6dd85f52935"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/hi-IN/firefox-99.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e8d87a8ad9033793e0c25c8954ddc4f405274468a572f46af494847481bedf11"; + sha256 = "cc762a99b9443f45c326971dd3f0fbe10c46abc4ab54a31916d8f344942fe645"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/hr/firefox-99.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "47964a5caec7f8ef0546ecba49e0d995dc9f67947fbcaafaa02789bdaa75e6c2"; + sha256 = "6f935f65ef177e330b53c35818d14cdc135436f79497b6e59e748365a2942767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/hsb/firefox-99.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "67f89985f60d21b04a9a20449d38d673c45e74e82a1d5762d82713c02d3e63b2"; + sha256 = "4ec5aaf93f6bebd218817ee6552b352822c016209e5b528bb96f65fc1b89ec69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/hu/firefox-99.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2716ce5bcfaac25456a144eeff6e6b173600d08016574812abbb315a4d001ca1"; + sha256 = "5042f7330efadd917d38f9e5415477f507258ba8462e5600ab1ab15755707db2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/hy-AM/firefox-99.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c028cfa29f0ea60f284d749dc9818772c074efe3d295590a34a3d6a4548a8f7f"; + sha256 = "479d9f677b0dc81f9286e4b9b8c89cc3a34de3c51d1e2088c7463adcb8cc7d35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ia/firefox-99.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5bd24eff8a4d95f27ff8df44d014d007c943a54fd1b5689435a1ce14b7f61375"; + sha256 = "42a882486fdd29a89220c3a2604873d338b9187d5545fac9da59929a4f865deb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/id/firefox-99.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0483ce90f8702febedb73674d3cc23348a4e7ef62445084430636f0c4c1fb287"; + sha256 = "483885d63782b4dc2f6444438f5f4c4f291600a5ca669b2630c6ee5fccdd4382"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/is/firefox-99.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d7b41cb2cd6ae22547d2c4d04dcadd5c4c05a4abf2b51d495baa749d4a2158b6"; + sha256 = "23c62d13ce11f8c5497ab32a80e0f6b49e56f711c9e42673baf37022e3feb364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/it/firefox-99.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f5a5a825787fef1f8c4f2a0f0c013e8d39bf1a08c4523d79069c5fb335c0e5a0"; + sha256 = "7a3006a99a20a54ad104389c7203bfd6c24b0aa53c02ca4d14a24e34503cf6a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ja/firefox-99.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "64d8c649de837049c2f0f73736a74f141de5bf426e11d19f4e0a5553cba6412e"; + sha256 = "05ca3af44e2d723edd2777c91714962459b889122dd669d72c91d83ecefded54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ka/firefox-99.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "01ba137970e9b538bc09195dc3da66927b56fab6204bcab60a85e03055c80a0d"; + sha256 = "9979bd999157dcbca6b70ca967401b61c574ed3a6d2dd62d436692dbd26fa0b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/kab/firefox-99.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "3a6b4e12f88226b0f19dc066a0f11cadf5a47d87f38540cbcc9f34e82c54290e"; + sha256 = "e2e5c9220501b8c481cc2c1a159b49b5adc243bdaad715afd7cf32aae89237c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/kk/firefox-99.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ecb9e0e63eb778892ce15d5df03e50bca8948a6e8dc3369b030cb716b172789a"; + sha256 = "67a0794f7ff2206955d47a2af2f9eeeb0b308526348e86845ec9fcaaaeff9ede"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/km/firefox-99.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "31968f898a8916705c67e71bc5010cea11bb43e544f27febad644a624b32c773"; + sha256 = "79de967bb49baaf50633e11c03487b9f696eb924a6c2cb4ca776849c03709f71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/kn/firefox-99.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "105f4f83a1e0ed15e568a218d49fe5108462db67cda228e088cde3679dd48e04"; + sha256 = "acf8833a43bbca67be2f7c883e8c9fd3b65b5e43f61e803a5ac188ca2724273a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ko/firefox-99.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "37932385223cebf7a3f59c362c2abfca321bfab0fd6e5e3da6daa0ec76257784"; + sha256 = "669aeb1fc430810d5347cb85df3e1f53240573c3b37c621c5ab9f384b2883f31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/lij/firefox-99.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "ae5c8fbc88f15edf60fa1830ca19d32ca3277194c0669717360659da5ad07b68"; + sha256 = "1c29ba78ad9834ce598c31fc40999861556d91e3a43a3a39b8eef08eac59a8f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/lt/firefox-99.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "104cdce0099e51d71d3ae3b8fd4ec40a256d893450c8fc905035480be5d675d9"; + sha256 = "caf5e72d891e001b5874cd9eb39359535d0e7a3e9e806bdf6c9bbc2ad5cb1543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/lv/firefox-99.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "d2e0055207f62681e4cc9c11ae1cd986179af1581af0252604762eed6637e726"; + sha256 = "48e2e31c5fe889be4ff3cbdf1bab671537ca66a55c59f63ae9f09a31f4222c9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/mk/firefox-99.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "8b03198b1d6424a1cd024fe17ce62a99c8b1b8c41798b0e229f802752a3b4551"; + sha256 = "cb26ff5fd9f9b4dbda62b173459173a5d0d39fd4caada1877a1f9750080f239a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/mr/firefox-99.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "5f5b132f3292cc0938e28f2c483a03b8ec76a95a306d3a928f2a2bde03f3af76"; + sha256 = "d8c95476b496d42e876080d2809fb349442f159afd385bdaa0444ae776f2bfb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ms/firefox-99.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9ba3cbfd2061d15356ebee861bad6d78be0cb5f4ea0ad9a13170ecdad67981a7"; + sha256 = "3be2c35dc0d5cb98b616eb573d436326238ea0f03b6dbb5ec3c6e9f0b6d3f677"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/my/firefox-99.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "700d224adc519fad23798afe919538ae54d53cfad4a74974ecabdf254afcffba"; + sha256 = "f24161a028dd225cc9e57636544fdf2fece02129e65388bf63bee752b23be712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/nb-NO/firefox-99.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "a75fa004af0cef3548238264f7997ad60bcb46d415e3e91ff6e9b16bb86a4a9a"; + sha256 = "1699b0cdfd96cef9193bbee9a461b3867783d93ca98974efec4e998ecd430847"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ne-NP/firefox-99.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "614d82dbc762f0ef2f565d95e5bff8d4212f8fa8174f294877e0ce155d75fb09"; + sha256 = "c0d6ed8fa1ad7853adb10c83d6422fe2a41254522655d52e1ac4fbe88412996f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/nl/firefox-99.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a6b8f0c827443f32c25c478aa11981d714a57fbf752891c2f018fa9542820e6a"; + sha256 = "cfc70746d63c465066e924ac3740e5c0ab7d19dfade9d32698e9c3903dfb8bfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/nn-NO/firefox-99.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "6227882b432684768b739058e7f1aa15e92157348e19b36053e70255172f0b04"; + sha256 = "700145c367d4177fabcbb183653498d4c3c0d23fa1686456f564912a62b1550c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/oc/firefox-99.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "3b2590ff70bf7cf8998dda933506c86515ebdb81b031fb15f925b02d5cf88f04"; + sha256 = "a657ab1229f0f670d113efe6ee7f008544682f60ce936edbb4d68a2a81b60a8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/pa-IN/firefox-99.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "09bbea80b952af6eb5358b2afbc785afbf04ee44a27b38f2f72dc6fa49417086"; + sha256 = "a3641a38f87342e9511baf1866226da4875160c30b573893fa85eba644c5195a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/pl/firefox-99.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "f0ef3e5e72fcf72ff49a5b631bb9216363fb01440da41d939e4b653e84527694"; + sha256 = "045ebe8f05147249b6516b412b1d1fbd9208f894e503000228a0e630c63f444f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/pt-BR/firefox-99.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "dfe183f6a40d50e3871f632ec79f397e302fd130c43af2c26c6b24acc114c4fb"; + sha256 = "23c50ecf3cf14217fa8c865f7ab1d7321c6815ff4c68c10630fef9d72904883e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/pt-PT/firefox-99.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c12fb2fb918a38a39655f3350676f290151e2fd6e44acff88379f3c4752743cd"; + sha256 = "17c937a8afa36f4260ce6d3ea79a07b9119ba12b1710c43d27ff05538e6971a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/rm/firefox-99.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "14d1ad150edaa100c535c9b007fccd3bbfc0afe09d3035ada361c202ab31cbf8"; + sha256 = "836195c4a54dd90d7a32c031114a56fa561d1c2e3b8f930227871e6325dc6262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ro/firefox-99.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "cd99ae37b4e8552cae7911c86f430900d8d21c96264dc2940c335cc050b8a62f"; + sha256 = "6c0c29c8b91013897b03866e242f9dd6a67c44440f1405c4b356dbb7a935a09a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ru/firefox-99.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0cf0c23c90f24ef417b460f57b566b87e06ad11df178ed3e7006a7a7a8acf7f7"; + sha256 = "73e15ebb5ceefe5d76ec3563378cb7c7704fb821fcf5b583fb709995a0efcb7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/sco/firefox-99.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "58bc7ea18c851d5a88c047bd41b836e9beab1f04289d0fc33e0b1d9fd7e55b3f"; + sha256 = "2f8ba8588f33fc783976617d662a29acbf41a78851dd781dfc26d7e0ac4d97e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/si/firefox-99.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "13914c46edc3e5da87c394468cfe83f0811359b2d30d6572b1c3c9726af45c3b"; + sha256 = "5fa2169531665633c3481c177490110cb6a9bd959172f0ae94b2e5a6475a1bd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/sk/firefox-99.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "818fd12a70a50061c507c8e06d7118ea7d1062ac905f8b70d31010710df642f3"; + sha256 = "abeb0a6de0522a4e2aa47c8ce02b8c478a21165153fc3c6edda8642777cba266"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/sl/firefox-99.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "1d70241ed0cc861c79165a770a73b580496fbbbb6a2530701c02073c9995fc4f"; + sha256 = "c0019a21096573635aae9f2b97c50557dc011b670f05f1fcf0779732e2f7dc92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/son/firefox-99.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "3b906867dc5a0ecf4dfb0e034c8e97a3fc39e5d0531ea483c8a408b32df860bc"; + sha256 = "ccd58c05db49f4e5295794c73248bb267bb87173aa7e0dcaa63cbe6593e9fc85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/sq/firefox-99.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b23189c437535a4fad78bab37b81d95e3fe5774a8c3c4c6bd6d77d7f785d2e30"; + sha256 = "5ff7791b6d9ff215e8e466b27902716a9de6018ee9ef0efd639579847178760f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/sr/firefox-99.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "08dde33689c92e2c23971b0aeec581ba420b502a118c45799e35d52087113055"; + sha256 = "709df8593b8257191313b456288de9952a9e6308a3663a21e40733b4eb3b7353"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/sv-SE/firefox-99.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3a099e8247e4f15879233624489f4df971493bde2019f47a18da3523e0ba142c"; + sha256 = "ff25b85789453457aa9c035395bd5588c252804d5801d8e111a24e64d69e4d1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/szl/firefox-99.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "94497a259e974c3c13bf2a74a4a91180710b57402fa47bdead77cece66696b32"; + sha256 = "1da12d4d2046e953010fd5d064dfe468fd97e65f5003c8d746cb70479bd66187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ta/firefox-99.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "006458ee81bd21b2cd3acd5b7893e90cc97233a3507b2247355b183164771502"; + sha256 = "494d240702bbcb9124d56c835ac4e3642e37bd873a5209ba9b99bcb338f40fda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/te/firefox-99.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a1173235bd09193a5fb6081db6af934ac5cea619bcf612c244423cdfaef75861"; + sha256 = "acebd79510550d690adb1444e906dc82d9f38e86bd5a93e5e72f711d2d3e49f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/th/firefox-99.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "ce6a04ad52b0ab49fd4db6724fe43c1f054fec37fe2434536985642fba1999db"; + sha256 = "b6f90c5a89a8116c1049da7a3a34fb6d82114b261f978f0a2237dd32a10462bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/tl/firefox-99.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "10f31d9636f9124aefd213ecb06da9be7ddfe70e2413ce66a1c1f84407f33319"; + sha256 = "961afa78a723382ef7e4cb49cd0f32cca39dd921dbe8168a8e835bbb244ff4a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/tr/firefox-99.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c83e8170ef55f271fb9c933505cf66d4e42eb8973d6e1751c903ecda3bc92cd6"; + sha256 = "15efd87bb2654ebd7921b72e0653639c4a3da51af7bee06b284d9abd0e395c1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/trs/firefox-99.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "484905693e9e952a56627561f10ab429e7ddd2df5b534252f60aebe52ed41b95"; + sha256 = "78bffcf079bb4e9518fb7ae6deddf395837c16e5a942b66fdeef67c9137d950b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/uk/firefox-99.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e17d15802c8d94770c6368aac7d46585483353053968c66f40f326dac00587d0"; + sha256 = "08995e6b88aaa2af8dab0a95d27312f5e97df3ad7e1a6f0096b0803d835ef6c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/ur/firefox-99.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "e03b1c472787bf1ccf33568435b7873a4d6e8f43a0b82a01751995e8ccebda9d"; + sha256 = "8530f5bcb6bdcc1f5a3127d0ab6c94f19e4a28df2a6c4291c821aaf9c85f379a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/uz/firefox-99.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1952bac0df8fb98273d0a4310f3141e928e6718eb1a91baed6d692088f041171"; + sha256 = "67c7aa4e6095f8073cb94339f63aef2eedf51e096985ca175e983bbca4089498"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/vi/firefox-99.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4d3a70f4cff2d11dccfeabe15c30ed99b74bf5058ad8f8c795d9bfd2db1dc11c"; + sha256 = "14ee8e4ab854e5443f537fa05ca83befc679c5c78db4323c54dc85ed58702435"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/xh/firefox-99.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "dd1c33d8a1769f2d4efa39eeb248a7cb6e2993f4b3bee38884fd997d7f20e026"; + sha256 = "ff4c8b2e0bc0a5231ba19bf058baaa7b455b2d8469f56ec97283d26539405641"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/zh-CN/firefox-99.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "623926088fa86ff736832cb35044d7d134ad1f4ff31666ba7dcbc31619c3a07d"; + sha256 = "0a9228bb1a0629351a62636db29ce428bfb1ed704222b66d1dd369e6fdb3d503"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-x86_64/zh-TW/firefox-99.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "6276f0e417d45cad209e0f57ac0276f52854f5172f7829684e4c8a49c0e78fde"; + sha256 = "42531087bef983024116ee5eb4d42197ddf6252c798944e7674648b76fdf57b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ach/firefox-99.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "0412368189b73bf54d5679c22271ca82f47c10ca1288431fdd16a42d51cbfb21"; + sha256 = "15488bccadd886bea058313e062b811120f42978ab5d9f7ed05ccef88026bdf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/af/firefox-99.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "67060ebdf9d7ce14c45db9edd588f99fe0485971674f791691766127a656575e"; + sha256 = "7a8a204badfb379007c116d4e7476111d19e72928ae3ed8557b1a7de7535d4d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/an/firefox-99.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "2c79a9307bfee1727a19cd212fed10ba02d31ef49bd68a51cf0ca0a7faccf2ea"; + sha256 = "4fdcb8886f89c586b1f58eee2300276536bc06d024aa9864a447235e74f5e31c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ar/firefox-99.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a6ce4fdcb3716e2f70fb83502fa9e9e90489ac58d26a25627eae7b8402a0562f"; + sha256 = "dc621abab4c6e678e8910569b21fbb01c4ca54e0ca80b0585c5ae2124f199e8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ast/firefox-99.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "21e4519d0403bf3e158eefe6c79d8283f2cc1e0875d91acdb995c0e83c56a9a9"; + sha256 = "afbe9810b9f326ee8b561acff2e2cb809793177daf00bd467bbfae245648fc56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/az/firefox-99.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0c1eaca5b928c2a1cc5a60a2dbbd624280ed2b55f10446bc886158e95af39199"; + sha256 = "806a98e46682d180348f772de1aacad415948e77845d00087d4717c40a4814cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/be/firefox-99.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e7716acc8417dbee838710d3efe670e081712ed3facb26bfa43864a574463ff0"; + sha256 = "ecaeb8a69b0c1a8330748e9db299bab7920c3f7f0e3825a35cc0ac6e06ee35a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/bg/firefox-99.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a90e61e0b5a31ffb7cebe747e8a6512e68baba210f234913af1ab8e90c79206c"; + sha256 = "cf499eb69e98f38eb211c1c962ea81a8617bf169b4e6309fe900f82ce38b8c45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/bn/firefox-99.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "e75ccfcac893ac7d54d8cf849044385ed0749de77dd53be7a1b1686949a4699d"; + sha256 = "40d828000019191f9a5f45ac49eae01f66b3251326cdffdc395089bec2396f66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/br/firefox-99.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "9c2286f7cf0d5052e44ac9aacf139e2c8abe9d212407960663819a8aa8436bd4"; + sha256 = "8ea216bc32179311769ec3eb9e8fa25aac44f75502a9f6d9b20c3ac0c2f6c336"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/bs/firefox-99.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "ceb98c5fb103e80488f8821027144b0d7124d0f76d360b6139308763a1ca33c4"; + sha256 = "d85c1085e8dd29f69ee7a41bebcbc6ef85118423e1684026a47e71b2072d74b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ca-valencia/firefox-99.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "f648e363da8ec8caa13ccfcc4d586efe0ac4e0b0d3574d295c95ac81dda937e0"; + sha256 = "ef80441301799de2d0043eaac8537a4e994e232666a315db4acfb3cbdfdd70d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ca/firefox-99.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "06b61c45238b90f8bb838193fb5035dc63c48fba416f16b7ab9463597bb92ab2"; + sha256 = "f5888c5c06b29afc8314f7c4bd3201c511cd8fa07322f990d7f58978e5a9d31f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/cak/firefox-99.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ae0ce800b1455aa4c607123ead63edf228a55f4bdac14c267746cbb640f60418"; + sha256 = "4ad994ecb37604cf9caa8035750325853fd9a87072439e17b2bd0cb4b6066634"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/cs/firefox-99.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1d7f47bdc98efaeda62dc2f3d1d16949a8cf3de96dcf87fdc30015ac7fdbbee5"; + sha256 = "688096996df92cc3d070c43ceea6abebc8dec53d458fb3bcecda0a63bb048269"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/cy/firefox-99.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4a24c3368e2f88f75f81af2e17050e41160d99b27720517cc34a7772533ddcc6"; + sha256 = "c10ab338b8785a0937d6ace161c36f3c05a8016d5b3d7051155eb412985c71cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/da/firefox-99.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5282d6c566361c74d5fb8c8d0f992ba5e929f2183b3abb9d479d7f1d53470dbc"; + sha256 = "04a25829cd6f56b5d05c0ccd2d26fd1e28838902388b8dd1fa2472eb84770360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/de/firefox-99.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f88988016fc2a8fa5543822d6fb1ad84c57f8f0d8ed2bafcc63552efb2361085"; + sha256 = "ee5530c4477d8a0df77f4fec8112ce1f606aee109e97cbd37aca6ddf25c4f52c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/dsb/firefox-99.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "252a9f2b5b99100abcf4ccaaad9982d48ebf903a7761d36e2aef766985fc0ec6"; + sha256 = "0f85121b622f28c84bf76666dac0282528a1d380506f03ddd0944de7f2b07afd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/el/firefox-99.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8e67fef2d4e2cf87a2961c7deebd244a1dfc7863e8474510aa196d54e199b4bb"; + sha256 = "99bdc3c28894fa8141e5e1cf9585717b91686ab0082a57b4d7aa43e8a6394505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/en-CA/firefox-99.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a687d4abfeece55bdc35bb000a802ac6a67bad8af6cdcf88802b7d42c486789a"; + sha256 = "5facba35ff29bee9609c94df4672df4375b7d20ea424b1b64e911bdeba5db26e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/en-GB/firefox-99.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "27819a8e87dbce94ca4bb2b3465153c6ab974c52bb81b2517fc685b2089548f2"; + sha256 = "e2ffe099d47813c705422758e78ddccc97fe99673379b2a6115d9e298df32074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/en-US/firefox-99.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "21cb440725cf0378021b4a6a858fa3d344b39292a61e4a774d065e9e41668e24"; + sha256 = "edd09800502881bb1a3e49042c0eb1c0618bf2a0507a38dca9dc4e3fb391dc97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/eo/firefox-99.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "ed0bb4aef9a5ff6790bc36f3ec45bf140ff23343a36716bc59fbdf4cb31c0976"; + sha256 = "678f340edfc6cfc8ca9b88032856119c0474f6944e8d67778e098100154f9a9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/es-AR/firefox-99.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "436ae41521b50068bb5fc9768936c4a4b77bb0a37f48ddb84cf8946a4a7ea76b"; + sha256 = "2d2fc35fae3617bfa1ea2ac466211b64ce58b13fdcda8f301ad31f13f90d968b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/es-CL/firefox-99.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "dc354dba3016dbe13ce744fcf654b292254c8fc0f53e55218952c6fbb961fcaa"; + sha256 = "df84c0a9ca7a896b02d83d13ffb238e90cf69926feb3c8e0d6edfca842f8defc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/es-ES/firefox-99.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "87bdfeab9856f13736ead5c3157d05a5d0b73c27a2ad0d7537bb63d994cf9703"; + sha256 = "1f87c85a46b57f99ae9bf98256fd115a15e1a86a4c9860cd3faa3c9bcc424806"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/es-MX/firefox-99.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6dd1f7fcf13e9c651d3359eadb1b8b2c13aca121e294ee5856f663a712438ebb"; + sha256 = "eb865eff70bd7042cd5e54e2251b9111b18d484fe1dea4d4ba57e7dc9ea2a5db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/et/firefox-99.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "fa5e600d2cddd4c93596baa0bce310cdfee9eef12df808968972382bee32f57e"; + sha256 = "beb51d1ea549633f09feaf220e96c3b0506c3b38baaa0772079b0f7efad2b281"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/eu/firefox-99.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1b277fc9646ea8d060c1bb554ca04e42b0099c70a44e697990ac4289712eb12d"; + sha256 = "d7da5f728c7858e8773ceff7e30ca28f238af7aa618711de1286100512fa2378"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/fa/firefox-99.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "370329076e609bcccdda5f472b334cb8dfe3df0e8eb696d22aadaa44f8b0b539"; + sha256 = "606190d0434108a4f8c2bf87629ca119339211856ec9fda619a0bc6c2bfc620c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ff/firefox-99.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "9b9e685fc94652195b00b5a959e48d81142b7589e0ac9d163c39f07cecadf27d"; + sha256 = "2b3a7038abaa4ba5ffbdc48eba4e6cd2c03bdf438f8ea9b70f15c1968bb59b80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/fi/firefox-99.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "f4b851f9a39fcdfea9034edf0f4930632da04d9a3b949c65b682e30dac63cb45"; + sha256 = "a2025ddf884826afea3a16a87716398658bf55fb5ac5b647331f4f25166555ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/fr/firefox-99.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e72943c2f034282b73aa136b272dc7e7e9d2bdda5b2c2db045029f05a0e8b14a"; + sha256 = "31adba6a0615ff23388686959327ee0e68812c4341bcf92878fb58a7c01712fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/fy-NL/firefox-99.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e2451341887d6dc51f3aee8c8b9a7dc65277e3cc9df9e2fafacdf67da838e48a"; + sha256 = "8f691e303e2d1fe5e7548184d1186f4d4a811b65cbbe6e839243a12ecef8eced"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ga-IE/firefox-99.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "01a03a21f479475d224fa7559a5b4e98bf978f61f4e472a58b1d1d272cf5fb24"; + sha256 = "e8a4903ceb272389a7e1461693a7e6727990432ba4a6d5c98898af5475e6d164"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/gd/firefox-99.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b64c925beb57420c5c76c4c4ac78282beabe4a6ad7fee19bd6bd4a9af2153422"; + sha256 = "bf6f72c6a2ecf977dc2b14be911c13f59951dea4a4d6c40cd16afd38ffc63553"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/gl/firefox-99.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "250ac76432b7312bc1173ee34a32d0e658c0ea658664eb296b7c5dc2c1fb6ca2"; + sha256 = "af31f670691de33b3943d5a1e9f12b9b64fe53d25ef45eb44cdc44430208c201"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/gn/firefox-99.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "bc3a716efd7cdb0538714ba3469a5303a9496b0b1f81d43a41b55434c047c991"; + sha256 = "f1a554806a9f51f8c4892eb23c65aa53f96390ca7e5e032f2c96cb26f9deb077"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/gu-IN/firefox-99.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "c6d2e017c5269064a5716d54f5df9f2e2dfe621f9f24e7d2a9dd3bfd6b47983e"; + sha256 = "2686a4fea05aee55741ef0333c916d4be8c5573f6e7e80b587a8d2bce3c2dacc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/he/firefox-99.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "0f3e2947b7e03ab0197af6817774a7e0bb11fd5dcf13df23ad3cb2899da49cba"; + sha256 = "f4c18f2cc00f93636db310f9d9279d43bea6ef193aa693c7761ff1066e9b46fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/hi-IN/firefox-99.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "161d898a2d74fbb709fb3d19c7444c9892e035c2876f66384c920ae3f76e21f0"; + sha256 = "8a2646bcd741965d8a6835ca8d38dfbe66b607c87d9cd3b32b861dabc5e7b916"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/hr/firefox-99.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "8bf24778507063352156caa82fdbaadfde5c840f2637196d87cd314ee89a3833"; + sha256 = "46b59ab47cc8fb194c6f5f20a1ccc2f2fb963f2c3944e91aeabdb829c1e3d483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/hsb/firefox-99.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "77f1a913c4e2973593edf6982eaa767185ba4b8ae91c16b967e8f3c7e82d72df"; + sha256 = "f4bac6b25259c55d7892477dfe7bde36d09ee85399096eebfcb3a0c5bba54d1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/hu/firefox-99.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "f4ae877d906e7427703df3f219c0c95abffdb995328a80de3b069cbc5eba4a42"; + sha256 = "d14bc01ca1936e05f9f58a6516f1af98029d71e41f6cac7aeb6055c3a25455b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/hy-AM/firefox-99.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "0d3371fe5359ec1d23dc58e00151ee81838c18a8e9fb665d48c3276ffa34809d"; + sha256 = "90f4b0aa50a353109ce313543abee0606c4155a2610105ef9537319e3bf9f137"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ia/firefox-99.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "7194d571e3cd92afbb8e19c5ecfe15e0c0ed4af28961008efeaf5e475ed8c1a9"; + sha256 = "384c3a0db8fe5448c17815d5ecab4e18ab25ec4ae75319b4b0075741d285fc4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/id/firefox-99.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "79a5a4d97a106dafb9ff6ede0e853dbbf24aafbc3f654f5b8244ba2a09ac6ff9"; + sha256 = "c8067e2bbe42bc9b639098e463f69c53475d949ce883dc2f108a80d62424c0f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/is/firefox-99.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "fbc2bd2dc236706d1e6599d32a6aef5b4dea0b2dbac4a0d59854205dc66c6958"; + sha256 = "33b049fb59684b094b919646994c446c29d4d3c533ef97ed5c592b86b621ca2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/it/firefox-99.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5d1b79b6be89b593f79982460bc10d160f8914c4544a802045562547b59ba364"; + sha256 = "1f3e0d9fc78f51946f2d35ca6ab977f53fd58ad0f80412dbba23fe97c9b8bb0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ja/firefox-99.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c55511e3e8546d31230e8735a85e9c2745d3358567e424324bbc850c8f9399b2"; + sha256 = "41fd54681fa8ff564fbc202cef68cf4f63b44764dca8090386eef4f0d7395de8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ka/firefox-99.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "009a89d79b2020f8e86a9d61b21b5751afd3aae053ce0c037b3cf303f528cec0"; + sha256 = "a46ee22485e1a51c0a955a66a388a4afcad842ba162fdfa4ccf8826fab26cc55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/kab/firefox-99.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "06b51518cb8a3ef97c084f1cafaab34a8175b7efab66e16d3f4f1f7d72aa9df4"; + sha256 = "33192258d78d383eebcd465bf333d3a59b92dcd87fce6dca72bbe59fd10ffc4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/kk/firefox-99.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "560b8a7cc248639361ba08996a477d2ef7eab0482f41bba67f0371c841ca490e"; + sha256 = "90bb4cab46a5827bc2e9abbcc79952f033b132fae628fb0f9697a55c69b9e049"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/km/firefox-99.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "cc0a12c6e2feab652d08d28a27b79a9481209f4c3869372b37f1cc5e27ff8e70"; + sha256 = "0b70f38800d315af8377a8a7db8f1769b559ba06f92fc90bea3ef9c07dcda86e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/kn/firefox-99.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "25541e2722cdf1621dc42ad529447c31c0e9e8ccf7300f87d89f2e1f91240fd9"; + sha256 = "dcb383343a002dec453abe185c02735d52e0f579e940104af9311b701a4a1d81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ko/firefox-99.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "cde1314a8135543aa98a9c28c083e3f57700be9990ba2ef780f6dce4a8de6dd3"; + sha256 = "a60f64fcb7fe7456ce76f696bc17e1bfb6c2a3997ff79e090ed49735c6443a44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/lij/firefox-99.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "f85d1f85763fac8e748662d1b493cd06dbdac37960785cee0e8946daab10fae6"; + sha256 = "a2dcd9632c637a52695a0d2aa085c329a7ecd19443bbba27c232839f9b64ed6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/lt/firefox-99.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "34ff1895eac6fda351b210ae65b2edbf837ca8a5a5592caa33750ccdf529c6bb"; + sha256 = "c6113f95e4c8387b9de8373838fd08638c25438995f27380f30e2e22bb211877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/lv/firefox-99.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "9769e7039a980ae239d242fd6ed4438e7b90e1fd91f7d9ceafd52e8183bde1a5"; + sha256 = "302a146408cd24bd215ab2a1ada0b6306e30e549663f9ab85cdce528a79eb088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/mk/firefox-99.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "1217469bc4707454ece2ccb422e99e85724845760a4a78205753c07354a2d6aa"; + sha256 = "72288455347b225f2e773df5bfc82d51709b493a2f7aa46b78da0b5fb4d89b35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/mr/firefox-99.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "e70d4bb799117c0343a17f57adc733dac1cdbacf30dcfe0ebc195da3de091408"; + sha256 = "f67ebc75fcebc1ef25ab6838ff34a27395d3babed0e08014c47b213a4724b9d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ms/firefox-99.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "91bff99d4326c16466ae3c4d1646f14cc8d341cf93c71db6dec117ae24dda154"; + sha256 = "612625f0ef927d42b9ab526c10f67c443d60bf0714f57570eb76ce97f84c2f4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/my/firefox-99.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4efb3b03955ab8cae4925704fef1a1d1ebc20c3bbdbb9332d1be31c2aa0f16a9"; + sha256 = "b3bc2ffb890f6ae3316be0cf7a987b186268cca8d9df4cd1ee6f390e689f1148"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/nb-NO/firefox-99.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9c01453ebeaa772eb1ad092400ff6da05d6a36d901fe4f9ca9d98bf4c41d2d40"; + sha256 = "0751f4007a434ad1241459e13841f66c32664b1c2eba53fe936c559acb609a36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ne-NP/firefox-99.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "697bf0266fd4cb19e42619054795bacf4e9a065dfd976086b074be47038f86ac"; + sha256 = "72e278fbb6e073166de952f70c9542e5de2fbda9615205a5ca8e4abfcaf2a199"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/nl/firefox-99.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "7314cfcd476f18054775d03d96787afd4572437c507b0387fe3104e272e66f32"; + sha256 = "5fc45ef4391c93b081e5690d9c759547e47bfba389bb6143c5f00353a18cf22e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/nn-NO/firefox-99.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "3fc8dc069fb41aca43581f3551a485f4659a760a275beac5087f479eba0b4605"; + sha256 = "1d7182f883569941f4a7c2e7445f5b2f39f2b9ace02b42c7f4c18108539c2778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/oc/firefox-99.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "22ea3193fbdddec8deb897ad5551fd94ceb659cd8493a04db51525c29ffae0c5"; + sha256 = "5a9100e569886a334cd5f6518f279a537482fa0a32ae0e663ddb3afc47b3f405"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/pa-IN/firefox-99.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "2f3dad5c917a28b41fc1ca3365316a281c6e6560283d2002364c2bddad5d7a52"; + sha256 = "fd310dab3a60759d98059ed81cf6c2cbf9a422ec9b56a590ce774e1a5377576c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/pl/firefox-99.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "6334e79bb84d78fad334d9298c8104472ce7297c17d80f28144cf0751c42ac80"; + sha256 = "79a8d53d9143d9208af8f63c96385b94a2b4ff2bcad40bfbc8250d792b1b3688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/pt-BR/firefox-99.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8fa05c175f271723e107ecce6d2a7d6b8e5afef5578ead1d6c8ece920d4b0a91"; + sha256 = "bbd6b280549cc9b446346e5a3bb3bf7d091782c6b17d27e22767cb5056bfa789"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/pt-PT/firefox-99.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "7b6751f8883c439f1fefa3b1c220093299f1dbd27b8a49c467113e8200849a72"; + sha256 = "7b246df8ad2f65bf29d97dab9d8f78a66fd7f5287820d4db21ca284b82ebf939"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/rm/firefox-99.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "81dced560a8048a4113c3a99ef72137174de6bff64a0ef4f0bd669f3d7f6d89f"; + sha256 = "a721ab8316ad1a3dd12407a2b68986dbbf32632b40c1151640dedae9ad7815c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ro/firefox-99.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "692746c7919b64f23bc92c00a7e7ba60f54152430887b608b84bcc105a436a33"; + sha256 = "66d9d112528b9b6f01cde01d7a251c28821e30b435316f5bc0afaaf9436052af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ru/firefox-99.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "52f4b321e3e149fa0317d610f85b4637b464c79b1b2046ceb9dfe2f4e56b6c6f"; + sha256 = "a7de24d79cf333da45b474d8ef9eb5b5034f18eb79b8d8590cd5f39c7d5de130"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/sco/firefox-99.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "3297b5b0d67381d1b7f9c4f76b767c6a5f76388d473afe5e9bf0df94a7bce0d9"; + sha256 = "9d8754c1a5e2c4f22d1ff5cfbd39f5092840e9910f58f0468fcdf8df4306639d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/si/firefox-99.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "bc1eae9950eb6bc6a79fd185835aaf7b3c9394c7d19bfb78348a1f4987315636"; + sha256 = "9dec327ac9b519dad9d61cfbebdff117f61f3a44715379ddd1db38891a13346a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/sk/firefox-99.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "fdef69d9e24c00616b177dba71e2c5db29f8c945cdba4c3dfbb39753b1f01a72"; + sha256 = "8b8a8278d15d848361a854f898c021e2ba875da54921cb5c5aef260929134b11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/sl/firefox-99.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "7225b70db5b568634792f18f0f6ddca4ab94e00b225942c6a4f5c4741ac9858c"; + sha256 = "f605f1d0e94e3ebda1491efde196bdf33c35ec6c34703a6d5559afbc47dc4c17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/son/firefox-99.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "2c7f228dadbb2b3ecd424ab2e80a532e17e861f92095e5de5ded2006e79e9dc6"; + sha256 = "7d0b0338f9ed0dd5e214199cc4eb10624d07078beb9945281f01721a829dbf9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/sq/firefox-99.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "63fec6dfd214dbce4b344ed347eeda9adb489707e06e6a4e1ad6fa828e0da7ff"; + sha256 = "546c338eb2cb4d185e597f0ab94186856ddcad7a7725837e9f0d3b6460363242"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/sr/firefox-99.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "8d584d48c4e35bd7ff1438c7a80e0b353bb4871ba946119c36f1fb3bd135518c"; + sha256 = "851482b831381a8fee93e7f2bf627675d6a0a39b6024b613c319e28341211bff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/sv-SE/firefox-99.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d5e7514a67a288e755d7ae30f2dd680e2138e50666fa15c1b710d0a454a51730"; + sha256 = "5116d06eee5bfe3d906ce833ad5ee6ec01df739ede6d2a0bb742964f5142b695"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/szl/firefox-99.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "1557cd8173d79820d852d99c0cbb07249c2bf17bb778670e437c4d408329fbc3"; + sha256 = "503a4fedd181a8fa1b5ce578a6e950d7c8e8c9d641a04bac617a4d5505c54802"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ta/firefox-99.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "2001ea5bb925d5a1e845844d03c441c2cea9a61b042df518d16e484a3a7901ba"; + sha256 = "8291466aba0e6bc86665a605e81e01ab2fdc3e94310f90284319a585a7688d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/te/firefox-99.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "c9994fe1e9212281fc007ba8f6b703856693deccbc083e17dc94b6da8ed29a72"; + sha256 = "6d5e52745638471ace3790e1d162f3eec0814f7f38e49e3041cdbdde84c14ebb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/th/firefox-99.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8c6b207b23fe66c7506da96df7de25270218ce9ca61bbedd693fc6f69c970d53"; + sha256 = "1983264e9e0681edfbfb1425a24af506b9c451bb2947d153aeab4d421a2dad94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/tl/firefox-99.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "c9c7cd8c6195588bfbe1c812425f94e7b2727fa0ab73e247b543cf85ea09b171"; + sha256 = "42b44c25ad8c5e7f69f4500411d41575a44efb943fb62da5c2a0844a79f1bbec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/tr/firefox-99.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9b7688be959e16f4ed652ddef4cde0bd5b3df391b8c43c33b6234ae5ba404987"; + sha256 = "68e01ef5fe17667548b218b1b69b7ad9b9017647b5695623e6ab6b2ee7e704a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/trs/firefox-99.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "470596584e9bbf2795624b5baf878955229472450fa7178c9e4612408452b170"; + sha256 = "29adf4bc2783130d5b64edd8ea812000748938538b90f47e1f9ec704cf183752"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/uk/firefox-99.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "814e5c7e9609b6ae72d2c4c0e012d503394ee6c669e777a0e3b4e4dcb4c7612d"; + sha256 = "6953e34511ccb537fbbf2a6cca6369c2f8252e3025dc459bb809ffd44f602ea1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/ur/firefox-99.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "2113a0313ed3d675bf1adecd574bd0112fa5c03d23f670e522928adea6c97265"; + sha256 = "6479f088e60bc401346ba93be6711d83f42e113c3cd9c71e02fe72e2fee18d2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/uz/firefox-99.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "4e759986facde4229324402963e0442d1592147c8f4bdfdcec5ec067e2d0b123"; + sha256 = "99217c54b034c995203bcb290b6b07ddcf8dfe3f0d4f67876656e5930a813e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/vi/firefox-99.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c77990635980e56d3856b3793f186a61aaa6da43ee0e0970e7ab06953596f85e"; + sha256 = "0b714adab63f4551e2837b6fe439f1193d2c097cccd0d938e6ee069bf6273cf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/xh/firefox-99.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "b4a725703b13e230f84c3a5aa1b9532a7755888a2bf7516b5a0c3a79f70f1ff0"; + sha256 = "f15315fdc1e03b0bb2f834240f35a695b3f1173494b2ee1eaa36d7b154fcca4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/zh-CN/firefox-99.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "fed127eedb2d7bf82977c9aa3311e40eca083b7fdd6a7e58f44b315e209c3267"; + sha256 = "a959f20cea8596ef0447f0823056a6e500fdc6d38fe9bdbea06fdbb8ebe93973"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/99.0b6/linux-i686/zh-TW/firefox-99.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "d29db983e9791aea1dba8f483cf9399ca032fe081e6e8cbb08d9fac3d644c582"; + sha256 = "e2c8da8c23fbb7817ef215c035042d04f6a2a0705de9924c66c80759deb67e1c"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 29a506dd1b03..a71cb84a05c3 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -11,7 +11,6 @@ , gdk-pixbuf , glib , glibc -, gtk2 , gtk3 , libkrb5 , libX11 @@ -110,7 +109,6 @@ stdenv.mkDerivation { gdk-pixbuf glib glibc - gtk2 gtk3 libkrb5 mesa @@ -190,6 +188,8 @@ stdenv.mkDerivation { ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json"; ''; + passthru.binaryName = "firefox"; + passthru.libName = "firefox-bin-${version}"; passthru.execdir = "/bin"; passthru.ffmpegSupport = true; passthru.gssSupport = true; diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index eab96830a8de..25a81d11efaf 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "96.0b3"; + version = "99.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ach/firefox-99.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "dd41bff1f1401eb376a3ab26154a42cdc35e409cdde24435737d753b15435fa6"; + sha256 = "0bb4605a97661502cb23fe2ebfdb1a31831f8ca015349b3105d1245fcaa5eb69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/af/firefox-99.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "963103d54c26d76abeebbc86480836408f8eb7eeee96178ce53d6fc269029603"; + sha256 = "564fd8895c6fa6aecebd5a7250bd73df45a6e51f90845d9597e59cd9175b6c2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/an/firefox-99.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "51862a663ea34d9bb1ae78bcf7846f6148dd8004cbdc6ed49c1252590262afe8"; + sha256 = "76035e42b93995e6cda0de737981760a0025013bc3330142b95ba7329d54153b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ar/firefox-99.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "24857b772fc0a7b018c0ceb51913b1a76df59ef3a95fd41f464e1c51b5201e6a"; + sha256 = "31abbbdf4378559e6b612fd3b0167bbaad332edc47d6ff67e8d9aa7e01130808"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ast/firefox-99.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "44c45ef6d101d0bf6f57d663ae6943a7d3bce248eb8feb35dacde292b2c3fcf1"; + sha256 = "1c4a2c370c3f566823c722082a3a9f149050cb7a891f3a1f21b7ca8ec899ca92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/az/firefox-99.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "c196437bfc3aa231859ebdd2f335eea4991c4eae6bd3cf9c64f4eb195704b1e3"; + sha256 = "b1d0effa84614c985001705630da49b70f09e91be3715795fc18d926303b6b95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/be/firefox-99.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a1d1eb29a51a84c2c779bd2090a7a064d1b7d290e0389672351821d414fdd35d"; + sha256 = "d0ace001eff838f8dcb80090a193307e143a5c1f3b1dac143ded5af3fecbdfda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/bg/firefox-99.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "1f78b12ceb1951ca0e354ee04ff6a7893fc7596480b9df1c9eb443800778e033"; + sha256 = "784d6029972a843829783581796263899371c777cf669f0e4f6978f35a8d6199"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/bn/firefox-99.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "b010759c37cafaa3e296b2b71ab19d2850ed62043c3a04e80b21c4d9e9acd235"; + sha256 = "7cdc3a6f35c2a56b87a58eaf3112148c51b2d2d0fe5d9afc5deccfb2d2269b2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/br/firefox-99.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5d58e3ad0cf8de459d68b60653af865bc1e11a1b69a6decca9e630675405885c"; + sha256 = "abbe12c9d887ea98d85479105bf2640bdbe3d295def41b626d3d8feef3627b36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/bs/firefox-99.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "d3f1ce059e17f6a14cad30ef2609cffe61bc3495bef3ada1a2941bfd8bbc440f"; + sha256 = "fc1076c2eda5623869a3af5c850fb51cf8611501f51984c85f690b4c545cc93b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ca-valencia/firefox-99.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "e06cf1c020f3f65e99c4816b054c9f79da55f892dde27d8acde17ebc24fbc840"; + sha256 = "d328055c61c96c92dd05989c23a3f8f49b36cb755f72118c21331f986ba3b44d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ca/firefox-99.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0f9644f78246459e2d7b0c8c1dabc5c33d5d20d2c6d517cee20fb540db501cd6"; + sha256 = "6a020e56c5f4136deff38f07d94b516971af1a31a804384a50396dbf6241877e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/cak/firefox-99.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9b78dc607de8f66352a778c05186806b0fed9afa8474fc4f2f9346c4298d0be6"; + sha256 = "c6298bdeba82a637bb3903aaf73b9de9f0a3ce4ec22637b1ee1340273b7e36af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/cs/firefox-99.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "cdc96bf52e2d9d463e1caca4eb567ec723311678233db59d1cb57a2e7e16c593"; + sha256 = "1facd79fe087052af58205d2a0a9acce68a1d9bc58d1a3bd3e49b740f6e51647"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/cy/firefox-99.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "91c833ce44c24d3fa7b90bab56d0994c930649ae39403c6888a85c2e22fda7c8"; + sha256 = "e7305badc55114c4a39edc317202338b3e61feba9844fc2cd8edc1518486736a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/da/firefox-99.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e8602e1cf72f9b98dceb23694eaeef70a82bf2704cefb4dfa9db380a31eda03d"; + sha256 = "6b1d2403e1e74c97c763476a128c56079d546967c87f1b225ac790d9acb6940d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/de/firefox-99.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "4d7ab6dfbc168e1edcf7b06b9da65e88b805cde7adc14519e2139fc811188b24"; + sha256 = "c8d01b9a1bbcdeb1fa0fa63ff553209d095280ebad4eb03efa47e029505b8204"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/dsb/firefox-99.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e0288172d3e7fd5f9d8631cb36a7f69118aed0b3daea8ca6d4bda0eee53a2353"; + sha256 = "bea09c23f3099c85e415bb05916ab9e3374f78e897e2b8549fb9f67895b7c052"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/el/firefox-99.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "eccb1283cee2fa9d6b35ed0cf30f789f422094cf2fb17966b9a406026bfea2d5"; + sha256 = "bd740ab9aaad78e4b16e42d610ea1b914db95e2f8396f0e9c4803e38c9810f20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/en-CA/firefox-99.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7769bc1d977fec4e0b5362fdfeb0b0f52bab1d0b12b012c90ff2b096209bc7c4"; + sha256 = "acf5c9da684d5f7bb5b25e5fbd62d5dfafb1a5f33bd6c7baa385a37967e516a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/en-GB/firefox-99.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "71e3b186ceb1333f4b95429e63abb1c0807a7f1df2c0e8da26b5af866ad077b7"; + sha256 = "76cfab3fb29274bcec47ce72e88f783668653d3f8ea4ad00637bdd7ad5d32364"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/en-US/firefox-99.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "cb4602feead2f7e7b407e83594ad2edd9de856d334a7f9cfd392a7764adfbbc2"; + sha256 = "798f68125a37ac1e60d72dff3a773cd167075a58d523d7d9659cd5fb511e2dcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/eo/firefox-99.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "36ad536374a186e2d9ff4c2894749ae43c512555ce2fcd5f67b0ee76949a764f"; + sha256 = "0b65dc59679b42a298484d3901f3f47d6073f08e260a792a6e80d9c5a0e6ad0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-AR/firefox-99.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "8f4c854834fe8bffc682f8c29ee674771f70f78d28173cff3beaab13ae637c54"; + sha256 = "3a894741998ee1a2adb6def1c8d548b2c5fcab8fbea655a013dbeef9a29ab228"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-CL/firefox-99.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "3381fa208df76553b85a53cfbd4ced059cfccaea1a8e246a5d0d1c54efed8e8f"; + sha256 = "1964534e196d426a9d6dbe664dc16790f010214cfba85e98f5df728e110e0a74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-ES/firefox-99.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e98d88c0e6350e477404ef14fc7348ee79f25fc9e31ed2031c93b79298fc37fa"; + sha256 = "32b21ccb56fbe2e46aba0e21c417e2a7d3404a0a3487186c75d042fd84c5033a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/es-MX/firefox-99.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "26b84f335c5ba6238d69a7537686141188226859d17b0a64c71a1ca0ac9e9d70"; + sha256 = "d70ff15a4cced1028433e603151af021be98d1026322203f0412605685611e5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/et/firefox-99.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "9371d5111ee591ea4179c4932e03d1686b4f8555c5b6b1dc110382b43dc046f8"; + sha256 = "df844133edc74d396a2fe66b0a71efda2c4797ca7110a12c4c7e620cbacbfe8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/eu/firefox-99.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "56336434a3be39e71459a3ae990f3dbf826fc53ddd33410b0208e4104fb9948a"; + sha256 = "1ca8ba1a7ba29a0c21d7bdf5cbb046fa0e145a9bdad5debd93d121b512a060a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fa/firefox-99.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "75105b2ec1f269e044332dfd1736edf0919141d3ce7ab979da06ac6a47c361f8"; + sha256 = "a4c223f683bf75c96650d939c56aa17bfeca975ba8863e44dd5ce0449b436b3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ff/firefox-99.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "86439e96051f460ac42154274401cf4f50102f89590e67e78024a7e0928a2dcd"; + sha256 = "6b165789213fc3f9c3f46457a04974e3c718b2c0aebd44c57c7bf8f41c73687b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fi/firefox-99.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e94714ca233a274a0229bfd6c9e5daceaecd2cab30b8314464b766ac79c1fc2f"; + sha256 = "eea67a8d94f324a9ab74caae5a7755f9505781ff690760a06a62ad034ba76bd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fr/firefox-99.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "4b88a49838eb6f479feccbdf3109e3ae7ffb1215a433233d0200fe8713475344"; + sha256 = "d4cc1a70f8d020870ccac0b023574b9c0f39fd44bbbcfd8a35f6c688183f2a9a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/fy-NL/firefox-99.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "216868ae9bf52b914063b154015efb07ca384f5a722064ce9ce2ef2191722c80"; + sha256 = "df49ee1a9db407819fcc7baa9c6bc9c6fc9ab2c2b57b08d85c9478f1b0aaf6c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ga-IE/firefox-99.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "38fb2079928d7fbe4e8181a14f7c7d955d41fd14f0c73f0122d91c9eb1ef7929"; + sha256 = "e7e846a95ba695a8a3edf233ad31117f4d35d4942784c5f6c5a1ebed7f2f8e4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gd/firefox-99.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "bd70c4241e3e8233458b7ff6bc2893de43e5917284222146a585fce47f785a5c"; + sha256 = "48ef5fa12ec7415ad23a5a40f2f882147e03ecc074b33b173f413e53cc0cdde6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gl/firefox-99.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "edac88def8dbbcff4cb4b5c33ab77f48d6b96a8ee1765649913028cd92d4b4a1"; + sha256 = "b44500b87f3b2219ba10e06bd937ba06784fc00085be12a16f69fe26f7733317"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gn/firefox-99.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "1dcb25e73b9dd759cba339bd24b769c279c9eac1a4d2b47338ceac82d9e45bb2"; + sha256 = "0e521a61d44d1058ceb566ae58272e41f0aab7f2267555781bb3235ff5e3a59c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/gu-IN/firefox-99.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "122331ecadf4b63319988f781c819f11f905d685f4a549cb08454a9d8478029e"; + sha256 = "2179c82d7763294f5adedb8c905ed5e009a4d3d176fae58c7503404015214c51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/he/firefox-99.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "45f8c33eff249c9373dcf558648475b171be65db5fefa873f7553ba1ce77f2d3"; + sha256 = "69383070d17f2ae68363e8a29efc53e2748b8f784137c854162ec0132295a9e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hi-IN/firefox-99.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9480b304d5c9ec6a10dfd480484dbd01dc41ea1cacee4b05b962d4a5bced4427"; + sha256 = "71e57a59cfc523d5c1c73c9b5547b3247170865a95022e5bd3098967c3e6002c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hr/firefox-99.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a287cf31defa7923a7004451fb2cf72018ee507cfc167a67899624f7b8375d97"; + sha256 = "9ea82b192336e83c7ac450dc7068f2730c031f43633a87b7fa554651cf64a912"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hsb/firefox-99.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "792b12bc891d6d6b4e0c14f745641f54e9c50ecc10222ee679a206a4348d0c9c"; + sha256 = "e3814f823f3bde2812751e9dd6a2b51a8861952eb04cb845d543a9252501dbba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hu/firefox-99.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "958a2569663fed2f45205ddb744e4c1a62210b678bae94e2717e8d4a66161788"; + sha256 = "e647f86de2e7687e23320aa0f36d96743f5da2cf43b2d83444a41506d13face9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/hy-AM/firefox-99.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "0bd1b2ab4b063faab90a1c2158d9d0d0fc96f7fc81389f06190af39c9247dc21"; + sha256 = "21cc172fad6136a17df0a6ae4c6e90ec72a02db744cfcb5252cedcf48223e543"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ia/firefox-99.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "09523f090a020e658e14eaeaafe65a6db0793d389c8dbf0671f9f6d3b291482a"; + sha256 = "5f0c85a36ec40ef57cfa2bbbc1a4663ce10c8659e0d6ecad67ea993186c9cbb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/id/firefox-99.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "39460a0d21b63c39c5aed3467a2177441e23f15222abbc44535b96ca2ac869db"; + sha256 = "e6671d2ac6b63ea4f2a84d1d0e89038ef1030d85e84d6b47c5b878ddc8d96b60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/is/firefox-99.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "7dc87ec09c0fc046a42c583c6ec84d5116ae71ccce466abdfdf8d88578d4fbf2"; + sha256 = "5bcafb210fa3aa06d56f17972d94c17faaaa2937948890b993bbc6c9bfbeecad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/it/firefox-99.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "bbc73998584297e0eed998927c574eec7d81aa37530be11e0b68d1b89fdf31fb"; + sha256 = "3c14104a82a312324c1d42644eca6f80b7375f946a42edcb0a23f8a824bd0eb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ja/firefox-99.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6d4c0748a49fe3b14ea9906088ca99e1865002af3bd3fbf1121a67409018a51e"; + sha256 = "00713bc8710add3312294aa755c881701ebbb2d00e1f5f242ca12d102ab6f19b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ka/firefox-99.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "595cb5d60786e691078ae1aa8e76ede002f2895fbfac3d9519467f382ddbbbf4"; + sha256 = "ba6985797ef85bdccb1f81053456baddbe2cfd9e1097e42b20617270f681c1ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/kab/firefox-99.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "59b28149d3724582a5b4c0b4898bda5818d762020eccc4f40d4054cc6752fc62"; + sha256 = "8be17598d305e257005ba0f9ef2f7053ee7e79bf3c1b4caade77c8e5a7e8a57c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/kk/firefox-99.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "13278da244a1cf7342235d75eaca237402432e73835d944dc9d5bdb9c5e967d7"; + sha256 = "7e142151f26355256d2923b183fa1d225e3ed26026cbedf9abcebef301dc1045"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/km/firefox-99.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "de8d8b310cb4b90e40d15e3a991810eee5f7d5418ce1d2b8ae1490c040c9b2f5"; + sha256 = "0df166d5a55e52ad60f8873afff5c1c43816ef99b56e1d817b4d4c29f173def5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/kn/firefox-99.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8f400d8effab470e0823ccfa2fe1ba9f49422faebc576d9775a8194957b4d97a"; + sha256 = "193c7b709c03212ba91ea99da00c6b1c53edebbc9390d7321bd9815e5ced8233"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ko/firefox-99.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "de78ebc094faedbb79b8b3c050dddd8d89cded9d7f5b8cacf96a8ae0741ed5f0"; + sha256 = "d265a984bcc6a381f715eff5e2501acde0c8793b111e15877f7d4e9086ddcf10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/lij/firefox-99.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "7b46ed0c449eabbed031a6c944c725e20eff8560adaf579afc386728a6aa078b"; + sha256 = "4a8327447982439a2f9e5ecff39b77ddd2bfdcb081d9b6f89848f2c93db3b3ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/lt/firefox-99.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2d51003f43ec3ee6a4891f65d9b1c248bae86da174c997d5cd47b779c403ac3a"; + sha256 = "cb2a9545762247192f909c1600097b1198fbddfed1c383adf5dfa9666ddc0e80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/lv/firefox-99.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "18a3afd1e3799ae4af17ca288b3ca2811437d752851e3043b6b2d506db2e1c95"; + sha256 = "6ed249ade30c7d2d5ff290c4b65d3eaf3df4e49e112412cb3153da15bcf23fcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/mk/firefox-99.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "62acd5a8e0eefed468022331f217cebb7e59e629ca8b26010cdd345fcfd3d50a"; + sha256 = "56af16c66d20eaae2d6b487c3bec4f438d21effd3e3b1582579bb9c1836956d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/mr/firefox-99.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "4e0ee6d697fafe9b855f3112ce745bab71b53c383a181b94dece0a66589604e7"; + sha256 = "fa6f5e496fdac7eda06220a423683f608d6c49b0e3caada52b9fd903b5ebcbe9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ms/firefox-99.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "1a6ae8edf5732a766c584bc89b7d51b97ad491abccf59cc649db8f250908ea0e"; + sha256 = "0820d7fcdeb7226d067f920e7cb8a0bb3bfd98ea931d468ae58ed54e074dd1f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/my/firefox-99.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "f9a53290d295b9be23338bb7b2e6427f75e048f04d0614451a8a23352c286264"; + sha256 = "20ab8faa3a4aa4b4f94f6c057d4fc9602201a55482d492bc6dd7acc5173364a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/nb-NO/firefox-99.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "99261f267895a39fd7ddd376c87fe1a0dafd1c18467e5fefe17419c9a1ae058f"; + sha256 = "77bf24610d6ad64859c83125909b70b3dd768e90e563971461f2c18fa2cd7693"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ne-NP/firefox-99.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "4c3d5200221d7d7bea5e9263329dc216bf74d9f2c822e1b626f8c051262aafaf"; + sha256 = "fe5477509d83a14875e0409f99e2336abba237da75d1e56d753e27b7d1016c9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/nl/firefox-99.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "16a4857eda94f8f561fe482f9e21ea53c8a84404d1cf7d3c01ed62a6215aa95f"; + sha256 = "3b67159e8d34c836d5367a2e17b54bd2aa274e1f602ae42649afc2ba2fa1429f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/nn-NO/firefox-99.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "12171700aab404bf48914952564a0bf862c816eff294885dd441ca5f68a48bb7"; + sha256 = "4faf2904a8b9a0c315c222d7e810d2fb3e24947dda1e006ddd1f727d2f9f967a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/oc/firefox-99.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "636950ca09f5a406581c1605370c85c610a6f53bd2e8adb4987e4ed7dabfed7c"; + sha256 = "1dfa10fd1d9f958d487023144b7fad8ca8d1e528954f11e28509b7e22e48a341"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pa-IN/firefox-99.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c7ba5162bbd16ad181d19ea42d34d6182c9972b208c98a009b301bb27c865357"; + sha256 = "e6e4cc03a47ab8ff0546457b2ee0b55b8702463ed5666c15c0d2d98716fa84d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pl/firefox-99.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "e0cf100f60f73cb96c4ef942240375034c792036608e646a0412fb18179b4316"; + sha256 = "525023c756ff0a0eae303c02ef9b7155fdad5f0f41bc4e539be5ca21d1af0ceb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pt-BR/firefox-99.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "4e2c43ff8dd482691190cdbee40cce73540f066b777e3c345acbb4b1622eb166"; + sha256 = "1a8070c38035f97ed771b02e59b3c2b0ef0073560c8ba285be9779fd4e99b61f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/pt-PT/firefox-99.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "de92cff3604a82952e49e04777a098cbe7e0fb991a5253e90c66df68f02a598e"; + sha256 = "ea356edfa8b398ea16719993cf05e65b5c63b4d2c4e589a9a26814ae275e4be2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/rm/firefox-99.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a88e3919ea3c8c29b1050e7dec608e62d986411fd4ae3fa8dd38ba55f9dab1f3"; + sha256 = "f07ca7d4233860a6271eaa972358bd05b834c7f56c4b64d45eb9af72bcf2dd9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ro/firefox-99.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e8a37f0ed391cd8b7a5bda1b4a492a5fa0201e06521c3c4863df8536c4c2da0a"; + sha256 = "fccb8f523251dba30a73f6ec9259113142514b6d4657f63b88f5b9d9e8a01923"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ru/firefox-99.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "284a8064fb0a41aff769af21194fa2359a951dbe2134d6415d40a41d4a5636f0"; + sha256 = "d87928af8f4a0b28abdcd0386755a3f4f70d7e17e455fe5913b1e177c3edff2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sco/firefox-99.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "01ac969a91b8d778ed08bb2f58faac842c1c28dda40ce8c0b90b40575658ace9"; + sha256 = "de3bda2032217c56213f64b31332e8e6ea9598c7f31f3dce1a7b136c40c3153d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/si/firefox-99.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "4348f3da5b2b6ac1fb2fe370d2a4c820933c5100baf3c529fcde1814e32f1fc0"; + sha256 = "22dbdccec8073bd1d83cc236fc563aa97a3607a92e9b3908d4c8c0307dca8b08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sk/firefox-99.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "e55e104417153e939c20be42e6307dc36fec843e9170441a3bd6f7d205111f5e"; + sha256 = "d5f73c93ef57cd600a2c4269a99a498896b580ec99b549db8b0ee1537a644bb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sl/firefox-99.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "73be90dd466c418f0f1e7cd231234823c9aec4b37c73d419c272d5f0c6549408"; + sha256 = "12459b203b0de94241b243b07b9f54e7ae612f7887581c5cd3ac7ca2a08a54d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/son/firefox-99.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "e310eb44e199a44f5c6dc938c5278e0cf5a57b0eca9afe93947caf124499a512"; + sha256 = "2d44c84feaa5c5e3595055289f84f320b447664d01c653b0a3b50f1da24b1a78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sq/firefox-99.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "a878f821fe66613200a69619d26bebeb5abd6e7a512f687dfd939ea7b055117d"; + sha256 = "fa3f9724380818a71d895252631b354ffb692f35679eb9b8ffa5b2beede8ab61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sr/firefox-99.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "a485ef9d3785f4dc8c9ce88287f597c550a489901b8c48ca9f760d8984c6c385"; + sha256 = "c2e5ad218b8cbadfda7c455266e018a6eaf9b450a905e8a73b01d02b7efed608"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/sv-SE/firefox-99.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "0ecc83a16278aefd627e50e317ad426d8bfe7b68f4633941e6bdbb20e0f1e043"; + sha256 = "12060ac843f03a7544db8631c7f53bcd0cc6fb15d62cd997b02a83f0560722aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/szl/firefox-99.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "0de3848f27c6be45f54429cd9679b19a661b79e857eac8c4852b511857a25395"; + sha256 = "71ace92d020f3fbd1d5e223dfaa01e3a53ac625ba5ecf074153aad8ccb640ede"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ta/firefox-99.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ebff08a86bfdb646c02add5e9226cc3f09e096d684247c1c67b9ca6faa48f33c"; + sha256 = "6ace267aab85845babad8b11b68e154e1128b920ed16b8b8d011d53f6dced16c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/te/firefox-99.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "8221220edc9041f76a493feb7ac3199d93590c2a4145fc1d7e62e961188b3f3e"; + sha256 = "e381faff48999b63b4981695e7c80bb946b44503ab5275344f12b7005ed49ef3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/th/firefox-99.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "6f0b612c589ea43323dc8534111808cc1588dcc8dbda09cd4c8326ee513af2c4"; + sha256 = "6c2ddea1c0ccf0521b9b647827569b78ac2143163895e67476051f8496011b66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/tl/firefox-99.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "d21cb5dcbb5a6a290d83f96ab8fd171254f54cc8586b0513689d30fa059a7555"; + sha256 = "9d949c9c61922756d0f2dbcff76906191d438d161c74fbe7d702c7372c11b5d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/tr/firefox-99.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "3cf9572b76b5bc627130e27105ce39bc51e55ba0446b4ea867593d7c36b546dc"; + sha256 = "88763e4847b865603a7d953d54b86e6a053d2476209b4046bcb09149275690f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/trs/firefox-99.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "269d9c9b50acc393ca9daf4f19404cf63e2e792028c26c03afb992f67628bd3e"; + sha256 = "b6e7aa724a06f85e4eaae7e1c55e3ed1ec9a6b5664150745a257bd3f63310d53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/uk/firefox-99.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "c1d304b0b4a7b5c463c07ccb982b16a0265cb1fc114ade7bc4b39f8e9158f5a3"; + sha256 = "69b200c0c4c92430f188ea12bf5e60aae18203a76e61cc163738d46c3627b137"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/ur/firefox-99.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "17ccb256c21e7f7a0851a980952cd5cb006a9d29176b40f420b0002017748da4"; + sha256 = "330bb00cc0c0882a1e8aa06fdf7d283eaeef04500a9bfccef50f7b2ab8becf81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/uz/firefox-99.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1ecd6d4a20e74d1b3116602a4661b6ea1d1e70f786c88e1452a61230125d4ca0"; + sha256 = "a9b7087c1deec3aedcc2c279b135b113e79739a28e31ba6cd090541505e5d9e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/vi/firefox-99.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "681857e16b6767b0d66e8d51423b360cfeb8d107839ad52cbeecf1e7003d66ec"; + sha256 = "76b034ed53b8c99cf7909a6a5651627fcd9cdebd7f8ccdbd3d2286cb19dc7eaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/xh/firefox-99.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "3122fcb6638c00f489c6540c3cca4312dbdc5de5cc16351746e83c68d02a45ac"; + sha256 = "a1c9ec73200bea835c46879d8196b380a3157c98404e6a009fbdb24b1662ddde"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/zh-CN/firefox-99.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5e4be58a4891d7b1363d57fcb9ad67e5d1379401cc3df49a5f9ea4fdf71495fa"; + sha256 = "74fd44c26c503014d0fc3a32dbb726feefd572ce52697879a392996243b5811d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-x86_64/zh-TW/firefox-99.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e904a8e65e8637d01376a08908bba94f437f952eba13a68b81b0a40936044e14"; + sha256 = "a9d86ddb8f5388370a28ac643e3d21a411625b7098aca9c399551f8e2c125da9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ach/firefox-99.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "f5e383bd0268098f82791079324eb1457298d95431d497adbd6023f12c762932"; + sha256 = "67b0501117e5d93046031860df5dc6eef3fc3126f0b10240cc13b83f6f1cfdb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/af/firefox-99.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "ae99c4ccebc0b938ebf2c20758a815fdeebae0b81715db79d8385d6a649bb6c9"; + sha256 = "43b9b1107fb13b97f6b955b3abaa4f1d590bbb1747859e54bb306c9578fbdfe6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/an/firefox-99.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ef7ab3d8b6b51d22f0f30b836024212332aec6989684b9a22a4f045662da6080"; + sha256 = "da752ce8f7a9a0769c93f6f1817649354f892c440cdd48f0dd75739baedcff40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ar/firefox-99.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "b3728cabcbb46393796b5b948daeb5821b70ae29a8571fb5295faa40d9a8e592"; + sha256 = "e67fc64daef74e78eee12a1e5d4c1ef5a89a8278d19187d9e0c67ac5ea350623"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ast/firefox-99.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "ecfcfa573fe215d94e48933bfb276f6dbd573c92a062f4f3ec1ed83ef0da83a7"; + sha256 = "115cb0605bfb7629b854d242634cd2797b5072f735c840a6611325faf7bc3f77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/az/firefox-99.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "37558cf0fdf41c728b2a22fc2b8142af011ef7beeb924e08de2400f29b2dede7"; + sha256 = "c839a19dc4f5d938fe7a5426a8abd7b228c89a262201c019b4b53953211aea78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/be/firefox-99.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "29a156bac1d7ffe10d05690fa3a82820cf246450ef1a77697e4f7f346c9eda13"; + sha256 = "94c8e688578059f8c4f7fd2a65a8fd77280b4047e845efd6ea66e34f5320d119"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/bg/firefox-99.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "631e34ca2499d6767a1fdc7b944f08841bdcd9e3c248f1e4f0572465797e819c"; + sha256 = "9f7acb26e7cd9193e9e435da3e2f4e9d9ee82195cc18e8de8295cba2446da1f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/bn/firefox-99.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "3500810a58a0cd5192982fc5536902e377458589faf0e8c978425ac2fffb19ee"; + sha256 = "93f31b395a9a42386b0de322db1f675810a3db106a0e8c583f18ad4dd0c56488"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/br/firefox-99.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "979342ef754af3751a5466a5d54b40291f87dc8f084173330b2e337aec84c516"; + sha256 = "a04a2b2f2b70f33bfe288d9907291aa61f2daa64d0d6802c784d7b4f44b38326"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/bs/firefox-99.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "55fe1b0bdac8f8dc37acf3159ccbef78e4054c499ac8df550b215826eeeeec6d"; + sha256 = "154456c3aeefe93d6891306fe295342aa02c294bf64693fe93943ae836fc796d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ca-valencia/firefox-99.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "ff090da1c4a6d6dfb12d1750dfbf1f37fe57e2f5f93250d30851da215f6daefc"; + sha256 = "c00ab86f77e5113f85feb8eb14b74c2c144e9c7e08c4442b06b749ffccde2cf1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ca/firefox-99.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "67027d0efa86c8fea2d27821a99a30e3878a9c478d9f26af3ecfcbdce336f896"; + sha256 = "07de1d9c72f9d5487b9ff57ec609a2b6ce37a8b09fc81200a6cc6610a7e66b9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/cak/firefox-99.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e7c2dd2447f157a2541540ea24d0732dfa0dd84b116824d87d7bae53a572883e"; + sha256 = "ee05ba6ce42f873ab79032553302caae28069d84c5105192623f1261d2d3d609"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/cs/firefox-99.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "bd7dc68d840a6a53a525a8a1229e0abca8aa2af14bee6c5f7198d877f3ecab1c"; + sha256 = "9b2af581c1c70b72cbf82cf656f94e65058063f0fd6807d99760dfe9b68af808"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/cy/firefox-99.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4a21599535668ffe96f3adb56801aa3c8b5aef40ce2998fde430e34cbb4898e0"; + sha256 = "f638faf94045b5e739736926e4b3e173f8830542287d46aed70337d9ac3a4495"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/da/firefox-99.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5f47de337347f65ba478c48c373d12befcde1b86b99102feb0c921d149541d2a"; + sha256 = "3dad188b310fef15b704ca788b320d502a0a6ee59538296176fb17d2b440163a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/de/firefox-99.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "4f11bf8857f65091d43835c4c1d16097189e184e72abd2dde6807e8b22370f8e"; + sha256 = "1bdb5b60bdf16126de86ba1413eb5ac4184f727b3e57a36d424dfe39647f53be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/dsb/firefox-99.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "6b426096f9a652e1eca190320fb485c5573c94d7f7558dc70f58b6c49508e5bb"; + sha256 = "b306d40607d73314c0e3e87bb1bce65369846be3e370943088a8e7e9731098fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/el/firefox-99.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "f374d64f64529238f867b76e7e894065a32b75b2d669787f1f7285f23ffb653a"; + sha256 = "45202f79f9cbf2a44bfefa9ce50bd0a6b88485207105db4df1f26f547c1f556b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/en-CA/firefox-99.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0806aa2abdc643eed084e7764acae24ee7da7e01c8482b35de5af0cbd809b9e0"; + sha256 = "78020bb6fa9395fc4e2cf40645e127d0f6d6dfca4044e5c00f63a90e24824add"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/en-GB/firefox-99.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b41a39b046956ba4971c4ef163d9da6f7ea6b70f2dd419fdc278995bdc300723"; + sha256 = "647947c0b765d1142947d3cb35ceb308946090e928ecbd4cf8c3eba4b57afa47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/en-US/firefox-99.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8869e2fadeeca2c22c7732f22cd9709d8da9b435b6e4f9c9d384f67405f0fc76"; + sha256 = "4249f742c2918d66af2e7defe1c6b34870f258fe047ae7b38f91b0394b453cbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/eo/firefox-99.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "3d339e3dcfe1ff4273d0a35f1177f580c8158b6457add582cc23f67c00676e56"; + sha256 = "1726df9605c7deafd6963c18c4b8dbd4bbbed86814fa9932367fd04f6ef609fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-AR/firefox-99.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ed129dc3258a62a6e1f02b881d78b2d6348b95b99c2011005644ba484968e3f9"; + sha256 = "c3820a35047f21efc721889fa0003d8e74e13858aad4d3aea038c01b5cd6c657"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-CL/firefox-99.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "0691ef7be86c09cc92fbebc431668d1eee722ed85179a068ab3c548cb6f50058"; + sha256 = "b1f5bf697007d8b6ac9f1fa057f292bcfb860d71229a7d0ad6d611ab02991211"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-ES/firefox-99.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "86629f77d8092ccc4ddfbbfd2613535e1fb3a76e70c10fab46081a87cecaffd8"; + sha256 = "de33571140d165d0422b2e4543893bab6435b6626333a05bfef39682ef759db0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/es-MX/firefox-99.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "5225e99833460c3098057602b82be9e0e52f2b00c060c29c1ca7310e2dec8384"; + sha256 = "f681be5b92c8959e0e8c90cf4c7f6cd9197e11be1828797e853310a49dc76698"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/et/firefox-99.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "0d97b86b2b6834ae518820e83a0f4af5318f3eb8848ca69ad4e3cf2dbbc56e6c"; + sha256 = "476a0ccde58372bffea3ebfb0d88795b31db2ec622f9c1b99df51287aa8ba69b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/eu/firefox-99.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d44a9db9a6638a6c69c7b4ffba024d5b5028407533eeab387c2c442f73078d47"; + sha256 = "d465a6a4a01853724894fd81e31b63b80e830cee268298d6e037e6877ae77661"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fa/firefox-99.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "df47ebeaf3e3eccfa2b483e46ffc4f7106299d62337923964249c2a7ee070a4d"; + sha256 = "cf8ac9c8d667ccb0066db1d20a9f43af807e40d1746931e001ec900b34fbbc02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ff/firefox-99.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "4be5b5876f032e09d87c90efb9da8f168f722b46f71adc0ec036c4a1840a2795"; + sha256 = "86dcb3f9e1d899973eaccd3caf401471b36ff70f4a4693fa9f857083e8641a2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fi/firefox-99.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "8ecb3ec4e9387647d3361345a420574887c74ca8bd38f723bea6d8ba4b2f4c81"; + sha256 = "ca0b830aa6ec724aa31f957e7c84156726c26fa0a74ace80ecdea899a8091f82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fr/firefox-99.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "15483453905eb6aff243af3c536e6d73a88dcaeee4363e829c30fa3e2e9bcf1b"; + sha256 = "e94a7a54ba806e2b4baa0159d2f8cb96e79abc9c01e2526821cac8253c6ad495"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/fy-NL/firefox-99.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "991445513ebb294c2bc8e5833e7631b791cbcc72ccd501ee883665b3b0b62ba1"; + sha256 = "cae5c9c607c0dc99e4645f756befce2c9c4ae83b7edc39cf12af81781b33a7b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ga-IE/firefox-99.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "036e8d167fc43d940d19ac8b90f4e136f264f16fe7d012fb1827b10dd47d8442"; + sha256 = "b9b1cb2a48cd17179d5e3a8a3fca9ac25c3367ff6281f632d826cd6a9bb4a633"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gd/firefox-99.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "056ee174fe2a43aa714abe4e59521d2f040fc326cd9d4d36b8ab2676fefba24f"; + sha256 = "b5454de81ba2fee053e98dcb37d3703b5385a51561e45fa32f6872494cfc047b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gl/firefox-99.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6f30edc15658ae9395037751fab17c115391f22d4e2560945cbee436344aae92"; + sha256 = "be3b3decd8e75740a317f105bfa2e4c919ad7f31e391845fb60b299fae7bea7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gn/firefox-99.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "d3cab8f98f1011b94c8b887db82ee3b64051f03879f83594113a0534fb7a730a"; + sha256 = "394562b739f81ec43a954f7393c5177f87d3d5b36d404d97e2e483f3000bb615"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/gu-IN/firefox-99.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "969d9e3ddd308b96fe6475b04e0eaab162aa89f98daa9f921b52a2602e95c93e"; + sha256 = "d2e36f37146b48cbc710af7663ad8b4f7770dbb5f6a557e3f54d637e7061ad90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/he/firefox-99.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "874a5cacf1f6025889a4fc0961b8c26f78a56b403e76af8e84cd6bc54de3455b"; + sha256 = "17bbbd7768ff852dc1f27b224b77dfdaaebabaf531028c71a371bf302a9dd92d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hi-IN/firefox-99.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "4d369daaffdaf1a28d940f98f3f3d4c3936c5ccb3f913c3c1f0233b4ee448da5"; + sha256 = "2f431a3e50ac0b74a2bda65652a5aa45c0e1b44ef0837645ec49e30c6d0d7fbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hr/firefox-99.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f5138a6569f4c8779c90462b3165fb7bb2351d48e9a81daa88d909e475eef2df"; + sha256 = "e57e5fe2cb59c25002e9c06cd3298d9cb75c4437ddc9556590d6c56a1eac57bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hsb/firefox-99.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f410a1786eda2f9b7bc27e30c438f4e0a090b436b871c0614f6fd871f4eaa2fd"; + sha256 = "7c1eefa455afacf5b3b1ee1d04b6e793e2db210912dae58910093c70a21a73f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hu/firefox-99.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "60aa12adff74ff46ef37141293acc39b4592d61512c9db0a3745a8a41858ce67"; + sha256 = "d2b02034ce6686e0743af6444acc2a23ed657124bd7bb6ddfaf6d24cf11730b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/hy-AM/firefox-99.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2187efe8640a541ab3b9c11583d09c977cf3af44c280887b03c5f4ed05239439"; + sha256 = "75589d2abd9488269693c0a0440d6359bafb354b1b5ee91b90306871903eda0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ia/firefox-99.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "1d3a3f28c0a99d56dccd1fc354a56cc1374f4f87a76760b410b616d0128f83fd"; + sha256 = "b26efd6320a41a558383e22db49cbcdd930161fb48ad0032d24e44b57b01f0c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/id/firefox-99.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b2e0853123208160486936e98ba978a7d509d8d4e0500c89bbe522ea69a4ff67"; + sha256 = "d50fff8b0ff7ae5546ad3f25e485ef51280bd022708e3d0aae97d99f79788f0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/is/firefox-99.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "43e9ca38b6ef601d7834b2b951b4a14394a6442d0da1d5045b83a5ccbf7bad40"; + sha256 = "4cf7fbadac8084b8e134f6110ee07076ddd93cf00a10b6ef3d6276df9080bdc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/it/firefox-99.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "ef20972394355ce52307056b94af6dea64a3f6b1cf1887b3796505baf4645fde"; + sha256 = "6fabf495a730600869f6d1e2d9382120361f5061e3a893321f68a6378f7eeddc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ja/firefox-99.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ec106d9e5ebf26c698106c0b751a54b1af77959a39ef47ef124433a3b610f146"; + sha256 = "95a537b3306ae1f6bfe9c4076042d6c29c6478c0f32e5aa4a01e800c1d2a75a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ka/firefox-99.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "19b20479c0df3f63a0d516bfa4521f0c7cb81e7fb9873ad801a6f662bc7558ab"; + sha256 = "e73b2b555f7318650ca1ea20f9d8c1fbc933d230eba3eaeb5e5a47dac24797b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/kab/firefox-99.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "200b9ec8da001ef900fa77ba7954ad67f68504e29ddc78a389847f076d9812db"; + sha256 = "cd55879a883ac4e4efef972d6200284d6839dc786e7dad4c3a81fd88b89b18ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/kk/firefox-99.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "8400fb463705221d80015a7b69388478f851231618bd3be0d9fffcc6b35783ec"; + sha256 = "cf2dd9ae9cd6347eaf976cdcf4a6cce81abb741b0cc273063cbe1274d271e05b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/km/firefox-99.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "4fee1c00876e71f6d8fe8194ac48dc56bb8ca6da2e5ad41488e1a99e3c65a32c"; + sha256 = "f0f3982e7d838841a01b24c330ed3e74416073c40470293447551aacb5411506"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/kn/firefox-99.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "c7aaaffd7539351180240837e1930b8303b1eb9d199a1937940f80041aca1632"; + sha256 = "3e2953e55e3bc7fa76ff77aac08f79b20bbf2be52683c08b3d54a323a1754ed7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ko/firefox-99.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f54d11032e4b929e0d283223744aec809c46d66a875dfa9e07fc2a9237c5edbc"; + sha256 = "5c5bec8a40dbea26674eb2d4b7160c1c2f3ef37f68d67c24a7ca6a2cf77eac85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/lij/firefox-99.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "c7e1da38ea4886454f252c656bc1fd9809cbbdbf06b159cc40674e9e03ce0275"; + sha256 = "7cc492c5eff065cc3cbceb292d18d833e9f2bf76ace0d5ca960256290f049f94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/lt/firefox-99.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5177db2a4e0ca4bbdbd9d7e3fe5aa5785f995df15df4ac4213bc22c2f9380a59"; + sha256 = "b4b56e01e65ffe4f7232daf661df178d4af1d813e1c8122c4ba56aada0b2ef52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/lv/firefox-99.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "0e5d27dbb6e1ed3bf87a60bf62bc90beeb1c503fcc545b4a22767fda0e8e695c"; + sha256 = "b13ac2b90f13813b8252c5eb817d0f55f770a58e05f8a98b1a08fdf59fc9191a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/mk/firefox-99.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "54250e1742ebd3cd0db36ac68f5790fcb803a4b63d77293905727922379c84f5"; + sha256 = "6b1d2598350feb901e86f332598688853b607c7c14c13ac228610d16e89eeda3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/mr/firefox-99.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "887c2cf008099abfd6cae59203f660e71618ad63d8492f0f1de072debab84450"; + sha256 = "9a6a47fc20500b4421b12381374f0a8ecfa9a0929a54a6f6dba73e1c2e5a6c81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ms/firefox-99.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "c34caded0c323906ff15538694b37e3c91a00c731d7f4017434027882f160086"; + sha256 = "e79c4f88952ec9061b4d90f8ca5970be8b5c19cbc1df8d9970b9b23c801103a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/my/firefox-99.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "f66ebec1bc3783cef6c57436a3f9764b52942f2466195fea8e5435275a276411"; + sha256 = "f8ce25b87b639843fa6fab4651326719f229f91a4d6b3a6ef17d0e9f4035b1f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/nb-NO/firefox-99.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6ac73b95d650bd7f8454345a041d7f9a294aed2cf249d09ab726eff5c6df0036"; + sha256 = "03f5550bf0c0f33c3cf252cbad1650204e008d852e6db46a6f7fb6f6b5ac10ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ne-NP/firefox-99.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "9f436cf3504f2629cbec87051539e00782c9942aeef4a03fc4fd44000dfd1b93"; + sha256 = "5d94d2dbdbdadf6abb7250772e6e046b9ce03cbf5e4c920ef7e8b5cae69359b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/nl/firefox-99.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "8759bcafc09fd00beda7f9795b49675d2dcc153d96020198c9c4117c30fe9c0c"; + sha256 = "3045ce321c102e2c114a48a46526572a2c52d228b44ab35d8241d92bd65dd9fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/nn-NO/firefox-99.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "2c5fc7af589d06e2bda4de52b6a079b4c8ac9287b71b8d86a6462dd63f64f62c"; + sha256 = "a16aa9b6de0ac4213492ca117eb47fbd4994824c0f080001baa9136231fb69cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/oc/firefox-99.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "0f96f8938af715461ab1267713d57beeafbca389aa291931c1712cfee375dcac"; + sha256 = "70bf39cd4c3fc4ef772dd71d97f71fdc92324ce2caf9d359cc1d3f3d1557c3a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pa-IN/firefox-99.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "1a8f36abd3b638cb4aa82e66e4dcbb13a56c0fe967ae3187686217ffac0c37f0"; + sha256 = "951263906c05aa6f60a65d77e917a95ce10e8ae31f156acac7f47ab4ec36deab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pl/firefox-99.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "01b349d1656b2cc480e22d1a1a4eb376ae3b0be65a4b64d1cfb95e29b8e3a7c0"; + sha256 = "476ca14396dd7ee636ed1e74a20d9d0ff3b0c452e5b5f61eae6f0594ba060f3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pt-BR/firefox-99.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "4db2f4df874ebd5914ac143c9963e108d45c9822474b43d32b7a417d9a0c14ec"; + sha256 = "33ea09c993bddcc36621ae633713e758ac33349847604995e05fce0d26be398f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/pt-PT/firefox-99.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "fb4f87a2f1c735fc19da371872990a4dcc76ceee2a0f6776e55b06780795589f"; + sha256 = "fd4b924d8afa163ec40a2f5ca6ae0b89e1a22a8be8b8fbf9f43012159d0b7172"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/rm/firefox-99.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "a9292aa129c8dc538014481865f046b8dbd069138a4ef73743137ad609656174"; + sha256 = "97ce5f4af9e8ed2af039255e284ce1b55b6a3ac0eacf4c40be82b635b1df0f2b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ro/firefox-99.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4da6f323d2cddfd0a6f85f61c75cae777668cfe4a88a9fae3ed6297702604e35"; + sha256 = "a959d39333b98c5a479e6975dfa82a4c2b3efe5d69d2d99fddc8d2aabdbe95ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ru/firefox-99.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "44eddd02a18b8e419d44bae127a4f37eda740f63fb7524891f3a435a6430f64b"; + sha256 = "e4f65bbf839054b7009e01461cf4a0b943e1373df054e9b40797b5d233654aac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sco/firefox-99.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "aabcfc84e1a06d901e29b571628905871248a3148fdfa9ebe1b26995db92fb81"; + sha256 = "fac16861dbc011655c3b36b31d5e0816a09e1f88e34032d247d09f691c097ddd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/si/firefox-99.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8a8b0fe064719cfb088ac61e412c7b1f2d6d66ea523d7f6742efbb54cf53f0d2"; + sha256 = "93423cb2cccf166f374fb4b8779f337fa1cfdff67f0f2c463a398a35ecd251bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sk/firefox-99.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "0bba256df30a3deeeaf5edb946fa535b762cdb42232f8e15f3d1ce49743c121f"; + sha256 = "e63c2240f7b791b01c94084dbb28d74ddd6528a7bd1e62bb74ee9271d0fd81f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sl/firefox-99.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5ed15767967d579d6809fdc0fae86f0f42b9f8ec2e024bd40aa151147528ccec"; + sha256 = "87064873e57431bb9cfd3e231df07753c8f644e218ea0318b3731baa05b16c1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/son/firefox-99.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "5e6f78700f74229fb3dfea3b408a5ac78f18892c6ec407bd85017467a5687ba6"; + sha256 = "6ecdf2061f0787fc9adcd27465211446df45751d103e279aa50f278361061728"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sq/firefox-99.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5eb1de045ee119d67e0251be6223f7efb3fd26d8cebc5f372f4513d0928c8a51"; + sha256 = "47783d01b35119b158c746c5ccede7e4832d15317958030306035d1b448b77dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sr/firefox-99.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "78b467f1ceda9ef4d181d5549855241ed37381dc08d4e282bdfdf0db3b0625a3"; + sha256 = "4aa1908894de6eb3640b497361d5245ed3379d29ffe6e10401540cc1c10cb965"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/sv-SE/firefox-99.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "a708c94b51ee31a40532970d59b2d570c87aedeed24454aace5f6870eaccfa5f"; + sha256 = "2334fb5859711a4471f06a9eb81907d0b41ba52a8fce05b7cec320a0d31a4167"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/szl/firefox-99.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "0095fd3dc0eb4eb46c55ae3b2ccc65bea69127aed00d6fac446fb9c9274f4302"; + sha256 = "39ad1c9f4da42278f2a1b3c125aa7e2a8005376a6f458a03851d42f85d116dee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ta/firefox-99.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "c8f052d0275c803da20f62172976b44357861ccd8599d9d70eba9a2c96594824"; + sha256 = "24055aedcf23fcde0dc519bc2124a8d42c82ddd74dda46b694a20d25ff76d2ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/te/firefox-99.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "efad15e6aeb3ad1287cc3d0e3d0daa389faa7f348a002cb5c7f52f812eda8c33"; + sha256 = "18a90860a6428ab31229c975927b264d75b2e2f186f83ef270262f7598053d48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/th/firefox-99.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "dfff091b8e2f6b19842335da51f4cc7107401268b91c1bee55bb473ab5f245bc"; + sha256 = "b965a21a0585cc07714c39ba33afc5ce757294d595c7617ba5b330a0d1d8cf0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/tl/firefox-99.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "35f3b8459096105e29d87645ebfba3a93fb23412ac7fcc30357f2ebbce658f2a"; + sha256 = "cd1fb6553daf6b123e6545cf0553038b2f16c12ae4a21425e253c68124a8ce42"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/tr/firefox-99.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3727440d1c3fac9b5761e3f79e46658dfeb5bee2f3ed17ec78697d869be7a7c0"; + sha256 = "2a2c6abfa119022520e8a3ab4c430c282a7a3f7d5e72d2a67d070a64398b2bb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/trs/firefox-99.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "91808cdc62ff8f8670d3c22acb6c203832471ade8e24fd606a2c00312fc39d7d"; + sha256 = "aae079859fcf211c1e465a00a6a07514397a9f715bc02d704daf062e3d75220a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/uk/firefox-99.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "947f2cb2572e17d04263e5ebebd897a6900d22dbc85196826e316706a8622aa6"; + sha256 = "04ebb332d79d0a9aef5d2e93b2aa8dae0ded8d4e4c639d192ac969e8033ffa24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/ur/firefox-99.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "d5baa22518ee5f189f780d159aef432591c7d4855cce7f1dc4c67d48c69d5780"; + sha256 = "8a8d6d6503657665882ccea44a56b324253adc8d98eba20696ecfd096311821f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/uz/firefox-99.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "25b19eac0ad6491c7285633ad61dab8f8d2833ba011b7aaa8dd1a2d0eca2b6da"; + sha256 = "e2990d6a4c3bfb5547bdac49a2499c7dd958d0b8e665b636e0ffd6e9aebaab58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/vi/firefox-99.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ad284426be9590e9a118c5f151c478d15e6d964beb46312fe7172347783e9162"; + sha256 = "b7c2a4d8c1c400f44fcad7e91572134328097d183c76b8e22d5eaa0a4959d35f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/xh/firefox-99.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ee90ff4921848363791e0486fc8810d892bf07c448c576bc4c0ea09a6bea8e55"; + sha256 = "e3dc9942f397812564b5d7728bb4857f0c217183300ac0ab28590921f56bda34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/zh-CN/firefox-99.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9cc4ec8d6ac780a0fa8ad01b5b16438a0bcb290da79691e7dbf993033bd919f0"; + sha256 = "11ff62d8f465b9ce17591177f1fc98d6dcbbd819332f65bcffd685d43b5aa285"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/99.0b6/linux-i686/zh-TW/firefox-99.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "6018bca3d3963b3b6dbed521ae068d15f659b6779240e8ed1f9c3c66ec75b932"; + sha256 = "406200aceeae06ce5ae2d736d8ff42713e2275b5f369682cd49946326c5cf21d"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 5734dfe9f03c..080fec91c1ca 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "96.0.2"; + version = "98.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ach/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ach/firefox-98.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "b7120e412b7c111f8d136a93aea6f426770cf58319e7b410a4eddc4698e052aa"; + sha256 = "e40a11afbb7a464eb7817457cf360ec2b4e0d77b8d5db5d7856c5b79cdb1425e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/af/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/af/firefox-98.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b3068543e15fdf9c0f9cc6bf7407baded25ad4154f1c2034d9a00d91b5a68c11"; + sha256 = "8d0570e82ec73708933cbe2cacd53d89503cdc7d1e97cc57edaa066960340a1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/an/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/an/firefox-98.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "6a74fe71edde4d2c47010dd0fdc7d33471ca31cb29b5a145bcdb30018a5e364c"; + sha256 = "04403b0d68911dde99880c76d1e87f1315d1c463a63711e37e0f40abbfd9c2eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ar/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ar/firefox-98.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "be9c0fc67c7f3997e8c9b25dae08b9310c435caf60fc4eba6eef1ac0b2717aa9"; + sha256 = "57ab64dfa19fead2a828333456921465cd77e37a36d2030f81b7c022062fe215"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ast/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ast/firefox-98.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "9a0e4231595413451039d598ac1dcfefa76784741f59b99a904c65b401786a6d"; + sha256 = "3dfb8f3c288e6c910d929da7c0228c52c490e33a1fbc99ce90c231e81cd9896d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/az/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/az/firefox-98.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "41f3fc81dfdf6b151763a15686f7ee3aab6814b35835502180dc2e2f229feda6"; + sha256 = "b5fc1a8d7decd2372026f9e4d4d8bb4d5fd839b165168f01e08a9641c0d7f92e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/be/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/be/firefox-98.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "e6b32fa0e50d3c5694e6bad54e86f78d78fcc9c3e2ae83545e6dc1f42044ce30"; + sha256 = "8b1fffc493c20318533879ecf9a006d0215d7c6f2323134fadecdfea68aaaa6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/bg/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/bg/firefox-98.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "b89cca59abc9566b07ac04796d3955df76dd31a3e99f2b28a8fd91a3197b2fb8"; + sha256 = "852016bb71423b058a195d1b8631331a6da144a20c0d74b641d6189c93730ad5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/bn/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/bn/firefox-98.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "e837daeb90214878ab4bb230955fcb67cbdfe4738ee6b93e41972d6789cb0713"; + sha256 = "748e7303d01ca41fed55dc31d0bb57458c69180499bb5915ca4c835f7fdb56c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/br/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/br/firefox-98.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "acc80a336e85db0a4648f4cb6a389645647ac3a01920bd301953b6f80faee7fd"; + sha256 = "efc2e20d5201621c76411ffc3c7df227c9462bb6994f7ad19d735c986c362aa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/bs/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/bs/firefox-98.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "8be349dbb749401c23fa5679764372d536486ccc85950fed6d1818eeeb9df9c3"; + sha256 = "adb507af1a64e2c72193942b2c3a839576ca7d493541bdfed06b0f838f3bef43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ca-valencia/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ca-valencia/firefox-98.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "246d56a18b93e956299b0d9e4c3bcd37e33b08981cbf949f23999746da81ba2b"; + sha256 = "1cb7d989fcb1ca726d022a2e20523427d9aa0718d2129cea5102971624edff61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ca/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ca/firefox-98.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "7e4076f7f4ce566f1900850c04ca314cbd3e2ac0490d1e93e6fc2d405936f66c"; + sha256 = "0d746e8c8ca233d4f4161134f920a44e1a3593a2277101e20184087f76a443b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/cak/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/cak/firefox-98.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e0f3494fbd1c4ec6ba9993b9ef6fe6d5d8659034533afdeed8a539bad20451b6"; + sha256 = "fac629e27bb9e60fef81fa58268f9367a95af59b299a628ffe692731fd5ae4c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/cs/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/cs/firefox-98.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "8bd32a17696fc93fddb14efa1ae60d98aa267f84482ec110c697cba380fc254f"; + sha256 = "7f6f30ea9afac44b1d1fde8abe2701f8f83b3014aa1c98fba1e2c4ae6c841140"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/cy/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/cy/firefox-98.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "761c62b1cd57d7c2e35195232fd094181c18f0ea10c5f4ae3ecc35f40d4061ca"; + sha256 = "63c2b0bf442365c7db1cf96f192db016c4ddd4233a32190d657779a254871a2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/da/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/da/firefox-98.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b08494880033516192c61fce66a64cc7dbebcaec595a089a24f2f7cd55f89396"; + sha256 = "f7d18039814a6310ce4a4e37d10d131639868a6f5ae85c4718ca1f9ceb90ae13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/de/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/de/firefox-98.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "71459eef80ae2003549422041ab7741668497de3ccf36680037cdf3eb7cddc6b"; + sha256 = "736f10e89507455708e40c9cdbd093fb1cb802ada7dd5d3e0d612cb0e11db096"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/dsb/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/dsb/firefox-98.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7c9e4aaf9874846eb403260ca20f05b3d02e9b0b125e106fb8bc77c8abcaaebd"; + sha256 = "50ca85b163011ebdda69be8772a76ff4a912653a03d527784b18bbffd7c63a16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/el/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/el/firefox-98.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d7180afa9621488ba28bd7ada933451e11e080f74d6925d7b9d6edb7dbba3dfc"; + sha256 = "4b3a28670c6a7577f65dba7f857e8c68009a8d1e80089707d8d830e02a5f7fa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/en-CA/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/en-CA/firefox-98.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "26d179040167f5ae244a7c7f040ea8114ca8094b0394bb25e092e93496ca545b"; + sha256 = "f3a7c9de172b6ec0673d2600537ab9265cf3cde3e2fa614424e9f4c08986eb7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/en-GB/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/en-GB/firefox-98.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "6c53b1227cf43e1a8cf2cc0a4255efe28a852b395f8c9504f1c63ebd9ee1baae"; + sha256 = "49f044b0b5f841d5e42b9c6275dc7c78e2b2f903aa28f0d6a02a25a41d781d23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/en-US/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/en-US/firefox-98.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "ae8aad9fddd1e3b28da71a0811eda5dff49593371d5e3f6b8852835bdf43bced"; + sha256 = "07c5f3dad0850a92d5c609278fb1fe682b2562fa55e6733c09a6b4da7373bfcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/eo/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/eo/firefox-98.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "e8e4a44511a5b0855b430063a2f6413603eda572e6f6567835fe7dbdfa4428ff"; + sha256 = "98626ef3b514d1ddf0d9d530ef7b3ac8bb504717eb633f036fe9cb9437d8ea56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/es-AR/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/es-AR/firefox-98.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3e18ce4633e66f51a2e89028cdb60cb68f01dea799590bf38ff663957ef7900a"; + sha256 = "86a57a29b086fbc1d59731f94b792d1116a358e4735d9a8d08c022a2d5c7d0d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/es-CL/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/es-CL/firefox-98.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "8456b5c6a474221679a26803cebb1be001e97c195a3bd322f8c8996c1e8f2258"; + sha256 = "834bbbe0388631cae1e87e464c0b4e0151c37341828d71dd99fccc2d56c179c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/es-ES/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/es-ES/firefox-98.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "28cc54e6d1f540a139ad1cd5961799326c526ffd13bc611c2f276cf3853e8d5d"; + sha256 = "590efa38b4a374ccac89128a0e84de77492f1a8702e70b3b13d9a456575963f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/es-MX/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/es-MX/firefox-98.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "0796ca6961f66801162f44022704c921671066ce044514489bdf3a784c517b33"; + sha256 = "f64ac621daa5f891541d836727d91cb56d5eb8db6093aa7f83af19adfc49ffc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/et/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/et/firefox-98.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "fc8f8b3ed9dff593a3b6968b86364c516a910601c1d6576b160ccf9ca51d0adf"; + sha256 = "08374c6ae7b8eff3b6ce748c87f18136c86f73abf6238383ba3c4b1555f8a003"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/eu/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/eu/firefox-98.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "1950fa86d15392b76b51a76ece16b9fae1fab449c7883cc6232e30bff75aa46f"; + sha256 = "3ce288c26201feca071bfd56f66fca69da7a68b3a468405ff6a665cb666cd799"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/fa/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/fa/firefox-98.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "8a7bc2e996ae85f7478792eef2ab9e0c2e67f845e8f89cebb8923a24f84c5dea"; + sha256 = "3bfac0751b251dbd3ddb253973bb1ad7afe58f7cb824bef59d4f6c7dc5acec78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ff/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ff/firefox-98.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "158ead011e5e65f84f7f2801760331d157008cfc2916bb50ee3dfe65c5c78bc2"; + sha256 = "2b962a0442a12c7f2dd7d2c716fbac0ad9435debf06d1c1e9f95fcb62fb90d50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/fi/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/fi/firefox-98.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "1472f32f694fd2e41b08c6be8cfdb35078a019c29ff03c39b141d0c69266e909"; + sha256 = "705b21bdfa9826563042d0014a9225870c87b3351b9920cca35e203d1375f9b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/fr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/fr/firefox-98.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "b630159914423bf066f7b5ba22524731ab69e05a96f00f11c803b1aa91e24dd6"; + sha256 = "e1d9cbb1c529508bb8262b0498506c30c7932b17a7d86d9b5877f44877cea60e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/fy-NL/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/fy-NL/firefox-98.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "85c3e5a6bfcf6275334878ecbba0feed4c56033e2874dba1ee322d37f157de98"; + sha256 = "c1b40fb366281b9df839083af4aaaaa7a264e1ce380f9ffe46a2fe181bddd3f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ga-IE/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ga-IE/firefox-98.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "57dec3d400e4525d65e3867c6e128010ca8b9017167e41a5ebfb70fc6041576e"; + sha256 = "466ff81e255bed9c03669c974581ee2cfc796e77456dea25af75adb501855c54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/gd/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/gd/firefox-98.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "d40c385478802645530b18d5340e7a37daec86fcbb265df224869bf944c0aaf1"; + sha256 = "0e1de18ab0b75b43ee8caff97c2963b7047f1000fa8dfdcc4e3fe87f29794c17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/gl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/gl/firefox-98.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "7c9c4974907567315bec93adc4985367a5773cfbfeb39fb31270b6c21f346ab2"; + sha256 = "56f259c9f2f13d3f366e921aae1fbd069f00d59131cd3a3b31cb0f3e16f2ad74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/gn/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/gn/firefox-98.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "33f2312e3368ee5bbd09ad397a16d5b1b376b91d75433575b8ed7d995d263ef9"; + sha256 = "b532c79002184bb13a3f197b5c0faf4a24e0b71f737de31c242f9fd286f05aa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/gu-IN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/gu-IN/firefox-98.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "bde662d7941d6afdadd84ad8c8b66e6463a7d7e20af7c6afda7b4f4a9ff23538"; + sha256 = "12ec5c968d852a7a72221373813fca48a4e524e552d22aca50ae99111a7128fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/he/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/he/firefox-98.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "d983738db39c773b3d9edb942d9ed6b202943fbcd58f94c21d7968c0d4526354"; + sha256 = "3c1c1222a4ffcac6679849c94da395440d417284a922cae16b5edd1cf4ba678d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/hi-IN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hi-IN/firefox-98.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9c5ca38a1ed0e7f20606e9e67139625f9c3896eb95f9f9f6c07271e1eb231cfd"; + sha256 = "6ae96b87b251917d2c11684ae58ac3df54496cf047b115145a5f85cfb1575b9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/hr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hr/firefox-98.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "3c372a95a03d12fc53f171de4a652ec083efede32d954c1a5aedb2c699000d35"; + sha256 = "4a77fb11f0d27a4abfc1426136d93404baaa730ffea2a31fe337f11ad92bcc8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/hsb/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hsb/firefox-98.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "1c68037a98166e5c1332c45e1c583cbe266baa88373d921656722bd9846423c3"; + sha256 = "725e2f719720c84ba06a28c5f025a16a951642c1102f7fe5faa41baede1b6a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/hu/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hu/firefox-98.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4a0b9577dfd5be293ca64d7311fbcb0cbd46d9b300bcfbe8fc89ac7726f6b71b"; + sha256 = "4a128951a5466189b703fbf3055a9e65af64f08a7fcd979448611b91a63bb456"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/hy-AM/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hy-AM/firefox-98.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "1b3c910074db508b7ff0fe120cc1ac52bdeb36d6ec5f2bc931bd42ce81aa5ff3"; + sha256 = "70e44a8105ef260b3e10271f1a9c36a5149a485130d5a1219397aff93500639a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ia/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ia/firefox-98.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "9954901a886af4e290e64bbb6f6787436182850dc29f5e246c9a53b1df10ff8e"; + sha256 = "a121636fb2513557f8e7e0a1b30e3d855202db14f997437cc5a6d7863214d385"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/id/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/id/firefox-98.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "6f8452d04dfdfdd013c18db31f88934203c6d3321b34d6d92dcc393ef9cce523"; + sha256 = "eccb423ef76aab7725cd21efda222ed63c030d494c294998f4e9837ecccbbf06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/is/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/is/firefox-98.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "fbdb3b7fa4ac13e654d5b1be90a7558c0912bf6288ce4c3d0214a4cf53768a45"; + sha256 = "86aac8ae944846967e472d6fd893c40ac988c25a2c2ee9af40485e216bb67b2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/it/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/it/firefox-98.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7e9ef17a0a854a1616d37fa684bcc8f9447cb98eac9232b70adcdc3d61d3e558"; + sha256 = "f0ccf0977b3f3e05ed0d07980eca2179a808e0f62930690fb33f17b68c3bdca7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ja/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ja/firefox-98.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b278b661cfba935010b827564ba4229350b692e5a0cc6f04536fe38d16c6f37a"; + sha256 = "217159ae769b050bf9ff1b04ed80ad85a384625e2ccbf0d9f98c0786dc2e6c5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ka/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ka/firefox-98.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "0dec6bd016fa636a1422a4d705bf5813e2d717c865eb1c5e1bcaf539980be89c"; + sha256 = "c4aa9e994cad797afc081d2031296cac780e76966a7f231e6a0e3187d9e8aef2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/kab/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/kab/firefox-98.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "9789005dc9c6e708fbcd5b0dc1d41ae92703f8aca99e77a5b9ff82ec5e901810"; + sha256 = "cc8333cb75f48ea82b752023162a270f18e33cbec610571624a38919737b00c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/kk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/kk/firefox-98.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "2f8265737bd4e9f77e346caf56fc442c243e4183a6d679b1dc2a602617b94741"; + sha256 = "3482645b2581284503f72569caedc750706c439346917c07673ed0a27b0bbf36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/km/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/km/firefox-98.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "25181612508656ba6ea558d3085e31860bfc70196d0011478885cc46af1e310e"; + sha256 = "b70fcfa2b4b4bed16d4fe8af2d57d8b7a4af346f321ece425895c10f7ac058d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/kn/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/kn/firefox-98.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "d8383e317ba7e9c599b87ebfe15dbe0fd45580fe8faa155e62ad466d883a405d"; + sha256 = "63550bf8572312f3c69c90f65de89423fc0ac926736723be3034d5d441ceb1e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ko/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ko/firefox-98.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "64a359934fc21a3d3d4c6447fc3b869ddf017356d1dd23ee9c71cafcde7e80bf"; + sha256 = "de17cda5324ca6d179b9d576b62cde0ed21718b72896b161631513b654540cf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/lij/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/lij/firefox-98.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "372f106a7c5b0f1499c5562b51918e9ea349018c7716677629ea984f185eb27a"; + sha256 = "67cafe6a9f0c01aadb1fb55afe273fb58e4baeb38be2b472ed90a83c72b07ed6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/lt/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/lt/firefox-98.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "05b0f431719ab8cb7df2e803d824bd42c0b30107010bb037343852c265460cd4"; + sha256 = "135773dc11e691c20f20b0a1d37e2b25d92062c573846127c113896708e649d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/lv/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/lv/firefox-98.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "946f16a920a0581c7a201b3228c15014d92ea94c2c6ed9d833170e4b9d029b20"; + sha256 = "44bfaf12e5d34e1b8e281d00c7d9a26c2d0aa0a8ffbd74df9a5026e15ac12b66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/mk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/mk/firefox-98.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "c8fd718b2e61971795d7dedb687821d5a46c0eb88c0af67bff3272c03395660b"; + sha256 = "94d7db6bc2ba9de25207a058d29d8abc57e967dfaf59c3388438953098da9580"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/mr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/mr/firefox-98.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "515b7b538e487c23e25eeb59d414a8a5b54cefa8f7bb4924be6327c8f9b9edf7"; + sha256 = "e2ef6708ed116e40d3cc776c483d3cd42c91988673b91d2d29f4da8ea996f1c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ms/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ms/firefox-98.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "3a6af28c127183f75fdfbb4484d32230c4639ef8c7890d6786525900552b0ed2"; + sha256 = "e376a479d170ff881d6de21f9c03ffc7a4968fccde7347e9fa261de7bb11e427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/my/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/my/firefox-98.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "1aca62c666431d987940852d1cda29281e30846e38a3855babd7230eaf7db5fa"; + sha256 = "a1143bce18aaadd340b69403f064574664f202765ee5a8553ac6d3372ab33134"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/nb-NO/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/nb-NO/firefox-98.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "04ed45b20776d517a08496bbe300d46c85c9a5c2ecbb74b03b0f22584ed506cd"; + sha256 = "eebdd022202cb7140db46995a3925c990e614233f3e15b850e5176b1f2c07907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ne-NP/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ne-NP/firefox-98.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "7a921f5c2667fe21cf62596e5eba8152c0c68abb3e81aaa25d4cb134ca9efc1b"; + sha256 = "084a278fe0b67a51126518d9aa62cae7cf78d96e3f6cf5b191f136a5c20acf84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/nl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/nl/firefox-98.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6379dcfb0c3a739dc65314531a425f03483f2b2b2359d89ddc8924d74a349743"; + sha256 = "fdae25ccd979bdb5b4bb23f4e9e82e432df98059d82732ee187f37c8cb3547d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/nn-NO/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/nn-NO/firefox-98.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "2872e3a05a7cb5dcc974f0f11b785207d21c76932958d6c6b0f3da73f73e4351"; + sha256 = "7ec4c099c7a282a5b38df9a124ea6f2ee3a1704746aa308431aa8c356a57bec5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/oc/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/oc/firefox-98.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "9ee1a08401c0a605ba42d90c3c4e297a4f295357faa82bf7b99950cfe6bbfa16"; + sha256 = "7f6d8ed3a7511d6af408c47c626a3e141425925df364f26a622a088491d7fe5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/pa-IN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/pa-IN/firefox-98.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "97f250aac0f6e096bcaebbe50e3482554454746eb73868e323fce73e72781464"; + sha256 = "9fa3699918286b6f9f8829beac8cd45e59f35f389a09e0cbb34dc393885ec8f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/pl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/pl/firefox-98.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "3e1a7c882c02907e39b6bdc4f21899bcfd3ec21c66425727f8db0d3e897ba8fd"; + sha256 = "e2ebf0346fb5b626a048a720782e325eefd04f1fe62de5c57826ebdd3ab1bec5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/pt-BR/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/pt-BR/firefox-98.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "ad31fd6dfd33647cfc2c886b99f06d868c9de3684d601ad39a0e16ad42fa98a7"; + sha256 = "dc79e634319ffc7221245e2a081cf6bfc15ddcd4bd8bf110d5dc15732aaab33f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/pt-PT/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/pt-PT/firefox-98.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "5a61590a49cebcac6ee9b6bdca80adf77458aa49eaaa989dd82bebfcdce6da1e"; + sha256 = "f94ba01eca76939d1ecbfccfd9647c96244effb080df98b4e04d3edfd80ffa48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/rm/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/rm/firefox-98.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "f03d956145c0780500c4eb5bc244f85ef826fe02606ac3df666f70bf6c8a28fd"; + sha256 = "6b27aee9330a94e659da34f17213522687859263ed8500daf1d62fc496cff033"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ro/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ro/firefox-98.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "42c514d296923177bf9b19a961a6cc322f5c3970dd42de583dc630320daa139a"; + sha256 = "b6029f72497173e8aef444cb42437d6035354fe4a2bfe6359c50eefa4d6e1850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ru/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ru/firefox-98.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "90247a6c685b3bbae9a1073b9003239d5185927c68e75b3399b27af1c3702ed5"; + sha256 = "73cbafa190a5083cfeba8ad0971d28eaaa228b9a9345ddc72d4f5d6490ebbad1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/sco/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sco/firefox-98.0.2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "c7d3799d03df9e50e57b1e2264196962146ca9bb953c8a2610ad62927426d07a"; + sha256 = "dd2d86ddcd270d2bb58c7152d15072341460a09b2da1639a76ac70afc9a714e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/si/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/si/firefox-98.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "2e27aa9eb0eba899a27d12a1d6ef63776365c06bafbfd6d3aa3c3ce2418de05e"; + sha256 = "0cf0281b2d082b3861947e5002f843df050586e96027ec30acba2913ce588daf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/sk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sk/firefox-98.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1e4ca0a7d7c11444a31de6dff04ef4a98ad92e6cd30187c7287c01d570bdfa48"; + sha256 = "8853372fdbe0834f6322e2e1c03d909b2c21f60496d7e679266dfc35e5835191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/sl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sl/firefox-98.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "59307696ffb8727e95cb2e390e3d00c31a590cb0d5bf5b860dc516085ae57755"; + sha256 = "ce97423a4ad380fb019b3e4c8d57a44bb15ca0b0afc7778a10fd23cb9382c143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/son/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/son/firefox-98.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "4b1c5a2a46570913fd6784e91f2b55db39666fcebdaa2b56684e6f1d674a4abc"; + sha256 = "468b642210c8c52ef5a8b91ddf81b9ff9c25768d7b0481f361e7c95861dfa5d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/sq/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sq/firefox-98.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "ef1bc449a6649e8476beddec58ca363601b1ff09a27ad053a0c576e7f9375dc7"; + sha256 = "8a079436e4be7ceb82b56f02d50054066906b2f819b787ba964d20c64ba731d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/sr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sr/firefox-98.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "76e5cff9bc3001c7ae66b3971ee6b526ca52a04654b98bfa8f027200329123bb"; + sha256 = "e9f0f1a8d6bf3bcb6df32a27560e952e3373d712cee08fb97e1c41b76052d370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/sv-SE/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sv-SE/firefox-98.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "efcf35ec4f65496f4e1b81cd0fb6ebbbf460dfd5257ccf44d75547d4474f8f23"; + sha256 = "eb4b4092f1f667661afbce19e0d3ef75301976689f1ea2ee11104d11fea2ddd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/szl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/szl/firefox-98.0.2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "e62f290ab601c5b4899de0115a476a6e5c6fe854a89c2555a059de0e9ad4f446"; + sha256 = "29c9fcd787fafc93480fabb59573dd500d557847079f032a6f3ca6e9c4422c80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ta/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ta/firefox-98.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7eba2c9394ea70e3cb1d56e1e1ac0c3d2e423fef6b6ae523962ac5f13f93f0c1"; + sha256 = "f07b8a79048b55d6fd8f7d19858ea2f1b5f53bde782c65ea7fb3f34d9cd5ac40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/te/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/te/firefox-98.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "f66730392b3a7ca2480b997288ef3502636722314731a33e930d30490c762715"; + sha256 = "14882f8a3c425dd512c37f80fd45bdf9d34c4d7163454e1533c6306713935d36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/th/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/th/firefox-98.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "9dcbc894d4cbccf0132808d56a4b1f45242bfb439d9219315ca72839ea46c5b4"; + sha256 = "c91bb2249cd2b22ae86b1b51fe6c34062a4da7772eab97b1e39915a2c2782488"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/tl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/tl/firefox-98.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "461a6e1f9107973da675594cbde1c3371f3636eb7f0bc1287f162f6b8e6b7823"; + sha256 = "1c6fe06f19821a7a77a26bedf38ed3fea20561df0589c672027b2108e080e6b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/tr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/tr/firefox-98.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d3dabac4567b81f988d209c094b7e80db12465f62622c21332d7f05e4e26fedd"; + sha256 = "c06881993063dcdf6fbfebe139f9fdafe2ca37667375683ae85497603517b5a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/trs/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/trs/firefox-98.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "0978b21a644764974d2bba3a532d3ab5f9ac66127cc51d9b0411016c6778c696"; + sha256 = "fcfd9120933339006f1868b27e0fff1d60f562a3d11e826bbf9996f69d4256ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/uk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/uk/firefox-98.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "f42e4a326aa1aeb2e2d82bf2ecc7c8d38fcbd613e090736a047f4f715f955727"; + sha256 = "01cabeeb98988d4478d381b34e7c0e6cde887d2ea83feeb349763ee454760924"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/ur/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ur/firefox-98.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "bf863ace693a73a187867600ced36a26e9236ae94b753a3c8c6f20801b49f2b0"; + sha256 = "db7de84fed953da53998ae6ff2456a02de833de22d13d1aa7e16f53d3bcb7fb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/uz/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/uz/firefox-98.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "89044b270b36a97b9d39350ea20df1d1cdd19628f048a4fb908316a9b081393c"; + sha256 = "9fe0fc4851f005160de9562123e48c19216cb013dcdd2b8bd2b745d7838062ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/vi/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/vi/firefox-98.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a983b8b260feb7777e55fc3022a130d7eac1e70c2d2472759009d3154ef208c3"; + sha256 = "e335f20bd5a63c2fa17ce15fdebe0c5af5c6787d37bd49ad2da156b450383ae3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/xh/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/xh/firefox-98.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "ccf3c8ec1c3aa9401693398deb82ae3a5bb3d4b085406f4f9986267309e04972"; + sha256 = "9cd953e87b70c979a8c03fde8c989f626a23f62a7d59be8796a09c8a8950127f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/zh-CN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/zh-CN/firefox-98.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "3dfa8a328952a2072431d8b532c0c47312e35bf7dea70c45344fe5198a2fc1e7"; + sha256 = "2c7d059be4474164fddd349fc3f18d1f380af5f9ba82f8e01b04e2f18bcd09e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-x86_64/zh-TW/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/zh-TW/firefox-98.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "d9028ad8fa1467c8ad16d16d758d9039cbad8c9de03f8c730680e82d95ad49e1"; + sha256 = "37b5a0275b137b0ef578591ccf5a54518bdbb449915f4ad50c276952a0bcccd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ach/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ach/firefox-98.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "117b128a7a24f7b582ef47afe4f1277f8c41e56cc2dabefa9e2761985a922c4a"; + sha256 = "b3b734eb8d62112f7983e86dbd49d2d3be3ed6d2f80fd2d7bc189f12e03ab0b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/af/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/af/firefox-98.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "4d7e19a89324ccbc740f1466b425a7ee8643c61c2b912e8c1682d26ed2161b8a"; + sha256 = "fcf6a355f70392606ec2ed5853b1d14e8d5923fd92c10774c776c43e6c8a6cdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/an/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/an/firefox-98.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "025f3022d2d1147c0d34ecdee4b5cc569e9ed4a0bf06f1d6ab57ec897bd1ecfb"; + sha256 = "388532ad380bf43c287ca3e7e29a3a6f97fbbc0e02c2ae5207ac07587c3faa2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ar/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ar/firefox-98.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "551fd200855a19e9a6f340143112011e02b148e01ab1e7fefaeedbeb9db6e464"; + sha256 = "178a38e6bec65a59679944fdd6882774d23bb15e62f2e697cf369742bc4c8196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ast/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ast/firefox-98.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "b0268f0f8ef786c7ae565bdda7bc18c40abe0c88a697c477532dad777540db3c"; + sha256 = "5fa0aea769c7f7fba13168fb404f03b2cb8f6df5ab733054118df67015ab665f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/az/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/az/firefox-98.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "69b7da590e9788548fe4acf2441780ad9aed2e896f799f9f38e9e49b8613400b"; + sha256 = "62816d95c32f04090a5e23bc38ebc774355ac77dfdd1a41a2d6e10ce983c53ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/be/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/be/firefox-98.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "1b96a70a6dc272e5a97df6a83598baf3065c54b02286a77df1cf459b750fe400"; + sha256 = "918447a5f57647ed5d846a0a0bbbcbaa55559722de7b8dca2ed2e744eb14ce36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/bg/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/bg/firefox-98.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "06f3e54d8a0dac7fd696c9e205d57dcc7ff3bf61be8afe0e125ed94b6cfb0dc2"; + sha256 = "74851892da2c6c0a9a75d822aeef2c0a275fb5bbc32b88abb28e67f9310bb2ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/bn/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/bn/firefox-98.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "f6e416409075720bd440163a5f852a8b9e34684de966fe7675733dcd3cf1b9eb"; + sha256 = "2a6f53aa3fec578a76368120bca30240bb631db9767159aedb3b5480c1ab661a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/br/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/br/firefox-98.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "8d9ab421a13aaf130b2487e3b2ff0a4c68da19ccc019ebaea9fbc506ccc02ac9"; + sha256 = "5d1d9478f459bcc3e6b148ff42d6f9f589b8fb395672e3b8ce8f333832b523dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/bs/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/bs/firefox-98.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "3348a5431c072589366e2226b096c24c5c206dfd088f475f6814b56a674ba8a1"; + sha256 = "ed99ea471d6e30c0304bbb27bbdf88b479fee4df7f8cbba481d03de13954131a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ca-valencia/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ca-valencia/firefox-98.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "38c46aa9998c09a5498115c2747bae7af74e79aba3e84ae8030979eb566e67a6"; + sha256 = "5dd1447b3fea23f08551b2ab5a80581c3e0e09f5602709cbdce751d491faa60a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ca/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ca/firefox-98.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "5e1f0a52844e54f689ddd8d101a1a35373aff57d2123bd764808c5e6e00f9a33"; + sha256 = "21f6c622de4016a8e372ae7d249a07800b4393ba02ab59994356869a01cef571"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/cak/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/cak/firefox-98.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "0bdd0ff060093c85c3dc4ac690b4e8e094165da76c1cc32df0ce2bd738f6d629"; + sha256 = "e9895877763157132e390f31c859b561c7d62adb011e209ab9cc0092ecfccb1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/cs/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/cs/firefox-98.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7adf999a82970a477e174b06bd20d0454a72fffa8e3ee3f21e72d02850069918"; + sha256 = "13c94b8b12fcbee4d41c6f7289f0cf2f199ef3d750628cc0ea11a60534ab6954"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/cy/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/cy/firefox-98.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "b8aec416d144b49395230194f056bb1749a5056adaabb132ff95da7bb653cde6"; + sha256 = "c21d9e83d14ac46effb9e12a5210d7b56e3d765eef877f8ac4ed5104582d2631"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/da/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/da/firefox-98.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6f1ef67a6394380d948e0365610e81e2fc0ccf850d6167f90c258c26cc363598"; + sha256 = "74a4a14ae8d8f64c56ce4409851f3e8e51bac61e2223c022f40d56d341fdcc65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/de/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/de/firefox-98.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "efd33ca5b825d9d62380f28a0ce6f9e4d1413570eddb94922522e8ac5272b8f3"; + sha256 = "d3449eec8075f3b6d07b2e6d7adecbec60a7e29b12c2016f642a90c5555971ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/dsb/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/dsb/firefox-98.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "b426f1945115787abafd1d91dea98e1e5b420a017cc596392cd4df7d246eb580"; + sha256 = "0dfac7916796d4ec7943963e28d7ca65f78661b6f22c226afb2dd00db47917e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/el/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/el/firefox-98.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8b9882be7db1ed6442e46fb47d8615ff1f408d95472cc40b96b44f0626907983"; + sha256 = "c2769489e0947a7eeb0cb1f9d99d51317fd037e2a7bb06134403df1d4560a767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/en-CA/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/en-CA/firefox-98.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d73debdbd205a77d813570072c900251da002ad829b62bda7921e8ae2b749876"; + sha256 = "87bb7162b58f7632ddf733fbdd4f195d75a9a6d467355c2625344171c72f4e9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/en-GB/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/en-GB/firefox-98.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a523d57d573b59c1ca4be7912c2a84b77db89f50417d7064f041474fe270d95a"; + sha256 = "89bbf10bb75effa9e8064b6c42d0a4d7fd21ac2cd6e4ed3625d92c6b55ba1ee6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/en-US/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/en-US/firefox-98.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "0bfaf456bdcfa41e0ca4c45718734a70fac419f29edec41d3357708f38813240"; + sha256 = "888db6752eb5703af5fe5ab4b1575f2a35dbd204614552fbe3a276042a3509d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/eo/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/eo/firefox-98.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "1223972105ead68b14903d9bd081fb23fdaa4cd6cfb8eef970253e64b467f141"; + sha256 = "a2004dc59269fb2b37e568767593bcc0a7862a109df18f548eb1a0b829cf4293"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/es-AR/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/es-AR/firefox-98.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "268fa9d6a476dbed0f2f20ad32d3de8784159dbbfeb8fab67f22088167b3ebe6"; + sha256 = "9e2c0f6cb231c469660cc7fe63489e69a2616553d17c52f5e7a2a86a171bc6e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/es-CL/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/es-CL/firefox-98.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "7c0b04a76748c77f78e629b4ece02ba8c9b237c229f699584408deb975a618cc"; + sha256 = "dfe6f1229a6f80b6fab3a22fc8a8a6ecf3137b31805339a489ec53e5af63f040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/es-ES/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/es-ES/firefox-98.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "59d9a063c4e072f7db25fca31b2ea93bc660a5290bf0a52b6936e3b7f6526708"; + sha256 = "01020488ee2ad2e2357bbaf83857a2ad0820fb9f97302d1447cf4148b22d2bd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/es-MX/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/es-MX/firefox-98.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "f9ea0cdb41fba2b058df9a8547fa626f368c820de40a07a5630e46c751f09e0d"; + sha256 = "3c7bacc6f703cdff7adb9097bfc39f52a67aa6a9814d7a8f451d4ef50c591714"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/et/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/et/firefox-98.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9dd85d7102378cbdf2a8307fadfc3c875ac7586aff93592a026fec03d924cc76"; + sha256 = "f2bc8e4200c89cf74ae6c984543e97b2523782dae70ecf6135f47943a01f1d83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/eu/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/eu/firefox-98.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "fb7de46ac3086baa493410aa184fe2e8af2dcc74d516f702a019bd091cf93563"; + sha256 = "62bf0d826adb66d755f38bf25199eaf3850c37bfddca627b597802a20f8d3367"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/fa/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/fa/firefox-98.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "f2036970faecc4e37e80fb8a128aa35ad260ed6774d42b4f1b797e63dbe756fb"; + sha256 = "9d4dfff33db462c71eb12067f56f2e20b0a557f9cbf1234b617e1c2ab5832ea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ff/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ff/firefox-98.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "b4d4cab79e00bed477a26da373e134fe319ea296c46ebcf20e5e92622a241bc8"; + sha256 = "5b3a271207003e25776a55b7ee6adba2f83e844d4b0a738209d21be7db82ac33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/fi/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/fi/firefox-98.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "8185c38f9511b0b38a15679c8e4965d29a6f3f0dee94f1c3c7b51d1f46e175c4"; + sha256 = "50a9408303ac8fc7c22da96f993b0b251407261d35598b4fe06f1c545788ef0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/fr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/fr/firefox-98.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "9ca5fa4bb1ad4329ba16e3926d78d59012f5c602f076fdcb302714e843dd2d1a"; + sha256 = "65db55f518be2abd8da5b52654bdf0efecd94b21ab843b76a6ad9e9ccb516a55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/fy-NL/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/fy-NL/firefox-98.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "4f3e48689490a883f68e5501759d31f7f415897aff6bc435265ec1ceff4868c5"; + sha256 = "b3da8b5a077e4955bf2c662840005adaba2dd77af4724e965403da3139b5fb3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ga-IE/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ga-IE/firefox-98.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0b6eba35cf420252b9864b51785f9ad3122fce63e73dfea103619c6a4e9b2ea0"; + sha256 = "f4812b90fa0a0391d2a372e7bf45a3393d59714209046618e7b1ed72f1889e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/gd/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/gd/firefox-98.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "62d500428de85366503c11beb87370d67bbf0cc26a3396ec22535f6e7c731fcc"; + sha256 = "769c42c86d5b3866f9ad38bc833f5f1f1b01c7f5ed6898eba064ce6f31c9f550"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/gl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/gl/firefox-98.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "cbbdc4165500ab3dcb10035b3fcbef5ca84612b8972821f2a9c974c55bf2de2d"; + sha256 = "b75ed9efccd63053589a3f60fbabb6ce5fc1c027a1a00789ff23b6971b0ebad5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/gn/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/gn/firefox-98.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "376ef506f3197384d4f93bf0e9c535181c82014190c881b0d61c957016b455a5"; + sha256 = "bf60ba48f5d5a18ef9aeaf631d564412788ca102990b69b176ac66c1b8e3535c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/gu-IN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/gu-IN/firefox-98.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "a2c77948f281162c8d430f5b5e3ccb1cd787e2b57177987a2b1a55c2f4c6c617"; + sha256 = "19f568337cfba71d7e1626099b1c6cee4d69a0332065779e5375da648d70a3f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/he/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/he/firefox-98.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "89cd9df5f34c129e9cb6d8a2c5cd964608f798a878aa2b695df00f8132fc12a2"; + sha256 = "7d6a55d76f74d85e2f9da77ee071df31aed1c37f9fb139e448624a105b6ef19d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/hi-IN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hi-IN/firefox-98.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "aab1f42deaa1cfecc31e3c7cb5f604da1856363f230ec61b921397838fd86b48"; + sha256 = "12451d7cc49ca2629ffedeebd1d77f8ac96d5839ed165ea91f55a249427ebf09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/hr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hr/firefox-98.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "bd585129e356ef3777358a38a86ae8452a5b86abdd9b28778d12ed73564561a4"; + sha256 = "b2197d6d51847848cd849fef446e8b84725fc2b9539824e65719c4fd1d7f29ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/hsb/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hsb/firefox-98.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "6895520f5a675d5234b1556823684c6e26b7fa68b92b63931f28995face794ba"; + sha256 = "5000e21630440a446416de3cc38bcfc7c22bb8bc8d1a1a027c14b9548acff74a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/hu/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hu/firefox-98.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ebfe02bac09e691ef4dc2b2c4e9710816d629b30bfc9a799f47adb81a9df1ce7"; + sha256 = "dee75736596f5f0dc1d6952327274d07f927ff42e7c9a0ed8c8ba8dc78a6b3f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/hy-AM/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hy-AM/firefox-98.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "fa1bd0398ab30da697189fb5ac3ecc641bb63c42917259234e11e4fc1d1f8710"; + sha256 = "4b7dcb46864b058bdbeb35404de32c88e2822dd0315f105e95f61be857288282"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ia/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ia/firefox-98.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "f981b9d9e290fd2efd8627a0f5e831de59d4d62833c0e5dd4c2f249791233d51"; + sha256 = "e89e07b1d71e1b2ccfd4d412dabea164bae8448f57a5f99a07ab04f9dcaa0bab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/id/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/id/firefox-98.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e8b5511d6e24e783677a4e4766151943283ae9b6b7047cf380ab33d7d557de80"; + sha256 = "398ee6ed278cec1ceb489dd06d8f4c2671309a3e0d61f3202fd5280a5b596ca7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/is/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/is/firefox-98.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "3e2eb36a19c5cbf69d958d7f19c0938039f1c26fc94ddd33696316cd709f5298"; + sha256 = "a3531b8f68ee22452390ff8e1c70d7f6b842e10ab60ca6666f79fd958284d099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/it/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/it/firefox-98.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "0365c8a8395cba72a2f57a65034c00c87e1dd392efb4bcf073812efc49713225"; + sha256 = "fe8fd2e7b0e87cb3b12ab6d8d973c422ef763d9d3a78620fe5a9f374455ccecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ja/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ja/firefox-98.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "6c3d8d2f71b3e1d0d5e270008dcd53ada5106b3f5239d2f2039eadf03b9dc076"; + sha256 = "5d52ec4afd7de44806b804b5de6e597228d7061c10b0cc8d6fabeca505a0b207"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ka/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ka/firefox-98.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a63591cd5b0ff79c2ab0baf125cdbfff0baac178dbb8fec5d50c313e2d63a4d4"; + sha256 = "902abc9df459c6dd2168050764cb2301ffee566f4deb11b2ef7c694cf429cc58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/kab/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/kab/firefox-98.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "80e09564908adc6fd6219ffd58ff2e4f91da04a42ba2535014526317fb63763f"; + sha256 = "aa96307da2c832df7ea7ea418d3dae6dd9f2aed56432a8ed6e43fabe71aa9828"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/kk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/kk/firefox-98.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "382fdf810ea304cfb12d8d19c28e407a404c75bf09770b882abdad3c5d101eb8"; + sha256 = "addb689db7bb19f28db963ca61dd0ece3813f5ca21f3437c1320c3f972e19029"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/km/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/km/firefox-98.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "2ff261744a3d3466086d175c860b7a7565848870e77bbd8af93bb1f0b7b1baea"; + sha256 = "7a982cdb847d162c6cedf724adebfab904cfacdbe3d4e48ee9af3e644e74cc14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/kn/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/kn/firefox-98.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "bdd6864ae5fa723f47d029a0f0d8265c865b7635d33aaed9003f26d4962ba34f"; + sha256 = "d2cb6eb8c004d9c0e0929d8047d93902a2235b5068b86672c693edef1a2b8911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ko/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ko/firefox-98.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "643a9b2ed25c15a3e2139af4cb80e249dd8da3719a36cc3d21549fd36de8631c"; + sha256 = "63770f2a873b520e5b1c1bece82ea4a987a2ae6535f9c4047e99b68f62c91748"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/lij/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/lij/firefox-98.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "326260fd6b0a996016cdbc0668cbd819199cc9f39584eb81e46182032b2e4175"; + sha256 = "ff130a01dc266b5b49f39f9c4355a6576211c0008cd5008290266daff222e18d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/lt/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/lt/firefox-98.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "7888d9db18476a8f5d1e6bc69159b80266bd0bc58e302c66b3aecc6bb304871a"; + sha256 = "04105e0614b660d0e156b0aa2307af9d0d11236119b6667718d7f0f1f13ae505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/lv/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/lv/firefox-98.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6c6eb3f523fbcee8342de1d0a159afa8a182621bd126e030ae0bf663fc7341ef"; + sha256 = "50dd34d558800dafc84d714f5cf08a26eb4970c3aa6b8850430aa156d8869549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/mk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/mk/firefox-98.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "d86c29d3a883d7caa7b6d5eacd43dbd7c25ec2cb01f8cd6a2a81da794bb4e7e4"; + sha256 = "8ca0b1cc9ff39757f2cc513d61a77d1d95a607862ea654d6743bf4a8f7bde99c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/mr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/mr/firefox-98.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "d2af69b599ef0793361909104e7ad7889f86789e534dfee13b977a044802a834"; + sha256 = "b24884486692dfcad578026498a3654d34ae78cd39e977b3708053bd7754d37b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ms/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ms/firefox-98.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "8876f2df083506768b674e20d43e4da2c0d54f717fc4df306c3386548ae42921"; + sha256 = "c43f2f10d928a3cf875e81afb54c09c1ef49ff8457069c054df2f62e0a43979f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/my/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/my/firefox-98.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "ce16c5c94d81c3d0b7cd763123c97ef8e56bcd01ddebb616ebd1ab77d37f1650"; + sha256 = "296d3860c2224deaa43184fa85dfce21eb9fc9b11d080d7f71cc189c4a790ed3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/nb-NO/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/nb-NO/firefox-98.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c56b6baf9439af5612e4b141d3af24bc12b256e93f13775f3e6d98065bea079b"; + sha256 = "b0ce5e0157ff9f64434b38cf9338960870bbf6bdb4b75494b82c8ba871868ff3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ne-NP/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ne-NP/firefox-98.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8c9dca9eb2f824697a66cedf1f3b92ab94b312b1463fa72596962b7aaa93cfb6"; + sha256 = "58b7a719e7fb10bf7bfbe23f4ffcf002434652f792a3a1ffbadb13a5e06a04ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/nl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/nl/firefox-98.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "b20a48a30c36750578b1365837be5bdb190f338a046c47748890edf96c4cd661"; + sha256 = "2951dae0cbb3bec0e47ae44b70e6796ace16c8fbac18d7d04da84a51ded6a650"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/nn-NO/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/nn-NO/firefox-98.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "9b7c79689c11d95acecb34a9a8022bf197384dc79b229fe3e648f92e08ab58bb"; + sha256 = "6f44201f301931e3b51144d57a79c484b776c37cb29dda93b57795c0a756c62f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/oc/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/oc/firefox-98.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "f2df32774438f105d67a80e8c3c0ef72b0606dbad796b34ae60f48942ab755b6"; + sha256 = "899a48b47dd642a64de0ac9226b4655e74bba9f0f6d1eccebc1c1875e1d3ea12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/pa-IN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/pa-IN/firefox-98.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d5e66f3c0f9c3a554f7c9254f46f15e2e087e1ece1a6cd946df03cc1067b42a1"; + sha256 = "392b6e6cb3ca1ef3e17f73ca327bf7fd49d453ee0216f922dfc3bfc7b2ce18da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/pl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/pl/firefox-98.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5eb5863b680e85e322d92cabed13683264d1503e596ef604cd60ee6c9a2c30ff"; + sha256 = "f4f6124c3520c58ee00b7f4f00a39a904657b21072fe3d822a17b072c8e69473"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/pt-BR/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/pt-BR/firefox-98.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "b1f14be92a6e861fc7dc04274d9260d863fad697ea3bd5b39f2254430ca5999c"; + sha256 = "b19e3aee72fb779ab139535295d3279cd06c125349fb5ee71c12737ab2aff733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/pt-PT/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/pt-PT/firefox-98.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "e72d8c50059ca2b87f7f75d53dd8c3e8523792326ac1b245c012353a11244023"; + sha256 = "0924bc137f6eaaf6686249f59540eadfd9b09aa843a071bd7db5d62f742258af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/rm/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/rm/firefox-98.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "47809c62aa91491b0856c1d775f700197d7b97b6b26d1ac2e41cdcbcedbe25a8"; + sha256 = "ea9b082ba495a19162c0945b865eae6f66c689962807873bf27ad59a3e83c85e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ro/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ro/firefox-98.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "5517806008befa780195a69a8f5a0b1f0c21b9e93ab2acddc6defa58bcd5ca23"; + sha256 = "3bbd902b4ace383d914f51553bce3de83c2ca4f6366e3f2dc42268795c7bf72b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ru/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ru/firefox-98.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "6a2050e7b67aa42b5deaf2455daaee8294cd987c5b7bbc95f6055e7c767c29f6"; + sha256 = "84296b00a3646cf8d0e7ba3ec6cbc90592b8fe8b2dcc36b8c904d1e15c264575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/sco/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sco/firefox-98.0.2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "e6a0ad3eeebde291d3196ea98704708bf23f22ee51df05c6d3e8170a97be7003"; + sha256 = "8f966e6fa33e9e0242dd422818c9c46c5ffe37ebeb34e01a7eb57258e0aea481"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/si/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/si/firefox-98.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "61d878e6e91a4aeced23cbdab43362fa12ff378b1f71eaa334fb052894cff070"; + sha256 = "3ce96976ec5e920b20fdb1ff7fa8d20db2a67c0797ac4307f7e387db91306719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/sk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sk/firefox-98.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "8cf44c88119dcc189e3792aa0da589f539b7986cb909c690262ca27d8f354cdf"; + sha256 = "1a4d37ac6777185230343dceb4902b55e0adad62d144347d09f031228583370c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/sl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sl/firefox-98.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "36799bbf527451d66dbbe93c9c59ca2f2b57c9a7541ba5ca26169eccdce67e76"; + sha256 = "e1875f0077c3c03f34d7fa33e807d0297f831d451a045cd55accc493c3dce366"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/son/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/son/firefox-98.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "a40fdc44a5dc12fe62a4a86d88c2ce970bb95d20d8b9f99f6826339ed286129f"; + sha256 = "1d13d9d3f9d8cfc03e5e45cd1c62a08b24437ed9feeb27ce42b07a75f0aefc04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/sq/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sq/firefox-98.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "b40fb49c73b5d1d6c0784b94f99bfb9804c0c5dfb40f579dc58ecb3e1625733a"; + sha256 = "e2ae3fa32c56258069cdb95231a5d3b44218d32f0b10afc4174ac204bda7acf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/sr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sr/firefox-98.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "6f91b48edc1a158c0d3e9413771d4de8086bfc271ce353a7af5849f9ca8ae969"; + sha256 = "96a5178bdbca9f6d1434610aa0d35c32b6eb542d6d3e760ce778a8e4181515f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/sv-SE/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sv-SE/firefox-98.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "24e91611cbeaf0f4276e92f7f2eb8fec2138daef6928ae0520fbac941eb80a67"; + sha256 = "fabe9274a8ac78ba84a394a7a5e7cfa22c41e3b58c8e6b94496fda6490bad644"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/szl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/szl/firefox-98.0.2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "3ae32ba0b3543f09f3420d049818fac9cb1640585d7a28f1dd6716bc2f7254d3"; + sha256 = "d77505b5fe04946002e5d1a28081c7e2933ce910a8d67f4e5ed31508808cfd41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ta/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ta/firefox-98.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "f5c15f7ed3794950b59ecc53a1131225b47a9ca80b511a4ad6d8102c59fc1f2d"; + sha256 = "a34e5b28526f9861bdc7af910e0a3418404f4316ad5792607493a698f480c9a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/te/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/te/firefox-98.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "d57ec26edb702f4e266f312f58301291e8591f27e1b192271abb02eb1c0b2b98"; + sha256 = "c3b8653af6ed8f4cf7e9f3e5a4a0c622a163f7c45dd0d1ddcb3936e1504ea1af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/th/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/th/firefox-98.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "2f8c857dc7a76dd6b67227db7c4e96a46731e62c94ecb4aea9fc0db02d564550"; + sha256 = "a6456037b76bf2adaa6a6d68f8b20f293f8a4fdbbc3e533c8a6a22aedcc3bf4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/tl/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/tl/firefox-98.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "5c32180b070711556389f075b4534af36512402b27d1b830b7ff61b6ac6dd6de"; + sha256 = "51ff115845f3d70a9fb08f08fcd3c1f86a41b3570f81f460c24a5a87605a779d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/tr/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/tr/firefox-98.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "bae06b7dd30733e5577e115f38422d19446da1b0688285f7c42dad67541ab99e"; + sha256 = "3ccb5735a16622dafe6ae465ba167ea164843c85df436e7cd20cf6e7a4fbb610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/trs/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/trs/firefox-98.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "abfda71628b8e1e2bde86313a40d6020af23375a35d5ca358b913018eaabf48c"; + sha256 = "7d1a71033460524506082087ce1b3ddc424207ea3ade6e0bbdbb00310e74cfea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/uk/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/uk/firefox-98.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "b3e5b473ef65142c874db372f0e91d9bccb98cdd036b6836d152763e3da9e91f"; + sha256 = "6db06ed2f126c5307ef6380dff4dae14cc39ca58d23b827835d3e702acf33c72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/ur/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ur/firefox-98.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "9cab179f8d78ff1e560b8abfe16a9c706196edadbe89533fd5fdf249922c978c"; + sha256 = "d00bcd6b3c70919999e748046b3291279d313f850c3daedae37259b695cb351d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/uz/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/uz/firefox-98.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "69f13464ba86fe89e601752dbb0a65f3c9f2d1316708830ec049f0b98933e4b1"; + sha256 = "1d77240a5f6d7542a7035fd32fd73e07bee1e1e880800cabd01e357a3da30907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/vi/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/vi/firefox-98.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "87fbc304b7a1da8b27cc2b1e3d15c6206293bdc3d535a98afcc9020b5ed205d9"; + sha256 = "9469a1c6613ea83a8e367c0e25e188ea9b9fddcc1497725a3ebb008fb5d5d73e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/xh/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/xh/firefox-98.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "cdcc87ed3e583f4a1720fe3fc8a9fa4d1241e999cd334c6caa9cf7692901807a"; + sha256 = "af3144bfcb52df706182fa04badf39be51e5774335af21d8ec38dcbebe3bdf13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/zh-CN/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/zh-CN/firefox-98.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4c19940887575f104a1f54a7cfdf98899894a51242cd3fe619512114fd8cc22a"; + sha256 = "fe6fc7bda0e52d64abcef8cbfc5e8576c64067b8746605e80790bde6dcd9b03d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0.2/linux-i686/zh-TW/firefox-96.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/zh-TW/firefox-98.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "0da0137f4abf987b7e8f20e49d6b04ba83f6f54e16d3fe9cb57ec2be8a6e6902"; + sha256 = "18da6dcf61bba9a22b5487f695793d65b952cfc7065ff334b0faf8e7ec82d90f"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 677c41e7230f..a1e836151350 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,34 +1,92 @@ -{ pname, version, meta, updateScript ? null -, binaryName ? "firefox", application ? "browser" -, src, unpackPhase ? null, patches ? [] -, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [], tests ? [] }: +{ pname +, version +, meta +, updateScript ? null +, binaryName ? "firefox" +, application ? "browser" +, src +, unpackPhase ? null +, extraPatches ? [] +, extraPostPatch ? "" +, extraNativeBuildInputs ? [] +, extraConfigureFlags ? [] +, extraBuildInputs ? [] +, extraMakeFlags ? [] +, extraPassthru ? {} +, tests ? [] +}: -{ lib, stdenv, pkg-config, pango, perl, python3, zip -, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg -, freetype, fontconfig, file, nspr, nss -, yasm, libGLU, libGL, sqlite, unzip, makeWrapper -, hunspell, libevent, libstartup_notification -, libvpx -, icu70, libpng, glib, pciutils -, autoconf213, which, gnused, rustPackages -, rust-cbindgen, nodejs, nasm, fetchpatch + +{ lib +, stdenv +, fetchpatch + +# build time +, autoconf +, cargo +, gnused +, makeWrapper +, nodejs +, perl +, pkg-config +, pkgsCross # wasm32 rlbox +, python3 +, runCommand +, rustc +, rust-cbindgen +, rustPlatform +, unzip +, which +, wrapGAppsHook + +# runtime +, bzip2 +, dbus +, dbus-glib +, file +, fontconfig +, freetype +, glib , gnum4 -, gtk3, wrapGAppsHook +, gtk3 +, icu +, libGL +, libGLU +, libevent +, libffi +, libjpeg +, libpng +, libstartup_notification +, libvpx +, libwebp +, nasm +, nspr +, nss +, pango +, xorg +, zip +, zlib + +# optionals + +## debugging + , debugBuild ? false -### optionals +# On 32bit platforms, we disable adding "-g" for easier linking. +, enableDebugSymbols ? !stdenv.is32bit ## optional libraries , alsaSupport ? stdenv.isLinux, alsa-lib -, pulseaudioSupport ? stdenv.isLinux, libpulseaudio , ffmpegSupport ? true -, waylandSupport ? true, libxkbcommon, libdrm -, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , gssSupport ? true, libkrb5 -, pipewireSupport ? waylandSupport && webrtcSupport, pipewire -# Jemalloc could reduce memory consumption. , jemallocSupport ? true, jemalloc +, ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages +, pgoSupport ? (stdenv.isLinux && stdenv.isx86_64 && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run +, pipewireSupport ? waylandSupport && webrtcSupport +, pulseaudioSupport ? stdenv.isLinux, libpulseaudio +, waylandSupport ? true, libxkbcommon, libdrm ## privacy-related options @@ -37,22 +95,24 @@ # WARNING: NEVER set any of the options below to `true` by default. # Set to `!privacySupport` or `false`. -# webrtcSupport breaks the aarch64 build on version >= 60, fixed in 63. -# https://bugzilla.mozilla.org/show_bug.cgi?id=1434589 -, webrtcSupport ? !privacySupport , geolocationSupport ? !privacySupport , googleAPISupport ? geolocationSupport -, crashreporterSupport ? false +, webrtcSupport ? !privacySupport -, safeBrowsingSupport ? false -, drmSupport ? false +# digital rights managemewnt -# macOS dependencies -, xcbuild, CoreMedia, ExceptionHandling, Kerberos, AVFoundation, MediaToolbox -, CoreLocation, Foundation, AddressBook, libobjc, cups, rsync +# This flag controls whether Firefox will show the nagbar, that allows +# users at runtime the choice to enable Widevine CDM support when a site +# requests it. +# Controlling the nagbar and widevine CDM at runtime is possible by setting +# `browser.eme.ui.enabled` and `media.gmp-widevinecdm.enabled` accordingly +, drmSupport ? true ## other +, crashreporterSupport ? false +, safeBrowsingSupport ? false + # As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at # https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we # have permission to use the official firefox branding. @@ -72,38 +132,16 @@ # > the experience of Firefox users, you won't have any issues using the # > official branding. , enableOfficialBranding ? true - -# On 32bit platforms, we disable adding "-g" for easier linking. -, enableDebugSymbols ? !stdenv.is32bit }: assert stdenv.cc.libc or null != null; -assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "pipewireSupport requires both wayland and webrtc support."; -assert ltoSupport -> stdenv.isDarwin -> throw "LTO is broken on Darwin (see PR#19312)."; +assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "${pname}: pipewireSupport requires both wayland and webrtc support."; let flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")]; - default-toolkit = if stdenv.isDarwin then "cairo-cocoa" - else "cairo-gtk3${lib.optionalString waylandSupport "-wayland"}"; - - binaryNameCapitalized = lib.toUpper (lib.substring 0 1 binaryName) + lib.substring 1 (-1) binaryName; - - applicationName = if stdenv.isDarwin then binaryNameCapitalized else binaryName; - - execdir = if stdenv.isDarwin - then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS" - else "/bin"; - - inherit (rustPackages) rustc cargo; - - # Darwin's stdenv provides the default llvmPackages version, match that since - # clang LTO on Darwin is broken so the stdenv is not being changed. - # Target the LLVM version that rustc -Vv reports it is built with for LTO. - llvmPackages0 = - if stdenv.isDarwin - then buildPackages.llvmPackages - else rustc.llvmPackages; + # Target the LLVM version that rustc is built with for LTO. + llvmPackages0 = rustc.llvmPackages; # Force the use of lld and other llvm tools for LTO llvmPackages = llvmPackages0.override { @@ -111,15 +149,20 @@ let bootBintools = null; }; - # When LTO for Darwin is fixed, the following will need updating as lld - # doesn't work on it. For now it is fine since ltoSupport implies no Darwin. - buildStdenv = if ltoSupport - # LTO requires LLVM bintools including ld.lld and llvm-ar. - then overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override { - inherit (llvmPackages) bintools; - }) - else stdenv; + # LTO requires LLVM bintools including ld.lld and llvm-ar. + buildStdenv = overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override { + inherit (llvmPackages) bintools; + }); + # Compile the wasm32 sysroot to build the RLBox Sandbox + # https://hacks.mozilla.org/2021/12/webassembly-and-back-again-fine-grained-sandboxing-in-firefox-95/ + # We only link c++ libs here, our compiler wrapper can find wasi libc and crt itself. + wasiSysRoot = runCommand "wasi-sysroot" {} '' + mkdir -p $out/lib/wasm32-wasi + for lib in ${pkgsCross.wasi32.llvmPackages.libcxx}/lib/* ${pkgsCross.wasi32.llvmPackages.libcxxabi}/lib/*; do + ln -s $lib $out/lib/wasm32-wasi + done + ''; in buildStdenv.mkDerivation ({ @@ -128,111 +171,109 @@ buildStdenv.mkDerivation ({ inherit src unpackPhase meta; + # Add another configure-build-profiling run before the final configure phase if we build with pgo + preConfigurePhases = lib.optionals pgoSupport [ + "configurePhase" + "buildPhase" + "profilingPhase" + ]; + patches = [ - ] ++ - lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++ - lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++ - lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++ + (fetchpatch { + # RDD Sandbox paths for NixOS, remove with Firefox>=100 + # https://hg.mozilla.org/integration/autoland/rev/5ac6a69a01f47ca050d90704a9791b8224d30f14 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1761692 + name = "mozbz-1761692-rdd-sandbox-paths.patch"; + url = "https://hg.mozilla.org/integration/autoland/raw-rev/5ac6a69a01f47ca050d90704a9791b8224d30f14"; + hash = "sha256-+NGRUxXA7HGvPaAwvDveqRsdXof5nBIc+l4hdf7cC/Y="; + }) + ] + ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch + ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch + ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch + ++ extraPatches; - # Fix wayland 1.20 compatibility (https://bugzilla.mozilla.org/show_bug.cgi?id=1745560:) - lib.optional (lib.versionOlder version "96") ./fix-build-with-wayland-1.20.patch ++ - - patches; + postPatch = '' + rm -rf obj-x86_64-pc-linux-gnu + patchShebangs mach + '' + + extraPostPatch; # Ignore trivial whitespace changes in patches, this fixes compatibility of # ./env_var_for_system_dir.patch with Firefox >=65 without having to track # two patches. patchFlags = [ "-p1" "-l" ]; - buildInputs = [ - gnum4 gtk3 perl zip libjpeg zlib bzip2 - dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor - xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - xorg.pixman yasm libGLU libGL - xorg.xorgproto - xorg.libXdamage - xorg.libXext - xorg.libXtst - libevent libstartup_notification /* cairo */ - libpng glib - nasm icu70 libvpx - # >= 66 requires nasm for the AV1 lib dav1d - # yasm can potentially be removed in future versions - # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 - # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ - nspr nss + nativeBuildInputs = [ + autoconf + cargo + gnused + llvmPackages.llvm # llvm-objdump + makeWrapper + nodejs + perl + pkg-config + python3 + rust-cbindgen + rustPlatform.bindgenHook + rustc + unzip + which + wrapGAppsHook ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed - ++ lib.optional gssSupport libkrb5 - ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] - ++ lib.optional pipewireSupport pipewire - ++ lib.optional jemallocSupport jemalloc - ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos - AVFoundation MediaToolbox CoreLocation - Foundation libobjc AddressBook cups ]; + ++ lib.optionals pgoSupport [ xvfb-run ] + ++ extraNativeBuildInputs; - MACH_USE_SYSTEM_PYTHON = "1"; - - postPatch = '' - rm -rf obj-x86_64-pc-linux-gnu - substituteInPlace toolkit/xre/glxtest.cpp \ - --replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so' - ''; - - nativeBuildInputs = - [ - autoconf213 - cargo - gnused - llvmPackages.llvm # llvm-objdump - makeWrapper - nodejs - perl - pkg-config - python3 - rust-cbindgen - rustc - which - unzip - wrapGAppsHook - ] - ++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ] - ++ extraNativeBuildInputs; - - separateDebugInfo = enableDebugSymbols; setOutputFlags = false; # `./mach configure` doesn't understand `--*dir=` flags. preConfigure = '' # remove distributed configuration files - rm -f configure - rm -f js/src/configure - rm -f .mozconfig* - # this will run autoconf213 + rm -f configure js/src/configure .mozconfig* + + # Runs autoconf through ./mach configure in configurePhase configureScript="$(realpath ./mach) configure" - export MOZCONFIG=$(pwd)/mozconfig + + # Set predictable directories for build and state + export MOZ_OBJDIR=$(pwd)/mozobj export MOZBUILD_STATE_PATH=$(pwd)/mozbuild - # Set C flags for Rust's bindgen program. Unlike ordinary C - # compilation, bindgen does not invoke $CC directly. Instead it - # uses LLVM's libclang. To make sure all necessary flags are - # included we need to look in a few places. - # TODO: generalize this process for other use-cases. + # Don't try to send libnotify notifications during build + export MOZ_NOSPAM=1 - BINDGEN_CFLAGS="$(< ${buildStdenv.cc}/nix-support/libc-crt1-cflags) \ - $(< ${buildStdenv.cc}/nix-support/libc-cflags) \ - $(< ${buildStdenv.cc}/nix-support/cc-cflags) \ - $(< ${buildStdenv.cc}/nix-support/libcxx-cxxflags) \ - ${lib.optionalString buildStdenv.cc.isClang "-idirafter ${buildStdenv.cc.cc.lib}/lib/clang/${lib.getVersion buildStdenv.cc.cc}/include"} \ - ${lib.optionalString buildStdenv.cc.isGNU "-isystem ${lib.getDev buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc} -isystem ${buildStdenv.cc.cc}/include/c++/${lib.getVersion buildStdenv.cc.cc}/${buildStdenv.hostPlatform.config}"} \ - $NIX_CFLAGS_COMPILE" - ${ - # Bindgen doesn't like the flag added by `separateDebugInfo`. - lib.optionalString enableDebugSymbols '' - BINDGEN_CFLAGS="''${BINDGEN_CFLAGS/ -Wa,--compress-debug-sections/}" - ''} - echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG - '' + (lib.optionalString googleAPISupport '' + # Set consistent remoting name to ensure wmclass matches with desktop file + export MOZ_APP_REMOTINGNAME="${binaryName}" + + # Use our own python + export MACH_USE_SYSTEM_PYTHON=1 + + # AS=as in the environment causes build failure + # https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 + unset AS + + '' + lib.optionalString (lib.versionAtLeast version "95.0") '' + # RBox WASM Sandboxing + export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc + export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++ + '' + lib.optionalString pgoSupport '' + if [ -e "$TMPDIR/merged.profdata" ]; then + echo "Configuring with profiling data" + for i in "''${!configureFlagsArray[@]}"; do + if [[ ''${configureFlagsArray[i]} = "--enable-profile-generate=cross" ]]; then + unset 'configureFlagsArray[i]' + fi + done + configureFlagsArray+=( + "--enable-profile-use=cross" + "--with-pgo-profile-path="$TMPDIR/merged.profdata"" + "--with-pgo-jarlog="$TMPDIR/jarlog"" + ) + else + echo "Configuring to generate profiling data" + configureFlagsArray+=( + "--enable-profile-generate=cross" + ) + fi + '' + lib.optionalString googleAPISupport '' # Google API key used by Chromium and Firefox. # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, # please get your own set of keys. @@ -240,52 +281,47 @@ buildStdenv.mkDerivation ({ # 60.5+ & 66+ did split the google API key arguments: https://bugzilla.mozilla.org/show_bug.cgi?id=1531176 configureFlagsArray+=("--with-google-location-service-api-keyfile=$TMPDIR/ga") configureFlagsArray+=("--with-google-safebrowsing-api-keyfile=$TMPDIR/ga") - '') + '' - # AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 - unset AS - '' + (lib.optionalString enableOfficialBranding '' + '' + lib.optionalString enableOfficialBranding '' export MOZILLA_OFFICIAL=1 - export BUILD_OFFICIAL=1 - ''); + ''; configureFlags = [ + "--disable-tests" + "--disable-updater" "--enable-application=${application}" + "--enable-default-toolkit=cairo-gtk3${lib.optionalString waylandSupport "-wayland"}" + "--enable-system-pixman" + "--with-libclang-path=${llvmPackages.libclang.lib}/lib" + "--with-system-ffi" + "--with-system-icu" "--with-system-jpeg" - "--with-system-zlib" "--with-system-libevent" "--with-system-libvpx" - "--with-system-png" # needs APNG support - "--with-system-icu" - "--enable-system-ffi" - "--enable-system-pixman" - #"--enable-system-cairo" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-updater" - "--enable-default-toolkit=${default-toolkit}" - "--with-libclang-path=${llvmPackages.libclang.lib}/lib" "--with-system-nspr" "--with-system-nss" + "--with-system-png" # needs APNG support + "--with-system-webp" + "--with-system-zlib" ] - ++ lib.optional (buildStdenv.isDarwin) "--disable-xcode-checks" - ++ lib.optional (!ltoSupport) "--with-clang-path=${llvmPackages.clang}/bin/clang" # LTO is done using clang and lld on Linux. - # Darwin needs to use the default linker as lld is not supported (yet?): - # https://bugzilla.mozilla.org/show_bug.cgi?id=1538724 + ++ lib.optionals ltoSupport [ + "--enable-lto=cross" # Cross-Language LTO + "--enable-linker=lld" + ] # elf-hack is broken when using clang+lld: - # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 - ++ lib.optional ltoSupport "--enable-lto=cross" # Cross-language LTO. + # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" - ++ lib.optional (ltoSupport && !buildStdenv.isDarwin) "--enable-linker=lld" + ++ lib.optional (lib.versionAtLeast version "95") "--with-wasi-sysroot=${wasiSysRoot}" ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" ++ flag ffmpegSupport "ffmpeg" ++ flag jemallocSupport "jemalloc" + ++ flag geolocationSupport "necko-wifi" ++ flag gssSupport "negotiateauth" ++ flag webrtcSupport "webrtc" ++ flag crashreporterSupport "crashreporter" - ++ lib.optional drmSupport "--enable-eme=widevine" + ++ lib.optional (!drmSupport) "--disable-eme" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] else [ "--disable-debug" "--enable-optimize" ]) @@ -296,22 +332,93 @@ buildStdenv.mkDerivation ({ ++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ] ++ lib.optional enableOfficialBranding "--enable-official-branding" - ++ lib.optional (lib.versionAtLeast version "95") "--without-wasm-sandboxed-libraries" ++ extraConfigureFlags; - postConfigure = '' - cd obj-* + buildInputs = [ + bzip2 + dbus + dbus-glib + file + fontconfig + freetype + glib + gnum4 + gtk3 + icu + libffi + libGL + libGLU + libevent + libjpeg + libpng + libstartup_notification + libvpx + libwebp + nasm + nspr + nss + pango + perl + xorg.libX11 + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXft + xorg.libXi + xorg.libXrender + xorg.libXt + xorg.libXtst + xorg.pixman + xorg.xorgproto + zip + zlib + ] + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed + ++ lib.optional gssSupport libkrb5 + ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] + ++ lib.optional jemallocSupport jemalloc + ++ extraBuildInputs; + + profilingPhase = lib.optionalString pgoSupport '' + # Package up Firefox for profiling + ./mach package + + # Run profiling + ( + export HOME=$TMPDIR + export LLVM_PROFDATA=llvm-profdata + export JARLOG_FILE="$TMPDIR/jarlog" + + xvfb-run -w 10 -s "-screen 0 1920x1080x24" \ + ./mach python ./build/pgo/profileserver.py + ) + + # Copy profiling data to a place we can easily reference + cp ./merged.profdata $TMPDIR/merged.profdata + + # Clean build dir + ./mach clobber + ''; + + preBuild = '' + cd mozobj + ''; + + postBuild = '' + cd .. ''; makeFlags = extraMakeFlags; - + separateDebugInfo = enableDebugSymbols; enableParallelBuilding = true; - doCheck = false; # "--disable-tests" above - installPhase = if buildStdenv.isDarwin then '' - mkdir -p $out/Applications - cp -LR dist/${binaryNameCapitalized}.app $out/Applications - '' else null; + # tests were disabled in configureFlags + doCheck = false; + + preInstall = '' + cd mozobj + ''; postInstall = lib.optionalString buildStdenv.isLinux '' # Remove SDK cruft. FIXME: move to a separate output? @@ -323,7 +430,7 @@ buildStdenv.mkDerivation ({ # Workaround: The separateDebugInfo hook skips artifacts whose build ID's length is not 40. # But we got 16-length build ID here. The function body is mainly copied from pkgs/build-support/setup-hooks/separate-debug-info.sh - # Remove it when PR #146275 is merged. + # Remove it when https://github.com/NixOS/nixpkgs/pull/146275 is merged. preFixup = lib.optionalString enableDebugSymbols '' _separateDebugInfo() { [ -e "$prefix" ] || return 0 @@ -360,22 +467,22 @@ buildStdenv.mkDerivation ({ doInstallCheck = true; installCheckPhase = '' # Some basic testing - "$out${execdir}/${applicationName}" --version + "$out/bin/${binaryName}" --version ''; passthru = { inherit updateScript; inherit version; inherit alsaSupport; + inherit binaryName; inherit pipewireSupport; inherit nspr; inherit ffmpegSupport; inherit gssSupport; - inherit execdir; - inherit applicationName; inherit tests; inherit gtk3; - }; + inherit wasiSysRoot; + } // extraPassthru; hardeningDisable = [ "format" ]; # -Werror=format-security diff --git a/pkgs/applications/networking/browsers/firefox/fix-build-with-wayland-1.20.patch b/pkgs/applications/networking/browsers/firefox/fix-build-with-wayland-1.20.patch deleted file mode 100644 index 49ce627faf54..000000000000 --- a/pkgs/applications/networking/browsers/firefox/fix-build-with-wayland-1.20.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c -index 7a448e6..7792581 100644 ---- a/widget/gtk/mozwayland/mozwayland.c -+++ b/widget/gtk/mozwayland/mozwayland.c -@@ -200,3 +200,8 @@ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; } - - MOZ_EXPORT void wl_list_insert_list(struct wl_list* list, - struct wl_list* other) {} -+ -+MOZ_EXPORT struct wl_proxy * -+wl_proxy_marshal_flags(struct wl_proxy *proxy, uint32_t opcode, -+ const struct wl_interface *interface, uint32_t version, -+ uint32_t flags, ...) { return NULL; } diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/default.nix b/pkgs/applications/networking/browsers/firefox/librewolf/default.nix new file mode 100644 index 000000000000..10b65e8825c2 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/librewolf/default.nix @@ -0,0 +1,41 @@ +{ callPackage, git }: +let + src = callPackage ./src.nix { }; +in +rec { + + inherit (src) packageVersion firefox source; + + extraPatches = [ ./verify-telemetry-macros.patch ]; + + extraConfigureFlags = [ + "--with-app-name=librewolf" + "--with-app-basename=LibreWolf" + "--with-branding=browser/branding/librewolf" + "--with-distribution-id=io.gitlab.librewolf-community" + "--with-unsigned-addon-scopes=app,system" + "--allow-addon-sideload" + ]; + + extraPostPatch = '' + while read patch_name; do + echo "applying LibreWolf patch: $patch_name" + patch -p1 < ${source}/$patch_name + done <${source}/assets/patches.txt + + cp -r ${source}/themes/browser . + cp ${source}/assets/search-config.json services/settings/dumps/main/search-config.json + sed -i '/MOZ_SERVICES_HEALTHREPORT/ s/True/False/' browser/moz.configure + sed -i '/MOZ_NORMANDY/ s/True/False/' browser/moz.configure + ''; + + extraPrefsFiles = [ "${source}/submodules/settings/librewolf.cfg" ]; + + extraPoliciesFiles = [ "${source}/submodules/settings/distribution/policies.json" ]; + + extraPassthru = { + librewolf = { inherit src extraPatches; }; + inherit extraPrefsFiles extraPoliciesFiles; + }; +} + diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/pkgs/applications/networking/browsers/firefox/librewolf/src.json new file mode 100644 index 000000000000..f24353089488 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/librewolf/src.json @@ -0,0 +1,11 @@ +{ + "packageVersion": "98.0.2-1", + "source": { + "rev": "98.0.2-1", + "sha256": "033l6mjmhfhf7b8p652s7ziw8zz725082hhzzvr3ahi498wshkx6" + }, + "firefox": { + "version": "98.0.2", + "sha512": "b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e" + } +} diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/src.nix b/pkgs/applications/networking/browsers/firefox/librewolf/src.nix new file mode 100644 index 000000000000..38c5dc6b593d --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/librewolf/src.nix @@ -0,0 +1,18 @@ +{ fetchurl, fetchFromGitLab }: +let src = builtins.fromJSON (builtins.readFile ./src.json); +in +{ + inherit (src) packageVersion; + source = fetchFromGitLab { + owner = "librewolf-community"; + repo = "browser/source"; + fetchSubmodules = true; + inherit (src.source) rev sha256; + }; + firefox = fetchurl { + url = + "mirror://mozilla/firefox/releases/${src.firefox.version}/source/firefox-${src.firefox.version}.source.tar.xz"; + inherit (src.firefox) sha512; + }; +} + diff --git a/pkgs/applications/networking/browsers/firefox/librewolf/update.nix b/pkgs/applications/networking/browsers/firefox/librewolf/update.nix new file mode 100644 index 000000000000..5cb5c6168f73 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/librewolf/update.nix @@ -0,0 +1,65 @@ +{ writeScript +, lib +, coreutils +, gnused +, gnugrep +, curl +, gnupg +, jq +, nix-prefetch-git +, moreutils +, runtimeShell +, ... +}: + +writeScript "update-librewolf" '' + #!${runtimeShell} + PATH=${lib.makeBinPath [ coreutils curl gnugrep gnupg gnused jq moreutils nix-prefetch-git ]} + set -euo pipefail + + latestTag=$(curl https://gitlab.com/api/v4/projects/librewolf-community%2Fbrowser%2Fsource/repository/tags?per_page=1 | jq -r .[0].name) + echo "latestTag=$latestTag" + + srcJson=pkgs/applications/networking/browsers/firefox/librewolf/src.json + localRev=$(jq -r .source.rev < $srcJson) + echo "localRev=$localRev" + + if [ "$localRev" == "$latestTag" ]; then + exit 0 + fi + + prefetchOut=$(mktemp) + repoUrl=https://gitlab.com/librewolf-community/browser/source.git/ + nix-prefetch-git $repoUrl --quiet --rev $latestTag --fetch-submodules > $prefetchOut + srcDir=$(jq -r .path < $prefetchOut) + srcHash=$(jq -r .sha256 < $prefetchOut) + + ffVersion=$(<$srcDir/version) + lwRelease=$(<$srcDir/release) + lwVersion="$ffVersion-$lwRelease" + echo "lwVersion=$lwVersion" + echo "ffVersion=$ffVersion" + if [ "$lwVersion" != "$latestTag" ]; then + echo "error: Tag name does not match the computed LibreWolf version" + exit 1 + fi + + HOME=$(mktemp -d) + export GNUPGHOME=$(mktemp -d) + gpg --receive-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353 + + mozillaUrl=https://archive.mozilla.org/pub/firefox/releases/ + + curl --silent --show-error -o "$HOME"/shasums "$mozillaUrl$ffVersion/SHA512SUMS" + curl --silent --show-error -o "$HOME"/shasums.asc "$mozillaUrl$ffVersion/SHA512SUMS.asc" + gpgv --keyring="$GNUPGHOME"/pubring.kbx "$HOME"/shasums.asc "$HOME"/shasums + + ffHash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o) + echo "ffHash=$ffHash" + + jq ".source.rev = \"$latestTag\"" $srcJson | sponge $srcJson + jq ".source.sha256 = \"$srcHash\"" $srcJson | sponge $srcJson + jq ".firefox.version = \"$ffVersion\"" $srcJson | sponge $srcJson + jq ".firefox.sha512 = \"$ffHash\"" $srcJson | sponge $srcJson + jq ".packageVersion = \"$lwVersion\"" $srcJson | sponge $srcJson +'' diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e0d75d9fc36b..94aa4d74feb6 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,16 +7,16 @@ in rec { firefox = common rec { pname = "firefox"; - version = "96.0.2"; + version = "98.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "5ceb1f023a9217c6a9c08b6525882d4091f989859cf209cc1d0ea22c846d05a967e1c47102ae052f7a5029d18118a558dd96da00437ee2c6fbf2896caf99d9dd"; + sha512 = "b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e"; }; meta = { description = "A web browser built from Firefox source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco lovesegfault hexa ]; + maintainers = with lib.maintainers; [ lovesegfault hexa ]; 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". @@ -32,10 +32,10 @@ rec { firefox-esr-91 = common rec { pname = "firefox-esr"; - version = "91.5.0esr"; + version = "91.7.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1712415b6b73c6a21edfefc39eaba5fcbbca54032f78627c0005d291501d16ef4daffb8b9a160d1d5361113ceba04eb5ddb21d903e3dd8d58838aa9596f2d781"; + sha512 = "c56aa38e9d706ff1f1838d2639dac82109dcffb54a7ea17326ae306604d78967ac32da13676756999bc1aa0bf50dc4e7072936ceb16e2e834bea48382ae4b48c"; }; meta = { @@ -54,4 +54,30 @@ rec { versionSuffix = "esr"; }; }; + + librewolf = + let + librewolf-src = callPackage ./librewolf { }; + in + (common rec { + pname = "librewolf"; + binaryName = "librewolf"; + version = librewolf-src.packageVersion; + src = librewolf-src.firefox; + inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru; + + meta = { + description = "A fork of Firefox, focused on privacy, security and freedom"; + homepage = "https://librewolf.net/"; + maintainers = with lib.maintainers; [ squalus ]; + inherit (firefox.meta) platforms badPlatforms broken maxSilent license; + }; + updateScript = callPackage ./librewolf/update.nix { + attrPath = "librewolf-unwrapped"; + }; + }).override { + crashreporterSupport = false; + enableOfficialBranding = false; + pgoSupport = false; # Profiling gets stuck and doesn't terminate. + }; } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 0b64bc7de968..d5055f04ed82 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -12,6 +12,7 @@ , libva , mesa # firefox wants gbm for drm+dmabuf , cups +, pciutils }: ## configurability of the wrapper itself @@ -20,13 +21,14 @@ browser: let wrapper = - { applicationName ? browser.applicationName or (lib.getName browser) + { applicationName ? browser.binaryName or (lib.getName browser) , pname ? applicationName , version ? lib.getVersion browser , desktopName ? # applicationName with first letter capitalized (lib.toUpper (lib.substring 0 1 applicationName) + lib.substring 1 (-1) applicationName) , nameSuffix ? "" , icon ? applicationName + , wmClass ? null , extraNativeMessagingHosts ? [] , pkcs11Modules ? [] , forceWayland ? false @@ -37,10 +39,12 @@ let # For more information about anti tracking (german website) # visit https://wiki.kairaven.de/open/app/firefox , extraPrefs ? "" + , extraPrefsFiles ? [] # For more information about policies visit # https://github.com/mozilla/policy-templates#enterprisepoliciesenabled , extraPolicies ? {} - , libName ? "firefox" # Important for tor package or the like + , extraPoliciesFiles ? [] + , libName ? browser.libName or "firefox" # Important for tor package or the like , nixExtensions ? null }: @@ -63,8 +67,8 @@ let ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); - libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups ] - ++ lib.optional (pipewireSupport && lib.versionAtLeast version "83") pipewire + libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] + ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport libkrb5 ++ lib.optional useGlvnd libglvnd @@ -102,7 +106,7 @@ let enterprisePolicies = { - policies = lib.optionalAttrs usesNixExtensions { + policies = { DisableAppUpdate = true; } // lib.optionalAttrs usesNixExtensions { @@ -150,35 +154,17 @@ let # # ############################# - # TODO: remove this after the next release (21.03) - configPlugins = lib.filter (a: builtins.hasAttr a cfg) [ - "enableAdobeFlash" - "enableAdobeReader" - "enableBluejeans" - "enableDjvu" - "enableFriBIDPlugin" - "enableGoogleTalkPlugin" - "enableMPlayer" - "enableVLC" - "icedtea" - "jre" - ]; - pluginsError = - "Your configuration mentions ${lib.concatMapStringsSep ", " (p: applicationName + "." + p) configPlugins}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."; - - in if configPlugins != [] then throw pluginsError else - (stdenv.mkDerivation { + in stdenv.mkDerivation { inherit pname version; desktopItem = makeDesktopItem { name = applicationName; exec = "${applicationName}${nameSuffix} %U"; inherit icon; - comment = ""; desktopName = "${desktopName}${nameSuffix}${lib.optionalString forceWayland " (Wayland)"}"; genericName = "Web Browser"; - categories = "Network;WebBrowser;"; - mimeType = lib.concatStringsSep ";" [ + categories = [ "Network" "WebBrowser" ]; + mimeTypes = [ "text/html" "text/xml" "application/xhtml+xml" @@ -187,20 +173,17 @@ let "x-scheme-handler/https" "x-scheme-handler/ftp" ]; + startupWMClass = wmClass; }; - nativeBuildInputs = [ makeWrapper lndir replace ]; + nativeBuildInputs = [ makeWrapper lndir replace jq ]; buildInputs = [ browser.gtk3 ]; - buildCommand = lib.optionalString stdenv.isDarwin '' - mkdir -p $out/Applications - cp -R --no-preserve=mode,ownership ${browser}/Applications/${applicationName}.app $out/Applications - rm -f $out${browser.execdir or "/bin"}/${applicationName} - '' + '' - if [ ! -x "${browser}${browser.execdir or "/bin"}/${applicationName}" ] + buildCommand = '' + if [ ! -x "${browser}/bin/${applicationName}" ] then - echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'" + echo "cannot find executable file \`${browser}/bin/${applicationName}'" exit 1 fi @@ -217,8 +200,8 @@ let find . -type f \( -not -name "${applicationName}" \) -exec ln -sT "${browser}"/{} "$out"/{} \; - find . -type f -name "${applicationName}" -print0 | while read -d $'\0' f; do - cp -P --no-preserve=mode,ownership "${browser}/$f" "$out/$f" + find . -type f \( -name "${applicationName}" -o -name "${applicationName}-bin" \) -print0 | while read -d $'\0' f; do + cp -P --no-preserve=mode,ownership --remove-destination "${browser}/$f" "$out/$f" chmod a+rwx "$out/$f" done @@ -237,12 +220,12 @@ let # create the wrapper - executablePrefix="$out${browser.execdir or "/bin"}" + executablePrefix="$out/bin" executablePath="$executablePrefix/${applicationName}" if [ ! -x "$executablePath" ] then - echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'" + echo "cannot find executable file \`${browser}/bin/${applicationName}'" exit 1 fi @@ -257,18 +240,18 @@ let oldExe="$(readlink -v --canonicalize-existing "$executablePath")" fi - if [ ! -x "${browser}${browser.execdir or "/bin"}/${applicationName}" ] + if [ ! -x "${browser}/bin/${applicationName}" ] then - echo "cannot find executable file \`${browser}${browser.execdir or "/bin"}/${applicationName}'" + echo "cannot find executable file \`${browser}/bin/${applicationName}'" exit 1 fi makeWrapper "$oldExe" \ - "$out${browser.execdir or "/bin"}/${applicationName}${nameSuffix}" \ + "$out/bin/${applicationName}${nameSuffix}" \ --prefix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --prefix PATH ':' "${xdg-utils}/bin" \ - --suffix PATH ':' "$out${browser.execdir or "/bin"}" \ + --suffix PATH ':' "$out/bin" \ --set MOZ_APP_LAUNCHER "${applicationName}${nameSuffix}" \ --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ --set MOZ_LEGACY_PROFILES 1 \ @@ -292,7 +275,7 @@ let mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" icon=$( find "${browser}/lib/" -name "default''${res}.png" ) if [ -e "$icon" ]; then ln -s "$icon" \ - "$out/share/icons/hicolor/''${res}x''${res}/apps/${applicationName}.png" + "$out/share/icons/hicolor/''${res}x''${res}/apps/${icon}.png" fi done fi @@ -325,6 +308,12 @@ let rm -f "$POL_PATH" cat ${policiesJson} >> "$POL_PATH" + extraPoliciesFiles=(${builtins.toString extraPoliciesFiles}) + for extraPoliciesFile in "''${extraPoliciesFiles[@]}"; do + jq -s '.[0] + .[1]' "$POL_PATH" $extraPoliciesFile > .tmp.json + mv .tmp.json "$POL_PATH" + done + # preparing for autoconfig mkdir -p "$out/lib/${libName}/defaults/pref" @@ -333,6 +322,11 @@ let cat > "$out/lib/${libName}/mozilla.cfg" < ${mozillaCfg} + extraPrefsFiles=(${builtins.toString extraPrefsFiles}) + for extraPrefsFile in "''${extraPrefsFiles[@]}"; do + cat "$extraPrefsFile" >> "$out/lib/${libName}/mozilla.cfg" + done + mkdir -p $out/lib/${libName}/distribution/extensions ############################# @@ -356,5 +350,5 @@ let hydraPlatforms = []; priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package }; - }); + }; in lib.makeOverridable wrapper diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index e93ea8ca66d1..5ba831b21022 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, patchelf, makeWrapper # Linked dynamic libraries. -, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr +, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core @@ -57,7 +57,7 @@ let version = chromium.upstream-info.version; deps = [ - glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr + glib fontconfig freetype pango cairo libX11 libXi atk nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb alsa-lib libXdamage libXtst libXrandr libxshmfence expat cups dbus gdk-pixbuf gcc-unwrapped.lib @@ -118,6 +118,9 @@ in stdenv.mkDerivation { cp -a opt/* $out/share cp -a usr/share/* $out/share + + substituteInPlace $out/share/google/$appname/google-$appname \ + --replace 'CHROME_WRAPPER' 'WRAPPER' substituteInPlace $out/share/applications/google-$appname.desktop \ --replace /usr/bin/google-chrome-$dist $exe substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \ @@ -143,7 +146,9 @@ in stdenv.mkDerivation { --prefix LD_LIBRARY_PATH : "$rpath" \ --prefix PATH : "$binpath" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \ - --add-flags ${escapeShellArg commandLineArgs} + --set CHROME_WRAPPER "google-chrome-$dist" \ + --add-flags ${escapeShellArg commandLineArgs} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do patchelf --set-rpath $rpath $elf diff --git a/pkgs/applications/networking/browsers/icecat-bin/default.nix b/pkgs/applications/networking/browsers/icecat-bin/default.nix deleted file mode 100644 index 2427570a59d0..000000000000 --- a/pkgs/applications/networking/browsers/icecat-bin/default.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ stdenv -, lib -, fetchzip -, autoPatchelfHook -, wrapGAppsHook -, gnome2 -, gtk2 -, nss -, xdg-utils -, xorg -, alsa-lib -, atk -, cairo -, cups -, curl -, dbus -, expat -, fontconfig -, freetype -, gdk-pixbuf -, glib -, gtk3 -, libX11 -, libxcb -, libXScrnSaver -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXrandr -, libXrender -, libXtst -, libdrm -, libnotify -, libopus -, libpulseaudio -, libuuid -, libxshmfence -, mesa -, nspr -, pango -, systemd -, at-spi2-atk -, at-spi2-core -}: - -stdenv.mkDerivation rec { - pname = "icecat-bin"; - version = "60.7.0"; - - src = fetchzip { - url = "https://mirror.tochlab.net/pub/gnu/gnuzilla/${version}/icecat-${version}.en-US.gnulinux-x86_64.tar.bz2"; - sha256 = "sha256-bEapbQIcZXQ0Tip/X1Q0guowpr3wNDYsFbHGmTbc5mE="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - wrapGAppsHook - ]; - - buildInputs = [ - nss - xdg-utils - xorg.libxkbfile - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - curl - dbus - expat - fontconfig.lib - freetype - gdk-pixbuf - glib - gnome2.GConf - gtk2 - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libdrm - libnotify - libopus - libuuid - libxcb - libxshmfence - mesa - nspr - nss - pango - xorg.libXt - stdenv.cc.cc.lib - ]; - - unpackPhase = '' - mkdir -p $TMP/ $out/{opt,bin} - cp $src/* $TMP/ -r - ''; - - installPhase = '' - cp -r $TMP/* $out/opt/ - ln -sf $out/opt/icecat-bin $out/bin/icecat - ''; - - runtimeDependencies = [ - libpulseaudio.out - (lib.getLib systemd) - ]; - - meta = with lib; { - description = "Binary build of the GNU version of the Mozilla Firefox browser"; - homepage = "https://www.gnu.org/software/gnuzilla/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 64658d6442f5..00d0bc8f6fd5 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.10.1"; + version = "1.11.1"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-HwrIdQv4LDVLLuvukzp28AuKKbEMQeHSb0ZW+a9q4ug="; + sha256 = "sha256-RrdD+G8DKOBm0TpmRQg1uMGNFAlAADFeK3h6oyo5RZ4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index ccbc7a8dc8fb..7c1cb7f04a71 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, lispPackages , makeWrapper, wrapGAppsHook, gst_all_1 , glib, gdk-pixbuf, cairo -, mime-types, pango, gtk3 +, mailcap, pango, gtk3 , glib-networking, gsettings-desktop-schemas , xclip, notify-osd, enchant }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib gdk-pixbuf cairo - mime-types pango gtk3 + mailcap pango gtk3 glib-networking gsettings-desktop-schemas xclip notify-osd enchant ] ++ gstBuildInputs; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 642781d570a7..7c37531263fb 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -11,7 +11,6 @@ , freetype , gdk-pixbuf , glib -, gnome2 , gtk3 , gtk4 , lib @@ -51,11 +50,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "82.0.4227.43"; + version = "84.0.4316.42"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-DFhf62dqk7qA2k+JgVqGLxF30UPwQwhXD105Qua25X0="; + sha256 = "sha256-ZjVuw30YfHQ69BVxPvIde6VuOcqtnXrGwhZpA26vLpw="; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; @@ -79,7 +78,6 @@ in stdenv.mkDerivation rec { freetype gdk-pixbuf glib - gnome2.GConf gtk3 libX11 libXScrnSaver diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index e33ff3f3ca6e..0a0a7f341c06 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -44,12 +44,12 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.4.4"; + version = "29.4.5"; src = fetchzip { name = "${pname}-${version}"; url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz"; - sha256 = "sha256-0R0IJd4rd7NqnxQxkHSx10cNlwECqpKgJnlfYAMx4wc="; + sha256 = "sha256-ls4uhfFaiFHkmAVbwwBenm71sNm6Tql2tMpzk9D2b5Y="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 7bf3ee9e75b0..c79aa1d6f1d6 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit patches; - installFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" ]; # Add run-time dependencies to PATH. Append them to PATH so the user can # override the dependencies with their own PATH. diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index f35ae98f71c4..28e11814029c 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0.4"; + version = "11.0.9"; lang = "en-US"; @@ -96,16 +96,18 @@ let urls = [ "https://dist.torproject.org/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" ]; - sha256 = "0pz1v5ig031wgnq3191ja08a4brdrbzziqnkpcrlra1wcdnzv985"; + sha256 = "0cl01bx64d6bmajknj7085nzc6841adkp65fz531r3y6nnpwr9ds"; }; i686-linux = fetchurl { urls = [ "https://dist.torproject.org/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" ]; - sha256 = "0ykdgbm8f5lcv7p54f3ffxsaw2cdzbhk6sv7d2hm7d81fcnhmjq4"; + sha256 = "0j6alhm1pqp7fb6nk55vzvr1qjz6gyd3vn6v2dkkvj9mgm57x1j5"; }; }; in @@ -125,7 +127,7 @@ stdenv.mkDerivation rec { desktopName = "Tor Browser"; genericName = "Web Browser"; comment = meta.description; - categories = "Network;WebBrowser;Security;"; + categories = [ "Network" "WebBrowser" "Security" ]; }; buildCommand = '' diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 781163050944..7cbf4cad975e 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,13 +2,13 @@ mkYarnPackage rec { pname = "vieb"; - version = "6.1.0"; + version = "7.1.2"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-MJJeHnwfXouBygRT/wFWFMRHxQVf/3k2c7vp/tkD5co="; + sha256 = "sha256-4LGg3w/rleTyHJd4867dog+/fIXhtKbYgF1bYKwoh/I="; }; packageJSON = ./package.json; @@ -24,8 +24,8 @@ mkYarnPackage rec { icon = "vieb"; desktopName = "Web Browser"; genericName = "Web Browser"; - categories = "Network;WebBrowser;"; - mimeType = lib.concatStringsSep ";" [ + categories = [ "Network" "WebBrowser" ]; + mimeTypes = [ "text/html" "application/xhtml+xml" "x-scheme-handler/http" diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json index 1836efdb8ad2..0e518f5ef4af 100644 --- a/pkgs/applications/networking/browsers/vieb/package.json +++ b/pkgs/applications/networking/browsers/vieb/package.json @@ -1,7 +1,7 @@ { "name": "vieb", "productName": "Vieb", - "version": "5.3.0", + "version": "7.1.2", "description": "Vim Inspired Electron Browser", "main": "app/index.js", "scripts": { @@ -14,7 +14,7 @@ "fix": "eslint --fix app .eslintrc.js build.js", "lint": "eslint app .eslintrc.js build.js", "start": "electron app", - "test": "jest --testEnvironment jsdom --coverage --collectCoverageFrom 'app/**/*.js' -u && npm run lint && echo 'All good :)'" + "test": "TZ=UTC jest --testEnvironment jsdom --coverage --collectCoverageFrom 'app/**/*.js' -u && npm run lint && echo 'All good :)'" }, "repository": "https://github.com/Jelmerro/Vieb", "homepage": "https://vieb.dev", @@ -28,23 +28,18 @@ "email": "Jelmerro@users.noreply.github.com", "license": "GPL-3.0-or-later", "devDependencies": { - "archiver": "5.3.0", - "electron": "13.1.4", - "electron-builder": "22.11.7", - "eslint": "7.29.0", - "eslint-plugin-compat": "3.9.0", - "eslint-plugin-sort-keys-fix": "1.1.1", - "jest": "27.0.6", - "jest-environment-jsdom": "27.0.6" + "electron": "17.0.1", + "electron-builder": "22.14.13", + "eslint": "8.9.0", + "eslint-plugin-sort-keys": "2.3.5", + "jest": "27.5.1", + "jest-environment-jsdom": "27.5.1" }, "dependencies": { "7zip-bin": "5.1.1", - "@cliqz/adblocker-electron": "1.22.2", - "@cliqz/adblocker-electron-preload": "1.22.2", - "is-svg": "4.3.1", + "@cliqz/adblocker-electron": "1.23.6", + "@cliqz/adblocker-electron-preload": "1.23.6", + "is-svg": "4.3.2", "rimraf": "3.0.2" - }, - "browserslist": [ - "last 2 Chrome versions" - ] + } } diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock index 33e9604c06da..4f5254819b16 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -7,184 +7,167 @@ resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== -"@babel/code-frame@7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" - integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== +"@ampproject/remapping@^2.1.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34" + integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg== dependencies: - "@babel/highlight" "^7.10.4" + "@jridgewell/trace-mapping" "^0.3.0" -"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" - integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" + integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== dependencies: - "@babel/highlight" "^7.14.5" + "@babel/highlight" "^7.16.7" -"@babel/compat-data@^7.14.5": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08" - integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw== +"@babel/compat-data@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz#078d8b833fbbcc95286613be8c716cef2b519fa2" + integrity sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ== -"@babel/core@^7.1.0", "@babel/core@^7.7.2", "@babel/core@^7.7.5": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz#e0814ec1a950032ff16c13a2721de39a8416fcab" - integrity sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA== +"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.2", "@babel/core@^7.8.0": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz#3dac27c190ebc3a4381110d46c80e77efe172e1a" + integrity sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ== dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.5" - "@babel/helper-compilation-targets" "^7.14.5" - "@babel/helper-module-transforms" "^7.14.5" - "@babel/helpers" "^7.14.6" - "@babel/parser" "^7.14.6" - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" + "@ampproject/remapping" "^2.1.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.17.7" + "@babel/helper-compilation-targets" "^7.17.7" + "@babel/helper-module-transforms" "^7.17.7" + "@babel/helpers" "^7.17.8" + "@babel/parser" "^7.17.8" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.3" + "@babel/types" "^7.17.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.1.2" semver "^6.3.0" - source-map "^0.5.0" -"@babel/generator@^7.14.5", "@babel/generator@^7.7.2": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz#848d7b9f031caca9d0cd0af01b063f226f52d785" - integrity sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA== +"@babel/generator@^7.17.3", "@babel/generator@^7.17.7", "@babel/generator@^7.7.2": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz#8da2599beb4a86194a3b24df6c085931d9ee45ad" + integrity sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.17.0" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-compilation-targets@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf" - integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw== +"@babel/helper-compilation-targets@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz#a3c2924f5e5f0379b356d4cfb313d1414dc30e46" + integrity sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w== dependencies: - "@babel/compat-data" "^7.14.5" - "@babel/helper-validator-option" "^7.14.5" - browserslist "^4.16.6" + "@babel/compat-data" "^7.17.7" + "@babel/helper-validator-option" "^7.16.7" + browserslist "^4.17.5" semver "^6.3.0" -"@babel/helper-function-name@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4" - integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ== +"@babel/helper-environment-visitor@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" + integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== dependencies: - "@babel/helper-get-function-arity" "^7.14.5" - "@babel/template" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.7" -"@babel/helper-get-function-arity@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815" - integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg== +"@babel/helper-function-name@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" + integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== dependencies: - "@babel/types" "^7.14.5" + "@babel/helper-get-function-arity" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-hoist-variables@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" - integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ== +"@babel/helper-get-function-arity@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" + integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.7" -"@babel/helper-member-expression-to-functions@^7.14.5": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970" - integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA== +"@babel/helper-hoist-variables@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" + integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.7" -"@babel/helper-module-imports@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3" - integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ== +"@babel/helper-module-imports@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" + integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.7" -"@babel/helper-module-transforms@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz#7de42f10d789b423eb902ebd24031ca77cb1e10e" - integrity sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA== +"@babel/helper-module-transforms@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd" + integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw== dependencies: - "@babel/helper-module-imports" "^7.14.5" - "@babel/helper-replace-supers" "^7.14.5" - "@babel/helper-simple-access" "^7.14.5" - "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/helper-validator-identifier" "^7.14.5" - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-simple-access" "^7.17.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/helper-validator-identifier" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.3" + "@babel/types" "^7.17.0" -"@babel/helper-optimise-call-expression@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c" - integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" + integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== + +"@babel/helper-simple-access@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367" + integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.17.0" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" - integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== - -"@babel/helper-replace-supers@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94" - integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow== +"@babel/helper-split-export-declaration@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" + integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== dependencies: - "@babel/helper-member-expression-to-functions" "^7.14.5" - "@babel/helper-optimise-call-expression" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/types" "^7.16.7" -"@babel/helper-simple-access@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz#66ea85cf53ba0b4e588ba77fc813f53abcaa41c4" - integrity sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw== +"@babel/helper-validator-identifier@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" + integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== + +"@babel/helper-validator-option@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" + integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== + +"@babel/helpers@^7.17.8": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.8.tgz#288450be8c6ac7e4e44df37bcc53d345e07bc106" + integrity sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw== dependencies: - "@babel/types" "^7.14.5" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.17.3" + "@babel/types" "^7.17.0" -"@babel/helper-split-export-declaration@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a" - integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA== +"@babel/highlight@^7.16.7": + version "7.16.10" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" + integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw== dependencies: - "@babel/types" "^7.14.5" - -"@babel/helper-validator-identifier@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8" - integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg== - -"@babel/helper-validator-option@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" - integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== - -"@babel/helpers@^7.14.6": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.6.tgz#5b58306b95f1b47e2a0199434fa8658fa6c21635" - integrity sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA== - dependencies: - "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" - -"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" - integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== - dependencies: - "@babel/helper-validator-identifier" "^7.14.5" + "@babel/helper-validator-identifier" "^7.16.7" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.14.7", "@babel/parser@^7.7.2": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz#6099720c8839ca865a2637e6c85852ead0bdb595" - integrity sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240" + integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -271,42 +254,43 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.7.2": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716" - integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q== + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8" + integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/template@^7.14.5", "@babel/template@^7.3.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" - integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g== +"@babel/template@^7.16.7", "@babel/template@^7.3.3": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" + integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/parser" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/code-frame" "^7.16.7" + "@babel/parser" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.7.2": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz#64007c9774cfdc3abd23b0780bc18a3ce3631753" - integrity sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ== +"@babel/traverse@^7.17.3", "@babel/traverse@^7.7.2": + version "7.17.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" + integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw== dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.5" - "@babel/helper-function-name" "^7.14.5" - "@babel/helper-hoist-variables" "^7.14.5" - "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.14.7" - "@babel/types" "^7.14.5" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.17.3" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/parser" "^7.17.3" + "@babel/types" "^7.17.0" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.14.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz#3bb997ba829a2104cedb20689c4a5b8121d383ff" - integrity sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg== +"@babel/types@^7.0.0", "@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" + integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== dependencies: - "@babel/helper-validator-identifier" "^7.14.5" + "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -314,46 +298,53 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.22.2": - version "1.22.2" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.2.tgz#643849d5f08c167eb84a2e7e3f1f9fbc41a3889b" - integrity sha512-EsV00IdW8sGujGnylOGR8dm401FdIfPRAjuevsRlZjgDE+hQKj6n5wwrZaylPIh994hWesg6bxWTmXpJ2Sy2QQ== +"@cliqz/adblocker-content@^1.23.6", "@cliqz/adblocker-content@^1.23.7": + version "1.23.7" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.23.7.tgz#21a1035e479d8f4dc4e7ecc2500cf8a4149eaace" + integrity sha512-tgCFcWhBty+WI3ObYBLDk56i1G7nScd5TBAOXlQf2EIbVJ+DC+G0YE91YHhQpzfy4ySI/wRGyEHrKzTRgmkuKQ== dependencies: - "@cliqz/adblocker-extended-selectors" "^1.22.2" + "@cliqz/adblocker-extended-selectors" "^1.23.7" -"@cliqz/adblocker-electron-preload@1.22.2", "@cliqz/adblocker-electron-preload@^1.22.2": - version "1.22.2" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.2.tgz#eea674767a60abe4e5f9ccb46188d33656f551d0" - integrity sha512-4JSqNNYo4hXMoZjnyBVTd3z2yV2n5qeoNPk+WaeOFEF9uJXhqPR+Sz7scNB6nMYnRuSQfraeogtdaA4s0JkJWQ== +"@cliqz/adblocker-electron-preload@1.23.6": + version "1.23.6" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.23.6.tgz#7f8db3df95afb385917df00ec5300847448437d1" + integrity sha512-xVBrIqfvcuh2Y07ZkEogzgkyqJuZvOqhRoFnuTyW2q97AmWAGLT6IjEGjl/vX7vMP0Y1b8wubdjI3VHnKvNKDg== dependencies: - "@cliqz/adblocker-content" "^1.22.2" + "@cliqz/adblocker-content" "^1.23.6" -"@cliqz/adblocker-electron@1.22.2": - version "1.22.2" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.2.tgz#85af3b49f7f653e6fb0d008b6523e3b3ba0dd41e" - integrity sha512-uSQjbcv9/csjQOO0AgqK8AnqdpKseebPkwXozglU1uFVVnuSOTs/4RohL3yac9uMkJtfyAIhT3mnbw9Cf4o+gQ== +"@cliqz/adblocker-electron-preload@^1.23.6": + version "1.23.7" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.23.7.tgz#6aff5198c518c2d35f67a34bd213664a2a86e3ae" + integrity sha512-bGWf4r5q4savAGs3Kl4aR7XBH4J9AmrErDmcYu+tJk9V3rhTGXUi29kMl0D5x2JimhRmnKOeJ/Q2GJSUjvnmsg== dependencies: - "@cliqz/adblocker" "^1.22.2" - "@cliqz/adblocker-electron-preload" "^1.22.2" + "@cliqz/adblocker-content" "^1.23.7" + +"@cliqz/adblocker-electron@1.23.6": + version "1.23.6" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.23.6.tgz#e550f2ffa2b5d0404d0090c3870d0a849d3cd5d8" + integrity sha512-wzkCfBCo5RvRanzsVOu65xHW9GAUDqsg+tP8GYld6/hgMMb96KJZJVpvrvwvsneAm9T55QE4ef1utZbIIwltqA== + dependencies: + "@cliqz/adblocker" "^1.23.6" + "@cliqz/adblocker-electron-preload" "^1.23.6" tldts-experimental "^5.6.21" -"@cliqz/adblocker-extended-selectors@^1.22.2": - version "1.22.2" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.2.tgz#1cad3c1569b765d9e7f8672c85b2a7b1e8e9ee90" - integrity sha512-/u4SmQ1wr7d80iGP705fZrfHjJUTf/1MyRXz5Wltt7i3OHvOCQEoST2mqNlfx0W/9gIWzxA7cFRLY0/aITmzTw== +"@cliqz/adblocker-extended-selectors@^1.23.7": + version "1.23.7" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.23.7.tgz#4782829c97b7ed229789a14d4e39b2339825077d" + integrity sha512-3y1eeHHZS3qvvv3dDZDjVVr6g03GeUBbDExCW/GOiHdo+qKYmM2K40EaLN+Upzc2ppuum9UKvzsHxG8Hs9R/kQ== -"@cliqz/adblocker@^1.22.2": - version "1.22.2" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.2.tgz#99a14d56327734d3083a077d96fe7b91c236bf7a" - integrity sha512-P+a8gYbRbQy38mYsr7932h2cnK/7AEuQrmCEfLTO1+abCr2v5RM2Qb+cCn/JVnQSeqnysebAIXoV+PUzrjfpiQ== +"@cliqz/adblocker@^1.23.6": + version "1.23.7" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.23.7.tgz#d439fe8b62d2789c274b5e124cddb930de25f59a" + integrity sha512-HUvC7CcmNbcIftcRhFeuQhHSpyNdOVdXazXDL0+avvWR0cxlI9zcC8yHMRKjxeY6nsiOXdyEFby+V5KgJvfwaQ== dependencies: - "@cliqz/adblocker-content" "^1.22.2" - "@cliqz/adblocker-extended-selectors" "^1.22.2" + "@cliqz/adblocker-content" "^1.23.7" + "@cliqz/adblocker-extended-selectors" "^1.23.7" "@remusao/guess-url-type" "^1.1.2" "@remusao/small" "^1.1.2" "@remusao/smaz" "^1.7.1" - "@types/chrome" "^0.0.145" - "@types/firefox-webext-browser" "^82.0.0" + "@types/chrome" "^0.0.180" + "@types/firefox-webext-browser" "^94.0.0" tldts-experimental "^5.6.21" "@develar/schema-utils@~2.6.5": @@ -364,10 +355,10 @@ ajv "^6.12.0" ajv-keywords "^3.4.1" -"@electron/get@^1.0.1": - version "1.12.4" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab" - integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg== +"@electron/get@^1.13.0": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40" + integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw== dependencies: debug "^4.1.1" env-paths "^2.2.0" @@ -377,7 +368,7 @@ semver "^6.2.0" sumchecker "^3.0.1" optionalDependencies: - global-agent "^2.0.2" + global-agent "^3.0.0" global-tunnel-ng "^2.7.1" "@electron/universal@1.0.5": @@ -391,21 +382,35 @@ dir-compare "^2.4.0" fs-extra "^9.0.1" -"@eslint/eslintrc@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179" - integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg== +"@eslint/eslintrc@^1.1.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6" + integrity sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ== dependencies: ajv "^6.12.4" - debug "^4.1.1" - espree "^7.3.0" + debug "^4.3.2" + espree "^9.3.1" globals "^13.9.0" - ignore "^4.0.6" + ignore "^5.2.0" import-fresh "^3.2.1" - js-yaml "^3.13.1" + js-yaml "^4.1.0" minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@humanwhocodes/config-array@^0.9.2": + version "0.9.5" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7" + integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw== + dependencies: + "@humanwhocodes/object-schema" "^1.2.1" + debug "^4.1.1" + minimatch "^3.0.4" + +"@humanwhocodes/object-schema@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -422,168 +427,168 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/console@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.0.6.tgz#3eb72ea80897495c3d73dd97aab7f26770e2260f" - integrity sha512-fMlIBocSHPZ3JxgWiDNW/KPj6s+YRd0hicb33IrmelCcjXo/pXPwvuiKFmZz+XuqI/1u7nbUK10zSsWL/1aegg== +"@jest/console@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz#260fe7239602fe5130a94f1aa386eff54b014bba" + integrity sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.5.1" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^27.0.6" - jest-util "^27.0.6" + jest-message-util "^27.5.1" + jest-util "^27.5.1" slash "^3.0.0" -"@jest/core@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.0.6.tgz#c5f642727a0b3bf0f37c4b46c675372d0978d4a1" - integrity sha512-SsYBm3yhqOn5ZLJCtccaBcvD/ccTLCeuDv8U41WJH/V1MW5eKUkeMHT9U+Pw/v1m1AIWlnIW/eM2XzQr0rEmow== +"@jest/core@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz#267ac5f704e09dc52de2922cbf3af9edcd64b626" + integrity sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ== dependencies: - "@jest/console" "^27.0.6" - "@jest/reporters" "^27.0.6" - "@jest/test-result" "^27.0.6" - "@jest/transform" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/console" "^27.5.1" + "@jest/reporters" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" emittery "^0.8.1" exit "^0.1.2" - graceful-fs "^4.2.4" - jest-changed-files "^27.0.6" - jest-config "^27.0.6" - jest-haste-map "^27.0.6" - jest-message-util "^27.0.6" - jest-regex-util "^27.0.6" - jest-resolve "^27.0.6" - jest-resolve-dependencies "^27.0.6" - jest-runner "^27.0.6" - jest-runtime "^27.0.6" - jest-snapshot "^27.0.6" - jest-util "^27.0.6" - jest-validate "^27.0.6" - jest-watcher "^27.0.6" + graceful-fs "^4.2.9" + jest-changed-files "^27.5.1" + jest-config "^27.5.1" + jest-haste-map "^27.5.1" + jest-message-util "^27.5.1" + jest-regex-util "^27.5.1" + jest-resolve "^27.5.1" + jest-resolve-dependencies "^27.5.1" + jest-runner "^27.5.1" + jest-runtime "^27.5.1" + jest-snapshot "^27.5.1" + jest-util "^27.5.1" + jest-validate "^27.5.1" + jest-watcher "^27.5.1" micromatch "^4.0.4" - p-each-series "^2.1.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.6.tgz#ee293fe996db01d7d663b8108fa0e1ff436219d2" - integrity sha512-4XywtdhwZwCpPJ/qfAkqExRsERW+UaoSRStSHCCiQTUpoYdLukj+YJbQSFrZjhlUDRZeNiU9SFH0u7iNimdiIg== +"@jest/environment@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.1.tgz#d7425820511fe7158abbecc010140c3fd3be9c74" + integrity sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA== dependencies: - "@jest/fake-timers" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/fake-timers" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" - jest-mock "^27.0.6" + jest-mock "^27.5.1" -"@jest/fake-timers@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.6.tgz#cbad52f3fe6abe30e7acb8cd5fa3466b9588e3df" - integrity sha512-sqd+xTWtZ94l3yWDKnRTdvTeZ+A/V7SSKrxsrOKSqdyddb9CeNRF8fbhAU0D7ZJBpTTW2nbp6MftmKJDZfW2LQ== +"@jest/fake-timers@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz#76979745ce0579c8a94a4678af7a748eda8ada74" + integrity sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ== dependencies: - "@jest/types" "^27.0.6" - "@sinonjs/fake-timers" "^7.0.2" + "@jest/types" "^27.5.1" + "@sinonjs/fake-timers" "^8.0.1" "@types/node" "*" - jest-message-util "^27.0.6" - jest-mock "^27.0.6" - jest-util "^27.0.6" + jest-message-util "^27.5.1" + jest-mock "^27.5.1" + jest-util "^27.5.1" -"@jest/globals@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.6.tgz#48e3903f99a4650673d8657334d13c9caf0e8f82" - integrity sha512-DdTGCP606rh9bjkdQ7VvChV18iS7q0IMJVP1piwTWyWskol4iqcVwthZmoJEf7obE1nc34OpIyoVGPeqLC+ryw== +"@jest/globals@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.1.tgz#7ac06ce57ab966566c7963431cef458434601b2b" + integrity sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q== dependencies: - "@jest/environment" "^27.0.6" - "@jest/types" "^27.0.6" - expect "^27.0.6" + "@jest/environment" "^27.5.1" + "@jest/types" "^27.5.1" + expect "^27.5.1" -"@jest/reporters@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.6.tgz#91e7f2d98c002ad5df94d5b5167c1eb0b9fd5b00" - integrity sha512-TIkBt09Cb2gptji3yJXb3EE+eVltW6BjO7frO7NEfjI9vSIYoISi5R3aI3KpEDXlB1xwB+97NXIqz84qYeYsfA== +"@jest/reporters@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.1.tgz#ceda7be96170b03c923c37987b64015812ffec04" + integrity sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^27.0.6" - "@jest/test-result" "^27.0.6" - "@jest/transform" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/console" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" + "@types/node" "*" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.2" - graceful-fs "^4.2.4" + graceful-fs "^4.2.9" istanbul-lib-coverage "^3.0.0" - istanbul-lib-instrument "^4.0.3" + istanbul-lib-instrument "^5.1.0" istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" - istanbul-reports "^3.0.2" - jest-haste-map "^27.0.6" - jest-resolve "^27.0.6" - jest-util "^27.0.6" - jest-worker "^27.0.6" + istanbul-reports "^3.1.3" + jest-haste-map "^27.5.1" + jest-resolve "^27.5.1" + jest-util "^27.5.1" + jest-worker "^27.5.1" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" terminal-link "^2.0.0" - v8-to-istanbul "^8.0.0" + v8-to-istanbul "^8.1.0" -"@jest/source-map@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.6.tgz#be9e9b93565d49b0548b86e232092491fb60551f" - integrity sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g== +"@jest/source-map@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz#6608391e465add4205eae073b55e7f279e04e8cf" + integrity sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg== dependencies: callsites "^3.0.0" - graceful-fs "^4.2.4" + graceful-fs "^4.2.9" source-map "^0.6.0" -"@jest/test-result@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.6.tgz#3fa42015a14e4fdede6acd042ce98c7f36627051" - integrity sha512-ja/pBOMTufjX4JLEauLxE3LQBPaI2YjGFtXexRAjt1I/MbfNlMx0sytSX3tn5hSLzQsR3Qy2rd0hc1BWojtj9w== +"@jest/test-result@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.1.tgz#56a6585fa80f7cdab72b8c5fc2e871d03832f5bb" + integrity sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag== dependencies: - "@jest/console" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/console" "^27.5.1" + "@jest/types" "^27.5.1" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz#80a913ed7a1130545b1cd777ff2735dd3af5d34b" - integrity sha512-bISzNIApazYOlTHDum9PwW22NOyDa6VI31n6JucpjTVM0jD6JDgqEZ9+yn575nDdPF0+4csYDxNNW13NvFQGZA== +"@jest/test-sequencer@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz#4057e0e9cea4439e544c6353c6affe58d095745b" + integrity sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ== dependencies: - "@jest/test-result" "^27.0.6" - graceful-fs "^4.2.4" - jest-haste-map "^27.0.6" - jest-runtime "^27.0.6" + "@jest/test-result" "^27.5.1" + graceful-fs "^4.2.9" + jest-haste-map "^27.5.1" + jest-runtime "^27.5.1" -"@jest/transform@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.6.tgz#189ad7107413208f7600f4719f81dd2f7278cc95" - integrity sha512-rj5Dw+mtIcntAUnMlW/Vju5mr73u8yg+irnHwzgtgoeI6cCPOvUwQ0D1uQtc/APmWgvRweEb1g05pkUpxH3iCA== +"@jest/transform@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.1.tgz#6c3501dcc00c4c08915f292a600ece5ecfe1f409" + integrity sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^27.0.6" - babel-plugin-istanbul "^6.0.0" + "@jest/types" "^27.5.1" + babel-plugin-istanbul "^6.1.1" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" - graceful-fs "^4.2.4" - jest-haste-map "^27.0.6" - jest-regex-util "^27.0.6" - jest-util "^27.0.6" + graceful-fs "^4.2.9" + jest-haste-map "^27.5.1" + jest-regex-util "^27.5.1" + jest-util "^27.5.1" micromatch "^4.0.4" - pirates "^4.0.1" + pirates "^4.0.4" slash "^3.0.0" source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^27.0.6": - version "27.0.6" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.0.6.tgz#9a992bc517e0c49f035938b8549719c2de40706b" - integrity sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g== +"@jest/types@^27.5.1": + version "27.5.1" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80" + integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^3.0.0" @@ -591,6 +596,24 @@ "@types/yargs" "^16.0.0" chalk "^4.0.0" +"@jridgewell/resolve-uri@^3.0.3": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c" + integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew== + +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.11" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec" + integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg== + +"@jridgewell/trace-mapping@^0.3.0": + version "0.3.4" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3" + integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@malept/cross-spawn-promise@^1.1.0": version "1.1.1" resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" @@ -608,13 +631,6 @@ lodash "^4.17.15" tmp-promise "^3.0.2" -"@mdn/browser-compat-data@^2.0.7": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz#72ec37b9c1e00ce0b4e0309d753be18e2da12ee3" - integrity sha512-GeeM827DlzFFidn1eKkMBiqXFD2oLsnZbaiGhByPl0vcapsRzUL+t9hDoov1swc9rB2jw64R+ihtzC8qOE9wXw== - dependencies: - extend "3.0.2" - "@remusao/guess-url-type@^1.1.2": version "1.2.1" resolved "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.1.tgz#b3e7c32abdf98d0fb4f93cc67cad580b5fe4ba57" @@ -662,10 +678,10 @@ dependencies: type-detect "4.0.8" -"@sinonjs/fake-timers@^7.0.2": - version "7.1.2" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz#2524eae70c4910edccf99b2f4e6efc5894aff7b5" - integrity sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg== +"@sinonjs/fake-timers@^8.0.1": + version "8.1.0" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7" + integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg== dependencies: "@sinonjs/commons" "^1.7.0" @@ -681,10 +697,15 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== + "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14": - version "7.1.14" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402" - integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g== + version "7.1.19" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460" + integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -693,44 +714,46 @@ "@types/babel__traverse" "*" "@types/babel__generator@*": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8" - integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ== + version "7.6.4" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7" + integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg== dependencies: "@babel/types" "^7.0.0" "@types/babel__template@*": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be" - integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A== + version "7.4.1" + resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969" + integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.0.tgz#a34277cf8acbd3185ea74129e1f100491eb1da7f" - integrity sha512-IilJZ1hJBUZwMOVDNTdflOOLzJB/ZtljYVa7k3gEZN/jqIJIPkWHC6dvbX+DD2CwZDHB9wAKzZPzzqMIkW37/w== + version "7.14.2" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43" + integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA== dependencies: "@babel/types" "^7.3.0" -"@types/chrome@^0.0.145": - version "0.0.145" - resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.145.tgz#6c53ae0af5f25350b07bfd24cf459b5fe65cd9b8" - integrity sha512-vLvTMmfc8mvwOZzkmn2UwlWSNu0t0txBkyuIv8NgihRkvFCe6XJX65YZAgAP/RdBit3enhU2GTxCr+prn4uZmA== +"@types/chrome@^0.0.180": + version "0.0.180" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.180.tgz#b7fb831848f6b6c49abffd85410b73037c02381e" + integrity sha512-A/CuuKAaHq2CHEpYBAtl0lp2ib7TTXK7VjJI4q+c+1U/HDvZLJ8IlsdEDzzHdvkNdh36bGONxrMnO9YZrKqbAw== dependencies: "@types/filesystem" "*" "@types/har-format" "*" -"@types/debug@^4.1.5": - version "4.1.5" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" - integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== +"@types/debug@^4.1.6": + version "4.1.7" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" + integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== + dependencies: + "@types/ms" "*" "@types/filesystem@*": - version "0.0.31" - resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.31.tgz#121a1ded274a2dc731d5e0d90163a920ad6a9ef1" - integrity sha512-9Dj1Gb7ZhknhJ8J1H/lTQrEorwIHWZlO9Tfi0WMrvyO1+2GUIUF8Sg4zrID77hj0ywArzQRJ1MwlT9H7c9QmEQ== + version "0.0.32" + resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.32.tgz#307df7cc084a2293c3c1a31151b178063e0a8edf" + integrity sha512-Yuf4jR5YYMR2DVgwuCiP11s0xuVRyPKmz8vo6HBY3CGdeMj8af93CFZX+T82+VD1+UqHOxTq31lO7MI7lepBtQ== dependencies: "@types/filewriter" "*" @@ -739,22 +762,22 @@ resolved "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.29.tgz#a48795ecadf957f6c0d10e0c34af86c098fa5bee" integrity sha512-BsPXH/irW0ht0Ji6iw/jJaK8Lj3FJemon2gvEqHKpCdDCeemHa+rI3WBGq5z7cDMZgoLjY40oninGxqk+8NzNQ== -"@types/firefox-webext-browser@^82.0.0": - version "82.0.0" - resolved "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-82.0.0.tgz#4d0f5cfebd7321d2cbf0ccfb6032570f0138b958" - integrity sha512-zKHePkjMx42KIUUZCPcUiyu1tpfQXH9VR4iDYfns3HvmKVJzt/TAFT+DFVroos8BI9RH78YgF3Hi/wlC6R6cKA== +"@types/firefox-webext-browser@^94.0.0": + version "94.0.1" + resolved "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-94.0.1.tgz#52afb975253dc0fd350d5d58c7fe9fd1a01f64a1" + integrity sha512-I6iHRQJSTZ+gYt2IxdH2RRAMvcUyK8v5Ig7fHQR0IwUNYP7hz9+cziBVIKxLCO6XI7fiyRsNOWObfl3/4Js2Lg== "@types/fs-extra@^9.0.11": - version "9.0.11" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz#8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87" - integrity sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA== + version "9.0.13" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" + integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== dependencies: "@types/node" "*" "@types/glob@^7.1.1": - version "7.1.3" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" - integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== + version "7.2.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" + integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== dependencies: "@types/minimatch" "*" "@types/node" "*" @@ -767,14 +790,14 @@ "@types/node" "*" "@types/har-format@*": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.6.tgz#471c83acdf6a2ea429620daee4c6dc1784a0e85f" - integrity sha512-TeZjp4COiAWPOeGx1tuFJETr/SBMx80lxqeqnCC36ZVn463f7ElCdA3X9RzDuo3BHjhN4apw41A5uoIw5FzgWA== + version "1.2.8" + resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.8.tgz#e6908b76d4c88be3db642846bb8b455f0bfb1c4e" + integrity sha512-OP6L9VuZNdskgNN3zFQQ54ceYD8OLq5IbqO4VK91ORLfOm7WdT/CiT/pHEBSQEqCInJ2y3O6iCm/zGtPElpgJQ== "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" - integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw== + version "2.0.4" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" + integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== "@types/istanbul-lib-report@*": version "3.0.0" @@ -791,19 +814,24 @@ "@types/istanbul-lib-report" "*" "@types/minimatch@*": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21" - integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" + integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== + +"@types/ms@*": + version "0.7.31" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" + integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "15.12.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.5.tgz#9a78318a45d75c9523d2396131bd3cca54b2d185" - integrity sha512-se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg== + version "17.0.22" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.22.tgz#38b6c4b9b2f3ed9f2e376cce42a298fb2375251e" + integrity sha512-8FwbVoG4fy+ykY86XCAclKZDORttqE5/s7dyWZKLXTdv3vRy5HozBEinG5IqhvPXXzIZEcTVbuHlQEI6iuwcmw== "@types/node@^14.6.2": - version "14.17.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.4.tgz#218712242446fc868d0e007af29a4408c7765bc0" - integrity sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A== + version "14.18.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz#0d4557fd3b94497d793efd4e7d92df2f83b4ef24" + integrity sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A== "@types/plist@^3.0.1": version "3.0.2" @@ -814,29 +842,36 @@ xmlbuilder ">=11.0.1" "@types/prettier@^2.1.5": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.0.tgz#2e8332cc7363f887d32ec5496b207d26ba8052bb" - integrity sha512-hkc1DATxFLQo4VxPDpMH1gCkPpBbpOoJ/4nhuXw4n63/0R6bCpQECj4+K226UJ4JO/eJQz+1mC2I7JsWanAdQw== + version "2.4.4" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.4.tgz#5d9b63132df54d8909fce1c3f8ca260fdd693e17" + integrity sha512-ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA== "@types/stack-utils@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" - integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" + integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== "@types/verror@^1.10.3": - version "1.10.4" - resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.4.tgz#805c0612b3a0c124cf99f517364142946b74ba3b" - integrity sha512-OjJdqx6QlbyZw9LShPwRW+Kmiegeg3eWNI41MQQKaG3vjdU2L9SRElntM51HmHBY1cu7izxQJ1lMYioQh3XMBg== + version "1.10.5" + resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz#2a1413aded46e67a1fe2386800e291123ed75eb1" + integrity sha512-9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw== "@types/yargs-parser@*": - version "20.2.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" - integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== + version "21.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" + integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== -"@types/yargs@^16.0.0", "@types/yargs@^16.0.2": - version "16.0.3" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz#4b6d35bb8e680510a7dc2308518a80ee1ef27e01" - integrity sha512-YlFfTGS+zqCgXuXNV26rOIeETOkXnGQXP/pjjL9P0gO/EP9jTmc7pUBhx+jVEIxpq41RX33GQ7N3DzOSfZoglQ== +"@types/yargs@^16.0.0": + version "16.0.4" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977" + integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw== + dependencies: + "@types/yargs-parser" "*" + +"@types/yargs@^17.0.1": + version "17.0.10" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz#591522fce85d8739bca7b8bb90d048e4478d186a" + integrity sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA== dependencies: "@types/yargs-parser" "*" @@ -854,24 +889,24 @@ acorn-globals@^6.0.0: acorn-walk "^7.1.1" acorn-jsx@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" - integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn-walk@^7.1.1: version "7.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn@^7.1.1, acorn@^7.4.0: +acorn@^7.1.1: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4: - version "8.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" - integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== +acorn@^8.2.4, acorn@^8.7.0: + version "8.7.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" + integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== agent-base@6: version "6.0.2" @@ -895,27 +930,12 @@ ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.1: - version "8.6.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz#60cc45d9c46a477d80d92c48076d972c342e5720" - integrity sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - ansi-align@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" - integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw== + version "3.0.1" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== dependencies: - string-width "^3.0.0" - -ansi-colors@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + string-width "^4.1.0" ansi-escapes@^4.2.1: version "4.3.2" @@ -924,20 +944,10 @@ ansi-escapes@^4.2.1: dependencies: type-fest "^0.21.3" -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= - -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== - -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-styles@^3.2.1: version "3.2.1" @@ -966,15 +976,15 @@ anymatch@^3.0.3: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@3.5.13: - version "3.5.13" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz#6dd7f4de34a4e408806f99b8c7d6ef1601305b7e" - integrity sha512-ighVe9G+bT1ENGdp9ecO1P+94vv/f+FUwaI+XkNzeg9bYF8Oi3BQ+mJuxS00UgyHs8luuOzjzC+qnAtdb43Mpg== +app-builder-bin@3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz#cb0825c5e12efc85b196ac3ed9c89f076c61040e" + integrity sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw== -app-builder-lib@22.11.7: - version "22.11.7" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz#c0ad1119ebfbf4189a8280ad693625f5e684dca6" - integrity sha512-pS9/cR4/TnNZVAHZECiSvvwTBzbwblj7KBBZkMKDG57nibq0I1XY8zAaYeHFdlYTyrRcz9JUXbAqJKezya7UFQ== +app-builder-lib@22.14.13: + version "22.14.13" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.13.tgz#c1f5b6afc86596357598bb90b69eef06c7c2eeb3" + integrity sha512-SufmrtxU+D0Tn948fjEwAOlCN9757UXLkzzTWXMwZKR/5hisvgqeeBepWfphMIE6OkDGz0fbzEhL1P2Pty4XMg== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" @@ -982,12 +992,14 @@ app-builder-lib@22.11.7: "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.11.7" - builder-util-runtime "8.7.7" + builder-util "22.14.13" + builder-util-runtime "8.9.2" chromium-pickle-js "^0.2.0" debug "^4.3.2" ejs "^3.1.6" - electron-publish "22.11.7" + electron-osx-sign "^0.5.0" + electron-publish "22.14.13" + form-data "^4.0.0" fs-extra "^10.0.0" hosted-git-info "^4.0.2" is-ci "^3.0.0" @@ -1000,35 +1012,6 @@ app-builder-lib@22.11.7: semver "^7.3.5" temp-file "^3.4.0" -archiver-utils@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2" - integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw== - dependencies: - glob "^7.1.4" - graceful-fs "^4.2.0" - lazystream "^1.0.0" - lodash.defaults "^4.2.0" - lodash.difference "^4.5.0" - lodash.flatten "^4.4.0" - lodash.isplainobject "^4.0.6" - lodash.union "^4.6.0" - normalize-path "^3.0.0" - readable-stream "^2.0.0" - -archiver@5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz#dd3e097624481741df626267564f7dd8640a45ba" - integrity sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg== - dependencies: - archiver-utils "^2.1.0" - async "^3.2.0" - buffer-crc32 "^0.2.1" - readable-stream "^3.6.0" - readdir-glob "^1.0.0" - tar-stream "^2.2.0" - zip-stream "^4.1.0" - argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -1042,9 +1025,9 @@ argparse@^2.0.1: integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== asar@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz#1fef03c2d6d2de0cbad138788e4f7ae03b129c7b" - integrity sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw== + version "3.1.0" + resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473" + integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ== dependencies: chromium-pickle-js "^0.2.0" commander "^5.0.0" @@ -1058,11 +1041,6 @@ assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= -ast-metadata-inferer@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/ast-metadata-inferer/-/ast-metadata-inferer-0.4.0.tgz#6be85ceeffcf267bd79db8e1ae731da44880b45f" - integrity sha512-tKHdBe8N/Vq2nLAm4YPBVREVZjMux6KrqyPfNQgIbDl0t7HaNSmy8w4OyVHYg/cvyn5BW7o7pVwpjPte89Zhcg== - astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" @@ -1078,11 +1056,6 @@ async@0.9.x: resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= -async@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" - integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -1093,35 +1066,35 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -babel-jest@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.6.tgz#e99c6e0577da2655118e3608b68761a5a69bd0d8" - integrity sha512-iTJyYLNc4wRofASmofpOc5NK9QunwMk+TLFgGXsTFS8uEqmd8wdI7sga0FPe2oVH3b5Agt/EAK1QjPEuKL8VfA== +babel-jest@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz#a1bf8d61928edfefd21da27eb86a695bfd691444" + integrity sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg== dependencies: - "@jest/transform" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" "@types/babel__core" "^7.1.14" - babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^27.0.6" + babel-plugin-istanbul "^6.1.1" + babel-preset-jest "^27.5.1" chalk "^4.0.0" - graceful-fs "^4.2.4" + graceful-fs "^4.2.9" slash "^3.0.0" -babel-plugin-istanbul@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" - integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ== +babel-plugin-istanbul@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" + integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@istanbuljs/load-nyc-config" "^1.0.0" "@istanbuljs/schema" "^0.1.2" - istanbul-lib-instrument "^4.0.0" + istanbul-lib-instrument "^5.0.4" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.6.tgz#f7c6b3d764af21cb4a2a1ab6870117dbde15b456" - integrity sha512-CewFeM9Vv2gM7Yr9n5eyyLVPRSiBnk6lKZRjgwYnGKSl9M14TMn2vkN02wTF04OGuSDLEzlWiMzvjXuW9mB6Gw== +babel-plugin-jest-hoist@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz#9be98ecf28c331eb9f5df9c72d6f89deb8181c2e" + integrity sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" @@ -1146,12 +1119,12 @@ babel-preset-current-node-syntax@^1.0.0: "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-jest@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.6.tgz#909ef08e9f24a4679768be2f60a3df0856843f9d" - integrity sha512-WObA0/Biw2LrVVwZkF/2GqbOdzhKD6Fkdwhoy9ASIrOWr/zodcSpQh72JOkEn6NWyjmnPDjNSqaGN4KnpKzhXw== +babel-preset-jest@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz#91f10f58034cb7989cb4f962b69fa6eef6a6bc81" + integrity sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag== dependencies: - babel-plugin-jest-hoist "^27.0.6" + babel-plugin-jest-hoist "^27.5.1" babel-preset-current-node-syntax "^1.0.0" balanced-match@^1.0.0: @@ -1164,15 +1137,6 @@ base64-js@^1.3.1, base64-js@^1.5.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -bl@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - bluebird-lst@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" @@ -1180,26 +1144,26 @@ bluebird-lst@^1.0.9: dependencies: bluebird "^3.5.5" -bluebird@^3.5.5: +bluebird@^3.5.0, bluebird@^3.5.5: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== boolean@^3.0.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz#e30f210a26b02458482a8cc353ab06f262a780c2" - integrity sha512-YN6UmV0FfLlBVvRvNPx3pz5W/mUoYB24J4WSXOKP/OOJpi+Oq6WYqPaNTHzjI0QzwWtnvEd5CGYyQPgp1jFxnw== + version "3.2.0" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" + integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== boxen@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.0.1.tgz#657528bdd3f59a772b8279b831f27ec2c744664b" - integrity sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA== + version "5.1.2" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== dependencies: ansi-align "^3.0.0" camelcase "^6.2.0" chalk "^4.1.0" cli-boxes "^2.2.1" - string-width "^4.2.0" + string-width "^4.2.2" type-fest "^0.20.2" widest-line "^3.1.0" wrap-ansi "^7.0.0" @@ -1224,16 +1188,16 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== -browserslist@^4.12.2, browserslist@^4.16.6: - version "4.16.6" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" - integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== +browserslist@^4.17.5: + version "4.20.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz#567b41508757ecd904dab4d1c646c612cd3d4f88" + integrity sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA== dependencies: - caniuse-lite "^1.0.30001219" - colorette "^1.2.2" - electron-to-chromium "^1.3.723" + caniuse-lite "^1.0.30001317" + electron-to-chromium "^1.4.84" escalade "^3.1.1" - node-releases "^1.1.71" + node-releases "^2.0.2" + picocolors "^1.0.0" bser@2.1.1: version "2.1.1" @@ -1242,7 +1206,20 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" -buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3: +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + +buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= @@ -1252,12 +1229,17 @@ buffer-equal@1.0.0: resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= -buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= -buffer@^5.1.0, buffer@^5.5.0: +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +buffer@^5.1.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== @@ -1265,36 +1247,31 @@ buffer@^5.1.0, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@8.7.6: - version "8.7.6" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz#4b43c96db2bd494ced7694bcd7674934655e8324" - integrity sha512-rj9AIY7CzLSuTOXpToiaQkruYh6UEQ+kYnd5UET22ch8MGClEtIZKXHG14qEiXEr2x4EOKDMxkcTa+9TYaE+ug== +builder-util-runtime@8.9.2: + version "8.9.2" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28" + integrity sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A== dependencies: debug "^4.3.2" sax "^1.2.4" -builder-util-runtime@8.7.7: - version "8.7.7" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz#6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d" - integrity sha512-RUfoXzVrmFFI0K/Oft0CtP1LpTIOlBeLJatt5DePTI0KlxE156am4SGUpqtbbdqZNm++LkV9mX4olBDcXyGPow== - dependencies: - debug "^4.3.2" - sax "^1.2.4" - -builder-util@22.11.7: - version "22.11.7" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz#ae9707afa6a31feafa13c274ac83b4fe28ef1467" - integrity sha512-ihqUe5ey82LM9qqQe0/oIcaSm9w+B9UjcsWJZxJliTBsbU+sErOpDFpHW+sim0veiTF/EIcGUh9HoduWw+l9FA== +builder-util@22.14.13: + version "22.14.13" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.13.tgz#41b5b7b4ee53aff4e09cc007fb144522598f3ce6" + integrity sha512-oePC/qrrUuerhmH5iaCJzPRAKlSBylrhzuAJmRQClTyWnZUv6jbaHh+VoHMbEiE661wrj2S2aV7/bQh12cj1OA== dependencies: "7zip-bin" "~5.1.1" - "@types/debug" "^4.1.5" + "@types/debug" "^4.1.6" "@types/fs-extra" "^9.0.11" - app-builder-bin "3.5.13" + app-builder-bin "3.7.1" bluebird-lst "^1.0.9" - builder-util-runtime "8.7.7" + builder-util-runtime "8.9.2" chalk "^4.1.1" + cross-spawn "^7.0.3" debug "^4.3.2" fs-extra "^10.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" is-ci "^3.0.0" js-yaml "^4.1.0" source-map-support "^0.5.19" @@ -1325,16 +1302,16 @@ camelcase@^5.3.1: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== camelcase@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" - integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001166, caniuse-lite@^1.0.30001219: - version "1.0.30001241" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001241.tgz#cd3fae47eb3d7691692b406568d7a3e5b23c7598" - integrity sha512-1uoSZ1Pq1VpH0WerIMqwptXHNNGfdl7d1cJUFs80CwQ/lVzdhTvsFZCeNFslze7AjsQnb4C85tzclPa1VShbeQ== +caniuse-lite@^1.0.30001317: + version "1.0.30001319" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz#eb4da4eb3ecdd409f7ba1907820061d56096e88f" + integrity sha512-xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw== -chalk@^2.0.0, chalk@^2.4.2: +chalk@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -1343,10 +1320,10 @@ chalk@^2.0.0, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -1366,28 +1343,28 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== -ci-info@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6" - integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A== +ci-info@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" + integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== cjs-module-lexer@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.1.tgz#2fd46d9906a126965aa541345c499aaa18e8cd73" - integrity sha512-jVamGdJPDeuQilKhvVn1h3knuMOZzr8QDnpk+M9aMlCaMkTDd6fBWPhiDqFvFZ07pL0liqabAiuy8SY4jGHeaw== + version "1.2.2" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" + integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== cli-boxes@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== -cli-truncate@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086" - integrity sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA== +cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== dependencies: - slice-ansi "^1.0.0" - string-width "^2.0.0" + slice-ansi "^3.0.0" + string-width "^4.2.0" cliui@^7.0.2: version "7.0.4" @@ -1439,11 +1416,6 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -colorette@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" - integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== - colors@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" @@ -1468,15 +1440,10 @@ commander@^5.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== -compress-commons@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d" - integrity sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ== - dependencies: - buffer-crc32 "^0.2.13" - crc32-stream "^4.0.2" - normalize-path "^3.0.0" - readable-stream "^3.6.0" +compare-version@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" + integrity sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA= concat-map@0.0.1: version "0.0.1" @@ -1520,31 +1487,15 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: dependencies: safe-buffer "~5.1.1" -core-js@^3.6.5: - version "3.15.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61" - integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q== - -core-util-is@1.0.2, core-util-is@~1.0.0: +core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -crc-32@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208" - integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA== - dependencies: - exit-on-epipe "~1.0.1" - printj "~1.1.0" - -crc32-stream@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007" - integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w== - dependencies: - crc-32 "^1.2.0" - readable-stream "^3.4.0" +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== crc@^3.8.0: version "3.8.0" @@ -1593,27 +1544,20 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" -debug@^2.6.9: +debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== - dependencies: - ms "2.1.2" - decimal.js@^10.2.1: version "10.3.1" resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" @@ -1637,9 +1581,9 @@ deep-extend@^0.6.0: integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== deep-is@^0.1.3, deep-is@~0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== deepmerge@^4.2.2: version "4.2.2" @@ -1673,10 +1617,10 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -diff-sequences@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz#3305cb2e55a033924054695cc66019fd7f8e5723" - integrity sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ== +diff-sequences@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327" + integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ== dir-compare@^2.4.0: version "2.4.0" @@ -1688,14 +1632,14 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@22.11.7: - version "22.11.7" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz#5956008c18d40ee72c0ea01ffea9590dbf51df89" - integrity sha512-+I+XfP2DODHB6PwFANgpH/WMzzCA5r5XoMvbFCIYjQjJpXlO0XnqQaamzFl2vh/Wz/Qt0d0lJMgRy8gKR3MGdQ== +dmg-builder@22.14.13: + version "22.14.13" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.13.tgz#cc613f3c18e889b8777d525991fd52f50a564f8c" + integrity sha512-xNOugB6AbIRETeU2uID15sUfjdZZcKdxK8xkFnwIggsM00PJ12JxpLNPTjcRoUnfwj3WrPjilrO64vRMwNItQg== dependencies: - app-builder-lib "22.11.7" - builder-util "22.11.7" - builder-util-runtime "8.7.6" + app-builder-lib "22.14.13" + builder-util "22.14.13" + builder-util-runtime "8.9.2" fs-extra "^10.0.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" @@ -1703,17 +1647,16 @@ dmg-builder@22.11.7: dmg-license "^1.0.9" dmg-license@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz#a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f" - integrity sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q== + version "1.0.11" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a" + integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q== dependencies: "@types/plist" "^3.0.1" "@types/verror" "^1.10.3" ajv "^6.10.0" - cli-truncate "^1.1.0" crc "^3.8.0" - iconv-corefoundation "^1.1.6" - plist "^3.0.1" + iconv-corefoundation "^1.1.7" + plist "^3.0.4" smart-buffer "^4.0.2" verror "^1.10.0" @@ -1760,17 +1703,17 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@22.11.7: - version "22.11.7" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz#cd97a0d9f6e6d388112e66b4376de431cca4d596" - integrity sha512-yQExSLt7Hbz/P8lLkZDdE/OnJJ7NCX+uiQcV+XIH0TeEZcD87ZnSqBBzGUN5akySU4BXXlrVZKeUsXACWrm5Kw== +electron-builder@22.14.13: + version "22.14.13" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.13.tgz#fd40564685cf5422a8f8d667940af3d3776f4fb8" + integrity sha512-3fgLxqF2TXVKiUPeg74O4V3l0l3j7ERLazo8sUbRkApw0+4iVAf2BJkHsHMaXiigsgCoEzK/F4/rB5rne/VAnw== dependencies: - "@types/yargs" "^16.0.2" - app-builder-lib "22.11.7" - builder-util "22.11.7" - builder-util-runtime "8.7.7" + "@types/yargs" "^17.0.1" + app-builder-lib "22.14.13" + builder-util "22.14.13" + builder-util-runtime "8.9.2" chalk "^4.1.1" - dmg-builder "22.11.7" + dmg-builder "22.14.13" fs-extra "^10.0.0" is-ci "^3.0.0" lazy-val "^1.0.5" @@ -1778,30 +1721,42 @@ electron-builder@22.11.7: update-notifier "^5.1.0" yargs "^17.0.1" -electron-publish@22.11.7: - version "22.11.7" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz#4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a" - integrity sha512-A4EhRRNBVz4SPzUlBrPO6BmuyDeI0pyprggPAV9rQ+SDVSnSB/WKPot9JwWMyArkGj3AUUTMNVT6hwZhMvhfqw== +electron-osx-sign@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz#fc258c5e896859904bbe3d01da06902c04b51c3a" + integrity sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ== + dependencies: + bluebird "^3.5.0" + compare-version "^0.1.2" + debug "^2.6.8" + isbinaryfile "^3.0.2" + minimist "^1.2.0" + plist "^3.0.1" + +electron-publish@22.14.13: + version "22.14.13" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.13.tgz#8b71e6975af8cc6ac5b21f293ade23f8704047c7" + integrity sha512-0oP3QiNj3e8ewOaEpEJV/o6Zrmy2VarVvZ/bH7kyO/S/aJf9x8vQsKVWpsdmSiZ5DJEHgarFIXrnO0ZQf0P9iQ== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "22.11.7" - builder-util-runtime "8.7.7" + builder-util "22.14.13" + builder-util-runtime "8.9.2" chalk "^4.1.1" fs-extra "^10.0.0" lazy-val "^1.0.5" mime "^2.5.2" -electron-to-chromium@^1.3.723: - version "1.3.763" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.763.tgz#93f6f02506d099941f557b9db9ba50b30215bf15" - integrity sha512-UyvEPae0wvzsyNJhVfGeFSOlUkHEze8xSIiExO5tZQ8QTr7obFiJWGk3U4e7afFOJMQJDszqU/3Pk5jtKiaSEg== +electron-to-chromium@^1.4.84: + version "1.4.90" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.90.tgz#4a518590f118828d54fff045728f547fef08143f" + integrity sha512-ZwKgSA0mQMyEhz+NR0F8dRzkrCLeHLzLkjx/CWf16+zV85hQ6meXPQbKanvhnpkYb7b2uJNj+enQJ/N877ND4Q== -electron@13.1.4: - version "13.1.4" - resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.4.tgz#6d20d932a0651c3cba9f09a3d08cbaf5b69aa84b" - integrity sha512-4qhRZbRvGqHmMWsCG/kRVF4X8VIq9Nujgm+gXZLBSpiR6uUtMHy7ViBTQZl1PGf6O9Ppxhpr9Yz+k6Um9WoP3Q== +electron@17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-17.0.1.tgz#e6c7ad2be26e7be8a5a9bac16b21920ad2671224" + integrity sha512-CBReR/QEOpgwMdt59lWCtj9wC8oHB6aAjMF1lhXcGew132xtp+C5N6EaXb/fmDceVYLouziYjbNcpeXsWrqdpA== dependencies: - "@electron/get" "^1.0.1" + "@electron/get" "^1.13.0" "@types/node" "^14.6.2" extract-zip "^1.0.3" @@ -1810,11 +1765,6 @@ emittery@^0.8.1: resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860" integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg== -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -1825,25 +1775,25 @@ encodeurl@^1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -end-of-stream@^1.1.0, end-of-stream@^1.4.1: +end-of-stream@^1.1.0: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== dependencies: once "^1.4.0" -enquirer@^2.3.5: - version "2.3.6" - resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" - integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== - dependencies: - ansi-colors "^4.1.1" - env-paths@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + es6-error@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" @@ -1886,105 +1836,87 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" -eslint-plugin-compat@3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-compat/-/eslint-plugin-compat-3.9.0.tgz#a7a224e09b102b58e7f7dff52c936428ff3e0186" - integrity sha512-lt3l5PHFHVEYSZ5zijcoYvtQJPsBifRiH5N0Et57KwVu7l/yxmHhSG6VJiLMa/lXrg93Qu8049RNQOMn0+yJBg== +eslint-plugin-sort-keys@2.3.5: + version "2.3.5" + resolved "https://registry.yarnpkg.com/eslint-plugin-sort-keys/-/eslint-plugin-sort-keys-2.3.5.tgz#f28d5cd2f5ee0fc5192f5ff879f56f8516aac57b" + integrity sha512-2j/XKQ9sNJwK8kIp/U0EvuF6stS6/8aIc53/NskE4C5NRNh4dt3xzbZyOdrVC11cTH6Zo59/pdzA0Kb+2fQGWg== dependencies: - "@mdn/browser-compat-data" "^2.0.7" - ast-metadata-inferer "^0.4.0" - browserslist "^4.12.2" - caniuse-lite "^1.0.30001166" - core-js "^3.6.5" - find-up "^4.1.0" - lodash.memoize "4.1.2" - semver "7.3.2" + natural-compare "1.4.0" -eslint-plugin-sort-keys-fix@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-sort-keys-fix/-/eslint-plugin-sort-keys-fix-1.1.1.tgz#2ed201b53fd4a89552c6e2abd38933f330a4b62e" - integrity sha512-x02SLBg+8OEaoT9vvMbsgeInw17wjHLsa9cOieIVQY+xMNRiXBbyMWw+NiBoxYyJIR4QKDOPDofCjQdoSvltQg== - dependencies: - requireindex "~1.2.0" - -eslint-scope@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== +eslint-scope@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" + integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== dependencies: esrecurse "^4.3.0" - estraverse "^4.1.1" + estraverse "^5.2.0" -eslint-utils@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" - integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== dependencies: - eslint-visitor-keys "^1.1.0" - -eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" - integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + eslint-visitor-keys "^2.0.0" eslint-visitor-keys@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint@7.29.0: - version "7.29.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0" - integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA== +eslint-visitor-keys@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" + integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== + +eslint@8.9.0: + version "8.9.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.9.0.tgz#a2a8227a99599adc4342fd9b854cb8d8d6412fdb" + integrity sha512-PB09IGwv4F4b0/atrbcMFboF/giawbBLVC7fyDamk5Wtey4Jh2K+rYaBhCAbUyEI4QzB1ly09Uglc9iCtFaG2Q== dependencies: - "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.2" + "@eslint/eslintrc" "^1.1.0" + "@humanwhocodes/config-array" "^0.9.2" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" - debug "^4.0.1" + debug "^4.3.2" doctrine "^3.0.0" - enquirer "^2.3.5" escape-string-regexp "^4.0.0" - eslint-scope "^5.1.1" - eslint-utils "^2.1.0" - eslint-visitor-keys "^2.0.0" - espree "^7.3.1" + eslint-scope "^7.1.1" + eslint-utils "^3.0.0" + eslint-visitor-keys "^3.3.0" + espree "^9.3.1" esquery "^1.4.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" - glob-parent "^5.1.2" + glob-parent "^6.0.1" globals "^13.6.0" - ignore "^4.0.6" + ignore "^5.2.0" import-fresh "^3.0.0" imurmurhash "^0.1.4" is-glob "^4.0.0" - js-yaml "^3.13.1" + js-yaml "^4.1.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" lodash.merge "^4.6.2" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" - progress "^2.0.0" - regexpp "^3.1.0" - semver "^7.2.1" - strip-ansi "^6.0.0" + regexpp "^3.2.0" + strip-ansi "^6.0.1" strip-json-comments "^3.1.0" - table "^6.0.9" text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^7.3.0, espree@^7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" - integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== +espree@^9.3.1: + version "9.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd" + integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ== dependencies: - acorn "^7.4.0" + acorn "^8.7.0" acorn-jsx "^5.3.1" - eslint-visitor-keys "^1.3.0" + eslint-visitor-keys "^3.3.0" esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" @@ -2005,15 +1937,10 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - estraverse@^5.1.0, estraverse@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" - integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== esutils@^2.0.2: version "2.0.3" @@ -2035,32 +1962,20 @@ execa@^5.0.0: signal-exit "^3.0.3" strip-final-newline "^2.0.0" -exit-on-epipe@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692" - integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw== - exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= -expect@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/expect/-/expect-27.0.6.tgz#a4d74fbe27222c718fff68ef49d78e26a8fd4c05" - integrity sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw== +expect@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz#83ce59f1e5bdf5f9d2b94b61d2050db48f3fef74" + integrity sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw== dependencies: - "@jest/types" "^27.0.6" - ansi-styles "^5.0.0" - jest-get-type "^27.0.6" - jest-matcher-utils "^27.0.6" - jest-message-util "^27.0.6" - jest-regex-util "^27.0.6" - -extend@3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + "@jest/types" "^27.5.1" + jest-get-type "^27.5.1" + jest-matcher-utils "^27.5.1" + jest-message-util "^27.5.1" extract-zip@^1.0.3: version "1.7.0" @@ -2073,9 +1988,9 @@ extract-zip@^1.0.3: yauzl "^2.10.0" extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + version "1.4.1" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" + integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" @@ -2093,9 +2008,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= fast-xml-parser@^3.19.0: - version "3.19.0" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz#cb637ec3f3999f51406dd8ff0e6fc4d83e520d01" - integrity sha512-4pXwmBplsCPv8FOY1WRakF970TjNGnGnfbOnLqjlYvMiF1SR3yOHyxMR/YCXpPTOspNF5gwudqktIP4VsWkvBg== + version "3.21.1" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz#152a1d51d445380f7046b304672dd55d15c9e736" + integrity sha512-FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg== + dependencies: + strnum "^1.0.4" fb-watchman@^2.0.0: version "2.0.1" @@ -2149,9 +2066,9 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" - integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + version "3.2.5" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" + integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== form-data@^3.0.0: version "3.0.1" @@ -2162,15 +2079,19 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/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" fs-extra@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1" - integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ== + version "10.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8" + integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -2249,17 +2170,17 @@ get-stream@^6.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== -glob-parent@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== +glob-parent@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== dependencies: - is-glob "^4.0.1" + is-glob "^4.0.3" glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -2268,13 +2189,12 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -global-agent@^2.0.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz#566331b0646e6bf79429a16877685c4a1fbf76dc" - integrity sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg== +global-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" + integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== dependencies: boolean "^3.0.1" - core-js "^3.6.5" es6-error "^4.1.1" matcher "^3.0.0" roarr "^2.15.3" @@ -2304,9 +2224,9 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^13.6.0, globals@^13.9.0: - version "13.9.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" - integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== + version "13.13.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b" + integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A== dependencies: type-fest "^0.20.2" @@ -2334,10 +2254,10 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.9: + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== "graceful-readlink@>= 1.0.0": version "1.0.1" @@ -2367,9 +2287,9 @@ has@^1.0.3: function-bind "^1.1.1" hosted-git-info@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" - integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + version "4.1.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== dependencies: lru-cache "^6.0.0" @@ -2399,6 +2319,15 @@ http-proxy-agent@^4.0.1: agent-base "6" debug "4" +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== + dependencies: + "@tootallnate/once" "2" + agent-base "6" + debug "4" + https-proxy-agent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" @@ -2412,12 +2341,12 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== -iconv-corefoundation@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz#27c135470237f6f8d13462fa1f5eaf250523c29a" - integrity sha512-1NBe55C75bKGZaY9UHxvXG3G0gEp0ziht7quhuFrW3SPgZDw9HI6qvYXRSV5M/Eupyu8ljuJ6Cba+ec15PZ4Xw== +iconv-corefoundation@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" + integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== dependencies: - cli-truncate "^1.1.0" + cli-truncate "^2.1.0" node-addon-api "^1.6.3" iconv-lite@0.4.24: @@ -2439,10 +2368,10 @@ ieee754@^1.1.13: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -ignore@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" - integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== +ignore@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" + integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" @@ -2458,9 +2387,9 @@ import-lazy@^2.1.0: integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= import-local@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" - integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" + integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== dependencies: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" @@ -2478,7 +2407,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: +inherits@2, inherits@^2.0.3, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -2493,6 +2422,11 @@ ini@^1.3.4, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -2501,16 +2435,16 @@ is-ci@^2.0.0: ci-info "^2.0.0" is-ci@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz#c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994" - integrity sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ== + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" + integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== dependencies: - ci-info "^3.1.1" + ci-info "^3.2.0" -is-core-module@^2.2.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" - integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== +is-core-module@^2.8.1: + version "2.8.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" + integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== dependencies: has "^1.0.3" @@ -2519,11 +2453,6 @@ is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= - is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -2534,10 +2463,10 @@ is-generator-fn@^2.0.0: resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== -is-glob@^4.0.0, is-glob@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== +is-glob@^4.0.0, is-glob@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== dependencies: is-extglob "^2.1.1" @@ -2575,14 +2504,14 @@ is-potential-custom-element-name@^1.0.1: integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== -is-svg@4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-4.3.1.tgz#8c63ec8c67c8c7f0a8de0a71c8c7d58eccf4406b" - integrity sha512-h2CGs+yPUyvkgTJQS9cJzo9lYK06WgRiXUqBBHtglSzVKAuH4/oWsqk7LGfbSa1hGk9QcZ0SyQtVggvBA8LZXA== +is-svg@4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-4.3.2.tgz#a119e9932e1af53f6be1969d1790d6cc5fd947d3" + integrity sha512-mM90duy00JGMyjqIVHu9gNTjywdZV+8qNasX8cm/EEYZ53PHDgajvbBwNVvty5dwSAxLUD3p3bdo+7sR/UMrpw== dependencies: fast-xml-parser "^3.19.0" @@ -2601,6 +2530,13 @@ isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isbinaryfile@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" + integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== + dependencies: + buffer-alloc "^1.2.0" + isbinaryfile@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" @@ -2611,19 +2547,20 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -istanbul-lib-coverage@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" - integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== +istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" + integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== -istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" - integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== +istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a" + integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q== dependencies: - "@babel/core" "^7.7.5" + "@babel/core" "^7.12.3" + "@babel/parser" "^7.14.7" "@istanbuljs/schema" "^0.1.2" - istanbul-lib-coverage "^3.0.0" + istanbul-lib-coverage "^3.2.0" semver "^6.3.0" istanbul-lib-report@^3.0.0: @@ -2636,252 +2573,254 @@ istanbul-lib-report@^3.0.0: supports-color "^7.1.0" istanbul-lib-source-maps@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" - integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== + version "4.0.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551" + integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw== dependencies: debug "^4.1.1" istanbul-lib-coverage "^3.0.0" source-map "^0.6.1" -istanbul-reports@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b" - integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw== +istanbul-reports@^3.1.3: + version "3.1.4" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz#1b6f068ecbc6c331040aab5741991273e609e40c" + integrity sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" jake@^10.6.1: - version "10.8.2" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" - integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== + version "10.8.4" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.4.tgz#f6a8b7bf90c6306f768aa82bb7b98bf4ca15e84a" + integrity sha512-MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA== dependencies: async "0.9.x" - chalk "^2.4.2" + chalk "^4.0.2" filelist "^1.0.1" minimatch "^3.0.4" -jest-changed-files@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.6.tgz#bed6183fcdea8a285482e3b50a9a7712d49a7a8b" - integrity sha512-BuL/ZDauaq5dumYh5y20sn4IISnf1P9A0TDswTxUi84ORGtVa86ApuBHqICL0vepqAnZiY6a7xeSPWv2/yy4eA== +jest-changed-files@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz#a348aed00ec9bf671cc58a66fcbe7c3dfd6a68f5" + integrity sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.5.1" execa "^5.0.0" throat "^6.0.1" -jest-circus@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.6.tgz#dd4df17c4697db6a2c232aaad4e9cec666926668" - integrity sha512-OJlsz6BBeX9qR+7O9lXefWoc2m9ZqcZ5Ohlzz0pTEAG4xMiZUJoacY8f4YDHxgk0oKYxj277AfOk9w6hZYvi1Q== +jest-circus@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.1.tgz#37a5a4459b7bf4406e53d637b49d22c65d125ecc" + integrity sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw== dependencies: - "@jest/environment" "^27.0.6" - "@jest/test-result" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/environment" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^27.0.6" + expect "^27.5.1" is-generator-fn "^2.0.0" - jest-each "^27.0.6" - jest-matcher-utils "^27.0.6" - jest-message-util "^27.0.6" - jest-runtime "^27.0.6" - jest-snapshot "^27.0.6" - jest-util "^27.0.6" - pretty-format "^27.0.6" + jest-each "^27.5.1" + jest-matcher-utils "^27.5.1" + jest-message-util "^27.5.1" + jest-runtime "^27.5.1" + jest-snapshot "^27.5.1" + jest-util "^27.5.1" + pretty-format "^27.5.1" slash "^3.0.0" stack-utils "^2.0.3" throat "^6.0.1" -jest-cli@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.6.tgz#d021e5f4d86d6a212450d4c7b86cb219f1e6864f" - integrity sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg== +jest-cli@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.1.tgz#278794a6e6458ea8029547e6c6cbf673bd30b145" + integrity sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw== dependencies: - "@jest/core" "^27.0.6" - "@jest/test-result" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/core" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/types" "^27.5.1" chalk "^4.0.0" exit "^0.1.2" - graceful-fs "^4.2.4" + graceful-fs "^4.2.9" import-local "^3.0.2" - jest-config "^27.0.6" - jest-util "^27.0.6" - jest-validate "^27.0.6" + jest-config "^27.5.1" + jest-util "^27.5.1" + jest-validate "^27.5.1" prompts "^2.0.1" - yargs "^16.0.3" + yargs "^16.2.0" -jest-config@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.6.tgz#119fb10f149ba63d9c50621baa4f1f179500277f" - integrity sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w== +jest-config@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.1.tgz#5c387de33dca3f99ad6357ddeccd91bf3a0e4a41" + integrity sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA== dependencies: - "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^27.0.6" - "@jest/types" "^27.0.6" - babel-jest "^27.0.6" + "@babel/core" "^7.8.0" + "@jest/test-sequencer" "^27.5.1" + "@jest/types" "^27.5.1" + babel-jest "^27.5.1" chalk "^4.0.0" + ci-info "^3.2.0" deepmerge "^4.2.2" glob "^7.1.1" - graceful-fs "^4.2.4" - is-ci "^3.0.0" - jest-circus "^27.0.6" - jest-environment-jsdom "^27.0.6" - jest-environment-node "^27.0.6" - jest-get-type "^27.0.6" - jest-jasmine2 "^27.0.6" - jest-regex-util "^27.0.6" - jest-resolve "^27.0.6" - jest-runner "^27.0.6" - jest-util "^27.0.6" - jest-validate "^27.0.6" + graceful-fs "^4.2.9" + jest-circus "^27.5.1" + jest-environment-jsdom "^27.5.1" + jest-environment-node "^27.5.1" + jest-get-type "^27.5.1" + jest-jasmine2 "^27.5.1" + jest-regex-util "^27.5.1" + jest-resolve "^27.5.1" + jest-runner "^27.5.1" + jest-util "^27.5.1" + jest-validate "^27.5.1" micromatch "^4.0.4" - pretty-format "^27.0.6" + parse-json "^5.2.0" + pretty-format "^27.5.1" + slash "^3.0.0" + strip-json-comments "^3.1.1" -jest-diff@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.6.tgz#4a7a19ee6f04ad70e0e3388f35829394a44c7b5e" - integrity sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg== +jest-diff@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def" + integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw== dependencies: chalk "^4.0.0" - diff-sequences "^27.0.6" - jest-get-type "^27.0.6" - pretty-format "^27.0.6" + diff-sequences "^27.5.1" + jest-get-type "^27.5.1" + pretty-format "^27.5.1" -jest-docblock@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz#cc78266acf7fe693ca462cbbda0ea4e639e4e5f3" - integrity sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA== +jest-docblock@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz#14092f364a42c6108d42c33c8cf30e058e25f6c0" + integrity sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ== dependencies: detect-newline "^3.0.0" -jest-each@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.6.tgz#cee117071b04060158dc8d9a66dc50ad40ef453b" - integrity sha512-m6yKcV3bkSWrUIjxkE9OC0mhBZZdhovIW5ergBYirqnkLXkyEn3oUUF/QZgyecA1cF1QFyTE8bRRl8Tfg1pfLA== +jest-each@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.1.tgz#5bc87016f45ed9507fed6e4702a5b468a5b2c44e" + integrity sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.5.1" chalk "^4.0.0" - jest-get-type "^27.0.6" - jest-util "^27.0.6" - pretty-format "^27.0.6" + jest-get-type "^27.5.1" + jest-util "^27.5.1" + pretty-format "^27.5.1" -jest-environment-jsdom@27.0.6, jest-environment-jsdom@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz#f66426c4c9950807d0a9f209c590ce544f73291f" - integrity sha512-FvetXg7lnXL9+78H+xUAsra3IeZRTiegA3An01cWeXBspKXUhAwMM9ycIJ4yBaR0L7HkoMPaZsozCLHh4T8fuw== +jest-environment-jsdom@27.5.1, jest-environment-jsdom@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz#ea9ccd1fc610209655a77898f86b2b559516a546" + integrity sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw== dependencies: - "@jest/environment" "^27.0.6" - "@jest/fake-timers" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/environment" "^27.5.1" + "@jest/fake-timers" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" - jest-mock "^27.0.6" - jest-util "^27.0.6" + jest-mock "^27.5.1" + jest-util "^27.5.1" jsdom "^16.6.0" -jest-environment-node@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.6.tgz#a6699b7ceb52e8d68138b9808b0c404e505f3e07" - integrity sha512-+Vi6yLrPg/qC81jfXx3IBlVnDTI6kmRr08iVa2hFCWmJt4zha0XW7ucQltCAPhSR0FEKEoJ3i+W4E6T0s9is0w== +jest-environment-node@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz#dedc2cfe52fab6b8f5714b4808aefa85357a365e" + integrity sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw== dependencies: - "@jest/environment" "^27.0.6" - "@jest/fake-timers" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/environment" "^27.5.1" + "@jest/fake-timers" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" - jest-mock "^27.0.6" - jest-util "^27.0.6" + jest-mock "^27.5.1" + jest-util "^27.5.1" -jest-get-type@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz#0eb5c7f755854279ce9b68a9f1a4122f69047cfe" - integrity sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg== +jest-get-type@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1" + integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw== -jest-haste-map@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.6.tgz#4683a4e68f6ecaa74231679dca237279562c8dc7" - integrity sha512-4ldjPXX9h8doB2JlRzg9oAZ2p6/GpQUNAeiYXqcpmrKbP0Qev0wdZlxSMOmz8mPOEnt4h6qIzXFLDi8RScX/1w== +jest-haste-map@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz#9fd8bd7e7b4fa502d9c6164c5640512b4e811e7f" + integrity sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.5.1" "@types/graceful-fs" "^4.1.2" "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" - graceful-fs "^4.2.4" - jest-regex-util "^27.0.6" - jest-serializer "^27.0.6" - jest-util "^27.0.6" - jest-worker "^27.0.6" + graceful-fs "^4.2.9" + jest-regex-util "^27.5.1" + jest-serializer "^27.5.1" + jest-util "^27.5.1" + jest-worker "^27.5.1" micromatch "^4.0.4" walker "^1.0.7" optionalDependencies: fsevents "^2.3.2" -jest-jasmine2@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz#fd509a9ed3d92bd6edb68a779f4738b100655b37" - integrity sha512-cjpH2sBy+t6dvCeKBsHpW41mjHzXgsavaFMp+VWRf0eR4EW8xASk1acqmljFtK2DgyIECMv2yCdY41r2l1+4iA== +jest-jasmine2@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz#a037b0034ef49a9f3d71c4375a796f3b230d1ac4" + integrity sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ== dependencies: - "@babel/traverse" "^7.1.0" - "@jest/environment" "^27.0.6" - "@jest/source-map" "^27.0.6" - "@jest/test-result" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/environment" "^27.5.1" + "@jest/source-map" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^27.0.6" + expect "^27.5.1" is-generator-fn "^2.0.0" - jest-each "^27.0.6" - jest-matcher-utils "^27.0.6" - jest-message-util "^27.0.6" - jest-runtime "^27.0.6" - jest-snapshot "^27.0.6" - jest-util "^27.0.6" - pretty-format "^27.0.6" + jest-each "^27.5.1" + jest-matcher-utils "^27.5.1" + jest-message-util "^27.5.1" + jest-runtime "^27.5.1" + jest-snapshot "^27.5.1" + jest-util "^27.5.1" + pretty-format "^27.5.1" throat "^6.0.1" -jest-leak-detector@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz#545854275f85450d4ef4b8fe305ca2a26450450f" - integrity sha512-2/d6n2wlH5zEcdctX4zdbgX8oM61tb67PQt4Xh8JFAIy6LRKUnX528HulkaG6nD5qDl5vRV1NXejCe1XRCH5gQ== +jest-leak-detector@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz#6ec9d54c3579dd6e3e66d70e3498adf80fde3fb8" + integrity sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ== dependencies: - jest-get-type "^27.0.6" - pretty-format "^27.0.6" + jest-get-type "^27.5.1" + pretty-format "^27.5.1" -jest-matcher-utils@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz#2a8da1e86c620b39459f4352eaa255f0d43e39a9" - integrity sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA== +jest-matcher-utils@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab" + integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw== dependencies: chalk "^4.0.0" - jest-diff "^27.0.6" - jest-get-type "^27.0.6" - pretty-format "^27.0.6" + jest-diff "^27.5.1" + jest-get-type "^27.5.1" + pretty-format "^27.5.1" -jest-message-util@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.6.tgz#158bcdf4785706492d164a39abca6a14da5ab8b5" - integrity sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw== +jest-message-util@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf" + integrity sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g== dependencies: "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.0.6" + "@jest/types" "^27.5.1" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" - graceful-fs "^4.2.4" + graceful-fs "^4.2.9" micromatch "^4.0.4" - pretty-format "^27.0.6" + pretty-format "^27.5.1" slash "^3.0.0" stack-utils "^2.0.3" -jest-mock@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.6.tgz#0efdd40851398307ba16778728f6d34d583e3467" - integrity sha512-lzBETUoK8cSxts2NYXSBWT+EJNzmUVtVVwS1sU9GwE1DLCfGsngg+ZVSIe0yd0ZSm+y791esiuo+WSwpXJQ5Bw== +jest-mock@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz#19948336d49ef4d9c52021d34ac7b5f36ff967d6" + integrity sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.5.1" "@types/node" "*" jest-pnp-resolver@^1.2.2: @@ -2889,187 +2828,181 @@ jest-pnp-resolver@^1.2.2: resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== -jest-regex-util@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz#02e112082935ae949ce5d13b2675db3d8c87d9c5" - integrity sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ== +jest-regex-util@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95" + integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg== -jest-resolve-dependencies@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz#3e619e0ef391c3ecfcf6ef4056207a3d2be3269f" - integrity sha512-mg9x9DS3BPAREWKCAoyg3QucCr0n6S8HEEsqRCKSPjPcu9HzRILzhdzY3imsLoZWeosEbJZz6TKasveczzpJZA== +jest-resolve-dependencies@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz#d811ecc8305e731cc86dd79741ee98fed06f1da8" + integrity sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg== dependencies: - "@jest/types" "^27.0.6" - jest-regex-util "^27.0.6" - jest-snapshot "^27.0.6" + "@jest/types" "^27.5.1" + jest-regex-util "^27.5.1" + jest-snapshot "^27.5.1" -jest-resolve@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.6.tgz#e90f436dd4f8fbf53f58a91c42344864f8e55bff" - integrity sha512-yKmIgw2LgTh7uAJtzv8UFHGF7Dm7XfvOe/LQ3Txv101fLM8cx2h1QVwtSJ51Q/SCxpIiKfVn6G2jYYMDNHZteA== +jest-resolve@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.1.tgz#a2f1c5a0796ec18fe9eb1536ac3814c23617b384" + integrity sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.5.1" chalk "^4.0.0" - escalade "^3.1.1" - graceful-fs "^4.2.4" + graceful-fs "^4.2.9" + jest-haste-map "^27.5.1" jest-pnp-resolver "^1.2.2" - jest-util "^27.0.6" - jest-validate "^27.0.6" + jest-util "^27.5.1" + jest-validate "^27.5.1" resolve "^1.20.0" + resolve.exports "^1.1.0" slash "^3.0.0" -jest-runner@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.6.tgz#1325f45055539222bbc7256a6976e993ad2f9520" - integrity sha512-W3Bz5qAgaSChuivLn+nKOgjqNxM7O/9JOJoKDCqThPIg2sH/d4A/lzyiaFgnb9V1/w29Le11NpzTJSzga1vyYQ== +jest-runner@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.1.tgz#071b27c1fa30d90540805c5645a0ec167c7b62e5" + integrity sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ== dependencies: - "@jest/console" "^27.0.6" - "@jest/environment" "^27.0.6" - "@jest/test-result" "^27.0.6" - "@jest/transform" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/console" "^27.5.1" + "@jest/environment" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" chalk "^4.0.0" emittery "^0.8.1" - exit "^0.1.2" - graceful-fs "^4.2.4" - jest-docblock "^27.0.6" - jest-environment-jsdom "^27.0.6" - jest-environment-node "^27.0.6" - jest-haste-map "^27.0.6" - jest-leak-detector "^27.0.6" - jest-message-util "^27.0.6" - jest-resolve "^27.0.6" - jest-runtime "^27.0.6" - jest-util "^27.0.6" - jest-worker "^27.0.6" + graceful-fs "^4.2.9" + jest-docblock "^27.5.1" + jest-environment-jsdom "^27.5.1" + jest-environment-node "^27.5.1" + jest-haste-map "^27.5.1" + jest-leak-detector "^27.5.1" + jest-message-util "^27.5.1" + jest-resolve "^27.5.1" + jest-runtime "^27.5.1" + jest-util "^27.5.1" + jest-worker "^27.5.1" source-map-support "^0.5.6" throat "^6.0.1" -jest-runtime@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.6.tgz#45877cfcd386afdd4f317def551fc369794c27c9" - integrity sha512-BhvHLRVfKibYyqqEFkybsznKwhrsu7AWx2F3y9G9L95VSIN3/ZZ9vBpm/XCS2bS+BWz3sSeNGLzI3TVQ0uL85Q== +jest-runtime@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.1.tgz#4896003d7a334f7e8e4a53ba93fb9bcd3db0a1af" + integrity sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A== dependencies: - "@jest/console" "^27.0.6" - "@jest/environment" "^27.0.6" - "@jest/fake-timers" "^27.0.6" - "@jest/globals" "^27.0.6" - "@jest/source-map" "^27.0.6" - "@jest/test-result" "^27.0.6" - "@jest/transform" "^27.0.6" - "@jest/types" "^27.0.6" - "@types/yargs" "^16.0.0" + "@jest/environment" "^27.5.1" + "@jest/fake-timers" "^27.5.1" + "@jest/globals" "^27.5.1" + "@jest/source-map" "^27.5.1" + "@jest/test-result" "^27.5.1" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" chalk "^4.0.0" cjs-module-lexer "^1.0.0" collect-v8-coverage "^1.0.0" - exit "^0.1.2" + execa "^5.0.0" glob "^7.1.3" - graceful-fs "^4.2.4" - jest-haste-map "^27.0.6" - jest-message-util "^27.0.6" - jest-mock "^27.0.6" - jest-regex-util "^27.0.6" - jest-resolve "^27.0.6" - jest-snapshot "^27.0.6" - jest-util "^27.0.6" - jest-validate "^27.0.6" + graceful-fs "^4.2.9" + jest-haste-map "^27.5.1" + jest-message-util "^27.5.1" + jest-mock "^27.5.1" + jest-regex-util "^27.5.1" + jest-resolve "^27.5.1" + jest-snapshot "^27.5.1" + jest-util "^27.5.1" slash "^3.0.0" strip-bom "^4.0.0" - yargs "^16.0.3" -jest-serializer@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.6.tgz#93a6c74e0132b81a2d54623251c46c498bb5bec1" - integrity sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA== +jest-serializer@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.1.tgz#81438410a30ea66fd57ff730835123dea1fb1f64" + integrity sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w== dependencies: "@types/node" "*" - graceful-fs "^4.2.4" + graceful-fs "^4.2.9" -jest-snapshot@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.6.tgz#f4e6b208bd2e92e888344d78f0f650bcff05a4bf" - integrity sha512-NTHaz8He+ATUagUgE7C/UtFcRoHqR2Gc+KDfhQIyx+VFgwbeEMjeP+ILpUTLosZn/ZtbNdCF5LkVnN/l+V751A== +jest-snapshot@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.1.tgz#b668d50d23d38054a51b42c4039cab59ae6eb6a1" + integrity sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA== dependencies: "@babel/core" "^7.7.2" "@babel/generator" "^7.7.2" - "@babel/parser" "^7.7.2" "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" "@babel/types" "^7.0.0" - "@jest/transform" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/transform" "^27.5.1" + "@jest/types" "^27.5.1" "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^27.0.6" - graceful-fs "^4.2.4" - jest-diff "^27.0.6" - jest-get-type "^27.0.6" - jest-haste-map "^27.0.6" - jest-matcher-utils "^27.0.6" - jest-message-util "^27.0.6" - jest-resolve "^27.0.6" - jest-util "^27.0.6" + expect "^27.5.1" + graceful-fs "^4.2.9" + jest-diff "^27.5.1" + jest-get-type "^27.5.1" + jest-haste-map "^27.5.1" + jest-matcher-utils "^27.5.1" + jest-message-util "^27.5.1" + jest-util "^27.5.1" natural-compare "^1.4.0" - pretty-format "^27.0.6" + pretty-format "^27.5.1" semver "^7.3.2" -jest-util@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.6.tgz#e8e04eec159de2f4d5f57f795df9cdc091e50297" - integrity sha512-1JjlaIh+C65H/F7D11GNkGDDZtDfMEM8EBXsvd+l/cxtgQ6QhxuloOaiayt89DxUvDarbVhqI98HhgrM1yliFQ== +jest-util@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz#3ba9771e8e31a0b85da48fe0b0891fb86c01c2f9" + integrity sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.5.1" "@types/node" "*" chalk "^4.0.0" - graceful-fs "^4.2.4" - is-ci "^3.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.9" picomatch "^2.2.3" -jest-validate@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.6.tgz#930a527c7a951927df269f43b2dc23262457e2a6" - integrity sha512-yhZZOaMH3Zg6DC83n60pLmdU1DQE46DW+KLozPiPbSbPhlXXaiUTDlhHQhHFpaqIFRrInko1FHXjTRpjWRuWfA== +jest-validate@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.1.tgz#9197d54dc0bdb52260b8db40b46ae668e04df067" + integrity sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ== dependencies: - "@jest/types" "^27.0.6" + "@jest/types" "^27.5.1" camelcase "^6.2.0" chalk "^4.0.0" - jest-get-type "^27.0.6" + jest-get-type "^27.5.1" leven "^3.1.0" - pretty-format "^27.0.6" + pretty-format "^27.5.1" -jest-watcher@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.6.tgz#89526f7f9edf1eac4e4be989bcb6dec6b8878d9c" - integrity sha512-/jIoKBhAP00/iMGnTwUBLgvxkn7vsOweDrOTSPzc7X9uOyUtJIDthQBTI1EXz90bdkrxorUZVhJwiB69gcHtYQ== +jest-watcher@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.1.tgz#71bd85fb9bde3a2c2ec4dc353437971c43c642a2" + integrity sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw== dependencies: - "@jest/test-result" "^27.0.6" - "@jest/types" "^27.0.6" + "@jest/test-result" "^27.5.1" + "@jest/types" "^27.5.1" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^27.0.6" + jest-util "^27.5.1" string-length "^4.0.1" -jest-worker@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.6.tgz#a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed" - integrity sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA== +jest-worker@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" + integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== dependencies: "@types/node" "*" merge-stream "^2.0.0" supports-color "^8.0.0" -jest@27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.6.tgz#10517b2a628f0409087fbf473db44777d7a04505" - integrity sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA== +jest@27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc" + integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ== dependencies: - "@jest/core" "^27.0.6" + "@jest/core" "^27.5.1" import-local "^3.0.2" - jest-cli "^27.0.6" + jest-cli "^27.5.1" js-tokens@^4.0.0: version "4.0.0" @@ -3092,9 +3025,9 @@ js-yaml@^4.1.0: argparse "^2.0.1" jsdom@^16.6.0: - version "16.6.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac" - integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg== + version "16.7.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" + integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== dependencies: abab "^2.0.5" acorn "^8.2.4" @@ -3121,7 +3054,7 @@ jsdom@^16.6.0: whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" whatwg-url "^8.5.0" - ws "^7.4.5" + ws "^7.4.6" xml-name-validator "^3.0.0" jsesc@^2.5.1: @@ -3134,16 +3067,16 @@ json-buffer@3.0.0: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" @@ -3155,11 +3088,9 @@ json-stringify-safe@^5.0.1: integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= json5@^2.1.2, json5@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" + version "2.2.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" + integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== jsonfile@^4.0.0: version "4.0.0" @@ -3201,13 +3132,6 @@ lazy-val@^1.0.4, lazy-val@^1.0.5: resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== -lazystream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" - integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ= - dependencies: - readable-stream "^2.0.5" - leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -3229,6 +3153,11 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" +lines-and-columns@^1.1.6: + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== + locate-path@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" @@ -3236,51 +3165,11 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" -lodash.clonedeep@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - -lodash.defaults@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" - integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= - -lodash.difference@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" - integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw= - -lodash.flatten@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" - integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= - -lodash.isplainobject@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= - -lodash.memoize@4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= - lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.truncate@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" - integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= - -lodash.union@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" - integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= - lodash@^4.17.10, lodash@^4.17.15, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -3310,12 +3199,12 @@ make-dir@^3.0.0: dependencies: semver "^6.0.0" -makeerror@1.0.x: - version "1.0.11" - resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" - integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= +makeerror@1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" + integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg== dependencies: - tmpl "1.0.x" + tmpl "1.0.5" matcher@^3.0.0: version "3.0.0" @@ -3337,22 +3226,22 @@ micromatch@^4.0.4: braces "^3.0.1" picomatch "^2.2.3" -mime-db@1.48.0: - version "1.48.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" - integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== mime-types@^2.1.12: - version "2.1.31" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b" - integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg== + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: - mime-db "1.48.0" + mime-db "1.52.0" mime@^2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" - integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== + version "2.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" + integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== mimic-fn@^2.1.0: version "2.1.0" @@ -3364,24 +3253,31 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== -minimatch@3.0.4, minimatch@^3.0.4: +minimatch@3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== dependencies: brace-expansion "^1.1.7" -minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimatch@^3.0.4: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.2.0, minimist@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== mkdirp@^0.5.4: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== dependencies: - minimist "^1.2.5" + minimist "^1.2.6" ms@2.0.0: version "2.0.0" @@ -3393,7 +3289,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -natural-compare@^1.4.0: +natural-compare@1.4.0, natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= @@ -3408,15 +3304,10 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= -node-modules-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" - integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= - -node-releases@^1.1.71: - version "1.1.73" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20" - integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg== +node-releases@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01" + integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg== normalize-path@^3.0.0: version "3.0.0" @@ -3496,11 +3387,6 @@ p-cancelable@^1.0.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== -p-each-series@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a" - integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA== - p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -3537,6 +3423,16 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" +parse-json@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + parse5@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" @@ -3557,7 +3453,7 @@ path-key@^3.0.0, path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.6: +path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== @@ -3567,22 +3463,25 @@ pend@~1.2.0: resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== + picomatch@^2.0.4, picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== pify@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= -pirates@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" - integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== - dependencies: - node-modules-regexp "^1.0.0" +pirates@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" + integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== pkg-dir@^4.2.0: version "4.2.0" @@ -3591,14 +3490,13 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -plist@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz#74bbf011124b90421c22d15779cee60060ba95bc" - integrity sha512-MSrkwZBdQ6YapHy87/8hDU8MnIcyxBKjeF+McXnr5A9MtffPewTs7G3hlpodT5TacyfIyFTaJEhh3GGcmasTgQ== +plist@^3.0.1, plist@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" + integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg== dependencies: base64-js "^1.5.1" xmlbuilder "^9.0.7" - xmldom "^0.5.0" prelude-ls@^1.2.1: version "1.2.1" @@ -3615,35 +3513,29 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= -pretty-format@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.6.tgz#ab770c47b2c6f893a21aefc57b75da63ef49a11f" - integrity sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ== +pretty-format@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e" + integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ== dependencies: - "@jest/types" "^27.0.6" - ansi-regex "^5.0.0" + ansi-regex "^5.0.1" ansi-styles "^5.0.0" react-is "^17.0.1" -printj@~1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" - integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== - process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -progress@^2.0.0, progress@^2.0.3: +progress@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== prompts@^2.0.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61" - integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ== + version "2.4.2" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" + integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q== dependencies: kleur "^3.0.3" sisteransi "^1.0.5" @@ -3704,7 +3596,7 @@ read-config-file@6.2.0: json5 "^2.2.0" lazy-val "^1.0.4" -readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.2.2: +readable-stream@^2.2.2: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -3717,23 +3609,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.2.2: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readdir-glob@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4" - integrity sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA== - dependencies: - minimatch "^3.0.4" - -regexpp@^3.1.0: +regexpp@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== @@ -3757,16 +3633,6 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -requireindex@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef" - integrity sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww== - resolve-cwd@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" @@ -3784,13 +3650,19 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== +resolve.exports@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" + integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== + resolve@^1.20.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + version "1.22.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" + integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" + is-core-module "^2.8.1" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" responselike@^1.0.2: version "1.0.2" @@ -3823,11 +3695,6 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -3864,17 +3731,12 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -semver@7.3.2: - version "7.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" - integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== - semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: +semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== @@ -3901,9 +3763,9 @@ shebang-regex@^3.0.0: integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== sisteransi@^1.0.5: version "1.0.5" @@ -3915,31 +3777,24 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -slice-ansi@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" - integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg== - dependencies: - is-fullwidth-code-point "^2.0.0" - -slice-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" - integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== dependencies: ansi-styles "^4.0.0" astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" smart-buffer@^4.0.2: - version "4.1.0" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba" - integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw== + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== source-map-support@^0.5.19, source-map-support@^0.5.6: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -3970,9 +3825,9 @@ sprintf-js@~1.0.2: integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= stack-utils@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277" - integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw== + version "2.0.5" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" + integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA== dependencies: escape-string-regexp "^2.0.0" @@ -3989,38 +3844,14 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -string-width@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string-width@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" - integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== +string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" + strip-ansi "^6.0.1" string_decoder@~1.1.1: version "1.1.1" @@ -4029,26 +3860,12 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: - ansi-regex "^3.0.0" - -strip-ansi@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.0" - -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== - dependencies: - ansi-regex "^5.0.0" + ansi-regex "^5.0.1" strip-bom@^4.0.0: version "4.0.0" @@ -4070,6 +3887,11 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= +strnum@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db" + integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA== + sumchecker@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" @@ -4106,34 +3928,16 @@ supports-hyperlinks@^2.0.0: has-flag "^4.0.0" supports-color "^7.0.0" +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -table@^6.0.9: - version "6.7.1" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" - integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== - dependencies: - ajv "^8.0.1" - lodash.clonedeep "^4.5.0" - lodash.truncate "^4.4.2" - slice-ansi "^4.0.0" - string-width "^4.2.0" - strip-ansi "^6.0.0" - -tar-stream@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" - integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== - dependencies: - bl "^4.0.3" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - temp-file@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" @@ -4169,22 +3973,22 @@ throat@^6.0.1: resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== -tldts-core@^5.7.38: - version "5.7.38" - resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.38.tgz#779092c90941803fb682c3d7094a88f12aad4508" - integrity sha512-mcL16YTXjpVJ+ekoKC/ddvdjGNMg8HkdWQNp3WNz26WJMV7Z2Hjr1IPwYYr9W3LxGdXV7mmg21Zk2vSstiSsFg== +tldts-core@^5.7.72: + version "5.7.72" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.72.tgz#d42d0ba3b0a1c677f7f4fc4581267df90238a14c" + integrity sha512-UVnXJQbM3CGYwXVy16nNJHh/MWr7fcaEyd3DravwgZjWn0pPHuQ/ajtGonzi9F62Ld3d5r6zBlOTI7qLlLJR1Q== tldts-experimental@^5.6.21: - version "5.7.38" - resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.38.tgz#a2b03ae0282ee7439b1ed1618a1d7d2e9e66be78" - integrity sha512-3L0yML53LSw3tlRPwHcGOf35l3dhZx/3DgPGWL3ILATnuu76OiAOvJ4Xw1Znl6sIxVKJ4B4BE0zroZMMzsHg/A== + version "5.7.72" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.72.tgz#b0a9b121e542a3b31f2b0dc7b64abc720940fd6a" + integrity sha512-Qg1FOnR8jCXBySOQVSaAmRZ4UiKse60MY7eTdx6oIaQ8ve+xGi+dXybb4+RN4cu9c4M7HOoGYkWERQ5tkBAPbg== dependencies: - tldts-core "^5.7.38" + tldts-core "^5.7.72" tmp-promise@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.2.tgz#6e933782abff8b00c3119d63589ca1fb9caaa62a" - integrity sha512-OyCLAKU1HzBjL6Ev3gxUeraJNlbNingmi8IrHHEsYH8LTmEuhvYfqvhn2F/je+mjf4N58UmZ96OMEy1JanSCpA== + version "3.0.3" + resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" + integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ== dependencies: tmp "^0.2.0" @@ -4195,10 +3999,10 @@ tmp@^0.2.0: dependencies: rimraf "^3.0.0" -tmpl@1.0.x: - version "1.0.4" - resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" - integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= +tmpl@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" + integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== to-fast-properties@^2.0.0: version "2.0.0" @@ -4347,7 +4151,7 @@ utf8-byte-length@^1.0.1: resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E= -util-deprecate@^1.0.1, util-deprecate@~1.0.1: +util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= @@ -4357,19 +4161,19 @@ v8-compile-cache@^2.0.3: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== -v8-to-istanbul@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz#4229f2a99e367f3f018fa1d5c2b8ec684667c69c" - integrity sha512-LkmXi8UUNxnCC+JlH7/fsfsKr5AU110l+SYGJimWNkWhxbN5EyeOtm1MJ0hhvqMMOhGwBj1Fp70Yv9i+hX0QAg== +v8-to-istanbul@^8.1.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed" + integrity sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" source-map "^0.7.3" verror@^1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + version "1.10.1" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb" + integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg== dependencies: assert-plus "^1.0.0" core-util-is "1.0.2" @@ -4390,11 +4194,11 @@ w3c-xmlserializer@^2.0.0: xml-name-validator "^3.0.0" walker@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" - integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= + version "1.0.8" + resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" + integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== dependencies: - makeerror "1.0.x" + makeerror "1.0.12" webidl-conversions@^5.0.0: version "5.0.0" @@ -4470,10 +4274,10 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -ws@^7.4.5: - version "7.5.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.1.tgz#44fc000d87edb1d9c53e51fbc69a0ac1f6871d66" - integrity sha512-2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow== +ws@^7.4.6: + version "7.5.7" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67" + integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A== xdg-basedir@^4.0.0: version "4.0.0" @@ -4500,11 +4304,6 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xmldom@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" - integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== - y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" @@ -4520,7 +4319,12 @@ yargs-parser@^20.2.2: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs@^16.0.3: +yargs-parser@^21.0.0: + version "21.0.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" + integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== + +yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== @@ -4534,17 +4338,17 @@ yargs@^16.0.3: yargs-parser "^20.2.2" yargs@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb" - integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ== + version "17.4.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.4.0.tgz#9fc9efc96bd3aa2c1240446af28499f0e7593d00" + integrity sha512-WJudfrk81yWFSOkZYpAZx4Nt7V4xp7S/uJkX0CnxovMCt1wCE8LNftPpNuF9X/u9gN5nsD7ycYtRcDf2pL3UiA== dependencies: cliui "^7.0.2" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" - string-width "^4.2.0" + string-width "^4.2.3" y18n "^5.0.5" - yargs-parser "^20.2.2" + yargs-parser "^21.0.0" yauzl@^2.10.0: version "2.10.0" @@ -4553,12 +4357,3 @@ yauzl@^2.10.0: dependencies: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" - -zip-stream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79" - integrity sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A== - dependencies: - archiver-utils "^2.1.0" - compress-commons "^4.1.0" - readable-stream "^3.6.0" diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix index 6f045bd27e63..a8a281126a0e 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -6,183 +6,167 @@ path = fetchurl { name = "7zip_bin___7zip_bin_5.1.1.tgz"; url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz"; - sha1 = "9274ec7460652f9c632c59addf24efb1684ef876"; + sha512 = "sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ=="; }; } { - name = "_babel_code_frame___code_frame_7.12.11.tgz"; + name = "_ampproject_remapping___remapping_2.1.2.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.12.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; - sha1 = "f4ad435aa263db935b8f10f2c552d23fb716a63f"; + name = "_ampproject_remapping___remapping_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz"; + sha512 = "hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg=="; }; } { - name = "_babel_code_frame___code_frame_7.14.5.tgz"; + name = "_babel_code_frame___code_frame_7.16.7.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz"; - sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb"; + name = "_babel_code_frame___code_frame_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz"; + sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; } { - name = "_babel_compat_data___compat_data_7.14.7.tgz"; + name = "_babel_compat_data___compat_data_7.17.7.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.14.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz"; - sha1 = "7b047d7a3a89a67d2258dc61f604f098f1bc7e08"; + name = "_babel_compat_data___compat_data_7.17.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.7.tgz"; + sha512 = "p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ=="; }; } { - name = "_babel_core___core_7.14.6.tgz"; + name = "_babel_core___core_7.17.8.tgz"; path = fetchurl { - name = "_babel_core___core_7.14.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz"; - sha1 = "e0814ec1a950032ff16c13a2721de39a8416fcab"; + name = "_babel_core___core_7.17.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz"; + sha512 = "OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ=="; }; } { - name = "_babel_generator___generator_7.14.5.tgz"; + name = "_babel_generator___generator_7.17.7.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz"; - sha1 = "848d7b9f031caca9d0cd0af01b063f226f52d785"; + name = "_babel_generator___generator_7.17.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.7.tgz"; + sha512 = "oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w=="; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.5.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.17.7.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz"; - sha1 = "7a99c5d0967911e972fe2c3411f7d5b498498ecf"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.17.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz"; + sha512 = "UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w=="; }; } { - name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; + name = "_babel_helper_environment_visitor___helper_environment_visitor_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz"; - sha1 = "89e2c474972f15d8e233b52ee8c480e2cfcd50c4"; + name = "_babel_helper_environment_visitor___helper_environment_visitor_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"; + sha512 = "SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag=="; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz"; - sha1 = "25fbfa579b0937eee1f3b805ece4ce398c431815"; + name = "_babel_helper_function_name___helper_function_name_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"; + sha512 = "QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA=="; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz"; - sha1 = "e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"; + sha512 = "flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw=="; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.7.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz"; - sha1 = "97e56244beb94211fe277bd818e3a329c66f7970"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"; + sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg=="; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.14.5.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz"; - sha1 = "6d1a44df6a38c957aa7c312da076429f11b422f3"; + name = "_babel_helper_module_imports___helper_module_imports_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"; + sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.14.5.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.17.7.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz"; - sha1 = "7de42f10d789b423eb902ebd24031ca77cb1e10e"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.17.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz"; + sha512 = "VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw=="; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.14.5.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz"; - sha1 = "f27395a8619e0665b3f0364cddb41c25d71b499c"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz"; + sha512 = "Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.17.7.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; - sha1 = "5ac822ce97eec46741ab70a517971e443a70c5a9"; + name = "_babel_helper_simple_access___helper_simple_access_7.17.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz"; + sha512 = "txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA=="; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.5.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz"; - sha1 = "0ecc0b03c41cd567b4024ea016134c28414abb94"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"; + sha512 = "xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw=="; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.14.5.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz"; - sha1 = "66ea85cf53ba0b4e588ba77fc813f53abcaa41c4"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; + sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; + name = "_babel_helper_validator_option___helper_validator_option_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz"; - sha1 = "22b23a54ef51c2b7605d851930c1976dd0bc693a"; + name = "_babel_helper_validator_option___helper_validator_option_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz"; + sha512 = "TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.5.tgz"; + name = "_babel_helpers___helpers_7.17.8.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz"; - sha1 = "d0f0e277c512e0c938277faa85a3968c9a44c0e8"; + name = "_babel_helpers___helpers_7.17.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.8.tgz"; + sha512 = "QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw=="; }; } { - name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; + name = "_babel_highlight___highlight_7.16.10.tgz"; path = fetchurl { - name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; - sha1 = "6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"; + name = "_babel_highlight___highlight_7.16.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz"; + sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; }; } { - name = "_babel_helpers___helpers_7.14.6.tgz"; + name = "_babel_parser___parser_7.17.8.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.14.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.6.tgz"; - sha1 = "5b58306b95f1b47e2a0199434fa8658fa6c21635"; - }; - } - { - name = "_babel_highlight___highlight_7.14.5.tgz"; - path = fetchurl { - name = "_babel_highlight___highlight_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; - sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; - }; - } - { - name = "_babel_parser___parser_7.14.7.tgz"; - path = fetchurl { - name = "_babel_parser___parser_7.14.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz"; - sha1 = "6099720c8839ca865a2637e6c85852ead0bdb595"; + name = "_babel_parser___parser_7.17.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz"; + sha512 = "BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ=="; }; } { @@ -190,7 +174,7 @@ path = fetchurl { name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; - sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"; + sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; }; } { @@ -198,7 +182,7 @@ path = fetchurl { name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"; - sha1 = "4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"; + sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg=="; }; } { @@ -206,7 +190,7 @@ path = fetchurl { name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; - sha1 = "b5c987274c4a3a82b89714796931a6b53544ae10"; + sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; }; } { @@ -214,7 +198,7 @@ path = fetchurl { name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"; - sha1 = "ee601348c370fa334d2207be158777496521fd51"; + sha512 = "Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g=="; }; } { @@ -222,7 +206,7 @@ path = fetchurl { name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; - sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a"; + sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; } { @@ -230,7 +214,7 @@ path = fetchurl { name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; - sha1 = "ca91ef46303530448b906652bac2e9fe9941f699"; + sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; }; } { @@ -238,7 +222,7 @@ path = fetchurl { name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; - sha1 = "167ed70368886081f74b5c36c65a88c03b66d1a9"; + sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; }; } { @@ -246,7 +230,7 @@ path = fetchurl { name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; - sha1 = "b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"; + sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; }; } { @@ -254,7 +238,7 @@ path = fetchurl { name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; - sha1 = "60e225edcbd98a640332a2e72dd3e66f1af55871"; + sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; }; } { @@ -262,7 +246,7 @@ path = fetchurl { name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; - sha1 = "6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"; + sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; }; } { @@ -270,7 +254,7 @@ path = fetchurl { name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; - sha1 = "4f69c2ab95167e0180cd5336613f8c5788f7d48a"; + sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; } { @@ -278,39 +262,39 @@ path = fetchurl { name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz"; url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; - sha1 = "c1cfdadc35a646240001f06138247b741c34d94c"; + sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.14.5.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.16.7.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz"; - sha1 = "b82c6ce471b165b5ce420cf92914d6fb46225716"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz"; + sha512 = "YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A=="; }; } { - name = "_babel_template___template_7.14.5.tgz"; + name = "_babel_template___template_7.16.7.tgz"; path = fetchurl { - name = "_babel_template___template_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz"; - sha1 = "a9bc9d8b33354ff6e55a9c60d1109200a68974f4"; + name = "_babel_template___template_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz"; + sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; } { - name = "_babel_traverse___traverse_7.14.7.tgz"; + name = "_babel_traverse___traverse_7.17.3.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.14.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz"; - sha1 = "64007c9774cfdc3abd23b0780bc18a3ce3631753"; + name = "_babel_traverse___traverse_7.17.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz"; + sha512 = "5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw=="; }; } { - name = "_babel_types___types_7.14.5.tgz"; + name = "_babel_types___types_7.17.0.tgz"; path = fetchurl { - name = "_babel_types___types_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz"; - sha1 = "3bb997ba829a2104cedb20689c4a5b8121d383ff"; + name = "_babel_types___types_7.17.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz"; + sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; }; } { @@ -318,47 +302,55 @@ path = fetchurl { name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz"; url = "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"; - sha1 = "75a2e8b51cb758a7553d6804a5932d7aace75c39"; + sha512 = "0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="; }; } { - name = "_cliqz_adblocker_content___adblocker_content_1.22.2.tgz"; + name = "_cliqz_adblocker_content___adblocker_content_1.23.7.tgz"; path = fetchurl { - name = "_cliqz_adblocker_content___adblocker_content_1.22.2.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.2.tgz"; - sha1 = "643849d5f08c167eb84a2e7e3f1f9fbc41a3889b"; + name = "_cliqz_adblocker_content___adblocker_content_1.23.7.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.23.7.tgz"; + sha512 = "tgCFcWhBty+WI3ObYBLDk56i1G7nScd5TBAOXlQf2EIbVJ+DC+G0YE91YHhQpzfy4ySI/wRGyEHrKzTRgmkuKQ=="; }; } { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.2.tgz"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.23.6.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.2.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.2.tgz"; - sha1 = "eea674767a60abe4e5f9ccb46188d33656f551d0"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.23.6.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.23.6.tgz"; + sha512 = "xVBrIqfvcuh2Y07ZkEogzgkyqJuZvOqhRoFnuTyW2q97AmWAGLT6IjEGjl/vX7vMP0Y1b8wubdjI3VHnKvNKDg=="; }; } { - name = "_cliqz_adblocker_electron___adblocker_electron_1.22.2.tgz"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.23.7.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron___adblocker_electron_1.22.2.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.2.tgz"; - sha1 = "85af3b49f7f653e6fb0d008b6523e3b3ba0dd41e"; + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.23.7.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.23.7.tgz"; + sha512 = "bGWf4r5q4savAGs3Kl4aR7XBH4J9AmrErDmcYu+tJk9V3rhTGXUi29kMl0D5x2JimhRmnKOeJ/Q2GJSUjvnmsg=="; }; } { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.2.tgz"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.23.6.tgz"; path = fetchurl { - name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.22.2.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.2.tgz"; - sha1 = "1cad3c1569b765d9e7f8672c85b2a7b1e8e9ee90"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.23.6.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.23.6.tgz"; + sha512 = "wzkCfBCo5RvRanzsVOu65xHW9GAUDqsg+tP8GYld6/hgMMb96KJZJVpvrvwvsneAm9T55QE4ef1utZbIIwltqA=="; }; } { - name = "_cliqz_adblocker___adblocker_1.22.2.tgz"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.23.7.tgz"; path = fetchurl { - name = "_cliqz_adblocker___adblocker_1.22.2.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.2.tgz"; - sha1 = "99a14d56327734d3083a077d96fe7b91c236bf7a"; + name = "_cliqz_adblocker_extended_selectors___adblocker_extended_selectors_1.23.7.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.23.7.tgz"; + sha512 = "3y1eeHHZS3qvvv3dDZDjVVr6g03GeUBbDExCW/GOiHdo+qKYmM2K40EaLN+Upzc2ppuum9UKvzsHxG8Hs9R/kQ=="; + }; + } + { + name = "_cliqz_adblocker___adblocker_1.23.7.tgz"; + path = fetchurl { + name = "_cliqz_adblocker___adblocker_1.23.7.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.23.7.tgz"; + sha512 = "HUvC7CcmNbcIftcRhFeuQhHSpyNdOVdXazXDL0+avvWR0cxlI9zcC8yHMRKjxeY6nsiOXdyEFby+V5KgJvfwaQ=="; }; } { @@ -366,15 +358,15 @@ path = fetchurl { name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz"; - sha1 = "3ece22c5838402419a6e0425f85742b961d9b6c6"; + sha512 = "0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig=="; }; } { - name = "_electron_get___get_1.12.4.tgz"; + name = "_electron_get___get_1.14.1.tgz"; path = fetchurl { - name = "_electron_get___get_1.12.4.tgz"; - url = "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz"; - sha1 = "a5971113fc1bf8fa12a8789dc20152a7359f06ab"; + name = "_electron_get___get_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz"; + sha512 = "BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw=="; }; } { @@ -382,15 +374,31 @@ path = fetchurl { name = "_electron_universal___universal_1.0.5.tgz"; url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz"; - sha1 = "b812340e4ef21da2b3ee77b2b4d35c9b86defe37"; + sha512 = "zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag=="; }; } { - name = "_eslint_eslintrc___eslintrc_0.4.2.tgz"; + name = "_eslint_eslintrc___eslintrc_1.2.1.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.4.2.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz"; - sha1 = "f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179"; + name = "_eslint_eslintrc___eslintrc_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz"; + sha512 = "bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ=="; + }; + } + { + name = "_humanwhocodes_config_array___config_array_0.9.5.tgz"; + path = fetchurl { + name = "_humanwhocodes_config_array___config_array_0.9.5.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz"; + sha512 = "ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw=="; + }; + } + { + name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; + path = fetchurl { + name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; + sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; }; } { @@ -398,7 +406,7 @@ path = fetchurl { name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz"; url = "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"; - sha1 = "fd3db1d59ecf7cf121e80650bb86712f9b55eced"; + sha512 = "VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ=="; }; } { @@ -406,95 +414,119 @@ path = fetchurl { name = "_istanbuljs_schema___schema_0.1.3.tgz"; url = "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz"; - sha1 = "e45e384e4b8ec16bce2fd903af78450f6bf7ec98"; + sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; }; } { - name = "_jest_console___console_27.0.6.tgz"; + name = "_jest_console___console_27.5.1.tgz"; path = fetchurl { - name = "_jest_console___console_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/@jest/console/-/console-27.0.6.tgz"; - sha1 = "3eb72ea80897495c3d73dd97aab7f26770e2260f"; + name = "_jest_console___console_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz"; + sha512 = "kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg=="; }; } { - name = "_jest_core___core_27.0.6.tgz"; + name = "_jest_core___core_27.5.1.tgz"; path = fetchurl { - name = "_jest_core___core_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/@jest/core/-/core-27.0.6.tgz"; - sha1 = "c5f642727a0b3bf0f37c4b46c675372d0978d4a1"; + name = "_jest_core___core_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz"; + sha512 = "AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ=="; }; } { - name = "_jest_environment___environment_27.0.6.tgz"; + name = "_jest_environment___environment_27.5.1.tgz"; path = fetchurl { - name = "_jest_environment___environment_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.6.tgz"; - sha1 = "ee293fe996db01d7d663b8108fa0e1ff436219d2"; + name = "_jest_environment___environment_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.1.tgz"; + sha512 = "/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA=="; }; } { - name = "_jest_fake_timers___fake_timers_27.0.6.tgz"; + name = "_jest_fake_timers___fake_timers_27.5.1.tgz"; path = fetchurl { - name = "_jest_fake_timers___fake_timers_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.6.tgz"; - sha1 = "cbad52f3fe6abe30e7acb8cd5fa3466b9588e3df"; + name = "_jest_fake_timers___fake_timers_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz"; + sha512 = "/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ=="; }; } { - name = "_jest_globals___globals_27.0.6.tgz"; + name = "_jest_globals___globals_27.5.1.tgz"; path = fetchurl { - name = "_jest_globals___globals_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.6.tgz"; - sha1 = "48e3903f99a4650673d8657334d13c9caf0e8f82"; + name = "_jest_globals___globals_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.1.tgz"; + sha512 = "ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q=="; }; } { - name = "_jest_reporters___reporters_27.0.6.tgz"; + name = "_jest_reporters___reporters_27.5.1.tgz"; path = fetchurl { - name = "_jest_reporters___reporters_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.6.tgz"; - sha1 = "91e7f2d98c002ad5df94d5b5167c1eb0b9fd5b00"; + name = "_jest_reporters___reporters_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.1.tgz"; + sha512 = "cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw=="; }; } { - name = "_jest_source_map___source_map_27.0.6.tgz"; + name = "_jest_source_map___source_map_27.5.1.tgz"; path = fetchurl { - name = "_jest_source_map___source_map_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.6.tgz"; - sha1 = "be9e9b93565d49b0548b86e232092491fb60551f"; + name = "_jest_source_map___source_map_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz"; + sha512 = "y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg=="; }; } { - name = "_jest_test_result___test_result_27.0.6.tgz"; + name = "_jest_test_result___test_result_27.5.1.tgz"; path = fetchurl { - name = "_jest_test_result___test_result_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.6.tgz"; - sha1 = "3fa42015a14e4fdede6acd042ce98c7f36627051"; + name = "_jest_test_result___test_result_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.1.tgz"; + sha512 = "EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag=="; }; } { - name = "_jest_test_sequencer___test_sequencer_27.0.6.tgz"; + name = "_jest_test_sequencer___test_sequencer_27.5.1.tgz"; path = fetchurl { - name = "_jest_test_sequencer___test_sequencer_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz"; - sha1 = "80a913ed7a1130545b1cd777ff2735dd3af5d34b"; + name = "_jest_test_sequencer___test_sequencer_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz"; + sha512 = "LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ=="; }; } { - name = "_jest_transform___transform_27.0.6.tgz"; + name = "_jest_transform___transform_27.5.1.tgz"; path = fetchurl { - name = "_jest_transform___transform_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.6.tgz"; - sha1 = "189ad7107413208f7600f4719f81dd2f7278cc95"; + name = "_jest_transform___transform_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.1.tgz"; + sha512 = "ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw=="; }; } { - name = "_jest_types___types_27.0.6.tgz"; + name = "_jest_types___types_27.5.1.tgz"; path = fetchurl { - name = "_jest_types___types_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.6.tgz"; - sha1 = "9a992bc517e0c49f035938b8549719c2de40706b"; + name = "_jest_types___types_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz"; + sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw=="; + }; + } + { + name = "_jridgewell_resolve_uri___resolve_uri_3.0.5.tgz"; + path = fetchurl { + name = "_jridgewell_resolve_uri___resolve_uri_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz"; + sha512 = "VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew=="; + }; + } + { + name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.11.tgz"; + path = fetchurl { + name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.11.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz"; + sha512 = "Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="; + }; + } + { + name = "_jridgewell_trace_mapping___trace_mapping_0.3.4.tgz"; + path = fetchurl { + name = "_jridgewell_trace_mapping___trace_mapping_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz"; + sha512 = "vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ=="; }; } { @@ -502,7 +534,7 @@ path = fetchurl { name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz"; - sha1 = "504af200af6b98e198bce768bc1730c6936ae01d"; + sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ=="; }; } { @@ -510,15 +542,7 @@ path = fetchurl { name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; url = "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz"; - sha1 = "e8a32c30a95d20c2b1bb635cc580981a06389858"; - }; - } - { - name = "_mdn_browser_compat_data___browser_compat_data_2.0.7.tgz"; - path = fetchurl { - name = "_mdn_browser_compat_data___browser_compat_data_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-2.0.7.tgz"; - sha1 = "72ec37b9c1e00ce0b4e0309d753be18e2da12ee3"; + sha512 = "9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q=="; }; } { @@ -526,7 +550,7 @@ path = fetchurl { name = "_remusao_guess_url_type___guess_url_type_1.2.1.tgz"; url = "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.1.tgz"; - sha1 = "b3e7c32abdf98d0fb4f93cc67cad580b5fe4ba57"; + sha512 = "rbOqre2jW8STjheOsOaQHLgYBaBZ9Owbdt8NO7WvNZftJlaG3y/K9oOkl8ZUpuFBisIhmBuMEW6c+YrQl5inRA=="; }; } { @@ -534,7 +558,7 @@ path = fetchurl { name = "_remusao_small___small_1.2.1.tgz"; url = "https://registry.yarnpkg.com/@remusao/small/-/small-1.2.1.tgz"; - sha1 = "63bfe4548832289f94ac868a0c305970c9a0e5f9"; + sha512 = "7MjoGt0TJMVw1GPKgWq6SJPws1SLsUXQRa43Umht+nkyw2jnpy3WpiLNqGdwo5rHr5Wp9B2W/Pm5RQp656UJdw=="; }; } { @@ -542,7 +566,7 @@ path = fetchurl { name = "_remusao_smaz_compress___smaz_compress_1.9.1.tgz"; url = "https://registry.yarnpkg.com/@remusao/smaz-compress/-/smaz-compress-1.9.1.tgz"; - sha1 = "fc75eaf9bcac2d58bc4c3d518183a7cb9612d275"; + sha512 = "E2f48TwloQu3r6BdLOGF2aczeH7bJ/32oJGqvzT9SKur0cuUnLcZ7ZXP874E2fwmdE+cXzfC7bKzp79cDnmeyw=="; }; } { @@ -550,7 +574,7 @@ path = fetchurl { name = "_remusao_smaz_decompress___smaz_decompress_1.9.1.tgz"; url = "https://registry.yarnpkg.com/@remusao/smaz-decompress/-/smaz-decompress-1.9.1.tgz"; - sha1 = "8094f997e8fb591a678cda9cf08c209c825eba5b"; + sha512 = "TfjKKprYe3n47od8auhvJ/Ikj9kQTbDTe71ynKlxslrvvUhlIV3VQSuwYuMWMbdz1fIs0H/fxCN1Z8/H3km6/A=="; }; } { @@ -558,7 +582,7 @@ path = fetchurl { name = "_remusao_smaz___smaz_1.9.1.tgz"; url = "https://registry.yarnpkg.com/@remusao/smaz/-/smaz-1.9.1.tgz"; - sha1 = "a2b9b045385f81e1615a68d932b7cc8b04c9db8d"; + sha512 = "e6BLuP8oaXCZ9+v46Is4ilAZ/Vq6YLgmBP204Ixgk1qTjXmqvFYG7+AS7v9nsZdGOy96r9DWGFbbDVgMxwu1rA=="; }; } { @@ -566,7 +590,7 @@ path = fetchurl { name = "_remusao_trie___trie_1.4.1.tgz"; url = "https://registry.yarnpkg.com/@remusao/trie/-/trie-1.4.1.tgz"; - sha1 = "755d09f8a007476334e611f42719b2d581f00720"; + sha512 = "yvwa+aCyYI/UjeD39BnpMypG8N06l86wIDW1/PAc6ihBRnodIfZDwccxQN3n1t74wduzaz74m4ZMHZnB06567Q=="; }; } { @@ -574,7 +598,7 @@ path = fetchurl { name = "_sindresorhus_is___is_0.14.0.tgz"; url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; - sha1 = "9fb3a3cf3132328151f353de4632e01e52102bea"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; }; } { @@ -582,15 +606,15 @@ path = fetchurl { name = "_sinonjs_commons___commons_1.8.3.tgz"; url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz"; - sha1 = "3802ddd21a50a949b6721ddd72da36e67e7f1b2d"; + sha512 = "xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ=="; }; } { - name = "_sinonjs_fake_timers___fake_timers_7.1.2.tgz"; + name = "_sinonjs_fake_timers___fake_timers_8.1.0.tgz"; path = fetchurl { - name = "_sinonjs_fake_timers___fake_timers_7.1.2.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz"; - sha1 = "2524eae70c4910edccf99b2f4e6efc5894aff7b5"; + name = "_sinonjs_fake_timers___fake_timers_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz"; + sha512 = "OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg=="; }; } { @@ -598,7 +622,7 @@ path = fetchurl { name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; - sha1 = "b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; } { @@ -606,63 +630,71 @@ path = fetchurl { name = "_tootallnate_once___once_1.1.2.tgz"; url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz"; - sha1 = "ccb91445360179a04e7fe6aff78c00ffc1eeaf82"; + sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; } { - name = "_types_babel__core___babel__core_7.1.14.tgz"; + name = "_tootallnate_once___once_2.0.0.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.14.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz"; - sha1 = "faaeefc4185ec71c389f4501ee5ec84b170cc402"; + name = "_tootallnate_once___once_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz"; + sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; }; } { - name = "_types_babel__generator___babel__generator_7.6.2.tgz"; + name = "_types_babel__core___babel__core_7.1.19.tgz"; path = fetchurl { - name = "_types_babel__generator___babel__generator_7.6.2.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz"; - sha1 = "f3d71178e187858f7c45e30380f8f1b7415a12d8"; + name = "_types_babel__core___babel__core_7.1.19.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz"; + sha512 = "WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw=="; }; } { - name = "_types_babel__template___babel__template_7.4.0.tgz"; + name = "_types_babel__generator___babel__generator_7.6.4.tgz"; path = fetchurl { - name = "_types_babel__template___babel__template_7.4.0.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz"; - sha1 = "0c888dd70b3ee9eebb6e4f200e809da0076262be"; + name = "_types_babel__generator___babel__generator_7.6.4.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz"; + sha512 = "tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg=="; }; } { - name = "_types_babel__traverse___babel__traverse_7.14.0.tgz"; + name = "_types_babel__template___babel__template_7.4.1.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.0.tgz"; - sha1 = "a34277cf8acbd3185ea74129e1f100491eb1da7f"; + name = "_types_babel__template___babel__template_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz"; + sha512 = "azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g=="; }; } { - name = "_types_chrome___chrome_0.0.145.tgz"; + name = "_types_babel__traverse___babel__traverse_7.14.2.tgz"; path = fetchurl { - name = "_types_chrome___chrome_0.0.145.tgz"; - url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.145.tgz"; - sha1 = "6c53ae0af5f25350b07bfd24cf459b5fe65cd9b8"; + name = "_types_babel__traverse___babel__traverse_7.14.2.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz"; + sha512 = "K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA=="; }; } { - name = "_types_debug___debug_4.1.5.tgz"; + name = "_types_chrome___chrome_0.0.180.tgz"; path = fetchurl { - name = "_types_debug___debug_4.1.5.tgz"; - url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz"; - sha1 = "b14efa8852b7768d898906613c23f688713e02cd"; + name = "_types_chrome___chrome_0.0.180.tgz"; + url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.180.tgz"; + sha512 = "A/CuuKAaHq2CHEpYBAtl0lp2ib7TTXK7VjJI4q+c+1U/HDvZLJ8IlsdEDzzHdvkNdh36bGONxrMnO9YZrKqbAw=="; }; } { - name = "_types_filesystem___filesystem_0.0.31.tgz"; + name = "_types_debug___debug_4.1.7.tgz"; path = fetchurl { - name = "_types_filesystem___filesystem_0.0.31.tgz"; - url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.31.tgz"; - sha1 = "121a1ded274a2dc731d5e0d90163a920ad6a9ef1"; + name = "_types_debug___debug_4.1.7.tgz"; + url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz"; + sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; + }; + } + { + name = "_types_filesystem___filesystem_0.0.32.tgz"; + path = fetchurl { + name = "_types_filesystem___filesystem_0.0.32.tgz"; + url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.32.tgz"; + sha512 = "Yuf4jR5YYMR2DVgwuCiP11s0xuVRyPKmz8vo6HBY3CGdeMj8af93CFZX+T82+VD1+UqHOxTq31lO7MI7lepBtQ=="; }; } { @@ -670,31 +702,31 @@ path = fetchurl { name = "_types_filewriter___filewriter_0.0.29.tgz"; url = "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.29.tgz"; - sha1 = "a48795ecadf957f6c0d10e0c34af86c098fa5bee"; + sha512 = "BsPXH/irW0ht0Ji6iw/jJaK8Lj3FJemon2gvEqHKpCdDCeemHa+rI3WBGq5z7cDMZgoLjY40oninGxqk+8NzNQ=="; }; } { - name = "_types_firefox_webext_browser___firefox_webext_browser_82.0.0.tgz"; + name = "_types_firefox_webext_browser___firefox_webext_browser_94.0.1.tgz"; path = fetchurl { - name = "_types_firefox_webext_browser___firefox_webext_browser_82.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-82.0.0.tgz"; - sha1 = "4d0f5cfebd7321d2cbf0ccfb6032570f0138b958"; + name = "_types_firefox_webext_browser___firefox_webext_browser_94.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-94.0.1.tgz"; + sha512 = "I6iHRQJSTZ+gYt2IxdH2RRAMvcUyK8v5Ig7fHQR0IwUNYP7hz9+cziBVIKxLCO6XI7fiyRsNOWObfl3/4Js2Lg=="; }; } { - name = "_types_fs_extra___fs_extra_9.0.11.tgz"; + name = "_types_fs_extra___fs_extra_9.0.13.tgz"; path = fetchurl { - name = "_types_fs_extra___fs_extra_9.0.11.tgz"; - url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz"; - sha1 = "8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87"; + name = "_types_fs_extra___fs_extra_9.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz"; + sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; }; } { - name = "_types_glob___glob_7.1.3.tgz"; + name = "_types_glob___glob_7.2.0.tgz"; path = fetchurl { - name = "_types_glob___glob_7.1.3.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz"; - sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; + name = "_types_glob___glob_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz"; + sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; } { @@ -702,23 +734,23 @@ path = fetchurl { name = "_types_graceful_fs___graceful_fs_4.1.5.tgz"; url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz"; - sha1 = "21ffba0d98da4350db64891f92a9e5db3cdb4e15"; + sha512 = "anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw=="; }; } { - name = "_types_har_format___har_format_1.2.6.tgz"; + name = "_types_har_format___har_format_1.2.8.tgz"; path = fetchurl { - name = "_types_har_format___har_format_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.6.tgz"; - sha1 = "471c83acdf6a2ea429620daee4c6dc1784a0e85f"; + name = "_types_har_format___har_format_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.8.tgz"; + sha512 = "OP6L9VuZNdskgNN3zFQQ54ceYD8OLq5IbqO4VK91ORLfOm7WdT/CiT/pHEBSQEqCInJ2y3O6iCm/zGtPElpgJQ=="; }; } { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.4.tgz"; path = fetchurl { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; - sha1 = "4ba8ddb720221f432e443bd5f9117fd22cfd4762"; + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz"; + sha512 = "z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="; }; } { @@ -726,7 +758,7 @@ path = fetchurl { name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha1 = "c14c24f18ea8190c118ee7562b7ff99a36552686"; + sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg=="; }; } { @@ -734,31 +766,39 @@ path = fetchurl { name = "_types_istanbul_reports___istanbul_reports_3.0.1.tgz"; url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz"; - sha1 = "9153fe98bba2bd565a63add9436d6f0d7f8468ff"; + sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; } { - name = "_types_minimatch___minimatch_3.0.4.tgz"; + name = "_types_minimatch___minimatch_3.0.5.tgz"; path = fetchurl { - name = "_types_minimatch___minimatch_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "f0ec25dbf2f0e4b18647313ac031134ca5b24b21"; + name = "_types_minimatch___minimatch_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz"; + sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; } { - name = "_types_node___node_15.12.5.tgz"; + name = "_types_ms___ms_0.7.31.tgz"; path = fetchurl { - name = "_types_node___node_15.12.5.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.5.tgz"; - sha1 = "9a78318a45d75c9523d2396131bd3cca54b2d185"; + name = "_types_ms___ms_0.7.31.tgz"; + url = "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz"; + sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; }; } { - name = "_types_node___node_14.17.4.tgz"; + name = "_types_node___node_17.0.22.tgz"; path = fetchurl { - name = "_types_node___node_14.17.4.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.4.tgz"; - sha1 = "218712242446fc868d0e007af29a4408c7765bc0"; + name = "_types_node___node_17.0.22.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.22.tgz"; + sha512 = "8FwbVoG4fy+ykY86XCAclKZDORttqE5/s7dyWZKLXTdv3vRy5HozBEinG5IqhvPXXzIZEcTVbuHlQEI6iuwcmw=="; + }; + } + { + name = "_types_node___node_14.18.12.tgz"; + path = fetchurl { + name = "_types_node___node_14.18.12.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz"; + sha512 = "q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A=="; }; } { @@ -766,47 +806,55 @@ path = fetchurl { name = "_types_plist___plist_3.0.2.tgz"; url = "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz"; - sha1 = "61b3727bba0f5c462fe333542534a0c3e19ccb01"; + sha512 = "ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw=="; }; } { - name = "_types_prettier___prettier_2.3.0.tgz"; + name = "_types_prettier___prettier_2.4.4.tgz"; path = fetchurl { - name = "_types_prettier___prettier_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.0.tgz"; - sha1 = "2e8332cc7363f887d32ec5496b207d26ba8052bb"; + name = "_types_prettier___prettier_2.4.4.tgz"; + url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.4.tgz"; + sha512 = "ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA=="; }; } { - name = "_types_stack_utils___stack_utils_2.0.0.tgz"; + name = "_types_stack_utils___stack_utils_2.0.1.tgz"; path = fetchurl { - name = "_types_stack_utils___stack_utils_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz"; - sha1 = "7036640b4e21cc2f259ae826ce843d277dad8cff"; + name = "_types_stack_utils___stack_utils_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz"; + sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; }; } { - name = "_types_verror___verror_1.10.4.tgz"; + name = "_types_verror___verror_1.10.5.tgz"; path = fetchurl { - name = "_types_verror___verror_1.10.4.tgz"; - url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.4.tgz"; - sha1 = "805c0612b3a0c124cf99f517364142946b74ba3b"; + name = "_types_verror___verror_1.10.5.tgz"; + url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz"; + sha512 = "9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw=="; }; } { - name = "_types_yargs_parser___yargs_parser_20.2.0.tgz"; + name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; path = fetchurl { - name = "_types_yargs_parser___yargs_parser_20.2.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz"; - sha1 = "dd3e6699ba3237f0348cd085e4698780204842f9"; + name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; + sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; } { - name = "_types_yargs___yargs_16.0.3.tgz"; + name = "_types_yargs___yargs_16.0.4.tgz"; path = fetchurl { - name = "_types_yargs___yargs_16.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz"; - sha1 = "4b6d35bb8e680510a7dc2308518a80ee1ef27e01"; + name = "_types_yargs___yargs_16.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz"; + sha512 = "T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw=="; + }; + } + { + name = "_types_yargs___yargs_17.0.10.tgz"; + path = fetchurl { + name = "_types_yargs___yargs_17.0.10.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz"; + sha512 = "gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA=="; }; } { @@ -814,7 +862,7 @@ path = fetchurl { name = "abab___abab_2.0.5.tgz"; url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; - sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a"; + sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; }; } { @@ -822,15 +870,15 @@ path = fetchurl { name = "acorn_globals___acorn_globals_6.0.0.tgz"; url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz"; - sha1 = "46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"; + sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg=="; }; } { - name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; - sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; }; } { @@ -838,7 +886,7 @@ path = fetchurl { name = "acorn_walk___acorn_walk_7.2.0.tgz"; url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; - sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc"; + sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; }; } { @@ -846,15 +894,15 @@ path = fetchurl { name = "acorn___acorn_7.4.1.tgz"; url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; - sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; } { - name = "acorn___acorn_8.4.1.tgz"; + name = "acorn___acorn_8.7.0.tgz"; path = fetchurl { - name = "acorn___acorn_8.4.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz"; - sha1 = "56c36251fc7cabc7096adc18f05afe814321a28c"; + name = "acorn___acorn_8.7.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz"; + sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; }; } { @@ -862,7 +910,7 @@ path = fetchurl { name = "agent_base___agent_base_6.0.2.tgz"; url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; - sha1 = "49fff58577cfee3f37176feab4c22e00f86d7f77"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; } { @@ -870,7 +918,7 @@ path = fetchurl { name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; - sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; + sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; }; } { @@ -878,31 +926,15 @@ path = fetchurl { name = "ajv___ajv_6.12.6.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; - sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; } { - name = "ajv___ajv_8.6.0.tgz"; + name = "ansi_align___ansi_align_3.0.1.tgz"; path = fetchurl { - name = "ajv___ajv_8.6.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz"; - sha1 = "60cc45d9c46a477d80d92c48076d972c342e5720"; - }; - } - { - name = "ansi_align___ansi_align_3.0.0.tgz"; - path = fetchurl { - name = "ansi_align___ansi_align_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz"; - sha1 = "b536b371cf687caaef236c18d3e21fe3797467cb"; - }; - } - { - name = "ansi_colors___ansi_colors_4.1.1.tgz"; - path = fetchurl { - name = "ansi_colors___ansi_colors_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; - sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + name = "ansi_align___ansi_align_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz"; + sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; }; } { @@ -910,31 +942,15 @@ path = fetchurl { name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; - sha1 = "6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"; + sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; }; } { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; + name = "ansi_regex___ansi_regex_5.0.1.tgz"; path = fetchurl { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; - }; - } - { - name = "ansi_regex___ansi_regex_4.1.0.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; - }; - } - { - name = "ansi_regex___ansi_regex_5.0.0.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + name = "ansi_regex___ansi_regex_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; } { @@ -942,7 +958,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_3.2.1.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; } { @@ -950,7 +966,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_4.3.0.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; } { @@ -958,7 +974,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_5.2.0.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz"; - sha1 = "07449690ad45777d1924ac2abb2fc8895dba836b"; + sha512 = "Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="; }; } { @@ -966,39 +982,23 @@ path = fetchurl { name = "anymatch___anymatch_3.1.2.tgz"; url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; - sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; + sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; }; } { - name = "app_builder_bin___app_builder_bin_3.5.13.tgz"; + name = "app_builder_bin___app_builder_bin_3.7.1.tgz"; path = fetchurl { - name = "app_builder_bin___app_builder_bin_3.5.13.tgz"; - url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.13.tgz"; - sha1 = "6dd7f4de34a4e408806f99b8c7d6ef1601305b7e"; + name = "app_builder_bin___app_builder_bin_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz"; + sha512 = "ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw=="; }; } { - name = "app_builder_lib___app_builder_lib_22.11.7.tgz"; + name = "app_builder_lib___app_builder_lib_22.14.13.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_22.11.7.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.11.7.tgz"; - sha1 = "c0ad1119ebfbf4189a8280ad693625f5e684dca6"; - }; - } - { - name = "archiver_utils___archiver_utils_2.1.0.tgz"; - path = fetchurl { - name = "archiver_utils___archiver_utils_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz"; - sha1 = "e8a460e94b693c3e3da182a098ca6285ba9249e2"; - }; - } - { - name = "archiver___archiver_5.3.0.tgz"; - path = fetchurl { - name = "archiver___archiver_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz"; - sha1 = "dd3e097624481741df626267564f7dd8640a45ba"; + name = "app_builder_lib___app_builder_lib_22.14.13.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.13.tgz"; + sha512 = "SufmrtxU+D0Tn948fjEwAOlCN9757UXLkzzTWXMwZKR/5hisvgqeeBepWfphMIE6OkDGz0fbzEhL1P2Pty4XMg=="; }; } { @@ -1006,7 +1006,7 @@ path = fetchurl { name = "argparse___argparse_1.0.10.tgz"; url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; - sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; } { @@ -1014,15 +1014,15 @@ path = fetchurl { name = "argparse___argparse_2.0.1.tgz"; url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; - sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; } { - name = "asar___asar_3.0.3.tgz"; + name = "asar___asar_3.1.0.tgz"; path = fetchurl { - name = "asar___asar_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz"; - sha1 = "1fef03c2d6d2de0cbad138788e4f7ae03b129c7b"; + name = "asar___asar_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz"; + sha512 = "vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ=="; }; } { @@ -1030,15 +1030,7 @@ path = fetchurl { name = "assert_plus___assert_plus_1.0.0.tgz"; url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - } - { - name = "ast_metadata_inferer___ast_metadata_inferer_0.4.0.tgz"; - path = fetchurl { - name = "ast_metadata_inferer___ast_metadata_inferer_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/ast-metadata-inferer/-/ast-metadata-inferer-0.4.0.tgz"; - sha1 = "6be85ceeffcf267bd79db8e1ae731da44880b45f"; + sha1 = "8S4PPF13sLHN2RRpQuTpbB5N1SU="; }; } { @@ -1046,7 +1038,7 @@ path = fetchurl { name = "astral_regex___astral_regex_2.0.0.tgz"; url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; - sha1 = "483143c567aeed4785759c0865786dc77d7d2e31"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; }; } { @@ -1054,7 +1046,7 @@ path = fetchurl { name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; url = "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz"; - sha1 = "8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"; + sha512 = "NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw=="; }; } { @@ -1062,15 +1054,7 @@ path = fetchurl { name = "async___async_0.9.2.tgz"; url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - } - { - name = "async___async_3.2.0.tgz"; - path = fetchurl { - name = "async___async_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz"; - sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720"; + sha1 = "rqdNXmHB+JlhO/ZL2mbUx48v0X0="; }; } { @@ -1078,7 +1062,7 @@ path = fetchurl { name = "asynckit___asynckit_0.4.0.tgz"; url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + sha1 = "x57Zf380y48robyXkLzDZkdLS3k="; }; } { @@ -1086,31 +1070,31 @@ path = fetchurl { name = "at_least_node___at_least_node_1.0.0.tgz"; url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; - sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; + sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; }; } { - name = "babel_jest___babel_jest_27.0.6.tgz"; + name = "babel_jest___babel_jest_27.5.1.tgz"; path = fetchurl { - name = "babel_jest___babel_jest_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.6.tgz"; - sha1 = "e99c6e0577da2655118e3608b68761a5a69bd0d8"; + name = "babel_jest___babel_jest_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz"; + sha512 = "cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg=="; }; } { - name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz"; + name = "babel_plugin_istanbul___babel_plugin_istanbul_6.1.1.tgz"; path = fetchurl { - name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz"; - sha1 = "e159ccdc9af95e0b570c75b4573b7c34d671d765"; + name = "babel_plugin_istanbul___babel_plugin_istanbul_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz"; + sha512 = "Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA=="; }; } { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.6.tgz"; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.5.1.tgz"; path = fetchurl { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.6.tgz"; - sha1 = "f7c6b3d764af21cb4a2a1ab6870117dbde15b456"; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz"; + sha512 = "50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ=="; }; } { @@ -1118,15 +1102,15 @@ path = fetchurl { name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.1.tgz"; url = "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz"; - sha1 = "b4399239b89b2a011f9ddbe3e4f401fc40cff73b"; + sha512 = "M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ=="; }; } { - name = "babel_preset_jest___babel_preset_jest_27.0.6.tgz"; + name = "babel_preset_jest___babel_preset_jest_27.5.1.tgz"; path = fetchurl { - name = "babel_preset_jest___babel_preset_jest_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.6.tgz"; - sha1 = "909ef08e9f24a4679768be2f60a3df0856843f9d"; + name = "babel_preset_jest___babel_preset_jest_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz"; + sha512 = "Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag=="; }; } { @@ -1134,7 +1118,7 @@ path = fetchurl { name = "balanced_match___balanced_match_1.0.2.tgz"; url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; - sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; } { @@ -1142,15 +1126,7 @@ path = fetchurl { name = "base64_js___base64_js_1.5.1.tgz"; url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; - sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; - }; - } - { - name = "bl___bl_4.1.0.tgz"; - path = fetchurl { - name = "bl___bl_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; - sha1 = "451535264182bec2fbbc83a62ab98cf11d9f7b3a"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; } { @@ -1158,7 +1134,7 @@ path = fetchurl { name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; url = "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz"; - sha1 = "a64a0e4365658b9ab5fe875eb9dfb694189bb41c"; + sha512 = "7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw=="; }; } { @@ -1166,23 +1142,23 @@ path = fetchurl { name = "bluebird___bluebird_3.7.2.tgz"; url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; - sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; } { - name = "boolean___boolean_3.1.2.tgz"; + name = "boolean___boolean_3.2.0.tgz"; path = fetchurl { - name = "boolean___boolean_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz"; - sha1 = "e30f210a26b02458482a8cc353ab06f262a780c2"; + name = "boolean___boolean_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz"; + sha512 = "d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="; }; } { - name = "boxen___boxen_5.0.1.tgz"; + name = "boxen___boxen_5.1.2.tgz"; path = fetchurl { - name = "boxen___boxen_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/boxen/-/boxen-5.0.1.tgz"; - sha1 = "657528bdd3f59a772b8279b831f27ec2c744664b"; + name = "boxen___boxen_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz"; + sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; }; } { @@ -1190,7 +1166,7 @@ path = fetchurl { name = "brace_expansion___brace_expansion_1.1.11.tgz"; url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; } { @@ -1198,7 +1174,7 @@ path = fetchurl { name = "braces___braces_3.0.2.tgz"; url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; - sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; } { @@ -1206,15 +1182,15 @@ path = fetchurl { name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; - sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; + sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; }; } { - name = "browserslist___browserslist_4.16.6.tgz"; + name = "browserslist___browserslist_4.20.2.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.16.6.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz"; - sha1 = "d7901277a5a88e554ed305b183ec9b0c08f66fa2"; + name = "browserslist___browserslist_4.20.2.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.2.tgz"; + sha512 = "CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA=="; }; } { @@ -1222,7 +1198,23 @@ path = fetchurl { name = "bser___bser_2.1.1.tgz"; url = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz"; - sha1 = "e6787da20ece9d07998533cfd9de6f5c38f4bc05"; + sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="; + }; + } + { + name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; + path = fetchurl { + name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; + sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; + }; + } + { + name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; + path = fetchurl { + name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; + sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="; }; } { @@ -1230,7 +1222,7 @@ path = fetchurl { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + sha1 = "DTM+PwDqxQqhRUq9MO+MKl2ackI="; }; } { @@ -1238,15 +1230,23 @@ path = fetchurl { name = "buffer_equal___buffer_equal_1.0.0.tgz"; url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; - sha1 = "59616b498304d556abd466966b22eeda3eca5fbe"; + sha1 = "WWFrSYME1Var1GaWayLu2j7KX74="; }; } { - name = "buffer_from___buffer_from_1.1.1.tgz"; + name = "buffer_fill___buffer_fill_1.0.0.tgz"; path = fetchurl { - name = "buffer_from___buffer_from_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; - sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + name = "buffer_fill___buffer_fill_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz"; + sha1 = "+PeLdniYiO858gXNY39o5wISKyw="; + }; + } + { + name = "buffer_from___buffer_from_1.1.2.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; } { @@ -1254,31 +1254,23 @@ path = fetchurl { name = "buffer___buffer_5.7.1.tgz"; url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; - sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; } { - name = "builder_util_runtime___builder_util_runtime_8.7.6.tgz"; + name = "builder_util_runtime___builder_util_runtime_8.9.2.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_8.7.6.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.6.tgz"; - sha1 = "4b43c96db2bd494ced7694bcd7674934655e8324"; + name = "builder_util_runtime___builder_util_runtime_8.9.2.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz"; + sha512 = "rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A=="; }; } { - name = "builder_util_runtime___builder_util_runtime_8.7.7.tgz"; + name = "builder_util___builder_util_22.14.13.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_8.7.7.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.7.tgz"; - sha1 = "6c83cc3abe7a7a5c8b4ec8878f68adc828c07f0d"; - }; - } - { - name = "builder_util___builder_util_22.11.7.tgz"; - path = fetchurl { - name = "builder_util___builder_util_22.11.7.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.11.7.tgz"; - sha1 = "ae9707afa6a31feafa13c274ac83b4fe28ef1467"; + name = "builder_util___builder_util_22.14.13.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.13.tgz"; + sha512 = "oePC/qrrUuerhmH5iaCJzPRAKlSBylrhzuAJmRQClTyWnZUv6jbaHh+VoHMbEiE661wrj2S2aV7/bQh12cj1OA=="; }; } { @@ -1286,7 +1278,7 @@ path = fetchurl { name = "cacheable_request___cacheable_request_6.1.0.tgz"; url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; - sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; } { @@ -1294,7 +1286,7 @@ path = fetchurl { name = "callsites___callsites_3.1.0.tgz"; url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; - sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; } { @@ -1302,23 +1294,23 @@ path = fetchurl { name = "camelcase___camelcase_5.3.1.tgz"; url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; - sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; } { - name = "camelcase___camelcase_6.2.0.tgz"; + name = "camelcase___camelcase_6.3.0.tgz"; path = fetchurl { - name = "camelcase___camelcase_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz"; - sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; + name = "camelcase___camelcase_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001241.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001319.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001241.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001241.tgz"; - sha1 = "cd3fae47eb3d7691692b406568d7a3e5b23c7598"; + name = "caniuse_lite___caniuse_lite_1.0.30001319.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz"; + sha512 = "xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw=="; }; } { @@ -1326,15 +1318,15 @@ path = fetchurl { name = "chalk___chalk_2.4.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; } { - name = "chalk___chalk_4.1.1.tgz"; + name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { - name = "chalk___chalk_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; - sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; + name = "chalk___chalk_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; } { @@ -1342,7 +1334,7 @@ path = fetchurl { name = "char_regex___char_regex_1.0.2.tgz"; url = "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz"; - sha1 = "d744358226217f981ed58f479b1d6bcc29545dcf"; + sha512 = "kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="; }; } { @@ -1350,7 +1342,7 @@ path = fetchurl { name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; - sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; + sha1 = "BKEGZywYsIWrd02YPfo+oTjyIgU="; }; } { @@ -1358,23 +1350,23 @@ path = fetchurl { name = "ci_info___ci_info_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; } { - name = "ci_info___ci_info_3.2.0.tgz"; + name = "ci_info___ci_info_3.3.0.tgz"; path = fetchurl { - name = "ci_info___ci_info_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz"; - sha1 = "2876cb948a498797b5236f0095bc057d0dca38b6"; + name = "ci_info___ci_info_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz"; + sha512 = "riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw=="; }; } { - name = "cjs_module_lexer___cjs_module_lexer_1.2.1.tgz"; + name = "cjs_module_lexer___cjs_module_lexer_1.2.2.tgz"; path = fetchurl { - name = "cjs_module_lexer___cjs_module_lexer_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.1.tgz"; - sha1 = "2fd46d9906a126965aa541345c499aaa18e8cd73"; + name = "cjs_module_lexer___cjs_module_lexer_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz"; + sha512 = "cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="; }; } { @@ -1382,15 +1374,15 @@ path = fetchurl { name = "cli_boxes___cli_boxes_2.2.1.tgz"; url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz"; - sha1 = "ddd5035d25094fce220e9cab40a45840a440318f"; + sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; }; } { - name = "cli_truncate___cli_truncate_1.1.0.tgz"; + name = "cli_truncate___cli_truncate_2.1.0.tgz"; path = fetchurl { - name = "cli_truncate___cli_truncate_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz"; - sha1 = "2b2dfd83c53cfd3572b87fc4d430a808afb04086"; + name = "cli_truncate___cli_truncate_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz"; + sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; }; } { @@ -1398,7 +1390,7 @@ path = fetchurl { name = "cliui___cliui_7.0.4.tgz"; url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; - sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; + sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; } { @@ -1406,7 +1398,7 @@ path = fetchurl { name = "clone_response___clone_response_1.0.2.tgz"; url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; - sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + sha1 = "0dyXOSAxTfZ/vrlCI7TuNQI56Ws="; }; } { @@ -1414,7 +1406,7 @@ path = fetchurl { name = "co___co_4.6.0.tgz"; url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + sha1 = "bqa989hTrlTMuOR7+gvz+QMfsYQ="; }; } { @@ -1422,7 +1414,7 @@ path = fetchurl { name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; url = "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz"; - sha1 = "cc2c8e94fc18bbdffe64d6534570c8a673b27f59"; + sha512 = "iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="; }; } { @@ -1430,7 +1422,7 @@ path = fetchurl { name = "color_convert___color_convert_1.9.3.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; } { @@ -1438,7 +1430,7 @@ path = fetchurl { name = "color_convert___color_convert_2.0.1.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; - sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; }; } { @@ -1446,7 +1438,7 @@ path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; }; } { @@ -1454,15 +1446,7 @@ path = fetchurl { name = "color_name___color_name_1.1.4.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; - }; - } - { - name = "colorette___colorette_1.2.2.tgz"; - path = fetchurl { - name = "colorette___colorette_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; - sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; } { @@ -1470,7 +1454,7 @@ path = fetchurl { name = "colors___colors_1.0.3.tgz"; url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz"; - sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + sha1 = "BDP0TYCWgP3rYO0mDxsMJi6CpAs="; }; } { @@ -1478,7 +1462,7 @@ path = fetchurl { name = "combined_stream___combined_stream_1.0.8.tgz"; url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; - sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; } { @@ -1486,7 +1470,7 @@ path = fetchurl { name = "commander___commander_2.9.0.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + sha1 = "nJkJQXbhIkDLItbFFGCYQA/g99Q="; }; } { @@ -1494,15 +1478,15 @@ path = fetchurl { name = "commander___commander_5.1.0.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz"; - sha1 = "46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"; + sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; } { - name = "compress_commons___compress_commons_4.1.1.tgz"; + name = "compare_version___compare_version_0.1.2.tgz"; path = fetchurl { - name = "compress_commons___compress_commons_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz"; - sha1 = "df2a09a7ed17447642bad10a85cc9a19e5c42a7d"; + name = "compare_version___compare_version_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz"; + sha1 = "AWLsLZNR9d3VmpICy6k1NmpyUIA="; }; } { @@ -1510,7 +1494,7 @@ path = fetchurl { name = "concat_map___concat_map_0.0.1.tgz"; url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; }; } { @@ -1518,7 +1502,7 @@ path = fetchurl { name = "concat_stream___concat_stream_1.6.2.tgz"; url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; - sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; } { @@ -1526,7 +1510,7 @@ path = fetchurl { name = "config_chain___config_chain_1.1.13.tgz"; url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; - sha1 = "fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"; + sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; }; } { @@ -1534,7 +1518,7 @@ path = fetchurl { name = "configstore___configstore_5.0.1.tgz"; url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; - sha1 = "d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"; + sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; }; } { @@ -1542,15 +1526,7 @@ path = fetchurl { name = "convert_source_map___convert_source_map_1.8.0.tgz"; url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz"; - sha1 = "f3373c32d21b4d780dd8004514684fb791ca4369"; - }; - } - { - name = "core_js___core_js_3.15.2.tgz"; - path = fetchurl { - name = "core_js___core_js_3.15.2.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz"; - sha1 = "740660d2ff55ef34ce664d7e2455119c5bdd3d61"; + sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; }; } { @@ -1558,23 +1534,15 @@ path = fetchurl { name = "core_util_is___core_util_is_1.0.2.tgz"; url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + sha1 = "tf1UIgqivFq1eqtxQMlAdUUDwac="; }; } { - name = "crc_32___crc_32_1.2.0.tgz"; + name = "core_util_is___core_util_is_1.0.3.tgz"; path = fetchurl { - name = "crc_32___crc_32_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz"; - sha1 = "cb2db6e29b88508e32d9dd0ec1693e7b41a18208"; - }; - } - { - name = "crc32_stream___crc32_stream_4.0.2.tgz"; - path = fetchurl { - name = "crc32_stream___crc32_stream_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz"; - sha1 = "c922ad22b38395abe9d3870f02fa8134ed709007"; + name = "core_util_is___core_util_is_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; } { @@ -1582,7 +1550,7 @@ path = fetchurl { name = "crc___crc_3.8.0.tgz"; url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; - sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; + sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; }; } { @@ -1590,7 +1558,7 @@ path = fetchurl { name = "cross_spawn___cross_spawn_7.0.3.tgz"; url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; } { @@ -1598,7 +1566,7 @@ path = fetchurl { name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; - sha1 = "ef2a7a966ec11083388369baa02ebead229b30d5"; + sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; }; } { @@ -1606,7 +1574,7 @@ path = fetchurl { name = "cssom___cssom_0.4.4.tgz"; url = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz"; - sha1 = "5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"; + sha512 = "p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="; }; } { @@ -1614,7 +1582,7 @@ path = fetchurl { name = "cssom___cssom_0.3.8.tgz"; url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz"; - sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"; + sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="; }; } { @@ -1622,7 +1590,7 @@ path = fetchurl { name = "cssstyle___cssstyle_2.3.0.tgz"; url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz"; - sha1 = "ff665a0ddbdc31864b09647f34163443d90b0852"; + sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; } { @@ -1630,15 +1598,15 @@ path = fetchurl { name = "data_urls___data_urls_2.0.0.tgz"; url = "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz"; - sha1 = "156485a72963a970f5d5821aaf642bef2bf2db9b"; + sha512 = "X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ=="; }; } { - name = "debug___debug_4.3.1.tgz"; + name = "debug___debug_4.3.4.tgz"; path = fetchurl { - name = "debug___debug_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; - sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; + name = "debug___debug_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; } { @@ -1646,15 +1614,7 @@ path = fetchurl { name = "debug___debug_2.6.9.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; - }; - } - { - name = "debug___debug_4.3.2.tgz"; - path = fetchurl { - name = "debug___debug_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; } { @@ -1662,7 +1622,7 @@ path = fetchurl { name = "decimal.js___decimal.js_10.3.1.tgz"; url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz"; - sha1 = "d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"; + sha512 = "V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="; }; } { @@ -1670,7 +1630,7 @@ path = fetchurl { name = "decompress_response___decompress_response_3.3.0.tgz"; url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + sha1 = "gKTdMjdIOEv6JICDYirt7Jgq3/M="; }; } { @@ -1678,7 +1638,7 @@ path = fetchurl { name = "dedent___dedent_0.7.0.tgz"; url = "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz"; - sha1 = "2495ddbaf6eb874abb0e1be9df22d2e5a544326c"; + sha1 = "JJXduvbrh0q7Dhvp3yLS5aVEMmw="; }; } { @@ -1686,15 +1646,15 @@ path = fetchurl { name = "deep_extend___deep_extend_0.6.0.tgz"; url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; - sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; } { - name = "deep_is___deep_is_0.1.3.tgz"; + name = "deep_is___deep_is_0.1.4.tgz"; path = fetchurl { - name = "deep_is___deep_is_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + name = "deep_is___deep_is_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; + sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; }; } { @@ -1702,7 +1662,7 @@ path = fetchurl { name = "deepmerge___deepmerge_4.2.2.tgz"; url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz"; - sha1 = "44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"; + sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; }; } { @@ -1710,7 +1670,7 @@ path = fetchurl { name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; - sha1 = "331ae050c08dcf789f8c83a7b81f0ed94f4ac591"; + sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; }; } { @@ -1718,7 +1678,7 @@ path = fetchurl { name = "define_properties___define_properties_1.1.3.tgz"; url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; - sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; } { @@ -1726,7 +1686,7 @@ path = fetchurl { name = "delayed_stream___delayed_stream_1.0.0.tgz"; url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + sha1 = "3zrhmayt+31ECqrgsp4icrJOxhk="; }; } { @@ -1734,7 +1694,7 @@ path = fetchurl { name = "detect_newline___detect_newline_3.1.0.tgz"; url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz"; - sha1 = "576f5dfc63ae1a192ff192d8ad3af6308991b651"; + sha512 = "TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="; }; } { @@ -1742,15 +1702,15 @@ path = fetchurl { name = "detect_node___detect_node_2.1.0.tgz"; url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz"; - sha1 = "c9c70775a49c3d03bc2c06d9a73be550f978f8b1"; + sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; }; } { - name = "diff_sequences___diff_sequences_27.0.6.tgz"; + name = "diff_sequences___diff_sequences_27.5.1.tgz"; path = fetchurl { - name = "diff_sequences___diff_sequences_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz"; - sha1 = "3305cb2e55a033924054695cc66019fd7f8e5723"; + name = "diff_sequences___diff_sequences_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz"; + sha512 = "k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="; }; } { @@ -1758,23 +1718,23 @@ path = fetchurl { name = "dir_compare___dir_compare_2.4.0.tgz"; url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz"; - sha1 = "785c41dc5f645b34343a4eafc50b79bac7f11631"; + sha512 = "l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA=="; }; } { - name = "dmg_builder___dmg_builder_22.11.7.tgz"; + name = "dmg_builder___dmg_builder_22.14.13.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_22.11.7.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.11.7.tgz"; - sha1 = "5956008c18d40ee72c0ea01ffea9590dbf51df89"; + name = "dmg_builder___dmg_builder_22.14.13.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.13.tgz"; + sha512 = "xNOugB6AbIRETeU2uID15sUfjdZZcKdxK8xkFnwIggsM00PJ12JxpLNPTjcRoUnfwj3WrPjilrO64vRMwNItQg=="; }; } { - name = "dmg_license___dmg_license_1.0.9.tgz"; + name = "dmg_license___dmg_license_1.0.11.tgz"; path = fetchurl { - name = "dmg_license___dmg_license_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz"; - sha1 = "a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f"; + name = "dmg_license___dmg_license_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz"; + sha512 = "ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q=="; }; } { @@ -1782,7 +1742,7 @@ path = fetchurl { name = "doctrine___doctrine_3.0.0.tgz"; url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; - sha1 = "addebead72a6574db783639dc87a121773973961"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; }; } { @@ -1790,7 +1750,7 @@ path = fetchurl { name = "domexception___domexception_2.0.1.tgz"; url = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz"; - sha1 = "fb44aefba793e1574b0af6aed2801d057529f304"; + sha512 = "yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg=="; }; } { @@ -1798,7 +1758,7 @@ path = fetchurl { name = "dot_prop___dot_prop_5.3.0.tgz"; url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; - sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; }; } { @@ -1806,7 +1766,7 @@ path = fetchurl { name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; - sha1 = "3fbaf020bfd794884072ea26b1e9791d45a629f0"; + sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; }; } { @@ -1814,7 +1774,7 @@ path = fetchurl { name = "dotenv___dotenv_9.0.2.tgz"; url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; - sha1 = "dacc20160935a37dea6364aa1bef819fb9b6ab05"; + sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; }; } { @@ -1822,7 +1782,7 @@ path = fetchurl { name = "duplexer3___duplexer3_0.1.4.tgz"; url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; - sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + sha1 = "7gHdHKwO08vH/b6jfcCo8c4ALOI="; }; } { @@ -1830,39 +1790,47 @@ path = fetchurl { name = "ejs___ejs_3.1.6.tgz"; url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz"; - sha1 = "5bfd0a0689743bb5268b3550cceeebbc1702822a"; + sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; } { - name = "electron_builder___electron_builder_22.11.7.tgz"; + name = "electron_builder___electron_builder_22.14.13.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_22.11.7.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.11.7.tgz"; - sha1 = "cd97a0d9f6e6d388112e66b4376de431cca4d596"; + name = "electron_builder___electron_builder_22.14.13.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.13.tgz"; + sha512 = "3fgLxqF2TXVKiUPeg74O4V3l0l3j7ERLazo8sUbRkApw0+4iVAf2BJkHsHMaXiigsgCoEzK/F4/rB5rne/VAnw=="; }; } { - name = "electron_publish___electron_publish_22.11.7.tgz"; + name = "electron_osx_sign___electron_osx_sign_0.5.0.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_22.11.7.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.11.7.tgz"; - sha1 = "4126cbb08ccf082a2aa7fef89ee629b3a4b8ae9a"; + name = "electron_osx_sign___electron_osx_sign_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz"; + sha512 = "icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ=="; }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.763.tgz"; + name = "electron_publish___electron_publish_22.14.13.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.763.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.763.tgz"; - sha1 = "93f6f02506d099941f557b9db9ba50b30215bf15"; + name = "electron_publish___electron_publish_22.14.13.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.13.tgz"; + sha512 = "0oP3QiNj3e8ewOaEpEJV/o6Zrmy2VarVvZ/bH7kyO/S/aJf9x8vQsKVWpsdmSiZ5DJEHgarFIXrnO0ZQf0P9iQ=="; }; } { - name = "electron___electron_13.1.4.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.4.90.tgz"; path = fetchurl { - name = "electron___electron_13.1.4.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-13.1.4.tgz"; - sha1 = "6d20d932a0651c3cba9f09a3d08cbaf5b69aa84b"; + name = "electron_to_chromium___electron_to_chromium_1.4.90.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.90.tgz"; + sha512 = "ZwKgSA0mQMyEhz+NR0F8dRzkrCLeHLzLkjx/CWf16+zV85hQ6meXPQbKanvhnpkYb7b2uJNj+enQJ/N877ND4Q=="; + }; + } + { + name = "electron___electron_17.0.1.tgz"; + path = fetchurl { + name = "electron___electron_17.0.1.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-17.0.1.tgz"; + sha512 = "CBReR/QEOpgwMdt59lWCtj9wC8oHB6aAjMF1lhXcGew132xtp+C5N6EaXb/fmDceVYLouziYjbNcpeXsWrqdpA=="; }; } { @@ -1870,15 +1838,7 @@ path = fetchurl { name = "emittery___emittery_0.8.1.tgz"; url = "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz"; - sha1 = "bb23cc86d03b30aa75a7f734819dee2e1ba70860"; - }; - } - { - name = "emoji_regex___emoji_regex_7.0.3.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + sha512 = "uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="; }; } { @@ -1886,7 +1846,7 @@ path = fetchurl { name = "emoji_regex___emoji_regex_8.0.0.tgz"; url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; } { @@ -1894,7 +1854,7 @@ path = fetchurl { name = "encodeurl___encodeurl_1.0.2.tgz"; url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; }; } { @@ -1902,15 +1862,7 @@ path = fetchurl { name = "end_of_stream___end_of_stream_1.4.4.tgz"; url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; - }; - } - { - name = "enquirer___enquirer_2.3.6.tgz"; - path = fetchurl { - name = "enquirer___enquirer_2.3.6.tgz"; - url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; - sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; } { @@ -1918,7 +1870,15 @@ path = fetchurl { name = "env_paths___env_paths_2.2.1.tgz"; url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; - sha1 = "420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"; + sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; } { @@ -1926,7 +1886,7 @@ path = fetchurl { name = "es6_error___es6_error_4.1.1.tgz"; url = "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz"; - sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d"; + sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; }; } { @@ -1934,7 +1894,7 @@ path = fetchurl { name = "escalade___escalade_3.1.1.tgz"; url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; - sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; } { @@ -1942,7 +1902,7 @@ path = fetchurl { name = "escape_goat___escape_goat_2.1.1.tgz"; url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; - sha1 = "1b2dc77003676c457ec760b2dc68edb648188675"; + sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; }; } { @@ -1950,7 +1910,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; }; } { @@ -1958,7 +1918,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; - sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344"; + sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; }; } { @@ -1966,7 +1926,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; } { @@ -1974,47 +1934,31 @@ path = fetchurl { name = "escodegen___escodegen_2.0.0.tgz"; url = "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz"; - sha1 = "5e32b12833e8aa8fa35e1bf0befa89380484c7dd"; + sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; }; } { - name = "eslint_plugin_compat___eslint_plugin_compat_3.9.0.tgz"; + name = "eslint_plugin_sort_keys___eslint_plugin_sort_keys_2.3.5.tgz"; path = fetchurl { - name = "eslint_plugin_compat___eslint_plugin_compat_3.9.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-compat/-/eslint-plugin-compat-3.9.0.tgz"; - sha1 = "a7a224e09b102b58e7f7dff52c936428ff3e0186"; + name = "eslint_plugin_sort_keys___eslint_plugin_sort_keys_2.3.5.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-sort-keys/-/eslint-plugin-sort-keys-2.3.5.tgz"; + sha512 = "2j/XKQ9sNJwK8kIp/U0EvuF6stS6/8aIc53/NskE4C5NRNh4dt3xzbZyOdrVC11cTH6Zo59/pdzA0Kb+2fQGWg=="; }; } { - name = "eslint_plugin_sort_keys_fix___eslint_plugin_sort_keys_fix_1.1.1.tgz"; + name = "eslint_scope___eslint_scope_7.1.1.tgz"; path = fetchurl { - name = "eslint_plugin_sort_keys_fix___eslint_plugin_sort_keys_fix_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-sort-keys-fix/-/eslint-plugin-sort-keys-fix-1.1.1.tgz"; - sha1 = "2ed201b53fd4a89552c6e2abd38933f330a4b62e"; + name = "eslint_scope___eslint_scope_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz"; + sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw=="; }; } { - name = "eslint_scope___eslint_scope_5.1.1.tgz"; + name = "eslint_utils___eslint_utils_3.0.0.tgz"; path = fetchurl { - name = "eslint_scope___eslint_scope_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; - sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; - }; - } - { - name = "eslint_utils___eslint_utils_2.1.0.tgz"; - path = fetchurl { - name = "eslint_utils___eslint_utils_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; - sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; - }; - } - { - name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; - path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; - sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + name = "eslint_utils___eslint_utils_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz"; + sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; }; } { @@ -2022,23 +1966,31 @@ path = fetchurl { name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; - sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; + sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; } { - name = "eslint___eslint_7.29.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_3.3.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.29.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz"; - sha1 = "ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0"; + name = "eslint_visitor_keys___eslint_visitor_keys_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"; + sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; }; } { - name = "espree___espree_7.3.1.tgz"; + name = "eslint___eslint_8.9.0.tgz"; path = fetchurl { - name = "espree___espree_7.3.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; - sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6"; + name = "eslint___eslint_8.9.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-8.9.0.tgz"; + sha512 = "PB09IGwv4F4b0/atrbcMFboF/giawbBLVC7fyDamk5Wtey4Jh2K+rYaBhCAbUyEI4QzB1ly09Uglc9iCtFaG2Q=="; + }; + } + { + name = "espree___espree_9.3.1.tgz"; + path = fetchurl { + name = "espree___espree_9.3.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz"; + sha512 = "bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ=="; }; } { @@ -2046,7 +1998,7 @@ path = fetchurl { name = "esprima___esprima_4.0.1.tgz"; url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; - sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; } { @@ -2054,7 +2006,7 @@ path = fetchurl { name = "esquery___esquery_1.4.0.tgz"; url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; - sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; }; } { @@ -2062,23 +2014,15 @@ path = fetchurl { name = "esrecurse___esrecurse_4.3.0.tgz"; url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; - sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; }; } { - name = "estraverse___estraverse_4.3.0.tgz"; + name = "estraverse___estraverse_5.3.0.tgz"; path = fetchurl { - name = "estraverse___estraverse_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; - sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; - }; - } - { - name = "estraverse___estraverse_5.2.0.tgz"; - path = fetchurl { - name = "estraverse___estraverse_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; - sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + name = "estraverse___estraverse_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz"; + sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; } { @@ -2086,7 +2030,7 @@ path = fetchurl { name = "esutils___esutils_2.0.3.tgz"; url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; - sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; }; } { @@ -2094,15 +2038,7 @@ path = fetchurl { name = "execa___execa_5.1.1.tgz"; url = "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz"; - sha1 = "f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"; - }; - } - { - name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz"; - path = fetchurl { - name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; - sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692"; + sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; }; } { @@ -2110,23 +2046,15 @@ path = fetchurl { name = "exit___exit_0.1.2.tgz"; url = "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz"; - sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + sha1 = "BjJjj42HfMghB9MKD/8aF8uhzQw="; }; } { - name = "expect___expect_27.0.6.tgz"; + name = "expect___expect_27.5.1.tgz"; path = fetchurl { - name = "expect___expect_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/expect/-/expect-27.0.6.tgz"; - sha1 = "a4d74fbe27222c718fff68ef49d78e26a8fd4c05"; - }; - } - { - name = "extend___extend_3.0.2.tgz"; - path = fetchurl { - name = "extend___extend_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; - sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + name = "expect___expect_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz"; + sha512 = "E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw=="; }; } { @@ -2134,15 +2062,15 @@ path = fetchurl { name = "extract_zip___extract_zip_1.7.0.tgz"; url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz"; - sha1 = "556cc3ae9df7f452c493a0cfb51cc30277940927"; + sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; }; } { - name = "extsprintf___extsprintf_1.4.0.tgz"; + name = "extsprintf___extsprintf_1.4.1.tgz"; path = fetchurl { - name = "extsprintf___extsprintf_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; - sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + name = "extsprintf___extsprintf_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz"; + sha512 = "Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA=="; }; } { @@ -2150,7 +2078,7 @@ path = fetchurl { name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; } { @@ -2158,7 +2086,7 @@ path = fetchurl { name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; } { @@ -2166,15 +2094,15 @@ path = fetchurl { name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; }; } { - name = "fast_xml_parser___fast_xml_parser_3.19.0.tgz"; + name = "fast_xml_parser___fast_xml_parser_3.21.1.tgz"; path = fetchurl { - name = "fast_xml_parser___fast_xml_parser_3.19.0.tgz"; - url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz"; - sha1 = "cb637ec3f3999f51406dd8ff0e6fc4d83e520d01"; + name = "fast_xml_parser___fast_xml_parser_3.21.1.tgz"; + url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz"; + sha512 = "FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg=="; }; } { @@ -2182,7 +2110,7 @@ path = fetchurl { name = "fb_watchman___fb_watchman_2.0.1.tgz"; url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz"; - sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85"; + sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg=="; }; } { @@ -2190,7 +2118,7 @@ path = fetchurl { name = "fd_slicer___fd_slicer_1.1.0.tgz"; url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; - sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + sha1 = "JcfInLH5B3+IkbvmHY85Dq4lbx4="; }; } { @@ -2198,7 +2126,7 @@ path = fetchurl { name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; } { @@ -2206,7 +2134,7 @@ path = fetchurl { name = "filelist___filelist_1.0.2.tgz"; url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz"; - sha1 = "80202f21462d4d1c2e214119b1807c1bc0380e5b"; + sha512 = "z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ=="; }; } { @@ -2214,7 +2142,7 @@ path = fetchurl { name = "fill_range___fill_range_7.0.1.tgz"; url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; - sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; } { @@ -2222,7 +2150,7 @@ path = fetchurl { name = "find_up___find_up_4.1.0.tgz"; url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; } { @@ -2230,15 +2158,15 @@ path = fetchurl { name = "flat_cache___flat_cache_3.0.4.tgz"; url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; - sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; } { - name = "flatted___flatted_3.1.1.tgz"; + name = "flatted___flatted_3.2.5.tgz"; path = fetchurl { - name = "flatted___flatted_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; - sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; + name = "flatted___flatted_3.2.5.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; } { @@ -2246,23 +2174,23 @@ path = fetchurl { name = "form_data___form_data_3.0.1.tgz"; url = "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz"; - sha1 = "ebd53791b78356a99af9a300d4282c4d5eb9755f"; + sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; }; } { - name = "fs_constants___fs_constants_1.0.0.tgz"; + name = "form_data___form_data_4.0.0.tgz"; path = fetchurl { - name = "fs_constants___fs_constants_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; - sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + name = "form_data___form_data_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz"; + sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; }; } { - name = "fs_extra___fs_extra_10.0.0.tgz"; + name = "fs_extra___fs_extra_10.0.1.tgz"; path = fetchurl { - name = "fs_extra___fs_extra_10.0.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz"; - sha1 = "9ff61b655dde53fb34a82df84bb214ce802e17c1"; + name = "fs_extra___fs_extra_10.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz"; + sha512 = "NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag=="; }; } { @@ -2270,7 +2198,7 @@ path = fetchurl { name = "fs_extra___fs_extra_8.1.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; - sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; } { @@ -2278,7 +2206,7 @@ path = fetchurl { name = "fs_extra___fs_extra_9.1.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; - sha1 = "5954460c764a8da2094ba3554bf839e6b9a7c86d"; + sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; }; } { @@ -2286,7 +2214,7 @@ path = fetchurl { name = "fs.realpath___fs.realpath_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; }; } { @@ -2294,7 +2222,7 @@ path = fetchurl { name = "fsevents___fsevents_2.3.2.tgz"; url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; - sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; }; } { @@ -2302,7 +2230,7 @@ path = fetchurl { name = "function_bind___function_bind_1.1.1.tgz"; url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; - sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; } { @@ -2310,7 +2238,7 @@ path = fetchurl { name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + sha1 = "GwqzvVU7Kg1jmdKcDj6gslIHgyc="; }; } { @@ -2318,7 +2246,7 @@ path = fetchurl { name = "gensync___gensync_1.0.0_beta.2.tgz"; url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz"; - sha1 = "32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"; + sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; } { @@ -2326,7 +2254,7 @@ path = fetchurl { name = "get_caller_file___get_caller_file_2.0.5.tgz"; url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; } { @@ -2334,7 +2262,7 @@ path = fetchurl { name = "get_package_type___get_package_type_0.1.0.tgz"; url = "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz"; - sha1 = "8de2d803cff44df3bc6c456e6668b36c3926e11a"; + sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; }; } { @@ -2342,7 +2270,7 @@ path = fetchurl { name = "get_stream___get_stream_4.1.0.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; - sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; } { @@ -2350,7 +2278,7 @@ path = fetchurl { name = "get_stream___get_stream_5.2.0.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; - sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; } { @@ -2358,31 +2286,31 @@ path = fetchurl { name = "get_stream___get_stream_6.0.1.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz"; - sha1 = "a262d8eef67aced57c2852ad6167526a43cbf7b7"; + sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; }; } { - name = "glob_parent___glob_parent_5.1.2.tgz"; + name = "glob_parent___glob_parent_6.0.2.tgz"; path = fetchurl { - name = "glob_parent___glob_parent_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; - sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; + name = "glob_parent___glob_parent_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz"; + sha512 = "XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="; }; } { - name = "glob___glob_7.1.7.tgz"; + name = "glob___glob_7.2.0.tgz"; path = fetchurl { - name = "glob___glob_7.1.7.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; - sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + name = "glob___glob_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; } { - name = "global_agent___global_agent_2.2.0.tgz"; + name = "global_agent___global_agent_3.0.0.tgz"; path = fetchurl { - name = "global_agent___global_agent_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz"; - sha1 = "566331b0646e6bf79429a16877685c4a1fbf76dc"; + name = "global_agent___global_agent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz"; + sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; }; } { @@ -2390,7 +2318,7 @@ path = fetchurl { name = "global_dirs___global_dirs_3.0.0.tgz"; url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz"; - sha1 = "70a76fe84ea315ab37b1f5576cbde7d48ef72686"; + sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; }; } { @@ -2398,7 +2326,7 @@ path = fetchurl { name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz"; - sha1 = "d03b5102dfde3a69914f5ee7d86761ca35d57d8f"; + sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg=="; }; } { @@ -2406,15 +2334,15 @@ path = fetchurl { name = "globals___globals_11.12.0.tgz"; url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; - sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e"; + sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; } { - name = "globals___globals_13.9.0.tgz"; + name = "globals___globals_13.13.0.tgz"; path = fetchurl { - name = "globals___globals_13.9.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz"; - sha1 = "4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb"; + name = "globals___globals_13.13.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz"; + sha512 = "EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A=="; }; } { @@ -2422,7 +2350,7 @@ path = fetchurl { name = "globalthis___globalthis_1.0.2.tgz"; url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz"; - sha1 = "2a235d34f4d8036219f7e34929b5de9e18166b8b"; + sha512 = "ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ=="; }; } { @@ -2430,15 +2358,15 @@ path = fetchurl { name = "got___got_9.6.0.tgz"; url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; - sha1 = "edf45e7d67f99545705de1f7bbeeeb121765ed85"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; } { - name = "graceful_fs___graceful_fs_4.2.6.tgz"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.6.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; }; } { @@ -2446,7 +2374,7 @@ path = fetchurl { name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + sha1 = "TK+tdrxi8C+gObL5Tpo906ORpyU="; }; } { @@ -2454,7 +2382,7 @@ path = fetchurl { name = "has_flag___has_flag_3.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; }; } { @@ -2462,7 +2390,7 @@ path = fetchurl { name = "has_flag___has_flag_4.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; - sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; } { @@ -2470,7 +2398,7 @@ path = fetchurl { name = "has_yarn___has_yarn_2.1.0.tgz"; url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; - sha1 = "137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"; + sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; }; } { @@ -2478,15 +2406,15 @@ path = fetchurl { name = "has___has_1.0.3.tgz"; url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; - sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; } { - name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; - sha1 = "5e425507eede4fea846b7262f0838456c4209961"; + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; + sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; }; } { @@ -2494,7 +2422,7 @@ path = fetchurl { name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"; - sha1 = "42a6dc4fd33f00281176e8b23759ca4e4fa185f3"; + sha512 = "D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ=="; }; } { @@ -2502,7 +2430,7 @@ path = fetchurl { name = "html_escaper___html_escaper_2.0.2.tgz"; url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz"; - sha1 = "dfd60027da36a36dfcbe236262c00a5822681453"; + sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="; }; } { @@ -2510,7 +2438,7 @@ path = fetchurl { name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha1 = "49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"; + sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; }; } { @@ -2518,7 +2446,15 @@ path = fetchurl { name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; - sha1 = "8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"; + sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; + }; + } + { + name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; + sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; }; } { @@ -2526,7 +2462,7 @@ path = fetchurl { name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha1 = "e2a90542abb68a762e0a0850f6c9edadfd8506b2"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; }; } { @@ -2534,15 +2470,15 @@ path = fetchurl { name = "human_signals___human_signals_2.1.0.tgz"; url = "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz"; - sha1 = "dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"; + sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; } { - name = "iconv_corefoundation___iconv_corefoundation_1.1.6.tgz"; + name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; path = fetchurl { - name = "iconv_corefoundation___iconv_corefoundation_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz"; - sha1 = "27c135470237f6f8d13462fa1f5eaf250523c29a"; + name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz"; + sha512 = "T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ=="; }; } { @@ -2550,7 +2486,7 @@ path = fetchurl { name = "iconv_lite___iconv_lite_0.4.24.tgz"; url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; } { @@ -2558,7 +2494,7 @@ path = fetchurl { name = "iconv_lite___iconv_lite_0.6.3.tgz"; url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha1 = "a52f80bf38da1952eb5c681790719871a1a72501"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; } { @@ -2566,15 +2502,15 @@ path = fetchurl { name = "ieee754___ieee754_1.2.1.tgz"; url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; - sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; } { - name = "ignore___ignore_4.0.6.tgz"; + name = "ignore___ignore_5.2.0.tgz"; path = fetchurl { - name = "ignore___ignore_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; - sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; + name = "ignore___ignore_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz"; + sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; }; } { @@ -2582,7 +2518,7 @@ path = fetchurl { name = "import_fresh___import_fresh_3.3.0.tgz"; url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; - sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; } { @@ -2590,15 +2526,15 @@ path = fetchurl { name = "import_lazy___import_lazy_2.1.0.tgz"; url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; - sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + sha1 = "BWmOPUXIjo1+nZLLBYTnfwlvPkM="; }; } { - name = "import_local___import_local_3.0.2.tgz"; + name = "import_local___import_local_3.1.0.tgz"; path = fetchurl { - name = "import_local___import_local_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz"; - sha1 = "a8cfd0431d1de4a2199703d003e3e62364fa6db6"; + name = "import_local___import_local_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz"; + sha512 = "ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg=="; }; } { @@ -2606,7 +2542,7 @@ path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; }; } { @@ -2614,7 +2550,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; }; } { @@ -2622,7 +2558,7 @@ path = fetchurl { name = "inherits___inherits_2.0.4.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } { @@ -2630,7 +2566,7 @@ path = fetchurl { name = "ini___ini_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz"; - sha1 = "e5fd556ecdd5726be978fa1001862eacb0a94bc5"; + sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; }; } { @@ -2638,7 +2574,15 @@ path = fetchurl { name = "ini___ini_1.3.8.tgz"; url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; - sha1 = "a29da425b48806f34767a4efce397269af28432c"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; + }; + } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "d8mYQFJ6qOyxqLppe4BkWnqSap0="; }; } { @@ -2646,23 +2590,23 @@ path = fetchurl { name = "is_ci___is_ci_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; - sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; }; } { - name = "is_ci___is_ci_3.0.0.tgz"; + name = "is_ci___is_ci_3.0.1.tgz"; path = fetchurl { - name = "is_ci___is_ci_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz"; - sha1 = "c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994"; + name = "is_ci___is_ci_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz"; + sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; }; } { - name = "is_core_module___is_core_module_2.4.0.tgz"; + name = "is_core_module___is_core_module_2.8.1.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz"; - sha1 = "8e9fc8e15027b011418026e98f0e6f4d86305cc1"; + name = "is_core_module___is_core_module_2.8.1.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz"; + sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; }; } { @@ -2670,15 +2614,7 @@ path = fetchurl { name = "is_extglob___is_extglob_2.1.1.tgz"; url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + sha1 = "qIwCU1eR8C7TfHahueqXc8gz+MI="; }; } { @@ -2686,7 +2622,7 @@ path = fetchurl { name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; } { @@ -2694,15 +2630,15 @@ path = fetchurl { name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; url = "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz"; - sha1 = "7d140adc389aaf3011a8f2a2a4cfa6faadffb118"; + sha512 = "cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="; }; } { - name = "is_glob___is_glob_4.0.1.tgz"; + name = "is_glob___is_glob_4.0.3.tgz"; path = fetchurl { - name = "is_glob___is_glob_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; - sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + name = "is_glob___is_glob_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz"; + sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; } { @@ -2710,7 +2646,7 @@ path = fetchurl { name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; - sha1 = "9a0fd407949c30f86eb6959ef1b7994ed0b7b520"; + sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; }; } { @@ -2718,7 +2654,7 @@ path = fetchurl { name = "is_npm___is_npm_5.0.0.tgz"; url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz"; - sha1 = "43e8d65cc56e1b67f8d47262cf667099193f45a8"; + sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; }; } { @@ -2726,7 +2662,7 @@ path = fetchurl { name = "is_number___is_number_7.0.0.tgz"; url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; - sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; } { @@ -2734,7 +2670,7 @@ path = fetchurl { name = "is_obj___is_obj_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; - sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; } { @@ -2742,7 +2678,7 @@ path = fetchurl { name = "is_path_inside___is_path_inside_3.0.3.tgz"; url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; + sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; }; } { @@ -2750,23 +2686,23 @@ path = fetchurl { name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"; - sha1 = "171ed6f19e3ac554394edf78caa05784a45bebb5"; + sha512 = "bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="; }; } { - name = "is_stream___is_stream_2.0.0.tgz"; + name = "is_stream___is_stream_2.0.1.tgz"; path = fetchurl { - name = "is_stream___is_stream_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz"; - sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3"; + name = "is_stream___is_stream_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz"; + sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; }; } { - name = "is_svg___is_svg_4.3.1.tgz"; + name = "is_svg___is_svg_4.3.2.tgz"; path = fetchurl { - name = "is_svg___is_svg_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/is-svg/-/is-svg-4.3.1.tgz"; - sha1 = "8c63ec8c67c8c7f0a8de0a71c8c7d58eccf4406b"; + name = "is_svg___is_svg_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/is-svg/-/is-svg-4.3.2.tgz"; + sha512 = "mM90duy00JGMyjqIVHu9gNTjywdZV+8qNasX8cm/EEYZ53PHDgajvbBwNVvty5dwSAxLUD3p3bdo+7sR/UMrpw=="; }; } { @@ -2774,7 +2710,7 @@ path = fetchurl { name = "is_typedarray___is_typedarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + sha1 = "5HnICFjfDBsR3dppQPlgEfzaSpo="; }; } { @@ -2782,7 +2718,7 @@ path = fetchurl { name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; - sha1 = "d502d3382590ea3004893746754c89139973e232"; + sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; }; } { @@ -2790,7 +2726,15 @@ path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; + }; + } + { + name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; + path = fetchurl { + name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz"; + sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; }; } { @@ -2798,7 +2742,7 @@ path = fetchurl { name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz"; - sha1 = "5d34b94865bd4946633ecc78a026fc76c5b11fcf"; + sha512 = "53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w=="; }; } { @@ -2806,23 +2750,23 @@ path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; }; } { - name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz"; + name = "istanbul_lib_coverage___istanbul_lib_coverage_3.2.0.tgz"; path = fetchurl { - name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"; - sha1 = "f5944a37c70b550b02a78a5c3b2055b280cec8ec"; + name = "istanbul_lib_coverage___istanbul_lib_coverage_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz"; + sha512 = "eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="; }; } { - name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz"; + name = "istanbul_lib_instrument___istanbul_lib_instrument_5.1.0.tgz"; path = fetchurl { - name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz"; - sha1 = "873c6fff897450118222774696a3f28902d77c1d"; + name = "istanbul_lib_instrument___istanbul_lib_instrument_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz"; + sha512 = "czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q=="; }; } { @@ -2830,159 +2774,159 @@ path = fetchurl { name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; url = "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha1 = "7518fe52ea44de372f460a76b5ecda9ffb73d8a6"; + sha512 = "wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw=="; }; } { - name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.1.tgz"; path = fetchurl { - name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz"; - sha1 = "75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"; + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz"; + sha512 = "n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw=="; }; } { - name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; + name = "istanbul_reports___istanbul_reports_3.1.4.tgz"; path = fetchurl { - name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz"; - sha1 = "d593210e5000683750cb09fc0644e4b6e27fd53b"; + name = "istanbul_reports___istanbul_reports_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz"; + sha512 = "r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw=="; }; } { - name = "jake___jake_10.8.2.tgz"; + name = "jake___jake_10.8.4.tgz"; path = fetchurl { - name = "jake___jake_10.8.2.tgz"; - url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; - sha1 = "ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"; + name = "jake___jake_10.8.4.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.4.tgz"; + sha512 = "MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA=="; }; } { - name = "jest_changed_files___jest_changed_files_27.0.6.tgz"; + name = "jest_changed_files___jest_changed_files_27.5.1.tgz"; path = fetchurl { - name = "jest_changed_files___jest_changed_files_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.6.tgz"; - sha1 = "bed6183fcdea8a285482e3b50a9a7712d49a7a8b"; + name = "jest_changed_files___jest_changed_files_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz"; + sha512 = "buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw=="; }; } { - name = "jest_circus___jest_circus_27.0.6.tgz"; + name = "jest_circus___jest_circus_27.5.1.tgz"; path = fetchurl { - name = "jest_circus___jest_circus_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.6.tgz"; - sha1 = "dd4df17c4697db6a2c232aaad4e9cec666926668"; + name = "jest_circus___jest_circus_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.1.tgz"; + sha512 = "D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw=="; }; } { - name = "jest_cli___jest_cli_27.0.6.tgz"; + name = "jest_cli___jest_cli_27.5.1.tgz"; path = fetchurl { - name = "jest_cli___jest_cli_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.6.tgz"; - sha1 = "d021e5f4d86d6a212450d4c7b86cb219f1e6864f"; + name = "jest_cli___jest_cli_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.1.tgz"; + sha512 = "Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw=="; }; } { - name = "jest_config___jest_config_27.0.6.tgz"; + name = "jest_config___jest_config_27.5.1.tgz"; path = fetchurl { - name = "jest_config___jest_config_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.6.tgz"; - sha1 = "119fb10f149ba63d9c50621baa4f1f179500277f"; + name = "jest_config___jest_config_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.1.tgz"; + sha512 = "5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA=="; }; } { - name = "jest_diff___jest_diff_27.0.6.tgz"; + name = "jest_diff___jest_diff_27.5.1.tgz"; path = fetchurl { - name = "jest_diff___jest_diff_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.6.tgz"; - sha1 = "4a7a19ee6f04ad70e0e3388f35829394a44c7b5e"; + name = "jest_diff___jest_diff_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz"; + sha512 = "m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw=="; }; } { - name = "jest_docblock___jest_docblock_27.0.6.tgz"; + name = "jest_docblock___jest_docblock_27.5.1.tgz"; path = fetchurl { - name = "jest_docblock___jest_docblock_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz"; - sha1 = "cc78266acf7fe693ca462cbbda0ea4e639e4e5f3"; + name = "jest_docblock___jest_docblock_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz"; + sha512 = "rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ=="; }; } { - name = "jest_each___jest_each_27.0.6.tgz"; + name = "jest_each___jest_each_27.5.1.tgz"; path = fetchurl { - name = "jest_each___jest_each_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.6.tgz"; - sha1 = "cee117071b04060158dc8d9a66dc50ad40ef453b"; + name = "jest_each___jest_each_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.1.tgz"; + sha512 = "1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ=="; }; } { - name = "jest_environment_jsdom___jest_environment_jsdom_27.0.6.tgz"; + name = "jest_environment_jsdom___jest_environment_jsdom_27.5.1.tgz"; path = fetchurl { - name = "jest_environment_jsdom___jest_environment_jsdom_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz"; - sha1 = "f66426c4c9950807d0a9f209c590ce544f73291f"; + name = "jest_environment_jsdom___jest_environment_jsdom_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz"; + sha512 = "TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw=="; }; } { - name = "jest_environment_node___jest_environment_node_27.0.6.tgz"; + name = "jest_environment_node___jest_environment_node_27.5.1.tgz"; path = fetchurl { - name = "jest_environment_node___jest_environment_node_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.6.tgz"; - sha1 = "a6699b7ceb52e8d68138b9808b0c404e505f3e07"; + name = "jest_environment_node___jest_environment_node_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz"; + sha512 = "Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw=="; }; } { - name = "jest_get_type___jest_get_type_27.0.6.tgz"; + name = "jest_get_type___jest_get_type_27.5.1.tgz"; path = fetchurl { - name = "jest_get_type___jest_get_type_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz"; - sha1 = "0eb5c7f755854279ce9b68a9f1a4122f69047cfe"; + name = "jest_get_type___jest_get_type_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz"; + sha512 = "2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="; }; } { - name = "jest_haste_map___jest_haste_map_27.0.6.tgz"; + name = "jest_haste_map___jest_haste_map_27.5.1.tgz"; path = fetchurl { - name = "jest_haste_map___jest_haste_map_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.6.tgz"; - sha1 = "4683a4e68f6ecaa74231679dca237279562c8dc7"; + name = "jest_haste_map___jest_haste_map_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz"; + sha512 = "7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng=="; }; } { - name = "jest_jasmine2___jest_jasmine2_27.0.6.tgz"; + name = "jest_jasmine2___jest_jasmine2_27.5.1.tgz"; path = fetchurl { - name = "jest_jasmine2___jest_jasmine2_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz"; - sha1 = "fd509a9ed3d92bd6edb68a779f4738b100655b37"; + name = "jest_jasmine2___jest_jasmine2_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz"; + sha512 = "jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ=="; }; } { - name = "jest_leak_detector___jest_leak_detector_27.0.6.tgz"; + name = "jest_leak_detector___jest_leak_detector_27.5.1.tgz"; path = fetchurl { - name = "jest_leak_detector___jest_leak_detector_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz"; - sha1 = "545854275f85450d4ef4b8fe305ca2a26450450f"; + name = "jest_leak_detector___jest_leak_detector_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz"; + sha512 = "POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ=="; }; } { - name = "jest_matcher_utils___jest_matcher_utils_27.0.6.tgz"; + name = "jest_matcher_utils___jest_matcher_utils_27.5.1.tgz"; path = fetchurl { - name = "jest_matcher_utils___jest_matcher_utils_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz"; - sha1 = "2a8da1e86c620b39459f4352eaa255f0d43e39a9"; + name = "jest_matcher_utils___jest_matcher_utils_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz"; + sha512 = "z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw=="; }; } { - name = "jest_message_util___jest_message_util_27.0.6.tgz"; + name = "jest_message_util___jest_message_util_27.5.1.tgz"; path = fetchurl { - name = "jest_message_util___jest_message_util_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.6.tgz"; - sha1 = "158bcdf4785706492d164a39abca6a14da5ab8b5"; + name = "jest_message_util___jest_message_util_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz"; + sha512 = "rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g=="; }; } { - name = "jest_mock___jest_mock_27.0.6.tgz"; + name = "jest_mock___jest_mock_27.5.1.tgz"; path = fetchurl { - name = "jest_mock___jest_mock_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.6.tgz"; - sha1 = "0efdd40851398307ba16778728f6d34d583e3467"; + name = "jest_mock___jest_mock_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz"; + sha512 = "K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og=="; }; } { @@ -2990,103 +2934,103 @@ path = fetchurl { name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"; - sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c"; + sha512 = "olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w=="; }; } { - name = "jest_regex_util___jest_regex_util_27.0.6.tgz"; + name = "jest_regex_util___jest_regex_util_27.5.1.tgz"; path = fetchurl { - name = "jest_regex_util___jest_regex_util_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz"; - sha1 = "02e112082935ae949ce5d13b2675db3d8c87d9c5"; + name = "jest_regex_util___jest_regex_util_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz"; + sha512 = "4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg=="; }; } { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.6.tgz"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_27.5.1.tgz"; path = fetchurl { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz"; - sha1 = "3e619e0ef391c3ecfcf6ef4056207a3d2be3269f"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz"; + sha512 = "QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg=="; }; } { - name = "jest_resolve___jest_resolve_27.0.6.tgz"; + name = "jest_resolve___jest_resolve_27.5.1.tgz"; path = fetchurl { - name = "jest_resolve___jest_resolve_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.6.tgz"; - sha1 = "e90f436dd4f8fbf53f58a91c42344864f8e55bff"; + name = "jest_resolve___jest_resolve_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.1.tgz"; + sha512 = "FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw=="; }; } { - name = "jest_runner___jest_runner_27.0.6.tgz"; + name = "jest_runner___jest_runner_27.5.1.tgz"; path = fetchurl { - name = "jest_runner___jest_runner_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.6.tgz"; - sha1 = "1325f45055539222bbc7256a6976e993ad2f9520"; + name = "jest_runner___jest_runner_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.1.tgz"; + sha512 = "g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ=="; }; } { - name = "jest_runtime___jest_runtime_27.0.6.tgz"; + name = "jest_runtime___jest_runtime_27.5.1.tgz"; path = fetchurl { - name = "jest_runtime___jest_runtime_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.6.tgz"; - sha1 = "45877cfcd386afdd4f317def551fc369794c27c9"; + name = "jest_runtime___jest_runtime_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.1.tgz"; + sha512 = "o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A=="; }; } { - name = "jest_serializer___jest_serializer_27.0.6.tgz"; + name = "jest_serializer___jest_serializer_27.5.1.tgz"; path = fetchurl { - name = "jest_serializer___jest_serializer_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.6.tgz"; - sha1 = "93a6c74e0132b81a2d54623251c46c498bb5bec1"; + name = "jest_serializer___jest_serializer_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.1.tgz"; + sha512 = "jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w=="; }; } { - name = "jest_snapshot___jest_snapshot_27.0.6.tgz"; + name = "jest_snapshot___jest_snapshot_27.5.1.tgz"; path = fetchurl { - name = "jest_snapshot___jest_snapshot_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.6.tgz"; - sha1 = "f4e6b208bd2e92e888344d78f0f650bcff05a4bf"; + name = "jest_snapshot___jest_snapshot_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.1.tgz"; + sha512 = "yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA=="; }; } { - name = "jest_util___jest_util_27.0.6.tgz"; + name = "jest_util___jest_util_27.5.1.tgz"; path = fetchurl { - name = "jest_util___jest_util_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.6.tgz"; - sha1 = "e8e04eec159de2f4d5f57f795df9cdc091e50297"; + name = "jest_util___jest_util_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz"; + sha512 = "Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw=="; }; } { - name = "jest_validate___jest_validate_27.0.6.tgz"; + name = "jest_validate___jest_validate_27.5.1.tgz"; path = fetchurl { - name = "jest_validate___jest_validate_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.6.tgz"; - sha1 = "930a527c7a951927df269f43b2dc23262457e2a6"; + name = "jest_validate___jest_validate_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.1.tgz"; + sha512 = "thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ=="; }; } { - name = "jest_watcher___jest_watcher_27.0.6.tgz"; + name = "jest_watcher___jest_watcher_27.5.1.tgz"; path = fetchurl { - name = "jest_watcher___jest_watcher_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.6.tgz"; - sha1 = "89526f7f9edf1eac4e4be989bcb6dec6b8878d9c"; + name = "jest_watcher___jest_watcher_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.1.tgz"; + sha512 = "z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw=="; }; } { - name = "jest_worker___jest_worker_27.0.6.tgz"; + name = "jest_worker___jest_worker_27.5.1.tgz"; path = fetchurl { - name = "jest_worker___jest_worker_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.6.tgz"; - sha1 = "a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed"; + name = "jest_worker___jest_worker_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz"; + sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; }; } { - name = "jest___jest_27.0.6.tgz"; + name = "jest___jest_27.5.1.tgz"; path = fetchurl { - name = "jest___jest_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-27.0.6.tgz"; - sha1 = "10517b2a628f0409087fbf473db44777d7a04505"; + name = "jest___jest_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz"; + sha512 = "Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ=="; }; } { @@ -3094,7 +3038,7 @@ path = fetchurl { name = "js_tokens___js_tokens_4.0.0.tgz"; url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; - sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; } { @@ -3102,7 +3046,7 @@ path = fetchurl { name = "js_yaml___js_yaml_3.14.1.tgz"; url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; - sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; } { @@ -3110,15 +3054,15 @@ path = fetchurl { name = "js_yaml___js_yaml_4.1.0.tgz"; url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; - sha1 = "c1fb65f8f5017901cdd2c951864ba18458a10602"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; }; } { - name = "jsdom___jsdom_16.6.0.tgz"; + name = "jsdom___jsdom_16.7.0.tgz"; path = fetchurl { - name = "jsdom___jsdom_16.6.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz"; - sha1 = "f79b3786682065492a3da6a60a4695da983805ac"; + name = "jsdom___jsdom_16.7.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz"; + sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw=="; }; } { @@ -3126,7 +3070,7 @@ path = fetchurl { name = "jsesc___jsesc_2.5.2.tgz"; url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; - sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4"; + sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; } { @@ -3134,7 +3078,15 @@ path = fetchurl { name = "json_buffer___json_buffer_3.0.0.tgz"; url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; - sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + sha1 = "Wx85evx11ne96Lz8Dkfh+aPZqJg="; + }; + } + { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; }; } { @@ -3142,15 +3094,7 @@ path = fetchurl { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; - }; - } - { - name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; - path = fetchurl { - name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; - sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; } { @@ -3158,7 +3102,7 @@ path = fetchurl { name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + sha1 = "nbe1lJatPzz+8wp1FC0tkwrXJlE="; }; } { @@ -3166,15 +3110,15 @@ path = fetchurl { name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + sha1 = "Epai1Y/UXxmg9s4B1lcB4sc1tus="; }; } { - name = "json5___json5_2.2.0.tgz"; + name = "json5___json5_2.2.1.tgz"; path = fetchurl { - name = "json5___json5_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; - sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; + name = "json5___json5_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; + sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; }; } { @@ -3182,7 +3126,7 @@ path = fetchurl { name = "jsonfile___jsonfile_4.0.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + sha1 = "h3Gq4HmbZAdrdmQPygWPnBDjPss="; }; } { @@ -3190,7 +3134,7 @@ path = fetchurl { name = "jsonfile___jsonfile_6.1.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; - sha1 = "bc55b2634793c679ec6403094eb13698a6ec0aae"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; }; } { @@ -3198,7 +3142,7 @@ path = fetchurl { name = "keyv___keyv_3.1.0.tgz"; url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; - sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; } { @@ -3206,7 +3150,7 @@ path = fetchurl { name = "kleur___kleur_3.0.3.tgz"; url = "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz"; - sha1 = "a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"; + sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; }; } { @@ -3214,7 +3158,7 @@ path = fetchurl { name = "latest_version___latest_version_5.1.0.tgz"; url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; - sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face"; + sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; } { @@ -3222,15 +3166,7 @@ path = fetchurl { name = "lazy_val___lazy_val_1.0.5.tgz"; url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz"; - sha1 = "6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d"; - }; - } - { - name = "lazystream___lazystream_1.0.0.tgz"; - path = fetchurl { - name = "lazystream___lazystream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz"; - sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; + sha512 = "0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="; }; } { @@ -3238,7 +3174,7 @@ path = fetchurl { name = "leven___leven_3.1.0.tgz"; url = "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz"; - sha1 = "77891de834064cccba82ae7842bb6b14a13ed7f2"; + sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; }; } { @@ -3246,7 +3182,7 @@ path = fetchurl { name = "levn___levn_0.4.1.tgz"; url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; - sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; + sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; } { @@ -3254,7 +3190,15 @@ path = fetchurl { name = "levn___levn_0.3.0.tgz"; url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + sha1 = "OwmSTt+fCDwEkP3UwLxEIeBHZO4="; + }; + } + { + name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; + sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; }; } { @@ -3262,55 +3206,7 @@ path = fetchurl { name = "locate_path___locate_path_5.0.0.tgz"; url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; - }; - } - { - name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; - path = fetchurl { - name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; - }; - } - { - name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; - path = fetchurl { - name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; - sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; - }; - } - { - name = "lodash.difference___lodash.difference_4.5.0.tgz"; - path = fetchurl { - name = "lodash.difference___lodash.difference_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz"; - sha1 = "9ccb4e505d486b91651345772885a2df27fd017c"; - }; - } - { - name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; - path = fetchurl { - name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; - sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; - }; - } - { - name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; - path = fetchurl { - name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; - }; - } - { - name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; - path = fetchurl { - name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; - sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; } { @@ -3318,23 +3214,7 @@ path = fetchurl { name = "lodash.merge___lodash.merge_4.6.2.tgz"; url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; - sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; - }; - } - { - name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; - path = fetchurl { - name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; - sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; - }; - } - { - name = "lodash.union___lodash.union_4.6.0.tgz"; - path = fetchurl { - name = "lodash.union___lodash.union_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz"; - sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; } { @@ -3342,7 +3222,7 @@ path = fetchurl { name = "lodash___lodash_4.17.21.tgz"; url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; - sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; } { @@ -3350,7 +3230,7 @@ path = fetchurl { name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; }; } { @@ -3358,7 +3238,7 @@ path = fetchurl { name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; - sha1 = "2603e78b7b4b0006cbca2fbcc8a3202558ac9479"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; } { @@ -3366,7 +3246,7 @@ path = fetchurl { name = "lru_cache___lru_cache_6.0.0.tgz"; url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; - sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } { @@ -3374,15 +3254,15 @@ path = fetchurl { name = "make_dir___make_dir_3.1.0.tgz"; url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; - sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; } { - name = "makeerror___makeerror_1.0.11.tgz"; + name = "makeerror___makeerror_1.0.12.tgz"; path = fetchurl { - name = "makeerror___makeerror_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz"; - sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; + name = "makeerror___makeerror_1.0.12.tgz"; + url = "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz"; + sha512 = "JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg=="; }; } { @@ -3390,7 +3270,7 @@ path = fetchurl { name = "matcher___matcher_3.0.0.tgz"; url = "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz"; - sha1 = "bd9060f4c5b70aa8041ccc6f80368760994f30ca"; + sha512 = "OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng=="; }; } { @@ -3398,7 +3278,7 @@ path = fetchurl { name = "merge_stream___merge_stream_2.0.0.tgz"; url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; - sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; }; } { @@ -3406,31 +3286,31 @@ path = fetchurl { name = "micromatch___micromatch_4.0.4.tgz"; url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; - sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; + sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; }; } { - name = "mime_db___mime_db_1.48.0.tgz"; + name = "mime_db___mime_db_1.52.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.48.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz"; - sha1 = "e35b31045dd7eada3aaad537ed88a33afbef2d1d"; + name = "mime_db___mime_db_1.52.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; }; } { - name = "mime_types___mime_types_2.1.31.tgz"; + name = "mime_types___mime_types_2.1.35.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.31.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz"; - sha1 = "a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"; + name = "mime_types___mime_types_2.1.35.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz"; + sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; }; } { - name = "mime___mime_2.5.2.tgz"; + name = "mime___mime_2.6.0.tgz"; path = fetchurl { - name = "mime___mime_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz"; - sha1 = "6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"; + name = "mime___mime_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz"; + sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; }; } { @@ -3438,7 +3318,7 @@ path = fetchurl { name = "mimic_fn___mimic_fn_2.1.0.tgz"; url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; } { @@ -3446,7 +3326,7 @@ path = fetchurl { name = "mimic_response___mimic_response_1.0.1.tgz"; url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; - sha1 = "4923538878eef42063cb8a3e3b0798781487ab1b"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; }; } { @@ -3454,23 +3334,31 @@ path = fetchurl { name = "minimatch___minimatch_3.0.4.tgz"; url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; } { - name = "minimist___minimist_1.2.5.tgz"; + name = "minimatch___minimatch_3.1.2.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.5.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + name = "minimatch___minimatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; } { - name = "mkdirp___mkdirp_0.5.5.tgz"; + name = "minimist___minimist_1.2.6.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + name = "minimist___minimist_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz"; + sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; + }; + } + { + name = "mkdirp___mkdirp_0.5.6.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; }; } { @@ -3478,7 +3366,7 @@ path = fetchurl { name = "ms___ms_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; }; } { @@ -3486,7 +3374,7 @@ path = fetchurl { name = "ms___ms_2.1.2.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; - sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; } { @@ -3494,7 +3382,7 @@ path = fetchurl { name = "natural_compare___natural_compare_1.4.0.tgz"; url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; - sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + sha1 = "Sr6/7tdUHywnrPspvbvRXI1bpPc="; }; } { @@ -3502,7 +3390,7 @@ path = fetchurl { name = "node_addon_api___node_addon_api_1.7.2.tgz"; url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz"; - sha1 = "3df30b95720b53c24e59948b49532b662444f54d"; + sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; }; } { @@ -3510,23 +3398,15 @@ path = fetchurl { name = "node_int64___node_int64_0.4.0.tgz"; url = "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz"; - sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; + sha1 = "h6kGXNs1XTGC2PlM4RGIuCXGijs="; }; } { - name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz"; + name = "node_releases___node_releases_2.0.2.tgz"; path = fetchurl { - name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz"; - sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; - }; - } - { - name = "node_releases___node_releases_1.1.73.tgz"; - path = fetchurl { - name = "node_releases___node_releases_1.1.73.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz"; - sha1 = "dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"; + name = "node_releases___node_releases_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz"; + sha512 = "XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="; }; } { @@ -3534,7 +3414,7 @@ path = fetchurl { name = "normalize_path___normalize_path_3.0.0.tgz"; url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; - sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; } { @@ -3542,7 +3422,7 @@ path = fetchurl { name = "normalize_url___normalize_url_4.5.1.tgz"; url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; - sha1 = "0dd90cf1288ee1d1313b87081c9a5932ee48518a"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; } { @@ -3550,7 +3430,7 @@ path = fetchurl { name = "npm_conf___npm_conf_1.1.3.tgz"; url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz"; - sha1 = "256cc47bd0e218c259c4e9550bf413bc2192aff9"; + sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; }; } { @@ -3558,7 +3438,7 @@ path = fetchurl { name = "npm_run_path___npm_run_path_4.0.1.tgz"; url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; - sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"; + sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; }; } { @@ -3566,7 +3446,7 @@ path = fetchurl { name = "nwsapi___nwsapi_2.2.0.tgz"; url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; - sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7"; + sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="; }; } { @@ -3574,7 +3454,7 @@ path = fetchurl { name = "object_keys___object_keys_1.1.1.tgz"; url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; } { @@ -3582,7 +3462,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; }; } { @@ -3590,7 +3470,7 @@ path = fetchurl { name = "onetime___onetime_5.1.2.tgz"; url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; - sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; } { @@ -3598,7 +3478,7 @@ path = fetchurl { name = "optionator___optionator_0.8.3.tgz"; url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; - sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; }; } { @@ -3606,7 +3486,7 @@ path = fetchurl { name = "optionator___optionator_0.9.1.tgz"; url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; - sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; + sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; }; } { @@ -3614,15 +3494,7 @@ path = fetchurl { name = "p_cancelable___p_cancelable_1.1.0.tgz"; url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; - sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc"; - }; - } - { - name = "p_each_series___p_each_series_2.2.0.tgz"; - path = fetchurl { - name = "p_each_series___p_each_series_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz"; - sha1 = "105ab0357ce72b202a8a8b94933672657b5e2a9a"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; } { @@ -3630,7 +3502,7 @@ path = fetchurl { name = "p_limit___p_limit_2.3.0.tgz"; url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; - sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; } { @@ -3638,7 +3510,7 @@ path = fetchurl { name = "p_locate___p_locate_4.1.0.tgz"; url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; } { @@ -3646,7 +3518,7 @@ path = fetchurl { name = "p_try___p_try_2.2.0.tgz"; url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; } { @@ -3654,7 +3526,7 @@ path = fetchurl { name = "package_json___package_json_6.5.0.tgz"; url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; - sha1 = "6feedaca35e75725876d0b0e64974697fed145b0"; + sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; }; } { @@ -3662,7 +3534,15 @@ path = fetchurl { name = "parent_module___parent_module_1.0.1.tgz"; url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; - sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + } + { + name = "parse_json___parse_json_5.2.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; }; } { @@ -3670,7 +3550,7 @@ path = fetchurl { name = "parse5___parse5_6.0.1.tgz"; url = "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz"; - sha1 = "e1a1c085c569b3dc08321184f19a39cc27f7c30b"; + sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; }; } { @@ -3678,7 +3558,7 @@ path = fetchurl { name = "path_exists___path_exists_4.0.0.tgz"; url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; }; } { @@ -3686,7 +3566,7 @@ path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; }; } { @@ -3694,7 +3574,7 @@ path = fetchurl { name = "path_key___path_key_3.1.1.tgz"; url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; - sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; } { @@ -3702,7 +3582,7 @@ path = fetchurl { name = "path_parse___path_parse_1.0.7.tgz"; url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; - sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; } { @@ -3710,15 +3590,23 @@ path = fetchurl { name = "pend___pend_1.2.0.tgz"; url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + sha1 = "elfrVQpng/kRUzH89GY9XI4AelA="; }; } { - name = "picomatch___picomatch_2.3.0.tgz"; + name = "picocolors___picocolors_1.0.0.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; - sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; + name = "picocolors___picocolors_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz"; + sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; + }; + } + { + name = "picomatch___picomatch_2.3.1.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz"; + sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; } { @@ -3726,15 +3614,15 @@ path = fetchurl { name = "pify___pify_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + sha1 = "5aSs0sEB/fPZpNB/DbxNtJ3SgXY="; }; } { - name = "pirates___pirates_4.0.1.tgz"; + name = "pirates___pirates_4.0.5.tgz"; path = fetchurl { - name = "pirates___pirates_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz"; - sha1 = "643a92caf894566f91b2b986d2c66950a8e2fb87"; + name = "pirates___pirates_4.0.5.tgz"; + url = "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz"; + sha512 = "8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="; }; } { @@ -3742,15 +3630,15 @@ path = fetchurl { name = "pkg_dir___pkg_dir_4.2.0.tgz"; url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; } { - name = "plist___plist_3.0.2.tgz"; + name = "plist___plist_3.0.4.tgz"; path = fetchurl { - name = "plist___plist_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz"; - sha1 = "74bbf011124b90421c22d15779cee60060ba95bc"; + name = "plist___plist_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz"; + sha512 = "ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg=="; }; } { @@ -3758,7 +3646,7 @@ path = fetchurl { name = "prelude_ls___prelude_ls_1.2.1.tgz"; url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; - sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; + sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; } { @@ -3766,7 +3654,7 @@ path = fetchurl { name = "prelude_ls___prelude_ls_1.1.2.tgz"; url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + sha1 = "IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="; }; } { @@ -3774,23 +3662,15 @@ path = fetchurl { name = "prepend_http___prepend_http_2.0.0.tgz"; url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; - sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + sha1 = "6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="; }; } { - name = "pretty_format___pretty_format_27.0.6.tgz"; + name = "pretty_format___pretty_format_27.5.1.tgz"; path = fetchurl { - name = "pretty_format___pretty_format_27.0.6.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.6.tgz"; - sha1 = "ab770c47b2c6f893a21aefc57b75da63ef49a11f"; - }; - } - { - name = "printj___printj_1.1.2.tgz"; - path = fetchurl { - name = "printj___printj_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz"; - sha1 = "d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"; + name = "pretty_format___pretty_format_27.5.1.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz"; + sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="; }; } { @@ -3798,7 +3678,7 @@ path = fetchurl { name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; } { @@ -3806,15 +3686,15 @@ path = fetchurl { name = "progress___progress_2.0.3.tgz"; url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; - sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; } { - name = "prompts___prompts_2.4.1.tgz"; + name = "prompts___prompts_2.4.2.tgz"; path = fetchurl { - name = "prompts___prompts_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz"; - sha1 = "befd3b1195ba052f9fd2fde8a486c4e82ee77f61"; + name = "prompts___prompts_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz"; + sha512 = "NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q=="; }; } { @@ -3822,7 +3702,7 @@ path = fetchurl { name = "proto_list___proto_list_1.2.4.tgz"; url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; - sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + sha1 = "IS1b/hMYMGpCD2QCuOJv85ZHqEk="; }; } { @@ -3830,7 +3710,7 @@ path = fetchurl { name = "psl___psl_1.8.0.tgz"; url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; - sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; } { @@ -3838,7 +3718,7 @@ path = fetchurl { name = "pump___pump_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; - sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; } { @@ -3846,7 +3726,7 @@ path = fetchurl { name = "punycode___punycode_2.1.1.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; } { @@ -3854,7 +3734,7 @@ path = fetchurl { name = "pupa___pupa_2.1.1.tgz"; url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz"; - sha1 = "f5e8fd4afc2c5d97828faa523549ed8744a20d62"; + sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; } { @@ -3862,7 +3742,7 @@ path = fetchurl { name = "rc___rc_1.2.8.tgz"; url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; - sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; } { @@ -3870,7 +3750,7 @@ path = fetchurl { name = "react_is___react_is_17.0.2.tgz"; url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz"; - sha1 = "e691d4a8e9c789365655539ab372762b0efb54f0"; + sha512 = "w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="; }; } { @@ -3878,7 +3758,7 @@ path = fetchurl { name = "read_config_file___read_config_file_6.2.0.tgz"; url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz"; - sha1 = "71536072330bcd62ba814f91458b12add9fc7ade"; + sha512 = "gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg=="; }; } { @@ -3886,23 +3766,7 @@ path = fetchurl { name = "readable_stream___readable_stream_2.3.7.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; - }; - } - { - name = "readable_stream___readable_stream_3.6.0.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; - }; - } - { - name = "readdir_glob___readdir_glob_1.1.1.tgz"; - path = fetchurl { - name = "readdir_glob___readdir_glob_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz"; - sha1 = "f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; } { @@ -3910,7 +3774,7 @@ path = fetchurl { name = "regexpp___regexpp_3.2.0.tgz"; url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; - sha1 = "0425a2768d8f23bad70ca4b90461fa2f1213e1b2"; + sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; } { @@ -3918,7 +3782,7 @@ path = fetchurl { name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; - sha1 = "6d7b4006441918972ccd5fedcd41dc322c79b250"; + sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; }; } { @@ -3926,7 +3790,7 @@ path = fetchurl { name = "registry_url___registry_url_5.1.0.tgz"; url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; - sha1 = "e98334b50d5434b81136b44ec638d9c2009c5009"; + sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; }; } { @@ -3934,23 +3798,7 @@ path = fetchurl { name = "require_directory___require_directory_2.1.1.tgz"; url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; - }; - } - { - name = "require_from_string___require_from_string_2.0.2.tgz"; - path = fetchurl { - name = "require_from_string___require_from_string_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; - sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; - }; - } - { - name = "requireindex___requireindex_1.2.0.tgz"; - path = fetchurl { - name = "requireindex___requireindex_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz"; - sha1 = "3463cdb22ee151902635aa6c9535d4de9c2ef1ef"; + sha1 = "jGStX9MNqxyXbiNE/+f3kqam30I="; }; } { @@ -3958,7 +3806,7 @@ path = fetchurl { name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; - sha1 = "0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"; + sha512 = "OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg=="; }; } { @@ -3966,7 +3814,7 @@ path = fetchurl { name = "resolve_from___resolve_from_4.0.0.tgz"; url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; - sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; }; } { @@ -3974,15 +3822,23 @@ path = fetchurl { name = "resolve_from___resolve_from_5.0.0.tgz"; url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; - sha1 = "c35225843df8f776df21c57557bc087e9dfdfc69"; + sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; }; } { - name = "resolve___resolve_1.20.0.tgz"; + name = "resolve.exports___resolve.exports_1.1.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; - sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + name = "resolve.exports___resolve.exports_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz"; + sha512 = "J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="; + }; + } + { + name = "resolve___resolve_1.22.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.22.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz"; + sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; }; } { @@ -3990,7 +3846,7 @@ path = fetchurl { name = "responselike___responselike_1.0.2.tgz"; url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; - sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + sha1 = "kYcg7ztjHFZCvgaPFa3lpG9Loec="; }; } { @@ -3998,7 +3854,7 @@ path = fetchurl { name = "rimraf___rimraf_3.0.2.tgz"; url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; - sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; } { @@ -4006,7 +3862,7 @@ path = fetchurl { name = "roarr___roarr_2.15.4.tgz"; url = "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz"; - sha1 = "f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"; + sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; }; } { @@ -4014,15 +3870,7 @@ path = fetchurl { name = "safe_buffer___safe_buffer_5.1.2.tgz"; url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; - }; - } - { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; } { @@ -4030,7 +3878,7 @@ path = fetchurl { name = "safer_buffer___safer_buffer_2.1.2.tgz"; url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; } { @@ -4038,7 +3886,7 @@ path = fetchurl { name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; url = "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; - sha1 = "755ebd752045931977e30b2025d340d7c9090378"; + sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; } { @@ -4046,7 +3894,7 @@ path = fetchurl { name = "sax___sax_1.2.4.tgz"; url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; - sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; } { @@ -4054,7 +3902,7 @@ path = fetchurl { name = "saxes___saxes_5.0.1.tgz"; url = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz"; - sha1 = "eebab953fa3b7608dbe94e5dadb15c888fa6696d"; + sha512 = "5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw=="; }; } { @@ -4062,7 +3910,7 @@ path = fetchurl { name = "semver_compare___semver_compare_1.0.0.tgz"; url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; - sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + sha1 = "De4hahyUGrN+nvsXiPavxf9VN/w="; }; } { @@ -4070,15 +3918,7 @@ path = fetchurl { name = "semver_diff___semver_diff_3.1.1.tgz"; url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; - sha1 = "05f77ce59f325e00e2706afd67bb506ddb1ca32b"; - }; - } - { - name = "semver___semver_7.3.2.tgz"; - path = fetchurl { - name = "semver___semver_7.3.2.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz"; - sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; + sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; }; } { @@ -4086,7 +3926,7 @@ path = fetchurl { name = "semver___semver_6.3.0.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; } { @@ -4094,7 +3934,7 @@ path = fetchurl { name = "semver___semver_7.3.5.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; - sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; } { @@ -4102,7 +3942,7 @@ path = fetchurl { name = "serialize_error___serialize_error_7.0.1.tgz"; url = "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz"; - sha1 = "f1360b0447f61ffb483ec4157c737fab7d778e18"; + sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; }; } { @@ -4110,7 +3950,7 @@ path = fetchurl { name = "shebang_command___shebang_command_2.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; - sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; } { @@ -4118,15 +3958,15 @@ path = fetchurl { name = "shebang_regex___shebang_regex_3.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; } { - name = "signal_exit___signal_exit_3.0.3.tgz"; + name = "signal_exit___signal_exit_3.0.7.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; - sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + name = "signal_exit___signal_exit_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; } { @@ -4134,7 +3974,7 @@ path = fetchurl { name = "sisteransi___sisteransi_1.0.5.tgz"; url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; - sha1 = "134d681297756437cc05ca01370d3a7a571075ed"; + sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="; }; } { @@ -4142,39 +3982,31 @@ path = fetchurl { name = "slash___slash_3.0.0.tgz"; url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; - sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; } { - name = "slice_ansi___slice_ansi_1.0.0.tgz"; + name = "slice_ansi___slice_ansi_3.0.0.tgz"; path = fetchurl { - name = "slice_ansi___slice_ansi_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz"; - sha1 = "044f1a49d8842ff307aad6b505ed178bd950134d"; + name = "slice_ansi___slice_ansi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz"; + sha512 = "pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="; }; } { - name = "slice_ansi___slice_ansi_4.0.0.tgz"; + name = "smart_buffer___smart_buffer_4.2.0.tgz"; path = fetchurl { - name = "slice_ansi___slice_ansi_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; - sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; + sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; }; } { - name = "smart_buffer___smart_buffer_4.1.0.tgz"; + name = "source_map_support___source_map_support_0.5.21.tgz"; path = fetchurl { - name = "smart_buffer___smart_buffer_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz"; - sha1 = "91605c25d91652f4661ea69ccf45f1b331ca21ba"; - }; - } - { - name = "source_map_support___source_map_support_0.5.19.tgz"; - path = fetchurl { - name = "source_map_support___source_map_support_0.5.19.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; - sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + name = "source_map_support___source_map_support_0.5.21.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz"; + sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; }; } { @@ -4182,7 +4014,7 @@ path = fetchurl { name = "source_map___source_map_0.5.7.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + sha1 = "igOdLRAh0i0eoUyA2OpGi6LvP8w="; }; } { @@ -4190,7 +4022,7 @@ path = fetchurl { name = "source_map___source_map_0.6.1.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; } { @@ -4198,7 +4030,7 @@ path = fetchurl { name = "source_map___source_map_0.7.3.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; - sha1 = "5302f8169031735226544092e64981f751750383"; + sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; } { @@ -4206,7 +4038,7 @@ path = fetchurl { name = "sprintf_js___sprintf_js_1.1.2.tgz"; url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; - sha1 = "da1765262bf8c0f571749f2ad6c26300207ae673"; + sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; } { @@ -4214,15 +4046,15 @@ path = fetchurl { name = "sprintf_js___sprintf_js_1.0.3.tgz"; url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + sha1 = "BOaSb2YolTVPPdAVIDYzuFcpfiw="; }; } { - name = "stack_utils___stack_utils_2.0.3.tgz"; + name = "stack_utils___stack_utils_2.0.5.tgz"; path = fetchurl { - name = "stack_utils___stack_utils_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz"; - sha1 = "cd5f030126ff116b78ccb3c027fe302713b61277"; + name = "stack_utils___stack_utils_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz"; + sha512 = "xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA=="; }; } { @@ -4230,7 +4062,7 @@ path = fetchurl { name = "stat_mode___stat_mode_1.0.0.tgz"; url = "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz"; - sha1 = "68b55cb61ea639ff57136f36b216a291800d1465"; + sha512 = "jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg=="; }; } { @@ -4238,39 +4070,15 @@ path = fetchurl { name = "string_length___string_length_4.0.2.tgz"; url = "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz"; - sha1 = "a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"; + sha512 = "+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ=="; }; } { - name = "string_width___string_width_2.1.1.tgz"; + name = "string_width___string_width_4.2.3.tgz"; path = fetchurl { - name = "string_width___string_width_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; - sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; - }; - } - { - name = "string_width___string_width_3.1.0.tgz"; - path = fetchurl { - name = "string_width___string_width_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; - sha1 = "22767be21b62af1081574306f69ac51b62203961"; - }; - } - { - name = "string_width___string_width_4.2.2.tgz"; - path = fetchurl { - name = "string_width___string_width_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; - sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; - }; - } - { - name = "string_decoder___string_decoder_1.3.0.tgz"; - path = fetchurl { - name = "string_decoder___string_decoder_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; - sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + name = "string_width___string_width_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; } { @@ -4278,31 +4086,15 @@ path = fetchurl { name = "string_decoder___string_decoder_1.1.1.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; } { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; + name = "strip_ansi___strip_ansi_6.0.1.tgz"; path = fetchurl { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; - }; - } - { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; - }; - } - { - name = "strip_ansi___strip_ansi_6.0.0.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + name = "strip_ansi___strip_ansi_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; } { @@ -4310,7 +4102,7 @@ path = fetchurl { name = "strip_bom___strip_bom_4.0.0.tgz"; url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz"; - sha1 = "9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"; + sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="; }; } { @@ -4318,7 +4110,7 @@ path = fetchurl { name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; - sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; + sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; }; } { @@ -4326,7 +4118,7 @@ path = fetchurl { name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; - sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; }; } { @@ -4334,7 +4126,15 @@ path = fetchurl { name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + sha1 = "PFMZQukIwml8DsNEhYwobHygpgo="; + }; + } + { + name = "strnum___strnum_1.0.5.tgz"; + path = fetchurl { + name = "strnum___strnum_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz"; + sha512 = "J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="; }; } { @@ -4342,7 +4142,7 @@ path = fetchurl { name = "sumchecker___sumchecker_3.0.1.tgz"; url = "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz"; - sha1 = "6377e996795abb0b6d348e9b3e1dfb24345a8e42"; + sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg=="; }; } { @@ -4350,7 +4150,7 @@ path = fetchurl { name = "supports_color___supports_color_5.5.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; } { @@ -4358,7 +4158,7 @@ path = fetchurl { name = "supports_color___supports_color_7.2.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; - sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; } { @@ -4366,7 +4166,7 @@ path = fetchurl { name = "supports_color___supports_color_8.1.1.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz"; - sha1 = "cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; }; } { @@ -4374,7 +4174,15 @@ path = fetchurl { name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz"; - sha1 = "4f77b42488765891774b70c79babd87f9bd594bb"; + sha512 = "6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ=="; + }; + } + { + name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; + path = fetchurl { + name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; } { @@ -4382,23 +4190,7 @@ path = fetchurl { name = "symbol_tree___symbol_tree_3.2.4.tgz"; url = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz"; - sha1 = "430637d248ba77e078883951fb9aa0eed7c63fa2"; - }; - } - { - name = "table___table_6.7.1.tgz"; - path = fetchurl { - name = "table___table_6.7.1.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz"; - sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2"; - }; - } - { - name = "tar_stream___tar_stream_2.2.0.tgz"; - path = fetchurl { - name = "tar_stream___tar_stream_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; - sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; + sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; }; } { @@ -4406,7 +4198,7 @@ path = fetchurl { name = "temp_file___temp_file_3.4.0.tgz"; url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz"; - sha1 = "766ea28911c683996c248ef1a20eea04d51652c7"; + sha512 = "C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg=="; }; } { @@ -4414,7 +4206,7 @@ path = fetchurl { name = "terminal_link___terminal_link_2.1.1.tgz"; url = "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz"; - sha1 = "14a64a27ab3c0df933ea546fba55f2d078edc994"; + sha512 = "un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ=="; }; } { @@ -4422,7 +4214,7 @@ path = fetchurl { name = "test_exclude___test_exclude_6.0.0.tgz"; url = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz"; - sha1 = "04a8698661d805ea6fa293b6cb9e63ac044ef15e"; + sha512 = "cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w=="; }; } { @@ -4430,7 +4222,7 @@ path = fetchurl { name = "text_table___text_table_0.2.0.tgz"; url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; - sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + sha1 = "f17oI66AUgfACvLfSoTsP8+lcLQ="; }; } { @@ -4438,31 +4230,31 @@ path = fetchurl { name = "throat___throat_6.0.1.tgz"; url = "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz"; - sha1 = "d514fedad95740c12c2d7fc70ea863eb51ade375"; + sha512 = "8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="; }; } { - name = "tldts_core___tldts_core_5.7.38.tgz"; + name = "tldts_core___tldts_core_5.7.72.tgz"; path = fetchurl { - name = "tldts_core___tldts_core_5.7.38.tgz"; - url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.38.tgz"; - sha1 = "779092c90941803fb682c3d7094a88f12aad4508"; + name = "tldts_core___tldts_core_5.7.72.tgz"; + url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.7.72.tgz"; + sha512 = "UVnXJQbM3CGYwXVy16nNJHh/MWr7fcaEyd3DravwgZjWn0pPHuQ/ajtGonzi9F62Ld3d5r6zBlOTI7qLlLJR1Q=="; }; } { - name = "tldts_experimental___tldts_experimental_5.7.38.tgz"; + name = "tldts_experimental___tldts_experimental_5.7.72.tgz"; path = fetchurl { - name = "tldts_experimental___tldts_experimental_5.7.38.tgz"; - url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.38.tgz"; - sha1 = "a2b03ae0282ee7439b1ed1618a1d7d2e9e66be78"; + name = "tldts_experimental___tldts_experimental_5.7.72.tgz"; + url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.7.72.tgz"; + sha512 = "Qg1FOnR8jCXBySOQVSaAmRZ4UiKse60MY7eTdx6oIaQ8ve+xGi+dXybb4+RN4cu9c4M7HOoGYkWERQ5tkBAPbg=="; }; } { - name = "tmp_promise___tmp_promise_3.0.2.tgz"; + name = "tmp_promise___tmp_promise_3.0.3.tgz"; path = fetchurl { - name = "tmp_promise___tmp_promise_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.2.tgz"; - sha1 = "6e933782abff8b00c3119d63589ca1fb9caaa62a"; + name = "tmp_promise___tmp_promise_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz"; + sha512 = "RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ=="; }; } { @@ -4470,15 +4262,15 @@ path = fetchurl { name = "tmp___tmp_0.2.1.tgz"; url = "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz"; - sha1 = "8457fc3037dcf4719c251367a1af6500ee1ccf14"; + sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; }; } { - name = "tmpl___tmpl_1.0.4.tgz"; + name = "tmpl___tmpl_1.0.5.tgz"; path = fetchurl { - name = "tmpl___tmpl_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz"; - sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; + name = "tmpl___tmpl_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz"; + sha512 = "3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="; }; } { @@ -4486,7 +4278,7 @@ path = fetchurl { name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + sha1 = "3F5pjL0HkmW8c+A3doGk5Og/YW4="; }; } { @@ -4494,7 +4286,7 @@ path = fetchurl { name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; - sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; }; } { @@ -4502,7 +4294,7 @@ path = fetchurl { name = "to_regex_range___to_regex_range_5.0.1.tgz"; url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; } { @@ -4510,7 +4302,7 @@ path = fetchurl { name = "tough_cookie___tough_cookie_4.0.0.tgz"; url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz"; - sha1 = "d822234eeca882f991f0f908824ad2622ddbece4"; + sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg=="; }; } { @@ -4518,7 +4310,7 @@ path = fetchurl { name = "tr46___tr46_2.1.0.tgz"; url = "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz"; - sha1 = "fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"; + sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw=="; }; } { @@ -4526,7 +4318,7 @@ path = fetchurl { name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; - sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; + sha1 = "QFkjkJWS1W94pYGENLC3hInKXys="; }; } { @@ -4534,7 +4326,7 @@ path = fetchurl { name = "tunnel___tunnel_0.0.6.tgz"; url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; - sha1 = "72f1314b34a5b192db012324df2cc587ca47f92c"; + sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="; }; } { @@ -4542,7 +4334,7 @@ path = fetchurl { name = "type_check___type_check_0.4.0.tgz"; url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; - sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; + sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; }; } { @@ -4550,7 +4342,7 @@ path = fetchurl { name = "type_check___type_check_0.3.2.tgz"; url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + sha1 = "WITKtRLPHTVeP7eE8wgEsrUg23I="; }; } { @@ -4558,7 +4350,7 @@ path = fetchurl { name = "type_detect___type_detect_4.0.8.tgz"; url = "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz"; - sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c"; + sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; } { @@ -4566,7 +4358,7 @@ path = fetchurl { name = "type_fest___type_fest_0.13.1.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz"; - sha1 = "0172cb5bce80b0bd542ea348db50c7e21834d934"; + sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; }; } { @@ -4574,7 +4366,7 @@ path = fetchurl { name = "type_fest___type_fest_0.20.2.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; }; } { @@ -4582,7 +4374,7 @@ path = fetchurl { name = "type_fest___type_fest_0.21.3.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz"; - sha1 = "d260a24b0198436e133fa26a524a6d65fa3b2e37"; + sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; }; } { @@ -4590,7 +4382,7 @@ path = fetchurl { name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; } { @@ -4598,7 +4390,7 @@ path = fetchurl { name = "typedarray___typedarray_0.0.6.tgz"; url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c="; }; } { @@ -4606,7 +4398,7 @@ path = fetchurl { name = "unique_string___unique_string_2.0.0.tgz"; url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; - sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d"; + sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; }; } { @@ -4614,7 +4406,7 @@ path = fetchurl { name = "universalify___universalify_0.1.2.tgz"; url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; - sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; } { @@ -4622,7 +4414,7 @@ path = fetchurl { name = "universalify___universalify_2.0.0.tgz"; url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; - sha1 = "75a4984efedc4b08975c5aeb73f530d02df25717"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; }; } { @@ -4630,7 +4422,7 @@ path = fetchurl { name = "update_notifier___update_notifier_5.1.0.tgz"; url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz"; - sha1 = "4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"; + sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; }; } { @@ -4638,7 +4430,7 @@ path = fetchurl { name = "uri_js___uri_js_4.4.1.tgz"; url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; - sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; } { @@ -4646,7 +4438,7 @@ path = fetchurl { name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + sha1 = "FrXK/Afb42dsGxmZF3gj1lA6yww="; }; } { @@ -4654,7 +4446,7 @@ path = fetchurl { name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; - sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61"; + sha1 = "9F8VDExm7uloGGUFq5P8u4rWv2E="; }; } { @@ -4662,7 +4454,7 @@ path = fetchurl { name = "util_deprecate___util_deprecate_1.0.2.tgz"; url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; }; } { @@ -4670,23 +4462,23 @@ path = fetchurl { name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; - sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; + sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; }; } { - name = "v8_to_istanbul___v8_to_istanbul_8.0.0.tgz"; + name = "v8_to_istanbul___v8_to_istanbul_8.1.1.tgz"; path = fetchurl { - name = "v8_to_istanbul___v8_to_istanbul_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz"; - sha1 = "4229f2a99e367f3f018fa1d5c2b8ec684667c69c"; + name = "v8_to_istanbul___v8_to_istanbul_8.1.1.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz"; + sha512 = "FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w=="; }; } { - name = "verror___verror_1.10.0.tgz"; + name = "verror___verror_1.10.1.tgz"; path = fetchurl { - name = "verror___verror_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + name = "verror___verror_1.10.1.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz"; + sha512 = "veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg=="; }; } { @@ -4694,7 +4486,7 @@ path = fetchurl { name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; - sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; + sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ=="; }; } { @@ -4702,15 +4494,15 @@ path = fetchurl { name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"; - sha1 = "3e7104a05b75146cc60f564380b7f683acf1020a"; + sha512 = "4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA=="; }; } { - name = "walker___walker_1.0.7.tgz"; + name = "walker___walker_1.0.8.tgz"; path = fetchurl { - name = "walker___walker_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz"; - sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; + name = "walker___walker_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz"; + sha512 = "ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ=="; }; } { @@ -4718,7 +4510,7 @@ path = fetchurl { name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; - sha1 = "ae59c8a00b121543a2acc65c0434f57b0fc11aff"; + sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; }; } { @@ -4726,7 +4518,7 @@ path = fetchurl { name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; - sha1 = "9111b4d7ea80acd40f5270d666621afa78b69514"; + sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="; }; } { @@ -4734,7 +4526,7 @@ path = fetchurl { name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; - sha1 = "5abacf777c32166a51d085d6b4f3e7d27113ddb0"; + sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; }; } { @@ -4742,7 +4534,7 @@ path = fetchurl { name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; - sha1 = "3d4b1e0312d2079879f826aff18dbeeca5960fbf"; + sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; }; } { @@ -4750,7 +4542,7 @@ path = fetchurl { name = "whatwg_url___whatwg_url_8.7.0.tgz"; url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz"; - sha1 = "656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"; + sha512 = "gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg=="; }; } { @@ -4758,7 +4550,7 @@ path = fetchurl { name = "which___which_2.0.2.tgz"; url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; - sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; } { @@ -4766,7 +4558,7 @@ path = fetchurl { name = "widest_line___widest_line_3.1.0.tgz"; url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; - sha1 = "8292333bbf66cb45ff0de1603b136b7ae1496eca"; + sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; } { @@ -4774,7 +4566,7 @@ path = fetchurl { name = "word_wrap___word_wrap_1.2.3.tgz"; url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; - sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; } { @@ -4782,7 +4574,7 @@ path = fetchurl { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; } { @@ -4790,7 +4582,7 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; }; } { @@ -4798,15 +4590,15 @@ path = fetchurl { name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; - sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8"; + sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; }; } { - name = "ws___ws_7.5.1.tgz"; + name = "ws___ws_7.5.7.tgz"; path = fetchurl { - name = "ws___ws_7.5.1.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.5.1.tgz"; - sha1 = "44fc000d87edb1d9c53e51fbc69a0ac1f6871d66"; + name = "ws___ws_7.5.7.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz"; + sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="; }; } { @@ -4814,7 +4606,7 @@ path = fetchurl { name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; - sha1 = "4bc8d9984403696225ef83a1573cbbcb4e79db13"; + sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; }; } { @@ -4822,7 +4614,7 @@ path = fetchurl { name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; - sha1 = "6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"; + sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; }; } { @@ -4830,7 +4622,7 @@ path = fetchurl { name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; - sha1 = "9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"; + sha512 = "yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="; }; } { @@ -4838,7 +4630,7 @@ path = fetchurl { name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; - sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + sha1 = "Ey7mPS7FVlxVfiD0wi35rKaGsQ0="; }; } { @@ -4846,15 +4638,7 @@ path = fetchurl { name = "xmlchars___xmlchars_2.2.0.tgz"; url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz"; - sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"; - }; - } - { - name = "xmldom___xmldom_0.5.0.tgz"; - path = fetchurl { - name = "xmldom___xmldom_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz"; - sha1 = "193cb96b84aa3486127ea6272c4596354cb4962e"; + sha512 = "JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="; }; } { @@ -4862,7 +4646,7 @@ path = fetchurl { name = "y18n___y18n_5.0.8.tgz"; url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; - sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; } { @@ -4870,7 +4654,7 @@ path = fetchurl { name = "yallist___yallist_4.0.0.tgz"; url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; } { @@ -4878,7 +4662,15 @@ path = fetchurl { name = "yargs_parser___yargs_parser_20.2.9.tgz"; url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; + sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; + }; + } + { + name = "yargs_parser___yargs_parser_21.0.1.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_21.0.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz"; + sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; }; } { @@ -4886,15 +4678,15 @@ path = fetchurl { name = "yargs___yargs_16.2.0.tgz"; url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; - sha1 = "1c82bf0f6b6a66eafce7ef30e376f49a12477f66"; + sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; } { - name = "yargs___yargs_17.0.1.tgz"; + name = "yargs___yargs_17.4.0.tgz"; path = fetchurl { - name = "yargs___yargs_17.0.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz"; - sha1 = "6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"; + name = "yargs___yargs_17.4.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.4.0.tgz"; + sha512 = "WJudfrk81yWFSOkZYpAZx4Nt7V4xp7S/uJkX0CnxovMCt1wCE8LNftPpNuF9X/u9gN5nsD7ycYtRcDf2pL3UiA=="; }; } { @@ -4902,15 +4694,7 @@ path = fetchurl { name = "yauzl___yauzl_2.10.0.tgz"; url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; - sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; - }; - } - { - name = "zip_stream___zip_stream_4.1.0.tgz"; - path = fetchurl { - name = "zip_stream___zip_stream_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz"; - sha1 = "51dd326571544e36aa3f756430b313576dc8fc79"; + sha1 = "x+sXyT4RLLEIb6bY5R+wZnt5pfk="; }; } ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index bf220c02b4e4..30d719593e83 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -4,7 +4,7 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat , libuuid , libxml2 -, glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2 +, glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core , libdrm, mesa , nss, nspr , patchelf, makeWrapper @@ -12,6 +12,7 @@ , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null , enableWidevine ? false, vivaldi-widevine ? null , commandLineArgs ? "" +, pulseSupport ? stdenv.isLinux, libpulseaudio }: let @@ -19,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.0.2497.32-1"; + version = "5.1.2567.73-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1l333q002z9rr08np0r0j89j26shmsl8y2clyqwh54h22h7hmypz"; + sha256 = "04jzhipn4ip7x3zdwmfnp6w0qc2y1qdfy5w3qyy0r114jz9s9i7g"; }; unpackPhase = '' @@ -38,9 +39,10 @@ in stdenv.mkDerivation rec { libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr atk at-spi2-atk at-spi2-core alsa-lib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd libva freetype fontconfig libXrender libuuid expat glib nss nspr - libxml2 pango cairo gnome2.GConf + libxml2 pango cairo libdrm mesa - ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; + ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs + ++ lib.optional pulseSupport libpulseaudio; libPath = lib.makeLibraryPath buildInputs + lib.optionalString (stdenv.is64bit) diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 28543c31edc4..461fd0050cf1 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "97.0.4692.56"; + version = "97.0.4692.71"; src = fetchurl { - url = "https://launchpadlibrarian.net/574348729/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; - sha256 = "sha256-v5DHJxQjHjBeIS/psaM+LyUaHKlwzrKncLarErbUGVU="; + url = "https://launchpadlibrarian.net/579085093/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; + sha256 = "sha256-YUv1D8U776NJBRPvYJigG7gyH9zd19FbnjAvIEhfYpA="; }; buildInputs = [ dpkg ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/pkgs/applications/networking/browsers/vivaldi/update.sh index 2e6c2853eb14..caf9148805cd 100755 --- a/pkgs/applications/networking/browsers/vivaldi/update.sh +++ b/pkgs/applications/networking/browsers/vivaldi/update.sh @@ -36,9 +36,13 @@ git commit -m "vivaldi: ${vivaldi_version_old} -> ${vivaldi_version}" # Check vivaldi-ffmpeg-codecs version. chromium_version_old=$(version vivaldi-ffmpeg-codecs) -chromium_version=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/vivaldi-bin | strings | grep '^[0-9]\{2,\}\.[0-9]\+\.[0-9]\{4,\}\+\.[0-9]\+$') +ffmpeg_update_script=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/update-ffmpeg) +chromium_version=$(sed -rne 's/FFMPEG_VERSION_DEB\=([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*/\1/p' <<< $ffmpeg_update_script) +download_subdir=$(sed -rne 's/.*FFMPEG_URL_DEB\=https:\/\/launchpadlibrarian\.net\/([0-9]+)\/.*_amd64\.deb/\1/p' <<< $ffmpeg_update_script) if [[ "$chromium_version" != "$chromium_version_old" ]]; then + # replace the download prefix + sed -i $ffmpeg_nix -e "s/\(https:\/\/launchpadlibrarian\.net\/\)[0-9]\+/\1$download_subdir/g" (cd "$root" && update-source-version vivaldi-ffmpeg-codecs "$chromium_version") git add "${ffmpeg_nix}" diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix deleted file mode 100644 index f9be7e9ec9aa..000000000000 --- a/pkgs/applications/networking/browsers/webbrowser/default.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ stdenv, lib, fetchgit, makeDesktopItem, pkg-config, makeWrapper -# Build -, python2, autoconf213, yasm, perl -, unzip, gnome2, gnum4 - -# Runtime -, xorg, zip, freetype, fontconfig, glibc, libffi -, dbus, dbus-glib, gtk2, alsa-lib, jack2, ffmpeg -}: - -let - - libPath = lib.makeLibraryPath [ ffmpeg ]; - -in stdenv.mkDerivation rec { - pname = "webbrowser"; - version = "29.0.0rc1"; - - src = fetchgit { - url = "https://git.nuegia.net/webbrowser.git"; - rev = version; - sha256 = "1d82943mla6q3257081d946kgms91dg0n93va3zlzm9hbbqilzm6"; - fetchSubmodules = true; - }; - - desktopItem = makeDesktopItem { - name = "webbrowser"; - exec = "webbrowser %U"; - icon = "webbrowser"; - desktopName = "Web Browser"; - genericName = "Web Browser"; - categories = "Network;WebBrowser;"; - mimeType = lib.concatStringsSep ";" [ - "text/html" - "text/xml" - "application/xhtml+xml" - "application/vnd.mozilla.xul+xml" - "x-scheme-handler/http" - "x-scheme-handler/https" - ]; - }; - - nativeBuildInputs = [ - gnum4 makeWrapper perl pkg-config python2 unzip - ]; - - buildInputs = [ - alsa-lib dbus dbus-glib ffmpeg fontconfig freetype yasm zip jack2 gtk2 - gnome2.GConf xorg.libXt - ]; - - enableParallelBuilding = true; - - configurePhase = '' - export MOZCONFIG=$PWD/.mozconfig - export MOZ_NOSPAM=1 - - cp $src/doc/mozconfig.example $MOZCONFIG - # Need to modify it - chmod 644 $MOZCONFIG - - substituteInPlace $MOZCONFIG \ - --replace "mk_add_options PYTHON=/usr/bin/python2" "mk_add_options PYTHON=${python2}/bin/python2" \ - --replace "mk_add_options AUTOCONF=/usr/bin/autoconf-2.13" "mk_add_options AUTOCONF=${autoconf213}/bin/autoconf" \ - --replace 'mk_add_options MOZ_OBJDIR=$HOME/build/wbobjects/' "" \ - --replace "ac_add_options --x-libraries=/usr/lib64" "ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]}" \ - --replace "_BUILD_64=1" "_BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"}" \ - --replace "--enable-ccache" "--disable-ccache" - - echo >> $MOZCONFIG ' - # - # NixOS-specific adjustments - # - - ac_add_options --prefix=$out - - mk_add_options MOZ_MAKE_FLAGS="-j$NIX_BUILD_CORES" - ' - ''; - - buildPhase = "$src/mach build"; - - installPhase = '' - $src/mach install - - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - - for n in 16 32 48; do - size=$n"x"$n - mkdir -p $out/share/icons/hicolor/$size/apps - cp $src/webbrowser/branding/unofficial/default$n.png \ - $out/share/icons/hicolor/$size/apps/webbrowser.png - done - - # Needed to make videos work - wrapProgram $out/lib/webbrowser-${version}/webbrowser \ - --prefix LD_LIBRARY_PATH : "${libPath}" - ''; - - meta = with lib; { - description = "Generic web browser without trackers compatible with XUL plugins using UXP rendering engine"; - homepage = "https://git.nuegia.net/webbrowser.git/"; - license = [ licenses.mpl20 licenses.gpl3 ]; - maintainers = with maintainers; [ TheBrainScrambler ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - broken = true; # 2021-01-07 - }; -} diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index a54ccfdf6cc3..dab9794277f6 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "yandex-browser"; - version = "21.6.2.817-1"; + version = "22.1.3.907-1"; src = fetchurl { url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; - sha256 = "sha256-xeZkQzVPPNABxa3/YBLoZl1obbFdzxdqIgLyoA4PN8U="; + sha256 = "sha256-7dbFqNzZP2CyseK0xD9zcvecIuueZfMy5KgN8gRRLEk="; }; nativeBuildInputs = [ @@ -109,21 +109,22 @@ stdenv.mkDerivation rec { ]; unpackPhase = '' - mkdir -p $TMP/ya $out/bin - cp $src $TMP/ya.deb - ar vx ya.deb + mkdir $TMP/ya/ $out/bin/ -p + ar vx $src tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/ya/ ''; installPhase = '' - cp -R $TMP/ya/opt $out/ + 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 ''; - runtimeDependencies = [ - libpulseaudio.out - (lib.getLib systemd) - ]; + runtimeDependencies = map lib.getLib [ + libpulseaudio + curl + systemd + ] ++ buildInputs; meta = with lib; { description = "Yandex Web Browser"; @@ -131,6 +132,12 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; - broken = true; + + knownVulnerabilities = [ + '' + Trusts a Russian government issued CA certificate for some websites. + See https://habr.com/en/company/yandex/blog/655185/ (Russian) for details. + '' + ]; }; } diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 8282713aa00a..2215de9291d5 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { longDescription = "GNOME Calls is a phone dialer and call handler. Setting NixOS option `programs.calls.enable = true` is recommended."; homepage = "https://source.puri.sm/Librem5/calls"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ craigem lheckemann ]; + maintainers = with maintainers; [ craigem lheckemann tomfitzhenry ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index 74074d23242a..dad293e51a2d 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -23,14 +23,14 @@ }: stdenv.mkDerivation rec { - version = "1.4.2"; + version = "1.5"; pname = "cawbird"; src = fetchFromGitHub { owner = "IBBoard"; repo = "cawbird"; rev = "v${version}"; - sha256 = "17575cp5qcgsqf37y3xqg3vr6l2j8bbbkmy2c1l185rxghfacida"; + sha256 = "sha256-XFN9gfCoQDmYYysg1yrUoPPE0Ow40LttvV5Ltu0DTfI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 757f39c5b35e..064213b01ae3 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -11,14 +11,21 @@ let generic = { version, sha256, platform ? "", jdk, ... }@attrs: let desktopItem = makeDesktopItem { - categories = "Network;Development;WebDevelopment;Java;"; + categories = [ "Network" "Development" "WebDevelopment" "Java" ]; desktopName = "Charles"; exec = "charles %F"; genericName = "Web Debugging Proxy"; icon = "charles-proxy"; - mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace"; + mimeTypes = [ + "application/x-charles-savedsession" + "application/x-charles-savedsession+xml" + "application/x-charles-savedsession+json" + "application/har+json" + "application/vnd.tcpdump.pcap" + "application/x-charles-trace" + ]; name = "Charles"; - startupNotify = "true"; + startupNotify = true; }; in stdenv.mkDerivation { diff --git a/pkgs/applications/networking/cisco-packet-tracer/7.nix b/pkgs/applications/networking/cisco-packet-tracer/7.nix index 33f35ba12af3..f7e731713120 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/7.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/7.nix @@ -38,7 +38,7 @@ let desktopName = "Cisco Packet Tracer 7"; icon = "${ptFiles}/opt/pt/art/app.png"; exec = "packettracer7 %f"; - mimeType = "application/x-pkt;application/x-pka;application/x-pkz;"; + mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ]; }; fhs = buildFHSUserEnvBubblewrap { diff --git a/pkgs/applications/networking/cisco-packet-tracer/8.nix b/pkgs/applications/networking/cisco-packet-tracer/8.nix index c823dcbb1d35..9bc890017454 100644 --- a/pkgs/applications/networking/cisco-packet-tracer/8.nix +++ b/pkgs/applications/networking/cisco-packet-tracer/8.nix @@ -27,7 +27,7 @@ }: let - version = "8.0.1"; + version = "8.1.1"; ptFiles = stdenv.mkDerivation { name = "PacketTracer8Drv"; @@ -36,7 +36,7 @@ let dontUnpack = true; src = requireFile { name = "CiscoPacketTracer_${builtins.replaceStrings ["."] [""] version}_Ubuntu_64bit.deb"; - sha256 = "77a25351b016faed7c78959819c16c7013caa89c6b1872cb888cd96edd259140"; + sha256 = "08c53171aa0257a64ae7de1540f242214033cfa4f879fbc9fed5cc0d32232abf"; url = "https://www.netacad.com"; }; @@ -72,6 +72,7 @@ let libXrandr libXrender libXScrnSaver + libXtst xcbutilimage xcbutilkeysyms xcbutilrenderutil @@ -94,7 +95,7 @@ let desktopName = "Cisco Packet Tracer 8"; icon = "${ptFiles}/opt/pt/art/app.png"; exec = "packettracer8 %f"; - mimeType = "application/x-pkt;application/x-pka;application/x-pkz;"; + mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ]; }; fhs = buildFHSUserEnvBubblewrap { diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 4c99319fbbc4..e5a3fc2060e9 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "cloudflared"; - version = "2022.1.2"; + version = "2022.3.4"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-PdmYOFy6CWMqHlcK0PeHPGCVSLhIJOIDnXOAh/qYt+8="; + hash = "sha256-W3XA3AOzuyHlFCps2ne4Fh2X+E48inJT4QrDJLOeD5M="; }; vendorSha256 = null; @@ -18,9 +18,9 @@ buildGo117Module rec { ldflags = [ "-X main.Version=${version}" ]; meta = with lib; { - description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)"; - homepage = "https://www.cloudflare.com/products/argo-tunnel"; - license = licenses.unfree; + description = "CloudFlare Tunnel daemon (and DNS-over-HTTPS client)"; + homepage = "https://www.cloudflare.com/products/tunnel"; + license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ bbigras enorris thoughtpolice ]; }; diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/applications/networking/cluster/argo-rollouts/default.nix new file mode 100644 index 000000000000..deb61af1ae88 --- /dev/null +++ b/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -0,0 +1,27 @@ +{ buildGoModule, lib, fetchFromGitHub }: + +buildGoModule rec { + pname = "argo-rollouts"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "argoproj"; + repo = "argo-rollouts"; + rev = "v${version}"; + sha256 = "sha256-RgjoRvLsd+WHTpFy1WbJtrVaMnRp6/7A921+abCMGu0="; + }; + + vendorSha256 = "sha256-URuIeF1ejKdMGxziJbujLctYheiIr/Jfo+gTzppZG9E="; + + # Disable tests since some test fail because of missing test data + doCheck = false; + + subPackages = [ "cmd/rollouts-controller" "cmd/kubectl-argo-rollouts" ]; + + meta = with lib; { + description = "Kubernetes Progressive Delivery Controller"; + homepage = "https://github.com/argoproj/argo-rollouts/"; + license = licenses.asl20; + maintainers = with maintainers; [ psibi ]; + }; +} diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 766f9b9292c0..503952fa59ad 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -1,11 +1,11 @@ -{ lib, buildGoModule, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, buildGoPackage, fetchFromGitHub, installShellFiles, pkgsBuildBuild, stdenv }: let # Argo can package a static server in the CLI using the `staticfiles` go module. # We build the CLI without the static server for simplicity, but the tool is still required for # compilation to succeed. # See: https://github.com/argoproj/argo/blob/d7690e32faf2ac5842468831daf1443283703c25/Makefile#L117 - staticfiles = buildGoPackage rec { + staticfiles = pkgsBuildBuild.buildGoPackage rec { name = "staticfiles"; src = fetchFromGitHub { owner = "bouk"; @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.2.6"; + version = "3.3.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-QyjG+/zXbZ7AS/+yXNV0PocXJaSKeJNN+1F7EMv1LOI="; + sha256 = "sha256-BDHbbb3WqQvRJB1A4NInfvujjB3r/AMmVvos8i/CnyU="; }; - vendorSha256 = "sha256-hxSr0sNlz93JxOxnE2SnR6/OgCGK8DrJZxqQtSxfbj8="; + vendorSha256 = "sha256-YeSeaYOkNRjQgxsK9G7iPbVpfrPs4HRRFwfoUDxoCm0="; doCheck = false; @@ -54,7 +54,10 @@ buildGoModule rec { postInstall = '' for shell in bash zsh; do - $out/bin/argo completion $shell > argo.$shell + ${if (stdenv.buildPlatform == stdenv.hostPlatform) + then "$out/bin/argo" + else "${pkgsBuildBuild.argo}/bin/argo" + } completion $shell > argo.$shell installShellCompletion argo.$shell done ''; diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix new file mode 100644 index 000000000000..674db790f223 --- /dev/null +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "argocd-autopilot"; + version = "0.3.0"; + commit = "c8d17bef976649e4dc2428c14c39e30a0f846552"; + + src = fetchFromGitHub { + owner = "argoproj-labs"; + repo = "argocd-autopilot"; + rev = "v${version}"; + sha256 = "sha256-tggE1T+oD/dJS9tD9xOExjhy+T1GDd0vwTerD3P2KvA="; + }; + + vendorSha256 = "sha256-v8UMSObE6w+ULzueEK0UFeebLqoamy/788SQLBmJZ8U="; + + proxyVendor = true; + + ldflags = + let package_url = "github.com/argoproj-labs/argocd-autopilot/pkg/store"; in + [ + "-s" + "-w" + "-X ${package_url}.binaryName=${pname}" + "-X ${package_url}.version=${src.rev}" + "-X ${package_url}.buildDate=unknown" + "-X ${package_url}.gitCommit=${commit}" + "-X ${package_url}.installationManifestURL=github.com/argoproj-labs/argocd-autopilot/manifests/base?ref=${src.rev}" + "-X ${package_url}.installationManifestsNamespacedURL=github.com/argoproj-labs/argocd-autopilot/manifests/insecure?ref=${src.rev}" + ]; + + subPackages = [ "cmd" ]; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/argocd-autopilot version | grep ${src.rev} > /dev/null + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 "$GOPATH/bin/cmd" -T $out/bin/argocd-autopilot + + runHook postInstall + ''; + + meta = with lib; { + description = "ArgoCD Autopilot"; + downloadPage = "https://github.com/argoproj-labs/argocd-autopilot"; + homepage = "https://argocd-autopilot.readthedocs.io/en/stable/"; + license = licenses.asl20; + maintainers = with maintainers; [ sagikazarmark bryanasdev000 ]; + }; +} diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index a42c3380e69c..211c2ce211eb 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -1,26 +1,25 @@ -{ lib, buildGoModule, fetchFromGitHub, packr, makeWrapper, installShellFiles, helm, kustomize }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "argocd"; - version = "2.2.3"; - commit = "afbd59ba636cfd999fe6ead8a84323413882e230"; + version = "2.3.2"; tag = "v${version}"; + # Update commit to match the tag above + # TODO make updadeScript + commit = "ecc2af9dcaa12975e654cde8cbbeaffbb315f75c"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "sha256-Lw4/VmwD/IF2GEFzQP1kerXrST1kvWvG2nr/br/tO0w="; + sha256 = "sha256-n+C4l4U3cDU+fgCnGWOYLdyjknw7n/xPEtC1i8AaU4o="; }; - vendorSha256 = "sha256-BVhts+gOM6nhcR1lkFzy7OJnainLXw5YdeseBBRF2xE="; + vendorSha256 = "sha256-Km+1o6yuuxJs+DNTQ/XVTUFurD5gM5ohwDc7MwJuu5s="; - nativeBuildInputs = [ packr makeWrapper installShellFiles ]; - - # run packr to embed assets - preBuild = '' - packr - ''; + # Set target as ./cmd per release-cli + # https://github.com/argoproj/argo-cd/blob/master/Makefile#L222 + subPackages = [ "cmd" ]; ldflags = let package_url = "github.com/argoproj/argo-cd/v2/common"; in @@ -33,20 +32,7 @@ buildGoModule rec { "-X ${package_url}.gitTreeState=clean" ]; - # Test is disabled because ksonnet is missing from nixpkgs. - # Log: https://gist.github.com/superherointj/79cbdc869dfd44d28a10dc6746ecb3f9 - doCheck = false; - checkInputs = [ - helm - kustomize - #ksonnet - ]; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/argocd version --client | grep ${tag} > /dev/null - $out/bin/argocd-util version --client | grep ${tag} > /dev/null - ''; + nativeBuildInputs = [ installShellFiles ]; installPhase = '' runHook preInstall @@ -55,10 +41,12 @@ buildGoModule rec { runHook postInstall ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/argocd version --client | grep ${tag} > /dev/null + ''; + postInstall = '' - for appname in argocd-util argocd-server argocd-repo-server argocd-application-controller argocd-dex ; do - makeWrapper $out/bin/argocd $out/bin/$appname --set ARGOCD_BINARY_NAME $appname - done installShellCompletion --cmd argocd \ --bash <($out/bin/argocd completion bash) \ --zsh <($out/bin/argocd completion zsh) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index e7550ae837b2..e66343270cac 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -2,24 +2,22 @@ , stdenv , buildGoModule , fetchFromGitHub -, makeWrapper -, kubectl }: buildGoModule rec { pname = "arkade"; - version = "0.8.12"; + version = "0.8.16"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-OBcvJ1+VAE7jDeQ/I/9uc0wiU0iibeflRMmb+ulgDtQ="; + sha256 = "sha256-NiUv7yl1nA7a826FHDF+1MhYscXkQjUpxZo2ZWrL+VQ="; }; CGO_ENABLED = 0; - vendorSha256 = "05zdd5c2x4k4myxmgj32md8wq08i543l8q81rabqgyd3r9nwv4lx"; + vendorSha256 = "sha256-ipLVzBkliQSPBZTL5FU8xosTVjxFsUVlAvO0a0q+j2o="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ @@ -40,25 +38,10 @@ buildGoModule rec { "-X github.com/alexellis/arkade/cmd.Version=${version}" ]; - buildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram "$out/bin/arkade" \ - --prefix PATH : ${lib.makeBinPath [ kubectl ]} - ''; - meta = with lib; { homepage = "https://github.com/alexellis/arkade"; description = "Open Source Kubernetes Marketplace"; license = licenses.mit; maintainers = with maintainers; [ welteki ]; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - "aarch64-linux" - "aarch64-darwin" - "armv7l-linux" - "armv6l-linux" - ]; }; } diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index e03451f4f2fb..beedc41fa8ec 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "6.4.7"; + version = "6.4.17"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uLzYRfH2wJB/ucYtZGjKi0K5FaiP3CyA85gJ8Ji3WHE="; + sha256 = "sha256-oVL7tBtdFJt6ktctSZiNZMd6g1LEWQ/Hra4rcGM6BnQ="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index da9f0938d144..cf1ada47189f 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.9.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t4Im3/2qcKnDDcKWmUUa/lsZszDDlos+uTERKxd7x1c="; + sha256 = "sha256-1/WXpXZ6f4p4IZ/yropCjH3hHt+t5HGw0aq0HFk04mo="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index a4b49adb1e20..4667b130e8db 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.0.0"; + version = "8.3.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "00cwnfylra0msbb423ad21if98s6smzccsyidqsl4r2mrlkhahwm"; + sha256 = "sha256-tC9U0yvuMEwO4mzWyUC+v+/H0EzgwTu02waTQrx19Bs="; }; - vendorSha256 = "0fcgyyd11xfhn8i11bqnaw3h51bj1y8s37b4d8wzv31dr8zswqsc"; + vendorSha256 = "sha256-aXq92SI4cgJrmo67SEfg8YKPEpO2UW2fcYnKq9TmAQg="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index fdd0e4967a76..786615801baa 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.0.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-esSpCNvgYhuz9i22AU4ZowU5A5ZOPZ15+XHB4OOfTa4="; + sha256 = "sha256-0njXmYhZM4DXFeK9KboXnVw8uHdz4PFJ2aJxwhgyEc8="; }; - vendorSha256 = "sha256-VO1Z4NUWrd4JuFYFg0a01psqoIM8ps3vKd0djR5OELU="; + vendorSha256 = "sha256-JVRLPsfI1ITilAOkVIAa2IjjuAlJ2PCpvYEkhnTzRDA="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix new file mode 100644 index 000000000000..df34db0e1476 --- /dev/null +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -0,0 +1,38 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "cmctl"; + version = "1.7.2"; + + src = fetchFromGitHub { + owner = "cert-manager"; + repo = "cert-manager"; + rev = "v${version}"; + sha256 = "sha256-Hx6MG5GCZyOX0tfpg1bfUT0BOI3p7Mws1VCz2PuUuw8="; + }; + + vendorSha256 = "sha256-4zhdpedOmLl/i1G0QCto4ACxguWRZLzOm5HfMBMtvPY="; + + subPackages = [ "cmd/ctl" ]; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + mv $out/bin/ctl $out/bin/cmctl + installShellCompletion --cmd cmctl \ + --bash <($out/bin/cmctl completion bash) \ + --fish <($out/bin/cmctl completion fish) \ + --zsh <($out/bin/cmctl completion zsh) + ''; + + meta = with lib; { + description = "A CLI tool for managing Cert-Manager service on Kubernetes clusters"; + downloadPage = "https://github.com/cert-manager/cert-manager"; + license = licenses.asl20; + homepage = "https://cert-manager.io/"; + maintainers = with maintainers; [ superherointj ]; + }; +} + diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 14e7095c4b9e..aad583c675c0 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "sha256-zIL9KG1WL+DlgC5c+b9gV1i7mB0Ge8bapcuSV4GNIck="; + sha256 = "sha256-I9OmTO5obTwAj4hkecUfmRYR4Q3rdllMfbpESv66eEQ="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index 5243c4130f14..28dd421c72c5 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -1,56 +1,56 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "driftctl"; - version = "0.18.3"; + version = "0.25.0"; src = fetchFromGitHub { - owner = "cloudskiff"; + owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-JD3T0dCRg0UQlG0pWnI8RJZuRrIFfSMVHMoaEIymdWE="; + sha256 = "sha256-opR1NkMGptZilSPVZ7yNjYBBjnOXxrqAFCYzQ1tNS78="; }; - vendorSha256 = "sha256-g3+g+mPXEO2ZcVraKuVYZCMBD5zEr1l8ogcYt3r4UjU="; + vendorSha256 = "sha256-I0OCRhUvuaF4k5qqPaV6R24mrd9AG5GgQCCF6yodK0E="; - postUnpack = '' - # Without this, tests fail to locate aws/3.19.0.json - for prefix in / \ - /pkg \ - /pkg/analyser \ - /pkg/alerter \ - /pkg/remote \ - /pkg/middlewares \ - /pkg/cmd/scan/output \ - /pkg/iac/terraform/state \ - /pkg/iac/supplier ; do - mkdir -p ./source/$prefix/github.com/cloudskiff - ln -sf $PWD/source ./source/$prefix/github.com/cloudskiff/driftctl - done + nativeBuildInputs = [ installShellFiles ]; - # Disable check for latest version and telemetry, which are opt-out. - # Making it out-in is quite a job, and why bother? - find -name '*.go' \ - | xargs sed -i 's,https://2lvzgmrf2e.execute-api.eu-west-3.amazonaws.com/,https://0.0.0.0/,g' + ldflags = [ + "-s" + "-w" + "-X github.com/snyk/driftctl/pkg/version.version=v${version}" + "-X github.com/snyk/driftctl/build.env=release" + "-X github.com/snyk/driftctl/build.enableUsageReporting=false" + ]; - # and remove corresponding flags from --help, so things look tidy. - find -name driftctl.go | \ - xargs sed -i -e '/("no-version-check"/ d' -e '/("disable-telemetry"/ d' + postInstall = '' + installShellCompletion --cmd driftctl \ + --bash <($out/bin/driftctl completion bash) \ + --fish <($out/bin/driftctl completion fish) \ + --zsh <($out/bin/driftctl completion zsh) + ''; - # Presumably it can be done with ldflags, but I failed to find incantation - # that would work, we here we go old-school. - find -name version.go | xargs sed -i -e 's/"dev"/"${version}"/' - find -name build.go | xargs sed -i -e 's/"dev"/"release"/' + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck - # Fix the tests that checks for dev-dev. - find -name version_test.go | xargs sed -i -e 's/"dev-dev/"${version}/' - find -name driftctl_test.go | xargs sed -i -e 's/"dev-dev/"${version}/' + $out/bin/driftctl --help + $out/bin/driftctl version | grep "v${version}" + # check there's no telemetry flag + $out/bin/driftctl --help | grep -vz "telemetry" + + runHook postInstallCheck ''; meta = with lib; { - description = "Tool to track infrastructure drift"; - homepage = "https://github.com/cloudskiff/driftctl"; + homepage = "https://driftctl.com/"; + changelog = "https://github.com/snyk/driftctl/releases/tag/v${version}"; + description = "Detect, track and alert on infrastructure drift"; + longDescription = '' + driftctl is a free and open-source CLI that warns of infrastructure drift + and fills in the missing piece in your DevSecOps toolbox. + ''; license = licenses.asl20; - maintainers = with maintainers; [ kaction ]; + maintainers = with maintainers; [ kaction jk ]; }; } diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index 55f3e23ad6c3..b5250a3bd7fa 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "1.14.0"; + version = "1.14.3"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz"; - sha256 = "149b9ae774022acc0109dced893ca2d73430627a612be17ff12de8734464aff8"; + sha256 = "sha256-dst0Q1AlDdggtOwYROoV6QcBLRNfmGTo7DL2BV/5PB4="; }; nativeBuildInputs = [ makeWrapper ]; @@ -34,6 +34,5 @@ stdenv.mkDerivation rec { license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ mbode ]; - repositories.git = "git://git.apache.org/flink.git"; }; } diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 54eaf06e12fb..ff686314f0c4 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.24.1"; - sha256 = "18jzf5kd06c10f45y4crvaqa5r10dhq2ashlhppzrmhigiyavxac"; - manifestsSha256 = "0qbdik65irnwgw7klj5w0z00jxflm855gikpnqb9gsxd7rbw8ysk"; + version = "0.28.4"; + sha256 = "1b98hna3qhg7gzs5rqpkrxdvas7zjzavzmi9rzn9936rw88lpgx6"; + manifestsSha256 = "0k8hpkcnxw2w1pvdkvvmmqzrmsrrbij5f734iwh4n9fd326bqgwc"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-HoAVdY+kZLpUEl3mE7obbTzAJUyt5MBPjGhs6ZDSnzU="; + vendorSha256 = "sha256-IL9RjmMQahFZ04FXKxH6L2PHsOM1MJnqCJorRdr49FY="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index cb15d47e02d1..22e596dabf26 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.11"; + version = "0.6.17"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "sha256-mBPRsLBIwahKm2RR22pNXxJhdLaWHCKx0TKc4H4YIVY="; + sha256 = "sha256-u/YISLlZFYlAUejSlaH7POA2WwKURPN8phFU86/caXU="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix new file mode 100644 index 000000000000..a9b4441e00f9 --- /dev/null +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "glooctl"; + version = "1.10.10"; + + src = fetchFromGitHub { + owner = "solo-io"; + repo = "gloo"; + rev = "v${version}"; + hash = "sha256-Be0ejIQ3euKXX6wc1abXz8BphhrDnBMP0GzmnrF7C/4="; + }; + + subPackages = [ "projects/gloo/cli/cmd" ]; + vendorSha256 = "1s3s4n2wgi4azwkmg9zw2a3gz378nb1i41p3s8aixfbf6fsqc6ga"; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/glooctl + + export HOME=$TMP + installShellCompletion --cmd glooctl \ + --bash <($out/bin/glooctl completion bash) \ + --zsh <($out/bin/glooctl completion zsh) + ''; + + ldflags = [ "-s" "-w" "-X github.com/solo-io/gloo/pkg/version.Version=${version}" ]; + + meta = with lib; { + description = "glooctl is the unified CLI for Gloo"; + homepage = "https://docs.solo.io/gloo-edge/latest/reference/cli/glooctl/"; + license = licenses.asl20; + maintainers = with maintainers; [ nelsonjeppesen ]; + }; +} diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 0e8e652fbb30..adb46540cba7 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,29 +1,49 @@ -{ lib, stdenv, fetchurl, makeWrapper, autoPatchelfHook -, jdk8_headless, jdk11_headless -, bash, coreutils, which -, bzip2, cyrus_sasl , protobuf3_7, snappy, zlib, zstd +{ lib +, stdenv +, fetchurl +, makeWrapper +, autoPatchelfHook +, jdk8_headless +, jdk11_headless +, bash +, coreutils +, which +, bzip2 +, cyrus_sasl +, protobuf3_7 +, snappy +, zlib +, zstd , openssl +, glibc +, nixosTests }: with lib; +assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + let - common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl, nativeLibs ? [ ], libPatches ? "" }: + common = { pname, version, untarDir ? "${pname}-${version}", sha256, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }: stdenv.mkDerivation rec { inherit pname version jdk libPatches untarDir openssl; src = fetchurl { - url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}.tar.gz"; - inherit sha256; + url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; + sha256 = sha256.${stdenv.system}; }; + doCheck = true; nativeBuildInputs = [ makeWrapper ] - ++ optional (nativeLibs != [] || libPatches != "") [ autoPatchelfHook ]; + ++ optional (stdenv.isLinux && (nativeLibs != [ ] || libPatches != "")) [ autoPatchelfHook ]; buildInputs = [ openssl ] ++ nativeLibs; installPhase = '' mkdir -p $out/{lib/${untarDir}/conf,bin,lib} mv * $out/lib/${untarDir} - + '' + 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}\ @@ -34,6 +54,8 @@ let done '' + libPatches; + passthru = { inherit tests; }; + meta = { homepage = "https://hadoop.apache.org/"; description = "Framework for distributed processing of large data sets across clusters of computers"; @@ -51,9 +73,8 @@ let computers, each of which may be prone to failures. ''; maintainers = with maintainers; [ volth illustris ]; - platforms = [ "x86_64-linux" ]; + platforms = attrNames sha256; }; - }; in { @@ -62,8 +83,13 @@ in hadoop_3_3 = common rec { pname = "hadoop"; version = "3.3.1"; - sha256 = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd"; untarDir = "${pname}-${version}"; + sha256 = rec { + x86_64-linux = "1b3v16ihysqaxw8za1r5jlnphy8dwhivdx2d0z64309w57ihlxxd"; + x86_64-darwin = x86_64-linux; + aarch64-linux = "00ln18vpi07jq2slk3kplyhcj8ad41n0yl880q5cihilk7daclxz"; + aarch64-darwin = aarch64-linux; + }; jdk = jdk11_headless; inherit openssl; # TODO: Package and add Intel Storage Acceleration Library @@ -74,23 +100,28 @@ in 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 ''; + tests = nixosTests.hadoop; }; hadoop_3_2 = common rec { pname = "hadoop"; version = "3.2.2"; - sha256 = "1hxq297cqvkfgz2yfdiwa3l28g44i2abv5921k2d6b4pqd33prwp"; + sha256.x86_64-linux = "1hxq297cqvkfgz2yfdiwa3l28g44i2abv5921k2d6b4pqd33prwp"; jdk = jdk8_headless; # not using native libs because of broken openssl_1_0_2 dependency # can be manually overriden - openssl = null; + tests = nixosTests.hadoop_3_2; }; hadoop2 = common rec { pname = "hadoop"; version = "2.10.1"; - sha256 = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97"; + sha256.x86_64-linux = "1w31x4bk9f2swnx8qxx0cgwfg8vbpm6cy5lvfnbbpl3rsjhmyg97"; jdk = jdk8_headless; - openssl = null; + tests = nixosTests.hadoop2; }; } diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix index 2f6dcbe01446..127ee9c6895a 100644 --- a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix +++ b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chart-testing"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "helm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lXi778MTeVUBtepGjIkKAX1kDEaaVzQI1gTKfcpANC0="; + sha256 = "sha256-LNCzz5me60R/moFfdJhGMgUToFxADiPL02G4QCv0DLg="; }; - vendorSha256 = "sha256-pNevyTibnhUK8LSM1lVnmumFazXK86q4AZ2WKFt5jok="; + vendorSha256 = "sha256-38ufXHzGlZgEh6swD/GhWbIYdY5uYznKCQ9OaoyOEiY="; postPatch = '' substituteInPlace pkg/config/config.go \ diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 59d4a4ff7cee..408f1bd3ed8a 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,22 +2,23 @@ buildGoModule rec { pname = "helm"; - version = "3.7.2"; - gitCommit = "663a896f4a815053445eec4153677ddc24a0a361"; + version = "3.8.1"; + gitCommit = "5cb9af4b1b271d11d7a97a71df3ac337dd94ad37"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-MhBuwpgF1PBAZ5QwF7t4J1gqam2cMX+hkdZs7KoSD6I="; + sha256 = "sha256-AjNrn46l9gVC7MtGF59QWv+l6qYn+jzopsZtM/2faXY="; }; - vendorSha256 = "sha256-YDdpeVh9rG3MF1HgG7uuRvjXDr9Fcjuhrj16kpK8tsI="; + vendorSha256 = "sha256-ffbp7J8XDxo/s79pjoiDVbft0pr/lJpuJuKiMpQwkT0="; doCheck = false; subPackages = [ "cmd/helm" ]; ldflags = [ - "-w" "-s" + "-w" + "-s" "-X helm.sh/helm/v3/internal/version.version=v${version}" "-X helm.sh/helm/v3/internal/version.gitCommit=${gitCommit}" ]; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 1fde5343d29d..b4c4fde53ed5 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.143.0"; + version = "0.143.3"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-3Kuj3umyD7fooa4alNJAm7Adu+7EQvoB7Gt/LRjgW94="; + sha256 = "sha256-A0xpXsMWUaJYTzo9O4KkdyjonSGZ+FylTK140pqnJX8="; }; - vendorSha256 = "sha256-/MbKYPcZ7cOPQKT+nYQaaCiahKLcesrSVKNo8hKFlf0="; + vendorSha256 = "sha256-qolmWat7An4HFm4O5vSCYZe+w79nsRIrnBLJacUCeA4="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index 4f9de00dcf25..e01f9c14a182 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-KZrv447Yz4WxtkmQkGLsnZC0ok0rWCM2Fs+m8LVTGfM="; + sha256 = "sha256-njo5LlowlgWFK5G2lpgi7hdxtnSs8f5cT0oHI7bJxNc="; }; - vendorSha256 = "sha256-4imZrZfpR/5tw9ZFSTr7Gx4G9O1iHNE9YRYMOJFKvHU="; + vendorSha256 = "sha256-F+b4EXAxa4+O6yepx+9eRrdq294ZcQ+sODFUCKYpSuo="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 02ed9b96f546..da633af2b8f7 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.12.2"; + version = "1.13.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-6eVFyGVvOUr5RA5jeavKcLJedv4jOGXAg3aa4N3cNx8="; + sha256 = "sha256-7YtszdwauTz9LfZ77d13fDU6vQm5hiJrIOiqpqIginQ="; }; - vendorSha256 = "sha256-ie7XRu+2+NmhMNtJEL2OgZH6wuTPJX9O2+cZBnI04JA="; + vendorSha256 = "sha256-AOcWkcw+2DcgBxvxRO/sdb339a7hmI7Oy5I4kW4oE+k="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 689922515de5..256d7e642255 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-Fk1aYSa3LqzxiHtlzH5pcNtodOprjfnCFh4UMqCa6Rc="; }; - vendorSha256 = "sha256-N4cU9wzBRZn71mZHkNDXKgSXvlN2QFS6K4MtlR25DJc="; + vendorSha256 = "sha256-21C6wZ8lKQnbUg3aD0ZFVOgopblXyWk4WP/ubZVk3Yk="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 34fe2bfb9d02..fa355b65131a 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -5,9 +5,11 @@ , iptables , iproute2 , bridge-utils +, btrfs-progs , conntrack-tools -, buildGoPackage +, buildGoModule , runc +, rsync , kmod , libseccomp , pkg-config @@ -18,6 +20,7 @@ , fetchzip , fetchgit , zstd +, yq-go , nixosTests }: @@ -43,27 +46,59 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.22.3+k3s1"; # k3s git tag - k3sCommit = "61a2aab25eeb97c26fa3f2b177e4355a7654c991"; # k3s git commit at the above version - k3sRepoSha256 = "0lz5hr3c86gxm9w5jy3g26n6a26m8k0y559hv6220rsi709j7ma9"; + k3sVersion = "1.23.4+k3s1"; # k3s git tag + k3sCommit = "43b1cb48200d8f6af85c16ed944d68fcc96b6506"; # k3s git commit at the above version + k3sRepoSha256 = "1sn7rd5hqfqvwj036blk0skmq6r8igbmiqk1dnpaqnkkddpzdgmc"; + k3sVendorSha256 = "sha256-1/kQvNqFUWwch1JH+twWzBdjNYseoZyVObB1+s9WPM4="; - traefikChartVersion = "10.3.0"; # taken from ./manifests/traefik.yaml at spec.version - traefikChartSha256 = "0y6wr64xp7bgx24kqil0x6myr3pnfrg8rw0d1h5zd2n5a8nfd73f"; + k3sServerVendorSha256 = "sha256-2KIFff43jfqWdxX61aWofrjmc5mMkr5aEJRFdGpLyU8="; - k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION - k3sRootSha256 = "0r2cj4l50cxkrvszpzxfk36lvbjf9vcmp6d5lvxg8qsah8lki3x8"; + # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 + # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. + traefikChartVersion = "10.14.1"; + traefikChartSha256 = "09a6cialx7nrh7nwi1gkkh8zcsasxcgb52dyx0r8bjq9ng29simj"; - k3sCNIVersion = "0.9.1-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS - k3sCNISha256 = "1327vmfph7b8i14q05c2xdfzk60caflg1zhycx0mrf3d59f4zsz5"; + # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 + k3sRootVersion = "0.11.0"; + k3sRootSha256 = "016n56vi09xkvjph7wgzb2m86mhd5x65fs4d11pmh20hl249r620"; + + # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 + k3sCNIVersion = "1.0.1-k3s1"; + k3sCNISha256 = "11ihlzzdnqf9p21y0a4ckpbxac016nm7746dcykhj26ym9zxyv92"; + + # taken from go.mod, the 'github.com/containerd/containerd' line + # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` + containerdVersion = "1.5.9-k3s1"; + containerdSha256 = "09wfy20z3c9fnla353pibpsb10xzl0f4xwp8qdjh3fwa1q2626gg"; + + # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag + criCtlVersion = "1.22.0-k3s1"; baseMeta = { description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank ]; + maintainers = with maintainers; [ euank mic92 superherointj ]; platforms = platforms.linux; }; + # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40 + versionldflags = [ + "-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}" + "-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}" + "-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitTreeState=clean" + "-X k8s.io/client-go/pkg/version.buildDate=1970-01-01T01:01:01Z" + "-X k8s.io/component-base/version.gitVersion=v${k3sVersion}" + "-X k8s.io/component-base/version.gitCommit=${k3sCommit}" + "-X k8s.io/component-base/version.gitTreeState=clean" + "-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z" + "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=v${criCtlVersion}" + "-X github.com/containerd/containerd/version.Version=v${containerdVersion}" + "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" + ]; + # bundled into the k3s binary traefikChart = fetchurl { url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; @@ -84,11 +119,11 @@ let sha256 = k3sRootSha256; stripRoot = false; }; - k3sPlugins = buildGoPackage rec { - name = "k3s-cni-plugins"; + k3sCNIPlugins = buildGoModule rec { + pname = "k3s-cni-plugins"; version = k3sCNIVersion; + vendorSha256 = null; - goPackagePath = "github.com/containernetworking/plugins"; subPackages = [ "." ]; src = fetchFromGitHub { @@ -98,6 +133,10 @@ let sha256 = k3sCNISha256; }; + postInstall = '' + mv $out/bin/plugins $out/bin/cni + ''; + meta = baseMeta // { description = "CNI plugins, as patched by rancher for k3s"; }; @@ -124,50 +163,39 @@ let # Then, we bundle those binaries into our thick k3s binary and use that as # the final single output. # This approach was chosen because it ensures the bundled binaries all are - # correctly built to run with nix (we can lean on the existing buildGoPackage + # correctly built to run with nix (we can lean on the existing buildGoModule # stuff), and we can again lean on that tooling for the final k3s binary too. # Other alternatives would be to manually run the # strip/patchelf/remove-references step ourselves in the installPhase of the # derivation when we've built all the binaries, but haven't bundled them in # with generated bindata yet. - k3sBuildStage1 = buildGoPackage rec { - name = "k3s-build-1"; + + k3sServer = buildGoModule rec { + pname = "k3s-server"; version = k3sVersion; - goPackagePath = "github.com/rancher/k3s"; - src = k3sRepo; - - # Patch build scripts so that we can use them. - # This makes things more dynamically linked (because nix can deal with - # dynamically linked dependencies just fine), removes the upload at the - # end, and skips building runc + cni, since we have our own derivations for - # those. - patches = [ ./patches/0002-Add-nixpkgs-patches.patch ]; + vendorSha256 = k3sServerVendorSha256; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp ]; - # Versioning info for build script - DRONE_TAG = "v${version}"; - DRONE_COMMIT = k3sCommit; - - buildPhase = '' - pushd go/src/${goPackagePath} - - patchShebangs ./scripts/build ./scripts/version.sh - mkdir -p bin - ./scripts/build - - popd - ''; - - installPhase = '' - pushd go/src/${goPackagePath} - - mkdir -p "$out/bin" - install -m 0755 -t "$out/bin" ./bin/* + subPackages = [ "cmd/server" ]; + ldflags = versionldflags; + # create the multicall symlinks for k3s + postInstall = '' + mv $out/bin/server $out/bin/k3s + pushd $out + # taken verbatim from https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/build#L105-L113 + ln -s k3s ./bin/k3s-agent + ln -s k3s ./bin/k3s-server + ln -s k3s ./bin/k3s-etcd-snapshot + ln -s k3s ./bin/k3s-secrets-encrypt + ln -s k3s ./bin/k3s-certificate + ln -s k3s ./bin/kubectl + ln -s k3s ./bin/crictl + ln -s k3s ./bin/ctr popd ''; @@ -175,76 +203,33 @@ let description = "The various binaries that get packaged into the final k3s binary"; }; }; - k3sBin = buildGoPackage rec { - name = "k3s-bin"; - version = k3sVersion; - - goPackagePath = "github.com/rancher/k3s"; - - src = k3sRepo; - - # See the above comment in k3sBuildStage1 - patches = [ ./patches/0002-Add-nixpkgs-patches.patch ]; - - nativeBuildInputs = [ pkg-config zstd ]; - # These dependencies are embedded as compressed files in k3s at runtime. - # Propagate them to avoid broken runtime references to libraries. - propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ]; - - # k3s appends a suffix to the final distribution binary for some arches - archSuffix = - if stdenv.hostPlatform.system == "x86_64-linux" then "" - else if stdenv.hostPlatform.system == "aarch64-linux" then "-arm64" - else throw "k3s isn't being built for ${stdenv.hostPlatform.system} yet."; - - DRONE_TAG = "v${version}"; - DRONE_COMMIT = k3sCommit; - - # In order to build the thick k3s binary (which is what - # ./scripts/package-cli does), we need to get all the binaries that script - # expects in place. - buildPhase = '' - pushd go/src/${goPackagePath} - - patchShebangs ./scripts/build ./scripts/version.sh ./scripts/package-cli - - mkdir -p bin - - install -m 0755 -t ./bin ${k3sBuildStage1}/bin/* - install -m 0755 -T "${k3sPlugins}/bin/plugins" ./bin/cni - # Note: use the already-nixpkgs-bundled k3s rather than the one bundled - # in k3s because the k3s one is completely unmodified from upstream - # (unlike containerd, cni, etc) - install -m 0755 -T "${runc}/bin/runc" ./bin/runc - cp -R "${k3sRoot}/etc" ./etc - mkdir -p "build/static/charts" - cp "${traefikChart}" "build/static/charts/traefik-${traefikChartVersion}.tgz" - - ./scripts/package-cli - - popd - ''; - - installPhase = '' - pushd go/src/${goPackagePath} - - mkdir -p "$out/bin" - install -m 0755 -T ./dist/artifacts/k3s${archSuffix} "$out/bin/k3s" - - popd - ''; - - meta = baseMeta // { - description = "The k3s go binary which is used by the final wrapped output below"; + k3sContainerd = buildGoModule { + pname = "k3s-containerd"; + version = containerdVersion; + src = fetchFromGitHub { + owner = "k3s-io"; + repo = "containerd"; + rev = "v${containerdVersion}"; + sha256 = containerdSha256; }; + vendorSha256 = null; + buildInputs = [ btrfs-progs ]; + subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; + ldflags = versionldflags; }; in -stdenv.mkDerivation rec { +buildGoModule rec { pname = "k3s"; version = k3sVersion; - # `src` here is a workaround for the updateScript bot. It couldn't be empty. - src = builtins.filterSource (path: type: false) ./.; + src = k3sRepo; + proxyVendor = true; + vendorSha256 = k3sVendorSha256; + + patches = [ + ./patches/0001-scrips-download-strip-downloading-just-package-CRD.patch + ./patches/0002-Don-t-build-a-static-binary-in-package-cli.patch + ]; # Important utilities used by the kubelet, see # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 @@ -260,32 +245,68 @@ stdenv.mkDerivation rec { conntrack-tools ]; - buildInputs = [ - k3sBin - ] ++ k3sRuntimeDeps; + buildInputs = k3sRuntimeDeps; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + rsync + yq-go + zstd + ]; - unpackPhase = "true"; + # embedded in the final k3s cli + propagatedBuildInputs = [ + k3sCNIPlugins + k3sContainerd + k3sServer + runc + ]; + + # We override most of buildPhase due to peculiarities in k3s's build. + # Specifically, it has a 'go generate' which runs part of the package. See + # this comment: + # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 + # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + buildPhase = '' + patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload + + # copy needed 'go generate' inputs into place + mkdir -p ./bin/aux + rsync -a --no-perms ${k3sServer}/bin/ ./bin/ + ln -vsf ${runc}/bin/runc ./bin/runc + ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni + ln -vsf ${k3sContainerd}/bin/* ./bin/ + rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/ + mkdir -p ./build/static/charts + # Note, upstream's chart has a 00 suffix. This seems to not matter though, so we're ignoring that naming detail. + export TRAEFIK_CHART_FILE=${traefikChart} + # place the traefik chart using their code since it's complicated + # We trim the actual download, see patches + ./scripts/download + + export ARCH=$GOARCH + export DRONE_TAG="v${k3sVersion}" + export DRONE_COMMIT="${k3sCommit}" + # use ./scripts/package-cli to run 'go generate' + 'go build' + + ./scripts/package-cli + mkdir -p $out/bin + ''; + + # Otherwise it depends on 'getGoDirs', which is normally set in buildPhase + doCheck = false; - # And, one final derivation (you thought the last one was it, right?) - # We got the binary we wanted above, but it doesn't have all the runtime - # dependencies k8s wants, including mount utilities for kubelet, networking - # tools for cni/kubelet stuff, etc - # Use a wrapper script to reference all the binaries that k3s tries to - # execute, but that we didn't bundle with it. installPhase = '' - runHook preInstall - mkdir -p "$out/bin" - makeWrapper ${k3sBin}/bin/k3s "$out/bin/k3s" \ + # wildcard to match the arm64 build too + install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s + wrapProgram $out/bin/k3s \ --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ --prefix PATH : "$out/bin" - runHook postInstall ''; doInstallCheck = true; installCheckPhase = '' - $out/bin/k3s --version | grep v${k3sVersion} > /dev/null + $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null ''; passthru.updateScript = ./update.sh; diff --git a/pkgs/applications/networking/cluster/k3s/patches/0001-scrips-download-strip-downloading-just-package-CRD.patch b/pkgs/applications/networking/cluster/k3s/patches/0001-scrips-download-strip-downloading-just-package-CRD.patch new file mode 100644 index 000000000000..115fd6824772 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/patches/0001-scrips-download-strip-downloading-just-package-CRD.patch @@ -0,0 +1,41 @@ +From 6f53bd36a40da4c71486e3b79f6e32d53d6eea5d Mon Sep 17 00:00:00 2001 +From: Euan Kemp +Date: Thu, 3 Feb 2022 23:50:40 -0800 +Subject: [PATCH 2/2] scrips/download: strip downloading, just package CRD + +The CRD packaging is a complicated set of commands, so let's reuse it. +--- + scripts/download | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/scripts/download b/scripts/download +index 5effc0562a..82361803ee 100755 +--- a/scripts/download ++++ b/scripts/download +@@ -24,12 +24,6 @@ rm -rf ${CONTAINERD_DIR} + mkdir -p ${CHARTS_DIR} + mkdir -p ${DATA_DIR} + +-curl --compressed -sfL https://github.com/k3s-io/k3s-root/releases/download/${VERSION_ROOT}/k3s-root-${ARCH}.tar | tar xf - --exclude=bin/socat +- +-git clone --single-branch --branch=${VERSION_RUNC} --depth=1 https://github.com/opencontainers/runc ${RUNC_DIR} +- +-git clone --single-branch --branch=${VERSION_CONTAINERD} --depth=1 https://github.com/k3s-io/containerd ${CONTAINERD_DIR} +- + setup_tmp() { + TMP_DIR=$(mktemp -d --tmpdir=${CHARTS_DIR}) + cleanup() { +@@ -44,8 +38,8 @@ setup_tmp() { + + download_and_package_traefik () { + echo "Downloading Traefik Helm chart from ${TRAEFIK_URL}" +- curl -sfL ${TRAEFIK_URL} -o ${TMP_DIR}/${TRAEFIK_FILE} +- code=$? ++ # nixpkgs: copy in our known traefik chart instead ++ cp $TRAEFIK_CHART_FILE ${TMP_DIR}/${TRAEFIK_FILE} + + if [ $code -ne 0 ]; then + echo "Error: Failed to download Traefik Helm chart!" +-- +2.34.1 + diff --git a/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch b/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch deleted file mode 100644 index dd26810a4563..000000000000 --- a/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch +++ /dev/null @@ -1,81 +0,0 @@ --Subject: [PATCH 2/2] Add nixpkgs patches --Original patch by: Euan Kemp --Adapted by: superherointj -- --This patch allows us to re-use upstream build scripts when building for nix. ----- -- 2 files changed: -- scripts/build -- scripts/package-cli -- -diff --git a/scripts/build b/scripts/build -index 2f3d1dc496..4f4e5aa897 100755 ---- a/scripts/build -+++ b/scripts/build -@@ -12,7 +12,8 @@ PKG_CONTAINERD="github.com/containerd/containerd" - PKG_K3S_CONTAINERD="github.com/k3s-io/containerd" - PKG_CRICTL="github.com/kubernetes-sigs/cri-tools" - --buildDate=$(date -u '+%Y-%m-%dT%H:%M:%SZ') -+# nixpkgs: deterministic build date -+buildDate="$(date -d "$(git log -1 --format=%ai)" -u "+%Y-%m-%dT%H:%M:%SZ")" - - VENDOR_PREFIX="${PKG}/vendor/" - VERSIONFLAGS=" -@@ -89,17 +90,7 @@ cleanup() { - } - - INSTALLBIN=$(pwd)/bin --if [ ! -x ${INSTALLBIN}/cni ]; then --( -- echo Building cni -- TMPDIR=$(mktemp -d) -- trap cleanup EXIT -- WORKDIR=$TMPDIR/src/github.com/containernetworking/plugins -- git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR -- cd $WORKDIR -- GOPATH=$TMPDIR CGO_ENABLED=0 "${GO}" build -tags "$TAGS" -ldflags "$LDFLAGS $STATIC" -o $INSTALLBIN/cni --) --fi -+# nixpkgs: skip building cni, we build it separately - # echo Building agent - # CGO_ENABLED=1 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/k3s-agent ./cmd/agent/main.go - echo Building server -@@ -116,10 +107,7 @@ ln -s containerd ./bin/ctr - #CGO_ENABLED=1 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC_SQLITE" -o bin/ctr ./cmd/ctr/main.go - # echo Building containerd - # CGO_ENABLED=0 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/containerd ./cmd/containerd/ --echo Building runc --rm -f ./build/src/github.com/opencontainers/runc/runc --make GOPATH=$(pwd)/build EXTRA_LDFLAGS="-w -s" BUILDTAGS="$RUNC_TAGS" -C ./build/src/github.com/opencontainers/runc $RUNC_STATIC --cp -f ./build/src/github.com/opencontainers/runc/runc ./bin/runc -+# nixpkgs: we build runc separately - - echo Building containerd-shim - rm -f ./vendor/github.com/containerd/containerd/bin/containerd-shim -diff --git a/scripts/package-cli b/scripts/package-cli -index ab4a6dac63..044b5587d0 100755 ---- a/scripts/package-cli -+++ b/scripts/package-cli -@@ -50,15 +50,17 @@ fi - - CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX} - --"${GO}" generate -+CGO_ENABLED=0 env -u GOARCH "${GO}" generate - LDFLAGS=" - -X github.com/rancher/k3s/pkg/version.Version=$VERSION - -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8} - -w -s - " --STATIC="-extldflags '-static'" --CGO_ENABLED=0 "${GO}" build -ldflags "$LDFLAGS $STATIC" -o ${CMD_NAME} ./cmd/k3s/main.go -+# STATIC="-extldflags '-static'" -+# nixpkgs: we can depend on dynamic linking because we have a good package manager -+"${GO}" build -ldflags "$LDFLAGS" -o ${CMD_NAME} ./cmd/k3s/main.go - - stat ${CMD_NAME} - --./scripts/build-upload ${CMD_NAME} ${COMMIT} -+# nixpkgs: skip uploading -+# ./scripts/build-upload ${CMD_NAME} ${COMMIT} diff --git a/pkgs/applications/networking/cluster/k3s/patches/0002-Don-t-build-a-static-binary-in-package-cli.patch b/pkgs/applications/networking/cluster/k3s/patches/0002-Don-t-build-a-static-binary-in-package-cli.patch new file mode 100644 index 000000000000..886b6ec7409b --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/patches/0002-Don-t-build-a-static-binary-in-package-cli.patch @@ -0,0 +1,37 @@ +From 49c000c7c5dd7a502a2be4c638d2c32b65673c00 Mon Sep 17 00:00:00 2001 +From: Euan Kemp +Date: Sun, 6 Feb 2022 23:13:00 -0800 +Subject: [PATCH] Don't build a static binary in package-cli + +since nixpkgs prefers dynamically linked binaries. + +Also remove "trimpath" for the 'go generate' step because the codegen +they use doesn't work with trimpath set. +--- + scripts/package-cli | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/scripts/package-cli b/scripts/package-cli +index 28927327b7..95dbb469f1 100755 +--- a/scripts/package-cli ++++ b/scripts/package-cli +@@ -48,14 +48,13 @@ fi + + CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX} + +-"${GO}" generate ++GOFLAGS="" "${GO}" generate + LDFLAGS=" + -X github.com/rancher/k3s/pkg/version.Version=$VERSION + -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8} + -w -s + " +-STATIC="-extldflags '-static'" +-CGO_ENABLED=0 "${GO}" build -ldflags "$LDFLAGS $STATIC" -o ${CMD_NAME} ./cmd/k3s/main.go ++CGO_ENABLED=0 "${GO}" build -ldflags "$LDFLAGS" -o ${CMD_NAME} ./cmd/k3s/main.go + + stat ${CMD_NAME} + +-- +2.34.1 + diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index 01b3434b5bae..8f199bf9cc0c 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -1,12 +1,14 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnugrep gnused jq +#!nix-shell -i bash -p curl gnugrep gnused jq yq-go nix-prefetch set -x -eu -o pipefail WORKDIR=$(mktemp -d) trap "rm -rf ${WORKDIR}" EXIT -cd $(dirname "${BASH_SOURCE[0]}") +NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/ +NIXPKGS_K3S_FOLDER=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ +cd ${NIXPKGS_K3S_FOLDER} LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ @@ -32,22 +34,33 @@ curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts FILE_MANIFESTS_TRAEFIK=${WORKDIR}/manifests-traefik.yaml curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/manifests/traefik.yaml > $FILE_MANIFESTS_TRAEFIK -TRAEFIK_CHART_VERSION=$(awk -F/ '/traefik-([[:digit:]]+\.)/ {sub(/traefik-/, "", $6) ; sub(/\.tgz/, "", $6); print $6}' $FILE_MANIFESTS_TRAEFIK) +FILE_GO_MOD=${WORKDIR}/go.mod +curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/go.mod > $FILE_GO_MOD +TRAEFIK_CHART_VERSION=$(yq e '.spec.chart' $FILE_MANIFESTS_TRAEFIK | awk 'match($0, /([0-9.]+)([0-9]{2})/, +m) { print m[1]; exit; }') TRAEFIK_CHART_SHA256=$(nix-prefetch-url --quiet "https://helm.traefik.io/traefik/traefik-${TRAEFIK_CHART_VERSION}.tgz") -K3S_ROOT_VERSION=$(grep 'ROOT_VERSION=' ${FILE_SCRIPTS_DOWNLOAD} \ - | cut -d'=' -f2 | cut -d' ' -f1 | sed 's/^v//') +K3S_ROOT_VERSION=$(grep 'VERSION_ROOT=' ${FILE_SCRIPTS_VERSION} \ + | cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \ "https://github.com/k3s-io/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar") CNIPLUGINS_VERSION=$(grep 'VERSION_CNIPLUGINS=' ${FILE_SCRIPTS_VERSION} \ - | cut -d'=' -f2 | cut -d' ' -f1 | sed -e 's/"//g' -e 's/^v//') + | cut -d'=' -f2 | sed -e 's/"//g' -e 's/^v//') CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \ "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz") +CONTAINERD_VERSION=$(grep github.com/containerd/containerd ${FILE_GO_MOD} \ + | head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//') +CONTAINERD_SHA256=$(nix-prefetch-url --quiet --unpack \ + "https://github.com/k3s-io/containerd/archive/refs/tags/v${CONTAINERD_VERSION}.tar.gz") + +CRI_CTL_VERSION=$(grep github.com/kubernetes-sigs/cri-tools ${FILE_GO_MOD} \ + | head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//') + setKV () { - sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_FOLDER}default.nix } setKV k3sVersion ${K3S_VERSION} @@ -62,3 +75,32 @@ setKV k3sRootSha256 ${K3S_ROOT_SHA256} setKV k3sCNIVersion ${CNIPLUGINS_VERSION} setKV k3sCNISha256 ${CNIPLUGINS_SHA256} + +setKV containerdVersion ${CONTAINERD_VERSION} +setKV containerdSha256 ${CONTAINERD_SHA256} + +setKV criCtlVersion ${CRI_CTL_VERSION} + +setKV k3sServerVendorSha256 "0000000000000000000000000000000000000000000000000000" + +set +e +K3S_SERVER_VENDOR_SHA256=$(nix-build ${NIXPKGS_ROOT} --no-out-link -A k3s 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') +set -e + +if [ -n "${K3S_SERVER_VENDOR_SHA256:-}" ]; then + setKV k3sServerVendorSha256 ${K3S_SERVER_VENDOR_SHA256} +else + echo "Update failed. K3S_SERVER_VENDOR_SHA256 is empty." + exit 1 +fi + +set +e +K3S_VENDOR_SHA256=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} "{ sha256 }: (import ${NIXPKGS_ROOT}. {}).k3s.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })") +set -e + +if [ -n "${K3S_VENDOR_SHA256:-}" ]; then + setKV k3sVendorSha256 ${K3S_VENDOR_SHA256} +else + echo "Update failed. K3S_VENDOR_SHA256 is empty." + exit 1 +fi diff --git a/pkgs/applications/networking/cluster/k3sup/default.nix b/pkgs/applications/networking/cluster/k3sup/default.nix new file mode 100644 index 000000000000..befec62fbc50 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3sup/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, bash +, openssh +}: + +buildGoModule rec { + pname = "k3sup"; + version = "0.11.3"; + + src = fetchFromGitHub { + owner = "alexellis"; + repo = "k3sup"; + rev = version; + sha256 = "sha256-6WYUmC2uVHFGLsfkA2EUOWmmo1dSKJzI4MEdRnlLgYY="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + vendorSha256 = "sha256-Pd+BgPWoxf1AhP0o5SgFSvy4LyUQB7peKWJk0BMy7ds="; + + postConfigure = '' + substituteInPlace vendor/github.com/alexellis/go-execute/pkg/v1/exec.go \ + --replace "/bin/bash" "${bash}/bin/bash" + ''; + + CGO_ENABLED = 0; + + ldflags = [ + "-s" "-w" + "-X github.com/alexellis/k3sup/cmd.GitCommit=ref/tags/${version}" + "-X github.com/alexellis/k3sup/cmd.Version=${version}" + ]; + + postInstall = '' + wrapProgram "$out/bin/k3sup" \ + --prefix PATH : ${lib.makeBinPath [ openssh ]} + ''; + + meta = with lib; { + homepage = "https://github.com/alexellis/k3sup"; + description = "Bootstrap Kubernetes with k3s over SSH"; + license = licenses.mit; + maintainers = with maintainers; [ welteki ]; + }; +} diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 27514303a15f..48236cdc25e2 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "k9s"; @@ -17,11 +17,12 @@ buildGoModule rec { "-X github.com/derailed/k9s/cmd.commit=${src.rev}" ]; - vendorSha256 = "sha256-jWZ1N1A8VECBQvkXyuzMUkI4u2NLr5/gSvJUfK5VgzM="; + vendorSha256 = "sha256-mMob7M9RQlqaVK0DgHpaAK9d1btzfQetnliUqFTvjJQ="; preCheck = "export HOME=$(mktemp -d)"; - doCheck = true; + # TODO investigate why some config tests are failing + doCheck = !(stdenv.isDarwin && stdenv.isAarch64); meta = with lib; { description = "Kubernetes CLI To Manage Your Clusters In Style"; diff --git a/pkgs/applications/networking/cluster/kconf/default.nix b/pkgs/applications/networking/cluster/kconf/default.nix index 683a91ffee85..e549c8f09fb0 100644 --- a/pkgs/applications/networking/cluster/kconf/default.nix +++ b/pkgs/applications/networking/cluster/kconf/default.nix @@ -2,16 +2,20 @@ buildGoModule rec { pname = "kconf"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "particledecay"; repo = "kconf"; rev = "v${version}"; - sha256 = "NlTpHQFOJJcIt/xMT3fvdrlxANyg//wtYMmXzEtaFXo="; + sha256 = "sha256-V+B1vqI/MLASqEy6DZiB71h7EkUfrxVKIMxriRK6pyY="; }; - vendorSha256 = "2d4o87wE9QZltk2YOHc20XVYF8n0EOrDf5mJ6i6EB0c="; + vendorSha256 = "sha256-Fq3V3vYaofB0TWt3t7uW1Dd7MlwMvh8RaRVpdq9XZh4="; + + ldflags = [ + "-s" "-w" "-X github.com/particledecay/kconf/build.Version=${version}" + ]; meta = with lib; { description = "An opinionated command line tool for managing multiple kubeconfigs"; diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index 796429f2a999..93ccd873f777 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.1.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-lRQ4IXV+q1idoTyhppJGlzjuUuRykP8DtQ3t/CsxhNw="; + sha256 = "sha256-xpSnirdEZ/Cua/wicu62HzeDm0E8Xo/Jt2eMfUS7mDo="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix index 87ae71f6a48d..10c161f45d05 100644 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -20,7 +20,6 @@ buildGoPackage rec { license = licenses.gpl3; maintainers = with maintainers; [ mbode tazjin ]; platforms = platforms.unix; - repositories.git = "git://github.com/tazjin/kontemplate.git"; longDescription = '' Kontemplate is a simple CLI tool that can take sets of diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index b7a7ab3c5d96..da8e14d1f307 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -43,7 +43,7 @@ let homepage = "https://github.com/kubernetes/kops"; changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases"; license = licenses.asl20; - maintainers = with maintainers; [ offline zimbatm diegolelis ]; + maintainers = with maintainers; [ offline zimbatm diegolelis yurrriq ]; platforms = platforms.unix; }; } // attrs'; @@ -52,12 +52,6 @@ rec { mkKops = generic; - kops_1_20 = mkKops rec { - version = "1.20.3"; - sha256 = "sha256-Yrh0wFz7MQgTDwENqQouYh3pr1gOq64Rqft5yxIiCAo="; - rev = "v${version}"; - }; - kops_1_21 = mkKops rec { version = "1.21.4"; sha256 = "sha256-f2xOVa3N/GH5IoI6H/QwDdKTeQoF/kEHX6lNytCZ9cs="; @@ -65,8 +59,14 @@ rec { }; kops_1_22 = mkKops rec { - version = "1.22.2"; - sha256 = "sha256-9LT4/iwlPFiz+hUHE0y8DK8T9xwL9HkrrFUXrEqKbM8="; + version = "1.22.4"; + sha256 = "sha256-osU7yI77ZALGrAGuP8qAgv+ogDRn+BSVmcjPbi/WEKE="; + rev = "v${version}"; + }; + + kops_1_23 = mkKops rec { + version = "1.23.0"; + sha256 = "sha256-tiVNUaW0an6C8M9bxEX5pvB/W5IjZ/S24RdPikzm3bc="; rev = "v${version}"; }; } diff --git a/pkgs/applications/networking/cluster/krane/default.nix b/pkgs/applications/networking/cluster/krane/default.nix index 6d325d6f592e..cc9d19fd8152 100644 --- a/pkgs/applications/networking/cluster/krane/default.nix +++ b/pkgs/applications/networking/cluster/krane/default.nix @@ -1,7 +1,5 @@ { lib , bundlerApp -, makeWrapper -, kubectl , bundlerUpdateScript }: @@ -10,13 +8,6 @@ bundlerApp { gemdir = ./.; exes = [ "krane" ]; - buildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram "$out/bin/krane" \ - --prefix PATH : ${lib.makeBinPath [ kubectl ]} - ''; - passthru.updateScript = bundlerUpdateScript "krane"; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/krelay/default.nix b/pkgs/applications/networking/cluster/krelay/default.nix new file mode 100644 index 000000000000..f0a9912ab914 --- /dev/null +++ b/pkgs/applications/networking/cluster/krelay/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "krelay"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "knight42"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7P+pGiML/1aZEpYAWtAPEhrBAo8e8ATcemrH8tD73w8="; + }; + + vendorSha256 = "sha256-PrL3GYP5K6ZaSAShwuDQA7WfOVJeQraxZ8jrtnajR9g="; + + subPackages = [ "cmd/client" ]; + + ldflags = [ "-s" "-w" "-X github.com/knight42/krelay/pkg/constants.ClientVersion=${version}" ]; + + postInstall = '' + mv $out/bin/client $out/bin/kubectl-relay + ''; + + meta = with lib; { + description = "A better alternative to `kubectl port-forward` that can forward TCP or UDP traffic to IP/Host which is accessible inside the cluster."; + homepage = "https://github.com/knight42/krelay"; + changelog = "https://github.com/knight42/krelay/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ivankovnatsky ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index 596a71251b2d..c7d14748e80f 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-capacity"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "robscott"; repo = pname; - sha256 = "sha256-jop1dn+D0A6BkR1UCMrU9qcbZ1AHVth430cTd+kUYJw="; + sha256 = "sha256-+1qewL8N3WTS7GW6fpL2+RPbFQQ/3DDMgShtBi+lRtg="; }; - vendorSha256 = "sha256-1D+nQ6WrHwJwcszCvoZ08SHX0anksdI69Jra5b9jPCY="; + vendorSha256 = "sha256-sMobdarMMktf34LbQnyZ6sgbfiJhWxWSQR0F+4x5J58="; meta = with lib; { description = diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/applications/networking/cluster/kube-score/default.nix index 6ef24ded1a67..c1383e8688d1 100644 --- a/pkgs/applications/networking/cluster/kube-score/default.nix +++ b/pkgs/applications/networking/cluster/kube-score/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-score"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "zegl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QAtsXNmR+Sg9xmvP7x6b2jAJkUcL/sMYk8i5CSzjVos="; + sha256 = "sha256-6/+S1aj2qoUPz+6+8Z4Z5dpfyOi/DnrLLUpPgBn/OxU="; }; - vendorSha256 = "sha256-kPYvkovzQDmoB67TZHCKZ5jtW6pN3gHxBPKAU8prbgo="; + vendorSha256 = "sha256-0Zi62FmX4rFl3os2ehtussSSUPJtxLq7622CEdeKZCs="; meta = with lib; { description = "Kubernetes object analysis with recommendations for improved reliability and security"; diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index 0e4dc8f560fd..0da63fae4215 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube3d"; - version = "5.2.2"; + version = "5.3.0"; src = fetchFromGitHub { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-yOrxEY2UpupVmbDSAhgruTUOhNVAGCpSJsvzDEFFccw="; + sha256 = "sha256-ZuUjk1wb7iRZX+OpjLJHp1T0WYNjCHU6DpYF4V/heVc="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index 02c1c834781a..1b1089f655cf 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - sha256 = "sha256-V/g2RHnZPa/9hkVG5WVXmbx6hnJAwUEyyUX/Q3OR2DM="; + sha256 = "sha256-xLeS0vfYuLEdzuou67ViduaBf62+Yqk+scaCCK+Xetk="; }; - vendorSha256 = "sha256-bTCLuAo5xXNoafjGpjKLKlKVKB29PEFwdPu9+qjvufs="; + vendorSha256 = "sha256-zE/y9FAoUZBmWiUMWbc66CwkK0h7SEXzfZY3KkjtQ0A="; subPackages = ["cmd"]; diff --git a/pkgs/applications/networking/cluster/kubecolor/default.nix b/pkgs/applications/networking/cluster/kubecolor/default.nix index 8a3c2d12d1b9..a295a48a1920 100644 --- a/pkgs/applications/networking/cluster/kubecolor/default.nix +++ b/pkgs/applications/networking/cluster/kubecolor/default.nix @@ -13,11 +13,13 @@ buildGoModule rec { vendorSha256 = "sha256-C1K7iEugA4HBLthcOI7EZ6H4YHW6el8X6FjVN1BeJR0="; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; + meta = with lib; { description = "Colorizes kubectl output"; homepage = "https://github.com/hidetatz/kubecolor"; changelog = "https://github.com/hidetatz/kubecolor/releases/tag/v${version}"; license = licenses.mit; - maintainers = [ maintainers.ivankovnatsky ]; + maintainers = with maintainers; [ ivankovnatsky SuperSandro2000 ]; }; } diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix index 29a8388bd5cc..07d15feddda5 100644 --- a/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.4.12"; + version = "0.4.13"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-03eGWuDV/GS2YgDQ7LaqonU7K/ohI8sQD4dXbJGXeXw="; + sha256 = "sha256-hKsGti04pUZj02uzah7ccImmg/qn31ceVfk11aTa9rk="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix index 5d056907264d..5e78cc9b72bd 100644 --- a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-doctor"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "emirozer"; repo = pname; rev = version; - sha256 = "0x784jbcwd34vzdnhg2yldh5ivkxvs2qlbsvaammbxkn04ch1ijz"; + sha256 = "sha256-yp5OfSDxIASiCgISUVNxfe3dsLukgIoHARVPALIaQfY="; }; - vendorSha256 = "04xq5kp1m7c98gb4fd0dni258vpfnhv535gl2qllfcp2mvk3mn55"; + vendorSha256 = "sha256-pdg65q7iMkcpFvSVUTa07m5URLQNNEfWQ4mdGu4suBM="; postInstall = '' mv $out/bin/{cmd,kubectl-doctor} diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index ee6a241a2304..8bfa519dee36 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-b5LbA2qEsEA7J0djEMhDeBY9iV1cvGVtxTlmneQGKYY="; + sha256 = "sha256-hRLju3nVLy0eDgqGeReHaF8p7oOlpo1T0IbLq4h/uwg="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix index ce1974fe2148..953a202170a5 100644 --- a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "kubelogin"; - version = "1.25.0"; + version = "1.25.1"; src = fetchFromGitHub { owner = "int128"; repo = pname; rev = "v${version}"; - sha256 = "sha256-orclZtmkdplTRvYkN7VotbynSQ9L2kvAPqP20j8QJ2s="; + sha256 = "sha256-BKJ6dZMGW+Md+YUEEgWtPdfiFiOP5Nfb+awx8FXB+bM="; }; subPackages = ["."]; - vendorSha256 = "sha256-i46G0lsRvh/PmM+pMYuAjoLMHWF1Uzbd8+EkjIId8KE="; + vendorSha256 = "sha256-mu4NHeYZBM4C5qpj2wRTLsRNLDvZGNkppKGDw621mp4="; # Rename the binary instead of symlinking to avoid conflict with the # Azure version of kubelogin diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index d5f04c14d572..d2ad103eee9c 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YLYyU3k3I74ZuczFZBwcJoJSfCR4B9Z1EbFupA+xkiE="; + sha256 = "sha256-+u+75Z2Efaq16g7kGNq1GHavXwtKvNO6dytniUr8mlE="; }; vendorSha256 = "sha256-vJfTf9gD/qrsPAfJeMYLjGa90mYLOshgDehv2Fcl6xM="; diff --git a/pkgs/applications/networking/cluster/kubemqctl/default.nix b/pkgs/applications/networking/cluster/kubemqctl/default.nix new file mode 100644 index 000000000000..a5ad1ea0a773 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubemqctl/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubemqctl"; + version = "3.5.1"; + src = fetchFromGitHub { + owner = "kubemq-io"; + repo = pname; + rev = "v${version}"; + sha256 = "0daqvd1y6b87xvnpdl2k0sa91zdmp48r0pgp6dvnb2l44ml8a4z0"; + }; + + ldflags = [ "-w" "-s" "-X main.version=${version}" ]; + + doCheck = false; # TODO tests are failing + + vendorSha256 = "1agn6i7cnsb5igvvbjzlaa5fgssr5h7h25y440q44bk16jxk6s74"; + + meta = { + homepage = "https://github.com/kubemq-io/kubemqctl"; + description = "Kubemqctl is a command line interface (CLI) for Kubemq Kubernetes Message Broker."; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ brianmcgee ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kubent/default.nix b/pkgs/applications/networking/cluster/kubent/default.nix new file mode 100644 index 000000000000..79c0fdf2186a --- /dev/null +++ b/pkgs/applications/networking/cluster/kubent/default.nix @@ -0,0 +1,29 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubent"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "doitintl"; + repo = "kube-no-trouble"; + rev = "${version}"; + sha256 = "0pwb9g1hhfqn3rl87fg6sf07m7aviadljb05bbnd241hhlcyslv6"; + }; + + vendorSha256 = "1z4cvk936l7011fbimsgpw89yqzyikw9jb4184l37mnj9hl5wpcp"; + + ldflags = [ + "-w" "-s" + "-X main.version=v${version}" + ]; + + subPackages = [ "cmd/kubent" ]; + + meta = with lib; { + homepage = "https://github.com/doitintl/kube-no-trouble"; + description = "Easily check your cluster for use of deprecated APIs"; + license = licenses.mit; + maintainers = with maintainers; [ peterromfeldhk ]; + }; +} diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 2b9ca9df0494..e08a3b46d156 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - sha256 = "sha256-IgV1ULxwL17ECsm7MdRfQERcEVy9cEft2L7fHP3XCKo="; + sha256 = "sha256-uij5daVHKIfxx+8UTmU/HKSbf/RTRFuO8mCQdsC80qI="; }; - vendorSha256 = "sha256-/rhV7JHuqejCTizcjKIkaJlbRcx7AfMcGqQYo6dlg48="; + vendorSha256 = "sha256-kI5i1us3Ooh603HOz9Y+HlfPUy/1J8z89/jvKEenpLw="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/applications/networking/cluster/kubergrunt/default.nix index 4e945e456409..32130ee96d28 100644 --- a/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.7.11"; + version = "0.8.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "1224ssqdz9ak0vylyfbr9c2w0yfdp4hw9jh99qmfi2j5nhw9kzcc"; + sha256 = "sha256-K94cGU+cFHOrAGXjHQFFFJYhZi9zNfdlGy5eb2DkcV8="; }; vendorSha256 = "sha256-95rteSEMOBQnAw0QKuj5Yyi8n3xXGl0Tm97WiyTGxVw="; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 069b57a6b5e3..e4203f0028ad 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,12 +1,12 @@ { stdenv , lib , fetchFromGitHub -, removeReferencesTo , which , go , makeWrapper , rsync , installShellFiles +, kubectl , nixosTests , components ? [ @@ -21,16 +21,16 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.22.6"; + version = "1.23.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-NL00GOdkVLVHTlj1RK1+stssioy+0xbtiKn4FZnCuzs="; + sha256 = "sha256-LhJ3gThcsWnawSOmHSzWOG8tfODIPo4dJTMeLKmvMdM="; }; - nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; + nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ]; outputs = [ "out" "man" "pause" ]; @@ -51,12 +51,10 @@ stdenv.mkDerivation rec { WHAT = lib.concatStringsSep " " ([ "cmd/kubeadm" - "cmd/kubectl" ] ++ components); postBuild = '' ./hack/update-generated-docs.sh - (cd build/pause/linux && cc pause.c -o pause) ''; installPhase = '' @@ -65,9 +63,14 @@ stdenv.mkDerivation rec { install -D _output/local/go/bin/''${p##*/} -t $out/bin done - install -D build/pause/linux/pause -t $pause/bin + cc build/pause/linux/pause.c -o pause + install -D pause -t $pause/bin + + rm docs/man/man1/kubectl* installManPage docs/man/man1/*.[1-9] + ln -s ${kubectl}/bin/kubectl $out/bin/kubectl + # Unfortunately, kube-addons-main.sh only looks for the lib file in either the # current working dir or in /opt. We have to patch this for now. substitute cluster/addons/addon-manager/kube-addons-main.sh $out/bin/kube-addons \ @@ -79,24 +82,22 @@ stdenv.mkDerivation rec { cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons-lib.sh - for tool in kubeadm kubectl; do - installShellCompletion --cmd $tool \ - --bash <($out/bin/$tool completion bash) \ - --zsh <($out/bin/$tool completion zsh) - done + installShellCompletion --cmd kubeadm \ + --bash <($out/bin/kubeadm completion bash) \ + --zsh <($out/bin/kubeadm completion zsh) runHook postInstall ''; - preFixup = '' - find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' + - ''; + disallowedReferences = [ go ]; + + GOFLAGS = [ "-trimpath" ]; meta = with lib; { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; homepage = "https://kubernetes.io"; maintainers = with maintainers; [ ] ++ teams.kubernetes.members; - platforms = platforms.unix; + platforms = platforms.linux; }; passthru.tests = nixosTests.kubernetes; diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix index fec93d8878e0..b1c15458543d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix +++ b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix @@ -1,29 +1,37 @@ -{ stdenv, kubernetes, installShellFiles }: +{ lib, stdenv, kubernetes }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "kubectl"; - version = kubernetes.version; - # kubectl is currently part of the main distribution but will eventially be - # split out (see homepage) - dontUnpack = true; - - nativeBuildInputs = [ installShellFiles ]; + inherit (kubernetes) + disallowedReferences + GOFLAGS + nativeBuildInputs + postBuild + postPatch + src + version + ; outputs = [ "out" "man" ]; - installPhase = '' - install -D ${kubernetes}/bin/kubectl -t $out/bin + WHAT = "cmd/kubectl"; - installManPage "${kubernetes.man}/share/man/man1"/kubectl* + installPhase = '' + runHook preInstall + install -D _output/local/go/bin/kubectl -t $out/bin + + installManPage docs/man/man1/kubectl* installShellCompletion --cmd kubectl \ --bash <($out/bin/kubectl completion bash) \ --zsh <($out/bin/kubectl completion zsh) + runHook postInstall ''; meta = kubernetes.meta // { description = "Kubernetes CLI"; homepage = "https://github.com/kubernetes/kubectl"; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index d7a58f09b4e7..b6d1ac477596 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -16,15 +16,15 @@ buildGoModule rec { inherit pname ; - version = "1.4.0"; + version = "1.4.1"; tags = lib.optionals enableGateway ["gateway"]; - vendorSha256 = "1fc5psvbd9bpc6c3y2cpx5dx8cgr2fcp7nln3kwfgbryahq2y8wl"; + vendorSha256 = "sha256-9v+ti/JTAF4TLZ0uvzFvrB0YBnRD2E0Q6K2yicEX3Zw="; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - sha256 = "0agib3w5s270n5rhg54m3p4f21s5fhdrhaks374j7l21njs7xhqb"; + sha256 = "sha256-zx4rohkv6jm2abtd0I/uQMITkCuhY3StHMKoaTxce0Q="; }; doCheck = false; diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix index a2f13fdf9cdb..66c507312c26 100644 --- a/pkgs/applications/networking/cluster/lens/default.nix +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -2,21 +2,22 @@ let pname = "lens"; - version = "5.2.6"; - build = "${version}-latest.20211104.1"; + version = "5.3.4"; + build = "${version}-latest.20220120.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage"; - sha256 = "1lkxzgwrgafraimpnciv89fs6r399275vb73drxlg5z83acacf5z"; - name="${pname}.AppImage"; + sha256 = "sha256-9vRLQFSocVkHAfgwdKSPhSAO4G/v/ANd0WQmilcZiVw="; + name = "${pname}.AppImage"; }; appimageContents = appimageTools.extractType2 { inherit name src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit name src; profile = '' diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 0af651246e5e..74b5578d0239 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "21.10.3"; - sha256 = "09k4c0dgn9vvgp6xb20x0vylk6bbd03srk3sra8vnpywwi591mcv"; - vendorSha256 = "sha256-J/+YFXHC6UTyhln2ZDEq/EyqMEP9XcNC4GRuJjGEY3g="; + version = "22.2.4"; + sha256 = "1s53zlb7f0xp2vqa5fnsjdhjq203bsksrmdbrxkkm1yi3nc3p369"; + vendorSha256 = "sha256-cN19kKa4Ieweta95/4bKlAYn/Bq8j27H408za3OoJoI="; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 9b40f636bcb8..d4a9ba4af7d3 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.25.1"; + version = "1.25.2"; - vendorSha256 = "sha256-MnyXePsnhb1Tl76uAtVW/DLacE0etXREGsapgNiZbMo="; + vendorSha256 = "sha256-8QqRIWry15/xwBxEOexMEq57ol8riy+kW8WrQqr53Q8="; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-pRNOVN9u27im9fkUawJYjuGHTW0N7L5oJa3fQ6DUO+4="; + sha256 = "sha256-WIk4ibq7jcqao0Qiz3mz9yfHdxTUlvtPuEh4gApSDBg="; }; nativeBuildInputs = [ installShellFiles pkg-config which ]; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 14a3675797ed..936e76823489 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.16.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZnSDL1a4I3e7z2w5MdG6tFZH0PT4jCYX34f+mOmO0oA="; + sha256 = "sha256-gkfy/tKzh6EO+nyjuiU3InSErKvGcJp/X7oqYk0Msr0="; }; - vendorSha256 = "sha256-S0WRLln80pdGWCe6ub3bMZ6G2PbXwvCEGDDzez+nF9E="; + vendorSha256 = "sha256-hjhZYNpqt9yFNrDVpFlguESUAAqU+AhpUQTCvyMadPk="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 047a472c3984..1f08aad53e4e 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -18,6 +18,8 @@ let nixops = super.nixops.overridePythonAttrs ( old: { + version = "${old.version}-pre-${lib.substring 0 7 super.nixops.src.rev or "dirty"}"; + postPatch = '' substituteInPlace nixops/args.py --subst-var version ''; diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index 5a121cbd3ec8..27c496905e5e 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -5,8 +5,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops.git"; - rev = "0c989d79c9052ebf52f12964131f4fc31ac20a18"; - sha256 = "07jz9grq3hjn1g9xybln5phbjhn2zsldcnan3lal6syzjggja6v1"; + rev = "7220cbdc8a1cf2db5b3ad75b525faf145a5560a3"; + sha256 = "199cw25cvjb8gxs56nc8ilq7v4560c6vgi1sh1vqrsqxayq1g4cs"; }; } ); @@ -15,8 +15,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops-aws.git"; - rev = "83900880a413218020ddd91d6cd3f5b823acb3fb"; - sha256 = "17gf4vfcl1vx81y9vk26zzcj6kac41kfhzwcx15cj91ivqrgn3b2"; + rev = "bc9de10b77aa74c9b245fd533f829e4307b984e8"; + sha256 = "12qsaxwlk67q04g13sqs4bxscpjspip5yphx6d8rq3iqki8yg4z9"; }; } ); @@ -74,9 +74,9 @@ self: super: { nixops-virtd = super.nixops-virtd.overridePythonAttrs ( _: { src = pkgs.fetchgit { - url = "https://github.com/nix-community/nixops-libvirtd.git"; - rev = "1245280d97e0adc4643d02d1cf62ddd582c73e49"; - sha256 = "1z3zsx54585rcyabj6hrbwbd1c783rrlfj53np1sa3i7m93vmxzc"; + url = "https://github.com/lovesegfault/nixops-libvirtd.git"; + rev = "84d1688ee06afff136738b3eaf51f9cc3c08c350"; + sha256 = "1f3q9bwmdjr3qac7fh9b9hgw7l43hmiixbsmqm2zrnhb7xcyfmfg"; }; } ); diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock index e0118fe79298..fa17d4286b34 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -8,14 +8,14 @@ python-versions = "*" [[package]] name = "apache-libcloud" -version = "3.4.1" +version = "3.5.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" category = "main" optional = false -python-versions = ">=3.5, <4" +python-versions = ">=3.6, <4" [package.dependencies] -requests = ">=2.5.0" +requests = ">=2.26.0" [[package]] name = "babel" @@ -38,14 +38,14 @@ python-versions = "*" [[package]] name = "boto3" -version = "1.20.20" +version = "1.21.18" description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.23.20,<1.24.0" +botocore = ">=1.24.18,<1.25.0" jmespath = ">=0.7.1,<1.0.0" s3transfer = ">=0.5.0,<0.6.0" @@ -54,7 +54,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.23.20" +version = "1.24.18" description = "Low-level, data-driven core of boto 3." category = "main" optional = false @@ -89,7 +89,7 @@ pycparser = "*" [[package]] name = "charset-normalizer" -version = "2.0.9" +version = "2.0.12" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -181,7 +181,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "jsonpickle" -version = "2.0.0" +version = "2.1.0" description = "Python library for serializing any arbitrary object graph into JSON" category = "main" optional = false @@ -189,12 +189,12 @@ python-versions = ">=2.7" [package.extras] docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] -testing = ["coverage (<5)", "pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov", "ecdsa", "feedparser", "numpy", "pandas", "pymongo", "sklearn", "sqlalchemy", "enum34", "jsonlib"] +testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-black-multipy", "pytest-cov", "ecdsa", "feedparser", "numpy", "pandas", "pymongo", "scikit-learn", "sqlalchemy", "enum34", "jsonlib"] "testing.libs" = ["demjson", "simplejson", "ujson", "yajl"] [[package]] name = "libvirt-python" -version = "7.10.0" +version = "8.1.0" description = "The libvirt virtualization API python binding" category = "main" optional = false @@ -202,11 +202,11 @@ python-versions = "*" [[package]] name = "markupsafe" -version = "2.0.1" +version = "2.1.0" description = "Safely add untrusted strings to HTML/XML markup." category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" [[package]] name = "nixops" @@ -227,7 +227,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops.git" reference = "master" -resolved_reference = "0c989d79c9052ebf52f12964131f4fc31ac20a18" +resolved_reference = "7220cbdc8a1cf2db5b3ad75b525faf145a5560a3" [[package]] name = "nixops-aws" @@ -249,7 +249,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops-aws.git" reference = "master" -resolved_reference = "83900880a413218020ddd91d6cd3f5b823acb3fb" +resolved_reference = "bc9de10b77aa74c9b245fd533f829e4307b984e8" [[package]] name = "nixops-digitalocean" @@ -358,14 +358,14 @@ python-versions = "^3.7" develop = false [package.dependencies] -libvirt-python = "^7.0" +libvirt-python = "^8.0" nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"} [package.source] type = "git" -url = "https://github.com/nix-community/nixops-libvirtd.git" -reference = "master" -resolved_reference = "1245280d97e0adc4643d02d1cf62ddd582c73e49" +url = "https://github.com/lovesegfault/nixops-libvirtd.git" +reference = "update-libvirt" +resolved_reference = "84d1688ee06afff136738b3eaf51f9cc3c08c350" [[package]] name = "nixopsvbox" @@ -443,7 +443,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "pygments" -version = "2.10.0" +version = "2.11.2" description = "Pygments is a syntax highlighting package written in Python." category = "dev" optional = false @@ -451,7 +451,7 @@ python-versions = ">=3.5" [[package]] name = "pyparsing" -version = "3.0.6" +version = "3.0.7" description = "Python parsing module" category = "dev" optional = false @@ -493,7 +493,7 @@ python-versions = "*" [[package]] name = "requests" -version = "2.26.0" +version = "2.27.1" description = "Python HTTP for Humans." category = "main" optional = false @@ -511,7 +511,7 @@ use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "s3transfer" -version = "0.5.0" +version = "0.5.2" description = "An Amazon S3 Transfer Manager" category = "main" optional = false @@ -643,7 +643,7 @@ test = ["pytest"] [[package]] name = "typeguard" -version = "2.13.2" +version = "2.13.3" description = "Run-time type checker for Python" category = "main" optional = false @@ -663,7 +663,7 @@ python-versions = "*" [[package]] name = "urllib3" -version = "1.26.7" +version = "1.26.8" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false @@ -677,7 +677,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [metadata] lock-version = "1.1" python-versions = "^3.8" -content-hash = "e75c6429aa8989659a345f903e2e67d87514b5864751e33890d90aa2d20ef3e2" +content-hash = "63b68a38ca6f7b9189d2403c2c6d1ec7af29cc1ccdeab2fbc970b5dbd766c3c6" [metadata.files] alabaster = [ @@ -685,8 +685,8 @@ alabaster = [ {file = "alabaster-0.7.12.tar.gz", hash = "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"}, ] apache-libcloud = [ - {file = "apache-libcloud-3.4.1.tar.gz", hash = "sha256:88f18da0cf3fac0af723e743fb741d9d1be251881edab7a5a0d1629955b5011b"}, - {file = "apache_libcloud-3.4.1-py2.py3-none-any.whl", hash = "sha256:af1a5b3cda7bc3220093726ff67dbb70928521e2ec19d0e33a31b1e22fde1850"}, + {file = "apache-libcloud-3.5.0.tar.gz", hash = "sha256:073f10492976faa383a22b13b82c249827cfe90a083c71620e8316e815a6db3b"}, + {file = "apache_libcloud-3.5.0-py2.py3-none-any.whl", hash = "sha256:3789f4f2464fe18e317cdd3a03eff363268e096bc47f1f5770ee82d6ffe28c40"}, ] babel = [ {file = "Babel-2.9.1-py2.py3-none-any.whl", hash = "sha256:ab49e12b91d937cd11f0b67cb259a57ab4ad2b59ac7a3b41d6c06c0ac5b0def9"}, @@ -697,12 +697,12 @@ boto = [ {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, ] boto3 = [ - {file = "boto3-1.20.20-py3-none-any.whl", hash = "sha256:6c173ffaf0604e34d6865edf7a9a71e1b3e79bd441b8b465ca4b2d44f840806d"}, - {file = "boto3-1.20.20.tar.gz", hash = "sha256:2c5377b6ab74eeccccd16f0f21537ede87b05c8322b0ccc852a68f36ea6c16c9"}, + {file = "boto3-1.21.18-py3-none-any.whl", hash = "sha256:d857feb6af9932e1ee3a748060a2cd9fd6043dbbccf66976eda54586597efdc0"}, + {file = "boto3-1.21.18.tar.gz", hash = "sha256:8d6f3c548f0ee03d742f404c96515e7579fc6968135aaa50dd855a046698ff79"}, ] botocore = [ - {file = "botocore-1.23.20-py3-none-any.whl", hash = "sha256:98275e47c941cada6507089ecfe91e420972209b1deeceaf55a89ea50d046347"}, - {file = "botocore-1.23.20.tar.gz", hash = "sha256:22e1c7b4b2b8b11d7001ca5ef2b41bda9a8be46fb3cb994a2948462666ac5ef1"}, + {file = "botocore-1.24.18-py3-none-any.whl", hash = "sha256:7ea8ef1ff7c4882ab59b337662f90ddf5ea860e95e7e209dca593a34ea585b1b"}, + {file = "botocore-1.24.18.tar.gz", hash = "sha256:d2da7ccbc5ddd61fe3cd45fcbd3de380d9e3a15bfa8fbfd2d9259a93dcc60c56"}, ] certifi = [ {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, @@ -761,8 +761,8 @@ cffi = [ {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.9.tar.gz", hash = "sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c"}, - {file = "charset_normalizer-2.0.9-py3-none-any.whl", hash = "sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721"}, + {file = "charset-normalizer-2.0.12.tar.gz", hash = "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597"}, + {file = "charset_normalizer-2.0.12-py3-none-any.whl", hash = "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, @@ -813,82 +813,53 @@ jmespath = [ {file = "jmespath-0.10.0.tar.gz", hash = "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"}, ] jsonpickle = [ - {file = "jsonpickle-2.0.0-py2.py3-none-any.whl", hash = "sha256:c1010994c1fbda87a48f8a56698605b598cb0fc6bb7e7927559fc1100e69aeac"}, - {file = "jsonpickle-2.0.0.tar.gz", hash = "sha256:0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a"}, + {file = "jsonpickle-2.1.0-py2.py3-none-any.whl", hash = "sha256:1dee77ddc5d652dfdabc33d33cff9d7e131d428007007da4fd6f7071ae774b0f"}, + {file = "jsonpickle-2.1.0.tar.gz", hash = "sha256:84684cfc5338a534173c8dd69809e40f2865d0be1f8a2b7af8465e5b968dcfa9"}, ] libvirt-python = [ - {file = "libvirt-python-7.10.0.tar.gz", hash = "sha256:267774bbdf99d47515274542880499437dc94ae291771f5663c62020a62da975"}, + {file = "libvirt-python-8.1.0.tar.gz", hash = "sha256:a21ecfab6d29ac1bdd1bfd4aa3ef58447f9f70919aefecd03774613f65914e43"}, ] markupsafe = [ - {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"}, - {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"}, - {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"}, - {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"}, - {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"}, - {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"}, - {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3028252424c72b2602a323f70fbf50aa80a5d3aa616ea6add4ba21ae9cc9da4c"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:290b02bab3c9e216da57c1d11d2ba73a9f73a614bbdcc027d299a60cdfabb11a"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6e104c0c2b4cd765b4e83909cde7ec61a1e313f8a75775897db321450e928cce"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24c3be29abb6b34052fd26fc7a8e0a49b1ee9d282e3665e8ad09a0a68faee5b3"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:204730fd5fe2fe3b1e9ccadb2bd18ba8712b111dcabce185af0b3b5285a7c989"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d3b64c65328cb4cd252c94f83e66e3d7acf8891e60ebf588d7b493a55a1dbf26"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:96de1932237abe0a13ba68b63e94113678c379dca45afa040a17b6e1ad7ed076"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75bb36f134883fdbe13d8e63b8675f5f12b80bb6627f7714c7d6c5becf22719f"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-win32.whl", hash = "sha256:4056f752015dfa9828dce3140dbadd543b555afb3252507348c493def166d454"}, + {file = "MarkupSafe-2.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:d4e702eea4a2903441f2735799d217f4ac1b55f7d8ad96ab7d4e25417cb0827c"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:f0eddfcabd6936558ec020130f932d479930581171368fd728efcfb6ef0dd357"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5ddea4c352a488b5e1069069f2f501006b1a4362cb906bee9a193ef1245a7a61"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:09c86c9643cceb1d87ca08cdc30160d1b7ab49a8a21564868921959bd16441b8"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a0a0abef2ca47b33fb615b491ce31b055ef2430de52c5b3fb19a4042dbc5cadb"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:736895a020e31b428b3382a7887bfea96102c529530299f426bf2e636aacec9e"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:679cbb78914ab212c49c67ba2c7396dc599a8479de51b9a87b174700abd9ea49"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:84ad5e29bf8bab3ad70fd707d3c05524862bddc54dc040982b0dbcff36481de7"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-win32.whl", hash = "sha256:8da5924cb1f9064589767b0f3fc39d03e3d0fb5aa29e0cb21d43106519bd624a"}, + {file = "MarkupSafe-2.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:454ffc1cbb75227d15667c09f164a0099159da0c1f3d2636aa648f12675491ad"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:142119fb14a1ef6d758912b25c4e803c3ff66920635c44078666fe7cc3f8f759"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b2a5a856019d2833c56a3dcac1b80fe795c95f401818ea963594b345929dffa7"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1d1fb9b2eec3c9714dd936860850300b51dbaa37404209c8d4cb66547884b7ed"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:62c0285e91414f5c8f621a17b69fc0088394ccdaa961ef469e833dbff64bd5ea"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fc3150f85e2dbcf99e65238c842d1cfe69d3e7649b19864c1cc043213d9cd730"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f02cf7221d5cd915d7fa58ab64f7ee6dd0f6cddbb48683debf5d04ae9b1c2cc1"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:d5653619b3eb5cbd35bfba3c12d575db2a74d15e0e1c08bf1db788069d410ce8"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:7d2f5d97fcbd004c03df8d8fe2b973fe2b14e7bfeb2cfa012eaa8759ce9a762f"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-win32.whl", hash = "sha256:3cace1837bc84e63b3fd2dfce37f08f8c18aeb81ef5cf6bb9b51f625cb4e6cd8"}, + {file = "MarkupSafe-2.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:fabbe18087c3d33c5824cb145ffca52eccd053061df1d79d4b66dafa5ad2a5ea"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:023af8c54fe63530545f70dd2a2a7eed18d07a9a77b94e8bf1e2ff7f252db9a3"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d66624f04de4af8bbf1c7f21cc06649c1c69a7f84109179add573ce35e46d448"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c532d5ab79be0199fa2658e24a02fce8542df196e60665dd322409a03db6a52c"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e67ec74fada3841b8c5f4c4f197bea916025cb9aa3fe5abf7d52b655d042f956"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:30c653fde75a6e5eb814d2a0a89378f83d1d3f502ab710904ee585c38888816c"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:961eb86e5be7d0973789f30ebcf6caab60b844203f4396ece27310295a6082c7"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:598b65d74615c021423bd45c2bc5e9b59539c875a9bdb7e5f2a6b92dfcfc268d"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:599941da468f2cf22bf90a84f6e2a65524e87be2fce844f96f2dd9a6c9d1e635"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-win32.whl", hash = "sha256:e6f7f3f41faffaea6596da86ecc2389672fa949bd035251eab26dc6697451d05"}, + {file = "MarkupSafe-2.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:b8811d48078d1cf2a6863dafb896e68406c5f513048451cd2ded0473133473c7"}, + {file = "MarkupSafe-2.1.0.tar.gz", hash = "sha256:80beaf63ddfbc64a0452b841d8036ca0611e049650e20afcb882f5d3c266d65f"}, ] nixops = [] nixops-aws = [] @@ -918,12 +889,12 @@ pycparser = [ {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] pygments = [ - {file = "Pygments-2.10.0-py3-none-any.whl", hash = "sha256:b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380"}, - {file = "Pygments-2.10.0.tar.gz", hash = "sha256:f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"}, + {file = "Pygments-2.11.2-py3-none-any.whl", hash = "sha256:44238f1b60a76d78fc8ca0528ee429702aae011c265fe6a8dd8b63049ae41c65"}, + {file = "Pygments-2.11.2.tar.gz", hash = "sha256:4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a"}, ] pyparsing = [ - {file = "pyparsing-3.0.6-py3-none-any.whl", hash = "sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4"}, - {file = "pyparsing-3.0.6.tar.gz", hash = "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"}, + {file = "pyparsing-3.0.7-py3-none-any.whl", hash = "sha256:a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484"}, + {file = "pyparsing-3.0.7.tar.gz", hash = "sha256:18ee9022775d270c55187733956460083db60b37d0d0fb357445f3094eed3eea"}, ] python-dateutil = [ {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, @@ -938,12 +909,12 @@ pytz = [ {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"}, ] requests = [ - {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, - {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, + {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, + {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, ] s3transfer = [ - {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, - {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, + {file = "s3transfer-0.5.2-py3-none-any.whl", hash = "sha256:7a6f4c4d1fdb9a2b640244008e142cbc2cd3ae34b386584ef044dd0f27101971"}, + {file = "s3transfer-0.5.2.tar.gz", hash = "sha256:95c58c194ce657a5f4fb0b9e60a84968c808888aed628cd98ab8771fe1db98ed"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -982,8 +953,8 @@ sphinxcontrib-serializinghtml = [ {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, ] typeguard = [ - {file = "typeguard-2.13.2-py3-none-any.whl", hash = "sha256:4f7da3d80dda5e42d6973f11f33da3542b8bf86edc12ba926b2dbad62adf3fcf"}, - {file = "typeguard-2.13.2.tar.gz", hash = "sha256:7e50071590ab997509aa0977609eb5cf9d73d84c1f416cb4fab78b77a9d15326"}, + {file = "typeguard-2.13.3-py3-none-any.whl", hash = "sha256:5e3e3be01e887e7eafae5af63d1f36c849aaa94e3a0112097312aabfa16284f1"}, + {file = "typeguard-2.13.3.tar.gz", hash = "sha256:00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"}, ] typing-extensions = [ {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, @@ -991,6 +962,6 @@ typing-extensions = [ {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, ] urllib3 = [ - {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"}, - {file = "urllib3-1.26.7.tar.gz", hash = "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"}, + {file = "urllib3-1.26.8-py2.py3-none-any.whl", hash = "sha256:000ca7f471a233c2251c6c7023ee85305721bfdf18621ebff4fd17a8653427ed"}, + {file = "urllib3-1.26.8.tar.gz", hash = "sha256:0e7c33d9a63e7ddfcb86780aac87befc2fbddf46c58dbb487e0855f7ceec283c"}, ] diff --git a/pkgs/applications/networking/cluster/nixops/pyproject.toml b/pkgs/applications/networking/cluster/nixops/pyproject.toml index 89e6e34c771e..acee33da249a 100644 --- a/pkgs/applications/networking/cluster/nixops/pyproject.toml +++ b/pkgs/applications/networking/cluster/nixops/pyproject.toml @@ -14,7 +14,10 @@ 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"} nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"} -nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} +# FIXME: Once #30 lands this can be replaced +# https://github.com/nix-community/nixops-libvirtd/pull/30 +# nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} +nixops-virtd = { git = "https://github.com/lovesegfault/nixops-libvirtd.git", branch = "update-libvirt" } [tool.poetry.dev-dependencies] sphinx = "^3.1.2" diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index cfa86ea2dcaf..6329ff9ed11c 100644 --- a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -1,9 +1,9 @@ -{ lib, fetchFromGitHub, buildGoModule, go, removeReferencesTo, buildEnv }: +{ lib, fetchFromGitHub, buildGoModule, buildEnv }: let package = buildGoModule rec { pname = "nomad-autoscaler"; - version = "0.3.4"; + version = "0.3.6"; outputs = [ "out" @@ -25,26 +25,24 @@ let owner = "hashicorp"; repo = "nomad-autoscaler"; rev = "v${version}"; - sha256 = "sha256-SmlcQH+K/axl6Gj+bX0Quk6K/usP0c1hWnIdFjS1dn8="; + sha256 = "sha256-fK5GsszNhz/WP0zVk2lOfU/gwYijdQa5qhNYO33RhXc="; }; - vendorSha256 = "sha256-tO8vi9jBV6rVcGk/OoaXzpnQi4yPdozYZZwAMFCz2+c="; + vendorSha256 = "sha256-Duzjpl011mj/SNoX/jQGMXwqUHPDz7iIMygRmK1vC3Q="; - subPackages = [ "." ]; - - nativeBuildInputs = [ removeReferencesTo ]; - - # buildGoModule overrides normal buildPhase, can't use makeTargets - postBuild = '' + buildPhase = '' + runHook preBuild make build plugins + runHook postBuild ''; # tries to pull tests from network, and fails silently anyway doCheck = false; - postInstall = '' - mkdir -p $bin/bin - mv $out/bin/nomad-autoscaler $bin/bin/nomad-autoscaler + installPhase = '' + runHook preInstall + mkdir -p $bin/bin $out/bin + mv bin/nomad-autoscaler $bin/bin ln -s $bin/bin/nomad-autoscaler $out/bin/nomad-autoscaler for d in $outputs; do @@ -54,7 +52,6 @@ let # have out contain all of the plugins for plugin in bin/plugins/*; do - remove-references-to -t ${go} "$plugin" cp "$plugin" $out/share/ done @@ -73,6 +70,7 @@ let mv bin/plugins/prometheus $prometheus/share/ mv bin/plugins/target-value $target_value/share/ mv bin/plugins/threshold $threshold/share/ + runHook postInstall ''; # make toggle-able, so that overrided versions can disable this check if diff --git a/pkgs/applications/networking/cluster/nomad-pack/default.nix b/pkgs/applications/networking/cluster/nomad-pack/default.nix new file mode 100644 index 000000000000..93d1d3badad2 --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad-pack/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "nomad-pack"; + version = "2022-02-11"; + rev = "568ac5e42bc41172a1fa3c8b18af2f42b9e341ff"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = pname; + inherit rev; + sha256 = "sha256-0hvnGdUT72sWvMER67ZBxcC+VTbuFMIos2NudOjeTB8="; + }; + + vendorSha256 = "sha256-wmoXZIogKj4i9+AsEjY7QaT2Tn4LQyGQcEFHrRO0W9s="; + + # skip running go tests as they require network access + doCheck = false; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/nomad-pack --version + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://github.com/hashicorp/nomad-pack"; + changelog = "https://github.com/hashicorp/nomad-pack/blob/main/CHANGELOG.md"; + description = "Nomad Pack is a templating and packaging tool used with HashiCorp Nomad."; + license = licenses.mpl20; + maintainers = with maintainers; [ techknowlogick ]; + }; + +} diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix deleted file mode 100644 index 079c957ebb0f..000000000000 --- a/pkgs/applications/networking/cluster/nomad/1.0.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage -, buildGoPackage -, nvidia_x11 -, nvidiaGpuSupport -}: - -callPackage ./generic.nix { - inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.13"; - sha256 = "19wlma2y8lpb7p01wb0l20rb6nvrvldz0mm3qfisx33y56ykjyh8"; -} diff --git a/pkgs/applications/networking/cluster/nomad/1.1.nix b/pkgs/applications/networking/cluster/nomad/1.1.nix index 5a3e964ad5f8..750e49fc1e18 100644 --- a/pkgs/applications/networking/cluster/nomad/1.1.nix +++ b/pkgs/applications/networking/cluster/nomad/1.1.nix @@ -4,7 +4,7 @@ , nvidiaGpuSupport }: -callPackage ./genericModule.nix { +callPackage ./generic.nix { inherit buildGoModule nvidia_x11 nvidiaGpuSupport; version = "1.1.8"; sha256 = "05k1r157h3jaqzzsrkgc96zcny3mi8dvixc2v1w0lwcxixqk0y2l"; diff --git a/pkgs/applications/networking/cluster/nomad/1.2.nix b/pkgs/applications/networking/cluster/nomad/1.2.nix index 1bf38a8457b5..81a31de7e506 100644 --- a/pkgs/applications/networking/cluster/nomad/1.2.nix +++ b/pkgs/applications/networking/cluster/nomad/1.2.nix @@ -4,9 +4,9 @@ , nvidiaGpuSupport }: -callPackage ./genericModule.nix { +callPackage ./generic.nix { inherit buildGoModule nvidia_x11 nvidiaGpuSupport; - version = "1.2.3"; - sha256 = "0qjj1pnq2yv4r8dv03m08ii4118drjnswf4n1r95dqh8j3bymv5i"; - vendorSha256 = "0djh2184yg4b656wbhzxg1q1hsdnbrwsk79vc0426d0mqbzyy7dx"; + version = "1.2.6"; + sha256 = "1ik8v1jznky9y4m85bzxgyba256zqmm5fs6d5xsvp5rzcylcdwgd"; + vendorSha256 = "1mbvpssf7haaxzx6ka9qzixm49jck8i89w8ymkaddgmxhlbxjv05"; } diff --git a/pkgs/applications/networking/cluster/nomad/generic.nix b/pkgs/applications/networking/cluster/nomad/generic.nix index c028e476020a..180cf48e3fb1 100644 --- a/pkgs/applications/networking/cluster/nomad/generic.nix +++ b/pkgs/applications/networking/cluster/nomad/generic.nix @@ -1,27 +1,30 @@ { lib -, buildGoPackage +, buildGoModule , fetchFromGitHub , version , sha256 +, vendorSha256 , nvidiaGpuSupport , patchelf , nvidia_x11 +, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "nomad"; inherit version; - rev = "v${version}"; - goPackagePath = "github.com/hashicorp/nomad"; subPackages = [ "." ]; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; - inherit rev sha256; + rev = "v${version}"; + inherit sha256; }; + inherit vendorSha256; + nativeBuildInputs = lib.optionals nvidiaGpuSupport [ patchelf ]; @@ -39,6 +42,8 @@ buildGoPackage rec { done ''; + passthru.tests.nomad = nixosTests.nomad; + meta = with lib; { homepage = "https://www.nomadproject.io/"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; diff --git a/pkgs/applications/networking/cluster/nomad/genericModule.nix b/pkgs/applications/networking/cluster/nomad/genericModule.nix deleted file mode 100644 index c2e657317533..000000000000 --- a/pkgs/applications/networking/cluster/nomad/genericModule.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, version -, sha256 -, vendorSha256 -, nvidiaGpuSupport -, patchelf -, nvidia_x11 -, nixosTests -}: - -buildGoModule rec { - pname = "nomad"; - inherit version; - - subPackages = [ "." ]; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = pname; - rev = "v${version}"; - inherit sha256; - }; - - inherit vendorSha256; - - nativeBuildInputs = lib.optionals nvidiaGpuSupport [ - patchelf - ]; - - # ui: - # Nomad release commits include the compiled version of the UI, but the file - # is only included if we build with the ui tag. - tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia"; - - # The dependency on NVML isn't explicit. We have to make it so otherwise the - # binary will not know where to look for the relevant symbols. - postFixup = lib.optionalString nvidiaGpuSupport '' - for bin in $out/bin/*; do - patchelf --add-needed "${nvidia_x11}/lib/libnvidia-ml.so" "$bin" - done - ''; - - passthru.tests.nomad = nixosTests.nomad; - - meta = with lib; { - homepage = "https://www.nomadproject.io/"; - description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; - platforms = platforms.unix; - license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ]; - }; -} diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/applications/networking/cluster/ocm/default.nix new file mode 100644 index 000000000000..1bacd8510dc4 --- /dev/null +++ b/pkgs/applications/networking/cluster/ocm/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub, testVersion, ocm }: + +buildGoModule rec { + pname = "ocm"; + version = "0.1.62"; + + src = fetchFromGitHub { + owner = "openshift-online"; + repo = "ocm-cli"; + rev = "v${version}"; + sha256 = "0kv0zcx6wdlyid37ygzg05xyyk77ybd2qcdgbswjv6crcjh1xdrd"; + }; + + vendorSha256 = "sha256-nXUrbF9mcHy8G7c+ktQixBmmf6x066gpuaZ0eUsJQwc="; + + # Tests expect the binary to be located in the root directory. + preCheck = '' + ln -s $GOPATH/bin/ocm ocm + ''; + + passthru.tests.version = testVersion { + package = ocm; + command = "ocm version"; + }; + + meta = with lib; { + description = "CLI for the Red Hat OpenShift Cluster Manager"; + license = licenses.asl20; + homepage = "https://github.com/openshift-online/ocm-cli"; + maintainers = with maintainers; [ stehessel ]; + }; +} diff --git a/pkgs/applications/networking/cluster/octant/default.nix b/pkgs/applications/networking/cluster/octant/default.nix index 7c97b9eaedb2..70c255790790 100644 --- a/pkgs/applications/networking/cluster/octant/default.nix +++ b/pkgs/applications/networking/cluster/octant/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "octant"; - version = "0.25.0"; + version = "0.25.1"; src = let @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; in fetchsrc version { - x86_64-linux = "sha256-woBmYDOOh3AQH0RZJtMCrOfjFBrpMPzv22cVZ2/xHZo="; - aarch64-linux = "sha256-3YUUdOZULjJZqVJP0aO/d1WulXlpwf012NYJ6Mc2qp8="; - x86_64-darwin = "sha256-9lbMyEid4I1fRLkLwGbmrB2OkycnGBPUU5wEdVZoTLo="; - aarch64-darwin = "sha256-Q0ZkQX9FpzEc6WC3mRoYfg9oW3fvLB1/Ksa64TDlSgo="; + x86_64-linux = "sha256-bYqycTB036J8trojySPNkC+jrw76F7+N4I4puGCyalU="; + aarch64-linux = "sha256-DlzSIZCAASPnflXQ8ndPU7/0jXA18U4bGGOfmgLXPr0="; + x86_64-darwin = "sha256-FaPyrPzO7AzC6LHQP5c58NjLTqU+ei8vFffT8x6mUhQ="; + aarch64-darwin = "sha256-31CYhAsHYIVAenp8hFHYj8LhFf3lSiOTw7gULBu3gio="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/applications/networking/cluster/odo/default.nix new file mode 100644 index 000000000000..be85981f7bf4 --- /dev/null +++ b/pkgs/applications/networking/cluster/odo/default.nix @@ -0,0 +1,38 @@ +{ lib, buildGoModule, fetchFromGitHub, testVersion, odo }: + +buildGoModule rec { + pname = "odo"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "redhat-developer"; + repo = "odo"; + rev = "v${version}"; + sha256 = "KYJkCoF80UPsebWwxpc5gIfmT3Aj4OU8r6dDkaWXqbY="; + }; + + vendorSha256 = null; + + buildPhase = '' + make bin + ''; + + installPhase = '' + mkdir -p $out/bin + cp -a odo $out/bin + ''; + + passthru.tests.version = testVersion { + package = odo; + command = "odo version"; + version = "v${version}"; + }; + + meta = with lib; { + description = "Developer-focused CLI for OpenShift and Kubernetes"; + license = licenses.asl20; + homepage = "odo.dev"; + maintainers = with maintainers; [ stehessel ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index a1d4b1468376..dd542f9ffac6 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -33,9 +33,16 @@ in buildGoPackage rec { goPackagePath = "github.com/openshift/origin"; - buildInputs = [ libkrb5 ncurses ]; + buildInputs = [ libkrb5 ]; - nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; + nativeBuildInputs = [ + clang + go-bindata + installShellFiles + ncurses + rsync + which + ]; patchPhase = '' patchShebangs ./hack diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix new file mode 100644 index 000000000000..1fa4dc161952 --- /dev/null +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pluto"; + version = "5.6.0"; + + src = fetchFromGitHub { + owner = "FairwindsOps"; + repo = "pluto"; + rev = "v${version}"; + sha256 = "0nr8h8vg8ifgibgw80rs4mk63bj3qhmd37lfjc89iyml4g6p9mwr"; + }; + + vendorSha256 = "08x5mzypg66s54apkd7hhj6bi5pgbch9if2dbr58ksd3arkji2pv"; + + ldflags = [ + "-w" "-s" + "-X main.version=v${version}" + ]; + + meta = with lib; { + homepage = "https://github.com/FairwindsOps/pluto"; + description = "Find deprecated Kubernetes apiVersions"; + license = licenses.asl20; + maintainers = with maintainers; [ peterromfeldhk ]; + }; +} diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index e70856ef9d90..25fa2c4adc55 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -32,6 +32,5 @@ buildGoModule rec { changelog = "https://github.com/derailed/popeye/releases/tag/v${version}"; license = licenses.asl20; maintainers = [ maintainers.bryanasdev000 ]; - platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index a83bf805d876..8dcb08247e35 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.14.8"; + version = "0.15.2"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "sha256-awuYmazBx7zv/WuDsePzdWNRcpAzLK7lf4L2W2Jbt3A="; + sha256 = "sha256-js/UjnNYRW7s3b4TeprhmBe4cDLDYDrMeLtpASI9aN4="; }; - vendorSha256 = "sha256-VOBRQJzATaY9DNRhZvYTRpoISikbzUAwS/1hUfce/44="; + vendorSha256 = "sha256-oEbKk9cMbI0ZWXrfM8Y19OF/A75mwHl0C/PJx0oTOBo="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/rancher/default.nix b/pkgs/applications/networking/cluster/rancher/default.nix index 7c219725d7c9..3ee09b14ce96 100644 --- a/pkgs/applications/networking/cluster/rancher/default.nix +++ b/pkgs/applications/networking/cluster/rancher/default.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - pname = "rancher-cli"; - version = "2.6.0"; + pname = "rancher"; + version = "2.6.4"; src = fetchFromGitHub { owner = "rancher"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-RfhcTo10nkHmKGwmS8WdjBioZhDIGSQ9vPPOv3Wg0Y4="; + sha256 = "sha256-5ceyScsCidJpHGfwhsq7/hDd3CClx29cD5Cdc1PSxTU="; }; ldflags = [ @@ -25,8 +25,6 @@ buildGoModule rec { mv $out/bin/cli $out/bin/rancher ''; - doCheck = true; - doInstallCheck = true; installCheckPhase = '' $out/bin/rancher | grep ${version} > /dev/null diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index c256f23dbc9c..f08f403de282 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "237bd35906f5c4bed1f4de4aa58cc6a6a676d4fd"; +let rev = "1005bee8fff1b8daa30ddbcca717d03384630a71"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.55.1"; # Do not forget to update `rev` above + version = "0.56.3"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -20,10 +20,10 @@ buildGoModule rec { owner = "vmware-tanzu"; repo = "sonobuoy"; rev = "v${version}"; - sha256 = "sha256-pHpnh+6O9yjnDA8u0jyLvqNQbXC+xz8fRn47aQNdOAo="; + sha256 = "sha256-7yN3/bGjcntzMQRbB//fmqvD7me/xKLytfF+mQ1fcfc="; }; - vendorSha256 = "sha256-jPKCWTFABKRZCg6X5VVdrmOU/ZFc7yGD7R8RJrpcITg="; + vendorSha256 = "sha256-qKXm39CwrTcXENIMh2BBS3MUlhJvmTTA3UzZNpF0PCc="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 7876eb1c7523..69cdcc8d1316 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,13 +1,26 @@ -{ lib, stdenv, fetchzip, makeWrapper, jdk8, python3Packages, extraPythonPackages ? [], coreutils, hadoop -, RSupport? true, R +{ lib +, stdenv +, fetchzip +, makeWrapper +, jdk8 +, python3Packages +, extraPythonPackages ? [ ] +, coreutils +, hadoop +, RSupport ? true +, R }: with lib; let - spark = { pname, version, src }: + spark = { pname, version, sha256 }: stdenv.mkDerivation rec { - inherit pname version src; + inherit pname version; + src = fetchzip { + url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; + sha256 = sha256; + }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk8 python3Packages.python ] ++ extraPythonPackages @@ -45,31 +58,28 @@ let ''; meta = { - description = "Apache Spark is a fast and general engine for large-scale data processing"; - homepage = "https://spark.apache.org/"; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ]; - repositories.git = "git://git.apache.org/spark.git"; + description = "Apache Spark is a fast and general engine for large-scale data processing"; + homepage = "https://spark.apache.org/"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ]; }; }; -in { - spark3 = spark rec { +in +{ + spark_3_2 = spark rec { + pname = "spark"; + version = "3.2.1"; + sha256 = "0kxdqczwmj6pray0h8h1qhygni9m82jzznw5fbv9hrxrkq1v182d"; + }; + spark_3_1 = spark rec { pname = "spark"; version = "3.1.2"; - - src = fetchzip { - url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; - sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf"; - }; + sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf"; }; - spark2 = spark rec { + spark_2_4 = spark rec { pname = "spark"; version = "2.4.8"; - - src = fetchzip { - url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; - sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv"; - }; + sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv"; }; } diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index 67db6edd989b..30ca2ee1cdee 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/k9lQS3oPOYxhaaXuaDwPnai7byDkge4yBu7/9g4RUE="; + sha256 = "sha256-sB7C0IKadgpQ2h6HuH4D6ku/GXnFfFS+fGCW/RBSc10="; # 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 { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-7SVEyyJRE7oYIhuENraZy0aieIAoFFWtq4mrSXxURlQ="; + vendorSha256 = "sha256-R7tF724y5WNIByE+9nRoNSZDZzfLtPfK/9tSBkARaN0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 959c40637fbe..19184ac15ae8 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.20.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-JredVk2hjnhoaJ9bT7D5k35skBNjcEBLa6GgO8dB2+U="; + sha256 = "sha256-+V0mRSjAwhZoiIS/OpZyqa5rvlqU9pGJwmW0QZ3H2g4="; }; - vendorSha256 = "sha256-ybsDB54kkbONi3b9URtNUusHIdUfzymOpYlNHJz4i2A="; + vendorSha256 = "sha256-IPHu23/2e6406FELB1Mwegp0C16cFD65mbW5Ah32D4Q="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix new file mode 100644 index 000000000000..374d9c972c7c --- /dev/null +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -0,0 +1,58 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +let + # look for GO_LDFLAGS getting set in the Makefile + version = "0.14.3"; + sha256 = "sha256-toEbWUZxnJkUe9jkZRdJrcPXu+CIh62fUKyX38OkXxU="; + vendorSha256 = "sha256-Pj1918TIOGfhkRiFEKkURL4xMFgWroiNsNU6yWzT8yk="; + pkgsVersion = "v0.9.0-6-gbfcc795"; + extrasVersion = "v0.7.0-2-gb4c9d21"; +in +buildGoModule rec { + pname = "talosctl"; + inherit version vendorSha256; + # nixpkgs-update: no auto update + + src = fetchFromGitHub { + owner = "talos-systems"; + repo = "talos"; + rev = "v${version}"; + inherit sha256; + }; + + ldflags = + let + versionPkg = "github.com/talos-systems/talos/pkg/version"; # VERSION_PKG + imagesPkgs = "github.com/talos-systems/talos/pkg/images"; # IMAGES_PKGS + mgmtHelpersPkg = "github.com/talos-systems/talos/cmd/talosctl/pkg/mgmt/helpers"; #MGMT_HELPERS_PKG + in + [ + "-X ${versionPkg}.Name=Talos" + "-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do + "-X ${versionPkg}.Tag=${src.rev}" + "-X ${versionPkg}.PkgsVersion=${pkgsVersion}" # PKGS + "-X ${versionPkg}.ExtrasVersion=${extrasVersion}" # EXTRAS + "-X ${imagesPkgs}.Username=talos-systems" # USERNAME + "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY + "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS + ]; + + subPackages = [ "cmd/talosctl" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd talosctl \ + --bash <($out/bin/talosctl completion bash) \ + --fish <($out/bin/talosctl completion fish) \ + --zsh <($out/bin/talosctl completion zsh) + ''; + + doCheck = false; + + meta = with lib; { + description = "A CLI for out-of-band management of Kubernetes nodes created by Talos"; + homepage = "https://github.com/talos-systems/talos"; + license = licenses.mpl20; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 8bdbf63a9ff5..0d21e440031d 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SMPStxqzoeooBoqUJdFK6Zg3dzbNHrB/tv8iwa8GdbM="; + sha256 = "sha256-Wtfn9ffUNKuwByRbeCYq27xvr2DuzxSSQMH9Sv5a7rU="; }; - vendorSha256 = "sha256-pqwdxFFcATfxGmz6quIH8OL4U2DZKmuVyOLEct2nBlE="; + vendorSha256 = "sha256-ed6rC+wrZHDViGfJrSBl5VUqX/o6RKytXbTKqxb3ZtU="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 0db134bdb215..bdd538ef804d 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.20.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-aVR1xNmL6M/m+1znt70vrCtuABCqDz0sDp8mDFI2uIg="; + sha256 = "sha256-fOq67Cxtb2A9Obh2o5/aFy5bYBnyFKYQDPcpxOXMy1s="; }; vendorSha256 = null; @@ -22,10 +22,14 @@ buildGoModule rec { excludedPackages = "\\(third_party\\|cmd/docs\\)"; preCheck = '' - # Some tests try to write to the home dir + # some tests try to write to the home dir export HOME="$TMPDIR" - # Change the golden files to match our desired version - sed -i "s/dev/${version}/" pkg/cmd/version/testdata/{TestGetVersions-,TestGetComponentVersions/}*.golden + + # the tests expect the clientVersion ldflag not to be set + unset ldflags + + # remove tests with networking + rm pkg/cmd/version/version_test.go ''; postInstall = '' @@ -48,10 +52,12 @@ buildGoModule rec { meta = with lib; { homepage = "https://tekton.dev"; changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}"; - description = "Provides a CLI for interacting with Tekton"; + description = "Provides a CLI for interacting with Tekton - tkn"; longDescription = '' - The Tekton Pipelines cli project provides a CLI for interacting with Tekton! - For your convenience, it is recommended that you install the Tekton CLI, tkn, together with the core component of Tekton, Tekton Pipelines. + The Tekton Pipelines cli project provides a CLI for interacting with + Tekton! For your convenience, it is recommended that you install the + Tekton CLI, tkn, together with the core component of Tekton, Tekton + Pipelines. ''; license = licenses.asl20; maintainers = with maintainers; [ jk mstrangfeld vdemeester ]; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index a03f69a9fc0a..2475dd0f1d94 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.12.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "1gdks7pzaqrsdihh2m3v597x0dw2qww95jlznj0h112jgicanimj"; + sha256 = "sha256-5Tu838086qgIa2fqda2xi7vn4JbkENVJH4XU3NwW7Ic="; }; - vendorSha256 = "sha256-dGmd6tCUKoK4uwhB5kXGOpXemtLn0VssabDE4iQWEAw="; + vendorSha256 = "sha256-caRBgkuHQ38r6OsKQCJ2pxAe8s6mc4g/QCIsCEXvY3M="; # Errors: # > === RUN TestNamespaceHandlerGlobalNamespaceDisabledSuite @@ -22,9 +22,10 @@ buildGoModule rec { runHook preInstall mkdir -p $out/bin install -Dm755 "$GOPATH/bin/cli" -T $out/bin/tctl - install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra + install -Dm755 "$GOPATH/bin/authorization" -T $out/bin/tctl-authorization-plugin install -Dm755 "$GOPATH/bin/server" -T $out/bin/temporal-server - install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql + install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra-tool + install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql-tool runHook postInstall ''; @@ -35,9 +36,9 @@ buildGoModule rec { meta = with lib; { description = "A microservice orchestration platform which enables developers to build scalable applications without sacrificing productivity or reliability"; - downloadPage = "https://github.com/temporalio/temporal"; homepage = "https://temporal.io"; + changelog = "https://github.com/temporalio/temporal/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ titanous ]; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 8690e65be88c..93be46bc7927 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -10,42 +10,42 @@ let # Our generic constructor to build new providers. # # Is designed to combine with the terraform.withPlugins implementation. - mkProvider = - { owner - , repo - , rev - , version - , sha256 - , vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */ - , deleteVendor ? false - , proxyVendor ? false - , # Looks like "registry.terraform.io/vancluever/acme" - provider-source-address - }@attrs: - buildGoModule { - pname = repo; - inherit vendorSha256 version deleteVendor proxyVendor; - subPackages = [ "." ]; - doCheck = false; - # https://github.com/hashicorp/terraform-provider-scaffolding/blob/a8ac8375a7082befe55b71c8cbb048493dd220c2/.goreleaser.yml - # goreleaser (used for builds distributed via terraform registry) requires that CGO is disabled - CGO_ENABLED = 0; - ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ]; - src = fetchFromGitHub { - inherit owner repo rev sha256; - }; + mkProvider = lib.makeOverridable + ({ owner + , repo + , rev + , version + , sha256 + , vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */ + , deleteVendor ? false + , proxyVendor ? false + , # Looks like "registry.terraform.io/vancluever/acme" + provider-source-address + }@attrs: + buildGoModule { + pname = repo; + inherit vendorSha256 version deleteVendor proxyVendor; + subPackages = [ "." ]; + doCheck = false; + # https://github.com/hashicorp/terraform-provider-scaffolding/blob/a8ac8375a7082befe55b71c8cbb048493dd220c2/.goreleaser.yml + # goreleaser (used for builds distributed via terraform registry) requires that CGO is disabled + CGO_ENABLED = 0; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ]; + src = fetchFromGitHub { + inherit owner repo rev sha256; + }; - # Move the provider to libexec - postInstall = '' - dir=$out/libexec/terraform-providers/${provider-source-address}/${version}/''${GOOS}_''${GOARCH} - mkdir -p "$dir" - mv $out/bin/* "$dir/terraform-provider-$(basename ${provider-source-address})_${version}" - rmdir $out/bin - ''; + # Move the provider to libexec + postInstall = '' + dir=$out/libexec/terraform-providers/${provider-source-address}/${version}/''${GOOS}_''${GOARCH} + mkdir -p "$dir" + mv $out/bin/* "$dir/terraform-provider-$(basename ${provider-source-address})_${version}" + rmdir $out/bin + ''; - # Keep the attributes around for later consumption - passthru = attrs; - }; + # Keep the attributes around for later consumption + passthru = attrs; + }); list = lib.importJSON ./providers.json; @@ -70,7 +70,6 @@ let in lib.optionalAttrs (config.allowAliases or false) { arukas = archived "2022/01"; - bitbucket = archived "2022/01"; chef = archived "2022/01"; cherryservers = archived "2022/01"; clc = archived "2022/01"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8612e898d910..56743624efaa 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -3,47 +3,47 @@ "owner": "CiscoDevNet", "provider-source-address": "registry.terraform.io/CiscoDevNet/aci", "repo": "terraform-provider-aci", - "rev": "v1.2.0", - "sha256": "1jxnamd701fjz0y62k229njrxa3ijmr1m1dszn0x3mpak5qgw7li", + "rev": "v2.1.0", + "sha256": "sha256-7fOvTEinJUpSaCnlP+191VTSEpE4z11+HUcH2iTFj60=", "vendorSha256": null, - "version": "1.2.0" + "version": "2.1.0" }, "acme": { "owner": "vancluever", "provider-source-address": "registry.terraform.io/vancluever/acme", "repo": "terraform-provider-acme", - "rev": "v2.7.1", - "sha256": "0gnq8jm31v0q2a4v310cjrrdc7y17c9vi326c6x9cs3lgjvn27m2", - "vendorSha256": "1wssw8x8zlrgx51ij0ghhwsbyzfl2r1qy4aqv03v705xipil8yn3", - "version": "2.7.1" + "rev": "v2.8.0", + "sha256": "06wjvjsh8qgncrbdhziqjd4pgp550q21p0xm4igdx80gd7541hr1", + "vendorSha256": "1gpbc72q7mjyjxk75dyfi3j2fk6glgz0a15m2pq7clyc35kapnkc", + "version": "2.8.0" }, "aiven": { "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v2.5.0", - "sha256": "1x37bnykn28hmb80qi530zgk6jfqpk97nswrm0hdw8x5vac4v63a", - "vendorSha256": "0ldk06dj72551b6djsq7vil0hzfsp3ixwh3ikqb40shsdq10iplx", - "version": "2.5.0" + "rev": "v2.7.0", + "sha256": "12n97z3r5bz7hwgcz193x90n7ibk4fdph7pqxwwinrvlc6zb7hz6", + "vendorSha256": "12lj7p74mhiy30fhc12ihbf827axlbxhbfzr10iwwhb0nydsfiyl", + "version": "2.7.0" }, "akamai": { "owner": "akamai", "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v1.9.1", - "sha256": "17a3ml4h1b1480z9dzppig20jx9mgldnmpz8cn2x8qgzbpiqz3hs", - "vendorSha256": "0l50hy4cy360g6adbhhbl4x8hagma9zfb3yyzk6vbslal9m4kd6j", - "version": "1.9.1" + "rev": "v1.11.0", + "sha256": "1ccliv8p36rh7f7zacjsa2x846d36nygbgs0vyjb0bpf5pl7grgd", + "vendorSha256": "19n841mby0l7ipjmmqsl5vnfmsj6y8fci1vzi8z6dqy3xcjlhwgb", + "version": "1.11.0" }, "alicloud": { "deleteVendor": true, "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.153.0", - "sha256": "1h37sxzkngmikvmyj9isx45vcpd31ml47f4r6ii1h2l69182hsqs", - "vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg", - "version": "1.153.0" + "rev": "v1.162.0", + "sha256": "sha256-xqZv15Tst+7o9HhNu6/bW+a4z7FTkra+MfS8jKrfeNs=", + "vendorSha256": "sha256-RbOf/S0rkbhW0s+/YOqu+BQuE0V4aS2x36Xf+hgBkqY=", + "version": "1.162.0" }, "ansible": { "owner": "nbering", @@ -67,10 +67,10 @@ "owner": "alexkappa", "provider-source-address": "registry.terraform.io/alexkappa/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.26.1", - "sha256": "03nzwsda6n1nycpk2w87b8fj6aqzid8i2fa29qd9skwplm7hyjfk", - "vendorSha256": "0k6lylkcdvm0piaic8hdbhg1jf1vzc897w1sq7v57brx7586h3sc", - "version": "0.26.1" + "rev": "v0.26.2", + "sha256": "1n9gn7zsdygdr2ybki7xz2snp3fygls6myb1w5zndby497kgxrkw", + "vendorSha256": "1x61f7vz73m2q6pdb6ddy27j4npiwrrlgzvd90zrcc0yj22h6mms", + "version": "0.26.2" }, "avi": { "owner": "vmware", @@ -85,37 +85,37 @@ "owner": "AviatrixSystems", "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", - "rev": "v2.20.3", - "sha256": "1k3sdfn0np9nzvc0bfc2wi7ixbrv0ikmzwyh103jfppidkasy5yq", + "rev": "v2.21.1-6.6.ga", + "sha256": "16ym9zyvvz7kb44rm97wqa7h431jkh70q3gf68mmxihvxpjvfcdh", "vendorSha256": null, - "version": "2.20.3" + "version": "2.21.1-6.6.ga" }, "aws": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.73.0", - "sha256": "0la188dljw15l09j2farlhgri0vhrlbmsay7q1ar2y4ralqlsgl8", - "vendorSha256": "1h2x1318ax4qdy261wm8pqxq21ra50hymcykhw6mhj5lqxcb5r5z", - "version": "3.73.0" + "rev": "v4.8.0", + "sha256": "sha256-Ere41qols4lNnoAIZGWQmituukLnPNbv5d8C/e3rQgI=", + "vendorSha256": "sha256-ZXH9YlSii2z1s6Y/TfZVBje0/xQ2DXw3ZpgcBPeQZ2I=", + "version": "4.8.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.15.0", - "sha256": "1gjx91svfg25x0hlx6mfam40615x278b9vxsy5p88s3dl6xs3hdv", + "rev": "v2.19.1", + "sha256": "sha256-n5jDlcy5rwCcrqoL3ut+HThDLQ8hPj2mZ15d7hhALFw=", "vendorSha256": null, - "version": "2.15.0" + "version": "2.19.1" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.93.0", - "sha256": "0akacaih0smdjxh9ssdir1j248m5bpcc4wpwhykb7922yvj581ds", + "rev": "v3.0.2", + "sha256": "sha256-T24bfys9OxBnGN4YtJEsJmSUK26a5hMnbgZUANcpg3k=", "vendorSha256": null, - "version": "2.93.0" + "version": "3.0.2" }, "azurestack": { "owner": "hashicorp", @@ -139,38 +139,47 @@ "owner": "F5Networks", "provider-source-address": "registry.terraform.io/F5Networks/bigip", "repo": "terraform-provider-bigip", - "rev": "v1.12.2", - "sha256": "08qs8psr4wy5f9qiv7chkmmsls19dwj2p2k6fqxdrd6pj2154rcg", + "rev": "v1.13.0", + "sha256": "0l1fgbzv3zjsgmnkg96ac299plx9zi4j54cjxrl27csvf87wi4lv", "vendorSha256": null, - "version": "1.12.2" + "version": "1.13.0" + }, + "bitbucket": { + "owner": "DrFaust92", + "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", + "repo": "terraform-provider-bitbucket", + "rev": "v2.13.1", + "sha256": "sha256-P/6scAuRMRrACHmEdWjn+W37ptVmVgtj+iTXQDrG+WM=", + "vendorSha256": "sha256-o1CZ4VuGCPALqSIz8KSm1zCwd3r9bR13CRvP7XpVBAM=", + "version": "2.13.1" }, "brightbox": { "owner": "brightbox", "provider-source-address": "registry.terraform.io/brightbox/brightbox", "repo": "terraform-provider-brightbox", - "rev": "v2.0.6", - "sha256": "0k3k6d0rnvs1r2fb22q37g10zi0wq9kvakvj6zw97hkfld9wrqfj", - "vendorSha256": "07mznpp2mr1n9izgk2s8aibfvqsamj533666s46x1k49p0sh7lqx", - "version": "2.0.6" + "rev": "v2.2.0", + "sha256": "1n0gdfsj8ylmm5pqsjs3dvjvj8larc30x5p9jq546xvi2idvl39n", + "vendorSha256": "03761vl8xcirmas38q8xivx2r312c07fmg1y80lklmswbd8d0f71", + "version": "2.2.0" }, "checkly": { "owner": "checkly", "provider-source-address": "registry.terraform.io/checkly/checkly", "repo": "terraform-provider-checkly", - "rev": "v1.4.0-rc1", - "sha256": "125ng4yzsmnbzgvwn3d2070cxnp3jvzpp8m9sc95q9x7dprbxzvl", - "vendorSha256": "1dkij2anw0cy8h2pv8h9a0cr0r9skpcc0j26bggspigk8qa4nzsx", - "version": "1.4.0-rc1" + "rev": "v1.4.3", + "sha256": "sha256-5VF1cAFgdm2TR4wvuNlycpgQuVdHesFYnTv34MeauxY=", + "vendorSha256": "sha256-7X2cS5Erf373zu8xqe2KBSz52ZmZOnAlNC8lq2/LXV4=", + "version": "1.4.3" }, "checkpoint": { "deleteVendor": true, "owner": "CheckPointSW", "provider-source-address": "registry.terraform.io/CheckPointSW/checkpoint", "repo": "terraform-provider-checkpoint", - "rev": "v1.6.0", - "sha256": "1sfvglyd5giwlfyix4klicli96yz7cp7ry6lbvjziw5xaxs5ramf", - "vendorSha256": "1jsy9ls04rkyl6kl98lp6av8y3clpyskqqhlm9vl5qsv6saqcry7", - "version": "1.6.0" + "rev": "v1.7.0", + "sha256": "1msd3qjrrhl0v3m7n9ybkwxki5wpchzjswd2dcifbif4k8pcs470", + "vendorSha256": "0yaxgyzwja5dl4p7w8q77ash75xwsf05kq88nvmdf94lvspfnwlq", + "version": "1.7.0" }, "ciscoasa": { "owner": "CiscoDevNet", @@ -185,19 +194,19 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.7.0", - "sha256": "1d1wljk033b9j5sx01xjv5jmclw79f2f21s8zsix036mmzvaiswb", - "vendorSha256": "1g3fyxrdqa4ds6n9pcw2mvi8nfiz4dna57ssvggfwic4jl89q7zm", - "version": "3.7.0" + "rev": "v3.11.0", + "sha256": "sha256-z7IjLXO/AHWENKYaCospJDcOwOubNcRHKDQzmRkhimw=", + "vendorSha256": "sha256-Lx/faIdx4k399sm9p8BVqpiKZtNjZoThBhWWWgEuPyg=", + "version": "3.11.0" }, "cloudfoundry": { "owner": "cloudfoundry-community", "provider-source-address": "registry.terraform.io/cloudfoundry-community/cloudfoundry", "repo": "terraform-provider-cloudfoundry", - "rev": "v0.15.0", - "sha256": "0kg9aivxlbkqgrwv0j02hfsaky5q4f0bmqihn589dsdk7jds66i7", - "vendorSha256": "19h526ag7p2jkdp0610slbpsz8q3njvj9d4xmsfdsv3r8pz7xzls", - "version": "0.15.0" + "rev": "v0.15.2", + "sha256": "sha256-I4E+UyiaxEa/UK699xys75IMhNccnBcJ8tgJ3XH0NPg=", + "vendorSha256": "sha256-mxsGmI26ZQlj0eagqScF6IeZFX0T6iLqqpgc0ZLpU1E=", + "version": "0.15.2" }, "cloudinit": { "owner": "hashicorp", @@ -221,37 +230,37 @@ "owner": "Constellix", "provider-source-address": "registry.terraform.io/Constellix/constellix", "repo": "terraform-provider-constellix", - "rev": "v0.3.11", - "sha256": "00amvk2d4nb029kjlbljjidmgs7irf7v0ss192csgiyxqi378k2c", + "rev": "v0.4.2", + "sha256": "sha256-XnLTh/AP0OcFD5U2I1LSNpQ3s1OObueURDnioAtIQlU=", "vendorSha256": null, - "version": "0.3.11" + "version": "0.4.2" }, "consul": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/consul", "repo": "terraform-provider-consul", - "rev": "v2.14.0", - "sha256": "19kmjjg4f74askwwwslbh5wvi5ndcr4wzm0374qr8gc57qiwxkpy", + "rev": "v2.15.0", + "sha256": "sha256-6NQL1ZlHZsxfoRV0zMOXApuCR+nj8CPWjpxj7BAJivY=", "vendorSha256": null, - "version": "2.14.0" + "version": "2.15.0" }, "ct": { "owner": "poseidon", "provider-source-address": "registry.terraform.io/poseidon/ct", "repo": "terraform-provider-ct", - "rev": "v0.9.1", - "sha256": "1d8q6ffh64v46r80vmbpsgmjw1vg6y26hpq3nz2h5mvqm0fqya9r", - "vendorSha256": "0zi64rki932x343iavwb7w5h5ripca3c2534mb91liym37vgkykv", - "version": "0.9.1" + "rev": "v0.10.0", + "sha256": "1wh5qd4m0wxbgd84mnnv5ghi57721wz1bdw0k7ff7l7d4whb0q1z", + "vendorSha256": "0qk83ppnwkwvj85dh9p0cv6a0nv8l8zlf4k74cy3m0bqym4ad0qk", + "version": "0.10.0" }, "datadog": { "owner": "DataDog", "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v3.8.1", - "sha256": "0mvl80dsqzab1r3p5n446737dadzfbsyfbdy2w2xvmz4fgx6aklh", - "vendorSha256": "0p8czqb4hn5z9bfgsfajdpx46hwil0ax75j8xljlh1ccvpp2rvyz", - "version": "3.8.1" + "rev": "v3.9.0", + "sha256": "sha256-CncMqWIa1JiHkIkNAgIQl4fcKZVKZGD4BZSjuv5cw18=", + "vendorSha256": "sha256-U1gVP4o1mj21NW9z8jyV5KhuJNJRYAV1Qvg1fV1zGO4=", + "version": "3.9.0" }, "dhall": { "owner": "awakesecurity", @@ -266,10 +275,10 @@ "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.17.0", - "sha256": "0in6xg4kgqy1izi8zapdi0f6dsni3i27fxh1l4sqp5kwh3vgpn0d", + "rev": "v2.18.0", + "sha256": "sha256-MuJpBLOB8AeAlNhQC+rwT6mkZriU4+XgAqQY33xjFck=", "vendorSha256": null, - "version": "2.17.0" + "version": "2.18.0" }, "dme": { "owner": "DNSMadeEasy", @@ -284,28 +293,28 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/dns", "repo": "terraform-provider-dns", - "rev": "v3.2.1", - "sha256": "1zynfwm7hl7pnldjr2nxj0a06j209r62g8zpkasj6zdjscy62rc8", - "vendorSha256": "0hpf48z7i5h1hh52wpyc48axpvfx9h3209iw36v8c764xzf87w0g", - "version": "3.2.1" + "rev": "v3.2.3", + "sha256": "sha256-aH9sDqlXSq2dJi0kzGreJZ5V8A0WU0UqTpxWPKn23rM=", + "vendorSha256": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=", + "version": "3.2.3" }, "dnsimple": { "owner": "dnsimple", "provider-source-address": "registry.terraform.io/dnsimple/dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v0.11.0", - "sha256": "0w5lz9lz5jfvpn87d7xzpjimvh6wnwqfwk6masrhiw88h10pgd7n", + "rev": "v0.11.1", + "sha256": "0jzw1kjykbka59kx30xm3qicjb6fdmm5l4f2dr8g7nxdaqnxri0s", "vendorSha256": "06wggchs5khzyg6fd9s0qj76awnw28s7l278awanqimqgqajijkj", - "version": "0.11.0" + "version": "0.11.1" }, "docker": { "owner": "kreuzwerker", "provider-source-address": "registry.terraform.io/kreuzwerker/docker", "repo": "terraform-provider-docker", - "rev": "v2.15.0", - "sha256": "0fk4i8hi0x40rgcnq40j4jv12wsn9kn974h8qwhzxnd66n0xbnv0", - "vendorSha256": "0ax2368nhi6hfs4zwf84dqnf5ijyy93gz0brlfk89m7d2a90gfkp", - "version": "2.15.0" + "rev": "v2.16.0", + "sha256": "0bh27al9s6zczdz208lr70qab517lsazpi708z6711pgns7qhwjm", + "vendorSha256": "0ykfmksffcc62xwni9dqwgj3vlcmzf6paz6kviljib6sv9vqf0pm", + "version": "2.16.0" }, "dome9": { "owner": "dome9", @@ -320,55 +329,55 @@ "owner": "phillbaker", "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", - "rev": "v2.0.0-beta.3", - "sha256": "1a3jrj93yr22srs4rwk4j1kydhpmkic0aqxrklg7v9ri7rdwx36s", - "vendorSha256": "1w92k895ikrqm9n1hf36wlh9nq278vifl3r14v0rxa8g9awizfdr", - "version": "2.0.0-beta.3" + "rev": "v2.0.0", + "sha256": "sha256-wl8pRAB97JObpZvi2rdyDZP5itKcOnm6Gsbku1+5oqQ=", + "vendorSha256": "sha256-OCXTZg0JkaxJDEgoF2Qs4BcMSiYkQpLmehWdCpEmTzk=", + "version": "2.0.0" }, "exoscale": { "owner": "exoscale", "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.31.2", - "sha256": "1fncpy8vc72g6h560mnkwm160wah8iik4bn12mjgbz3nvjlsm04x", + "rev": "v0.33.1", + "sha256": "sha256-HlhJe8jyvtACOF0msFMSrt9l//Ik03poSvhP+JccRyQ=", "vendorSha256": null, - "version": "0.31.2" + "version": "0.33.1" }, "external": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/external", "repo": "terraform-provider-external", - "rev": "v2.2.0", - "sha256": "0s7zxz9dni1p93di1ddx595d0mmizq7zrvkbbx1m4c5f208m262x", - "vendorSha256": "1f5gh110rylb1cw4dlwdzsj8sb0myj7xcj7ix966l5qa9x05p9pn", - "version": "2.2.0" + "rev": "v2.2.2", + "sha256": "sha256-gImRxsDUgBHmw/5DeKcO9BzB906JB8dUcSGKQj+Vcy0=", + "vendorSha256": "sha256-1BUFg8epcEsCf6yyJr4E4CdX2o6/3R384opRTxwrsng=", + "version": "2.2.2" }, "fastly": { "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v0.41.0", - "sha256": "096dwysa1awyb4a1fay9sw1i784cki8q4x141f9gan5w1qwns89y", + "rev": "v1.1.2", + "sha256": "sha256-CxyVW9uE9mK+ZF8fyjAsrFKY82xAyGn9k1jOFqTaAhA=", "vendorSha256": null, - "version": "0.41.0" + "version": "1.1.2" }, "flexibleengine": { "owner": "FlexibleEngineCloud", "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", - "rev": "v1.26.0", - "sha256": "1n22jll76gw3cxnyi2xfzh3mh0g9912rmkqpps7fid0imaz5jlck", + "rev": "v1.27.1", + "sha256": "0glfs1hq9v3jdga8vvjrybld4g6qmyhy4kayapccbmdnbx9rpg76", "vendorSha256": null, - "version": "1.26.0" + "version": "1.27.1" }, "fortios": { "owner": "fortinetdev", "provider-source-address": "registry.terraform.io/fortinetdev/fortios", "repo": "terraform-provider-fortios", - "rev": "v1.13.2", - "sha256": "042fn5jii9fx7vb6x4kcvmrmiccj7s13xqm91l3b2i9mzh4cgb3k", + "rev": "v1.14.0", + "sha256": "078wvbihrs6j5yrbqsx5g6l7z05y98kwlyanq5w99fsazz78rr4h", "vendorSha256": null, - "version": "1.13.2" + "version": "1.14.0" }, "gandi": { "owner": "go-gandi", @@ -383,66 +392,66 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.19.2", - "sha256": "0k6w1wxx9a67wkgh4j4aswbpcnlnjcvqnfi0gy2rw9kqbyxb9j0m", + "rev": "v4.23.0", + "sha256": "sha256-N7PFLh7qr8OPB92ePLS1B/KexipKV5LFRWvrxdS8cGk=", "vendorSha256": null, - "version": "4.19.2" + "version": "4.23.0" }, "gitlab": { "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.8.0", - "sha256": "0ha6lp0z3lqdk05fhggdgdz50dm7z6ksn648khp44n7in0c0c5pj", - "vendorSha256": "143marl3zrqd37cgr6s6fdbx8dfmcchzc1f63140i4m07ygxwhxn", - "version": "3.8.0" + "rev": "v3.12.0", + "sha256": "sha256-6CrM2Pt4yB0ZaXvcgUPreIhJrUhXCNt/xt+fExzGJqc=", + "vendorSha256": "sha256-78/7+t75xFjLt1JfoVpHVPlM7q5BX+NI/I9ugfjdv+g=", + "version": "3.12.0" }, "google": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.7.0", - "sha256": "15w69dyr0s818as7v8pwzdbfs82l23qn846a7xlihw2g49xk0cah", - "vendorSha256": "144kv885w2gfsljj8vx7q9pgrpyshpn392162ljzpjb6qx3qzzxj", - "version": "4.7.0" + "rev": "v4.15.0", + "sha256": "sha256-BHtbBfCihy1zh/A9JB03CDh5KpzMWeR/mbuRErJkVUE=", + "vendorSha256": "sha256-7xTABs0O2eBBwjP1JNaFhsodl/ItPC+iv7NnwwlACvU=", + "version": "4.15.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.7.0", - "sha256": "0jnz05yvhlawgc188xazv1fvqsqvpm867xf3i93xpl248pr1vqlf", - "vendorSha256": "144kv885w2gfsljj8vx7q9pgrpyshpn392162ljzpjb6qx3qzzxj", - "version": "4.7.0" + "rev": "v4.15.0", + "sha256": "sha256-FTT6PS0OS4HPfkM2u4PZwOA/v5VzDwHLdO2s+qgRkW8=", + "vendorSha256": "sha256-7xTABs0O2eBBwjP1JNaFhsodl/ItPC+iv7NnwwlACvU=", + "version": "4.15.0" }, "grafana": { "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.18.0", - "sha256": "1qvhdshaiy1v7557nkh869k1wmz604pv2gchv98vrm3cp7zj83zn", - "vendorSha256": "1rgvil2kw38kbgbgcjy8mbkahj6zm91s187x41vd4x7ypc5kgbkn", - "version": "1.18.0" + "rev": "v1.20.1", + "sha256": "1hl1dplb59hssdlq0j83mix9abfgzkbpqpsfirwd8pv4z47s055j", + "vendorSha256": "157y4fwfd2l822ass7v2sa3vn3kxrfhiapg5rwsm8q3lg1g42f2m", + "version": "1.20.1" }, "gridscale": { "owner": "gridscale", "provider-source-address": "registry.terraform.io/gridscale/gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.14.0", - "sha256": "1syi3hvmff8dkbh538r4acbr5r72nmd073fvr52zcn0a9bc3q9np", + "rev": "v1.14.1", + "sha256": "1vf1xvj3djm1mgrgfj428yh26qxksclxxnvkxl663nqsvy14gd6s", "vendorSha256": null, - "version": "1.14.0" + "version": "1.14.1" }, "hcloud": { "owner": "hetznercloud", "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", "repo": "terraform-provider-hcloud", - "rev": "v1.32.2", - "sha256": "0rr65bxd0w5r0zqgj975rzxw7j3wrav4dw9gl3ispfhkb9v1302f", + "rev": "v1.33.1", + "sha256": "1mskbr0adhnri72fa3afghxpcfbzq0qnpslhh9gdnymvs3afjbdg", "vendorSha256": "0rc4pznb16fm5dhi54fwka44zvngy3hp0cfwlrh84ifmzqgx0mlv", - "version": "1.32.2" + "version": "1.33.1" }, "helm": { "owner": "hashicorp", @@ -457,10 +466,10 @@ "owner": "heroku", "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v4.8.0", - "sha256": "12v0agcib8bziywaqzn6p04pwxnzyn74kqc5al8n572k0ndw3bps", - "vendorSha256": "183j20my61mqhch87cn455l938jqx4ssbnv8yl416i6bxgcpy6f9", - "version": "4.8.0" + "rev": "v5.0.1", + "sha256": "13nsqvcbb9ydzsgri090ddw2y5gcxa2a07i1hfzm78mf5hflp4rb", + "vendorSha256": "13f7841i14b5n5iabqky7694mbqg95f0cvaygapczki5lf2j7fqy", + "version": "5.0.1" }, "http": { "owner": "hashicorp", @@ -475,10 +484,10 @@ "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.32.1", - "sha256": "05rm1cmpbmavza1pyqjzrd316v6r68427cjhqy6bngb749nc1als", + "rev": "v1.34.1", + "sha256": "14dxnphzg53qc9jxp5gr4vv0gj9j9i36zdyxh9ffcpcv4y3v9lkj", "vendorSha256": null, - "version": "1.32.1" + "version": "1.34.1" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -502,10 +511,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.38.0", - "sha256": "0cbyq74fy3y7ia8lywr8amwcjq53bn3psymyl5cnwqx8y97avx5w", - "vendorSha256": "0cgl87pij4amn77ksbrzl0qlf6a5ga29b64cnasq8lq03lbmqzw4", - "version": "1.38.0" + "rev": "v1.40.0-beta0", + "sha256": "sha256-1C0JdzoHf/GKdlLyHA6GgJpb3lbYFXeMGeWYJ7RkyfU=", + "vendorSha256": "sha256-YgRgm5S7cXHO9yqUUuVVkFRQL+pf0RMPJI9oUaWob2I=", + "version": "1.40.0-beta0" }, "icinga2": { "owner": "Icinga", @@ -520,10 +529,10 @@ "owner": "infobloxopen", "provider-source-address": "registry.terraform.io/infobloxopen/infoblox", "repo": "terraform-provider-infoblox", - "rev": "v2.0.1", - "sha256": "0xmlhm4lgb43f75300hajlq7zk3r1xqxi4dc2x0vlnkhgdj3hrfi", + "rev": "v2.1.0", + "sha256": "1agxlvm5gxgsfyg1kij09jaly4pj3wfbdc4hk7456m2v1k4r7asn", "vendorSha256": null, - "version": "2.0.1" + "version": "2.1.0" }, "kafka": { "owner": "Mongey", @@ -547,82 +556,82 @@ "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v3.6.0", - "sha256": "1lrnzfjrw0yn4hsklhikf75n6drra7nljlzxf2asfkfaiwgcik99", - "vendorSha256": "17v5h5s2vijfx5yxhindr30g8ilmz7hamkxhmlk0zg5qb80mzqc1", - "version": "3.6.0" + "rev": "v3.7.0", + "sha256": "1qzdm0jgk6f0zyjbv5qaq24h9a37bgb4ghym61vg763lqra69als", + "vendorSha256": "1q5z54rz5lqgdv9gfl20gfnzi4in0d65jkfxnmmsx6fjcb9ih4p6", + "version": "3.7.0" }, "ksyun": { "owner": "kingsoftcloud", "provider-source-address": "registry.terraform.io/kingsoftcloud/ksyun", "repo": "terraform-provider-ksyun", - "rev": "v1.3.41", - "sha256": "0p8fl7dkp2nfw73ij769svm83cpvi1rw3aykf0qx33n9si78m892", - "vendorSha256": "1pm4kld23mvgs14z54fpfdvnj0alm8frkkmf0851hi58nazc54dq", - "version": "1.3.41" + "rev": "v1.3.43", + "sha256": "sha256-HOZ1nhHLdiYy+WR2y4OsyRGReK+OJFTaWqYU0X4eEQ0=", + "vendorSha256": "sha256-nbAEaRFtFtB4ftLgnCv3MmkjFFbcNkCuxZc+G8/ObPE=", + "version": "1.3.43" }, "kubectl": { "owner": "gavinbunney", "provider-source-address": "registry.terraform.io/gavinbunney/kubectl", "repo": "terraform-provider-kubectl", - "rev": "v1.13.1", - "sha256": "0jm6zri6j3wdgwg8wixfh6w8il3vnqmwlbpa6scbfa8zq71qi1a0", - "vendorSha256": "1ahxhb6ws1mq4x7nbww8di0b19z6669gn18scqipvxcvmsihfx4m", - "version": "1.13.1" + "rev": "v1.14.0", + "sha256": "sha256-UkUwWi7Z9cSMyZakD6JxMl+qdczAYfZQgwroCUjFIUM=", + "vendorSha256": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=", + "version": "1.14.0" }, "kubernetes": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.7.1", - "sha256": "061zxphysj6spr1giwfnqgy3hh8s4j0lw10gs3cjkqxbpc4bbs7a", + "rev": "v2.9.0", + "sha256": "sha256-w16pm2+8M59grW5HUBBtkKaCnvf5p4GQMEHtQa4DLXs=", "vendorSha256": null, - "version": "2.7.1" + "version": "2.9.0" }, "launchdarkly": { "owner": "launchdarkly", "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.4.1", - "sha256": "1smrdhg6fn9lzrlh0mz822zibnvd1487w5qn38l71ark9dadahqv", + "rev": "v2.5.0", + "sha256": "1083w217y8l6clj3q31f1lanzngfinw682kdqpm0xfssqas7qzx6", "vendorSha256": "13vcxvw56bn7mdz917lvdryd2d7mcvi83ykbzjfbpxr4lzrrm9qw", - "version": "2.4.1" + "version": "2.5.0" }, "libvirt": { "owner": "dmacvicar", "provider-source-address": "registry.terraform.io/dmacvicar/libvirt", "repo": "terraform-provider-libvirt", - "rev": "v0.6.13", - "sha256": "1fvxvijl5vjx7gb4w19pf4gcq97pisiznr2n72ybpma46c2clx2h", - "vendorSha256": "0rck411b4dh2zh4m4m6h2d03zlv5wm94li9dq5ggr0lspfx6nv1i", - "version": "0.6.13" + "rev": "v0.6.14", + "sha256": "1x1xl3blcs4dpjavf4im82l9vrv0plyyiayy475qjf0sl028criy", + "vendorSha256": "1kq0sbz7sv4gw35wl52z7gjv588r82izhrz7ydf5n0c4d2izmg6a", + "version": "0.6.14" }, "linode": { "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.25.1", - "sha256": "1sy3hg9scfidrn3z9ip6ryxghv1s9zlhwccl8k2s2b05xkx43j23", - "vendorSha256": "0c882yafydhdhnp5awb8llzbmiljfdbamqlx740347ywpliy0ga2", - "version": "1.25.1" + "rev": "v1.26.3", + "sha256": "sha256-BVPlzrsX04XCaypKhqM9uvDrevak+qXe+x4mSo2G3kY=", + "vendorSha256": "sha256-mp1w1JXqrpLl8+pFlrBx/P9ZnGKIu8O/FgR73ff/wpQ=", + "version": "1.26.3" }, "linuxbox": { "owner": "numtide", "provider-source-address": "registry.terraform.io/numtide/linuxbox", "repo": "terraform-provider-linuxbox", - "rev": "v0.4.2", - "sha256": "1ghlp0nnc67m5rsx6aixqxjd5vhpbi88gcfyv3710dvqxchdgscy", - "vendorSha256": "01d556pfaa2ycww5kgd1f3shp2i2r48kgwnls39lhplp5qmnkz4g", - "version": "0.4.2" + "rev": "v0.4.3", + "sha256": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", + "vendorSha256": "sha256-Jlg3a91pOhMC5SALzL9onajZUZ2H9mXfU5CKvotbCbw=", + "version": "0.4.3" }, "local": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/local", "repo": "terraform-provider-local", - "rev": "v2.1.0", - "sha256": "0lv1mvy4pkx0sc49xny4j0h30m64lvr3rnmqk85i5p0xhyn77gf2", - "vendorSha256": null, - "version": "2.1.0" + "rev": "v2.2.2", + "sha256": "sha256-JpTdRi9EagrnhYnlq6sl6+t4SE6i7T7YrGTsYCDync8=", + "vendorSha256": "sha256-Ha/MGbXwwhbVxaHbkU2xBhyNcDxLivk7vYQjfVzWOcY=", + "version": "2.2.2" }, "logicmonitor": { "deleteVendor": true, @@ -638,10 +647,10 @@ "owner": "terraform-lxd", "provider-source-address": "registry.terraform.io/terraform-lxd/lxd", "repo": "terraform-provider-lxd", - "rev": "v1.7.0", - "sha256": "1fg9ad6zmkkg8j4sqfan3ibjjb73digg10k5h8xaii778r9bh311", + "rev": "v1.7.1", + "sha256": "0r1d0d6fp3rihxhfsxlay0dqp5rmnja9s369msra8jylqyharnrh", "vendorSha256": "11x12jxh4q99hinpljqfchysgkhch93sgv0mz065ws20y0dxzfvs", - "version": "1.7.0" + "version": "1.7.1" }, "mailgun": { "owner": "wgebis", @@ -665,37 +674,37 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", - "rev": "v3.2.1", - "sha256": "0j07rras4m6i668lkvvn3rq5l67qfzk9bmpijsfk3my0zsgv8nvw", - "vendorSha256": null, - "version": "3.2.1" + "rev": "v3.3.0-alpha.2", + "sha256": "sha256-RUD4BJy0/s23+OWlQfFEh59BEhhtobW7zDOOcosC0l4=", + "vendorSha256": "sha256-Ln9EyycPduVuj+JefH9f+Q5KlNGvbcwcEDgaqH2M0So=", + "version": "3.3.0-alpha.2" }, "minio": { "owner": "aminueza", "provider-source-address": "registry.terraform.io/aminueza/minio", "repo": "terraform-provider-minio", - "rev": "v1.2.0", - "sha256": "07f7kflmy0n8vbcxs2f62iqwm8fw8r97vgwwp38hmz3f1bix42qn", - "vendorSha256": "0pg1m7zp6363c98cww9cv4jsyavq201spc4lxcs5920xz00z86bw", - "version": "1.2.0" + "rev": "v1.5.0", + "sha256": "sha256-wHxslrcjv0SuQhbEv95lkGba61HMimE1JLX4lWgSi3s=", + "vendorSha256": "sha256-j5DWJodrnGm9a3VsOjk0ZeVBh77C00SMMXrK7SNKKrY=", + "version": "1.5.0" }, "mongodbatlas": { "owner": "mongodb", "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.2.0", - "sha256": "08v1byvy7c2wdlbinjxb01vbzvsqfc73nc3cacp40n69z8wl70bi", - "vendorSha256": "19q835m219i85bq7mm5gafpw4q2y4lhbas2ppbfn3hkky15mvwks", - "version": "1.2.0" + "rev": "v1.3.0", + "sha256": "0lrzbljd8iklyrmplc64lq4v8y7z5fw7l41y27nsfjl4rm0xz5bn", + "vendorSha256": "0kkkrdbapyvfzmnbh5kmhlcz5l8g8gf0mfwbya66iy1bb6f6w4mz", + "version": "1.3.0" }, "ncloud": { "owner": "NaverCloudPlatform", "provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud", "repo": "terraform-provider-ncloud", - "rev": "v2.2.1", - "sha256": "0igzwc1hycnlcvgi0il1z94xlb6rlklr1h7j909im1am3p6s3q1s", - "vendorSha256": "1799i4d32y22v6ywwklm3ncmzir5hg8cw23jzb8d28xiw8vswhs4", - "version": "2.2.1" + "rev": "v2.2.6", + "sha256": "sha256-Sw3Z6hi+nm/e+lMQQkk8KIa2AK2+q+0gBUe091GnQq0=", + "vendorSha256": "sha256-ovHg4GcbMzjEi+qJBpdqhR0YUakZCdnpc10SCu8FP8I=", + "version": "2.2.6" }, "netlify": { "owner": "AegirHealth", @@ -710,10 +719,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.35.0", - "sha256": "0pwy3vsj332v82n3is6xaw4mgvv968ffr8n41s1r7j39r8bpl77f", - "vendorSha256": "13xqrdv0xnza0yxdgk155x4vq8lai9jrjvnfp153jb5p5hfnzwmp", - "version": "2.35.0" + "rev": "v2.41.2", + "sha256": "sha256-LCA1K4md1wRRkB7oerUn1MM0TRLcqQBoVpvoxCMGSs8=", + "vendorSha256": "sha256-G/GWIE+XeLiHW0xxyjbIpncAnpBmC/+iZnI8MFmi80k=", + "version": "2.41.2" }, "nomad": { "owner": "hashicorp", @@ -725,14 +734,13 @@ "version": "1.4.16" }, "ns1": { - "deleteVendor": true, "owner": "ns1-terraform", "provider-source-address": "registry.terraform.io/ns1-terraform/ns1", "repo": "terraform-provider-ns1", - "rev": "v1.12.2", - "sha256": "01cmfmg429vp7j8xb9fvfvwg9l3pwjrpv9a4jbdbhh8gaarpw8db", - "vendorSha256": "0nk8xs24hwsarr22h5m1qcpixg7ijdkah5686wkp51y8cp69v25r", - "version": "1.12.2" + "rev": "v1.12.5", + "sha256": "0g69jr96ns2h578cmh5zz27m5dkgygrfr6shvx79wal26fpr8413", + "vendorSha256": "0s70626ng7pvqxnx0a4rp22b8spy45y011bvvm77fndm8fc1w9zn", + "version": "1.12.5" }, "nsxt": { "owner": "vmware", @@ -747,38 +755,38 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/null", "repo": "terraform-provider-null", - "rev": "v3.1.0", - "sha256": "0s6j2py9bb3knrn0f8aga8ypkxj6v5ns08k7zgw26h3wwdxwyd12", - "vendorSha256": null, - "version": "3.1.0" + "rev": "v3.1.1", + "sha256": "sha256-OKnlIt+R16d5GOKqM7/+sApQoC1+nv9h5Ty32QIIMuQ=", + "vendorSha256": "sha256-MtVpbcN/GZRYabsli2mhUXyCuRLRR0NEvcX1iLM552c=", + "version": "3.1.1" }, "nutanix": { "deleteVendor": true, "owner": "nutanix", "provider-source-address": "registry.terraform.io/nutanix/nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.2.2", - "sha256": "08y5hxp28z5mhrbfs0mdwdj694k26gwl0qb80dggmmdil704ajwk", - "vendorSha256": "0s7yi00zskc4j7vnqjfd64pxk2bpk1cqmqgiyxfh7aqqzg22yqkz", - "version": "1.2.2" + "rev": "v1.4.1", + "sha256": "sha256-NUu5MB2Y7wWDgKXMfKKygNUmpvfkEVF2Z1lBMpktIdc=", + "vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=", + "version": "1.4.1" }, "oci": { - "owner": "terraform-providers", - "provider-source-address": "registry.terraform.io/hashicorp/oci", + "owner": "oracle", + "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.60.0", - "sha256": "02wxisy2c9g6kkg6wrgv99qfrds26xwqfj2m3v97y0ldpi2fhbpa", + "rev": "v4.69.0", + "sha256": "sha256-VwL+i4HtvAJi3R57cjUrg+7rx1LxEUAMwkorCvJ9DcU=", "vendorSha256": null, - "version": "4.60.0" + "version": "4.69.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.20.3", - "sha256": "0m9y0dagav1pw8cz6pv9zkhag59f9bbn8b6zi1h3lcgvmzf303wv", - "vendorSha256": "156nyjga5q5mgwiq6aynp199i0hn5mvckj2h7j3pfzc1yz8ri5cc", - "version": "3.20.3" + "rev": "v3.22.1", + "sha256": "sha256-G1KJJSxJmzFlIUWOs+7htcgp61oWCu+ryCKaIHzxhzw=", + "vendorSha256": "sha256-n7ih8QtapA+xno1twlM2b2XGEesdJdJIPD+QWpmJDVA=", + "version": "3.22.1" }, "oktaasa": { "owner": "oktadeveloper", @@ -803,37 +811,37 @@ "owner": "OpenNebula", "provider-source-address": "registry.terraform.io/OpenNebula/opennebula", "repo": "terraform-provider-opennebula", - "rev": "v0.4.0", - "sha256": "1r6v1ksis0h9mairvn9mwk49dkn6s6ixi8j0jaz9w173lx5si917", - "vendorSha256": "0qyzavig8wnnjzm63pny5azywqyrnjm978yg5y0sr6zw8wghjd15", - "version": "0.4.0" + "rev": "v0.4.3", + "sha256": "sha256-mnRRMubaz5hin4kG5NK+GMtTPcsIJu6GS8PKDitNszg=", + "vendorSha256": "sha256-JTQJH0f8m6yBL8+jk6q02WPuvyre3mHql9Zy9OJW32M=", + "version": "0.4.3" }, "openstack": { "owner": "terraform-provider-openstack", "provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack", "repo": "terraform-provider-openstack", - "rev": "v1.46.0", - "sha256": "1kkqfr0i33kw0qj3dp5knxm14p1ndy72n4chd36dhkydp4rm688f", - "vendorSha256": "10vcxqh77wqxwzsrq1y0rlyl7wazl5glmsqbz5wfvrq5b9q1r75x", - "version": "1.46.0" + "rev": "v1.47.0", + "sha256": "0hbp5hk3b9fdsyqkxb3fzpjiw5dd7h7f3gs3xv5imzkfv1dmqghz", + "vendorSha256": "007qmkgp5svhy7gvlkbyxllh0ijsk4xq5kmy7zmjgf7mawp16ny6", + "version": "1.47.0" }, "opentelekomcloud": { "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.27.3", - "sha256": "17n1vy9h2blw9k3p82sbcz9zbj4hilg33qga5n09nq2ngafagazg", - "vendorSha256": "12ahdbb83gxb9dcax635ngr54cqvnydr7l65h5dvv7b2gfldb1ki", - "version": "1.27.3" + "rev": "v1.28.2", + "sha256": "sha256-qp5H37Zf9oPYA2vvWKuEpfUeHIfK1NYE9Uk7dcX9izA=", + "vendorSha256": "sha256-FMcPG7EJvU6XNKd2+8+xmjqSI0Ec9Xx/6gZvK9zJ3wg=", + "version": "1.28.2" }, "opsgenie": { "owner": "opsgenie", "provider-source-address": "registry.terraform.io/opsgenie/opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.8", - "sha256": "10lq9gfmpwc56m6rihxjc5hkglmfh6sqsa0fwsypw6709488a7yq", + "rev": "v0.6.10", + "sha256": "1kxq66skal10nx5mgk8qj15chk01fi1pjamgakr1j56m1dgw03cw", "vendorSha256": null, - "version": "0.6.8" + "version": "0.6.10" }, "oraclepaas": { "owner": "terraform-providers", @@ -857,19 +865,19 @@ "owner": "PagerDuty", "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", - "rev": "v2.2.1", - "sha256": "0nhn47bd9lqs14wvxjkvhsnzgm6iys5icy5ydmsma3p2fb90qgas", + "rev": "v2.3.0", + "sha256": "02k416zgjg2f4bl4ilxbg0ig2lh86qc4pv96p2slpzyg8ypf87zg", "vendorSha256": null, - "version": "2.2.1" + "version": "2.3.0" }, "panos": { "owner": "PaloAltoNetworks", "provider-source-address": "registry.terraform.io/PaloAltoNetworks/panos", "repo": "terraform-provider-panos", - "rev": "v1.9.2", - "sha256": "03585rm434lcp6xk58185i78iv5fjd18z7nrdnbhxxy94yhhf335", + "rev": "v1.10.0", + "sha256": "1nh1kc8pz10014p6dw8l2qdiqxdgcj5yy3da2qhbarwn0qm9fs36", "vendorSha256": null, - "version": "1.9.2" + "version": "1.10.0" }, "pass": { "owner": "camptocamp", @@ -884,10 +892,10 @@ "owner": "cyrilgdn", "provider-source-address": "registry.terraform.io/cyrilgdn/postgresql", "repo": "terraform-provider-postgresql", - "rev": "v1.14.0", - "sha256": "08z8i2y4qmq7zd50hjaiz6vazwb9yszm1c0mxc87sxayj0mcyl6r", - "vendorSha256": null, - "version": "1.14.0" + "rev": "v1.15.0", + "sha256": "04gm7y5qyvipg0a0glgyx257vjrkk4k5pjrvzik6adyrjyidixw1", + "vendorSha256": "0pp9c76zdpfyq57jcwv258gipvmy6hjqi933xdi155hkx45cnixr", + "version": "1.15.0" }, "powerdns": { "owner": "pan-net", @@ -920,28 +928,28 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/random", "repo": "terraform-provider-random", - "rev": "v3.1.0", - "sha256": "1677mia6bbydqa8w50f1y85rynpv9lhg9ar5s6japsr5g78lrcqf", - "vendorSha256": null, - "version": "3.1.0" + "rev": "v3.1.2", + "sha256": "sha256-Yk1CPR9gN70E+Qpc20vBQG2MY/RCO5cvaNtD8N++d5A=", + "vendorSha256": "sha256-/IjOv7/kQlGuV9+9Vhc7zUrr6hbcoxZyKi+q52YA/kk=", + "version": "3.1.2" }, "rundeck": { "owner": "rundeck", "provider-source-address": "registry.terraform.io/rundeck/rundeck", "repo": "terraform-provider-rundeck", - "rev": "v0.4.2", - "sha256": "0447hsmdf8k4464m56c7ipn9a05rv6hlrjb7q8b1jdwh2j5yq8pr", + "rev": "v0.4.3", + "sha256": "1bvk5mfjpl57dfglksnz1cnvd5qgk2cnidwiwjwa3ssmm2kzji8s", "vendorSha256": null, - "version": "0.4.2" + "version": "0.4.3" }, "scaleway": { "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.0", - "sha256": "1l9cmdz46rhvbnlyxi3hyk8rszf44xphpz22w56mrbi91z1yr8c1", - "vendorSha256": "0zbz0y3fg94c9794jgfcqngh1xcyqcdhcgmy74pdscrvydjhd5z8", - "version": "2.2.0" + "rev": "v2.2.1-rc.1", + "sha256": "0f4sizgcy3000k67nb3axa8xhpczvzdla3bnpda27jdrx22ckyz8", + "vendorSha256": "11g5v5kvs4qxdg34ai7fpinwbshrjwi9hxzav2vpnzhy8lfqpkzb", + "version": "2.2.1-rc.1" }, "secret": { "owner": "numtide", @@ -956,10 +964,10 @@ "owner": "selectel", "provider-source-address": "registry.terraform.io/selectel/selectel", "repo": "terraform-provider-selectel", - "rev": "v3.7.1", - "sha256": "02sfzrs3k907djcyjz7qn42b21wccykw0fw65ms34h5vz5ld73mx", - "vendorSha256": null, - "version": "3.7.1" + "rev": "v3.8.0", + "sha256": "0qc08v217cv2i43cxcx854rvhihrlhlakfark37vcdrh9z6swf1n", + "vendorSha256": "1mjp5yqwl1nya82yf5v6l3sq7iv0m94xy5w7y5avn8h40dl1wfnf", + "version": "3.8.0" }, "sentry": { "owner": "jianyuan", @@ -983,10 +991,10 @@ "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.7.10", - "sha256": "113q9wwvz0lxn1l948g5mnwbpd76q8j2pm9q90nbkg1yvwsidsqi", - "vendorSha256": "1dd42a9kqsrvvllign6g9kzb0jvav71x7kg9n2w9rs9wvmmang4w", - "version": "6.7.10" + "rev": "v6.11.0", + "sha256": "sha256-ezd4TzckY5yx/UjwGxH36VX+owI8fBUmxtQFztOsFvs=", + "vendorSha256": "sha256-PVbqS37MBkIrr8CO6LxB0NjWWiTI5NFDipX6GvokrnY=", + "version": "6.11.0" }, "skytap": { "owner": "skytap", @@ -997,6 +1005,15 @@ "vendorSha256": null, "version": "0.14.5" }, + "snowflake": { + "owner": "chanzuckerberg", + "provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake", + "repo": "terraform-provider-snowflake", + "rev": "v0.29.0", + "sha256": "sha256-CdJHknGzEKfbxzrtqmevKwiYTs1UoRFRj6/ShQ9mdIc=", + "vendorSha256": "sha256-G/UIKuKtolLY7RIQF06wzn/ZYTMihEmJZ1DqVcHFGdg=", + "version": "0.29.0" + }, "sops": { "owner": "carlpett", "provider-source-address": "registry.terraform.io/carlpett/sops", @@ -1010,10 +1027,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.65.0", - "sha256": "1gk4v6lxa4k8za6c1zxrrrc6qw3ymsk46w97qhfri6y7vrc3vxh0", - "vendorSha256": "0xhzj8lmrh0mcpbxa7xkzhhgl3jfk6mz5adia0jgflgrx4wjaf38", - "version": "1.65.0" + "rev": "v1.69.0", + "sha256": "sha256-pTQvqjh52B9w383yLvhNjDujSgQI1k8WpA1vpcY7RKI=", + "vendorSha256": "sha256-X7K0eHbmGBYnJ5ovnD/y6O9r7TTHgK7f7s9w4R5ThBU=", + "version": "1.69.0" }, "stackpath": { "owner": "stackpath", @@ -1028,19 +1045,19 @@ "owner": "StatusCakeDev", "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake", "repo": "terraform-provider-statuscake", - "rev": "v1.0.1", - "sha256": "16pwsna1bkrdppxn2vjgbx552vsg4f2igykcb26mw3vp6n9piwfl", - "vendorSha256": null, - "version": "1.0.1" + "rev": "v2.0.1-pre", + "sha256": "sha256-/SWmGy6kMAt4TAswlpmfs4rVAa/DZBFoE1Yv+EcWfGo=", + "vendorSha256": "sha256-sFKhbOsE2eQ4Qxfbtab19nZRIKhJXNdsg274tWRjoVg=", + "version": "2.0.1-pre" }, "sumologic": { "owner": "SumoLogic", "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", - "rev": "v2.11.5", - "sha256": "1k3z0rbnqfjrz4awrmid03g7lmalkya7m60l22qdhpsc6c6pg0mp", - "vendorSha256": "0jfzyzlfvpkbxi60439hmsrn2qqm86ghb859jl4mphd6g7p75zdj", - "version": "2.11.5" + "rev": "v2.13.0", + "sha256": "1jg6jdmxi60v8gsqycnq7jy89l2zls37zvl317vhp8f93si2hr2d", + "vendorSha256": "19zhpa47wxkxk2nixd960xz9xh38nq5ml7dwnimr4v1mpvw9hcgc", + "version": "2.13.0" }, "template": { "owner": "hashicorp", @@ -1055,28 +1072,28 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.61.2", - "sha256": "1i9jyz4r344swdvnnpgz2s1ds5b5s2hif3bjr82mmfd7gshyagnq", + "rev": "v1.66.1", + "sha256": "sha256-kzEU+yDm8O9tBNkf+qy945drnPj8wNR4VfBPO6fcbGE=", "vendorSha256": null, - "version": "1.61.2" + "version": "1.66.1" }, "tfe": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", - "rev": "v0.27.0", - "sha256": "00lra2d8dzczlmx74cblk7hglj2dvlkkgv30ndb85fbmaq2jqw0n", - "vendorSha256": "0p2kdf7l6k75c9ngfysj70fqf3my8fsm41gi8d1j1djfsxgzfpxs", - "version": "0.27.0" + "rev": "v0.29.0", + "sha256": "sha256-2RksakMtNF0FGdUmJ4BBF6pvO2SrW0BNlQo95GIJSK4=", + "vendorSha256": "sha256-Nh22X4Unt77oWs/jf2PjZcxrz0nkyJrOY55ZbA972v8=", + "version": "0.29.0" }, "thunder": { "owner": "a10networks", "provider-source-address": "registry.terraform.io/a10networks/thunder", "repo": "terraform-provider-thunder", - "rev": "v0.5.21-beta", - "sha256": "1z52ifdi0nj3miwjz96zkmszh13l3vcbijgacfa28j2shasjyfwd", + "rev": "v1.0.0", + "sha256": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", "vendorSha256": null, - "version": "0.5.21-beta" + "version": "1.0.0" }, "time": { "owner": "hashicorp", @@ -1110,28 +1127,37 @@ "owner": "turbot", "provider-source-address": "registry.terraform.io/turbot/turbot", "repo": "terraform-provider-turbot", - "rev": "v1.8.2", - "sha256": "16nxngn7mx7049mar7azj03pyslmf9wri50kwhimkfjva0k9zbl7", + "rev": "v1.8.3", + "sha256": "0jx37w4sbm7gj8vqnb58rg24s6fafc73ds954vqh9rjn8a6x0qz9", "vendorSha256": null, - "version": "1.8.2" + "version": "1.8.3" }, "ucloud": { "owner": "ucloud", "provider-source-address": "registry.terraform.io/ucloud/ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.30.0", - "sha256": "1difp4nkyr8hp9l3ik5vdxl3kxiq9i342mmpc0j3drmr341djf1s", + "rev": "v1.31.0", + "sha256": "0maiqxrr1xl2q4lgpv0d78znsrrl95qi2bgpr5jd14w1kvw2bj73", "vendorSha256": null, - "version": "1.30.0" + "version": "1.31.0" + }, + "utils": { + "owner": "cloudposse", + "provider-source-address": "registry.terraform.io/cloudposse/utils", + "repo": "terraform-provider-utils", + "rev": "0.17.17", + "sha256": "sha256-QJtdCEw8bnVku4fqAX5MBU9tkPv5jwjra9lGPfUPGQw=", + "vendorSha256": "sha256-5EelFIfHVLRiRJig6EeJG6KGJuQ05LX3M5CNxUxQAas=", + "version": "0.17.17" }, "vault": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v3.2.1", - "sha256": "0y8vvc5mckzjs24x36rihl1vdvh9k2kazn5lsqvq6apv36kg5vw4", - "vendorSha256": "0j5kz5jvyds701gq89v8dcsvm67kbfxxgzjvmn74ms3nrkx8hr84", - "version": "3.2.1" + "rev": "v3.4.0", + "sha256": "sha256-guacIY3iXieTiEXJ8mnq6gNWHs1doTNGJ8Su5PTfnaY=", + "vendorSha256": "sha256-JiNYM8P6ExGVVOVBYA2WJSZOpZ0PAyoncENqYRXPo7c=", + "version": "3.4.0" }, "vcd": { "owner": "vmware", @@ -1147,10 +1173,10 @@ "owner": "Venafi", "provider-source-address": "registry.terraform.io/Venafi/venafi", "repo": "terraform-provider-venafi", - "rev": "v0.13.0", - "sha256": "1gvr0g622ddc8sw7f1g6vqw6wvzmm26qqzw7dljmgbvch0xyal86", - "vendorSha256": "1hk8nwm29yfbvwy6h8lv136vvh8nynjnqifzjdriqv2ldxl6pykj", - "version": "0.13.0" + "rev": "v0.15.2", + "sha256": "sha256-jnBunvqdLuU+GTRoXr/62FSnUoD5nfLVCN/wo4NdM3A=", + "vendorSha256": "sha256-lj8cuv9jR+3P7OiO/eW8poHcX+LsQo+kOyspiqdMXRY=", + "version": "0.15.2" }, "vercel": { "owner": "ondrejsika", @@ -1165,54 +1191,54 @@ "owner": "vpsfreecz", "provider-source-address": "registry.terraform.io/vpsfreecz/vpsadmin", "repo": "terraform-provider-vpsadmin", - "rev": "v0.2.0", - "sha256": "1jb5s8lv8az1az9an8kj8bi0hh71zcaw5mpa4zyba5xk1vqig0kv", - "vendorSha256": "1xnscd7yir736y913r7nvn3a78h8cwc7m206h0vcc0hrl1jvf45i", - "version": "0.2.0" + "rev": "v1.0.0", + "sha256": "1ci86ikdz8i6gwdiif4ayx15hjm9phr756rvywz8pblaa6niwl9h", + "vendorSha256": "1wc0kzinz39kv4gib438js2qv07ndm6yj2qpj041d75hnlq06drv", + "version": "1.0.0" }, "vra7": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/vra7", "repo": "terraform-provider-vra7", - "rev": "v3.0.3", - "sha256": "0f4mc7gbjbzw4x6rw6cbhc9xrmkhwhvjdzcinvc96pfm2fy3cdxh", + "rev": "v3.0.4", + "sha256": "1w16cl27fqpzy1v6cdp61shgrmj787fdfjwhr719n57hqax4pck5", "vendorSha256": null, - "version": "3.0.3" + "version": "3.0.4" }, "vsphere": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vsphere", "repo": "terraform-provider-vsphere", - "rev": "v2.0.2", - "sha256": "0ncl2vs6gcx9wm710hg575hqinkg45ds73n209xwdbpxlbv8qb7m", + "rev": "v2.1.1", + "sha256": "sha256-Xu5BMmOHEX+ctPu8374BDGsRC5hnvzji5oI69ptIi3Y=", "vendorSha256": null, - "version": "2.0.2" + "version": "2.1.1" }, "vultr": { "owner": "vultr", "provider-source-address": "registry.terraform.io/vultr/vultr", "repo": "terraform-provider-vultr", - "rev": "v2.9.0", - "sha256": "0hx1n1wcjx40s94bysr14j0w4bc1xzkrrmkpjcwwbqywn75p6ggw", + "rev": "v2.10.0", + "sha256": "sha256-4WoTMyGKBTYzoqt0Ih+khfsaeJuKox5Sq9ak9xwvvJQ=", "vendorSha256": null, - "version": "2.9.0" + "version": "2.10.0" }, "wavefront": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/wavefront", "repo": "terraform-provider-wavefront", - "rev": "v3.0.0", - "sha256": "1awi74b7ny021krck0vp1gv6v93a4h0rgdl5xib82lf5pxnx4wgn", - "vendorSha256": "0gbwj4cqywip22irkx9hyghy6zx9dirm6gd3i70nclchvkg9dm1x", - "version": "3.0.0" + "rev": "v3.0.2", + "sha256": "sha256-HCo6Hw724kQrPOCHoyByThq7L5NIZ/0AHmnQD27RUFA=", + "vendorSha256": "sha256-PdSW3tyQUWbBiaM9U3NsqX/j4fMw9ZmjEDdyjxmRfD0=", + "version": "3.0.2" }, "yandex": { "owner": "yandex-cloud", "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", - "rev": "v0.70.0", - "sha256": "0dmhzjwcd0j7rfczxahami23yjcc0pr10m12iig3z4hj9kgikzvy", - "vendorSha256": "0zx2lq9va0llrjlf3lk8pnx6f5knmi4jjxrnll89kp01imydjqv8", - "version": "0.70.0" + "rev": "v0.72.0", + "sha256": "0sjwyaqb7rgmwpskw95gmb5k0bfj06f9s8kn76rk1hc8rdqrl251", + "vendorSha256": "1bh7sc210n3rzq5065qzch8pfq3ppcg6fhy7yha23xaa5j8yabqx", + "version": "0.72.0" } } diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers index 46f0ce1be561..d7a05cf24a65 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers @@ -5,7 +5,7 @@ # Update all providers which have specified provider source address set -euo pipefail -providers=$( +readarray -t providers < <( jq -r 'to_entries | map_values(.value + { alias: .key }) | .[] @@ -13,10 +13,13 @@ providers=$( | .alias' providers.json ) -echo "Will update providers:" -echo "${providers}" +cat </] +Usage: ./update-provider [--force] [--no-build] [/] Update a single provider in the providers.json inventory file. @@ -27,14 +27,14 @@ to add the provider to the list: Options: * --force: Force the update even if the version matches. - * --vendor: Switch from go package to go modules with vendor. + * --no-build: Don't build provider * --vendor-sha256 : Override the SHA256 or "null". DOC } force= provider= -vendor= +build=1 vendorSha256= while [[ $# -gt 0 ]]; do @@ -47,9 +47,8 @@ while [[ $# -gt 0 ]]; do force=1 shift ;; - --vendor) - force=1 - vendor=1 + --no-build) + build=0 shift ;; --vendor-sha256) @@ -76,45 +75,46 @@ if [[ -z ${provider} ]]; then exit 1 fi -provider_name=$(basename "${provider}") - # Usage: read_attr read_attr() { - jq -r ".\"${provider_name}\".\"$1\"" providers.json + jq -r ".\"${provider}\".\"$1\"" providers.json } # Usage: update_attr update_attr() { if [[ $2 == "null" ]]; then - jq -S ".\"${provider_name}\".\"$1\" = null" providers.json | sponge providers.json + jq -S ".\"${provider}\".\"$1\" = null" providers.json | sponge providers.json else - jq -S ".\"${provider_name}\".\"$1\" = \"$2\"" providers.json | sponge providers.json + jq -S ".\"${provider}\".\"$1\" = \"$2\"" providers.json | sponge providers.json fi } -prefetch_github() { - # of a given owner, repo and rev, fetch the tarball and return the output of - # `nix-prefetch-url` - local owner=$1 - local repo=$2 - local rev=$3 - nix-prefetch-url --unpack "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz" +repo_root=$(git rev-parse --show-toplevel) + +generate_hash() { + nix-prefetch -I nixpkgs="${repo_root}" \ + "{ sha256 }: (import ${repo_root} {}).terraform-providers.${provider}.$1.overrideAttrs (_: { $2 = sha256; })" } -old_source_address="$(read_attr provider-source-address)" -old_vendor_sha256=$(read_attr vendorSha256) -old_version=$(read_attr version) +echo_provider() { + echo "== terraform-providers.${provider}: $* ==" +} if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then + echo_provider "init" source_address=registry.terraform.io/${provider} + provider=$(basename "${provider}") + update_attr "provider-source-address" "${source_address}" + update_attr version "0" + # create empty stings so nix-prefetch works + update_attr sha256 "" + update_attr vendorSha256 "" else - source_address=${old_source_address} + source_address="$(read_attr provider-source-address)" fi -if [[ ${source_address} == "null" ]]; then - echo "Could not find the source address for provider: ${provider}" - exit 1 -fi -update_attr "provider-source-address" "${source_address}" + +old_vendor_sha256=$(read_attr vendorSha256) +old_version=$(read_attr version) # The provider source address (used inside Terraform `required_providers` block) is # used to compute the registry API endpoint @@ -126,8 +126,10 @@ registry_response=$(curl -s https://"${source_address/\///v1/providers/}") version="$(jq -r '.version' <<<"${registry_response}")" if [[ ${old_version} == "${version}" && ${force} != 1 && -z ${vendorSha256} && ${old_vendor_sha256} != "${vendorSha256}" ]]; then - echo "${provider_name} is already at version ${version}" + echo_provider "already at version ${version}" exit +else + echo_provider "updating from ${old_version} to ${version}" fi update_attr version "${version}" @@ -139,28 +141,23 @@ repo="$(echo "${provider_source_url}" | cut -d '/' -f 5)" update_attr repo "${repo}" rev="$(jq -r '.tag' <<<"${registry_response}")" update_attr rev "${rev}" -sha256=$(prefetch_github "${org}" "${repo}" "${rev}") +echo_provider "calculating sha256" +sha256=$(generate_hash src outputHash) update_attr sha256 "${sha256}" -repo_root=$(git rev-parse --show-toplevel) - if [[ -z ${vendorSha256} ]]; then if [[ ${old_vendor_sha256} == null ]]; then vendorSha256=null - elif [[ -n ${old_vendor_sha256} || ${vendor} == 1 ]]; then - echo "=== Calculating vendorSha256 ===" - vendorSha256=$(nix-prefetch -I nixpkgs=../../../../.. "{ sha256 }: (import ../../../../.. {}).terraform-providers.${provider_name}.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })") - # Deal with nix unstable - if [[ ${vendorSha256} == sha256-* ]]; then - vendorSha256=$(nix --extra-experimental-features nix-command hash to-base32 "${vendorSha256}") - fi + else + echo_provider "calculating vendorSha256" + vendorSha256=$(generate_hash go-modules vendorSha256) fi fi -if [[ -n ${vendorSha256} ]]; then - update_attr vendorSha256 "${vendorSha256}" -fi +update_attr vendorSha256 "${vendorSha256}" # Check that the provider builds -echo "=== Building terraform-providers.${provider_name} ===" -nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider_name}" +if [[ ${build} == 1 ]]; then + echo_provider "building" + nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider}" +fi diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a5e92bedef6a..897acd76237a 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, buildEnv , buildGoModule , fetchFromGitHub , makeWrapper @@ -87,7 +86,26 @@ let withPlugins (x: newplugins x ++ actualPlugins); full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p)); - # Ouch + # Expose wrappers around the override* functions of the terraform + # derivation. + # + # Note that this does not behave as anyone would expect if plugins + # are specified. The overrides are not on the user-visible wrapper + # derivation but instead on the function application that eventually + # generates the wrapper. This means: + # + # 1. When using overrideAttrs, only `passthru` attributes will + # become visible on the wrapper derivation. Other overrides that + # modify the derivation *may* still have an effect, but it can be + # difficult to follow. + # + # 2. Other overrides may work if they modify the terraform + # derivation, or they may have no effect, depending on what + # exactly is being changed. + # + # 3. Specifying overrides on the wrapper is unsupported. + # + # See nixpkgs#158620 for details. overrideDerivation = f: (pluggable (terraform.overrideDerivation f)).withPlugins plugins; overrideAttrs = f: @@ -102,12 +120,35 @@ let terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; }) else - lib.appendToName "with-plugins" (buildEnv { + lib.appendToName "with-plugins" (stdenv.mkDerivation { inherit (terraform) name meta; - paths = actualPlugins; nativeBuildInputs = [ makeWrapper ]; - postBuild = '' - mkdir -p $out/bin + + # Expose the passthru set with the override functions + # defined above, as well as any passthru values already + # set on `terraform` at this point (relevant in case a + # user overrides attributes). + passthru = terraform.passthru // passthru; + + buildCommand = '' + # Create wrappers for terraform plugins because Terraform only + # walks inside of a tree of files. + for providerDir in ${toString actualPlugins} + do + for file in $(find $providerDir/libexec/terraform-providers -type f) + do + relFile=''${file#$providerDir/} + mkdir -p $out/$(dirname $relFile) + cat < $out/$relFile + #!${runtimeShell} + exec "$file" "$@" + WRAPPER + chmod +x $out/$relFile + done + done + + # Create a wrapper for terraform to point it to the plugins dir. + mkdir -p $out/bin/ makeWrapper "${terraform}/bin/terraform" "$out/bin/terraform" \ --set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \ --prefix PATH : "${lib.makeBinPath wrapperInputs}" @@ -150,9 +191,9 @@ rec { }; terraform_1 = mkTerraform { - version = "1.1.4"; - sha256 = "sha256-PzBdo4zqWB9ma+uYFGmZtJNCXlRnAHxQmzWxZFPzHH0="; - vendorSha256 = "sha256-Rk2hHtJfaS553MJIea6n51irMas3qcBrWAD+adzTi1Y="; + version = "1.1.7"; + sha256 = "sha256-E8qY17MSdA7fQW4wGSDiPzbndBP5SZwelAJAWzka/io="; + vendorSha256 = "sha256-lyy/hcr00ix6qZoxzSfCbXvDC8dRB2ZjrONywpqbVZ8="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 3753e9393ce8..48025dfd7f72 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.36.0"; + version = "0.36.6"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HUhV6FcLd75ZOPKw9Fl+7KUsSVG7HpQ6X2JZo9C9eeA="; + sha256 = "sha256-WSvdv4E/m6mJZdo3s9FHMETKaYNB7mltWrQlTHTFJ/E="; }; vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg="; diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/applications/networking/cluster/tfswitch/default.nix index f8473481cc01..3e872c27142d 100644 --- a/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/pkgs/applications/networking/cluster/tfswitch/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tfswitch"; - version = "0.13.1201"; + version = "0.13.1218"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = version; - sha256 = "sha256-gJa8oVdgerDi0GdTSNus5rHLsFuzg8ZqVeKTMuPXu0o="; + sha256 = "sha256-RJdbNXO+6TqFLapWiZ1UeXGS5522ykQvhhNDEHPr8xE="; }; - vendorSha256 = "sha256-z3UDrwlMHFFH56U3oylSWE3wqWOCA4RI2smafHHwYkQ="; + vendorSha256 = "sha256-Xqgki072Iy+snRriPVJ9oaDNJ/LiKL+AuU+eVw0zlDU="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/pkgs/applications/networking/cluster/tgswitch/default.nix b/pkgs/applications/networking/cluster/tgswitch/default.nix index 9a1652f25d36..5f669a6b9d8a 100644 --- a/pkgs/applications/networking/cluster/tgswitch/default.nix +++ b/pkgs/applications/networking/cluster/tgswitch/default.nix @@ -1,13 +1,13 @@ { buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { pname = "tgswitch"; - version = "0.5.378"; + version = "0.5.389"; src = fetchFromGitHub { owner = "warrensbox"; repo = "tgswitch"; rev = version; - sha256 = "0q2aqh75acbpkmvkws0rl3d5dzq3sisy637c0x6cnc88h34g3n3i"; + sha256 = "sha256-6hErfI7LEJFgOoJR8IF9jTSBwqbQYeGiwdeJShqxVQ0="; }; goPackagePath = "github.com/warrensbox/tgswitch"; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index dbdf06771b46..c13c08c44a43 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule 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.23.4"; + version = "0.26.3"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SWofXsbkuirPvqgU639W8IQklafLKbThoZUzOzfYwdQ="; + sha256 = "sha256-jrVf6vNlEkTgALS93o3kIiticvsyFHm5oA2Fh1edAGY="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index f8d4e5f52c88..7f1476d7fbf8 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGo117Module rec { +buildGoModule rec { pname = "vcluster"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+rLDRVfB6wZ1wYoLE2wwRxzS6GmI6KYtOKdXZd+LnnU="; + sha256 = "sha256-kY12bsZyDb36KE2dWx6RVYlKTbJh+XFQcBpFXoCLgEM="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index d373316b19ff..88c3a31fd2d7 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-Jz3Tp5FqpmPuBscRB0KleQxtCvB43qmeLZNtGPnjuL0="; + sha256 = "sha256-oiYr9JQlJVxjZxGhZyOIUy934KedBmDhzK+71qmaD58="; }; ldflags = [ @@ -18,9 +18,9 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" ]; - vendorSha256 = "sha256-fX9FeoIkxxSi3dl5W2MZLz5vN1VHkPNpTBGRxGP5Qx8="; + vendorSha256 = "sha256-DyQ+MHRNZFg80Yz/SCxhnF4NVbIsyhz4mApx0+kgHoA="; - excludedPackages = [ "issue-template-gen" "crd-gen" "release-tools" "velero-restic-restore-helper" "v1" "v1beta1" ]; + excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; doCheck = false; # Tests expect a running cluster see https://github.com/vmware-tanzu/velero/tree/main/test/e2e doInstallCheck = true; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index b0d0d6193e27..128717191725 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,17 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.4.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JB/0nU/05Agh4fWFeSfrUHFtR8cQjxdXW0QHAoH0dDc="; + sha256 = "sha256-ek3WOL1sNPAIkZN/cWDSmlNtN41VL3SKb7Qb4kew8vo="; }; - deleteVendor = true; - vendorSha256 = "sha256-2YrCRdpRk+gPHN8flahgWb2sbK5dYL5ivVqeJSsiy8Y="; + vendorSha256 = "sha256-a0O36zyQQSVrGXWpTdCkAAwNAXU23pcFJBB+o2KYnWw="; nativeBuildInputs = [ go-bindata installShellFiles ]; @@ -77,7 +76,6 @@ buildGoModule rec { through a consistent and repeatable workflow. ''; license = licenses.mpl20; - maintainers = with maintainers; [ winpat jk ]; - platforms = platforms.linux; + maintainers = with maintainers; [ winpat jk techknowlogick ]; }; } diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index fdc1648dbf7f..9a9f454ac003 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "werf"; - version = "1.2.56"; + version = "1.2.78"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-6gDSH/YWkXeYyEwJDYNNCAWTBjwGx7kNcsCqmmwqJy0="; + sha256 = "sha256-ehrzb7WvkYL8oj2RSzKc1KDagV0zg6vMzgpT2sPyhcI="; }; - vendorSha256 = "sha256-Cod7nFLu6au0uxrJLBf7SG1YBasRzmDjt+FmtZqMw3U="; + vendorSha256 = "sha256-w8ZeAQbZIVOBoRa9fJhXgTeYRCYpkh/U4pwb5u6A9mQ="; proxyVendor = true; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/cozy-drive/default.nix b/pkgs/applications/networking/cozy-drive/default.nix index 57a791d9db4d..9c0fda32acea 100644 --- a/pkgs/applications/networking/cozy-drive/default.nix +++ b/pkgs/applications/networking/cozy-drive/default.nix @@ -5,12 +5,12 @@ let pname = "cozydrive"; - version = "3.30.1"; + version = "3.32.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/cozy-labs/cozy-desktop/releases/download/v${version}/Cozy-Drive-${version}-x86_64.AppImage"; - sha256 = "06w305l5iadd4k70jvrvw2scwlfxycign2nz0f2vrwwhqy8bpfqs"; + sha256 = "0qd5abswqbzqkk1krn9la5d8wkwfydkqrnbak3xmzbdxnkg4gc9a"; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 92421b33a21c..c6ada11d356c 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.13.1"; + version = "3.15.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S3/uxtrCFU9HbNhYKqOYy1ytSVi2DU/lXIlhBgNnaPg="; + sha256 = "sha256-znBvV6z5rMfLeyEBRmAtfwVw1is5jJlGPQplXqEGAAM="; }; - vendorSha256 = "sha256-OwiZL+MBmAFtV8Vg2Wl9yAeTG3AzMSmCjefxObU7lfQ="; + vendorSha256 = "sha256-S2og/isDy6Jvo9XgIV6XbgrmRJsLnePwh/gll/14Ds0="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 9c4340fffedb..a65110b80232 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -24,8 +24,8 @@ let comment = "Sync your files across computers and to the web"; desktopName = "Dropbox"; genericName = "File Synchronizer"; - categories = "Network;FileTransfer;"; - startupNotify = "false"; + categories = [ "Network" "FileTransfer" ]; + startupNotify = false; icon = "dropbox"; }; in diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix index 9b173e856827..633c1e744bb6 100644 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix +++ b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix @@ -11,6 +11,7 @@ , wrapGAppsHook , glib +, glib-networking , gtk3 , libhandy , listparser ? callPackage ./listparser.nix { } @@ -44,6 +45,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib + glib-networking gtk3 libhandy webkitgtk diff --git a/pkgs/applications/networking/feedreaders/photon/default.nix b/pkgs/applications/networking/feedreaders/photon/default.nix index 8e4c85cebeae..0a02c1db1818 100644 --- a/pkgs/applications/networking/feedreaders/photon/default.nix +++ b/pkgs/applications/networking/feedreaders/photon/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { proxyVendor = true; - vendorSha256 = "sha256-MLNgaxxvPGRzBEWRuKTDskl0J2IVushW11E5prpYsE4="; + vendorSha256 = "sha256-1vlgnY4kZJfoAtbv+r8onxL03Ak32zKLJgtrBYZX09g="; meta = with lib; { description = "RSS/Atom reader with the focus on speed, usability and a bit of unix philosophy"; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index d79356da835d..96d3e773c88c 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,15 +1,18 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib +, python3Packages +, fetchFromGitHub +}: python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.2.15"; + version = "3.3.4"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "0ygkygd0gcldwdx6wl1kbvzi93k75m0v05m614cahh0jc7j27xy7"; + hash = "sha256-/nuY8+/RMM7ASke+NXb95yu+FeQHawCdgqVsBrk/KZ8="; }; postPatch = '' @@ -18,7 +21,7 @@ python3Packages.buildPythonApplication rec { ln -sf requirements.in requirements.txt # remove dependency constraints - sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt + sed 's/[>=]=.*//' -i requirements.txt # "zxcvbn-python" was renamed to "zxcvbn", and we don't have the former in # nixpkgs. See: https://github.com/NixOS/nixpkgs/issues/62110 diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 0ffa9e1023bd..d5e73f833c3a 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.57.0"; + version = "3.58.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "sha256-gr9scHfKEwElSTVrRjlS8STuBIdvIeS6cgrMmBHImcc="; + sha256 = "sha256-0P5/cuAfd0K6oGRmgYsYbo6R//Ytbuey8OiEtrM4XYg="; }; # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index ff620989f9de..9fc1e25a92d7 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -6,15 +6,19 @@ buildGoModule rec { pname = "gmailctl"; - version = "0.10.0"; + # on an unstable version because of https://github.com/mbrt/gmailctl/issues/232 + # and https://github.com/mbrt/gmailctl/commit/484bb689866987580e0576165180ef06375a543f + version = "unstable-2022-03-24"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; - rev = "v${version}"; - sha256 = "sha256-JuE8+OW+qM6tir4A25tN2GTXQIkcKVE4uKbZNSTcNlA="; + rev = "484bb689866987580e0576165180ef06375a543f"; + sha256 = "sha256-hIoS64QEDJ1qq3KJ2H8HjgQl8SxuIo+xz7Ot8CdjjQA="; }; + vendorSha256 = "sha256-KWM20a38jZ3/a45313kxY2LaCQyiNMEdfdIV78phrBo="; + nativeBuildInputs = [ installShellFiles ]; @@ -26,8 +30,6 @@ buildGoModule rec { --zsh <($out/bin/gmailctl completion zsh) ''; - vendorSha256 = "sha256-zEWEcv6G/9tmM6/+lhMFkyew3r/pvQRjvh74BENTYI4="; - doCheck = false; meta = with lib; { diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 7aebfba1b49b..95ec995cbfd5 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -7,7 +7,21 @@ let ]; python = python3.override { - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides; + packageOverrides = lib.foldr lib.composeExtensions (self: super: { + jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { + version = "3.2.0"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + doCheck = false; + }); + }) defaultOverrides; }; in python.pkgs.buildPythonPackage rec { pname = "gns3-gui"; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index ab3a6db587cf..818c01a89ab4 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -17,13 +17,28 @@ let }; doCheck = false; }); + + jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { + version = "3.2.0"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + doCheck = false; + }); + }) ]; python = python3.override { packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); }; -in python.pkgs.buildPythonPackage { +in python.pkgs.buildPythonApplication { pname = "gns3-server"; inherit version; diff --git a/pkgs/applications/networking/hyprspace/default.nix b/pkgs/applications/networking/hyprspace/default.nix index 037feccca4ed..5482ce12e253 100644 --- a/pkgs/applications/networking/hyprspace/default.nix +++ b/pkgs/applications/networking/hyprspace/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hyprspace"; - version = "0.1.7"; + version = "0.2.2"; propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac; @@ -10,10 +10,10 @@ buildGoModule rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ecdxs6see4uexY6DatZ/VSGgWR81zRjo3AeAsXSjJ4A="; + sha256 = "sha256-UlIQCy4moW58tQ1dqxrPsU5LN1Bs/Jy5X+2CEmXdYIk="; }; - vendorSha256 = "sha256-nFiBHhtvTu9Ya6n1KUF+pOXrksHMOph7ABVtGSWVWlo="; + vendorSha256 = "sha256-EV59sXmjunWs+MC++CwyuBlbWzWZI1YXDLEsOaESgRU="; meta = with lib; { description = "A Lightweight VPN Built on top of Libp2p for Truly Distributed Networks."; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 20623ac31827..e91b517e8158 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -21,16 +21,33 @@ stdenv.mkDerivation rec { pname = "zeek"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "0wq3kjc3zc5ikzwix7k7gr92v75rg6283kx5fzvc3lcdkaczq2lc"; + sha256 = "sha256-jZoCjKn+x61KnkinY+KWBSOEz0AupM03FXe/8YPCdFE="; }; - nativeBuildInputs = [ cmake flex bison file ]; - buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python3 swig ncurses ] - ++ lib.optionals stdenv.isDarwin [ gettext ]; + nativeBuildInputs = [ + bison + cmake + file + flex + ]; + + buildInputs = [ + curl + gperftools + libmaxminddb + libpcap + ncurses + openssl + python3 + swig + zlib + ] ++ lib.optionals stdenv.isDarwin [ + gettext + ]; outputs = [ "out" "lib" "py" ]; @@ -54,7 +71,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Powerful network analysis framework much different from a typical IDS"; + description = "Network analysis framework much different from a typical IDS"; homepage = "https://www.zeek.org"; changelog = "https://github.com/zeek/zeek/blob/v${version}/CHANGES"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index bf674ef44426..ebed984c4d53 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.34.0"; + version = "8.40.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-85bsu6l/B+lHkjFBXNQ9BEzOn1oYTsFgungG06p9nD0="; + sha256 = "sha256-meiIDIG7OXxF2aclHA/8FN8aSz5KWJliDbm2p/flD4k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 97530b722fdb..ad57e2c6623b 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.25.0.78"; + version = "2.26.0.136"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-Xk9iU7mNm3YlXKsmf6yPqd1YAklsFOWu+04Llb+2yWQ="; + sha256 = "sha256-9QiE7CjCepDXQCzduqGzNUGqUgYS+PWBS71ouzHa83o="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index fe7881de9959..97282c76d04c 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -11,6 +11,7 @@ , evolution-data-server , feedbackd , glibmm +, gnome-desktop , gspell , gtk3 , json-glib @@ -27,14 +28,15 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.4.0"; + version = "0.6.1"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "chatty"; rev = "v${version}"; - sha256 = "12k1a5xrwd6zk4x0m53hbzggk695z3bpbzy1wcikzy0jvch7h13d"; + fetchSubmodules = true; + hash = "sha256-AufxwuOibTx5OvLBVbJqay/mYLmcDpE2BgwVv6Y5IlY="; }; postPatch = '' @@ -55,6 +57,7 @@ stdenv.mkDerivation rec { evolution-data-server feedbackd glibmm + gnome-desktop gspell gtk3 json-glib diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index 4c8f356cdf47..940d0b6b92b3 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "1.6.1"; + version = "1.8.2"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "sha256-RJpLK16bedpqo/JJf3atpiuL5spHJNowomcusjZtEWA="; + sha256 = "sha256-0harFaO1MWzTmN/Q3e38MC2O7P9yVeQ5ZSy0yiGbtCs="; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index abcdf617352b..7e2f2422573a 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -23,5 +23,6 @@ buildGoPackage rec { homepage = "https://coy.im/"; license = licenses.gpl3; platforms = platforms.linux; + broken = true; #fails to build with go >= 1.16 }; } diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index fa795a11c2ae..f80d8cab8b11 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,38 +1,41 @@ { lib , copyDesktopItems -, electron +, electron_14 , esbuild , fetchFromGitHub , fetchpatch , libdeltachat , makeDesktopItem , makeWrapper -, nodePackages +, nodejs-14_x +, noto-fonts-emoji , pkg-config +, roboto , rustPlatform +, sqlcipher , stdenv , CoreServices }: let libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.70.0"; + version = "1.76.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-702XhFWvFG+g++3X97sy6C5DMNWogv1Xbr8QPR8QyLo="; + hash = "sha256-aeYOszOFyLaC1xKswYZLzqoWSFFWOOeOkc+WrtqU0jo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - hash = "sha256-MiSGJMXe8vouv4XEHXq274FHEvBMtd7IX6DyNJIWYeU="; + hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok="; }; }); electronExec = if stdenv.isDarwin then - "${electron}/Applications/Electron.app/Contents/MacOS/Electron" + "${electron_14}/Applications/Electron.app/Contents/MacOS/Electron" else - "${electron}/bin/electron"; + "${electron_14}/bin/electron"; esbuild' = esbuild.overrideAttrs (old: rec { version = "0.12.29"; src = fetchFromGitHub { @@ -42,19 +45,18 @@ let hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg="; }; }); -in nodePackages.deltachat-desktop.override rec { +in nodejs-14_x.pkgs.deltachat-desktop.override rec { pname = "deltachat-desktop"; - version = "1.26.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-IDyGV2+/+wHp5N4G10y5OHvw2yoyVxWx394xszIYoj4="; + hash = "sha256-Ur0UxaKEWp+y7lGz2Khsg4npOf+gjCiOoijkSbnp0hg="; }; nativeBuildInputs = [ - esbuild makeWrapper pkg-config ] ++ lib.optionals stdenv.isLinux [ @@ -72,27 +74,28 @@ in nodePackages.deltachat-desktop.override rec { USE_SYSTEM_LIBDELTACHAT = "true"; VERSION_INFO_GIT_REF = src.rev; - postInstall = let - keep = lib.concatMapStringsSep " " (file: "! -name ${file}") [ - "_locales" "build" "html-dist" "images" "index.js" - "node_modules" "themes" "tsc-dist" - ]; - in '' + postInstall = '' rm -r node_modules/deltachat-node/{deltachat-core-rust,prebuilds,src} - patchShebangs node_modules/sass/sass.js - npm run build npm prune --production - find . -mindepth 1 -maxdepth 1 ${keep} -print0 | xargs -0 rm -r - - mkdir -p $out/share/icons/hicolor/scalable/apps - ln -s $out/lib/node_modules/deltachat-desktop/build/icon.png \ + install -D $out/lib/node_modules/deltachat-desktop/build/icon.png \ $out/share/icons/hicolor/scalable/apps/deltachat.png + awk '!/^#/ && NF' build/packageignore_list \ + | xargs -I {} sh -c "rm -rf {}" || true + + ln -sf ${noto-fonts-emoji}/share/fonts/noto/NotoColorEmoji.ttf \ + $out/lib/node_modules/deltachat-desktop/html-dist/fonts/noto/emoji + for font in $out/lib/node_modules/deltachat-desktop/html-dist/fonts/Roboto-*.ttf; do + ln -sf ${roboto}/share/fonts/truetype/$(basename $font) \ + $out/lib/node_modules/deltachat-desktop/html-dist/fonts + done + makeWrapper ${electronExec} $out/bin/deltachat \ + --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \ --add-flags $out/lib/node_modules/deltachat-desktop ''; @@ -103,11 +106,9 @@ in nodePackages.deltachat-desktop.override rec { desktopName = "Delta Chat"; genericName = "Delta Chat"; comment = meta.description; - categories = "Network;InstantMessaging;Chat;"; - extraEntries = '' - StartupWMClass=DeltaChat - MimeType=x-scheme-handler/openpgp4fpr;x-scheme-handler/mailto; - ''; + categories = [ "Network" "InstantMessaging" "Chat" ]; + startupWMClass = "DeltaChat"; + mimeTypes = [ "x-scheme-handler/openpgp4fpr" "x-scheme-handler/mailto" ]; }); passthru.updateScript = ./update.sh; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json index fe9f024052c4..ca584702765a 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json @@ -1,36 +1,39 @@ { "name": "deltachat-desktop", - "version": "1.26.0", + "version": "1.28.0", "dependencies": { "@blueprintjs/core": "^3.22.3", - "@deltachat/message_parser_wasm": "^0.1.0", + "@deltachat/message_parser_wasm": "^0.3.0", "@mapbox/geojson-extent": "^1.0.0", "application-config": "^1.0.1", "classnames": "^2.3.1", "debounce": "^1.2.0", - "deltachat-node": "1.70.0", + "deltachat-node": "1.76.0", "emoji-js-clean": "^4.0.0", "emoji-mart": "^3.0.0", "emoji-regex": "^9.2.2", - "error-stack-parser": "^2.0.6", + "error-stack-parser": "^2.0.7", "filesize": "^8.0.6", + "immutable": "^4.0.0", "mapbox-gl": "^1.12.0", "mime-types": "^2.1.31", "moment": "^2.27.0", - "node-fetch": "^2.6.1", + "node-fetch": "^2.6.7", "path-browserify": "^1.0.1", "rc": "^1.2.8", "react": "^17.0.2", "react-dom": "^17.0.2", "react-qr-reader": "^2.2.1", "react-qr-svg": "^2.1.0", - "react-string-replace": "^0.4.4", + "react-string-replace": "^1.0.0", "react-virtualized-auto-sizer": "^1.0.5", "react-window": "^1.8.6", "react-window-infinite-loader": "^1.0.7", + "react-zoom-pan-pinch": "^2.1.3", "source-map-support": "^0.5.19", + "stackframe": "^1.2.1", "tempy": "^0.3.0", - "url-parse": "^1.5.3", + "url-parse": "^1.5.9", "use-debounce": "^3.3.0", "@babel/core": "^7.7.7", "@babel/preset-env": "^7.7.7", @@ -48,8 +51,8 @@ "@types/react-window": "^1.8.4", "@types/react-window-infinite-loader": "^1.0.4", "@types/url-parse": "^1.4.3", - "electron": "^13.1.6", - "esbuild": "^0.12.15", + "electron": "^14.2.6", + "esbuild": "^0.12.29", "glob-watcher": "^5.0.5", "sass": "^1.26.5", "typescript": "^4.4.4", diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh index 3f14f01b3604..c3119a79afd8 100755 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh @@ -29,7 +29,7 @@ tac default.nix \ src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link) -jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@typescript-eslint/eslint-plugin","@typescript-eslint/parser","electron-builder","electron-devtools-installer","electron-notarize","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","prettier","tape","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","walk"]))) }' \ +jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@types/chai","@types/mocha","@typescript-eslint/eslint-plugin","@typescript-eslint/parser","chai","electron-builder","electron-devtools-installer","electron-notarize","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","mocha","prettier","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","ts-node","walk"]))) }' \ "$src/package.json" > package.json.new if cmp --quiet package.json{.new,}; then diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 5e362784c811..3e992899e43e 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -13,17 +13,19 @@ , pcre , qrencode , icu +, gspell +, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good }: stdenv.mkDerivation rec { pname = "dino"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "sha256-uYP3D2uyvfRP91fq/1jKOaKgp/+How0SUwmxSrLLH4c="; + sha256 = "sha256-L5a5QlF9qlr4X/hGTabbbvOE5J1x/UVneWl/BRAa29Q="; }; nativeBuildInputs = [ @@ -56,6 +58,13 @@ stdenv.mkDerivation rec { icu libsignal-protocol-c librsvg + gspell + srtp + libnice + gnutls + gstreamer + gst-plugins-base + gst-plugins-good ] ++ lib.optionals (!stdenv.isDarwin) [ xorg.libxcb xorg.libpthreadstubs @@ -83,6 +92,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dino/dino"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ qyliss ]; + maintainers = with maintainers; [ qyliss tomfitzhenry ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2f58ec414ab9..d3416ef58801 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,31 +2,36 @@ let inherit (pkgs) callPackage fetchurl; versions = if stdenv.isLinux then { - stable = "0.0.16"; - ptb = "0.0.27"; - canary = "0.0.132"; + stable = "0.0.17"; + ptb = "0.0.29"; + canary = "0.0.134"; } else { stable = "0.0.264"; - ptb = "0.0.58"; - canary = "0.0.280"; + ptb = "0.0.59"; + canary = "0.0.283"; }; version = versions.${branch}; - srcs = { + srcs = let + darwin-ptb = fetchurl { + url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; + sha256 = "sha256-LS7KExVXkOv8O/GrisPMbBxg/pwoDXIOo1dK9wk1yB8="; + }; + in { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "UTVKjs/i7C/m8141bXBsakQRFd/c//EmqqhKhkr1OOk="; + sha256 = "058k0cmbm4y572jqw83bayb2zzl2fw2aaz0zj1gvg6sxblp76qil"; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "0yphs65wpyr0ap6y24b0nbhq7sm02dg5c1yiym1fxjbynm1mdvqb"; + sha256 = "d78NnQZ3MkLje8mHrI6noH2iD2oEvSJ3cDnsmzQsUYc="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "1jjbd9qllgcdpnfxg5alxpwl050vzg13rh17n638wha0vv4mjhyv"; + sha256 = "sha256-HyJa6lGcKMPKWffO/pnNcn8fDTJj6O4J8Y5RA23a1kM="; }; }; x86_64-darwin = { @@ -34,25 +39,15 @@ let url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; sha256 = "1jvlxmbfqhslsr16prsgbki77kq7i3ipbkbn67pnwlnis40y9s7p"; }; - ptb = fetchurl { - url = - "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - sha256 = "sha256-GwYUoPBbx9lSaRP1JwzI0UE9gEU+rV4a9BNPVSxHki0="; - }; + ptb = darwin-ptb; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - sha256 = "0ccchsywry68vv81pqzzxmh1r19lnvxr429iwvgfr9y82lyjvz06"; + sha256 = "0mqpk1szp46mih95x42ld32rrspc6jx1j7qdaxf01whzb3d4pi9l"; }; }; # Only PTB bundles a MachO Universal binary with ARM support. - aarch64-darwin = { - ptb = fetchurl { - url = - "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - sha256 = "sha256-GwYUoPBbx9lSaRP1JwzI0UE9gEU+rV4a9BNPVSxHki0="; - }; - }; + aarch64-darwin = { ptb = darwin-ptb; }; }; src = srcs.${stdenv.hostPlatform.system}.${branch}; @@ -66,24 +61,24 @@ let ++ lib.optionals (branch == "ptb") [ "aarch64-darwin" ]; }; package = if stdenv.isLinux then ./linux.nix else ./darwin.nix; - packages = { - stable = callPackage package rec { - inherit src version meta; - pname = "discord"; - binaryName = "Discord"; - desktopName = "Discord"; - }; - ptb = callPackage package rec { - inherit src version meta; - pname = "discord-ptb"; - binaryName = "DiscordPTB"; - desktopName = "Discord PTB"; - }; - canary = callPackage package rec { - inherit src version meta; - pname = "discord-canary"; - binaryName = "DiscordCanary"; - desktopName = "Discord Canary"; - }; - }; + packages = (builtins.mapAttrs + (_: value: callPackage package (value // { inherit src version; meta = meta // { mainProgram = value.binaryName; }; })) + { + stable = rec { + pname = "discord"; + binaryName = "Discord"; + desktopName = "Discord"; + }; + ptb = rec { + pname = "discord-ptb"; + binaryName = "DiscordPTB"; + desktopName = "Discord PTB"; + }; + canary = rec { + pname = "discord-canary"; + binaryName = "DiscordCanary"; + desktopName = "Discord Canary"; + }; + } + ); in packages.${branch} diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 866b28890948..05833c1eeaf4 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { wrapProgram $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} @@ -99,8 +100,8 @@ stdenv.mkDerivation rec { icon = pname; inherit desktopName; genericName = meta.description; - categories = "Network;InstantMessaging;"; - mimeType = "x-scheme-handler/discord"; + categories = [ "Network" "InstantMessaging" ]; + mimeTypes = [ "x-scheme-handler/discord" ]; }; passthru.updateScript = writeScript "discord-update-script" '' diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index c091a882d772..46ee444c3783 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.9.9", + "version": "1.10.8", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -44,7 +44,7 @@ "counterpart": "^0.18.6", "electron-store": "^6.0.1", "electron-window-state": "^5.0.3", - "minimist": "^1.2.3", + "minimist": "^1.2.6", "png-to-ico": "^2.1.1", "request": "^2.88.2" }, @@ -61,18 +61,19 @@ "app-builder-lib": "^22.14.10", "asar": "^2.0.1", "chokidar": "^3.5.2", - "electron": "13.5", + "electron": "^17", "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1", "electron-notarize": "^1.0.0", "eslint": "7.18.0", "eslint-config-google": "^0.14.0", - "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945", + "eslint-plugin-import": "^2.25.4", + "eslint-plugin-matrix-org": "^0.4.0", "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-web-i18n": "github:matrix-org/matrix-web-i18n", + "matrix-web-i18n": "^1.2.0", "mkdirp": "^1.0.3", "needle": "^2.5.0", "node-pre-gyp": "^0.15.0", diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 1a0c25c606b0..2ad5d8c4654f 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -12,14 +12,16 @@ , Security , AppKit , CoreServices - -, useWayland ? false +, desktopToDarwinBundle +, useKeytar ? true }: let pinData = lib.importJSON ./pin.json; executableName = "element-desktop"; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; + keytar = callPackage ./keytar { inherit Security AppKit; }; + seshat = callPackage ./seshat { inherit CoreServices; }; in mkYarnPackage rec { pname = "element-desktop"; @@ -38,10 +40,9 @@ mkYarnPackage rec { sha256 = pinData.desktopYarnHash; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; - seshat = callPackage ./seshat { inherit CoreServices; }; - keytar = callPackage ./keytar { inherit Security AppKit; }; + inherit seshat; buildPhase = '' runHook preBuild @@ -52,12 +53,14 @@ mkYarnPackage rec { node ./scripts/copy-res.js popd rm -rf node_modules/matrix-seshat node_modules/keytar - ln -s $keytar node_modules/keytar + ${lib.optionalString useKeytar "ln -s ${keytar} node_modules/keytar"} ln -s $seshat node_modules/matrix-seshat runHook postBuild ''; installPhase = '' + runHook preInstall + # resources mkdir -p "$out/share/element" ln -s '${element-web}' "$out/share/element/webapp" @@ -82,7 +85,10 @@ mkYarnPackage rec { # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102 makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ - --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}" + --add-flags "$out/share/element/electron" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + + runHook postInstall ''; # Do not attempt generating a tarball for element-web again. @@ -100,14 +106,25 @@ mkYarnPackage rec { desktopName = "Element"; genericName = "Matrix Client"; comment = meta.description; - categories = "Network;InstantMessaging;Chat;"; - extraEntries = '' - StartupWMClass=element - MimeType=x-scheme-handler/element; - ''; + categories = [ "Network" "InstantMessaging" "Chat" ]; + startupWMClass = "element"; + mimeTypes = [ "x-scheme-handler/element" ]; }; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + + # TL;DR: keytar is optional while seshat isn't. + # + # This prevents building keytar when `useKeytar` is set to `false`, because + # if libsecret is unavailable (e.g. set to `null` or fails to build), then + # this package wouldn't even considered for building because + # "one of the dependencies failed to build", + # although the dependency wouldn't even be used. + # + # It needs to be `passthru` anyways because other packages do depend on it. + inherit keytar; + }; meta = with lib; { description = "A feature-rich client for Matrix.org"; diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index ae9627afe30d..9d46657e0ab5 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage +{ lib, stdenv, fetchFromGitHub, nodejs-14_x, python3, callPackage, removeReferencesTo , fixup_yarn_lock, yarn, pkg-config, libsecret, xcbuild, Security, AppKit, fetchYarnDeps }: let @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { }; buildPhase = '' + runHook preBuild cp ${./yarn.lock} ./yarn.lock chmod u+w . ./yarn.lock export HOME=$PWD/tmp @@ -37,16 +38,22 @@ in stdenv.mkDerivation rec { yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ node_modules/.bin/node-gyp rebuild + runHook postBuild ''; doCheck = false; installPhase = '' + runHook preInstall shopt -s extglob rm -rf node_modules rm -rf $HOME mkdir -p $out cp -r ./!(build) $out install -D -t $out/build/Release build/Release/keytar.node + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $out/build/Release/keytar.node + runHook postInstall ''; + + disallowedReferences = [ stdenv.cc.cc ]; } diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json index 25e335decc8b..d487e9ae3160 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.9.9", - "desktopSrcHash": "IMqco5HeAgsh1LMBXFH1/HnlIEFEQU0xqnHbTKwHGL4=", - "desktopYarnHash": "0zzr14fcyc5q2562x50nvxxda10yr5ihbr12nykzg4j534rgb55y", - "webHash": "1i3zka9cfn14rv5wzz969w6dz5dbkw87clrgajs8p1s2l62ac1jf" + "version": "1.10.8", + "desktopSrcHash": "S9MQIn773BzCH4dsTkD1DpIThDzoIGr4Heaie2Qs0jY=", + "desktopYarnHash": "1imx43qbpj08l6d0fji31kcxqshcpr0ch8dzfbbgxyjvblq2p8ln", + "webHash": "02i6l3armzr19kki3hgshhzkdpb3001nilh4h10hr3xw5z711ppr" } diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index de38c7a90bad..3c4ac2f52ae1 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, callPackage, sqlcipher, nodejs-14_x, python3, yarn, fixup_yarn_lock, CoreServices, fetchYarnDeps, removeReferencesTo }: let pinData = lib.importJSON ./pin.json; @@ -27,6 +27,7 @@ in rustPlatform.buildRustPackage rec { }; buildPhase = '' + runHook preBuild cd .. chmod u+w . ./yarn.lock export HOME=$PWD/tmp @@ -36,17 +37,22 @@ in rustPlatform.buildRustPackage rec { yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ node_modules/.bin/neon build --release + runHook postBuild ''; doCheck = false; installPhase = '' + runHook preInstall shopt -s extglob rm -rf native/!(index.node) - rm -rf node_modules - rm -rf $HOME + rm -rf node_modules $HOME cp -r . $out + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $out/native/index.node + runHook postInstall ''; + disallowedReferences = [ stdenv.cc.cc ]; + cargoSha256 = pinData.cargoHash; } diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 92e39f091b15..0a44a37cf4bc 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -17,10 +17,10 @@ in mkFranzDerivation' rec { pname = "ferdi"; name = "Ferdi"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-WwtnYNjXHk80o1wMsEBoaT9j0+4TWTfWhuVpGHaZB7c="; + sha256 = "sha256-Dd/iH9dtr4WvM++bSURF8kI6BsF6uBiSFviC/ik2H+o="; }; extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix new file mode 100644 index 000000000000..565c44f72e92 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -0,0 +1,81 @@ +{ lib +, fetchFromGitLab +, flutter +, olm +, imagemagick +, makeDesktopItem +}: + +flutter.mkFlutterApp rec { + pname = "fluffychat"; + version = "1.2.0"; + + vendorHash = "sha256-j5opwEFifa+DMG7Uziv4SWEPVokD6OSq8mSIr0AdDL0="; + + src = fetchFromGitLab { + owner = "famedly"; + repo = "fluffychat"; + rev = "v${version}"; + hash = "sha256-PJH3jMQc6u9R6Snn+9rNN8t+8kt6l3Xt7zKPbpqj13E="; + }; + + desktopItem = makeDesktopItem { + name = "Fluffychat"; + exec = "@out@/bin/fluffychat"; + icon = "fluffychat"; + desktopName = "Fluffychat"; + genericName = "Chat with your friends (matrix client)"; + categories = [ "Chat" "Network" "InstantMessaging" ]; + }; + + buildInputs = [ + olm + ]; + + nativeBuildInputs = [ + imagemagick + ]; + + flutterExtraFetchCommands = '' + M=$(echo $TMP/.pub-cache/hosted/pub.dartlang.org/matrix-*) + sed -i $M/scripts/prepare.sh \ + -e "s|/usr/lib/x86_64-linux-gnu/libolm.so.3|/bin/sh|g" \ + -e "s|if which flutter >/dev/null; then|exit; if which flutter >/dev/null; then|g" + + pushd $M + bash scripts/prepare.sh + popd + ''; + + # replace olm dummy path + postConfigure = '' + M=$(echo $depsFolder/.pub-cache/hosted/pub.dartlang.org/matrix-*) + ln -sf ${olm}/lib/libolm.so.3 $M/ffi/olm/libolm.so + ''; + + postInstall = '' + FAV=$out/app/data/flutter_assets/assets/favicon.png + ICO=$out/share/icons + + install -D $FAV $ICO/fluffychat.png + mkdir $out/share/applications + cp $desktopItem/share/applications/*.desktop $out/share/applications + + for s in 24 32 42 64 128 256 512; do + D=$ICO/hicolor/''${s}x''${s}/apps + mkdir -p $D + convert $FAV -resize ''${s}x''${s} $D/fluffychat.png + done + + substituteInPlace $out/share/applications/*.desktop \ + --subst-var out + ''; + + meta = with lib; { + description = "Chat with your friends (matrix client)"; + homepage = "https://fluffychat.im/"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index d957daced26d..3b5349d65ffe 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitLab +, fetchpatch , nix-update-script , meson , ninja @@ -33,6 +35,15 @@ stdenv.mkDerivation rec { sha256 = "DSNVd9YvI7Dd3s3+M0+wE594tmL1yPNMnD1W9wLhSuw="; }; + patches = [ + # Fix build with meson 0.61 + # fractal-gtk/res/meson.build:5:0: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/fractal/-/commit/6fa1a23596d65d94aa889efe725174e6cd2903f0.patch"; + sha256 = "3OzU9XL2V1VNOkvL1j677K3HNoBqPMQudQDmiDxYfAc="; + }) + ]; + cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 4496af4a1dfa..7438e5496acd 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -13,7 +13,6 @@ , freetype , fontconfig , gtk3 -, gnome2 , dbus , nss , nspr @@ -61,7 +60,6 @@ stdenv.mkDerivation rec { freetype fontconfig dbus - gnome2.GConf nss nspr alsa-lib diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 05a8b9969575..3c56d84db4b5 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -87,7 +87,6 @@ python3.pkgs.buildPythonApplication rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin abbradar ]; downloadPage = "http://gajim.org/downloads.php"; - updateWalker = true; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix index 854cc18a47ff..8ed85cba8546 100644 --- a/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, alsa-lib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl -, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libdrm, libX11 +, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libdrm, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx , libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, mesa, nspr, nss @@ -18,7 +18,6 @@ let gitterDirectorySuffix = "opt/gitter"; freetype gdk-pixbuf glib - gnome2.GConf gtk3 libX11 libXScrnSaver @@ -89,7 +88,7 @@ in stdenv.mkDerivation rec { icon = pname; desktopName = "Gitter"; genericName = meta.description; - categories = "Network;InstantMessaging;"; + categories = [ "Network" "InstantMessaging" ]; }; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 5f2a094ca36b..695089c23e61 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -40,10 +40,10 @@ buildGoModule rec { makeDesktopItem { name = "net.maunium.gomuks.desktop"; exec = "@out@/bin/gomuks"; - terminal = "true"; + terminal = true; desktopName = "Gomuks"; genericName = "Matrix client"; - categories = "Network;Chat"; + categories = [ "Network" "Chat" ]; comment = meta.description; } }/* $out/ diff --git a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix new file mode 100644 index 000000000000..f44c05da5c01 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, gtk4 +, glib +, gobject-introspection +, pkg-config +, go +}: + +buildGoModule rec { + pname = "gotktrix"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "diamondburned"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-K+q0sykdOMnAWypOXnwTU5oTokpYw61CTsAW1gIvGSQ="; + }; + + vendorSha256 = "sha256-Br9KgUoN01yoGujgbj5UEoB57K87oEH/o40rrRtIZVY="; + + buildInputs = [ + gtk4 + glib + gobject-introspection + ]; + + nativeBuildInputs = [ pkg-config ]; + + # Checking requires a working display + doCheck = false; + + meta = with lib; { + description = "Matrix client written in Go using GTK4"; + homepage = "https://github.com/diamondburned/gotktrix"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix new file mode 100644 index 000000000000..6430ebdd22fc --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, lib +, protobuf +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "gurk-rs"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "boxdot"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Mko5udM8BY50uUwn7xESxB+s0MEO1kAJX4Dt/DnEEa4="; + }; + + cargoHash = "sha256-pYMMgBvLsqkj2peouDQK1vn97ByUjtdCrkbzuZZLXrY="; + buildInputs = [ protobuf ]; + + PROTOC = "${protobuf}/bin/protoc"; + + meta = with lib; { + description = "Signal Messenger client for terminal"; + homepage = "https://github.com/boxdot/gurk-rs"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ devhell ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/pkgs/applications/networking/instant-messengers/jami/daemon.nix index a324d061aa73..f39b731132ea 100644 --- a/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ b/pkgs/applications/networking/instant-messengers/jami/daemon.nix @@ -7,7 +7,7 @@ , autoreconfHook , pkg-config , perl # for pod2man -, ffmpeg +, ffmpeg_4 , pjsip , alsa-lib , asio @@ -39,7 +39,7 @@ let readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); - ffmpeg-jami = ffmpeg.overrideAttrs (old: + ffmpeg-jami = ffmpeg_4.overrideAttrs (old: let patch-src = src + "/daemon/contrib/src/ffmpeg/"; in diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 5be6e0211788..3e0ba8bb5e8f 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -8,11 +8,11 @@ }: rec { - version = "20211213.2.37be4c3"; + version = "20211223.2.37be4c3"; src = fetchzip { url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; - sha256 = "08abswvxwsxh6b0smb4l4cmymsbfiy7473b2sgvghj55w603prsc"; + sha256 = "1zw9azwmxr4991nq5kl527lbwlj7psrissgvrkl1kxxbfbdncbhh"; stripRoot = false; extraPostFetch = '' diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 7bd27285fd47..2395a196f605 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.8.11"; + version = "2022.1.1"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "sha256-DznbSwA1UISw3EkIfM5hGgmIToeXsH1b1HB7UOgDTKU="; + sha256 = "0x3fdqgjnsd570b7nszfx3h8l5c8x2kg32ig85n2a2g481c7xi6l"; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index e2ace1a5d35f..21c28c7391ae 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { comment = "VoIP and Instant Messaging client"; desktopName = "Jitsi"; genericName = "Instant Messaging"; - categories = "Chat"; + categories = [ "Chat" ]; }; libPath = lib.makeLibraryPath ([ diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix index 7e88a77193b6..9b501facb7f6 100644 --- a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix @@ -1,13 +1,14 @@ -{ lib, fetchgit +{ lib, fetchFromGitHub , buildPythonApplication, buildPythonPackage , pygobject3, pytest-runner, requests, responses, pytest, python-olm , canonicaljson, olm }: let - mainsrc = fetchgit { - url = "https://github.com/saadnpq/matrixcli"; + mainsrc = fetchFromGitHub { + owner = "saadnpq"; + repo = "matrixcli"; rev = "61ebde173ca2f77185c261c2b7f6db297ca89863"; - sha256 = "0xcjjy2xwlcixr9fwgzcfjjkivqpk104h7dslfa7lz9jq9pzqzvq"; + sha256 = "sha256-eH/8b8IyfXqUo7odSECYF+84pXTsP+5S7pFR3oWXknU="; fetchSubmodules = true; }; @@ -35,7 +36,6 @@ let in buildPythonApplication rec { - name = "${pname}-${version}"; pname = "matrixcli"; version = "0.0.2019-08-15"; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 874fbd6375d0..6f53fe2b3a3b 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,105 +1,91 @@ -{ lib, stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk-pixbuf, glib, -freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, -libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, -libXScrnSaver, nss, nspr, alsa-lib, cups, expat, udev, wrapGAppsHook, -hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk, libappindicator-gtk3 }: +{ lib +, stdenv +, fetchurl +, atomEnv +, systemd +, pulseaudio +, libxshmfence +, libnotify +, libappindicator-gtk3 +, wrapGAppsHook +, autoPatchelfHook +}: let - rpath = lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gnome2.GConf - gtk3 - pango - libappindicator-gtk3 - libuuid - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - nspr - nss - stdenv.cc.cc - udev - xorg.libxcb - ]; + + pname = "mattermost-desktop"; + version = "5.0.3"; + + srcs = { + "x86_64-linux" = { + url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; + hash = "sha256-KLSWJpNSMGmfugbkFIJLDnxcZtrtBZOGjLlR+kAoMTA="; + }; + + "i686-linux" = { + url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; + hash = "sha256-4ofjOsfGbgO1PSqQpigNp90JsvlGP1kGexVAR/h3/88="; + }; + }; + + inherit (stdenv.hostPlatform) system; in - stdenv.mkDerivation rec { - pname = "mattermost-desktop"; - version = "4.6.2"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - sha256 = "0i836bc0gx375a9fm2cdxg84k03zhpx1z6jqxndf2m8pkfsblc3x"; - } - else if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; - sha256 = "04jv9hkmkh0jipv0fjdprnp5kmkjvf3c0fah6ysi21wmnmp5ab3m"; - } - else - throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}"; +stdenv.mkDerivation { + inherit pname version; - dontBuild = true; - dontConfigure = true; - dontPatchELF = true; + src = fetchurl (srcs."${system}" or (throw "Unsupported system ${system}")); - nativeBuildInputs = [ wrapGAppsHook ]; + dontBuild = true; + dontConfigure = true; + dontStrip = true; - buildInputs = [ gtk3 hicolor-icon-theme ]; + nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook ]; - installPhase = '' - runHook preInstall + buildInputs = atomEnv.packages ++ [ + libxshmfence + ]; - mkdir -p $out/share/mattermost-desktop - cp -R . $out/share/mattermost-desktop + runtimeDependencies = [ + (lib.getLib systemd) + pulseaudio + libnotify + libappindicator-gtk3 + ]; - mkdir -p "$out/bin" - ln -s $out/share/mattermost-desktop/mattermost-desktop \ - $out/bin/mattermost-desktop + installPhase = '' + runHook preInstall - patchShebangs $out/share/mattermost-desktop/create_desktop_file.sh - $out/share/mattermost-desktop/create_desktop_file.sh - rm $out/share/mattermost-desktop/create_desktop_file.sh - mkdir -p $out/share/applications - mv Mattermost.desktop $out/share/applications/Mattermost.desktop - substituteInPlace \ - $out/share/applications/Mattermost.desktop \ - --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop + # Mattermost tarball comes with executable bit set for everything. + # We’ll apply it only to files that need it. + find . -type f -print0 | xargs -0 chmod -x + find . -type f \( -name '*.so.*' -o -name '*.s[oh]' \) -print0 | xargs -0 chmod +x + chmod +x mattermost-desktop chrome-sandbox - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}:$out/share/mattermost-desktop" \ - $out/share/mattermost-desktop/mattermost-desktop + mkdir -p $out/share/mattermost-desktop + cp -R . $out/share/mattermost-desktop - runHook postInstall - ''; + mkdir -p "$out/bin" + ln -s $out/share/mattermost-desktop/mattermost-desktop $out/bin/mattermost-desktop - meta = with lib; { - description = "Mattermost Desktop client"; - homepage = "https://about.mattermost.com/"; - license = licenses.asl20; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ maintainers.joko ]; - }; - } + patchShebangs $out/share/mattermost-desktop/create_desktop_file.sh + $out/share/mattermost-desktop/create_desktop_file.sh + rm $out/share/mattermost-desktop/create_desktop_file.sh + mkdir -p $out/share/applications + chmod -x Mattermost.desktop + mv Mattermost.desktop $out/share/applications/Mattermost.desktop + substituteInPlace $out/share/applications/Mattermost.desktop \ + --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop + + runHook postInstall + ''; + + meta = with lib; { + description = "Mattermost Desktop client"; + homepage = "https://about.mattermost.com/"; + license = licenses.asl20; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.joko ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 2ca94953c4f6..3acd11a9a0d3 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; - updateWalker = true; downloadPage = "http://mcabber.com/files/"; - downloadURLRegexp = "mcabber-[0-9.]+[.]tar[.][a-z0-9]+$"; }; } diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index c20ec46f266d..ffc2eea5b868 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -49,9 +49,9 @@ let desktopName = "mikutter"; exec = "mikutter"; icon = "mikutter"; - categories = "Network;"; + categories = [ "Network" ]; comment = description; - extraDesktopEntries.Keywords = "Mastodon;"; + keywords = [ "Mastodon" ]; }; mkInfoPlist = { version }: diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index f35db8e3a11b..bfe11b27218e 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -65,6 +65,7 @@ mkDerivation rec { setuptools watchgod dbus-python + matrix-nio ]; qmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index c8f24e72a9ae..ce4963df01e8 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -16,6 +16,6 @@ buildGoModule { description = "A file system based matrix client"; homepage = "https://git.lost.host/meutraa/mm"; license = licenses.isc; - maintainers = with maintainers; [ meutraa ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix index b6706d647868..a8e73ad1098f 100644 --- a/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -8,6 +8,7 @@ , kconfig , kdbusaddons , ki18n +, kio , kirigami2 , kitemmodels , knotifications @@ -16,23 +17,25 @@ , libquotient , libsecret , olm +, qcoro , qqc2-desktop-style , qtgraphicaleffects , qtkeychain , qtmultimedia , qtquickcontrols2 +, sonnet }: mkDerivation rec { pname = "neochat"; - version = "1.2"; + version = "22.02"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kpv7BY/qS0A3xFlYFhz1RRNwQVsyhOTHHGDbWRTTv1I="; + sha256 = "sha256-7EBnHuwpyJ/bGrCldZHWOwcnJWDIDaNWZXHkCYkOTjs="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; @@ -41,6 +44,7 @@ mkDerivation rec { cmark kconfig kdbusaddons + kio ki18n kirigami2 kitemmodels @@ -50,18 +54,20 @@ mkDerivation rec { libquotient libsecret olm + qcoro qtgraphicaleffects qtkeychain qtmultimedia qtquickcontrols2 qqc2-desktop-style + sonnet ]; meta = with lib; { description = "A client for matrix, the decentralized communication protocol."; homepage = "https://apps.kde.org/en/neochat"; license = licenses.gpl3Only; - maintainers = with maintainers; [ mjlbach peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index bee1f7cf2891..750511ebf152 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , cmake +, asciidoc , cmark , lmdb , lmdbxx @@ -32,19 +33,20 @@ mkDerivation rec { pname = "nheko"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "sha256-KnWZ1DSTg8vtNSlpG5LGUG8YDHt25s9pMLpLuj0WLnM="; + sha256 = "sha256-h1Yahz7Rt7+r55RFTSVj6E14nWnjCs0CecljceaWgaQ="; }; nativeBuildInputs = [ lmdbxx cmake pkg-config + asciidoc ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 9722d3b89e32..894294ae24c5 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.10.2"; + version = "0.10.4"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "sha256-sjaJomKMKSZqLlKWTG7Oa87dXa5SnGQlVnrdS707A1w="; + sha256 = "sha256-X6DJHH+ZBPw7iWVMa43HvVFh+LDn6shzOU1A2uiAYL4="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index a168eb984c33..2c6a0c5e7e64 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -1,16 +1,14 @@ -{ lib, stdenv, fetchgit, pkg-config, pidgin } : +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin } : -let - version = "54b2992"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pidgin-mra"; - inherit version; + version = "unstable-2014-07-08"; - src = fetchgit { - url = "https://github.com/dreadatour/pidgin-mra"; - rev = version; - sha256 = "1adq57g11kw7bfpivyvfk3nlpjkc8raiw4bzn3gn4nx3m0wl99vw"; + src = fetchFromGitHub { + owner = "dreadatour"; + repo = "pidgin-mra"; + rev = "54b299266265cde800289b2d51f13b81f6bf379c"; + sha256 = "sha256-fKdEOaijW2LfsH8RHlVGbMpL7Zhu+x2vW4fPEN4puKk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index 527af9ed98db..6f7aab564fac 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -1,16 +1,14 @@ -{ lib, stdenv, fetchgit, pkg-config, pidgin, libwebp, libgcrypt, gettext } : +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, libwebp, libgcrypt, gettext } : -let - version = "1.3.1"; -in stdenv.mkDerivation rec { pname = "telegram-purple"; - inherit version; + version = "1.3.1"; - src = fetchgit { - url = "https://github.com/majn/telegram-purple"; + src = fetchFromGitHub { + owner = "majn"; + repo = "telegram-purple"; rev = "v${version}"; - sha256 = "0p93jpjpx7hszwffzgixw04zkrpsiyzz4za3gfr4j07krc4771fp"; + sha256 = "sha256-14VzCMvzAEmye0N98r+P+ub5CeA9vu8c/xqefuWVI10="; }; NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index f26cd0109444..c7b5d56dbba3 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkg-config, gtk3, gtkspell3, - fetchgit }: + fetchFromGitHub }: let gui = true; # Might be implemented with nixpkgs config. in buildGoPackage rec { pname = "pond"; - version = "20150830-${lib.strings.substring 0 7 rev}"; - rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; + version = "unstable-2015-08-30"; goPackagePath = "github.com/agl/pond"; - src = fetchgit { - inherit rev; - url = "https://github.com/agl/pond"; - sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4"; + src = fetchFromGitHub { + owner = "agl"; + repo = "pond"; + rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; + sha256 = "sha256-BE7+146E9hz8enrfA+sQhtqgHiSZAtjrW1OOqchbr7Y="; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index d1cf00969b10..aeb20d6779ef 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins; mkDerivation rec { pname = "psi-plus"; - version = "1.5.1596"; + version = "1.5.1615"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "sha256-8GnENdoFgFa+pDN8C+W5qoFxsCE7tl3dUHf5TBipo5g="; + sha256 = "sha256-aD+JVGmBWHUav2bH9rXGtgqI+/5lJTMrYLRP7E65JxI="; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index b264608f5100..3f6d374c3996 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -28,13 +28,13 @@ mkDerivation rec { pname = "qtox"; - version = "1.17.4"; + version = "1.17.6"; src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; rev = "v${version}"; - sha256 = "sha256-j1aAry4wjb4RResdu8PQzyVazvVxnxvZMoC59sO0frw="; + sha256 = "sha256-naKWoodSMw0AEtACvkASFmw9t0H0d2pcqOW79NNTYF0="; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix index df038611c3b1..d4329ed09d35 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix @@ -10,8 +10,7 @@ let name = pname; exec = pname; icon = pname; - type = "Application"; - categories = "Network;"; + categories = [ "Network" ]; }); appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 0aa2d4cc6771..f612ec524a7b 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { desktopName = "Ricochet"; genericName = "Ricochet"; comment = meta.description; - categories = "Office;Email;"; + categories = [ "Office" "Email" ]; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix new file mode 100644 index 000000000000..ef9dad66b5d6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix @@ -0,0 +1,33 @@ +{ stdenvNoCC, lib, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "ripcord"; + version = "0.4.29"; + + src = fetchzip { + url = "https://cancel.fm/dl/Ripcord_Mac_${version}.zip"; + sha256 = "sha256-v8iydjLBjFN5LuctpcBpEkhSICxPhLKzLjSASWtsQok="; + stripRoot = false; + }; + + dontBuild = true; + dontFixup = true; # modification is not allowed by the license https://cancel.fm/ripcord/shareware-redistribution/ + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r $src/Ripcord.app $out/Applications/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Desktop chat client for Slack and Discord"; + homepage = "https://cancel.fm/ripcord/"; + # See: https://cancel.fm/ripcord/shareware-redistribution/ + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ mikroskeem ]; + platforms = [ "x86_64-darwin" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index ca6da2100b4f..ac17f7590888 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.7.6"; + version = "3.7.8"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb"; - sha256 = "sha256-lOiYj0eC/Mw2icdizK7wvBG2xuIBRkCF0aBJ24qzyK8="; + sha256 = "sha256-61HSJIFir+ikwui7KtPm2BDstIRWY/WruGX3WSfY5ZI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json index 30ca1e9f475a..d227dc4b0fbe 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,6 +1,9 @@ { - "version": "1.9.7-sc.1", - "srcHash": "0qrjjwcxa141phsgdz325rrkfmjqdmxc3h917cs9c9kf6cblkxaq", - "webYarnHash": "19c594pql2yz1z15phfdlkwcvrcbm8k058fcq7p0k6840dhif5fd", - "desktopYarnHash": "058ihkljb1swjzvgf8gqci5ghvwapmpcf2bsab3yr66lhps7fhci" + "version": "1.10.4-sc.1", + "rev": "v1.10.4-sc.1", + "srcHash": "0sxibzskbw9pa6wmbk1y3n7p74cfj9zvm2hsw76sp6wfac1wnbwl", + "webYarnHash": "1z8xr35gh74y2iv9kfk6d6b6f3iclcrpkdds5q7rh2irpf14fwpw", + "jsSdkYarnHash": "1cwvb0hwq19dh2937fmcbfvnkkfmalk9wrxf1yv81nsbyjnx86di", + "reactSdkYarnHash": "0j4rxg11q35idfzvjrpmyrwkz9yqgzpwps3xqx1k4qcs844jjs9f", + "desktopYarnHash": "0akmgib212gkygvs2snn9c43k3ika3ipg85d480j3hqyb6yxwqmn" } diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index 4e1d330f5000..e2b4cafe9936 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -2,18 +2,18 @@ , element-desktop # for seshat and keytar , schildichat-web , stdenv -, fetchgit +, fetchFromGitHub , makeWrapper , makeDesktopItem , copyDesktopItems , fetchYarnDeps -, yarn, nodejs, fixup_yarn_lock +, yarn +, nodejs +, fixup_yarn_lock , electron , Security , AppKit , CoreServices - -, useWayland ? false }: let @@ -25,9 +25,10 @@ stdenv.mkDerivation rec { pname = "schildichat-desktop"; inherit (pinData) version; - src = fetchgit { - url = "https://github.com/SchildiChat/schildichat-desktop/"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "SchildiChat"; + repo = "schildichat-desktop"; + inherit (pinData) rev; sha256 = pinData.srcHash; fetchSubmodules = true; }; @@ -88,7 +89,8 @@ stdenv.mkDerivation rec { # executable wrapper makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ - --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}" + --add-flags "$out/share/element/electron" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" runHook postInstall ''; @@ -101,17 +103,15 @@ stdenv.mkDerivation rec { # https://github.com/schildichat/element-desktop/blob/sc/package.json desktopItems = [ (makeDesktopItem { - name = "schildichat-desktop"; - exec = "${executableName} %u"; - icon = "schildichat"; - desktopName = "SchildiChat"; - genericName = "Matrix Client"; - comment = meta.description; - categories = "Network;InstantMessaging;Chat;"; - extraEntries = '' - StartupWMClass=schildichat - MimeType=x-scheme-handler/element; - ''; + name = "schildichat-desktop"; + exec = "${executableName} %u"; + icon = "schildichat"; + desktopName = "SchildiChat"; + genericName = "Matrix Client"; + comment = meta.description; + categories = [ "Network" "InstantMessaging" "Chat" ]; + startupWMClass = "schildichat"; + mimeTypes = [ "x-scheme-handler/element" ]; }) ]; @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { description = "Matrix client / Element Desktop fork"; homepage = "https://schildi.chat/"; changelog = "https://github.com/SchildiChat/schildichat-desktop/releases"; - maintainers = lib.teams.matrix.members; + maintainers = lib.teams.matrix.members ++ [ lib.maintainers.kloenk ]; license = lib.licenses.asl20; platforms = lib.platforms.all; }; diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix index c1bfc98047be..a7ad6fb4d9b1 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-web.nix @@ -1,5 +1,5 @@ { stdenv, lib -, fetchgit +, fetchFromGitHub , fetchYarnDeps , nodejs , yarn @@ -18,17 +18,26 @@ in stdenv.mkDerivation rec { pname = "schildichat-web"; inherit (pinData) version; - src = fetchgit { - url = "https://github.com/SchildiChat/schildichat-desktop/"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "SchildiChat"; + repo = "schildichat-desktop"; + inherit (pinData) rev; sha256 = pinData.srcHash; fetchSubmodules = true; }; - offlineCache = fetchYarnDeps { + webOfflineCache = fetchYarnDeps { yarnLock = src + "/element-web/yarn.lock"; sha256 = pinData.webYarnHash; }; + jsSdkOfflineCache = fetchYarnDeps { + yarnLock = src + "/matrix-js-sdk/yarn.lock"; + sha256 = pinData.jsSdkYarnHash; + }; + reactSdkOfflineCache = fetchYarnDeps { + yarnLock = src + "/matrix-react-sdk/yarn.lock"; + sha256 = pinData.reactSdkYarnHash; + }; nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; @@ -37,14 +46,30 @@ in stdenv.mkDerivation rec { export HOME=$PWD/tmp mkdir -p $HOME + pushd element-web - yarn config --offline set yarn-offline-mirror $offlineCache fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $webOfflineCache yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules rm -rf node_modules/matrix-react-sdk - patchShebangs node_modules/ ../matrix-react-sdk/scripts/ ln -s $PWD/../matrix-react-sdk node_modules/ - ln -s $PWD/node_modules ../matrix-react-sdk/ + rm -rf node_modules/matrix-js-sdk + ln -s $PWD/../matrix-js-sdk node_modules/ + popd + + pushd matrix-js-sdk + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $jsSdkOfflineCache + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules + popd + + pushd matrix-react-sdk + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $reactSdkOfflineCache + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules scripts popd runHook postConfigure @@ -54,7 +79,7 @@ in stdenv.mkDerivation rec { runHook preBuild pushd matrix-react-sdk - node_modules/.bin/reskindex -h ../element-web/src/header + ../element-web/node_modules/.bin/reskindex -h ../element-web/src/header popd pushd element-web @@ -79,7 +104,7 @@ in stdenv.mkDerivation rec { description = "Matrix client / Element Web fork"; homepage = "https://schildi.chat/"; changelog = "https://github.com/SchildiChat/schildichat-desktop/releases"; - maintainers = lib.teams.matrix.members; + maintainers = lib.teams.matrix.members ++ [ lib.maintainers.kloenk ]; license = lib.licenses.asl20; platforms = lib.platforms.all; }; diff --git a/pkgs/applications/networking/instant-messengers/schildichat/update.sh b/pkgs/applications/networking/instant-messengers/schildichat/update.sh index 3f5289de8c4e..6ddc99902c3b 100755 --- a/pkgs/applications/networking/instant-messengers/schildichat/update.sh +++ b/pkgs/applications/networking/instant-messengers/schildichat/update.sh @@ -1,35 +1,43 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-git jq -if [[ "$#" -gt 1 || "$1" == -* ]]; then +if [[ "$#" -gt 2 || "$1" == -* ]]; then echo "Regenerates packaging data for the SchildiChat packages." - echo "Usage: $0 [git release tag]" + echo "Usage: $0 [git revision or tag] [version string override]" exit 1 fi -version="$1" +rev="$1" +version="$2" set -euo pipefail -if [ -z "$version" ]; then - version="$(wget -O- "https://api.github.com/repos/SchildiChat/schildichat-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" +if [ -z "$rev" ]; then + rev="$(wget -O- "https://api.github.com/repos/SchildiChat/schildichat-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" fi -# strip leading "v" -version="${version#v}" +if [ -z "$version" ]; then + # strip leading "v" + version="${rev#v}" +fi -src_data=$(nix-prefetch-git https://github.com/SchildiChat/schildichat-desktop --fetch-submodules --rev v${version}) +src_data=$(nix-prefetch-git https://github.com/SchildiChat/schildichat-desktop --fetch-submodules --rev $rev) src=$(echo $src_data | jq -r .path) src_hash=$(echo $src_data | jq -r .sha256) web_yarn_hash=$(prefetch-yarn-deps $src/element-web/yarn.lock) desktop_yarn_hash=$(prefetch-yarn-deps $src/element-desktop/yarn.lock) +js_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-js-sdk/yarn.lock) +react_sdk_yarn_hash=$(prefetch-yarn-deps $src/matrix-react-sdk/yarn.lock) cat > pin.json << EOF { "version": "$version", + "rev": "$rev", "srcHash": "$src_hash", "webYarnHash": "$web_yarn_hash", + "jsSdkYarnHash": "$js_sdk_yarn_hash", + "reactSdkYarnHash": "$react_sdk_yarn_hash", "desktopYarnHash": "$desktop_yarn_hash" } EOF diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index c998f869d1ea..4518627fe2b8 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -1,15 +1,53 @@ { lib +, makeDesktopItem +, copyDesktopItems +, stdenvNoCC , fetchurl , appimageTools }: -appimageTools.wrapType2 rec { +let + version = "1.7.9"; pname = "session-desktop-appimage"; - version = "1.7.6"; + src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "PNjUslqLcSxkRSXFpesBr2sfre4wetZWfUQTjywdClU="; + sha256 = "ca7754e59146633b71e66b02a90cff87e4f2574e57ff831ca4a5f983b7e2fbef"; }; + appimage = appimageTools.wrapType2 { + inherit version pname src; + }; + appimage-contents = appimageTools.extractType2 { + inherit version pname src; + }; +in +stdenvNoCC.mkDerivation { + inherit version pname; + src = appimage; + + nativeBuildInputs = [ copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem { + name = "Session"; + desktopName = "Session"; + comment = "Onion routing based messenger"; + exec = "${appimage}/bin/session-desktop-appimage-${version}"; + icon = "${appimage-contents}/session-desktop.png"; + terminal = false; + type = "Application"; + categories = [ "Network" ]; + }) + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/ + cp -r bin $out/bin + + runHook postInstall + ''; meta = with lib; { description = "Onion routing based messenger"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index f1bcd1012797..e3fa08e3df3a 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests -, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig +, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa # Runtime dependencies: -, systemd, libnotify, libdbusmenu, libpulseaudio +, systemd, libnotify, libdbusmenu, libpulseaudio, xdg-utils # Unfortunately this also overwrites the UI language (not just the spell # checking language!): , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.27.1"; # Please backport all updates to the stable channel. + version = "5.36.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0z0v7q0rpxdx7ic78jv7wp1hq8nrfp51jjdr6d85x0hsfdj0z1mc"; + sha256 = "sha256-x1PUEDq/0B1T14mBs2FuKtcGpJHWOIvHAs8hptpzhZk="; }; nativeBuildInputs = [ @@ -56,7 +56,6 @@ in stdenv.mkDerivation rec { freetype gdk-pixbuf glib - gnome2.GConf gtk3 libX11 libXScrnSaver @@ -85,6 +84,7 @@ in stdenv.mkDerivation rec { (lib.getLib systemd) libnotify libdbusmenu + xdg-utils ]; unpackPhase = "dpkg-deb -x $src ."; @@ -123,6 +123,8 @@ in stdenv.mkDerivation rec { gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" ${customLanguageWrapperArgs} + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ) # Fix the desktop link @@ -145,7 +147,7 @@ in stdenv.mkDerivation rec { homepage = "https://signal.org/"; changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ ixmatus primeos equirosa ]; + maintainers = with lib.maintainers; [ mic92 equirosa ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 5da0536b3794..f03a91faa23f 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20220107"; + version = "20220316"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-sB8/xQgSORtwupcwSejKUhHoz04exdYS0ymefw9wXDQ="; + sha256 = "sha256-c9eqY3KBzCrNOLNf1DGpARmxGzwga3+tBg3e7Yr+Rb8="; }; # Remove when Apple SDK is >= 10.13 diff --git a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch new file mode 100644 index 000000000000..e23aded6d0e7 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch @@ -0,0 +1,35 @@ +From 232c692240b9c52b95bd38ba7aecb11e7077cf31 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sat, 26 Feb 2022 12:33:13 +0100 +Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD + +--- + build.gradle | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/build.gradle b/build.gradle +index cbb587f..3b06e80 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -82,6 +82,9 @@ static String getVersion() { + + repositories { + maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages ++ maven { ++ url "https://plugins.gradle.org/m2/" ++ } + mavenCentral() + } + +@@ -102,6 +105,8 @@ dependencies { + implementation 'io.prometheus:simpleclient_httpserver:0.14.1' + implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' + implementation 'io.sentry:sentry:5.6.1' ++ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' ++ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31' + testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' + } + +-- +2.33.1 + diff --git a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch new file mode 100644 index 000000000000..c5931238fe58 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch @@ -0,0 +1,60 @@ +From 80277ce9e24d9efa8dfd6eb775187c823e0e528e Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sat, 26 Feb 2022 12:36:15 +0100 +Subject: [PATCH 2/2] buildconfig/local deps fixes + +--- + build.gradle | 20 ++++++++++++++++++-- + 1 file changed, 18 insertions(+), 2 deletions(-) + +diff --git a/build.gradle b/build.gradle +index cbb587f..ad836cf 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -9,10 +9,21 @@ import org.gradle.nativeplatform.platform.internal.ArchitectureInternal + import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal + import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform + ++buildscript { ++ repositories { ++ maven { ++ url(uri("@deps@")) ++ } ++ } ++ dependencies { ++ classpath "com.github.gmazzo:gradle-buildconfig-plugin:3.0.3" ++ } ++} ++ + plugins { +- id 'com.github.gmazzo.buildconfig' version '3.0.3' + id 'application' + } ++apply plugin: "com.github.gmazzo.buildconfig" + + compileJava.options.encoding = 'UTF-8' + +@@ -82,7 +93,10 @@ static String getVersion() { + + repositories { + maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages +- mavenCentral() ++ mavenLocal() ++ maven { ++ url uri("@deps@") ++ } + } + + dependencies { +@@ -102,6 +116,8 @@ dependencies { + implementation 'io.prometheus:simpleclient_httpserver:0.14.1' + implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' + implementation 'io.sentry:sentry:5.6.1' ++ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' ++ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.4.31' + testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' + } + +-- +2.33.1 + diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index e75c2357b28b..3f84c156f823 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,34 +1,24 @@ { lib, stdenv, fetchurl, fetchFromGitLab, jdk17_headless, coreutils, gradle_6, git, perl -, makeWrapper, fetchpatch +, makeWrapper, fetchpatch, substituteAll }: let pname = "signald"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = version; - sha256 = "ftK+oeqzJ+TxrlvqivFkAi5RCcyJ5Y0oQAJuo0YheBg="; - }; - - log4j-update-cve-2021-44228 = fetchpatch { - url = "https://gitlab.com/signald/signald/-/commit/7f668062ab9ffa09a49d171e995f57cf0a0803a7.patch"; - sha256 = "sha256-504je6hKciUGelVCGZjxGjHi1qZQaovagXD5PBQP+mM="; - }; - - buildConfigJar = fetchurl { - url = "https://dl.bintray.com/mfuerstenau/maven/gradle/plugin/de/fuerstenau/BuildConfigPlugin/1.1.8/BuildConfigPlugin-1.1.8.jar"; - sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f"; + sha256 = "sha256-eN6lEs6PuRczbzQZmGlNf6Ahp4FbWpA3EArlATEiZHU="; }; # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit src version; - patches = [ log4j-update-cve-2021-44228 ]; nativeBuildInputs = [ gradle_6 perl ]; + patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) gradle --no-daemon build @@ -36,7 +26,7 @@ let # 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 =~ s/-jvm//r)}" #e' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \ | sh ''; # Don't move info to share/ @@ -45,8 +35,8 @@ let outputHashMode = "recursive"; # Downloaded jars differ by platform outputHash = { - x86_64-linux = "sha256-e2Tehtznc+VsvQzD3lQ50Lg7ipQc7P3ekOnb8XLORO8="; - aarch64-linux = "sha256-P48s3vG5vUNxCCga5FhzpODhlvvc+F2ZZGX/G0FVGWc="; + x86_64-linux = "sha256-kZ25p+lIkOqNoFFBgJRYFcvKJenKICVa1PasaaEHmRA="; + aarch64-linux = "sha256-CbFNigp3R7ETX0uXv6PNuhDpmPc4sowbWmwZ+5txXQs="; }.${stdenv.system} or (throw "Unsupported platform"); }; @@ -54,22 +44,17 @@ in stdenv.mkDerivation rec { inherit pname src version; patches = [ - ./gradle-plugin.patch - log4j-update-cve-2021-44228 + (substituteAll { + src = ./0002-buildconfig-local-deps-fixes.patch; + inherit deps; + }) ]; - postPatch = '' - sed -i 's|BuildConfig.jar|${buildConfigJar}|' build.gradle - ''; - buildPhase = '' runHook preBuild export GRADLE_USER_HOME=$(mktemp -d) - # Use the local packages from -deps - sed -i -e 's|mavenCentral()|mavenLocal(); maven { url uri("${deps}") }|' build.gradle - gradle --offline --no-daemon distTar runHook postBuild @@ -100,7 +85,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://signald.org"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ expipiplus1 ]; + maintainers = with maintainers; [ expipiplus1 ma27 ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch b/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch deleted file mode 100644 index fec988a94e73..000000000000 --- a/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index 11d7a99..66805bb 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -18,9 +18,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal - import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform - import org.xml.sax.SAXParseException - --plugins { -- id 'de.fuerstenau.buildconfig' version '1.1.8' -+buildscript { -+ dependencies { -+ classpath files ("BuildConfig.jar") -+ } - } -+apply plugin: 'de.fuerstenau.buildconfig' - - apply plugin: 'java' - apply plugin: 'application' diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix new file mode 100644 index 000000000000..464d4d77f946 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/sky/default.nix @@ -0,0 +1,66 @@ +{ lib +, mkDerivation +, fetchurl +, autoPatchelfHook +, zstd +, curl +, ffmpeg +, libjpeg_turbo +, libpam-wrapper +, libv4l +, pulseaudio +, zlib +, xorg +}: + +mkDerivation rec { + pname = "sky"; + version = "2.1.7801"; + + src = fetchurl { + url = "https://tel.red/repos/archlinux/sky-archlinux-${version}-1-x86_64.pkg.tar.zst"; + sha256 = "sha256-3xiq2b3CwNjRd09q0z8olrmLGhgkJGAVkZoJSIHom+k="; + }; + + nativeBuildInputs = [ autoPatchelfHook zstd ]; + + buildInputs = [ + curl + ffmpeg + libjpeg_turbo + libpam-wrapper + libv4l + pulseaudio + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcursor + xorg.libXdamage + xorg.libXinerama + xorg.libXmu + xorg.libXrandr + xorg.libXtst + xorg.libXv + xorg.libxkbfile + zlib + ]; + + installPhase = '' + runHook preInstall + + mkdir $out + mv * $out/ + ln --force --symbolic $out/lib/sky/sky{,_sender} $out/bin + substituteInPlace $out/share/applications/sky.desktop \ + --replace /usr/ $out/ + + runHook postInstall + ''; + + meta = { + description = "Lync & Skype for Business on Linux"; + homepage = "https://tel.red/"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.wucke13 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 79fae0a299a2..b23f4f107aed 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg -, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome +, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg , at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon, libxshmfence }: @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.80.0.143"; + version = "8.81.0.268"; rpath = lib.makeLibraryPath [ alsa-lib @@ -26,7 +26,6 @@ let libsecret libuuid - gnome2.GConf gdk-pixbuf gtk3 libappindicator-gtk3 @@ -69,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-SLypP+ZRHMWeB3KuvmmYb0Y1T3ipSpWNiYYQIzMCDDY="; + sha256 = "sha256-MqXLK+AdYkQVTeTjul9Dru78597FuThRUVq7/y9FYUU="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 5e0175518716..5eb7518ea378 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -18,7 +18,6 @@ , freetype , gdk-pixbuf , glib -, gnome2 , gtk3 , libGL , libappindicator-gtk3 @@ -45,46 +44,45 @@ let pname = "slack"; - x86_64-darwin-version = "4.22.0"; - x86_64-darwin-sha256 = "094p9vyv56m5qfp9jh2205ijfqcp0dr6bkmiv0wxihy2rg20b5zp"; + x86_64-darwin-version = "4.23.0"; + x86_64-darwin-sha256 = "0l4zfyys0yf95dn0sldyjkhzp7bpn84z9q9li1lvv5jj55f0g9jd"; - x86_64-linux-version = "4.22.0"; - x86_64-linux-sha256 = "0k84glxp653lxgfv5b65zvvysax7fr3lhsjgq76safk7g7cjc86i"; + x86_64-linux-version = "4.23.0"; + x86_64-linux-sha256 = "1wsrxacnj9f3cb6as7ncbdvi02jqcbyc7ijsavps5bls9phkp0is"; - aarch64-darwin-version = "4.22.0"; - aarch64-darwin-sha256 = "1z2pcgva9ixjx702c1535b4k0xr9fdnfzi5m08xgvabk9x66hqx4"; + aarch64-darwin-version = "4.23.0"; + aarch64-darwin-sha256 = "053psiqysyi7l8pviq0vwvk2azlxcpdrwfa0b99f1h6lbfcf48f3"; version = { x86_64-darwin = x86_64-darwin-version; - aarch64-darwin = aarch64-darwin-version; x86_64-linux = x86_64-linux-version; + aarch64-darwin = aarch64-darwin-version; }.${system} or throwSystem; - src = - let - base = "https://downloads.slack-edge.com"; - in - { - x86_64-darwin = fetchurl { - url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; - sha256 = x86_64-darwin-sha256; - }; - aarch64-darwin = fetchurl { - url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg"; - sha256 = aarch64-darwin-sha256; - }; - x86_64-linux = fetchurl { - url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb"; - sha256 = x86_64-linux-sha256; - }; - }.${system} or throwSystem; + + src = let + base = "https://downloads.slack-edge.com"; + in { + x86_64-darwin = fetchurl { + url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; + sha256 = x86_64-darwin-sha256; + }; + x86_64-linux = fetchurl { + url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb"; + sha256 = x86_64-linux-sha256; + }; + aarch64-darwin = fetchurl { + url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg"; + sha256 = aarch64-darwin-sha256; + }; + }.${system} or throwSystem; meta = with lib; { description = "Desktop client for Slack"; homepage = "https://slack.com"; license = licenses.unfree; maintainers = with maintainers; [ mmahut ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin"]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; }; linux = stdenv.mkDerivation rec { @@ -106,7 +104,6 @@ let freetype gdk-pixbuf glib - gnome2.GConf gtk3 libGL libappindicator-gtk3 @@ -170,7 +167,8 @@ let rm $out/bin/slack makeWrapper $out/lib/slack/slack $out/bin/slack \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ - --prefix PATH : ${lib.makeBinPath [xdg-utils]} + --prefix PATH : ${lib.makeBinPath [xdg-utils]} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ @@ -194,7 +192,10 @@ let runHook preInstall mkdir -p $out/Applications/Slack.app cp -R . $out/Applications/Slack.app - /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES + '' + lib.optionalString (!stdenv.isAarch64) '' + # on aarch64-darwin we get: Could not write domain com.tinyspeck.slackmacgap; exiting + /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -Bool YES + '' + '' runHook postInstall ''; }; diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh index 0bb0d784167c..688fe579f877 100755 --- a/pkgs/applications/networking/instant-messengers/slack/update.sh +++ b/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -16,21 +16,28 @@ nixpkgs="$(git rev-parse --show-toplevel)" slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix" nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p') nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p') +nixpkgs_mac_arm_version=$(cat "$slack_nix" | sed -n 's/.*aarch64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p') -if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_version" == "$latest_mac_version" ]]; then +if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && \ + "$nixpkgs_mac_version" == "$latest_mac_version" && \ + "$nixpkgs_mac_arm_version" == "$latest_mac_version" ]]; then echo "nixpkgs versions are all up to date!" exit 0 fi -linux_url="https://downloads.slack-edge.com/linux_releases/slack-desktop-${latest_linux_version}-amd64.deb" +linux_url="https://downloads.slack-edge.com/releases/linux/${latest_linux_version}/prod/x64/slack-desktop-${latest_linux_version}-amd64.deb" mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg" +mac_arm_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/arm64/Slack-${latest_mac_version}-macOS.dmg" linux_sha256=$(nix-prefetch-url ${linux_url}) mac_sha256=$(nix-prefetch-url ${mac_url}) +mac_arm_sha256=$(nix-prefetch-url ${mac_arm_url}) sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_version}\"/" "$slack_nix" sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix" +sed -i "s/aarch64-darwin-version = \".*\"/aarch64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix" sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix" sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix" +sed -i "s/aarch64-darwin-sha256 = \".*\"/aarch64-darwin-sha256 = \"${mac_arm_sha256}\"/" "$slack_nix" if ! nix-build -A slack "$nixpkgs"; then echo "The updated slack failed to build." diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 52935267cf2e..84310498eee4 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -14,109 +14,150 @@ , xdg-utils , systemd , nodePackages -, enableRectOverlay ? false }: +, xar +, cpio +, makeWrapper +, enableRectOverlay ? false +}: -stdenv.mkDerivation rec { +let pname = "teams"; version = "1.4.00.26453"; - - src = fetchurl { - url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "0ndqk893l17m42hf5fiiv6mka0v7v8r54kblvb67jsxajdvva5gf"; - }; - - nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ]; - - unpackCmd = "dpkg -x $curSrc ."; - - buildInputs = atomEnv.packages ++ [ - libuuid - at-spi2-atk - ]; - - runtimeDependencies = [ - (lib.getLib systemd) - pulseaudio - libappindicator-gtk3 - ]; - - preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin") - gappsWrapperArgs+=(--add-flags --disable-namespace-sandbox) - gappsWrapperArgs+=(--add-flags --disable-setuid-sandbox) - ''; - - - buildPhase = '' - runHook preBuild - - asar extract share/teams/resources/app.asar "$TMP/work" - substituteInPlace $TMP/work/main.bundle.js \ - --replace "/usr/share/pixmaps/" "$out/share/pixmaps" \ - --replace "/usr/bin/xdg-mime" "${xdg-utils}/bin/xdg-mime" \ - --replace "Exec=/usr/bin/" "Exec=" # Remove usage of absolute path in autostart. - asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" share/teams/resources/app.asar - - runHook postBuild - ''; - - preferLocalBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{opt,bin} - - mv share/teams $out/opt/ - mv share $out/share - - substituteInPlace $out/share/applications/teams.desktop \ - --replace /usr/bin/ "" - - ln -s $out/opt/teams/teams $out/bin/ - - ${lib.optionalString (!enableRectOverlay) '' - # Work-around screen sharing bug - # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html - rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay - ''} - - runHook postInstall - ''; - - dontAutoPatchelf = true; - - # Includes runtimeDependencies in the RPATH of the included Node modules - # so that dynamic loading works. We cannot use directly runtimeDependencies - # here, since the libraries from runtimeDependencies are not propagated - # to the dynamically loadable node modules because of a condition in - # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) - # instead of EXEC or INTERP it expects. - # Fixes: https://github.com/NixOS/nixpkgs/issues/85449 - postFixup = '' - autoPatchelf "$out" - - runtime_rpath="${lib.makeLibraryPath runtimeDependencies}" - - for mod in $(find "$out/opt/teams" -name '*.node'); do - mod_rpath="$(patchelf --print-rpath "$mod")" - - echo "Adding runtime dependencies to RPATH of Node module $mod" - patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" - done; - - # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406 - # while we create the wrapper ourselves, gappsWrapperArgs leads to the same issue - # another option would be to introduce gappsWrapperAppendedArgs, to allow control of positioning - substituteInPlace "$out/bin/teams" --replace '.teams-wrapped" --disable-namespace-sandbox --disable-setuid-sandbox "$@"' '.teams-wrapped" "$@" --disable-namespace-sandbox --disable-setuid-sandbox' - ''; - meta = with lib; { description = "Microsoft Teams"; homepage = "https://teams.microsoft.com"; downloadPage = "https://teams.microsoft.com/downloads"; license = licenses.unfree; - maintainers = [ maintainers.liff ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ liff tricktron ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; -} + + linux = stdenv.mkDerivation rec { + inherit pname version meta; + + src = fetchurl { + url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; + sha256 = "0ndqk893l17m42hf5fiiv6mka0v7v8r54kblvb67jsxajdvva5gf"; + }; + + nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ]; + + unpackCmd = "dpkg -x $curSrc ."; + + buildInputs = atomEnv.packages ++ [ + libuuid + at-spi2-atk + ]; + + runtimeDependencies = [ + (lib.getLib systemd) + pulseaudio + libappindicator-gtk3 + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin") + gappsWrapperArgs+=(--add-flags --disable-namespace-sandbox) + gappsWrapperArgs+=(--add-flags --disable-setuid-sandbox) + ''; + + + buildPhase = '' + runHook preBuild + + asar extract share/teams/resources/app.asar "$TMP/work" + substituteInPlace $TMP/work/main.bundle.js \ + --replace "/usr/share/pixmaps/" "$out/share/pixmaps" \ + --replace "/usr/bin/xdg-mime" "${xdg-utils}/bin/xdg-mime" \ + --replace "Exec=/usr/bin/" "Exec=" # Remove usage of absolute path in autostart. + asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" share/teams/resources/app.asar + + runHook postBuild + ''; + + preferLocalBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{opt,bin} + + mv share/teams $out/opt/ + mv share $out/share + + substituteInPlace $out/share/applications/teams.desktop \ + --replace /usr/bin/ "" + + ln -s $out/opt/teams/teams $out/bin/ + + ${lib.optionalString (!enableRectOverlay) '' + # Work-around screen sharing bug + # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html + rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay + ''} + + runHook postInstall + ''; + + dontAutoPatchelf = true; + + # Includes runtimeDependencies in the RPATH of the included Node modules + # so that dynamic loading works. We cannot use directly runtimeDependencies + # here, since the libraries from runtimeDependencies are not propagated + # to the dynamically loadable node modules because of a condition in + # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) + # instead of EXEC or INTERP it expects. + # Fixes: https://github.com/NixOS/nixpkgs/issues/85449 + postFixup = '' + autoPatchelf "$out" + + runtime_rpath="${lib.makeLibraryPath runtimeDependencies}" + + for mod in $(find "$out/opt/teams" -name '*.node'); do + mod_rpath="$(patchelf --print-rpath "$mod")" + + echo "Adding runtime dependencies to RPATH of Node module $mod" + patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" + done; + + # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406 + # while we create the wrapper ourselves, gappsWrapperArgs leads to the same issue + # another option would be to introduce gappsWrapperAppendedArgs, to allow control of positioning + substituteInPlace "$out/bin/teams" --replace '.teams-wrapped" --disable-namespace-sandbox --disable-setuid-sandbox "$@"' '.teams-wrapped" "$@" --disable-namespace-sandbox --disable-setuid-sandbox' + ''; + }; + + appName = "Teams.app"; + + darwin = stdenv.mkDerivation { + inherit pname version meta; + + src = fetchurl { + url = "https://statics.teams.cdn.office.net/production-osx/${version}/Teams_osx.pkg"; + sha256 = "1mg6a3b3954w4xy5rlcrwxczymygl61dv2rxqp45sjcsh3hp39q0"; + }; + + buildInputs = [ xar cpio makeWrapper ]; + + unpackPhase = '' + xar -xf $src + zcat < Teams_osx_app.pkg/Payload | cpio -i + ''; + + sourceRoot = "Microsoft\ Teams.app"; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/{Applications/${appName},bin} + cp -R . $out/Applications/${appName} + makeWrapper $out/Applications/${appName}/Contents/MacOS/Teams $out/bin/teams + runHook postInstall + ''; + }; +in +if stdenv.isDarwin +then darwin +else linux diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 513f427ee13d..80d04eabc824 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config -, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin +, alsa-lib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages_10, writeShellScriptBin }: let @@ -13,7 +13,7 @@ let [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender openssl xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsa-lib qtbase qtwebengine qtwebchannel qtsvg - qtwebsockets libpulseaudio quazip llvmPackages.libcxx llvmPackages.libcxxabi + qtwebsockets libpulseaudio quazip llvmPackages_10.libcxx llvmPackages_10.libcxxabi # llvmPackages_11 and higher crash https://github.com/NixOS/nixpkgs/issues/161395 ]; desktopItem = makeDesktopItem { @@ -23,7 +23,7 @@ let comment = "The TeamSpeak voice communication tool"; desktopName = "TeamSpeak"; genericName = "TeamSpeak"; - categories = "Network"; + categories = [ "Network" ]; }; fakeLess = writeShellScriptBin "less" "cat"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index cb4f3e5e5d15..ce5dc0e266e6 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,53 +1,231 @@ -{ mkDerivation, lib, fetchFromGitHub, callPackage -, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook -, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash -, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 -, tl-expected, hunspell, glibmm, webkitgtk -# Transitive dependencies: -, pcre, xorg, util-linux, libselinux, libsepol, libepoxy -, at-spi2-core, libXtst, libthai, libdatrie +{ lib +, stdenv +, fetchFromGitHub +, callPackage +, pkg-config +, cmake +, ninja +, clang +, python3 +, wrapGAppsHook +, wrapQtAppsHook +, removeReferencesTo +, extra-cmake-modules +, qtbase +, qtimageformats +, qtsvg +, kwayland +, lz4 +, xxHash +, ffmpeg +, openalSoft +, minizip +, libopus +, alsa-lib +, libpulseaudio +, range-v3 +, tl-expected +, hunspell +, glibmm +, webkitgtk +, jemalloc +, rnnoise +, abseil-cpp +, microsoft_gsl +, wayland +, libicns +, Cocoa +, CoreFoundation +, CoreServices +, CoreText +, CoreGraphics +, CoreMedia +, OpenGL +, AudioUnit +, ApplicationServices +, Foundation +, AGL +, Security +, SystemConfiguration +, Carbon +, AudioToolbox +, VideoToolbox +, VideoDecodeAcceleration +, AVFoundation +, CoreAudio +, CoreVideo +, CoreMediaIO +, QuartzCore +, AppKit +, CoreWLAN +, WebKit +, IOKit +, GSS +, MediaPlayer +, IOSurface +, Metal +, MetalKit +, withWebKit ? false }: with lib; let - tg_owt = callPackage ./tg_owt.nix {}; -in mkDerivation rec { + tg_owt = callPackage ./tg_owt.nix { + abseil-cpp = (abseil-cpp.override { + # abseil-cpp should use the same compiler + inherit stdenv; + cxxStandard = "20"; + }).overrideAttrs (_: { + # https://github.com/NixOS/nixpkgs/issues/130963 + NIX_LDFLAGS = optionalString stdenv.isDarwin "-lc++abi"; + }); + + # tg_owt should use the same compiler + inherit stdenv; + + inherit Cocoa AppKit IOKit IOSurface Foundation AVFoundation CoreMedia VideoToolbox + CoreGraphics CoreVideo OpenGL Metal MetalKit CoreFoundation ApplicationServices; + }; +in +stdenv.mkDerivation rec { pname = "kotatogram-desktop"; - version = "1.4.1"; + version = "1.4.9"; src = fetchFromGitHub { owner = "kotatogram"; repo = "kotatogram-desktop"; rev = "k${version}"; - sha256 = "07z56gz3sk45n5j0gw9p9mxrbwixxsmp7lvqc6lqnxmglz6knc1d"; + sha256 = "sha256-6bF/6fr8mJyyVg53qUykysL7chuewtJB8E22kVyxjHw="; fetchSubmodules = true; }; - postPatch = '' + patches = [ + ./shortcuts-binary-path.patch + # let it build with nixpkgs 10.12 sdk + ./kotato-10.12-sdk.patch + ]; + + postPatch = optionalString stdenv.isLinux '' + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ + --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ + --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ + --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' + '' + optionalString (stdenv.isLinux && withWebKit) '' + substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \ + --replace '"libwebkit2gtk-4.0.so.37"' '"${webkitgtk}/lib/libwebkit2gtk-4.0.so.37"' + '' + optionalString stdenv.isDarwin '' substituteInPlace Telegram/CMakeLists.txt \ - --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' + --replace 'COMMAND iconutil' 'COMMAND png2icns' \ + --replace '--convert icns' "" \ + --replace '--output AppIcon.icns' 'AppIcon.icns' \ + --replace "\''${appicon_path}" "\''${appicon_path}/icon_16x16.png \''${appicon_path}/icon_32x32.png \''${appicon_path}/icon_128x128.png \''${appicon_path}/icon_256x256.png \''${appicon_path}/icon_512x512.png" ''; # We want to run wrapProgram manually (with additional parameters) - dontWrapGApps = true; - dontWrapQtApps = true; + dontWrapGApps = stdenv.isLinux; + dontWrapQtApps = stdenv.isLinux && withWebKit; - nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook ]; - - buildInputs = [ - qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash - ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 - tl-expected hunspell glibmm webkitgtk - tg_owt - # Transitive dependencies: - pcre xorg.libXdmcp util-linux libselinux libsepol libepoxy - at-spi2-core libXtst libthai libdatrie + nativeBuildInputs = [ + pkg-config + cmake + ninja + python3 + wrapQtAppsHook + removeReferencesTo + ] ++ optionals stdenv.isLinux [ + # to build bundled libdispatch + clang + extra-cmake-modules + ] ++ optionals (stdenv.isLinux && withWebKit) [ + wrapGAppsHook ]; - cmakeFlags = [ "-DTDESKTOP_API_TEST=ON" ]; + buildInputs = [ + qtbase + qtimageformats + qtsvg + lz4 + xxHash + ffmpeg + openalSoft + minizip + libopus + range-v3 + tl-expected + rnnoise + tg_owt + microsoft_gsl + ] ++ optionals stdenv.isLinux [ + kwayland + alsa-lib + libpulseaudio + hunspell + glibmm + jemalloc + wayland + ] ++ optionals (stdenv.isLinux && withWebKit) [ + webkitgtk + ] ++ optionals stdenv.isDarwin [ + Cocoa + CoreFoundation + CoreServices + CoreText + CoreGraphics + CoreMedia + OpenGL + AudioUnit + ApplicationServices + Foundation + AGL + Security + SystemConfiguration + Carbon + AudioToolbox + VideoToolbox + VideoDecodeAcceleration + AVFoundation + CoreAudio + CoreVideo + CoreMediaIO + QuartzCore + AppKit + CoreWLAN + WebKit + IOKit + GSS + MediaPlayer + IOSurface + Metal + libicns + ]; - postFixup = '' + # https://github.com/NixOS/nixpkgs/issues/130963 + NIX_LDFLAGS = optionalString stdenv.isDarwin "-lc++abi"; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DTDESKTOP_API_TEST=ON" + "-DDESKTOP_APP_QT6=OFF" + ]; + + installPhase = optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -r Kotatogram.app $out/Applications + ln -s $out/Applications/Kotatogram.app/Contents/MacOS $out/bin + ''; + + preFixup = '' + binName=${if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"} + remove-references-to -t ${stdenv.cc.cc} $out/bin/$binName + remove-references-to -t ${microsoft_gsl} $out/bin/$binName + remove-references-to -t ${tg_owt.dev} $out/bin/$binName + ''; + + postFixup = optionalString (stdenv.isLinux && withWebKit) '' # We also use gappsWrapperArgs from wrapGAppsHook. wrapProgram $out/bin/kotatogram-desktop \ "''${gappsWrapperArgs[@]}" \ @@ -66,9 +244,9 @@ in mkDerivation rec { It contains some useful (or purely cosmetic) features, but they could be unstable. A detailed list is available here: https://kotatogram.github.io/changes ''; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.all; homepage = "https://kotatogram.github.io"; - changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{ver}"; + changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; maintainers = with maintainers; [ ilya-fedin ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch new file mode 100644 index 000000000000..d603c967cfde --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kotato-10.12-sdk.patch @@ -0,0 +1,415 @@ +diff --git a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm +index 337055443..09604b117 100644 +--- a/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm ++++ b/Telegram/SourceFiles/platform/mac/file_bookmark_mac.mm +@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + + #include + #include ++#undef check + + namespace Platform { + namespace { +diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm +index 3b4395ae3..7f8ee401f 100644 +--- a/Telegram/SourceFiles/platform/mac/specific_mac.mm ++++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm +@@ -119,6 +119,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) { + switch (type) { + case PermissionType::Microphone: + case PermissionType::Camera: ++#if 0 + const auto nativeType = (type == PermissionType::Microphone) + ? AVMediaTypeAudio + : AVMediaTypeVideo; +@@ -133,6 +134,7 @@ PermissionStatus GetPermissionStatus(PermissionType type) { + return PermissionStatus::Denied; + } + } ++#endif + break; + } + return PermissionStatus::Granted; +@@ -142,6 +144,7 @@ void RequestPermission(PermissionType type, Fn resultCal + switch (type) { + case PermissionType::Microphone: + case PermissionType::Camera: ++#if 0 + const auto nativeType = (type == PermissionType::Microphone) + ? AVMediaTypeAudio + : AVMediaTypeVideo; +@@ -152,6 +155,7 @@ void RequestPermission(PermissionType type, Fn resultCal + }); + }]; + } ++#endif + break; + } + resultCallback(PermissionStatus::Granted); +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h +index a537929c8..82ef2b837 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_formatter_item.h +@@ -9,8 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + + #import + #import ++#undef check + +-API_AVAILABLE(macos(10.12.2)) + @interface TextFormatPopover : NSPopoverTouchBarItem + - (id)init:(NSTouchBarItemIdentifier)identifier; + @end +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h +index c6a4b886f..d2e0936c0 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_pinned_chats_item.h +@@ -8,12 +8,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #pragma once + + #include ++#undef check + + namespace Main { + class Session; + } // namespace Main + +-API_AVAILABLE(macos(10.12.2)) + @interface PinnedDialogsPanel : NSImageView + - (id)init:(not_null)session + destroyEvent:(rpl::producer<>)touchBarSwitches; +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h +index 27b04467c..b1a7dfbd9 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/items/mac_scrubber_item.h +@@ -9,12 +9,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + + #import + #import ++#undef check + + namespace Window { + class Controller; + } // namespace Window + +-API_AVAILABLE(macos(10.12.2)) + @interface StickerEmojiPopover : NSPopoverTouchBarItem + - (id)init:(not_null)controller + identifier:(NSTouchBarItemIdentifier)identifier; +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h +index ec4596c67..972461aef 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_audio.h +@@ -8,8 +8,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #pragma once + + #import ++#undef check + +-API_AVAILABLE(macos(10.12.2)) + @interface TouchBarAudioPlayer : NSTouchBar + - (rpl::producer<>)closeRequests; + @end +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h +index 52b54de12..ac3857f9b 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_common.h +@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + + #import + #import ++#undef check + + namespace TouchBar { + +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h +index 1cc8c832f..c2178c975 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h +@@ -20,19 +20,19 @@ struct TrackState; + + namespace TouchBar { + +-[[nodiscard]] API_AVAILABLE(macos(10.12.2)) ++[[nodiscard]] + NSButton *CreateTouchBarButton( + NSImage *image, + rpl::lifetime &lifetime, + Fn callback); + +-[[nodiscard]] API_AVAILABLE(macos(10.12.2)) ++[[nodiscard]] + NSButton *CreateTouchBarButton( + const style::icon &icon, + rpl::lifetime &lifetime, + Fn callback); + +-[[nodiscard]] API_AVAILABLE(macos(10.12.2)) ++[[nodiscard]] + NSButton *CreateTouchBarButtonWithTwoStates( + NSImage *icon1, + NSImage *icon2, +@@ -41,7 +41,7 @@ NSButton *CreateTouchBarButtonWithTwoStates( + bool firstState, + rpl::producer stateChanged = rpl::never()); + +-[[nodiscard]] API_AVAILABLE(macos(10.12.2)) ++[[nodiscard]] + NSButton *CreateTouchBarButtonWithTwoStates( + const style::icon &icon1, + const style::icon &icon2, +@@ -50,14 +50,14 @@ NSButton *CreateTouchBarButtonWithTwoStates( + bool firstState, + rpl::producer stateChanged = rpl::never()); + +-[[nodiscard]] API_AVAILABLE(macos(10.12.2)) ++[[nodiscard]] + NSSliderTouchBarItem *CreateTouchBarSlider( + NSString *itemId, + rpl::lifetime &lifetime, + Fn callback, + rpl::producer stateChanged); + +-[[nodiscard]] API_AVAILABLE(macos(10.12.2)) ++[[nodiscard]] + NSCustomTouchBarItem *CreateTouchBarTrackPosition( + NSString *itemId, + rpl::producer stateChanged); +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h +index f03546eaf..bc8c63678 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_main.h +@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #pragma once + + #import ++#undef check + + namespace Window { + class Controller; +@@ -21,7 +22,6 @@ const auto kPopoverPickerItemIdentifier = @"pickerButtons"; + + } // namespace TouchBar::Main + +-API_AVAILABLE(macos(10.12.2)) + @interface TouchBarMain : NSTouchBar + - (id)init:(not_null)controller + touchBarSwitches:(rpl::producer<>)touchBarSwitches; +diff --git a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h +index 464f87c9c..9a008c75e 100644 +--- a/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h ++++ b/Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_manager.h +@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #pragma once + + #import ++#undef check + + namespace Main { + class Domain; +@@ -17,7 +18,6 @@ namespace Window { + class Controller; + } // namespace Window + +-API_AVAILABLE(macos(10.12.2)) + @interface RootTouchBar : NSTouchBar + - (id)init:(rpl::producer)canApplyMarkdown + controller:(not_null)controller +Submodule Telegram/ThirdParty/tgcalls contains modified content +diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm +index 8a4417b..2d9794e 100644 +--- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm ++++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoDecoderFactory.mm +@@ -71,7 +71,7 @@ + if (@available(iOS 11.0, *)) { + [result addObject:h265Info]; + } +-#else // WEBRTC_IOS ++#elif 0 // WEBRTC_IOS + if (@available(macOS 10.13, *)) { + [result addObject:h265Info]; + } +@@ -101,7 +101,7 @@ + return [[TGRTCVideoDecoderH265 alloc] init]; + } + } +-#else // WEBRTC_IOS ++#elif 0 // WEBRTC_IOS + if (@available(macOS 10.13, *)) { + if ([info.name isEqualToString:kRTCVideoCodecH265Name]) { + return [[TGRTCVideoDecoderH265 alloc] init]; +diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm +index 2901417..ac9ec2a 100644 +--- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm ++++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/TGRTCDefaultVideoEncoderFactory.mm +@@ -76,7 +76,7 @@ + [result addObject:h265Info]; + } + } +-#else // WEBRTC_IOS ++#elif 0 // WEBRTC_IOS + if (@available(macOS 10.13, *)) { + if ([[AVAssetExportSession allExportPresets] containsObject:AVAssetExportPresetHEVCHighestQuality]) { + [result addObject:h265Info]; +@@ -112,7 +112,7 @@ + return [[TGRTCVideoEncoderH265 alloc] initWithCodecInfo:info]; + } + } +-#else // WEBRTC_IOS ++#elif 0 // WEBRTC_IOS + if (@available(macOS 10.13, *)) { + if ([info.name isEqualToString:kRTCVideoCodecH265Name]) { + return [[TGRTCVideoEncoderH265 alloc] initWithCodecInfo:info]; +diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm +index de92427..9a5b20d 100644 +--- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm ++++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.mm +@@ -507,8 +507,7 @@ static tgcalls::DarwinVideoTrackSource *getObjCVideoSource(const rtc::scoped_ref + - (void)captureOutput:(AVCaptureOutput *)captureOutput + didDropSampleBuffer:(CMSampleBufferRef)sampleBuffer + fromConnection:(AVCaptureConnection *)connection { +- NSString *droppedReason = +- (__bridge NSString *)CMGetAttachment(sampleBuffer, kCMSampleBufferAttachmentKey_DroppedFrameReason, nil); ++ NSString *droppedReason = nil; + RTCLogError(@"Dropped sample buffer. Reason: %@", droppedReason); + } + +diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm +index bcabcf7..de7b6c7 100644 +--- a/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm ++++ b/Telegram/ThirdParty/tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.mm +@@ -245,9 +245,11 @@ private: + layer.framebufferOnly = true; + layer.opaque = false; + // layer.cornerRadius = 4; ++#if 0 + if (@available(macOS 10.13, *)) { + layer.displaySyncEnabled = NO; + } ++#endif + // layer.presentsWithTransaction = YES; + layer.backgroundColor = [NSColor clearColor].CGColor; + layer.contentsGravity = kCAGravityResizeAspectFill; +@@ -334,9 +336,7 @@ private: + - (RTCVideoRotation)rtcFrameRotation { + if (_rotationOverride) { + RTCVideoRotation rotation; +- if (@available(macOS 10.13, *)) { +- [_rotationOverride getValue:&rotation size:sizeof(rotation)]; +- } else { ++ { + [_rotationOverride getValue:&rotation]; + } + return rotation; +Submodule Telegram/lib_base contains modified content +diff --git a/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm b/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm +index 5491702..32befc6 100644 +--- a/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm ++++ b/Telegram/lib_base/base/platform/mac/base_global_shortcuts_mac.mm +@@ -128,6 +128,7 @@ bool Available() { + } + + bool Allowed() { ++#if 0 + if (@available(macOS 10.15, *)) { + // Input Monitoring is required on macOS 10.15 an later. + // Even if user grants access, restart is required. +@@ -141,6 +142,7 @@ bool Allowed() { + return AXIsProcessTrustedWithOptions( + (__bridge CFDictionaryRef)options); + } ++#endif + return true; + } + +diff --git a/Telegram/lib_base/base/platform/mac/base_info_mac.mm b/Telegram/lib_base/base/platform/mac/base_info_mac.mm +index 29e368f..ea1f65f 100644 +--- a/Telegram/lib_base/base/platform/mac/base_info_mac.mm ++++ b/Telegram/lib_base/base/platform/mac/base_info_mac.mm +@@ -203,16 +203,20 @@ void Finish() { + } + + void OpenInputMonitoringPrivacySettings() { ++#if 0 + if (@available(macOS 10.15, *)) { + IOHIDRequestAccess(kIOHIDRequestTypeListenEvent); + } ++#endif + [[NSWorkspace sharedWorkspace] openURL:PrivacySettingsUrl("Privacy_ListenEvent")]; + } + + void OpenDesktopCapturePrivacySettings() { ++#if 0 + if (@available(macOS 11.0, *)) { + CGRequestScreenCaptureAccess(); + } ++#endif + [[NSWorkspace sharedWorkspace] openURL:PrivacySettingsUrl("Privacy_ScreenCapture")]; + } + +diff --git a/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm b/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm +index c86ac77..b081162 100644 +--- a/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm ++++ b/Telegram/lib_base/base/platform/mac/base_system_media_controls_mac.mm +@@ -271,6 +271,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) { + if (thumbnail.isNull()) { + return; + } ++#if 0 + if (@available(macOS 10.13.2, *)) { + const auto copy = thumbnail; + [_private->info +@@ -284,6 +285,7 @@ void SystemMediaControls::setThumbnail(const QImage &thumbnail) { + forKey:MPMediaItemPropertyArtwork]; + updateDisplay(); + } ++#endif + } + + void SystemMediaControls::setDuration(int duration) { +@@ -302,10 +304,12 @@ void SystemMediaControls::setVolume(float64 volume) { + } + + void SystemMediaControls::clearThumbnail() { ++#if 0 + if (@available(macOS 10.13.2, *)) { + [_private->info removeObjectForKey:MPMediaItemPropertyArtwork]; + updateDisplay(); + } ++#endif + } + + void SystemMediaControls::clearMetadata() { +@@ -367,9 +371,11 @@ bool SystemMediaControls::volumeSupported() const { + } + + bool SystemMediaControls::Supported() { ++#if 0 + if (@available(macOS 10.12.2, *)) { + return true; + } ++#endif + return false; + } + +Submodule Telegram/lib_webrtc contains modified content +diff --git a/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm b/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm +index 21e93f7..10a3890 100644 +--- a/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm ++++ b/Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm +@@ -397,6 +397,7 @@ void MacMediaDevices::videoInputRefreshed() { + } + + bool MacDesktopCaptureAllowed() { ++#if 0 + if (@available(macOS 11.0, *)) { + // Screen Recording is required on macOS 10.15 an later. + // Even if user grants access, restart is required. +@@ -421,6 +422,7 @@ bool MacDesktopCaptureAllowed() { + CFRelease(stream); + return true; + } ++#endif + return true; + } + diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch new file mode 100644 index 000000000000..f173a64f141a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch @@ -0,0 +1,38 @@ +diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp +index 2a092c6ea..de46dd269 100644 +--- a/Telegram/SourceFiles/core/application.cpp ++++ b/Telegram/SourceFiles/core/application.cpp +@@ -1173,7 +1173,7 @@ void Application::startShortcuts() { + + void Application::RegisterUrlScheme() { + base::Platform::RegisterUrlScheme(base::Platform::UrlSchemeDescriptor{ +- .executable = cExeDir() + cExeName(), ++ .executable = qsl("kotatogram-desktop"), + .arguments = qsl("-workdir \"%1\"").arg(cWorkingDir()), + .protocol = qsl("tg"), + .protocolName = qsl("Telegram Link"), +diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp +index 26168baa7..00d2525a0 100644 +--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp ++++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp +@@ -303,19 +303,11 @@ bool GenerateDesktopFile( + + QFile target(targetFile); + if (target.open(QIODevice::WriteOnly)) { +- fileText = fileText.replace( +- QRegularExpression( +- qsl("^TryExec=.*$"), +- QRegularExpression::MultilineOption), +- qsl("TryExec=%1").arg( +- QString(cExeDir() + cExeName()).replace('\\', "\\\\"))); +- + fileText = fileText.replace( + QRegularExpression( + qsl("^Exec=kotatogram-desktop(.*)$"), + QRegularExpression::MultilineOption), +- qsl("Exec=%1 -workdir %2\\1").arg( +- EscapeShellInLauncher(cExeDir() + cExeName()), ++ qsl("Exec=kotatogram-desktop -workdir %1\\1").arg( + EscapeShellInLauncher(cWorkingDir()))); + + fileText = fileText.replace( diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch new file mode 100644 index 000000000000..a9adf5737a55 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt-10.12-sdk.patch @@ -0,0 +1,55 @@ +diff --git a/src/rtc_base/system/gcd_helpers.m b/src/rtc_base/system/gcd_helpers.m +index fd9a361f..3a63be6d 100644 +--- a/src/rtc_base/system/gcd_helpers.m ++++ b/src/rtc_base/system/gcd_helpers.m +@@ -13,9 +13,6 @@ + dispatch_queue_t RTCDispatchQueueCreateWithTarget(const char *label, + dispatch_queue_attr_t attr, + dispatch_queue_t target) { +- if (@available(iOS 10, macOS 10.12, tvOS 10, watchOS 3, *)) { +- return dispatch_queue_create_with_target(label, attr, target); +- } + dispatch_queue_t queue = dispatch_queue_create(label, attr); + dispatch_set_target_queue(queue, target); + return queue; +diff --git a/src/sdk/objc/components/video_codec/nalu_rewriter.cc b/src/sdk/objc/components/video_codec/nalu_rewriter.cc +index 61c1e7d6..b19f3f91 100644 +--- a/src/sdk/objc/components/video_codec/nalu_rewriter.cc ++++ b/src/sdk/objc/components/video_codec/nalu_rewriter.cc +@@ -245,10 +245,7 @@ bool H265CMSampleBufferToAnnexBBuffer( + int nalu_header_size = 0; + size_t param_set_count = 0; + OSStatus status = noErr; +- if (__builtin_available(macOS 10.13, *)) { +- status = CMVideoFormatDescriptionGetHEVCParameterSetAtIndex( +- description, 0, nullptr, nullptr, ¶m_set_count, &nalu_header_size); +- } else { ++ { + RTC_LOG(LS_ERROR) << "Not supported."; + return false; + } +@@ -271,10 +268,7 @@ bool H265CMSampleBufferToAnnexBBuffer( + size_t param_set_size = 0; + const uint8_t* param_set = nullptr; + for (size_t i = 0; i < param_set_count; ++i) { +- if (__builtin_available(macOS 10.13, *)) { +- status = CMVideoFormatDescriptionGetHEVCParameterSetAtIndex( +- description, i, ¶m_set, ¶m_set_size, nullptr, nullptr); +- } else { ++ { + RTC_LOG(LS_ERROR) << "Not supported."; + return false; + } +@@ -514,11 +508,7 @@ CMVideoFormatDescriptionRef CreateH265VideoFormatDescription( + // Parse the SPS and PPS into a CMVideoFormatDescription. + CMVideoFormatDescriptionRef description = nullptr; + OSStatus status = noErr; +- if (__builtin_available(macOS 10.13, *)) { +- status = CMVideoFormatDescriptionCreateFromHEVCParameterSets( +- kCFAllocatorDefault, 3, param_set_ptrs, param_set_sizes, 4, nullptr, +- &description); +- } else { ++ { + RTC_LOG(LS_ERROR) << "Not supported."; + return nullptr; + } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index 614183b72d08..fe62270b8e80 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -1,35 +1,123 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm -, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf -, xorg, libXtst +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, ninja +, yasm +, libjpeg +, openssl +, libopus +, ffmpeg_4 +, protobuf +, openh264 +, usrsctp +, libvpx +, libX11 +, libXtst +, libXcomposite +, libXdamage +, libXext +, libXrender +, libXrandr +, libXi +, glib +, abseil-cpp +, pipewire +, mesa +, libglvnd +, libepoxy +, Cocoa +, AppKit +, IOKit +, IOSurface +, Foundation +, AVFoundation +, CoreMedia +, VideoToolbox +, CoreGraphics +, CoreVideo +, OpenGL +, Metal +, MetalKit +, CoreFoundation +, ApplicationServices }: -let - rev = "2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3"; - sha256 = "0kz0i381iwsgcc3yzsq7njx3gkqja4bb9fsgc24vhg0md540qhyn"; - -in stdenv.mkDerivation { +stdenv.mkDerivation { pname = "tg_owt"; - version = "git-${rev}"; + version = "unstable-2022-02-26"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - inherit rev sha256; + rev = "a264028ec71d9096e0aa629113c49c25db89d260"; + sha256 = "sha256-JR+M+4w0QsQLfIunZ/7W+5Knn+gX+RR3DBrpOz7q44I="; fetchSubmodules = true; }; + patches = [ + # let it build with nixpkgs 10.12 sdk + ./tg_owt-10.12-sdk.patch + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkg-config cmake ninja yasm ]; buildInputs = [ - libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf - xorg.libX11 libXtst + libjpeg + openssl + libopus + ffmpeg_4 + protobuf + openh264 + usrsctp + libvpx + abseil-cpp + ] ++ lib.optionals stdenv.isLinux [ + libX11 + libXtst + libXcomposite + libXdamage + libXext + libXrender + libXrandr + libXi + glib + pipewire + mesa + libepoxy + libglvnd + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + AppKit + IOKit + IOSurface + Foundation + AVFoundation + CoreMedia + VideoToolbox + CoreGraphics + CoreVideo + OpenGL + Metal + MetalKit + CoreFoundation + ApplicationServices ]; - cmakeFlags = [ - # Building as a shared library isn't officially supported and currently broken: - "-DBUILD_SHARED_LIBS=OFF" + # https://github.com/NixOS/nixpkgs/issues/130963 + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lc++abi"; + + enableParallelBuilding = true; + + propagatedBuildInputs = [ + # Required for linking downstream binaries. + abseil-cpp + openh264 + usrsctp + libvpx ]; meta.license = lib.licenses.bsd3; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index c58ade82d302..c23e416d2c62 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -70,7 +70,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "3.4.8"; + version = "3.6.0"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -79,7 +79,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "11h2w82i10zn55iz9xda8ihsnv6s8rxm3wkmmmkpa4zfzinryqb4"; + sha256 = "0zcjm08nfdlxrsv0fi6dqg3lk52bcvsxnsf6jm5fv6gf5v9ia3hq"; }; postPatch = '' @@ -189,6 +189,6 @@ env.mkDerivation rec { platforms = platforms.linux; homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; - maintainers = with maintainers; [ oxalica vanilla ]; + maintainers = with maintainers; [ oxalica ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 25dc1ff3d034..200e0e887e3e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -4,17 +4,18 @@ , openh264, usrsctp, libevent, libvpx , libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi , glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire +, mesa, valgrind, libepoxy, libglvnd }: stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2021-12-22"; + version = "unstable-2022-02-25"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "6708e0d31a73e64fe12f54829bf4060c41b2658e"; - sha256 = "081ylw8vp8c84x3f1xx1kia6k1sds2iza9fm5dvn3ccgjwxdm5ny"; + rev = "a264028ec71d9096e0aa629113c49c25db89d260"; + sha256 = "10p3x8z3ps8s1ivi9y8px2gsg4pvsvz6g9wbgh5w8hilikxqq7r5"; fetchSubmodules = true; }; @@ -27,6 +28,7 @@ stdenv.mkDerivation { openh264 usrsctp libevent libvpx libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire + mesa libepoxy libglvnd ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 943ec299cdbd..cbc93857c819 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,7 +1,7 @@ { mkDerivation , lib , stdenv -, fetchgit +, fetchFromGitHub , qtbase , qtquickcontrols , qmake @@ -15,10 +15,11 @@ mkDerivation rec { pname = "tensor"; version = "unstable-2017-02-21"; - src = fetchgit { - url = "https://github.com/davidar/tensor.git"; + src = fetchFromGitHub { + owner = "davidar"; + repo = "tensor"; rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; - sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9"; + sha256 = "sha256-aR6TsfUxsxoSDaIWYgRCwd7BCgekSEqY6LpDoQ5DNqY="; fetchSubmodules = true; }; @@ -32,8 +33,8 @@ mkDerivation rec { comment = meta.description; desktopName = "Tensor Matrix Client"; genericName = meta.description; - categories = "Chat;Utility"; - mimeType = "application/x-chat"; + categories = [ "Chat" "Utility" ]; + mimeTypes = [ "application/x-chat" ]; }; installPhase = if stdenv.isDarwin then '' diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 51b119aa6de5..5fb0f14f36a0 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -4,20 +4,20 @@ let pname = "vk-messenger"; - version = "5.2.3"; + version = "5.3.2"; src = { i686-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm"; - sha256 = "09zi2rzsank6lhw1z9yar1rp634y6qskvr2i0rvqg2fij7cy6w19"; + sha256 = "L0nE0zW4LP8udcE8uPy+cH9lLuQsUSq7cF13Gv7w2rI="; }; x86_64-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm"; - sha256 = "1m6saanpv1k5wc5s58jpf0wsgjsj7haabx8nycm1fjyhky1chirb"; + sha256 = "spDw9cfDSlIuCwOqREsqXC19tx62TiAz9fjIS9lYjSQ="; }; x86_64-darwin = fetchurl { - url = "https://web.archive.org/web/20210310071550/https://desktop.userapi.com/mac/master/vk.dmg"; - sha256 = "0j5qsr0fyl55d0x46xm4h2ykwr4y9z1dsllhqx5lnc15nc051s9b"; + url = "https://web.archive.org/web/20220302083827/https://desktop.userapi.com/mac/master/vk.dmg"; + sha256 = "hxK8I9sF6njfCxSs1KBCHfnG81JGKUgHKAeFLtuCNe0="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 371ac91120b5..26a6b43d4489 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -16,7 +16,7 @@ let icon = "wavebox"; desktopName = name; genericName = name; - categories = "Network;"; + categories = [ "Network" ]; }; tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index fc8fbdcede3d..974d9a6a05df 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -68,16 +68,14 @@ let }; desktopItem = makeDesktopItem { - categories = "Network;InstantMessaging;Chat;VideoConference"; + categories = [ "Network" "InstantMessaging" "Chat" "VideoConference" ]; comment = "Secure messenger for everyone"; desktopName = "Wire"; exec = "wire-desktop %U"; genericName = "Secure messenger"; icon = "wire-desktop"; name = "wire-desktop"; - extraEntries = '' - StartupWMClass=Wire - ''; + startupWMClass = "Wire"; }; dontBuild = true; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 752fa7ba191f..4aa9dbc9b10c 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -28,11 +28,11 @@ }: let - version = "5.9.1.1380"; + version = "5.9.6.2225"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "0r1w13y3ks377hdyil9s68vn09vh22zl6ni4693fm7cf6q49ayyw"; + sha256 = "0rynpw2fjn9j75f34rk0rgqn9wzyzgzmwh1a3xcx7hqingv45k53"; }; }; diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index d66efa86a7f9..de4bb988d768 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,18 +1,27 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "ipfs-cluster"; - version = "0.14.4"; + version = "0.14.5"; - vendorSha256 = "sha256-4j6aPs17YNXyPIRr5NshAPYIfNM08GlYV13jnGtJzQc="; + vendorSha256 = "sha256-ykUjq7Svp3+kUNnFkwsBlC+C4nws6Yvu3bk2Wb4c8vY="; src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "sha256-82t3sHMKZiV6sYnW72N94qfRZ/aMkavj+hiAyg5viHQ="; + sha256 = "sha256-Xb7QbBmCJKgokxvdbtWxtnNIS/iUsYFLlRzgfoABAq8="; }; + # Remove patch when updating to >0.14.5 + patches = [ + (fetchpatch { + name = "remove-distribution-test.patch"; + url = "https://github.com/ipfs/ipfs-cluster/pull/1589/commits/49825d1df76f848806f1d76abce5e279221cc8c5.patch"; + sha256 = "sha256-mM2rc4ai/qhbvxnoRw5jO7BTRlD2/Tp037EuqqS49DE="; + }) + ]; + meta = with lib; { description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons"; homepage = "https://cluster.ipfs.io/"; diff --git a/pkgs/applications/networking/ipfs-migrator/all-migrations.nix b/pkgs/applications/networking/ipfs-migrator/all-migrations.nix new file mode 100644 index 000000000000..a376e9f895b1 --- /dev/null +++ b/pkgs/applications/networking/ipfs-migrator/all-migrations.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, symlinkJoin +, buildGoModule +, ipfs-migrator-unwrapped +}: + +# This package contains all the individual migrations in the bin directory. +# This is used by fs-repo-migrations and could also be used by IPFS itself +# when starting it like this: ipfs daemon --migrate + +let + fs-repo-common = pname: version: buildGoModule { + inherit pname version; + inherit (ipfs-migrator-unwrapped) src; + sourceRoot = "source/${pname}"; + vendorSha256 = null; + doCheck = false; + meta = ipfs-migrator-unwrapped.meta // { + mainProgram = pname; + description = "Individual migration for the filesystem repository of ipfs clients"; + }; + }; + + # Concatenation of the latest repo version and the version of that migration + version = "12.1.0.2"; + + fs-repo-11-to-12 = fs-repo-common "fs-repo-11-to-12" "1.0.2"; + fs-repo-10-to-11 = fs-repo-common "fs-repo-10-to-11" "1.0.1"; + fs-repo-9-to-10 = fs-repo-common "fs-repo-9-to-10" "1.0.1"; + fs-repo-8-to-9 = fs-repo-common "fs-repo-8-to-9" "1.0.1"; + fs-repo-7-to-8 = fs-repo-common "fs-repo-7-to-8" "1.0.1"; + fs-repo-6-to-7 = fs-repo-common "fs-repo-6-to-7" "1.0.1"; + fs-repo-5-to-6 = fs-repo-common "fs-repo-5-to-6" "1.0.1"; + fs-repo-4-to-5 = fs-repo-common "fs-repo-4-to-5" "1.0.1"; + fs-repo-3-to-4 = fs-repo-common "fs-repo-3-to-4" "1.0.1"; + fs-repo-2-to-3 = fs-repo-common "fs-repo-2-to-3" "1.0.1"; + fs-repo-1-to-2 = fs-repo-common "fs-repo-1-to-2" "1.0.1"; + fs-repo-0-to-1 = fs-repo-common "fs-repo-0-to-1" "1.0.1"; + + all-migrations = [ + fs-repo-11-to-12 + fs-repo-10-to-11 + fs-repo-9-to-10 + fs-repo-8-to-9 + fs-repo-7-to-8 + ] ++ lib.optional (!stdenv.isDarwin) # I didn't manage to fix this on macOS: + fs-repo-6-to-7 # gx/ipfs/QmSGRM5Udmy1jsFBr1Cawez7Lt7LZ3ZKA23GGVEsiEW6F3/eventfd/eventfd.go:27:32: undefined: syscall.SYS_EVENTFD2 + ++ [ + fs-repo-5-to-6 + fs-repo-4-to-5 + fs-repo-3-to-4 + fs-repo-2-to-3 + fs-repo-1-to-2 + fs-repo-0-to-1 + ]; + +in + +symlinkJoin { + name = "ipfs-migrator-all-fs-repo-migrations-${version}"; + paths = all-migrations; +} diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix index abc81e213d7d..d8c5de150bb3 100644 --- a/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/pkgs/applications/networking/ipfs-migrator/default.nix @@ -1,27 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildEnv +, makeWrapper +, ipfs-migrator-unwrapped +, ipfs-migrator-all-fs-repo-migrations +}: -buildGoModule rec { - pname = "ipfs-migrator"; - version = "1.7.1"; +buildEnv { + name = "ipfs-migrator-${ipfs-migrator-unwrapped.version}"; - src = fetchFromGitHub { - owner = "ipfs"; - repo = "fs-repo-migrations"; - rev = "v${version}"; - sha256 = "sha256-MxEKmoveIpuxBkGGGJHp9T11i3Py8a1fLpF0fWk0ftg="; - }; + nativeBuildInputs = [ makeWrapper ]; - vendorSha256 = null; + paths = [ ipfs-migrator-unwrapped ]; - doCheck = false; + pathsToLink = [ "/bin" ]; - subPackages = [ "." ]; + postBuild = '' + wrapProgram "$out/bin/fs-repo-migrations" \ + --prefix PATH ':' '${lib.makeBinPath [ ipfs-migrator-all-fs-repo-migrations ]}' + ''; - meta = with lib; { - description = "Migrations for the filesystem repository of ipfs clients"; - homepage = "https://ipfs.io/"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ elitak ]; - }; + inherit (ipfs-migrator-unwrapped) meta; } diff --git a/pkgs/applications/networking/ipfs-migrator/unwrapped.nix b/pkgs/applications/networking/ipfs-migrator/unwrapped.nix new file mode 100644 index 000000000000..c8ade793218f --- /dev/null +++ b/pkgs/applications/networking/ipfs-migrator/unwrapped.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ipfs-migrator"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "ipfs"; + repo = "fs-repo-migrations"; + # Use the latest git tag here, since v2.0.2 does not + # contain the latest migration fs-repo-11-to-12/v1.0.2 + # The fs-repo-migrations code itself is the same between + # the two versions but the migration code, which is built + # into separate binaries, is not. + rev = "fs-repo-11-to-12/v1.0.2"; + sha256 = "sha256-CG4utwH+/+Igw+SP3imhl39wijlB53UGtkJG5Mwh+Ik="; + }; + + sourceRoot = "source/fs-repo-migrations"; + + vendorSha256 = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk="; + + doCheck = false; + + meta = with lib; { + description = "Migrations for the filesystem repository of ipfs clients"; + homepage = "https://github.com/ipfs/fs-repo-migrations"; + license = licenses.mit; + maintainers = with maintainers; [ Luflosi elitak ]; + mainProgram = "fs-repo-migrations"; + }; +} diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index c0526fc0d97c..f6285ae59beb 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,13 +2,15 @@ buildGoModule rec { pname = "ipfs"; - version = "0.11.0"; + version = "0.12.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; + repoVersion = "12"; # Also update ipfs-migrator when changing the repo version + # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "lTPGnFqDgyMWmSCPmLHguGNnJQMWi9LPrOZfDgeS9Y4="; + sha256 = "jWoMm/xIp3Zn/FiHWQ5/q39i6Lh4Fdoi9OdnRVc51Xk="; }; # tarball contains multiple files/directories @@ -27,15 +29,23 @@ buildGoModule rec { vendorSha256 = null; + outputs = [ "out" "systemd_unit" "systemd_unit_hardened" ]; + + postPatch = '' + substituteInPlace 'misc/systemd/ipfs.service' \ + --replace '/usr/bin/ipfs' "$out/bin/ipfs" + substituteInPlace 'misc/systemd/ipfs-hardened.service' \ + --replace '/usr/bin/ipfs' "$out/bin/ipfs" + ''; + postInstall = '' - install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service - install --mode=444 -D misc/systemd/ipfs-hardened.service $out/etc/systemd/system/ipfs-hardened.service - install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket - install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket - substituteInPlace $out/etc/systemd/system/ipfs.service \ - --replace /usr/bin/ipfs $out/bin/ipfs - substituteInPlace $out/etc/systemd/system/ipfs-hardened.service \ - --replace /usr/bin/ipfs $out/bin/ipfs + install --mode=444 -D 'misc/systemd/ipfs-api.socket' "$systemd_unit/etc/systemd/system/ipfs-api.socket" + install --mode=444 -D 'misc/systemd/ipfs-gateway.socket' "$systemd_unit/etc/systemd/system/ipfs-gateway.socket" + install --mode=444 -D 'misc/systemd/ipfs.service' "$systemd_unit/etc/systemd/system/ipfs.service" + + install --mode=444 -D 'misc/systemd/ipfs-api.socket' "$systemd_unit_hardened/etc/systemd/system/ipfs-api.socket" + install --mode=444 -D 'misc/systemd/ipfs-gateway.socket' "$systemd_unit_hardened/etc/systemd/system/ipfs-gateway.socket" + install --mode=444 -D 'misc/systemd/ipfs-hardened.service' "$systemd_unit_hardened/etc/systemd/system/ipfs.service" ''; meta = with lib; { diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/applications/networking/irc/catgirl/default.nix index 9f979781857d..d032238ca5b7 100644 --- a/pkgs/applications/networking/irc/catgirl/default.nix +++ b/pkgs/applications/networking/irc/catgirl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "catgirl"; - version = "2.0a"; + version = "2.1"; src = fetchurl { url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-AbzzTqaulPDplntwRYw4fVxZXUIJ2L0MKZvyWq4lvro="; + sha256 = "sha256-pov7gvYlvN97xbem4VKP41Wbze1B8NPJcvi36Ri87o4="; }; # catgirl's configure script uses pkg-config --variable exec_prefix openssl diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index df7168ac308e..c8c36049a2a4 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -1,13 +1,14 @@ -{ fetchgit, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }: +{ fetchFromGitHub, libcommuni, qtbase, qmake, lib, stdenv, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "communi"; version = "3.5.0"; - src = fetchgit { - url = "https://github.com/communi/communi-desktop.git"; + src = fetchFromGitHub { + owner = "communi"; + repo = "communi-desktop"; rev = "v${version}"; - sha256 = "10grskhczh8601s90ikdsbjabgr9ypcp2j7vivjkl456rmg6xbji"; + sha256 = "sha256-Ua5uXs2mEDrljvtIcdn1Kb+l5NJtRpB0AAbBz+DU+YE="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index fbe9971f1d7d..0bc25c0f8592 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "hexchat"; - version = "2.16.0"; + version = "2.16.1"; src = fetchFromGitHub { owner = "hexchat"; repo = "hexchat"; rev = "v${version}"; - sha256 = "08zhlf9d3xdis62byxzgizhfg8kbppxl7cgxkzhwdc1srpj7vpx6"; + sha256 = "sha256-2IUlNUTL3TOJnDNMds2EWwkfn5NUOQ1ids96Ddo196E="; }; nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/applications/networking/irc/ircdog/default.nix index 5badc69a3a27..87d4b8777c3f 100644 --- a/pkgs/applications/networking/irc/ircdog/default.nix +++ b/pkgs/applications/networking/irc/ircdog/default.nix @@ -5,21 +5,22 @@ buildGoPackage rec { pname = "ircdog"; - version = "0.2.1"; + version = "0.3.0"; - goPackagePath = "github.com/goshuirc/ircdog"; + goPackagePath = "github.com/ergochat/ircdog"; src = fetchFromGitHub { owner = "goshuirc"; repo = pname; rev = "v${version}"; - sha256 = "1ppbznlkv7vajfbimxbyiq5y6pkfhm6ylhl408rwq1bawl28hpkl"; + sha256 = "sha256-x3ihWLgVYu17vG1xQTgIr4TSkeZ467TZBV1fPTPnZgw="; fetchSubmodules = true; }; meta = with lib; { description = "ircdog is a simple wrapper over the raw IRC protocol that can respond to pings, and interprets formatting codes"; - homepage = "https://github.com/goshuirc/ircdog"; + homepage = "https://github.com/ergochat/ircdog"; + changelog = "https://github.com/ergochat/ircdog/releases/tag/v${version}"; license = licenses.isc; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 7a4fc703dd77..8dbd2cd73ee4 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr, git }: stdenv.mkDerivation rec { pname = "irssi"; version = "1.2.3"; - src = fetchurl { - url = "https://github.com/irssi/irssi/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "09cwz5ff1i5lp35qhhmw6kbw5dwcn9pl16gpzkc92xg5sx3bgjr9"; + + src = fetchFromGitHub { + "owner" = "irssi"; + "repo" = "irssi"; + "rev" = "91dc3e4dfa1a9558c5a7fe0ea982cb9df0e2de65"; + "sha256" = "efnE4vuDd7TnOBxMPduiV0/nez1jVhTjbJ0vzN4ZMcg="; + "leaveDotGit" = true; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoconf automake libtool git ]; buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ]; + enableParallelBuilding = true; + + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + configureFlags = [ "--with-proxy" "--with-bot" diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index df59ddec6a90..a3ee4e4ab9c7 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - tar xf ${irssi.src} + cp -a "${irssi.src}" "./${irssi.name}" configureFlags="$configureFlags --with-irssi-source=`pwd`/${irssi.name}" ./regen.sh diff --git a/pkgs/applications/networking/irc/kirc/default.nix b/pkgs/applications/networking/irc/kirc/default.nix index 08823cab5735..71bd96d3b70e 100644 --- a/pkgs/applications/networking/irc/kirc/default.nix +++ b/pkgs/applications/networking/irc/kirc/default.nix @@ -5,18 +5,18 @@ stdenv.mkDerivation rec { pname = "kirc"; - version = "0.2.9"; + version = "0.3.1"; src = fetchFromGitHub { owner = "mcpcpc"; repo = pname; rev = version; - hash = "sha256-KRCVjz59SHjk86VgfGxYKk/Ti3o77dV7fdRu9mB3FSo="; + hash = "sha256-bLBrkbW/Iv1v9z5NOiMAA/dH5/9FlqusRV5rSqjdlPw="; }; dontConfigure = true; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { homepage = "http://kirc.io/"; diff --git a/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch b/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch deleted file mode 100644 index 6c40dc8dd895..000000000000 --- a/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ac9387271b2420a71f7d172f44354fc35adac504 Mon Sep 17 00:00:00 2001 -From: Manuel Nickschas -Date: Tue, 7 Jan 2020 18:34:54 +0100 -Subject: [PATCH] common: Disable enum type stream operators for Qt >= 5.14 - -Starting from version 5.14, Qt provides stream operators for enum -types, which collide with the ones we ship in types.h. Disable -Quassel's stream operators when compiling against Qt 5.14 or later. - -(cherry-picked from 579e559a6322209df7cd51c34801fecff5fe734b) ---- - src/common/types.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/common/types.h b/src/common/types.h -index 467d9fb2..c4b9f364 100644 ---- a/src/common/types.h -+++ b/src/common/types.h -@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress) - typedef QList MsgIdList; - typedef QList BufferIdList; - -+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - /** - * Catch-all stream serialization operator for enum types. - * -@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) { - value = static_cast(v); - return in; - } -+#endif - - // Exceptions - --- -2.26.2 - diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 44e7fb853601..4bc930b12d0a 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -5,7 +5,7 @@ , static ? false # link statically , lib, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf -, mkDerivation, qtbase, qtscript +, mkDerivation, qtbase, boost, zlib, qtscript , phonon, libdbusmenu, qca-qt5 , withKDE ? true # enable KDE integration @@ -33,27 +33,21 @@ let in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { pname = "quassel${tag}"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "quassel"; repo = "quassel"; rev = version; - sha256 = "0z8p7iv90yrrjbh31cyxhpr6hsynfmi23rlayn7p2f6ki5az7yc3"; + sha256 = "sha256-eulhNcyCmy9ryietOhT2yVJeJH+MMZRbTUo2XuTy9qU="; }; - patches = [ - # fixes build with Qt 5.14 - # source: https://github.com/quassel/quassel/pull/518/commits/8a46d983fc99204711cdff1e4c542e272fef45b9 - ./0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch - ]; - # Prevent ``undefined reference to `qt_version_tag''' in SSL check NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ qtbase ] - ++ lib.optionals buildCore [qtscript qca-qt5] + buildInputs = [ qtbase boost zlib ] + ++ lib.optionals buildCore [qtscript qca-qt5 ] ++ lib.optionals buildClient [libdbusmenu phonon] ++ lib.optionals (buildClient && withKDE) [ extra-cmake-modules kconfigwidgets kcoreaddons @@ -94,7 +88,6 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { ''; license = licenses.gpl3; maintainers = with maintainers; [ ttuegel ]; - repositories.git = "https://github.com/quassel/quassel.git"; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix index 8cac8e144b85..2fb6fed15ca8 100644 --- a/pkgs/applications/networking/irc/srain/default.nix +++ b/pkgs/applications/networking/irc/srain/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "srain"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "SrainApp"; repo = "srain"; rev = version; - sha256 = "sha256-jGt0DlxlR2J9bE5S9pqT45OZTqzsr+DiZ7pON5QbU/Y="; + sha256 = "sha256-JsXReGmdBtzMXhrT1cFlkBbw8j/SxzgXSeHcHlns2po="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index e102b1077a38..4d7f5b0ca36c 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -3,9 +3,11 @@ , rustPlatform , fetchFromGitHub , pkg-config -, dbus -, openssl , Foundation +, dbusSupport ? stdenv.isLinux, dbus +# rustls will be used for TLS if useOpenSSL=false +, useOpenSSL ? stdenv.isLinux, openssl +, notificationSupport ? stdenv.isLinux }: rustPlatform.buildRustPackage rec { @@ -22,9 +24,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1"; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; - buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ] ++ lib.optional stdenv.isDarwin Foundation; + buildInputs = lib.optionals dbusSupport [ dbus ] + ++ lib.optionals useOpenSSL [ openssl ] + ++ lib.optional stdenv.isDarwin Foundation; - buildFeatures = lib.optional stdenv.isLinux "desktop-notifications"; + buildFeatures = lib.optional notificationSupport "desktop-notifications"; meta = with lib; { description = "A console IRC client"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 80f15eeff3c5..541ad8c68f21 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -28,21 +28,21 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.3"; + version = "3.4.1"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "sha256-GnSi7uMxiyWSQau75q07NlX1ikaBeWOdrzOf9f0jnBM="; + sha256 = "sha256-TJ4JI97WiobkBxgnkUGh/XQAIlDV+PDgIxCzTqefiMw="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; cmakeFlags = with lib; [ "-DENABLE_MAN=ON" - "-DENABLE_DOC=ON" + "-DENABLE_DOC=OFF" # TODO: Documentation fails to build, was deactivated to push through security update "-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360 "-DENABLE_PHP=OFF" ] diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index 1adb61b89347..b22cea57987c 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.11"; + version = "2.9.27"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-KcvlnEfDzwhFzwaWLYuRGa8nh6MkjqZ+u+qJSJZl13U="; + sha256 = "sha256-4G+veQkPY6n/uRMsBWQgig/6IDc0Y2nXDpMUyC1ShF4="; }; - vendorSha256 = "sha256-0KGeMJDv1BdqM1/uMk+mKpK+Nejz9PiCAfRy96pu3OQ="; + vendorSha256 = "sha256-Ieaf+Qp/7/6nv2ftHY3pbtOg+t7dYAuMv4BvhRaAZ9E="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix index 420b9b28ccfc..a9bf177128d5 100644 --- a/pkgs/applications/networking/lieer/default.nix +++ b/pkgs/applications/networking/lieer/default.nix @@ -33,7 +33,6 @@ python3Packages.buildPythonApplication rec { GMail account. ''; homepage = "https://lieer.gaute.vetsj.com/"; - repositories.git = "https://github.com/gauteh/lieer.git"; license = licenses.gpl3Plus; maintainers = with maintainers; [ flokli kaiha ]; }; diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index 090f53cffb62..72128a5ef95c 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt, wrapQtAppsHook }: +{ lib, stdenv, fetchurl, qtbase, qtsvg, qmake, pkg-config, boost, wirelesstools, iw, qwt6_1, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "linssid"; @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; - buildInputs = [ qtbase qtsvg boost qwt ]; + buildInputs = [ qtbase qtsvg boost qwt6_1 ]; patches = [ ./0001-unbundled-qwt.patch ]; postPatch = '' - sed -e "s|/usr/include/qt5.*$|& ${qwt}/include|" -i linssid-app/linssid-app.pro + sed -e "s|/usr/include/qt5.*$|& ${qwt6_1}/include|" -i linssid-app/linssid-app.pro sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \ -e "s|/usr|$out|g" \ diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 78876090e9ff..2f0f3bd74ff1 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -6,16 +6,18 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.5.2"; + version = "1.5.3"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "sha256-/wleUwTPkm5l8GgtBM2J0jsdc1A54WRYJPmHqSsdz4c="; + sha256 = "sha256-zaG9Zwz9S/SVb7xDa7eXkjLNt1BhA1cQ3I18rVt+8uQ="; }; + format = "pyproject"; + propagatedBuildInputs = with python3.pkgs; [ click markdown2 diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 244e48939339..172cea3d061d 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = "sha256-3BbKf2xSzXznCB5UU/cThVg329GSeJG9KwjaS+tN3Rs="; + vendorSha256 = "sha256-hpGd78PWk3tIwB+TPmPy0gKkU8+t5NTm9RzPuLae+Fk="; doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index 3d09711fb3cc..cb49829dce07 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -9,13 +9,7 @@ , withManpage ? false }: -with python3.pkgs; -let - notmuch2 = callPackage ./notmuch.nix { - inherit notmuch; - }; -in -buildPythonApplication rec { +with python3.pkgs; buildPythonApplication rec { pname = "alot"; version = "0.10"; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 246d666df308..db7771bc3c9f 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.42.3"; + version = "3.44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "qgi2ycWlzY4PaiEMHu0Rd3bN2aqFcLtxkII1MzZXls4="; + sha256 = "q4Cg6eLOdn+56EruBl0Ote9QLNebLiykUeyoQpIpeoA="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Evolution connector for Microsoft Exchange Server protocols"; homepage = "https://gitlab.gnome.org/GNOME/evolution-ews"; - license = "LGPL-2.1-only OR LGPL-3.0-only"; # https://gitlab.gnome.org/GNOME/evolution-ews/issues/111 + license = licenses.lgpl21Plus; # https://gitlab.gnome.org/GNOME/evolution-ews/issues/111 maintainers = [ maintainers.dasj19 ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index c76393d69f51..2fae122fc1b6 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , cmake , ninja , intltool @@ -25,6 +26,7 @@ , gcr , sqlite , gnome +, gnome-desktop , librsvg , gdk-pixbuf , libsecret @@ -32,6 +34,8 @@ , nspr , icu , libcanberra-gtk3 +, geocode-glib +, cmark , bogofilter , gst_all_1 , procps @@ -42,11 +46,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.42.3"; + version = "3.44.0"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RGKeagIojsEApm/VlBOgaLa5zWJL7TJVqimhZuom0LY="; + sha256 = "3yHT31Ik36hC6ikO/82QKv1LFBhgik37aQejt9TZlPk="; }; nativeBuildInputs = [ @@ -68,7 +72,7 @@ stdenv.mkDerivation rec { gdk-pixbuf glib glib-networking - gnome.gnome-desktop + gnome-desktop gsettings-desktop-schemas gst_all_1.gst-plugins-base gst_all_1.gstreamer @@ -77,6 +81,8 @@ stdenv.mkDerivation rec { highlight icu libcanberra-gtk3 + geocode-glib + cmark libgdata libgweather libical @@ -106,6 +112,7 @@ stdenv.mkDerivation rec { "-DWITH_SA_LEARN=${spamassassin}/bin/sa-learn" "-DWITH_BOGOFILTER=${bogofilter}/bin/bogofilter" "-DWITH_OPENLDAP=${openldap}" + "-DWITH_GWEATHER4=ON" ]; requiredSystemFeatures = [ diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index b2ec2a743f3d..c039febb6d7c 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1"; }; - vendorSha256 = "0sblgjmn3i3k31jfq5zy3bx7bv5z2cg6rjzr7aj87c57yhzzcmk7"; + vendorSha256 = "129hvr8qh5mxj6mzg7793p5jsi4jmsm96f63j7r8wn544yq8sqci"; doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index 33c1cc63a7f9..91161e5ab14a 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.5.1"; + version = "0.5.10"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BmV4kekl0QDbX/ueSrWM5jRvqr6WQeZIs7hiXhiHBSI="; + sha256 = "sha256-CXchZbXX7NH2ZXeAoPph3qxxdcAdDVZLBmOMwxFu+Yo="; }; - cargoSha256 = "sha256-lu5xVuAw9yTeQr3gpiW5g5bdm7Alf0YXmlbSkPaXhk0="; + cargoSha256 = "sha256-sSQX7DHDgh1eO1Dwn1f0m51Bl2ZG1daRtrnYvsvPOkg="; nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; @@ -34,6 +34,10 @@ rustPlatform.buildRustPackage rec { openssl ]; + # flag added because without end-to-end testing is ran which requires + # additional tooling and servers to test + cargoTestFlags = [ "--lib" ]; + postInstall = lib.optionalString enableCompletions '' # Install shell function installShellCompletion --cmd himalaya \ @@ -43,10 +47,10 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "CLI email client written in Rust"; + description = "Command-line interface for email management"; homepage = "https://github.com/soywod/himalaya"; changelog = "https://github.com/soywod/himalaya/blob/v${version}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ yanganto ]; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ toastal yanganto ]; }; } diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 98298d854d5f..9904e2db362d 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.1.5"; + version = "2.2.2"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1q1bq5qfv67s6ynbqga19ifaprgavhdbgg154kb9ffingvj0k8wj"; + sha256 = "1k0ghbpc4gn3sydbw10xv9djin9grk1pkxdwynrw0iknyc68gphh"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 2a95453f7ae3..e89216802e50 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -2,42 +2,40 @@ , pkg-config, gnupg , xapian, gmime, talloc, zlib , doxygen, perl, texinfo +, notmuch , pythonPackages , emacs , ruby +, testVersion , which, dtach, openssl, bash, gdb, man , withEmacs ? true +, withRuby ? true }: stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.34.3"; + version = "0.35"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - sha256 = "sha256-P+kQSDv9gVpcO5UOImp7yoFWBT/TLXrR6xoKijrK6Ig="; + sha256 = "0fdc81m24xrbhfrhw00g12ak4b8hap4961sq7ap6q2pjqhac8cd8"; }; - patches = [ - # https://nmbug.notmuchmail.org/nmweb/show/87o84iza9r.fsf%40starbuck.i-did-not-set--mail-host-address--so-tickle-me - ./test-fix-support-for-gpgsm-in-gnupg-2.3.patch - ]; - nativeBuildInputs = [ pkg-config doxygen # (optional) api docs pythonPackages.sphinx # (optional) documentation -> doc/INSTALL texinfo # (optional) documentation -> doc/INSTALL pythonPackages.cffi - ] ++ lib.optional withEmacs emacs; + ] ++ lib.optional withEmacs emacs + ++ lib.optional withRuby ruby; buildInputs = [ gnupg # undefined dependencies xapian gmime talloc zlib # dependencies described in INSTALL perl pythonPackages.python - ruby - ]; + ] ++ lib.optional withRuby ruby; postPatch = '' patchShebangs configure test/ @@ -56,7 +54,7 @@ stdenv.mkDerivation rec { "--infodir=${placeholder "info"}/share/info" ] ++ lib.optional (!withEmacs) "--without-emacs" ++ lib.optional withEmacs "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp" - ++ lib.optional (isNull ruby) "--without-ruby"; + ++ lib.optional (!withRuby) "--without-ruby"; # Notmuch doesn't use autoconf and consequently doesn't tag --bindir and # friends @@ -64,7 +62,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; makeFlags = [ "V=1" ]; - outputs = [ "out" "man" "info" ] ++ lib.optional withEmacs "emacs"; + postConfigure = '' + mkdir ${placeholder "bindingconfig"} + cp bindings/python-cffi/_notmuch_config.py ${placeholder "bindingconfig"}/ + ''; + + outputs = [ "out" "man" "info" "bindingconfig" ] + ++ lib.optional withEmacs "emacs" + ++ lib.optional withRuby "ruby"; preCheck = let test-database = fetchurl { @@ -87,10 +92,17 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString withEmacs '' moveToOutput bin/notmuch-emacs-mua $emacs + '' + lib.optionalString withRuby '' + make -C bindings/ruby install \ + vendordir=$ruby/lib/ruby \ + SHELL=$SHELL \ + $makeFlags "''${makeFlagsArray[@]}" \ + $installFlags "''${installFlagsArray[@]}" ''; passthru = { pythonSourceRoot = "notmuch-${version}/bindings/python"; + tests.version = testVersion { package = notmuch; }; inherit version; }; diff --git a/pkgs/applications/networking/mailreaders/notmuch/test-fix-support-for-gpgsm-in-gnupg-2.3.patch b/pkgs/applications/networking/mailreaders/notmuch/test-fix-support-for-gpgsm-in-gnupg-2.3.patch deleted file mode 100644 index 91c77df70109..000000000000 --- a/pkgs/applications/networking/mailreaders/notmuch/test-fix-support-for-gpgsm-in-gnupg-2.3.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a642ad542e3d3f34e949c5c66923ca8a6e6cbbd8 Mon Sep 17 00:00:00 2001 -From: Stig Palmquist -Date: Tue, 11 Jan 2022 13:23:13 +0100 -Subject: [PATCH] test: fix support for gpgsm in gnupg 2.3 - -gpgsm --list-keys output changed the label for fingerprints from -"fingerprint: " to "sha[12] fpr: " breaking tests with gnupg 2.3. this -adds support for both. ---- - test/test-lib.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/test-lib.sh b/test/test-lib.sh -index 6bc0b723..3de608f9 100644 ---- a/test/test-lib.sh -+++ b/test/test-lib.sh -@@ -145,7 +145,7 @@ add_gpgsm_home () { - mkdir -p -m 0700 "$GNUPGHOME" - gpgsm --batch --no-tty --no-common-certs-import --pinentry-mode=loopback --passphrase-fd 3 \ - --disable-dirmngr --import >"$GNUPGHOME"/import.log 2>&1 3<<<'' <$NOTMUCH_SRCDIR/test/smime/0xE0972A47.p12 -- fpr=$(gpgsm --batch --list-key test_suite@notmuchmail.org | sed -n 's/.*fingerprint: //p') -+ fpr=$(gpgsm --batch --list-key test_suite@notmuchmail.org | sed -n 's/.*\(fingerprint\|sha1 fpr\): //p') - echo "$fpr S relax" >> "$GNUPGHOME/trustlist.txt" - gpgsm --quiet --batch --no-tty --no-common-certs-import --disable-dirmngr --import < $NOTMUCH_SRCDIR/test/smime/ca.crt - echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$GNUPGHOME/trustlist.txt" --- -2.34.1 - diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 893473ff15fb..492abf1f37c4 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.5.0"; + version = "91.7.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/af/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/af/thunderbird-91.7.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "20272a9fbf08651ca804f324aca1c0c7b6b04351b0a773790510a69d56ef19fb"; + sha256 = "bcc9a123b3de4d442836820d3eff52a37ff513b063850493e58c2132ad0ec029"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ar/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ar/thunderbird-91.7.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "208937e2b22db6a159b2c744d9ad6d9e96fddf21f753673d9006b2576e5ddd24"; + sha256 = "4800a0be829e654d6917271b4944a5be3a8688e75eed58a4a5bae3643d2bce4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ast/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ast/thunderbird-91.7.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a8b078c5699d174db89c4adbcce45c4add38d88561d1154dcaff56be4731b29d"; + sha256 = "779bf2732f89a82f36449d75d14ec4f8cbceb79c7f2d590f0407f4261fd9a5f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/be/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/be/thunderbird-91.7.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "91be973a0658dc7a284cde429b537bc70db88143abe42fd6ce6c4a0a450353ca"; + sha256 = "e1f033cf11d1d18828771ca81e90e6851a1b96971f0d3d81665ca6aebb6c737c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/bg/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/bg/thunderbird-91.7.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "bdb25d9c1e3ed725d667b9b613a425a3f1c18bd6ff78417a32f04fc6257c7b66"; + sha256 = "293917397d1d52415bab86a1d27e9442b5bafb989e65cb3cbee0ba601970bc2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/br/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/br/thunderbird-91.7.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "b8cf6f6f490a3f7a06a036bf84d71cdcdfb21e4e253190d2c8c648df8f7af931"; + sha256 = "317883e2764505713e4507fffeaf1528f685fc774b99dc5b802164cdd1473292"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ca/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ca/thunderbird-91.7.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5a55055b5eb29e209e02b2980895719883bfc9929910d0f336e431ebea870856"; + sha256 = "cdfcbddc1697b46a85b67382d7b4a9d64d1ffc31d5faeb8e0edd21f4868a6008"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/cak/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cak/thunderbird-91.7.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "fe192c81dd6f04d37c4f603c3e0367d462c5dc6effe7c8a07a030d5584118c58"; + sha256 = "8c1d1dff29b7631d5aad6384d02269b5c058bd1c37d85de0c92fd74e2a08e37c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/cs/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cs/thunderbird-91.7.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "bce9c7bd093631e2f0096ac3c8c2cdb19d9567d5233d912169c238e33372da1e"; + sha256 = "3d1818c6d067552a7f7c62fc9dfae7370c309c9604f20ba1f1f4723020f04c7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/cy/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/cy/thunderbird-91.7.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4128f704289b9267316eb373a3142305096897b37a2daa79a84f4448aea54b14"; + sha256 = "d339d87800e4060120468314544b34b4dfc355a5369363d6df826a6f10682afc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/da/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/da/thunderbird-91.7.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "39e5239860b450079cc10179e215bef63d77957c47bc3690c16c086a30e01317"; + sha256 = "e00bb159fa9d113272866986eb8f9c3e6c3f29748cc7240cc736c00ed3eb1927"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/de/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/de/thunderbird-91.7.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "0bc2cabac439734fdddfcfc1426696559ac1ee3e9a7bad1182329d83fb47d8cb"; + sha256 = "af8365195927f75f6aac52fd91904193172f5e3b7bc09a7e52a94840ede1a6aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/dsb/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/dsb/thunderbird-91.7.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2c4d8fc6ae4c9a2adabe0a1593d7289596b97dd7b9e39b44da926f925f754ef2"; + sha256 = "96bdb60659052126bca84a64a1f2fdd26654875d74feacd4b9d50cf66b90c3d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/el/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/el/thunderbird-91.7.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "07e10b923d0829e6cddc35bd56fe51afd07b35664b4feb725dfedbd51e99029a"; + sha256 = "af0101f1d999947cb02b3cf7c92eadab0f360b64f64788a3ea2ecbb6e8628c9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/en-CA/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-CA/thunderbird-91.7.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7f583ea36dc9d8a1a2136343773a8e7434d466f31ddf50f5f7da7675a08dbd03"; + sha256 = "3537bfe2ffe474e587df4549a243ace7fb02236e8a424fac9c9e23ea74978969"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/en-GB/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-GB/thunderbird-91.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "46bd4e13d215bd9be875ebe3f999da3927a480401aa4a2e51f0388d3cf28a3a0"; + sha256 = "ff0daecd9a50d9bb060750d822bd0da409ac838f9280faf71ed6f146f1bd928d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/en-US/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/en-US/thunderbird-91.7.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f6d62b3161d1b7cf665fdb965526632fc4eefcaf1727ece7986e956c7575cf0d"; + sha256 = "f4da2a0627b042e61b8f25eb57396ab71d862c728abd9cc82e9eb102b27d26f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/es-AR/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/es-AR/thunderbird-91.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "4f190b4d64db8fe9accafe1941e3f949ba21488b4411a506f6f61d437f17d61e"; + sha256 = "a052ed75f7b3aaa2fea27b7eaa658a0d75e03c5d8e51214e9207e79c8c656489"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/es-ES/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/es-ES/thunderbird-91.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "61065d0c72451cebbf5d83c92e460e240e7f477322531a3f4d082b3c0e6c213e"; + sha256 = "312b2eb38ec895a77a10cbd41cf861f03520d9ce7ff6cc0b2fd9e282c1a85743"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/et/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/et/thunderbird-91.7.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "cba4afe259ccd7c6619f4ee0adf167659eb4f80e9355b25138d9f370ecbcf932"; + sha256 = "257137eab9877c8c6663cfa9200707f5ff5ff30076c72952f43db9eeb3fc334b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/eu/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/eu/thunderbird-91.7.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "4e8569190b2702ad6e10156b434100cdf879dfb3a5ee798c876fc46871e1abf3"; + sha256 = "69e426d23b3d29aa625d3fcc18080befe5ea717279a4d17a798c987819ce9f0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/fi/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fi/thunderbird-91.7.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "93e3b7624d6de0b77f87bb192384437e006530abd03bdc5589dc0dc47e0af304"; + sha256 = "2acb1d75cf32c65ca281ee353a79973bda5b96cfb1b8c6d55f91f5051ad9b720"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/fr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fr/thunderbird-91.7.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "a35c370b69a977160a83ffc4d24f5a9a9f1000e1012c71fcd1e7adc6c16c68b8"; + sha256 = "979a4ab6ae26ed9fe2320bc0baf828588ee96899d9aa04781aa5e3f7e1e4e35a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/fy-NL/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/fy-NL/thunderbird-91.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c392fb2f59d13f912e757be716a4bfc464a0cb2f69f8af780bbaec8e6bbcdf0f"; + sha256 = "2cad6ddf73676bedc04d18afec2fce7f8085fe10400b514d5091113dbd1ccd39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ga-IE/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ga-IE/thunderbird-91.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "210aeb0fe2c3214f82948ef39205416e4c50750be0226fa56b2c5548ed06a182"; + sha256 = "6a8b5f6f413bf2d9122b90865131f1b2e3d1f528a2c0c54b0c3118b16948ef6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/gd/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/gd/thunderbird-91.7.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c02818558da950caa540cc73597bb2ba1cbfcf02240b085856776df5155b59eb"; + sha256 = "e739fdbcd525b1ec9a6415a1fc2b4f982895bc07e503324f8ee7cb9c44e30bf1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/gl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/gl/thunderbird-91.7.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "5704fa5d4efb470e516c23a6f15d238ebaeaa7ad1ce14f49b7a5a3bd19524f92"; + sha256 = "b8b87d0c8d200264e7aab95fc2f1a59b3ffd1b0a6143409cb947df6acce2711b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/he/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/he/thunderbird-91.7.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c366556e481757da8f48b89f1ef54492e5d5e41a45d9ec55f5e81081de4d8b58"; + sha256 = "3d8048e55eb538414b436387419d0ed2b4589a6846d55c49665af2741082bd03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hr/thunderbird-91.7.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "47a713172ea17582ec988fdef33cab24f3245274badefbefee7f665af7e9e917"; + sha256 = "e3eb72e83138d593046db8c72a09538b3b83abdef9b1534b9cf757751f172f78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hsb/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hsb/thunderbird-91.7.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "019271fd8d9343581783dcd6a59698de726fdeca39e4e71226b7361a42e7478b"; + sha256 = "e110bd72de8a035ba2de4f849b09e60d11db161b09dda2bd4ba01ee7e42c0075"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hu/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hu/thunderbird-91.7.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "bbdd56ba0a2f1079d2dfe63f2cbf56dc98f5f0675c73413880aba147d797d1c2"; + sha256 = "2fc4d4e970257aff81352132dd73fc365cc7df822b70aef9716082cb455bbc6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/hy-AM/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/hy-AM/thunderbird-91.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "8393fdba3c2d7024c1ad5d017853c1a13fec47a29e31db4ba0f38c5ee49843ec"; + sha256 = "ff5d16b7712f6975e68305f4d50e3c97846238021a4ffeb87526a5db0eb76db3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/id/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/id/thunderbird-91.7.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "51ff83923eda81e69d5c74bd49878c17eb3552072b196e2fc933b3dbf89a7513"; + sha256 = "5063b921fbe8ea8273441868f1cda6e0e32a8fe00b2b866dd4f91c9f12f15011"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/is/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/is/thunderbird-91.7.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9f6bdf8f9a97788137e698464e391f6942e3cbff5870e8b4f534597f0b582f5d"; + sha256 = "55d42de9dea45c13ad4288144b544d61b789d94d85976525b18c6dd32a75d210"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/it/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/it/thunderbird-91.7.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "33b0169fec2ba8822c086837fce0ed59d77676f6fe804948dfd0ad0c328e1cc7"; + sha256 = "7a6774106b689e6f829f8f74b03d23a85d79b9f8304d9a60d3fd172188e1bc26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ja/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ja/thunderbird-91.7.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "bf93f1e234aa13edb416912377a23ffb370de5a249cc66ec13587632493f0efc"; + sha256 = "b557c29aa992758dd4f92d3dab71cdac764b82b66359b75f2695de4fa052f918"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ka/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ka/thunderbird-91.7.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "dee6e5c984c0dafa66476bd4342385beedeb826a947991b2b4bc3a0e1d7bafd4"; + sha256 = "681430faee4d1e6512ca4a68142b6c3314f26e2944c7de04016404c60bae735e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/kab/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/kab/thunderbird-91.7.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "fcf175d175327f8a6c76d0e81062a967813f486e8005aafa7998fa682542e5db"; + sha256 = "5b45b128a48395300ed63e033ea09562b368276c7e6a9ea7801db74b8db13e97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/kk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/kk/thunderbird-91.7.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "22e2bff84795a512eaa486acb11440afa51afddd5feb6828c025bfdd796cc5e8"; + sha256 = "a44dfb8259cd9e8c694e8c842cf5b691f2bfe5d9c5176dcc65bcfa9a316e78d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ko/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ko/thunderbird-91.7.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a3c8fb1b1cfc7e68ad177fce78a8751c86cb4d95965d05abeff384c19f470bce"; + sha256 = "e04ab8d19264afe6207875ea08b878993041ca84b613c4184d608a4f8bbedcba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/lt/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/lt/thunderbird-91.7.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "5aaa95d61662a69d3d92cad9d5cbf24a348a7c6d7db1440412a324799167bd7d"; + sha256 = "4cc3797ed91e6edfe994821bca011f20a64a7d1f6bc13634c1a31c877b161b2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/lv/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/lv/thunderbird-91.7.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ec61d867216b50649e2900e8922603f38ebd4c67596b29984c60c1933f1f00a6"; + sha256 = "011867f9ee77187f02b6ce0040ab9c2d4babd6d2bbbb4c174094cc5f35eca65d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ms/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ms/thunderbird-91.7.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "27bf8b301dc1c05a22c413559f833d522fb42934c136be126de90d3519df7c1d"; + sha256 = "8f9bd1f1d5052a8259f1096b38fef693f5a74e81b8a2bb69477fc1cfa7461796"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/nb-NO/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nb-NO/thunderbird-91.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "587b27872162ac8e7580183b362192f7c2439a4a7a783aa4fc6ae81e87e7b4bd"; + sha256 = "7bc57e4bc1373b5b484eb98f9775b85bbe9c6564e246af157b51314f74a20c67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/nl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nl/thunderbird-91.7.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "be970367d664bcc2a5e6a0805d0b63fc991221c41497ccfa1a1ce5102b20450a"; + sha256 = "bff24b619fa4282cc6341828528798d0d256213b43f1bcb4b36070e370bd2ba6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/nn-NO/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/nn-NO/thunderbird-91.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "92e168f3db1bef0c2fd33dd8da8f2ba8732e63c1b36aeb0e01f3478e67dafba2"; + sha256 = "4286c9c093aacb233874bb1439e8b7880d7f3e81dc1bdeb24dd0096075d34b7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pa-IN/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pa-IN/thunderbird-91.7.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "485d231b5153fde23d9a35154c713b97dbcf96a8f1058399b09796210c831391"; + sha256 = "6ae5d50b4296201996b6ddf9ab2614534ec5fa3ed903c8e9d36c3254af820862"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pl/thunderbird-91.7.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "112240a352a3d833de9df127ab0118841b88e67c4496a17c8cc63abbd19f1166"; + sha256 = "ac2fb293885f0a37d0ec6903cb72ca0d2126e18540a8e542ebf89e15748ed9e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pt-BR/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pt-BR/thunderbird-91.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "7388f54dc99de6498af19f0a6e7b80bf2c7465c68d94c4e04ca5038a2e087960"; + sha256 = "7d31e4ea4f14cf1b3c2c2c7dc9af2d0c2e97d397a6748cb53f8fc0ded21c3d5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/pt-PT/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/pt-PT/thunderbird-91.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1ca7c9a460e8603d0daadbc07fd12fe6d0d07ef288144ba5da389fdbb5ccf4e2"; + sha256 = "7eedd322ea310df8b308a075c995cb530892be67348b66bac82096cc3d7da035"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/rm/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/rm/thunderbird-91.7.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "954516da6b44ad4dfc56f3b837e45bc0816498fe426ae3aa4d3363621cb2c289"; + sha256 = "606b4d58bc6afd7fe67be985d3eac5ad2c734c0037bd5e6380e9b0993579d762"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ro/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ro/thunderbird-91.7.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e5d83482c7381d89445d49b5c85b5645533dae173010f2ebfcf706c01337f4e2"; + sha256 = "a189258f7986e540edec1c0cb35f84f58924a079cce2da2332ad80a323c63241"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/ru/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/ru/thunderbird-91.7.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "51db5bfaca6c9404eddb71cc6559c7c83534fbe57bf27da14c35b4b268cdfc98"; + sha256 = "2677c5d98c13ad6cdf3698b644b38ea9c94e94e46eec9ef307036d5bd3d32c9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sk/thunderbird-91.7.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "5803d8547bddaffa6a9532eb6abd2f66f6936c6614a1c322a8065a01e6c831c9"; + sha256 = "f3d630189c20ff6d4246f4f67173f60ff89bc4643267e6fd27cc37a25437b6d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sl/thunderbird-91.7.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "2837b957b89184978c0ead48e7a2d58a7ee140ed280be8d744fac929d66cfd0a"; + sha256 = "d2020220b3c54b9bbc114ff367c10818541bd070f5e0e0d4c56fdbb027bd8d85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sq/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sq/thunderbird-91.7.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fd98ce5bb9bccfc8c9ae022cdf0416848e3564b59ccaf3ce8888eb7d4d02f0ce"; + sha256 = "91cc13d2a69372b619273feeabb961ae4e27dda6973b64cbb316db7207760c27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sr/thunderbird-91.7.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d9c1ec7df7e66e1b4e28a68c9ed74e8ea17a166dee2d2aaf7c9be616bfde97a0"; + sha256 = "7b4c459eb200c9d407acfbcc451290a5f43c6b9f0aa4dac6d4536c267b6afadf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/sv-SE/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/sv-SE/thunderbird-91.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e9e8ea82bf5fdb900c36ef22afda90d518ac52a4fadff5a3f1afbb09b4d1ebe4"; + sha256 = "be920ab8279dfe412f5e12082a7709d0e24ea7869f5a86d36e65962430a5798e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/th/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/th/thunderbird-91.7.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "4a58f3d88283cbe83bc6f9ff26c5b621bde3a52a8e5cda283f9bac6fa329e2a1"; + sha256 = "2a6d558efee3c0d02e4695b77b1f9dbaacf673f499a4ef28e3763358bb61346f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/tr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/tr/thunderbird-91.7.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "489e5d4448c25310ae14c6a74405d582b50113a73c394aa51776c2c3b37104ec"; + sha256 = "0cb0bb5991481cdb80d729f1c59276f4e1e12fac48b820fe5e352d63a44ff8ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/uk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/uk/thunderbird-91.7.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "cefeaf9df2e5fab13cf131d597393b83c1101d83b6dda04207c4428abbb62d15"; + sha256 = "056a958ad687e5b3a0c707379d15ba2b23e17a5c11f113edebcecaf5ab229ada"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/uz/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/uz/thunderbird-91.7.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7a330fa612f09f1337c3c775d0c0447dd2878e79c2555c7e1a13f611e2712720"; + sha256 = "31bf50803722d1b8017861da34237c41d725649a5884b33a15a3bc35738adb94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/vi/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/vi/thunderbird-91.7.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c1c11ce007f1e8cdfd039c8b9dbc73e879adafc40d6ef11dbf82134ff76c8d48"; + sha256 = "55b5d7c9c3ce8b02d58cb371b58afeff39f08e8b45b1d8875aaa267273ff65b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/zh-CN/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/zh-CN/thunderbird-91.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "041aa19e78aad8be563bf4466572deb8bbd16f3a74c24f297da0667dfc65739f"; + sha256 = "39983db7492adfd30f7c281f7de16f5538e65dfffd86579cc6abd91936c420b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-x86_64/zh-TW/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-x86_64/zh-TW/thunderbird-91.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "dee8d2dea78128f250054d5f8aaf948b19d3e43acc228a0c751df84d601ce76c"; + sha256 = "0b0dbff293c33ed286904f798153c64e8ee631430e9293bc384ca1f1368c44f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/af/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/af/thunderbird-91.7.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "6e19fa5338b63c3aa163cbb9d84953a0f1bc4bb593cbc685cf4e59249425f948"; + sha256 = "dd662bf17307215d0ffab8ea10852bf1a742b5dc0564b07b1f3583239169fccb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ar/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ar/thunderbird-91.7.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "2b35a83198c30bc9838849260477b4846dbd35b82607261534e05336911129c5"; + sha256 = "b3ea9d805c423c3ae2b7bdf74bcc3bc3cda88467c28c3eb02c5cf9f42bcee801"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ast/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ast/thunderbird-91.7.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "01712e869983cb089f9e98449ae215c95aa59e70ad2a7e61a17788f74c50c905"; + sha256 = "5853f37ec0ac021ace8ee23b2255bc680c2ac5a8c81a4023a98235d3fa2b53d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/be/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/be/thunderbird-91.7.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e7cfd5b52f0a809c514ac17f29bf30d2aa1959193020f742b8e907fc4772eb8b"; + sha256 = "ef0149c8c758a487cfd748f0a0cd114ee01d3fe63605952e3f5cb02c0fe2e351"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/bg/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/bg/thunderbird-91.7.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "e74a5073ec17e2ac75c81e9dbe418167932d53d47fb1449a919b7a6824f7ace3"; + sha256 = "9ce3b7ee2fae34af3e272d1a0a24a086901e032e589169005a4b75ca1dff6051"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/br/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/br/thunderbird-91.7.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a8b13e933e1767d6f42fa4e02892d99ef5d8da14c9aad51e2089d16c2b935c6b"; + sha256 = "6bb10ee9209b264889fd5338be11a6ed0295c4480eae1b0ca35ca8cd5e173066"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ca/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ca/thunderbird-91.7.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "047e158f5b81c5c5837c583e63f1852e94ab65365e7551dc14dee4e91711ee89"; + sha256 = "8b2cbcce416213c2628656722f2d6f4a8de47b8f601e6da665c99ba2710e3ae5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/cak/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cak/thunderbird-91.7.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "1175e2c893f720fd128de26ff7832367e2e8792d1a0fb968c23cf0c2971d87a5"; + sha256 = "140658bf9d5d0e7d8cdf7a6ecd987fd9d18a789d92a7ccc9fe64200fa531c0b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/cs/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cs/thunderbird-91.7.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9c80c6afa31ed73ccb2e1c813acabc3be484e00f6c498dece19e095d5fc7e1ab"; + sha256 = "5c4dffc7b3f672edbaf6906e487fc6636ab25fcc8dc9e3697b2b8d2a90ba24da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/cy/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/cy/thunderbird-91.7.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "79418720066cdeca5abee231952b3b26f1209eaf59ceab0882f798ba86305aee"; + sha256 = "b248ee575f00f1b4de3ac4be15886f270366b1073ad6dd84f4807ecc7fbd9a9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/da/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/da/thunderbird-91.7.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "4797af3b1d72199565fafe269d5514042420d3ffd276fb94b3bdda5cea2191f2"; + sha256 = "e2c03805474f8c39467217cd26a08133fd3cba61de35d4a2515b1d535bea6d0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/de/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/de/thunderbird-91.7.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "c15470c0a61190749d88c857d1a4490e331fc0046cd7aa18fffa5d23b33c1460"; + sha256 = "5de15b1da2b90eac08889791178a2d8b304b97bb4377c2478a0142ad0dc166f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/dsb/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/dsb/thunderbird-91.7.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "64c176f0c64d877a505006b03eb0d685042b7120293b733de029868a3ae562ec"; + sha256 = "20c2c5e9a57440eb046b35ce7f549d846e17afd26cf4883d7ee9de2223bce0d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/el/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/el/thunderbird-91.7.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "b220e7f82cbd674b5e98d082766b06a52bc69e18c7d1c91bb0a9dc6d2f129c99"; + sha256 = "3c5c3462455517f391ef0aa194a39522397d971e8d5ab2113a47cde1bea3b7b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/en-CA/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-CA/thunderbird-91.7.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0cc5344d19e62fc86843d71792a59b310be9604ba2bc1ea633d71d6f54ea7eae"; + sha256 = "adee07c4cc48bcd3595d32c881bedabf3410df9c3517c3f8f6feeb237552451d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/en-GB/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-GB/thunderbird-91.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "04285f839530ce6917a1918d557cc86448debbd8910d54ca051b9f1b63749b7d"; + sha256 = "b9eaf0f03ac73e961a160017bfc3f4537592d6d6d63239c3a8249fdb08a5f232"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/en-US/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/en-US/thunderbird-91.7.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "fa96eb80909cc7f485abda8fdc093f0ef1e2e5fe69f4919bdeeea27651fa264c"; + sha256 = "50783e08cf7bcb904bcca66270b55570a961390d078dae9998fcf8e527f92d3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/es-AR/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/es-AR/thunderbird-91.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5affd961efe6b8d6b7616ef1103095c068627f6d3c571aaf71924bc8f8bc58ec"; + sha256 = "e43babb45d6bffed8e2f27b7a21c211306322cec480b928124118b6bf999b6f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/es-ES/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/es-ES/thunderbird-91.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "1dae610383b6dd35e4d6e7d0f8a757b98ab98c6b587940818c239c95f7829e24"; + sha256 = "eead62cde35d787634bb1b6e6e8a96458f05e68d0bb9cd66c3926350d890c5a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/et/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/et/thunderbird-91.7.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "3b2979496032f3f140460295fcae7ff6b08b7970c18eff6bd83df6f582c20651"; + sha256 = "c3b4d1ebdc325e6ecd6f35012634ea5f4ffd620de7c30589a8999b128b986d59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/eu/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/eu/thunderbird-91.7.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a10fddb7405cb311d0a8c69dafca4dce66084c64f68fc7dabbdd7292d265d528"; + sha256 = "b23c783109a22c71bd5b337e2633bf2d17f8ee7b580faa43164b2ce7d70d5c45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/fi/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fi/thunderbird-91.7.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "edc8f3c7368126e3678f8ea6c22e8e575cd34054a94e21b1eac0a44f44689790"; + sha256 = "a34afada49c57d6816cfc472681b100366df881fdd343495b959df44dcc8bf5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/fr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fr/thunderbird-91.7.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bae7f4e7cd6d72c3e8270f12483f382c939f3012df6597bb3233af9a3d0bab03"; + sha256 = "85c5472de95eb357bba1eb697b17b309ec586717ef09a735cc94b3d7ee069ce3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/fy-NL/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/fy-NL/thunderbird-91.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "dd38566e30d30d1a15283ef1c4382d350cfd4afe8cdaeefc38b995cc82045964"; + sha256 = "e654bd29cd2a4a99a09d0d7feca2af89cd308d8d9fca6ad1069e5b026e04cee2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ga-IE/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ga-IE/thunderbird-91.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "7b16826113f3c46601465dbc3b44a24b5e62d9a6a0639d4f74b6314250f24224"; + sha256 = "ae2e865abb044bb61f51f46636f84054f87ef0e2d46b0c4d85d990bcb05d45da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/gd/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/gd/thunderbird-91.7.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "4287667e5ff7a6ff39c74066a7c22229736ce503fad749293710a25cf74b5836"; + sha256 = "54b117bb7ba110de0c3fb5e9c4d2743d54a49b941c273ed7f8c11dae30c1517e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/gl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/gl/thunderbird-91.7.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "bcca84aaab4c48e8842f1c921ac398f56eaa569cda6ffa6b5aa3cd0ec709e42e"; + sha256 = "bcec6b86c99fd463cbb16974e43fb232bc93e5ff2b1b08b18332000b274eaa67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/he/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/he/thunderbird-91.7.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "fd9be0e774dde17d5c2b5d1887c9e9ab75fcb7c797f5b6d59c991679eeb870a7"; + sha256 = "9ab72a7b9a87a75b113421ceef891b3e546a056e48c039f7af20e85a1b17b598"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hr/thunderbird-91.7.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4dbc9d9a2d9409688c2f67f5c73fbb31fd1027ee787527f437f95582103c728a"; + sha256 = "b8ec76e30180214f2c4d2743686e8de374207fbad8677d5801eb941174217834"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hsb/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hsb/thunderbird-91.7.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "5cf4fc68d7d9464d55686dbac2dba4a38ca50bb36e6661ed4d58b91726f0b312"; + sha256 = "5d35c9c51d1d94c55cf72901866ce0896770d8939fbbefe234f312f1b18c6b17"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hu/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hu/thunderbird-91.7.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "dd1b4a5f2498eb2e3a3956fdf6379cdde04f0eb60efc201c86237f07dfc01a2f"; + sha256 = "dc34328fd070973dd230158679bc34ba79075eaf8c62b4c3d67fc9daa8fd04a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/hy-AM/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/hy-AM/thunderbird-91.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4e717d157784d865f4de4dd8b14718d39103ce24be1d72c5720629c74d74ae94"; + sha256 = "6e94dca126ef9f60dc8f6086b4396548fbf3db4cd85feba332ee9cdc5c5546e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/id/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/id/thunderbird-91.7.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a705929998084e28016cc60df3b7ae6a1f70929270be16307e9be89f1324de2c"; + sha256 = "7ef09c4636f141fc19ca67e0787d1a04d4b6856d6bfc57732f1eacc31fe6b437"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/is/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/is/thunderbird-91.7.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "48d7eb8c949e9590699031c45bcdd746d1e86ed8dd893bb3afa7025f7bc4c247"; + sha256 = "8644c28c791152e6de4bf932417328afbcb3ff1832e85ded577d88a045071ceb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/it/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/it/thunderbird-91.7.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "0278a174914da7f874a974847a30bc52851496e79690a8ccde2c3a0a24e9aa39"; + sha256 = "a17c80fdb39ff828ab0b7d8fb2274a2f9c1dafb4d8657c510e894697f72e6941"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ja/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ja/thunderbird-91.7.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "243e610020c892cf44de3d76b27539e57c5c9eeaef6c5d8298af59ee4be8b448"; + sha256 = "50f48c0bb455132ee1a8e7f2a98a7e01688c0517c134dbf706538432615f44ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ka/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ka/thunderbird-91.7.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c641e2f92c87a7454603d059dc34dd2719aefe9b10548dba9e4b95e728583181"; + sha256 = "16b4cdc1dda75f62f664f5d0780e4dd9e65c91414fa3c6e546ed9ae39a5f251b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/kab/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/kab/thunderbird-91.7.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a47675e0ec44e8bb94dd950e5282f26f0ee878be90a87c0cffe50fe74adc754a"; + sha256 = "ef2db45999395216684c0cdee16fbaa9ad8a665088d529bcb80df72d442b433b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/kk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/kk/thunderbird-91.7.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "1a4cc1087fd9fd0f9cb303c1a0de438d95ec9a665360d9c9915af4269af6f5e9"; + sha256 = "fb1e05654c70c6b4361892799bf5e2b2035183407db9cae5307b4191548c3bd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ko/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ko/thunderbird-91.7.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f45540f54fab28b107c2938b91191a65f2051fbf435e00530d343f076cb84373"; + sha256 = "ca29bff1b2276510bba6bdaf280ea8a198fc36c77b325e60a4c1f5207a16a7e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/lt/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/lt/thunderbird-91.7.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "be4d02c3b07aab05e82de8d167ae22269ca5c5ee020a6d8cad0e53a433135160"; + sha256 = "7551bc85a46fa13c4fd7d72b31d34bda108bf5c7831825b7906c153542918f86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/lv/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/lv/thunderbird-91.7.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "76e3c3c943d4f3598f6f49b51ab9c8625322ad78b6809418905e8d0c7d586ee7"; + sha256 = "a6fd175e80f8f14431500cd272f7a277ab7b210b6d81c4b80c333e34e13260f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ms/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ms/thunderbird-91.7.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "e125a89ea9d9f013ddd2f816ab10c6916b514ff329011f54e517e2d6e5edb865"; + sha256 = "5fcb5b9a0a04957192a40fda0b097a1f781a98d9b18e6165810bbfad96cf188a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/nb-NO/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nb-NO/thunderbird-91.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "f1645ab9430323efefff6751696e1fe601063eef5c5ac70b90889620f6bd9680"; + sha256 = "50d5e767ea3c826d3c924d5a50bce2db2eff9b5ada8c2fd10b4bd8c85061e9da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/nl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nl/thunderbird-91.7.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "2c1cc1a8ed006e45d4649fa89d5446a9df2e95e2656e9a18130556c42ee0db78"; + sha256 = "c44d23adedd33715a38aa6a704de273de1034dbf0964698224463a2eb3a22fde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/nn-NO/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/nn-NO/thunderbird-91.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "089e6cb230da93b30aac8a81d22f6ac97233d20f6a0e50e96ef8675acfcc407c"; + sha256 = "c2081d7dc420cf97cbfc38901af9e3654bdd00610ad27cfc0a006afb7de003c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pa-IN/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pa-IN/thunderbird-91.7.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "6ca6b68ac5ab40966b8bc13d6a8f1ef26730d8065cad27f93bd3139295b5fcbc"; + sha256 = "426e6b686e8cfa660dadda666b7bfdc0a70ccb5db4134e4960cf7c408e88c9e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pl/thunderbird-91.7.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "93f94b83a17569b5b626277af71651a607d74c32fa17fc35896ac42556075d2d"; + sha256 = "c667bddefd1b82dd4945ca3a4a392f60b27ab7ab56e1b9fece0cac0dc4eb4971"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pt-BR/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pt-BR/thunderbird-91.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "9c7e02da587136eebf6111fe4e25687f904b8db7629be251c84ab25b6adfd2e5"; + sha256 = "ea24bf62001fa225ed08a05a34f8e5b0579de6c6b79fa08bd28760f41607ffd2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/pt-PT/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/pt-PT/thunderbird-91.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "8666b71ac2fa83da6175c8c26ab73a957f19dcc6b36cca7f980407aa7a42111d"; + sha256 = "8676b8fcd019099ede4973fa1e949e63ea06bd5dc599cc6dcc836dc49fdf4470"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/rm/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/rm/thunderbird-91.7.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "f278f045fe7c941b4545ea452152859960d952704f2d666d39bb6a91175c7027"; + sha256 = "4aa9681f172a62d5be35c5c4e3ba500253541ef4f8e38eaf37fcb41dac7989c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ro/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ro/thunderbird-91.7.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "2c43f39a8fcd557efde852eb7f859eff048672806ec23620037a28d4d98da99a"; + sha256 = "12c57824de26d6bfde6e9de1c3d5b5b1481213ce939fc4860c2fc86aaf8d64a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/ru/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/ru/thunderbird-91.7.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "63041d68d0072699dfc7e3fa448ac9a3bf065795c455dd3f5671cae97d5d121a"; + sha256 = "3afa7da7eacf0a3479b92a72c3d1f503d62961a9683c9cf5a538da90e5a3bae8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sk/thunderbird-91.7.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "be1cdf0cd47f788d736c9bfae340b6cf9edd661293e5ce5b5bca6b2aa169438c"; + sha256 = "1f5b0a28de82f795eb54daf44b8b807fdd30a7bff9dc5d1565adb001d38bd354"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sl/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sl/thunderbird-91.7.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "128a46d7df356375536a432d7bd13bdea8d4932b105cdf4b8288af3dfa878b7d"; + sha256 = "340026146fd09e3ed7a49a7123898b3d005a147d4988bc2df2c86b173fa088fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sq/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sq/thunderbird-91.7.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6a8fa0c4806240a886393c51f63992e567524264c821ccf4f12e202f4f30e7ce"; + sha256 = "64a9d0d4652d2d709aed3aa1e2a09bcf17ce936c0c4c950a27f8784e0a89d995"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sr/thunderbird-91.7.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "e2639022166d0be0d30846a269c08940652475e77ef114089e22c9d5ddf61f98"; + sha256 = "eb59bc42ef366a5ecf98f20f53113e69cc2f6591008bcccf592bc76dab636945"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/sv-SE/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/sv-SE/thunderbird-91.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d8a419a6c8105fbf6ee29a38cba3e40729ef8f12743d87ce2a623e8707ba0414"; + sha256 = "0f833b8b7a83b06b2f3cab5bffe94bfe28cbfc043543f73102f6789fdce95e61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/th/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/th/thunderbird-91.7.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "ac2926a73937c0789ba63d6ecce8a17dcf5a65a7fca5dd439618384588c0dce5"; + sha256 = "149d88dbb883e9eb04584d080d5e746a0165fa9cecc100e1af875414bd2c1154"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/tr/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/tr/thunderbird-91.7.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "efcf840a32ab0264484c7f1fa2b3a0961cdd1e8ff37f4f83126ab0626c19834b"; + sha256 = "7b92aa7c7ace49f7e7d0489b5c69a2c1282fc267b3650aec765e194413b6e9e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/uk/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/uk/thunderbird-91.7.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "e1fabb41564ebd683cf298bb3bc13e3478dfef6522f6524a7c2ab69c64d59251"; + sha256 = "217e921fb8d0fb6773ec7b4dabcb9a29293b15d2024353a4b542c8660f93e924"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/uz/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/uz/thunderbird-91.7.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "2dac221764006b5db352416159311849cfa62c67894ec40a2914caf3191c79d9"; + sha256 = "9428919a2d99f2ae953e50d148ab27200a3d9d8d02e5a8f5615a804468867922"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/vi/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/vi/thunderbird-91.7.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "fb482c3579b6bde18214ca68fa731d50ac254152dc51c5d13e283f16559f0886"; + sha256 = "2ee2b69190e6a5640b378d8a4b1dbe78aff7cae1db131aa162e23ee6626ee215"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/zh-CN/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/zh-CN/thunderbird-91.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "4e596742711f72eae50621fbc0b329bdf736267c753c51ab8dd1713cc0860285"; + sha256 = "e0537b6f509428a3721bac1ab4ff4567568d9854ece675a68a7bc2c058176e7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.5.0/linux-i686/zh-TW/thunderbird-91.5.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.7.0/linux-i686/zh-TW/thunderbird-91.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "c97873b840540297f08ad866479789f2f7cc8baa48de6bdf9eb4b945a5c135c4"; + sha256 = "ec7aec372154e7e7281fd1b2d84068140c50577d8e1f3ad30006092fefc61766"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index c9cc9f901a33..e2d4a76df7d0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -8,16 +8,16 @@ let in rec { - thunderbird = common rec { + thunderbird = (common rec { pname = "thunderbird"; - version = "91.5.0"; + version = "91.7.0"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "e1cafbd99e67e8fef346e936890a22aeadded4aa8be604607535ae933251bc1b2a3b56c2b62045b3d37ecb09999adb746157df188d1a32dfe75685f3af959b7d"; + sha512 = "2afaee16f155edcb0bdb46ebe282a733cf041ec6f562aebd06f8b675e46917f6f500fcc532fc54d74f3f4b0b489a88934a2c6c304f849873de4bc2690b9056a0"; }; - patches = [ + extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. ./no-buildconfig.patch ]; @@ -35,5 +35,7 @@ rec { updateScript = callPackage ./update.nix { attrPath = "thunderbird-unwrapped"; }; + }).override { + pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" }; } diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index c44b5f72724e..e5edfaa46709 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.89.25"; + version = "3.91.10"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-0j0vL45kpZeBBdW7NY8lvseYUhXGPoCbOdUtT97fMiI="; + sha256 = "sha256-RlEgpXco0lkkjlJ8FZz4MxYznKLPl1Lxkb5MSmhOTzI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/misc/zammad/0001-nulldb.patch b/pkgs/applications/networking/misc/zammad/0001-nulldb.patch new file mode 100644 index 000000000000..61971525b99d --- /dev/null +++ b/pkgs/applications/networking/misc/zammad/0001-nulldb.patch @@ -0,0 +1,15 @@ +diff --git a/config/application.rb b/config/application.rb +index d85a17491..90ea5e387 100644 +--- a/config/application.rb ++++ b/config/application.rb +@@ -3,6 +3,7 @@ + require_relative 'boot' + + require 'rails/all' ++require 'nulldb' + require_relative 'issue_2656_workaround_for_rails_issue_33600' + + # DO NOT REMOVE THIS LINE - see issue #2037 +diff --git a/db/schema.rb b/db/schema.rb +new file mode 100644 +index 000000000..e69de29bb diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix new file mode 100644 index 000000000000..ca5e2222c8e1 --- /dev/null +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -0,0 +1,141 @@ +{ stdenv +, lib +, fetchFromGitHub +, applyPatches +, bundlerEnv +, defaultGemConfig +, callPackage +, writeText +, procps +, ruby_2_7 +, postgresql +, imlib2 +, jq +, moreutils +, nodejs +, yarn +, yarn2nix-moretea +, v8 +, cacert +}: + +let + pname = "zammad"; + version = "5.1.0"; + + src = applyPatches { + + src = fetchFromGitHub (lib.importJSON ./source.json); + + patches = [ ./0001-nulldb.patch ]; + + postPatch = '' + sed -i -e "s|ruby '2.7.4'|ruby '${ruby_2_7.version}'|" Gemfile + sed -i -e "s|ruby 2.7.4p191|ruby ${ruby_2_7.version}|" Gemfile.lock + sed -i -e "s|2.7.4|${ruby_2_7.version}|" .ruby-version + ${jq}/bin/jq '. += {name: "Zammad", version: "${version}"}' package.json | ${moreutils}/bin/sponge package.json + ''; + }; + + databaseConfig = writeText "database.yml" '' + production: + url: <%= ENV['DATABASE_URL'] %> + ''; + + secretsConfig = writeText "secrets.yml" '' + production: + secret_key_base: <%= ENV['SECRET_KEY_BASE'] %> + ''; + + rubyEnv = bundlerEnv { + name = "${pname}-gems-${version}"; + inherit version; + + # Which ruby version to select: + # https://docs.zammad.org/en/latest/prerequisites/software.html#ruby-programming-language + inherit ruby_2_7; + + gemdir = src; + gemset = ./gemset.nix; + groups = [ + "assets" + "unicorn" # server + "nulldb" + "test" + "mysql" + "puma" + "development" + "postgres" # database + ]; + gemConfig = defaultGemConfig // { + pg = attrs: { + buildFlags = [ "--with-pg-config=${postgresql}/bin/pg_config" ]; + }; + rszr = attrs: { + buildInputs = [ imlib2 imlib2.dev ]; + buildFlags = [ "--without-imlib2-config" ]; + }; + mini_racer = attrs: { + buildFlags = [ + "--with-v8-dir=\"${v8}\"" + ]; + dontBuild = false; + postPatch = '' + substituteInPlace ext/mini_racer_extension/extconf.rb \ + --replace Libv8.configure_makefile '$CPPFLAGS += " -x c++"; Libv8.configure_makefile' + ''; + }; + }; + }; + + yarnEnv = yarn2nix-moretea.mkYarnPackage { + pname = "${pname}-node-modules"; + inherit version src; + yarnLock = ./yarn.lock; + yarnNix = ./yarn.nix; + packageJSON = ./package.json; + }; + +in +stdenv.mkDerivation { + inherit pname version src; + + buildInputs = [ + rubyEnv + rubyEnv.wrappedRuby + rubyEnv.bundler + yarn + nodejs + procps + cacert + ]; + + RAILS_ENV = "production"; + + buildPhase = '' + node_modules=${yarnEnv}/libexec/Zammad/node_modules + ${yarn2nix-moretea.linkNodeModulesHook} + + rake DATABASE_URL="nulldb://user:pass@127.0.0.1/dbname" assets:precompile + ''; + + installPhase = '' + cp -R . $out + cp ${databaseConfig} $out/config/database.yml + cp ${secretsConfig} $out/config/secrets.yml + sed -i -e "s|info|debug|" $out/config/environments/production.rb + ''; + + passthru = { + inherit rubyEnv yarnEnv; + updateScript = [ "${callPackage ./update.nix {}}/bin/update.sh" pname (toString ./.) ]; + }; + + meta = with lib; { + description = "Zammad, a web-based, open source user support/ticketing solution."; + homepage = "https://zammad.org"; + license = licenses.agpl3Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ n0emis garbas taeer ]; + }; +} diff --git a/pkgs/applications/networking/misc/zammad/gemset.nix b/pkgs/applications/networking/misc/zammad/gemset.nix new file mode 100644 index 000000000000..2f9e77d42531 --- /dev/null +++ b/pkgs/applications/networking/misc/zammad/gemset.nix @@ -0,0 +1,2608 @@ +{ + aasm = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05j0rdhdzc628v5nyzrazp4704hh96j5sjbn48zxyk4v3a61f4m2"; + type = "gem"; + }; + version = "5.2.0"; + }; + actioncable = { + dependencies = ["actionpack" "nio4r" "websocket-driver"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1csrylhksddsarr6wcsiyd0sni106djabswz5gwqqgm2hp992hkz"; + type = "gem"; + }; + version = "6.0.4.7"; + }; + actionmailbox = { + dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wm2g9f9vppxpv7dyvi5y6dg2k3cdd3x8635cswhpxlfd707sr4p"; + type = "gem"; + }; + version = "6.0.4.7"; + }; + actionmailer = { + dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iv2hgqynqlynl2gfaxazb5zzz7qdvdbvl0w695s9ry36ap6mlyi"; + type = "gem"; + }; + version = "6.0.4.7"; + }; + actionpack = { + dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01fc5lhy6g602xpwdc4pb0sbsfy3kpkc6w99k3fcrq1p14d4kbv5"; + type = "gem"; + }; + version = "6.0.4.7"; + }; + actiontext = { + dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11n4aaxwjq0iaddvlcdpfip1dpva7hhl2bd883gm0ijw2klaf17n"; + type = "gem"; + }; + version = "6.0.4.7"; + }; + actionview = { + dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gjcbrav25klh8gfj29hfd352if746v7rww77m1mj2adak02sjd1"; + type = "gem"; + }; + version = "6.0.4.7"; + }; + activejob = { + dependencies = ["activesupport" "globalid"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pvf0hl372y6lsar7svykbvdb3rn5jbis8z7vnqm57l2wvzzp6gv"; + type = "gem"; + }; + version = "6.0.4.7"; + }; + activemodel = { + dependencies = ["activesupport"]; + groups = ["default" "nulldb"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kznd1n0rffhd0vvhxzqdm4m9qp3y7xgqz34vmq2919m3zygqihx"; + type = "gem"; + }; + version = "6.0.4.7"; + }; + activerecord = { + dependencies = ["activemodel" "activesupport"]; + groups = ["default" "nulldb"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19kw1mcd6a1lyy8k3wk55pb2qdavwwpqn63ikfyb90ylvnr36g2q"; + type = "gem"; + }; + version = "6.0.4.7"; + }; + activerecord-import = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nagy0b82ims0pc9mvg1fq8hlrnn6z8r9kpaas83f4yyrwr9h359"; + type = "gem"; + }; + version = "1.3.0"; + }; + activerecord-nulldb-adapter = { + dependencies = ["activerecord"]; + groups = ["nulldb"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c0f7fn06fzc7pn0dydchnq6xgcaga9rbzhmin5z5xvg5nkv783c"; + type = "gem"; + }; + version = "0.8.0"; + }; + activerecord-session_store = { + dependencies = ["actionpack" "activerecord" "multi_json" "rack" "railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06ddhz1b2yg72iv09n48gcd3ix5da7hxlzi7vvj13nrps2qwlffg"; + type = "gem"; + }; + version = "2.0.0"; + }; + activestorage = { + dependencies = ["actionpack" "activejob" "activerecord" "marcel"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ync0w5mnmyk3pczc0k44iic35a5ij25fi5jwjhl9k7jr6wdhi2b"; + type = "gem"; + }; + version = "6.0.4.7"; + }; + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + groups = ["assets" "default" "development" "nulldb" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15pwg27li00rrzq4drmxx9l4w8fmxapnigvhh9m4xl0asmy1k207"; + type = "gem"; + }; + version = "6.0.4.7"; + }; + acts_as_list = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12p22h59c45dnccb51pqk275ziyi502azf9w3qcnkcsq827ma5jm"; + type = "gem"; + }; + version = "1.0.4"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + type = "gem"; + }; + version = "2.8.0"; + }; + argon2 = { + dependencies = ["ffi" "ffi-compiler"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g4qsdq072fyrsa7r0sg456dhrb017jmzdbnnzl2c80ha40bbmhg"; + type = "gem"; + }; + version = "2.1.1"; + }; + ast = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; + type = "gem"; + }; + version = "2.4.2"; + }; + autodiscover = { + dependencies = ["httpclient" "logging" "nokogiri" "nori"]; + groups = ["default"]; + platforms = []; + source = { + fetchSubmodules = false; + rev = "ee9b53dfa797ce6d4f970b82beea7fbdd2df56bb"; + sha256 = "1qffylir5i06vd3khwd182pslnqsa0kfc3dihvvjfdyl7p1lxv16"; + type = "git"; + url = "https://github.com/zammad-deps/autodiscover"; + }; + version = "1.0.2"; + }; + autoprefixer-rails = { + dependencies = ["execjs"]; + groups = ["assets"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ssfcicmmwx50491wns3aa9i0yamp2x6qk04yrgn51h9kzhp7frf"; + type = "gem"; + }; + version = "10.4.2.0"; + }; + binding_of_caller = { + dependencies = ["debug_inspector"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "078n2dkpgsivcf0pr50981w95nfc2bsrp3wpf9wnxz1qsp8jbb9s"; + type = "gem"; + }; + version = "1.0.0"; + }; + biz = { + dependencies = ["clavius" "tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n2d7cs9jlnpi75nbssv77qlw0jsqnixaikpxsrbxz154q43gvlc"; + type = "gem"; + }; + version = "1.8.2"; + }; + bootsnap = { + dependencies = ["msgpack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bjhh8pngmvnrsri2h6a753pgv0xdkbbgi1bmv6c7q137sp37jbg"; + type = "gem"; + }; + version = "1.11.1"; + }; + brakeman = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "197bvfm4rpczyrpbjzn7zh4q6rxigwnxnnmvvgfg9451k3jjygyy"; + type = "gem"; + }; + version = "5.2.1"; + }; + browser = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g4bcpax07kqqr9cp7cjc7i0pcij4nqpn1rdsg2wdwhzf00m6x32"; + type = "gem"; + }; + version = "5.3.1"; + }; + buftok = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs"; + type = "gem"; + }; + version = "0.2.0"; + }; + builder = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; + byebug = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194"; + type = "gem"; + }; + version = "11.1.3"; + }; + capybara = { + dependencies = ["addressable" "matrix" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dv75hs45456mi76h720gxk959gpg4f6091hmk42y0ln6kp2x7i0"; + type = "gem"; + }; + version = "3.36.0"; + }; + childprocess = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in"; + type = "gem"; + }; + version = "4.1.0"; + }; + chunky_png = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9"; + type = "gem"; + }; + version = "1.4.0"; + }; + clavius = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y58v8k860vafm1psm69f2ndcqmcifyvswsjdy8bxbxy30zrgad1"; + type = "gem"; + }; + version = "1.0.4"; + }; + clearbit = { + dependencies = ["nestful"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ccgvxzgpll1wr5i9wjm1h0m2z600j6c4yf6pww423qhg8a25lbl"; + type = "gem"; + }; + version = "0.3.3"; + }; + coderay = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; + type = "gem"; + }; + version = "1.1.3"; + }; + coffee-rails = { + dependencies = ["coffee-script" "railties"]; + groups = ["assets"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "170sp4y82bf6nsczkkkzypzv368sgjg6lfrkib4hfjgxa6xa3ajx"; + type = "gem"; + }; + version = "5.0.0"; + }; + coffee-script = { + dependencies = ["coffee-script-source" "execjs"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2"; + type = "gem"; + }; + version = "2.4.1"; + }; + coffee-script-source = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1907v9q1zcqmmyqzhzych5l7qifgls2rlbnbhy5vzyr7i7yicaz1"; + type = "gem"; + }; + version = "1.12.2"; + }; + coffeelint = { + dependencies = ["coffee-script" "execjs" "json"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k6nqia44m6jzzkav6wz1aafjipbygla3g6nl6i7sks854bwgdg1"; + type = "gem"; + }; + version = "1.16.1"; + }; + composite_primary_keys = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08w8rns5dgjmvavqf1apfbd59dyqyv4igni940rklnqps297w2bn"; + type = "gem"; + }; + version = "12.0.10"; + }; + concurrent-ruby = { + groups = ["assets" "default" "development" "nulldb" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + type = "gem"; + }; + version = "1.1.9"; + }; + crack = { + dependencies = ["rexml"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cr1kfpw3vkhysvkk3wg7c54m75kd68mbm9rs5azdjdq57xid13r"; + type = "gem"; + }; + version = "0.4.5"; + }; + crass = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; + type = "gem"; + }; + version = "1.0.6"; + }; + csv = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xqp6d3k3qcfybfibv6jx315800j1zvm1wwrdmfbs35g3wi9sb2c"; + type = "gem"; + }; + version = "3.2.2"; + }; + daemons = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07cszb0zl8mqmwhc8a2yfg36vi6lbgrp4pa5bvmryrpcz9v6viwg"; + type = "gem"; + }; + version = "1.4.1"; + }; + dalli = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wb7lqiza98cb76bq1jwvzr1j0r2nxkihaaa3dk17wjshd02jyn3"; + type = "gem"; + }; + version = "3.2.1"; + }; + debug_inspector = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01l678ng12rby6660pmwagmyg8nccvjfgs3487xna7ay378a59ga"; + type = "gem"; + }; + version = "1.1.0"; + }; + delayed_job = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f1vzxi1xcm1mq7nw3xr9j4q6a5pr5xply15s0n1hl1gahsgnlfa"; + type = "gem"; + }; + version = "4.1.10"; + }; + delayed_job_active_record = { + dependencies = ["activerecord" "delayed_job"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wh1146hg0b85zv336dn00jx9mzw5ma0maj67is7bvz5l35hd6yk"; + type = "gem"; + }; + version = "4.1.7"; + }; + deprecation_toolkit = { + dependencies = ["activesupport"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fh4d98irhph3ri7c2rrvvmmjd4z14702r8baq9flh5f34dap8d8"; + type = "gem"; + }; + version = "1.5.1"; + }; + diff-lcs = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; + type = "gem"; + }; + version = "1.5.0"; + }; + diffy = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nrg7kpgz6cn1gv2saj2fa5sfiykamvd7vn9lw2v625k7pjwf31l"; + type = "gem"; + }; + version = "3.4.0"; + }; + domain_name = { + dependencies = ["unf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + type = "gem"; + }; + version = "0.5.20190701"; + }; + doorkeeper = { + dependencies = ["railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "188ybg2cgghcp5r1jpfnbx3anf0z8fzlla72jra0vgwkdylk7qkz"; + type = "gem"; + }; + version = "5.5.4"; + }; + dotenv = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; + type = "gem"; + }; + version = "2.7.6"; + }; + eco = { + dependencies = ["coffee-script" "eco-source" "execjs"]; + groups = ["assets"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09jiwb7pkg0sxk730maxahra4whqw5l47zd7yg7fvd71pikdwdr0"; + type = "gem"; + }; + version = "1.0.0"; + }; + eco-source = { + groups = ["assets" "default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ccxrvaac6mw5kdj1i490b5xb1wdka3a5q4jhvn8dvg41594yba1"; + type = "gem"; + }; + version = "1.1.0.rc.1"; + }; + em-websocket = { + dependencies = ["eventmachine" "http_parser.rb"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a66b0kjk6jx7pai9gc7i27zd0a128gy73nmas98gjz6wjyr4spm"; + type = "gem"; + }; + version = "0.5.3"; + }; + equalizer = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4"; + type = "gem"; + }; + version = "0.0.11"; + }; + erubi = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; + type = "gem"; + }; + version = "1.10.0"; + }; + eventmachine = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + execjs = { + groups = ["assets" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; + type = "gem"; + }; + version = "2.8.1"; + }; + factory_bot = { + dependencies = ["activesupport"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04vxmjr200akcil9fqxc9ghbb9q0lyrh2q03xxncycd5vln910fi"; + type = "gem"; + }; + version = "6.2.0"; + }; + factory_bot_rails = { + dependencies = ["factory_bot" "railties"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18fhcihkc074gk62iwqgbdgc3ymim4fm0b4p3ipffy5hcsb9d2r7"; + type = "gem"; + }; + version = "6.2.0"; + }; + faker = { + dependencies = ["i18n"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1694ndj701a8q4c4bwxz53kx94ih1rr4pgr4gk7a6c8k4jsbjgwi"; + type = "gem"; + }; + version = "2.20.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"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; + type = "gem"; + }; + version = "1.10.0"; + }; + faraday-em_http = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-em_synchrony = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-excon = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; + }; + faraday-httpclient = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-multipart = { + dependencies = ["multipart-post"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + type = "gem"; + }; + version = "1.0.3"; + }; + faraday-net_http = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http_persistent = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; + type = "gem"; + }; + version = "1.2.0"; + }; + faraday-patron = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-rack = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-retry = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; + type = "gem"; + }; + version = "1.0.3"; + }; + faraday_middleware = { + dependencies = ["faraday"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy"; + type = "gem"; + }; + version = "1.2.0"; + }; + ffi = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + type = "gem"; + }; + version = "1.15.5"; + }; + ffi-compiler = { + dependencies = ["ffi" "rake"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1"; + type = "gem"; + }; + version = "1.0.1"; + }; + formatador = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l06bv4avphbdmr1y4g0rqlczr38k6r65b3zghrbj2ynyhm3xqjl"; + type = "gem"; + }; + version = "1.1.0"; + }; + gli = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rv8dlq9nqpias29jh40qb6xzznlk6ra41nan6s5hy56402f0k29"; + type = "gem"; + }; + version = "2.21.0"; + }; + globalid = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n5yc058i8xhi1fwcp1w7mfi6xaxfmrifdb4r4hjfff33ldn8lqj"; + type = "gem"; + }; + version = "1.0.0"; + }; + gmail_xoauth = { + dependencies = ["oauth"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dslnb1kffcygcbs8sqw58w6ba0maq4w7k1i7kjrqpq0kxx6wklq"; + type = "gem"; + }; + version = "0.4.2"; + }; + guard = { + dependencies = ["formatador" "listen" "lumberjack" "nenv" "notiffany" "pry" "shellany" "thor"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zqy994fr0pf3pda0x3mmkhgnfg4hd12qp5bh1s1xm68l00viwhj"; + type = "gem"; + }; + version = "2.18.0"; + }; + guard-compat = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj6sr1k8w59mmi27rsii0v8xyy2rnsi09nqvwpgj1q10yq1mlis"; + type = "gem"; + }; + version = "1.2.1"; + }; + guard-livereload = { + dependencies = ["em-websocket" "guard" "guard-compat" "multi_json"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yd74gdbbv2yz2caqwpsavzw8d5fd5y446wp8rdjw8wan0yd6k8j"; + type = "gem"; + }; + version = "2.5.2"; + }; + guard-symlink = { + dependencies = ["guard" "guard-compat"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s5lwl8v55lq0bbvj9k3fv0l4nkl0ydd7gr1k26ycs2a80cgd5mq"; + type = "gem"; + }; + version = "0.1.1"; + }; + hashdiff = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c"; + type = "gem"; + }; + version = "1.0.1"; + }; + hashie = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x"; + type = "gem"; + }; + version = "5.0.0"; + }; + hiredis = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04jj8k7lxqxw24sp0jiravigdkgsyrpprxpxm71ba93x1wr2w1bz"; + type = "gem"; + }; + version = "0.6.3"; + }; + htmlentities = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + type = "gem"; + }; + version = "4.3.4"; + }; + http = { + dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y"; + type = "gem"; + }; + version = "4.4.1"; + }; + http-accept = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09m1facypsdjynfwrcv19xcb1mqg8z6kk31g8r33pfxzh838c9n6"; + type = "gem"; + }; + version = "1.7.0"; + }; + http-cookie = { + dependencies = ["domain_name"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9"; + type = "gem"; + }; + version = "1.0.4"; + }; + http-form_data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wx591jdhy84901pklh1n9sgh74gnvq1qyqxwchni1yrc49ynknc"; + type = "gem"; + }; + version = "2.3.0"; + }; + http-parser = { + dependencies = ["ffi-compiler"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18qqvckvqjffh88hfib6c8pl9qwk9gp89w89hl3f2s1x8hgyqka1"; + type = "gem"; + }; + version = "1.2.3"; + }; + "http_parser.rb" = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + type = "gem"; + }; + version = "0.6.0"; + }; + httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["assets" "default" "development" "nulldb" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + type = "gem"; + }; + version = "1.10.0"; + }; + icalendar = { + dependencies = ["ice_cube"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wv5wq6pzq6434bnxfanvijswj2rnfvjmgisj1qg399mc42g46ls"; + type = "gem"; + }; + version = "2.7.1"; + }; + icalendar-recurrence = { + dependencies = ["icalendar" "ice_cube"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06li3cdbwkd9y2sadjlbwj54blqdaa056yx338s4ddfxywrngigh"; + type = "gem"; + }; + version = "1.1.3"; + }; + ice_cube = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dri4mcya1fwzrr9nzic8hj1jr28a2szjag63f9k7p2bw9fpw4fs"; + type = "gem"; + }; + version = "0.16.4"; + }; + inflection = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mfkk0j0dway3p4gwzk8fnpi4hwaywl2v0iywf1azf98zhk9pfnf"; + type = "gem"; + }; + version = "1.0.0"; + }; + iniparse = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wb1qy4i2xrrd92dc34pi7q7ibrjpapzk9y465v0n9caiplnb89n"; + type = "gem"; + }; + version = "1.5.0"; + }; + interception = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01vrkn28psdx1ysh5js3hn17nfp1nvvv46wc1pwqsakm6vb1hf55"; + type = "gem"; + }; + version = "0.5"; + }; + json = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; + type = "gem"; + }; + version = "2.6.1"; + }; + jwt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838"; + type = "gem"; + }; + version = "2.3.0"; + }; + kgio = { + groups = ["default" "unicorn"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ipzvw7n0kz1w8rkqybyxvf3hb601a770khm0xdqm68mc4aa59xx"; + type = "gem"; + }; + version = "2.11.4"; + }; + koala = { + dependencies = ["addressable" "faraday" "json" "rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "028cfg3i8kysv7vvrscakx5b809jbmlrbykr727sngh3hxq1wknb"; + type = "gem"; + }; + version = "3.1.0"; + }; + libv8 = { + groups = ["mini_racer"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0317sr3nrl51sp844bps71smkrwim3fjn47wdfpbycixnbxspivm"; + type = "gem"; + }; + version = "8.4.255.0"; + }; + listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; + type = "gem"; + }; + version = "3.7.1"; + }; + little-plugger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + logging = { + dependencies = ["little-plugger" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9"; + type = "gem"; + }; + version = "2.3.0"; + }; + loofah = { + dependencies = ["crass" "nokogiri"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w"; + type = "gem"; + }; + version = "2.14.0"; + }; + lumberjack = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06pybb23hypc9gvs2p839ildhn26q68drb6431ng3s39i3fkkba8"; + type = "gem"; + }; + version = "1.2.8"; + }; + mail = { + dependencies = ["mini_mime"]; + groups = ["default"]; + platforms = []; + source = { + fetchSubmodules = false; + rev = "9265cf75bbe376f595944bd10d2dd953f863e765"; + sha256 = "04jxql35kwijapl37h9an6127hzz0y4pnj82a9iw39kz9vva890s"; + type = "git"; + url = "https://github.com/zammad-deps/mail"; + }; + version = "2.7.2.edge"; + }; + marcel = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0"; + type = "gem"; + }; + version = "1.0.2"; + }; + matrix = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; + type = "gem"; + }; + version = "0.4.2"; + }; + memoizable = { + dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; + type = "gem"; + }; + version = "0.4.2"; + }; + messagebird-rest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nj994h4ziwb72g54ma3ivb3rbfkv3yk81wwcmgykl2ik3g7q2bm"; + type = "gem"; + }; + version = "3.0.0"; + }; + method_source = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; + type = "gem"; + }; + version = "1.0.0"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + 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"; + }; + mini_mime = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + type = "gem"; + }; + version = "1.1.2"; + }; + mini_portile2 = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + type = "gem"; + }; + version = "2.8.0"; + }; + mini_racer = { + dependencies = ["libv8"]; + groups = ["mini_racer"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zi36qcg5qj4g1c11vwmc7lknjihirrmc6yxi6q8j6v4lfnyjbyg"; + type = "gem"; + }; + version = "0.2.9"; + }; + minitest = { + groups = ["assets" "default" "development" "nulldb" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + type = "gem"; + }; + version = "5.15.0"; + }; + msgpack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cshgsx3hmpgx639xyqjqa2q3hgrhlyr9rpwhsglsx529alqq125"; + type = "gem"; + }; + version = "1.4.5"; + }; + multi_json = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + multi_xml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; + type = "gem"; + }; + version = "0.6.0"; + }; + multipart-post = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + type = "gem"; + }; + version = "2.1.1"; + }; + mysql2 = { + groups = ["mysql"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d14pcy5m4hjig0zdxnl9in5f4izszc7v9zcczf2gyi5kiyxk8jw"; + type = "gem"; + }; + version = "0.5.3"; + }; + naught = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wwjx35zgbc0nplp8a866iafk4zsrbhwwz4pav5gydr2wm26nksg"; + type = "gem"; + }; + version = "1.1.0"; + }; + nenv = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r97jzknll9bhd8yyg2bngnnkj8rjhal667n7d32h8h7ny7nvpnr"; + type = "gem"; + }; + version = "0.3.0"; + }; + nestful = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sn7lrdhp1dwn9xkqwkarby5bxx1g30givy3fi1dwp1xvqbrqikw"; + type = "gem"; + }; + version = "1.1.4"; + }; + net-ldap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j19yxrz7h3hj7kiiln13c7bz7hvpdqr31bwi88dj64zifr7896n"; + type = "gem"; + }; + version = "0.17.0"; + }; + netrc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; + nio4r = { + groups = ["default" "puma"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + type = "gem"; + }; + version = "2.5.8"; + }; + nokogiri = { + dependencies = ["mini_portile2" "racc"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + type = "gem"; + }; + version = "1.13.3"; + }; + nori = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + type = "gem"; + }; + version = "2.6.0"; + }; + notiffany = { + dependencies = ["nenv" "shellany"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f47h3bmg1apr4x51szqfv3rh2vq58z3grh4w02cp3bzbdh6jxnk"; + type = "gem"; + }; + version = "0.1.3"; + }; + oauth = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h6nfg2pibc17fch0795d4bcy41a92im5zrsrgs31zdhrl6zf4w0"; + type = "gem"; + }; + version = "0.5.8"; + }; + oauth2 = { + dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16sk9h6a6vzqxf8v1fisa8jq5cj9sw4mwc7azy5gj2w1whkfa5dp"; + type = "gem"; + }; + version = "1.4.9"; + }; + omniauth = { + dependencies = ["hashie" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz"; + type = "gem"; + }; + version = "1.9.1"; + }; + omniauth-facebook = { + dependencies = ["omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m7q38kjm94wgq6h7hk9546yg33wcs3vf1v6zp0vx7nwkvfxh2j4"; + type = "gem"; + }; + version = "9.0.0"; + }; + omniauth-github = { + dependencies = ["omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xbk0dbxqfpyfb33ghz6vrlz3m6442rp18ryf13gwzlnifcawhlb"; + type = "gem"; + }; + version = "1.4.0"; + }; + omniauth-gitlab = { + dependencies = ["omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nbrg93p0nqxs1i2ddyij2rr7jn4vr3la4la39q4fknpin535k3z"; + type = "gem"; + }; + version = "2.0.0"; + }; + omniauth-google-oauth2 = { + dependencies = ["jwt" "oauth2" "omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10pnxvb6wpnf58dja3yz4ja527443x3q13hzhcbays4amnnp8i4a"; + type = "gem"; + }; + version = "0.8.2"; + }; + omniauth-linkedin-oauth2 = { + dependencies = ["omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ydkj9f2hd3fskpc2gazz9dim70z2k6z6pb8j3glnlhkd67iyzci"; + type = "gem"; + }; + version = "1.0.0"; + }; + omniauth-microsoft-office365 = { + dependencies = ["omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vw6418gykxqd9z32ddq0mr6wa737la1zwppb1ilw9sgii24rg1v"; + type = "gem"; + }; + version = "0.0.8"; + }; + omniauth-oauth = { + dependencies = ["oauth" "omniauth"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yw2vzx633p9wpdkd4jxsih6mw604mj7f6myyfikmj4d95c8d9z7"; + type = "gem"; + }; + version = "1.2.0"; + }; + omniauth-oauth2 = { + dependencies = ["oauth2" "omniauth"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ry65f309rnzhgdjvqybkd5i4qp9rpk1gbp4dz02h4l6bkk6ya10"; + type = "gem"; + }; + version = "1.7.2"; + }; + omniauth-rails_csrf_protection = { + dependencies = ["actionpack" "omniauth"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xgkxwg17w39q3yjqcj0fm6hdkw37qm1l82dvm9zxn6q2pbzm2zv"; + type = "gem"; + }; + version = "0.1.2"; + }; + omniauth-saml = { + dependencies = ["omniauth" "ruby-saml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gxl14lbksnjkl8dfn23lsjkk63md77icm5racrh6fsp5n4ni9d4"; + type = "gem"; + }; + version = "1.10.3"; + }; + omniauth-twitter = { + dependencies = ["omniauth-oauth" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65"; + type = "gem"; + }; + version = "1.4.0"; + }; + omniauth-weibo-oauth2 = { + dependencies = ["omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02cz73lj38cjqkbrdnfr7iymzqdcxgqcjy992r5hmawgpqqgxvwb"; + type = "gem"; + }; + version = "0.5.2"; + }; + openssl = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1azzx975qr078isvg8i0hmsr2l98kgnlfrnbb2jdm9b5kwifx1h4"; + type = "gem"; + }; + version = "3.0.0"; + }; + overcommit = { + dependencies = ["childprocess" "iniparse" "rexml"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wbczp2pxwiggx5n925mdr2q17c6m9hq7h0q7ml2spmla29609sr"; + type = "gem"; + }; + version = "0.58.0"; + }; + parallel = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hkfpm78c2vs1qblnva3k1grijvxh87iixcnyd83s3lxrxsjvag4"; + type = "gem"; + }; + version = "1.21.0"; + }; + parser = { + dependencies = ["ast"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c"; + type = "gem"; + }; + version = "3.1.1.0"; + }; + pg = { + groups = ["postgres"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00vhasqwc4f98qb4wxqn2h07fjwzhp5lwyi41j2gndi2g02wrdqh"; + type = "gem"; + }; + version = "0.21.0"; + }; + PoParser = { + dependencies = ["simple_po_parser"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mf9f5zx23cjjn0p77wz1igzpfr22mxhljgavffl8fwqq74v4ih"; + type = "gem"; + }; + version = "3.2.5"; + }; + power_assert = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01z44m715rb6nzfrc90c5rkkdiy42dv3q94jw1q8baf9dg33nwi5"; + type = "gem"; + }; + version = "2.0.1"; + }; + pry = { + dependencies = ["coderay" "method_source"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr"; + type = "gem"; + }; + version = "0.14.1"; + }; + pry-rails = { + dependencies = ["pry"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cf4ii53w2hdh7fn8vhqpzkymmchjbwij4l3m7s6fsxvb9bn51j6"; + type = "gem"; + }; + version = "0.3.9"; + }; + pry-remote = { + dependencies = ["pry" "slop"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10g1wrkcy5v5qyg9fpw1cag6g5rlcl1i66kn00r7kwqkzrdhd7nm"; + type = "gem"; + }; + version = "0.1.8"; + }; + pry-rescue = { + dependencies = ["interception" "pry"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wn72y8y3d3g0ng350ld92nyjln012432q2z2iy9lhwzjc4dwi65"; + type = "gem"; + }; + version = "1.5.2"; + }; + pry-stack_explorer = { + dependencies = ["binding_of_caller" "pry"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h7kp99r8vpvpbvia079i58932qjz2ci9qhwbk7h1bf48ydymnx2"; + type = "gem"; + }; + version = "0.6.1"; + }; + public_suffix = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + type = "gem"; + }; + version = "4.0.6"; + }; + puma = { + dependencies = ["nio4r"]; + groups = ["puma"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xvkz9xrd1cqnlm0qac1iwwxzndx3cc17zrjncpa4lzjfwbxhsnm"; + type = "gem"; + }; + version = "4.3.11"; + }; + pundit = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17z2f7w3syh3c04c8m1v9pvb9pfpymk8b5plszr5l24hx374xvsd"; + type = "gem"; + }; + version = "2.2.0"; + }; + pundit-matchers = { + dependencies = ["rspec-rails"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10kvf0pj5339fh3dgf9lvsv94d74x7x1wxdb0hp8a1ac7w5l6vmm"; + type = "gem"; + }; + version = "1.7.0"; + }; + racc = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + type = "gem"; + }; + version = "1.6.0"; + }; + rack = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + type = "gem"; + }; + version = "2.2.3"; + }; + rack-livereload = { + dependencies = ["rack"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1slzlmvlapgp2pc7389i0zndq3nka0s6sh445vf21cxpz7vz3p5i"; + type = "gem"; + }; + version = "0.3.17"; + }; + rack-test = { + dependencies = ["rack"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + type = "gem"; + }; + version = "1.1.0"; + }; + rails = { + dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r9b9bxa7s3mw8dz8bl61pyazk880jmpngy3rkpyjc5cckawqbnb"; + type = "gem"; + }; + version = "6.0.4.7"; + }; + rails-controller-testing = { + dependencies = ["actionpack" "actionview" "activesupport"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "151f303jcvs8s149mhx2g5mn67487x0blrf9dzl76q1nb7dlh53l"; + type = "gem"; + }; + version = "1.0.5"; + }; + rails-dom-testing = { + dependencies = ["activesupport" "nokogiri"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + type = "gem"; + }; + version = "2.0.3"; + }; + rails-html-sanitizer = { + dependencies = ["loofah"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09qrfi3pgllxb08r024lln9k0qzxs57v0slsj8616xf9c0cwnwbk"; + type = "gem"; + }; + version = "1.4.2"; + }; + railties = { + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03kwdd874sjaag082ia3zf4bng6dgsjk4nkkkn28l7n89i062ca3"; + type = "gem"; + }; + version = "6.0.4.7"; + }; + rainbow = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; + type = "gem"; + }; + version = "3.1.1"; + }; + raindrops = { + groups = ["default" "unicorn"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wb2x51parf6v78w0cic90m33bdc92y5h8rj4wqs75dhw1b69hc7"; + type = "gem"; + }; + version = "0.20.0"; + }; + rake = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + rb-fsevent = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06c50pvxib7wqnv6q0f3n7gzfcrp5chi3sa48hxpkfxc3hhy11fm"; + type = "gem"; + }; + version = "0.11.1"; + }; + rb-inotify = { + dependencies = ["ffi"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + type = "gem"; + }; + version = "0.10.1"; + }; + rchardet = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; + type = "gem"; + }; + version = "1.8.0"; + }; + redis = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lhdfkl4r6dnhlr8jpz4a21ca6c76jfy7fj7gf4j2qpbh8ld8qyb"; + type = "gem"; + }; + version = "4.6.0"; + }; + regexp_parser = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; + type = "gem"; + }; + version = "2.2.1"; + }; + rest-client = { + dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qs74yzl58agzx9dgjhcpgmzfn61fqkk33k1js2y5yhlvc5l19im"; + type = "gem"; + }; + version = "2.1.0"; + }; + rexml = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "118hkfw9b11hvvalr7qlylwal5h8dihagm9xg7k4gskg7587hca6"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "001ihayil7jpfxdlxlhakvz02kx0nk5m1w0bz6z8izdx0nc8bh53"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-rails = { + dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jj5zs9h2ll8iz699ac4bysih7y4csnf8h5h80bm6ppbf02ly8fa"; + type = "gem"; + }; + version = "5.1.1"; + }; + rspec-support = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xfk4pla77251n39zf4n792m1rhg5sn1kp63yvpvvysany34la03"; + type = "gem"; + }; + version = "3.11.0"; + }; + rszr = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ns5qxdkgbqw1d52nz29lwx6xgs5bqwx1js1227n6l4q36g3snpp"; + type = "gem"; + }; + version = "0.5.2"; + }; + rubocop = { + dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03c6v6bfqdw8vnda0if0sx7aff0iq6xnv1adyfs0bi9msgggafcr"; + type = "gem"; + }; + version = "1.26.0"; + }; + rubocop-ast = { + dependencies = ["parser"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv"; + type = "gem"; + }; + version = "1.16.0"; + }; + rubocop-faker = { + dependencies = ["faker" "rubocop"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05d2mpi8xq50xh1s53h75hgvdhcz76lv9cnfn4jg35nbg67j1pdz"; + type = "gem"; + }; + version = "1.1.0"; + }; + rubocop-inflector = { + dependencies = ["activesupport" "rubocop" "rubocop-rspec"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v5ijrpvvibkzfdbih0c0rvfpvifirj2fmy237ph48r5q0xm1fzl"; + type = "gem"; + }; + version = "0.1.1"; + }; + rubocop-performance = { + dependencies = ["rubocop" "rubocop-ast"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17ny81dy5gjrvris8mni7la8yjg57snphyg9nmvnc3al7yhwr74x"; + type = "gem"; + }; + version = "1.13.3"; + }; + rubocop-rails = { + dependencies = ["activesupport" "rack" "rubocop"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vibx4jhpxaxa8w3wyhasskcgrxfjiyqdwrrc7l2lb0mbxqcs1ly"; + type = "gem"; + }; + version = "2.13.2"; + }; + rubocop-rspec = { + dependencies = ["rubocop"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "051gq9pz49iv4gq34d3n089iaa6cb418n2fhin6gd6fpysbi3nf6"; + type = "gem"; + }; + version = "2.9.0"; + }; + ruby-progressbar = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + type = "gem"; + }; + version = "1.11.0"; + }; + ruby-saml = { + dependencies = ["nokogiri" "rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1irn32sy9gx6xj9jxc28h7dax7vp9z8j6hjjfsb2f5hd4qz0z20x"; + type = "gem"; + }; + version = "1.14.0"; + }; + ruby2_keywords = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; + rubyntlm = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; + type = "gem"; + }; + version = "0.6.3"; + }; + rubyzip = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + sassc = { + dependencies = ["ffi"]; + groups = ["assets" "default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c"; + type = "gem"; + }; + version = "2.4.0"; + }; + sassc-rails = { + dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"]; + groups = ["assets"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d9djmwn36a5m8a83bpycs48g8kh1n2xkyvghn7dr6zwh4wdyksz"; + type = "gem"; + }; + version = "2.1.2"; + }; + selenium-webdriver = { + dependencies = ["childprocess" "rexml" "rubyzip"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17hilxa40cj7q48k6wcx1cbdb1v3q9c4nx89fji7gyqpcfm16vq7"; + type = "gem"; + }; + version = "4.1.0"; + }; + shellany = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ryyzrj1kxmnpdzhlv4ys3dnl2r5r3d2rs2jwzbnd1v96a8pl4hf"; + type = "gem"; + }; + version = "0.0.1"; + }; + shoulda-matchers = { + dependencies = ["activesupport"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01svmyma958sbqfz0v29lbqbr0ibvgcng352nhx6bsc9k5c207d0"; + type = "gem"; + }; + version = "5.1.0"; + }; + simple_oauth = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dw9ii6m7wckml100xhjc6vxpjcry174lbi9jz5v7ibjr3i94y8l"; + type = "gem"; + }; + version = "0.3.1"; + }; + simple_po_parser = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "134zg0dzd7216lyczkhv01v27ikkmipjihcy2bzi0qv72p1i923i"; + type = "gem"; + }; + version = "1.1.5"; + }; + slack-notifier = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "001bipchr45sny33nlavqgxca9y1qqxa7xpi7pvjfqiybwzvm6nd"; + type = "gem"; + }; + version = "2.4.0"; + }; + slack-ruby-client = { + dependencies = ["faraday" "faraday_middleware" "gli" "hashie" "websocket-driver"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i067a99sr4m80gimcrymkic9da7zrszlfr87mhlgy5s7z4j70gw"; + type = "gem"; + }; + version = "1.0.0"; + }; + slop = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; + type = "gem"; + }; + version = "3.6.0"; + }; + spring = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ihmqcqylfx04bigg0fswmlvp0639f1j47kdir4g9lc76yw3c6ia"; + type = "gem"; + }; + version = "4.0.0"; + }; + sprockets = { + dependencies = ["concurrent-ruby" "rack"]; + groups = ["assets"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + type = "gem"; + }; + version = "3.7.2"; + }; + sprockets-rails = { + dependencies = ["actionpack" "activesupport" "sprockets"]; + groups = ["assets" "default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min"; + type = "gem"; + }; + version = "3.4.2"; + }; + tcr = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14678jlva69bxx24sz5i882x25h357xmbmqsichvq8vdiw2xf6aa"; + type = "gem"; + }; + version = "0.2.2"; + }; + telegramAPI = { + dependencies = ["rest-client"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "043blxqk5qps62jgjyr7hbf2y2fg5ldcmii8mxk09b3c6ps9ji6g"; + type = "gem"; + }; + version = "1.4.2"; + }; + telephone_number = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ai25w1g5g6lr6mz2yxma2px78gfx50bk66kbakkx0dczdybxd1r"; + type = "gem"; + }; + version = "1.4.14"; + }; + test-unit = { + dependencies = ["power_assert"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h0gpi3fggfa76sbm5kh48ma79z41yh6y7n3lxmaqrbf3zqyjlcw"; + type = "gem"; + }; + version = "3.5.3"; + }; + thor = { + groups = ["assets" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + type = "gem"; + }; + version = "1.2.1"; + }; + thread_safe = { + groups = ["assets" "default" "development" "nulldb" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tilt = { + groups = ["assets" "default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + type = "gem"; + }; + version = "2.0.10"; + }; + twilio-ruby = { + dependencies = ["faraday" "jwt" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0x8md052pya691vjzzvpmpf0j42m017p3d8xr2js6j5ir69iya0j"; + type = "gem"; + }; + version = "5.65.1"; + }; + twitter = { + dependencies = ["addressable" "buftok" "equalizer" "http" "http-form_data" "http_parser.rb" "memoizable" "multipart-post" "naught" "simple_oauth"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13dmkjgsnym1avym9f7y2i2h3mlk8crqvc87drrzr4f0sf9l8g2y"; + type = "gem"; + }; + version = "7.0.0"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + groups = ["assets" "default" "development" "nulldb" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + type = "gem"; + }; + version = "1.2.9"; + }; + uglifier = { + dependencies = ["execjs"]; + groups = ["assets"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wgh7bzy68vhv9v68061519dd8samcy8sazzz0w3k8kqpy3g4s5f"; + type = "gem"; + }; + version = "4.2.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 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd"; + type = "gem"; + }; + version = "0.0.8"; + }; + unicode-display_width = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn"; + type = "gem"; + }; + version = "2.1.0"; + }; + unicorn = { + dependencies = ["kgio" "raindrops"]; + groups = ["unicorn"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h0gma14jjxiz6piyi6p99q7lya2mxrq79l03160hascvmx9ipa5"; + type = "gem"; + }; + version = "6.1.0"; + }; + valid_email2 = { + dependencies = ["activemodel" "mail"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mm92c0p2cgsydcn1va624yzpsdp9bnh24c68lw45j43rca88kq7"; + type = "gem"; + }; + version = "4.0.3"; + }; + vcr = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xzd8f17mmcq9f6lxg4w0x4nd9pyp41lr77gjzxwynijzp8rcgjl"; + type = "gem"; + }; + version = "6.1.0"; + }; + viewpoint = { + dependencies = ["httpclient" "logging" "nokogiri" "rubyntlm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14bvihfs0gzmam680xqqs07isxjk677yi3ph2pdvyyhhkbfys0l0"; + type = "gem"; + }; + version = "1.1.1"; + }; + webmock = { + dependencies = ["addressable" "crack" "hashdiff"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l8vh8p0g92cqcvv0ra3mblsa4nczh0rz8nbwbkc3g3yzbva85xk"; + type = "gem"; + }; + version = "3.14.0"; + }; + websocket-driver = { + dependencies = ["websocket-extensions"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + type = "gem"; + }; + version = "0.7.5"; + }; + websocket-extensions = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; + type = "gem"; + }; + version = "0.1.5"; + }; + writeexcel = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0waaf1drp17m5qdchxqlqzj51sfa9hxqccw7d71qdg73gzay1x34"; + type = "gem"; + }; + version = "1.0.5"; + }; + xpath = { + dependencies = ["nokogiri"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; + type = "gem"; + }; + version = "3.2.0"; + }; + zeitwerk = { + groups = ["assets" "default" "development" "nulldb" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; + type = "gem"; + }; + version = "2.5.4"; + }; + zendesk_api = { + dependencies = ["faraday" "hashie" "inflection" "mini_mime" "multipart-post"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sl5a01sl58pxxcx9qdvjwm04my1waysaik7y6l5564wbx4xczyr"; + type = "gem"; + }; + version = "1.35.0"; + }; +} diff --git a/pkgs/applications/networking/misc/zammad/package.json b/pkgs/applications/networking/misc/zammad/package.json new file mode 100644 index 000000000000..00c22263200b --- /dev/null +++ b/pkgs/applications/networking/misc/zammad/package.json @@ -0,0 +1,18 @@ +{ + "scripts": { + "lint:css": "stylelint \"**/*.{css,scss}\"", + "lint:css:fix": "stylelint \"**/*.{css,scss}\" --fix" + }, + "devDependencies": { + "postcss": "^8.4.4", + "postcss-html": "^1.3.0", + "prettier": "2.5.0", + "stylelint": "^14.1.0", + "stylelint-config-prettier": "^9.0.3", + "stylelint-config-standard": "^24.0.0", + "stylelint-config-standard-scss": "^3.0.0", + "stylelint-prettier": "^2.0.0" + }, + "name": "Zammad", + "version": "5.1.0" +} diff --git a/pkgs/applications/networking/misc/zammad/source.json b/pkgs/applications/networking/misc/zammad/source.json new file mode 100644 index 000000000000..76e1321433f1 --- /dev/null +++ b/pkgs/applications/networking/misc/zammad/source.json @@ -0,0 +1,7 @@ +{ + "owner": "zammad", + "repo": "zammad", + "rev": "eefae45c2ad6e6a96b8df631d2f50f290ecbd27d", + "sha256": "EjowvM//+UsAfEH9/0jgLkiD7EWH34M1NQ9U2DotBqc=", + "fetchSubmodules": true +} diff --git a/pkgs/applications/networking/misc/zammad/update.nix b/pkgs/applications/networking/misc/zammad/update.nix new file mode 100644 index 000000000000..49e676d13f39 --- /dev/null +++ b/pkgs/applications/networking/misc/zammad/update.nix @@ -0,0 +1,37 @@ +{ stdenv +, lib +, makeWrapper +, bundix +, common-updater-scripts +, jq +, nix-prefetch-github +, yarn +, yarn2nix +}: + +stdenv.mkDerivation rec { + name = "zammad-update-script"; + installPhase = '' + mkdir -p $out/bin + cp ${./update.sh} $out/bin/update.sh + patchShebangs $out/bin/update.sh + wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs} + ''; + phases = [ "installPhase" ]; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + bundix + common-updater-scripts + jq + nix-prefetch-github + yarn + yarn2nix + ]; + + meta = { + maintainers = with lib.maintainers; [ n0emis ]; + description = "Utility to generate Nix expressions for Zammad's dependencies"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/applications/networking/misc/zammad/update.sh b/pkgs/applications/networking/misc/zammad/update.sh new file mode 100755 index 000000000000..982e77c1228b --- /dev/null +++ b/pkgs/applications/networking/misc/zammad/update.sh @@ -0,0 +1,68 @@ +#!/usr/bin/env bash + +set -euo pipefail + +if [ "$#" -gt 2 ] || [[ "$1" == -* ]]; then + echo "Regenerates packaging data for the zammad packages." + echo "Usage: $0 [package name] [zammad directory in nixpkgs]" + exit 1 +fi + +VERSION=$(curl -s https://ftp.zammad.com/ | grep -v latest | grep tar.gz | sed "s/zammad-//" | sort -h | tail -n 1 | awk '{print $1}' | sed 's/.tar.gz<\/a>//') +TARGET_DIR="$2" +WORK_DIR=$(mktemp -d) +SOURCE_DIR=$WORK_DIR/zammad-$VERSION + +pushd $TARGET_DIR + +rm -rf \ + ./source.json \ + ./gemset.nix \ + ./yarn.lock \ + ./yarn.nix + + +# Check that working directory was created. +if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then + echo "Could not create temporary directory." + exit 1 +fi + +# Delete the working directory on exit. +function cleanup { + rm -rf "$WORK_DIR" +} +trap cleanup EXIT + + +pushd $WORK_DIR + +echo ":: Creating source.json" +nix-prefetch-github zammad zammad --rev $VERSION --json --fetch-submodules | jq 'del(.leaveDotGit) | del(.deepClone)' > $TARGET_DIR/source.json +echo >> $TARGET_DIR/source.json + +echo ":: Fetching source" +curl -L https://github.com/zammad/zammad/archive/$VERSION.tar.gz --output source.tar.gz +tar zxf source.tar.gz + +if [[ ! "$SOURCE_DIR" || ! -d "$SOURCE_DIR" ]]; then + echo "Source directory does not exists." + exit 1 +fi + +pushd $SOURCE_DIR + +echo ":: Creating gemset.nix" +bundix --lockfile=./Gemfile.lock --gemfile=./Gemfile --gemset=$TARGET_DIR/gemset.nix + +echo ":: Creating yarn.nix" +yarn install +cp yarn.lock $TARGET_DIR +yarn2nix > $TARGET_DIR/yarn.nix + +# needed to avoid import from derivation +jq --arg VERSION "$VERSION" '. += {name: "Zammad", version: $VERSION}' package.json > $TARGET_DIR/package.json + +popd +popd +popd diff --git a/pkgs/applications/networking/misc/zammad/yarn.lock b/pkgs/applications/networking/misc/zammad/yarn.lock new file mode 100644 index 000000000000..410bbae565ad --- /dev/null +++ b/pkgs/applications/networking/misc/zammad/yarn.lock @@ -0,0 +1,1275 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/code-frame@^7.0.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" + integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== + dependencies: + "@babel/highlight" "^7.16.0" + +"@babel/helper-validator-identifier@^7.15.7": + version "7.15.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" + integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== + +"@babel/highlight@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" + integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g== + dependencies: + "@babel/helper-validator-identifier" "^7.15.7" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.3": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + +"@types/minimist@^1.2.0": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" + integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== + +"@types/normalize-package-data@^2.4.0": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" + integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== + +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + +ajv@^8.0.1: + version "8.8.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb" + integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + +arrify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" + integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= + +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +balanced-match@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9" + integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA== + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +camelcase-keys@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" + integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg== + dependencies: + camelcase "^5.3.1" + map-obj "^4.0.0" + quick-lru "^4.0.1" + +camelcase@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +chalk@^2.0.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + 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" + +clone-regexp@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz#7d65e00885cd8796405c35a737e7a86b7429e36f" + integrity sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q== + dependencies: + is-regexp "^2.0.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +cosmiconfig@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.2.1" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.10.0" + +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + +debug@^4.3.2: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + dependencies: + ms "2.1.2" + +decamelize-keys@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" + integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk= + dependencies: + decamelize "^1.1.0" + map-obj "^1.0.0" + +decamelize@^1.1.0, decamelize@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +dom-serializer@^1.0.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" + integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.2.0" + entities "^2.0.0" + +domelementtype@^2.0.1, domelementtype@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== + +domhandler@^4.2.0, domhandler@^4.2.2: + version "4.3.0" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626" + integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g== + dependencies: + domelementtype "^2.2.0" + +domutils@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== + dependencies: + dom-serializer "^1.0.1" + domelementtype "^2.2.0" + domhandler "^4.2.0" + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +entities@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== + +entities@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" + integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +execall@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz#16a06b5fe5099df7d00be5d9c06eecded1663b45" + integrity sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow== + dependencies: + clone-regexp "^2.1.0" + +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-diff@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" + integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== + +fast-glob@^3.1.1, fast-glob@^3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== + 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" + +fastest-levenshtein@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" + integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== + +fastq@^1.6.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== + dependencies: + reusify "^1.0.4" + +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== + dependencies: + flat-cache "^3.0.4" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + dependencies: + flatted "^3.1.0" + rimraf "^3.0.2" + +flatted@^3.1.0: + version "3.2.4" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2" + integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw== + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +get-stdin@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" + integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== + +glob-parent@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob@^7.1.3: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +global-modules@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" + integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== + dependencies: + global-prefix "^3.0.0" + +global-prefix@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== + dependencies: + ini "^1.3.5" + kind-of "^6.0.2" + which "^1.3.1" + +globby@^11.0.4: + version "11.0.4" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" + integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.1.1" + ignore "^5.1.4" + merge2 "^1.3.0" + slash "^3.0.0" + +globjoin@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" + integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM= + +hard-rejection@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" + integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +hosted-git-info@^2.1.4: + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== + +hosted-git-info@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" + integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + dependencies: + lru-cache "^6.0.0" + +html-tags@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" + integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg== + +htmlparser2@^7.1.2: + version "7.2.0" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-7.2.0.tgz#8817cdea38bbc324392a90b1990908e81a65f5a5" + integrity sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.2.2" + domutils "^2.8.0" + entities "^3.0.1" + +ignore@^5.1.4, ignore@^5.1.9: + version "5.1.9" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" + integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ== + +import-fresh@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +import-lazy@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" + integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@^1.3.5: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-core-module@^2.2.0, is-core-module@^2.5.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== + dependencies: + has "^1.0.3" + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-glob@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-plain-obj@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= + +is-plain-object@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" + integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== + +is-regexp@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d" + integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA== + +is-typedarray@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + +kind-of@^6.0.2, kind-of@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +known-css-properties@^0.23.0: + version "0.23.0" + resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.23.0.tgz#e643e1bab2b1f8ba292eea9557121cc02e9846a0" + integrity sha512-h9ivI88e1lFNmTT4HovBN33Ysn0OIJG7IPG2mkpx2uniQXFWqo35QdiX7w0TovlUFXfW8aPFblP5/q0jlOr2sA== + +lines-and-columns@^1.1.6: + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + +lodash@^4.17.15: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +map-obj@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= + +map-obj@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" + integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== + +mathml-tag-names@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" + integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== + +meow@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364" + integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ== + dependencies: + "@types/minimist" "^1.2.0" + camelcase-keys "^6.2.2" + decamelize "^1.2.0" + decamelize-keys "^1.1.0" + hard-rejection "^2.1.0" + minimist-options "4.1.0" + normalize-package-data "^3.0.0" + read-pkg-up "^7.0.1" + redent "^3.0.0" + trim-newlines "^3.0.0" + type-fest "^0.18.0" + yargs-parser "^20.2.3" + +merge2@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +micromatch@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + dependencies: + braces "^3.0.1" + picomatch "^2.2.3" + +min-indent@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" + integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist-options@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" + integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A== + dependencies: + arrify "^1.0.1" + is-plain-obj "^1.1.0" + kind-of "^6.0.3" + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +nanoid@^3.1.30: + version "3.1.30" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" + integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ== + +normalize-package-data@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-package-data@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" + integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== + dependencies: + hosted-git-info "^4.0.1" + is-core-module "^2.5.0" + semver "^7.3.4" + validate-npm-package-license "^3.0.1" + +normalize-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +normalize-selector@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03" + integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM= + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-json@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-parse@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== + +picomatch@^2.2.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + +postcss-html@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-1.3.0.tgz#5b28b44a9cc8351cdba6ae1f26017c2303bd7642" + integrity sha512-ewbwd7OGW4dLsErtvZH9HpVMEcXnlhYSzKsr7MepGlOT8imHTIZ/+pdfEruLS+hTYapLTQAWDnoQcJpsYU4uRw== + dependencies: + htmlparser2 "^7.1.2" + postcss "^8.4.0" + postcss-safe-parser "^6.0.0" + +postcss-media-query-parser@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" + integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ= + +postcss-resolve-nested-selector@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e" + integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4= + +postcss-safe-parser@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1" + integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ== + +postcss-scss@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.2.tgz#39ddcc0ab32f155d5ab328ee91353d67a52d537b" + integrity sha512-xfdkU128CkKKKVAwkyt0M8OdnelJ3MRcIRAPPQkRpoPeuzWY3RIeg7piRCpZ79MK7Q16diLXMMAD9dN5mauPlQ== + +postcss-selector-parser@^6.0.6: + version "6.0.6" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" + integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + +postcss-value-parser@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" + integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== + +postcss@^8.3.11, postcss@^8.4.0, postcss@^8.4.4: + version "8.4.4" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.4.tgz#d53d4ec6a75fd62557a66bb41978bf47ff0c2869" + integrity sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q== + dependencies: + nanoid "^3.1.30" + picocolors "^1.0.0" + source-map-js "^1.0.1" + +prettier-linter-helpers@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" + integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== + dependencies: + fast-diff "^1.1.2" + +prettier@2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.0.tgz#a6370e2d4594e093270419d9cc47f7670488f893" + integrity sha512-FM/zAKgWTxj40rH03VxzIPdXmj39SwSjwG0heUcNFwI+EMZJnY93yAiKXM3dObIKAM5TA88werc8T/EwhB45eg== + +punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + +quick-lru@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" + integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== + +read-pkg-up@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" + integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== + dependencies: + find-up "^4.1.0" + read-pkg "^5.2.0" + type-fest "^0.8.1" + +read-pkg@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" + integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== + dependencies: + "@types/normalize-package-data" "^2.4.0" + normalize-package-data "^2.5.0" + parse-json "^5.0.0" + type-fest "^0.6.0" + +redent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" + integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== + dependencies: + indent-string "^4.0.0" + strip-indent "^3.0.0" + +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + +resolve@^1.10.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + +"semver@2 || 3 || 4 || 5": + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^7.3.4: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +signal-exit@^3.0.2: + version "3.0.6" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + +source-map-js@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" + integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA== + +spdx-correct@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" + integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== + +spdx-expression-parse@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.11" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95" + integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g== + +specificity@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019" + integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg== + +string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-indent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" + integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== + dependencies: + min-indent "^1.0.0" + +style-search@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" + integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI= + +stylelint-config-prettier@^9.0.3: + version "9.0.3" + resolved "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-9.0.3.tgz#0dccebeff359dcc393c9229184408b08964d561c" + integrity sha512-5n9gUDp/n5tTMCq1GLqSpA30w2sqWITSSEiAWQlpxkKGAUbjcemQ0nbkRvRUa0B1LgD3+hCvdL7B1eTxy1QHJg== + +stylelint-config-recommended-scss@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz#193f483861c76a36ece24c52eb6baca4838f4a48" + integrity sha512-b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg== + dependencies: + postcss-scss "^4.0.2" + stylelint-config-recommended "^6.0.0" + stylelint-scss "^4.0.0" + +stylelint-config-recommended@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz#fd2523a322836005ad9bf473d3e5534719c09f9d" + integrity sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw== + +stylelint-config-standard-scss@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-3.0.0.tgz#dafc4fa5538d0ed833bf0a7d391e075683ffd96c" + integrity sha512-zt3ZbzIbllN1iCmc94e4pDxqpkzeR6CJo5DDXzltshuXr+82B8ylHyMMARNnUYrZH80B7wgY7UkKTYCFM0UUyw== + dependencies: + stylelint-config-recommended-scss "^5.0.2" + stylelint-config-standard "^24.0.0" + +stylelint-config-standard@^24.0.0: + version "24.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-24.0.0.tgz#6823f207ab997ae0b641f9a636d007cc44d77541" + integrity sha512-+RtU7fbNT+VlNbdXJvnjc3USNPZRiRVp/d2DxOF/vBDDTi0kH5RX2Ny6errdtZJH3boO+bmqIYEllEmok4jiuw== + dependencies: + stylelint-config-recommended "^6.0.0" + +stylelint-prettier@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/stylelint-prettier/-/stylelint-prettier-2.0.0.tgz#ead781aea522379f2ffa2d136bafdfc451d699a5" + integrity sha512-jvT3G+9lopkeB0ARmDPszyfaOnvnIF+30QCjZxyt7E6fynI1T9mOKgYDNb9bXX17M7PXMZaX3j/26wqakjp1tw== + dependencies: + prettier-linter-helpers "^1.0.0" + +stylelint-scss@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.0.0.tgz#4901ced92b9c68e37649799a39defbd5f2ac5bcd" + integrity sha512-lIRhPqtI6I065EJ6aI4mWKsmQt8Krnu6aF9XSL9s8Nd2f/cDKImST0T9TfjnUul3ReKYWozkG9dlpNTZH2FB9w== + dependencies: + lodash "^4.17.15" + postcss-media-query-parser "^0.2.3" + postcss-resolve-nested-selector "^0.1.1" + postcss-selector-parser "^6.0.6" + postcss-value-parser "^4.1.0" + +stylelint@^14.1.0: + version "14.1.0" + resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.1.0.tgz#8cefb64df6158b30f678c2d93a7052e2c1d8235b" + integrity sha512-IedkssuNVA11+v++2PIV2OHOU5A3SfRcXVi56vZVSsMhGrgtwmmit69jeM+08/Tun5DTBe7BuH1Zp1mMLmtKLA== + dependencies: + balanced-match "^2.0.0" + cosmiconfig "^7.0.1" + debug "^4.3.2" + execall "^2.0.0" + fast-glob "^3.2.7" + fastest-levenshtein "^1.0.12" + file-entry-cache "^6.0.1" + get-stdin "^8.0.0" + global-modules "^2.0.0" + globby "^11.0.4" + globjoin "^0.1.4" + html-tags "^3.1.0" + ignore "^5.1.9" + import-lazy "^4.0.0" + imurmurhash "^0.1.4" + is-plain-object "^5.0.0" + known-css-properties "^0.23.0" + mathml-tag-names "^2.1.3" + meow "^9.0.0" + micromatch "^4.0.4" + normalize-path "^3.0.0" + normalize-selector "^0.2.0" + picocolors "^1.0.0" + postcss "^8.3.11" + postcss-media-query-parser "^0.2.3" + postcss-resolve-nested-selector "^0.1.1" + postcss-safe-parser "^6.0.0" + postcss-selector-parser "^6.0.6" + postcss-value-parser "^4.1.0" + resolve-from "^5.0.0" + specificity "^0.4.1" + string-width "^4.2.3" + strip-ansi "^6.0.1" + style-search "^0.1.0" + svg-tags "^1.0.0" + table "^6.7.3" + v8-compile-cache "^2.3.0" + write-file-atomic "^3.0.3" + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +svg-tags@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" + integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q= + +table@^6.7.3: + version "6.7.5" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.5.tgz#f04478c351ef3d8c7904f0e8be90a1b62417d238" + integrity sha512-LFNeryOqiQHqCVKzhkymKwt6ozeRhlm8IL1mE8rNUurkir4heF6PzMyRgaTa4tlyPTGGgXuvVOF/OLWiH09Lqw== + dependencies: + ajv "^8.0.1" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +trim-newlines@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" + integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== + +type-fest@^0.18.0: + version "0.18.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" + integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw== + +type-fest@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" + integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== + +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +util-deprecate@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +v8-compile-cache@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + +which@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +write-file-atomic@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yaml@^1.10.0: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + +yargs-parser@^20.2.3: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== diff --git a/pkgs/applications/networking/misc/zammad/yarn.nix b/pkgs/applications/networking/misc/zammad/yarn.nix new file mode 100644 index 000000000000..2b17084486f1 --- /dev/null +++ b/pkgs/applications/networking/misc/zammad/yarn.nix @@ -0,0 +1,1549 @@ +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_babel_code_frame___code_frame_7.16.0.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz"; + sha512 = "IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA=="; + }; + } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; + sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; + }; + } + { + name = "_babel_highlight___highlight_7.16.0.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz"; + sha512 = "t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g=="; + }; + } + { + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; + path = fetchurl { + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; + }; + } + { + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; + }; + } + { + name = "_types_minimist___minimist_1.2.2.tgz"; + path = fetchurl { + name = "_types_minimist___minimist_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz"; + sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; + }; + } + { + name = "_types_normalize_package_data___normalize_package_data_2.4.1.tgz"; + path = fetchurl { + name = "_types_normalize_package_data___normalize_package_data_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"; + sha512 = "Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="; + }; + } + { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; + }; + } + { + name = "ajv___ajv_8.8.2.tgz"; + path = fetchurl { + name = "ajv___ajv_8.8.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz"; + sha512 = "x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw=="; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + } + { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; + }; + } + { + name = "array_union___array_union_2.1.0.tgz"; + path = fetchurl { + name = "array_union___array_union_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; + }; + } + { + name = "arrify___arrify_1.0.1.tgz"; + path = fetchurl { + name = "arrify___arrify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz"; + sha1 = "iYUI2iIm84DfkEcoRWhJwVAaSw0="; + }; + } + { + name = "astral_regex___astral_regex_2.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; + }; + } + { + name = "balanced_match___balanced_match_1.0.2.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; + }; + } + { + name = "balanced_match___balanced_match_2.0.0.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz"; + sha512 = "1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA=="; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + } + { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + } + { + name = "callsites___callsites_3.1.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + } + { + name = "camelcase_keys___camelcase_keys_6.2.2.tgz"; + path = fetchurl { + name = "camelcase_keys___camelcase_keys_6.2.2.tgz"; + url = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz"; + sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; + }; + } + { + name = "camelcase___camelcase_5.3.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + } + { + name = "clone_regexp___clone_regexp_2.2.0.tgz"; + path = fetchurl { + name = "clone_regexp___clone_regexp_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz"; + sha512 = "beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q=="; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; + }; + } + { + name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; + sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; + }; + } + { + name = "cssesc___cssesc_3.0.0.tgz"; + path = fetchurl { + name = "cssesc___cssesc_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz"; + sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; + }; + } + { + name = "debug___debug_4.3.3.tgz"; + path = fetchurl { + name = "debug___debug_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; + }; + } + { + name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; + path = fetchurl { + name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; + sha1 = "0XGoeTMlKAfrPLYdwcFEXQeN8tk="; + }; + } + { + name = "decamelize___decamelize_1.2.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "9lNNFRSCabIDUue+4m9QH5oZEpA="; + }; + } + { + name = "dir_glob___dir_glob_3.0.1.tgz"; + path = fetchurl { + name = "dir_glob___dir_glob_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; + }; + } + { + name = "dom_serializer___dom_serializer_1.3.2.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz"; + sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; + }; + } + { + name = "domelementtype___domelementtype_2.2.0.tgz"; + path = fetchurl { + name = "domelementtype___domelementtype_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz"; + sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; + }; + } + { + name = "domhandler___domhandler_4.3.0.tgz"; + path = fetchurl { + name = "domhandler___domhandler_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz"; + sha512 = "fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g=="; + }; + } + { + name = "domutils___domutils_2.8.0.tgz"; + path = fetchurl { + name = "domutils___domutils_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz"; + sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + } + { + name = "entities___entities_2.2.0.tgz"; + path = fetchurl { + name = "entities___entities_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; + }; + } + { + name = "entities___entities_3.0.1.tgz"; + path = fetchurl { + name = "entities___entities_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz"; + sha512 = "WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; + }; + } + { + name = "execall___execall_2.0.0.tgz"; + path = fetchurl { + name = "execall___execall_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz"; + sha512 = "0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow=="; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; + }; + } + { + name = "fast_diff___fast_diff_1.2.0.tgz"; + path = fetchurl { + name = "fast_diff___fast_diff_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz"; + sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; + }; + } + { + name = "fast_glob___fast_glob_3.2.7.tgz"; + path = fetchurl { + name = "fast_glob___fast_glob_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz"; + sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; + }; + } + { + name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; + path = fetchurl { + name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; + url = "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"; + sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; + }; + } + { + name = "fastq___fastq_1.13.0.tgz"; + path = fetchurl { + name = "fastq___fastq_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz"; + sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; + }; + } + { + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; + }; + } + { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; + }; + } + { + name = "flat_cache___flat_cache_3.0.4.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; + }; + } + { + name = "flatted___flatted_3.2.4.tgz"; + path = fetchurl { + name = "flatted___flatted_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz"; + sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; + }; + } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + } + { + name = "get_stdin___get_stdin_8.0.0.tgz"; + path = fetchurl { + name = "get_stdin___get_stdin_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz"; + sha512 = "sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg=="; + }; + } + { + name = "glob_parent___glob_parent_5.1.2.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; + }; + } + { + name = "glob___glob_7.2.0.tgz"; + path = fetchurl { + name = "glob___glob_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; + }; + } + { + name = "global_modules___global_modules_2.0.0.tgz"; + path = fetchurl { + name = "global_modules___global_modules_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; + sha512 = "NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A=="; + }; + } + { + name = "global_prefix___global_prefix_3.0.0.tgz"; + path = fetchurl { + name = "global_prefix___global_prefix_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz"; + sha512 = "awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg=="; + }; + } + { + name = "globby___globby_11.0.4.tgz"; + path = fetchurl { + name = "globby___globby_11.0.4.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz"; + sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; + }; + } + { + name = "globjoin___globjoin_0.1.4.tgz"; + path = fetchurl { + name = "globjoin___globjoin_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz"; + sha1 = "L0SUrIkZ43Z8XLtpHp9GMyQoXUM="; + }; + } + { + name = "hard_rejection___hard_rejection_2.1.0.tgz"; + path = fetchurl { + name = "hard_rejection___hard_rejection_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz"; + sha512 = "VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA=="; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + } + { + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; + }; + } + { + name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; + sha512 = "c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg=="; + }; + } + { + name = "html_tags___html_tags_3.1.0.tgz"; + path = fetchurl { + name = "html_tags___html_tags_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz"; + sha512 = "1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg=="; + }; + } + { + name = "htmlparser2___htmlparser2_7.2.0.tgz"; + path = fetchurl { + name = "htmlparser2___htmlparser2_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-7.2.0.tgz"; + sha512 = "H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog=="; + }; + } + { + name = "ignore___ignore_5.1.9.tgz"; + path = fetchurl { + name = "ignore___ignore_5.1.9.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz"; + sha512 = "2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ=="; + }; + } + { + name = "import_fresh___import_fresh_3.3.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; + }; + } + { + name = "import_lazy___import_lazy_4.0.0.tgz"; + path = fetchurl { + name = "import_lazy___import_lazy_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz"; + sha512 = "rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw=="; + }; + } + { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; + }; + } + { + name = "indent_string___indent_string_4.0.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + } + { + name = "ini___ini_1.3.8.tgz"; + path = fetchurl { + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; + }; + } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "d8mYQFJ6qOyxqLppe4BkWnqSap0="; + }; + } + { + name = "is_core_module___is_core_module_2.8.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz"; + sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="; + }; + } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "qIwCU1eR8C7TfHahueqXc8gz+MI="; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + } + { + name = "is_glob___is_glob_4.0.3.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz"; + sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; + }; + } + { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + } + { + name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "caUMhCnfync8kqOQpKA7OfzVHT4="; + }; + } + { + name = "is_plain_object___is_plain_object_5.0.0.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; + }; + } + { + name = "is_regexp___is_regexp_2.1.0.tgz"; + path = fetchurl { + name = "is_regexp___is_regexp_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz"; + sha512 = "OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA=="; + }; + } + { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + path = fetchurl { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "5HnICFjfDBsR3dppQPlgEfzaSpo="; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; + }; + } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; + }; + } + { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; + }; + } + { + name = "kind_of___kind_of_6.0.3.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; + }; + } + { + name = "known_css_properties___known_css_properties_0.23.0.tgz"; + path = fetchurl { + name = "known_css_properties___known_css_properties_0.23.0.tgz"; + url = "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.23.0.tgz"; + sha512 = "h9ivI88e1lFNmTT4HovBN33Ysn0OIJG7IPG2mkpx2uniQXFWqo35QdiX7w0TovlUFXfW8aPFblP5/q0jlOr2sA=="; + }; + } + { + name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; + sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; + }; + } + { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; + }; + } + { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "WjUNoLERO4N+z//VgSy+WNbq4ZM="; + }; + } + { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + } + { + name = "map_obj___map_obj_1.0.1.tgz"; + path = fetchurl { + name = "map_obj___map_obj_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "2TPOuSBdgr3PSIb2dCvcK03qFG0="; + }; + } + { + name = "map_obj___map_obj_4.3.0.tgz"; + path = fetchurl { + name = "map_obj___map_obj_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz"; + sha512 = "hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="; + }; + } + { + name = "mathml_tag_names___mathml_tag_names_2.1.3.tgz"; + path = fetchurl { + name = "mathml_tag_names___mathml_tag_names_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz"; + sha512 = "APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg=="; + }; + } + { + name = "meow___meow_9.0.0.tgz"; + path = fetchurl { + name = "meow___meow_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz"; + sha512 = "+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ=="; + }; + } + { + name = "merge2___merge2_1.4.1.tgz"; + path = fetchurl { + name = "merge2___merge2_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; + }; + } + { + name = "micromatch___micromatch_4.0.4.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; + sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; + }; + } + { + name = "min_indent___min_indent_1.0.1.tgz"; + path = fetchurl { + name = "min_indent___min_indent_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz"; + sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + } + { + name = "minimist_options___minimist_options_4.1.0.tgz"; + path = fetchurl { + name = "minimist_options___minimist_options_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz"; + sha512 = "Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A=="; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + } + { + name = "nanoid___nanoid_3.1.30.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.1.30.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz"; + sha512 = "zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ=="; + }; + } + { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; + }; + } + { + name = "normalize_package_data___normalize_package_data_3.0.3.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz"; + sha512 = "p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="; + }; + } + { + name = "normalize_path___normalize_path_3.0.0.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + } + { + name = "normalize_selector___normalize_selector_0.2.0.tgz"; + path = fetchurl { + name = "normalize_selector___normalize_selector_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz"; + sha1 = "0LFF62kRicY6eNIB3E/bEpPvDAM="; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; + }; + } + { + name = "p_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; + }; + } + { + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; + }; + } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + } + { + name = "parse_json___parse_json_5.2.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; + }; + } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; + }; + } + { + name = "path_parse___path_parse_1.0.7.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; + }; + } + { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; + }; + } + { + name = "picocolors___picocolors_1.0.0.tgz"; + path = fetchurl { + name = "picocolors___picocolors_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz"; + sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; + }; + } + { + name = "picomatch___picomatch_2.3.0.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; + sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; + }; + } + { + name = "postcss_html___postcss_html_1.3.0.tgz"; + path = fetchurl { + name = "postcss_html___postcss_html_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-html/-/postcss-html-1.3.0.tgz"; + sha512 = "ewbwd7OGW4dLsErtvZH9HpVMEcXnlhYSzKsr7MepGlOT8imHTIZ/+pdfEruLS+hTYapLTQAWDnoQcJpsYU4uRw=="; + }; + } + { + name = "postcss_media_query_parser___postcss_media_query_parser_0.2.3.tgz"; + path = fetchurl { + name = "postcss_media_query_parser___postcss_media_query_parser_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz"; + sha1 = "J7Ocb02U+Bsac7j3Y1HGCeXO8kQ="; + }; + } + { + name = "postcss_resolve_nested_selector___postcss_resolve_nested_selector_0.1.1.tgz"; + path = fetchurl { + name = "postcss_resolve_nested_selector___postcss_resolve_nested_selector_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz"; + sha1 = "Kcy8fDfe36wwTp//C/FZaz9qDk4="; + }; + } + { + name = "postcss_safe_parser___postcss_safe_parser_6.0.0.tgz"; + path = fetchurl { + name = "postcss_safe_parser___postcss_safe_parser_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz"; + sha512 = "FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ=="; + }; + } + { + name = "postcss_scss___postcss_scss_4.0.2.tgz"; + path = fetchurl { + name = "postcss_scss___postcss_scss_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.2.tgz"; + sha512 = "xfdkU128CkKKKVAwkyt0M8OdnelJ3MRcIRAPPQkRpoPeuzWY3RIeg7piRCpZ79MK7Q16diLXMMAD9dN5mauPlQ=="; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; + sha512 = "9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg=="; + }; + } + { + name = "postcss_value_parser___postcss_value_parser_4.2.0.tgz"; + path = fetchurl { + name = "postcss_value_parser___postcss_value_parser_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"; + sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; + }; + } + { + name = "postcss___postcss_8.4.4.tgz"; + path = fetchurl { + name = "postcss___postcss_8.4.4.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.4.4.tgz"; + sha512 = "joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q=="; + }; + } + { + name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; + path = fetchurl { + name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; + sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; + }; + } + { + name = "prettier___prettier_2.5.0.tgz"; + path = fetchurl { + name = "prettier___prettier_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.5.0.tgz"; + sha512 = "FM/zAKgWTxj40rH03VxzIPdXmj39SwSjwG0heUcNFwI+EMZJnY93yAiKXM3dObIKAM5TA88werc8T/EwhB45eg=="; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + } + { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + path = fetchurl { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; + }; + } + { + name = "quick_lru___quick_lru_4.0.1.tgz"; + path = fetchurl { + name = "quick_lru___quick_lru_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz"; + sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; + }; + } + { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; + }; + } + { + name = "read_pkg___read_pkg_5.2.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; + sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; + }; + } + { + name = "redent___redent_3.0.0.tgz"; + path = fetchurl { + name = "redent___redent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz"; + sha512 = "6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg=="; + }; + } + { + name = "require_from_string___require_from_string_2.0.2.tgz"; + path = fetchurl { + name = "require_from_string___require_from_string_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; + sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; + }; + } + { + name = "resolve_from___resolve_from_5.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; + sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; + }; + } + { + name = "resolve___resolve_1.20.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; + sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + }; + } + { + name = "reusify___reusify_1.0.4.tgz"; + path = fetchurl { + name = "reusify___reusify_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + } + { + name = "run_parallel___run_parallel_1.2.0.tgz"; + path = fetchurl { + name = "run_parallel___run_parallel_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + } + { + name = "semver___semver_7.3.5.tgz"; + path = fetchurl { + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + }; + } + { + name = "signal_exit___signal_exit_3.0.6.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz"; + sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; + }; + } + { + name = "slash___slash_3.0.0.tgz"; + path = fetchurl { + name = "slash___slash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; + }; + } + { + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; + }; + } + { + name = "source_map_js___source_map_js_1.0.1.tgz"; + path = fetchurl { + name = "source_map_js___source_map_js_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.1.tgz"; + sha512 = "4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA=="; + }; + } + { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + path = fetchurl { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; + }; + } + { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + path = fetchurl { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; + }; + } + { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + path = fetchurl { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; + }; + } + { + name = "spdx_license_ids___spdx_license_ids_3.0.11.tgz"; + path = fetchurl { + name = "spdx_license_ids___spdx_license_ids_3.0.11.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"; + sha512 = "Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="; + }; + } + { + name = "specificity___specificity_0.4.1.tgz"; + path = fetchurl { + name = "specificity___specificity_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz"; + sha512 = "1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg=="; + }; + } + { + name = "string_width___string_width_4.2.3.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; + }; + } + { + name = "strip_indent___strip_indent_3.0.0.tgz"; + path = fetchurl { + name = "strip_indent___strip_indent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz"; + sha512 = "laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ=="; + }; + } + { + name = "style_search___style_search_0.1.0.tgz"; + path = fetchurl { + name = "style_search___style_search_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz"; + sha1 = "eVjHk+R+MuB9K1yv5cC/jhLneQI="; + }; + } + { + name = "stylelint_config_prettier___stylelint_config_prettier_9.0.3.tgz"; + path = fetchurl { + name = "stylelint_config_prettier___stylelint_config_prettier_9.0.3.tgz"; + url = "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-9.0.3.tgz"; + sha512 = "5n9gUDp/n5tTMCq1GLqSpA30w2sqWITSSEiAWQlpxkKGAUbjcemQ0nbkRvRUa0B1LgD3+hCvdL7B1eTxy1QHJg=="; + }; + } + { + name = "stylelint_config_recommended_scss___stylelint_config_recommended_scss_5.0.2.tgz"; + path = fetchurl { + name = "stylelint_config_recommended_scss___stylelint_config_recommended_scss_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz"; + sha512 = "b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg=="; + }; + } + { + name = "stylelint_config_recommended___stylelint_config_recommended_6.0.0.tgz"; + path = fetchurl { + name = "stylelint_config_recommended___stylelint_config_recommended_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz"; + sha512 = "ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw=="; + }; + } + { + name = "stylelint_config_standard_scss___stylelint_config_standard_scss_3.0.0.tgz"; + path = fetchurl { + name = "stylelint_config_standard_scss___stylelint_config_standard_scss_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-3.0.0.tgz"; + sha512 = "zt3ZbzIbllN1iCmc94e4pDxqpkzeR6CJo5DDXzltshuXr+82B8ylHyMMARNnUYrZH80B7wgY7UkKTYCFM0UUyw=="; + }; + } + { + name = "stylelint_config_standard___stylelint_config_standard_24.0.0.tgz"; + path = fetchurl { + name = "stylelint_config_standard___stylelint_config_standard_24.0.0.tgz"; + url = "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-24.0.0.tgz"; + sha512 = "+RtU7fbNT+VlNbdXJvnjc3USNPZRiRVp/d2DxOF/vBDDTi0kH5RX2Ny6errdtZJH3boO+bmqIYEllEmok4jiuw=="; + }; + } + { + name = "stylelint_prettier___stylelint_prettier_2.0.0.tgz"; + path = fetchurl { + name = "stylelint_prettier___stylelint_prettier_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/stylelint-prettier/-/stylelint-prettier-2.0.0.tgz"; + sha512 = "jvT3G+9lopkeB0ARmDPszyfaOnvnIF+30QCjZxyt7E6fynI1T9mOKgYDNb9bXX17M7PXMZaX3j/26wqakjp1tw=="; + }; + } + { + name = "stylelint_scss___stylelint_scss_4.0.0.tgz"; + path = fetchurl { + name = "stylelint_scss___stylelint_scss_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.0.0.tgz"; + sha512 = "lIRhPqtI6I065EJ6aI4mWKsmQt8Krnu6aF9XSL9s8Nd2f/cDKImST0T9TfjnUul3ReKYWozkG9dlpNTZH2FB9w=="; + }; + } + { + name = "stylelint___stylelint_14.1.0.tgz"; + path = fetchurl { + name = "stylelint___stylelint_14.1.0.tgz"; + url = "https://registry.yarnpkg.com/stylelint/-/stylelint-14.1.0.tgz"; + sha512 = "IedkssuNVA11+v++2PIV2OHOU5A3SfRcXVi56vZVSsMhGrgtwmmit69jeM+08/Tun5DTBe7BuH1Zp1mMLmtKLA=="; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + } + { + name = "svg_tags___svg_tags_1.0.0.tgz"; + path = fetchurl { + name = "svg_tags___svg_tags_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz"; + sha1 = "WPcc7jvVGbWdSyqEO2x95krAR2Q="; + }; + } + { + name = "table___table_6.7.5.tgz"; + path = fetchurl { + name = "table___table_6.7.5.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.5.tgz"; + sha512 = "LFNeryOqiQHqCVKzhkymKwt6ozeRhlm8IL1mE8rNUurkir4heF6PzMyRgaTa4tlyPTGGgXuvVOF/OLWiH09Lqw=="; + }; + } + { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + } + { + name = "trim_newlines___trim_newlines_3.0.1.tgz"; + path = fetchurl { + name = "trim_newlines___trim_newlines_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz"; + sha512 = "c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="; + }; + } + { + name = "type_fest___type_fest_0.18.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz"; + sha512 = "OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw=="; + }; + } + { + name = "type_fest___type_fest_0.6.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; + sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="; + }; + } + { + name = "type_fest___type_fest_0.8.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; + }; + } + { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + path = fetchurl { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; + }; + } + { + name = "uri_js___uri_js_4.4.1.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; + }; + } + { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; + }; + } + { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + path = fetchurl { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; + }; + } + { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; + sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + }; + } + { + name = "yaml___yaml_1.10.2.tgz"; + path = fetchurl { + name = "yaml___yaml_1.10.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz"; + sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; + }; + } + ]; +} diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index fd08817f026d..cf22d8804068 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchurl, dpkg , alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype -, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, mesa +, gdk-pixbuf, glib, pango, nspr, nss, gtk3, mesa , xorg, autoPatchelfHook, systemd, libnotify, libappindicator +, makeWrapper }: let deps = [ @@ -15,7 +16,6 @@ let deps = [ freetype gdk-pixbuf glib - gnome2.GConf pango gtk3 libappindicator @@ -43,16 +43,17 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2021.6"; + version = "2022.1"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "0vpahryw4hm1k9p4vang84ji88znz67s7wxnwqndf02a627n7fcm"; + sha256 = "0s12y9j75k59kqkcvfflb1v5p3ny7xgc1m5bd635lvql1bv46c3i"; }; nativeBuildInputs = [ autoPatchelfHook dpkg + makeWrapper ]; buildInputs = deps; @@ -73,12 +74,14 @@ stdenv.mkDerivation rec { mv usr/bin/* $out/bin mv opt/Mullvad\ VPN/* $out/share/mullvad - sed -i 's|"\/opt\/Mullvad.*VPN|env MULLVAD_DISABLE_UPDATE_NOTIFICATION=1 "'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop - ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/ ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon ln -sf $out/share/mullvad/resources/mullvad-problem-report $out/bin/mullvad-problem-report + wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 + + sed -i "s|Exec.*$|Exec=$out/bin/mullvad-vpn $U|" $out/share/applications/mullvad-vpn.desktop + runHook postInstall ''; diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index c7500d903288..fefa884c2a62 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,62 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, qt5 +{ lib, stdenv, fetchFromGitHub, pkg-config, qt5, cmake , avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsa-lib, python3 , rnnoise -, jackSupport ? false, libjack2 -, speechdSupport ? false, speechd -, pulseSupport ? false, libpulseaudio -, iceSupport ? false, zeroc-ice -, grpcSupport ? false, grpc, which , nixosTests +, poco +, flac +, libogg +, libvorbis +, grpcSupport ? false, grpc, which +, iceSupport ? true, zeroc-ice +, jackSupport ? false, libjack2 +, pipewireSupport ? true, pipewire +, pulseSupport ? true, libpulseaudio +, speechdSupport ? false, speechd }: let - generic = overrides: source: qt5.mkDerivation (source // overrides // { + generic = overrides: source: stdenv.mkDerivation (source // overrides // { pname = overrides.type; version = source.version; - patches = (source.patches or []) - ++ [ ./fix-rnnoise-argument.patch ]; - - nativeBuildInputs = [ pkg-config python3 qt5.qmake ] + nativeBuildInputs = [ cmake pkg-config python3 qt5.wrapQtAppsHook qt5.qttools ] ++ (overrides.nativeBuildInputs or [ ]); - buildInputs = [ boost protobuf avahi ] + buildInputs = [ avahi boost poco protobuf ] ++ (overrides.buildInputs or [ ]); - qmakeFlags = [ - "CONFIG+=c++11" - "CONFIG+=shared" - "CONFIG+=no-g15" - "CONFIG+=packaged" - "CONFIG+=no-update" - "CONFIG+=no-embed-qt-translations" - "CONFIG+=bundled-celt" - "CONFIG+=no-bundled-opus" - "CONFIG+=no-bundled-speex" - "DEFINES+=PLUGIN_PATH=${placeholder "out"}/lib/mumble" - ] ++ lib.optional (!speechdSupport) "CONFIG+=no-speechd" - ++ lib.optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" - ++ (overrides.configureFlags or [ ]); + cmakeFlags = [ + "-D g15=OFF" + ] ++ (overrides.configureFlags or [ ]); preConfigure = '' patchShebangs scripts ''; - makeFlags = [ "release" ]; - - installPhase = '' - runHook preInstall - - ${overrides.installPhase} - - # doc stuff - mkdir -p $out/share/man/man1 - install -Dm644 man/mum* $out/share/man/man1/ - - runHook postInstall - ''; - passthru.tests.connectivity = nixosTests.mumble; meta = with lib; { @@ -72,66 +49,63 @@ let type = "mumble"; nativeBuildInputs = [ qt5.qttools ]; - buildInputs = [ libopus libsndfile speex qt5.qtsvg rnnoise ] - ++ lib.optional stdenv.isLinux alsa-lib + buildInputs = [ flac libogg libopus libsndfile libvorbis qt5.qtsvg rnnoise speex ] + ++ lib.optional (!jackSupport) alsa-lib ++ lib.optional jackSupport libjack2 ++ lib.optional speechdSupport speechd - ++ lib.optional pulseSupport libpulseaudio; + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional pipewireSupport pipewire; configureFlags = [ - "CONFIG+=no-server" - ]; + "-D server=OFF" + "-D bundled-celt=ON" + "-D bundled-opus=OFF" + "-D bundled-speex=OFF" + "-D bundled-rnnoise=OFF" + "-D bundle-qt-translations=OFF" + "-D update=OFF" + "-D overlay-xcompile=OFF" + "-D oss=OFF" + ] ++ lib.optional (!speechdSupport) "-D speechd=OFF" + ++ lib.optional (!pulseSupport) "-D pulseaudio=OFF" + ++ lib.optional (!pipewireSupport) "-D pipewire=OFF" + ++ lib.optional jackSupport "-D alsa=OFF -D jackaudio=ON"; NIX_CFLAGS_COMPILE = lib.optional speechdSupport "-I${speechd}/include/speech-dispatcher"; - installPhase = '' - # bin stuff - install -Dm755 release/mumble $out/bin/mumble - install -Dm755 scripts/mumble-overlay $out/bin/mumble-overlay - - # lib stuff - mkdir -p $out/lib/mumble - cp -P release/libmumble.so* $out/lib - cp -P release/libcelt* $out/lib/mumble - cp -P release/plugins/* $out/lib/mumble - - # icons - install -Dm644 scripts/mumble.desktop $out/share/applications/mumble.desktop - install -Dm644 icons/mumble.svg $out/share/icons/hicolor/scalable/apps/mumble.svg + postFixup = '' + wrapProgram $out/bin/mumble \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optional pulseSupport libpulseaudio ++ lib.optional pipewireSupport pipewire)}" ''; } source; server = source: generic { type = "murmur"; - postPatch = lib.optionalString iceSupport '' - grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc-ice.dev}/share/ice/,g' - ''; - configureFlags = [ - "CONFIG+=no-client" - ] ++ lib.optional (!iceSupport) "CONFIG+=no-ice" - ++ lib.optional grpcSupport "CONFIG+=grpc"; + "-D client=OFF" + ] ++ lib.optional (!iceSupport) "-D ice=OFF" + ++ lib.optionals iceSupport [ + "-D Ice_HOME=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}" + "-D CMAKE_PREFIX_PATH=${lib.getDev zeroc-ice};${lib.getLib zeroc-ice}" + "-D Ice_SLICE_DIR=${lib.getDev zeroc-ice}/share/ice/slice" + ] + ++ lib.optional grpcSupport "-D grpc=ON"; buildInputs = [ libcap ] ++ lib.optional iceSupport zeroc-ice ++ lib.optionals grpcSupport [ grpc which ]; - - installPhase = '' - # bin stuff - install -Dm755 release/murmurd $out/bin/murmurd - ''; } source; source = rec { - version = "1.3.4"; + version = "unstable-1.4.231"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; - rev = version; - sha256 = "sha256-njovShQpW0JNeeE8VugdmGzDk3fKG8/fcJoBgdyTZug="; + rev = "9e0e274d6a9d8a9919267e747d05d0500d150560"; + sha256 = "0whvb4nlf7gjf2v7wsaq0ir18mshhw5wi8c9q9qz43wnh42nn2qi"; fetchSubmodules = true; }; }; diff --git a/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch b/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch deleted file mode 100644 index 78e8ed24d58f..000000000000 --- a/pkgs/applications/networking/mumble/fix-rnnoise-argument.patch +++ /dev/null @@ -1,16 +0,0 @@ -nixpkgs has a more recent rnnoise than the one used by mumble, and rnnoise -changed the argument rnnoise_create[1], - -[1] https://github.com/xiph/rnnoise/commit/231b9c02d14a74cb449a98004cb7a2cf1bdeca2f - ---- old/src/mumble/AudioInput.cpp 2020-02-18 22:55:32.000000000 -0500 -+++ new/src/mumble/AudioInput.cpp 2020-02-18 22:58:08.000000000 -0500 -@@ -106,7 +106,7 @@ - #endif - - #ifdef USE_RNNOISE -- denoiseState = rnnoise_create(); -+ denoiseState = rnnoise_create(NULL); - #endif - - qWarning("AudioInput: %d bits/s, %d hz, %d sample", iAudioQuality, iSampleRate, iFrameSize); diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index d882134473b6..72b4c7720480 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -12,9 +12,17 @@ nodePackages.n8n.override { node-pre-gyp ]; + passthru.updateScript = ./generate-dependencies.sh; + meta = with lib; { description = "Free and open fair-code licensed node based Workflow Automation Tool"; maintainers = with maintainers; [ freezeboy k900 ]; - license = licenses.asl20; + license = { + fullName = "Sustainable Use License"; + url = "https://github.com/n8n-io/n8n/blob/master/LICENSE.md"; + free = false; + # only free to redistribute "for non-commercial purposes" + redistributable = false; + }; }; } diff --git a/pkgs/applications/networking/n8n/generate-dependencies.sh b/pkgs/applications/networking/n8n/generate-dependencies.sh index 26926deefb68..f7412bc5e5e2 100755 --- a/pkgs/applications/networking/n8n/generate-dependencies.sh +++ b/pkgs/applications/networking/n8n/generate-dependencies.sh @@ -10,6 +10,7 @@ # -> cpu-features # -> node-gyp@3.8.0 -> python2 # -> cmake +cd "$(dirname $(readlink -f $0))" node2nix \ --14 \ diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index e78448933b19..ab66b28fe17a 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -13,13 +13,13 @@ let sha512 = "G5sjKExiVsbFQo+4YY5MBPOSsh3EUv6XmqjgJaF/VCjckWLGGKPUPGfbCSn6Xal6gzGoPQMOQ+wCCGNCX9NAPg=="; }; }; - "@azure/core-asynciterator-polyfill-1.0.1" = { + "@azure/core-asynciterator-polyfill-1.0.2" = { name = "_at_azure_slash_core-asynciterator-polyfill"; packageName = "@azure/core-asynciterator-polyfill"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.1.tgz"; - sha512 = "TcpFIR+2jS4zPGXMbvA2rRNex+Wapj0wAOC7YJX7Wsk7/dj8TmPntTDjKbQiQa90Dh07brsi3qoqF4R1dfKhIA=="; + url = "https://registry.npmjs.org/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.2.tgz"; + sha512 = "3rkP4LnnlWawl0LZptJOdXNrT/fHp2eQMadoasa6afspXdpGrtPZuAQc2PD0cpgyuoXtUWyC3tv7xfntjGS5Dw=="; }; }; "@azure/core-auth-1.3.2" = { @@ -31,22 +31,22 @@ let sha512 = "7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA=="; }; }; - "@azure/core-http-2.2.3" = { + "@azure/core-http-2.2.4" = { name = "_at_azure_slash_core-http"; packageName = "@azure/core-http"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.3.tgz"; - sha512 = "xr8AeszxP418rI//W38NfJDDr0kbVAPZkURZnZ+Fle+lLWeURjDE5zNIuocA1wUPoKSP8iXc0ApW6nPtbLGswA=="; + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.4.tgz"; + sha512 = "QmmJmexXKtPyc3/rsZR/YTLDvMatzbzAypJmLzvlfxgz/SkgnqV/D4f6F2LsK6tBj1qhyp8BoXiOebiej0zz3A=="; }; }; - "@azure/core-lro-2.2.3" = { + "@azure/core-lro-2.2.4" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.3.tgz"; - sha512 = "UMdlR9NsqDCLTba3EUbRjfMF4gDmWvld196JmUjbz9WWhJ2XT00OR5MXeWiR+vmGT+ETiO4hHFCi2/eGO5YVtg=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.4.tgz"; + sha512 = "e1I2v2CZM0mQo8+RSix0x091Av493e4bnT22ds2fcQGslTHzM2oTbswkB65nP4iEpCxBrFxOSDPKExmTmjCVtQ=="; }; }; "@azure/core-paging-1.2.1" = { @@ -85,13 +85,13 @@ let sha512 = "dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="; }; }; - "@azure/ms-rest-js-2.6.0" = { + "@azure/ms-rest-js-2.6.1" = { name = "_at_azure_slash_ms-rest-js"; packageName = "@azure/ms-rest-js"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.0.tgz"; - sha512 = "4C5FCtvEzWudblB+h92/TYYPiq7tuElX8icVYToxOdggnYqeec4Se14mjse5miInKtZahiFHdl8lZA/jziEc5g=="; + url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.1.tgz"; + sha512 = "LLi4jRe/qy5IM8U2CkoDgSZp2OH+MgDe2wePmhz8uY84Svc53EhHaamVyoU6BjjHBxvCRh1vcD1urJDccrxqIw=="; }; }; "@azure/ms-rest-nodeauth-3.1.1" = { @@ -103,40 +103,49 @@ let sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; }; }; - "@azure/storage-blob-12.8.0" = { + "@azure/storage-blob-12.9.0" = { name = "_at_azure_slash_storage-blob"; packageName = "@azure/storage-blob"; - version = "12.8.0"; + version = "12.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.8.0.tgz"; - sha512 = "c8+Wz19xauW0bGkTCoqZH4dYfbtBniPiGiRQOn1ca6G5jsjr4azwaTk9gwjVY8r3vY2Taf95eivLzipfIfiS4A=="; + url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.9.0.tgz"; + sha512 = "ank38FdCLfJ+EoeMzCz3hkYJuZAd63ARvDKkxZYRDb+beBYf+/+gx8jNTqkq/hfyUl4dJQ/a7tECU0Y0F98CHg=="; }; }; - "@babel/runtime-7.16.7" = { + "@babel/runtime-7.17.8" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.16.7"; + version = "7.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz"; - sha512 = "9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz"; + sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA=="; }; }; - "@dabh/diagnostics-2.0.2" = { + "@colors/colors-1.5.0" = { + name = "_at_colors_slash_colors"; + packageName = "@colors/colors"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"; + sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; + }; + }; + "@dabh/diagnostics-2.0.3" = { name = "_at_dabh_slash_diagnostics"; packageName = "@dabh/diagnostics"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; - sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; + url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz"; + sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; - "@fontsource/open-sans-4.5.2" = { + "@fontsource/open-sans-4.5.8" = { name = "_at_fontsource_slash_open-sans"; packageName = "@fontsource/open-sans"; - version = "4.5.2"; + version = "4.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.2.tgz"; - sha512 = "aDQrW8s0KslG2aKb9nM5R6fiQR9iPomqWXf6iZCC30qv/UFlSY14SppodA3rE//+w37EqsJjyUq3BSEYzLdisg=="; + url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.8.tgz"; + sha512 = "3b94XDdRLqL7OlE7OjWg/4pgG825Juw8PLVEDm6h5pio0gMU89ICxfatGxHsBxMGfqad+wnvdmUweZWlELDFpQ=="; }; }; "@icetee/ftp-0.3.15" = { @@ -220,6 +229,15 @@ let sha512 = "cE3qfHWv8hGRCP31j7fIS7BfCflm/BNZ2HNqHexH+fDrdF2f1D5S8VmXWLC77ffv3oDvWyvE9AZeR0RfmHCCaA=="; }; }; + "@oclif/config-1.18.3" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.18.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.3.tgz"; + sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA=="; + }; + }; "@oclif/errors-1.3.5" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -247,22 +265,22 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.6" = { + "@oclif/parser-3.8.7" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.6"; + version = "3.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.6.tgz"; - sha512 = "tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.7.tgz"; + sha512 = "b11xBmIUK+LuuwVGJpFs4LwQN2xj2cBWj2c4z1FtiXGrJ85h9xV6q+k136Hw0tGg1jQoRXuvuBnqQ7es7vO9/Q=="; }; }; - "@opentelemetry/api-1.0.4" = { + "@opentelemetry/api-1.1.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.4.tgz"; - sha512 = "BuJuXRSJNQ3QoKA6GWWDyuLpOUck+9hAXNMCnrloc1aWVoy6Xq6t9PUV08aBZ4Lutqq2LEHM486bpZqoViScog=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.1.0.tgz"; + sha512 = "hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ=="; }; }; "@rudderstack/rudder-sdk-node-1.0.6" = { @@ -391,13 +409,13 @@ let sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; }; }; - "@types/express-unless-0.5.2" = { + "@types/express-unless-0.5.3" = { name = "_at_types_slash_express-unless"; packageName = "@types/express-unless"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.2.tgz"; - sha512 = "Q74UyYRX/zIgl1HSp9tUX2PlG8glkVm+59r7aK4KGKzC5jqKIOX6rrVLRQrzpZUQ84VukHtRoeAuon2nIssHPQ=="; + url = "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.3.tgz"; + sha512 = "TyPLQaF6w8UlWdv4gj8i46B+INBVzURBNRahCozCSXfsK2VTlL1wNyTlMKw817VHygBtlcl5jfnPadlydr06Yw=="; }; }; "@types/ftp-0.3.33" = { @@ -427,13 +445,13 @@ let sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A=="; }; }; - "@types/lodash-4.14.178" = { + "@types/lodash-4.14.180" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.178"; + version = "4.14.180"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz"; - sha512 = "0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.180.tgz"; + sha512 = "XOKXa1KIxtNXgASAnwj7cnttJxS4fksBRywK/9LzRV5YxrF80BXZIGeQSuoESQ/VkUj30Ae0+YcuHc15wJCB2g=="; }; }; "@types/lossless-json-1.0.1" = { @@ -454,31 +472,31 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/node-12.20.42" = { + "@types/node-12.20.47" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.42"; + version = "12.20.47"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.42.tgz"; - sha512 = "aI3/oo5DzyiI5R/xAhxxRzfZlWlsbbqdgxfTPkqu/Zt+23GXiJvMCyPJT4+xKSXOnLqoL8jJYMLTwvK2M3a5hw=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz"; + sha512 = "BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg=="; }; }; - "@types/node-17.0.10" = { + "@types/node-17.0.23" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.10"; + version = "17.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.10.tgz"; - sha512 = "S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz"; + sha512 = "UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="; }; }; - "@types/node-fetch-2.5.12" = { + "@types/node-fetch-2.6.1" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.5.12"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz"; - sha512 = "MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.1.tgz"; + sha512 = "oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA=="; }; }; "@types/promise-ftp-1.3.4" = { @@ -589,13 +607,13 @@ let sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; }; }; - "accepts-1.3.7" = { + "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; + sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; "access-control-1.0.1" = { @@ -607,6 +625,24 @@ let sha512 = "H5aqjkogmFxfaOrfn/e42vyspHVXuJ8er63KuljJXpOyJ1ZO/U5CrHfO8BLKIy2w7mBM02L5quL0vbfQqrGQbA=="; }; }; + "acorn-8.7.0" = { + name = "acorn"; + packageName = "acorn"; + version = "8.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz"; + sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; + }; + }; + "acorn-walk-8.2.0" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"; + sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; + }; + }; "adal-node-0.2.3" = { name = "adal-node"; packageName = "adal-node"; @@ -634,15 +670,6 @@ let sha512 = "f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g=="; }; }; - "agent-base-4.3.0" = { - name = "agent-base"; - packageName = "agent-base"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz"; - sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg=="; - }; - }; "agent-base-6.0.2" = { name = "agent-base"; packageName = "agent-base"; @@ -940,13 +967,13 @@ let sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A=="; }; }; - "aws-sdk-2.1062.0" = { + "aws-sdk-2.1101.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1062.0"; + version = "2.1101.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1062.0.tgz"; - sha512 = "QIU8jwi7Uqyvw2HjsXXXUZv3V/6TinUzLewrdl2EdvonqZCXhwMgnZx2F9I2x62IKH1RqnINwFWdoK+OTgcAjA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1101.0.tgz"; + sha512 = "7lyVb7GXGl8yyu954Qxf6vU6MrcgFlmKyTLBVXJyo3Phn1OB+qOExA55WtSC6gQiQ7e5TeWOn1RUHLg30ywTBA=="; }; }; "aws-sign2-0.7.0" = { @@ -1138,13 +1165,13 @@ let sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; }; }; - "body-parser-1.19.1" = { + "body-parser-1.19.2" = { name = "body-parser"; packageName = "body-parser"; - version = "1.19.1"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz"; - sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"; + sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; }; }; "body-parser-xml-2.0.3" = { @@ -1282,13 +1309,13 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; - "bytes-3.1.1" = { + "bytes-3.1.2" = { name = "bytes"; packageName = "bytes"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz"; - sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"; + sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; }; "call-bind-1.0.2" = { @@ -1435,6 +1462,15 @@ let sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; + "clamp-1.0.1" = { + name = "clamp"; + packageName = "clamp"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz"; + sha1 = "66a0e64011816e37196828fdc8c8c147312c8634"; + }; + }; "class-validator-0.13.2" = { name = "class-validator"; packageName = "class-validator"; @@ -1597,15 +1633,6 @@ let sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; }; }; - "colors-1.4.0" = { - name = "colors"; - packageName = "colors"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; - sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; - }; - }; "colorspace-1.1.4" = { name = "colorspace"; packageName = "colorspace"; @@ -1741,13 +1768,13 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "convict-6.2.1" = { + "convict-6.2.2" = { name = "convict"; packageName = "convict"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/convict/-/convict-6.2.1.tgz"; - sha512 = "Mn4AJiYkR3TAZH1Xm/RU7gFS/0kM5TBSAQDry8y40Aez0ASY+3boUhv+3QE5XbOXiXM2JjdhkKve3IsBvWCibQ=="; + url = "https://registry.npmjs.org/convict/-/convict-6.2.2.tgz"; + sha512 = "3MsROJiEFN3BAzeFit1t87t7EUFzd44MNd13MLSikV2dsnDl7znwKgtYPPONtnDzxiDW0nBAsxVhSRNrjUrTTg=="; }; }; "cookie-0.4.1" = { @@ -1759,6 +1786,24 @@ let sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; }; + "cookie-0.4.2" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; + sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; + }; + }; + "cookie-parser-1.4.6" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz"; + sha512 = "z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA=="; + }; + }; "cookie-signature-1.0.6" = { name = "cookie-signature"; packageName = "cookie-signature"; @@ -1768,13 +1813,13 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; - "core-js-3.20.3" = { + "core-js-3.21.1" = { name = "core-js"; packageName = "core-js"; - version = "3.20.3"; + version = "3.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz"; - sha512 = "vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz"; + sha512 = "FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="; }; }; "core-util-is-1.0.2" = { @@ -1786,13 +1831,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "crc-32-1.2.0" = { + "crc-32-1.2.1" = { name = "crc-32"; packageName = "crc-32"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz"; - sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA=="; + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz"; + sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w=="; }; }; "cron-1.7.2" = { @@ -1867,6 +1912,15 @@ let sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="; }; }; + "cssfilter-0.0.10" = { + name = "cssfilter"; + packageName = "cssfilter"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz"; + sha1 = "c6d2672632a2e5c83e013e6864a42ce8defd20ae"; + }; + }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -1912,13 +1966,13 @@ let sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; }; - "debug-4.3.3" = { + "debug-4.3.4" = { name = "debug"; packageName = "debug"; - version = "4.3.3"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"; - sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; }; "debuglog-1.0.1" = { @@ -2083,13 +2137,13 @@ let sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; }; }; - "domhandler-4.3.0" = { + "domhandler-4.3.1" = { name = "domhandler"; packageName = "domhandler"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz"; - sha512 = "fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"; + sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="; }; }; "domutils-2.8.0" = { @@ -2272,24 +2326,6 @@ let sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab"; }; }; - "es6-promise-4.2.8" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "4.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz"; - sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="; - }; - }; - "es6-promisify-5.0.0" = { - name = "es6-promisify"; - packageName = "es6-promisify"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; - sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; - }; - }; "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; @@ -2407,13 +2443,13 @@ let sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; - "express-4.17.2" = { + "express-4.17.3" = { name = "express"; packageName = "express"; - version = "4.17.2"; + version = "4.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.2.tgz"; - sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; + url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz"; + sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; }; }; "extend-3.0.2" = { @@ -2542,22 +2578,13 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; - "flatted-2.0.2" = { + "flatted-3.2.5" = { name = "flatted"; packageName = "flatted"; - version = "2.0.2"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"; - sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; - }; - }; - "flatted-3.2.4" = { - name = "flatted"; - packageName = "flatted"; - version = "3.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz"; - sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; }; "fn.name-1.1.0" = { @@ -2569,13 +2596,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.14.7" = { + "follow-redirects-1.14.9" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.7"; + version = "1.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz"; - sha512 = "+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz"; + sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; }; }; "for-each-0.3.3" = { @@ -2929,13 +2956,13 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-symbols-1.0.2" = { + "has-symbols-1.0.3" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; }; "has-tostringtag-1.0.0" = { @@ -3064,15 +3091,6 @@ let sha512 = "3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw=="; }; }; - "https-proxy-agent-3.0.1" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz"; - sha512 = "+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg=="; - }; - }; "https-proxy-agent-5.0.0" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; @@ -3235,13 +3253,13 @@ let sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; }; }; - "ioredis-4.28.3" = { + "ioredis-4.28.5" = { name = "ioredis"; packageName = "ioredis"; - version = "4.28.3"; + version = "4.28.5"; src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-4.28.3.tgz"; - sha512 = "9JOWVgBnuSxpIgfpjc1OeY1OLmA4t2KOWWURTDRXky+eWO0LZhI33pQNT9gYxANUXfh5p/zYephYni6GPRsksQ=="; + url = "https://registry.npmjs.org/ioredis/-/ioredis-4.28.5.tgz"; + sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; "ip-regex-2.1.0" = { @@ -3577,13 +3595,13 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "isbot-3.4.0" = { + "isbot-3.4.5" = { name = "isbot"; packageName = "isbot"; - version = "3.4.0"; + version = "3.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.4.0.tgz"; - sha512 = "0WOb6bbJ6gtpWVHQ30r5MzqvSrCNbZ70wFXAJWdXt/0LulF59uvBQnPgA7IelbOXEpV+CtLWkDxLB4TU7f0+VA=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.4.5.tgz"; + sha512 = "+KD6q1BBtw0iK9aGBGSfxJ31/ZgizKRjhm8ebgJUBMx0aeeQuIJ1I72beCoIrltIZGrSm4vmrxRxrG5n1aUTtw=="; }; }; "isexe-2.0.0" = { @@ -3595,13 +3613,13 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "iso-639-1-2.1.12" = { + "iso-639-1-2.1.13" = { name = "iso-639-1"; packageName = "iso-639-1"; - version = "2.1.12"; + version = "2.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.12.tgz"; - sha512 = "XuThg6XyPBj4RpXtsLbgbJPww6cQeSoiVQWJprM72f1ZTEV/1oeTMzU+dUY+SMPkHfIM5CfaliR4veTVtdXRKg=="; + url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.13.tgz"; + sha512 = "stYt3u6OnVDNcK4IWARGXmTOOY5Wa5g4bUmBsttZp/55ZiEjDUibR3C59ZnorKoSS0tfJmFuGMST3ksnY1zu7Q=="; }; }; "isstream-0.1.2" = { @@ -3766,13 +3784,13 @@ let sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA=="; }; }; - "kafkajs-1.15.0" = { + "kafkajs-1.16.0" = { name = "kafkajs"; packageName = "kafkajs"; - version = "1.15.0"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/kafkajs/-/kafkajs-1.15.0.tgz"; - sha512 = "yjPyEnQCkPxAuQLIJnY5dI+xnmmgXmhuOQ1GVxClG5KTOV/rJcW1qA3UfvyEJKTp/RTSqQnUR3HJsKFvHyTpNg=="; + url = "https://registry.npmjs.org/kafkajs/-/kafkajs-1.16.0.tgz"; + sha512 = "+Rcfu2hyQ/jv5skqRY8xA7Ra+mmRkDAzCaLDYbkGtgsNKpzxPWiLbk8ub0dgr4EbWrN1Zb4BCXHUkD6+zYfdWg=="; }; }; "kuler-1.0.1" = { @@ -3820,13 +3838,13 @@ let sha512 = "2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg=="; }; }; - "libphonenumber-js-1.9.44" = { + "libphonenumber-js-1.9.50" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.9.44"; + version = "1.9.50"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.44.tgz"; - sha512 = "zhw8nUMJuQf7jG1dZfEOKKOS6M3QYIv3HnvB/vGohNd0QfxIQcObH3a6Y6s350H+9xgBeOXClOJkS0hJ0yvS3g=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.50.tgz"; + sha512 = "cCzQPChw2XbordcO2LKiw5Htx5leHVfFk/EXkxNHqJfFo7Fndcb1kF5wPJpc316vCJhhikedYnVysMh3Sc7Ocw=="; }; }; "libqp-1.1.0" = { @@ -3991,6 +4009,15 @@ let sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; }; }; + "lodash.merge-4.6.2" = { + name = "lodash.merge"; + packageName = "lodash.merge"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; + }; + }; "lodash.once-4.1.1" = { name = "lodash.once"; packageName = "lodash.once"; @@ -4009,6 +4036,15 @@ let sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; }; }; + "lodash.throttle-4.1.1" = { + name = "lodash.throttle"; + packageName = "lodash.throttle"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"; + sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; + }; + }; "lodash.uniqby-4.7.0" = { name = "lodash.uniqby"; packageName = "lodash.uniqby"; @@ -4027,13 +4063,13 @@ let sha1 = "370d1d3e85b72a7e1b0cdf2d272121306f23e4ed"; }; }; - "logform-2.3.2" = { + "logform-2.4.0" = { name = "logform"; packageName = "logform"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.3.2.tgz"; - sha512 = "V6JiPThZzTsbVRspNO6TmHkR99oqYTs8fivMBYQkjZj6rxW92KxtDCPE6IkAk1DNBnYKNkjm4jYBm6JDUcyhOA=="; + url = "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz"; + sha512 = "CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw=="; }; }; "long-4.0.0" = { @@ -4099,6 +4135,15 @@ let sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ=="; }; }; + "luxon-2.3.1" = { + name = "luxon"; + packageName = "luxon"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/luxon/-/luxon-2.3.1.tgz"; + sha512 = "I8vnjOmhXsMSlNMZlMkSOvgrxKJl0uOsEzdGgGNZuZPaS9KlefpE9KV95QFftlJSC+1UyCC9/I69R02cz/zcCA=="; + }; + }; "mailparser-3.4.0" = { name = "mailparser"; packageName = "mailparser"; @@ -4144,13 +4189,22 @@ let sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg=="; }; }; - "mappersmith-2.36.3" = { + "mappersmith-2.38.1" = { name = "mappersmith"; packageName = "mappersmith"; - version = "2.36.3"; + version = "2.38.1"; src = fetchurl { - url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.36.3.tgz"; - sha512 = "izy4Gc7+VafMR/fDQukiEEBAfFoPGRYLBzFxXqXMR1IwAHqlQgSPRX+g/uIkaVqGRh+eb5c7sy8HNaBq9opwkA=="; + url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.38.1.tgz"; + sha512 = "ecZ+YyzBK7r3tC8MTaGo5tySHPhB6f9jdxN706Tux6dMlcE2fgwiBM/bf/+Sz5m2yKlTq5ntiahz7xSPgurD6w=="; + }; + }; + "material-colors-1.2.6" = { + name = "material-colors"; + packageName = "material-colors"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz"; + sha512 = "6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg=="; }; }; "md5-2.3.0" = { @@ -4198,13 +4252,13 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; - "micromatch-4.0.4" = { + "micromatch-4.0.5" = { name = "micromatch"; packageName = "micromatch"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; - sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"; + sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; }; }; "millisecond-0.1.2" = { @@ -4225,22 +4279,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.51.0" = { + "mime-db-1.52.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.51.0"; + version = "1.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; - sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; }; }; - "mime-types-2.1.34" = { + "mime-types-2.1.35" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.34"; + version = "2.1.35"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; - sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; + sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; }; }; "mimic-fn-2.1.0" = { @@ -4261,22 +4315,22 @@ let sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; }; - "minimatch-3.0.4" = { + "minimatch-3.1.2" = { name = "minimatch"; packageName = "minimatch"; - version = "3.0.4"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; - "minimist-1.2.5" = { + "minimist-1.2.6" = { name = "minimist"; packageName = "minimist"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"; + sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; }; "minipass-2.9.0" = { @@ -4297,13 +4351,13 @@ let sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; }; }; - "mkdirp-0.5.5" = { + "mkdirp-0.5.6" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; }; }; "mkdirp-1.0.4" = { @@ -4414,13 +4468,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "mssql-6.4.0" = { + "mssql-6.4.1" = { name = "mssql"; packageName = "mssql"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-6.4.0.tgz"; - sha512 = "Mtgu3PXqoaL7aHCMurttvEHibjvz5XKjlR6ZCDyAeKtDBORpxm88JyzEU2EESVf7588GulYKc7Gr+Txf5CICBQ=="; + url = "https://registry.npmjs.org/mssql/-/mssql-6.4.1.tgz"; + sha512 = "G1I7mM0gfxcH5TGSNoVmxq13Mve5YnQgRAlonqaMlHEjHjMn1g04bsrIQbVHFRdI6++dw/FGWlh8GoItJMoUDw=="; }; }; "mute-stream-0.0.8" = { @@ -4450,49 +4504,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.102.0" = { + "n8n-core-0.111.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.102.0"; + version = "0.111.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.102.0.tgz"; - sha512 = "9/suLELO/HBoEZ06bEv3cN7HZoR43qZlubM0BDXDhXJHBasfKcfegXYYacSfBxtTVX71cLffVgshJoJt8OtDcw=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.111.0.tgz"; + sha512 = "fZLLJ60yIuuX+geKGQrO6jk+kxn1UaCJMoWEi2FVE+InTmi+/r51Bv6LGoapoW0Oz+Em+CDq0wE7Yzg3xNx7fw=="; }; }; - "n8n-design-system-0.9.0" = { + "n8n-design-system-0.16.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.9.0"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.9.0.tgz"; - sha512 = "E1DoUDIvPTLAQ72mkg+MVS72QxDxa5UPxVqX4QeF/xAhUrXKfTWHveG5OxugW+mrEF5nO8IG08MEDOQCOzJZpQ=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.16.0.tgz"; + sha512 = "X7Qa+DoXRyJL4gqh7x59udnPIBYAUgDvhchL33dpI/Rgq9gaFajT9eAuOFQnXKMUaL0FZ5hu3rRGcAmwwEA/bA=="; }; }; - "n8n-editor-ui-0.127.0" = { + "n8n-editor-ui-0.137.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.127.0"; + version = "0.137.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.127.0.tgz"; - sha512 = "XCiLwXing2nSidUfrEqcYxG7Zc7TBbJDxmUjSwv2fdH4SK4vMPcUINJbEQOHPIhc6GNEjSt1J/tbCEJJC/acbg=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.137.0.tgz"; + sha512 = "/wYAIh/3RtVaFxY+vtVEACfo6xsVOi3cEPWd+GSFCK/AMxXs517CNGbwNz54geqaGNUH+rhhUz87C0pG+TgiUg=="; }; }; - "n8n-nodes-base-0.158.0" = { + "n8n-nodes-base-0.168.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.158.0"; + version = "0.168.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.158.0.tgz"; - sha512 = "qs/T0S2BHrovOFh6mnCRpuY9qhKZxub160+qtvXMVsiUWCpKEW1eIA4owYHLH3DLYqW0izQJap0sGlZEzV3xTg=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.168.0.tgz"; + sha512 = "TyIL5Gwn+qvfi+1nNkQTPfrJYMqjx2P2OCiDWAMfzahauJyJpfJMYpIEKF3UxoKXCfWpBYPmHVoov6GadEOR1w=="; }; }; - "n8n-workflow-0.84.0" = { + "n8n-workflow-0.93.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.84.0"; + version = "0.93.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.84.0.tgz"; - sha512 = "ibZ/oCWd81DMhjUQcAMC5GNs2C/dm+4boKTIjRuFHmbGzF2elwpb5s2nlkRn5REj9aZseZ0N9bfJ6slcLbw/Sw=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.93.0.tgz"; + sha512 = "IqZrnTKdIZD7aeL9/FiwoI7w1WBgeBmqZVXRF+OGtIHooK/lDkHpy17hoXXqAyeATiVf2licgl8F/zMvSsnuJA=="; }; }; "named-placeholders-1.1.2" = { @@ -4513,13 +4567,13 @@ let sha512 = "wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="; }; }; - "nanoid-3.2.0" = { + "nanoid-3.3.1" = { name = "nanoid"; packageName = "nanoid"; - version = "3.2.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz"; - sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz"; + sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="; }; }; "native-duplexpair-1.0.0" = { @@ -4549,13 +4603,13 @@ let sha512 = "6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ=="; }; }; - "negotiator-0.6.2" = { + "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; }; }; "neo-async-2.6.2" = { @@ -4612,13 +4666,13 @@ let sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; }; }; - "node-ssh-12.0.3" = { + "node-ssh-12.0.4" = { name = "node-ssh"; packageName = "node-ssh"; - version = "12.0.3"; + version = "12.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-ssh/-/node-ssh-12.0.3.tgz"; - sha512 = "+TrX99Fvu50ZwBu/1Z9oWV1xC+vjADCJACSmvdgYUeUH/PKIX6Y5ltPvrh30WFXcxaP1wHN09BBVdQ3jfZlfoA=="; + url = "https://registry.npmjs.org/node-ssh/-/node-ssh-12.0.4.tgz"; + sha512 = "5M3FBeAWjEpAQvVakQde6CeviEoEiYb6IjJL9mrMen9at63GAv0Q5vOFHFP+SM1Y7pTN3EBvJ/I+oxn2Lpydbw=="; }; }; "nodeify-1.0.1" = { @@ -4639,13 +4693,13 @@ let sha512 = "AtiTVUFHLiiDnMQ43zi0YgkzHOEWUkhDgPlBXrsDzJiJvB29Alo4OKxHQ0ugF3gRqRQIneCLtZU3yiUo7pItZw=="; }; }; - "nodemailer-6.7.2" = { + "nodemailer-6.7.3" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.7.2"; + version = "6.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.2.tgz"; - sha512 = "Dz7zVwlef4k5R71fdmxwR8Q39fiboGbu3xgswkzGwczUfjp873rVxt1O46+Fh0j1ORnAC6L9+heI8uUpO6DT7Q=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.3.tgz"; + sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g=="; }; }; "nopt-4.0.3" = { @@ -5053,6 +5107,42 @@ let sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; }; }; + "passport-0.5.2" = { + name = "passport"; + packageName = "passport"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/passport/-/passport-0.5.2.tgz"; + sha512 = "w9n/Ot5I7orGD4y+7V3EFJCQEznE5RxHamUxcqLT2QoJY0f2JdN8GyHonYFvN0Vz+L6lUJfVhrk2aZz2LbuREw=="; + }; + }; + "passport-cookie-1.0.9" = { + name = "passport-cookie"; + packageName = "passport-cookie"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-cookie/-/passport-cookie-1.0.9.tgz"; + sha512 = "8a6foX2bbGoJzup0RAiNcC2tTqzYS46RQEK3Z4u8p86wesPUjgDaji3C7+5j4TGyCq4ZoOV+3YLw1Hy6cV6kyw=="; + }; + }; + "passport-jwt-4.0.0" = { + name = "passport-jwt"; + packageName = "passport-jwt"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-jwt/-/passport-jwt-4.0.0.tgz"; + sha512 = "BwC0n2GP/1hMVjR4QpnvqA61TxenUMlmfNjYNgK0ZAs0HK4SOQkHcSv4L328blNTLtHq7DbmvyNJiH+bn6C5Mg=="; + }; + }; + "passport-strategy-1.0.0" = { + name = "passport-strategy"; + packageName = "passport-strategy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"; + sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4"; + }; + }; "path-case-3.0.4" = { name = "path-case"; packageName = "path-case"; @@ -5098,6 +5188,15 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; + "pause-0.0.1" = { + name = "pause"; + packageName = "pause"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + }; + }; "pdf-parse-1.1.1" = { name = "pdf-parse"; packageName = "pdf-parse"; @@ -5107,13 +5206,13 @@ let sha512 = "v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A=="; }; }; - "peek-readable-4.0.2" = { + "peek-readable-4.1.0" = { name = "peek-readable"; packageName = "peek-readable"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.0.2.tgz"; - sha512 = "9fMaz6zoxw9ypO1KZy5RDJgSupEtu0Q+g/OqqsVHX3rKGR8qehRLYzsFARZ4bVvdvfknKiXvuDbkMnO1g6cRpQ=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz"; + sha512 = "ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg=="; }; }; "performance-now-2.1.0" = { @@ -5134,6 +5233,15 @@ let sha512 = "7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA=="; }; }; + "pg-8.7.3" = { + name = "pg"; + packageName = "pg"; + version = "8.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pg/-/pg-8.7.3.tgz"; + sha512 = "HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw=="; + }; + }; "pg-connection-string-2.5.0" = { name = "pg-connection-string"; packageName = "pg-connection-string"; @@ -5161,13 +5269,13 @@ let sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="; }; }; - "pg-pool-3.4.1" = { + "pg-pool-3.5.1" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.4.1.tgz"; - sha512 = "TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.1.tgz"; + sha512 = "6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ=="; }; }; "pg-promise-10.11.1" = { @@ -5242,13 +5350,13 @@ let sha512 = "vrlOGvNVELko0+J8NpGC5lHWDGrk8LQJq9nwAMIVEVBfN1Lib3BLxAaLRGDTuUnvl45j5N9dT2H85PULz6IjjQ=="; }; }; - "popsicle-redirects-1.1.0" = { + "popsicle-redirects-1.1.1" = { name = "popsicle-redirects"; packageName = "popsicle-redirects"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/popsicle-redirects/-/popsicle-redirects-1.1.0.tgz"; - sha512 = "XCpzVjVk7tty+IJnSdqWevmOr1n8HNDhL86v7mZ6T1JIIf2KGybxUk9mm7ZFOhWMkGB0e8XkacHip7BV8AQWQA=="; + url = "https://registry.npmjs.org/popsicle-redirects/-/popsicle-redirects-1.1.1.tgz"; + sha512 = "mC2HrKjdTAWDalOjGxlXw9j6Qxrz/Yd2ui6bPxpi2IQDYWpF4gUAMxbA8EpSWJhLi0PuWKDwTHHPrUPGutAoIA=="; }; }; "popsicle-transport-http-1.2.1" = { @@ -5332,13 +5440,13 @@ let sha512 = "sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA=="; }; }; - "printj-1.3.0" = { + "printj-1.3.1" = { name = "printj"; packageName = "printj"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/printj/-/printj-1.3.0.tgz"; - sha512 = "017o8YIaz8gLhaNxRB9eBv2mWXI2CtzhPJALnQTP+OPpuUfP0RMWqr/mHCzqVeu1AQxfzSfAtAq66vKB8y7Lzg=="; + url = "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz"; + sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg=="; }; }; "process-0.11.10" = { @@ -5530,13 +5638,13 @@ let sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; }; }; - "qs-6.9.6" = { + "qs-6.9.7" = { name = "qs"; packageName = "qs"; - version = "6.9.6"; + version = "6.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; - sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz"; + sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; }; }; "querystring-0.2.0" = { @@ -5620,13 +5728,13 @@ let sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; - "raw-body-2.4.2" = { + "raw-body-2.4.3" = { name = "raw-body"; packageName = "raw-body"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz"; - sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz"; + sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; }; }; "rc-1.2.8" = { @@ -5791,13 +5899,13 @@ let sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; - "requestretry-6.0.0" = { + "requestretry-7.0.2" = { name = "requestretry"; packageName = "requestretry"; - version = "6.0.0"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/requestretry/-/requestretry-6.0.0.tgz"; - sha512 = "X7O+BMlfHgzetfSDtgQIMinLn1BuT+95W12iffDzyOS+HLoBEIQqCZv++UTChUWVjOu+pudbocD76+4j+jK9ww=="; + url = "https://registry.npmjs.org/requestretry/-/requestretry-7.0.2.tgz"; + sha512 = "Zz8z7G2OuVs4F0wR0shKMEMm7lNvPNHM0UIHNns9qfyuBDKSExoTsZGtSjKst6nPEwlMrbA9G+m/yC0AbGj+8w=="; }; }; "require-at-1.0.6" = { @@ -5962,13 +6070,13 @@ let sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; - "safe-stable-stringify-1.1.1" = { + "safe-stable-stringify-2.3.1" = { name = "safe-stable-stringify"; packageName = "safe-stable-stringify"; - version = "1.1.1"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz"; - sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="; + url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz"; + sha512 = "kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg=="; }; }; "safer-buffer-2.1.2" = { @@ -6169,13 +6277,13 @@ let sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; }; }; - "signal-exit-3.0.6" = { + "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz"; - sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; "simple-git-2.48.0" = { @@ -6223,13 +6331,13 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.6" = { + "snowflake-sdk-1.6.8" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.6"; + version = "1.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.6.tgz"; - sha512 = "b8mbYI6TFGe8H0m0eviNd4FC/3jsw02OHNt21k9sLWkBp4re2VUhaJf7555ln7thMSnMcbkdAB8zQBZcbqdoPg=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.8.tgz"; + sha512 = "ZmzeR2W4mQVri546mUxUW+jBxTn0JRKm06EtndO7MUFLcS8YChf60tXTa+s7A0hO8FxQkSQAFonCmtz4nzPoSA=="; }; }; "source-map-0.6.1" = { @@ -6295,13 +6403,13 @@ let sha512 = "1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA=="; }; }; - "sqlstring-2.3.2" = { + "sqlstring-2.3.3" = { name = "sqlstring"; packageName = "sqlstring"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.2.tgz"; - sha512 = "vF4ZbYdKS8OnoJAWBmMxCQDkiEBkGQYU7UZPtL8flbDRSNkhaXvRJ279ZtI6M+zDaQovVU4tuRgzK5fVhvFAhg=="; + url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz"; + sha512 = "qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg=="; }; }; "sse-channel-3.1.1" = { @@ -6322,22 +6430,22 @@ let sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="; }; }; - "ssh2-1.5.0" = { + "ssh2-1.8.0" = { name = "ssh2"; packageName = "ssh2"; - version = "1.5.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-1.5.0.tgz"; - sha512 = "iUmRkhH9KGeszQwDW7YyyqjsMTf4z+0o48Cp4xOwlY5LjtbIAvyd3fwnsoUZW/hXmTCRA3yt7S/Jb9uVjErVlA=="; + url = "https://registry.npmjs.org/ssh2/-/ssh2-1.8.0.tgz"; + sha512 = "NVIRkIwJvWl+mcRozp+EBzHMVCcbDKBea64ToPdZEk43yAVGwmfqYZRPFRnnvGjsKC34wYCmiupTcKgCVNVNNg=="; }; }; - "ssh2-sftp-client-7.2.1" = { + "ssh2-sftp-client-7.2.3" = { name = "ssh2-sftp-client"; packageName = "ssh2-sftp-client"; - version = "7.2.1"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-7.2.1.tgz"; - sha512 = "kr5QFL+d8Ta28wGhlRqkHo812PjMhKrBK7oTaYGNHqTvXAUjxZR6SeWRXbwKASE3dh2xeDz5aXHcg01bzfAeCA=="; + url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-7.2.3.tgz"; + sha512 = "Bmq4Uewu3e0XOwu5bnPbiS5KRQYv+dff5H6+85V4GZrPrt0Fkt1nUH+uXanyAkoNxUpzjnAPEEoLdOaBO9c3xw=="; }; }; "sshpk-1.17.0" = { @@ -6493,13 +6601,13 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "strtok3-6.2.4" = { + "strtok3-6.3.0" = { name = "strtok3"; packageName = "strtok3"; - version = "6.2.4"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.4.tgz"; - sha512 = "GO8IcFF9GmFDvqduIspUBwCzCbqzegyVKIsSymcMgiZKeCfrN9SowtUoi8+b59WZMAjIzVZic/Ft97+pynR3Iw=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz"; + sha512 = "fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw=="; }; }; "supports-color-2.0.0" = { @@ -6637,6 +6745,15 @@ let sha512 = "a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w=="; }; }; + "tinycolor2-1.4.2" = { + name = "tinycolor2"; + packageName = "tinycolor2"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz"; + sha512 = "vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="; + }; + }; "tlds-1.224.0" = { name = "tlds"; packageName = "tlds"; @@ -6979,13 +7096,13 @@ let sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; }; }; - "url-parse-1.5.4" = { + "url-parse-1.5.10" = { name = "url-parse"; packageName = "url-parse"; - version = "1.5.4"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz"; - sha512 = "ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz"; + sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; "utf7-1.0.2" = { @@ -7105,13 +7222,31 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; - "vm2-3.9.5" = { + "vm2-3.9.9" = { name = "vm2"; packageName = "vm2"; - version = "3.9.5"; + version = "3.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.5.tgz"; - sha512 = "LuCAHZN75H9tdrAiLFf030oW7nJV5xwNMuk1ymOZwopmuK3d2H4L1Kv4+GFHgarKiLfXXLFU+7LDABHnwOkWng=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz"; + sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw=="; + }; + }; + "vue-2.6.14" = { + name = "vue"; + packageName = "vue"; + version = "2.6.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"; + sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; + }; + }; + "vue-color-2.8.1" = { + name = "vue-color"; + packageName = "vue-color"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-color/-/vue-color-2.8.1.tgz"; + sha512 = "BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw=="; }; }; "vue-fragment-1.5.2" = { @@ -7132,6 +7267,15 @@ let sha512 = "SX35iJHL5PJ4Gfh0Mo/q0shyHiI2V6Zkh51c+k8E9O1RKv5BQyYrCxRzpvPrsIOJEnLaeiovet3dsUB0e/kDzw=="; }; }; + "vue2-boring-avatars-0.3.4" = { + name = "vue2-boring-avatars"; + packageName = "vue2-boring-avatars"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vue2-boring-avatars/-/vue2-boring-avatars-0.3.4.tgz"; + sha512 = "N3FYX9Z6rZdTeP3BOBz2LMxlWo9WRmPF6SOsYzz+tEuUH0QjX8UD7c1X95J8pZ7cFvbh9QflVujYQRqRiiwoAg=="; + }; + }; "webidl-conversions-3.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -7186,22 +7330,22 @@ let sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; }; - "winston-3.4.0" = { + "winston-3.6.0" = { name = "winston"; packageName = "winston"; - version = "3.4.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.4.0.tgz"; - sha512 = "FqilVj+5HKwCfIHQzMxrrd5tBIH10JTS3koFGbLVWBODjiIYq7zir08rFyBT4rrTYG/eaTqDcfSIbcjSM78YSw=="; + url = "https://registry.npmjs.org/winston/-/winston-3.6.0.tgz"; + sha512 = "9j8T75p+bcN6D00sF/zjFVmPp+t8KMPB1MzbbzYjeN9VWxdsYnTB40TkbNUEXAmILEfChMvAMgidlX64OG3p6w=="; }; }; - "winston-transport-4.4.2" = { + "winston-transport-4.5.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.4.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.2.tgz"; - sha512 = "9jmhltAr5ygt5usgUTQbEiw/7RYXpyUbEAFRCSicIacpUzPkrnQsQZSPGEI12aLK9Jth4zNcYJx3Cvznwrl8pw=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"; + sha512 = "YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q=="; }; }; "wmf-1.0.2" = { @@ -7258,13 +7402,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "ws-7.5.6" = { + "ws-7.5.7" = { name = "ws"; packageName = "ws"; - version = "7.5.6"; + version = "7.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz"; - sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz"; + sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="; }; }; "xlsx-0.17.5" = { @@ -7330,6 +7474,15 @@ let sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; }; }; + "xss-1.0.11" = { + name = "xss"; + packageName = "xss"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz"; + sha512 = "EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ=="; + }; + }; "xtend-4.0.2" = { name = "xtend"; packageName = "xtend"; @@ -7426,10 +7579,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.160.0"; + version = "0.170.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.160.0.tgz"; - sha512 = "mdjD4tKohZP8kMbFa+gGWx5rYXLz9HprXr2tPHUpAvZ6x7JGb06uY2ieNifSAH9Ap3CR+qfg6HkPgSKe183CIA=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.170.0.tgz"; + sha512 = "aY4A9+P7K6iinxFyDZl9Jdin283csAbiMStjfxLX5IfO75/aNbjXhSmpjclV9PCUuuTonvoMiVMTvpbCaeImqg=="; }; dependencies = [ (sources."@azure/abort-controller-1.0.5" // { @@ -7437,19 +7590,19 @@ in sources."tslib-2.3.1" ]; }) - sources."@azure/core-asynciterator-polyfill-1.0.1" + sources."@azure/core-asynciterator-polyfill-1.0.2" (sources."@azure/core-auth-1.3.2" // { dependencies = [ sources."tslib-2.3.1" ]; }) - (sources."@azure/core-http-2.2.3" // { + (sources."@azure/core-http-2.2.4" // { dependencies = [ sources."tough-cookie-4.0.0" sources."tslib-2.3.1" ]; }) - (sources."@azure/core-lro-2.2.3" // { + (sources."@azure/core-lro-2.2.4" // { dependencies = [ sources."tslib-2.3.1" ]; @@ -7470,25 +7623,26 @@ in ]; }) sources."@azure/ms-rest-azure-env-2.0.0" - (sources."@azure/ms-rest-js-2.6.0" // { + (sources."@azure/ms-rest-js-2.6.1" // { dependencies = [ sources."form-data-2.5.1" ]; }) sources."@azure/ms-rest-nodeauth-3.1.1" - (sources."@azure/storage-blob-12.8.0" // { + (sources."@azure/storage-blob-12.9.0" // { dependencies = [ sources."tslib-2.3.1" ]; }) - sources."@babel/runtime-7.16.7" - (sources."@dabh/diagnostics-2.0.2" // { + sources."@babel/runtime-7.17.8" + sources."@colors/colors-1.5.0" + (sources."@dabh/diagnostics-2.0.3" // { dependencies = [ sources."enabled-2.0.0" sources."kuler-2.0.0" ]; }) - sources."@fontsource/open-sans-4.5.2" + sources."@fontsource/open-sans-4.5.8" sources."@icetee/ftp-0.3.15" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" @@ -7497,7 +7651,7 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@oclif/command-1.8.16" - (sources."@oclif/config-1.18.2" // { + (sources."@oclif/config-1.18.3" // { dependencies = [ sources."tslib-2.3.1" ]; @@ -7507,14 +7661,19 @@ in sources."wrap-ansi-7.0.0" ]; }) - sources."@oclif/help-1.0.1" + (sources."@oclif/help-1.0.1" // { + dependencies = [ + sources."@oclif/config-1.18.2" + sources."tslib-2.3.1" + ]; + }) sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.6" // { + (sources."@oclif/parser-3.8.7" // { dependencies = [ sources."tslib-2.3.1" ]; }) - sources."@opentelemetry/api-1.0.4" + sources."@opentelemetry/api-1.1.0" sources."@rudderstack/rudder-sdk-node-1.0.6" sources."@segment/loosely-validate-event-2.0.0" sources."@selderee/plugin-htmlparser2-0.6.0" @@ -7528,15 +7687,15 @@ in sources."@types/express-4.17.13" sources."@types/express-jwt-0.0.42" sources."@types/express-serve-static-core-4.17.28" - sources."@types/express-unless-0.5.2" + sources."@types/express-unless-0.5.3" sources."@types/ftp-0.3.33" sources."@types/json-diff-0.5.2" sources."@types/jsonwebtoken-8.5.8" - sources."@types/lodash-4.14.178" + sources."@types/lodash-4.14.180" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.10" - (sources."@types/node-fetch-2.5.12" // { + sources."@types/node-17.0.23" + (sources."@types/node-fetch-2.6.1" // { dependencies = [ sources."form-data-3.0.1" ]; @@ -7553,8 +7712,10 @@ in sources."@xmldom/xmldom-0.7.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."access-control-1.0.1" + sources."acorn-8.7.0" + sources."acorn-walk-8.2.0" (sources."adal-node-0.2.3" // { dependencies = [ sources."uuid-3.4.0" @@ -7602,7 +7763,7 @@ in ]; }) sources."avsc-5.7.3" - (sources."aws-sdk-2.1062.0" // { + (sources."aws-sdk-2.1101.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -7656,7 +7817,7 @@ in }) sources."bluebird-3.7.2" sources."bn.js-4.12.0" - (sources."body-parser-1.19.1" // { + (sources."body-parser-1.19.2" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -7675,7 +7836,7 @@ in sources."buffer-writer-2.0.0" sources."bull-3.29.3" sources."byte-length-1.0.2" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."call-bind-1.0.2" sources."callback-stream-1.1.0" sources."callsites-3.1.0" @@ -7697,7 +7858,7 @@ in sources."printj-1.2.3" ]; }) - sources."printj-1.3.0" + sources."printj-1.3.1" ]; }) sources."chalk-4.1.2" @@ -7712,6 +7873,7 @@ in sources."cheerio-select-1.5.0" sources."chokidar-3.5.2" sources."chownr-1.1.4" + sources."clamp-1.0.1" sources."class-validator-0.13.2" sources."clean-stack-3.0.1" sources."cli-color-0.1.7" @@ -7742,7 +7904,6 @@ in sources."color-name-1.1.4" sources."color-string-1.9.0" sources."colornames-1.1.1" - sources."colors-1.4.0" sources."colorspace-1.1.4" sources."combined-stream-1.0.8" sources."commander-5.1.0" @@ -7773,12 +7934,17 @@ in }) sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."convict-6.2.1" + sources."convict-6.2.2" sources."cookie-0.4.1" + sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.1" sources."core-util-is-1.0.2" - sources."crc-32-1.2.0" + (sources."crc-32-1.2.1" // { + dependencies = [ + sources."printj-1.3.1" + ]; + }) sources."cron-1.7.2" sources."cron-parser-2.18.0" (sources."cross-spawn-4.0.2" // { @@ -7792,9 +7958,10 @@ in sources."csrf-3.1.0" sources."css-select-4.2.1" sources."css-what-5.1.0" + sources."cssfilter-0.0.10" sources."dashdash-1.14.1" sources."date-utils-1.2.21" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."debuglog-1.0.1" sources."deep-extend-0.6.0" sources."deepmerge-4.2.2" @@ -7811,7 +7978,7 @@ in sources."discontinuous-range-1.0.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" sources."domutils-2.8.0" (sources."dot-case-3.0.4" // { dependencies = [ @@ -7842,8 +8009,6 @@ in sources."es-abstract-1.19.1" sources."es-to-primitive-1.2.1" sources."es5-ext-0.8.2" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" @@ -7855,8 +8020,9 @@ in sources."eventsource-1.1.0" sources."exit-on-epipe-1.0.1" sources."expand-tilde-2.0.2" - (sources."express-4.17.2" // { + (sources."express-4.17.3" // { dependencies = [ + sources."cookie-0.4.2" sources."debug-2.6.9" sources."ms-2.0.0" ]; @@ -7884,9 +8050,9 @@ in sources."ms-2.0.0" ]; }) - sources."flatted-2.0.2" + sources."flatted-3.2.5" sources."fn.name-1.1.0" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."for-each-0.3.3" sources."forever-agent-0.6.1" sources."form-data-4.0.0" @@ -7945,7 +8111,7 @@ in }) sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" @@ -7977,7 +8143,7 @@ in sources."ini-1.3.8" sources."inquirer-7.3.3" sources."internal-slot-1.0.3" - sources."ioredis-4.28.3" + sources."ioredis-4.28.5" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" @@ -8012,9 +8178,9 @@ in sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-0.0.1" - sources."isbot-3.4.0" + sources."isbot-3.4.5" sources."isexe-2.0.0" - sources."iso-639-1-2.1.12" + sources."iso-639-1-2.1.13" sources."isstream-0.1.2" sources."jmespath-0.16.0" sources."join-component-1.1.0" @@ -8036,7 +8202,7 @@ in sources."jwa-1.4.1" sources."jwks-rsa-1.12.3" sources."jws-3.2.2" - sources."kafkajs-1.15.0" + sources."kafkajs-1.16.0" sources."kuler-1.0.1" sources."leven-2.1.0" sources."libbase64-1.2.1" @@ -8045,7 +8211,7 @@ in sources."iconv-lite-0.6.2" ]; }) - sources."libphonenumber-js-1.9.44" + sources."libphonenumber-js-1.9.50" sources."libqp-1.1.0" sources."limiter-1.1.5" sources."linkify-it-3.0.3" @@ -8068,11 +8234,13 @@ in sources."lodash.isnumber-3.0.3" sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" + sources."lodash.merge-4.6.2" sources."lodash.once-4.1.1" sources."lodash.set-4.3.2" + sources."lodash.throttle-4.1.1" sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" - sources."logform-2.3.2" + sources."logform-2.4.0" sources."long-4.0.0" sources."lossless-json-1.0.5" (sources."lower-case-2.0.2" // { @@ -8087,6 +8255,7 @@ in sources."yallist-2.1.2" ]; }) + sources."luxon-2.3.1" (sources."mailparser-3.4.0" // { dependencies = [ sources."iconv-lite-0.6.3" @@ -8101,21 +8270,22 @@ in }) sources."make-error-1.3.6" sources."make-error-cause-2.3.0" - sources."mappersmith-2.36.3" + sources."mappersmith-2.38.1" + sources."material-colors-1.2.6" sources."md5-2.3.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."millisecond-0.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" (sources."minipass-2.9.0" // { dependencies = [ sources."yallist-3.1.1" @@ -8148,7 +8318,7 @@ in ]; }) sources."ms-2.1.2" - sources."mssql-6.4.0" + sources."mssql-6.4.1" sources."mute-stream-0.0.8" (sources."mysql2-2.3.3" // { dependencies = [ @@ -8157,20 +8327,19 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.102.0" // { + (sources."n8n-core-0.111.0" // { dependencies = [ - sources."flatted-3.2.4" sources."qs-6.10.3" ]; }) - sources."n8n-design-system-0.9.0" - sources."n8n-editor-ui-0.127.0" - (sources."n8n-nodes-base-0.158.0" // { + sources."n8n-design-system-0.16.0" + sources."n8n-editor-ui-0.137.0" + (sources."n8n-nodes-base-0.168.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.84.0" + sources."n8n-workflow-0.93.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8178,7 +8347,7 @@ in ]; }) sources."nanoclone-0.2.1" - sources."nanoid-3.2.0" + sources."nanoid-3.3.1" sources."native-duplexpair-1.0.0" (sources."nearley-2.20.1" // { dependencies = [ @@ -8190,7 +8359,7 @@ in sources."debug-3.2.7" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."neo-async-2.6.2" (sources."no-case-3.0.4" // { dependencies = [ @@ -8202,14 +8371,14 @@ in sources."node-fetch-2.6.7" (sources."node-pre-gyp-0.11.0" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."rimraf-2.7.1" sources."semver-5.7.1" ]; }) - sources."node-ssh-12.0.3" + sources."node-ssh-12.0.4" sources."nodeify-1.0.1" - sources."nodemailer-6.7.2" + sources."nodemailer-6.7.3" sources."nopt-4.0.3" sources."normalize-path-3.0.0" sources."npm-bundled-1.1.2" @@ -8275,6 +8444,10 @@ in sources."tslib-2.3.1" ]; }) + sources."passport-0.5.2" + sources."passport-cookie-1.0.9" + sources."passport-jwt-4.0.0" + sources."passport-strategy-1.0.0" (sources."path-case-3.0.4" // { dependencies = [ sources."tslib-2.3.1" @@ -8284,19 +8457,24 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" + sources."pause-0.0.1" (sources."pdf-parse-1.1.1" // { dependencies = [ sources."debug-3.2.7" ]; }) - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" - sources."pg-8.7.1" + sources."pg-8.7.3" sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" - sources."pg-pool-3.4.1" - sources."pg-promise-10.11.1" + sources."pg-pool-3.5.1" + (sources."pg-promise-10.11.1" // { + dependencies = [ + sources."pg-8.7.1" + ]; + }) sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" (sources."pgpass-1.0.5" // { @@ -8308,7 +8486,7 @@ in sources."popsicle-12.1.0" sources."popsicle-content-encoding-1.0.0" sources."popsicle-cookie-jar-1.0.0" - sources."popsicle-redirects-1.1.0" + sources."popsicle-redirects-1.1.1" sources."popsicle-transport-http-1.2.1" sources."popsicle-transport-xhr-2.0.0" sources."popsicle-user-agent-1.0.0" @@ -8342,7 +8520,7 @@ in }) sources."punycode-2.1.1" sources."python-struct-1.1.3" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."querystring-0.2.0" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" @@ -8352,7 +8530,7 @@ in sources."random-bytes-1.0.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" sources."rc-1.2.8" sources."readable-stream-1.1.14" sources."readable-web-to-node-stream-2.0.0" @@ -8380,7 +8558,7 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."requestretry-6.0.0" + sources."requestretry-7.0.2" sources."require-at-1.0.6" sources."require-directory-2.1.1" sources."requires-port-1.0.0" @@ -8401,7 +8579,7 @@ in sources."run-parallel-1.2.0" sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-1.1.1" + sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."sb-promise-queue-2.1.0" @@ -8433,7 +8611,7 @@ in sources."sha.js-2.4.11" sources."shell-escape-0.2.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-git-2.48.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" @@ -8443,12 +8621,10 @@ in sources."tslib-2.3.1" ]; }) - (sources."snowflake-sdk-1.6.6" // { + (sources."snowflake-sdk-1.6.8" // { dependencies = [ - sources."agent-base-4.3.0" sources."debug-3.2.7" sources."http-signature-1.3.6" - sources."https-proxy-agent-3.0.1" sources."jsprim-2.0.2" sources."tmp-0.2.1" sources."uuid-3.4.0" @@ -8464,11 +8640,11 @@ in }) sources."sprintf-js-1.1.2" sources."sqlite3-5.0.2" - sources."sqlstring-2.3.2" + sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" - sources."ssh2-1.5.0" - sources."ssh2-sftp-client-7.2.1" + sources."ssh2-1.8.0" + sources."ssh2-sftp-client-7.2.3" sources."sshpk-1.17.0" sources."stack-trace-0.0.10" sources."standard-as-callback-2.1.0" @@ -8482,11 +8658,11 @@ in sources."string_decoder-0.10.31" sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" sources."supports-color-7.2.0" (sources."tar-4.4.19" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."yallist-3.1.1" ]; }) @@ -8494,7 +8670,7 @@ in sources."tdigest-0.1.1" (sources."tedious-6.7.1" // { dependencies = [ - sources."@types/node-12.20.42" + sources."@types/node-12.20.47" sources."bl-3.0.1" sources."depd-2.0.0" sources."iconv-lite-0.5.2" @@ -8518,6 +8694,7 @@ in sources."through2-filter-3.0.0" sources."throwback-4.1.0" sources."timeago.js-4.0.2" + sources."tinycolor2-1.4.2" sources."tlds-1.224.0" sources."tmp-0.0.33" (sources."tmp-promise-3.0.3" // { @@ -8576,7 +8753,7 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-1.5.4" + sources."url-parse-1.5.10" (sources."utf7-1.0.2" // { dependencies = [ sources."semver-5.3.0" @@ -8592,23 +8769,26 @@ in sources."validator-13.7.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."vm2-3.9.5" + sources."vm2-3.9.9" + sources."vue-2.6.14" + sources."vue-color-2.8.1" sources."vue-fragment-1.5.2" sources."vue-i18n-8.27.0" + sources."vue2-boring-avatars-0.3.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."wide-align-1.1.5" sources."widest-line-3.1.0" - (sources."winston-3.4.0" // { + (sources."winston-3.6.0" // { dependencies = [ sources."async-3.2.3" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" ]; }) - (sources."winston-transport-4.4.2" // { + (sources."winston-transport-4.5.0" // { dependencies = [ sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" @@ -8619,12 +8799,17 @@ in sources."wordwrap-1.0.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xlsx-0.17.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xpath.js-1.1.0" sources."xregexp-2.0.0" + (sources."xss-1.0.11" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index bbdddbf60682..deac64c903e1 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -17,17 +17,18 @@ , qtgraphicaleffects , sqlite , inkscape +, xdg-utils }: mkDerivation rec { pname = "nextcloud-client"; - version = "3.4.1"; + version = "3.4.4"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-1fUk4PUFkWcLOvrYvM+K+ZarUSeq/JtDU2bHHPoAoC8="; + sha256 = "sha256-e4me4mpK0N3UyM5MuJP3jxwM5h1dGBd+JzAr5f3BOGQ="; }; patches = [ @@ -62,6 +63,7 @@ mkDerivation rec { "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" # See also: https://bugreports.qt.io/browse/QTBUG-85967 "--set QML_DISABLE_DISK_CACHE 1" + "--prefix PATH : ${lib.makeBinPath [ xdg-utils ]}" ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index ae7eb49a1c66..c06291c719e8 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.37.3"; + version = "1.37.10"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-BCDVn4JaRYIexI7NrRDchUl9u4AEJa+An9ItYYJDs3A="; + sha256 = "sha256-iwxgDBIuTClikvXF+3mCjFKKV0upN+K+aL85ewYkMXo="; }; - vendorSha256 = "sha256-YZm+DUrH+1xdJrGjmlajbcsnqVODVbZKivVjmqZ2e48="; + vendorSha256 = "sha256-6hWD05lXteqL7egj9tiRVHlevKM33i+a+zBUZs7PF7I="; doCheck = false; diff --git a/pkgs/applications/networking/ngadmin/default.nix b/pkgs/applications/networking/ngadmin/default.nix index 8392e0583454..f63fbfcf9503 100644 --- a/pkgs/applications/networking/ngadmin/default.nix +++ b/pkgs/applications/networking/ngadmin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ] ++ lib.optional withReadline readline; - enableParallelBuild = true; + enableParallelBuilding = true; configureFlags = with lib; optional (!withReadline) "--without-readline" ++ optional enableEmu "--enable-emu" diff --git a/pkgs/applications/networking/novnc/default.nix b/pkgs/applications/networking/novnc/default.nix new file mode 100644 index 000000000000..269944324c64 --- /dev/null +++ b/pkgs/applications/networking/novnc/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "novnc"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "novnc"; + repo = "noVNC"; + rev = "v${version}"; + sha256 = "sha256-Z+bks7kcwj+Z3uf/t0u25DnGOM60QhSH6uuoIi59jqU="; + }; + + installPhase = '' + runHook preInstall + + install -Dm755 utils/novnc_proxy "$out/bin/novnc" + install -dm755 "$out/share/webapps/novnc/" + cp -a app core po vendor vnc.html karma.conf.js package.json vnc_lite.html "$out/share/webapps/novnc/" + + runHook postInstall + ''; + + meta = with lib; { + description = "VNC client web application"; + homepage = "https://novnc.com"; + license = with licenses; [ mpl20 ofl bsd3 bsd2 mit ]; + maintainers = with maintainers; [ neverbehave ]; + }; +} diff --git a/pkgs/applications/networking/opsdroid/default.nix b/pkgs/applications/networking/opsdroid/default.nix index 3560e8066d88..ff6760d3daaf 100644 --- a/pkgs/applications/networking/opsdroid/default.nix +++ b/pkgs/applications/networking/opsdroid/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "opsdroid"; - version = "0.24.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "opsdroid"; repo = "opsdroid"; rev = "v${version}"; - sha256 = "15l2jvcpb9l8sgdd9zsvxqglf1r3vap0pp9cklpfa9jj0aik6nx9"; + sha256 = "0f32jf2rds9543akysxinf3hsgzr0w880xwcrcm1r2r0nhp8b8s5"; }; disabled = !python3Packages.isPy3k; diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index 0719c137aba5..45307504d731 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -29,21 +29,18 @@ mkDerivation rec { ''; desktopItem = makeDesktopItem { - type = "Application"; name = "ostinato"; desktopName = "Ostinato"; genericName = "Packet/Traffic Generator and Analyzer"; comment = "Network packet and traffic generator and analyzer with a friendly GUI"; - categories = "Network"; - terminal = "false"; - startupNotify = "true"; + categories = [ "Network" ]; + startupNotify = true; exec = "$out/bin/ostinato"; icon = ostinatoIcon; - extraEntries = '' - GenericName[it]=Generatore ed Analizzatore di pacchetti di rete - Comment[it]=Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole - ''; - fileValidation = false; + extraConfig = { + "GenericName[it]" = "Generatore ed Analizzatore di pacchetti di rete"; + "Comment[it]" = "Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole"; + }; }; postInstall = '' diff --git a/pkgs/applications/networking/p2p/dht/default.nix b/pkgs/applications/networking/p2p/dht/default.nix index 0088e517914f..b1d01f82876e 100644 --- a/pkgs/applications/networking/p2p/dht/default.nix +++ b/pkgs/applications/networking/p2p/dht/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "BitTorrent DHT library"; homepage = "https://github.com/transmission/dht"; license = licenses.mit; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/p2p/fragments/default.nix b/pkgs/applications/networking/p2p/fragments/default.nix index 721f0ca259f0..ebeba4c010e8 100644 --- a/pkgs/applications/networking/p2p/fragments/default.nix +++ b/pkgs/applications/networking/p2p/fragments/default.nix @@ -1,77 +1,90 @@ { lib , stdenv , fetchFromGitLab -, meson -, vala -, ninja -, pkg-config -, wrapGAppsHook -, desktop-file-utils +, fetchpatch , appstream-glib -, python3 +, dbus +, desktop-file-utils +, git , glib -, gtk3 -, libhandy -, libtransmission -, libb64 -, libutp -, miniupnpc -, dht -, libnatpmp -, libevent -, curl +, gtk4 +, libadwaita +, meson +, ninja , openssl -, zlib +, pkg-config +, python3 +, rustPlatform +, sqlite +, transmission +, wrapGAppsHook4 }: -stdenv.mkDerivation rec { +let + patchedTransmission = transmission.overrideAttrs (oldAttrs: { + patches = (oldAttrs.patches or []) ++ [ + (fetchpatch { + url = "https://raw.githubusercontent.com/flathub/de.haeckerfelix.Fragments/2aee477c8e26a24570f8dbbdbd1c49e017ae32eb/transmission_pdeathsig.patch"; + sha256 = "sha256-/rCoA566tMmzqcIfffC082Y56TwEyyQJ0knxymtscbA="; + }) + ]; + }); +in stdenv.mkDerivation rec { pname = "fragments"; - version = "1.5"; + version = "2.0.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Fragments"; rev = version; - sha256 = "0x1kafhlgyi65l4w67c24r8mpvasg3q3c4wlgnjc9sxvp6ki7xbn"; + sha256 = "sha256-CMa1yka0kOxMhxSuazlJxTk4fzxuuwKYLBpEMwHbBUE="; }; - patches = [ - # Fix dependency resolution - ./dependency-resolution.patch - ]; + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-/rFZcbpITYkpSCEZp9XH253u90RGmuVLEBGIRNBgI/o="; + }; nativeBuildInputs = [ + appstream-glib + desktop-file-utils + git meson - vala ninja pkg-config - wrapGAppsHook - desktop-file-utils - appstream-glib python3 - ]; + wrapGAppsHook4 + ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); buildInputs = [ + dbus glib - gtk3 - libhandy - libtransmission - libb64 - libutp - miniupnpc - dht - libnatpmp - libevent - curl + gtk4 + libadwaita openssl - zlib + sqlite ]; + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ patchedTransmission ]}" + ) + ''; + meta = with lib; { homepage = "https://gitlab.gnome.org/World/Fragments"; - description = "A GTK3 BitTorrent Client"; - maintainers = with maintainers; [ angustrau ]; + description = "Easy to use BitTorrent client for the GNOME desktop environment"; + maintainers = with maintainers; [ emilytrau ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/p2p/fragments/dependency-resolution.patch b/pkgs/applications/networking/p2p/fragments/dependency-resolution.patch deleted file mode 100644 index 0446bc1390c7..000000000000 --- a/pkgs/applications/networking/p2p/fragments/dependency-resolution.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/meson.build b/meson.build -index 5030d0c..6de7a20 100644 ---- a/meson.build -+++ b/meson.build -@@ -32,10 +32,11 @@ transmission_dep = declare_dependency( - meson.get_compiler('c').find_library('dht'), - meson.get_compiler('c').find_library('natpmp'), - meson.get_compiler('c').find_library('event'), -- meson.get_compiler('c').find_library('libcurl'), -- meson.get_compiler('c').find_library('libcrypto'), -+ meson.get_compiler('c').find_library('curl'), -+ meson.get_compiler('c').find_library('crypto'), -+ meson.get_compiler('c').find_library('ssl'), - meson.get_compiler('c').find_library('libpthread'), -- meson.get_compiler('c').find_library('libz'), -+ meson.get_compiler('c').find_library('z'), - transmission_vapi, - transmission_lib - ]) -@@ -45,4 +46,4 @@ subdir('data') - subdir('po') - subdir('src') - --meson.add_install_script('build-aux/postinstall.py') -+meson.add_install_script('python3', '../build-aux/postinstall.py') diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index b3b277bf130a..cd6ae563aa0b 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -2,12 +2,11 @@ let version = "6.6.7-build-529"; - name = "frostwire-desktop-${version}"; src = fetchFromGitHub { owner = "frostwire"; repo = "frostwire"; - rev = name; + rev = "frostwire-desktop-${version}"; sha256 = "03wdj2kr8akzx8m1scvg98132zbaxh81qjdsxn2645b3gahjwz0m"; }; @@ -18,13 +17,13 @@ let exec = "frostwire"; icon = "frostwire"; comment = "Search and explore all kinds of files on the Bittorrent network"; - categories = "Network;FileTransfer;P2P;"; + categories = [ "Network" "FileTransfer" "P2P" ]; }; # fake build to pre-download deps into fixed-output derivation deps = stdenv.mkDerivation { - name = "${name}-deps"; - inherit src; + pname = "frostwire-desktop-deps"; + inherit version src; buildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -40,11 +39,12 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "11zd98g0d0fdgls4lsskkagwfxyh26spfd6c6g9cahl89czvlg3c"; + outputHash = "sha256-r6YSrbSJbM3063JrX4tCVKFrJxTaLN4Trc+33jzpwcE="; }; in stdenv.mkDerivation { - inherit name src; + pname = "frostwire-desktop"; + inherit version src; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ gradle_6 ]; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 02c383b30ff7..cfee9d91c930 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,28 +1,41 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "6.9.5"; + version = "6.9.7"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "sha256-jMv4wIBsmgg2Q/Q/QDJnWa5wUeD1ur6Lu6eXOCLaGg4="; + sha256 = "sha256-LsmDfNAj10x+txJ4PugyF3Irj/N1reb3ChTvFFIucdc="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/share/java mv $(ls */*.jar) $out/share/java makeWrapper $out/share/java/frostwire $out/bin/frostwire \ - --prefix PATH : ${jre}/bin/ + --prefix PATH : ${jre}/bin \ + --prefix LD_LIBRARY_PATH : $out/share/java \ + --set JAVA_HOME "${jre}" + + substituteInPlace $out/share/java/frostwire \ + --replace "export JAVA_PROGRAM_DIR=/usr/lib/frostwire/jre/bin" \ + "export JAVA_PROGRAM_DIR=${jre}/bin/" + + substituteInPlace $out/share/java/frostwire.desktop \ + --replace "Exec=/usr/bin/frostwire %U" "Exec=${placeholder "out"}/bin/frostwire %U" + + runHook postInstall ''; meta = with lib; { homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; - license = licenses.gpl2; + license = licenses.gpl3Plus; maintainers = with maintainers; [ gavin ]; platforms = [ "x86_64-linux"]; }; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 2ccf4ff4b860..f24f74e5ae05 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.15.3"; + version = "0.16.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-1iZpqPQeB46qIgznejL08/gB4wmTV66McFSY/nOITsU="; + sha256 = "sha256-0y2m8T/xzYZwUlcZ6g956fdtLef2Bphg4Kd/xpo2AGg="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix deleted file mode 100644 index 94a4642b2de1..000000000000 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkDerivation, lib, fetchurl, fetchpatch, cmake -, extra-cmake-modules, qtbase, qtscript -, karchive, kcrash, kdnssd, ki18n, kio, knotifications, knotifyconfig -, kdoctools, kross, kcmutils, kwindowsystem -, libktorrent, taglib, libgcrypt, kplotting -}: - -mkDerivation rec { - pname = "ktorrent"; - version = "${libktorrent.mainVersion}"; - - src = fetchurl { - url = "mirror://kde/stable/ktorrent/${libktorrent.mainVersion}/${pname}-${version}.tar.xz"; - sha256 = "0kwd0npxfg4mdh7f3xadd2zjlqalpb1jxk61505qpcgcssijf534"; - }; - - nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ]; - - buildInputs = [ - qtbase qtscript - karchive kcrash kdnssd ki18n kio knotifications knotifyconfig kross kcmutils kwindowsystem - libktorrent taglib libgcrypt kplotting - ]; - - meta = with lib; { - description = "KDE integrated BtTorrent client"; - homepage = "https://www.kde.org/applications/internet/ktorrent/"; - license = licenses.gpl2; - maintainers = with maintainers; [ eelco ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/p2p/libutp/default.nix b/pkgs/applications/networking/p2p/libutp/default.nix index 6fba4faf50c0..a07ffdea6b69 100644 --- a/pkgs/applications/networking/p2p/libutp/default.nix +++ b/pkgs/applications/networking/p2p/libutp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "uTorrent Transport Protocol library"; homepage = "https://github.com/transmission/libutp"; license = licenses.mit; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index ee5e98ed42c6..3c05398df0ea 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null); with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-xxQ6NGRSwRP+7kTxUsDB00VItHRHuaFopEroETtnGSs="; + sha256 = "sha256-HNgegPL7M0zwkn7+lcNcsgWgrCbY9/d0nuIlIC5hkAM="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 0a2f90ecb711..da7633221a5a 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -49,13 +49,9 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Transmission Remote GUI"; genericName = "BitTorrent Client"; - categories = lib.concatStringsSep ";" [ - "Application" "Network" "FileTransfer" "P2P" "GTK" - ]; - startupNotify = "true"; - mimeType = lib.concatStringsSep ";" [ - "application/x-bittorrent" "x-scheme-handler/magnet" - ]; + categories = [ "Application" "Network" "FileTransfer" "P2P" "GTK" ]; + startupNotify = true; + mimeTypes = [ "application/x-bittorrent" "x-scheme-handler/magnet" ]; }; postInstall = '' diff --git a/pkgs/applications/networking/p2p/tribler/aiohttp-apispec.nix b/pkgs/applications/networking/p2p/tribler/aiohttp-apispec.nix deleted file mode 100644 index 4e1f5ee6ca70..000000000000 --- a/pkgs/applications/networking/p2p/tribler/aiohttp-apispec.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder -, aiohttp, webargs, fetchFromGitHub, callPackage -}: - -let - apispec3 = callPackage ./apispec.nix {}; - jinja2 = callPackage ../../../../development/python2-modules/jinja2 {}; -in -buildPythonPackage rec { - pname = "aiohttp-apispec"; - version = "unstable-2021-21-08"; - - # unstable so we can use latest webargs - src = fetchFromGitHub { - owner = "maximdanilchenko"; - repo = "aiohttp-apispec"; - rev = "cfa19646394480dda289f6b7af19b7d50f245d81"; - sha256 = "uEgDRAlMjTa4rvdE3fkORCHIlCLzxPJJ2/m4ZRU3eIQ="; - fetchSubmodules = false; - }; - - propagatedBuildInputs = [ aiohttp webargs apispec3 jinja2 ]; - - pythonImportsCheck = [ - "aiohttp_apispec" - ]; - - # Requires pytest-sanic, currently broken in nixpkgs - doCheck = false; - - meta = with lib; { - description = "Build and document REST APIs with aiohttp and apispec"; - homepage = "https://github.com/maximdanilchenko/aiohttp-apispec/"; - license = licenses.mit; - maintainers = [ maintainers.viric ]; - }; -} diff --git a/pkgs/applications/networking/p2p/tribler/apispec.nix b/pkgs/applications/networking/p2p/tribler/apispec.nix deleted file mode 100644 index e60a440df3f4..000000000000 --- a/pkgs/applications/networking/p2p/tribler/apispec.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pyyaml -, prance -, marshmallow -, pytestCheckHook -, mock -, openapi-spec-validator -}: - -buildPythonPackage rec { - pname = "apispec"; - version = "3.3.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "d23ebd5b71e541e031b02a19db10b5e6d5ef8452c552833e3e1afc836b40b1ad"; - }; - - propagatedBuildInputs = [ - pyyaml - prance - ]; - - postPatch = '' - rm tests/test_ext_marshmallow.py - ''; - - checkInputs = [ - openapi-spec-validator - marshmallow - mock - pytestCheckHook - ]; - - pythonImportsCheck = [ - "apispec" - ]; - - meta = with lib; { - description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification"; - homepage = "https://github.com/marshmallow-code/apispec"; - license = licenses.mit; - maintainers = [ maintainers.viric ]; - }; -} diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 6a8f93a29381..d1df2fea444c 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,20 +1,23 @@ -{ stdenv, lib, fetchurl, python3, makeWrapper -, libtorrent-rasterbar-1_2_x, qt5 +{ lib +, stdenv +, fetchurl +, python3 +, makeWrapper +, libtorrent-rasterbar-1_2_x +, qt5 }: let libtorrent = (python3.pkgs.toPythonModule ( libtorrent-rasterbar-1_2_x.override { python = python3; })).python; - - aiohttp-apispec = python3.pkgs.callPackage ./aiohttp-apispec.nix { }; in stdenv.mkDerivation rec { pname = "tribler"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "1x45z23d1cqf0lai7wg5ki7gi2vba5hqk0swhggzplcjwma4wmh9"; + sha256 = "0ffh8chb47iaar8872gvalgm84fjzyxph16nixsxknnprqdxyrkx"; }; nativeBuildInputs = [ @@ -29,40 +32,38 @@ stdenv.mkDerivation rec { pythonPath = [ libtorrent ] ++ (with python3.pkgs; [ - twisted - netifaces - pycrypto - pyasn1 - requests - m2crypto - pyqt5 - chardet - cherrypy - cryptography - libnacl - configobj - decorator - feedparser - service-identity - psutil - pillow - networkx - pony - lz4 - pyqtgraph - pyyaml aiohttp aiohttp-apispec + asynctest + chardet + cherrypy + configobj + cryptography + decorator faker - sentry-sdk + feedparser + libnacl + lz4 + m2crypto + netifaces + networkx + pillow + pony + psutil + pyasn1 + pycrypto + pyqt5 + pyqtgraph pytest-asyncio pytest-timeout - asynctest + pyyaml + requests + sentry-sdk + service-identity + twisted yappi - - # there is a BTC feature, but it requires some unclear version of - # bitcoinlib, so this doesn't work right now. - # bitcoinlib + pydantic + anyio ]); installPhase = '' @@ -72,6 +73,7 @@ stdenv.mkDerivation rec { cp -prvd ./* $out/ makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \ --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ + --set QT_PLUGIN_PATH "${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" \ --set _TRIBLERPATH $out/src \ --set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \ --set NO_AT_BRIDGE 1 \ @@ -79,15 +81,22 @@ stdenv.mkDerivation rec { --add-flags "-O $out/src/run_tribler.py" mkdir -p $out/share/applications $out/share/icons - cp $out/build/debian/tribler/usr/share/applications/tribler.desktop $out/share/applications/tribler.desktop + cp $out/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop $out/share/applications/ cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm ''; + shellHook = '' + wrapPythonPrograms || true + export QT_QPA_PLATFORM_PLUGIN_PATH=$(echo ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms) + export PYTHONPATH=./tribler-core:./tribler-common:./tribler-gui:$program_PYTHONPATH + export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" + ''; + meta = with lib; { - maintainers = with maintainers; [ xvapx viric ]; + description = "Decentralised P2P filesharing client based on the Bittorrent protocol"; homepage = "https://www.tribler.org/"; - description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ xvapx viric ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 9c708b795885..c8e3c4ce7b91 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2 -, boost, db, openssl, geoip, libiconv, miniupnpc -, srcOnly, fetchgit +, boost, db, openssl, geoip, libiconv, miniupnpc, srcOnly }: let twisterHTML = srcOnly { name = "twister-html"; - src = fetchgit { - url = "git://github.com/miguelfreitas/twister-html.git"; + src = fetchFromGitHub { + owner = "miguelfreitas"; + repo = "twister-html"; rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b"; - sha256 = "0scjbin6s1kmi0bqq0dx0qyjw4n5xgmj567n0156i39f9h0dabqy"; + sha256 = "sha256-Hi/VAEwujWhKAPaYIuvrxRIuPQa9AYwXiHUGbWxckmk="; }; }; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 5a0d3e4870a3..8b0fad83b960 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pjsip"; - version = "2.11.1"; + version = "2.12"; src = fetchFromGitHub { owner = pname; repo = "pjproject"; rev = version; - sha256 = "sha256-mqtlxQDIFee93wpdn8oNWmMPDyjYTCmVqF6IJvJbRBM="; + sha256 = "sha256-snp9+PlffU9Ay8o42PM8SqyP60hu9nozp457HM+0bM8="; }; patches = [ diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 1283f0d7fa80..d56197c31347 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "1.8.12"; + version = "2.1.1"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "br-${version}"; - sha256 = "sha256-CkvD7PKx2Gm2KgsIIqQ9l1Z3tWlhqIbW0sxCV2UBYTE="; + sha256 = "sha256-8oDA1QU5ZjtQZoCPVDa1U3P2KLzXtegtOxm6rNh+Ahk="; }; - vendorSha256 = "sha256-Pz3xRTwlnJGh1XvxIbyjvYcMywk/wdp4hYovPLBD494="; + vendorSha256 = "sha256-n+WwkNHT+/CrC4vWIVHqYs2a8Qe/LNc0L3uoPZWDTts="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index b6583efe730e..ecfde0a39c20 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -1,8 +1,21 @@ -{ lib, fetchFromGitHub, gobject-introspection, imagemagick, -wrapGAppsHook, python3Packages, gtk3, networkmanager, webkitgtk }: +{ lib +, buildPythonApplication +, fetchFromGitHub +, wrapGAppsHook +, gobject-introspection +, imagemagick +, networkmanager +, pango +, webkitgtk +# Python libs +, protonvpn-nm-lib +, psutil +# Optionals +, withIndicator ? true +, libappindicator-gtk3 }: -python3Packages.buildPythonApplication rec { - pname = "protonvpn-linux-gui"; +buildPythonApplication rec { + pname = "protonvpn-gui"; version = "1.7.0"; src = fetchFromGitHub { @@ -12,22 +25,26 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-uzooFQBq2mhqTBr/cgea5cVQ889P70sgSk2vjXBQEfw="; }; - strictDeps = false; - nativeBuildInputs = [ - gobject-introspection imagemagick wrapGAppsHook + gobject-introspection + imagemagick + wrapGAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ protonvpn-nm-lib psutil ]; buildInputs = [ - gtk3 networkmanager webkitgtk - ]; + # To avoid enabling strictDeps = false (#56943) + gobject-introspection + networkmanager + pango + webkitgtk + ] ++ lib.optionals withIndicator [ libappindicator-gtk3 ]; - postFixup = '' + postInstall = '' # Setting icons for size in 16 32 48 64 72 96 128 192 512 1024; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps @@ -45,9 +62,9 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with lib; { - description = "Linux GUI for ProtonVPN, written in Python"; + description = "Official ProtonVPN Linux app"; homepage = "https://github.com/ProtonVPN/linux-app"; - maintainers = with maintainers; [ offline wolfangaukang ]; + maintainers = with maintainers; [ wolfangaukang ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 890553b338eb..54d7c5c6813a 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -12,8 +12,8 @@ let icon = "anydesk"; desktopName = "AnyDesk"; genericName = description; - categories = "Network;"; - startupNotify = "false"; + categories = [ "Network" ]; + startupNotify = false; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index f9450c588263..852fcf68987e 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.5.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-OLz/f4E+Haumw5Jaw+F1hiHz0jfcywhfK3fEUgLorao="; + sha256 = "sha256-+yKdB/glNf74drv9EvBwVMWrqr5ADBkSJVVDH+UKb2U="; }; postPatch = '' diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index da07d7d72ab9..9721c6b9ba43 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,25 +1,27 @@ { lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook , glib, gtk3, gettext, libxkbfile, libX11 -, freerdp, libssh, libgcrypt, gnutls +, freerdp, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, libsoup, spice-protocol, spice-gtk, libepoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz # The themes here are soft dependencies; only icons are missing without them. , gnome +, withLibsecret ? true +, withVte ? true }: with lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.23"; + version = "1.4.25"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "sha256-MyemiSAMZEa9Ng6WHEyHgrze8YtIbzMCR8CTb86PDsg="; + sha256 = "sha256-1val/KCClEtw1prVWuXJe8DmmQ7e7oqwAfAnT9G9iHI="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; @@ -29,15 +31,17 @@ stdenv.mkDerivation rec { freerdp libssh libgcrypt gnutls pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon - libsecret libsoup spice-protocol spice-gtk libepoxy at-spi2-core + libsoup spice-protocol spice-gtk libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz - ]; + ] ++ optionals withLibsecret [ libsecret ] + ++ optionals withVte [ vte ]; cmakeFlags = [ - "-DWITH_VTE=OFF" + "-DWITH_VTE=${if withVte then "ON" else "OFF"}" "-DWITH_TELEPATHY=OFF" "-DWITH_AVAHI=OFF" + "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" "-DFREERDP_LIBRARY=${freerdp}/lib/libfreerdp2.so" "-DFREERDP_CLIENT_LIBRARY=${freerdp}/lib/libfreerdp-client2.so" "-DFREERDP_WINPR_LIBRARY=${freerdp}/lib/libwinpr2.so" diff --git a/pkgs/applications/networking/remote/rustdesk/cargo.patch b/pkgs/applications/networking/remote/rustdesk/cargo.patch new file mode 100644 index 000000000000..ecf2f4af5beb --- /dev/null +++ b/pkgs/applications/networking/remote/rustdesk/cargo.patch @@ -0,0 +1,50 @@ +diff --git a/Cargo.lock b/Cargo.lock +index c3e139e..b77d8bd 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1761,11 +1761,11 @@ dependencies = [ + + [[package]] + name = "magnum-opus" +-version = "0.3.4-2" +-source = "git+https://github.com/open-trade/magnum-opus#ad0836164abf4a4df69009b1ee08eabe3a13b33f" ++version = "0.4.0" ++source = "git+https://github.com/TheRadioGuy/magnum-opus#171e1d021004626f7444d1e39b98f50bc3cb2604" + dependencies = [ +- "bindgen 0.59.1", +- "target_build_utils", ++ "libc", ++ "opusic-sys", + ] + + [[package]] +@@ -2188,6 +2188,16 @@ version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" + ++[[package]] ++name = "opusic-sys" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5eace752ce07a037241dba8f02c654799f051e431b27028056bcb480e83b54f5" ++dependencies = [ ++ "cmake", ++ "libc", ++] ++ + [[package]] + name = "parity-tokio-ipc" + version = "0.7.2" +diff --git a/Cargo.toml b/Cargo.toml +index 75504a0..43e1624 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -32,7 +32,7 @@ libc = "0.2" + parity-tokio-ipc = { git = "https://github.com/open-trade/parity-tokio-ipc" } + flexi_logger = "0.17" + runas = "0.2" +-magnum-opus = { git = "https://github.com/open-trade/magnum-opus" } ++magnum-opus = { git = "https://github.com/TheRadioGuy/magnum-opus" } + dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true } + rubato = { version = "0.8", optional = true } + samplerate = { version = "0.2", optional = true } diff --git a/pkgs/applications/networking/remote/rustdesk/default.nix b/pkgs/applications/networking/remote/rustdesk/default.nix new file mode 100644 index 000000000000..677629dbcfba --- /dev/null +++ b/pkgs/applications/networking/remote/rustdesk/default.nix @@ -0,0 +1,104 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, makeWrapper +, rustPlatform +, cmake +, yasm +, nasm +, zip +, pkg-config +, clang +, gtk3 +, xdotool +, libxcb +, libXfixes +, alsa-lib +, pulseaudio +, libXtst +, libvpx +, libyuv +, libopus +, libsciter +, llvmPackages +, wrapGAppsHook +}: + +rustPlatform.buildRustPackage rec { + pname = "rustdesk"; + version = "1.1.8"; + + src = fetchFromGitHub { + owner = "rustdesk"; + repo = "rustdesk"; + rev = "0325500ebf331b66220cec6e9078afb83b0e98a7"; + sha256 = "sha256-xglyyoiAjJx3y8+A2OYHZffjqjDkcTjIluPA/J42VVg="; + }; + + cargoSha256 = "sha256-4MQKa54f3X7IHGd29H6RY7v2toeHvTHInIpgXjdotjw="; + + LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; + + # Change magnus-opus version to upstream so that it does not use + # vcpkg for libopus since it does not work. + cargoPatches = [ + ./cargo.patch + ]; + + # Manually simulate a vcpkg installation so that it can link the libaries + # properly. + postUnpack = let + vcpkg_target = "x64-linux"; + in '' + export VCPKG_ROOT="$TMP/vcpkg"; + + mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib + + ln -s ${libvpx.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ + ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ + ''; + + nativeBuildInputs = [ pkg-config cmake makeWrapper copyDesktopItems yasm nasm clang wrapGAppsHook ]; + buildInputs = [ alsa-lib pulseaudio libXfixes libxcb xdotool gtk3 libvpx libopus libXtst libyuv ]; + + # Checks require an active X display. + doCheck = false; + + desktopItems = [ (makeDesktopItem { + name = "rustdesk"; + exec = meta.mainProgram; + icon = "rustdesk"; + desktopName = "RustDesk"; + comment = meta.description; + genericName = "Remote Desktop"; + categories = ["Network"]; + }) ]; + + # Add static ui resources and libsciter to same folder as binary so that it + # can find them. + postInstall = '' + mkdir -p $out/{share/src,lib/rustdesk} + + # so needs to be next to the executable + mv $out/bin/rustdesk $out/lib/rustdesk + ln -s ${libsciter}/lib/libsciter-gtk.so $out/lib/rustdesk + + makeWrapper $out/lib/rustdesk/rustdesk $out/bin/rustdesk \ + --run "cd $out/share" + + cp -a $src/src/ui $out/share/src + + install -Dm0644 $src/logo.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg + ''; + + meta = with lib; { + description = "Yet another remote desktop software"; + homepage = "https://rustdesk.com"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ leixb ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "rustdesk"; + }; +} diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 9d9e1a7c8df9..00289e5c6286 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "15.25.5"; + version = "15.26.4"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-LtITPS0bLy85dv/zdOo8JcsEZ0ZgtVmM+CcggaYJxXA="; + sha256 = "sha256-2CprtdKHHTLxS8jA4bRVoHvj/8zyVUV0aGPzU7mNxM8="; }; unpackPhase = '' diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index 033386afd1ff..f114f8a3091b 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -1,57 +1,40 @@ { stdenv , lib -, at-spi2-atk -, atk , buildFHSUserEnv -, cairo -, dbus , fetchurl -, fontconfig -, freetype -, gdk-pixbuf -, glib , gsettings-desktop-schemas -, gtk2 -, gtk3-x11 -, harfbuzz -, liberation_ttf -, libjpeg -, libtiff -, libudev0-shim -, libuuid -, libX11 -, libXcursor -, libXext -, libXi -, libXinerama -, libxkbfile -, libxml2 -, libXrandr -, libXrender -, libXScrnSaver -, libxslt -, libXtst , makeDesktopItem , makeWrapper -, pango -, pcsclite -, pixman -, zlib +, writeTextDir +, configText ? "" }: let - version = "2106.1"; + version = "2111"; sysArch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" else throw "Unsupported system: ${stdenv.hostPlatform.system}"; # The downloaded archive also contains ARM binaries, but these have not been tested. + # For USB support, ensure that /var/run/vmware/ + # exists and is owned by you. Then run vmware-usbarbitrator as root. + bins = [ "vmware-view" "vmware-usbarbitrator" ]; + + # This forces the default GTK theme (Adwaita) because Horizon is prone to + # UI usability issues when using non-default themes, such as Adwaita-dark. + wrapBinCommands = name: '' + makeWrapper "$out/bin/${name}" "$out/bin/${name}_wrapper" \ + --set GTK_THEME Adwaita \ + --suffix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ + --suffix LD_LIBRARY_PATH : "$out/lib/vmware/view/crtbora:$out/lib/vmware" + ''; + vmwareHorizonClientFiles = stdenv.mkDerivation { name = "vmwareHorizonClientFiles"; inherit version; src = fetchurl { - url = "https://download3.vmware.com/software/view/viewclients/CART22FQ2/VMware-Horizon-Client-Linux-2106.1-8.3.1-18435609.tar.gz"; - sha256 = "b42ddb9d7e9c8d0f8b86b69344fcfca45251c5a5f1e06a18a3334d5a04e18c39"; + url = "https://download3.vmware.com/software/view/viewclients/CART22FH2/VMware-Horizon-Client-Linux-2111-8.4.0-18957622.tar.gz"; + sha256 = "2f79d2d8d34e6f85a5d21a3350618c4763d60455e7d68647ea40715eaff486f7"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -65,27 +48,19 @@ let # Deleting the bundled library is the simplest way to force it to use our version. rm "$out/lib/vmware/gcc/libstdc++.so.6" - # This libjpeg library interferes with Chromium, so we will be using ours instead. - rm $out/lib/vmware/libjpeg.* - # This library causes the program to core-dump occasionally. Use ours instead. rm $out/lib/vmware/view/crtbora/libcairo.* - # Force the default GTK theme (Adwaita) because Horizon is prone to - # UI usability issues when using non-default themes, such as Adwaita-dark. - makeWrapper "$out/bin/vmware-view" "$out/bin/vmware-view_wrapper" \ - --set GTK_THEME Adwaita \ - --suffix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ - --suffix LD_LIBRARY_PATH : "$out/lib/vmware/view/crtbora:$out/lib/vmware" + ${lib.concatMapStrings wrapBinCommands bins} ''; }; - vmwareFHSUserEnv = buildFHSUserEnv { - name = "vmware-view"; + vmwareFHSUserEnv = name: buildFHSUserEnv { + inherit name; - runScript = "${vmwareHorizonClientFiles}/bin/vmware-view_wrapper"; + runScript = "${vmwareHorizonClientFiles}/bin/${name}_wrapper"; - targetPkgs = pkgs: [ + targetPkgs = pkgs: with pkgs; [ at-spi2-atk atk cairo @@ -99,25 +74,29 @@ let harfbuzz liberation_ttf libjpeg + libpulseaudio libtiff libudev0-shim libuuid - libX11 - libXcursor - libXext - libXi - libXinerama - libxkbfile + libv4l libxml2 - libXrandr - libXrender - libXScrnSaver - libXtst pango pcsclite pixman vmwareHorizonClientFiles + xorg.libX11 + xorg.libXcursor + xorg.libXext + xorg.libXi + xorg.libXinerama + xorg.libxkbfile + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst zlib + + (writeTextDir "etc/vmware/config" configText) ]; }; @@ -125,20 +104,26 @@ let name = "vmware-view"; desktopName = "VMware Horizon Client"; icon = "${vmwareHorizonClientFiles}/share/icons/vmware-view.png"; - exec = "${vmwareFHSUserEnv}/bin/vmware-view %u"; - mimeType = "x-scheme-handler/vmware-view"; + exec = "${vmwareFHSUserEnv "vmware-view"}/bin/vmware-view %u"; + mimeTypes = [ "x-scheme-handler/vmware-view" ]; }; + binLinkCommands = lib.concatMapStringsSep + "\n" + (bin: "ln -s ${vmwareFHSUserEnv bin}/bin/${bin} $out/bin/") + bins; + in stdenv.mkDerivation { - name = "vmware-view"; + pname = "vmware-horizon-client"; + inherit version; dontUnpack = true; installPhase = '' mkdir -p $out/bin $out/share/applications - cp "${desktopItem}"/share/applications/* $out/share/applications/ - ln -s "${vmwareFHSUserEnv}/bin/vmware-view" "$out/bin/" + cp ${desktopItem}/share/applications/* $out/share/applications/ + ${binLinkCommands} ''; unwrapped = vmwareHorizonClientFiles; @@ -146,10 +131,11 @@ stdenv.mkDerivation { passthru.updateScript = ./update.sh; meta = with lib; { + mainProgram = "vmware-view"; description = "Allows you to connect to your VMware Horizon virtual desktop"; homepage = "https://www.vmware.com/go/viewclients"; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ buckley310 ]; }; } diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index dfed1f590758..bf9f59444aae 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,7 +1,21 @@ -{ lib, fetchurl, cups, libssh, libXpm, nx-libs, openldap, openssh -, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }: +{ lib +, fetchurl +, cups +, libssh +, libXpm +, nx-libs +, openldap +, openssh +, qt5 +, qtbase +, qtsvg +, qtx11extras +, qttools +, phonon +, pkg-config +}: -mkDerivation rec { +qt5.mkDerivation rec { pname = "x2goclient"; version = "4.1.2.2"; @@ -10,8 +24,24 @@ mkDerivation rec { sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So="; }; - buildInputs = [ cups libssh libXpm nx-libs openldap openssh - qtbase qtsvg qtx11extras qttools phonon pkg-config ]; + buildInputs = [ + cups + libssh + libXpm + nx-libs + openldap + openssh + qtbase + qtsvg + qtx11extras + qttools + phonon + ]; + + nativeBuildInputs = [ + pkg-config + qt5.wrapQtAppsHook + ]; postPatch = '' substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd" @@ -26,7 +56,7 @@ mkDerivation rec { installTargets = [ "install_client" "install_man" ]; - qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ]; + qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" "--set QT_QPA_PLATFORM xcb" ]; meta = with lib; { description = "Graphical NoMachine NX3 remote desktop client"; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 7d5d414a4f97..f2cd1282fc6e 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "seafile-client"; - version = "8.0.5"; + version = "8.0.6"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "1p9wkvnr3km829gy84b1w1pv72pany5vr3r7ydz1c0aqrp0snfhx"; + sha256 = "sha256-pImSrQ63AS1hi9CUvFAR91ZHgPCJB0ZOAA0fEZ24O8o="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix new file mode 100644 index 000000000000..8c26b7290836 --- /dev/null +++ b/pkgs/applications/networking/seahub/default.nix @@ -0,0 +1,74 @@ +{ lib, fetchFromGitHub, python3, makeWrapper }: +let + # Seahub 8.x.x does not support django-webpack-loader >=1.x.x + python = python3.override { + packageOverrides = self: super: { + django-webpack-loader = super.django-webpack-loader.overridePythonAttrs (old: rec { + version = "0.7.0"; + src = old.src.override { + inherit version; + sha256 = "0izl6bibhz3v538ad5hl13lfr6kvprf62rcl77wq2i5538h8hg3s"; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { + pname = "seahub"; + version = "8.0.8"; + + src = fetchFromGitHub { + owner = "haiwen"; + repo = "seahub"; + rev = "c51346155b2f31e038c3a2a12e69dcc6665502e2"; # using a fixed revision because upstream may re-tag releases :/ + sha256 = "0dagiifxllfk73xdzfw2g378jccpzplhdrmkwbaakbhgbvvkg92k"; + }; + + dontBuild = true; + doCheck = false; # disabled because it requires a ccnet environment + + nativeBuildInputs = [ makeWrapper ]; + + propagatedBuildInputs = with python.pkgs; [ + django + future + django-statici18n + django-webpack-loader + django-simple-captcha + django-picklefield + django-formtools + mysqlclient + pillow + python-dateutil + django_compressor + djangorestframework + openpyxl + requests + requests_oauthlib + pyjwt + pycryptodome + qrcode + pysearpc + seaserv + gunicorn + ]; + + installPhase = '' + cp -dr --no-preserve='ownership' . $out/ + wrapProgram $out/manage.py \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/thirdpart:" + ''; + + passthru = { + inherit python; + pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; + }; + + meta = with lib; { + homepage = "https://github.com/haiwen/seahub"; + description = "The web end of seafile server"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ greizgh schmittlauch ]; + }; +} diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 2254b4f34156..4b6ae464e7d9 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.85"; + version = "2.90"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-MsPvda+VaqO3tXH26nVukNWcJ1n+/n5Qk7BMr/DAVUk="; + sha256 = "sha256-PZe/yUJGcj3/nIYaf7eAbiJIA2YASJ8nlMLIWWKJrbo="; }; - vendorSha256 = "sha256-TYVBfjwaoEBKJmIHdwvj/5g4jYmnmJPE1mCL/yET1GQ="; + vendorSha256 = "sha256-E6bMpWzXb5dMPXkrVSJJWXJYvkmI3cNRseMgrQNpCl4="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 3128529f0e67..d698601cb190 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -1,33 +1,31 @@ { lib , buildGoModule , fetchFromGitHub -, genericUpdater -, common-updater-scripts +, gitUpdater , makeWrapper , openssh }: buildGoModule rec { pname = "shellhub-agent"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "saaohHHjX9ws74SXlpP+V9cks0ddLkz04ceY14uoVhA="; + sha256 = "A1634b3uxlILMpx/9jpCIApqAqofvD4ZPasVKL29Gtc="; }; modRoot = "./agent"; - vendorSha256 = "sha256-Xfzk6Ts6+LzGaMTcbopGG6WT541nkAnZxq/3AlX81ks="; + vendorSha256 = "sha256-LxJtLQr8djoRGznT5hL2agTgtZY6pFS8Zo0BwHDmugc="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; passthru = { - updateScript = genericUpdater { + updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; ignoredVersions = ".(rc|beta).*"; }; diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 5bcbac74ca7c..401d6dfa32cd 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -3,7 +3,6 @@ , autoconf , automake , fetchFromGitHub -, fetchpatch , libpcap , ncurses , openssl @@ -12,25 +11,15 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.4.9"; + version = "1.4.10"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-92wPRDFSoIOYFv3XKdsuYH8j3D8kXyg++q6VpIIMGDg="; + sha256 = "sha256-P618QLk85W0oPisAGiRfpCgHCddKutUkGjwdfgsV4Es="; }; - patches = [ - # Pull fix pending upstream inclusion for ncurses-6.3 support: - # https://github.com/irontec/sngrep/pull/382 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/irontec/sngrep/commit/d09e1c323dbd7fc899e8985899baec568f045601.patch"; - sha256 = "sha256-nY5i3WQh/oKboEAh4wvxF5Imf2BHYEKdFj+WF1M3SSA="; - }) - ]; - nativeBuildInputs = [ autoconf automake diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 4e4db0e74e97..b667c7671bdc 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -11,7 +11,7 @@ assert withQt -> qt5 != null; with lib; let - version = "3.6.1"; + version = "3.6.2"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-BDTtqPtr+I4rQqZ+tdHeJUpn1QW+w7tR/unXyteSWjg="; + sha256 = "sha256-XZAaVXKu+VPwStwlPtKgaZ1MYnedMkkCHh6FQaAkww4="; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index 34579ec8ba77..c38a01a49d5e 100644 --- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -5,13 +5,13 @@ with lib; python3Packages.buildPythonApplication rec { pname = "nicotine-plus"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Nicotine-Plus"; repo = "nicotine-plus"; rev = version; - hash = "sha256-E8b2VRlnMWmBHu919QDPBYuMbrjov9t//bHi1Y/F0Ak="; + hash = "sha256-3NXlNd3Zy++efnvcnfIOUP83mdJ5h8BmE4a2uWn5CPQ="; }; nativeBuildInputs = [ gettext wrapGAppsHook ]; diff --git a/pkgs/applications/networking/ssb-patchwork/default.nix b/pkgs/applications/networking/ssb-patchwork/default.nix index 0223c153f5c8..4d0fd119285b 100644 --- a/pkgs/applications/networking/ssb-patchwork/default.nix +++ b/pkgs/applications/networking/ssb-patchwork/default.nix @@ -26,7 +26,7 @@ let comment = "Client for the decentralized social network Secure Scuttlebutt"; desktopName = "Patchwork"; genericName = "Patchwork"; - categories = "Network;"; + categories = [ "Network" ]; }; in diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix index bc2776657c20..98b29038edec 100644 --- a/pkgs/applications/networking/sync/desync/default.nix +++ b/pkgs/applications/networking/sync/desync/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "desync"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "folbricht"; repo = "desync"; - sha256 = "0j9hixgkja268r2zn2dglrmlrb2z57sgz6q3wqb8dfwpan7b5rsy"; + sha256 = "sha256-yGlf6Z38GnOWSc2pvt/u4arx5lCB0QpoqPdNamdL9b0="; }; - vendorSha256 = "1gajh99jb6mbwk93dypddhl7r7n8h2s11s3s82firbrb5k24s4pz"; + vendorSha256 = "sha256-c+Sz3WMKyzdEE/Hs+7dekQPn+62ddbmfvV21W0KeLDU="; # nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad. doCheck = false; diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index 2cbf706ea78e..68af0bd2890a 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.15"; + version = "2.4.16"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nYko7htg16Sp/Fs+KuPflrpHn8WShM0OKozhr9BFH5U="; + sha256 = "sha256-GoufEcCu/Cg2Fu0RcjTi4te/7+gZfQRTj+AtK0YnF5I="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index f9fbb071b06a..9ebd9db67f9d 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.57.0"; + version = "1.58.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0pwbprbkx5y0c93b61k8znan4aimk7dkssapjhkhzw4c38xd4lza"; + sha256 = "sha256-zCKXi3qeiq2AGT7UioVfCbB4bc5F2tXJ507zPa+O0pc="; }; - vendorSha256 = "0353pff07lwpa1jmi095kb2izcw09z73x6nninnnpyqppwzas6ha"; + vendorSha256 = "sha256-mgupx5SNQ3wUkQCeTVnw3wwdSCrTcwLYxcX6tlqXTyQ="; subPackages = [ "." ]; @@ -40,8 +40,13 @@ buildGoModule rec { ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell installShellCompletion rclone.$shell done - '' + lib.optionalString (enableCmount && !stdenv.isDarwin) '' - wrapProgram $out/bin/rclone --prefix LD_LIBRARY_PATH : "${fuse}/lib" + '' + 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. + '' + wrapProgram $out/bin/rclone \ + --suffix PATH : "${lib.makeBinPath [ fuse ] }" \ + --prefix LD_LIBRARY_PATH : "${fuse}/lib" ''; meta = with lib; { diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 9759516eddc2..497b91ad361e 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "unison"; - version = "2.51.5"; + version = "2.52.0"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${version}"; - sha256 = "sha256-pi5uYwPpIy0lERmgATWQCO3EA3Pg5pnn7gxv49FaPug="; + sha256 = "sha256-YCuXkHqY+JHsguvst2UkI/6YlFt3iTvchO8PQuS15nI="; }; nativeBuildInputs = [ makeWrapper ] @@ -60,12 +60,9 @@ stdenv.mkDerivation rec { genericName = "File synchronization tool"; exec = "unison"; icon = "unison"; - categories = "Utility;FileTools;GTK;"; - extraDesktopEntries = { - StartupWMClass = "Unison"; - StartupNotify = "true"; - X-MultipleArgs = "false"; - }; + categories = [ "Utility" "FileTools" "GTK" ]; + startupNotify = true; + startupWMClass = "Unison"; }); meta = with lib; { diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix new file mode 100644 index 000000000000..53a112790bae --- /dev/null +++ b/pkgs/applications/networking/sync/wdt/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, cmake, folly, boost, gflags, glog, openssl, double-conversion, fmt }: + +stdenv.mkDerivation { + pname = "wdt"; + version = "unstable-2022-03-24"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "wdt"; + rev = "43319e59d0c77092468367cdadab37d12d7a2383"; + sha256 = "sha256-MajYK2eTUbWhEql0iTlgW5yLg9xAGZQk+Dx4fNxFFqw="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ folly boost gflags glog openssl double-conversion fmt ]; + + # source is expected to be named wdt + # https://github.com/facebook/wdt/blob/43319e59d0c77092468367cdadab37d12d7a2383/CMakeLists.txt#L238 + postUnpack = '' + ln -s $sourceRoot wdt + ''; + + cmakeFlags = [ + "-DWDT_USE_SYSTEM_FOLLY=ON" + ]; + + meta = with lib; { + description = "Warp speed Data Transfer"; + homepage = "https://github.com/facebook/wdt"; + license = licenses.bsd3; + maintainers = with maintainers; [ nickcao ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index fe8f22b4d43e..31d0ce461d09 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.18.6"; + version = "1.19.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "sha256-fkIHHyhwZV0/aB/JFwz3XrYVOaCn5ZK3ihY3GVoOAHg="; + sha256 = "sha256-/CRDdKUeLQ/jSLrd44Tjbb0lfgFFnJkpmFEYZJFQHY8="; }; - vendorSha256 = "sha256-D16jlzP1amkiHW+/BqQV/DISf/H9MlZgvMJmlGtvrhg="; + vendorSha256 = "sha256-GBDGckGewo5Yp8zwAKwwXkSP5lx0fQR4AHQFkzO7Q0Q="; doCheck = false; diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index c699781376ac..318ac8762395 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -8,23 +8,26 @@ , lib , udev , wrapGAppsHook +, libxshmfence }: stdenv.mkDerivation rec { pname = "termius"; - version = "7.17.1"; + version = "7.37.0"; src = fetchurl { # find the latest version with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.version' # and the url with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_81.snap"; - sha256 = "sha256-jNwWQTjUy8nJ8gHlbP9WgDlARWOhTQAA7KAcQNXKhNg="; + # and the sha512 with + # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_108.snap"; + sha512 = "05c4a0baeee8c1ff9547017288d099a9ef7b3049647ef0318ca4b1112df26f9f3a844bbae5f9ada59adaf07838987e2a685aee21ea494945202009236fe5f6bc"; }; desktopItem = makeDesktopItem { - categories = "Network;"; + categories = [ "Network" ]; comment = "The SSH client that works on Desktop and Mobile"; desktopName = "Termius"; exec = "termius-app"; @@ -40,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ]; - buildInputs = atomEnv.packages; + buildInputs = atomEnv.packages ++ [ libxshmfence ]; unpackPhase = '' runHook preUnpack @@ -52,15 +55,7 @@ stdenv.mkDerivation rec { runHook preInstall cd squashfs-root mkdir -p $out/opt/termius - cp -r \ - icudtl.dat \ - libffmpeg.so \ - locales \ - resources \ - resources.pak \ - termius-app \ - v8_context_snapshot.bin \ - $out/opt/termius + cp -r ./ $out/opt/termius mkdir -p "$out/share/applications" "$out/share/pixmaps/termius-app.png" cp "${desktopItem}/share/applications/"* "$out/share/applications" diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index cd0b47a3957a..5f889f6c5e79 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "testssl.sh"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "drwetter"; repo = pname; rev = "v${version}"; - sha256 = "016qpsb4dv9qb3ab3hmvk4vzf4ipr3xgmzv2cx46pxxsj0gnigd8"; + sha256 = "sha256-SZfGiKSbLq81YdDMgG0C6LC/nE5NApqeWK/PqDzQNBU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/wayback_machine_downloader/Gemfile b/pkgs/applications/networking/wayback_machine_downloader/Gemfile index e519efbf5701..3625511551d3 100644 --- a/pkgs/applications/networking/wayback_machine_downloader/Gemfile +++ b/pkgs/applications/networking/wayback_machine_downloader/Gemfile @@ -1,5 +1,4 @@ # frozen_string_literal: true -source 'https://rubygems.org' do - gem 'wayback_machine_downloader' -end +source 'https://rubygems.org' +gem 'wayback_machine_downloader' diff --git a/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock b/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock index 4534beb20c39..936e10996fb3 100644 --- a/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock +++ b/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - wayback_machine_downloader (2.2.1) + wayback_machine_downloader (2.3.1) PLATFORMS ruby DEPENDENCIES - wayback_machine_downloader! + wayback_machine_downloader BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/pkgs/applications/networking/wayback_machine_downloader/gemset.nix b/pkgs/applications/networking/wayback_machine_downloader/gemset.nix index 1ef3cd36536d..87cb3019d0a5 100644 --- a/pkgs/applications/networking/wayback_machine_downloader/gemset.nix +++ b/pkgs/applications/networking/wayback_machine_downloader/gemset.nix @@ -4,9 +4,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12kb1qmvmmsaihqab1prn6cmynkn6cgb4vf41mgv22wkcgv5wgk2"; + sha256 = "170426sashqc2k2angg8d0bhs7spi1x1isv6cyk2hif0l6xxm3cm"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.1"; }; } diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 05bb88bdfe74..abc8e33fd370 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.0.2"; + version = "0.0.3"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz"; - sha256 = "1fvv4mlgf0vqcq5zh0zl2xr44saz0sm47r8whcywwrmcm0l66iv6"; + sha256 = "sha256-m9vfgytSKnWLf6hwKjIGcU/7OCmIBiF4hJ/yIRBdSpQ="; }; nativeBuildInputs = [ @@ -46,13 +46,14 @@ stdenv.mkDerivation rec { ''; preFixup = let - libPath = lib.makeLibraryPath [ + binPath = lib.makeBinPath [ xdg-user-dirs ]; in '' # Add missing libraries to appflowy using the ones it comes with makeWrapper $out/opt/app_flowy $out/bin/appflowy \ - --set LD_LIBRARY_PATH "$out/opt/lib/:${libPath}" + --set LD_LIBRARY_PATH "$out/opt/lib/" \ + --prefix PATH : "${binPath}" ''; desktopItems = [ @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { desktopName = "AppFlowy"; comment = meta.description; exec = "appflowy"; - categories = "Office;"; + categories = [ "Office" ]; }) ]; diff --git a/pkgs/applications/office/autokey/remove-requires-dbus-python.patch b/pkgs/applications/office/autokey/remove-requires-dbus-python.patch deleted file mode 100644 index 73372e435291..000000000000 --- a/pkgs/applications/office/autokey/remove-requires-dbus-python.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -71,7 +71,7 @@ - 'console_scripts': ['autokey-gtk=autokey.gtkui.__main__:main'] - }, - scripts=['autokey-qt', 'autokey-run', 'autokey-shell'], -- install_requires=['dbus-python', 'pyinotify', 'python3-xlib'], -+ install_requires=['pyinotify', 'python-xlib'], - classifiers=[ - 'Development Status :: 4 - Beta', - 'Intended Audience :: Developers', diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index 8bd1d8f974b3..9cdbd14e105c 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -1,43 +1,67 @@ -{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, glib, webkitgtk, libgee -, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook -, appstream, desktop-file-utils }: +{ lib +, stdenv +, fetchFromGitHub +, appstream +, bash +, coreutils +, curl +, desktop-file-utils +, glib +, gnugrep +, gobject-introspection +, gtk3 +, html2text +, libgee +, libxml2 +, meson +, ninja +, pantheon +, pkg-config +, poppler +, poppler_utils +, python3 +, sqlite +, unar +, unzip +, vala +, webkitgtk +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "bookworm"; - version = "1.1.2"; + version = "unstable-2022-01-09"; src = fetchFromGitHub { owner = "babluboy"; repo = pname; - rev = version; - sha256 = "0w0rlyahpgx0l6inkbj106agbnr2czil0vdcy1zzv70apnjz488j"; + rev = "f3df858ce748a6bbc43f03a6e261ff76a6d7d303"; + hash = "sha256-mLyJfblF5WnWBV3rX1ZRupccou4t5mBpo3W7+ECNMVI="; }; nativeBuildInputs = [ bash - gobject-introspection - libxml2 meson ninja pkg-config - python3 vala wrapGAppsHook ]; buildInputs = [ - pantheon.elementary-icon-theme - pantheon.granite - glib - libgee - gtk3 - html2text - poppler - python2 - sqlite - webkitgtk appstream desktop-file-utils + glib + gobject-introspection + gtk3 + html2text + libgee + libxml2 + pantheon.granite + poppler + python3 + sqlite + webkitgtk ]; postPatch = '' @@ -58,13 +82,13 @@ stdenv.mkDerivation rec { patchShebangs $out/share/bookworm/scripts/tasks/*.sh ''; - meta = with lib; { - description = "A simple, focused eBook reader"; - longDescription = '' - Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc. - ''; - homepage = "https://babluboy.github.io/bookworm/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; - } + meta = with lib; { + description = "A simple, focused eBook reader"; + longDescription = '' + Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc. + ''; + homepage = "https://babluboy.github.io/bookworm/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index d07133e9065e..54ad0753c72e 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -64,14 +64,27 @@ stdenv.mkDerivation rec { ]; postPatch = '' + # The GTK theme has been renamed in elementary OS 6 + # https://github.com/elementary/flatpak-platform/blob/6.1.0/io.elementary.Sdk.json#L182 + # Remove this in https://github.com/NixOS/nixpkgs/pull/159249 + substituteInPlace src/Application.vala \ + --replace '"gtk-theme-name", "elementary"' '"gtk-theme-name", "io.elementary.stylesheet.blueberry"' + + # Fix build with vala 0.56 + # https://github.com/alainm23/planner/pull/884 + substituteInPlace src/Application.vala \ + --replace "public const OptionEntry[] PLANNER_OPTIONS" "private const OptionEntry[] PLANNER_OPTIONS" + chmod +x build-aux/meson/post_install.py patchShebangs build-aux/meson/post_install.py ''; preFixup = '' gappsWrapperArgs+=( - # the theme is hardcoded + # The GTK theme is hardcoded. --prefix XDG_DATA_DIRS : "${pantheon.elementary-gtk-theme}/share" + # The icon theme is hardcoded. + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ) ''; diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index adeb087ae8be..e4b46c5bc2dd 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -55,6 +55,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://espanso.org"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kimat ]; + platforms = platforms.linux; longDescription = '' Espanso detects when you type a keyword and replaces it while you're typing. diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/applications/office/foliate/default.nix index bcd42b361b93..7eff0ac90976 100644 --- a/pkgs/applications/office/foliate/default.nix +++ b/pkgs/applications/office/foliate/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "foliate"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "johnfactotum"; repo = pname; rev = version; - sha256 = "0ribqaxl8g1i83fxbn288afwbzzls48ni57xqi07d19p9ka892mr"; + sha256 = "sha256-Pr2YA2MHXD4W7lyCxGAVLKyoZarZ8t92RSkWle3LNuc="; }; nativeBuildInputs = [ meson ninja python3 wrapGAppsHook ]; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index d6e5c4143a4a..a9d532a27c24 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,9 +1,10 @@ -{ fetchurl -, lib +{ lib , stdenv +, fetchurl , aqbanking , boost , cmake +, gettext , glib , glibcLocales , gtest @@ -16,7 +17,6 @@ , libxml2 , libxslt , makeWrapper -, perl , perlPackages , pkg-config , swig @@ -28,13 +28,15 @@ stdenv.mkDerivation rec { pname = "gnucash"; version = "4.9"; + # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { - url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2"; - sha256 = "0bdpzb0wc9bjph5iff7133ppnkcqzfd10yi2qagij4mpq4q1qmcs"; + url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2"; + hash = "sha256-mlUcMMG3EhmfwiJ6EJr7mE177xjhOBcLvHIlxsH6ty0="; }; nativeBuildInputs = [ cmake + gettext makeWrapper wrapGAppsHook ]; @@ -53,11 +55,15 @@ stdenv.mkDerivation rec { libofx libxml2 libxslt - perl pkg-config swig webkitgtk - ] ++ (with perlPackages; [ FinanceQuote DateManip ]); + ] + ++ (with perlPackages; [ + DateManip + FinanceQuote + perl + ]); patches = [ # this patch disables test-gnc-timezone and test-gnc-datetime which fail due to nix datetime challenges @@ -68,16 +74,14 @@ stdenv.mkDerivation rec { ./0003-remove-valgrind.patch ]; - preConfigure = '' - export GUILE_AUTO_COMPILE=0 # this needs to be an env variable and not a cmake flag to suppress guile warning - ''; + # this needs to be an environment variable and not a cmake flag to suppress + # guile warning + GUILE_AUTO_COMPILE="0"; + # `make check` target does not define its prerequisites but expects them to + # have already been built. The list of targets below was built through trial + # and error based on failing tests. doCheck = true; - - /* - GNUcash's `make check` target does not define its prerequisites but expects them to have already been built. - The list of targets below was built through trial and error based on failing tests. - */ preCheck = '' make \ test-account-object \ @@ -156,12 +160,15 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd # specify where db drivers are - --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"} # specify where nix puts the gnome settings schemas + # db drivers location + --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd + # gnome settings schemas location on Nix + --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"} ) ''; - # wrapGAppsHook would wrap all binaries including the cli utils which need Perl wrapping + # wrapGAppsHook would wrap all binaries including the cli utils which need + # Perl wrapping dontWrapGApps = true; # gnucash is wrapped using the args constructed for wrapGAppsHook. @@ -176,15 +183,31 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Personal and small business double entry accounting application."; - longDescription = '' - Designed to be easy to use, yet powerful and flexible, GnuCash allows you to track bank accounts, stocks, income and expenses. - As quick and intuitive to use as a checkbook register, it is based on professional accounting principles to ensure balanced books and accurate reports. - ''; - homepage = "https://www.gnucash.org/"; + description = "Free software for double entry accounting"; + longDescription = '' + GnuCash is personal and small-business financial-accounting software, + freely licensed under the GNU GPL and available for GNU/Linux, BSD, + Solaris, Mac OS X and Microsoft Windows. + + Designed to be easy to use, yet powerful and flexible, GnuCash allows you + to track bank accounts, stocks, income and expenses. As quick and + intuitive to use as a checkbook register, it is based on professional + accounting principles to ensure balanced books and accurate reports. + + Some interesting features: + + - Double-Entry Accounting + - Stock/Bond/Mutual Fund Accounts + - Small-Business Accounting + - Reports, Graphs + - QIF/OFX/HBCI Import, Transaction Matching + - Scheduled Transactions + - Financial Calculations + ''; license = licenses.gpl2Plus; - maintainers = [ maintainers.domenkozar ]; - platforms = platforms.linux; + maintainers = with maintainers; [ domenkozar AndersonTorres ]; + platforms = platforms.unix; }; } +# TODO: investigate Darwin support diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 5ab9be9fa75a..13b0c84cfaa5 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.50"; + version = "1.12.51"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "dYgZuhvWmDgp+efG1xp/ogzXWjZSonHluwA9XYvMFLg="; + sha256 = "oA5sbk7N2tq9mwrhgBPXsFk3/cuPmq1ac7lZI8eusd0="; }; configureFlags = [ "--disable-component" ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 54e09783dbef..7e6910a3ab4b 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.5.3"; + version = "5.5.4"; src = fetchurl { url = "http://homebank.free.fr/public/homebank-${version}.tar.gz"; - sha256 = "sha256-BzYHkYqWEAh3kfNvWecNEmH+6OThFGpc/VhxodLZEJM="; + sha256 = "sha256-DQZpvKCZNArlwhPqE8srkyg7/IoOTPelkCwYKTZuV2U="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix deleted file mode 100644 index f46d893d8948..000000000000 --- a/pkgs/applications/office/impressive/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ fetchurl, stdenv, python2, makeWrapper, lib -, SDL, ghostscript, pdftk, dejavu_fonts }: - -let - version = "0.12.1"; - pythonEnv = python2.withPackages (ps: with ps; [pyopengl pygame pillow]); -in stdenv.mkDerivation { - # This project was formerly known as KeyJNote. - # See http://keyj.emphy.de/apple-lawsuit/ for details. - - pname = "impressive"; - inherit version; - - src = fetchurl { - url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; - sha256 = "1r7ihv41awnlnlry1kymb8fka053wdhzibfwcarn78rr3vs338vl"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ pythonEnv ]; - - configurePhase = '' - # Let's fail at build time if the library we're substituting in doesn't - # exist/isn't marked as executable - test -x ${SDL}/lib/libSDL.so - sed -i "impressive.py" \ - -e '/^__website__/a SDL_LIBRARY = "${SDL}/lib/libSDL.so"' \ - -e 's/sdl = CDLL.*/sdl = CDLL(SDL_LIBRARY)/' \ - -e 's^FontPath =.*/usr/.*$^FontPath = ["${dejavu_fonts}/share/fonts", ""]^' - ''; - - installPhase = '' - mkdir -p "$out/bin" "$out/share/doc/impressive" "$out/share/man/man1" - mv impressive.py "$out/bin/impressive" - mv impressive.1 "$out/share/man/man1" - mv changelog.txt impressive.html license.txt "$out/share/doc/impressive" - - wrapProgram "$out/bin/impressive" \ - --prefix PATH ":" "${ghostscript}/bin:${pdftk}/bin" - ''; - - meta = { - description = "Impressive, an effect-rich presentation tool for PDFs"; - - longDescription = '' - Impressive is a program that displays presentation slides. - But unlike OpenOffice.org Impress or other similar - applications, it does so with style. Smooth alpha-blended - slide transitions are provided for the sake of eye candy, but - in addition to this, Impressive offers some unique tools that - are really useful for presentations. Read below if you want - to know more about these features. - - Creating presentations for Impressive is very simple: You just - need to export a PDF file from your presentation software. - This means that you can create slides in the application of - your choice and use Impressive for displaying them. If your - application does not support PDF output, you can alternatively - use a set of pre-rendered image files – or you use Impressive - to make a slideshow with your favorite photos. - ''; - - homepage = "http://impressive.sourceforge.net/"; - - license = lib.licenses.gpl2; - - maintainers = with lib.maintainers; [ lheckemann ]; - platforms = lib.platforms.mesaPlatforms; - }; - } diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 0b4ce74cdfa7..255dba62294e 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -2,12 +2,12 @@ , zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsa-lib, cairo, freetype, pango, gdk-pixbuf, glib }: stdenv.mkDerivation rec { - version = "5.1"; + version = "5.5"; pname = "jabref"; src = fetchurl { url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}-portable_linux.tar.gz"; - sha256 = "04f612byrq3agzy26byg1sgrjyhcpa8xfj0ssh8dl8d8vnhx9742"; + sha256 = "sha256-9MHNehyAmu7CiBp1rgb4zTkSqmjXm2tcmiGKFBFapKI="; }; preferLocalBuild = true; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { name = "jabref"; desktopName = "JabRef"; genericName = "Bibliography manager"; - categories = "Office;"; + categories = [ "Office" ]; icon = "jabref"; exec = "jabref"; }; diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index c983787d23e5..d5c4dcb65011 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -1,10 +1,9 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: let - _version = "2.10.0"; - _build = "480"; + _version = "2.10.1"; + _build = "482"; version = "${_version}-${_build}"; - name = "jameica-${version}"; swtSystem = if stdenv.hostPlatform.system == "i686-linux" then "linux" else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" @@ -17,11 +16,13 @@ let comment = "Free Runtime Environment for Java Applications."; desktopName = "Jameica"; genericName = "Jameica"; - categories = "Office;"; + icon = "jameica"; + categories = [ "Office" ]; }; in stdenv.mkDerivation rec { - inherit name version; + pname = "jameica"; + inherit version; nativeBuildInputs = [ ant jdk makeWrapper ]; buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { owner = "willuhn"; repo = "jameica"; rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; - sha256 = "0rzhbskzzvr9aan6fwxd2kmzg79ranx7aym5yn1i37z3ra67d1nz"; + sha256 = "0pzcfqsf7flzipwivpinpkfb2xisand1sfjm00wif4pyj3f4qfh1"; }; # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries @@ -41,12 +42,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/libexec $out/lib $out/bin $out/share/{applications,${name},java}/ + mkdir -p $out/libexec $out/lib $out/bin $out/share/{applications,jameica-${version},java}/ # copy libraries except SWT - cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/share/${name}/ + cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/share/jameica-${version}/ # copy platform-specific SWT - cp lib/swt/${swtSystem}/swt.jar $out/share/${name}/ + cp lib/swt/${swtSystem}/swt.jar $out/share/jameica-${version}/ install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/share/java/ install -Dm644 plugin.xml $out/share/java/ @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { cp ${desktopItem}/share/applications/* $out/share/applications/ makeWrapper ${jre}/bin/java $out/bin/jameica \ - --add-flags "-cp $out/share/java/jameica.jar:$out/share/${name}/* ${ + --add-flags "-cp $out/share/java/jameica.jar:$out/share/jameica-${version}/* ${ lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' } de.willuhn.jameica.Main" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} \ @@ -70,6 +71,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ flokli ]; + maintainers = with maintainers; [ flokli r3dl3g ]; }; } diff --git a/pkgs/applications/office/kalendar/default.nix b/pkgs/applications/office/kalendar/default.nix index 00aa23f6d1fd..32cc2f5de57c 100644 --- a/pkgs/applications/office/kalendar/default.nix +++ b/pkgs/applications/office/kalendar/default.nix @@ -10,6 +10,7 @@ , qtsvg , qtlocation , qtdeclarative +, qqc2-desktop-style , kirigami2 , kdbusaddons @@ -38,14 +39,14 @@ mkDerivation rec { pname = "kalendar"; - version = "0.4.0"; + version = "1.0.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "pim"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j383I40lChsI/VOgceaHYGhE61p3SpvInUrkUV5HnHY="; + sha256 = "sha256-kjtLVU+8wbIa7R6J1XOjuvS3AnJNngxNBCx24Dy1QzM="; }; nativeBuildInputs = [ @@ -60,6 +61,7 @@ mkDerivation rec { qtsvg qtlocation qtdeclarative + qqc2-desktop-style kirigami2 kdbusaddons diff --git a/pkgs/applications/office/libreoffice/darwin.nix b/pkgs/applications/office/libreoffice/darwin.nix new file mode 100644 index 000000000000..765cbcd43024 --- /dev/null +++ b/pkgs/applications/office/libreoffice/darwin.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchurl +, undmg +}: + +let + appName = "LibreOffice.app"; + version = "7.2.5"; + dist = { + aarch64-darwin = { + arch = "aarch64"; + sha256 = "bdbcb9a98211f866ca089d440aebcd1d313aa99e8ab4104aae4e65ea3cee74ca"; + }; + + x86_64-darwin = { + arch = "x86_64"; + sha256 = "0b7ef18ed08341ac6c15339fe9a161ad17f6b469009d987cfc7d50c628d12a4e"; + }; + }."${stdenv.hostPlatform.system}"; +in +stdenv.mkDerivation { + inherit version; + pname = "libreoffice"; + src = fetchurl { + url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${dist.arch}/LibreOffice_${version}_MacOS_${dist.arch}.dmg"; + inherit (dist) sha256; + }; + + nativeBuildInputs = [ undmg ]; + sourceRoot = "${appName}"; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstallPhase + mkdir -p $out/{Applications/${appName},bin} + cp -R . $out/Applications/${appName} + ln -s $out/Applications/${appName}/Contents/MacOS/soffice $out/bin + runHook postInstallPhase + ''; + + meta = with lib; { + description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; + homepage = "https://libreoffice.org/"; + license = licenses.lgpl3; + maintainers = with maintainers; [ tricktron ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 8572ff15c1db..5ebde5e10dec 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gnome, glib, ncurses, libepoxy, gpgme -, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] +, langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null , ki18n ? null, kconfig ? null, kcoreaddons ? null, kio ? null, kwindowsystem ? null @@ -25,7 +25,7 @@ assert builtins.elem variant [ "fresh" "still" ]; let jre' = jre_minimal.override { - modules = [ "java.base" "java.desktop" ]; + modules = [ "java.base" "java.desktop" "java.logging" ]; }; importVariant = f: import (./. + "/src-${variant}/${f}"); @@ -82,7 +82,15 @@ in (mkDrv rec { tar -xf ${srcs.translations} ''; - patches = [ ./skip-failed-test-with-icu70.patch ]; + patches = [ + ./skip-failed-test-with-icu70.patch + + # Fix build with poppler 22.03 + (fetchurl { + url = "https://github.com/archlinux/svntogit-packages/raw/f82958b9538f86e41b51f1ba7134968d2f3788d1/trunk/poppler-22.03.0.patch"; + sha256 = "5h4qJmx6Q3Q3dHUlSi8JXBziN2mAswGVWk5aDTLTwls="; + }) + ]; ### QT/KDE # @@ -110,6 +118,7 @@ in (mkDrv rec { 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' '' + lib.optionalString kdeIntegration '' substituteInPlace configure.ac \ + --replace kcoreaddons_version.h KCoreAddons/kcoreaddons_version.h \ --replace '$QT5INC' ${qtbase.dev}/include \ --replace '$QT5LIB' ${qtbase.out}/lib \ --replace '-I$qt5_incdir ' '-I${qtx11extras.dev}/include '\ diff --git a/pkgs/applications/office/micropad/default.nix b/pkgs/applications/office/micropad/default.nix new file mode 100644 index 000000000000..a4ac00b3b6d0 --- /dev/null +++ b/pkgs/applications/office/micropad/default.nix @@ -0,0 +1,101 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchzip +, makeWrapper +, makeDesktopItem +, mkYarnPackage +, electron +, desktopToDarwinBundle +, copyDesktopItems +}: +let + executableName = "micropad"; + electron_exec = + if stdenv.isDarwin + then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" + else "${electron}/bin/electron"; +in + mkYarnPackage rec { + pname = "micropad"; + version = "3.30.6"; + + src = fetchFromGitHub { + owner = "MicroPad"; + repo = "Micropad-Electron"; + rev = "v${version}"; + sha256 = "sha256-v3hnHG6FMW2xBU/DnenqjFizQv/OZ9cW99n/3SoENe8="; + }; + + micropad-core = fetchzip { + url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz"; + hash = "sha256-aqshYbVrQg6tYtTlO91FGiH7DuueOA0OU5KGCVc7XvI="; + }; + + packageJSON = ./package.json; + yarnLock = ./yarn.lock; + yarnNix = ./yarn.nix; + + nativeBuildInputs = [ copyDesktopItems makeWrapper ] + ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + + buildPhase = '' + runHook preBuild + pushd deps/micropad/ + yarn --offline build + popd + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + # resources + mkdir -p "$out/share/" + cp -r './deps/micropad' "$out/share/micropad" + ln -s '${micropad-core}' "$out/share/micropad/core" + rm "$out/share/micropad/node_modules" + cp -r './node_modules' "$out/share/micropad" + + # icons + for icon in $out/share/micropad/build/icons/*.png; do + mkdir -p "$out/share/icons/hicolor/$(basename $icon .png | sed -e 's/^icon-//')/apps" + ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png | sed -e 's/^icon-//')/apps/micropad.png" + done + + # executable wrapper + makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ + --add-flags "$out/share/micropad" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" + + runHook postInstall + ''; + + # Do not attempt generating a tarball for micropad again. + # note: `doDist = false;` does not work. + distPhase = '' + true + ''; + + # The desktop item properties should be kept in sync with data from upstream: + # https://github.com/MicroPad/MicroPad-Electron/blob/master/package.json + desktopItems = [ + (makeDesktopItem { + name = "micropad"; + exec = "${executableName} %u"; + icon = "micropad"; + desktopName = "µPad"; + startupWMClass = "µPad"; + comment = meta.description; + categories = ["Office"]; + }) + ]; + + meta = with lib; { + description = "A powerful note-taking app that helps you organise + take notes without restrictions"; + homepage = "https://getmicropad.com/"; + license = licenses.mpl20; + maintainers = with maintainers; [rhysmdnz]; + inherit (electron.meta) platforms; + }; + } diff --git a/pkgs/applications/office/micropad/package.json b/pkgs/applications/office/micropad/package.json new file mode 100644 index 000000000000..784aad7be11a --- /dev/null +++ b/pkgs/applications/office/micropad/package.json @@ -0,0 +1,87 @@ +{ + "name": "micropad", + "version": "3.30.5", + "description": "A powerful note-taking app that helps you organise + take notes without restrictions.", + "main": "main.js", + "scripts": { + "start": "yarn build && yarn electron . --is-dev --no-sandbox", + "build": "yarn tsc -p tsconfig.json", + "update-core": "rm -rf core && rm -rf tmp && mkdir tmp && wget https://github.com/MicroPad/MicroPad-Core/releases/download/v${npm_package_version}/micropad.tar.xz -P ./tmp && cd tmp && tar -xf micropad.tar.xz && rm build/*.map && rm build/static/*/*.map && cp -r build ../core && cd .. && rm -rf tmp", + "pack": "yarn build && yarn electron-builder --dir", + "dist": "yarn build && yarn electron-builder" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/MicroPad/Electron.git" + }, + "author": { + "name": "Nick Webster", + "email": "nick@nick.geek.nz" + }, + "license": "MPL-2.0", + "bugs": { + "url": "https://github.com/MicroPad/Electron/issues" + }, + "homepage": "https://getmicropad.com", + "devDependencies": { + "electron": "^17.1.0", + "electron-builder": "^23.0.2", + "typescript": "~4.5.4" + }, + "dependencies": { + "dictionary-en": "^3.0.0", + "dictionary-en-au": "^2.1.1", + "electron-context-menu": "^3.1.2", + "localforage": "^1.10.0", + "typo-js": "^1.2.1" + }, + "build": { + "appId": "com.getmicropad.micropad", + "productName": "µPad", + "publish": { + "provider": "github", + "releaseType": "release" + }, + "asarUnpack": [ + "preload.js" + ], + "linux": { + "target": [ + "tar.gz", + "AppImage", + "snap", + "deb", + "rpm", + "pacman" + ], + "executableName": "micropad", + "category": "Office", + "icon": "build/icons" + }, + "pacman": { + "depends": [ + "gtk3" + ] + }, + "snap": { + "publish": { + "provider": "github", + "releaseType": "release" + } + }, + "mac": { + "target": { + "target": "dmg", + "arch": "universal" + }, + "category": "public.app-category.productivity", + "identity": null + }, + "win": { + "target": [ + "nsis", + "portable" + ] + } + } +} diff --git a/pkgs/applications/office/micropad/yarn.lock b/pkgs/applications/office/micropad/yarn.lock new file mode 100644 index 000000000000..24c4dd8ed54f --- /dev/null +++ b/pkgs/applications/office/micropad/yarn.lock @@ -0,0 +1,2006 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"7zip-bin@~5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" + integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== + +"@develar/schema-utils@~2.6.5": + version "2.6.5" + resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6" + integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig== + dependencies: + ajv "^6.12.0" + ajv-keywords "^3.4.1" + +"@electron/get@^1.13.0": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40" + integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw== + dependencies: + debug "^4.1.1" + env-paths "^2.2.0" + fs-extra "^8.1.0" + got "^9.6.0" + progress "^2.0.3" + semver "^6.2.0" + sumchecker "^3.0.1" + optionalDependencies: + global-agent "^3.0.0" + global-tunnel-ng "^2.7.1" + +"@electron/universal@1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.0.tgz#518cac72bccd79c00bf41345119e6fdbabdb871d" + integrity sha512-eu20BwNsrMPKoe2bZ3/l9c78LclDvxg3PlVXrQf3L50NaUuW5M59gbPytI+V4z7/QMrohUHetQaU0ou+p1UG9Q== + dependencies: + "@malept/cross-spawn-promise" "^1.1.0" + asar "^3.1.0" + debug "^4.3.1" + dir-compare "^2.4.0" + fs-extra "^9.0.1" + minimatch "^3.0.4" + plist "^3.0.4" + +"@malept/cross-spawn-promise@^1.1.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" + integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== + dependencies: + cross-spawn "^7.0.1" + +"@malept/flatpak-bundler@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" + integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q== + dependencies: + debug "^4.1.1" + fs-extra "^9.0.0" + lodash "^4.17.15" + tmp-promise "^3.0.2" + +"@sindresorhus/is@^0.14.0": + version "0.14.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" + integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== + +"@szmarczak/http-timer@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== + dependencies: + defer-to-connect "^1.0.1" + +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== + +"@types/debug@^4.1.6": + version "4.1.7" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" + integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== + dependencies: + "@types/ms" "*" + +"@types/fs-extra@^9.0.11": + version "9.0.13" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" + integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== + dependencies: + "@types/node" "*" + +"@types/glob@^7.1.1": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" + integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== + dependencies: + "@types/minimatch" "*" + "@types/node" "*" + +"@types/minimatch@*": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" + integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== + +"@types/ms@*": + version "0.7.31" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" + integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== + +"@types/node@*": + version "17.0.21" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644" + integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ== + +"@types/node@^14.6.2": + version "14.18.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz#0d4557fd3b94497d793efd4e7d92df2f83b4ef24" + integrity sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A== + +"@types/plist@^3.0.1": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01" + integrity sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw== + dependencies: + "@types/node" "*" + xmlbuilder ">=11.0.1" + +"@types/verror@^1.10.3": + version "1.10.5" + resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz#2a1413aded46e67a1fe2386800e291123ed75eb1" + integrity sha512-9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw== + +"@types/yargs-parser@*": + version "21.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" + integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== + +"@types/yargs@^17.0.1": + version "17.0.10" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz#591522fce85d8739bca7b8bb90d048e4478d186a" + integrity sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA== + dependencies: + "@types/yargs-parser" "*" + +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +ajv-keywords@^3.4.1: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv@^6.10.0, ajv@^6.12.0: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ansi-align@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== + dependencies: + string-width "^4.1.0" + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +app-builder-bin@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" + integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== + +app-builder-lib@23.0.2: + version "23.0.2" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.0.2.tgz#43f168a233812d7b65bee21962c1a9d1a62d30c4" + integrity sha512-2ytlOKavGQVvVujsGajJURtyrXHRXWIqHTzzZKUtYNrJUbDG2HcPZN7aktf+SDBeoXX0Lp/QA6dBpBpSRuG6rQ== + dependencies: + "7zip-bin" "~5.1.1" + "@develar/schema-utils" "~2.6.5" + "@electron/universal" "1.2.0" + "@malept/flatpak-bundler" "^0.4.0" + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.9" + builder-util "23.0.2" + builder-util-runtime "9.0.0" + chromium-pickle-js "^0.2.0" + debug "^4.3.2" + ejs "^3.1.6" + electron-osx-sign "^0.6.0" + electron-publish "23.0.2" + form-data "^4.0.0" + fs-extra "^10.0.0" + hosted-git-info "^4.0.2" + is-ci "^3.0.0" + isbinaryfile "^4.0.8" + js-yaml "^4.1.0" + lazy-val "^1.0.5" + minimatch "^3.0.4" + read-config-file "6.2.0" + sanitize-filename "^1.6.3" + semver "^7.3.5" + temp-file "^3.4.0" + +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + +asar@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473" + integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ== + dependencies: + chromium-pickle-js "^0.2.0" + commander "^5.0.0" + glob "^7.1.6" + minimatch "^3.0.4" + optionalDependencies: + "@types/glob" "^7.1.1" + +assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + +async-exit-hook@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" + integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== + +async@0.9.x: + version "0.9.2" + resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" + integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64-js@^1.3.1, base64-js@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +bluebird-lst@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" + integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw== + dependencies: + bluebird "^3.5.5" + +bluebird@^3.5.0, bluebird@^3.5.5: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== + +boolean@^3.0.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" + integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== + +boxen@^5.0.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== + dependencies: + ansi-align "^3.0.0" + camelcase "^6.2.0" + chalk "^4.1.0" + cli-boxes "^2.2.1" + string-width "^4.2.2" + type-fest "^0.20.2" + widest-line "^3.1.0" + wrap-ansi "^7.0.0" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + +buffer-equal@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" + integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= + +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +buffer@^5.1.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +builder-util-runtime@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.0.tgz#3a40ba7382712ccdb24471567f91d7c167e00830" + integrity sha512-SkpEtSmTkREDHRJnxKEv43aAYp8sYWY8fxYBhGLBLOBIRXeaIp6Kv3lBgSD7uR8jQtC7CA659sqJrpSV6zNvSA== + dependencies: + debug "^4.3.2" + sax "^1.2.4" + +builder-util@23.0.2: + version "23.0.2" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.0.2.tgz#da84a971076397e3a671726f4bb96f0c2214fea7" + integrity sha512-HaNHL3axNW/Ms8O1mDx3I07G+ZnZ/TKSWWvorOAPau128cdt9S+lNx5ocbx8deSaHHX4WFXSZVHh3mxlaKJNgg== + dependencies: + "7zip-bin" "~5.1.1" + "@types/debug" "^4.1.6" + "@types/fs-extra" "^9.0.11" + app-builder-bin "4.0.0" + bluebird-lst "^1.0.9" + builder-util-runtime "9.0.0" + chalk "^4.1.1" + cross-spawn "^7.0.3" + debug "^4.3.2" + fs-extra "^10.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + is-ci "^3.0.0" + js-yaml "^4.1.0" + source-map-support "^0.5.19" + stat-mode "^1.0.0" + temp-file "^3.4.0" + +cacheable-request@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^3.0.0" + lowercase-keys "^2.0.0" + normalize-url "^4.1.0" + responselike "^1.0.2" + +camelcase@^6.2.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== + +chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + 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" + +chalk@^4.1.0, chalk@^4.1.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chromium-pickle-js@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" + integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU= + +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + +ci-info@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" + integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== + +cli-boxes@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" + integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== + +cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== + dependencies: + slice-ansi "^3.0.0" + string-width "^4.2.0" + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +clone-response@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + dependencies: + mimic-response "^1.0.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +colors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" + integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= + +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +commander@2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" + integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= + dependencies: + graceful-readlink ">= 1.0.0" + +commander@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" + integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== + +compare-version@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" + integrity sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA= + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concat-stream@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +config-chain@^1.1.11: + version "1.1.13" + resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" + integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== + dependencies: + ini "^1.3.4" + proto-list "~1.2.1" + +configstore@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" + integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== + dependencies: + dot-prop "^5.2.0" + graceful-fs "^4.1.2" + make-dir "^3.0.0" + unique-string "^2.0.0" + write-file-atomic "^3.0.0" + xdg-basedir "^4.0.0" + +core-util-is@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + +crc@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" + integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== + dependencies: + buffer "^5.1.0" + +cross-spawn@^7.0.1, cross-spawn@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +crypto-random-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" + integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== + +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +debug@^2.6.8, debug@^2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +decompress-response@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= + dependencies: + mimic-response "^1.0.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +defer-to-connect@^1.0.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" + integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== + +define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + +detect-node@^2.0.4: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== + +dictionary-en-au@^2.1.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/dictionary-en-au/-/dictionary-en-au-2.3.0.tgz#261e8e8d0bd776afcf7ff49722815656438d5be9" + integrity sha512-KoEotpXPCyCgZ5DHlexHyzFfNwPnv9VupeCrp6r+JrtEkycPmZYbQiXF+cXz9NJr1gXy0AMEpzZ8UfxF40+8OQ== + +dictionary-en@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/dictionary-en/-/dictionary-en-3.1.0.tgz#2883598f02c9ccfb8acf7aa513797b50eeec77d2" + integrity sha512-dNjhoQagh7GX3YUBdbzehy/+wR2GLhkdpkxF8wMEGIXxMrH6aqzMn/8CHP5xnF85qbv288gCt4XtPQEVCOmTeA== + +dir-compare@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" + integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA== + dependencies: + buffer-equal "1.0.0" + colors "1.0.3" + commander "2.9.0" + minimatch "3.0.4" + +dmg-builder@23.0.2: + version "23.0.2" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.0.2.tgz#06ac1a551e9b6ea2826b4b2063dc2f6fc775fd86" + integrity sha512-kfJZRKbIN6kM/Vuzrme8SGSA+M/F0VvNrSGa6idWXbqtxIbGZZMF1QxVrXJbxSayf0Jh4hPy6NUNZAfbX9/m3g== + dependencies: + app-builder-lib "23.0.2" + builder-util "23.0.2" + builder-util-runtime "9.0.0" + fs-extra "^10.0.0" + iconv-lite "^0.6.2" + js-yaml "^4.1.0" + optionalDependencies: + dmg-license "^1.0.9" + +dmg-license@^1.0.9: + version "1.0.11" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a" + integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q== + dependencies: + "@types/plist" "^3.0.1" + "@types/verror" "^1.10.3" + ajv "^6.10.0" + crc "^3.8.0" + iconv-corefoundation "^1.1.7" + plist "^3.0.4" + smart-buffer "^4.0.2" + verror "^1.10.0" + +dot-prop@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== + dependencies: + is-obj "^2.0.0" + +dotenv-expand@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" + integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== + +dotenv@^9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" + integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== + +duplexer3@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + +ejs@^3.1.6: + version "3.1.6" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" + integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== + dependencies: + jake "^10.6.1" + +electron-builder@^23.0.2: + version "23.0.2" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.0.2.tgz#55982959ac91b72f397a936afba2eb989cd3fc1a" + integrity sha512-NG8ywuoHZpq6uk/2fEo9XVKBnjyGwNCnCyPxgGLdEk6xLAXr6nkF54+kqdhrDw4E8alwxc/TPHxUY3G0B8k/Dw== + dependencies: + "@types/yargs" "^17.0.1" + app-builder-lib "23.0.2" + builder-util "23.0.2" + builder-util-runtime "9.0.0" + chalk "^4.1.1" + dmg-builder "23.0.2" + fs-extra "^10.0.0" + is-ci "^3.0.0" + lazy-val "^1.0.5" + read-config-file "6.2.0" + update-notifier "^5.1.0" + yargs "^17.0.1" + +electron-context-menu@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.1.2.tgz#0f550e47df39cb25c03e0f4bf840ce5c9fefcdd5" + integrity sha512-nNzu4w14n7mOR+4cLjRC9cEFqGUsAY76seOm0sw3f4OxEfX/d75m7HYekyp5b+0m7Ixy2KN/Mrljw1zLmpyV2w== + dependencies: + cli-truncate "^2.1.0" + electron-dl "^3.2.1" + electron-is-dev "^2.0.0" + +electron-dl@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.3.0.tgz#4e422e276c627373ba61fcf3f92ffa088988db1a" + integrity sha512-Zwaz/OMGPIfBLV2SQH4sTsdDOs/U4y5AOHfremMBXEpjIxX+SiTx845DZAvJJwgb5hfowyWOBLiJhd/emBNLLQ== + dependencies: + ext-name "^5.0.0" + pupa "^2.0.1" + unused-filename "^2.1.0" + +electron-is-dev@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-2.0.0.tgz#833487a069b8dad21425c67a19847d9064ab19bd" + integrity sha512-3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA== + +electron-osx-sign@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8" + integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg== + dependencies: + bluebird "^3.5.0" + compare-version "^0.1.2" + debug "^2.6.8" + isbinaryfile "^3.0.2" + minimist "^1.2.0" + plist "^3.0.1" + +electron-publish@23.0.2: + version "23.0.2" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.0.2.tgz#aa11419ae57b847df4beb63b95e2b2a43161957c" + integrity sha512-8gMYgWqv96lc83FCm85wd+tEyxNTJQK7WKyPkNkO8GxModZqt1GO8S+/vAnFGxilS/7vsrVRXFfqiCDUCSuxEg== + dependencies: + "@types/fs-extra" "^9.0.11" + builder-util "23.0.2" + builder-util-runtime "9.0.0" + chalk "^4.1.1" + fs-extra "^10.0.0" + lazy-val "^1.0.5" + mime "^2.5.2" + +electron@^17.1.0: + version "17.1.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-17.1.2.tgz#b4e4a0df883d9a9854cf865efa2bb00b12d55b1d" + integrity sha512-hqKQaUIRWX5Y2eAD8FZINWD/e5TKdpkbBYbkcZmJS4Bd1PKQsaDVc9h5xoA8zZQkPymE9rss+swjRpAFurOPGQ== + dependencies: + "@electron/get" "^1.13.0" + "@types/node" "^14.6.2" + extract-zip "^1.0.3" + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +encodeurl@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +env-paths@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + +es6-error@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" + integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-goat@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +ext-list@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37" + integrity sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA== + dependencies: + mime-db "^1.28.0" + +ext-name@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz#70781981d183ee15d13993c8822045c506c8f0a6" + integrity sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ== + dependencies: + ext-list "^2.0.0" + sort-keys-length "^1.0.0" + +extract-zip@^1.0.3: + version "1.7.0" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" + integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== + dependencies: + concat-stream "^1.6.2" + debug "^2.6.9" + mkdirp "^0.5.4" + yauzl "^2.10.0" + +extsprintf@^1.2.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" + integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== + +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= + dependencies: + pend "~1.2.0" + +filelist@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" + integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== + dependencies: + minimatch "^3.0.4" + +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/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" + +fs-extra@^10.0.0: + version "10.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8" + integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs-extra@^9.0.0, fs-extra@^9.0.1: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + +get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +glob@^7.1.3, glob@^7.1.6: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +global-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" + integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== + dependencies: + boolean "^3.0.1" + es6-error "^4.1.1" + matcher "^3.0.0" + roarr "^2.15.3" + semver "^7.3.2" + serialize-error "^7.0.1" + +global-dirs@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" + integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== + dependencies: + ini "2.0.0" + +global-tunnel-ng@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" + integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg== + dependencies: + encodeurl "^1.0.2" + lodash "^4.17.10" + npm-conf "^1.1.3" + tunnel "^0.0.6" + +globalthis@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b" + integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ== + dependencies: + define-properties "^1.1.3" + +got@^9.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" + integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== + dependencies: + "@sindresorhus/is" "^0.14.0" + "@szmarczak/http-timer" "^1.1.2" + cacheable-request "^6.0.0" + decompress-response "^3.3.0" + duplexer3 "^0.1.4" + get-stream "^4.1.0" + lowercase-keys "^1.0.1" + mimic-response "^1.0.1" + p-cancelable "^1.0.0" + to-readable-stream "^1.0.0" + url-parse-lax "^3.0.0" + +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== + +"graceful-readlink@>= 1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" + integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-yarn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" + integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== + +hosted-git-info@^4.0.2: + version "4.1.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== + dependencies: + lru-cache "^6.0.0" + +http-cache-semantics@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" + integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== + dependencies: + "@tootallnate/once" "2" + agent-base "6" + debug "4" + +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + +iconv-corefoundation@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" + integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== + dependencies: + cli-truncate "^2.1.0" + node-addon-api "^1.6.3" + +iconv-lite@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +immediate@~3.0.5: + version "3.0.6" + resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" + integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps= + +import-lazy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.3, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" + integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== + +ini@^1.3.4, ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + +is-ci@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" + integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== + dependencies: + ci-info "^3.2.0" + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-installed-globally@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== + dependencies: + global-dirs "^3.0.0" + is-path-inside "^3.0.2" + +is-npm@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" + integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== + +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + +is-path-inside@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + +is-plain-obj@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= + +is-typedarray@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +is-yarn-global@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isbinaryfile@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" + integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== + dependencies: + buffer-alloc "^1.2.0" + +isbinaryfile@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" + integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w== + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +jake@^10.6.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" + integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== + dependencies: + async "0.9.x" + chalk "^2.4.2" + filelist "^1.0.1" + minimatch "^3.0.4" + +js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + +json-buffer@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-stringify-safe@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + +json5@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== + dependencies: + minimist "^1.2.5" + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + +keyv@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" + integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== + dependencies: + json-buffer "3.0.0" + +latest-version@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== + dependencies: + package-json "^6.3.0" + +lazy-val@^1.0.4, lazy-val@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" + integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== + +lie@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e" + integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4= + dependencies: + immediate "~3.0.5" + +localforage@^1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4" + integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg== + dependencies: + lie "3.1.1" + +lodash@^4.17.10, lodash@^4.17.15: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== + +lowercase-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +make-dir@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +matcher@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" + integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== + dependencies: + escape-string-regexp "^4.0.0" + +mime-db@1.52.0, mime-db@^1.28.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + +mime@^2.5.2: + version "2.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" + integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== + +mimic-response@^1.0.0, mimic-response@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== + +minimatch@3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimatch@^3.0.4: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mkdirp@^0.5.4: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +modify-filename@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/modify-filename/-/modify-filename-1.1.0.tgz#9a2dec83806fbb2d975f22beec859ca26b393aa1" + integrity sha1-mi3sg4Bvuy2XXyK+7IWcoms5OqE= + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +node-addon-api@^1.6.3: + version "1.7.2" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" + integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== + +normalize-url@^4.1.0: + version "4.5.1" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== + +npm-conf@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" + integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== + dependencies: + config-chain "^1.1.11" + pify "^3.0.0" + +object-keys@^1.0.12: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +p-cancelable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" + integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== + +package-json@^6.3.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== + dependencies: + got "^9.6.0" + registry-auth-token "^4.0.0" + registry-url "^5.0.0" + semver "^6.2.0" + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= + +plist@^3.0.1, plist@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" + integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg== + dependencies: + base64-js "^1.5.1" + xmlbuilder "^9.0.7" + +prepend-http@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +progress@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +proto-list@~1.2.1: + version "1.2.4" + resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" + integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +pupa@^2.0.1, pupa@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" + integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== + dependencies: + escape-goat "^2.0.0" + +rc@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +read-config-file@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" + integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== + dependencies: + dotenv "^9.0.2" + dotenv-expand "^5.1.0" + js-yaml "^4.1.0" + json5 "^2.2.0" + lazy-val "^1.0.4" + +readable-stream@^2.2.2: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +registry-auth-token@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" + integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== + dependencies: + rc "^1.2.8" + +registry-url@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== + dependencies: + rc "^1.2.8" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +responselike@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= + dependencies: + lowercase-keys "^1.0.0" + +rimraf@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +roarr@^2.15.3: + version "2.15.4" + resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" + integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== + dependencies: + boolean "^3.0.1" + detect-node "^2.0.4" + globalthis "^1.0.1" + json-stringify-safe "^5.0.1" + semver-compare "^1.0.0" + sprintf-js "^1.1.2" + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +"safer-buffer@>= 2.1.2 < 3.0.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sanitize-filename@^1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" + integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== + dependencies: + truncate-utf8-bytes "^1.0.0" + +sax@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= + +semver-diff@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" + integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== + dependencies: + semver "^6.3.0" + +semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +serialize-error@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" + integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== + dependencies: + type-fest "^0.13.1" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +signal-exit@^3.0.2: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== + +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + +smart-buffer@^4.0.2: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + +sort-keys-length@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188" + integrity sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg= + dependencies: + sort-keys "^1.0.0" + +sort-keys@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" + integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0= + dependencies: + is-plain-obj "^1.0.0" + +source-map-support@^0.5.19: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +sprintf-js@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" + integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== + +stat-mode@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" + integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== + +string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +sumchecker@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" + integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== + dependencies: + debug "^4.1.0" + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +temp-file@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" + integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg== + dependencies: + async-exit-hook "^2.0.1" + fs-extra "^10.0.0" + +tmp-promise@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" + integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ== + dependencies: + tmp "^0.2.0" + +tmp@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== + dependencies: + rimraf "^3.0.0" + +to-readable-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== + +truncate-utf8-bytes@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" + integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys= + dependencies: + utf8-byte-length "^1.0.1" + +tunnel@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" + integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== + +type-fest@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" + integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== + +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + +typescript@~4.5.4: + version "4.5.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3" + integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA== + +typo-js@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.1.tgz#334a0d8c3f6c56f2f1e15fdf6c31677793cbbe9b" + integrity sha512-bTGLjbD3WqZDR3CgEFkyi9Q/SS2oM29ipXrWfDb4M74ea69QwKAECVceYpaBu0GfdnASMg9Qfl67ttB23nePHg== + +unique-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== + dependencies: + crypto-random-string "^2.0.0" + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +universalify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== + +unused-filename@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/unused-filename/-/unused-filename-2.1.0.tgz#33719c4e8d9644f32d2dec1bc8525c6aaeb4ba51" + integrity sha512-BMiNwJbuWmqCpAM1FqxCTD7lXF97AvfQC8Kr/DIeA6VtvhJaMDupZ82+inbjl5yVP44PcxOuCSxye1QMS0wZyg== + dependencies: + modify-filename "^1.1.0" + path-exists "^4.0.0" + +update-notifier@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" + integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== + dependencies: + boxen "^5.0.0" + chalk "^4.1.0" + configstore "^5.0.1" + has-yarn "^2.1.0" + import-lazy "^2.1.0" + is-ci "^2.0.0" + is-installed-globally "^0.4.0" + is-npm "^5.0.0" + is-yarn-global "^0.3.0" + latest-version "^5.1.0" + pupa "^2.1.1" + semver "^7.3.4" + semver-diff "^3.1.1" + xdg-basedir "^4.0.0" + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +url-parse-lax@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + dependencies: + prepend-http "^2.0.0" + +utf8-byte-length@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" + integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E= + +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +verror@^1.10.0: + version "1.10.1" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb" + integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg== + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +widest-line@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== + dependencies: + string-width "^4.0.0" + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +write-file-atomic@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + +xdg-basedir@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" + integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== + +xmlbuilder@>=11.0.1: + version "15.1.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" + integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== + +xmlbuilder@^9.0.7: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yargs-parser@^21.0.0: + version "21.0.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" + integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== + +yargs@^17.0.1: + version "17.3.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9" + integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.0.0" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" diff --git a/pkgs/applications/office/micropad/yarn.nix b/pkgs/applications/office/micropad/yarn.nix new file mode 100644 index 000000000000..5dbb77388ef0 --- /dev/null +++ b/pkgs/applications/office/micropad/yarn.nix @@ -0,0 +1,2341 @@ +{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "7zip_bin___7zip_bin_5.1.1.tgz"; + path = fetchurl { + name = "7zip_bin___7zip_bin_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz"; + sha512 = "sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ=="; + }; + } + { + name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; + path = fetchurl { + name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; + url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz"; + sha512 = "0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig=="; + }; + } + { + name = "_electron_get___get_1.14.1.tgz"; + path = fetchurl { + name = "_electron_get___get_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz"; + sha512 = "BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw=="; + }; + } + { + name = "_electron_universal___universal_1.2.0.tgz"; + path = fetchurl { + name = "_electron_universal___universal_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.0.tgz"; + sha512 = "eu20BwNsrMPKoe2bZ3/l9c78LclDvxg3PlVXrQf3L50NaUuW5M59gbPytI+V4z7/QMrohUHetQaU0ou+p1UG9Q=="; + }; + } + { + name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; + path = fetchurl { + name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz"; + sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ=="; + }; + } + { + name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; + path = fetchurl { + name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz"; + sha512 = "9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q=="; + }; + } + { + name = "_sindresorhus_is___is_0.14.0.tgz"; + path = fetchurl { + name = "_sindresorhus_is___is_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; + }; + } + { + name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + path = fetchurl { + name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; + }; + } + { + name = "_tootallnate_once___once_2.0.0.tgz"; + path = fetchurl { + name = "_tootallnate_once___once_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz"; + sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; + }; + } + { + name = "_types_debug___debug_4.1.7.tgz"; + path = fetchurl { + name = "_types_debug___debug_4.1.7.tgz"; + url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz"; + sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; + }; + } + { + name = "_types_fs_extra___fs_extra_9.0.13.tgz"; + path = fetchurl { + name = "_types_fs_extra___fs_extra_9.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz"; + sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; + }; + } + { + name = "_types_glob___glob_7.2.0.tgz"; + path = fetchurl { + name = "_types_glob___glob_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz"; + sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; + }; + } + { + name = "_types_minimatch___minimatch_3.0.5.tgz"; + path = fetchurl { + name = "_types_minimatch___minimatch_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz"; + sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; + }; + } + { + name = "_types_ms___ms_0.7.31.tgz"; + path = fetchurl { + name = "_types_ms___ms_0.7.31.tgz"; + url = "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz"; + sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; + }; + } + { + name = "_types_node___node_17.0.21.tgz"; + path = fetchurl { + name = "_types_node___node_17.0.21.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz"; + sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="; + }; + } + { + name = "_types_node___node_14.18.12.tgz"; + path = fetchurl { + name = "_types_node___node_14.18.12.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz"; + sha512 = "q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A=="; + }; + } + { + name = "_types_plist___plist_3.0.2.tgz"; + path = fetchurl { + name = "_types_plist___plist_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz"; + sha512 = "ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw=="; + }; + } + { + name = "_types_verror___verror_1.10.5.tgz"; + path = fetchurl { + name = "_types_verror___verror_1.10.5.tgz"; + url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz"; + sha512 = "9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw=="; + }; + } + { + name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; + path = fetchurl { + name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; + sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; + }; + } + { + name = "_types_yargs___yargs_17.0.10.tgz"; + path = fetchurl { + name = "_types_yargs___yargs_17.0.10.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz"; + sha512 = "gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA=="; + }; + } + { + name = "agent_base___agent_base_6.0.2.tgz"; + path = fetchurl { + name = "agent_base___agent_base_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; + }; + } + { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; + }; + } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; + }; + } + { + name = "ansi_align___ansi_align_3.0.1.tgz"; + path = fetchurl { + name = "ansi_align___ansi_align_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz"; + sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + } + { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; + }; + } + { + name = "app_builder_bin___app_builder_bin_4.0.0.tgz"; + path = fetchurl { + name = "app_builder_bin___app_builder_bin_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz"; + sha512 = "xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA=="; + }; + } + { + name = "app_builder_lib___app_builder_lib_23.0.2.tgz"; + path = fetchurl { + name = "app_builder_lib___app_builder_lib_23.0.2.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.0.2.tgz"; + sha512 = "2ytlOKavGQVvVujsGajJURtyrXHRXWIqHTzzZKUtYNrJUbDG2HcPZN7aktf+SDBeoXX0Lp/QA6dBpBpSRuG6rQ=="; + }; + } + { + name = "argparse___argparse_2.0.1.tgz"; + path = fetchurl { + name = "argparse___argparse_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; + }; + } + { + name = "asar___asar_3.1.0.tgz"; + path = fetchurl { + name = "asar___asar_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz"; + sha512 = "vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ=="; + }; + } + { + name = "assert_plus___assert_plus_1.0.0.tgz"; + path = fetchurl { + name = "assert_plus___assert_plus_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "8S4PPF13sLHN2RRpQuTpbB5N1SU="; + }; + } + { + name = "astral_regex___astral_regex_2.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; + }; + } + { + name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; + path = fetchurl { + name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz"; + sha512 = "NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw=="; + }; + } + { + name = "async___async_0.9.2.tgz"; + path = fetchurl { + name = "async___async_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; + sha1 = "rqdNXmHB+JlhO/ZL2mbUx48v0X0="; + }; + } + { + name = "asynckit___asynckit_0.4.0.tgz"; + path = fetchurl { + name = "asynckit___asynckit_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "x57Zf380y48robyXkLzDZkdLS3k="; + }; + } + { + name = "at_least_node___at_least_node_1.0.0.tgz"; + path = fetchurl { + name = "at_least_node___at_least_node_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; + sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; + }; + } + { + name = "balanced_match___balanced_match_1.0.2.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; + }; + } + { + name = "base64_js___base64_js_1.5.1.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; + }; + } + { + name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; + path = fetchurl { + name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz"; + sha512 = "7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw=="; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; + }; + } + { + name = "boolean___boolean_3.2.0.tgz"; + path = fetchurl { + name = "boolean___boolean_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz"; + sha512 = "d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="; + }; + } + { + name = "boxen___boxen_5.1.2.tgz"; + path = fetchurl { + name = "boxen___boxen_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz"; + sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + } + { + name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; + path = fetchurl { + name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; + sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; + }; + } + { + name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; + path = fetchurl { + name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; + sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="; + }; + } + { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + path = fetchurl { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "DTM+PwDqxQqhRUq9MO+MKl2ackI="; + }; + } + { + name = "buffer_equal___buffer_equal_1.0.0.tgz"; + path = fetchurl { + name = "buffer_equal___buffer_equal_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; + sha1 = "WWFrSYME1Var1GaWayLu2j7KX74="; + }; + } + { + name = "buffer_fill___buffer_fill_1.0.0.tgz"; + path = fetchurl { + name = "buffer_fill___buffer_fill_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz"; + sha1 = "+PeLdniYiO858gXNY39o5wISKyw="; + }; + } + { + name = "buffer_from___buffer_from_1.1.2.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; + }; + } + { + name = "buffer___buffer_5.7.1.tgz"; + path = fetchurl { + name = "buffer___buffer_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + } + { + name = "builder_util_runtime___builder_util_runtime_9.0.0.tgz"; + path = fetchurl { + name = "builder_util_runtime___builder_util_runtime_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.0.tgz"; + sha512 = "SkpEtSmTkREDHRJnxKEv43aAYp8sYWY8fxYBhGLBLOBIRXeaIp6Kv3lBgSD7uR8jQtC7CA659sqJrpSV6zNvSA=="; + }; + } + { + name = "builder_util___builder_util_23.0.2.tgz"; + path = fetchurl { + name = "builder_util___builder_util_23.0.2.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-23.0.2.tgz"; + sha512 = "HaNHL3axNW/Ms8O1mDx3I07G+ZnZ/TKSWWvorOAPau128cdt9S+lNx5ocbx8deSaHHX4WFXSZVHh3mxlaKJNgg=="; + }; + } + { + name = "cacheable_request___cacheable_request_6.1.0.tgz"; + path = fetchurl { + name = "cacheable_request___cacheable_request_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; + }; + } + { + name = "camelcase___camelcase_6.3.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + } + { + name = "chalk___chalk_4.1.2.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; + }; + } + { + name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; + path = fetchurl { + name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; + sha1 = "BKEGZywYsIWrd02YPfo+oTjyIgU="; + }; + } + { + name = "ci_info___ci_info_2.0.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; + }; + } + { + name = "ci_info___ci_info_3.3.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz"; + sha512 = "riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw=="; + }; + } + { + name = "cli_boxes___cli_boxes_2.2.1.tgz"; + path = fetchurl { + name = "cli_boxes___cli_boxes_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz"; + sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; + }; + } + { + name = "cli_truncate___cli_truncate_2.1.0.tgz"; + path = fetchurl { + name = "cli_truncate___cli_truncate_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz"; + sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; + }; + } + { + name = "cliui___cliui_7.0.4.tgz"; + path = fetchurl { + name = "cliui___cliui_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; + sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; + }; + } + { + name = "clone_response___clone_response_1.0.2.tgz"; + path = fetchurl { + name = "clone_response___clone_response_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "0dyXOSAxTfZ/vrlCI7TuNQI56Ws="; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + } + { + name = "colors___colors_1.0.3.tgz"; + path = fetchurl { + name = "colors___colors_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz"; + sha1 = "BDP0TYCWgP3rYO0mDxsMJi6CpAs="; + }; + } + { + name = "combined_stream___combined_stream_1.0.8.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; + }; + } + { + name = "commander___commander_2.9.0.tgz"; + path = fetchurl { + name = "commander___commander_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz"; + sha1 = "nJkJQXbhIkDLItbFFGCYQA/g99Q="; + }; + } + { + name = "commander___commander_5.1.0.tgz"; + path = fetchurl { + name = "commander___commander_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz"; + sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; + }; + } + { + name = "compare_version___compare_version_0.1.2.tgz"; + path = fetchurl { + name = "compare_version___compare_version_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz"; + sha1 = "AWLsLZNR9d3VmpICy6k1NmpyUIA="; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + }; + } + { + name = "config_chain___config_chain_1.1.13.tgz"; + path = fetchurl { + name = "config_chain___config_chain_1.1.13.tgz"; + url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; + sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; + }; + } + { + name = "configstore___configstore_5.0.1.tgz"; + path = fetchurl { + name = "configstore___configstore_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; + sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "tf1UIgqivFq1eqtxQMlAdUUDwac="; + }; + } + { + name = "core_util_is___core_util_is_1.0.3.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; + }; + } + { + name = "crc___crc_3.8.0.tgz"; + path = fetchurl { + name = "crc___crc_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; + sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; + }; + } + { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; + }; + } + { + name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; + path = fetchurl { + name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; + sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; + }; + } + { + name = "debug___debug_4.3.4.tgz"; + path = fetchurl { + name = "debug___debug_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + } + { + name = "decompress_response___decompress_response_3.3.0.tgz"; + path = fetchurl { + name = "decompress_response___decompress_response_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "gKTdMjdIOEv6JICDYirt7Jgq3/M="; + }; + } + { + name = "deep_extend___deep_extend_0.6.0.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + } + { + name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + path = fetchurl { + name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; + sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; + }; + } + { + name = "define_properties___define_properties_1.1.3.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + }; + } + { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + path = fetchurl { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "3zrhmayt+31ECqrgsp4icrJOxhk="; + }; + } + { + name = "detect_node___detect_node_2.1.0.tgz"; + path = fetchurl { + name = "detect_node___detect_node_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz"; + sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; + }; + } + { + name = "dictionary_en_au___dictionary_en_au_2.3.0.tgz"; + path = fetchurl { + name = "dictionary_en_au___dictionary_en_au_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/dictionary-en-au/-/dictionary-en-au-2.3.0.tgz"; + sha512 = "KoEotpXPCyCgZ5DHlexHyzFfNwPnv9VupeCrp6r+JrtEkycPmZYbQiXF+cXz9NJr1gXy0AMEpzZ8UfxF40+8OQ=="; + }; + } + { + name = "dictionary_en___dictionary_en_3.1.0.tgz"; + path = fetchurl { + name = "dictionary_en___dictionary_en_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/dictionary-en/-/dictionary-en-3.1.0.tgz"; + sha512 = "dNjhoQagh7GX3YUBdbzehy/+wR2GLhkdpkxF8wMEGIXxMrH6aqzMn/8CHP5xnF85qbv288gCt4XtPQEVCOmTeA=="; + }; + } + { + name = "dir_compare___dir_compare_2.4.0.tgz"; + path = fetchurl { + name = "dir_compare___dir_compare_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz"; + sha512 = "l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA=="; + }; + } + { + name = "dmg_builder___dmg_builder_23.0.2.tgz"; + path = fetchurl { + name = "dmg_builder___dmg_builder_23.0.2.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.0.2.tgz"; + sha512 = "kfJZRKbIN6kM/Vuzrme8SGSA+M/F0VvNrSGa6idWXbqtxIbGZZMF1QxVrXJbxSayf0Jh4hPy6NUNZAfbX9/m3g=="; + }; + } + { + name = "dmg_license___dmg_license_1.0.11.tgz"; + path = fetchurl { + name = "dmg_license___dmg_license_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz"; + sha512 = "ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q=="; + }; + } + { + name = "dot_prop___dot_prop_5.3.0.tgz"; + path = fetchurl { + name = "dot_prop___dot_prop_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; + }; + } + { + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; + path = fetchurl { + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; + sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; + }; + } + { + name = "dotenv___dotenv_9.0.2.tgz"; + path = fetchurl { + name = "dotenv___dotenv_9.0.2.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; + sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; + }; + } + { + name = "duplexer3___duplexer3_0.1.4.tgz"; + path = fetchurl { + name = "duplexer3___duplexer3_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "7gHdHKwO08vH/b6jfcCo8c4ALOI="; + }; + } + { + name = "ejs___ejs_3.1.6.tgz"; + path = fetchurl { + name = "ejs___ejs_3.1.6.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz"; + sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; + }; + } + { + name = "electron_builder___electron_builder_23.0.2.tgz"; + path = fetchurl { + name = "electron_builder___electron_builder_23.0.2.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.0.2.tgz"; + sha512 = "NG8ywuoHZpq6uk/2fEo9XVKBnjyGwNCnCyPxgGLdEk6xLAXr6nkF54+kqdhrDw4E8alwxc/TPHxUY3G0B8k/Dw=="; + }; + } + { + name = "electron_context_menu___electron_context_menu_3.1.2.tgz"; + path = fetchurl { + name = "electron_context_menu___electron_context_menu_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.1.2.tgz"; + sha512 = "nNzu4w14n7mOR+4cLjRC9cEFqGUsAY76seOm0sw3f4OxEfX/d75m7HYekyp5b+0m7Ixy2KN/Mrljw1zLmpyV2w=="; + }; + } + { + name = "electron_dl___electron_dl_3.3.0.tgz"; + path = fetchurl { + name = "electron_dl___electron_dl_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.3.0.tgz"; + sha512 = "Zwaz/OMGPIfBLV2SQH4sTsdDOs/U4y5AOHfremMBXEpjIxX+SiTx845DZAvJJwgb5hfowyWOBLiJhd/emBNLLQ=="; + }; + } + { + name = "electron_is_dev___electron_is_dev_2.0.0.tgz"; + path = fetchurl { + name = "electron_is_dev___electron_is_dev_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-2.0.0.tgz"; + sha512 = "3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA=="; + }; + } + { + name = "electron_osx_sign___electron_osx_sign_0.6.0.tgz"; + path = fetchurl { + name = "electron_osx_sign___electron_osx_sign_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz"; + sha512 = "+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg=="; + }; + } + { + name = "electron_publish___electron_publish_23.0.2.tgz"; + path = fetchurl { + name = "electron_publish___electron_publish_23.0.2.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.0.2.tgz"; + sha512 = "8gMYgWqv96lc83FCm85wd+tEyxNTJQK7WKyPkNkO8GxModZqt1GO8S+/vAnFGxilS/7vsrVRXFfqiCDUCSuxEg=="; + }; + } + { + name = "electron___electron_17.1.2.tgz"; + path = fetchurl { + name = "electron___electron_17.1.2.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-17.1.2.tgz"; + sha512 = "hqKQaUIRWX5Y2eAD8FZINWD/e5TKdpkbBYbkcZmJS4Bd1PKQsaDVc9h5xoA8zZQkPymE9rss+swjRpAFurOPGQ=="; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + } + { + name = "encodeurl___encodeurl_1.0.2.tgz"; + path = fetchurl { + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + } + { + name = "env_paths___env_paths_2.2.1.tgz"; + path = fetchurl { + name = "env_paths___env_paths_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; + sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; + }; + } + { + name = "es6_error___es6_error_4.1.1.tgz"; + path = fetchurl { + name = "es6_error___es6_error_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz"; + sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; + }; + } + { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; + }; + } + { + name = "escape_goat___escape_goat_2.1.1.tgz"; + path = fetchurl { + name = "escape_goat___escape_goat_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; + sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; + }; + } + { + name = "ext_list___ext_list_2.2.2.tgz"; + path = fetchurl { + name = "ext_list___ext_list_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz"; + sha512 = "u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA=="; + }; + } + { + name = "ext_name___ext_name_5.0.0.tgz"; + path = fetchurl { + name = "ext_name___ext_name_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz"; + sha512 = "yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ=="; + }; + } + { + name = "extract_zip___extract_zip_1.7.0.tgz"; + path = fetchurl { + name = "extract_zip___extract_zip_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz"; + sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; + }; + } + { + name = "extsprintf___extsprintf_1.4.1.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz"; + sha512 = "Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA=="; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; + }; + } + { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + path = fetchurl { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "JcfInLH5B3+IkbvmHY85Dq4lbx4="; + }; + } + { + name = "filelist___filelist_1.0.2.tgz"; + path = fetchurl { + name = "filelist___filelist_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz"; + sha512 = "z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ=="; + }; + } + { + name = "form_data___form_data_4.0.0.tgz"; + path = fetchurl { + name = "form_data___form_data_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz"; + sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; + }; + } + { + name = "fs_extra___fs_extra_10.0.1.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_10.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz"; + sha512 = "NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag=="; + }; + } + { + name = "fs_extra___fs_extra_8.1.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; + }; + } + { + name = "fs_extra___fs_extra_9.1.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; + sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; + }; + } + { + name = "get_stream___get_stream_4.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; + }; + } + { + name = "get_stream___get_stream_5.2.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; + }; + } + { + name = "glob___glob_7.2.0.tgz"; + path = fetchurl { + name = "glob___glob_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; + }; + } + { + name = "global_agent___global_agent_3.0.0.tgz"; + path = fetchurl { + name = "global_agent___global_agent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz"; + sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; + }; + } + { + name = "global_dirs___global_dirs_3.0.0.tgz"; + path = fetchurl { + name = "global_dirs___global_dirs_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz"; + sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; + }; + } + { + name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; + path = fetchurl { + name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz"; + sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg=="; + }; + } + { + name = "globalthis___globalthis_1.0.2.tgz"; + path = fetchurl { + name = "globalthis___globalthis_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz"; + sha512 = "ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ=="; + }; + } + { + name = "got___got_9.6.0.tgz"; + path = fetchurl { + name = "got___got_9.6.0.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.9.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.9.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; + }; + } + { + name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; + path = fetchurl { + name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "TK+tdrxi8C+gObL5Tpo906ORpyU="; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + } + { + name = "has_yarn___has_yarn_2.1.0.tgz"; + path = fetchurl { + name = "has_yarn___has_yarn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; + sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; + }; + } + { + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; + sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; + }; + } + { + name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + path = fetchurl { + name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; + sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + }; + } + { + name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; + sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; + }; + } + { + name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + }; + } + { + name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; + path = fetchurl { + name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz"; + sha512 = "T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ=="; + }; + } + { + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; + }; + } + { + name = "ieee754___ieee754_1.2.1.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + } + { + name = "immediate___immediate_3.0.6.tgz"; + path = fetchurl { + name = "immediate___immediate_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz"; + sha1 = "nbHb0Pr43m++D13V5Wu2BigN5ps="; + }; + } + { + name = "import_lazy___import_lazy_2.1.0.tgz"; + path = fetchurl { + name = "import_lazy___import_lazy_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "BWmOPUXIjo1+nZLLBYTnfwlvPkM="; + }; + } + { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + } + { + name = "ini___ini_2.0.0.tgz"; + path = fetchurl { + name = "ini___ini_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz"; + sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; + }; + } + { + name = "ini___ini_1.3.8.tgz"; + path = fetchurl { + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; + }; + } + { + name = "is_ci___is_ci_2.0.0.tgz"; + path = fetchurl { + name = "is_ci___is_ci_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; + }; + } + { + name = "is_ci___is_ci_3.0.1.tgz"; + path = fetchurl { + name = "is_ci___is_ci_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz"; + sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + } + { + name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; + path = fetchurl { + name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; + sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; + }; + } + { + name = "is_npm___is_npm_5.0.0.tgz"; + path = fetchurl { + name = "is_npm___is_npm_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz"; + sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; + }; + } + { + name = "is_obj___is_obj_2.0.0.tgz"; + path = fetchurl { + name = "is_obj___is_obj_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; + }; + } + { + name = "is_path_inside___is_path_inside_3.0.3.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; + sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; + }; + } + { + name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "caUMhCnfync8kqOQpKA7OfzVHT4="; + }; + } + { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + path = fetchurl { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "5HnICFjfDBsR3dppQPlgEfzaSpo="; + }; + } + { + name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + path = fetchurl { + name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; + sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; + }; + } + { + name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; + path = fetchurl { + name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz"; + sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; + }; + } + { + name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; + path = fetchurl { + name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz"; + sha512 = "53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w=="; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; + }; + } + { + name = "jake___jake_10.8.2.tgz"; + path = fetchurl { + name = "jake___jake_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; + sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; + }; + } + { + name = "js_yaml___js_yaml_4.1.0.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; + }; + } + { + name = "json_buffer___json_buffer_3.0.0.tgz"; + path = fetchurl { + name = "json_buffer___json_buffer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "Wx85evx11ne96Lz8Dkfh+aPZqJg="; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + } + { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + path = fetchurl { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "Epai1Y/UXxmg9s4B1lcB4sc1tus="; + }; + } + { + name = "json5___json5_2.2.0.tgz"; + path = fetchurl { + name = "json5___json5_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; + sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; + }; + } + { + name = "jsonfile___jsonfile_4.0.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "h3Gq4HmbZAdrdmQPygWPnBDjPss="; + }; + } + { + name = "jsonfile___jsonfile_6.1.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; + }; + } + { + name = "keyv___keyv_3.1.0.tgz"; + path = fetchurl { + name = "keyv___keyv_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; + }; + } + { + name = "latest_version___latest_version_5.1.0.tgz"; + path = fetchurl { + name = "latest_version___latest_version_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; + sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; + }; + } + { + name = "lazy_val___lazy_val_1.0.5.tgz"; + path = fetchurl { + name = "lazy_val___lazy_val_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz"; + sha512 = "0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="; + }; + } + { + name = "lie___lie_3.1.1.tgz"; + path = fetchurl { + name = "lie___lie_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz"; + sha1 = "mkNrLMd0bKWd56QfpGmz77dr2H4="; + }; + } + { + name = "localforage___localforage_1.10.0.tgz"; + path = fetchurl { + name = "localforage___localforage_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz"; + sha512 = "14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg=="; + }; + } + { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + } + { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; + }; + } + { + name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + } + { + name = "make_dir___make_dir_3.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; + }; + } + { + name = "matcher___matcher_3.0.0.tgz"; + path = fetchurl { + name = "matcher___matcher_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz"; + sha512 = "OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng=="; + }; + } + { + name = "mime_db___mime_db_1.52.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.52.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; + }; + } + { + name = "mime_types___mime_types_2.1.35.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.35.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz"; + sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; + }; + } + { + name = "mime___mime_2.6.0.tgz"; + path = fetchurl { + name = "mime___mime_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz"; + sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; + }; + } + { + name = "mimic_response___mimic_response_1.0.1.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + } + { + name = "minimatch___minimatch_3.1.2.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + }; + } + { + name = "modify_filename___modify_filename_1.1.0.tgz"; + path = fetchurl { + name = "modify_filename___modify_filename_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/modify-filename/-/modify-filename-1.1.0.tgz"; + sha1 = "mi3sg4Bvuy2XXyK+7IWcoms5OqE="; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + } + { + name = "node_addon_api___node_addon_api_1.7.2.tgz"; + path = fetchurl { + name = "node_addon_api___node_addon_api_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz"; + sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; + }; + } + { + name = "normalize_url___normalize_url_4.5.1.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_4.5.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; + }; + } + { + name = "npm_conf___npm_conf_1.1.3.tgz"; + path = fetchurl { + name = "npm_conf___npm_conf_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz"; + sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; + }; + } + { + name = "p_cancelable___p_cancelable_1.1.0.tgz"; + path = fetchurl { + name = "p_cancelable___p_cancelable_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; + }; + } + { + name = "package_json___package_json_6.5.0.tgz"; + path = fetchurl { + name = "package_json___package_json_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; + sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; + }; + } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; + }; + } + { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; + }; + } + { + name = "pend___pend_1.2.0.tgz"; + path = fetchurl { + name = "pend___pend_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; + sha1 = "elfrVQpng/kRUzH89GY9XI4AelA="; + }; + } + { + name = "pify___pify_3.0.0.tgz"; + path = fetchurl { + name = "pify___pify_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; + sha1 = "5aSs0sEB/fPZpNB/DbxNtJ3SgXY="; + }; + } + { + name = "plist___plist_3.0.4.tgz"; + path = fetchurl { + name = "plist___plist_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz"; + sha512 = "ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg=="; + }; + } + { + name = "prepend_http___prepend_http_2.0.0.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + } + { + name = "progress___progress_2.0.3.tgz"; + path = fetchurl { + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; + }; + } + { + name = "proto_list___proto_list_1.2.4.tgz"; + path = fetchurl { + name = "proto_list___proto_list_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "IS1b/hMYMGpCD2QCuOJv85ZHqEk="; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + } + { + name = "pupa___pupa_2.1.1.tgz"; + path = fetchurl { + name = "pupa___pupa_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz"; + sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; + }; + } + { + name = "rc___rc_1.2.8.tgz"; + path = fetchurl { + name = "rc___rc_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + } + { + name = "read_config_file___read_config_file_6.2.0.tgz"; + path = fetchurl { + name = "read_config_file___read_config_file_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz"; + sha512 = "gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg=="; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + }; + } + { + name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; + path = fetchurl { + name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; + sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; + }; + } + { + name = "registry_url___registry_url_5.1.0.tgz"; + path = fetchurl { + name = "registry_url___registry_url_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; + sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; + }; + } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "jGStX9MNqxyXbiNE/+f3kqam30I="; + }; + } + { + name = "responselike___responselike_1.0.2.tgz"; + path = fetchurl { + name = "responselike___responselike_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; + sha1 = "kYcg7ztjHFZCvgaPFa3lpG9Loec="; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + } + { + name = "roarr___roarr_2.15.4.tgz"; + path = fetchurl { + name = "roarr___roarr_2.15.4.tgz"; + url = "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz"; + sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + } + { + name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; + path = fetchurl { + name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; + url = "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; + sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; + }; + } + { + name = "sax___sax_1.2.4.tgz"; + path = fetchurl { + name = "sax___sax_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + } + { + name = "semver_compare___semver_compare_1.0.0.tgz"; + path = fetchurl { + name = "semver_compare___semver_compare_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; + sha1 = "De4hahyUGrN+nvsXiPavxf9VN/w="; + }; + } + { + name = "semver_diff___semver_diff_3.1.1.tgz"; + path = fetchurl { + name = "semver_diff___semver_diff_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; + sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + } + { + name = "semver___semver_7.3.5.tgz"; + path = fetchurl { + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + }; + } + { + name = "serialize_error___serialize_error_7.0.1.tgz"; + path = fetchurl { + name = "serialize_error___serialize_error_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz"; + sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; + }; + } + { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; + }; + } + { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; + }; + } + { + name = "signal_exit___signal_exit_3.0.7.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; + }; + } + { + name = "slice_ansi___slice_ansi_3.0.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz"; + sha512 = "pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="; + }; + } + { + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + path = fetchurl { + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; + sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; + }; + } + { + name = "sort_keys_length___sort_keys_length_1.0.1.tgz"; + path = fetchurl { + name = "sort_keys_length___sort_keys_length_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz"; + sha1 = "nLb09OnkgVWmqgZx7dM2/xR5oYg="; + }; + } + { + name = "sort_keys___sort_keys_1.1.2.tgz"; + path = fetchurl { + name = "sort_keys___sort_keys_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz"; + sha1 = "RBttTTRnmPG05J6JIK37oOVD+a0="; + }; + } + { + name = "source_map_support___source_map_support_0.5.21.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.21.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz"; + sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + }; + } + { + name = "sprintf_js___sprintf_js_1.1.2.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; + sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; + }; + } + { + name = "stat_mode___stat_mode_1.0.0.tgz"; + path = fetchurl { + name = "stat_mode___stat_mode_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz"; + sha512 = "jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg=="; + }; + } + { + name = "string_width___string_width_4.2.3.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; + }; + } + { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "PFMZQukIwml8DsNEhYwobHygpgo="; + }; + } + { + name = "sumchecker___sumchecker_3.0.1.tgz"; + path = fetchurl { + name = "sumchecker___sumchecker_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz"; + sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg=="; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + }; + } + { + name = "temp_file___temp_file_3.4.0.tgz"; + path = fetchurl { + name = "temp_file___temp_file_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz"; + sha512 = "C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg=="; + }; + } + { + name = "tmp_promise___tmp_promise_3.0.3.tgz"; + path = fetchurl { + name = "tmp_promise___tmp_promise_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz"; + sha512 = "RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ=="; + }; + } + { + name = "tmp___tmp_0.2.1.tgz"; + path = fetchurl { + name = "tmp___tmp_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz"; + sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; + }; + } + { + name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; + path = fetchurl { + name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; + }; + } + { + name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; + path = fetchurl { + name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; + sha1 = "QFkjkJWS1W94pYGENLC3hInKXys="; + }; + } + { + name = "tunnel___tunnel_0.0.6.tgz"; + path = fetchurl { + name = "tunnel___tunnel_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; + sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="; + }; + } + { + name = "type_fest___type_fest_0.13.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.13.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz"; + sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; + }; + } + { + name = "type_fest___type_fest_0.20.2.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.20.2.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; + }; + } + { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + path = fetchurl { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c="; + }; + } + { + name = "typescript___typescript_4.5.5.tgz"; + path = fetchurl { + name = "typescript___typescript_4.5.5.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz"; + sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; + }; + } + { + name = "typo_js___typo_js_1.2.1.tgz"; + path = fetchurl { + name = "typo_js___typo_js_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.1.tgz"; + sha512 = "bTGLjbD3WqZDR3CgEFkyi9Q/SS2oM29ipXrWfDb4M74ea69QwKAECVceYpaBu0GfdnASMg9Qfl67ttB23nePHg=="; + }; + } + { + name = "unique_string___unique_string_2.0.0.tgz"; + path = fetchurl { + name = "unique_string___unique_string_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; + sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; + }; + } + { + name = "universalify___universalify_0.1.2.tgz"; + path = fetchurl { + name = "universalify___universalify_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; + }; + } + { + name = "universalify___universalify_2.0.0.tgz"; + path = fetchurl { + name = "universalify___universalify_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; + }; + } + { + name = "unused_filename___unused_filename_2.1.0.tgz"; + path = fetchurl { + name = "unused_filename___unused_filename_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/unused-filename/-/unused-filename-2.1.0.tgz"; + sha512 = "BMiNwJbuWmqCpAM1FqxCTD7lXF97AvfQC8Kr/DIeA6VtvhJaMDupZ82+inbjl5yVP44PcxOuCSxye1QMS0wZyg=="; + }; + } + { + name = "update_notifier___update_notifier_5.1.0.tgz"; + path = fetchurl { + name = "update_notifier___update_notifier_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz"; + sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; + }; + } + { + name = "uri_js___uri_js_4.4.1.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; + }; + } + { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + path = fetchurl { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; + sha1 = "FrXK/Afb42dsGxmZF3gj1lA6yww="; + }; + } + { + name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; + path = fetchurl { + name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; + sha1 = "9F8VDExm7uloGGUFq5P8u4rWv2E="; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; + }; + } + { + name = "verror___verror_1.10.1.tgz"; + path = fetchurl { + name = "verror___verror_1.10.1.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz"; + sha512 = "veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg=="; + }; + } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + } + { + name = "widest_line___widest_line_3.1.0.tgz"; + path = fetchurl { + name = "widest_line___widest_line_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; + sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; + }; + } + { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; + }; + } + { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; + sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; + }; + } + { + name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; + path = fetchurl { + name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; + sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; + }; + } + { + name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; + path = fetchurl { + name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; + sha512 = "yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="; + }; + } + { + name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; + path = fetchurl { + name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; + sha1 = "Ey7mPS7FVlxVfiD0wi35rKaGsQ0="; + }; + } + { + name = "y18n___y18n_5.0.8.tgz"; + path = fetchurl { + name = "y18n___y18n_5.0.8.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + }; + } + { + name = "yargs_parser___yargs_parser_21.0.1.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_21.0.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz"; + sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; + }; + } + { + name = "yargs___yargs_17.3.1.tgz"; + path = fetchurl { + name = "yargs___yargs_17.3.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz"; + sha512 = "WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA=="; + }; + } + { + name = "yauzl___yauzl_2.10.0.tgz"; + path = fetchurl { + name = "yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "x+sXyT4RLLEIb6bY5R+wZnt5pfk="; + }; + } + ]; +} diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 7113997c90f3..c5a4e93de785 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -1,35 +1,32 @@ -{ lib, stdenv, fetchgit, sqlite, wxGTK30, gettext, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, sqlite, wxGTK30, gettext, wrapGAppsHook }: - -let +stdenv.mkDerivation rec { + pname = "money-manager-ex"; version = "1.3.3"; -in - stdenv.mkDerivation { - pname = "money-manager-ex"; - inherit version; - src = fetchgit { - url = "https://github.com/moneymanagerex/moneymanagerex.git"; - rev = "refs/tags/v${version}"; - sha256 = "0r4n93z3scv0i0zqflsxwv7j4yl8jy3gr0m4l30y1q8qv0zj9n74"; - }; + src = fetchFromGitHub { + owner = "moneymanagerex"; + repo = "moneymanagerex"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-5NgkP9gY4eDBoKSC/IaXiHoiz+ZdU4c/iGAzPf5IlmQ="; + }; - nativeBuildInputs = [ - wrapGAppsHook - ]; + nativeBuildInputs = [ + wrapGAppsHook + ]; - buildInputs = [ - gettext - sqlite - wxGTK30 - wxGTK30.gtk - ]; + buildInputs = [ + gettext + sqlite + wxGTK30 + wxGTK30.gtk + ]; - meta = { - description = "Easy-to-use personal finance software"; - homepage = "https://www.moneymanagerex.org/"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux; - }; - } + meta = { + description = "Easy-to-use personal finance software"; + homepage = "https://www.moneymanagerex.org/"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [viric]; + platforms = with lib.platforms; linux; + }; +} diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix new file mode 100644 index 000000000000..b461b2ba19e1 --- /dev/null +++ b/pkgs/applications/office/morgen/default.nix @@ -0,0 +1,59 @@ +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron +, nodePackages, alsa-lib, gtk3, libxshmfence, mesa, nss }: + +stdenv.mkDerivation rec { + pname = "morgen"; + version = "2.4.4"; + + src = fetchurl { + url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; + sha256 = "sha256-5/85ro206o3SsvAvcZeDD2Dmo2jU4zXmtI3X4WdQaRI="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + makeWrapper + nodePackages.asar + ]; + + buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; + + dontBuild = true; + dontConfigure = true; + + unpackCmd = '' + dpkg-deb -x ${src} ./morgen-${pname} + ''; + + installPhase = '' + runHook preInstall + + mv usr $out + mv opt $out + + asar extract $out/opt/Morgen/resources/app.asar "$TMP/work" + # 1. Fixes path for todesktop-runtime-config.json + # 2. Fixes startup script + substituteInPlace $TMP/work/dist/main.js \ + --replace "process.resourcesPath,\"todesktop-runtime-config.json" "\"$out/opt/Morgen/resources/todesktop-runtime-config.json" \ + --replace "Exec=\"+process.execPath+\"" "Exec=$out/bin/morgen" + asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" $out/opt/Morgen/resources/app.asar + + substituteInPlace $out/share/applications/morgen.desktop \ + --replace '/opt/Morgen' $out/bin + + makeWrapper ${electron}/bin/electron $out/bin/morgen \ + --add-flags $out/opt/Morgen/resources/app.asar + + runHook postInstall + ''; + + meta = with lib; { + description = "All-in-one Calendars, Tasks and Scheduler"; + homepage = "https://morgen.so/download"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/office/paperless-ng/default.nix b/pkgs/applications/office/paperless-ng/default.nix index 2fcb2388b8c8..ab140f90ceda 100644 --- a/pkgs/applications/office/paperless-ng/default.nix +++ b/pkgs/applications/office/paperless-ng/default.nix @@ -1,5 +1,6 @@ { lib , fetchurl +, fetchpatch , nixosTests , python3 , ghostscript @@ -17,10 +18,6 @@ let py = python3.override { packageOverrides = self: super: { django = super.django_3; - django-picklefield = super.django-picklefield.overrideAttrs (oldAttrs: { - # Checks do not pass with django 3 - doInstallCheck = false; - }); # Avoid warning in django-q versions > 1.3.4 # https://github.com/jonaswinkler/paperless-ng/issues/857 # https://github.com/Koed00/django-q/issues/526 @@ -54,6 +51,15 @@ py.pkgs.pythonPackages.buildPythonApplication rec { sha256 = "oVSq0AWksuWC81MF5xiZ6ZbdKKtqqphmL+xIzJLaDMw="; }; + patches = [ + # Fix the `slow_write_pdf` test: + # https://github.com/NixOS/nixpkgs/issues/136626 + (fetchpatch { + url = "https://github.com/paperless-ngx/paperless-ngx/commit/4fbabe43ea12811864e9676b04d82a82b38e799d.patch"; + sha256 = "sha256-8ULep5aeW3wJAQGy2OEAjFYybELNq1DzCC1uBrZx36I="; + }) + ]; + format = "other"; # Make bind address configurable @@ -155,27 +161,6 @@ py.pkgs.pythonPackages.buildPythonApplication rec { zope_interface ]; - doCheck = true; - checkInputs = with py.pkgs.pythonPackages; [ - pytest - pytest-cov - pytest-django - pytest-env - pytest-sugar - pytest-xdist - factory_boy - ]; - - # The tests require: - # - PATH with runtime binaries - # - A temporary HOME directory for gnupg - # - XDG_DATA_DIRS with test-specific fonts - checkPhase = '' - pushd src - PATH="${path}:$PATH" HOME=$(mktemp -d) XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" pytest - popd - ''; - installPhase = '' mkdir -p $out/lib cp -r . $out/lib/paperless-ng @@ -185,6 +170,31 @@ py.pkgs.pythonPackages.buildPythonApplication rec { --prefix PATH : "${path}" ''; + checkInputs = with py.pkgs.pythonPackages; [ + pytest-django + pytest-env + pytest-sugar + pytest-xdist + factory_boy + pytestCheckHook + ]; + + pytestFlagsArray = [ "src" ]; + + # The tests require: + # - PATH with runtime binaries + # - A temporary HOME directory for gnupg + # - XDG_DATA_DIRS with test-specific fonts + preCheck = '' + export PATH="${path}:$PATH" + export HOME=$(mktemp -d) + export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" + + # Disable unneeded code coverage test + substituteInPlace src/setup.cfg \ + --replace "--cov --cov-report=html" "" + ''; + passthru = { # PYTHONPATH of all dependencies used by the package pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; diff --git a/pkgs/applications/office/paperwork/openpaperwork-core.nix b/pkgs/applications/office/paperwork/openpaperwork-core.nix index 9b6f352d97ac..8f08b56d4d5b 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -39,5 +39,6 @@ buildPythonPackage rec { homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index 4ddc0b4e2784..f1eb43dbdbc8 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -49,5 +49,6 @@ buildPythonPackage rec { homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 16ee7733ed26..f80f40929a19 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -16,6 +16,7 @@ , texlive , imagemagick , perlPackages +, writeScript }: let @@ -27,12 +28,19 @@ let imagemagick perlPackages.Po4a ]; + inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; in python3Packages.buildPythonApplication rec { - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; + inherit src version; pname = "paperwork"; + sample_docs = sample_documents // { + # a trick for the update script + name = "sample_documents"; + src = sample_documents; + }; + sourceRoot = "source/paperwork-gtk"; # Patch out a few paths that assume that we're using the FHS: @@ -69,7 +77,7 @@ python3Packages.buildPythonApplication rec { export XDG_DATA_DIRS=$XDG_DATA_DIRS:${gnome.adwaita-icon-theme}/share # build the user manual - PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_documents} make data + PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_docs} make data for i in src/paperwork_gtk/model/help/out/*.pdf; do install -Dt $site/model/help/out $i done @@ -122,12 +130,20 @@ python3Packages.buildPythonApplication rec { openpaperwork-core pypillowfight pyxdg - python-dateutil setuptools ]; disallowedRequisites = documentation_deps; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts + version=$(list-git-tags https://gitlab.gnome.org/World/OpenPaperwork/paperwork.git | sed 's/^v//' | sort -V | tail -n1) + update-source-version paperwork "$version" --file=pkgs/applications/office/paperwork/src.nix + docs_version="$(curl https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/raw/$version/paperwork-gtk/src/paperwork_gtk/model/help/screenshot.sh | grep TEST_DOCS_TAG= | cut -d'"' -f2)" + update-source-version paperwork.sample_docs "$docs_version" --file=pkgs/applications/office/paperwork/src.nix --version-key=rev + ''; + meta = { description = "A personal document manager for scanned documents"; homepage = "https://openpaper.work/"; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index a5141a43e502..980a4aabf7ab 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "0d1cw6k1giqs8ji8h3h97ckb134s8pszgip0nac5hmw0mvqq84xa"; + sha256 = "2M2eMP54F3RRDMBuAZ1gBiBoMmTRJaHTUwtTjj4ZU+4="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index fc1b329c4322..ecabdb85a93c 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -18,18 +18,18 @@ let icon = "portfolio"; comment = "Calculate Investment Portfolio Performance"; desktopName = "Portfolio Performance"; - categories = "Office;"; + categories = [ "Office" ]; }; runtimeLibs = lib.makeLibraryPath [ gtk3 webkitgtk ]; in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.56.2"; + version = "0.56.5"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-4iMLn0KTrH7MOlNduSl7BMOZKPakHhhQdR3NQXV2ZZU="; + sha256 = "sha256-g/MjOrivqbZ93iSs5mLQT36gn72KCJEOgEssBZER+TA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/pyspread/default.nix b/pkgs/applications/office/pyspread/default.nix index b7261dca5a4d..6a63aba4a178 100644 --- a/pkgs/applications/office/pyspread/default.nix +++ b/pkgs/applications/office/pyspread/default.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { desktopName = "Pyspread"; genericName = "Spreadsheet"; comment = meta.description; - categories = "Office;Development;Spreadsheet;"; + categories = [ "Office" "Development" "Spreadsheet" ]; }) ]; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index c6ee045dfbf9..b40085e85293 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.1.9"; + version = "22.3.4"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "sha256-vUYfZpqOe7cZJxrNPXN2gCyNRNqC2/NA83+UCL9+mq0="; + sha256 = "bec1ee9735821a7c4556c00790e3acfef06f21490ec8b7d99d9e002c9c0a1207"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 6aed41d7f9af..754c9ba03d4e 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -54,6 +54,36 @@ mkDerivation rec { url = "https://github.com/scribusproject/scribus/commit/68ec41169eaceea4a6e1d6f359762a191c7e61d5.patch"; sha256 = "sha256-xhp65qVvaof0md1jb3XHZw7uFX1RtNxPfUOaVnvZV1Y="; }) + # For Poppler 22.02 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch"; + sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/f75c1613db67f4067643d0218a2db3235e42ec9f.patch"; + sha256 = "vJU8HsKHE3oXlhcXQk9uCYINPYVPF5IGmrWYFQ6Py5c="; + }) + # For Poppler 22.03 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/553d1fd5f76ffb3743583b88c78a7232b076a965.patch"; + sha256 = "56JrEG3eCzyALTH04yjzurKRj2PocpjO6b4PusMRxjY="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/1f82e38be0782b065910f5fb4cece23f690349ae.patch"; + sha256 = "qektUfel5KeA327D3THyqi8dznP1SQQFToUC5Kd0+W4="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch"; + sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch"; + sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch"; + sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ="; + }) ]; nativeBuildInputs = [ @@ -83,6 +113,11 @@ mkDerivation rec { qttools ]; + cmakeFlags = [ + # poppler uses std::optional + "-DWANT_CPP17=ON" + ]; + meta = with lib; { maintainers = with maintainers; [ erictapen diff --git a/pkgs/applications/office/skanlite/default.nix b/pkgs/applications/office/skanlite/default.nix deleted file mode 100644 index 6cdbea755984..000000000000 --- a/pkgs/applications/office/skanlite/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase, - kcoreaddons, kdoctools, ki18n, kio, kxmlgui, ktextwidgets, - libksane -}: - -mkDerivation rec { - pname = "skanlite"; - version = "2.2.0"; - - src = fetchurl { - url = "mirror://kde/stable/skanlite/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "VP7MOZdUe64XIVr3r0aKIl1IPds3vjBTZzOS3N3VhOQ="; - }; - - nativeBuildInputs = [ cmake kdoctools extra-cmake-modules ]; - - buildInputs = [ - qtbase - kcoreaddons kdoctools ki18n kio kxmlgui ktextwidgets - libksane - ]; - - meta = with lib; { - description = "KDE simple image scanning application"; - homepage = "https://apps.kde.org/skanlite"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ polendri ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 506a2f99f607..3958d2870942 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "skrooge"; - version = "2.26.1"; + version = "2.27.0"; src = fetchurl { url = "https://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz"; - sha256 = "sha256-66hoA+FDTeMbNAInr9TlTSnwUywJQjTRz87MkdNYn5Q="; + sha256 = "sha256-xkl0UyJEDOeYOqqXf3woCDMb8ZyC2c5ChQdDFFERZxE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/softmaker/desktop_items.nix b/pkgs/applications/office/softmaker/desktop_items.nix index 614c6574faa2..a97b3f7d37b6 100644 --- a/pkgs/applications/office/softmaker/desktop_items.nix +++ b/pkgs/applications/office/softmaker/desktop_items.nix @@ -5,38 +5,92 @@ name = "${pname}-planmaker"; desktopName = "${suiteName} PlanMaker"; icon = "${pname}-pml"; - categories = "Office;"; + categories = [ "Office" ]; exec = "${pname}-planmaker %F"; - mimeType = "application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12;"; - extraEntries = '' - TryExec=${pname}-planmaker - StartupWMClass=pm - ''; + tryExec = "${pname}-planmaker"; + mimeTypes = [ + "application/x-pmd" + "application/x-pmdx" + "application/x-pmv" + "application/excel" + "application/x-excel" + "application/x-ms-excel" + "application/x-msexcel" + "application/x-sylk" + "application/x-xls" + "application/xls" + "application/vnd.ms-excel" + "application/vnd.stardivision.calc" + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" + "application/vnd.openxmlformats-officedocument.spreadsheetml.template" + "application/vnd.ms-excel.sheet.macroenabled.12" + "application/vnd.ms-excel.template.macroEnabled.12" + "application/x-dif" + "text/spreadsheet" + "text/csv" + "application/x-prn" + "application/vnd.ms-excel.sheet.binary.macroenabled.12" + ]; + startupWMClass = "pm"; }; presentations = makeDesktopItem { name = "${pname}-presentations"; desktopName = "${suiteName} Presentations"; icon = "${pname}-prl"; - categories = "Office;"; + categories = [ "Office" ]; exec = "${pname}-presentations %F"; - mimeType = "application/x-prdx;application/x-prvx;application/x-prsx;application/x-prd;application/x-prv;application/x-prs;application/ppt;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;"; - extraEntries = '' - TryExec=${pname}-presentations - StartupWMClass=pr - ''; + tryExec = "${pname}-presentations"; + mimeTypes = [ + "application/x-prdx" + "application/x-prvx" + "application/x-prsx" + "application/x-prd" + "application/x-prv" + "application/x-prs" + "application/ppt" + "application/mspowerpoint" + "application/vnd.ms-powerpoint" + "application/vnd.openxmlformats-officedocument.presentationml.presentation" + "application/vnd.ms-powerpoint.presentation.macroenabled.12" + "application/vnd.openxmlformats-officedocument.presentationml.template" + "application/vnd.ms-powerpoint.template.macroEnabled.12" + "application/vnd.ms-powerpoint.slideshow.macroenabled.12" + "application/vnd.openxmlformats-officedocument.presentationml.slideshow" + ]; + startupWMClass = "pr"; }; textmaker = makeDesktopItem { name = "${pname}-textmaker"; desktopName = "${suiteName} TextMaker"; icon = "${pname}-tml"; - categories = "Office;"; + categories = [ "Office" ]; exec = "${pname}-textmaker %F"; - mimeType = "application/x-tmdx;application/x-tmvx;application/x-tmd;application/x-tmv;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/x-pocket-word;application/x-dbf;application/msword-template;"; - extraEntries = '' - TryExec=${pname}-textmaker - StartupWMClass=tm - ''; + tryExec = "${pname}-textmaker"; + mimeTypes = [ + "application/x-tmdx" + "application/x-tmvx" + "application/x-tmd" + "application/x-tmv" + "application/msword" + "application/vnd.ms-word" + "application/x-doc" + "text/rtf" + "application/rtf" + "application/vnd.oasis.opendocument.text" + "application/vnd.oasis.opendocument.text-template" + "application/vnd.stardivision.writer" + "application/vnd.sun.xml.writer" + "application/vnd.sun.xml.writer.template" + "application/vnd.openxmlformats-officedocument.wordprocessingml.document" + "application/vnd.ms-word.document.macroenabled.12" + "application/vnd.openxmlformats-officedocument.wordprocessingml.template" + "application/vnd.ms-word.template.macroenabled.12" + "application/x-pocket-word" + "application/x-dbf" + "application/msword-template" + ]; + startupWMClass = "tm"; }; } diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 1de5a8b817b4..9c716dfd9a43 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { libgee libgudev libsoup - pantheon.elementary-icon-theme pantheon.granite ]; diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index d9f77cb560f1..ccb4cea95ecb 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.10.0"; + version = "7.10.1"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-Aa0orJpsin7XntUVpW6VLcbGiTSeyySDCGNFOERtgvg="; + sha256 = "sha256-jhCsC5G8epyclp2+DYpot1UMjo5mkMa0UO0bQZ1T0Ug="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/office/timekeeper/default.nix b/pkgs/applications/office/timekeeper/default.nix deleted file mode 100644 index ba9390251fc5..000000000000 --- a/pkgs/applications/office/timekeeper/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, fetchFromGitHub -, poco -, pkg-config -, gnome2 -, gtkmm2 -, lib -}: - -stdenv.mkDerivation rec { - pname = "timekeeper"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "bburdette"; - repo = "TimeKeeper"; - rev = "v${version}"; - fetchSubmodules = true; - sha256 = "03rvzkygnn7igcindbb5bcmfy0l83n0awkzprsnhlb6ndxax3k9w"; - }; - - nativeBuildInputs = [ - poco - pkg-config - ]; - - buildInputs = [ - gtkmm2 - gnome2.libglademm - gnome2.libglade - ]; - - installPhase = '' - install -Dm755 TimeKeeper/TimeKeeper $out/bin/timekeeper - ''; - - meta = with lib; { - description = "Log hours worked and make reports"; - homepage = "https://github.com/bburdette/TimeKeeper"; - maintainers = with maintainers; [ bburdette ]; - platforms = [ "x86_64-linux" ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/applications/office/timeline/default.nix index 526777162473..7cf777ae13f1 100644 --- a/pkgs/applications/office/timeline/default.nix +++ b/pkgs/applications/office/timeline/default.nix @@ -8,22 +8,20 @@ python3.pkgs.buildPythonApplication rec { pname = "timeline"; - version = "2.4.0"; + version = "2.6.0"; src = fetchurl { url = "mirror://sourceforge/thetimelineproj/${pname}-${version}.zip"; - sha256 = "1pa0whqci6c2p20xf7gbndrrpr1xg42ixhql595ibdd4p3l37v23"; + sha256 = "sha256-qwH2mt3Va62QJKJGOpt5WV3QksqQaRGEif4CcPC5F2E="; }; nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ]; pythonPath = with python3.pkgs; [ - wxPython_4_1 + wxPython_4_0 humblewx icalendar markdown - pysvg-py3 - pillow ]; checkInputs = [ @@ -37,9 +35,8 @@ python3.pkgs.buildPythonApplication rec { name = "timeline"; comment = "Display and navigate information on a timeline"; icon = "timeline"; - terminal = false; exec = "timeline"; - categories = "Office;Calendar;"; + categories = [ "Office" "Calendar" ]; }) ]; diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index d8fe8649381d..2055bfc0fc7f 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -1,41 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, wxGTK, makeWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, wxGTK +, cmake +, ninja +, wrapGAppsHook +, unstableGitUpdater +}: stdenv.mkDerivation rec { pname = "treesheets"; - version = "1.0.1"; + version = "unstable-2022-03-12"; src = fetchFromGitHub { - owner = "aardappel"; - repo = "treesheets"; - rev = "v${version}"; - sha256 = "0krsj7i5yr76imf83krz2lmlmpbsvpwqg2d4r0jwxiydjfyj4qr4"; + owner = "aardappel"; + repo = "treesheets"; + rev = "120c10d4d9ea1ce76db5c1bbd6f5d705b397b57d"; + sha256 = "oXgOvvRoZpueEeWnD3jsc6y5RIAzkXzLeEe7BSErBpw="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ wxGTK ]; + nativeBuildInputs = [ + cmake + ninja + wrapGAppsHook + ]; - preConfigure = "cd src"; + buildInputs = [ + wxGTK + ]; - postInstall = '' - mkdir "$out/share" -p - cp -av ../TS "$out/share/libexec" + NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\""; - mkdir "$out/bin" -p - makeWrapper "$out/share/libexec/treesheets" "$out/bin/treesheets" - - mkdir "$out/share/doc" -p - - for f in readme.html docs examples - do - mv -v "$out/share/libexec/$f" "$out/share/doc" - ln -sv "$out/share/doc/$f" "$out/share/libexec/$f" - done - - mkdir "$out/share/applications" -p - mv -v "$out/share/libexec/treesheets.desktop" "$out/share/applications" - substituteInPlace "$out/share/applications/treesheets.desktop" \ - --replace "Icon=images/treesheets.svg" "Icon=$out/share/libexec/images/treesheets.svg" - ''; + passthru = { + updateScript = unstableGitUpdater { }; + }; meta = with lib; { description = "Free Form Data Organizer"; @@ -49,9 +47,9 @@ stdenv.mkDerivation rec { planning, requirements gathering, presentation of information, etc. ''; - homepage = "https://strlen.com/treesheets/"; + homepage = "https://strlen.com/treesheets/"; maintainers = with maintainers; [ obadz avery ]; - platforms = platforms.linux; - license = licenses.zlib; + platforms = platforms.linux; + license = licenses.zlib; }; } diff --git a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch index 0cb26afe8296..7b2635cfe121 100644 --- a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch +++ b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch @@ -1,13 +1,14 @@ diff --git a/src/services/log.js b/src/services/log.js -index 4f29994..1e89e0a 100644 +index 0fcd9812..dcbff070 100644 --- a/src/services/log.js +++ b/src/services/log.js -@@ -1,14 +1,5 @@ +@@ -1,15 +1,7 @@ "use strict"; -const fs = require('fs'); -const dataDir = require('./data_dir'); -- + const cls = require('./cls'); + -if (!fs.existsSync(dataDir.LOG_DIR)) { - fs.mkdirSync(dataDir.LOG_DIR, 0o700); -} @@ -17,7 +18,7 @@ index 4f29994..1e89e0a 100644 const SECOND = 1000; const MINUTE = 60 * SECOND; const HOUR = 60 * MINUTE; -@@ -16,45 +7,7 @@ const DAY = 24 * HOUR; +@@ -17,38 +9,6 @@ const DAY = 24 * HOUR; const NEW_LINE = process.platform === "win32" ? '\r\n' : '\n'; @@ -54,6 +55,12 @@ index 4f29994..1e89e0a 100644 -} - function log(str) { + const bundleNoteId = cls.get("bundleNoteId"); + +@@ -56,12 +16,6 @@ function log(str) { + str = `[Script ${bundleNoteId}] ${str}`; + } + - let millisSinceMidnight = Date.now() - todaysMidnight.getTime(); - - millisSinceMidnight = checkDate(millisSinceMidnight); @@ -63,41 +70,3 @@ index 4f29994..1e89e0a 100644 console.log(str); } -@@ -83,37 +36,6 @@ function request(req, res, timeMs, responseLength = "?") { - `${res.statusCode} ${req.method} ${req.url} with ${responseLength} bytes took ${timeMs}ms`); - } - --function pad(num) { -- num = Math.floor(num); -- -- return num < 10 ? ("0" + num) : num.toString(); --} -- --function padMilli(num) { -- if (num < 10) { -- return "00" + num; -- } -- else if (num < 100) { -- return "0" + num; -- } -- else { -- return num.toString(); -- } --} -- --function formatTime(millisSinceMidnight) { -- return pad(millisSinceMidnight / HOUR) -- + ":" + pad((millisSinceMidnight % HOUR) / MINUTE) -- + ":" + pad((millisSinceMidnight % MINUTE) / SECOND) -- + "." + padMilli(millisSinceMidnight % SECOND); --} -- --function formatDate() { -- return pad(todaysMidnight.getFullYear()) -- + "-" + pad(todaysMidnight.getMonth() + 1) -- + "-" + pad(todaysMidnight.getDate()); --} -- - module.exports = { - info, - error, diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 39bb5d1bf141..c73c0b87c0c1 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -8,7 +8,7 @@ let icon = "trilium"; comment = description; desktopName = "Trilium Notes"; - categories = "Office"; + categories = [ "Office" ]; }; meta = with lib; { @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.49.5"; + version = "0.50.2"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "0bis0xkpcr8rvhm9364v0np5cnvkscv2fgl90f455lcwy7kk9m12"; + sha256 = "0fljza5afpjxgrzgskjhs7w86aa51d88xzv2h43666638j3c5mvk"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "1wv9xz1asjadz1jzgpaxf6lzbj5azgsq0qpawp3y257h488r1z9k"; + sha256 = "0jqpi1gc48jxvc68yzx80jp553haihybj3g3c5ymvqmgivwn7n4c"; }; in { diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/applications/office/tusk/default.nix index d54f27f9bbf3..5bfc8ebc9703 100644 --- a/pkgs/applications/office/tusk/default.nix +++ b/pkgs/applications/office/tusk/default.nix @@ -17,7 +17,7 @@ let icon = icon; desktopName = pname; genericName = "Evernote desktop app"; - categories = "Application"; + categories = [ "Application" ]; }; in appimageTools.wrapType2 rec { diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix index 435474fbdce8..f548cf01fcd5 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/applications/office/vnote/default.nix @@ -8,14 +8,14 @@ mkDerivation rec { pname = "vnote"; - version = "3.12.0"; + version = "3.12.888"; src = fetchFromGitHub { owner = "vnotex"; repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-hlB/G7qFYbkdIk9f2N+q1Do3V1ON8UUQZ6AUmBfK8x0="; + sha256 = "sha256-l9oFixyEM0aAfvrC5rrQMzv7n8rUHECRzhuIQJ/szjc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 178b2351a6b6..46f2569b13ab 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -142,7 +142,6 @@ stdenv.mkDerivation rec { installPhase = let steam-run = (steam.override { extraPkgs = p: buildInputs; - nativeOnly = true; }).run; in '' prefix=$out/opt/kingsoft/wps-office diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix deleted file mode 100644 index 57947e23baa0..000000000000 --- a/pkgs/applications/office/zanshin/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ mkDerivation -, lib -, fetchurl -, extra-cmake-modules -, boost -, akonadi-calendar -, kontactinterface -, krunner -}: - -mkDerivation rec { - pname = "zanshin"; - version = "21.12.0"; - - src = fetchurl { - url = "mirror://kde/stable/release-service/${version}/src/zanshin-${version}.tar.xz"; - sha256 = "sha256-l8W47tS7q747fkSAH3HJdwPsqjMfCyxzl3xJEeAXeh0="; - }; - - nativeBuildInputs = [ - extra-cmake-modules - ]; - - buildInputs = [ - boost - akonadi-calendar - kontactinterface - krunner - ]; - - meta = with lib; { - description = "A powerful yet simple application to manage your day to day actions, getting your mind like water"; - homepage = "https://zanshin.kde.org/"; - maintainers = with maintainers; [ zraexy ]; - platforms = platforms.linux; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 74f05a0b4025..53c61f0d993c 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook, makeDesktopItem +{ lib +, stdenv +, fetchurl +, wrapGAppsHook +, makeDesktopItem , atk , cairo , coreutils @@ -27,7 +31,8 @@ , libXt , libnotify , gnome -, libGLU, libGL +, libGLU +, libGL , nspr , nss , pango @@ -36,55 +41,56 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.96.3"; + version = "6.0"; src = fetchurl { - url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-eqSNzmkGNopGJ7VByvUffFEPJz3WHS7b5+jgUAW/hU4="; + url = + "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; + sha256 = "0zkgmmflcj6vbyv8rs51jf3vx1zq8pl7b5d5asgayhrdlwi0qgff"; }; nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; + buildInputs = + [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; dontConfigure = true; dontBuild = true; dontStrip = true; dontPatchELF = true; - libPath = lib.makeLibraryPath - [ stdenv.cc.cc - atk - cairo - curl - cups - dbus-glib - dbus - fontconfig - freetype - gdk-pixbuf - glib - glibc - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libxcb - libXdamage - libXext - libXfixes - libXi - libXinerama - libXrender - libXt - libnotify - libGLU libGL - nspr - nss - pango - ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ - stdenv.cc.cc - ]; + libPath = lib.makeLibraryPath [ + stdenv.cc.cc + atk + cairo + curl + cups + dbus-glib + dbus + fontconfig + freetype + gdk-pixbuf + glib + glibc + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libxcb + libXdamage + libXext + libXfixes + libXi + libXinerama + libXrender + libXt + libnotify + libGLU + libGL + nspr + nss + pango + ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; postPatch = '' sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js @@ -94,13 +100,12 @@ stdenv.mkDerivation rec { name = "zotero-${version}"; exec = "zotero -url %U"; icon = "zotero"; - type = "Application"; comment = meta.description; desktopName = "Zotero"; genericName = "Reference Management"; - categories = "Office;Database;"; - startupNotify = "true"; - mimeType = "text/plain"; + categories = [ "Office" "Database" ]; + startupNotify = true; + mimeTypes = [ "text/plain" ]; }; installPhase = '' diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index 00e5e0089cf8..63eab66db8ff 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "dump1090"; - version = "6.1"; + version = "7.1"; src = fetchFromGitHub { owner = "flightaware"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OLXnT5TD6ZBNJUk4qXOMbr+NWdw3j1rv1xkFPZi4Wo8="; + sha256 = "sha256-1fD8ZMkTS/r+p1rrOfJhH2sz3sJCapQcvk8f8crGApw="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index b369a5475e53..bbf40a44c2a7 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -1,8 +1,10 @@ -{ lib +{ config +, lib , stdenv , fetchFromGitHub , cmake , codec2 +, libpulseaudio , libsamplerate , libsndfile , lpcnetfreedv @@ -10,17 +12,18 @@ , speexdsp , hamlib , wxGTK31-gtk3 +, pulseSupport ? config.pulseaudio or stdenv.isLinux }: stdenv.mkDerivation rec { pname = "freedv"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - sha256 = "1dzhf944vgla9a5ilcgwivhzgdbfaknqnwbpb071a0rz8rajnv0q"; + hash = "sha256-0E7r/7+AQRPIFAcE6O1WE0NYiKzAlBR0jKbssqWvRMU="; }; nativeBuildInputs = [ cmake ]; @@ -29,21 +32,22 @@ stdenv.mkDerivation rec { libsamplerate libsndfile lpcnetfreedv - portaudio speexdsp hamlib wxGTK31-gtk3 - ]; + ] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]); cmakeFlags = [ "-DUSE_INTERNAL_CODEC2:BOOL=FALSE" "-DUSE_STATIC_DEPS:BOOL=FALSE" - ]; + ] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ]; meta = with lib; { homepage = "https://freedv.org/"; description = "Digital voice for HF radio"; license = licenses.lgpl21; maintainers = with maintainers; [ mvs ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; # see https://github.com/NixOS/nixpkgs/issues/165422 }; } diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 479b3b641cd3..383c5710808f 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -7,78 +7,97 @@ , gtest , openssl , gflags -, gnuradio3_8 +, gnuradio , thrift -, libpcap +, enableRawUdp ? true, libpcap , orc , pkg-config -, uhd -, log4cpp , blas, lapack , matio , pugixml , protobuf }: -gnuradio3_8.pkgs.mkDerivation rec { +gnuradio.pkgs.mkDerivation rec { pname = "gnss-sdr"; - # There's an issue with cpufeatures on 0.0.15, see: - # https://github.com/NixOS/nixpkgs/pull/142557#issuecomment-950217925 - version = "0.0.13"; + version = "0.0.16"; src = fetchFromGitHub { owner = "gnss-sdr"; repo = "gnss-sdr"; rev = "v${version}"; - sha256 = "0a3k47fl5dizzhbqbrbmckl636lznyjby2d2nz6fz21637hvrnby"; + sha256 = "sha256-ODe4k6PDGtDX11FrbggEbN3tc4UtATaItUIpCKl4JjM="; }; + patches = [ + # Use the relative install location for volk_gnsssdr_module and + # cpu_features which is bundled in the source. NOTE: Perhaps this patch + # should be sent upstream. + ./fix_libcpu_features_install_path.patch + ]; + nativeBuildInputs = [ cmake - gnuradio3_8.unwrapped.python - gnuradio3_8.unwrapped.python.pkgs.Mako - gnuradio3_8.unwrapped.python.pkgs.six + pkg-config + gnuradio.unwrapped.python + gnuradio.unwrapped.python.pkgs.Mako + gnuradio.unwrapped.python.pkgs.six + ]; + checkInputs = [ + gtest ]; buildInputs = [ gmp armadillo - gnuradio3_8.unwrapped.boost glog - gtest - openssl gflags + openssl orc - # UHD support is optional, but gnuradio is built with it, so there's - # nothing to be gained by leaving it out. - gnuradio3_8.unwrapped.uhd - log4cpp blas lapack matio pugixml protobuf - gnuradio3_8.pkgs.osmosdr + gnuradio.unwrapped.boost + ] ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [ + gnuradio.unwrapped.uhd + ] ++ (if (lib.versionAtLeast gnuradio.unwrapped.versionAttr.major "3.10") then [ + gnuradio.unwrapped.spdlog + ] else [ + gnuradio.unwrapped.log4cpp + ]) ++ lib.optionals (enableRawUdp) [ libpcap - ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [ + ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [ thrift - gnuradio3_8.unwrapped.python.pkgs.thrift + gnuradio.unwrapped.python.pkgs.thrift + ] ++ lib.optionals (gnuradio.hasFeature "gr-pdu" || gnuradio.hasFeature "gr-iio") [ + gnuradio.unwrapped.libiio + ] ++ lib.optionals (gnuradio.hasFeature "gr-pdu") [ + gnuradio.unwrapped.libad9361 ]; cmakeFlags = [ - "-DGFlags_ROOT_DIR=${gflags}/lib" + "-DGFlags_INCLUDE_DIRS=${gflags}/include" "-DGLOG_INCLUDE_DIR=${glog}/include" + # Should use .dylib if darwin support is requested + "-DGFlags_LIBS=${gflags}/lib/libgflags.so" + "-DGLOG_LIBRARIES=${glog}/lib/libglog.so" + # Use our dependencies glog, gflags and armadillo dependencies + "-DENABLE_OWN_GLOG=OFF" + "-DENABLE_OWN_ARMADILLO=OFF" + "-DENABLE_ORC=ON" + "-DENABLE_LOG=ON" + "-DENABLE_RAW_UDP=${if enableRawUdp then "ON" else "OFF"}" + "-DENABLE_UHD=${if (gnuradio.hasFeature "gr-uhd") then "ON" else "OFF"}" + "-DENABLE_FMCOMMS2=${if (gnuradio.hasFeature "gr-iio" && gnuradio.hasFeature "gr-pdu") then "ON" else "OFF"}" + "-DENABLE_PLUTOSDR=${if (gnuradio.hasFeature "gr-iio") then "ON" else "OFF"}" + "-DENABLE_AD9361=${if (gnuradio.hasFeature "gr-pdu") then "ON" else "OFF"}" "-DENABLE_UNIT_TESTING=OFF" # gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as # armadillo is built using both, so skip checking for them. - "-DBLAS=YES" - "-DLAPACK=YES" "-DBLAS_LIBRARIES=-lblas" "-DLAPACK_LIBRARIES=-llapack" - - # Similarly, it doesn't actually use gfortran despite checking for - # its presence. - "-DGFORTRAN=YES" ]; meta = with lib; { diff --git a/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch b/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch new file mode 100644 index 000000000000..cfeb0bd416b4 --- /dev/null +++ b/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch @@ -0,0 +1,47 @@ +--- a/CMakeLists.txt 1970-01-01 08:00:01.000000000 +0800 ++++ b/CMakeLists.txt 2022-02-16 20:41:53.725290020 +0800 +@@ -1214,7 +1214,7 @@ + BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build + CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} + -DCMAKE_BUILD_TYPE=$<$:None>$<$:Debug>$<$:Release>$<$:RelWithDebInfo>$<$:MinSizeRel>$<$:NoOptWithASM>$<$:Coverage>$<$:O2WithASM>$<$:O3WithASM>$<$:ASAN> +- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} ++ -DCMAKE_INSTALL_LIBDIR=lib + DOWNLOAD_COMMAND "" + UPDATE_COMMAND "" + PATCH_COMMAND "" +@@ -1247,7 +1247,7 @@ + ) + set(VOLK_GNSSSDR_BUILD_BYPRODUCTS + ${VOLK_GNSSSDR_BUILD_BYPRODUCTS} +- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} ++ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} + ) + endif() + ExternalProject_Add(volk_gnsssdr_module +@@ -1256,7 +1256,7 @@ + BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build + CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} + -DCMAKE_BUILD_TYPE=$<$:None>$<$:Debug>$<$:Release>$<$:RelWithDebInfo>$<$:MinSizeRel>$<$:NoOptWithASM>$<$:Coverage>$<$:O2WithASM>$<$:O3WithASM>$<$:ASAN> +- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} ++ -DCMAKE_INSTALL_LIBDIR=lib + DOWNLOAD_COMMAND "" + UPDATE_COMMAND "" + PATCH_COMMAND "" +@@ -1271,7 +1271,7 @@ + BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build + CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} + -DCMAKE_BUILD_TYPE=$<$:None>$<$:Debug>$<$:Release>$<$:RelWithDebInfo>$<$:MinSizeRel>$<$:NoOptWithASM>$<$:Coverage>$<$:O2WithASM>$<$:O3WithASM>$<$:ASAN> +- -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} ++ -DCMAKE_INSTALL_LIBDIR=lib + DOWNLOAD_COMMAND "" + UPDATE_COMMAND "" + PATCH_COMMAND "" +@@ -1310,7 +1310,7 @@ + if(CMAKE_VERSION VERSION_GREATER 3.0 AND SUPPORTED_CPU_FEATURES_ARCH) + if(NOT CpuFeatures_FOUND) + set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES +- INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} ++ INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} + ) + endif() + endif() diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 63adbf04b0e4..f3a56cfdb055 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -251,7 +251,11 @@ stdenv.mkDerivation rec { ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must - inherit boost volk; + inherit + boost + volk + log4cpp + ; } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; } // lib.optionalAttrs (hasFeature "gr-qtgui") { diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 784ab7bd0fc2..638064bbd072 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -275,7 +275,11 @@ stdenv.mkDerivation rec { ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must - inherit boost volk; + inherit + boost + volk + log4cpp + ; } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; } // lib.optionalAttrs (hasFeature "gr-qtgui") { diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 3e1366547ee7..eef1960ae1f4 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -48,13 +48,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.10"; - minor = "0"; - patch = "0"; + minor = "1"; + patch = "1"; } }: let - sourceSha256 = "sha256-1K8nlNiirks3MJ+9cH9bkILVFtu5OxhKkNhetGqojn4="; + sourceSha256 = "sha256-vsAK+GQzcpA9Vsa6q4RFEzVpbF7/+yZkMsemKn6VhIg="; featuresInfo = { # Needed always basic = { @@ -293,9 +293,15 @@ stdenv.mkDerivation rec { ]; passthru = shared.passthru // { # Deps that are potentially overriden and are used inside GR plugins - the same version must - inherit boost volk; + inherit + boost + volk + spdlog + ; } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; + } // lib.optionalAttrs (hasFeature "gr-pdu") { + inherit libiio libad9361; } // lib.optionalAttrs (hasFeature "gr-qtgui") { inherit (libsForQt5) qwt; }; diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index 4cbccbd51819..6765c877437b 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -50,7 +50,8 @@ let ; pythonEnv = unwrapped.python.withPackages(ps: pythonPkgs); - name = (lib.appendToName "wrapped" unwrapped).name; + pname = unwrapped.pname + "-wrapped"; + inherit (unwrapped) version; makeWrapperArgs = builtins.concatStringsSep " " ([ ] # Emulating wrapGAppsHook & wrapQtAppsHook working together @@ -59,7 +60,7 @@ let || (unwrapped.hasFeature "gr-qtgui") ) [ "--prefix" "XDG_DATA_DIRS" ":" "$out/share" - "--prefix" "XDG_DATA_DIRS" ":" "$out/share/gsettings-schemas/${name}" + "--prefix" "XDG_DATA_DIRS" ":" "$out/share/gsettings-schemas/${pname}" "--prefix" "XDG_DATA_DIRS" ":" "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" "--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share" # Needs to run `gsettings` on startup, see: @@ -135,7 +136,7 @@ let }; self = if doWrap then stdenv.mkDerivation { - inherit name passthru; + inherit pname version passthru; buildInputs = [ makeWrapper xorg.lndir diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index f9aca3286bbf..28be25920a45 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -5,7 +5,6 @@ , qt5 , gnuradio3_8Minimal , thrift -, log4cpp , mpir , fftwFloat , alsa-lib @@ -24,13 +23,13 @@ assert !(pulseaudioSupport && portaudioSupport); gnuradio3_8Minimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.15.7"; + version = "2.15.8"; src = fetchFromGitHub { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - sha256 = "sha256-4tXWwBkVmNZ4s3d6/n6XBdbh9Fv7821L3vkYmjgv1ds="; + sha256 = "sha256-RxwkiJdPHWyhU3azSpWV2M0tG5GInQBpc/ls16V1B94="; }; nativeBuildInputs = [ @@ -39,7 +38,7 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { qt5.wrapQtAppsHook ]; buildInputs = [ - log4cpp + gnuradio3_8Minimal.unwrapped.log4cpp mpir fftwFloat alsa-lib diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix index 817013dbf3ec..1b36b36829a0 100644 --- a/pkgs/applications/radio/pothos/default.nix +++ b/pkgs/applications/radio/pothos/default.nix @@ -9,7 +9,7 @@ , poco , qtbase , qtsvg -, libsForQt5 +, qwt6_1 , nlohmann_json , soapysdr-with-plugins , portaudio @@ -38,7 +38,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config doxygen wrapQtAppsHook ]; buildInputs = [ - pcre poco qtbase qtsvg libsForQt5.qwt nlohmann_json + pcre poco qtbase qtsvg qwt6_1 nlohmann_json soapysdr-with-plugins portaudio alsa-lib muparserx python3 ]; diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 6960eba6a57d..567a587e6d5b 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -7,7 +7,6 @@ , thrift # Not gnuradioPackages' , codec2 -, log4cpp , gmp , gsm , libopus @@ -48,7 +47,7 @@ gnuradio3_8.pkgs.mkDerivation rec { buildInputs = [ gnuradio3_8.unwrapped.boost codec2 - log4cpp + gnuradio3_8.unwrapped.log4cpp gmp libpulseaudio libconfig diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index 7b27bb2eac02..6e7a28eb7c74 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -2,12 +2,12 @@ libpulseaudio, alsa-lib, hamlib, libv4l, fftwFloat }: mkDerivation rec { - version = "9.4.4"; + version = "9.5.8"; pname = "qsstv"; src = fetchurl { url = "http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"; - sha256 = "0f9hx6sy418cb23fadll298pqbc5l2lxsdivi4vgqbkvx7sw58zi"; + sha256 = "0s3sivc0xan6amibdiwfnknrl3248wzgy98w6gyxikl0qsjpygy0"; }; nativeBuildInputs = [ @@ -20,7 +20,8 @@ mkDerivation rec { postInstall = '' # Install desktop icon - install -D qsstv/icons/qsstv.png $out/share/pixmaps/qsstv.png + install -D icons/qsstv.png $out/share/pixmaps/qsstv.png + install -D qsstv.desktop $out/share/applications/qsstv.desktop ''; meta = with lib; { @@ -31,4 +32,3 @@ mkDerivation rec { maintainers = with lib.maintainers; [ hax404 ]; }; } - diff --git a/pkgs/applications/radio/rtl-ais/default.nix b/pkgs/applications/radio/rtl-ais/default.nix index 7fd37d21fe16..243d3126b5f4 100644 --- a/pkgs/applications/radio/rtl-ais/default.nix +++ b/pkgs/applications/radio/rtl-ais/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libusb1, rtl-sdr }: stdenv.mkDerivation { - name = "rtl-ais"; + pname = "rtl-ais"; version = "0.8.1"; buildInputs = [ pkg-config rtl-sdr libusb1 ]; diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 2ba379400382..2f66de63428c 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -33,13 +33,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "6.17.2"; + version = "6.18.1"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-sMD2JTJJlssMdXCUHdFYjEqGknhGGuG4szfnvFFN7t4="; + sha256 = "sha256-gf+RUOcki0pi3UH4NHFsmbTV04HUG16UC4jcUjyeip4="; fetchSubmodules = false; }; diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/applications/radio/sdrplay/default.nix index d12b12ecc13c..441ff1cf0f3d 100644 --- a/pkgs/applications/radio/sdrplay/default.nix +++ b/pkgs/applications/radio/sdrplay/default.nix @@ -4,7 +4,7 @@ let else if stdenv.isi686 then "i686" else throw "unsupported architecture"; in stdenv.mkDerivation rec { - name = "sdrplay"; + pname = "sdrplay"; version = "3.07.1"; src = fetchurl { diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index 8fe3dc90008f..1d2aaca9362b 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -3,7 +3,7 @@ } : let - version = "0.3.3"; + version = "0.3.4"; in stdenv.mkDerivation { pname = "soapyhackrf"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapyHackRF"; rev = "soapy-hackrf-${version}"; - sha256 = "1awn89z462500gb3fjb7x61b1znkjri9n1d39bqfip1qk4s11pxc"; + sha256 = "sha256-fzPYHJAPX8FkFxPXpLlUagTd/NoamRX0YnxHwkbV1nI="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/radio/soapysdrplay/default.nix b/pkgs/applications/radio/soapysdrplay/default.nix index dbee593bd0d6..d205462fb604 100644 --- a/pkgs/applications/radio/soapysdrplay/default.nix +++ b/pkgs/applications/radio/soapysdrplay/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, soapysdr, sdrplay }: stdenv.mkDerivation { - name = "soapysdr-sdrplay3"; - version = "20210425"; + pname = "soapysdr-sdrplay3"; + version = "unstable-2021-04-25"; src = fetchFromGitHub { owner = "pothosware"; diff --git a/pkgs/applications/radio/soundmodem/default.nix b/pkgs/applications/radio/soundmodem/default.nix index bedcc8b02c4e..01a8006822f6 100644 --- a/pkgs/applications/radio/soundmodem/default.nix +++ b/pkgs/applications/radio/soundmodem/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, alsa-lib, audiofile, gtk2, libxml2 }: stdenv.mkDerivation rec { - name = "soundmodem"; + pname = "soundmodem"; version = "0.20"; src = fetchurl { - url = "https://archive.org/download/${name}-${version}/${name}-${version}.tar.gz"; + url = "https://archive.org/download/soundmodem-${version}/soundmodem-${version}.tar.gz"; sha256 = "156l3wjnh5rcisxb42kcmlf74swf679v4xnj09zy5j74rd4h721z"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; #homepage = "http://gna.org/projects/soundmodem"; # official, but "Connection refused" homepage = "http://soundmodem.vk4msl.id.au/"; - downloadPage = "https://archive.org/download/${name}-${version}/${name}-${version}.tar.gz"; + downloadPage = "https://archive.org/download/${pname}-${version}/${pname}-${version}.tar.gz"; license = licenses.gpl2Only; maintainers = with maintainers; [ ymarkus ]; platforms = platforms.all; diff --git a/pkgs/applications/radio/srsran/default.nix b/pkgs/applications/radio/srsran/default.nix new file mode 100644 index 000000000000..dc7ae777df71 --- /dev/null +++ b/pkgs/applications/radio/srsran/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, lib +, cmake +, fetchFromGitHub +, pkg-config +, fftwFloat +, mbedtls +, boost +, lksctp-tools +, libconfig +, pcsclite +, uhd +, soapysdr +, libbladeRF +}: + +stdenv.mkDerivation rec { + pname = "srsran"; + version = "21.10"; + + src = fetchFromGitHub { + owner = "srsran"; + repo = "srsran"; + rev = "release_${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "sha256-uJv8khevp7g2p4zT6bkrut67kvMu+fuL1VHDDit0viw="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + fftwFloat + mbedtls + boost + libconfig + lksctp-tools + pcsclite + uhd + soapysdr + libbladeRF + ]; + + meta = with lib; { + homepage = "https://www.srslte.com/"; + description = "Open-source 4G and 5G software radio suite."; + license = licenses.agpl3; + platforms = with platforms; linux ; + maintainers = with maintainers; [ hexagonal-sun ]; + }; +} diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix index 255f7761be92..8c1d5f2129ea 100644 --- a/pkgs/applications/radio/svxlink/default.nix +++ b/pkgs/applications/radio/svxlink/default.nix @@ -9,7 +9,7 @@ let icon = "qtel"; desktopName = name; genericName = "EchoLink Client"; - categories = "HamRadio;Qt;Network;"; + categories = [ "HamRadio" "Qt" "Network" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 29f8ec7b5e51..93836cee2819 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "0ibcr2ypnyl2aq324sbmmr18ksxszg81yrhybawx46ba9vym6j99"; + sha256 = "sha256-TrvyPcpSMACrbKPVOjxHsVsC28LmruiVO/CyCPh0KZ8="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index cfd339c2d1ea..fbc7eae9109d 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "welle-io"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "AlbrechtL"; repo = "welle.io"; rev = "v${version}"; - sha256 = "1xl1lanw0xgmgks67dbfb2h52jxnrd1i2zik56v0q8dwsr7f0daw"; + sha256 = "sha256-xXiCL/A2SwCSr5SA4AQQEdieRzBksXx9Z78bHtlFiW4="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/science/astronomy/gnuastro/default.nix b/pkgs/applications/science/astronomy/gnuastro/default.nix new file mode 100644 index 000000000000..aed029f9d367 --- /dev/null +++ b/pkgs/applications/science/astronomy/gnuastro/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, libtool +, cfitsio, curl, ghostscript, gsl, libgit2, libjpeg, libtiff, lzlib, wcslib }: + +stdenv.mkDerivation rec { + pname = "gnuastro"; + version = "0.17"; + + src = fetchurl { + url = "mirror://gnu/gnuastro/gnuastro-${version}.tar.gz"; + sha256 = "sha256-xBvtM8wkDOqXg/Q2dNfPR0R0ZgRm4QiPJZoLDKivaPU="; + }; + + nativeBuildInputs = [ libtool ]; + + buildInputs = [ + cfitsio + curl + ghostscript + gsl + libgit2 + libjpeg + libtiff + lzlib + wcslib + ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "GNU astronomy utilities and library"; + homepage = "https://www.gnu.org/software/gnuastro/"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/applications/science/astronomy/gprojector/default.nix b/pkgs/applications/science/astronomy/gprojector/default.nix index 3864058828f4..8ad7ef720c6b 100644 --- a/pkgs/applications/science/astronomy/gprojector/default.nix +++ b/pkgs/applications/science/astronomy/gprojector/default.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "gprojector"; - version = "3.0.2"; + version = "3.0.3"; src = fetchzip { url = "https://www.giss.nasa.gov/tools/gprojector/download/G.ProjectorJ-${version}.tgz"; - sha256 = "sha256-IvGZOYt2d8aWtlAJJzVrwkqOOhaUHUmEDlMeD/0NdwU="; + sha256 = "sha256-60UT6z5aQ3Tk4EujEUp4ntB5GakFVhJzk5eytoIwf78="; }; desktopItems = [ (makeDesktopItem { @@ -22,8 +22,8 @@ stdenvNoCC.mkDerivation rec { exec = "gprojector"; desktopName = "G.Projector"; comment = meta.description; - categories = "Science;"; - extraEntries = "StartupWMClass = gov-nasa-giss-projector-GProjector"; + categories = [ "Science" ]; + startupWMClass = "gov-nasa-giss-projector-GProjector"; }) ]; buildInputs = [ jre ]; diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index d557f32bb6da..fb5cce02bdb4 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: +{ lib, stdenv, fetchFromGitHub, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: stdenv.mkDerivation rec { pname = "gravit"; version = "0.5.1"; - src = fetchurl { - url = "https://gravit.slowchop.com/media/downloads/gravit-${version}.tgz"; - sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; + src = fetchFromGitHub { + owner = "gak"; + repo = pname; + rev = version; + hash = "sha256-JuqnLLD5+Ec8kQI0SK98V1O6TTbGM6+yKn5KCHe85eM="; }; buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image lua5 libpng libSM libICE ]; @@ -23,9 +25,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = "https://gravit.slowchop.com"; + homepage = "https://github.com/gak/gravit"; description = "Beautiful OpenGL-based gravity simulator"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; longDescription = '' Gravit is a gravity simulator which runs under Linux, Windows and diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index b7b9fbeb14d3..9f58de432596 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.5.6"; + version = "3.5.8"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-n+fGYLzQAGS8828hr7XE9qiTMyg99L+W7VRjd9aEkrQ="; + sha256 = "sha256-Zg2QKDe3q/OBDW4k9y/YTwREopvX1D4YlrGf7OHIjD8="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/applications/science/astronomy/phd2/default.nix index 543e6820a763..52049302a27b 100644 --- a/pkgs/applications/science/astronomy/phd2/default.nix +++ b/pkgs/applications/science/astronomy/phd2/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "phd2"; - version = "2.6.10"; + version = "2.6.11"; src = fetchFromGitHub { owner = "OpenPHDGuiding"; repo = "phd2"; rev = "v${version}"; - sha256 = "sha256-2ZiPjhlguWXFcC53xG1aqAode7twtoHWszFUMQkK5xU="; + sha256 = "sha256-iautgHOVzdLWYGOVu3wHBDt30uCbaP58mDz/l7buB1k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index b50cb4b71d0d..4a51e88dc3b9 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "siril"; - version = "0.99.10.1"; + version = "1.0.0"; src = fetchFromGitLab { owner = "free-astro"; repo = pname; rev = version; - sha256 = "sha256-gqV+pJNaU+GnYiUo/imofgNdeM+AtDg/pSH7aoqhkYA="; + sha256 = "sha256-yqWFEa1fnSwl0ecN9hMI13QCfj0f69CFqTJlEAhTpJI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 0963b4c17e02..7b5f28fbd848 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,25 +1,25 @@ { stdenv, lib, mkDerivation, fetchFromGitHub , cmake, freetype, libpng, libGLU, libGL, openssl, perl, libiconv -, qtscript, qtserialport, qttools +, qtscript, qtserialport, qttools, qtcharts , qtmultimedia, qtlocation, qtbase, wrapQtAppsHook }: mkDerivation rec { pname = "stellarium"; - version = "0.21.3"; + version = "0.22.0"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "sha256-TQMLy5ziBF7YqPDzPwgjY5FHxxMUe7MXo/TGxQ1nGcg="; + sha256 = "sha256-scG/SS9emEmrZunv6n3Vzcchoh0Cf9rDOkuxAMnxNk4="; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; buildInputs = [ freetype libpng libGLU libGL openssl libiconv qtscript qtserialport qttools - qtmultimedia qtlocation qtbase + qtmultimedia qtlocation qtbase qtcharts ]; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/science/biology/angsd/default.nix b/pkgs/applications/science/biology/angsd/default.nix new file mode 100644 index 000000000000..02e00cd19ad6 --- /dev/null +++ b/pkgs/applications/science/biology/angsd/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, htslib, zlib, bzip2, xz, curl, openssl }: + +stdenv.mkDerivation rec { + pname = "angsd"; + version = "0.937"; + + src = fetchFromGitHub { + owner = "ANGSD"; + repo = "angsd"; + sha256 = "1020gh066dprqhfi90ywqzqqnq7awn49wrkkjnizmmab52v00kxs"; + rev = "${version}"; + }; + + buildInputs = [ htslib zlib bzip2 xz curl openssl ]; + + makeFlags = [ "HTSSRC=systemwide" "prefix=$(out)" ]; + + meta = with lib; { + description = "Program for analysing NGS data"; + homepage = "http://www.popgen.dk/angsd"; + maintainers = [ maintainers.bzizou ]; + license = licenses.gpl2; + }; +} + diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index f6aa5e8892ac..c04d6af080e3 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.14"; + version = "1.15"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-t++Iron8tVZYxb6i6MuOdWsFXhOGADbWvhN1Z4KqGcs="; + sha256 = "sha256-GIXMtFCobpegCqkF1zgcqeB72JZ8BXBaYdAAfS4iKW4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 818d0fe14ba2..1702079e017f 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2B6w6c/qztyBb1jNA0zg+udQm41ouT1DyB6Ygpi5nC8="; + sha256 = "sha256-xCsTkQXrZS+Njn0YfidhPln+OwVfTXOqbtB0dCfTP2U="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/biology/febio-studio/default.nix b/pkgs/applications/science/biology/febio-studio/default.nix new file mode 100644 index 000000000000..e334637f243c --- /dev/null +++ b/pkgs/applications/science/biology/febio-studio/default.nix @@ -0,0 +1,61 @@ +{ lib, stdenv, fetchFromGitHub, cmake, zlib, libglvnd, libGLU, wrapQtAppsHook +, sshSupport ? true, openssl, libssh +, tetgenSupport ? true, tetgen +, ffmpegSupport ? true, ffmpeg +, dicomSupport ? false, dcmtk +, withModelRepo ? true +, withCadFeatures ? false +}: + +stdenv.mkDerivation rec { + pname = "febio-studio"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "febiosoftware"; + repo = "FEBioStudio"; + rev = "v${version}"; + sha256 = "0r6pg49i0q9idp7pjymj7mlxd63qjvmfvg0l7fmx87y1yd2hfw4h"; + }; + + patches = [ + ./febio-studio-cmake.patch # Fix Errors that appear with certain Cmake flags + ]; + + cmakeFlags = [ + "-DQt_Ver=5" + "-DNOT_FIRST=On" + "-DOpenGL_GL_PREFERENCE=GLVND" + ] + ++ lib.optional sshSupport "-DUSE_SSH=On" + ++ lib.optional tetgenSupport "-DUSE_TETGEN=On" + ++ lib.optional ffmpegSupport "-DUSE_FFMPEG=On" + ++ lib.optional dicomSupport "-DUSE_DICOM=On" + ++ lib.optional withModelRepo "-DMODEL_REPO=On" + ++ lib.optional withCadFeatures "-DCAD_FEATURES=On" + ; + + + installPhase = '' + runHook preInstall + mkdir -p $out/ + cp -R bin $out/ + runHook postInstall + ''; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + buildInputs = [ zlib libglvnd libGLU openssl libssh ] + ++ lib.optional sshSupport openssl + ++ lib.optional tetgenSupport tetgen + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional dicomSupport dcmtk + ; + + meta = with lib; { + description = "FEBio Suite Solver"; + license = with licenses; [ mit ]; + homepage = "https://febio.org/"; + platforms = platforms.unix; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} diff --git a/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch b/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch new file mode 100644 index 000000000000..e694f6c3b89f --- /dev/null +++ b/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch @@ -0,0 +1,38 @@ +diff --git a/FEBioStudio/RepositoryPanel.cpp b/FEBioStudio/RepositoryPanel.cpp +index 382db303..314cdc68 100644 +--- a/FEBioStudio/RepositoryPanel.cpp ++++ b/FEBioStudio/RepositoryPanel.cpp +@@ -1364,10 +1364,10 @@ void CRepositoryPanel::loadingPageProgress(qint64 bytesSent, qint64 bytesTotal) + + #else + +-CRepositoryPanel::CRepositoryPanel(CMainWindow* pwnd, QWidget* parent){} ++CRepositoryPanel::CRepositoryPanel(CMainWindow* pwnd, QDockWidget* parent){} + CRepositoryPanel::~CRepositoryPanel(){} + void CRepositoryPanel::OpenLink(const QString& link) {} +-// void CRepositoryPanel::Raise() {} ++void CRepositoryPanel::Raise() {} + void CRepositoryPanel::SetModelList(){} + void CRepositoryPanel::ShowMessage(QString message) {} + void CRepositoryPanel::ShowWelcomeMessage(QByteArray messages) {} +@@ -1396,6 +1396,7 @@ void CRepositoryPanel::on_actionSearch_triggered() {} + void CRepositoryPanel::on_actionClearSearch_triggered() {} + void CRepositoryPanel::on_actionDeleteRemote_triggered() {} + void CRepositoryPanel::on_actionModify_triggered() {} ++void CRepositoryPanel::on_actionCopyPermalink_triggered() {} + void CRepositoryPanel::on_treeWidget_itemSelectionChanged() {} + void CRepositoryPanel::on_treeWidget_customContextMenuRequested(const QPoint &pos) {} + void CRepositoryPanel::DownloadItem(CustomTreeWidgetItem *item) {} +diff --git a/FEBioStudio/WzdUpload.cpp b/FEBioStudio/WzdUpload.cpp +index 5ce74346..20062e06 100644 +--- a/FEBioStudio/WzdUpload.cpp ++++ b/FEBioStudio/WzdUpload.cpp +@@ -1183,7 +1183,7 @@ void CWzdUpload::on_saveJson_triggered() + getProjectJson(&projectInfo); + + QFile file(filedlg.selectedFiles()[0]); +- file.open(QIODeviceBase::WriteOnly); ++ file.open(QIODevice::WriteOnly); + file.write(projectInfo); + file.close(); + } diff --git a/pkgs/applications/science/biology/flywheel-cli/default.nix b/pkgs/applications/science/biology/flywheel-cli/default.nix new file mode 100644 index 000000000000..7db8b0066263 --- /dev/null +++ b/pkgs/applications/science/biology/flywheel-cli/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchurl +, unzip +}: + +let + inherit (stdenv.targetPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; + + os = { + x86_64-darwin = "darwin"; + x86_64-linux = "linux"; + }.${system} or throwSystem; + + sha256 = { + x86_64-darwin = "sha256-OIyEu3Hsobui9s5+T9nC10SxMw0MhgmTA4SN9Ridyzo="; + x86_64-linux = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78="; + }.${system} or throwSystem; +in +stdenv.mkDerivation rec { + pname = "flywheel-cli"; + version = "16.2.0"; + + src = fetchurl { + url = "https://storage.googleapis.com/flywheel-dist/cli/${version}/fw-${os}_amd64-${version}.zip"; + inherit sha256; + }; + + nativeBuildInputs = [ unzip ]; + + unpackPhase = '' + unzip ${src} + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/bin ./${os}_amd64/fw + runHook postInstall + ''; + + meta = with lib; { + description = "Library and command line interface for interacting with a Flywheel site"; + homepage = "https://gitlab.com/flywheel-io/public/python-cli"; + license = licenses.mit; + maintainers = with maintainers; [ rbreslow ]; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix index ab8e26f92a0d..67c39031b773 100644 --- a/pkgs/applications/science/biology/hisat2/default.nix +++ b/pkgs/applications/science/biology/hisat2/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Graph based aligner"; - license = licenses.gpl3; - homepage = "https://ccb.jhu.edu/software/hisat2/index.shtml"; + license = licenses.gpl3Plus; + homepage = "https://daehwankimlab.github.io/hisat2/"; maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix index 203d0520660f..156f55161291 100644 --- a/pkgs/applications/science/biology/kallisto/default.nix +++ b/pkgs/applications/science/biology/kallisto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kallisto"; - version = "0.46.2"; + version = "0.48.0"; src = fetchFromGitHub { repo = "kallisto"; owner = "pachterlab"; rev = "v${version}"; - sha256 = "0m0r2820ca3rch99md1zzbgkilmlfkhdkpys2lfnb87qxmf1jnmb"; + sha256 = "sha256-r0cdR0jTRa1wu/LDKW6NdxI3XaKj6wcIVbIlct0fFvI="; }; nativeBuildInputs = [ autoconf cmake ]; diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 8de0580a8199..bbe661b4f0a0 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1256"; + version = "1268"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = version; - sha256 = "sha256-lOsU0X4K6jYcbkTzwQV+KAerQh9odE4zCLtSgZrYH6s="; + sha256 = "sha256-9yzeLg3xporl32sZ1Ks8s63jXJNGUiI64XyQmhbQF4M="; }; nativeBuildInputs = [ unzip ]; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Genomic sequence aligner"; - homepage = "http://last.cbrc.jp/"; - license = licenses.gpl3; + homepage = "https://gitlab.com/mcfrith/last"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jbedo ]; platforms = platforms.x86_64; }; diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index d395804a42e5..79cce7b9f744 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "3.7"; + version = "3.7.1"; pname = "messer-slim"; src = fetchFromGitHub { owner = "MesserLab"; repo = "SLiM"; rev = "v${version}"; - sha256 = "sha256-YEIpdW7W/Dezezh9r6q0fLkF4zb+oH36bAZ/YYqkr8k="; + sha256 = "sha256-3ox+9hzqI8s4gmEkQ3Xm1Ih639LBtcSJNNmJgbpWaoM="; }; nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index bba8a02b76e3..7e162e2d27c6 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; + makeFlags = lib.optionals stdenv.isAarch64 [ "arm_neon=1" "aarch64=1" ]; + installPhase = '' mkdir -p $out/bin cp minimap2 $out/bin @@ -25,7 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://lh3.github.io/minimap2"; license = licenses.mit; platforms = platforms.all; - badPlatforms = platforms.aarch64; maintainers = [ maintainers.arcadio ]; }; } diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix index b6cc5e406153..fa93ab3fcdb0 100644 --- a/pkgs/applications/science/biology/mosdepth/default.nix +++ b/pkgs/applications/science/biology/mosdepth/default.nix @@ -2,14 +2,14 @@ nimPackages.buildNimPackage rec { pname = "mosdepth"; - version = "0.3.2"; + version = "0.3.3"; nimBinOnly = true; src = fetchFromGitHub { owner = "brentp"; repo = "mosdepth"; rev = "v${version}"; - sha256 = "sha256-uui4yC7ok+pvbXVKfBVsAarH40fnH4fnP8P4uzOqztQ="; + sha256 = "sha256-de3h3SXnXlqjuLT1L66jj/1AoiTuFc3PVJYjm7s8Fj8="; }; buildInputs = with nimPackages; [ docopt hts-nim pcre ]; diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix index 0e273dbefaac..dff041971ea7 100644 --- a/pkgs/applications/science/biology/ncbi-tools/default.nix +++ b/pkgs/applications/science/biology/ncbi-tools/default.nix @@ -8,10 +8,10 @@ # Another note: you may want the older and deprecated C-libs at ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/Mar_17_2008/NCBI_C_Toolkit/ncbi_c--Mar_17_2008.tar.gz stdenv.mkDerivation rec { - name = "ncbi_tools"; - ncbi_version = "Dec_31_2008"; + pname = "ncbi_tools"; + version = "Dec_31_2008"; src = fetchurl { - url = "ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/${ncbi_version}/ncbi_cxx--${ncbi_version}.tar.gz"; + url = "ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/${version}/ncbi_cxx--${version}.tar.gz"; sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr"; }; diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 804407968e1c..4dc850f50627 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { - pname = "neuron"; + pname = "neuron${lib.optionalString useMpi "-mpi"}"; version = "7.5"; nativeBuildInputs = [ which pkg-config automake autoconf libtool ]; diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index f6dcca3a2399..526a5b3ed33b 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.26.9"; + version = "2.26.11"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-5e60StDQil9SMR9G6Gs+OPWMjADn96fOpfHDlNoZSGc="; + sha256 = "sha256-0swggo1a5gExpj3VgaWKT/TYd7rfSFBcqRrAURnTPjM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index 6e747e318f57..d02d47266297 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - pname = "RAxML"; + pname = "RAxML${lib.optionalString useMpi "-mpi"}"; version = "8.2.12"; src = fetchFromGitHub { owner = "stamatak"; - repo = "standard-${pname}"; + repo = "standard-RAxML"; rev = "v${version}"; sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh"; }; diff --git a/pkgs/applications/science/biology/repseek/default.nix b/pkgs/applications/science/biology/repseek/default.nix new file mode 100644 index 000000000000..5966c83b7a5f --- /dev/null +++ b/pkgs/applications/science/biology/repseek/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "repseek"; + version = "9Sep2014"; + src = fetchurl { + url = "https://bioinfo.mnhn.fr/abi/public/RepSeek/RepSeek.${version}.tgz"; + sha256 = "1jiknji3ivrv7zmrfbf2mccfpdwhin3lfxfsciaqwf69b3sda8nf"; + }; + + preConfigure = '' + mkdir -p $out/bin + substituteInPlace Makefile \ + --replace "INSTALLDIR = \$\$HOME/bin" "INSTALLDIR = $out/bin/" \ + --replace "CC= gcc" "CC = $CC" + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace Makefile --replace "MACHINE = MACOSX" "MACHINE = LINUX" + ''; + + meta = { + description = "Tool to retrieve approximate repeats from large DNA sequences"; + homepage = "https://bioinfo.mnhn.fr/abi/public/RepSeek"; + maintainers = [ lib.maintainers.bzizou ]; + license = lib.licenses.lgpl21; + }; + +} diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix index b41d266dbab5..5302b43bb026 100644 --- a/pkgs/applications/science/biology/spades/default.nix +++ b/pkgs/applications/science/biology/spades/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SPAdes"; - version = "3.15.3"; + version = "3.15.4"; src = fetchurl { url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-suWp/XplruWriGIi1q9Pe3vH91XaegOUFXH6vWueFJk="; + sha256 = "sha256-OyQcUopCqL398j5b+PAISDR5BZDQhJHezqnw8AnYWJ8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/chemistry/chemtool/default.nix b/pkgs/applications/science/chemistry/chemtool/default.nix index 3b5d144ba22b..bf78aeb825d5 100644 --- a/pkgs/applications/science/chemistry/chemtool/default.nix +++ b/pkgs/applications/science/chemistry/chemtool/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/chemistry/d-seams/default.nix b/pkgs/applications/science/chemistry/d-seams/default.nix index f5e21db4b55a..74260bacabcc 100644 --- a/pkgs/applications/science/chemistry/d-seams/default.nix +++ b/pkgs/applications/science/chemistry/d-seams/default.nix @@ -2,13 +2,13 @@ , eigen, lua, luaPackages, liblapack, blas, lib, boost, gsl }: clangStdenv.mkDerivation rec { - version = "v1.0.1"; + version = "1.0.1"; pname = "d-SEAMS"; src = fetchFromGitHub { owner = "d-SEAMS"; repo = "seams-core"; - rev = "v1.0.1"; + rev = "v${version}"; sha256 = "03zhhl9vhi3rhc3qz1g3zb89jksgpdlrk15fcr8xcz8pkj6r5b1i"; }; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 20b665792ac4..a747b96dd180 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -12,19 +12,27 @@ let exec = "jmol"; desktopName = "JMol"; genericName = "Molecular Modeler"; - mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"; - categories = "Graphics;Education;Science;Chemistry;"; + mimeTypes = [ + "chemical/x-pdb" + "chemical/x-mdl-molfile" + "chemical/x-mol2" + "chemical/seq-aa-fasta" + "chemical/seq-na-fasta" + "chemical/x-xyz" + "chemical/x-mdl-sdf" + ]; + categories = [ "Graphics" "Education" "Science" "Chemistry" ]; }; in stdenv.mkDerivation rec { - version = "14.32.6"; + version = "14.32.39"; 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"; - sha256 = "sha256-b9E/IJfqeA8rBSQogb/ZVBMW3y9bc2dBj/BIl0HWFR8="; + sha256 = "sha256-ekwipWWGsXYECJBOmw0+uIWHDpdF8T8jZUo6LeqD6Io="; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 72958898428a..2b5a1b969509 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "21.20.0"; + version = "22.8.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "sha256-xOtlJSUY7QLyggFXW0Ay3+6KNHIqljyDpyk0CP8jxWs="; + sha256 = "sha256-dmG2p4KqzjLuuVw+wPWaxVoqOqba8Tx5l44PauWpqv4="; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 39bbae77a66e..5f7c0c1f6be7 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -24,8 +24,16 @@ let genericName = "Molecular Modeler"; comment = description; icon = pname; - mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"; - categories = "Graphics;Education;Science;Chemistry;"; + mimeTypes = [ + "chemical/x-pdb" + "chemical/x-mdl-molfile" + "chemical/x-mol2" + "chemical/seq-aa-fasta" + "chemical/seq-na-fasta" + "chemical/x-xyz" + "chemical/x-mdl-sdf" + ]; + categories = [ "Graphics" "Education" "Science" "Chemistry" ]; }; in python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix new file mode 100644 index 000000000000..fc840fe45fbc --- /dev/null +++ b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook, qtbase }: + +stdenv.mkDerivation rec { + pname = "QtRVSim"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "cvut"; + repo = "qtrvsim"; + rev = "refs/tags/v${version}"; + sha256 = "B1l+ysrodeDbxYfdLLMF8yk4/uPXTcDrTaMtYm89HuU="; + }; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + buildInputs = [ qtbase ]; + + meta = with lib; { + description = "RISC-V CPU simulator for education purposes"; + longDescription = '' + RISC-V CPU simulator for education purposes with pipeline and cache visualization. + Developed at FEE CTU for computer architecture classes. + ''; + homepage = "https://github.com/cvut/qtrvsim"; + license = licenses.gpl3Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ jdupak ]; + mainProgram = "qtrvsim_gui"; + }; +} diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index 909a3ec767c6..cf135b9469a7 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool automake autoconf flex ]; buildInputs = [ xorgproto motif libX11 libXt libXpm bison ]; + # Disable parallel build, errors: + # ./pat_decl_y.y:736:5: error: expected '=', ... + enableParallelBuilding = false; + ALLIANCE_TOP = placeholder "out"; configureFlags = [ diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index 6a9a491af1ee..1adac4832a13 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: +{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt6_1}: mkDerivation rec { pname = "caneda"; @@ -12,7 +12,7 @@ mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qttools qtsvg qwt ]; + buildInputs = [ qtbase qttools qtsvg qwt6_1 ]; meta = { description = "Open source EDA software focused on easy of use and portability"; diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/applications/science/electronics/diylc/default.nix index 987f6156b4b9..ff4e3809fc2b 100644 --- a/pkgs/applications/science/electronics/diylc/default.nix +++ b/pkgs/applications/science/electronics/diylc/default.nix @@ -27,7 +27,7 @@ let comment = "Multi platform circuit layout and schematic drawing tool"; exec = "diylc"; icon = "diylc_icon"; - categories = "Development;Electronics;"; + categories = [ "Development" "Electronics" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 2fb3b8c8b18c..5b4c8eb790fe 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -27,7 +27,7 @@ let comment = "Schematic capture and PCB layout"; desktopName = "Eagle"; genericName = "Schematic editor"; - categories = "Development;"; + categories = [ "Development" ]; }; buildInputs = diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index 8ea75a3ec486..f48d08d40799 100644 --- a/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { comment = "Schematic capture and PCB layout"; desktopName = "Eagle"; genericName = "Schematic editor"; - categories = "Development;"; + categories = [ "Development" ]; }; buildInputs = @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Schematic editor and PCB layout tool from CadSoft"; - homepage = "http://www.cadsoftusa.com/"; + homepage = "https://www.autodesk.com/products/eagle/overview"; license = licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/science/electronics/gaw/default.nix b/pkgs/applications/science/electronics/gaw/default.nix new file mode 100644 index 000000000000..7f0b5625e85a --- /dev/null +++ b/pkgs/applications/science/electronics/gaw/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchurl +, lib +, gtk3 +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "gaw"; + version = "20220315"; + + src = fetchurl { + url = "https://download.tuxfamily.org/gaw/download/gaw3-${version}.tar.gz"; + sha256 = "0j2bqi9444s1mfbr7x9rqp232xf7ab9z7ifsnl305jsklp6qmrbg"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ gtk3 ]; + + meta = with lib; { + description = "Gtk Analog Wave viewer"; + longDescription = '' + Gaw is a software tool for displaying analog waveforms from + sampled datas, for example from the output of simulators or + input from sound cards. Data can be imported to gaw using files, + direct tcp/ip connection or directly from the sound card. + ''; + homepage = "http://gaw.tuxfamily.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fbeffa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index f1ae123c715b..9adfac344b38 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,45 +3,45 @@ { "kicad" = { kicadVersion = { - version = "6.0.1"; + version = "6.0.4"; src = { - rev = "79c1e3a40b913f818bddb69ae98d4d38ab81f926"; - sha256 = "1vpcbhhw8844hm6vpk3kk405wak531pvcvcpc66z0b48iprk3imr"; + rev = "6f826c9f35a3dc9a104bb24a0a89a2e04b2d9721"; + sha256 = "0lki59ws0ncqkp9wxrhyni1ck2sx5z07mmpkjg0d9jpkync9hx9y"; }; }; libVersion = { - version = "6.0.1"; + version = "6.0.4"; libSources = { - symbols.rev = "9f21fdcd5728ce6339dd4e1b26ebe60a1bba05e0"; - symbols.sha256 = "1azjx1bmxaz8bniyw75lq60mc8hvay00jn9qdc2zp7isy3c9ibp0"; - templates.rev = "5a9266bc796ba5c285401dd1fd900dbc4b6a8cd3"; + symbols.rev = "9d00fbb9373571e54d9f29985b21a03d862795a4"; + symbols.sha256 = "12lyc187337bf2frl3jvwqdwwnd69f7l414k3kxhccs3sa2mcf1y"; + templates.rev = "c4f4fe4b821e062a3ddd275f9313d5d81ff8f8d7"; templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; - footprints.rev = "c7f4881b9ec1cbe7f7e5a0828946d0dd909afbee"; - footprints.sha256 = "0mv9xs0mmmfn0yhzx1v55r5app13ckagb16249rabyiz3v5crdpb"; - packages3d.rev = "5d0c3590b26835f9d206a355d7579706c06d8bfe"; - packages3d.sha256 = "0vwcbzq42hzjl4f0zjaswmiff1x59hv64g5n00mx1gl0gwngnyla"; + footprints.rev = "c48d3dfcfa6ce58ec11e10b7a74878bb69fae580"; + footprints.sha256 = "0px2g9jansky0rvc0bdjylbmv8xwhc0q63g88hd2nzbknqli9f1y"; + packages3d.rev = "b1de0b5c3edc16999602b809a05017da62ff52cc"; + packages3d.sha256 = "0ms9py93qyihxrhh9wm2ziycmdn88m36r8adx22ynjnxixw1f9ja"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2022-01-13"; + version = "2022-03-19"; src = { - rev = "33a4c9b08e040a17daefae9069fdf834063555b4"; - sha256 = "1ma0i0vgvdsjrmlfzdi34byly7n1vsaynwp9f1hny4s1m53nirha"; + rev = "58c146a7c00ee64ca07cacbcc594121f40aa2aeb"; + sha256 = "0gcbl11pq0dgp590hdwsh5np7spixk5kgva0v8mx9rqd374z4bdm"; }; }; libVersion = { - version = "2022-01-13"; + version = "2022-03-19"; libSources = { - symbols.rev = "e3b198d827817b79fb8a6df07f0cfc1cb9140edf"; - symbols.sha256 = "1azjx1bmxaz8bniyw75lq60mc8hvay00jn9qdc2zp7isy3c9ibp0"; + symbols.rev = "9b8d3163450172a7f368462c6d005841ad199144"; + symbols.sha256 = "12lyc187337bf2frl3jvwqdwwnd69f7l414k3kxhccs3sa2mcf1y"; templates.rev = "a27d83f0a20f0be0c1ab04b139a0c518da51a5d4"; templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; - footprints.rev = "a939c691f1c515d6830e54cf035a420de3e5a92c"; - footprints.sha256 = "13g6y1l95znz6ixc4dpqsxp3icrzs951xpabnzr5znw42577gm9j"; - packages3d.rev = "196a26294d8e501b0e8b06c1df1abae0ebe23051"; - packages3d.sha256 = "0ywlk00dfwv7hc494finmazdh3g1yx0ir7bvnd8zp6cq4ql0nwl4"; + footprints.rev = "c871df2c81a894bc5e91d2d517b76884d5a918aa"; + footprints.sha256 = "0px2g9jansky0rvc0bdjylbmv8xwhc0q63g88hd2nzbknqli9f1y"; + packages3d.rev = "6ff98426fd51d53c55bc48025d66d3d0b0c5df92"; + packages3d.sha256 = "0ms9py93qyihxrhh9wm2ziycmdn88m36r8adx22ynjnxixw1f9ja"; }; }; }; diff --git a/pkgs/applications/science/electronics/lepton-eda/default.nix b/pkgs/applications/science/electronics/lepton-eda/default.nix index 3e701dc93c4f..8d4217d0aba3 100644 --- a/pkgs/applications/science/electronics/lepton-eda/default.nix +++ b/pkgs/applications/science/electronics/lepton-eda/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "lepton-eda"; - version = "1.9.16-20210731"; + version = "1.9.17-20211219"; src = fetchurl { url = "https://github.com/lepton-eda/lepton-eda/releases/download/${version}/lepton-eda-${builtins.head (lib.splitString "-" version)}.tar.gz"; - sha256 = "sha256-xdJ11M4RXNF6ePZD6Y+/DUdO21AFLbydZcq9nWg0+Yk="; + sha256 = "sha256-lOneKeJUcw6jOX/3iv9BDWOJ3xip/vGhzxHHNAbtsS8="; }; nativeBuildInputs = [ pkg-config makeWrapper texinfo autoreconfHook ]; diff --git a/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch b/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch deleted file mode 100644 index 37ae35195503..000000000000 --- a/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/database/DBio.c b/database/DBio.c -index 93c4b0b..292ea5f 100644 ---- a/database/DBio.c -+++ b/database/DBio.c -@@ -2378,12 +2378,12 @@ DBCellWriteFile(cellDef, f) - - #define FPRINTF(f,s)\ - {\ -- if (fprintf(f,s) == EOF) goto ioerror;\ -+ if (fprintf(f,"%s",s) == EOF) goto ioerror;\ - DBFileOffset += strlen(s);\ - } - #define FPRINTR(f,s)\ - {\ -- if (fprintf(f,s) == EOF) return 1;\ -+ if (fprintf(f,"%s",s) == EOF) return 1;\ - DBFileOffset += strlen(s);\ - } - diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 82d8dbd2ddc4..edee5946d946 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.109"; + version = "8.3.277"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-ZK4OF5XwjW1OJmOVUFqLklfpM10eIwCILygqIyjRbEQ="; + sha256 = "sha256-cS3KaIVwGN/mMfRKjJxzdY6DeNV7tw2fATIHrFBV0fY="; }; nativeBuildInputs = [ python3 ]; @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { patches = [ ./0001-strip-bin-prefix.patch - ./0002-fix-format-security.patch ]; meta = with lib; { diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index 0eed8b1692aa..f4bf424f1090 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "ngspice"; - version = "34"; + version = "36"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - sha256 = "sha256-ImP//GaUdUlyr3By7wHP5irHkIANrWUbwpC/yueb17U="; + sha256 = "sha256-T4GCh++6JFNBBGY1t1eugfh5VJsyakMWtfbml6pRf4w="; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix index 1b9d7773669c..09d36094e7c9 100644 --- a/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openhantek6022"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "sha256-Rb0bd2fnnNWEm1n2EVRB2Leb0Or9vxi5oj+FKNY4GSc="; + sha256 = "sha256-QwJmbABAax4yCbcRONArtj5EUKO1gh3pVoLi2hF/WJI="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 159e15cf247d..5ee89dfa8c43 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,25 +1,31 @@ -{ lib, stdenv, fetchurl -, perl, flex, bison, python3 +{ lib, stdenv, fetchFromGitHub +, perl, flex, bison, python3, autoconf }: stdenv.mkDerivation rec { pname = "verilator"; - version = "4.210"; + version = "4.218"; - src = fetchurl { - url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "sha256-KoIfJeV2aITnwiB2eQgQo4ZyXfMe6erFiGKXezR+IBg="; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FukC60z7Y3bb3I/dgzqCh6kFP6DDBOGi0M8IIZ50P3g="; }; enableParallelBuilding = true; buildInputs = [ perl ]; - nativeBuildInputs = [ flex bison python3 ]; + nativeBuildInputs = [ flex bison python3 autoconf ]; # these tests need some interpreter paths patched early on... # see https://github.com/NixOS/nix/issues/1205 doCheck = false; checkTarget = "test"; + preConfigure = '' + autoconf + ''; + postPatch = '' patchShebangs \ src/flexfix \ diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix index 68322a191787..eb2a29382e60 100644 --- a/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -1,16 +1,12 @@ { lib, stdenv, fetchurl, autoreconfHook, automake, pkg-config , cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }: -let +stdenv.mkDerivation rec { version = "3.10.12"; - name = "xcircuit-${version}"; - inherit (lib) getBin; - -in stdenv.mkDerivation { - inherit name version; + pname = "xcircuit"; src = fetchurl { - url = "http://opencircuitdesign.com/xcircuit/archive/${name}.tgz"; + url = "http://opencircuitdesign.com/xcircuit/archive/xcircuit-${version}.tgz"; sha256 = "1h1ywc3mr7plvwnhdii2zgnnv5ih2nhyl4qbdjpi83dq0aq1s2mn"; }; @@ -20,7 +16,7 @@ in stdenv.mkDerivation { configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" - "--with-ngspice=${getBin ngspice}/bin/ngspice" + "--with-ngspice=${lib.getBin ngspice}/bin/ngspice" ]; buildInputs = with xorg; [ cairo ghostscript libSM libXt libICE libX11 libXpm tcl tk zlib ]; diff --git a/pkgs/applications/science/electronics/xschem/default.nix b/pkgs/applications/science/electronics/xschem/default.nix new file mode 100644 index 000000000000..25fa0aca4677 --- /dev/null +++ b/pkgs/applications/science/electronics/xschem/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, lib +, bison +, cairo +, flex +, libX11 +, libXpm +, pkg-config +, tcl +, tk +}: + +stdenv.mkDerivation rec { + pname = "xschem"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "StefanSchippers"; + repo = "xschem"; + rev = version; + sha256 = "sha256-C57jo8tAbiqQAgf4Xp2lpFGOr6F1knPpFcYxPiqSM4k="; + }; + + nativeBuildInputs = [ bison flex pkg-config ]; + + buildInputs = [ cairo libX11 libXpm tcl tk ]; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + description = "Schematic capture and netlisting EDA tool"; + longDescription = '' + Xschem is a schematic capture program, it allows creation of + hierarchical representation of circuits with a top down approach. + By focusing on interfaces, hierarchy and instance properties a + complex system can be described in terms of simpler building + blocks. A VHDL or Verilog or Spice netlist can be generated from + the drawn schematic, allowing the simulation of the circuit. + ''; + homepage = "https://xschem.sourceforge.io/stefan/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fbeffa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/electronics/xyce/default.nix b/pkgs/applications/science/electronics/xyce/default.nix new file mode 100644 index 000000000000..8d9b02d909e9 --- /dev/null +++ b/pkgs/applications/science/electronics/xyce/default.nix @@ -0,0 +1,182 @@ +{ stdenv +, fetchFromGitHub +, fetchgit +, lib +, autoconf +, automake +, bison +, blas +, flex +, fftw +, gfortran +, lapack +, libtool_2 +, mpi +, suitesparse +, trilinos +, withMPI ? false + # for doc +, texlive +, pandoc +, enableDocs ? true + # for tests +, bash +, bc +, openssh # required by MPI +, perl +, perlPackages +, python3 +, enableTests ? true +}: + +assert withMPI -> trilinos.withMPI; + +stdenv.mkDerivation rec { + pname = "xyce"; + version = "7.4.0"; + + srcs = [ + # useing fetchurl or fetchFromGitHub doesn't include the manuals + # due to .gitattributes files + (fetchgit { + url = "https://github.com/Xyce/Xyce.git"; + rev = "Release-${version}"; + sha256 = "sha256-sOHjQEo4FqlDseTtxFVdLa0SI/VAf2OkwQV7QSL7SNM="; + }) + (fetchFromGitHub { + owner = "Xyce"; + repo = "Xyce_Regression"; + rev = "Release-${version}"; + sha256 = "sha256-kSGUaFarOHDNJ8kA/TAGkmzicm9O7cfJ7mGFZcbqCZM="; + }) + ]; + + sourceRoot = "./Xyce"; + + preConfigure = "./bootstrap"; + + configureFlags = [ + "CXXFLAGS=-O3" + "--enable-xyce-shareable" + "--enable-shared" + "--enable-stokhos" + "--enable-amesos2" + ] ++ lib.optionals withMPI [ + "--enable-mpi" + "CXX=mpicxx" + "CC=mpicc" + "F77=mpif77" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + autoconf + automake + gfortran + libtool_2 + ] ++ lib.optionals enableDocs [ + (texlive.combine { + inherit (texlive) + scheme-medium + koma-script + optional + framed + enumitem + multirow + preprint; + }) + ]; + + buildInputs = [ + bison + blas + flex + fftw + lapack + suitesparse + trilinos + ] ++ lib.optionals withMPI [ mpi ]; + + doCheck = enableTests; + + postPatch = '' + pushd ../source + find Netlists -type f -regex ".*\.sh\|.*\.pl" -exec chmod ugo+x {} \; + # some tests generate new files, some overwrite netlists + find . -type d -exec chmod u+w {} \; + find . -type f -name "*.cir" -exec chmod u+w {} \; + patchShebangs Netlists/ TestScripts/ + # patch script generating functions + sed -i -E 's|/usr/bin/env perl|${lib.escapeRegex perl.outPath}/bin/perl|' \ + TestScripts/XyceRegression/Testing/Netlists/RunOptions/runOptions.cir.sh + sed -i -E 's|/bin/sh|${lib.escapeRegex bash.outPath}/bin/sh|' \ + TestScripts/XyceRegression/Testing/Netlists/RunOptions/runOptions.cir.sh + popd + ''; + + checkInputs = [ + bc + perl + perlPackages.DigestMD5 + (python3.withPackages (ps: with ps; [ numpy scipy ])) + ] ++ lib.optionals withMPI [ mpi openssh ]; + + checkPhase = '' + XYCE_BINARY="$(pwd)/src/Xyce" + EXECSTRING="${lib.optionalString withMPI "mpirun -np 2 "}$XYCE_BINARY" + TEST_ROOT="$(pwd)/../source" + + # Honor the TMP variable + sed -i -E 's|/tmp|\$TMP|' $TEST_ROOT/TestScripts/suggestXyceTagList.sh + + EXLUDE_TESTS_FILE=$TMP/exclude_tests.$$ + # Gold standard has additional ":R" suffix in result column label + echo "Output/HB/hb-step-tecplot.cir" >> $EXLUDE_TESTS_FILE + # This test makes Xyce access /sys/class/net when run with MPI + ${lib.optionalString withMPI "echo \"CommandLine/command_line.cir\" >> $EXLUDE_TESTS_FILE"} + + $TEST_ROOT/TestScripts/run_xyce_regression \ + --output="$(pwd)/Xyce_Test" \ + --xyce_test="''${TEST_ROOT}" \ + --taglist="$($TEST_ROOT/TestScripts/suggestXyceTagList.sh "$XYCE_BINARY" | sed -E -e 's/TAGLIST=([^ ]+).*/\1/' -e '2,$d')" \ + --resultfile="$(pwd)/test_results" \ + --excludelist="$EXLUDE_TESTS_FILE" \ + "''${EXECSTRING}" + ''; + + outputs = [ "out" "doc" ]; + + postInstall = lib.optionalString enableDocs '' + local docFiles=("doc/Users_Guide/Xyce_UG" + "doc/Reference_Guide/Xyce_RG" + "doc/Release_Notes/Release_Notes_${lib.versions.majorMinor version}/Release_Notes_${lib.versions.majorMinor version}") + + # Release notes refer to an image not in the repo. + sed -i -E 's/\\includegraphics\[height=(0.5in)\]\{snllineblubrd\}/\\mbox\{\\rule\{0mm\}\{\1\}\}/' ''${docFiles[2]}.tex + + install -d $doc/share/doc/${pname}-${version}/ + for d in ''${docFiles[@]}; do + # Use a public document class + sed -i -E 's/\\documentclass\[11pt,report\]\{SANDreport\}/\\documentclass\[11pt,letterpaper\]\{scrreprt\}/' $d.tex + sed -i -E 's/\\usepackage\[sand\]\{optional\}/\\usepackage\[report\]\{optional\}/' $d.tex + pushd $(dirname $d) + make + install -t $doc/share/doc/${pname}-${version}/ $(basename $d.pdf) + popd + done + ''; + + meta = with lib; { + description = "High-performance analog circuit simulator"; + longDescription = '' + Xyce is a SPICE-compatible, high-performance analog circuit simulator, + capable of solving extremely large circuit problems by supporting + large-scale parallel computing platforms. + ''; + homepage = "https://xyce.sandia.gov"; + license = licenses.gpl3; + maintainers = with maintainers; [ fbeffa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/applications/science/geometry/gama/default.nix index 750cba9d8b23..b2226db46087 100644 --- a/pkgs/applications/science/geometry/gama/default.nix +++ b/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.16"; + version = "2.17"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-fO2AHZnqRvCF1+AlKDeD3ygivW3zXCuF10O2nKL2CWs="; + sha256 = "sha256-AyUjcYDUjAYI4p0vVDO7SGqhbO83Kesd+JUUgQf5GPU="; }; buildInputs = [ expat ]; diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index 1e3c96ae8c62..ff2b211b34d2 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -1,18 +1,25 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl, cmake }: -let version = "1.6.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "tetgen"; - inherit version; + version = "1.6.0"; src = fetchurl { url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz"; sha256 = "sha256-h7XmHr06Rx/E8s3XEkwrEd1mOfT+sflBpdL1EQ0Fzjk="; }; + nativeBuildInputs = [ cmake ]; + installPhase = '' - mkdir -p $out/bin + runHook preInstall + + mkdir -p $out/{bin,lib,include} cp tetgen $out/bin + cp libtet.a $out/lib + cp ../tetgen.{cxx,h} $out/include + + runHook postInstall ''; meta = { diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index fe73f4f4d6e2..60454ca9ce99 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "2021.11.12"; + version = "2022.03.04"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "f6fa2ddcfc89099726d60386befba874c7ac1e0d"; - hash = "sha256-0rvMPZ+kL0m/GjlCLx3eXYQ0osQ2wQiS3+csqPl3U9s="; + rev = "d7ecb23eeee9c9b4924182ce570c2e33eb18abff"; + hash = "sha256-aufWRTggJNOaUFsjh5+HFDqEur+nuM0hZSsTfGptbks="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 837f25e320f7..096a648b4ddf 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -12,36 +12,33 @@ let }; useDune2 = true; - - nativeBuildInputs = [ which ]; - in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src useDune2 nativeBuildInputs; + inherit version src useDune2; configureFlags = pname; + nativeBuildInputs = [ which ]; buildInputs = with ocamlPackages; [ dune-configurator ]; propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src useDune2 nativeBuildInputs; + inherit version src useDune2; configureFlags = pname; - buildInputs = with ocamlPackages; [ menhir ]; + nativeBuildInputs = [ which ocamlPackages.menhir ]; propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); }; in ocamlPackages.buildDunePackage { - inherit pname version src useDune2 nativeBuildInputs; + inherit pname version src useDune2; configureFlags = pname; - buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ - cmdliner menhir ]) - ; + nativeBuildInputs = [ which ocamlPackages.menhir ]; + buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner ]; meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/logic/anders/default.nix b/pkgs/applications/science/logic/anders/default.nix new file mode 100644 index 000000000000..bb60b2b8321a --- /dev/null +++ b/pkgs/applications/science/logic/anders/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, ocamlPackages }: + +ocamlPackages.buildDunePackage rec { + pname = "anders"; + version = "1.1.1"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "groupoid"; + repo = "anders"; + rev = "${version}"; + sha256 = "sha256-JUiZoo2rNLfgs94TlJqUNzul/7ODisCjSFAzhgSp1z4="; + }; + + strictDeps = true; + + nativeBuildInputs = [ ocamlPackages.menhir ]; + buildInputs = [ ocamlPackages.zarith ]; + + meta = with lib; { + description = "Modal Homotopy Type System"; + homepage = "https://homotopy.dev/"; + license = licenses.isc; + maintainers = [ maintainers.suhr ]; + }; +} diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 6d38d2a650e1..a9fb21681586 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -47,6 +47,7 @@ let "8.14.0".sha256 = "04y2z0qyvag66zanfyc3f9agvmzbn4lsr0p1l7ck6yjhqx7vbm17"; "8.14.1".sha256 = "0sx78pgx0qw8v7v2r32zzy3l161zipzq95iacda628girim7psnl"; "8.15.0".sha256 = "sha256:1ma76wfrpfsl72yh10w1ys2a0vi0mdc2jc79kdc8nrmxkhpw1nxx"; + "8.15.1".sha256 = "sha256:1dsa04jzkx5pw69pmxn0l55q4w88lg6fvz7clbga0bazzsfnsgd6"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix @@ -69,7 +70,9 @@ let { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } ] ocamlPackages_4_12; - ocamlBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] + ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] + ++ optional (versionAtLeast "8.14") ocamlPackages.dune_2; + ocamlBuildInputs = [] ++ optional (!versionAtLeast "8.10") ocamlPackages.camlp5 ++ optional (!versionAtLeast "8.13") ocamlPackages.num ++ optional (versionAtLeast "8.13") ocamlPackages.zarith; @@ -79,7 +82,7 @@ self = stdenv.mkDerivation { passthru = { inherit coq-version; - inherit ocamlPackages ocamlBuildInputs; + inherit ocamlPackages ocamlBuildInputs ocamlNativeBuildInputs; # For compatibility inherit (ocamlPackages) ocaml camlp5 findlib num ; emacsBufferSetup = pkgs: '' @@ -129,14 +132,15 @@ self = stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config ] + ++ ocamlNativeBuildInputs ++ optional buildIde copyDesktopItems + ++ optional (buildIde && versionAtLeast "8.10") wrapGAppsHook ++ optional (!versionAtLeast "8.6") gnumake42; buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde (if versionAtLeast "8.10" - then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme wrapGAppsHook ] + then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme ] else [ ocamlPackages.lablgtk ]) - ++ optional (versionAtLeast "8.14") ocamlPackages.dune_2 ; postPatch = '' @@ -167,7 +171,7 @@ self = stdenv.mkDerivation { prefixKey = "-prefix "; - buildFlags = [ "revision" "coq" "coqide" ] ++ optional (!versionAtLeast "8.14") "bin/votour"; + buildFlags = [ "revision" "coq" ] ++ optional buildIde "coqide" ++ optional (!versionAtLeast "8.14") "bin/votour"; enableParallelBuilding = true; createFindlibDestdir = true; @@ -178,7 +182,7 @@ self = stdenv.mkDerivation { icon = "coq"; desktopName = "CoqIDE"; comment = "Graphical interface for the Coq proof assistant"; - categories = "Development;Science;Math;IDE;GTK"; + categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; }); postInstall = let suffix = if versionAtLeast "8.14" then "-core" else ""; in '' @@ -204,5 +208,6 @@ self = stdenv.mkDerivation { branch = coq-version; maintainers = with maintainers; [ roconnor thoughtpolice vbgl Zimmi48 ]; platforms = platforms.unix; + mainProgram = "coqide"; }; }; in self diff --git a/pkgs/applications/science/logic/formula/default.nix b/pkgs/applications/science/logic/formula/default.nix new file mode 100644 index 000000000000..13c13713a72e --- /dev/null +++ b/pkgs/applications/science/logic/formula/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, buildDotnetModule, dotnetCorePackages }: + +buildDotnetModule rec { + pname = "formula-dotnet"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "VUISIS"; + repo = "formula-dotnet"; + rev = "e962438022350dca64335c0603c00d44cb10b528"; + sha256 = "sha256-hVtwV1MdsXaN6ZrGW4RG2HcNcv/hys/5VxGjH9vFdRE="; + }; + + nugetDeps = ./nuget.nix; + projectFile = "Src/CommandLine/CommandLine.csproj"; + + postFixup = if stdenv.isLinux then '' + mv $out/bin/CommandLine $out/bin/formula + '' else lib.optionalString stdenv.isDarwin '' + makeWrapper ${dotnetCorePackages.runtime_5_0}/bin/dotnet $out/bin/formula \ + --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ + --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native + ''; + + meta = with lib; { + description = "Formal Specifications for Verification and Synthesis"; + homepage = "https://github.com/VUISIS/formula-dotnet"; + license = licenses.mspl; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/logic/formula/nuget.nix b/pkgs/applications/science/logic/formula/nuget.nix new file mode 100644 index 000000000000..e7ee3005e973 --- /dev/null +++ b/pkgs/applications/science/logic/formula/nuget.nix @@ -0,0 +1,77 @@ +{ fetchNuGet }: [ + (fetchNuGet { pname = "Antlr4.Runtime.Standard"; version = "4.7.2"; sha256 = "1pmrpsgqjfj0nzr1zqzk1m2fm0ynd4nklwq3dhvww08yjg5s0586"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Z3.x64"; version = "4.8.7"; sha256 = "1wxlw29xm5x8vwji2s7gwk39wb88dkbpg76l9s9gq0hqpghwlmdz"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (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.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"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (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.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (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.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) +] diff --git a/pkgs/applications/science/logic/isabelle/components/default.nix b/pkgs/applications/science/logic/isabelle/components/default.nix new file mode 100644 index 000000000000..dd7b605f56af --- /dev/null +++ b/pkgs/applications/science/logic/isabelle/components/default.nix @@ -0,0 +1,5 @@ +{ callPackage }: + +{ + isabelle-linter = callPackage ./isabelle-linter.nix {}; +} diff --git a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix b/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix new file mode 100644 index 000000000000..7fca547f67c8 --- /dev/null +++ b/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchFromGitHub, isabelle }: + +stdenv.mkDerivation rec { + pname = "isabelle-linter"; + version = "Isabelle2021-1-v1.0.0"; + + src = fetchFromGitHub { + owner = "isabelle-prover"; + repo = "isabelle-linter"; + rev = version; + sha256 = "0v6scc2rhj6bjv530gzz6i57czzcgpkw7a9iqnfdnm5gvs5qjk7a"; + }; + + installPhase = import ./mkBuild.nix { inherit isabelle; path = "${pname}-${version}"; }; + + meta = with lib; { + description = "Linter component for Isabelle."; + homepage = "https://github.com/isabelle-prover/isabelle-linter"; + maintainers = with maintainers; [ jvanbruegge ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/science/logic/isabelle/components/mkBuild.nix b/pkgs/applications/science/logic/isabelle/components/mkBuild.nix new file mode 100644 index 000000000000..a05b5196b007 --- /dev/null +++ b/pkgs/applications/science/logic/isabelle/components/mkBuild.nix @@ -0,0 +1,36 @@ +{ isabelle, path }: + +let + dir = "$out/isabelle/${isabelle.dirname}"; + iDir = "${isabelle}/${isabelle.dirname}"; +in '' + shopt -s extglob + mkdir -p ${dir}/lib/classes + + cDir=$out/${isabelle.dirname}/contrib/${path} + mkdir -p $cDir + cp -r !(isabelle) $cDir + + cd ${dir} + ln -s ${iDir}/!(lib|bin) ./ + ln -s ${iDir}/lib/!(classes) lib/ + ln -s ${iDir}/lib/classes/* lib/classes/ + + mkdir bin/ + cp ${iDir}/bin/* bin/ + + export HOME=$TMP + bin/isabelle components -u $cDir + bin/isabelle scala_build + + cd lib/classes + for f in ${iDir}/lib/classes/*; do + rm $(basename $f) + done + + lDir=$out/${isabelle.dirname}/lib/classes/ + mkdir -p $lDir + cp -r * $lDir + cd $out + rm -rf isabelle +'' diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 5427f42a7588..6696527cece2 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, nettools, java, polyml, z3, veriT, vampire, eprover-ho, rlwrap, makeDesktopItem }: +{ lib, stdenv, fetchurl, coreutils, nettools, java, scala, polyml, z3, veriT, vampire, eprover-ho, naproche, rlwrap, perl, makeDesktopItem, isabelle-components, isabelle, symlinkJoin }: # nettools needed for hostname stdenv.mkDerivation rec { @@ -66,13 +66,23 @@ stdenv.mkDerivation rec { ISABELLE_JDK_HOME=${java} EOF - sed -i -e 's/naproche_server : bool = true/naproche_server : bool = false/' contrib/naproche-*/etc/options + rm contrib/naproche-*/x86*/Naproche-SAD + ln -s ${naproche}/bin/Naproche-SAD contrib/naproche-*/x86*/ echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings for comp in contrib/jdk* contrib/polyml-* contrib/z3-* contrib/verit-* contrib/vampire-* contrib/e-*; do rm -rf $comp/x86* done + + substituteInPlace lib/Tools/env \ + --replace /usr/bin/env ${coreutils}/bin/env + + substituteInPlace src/Tools/Setup/src/Environment.java \ + --replace 'cmd.add("/usr/bin/env");' "" \ + --replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");" + + rm -r heaps '' + (if ! stdenv.isLinux then "" else '' arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} for f in contrib/*/$arch/{bash_process,epclextract,nunchaku,SPASS,zipperposition}; do @@ -83,6 +93,29 @@ stdenv.mkDerivation rec { done ''); + buildPhase = '' + export HOME=$TMP # The build fails if home is not set + setup_name=$(basename contrib/isabelle_setup*) + + #The following is adapted from https://isabelle.sketis.net/repos/isabelle/file/Isabelle2021-1/Admin/lib/Tools/build_setup + TARGET_DIR="contrib/$setup_name/lib" + rm -rf "$TARGET_DIR" + mkdir -p "$TARGET_DIR/isabelle/setup" + declare -a ARGS=("-Xlint:unchecked") + + SOURCES="$(${perl}/bin/perl -e 'while (<>) { if (m/(\S+\.java)/) { print "$1 "; } }' "src/Tools/Setup/etc/build.props")" + for SRC in $SOURCES + do + ARGS["''${#ARGS[@]}"]="src/Tools/Setup/$SRC" + done + ${java}/bin/javac -d "$TARGET_DIR" -classpath ${scala}/lib/scala-compiler.jar "''${ARGS[@]}" + ${java}/bin/jar -c -f "$TARGET_DIR/isabelle_setup.jar" -e "isabelle.setup.Setup" -C "$TARGET_DIR" isabelle + rm -rf "$TARGET_DIR/isabelle" + + # Prebuild HOL Session + bin/isabelle build -v -o system_heaps -b HOL + ''; + installPhase = '' mkdir -p $out/bin mv $TMP/$dirname $out @@ -104,7 +137,7 @@ stdenv.mkDerivation rec { icon = "isabelle"; desktopName = "Isabelle"; comment = meta.description; - categories = "Education;Science;Math;"; + categories = [ "Education" "Science" "Math" ]; }; meta = with lib; { @@ -117,7 +150,32 @@ stdenv.mkDerivation rec { ''; homepage = "https://isabelle.in.tum.de/"; license = licenses.bsd3; - maintainers = [ maintainers.jwiegley ]; + maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ]; platforms = platforms.linux; }; +} // { + withComponents = f: + let + base = "$out/${isabelle.dirname}"; + components = f isabelle-components; + in symlinkJoin { + name = "isabelle-with-components-${isabelle.version}"; + paths = [ isabelle ] ++ components; + + postBuild = '' + rm $out/bin/* + + cd ${base} + rm bin/* + cp ${isabelle}/${isabelle.dirname}/bin/* bin/ + rm etc/components + cat ${isabelle}/${isabelle.dirname}/etc/components > etc/components + + export HOME=$TMP + bin/isabelle install $out/bin + patchShebangs $out/bin + '' + lib.concatMapStringsSep "\n" (c: '' + echo contrib/${c.pname}-${c.version} >> ${base}/etc/components + '') components; + }; } diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix index e9b0cc7540b5..85a7ecb08c39 100644 --- a/pkgs/applications/science/logic/key/default.nix +++ b/pkgs/applications/science/logic/key/default.nix @@ -1,62 +1,106 @@ { lib, stdenv , fetchurl -, unzip , jdk -, ant +, gradle_7 +, perl , jre , makeWrapper +, makeDesktopItem +, copyDesktopItems , testVersion , key }: -# get this from the download URL when changing version -let gitRevision = "7d3deab0763c88edee4f7a08e604661e0dbdd450"; - -in stdenv.mkDerivation rec { +let pname = "key"; - version = "2.6.3"; - + version = "2.10.0"; src = fetchurl { - url = "https://formal.iti.kit.edu/key/releases/${version}/key-src-${version}_${gitRevision}.zip"; - sha256 = "1dr5jmrqs0iy76wdsfiv5hx929i24yzm1xypzqqvx7afc7apyawy"; + url = "https://www.key-project.org/dist/${version}/key-${version}-sources.tgz"; + sha256 = "1f201cbcflqd1z6ysrkh3mff5agspw3v74ybdc3s2lfdyz3b858w"; }; + sourceRoot = "key-${version}/key"; - sourceRoot = "key"; + # fake build to pre-download deps into fixed-output derivation + deps = stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit version src sourceRoot; + nativeBuildInputs = [ gradle_7 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 classes testClasses + ''; + # 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"; + outputHashAlgo = "sha256"; + outputHash = "sha256-GjBUwJxeyJA6vGrPQVtNpcHb4CJlNlY4kHt1PT21xjo="; + }; +in stdenv.mkDerivation rec { + inherit pname version src sourceRoot; nativeBuildInputs = [ - unzip jdk - ant + gradle_7 makeWrapper + copyDesktopItems ]; - buildPhase = '' - ant -buildfile scripts/build.xml \ - -Dgit.revision=${gitRevision} \ - compileAll deployAll - ''; + executable-name = "KeY"; - postCheck = '' - ant -buildfile scripts/build.xml \ - -Dgit.revision=${gitRevision} \ - compileAllTests runAllTests test-deploy-all + desktopItems = [ + (makeDesktopItem { + name = "KeY"; + exec = executable-name; + icon = "key"; + comment = meta.description; + desktopName = "KeY"; + genericName = "KeY"; + categories = [ "Science" ]; + }) + ]; + + # disable tests (broken on darwin) + gradleAction = if stdenv.isDarwin then "assemble" else "build"; + + 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 + cat <(echo "pluginManagement { repositories { maven { url '${deps}' } } }") settings.gradle > settings_new.gradle + mv settings_new.gradle settings.gradle + gradle --offline --no-daemon ${gradleAction} + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/java - # Wrong version in the code. On next version change 2.5 to ${version}: - unzip deployment/key-2.5_${gitRevision}.zip -d $out/share/java + cp key.ui/build/libs/key-*-exe.jar $out/share/java/KeY.jar mkdir -p $out/bin + mkdir -p $out/share/icons/hicolor/256x256/apps + cp key.ui/src/main/resources/de/uka/ilkd/key/gui/images/key-color-icon-square.png $out/share/icons/hicolor/256x256/apps/key.png makeWrapper ${jre}/bin/java $out/bin/KeY \ --add-flags "-cp $out/share/java/KeY.jar de.uka.ilkd.key.core.Main" + + runHook postInstall ''; passthru.tests.version = testVersion { package = key; command = "KeY --help"; - # Wrong '2.5' version in the code. On next version change to ${version} - version = "2.5"; }; meta = with lib; { diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index e0ace7e81c82..612d9fd57c7c 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, callPackage , fetchFromGitHub , fetchpatch , cmake @@ -14,13 +14,37 @@ , sqlite , gtest , lit + +# Build KLEE in debug mode. Defaults to false. , debug ? false + +# Include debug info in the build. Defaults to true. +, includeDebugInfo ? true + +# Enable KLEE asserts. Defaults to true, since LLVM is built with them. +, asserts ? true + +# Build the KLEE runtime in debug mode. Defaults to true, as this improves +# stack traces of the software under test. +, debugRuntime ? true + +# Enable runtime asserts. Default false. +, runtimeAsserts ? false + +# Extra klee-uclibc config. +, extraKleeuClibcConfig ? {} }: let + # Python used for KLEE tests. kleePython = python3.withPackages (ps: with ps; [ tabulate ]); + + # The klee-uclibc derivation. + kleeuClibc = callPackage ./klee-uclibc.nix { + inherit clang_9 llvmPackages_9 extraKleeuClibcConfig debugRuntime runtimeAsserts; + }; in -stdenv.mkDerivation rec { +clang_9.stdenv.mkDerivation rec { pname = "klee"; version = "2.2"; src = fetchFromGitHub { @@ -30,11 +54,12 @@ stdenv.mkDerivation rec { sha256 = "Ar3BKfADjJvvP0dI9+x/l3RDs8ncx4jmO7ol4MgOr4M="; }; buildInputs = [ - llvmPackages_9.llvm clang_9 z3 stp cryptominisat + llvmPackages_9.llvm + z3 stp cryptominisat gperftools sqlite ]; nativeBuildInputs = [ - cmake + cmake clang_9 ]; checkInputs = [ gtest @@ -46,14 +71,17 @@ stdenv.mkDerivation rec { ]; cmakeFlags = let - buildType = if debug then "Debug" else "Release"; - in - [ - "-DCMAKE_BUILD_TYPE=${buildType}" - "-DKLEE_RUNTIME_BUILD_TYPE=${buildType}" - "-DENABLE_POSIX_RUNTIME=ON" - "-DENABLE_UNIT_TESTS=ON" - "-DENABLE_SYSTEM_TESTS=ON" + onOff = val: if val then "ON" else "OFF"; + in [ + "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else if !debug && includeDebugInfo then "RelWithDebInfo" else "MinSizeRel"}" + "-DKLEE_RUNTIME_BUILD_TYPE=${if debugRuntime then "Debug" else "Release"}" + "-DKLEE_ENABLE_TIMESTAMP=${onOff false}" + "-DENABLE_KLEE_UCLIBC=${onOff true}" + "-DKLEE_UCLIBC_PATH=${kleeuClibc}" + "-DENABLE_KLEE_ASSERTS=${onOff asserts}" + "-DENABLE_POSIX_RUNTIME=${onOff true}" + "-DENABLE_UNIT_TESTS=${onOff true}" + "-DENABLE_SYSTEM_TESTS=${onOff true}" "-DGTEST_SRC_DIR=${gtest.src}" "-DGTEST_INCLUDE_DIR=${gtest.src}/googletest/include" "-Wno-dev" @@ -66,21 +94,40 @@ stdenv.mkDerivation rec { patchShebangs . ''; - /* This patch is currently necessary for the unit test suite to run correctly. - * See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03136.html - * and https://github.com/klee/klee/pull/1458 for more information. - */ patches = map fetchpatch [ + /* This patch is currently necessary for the unit test suite to run correctly. + * See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03136.html + * and https://github.com/klee/klee/pull/1458 for more information. + */ { name = "fix-gtest"; sha256 = "F+/6videwJZz4sDF9lnV4B8lMx6W11KFJ0Q8t1qUDf4="; url = "https://github.com/klee/klee/pull/1458.patch"; } + + # This patch fixes test compile issues with glibc 2.33+. + { + name = "fix-glibc-2.33"; + sha256 = "PzxqtFyLy9KF1eA9AAKg1tu+ggRdvu7leuvXifayIcc="; + url = "https://github.com/klee/klee/pull/1385.patch"; + } + + # /etc/mtab doesn't exist in the Nix build sandbox. + { + name = "fix-etc-mtab-in-tests"; + sha256 = "2Yb/rJA791esNNqq8uAXV+MML4YXIjPKkHBOufvyRoQ="; + url = "https://github.com/klee/klee/pull/1471.patch"; + } ]; doCheck = true; checkTarget = "check"; + passthru = { + # Let the user depend on `klee.uclibc` for klee-uclibc + uclibc = kleeuClibc; + }; + meta = with lib; { description = "A symbolic virtual machine built on top of LLVM"; longDescription = '' diff --git a/pkgs/applications/science/logic/klee/klee-uclibc.nix b/pkgs/applications/science/logic/klee/klee-uclibc.nix new file mode 100644 index 000000000000..2e3826c50c42 --- /dev/null +++ b/pkgs/applications/science/logic/klee/klee-uclibc.nix @@ -0,0 +1,98 @@ +{ lib +, fetchurl +, fetchFromGitHub +, which +, linuxHeaders +, clang_9 +, llvmPackages_9 +, python3 +, debugRuntime ? true +, runtimeAsserts ? false +, extraKleeuClibcConfig ? {} +}: + +let + localeSrcBase = "uClibc-locale-030818.tgz"; + localeSrc = fetchurl { + url = "http://www.uclibc.org/downloads/${localeSrcBase}"; + sha256 = "xDYr4xijjxjZjcz0YtItlbq5LwVUi7k/ZSmP6a+uvVc="; + }; + resolvedExtraKleeuClibcConfig = lib.mapAttrsToList (name: value: "${name}=${value}") (extraKleeuClibcConfig // { + "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA" = "n"; + "RUNTIME_PREFIX" = "/"; + "DEVEL_PREFIX" = "/"; + }); +in +clang_9.stdenv.mkDerivation rec { + pname = "klee-uclibc"; + version = "1.2"; + src = fetchFromGitHub { + owner = "klee"; + repo = "klee-uclibc"; + rev = "klee_uclibc_v${version}"; + sha256 = "qdrGMw+2XwpDsfxdv6swnoaoACcF5a/RWgUxUYbtPrI="; + }; + nativeBuildInputs = [ + clang_9 + llvmPackages_9.llvm + python3 + which + ]; + + # Some uClibc sources depend on Linux headers. + UCLIBC_KERNEL_HEADERS = "${linuxHeaders}/include"; + + # HACK: needed for cross-compile. + # See https://www.mail-archive.com/klee-dev@imperial.ac.uk/msg03141.html + KLEE_CFLAGS = "-idirafter ${clang_9}/resource-root/include"; + + prePatch = '' + patchShebangs ./configure + patchShebangs ./extra + ''; + + # klee-uclibc configure does not support --prefix, so we override configurePhase entirely + configurePhase = '' + ./configure ${lib.escapeShellArgs ( + ["--make-llvm-lib"] + ++ lib.optional (!debugRuntime) "--enable-release" + ++ lib.optional runtimeAsserts "--enable-assertions" + )} + + # Set all the configs we care about. + configs=( + PREFIX=$out + ) + for value in ${lib.escapeShellArgs resolvedExtraKleeuClibcConfig}; do + configs+=("$value") + done + + for configFile in .config .config.cmd; do + for config in "''${configs[@]}"; do + prefix="''${config%%=*}=" + if grep -q "$prefix" "$configFile"; then + sed -i "s"'\001'"''${prefix}"'\001'"#''${prefix}"'\001'"g" "$configFile" + fi + echo "$config" >> "$configFile" + done + done + ''; + + # Link the locale source into the correct place + preBuild = '' + ln -sf ${localeSrc} extra/locale/${localeSrcBase} + ''; + + makeFlags = ["HAVE_DOT_CONFIG=y"]; + + meta = with lib; { + description = "A modified version of uClibc for KLEE."; + longDescription = '' + klee-uclibc is a bitcode build of uClibc meant for compatibility with the + KLEE symbolic virtual machine. + ''; + homepage = "https://klee.github.io/"; + license = licenses.lgpl3; + maintainers = with maintainers; [ numinit ]; + }; +} diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index c9ba47eca140..b5e5ca8723d4 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.38.0"; + version = "3.42.0"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "a8cf8a0c9ea19a633baeb3aa7e8d706b86c2c0f9"; - sha256 = "14dam91pnn266fgii5c2j5p9p2i31bghx0s2h3qnnqyvxi4s5isx"; + rev = "b35d4695da88139a9168f2ad7acf0782e66dc4f0"; + sha256 = "02rpigw6lnyjw8ccrlp2mcvswawkhl5y6kqa3zq76qp1fdjqjrbp"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/leo2/default.upstream b/pkgs/applications/science/logic/leo2/default.upstream deleted file mode 100644 index 52b8ed1cdaa2..000000000000 --- a/pkgs/applications/science/logic/leo2/default.upstream +++ /dev/null @@ -1,6 +0,0 @@ -url http://page.mi.fu-berlin.de/cbenzmueller/leo/download.html -version_link '[.]tgz' -version '.*_v([0-9.]+)[.][a-z0-9]+$' '\1' -do_overwrite () { - do_overwrite_just_version -} diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index 6ab0921f66fe..67e699bc63fa 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { exec = "logisim-evolution"; icon = "logisim-evolution"; comment = meta.description; - categories = "Education;"; + categories = [ "Education" ]; }) ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/logisim-evolution/logisim-evolution"; description = "Digital logic designer and simulator"; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index f94f08e43ab2..06dc024e6d23 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { exec = "logisim"; icon = "logisim"; comment = meta.description; - categories = "Education;"; + categories = [ "Education" ]; }) ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.cburch.com/logisim/"; description = "Educational tool for designing and simulating digital logic circuits"; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/logic/naproche/default.nix b/pkgs/applications/science/logic/naproche/default.nix new file mode 100644 index 000000000000..5e286a9b57e3 --- /dev/null +++ b/pkgs/applications/science/logic/naproche/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub, haskellPackages, makeWrapper, eprover }: + +with haskellPackages; mkDerivation { + pname = "Naproche-SAD"; + version = "0.1.0.0"; + + src = fetchFromGitHub { + owner = "naproche"; + repo = "naproche"; + rev = "d39cea85ace04d5b3775fde9972a33886799bfe6"; + sha256 = "1zqrldmxkzbyg9bssrbwb00zic29904igcipaz1m9al0456yjnkf"; + }; + + isExecutable = true; + + buildTools = [ hpack makeWrapper ]; + executableHaskellDepends = [ + base array bytestring containers ghc-prim megaparsec mtl network process + split temporary text threads time transformers uuid + ]; + + prePatch = "hpack"; + + checkPhase = '' + export NAPROCHE_EPROVER=${eprover}/bin/eprover + dist/build/Naproche-SAD/Naproche-SAD examples/cantor.ftl.tex -t 60 --tex=on + ''; + + postInstall = '' + wrapProgram $out/bin/Naproche-SAD \ + --set-default NAPROCHE_EPROVER ${eprover}/bin/eprover + ''; + + homepage = "https://github.com/naproche/naproche#readme"; + description = "Write formal proofs in natural language and LaTeX"; + maintainers = with lib.maintainers; [ jvanbruegge ]; + license = lib.licenses.gpl3Only; +} diff --git a/pkgs/applications/science/logic/nuXmv/default.nix b/pkgs/applications/science/logic/nuXmv/default.nix new file mode 100644 index 000000000000..021c612d1069 --- /dev/null +++ b/pkgs/applications/science/logic/nuXmv/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "nuXmv"; + version = "2.0.0"; + + src = fetchurl { + url = "https://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-${version}-linux64.tar.gz"; + sha256 = "0nndrw994clf8lnlcfzdf1mf00vif3fvd4xsiwcjpbyk12091zqr"; + }; + + installPhase= '' + runHook preInstall + install -Dm755 -t $out/bin ./bin/nuXmv + runHook postInstall + ''; + + meta = with lib; { + description = "Symbolic model checker for analysis of finite and infinite state systems"; + homepage = "https://nuxmv.fbk.eu/pmwiki.php"; + license = licenses.unfree; + maintainers = with maintainers; [ siraben ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index e701fb2711f0..9f104ab80a63 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opensmt"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; rev = "v${version}"; - sha256 = "sha256-6VkBGDzqG3mplpvFh5DIR0I1I2/J0Pi7xYk/yVn04Kg="; + sha256 = "sha256-3F4Q/ZWlgkiiW7QVjnaaDLSNLVdfAOSmwYdQo1v9Lv4="; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/pkgs/applications/science/logic/potassco/clingo.upstream b/pkgs/applications/science/logic/potassco/clingo.upstream deleted file mode 100644 index 062577d1451b..000000000000 --- a/pkgs/applications/science/logic/potassco/clingo.upstream +++ /dev/null @@ -1,6 +0,0 @@ -target clingo.nix -attribute_name clingo -url https://github.com/potassco/clingo/releases/ -ensure_choice -version '.*/v([0-9.]+)[.]tar[.].*' '\1' -minimize_overwrite diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 9bfad1fa010e..7a523bbf24ef 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -66,6 +66,5 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php"; homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php"; - updateWalker = true; }; } diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index 7d447745a23d..8b9f64a8f5b9 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tlaplus"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "https://github.com/tlaplus/tlaplus/releases/download/v${version}/tla2tools.jar"; - sha256 = "d532ba31aafe17afba1130f92410d9257454ff7393d1eb2fe032f0c07f352da5"; + sha256 = "sha256-+hhUPkTtWXSoW9LGDA3BZiCuEXaA6o5pPSaRmZ7ZCyI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix index 90a4aeb4f8ab..14b3055ab36b 100644 --- a/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { pname = "tlaps"; - version = "1.4.3"; + version = "1.4.5"; src = fetchurl { - url = "https://tla.msr-inria.inria.fr/tlaps/dist/current/tlaps-${version}.tar.gz"; - sha256 = "1w5z3ns5xxmhmp8r4x2kjmy3clqam935gmvx82imyxrr1bamx6gf"; + url = "https://tla.msr-inria.inria.fr/tlaps/dist/${version}/tlaps-${version}.tar.gz"; + sha256 = "c296998acd14d5b93a8d5be7ee178007ef179957465966576bda26944b1b7fca"; }; buildInputs = [ ocaml isabelle cvc3 perl wget which ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = "https://tla.msr-inria.inria.fr/tlaps/content/Home.html"; license = lib.licenses.bsd2; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ florentc ]; }; } diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 21c60d03ac1e..7b1ee4384c9e 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -18,10 +18,8 @@ let comment = "IDE for TLA+"; desktopName = name; genericName = comment; - categories = "Development"; - extraEntries = '' - StartupWMClass=TLA+ Toolbox - ''; + categories = [ "Development" ]; + startupWMClass = "TLA+ Toolbox"; }; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 78631486554a..0f3dab8038ee 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -3,15 +3,15 @@ stdenv.mkDerivation rec { pname = "why3"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38425/why3-${version}.tar.gz"; - sha256 = "0lw0cpx347zz9vvwqibmbxgs80fsd16scgk3isscvwxnajpc3rv8"; + url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; + sha256 = "sha256:1rqyypzlvagrn43ykl0c5wxyvnry5fl1ykn3xcvlzgghk96yq3jq"; }; buildInputs = with ocamlPackages; [ - ocaml findlib ocamlgraph zarith menhir menhirLib + ocaml findlib ocamlgraph zarith menhir # Emacs compilation of why3.el emacs # Documentation @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { coqPackages.coq coqPackages.flocq ]; - propagatedBuildInputs = with ocamlPackages; [ camlzip num re sexplib ]; + propagatedBuildInputs = with ocamlPackages; [ camlzip menhirLib num re sexplib ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/applications/science/logic/why3/with-provers.nix index 826473b38e9f..ae0acb1e525c 100644 --- a/pkgs/applications/science/logic/why3/with-provers.nix +++ b/pkgs/applications/science/logic/why3/with-provers.nix @@ -12,7 +12,7 @@ let configAwkScript = runCommand "why3-conf.awk" { inherit provers; } ''; in stdenv.mkDerivation { - name = "${why3.name}-with-provers"; + pname = "${why3.pname}-with-provers"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ why3 ] ++ provers; diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 2829cb59340b..0c20faceb54e 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.3.5"; + version = "3.3.6"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "sha256-KErKYK3mmjp5uNdGQnjzUUIEwXT5fqbAPUunH72Mtig="; + sha256 = "sha256-5J4HOTz92ALUcZZr15jJ6vplc3KDwbFCXqjEhlOV4kE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/logic/z3/4.4.0.nix b/pkgs/applications/science/logic/z3/4.4.0.nix index 2fbaa0a28caf..a3d6c16fb7df 100644 --- a/pkgs/applications/science/logic/z3/4.4.0.nix +++ b/pkgs/applications/science/logic/z3/4.4.0.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, python }: stdenv.mkDerivation rec { - name = "z3-${version}"; + pname = "z3"; version = "4.4.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 3cb018b9a5db..b715c2fc33b3 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -6,7 +6,7 @@ # build , cmake , ctags -, python2Packages +, python3Packages , swig # math , eigen @@ -30,13 +30,13 @@ , lp_solve , colpack # extra support -, pythonSupport ? true +, pythonSupport ? false , opencvSupport ? false , opencv ? null , withSvmLight ? false }: -assert pythonSupport -> python2Packages != null; +assert pythonSupport -> python3Packages != null; assert opencvSupport -> opencv != null; assert (!blas.isILP64) && (!lapack.isILP64); @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch; nativeBuildInputs = [ cmake swig ctags ] - ++ (with python2Packages; [ python jinja2 ply ]); + ++ (with python3Packages; [ python jinja2 ply ]); buildInputs = [ eigen @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { nlopt lp_solve colpack - ] ++ lib.optionals pythonSupport (with python2Packages; [ python numpy ]) + ] ++ lib.optionals pythonSupport (with python3Packages; [ python numpy ]) ++ lib.optional opencvSupport opencv; cmakeFlags = let @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { "-DENABLE_TESTING=${enableIf doCheck}" "-DDISABLE_META_INTEGRATION_TESTS=ON" "-DTRAVIS_DISABLE_META_CPP=ON" - "-DPythonModular=${enableIf pythonSupport}" + "-DINTERFACE_PYTHON=${enableIf pythonSupport}" "-DOpenCV=${enableIf opencvSupport}" "-DUSE_SVMLIGHT=${enableIf withSvmLight}" ]; @@ -177,6 +177,12 @@ stdenv.mkDerivation rec { rm -r $out/share ''; + postFixup = '' + # CMake incorrectly calculates library path from dev prefix + substituteInPlace $dev/lib/cmake/shogun/ShogunTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/" "$out/lib/" + ''; + meta = with lib; { description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; homepage = "http://shogun-toolbox.org/"; diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix index 7e9b322b4157..8dd55efaeb52 100644 --- a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix +++ b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vowpal-wabbit"; - version = "8.11.0"; + version = "9.0.1"; src = fetchFromGitHub { owner = "VowpalWabbit"; repo = "vowpal_wabbit"; rev = version; - sha256 = "sha256-F3la4n1ULMN2nktr+PVWFPl3V2RfCowR0ozL+dnbhgA="; + sha256 = "sha256-ZUurY2bmTKKIW4GR4oiIpLxb6DSRUNJI/EyNSOu9D9c="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index d08078c356e1..f91d72ff3f63 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -14,11 +14,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "R"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-IDYiXp9yB9TOCX5Ulyrs2qi0DX2ZEc0mSR+sWg+rOK8="; + sha256 = "sha256-Ff9bMzxhCUBgsqUunB2OxVzELdAp45yiKr2qkJUm/tY="; }; dontUseImakeConfigure = true; @@ -94,6 +94,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # disable stackprotector on aarch64-darwin for now + # https://github.com/NixOS/nixpkgs/issues/158730 + # see https://github.com/NixOS/nixpkgs/issues/127608 for a similar issue + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + setupHook = ./setup-hook.sh; meta = with lib; { diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 85bcd1b2d2fc..b23b433becd3 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "bcal"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "jarun"; repo = "bcal"; rev = "v${version}"; - sha256 = "sha256-1k8Q+I1Mc196QL+x4yXzRi7WLBf30U4sJyl0rXisW7k="; + sha256 = "sha256-PleWU2yyJzkUAZEvEYoCGdpEXqOgRvZK9zXTYrxRtQU="; }; buildInputs = [ readline ]; diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix index 35b9200a4774..374b245e2499 100644 --- a/pkgs/applications/science/math/cemu/default.nix +++ b/pkgs/applications/science/math/cemu/default.nix @@ -7,7 +7,7 @@ , qtbase , qmake , git -, libpng_apng +, libpng , pkg-config , wrapQtAppsHook , stdenv @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libarchive libusb-compat-0_1 qtbase - libpng_apng + libpng ]; qmakeFlags = [ diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index ba2225b903fa..eb14982575a2 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, cmake , fetchpatch , openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi , onebitSGDSupport ? false @@ -22,11 +22,12 @@ in stdenv.mkDerivation rec { pname = "CNTK"; version = "2.7"; - # Submodules - src = fetchgit { - url = "https://github.com/Microsoft/CNTK"; + src = fetchFromGitHub { + owner = "Microsoft"; + repo = "CNTK"; rev = "v${version}"; - sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns"; + sha256 = "sha256-2rIrPJyvZhnM5EO6tNhF6ARTocfUHce4N0IZk/SZiaI="; + fetchSubmodules = true; }; patches = [ diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 79d5664426be..8c2541fe4129 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }: -let +stdenv.mkDerivation rec { + pname = "fricas"; version = "1.3.7"; - name = "fricas-" + version; -in -stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "mirror://sourceforge/fricas/fricas/${version}/${name}-full.tar.bz2"; + url = "mirror://sourceforge/fricas/fricas/${version}/fricas-${version}-full.tar.bz2"; sha256 = "sha256-cOqMvSe3ef/ZeVy5cj/VU/aTRtxgfxZfRbE4lWE5TU4="; }; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index 7ebfe2030d4a..8ab498c61d93 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -15,8 +15,8 @@ let desktopName = "Geogebra"; genericName = "Geogebra"; comment = meta.description; - categories = "Education;Science;Math;"; - mimeType = "application/vnd.geogebra.file;application/vnd.geogebra.tool;"; + categories = [ "Education" "Science" "Math" ]; + mimeTypes = [ "application/vnd.geogebra.file" "application/vnd.geogebra.tool" ]; }; meta = with lib; { diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix index 5ea3550d08a4..5713f84a866f 100644 --- a/pkgs/applications/science/math/getdp/default.nix +++ b/pkgs/applications/science/math/getdp/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "getdp"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { url = "http://getdp.info/src/getdp-${version}-source.tgz"; - sha256 = "1pfviy2bw8z5y6c15czvlvyjjg9pvpgrj9fr54xfi2gmvs7zkgpf"; + sha256 = "sha256-d5YxJgtMf94PD6EHvIXpPBFPKC+skI/2v1K5Sad51hA="; }; inherit (petsc) mpiSupport; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://getdp.info/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/math/gfm/default.nix b/pkgs/applications/science/math/gfm/default.nix deleted file mode 100644 index 1078be99c3a9..000000000000 --- a/pkgs/applications/science/math/gfm/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, pkg-config -, autoreconfHook -, gnome2 -, gtk2 -, glib -, libtifiles2 -, libticables2 -, libticalcs2 -, libticonv -}: - -stdenv.mkDerivation rec { - pname = "gfm"; - version = "1.08"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "0zq1a9mm54zr18dz2mqh79w1a126xwqz6dcrpjlbd1pnmg01l0q9"; - }; - - patches = fetchpatch { - name = "remove-broken-kde-support.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=gfm"; - sha256 = "03yc8s2avicmv04f2ygg3r3q8l7kpsc94mhp6clp584kmjpjqag5"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - gtk2 - gnome2.libglade - glib - libtifiles2 - libticables2 - libticalcs2 - libticonv - ]; - - NIX_CFLAGS_COMPILE = "-I${libticables2}/include/tilp2"; - - meta = with lib; { - changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; - description = "Group File Manager (GFM) allows manipulation of single/group/tigroup files"; - homepage = "http://lpg.ticalc.org/prj_gfm/index.html"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ siraben luc65r ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 78b64d7f587a..1fff1156c1a0 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ginac"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { url = "https://www.ginac.de/ginac-${version}.tar.bz2"; - sha256 = "sha256-8WldvWsYcGHvP7pQdkjJ1tukOPczsFjBb5J4y9z14as="; + sha256 = "sha256-v811Gryviv3bg5WMKtInY6deokAyVT5QPumzjj6jtsM="; }; propagatedBuildInputs = [ cln ]; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index fe34a82679a8..4306ae091515 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -5,25 +5,28 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.9.2"; + version = "4.9.5"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-26KB4DNYT12gfi2Y1656PcSBcjyybCxye2X8ILMBYYw="; + sha256 = "sha256-/9ZJAIRCCHGciNkaZsKBiJAjEyt6nigsUVSMufbzrUQ="; }; - buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL - libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext - xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE - opencascade-occt + buildInputs = [ + blas lapack gmm fltk libjpeg zlib opencascade-occt + ] ++ lib.optionals (!stdenv.isDarwin) [ + libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes + xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM + xorg.libICE ]; nativeBuildInputs = [ cmake gfortran ]; + doCheck = true; + meta = { description = "A three-dimensional finite element mesh generator"; homepage = "https://gmsh.info/"; - platforms = [ "x86_64-linux" ]; license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index 175add544b5c..b8b600c18748 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gretl"; - version = "2021d"; + version = "2022a"; src = fetchurl { url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "sha256-zij337P/MemCwvMah2bUE3odv0Kf/KW6fUl2OgMzjuI="; + sha256 = "sha256-J+JcuCda2xYJ5aVz6UXR+nWiid6QxpDtt4DXlb6L4UA="; }; buildInputs = [ diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index 91ee7c1c65e0..dc947a94001b 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gurobi"; - version = "9.1.2"; + version = "9.5.0"; src = fetchurl { url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; - sha256 = "7f60bd675f79476bb2b32cd632aa1d470f8246f2b033b7652d8de86f6e7e429b"; + sha256 = "sha256-u1QuWl0WhfbjZOrwXqbFVySF/8N6IkUWnPPLQCiLwp4="; }; sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64"; diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index 474c8d1ea060..60841eaa3ee2 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -7,6 +7,13 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ + { + version = "13.0.1"; + lang = "en"; + language = "English"; + sha256 = "3672a920c1b4af1afd480733f6d67665baf8258757dfe59a6ed6d7440cf26dba"; + installer = "Mathematica_13.0.1_BNDL_LINUX.sh"; + } { version = "13.0.0"; lang = "en"; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 2fe027365cdc..3e7a8b56af1c 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { gtk3 gtksourceview libgee - pantheon.elementary-icon-theme pantheon.granite webkitgtk # We add libqalculate's runtime dependencies because nasc has it as a modified subproject. diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 4ba1d5c6b474..a9c002d210f2 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -82,6 +82,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes AndersonTorres ] ++ teams.sage.members; platforms = platforms.linux ++ platforms.darwin; - updateWalker = true; }; } diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index f4f6366465b8..d132a98dcb9a 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "polymake"; - version = "4.5"; + version = "4.6"; 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-6UPUuzHBEvrYUjQONZW8WRwgcGkqFtUBg6OxBFZteZY="; + sha256 = "sha256-QjpE3e8R6uqEV6sV3V2G3beovMbJuxF3b54pWNfc+dA="; }; buildInputs = [ diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 03f4b223803c..4f68eb6ae78d 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.22.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-BarbO25c103YImOOnjVgwgqpa3mUVvndgJeUHRf2I60="; + sha256 = "sha256-EOiExp8JBc3SybSiBVbuRxBqTujzLjysWM0v94goups="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index ec5d9ef366f8..dd8258a3456d 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; homepage = "http://www.mathe2.uni-bayreuth.de/stoll/programs/"; - updateWalker = true; }; } diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix index 22d1c92e1ec3..78943457d3b2 100644 --- a/pkgs/applications/science/math/rofi-calc/default.nix +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "rofi-calc"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "NbWXMash0pK7Y9gOEBbL7zXjFytoeZBN9/wIbRTvQ8g="; + sha256 = "sha256-sfUcBSUYf/+neBAhEd5LAtMOfIbdXM/ieUOztjk8Pwg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/sage/README.md b/pkgs/applications/science/math/sage/README.md index 26e91fc63133..c3a81c2109ee 100644 --- a/pkgs/applications/science/math/sage/README.md +++ b/pkgs/applications/science/math/sage/README.md @@ -17,7 +17,7 @@ If the build broke as a result of a package update, try those solutions in order - fix the problem yourself. First clone the sagemath source and then check out the sage version you want to patch: ``` -[user@localhost ~]$ git clone git://github.com/sagemath/sage.git +[user@localhost ~]$ git clone https://github.com/sagemath/sage.git [user@localhost ~]$ cd sage [user@localhost sage]$ git checkout 8.2 # substitute the relevant version here ``` @@ -41,7 +41,7 @@ You can [login the sage trac using GitHub](https://trac.sagemath.org/login). You Here's the gist, assuming you want to use ssh key authentication. First, [add your public ssh key](https://trac.sagemath.org/prefs/sshkeys). Then: ``` -[user@localhost ~]$ git clone git://github.com/sagemath/sage.git +[user@localhost ~]$ git clone https://github.com/sagemath/sage.git [user@localhost ~]$ cd sage [user@localhost sage]$ git remote add trac git@trac.sagemath.org:sage.git -t master [user@localhost sage]$ git checkout -b u/gh-/ develop diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index e9dae55fbae3..70e24e2608d0 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -1,5 +1,7 @@ { pkgs , withDoc ? false +, requireSageTests ? true +, extraPythonPackages ? ps: [] }: # Here sage and its dependencies are put together. Some dependencies may be pinned @@ -14,13 +16,17 @@ let # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { inherit flint arb; - inherit sage-src env-locations pynac singular; + inherit sage-src env-locations singular; inherit (maxima) lisp-compiler; linbox = pkgs.linbox.override { withSage = true; }; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; - sage_docbuild = self.callPackage ./sage_docbuild.nix { + sage-docbuild = self.callPackage ./python-modules/sage-docbuild.nix { + inherit sage-src; + }; + + sage-setup = self.callPackage ./python-modules/sage-setup.nix { inherit sage-src; }; }; @@ -58,9 +64,9 @@ let # the env-locations file. sage-env = callPackage ./sage-env.nix { sagelib = python3.pkgs.sagelib; - sage_docbuild = python3.pkgs.sage_docbuild; + sage-docbuild = python3.pkgs.sage-docbuild; inherit env-locations; - inherit python3 singular palp flint pynac pythonEnv maxima; + inherit python3 singular palp flint pythonEnv maxima; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; @@ -74,7 +80,7 @@ let sage-with-env = callPackage ./sage-with-env.nix { inherit python3 pythonEnv; inherit sage-env; - inherit pynac singular maxima; + inherit singular maxima; inherit three; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; @@ -91,7 +97,7 @@ let pythonRuntimeDeps = with python3.pkgs; [ sagelib - sage_docbuild + sage-docbuild cvxopt networkx service-identity @@ -105,7 +111,7 @@ let rpy2 sphinx pillow - ]; + ] ++ extraPythonPackages python3.pkgs; pythonEnv = python3.buildEnv.override { extraLibs = pythonRuntimeDeps; @@ -132,9 +138,6 @@ let }; }; - # *not* to confuse with the python package "pynac" - pynac = pkgs.pynac.override { inherit singular flint; }; - # With openblas (64 bit), the tests fail the same way as when sage is build with # openblas instead of openblasCompat. Apparently other packages somehow use flints # blas when it is available. Alternative would be to override flint to use @@ -165,5 +168,5 @@ in # A wrapper around sage that makes sure sage finds its docs (if they were build). callPackage ./sage.nix { inherit sage-tests sage-with-env sagedoc jupyter-kernel-definition; - inherit withDoc; + inherit withDoc requireSageTests; } diff --git a/pkgs/applications/science/math/sage/patches/Only-test-external-software-when-all-of-sage-is.patch b/pkgs/applications/science/math/sage/patches/Only-test-external-software-when-all-of-sage-is.patch new file mode 100644 index 000000000000..a478f50d92e8 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/Only-test-external-software-when-all-of-sage-is.patch @@ -0,0 +1,46 @@ +diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py +index 01f32fb8e4..4d83dc7b47 100644 +--- a/src/sage/doctest/control.py ++++ b/src/sage/doctest/control.py +@@ -1253,6 +1253,7 @@ class DocTestController(SageObject): + + self.log("Using --optional=" + self._optional_tags_string()) + available_software._allow_external = self.options.optional is True or 'external' in self.options.optional ++ available_software._autodetect_safe = self.options.optional is True or 'sage' in self.options.optional + self.log("Features to be detected: " + ','.join(available_software.detectable())) + self.add_files() + self.expand_files_into_sources() +diff --git a/src/sage/doctest/external.py b/src/sage/doctest/external.py +index 84dae19ea5..badc61466e 100644 +--- a/src/sage/doctest/external.py ++++ b/src/sage/doctest/external.py +@@ -409,6 +409,7 @@ class AvailableSoftware(object): + [] + """ + self._allow_external = True ++ self._autodetect_safe = True + # For multiprocessing of doctests, the data self._seen should be + # shared among subprocesses. Thus we use Array class from the + # multiprocessing module. +@@ -430,6 +431,8 @@ class AvailableSoftware(object): + sage: 'internet' in available_software # random, optional - internet + True + """ ++ if not self._autodetect_safe: ++ return False + try: + idx = self._indices[item] + except KeyError: +diff --git a/src/sage/features/sagemath.py b/src/sage/features/sagemath.py +index 433338766d..233623b14a 100644 +--- a/src/sage/features/sagemath.py ++++ b/src/sage/features/sagemath.py +@@ -12,7 +12,7 @@ class sagemath_doc_html(StaticFile): + + EXAMPLES:: + +- sage: from sage.features.sagemath import sagemath_doc_html ++ sage: from sage.features.sagemath import sagemath_doc_html # optional - sagemath_doc_html + sage: sagemath_doc_html().is_present() # optional - sagemath_doc_html + FeatureTestResult('sagemath_doc_html', True) + """ diff --git a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch deleted file mode 100644 index d5c19a54fd96..000000000000 --- a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f5ea42a7aaed7611fb55b65897b9fcf2b7bcf97e Mon Sep 17 00:00:00 2001 -From: Timo Kaufmann -Date: Sun, 21 Oct 2018 17:52:40 +0200 -Subject: [PATCH] Only test py2/py3 optional tests when all of sage is tested - ---- - src/sage/doctest/control.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py -index 2d93841e50..6d156e29a1 100644 ---- a/src/sage/doctest/control.py -+++ b/src/sage/doctest/control.py -@@ -375,7 +375,8 @@ class DocTestController(SageObject): - if not optionaltag_regex.search(o): - raise ValueError('invalid optional tag {!r}'.format(o)) - -- options.optional |= auto_optional_tags -+ if "sage" in options.optional: -+ options.optional |= auto_optional_tags - - self.options = options - --- -2.28.0 - diff --git a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch b/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch index 178cef3e54ea..90a23f94cb5f 100644 --- a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch +++ b/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch @@ -1,8 +1,8 @@ diff --git a/src/sage/env.py b/src/sage/env.py -index 95980cc2df..37107a30e1 100644 +index c4953cfa65..47b880f9ad 100644 --- a/src/sage/env.py +++ b/src/sage/env.py -@@ -227,93 +227,12 @@ OPENMP_CXXFLAGS = var("OPENMP_CXXFLAGS", "") +@@ -244,81 +244,8 @@ os.environ['MPMATH_SAGE'] = '1' SAGE_BANNER = var("SAGE_BANNER", "") SAGE_IMPORTALL = var("SAGE_IMPORTALL", "yes") @@ -29,20 +29,12 @@ index 95980cc2df..37107a30e1 100644 - - EXAMPLES:: - -- sage: import sys -- sage: from fnmatch import fnmatch - sage: from sage.env import _get_shared_lib_path -- sage: lib_filename = _get_shared_lib_path("Singular", "singular-Singular") -- sage: if sys.platform == 'cygwin': -- ....: pattern = "*/cygSingular-*.dll" -- ....: elif sys.platform == 'darwin': -- ....: pattern = "*/libSingular-*.dylib" -- ....: else: -- ....: pattern = "*/lib*Singular-*.so" -- sage: fnmatch(str(lib_filename), pattern) +- sage: "gap" in _get_shared_lib_path("gap") - True - sage: _get_shared_lib_path("an_absurd_lib") is None - True +- - """ - - for libname in libnames: @@ -87,11 +79,6 @@ index 95980cc2df..37107a30e1 100644 - # Just return None if no files were found - return None - - # locate singular shared object - # On Debian it's libsingular-Singular so try that as well --SINGULAR_SO = var("SINGULAR_SO", _get_shared_lib_path("Singular", "singular-Singular")) -+SINGULAR_SO = var("SINGULAR_SO", '/default') - # locate libgap shared object -GAP_SO = var("GAP_SO", _get_shared_lib_path("gap", "")) +GAP_SO = var("GAP_SO", '/default') diff --git a/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch b/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch deleted file mode 100644 index 93c03a04ddb1..000000000000 --- a/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/doc/en/prep/Advanced-2DPlotting.rst b/src/doc/en/prep/Advanced-2DPlotting.rst -index 337457afef..f7c76f4b56 100644 ---- a/src/doc/en/prep/Advanced-2DPlotting.rst -+++ b/src/doc/en/prep/Advanced-2DPlotting.rst -@@ -695,6 +695,8 @@ by the cells. - - sage: pdf_savename = name+'.pdf' - sage: p.save(pdf_savename) -+ ... -+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. - - Notably, we can export in formats ready for inclusion in web pages. - -diff --git a/src/sage/plot/disk.py b/src/sage/plot/disk.py -index 8680a1c9b1..e83763b678 100644 ---- a/src/sage/plot/disk.py -+++ b/src/sage/plot/disk.py -@@ -156,6 +156,8 @@ class Disk(GraphicPrimitive): - sage: f = tmp_filename(ext='.pdf') - sage: p = disk((0,0), 5, (0, pi/4), alpha=0.5) - sage: p.save(f) -+ ... -+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. - - """ - import matplotlib.patches as patches -diff --git a/src/sage/plot/text.py b/src/sage/plot/text.py -index 04cbdedf76..a970f97b79 100644 ---- a/src/sage/plot/text.py -+++ b/src/sage/plot/text.py -@@ -325,6 +325,8 @@ def text(string, xy, **options): - You can save text as part of PDF output:: - - sage: text("sage", (0,0), rgbcolor=(0,0,0)).save(os.path.join(SAGE_TMP, 'a.pdf')) -+ ... -+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. - - Some examples of bounding box:: - diff --git a/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch b/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch new file mode 100644 index 000000000000..91e080aa294a --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/linbox-1.7-upgrade.patch @@ -0,0 +1,58 @@ +diff --git a/src/sage/libs/linbox/conversion.pxd b/src/sage/libs/linbox/conversion.pxd +index 7794c9edc3..1753277b1f 100644 +--- a/src/sage/libs/linbox/conversion.pxd ++++ b/src/sage/libs/linbox/conversion.pxd +@@ -177,9 +177,8 @@ cdef inline Vector_integer_dense new_sage_vector_integer_dense(P, DenseVector_in + - v -- linbox vector + """ + cdef Vector_integer_dense res = P() +- cdef cppvector[Integer] * vec = &v.refRep() + cdef size_t i + for i in range( res._degree): +- mpz_set(res._entries[i], vec[0][i].get_mpz_const()) ++ mpz_set(res._entries[i], v.getEntry(i).get_mpz_const()) + + return res +diff --git a/src/sage/libs/linbox/linbox.pxd b/src/sage/libs/linbox/linbox.pxd +index 9112d151f8..dcc482960c 100644 +--- a/src/sage/libs/linbox/linbox.pxd ++++ b/src/sage/libs/linbox/linbox.pxd +@@ -32,7 +32,7 @@ cdef extern from "linbox/matrix/dense-matrix.h": + ctypedef Modular_double Field + ctypedef double Element + DenseMatrix_Modular_double(Field F, size_t m, size_t n) +- DenseMatrix_Modular_double(Field F, Element*, size_t m, size_t n) ++ DenseMatrix_Modular_double(Field F, size_t m, size_t n, Element*) + void setEntry(size_t i, size_t j, Element& a) + Element &getEntry(size_t i, size_t j) + +@@ -42,7 +42,7 @@ cdef extern from "linbox/matrix/dense-matrix.h": + ctypedef Modular_float Field + ctypedef float Element + DenseMatrix_Modular_float(Field F, size_t m, size_t n) +- DenseMatrix_Modular_float(Field F, Element*, size_t m, size_t n) ++ DenseMatrix_Modular_float(Field F, size_t m, size_t n, Element*) + void setEntry(size_t i, size_t j, Element& a) + Element &getEntry(size_t i, size_t j) + +@@ -101,7 +101,6 @@ cdef extern from "linbox/vector/vector.h": + DenseVector_integer (Field &F) + DenseVector_integer (Field &F, long& m) + DenseVector_integer (Field &F, cppvector[Integer]&) +- cppvector[Element]& refRep() + size_t size() + void resize(size_t) + void resize(size_t n, const Element&) +diff --git a/src/sage/matrix/matrix_modn_dense_template.pxi b/src/sage/matrix/matrix_modn_dense_template.pxi +index 010365d76f..3d60726ff9 100644 +--- a/src/sage/matrix/matrix_modn_dense_template.pxi ++++ b/src/sage/matrix/matrix_modn_dense_template.pxi +@@ -219,7 +219,7 @@ cdef inline linbox_echelonize_efd(celement modulus, celement* entries, Py_ssize_ + return 0,[] + + cdef ModField *F = new ModField(modulus) +- cdef DenseMatrix *A = new DenseMatrix(F[0], entries,nrows, ncols) ++ cdef DenseMatrix *A = new DenseMatrix(F[0], nrows, ncols, entries) + cdef Py_ssize_t r = reducedRowEchelonize(A[0]) + cdef Py_ssize_t i,j + for i in range(nrows): diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch index 3c64be100d25..1ff081b25e0f 100644 --- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch +++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch @@ -1,8 +1,8 @@ diff --git a/src/sage_docbuild/__init__.py b/src/sage_docbuild/__init__.py -index 79005b903a..fbe6fe2595 100644 +index 8a5c1a19d2..21fd192642 100644 --- a/src/sage_docbuild/__init__.py +++ b/src/sage_docbuild/__init__.py -@@ -85,27 +85,6 @@ def builder_helper(type): +@@ -89,27 +89,6 @@ def builder_helper(type): """ Returns a function which builds the documentation for output type ``type``. @@ -12,7 +12,7 @@ index 79005b903a..fbe6fe2595 100644 - Check that :trac:`25161` has been resolved:: - - sage: from sage_docbuild import DocBuilder, setup_parser -- sage: DocBuilder._options = setup_parser().parse_args([])[0] # builder_helper needs _options to be set +- sage: DocBuilder._options = setup_parser().parse_args([]) # builder_helper needs _options to be set - - sage: import sage_docbuild.sphinxbuild - sage: def raiseBaseException(): @@ -30,7 +30,7 @@ index 79005b903a..fbe6fe2595 100644 """ def f(self, *args, **kwds): output_dir = self._output_dir(type) -@@ -127,10 +106,9 @@ def builder_helper(type): +@@ -131,10 +110,9 @@ def builder_helper(type): logger.debug(build_command) # Run Sphinx with Sage's special logger @@ -44,10 +44,10 @@ index 79005b903a..fbe6fe2595 100644 if ABORT_ON_ERROR: raise diff --git a/src/sage_docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py -index f58f6c61d7..ef51a55411 100644 +index d917c3e9d4..551cc8028a 100644 --- a/src/sage_docbuild/sphinxbuild.py +++ b/src/sage_docbuild/sphinxbuild.py -@@ -326,3 +326,8 @@ def runsphinx(): +@@ -327,3 +327,8 @@ def runsphinx(): sys.stderr = saved_stderr sys.stdout.flush() sys.stderr.flush() diff --git a/pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch b/pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch new file mode 100644 index 000000000000..5fea88309036 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/tachyon-renamed-focallength.patch @@ -0,0 +1,81 @@ +diff --git a/src/sage/interfaces/tachyon.py b/src/sage/interfaces/tachyon.py +index 3f1dcdb538..b6fa8d1fbd 100644 +--- a/src/sage/interfaces/tachyon.py ++++ b/src/sage/interfaces/tachyon.py +@@ -261,13 +261,13 @@ written in the sequence they are listed in the examples in this section. + The {\bf PROJECTION} keyword must be followed by one of the supported + camera projection mode identifiers {\bf PERSPECTIVE}, {\bf PERSPECTIVE_DOF}, + {\bf ORTHOGRAPHIC}, or {\bf FISHEYE}. The {\bf FISHEYE} projection mode +-requires two extra parameters {\bf FOCALLENGTH} and {\bf APERTURE} ++requires two extra parameters {\bf FOCALDIST} and {\bf APERTURE} + which precede the regular camera options. + + \begin{verbatim} + Camera + projection perspective_dof +- focallength 0.75 ++ focaldist 0.75 + aperture 0.02 + Zoom 0.666667 + Aspectratio 1.000000 +diff --git a/src/sage/plot/plot3d/tachyon.py b/src/sage/plot/plot3d/tachyon.py +index 08caf38d67..3e827411ce 100644 +--- a/src/sage/plot/plot3d/tachyon.py ++++ b/src/sage/plot/plot3d/tachyon.py +@@ -92,7 +92,7 @@ angle, right angle):: + Finally there is the ``projection='perspective_dof'`` option. :: + + sage: T = Tachyon(xres=800, antialiasing=4, raydepth=10, +- ....: projection='perspective_dof', focallength='1.0', aperture='.0025') ++ ....: projection='perspective_dof', focaldist='1.0', aperture='.0025') + sage: T.light((0,5,7), 1.0, (1,1,1)) + sage: T.texture('t1', opacity=1, specular=.3) + sage: T.texture('t2', opacity=1, specular=.3, color=(0,0,1)) +@@ -186,7 +186,7 @@ class Tachyon(WithEqualityById, SageObject): + or ``'fisheye'``. + - ``frustum`` - (default ''), otherwise list of four numbers. Only + used with projection='fisheye'. +- - ``focallength`` - (default ''), otherwise a number. Only used ++ - ``focaldist`` - (default ''), otherwise a number. Only used + with projection='perspective_dof'. + - ``aperture`` - (default ''), otherwise a number. Only used + with projection='perspective_dof'. +@@ -331,7 +331,7 @@ class Tachyon(WithEqualityById, SageObject): + Use of the ``projection='perspective_dof'`` option. This may not be + implemented correctly. :: + +- sage: T = Tachyon(xres=800,antialiasing=4, raydepth=10, projection='perspective_dof', focallength='1.0', aperture='.0025') ++ sage: T = Tachyon(xres=800,antialiasing=4, raydepth=10, projection='perspective_dof', focaldist='1.0', aperture='.0025') + sage: T.light((0,5,7), 1.0, (1,1,1)) + sage: T.texture('t1', opacity=1, specular=.3) + sage: T.texture('t2', opacity=1, specular=.3, color=(0,0,1)) +@@ -365,7 +365,7 @@ class Tachyon(WithEqualityById, SageObject): + look_at=[0, 0, 0], + viewdir=None, + projection='PERSPECTIVE', +- focallength='', ++ focaldist='', + aperture='', + frustum=''): + r""" +@@ -391,7 +391,7 @@ class Tachyon(WithEqualityById, SageObject): + self._camera_position = (-3, 0, 0) # default value + self._updir = updir + self._projection = projection +- self._focallength = focallength ++ self._focaldist = focaldist + self._aperture = aperture + self._frustum = frustum + self._objects = [] +@@ -624,9 +624,9 @@ class Tachyon(WithEqualityById, SageObject): + camera_out = r""" + camera + projection %s""" % (tostr(self._projection)) +- if self._focallength != '': ++ if self._focaldist != '': + camera_out = camera_out + r""" +- focallength %s""" % (float(self._focallength)) ++ focaldist %s""" % (float(self._focaldist)) + if self._aperture != '': + camera_out = camera_out + r""" + aperture %s""" % (float(self._aperture)) diff --git a/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix b/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix new file mode 100644 index 000000000000..1766cec3e35d --- /dev/null +++ b/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, sage-src +, sphinx +}: + +buildPythonPackage rec { + version = src.version; + pname = "sage-docbuild"; + src = sage-src; + + propagatedBuildInputs = [ + sphinx + ]; + + preBuild = '' + cd pkgs/sage-docbuild + ''; + + doCheck = false; # we will run tests in sagedoc.nix + + meta = with lib; { + description = "Build system of the Sage documentation"; + homepage = "https://www.sagemath.org"; + license = licenses.gpl2Plus; + maintainers = teams.sage.members; + }; +} diff --git a/pkgs/applications/science/math/sage/python-modules/sage-setup.nix b/pkgs/applications/science/math/sage/python-modules/sage-setup.nix new file mode 100644 index 000000000000..50346153123d --- /dev/null +++ b/pkgs/applications/science/math/sage/python-modules/sage-setup.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, sage-src +, pkgconfig # the python module, not the pkg-config alias +}: + +buildPythonPackage rec { + version = src.version; + pname = "sage-setup"; + src = sage-src; + + buildInputs = [ + pkgconfig + ]; + + preBuild = '' + cd pkgs/sage-setup + ''; + + doCheck = false; # sagelib depends on sage-setup, but sage-setup's tests depend on sagelib + + meta = with lib; { + description = "Build system of the Sage library"; + homepage = "https://www.sagemath.org"; + license = licenses.gpl2Plus; + maintainers = teams.sage.members; + }; +} diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index ae0b9f7453b5..e680c0c3b22d 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -2,7 +2,7 @@ , lib , writeTextFile , sagelib -, sage_docbuild +, sage-docbuild , env-locations , gfortran , bash @@ -45,11 +45,10 @@ , flint , gmp , mpfr -, pynac , zlib , gsl , ntl -, jdk8 +, jdk , less }: @@ -60,8 +59,6 @@ assert (!blas.isILP64) && (!lapack.isILP64); # dependencies. let - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - runtimepath = (lib.makeBinPath ([ "@sage-local@" "@sage-local@/build" @@ -163,7 +160,6 @@ writeTextFile rec { gmp mpfr pari - pynac zlib eclib gsl @@ -179,7 +175,6 @@ writeTextFile rec { glpk flint gap - pynac mpfr.dev ]) }' @@ -193,5 +188,5 @@ writeTextFile rec { ''; } // { # equivalent of `passthru`, which `writeTextFile` doesn't support lib = sagelib; - docbuild = sage_docbuild; + docbuild = sage-docbuild; } diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index eb07434b4cc0..22e3a288b7d7 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -57,24 +57,29 @@ let ); in stdenv.mkDerivation rec { - version = "9.4"; + version = "9.5"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "sha256-jqkr4meG02KbTCMsGvyr1UbosS4ZuUJhPXU/InuS+9A="; + sha256 = "sha256-uOsLpsGpcIGs8Xr82X82MElnTB2E908gytyNJ8WVD5w="; }; # Patches needed because of particularities of nix or the way this is packaged. # The goal is to upstream all of them and get rid of this list. nixPatches = [ - # Make sure py2/py3 tests are only run when their expected context (all "sage" - # tests) are also run. That is necessary to test dochtml individually. See - # https://trac.sagemath.org/ticket/26110 for an upstream discussion. - # TODO: Determine if it is still necessary. - ./patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch + # Since https://trac.sagemath.org/ticket/32174, some external features are + # marked as "safe" and get auto-detected, in which case the corresponding + # optional tests are executed. We disable auto-detection of safe features if + # we are doctesting with an "--optional" argument which does not include + # "sage", because tests from autodetected features expect context provided + # by running basic sage tests. This is necessary to test sagemath_doc_html + # separately. See https://trac.sagemath.org/ticket/26110 for a related + # upstream discussion (from the time when Sage still had optional py2/py3 + # tags). + ./patches/Only-test-external-software-when-all-of-sage-is.patch # Fixes a potential race condition which can lead to transient doctest failures. ./patches/fix-ecl-race.patch @@ -109,61 +114,48 @@ stdenv.mkDerivation rec { # strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch - # fonttools 4.26.2, used by matplotlib, uses deprecated methods internally. - # This is fixed in fonttools 4.27.0, but since fonttools is a dependency of - # 2000+ packages and DeprecationWarnings are hidden almost everywhere by - # default (not on Sage's doctest harness, though), it doesn't make sense to - # backport the fix (see https://github.com/NixOS/nixpkgs/pull/151415). - # Let's just assume warnings are expected until we update to 4.27.0. - ./patches/fonttools-deprecation-warnings.patch + # Upstream will wait until Sage 9.7 to upgrade to linbox 1.7 because it + # does not support gcc 6. We can upgrade earlier. + # https://trac.sagemath.org/ticket/32959 + ./patches/linbox-1.7-upgrade.patch - # https://trac.sagemath.org/ticket/32305 + # https://trac.sagemath.org/ticket/33170 (fetchSageDiff { - base = "9.4"; - name = "networkx-2.6-upgrade.patch"; - rev = "9808325853ba9eb035115e5b056305a1c9d362a0"; - sha256 = "sha256-gJSqycCtbAVr5qnVEbHFUvIuTOvaxFIeffpzd6nH4DE="; - }) - - # https://trac.sagemath.org/ticket/32420 - (fetchSageDiff { - base = "9.5.beta2"; - name = "sympy-1.9-update.patch"; - rev = "beed4e16aff32e47d0c3b1c58cb1e2f4c38590f8"; - sha256 = "sha256-3eJPfWfCrCAQ5filIn7FbzjRQeO9QyTIVl/HyRuqFtE="; - }) - - # https://trac.sagemath.org/ticket/32567 - (fetchSageDiff { - base = "9.5.beta2"; - name = "arb-2.21.0-update.patch"; - rev = "eb3304dd521a3d5a9334e747a08e234bbf16b4eb"; - sha256 = "sha256-XDkaY4VQGyESXI6zuD7nCNzyQOl/fmBFvAESH9+RRvk="; - }) - - # https://trac.sagemath.org/ticket/32797 - (fetchSageDiff { - base = "9.5.beta7"; - name = "pari-2.13.3-update.patch"; - rev = "f5f7a86908daf60b25e66e6a189c51ada7e0a732"; - sha256 = "sha256-H/caGx3q4KcdsyGe+ojV9bUTQ5y0siqM+QHgDbeEnbw="; - }) - - # https://trac.sagemath.org/ticket/32909 - (fetchSageDiff { - base = "9.5.beta7"; - name = "matplotlib-3.5-deprecation-warnings.patch"; - rev = "a5127dc56fdf5c2e82f6bc781cfe78dbd04e97b7"; - sha256 = "sha256-p23qUu9mgEUbdbX6cy7ArxZAtpcFjCKbgyxN4jWvj1o="; + base = "9.5.rc1"; + name = "ipython-8-update.patch"; + rev = "a90a314616d86d6be9c0d5233f0d36c4bfe06231"; + sha256 = "sha256-pXdtokTo84xNCnV+HyAKEzG562z8FjzJ7hczOja0dRw="; }) # https://trac.sagemath.org/ticket/32968 (fetchSageDiff { - base = "9.5.beta8"; + base = "9.5"; name = "sphinx-4.3-update.patch"; rev = "fc84f82f52b6f05f512cb359ec7c100f93cf8841"; sha256 = "sha256-bBbfdcnw/9LUOlY8rHJRbFJEdMXK4shosqTNaobTS1Q="; }) + + # https://trac.sagemath.org/ticket/33189 + (fetchSageDiff { + base = "9.5"; + name = "arb-2.22-update.patch"; + rev = "53532ddd4e2dc92469c1590ebf0c40f8f69bf579"; + sha256 = "sha256-6SoSBvIlqvNwZV3jTB6uPdUtaWIOeNmddi2poK/WvGs="; + }) + + # TODO: This will not be necessary when Sphinx 4.4.1 is released, + # since some warnings introduced in 4.4.0 will be disabled by then + # (https://github.com/sphinx-doc/sphinx/pull/10126). + # https://trac.sagemath.org/ticket/33272 + (fetchSageDiff { + base = "9.5"; + name = "sphinx-4.4-warnings.patch"; + rev = "97d7958bed441cf2ccc714d88f83d3a8426bc085"; + sha256 = "sha256-y1STE0oxswnijGCsBw8eHWWqpmT1XMznIfA0vvX9pFA="; + }) + + # adapted from https://trac.sagemath.org/ticket/23712#comment:22 + ./patches/tachyon-renamed-focallength.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index b74ec4007e62..df3a1467d53c 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -18,7 +18,6 @@ , eclib , ntl , ecm -, pynac , pythonEnv }: @@ -36,7 +35,6 @@ let blas lapack singular three - pynac giac gap pari @@ -126,6 +124,10 @@ stdenv.mkDerivation rec { cp -r src/bin "$out/bin" cp -r build/bin "$out/build/bin" + # sage assumes the existence of sage-src-env-config.in means it's being executed in-tree. in this case, it + # adds SAGE_SRC/bin to PATH, breaking our wrappers + rm "$out/bin"/*.in "$out/build/bin"/*.in + cp -f '${sage-env}/sage-env' "$out/bin/sage-env" substituteInPlace "$out/bin/sage-env" \ --subst-var-by sage-local "$out" diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index 106f9eea3097..96122fba5ab4 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -6,6 +6,7 @@ , jupyter-kernel , sagedoc , withDoc +, requireSageTests }: # A wrapper that makes sure sage finds its docs (if they were build) and the @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper - + ] ++ lib.optionals requireSageTests [ # This is a hack to make sure sage-tests is evaluated. It doesn't acutally # produce anything of value, it just decouples the tests from the build. sage-tests @@ -62,7 +63,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"; - license = licenses.gpl2; + homepage = "https://www.sagemath.org"; + license = licenses.gpl2Plus; maintainers = teams.sage.members; }; } diff --git a/pkgs/applications/science/math/sage/sage_docbuild.nix b/pkgs/applications/science/math/sage/sage_docbuild.nix deleted file mode 100644 index ed78d46b4451..000000000000 --- a/pkgs/applications/science/math/sage/sage_docbuild.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ buildPythonPackage -, sage-src -, sphinx -}: - -buildPythonPackage rec { - version = src.version; - pname = "sage_docbuild"; - src = sage-src; - - propagatedBuildInputs = [ - sphinx - ]; - - preBuild = '' - cd build/pkgs/sage_docbuild/src - ''; - - doCheck = false; # we will run tests in sagedoc.nix -} diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix index 6016b3baeb48..489fc2edfe55 100644 --- a/pkgs/applications/science/math/sage/sagedoc.nix +++ b/pkgs/applications/science/math/sage/sagedoc.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { jmol cddlib ] ++ (with python3.pkgs; [ - sage_docbuild + sage-docbuild psutil future sphinx @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' - ${sage-with-env}/bin/sage -t --optional=dochtml --all + ${sage-with-env}/bin/sage -t --optional=sagemath_doc_html --all ''; } diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index a884ad8899d4..8d685c8da60f 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -2,6 +2,7 @@ , env-locations , perl , buildPythonPackage +, m4 , arb , blas , lapack @@ -37,7 +38,7 @@ , pkg-config , planarity , ppl -, pynac +, primecountpy , python , ratpoints , readline @@ -49,11 +50,24 @@ , singular , pip , jupyter_core +, sage-setup , libhomfly , libbraiding , gmpy2 , pplpy , sqlite +, jupyter-client +, ipywidgets +, mpmath +, rpy2 +, fpylll +, scipy +, sympy +, matplotlib +, pillow +, ipykernel +, networkx +, sphinx # TODO: this is in setup.cfg, bug should we override it? }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -73,8 +87,10 @@ buildPythonPackage rec { perl jupyter_core pkg-config + sage-setup pip # needed to query installed packages lisp-compiler + m4 ]; buildInputs = [ @@ -116,7 +132,7 @@ buildPythonPackage rec { pari planarity ppl - pynac + primecountpy rankwidth ratpoints singular @@ -130,6 +146,18 @@ buildPythonPackage rec { gmpy2 pplpy sqlite + mpmath + rpy2 + scipy + sympy + matplotlib + pillow + ipykernel + fpylll + networkx + jupyter-client + ipywidgets + sphinx ]; preBuild = '' @@ -148,8 +176,24 @@ buildPythonPackage rec { mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython" mkdir -p "var/lib/sage/installed" - # src/setup.py should not be used, see https://trac.sagemath.org/ticket/31377#comment:124 - cd build/pkgs/sagelib/src + cd build/pkgs/sagelib + + # some files, like Pipfile, pyproject.toml, requirements.txt and setup.cfg + # are generated by the bootstrap script using m4. these can fetch data from + # build/pkgs, either directly or via sage-get-system-packages. + sed -i 's/==2.1.0rc1/>=2.1.1/' ../gmpy2/install-requires.txt + sed -i 's/, <3.4//' ../rpy2/install-requires.txt + sed -i 's/, <4.3//' ../sphinx/install-requires.txt + sed -i '/sage_conf/d' src/setup.cfg.m4 + sed -i '/sage_conf/d' src/requirements.txt.m4 + for infile in src/*.m4; do + if [ -f "$infile" ]; then + outfile="src/$(basename $infile .m4)" + m4 "$infile" > "$outfile" + fi + done + + cd src ''; postInstall = '' diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 5dea2c7653aa..65d8c145bef6 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -1,11 +1,7 @@ { stdenv, fetchurl, lib, xorg }: let - name = "scilab-bin-${ver}"; - - ver = "6.0.2"; - - badArch = throw "${name} requires i686-linux or x86_64-linux"; + badArch = throw "scilab-bin requires i686-linux or x86_64-linux"; architecture = if stdenv.hostPlatform.system == "i686-linux" then @@ -15,16 +11,17 @@ let else badArch; in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + pname = "scilab-bin"; + version = "6.1.1"; src = fetchurl { - url = "https://www.scilab.org/download/${ver}/scilab-${ver}.bin.linux-${architecture}.tar.gz"; + url = "https://www.scilab.org/download/${version}/scilab-${version}.bin.linux-${architecture}.tar.gz"; sha256 = if stdenv.hostPlatform.system == "i686-linux" then "0fgjc2ak3b2qi6yin3fy50qwk2bcj0zbz1h4lyyic9n1n1qcliib" else if stdenv.hostPlatform.system == "x86_64-linux" then - "05clcdgry90drirl3swbxn5q36fmgknnhs6h5pr7mmrzfr6r818w" + "sha256-PuGnz2YdAhriavwnuf5Qyy0cnCeRHlWC6dQzfr7bLHk=" else badArch; }; @@ -43,7 +40,7 @@ stdenv.mkDerivation { sed -i 's|\$(/bin/|$(|g' bin/scilab sed -i 's|/usr/bin/||g' bin/scilab - sci="$out/opt/scilab-${ver}" + sci="$out/opt/scilab-${version}" fullLibPath="$sci/lib/scilab:$sci/lib/thirdparty:$libPath" fullLibPath="$fullLibPath:$sci/lib/thirdparty/redist" @@ -55,31 +52,31 @@ stdenv.mkDerivation { ''; installPhase = '' - mkdir -p "$out/opt/scilab-${ver}" - cp -r . "$out/opt/scilab-${ver}/" + mkdir -p "$out/opt/scilab-${version}" + cp -r . "$out/opt/scilab-${version}/" # Create bin/ dir mkdir "$out/bin" # Creating executable symlinks - ln -s "$out/opt/scilab-${ver}/bin/scilab" "$out/bin/scilab" - ln -s "$out/opt/scilab-${ver}/bin/scilab-cli" "$out/bin/scilab-cli" - ln -s "$out/opt/scilab-${ver}/bin/scilab-adv-cli" "$out/bin/scilab-adv-cli" + ln -s "$out/opt/scilab-${version}/bin/scilab" "$out/bin/scilab" + ln -s "$out/opt/scilab-${version}/bin/scilab-cli" "$out/bin/scilab-cli" + ln -s "$out/opt/scilab-${version}/bin/scilab-adv-cli" "$out/bin/scilab-adv-cli" # Creating desktop config dir mkdir -p "$out/share/applications" # Moving desktop config files - mv $out/opt/scilab-${ver}/share/applications/*.desktop $out/share/applications + mv $out/opt/scilab-${version}/share/applications/*.desktop $out/share/applications # Fixing Exec paths and launching each app with a terminal - sed -i -e "s|Exec=|Exec=$out/opt/scilab-${ver}/bin/|g" \ + sed -i -e "s|Exec=|Exec=$out/opt/scilab-${version}/bin/|g" \ -e "s|Terminal=.*$|Terminal=true|g" $out/share/applications/*.desktop # Moving icons to the appropriate locations - for path in $out/opt/scilab-${ver}/share/icons/hicolor/*/*/* + for path in $out/opt/scilab-${version}/share/icons/hicolor/*/*/* do - newpath=$(echo $path | sed 's|/opt/scilab-${ver}||g') + newpath=$(echo $path | sed 's|/opt/scilab-${version}||g') filename=$(echo $path | sed 's|.*/||g') dir=$(echo $newpath | sed "s|$filename||g") mkdir -p $dir @@ -87,10 +84,10 @@ stdenv.mkDerivation { done # Removing emptied folders - rm -rf $out/opt/scilab-${ver}/share/{applications,icons} + rm -rf $out/opt/scilab-${version}/share/{applications,icons} # Moving other share/ folders - mv $out/opt/scilab-${ver}/share/{appdata,locale,mime} $out/share + mv $out/opt/scilab-${version}/share/{appdata,locale,mime} $out/share ''; meta = { diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index b543252e8712..23712061160e 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gmp, bison, perl, ncurses, readline, coreutils, pkg-config , lib -, fetchpatch , autoreconfHook +, buildPackages , sharutils , file , flint @@ -11,6 +11,7 @@ , lrcalc , doxygen , graphviz +, latex2html # upstream generates docs with texinfo 4. later versions of texinfo # use letters instead of numbers for post-appendix chapters, and we # want it to match the upstream format because sage depends on it. @@ -22,66 +23,25 @@ stdenv.mkDerivation rec { pname = "singular"; - version = "4.2.0p2"; + version = "4.3.0"; - # since the tarball does not contain tests or documentation (and - # there is no separate tests tarball for 4.2.0), we fetch from - # GitHub. + # since the tarball does not contain tests, we fetch from GitHub. src = fetchFromGitHub { owner = "Singular"; repo = "Singular"; - # 4.2.0p2 is not tagged, but the tarball matches the commit below. - rev = "6f68939ddf612d96e3caaaaa8275f77613ac1da8"; - sha256 = "sha256-BJNzYylzDqD/5YjzjxPRb/c96tYiuGy9Y+A7qf3ZSG8="; - - # if a release is tagged it will be in the format below. - # rev = "Release${lib.replaceStrings ["."] ["-"] version}"; + # if a release is tagged (which sometimes does not happen), it will + # be in the format below. + # rev = "Release-${lib.replaceStrings ["."] ["-"] version}"; + rev = "d895b0f1f543c61eb03adddad20f08655a419d4e"; + sha256 = "sha256-c5Qr6VUuPKjfw8fowjJJz3oGAyUwo/K0WeMvU5djzVA="; # the repository's .gitattributes file contains the lines "/Tst/ # export-ignore" and "/doc/ export-ignore" so some directories are - # not included in the tarball downloaded by fetchzip. setting - # fetchSubmodules works around this by using fetchgit instead of - # fetchzip. - fetchSubmodules = true; + # not included in the tarball downloaded by fetchzip. + forceFetchGit = true; }; - patches = [ - # fix timeouts when docbuilding with >= 64 cpus - # https://github.com/Singular/Singular/issues/1117 - ./vspace-MAX_PROCESS.patch - - # add aarch64 support to cpu-check.m4. copied from redhat. - ./redhat-aarch64.patch - - # the newest version of ax-prog-cc-for-build.m4 seems to trigger - # linker errors. see - # https://github.com/alsa-project/alsa-firmware/issues/3 for a - # related issue. - ./use-older-ax-prog-cc-for-build.patch - - # https://github.com/Singular/Singular/issues/1086 - (fetchpatch { - name = "schubert-lib-fails-with-too-many-cpus.patch"; - url = "https://github.com/Singular/Singular/commit/3cda50c00a849455efa2502e56596955491a353a.patch"; - sha256 = "sha256-fgYd+2vT32w5Ki8kKx6PfZn2e4QSJcYWOwEFXtc+lSA="; - }) - ] ++ lib.optionals enableDocs [ - # singular supports building without 4ti2, bertini, normaliz or - # topcom just fine, but the docbuilding does not skip manual pages - # tagged as depending on those binaries (probably a bug in - # doc2tex.pl::HandleLib, since it seems to ignore "-exclude" - # argumens). skip them manually. - ./disable-docs-for-optional-unpackaged-deps.patch - - # fix some non-ascii characters in doc/decodegb.doc - (fetchpatch { - name = "decodegb-ascii.patch"; - url = "https://github.com/Singular/Singular/commit/36966d9009de572ee4dbc487f3e5744098fe91be.patch"; - sha256 = "sha256-9WcEov/oOQRC584ag6WVHFwY2aCjbM75HWyvZoEwppw="; - }) - ]; - configureFlags = [ "--with-ntl=${ntl}" "--disable-pyobject-module" @@ -114,6 +74,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableGfanlib [ cddlib ]; + nativeBuildInputs = [ bison perl @@ -123,9 +84,11 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableDocs [ doxygen graphviz + latex2html texinfo4 texlive.combined.scheme-small ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; preAutoreconf = '' find . -type f -readable -writable -exec sed \ @@ -137,21 +100,14 @@ stdenv.mkDerivation rec { hardeningDisable = lib.optional stdenv.isi686 "stackprotector"; - # The Makefile actually defaults to `make install` anyway - buildPhase = '' - # do nothing - ''; - doCheck = true; # very basic checks, does not test any libraries installPhase = '' - mkdir -p "$out" - cp -r Singular/LIB "$out/lib" make install '' + lib.optionalString enableDocs '' - # Sage uses singular.hlp (which is not in the tarball) + # Sage uses singular.info, which is not installed by default mkdir -p $out/share/info - cp doc/singular.hlp $out/share/info + cp doc/singular.info $out/share/info '' + '' # Make sure patchelf picks up the right libraries rm -rf libpolys factory resources omalloc Singular @@ -211,5 +167,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = "http://www.singular.uni-kl.de"; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; + mainProgram = "Singular"; }; } diff --git a/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch b/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch deleted file mode 100644 index 46d92922f3ce..000000000000 --- a/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch +++ /dev/null @@ -1,112 +0,0 @@ -commit 9e8b044d982e132cf35a106a1cc0cf7e77b27f7c -Author: Mauricio Collares -Date: Thu Apr 15 20:33:21 2021 -0300 - - Disable manual sections using optional packages not yet in Nixpkgs - - * normaliz.lib depends on normaliz. - * polymake.lib depends on topcom. - * recover.lib depends on bertini. - * sing4ti2.lib depends on 4ti2. - * tateProdCplxNegGrad.lib uses multigrading.lib, which depends on 4ti2. - -diff --git a/doc/singular.doc b/doc/singular.doc -index 64b969d39..e704f95f0 100644 ---- a/doc/singular.doc -+++ b/doc/singular.doc -@@ -407,7 +407,6 @@ LIB "all.lib"; - * nfmodsyz_lib:: Syzygy modules of submodules of free modules over algebraic number fields - * noether_lib:: Noether normalization of an ideal - * normal_lib:: procedure for normalization --* normaliz_lib:: integral closure, normalization for monomial ideals, toric ideals - * pointid_lib:: factorized lex GB of the vanishing ideal of a set of points - * primdec_lib:: procedures for primary decomposition - * primdecint_lib:: primary decomposition over the integers -@@ -416,7 +415,6 @@ LIB "all.lib"; - * reesclos_lib:: Rees Algebra and integral closure of an ideal - * rstandard_lib:: Janet bases and border bases for ideals - * sagbi_lib:: Subalgebras bases Analogous to Groebner bases for ideals --* sing4ti2_lib:: interface to program 4ti2 - * symodstd_lib:: Groebner bases for symmetric ideals - * toric_lib:: toric ideals - @end menu -@@ -521,10 +519,6 @@ LIB "all.lib"; - @node normal_lib - @subsection normal_lib - @c lib normal.lib --@c --------------------------------------------------------- --@node normaliz_lib --@subsection normaliz_lib --@c lib normaliz.lib tag:normaliz - @c ---------------------------------------------------------- - @node pointid_lib - @subsection pointid_lib -@@ -558,10 +552,6 @@ LIB "all.lib"; - @subsection sagbi_lib - @c lib sagbi.lib - @c --------------------------------------------------------- --@node sing4ti2_lib --@subsection sing4ti2_lib --@c lib sing4ti2.lib tag:sing4ti2 --@c ---------------------------------------------------------- - @node symodstd_lib - @subsection symodstd_lib - @c lib symodstd.lib -@@ -873,7 +863,6 @@ iniD, reslist, sumlist, dividelist, createlist - * solve_lib:: procedures to solve polynomial systems - * triang_lib:: procedures for decomposing zero-dimensional ideals - * ntsolve_lib:: one real solution of polynomial systems (Newton iteration) --* recover_lib:: Hybrid numerical/symbolical algorithms - * rootisolation_lib:: real root isolation with intervals - * signcond_lib:: computing realizable sign conditions - * zeroset_lib:: procedures for roots and factorization -@@ -904,10 +893,6 @@ iniD, reslist, sumlist, dividelist, createlist - @subsection ntsolve_lib - @c lib ntsolve.lib - @c --------------------------------------------------------- --@node recover_lib --@subsection recover_lib --@c lib recover.lib tag:bertini --@c ---------------------------------------------------------- - @node rootisolation_lib - @subsection rootisolation_lib - @c lib rootisolation.lib -@@ -1108,7 +1093,6 @@ but not for serious computations. - * cimonom_lib:: complete intersection for toric ideals - * gfan_lib:: A gfanlib interface for Singular - * gitfan_lib:: Compute GIT-fans --* polymake_lib:: interface to TOPCOM - * realizationMatroids_lib:: Realizability for Tropical Fan Curves - * tropical_lib:: interface to gfan - * tropicalNewton_lib:: Newton polygons in tropical geometry -@@ -1125,10 +1109,7 @@ but not for serious computations. - @node gitfan_lib - @subsection gitfan_lib - @c lib gitfan.lib --@c ---------------------------------------------------------- --@node polymake_lib --@subsection polymake_lib --@c lib polymake.lib tag:topcom -+ - @c ---------------------------------------------------------- - @node realizationMatroids_lib - @subsection realizationMatroids_lib -@@ -1219,7 +1200,6 @@ Comments should be send to the author of the library directly. - * stanleyreisner_lib:: T1 and T2 for a general Stanley-Reiser ring - * swalk_lib:: Sagbi Walk Conversion Algorithm - * systhreads_lib:: multi-threaded objects --* tateProdCplxNegGrad_lib:: sheaf cohomology on product of projective spaces - * VecField_lib:: vector fields - @end menu - @c ---------------------------------------------------------- -@@ -1310,10 +1290,6 @@ Todos/Issues: - @subsection systhreads_lib - @c lib systhreads.lib - @c --------------------------------------------------------- --@node tateProdCplxNegGrad_lib --@subsection tateProdCplxNegGrad_lib --@c lib tateProdCplxNegGrad.lib --@c --------------------------------------------------------- - @node VecField_lib - @subsection VecField_lib - @c lib VecField.lib diff --git a/pkgs/applications/science/math/singular/redhat-aarch64.patch b/pkgs/applications/science/math/singular/redhat-aarch64.patch deleted file mode 100644 index e0db6e87f994..000000000000 --- a/pkgs/applications/science/math/singular/redhat-aarch64.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/m4/cpu-check.m4 b/m4/cpu-check.m4 -index 3cf0a7f08..12bb926ac 100644 ---- a/m4/cpu-check.m4 -+++ b/m4/cpu-check.m4 -@@ -37,6 +37,18 @@ if test "$ac_cv_singcpuname" = ppc; then - AC_DEFINE(SI_CPU_PPC,1,"PPC") - AC_SUBST(SI_CPU_PPC) - fi -+if test "$ac_cv_singcpuname" = arm -o "$ac_cv_singcpuname" = armel; then -+ AC_DEFINE(SI_CPU_ARM,1,"ARM") -+ AC_SUBST(SI_CPU_ARM) -+fi -+if test "$ac_cv_singcpuname" = aarch64; then -+ AC_DEFINE(SI_CPU_AARCH64,1,"AARCH64") -+ AC_SUBST(SI_CPU_AARCH64) -+fi -+if test "$ac_cv_singcpuname" = s390; then -+ AC_DEFINE(SI_CPU_S390,1,"S390") -+ AC_SUBST(SI_CPU_S390) -+fi - - # UNAME and PATH - AC_MSG_CHECKING(uname for Singular) -@@ -65,6 +77,14 @@ dnl testet on: ppc_Linux, 740/750 PowerMac G3, 512k L2 cache - [powerpc*|ppc*], [AC_DEFINE(HAVE_GENERIC_MULT,1,multiplication is fast on the cpu: a*b is with mod otherwise using tables of logartihms)], - dnl the following settings seems to be better on arm processors - [arm*], [], -+dnl FIXME: need to run some tests -+ [aarch64*], [ -+ AC_DEFINE(HAVE_MULT_MOD,1,multiplication is fast on the cpu: a*b is with mod otherwise using tables of logartihms) -+ AC_DEFINE(HAVE_GENERIC_ADD,1,use branch for addition in Z/p otherwise it uses a generic add) -+ AC_DEFINE(HAVE_DIV_MOD,1,division using extend euclidian algorithm otherwise using tables of logartihms) -+ ], -+dnl FIXME: need to run some tests -+ [s390*], [AC_DEFINE(HAVE_GENERIC_ADD,1,use branch for addition in Z/p otherwise it uses a generic add)], - [] - ) - diff --git a/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch b/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch deleted file mode 100644 index f664378617cf..000000000000 --- a/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch +++ /dev/null @@ -1,194 +0,0 @@ -diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4 -index f7410d74b..12cb005a5 100644 ---- a/m4/ax_prog_cc_for_build.m4 -+++ b/m4/ax_prog_cc_for_build.m4 -@@ -32,35 +32,31 @@ - # and this notice are preserved. This file is offered as-is, without any - # warranty. - --#serial 18 -+#serial 9 - - AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) - AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_PROG_CPP])dnl --AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+AC_REQUIRE([AC_EXEEXT])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl - - dnl Use the standard macros, but make them use other variable names - dnl - pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl --pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl - pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl - pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl - pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl - pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl --pushdef([ac_cv_c_compiler_gnu], ac_cv_build_c_compiler_gnu)dnl - pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl - pushdef([ac_cv_objext], ac_cv_build_objext)dnl - pushdef([ac_exeext], ac_build_exeext)dnl - pushdef([ac_objext], ac_build_objext)dnl - pushdef([CC], CC_FOR_BUILD)dnl - pushdef([CPP], CPP_FOR_BUILD)dnl --pushdef([GCC], GCC_FOR_BUILD)dnl - pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl - pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl --pushdef([EXEEXT], BUILD_EXEEXT)dnl - pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl --pushdef([OBJEXT], BUILD_OBJEXT)dnl - pushdef([host], build)dnl - pushdef([host_alias], build_alias)dnl - pushdef([host_cpu], build_cpu)dnl -@@ -71,29 +67,27 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl - pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl - pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl - pushdef([ac_cv_host_os], ac_cv_build_os)dnl --pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl --pushdef([am_cv_CC_dependencies_compiler_type], am_cv_build_CC_dependencies_compiler_type)dnl --pushdef([am_cv_prog_cc_c_o], am_cv_build_prog_cc_c_o)dnl --pushdef([cross_compiling], cross_compiling_build)dnl -+pushdef([ac_cpp], ac_build_cpp)dnl -+pushdef([ac_compile], ac_build_compile)dnl -+pushdef([ac_link], ac_build_link)dnl - --cross_compiling_build=no -+save_cross_compiling=$cross_compiling -+save_ac_tool_prefix=$ac_tool_prefix -+cross_compiling=no -+ac_tool_prefix= - --ac_build_tool_prefix= --AS_IF([test -n "$build"], [ac_build_tool_prefix="$build-"], -- [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"]) -- --AC_LANG_PUSH([C]) - AC_PROG_CC --_AC_COMPILER_EXEEXT --_AC_COMPILER_OBJEXT - AC_PROG_CPP -+AC_EXEEXT -+ -+ac_tool_prefix=$save_ac_tool_prefix -+cross_compiling=$save_cross_compiling - - dnl Restore the old definitions - dnl --popdef([cross_compiling])dnl --popdef([am_cv_prog_cc_c_o])dnl --popdef([am_cv_CC_dependencies_compiler_type])dnl --popdef([ac_tool_prefix])dnl -+popdef([ac_link])dnl -+popdef([ac_compile])dnl -+popdef([ac_cpp])dnl - popdef([ac_cv_host_os])dnl - popdef([ac_cv_host_vendor])dnl - popdef([ac_cv_host_cpu])dnl -@@ -104,33 +98,25 @@ popdef([host_vendor])dnl - popdef([host_cpu])dnl - popdef([host_alias])dnl - popdef([host])dnl --popdef([OBJEXT])dnl - popdef([LDFLAGS])dnl --popdef([EXEEXT])dnl - popdef([CPPFLAGS])dnl - popdef([CFLAGS])dnl --popdef([GCC])dnl - popdef([CPP])dnl - popdef([CC])dnl - popdef([ac_objext])dnl - popdef([ac_exeext])dnl - popdef([ac_cv_objext])dnl - popdef([ac_cv_exeext])dnl --popdef([ac_cv_c_compiler_gnu])dnl - popdef([ac_cv_prog_cc_g])dnl - popdef([ac_cv_prog_cc_cross])dnl - popdef([ac_cv_prog_cc_works])dnl --popdef([ac_cv_prog_cc_c89])dnl - popdef([ac_cv_prog_gcc])dnl - popdef([ac_cv_prog_CPP])dnl - --dnl restore global variables ac_ext, ac_cpp, ac_compile, --dnl ac_link, ac_compiler_gnu (dependant on the current --dnl language after popping): --AC_LANG_POP([C]) -- - dnl Finally, set Makefile variables - dnl -+BUILD_EXEEXT=$ac_build_exeext -+BUILD_OBJEXT=$ac_build_objext - AC_SUBST(BUILD_EXEEXT)dnl - AC_SUBST(BUILD_OBJEXT)dnl - AC_SUBST([CFLAGS_FOR_BUILD])dnl -diff --git a/m4/ax_prog_cxx_for_build.m4 b/m4/ax_prog_cxx_for_build.m4 -index 4d976769f..17c19a89f 100644 ---- a/m4/ax_prog_cxx_for_build.m4 -+++ b/m4/ax_prog_cxx_for_build.m4 -@@ -31,7 +31,7 @@ - # and this notice are preserved. This file is offered as-is, without any - # warranty. - --#serial 4 -+#serial 3 - - AU_ALIAS([AC_PROG_CXX_FOR_BUILD], [AX_PROG_CXX_FOR_BUILD]) - AC_DEFUN([AX_PROG_CXX_FOR_BUILD], [dnl -@@ -49,7 +49,6 @@ pushdef([ac_cv_prog_cxx_cross], ac_cv_build_prog_cxx_cross)dnl - pushdef([ac_cv_prog_cxx_g], ac_cv_build_prog_cxx_g)dnl - pushdef([CXX], CXX_FOR_BUILD)dnl - pushdef([CXXCPP], CXXCPP_FOR_BUILD)dnl --pushdef([GXX], GXX_FOR_BUILD)dnl - pushdef([CXXFLAGS], CXXFLAGS_FOR_BUILD)dnl - pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl - pushdef([CXXCPPFLAGS], CXXCPPFLAGS_FOR_BUILD)dnl -@@ -63,25 +62,26 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl - pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl - pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl - pushdef([ac_cv_host_os], ac_cv_build_os)dnl --pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl --pushdef([am_cv_CXX_dependencies_compiler_type], am_cv_build_CXX_dependencies_compiler_type)dnl --pushdef([cross_compiling], cross_compiling_build)dnl -+pushdef([ac_cxxcpp], ac_build_cxxcpp)dnl -+pushdef([ac_compile], ac_build_compile)dnl -+pushdef([ac_link], ac_build_link)dnl - --cross_compiling_build=no -+save_cross_compiling=$cross_compiling -+save_ac_tool_prefix=$ac_tool_prefix -+cross_compiling=no -+ac_tool_prefix= - --ac_build_tool_prefix= --AS_IF([test -n "$build"], [ac_build_tool_prefix="$build-"], -- [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"]) -- --AC_LANG_PUSH([C++]) - AC_PROG_CXX - AC_PROG_CXXCPP - -+ac_tool_prefix=$save_ac_tool_prefix -+cross_compiling=$save_cross_compiling -+ - dnl Restore the old definitions - dnl --popdef([cross_compiling])dnl --popdef([am_cv_CXX_dependencies_compiler_type])dnl --popdef([ac_tool_prefix])dnl -+popdef([ac_link])dnl -+popdef([ac_compile])dnl -+popdef([ac_cxxcpp])dnl - popdef([ac_cv_host_os])dnl - popdef([ac_cv_host_vendor])dnl - popdef([ac_cv_host_cpu])dnl -@@ -103,10 +103,6 @@ popdef([ac_cv_prog_cxx_works])dnl - popdef([ac_cv_prog_gxx])dnl - popdef([ac_cv_prog_CXXCPP])dnl - --dnl restore global variables (dependant on the current --dnl language after popping): --AC_LANG_POP([C++]) -- - dnl Finally, set Makefile variables - dnl - AC_SUBST([CXXFLAGS_FOR_BUILD])dnl diff --git a/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch b/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch deleted file mode 100644 index 78d658f926ee..000000000000 --- a/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/kernel/GBEngine/kChinese.cc b/kernel/GBEngine/kChinese.cc -index 829a66609..84655caf2 100644 ---- a/kernel/GBEngine/kChinese.cc -+++ b/kernel/GBEngine/kChinese.cc -@@ -209,6 +209,8 @@ ideal id_ChineseRemainder_0(ideal *xx, number *q, int rl, const ring r) - return NULL; - } - int cpus=(int)(long)feOptValue(FE_OPT_CPUS); -+ if (cpus>=vspace::internals::MAX_PROCESS) -+ cpus=vspace::internals::MAX_PROCESS-1; - if ((cpus==1) || (2*cpus>=cnt)) - /* at least 2 polys for each process, or switch to seriell version */ - return id_ChineseRemainder(xx,q,rl,r); -@@ -295,6 +297,8 @@ ideal id_Farey_0(ideal x, number N, const ring r) - { - int cnt=IDELEMS(x)*x->nrows; - int cpus=(int)(long)feOptValue(FE_OPT_CPUS); -+ if (cpus>=vspace::internals::MAX_PROCESS) -+ cpus=vspace::internals::MAX_PROCESS-1; - if (2*cpus>=cnt) /* at least 2 polys for each process, - or switch to seriell version */ - return id_Farey(x,N,r); -diff --git a/kernel/GBEngine/kverify.cc b/kernel/GBEngine/kverify.cc -index 909d84994..aa06d6624 100644 ---- a/kernel/GBEngine/kverify.cc -+++ b/kernel/GBEngine/kverify.cc -@@ -176,6 +176,8 @@ BOOLEAN kVerify2(ideal F, ideal Q) - /*---------------------------------------------------------------------*/ - BOOLEAN all_okay=TRUE; - int cpus=(int)(long)feOptValue(FE_OPT_CPUS); -+ if (cpus>=vspace::internals::MAX_PROCESS) -+ cpus=vspace::internals::MAX_PROCESS-1; - int parent_pid=getpid(); - using namespace vspace; - vmem_init(); diff --git a/pkgs/applications/science/math/tilp2/default.nix b/pkgs/applications/science/math/tilp2/default.nix deleted file mode 100644 index ebcca69f0940..000000000000 --- a/pkgs/applications/science/math/tilp2/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, autoreconfHook -, pkg-config -, intltool -, glib -, gnome2 -, gtk2 -, gfm -, libticables2 -, libticalcs2 -, libticonv -, libtifiles2 -}: - -stdenv.mkDerivation rec { - pname = "tilp2"; - version = "1.18"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "0isf73bjwk06baz2gm3vpdh600gqck9ca4aqxzb089dmxriv6fkv"; - }; - - patches = fetchpatch { - name = "remove-broken-kde-support.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=tilp"; - sha256 = "1fn6vh7r45spkwpmkvffkbn7zrcsdrs5mjmspd5rwi3jc12cy3ny"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - intltool - ]; - - buildInputs = [ - glib - gtk2 - gnome2.libglade - gfm - libticables2 - libticalcs2 - libticonv - libtifiles2 - ]; - - meta = with lib; { - changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; - description = "Transfer data between Texas Instruments graphing calculators and a computer"; - homepage = "http://lpg.ticalc.org/prj_tilp/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ luc65r ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix new file mode 100644 index 000000000000..3ca998643ac2 --- /dev/null +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -0,0 +1,77 @@ +{ lib +, meson +, ninja +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, gdk-pixbuf +, gettext +, glib +, gnome +, gobject-introspection +, gtk4 +, libxml2 +, pkg-config +, python3Packages +, wrapGAppsHook4 }: + +python3Packages.buildPythonApplication rec { + pname = "bada-bib"; + version = "0.6.0"; + format = "other"; + strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 + + src = fetchFromGitHub { + owner = "RogerCrocker"; + repo = "BadaBib"; + rev = "v${version}"; + sha256 = "sha256-gfZc3R8hrYy4Nco+XwG29lzZd537ByEgd3RL8h7f6DQ="; + }; + + nativeBuildInputs = [ + gettext + gobject-introspection + libxml2 + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + gdk-pixbuf + glib + gtk4 + ]; + + checkInputs = [ + appstream-glib + desktop-file-utils + ]; + + pythonPath = with python3Packages; [ + bibtexparser + pygobject3 + ]; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + dontWrapGApps = true; # Needs python wrapper + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" + ''; + + meta = with lib; { + homepage = "https://github.com/RogerCrocker/BadaBib"; + description = "A simple BibTeX Viewer and Editor"; + maintainers = [ maintainers.Cogitri ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 60f9810dfb6a..c41c8593a5c4 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -7,13 +7,13 @@ assert !cudaSupport || cudatoolkit != null; let boost_static = boost17x.override { enableStatic = true; }; in mkDerivation rec { - version = "3.6"; + version = "3.7"; pname = "colmap"; src = fetchFromGitHub { owner = "colmap"; repo = "colmap"; rev = version; - sha256 = "1kfivdmhpmdxjjf30rr57y2iy7xmdpg4h8aw3qgacv8ckfpgda3n"; + sha256 = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I="; }; buildInputs = [ @@ -30,7 +30,7 @@ mkDerivation rec { with a graphical and command-line interface. ''; homepage = "https://colmap.github.io/index.html"; - license = licenses.bsd2; + license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ lebastr ]; }; diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index 190ba1af23c1..b3647e0f1b60 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20220124184855"; + version = "3.1.20220221074232"; format = "setuptools"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = version; - sha256 = "0b0mxminfijbi3d9sslhwhs8awnagdsx8d2wh9x9ipdpwipihpmb"; + sha256 = "sha256-hUdwtqYHcfyJ68LzwwCXAxr7YIkJm64brb+kA/WJqU8="; }; postPatch = '' diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 783381f9db03..a907a5f8c169 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cytoscape"; - version = "3.9.0"; + version = "3.9.1"; src = fetchurl { url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz"; - sha256 = "sha256-7YDmojzQujHrsDuB7WC0C3Z2srTd9QUveh1baod3KvU="; + sha256 = "sha256-I4C2yGiIygnFUkRBC4LBSQFgjZlVKCoQGRphynVpscw="; }; patches = [ diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 974fd3ece45c..a3d6e1564666 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -1,12 +1,9 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2 , xylib, readline, gnuplot, swig3 }: -let - name = "fityk"; +stdenv.mkDerivation rec { + pname = "fityk"; version = "1.3.1"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; src = fetchFromGitHub { owner = "wojdyr"; diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix index 1430881a3f08..e5cc02edcfbe 100644 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ b/pkgs/applications/science/misc/foldingathome/control.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { installPhase = "cp -ar usr $out"; postFixup = '' - sed -e 's|/usr/bin|$out/bin|g' -i $out/share/applications/FAHControl.desktop + sed -e "s|/usr/bin|$out/bin|g" -i $out/share/applications/FAHControl.desktop wrapProgram "$out/bin/FAHControl" \ --suffix PATH : "${fahviewer.outPath}/bin" \ --set PYTHONPATH "$out/lib/python2.7/dist-packages" diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index 52ca9c9e623f..75e900a0a72c 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { unpackPhase = '' dpkg-deb -x ${src} ./ - sed -e 's|/usr/bin|$out/bin|g' -i usr/share/applications/FAHViewer.desktop + sed -e "s|/usr/bin|$out/bin|g" -i usr/share/applications/FAHViewer.desktop ''; installPhase = '' diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix deleted file mode 100644 index 9846be8a43a8..000000000000 --- a/pkgs/applications/science/misc/golly/beta.nix +++ /dev/null @@ -1,50 +0,0 @@ -{lib, stdenv, fetchgit -, wxGTK, perl, python2, zlib, libGLU, libGL, libX11 -, automake, autoconf -}: - -stdenv.mkDerivation rec { - pname = "golly"; - version = "2.8.99.2.20161122"; - #src = fetchurl { - # url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz"; - # sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204"; - #}; - src = fetchgit { - url = "git://git.code.sf.net/p/golly/code"; - rev = "93495edf3c9639332c6eb43ca7149c69629ee5d8"; - sha256 = "1j308s9zlqkr3wnl1l32s5zk7r3g4ijwawkkysl8j5ik9sibi2gk"; - }; - - setSourceRoot = '' - export sourceRoot="$(echo */gui-wx/configure)" - ''; - - nativeBuildInputs = [autoconf automake]; - - buildInputs = [ - wxGTK perl python2 zlib libGLU libGL libX11 - ]; - - # Link against Python explicitly as it is needed for scripts - makeFlags=[ - "AM_LDFLAGS=" - ]; - NIX_LDFLAGS="-l${python2.libPrefix} -lperl -ldl -lGL"; - preConfigure='' - export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE - -DPYTHON_SHLIB=$(basename "$( - readlink -f ${python2}/lib/libpython*.so)")" - - sh autogen.sh - ''; - - meta = { - description = "Cellular automata simulation program"; - license = lib.licenses.gpl2; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; - downloadPage = "https://sourceforge.net/projects/golly/files/golly"; - }; -} diff --git a/pkgs/applications/science/misc/golly/default.upstream b/pkgs/applications/science/misc/golly/default.upstream deleted file mode 100644 index e8ce81586a8d..000000000000 --- a/pkgs/applications/science/misc/golly/default.upstream +++ /dev/null @@ -1,5 +0,0 @@ -url https://sourceforge.net/projects/golly/files/golly/ -version_link '[-][0-9.]+/$' -SF_version_tarball 'src' -SF_redirect -minimize_overwrite diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix index b22c6294fba6..ed92dfb90dab 100644 --- a/pkgs/applications/science/misc/netlogo/default.nix +++ b/pkgs/applications/science/misc/netlogo/default.nix @@ -8,7 +8,7 @@ let icon = name; comment = "A multi-agent programmable modeling environment"; desktopName = "NetLogo"; - categories = "Science;"; + categories = [ "Science" ]; }; in diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 9962b1ce60f5..872438158d66 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { # Hardcode path to fix use with cmake sed -i cmake/scripts/ROOTConfig.cmake.in \ - -e 'iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' + -e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' patchShebangs build/unix/ '' + lib.optionalString noSplash '' @@ -120,7 +120,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Drpath=ON" - "-DCMAKE_CXX_STANDARD=17" "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" @@ -176,7 +175,8 @@ stdenv.mkDerivation rec { postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ - --prefix PYTHONPATH : "$out/lib" + --set PYTHONPATH "$out/lib" \ + --set ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH "$out/lib" done ''; diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index d12f9454ce7e..51dea2755785 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -1,70 +1,57 @@ -{ lib, fetchFromGitHub, gcc, python2 }: +{ lib +, python3 +, fetchFromGitHub +, which +, wrapQtAppsHook +}: -let - xhtml2pdf = import ./xhtml2pdf.nix { - inherit lib; - fetchPypi = python2.pkgs.fetchPypi; - buildPythonPackage = python2.pkgs.buildPythonPackage; - html5lib = python2.pkgs.html5lib; - httplib2 = python2.pkgs.httplib2; - nose = python2.pkgs.nose; - pillow = python2.pkgs.pillow; - pypdf2 = python2.pkgs.pypdf2; - reportlab = python2.pkgs.reportlab; - }; - -in - -python2.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "sasview"; - version = "4.2.0"; - - checkInputs = with python2.pkgs; [ - pytest - unittest-xml-reporting - ]; - - checkPhase = '' - # fix the following error: - # imported module 'sas.sascalc.data_util.uncertainty' has this __file__ attribute: - # /build/source/build/lib.linux-x86_64-2.7/sas/sascalc/data_util/uncertainty.py - # which is not the same as the test file we want to collect: - # /build/source/dist/tmpbuild/sasview/sas/sascalc/data_util/uncertainty.py - rm -r dist/tmpbuild - - HOME=$(mktemp -d) py.test - ''; - - propagatedBuildInputs = with python2.pkgs; [ - bumps - gcc - h5py - libxslt - lxml - matplotlib - numpy - pyparsing - periodictable - pillow - pylint - pyopencl - reportlab - sasmodels - scipy - six - sphinx - wxPython - xhtml2pdf - ]; + version = "5.0.4"; src = fetchFromGitHub { owner = "SasView"; repo = "sasview"; rev = "v${version}"; - sha256 = "0k3486h46k6406h0vla8h68fd78wh3dcaq5w6f12jh6g4cjxv9qa"; + hash = "sha256-TjcchqA6GCvkr59ZgDuGglan2RxLp+aMjJk28XhvoiY="; }; - patches = [ ./pyparsing-fix.patch ./local_config.patch ]; + nativeBuildInputs = [ + python3.pkgs.pyqt5 + wrapQtAppsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + bumps + h5py + lxml + periodictable + pillow + pyparsing + pyqt5 + qt5reactor + sasmodels + scipy + setuptools + xhtml2pdf + ]; + + postBuild = '' + ${python3.interpreter} src/sas/qtgui/convertUI.py + ''; + + dontWrapQtApps = true; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + unittest-xml-reporting + ]; + + pytestFlagsArray = [ "test" ]; meta = with lib; { homepage = "https://www.sasview.org"; diff --git a/pkgs/applications/science/misc/sasview/local_config.patch b/pkgs/applications/science/misc/sasview/local_config.patch deleted file mode 100644 index 5b6c3436494a..000000000000 --- a/pkgs/applications/science/misc/sasview/local_config.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/sas/_config.py b/src/sas/_config.py -index ece08fd4c..926768593 100644 ---- a/src/sas/_config.py -+++ b/src/sas/_config.py -@@ -67,8 +67,8 @@ def load_local_config(app_dir): - logger.info("GuiManager loaded %s", path) - return module - except Exception as exc: -- logger.critical("Error loading %s: %s", path, exc) -- sys.exit() -+ import sas.sasview.local_config -+ return sas.sasview.local_config - - def make_custom_config_path(user_dir): - """ -@@ -116,4 +116,4 @@ def load_custom_config(path): - - from sas.sasview import custom_config - logger.info("GuiManager custom_config defaults to sas.sasview.custom_config") -- return custom_config -\ No newline at end of file -+ return custom_config diff --git a/pkgs/applications/science/misc/sasview/pyparsing-fix.patch b/pkgs/applications/science/misc/sasview/pyparsing-fix.patch deleted file mode 100644 index c3cd164a899a..000000000000 --- a/pkgs/applications/science/misc/sasview/pyparsing-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 866ab7e36..78727b276 100755 ---- a/setup.py -+++ b/setup.py -@@ -401,7 +401,7 @@ package_data['sas.sasview'] = ['images/*', - packages.append("sas.sasview") - - required = [ -- 'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing>=2.0.0', -+ 'bumps>=0.7.5.9', 'periodictable>=1.5.0', - - # 'lxml>=2.2.2', - 'lxml', 'h5py', diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 23815442da7e..4867e6c9ed55 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, cmake, perl, python3, boost, valgrind -# Optional requirements -# Lua 5.3 needed and not available now -#, luaSupport ? false, lua5 +{ stdenv, lib, fetchFromGitLab, cmake, perl, python3, boost , fortranSupport ? false, gfortran -, buildDocumentation ? false, transfig, ghostscript, doxygen +, buildDocumentation ? false, fig2dev, ghostscript, doxygen , buildJavaBindings ? false, openjdk +, buildPythonBindings ? true, python3Packages , modelCheckingSupport ? false, libunwind, libevent, elfutils # Inside elfutils: libelf and libdw +, bmfSupport ? true, eigen +, minimalBindings ? false , debug ? false +, optimize ? (!debug) , moreTests ? false +, withoutBin ? false }: with lib; @@ -18,54 +20,36 @@ in stdenv.mkDerivation rec { pname = "simgrid"; - version = "3.28"; + version = "3.31"; src = fetchFromGitLab { domain = "framagit.org"; owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0vylwgd4i89bvhbgfay0wq953324dwfmmr8jp9b4vvlc9m0017r9"; + sha256 = "sha256-K6YkkCMxc2lqxHIwyuLiwcp3m49sqbEtOlwZh4L1YJg="; }; - patches = [ - (fetchpatch { - name = "fix-smpi-dirs-absolute.patch"; - url = "https://framagit.org/simgrid/simgrid/-/commit/71f01e667577be1076646eb841e0a57bd5388545.patch"; - sha256 = "0x3y324b6269687zfy43ilc48bwrs4nb7svh2mpg88lrz53rky15"; - }) - ]; - propagatedBuildInputs = [ boost ]; - nativeBuildInputs = [ cmake perl python3 valgrind ] - ++ optionals fortranSupport [ gfortran ] - ++ optionals buildJavaBindings [ openjdk ] - ++ optionals buildDocumentation [ transfig ghostscript doxygen ] - ++ optionals modelCheckingSupport [ libunwind libevent elfutils ]; + nativeBuildInputs = [ cmake perl python3 ] + ++ optionals fortranSupport [ gfortran ] + ++ optionals buildJavaBindings [ openjdk ] + ++ optionals buildPythonBindings [ python3Packages.pybind11 ] + ++ optionals buildDocumentation [ fig2dev ghostscript doxygen ] + ++ optionals bmfSupport [ eigen ] + ++ optionals modelCheckingSupport [ libunwind libevent elfutils ]; - #buildInputs = optional luaSupport lua5; + outputs = [ "out" ] + ++ optionals buildPythonBindings [ "python" ]; - # Make it so that libsimgrid.so will be found when running programs from - # the build dir. - preConfigure = '' - export LD_LIBRARY_PATH="$PWD/build/lib" - ''; - - # Release mode is not supported in SimGrid + # "Release" does not work. non-debug mode is Debug compiled with optimization cmakeBuildType = "Debug"; - - # Disable/Enable functionality - # Note: those packages are not packaged in Nixpkgs yet so some options - # are disabled: - # - papi: for enable_smpi_papi - # - ns3: for enable_ns3 - # - lua53: for enable_lua - # - # For more information see: - # https://simgrid.org/doc/3.22/Installing_SimGrid.html#simgrid-compilation-options) cmakeFlags = [ "-Denable_documentation=${optionOnOff buildDocumentation}" "-Denable_java=${optionOnOff buildJavaBindings}" + "-Denable_python=${optionOnOff buildPythonBindings}" + "-DSIMGRID_PYTHON_LIBDIR=./" # prevents CMake to install in ${python3} dir + "-Denable_msg=${optionOnOff buildJavaBindings}" "-Denable_fortran=${optionOnOff fortranSupport}" "-Denable_model-checking=${optionOnOff modelCheckingSupport}" "-Denable_ns3=off" @@ -75,27 +59,28 @@ stdenv.mkDerivation rec { "-Denable_mallocators=on" "-Denable_debug=on" "-Denable_smpi=on" + "-Dminimal-bindings=${optionOnOff minimalBindings}" "-Denable_smpi_ISP_testsuite=${optionOnOff moreTests}" "-Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests}" - "-Denable_compile_warnings=${optionOnOff debug}" - "-Denable_compile_optimizations=${optionOnOff (!debug)}" - "-Denable_lto=${optionOnOff (!debug)}" - # "-Denable_lua=${optionOnOff luaSupport}" - # "-Denable_smpi_papi=${optionOnOff moreTests}" + "-Denable_compile_warnings=off" + "-Denable_compile_optimizations=${optionOnOff optimize}" + "-Denable_lto=${optionOnOff optimize}" ]; - makeFlags = optional debug "VERBOSE=1"; - # Some Perl scripts are called to generate test during build which - # is before the fixupPhase, so do this manualy here: + # needed to run tests and to ensure correct shabangs in output scripts preBuild = '' patchShebangs .. ''; - doCheck = true; + # needed by tests (so libsimgrid.so is found) + preConfigure = '' + export LD_LIBRARY_PATH="$PWD/build/lib" + ''; - # Prevent the execution of tests known to fail. + doCheck = true; preCheck = '' + # prevent the execution of tests known to fail cat <CTestCustom.cmake SET(CTEST_CUSTOM_TESTS_IGNORE smpi-replay-multiple) EOW @@ -104,6 +89,20 @@ stdenv.mkDerivation rec { make tests -j $NIX_BUILD_CORES ''; + postInstall = lib.optionalString withoutBin '' + # remove bin from output if requested. + # having a specific bin output would be cleaner but it does not work currently (circular references) + rm -rf $out/bin + '' + lib.optionalString buildPythonBindings '' + # manually install the python binding if requested. + mkdir -p $python/lib/python${lib.versions.majorMinor python3.version}/site-packages/ + cp ./lib/simgrid.cpython*.so $python/lib/python${lib.versions.majorMinor python3.version}/site-packages/ + ''; + + # improve debuggability if requested + hardeningDisable = lib.optionals debug [ "fortify" ]; + dontStrip = debug; + meta = { description = "Framework for the simulation of distributed applications"; longDescription = '' @@ -118,5 +117,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ mickours mpoquet ]; platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 40c102fc6822..f4a3da9711dd 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -1,8 +1,8 @@ -{ lib, python3Packages }: +{ lib, python3Packages, fetchFromGitHub }: python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "6.10.0"; + version = "6.15.5"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -29,12 +29,31 @@ python3Packages.buildPythonApplication rec { wrapt ]; - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "199a86c8d1fcfdb88c4271a1507b0ab371a15bc407f2dad9b0ab8c43438adff8"; + src = fetchFromGitHub { + owner = "snakemake"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-i8C7gPLzUzSxNH9xwpr+fUKI1SvpYFsFBlspS74LoWU="; }; - doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json + # See + # https://github.com/snakemake/snakemake/blob/main/.github/workflows/main.yml#L99 + # for the current basic test suite. Tibanna and Tes require extra + # setup. + + checkInputs = with python3Packages; [ + pandas + pytestCheckHook + requests-mock + ]; + + disabledTestPaths = [ + "tests/test_tes.py" + "tests/test_tibanna.py" + "tests/test_linting.py" + ]; + + pythonImportsCheck = [ "snakemake" ]; meta = with lib; { homepage = "https://snakemake.github.io"; diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 1dfd47a3d381..87a05f146e9e 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,19 +1,20 @@ -{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4 -, cmake, makeWrapper, libjpeg, python2 }: +{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew +, qtbase, wrapQtAppsHook, python3 +, cmake, libjpeg }: -let version = "5.2.1"; in stdenv.mkDerivation rec { pname = "tulip"; - inherit version; + version = "5.6.1"; src = fetchurl { url = "mirror://sourceforge/auber/${pname}-${version}_src.tar.gz"; - sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky"; + sha256 = "1fy3nvgxv3igwc1d23zailcgigj1d0f2kkh7a5j24c0dyqz5zxmw"; }; - buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python2 ]; + buildInputs = [ libxml2 freetype glew libGLU libGL libjpeg qtbase python3 ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; - nativeBuildInputs = [ cmake makeWrapper ]; + qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ]; # FIXME: "make check" needs Docbook's DTD 4.4, among other things. doCheck = false; diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index dd4bb6ef1425..69810f95b846 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "gromacs"; - version = "2021.5"; + version = "2022"; src = fetchurl { url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz"; - sha256 = "1dh9l2gcv61h1r6qsg8vr3k1xp8jgd27czzg24kzf4k823k3z9pb"; + sha256 = "0s1bv8nvmdpiyk2yhcmzq8q936hm5jgnqb393101drh2dih0vmps"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/physics/shtns/default.nix b/pkgs/applications/science/physics/shtns/default.nix new file mode 100644 index 000000000000..a720213b3913 --- /dev/null +++ b/pkgs/applications/science/physics/shtns/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchgit, fftw }: + +stdenv.mkDerivation rec { + pname = "shtns"; + version = "3.5.1"; + + src = fetchgit { + url = "https://bitbucket.org/nschaeff/shtns"; + rev = "v${version}"; + sha256 = "1ajrplhv7a2dvb3cn3n638281w0bzdcydvvwbg64awbjg622mdpd"; + }; + + buildInputs = [ fftw ]; + + meta = with lib; { + description = "High performance library for Spherical Harmonic Transform"; + homepage = "https://nschaeff.bitbucket.io/shtns/"; + license = licenses.cecill21; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/programming/groove/default.nix b/pkgs/applications/science/programming/groove/default.nix index 86d77072ee8c..f4c323defd6f 100644 --- a/pkgs/applications/science/programming/groove/default.nix +++ b/pkgs/applications/science/programming/groove/default.nix @@ -7,7 +7,7 @@ let icon = "groove"; desktopName = "GROOVE Simulator"; comment = "GRaphs for Object-Oriented VErification"; - categories = "Science;ComputerScience;"; + categories = [ "Science" "ComputerScience" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/robotics/inav-configurator/default.nix b/pkgs/applications/science/robotics/inav-configurator/default.nix index 40914a8ac1a5..ec605a3a97e9 100644 --- a/pkgs/applications/science/robotics/inav-configurator/default.nix +++ b/pkgs/applications/science/robotics/inav-configurator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "inav-configurator"; - version = "3.0.2"; + version = "4.1.0"; src = fetchurl { url = "https://github.com/iNavFlight/inav-configurator/releases/download/${version}/INAV-Configurator_linux64_${version}.tar.gz"; - sha256 = "0v6dcg634wpp9q4ya3mj00j3pg25g62aq209iq2dsvj0a03afbp2"; + sha256 = "sha256-+rPzytnAQcNGbISFBHb4JS9Nqy0C2i36k+EPBvq/mso="; }; icon = fetchurl { diff --git a/pkgs/applications/science/robotics/mission-planner/default.nix b/pkgs/applications/science/robotics/mission-planner/default.nix index 3dbb1a4bf5af..3f0a6a6cde50 100644 --- a/pkgs/applications/science/robotics/mission-planner/default.nix +++ b/pkgs/applications/science/robotics/mission-planner/default.nix @@ -12,11 +12,11 @@ let }; in stdenv.mkDerivation rec { inherit pname; - version = "1.3.74"; + version = "1.3.76"; src = fetchurl { url = "https://firmware.ardupilot.org/Tools/MissionPlanner/MissionPlanner-${version}.zip"; - sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x"; + sha256 = "sha256-vdunUGwLjDKf1LDhtyTQAExddecyWc1TdZOyuu0qMlk="; }; nativeBuildInputs = [ makeWrapper mono unzip ]; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 76d2318cead4..afd05c3e8f71 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.1.4"; + version = "4.2.0"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -29,6 +29,8 @@ mkDerivation rec { "CONFIG+=StableBuild" # Default install tries to copy Qt files into package "CONFIG+=QGC_DISABLE_BUILD_SETUP" + # Tries to download x86_64-only prebuilt binaries + "DEFINES+=DISABLE_AIRMAP" "../qgroundcontrol.pro" ]; @@ -62,13 +64,13 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "0lhc36jpy7a5bnysqi574nk5izglj557mf8n9lcsgvzwxlkb2rbf"; + sha256 = "sha256-TBnJQKO9cwxP9q+bIB1CaGnm9npymJ3iEAD9kPJi9JA="; fetchSubmodules = true; }; meta = with lib; { description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; - homepage = "http://qgroundcontrol.org/"; + homepage = "http://qgroundcontrol.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ lopsided98 ]; diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 653d727525e8..5de6e1165dc4 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "1fv98yz9393ddp0k96bwbgccy6x9dmmg8g1pjd3xs6m4c1bnvfc7"; + sha256 = "sha256-qwx60cp3Q6PL1iwRP+M9Rtmxcis0EByi8fk13H4cXfc="; fetchSubmodules = true; }; @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stsdc/monitor"; maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; mainProgram = "com.github.stsdc.monitor"; }; } diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 78c6c0988c57..e6762f543cb9 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , rustPlatform +, nixosTests , cmake , gzip @@ -54,16 +55,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-eVPy47T2wcsN7NxtwMoyuC6loBVXsoJjJ/2q31i3vxQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Q/ulRgU6zNLRZUjL83O/Krx85voPWZPZDo65CLp/aOg="; }; - cargoSha256 = "sha256-RY+qidm7NZFKq6P8qVaMpxYfTfHpZac2YJwuNbOJwoM="; + cargoSha256 = "sha256-S1V8hDuzp4sf6945gqs8QNVdu8jwPGVYjVbV6EY28Hk="; nativeBuildInputs = [ cmake @@ -132,6 +133,8 @@ rustPlatform.buildRustPackage rec { dontPatchELF = true; + passthru.tests.test = nixosTests.terminal-emulators.alacritty; + meta = with lib; { description = "A cross-platform, GPU-accelerated terminal emulator"; homepage = "https://github.com/alacritty/alacritty"; diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index 6ef16a5b9e48..d0def97e46f3 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, freetype, libGL, pcre, nixosTests }: mkDerivation rec { pname = "contour"; @@ -16,6 +16,8 @@ mkDerivation rec { buildInputs = [ freetype libGL pcre ]; + passthru.tests.test = nixosTests.terminal-emulators.contour; + meta = with lib; { description = "Modern C++ Terminal Emulator"; homepage = "https://github.com/christianparpart/contour"; diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 049452c7e3ad..4243502e7fe9 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, mkDerivation, qtbase, qtquick1, qmltermwidget -, qtquickcontrols, qtgraphicaleffects, qmake }: +, qtquickcontrols, qtgraphicaleffects, qmake, nixosTests }: mkDerivation rec { version = "1.1.1"; @@ -29,6 +29,8 @@ mkDerivation rec { ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term ''; + passthru.tests.test = nixosTests.terminal-emulators.cool-retro-term; + meta = { description = "Terminal emulator which mimics the old cathode display"; longDescription = '' diff --git a/pkgs/applications/terminal-emulators/ctx/default.nix b/pkgs/applications/terminal-emulators/ctx/default.nix index 78c673d035a0..420e9b020e99 100644 --- a/pkgs/applications/terminal-emulators/ctx/default.nix +++ b/pkgs/applications/terminal-emulators/ctx/default.nix @@ -8,6 +8,7 @@ , libdrm # Not documented , pkg-config , enableFb ? false +, nixosTests }: stdenv.mkDerivation rec { @@ -43,6 +44,8 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder "out"}" ]; + passthru.tests.test = nixosTests.terminal-emulators.ctx; + meta = with lib; { homepage = "https://ctx.graphics/"; description = "Vector graphics terminal"; diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix index f63232949501..17af8457cb10 100644 --- a/pkgs/applications/terminal-emulators/darktile/default.nix +++ b/pkgs/applications/terminal-emulators/darktile/default.nix @@ -12,6 +12,7 @@ , libXext , libXxf86vm , libGL +, nixosTests }: stdenv.mkDerivation rec { @@ -57,6 +58,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests.test = nixosTests.terminal-emulators.darktile; + meta = with lib; { description = "A GPU rendered terminal emulator designed for tiling window managers"; homepage = "https://github.com/liamg/darktile"; diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix index b5ca8b889592..769104fea431 100644 --- a/pkgs/applications/terminal-emulators/eterm/default.nix +++ b/pkgs/applications/terminal-emulators/eterm/default.nix @@ -8,6 +8,7 @@ , libXext , libast , pkg-config +, nixosTests }: stdenv.mkDerivation rec { @@ -33,8 +34,10 @@ stdenv.mkDerivation rec { libast ]; + passthru.tests.test = nixosTests.terminal-emulators.eterm; + meta = with lib; { - homepage = "http://www.eterm.org"; + homepage = "https://github.com/mej/Eterm"; # http://www.eterm.org is gone description = "Terminal emulator"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 591b16ee8226..41154cc1034f 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.10.3"; + version = "1.11.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = pname; rev = version; - sha256 = "13v6xqaw3xn1x84dn4gnkiimcsllb19mrbvcdj2fnm8klnrys3gs"; + sha256 = "1d9bk8lhmw5lc8k0mw80g0vbwgxyh3gw5c7ppy3sir07s9y0y0fn"; }; depsBuildBuild = [ @@ -163,6 +163,7 @@ stdenv.mkDerivation rec { # make sure there is _some_ profiling data on all binaries ./footclient --version ./foot --version + ./tests/test-config # generate pgo data of wayland independent code ./pgo ${stimuliFile} ${stimuliFile} ${stimuliFile} meson configure -Db_pgo=use diff --git a/pkgs/applications/terminal-emulators/germinal/default.nix b/pkgs/applications/terminal-emulators/germinal/default.nix index 1bbe87853f75..aef24f675b1a 100644 --- a/pkgs/applications/terminal-emulators/germinal/default.nix +++ b/pkgs/applications/terminal-emulators/germinal/default.nix @@ -9,6 +9,7 @@ , tmux , vte , wrapGAppsHook +, nixosTests }: stdenv.mkDerivation rec { @@ -45,6 +46,8 @@ stdenv.mkDerivation rec { runHook postFixup ''; + passthru.tests.test = nixosTests.terminal-emulators.germinal; + meta = with lib; { description = "A minimal terminal emulator"; homepage = "https://github.com/Keruspe/Germinal"; diff --git a/pkgs/applications/terminal-emulators/gnome-console/default.nix b/pkgs/applications/terminal-emulators/gnome-console/default.nix new file mode 100644 index 000000000000..9b4b460550ff --- /dev/null +++ b/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchurl +, gettext +, gnome +, libgtop +, gtk3 +, libhandy +, pcre2 +, vte +, appstream-glib +, desktop-file-utils +, git +, meson +, ninja +, pkg-config +, python3 +, sassc +, wrapGAppsHook +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "gnome-console"; + version = "42.beta"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "Lq/shyAhDcwB5HqpihvGx2+xwVU2Xax7/NerFwR36DQ="; + }; + + buildInputs = [ + gettext + libgtop + gnome.nautilus + gtk3 + libhandy + pcre2 + vte + ]; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + git + meson + ninja + pkg-config + python3 + sassc + wrapGAppsHook + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + + passthru.tests.test = nixosTests.terminal-emulators.kgx; + + meta = with lib; { + description = "Simple user-friendly terminal emulator for the GNOME desktop"; + homepage = "https://gitlab.gnome.org/GNOME/console"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ zhaofengli ]); + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index 8c4c6b383d56..cc2dc5c55d61 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -10,6 +10,7 @@ , libutempter , vte , libwnck +, nixosTests }: python3.pkgs.buildPythonApplication rec { @@ -66,6 +67,8 @@ python3.pkgs.buildPythonApplication rec { gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}") ''; + passthru.tests.test = nixosTests.terminal-emulators.guake; + meta = with lib; { description = "Drop-down terminal for GNOME"; homepage = "http://guake-project.org"; diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 0b8ca7f40d72..485c1dead14c 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -2,7 +2,7 @@ , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver, libxcb, nss, nspr , alsa-lib, cups, expat, udev, libpulseaudio, at-spi2-atk, at-spi2-core, libxshmfence -, libdrm, libxkbcommon, mesa }: +, libdrm, libxkbcommon, mesa, nixosTests}: let libPath = lib.makeLibraryPath [ @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "hyper"; - version = "3.1.5"; + version = "3.2.0"; src = fetchurl { url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb"; - sha256 = "sha256-Pgu09QvP1PnZ13omQlQLVHr3NayhFaQndmsQdLM+W90="; + sha256 = "1ryw3315x0lb60j8nzz78h7zd36r2l1j39hnlfav0p7nq8dhqbpm"; }; nativeBuildInputs = [ dpkg ]; @@ -43,11 +43,13 @@ stdenv.mkDerivation rec { --replace "/opt/Hyper/hyper" "hyper" ''; + passthru.tests.test = nixosTests.terminal-emulators.hyper; + dontPatchELF = true; meta = with lib; { description = "A terminal built on web technologies"; homepage = "https://hyper.is/"; - maintainers = with maintainers; [ puffnfresh ]; + maintainers = with maintainers; [ puffnfresh fabiangd ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index 4c46bcc6c3fc..e8fbb8cb9fa9 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -1,48 +1,42 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ fetchzip, lib, stdenvNoCC }: /* - This derivation is impure: it relies on an Xcode toolchain being installed - and available in the expected place. The values of sandboxProfile - are copied pretty directly from the MacVim derivation, which - is also impure. In order to build you at least need the `sandbox` - option set to `relaxed` or `false`. + This cannot be built from source as it requires entitlements and + for that it needs to be code signed. Automatic updates will have + to be disabled via preferences instead of at build time. To do + that edit $HOME/Library/Preferences/com.googlecode.iterm2.plist + and add: + SUEnableAutomaticChecks = 0; */ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.14"; + version = "3.4.15"; - src = fetchFromGitHub { - owner = "gnachman"; - repo = "iTerm2"; - rev = "v${version}"; - sha256 = "sha256-sDCnBO7xDpecu2cSjpHwync2DVsj9EKUmgpqEVLtxRM="; + src = fetchzip { + url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; + sha256 = "sha256-ZE/uYBKB2popdIdZWA8AvyJiwMzt32u6u/H/AyNcoVo="; }; - patches = [ ./disable_updates.patch ]; - postPatch = '' - sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj - ''; - - preConfigure = "LD=$CC"; - makeFlagsArray = ["Nix"]; installPhase = '' - mkdir -p $out/Applications - mv Build/Products/Deployment/iTerm2.app $out/Applications/iTerm.app - ''; - - sandboxProfile = '' - (allow file-read* file-write* process-exec mach-lookup) - ; block homebrew dependencies - (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log)) + runHook preInstall + APP_DIR="$out/Applications/iTerm2.app" + mkdir -p "$APP_DIR" + cp -r . "$APP_DIR" + mkdir -p "$out/bin" + cat << EOF > "$out/bin/iterm2" + #!${stdenvNoCC.shell} + open -na "$APP_DIR" --args "$@" + EOF + chmod +x "$out/bin/iterm2" + runHook postInstall ''; meta = with lib; { description = "A replacement for Terminal and the successor to iTerm"; homepage = "https://www.iterm2.com/"; license = licenses.gpl2; - maintainers = with maintainers; [ tricktron ]; - platforms = platforms.darwin; - hydraPlatforms = []; + maintainers = with maintainers; [ steinybot tricktron ]; + platforms = [ "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix b/pkgs/applications/terminal-emulators/kermit-terminal/default.nix new file mode 100644 index 000000000000..da5342aa683f --- /dev/null +++ b/pkgs/applications/terminal-emulators/kermit-terminal/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtk3 +, pcre +, pkg-config +, vte +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "kermit"; + version = "3.7"; + + src = fetchFromGitHub { + name = "${pname}-${version}-src"; + owner = "orhun"; + repo = pname; + rev = version; + hash = "sha256-O5jpiQ+aaOTPst4/Z+H5e7ylA8CNBevqNoH50p4uEA4="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + gtk3 + pcre + vte + ]; + + passthru.tests.test = nixosTests.terminal-emulators.kermit; + + meta = with lib; { + homepage = "https://github.com/orhun/kermit"; + description = "A VTE-based, simple and froggy terminal emulator"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/applications/terminal-emulators/kgx/default.nix b/pkgs/applications/terminal-emulators/kgx/default.nix deleted file mode 100644 index dc5c651d50a5..000000000000 --- a/pkgs/applications/terminal-emulators/kgx/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, genericBranding ? false -, fetchFromGitLab -, gettext -, gnome -, libgtop -, gtk3 -, libhandy -, pcre2 -, vte -, appstream-glib -, desktop-file-utils -, git -, meson -, ninja -, pkg-config -, python3 -, sassc -, wrapGAppsHook -}: - -stdenv.mkDerivation { - pname = "kgx"; - version = "unstable-2021-03-13"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "ZanderBrown"; - repo = "kgx"; - rev = "105adb6a8d09418a3ce622442aef6ae623dee787"; - sha256 = "0m34y0nbcfkyicb40iv0iqaq6f9r3f66w43lr803j3351nxqvcz2"; - }; - - buildInputs = [ - gettext - libgtop - gnome.nautilus - gtk3 - libhandy - pcre2 - vte - ]; - - nativeBuildInputs = [ - appstream-glib - desktop-file-utils - git - meson - ninja - pkg-config - python3 - sassc - wrapGAppsHook - ]; - - mesonFlags = lib.optional genericBranding "-Dgeneric=true"; - - postPatch = '' - chmod +x build-aux/meson/postinstall.py - patchShebangs build-aux/meson/postinstall.py - ''; - - preFixup = '' - substituteInPlace $out/share/applications/org.gnome.zbrown.KingsCross.desktop \ - --replace "Exec=kgx" "Exec=$out/bin/kgx" - ''; - - meta = with lib; { - description = "Simple user-friendly terminal emulator for the GNOME desktop"; - homepage = "https://gitlab.gnome.org/ZanderBrown/kgx"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ zhaofengli ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index d79ce43bdff6..d06c6d937c11 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,36 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring, - harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel, - libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, - libxkbcommon, libXi, libXext, wayland-protocols, wayland, - lcms2, - librsync, - installShellFiles, - dbus, - darwin, - Cocoa, - CoreGraphics, - Foundation, - IOKit, - Kernel, - OpenGL, - libcanberra, - libicns, - libpng, - python3, - zlib, +{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring +, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel +, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor +, libxkbcommon, libXi, libXext, wayland-protocols, wayland +, lcms2 +, librsync +, installShellFiles +, dbus +, darwin +, Cocoa +, CoreGraphics +, Foundation +, IOKit +, Kernel +, OpenGL +, libcanberra +, libicns +, libpng +, python3 +, zlib +, bashInteractive +, zsh +, fish +, fetchpatch +, nixosTests }: with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.24.1"; + version = "0.24.4"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-WPkyub7CwNXRksUmqiZeznnSqEPFpyHTeFLQ+D4Fb5c="; + sha256 = "sha256-c6XM/xeGZ68srf8xQJA1iYCUR3kXNceTMxsZAnbFmug="; }; buildInputs = [ @@ -74,6 +79,19 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" "shell_integration" ]; + patches = [ + (fetchpatch { + name = "fix-zsh-completion-test-1.patch"; + url = "https://github.com/kovidgoyal/kitty/commit/297592242c290a81ca4ba08802841f4c33a4de25.patch"; + sha256 = "sha256-/V6y/4AaJsZvx1KS5UFZ+0zyAoZuLgbgFORZ1dX/1qE="; + }) + (fetchpatch { + name = "fix-zsh-completion-test-2.patch"; + url = "https://github.com/kovidgoyal/kitty/commit/d8ed42ae8e014d9abf9550a65ae203468f8bfa43.patch"; + sha256 = "sha256-Azgzqf5atW999FVn9rSGKMyZLsI692dYXhJPx07GBO0="; + }) + ]; + # Causes build failure due to warning hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; @@ -101,7 +119,14 @@ buildPythonApplication rec { runHook postBuild ''; - checkInputs = [ pillow ]; + checkInputs = [ + pillow + + # Shells needed for shell integration tests + bashInteractive + zsh + fish + ]; checkPhase = let buildBinPath = @@ -132,9 +157,9 @@ buildPythonApplication rec { wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick xsel ncurses.dev ]}" installShellCompletion --cmd kitty \ - --bash <("$out/bin/kitty" + complete setup bash) \ - --fish <("$out/bin/kitty" + complete setup fish) \ - --zsh <("$out/bin/kitty" + complete setup zsh) + --bash <("$out/bin/kitty" +complete setup bash) \ + --fish <("$out/bin/kitty" +complete setup fish2) \ + --zsh <("$out/bin/kitty" +complete setup zsh) terminfo_src=${if stdenv.isDarwin then ''"$out/Applications/kitty.app/Contents/Resources/terminfo"'' @@ -152,6 +177,8 @@ buildPythonApplication rec { runHook postInstall ''; + passthru.tests.test = nixosTests.terminal-emulators.kitty; + meta = with lib; { homepage = "https://github.com/kovidgoyal/kitty"; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; diff --git a/pkgs/applications/terminal-emulators/lxterminal/default.nix b/pkgs/applications/terminal-emulators/lxterminal/default.nix index 25495a686834..13f4e3c4119e 100644 --- a/pkgs/applications/terminal-emulators/lxterminal/default.nix +++ b/pkgs/applications/terminal-emulators/lxterminal/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook -, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs +, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs, nixosTests }: stdenv.mkDerivation rec { @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.test = nixosTests.terminal-emulators.lxterminal; + meta = { description = "The standard terminal emulator of LXDE"; longDescription = '' diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 48c4f6f2c4d7..056a24138441 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, autoconf, makeDesktopItem +{ stdenv, lib, fetchFromGitHub, pkg-config, autoconf, makeDesktopItem, nixosTests , libX11, gdk-pixbuf, cairo, libXft, gtk3, vte , harfbuzz #substituting glyphs with opentype fonts , fribidi, m17n_lib #bidi and encoding @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "arakiken"; repo = pname; - rev = "rel-${lib.replaceStrings [ "." ] [ "_" ] version}"; # 3.9.1 -> rel-3_9_1 + rev = version; sha256 = "sha256-DvGR3rDegInpnLp3H+rXNXktCGhpjsBBPTRMwodeTro="; }; @@ -106,12 +106,12 @@ stdenv.mkDerivation rec { comment = "Terminal emulator"; desktopName = "mlterm"; genericName = "Terminal emulator"; - categories = lib.concatStringsSep ";" [ - "Application" "System" "TerminalEmulator" - ]; - startupNotify = "false"; + categories = [ "Application" "System" "TerminalEmulator" ]; + startupNotify = false; }; + passthru.tests.test = nixosTests.terminal-emulators.mlterm; + meta = with lib; { description = "Multi Lingual TERMinal emulator"; homepage = "http://mlterm.sourceforge.net/"; diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index ba6c6ab87c15..006616bd944c 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -10,6 +10,7 @@ , freetype , pkg-config , which +, nixosTests }: stdenv.mkDerivation rec { @@ -38,6 +39,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2"; ''; + passthru.tests.test = nixosTests.terminal-emulators.mrxvt; + meta = with lib; { description = "Lightweight multitabbed feature-rich X11 terminal emulator"; longDescription = " diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index da9bfac952b5..7444a8627b79 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -1,18 +1,18 @@ { at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, libepoxy, fetchFromGitHub , glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs , libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 -, pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto +, pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto, nixosTests }: stdenv.mkDerivation rec { pname = "roxterm"; - version = "3.11.1"; + version = "3.12.1"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; rev = version; - sha256 = "1n7588bl83sp51jwjq97f526c7fkh0kq90idw3nayb4zmi530irx"; + sha256 = "sha256-jVcf/nrEq8dM8rw40ZhXGJjt3DQLroCePtIAdAsVIfs="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { libsepol libxkbcommon libepoxy at-spi2-core libXtst libtasn1 p11-kit ]; + passthru.tests.test = nixosTests.terminal-emulators.roxterm; + meta = with lib; { homepage = "https://github.com/realh/roxterm"; license = licenses.gpl3; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix index 88dae0a34ff5..7824fa2a814b 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, xrdb, xlsfonts }: stdenv.mkDerivation rec { - name = "urxvt-font-size"; + pname = "urxvt-font-size"; version = "1.3"; src = fetchFromGitHub { diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index 70ff4a4555d7..0eccceb5a4f6 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem +{ lib, stdenv, fetchurl, fetchpatch, makeDesktopItem , libX11, libXt, libXft, libXrender , ncurses, fontconfig, freetype , pkg-config, gdk-pixbuf, perl @@ -6,6 +6,8 @@ , perlSupport ? true , gdkPixbufSupport ? true , unicode3Support ? true +, emojiSupport ? false +, nixosTests }: let @@ -20,8 +22,15 @@ let comment = description; desktopName = "URxvt"; genericName = pname; - categories = "System;TerminalEmulator;"; + categories = [ "System" "TerminalEmulator" ]; }; + + fetchPatchFromAUR = { package, name, rev, sha256 }: + fetchpatch rec { + url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=${package}&id=${rev}"; + extraPrefix = ""; + inherit name sha256; + }; in with lib; @@ -44,18 +53,33 @@ stdenv.mkDerivation { outputs = [ "out" "terminfo" ]; - patches = [ + patches = (if emojiSupport then [ + # the required patches to libXft are in nixpkgs by default, see + # ../../../servers/x11/xorg/overrides.nix + (fetchPatchFromAUR { + name = "enable-wide-glyphs.patch"; + package = "rxvt-unicode-truecolor-wide-glyphs"; + rev = "69701a09c2c206233952b84bc966407f6774f1dc"; + sha256 = "0jfcj0ahky4dxdfrhqvh1v83mblhf5nak56dk1vq3bhyifdg7ffq"; + }) + (fetchPatchFromAUR { + name = "improve-font-rendering.patch"; + package = "rxvt-unicode-truecolor-wide-glyphs"; + rev = "69701a09c2c206233952b84bc966407f6774f1dc"; + sha256 = "1jj5ai2182nq912279adihi4zph1w4dvbdqa1pwacy4na6y0fz9y"; + }) + ] else [ ./patches/9.06-font-width.patch + ]) ++ [ ./patches/256-color-resources.patch - ] ++ optional stdenv.isDarwin ./patches/makefile-phony.patch; - + ]++ optional stdenv.isDarwin ./patches/makefile-phony.patch; configureFlags = [ "--with-terminfo=${placeholder "terminfo"}/share/terminfo" "--enable-256-color" (enableFeature perlSupport "perl") (enableFeature unicode3Support "unicode3") - ]; + ] ++ optional emojiSupport "--enable-wide-glyphs"; LDFLAGS = [ "-lfontconfig" "-lXrender" "-lpthread" ]; CFLAGS = [ "-I${freetype.dev}/include/freetype2" ]; @@ -79,6 +103,8 @@ stdenv.mkDerivation { cp -r ${desktopItem}/share/applications/ $out/share/ ''; + passthru.tests.test = nixosTests.terminal-emulators.urxvt; + meta = { inherit description; homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix index 5255d40b9ce2..9fe78e30ae3d 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix @@ -5,6 +5,7 @@ , rxvt-unicode-unwrapped , rxvt-unicode-plugins , perlPackages +, nixosTests , configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; extraDeps = [ ]; @@ -51,7 +52,10 @@ let --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" ''; - passthru.plugins = plugins; + passthru = { + plugins = plugins; + tests.test = nixosTests.terminal-emulators.urxvt; + }; }; in diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix index 8434c233ad4b..52b35ad38ae7 100644 --- a/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/pkgs/applications/terminal-emulators/sakura/default.nix @@ -9,6 +9,7 @@ , perl , pkg-config , vte +, nixosTests }: stdenv.mkDerivation rec { @@ -43,6 +44,8 @@ stdenv.mkDerivation rec { --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ ''; + passthru.tests.test = nixosTests.terminal-emulators.sakura; + meta = with lib; { homepage = "https://www.pleyades.net/david/projects/sakura"; description = "A terminal emulator based on GTK and VTE"; diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index 35baec9d0e44..efbdc040589f 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -11,6 +11,7 @@ , conf ? null , patches ? [ ] , extraLibs ? [ ] +, nixosTests }: stdenv.mkDerivation rec { @@ -55,6 +56,8 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; + passthru.tests.test = nixosTests.terminal-emulators.st; + meta = with lib; { homepage = "https://st.suckless.org/"; description = "Simple Terminal for X from Suckless.org Community"; diff --git a/pkgs/applications/terminal-emulators/stupidterm/default.nix b/pkgs/applications/terminal-emulators/stupidterm/default.nix index 554d210fbdea..279af55254e0 100644 --- a/pkgs/applications/terminal-emulators/stupidterm/default.nix +++ b/pkgs/applications/terminal-emulators/stupidterm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, vte, gtk, pcre2 }: +{ lib, stdenv, fetchFromGitHub, pkg-config, vte, gtk, pcre2, nixosTests }: stdenv.mkDerivation { pname = "stupidterm"; @@ -26,6 +26,8 @@ stdenv.mkDerivation { --replace "Exec=st" "Exec=$out/bin/stupidterm" ''; + passthru.tests.test = nixosTests.terminal-emulators.stupidterm; + meta = with lib; { description = "Simple wrapper around the VTE terminal emulator widget for GTK"; homepage = "https://github.com/esmil/stupidterm"; diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 67c7196e24da..04d4af0ccaf0 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -9,6 +9,7 @@ , libnotify , wrapGAppsHook , vte +, nixosTests }: python3.pkgs.buildPythonApplication rec { @@ -62,6 +63,8 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru.tests.test = nixosTests.terminal-emulators.terminator; + meta = with lib; { description = "Terminal emulator with support for tiling and tabs"; longDescription = '' diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix index 96fd3409dc7a..2b05ecdc7221 100644 --- a/pkgs/applications/terminal-emulators/termite/default.nix +++ b/pkgs/applications/terminal-emulators/termite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook, nixosTests }: let @@ -57,7 +57,10 @@ in stdenv.mkDerivation rec { outputs = [ "out" "terminfo" ]; - passthru = { inherit vte-ng; }; + passthru = { + inherit vte-ng; + tests = nixosTests.terminal-emulators.termite; + }; postInstall = '' mkdir -p $terminfo/share diff --git a/pkgs/applications/terminal-emulators/termonad/default.nix b/pkgs/applications/terminal-emulators/termonad/default.nix index 6a1dd0bec398..efddfa454668 100644 --- a/pkgs/applications/terminal-emulators/termonad/default.nix +++ b/pkgs/applications/terminal-emulators/termonad/default.nix @@ -1,9 +1,10 @@ -{ stdenv, haskellPackages, makeWrapper, packages ? (pkgSet: []) }: +{ stdenv, haskellPackages, makeWrapper, packages ? (pkgSet: []), nixosTests }: let termonadEnv = haskellPackages.ghcWithPackages (self: [ self.termonad ] ++ packages self); in stdenv.mkDerivation { - name = "termonad-with-packages-${termonadEnv.version}"; + pname = "termonad-with-packages"; + inherit (termonadEnv) version; nativeBuildInputs = [ makeWrapper ]; @@ -17,6 +18,8 @@ in stdenv.mkDerivation { preferLocalBuild = true; allowSubstitutes = false; + passthru.tests.test = nixosTests.terminal-emulators.termonad; + meta = haskellPackages.termonad.meta // { mainProgram = "termonad"; }; diff --git a/pkgs/applications/terminal-emulators/tilda/default.nix b/pkgs/applications/terminal-emulators/tilda/default.nix index 1ea50cfff7a1..01cc4f527a91 100644 --- a/pkgs/applications/terminal-emulators/tilda/default.nix +++ b/pkgs/applications/terminal-emulators/tilda/default.nix @@ -9,6 +9,7 @@ , pcre2 , vte , makeWrapper +, nixosTests }: stdenv.mkDerivation rec { @@ -42,6 +43,8 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; + passthru.tests.test = nixosTests.terminal-emulators.tilda; + meta = with lib; { description = "A Gtk based drop down terminal for Linux and Unix"; homepage = "https://github.com/lanoxx/tilda/"; diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index c217ae7f991d..917b179490c6 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -17,17 +17,18 @@ , wrapGAppsHook , libunwind , appstream +, nixosTests }: stdenv.mkDerivation rec { pname = "tilix"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; rev = version; - sha256 = "sha256:020gr4q7kmqq8vnsh8rw97gf1p2n1yq4d7ncyjjh9l13zkaxqqv9"; + sha256 = "sha256-sPVL5oYDOmloRVm/nONKkC20vZc907c7ixBF6E2PQ8Y="; }; # Default upstream else LDC fails to link @@ -66,6 +67,8 @@ stdenv.mkDerivation rec { --replace "Exec=tilix" "Exec=$out/bin/tilix" ''; + passthru.tests.test = nixosTests.terminal-emulators.tilix; + meta = with lib; { description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; homepage = "https://gnunn1.github.io/tilix-web"; diff --git a/pkgs/applications/terminal-emulators/wayst/default.nix b/pkgs/applications/terminal-emulators/wayst/default.nix index c6f39effed62..eeb258f48c49 100644 --- a/pkgs/applications/terminal-emulators/wayst/default.nix +++ b/pkgs/applications/terminal-emulators/wayst/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , pkg-config +, nixosTests , freetype , fontconfig , libGL @@ -21,15 +22,12 @@ let desktopItem = makeDesktopItem { desktopName = "Wayst"; name = "wayst"; + genericName = "Terminal"; exec = "wayst"; icon = "wayst"; - terminal = "false"; - categories = "System;TerminalEmulator"; + categories = [ "System" "TerminalEmulator" ]; + keywords = [ "wayst" "terminal" ]; comment = "A simple terminal emulator"; - extraEntries = '' - GenericName=Terminal - Keywords=wayst;terminal; - ''; }; in stdenv.mkDerivation rec { @@ -81,6 +79,8 @@ stdenv.mkDerivation rec { install -D icons/wayst.svg $out/share/icons/hicolor/scalable/apps/wayst.svg ''; + passthru.tests.test = nixosTests.terminal-emulators.wayst; + meta = with lib; { description = "A simple terminal emulator"; mainProgram = "wayst"; diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index fc12b1addf6f..6d1276035c13 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -22,11 +22,12 @@ , Cocoa , Foundation , libiconv +, nixosTests }: rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220101-133340-7edc5b5a"; + version = "20220319-142410-0fcdea07"; outputs = [ "out" "terminfo" ]; @@ -35,7 +36,7 @@ rustPlatform.buildRustPackage rec { repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-UZCvKbZdZ7K4RtvVLmr44M612tqd4rkrjF2tys0JHNM="; + sha256 = "sha256-KmIlfzSbVY003WesodN5srJ7qEQaU93izmrZW1MobCo="; }; postPatch = '' @@ -45,7 +46,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "1imil15n9mf1r71qdp4cb4q7kzrrc2cspml0d54825yqaq8vjhsc"; + cargoSha256 = "sha256-+Iu6/pd14O1QIsLkHe7fTP30XyI+8J0GiRY8cnRPS5I="; nativeBuildInputs = [ pkg-config @@ -99,6 +100,8 @@ rustPlatform.buildRustPackage rec { ln -s $out/bin/{wezterm,wezterm-mux-server,wezterm-gui,strip-ansi-escapes} "$OUT_APP" ''; + passthru.tests.test = nixosTests.terminal-emulators.wezterm; + meta = with lib; { description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust"; homepage = "https://wezfurlong.org/wezterm"; diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 738260646f20..278332ca6a36 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "370"; + version = "372"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "ljxdhAoPD0wHf/KEWG6LH4Pz+YPcpvdPSzYZdbU4jII="; + sha256 = "xtCBJ8skCcOgS8rlWbcCUZbtdwu3vyZjCry0XZX2CrE="; }; strictDeps = true; @@ -76,7 +76,10 @@ stdenv.mkDerivation rec { ''; passthru = { - tests = { inherit (nixosTests) xterm; }; + tests = { + customTest = nixosTests.xterm; + standardTest = nixosTests.terminal-emulators.xterm; + }; updateScript = let # Tags that end in letters are unstable diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index f3bd18eb32bd..57adae69db03 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -4,19 +4,19 @@ let pname = "bcompare"; - version = "4.4.0.25886"; + version = "4.4.2.26348"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchurl { url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb"; - sha256 = "sha256-zQZrCjXzoOZ5o5M4t1n5/HhGoGTcZSj5rlf9Uz9UZko="; + sha256 = "sha256-GotORErgPs7IPXATbBfIisDCNwp8csl7pDSwV77FylA="; }; x86_64-darwin = fetchurl { url = "https://www.scootersoftware.com/BCompareOSX-${version}.zip"; - sha256 = "sha256-dez30a1sp+4XuBBYhu07Vpn1+AUmX0Ni7aad7hy2ajQ="; + sha256 = "sha256-XqmtW2EGyFmOzCooXczP3mtMN5UVQCCx7DJnVDlzAko="; }; aarch64-darwin = srcs.x86_64-darwin; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index fddffe6d198d..38aca7350a6c 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -1,27 +1,47 @@ { buildPythonApplication -, lib -, fetchFromGitHub -, poetry -, termcolor -, questionary , colorama , decli -, tomlkit +, fetchFromGitHub +, git , jinja2 +, lib +, packaging +, poetry +, pytest-freezegun +, pytest-mock +, pytest-regressions +, pytestCheckHook , pyyaml -, argcomplete +, questionary +, termcolor +, tomlkit , typing-extensions + +, argcomplete, fetchPypi }: +let + # NOTE: Upstream requires argcomplete <2, so we make it here. + argcomplete_1 = argcomplete.overrideAttrs (old: rec { + version = "1.12.3"; + src = fetchPypi { + inherit (old) pname; + inherit version; + sha256 = "sha256-LH2//YwEXqU0kh5jsL5v5l6IWZmQ2NxAisjFQrcqVEU="; + }; + }); +in + buildPythonApplication rec { pname = "commitizen"; - version = "2.20.3"; + version = "2.21.2"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rAm2GTRxZIHQmn/FM0IwwH/2h+oOvzGmeVr5xkvD/zA="; + sha256 = "sha256-7S676bpSrlAqpbgDj9nAo0WjeitbbHoYc693MJm35Js="; + deepClone = true; }; format = "pyproject"; @@ -36,8 +56,61 @@ buildPythonApplication rec { tomlkit jinja2 pyyaml - argcomplete + argcomplete_1 typing-extensions + packaging + ]; + + doCheck = true; + checkInputs = [ + pytestCheckHook + pytest-freezegun + pytest-mock + pytest-regressions + argcomplete_1 + git + ]; + + # NB: These require full git history + disabledTests = [ + "test_breaking_change_content_v1" + "test_breaking_change_content_v1_beta" + "test_breaking_change_content_v1_multiline" + "test_bump_command_prelease" + "test_bump_dry_run" + "test_bump_files_only" + "test_bump_local_version" + "test_bump_major_increment" + "test_bump_minor_increment" + "test_bump_on_git_with_hooks_no_verify_disabled" + "test_bump_on_git_with_hooks_no_verify_enabled" + "test_bump_patch_increment" + "test_bump_tag_exists_raises_exception" + "test_bump_when_bumpping_is_not_support" + "test_bump_when_version_inconsistent_in_version_files" + "test_bump_with_changelog_arg" + "test_bump_with_changelog_config" + "test_bump_with_changelog_to_stdout_arg" + "test_changelog_config_flag_increment" + "test_changelog_config_start_rev_option" + "test_changelog_from_start" + "test_changelog_from_version_zero_point_two" + "test_changelog_hook" + "test_changelog_incremental_angular_sample" + "test_changelog_incremental_keep_a_changelog_sample" + "test_changelog_incremental_keep_a_changelog_sample_with_annotated_tag" + "test_changelog_incremental_with_release_candidate_version" + "test_changelog_is_persisted_using_incremental" + "test_changelog_multiple_incremental_do_not_add_new_lines" + "test_changelog_replacing_unreleased_using_incremental" + "test_changelog_with_different_cz" + "test_get_commits" + "test_get_commits_author_and_email" + "test_get_commits_with_signature" + "test_get_latest_tag_name" + "test_is_staging_clean_when_updating_file" + "test_none_increment_should_not_call_git_tag_and_error_code_is_not_zero" + "test_prevent_prerelease_when_no_increment_detected" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index f8d84f4e93c0..9f1df695a174 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -8,7 +8,7 @@ pypy2Packages.buildPythonApplication rec { version = "2.5.0"; src = fetchurl { - url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${pname}-${version}.tar.gz"; + url = "https://github.com/mhagger/cvs2svn/releases/download/${version}/${pname}-${version}.tar.gz"; sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4"; }; @@ -29,7 +29,7 @@ pypy2Packages.buildPythonApplication rec { meta = with lib; { description = "A tool to convert CVS repositories to Subversion repositories"; - homepage = "http://cvs2svn.tigris.org/"; + homepage = "https://github.com/mhagger/cvs2svn"; maintainers = [ maintainers.makefu ]; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index a886f6b332cc..936661e4e105 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, fetchpatch , enableGoogle ? false , enableAWS ? false , enableAzure ? false @@ -9,16 +10,38 @@ python3.pkgs.buildPythonApplication rec { pname = "dvc"; - version = "2.9.3"; + version = "2.9.5"; format = "setuptools"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = version; - hash = "sha256-nRlgo7Wjs7RgTUxoMYQh5YEsqiJtdWH2ex79rhXagAQ="; + hash = "sha256-MviiA0ja1IaxMPlqu2dhIGBcdEXiEvBYnK9731dihMg="; }; + # make the patch apply + prePatch = '' + substituteInPlace setup.cfg \ + --replace "scmrepo==0.0.7" "scmrepo==0.0.10" + ''; + + patches = [ + ./dvc-daemon.patch + (fetchpatch { + url = "https://github.com/iterative/dvc/commit/ab54b5bdfcef3576b455a17670b8df27beb504ce.patch"; + sha256 = "sha256-wzMK6Br7/+d3EEGpfPuQ6Trj8IPfehdUvOvX3HZlS+o="; + }) + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "grandalf==0.6" "grandalf>=0.6" \ + --replace "scmrepo==0.0.13" "scmrepo" + substituteInPlace dvc/daemon.py \ + --subst-var-by dvc "$out/bin/dcv" + ''; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm setuptools-scm-git-archive @@ -73,15 +96,6 @@ python3.pkgs.buildPythonApplication rec { importlib-resources ]; - patches = [ ./dvc-daemon.patch ]; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace "grandalf==0.6" "grandalf>=0.6" - substituteInPlace dvc/daemon.py \ - --subst-var-by dvc "$out/bin/dcv" - ''; - # Tests require access to real cloud services doCheck = false; diff --git a/pkgs/applications/version-management/dvc/dvc-daemon.patch b/pkgs/applications/version-management/dvc/dvc-daemon.patch index 2263ce118dd4..65ba630f3b80 100644 --- a/pkgs/applications/version-management/dvc/dvc-daemon.patch +++ b/pkgs/applications/version-management/dvc/dvc-daemon.patch @@ -12,7 +12,7 @@ index 9854a0e1..fefdd613 100644 - file_path = os.path.abspath(inspect.stack()[0][1]) - env["PYTHONPATH"] = os.path.dirname(os.path.dirname(file_path)) + cmd = [ "@dvc@" , "daemon", "-q"] + args -+ env = None ++ env = os.environ.copy() env[DVC_DAEMON] = "1" _spawn(cmd, env) diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix new file mode 100644 index 000000000000..1e234dea5e3e --- /dev/null +++ b/pkgs/applications/version-management/fnc/default.nix @@ -0,0 +1,40 @@ +{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }: + +stdenv.mkDerivation rec { + pname = "fnc"; + version = "0.10"; + + src = fetchurl { + url = "https://fnc.bsdbox.org/tarball/${version}/fnc-${version}.tar.gz"; + sha256 = "1phqxh0afky7q2qmhgjlsq1awbv4254yd8wpzxlww4p7a57cp0lk"; + }; + + buildInputs = [ libiconv ncurses zlib ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + preInstall = '' + mkdir -p $out/bin + ''; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + test "$($out/bin/fnc --version)" = '${pname} ${version}' + runHook postInstallCheck + ''; + + meta = with lib; { + description = "Interactive ncurses browser for Fossil repositories"; + longDescription = '' + An interactive ncurses browser for Fossil repositories. + + fnc uses libfossil to create a fossil ui experience in the terminal. + ''; + homepage = "https://fnc.bsdbox.org"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ abbe ]; + }; +} diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 0e6302534ad9..867efc6ecebb 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.17"; + version = "2.18"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"; - sha256 = "0539rsfvwv49qyrf36z5m0k74kvnn6y5xasm9vvi6lbphx8yxmi1"; + sha256 = "0iimdzfdl5687xyqxfadbn640x45n3933q1nfx7b32rl4v3vk778"; }; nativeBuildInputs = [ installShellFiles tcl tcllib ]; diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 20b8c3c04d1c..ea785bab49bf 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "sha256-pHomYKYpV60SIKLoST5y9i3FprMV1VGy+5GjhpRhBUo="; + sha256 = "3fb5de878b6470dc8ef65ce22f2709cb8baecb5f16d89497dfaa33a0f33f7920"; }; buildCommand = '' diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index 42ac2ed4508f..7de53c7c541f 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -1,50 +1,46 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: -let +stdenv.mkDerivation rec { + pname = "bfg-repo-cleaner"; version = "1.13.0"; + jarName = "bfg-${version}.jar"; - mavenUrl = "mirror://maven/com/madgag/bfg/${version}/${jarName}"; -in - stdenv.mkDerivation { - inherit version jarName; - name = "bfg-repo-cleaner-${version}"; + src = fetchurl { + url = "mirror://maven/com/madgag/bfg/${version}/${jarName}"; + sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz"; + }; - src = fetchurl { - url = mavenUrl; - sha256 = "1kn84rsvms1v5l1j2xgrk7dc7mnsmxkc6sqd94mnim22vnwvl8mz"; - }; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre ]; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre ]; + dontUnpack = true; - dontUnpack = true; + installPhase = '' + mkdir -p $out/share/java + mkdir -p $out/bin + cp $src $out/share/java/$jarName + makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main" + ''; - installPhase = '' - mkdir -p $out/share/java - mkdir -p $out/bin - cp $src $out/share/java/$jarName - makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main" + meta = with lib; { + homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; + # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner + description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster"; + longDescription = '' + The BFG is a simpler, faster alternative to git-filter-branch for + cleansing bad data out of your Git repository history, in particular removing + crazy big files and removing passwords, credentials, and other private data. + + The git-filter-branch command is enormously powerful and can do things + that the BFG can't - but the BFG is much better for the tasks above, because + it's faster (10-720x), simpler (dedicated to just removing things), and + beautiful (can use Scala instead of bash to script customizations). ''; + license = licenses.gpl3; + maintainers = [ maintainers.changlinli ]; + platforms = platforms.unix; + downloadPage = "https://mvnrepository.com/artifact/com.madgag/bfg/${version}"; + }; - meta = with lib; { - homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; - # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner - description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster"; - longDescription = '' - The BFG is a simpler, faster alternative to git-filter-branch for - cleansing bad data out of your Git repository history, in particular removing - crazy big files and removing passwords, credentials, and other private data. - - The git-filter-branch command is enormously powerful and can do things - that the BFG can't - but the BFG is much better for the tasks above, because - it's faster (10-720x), simpler (dedicated to just removing things), and - beautiful (can use Scala instead of bash to script customizations). - ''; - license = licenses.gpl3; - maintainers = [ maintainers.changlinli ]; - platforms = platforms.unix; - downloadPage = "https://mvnrepository.com/artifact/com.madgag/bfg/${version}"; - }; - - } +} diff --git a/pkgs/applications/version-management/git-and-tools/cgit/common.nix b/pkgs/applications/version-management/git-and-tools/cgit/common.nix new file mode 100644 index 000000000000..d6b787315b8d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/cgit/common.nix @@ -0,0 +1,77 @@ +{ pname, version, src, gitSrc, buildInputs ? [] +, homepage, description, maintainers +}: + +{ lib, stdenv, openssl, zlib, asciidoc, libxml2, libxslt +, docbook_xsl, pkg-config +, coreutils, gnused, groff, docutils +, gzip, bzip2, lzip, xz, zstd +, python3Packages +}: + +stdenv.mkDerivation { + inherit pname version src gitSrc; + + nativeBuildInputs = [ + pkg-config asciidoc + ] ++ (with python3Packages; [ python wrapPython ]); + buildInputs = buildInputs ++ [ + openssl zlib libxml2 libxslt docbook_xsl + ]; + pythonPath = with python3Packages; [ pygments markdown ]; + + postPatch = '' + sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ + -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ + -e 's|"lzip"|"${lzip}/bin/lzip"|' \ + -e 's|"xz"|"${xz.bin}/bin/xz"|' \ + -e 's|"zstd"|"${zstd}/bin/zstd"|' \ + -i ui-snapshot.c + + substituteInPlace filters/html-converters/man2html \ + --replace 'groff' '${groff}/bin/groff' + + substituteInPlace filters/html-converters/rst2html \ + --replace 'rst2html.py' '${docutils}/bin/rst2html.py' + ''; + + # Give cgit a git source tree and pass configuration parameters (as make + # variables). + preBuild = '' + mkdir -p git + tar --strip-components=1 -xf "$gitSrc" -C git + ''; + + makeFlags = [ + "prefix=$(out)" + "CGIT_SCRIPT_PATH=$(out)/cgit/" + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + ]; + + # Install manpage. + postInstall = '' + # xmllint fails: + #make install-man + + # bypassing xmllint works: + a2x --no-xmllint -f manpage cgitrc.5.txt + mkdir -p "$out/share/man/man5" + cp cgitrc.5 "$out/share/man/man5" + + wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" + + for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do + wrapProgram $script --prefix PATH : '${lib.makeBinPath [ coreutils gnused ]}' + done + ''; + + stripDebugList = [ "cgit" ]; + + meta = { + inherit homepage description; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = maintainers ++ (with lib.maintainers; [ qyliss ]); + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index b8f7cee7358c..f6a0af102303 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,11 +1,6 @@ -{ lib, stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt -, docbook_xsl, pkg-config, luajit -, coreutils, gnused, groff, docutils -, gzip, bzip2, lzip, xz, zstd -, python, wrapPython, pygments, markdown -}: +{ lib, fetchurl, callPackage, luajit }: -stdenv.mkDerivation rec { +callPackage (import ./common.nix rec { pname = "cgit"; version = "1.2.3"; @@ -22,66 +17,9 @@ stdenv.mkDerivation rec { sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; - nativeBuildInputs = [ pkg-config asciidoc ] ++ [ python wrapPython ]; - buildInputs = [ - openssl zlib libxml2 libxslt docbook_xsl luajit - ]; - pythonPath = [ pygments markdown ]; + buildInputs = [ luajit ]; - postPatch = '' - sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \ - -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \ - -e 's|"lzip"|"${lzip}/bin/lzip"|' \ - -e 's|"xz"|"${xz.bin}/bin/xz"|' \ - -e 's|"zstd"|"${zstd}/bin/zstd"|' \ - -i ui-snapshot.c - - substituteInPlace filters/html-converters/man2html \ - --replace 'groff' '${groff}/bin/groff' - - substituteInPlace filters/html-converters/rst2html \ - --replace 'rst2html.py' '${docutils}/bin/rst2html.py' - ''; - - # Give cgit a git source tree and pass configuration parameters (as make - # variables). - preBuild = '' - mkdir -p git - tar --strip-components=1 -xf "$gitSrc" -C git - ''; - - makeFlags = [ - "prefix=$(out)" - "CGIT_SCRIPT_PATH=$(out)/cgit/" - "CC=${stdenv.cc.targetPrefix}cc" - "AR=${stdenv.cc.targetPrefix}ar" - ]; - - # Install manpage. - postInstall = '' - # xmllint fails: - #make install-man - - # bypassing xmllint works: - a2x --no-xmllint -f manpage cgitrc.5.txt - mkdir -p "$out/share/man/man5" - cp cgitrc.5 "$out/share/man/man5" - - wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" - - for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do - wrapProgram $script --prefix PATH : '${lib.makeBinPath [ coreutils gnused ]}' - done - ''; - - stripDebugList = [ "cgit" ]; - - meta = { - homepage = "https://git.zx2c4.com/cgit/about/"; - repositories.git = "git://git.zx2c4.com/cgit"; - description = "Web frontend for git repositories"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ bjornfor ]; - }; -} + homepage = "https://git.zx2c4.com/cgit/about/"; + description = "Web frontend for git repositories"; + maintainers = with lib.maintainers; [ bjornfor ]; +}) {} diff --git a/pkgs/applications/version-management/git-and-tools/cgit/pink.nix b/pkgs/applications/version-management/git-and-tools/cgit/pink.nix new file mode 100644 index 000000000000..75e99a06b1d8 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/cgit/pink.nix @@ -0,0 +1,23 @@ +{ lib, fetchurl, callPackage }: + +callPackage (import ./common.nix rec { + pname = "cgit-pink"; + version = "1.3.0"; + + src = fetchurl { + url = "https://git.causal.agency/cgit-pink/snapshot/cgit-pink-${version}.tar.gz"; + sha256 = "sha256-oL46NWgqi1VqKNEt0QGBWNXbi2l7nOQDZy1aMivcWuM="; + }; + + # cgit-pink is tightly coupled with git and needs a git source tree to build. + # IMPORTANT: Remember to check which git version cgit-pink needs on every + # version bump (look for "GIT_VER" in the top-level Makefile). + gitSrc = fetchurl { + url = "mirror://kernel/software/scm/git/git-2.35.1.tar.xz"; + sha256 = "sha256-12hSjmRD9logMDYmbxylD50Se6iXUeMurTcRftkZEIA="; + }; + + homepage = "https://git.causal.agency/cgit-pink/about/"; + description = "cgit fork aiming for better maintenance"; + maintainers = with lib.maintainers; [ qyliss sternenseemann ]; +}) {} diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix index f4b7d38bebcf..895e4610f4fc 100644 --- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }: +{ lib, stdenv, fetchFromGitHub, ruby, gnugrep, diffutils, git, darcs }: stdenv.mkDerivation { pname = "darcs-to-git"; version = "2015-06-04"; - src = fetchgit { - url = "git://github.com/purcell/darcs-to-git.git"; + src = fetchFromGitHub { + owner = "purcell"; + repo = "darcs-to-git"; rev = "e5fee32495908fe0f7d700644c7b37347b7a0a5b"; - sha256 = "0lxcx0x0m1cv2j4x9ykpjf6r2zg6lh5rya016x93vkmlzxm3f0ji"; + sha256 = "sha256-UQI3av+0zj1SNwEonwuk5n2RjZN3+tSJFJuFCjrorFM="; }; patchPhase = let diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index ed01e9259f7a..c1f2c281c7a0 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.11.3"; + version = "0.12.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-qpoXUzXRcsUi1WHZAYGgnEaNxBYEQAdkXAz7YPiPae8="; + sha256 = "sha256-khW+Ri+MZytMZcd2tRXhc/D6kOOhk+LP6MsS+GijjQM="; }; - cargoSha256 = "sha256-eds2W47+lOwO/HHKR+IjXOJOD8p1OYkk5qilDYTOUyk="; + cargoSha256 = "sha256-SD1y+l86wqlJUUaG4ae4PXXSMS+4CPth3F4pLYbXMVc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/gg/default.nix b/pkgs/applications/version-management/git-and-tools/gg/default.nix index a5ea070ec0f2..032c461a74ce 100644 --- a/pkgs/applications/version-management/git-and-tools/gg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gg/default.nix @@ -3,32 +3,41 @@ , fetchFromGitHub , installShellFiles , makeWrapper +, bash +, coreutils , git , pandoc }: -buildGoModule rec { +let + version = "1.3.0"; + commit = "5bfe79b3632f15c442e8dc51ec206ab76354487f"; +in buildGoModule { pname = "gg-scm"; - version = "1.1.0"; + inherit version; src = fetchFromGitHub { owner = "gg-scm"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-kLmu4h/EBbSFHrffvusKq38X3/ID9bOlLMvEUtnFGhk="; + sha256 = "e628aeddb94d2470de860df09ef65499f8c5493fb336bf3df8502842ee02487f"; }; - patches = [ ./skip-broken-revert-tests.patch ]; + postPatch = '' + substituteInPlace cmd/gg/editor_unix.go \ + --replace /bin/sh ${bash}/bin/sh + ''; subPackages = [ "cmd/gg" ]; ldflags = [ "-s" "-w" "-X" "main.versionInfo=${version}" - "-X" "main.buildCommit=a0b348c9cef33fa46899f5e55e3316f382a09f6a+" + "-X" "main.buildCommit=${commit}" ]; - vendorSha256 = "sha256-+ZmNXB+I6vPRbACwEkfl/vVmqoZy67Zn9SBrham5zRk="; + vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405"; - nativeBuildInputs = [ git pandoc installShellFiles makeWrapper ]; - buildInputs = [ git ]; + nativeBuildInputs = [ pandoc installShellFiles makeWrapper ]; + checkInputs = [ bash coreutils git ]; + buildInputs = [ bash git ]; postInstall = '' wrapProgram $out/bin/gg --suffix PATH : ${git}/bin diff --git a/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch b/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch deleted file mode 100644 index f8540952ae7c..000000000000 --- a/pkgs/applications/version-management/git-and-tools/gg/skip-broken-revert-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmd/gg/revert_test.go b/cmd/gg/revert_test.go -index 9420e9b..ff6ca93 100644 ---- a/cmd/gg/revert_test.go -+++ b/cmd/gg/revert_test.go -@@ -592,6 +592,7 @@ func TestRevert_LocalRename(t *testing.T) { - } - - func TestRevert_UnknownFile(t *testing.T) { -+ t.Skip("Broken in 1.1.0") - t.Parallel() - t.Run("EmptyRepo", func(t *testing.T) { - t.Parallel() diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 59aba526c3fd..36b813f547e0 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.4.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-RFKS6fHh+rX5S31MvAQpJUNgaI6loiUw0FNkdsMFqlQ="; + sha256 = "sha256-NvVm/deO4LSIl5TSziqsrGt9atCXjt4UZ/VJfmX3i4c="; }; - vendorSha256 = "sha256-6owFzn+NAhlHjTJEur1H5oZY87ZoptvAnF2w6kafix8="; + vendorSha256 = "sha256-pBjg6WyD61+Bl3ttcpl/b9XoWBCi7cDvE8NPaZGu7Aw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 6a765f8e8b52..543e3a7501a7 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.5.1"; + version = "1.7.11"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; - rev = version; - sha256 = "sha256-HkOMG7VG8jyvr1W1T/62murtNYE8wyT/p3lDtuxfm5M="; + rev = "v${version}"; + sha256 = "sha256-/JecaTRmqTB1I0tqBRidlqWOvNE6U5zep5/lFi8VTCc="; }; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 6d3b65547330..c32d29f2561a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -1,16 +1,16 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-annex-remote-b2"; - version = "20151212-${lib.strings.substring 0 7 rev}"; - rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; + version = "unstable-2015-12-12"; goPackagePath = "github.com/encryptio/git-annex-remote-b2"; - src = fetchgit { - inherit rev; - url = "https://github.com/encryptio/git-annex-remote-b2"; - sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2"; + src = fetchFromGitHub { + owner = "encryptio"; + repo = "git-annex-remote-b2"; + rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; + sha256 = "sha256-QhotoSdCpiuDyMARW5jExP2887XRMaaxVXBIutvPaYQ="; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix index 9a4d3878e8af..19f794e6c916 100644 --- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.3.8"; + version = "0.3.10"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - sha256 = "sha256-eDVC1tvAkCioV0Mi5f/Qkc0MMTNaoFXuvWXpllZ7PgE="; + sha256 = "sha256-TLqAU1/olSS59Zeb+2m9Jq19EYTO1TnbKPYciHPKO2A="; }; - cargoSha256 = "sha256-wtG/WTmZ13jxIawI9j9QKQm7jPx5TUs7MjqX+lq/Vf0="; + cargoSha256 = "sha256-sA4KWGW4bxGUkotTWHUcRqcoaUJsSUCTK8hUkKiRcnY="; nativeBuildInputs = [ pkg-config ]; @@ -39,8 +39,8 @@ rustPlatform.buildRustPackage rec { ]; preCheck = '' - export PATH_TO_GIT=${git}/bin/git - export GIT_EXEC_PATH=$(${git}/bin/git --exec-path) + export TEST_GIT=${git}/bin/git + export TEST_GIT_EXEC_PATH=$(${git}/bin/git --exec-path) ''; # FIXME: these tests deadlock when run in the Nix sandbox checkFlags = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index f88130b926aa..c9bf60a1eb93 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-1ScZ8pxRN/Eot/Q+HWbWOgDWBmVLjqtPeftRsNQIJEI="; + sha256 = "sha256-CJ/2Cv/XoLq9U7u5mexH8iCCHbGtV6xohP3FapqO3+g="; }; - cargoSha256 = "sha256-FMlJn/mVcrHhu3gGISb1e7D2mVAocccqXRYZnMVNPqA="; + cargoSha256 = "sha256-pYStKDgvvV/Z96TAonpDW7DIs1YSO6gAoiUCieVa9QY="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 47d6cc023b80..449634ae6992 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,36 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: +{ lib +, stdenv +, fetchFromGitea +, rustPlatform +, libiconv +, Security +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.3.7"; + version = "0.3.8"; - src = fetchFromGitHub { - owner = "lunaryorn"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "flausch"; repo = pname; rev = "v${version}"; - sha256 = "0hhy1yazda9r4n753a5m9jf31fbzmm4v8wvl3pksspj2syglmll8"; + sha256 = "sha256-hKbq2rJwEZI3391RsZXsQSjjp7rSqglUckRDYAu42KE="; }; - cargoSha256 = "0mbc1742szpxnqqah6q0yhkn4fyyxqzg830bd1vzr07v273wr06r"; + cargoSha256 = "sha256-gBQ4V8Bwx6Di8aVnOYwx0UZZIIOFxZAXT7Tl1Yli0Fk="; - nativeBuildInputs = [ pkg-config makeWrapper installShellFiles ]; + nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' installManPage git-gone.1 ''; - postFixup = '' - wrapProgram $out/bin/git-gone --prefix PATH : "${lib.makeBinPath [ git ]}" - ''; - meta = with lib; { - description = "Cleanup stale Git branches of pull requests"; - homepage = "https://github.com/lunaryorn/git-gone"; + description = "Cleanup stale Git branches of merge requests"; + homepage = "https://codeberg.org/flausch/git-gone"; + changelog = "https://codeberg.org/flausch/git-gone/raw/tag/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index be1fd992a9da..279ae81b1010 100644 --- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-hub"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "sociomantic-tsunami"; repo = "git-hub"; rev = "v${version}"; - sha256 = "sha256-Iq6IrW2gAGqq56b2gXpEkg+I/5FcmsESWBJQiG1XWWA="; + sha256 = "sha256-fb/WDmBx1Vayu4fLeG+D1nmHJJawgIAAXcQsABsenBo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index f08a74bd3401..829ebedc1e8e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , installShellFiles , git -, stestr , nix-update-script , testVersion , git-machete @@ -11,30 +10,26 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.5.0"; + version = "3.7.2"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kR37TClFMkoe4e46g/omfwZCrQFr7gukW7I70WI9+dw="; + sha256 = "sha256-7WaLUCJr29i7JW5YAJG1AuYnSLKRMpAEnCY2i4Zle+c="; }; nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ git stestr ]; - - postCheck = '' - stestr run - ''; + checkInputs = [ git ]; postInstall = '' installShellCompletion --bash --name git-machete completion/git-machete.completion.bash installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh + installShellCompletion --fish completion/git-machete.fish ''; postInstallCheck = '' - git init test "$($out/bin/git-machete version)" = "git-machete version ${version}" ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 4490f8068e04..b76f7515eba6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -4,13 +4,13 @@ python3Packages.buildPythonApplication rec { pname = "git-remote-hg"; - version = "1.0.2.1"; + version = "1.0.3.2"; src = fetchFromGitHub { owner = "mnauw"; repo = "git-remote-hg"; rev = "v${version}"; - sha256 = "1crgq13v2p9wmw1yhckmyzybh8h1nz3839qhqvzh48vxqkailzmn"; + sha256 = "0b5lfbrcrvzpz380817md00lbgy5yl4y76vs3vm0bpm5wmr7c027"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index e3845af8926d..4c50836cfdb2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -1,14 +1,11 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }: -let +stdenv.mkDerivation rec { + pname = "git-secret"; version = "0.4.0"; - repo = "git-secret"; - -in stdenv.mkDerivation { - name = "${repo}-${version}"; src = fetchFromGitHub { - inherit repo; + repo = "git-secret"; owner = "sobolevn"; rev = "v${version}"; sha256 = "sha256-Mtuj+e/yCDr4XkmYkWUFJB3cqOT5yOMOq9P/QJV1S80="; diff --git a/pkgs/applications/version-management/git-and-tools/git-team/default.nix b/pkgs/applications/version-management/git-and-tools/git-team/default.nix new file mode 100644 index 000000000000..3fac0dc9791b --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-team/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +buildGoModule rec { + pname = "git-team"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "hekmekk"; + repo = "git-team"; + rev = "v${version}"; + sha256 = "0nl5j64b61jw4bkf29y51svjbndmqqrqx96yaip4vjzj2dx9ywm4"; + }; + + vendorSha256 = "sha256-xJMWPDuqoNtCCUnKuUvwlYztyrej1uZttC0NsDvYnXI="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + go run main.go --generate-man-page > ${pname}.1 + installManPage ${pname}.1 + + # Currently only bash completions are provided + installShellCompletion --cmd git-team --bash <($out/bin/git-team completion bash) + ''; + + meta = with lib; { + description = "Command line interface for managing and enhancing git commit messages with co-authors"; + homepage = "https://github.com/hekmekk/git-team"; + license = licenses.mit; + maintainers = with maintainers; [ lockejan ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix index ec4db1631b0f..a4e0290d3102 100644 --- a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix @@ -2,8 +2,8 @@ }: let - version = "1.2.2"; - sha256 = "sha256-PhxYiTMXg8qRqwbrZaw9UH7pdvXTEnrd09TiYPepzmk="; + version = "1.3.0"; + sha256 = "sha256-CFv9gZQHeEiZctJFyB6PJ1dVNkrQ7PlVtgZuteQQTJ0="; in stdenv.mkDerivation { pname = "git-vendor"; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 073b50c4bd51..13da857b790e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.34.1"; + version = "2.35.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0b40vf315s1kz65x1wq47g8srl4wqac39pwnvlj1mdzs3kfma1rs"; + sha256 = "100h37cpw49pmlpf6lcpm1xi578gllf6y9in60h5mxj3cj754s6p"; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index d6f54497a33b..7e56f28a81ea 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "sha256-ZTpnT4kuntHdMWK7c/pHS6mJrAHF9T51DydXnWXj8Z0="; + sha256 = "sha256-mVfB3HWjvk4X8bmLEC/U8SKBRytTh/gjjuReqzN5qTk="; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix { }) ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index f94f772f50f1..73d35b1bd9b2 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, libgit2, ...}: +{ fetchFromGitHub, libgit2, ... }: libgit2.overrideAttrs (oldAttrs: { cmakeFlags = oldAttrs.cmakeFlags ++ [ @@ -8,15 +8,18 @@ libgit2.overrideAttrs (oldAttrs: { "-DUSE_BUNDLED_ZLIB=ON" "-DUSE_GSSAPI=OFF" "-DUSE_HTTPS=OFF" - "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2 + "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2 "-DUSE_NTLMCLIENT=OFF" "-DUSE_SSH=OFF" "-DZERO_NSEC=ON" ]; + src = fetchFromGitHub { owner = "romkatv"; repo = "libgit2"; - rev = "tag-5860a42d19bcd226cb6eff2dcbfcbf155d570c73"; - sha256 = "sha256-OdGLNGOzXbWQGqw5zYM1RhU4Z2yRXi9cpAt7Vn9+j5I="; + rev = "tag-0ad3d776aa86dd607dc86dcd7f77ad3ed7ebec61"; + sha256 = "sha256-mXCmspM3fqI14DF9sAIMH5vGdMMjWkdDjdME4EiQuqY="; }; + + patches = [ ]; }) diff --git a/pkgs/applications/version-management/git-and-tools/gitty/default.nix b/pkgs/applications/version-management/git-and-tools/gitty/default.nix index 759694b0eb3e..12a82143c35b 100644 --- a/pkgs/applications/version-management/git-and-tools/gitty/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitty/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitty"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "muesli"; repo = "gitty"; rev = "v${version}"; - sha256 = "sha256-gjiFaBM6PP937l5EQIeB27kGuZCT7cmVHm0UwuytqfE="; + sha256 = "sha256-g0D6nJiHY7cz72DSmdQZsj9Vgv/VOp0exTcLsaypGiU="; }; - vendorSha256 = "sha256-CytlkfOzrmCRjj4tGoDUbqdim5DWElMYo1Tosw7Dhmg="; + vendorSha256 = "sha256-qrLECQkjXH0aTHmysq64jnXj9jgbunpVtBAIXJOEYIY="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 24ba62a6908c..e5058ad48e6c 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,18 +1,30 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip, pkg-config }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, libiconv +, openssl +, pkg-config +, xclip +, AppKit +, Security +}: + rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.19.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PNyXmXHS8StJhx6Qko7zbXrX1CX3owC1HmyX9VV7tEg="; + sha256 = "sha256-zYM0JVhgFnp8JDBx9iEOt029sr8azIPX5jrtvUE/Pn0="; }; - cargoSha256 = "sha256-Q6QUxIe5bkoEcxZZwhJbihaHhSsX8SLqWzmjp8hFsS4="; + cargoSha256 = "sha256-kbLI95GzCwm2OKzzpk7jvgtm8vArf29u5BiPRTh2OmE="; + + nativeBuildInputs = [ pkg-config ]; - nativeBuildInputs = [ python3 perl pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isLinux xclip ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; @@ -21,7 +33,7 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; meta = with lib; { - description = "Blazing fast terminal-ui for git written in rust"; + description = "Blazing fast terminal-ui for Git written in Rust"; homepage = "https://github.com/extrawurst/gitui"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne yanganto ]; diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix index 7cefd485d144..69e950867631 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-7w6cbeZYhmV0EXXcWlXFq2pQGGxc5Ok4bba0g3fcgmE="; }; - vendorSha256 = "sha256-P7gHCyFafjWOYLEtK9Eh2S2KA0e2hzc1G/ZqVaEWWB0="; + vendorSha256 = "sha256-hGpJXCs5lZ6QQHr6LW1fCT+CVtOaUpYXJPchDPDdbaM="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/pkgs/applications/version-management/git-and-tools/glitter/default.nix index 626e3db5ca50..f8034ce42d7f 100644 --- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glitter/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "glitter"; - version = "1.5.12"; + version = "1.5.15"; src = fetchFromGitHub { owner = "milo123459"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XQ3HLmT3sWjoHTxnOU9FSHbnCwitFH0tOOpT7WwTEPE="; + sha256 = "sha256-4oI0opwbmEyHc3zx06l8bDPnOi7rGrMqUJPBDAfmPY0="; }; - cargoSha256 = "sha256-V54Itj7/zUO1bp0y30TjV1mSo/oNJOxEofpSqrYz6xk="; + cargoSha256 = "sha256-rmECD/0ThDXBAGqDMNbyHi9eoGNOJhBndaxCuUS/qpc="; # tests require it to be in a git repository preCheck = '' diff --git a/pkgs/applications/version-management/git-and-tools/hut/default.nix b/pkgs/applications/version-management/git-and-tools/hut/default.nix new file mode 100644 index 000000000000..ad0c02aa2e0d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/hut/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildGoModule +, fetchFromSourcehut +, scdoc +, unstableGitUpdater +}: + +buildGoModule { + pname = "hut"; + version = "unstable-2022-03-02"; + + src = fetchFromSourcehut { + owner = "~emersion"; + repo = "hut"; + rev = "55ad2fbd9ceeeb9e7dc203c15476fa785f1209e0"; + sha256 = "sha256-j2IVwCm7iq3JKccPL8noRBhqw+V+4qfcpAwV65xhZk0="; + }; + + vendorSha256 = "sha256-zdQvk0M1a+Y90pnhqIpKxLJnlVJqMoSycewTep2Oux4="; + + nativeBuildInputs = [ + scdoc + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postBuild = '' + make $makeFlags completions doc/hut.1 + ''; + + preInstall = '' + make $makeFlags install + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + homepage = "https://sr.ht/~emersion/hut/"; + description = "A CLI tool for Sourcehut / sr.ht"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index f1be6a4fc8de..8f4acbc3fc43 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "lab"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "0g8v3cli8rvr0zsxiv4w0afzqmh0d85a832c4hc75b3f9amkr0dl"; + sha256 = "sha256-sw00D/PJaLAPHoPdJC2WYUNklIzMbc/bXt2jlQZ7E90="; }; subPackages = [ "." ]; - vendorSha256 = "09xn5vycb9shygs13pfwxlb89j6rhrbplm10mfgxi4kzlvm7agl6"; + vendorSha256 = "sha256-FwnVMH//GwFbi+llFF6XNqrZX2hRB4r51p8TRz2vN+g="; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix index 7d91fb775425..e1129a727427 100644 --- a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "lucky-commit"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "not-an-aardvark"; repo = pname; rev = "v${version}"; - sha256 = "0vs668i1yglfcqs94jhwdk90v0lja2w5kr5gakz082wykilms0zg"; + sha256 = "sha256-FnH9rDy6opu0WJnCgAFvxJXWKyD2v5eGPNmbC1cvzko="; }; - cargoSha256 = "sha256-MvopLKhovwXaEmRgXnAzJeuhPgqnMjt0EtKUGSWFpaY="; + cargoSha256 = "sha256-iEYkOPAcWIwK7mthovrGFHfp/NsQ4ycqiTZvkHnYWzA="; buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd); diff --git a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index a431a50af3b7..63f7a459a70a 100644 --- a/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "pass-git-helper"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; rev = "v${version}"; - sha256 = "sha256-HEdOR6jS16c4UIatlgB6HeBtyyxePSab+6e2hu85dsI="; + sha256 = "sha256-An9JKnS/Uor7iZ+lbBGR3eOkxOgV+SjnCWN/QmqFI/I="; }; propagatedBuildInputs = [ pyxdg ]; diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 1c3fdf90aa79..0a6251548be2 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -12,13 +12,13 @@ python3Packages.buildPythonApplication rec { pname = "stgit"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - sha256 = "0yx81d61kp33h7n0c14wvcrh8vvjjjq4xjh1qwq2sdbmqc43p3hg"; + sha256 = "sha256-TsJr2Riygz/DZrn6UZMPvq1tTfvl3dFEZZNq2wVj1Nw="; }; nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl docbook_xml_dtd_45 ]; diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 4124ca67e65d..54dbc195f07f 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "subgit"; - version = "3.3.12"; + version = "3.3.13"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://subgit.com/download/subgit-${version}.zip"; - sha256 = "sha256-Mdjm7rkF/iw3HBftCgXrbFCG00g/RowFcF/oeKLyzL0="; + sha256 = "sha256-+sG7yD2aVLV9i7iPZTMMsY1CQ1VuJ8w+jPguuTulR8c="; }; } diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 78a393eb5e44..9f0126d9ac4c 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "git-lfs"; - version = "3.0.2"; + version = "3.1.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "0k2pzbhd95xixh5aqdwf5pafilg85wl46d04xbb4lx6k3gkfv0f3"; + sha256 = "sha256-IEo8poEYPjAbBGk+SQdJqyhwgMYjNLdibI+AktVIg1g="; }; goPackagePath = "github.com/git-lfs/git-lfs"; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 03ca6111e341..7fe27da6080a 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.20"; + version = "2.22"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-5yyiQMIoAtaNh9H1pjU1gXAbmU3/VdXGt7AL4wmJC28="; + sha256 = "sha256-oVwvoZdjD6V3CHECZOYBSYVtCX1XwW5fynyCn7Oj+Bc="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index 40061baca53e..98c9c5312e61 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -4,8 +4,7 @@ , pbr , requests , setuptools -, genericUpdater -, common-updater-scripts +, gitUpdater }: buildPythonApplication rec { @@ -42,10 +41,7 @@ buildPythonApplication rec { pythonImportsCheck = [ "git_review" ]; - passthru.updateScript = genericUpdater { - inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; - }; + passthru.updateScript = gitUpdater { inherit pname version; }; meta = with lib; { description = "Tool to submit code to Gerrit"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 1337c18692a0..840937c190f0 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.15.10"; + version = "1.16.5"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "1rrxkpahgzxgs4mckdsrss19mdjdicjgskw689hvhc063slb9vlx"; + sha256 = "sha256-2aqy6DV8oaIur/syg1bk41Wo+FGk3m+05+tUyoDwGHs="; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/github-desktop/default.nix b/pkgs/applications/version-management/github-desktop/default.nix index 319fddcc06b8..83991407fd41 100644 --- a/pkgs/applications/version-management/github-desktop/default.nix +++ b/pkgs/applications/version-management/github-desktop/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "github-desktop"; - version = "2.9.6"; + version = "2.9.9"; src = fetchurl { url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb"; - sha256 = "sha256-YL3Gc76jWfQvY96pAlS5JB7BwSOUklNvGR0tOBdQHuE="; + sha256 = "sha256-LMKOxQR3Bgw00LnKqAe2hq+eASgwC7y0cxNSSt/sjWA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index b5372233c247..52ad060c990d 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -3,7 +3,7 @@ , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid -, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems +, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon }: with lib; @@ -11,22 +11,25 @@ with lib; let curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; pname = "gitkraken"; - version = "8.2.1"; + version = "8.3.3"; 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-FjG7htwMRLZmwH6OjjyHkGUTaVNzuMTn6BjXUnCgwAA="; + sha256 = "185msrpa33w40prc88n5m0g12wh8r6szj56iikk4ps6kwr6wamy7"; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-cBZ53lekhPl5yjxclg2PeMCL0NKwshkKhP/lFbEinCs="; + sha256 = "0iam5ni8imajxhcv12zib6m475i6czllmqy512r1wmzw9zbilf43"; }; - aarch64-darwin = srcs.x86_64-darwin; + aarch64-darwin = fetchzip { + url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; + sha256 = "12af421r4d8s4l5j54xyd3x8pa72nbilass95v0y3b0wgsi35g0z"; + }; }; src = srcs.${stdenv.hostPlatform.system} or throwSystem; @@ -85,6 +88,8 @@ let krb5 libdrm mesa + libxshmfence + libxkbcommon ]; desktopItems = [ (makeDesktopItem { @@ -93,7 +98,7 @@ let icon = pname; desktopName = "GitKraken"; genericName = "Git Client"; - categories = "Development;"; + categories = [ "Development" ]; comment = "Graphical Git client from Axosoft"; }) ]; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 7a00d41df0f8..bd524c622d6f 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "14.7.0", - "repo_hash": "0jam4krhwkbri99642vz4gjlnr7zfgd6mq7pgjyf00f6pggvhq79", - "yarn_hash": "1cv3lxfw4i9snlw5x6bcip1n97wg72v5zpz9mjxdpzd2i1bwp6da", + "version": "14.9.1", + "repo_hash": "0jkhvglisaj3h9ls8q8wrxnnp4xp3zggc8vmwg6jqqjsmbpi332h", + "yarn_hash": "1bq1ka0nlb2nkjx70qpwpm8x6crbkfj0c8m39pwwc42j8wn10r9g", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.7.0-ee", + "rev": "v14.9.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.7.0", - "GITLAB_PAGES_VERSION": "1.51.0", - "GITLAB_SHELL_VERSION": "13.22.2", - "GITLAB_WORKHORSE_VERSION": "14.7.0" + "GITALY_SERVER_VERSION": "14.9.1", + "GITLAB_PAGES_VERSION": "1.56.0", + "GITLAB_SHELL_VERSION": "13.24.0", + "GITLAB_WORKHORSE_VERSION": "14.9.1" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index f53c693c90be..362cf4702f45 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv , ruby, tzdata, git, nettools, nixosTests, nodejs, openssl , gitlabEnterprise ? false, callPackage, yarn -, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps +, fixup_yarn_lock, replace, file, cacert, fetchYarnDeps, makeWrapper }: let @@ -120,7 +120,7 @@ stdenv.mkDerivation { inherit src; buildInputs = [ - rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools + rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools makeWrapper ]; patches = [ @@ -174,6 +174,9 @@ stdenv.mkDerivation { # rake tasks to mitigate CVE-2017-0882 # see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/ cp ${./reset_token.rake} $out/share/gitlab/lib/tasks/reset_token.rake + + # manually patch the shebang line in generate-loose-foreign-key + wrapProgram $out/share/gitlab/scripts/decomposition/generate-loose-foreign-key --set ENABLE_SPRING 0 --add-flags 'runner -e test' ''; passthru = { diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 70dd9c594c98..78296dff887f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.1.4.4' +gem 'activesupport', '~> 6.1.4.6' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index fd0dea027e0d..752883d801d1 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.1.4.4) - actionview (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionpack (6.1.4.6) + actionview (= 6.1.4.6) + activesupport (= 6.1.4.6) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.4.4) - activesupport (= 6.1.4.4) + actionview (6.1.4.6) + activesupport (= 6.1.4.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.1.4.4) + activesupport (6.1.4.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -88,7 +88,7 @@ GEM google-protobuf (~> 3.18) googleapis-common-protos-types (~> 1.0) grpc-tools (1.42.0) - i18n (1.8.11) + i18n (1.9.1) concurrent-ruby (~> 1.0) ice_nine (0.11.2) jaeger-client (1.1.0) @@ -101,7 +101,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.13.0) + loofah (2.14.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -219,13 +219,13 @@ GEM with_env (1.1.0) xml-simple (1.1.9) rexml - zeitwerk (2.5.3) + zeitwerk (2.5.4) PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.1.4.4) + activesupport (~> 6.1.4.6) factory_bot faraday (~> 1.0) github-linguist (~> 7.12) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index e2c5a8757f59..d8ab7f36b39c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,21 +1,9 @@ { lib, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby , bundlerEnv, pkg-config # libgit2 + dependencies -, libgit2, openssl, zlib, pcre, http-parser }: +, libgit2_1_3_0, openssl, zlib, pcre, http-parser }: let - # git2go 32.0.5 does not support libgit2 1.2.0 or 1.3.0. - # It needs a specific commit in between those two releases. - libgit2_custom = libgit2.overrideAttrs (oldAttrs: rec { - version = "1.2.0"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "109b4c887ffb63962c7017a66fc4a1f48becb48e"; - sha256 = "sha256-w029FHpOv5K49wE1OJMOlkTe+2cv+ORYqEHxs59GDBI="; - }; - }); - rubyEnv = bundlerEnv rec { name = "gitaly-env"; inherit ruby; @@ -23,7 +11,7 @@ let gemdir = ./.; }; - version = "14.7.0"; + version = "14.9.1"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -35,10 +23,10 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-hOtdeJSjZLGcPCZpu42lGtCtQoLE0/AQqfQWLUJ6Hf8="; + sha256 = "sha256-mk6JZuu6b2r/OqRI4ZUf8AV/ObRKhTIQT9bQE8sH894="; }; - vendorSha256 = "sha256-eapqtSstc7d3R7A/5krKV0uVr9GhGkHHMrmsBOpWAbo="; + vendorSha256 = "sha256-kEjgWA/Task23PScPYrqdDu3vdVR/FJl7OilUug/Bds="; passthru = { inherit rubyEnv; @@ -48,12 +36,12 @@ buildGoModule { tags = [ "static,system_libgit2" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2_custom openssl zlib pcre http-parser ]; + buildInputs = [ rubyEnv.wrappedRuby libgit2_1_3_0 openssl zlib pcre http-parser ]; doCheck = false; postInstall = '' mkdir -p $ruby - cp -rv $src/ruby/{bin,lib,proto,git-hooks} $ruby + cp -rv $src/ruby/{bin,lib,proto} $ruby mv $out/bin/gitaly-git2go $out/bin/gitaly-git2go-${version} ''; @@ -63,7 +51,7 @@ buildGoModule { homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "A Git RPC service for handling all the git calls made by GitLab"; platforms = platforms.linux ++ [ "x86_64-darwin" ]; - maintainers = with maintainers; [ roblabla globin fpletz talyz ]; + maintainers = with maintainers; [ roblabla globin fpletz talyz yayayayaka ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 9539139fe4a3..c55d094db5f8 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "171ida68hrk21cq1zz1kfl9h94a3qw5p3afviqzsirl0kx6qjyv9"; + sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm2pf35p6q4ff78z175h6ihmzfg2j7ssn41374rb9iy9gpiiidm"; + sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98"; + sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -343,10 +343,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "1nancdgq51wk3c1pkxps0rkjsfdwnkx60hzkm947m5rzsz8b2sw8"; type = "gem"; }; - version = "1.8.11"; + version = "1.9.1"; }; ice_nine = { source = { @@ -394,10 +394,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17rvbrqcci1579d7dpbsfmz1f9g7msk82lyh9ip5h29dkrnixcgg"; + sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w"; type = "gem"; }; - version = "2.13.0"; + version = "2.14.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -994,9 +994,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; + sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; type = "gem"; }; - version = "2.5.3"; + version = "2.5.4"; }; } diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 9dabd7c949be..971ef2af955c 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.22.2"; + version = "13.24.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-jAH/MKmCIybLXsypHehQJaKf+mK9ko5XqWoDH/XKE5w="; + sha256 = "sha256-/SH1YNmZr/NuCvyL6tmyTj1C2LUuxldeHwmJHWKPz2M="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-cE6phpVYcZNCEk6bElEksIf4GOr/5vJPRdlGCubRafE="; + vendorSha256 = "sha256-RLV01CM5O0K4R8XDDcas2LjIig0S7GoyAo/S8+Vx2bY="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin @@ -26,7 +26,7 @@ buildGoModule rec { description = "SSH access and repository management app for GitLab"; homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin talyz ]; + maintainers = with maintainers; [ fpletz globin talyz yayayayaka ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 3b1bc8cb1b08..e16d7f75bf69 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.7.0"; + version = "14.9.1"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-ps/MjNY2woHrfcsNZTurnO2TbasWdS3LiuPUfVD2Ypc="; + vendorSha256 = "sha256-ubuMuO8tDjdVZWehsmsJqUgvmySIBJ15D9GHZFzApFw="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; @@ -24,7 +24,7 @@ buildGoModule rec { meta = with lib; { homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin talyz ]; + maintainers = with maintainers; [ fpletz globin talyz yayayayaka ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index 2026808875d0..2b5053074052 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -207,3 +207,13 @@ index 567c7540777..29906b1c132 100644 end end end +diff --git a/scripts/decomposition/generate-loose-foreign-key b/scripts/decomposition/generate-loose-foreign-key +index 35f84c64ce1..c2fecf3404c 100755 +--- a/scripts/decomposition/generate-loose-foreign-key ++++ b/scripts/decomposition/generate-loose-foreign-key +@@ -1,4 +1,4 @@ +-#!/usr/bin/env -S ENABLE_SPRING=0 bin/rails runner -e test ++#!/usr/bin/env rails + + # This is helper script to swap foreign key to loose foreign key + # using DB schema diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index aab373095f79..fd469fd8bcc7 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.1.4.4' +gem 'rails', '~> 6.1.4.6' gem 'bootsnap', '~> 1.9.1', require: false @@ -11,6 +11,8 @@ gem 'responders', '~> 3.0' gem 'sprockets', '~> 3.7.0' +gem 'view_component', '~> 2.50.0' + # Default values for AR models gem 'default_value_for', '~> 3.4.0' @@ -72,7 +74,7 @@ gem 'u2f', '~> 0.2.1' # GitLab Pages gem 'validates_hostname', '~> 1.0.11' -gem 'rubyzip', '~> 2.0.0', require: 'zip' +gem 'rubyzip', '~> 2.3.2', require: 'zip' # GitLab Pages letsencrypt support gem 'acme-client', '~> 2.0', '>= 2.0.9' @@ -153,7 +155,7 @@ gem 'html-pipeline', '~> 2.13.2' gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.8.0' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'commonmarker', '~> 0.23.2' +gem 'commonmarker', '~> 0.23.4' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.3.2' @@ -183,7 +185,7 @@ gem 'rack', '~> 2.2.3' gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' group :puma do - gem 'puma', '~> 5.5.2', require: false + gem 'puma', '~> 5.6.2', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false gem 'sd_notify', '~> 0.1.0', require: false end @@ -195,7 +197,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' gem 'acts-as-taggable-on', '~> 9.0' # Background jobs -gem 'sidekiq', '~> 6.3' +gem 'sidekiq', '~> 6.4' gem 'sidekiq-cron', '~> 1.2' gem 'redis-namespace', '~> 1.8.1' gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch' @@ -290,18 +292,21 @@ gem 'autoprefixer-rails', '10.2.5.1' gem 'terser', '1.0.2' gem 'addressable', '~> 2.8' -gem 'tanuki_emoji', '~> 0.5' +gem 'tanuki_emoji', '~> 0.6' gem 'gon', '~> 6.4.0' gem 'request_store', '~> 1.5' gem 'base32', '~> 0.3.0' -gem 'gitlab-license', '~> 2.0' +gem 'gitlab-license', '~> 2.1.0' # Protect against bruteforcing gem 'rack-attack', '~> 6.3.0' # Sentry integration gem 'sentry-raven', '~> 3.1' +gem 'sentry-ruby', '~> 5.1.1' +gem 'sentry-rails', '~> 5.1.1' +gem 'sentry-sidekiq', '~> 5.1.1' # PostgreSQL query parsing # @@ -310,7 +315,7 @@ gem 'pg_query', '~> 2.1' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.21.3' +gem 'gitlab-labkit', '~> 0.22.0' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -374,7 +379,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 6.6.0', require: false + gem 'gitlab-styles', '~> 7.0.0', require: false gem 'haml_lint', '~> 0.36.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -393,14 +398,16 @@ group :development, :test do gem 'parallel', '~> 1.19', require: false gem 'test_file_finder', '~> 0.1.3' + + gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 2.6.1', require: false + gem 'gitlab-dangerfiles', '~> 2.11.0', require: false end group :development, :test, :coverage do - gem 'simplecov', '~> 0.18.5', require: false + gem 'simplecov', '~> 0.21', require: false gem 'simplecov-lcov', '~> 0.8.0', require: false gem 'simplecov-cobertura', '~> 1.3.1', require: false gem 'undercover', '~> 0.4.4', require: false @@ -418,6 +425,7 @@ group :test do gem 'fuubar', '~> 2.2.0' gem 'rspec-retry', '~> 0.6.1' gem 'rspec_profiling', '~> 0.0.6' + gem 'rspec-benchmark', '~> 0.6.0' gem 'rspec-parameterized', require: false gem 'capybara', '~> 3.35.3' @@ -466,21 +474,14 @@ gem 'sys-filesystem', '~> 1.4.3' # NTP client gem 'net-ntp' -# SSH host key support -gem 'net-ssh', '~> 6.0' -gem 'sshkey', '~> 2.0' - -# Required for ED25519 SSH host key support -group :ed25519 do - gem 'ed25519', '~> 1.2' - gem 'bcrypt_pbkdf', '~> 1.1' -end +# SSH keys support +gem 'ssh_data', '~> 1.2' # Spamcheck GRPC protocol definitions gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.6.0.pre.rc1' +gem 'gitaly', '~> 14.9.0.pre.rc4' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' @@ -496,7 +497,7 @@ gem 'flipper', '~> 0.21.0' gem 'flipper-active_record', '~> 0.21.0' gem 'flipper-active_support_cache_store', '~> 0.21.0' gem 'unleash', '~> 3.2.2' -gem 'gitlab-experiment', '~> 0.6.5' +gem 'gitlab-experiment', '~> 0.7.0' # Structured logging gem 'lograge', '~> 0.5' @@ -541,4 +542,4 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'ipynbdiff', '0.3.8' +gem 'ipynbdiff', '0.4.4' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 666a1e7d0267..da4987d35dcd 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -4,63 +4,63 @@ GEM RedCloth (4.3.2) acme-client (2.0.9) faraday (>= 0.17, < 2.0.0) - actioncable (6.1.4.4) - actionpack (= 6.1.4.4) - activesupport (= 6.1.4.4) + actioncable (6.1.4.6) + actionpack (= 6.1.4.6) + activesupport (= 6.1.4.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.4.4) - actionpack (= 6.1.4.4) - activejob (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionmailbox (6.1.4.6) + actionpack (= 6.1.4.6) + activejob (= 6.1.4.6) + activerecord (= 6.1.4.6) + activestorage (= 6.1.4.6) + activesupport (= 6.1.4.6) mail (>= 2.7.1) - actionmailer (6.1.4.4) - actionpack (= 6.1.4.4) - actionview (= 6.1.4.4) - activejob (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionmailer (6.1.4.6) + actionpack (= 6.1.4.6) + actionview (= 6.1.4.6) + activejob (= 6.1.4.6) + activesupport (= 6.1.4.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.4.4) - actionview (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionpack (6.1.4.6) + actionview (= 6.1.4.6) + activesupport (= 6.1.4.6) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.4.4) - actionpack (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + actiontext (6.1.4.6) + actionpack (= 6.1.4.6) + activerecord (= 6.1.4.6) + activestorage (= 6.1.4.6) + activesupport (= 6.1.4.6) nokogiri (>= 1.8.5) - actionview (6.1.4.4) - activesupport (= 6.1.4.4) + actionview (6.1.4.6) + activesupport (= 6.1.4.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.4.4) - activesupport (= 6.1.4.4) + activejob (6.1.4.6) + activesupport (= 6.1.4.6) globalid (>= 0.3.6) - activemodel (6.1.4.4) - activesupport (= 6.1.4.4) - activerecord (6.1.4.4) - activemodel (= 6.1.4.4) - activesupport (= 6.1.4.4) + activemodel (6.1.4.6) + activesupport (= 6.1.4.6) + activerecord (6.1.4.6) + activemodel (= 6.1.4.6) + activesupport (= 6.1.4.6) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.1.4.4) - actionpack (= 6.1.4.4) - activejob (= 6.1.4.4) - activerecord (= 6.1.4.4) - activesupport (= 6.1.4.4) + activestorage (6.1.4.6) + actionpack (= 6.1.4.6) + activejob (= 6.1.4.6) + activerecord (= 6.1.4.6) + activesupport (= 6.1.4.6) marcel (~> 1.0.0) mini_mime (>= 1.1.0) - activesupport (6.1.4.4) + activesupport (6.1.4.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -130,11 +130,13 @@ GEM base32 (0.3.2) batch-loader (2.0.1) bcrypt (3.1.16) - bcrypt_pbkdf (1.1.0) benchmark (0.1.1) benchmark-ips (2.3.0) + benchmark-malloc (0.2.0) benchmark-memory (0.1.2) memory_profiler (~> 0.9) + benchmark-perf (0.6.0) + benchmark-trend (0.4.0) better_errors (2.9.1) coderay (>= 1.0.0) erubi (>= 1.0.0) @@ -186,16 +188,16 @@ GEM childprocess (3.0.0) chunky_png (1.3.5) citrus (3.0.2) - claide (1.0.3) + claide (1.1.0) claide-plugins (0.9.2) cork nap open4 (~> 1.3) coderay (1.1.3) colored2 (3.1.2) - commonmarker (0.23.2) + commonmarker (0.23.4) concurrent-ruby (1.1.9) - connection_pool (2.2.2) + connection_pool (2.2.5) contracts (0.11.0) cork (0.3.0) colored2 (~> 3.1) @@ -215,7 +217,7 @@ GEM css_parser (1.7.0) addressable daemons (1.3.1) - danger (8.4.2) + danger (8.4.5) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -232,6 +234,7 @@ GEM danger gitlab (~> 4.2, >= 4.2.0) database_cleaner (1.7.0) + dead_end (3.1.1) deckar01-task_list (2.3.1) html-pipeline declarative (0.0.20) @@ -241,13 +244,15 @@ GEM activerecord (>= 3.2.0, < 7.0) deprecation_toolkit (1.5.1) activesupport (>= 4.2) - derailed_benchmarks (1.8.1) + derailed_benchmarks (2.1.1) benchmark-ips (~> 2) + dead_end get_process_mem (~> 0) heapy (~> 0) - memory_profiler (~> 0) - mini_histogram (>= 0.2.1) + memory_profiler (>= 0, < 2) + mini_histogram (>= 0.3.0) rack (>= 1) + rack-test rake (> 10, < 14) ruby-statistics (>= 2.1) thor (>= 0.19, < 2) @@ -269,7 +274,7 @@ GEM diffy (3.3.0) discordrb-webhooks (3.4.2) rest-client (>= 2.0.0) - docile (1.3.2) + docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) doorkeeper (5.5.0.rc2) @@ -301,7 +306,6 @@ GEM e2mmap (0.1.0) ecma-re-validator (0.3.0) regexp_parser (~> 2.0) - ed25519 (1.2.4) elasticsearch (6.8.2) elasticsearch-api (= 6.8.2) elasticsearch-transport (= 6.8.2) @@ -367,7 +371,7 @@ GEM fast_blank (1.0.0) fast_gettext (2.1.0) ffaker (2.10.0) - ffi (1.15.3) + ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -430,7 +434,7 @@ GEM ruby-progressbar (~> 1.4) fuzzyurl (0.9.0) gemoji (3.0.1) - get_process_mem (0.2.5) + get_process_mem (0.2.7) ffi (~> 1.0) gettext (3.3.6) locale (>= 2.0.5) @@ -444,7 +448,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.6.0.pre.rc1) + gitaly (14.9.0.pre.rc4) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -452,13 +456,12 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (2.6.1) - danger (>= 8.3.1) + gitlab-dangerfiles (2.11.0) + danger (>= 8.4.5) danger-gitlab (>= 8.0.0) - gitlab-experiment (0.6.5) + gitlab-experiment (0.7.0) activesupport (>= 3.0) request_store (>= 1.0) - scientist (~> 1.6, >= 1.6.0) gitlab-fog-azure-rm (1.2.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) @@ -466,15 +469,15 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.21.3) + gitlab-labkit (0.22.0) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (>= 1.37) - jaeger-client (~> 1.1) + jaeger-client (~> 1.1.0) opentracing (~> 0.4) pg_query (~> 2.1) redis (> 3.0.0, < 5.0.0) - gitlab-license (2.0.0) + gitlab-license (2.1.0) gitlab-license_finder (6.14.2.1) bundler rubyzip (>= 1, < 3) @@ -491,7 +494,7 @@ GEM openid_connect (~> 1.2) gitlab-sidekiq-fetcher (0.8.0) sidekiq (~> 6.1) - gitlab-styles (6.6.0) + gitlab-styles (7.0.0) rubocop (~> 0.91, >= 0.91.1) rubocop-gitlab-security (~> 0.1.1) rubocop-graphql (~> 0.10) @@ -626,7 +629,7 @@ GEM http-form_data (~> 2.2) http-parser (~> 1.2.0) http-accept (1.7.0) - http-cookie (1.0.3) + http-cookie (1.0.4) domain_name (~> 0.5) http-form_data (2.3.0) http-parser (1.2.3) @@ -635,7 +638,7 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.8.11) + i18n (1.10.0) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) @@ -644,9 +647,9 @@ GEM invisible_captcha (1.1.0) rails (>= 4.2) ipaddress (0.8.3) - ipynbdiff (0.3.8) - diffy (= 3.3.0) - json (= 2.5.1) + ipynbdiff (0.4.4) + diffy (~> 3.3) + json (~> 2.5, >= 2.5.1) jaeger-client (1.1.0) opentracing (~> 0.3) thrift @@ -937,7 +940,7 @@ GEM tty-markdown tty-prompt public_suffix (4.0.6) - puma (5.5.2) + puma (5.6.2) nio4r (~> 2.0) puma_worker_killer (0.3.1) get_process_mem (~> 0.2) @@ -963,20 +966,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.2) - rails (6.1.4.4) - actioncable (= 6.1.4.4) - actionmailbox (= 6.1.4.4) - actionmailer (= 6.1.4.4) - actionpack (= 6.1.4.4) - actiontext (= 6.1.4.4) - actionview (= 6.1.4.4) - activejob (= 6.1.4.4) - activemodel (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + rails (6.1.4.6) + actioncable (= 6.1.4.6) + actionmailbox (= 6.1.4.6) + actionmailer (= 6.1.4.6) + actionpack (= 6.1.4.6) + actiontext (= 6.1.4.6) + actionview (= 6.1.4.6) + activejob (= 6.1.4.6) + activemodel (= 6.1.4.6) + activerecord (= 6.1.4.6) + activestorage (= 6.1.4.6) + activesupport (= 6.1.4.6) bundler (>= 1.15.0) - railties (= 6.1.4.4) + railties (= 6.1.4.6) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -990,9 +993,9 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.1.4.4) - actionpack (= 6.1.4.4) - activesupport (= 6.1.4.4) + railties (6.1.4.6) + actionpack (= 6.1.4.6) + activesupport (= 6.1.4.6) method_source rake (>= 0.13) thor (~> 1.0) @@ -1024,13 +1027,13 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.9.0) redis (>= 4, < 5) - regexp_parser (2.1.1) + regexp_parser (2.2.1) regexp_property_values (1.0.0) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) uber (< 0.2.0) - request_store (1.5.0) + request_store (1.5.1) rack (>= 1.4) responders (3.0.0) actionpack (>= 5.0) @@ -1055,6 +1058,11 @@ GEM rspec-core (~> 3.10.0) rspec-expectations (~> 3.10.0) rspec-mocks (~> 3.10.0) + rspec-benchmark (0.6.0) + benchmark-malloc (~> 0.2) + benchmark-perf (~> 0.6) + benchmark-trend (~> 0.4) + rspec (>= 3.0) rspec-core (3.10.1) rspec-support (~> 3.10.0) rspec-expectations (3.10.1) @@ -1100,7 +1108,7 @@ GEM parser (>= 2.7.1.5) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-graphql (0.10.3) + rubocop-graphql (0.13.0) rubocop (>= 0.87, < 2) rubocop-performance (1.9.2) rubocop (>= 0.90.0, < 2.0) @@ -1114,20 +1122,20 @@ GEM rubocop-ast (>= 0.7.1) ruby-fogbugz (0.2.1) crack (~> 0.4) - ruby-magic (0.5.3) + ruby-magic (0.5.4) mini_portile2 (~> 2.6) ruby-prof (1.3.1) ruby-progressbar (1.11.0) ruby-saml (1.13.0) nokogiri (>= 1.10.5) rexml - ruby-statistics (2.1.2) + ruby-statistics (3.0.0) ruby2_keywords (0.0.4) ruby_parser (3.15.0) sexp_processor (~> 4.9) rubyntlm (0.6.2) rubypants (0.2.0) - rubyzip (2.0.0) + rubyzip (2.3.2) rugged (1.2.0) safe_yaml (1.0.4) safety_net_attestation (0.4.0) @@ -1140,9 +1148,8 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sassc (2.0.1) + sassc (2.4.0) ffi (~> 1.9) - rake sassc-rails (2.1.0) railties (>= 4.0.0) sassc (>= 2.0) @@ -1152,7 +1159,6 @@ GEM sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - scientist (1.6.2) sd_notify (0.1.0) securecompare (1.0.0) seed-fu (2.3.7) @@ -1161,34 +1167,48 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) + sentry-rails (5.1.1) + railties (>= 5.0) + sentry-ruby-core (~> 5.1.1) sentry-raven (3.1.2) faraday (>= 1.0) + sentry-ruby (5.1.1) + concurrent-ruby (~> 1.0, >= 1.0.2) + sentry-ruby-core (= 5.1.1) + sentry-ruby-core (5.1.1) + concurrent-ruby + sentry-sidekiq (5.1.1) + sentry-ruby-core (~> 5.1.1) + sidekiq (>= 3.0) set (1.0.1) settingslogic (2.0.9) sexp_processor (4.15.1) shellany (0.0.1) shoulda-matchers (4.0.1) activesupport (>= 4.2.0) - sidekiq (6.3.1) + sidekiq (6.4.0) connection_pool (>= 2.2.2) rack (~> 2.0) redis (>= 4.2.0) sidekiq-cron (1.2.0) fugit (~> 1.1) sidekiq (>= 4.2.1) + sigdump (0.2.4) signet (0.14.0) addressable (~> 2.3) faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_po_parser (1.1.2) - simplecov (0.18.5) + simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) simplecov-cobertura (1.3.1) simplecov (~> 0.8) simplecov-html (0.12.3) simplecov-lcov (0.8.0) + simplecov_json_formatter (0.1.4) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.4) snowplow-tracker (0.6.1) @@ -1225,7 +1245,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkey (2.0.0) + ssh_data (1.2.0) ssrf_filter (1.0.7) stackprof (0.2.15) state_machines (0.5.0) @@ -1247,7 +1267,7 @@ GEM sys-filesystem (1.4.3) ffi (~> 1.1) sysexits (1.2.0) - tanuki_emoji (0.5.0) + tanuki_emoji (0.6.0) temple (0.8.2) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) @@ -1261,7 +1281,7 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.1.0) + thor (1.2.1) thrift (0.14.0) tilt (2.0.10) timecop (0.9.1) @@ -1312,7 +1332,7 @@ GEM rugged (>= 0.27, < 1.3) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) + unf_ext (0.0.8) unicode-display_width (1.7.0) unicode_utils (1.4.0) uniform_notifier (1.13.0) @@ -1335,6 +1355,9 @@ GEM activerecord (>= 3.0) activesupport (>= 3.0) version_sorter (2.2.4) + view_component (2.50.0) + activesupport (>= 5.0.0, < 8.0) + method_source (~> 1.0) vmstat (2.3.0) warden (1.2.8) rack (>= 2.0.6) @@ -1372,7 +1395,7 @@ GEM nokogiri (~> 1.8) yajl-ruby (1.4.1) yard (0.9.26) - zeitwerk (2.5.3) + zeitwerk (2.5.4) PLATFORMS ruby @@ -1401,7 +1424,6 @@ DEPENDENCIES base32 (~> 0.3.0) batch-loader (~> 2.0.1) bcrypt (~> 3.1, >= 3.1.14) - bcrypt_pbkdf (~> 1.1) benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.0) @@ -1414,7 +1436,7 @@ DEPENDENCIES capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) - commonmarker (~> 0.23.2) + commonmarker (~> 0.23.4) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 3.0) @@ -1434,7 +1456,6 @@ DEPENDENCIES discordrb-webhooks (~> 3.4) doorkeeper (~> 5.5.0.rc2) doorkeeper-openid_connect (~> 1.7.5) - ed25519 (~> 1.2) elasticsearch-api (~> 6.8.2) elasticsearch-model (~> 6.1) elasticsearch-rails (~> 6.1) @@ -1463,21 +1484,21 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.6.0.pre.rc1) + gitaly (~> 14.9.0.pre.rc4) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 2.6.1) - gitlab-experiment (~> 0.6.5) + gitlab-dangerfiles (~> 2.11.0) + gitlab-experiment (~> 0.7.0) gitlab-fog-azure-rm (~> 1.2.0) - gitlab-labkit (~> 0.21.3) - gitlab-license (~> 2.0) + gitlab-labkit (~> 0.22.0) + gitlab-license (~> 2.1.0) gitlab-license_finder (~> 6.0) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.8.0) gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.9.0) gitlab-sidekiq-fetcher (= 0.8.0) - gitlab-styles (~> 6.6.0) + gitlab-styles (~> 7.0.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.4.0) @@ -1507,7 +1528,7 @@ DEPENDENCIES icalendar invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) - ipynbdiff (= 0.3.8) + ipynbdiff (= 0.4.4) jira-ruby (~> 2.1.4) js_regex (~> 3.7) json (~> 2.5.1) @@ -1534,7 +1555,6 @@ DEPENDENCIES multi_json (~> 1.14.1) net-ldap (~> 0.16.3) net-ntp - net-ssh (~> 6.0) nokogiri (~> 1.12) oauth2 (~> 1.4) octokit (~> 4.15) @@ -1571,7 +1591,7 @@ DEPENDENCIES pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.5.0) - puma (~> 5.5.2) + puma (~> 5.6.2) puma_worker_killer (~> 0.3.1) rack (~> 2.2.3) rack-attack (~> 6.3.0) @@ -1579,7 +1599,7 @@ DEPENDENCIES rack-oauth2 (~> 1.16.0) rack-proxy (~> 0.6.0) rack-timeout (~> 0.5.1) - rails (~> 6.1.4.4) + rails (~> 6.1.4.6) rails-controller-testing rails-i18n (~> 6.0) rainbow (~> 3.0) @@ -1596,6 +1616,7 @@ DEPENDENCIES rexml (~> 3.2.5) rouge (~> 3.27.0) rqrcode-rails3 (~> 0.1.7) + rspec-benchmark (~> 0.6.0) rspec-parameterized rspec-rails (~> 5.0.1) rspec-retry (~> 0.6.1) @@ -1607,20 +1628,24 @@ DEPENDENCIES ruby-progressbar (~> 1.10) ruby-saml (~> 1.13.0) ruby_parser (~> 3.15) - rubyzip (~> 2.0.0) + rubyzip (~> 2.3.2) rugged (~> 1.2) sanitize (~> 6.0) sassc-rails (~> 2.1.0) sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) selenium-webdriver (~> 3.142) + sentry-rails (~> 5.1.1) sentry-raven (~> 3.1) + sentry-ruby (~> 5.1.1) + sentry-sidekiq (~> 5.1.1) settingslogic (~> 2.0.9) shoulda-matchers (~> 4.0.1) - sidekiq (~> 6.3) + sidekiq (~> 6.4) sidekiq-cron (~> 1.2) + sigdump (~> 0.2.4) simple_po_parser (~> 1.1.2) - simplecov (~> 0.18.5) + simplecov (~> 0.21) simplecov-cobertura (~> 1.3.1) simplecov-lcov (~> 0.8.0) slack-messenger (~> 2.3.4) @@ -1631,11 +1656,11 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) sprite-factory (~> 1.7) sprockets (~> 3.7.0) - sshkey (~> 2.0) + ssh_data (~> 1.2) stackprof (~> 0.2.15) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) - tanuki_emoji (~> 0.5) + tanuki_emoji (~> 0.6) terser (= 1.0.2) test-prof (~> 1.0.7) test_file_finder (~> 0.1.3) @@ -1652,6 +1677,7 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.11) version_sorter (~> 2.2.4) + view_component (~> 2.50.0) vmstat (~> 2.3.0) warning (~> 1.2.0) webauthn (~> 2.3) @@ -1661,4 +1687,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.2.24 + 2.3.9 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index a74ca37e00e7..5fc9a183a8b9 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z3ab9n901craqd3p1yl87kawci0vfw1xlh4d0zkj7lx8hpk10sn"; + sha256 = "0abclh3rd7s2k88bj40jn9wcmal8dcybvn5xrnl80xknmxh3zigp"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q94js7ifm0a76xcwxin98bhr8nz0zqcsqi4y7j2mfwm3hq3bh0i"; + sha256 = "0qhnkz4fs45zid30lnc77m4rw7an6pp2pdmkwkn6cczikqz5sklw"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gncnc5xl1ff70mfnqcys2qy65201yjrkwxx0hb5hl7jlamgvz9h"; + sha256 = "0mqcmxv28wy2jrpk9vghq7njjr03drw0ab3hw64j2d9kbpnpb8w8"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "171ida68hrk21cq1zz1kfl9h94a3qw5p3afviqzsirl0kx6qjyv9"; + sha256 = "1d4nxv0p3wv4w0pf89nmxzg10balny5rwbchwsscgiminzh3mg7y"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j9591z8lsp9lx3l75699prw6rgkhhlrfaj4lh5klcdffvxzkvi3"; + sha256 = "1n2n52m5j6h370r5j18w76kgqzzkcv8x72p040l16ax40ysglq7p"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm2pf35p6q4ff78z175h6ihmzfg2j7ssn41374rb9iy9gpiiidm"; + sha256 = "0cmxc80gg7pm6d9y7ah5qr4ymzks8rp51jv0a2qdq2m9p6llzlkk"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sf0nfjcj1na4v6zaxz6hjglax99yznaymjzpk1fi7mk71qf5hx4"; + sha256 = "02dnr16mgwp98n9q733nprfx7dn09z6pa11cfk0pivj8daad5x1l"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g3qdz8dw6zkgz45jd13lwfdnm7rhgczv1pssw63g9k6qj3bkxjm"; + sha256 = "0izra8g3g1agv3mz72b0474adkj4ldszj3nwk3l0szgrln7df0lv"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "090d4wl1pq06m9mibpck0m5nm8h45fwhs3fjx27297kjmnv4gzik"; + sha256 = "15v0dwp2122yzwlw8ca0lgx5qbw8fsasbn8zzcks1mvmc9afisss"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a6mmm1s8abv11ycqs6cq55kr6j89jpclkcnra9w2k47rl047vk4"; + sha256 = "1kngq1555jphy5yhmz4yfigpk3ms4b65ynzy5yssrlhbmdf8r430"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -137,10 +137,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98"; + sha256 = "0vrz4vgqz4grr2ykwkd8zhhd0rg12z89n89zl6aff17zrdhhad35"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -479,16 +479,6 @@ }; version = "3.1.16"; }; - bcrypt_pbkdf = { - groups = ["ed25519"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445"; - type = "gem"; - }; - version = "1.1.0"; - }; benchmark = { groups = ["default" "development"]; platforms = []; @@ -509,6 +499,16 @@ }; version = "2.3.0"; }; + benchmark-malloc = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0svyac8alxbmip6b9rp34wq5lcimdaapjkaqdw1385i66l28ziip"; + type = "gem"; + }; + version = "0.2.0"; + }; benchmark-memory = { dependencies = ["memory_profiler"]; groups = ["default"]; @@ -520,6 +520,26 @@ }; version = "0.1.2"; }; + benchmark-perf = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08cngwnwk2h6cdxx3dyckxcg7d0yi3pm83c26kfzkq1xkyah2azy"; + type = "gem"; + }; + version = "0.6.0"; + }; + benchmark-trend = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10axhj80jan0b7c77hm0aj2yxv0dh9clfy4pppxvxfj3yjlh4nny"; + type = "gem"; + }; + version = "0.4.0"; + }; better_errors = { dependencies = ["coderay" "erubi" "rack"]; groups = ["development"]; @@ -745,14 +765,14 @@ version = "3.0.2"; }; claide = { - groups = ["default" "development"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; + sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; claide-plugins = { dependencies = ["cork" "nap" "open4"]; @@ -794,10 +814,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sshs8mvjgk73sfz3bi9apq0p99kfj7n9bg1cyldl4yyy2z05prs"; + sha256 = "1kn7x7smqsk0x2iq17dbbaay0qimmgza8wbdlrs66dvn0l2wpncm"; type = "gem"; }; - version = "0.23.2"; + version = "0.23.4"; }; concurrent-ruby = { groups = ["default" "development" "test"]; @@ -814,10 +834,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68"; + sha256 = "0ffdxhgirgc86qb42yvmfj6v1v0x4lvi0pxn9zhghkff44wzra0k"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.5"; }; contracts = { groups = ["default"]; @@ -931,10 +951,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07mxkgksgilfipd97rgfhx7c421j1fx7rk6lf0k18bkccyg1r8vn"; + sha256 = "1bmbqxscz0whc3kf5622ffp83k96h0vx71bhb5rzi3zzmg6b4vkl"; type = "gem"; }; - version = "8.4.2"; + version = "8.4.5"; }; danger-gitlab = { dependencies = ["danger" "gitlab"]; @@ -957,6 +977,16 @@ }; version = "1.7.0"; }; + dead_end = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nrg9cwy21iwzl1djp1hamy24q3pfhvvrjqi9q0bwj81gizxy48h"; + type = "gem"; + }; + version = "3.1.1"; + }; deckar01-task_list = { dependencies = ["html-pipeline"]; groups = ["default"]; @@ -1021,15 +1051,15 @@ version = "1.5.1"; }; derailed_benchmarks = { - dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rake" "ruby-statistics" "thor"]; + dependencies = ["benchmark-ips" "dead_end" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rack-test" "rake" "ruby-statistics" "thor"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05nryqr18w61dyk9amajh7chn07zxardxnywayyis72kmd8f9q29"; + sha256 = "1cxaqvfhm8xpv3hvpwn7y4g5315zzf5gsdffdkm1bisjviwvmc15"; type = "gem"; }; - version = "1.8.1"; + version = "2.1.1"; }; device_detector = { groups = ["default"]; @@ -1105,14 +1135,14 @@ version = "3.4.2"; }; docile = { - groups = ["default" "development" "test"]; + groups = ["coverage" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; + sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.0"; }; domain_name = { dependencies = ["unf"]; @@ -1253,16 +1283,6 @@ }; version = "0.3.0"; }; - ed25519 = { - groups = ["ed25519"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw"; - type = "gem"; - }; - version = "1.2.4"; - }; elasticsearch = { dependencies = ["elasticsearch-api" "elasticsearch-transport"]; groups = ["default"]; @@ -1614,10 +1634,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; type = "gem"; }; - version = "1.15.3"; + version = "1.15.5"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -1837,14 +1857,14 @@ }; get_process_mem = { dependencies = ["ffi"]; - groups = ["default" "puma" "unicorn"]; + groups = ["default" "puma" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q7pivp9z9pdxc2ha32q7x9zgqy8m9jf87g6n5mvi5l6knxya8sh"; + sha256 = "1fkyyyxjcx4iigm8vhraa629k2lxa1npsv4015y82snx84v3rzaa"; type = "gem"; }; - version = "0.2.5"; + version = "0.2.7"; }; gettext = { dependencies = ["locale" "text"]; @@ -1896,10 +1916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "175whfk08jrmvssh5lgk0zgsaksbnhv6p5fg3picknrw4v05vw85"; + sha256 = "13yq0ln40iy0wjapdg5phkqgr2bbdfk3xccyr1828yxpgkd44716"; type = "gem"; }; - version = "14.6.0.pre.rc1"; + version = "14.9.0.pre.rc4"; }; github-markup = { groups = ["default"]; @@ -1939,21 +1959,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pgb0v41qn2cnzzn4fizffds07vhz9sf09bpmm0lw86x8lz6vfdq"; + sha256 = "1in56r2mdi6ghwx4nxvfihb2sg73xhnpw0w42wc5f57wwy6m1s24"; type = "gem"; }; - version = "2.6.1"; + version = "2.11.0"; }; gitlab-experiment = { - dependencies = ["activesupport" "request_store" "scientist"]; + dependencies = ["activesupport" "request_store"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "064iy0pgjfvfcxynclmk70cdi10hwx7xzq1c14p68cilg569vma2"; + sha256 = "1ph12qxhml2iq02sad7hybi5yrc5zvz2spav2ahfh3ks2fvs7cbx"; type = "gem"; }; - version = "0.6.5"; + version = "0.7.0"; }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; @@ -1972,20 +1992,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05fs11wpqn801dsscs845629hbgwbgs94qhig45jmalw4h9rira4"; + sha256 = "1vs5q1lfk5i953gv2xvz6h5x6ycllr8hdzg81zsrz7hy3aygxknj"; type = "gem"; }; - version = "0.21.3"; + version = "0.22.0"; }; gitlab-license = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01hddqd3167360m1h5lnrgxd0gmwhaisb9qz89rprhi5ckzyx2gz"; + sha256 = "1ys98a5qwih4l9zllsysd48d7jl5qcw2ralav0hab3lxalmy5pwf"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; gitlab-license_finder = { dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; @@ -2056,10 +2076,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xs7v0sj3j4d5yflfn8n5azh5qwxsrc432q7v4nckg9irwqj99js"; + sha256 = "10fmvx2vx2v0mbwv5d4wcpc2iyp5y8lwxn9hjpzkk5bvxkk4c493"; type = "gem"; }; - version = "6.6.0"; + version = "7.0.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2487,10 +2507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; http-form_data = { groups = ["default"]; @@ -2540,10 +2560,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; type = "gem"; }; - version = "1.8.11"; + version = "1.10.0"; }; i18n_data = { groups = ["default"]; @@ -2603,10 +2623,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0raj4xwp2dz1xrzcpqqdp5ygfpjdy7jx28ziqg9f73hf850j90d1"; + sha256 = "0cgrr3pc0y11gas6k2js33qghj7rpdh99vavda712wbq3hz42jx2"; type = "gem"; }; - version = "0.3.8"; + version = "0.4.4"; }; jaeger-client = { dependencies = ["opentracing" "thrift"]; @@ -3955,10 +3975,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; + sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56"; type = "gem"; }; - version = "5.5.2"; + version = "5.6.2"; }; puma_worker_killer = { dependencies = ["get_process_mem" "puma"]; @@ -4093,10 +4113,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10vylypjzfp6c34zx175x7ql7h27llmjdhgjxp5bn2zmrx3lac8l"; + sha256 = "01mvxg2rmwiqcw0alfd526axg7y1knj0lhy4i2mmxa3q0v7xb8za"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4148,10 +4168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nmyds2www6dmqbbd5ggq31gxxb9mwxd5llzmb3iyczssk6l7lla"; + sha256 = "1snhwpbnmsyhr297qmin8i5i631aimjca1hiazi128i1355255hb"; type = "gem"; }; - version = "6.1.4.4"; + version = "6.1.4.6"; }; rainbow = { groups = ["default" "development" "test"]; @@ -4335,10 +4355,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vg7imjnfcqjx7kw94ccj5r78j4g190cqzi1i59sh4a0l940b9cr"; + sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.1"; }; regexp_property_values = { groups = ["default"]; @@ -4367,10 +4387,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cx74kispmnw3ljwb239j65a2j14n8jlsygy372hrsa8mxc71hxi"; + sha256 = "13ppgmsbrqah08j06bybd3cddv6dml79yzyjn7r8j1src78h98h7"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; responders = { dependencies = ["actionpack" "railties"]; @@ -4488,6 +4508,17 @@ }; version = "3.10.0"; }; + rspec-benchmark = { + dependencies = ["benchmark-malloc" "benchmark-perf" "benchmark-trend" "rspec"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kyn7p409n75ikb7z9v3dbzjyyinkwi88f66alj9lnf2gssss50h"; + type = "gem"; + }; + version = "0.6.0"; + }; rspec-core = { dependencies = ["rspec-support"]; groups = ["default" "development" "test"]; @@ -4625,10 +4656,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hvm17hm7xjqcfn70c7h3rrz2y2mrazqmkp5ains08j0zd39x7rh"; + sha256 = "18md69dkz0s5xm93c4psmvy4c0nx3a7yi61vfjn46cw6yk54fm7b"; type = "gem"; }; - version = "0.10.3"; + version = "0.13.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -4680,10 +4711,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "192bc7a4jgqcjgsp8jzkb2f355k5shy133zbvfcrjb7rjla7n9l9"; + sha256 = "1m91qhhh2sakmd6kznipmwwb3i2qlfx40fpnj4vsh40d2f2v25rc"; type = "gem"; }; - version = "0.5.3"; + version = "0.5.4"; }; ruby-prof = { groups = ["default"]; @@ -4717,14 +4748,14 @@ version = "1.13.0"; }; ruby-statistics = { - groups = ["default"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmd9dk1fcmii38apwn3py00qfqxd5yzylafm49n24plzwv913nh"; + sha256 = "10fwxwhby6n1q1k61bic2s0mddlfwb9x7a7306vir4s60cvh20v1"; type = "gem"; }; - version = "2.1.2"; + version = "3.0.0"; }; ruby2_keywords = { groups = ["danger" "default" "development" "test"]; @@ -4772,10 +4803,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gz0ri0pa2xr7b6bf66yjc2wfvk51f4gi6yk7bklwl1nr65zc4gz"; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; type = "gem"; }; - version = "2.0.0"; + version = "2.3.2"; }; rugged = { groups = ["default"]; @@ -4842,15 +4873,15 @@ version = "4.0.0"; }; sassc = { - dependencies = ["ffi" "rake"]; + dependencies = ["ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4"; + sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c"; type = "gem"; }; - version = "2.0.1"; + version = "2.4.0"; }; sassc-rails = { dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"]; @@ -4874,16 +4905,6 @@ }; version = "0.8.2"; }; - scientist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05xiv6kznhawbkjrz97s6lp2ld0w95x1l2s80gm8m49f273399s2"; - type = "gem"; - }; - version = "1.6.2"; - }; sd_notify = { groups = ["puma"]; platforms = []; @@ -4926,6 +4947,17 @@ }; version = "3.142.7"; }; + sentry-rails = { + dependencies = ["railties" "sentry-ruby-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zv5db0wrvs4gjgrqz7fzpihgil1p9b8hm4bmf25ihyxfskz0vlh"; + type = "gem"; + }; + version = "5.1.1"; + }; sentry-raven = { dependencies = ["faraday"]; groups = ["default"]; @@ -4937,6 +4969,39 @@ }; version = "3.1.2"; }; + sentry-ruby = { + dependencies = ["concurrent-ruby" "sentry-ruby-core"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09f1zkc99m1z89qf40bd2ik4fdkchm5h5rb77bz2zhn1f8xmcjaf"; + type = "gem"; + }; + version = "5.1.1"; + }; + sentry-ruby-core = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "012xra6f9b9y00wvnd2vks5kw3wrjaz3flm692j8sd3qxs8xhbhm"; + type = "gem"; + }; + version = "5.1.1"; + }; + sentry-sidekiq = { + dependencies = ["sentry-ruby-core" "sidekiq"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1byig501hvjyc3y0x5x0w3h0k3c6lw9j10f3kxx7z8zvfy2n3hz4"; + type = "gem"; + }; + version = "5.1.1"; + }; set = { groups = ["default"]; platforms = []; @@ -4994,10 +5059,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k38cbwhcj9ncfzlgfmvq2zqfdvldln58w8s8v89m0jqlhnhsqhj"; + sha256 = "10pllqwracvy5nmchipg359sq9pnyg08q970xpqmpc3nkmrihxlf"; type = "gem"; }; - version = "6.3.1"; + version = "6.4.0"; }; sidekiq-cron = { dependencies = ["fugit" "sidekiq"]; @@ -5010,6 +5075,16 @@ }; version = "1.2.0"; }; + sigdump = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mqf06iw7rymv54y7rgbmfi6ppddgjjmxzi3hrw658n1amp1gwhb"; + type = "gem"; + }; + version = "0.2.4"; + }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; groups = ["default"]; @@ -5032,15 +5107,15 @@ version = "1.1.2"; }; simplecov = { - dependencies = ["docile" "simplecov-html"]; - groups = ["development" "test"]; + dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; + groups = ["coverage" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ycx5q699ycbjhp28sjbkrd62vwxlrb7fh4v2m7sjsp2qhi6cf6r"; + sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; type = "gem"; }; - version = "0.18.5"; + version = "0.21.2"; }; simplecov-cobertura = { dependencies = ["simplecov"]; @@ -5073,6 +5148,16 @@ }; version = "0.8.0"; }; + simplecov_json_formatter = { + groups = ["coverage" "default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; + type = "gem"; + }; + version = "0.1.4"; + }; sixarm_ruby_unaccent = { groups = ["default"]; platforms = []; @@ -5200,15 +5285,15 @@ }; version = "1.3.13"; }; - sshkey = { + ssh_data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; + sha256 = "0p3vaq2fbmlphphqr0yjc5cyzzxjizq4zbxbbw3j2vpgdcmpi6bs"; type = "gem"; }; - version = "2.0.0"; + version = "1.2.0"; }; ssrf_filter = { groups = ["default"]; @@ -5320,10 +5405,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qw0qa3xz4h3izwl5qsvmg5vvfsfjhmv4mdxaw1v1w1qgp7j7gws"; + sha256 = "0an1311bpyhd9kzak1qpd4jks336i47gbvx3zdrnn1rdxppimsac"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; temple = { groups = ["default" "development" "test"]; @@ -5404,10 +5489,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; thrift = { groups = ["default"]; @@ -5645,10 +5730,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd"; type = "gem"; }; - version = "0.0.7.7"; + version = "0.0.8"; }; unicode-display_width = { groups = ["default" "development" "test"]; @@ -5766,6 +5851,17 @@ }; version = "2.2.4"; }; + view_component = { + dependencies = ["activesupport" "method_source"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1syhbmnrqklahqaaac13jx6rwpc6z210f53apwglngp2xdibxkf1"; + type = "gem"; + }; + version = "2.50.0"; + }; vmstat = { groups = ["default"]; platforms = []; @@ -5948,9 +6044,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; + sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; type = "gem"; }; - version = "2.5.3"; + version = "2.5.4"; }; } diff --git a/pkgs/applications/version-management/gitqlient/default.nix b/pkgs/applications/version-management/gitqlient/default.nix new file mode 100644 index 000000000000..3737828ef720 --- /dev/null +++ b/pkgs/applications/version-management/gitqlient/default.nix @@ -0,0 +1,41 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, qmake +, qtwebengine +, gitUpdater +}: + +mkDerivation rec { + pname = "gitqlient"; + version = "1.4.3"; + + src = fetchFromGitHub { + owner = "francescmm"; + repo = pname; + rev = "v${version}"; + sha256 = "018jz6b28zwr205jmgw13ddlfvlhxqf0cw1pfjiwsi6i8gay7w6s"; + }; + + nativeBuildInputs = [ + qmake + ]; + + buildInputs = [ + qtwebengine + ]; + + qmakeFlags = [ + "GitQlient.pro" + ]; + + passthru.updateScript = gitUpdater { inherit pname version; }; + + meta = with lib; { + homepage = "https://github.com/francescmm/GitQlient"; + description = "Multi-platform Git client written with Qt"; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index f7b7305b1097..cf0622a6b0ec 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -8,16 +8,16 @@ with lib; buildGoModule rec { pname = "gogs"; - version = "0.12.3"; + version = "0.12.5"; src = fetchFromGitHub { owner = "gogs"; repo = "gogs"; rev = "v${version}"; - sha256 = "0ix3mxy8cpqbx24qffbzyf5z88x7605icm7rk5n54r8bdsr7cckd"; + sha256 = "sha256-I3kFRKgVMGMKgHU5VEeNai8FseN/ea6MzEP94AR2Zfo="; }; - vendorSha256 = "0m0g4dsiq8p2ngsbjxfi3wff7x4xpm67qlhgcgf8b48mqai4d2gc"; + vendorSha256 = "sha256-3dT5D+oDd0mpJp/cP53TQcRUkmqh6g3sRBWWAUqhaAo="; subPackages = [ "." ]; diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 61e938b093b3..9e444fb3b39e 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -2,12 +2,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.64"; + version = "0.68.1"; src = fetchurl { - url = - "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "1qigv8fnmiynrx6qrg28n2981a30n56nh3xbhmlpihl7fqxmg1sq"; + url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; + sha256 = "122wignzrhsw00mfnh7mxcxvjyp9rk73yxzfyvmg7f5kmb0hng35"; }; nativeBuildInputs = [ pkg-config ]; @@ -35,7 +34,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gameoftrees.org"; license = licenses.isc; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ abbe ]; }; } diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix new file mode 100644 index 000000000000..fbf800363ab0 --- /dev/null +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -0,0 +1,60 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, dbus +, sqlite +, Security +, SystemConfiguration +, libiconv +, testVersion +, jujutsu +}: + +rustPlatform.buildRustPackage rec { + pname = "jujutsu"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "martinvonz"; + repo = "jj"; + rev = "v${version}"; + sha256 = "sha256-BOT2pKcOSOha28fba62X+GgILcplhkMWhZo7Q0gGTQ8="; + }; + + cargoSha256 = "sha256-uvR+WXX2iIWFhcPYpOoOS1WBvOXuhTmgVVT2446c6XE="; + + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + dbus + sqlite + ] ++ lib.optionals stdenv.isDarwin [ + Security + SystemConfiguration + libiconv + ]; + + passthru.tests = { + version = testVersion { + package = jujutsu; + command = "jj --version"; + }; + }; + + meta = with lib; { + description = "A Git-compatible DVCS that is both simple and powerful"; + homepage = "https://github.com/martinvonz/jj"; + changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index bef284ea5344..462744641e3b 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,5 +1,6 @@ { lib , fetchurl +, fetchpatch , gettext , itstool , python3 @@ -27,6 +28,16 @@ python3.pkgs.buildPythonApplication rec { sha256 = "cP6Y65Ms4h1nFw47D2pzF+gT6GLemJM+pROYLpoDMgI="; }; + patches = [ + # Pull upstream fix for meson-0.60: + # https://gitlab.gnome.org/GNOME/meld/-/merge_requests/78 + (fetchpatch { + name = "meson-0.60.patch"; + url = "https://gitlab.gnome.org/GNOME/meld/-/commit/cc7746c141d976a4779cf868774fae1fe7627a6d.patch"; + sha256 = "sha256-4uJZyF00Z6svzrOebByZV1hutCZRkIQYC4rUxQr5fdQ="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 85993487fb37..9dc3e0329e3c 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -20,23 +20,28 @@ let inherit (python3Packages) docutils python fb-re2 pygit2 pygments; self = python3Packages.buildPythonApplication rec { - pname = "mercurial"; - version = "6.0.1"; + pname = "mercurial${lib.optionalString fullBuild "-full"}"; + version = "6.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-Bf0LSAOJyWVH9abHaekO4A8dE/esDUZeQKOBxs86VuI="; + sha256 = "sha256-hvmGReRWWpJWmR3N4it3uOfSLKb7tgwfTNvYRpo4zB8="; }; + patches = [ + # Fix the type of libc buffer for aarch64-linux + ./fix-rhg-type-aarch64.patch + ]; + format = "other"; passthru = { inherit python; }; # pass it so that the same version can be used in hg2git cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; - name = "${pname}-${version}"; - sha256 = "sha256-leyLb6RqntiuEhmJSUkZRUuO8ah0BZI5OhKkGbWRjxs="; - sourceRoot = "${pname}-${version}/rust"; + name = "mercurial-${version}"; + sha256 = "sha256-+Y91gEC8vmyutNpVFAAL4MSg4KnpFbhH12CIuMRx0Mc="; + sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -92,7 +97,6 @@ let downloadPage = "https://www.mercurial-scm.org/release/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ eelco lukegb pacien ]; - updateWalker = true; platforms = platforms.unix; }; }; @@ -181,7 +185,11 @@ in buildInputs = self.buildInputs ++ self.propagatedBuildInputs; nativeBuildInputs = self.nativeBuildInputs; - phases = [ "installPhase" "installCheckPhase" ]; + dontUnpack = true; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + doCheck = false; installPhase = '' runHook preInstall diff --git a/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch b/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch new file mode 100644 index 000000000000..84417b497c0a --- /dev/null +++ b/pkgs/applications/version-management/mercurial/fix-rhg-type-aarch64.patch @@ -0,0 +1,12 @@ +diff --git a/rust/hg-core/src/lock.rs b/rust/hg-core/src/lock.rs +--- a/rust/hg-core/src/lock.rs ++++ b/rust/hg-core/src/lock.rs +@@ -145,7 +145,7 @@ lazy_static::lazy_static! { + + /// Same as https://github.com/python/cpython/blob/v3.10.0/Modules/socketmodule.c#L5414 + const BUFFER_SIZE: usize = 1024; +- let mut buffer = [0_i8; BUFFER_SIZE]; ++ let mut buffer = [0 as libc::c_char; BUFFER_SIZE]; + let hostname_bytes = unsafe { + let result = libc::gethostname(buffer.as_mut_ptr(), BUFFER_SIZE); + if result != 0 { diff --git a/pkgs/applications/version-management/monotone/default.upstream b/pkgs/applications/version-management/monotone/default.upstream deleted file mode 100644 index e0d01fb190c6..000000000000 --- a/pkgs/applications/version-management/monotone/default.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url http://www.monotone.ca/downloads.php - -do_overwrite(){ - ensure_version - ensure_hash - set_var_value version $CURRENT_VERSION - set_var_value sha256 $CURRENT_HASH -} diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index d814e0ca0a52..d46a67a8601e 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed }: +{ lib, stdenv, fetchurl, fetchpatch, buildPackages, diffutils, ed, lzip }: stdenv.mkDerivation rec { pname = "rcs"; - version = "5.10.0"; + version = "5.10.1"; src = fetchurl { - url = "mirror://gnu/rcs/${pname}-${version}.tar.xz"; - sha256 = "sha256-Og2flYx60wPkdehjRlSXTtvm3rOkVEkfOFfcGIm6xcU"; + url = "mirror://gnu/rcs/${pname}-${version}.tar.lz"; + sha256 = "sha256-Q93+EHJKi4XiRo9kA7YABzcYbwHmDgvWL95p2EIjTMU="; }; ac_cv_path_ED = "${ed}/bin/ed"; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { hardeningDisable = lib.optional stdenv.cc.isClang "format"; + nativeBuildInputs = [ lzip ]; + meta = { homepage = "https://www.gnu.org/software/rcs/"; description = "Revision control system"; diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index 9835e23f2828..c3c25dafd544 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '>= 2.4.0', '< 2.8.0' gem 'bundler', '>= 1.12.0' -gem 'rails', '5.2.6' +gem 'rails', '5.2.6.2' gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') gem 'rouge', '~> 3.26.0' diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 00ac026e8696..b745c54520b1 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.6) - actionpack (= 5.2.6) + actioncable (5.2.6.2) + actionpack (= 5.2.6.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) + actionmailer (5.2.6.2) + actionpack (= 5.2.6.2) + actionview (= 5.2.6.2) + activejob (= 5.2.6.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.6) - actionview (= 5.2.6) - activesupport (= 5.2.6) + actionpack (5.2.6.2) + actionview (= 5.2.6.2) + activesupport (= 5.2.6.2) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) @@ -21,26 +21,26 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actionview (5.2.6) - activesupport (= 5.2.6) + actionview (5.2.6.2) + activesupport (= 5.2.6.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.6) - activesupport (= 5.2.6) + activejob (5.2.6.2) + activesupport (= 5.2.6.2) globalid (>= 0.3.6) - activemodel (5.2.6) - activesupport (= 5.2.6) - activerecord (5.2.6) - activemodel (= 5.2.6) - activesupport (= 5.2.6) + activemodel (5.2.6.2) + activesupport (= 5.2.6.2) + activerecord (5.2.6.2) + activemodel (= 5.2.6.2) + activesupport (= 5.2.6.2) arel (>= 9.0) - activestorage (5.2.6) - actionpack (= 5.2.6) - activerecord (= 5.2.6) + activestorage (5.2.6.2) + actionpack (= 5.2.6.2) + activerecord (= 5.2.6.2) marcel (~> 1.0.0) - activesupport (5.2.6) + activesupport (5.2.6.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -58,21 +58,21 @@ GEM rack-test (>= 0.6.3) regexp_parser (~> 1.5) xpath (~> 3.2) - childprocess (3.0.0) + childprocess (4.1.0) chunky_png (1.4.0) concurrent-ruby (1.1.9) crass (1.0.6) - css_parser (1.10.0) + css_parser (1.11.0) addressable csv (3.1.9) docile (1.4.0) erubi (1.10.0) - globalid (0.5.2) + globalid (1.0.0) activesupport (>= 5.0) htmlentities (4.3.4) - i18n (1.8.10) + i18n (1.8.11) concurrent-ruby (~> 1.0) - loofah (2.12.0) + loofah (2.14.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -82,7 +82,7 @@ GEM mini_magick (4.11.0) mini_mime (1.0.3) mini_portile2 (2.5.3) - minitest (5.14.4) + minitest (5.15.0) mocha (1.13.0) mysql2 (0.5.3) net-ldap (0.17.0) @@ -91,44 +91,44 @@ GEM mini_portile2 (~> 2.5.0) racc (~> 1.4) parallel (1.21.0) - parser (3.0.2.0) + parser (3.1.1.0) ast (~> 2.4.1) pg (1.2.3) public_suffix (4.0.6) - puma (5.5.2) + puma (5.6.2) nio4r (~> 2.0) - racc (1.5.2) + racc (1.6.0) rack (2.2.3) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.6) - actioncable (= 5.2.6) - actionmailer (= 5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) - activemodel (= 5.2.6) - activerecord (= 5.2.6) - activestorage (= 5.2.6) - activesupport (= 5.2.6) + rails (5.2.6.2) + actioncable (= 5.2.6.2) + actionmailer (= 5.2.6.2) + actionpack (= 5.2.6.2) + actionview (= 5.2.6.2) + activejob (= 5.2.6.2) + activemodel (= 5.2.6.2) + activerecord (= 5.2.6.2) + activestorage (= 5.2.6.2) + activesupport (= 5.2.6.2) bundler (>= 1.3.0) - railties (= 5.2.6) + railties (= 5.2.6.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - railties (5.2.6) - actionpack (= 5.2.6) - activesupport (= 5.2.6) + railties (5.2.6.2) + actionpack (= 5.2.6.2) + activesupport (= 5.2.6.2) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) rbpdf (1.20.1) htmlentities @@ -136,7 +136,7 @@ GEM rbpdf-font (1.19.1) redcarpet (3.5.1) regexp_parser (1.8.2) - request_store (1.5.0) + request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) roadie (4.0.0) @@ -147,7 +147,7 @@ GEM roadie (>= 3.1, < 5.0) rotp (6.2.0) rouge (3.26.1) - rqrcode (2.1.0) + rqrcode (2.1.1) chunky_png (~> 1.0) rqrcode_core (~> 1.0) rqrcode_core (1.2.0) @@ -160,8 +160,8 @@ GEM rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.12.0) - parser (>= 3.0.1.1) + rubocop-ast (1.16.0) + parser (>= 3.1.1.0) rubocop-performance (1.10.2) rubocop (>= 0.90.0, < 2.0) rubocop-ast (>= 0.4.0) @@ -172,8 +172,9 @@ GEM ruby-openid (2.9.2) ruby-progressbar (1.11.0) rubyzip (2.3.2) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) + selenium-webdriver (4.1.0) + childprocess (>= 0.5, < 5.0) + rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2) simplecov (0.18.5) docile (~> 1.1) @@ -182,25 +183,27 @@ GEM sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) - thor (1.1.0) + thor (1.2.1) thread_safe (0.3.6) tzinfo (1.2.9) thread_safe (~> 0.1) unicode-display_width (2.1.0) - webdrivers (4.6.1) + webdrivers (4.7.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) - selenium-webdriver (>= 3.0, < 4.0) + selenium-webdriver (> 3.141, < 5.0) + webrick (1.7.0) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.26) + yard (0.9.27) + webrick (~> 1.7.0) PLATFORMS ruby @@ -224,7 +227,7 @@ DEPENDENCIES pg (~> 1.2.2) puma rack-openid - rails (= 5.2.6) + rails (= 5.2.6.2) rails-dom-testing rbpdf (~> 1.20.0) redcarpet (~> 3.5.1) diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 5a964f51e362..39e46d90b88d 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }: let - version = "4.2.3"; + version = "4.2.4"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; @@ -15,8 +15,10 @@ in inherit version; src = fetchurl { - url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "033slhr5kmz5b29v7n52336i0r7y4m9si748b22r85s2jpf37xkj"; + # https://www.redmine.org/news/134 + # > "These releases are not available yet on the releases page from a technical reason, we are sorry for this and we expected to have them uploaded next week. I'll post here an update after we have them uploaded." + url = "https://www.redmine.org/attachments/download/28862/${pname}-${version}.tar.gz"; + sha256 = "7f50fd4a6cf1c1e48091a87696b813ba264e11f04dec67fb006858a1b49a5c7d"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index dbbef0f218aa..a18e819fc90a 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s778lwghaf0zwfvbhzvjq691rl75d85raiqg1c7zly8p9afq8ym"; + sha256 = "0il9l30jz1gfjccrahfk2gl57b31dqgjlzjc8cfifm76ggywmz67"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gwvn4lrkhqmxp96npjp4sfaz78h9ab2lrl20sjph7xxakfwknld"; + sha256 = "1cci24da56d467ldq40n3l176h9qdw691w1b703c251izh6c4n5d"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2xl458f2ygnjbvv0hacc8bk9qxbx64m2g7vw6f9y7k8q85930y"; + sha256 = "1xis55xvs4hja6fnmj4785rzafk553k5f0xb7jprqf38c6dzmiak"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06f8212kplqhap9jpi49dvqlhwkfxxxm9nh8al6qjvl7mfh9qbzg"; + sha256 = "00a9g63xwfimnzsrcrnr4vmdwhg7jaic49jas70r695nznwkxr9x"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cdvxkbzbs4cdh4bgf2cg7i886a20gvr43hg76kx5rzd8xal7xnd"; + sha256 = "0fm5qxrv8pxhl7m88p17xxpizddasm9kknaldkax8im3b9vrgnr9"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; activemodel = { dependencies = ["activesupport"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r28kcnzr8dm6idirndd8pvbmg5c678ijxk845g84ykq1l69czs6"; + sha256 = "0k0xizwbcadmslc8rkg2vnsbrsqivm6yj2yjrzb6rhqwphcr9zjf"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05qqnichgxml6z3d1dpgjy2fi62dppnqxgg37hr9a35hwhn05fzc"; + sha256 = "1m00zh62rfn2h15vfn89jg39wxmghc88v2vjb5r4m0c7g24vrb14"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wnzac1qs4y339p13xyr03rx4ql3i4ywzfhyzn118d2zz82xnpfl"; + sha256 = "0h3z331xli0j5didh0g9cv4zrlx32b5csp1566fpy0fr2kgqmpi9"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj"; + sha256 = "164lmi9w96wdwd00dnly8f9dcak3blv49ymyqz30q2fdjn45c775"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -166,10 +166,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; + sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in"; type = "gem"; }; - version = "3.0.0"; + version = "4.1.0"; }; chunky_png = { groups = ["default"]; @@ -207,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5"; + sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; csv = { groups = ["default"]; @@ -248,10 +248,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k6ww3shk3mv119xvr9m99l6ql0czq91xhd66hm8hqssb18r2lvm"; + sha256 = "1n5yc058i8xhi1fwcp1w7mfi6xaxfmrifdb4r4hjfff33ldn8lqj"; type = "gem"; }; - version = "0.5.2"; + version = "1.0.0"; }; htmlentities = { groups = ["default"]; @@ -269,10 +269,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; + sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; type = "gem"; }; - version = "1.8.10"; + version = "1.8.11"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -280,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw"; + sha256 = "0z8bdcmw66j3dy6ivcc02yq32lx3n9bavx497llln8qy014xjm4w"; type = "gem"; }; - version = "2.12.0"; + version = "2.14.0"; }; mail = { dependencies = ["mini_mime"]; @@ -351,10 +351,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; + sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; type = "gem"; }; - version = "5.14.4"; + version = "5.15.0"; }; mocha = { groups = ["test"]; @@ -431,10 +431,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06ma6w87ph8lnc9z4hi40ynmcdnjv0p8x53x0s3fjkz4q2p6sxh5"; + sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c"; type = "gem"; }; - version = "3.0.2.0"; + version = "3.1.1.0"; }; pg = { groups = ["default"]; @@ -470,20 +470,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn"; + sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56"; type = "gem"; }; - version = "5.5.2"; + version = "5.6.2"; }; racc = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; }; rack = { groups = ["default" "openid" "test"]; @@ -523,10 +523,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p17dmifd0v3knh9wja4z4rv0qaybwansnwxmvx6f3rcgkszkpnc"; + sha256 = "0fgbld733j2j85pf8kpv1mvp8rmlkqs7ccv77q2mwfm7ri4yisy0"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -556,20 +556,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rs97fxv13hgpbmyhk8ag8qzgkh25css0797h90k9w1vg9djl84k"; + sha256 = "1fgyw80j2mss3hdhzxa1b12c7j17az55znq0d16md69if8dwfmic"; type = "gem"; }; - version = "5.2.6"; + version = "5.2.6.2"; }; rainbow = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.1"; }; rake = { groups = ["default"]; @@ -628,10 +628,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cx74kispmnw3ljwb239j65a2j14n8jlsygy372hrsa8mxc71hxi"; + sha256 = "13ppgmsbrqah08j06bybd3cddv6dml79yzyjn7r8j1src78h98h7"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; rexml = { groups = ["default" "test"]; @@ -691,10 +691,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0444sgvx3ahvgr3c9swpy32kcdpciwgcqahp3pb4m7d23xp1qjdc"; + sha256 = "10sq4aknch9rzpy8af77rqxk8rr59d33slg1kwg9h7fw9f1spmjn"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; rqrcode_core = { groups = ["default"]; @@ -723,10 +723,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x0xfq2mpg194rcanbjrgvjbh94s9kq72jynxx61789s628kxy59"; + sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv"; type = "gem"; }; - version = "1.12.0"; + version = "1.16.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -781,15 +781,15 @@ version = "2.3.2"; }; selenium-webdriver = { - dependencies = ["childprocess" "rubyzip"]; + dependencies = ["childprocess" "rexml" "rubyzip"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0adcvp86dinaqq3nhf8p3m0rl2g6q0a4h52k0i7kdnsg1qz9k86y"; + sha256 = "17hilxa40cj7q48k6wcx1cbdb1v3q9c4nx89fji7gyqpcfm16vq7"; type = "gem"; }; - version = "3.142.7"; + version = "4.1.0"; }; simplecov = { dependencies = ["docile" "simplecov-html"]; @@ -829,20 +829,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2"; + sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min"; type = "gem"; }; - version = "3.2.2"; + version = "3.4.2"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; thread_safe = { groups = ["default" "test"]; @@ -881,10 +881,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1naymcfmm9pkf0f67xd99d9f6dpv477ggyvc1c04gxifirynfydp"; + sha256 = "05fdb6z8541p912xanjbl9y15cyj6g44530y0nib6qhv6i90rkzp"; type = "gem"; }; - version = "4.6.1"; + version = "4.7.0"; + }; + webrick = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; }; websocket-driver = { dependencies = ["websocket-extensions"]; @@ -919,13 +929,14 @@ version = "3.2.0"; }; yard = { + dependencies = ["webrick"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h"; + sha256 = "0d08gkis1imlvppyh8dbslk89hwj5af2fmlzvmwahgx2bm48d9sn"; type = "gem"; }; - version = "0.9.26"; + version = "0.9.27"; }; } diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 3c0e540d228b..932f4847c281 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "20.2.5"; + version = "21.2.2"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "05f3yhzf6mvr6c5v6qvjrx97pzrrnkh9mp444zlkbnpgnrsmdc6v"; + sha256 = "10v6sg0lmjby3v8g3sk2rzzvdx5p69ia4zz2c0hbf30rk0p6gqn3"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -65,23 +65,19 @@ stdenv.mkDerivation rec { comment = meta.description; icon = "smartgit"; desktopName = "SmartGit"; - categories = concatStringsSep ";" [ + categories = [ "Application" "Development" "RevisionControl" ]; - mimeType = concatStringsSep ";" [ + mimeTypes = [ "x-scheme-handler/git" "x-scheme-handler/smartgit" "x-scheme-handler/sourcetree" ]; - startupNotify = "true"; - extraEntries = '' - Keywords=git - StartupWMClass=${name} - Version=1.0 - Encoding=UTF-8 - ''; + startupNotify = true; + startupWMClass = name; + keywords = [ "git" ]; }; meta = with lib; { diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 2e771de73a54..350afd07fe19 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -11,13 +11,13 @@ , python }: let - version = "0.74.17"; + version = "0.75.2"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "builds.sr.ht"; rev = version; - sha256 = "sha256-6Yc33lkhozpnx8e6yukUfo+/Qw5mwpJQQKuYbC7uqcU="; + sha256 = "sha256-SwyxMzmp9baRQ0vceuEn/OpfIv7z7jwq/l67hdOHXjM="; }; buildWorker = src: buildGoModule { diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 3242b85e3787..805da8c32821 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "srht"; - version = "0.68.13"; + version = "0.68.14"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/core.sr.ht"; rev = version; - sha256 = "sha256-LPyEfpNlmod18Fj16xpihKOrsU/hQUfAeOmWMmUeVPQ="; + sha256 = "sha256-BY3W2rwrg0mhH3CltgUqg6Xv8Ve5VZNY/lI1cfbAjYM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index 18e105aea4bf..a2da28404ac9 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "dispatchsrht" ]; meta = with lib; { - homepage = "https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht"; + homepage = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht"; description = "Task dispatcher and service integration tool for the sr.ht network"; license = licenses.agpl3Only; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index e33bb6595012..318bee4cf517 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -8,13 +8,13 @@ , scmsrht }: let - version = "0.76.4"; + version = "0.77.3"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "git.sr.ht"; rev = version; - sha256 = "sha256-diUkQpB/ivg8JTaoTcSyKr9Q9LZiMo6qVInBDPceklc="; + sha256 = "sha256-eJvXCcmdiUzTK0EqNJkLEZsAfr6toD/378HObnMbOWM="; }; buildShell = src: buildGoModule { @@ -48,6 +48,11 @@ buildPythonPackage rec { inherit src version; pname = "gitsrht"; + patches = [ + # Revert change breaking Unix socket support for Redis + patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch + ]; + nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index 6716f643a7e1..f3e778b2f31b 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "hgsrht"; - version = "0.29.3"; + version = "0.29.4"; src = fetchhg { url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht"; rev = version; - sha256 = "y8gKaamwD5lsYqO1SkxMcn3E2TWidHAo2slvEU+8ovg="; + sha256 = "Jn9M/R5tJK/GeJDWGo3LWCK2nwsfI9zh+/yo2M+X6Sk="; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 3490796dda01..3ba6375a9138 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -12,15 +12,20 @@ buildPythonPackage rec { pname = "listssrht"; - version = "0.51.0"; + version = "0.51.7"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "lists.sr.ht"; rev = version; - sha256 = "sha256-iywZ6G5E4AJevg/Q1LoB7JMJxBcsAnbhiND++mFy/bw="; + sha256 = "sha256-oNY5A98oVoL2JKO0fU/8YVl8u7ywmHb/RHD8A6z9yIM="; }; + patches = [ + # Revert change breaking Unix socket support for Redis + patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch + ]; + nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 2d4d152e3aae..8d43f297a4f8 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mansrht"; - version = "0.15.22"; + version = "0.15.23"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "man.sr.ht"; rev = version; - sha256 = "sha256-curouf+eNCKprDI23blGs4AzJMry6zlCLDt/+0j5c8A="; + sha256 = "sha256-xrBptXdwMee+YkPup/BYL/iXBhCzSUQ5htSHIw/1Ncc="; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 74a00692b6c7..ab19cc88d25e 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -18,19 +18,19 @@ , python }: let - version = "0.57.2"; + version = "0.57.5"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "meta.sr.ht"; rev = version; - sha256 = "sha256-+ksfAOuch/fLkFLYU52Ug0Hf0EoERy+oCwa9g+GKuAA="; + sha256 = "sha256-qsCwZaCiqvY445U053OCWD98jlIUi9NB2jWVP2oW3Vk="; }; buildApi = src: buildGoModule { inherit src version; pname = "metasrht-api"; - vendorSha256 = "sha256-vo+YbMyo/Eal7hbFxP9hwIW2cePJcGFszoDRCCzFYdM="; + vendorSha256 = "sha256-8Ubrr9qRlgW2wsLHrPHwulSWLz+gp4VPcTvOZpg8TYM="; }; in diff --git a/pkgs/applications/version-management/sourcehut/pages.nix b/pkgs/applications/version-management/sourcehut/pages.nix index 9b6011d99900..b6a18b5bda77 100644 --- a/pkgs/applications/version-management/sourcehut/pages.nix +++ b/pkgs/applications/version-management/sourcehut/pages.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pagessrht"; - version = "0.5.2"; + version = "0.6.2"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "pages.sr.ht"; rev = version; - sha256 = "sha256-yEM122uhF0MNkMlNXyvBSfkLogRQETeuBl2K66kivac="; + sha256 = "sha256-ob0+t9V2o8lhVC6fXbi1rNm0Mnbs+GoyAmhBqVZ13PA="; }; - vendorSha256 = "sha256-udr+1y5ApQCSPhs3yQTTi9QfzRbz0A9COYuFMjQGa74="; + vendorSha256 = "sha256-b0sHSH0jkKoIVq045N96wszuLJDegkkj0v50nuDFleU="; postInstall = '' mkdir -p $out/share/sql/ diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch new file mode 100644 index 000000000000..4c526dd23e11 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch @@ -0,0 +1,50 @@ +From 5ccb5386304c26f25b0a9eb10ce9edb6da32f91a Mon Sep 17 00:00:00 2001 +From: Julien Moutinho +Date: Sat, 12 Feb 2022 00:11:59 +0100 +Subject: [PATCH git.sr.ht] Revert "Add webhook queue monitoring" + +This reverts commit 7ea630b776947ab82438d0ffa263b0f9d33ebff3. + +Which has broken Unix socket support for Redis. +See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E +--- + gitsrht/app.py | 3 --- + gitsrht/webhooks.py | 5 +---- + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/gitsrht/app.py b/gitsrht/app.py +index e9ccb56..4928851 100644 +--- a/gitsrht/app.py ++++ b/gitsrht/app.py +@@ -48,9 +48,6 @@ class GitApp(ScmSrhtFlask): + self.add_template_filter(url_quote) + self.add_template_filter(commit_links) + +- from gitsrht.webhooks import webhook_metrics_collector +- self.metrics_registry.register(webhook_metrics_collector) +- + @self.context_processor + def inject(): + notice = session.get("notice") +diff --git a/gitsrht/webhooks.py b/gitsrht/webhooks.py +index 8a203fe..6240d50 100644 +--- a/gitsrht/webhooks.py ++++ b/gitsrht/webhooks.py +@@ -7,13 +7,10 @@ if not hasattr(db, "session"): + db.init() + from srht.webhook import Event + from srht.webhook.celery import CeleryWebhook, make_worker +-from srht.metrics import RedisQueueCollector + from scmsrht.webhooks import UserWebhook + import sqlalchemy as sa + +-webhook_broker = cfg("git.sr.ht", "webhooks") +-worker = make_worker(broker=webhook_broker) +-webhook_metrics_collector = RedisQueueCollector(webhook_broker, "srht_webhooks", "Webhook queue length") ++worker = make_worker(broker=cfg("git.sr.ht", "webhooks")) + + class RepoWebhook(CeleryWebhook): + events = [ +-- +2.34.1 + diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch new file mode 100644 index 000000000000..872d285b9bb0 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch @@ -0,0 +1,48 @@ +From 730e090f31b150d42be4b4722751f8e4610835b0 Mon Sep 17 00:00:00 2001 +From: Julien Moutinho +Date: Sat, 12 Feb 2022 00:38:12 +0100 +Subject: [PATCH lists.sr.ht] Revert "Add webhook queue monitoring" + +This reverts commit e74e344808e8d523a9786cefcbf64c9a247d7a0e. + +Which has broken Unix socket support for Redis. +See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E +--- + listssrht/app.py | 3 --- + listssrht/webhooks.py | 5 +---- + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/listssrht/app.py b/listssrht/app.py +index aec59f3..83a355d 100644 +--- a/listssrht/app.py ++++ b/listssrht/app.py +@@ -29,9 +29,6 @@ class ListsApp(SrhtFlask): + self.register_blueprint(user) + self.register_blueprint(gql_blueprint) + +- from listssrht.webhooks import webhook_metrics_collector +- self.metrics_registry.register(webhook_metrics_collector) +- + @self.context_processor + def inject(): + from listssrht.types import ListAccess +diff --git a/listssrht/webhooks.py b/listssrht/webhooks.py +index ae5b1cb..86421ba 100644 +--- a/listssrht/webhooks.py ++++ b/listssrht/webhooks.py +@@ -8,11 +8,8 @@ if not hasattr(db, "session"): + db.init() + from srht.webhook import Event + from srht.webhook.celery import CeleryWebhook, make_worker +-from srht.metrics import RedisQueueCollector + +-webhook_broker = cfg("lists.sr.ht", "webhooks") +-worker = make_worker(broker=webhook_broker) +-webhook_metrics_collector = RedisQueueCollector(webhook_broker, "srht_webhooks", "Webhook queue length") ++worker = make_worker(broker=cfg("lists.sr.ht", "webhooks")) + + class ListWebhook(CeleryWebhook): + events = [ +-- +2.34.1 + diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch new file mode 100644 index 000000000000..861608c11843 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch @@ -0,0 +1,50 @@ +From 42a27ea60d8454552d54e1f51f1b976d1067fc32 Mon Sep 17 00:00:00 2001 +From: Julien Moutinho +Date: Sat, 12 Feb 2022 00:30:29 +0100 +Subject: [PATCH todo.sr.ht] Revert "Add webhook queue monitoring" + +This reverts commit 320a5e8f7cd16ca43928c36f0320593f84d986fa. + +Which has broken Unix socket support for Redis. +See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E +--- + todosrht/flask.py | 3 --- + todosrht/webhooks.py | 6 +----- + 2 files changed, 1 insertion(+), 8 deletions(-) + +diff --git a/todosrht/flask.py b/todosrht/flask.py +index 5e8ac66..9d0fd27 100644 +--- a/todosrht/flask.py ++++ b/todosrht/flask.py +@@ -43,9 +43,6 @@ class TodoApp(SrhtFlask): + self.add_template_filter(urls.tracker_url) + self.add_template_filter(urls.user_url) + +- from todosrht.webhooks import webhook_metrics_collector +- self.metrics_registry.register(webhook_metrics_collector) +- + @self.context_processor + def inject(): + return { +diff --git a/todosrht/webhooks.py b/todosrht/webhooks.py +index eb8e08a..950047f 100644 +--- a/todosrht/webhooks.py ++++ b/todosrht/webhooks.py +@@ -7,13 +7,9 @@ if not hasattr(db, "session"): + db.init() + from srht.webhook import Event + from srht.webhook.celery import CeleryWebhook, make_worker +-from srht.metrics import RedisQueueCollector + import sqlalchemy as sa + +- +-webhooks_broker = cfg("todo.sr.ht", "webhooks") +-worker = make_worker(broker=webhooks_broker) +-webhook_metrics_collector = RedisQueueCollector(webhooks_broker, "srht_webhooks", "Webhook queue length") ++worker = make_worker(broker=cfg("todo.sr.ht", "webhooks")) + + import todosrht.tracker_import + +-- +2.34.1 + diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index 9fbaa8c92454..10da3018843a 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "scmsrht"; - version = "0.22.16"; # Untagged version + version = "0.22.19"; # Untagged version src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "scm.sr.ht"; rev = version; - sha256 = "sha256-A4Q7wUc4ag7KRWOkdYXCsbzuFHyJJsM15OjrCoVt9UQ="; + sha256 = "sha256-/QryPjWJ2S0Ov9DTdrwbM81HYucHiYcLh0oKacflywI="; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index da31ba240730..1446e68fa69d 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -12,15 +12,20 @@ buildPythonPackage rec { pname = "todosrht"; - version = "0.66.1"; + version = "0.67.2"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "todo.sr.ht"; rev = version; - sha256 = "sha256-P0xaQpK7O9zipGSIa5jL1O0L/fKt51EMNGt7XndYQ+g="; + sha256 = "sha256-/QHsMlhzyah85ubZyx8j4GDUoITuWcLDJKosbZGeOZU="; }; + patches = [ + # Revert change breaking Unix socket support for Redis + patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch + ]; + nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkrev/default.nix similarity index 54% rename from pkgs/applications/version-management/tkcvs/default.nix rename to pkgs/applications/version-management/tkrev/default.nix index 36e9154571be..66c1aa4d0e12 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkrev/default.nix @@ -1,18 +1,21 @@ { lib, stdenv, fetchurl, tcl, tk }: stdenv.mkDerivation rec { - pname = "tkcvs"; - version = "8.2.1"; + pname = "tkrev"; + version = "9.4.1"; src = fetchurl { - url = "mirror://sourceforge/tkcvs/tkcvs_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; - sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i"; + url = "mirror://sourceforge/tkcvs/tkrev_${version}.tar.gz"; + sha256 = "sha256-WHDZPShEB9Q+Bjbb37mogJLUZk2GuWoO8bz+Zydc7i4="; }; buildInputs = [ tcl tk ]; patchPhase = '' - sed -e 's@exec wish@exec ${tk}/bin/wish@' -i tkcvs/tkcvs.tcl tkdiff/tkdiff + for file in tkrev/tkrev.tcl tkdiff/tkdiff; do + substituteInPlace "$file" \ + --replace "exec wish" "exec ${tk}/bin/wish" + done ''; installPhase = '' diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 3e1b6e4cd8cb..6a9903c25b20 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,45 +1,59 @@ -{ lib, fetchurl, python3Packages -, mercurial, qt5 +{ lib +, fetchurl +, python3Packages +, mercurial +, qt5 }: python3Packages.buildPythonApplication rec { - pname = "tortoisehg"; - version = "5.9"; + pname = "tortoisehg"; + version = "6.1"; - src = fetchurl { - url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; - sha256 = "1y8nb2b9j9qx11k1wrb9hydc94dgbsqx4yf2bv8y878hqmk1z57a"; - }; + src = fetchurl { + url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; + sha256 = "sha256-UG13BlFY9DcsCPWaBiYa6r2oA3ieJtTYfXknDoKNkYI="; + }; - # Extension point for when thg's mercurial is lagging behind mainline. - tortoiseMercurial = mercurial; + # Extension point for when thg's mercurial is lagging behind mainline. + tortoiseMercurial = mercurial; - propagatedBuildInputs = with python3Packages; [ - tortoiseMercurial qscintilla-qt5 iniparse - ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ + tortoiseMercurial + qscintilla-qt5 + iniparse + ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - doCheck = false; # tests fail with "thg: cannot connect to X server" - postInstall = '' - mkdir -p $out/share/doc/tortoisehg - cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt - # convenient alias - ln -s $out/bin/thg $out/bin/tortoisehg - wrapQtApp $out/bin/thg - ''; + doCheck = true; + postInstall = '' + mkdir -p $out/share/doc/tortoisehg + cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt + # convenient alias + ln -s $out/bin/thg $out/bin/tortoisehg + wrapQtApp $out/bin/thg + ''; - checkPhase = '' - echo "test: thg version" - $out/bin/thg version - ''; + checkPhase = '' + export QT_QPA_PLATFORM=offscreen + echo "test: thg smoke test" + $out/bin/thg -h > help.txt & + sleep 1s + if grep "list of commands" help.txt; then + echo "thg help output was captured. Seems like package in a working state." + exit 0 + else + echo "thg help output was not captured. Seems like package is broken." + exit 1 + fi + ''; - passthru.mercurial = tortoiseMercurial; + passthru.mercurial = tortoiseMercurial; - meta = { - description = "Qt based graphical tool for working with Mercurial"; - homepage = "https://tortoisehg.bitbucket.io/"; - license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ danbst ]; - }; + meta = { + description = "Qt based graphical tool for working with Mercurial"; + homepage = "https://tortoisehg.bitbucket.io/"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ danbst ]; + }; } diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index e0e26b804f58..ffd5fdaab7c0 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,18 +1,43 @@ -{ lib, stdenv, fetchFromGitHub, git, gnupg, installShellFiles }: +{ lib +, stdenv +, resholvePackage +, fetchFromGitHub +, git +, bash +, openssl +, gawk +/* +TODO: yadm can use git-crypt and transcrypt +but it does so in a way that resholve 0.6.0 +can't yet do anything smart about. It looks +like these are for interactive use, so the +main impact should just be that users still +need both of these packages in their profile +to support their use in yadm. +*/ +# , git-crypt +# , transcrypt +, j2cli +, esh +, gnupg +, coreutils +, gnutar +, installShellFiles +, runCommand +, yadm +}: -stdenv.mkDerivation rec { +resholvePackage rec { pname = "yadm"; version = "3.1.1"; - buildInputs = [ git gnupg ]; - nativeBuildInputs = [ installShellFiles ]; src = fetchFromGitHub { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "sha256-bgiRBlqEjDq0gQ0+aUWpFDeE2piFX3Gy2gEAXgChAOk="; + hash = "sha256-bgiRBlqEjDq0gQ0+aUWpFDeE2piFX3Gy2gEAXgChAOk="; }; dontConfigure = true; @@ -31,6 +56,72 @@ stdenv.mkDerivation rec { --bash completion/bash/yadm ''; + solutions = { + yadm = { + scripts = [ "bin/yadm" ]; + interpreter = "${bash}/bin/sh"; + inputs = [ + git + gnupg + openssl + gawk + # see head comment + # git-crypt + # transcrypt + j2cli + esh + bash + coreutils + gnutar + ]; + fake = { + external = if stdenv.isCygwin then [ ] else [ "cygpath" ]; + }; + fix = { + "$GPG_PROGRAM" = [ "gpg" ]; + "$OPENSSL_PROGRAM" = [ "openssl" ]; + "$GIT_PROGRAM" = [ "git" ]; + "$AWK_PROGRAM" = [ "awk" ]; + # see head comment + # "$GIT_CRYPT_PROGRAM" = [ "git-crypt" ]; + # "$TRANSCRYPT_PROGRAM" = [ "transcrypt" ]; + "$J2CLI_PROGRAM" = [ "j2" ]; + "$ESH_PROGRAM" = [ "esh" ]; + # not in nixpkgs (yet) + # "$ENVTPL_PROGRAM" = [ "envtpl" ]; + # "$LSB_RELEASE_PROGRAM" = [ "lsb_release" ]; + }; + keep = { + "$YADM_COMMAND" = true; # internal cmds + "$template_cmd" = true; # dynamic, template-engine + "$SHELL" = true; # probably user env? unsure + "$hook_command" = true; # ~git hooks? + "exec" = [ "$YADM_BOOTSTRAP" ]; # yadm bootstrap script + + # not in nixpkgs + "$ENVTPL_PROGRAM" = true; + "$LSB_RELEASE_PROGRAM" = true; + }; + /* + TODO: these should be dropped as fast as they can be dealt + with properly in binlore and/or resholve. + */ + execer = [ + "cannot:${j2cli}/bin/j2" + "cannot:${esh}/bin/esh" + "cannot:${git}/bin/git" + "cannot:${gnupg}/bin/gpg" + ]; + }; + }; + + passthru.tests = { + minimal = runCommand "${pname}-test" {} '' + export HOME=$out + ${yadm}/bin/yadm init + ''; + }; + meta = { homepage = "https://github.com/TheLocehiliosan/yadm"; description = "Yet Another Dotfiles Manager"; @@ -40,6 +131,7 @@ stdenv.mkDerivation rec { * Provides a way to use alternate files on a specific OS or host. * Supplies a method of encrypting confidential data so it can safely be stored in your repository. ''; + changelog = "https://github.com/TheLocehiliosan/yadm/blob/${version}/CHANGES"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ abathur ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix new file mode 100644 index 000000000000..6883587b4b81 --- /dev/null +++ b/pkgs/applications/video/ani-cli/default.nix @@ -0,0 +1,44 @@ +{ fetchFromGitHub +, makeWrapper +, stdenvNoCC +, lib +, gnugrep +, gnused +, curl +, openssl +, mpv +, aria2 +}: + +stdenvNoCC.mkDerivation rec { + pname = "ani-cli"; + version = "1.9"; + + src = fetchFromGitHub { + owner = "pystardust"; + repo = "ani-cli"; + rev = "v${version}"; + sha256 = "sha256-oYiq3Mnuhba5NELJXqVN3gY/d0RfQIqW13YtdcmYKK4="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -Dm755 ani-cli $out/bin/ani-cli + + wrapProgram $out/bin/ani-cli \ + --prefix PATH : ${lib.makeBinPath [ gnugrep gnused curl openssl mpv aria2 ]} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/pystardust/ani-cli"; + description = "A cli tool to browse and play anime"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ skykanin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index a9eee05d238f..2919cb10ca3f 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "byzanz"; src = fetchgit { - url = "git://github.com/GNOME/byzanz"; + url = "https://gitlab.gnome.org/Archive/byzanz"; rev = "1875a7f6a3903b83f6b1d666965800f47db9286a"; sha256 = "0a72fw2mxl8vdcdnzy0bwis4jk28pd7nc8qgr4vhyw5pd48dynvh"; }; diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 4f09fc14d9f8..0e97eab1773e 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -12,7 +12,7 @@ , desktop-file-utils , makeWrapper , shared-mime-info -, wrapGAppsHook +, wrapGAppsHook4 , meson , gjs , gtk4 @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { pkg-config python3 shared-mime-info # for update-mime-database - wrapGAppsHook # for gsettings + wrapGAppsHook4 # for gsettings ]; buildInputs = [ diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 287557d6f53e..9a1940cffc75 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -1,6 +1,7 @@ { lib, fetchurl, makeDesktopItem, ffmpeg , qmake, qttools, mkDerivation , qtbase, qtdeclarative, qtlocation, qtquickcontrols2, qtwebchannel, qtwebengine +, yt-dlp }: mkDerivation rec { @@ -16,7 +17,15 @@ mkDerivation rec { buildInputs = [ ffmpeg qtbase qtdeclarative qtlocation qtquickcontrols2 qtwebchannel qtwebengine ]; nativeBuildInputs = [ qmake qttools ]; - postPatch = lib.optionalString (ffmpeg != null) '' + patches = [ + ./yt-dlp-path.patch + ]; + + postPatch = '' + substituteInPlace youtube_dl.cpp \ + --replace 'QString YoutubeDl::path = QString();' \ + 'QString YoutubeDl::path = QString("${yt-dlp}/bin/yt-dlp");' + '' + lib.optionalString (ffmpeg != null) '' substituteInPlace converter_ffmpeg.cpp \ --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \ --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg ' @@ -31,7 +40,7 @@ mkDerivation rec { desktopName = "ClipGrab"; comment = meta.description; genericName = "Web video downloader"; - categories = "Qt;AudioVideo;Audio;Video"; + categories = [ "Qt" "AudioVideo" "Audio" "Video" ]; }; installPhase = '' diff --git a/pkgs/applications/video/clipgrab/yt-dlp-path.patch b/pkgs/applications/video/clipgrab/yt-dlp-path.patch new file mode 100644 index 000000000000..5a9a4b6dcc48 --- /dev/null +++ b/pkgs/applications/video/clipgrab/yt-dlp-path.patch @@ -0,0 +1,86 @@ +--- a/main.cpp ++++ b/main.cpp +@@ -91,14 +91,5 @@ int main(int argc, char *argv[]) + w.show(); + } + +- QTimer::singleShot(0, [=] { +- cg->getUpdateInfo(); +- QObject::connect(cg, &ClipGrab::updateInfoProcessed, [cg] { +- bool force = QSettings().value("forceYoutubeDlDownload", false).toBool(); +- if (force) QSettings().setValue("forceYoutubeDlDownload", false); +- cg->downloadYoutubeDl(force); +- }); +- }); +- + return app.exec(); + } +--- a/youtube_dl.cpp ++++ b/youtube_dl.cpp +@@ -8,52 +8,16 @@ YoutubeDl::YoutubeDl() + QString YoutubeDl::path = QString(); + + QString YoutubeDl::find(bool force) { +- if (!force && !path.isEmpty()) return path; +- +- // Prefer downloaded youtube-dl +- QString localPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, "yt-dlp"); +- QProcess* process = instance(localPath, QStringList() << "--version"); +- process->start(); +- process->waitForFinished(); +- process->deleteLater(); +- if (process->state() != QProcess::NotRunning) process->kill(); +- if (process->exitCode() == QProcess::ExitStatus::NormalExit) { +- path = localPath; +- return path; +- } +- +- // Try system-wide youtube-dlp installation +- QString globalPath = QStandardPaths::findExecutable("yt-dlp"); +- process = instance(globalPath, QStringList() << "--version"); +- process->start(); +- process->waitForFinished(); +- process->deleteLater(); +- if (process->state() != QProcess::NotRunning) process->kill(); +- if (process->exitCode() == QProcess::ExitStatus::NormalExit) { +- path = globalPath; +- return path; +- } +- +- return ""; ++ // We supply yt-dlp from nixpkgs, so the downloading ++ // machinery is not needed anymore. ++ (void)force; ++ return path; + } + + QProcess* YoutubeDl::instance(QStringList arguments) { +- return instance(find(), arguments); +-} +- +-QProcess* YoutubeDl::instance(QString path, QStringList arguments) { + QProcess *process = new QProcess(); + +- QString execPath = QCoreApplication::applicationDirPath(); +- QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); +- env.insert("PATH", execPath + ":" + env.value("PATH")); +- process->setEnvironment(env.toStringList()); +- +- #if defined Q_OS_WIN +- process->setProgram(execPath + "/python/python.exe"); +- #else +- process->setProgram(QStandardPaths::findExecutable("python3")); +- #endif ++ process->setProgram(path); + + QSettings settings; + QStringList proxyArguments; +@@ -81,7 +45,7 @@ QProcess* YoutubeDl::instance(QString path, QStringList arguments) { + networkArguments << "--force-ipv4"; + } + +- process->setArguments(QStringList() << path << arguments << proxyArguments << networkArguments); ++ process->setArguments(QStringList() << arguments << proxyArguments << networkArguments); + return process; + } + diff --git a/pkgs/applications/video/corrscope/default.nix b/pkgs/applications/video/corrscope/default.nix index 0e1d377be28e..1c7855c7c073 100644 --- a/pkgs/applications/video/corrscope/default.nix +++ b/pkgs/applications/video/corrscope/default.nix @@ -2,7 +2,6 @@ , mkDerivationWith , python3Packages , fetchFromGitHub -, fetchpatch , wrapQtAppsHook , ffmpeg , qtbase @@ -10,25 +9,16 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "corrscope"; - version = "0.7.1"; + version = "0.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "corrscope"; repo = "corrscope"; rev = version; - sha256 = "0c9kmrw6pcda68li04b5j2kmsgdw1q463qlc32wn96zn9hl82v6m"; + sha256 = "1wdla4ryif1ss37aqi61lcvzddvf568wyh5s3xv1lrryh4al9vpd"; }; - patches = [ - # Remove when bumping past 0.7.1 - (fetchpatch { - name = "0001-Use-poetry-core.patch"; - url = "https://github.com/corrscope/corrscope/commit/d40d1846dd54b8bccd7b8055d6aece48aacbb943.patch"; - sha256 = "0xxsbmxdbh3agfm6ww3rpa7ab0ysppan490w0gaqwmwzrxmmdljv"; - }) - ]; - nativeBuildInputs = [ wrapQtAppsHook ] ++ (with python3Packages; [ @@ -48,8 +38,10 @@ mkDerivationWith python3Packages.buildPythonApplication rec { matplotlib numpy packaging + qtpy pyqt5 ruamel-yaml + colorspacious ]; dontWrapQtApps = true; diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix index 066c17f10690..67f098c97fba 100644 --- a/pkgs/applications/video/droidcam/default.nix +++ b/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-3iA7GDTiCx5vHawj8ZBFAK0BIfmxEFuQrVfL7Gi6FhM="; + sha256 = "sha256-AxJBpoiBnb+5Pq/h4giOYAeLlvOtAJT5sCwzPEKo7w4="; }; nativeBuildInputs = [ @@ -30,7 +30,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/droidcam.c \ - --replace "/opt/droidcam-icon.png" "$out/share/icons/hicolor/droidcam.png" + --replace "/opt/droidcam-icon.png" "$out/share/icons/hicolor/96x96/apps/droidcam.png" + substituteInPlace droidcam.desktop \ + --replace "/opt/droidcam-icon.png" "droidcam" \ + --replace "/usr/local/bin/droidcam" "droidcam" ''; preBuild = '' @@ -42,7 +45,8 @@ stdenv.mkDerivation rec { runHook preInstall install -Dt $out/bin droidcam droidcam-cli - install -D icon2.png $out/share/icons/hicolor/droidcam.png + install -D icon2.png $out/share/icons/hicolor/96x96/apps/droidcam.png + install -D droidcam.desktop $out/share/applications/droidcam.desktop runHook postInstall ''; diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 81f3cac73e19..8d42c2b2bfd6 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -3,17 +3,21 @@ , fetchurl , bison , cdrtools -, docbook5 +, docbook_xml_dtd_412 +, docbook-xsl-nons , dvdauthor , dvdplusrwtools , ffmpeg , flex , fontconfig , gettext +, glib +, gobject-introspection , libexif -, makeWrapper +, libjpeg , pkg-config -, wxGTK30 +, wrapGAppsHook +, wxGTK30-gtk3 # crash with wxGTK30 with GTK2 compat , wxSVG , xine-ui , xmlto @@ -37,43 +41,50 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ + bison + docbook_xml_dtd_412 + docbook-xsl-nons + flex + gettext + gobject-introspection pkg-config + wrapGAppsHook + xmlto + zip ]; buildInputs = [ - bison cdrtools - docbook5 dvdauthor dvdplusrwtools ffmpeg - flex fontconfig - gettext + glib libexif - makeWrapper + libjpeg wxSVG - wxGTK30 + wxGTK30-gtk3 xine-ui - xmlto - zip ] ++ optionals dvdisasterSupport [ dvdisaster ] ++ optionals udevSupport [ udev ] ++ optionals dbusSupport [ dbus ] ++ optionals thumbnailSupport [ libgnomeui ]; + enableParallelBuilding = true; - postInstall = let - binPath = makeBinPath [ + preFixup = let + binPath = makeBinPath ([ cdrtools dvdauthor dvdplusrwtools - ]; in + ] ++ optionals dvdisasterSupport [ dvdisaster ]); + in '' - wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}" - ''; + gappsWrapperArgs+=( + --prefix PATH : "${binPath}" + ) + ''; - enableParallelBuilding = true; meta = with lib; { homepage = "https://www.dvdstyler.org/"; diff --git a/pkgs/applications/video/epgstation/client/package.json b/pkgs/applications/video/epgstation/client/package.json new file mode 100644 index 000000000000..6ba9974afa5a --- /dev/null +++ b/pkgs/applications/video/epgstation/client/package.json @@ -0,0 +1,57 @@ +{ + "name": "epgstation-client", + "version": "2.6.20", + "private": true, + "scripts": { + "build": "vue-cli-service build", + "lint": "vue-cli-service lint", + "watch": "vue-cli-service build --watch --mode development" + }, + "dependencies": { + "@mdi/font": "6.5.95", + "aribb24.js": "1.8.8", + "axios": "0.24.0", + "eventemitter2": "6.4.5", + "hls.js": "1.1.2", + "inversify": "6.0.1", + "json-stable-stringify": "1.0.1", + "lodash": "4.17.21", + "material-design-icons-iconfont": "6.1.1", + "mpegts.js": "1.6.10", + "reflect-metadata": "0.1.13", + "resize-observer-polyfill": "1.5.1", + "roboto-fontface": "*", + "smoothscroll-polyfill": "0.4.4", + "socket.io-client": "4.3.2", + "typeface-roboto": "1.1.13", + "vue": "2.6.14", + "vue-class-component": "7.2.6", + "vue-property-decorator": "9.1.2", + "vue-router": "3.5.3", + "vuetify": "2.5.10", + "vuetify-datetime-picker": "2.1.1", + "@types/hls.js": "0.13.3", + "@types/json-stable-stringify": "1.0.33", + "@types/lodash": "4.14.178", + "@types/smoothscroll-polyfill": "0.3.1", + "@types/socket.io-client": "1.4.36", + "@typescript-eslint/eslint-plugin": "4.33.0", + "@typescript-eslint/parser": "4.33.0", + "@vue/cli-plugin-eslint": "4.5.12", + "@vue/cli-plugin-typescript": "4.5.13", + "@vue/cli-plugin-vuex": "4.5.13", + "@vue/cli-service": "4.5.13", + "@vue/eslint-config-prettier": "6.0.0", + "@vue/eslint-config-typescript": "7.0.0", + "eslint": "7.32.0", + "eslint-plugin-prettier": "3.4.1", + "eslint-plugin-vue": "7.20.0", + "prettier": "2.4.1", + "sass": "1.32.12", + "sass-loader": "10.2.0", + "typescript": "4.4.4", + "vue-cli-plugin-vuetify": "2.4.3", + "vue-template-compiler": "2.6.14", + "vuetify-loader": "1.7.3" + } +} diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index 3d910ad4c0e8..77510ae153de 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -10,17 +10,18 @@ , nodePackages , gzip , jq +, yq }: let # NOTE: use updateScript to bump the package version pname = "EPGStation"; - version = "1.7.5"; + version = "2.6.20"; src = fetchFromGitHub { owner = "l3tnun"; repo = "EPGStation"; rev = "v${version}"; - sha256 = "06yaf5yb5rp3q0kdhw33df7px7vyfby885ckb6bdzw3wnams5d8m"; + sha256 = "K1cAvmqWEfS6EY4MKAtjXb388XLYHtouxNM70PWgFig="; }; workaround-opencollective-buildfailures = stdenv.mkDerivation { @@ -35,19 +36,44 @@ let ''; }; - pkg = nodePackages.epgstation.override (drv: { + client = nodePackages.epgstation-client.override (drv: { + # FIXME: remove this option if possible + # + # Unsetting this option resulted NPM attempting to re-download packages. + dontNpmInstall = true; + + meta = drv.meta // { + inherit (nodejs.meta) platforms; + }; + }); + + server = nodePackages.epgstation.override (drv: { inherit src; + bypassCache = false; + + # This is set to false to keep devDependencies at build time. Build time + # dependencies are pruned afterwards. + production = false; + buildInputs = [ bash ]; nativeBuildInputs = [ + nodejs workaround-opencollective-buildfailures makeWrapper - nodePackages.node-pre-gyp - ]; + ] ++ (with nodePackages; [ + node-pre-gyp + node-gyp-build + ]); preRebuild = '' # Fix for not being able to connect to mysql using domain sockets. - patch -p1 ${./use-mysql-over-domain-socket.patch} + patch -p1 < ${./use-mysql-over-domain-socket.patch} + + # Workaround for https://github.com/svanderburg/node2nix/issues/275 + sed -i -e "s|#!/usr/bin/env node|#! ${nodejs}/bin/node|" node_modules/node-gyp-build/bin.js + + find . -name package-lock.json -delete ''; postInstall = let @@ -56,12 +82,19 @@ let '' mkdir -p $out/{bin,libexec,share/doc/epgstation,share/man/man1} - pushd $out/lib/node_modules/EPGStation + pushd $out/lib/node_modules/epgstation + + cp -r ${client}/lib/node_modules/epgstation-client/node_modules client/node_modules + chmod -R u+w client/node_modules npm run build - npm prune --production - mv config/{enc.sh,enc.js} $out/libexec + npm prune --production + pushd client + npm prune --production + popd + + mv config/enc.js.template $out/libexec/enc.js mv LICENSE Readme.md $out/share/doc/epgstation mv doc/* $out/share/doc/epgstation sed 's/@DESCRIPTION@/${drv.meta.description}/g' ${./epgstation.1} \ @@ -82,8 +115,9 @@ let ln -sfT /var/lib/epgstation/thumbnail thumbnail makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \ - --run "cd $out/lib/node_modules/EPGStation" \ - --prefix PATH : ${lib.makeBinPath runtimeDeps} + --run "cd $out/lib/node_modules/epgstation" \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} \ + --set APP_ROOT_PATH "$out/lib/node_modules/epgstation" popd ''; @@ -99,22 +133,25 @@ let common-updater-scripts genericUpdater writers - jq; + jq + yq; }; # nodePackages.epgstation is a stub package to fetch npm dependencies and - # is marked as broken to prevent users from installing it directly. This - # technique ensures epgstation can share npm packages with the rest of - # nixpkgs while still allowing us to heavily customize the build. It also - # allows us to provide devDependencies for the epgstation build process - # without doing the same for all the other node packages. - meta = drv.meta // { broken = false; }; + # its meta.platforms is made empty to prevent users from installing it + # directly. This technique ensures epgstation can share npm packages with + # the rest of nixpkgs while still allowing us to heavily customize the + # build. It also allows us to provide devDependencies for the epgstation + # build process without doing the same for all the other node packages. + meta = drv.meta // { + inherit (nodejs.meta) platforms; + }; }); in -pkg // { +server // { name = "${pname}-${version}"; - meta = with lib; pkg.meta // { + meta = with lib; server.meta // { maintainers = with maintainers; [ midchildan ]; # NOTE: updateScript relies on this being correct diff --git a/pkgs/applications/video/epgstation/epgstation.1 b/pkgs/applications/video/epgstation/epgstation.1 index bb5c02381378..2dc67f646088 100644 --- a/pkgs/applications/video/epgstation/epgstation.1 +++ b/pkgs/applications/video/epgstation/epgstation.1 @@ -27,7 +27,7 @@ platforms, run to start EPGStation. .Sh FILES .Bl -tag -width Ds -compact -.It Pa /etc/epgstation/config.json +.It Pa /etc/epgstation/config.yml .Nm configuration file. .El @@ -48,5 +48,9 @@ Restore the EPGstation database. .Pp .Dl $ epgstation run restore /path/to/src .Pp +Restore the EPGstation database from the prior v1 release. +.Pp +.Dl $ epgstation run v1migrate /path/to/src +.Pp .Sh SEE ALSO .Xr npm 1 diff --git a/pkgs/applications/video/epgstation/package.json b/pkgs/applications/video/epgstation/package.json index 53b1ebca2da7..cf302a95161a 100644 --- a/pkgs/applications/video/epgstation/package.json +++ b/pkgs/applications/video/epgstation/package.json @@ -1,85 +1,72 @@ { - "name": "EPGStation", - "version": "1.7.5", + "name": "epgstation", + "version": "2.6.20", "description": "DTV Software in Japan.", "repository": { "type": "git", - "url": "https://github.com/l3tnun/EPGStation.git" + "url": "git+https://github.com/l3tnun/EPGStation-V2.git" }, "author": "l3tnun", "license": "MIT", "bugs": { - "url": "https://github.com/l3tnun/EPGStation/issues" - }, - "homepage": "https://github.com/l3tnun/EPGStation#readme", - "engines": { - "node": "^10.x.x < 11 || ^12.14.0 < 13 || ^14.5.0 < 15" + "url": "https://github.com/l3tnun/EPGStation-V2/issues" }, + "homepage": "https://github.com/l3tnun/EPGStation-V2#readme", "dependencies": { - "aribts": "^2.1.12", - "b24.js": "1.0.3", - "basic-auth": "2.0.1", + "arib-subtitle-timedmetadater": "4.0.9", + "aribts": "2.1.12", + "axios": "0.24.0", "body-parser": "1.19.0", - "chart.js": "2.9.3", - "css-ripple-effect": "1.0.5", - "diskusage": "1.1.3", + "cors": "2.8.5", + "diskusage-ng": "1.0.2", "express": "4.17.1", - "express-openapi": "7.0.1", - "fs-extra": "9.0.1", - "hls-b24.js": "0.12.3", - "js-yaml": "3.14.0", - "lodash": "4.17.20", + "express-openapi": "9.3.0", + "file-type": "16.5.3", + "inversify": "5.1.1", + "js-yaml": "4.1.0", + "lodash": "4.17.21", "log4js": "6.3.0", - "material-design-icons": "3.0.1", - "material-design-lite": "1.3.0", "minimist": "1.2.5", - "mirakurun": "3.3.1", - "mithril": "2.0.4", + "mirakurun": "3.9.0-beta.26", "mkdirp": "1.0.4", - "multer": "1.4.2", + "multer": "1.4.3", "mysql": "2.18.1", - "openapi-types": "7.0.1", - "pg": "8.3.3", - "request": "2.88.2", - "socket.io": "2.3.0", - "socket.io-client": "2.3.0", - "sqlite3": "5.0.0", - "swagger-ui-dist": "3.34.0", + "openapi-types": "9.3.0", + "reflect-metadata": "0.1.13", + "socket.io": "4.3.1", + "source-map-support": "0.5.20", + "sqlite3": "5.0.2", + "swagger-ui-dist": "3.52.5", + "typeorm": "0.2.38", "url-join": "4.0.1", - "@types/basic-auth": "1.1.3", - "@types/body-parser": "1.19.0", - "@types/chart.js": "2.9.24", - "@types/express": "4.17.8", - "@types/hls.js": "0.13.1", - "@types/js-yaml": "3.12.5", - "@types/lodash": "4.14.161", - "@types/material-design-lite": "1.1.16", - "@types/minimist": "1.2.0", - "@types/mithril": "2.0.3", - "@types/mkdirp": "1.0.1", - "@types/multer": "1.4.4", - "@types/mysql": "2.15.15", - "@types/node": "14.11.1", - "@types/pg": "7.14.5", - "@types/request": "2.48.5", - "@types/socket.io": "2.1.11", - "@types/socket.io-client": "1.4.33", - "@types/sqlite3": "3.1.6", - "@types/url-join": "4.0.0", - "del": "5.1.0", + "@types/body-parser": "1.19.1", + "@types/express": "4.17.13", + "@types/file-type": "10.9.1", + "@types/js-yaml": "4.0.4", + "@types/lodash": "4.14.176", + "@types/minimist": "1.2.2", + "@types/mkdirp": "1.0.2", + "@types/mongodb": "4.0.6", + "@types/multer": "1.4.7", + "@types/node": "16.11.6", + "@types/socket.io": "3.0.1", + "@types/source-map-support": "0.5.4", + "@types/sqlite3": "3.1.7", + "@types/url-join": "4.0.1", + "@typescript-eslint/eslint-plugin": "4.33.0", + "@typescript-eslint/parser": "4.33.0", + "del": "6.0.0", + "eslint": "7.32.0", + "eslint-config-prettier": "8.3.0", + "eslint-plugin-prettier": "3.4.1", "gulp": "4.0.2", - "gulp-clean-css": "4.3.0", - "gulp-concat": "2.6.1", - "gulp-dart-sass": "1.0.2", + "gulp-eslint": "6.0.0", "gulp-plumber": "1.2.1", - "gulp-sourcemaps": "2.6.5", - "gulp-tslint": "8.1.4", + "gulp-sourcemaps": "3.0.0", "gulp-typescript": "5.0.1", - "terser-webpack-plugin": "4.2.2", - "ts-loader": "8.0.4", - "tslint": "6.1.3", - "typescript": "4.0.3", - "webpack": "4.44.2", - "webpack-stream": "6.1.0" + "prettier": "2.4.1", + "ts-loader": "9.2.6", + "ts-node": "10.4.0", + "typescript": "4.4.4" } } diff --git a/pkgs/applications/video/epgstation/update.nix b/pkgs/applications/video/epgstation/update.nix index 9faa83c64f9e..5eb23be6c52b 100644 --- a/pkgs/applications/video/epgstation/update.nix +++ b/pkgs/applications/video/epgstation/update.nix @@ -6,6 +6,7 @@ , genericUpdater , writers , jq +, yq }: let @@ -13,7 +14,7 @@ let inherit pname version; attrPath = lib.toLower pname; rev-prefix = "v"; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${homepage}"; + versionLister = "${common-updater-scripts}/bin/list-git-tags --url=${homepage}"; }; updateScript = builtins.elemAt updater 0; updateArgs = map (lib.escapeShellArg) (builtins.tail updater); @@ -40,6 +41,11 @@ in writers.writeBash "update-epgstation" '' } | del(.devDependencies, .main, .scripts)' \ "$SRC/package.json" \ > package.json + ${jq}/bin/jq '. + { + dependencies: (.dependencies + .devDependencies), + } | del(.devDependencies, .main, .scripts)' \ + "$SRC/client/package.json" \ + > client/package.json # Regenerate node packages to update the pre-overriden epgstation derivation. # This must come *after* package.json has been regenerated. @@ -49,18 +55,11 @@ in writers.writeBash "update-epgstation" '' # Generate default streaming settings for the nixos module. pushd ../../../../nixos/modules/services/video/epgstation - ${jq}/bin/jq ' - { liveHLS - , liveMP4 - , liveWebM - , mpegTsStreaming - , mpegTsViewer - , recordedDownloader - , recordedStreaming - , recordedHLS - , recordedViewer - }' \ - "$SRC/config/config.sample.json" \ + ${yq}/bin/yq -j '{ urlscheme , stream }' \ + "$SRC/config/config.yml.template" \ > streaming.json + + # Fix generated output for EditorConfig compliance + printf '\n' >> streaming.json # rule: insert_final_newline popd '' diff --git a/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch b/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch index 48640f2ba08d..87bb3e7fbd19 100644 --- a/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch +++ b/pkgs/applications/video/epgstation/use-mysql-over-domain-socket.patch @@ -1,17 +1,46 @@ -diff --git a/src/server/ConfigInterface.ts b/src/server/ConfigInterface.ts -index d23badd..1dd2b98 100644 ---- a/src/server/ConfigInterface.ts -+++ b/src/server/ConfigInterface.ts -@@ -11,9 +11,10 @@ interface ConfigInterface { - dbPath: string; - dbInfoPath: string; - mysql: { +diff --git a/ormconfig.js b/ormconfig.js +index 5591853b..838c06cb 100644 +--- a/ormconfig.js ++++ b/ormconfig.js +@@ -38,8 +38,6 @@ switch (config.dbtype) { + + case 'mysql': + ormConfig.type = 'mysql'; +- ormConfig.host = config.mysql.host; +- ormConfig.port = config.mysql.port; + ormConfig.username = config.mysql.user; + ormConfig.password = config.mysql.password; + ormConfig.database = config.mysql.database; +@@ -49,6 +47,12 @@ switch (config.dbtype) { + } else { + ormConfig.charset = config.mysql.charset; + } ++ if (config.mysql.socketPath) { ++ ormConfig.socketPath = config.mysql.socketPath; ++ } else { ++ ormConfig.host = config.mysql.host; ++ ormConfig.port = config.mysql.port; ++ } + break; + + case 'postgres': +diff --git a/src/model/IConfigFile.ts b/src/model/IConfigFile.ts +index 6a502e83..ba84a423 100644 +--- a/src/model/IConfigFile.ts ++++ b/src/model/IConfigFile.ts +@@ -61,12 +61,13 @@ export default interface IConfigFile { + regexp?: boolean; + }; + mysql?: { - host: string; + host?: string; -+ socketPath?: string; user: string; -- password: string; -+ password?: string; +- port: number; ++ port?: number; + password: string; database: string; - connectTimeout: number; - connectionLimit: number; + charset?: string; ++ socketPath?: string; + }; + postgres?: { + host: string; diff --git a/pkgs/applications/video/f1viewer/default.nix b/pkgs/applications/video/f1viewer/default.nix index b00d2d8275be..c241dd8a7458 100644 --- a/pkgs/applications/video/f1viewer/default.nix +++ b/pkgs/applications/video/f1viewer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "f1viewer"; - version = "2.4.0"; + version = "2.6.2"; src = fetchFromGitHub { owner = "SoMuchForSubtlety"; repo = pname; rev = "v${version}"; - sha256 = "7eXRUG74l9+9nU7EmDvNcHc+2pg5+/amjqtrzT60f94="; + sha256 = "sha256-Z6rnkHypk7r9NnYwqZpWQOuGPbWn/EppS+46PQHIdDM="; }; - vendorSha256 = "4pQ8NT0mh3w7naHEHh2w6Csop0uitlWClZ95VlYaPW0="; + vendorSha256 = "sha256-UNeH3zxgssXxFpJws6nAL8EgXt0DRyAQfmlJWz/qyDg="; meta = with lib; { description = diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 41c035350d83..a2f802c6e87b 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.4"; + version = "1.22.8"; src = fetchPypi { inherit pname version; - sha256 = "a20978538ae9a51bdbe5ef5aa0f87ede0f8efd2817ab240980de56eac36982e3"; + sha256 = "sha256-vxiq6q8fPh8ZLKnxYdIN591UQW73FWsoke1PvKTkko8="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index 93f11e78ffb3..df435d03d09d 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openjdk11, makeWrapper, autoPatchelfHook +{ lib, stdenv, fetchurl, openjdk17, makeWrapper, autoPatchelfHook , zlib, libzen, libmediainfo, curl, libmms, glib }: @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "filebot"; - version = "4.9.4"; + version = "4.9.6"; src = fetchurl { - url = "https://web.archive.org/web/20210326102451/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; - sha256 = "sha256-fz0B9P/UBrlKGPZkheMd/4cFnWHt+brS3zRTv4nVt9o="; + url = "https://web.archive.org/web/20220305095926/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz"; + sha256 = "sha256-3j0WmmamE9KUNwjOVZvrdFH5dS/9FHSdbLfcAsOzQOo="; }; unpackPhase = "tar xvf $src"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { --replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' wrapProgram $out/opt/filebot.sh \ - --prefix PATH : ${lib.makeBinPath [ openjdk11 ]} + --prefix PATH : ${lib.makeBinPath [ openjdk17 ]} # Expose the binary in bin to make runnable. ln -s $out/opt/filebot.sh $out/bin/filebot ''; diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index c5a2a3138609..c93be6b63834 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.15.1"; + version = "0.16.0"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-7jmKD6HjsTqW/SRmD4xI3uQJnwmyDgjJZRJX9XygZyU="; + sha256 = "sha256-G4lZ1lbNN8X9ocWhcuuNZGTZm9AUzuWKVm23YgsJwig="; }; appimageContents = appimageTools.extractType2 { @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share/${pname} $out/share/applications + mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/icons/hicolor/scalable/apps cp -a ${appimageContents}/{locales,resources} $out/share/${pname} cp -a ${appimageContents}/freetube.desktop $out/share/applications/${pname}.desktop - cp -a ${appimageContents}/usr/share/icons $out/share + cp -a ${appimageContents}/usr/share/icons/hicolor/scalable/freetube.svg $out/share/icons/hicolor/scalable/apps substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index 0ffb5170dc29..99ddd7b24b69 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-chromecast"; - version = "0.2.11"; + version = "0.2.12"; src = fetchFromGitHub { owner = "vishen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BCOyeXo3uoR4ry/nFbF+//U62/hHnPK+tbG+8Rv6Rv0="; + sha256 = "sha256-h8qWwMaEhXnj6ZSrKAXBVbrMR0je41EoOtFeN9XlCuk="; }; - vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620="; + vendorSha256 = "sha256-PpMLHuJR6irp+QHhzguwGtBy30HM7DR0tNGiwB07M5E="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 6597b5fbffe8..6fd7a2036c56 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, pkg-config, zlib }: stdenv.mkDerivation rec { - version = "1.0.1"; + version = "2.0.0"; pname = "gpac"; src = fetchFromGitHub { owner = "gpac"; repo = "gpac"; rev = "v${version}"; - sha256 = "0gj46jpprfqv3wyagblv3a52chbplyzhvpra66v63czjibqsslm5"; + sha256 = "sha256-MIX32lSqf/lrz9240h4wMIQp/heUmwvDJz8WN08yf6c="; }; postPatch = '' diff --git a/pkgs/applications/video/gpu-screen-recorder/default.nix b/pkgs/applications/video/gpu-screen-recorder/default.nix new file mode 100644 index 000000000000..be02bb5c690e --- /dev/null +++ b/pkgs/applications/video/gpu-screen-recorder/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, fetchgit, makeWrapper, pkg-config, cudatoolkit, glew, libX11 +, libXcomposite, glfw, libpulseaudio, ffmpeg }: + +stdenv.mkDerivation rec { + pname = "gpu-screen-recorder"; + version = "1.0.0"; + + src = fetchgit { + url = "https://repo.dec05eba.com/gpu-screen-recorder"; + rev = "36fd4516db06bcb192e49055319d1778bbed0322"; + sha256 = "sha256-hYEHM4FOYcPmQ5Yxh520PKy8HiD+G0xv9hrn8SmA07w="; + }; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ + glew + libX11 + libXcomposite + glfw + libpulseaudio + ffmpeg + ]; + + postPatch = '' + substituteInPlace ./build.sh \ + --replace '/opt/cuda/targets/x86_64-linux/include' '${cudatoolkit}/targets/x86_64-linux/include' \ + --replace '/usr/lib64/libcuda.so' '${cudatoolkit}/targets/x86_64-linux/lib/stubs/libcuda.so' + ''; + + buildPhase = '' + ./build.sh + ''; + + installPhase = '' + install -Dt $out/bin/ gpu-screen-recorder + wrapProgram $out/bin/gpu-screen-recorder --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib + ''; + + meta = with lib; { + description = "A screen recorder that has minimal impact on system performance by recording a window using the GPU only"; + homepage = "https://git.dec05eba.com/gpu-screen-recorder/about/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ babbaj ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch b/pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch new file mode 100644 index 000000000000..bd0d7111c80a --- /dev/null +++ b/pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch @@ -0,0 +1,38 @@ +diff --git a/build.sh b/build.sh +index 05603db..8c38b31 100755 +--- a/build.sh ++++ b/build.sh +@@ -2,5 +2,5 @@ + + dependencies="gtk+-3.0 x11 xrandr libpulse" + includes="$(pkg-config --cflags $dependencies)" +-libs="$(pkg-config --libs $dependencies)" ++libs="$(pkg-config --libs $dependencies) -ldl" + g++ -o gpu-screen-recorder-gtk -O2 src/main.cpp -s $includes $libs +diff --git a/src/main.cpp b/src/main.cpp +index ae2078f..9dcdce1 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + typedef struct { + Display *display; +@@ -830,7 +831,13 @@ static void audio_input_change_callback(GtkComboBox *widget, gpointer userdata) + } + + static bool is_nv_fbc_installed() { +- return access("/usr/lib/libnvidia-fbc.so.1", F_OK) == 0 || access("/usr/local/lib/libnvidia-fbc.so.1", F_OK) == 0; ++ auto handle = dlopen("libnvidia-fbc.so.1", RTLD_LAZY); ++ if (handle) { ++ dlclose(handle); ++ return true; ++ } else { ++ return false; ++ } + } + + static GtkWidget* create_common_settings_page(GtkStack *stack, GtkApplication *app) { diff --git a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix new file mode 100644 index 000000000000..6bfb425f0af9 --- /dev/null +++ b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix @@ -0,0 +1,46 @@ +{ stdenv, lib, fetchgit, pkg-config, makeWrapper, gtk3, libX11, libXrandr +, libpulseaudio, gpu-screen-recorder }: + +stdenv.mkDerivation rec { + pname = "gpu-screen-recorder-gtk"; + version = "0.1.0"; + + src = fetchgit { + url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk"; + rev = "4c317abd0531f8e155fbbbcd32850bbeebbf2ead"; + sha256 = "sha256-5W6qmUMP31ndRDxMHuQ/XnZysPQgaie0vVlMTzfODU4="; + }; + + patches = [ ./fix-nvfbc-check.patch ]; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ + gtk3 + libX11 + libXrandr + libpulseaudio + ]; + + buildPhase = '' + ./build.sh + ''; + + installPhase = '' + install -Dt $out/bin/ gpu-screen-recorder-gtk + install -Dt $out/share/applications/ gpu-screen-recorder-gtk.desktop + + wrapProgram $out/bin/gpu-screen-recorder-gtk --prefix PATH : ${lib.makeBinPath [ gpu-screen-recorder ]} + ''; + + meta = with lib; { + description = "GTK frontend for gpu-screen-recorder."; + homepage = "https://git.dec05eba.com/gpu-screen-recorder-gtk/about/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ babbaj ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix new file mode 100644 index 000000000000..2607ee64f70a --- /dev/null +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, toKodiAddon, addonDir }: +let + drv = stdenv.mkDerivation { + pname = "controller-topology-project"; + version = "unstable-2022-01-22"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "controller-topology-project"; + rev = "e2a9bac903f21b2acfeee374070cfc97d03aba2d"; + sha256 = "sha256-o6uKxOjEYNAK27drvNOokOFPdjkOEnr49mBre9ycM0w="; + }; + + postPatch = '' + # remove addons already included in the base kodi package + rm -r addons/game.controller.default + rm -r addons/game.controller.snes + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out${addonDir} + cp -r addons/* $out${addonDir} + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/kodi-game/controller-topology-project"; + description = "Models how controllers connect to and map to each other for all gaming history"; + license = with licenses; [ odbl ]; + maintainers = teams.kodi.members; + }; + }; +in + toKodiAddon drv diff --git a/pkgs/applications/video/kodi/addons/controllers/default.nix b/pkgs/applications/video/kodi/addons/controllers/default.nix deleted file mode 100644 index 825ad5d53fc4..000000000000 --- a/pkgs/applications/video/kodi/addons/controllers/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildKodiAddon, fetchFromGitHub, controller }: -buildKodiAddon rec { - pname = "game-controller-${controller}"; - namespace = "game.controller.${controller}"; - version = "1.0.3"; - - sourceDir = "addons/" + namespace; - - src = fetchFromGitHub { - owner = "kodi-game"; - repo = "kodi-game-controllers"; - rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18"; - sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb"; - }; - - meta = with lib; { - description = "Add support for different gaming controllers."; - platforms = platforms.all; - license = licenses.odbl; - maintainers = teams.kodi.members; - }; -} diff --git a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index 9fc59b2d329e..b16bab1b217a 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "19.0.1"; + version = "19.0.3"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-KMEo7kXyFMEeUR/HRvXpUhwDFlWsuwYZFA6bA3W1AmY="; + sha256 = "sha256-YYIPPxM8zVIugqLz0YntVZt1N+dReH+7V1Lkeif2wIY="; }; extraNativeBuildInputs = [ gtest ]; diff --git a/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix b/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix index 313456bbfa7c..78b6ea5ac1d1 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-ffmpegdirect"; namespace = "inputstream.ffmpegdirect"; - version = "19.0.0"; + version = "19.0.1"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.ffmpegdirect"; rev = "${version}-${rel}"; - sha256 = "sha256-qdN2tmwS6uD9wrHnKC3iNvHnA2WlJAoNhdwvw16/L0U="; + sha256 = "sha256-yVMo3cRsIww1y0jGrqRag2Bc1x98+e86AHlnY1O9klE="; }; extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ]; diff --git a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix index 758e509b85d9..9c7041441ff1 100644 --- a/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-hdhomerun/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "19.0.2"; + version = "19.1.0"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; rev = "${version}-${rel}"; - sha256 = "sha256-iFAOoQvZAdvJvN8FBg2w+oZWtr8mYdBQ3QX58HLmBho="; + sha256 = "sha256-sYVb4nhUz2j19yv3/cyLyUAC+1K0c05+iAMEfpPifjs="; }; extraBuildInputs = [ jsoncpp libhdhomerun ]; diff --git a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix index e64f8c60e5c3..4b13e4a617ec 100644 --- a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hts"; namespace = "pvr.hts"; - version = "19.0.4"; + version = "19.0.6"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "sha256-WP/eaE3qO0NqN23dHkFOiOjoeKIglbbHofqnUsfxSfI="; + sha256 = "sha256-Lc3B1TdQ4oQIEIyKuQju+5cpInF5i2u4WFe3okFhe+I="; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix index 5aefffabc324..89aa3c7d3585 100644 --- a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "19.0.3"; + version = "19.1.0"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-LQP+yPHPOjgvW7LQmqrp15NWFBVdnrGOSGm37N8AsHg="; + sha256 = "sha256-APRj/Z/GtRXNSVX5kB0o09FTa9me2ESzrZ/Q+QNrw0w="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 89eeed890485..18319468eae9 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -38,24 +38,24 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20211024"; - kodiVersion = "19.3"; + kodiReleaseDate = "20220303"; + kodiVersion = "19.4"; rel = "Matrix"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "02bnknk87zzv9j6b6k9c0xx47q2gh399j6v25rm94g7rhzf8phbw"; + sha256 = "sha256-XDtmY3KthiD91kvueQRSamBcdM7fBpRntmZX6KRsCzE="; }; ffmpeg = stdenv.mkDerivation rec { pname = "kodi-ffmpeg"; - version = "4.3.2"; + version = "4.3.2"; # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ffmpeg/FFMPEG-VERSION src = fetchFromGitHub { owner = "xbmc"; repo = "FFmpeg"; - rev = "${version}-${rel}-${kodiVersion}"; + rev = "${version}-${rel}-19.2"; sha256 = "14s215sgc93ds1mrdbkgb7fvy94lpgv2ldricyxzis0gbzqfgs4f"; }; preConfigure = '' diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/applications/video/lbry/default.nix index cf5608e66a02..ea69ea547df8 100644 --- a/pkgs/applications/video/lbry/default.nix +++ b/pkgs/applications/video/lbry/default.nix @@ -2,7 +2,7 @@ let pname = "lbry-desktop"; - version = "0.50.2"; + version = "0.52.5"; in appimageTools.wrapAppImage rec { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in appimageTools.wrapAppImage rec { src = fetchurl { url = "https://github.com/lbryio/lbry-desktop/releases/download/v${version}/LBRY_${version}.AppImage"; # Gotten from latest-linux.yml - sha512 = "br6HvVRz+ybmAhmQh3vOC5wgLmOCVrGHDn59ueWk6rFoKOCbm8WdmdadOZvHeN1ld2nlvPzEy+KXMOEfF1LeQg=="; + sha512 = "i0t1Ygf3el7Brh6TA804V6n5r5UczvOPxAdhyJ7Gvvg9VqN1+QXB6hsqF4jYTW3jcKxvorVALwrFDVezBTPv5g=="; }; }; diff --git a/pkgs/applications/video/losslesscut-bin/appimage.nix b/pkgs/applications/video/losslesscut-bin/appimage.nix index d1f60c3dd2c2..e6be6f54e1dc 100644 --- a/pkgs/applications/video/losslesscut-bin/appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/appimage.nix @@ -1,4 +1,4 @@ -{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version }: +{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version, sha256 }: let pname = "losslesscut"; @@ -11,7 +11,7 @@ let src = fetchurl { url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; name = nameSource; - sha256 = "0aqz5ijl5japfzzbcdcd2mmihkb8b2fc2hs9kkm3211yb37c5ygv"; + inherit sha256; }; extracted = appimageTools.extractType2 { inherit name src; diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index 01f9c1580628..be7786f91020 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -1,9 +1,9 @@ { callPackage, stdenvNoCC, lib }: let - version = "3.33.1"; - appimage = callPackage ./appimage.nix { inherit version; }; - dmg = callPackage ./dmg.nix { inherit version; }; - windows = callPackage ./windows.nix { inherit version; }; + version = "3.43.0"; + appimage = callPackage ./appimage.nix { inherit version; sha256 = "1xfr3i4gsi13wj374yr5idhgs0q71s4h33yxdr7b7xjdg2gb8lp1"; }; + dmg = callPackage ./dmg.nix { inherit version; sha256 = "1axki47hrxx5m0hrmjpxcya091lahqfnh2pd3zhn5dd496slq8an"; }; + windows = callPackage ./windows.nix { inherit version; sha256 = "1v00gym18hjxxm42dfqmw7vhwh8lgjz2jgv6fmg234npr3d43py5"; }; in ( if stdenvNoCC.isDarwin then dmg else if stdenvNoCC.isCygwin then windows @@ -13,7 +13,7 @@ in ( meta = with lib; { description = "The swiss army knife of lossless video/audio editing"; homepage = "https://mifi.no/losslesscut/"; - license = licenses.mit; + license = licenses.gpl2Only; maintainers = with maintainers; [ ShamrockLee ]; } // oldAttrs.meta // { platforms = diff --git a/pkgs/applications/video/losslesscut-bin/dmg.nix b/pkgs/applications/video/losslesscut-bin/dmg.nix index 3d0bad197570..3cbd77198b93 100644 --- a/pkgs/applications/video/losslesscut-bin/dmg.nix +++ b/pkgs/applications/video/losslesscut-bin/dmg.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lib, fetchurl, undmg, version }: +{ stdenvNoCC, lib, fetchurl, undmg, version , sha256 }: let pname = "losslesscut"; @@ -10,7 +10,7 @@ let src = fetchurl { url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; name = nameSource; - sha256 = "0xa1avbwar7x7kv5yn2ldca4vj3nwaz0dhjm3bcdy59q914xn3dj"; + inherit sha256; }; in stdenvNoCC.mkDerivation { inherit pname version src; diff --git a/pkgs/applications/video/losslesscut-bin/windows.nix b/pkgs/applications/video/losslesscut-bin/windows.nix index fe5df9d6c906..0e6ed9b04123 100644 --- a/pkgs/applications/video/losslesscut-bin/windows.nix +++ b/pkgs/applications/video/losslesscut-bin/windows.nix @@ -3,6 +3,7 @@ , fetchurl , unzip , version +, sha256 , useMklink ? false , customSymlinkCommand ? null }: @@ -18,12 +19,12 @@ let else if useMklink then (targetPath: linkPath: "mklink ${targetPath} ${linkPath}") else (targetPath: linkPath: "ln -s ${targetPath} ${linkPath}"); in stdenvNoCC.mkDerivation { - inherit pname version; + inherit pname version sha256; src = fetchurl { name = nameSource; url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}"; - sha256 = "1rq9frab0jl9y1mgmjhzsm734jvz0a646zq2wi5xzzspn4wikhvb"; + inherit sha256; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 26d80b1596c2..712ccacd7a0c 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -14,21 +14,21 @@ }: let - version = "1.16.5"; + version = "1.16.7"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - sha256 = "1y14yxhjj0sdq0s24qr58m0ddhna2rf0q0w3ny888as4wbqiwvm0"; + sha256 = "sha256-YjsYW2MmzDZqOMdYlqE0dZ399Qq8hJRQ9BCViNexLHs="; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - sha256 = "131vdi4gyc996z77rrcqb9nfbd62j8314ai4ib1jnilmrsrk93p5"; + sha256 = "sha256-TL0PRP/pDg16qsbYi9RYyD0egNDaxuApmR86hiR/Rq8="; }; in mkDerivation { @@ -55,15 +55,15 @@ in mkDerivation { installPhase = '' runHook preInstall - install -Dm555 -t $out/bin out/makemkv ../makemkv-bin-${version}/bin/amd64/makemkvcon - install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.* - install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/* - install -Dm444 -t $out/share/applications ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop - install -Dm444 -t $out/share/icons/hicolor/16x16 ../makemkv-oss-${version}/makemkvgui/share/icons/16x16/* - install -Dm444 -t $out/share/icons/hicolor/32x32 ../makemkv-oss-${version}/makemkvgui/share/icons/32x32/* - install -Dm444 -t $out/share/icons/hicolor/64x64 ../makemkv-oss-${version}/makemkvgui/share/icons/64x64/* - install -Dm444 -t $out/share/icons/hicolor/128x128 ../makemkv-oss-${version}/makemkvgui/share/icons/128x128/* - install -Dm444 -t $out/share/icons/hicolor/256x256 ../makemkv-oss-${version}/makemkvgui/share/icons/256x256/* + install -Dm555 -t $out/bin out/makemkv ../makemkv-bin-${version}/bin/amd64/makemkvcon + install -D -t $out/lib out/lib{driveio,makemkv,mmbd}.so.* + install -D -t $out/share/MakeMKV ../makemkv-bin-${version}/src/share/* + install -Dm444 -t $out/share/applications ../makemkv-oss-${version}/makemkvgui/share/makemkv.desktop + install -Dm444 -t $out/share/icons/hicolor/16x16/apps ../makemkv-oss-${version}/makemkvgui/share/icons/16x16/* + install -Dm444 -t $out/share/icons/hicolor/32x32/apps ../makemkv-oss-${version}/makemkvgui/share/icons/32x32/* + install -Dm444 -t $out/share/icons/hicolor/64x64/apps ../makemkv-oss-${version}/makemkvgui/share/icons/64x64/* + install -Dm444 -t $out/share/icons/hicolor/128x128/apps ../makemkv-oss-${version}/makemkvgui/share/icons/128x128/* + install -Dm444 -t $out/share/icons/hicolor/256x256/apps ../makemkv-oss-${version}/makemkvgui/share/icons/256x256/* runHook postInstall ''; diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 4e8373383a8e..eda58349bd86 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -6,10 +6,10 @@ mkDerivation rec { pname = "minitube"; - version = "3.9.2"; + version = "3.9.3"; src = fetchFromGitHub { - sha256 = "sha256-MIzfo17eAvpWO2HNq9z+D9XiOKTRiUHvaOdxI1EK1f0="; + sha256 = "sha256-ROqROQsV8ddrxYT5mMdkf6rCgCoGr1jpxQ1ohcoEaQs="; rev = version; repo = "minitube"; owner = "flaviotordini"; diff --git a/pkgs/applications/video/mirakurun/update.nix b/pkgs/applications/video/mirakurun/update.nix index ccea2279783b..18a4d0ab2562 100644 --- a/pkgs/applications/video/mirakurun/update.nix +++ b/pkgs/applications/video/mirakurun/update.nix @@ -17,7 +17,7 @@ let # exclude prerelease versions versionLister = writers.writeBash "list-mirakurun-versions" '' - ${common-updater-scripts}/bin/list-git-tags ${homepage} \ + ${common-updater-scripts}/bin/list-git-tags --url=${homepage} \ | grep '^[0-9]\+\.[0-9]\+\.[0-9]\+$' ''; }; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 04911562a347..137731312b0e 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "64.0.0"; + version = "66.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "sha256-tg9rjTbprcVkzUUVWCKqF1dzIjFKjzIqrVADtuUU9Fk="; + sha256 = "sha256-JTPayZhV3Z+o1v+TbHp9SGMAZk1oEzMdNhk67BYB75A="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 1715ce4a6a17..0c435bfbe158 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg +{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null @@ -93,11 +93,12 @@ in stdenv.mkDerivation rec { pname = "mplayer"; - version = "1.4"; + version = "unstable-2022-02-03"; - src = fetchurl { - url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-${version}.tar.xz"; - sha256 = "0j5mflr0wnklxsvnpmxvk704hscyn2785hvvihj2i3a7b3anwnc2"; + src = fetchsvn { + url = "svn://svn.mplayerhq.hu/mplayer/trunk"; + rev = "38331"; + sha256 = "1vpic8i6zvg0zsy50vhm45ysqag561bpn9jycfbvvwl9ji7l55zi"; }; prePatch = '' @@ -106,8 +107,6 @@ stdenv.mkDerivation rec { rm -rf ffmpeg ''; - patches = [ ./svn-r38199-ffmpeg44fix.patch ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config yasm ]; buildInputs = with lib; @@ -163,7 +162,6 @@ stdenv.mkDerivation rec { (if pulseSupport then "--enable-pulse" else "--disable-pulse") (if v4lSupport then "--enable-v4l2 --enable-tv-v4l2" else "--disable-v4l2 --disable-tv-v4l2") "--disable-xanim" - "--disable-ivtv" "--disable-xvid --disable-xvid-lavc" "--disable-ossaudio" "--disable-ffmpeg_a" diff --git a/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch b/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch deleted file mode 100644 index 4137989fcb54..000000000000 --- a/pkgs/applications/video/mplayer/svn-r38199-ffmpeg44fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: libmpcodecs/ad_spdif.c -=================================================================== -diff --git a/libmpcodecs/ad_spdif.c b/libmpcodecs/ad_spdif.c ---- a/libmpcodecs/ad_spdif.c (revision 38198) -+++ b/libmpcodecs/ad_spdif.c (revision 38199) -@@ -298,14 +298,8 @@ - if (spdif_ctx->header_written) - av_write_trailer(lavf_ctx); - av_freep(&lavf_ctx->pb); -- if (lavf_ctx->streams) { -- av_freep(&lavf_ctx->streams[0]->codec); -- av_freep(&lavf_ctx->streams[0]->info); -- av_freep(&lavf_ctx->streams[0]); -- } -- av_freep(&lavf_ctx->streams); -- av_freep(&lavf_ctx->priv_data); -+ avformat_free_context(lavf_ctx); -+ lavf_ctx = NULL; - } -- av_freep(&lavf_ctx); - av_freep(&spdif_ctx); - } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 576f79c47793..3ceda57fb899 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -15,7 +15,6 @@ , freetype , libass , libpthreadstubs -, mujs , nv-codec-headers , lua , libuchardet @@ -56,6 +55,7 @@ , cmsSupport ? true, lcms2 , dvdnavSupport ? stdenv.isLinux, libdvdnav , jackaudioSupport ? false, libjack2 +, javascriptSupport ? true, mujs , libpngSupport ? true, libpng , openalSupport ? true, openalSoft , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio @@ -108,6 +108,7 @@ in stdenv.mkDerivation rec { (lib.enableFeature archiveSupport "libarchive") (lib.enableFeature cddaSupport "cdda") (lib.enableFeature dvdnavSupport "dvdnav") + (lib.enableFeature javascriptSupport "javascript") (lib.enableFeature openalSupport "openal") (lib.enableFeature sdl2Support "sdl2") (lib.enableFeature sixelSupport "sixel") @@ -134,7 +135,6 @@ in stdenv.mkDerivation rec { libpthreadstubs libuchardet luaEnv - mujs ] ++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals archiveSupport [ libarchive ] ++ lib.optionals bluraySupport [ libbluray ] @@ -145,6 +145,7 @@ in stdenv.mkDerivation rec { ++ lib.optionals drmSupport [ libdrm mesa ] ++ lib.optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ lib.optionals jackaudioSupport [ libjack2 ] + ++ lib.optionals javascriptSupport [ mujs ] ++ lib.optionals libpngSupport [ libpng ] ++ lib.optionals openalSupport [ openalSoft ] ++ lib.optionals pulseSupport [ libpulseaudio ] diff --git a/pkgs/applications/video/mpv/scripts/vr-reversal.nix b/pkgs/applications/video/mpv/scripts/vr-reversal.nix new file mode 100644 index 000000000000..4c4aacef31dc --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/vr-reversal.nix @@ -0,0 +1,35 @@ +{ lib, stdenvNoCC, fetchFromGitHub, ffmpeg }: + +stdenvNoCC.mkDerivation rec { + pname = "vr-reversal"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "dfaker"; + repo = pname; + rev = "v${version}"; + sha256 = "1wn2ngcvn7wcsl3kmj782x5q9130qw951lj6ilrkafp6q6zscpqr"; + }; + + dontBuild = true; + + # reset_rot is only available in ffmpeg 5.0, see 5bcc61ce87922ecccaaa0bd303a7e195929859a8 + postPatch = lib.optionalString (lib.versionOlder ffmpeg.version "5.0") '' + substituteInPlace 360plugin.lua --replace ":reset_rot=1:" ":" + ''; + + installPhase = '' + mkdir -p $out/share/mpv/scripts + cp -r 360plugin.lua $out/share/mpv/scripts/ + ''; + + passthru.scriptName = "360plugin.lua"; + + meta = with lib; { + description = "Script for mpv to play VR video with optional saving of head tracking data."; + homepage = "https://github.com/dfaker/VR-reversal"; + license = licenses.unlicense; + platforms = platforms.all; + maintainers = with maintainers; [ schnusch ]; + }; +} diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index ea8a801d1954..82eaa30bba3e 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, - poppler, imagemagick, openexr, ffmpeg_3, opencolorio_1, openimageio, + poppler, imagemagick, openexr, ffmpeg, opencolorio_1, openimageio, qmake4Hook, libpng, libGL, lndir, libraw, openjpeg, libwebp, fetchFromGitHub }: let @@ -74,7 +74,7 @@ let sha256 = "OQg6a5wNy9TFFySjmgd1subvXRxY/ZnSOCkaoUo+ZaA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libpng ffmpeg_3 openexr opencolorio_1 openimageio boost libGL + libpng ffmpeg openexr opencolorio_1 openimageio boost libGL seexpr libraw openjpeg libwebp ]; }) @@ -135,5 +135,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; + broken = true; # Last evaluated on Hydra on 2021-05-18 }; } diff --git a/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch b/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch deleted file mode 100644 index 0bc796248607..000000000000 --- a/pkgs/applications/video/obs-studio/Change-product_version-to-user_agent_product.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 635772c4c5ecf11a0f84e6c9fc273dce6b9a5688 Mon Sep 17 00:00:00 2001 -From: V -Date: Thu, 10 Jun 2021 18:36:22 +0200 -Subject: [PATCH] Change product_version to user_agent_product - -This is its name as of CEF 91.1.0. ---- - obs-browser-plugin.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/obs-browser-plugin.cpp b/obs-browser-plugin.cpp -index 1a6a009..5eb379e 100644 ---- a/plugins/obs-browser/obs-browser-plugin.cpp -+++ b/plugins/obs-browser/obs-browser-plugin.cpp -@@ -298,7 +298,7 @@ static void BrowserInit(void) - prod_ver << std::to_string(obs_maj) << "." << std::to_string(obs_min) - << "." << std::to_string(obs_pat); - -- CefString(&settings.product_version) = prod_ver.str(); -+ CefString(&settings.user_agent_product) = prod_ver.str(); - - #ifdef USE_QT_LOOP - settings.external_message_pump = true; --- -2.31.1 - diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 31f478c47c0b..22c206dfe037 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -6,7 +6,7 @@ , addOpenGLRunpath , cmake , fdk_aac -, ffmpeg +, ffmpeg_4 , jansson , libjack2 , libxkbcommon @@ -34,8 +34,10 @@ , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio , libcef +, pciutils , pipewireSupport ? stdenv.isLinux , pipewire +, libdrm }: let @@ -44,22 +46,19 @@ let in mkDerivation rec { pname = "obs-studio"; - version = "27.0.1"; + version = "27.2.1"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "04fzsr9yizmxy0r7z2706crvnsnybpnv5kgfn77znknxxjacfhkn"; + sha256 = "sha256-RHPzSw7wjnAHk90N7g53LyIH3ozO/hyZV5hVZpZe+Ow="; fetchSubmodules = true; }; patches = [ # Lets obs-browser build against CEF 90.1.0+ ./Enable-file-access-and-universal-access-for-file-URL.patch - - # Lets obs-browser build against CEF 91.1.0+ - ./Change-product_version-to-user_agent_product.patch ]; nativeBuildInputs = [ @@ -73,7 +72,7 @@ mkDerivation rec { buildInputs = [ curl fdk_aac - ffmpeg + ffmpeg_4 jansson libcef libjack2 @@ -89,11 +88,12 @@ mkDerivation rec { x264 libvlc mbedtls + pciutils ] ++ optionals scriptingSupport [ luajit python3 ] ++ optional alsaSupport alsa-lib ++ optional pulseaudioSupport libpulseaudio - ++ optional pipewireSupport pipewire; + ++ optionals pipewireSupport [ pipewire libdrm ]; # Copied from the obs-linuxbrowser postUnpack = '' @@ -143,5 +143,6 @@ mkDerivation rec { maintainers = with maintainers; [ jb55 MP2E V ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + mainProgram = "obs"; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix index c78a8236bf25..a6c84cbbbef0 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "obs-multi-rtmp"; - version = "0.2.7.1"; + version = "0.2.8.1"; src = fetchFromGitHub { owner = "sorayuki"; repo = "obs-multi-rtmp"; rev = version; - sha256 = "sha256-pnSIbAWGufcWIARXpX/zwA/Ff35lrinFaMIdFY00c4Y="; + sha256 = "sha256-OhatuSlDJ2VDNorM4QfoKPYKyv5YpN8EnIelLdBTlZ0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix index 5c13d33ae466..d747268cc556 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix @@ -4,24 +4,48 @@ , fetchpatch , cmake , qtbase +, qtsvg , obs-studio , asio_1_10 , websocketpp +, nlohmann_json }: stdenv.mkDerivation rec { pname = "obs-websocket"; - version = "4.9.1"; + + # We have updated to the alpha version when OBS Studio 27.2 was + # released, because this is the only version of obs-websocket that + # builds against the new OBS Studio. + version = "5.0.0-alpha3"; src = fetchFromGitHub { owner = "Palakis"; repo = "obs-websocket"; rev = version; - sha256 = "sha256-XCiSNWTiA/u+3IbYlhIc5bCjKjLHDRVjYIG5MEoYnr0="; + sha256 = "Lr6SBj5rRTAWmn9Tnlu4Sl7SAkOCRCTP6sFWSp4xB+I="; + fetchSubmodules = true; }; + patches = [ + # This patch can be dropped when obs-websocket is updated to the + # next version. + (fetchpatch { + url = "https://github.com/obsproject/obs-websocket/commit/13c7b83c34eb67b2ee80af05071d81f10d0d2997.patch"; + sha256 = "TNap/T8+058vhfWzRRr4vmlblFk9tHMUNyG6Ob5PwiM="; + name = "obs-addref-werror-fix.patch"; + }) + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase obs-studio asio_1_10 websocketpp ]; + buildInputs = [ + qtbase + qtsvg + obs-studio + asio_1_10 + websocketpp + nlohmann_json + ]; dontWrapQtApps = true; diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index 35dceddf224e..f64af16709f6 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, pkg-config, fetchFromGitHub, opencv2, ncurses, portaudio }: stdenv.mkDerivation { - name = "p2pvc"; + pname = "p2pvc"; + version = "unstable-2015-02-12"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ opencv2 ncurses portaudio ]; diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index edeb848867fb..27064077a9f8 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -35,6 +37,15 @@ stdenv.mkDerivation rec { sha256 = "1xwlfizga6hvjqq127py8vabaphsny928ar7mwqj9cyqfl6fx41x"; }; + patches = [ + # Fix compatibility with GNOME Shell ≥ 40. + # https://github.com/phw/peek/pull/910 + (fetchpatch { + url = "https://github.com/phw/peek/commit/008d15316ab5428363c512b263ca8138cb8f52ba.patch"; + sha256 = "xxJ+r5uRk93MEzWTFla88ewZsnUl3+YKTenzDygtKP0="; + }) + ]; + nativeBuildInputs = [ appstream-glib desktop-file-utils diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index f22dd77b332a..7ae463b98730 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -12,6 +12,7 @@ , libpeas , librsvg , gnome +, gnome-desktop , libnotify , gsound , meson @@ -52,7 +53,7 @@ python3Packages.buildPythonApplication rec { gtk3 libpeas librsvg - gnome.gnome-desktop + gnome-desktop gsound gnome.adwaita-icon-theme gsettings-desktop-schemas diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 81b354fe1fff..34b6eb9c2862 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -36,12 +36,16 @@ in mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ]; + # plexmediaplayer currently segfaults under wayland + qtWrapperArgs = [ "--set" "QT_QPA_PLATFORM" "xcb" ]; + passthru.updateScript = ./update.sh; meta = with lib; { description = "Streaming media player for Plex"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ b4dm4n ]; homepage = "https://plex.tv"; + mainProgram = "plexmediaplayer"; }; } diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix index 9621b8864c9a..12864d3b40af 100644 --- a/pkgs/applications/video/qmplay2/default.nix +++ b/pkgs/applications/video/qmplay2/default.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation rec { pname = "qmplay2"; - version = "21.12.24"; + version = "22.03.19"; src = fetchFromGitHub { owner = "zaps166"; repo = "QMPlay2"; rev = version; - sha256 = "sha256-SHReKh+M1rgSIiweYFgVvwMeKWeQD52S4KxEiTsyHrI="; + sha256 = "sha256-+EIv74dMm0zxZcCfa5wR6FJNJl5Xaes+/dCRQEBqFeo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch b/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch new file mode 100644 index 000000000000..f3b31ed95861 --- /dev/null +++ b/pkgs/applications/video/rtabmap/0001-remove-printer-support.patch @@ -0,0 +1,139 @@ +From c04ce502d29f7769efbff730d1f9060b8c24629a Mon Sep 17 00:00:00 2001 +From: ckie +Date: Tue, 8 Feb 2022 19:18:49 +0200 +Subject: [PATCH] remove printer support + +--- + app/src/CMakeLists.txt | 4 ++-- + guilib/src/CMakeLists.txt | 4 ++-- + guilib/src/GraphViewer.cpp | 12 +----------- + guilib/src/ImageView.cpp | 16 ---------------- + guilib/src/utilite/UPlot.cpp | 9 --------- + 5 files changed, 5 insertions(+), 40 deletions(-) + +diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt +index b20a07d4..2cad8c1e 100644 +--- a/app/src/CMakeLists.txt ++++ b/app/src/CMakeLists.txt +@@ -63,9 +63,9 @@ ENDIF() + TARGET_LINK_LIBRARIES(rtabmap rtabmap_core rtabmap_gui rtabmap_utilite ${LIBRARIES}) + IF(Qt5_FOUND) + IF(Qt5Svg_FOUND) +- QT5_USE_MODULES(rtabmap Widgets Core Gui Svg PrintSupport) ++ QT5_USE_MODULES(rtabmap Widgets Core Gui Svg) + ELSE() +- QT5_USE_MODULES(rtabmap Widgets Core Gui PrintSupport) ++ QT5_USE_MODULES(rtabmap Widgets Core Gui) + ENDIF() + ENDIF(Qt5_FOUND) + +diff --git a/guilib/src/CMakeLists.txt b/guilib/src/CMakeLists.txt +index 3711205b..a393aa25 100644 +--- a/guilib/src/CMakeLists.txt ++++ b/guilib/src/CMakeLists.txt +@@ -208,9 +208,9 @@ ADD_LIBRARY(rtabmap_gui ${SRC_FILES}) + TARGET_LINK_LIBRARIES(rtabmap_gui rtabmap_core rtabmap_utilite ${LIBRARIES}) + IF(Qt5_FOUND) + IF(Qt5Svg_FOUND) +- QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg PrintSupport) ++ QT5_USE_MODULES(rtabmap_gui Widgets Core Gui Svg) + ELSE() +- QT5_USE_MODULES(rtabmap_gui Widgets Core Gui PrintSupport) ++ QT5_USE_MODULES(rtabmap_gui Widgets Core Gui) + ENDIF() + ENDIF(Qt5_FOUND) + +diff --git a/guilib/src/GraphViewer.cpp b/guilib/src/GraphViewer.cpp +index 58907c34..7b41061f 100644 +--- a/guilib/src/GraphViewer.cpp ++++ b/guilib/src/GraphViewer.cpp +@@ -38,7 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include + #include +-#include + #include + #ifdef QT_SVG_LIB + #include +@@ -2011,16 +2010,7 @@ void GraphViewer::contextMenuEvent(QContextMenuEvent * event) + this->scene()->setSceneRect(this->scene()->itemsBoundingRect()); // Re-shrink the scene to it's bounding contents + QSize sceneSize = this->scene()->sceneRect().size().toSize(); + +- if(QFileInfo(filePath).suffix().compare("pdf") == 0) +- { +- QPrinter printer(QPrinter::HighResolution); +- printer.setOrientation(QPrinter::Portrait); +- printer.setOutputFileName( filePath ); +- QPainter p(&printer); +- scene()->render(&p); +- p.end(); +- } +- else if(QFileInfo(filePath).suffix().compare("svg") == 0) ++ if(QFileInfo(filePath).suffix().compare("svg") == 0) + { + #ifdef QT_SVG_LIB + QSvgGenerator svgGen; +diff --git a/guilib/src/ImageView.cpp b/guilib/src/ImageView.cpp +index 714f2d36..887e7bdc 100644 +--- a/guilib/src/ImageView.cpp ++++ b/guilib/src/ImageView.cpp +@@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include + #include +-#include + #include + #include "rtabmap/utilite/ULogger.h" + #include "rtabmap/gui/KeypointItem.h" +@@ -843,21 +842,6 @@ void ImageView::contextMenuEvent(QContextMenuEvent * e) + } + + _savedFileName = text; +- if(QFileInfo(text).suffix().compare("pdf") == 0) +- { +- QPrinter printer(QPrinter::HighResolution); +- printer.setOrientation(QPrinter::Portrait); +- printer.setOutputFileName( text ); +- QPainter p(&printer); +- p.begin(&printer); +- double xscale = printer.pageRect().width()/double(_graphicsView->sceneRect().width()); +- double yscale = printer.pageRect().height()/double(_graphicsView->sceneRect().height()); +- double scale = qMin(xscale, yscale); +- p.scale(scale, scale); +- _graphicsView->scene()->render(&p, _graphicsView->sceneRect(), _graphicsView->sceneRect()); +- p.end(); +- } +- else + { + QImage img(_graphicsView->sceneRect().width(), _graphicsView->sceneRect().height(), QImage::Format_ARGB32_Premultiplied); + QPainter p(&img); +diff --git a/guilib/src/utilite/UPlot.cpp b/guilib/src/utilite/UPlot.cpp +index 1b11c65e..8bf94841 100644 +--- a/guilib/src/utilite/UPlot.cpp ++++ b/guilib/src/utilite/UPlot.cpp +@@ -42,7 +42,6 @@ + #include + #include + #include +-#include + #include + #include + #ifdef QT_SVG_LIB +@@ -2849,14 +2848,6 @@ void UPlot::contextMenuEvent(QContextMenuEvent * event) + else + { + #endif +- if(QFileInfo(text).suffix().compare("pdf") == 0) +- { +- QPrinter printer; +- printer.setOutputFormat(QPrinter::PdfFormat); +- printer.setOutputFileName(text); +- this->render(&printer); +- } +- else + { + QPixmap figure = QPixmap::grabWidget(this); + figure.save(text); +-- +2.34.1 + diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix new file mode 100644 index 000000000000..c6429b093486 --- /dev/null +++ b/pkgs/applications/video/rtabmap/default.nix @@ -0,0 +1,59 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen +, wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect +, libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "rtabmap"; + version = "unstable-2022-02-07"; + + src = fetchFromGitHub { + owner = "introlab"; + repo = "rtabmap"; + rev = "f584f42ea423c44138aa0668b5c8eb18f2978fe2"; + sha256 = "sha256-xotOcaz5XrmzwEKuVEQZoeq6fEVbACK7PSUW9kULH40="; + }; + + patches = [ + # Our Qt5 seems to be missing PrintSupport.. I think? + ./0001-remove-printer-support.patch + ]; + + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook ]; + buildInputs = [ + ## Required + opencv + pcl + ## Optional + libusb1 + eigen + g2o + ceres-solver + # libpointmatcher - ABI mismatch + octomap + freenect + libdc1394 + # librealsense - missing includedir + qtbase + libGL + libGLU + vtkWithQt5 + ]; + + # Disable warnings that are irrelevant to us as packagers + cmakeFlags = "-Wno-dev"; + + # We run one of the executables we build while the build is + # still running (and patchelf hasn't been invoked) which means + # the RPATH is not set correctly. This hacks around that error: + # + # build/bin/rtabmap-res_tool: error while loading shared libraries: librtabmap_utilite.so.0.20: cannot open shared object file: No such file or directory + LD_LIBRARY_PATH = "/build/source/build/bin"; + + meta = with lib; { + description = "Real-Time Appearance-Based 3D Mapping"; + homepage = "https://introlab.github.io/rtabmap/"; + license = licenses.bsd3; + maintainers = with maintainers; [ ckie ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 3b6116d5a068..e996ae92d216 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -17,8 +17,7 @@ , qtgraphicaleffects , qmake , qttools -, genericUpdater -, common-updater-scripts +, gitUpdater }: assert lib.versionAtLeast mlt.version "6.24.0"; @@ -76,9 +75,8 @@ mkDerivation rec { cp -r src/qml $out/share/shotcut/ ''; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; }; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 6d4e0f18d6fb..eecb3a6b9749 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "smplayer"; - version = "21.10.0"; + version = "22.2.0"; src = fetchFromGitHub { owner = "smplayer-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-p6036c8KX3GCINmkjHZlDLgHhLKri+t2WNWzP4KsSI8="; + hash = "sha256-7DMvIqW3vzjVzJPyjbXuHHcf1T6EFcf/a/mVYqa3XS8="; }; nativeBuildInputs = [ @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; - buildInputs = [ qtscript ]; + buildInputs = [ + qtscript + ]; dontUseQmakeConfigure = true; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 53e87fbb2b9d..395da881ea9f 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -27,7 +27,7 @@ }: let basename = "streamlink-twitch-gui"; - runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; + runtimeLibs = lib.makeLibraryPath [ gtk3-x11 libudev0-shim ]; runtimeBins = lib.makeBinPath [ streamlink ]; arch = if stdenv.hostPlatform.system == "x86_64-linux" @@ -39,16 +39,16 @@ let in stdenv.mkDerivation rec { pname = "${basename}-bin"; - version = "1.11.0"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/streamlink/${basename}/releases/download/v${version}/${basename}-v${version}-${arch}.tar.gz"; - sha256 = + hash = if arch == "linux64" then - "0y96nziavvpdvrpn58p6a175kaa8cgadp19rnbm250x9cypn1d9y" + "sha256-5AgQ+nvv/J493Zi+F+6QRT/DGg8JyusXsP5qVuXtiG4=" else - "0sfmhqf55w7wavqy4idsqpkf5p7l8sapjxap6xvyzpz4z5z6xr7y"; + "sha256-+jgTpIYb4BPM7Ixmo+YUeOX5OlQlMaRVEXf3WzS2lAI="; }; nativeBuildInputs = with xorg; [ @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { icon = basename; desktopName = "Streamlink Twitch GUI"; genericName = meta.description; - categories = "AudioVideo;Network;"; + categories = [ "AudioVideo" "Network" ]; }; meta = with lib; { diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 8a2522397ae1..415790b4c11c 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "3.1.0"; + version = "3.2.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-T2M0vg+BYIdr21CcdrrBf7bVVlZU+tKJWG2xfBMoMlg="; + sha256 = "sha256-l3DS2DhExTeKc+FBMNy3YKvIVlZsqgpB/FuXoN7V2SY="; }; checkInputs = with python3Packages; [ @@ -44,7 +44,6 @@ python3Packages.buildPythonApplication rec { ''; changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md"; license = licenses.bsd2; - platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ]; }; } diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix index fd5b2888d63d..1603bdcbb940 100644 --- a/pkgs/applications/video/sub-batch/default.nix +++ b/pkgs/applications/video/sub-batch/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "sub-batch"; - version = "0.4.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "kl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WUW+lOGbZ82NJxmW+Ogxslf3COOp62aZ/08Yn26l4T0="; + sha256 = "sha256-N+3KyBlLG90C3D5ivgj6qedtKsUBoBHr89gmxyAIfVI="; }; - cargoSha256 = "sha256-m9nBubmuuOcJyegmYGJizY/2b7oamBHKFNIaxOtikcA="; + cargoSha256 = "sha256-rjhSosiLIgcSw6OHpFmGNHXGUdf2QsiIXFVgtO9qNY0="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 74ce4446a195..3b333be7afef 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.3.332"; + version = "2.3.367"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "v${version}"; - sha256 = "1m7p4chpvbh4mswsymh89dksdgwhmnkpfbx9zi2jzqgkinfd6a2k"; + sha256 = "sha256-ZoNe3Ibv0adM6Is5cWMqfUrr0U3R951IJFsdEm1bztc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix index 6dc8aa56b5cc..f2753affa563 100644 --- a/pkgs/applications/video/ustreamer/default.nix +++ b/pkgs/applications/video/ustreamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ustreamer"; - version = "4.9"; + version = "4.11"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - sha256 = "sha256-dYwR+D2g4PxYyhsH9mGwgzTQ2Vw5UpMSomTl828gFvM="; + sha256 = "sha256-MTzlhnnDVZzS3lnYe3P/Hi6pi6f4B0+ejmDwV0f9juI="; }; buildInputs = [ libbsd libevent libjpeg ]; diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 51984cf5f11f..5584e63ab446 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.6.0"; + version = "2.6.1"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; rev = version; - sha256 = "sha256-TZm9pN9xtqkKhETsUhIIalK+4xQpFV3TXyWychSoyRk="; + sha256 = "sha256-jKuvh1OruPXTBlgLwlwcJdqC8u0WBDr/Un5JUL3U0hw="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 1efebb6fdf55..c19b8fa15cd1 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -10,7 +10,7 @@ , avahi , dbus , faad2 -, ffmpeg +, ffmpeg_4 , flac , fluidsynth , freefont_ttf @@ -82,11 +82,11 @@ let in stdenv.mkDerivation rec { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.16"; + version = "3.0.17"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; - sha256 = "sha256-/641/GT2JcF1Vx0jRrxfYge+mXYlF/FUI+dPGDmUEPY="; + sha256 = "sha256-SL2b8zeqEHoVJOulfFLcSpHin1qX+97pL2pNupA4PNA="; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { avahi dbus faad2 - ffmpeg + ffmpeg_4 flac fluidsynth fribidi @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { xcbutilkeysyms xlibsWrapper ]) - ++ optional (!hostIsAarch) live555 + ++ optional (!hostIsAarch && !onlyLibVLC) live555 ++ optional jackSupport libjack2 ++ optionals chromecastSupport [ libmicrodns protobuf ] ++ optionals skins2Support (with xorg; [ @@ -187,10 +187,15 @@ stdenv.mkDerivation rec { BUILDCC = "${stdenv.cc}/bin/gcc"; patches = [ - # Required in order to run newer srt plugin. Remove it when next release arrives + # patches to build with recent live555 + # upstream issue: https://code.videolan.org/videolan/vlc/-/issues/25473 (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4250fe8f28c220d883db454cec2b2c76a07473eb/trunk/vlc-3.0.11.1-srt_1.4.2.patch"; - sha256 = "53poWjZfwq/6l316sqiCp0AtcGweyXBntcLDFPSokHQ="; + url = "https://code.videolan.org/videolan/vlc/uploads/3c84ea58d7b94d7a8d354eaffe4b7d55/0001-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch"; + sha256 = "171d3qjl9a4dm13sqig3ra8s2zcr76wfnqz4ba4asg139cyc1axd"; + }) + (fetchpatch { + url = "https://code.videolan.org/videolan/vlc/uploads/eb1c313d2d499b8a777314f789794f9d/0001-Add-lssl-and-lcrypto-to-liblive555_plugin_la_LIBADD.patch"; + sha256 = "0kyi8q2zn2ww148ngbia9c7qjgdrijf4jlvxyxgrj29cb5iy1kda"; }) ]; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 3d44796f78cd..b4f610c7a91d 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchurl +, fetchpatch +, autoreconfHook , curl , libjpeg , libpng @@ -22,7 +24,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-sjgtB1xysbEAOeDpAxDMhsjZEDWMU1We2C09WEIB9cU="; }; + patches = [ + (fetchpatch { + # Fix build on aarch64 + name = "xine-ui_FTBS_aarch64.patch"; + url = "https://salsa.debian.org/debian/xine-ui/-/raw/b2f04f64947a8975a805950e7e67b15cb44007ef/debian/patches/backport/0003-Fix-build.patch"; + sha256 = "03f8nkm7q11v5vssl1bj500ja4ljz4y752mfk22k2g4djkwimx62"; + }) + ]; + nativeBuildInputs = [ + autoreconfHook pkg-config shared-mime-info ]; @@ -57,7 +69,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://xinehq.de/"; + homepage = "http://xine.sourceforge.net/"; description = "Xlib-based frontend for Xine video player"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/applications/video/xplayer/default.nix index a4b03e91501d..9d6a5e18ad5d 100644 --- a/pkgs/applications/video/xplayer/default.nix +++ b/pkgs/applications/video/xplayer/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # the gstreamer toolsdir points to the wrong derivation output postPatch = '' substituteInPlace configure.ac \ - --replace '$gst10_toolsdir/gst-inspect-1.0' '${gstreamer.dev}/bin/gst-inspect-1.0' \ + --replace '$gst10_toolsdir/gst-inspect-1.0' '${gstreamer}/bin/gst-inspect-1.0' \ ''; preBuild = '' diff --git a/pkgs/applications/video/yuview/default.nix b/pkgs/applications/video/yuview/default.nix new file mode 100644 index 000000000000..440782a8b70a --- /dev/null +++ b/pkgs/applications/video/yuview/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, qmake +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "yuview"; + version = "2.12.1"; + + src = fetchFromGitHub { + owner = "IENT"; + repo = "YUView"; + rev = "v${version}"; + sha256 = "sha256-BQnlq6TBxGbwqn6lAZGBo4+2HeXdFYL33LKqKSXMvdY="; + }; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + + patches = [ ./disable_version_check.patch ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://ient.github.io/YUView"; + description = "YUV Viewer and Analysis Tool"; + longDescription = '' + YUView is a Qt based YUV player with an advanced analytic toolset for + Linux, Windows and Mac. At its core, YUView is a powerful YUV player that + can open and show almost any YUV format. With its simple interface it is + easy to navigate through sequences and inspect details and a side by side + and comparison view can help to spot differences between two sequences. A + sophisticated statistics renderer can overlay the video with supplemental + information. More features include playlists, support for visual tests and + presentations, support of compressed formats (through libde265 and + FFmpeg), support for raw RGB files as well as image files and image + sequences, and many more. Further information can be found in the YUV help + in the application itself or in our wiki. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ leixb ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/video/yuview/disable_version_check.patch b/pkgs/applications/video/yuview/disable_version_check.patch new file mode 100644 index 000000000000..c13cb9e9b5bd --- /dev/null +++ b/pkgs/applications/video/yuview/disable_version_check.patch @@ -0,0 +1,15 @@ +diff --git a/YUViewLib/src/common/Typedef.h b/YUViewLib/src/common/Typedef.h +--- a/YUViewLib/src/common/Typedef.h ++++ b/YUViewLib/src/common/Typedef.h +@@ -212,12 +212,7 @@ private: + #define YUVIEW_VERSION "Unknown" + #endif + +-#ifndef YUVIEW_HASH + #define VERSION_CHECK 0 +-#define YUVIEW_HASH 0 +-#else +-#define VERSION_CHECK 1 +-#endif + + #define MAX_RECENT_FILES 10 diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 7adcd328add7..843cebe7d6ba 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -22,7 +22,8 @@ let in edk2.mkDerivation projectDscPath { - name = "OVMF-${version}"; + pname = "OVMF"; + inherit version; outputs = [ "out" "fd" ]; diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index cbd7d8e5512d..2889d09183d7 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook makeWrapper ]; buildInputs = [ docker - (python3.withPackages (ps: [ ps.lark-parser ps.requests ])) + (python3.withPackages (ps: [ ps.lark ps.requests ])) ]; configureFlags = let - pythonEnv = python3.withPackages (ps: [ ps.lark-parser ps.requests ]); + pythonEnv = python3.withPackages (ps: [ ps.lark ps.requests ]); in [ "--with-python=${pythonEnv}/bin/python3" ]; diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 4c2a21fd4c2d..b381d3ccca17 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "20.2"; + version = "22.1"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yIp1p8GyBojWKmvFRZ/OeyF2bjlqYsuXUrYTVunYV8Y="; + sha256 = "sha256-KWCGcGB4HCpV7uSM4otQhSGEzQ+1jQip2fiAysNN54k="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "sha256-s2u6e2JbukPo3pXYzQJXP5d2G213u1+1ke9gZFnB+5g="; + cargoSha256 = "sha256-R70H1R9jFnQyOLI4UNuRzpOAAnGSBGpiHFKbxP2472o="; + + OPENSSL_NO_VENDOR = true; + + # Integration tests require root. + cargoTestFlags = [ "--bins" ]; meta = with lib; { homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 4845b1b6466a..980955fcda65 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "colima"; - version = "0.3.2"; + version = "0.3.4"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hZ5BqNHQAMzL69ptpbTT+fN4NdV4AFhboCL2t1sF5AQ="; + sha256 = "sha256-g7q2DmtyArtW7Ii2XF5umXQ0+BlCSa1Q7VNNuIuX65k="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/applications/virtualization/containerd/1.4.nix b/pkgs/applications/virtualization/containerd/1.4.nix deleted file mode 100644 index 92c7ab0b2fd6..000000000000 --- a/pkgs/applications/virtualization/containerd/1.4.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoPackage -, btrfs-progs -, go-md2man -, installShellFiles -, util-linux -, nixosTests -}: - -buildGoPackage rec { - pname = "containerd"; - version = "1.4.11"; - - src = fetchFromGitHub { - owner = "containerd"; - repo = "containerd"; - rev = "v${version}"; - sha256 = "sha256-mUagr1/LqTCFvshWuiSMxsqdRqjzogt2tZ0uwR7ZVAs="; - }; - - goPackagePath = "github.com/containerd/containerd"; - outputs = [ "out" "man" ]; - - nativeBuildInputs = [ go-md2man installShellFiles util-linux ]; - - buildInputs = [ btrfs-progs ]; - - buildPhase = '' - cd go/src/${goPackagePath} - patchShebangs . - make binaries man "VERSION=v${version}" "REVISION=${src.rev}" - ''; - - installPhase = '' - install -Dm555 bin/* -t $out/bin - installManPage man/*.[1-9] - installShellCompletion --bash contrib/autocomplete/ctr - installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete - ''; - - passthru.tests = { inherit (nixosTests) docker; }; - - meta = with lib; { - homepage = "https://containerd.io/"; - description = "A daemon to control runC"; - license = licenses.asl20; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index a41dde4c9519..367f43deb809 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,15 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.5.9"; - - outputs = [ "out" "man" ]; + version = "1.6.2"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-v5seKJMfZUVMbydxKiTSy0OSwen6I/3DrGJnL2DyqHg="; + sha256 = "sha256-l/9jOvZ4nn/wy+XPRoT1lojfGvPEXhPz2FJjLpZ/EE8="; }; vendorSha256 = null; @@ -32,14 +30,13 @@ buildGoModule rec { buildPhase = '' runHook preBuild patchShebangs . - make binaries man "VERSION=v${version}" "REVISION=${src.rev}" + make binaries "VERSION=v${version}" "REVISION=${src.rev}" runHook postBuild ''; installPhase = '' runHook preInstall install -Dm555 bin/* -t $out/bin - installManPage man/*.[1-9] installShellCompletion --bash contrib/autocomplete/ctr installShellCompletion --zsh --name _ctr contrib/autocomplete/zsh_autocomplete runHook postInstall @@ -51,7 +48,7 @@ buildGoModule rec { homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; - maintainers = with maintainers; [ offline vdemeester endocrimes ]; + maintainers = with maintainers; [ offline vdemeester endocrimes zowoq ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 75a3dbf37462..b6d238d599ee 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.22.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-x1bnDksmEjKuzjwPBENP9xpQbzo8HAW+0i2l2Ra/48Y="; + sha256 = "sha256-sjeYWBcal6RtoUZd6orQ+237Fz80vQKx5vocFMq4l7U="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/crosvm/Cargo.lock b/pkgs/applications/virtualization/crosvm/Cargo.lock new file mode 100644 index 000000000000..3746d87cf0af --- /dev/null +++ b/pkgs/applications/virtualization/crosvm/Cargo.lock @@ -0,0 +1,1491 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aarch64" +version = "0.1.0" +dependencies = [ + "arch", + "base", + "data_model", + "devices", + "hypervisor", + "kernel_cmdline", + "kvm", + "kvm_sys", + "libc", + "minijail", + "remain", + "resources", + "sync", + "thiserror", + "vm_control", + "vm_memory", +] + +[[package]] +name = "acpi_tables" +version = "0.1.0" +dependencies = [ + "data_model", + "tempfile", +] + +[[package]] +name = "android_log-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" + +[[package]] +name = "anyhow" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" + +[[package]] +name = "arch" +version = "0.1.0" +dependencies = [ + "acpi_tables", + "base", + "devices", + "gdbstub_arch", + "hypervisor", + "kernel_cmdline", + "libc", + "minijail", + "power_monitor", + "remain", + "resources", + "sync", + "thiserror", + "vm_control", + "vm_memory", +] + +[[package]] +name = "argh" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb41d85d92dfab96cb95ab023c265c5e4261bb956c0fb49ca06d90c570f1958" +dependencies = [ + "argh_derive", + "argh_shared", +] + +[[package]] +name = "argh_derive" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be69f70ef5497dd6ab331a50bd95c6ac6b8f7f17a7967838332743fbd58dc3b5" +dependencies = [ + "argh_shared", + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "argh_shared" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6f8c380fa28aa1b36107cd97f0196474bb7241bb95a453c5c01a15ac74b2eac" + +[[package]] +name = "assertions" +version = "0.1.0" + +[[package]] +name = "async-task" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" + +[[package]] +name = "async-trait" +version = "0.1.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "audio_streams" +version = "0.1.0" +dependencies = [ + "async-trait", + "cros_async", + "remain", + "sync", + "thiserror", +] + +[[package]] +name = "autocfg" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" +dependencies = [ + "autocfg 1.1.0", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base" +version = "0.1.0" +dependencies = [ + "audio_streams", + "cros_async", + "data_model", + "libc", + "remain", + "serde", + "serde_json", + "smallvec", + "sync", + "sys_util", + "thiserror", +] + +[[package]] +name = "bit_field" +version = "0.1.0" +dependencies = [ + "bit_field_derive", +] + +[[package]] +name = "bit_field_derive" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + +[[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 = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ + "bitflags", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "cros_async" +version = "0.1.0" +dependencies = [ + "async-task", + "async-trait", + "data_model", + "futures", + "intrusive-collections", + "io_uring", + "libc", + "once_cell", + "paste", + "pin-utils", + "remain", + "slab", + "sync", + "sys_util", + "thiserror", +] + +[[package]] +name = "cros_fuzz" +version = "0.1.0" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "crosvm" +version = "0.1.0" +dependencies = [ + "aarch64", + "acpi_tables", + "anyhow", + "arch", + "assertions", + "audio_streams", + "base", + "bit_field", + "crosvm_plugin", + "data_model", + "devices", + "disk", + "enumn", + "gdbstub", + "gdbstub_arch", + "hypervisor", + "kernel_cmdline", + "kernel_loader", + "kvm", + "kvm_sys", + "libc", + "libcras", + "minijail", + "net_util", + "p9", + "protobuf", + "protos", + "remain", + "resources", + "rutabaga_gfx", + "scudo", + "serde_json", + "sync", + "tempfile", + "thiserror", + "vhost", + "vm_control", + "vm_memory", + "x86_64", +] + +[[package]] +name = "crosvm-fuzz" +version = "0.0.1" +dependencies = [ + "base", + "cros_fuzz", + "data_model", + "devices", + "disk", + "fuse", + "hypervisor", + "kernel_loader", + "libc", + "rand", + "tempfile", + "usb_util", + "vm_memory", +] + +[[package]] +name = "crosvm_control" +version = "0.1.0" +dependencies = [ + "base", + "libc", + "vm_control", +] + +[[package]] +name = "crosvm_plugin" +version = "0.17.0" +dependencies = [ + "base", + "kvm", + "kvm_sys", + "libc", + "protobuf", + "protos", +] + +[[package]] +name = "data_model" +version = "0.1.0" +dependencies = [ + "assertions", + "libc", + "remain", + "serde", + "thiserror", +] + +[[package]] +name = "dbus" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0a745c25b32caa56b82a3950f5fec7893a960f4c10ca3b02060b0c38d8c2ce" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + +[[package]] +name = "devices" +version = "0.1.0" +dependencies = [ + "acpi_tables", + "anyhow", + "argh", + "async-task", + "audio_streams", + "base", + "bit_field", + "cros_async", + "data_model", + "dbus", + "disk", + "enumn", + "fuse", + "futures", + "gpu_display", + "hypervisor", + "kvm_sys", + "libc", + "libcras", + "libvda", + "linux_input_sys", + "minijail", + "net_sys", + "net_util", + "once_cell", + "p9", + "power_monitor", + "protobuf", + "protos", + "remain", + "resources", + "rutabaga_gfx", + "serde", + "serde_json", + "smallvec", + "sync", + "sys_util", + "system_api", + "tempfile", + "thiserror", + "tpm2", + "usb_util", + "vfio_sys", + "vhost", + "virtio_sys", + "vm_control", + "vm_memory", + "vmm_vhost", +] + +[[package]] +name = "disk" +version = "0.1.0" +dependencies = [ + "async-trait", + "base", + "crc32fast", + "cros_async", + "data_model", + "futures", + "libc", + "protobuf", + "protos", + "remain", + "tempfile", + "thiserror", + "uuid", + "vm_memory", +] + +[[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.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "enumn" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e58b112d5099aa0857c5d05f0eacab86406dd8c0f85fe5d320a13256d29ecf4" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "fastrand" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +dependencies = [ + "instant", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "fuse" +version = "0.1.0" +dependencies = [ + "base", + "bitflags", + "data_model", + "enumn", + "libc", + "remain", + "thiserror", +] + +[[package]] +name = "futures" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" + +[[package]] +name = "futures-io" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" + +[[package]] +name = "futures-macro" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gdbstub" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e135587d3f6eee6fa02c4ba174270c2337424e6d852c156942c0840b3c0f5cc" +dependencies = [ + "cfg-if 0.1.10", + "log", + "managed", + "num-traits", + "paste", +] + +[[package]] +name = "gdbstub_arch" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e358b9c0e1468eae66099062e47bb502849308b987b74b5e72f1936397c33c16" +dependencies = [ + "gdbstub", + "num-traits", +] + +[[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", +] + +[[package]] +name = "gpu_display" +version = "0.1.0" +dependencies = [ + "base", + "cc", + "data_model", + "libc", + "linux_input_sys", + "pkg-config", + "remain", + "thiserror", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hypervisor" +version = "0.1.0" +dependencies = [ + "base", + "bit_field", + "data_model", + "downcast-rs", + "enumn", + "kvm", + "kvm_sys", + "libc", + "serde", + "sync", + "vm_memory", +] + +[[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 = "integration_tests" +version = "0.1.0" +dependencies = [ + "anyhow", + "arch", + "base", + "crosvm", + "libc", + "tempfile", +] + +[[package]] +name = "intrusive-collections" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb484b70a4ebad7f571bf84e9cd06b5bfb6a7e4db0c36e13dd1570c6b449c10d" +dependencies = [ + "memoffset", +] + +[[package]] +name = "io_uring" +version = "0.1.0" +dependencies = [ + "data_model", + "libc", + "remain", + "sync", + "sys_util", + "thiserror", +] + +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + +[[package]] +name = "kernel_cmdline" +version = "0.1.0" +dependencies = [ + "libc", + "remain", + "thiserror", +] + +[[package]] +name = "kernel_loader" +version = "0.1.0" +dependencies = [ + "base", + "data_model", + "libc", + "remain", + "tempfile", + "thiserror", + "vm_memory", +] + +[[package]] +name = "kvm" +version = "0.1.0" +dependencies = [ + "base", + "data_model", + "kvm_sys", + "libc", + "sync", + "vm_memory", +] + +[[package]] +name = "kvm_sys" +version = "0.1.0" +dependencies = [ + "base", + "data_model", + "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.120" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad5c14e80759d0939d013e6ca49930e59fc53dd8e5009132f76240c179380c09" + +[[package]] +name = "libcras" +version = "0.1.0" + +[[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 = "libvda" +version = "0.1.0" +dependencies = [ + "enumn", + "libc", + "pkg-config", +] + +[[package]] +name = "linux_input_sys" +version = "0.1.0" +dependencies = [ + "base", + "data_model", + "libc", +] + +[[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 = "managed" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" + +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "memoffset" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" +dependencies = [ + "autocfg 1.1.0", +] + +[[package]] +name = "minijail" +version = "0.2.3" +dependencies = [ + "libc", + "minijail-sys", +] + +[[package]] +name = "minijail-sys" +version = "0.0.13" +dependencies = [ + "libc", + "pkg-config", + "which", +] + +[[package]] +name = "net_sys" +version = "0.1.0" +dependencies = [ + "base", +] + +[[package]] +name = "net_util" +version = "0.1.0" +dependencies = [ + "base", + "cros_async", + "data_model", + "libc", + "net_sys", + "remain", + "thiserror", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg 1.1.0", +] + +[[package]] +name = "once_cell" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" + +[[package]] +name = "p9" +version = "0.1.0" +dependencies = [ + "libc", + "sys_util", + "wire_format_derive", +] + +[[package]] +name = "paste" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" + +[[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 = "poll_token_derive" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "power_monitor" +version = "0.1.0" +dependencies = [ + "base", + "dbus", + "protobuf", + "protoc-rust", + "remain", + "thiserror", +] + +[[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 = "protobuf" +version = "2.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96" + +[[package]] +name = "protobuf-codegen" +version = "2.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aec1632b7c8f2e620343439a7dfd1f3c47b18906c4be58982079911482b5d707" +dependencies = [ + "protobuf", +] + +[[package]] +name = "protoc" +version = "2.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2ef1dc036942fac2470fdb8a911f125404ee9129e9e807f3d12d8589001a38f" +dependencies = [ + "log", + "which", +] + +[[package]] +name = "protoc-rust" +version = "2.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a9e315121c8e7e21396e940a3d27f92280a6d28e3931213bf6cbfea76c5cc94" +dependencies = [ + "protobuf", + "protobuf-codegen", + "protoc", + "tempfile", +] + +[[package]] +name = "protos" +version = "0.1.0" +dependencies = [ + "kvm_sys", + "protobuf", + "protoc-rust", +] + +[[package]] +name = "qcow_utils" +version = "0.1.0" +dependencies = [ + "argh", + "base", + "disk", + "libc", +] + +[[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.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ + "autocfg 0.1.8", + "libc", + "rand_chacha", + "rand_core 0.4.2", + "rand_hc", + "rand_isaac", + "rand_jitter", + "rand_os", + "rand_pcg", + "rand_xorshift", + "winapi", +] + +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.3.1", +] + +[[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 = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ + "libc", + "rand_core 0.4.2", + "winapi", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.4.2", + "rdrand", + "winapi", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ + "rand_core 0.3.1", +] + +[[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 = "redox_syscall" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" +dependencies = [ + "bitflags", +] + +[[package]] +name = "remain" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ba1e78fa68412cb93ef642fd4d20b9a941be49ee9333875ebaf13112673ea7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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 = "resources" +version = "0.1.0" +dependencies = [ + "base", + "libc", + "remain", + "serde", + "thiserror", +] + +[[package]] +name = "rutabaga_gfx" +version = "0.1.0" +dependencies = [ + "anyhow", + "base", + "data_model", + "libc", + "pkg-config", + "remain", + "sync", + "thiserror", +] + +[[package]] +name = "rutabaga_gfx_ffi" +version = "0.1.0" +dependencies = [ + "base", + "data_model", + "libc", + "rutabaga_gfx", +] + +[[package]] +name = "ryu" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" + +[[package]] +name = "scudo" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a043122e575636c0e47121917446b4f40803fc6defd8797369e7d2d47086d8e3" +dependencies = [ + "libc", + "scudo-sys", +] + +[[package]] +name = "scudo-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aedac72a22df5e73d23abf6b26a9b124a3e10f0e5cc74b9aa8121c7e14cf106" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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 = "slab" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" + +[[package]] +name = "smallvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" + +[[package]] +name = "syn" +version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd69e719f31e88618baa1eaa6ee2de5c9a1c004f1e9ecdb58e8352a13f20a01" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "sync" +version = "0.1.0" + +[[package]] +name = "sys_util" +version = "0.1.0" +dependencies = [ + "android_log-sys", + "data_model", + "libc", + "poll_token_derive", + "remain", + "serde", + "serde_json", + "sync", + "tempfile", + "thiserror", +] + +[[package]] +name = "system_api" +version = "0.1.0" + +[[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 = "tpm2" +version = "0.1.0" +dependencies = [ + "tpm2-sys", +] + +[[package]] +name = "tpm2-sys" +version = "0.1.0" +dependencies = [ + "anyhow", + "pkg-config", +] + +[[package]] +name = "unicode-segmentation" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "usb_sys" +version = "0.1.0" +dependencies = [ + "base", +] + +[[package]] +name = "usb_util" +version = "0.1.0" +dependencies = [ + "assertions", + "base", + "data_model", + "libc", + "remain", + "thiserror", + "usb_sys", +] + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "vfio_sys" +version = "0.1.0" +dependencies = [ + "base", +] + +[[package]] +name = "vhost" +version = "0.1.0" +dependencies = [ + "assertions", + "base", + "libc", + "net_util", + "remain", + "thiserror", + "virtio_sys", + "vm_memory", +] + +[[package]] +name = "virtio_sys" +version = "0.1.0" +dependencies = [ + "base", +] + +[[package]] +name = "vm_control" +version = "0.1.0" +dependencies = [ + "base", + "data_model", + "gdbstub_arch", + "hypervisor", + "libc", + "remain", + "resources", + "rutabaga_gfx", + "serde", + "serde_json", + "sync", + "thiserror", + "vm_memory", +] + +[[package]] +name = "vm_memory" +version = "0.1.0" +dependencies = [ + "base", + "bitflags", + "cros_async", + "data_model", + "libc", + "remain", + "thiserror", +] + +[[package]] +name = "vmm_vhost" +version = "0.1.0" +dependencies = [ + "anyhow", + "bitflags", + "data_model", + "libc", + "remain", + "sys_util", + "tempfile", + "thiserror", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "which" +version = "4.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2" +dependencies = [ + "either", + "lazy_static", + "libc", +] + +[[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 = "wire_format_derive" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "x86_64" +version = "0.1.0" +dependencies = [ + "acpi_tables", + "arch", + "assertions", + "base", + "data_model", + "devices", + "gdbstub_arch", + "hypervisor", + "kernel_cmdline", + "kernel_loader", + "libc", + "minijail", + "remain", + "resources", + "sync", + "thiserror", + "vm_control", + "vm_memory", +] diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 697741e21f14..2afbe123b55b 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, rustPlatform, fetchgit, runCommand, symlinkJoin -, pkg-config, minijail, dtc, libusb1, libcap, linux +{ stdenv, lib, rustPlatform, fetchgit +, pkg-config, wayland-scanner, libcap, minijail, wayland, wayland-protocols +, linux }: let @@ -11,55 +12,26 @@ let else if isx86_64 then "x86_64" else throw "no seccomp policy files available for host platform"; - crosvmSrc = fetchgit { - inherit (upstreamInfo.components."chromiumos/platform/crosvm") - url rev sha256 fetchSubmodules; - }; - - adhdSrc = fetchgit { - inherit (upstreamInfo.components."chromiumos/third_party/adhd") - url rev sha256 fetchSubmodules; - }; - in rustPlatform.buildRustPackage rec { pname = "crosvm"; inherit (upstreamInfo) version; - unpackPhase = '' - runHook preUnpack - - mkdir -p chromiumos/platform chromiumos/third_party - - pushd chromiumos/platform - unpackFile ${crosvmSrc} - mv ${crosvmSrc.name} crosvm - popd - - pushd chromiumos/third_party - unpackFile ${adhdSrc} - mv ${adhdSrc.name} adhd - popd - - chmod -R u+w -- "$sourceRoot" - - runHook postUnpack - ''; - - sourceRoot = "chromiumos/platform/crosvm"; + src = fetchgit (builtins.removeAttrs upstreamInfo.src [ "date" "path" ]); patches = [ ./default-seccomp-policy-dir.diff ]; - cargoSha256 = "0aax0slg59afbyn3ygswwap2anv11k6sr9hfpysb4f8rvymvx7hd"; + cargoLock.lockFile = ./Cargo.lock; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wayland-scanner ]; - buildInputs = [ dtc libcap libusb1 minijail ]; + buildInputs = [ libcap minijail wayland wayland-protocols ]; postPatch = '' + cp ${./Cargo.lock} Cargo.lock sed -i "s|/usr/share/policy/crosvm/|$out/share/policy/|g" \ seccomp/*/*.policy ''; @@ -77,11 +49,7 @@ in lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) "${linux}/${stdenv.hostPlatform.linux-kernel.target}"; - passthru = { - inherit adhdSrc; - src = crosvmSrc; - updateScript = ./update.py; - }; + passthru.updateScript = ./update.py; meta = with lib; { description = "A secure virtual machine monitor for KVM"; diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py index 29e68b9f5790..6e36e524b78d 100755 --- a/pkgs/applications/virtualization/crosvm/update.py +++ b/pkgs/applications/virtualization/crosvm/update.py @@ -12,9 +12,7 @@ from lxml import etree from lxml.etree import HTMLParser from urllib.request import urlopen -# ChromiumOS components required to build crosvm. -components = ['chromiumos/platform/crosvm', 'chromiumos/third_party/adhd'] - +git_path = 'chromiumos/platform/crosvm' git_root = 'https://chromium.googlesource.com/' manifest_versions = f'{git_root}chromiumos/manifest-versions' buildspecs_url = f'{manifest_versions}/+/refs/heads/master/full/buildspecs/' @@ -54,32 +52,27 @@ with urlopen(f'{buildspecs_url}{chrome_major_version}/?format=TEXT') as resp: buildspecs.sort(reverse=True) buildspec = splitext(buildspecs[0])[0] -revisions = {} - -# Read the buildspec, and extract the git revisions for each component. +# Read the buildspec, and extract the git revision. with urlopen(f'{buildspecs_url}{chrome_major_version}/{buildspec}.xml?format=TEXT') as resp: xml = base64.decodebytes(resp.read()) root = etree.fromstring(xml) - for project in root.findall('project'): - revisions[project.get('name')] = project.get('revision') + revision = root.find(f'./project[@name="{git_path}"]').get('revision') # Initialize the data that will be output from this script. Leave the # rc number in buildspec so nobody else is subject to the same level # of confusion I have been. -data = {'version': f'{chrome_major_version}.{buildspec}', 'components': {}} +data = {'version': f'{chrome_major_version}.{buildspec}'} -# Fill in the 'components' dictionary with the output from -# nix-prefetch-git, which can be passed straight to fetchGit when -# imported by Nix. -for component in components: - argv = ['nix-prefetch-git', - '--url', git_root + component, - '--rev', revisions[component]] +# Fill in the 'src' key with the output from nix-prefetch-git, which +# can be passed straight to fetchGit when imported by Nix. +argv = ['nix-prefetch-git', + '--fetch-submodules', + '--url', git_root + git_path, + '--rev', revision] +output = subprocess.check_output(argv) +data['src'] = json.loads(output.decode('utf-8')) - output = subprocess.check_output(argv) - data['components'][component] = json.loads(output.decode('utf-8')) - -# Find the path to crosvm's default.nix, so the srcs data can be +# Find the path to crosvm's default.nix, so the src data can be # written into the same directory. argv = ['nix-instantiate', '--eval', '--json', '-A', 'crosvm.meta.position'] position = json.loads(subprocess.check_output(argv).decode('utf-8')) diff --git a/pkgs/applications/virtualization/crosvm/upstream-info.json b/pkgs/applications/virtualization/crosvm/upstream-info.json index bb9cc8841b4a..437e8f418699 100644 --- a/pkgs/applications/virtualization/crosvm/upstream-info.json +++ b/pkgs/applications/virtualization/crosvm/upstream-info.json @@ -1,23 +1,14 @@ { - "version": "81.12871.0.0-rc1", - "components": { - "chromiumos/platform/crosvm": { - "url": "https://chromium.googlesource.com/chromiumos/platform/crosvm", - "rev": "8b8c01e1ad31718932491e4aee63f56109a138e2", - "date": "2020-01-25T02:28:10+00:00", - "sha256": "1qmf1k06pwynh15c3nr9m6v90z2pkk930xniwvlvbvnazrk4rllg", - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false - }, - "chromiumos/third_party/adhd": { - "url": "https://chromium.googlesource.com/chromiumos/third_party/adhd", - "rev": "f361d5b02623274723bff251dafa1e2a2887b013", - "date": "2020-01-23T18:37:46+00:00", - "sha256": "1p8iwjwgmcgmzri03ik2jaid8l0ch0bzn6z9z64dix1hlrvrlliw", - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false - } + "version": "99.14468.0.0-rc1", + "src": { + "url": "https://chromium.googlesource.com/chromiumos/platform/crosvm", + "rev": "410ea3a1980bfe96968a7dfb7a7d203d43b186b2", + "date": "2022-01-11T00:01:17-08:00", + "path": "/nix/store/y2rpzh1any8c4nwnwkvir7241kbcj8fn-crosvm-410ea3a", + "sha256": "1bgwndh2f60ka1f8c8yqnqqkra510ai9miyfvvm0b3dnsdpy77kd", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false } } diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 2164f16bd3ec..5855eee63792 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -18,6 +18,7 @@ let disabledTests = [ "test_capabilities.py" "test_cwd.py" + "test_delete.py" "test_detach.py" "test_exec.py" "test_hooks.py" @@ -37,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.4.1"; + version = "1.4.4"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-j2+ga+jnKnjnFGmrOOym99keLALg7wR7Jk+jjesiMc4="; + sha256 = "sha256-ITUj905ZSdCH0mcw8tubyVKqI6p/oNcC4OW7/NbkR5o="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix new file mode 100644 index 000000000000..e67509c54f85 --- /dev/null +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -0,0 +1,38 @@ +{ stdenvNoCC, lib, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "distrobox"; + version = "1.2.14"; + + src = fetchFromGitHub { + owner = "89luca89"; + repo = pname; + rev = version; + sha256 = "sha256-gHKyuIL4K/SLBJw8xNuPdNifDcHI91AFTiHaiv38gus="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + ./install -p $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Wrapper around podman or docker to create and start containers"; + longDescription = '' + Use any linux distribution inside your terminal. Enable both backward and + forward compatibility with software and freedom to use whatever distribution + you’re more comfortable with + ''; + homepage = "https://distrobox.privatedns.org/"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index cd8a1f5041aa..a7261dac6d1f 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.37.3"; + version = "1.37.5"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "sha256-jzwQ3nrhLDiQXcVkPiXrRAmpLQOD8ILBnoCEUiEbxzw="; + sha256 = "sha256-MBs0ybBXsanNFt6R7+ZYvtCh7iHE3FtWXE9uy9tbrE4="; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index a149b5e4b334..9b440963f4ae 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "sha256-5EV0Rw1+ufxQ1wmQ0EJXQ7HVtXVbB4do/tet0QFRi08="; + sha256 = "sha256-NJNFjzbiBcmXcBF1k0qybv5LnkaQ+1ehSfF18CC85JY="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 35856eae01c8..59a9a7606ef1 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.2.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-c6rwRFJ/9moukd56qrmHxOeULhSPHCU0Cj+vw4TQ8+Q="; + sha256 = "sha256-ZFnrfGM2LUZZC8IPPCh3GS95jz7NGraOlr3wQaw5K0k="; }; - vendorSha256 = "sha256-W+bcjUXPZjldjhgaGsUKS1vSvS3yP/kH0QqwyvhL7Ww="; + vendorSha256 = "sha256-Y2rE5/XLmQLqBA8xiCd9v30gTaO9qbiBFa4jKucKU6M="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 462ebb556f1d..ef9050f47d96 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -10,9 +10,9 @@ rec { , containerdRev, containerdSha256 , tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true # package dependencies - , stdenv, fetchFromGitHub, buildGoPackage + , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc - , go-md2man, go, containerd_1_4, runc, docker-proxy, tini, libtool + , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2 , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp, rootlesskit, slirp4netns, fuse-overlayfs @@ -33,7 +33,7 @@ rec { patches = []; }); - docker-containerd = containerd_1_4.overrideAttrs (oldAttrs: { + docker-containerd = containerd.overrideAttrs (oldAttrs: { name = "docker-containerd-${version}"; inherit version; src = fetchFromGitHub { @@ -79,6 +79,16 @@ rec { extraUserPath = optionals (stdenv.isLinux && !clientOnly) (makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); + patches = [ + # This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver. + # It could be removed when a version incorporating this patch is released. + (fetchpatch { + name = "buildkit-zfs.patch"; + url = "https://github.com/moby/moby/pull/43136.patch"; + sha256 = "1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; + }) + ]; + postPatch = '' patchShebangs hack/make.sh hack/make/ ''; @@ -233,20 +243,20 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.12"; + version = "20.10.14"; rev = "v${version}"; - sha256 = "sha256-nU6grb2lSW7BY7w9aAXwVbGp9TyO2ZxnJaxAi0wbk/c="; + sha256 = "sha256-eDwgqFx4io++SMOjhxMxVzqzcOgOnv6Xe/qmmPCvZts="; moby-src = fetchFromGitHub { owner = "moby"; repo = "moby"; rev = "v${version}"; - sha256 = "sha256-qizzK1qJNRGFisahE3iAzZTNW/HmledlMNxcJCMQSJ4="; + sha256 = "sha256-I5oxpFLH789I2Sb29OXDaM4fCbQT/KvPq0DYcAVp0aI="; }; - runcRev = "v1.0.2"; - runcSha256 = "1bpckghjah0rczciw1a1ab8z718lb2d3k4mjm4zb45lpm3njmrcp"; - containerdRev = "v1.4.12"; - containerdSha256 = "sha256-g30kshXyGVew5tVaXFAOQUOYvvo0JBqIj1YaC5nTiS8="; - tiniRev = "v0.19.0"; # v0.19.0 - tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; + runcRev = "v1.0.3"; + runcSha256 = "sha256-Tl/JKbIpao+FCjngPzaVkxse50zo3XQ9Mg/AdkblMcI="; + containerdRev = "v1.5.11"; + containerdSha256 = "sha256-YzFtv6DIjImSK0SywxhZrEeEmCnHTceAi3pfwnPubKg="; + tiniRev = "v0.19.0"; + tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; } diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/applications/virtualization/docker/gc.nix index 52ca54501d75..0736516ee7d2 100644 --- a/pkgs/applications/virtualization/docker/gc.nix +++ b/pkgs/applications/virtualization/docker/gc.nix @@ -3,13 +3,13 @@ with lib; stdenv.mkDerivation rec { - name = "docker-gc-${rev}"; - rev = "b0cc52aa3da2e2ac0080794e0be6e674b1f063fc"; + pname = "docker-gc"; + version = "unstable-2015-10-5"; src = fetchFromGitHub { - inherit rev; owner = "spotify"; repo = "docker-gc"; + rev = "b0cc52aa3da2e2ac0080794e0be6e674b1f063fc"; sha256 = "07wf9yn0f771xkm3x12946x5rp83hxjkd70xgfgy35zvj27wskzm"; }; diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index a247e2cecfaf..6038a129e2a1 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -1,13 +1,13 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "docker-proxy-${rev}"; - rev = "fa125a3512ee0f6187721c88582bf8c4378bd4d7"; + pname = "docker-proxy"; + version = "unstable-2020-12-15"; src = fetchFromGitHub { - inherit rev; owner = "docker"; repo = "libnetwork"; + rev = "fa125a3512ee0f6187721c88582bf8c4378bd4d7"; sha256 = "1r47y0gww3j7fas4kgiqbhrz5fazsx1c6sxnccdfhj8fzik77s9y"; }; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index a3ef59e8e92e..9d35e87f1614 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "0.25.2"; + version = "1.0.0"; suffix = { x86_64-linux = "x86_64"; @@ -22,8 +22,8 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-ZzlPq+Q9XfWQJr+7nKS0e6bfKwYNfpMHSiBIKeOr/s4="; - aarch64-linux = "sha256-75UC+HeVUfUk1HRvTJsOHbHHkgr6me1OtxDF7lahf68="; + x86_64-linux = "sha256-yeWVsrvH3yYlS2uH/TkSleHjXvIDnHWcZSvLgV+CGF0="; + aarch64-linux = "sha256-9ggRmijwXE9adVFv5XommgvdpeeWnWUFES+Ep2GrBVo="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/flintlock/default.nix b/pkgs/applications/virtualization/flintlock/default.nix new file mode 100644 index 000000000000..d258604496eb --- /dev/null +++ b/pkgs/applications/virtualization/flintlock/default.nix @@ -0,0 +1,49 @@ +{ lib +, cni-plugins +, buildGoModule +, firecracker +, containerd +, runc +, makeWrapper +, fetchFromGitHub +}: + +buildGoModule rec{ + pname = "flintlock"; + version = "0.1.0-alpha.9"; + + src = fetchFromGitHub { + owner = "weaveworks"; + repo = "flintlock"; + rev = "v${version}"; + sha256 = "sha256-Xw3g2wh0fPUknSuAKoJL3jxVZS50wSPZ9Wz05zkTVXM="; + }; + + vendorSha256 = "sha256-EjVlM6AD+O/z6+R5TRBmmRWbrP4C+qyvsnEjwOkDkUE="; + + subPackages = [ "cmd/flintlock-metrics" "cmd/flintlockd" ]; + + ldflags = [ "-s" "-w" "-X github.com/weaveworks/flintlock/internal/version.Version=v${version}" ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + firecracker + ]; + + postInstall = '' + for prog in flintlockd flintlock-metrics; do + wrapProgram "$out/bin/$prog" --prefix PATH : ${lib.makeBinPath [ cni-plugins firecracker containerd runc ]} + done + ''; + + meta = with lib; { + description = "Create and manage the lifecycle of MicroVMs backed by containerd"; + homepage = "https://github.com/weaveworks/flintlock"; + license = licenses.mpl20; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/pkgs/applications/virtualization/gvisor/containerd-shim.nix b/pkgs/applications/virtualization/gvisor/containerd-shim.nix index c8610b73865b..612ef0f4b536 100644 --- a/pkgs/applications/virtualization/gvisor/containerd-shim.nix +++ b/pkgs/applications/virtualization/gvisor/containerd-shim.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { - name = "gvisor-containerd-shim-${version}"; - version = "2019-10-09"; + pname = "gvisor-containerd-shim"; + version = "unstable-2019-10-09"; src = fetchFromGitHub { owner = "google"; diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 4cd043d4eb6d..cf6f2102e6ac 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -52,7 +52,7 @@ let }; in buildBazelPackage rec { - name = "gvisor-${version}"; + pname = "gvisor"; version = "20210518.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/libgovirt/default.nix b/pkgs/applications/virtualization/libgovirt/default.nix new file mode 100644 index 000000000000..9c9da54c3632 --- /dev/null +++ b/pkgs/applications/virtualization/libgovirt/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchurl +, glib +, gnome +, librest +, libsoup +, pkg-config +, gobject-introspection +}: + +stdenv.mkDerivation rec { + pname = "libgovirt"; + version = "0.3.8"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/libgovirt/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg="; + }; + + nativeBuildInputs = [ + pkg-config + gobject-introspection + ]; + + buildInputs = [ + libsoup + ]; + + propagatedBuildInputs = [ + glib + librest + ]; + + enableParallelBuilding = true; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/GNOME/libgovirt"; + description = "GObject wrapper for the oVirt REST API"; + maintainers = [ maintainers.amarshall ]; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index ad9955cc4772..db3ed3500e34 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.8.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vOoRwV4BO40cUWNxmWubgbN1q7WPKe2vifg8F1duaVA="; + sha256 = "sha256-GS/mzBoVL78U7vMxkbnQfb89U640w8YdA8YhPH4Iwrc="; }; - vendorSha256 = "sha256-118TYmpGUNMZgFKsOzqOy71SabG9tN6IeOkpgwVSXTY="; + vendorSha256 = "sha256-funVyM0RhDzGQPyzsABzXu3ETPYJwRosqkQreGBADZc="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 5d2be06db0a3..60db5708922f 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { wayland-protocols ]; - NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem. + cmakeFlags = [ "-DOPTIMIZE_FOR_NATIVE=OFF" ]; postUnpack = '' echo ${src.rev} > source/VERSION diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index c3721bbe36e5..6018608a3f16 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook -, bash, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto +{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, autoreconfHook +, bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto , libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst , pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which , libdrm, udev @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "11.3.5"; + version = "12.0.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "03fahljrijq4ij8a4v8d7806mpf22ppkgr61n5s974g3xfdvpl13"; + sha256 = "sha256-agWTGf8x6bxZ7S5bU2scHt8IdLLe/hZdaEMfHIK9d8U="; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -22,10 +22,24 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; - buildInputs = [ fuse glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ] + buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; + patches = [ + # glibc 2.35 and GCC 11 & 12 reporting possible array bounds overflow + # Will be fixed in the release after 12.0.0 + (fetchpatch { + url = "https://github.com/vmware/open-vm-tools/commit/de6d129476724668b8903e2a87654f50ba21b1b2.patch"; + sha256 = "1cqhm868g40kcp8qzzwq10zd4bah9ypaw1qawnli5d240mlkpfhh"; + }) + ]; + + prePatch = '' + cd .. + ''; + postPatch = '' + cd open-vm-tools sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am @@ -43,6 +57,7 @@ stdenv.mkDerivation rec { "--without-kernel-modules" "--without-xmlsecurity" "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d" + "--with-fuse=fuse3" ] ++ lib.optional (!withX) "--without-x"; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/applications/virtualization/podman-compose/default.nix index 974aa712d62f..a05ff32e397b 100644 --- a/pkgs/applications/virtualization/podman-compose/default.nix +++ b/pkgs/applications/virtualization/podman-compose/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { description = "An implementation of docker-compose with podman backend"; homepage = "https://github.com/containers/podman-compose"; license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.sikmir ] ++ lib.teams.podman.members; }; } diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix new file mode 100644 index 000000000000..7a8ed6fed284 --- /dev/null +++ b/pkgs/applications/virtualization/podman-tui/default.nix @@ -0,0 +1,49 @@ +{ lib +, pkg-config +, fetchFromGitHub +, buildGoModule +, btrfs-progs +, gpgme +, libassuan +, lvm2 +, testVersion +, podman-tui +}: +buildGoModule rec { + pname = "podman-tui"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "containers"; + repo = "podman-tui"; + rev = "v${version}"; + sha256 = "sha256-y5bFr31CQ4JES6tjvThyy7qmoKFC59uwtDMG5r+r8K4="; + }; + + vendorSha256 = null; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + btrfs-progs + gpgme + libassuan + lvm2 + ]; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testVersion { + package = podman-tui; + command = "podman-tui version"; + version = "v${version}"; + }; + + meta = with lib; { + homepage = "https://github.com/containers/podman-tui"; + description = "Podman Terminal UI"; + license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 0dad4d9123dc..7d783b211bbd 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -17,20 +17,20 @@ buildGoModule rec { pname = "podman"; - version = "3.4.4"; + version = "4.0.2"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-5Y0+xfoMCe3a6kX+OhmxURZXZLAnrS1t8TFyHqjGCeA="; + sha256 = "sha256-uLpvTnn2EWEI8+5gC3ofMjsZ9O7nLOaaUGGuvSE1gdE="; }; vendorSha256 = null; doCheck = false; - outputs = [ "out" "man" ]; + outputs = [ "out" "man" ] ++ lib.optionals stdenv.isLinux [ "rootlessport" ]; nativeBuildInputs = [ pkg-config go-md2man installShellFiles ]; @@ -47,26 +47,32 @@ buildGoModule rec { buildPhase = '' runHook preBuild patchShebangs . - ${if stdenv.isDarwin - then "make podman-remote" - else "make podman"} + ${if stdenv.isDarwin then '' + make podman-remote # podman-mac-helper uses FHS paths + '' else '' + make bin/podman bin/rootlessport + ''} make docs runHook postBuild ''; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' - mv bin/{darwin/podman,podman} - '' + '' - install -Dm555 bin/podman $out/bin/podman - installShellCompletion --bash completions/bash/* - installShellCompletion --fish completions/fish/* - installShellCompletion --zsh completions/zsh/* - MANDIR=$man/share/man make install.man-nobuild - install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d - install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d - install -Dm644 contrib/systemd/system/podman.{socket,service} -t $out/lib/systemd/system + mkdir -p {$out/{bin,etc,lib,share},$man} # ensure paths exist for the wrapper + ${if stdenv.isDarwin then '' + mv bin/{darwin/podman,podman} + '' else '' + install -Dm644 cni/87-podman-bridge.conflist -t $out/etc/cni/net.d + install -Dm644 contrib/tmpfile/podman.conf -t $out/lib/tmpfiles.d + for s in contrib/systemd/**/*.in; do + substituteInPlace "$s" --replace "@@PODMAN@@" "podman" # don't use unwrapped binary + done + PREFIX=$out make install.systemd + install -Dm555 bin/rootlessport -t $rootlessport/bin + ''} + install -Dm555 bin/podman -t $out/bin + PREFIX=$out make install.completions + MANDIR=$man/share/man make install.man runHook postInstall ''; @@ -87,9 +93,8 @@ buildGoModule rec { meta = with lib; { homepage = "https://podman.io/"; description = "A program for managing pods, containers and container images"; - changelog = "https://github.com/containers/podman/blob/v${version}/changelog.txt"; + changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md"; license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; - platforms = platforms.unix; }; } diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index c9ec18593dff..fa3a50bc5357 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -1,7 +1,9 @@ { podman-unwrapped , runCommand , makeWrapper +, symlinkJoin , lib +, stdenv , extraPackages ? [] , podman # Docker compat , runc # Default container runtime @@ -13,12 +15,19 @@ , cni-plugins # not added to path , iptables , iproute2 +, catatonit +, gvproxy }: +# do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed + +# adding aardvark-dns/netavark to `helpersBin` requires changes to the modules and tests + let podman = podman-unwrapped; binPath = lib.makeBinPath ([ + ] ++ lib.optionals stdenv.isLinux [ runc crun conmon @@ -29,6 +38,18 @@ let iproute2 ] ++ extraPackages); + helpersBin = symlinkJoin { + name = "${podman.pname}-helper-binary-wrapper-${podman.version}"; + + # this only works for some binaries, others may need to be be added to `binPath` or in the modules + paths = [ + gvproxy + ] ++ lib.optionals stdenv.isLinux [ + catatonit # added here for the pause image and also set in `containersConf` for `init_path` + podman.rootlessport + ]; + }; + in runCommand podman.name { name = "${podman.pname}-wrapper-${podman.version}"; inherit (podman) pname version passthru; @@ -54,5 +75,6 @@ in runCommand podman.name { ln -s ${podman-unwrapped}/lib $out/lib ln -s ${podman-unwrapped}/share $out/share makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ + --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \ --prefix PATH : ${binPath} '' diff --git a/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch b/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch deleted file mode 100644 index 03e47a57863c..000000000000 --- a/pkgs/applications/virtualization/qemu/9p-ignore-noatime.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit cdc3e7eeafa9f683214d2c15d52ef384c3de6611 -Author: aszlig -Date: Mon Mar 18 13:21:01 2019 +0100 - - 9pfs: Ignore O_NOATIME open flag - - Since Linux 4.19, overlayfs uses the O_NOATIME flag on its lowerdir, - which in turn causes errors when the Nix store is mounted in the guest - because the file owner of the store paths typically don't match the - owner of the QEMU process. - - After submitting a patch to the overlayfs mailing list[1], it turns out - that my patch was incomplete[2] and needs a bit more rework. - - So instead of using an incomplete kernel patch in nixpkgs, which affects - *all* users of overlayfs, not just NixOS VM tests, I decided that for - now it's better to patch QEMU instead. - - The change here really only ignores the O_NOATIME flag so that the - behaviour is similar to what NFS does. From open(2): - - This flag may not be effective on all filesystems. One example is NFS, - where the server maintains the access time. - - This change is therefore only temporary until the final fix lands in the - stable kernel releases. - - [1]: https://www.spinics.net/lists/linux-unionfs/msg06755.html - [2]: https://www.spinics.net/lists/linux-unionfs/msg06756.html - - Signed-off-by: aszlig - -diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c -index 55821343e5..0b8425fe18 100644 ---- a/hw/9pfs/9p.c -+++ b/hw/9pfs/9p.c -@@ -127,7 +127,6 @@ static int dotl_to_open_flags(int flags) - { P9_DOTL_LARGEFILE, O_LARGEFILE }, - { P9_DOTL_DIRECTORY, O_DIRECTORY }, - { P9_DOTL_NOFOLLOW, O_NOFOLLOW }, -- { P9_DOTL_NOATIME, O_NOATIME }, - { P9_DOTL_SYNC, O_SYNC }, - }; - diff --git a/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch b/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch new file mode 100644 index 000000000000..a498d309c233 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/allow-virtfs-on-darwin.patch @@ -0,0 +1,77 @@ +From 4ca09b7cd1d42eb6b1587fed74cd4d684e31bfbe Mon Sep 17 00:00:00 2001 +From: Keno Fischer +Date: Sun, 27 Feb 2022 17:35:22 -0500 +Subject: [PATCH] 9p: darwin: meson: Allow VirtFS on Darwin + +To allow VirtFS on darwin, we need to check that pthread_fchdir_np is +available, which has only been available since macOS 10.12. + +Additionally, virtfs_proxy_helper is disabled on Darwin. This patch +series does not currently provide an implementation of the proxy-helper, +but this functionality could be implemented later on. + +Signed-off-by: Keno Fischer +[Michael Roitzsch: - Rebase for NixOS] +Signed-off-by: Michael Roitzsch +[Will Cohen: - Rebase to master] +Signed-off-by: Will Cohen +Reviewed-by: Paolo Bonzini +[Will Cohen: - Add check for pthread_fchdir_np to virtfs + - Add comments to patch commit + - Note that virtfs_proxy_helper does not work + on macOS + - Fully adjust meson virtfs error note to specify + macOS + - Rebase to master] +Signed-off-by: Will Cohen +Message-Id: <20220227223522.91937-12-wwcohen@gmail.com> +Signed-off-by: Christian Schoenebeck +Acked-by: Christian Schoenebeck +--- + fsdev/meson.build | 1 + + meson.build | 17 +++++++++++------ + 2 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/fsdev/meson.build b/fsdev/meson.build +index adf57cc43e..b632b66348 100644 +--- a/fsdev/meson.build ++++ b/fsdev/meson.build +@@ -7,6 +7,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files( + 'qemu-fsdev.c', + ), if_false: files('qemu-fsdev-dummy.c')) + softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss) ++softmmu_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss) + + if have_virtfs_proxy_helper + executable('virtfs-proxy-helper', +diff --git a/meson.build b/meson.build +index 2265fa409a..6d73c02903 100644 +--- a/meson.build ++++ b/meson.build +@@ -1383,12 +1383,17 @@ endif + have_host_block_device = (targetos != 'darwin' or + cc.has_header('IOKit/storage/IOMedia.h')) + +-have_virtfs = (targetos == 'linux' and +- have_system and +- libattr.found() and +- libcap_ng.found()) +- +-have_virtfs_proxy_helper = have_virtfs and have_tools ++have_virtfs = get_option('virtfs') \ ++ .require(targetos == 'linux' or targetos == 'darwin', ++ error_message: 'virtio-9p (virtfs) requires Linux or macOS') \ ++ .require(targetos == 'linux' or cc.has_function('pthread_fchdir_np'), ++ error_message: 'virtio-9p (virtfs) on macOS requires the presence of pthread_fchdir_np') \ ++ .require(targetos == 'darwin' or (libattr.found() and libcap_ng.found()), ++ error_message: 'virtio-9p (virtfs) on Linux requires libcap-ng-devel and libattr-devel') \ ++ .disable_auto_if(not have_tools and not have_system) \ ++ .allowed() ++ ++have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools + + if get_option('virtfs').enabled() + if not have_virtfs +-- +2.35.1 + diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 059057bc497b..8f22e499d359 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, fetchpatch, python3, python3Packages, zlib, pkg-config, glib, buildPackages , perl, pixman, vde2, alsa-lib, texinfo, flex , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool -, makeWrapper, runtimeShell -, attr, libcap, libcap_ng +, makeWrapper, runtimeShell, removeReferencesTo +, attr, libcap, libcap_ng, socat , CoreServices, Cocoa, Hypervisor, rez, setfile , numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp @@ -31,31 +31,25 @@ ++ ["${stdenv.hostPlatform.qemuArch}-softmmu"]) else null) , nixosTestRunner ? false +, doCheck ? false +, qemu # for passthru.tests }: -let - audio = lib.optionalString alsaSupport "alsa," - + lib.optionalString pulseSupport "pa," - + lib.optionalString sdlSupport "sdl," - + lib.optionalString jackSupport "jack,"; - -in - stdenv.mkDerivation rec { pname = "qemu" + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { url= "https://download.qemu.org/qemu-${version}.tar.xz"; - sha256 = "15iw7982g6vc4jy1l9kk1z9sl5bm1bdbwr74y7nvwjs1nffhig7f"; + sha256 = "0iavlsy9hin8k38230j8lfmyipx3965zljls1dp34mmc8n75vqb8"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ makeWrapper pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx_rtd_theme ] + nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx_rtd_theme ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; @@ -94,62 +88,71 @@ stdenv.mkDerivation rec { patches = [ ./fix-qemu-ga.patch - ./9p-ignore-noatime.patch # Cocoa clipboard support only works on macOS 10.14+ (fetchpatch { url = "https://gitlab.com/qemu-project/qemu/-/commit/7e3e20d89129614f4a7b2451fe321cc6ccca3b76.diff"; sha256 = "09xz06g57wxbacic617pq9c0qb7nly42gif0raplldn5lw964xl2"; revert = true; }) + # 9p-darwin for 7.0 backported to 6.2.0 + # + # Can generally be removed when updating derivation to 7.0. Nine of the + # patches can be drawn directly from QEMU upstream, but the second commit + # and the eleventh commit had to be modified when rebasing back to 6.2.0. (fetchpatch { - name = "CVE-2021-3713.patch"; # remove with next release - url = "https://gitlab.com/qemu-project/qemu/-/commit/13b250b12ad3c59114a6a17d59caf073ce45b33a.patch"; - sha256 = "0lkzfc7gdlvj4rz9wk07fskidaqysmx8911g914ds1jnczgk71mf"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/e0bd743bb2dd4985791d4de880446bdbb4e04fed.patch"; + sha256 = "sha256-c6QYL3zig47fJwm6rqkqGp3E1PakVTaihvXDRebbBlQ="; }) - # Fixes a crash that frequently happens in some setups that share /nix/store over 9p like nixos tests - # on some systems. Remove with next release. + ./rename-9p-util.patch (fetchpatch { - name = "fix-crash-in-v9fs_walk.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/f83df00900816476cca41bb536e4d532b297d76e.patch"; - sha256 = "sha256-LYGbBLS5YVgq8Bf7NVk7HBFxXq34NmZRPCEG79JPwk8="; + url = "https://gitlab.com/qemu-project/qemu/-/commit/f41db099c71151291c269bf48ad006de9cbd9ca6.patch"; + sha256 = "sha256-70/rrhZw+02JJbJ3CoW8B1GbdM4Lwb2WkUdwstYAoIQ="; }) - # Fixes an io error on discard/unmap operation for aio/file backend. Remove with next release. (fetchpatch { - name = "fix-aio-discard-return-value.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/13a028336f2c05e7ff47dfdaf30dfac7f4883e80.patch"; - sha256 = "sha256-23xVixVl+JDBNdhe5j5WY8CB4MsnUo+sjrkAkG+JS6M="; + url = "https://gitlab.com/qemu-project/qemu/-/commit/6b3b279bd670c6a2fa23c9049820c814f0e2c846.patch"; + sha256 = "sha256-7WqklSvLirEuxTXTIMQDQhWpXnwMseJ1RumT+faq/Y8="; }) - # Fixes managedsave (snapshot creation) with QXL video device. Remove with next release. (fetchpatch { - name = "qxl-fix-pre-save-logic.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/eb94846280df3f1e2a91b6179fc05f9890b7e384.patch"; - sha256 = "sha256-p31fd47RTSw928DOMrubQQybnzDAGm23z4Yhe+hGJQ8="; + url = "https://gitlab.com/qemu-project/qemu/-/commit/67a71e3b71a2834d028031a92e76eb9444e423c6.patch"; + sha256 = "sha256-COFm/SwfJSoSl9YDpL6ceAE8CcE4mGhsGxw1HMuL++o="; }) - # Fixes socket_sockaddr_to_address_unix assertion errors in some setups. Remove with next release. (fetchpatch { - name = "fix-unix-socket-path-copy-again.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/118d527f2e4baec5fe8060b22a6212468b8e4d3f.patch"; - sha256 = "sha256-ox+JSpc0pqd3bMi5Ot7ljQyk70SX8g+BLufR06mZPps="; + url = "https://gitlab.com/qemu-project/qemu/-/commit/38d7fd68b0c8775b5253ab84367419621aa032e6.patch"; + sha256 = "sha256-iwGIzq9FWW6zpbDg/IKrp5OZpK9cgQqTRWWq8WBIHRQ="; }) - ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch - ++ lib.optionals stdenv.hostPlatform.isMusl [ - ./sigrtminmax.patch (fetchpatch { - url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch"; - sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/57b3910bc3513ab515296692daafd1c546f3c115.patch"; + sha256 = "sha256-ybl9+umZAcQKHYL7NkGJQC0W7bccTagA9KQiFaR2LYA="; }) - ] ++ lib.optionals stdenv.isDarwin [ - # The Hypervisor.framework support patch converted something that can be applied: - # * https://patchwork.kernel.org/project/qemu-devel/list/?series=548227 - # The base revision is whatever commit there is before the series starts: - # * https://github.com/patchew-project/qemu/commits/patchew/20210916155404.86958-1-agraf%40csgraf.de - # The target revision is what patchew has as the series tag from patchwork: - # * https://github.com/patchew-project/qemu/releases/tag/patchew%2F20210916155404.86958-1-agraf%40csgraf.de (fetchpatch { - url = "https://github.com/patchew-project/qemu/compare/7adb961995a3744f51396502b33ad04a56a317c3..d2603c06d9c4a28e714b9b70fe5a9d0c7b0f934d.diff"; - sha256 = "sha256-nSi5pFf9+EefUmyJzSEKeuxOt39ztgkXQyUB8fTHlcY="; + url = "https://gitlab.com/qemu-project/qemu/-/commit/b5989326f558faedd2511f29459112cced2ca8f5.patch"; + sha256 = "sha256-s+O9eCgj2Ev+INjL9LY9MJBdISIdZLslI3lue2DICGM="; }) - ]; + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/029ed1bd9defa33a80bb40cdcd003699299af8db.patch"; + sha256 = "sha256-mGqcRWcEibDJdhTRrN7ZWrMuCfUWW8vWiFj7sb2/RYo="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/d3671fd972cd185a6923433aa4802f54d8b62112.patch"; + sha256 = "sha256-GUh5o7mbFTm/dm6CqcGdoMlC+YrV8RlcEwu/mxrfTzo="; + }) + # The next two commits are to make Linux v5.17 work on aarch64-darwin. These are included in QEMU v7. + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/ad99f64f1cfff7c5e7af0e697523d9b7e45423b6.patch"; + sha256 = "sha256-e6WtfQIPEiXhWucd5ab7UIoccbWEAv3bwksn4hR85CY="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/7f6c295cdfeaa229c360cac9a36e4e595aa902ae.patch"; + sha256 = "sha256-mORtgfU1CYQFKO5UrXgM9cJyZxeF2bz8iAoq0UlFQeY="; + }) + ./allow-virtfs-on-darwin.patch + # QEMU upstream does not demand compatibility to pre-10.13, so 9p-darwin + # support on nix requires utimensat fallback. The patch adding this fallback + # set was removed during the process of upstreaming this functionality, and + # will still be needed in nix until the macOS SDK reaches 10.13+. + ./provide-fallback-for-utimensat.patch + ] + ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; postPatch = '' # Otherwise tries to ensure /var/run exists. @@ -180,12 +183,9 @@ stdenv.mkDerivation rec { --replace '$source_path/VERSION' '$source_path/QEMU_VERSION' substituteInPlace meson.build \ --replace "'VERSION'" "'QEMU_VERSION'" - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H" ''; configureFlags = [ - "--audio-drv-list=${audio}" "--disable-strip" # We'll strip ourselves after separating debug info. "--enable-docs" "--enable-tools" @@ -217,7 +217,6 @@ stdenv.mkDerivation rec { ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd" ++ lib.optional uringSupport "--enable-linux-io-uring"; - doCheck = false; # tries to access /dev dontWrapGApps = true; # QEMU attaches entitlements with codesign and strip removes those, @@ -233,6 +232,7 @@ stdenv.mkDerivation rec { # copy qemu-ga (guest agent) to separate output mkdir -p $ga/bin cp $out/bin/qemu-ga $ga/bin/ + remove-references-to -t $out $ga/bin/qemu-ga '' + lib.optionalString gtkSupport '' # wrap GTK Binaries for f in $out/bin/qemu-system-*; do @@ -241,44 +241,56 @@ stdenv.mkDerivation rec { ''; preBuild = "cd build"; + # tests can still timeout on slower systems + inherit doCheck; + checkInputs = [ socat ]; + preCheck = '' + # time limits are a little meagre for a build machine that's + # potentially under load. + substituteInPlace ../tests/unit/meson.build \ + --replace 'timeout: slow_tests' 'timeout: 50 * slow_tests' + substituteInPlace ../tests/qtest/meson.build \ + --replace 'timeout: slow_qtests' 'timeout: 50 * slow_qtests' + substituteInPlace ../tests/fp/meson.build \ + --replace 'timeout: 90)' 'timeout: 300)' + + # point tests towards correct binaries + substituteInPlace ../tests/unit/test-qga.c \ + --replace '/bin/echo' "$(type -P echo)" + substituteInPlace ../tests/unit/test-io-channel-command.c \ + --replace '/bin/socat' "$(type -P socat)" + + # combined with a long package name, some temp socket paths + # can end up exceeding max socket name len + substituteInPlace ../tests/qtest/bios-tables-test.c \ + --replace 'qemu-test_acpi_%s_tcg_%s' '%s_%s' + + # get-fsinfo attempts to access block devices, disallowed by sandbox + sed -i -e '/\/qga\/get-fsinfo/d' -e '/\/qga\/blacklist/d' \ + ../tests/unit/test-qga.c + '' + lib.optionalString stdenv.isDarwin '' + # skip test that stalls on darwin, perhaps due to subtle differences + # in fifo behaviour + substituteInPlace ../tests/unit/meson.build \ + --replace "'test-io-channel-command'" "#'test-io-channel-command'" + ''; + # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' - install -m755 -D $emitKvmWarningsPath $out/libexec/emit-kvm-warnings - if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then - makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \ - $out/bin/qemu-kvm \ - --run $out/libexec/emit-kvm-warnings \ - --add-flags "\$([ -r /dev/kvm -a -w /dev/kvm ] && echo -enable-kvm)" - fi + ln -s $out/libexec/virtiofsd $out/bin + ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm ''; passthru = { qemu-system-i386 = "bin/qemu-system-i386"; + tests = { + qemu-tests = qemu.override { doCheck = true; }; + }; }; # Builds in ~3h with 2 cores, and ~20m with a big-parallel builder. requiredSystemFeatures = [ "big-parallel" ]; - emitKvmWarnings = '' - #!${runtimeShell} - WARNCOL='\033[1;35m' - NEUTRALCOL='\033[0m' - WARNING="''${WARNCOL}warning:''${NEUTRALCOL}" - if [ ! -e /dev/kvm ]; then - echo -e "''${WARNING} KVM is not available - execution will be slow" >&2 - echo "Consider installing KVM for hardware-accelerated execution." >&2 - echo "If KVM is already installed make sure the kernel module is loaded." >&2 - elif [ ! -r /dev/kvm -o ! -w /dev/kvm ]; then - echo -e "''${WARNING} /dev/kvm is not read-/writable - execution will be slow" >&2 - echo "/dev/kvm needs to be read-/writable by the user executing QEMU." >&2 - echo "" >&2 - echo "For hardware-acceleration inside the nix build sandbox /dev/kvm" >&2 - echo "must be world-read-/writable (rw-rw-rw-)." >&2 - fi - ''; - - passAsFile = [ "emitKvmWarnings" ]; - meta = with lib; { homepage = "http://www.qemu.org/"; description = "A generic and open source machine emulator and virtualizer"; @@ -286,5 +298,6 @@ stdenv.mkDerivation rec { mainProgram = "qemu-kvm"; maintainers = with maintainers; [ eelco qyliss ]; platforms = platforms.unix; + priority = 10; # Prefer virtiofsd from the virtiofsd package. }; } diff --git a/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch b/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch new file mode 100644 index 000000000000..dbc4e2b9af51 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch @@ -0,0 +1,190 @@ +From 70328c307001f4bb75d30d93c5bba3c3cd790c88 Mon Sep 17 00:00:00 2001 +From: Keno Fischer +Date: Sat, 16 Jun 2018 20:56:54 -0400 +Subject: [PATCH] 9p: darwin: Provide fallback impl for utimensat + +This function is new in Mac OS 10.13. Provide a fallback implementation +when building against older SDKs. The complication in the definition comes +having to separately handle the used SDK version and the target OS version. + +- If the SDK version is too low (__MAC_10_13 not defined), utimensat is not + defined in the header, so we must not try to use it (doing so would error). +- Otherwise, if the targetted OS version is at least 10.13, we know this + function is available, so we can unconditionally call it. +- Lastly, we check for the availability of the __builtin_available macro to + potentially insert a dynamic check for this OS version. However, __builtin_available + is only available with sufficiently recent versions of clang and while all + Apple clang versions that ship with Xcode versions that support the 10.13 + SDK support with builtin, we want to allow building with compilers other + than Apple clang that may not support this builtin. + +Signed-off-by: Keno Fischer +Signed-off-by: Michael Roitzsch +Signed-off-by: Will Cohen +--- + hw/9pfs/9p-local.c | 2 +- + hw/9pfs/9p-util-darwin.c | 96 ++++++++++++++++++++++++++++++++++++++++ + hw/9pfs/9p-util-linux.c | 6 +++ + hw/9pfs/9p-util.h | 8 ++++ + 4 files changed, 111 insertions(+), 1 deletion(-) + +diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c +index d42ce6d8b8..b2c1fa42e1 100644 +--- a/hw/9pfs/9p-local.c ++++ b/hw/9pfs/9p-local.c +@@ -1085,7 +1085,7 @@ static int local_utimensat(FsContext *s, V9fsPath *fs_path, + goto out; + } + +- ret = utimensat(dirfd, name, buf, AT_SYMLINK_NOFOLLOW); ++ ret = utimensat_nofollow(dirfd, name, buf); + close_preserve_errno(dirfd); + out: + g_free(dirpath); +diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c +index bec0253474..2fc0475292 100644 +--- a/hw/9pfs/9p-util-darwin.c ++++ b/hw/9pfs/9p-util-darwin.c +@@ -95,3 +95,99 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev) + } + + #endif ++ ++#ifndef __has_builtin ++#define __has_builtin(x) 0 ++#endif ++ ++static int update_times_from_stat(int fd, struct timespec times[2], ++ int update0, int update1) ++{ ++ struct stat buf; ++ int ret = fstat(fd, &buf); ++ if (ret == -1) { ++ return ret; ++ } ++ if (update0) { ++ times[0] = buf.st_atimespec; ++ } ++ if (update1) { ++ times[1] = buf.st_mtimespec; ++ } ++ return 0; ++} ++ ++int utimensat_nofollow(int dirfd, const char *filename, ++ const struct timespec times_in[2]) ++{ ++ int ret, fd; ++ int special0, special1; ++ struct timeval futimes_buf[2]; ++ struct timespec times[2]; ++ memcpy(times, times_in, 2 * sizeof(struct timespec)); ++ ++/* Check whether we have an SDK version that defines utimensat */ ++#if defined(__MAC_10_13) ++# if __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_13 ++# define UTIMENSAT_AVAILABLE 1 ++# elif __has_builtin(__builtin_available) ++# define UTIMENSAT_AVAILABLE __builtin_available(macos 10.13, *) ++# else ++# define UTIMENSAT_AVAILABLE 0 ++# endif ++ if (UTIMENSAT_AVAILABLE) { ++ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW); ++ } ++#endif ++ ++ /* utimensat not available. Use futimes. */ ++ fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0); ++ if (fd == -1) { ++ return -1; ++ } ++ ++ special0 = times[0].tv_nsec == UTIME_OMIT; ++ special1 = times[1].tv_nsec == UTIME_OMIT; ++ if (special0 || special1) { ++ /* If both are set, nothing to do */ ++ if (special0 && special1) { ++ ret = 0; ++ goto done; ++ } ++ ++ ret = update_times_from_stat(fd, times, special0, special1); ++ if (ret < 0) { ++ goto done; ++ } ++ } ++ ++ special0 = times[0].tv_nsec == UTIME_NOW; ++ special1 = times[1].tv_nsec == UTIME_NOW; ++ if (special0 || special1) { ++ ret = futimes(fd, NULL); ++ if (ret < 0) { ++ goto done; ++ } ++ ++ /* If both are set, we are done */ ++ if (special0 && special1) { ++ ret = 0; ++ goto done; ++ } ++ ++ ret = update_times_from_stat(fd, times, special0, special1); ++ if (ret < 0) { ++ goto done; ++ } ++ } ++ ++ futimes_buf[0].tv_sec = times[0].tv_sec; ++ futimes_buf[0].tv_usec = times[0].tv_nsec / 1000; ++ futimes_buf[1].tv_sec = times[1].tv_sec; ++ futimes_buf[1].tv_usec = times[1].tv_nsec / 1000; ++ ret = futimes(fd, futimes_buf); ++ ++done: ++ close_preserve_errno(fd); ++ return ret; ++} +diff --git a/hw/9pfs/9p-util-linux.c b/hw/9pfs/9p-util-linux.c +index db451b0784..320697f347 100644 +--- a/hw/9pfs/9p-util-linux.c ++++ b/hw/9pfs/9p-util-linux.c +@@ -68,3 +68,9 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev) + { + return mknodat(dirfd, filename, mode, dev); + } ++ ++int utimensat_nofollow(int dirfd, const char *filename, ++ const struct timespec times[2]) ++{ ++ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW); ++} +diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h +index 1f74d37558..a4b002d1b5 100644 +--- a/hw/9pfs/9p-util.h ++++ b/hw/9pfs/9p-util.h +@@ -36,6 +36,12 @@ static inline int qemu_lsetxattr(const char *path, const char *name, + #define qemu_lsetxattr lsetxattr + #endif + ++/* Compatibility with old SDK Versions for Darwin */ ++#if defined(CONFIG_DARWIN) && !defined(UTIME_NOW) ++#define UTIME_NOW -1 ++#define UTIME_OMIT -2 ++#endif ++ + static inline void close_preserve_errno(int fd) + { + int serrno = errno; +@@ -96,6 +102,8 @@ ssize_t flistxattrat_nofollow(int dirfd, const char *filename, + char *list, size_t size); + ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, + const char *name); ++int utimensat_nofollow(int dirfd, const char *filename, ++ const struct timespec times[2]); + + /** + * Darwin has d_seekoff, which appears to function similarly to d_off. +-- +2.35.1 + diff --git a/pkgs/applications/virtualization/qemu/rename-9p-util.patch b/pkgs/applications/virtualization/qemu/rename-9p-util.patch new file mode 100644 index 000000000000..fe3e2d7b4b8f --- /dev/null +++ b/pkgs/applications/virtualization/qemu/rename-9p-util.patch @@ -0,0 +1,54 @@ +From 011b121d7f84c8974f03a81582cf1107249245bb Mon Sep 17 00:00:00 2001 +From: Keno Fischer +Date: Sun, 27 Feb 2022 17:35:13 -0500 +Subject: [PATCH] 9p: Rename 9p-util -> 9p-util-linux +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The current file only has the Linux versions of these functions. +Rename the file accordingly and update the Makefile to only build +it on Linux. A Darwin version of these will follow later in the +series. + +Signed-off-by: Keno Fischer +[Michael Roitzsch: - Rebase for NixOS] +Signed-off-by: Michael Roitzsch +Signed-off-by: Will Cohen +Reviewed-by: Greg Kurz +Reviewed-by: Philippe Mathieu-Daudé +Message-Id: <20220227223522.91937-3-wwcohen@gmail.com> +Signed-off-by: Christian Schoenebeck +--- + hw/9pfs/{9p-util.c => 9p-util-linux.c} | 0 + hw/9pfs/meson.build | 2 +- + 2 files changed, 1 insertion(+), 1 deletion(-) + rename hw/9pfs/{9p-util.c => 9p-util-linux.c} (100%) + +diff --git a/hw/9pfs/9p-util.c b/hw/9pfs/9p-util-linux.c +similarity index 100% +rename from hw/9pfs/9p-util.c +rename to hw/9pfs/9p-util-linux.c +diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build +index 99be5d9119..1b28e70040 100644 +--- a/hw/9pfs/meson.build ++++ b/hw/9pfs/meson.build +@@ -4,7 +4,6 @@ fs_ss.add(files( + '9p-posix-acl.c', + '9p-proxy.c', + '9p-synth.c', +- '9p-util.c', + '9p-xattr-user.c', + '9p-xattr.c', + '9p.c', +@@ -14,6 +13,7 @@ fs_ss.add(files( + 'coth.c', + 'coxattr.c', + )) ++fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c')) + fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c')) + softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss) + +-- +2.35.1 + diff --git a/pkgs/applications/virtualization/qemu/sigrtminmax.patch b/pkgs/applications/virtualization/qemu/sigrtminmax.patch deleted file mode 100644 index 41050447ac64..000000000000 --- a/pkgs/applications/virtualization/qemu/sigrtminmax.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2697fcc42546e814a2d2617671cb8398b15256fb Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Fri, 17 Aug 2018 00:22:35 -0500 -Subject: [PATCH] quick port __SIGRTMIN/__SIGRTMAX patch for qemu 3.0 - ---- - linux-user/signal.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/linux-user/signal.c b/linux-user/signal.c -index 602b631b92..87f9240134 100644 ---- a/linux-user/signal.c -+++ b/linux-user/signal.c -@@ -26,6 +26,13 @@ - #include "trace.h" - #include "signal-common.h" - -+#ifndef __SIGRTMIN -+#define __SIGRTMIN 32 -+#endif -+#ifndef __SIGRTMAX -+#define __SIGRTMAX (NSIG-1) -+#endif -+ - struct target_sigaltstack target_sigaltstack_used = { - .ss_sp = 0, - .ss_size = 0, --- -2.18.0 - diff --git a/pkgs/applications/virtualization/qemu/utils.nix b/pkgs/applications/virtualization/qemu/utils.nix index 90783039a1a0..d9a88bf545b3 100644 --- a/pkgs/applications/virtualization/qemu/utils.nix +++ b/pkgs/applications/virtualization/qemu/utils.nix @@ -1,8 +1,8 @@ { stdenv, installShellFiles, qemu }: stdenv.mkDerivation rec { - name = "qemu-utils-${version}"; - version = qemu.version; + pname = "qemu-utils"; + inherit (qemu) version; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ qemu ]; diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 0dd3da4b37c6..e295a51637a7 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "sha256-svLxxfiRDLWkdRuHXaDyH5Ta6qmptI8z+s41iZKgbWM="; + sha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY="; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index a97c43495703..c6442b57a421 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchurl, acpica-tools, python3 }: +{ lib, stdenv, fetchgit, acpica-tools, python3 }: stdenv.mkDerivation rec { pname = "seabios"; - version = "1.14.0"; + version = "1.16.0"; - src = fetchurl { - url = "https://www.seabios.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "1zc1brgafbbf5hmdr1qc1p859cabpz73l8sklq83xa4sn9icqw7b"; + src = fetchgit { + url = "https://git.seabios.org/seabios.git"; + rev = "rel-${version}"; + sha256 = "0acal1rr7sya86wlhw2mgimabwhjnr0y1pl5zxwb79j8k1w1r8sh"; }; nativeBuildInputs = [ python3 ]; @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.seabios.org"; license = licenses.lgpl3; - maintainers = [ maintainers.tstrobel ]; + maintainers = with maintainers; [ tstrobel ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 4d6fb0ef4afa..5ec5b19ce042 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -15,11 +15,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.8.5"; + version = "3.8.7"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "sha256-f/94tcB7XU0IJpvSZ6xemUOQ+TMyHlTv1rfIZoMVPOQ="; + sha256 = "sha256-Myny5YP4SoNDyywDgKHWy86vrn0eYztcvK33FD6shZs="; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix index 7db42c71092f..cc2489356c5d 100644 --- a/pkgs/applications/virtualization/spike/default.nix +++ b/pkgs/applications/virtualization/spike/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv, fetchgit, dtc, fetchpatch, pkgsCross }: +{ lib, stdenv, fetchFromGitHub, dtc, fetchpatch, pkgsCross }: stdenv.mkDerivation rec { pname = "spike"; version = "1.0.0"; - src = fetchgit { - url = "https://github.com/riscv/riscv-isa-sim.git"; + src = fetchFromGitHub { + owner = "riscv"; + repo = "riscv-isa-sim"; rev = "v${version}"; sha256 = "1hcl01nj96s3rkz4mrq747s5lkw81lgdjdimb8b1b9h8qnida7ww"; }; diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix deleted file mode 100644 index 17cee52a64e0..000000000000 --- a/pkgs/applications/virtualization/tinyemu/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, openssl, curl, SDL }: - -stdenv.mkDerivation rec { - pname = "tinyemu"; - version = "2018-09-23"; - src = fetchurl { - url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz"; - sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v"; - }; - buildInputs = [ openssl curl SDL ]; - makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; - preInstall = '' - mkdir -p "$out/bin" - ''; - meta = { - homepage = "https://bellard.org/tinyemu/"; - description = "A system emulator for the RISC-V and x86 architectures"; - longDescription = "TinyEMU is a system emulator for the RISC-V and x86 architectures. Its purpose is to be small and simple while being complete."; - license = with lib.licenses; [ mit bsd2 ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jhhuh ]; - }; -} diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index fb62a0d2e11a..aa225c1d1730 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,22 +1,21 @@ -{ lib, fetchurl, python3Packages, intltool, file -, wrapGAppsHook, gtk-vnc, vte, avahi, dconf -, gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, libosinfo, gnome -, gtksourceview4, docutils +{ lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook, gtk-vnc +, vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt +, gsettings-desktop-schemas, libosinfo, gnome, gtksourceview4, docutils, cpio +, e2fsprogs, findutils, gzip, cdrtools, xorriso , spiceSupport ? true, spice-gtk ? null -, cpio, e2fsprogs, findutils, gzip -, cdrtools }: with lib; -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "virt-manager"; - version = "3.2.0"; + version = "4.0.0"; - src = fetchurl { - url = "https://releases.pagure.org/virt-manager/${pname}-${version}.tar.gz"; - sha256 = "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-3ycXNBuf91kI2cJCRw0ZzaWkaIVwb/lmkOKeHNwpH9Y="; }; nativeBuildInputs = [ @@ -32,7 +31,7 @@ python3Packages.buildPythonApplication rec { gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ optional spiceSupport spice-gtk; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ pygobject3 ipaddress libvirt libxml2 requests cdrtools ]; @@ -42,14 +41,16 @@ python3Packages.buildPythonApplication rec { ''; postConfigure = '' - ${python3Packages.python.interpreter} setup.py configure --prefix=$out + ${python3.interpreter} setup.py configure --prefix=$out ''; - setupPyGlobalFlags = [ "--no-update-icon-cache" ]; + setupPyGlobalFlags = [ "--no-update-icon-cache" "--no-compile-schemas" ]; dontWrapGApps = true; preFixup = '' + glib-compile-schemas $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas + gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH") # these are called from virt-install in initrdinject.py gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}") @@ -57,14 +58,17 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - checkInputs = with python3Packages; [ cpio cdrtools pytestCheckHook ]; + checkInputs = with python3.pkgs; [ + pytestCheckHook + cpio + cdrtools + xorriso + ]; - disabledTestPaths = [ - "tests/test_cli.py" - "tests/test_disk.py" - "tests/test_checkprops.py" - "tests/test_storage.py" - ]; # Error logs: https://gist.github.com/superherointj/fee040872beaafaaa19b8bf8f3ff0be5 + disabledTests = [ + "testAlterDisk" + "test_misc_nonpredicatble_generate" + ]; preCheck = '' export HOME=. diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 4fd56e0cae33..86474da9ee61 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,36 +1,85 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, shared-mime-info, wrapGAppsHook -, glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte +{ lib +, stdenv +, bash-completion +, fetchurl +, gdbm ? null +, glib +, gsettings-desktop-schemas +, gtk-vnc +, gtk3 +, intltool +, libcap ? null +, libgovirt +, libvirt +, libvirt-glib +, libxml2 +, meson +, ninja +, pkg-config +, python3 +, shared-mime-info +, spice-gtk ? null +, spice-protocol ? null , spiceSupport ? true -, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null +, vte +, wrapGAppsHook }: -assert spiceSupport -> - spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null; +assert spiceSupport -> ( + gdbm != null + && libcap != null + && spice-gtk != null + && spice-protocol != null +); with lib; stdenv.mkDerivation rec { - baseName = "virt-viewer"; - version = "9.0"; - name = "${baseName}-${version}"; + pname = "virt-viewer"; + version = "11.0"; src = fetchurl { - url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - sha256 = "09a83mzyn3b4nd7wpa659g1zf1fjbzb79rk968bz6k5xl21k7d4i"; + url = "https://releases.pagure.org/virt-viewer/virt-viewer-${version}.tar.xz"; + sha256 = "sha256-pD+iMlxMHHelyMmAZaww7wURohrJjlkPIjQIabrZq9A="; }; - nativeBuildInputs = [ pkg-config intltool shared-mime-info wrapGAppsHook glib ]; + nativeBuildInputs = [ + glib + intltool + meson + ninja + pkg-config + python3 + shared-mime-info + wrapGAppsHook + ]; + buildInputs = [ - glib gsettings-desktop-schemas gtk-vnc gtk3 libvirt libvirt-glib libxml2 vte + bash-completion + glib + gsettings-desktop-schemas + gtk-vnc + gtk3 + libgovirt + libvirt + libvirt-glib + libxml2 + vte ] ++ optionals spiceSupport [ - spice-gtk spice-protocol libcap gdbm + gdbm + libcap + spice-gtk + spice-protocol ]; # Required for USB redirection PolicyKit rules file propagatedUserEnvPkgs = optional spiceSupport spice-gtk; strictDeps = true; - enableParallelBuilding = true; + + postPatch = '' + patchShebangs build-aux/post_install.py + ''; meta = { description = "A viewer for remote virtual machines"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index f60e203d7fb9..9424628d2877 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -229,5 +229,6 @@ in stdenv.mkDerivation { homepage = "https://www.virtualbox.org/"; maintainers = with maintainers; [ sander ]; platforms = [ "x86_64-linux" ]; + mainProgram = "VirtualBox"; }; } diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index ad22fc4cc9f5..865dcad157bd 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -162,5 +162,6 @@ in stdenv.mkDerivation rec { license = "GPL"; maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.linux; + broken = kernel.kernelAtLeast "5.17"; }; } diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 7e79d963fc29..bad1e98296c2 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "6.10.0"; + version = "7.1.3"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-cPCtxfLzg1RDh3vKFfxAkcCMytu0mDsGp9CLJQmXATA="; + sha256 = "sha256-eSarw5RG2ckup9pNlZtAyZAN8IPZy94RRfej9ppiLfo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 8299304045d0..c85e70116682 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -18,7 +18,7 @@ config: # Documentation # python2Packages.markdown -, transfig, ghostscript, texinfo, pandoc +, fig2dev, ghostscript, texinfo, pandoc , binutils-unwrapped @@ -81,7 +81,7 @@ stdenv.mkDerivation (rec { python2Packages.wrapPython # Documentation - python2Packages.markdown transfig ghostscript texinfo pandoc + python2Packages.markdown fig2dev ghostscript texinfo pandoc # Others ] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles)) @@ -254,5 +254,9 @@ stdenv.mkDerivation (rec { platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ eelco tstrobel oxij ]; license = lib.licenses.gpl2; + # https://xenbits.xen.org/docs/unstable/support-matrix.html + knownVulnerabilities = lib.optionals (lib.versionOlder version "4.13") [ + "This version of Xen has reached its end of life. See https://xenbits.xen.org/docs/unstable/support-matrix.html" + ]; } // (config.meta or {}); } // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ]) diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix index 23aa8ff8201e..f6ba52013f6f 100644 --- a/pkgs/applications/window-managers/berry/default.nix +++ b/pkgs/applications/window-managers/berry/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "berry"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "JLErvin"; repo = pname; rev = version; - hash = "sha256-E1kjqSv2eylJ/9EGcxQrJ2P7VaehyUiirk0TxlPWSnM="; + hash = "sha256-6asph0QXzhmHuYcfrLcQ8RTP4QzX8m6AcCp5ImA++9M="; }; nativeBuildInputs = [ @@ -50,11 +50,12 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Berry Window Manager"; genericName = "Berry Window Manager"; - categories = "Utility;"; + categories = [ "Utility" ]; }) ]; meta = with lib; { + homepage = "https://berrywm.org/"; description = "A healthy, bite-sized window manager"; longDescription = '' berry is a healthy, bite-sized window manager written in C for unix @@ -69,11 +70,8 @@ stdenv.mkDerivation rec { - Intuitively place new windows in unoccupied spaces. - Virtual desktops. ''; - homepage = "https://berrywm.org/"; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; }; } -# TODO: report upstream that `which` is not POSIX; the `command` shell builtin -# should be used instead diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix index 5f107337ee44..a837c435204a 100644 --- a/pkgs/applications/window-managers/btops/default.nix +++ b/pkgs/applications/window-managers/btops/default.nix @@ -1,5 +1,4 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "btops"; @@ -7,10 +6,11 @@ buildGoPackage rec { goPackagePath = "github.com/cmschuetz/btops"; - src = fetchgit { - url = "https://github.com/cmschuetz/btops.git"; + src = fetchFromGitHub { + owner = "cmschuetz"; + repo = "btops"; rev = version; - sha256 = "1ilidvpy7gz49zqp6rf0q7wjrc3r0brdrcp4r5f6i6p9cwybqkbq"; + sha256 = "sha256-eE28PGfpmmhcyeSy3PICebAs+cHAZXPxT+S/4+9ukcY="; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix index 1c6f92a38f29..9984e8788460 100644 --- a/pkgs/applications/window-managers/clfswm/default.nix +++ b/pkgs/applications/window-managers/clfswm/default.nix @@ -2,11 +2,12 @@ , makeWrapper }: stdenv.mkDerivation { - name = "clfswm"; + pname = "clfswm"; + version = "unstable-2016-11-12"; src = fetchgit { url = "https://gitlab.common-lisp.net/clfswm/clfswm.git"; - rev = "refs/heads/master"; + rev = "3c7721dba6339ebb4f8c8d7ce2341740fa86f837"; sha256 = "0hynzh3a1zr719cxfb0k4cvh5lskzs616hwn7p942isyvhwzhynd"; }; diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 04944a1e9092..bfc360e81bbd 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -1,19 +1,18 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub -, pkg-config , libinput , libxcb , libxkbcommon , pixman +, pkg-config , wayland , wayland-protocols , wlroots -, enable-xwayland ? true, xwayland, libX11 -, patches ? [ ] -, conf ? null , writeText -, fetchpatch +, enable-xwayland ? true, xwayland, libX11 +, conf ? null +, patches ? [ ] }: let @@ -22,16 +21,17 @@ in stdenv.mkDerivation rec { pname = "dwl"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "djpohly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lfUAymLA4+E9kULZIueA+9gyVZYgaVS0oTX0LJjsSEs="; + hash = "sha256-T2GqDehBNO8eublqZUmA5WADjnwElzT+bp9Dp1bqSgg="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libinput libxcb @@ -60,6 +60,11 @@ stdenv.mkDerivation rec { else writeText "config.def.h" conf; in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + NIX_CFLAGS_COMPILE = [ + # https://github.com/djpohly/dwl/issues/186 + "-Wno-error=unused-result" + ]; + dontConfigure = true; installPhase = '' @@ -85,8 +90,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Only; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + inherit (wayland.meta) platforms; }; } # TODO: custom patches from upstream website -# TODO: investigate the modifications in the upstream unstable version diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 7b22eb399251..1b83e28309e0 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -9,19 +9,19 @@ in rustPlatform.buildRustPackage rec { pname = "dwm-status"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "Gerschtli"; repo = pname; rev = version; - sha256 = "sha256-Y1J0nCVEmGKgQP+GEtPqK8l3SRuls5yesvJuowLDzUo="; + sha256 = "sha256-dkVo9NpGt3G6by9Of1kOlXaZn7xsVSvfNXq7KPO6HE4="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "sha256-8/vzJXZjSQmefHMo5BXKTRiLy2F3wfIn8VgPMJxtIvY="; + cargoSha256 = "sha256-QPnr7dUsq/RzuNLpbTRQbGB3zU6lNuPPPM9FmH4ydzY="; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}" diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix index 4647f0a07217..f3c2e13fbdcb 100644 --- a/pkgs/applications/window-managers/i3/balance-workspace.nix +++ b/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "i3-balance-workspace"; - version = "1.8.5"; + version = "1.8.6"; src = fetchPypi { inherit pname version; - sha256 = "7b5d72b756f79878a058484825bb343b100433e00a01f80c9c6d1ccc9f4af57a"; + sha256 = "sha256-zJdn/Q6r60FQgfehtQfeDkmN0Rz3ZaqgNhiWvjyQFy0="; }; propagatedBuildInputs = [ i3ipc ]; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 4168a7f3411d..ed518d8eb2e8 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -8,24 +8,27 @@ , notmuch , openssl , ethtool +, lm_sensors +, iw +, iproute2 }: rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.21.2"; + version = "0.21.8"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m0Yq6uxo4FAmwvUK/b3zTb79AT9h/fgdm4Q9sf1DYe0="; + sha256 = "sha256-l0XfitQSmSkivEg8+XcA/+bWdy/wzIpii/Npc4p8kUw="; }; - cargoSha256 = "sha256-J+829GzZ4lKrn3MSip/weaI8pExBt3uex86bKZOofg4="; + cargoSha256 = "sha256-2rJ9ZZHK1acJu6r6EjuoolLJZMdBsbKgN1DNvGM7deA="; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ dbus libpulseaudio notmuch openssl ]; + buildInputs = [ dbus libpulseaudio notmuch openssl lm_sensors ]; buildFeatures = [ "notmuch" @@ -44,7 +47,7 @@ rustPlatform.buildRustPackage rec { ''; postFixup = '' - wrapProgram $out/bin/i3status-rs --prefix PATH : "${ethtool}/bin" + wrapProgram $out/bin/i3status-rs --prefix PATH : ${lib.makeBinPath [ iproute2 ethtool iw ]} ''; # Currently no tests are implemented, so we avoid building the package twice @@ -53,7 +56,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Very resource-friendly and feature-rich replacement for i3status"; homepage = "https://github.com/greshake/i3status-rust"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ backuitist globin ma27 ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/i3/swallow.nix b/pkgs/applications/window-managers/i3/swallow.nix new file mode 100644 index 000000000000..31101721e4c4 --- /dev/null +++ b/pkgs/applications/window-managers/i3/swallow.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, poetry-core +, i3ipc +, xlib +, six +}: + +buildPythonApplication rec { + pname = "i3-swallow"; + version = "unstable-2022-02-19"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jamesofarrell"; + repo = "i3-swallow"; + rev = "6fbc04645c483fe733de56b56743e453693d4c78"; + sha256 = "1l3x8mixwq4n0lnyp0wz5vijgnypamq6lqjazcd2ywl2jv8d6fif"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + i3ipc + xlib + six + ]; + + # No tests available + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/jamesofarrell/i3-swallow"; + description = "Swallow a terminal window in i3wm"; + license = licenses.mit; + platforms = platforms.linux; + mainProgram = "swallow"; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/applications/window-managers/i3/wsr.nix b/pkgs/applications/window-managers/i3/wsr.nix index 6af5717916bf..68ae959c2631 100644 --- a/pkgs/applications/window-managers/i3/wsr.nix +++ b/pkgs/applications/window-managers/i3/wsr.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "i3wsr"; - version = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "roosta"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JzQWfC0kmnMArpIAE5fgb3YLmXktSCH5aUdrQH9pCbo="; + sha256 = "sha256-Mq4TpQDiIYePUS3EwBfOe2+QmvF6+WEDK12WahbuhSU="; }; - cargoSha256 = "sha256-ZvSdJLaw1nfaqpTBKIiHiXvNFSZhsmLk0PBrV6ykv/w="; + cargoSha256 = "sha256-hybvzHwHM0rQwgZfQpww/w9wQDW5h9P2KSjpAScVTBo="; nativeBuildInputs = [ python3 ]; buildInputs = [ libxcb ]; diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 25966fb93664..75cb96f27f4a 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "icewm"; - version = "2.9.4"; + version = "2.9.6"; src = fetchFromGitHub { - owner = "ice-wm"; + owner = "ice-wm"; repo = pname; rev = version; - hash = "sha256-ne2lqo9CAhGgC8dd9R03zhFXy9nPBQR0NcfAY0DeVj4="; + hash = "sha256-qC8gEVJ/cmsEbF8jMzv7zyvVcjlbXhgHU3ixe7RLcnA="; }; nativeBuildInputs = [ @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { perl pkg-config ]; + buildInputs = [ expat fontconfig @@ -99,7 +100,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://www.ice-wm.org/"; + homepage = "https://ice-wm.org/"; description = "A simple, lightweight X window manager"; longDescription = '' IceWM is a window manager for the X Window System. The goal of IceWM is @@ -108,11 +109,11 @@ stdenv.mkDerivation rec { system. Application windows can be managed by keyboard and mouse. Windows can be iconified to the taskbar, to the tray, to the desktop or be made hidden. They are controllable by a quick switch window (Alt+Tab) and in a - window list. A handful of configurable focus models are - menu-selectable. Setups with multiple monitors are supported by RandR and - Xinerama. IceWM is very configurable, themeable and well documented. It - includes an optional external background wallpaper manager with - transparency support, a simple session manager and a system tray. + window list. A handful of configurable focus models are menu-selectable. + Setups with multiple monitors are supported by RandR and Xinerama. IceWM + is very configurable, themeable and well documented. It includes an + optional external background wallpaper manager with transparency support, + a simple session manager and a system tray. ''; license = licenses.lgpl2Only; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 2c9461d6388b..8a9b72265b99 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "jwm"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "joewing"; repo = "jwm"; rev = "v${version}"; - sha256 = "19fnrlw05njib13ljh7pmi48myfclra1xhy4b6hi74c6w6yz2fgj"; + sha256 = "sha256-7CEL2ddlABM7SYjMVUs3pu0O+2cVsz04slsdUIbgZuM="; }; nativeBuildInputs = [ pkg-config gettext which autoreconfHook ]; diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index 3bbe08164641..f58b71ef03ad 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -1,33 +1,33 @@ { lib , stdenv , fetchFromGitHub -, pkg-config -, meson -, ninja , cairo , glib +, libdrm , libinput +, libxcb +, libxkbcommon , libxml2 +, meson +, ninja , pango +, pkg-config +, scdoc , wayland , wayland-protocols , wlroots -, libxcb -, libxkbcommon , xwayland -, libdrm -, scdoc }: stdenv.mkDerivation rec { pname = "labwc"; - version = "0.3.0"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "johanmalm"; + owner = "labwc"; repo = pname; rev = version; - sha256 = "sha256-v8LGiQG/n1IXeVMPWyiP9MgZzZLW78JftvxnRVTswaM="; + hash = "sha256-G0EQuXSHftl4JLXKIro+tmhbApwAhlzcjPEL7DP6LHk="; }; nativeBuildInputs = [ @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { pkg-config scdoc ]; + buildInputs = [ cairo glib @@ -54,10 +55,10 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dxwayland=enabled" ]; meta = with lib; { - homepage = "https://github.com/johanmalm/labwc"; - description = "Openbox alternative for Wayland"; + homepage = "https://github.com/labwc/labwc"; + description = "A Wayland stacking compositor, similar to Openbox"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + inherit (wayland.meta) platforms; }; } diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index 5b77320e2203..20f4c33ae60e 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.2.10"; + version = "0.2.11"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "sha256-WGss/XmryULq8Ly5MFmEqsL+9r4fnrvBEtetngJ05NY="; + sha256 = "sha256-GLHmX628UUdIM+xYJhPtqFg4whQqaF8hFxg0Z5grPac="; }; - cargoSha256 = "sha256-9qvXzsAu4H2TAcArajrGqXwKF3BBDvmZbny7hiVO9Yo="; + cargoSha256 = "sha256-4Pu3TDLmi0c2nyUj1lTRincgRqL40A/g0PkyJOen0is="; buildInputs = rpathLibs; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index e1f805662c67..77a65eef6671 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -14,6 +14,7 @@ , glib , gtk3 , gnome +, gnome-desktop , gcr , pam , systemd @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.14.1"; + version = "0.16.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-FILSNVBYpWSPXeDb1Vc4jZ7zJMg0Gj6EY5yoc81gUr0="; + sha256 = "sha256-nxQYVWUXT1fNgOTRB3iWCLWYI/STk8vtguTbPPNTHdg="; }; nativeBuildInputs = [ @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { networkmanager polkit gnome.gnome-control-center - gnome.gnome-desktop + gnome-desktop gnome.gnome-session gtk3 pam @@ -108,8 +109,6 @@ stdenv.mkDerivation rec { postFixup = '' mkdir -p $out/share/wayland-sessions ln -s $out/share/applications/sm.puri.Phosh.desktop $out/share/wayland-sessions/ - # The OSK0.desktop points to a dummy stub that's not needed - rm $out/share/applications/sm.puri.OSK0.desktop ''; passthru = { diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index 32eee9df0d83..b5a524a38b49 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "picom"; - version = "8.2"; + version = "9.1"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; rev = "v${version}"; - sha256 = "0gjksayz2xpmgglvw17ppsan2imrd1fijs579kbf27xwp503xgfl"; + sha256 = "sha256-Fqk6bPAOg4muxmSP+ezpGUNw6xrMWchZACKemeA08mA="; fetchSubmodules = true; }; diff --git a/pkgs/applications/window-managers/picom/picom-next.nix b/pkgs/applications/window-managers/picom/picom-next.nix index 88b00c2731db..d20d7a5ecceb 100644 --- a/pkgs/applications/window-managers/picom/picom-next.nix +++ b/pkgs/applications/window-managers/picom/picom-next.nix @@ -2,12 +2,12 @@ picom.overrideAttrs (oldAttrs: rec { pname = "picom-next"; - version = "unstable-2021-11-19"; + version = "unstable-2022-02-05"; src = fetchFromGitHub { owner = "yshui"; repo = "picom"; - rev = "1c7a4ff5a3cd5f3e25abcac0196896eea5939dce"; - sha256 = "sha256-2uy2ofXhEWKuM+nEUqU16c85UGt6fJGtPZj+az907aw="; + rev = "928963721c8789fc5f27949e8b0730771aab940d"; + sha256 = "sha256-qu9HnUG5VQbiSgduW1oR/tVvzEckaD2TWzds4R5zI+Y="; }; meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ]; }) diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index a505c852a95c..d0bec27e215a 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,17 +1,34 @@ -{ lib, fetchFromGitHub, python3, python3Packages, mypy, glib, pango, pkg-config, xcbutilcursor }: +{ lib +, fetchFromGitHub +, python3 +, python3Packages +, mypy +, glib +, pango +, pkg-config +, libinput +, libxkbcommon +, wayland +, wlroots +, xcbutilcursor +}: let unwrapped = python3Packages.buildPythonPackage rec { pname = "qtile"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - sha256 = "TRmul3t//izJRdViTvxFz29JZeGYsWc7WsJjagQ35nw="; + sha256 = "3QCI1TZIh1LcWuklVQkqgR1MQphi6CzZKc1UZcytV0k="; }; + patches = [ + ./fix-restart.patch # https://github.com/NixOS/nixpkgs/issues/139568 + ]; + postPatch = '' substituteInPlace libqtile/pangocffi.py \ --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ @@ -44,6 +61,13 @@ let xkbcommon ]; + buildInputs = [ + libinput + wayland + wlroots + libxkbcommon + ]; + # for `qtile check`, needs `stubtest` and `mypy` commands makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ mypy ]}" @@ -65,4 +89,7 @@ in name = "${unwrapped.pname}-${unwrapped.version}"; # export underlying qtile package passthru = { inherit unwrapped; }; + + # restore original qtile attrs + inherit (unwrapped) pname version meta; }) diff --git a/pkgs/applications/window-managers/qtile/fix-restart.patch b/pkgs/applications/window-managers/qtile/fix-restart.patch new file mode 100644 index 000000000000..eca4f0866342 --- /dev/null +++ b/pkgs/applications/window-managers/qtile/fix-restart.patch @@ -0,0 +1,22 @@ +diff --git a/libqtile/core/lifecycle.py b/libqtile/core/lifecycle.py +index 0d4d119d..c37d1799 100644 +--- a/libqtile/core/lifecycle.py ++++ b/libqtile/core/lifecycle.py +@@ -25,7 +25,7 @@ class LifeCycle: + + def _atexit(self) -> None: + if self.behavior is Behavior.RESTART: +- argv = [sys.executable] + sys.argv ++ argv = sys.argv + if "--no-spawn" not in argv: + argv.append("--no-spawn") + argv = [s for s in argv if not s.startswith("--with-state")] +@@ -33,7 +33,7 @@ class LifeCycle: + argv.append("--with-state=" + self.state_file) + logger.warning("Restarting Qtile with os.execv(...)") + # No other code will execute after the following line does +- os.execv(sys.executable, argv) ++ os.execv(sys.argv[0], argv) + elif self.behavior is Behavior.TERMINATE: + logger.warning("Qtile will now terminate") + elif self.behavior is Behavior.NONE: diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index ca95806b7920..b1f80d102d2a 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -13,19 +13,20 @@ , udev , libevdev , libinput -, libX11 , libGL +, libX11 +, xwaylandSupport ? true }: stdenv.mkDerivation rec { pname = "river"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "riverwm"; repo = pname; rev = "v${version}"; - sha256 = "0mysj6fmgiwzrfzm1rk09k4xa9qiqsdwvwr59b4rs010c1gsllwk"; + sha256 = "sha256-bHfHhyDx/Wzhvhr7mAeVzJf0TBJgMTGb/ClGjWMLlQ8="; fetchSubmodules = true; }; @@ -39,9 +40,8 @@ stdenv.mkDerivation rec { udev libevdev libinput - libX11 libGL - ]; + ] ++ lib.optional xwaylandSupport libX11; dontConfigure = true; @@ -51,13 +51,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - zig build -Drelease-safe -Dcpu=baseline -Dxwayland -Dman-pages --prefix $out install + zig build -Drelease-safe -Dcpu=baseline ${lib.optionalString xwaylandSupport "-Dxwayland"} -Dman-pages --prefix $out install runHook postInstall ''; /* Builder patch install dir into river to get default config - When installFlags is removed, river becomes half broken. - See https://github.com/riverwm/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56 + When installFlags is removed, river becomes half broken. + See https://github.com/riverwm/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56 */ installFlags = [ "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index be2c5bc3d6ec..11ef2979afe0 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation { xcbutilwm ]; - sourceRoot = let + prePatch = let subdir = if stdenv.isDarwin then "osx" else "linux"; - in "source/${subdir}"; + in "cd ${subdir}"; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index 6d91d8c8f46c..e98adefa4476 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/applications/window-managers/sway/bg.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "swaybg"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaybg"; rev = "v${version}"; - sha256 = "17508q9wsw6c1lsxlcbxj74z2naqhwi5c7lkbq24m4lk8qmy0576"; + hash = "sha256-Lt/hn/K+CjcmU3Bs5wChiZq0VGNcraH4tSVYsmYnKjc="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 194525dcffb5..727d9b4e6b36 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, substituteAll, swaybg , meson, ninja, pkg-config, wayland-scanner, scdoc -, wayland, libxkbcommon, pcre, json_c, dbus, libevdev +, wayland, libxkbcommon, pcre, json_c, libevdev , pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg , wlroots, wayland-protocols, libdrm , nixosTests @@ -8,8 +8,19 @@ , isNixOS ? false , enableXWayland ? true +, systemdSupport ? stdenv.isLinux +, dbusSupport ? true +, dbus +, trayEnabled ? systemdSupport && dbusSupport }: +# The "sd-bus-provider" meson option does not include a "none" option, +# but it is silently ignored iff "-Dtray=disabled". We use "basu" +# (which is not in nixpkgs) instead of "none" to alert us if this +# changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761 +assert trayEnabled -> systemdSupport && dbusSupport; +let sd-bus-provider = if systemdSupport then "libsystemd" else "basu"; in + stdenv.mkDerivation rec { pname = "sway-unwrapped"; version = "1.7"; @@ -47,16 +58,18 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - wayland libxkbcommon pcre json_c dbus libevdev + wayland libxkbcommon pcre json_c libevdev pango cairo libinput libcap pam gdk-pixbuf librsvg wayland-protocols libdrm (wlroots.override { inherit enableXWayland; }) + ] ++ lib.optionals dbusSupport [ + dbus ]; - mesonFlags = [ - "-Dsd-bus-provider=libsystemd" - ] + mesonFlags = + [ "-Dsd-bus-provider=${sd-bus-provider}" ] ++ lib.optional (!enableXWayland) "-Dxwayland=disabled" + ++ lib.optional (!trayEnabled) "-Dtray=disabled" ; passthru.tests.basic = nixosTests.sway; diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index fd424e3074a7..0928fbcfb4ef 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland-scanner -, wayland, wayland-protocols, systemd +, wayland, wayland-protocols +, systemdSupport ? stdenv.isLinux, systemd }: stdenv.mkDerivation rec { @@ -15,9 +16,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ wayland wayland-protocols systemd ]; + buildInputs = [ wayland wayland-protocols ] + ++ lib.optionals systemdSupport [ systemd ]; - mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ]; + mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=${if systemdSupport then "enabled" else "disabled"}" ]; meta = with lib; { description = "Idle management daemon for Wayland"; diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 6dccedad827b..b70160b1dbfd 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -5,20 +5,15 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; rev = version; - sha256 = "0r95p4w11dwm5ra614vddz83r8j7z6gd120z2vcchy7m9b0f15kf"; + sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY="; }; - postPatch = '' - substituteInPlace meson.build \ - --replace "version: '1.4'" "version: '${version}'" - ''; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 827fce897026..c1f531683d70 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -8,6 +8,7 @@ , isNixOS ? false , enableXWayland ? true +, dbusSupport ? true }: assert extraSessionCommands != "" -> withBaseWrapper; @@ -27,7 +28,7 @@ let export DBUS_SESSION_BUS_ADDRESS exec ${sway}/bin/sway "$@" else - exec ${dbus}/bin/dbus-run-session ${sway}/bin/sway "$@" + exec ${if !dbusSupport then "" else "${dbus}/bin/dbus-run-session"} ${sway}/bin/sway "$@" fi ''; in symlinkJoin { diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index 7d9e5f9c1cb0..2afb6e505c33 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -5,7 +5,8 @@ let self.taffybar ] ++ packages self); in stdenv.mkDerivation { - name = "taffybar-with-packages-${taffybarEnv.version}"; + pname = "taffybar-with-packages"; + inherit (taffybarEnv) version; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 598e78be2643..043e2b02a7fb 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, wayland-scanner, python3 , wayland, libGL, mesa, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput, libevdev , colord, lcms2, pipewire ? null @@ -10,14 +10,14 @@ with lib; stdenv.mkDerivation rec { pname = "weston"; - version = "9.0.0"; + version = "10.0.0"; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1zlql0xgiqc3pvgbpnnvj4xvpd91pwva8qf83xfb23if377ddxaw"; + sha256 = "1bj7wnadr7ssn6xw7k8ki0wpj6np3kjd2pcysfz3h0mr290rc8sw"; }; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner python3 ]; buildInputs = [ wayland libGL mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput libevdev pango libunwind freerdp vaapi libva diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix index f5c9f12a23f6..409bf73c893f 100644 --- a/pkgs/applications/window-managers/xmonad/wrapper.nix +++ b/pkgs/applications/window-managers/xmonad/wrapper.nix @@ -3,7 +3,8 @@ let xmonadEnv = ghcWithPackages (self: [ self.xmonad ] ++ packages self); in stdenv.mkDerivation { - name = "xmonad-with-packages-${xmonadEnv.version}"; + pname = "xmonad-with-packages"; + inherit (xmonadEnv) version; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 8917784bc6c3..7186675a5c62 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -1,7 +1,7 @@ { lib, stdenv -, lapack-reference, openblasCompat, openblas +, lapack-reference, openblas , isILP64 ? false -, blasProvider ? if isILP64 then openblas else openblasCompat }: +, blasProvider ? openblas }: let blasFortranSymbols = [ @@ -32,10 +32,13 @@ let blasImplementation = lib.getName blasProvider; + blasProvider' = if blasImplementation == "mkl" + then blasProvider + else blasProvider.override { blas64 = isILP64; }; in -assert isILP64 -> (blasImplementation == "openblas" && blasProvider.blas64) || blasImplementation == "mkl"; +assert isILP64 -> blasImplementation == "mkl" || blasProvider'.blas64; stdenv.mkDerivation { pname = "blas"; @@ -43,13 +46,13 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - meta = (blasProvider.meta or {}) // { + meta = (blasProvider'.meta or {}) // { description = "${lib.getName blasProvider} with just the BLAS C and FORTRAN ABI"; }; passthru = { inherit isILP64; - provider = blasProvider; + provider = blasProvider'; implementation = blasImplementation; }; @@ -62,10 +65,10 @@ stdenv.mkDerivation { installPhase = ('' mkdir -p $out/lib $dev/include $dev/lib/pkgconfig - libblas="${lib.getLib blasProvider}/lib/libblas${canonicalExtension}" + libblas="${lib.getLib blasProvider'}/lib/libblas${canonicalExtension}" if ! [ -e "$libblas" ]; then - echo "$libblas does not exist, ${blasProvider.name} does not provide libblas." + echo "$libblas does not exist, ${blasProvider'.name} does not provide libblas." exit 1 fi @@ -79,11 +82,11 @@ stdenv.mkDerivation { '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname libblas${canonicalExtension} $out/lib/libblas${canonicalExtension} - patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libblas${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider'}/lib" $out/lib/libblas${canonicalExtension} '' else if stdenv.hostPlatform.isDarwin then '' install_name_tool \ -id $out/lib/libblas${canonicalExtension} \ - -add_rpath ${lib.getLib blasProvider}/lib \ + -add_rpath ${lib.getLib blasProvider'}/lib \ $out/lib/libblas${canonicalExtension} '' else "") + '' @@ -99,10 +102,10 @@ Libs: -L$out/lib -lblas Cflags: -I$dev/include EOF - libcblas="${lib.getLib blasProvider}/lib/libcblas${canonicalExtension}" + libcblas="${lib.getLib blasProvider'}/lib/libcblas${canonicalExtension}" if ! [ -e "$libcblas" ]; then - echo "$libcblas does not exist, ${blasProvider.name} does not provide libcblas." + echo "$libcblas does not exist, ${blasProvider'.name} does not provide libcblas." exit 1 fi @@ -111,11 +114,11 @@ EOF '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname libcblas${canonicalExtension} $out/lib/libcblas${canonicalExtension} - patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libcblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libcblas${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libcblas${canonicalExtension}):${lib.getLib blasProvider'}/lib" $out/lib/libcblas${canonicalExtension} '' else if stdenv.hostPlatform.isDarwin then '' install_name_tool \ -id $out/lib/libcblas${canonicalExtension} \ - -add_rpath ${lib.getLib blasProvider}/lib \ + -add_rpath ${lib.getLib blasProvider'}/lib \ $out/lib/libcblas${canonicalExtension} '' else "") + '' if [ "$out/lib/libcblas${canonicalExtension}" != "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then @@ -135,6 +138,6 @@ EOF mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} - ln -sf ${blasProvider}/include/* $dev/include + ln -sf ${blasProvider'}/include/* $dev/include ''); } diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 61da183c835d..80fb7be8c1e1 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv -, lapack-reference, openblasCompat, openblas +, lapack-reference, openblas , isILP64 ? false -, lapackProvider ? if isILP64 then openblas else openblasCompat }: +, lapackProvider ? openblas }: let @@ -11,10 +11,13 @@ let else stdenv.hostPlatform.extensions.sharedLibrary; lapackImplementation = lib.getName lapackProvider; + lapackProvider' = if lapackImplementation == "mkl" + then lapackProvider + else lapackProvider.override { blas64 = isILP64; }; in -assert isILP64 -> (lapackImplementation == "openblas" && lapackProvider.blas64) || lapackImplementation == "mkl"; +assert isILP64 -> lapackImplementation == "mkl" || lapackProvider'.blas64; stdenv.mkDerivation { pname = "lapack"; @@ -22,13 +25,13 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; - meta = (lapackProvider.meta or {}) // { - description = "${lib.getName lapackProvider} with just the LAPACK C and FORTRAN ABI"; + meta = (lapackProvider'.meta or {}) // { + description = "${lib.getName lapackProvider'} with just the LAPACK C and FORTRAN ABI"; }; passthru = { inherit isILP64; - provider = lapackProvider; + provider = lapackProvider'; implementation = lapackImplementation; }; @@ -41,10 +44,10 @@ stdenv.mkDerivation { installPhase = ('' mkdir -p $out/lib $dev/include $dev/lib/pkgconfig - liblapack="${lib.getLib lapackProvider}/lib/liblapack${canonicalExtension}" + liblapack="${lib.getLib lapackProvider'}/lib/liblapack${canonicalExtension}" if ! [ -e "$liblapack" ]; then - echo "$liblapack does not exist, ${lapackProvider.name} does not provide liblapack." + echo "$liblapack does not exist, ${lapackProvider'.name} does not provide liblapack." exit 1 fi @@ -53,7 +56,7 @@ stdenv.mkDerivation { '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname liblapack${canonicalExtension} $out/lib/liblapack${canonicalExtension} - patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider}/lib" $out/lib/liblapack${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider'}/lib" $out/lib/liblapack${canonicalExtension} '' else "") + '' if [ "$out/lib/liblapack${canonicalExtension}" != "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then @@ -70,10 +73,10 @@ Cflags: -I$dev/include Libs: -L$out/lib -llapack EOF - liblapacke="${lib.getLib lapackProvider}/lib/liblapacke${canonicalExtension}" + liblapacke="${lib.getLib lapackProvider'}/lib/liblapacke${canonicalExtension}" if ! [ -e "$liblapacke" ]; then - echo "$liblapacke does not exist, ${lapackProvider.name} does not provide liblapacke." + echo "$liblapacke does not exist, ${lapackProvider'.name} does not provide liblapacke." exit 1 fi @@ -82,7 +85,7 @@ EOF '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname liblapacke${canonicalExtension} $out/lib/liblapacke${canonicalExtension} - patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider}/lib" $out/lib/liblapacke${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider'}/lib" $out/lib/liblapacke${canonicalExtension} '' else "") + '' if [ -f "$out/lib/liblapacke.so.3" ]; then @@ -102,6 +105,6 @@ EOF mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ln -s $out/lib/liblapack${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} - ln -sf ${lapackProvider}/include/* $dev/include + ln -sf ${lapackProvider'}/include/* $dev/include ''); } diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 9ceaab88946d..0bee6ce065ad 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -68,6 +68,8 @@ rec { xdg-utils iana-etc krb5 + gsettings-desktop-schemas + hicolor-icon-theme # dont show a gtk warning about hicolor not being installed ]; # list of libraries expected in an appimage environment: @@ -123,7 +125,6 @@ rec { atk at-spi2-atk libudev0-shim - networkmanager098 xorg.libXt xorg.libXmu @@ -180,6 +181,8 @@ rec { fribidi p11-kit + gmp + # libraries not on the upstream include list, but nevertheless expected # by at least one appimage libtool.lib # for Synfigstudio diff --git a/pkgs/build-support/build-dotnet-module/default.nix b/pkgs/build-support/build-dotnet-module/default.nix deleted file mode 100644 index 49a61f4e5d6d..000000000000 --- a/pkgs/build-support/build-dotnet-module/default.nix +++ /dev/null @@ -1,270 +0,0 @@ -{ lib, stdenvNoCC, linkFarmFromDrvs, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, cacert }: - -{ name ? "${args.pname}-${args.version}" -, enableParallelBuilding ? true -, doCheck ? false -# Flags to pass to `makeWrapper`. This is done to avoid double wrapping. -, makeWrapperArgs ? [] - -# Flags to pass to `dotnet restore`. -, dotnetRestoreFlags ? [] -# Flags to pass to `dotnet build`. -, dotnetBuildFlags ? [] -# Flags to pass to `dotnet test`, if running tests is enabled. -, dotnetTestFlags ? [] -# Flags to pass to `dotnet install`. -, dotnetInstallFlags ? [] -# Flags to pass to `dotnet pack`. -, dotnetPackFlags ? [] -# Flags to pass to dotnet in all phases. -, dotnetFlags ? [] - -# The binaries that should get installed to `$out/bin`, relative to `$out/lib/$pname/`. These get wrapped accordingly. -# Unfortunately, dotnet has no method for doing this automatically. -# If unset, all executables in the projects root will get installed. This may cause bloat! -, executables ? null -# Packs a project as a `nupkg`, and installs it to `$out/share`. If set to `true`, the derivation can be used as a dependency for another dotnet project by adding it to `projectReferences`. -, packNupkg ? false -# The packages project file, which contains instructions on how to compile it. This can be an array of multiple project files as well. -, projectFile ? null -# The NuGet dependency file. This locks all NuGet dependency versions, as otherwise they cannot be deterministically fetched. -# This can be generated by running the `passthru.fetch-deps` script. -, nugetDeps ? null -# A list of derivations containing nupkg packages for local project references. -# Referenced derivations can be built with `buildDotnetModule` with `packNupkg=true` flag. -# Since we are sharing them as nugets they must be added to csproj/fsproj files as `PackageReference` as well. -# For example, your project has a local dependency: -# -# To enable discovery through `projectReferences` you would need to add a line: -# -# -, projectReferences ? [] -# Libraries that need to be available at runtime should be passed through this. -# These get wrapped into `LD_LIBRARY_PATH`. -, runtimeDeps ? [] - -# Tests to disable. This gets passed to `dotnet test --filter "FullyQualifiedName!={}"`, to ensure compatibility with all frameworks. -# See https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details for more details. -, disabledTests ? [] -# The project file to run unit tests against. This is usually referenced in the regular project file, but sometimes it needs to be manually set. -# It gets restored and build, but not installed. You may need to regenerate your nuget lockfile after setting this. -, testProjectFile ? "" - -# The type of build to perform. This is passed to `dotnet` with the `--configuration` flag. Possible values are `Release`, `Debug`, etc. -, buildType ? "Release" -# The dotnet SDK to use. -, dotnet-sdk ? dotnetCorePackages.sdk_5_0 -# The dotnet runtime to use. -, dotnet-runtime ? dotnetCorePackages.runtime_5_0 -# The dotnet SDK to run tests against. This can differentiate from the SDK compiled against. -, dotnet-test-sdk ? dotnet-sdk -, ... } @ args: - -assert projectFile == null -> throw "Defining the `projectFile` attribute is required. This is usually an `.csproj`, or `.sln` file."; - -# TODO: Automatically generate a dependency file when a lockfile is present. -# This file is unfortunately almost never present, as Microsoft recommands not to push this in upstream repositories. -assert nugetDeps == null -> throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated by running the `passthru.fetch-deps` script."; - -let - _nugetDeps = linkFarmFromDrvs "${name}-nuget-deps" (import nugetDeps { - fetchNuGet = { pname, version, sha256 }: fetchurl { - name = "${pname}-${version}.nupkg"; - url = "https://www.nuget.org/api/v2/package/${pname}/${version}"; - inherit sha256; - }; - }); - _localDeps = linkFarmFromDrvs "${name}-local-nuget-deps" projectReferences; - - nuget-source = stdenvNoCC.mkDerivation rec { - name = "${args.pname}-nuget-source"; - meta.description = "A Nuget source with the dependencies for ${args.pname}"; - - nativeBuildInputs = [ dotnetPackages.Nuget xml2 ]; - buildCommand = '' - export HOME=$(mktemp -d) - mkdir -p $out/{lib,share} - - nuget sources Add -Name nixos -Source "$out/lib" - nuget init "${_nugetDeps}" "$out/lib" - ${lib.optionalString (projectReferences != []) - "nuget init \"${_localDeps}\" \"$out/lib\""} - - # Generates a list of all unique licenses' spdx ids. - find "$out/lib" -name "*.nuspec" -exec sh -c \ - "xml2 < {} | grep "license=" | cut -d'=' -f2" \; | sort -u > $out/share/licenses - ''; - } // { # This is done because we need data from `$out` for `meta`. We have to use overrides as to not hit infinite recursion. - meta.licence = let - depLicenses = lib.splitString "\n" (builtins.readFile "${nuget-source}/share/licenses"); - getLicence = spdx: lib.filter (license: license.spdxId or null == spdx) (builtins.attrValues lib.licenses); - in (lib.flatten (lib.forEach depLicenses (spdx: - if (getLicence spdx) != [] then (getLicence spdx) else [] ++ lib.optional (spdx != "") spdx - ))); - }; - - package = stdenvNoCC.mkDerivation (args // { - inherit buildType; - - nativeBuildInputs = args.nativeBuildInputs or [] ++ [ dotnet-sdk cacert makeWrapper ]; - - # Stripping breaks the executable - dontStrip = true; - - # gappsWrapperArgs gets included when wrapping for dotnet, as to avoid double wrapping - dontWrapGApps = true; - - DOTNET_NOLOGO = true; # This disables the welcome message. - DOTNET_CLI_TELEMETRY_OPTOUT = true; - - passthru = { - fetch-deps = writeScript "fetch-${args.pname}-deps" '' - set -euo pipefail - cd "$(dirname "''${BASH_SOURCE[0]}")" - - export HOME=$(mktemp -d) - deps_file="/tmp/${args.pname}-deps.nix" - - store_src="${package.src}" - src="$(mktemp -d /tmp/${args.pname}.XXX)" - cp -rT "$store_src" "$src" - chmod -R +w "$src" - - trap "rm -rf $src $HOME" EXIT - pushd "$src" - - export DOTNET_NOLOGO=1 - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - - mkdir -p "$HOME/nuget_pkgs" - - for project in "${lib.concatStringsSep "\" \"" ((lib.toList projectFile) ++ lib.optionals (testProjectFile != "") (lib.toList testProjectFile))}"; do - ${dotnet-sdk}/bin/dotnet restore "$project" \ - ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --packages "$HOME/nuget_pkgs" \ - "''${dotnetRestoreFlags[@]}" \ - "''${dotnetFlags[@]}" - done - - echo "Writing lockfile..." - ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" > "$deps_file" - echo "Succesfully wrote lockfile to: $deps_file" - ''; - } // args.passthru or {}; - - configurePhase = args.configurePhase or '' - runHook preConfigure - - export HOME=$(mktemp -d) - - for project in ''${projectFile[@]} ''${testProjectFile[@]}; do - dotnet restore "$project" \ - ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --source "${nuget-source}/lib" \ - "''${dotnetRestoreFlags[@]}" \ - "''${dotnetFlags[@]}" - done - - runHook postConfigure - ''; - - buildPhase = args.buildPhase or '' - runHook preBuild - - for project in ''${projectFile[@]} ''${testProjectFile[@]}; do - dotnet build "$project" \ - -maxcpucount:${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} \ - -p:BuildInParallel=${if enableParallelBuilding then "true" else "false"} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - -p:Version=${args.version} \ - --configuration "$buildType" \ - --no-restore \ - "''${dotnetBuildFlags[@]}" \ - "''${dotnetFlags[@]}" - done - - runHook postBuild - ''; - - checkPhase = args.checkPhase or '' - runHook preCheck - - for project in ''${testProjectFile[@]}; do - ${lib.getBin dotnet-test-sdk}/bin/dotnet test "$project" \ - -maxcpucount:${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --configuration "$buildType" \ - --no-build \ - --logger "console;verbosity=normal" \ - ${lib.optionalString (disabledTests != []) "--filter \"FullyQualifiedName!=${lib.concatStringsSep "&FullyQualifiedName!=" disabledTests}\""} \ - "''${dotnetTestFlags[@]}" \ - "''${dotnetFlags[@]}" - done - - runHook postCheck - ''; - - installPhase = args.installPhase or '' - runHook preInstall - - for project in ''${projectFile[@]}; do - dotnet publish "$project" \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --output $out/lib/${args.pname} \ - --configuration "$buildType" \ - --no-build \ - --no-self-contained \ - "''${dotnetInstallFlags[@]}" \ - "''${dotnetFlags[@]}" - done - '' + lib.optionalString packNupkg '' - for project in ''${projectFile[@]}; do - dotnet pack "$project" \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --output $out/share \ - --configuration "$buildType" \ - --no-build \ - "''${dotnetPackFlags[@]}" \ - "''${dotnetFlags[@]}" - done - '' + '' - runHook postInstall - ''; - - preFixup = '' - _wrapDotnetProgram() { - makeWrapper "$1" "$out/bin/$(basename "$executable")" \ - --set DOTNET_ROOT "${dotnet-runtime}" \ - --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \ - "''${gappsWrapperArgs[@]}" \ - "''${makeWrapperArgs[@]}" - } - '' + (if executables != null then '' - for executable in ''${executables[@]}; do - execPath="$out/lib/${args.pname}/$executable" - - if [[ -f "$execPath" && -x "$execPath" ]]; then - _wrapDotnetProgram $execPath - else - echo "Specified binary \"$executable\" is either not an executable, or does not exist!" - exit 1 - fi - done - '' else '' - for executable in $out/lib/${args.pname}/*; do - if [[ -f "$executable" && -x "$executable" && "$executable" != *"dll"* ]]; then - _wrapDotnetProgram $executable - fi - done - ''); - }); -in - package diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 0051961d9f17..a36008d752bd 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -41,7 +41,7 @@ let basePkgs = with pkgs; [ glibcLocales (if isMultiBuild then glibc_multi else glibc) - (toString gcc.cc.lib) bashInteractive coreutils less shadow su + (toString gcc.cc.lib) bashInteractiveFHS coreutils less shadow su gawk diffutils findutils gnused gnugrep gnutar gzip bzip2 xz ]; @@ -59,6 +59,9 @@ let export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" export TZDIR='/etc/zoneinfo' + # XDG_DATA_DIRS is used by pressure-vessel (steam proton) and vulkan loaders to find the corresponding icd + export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share + # Force compilers and other tools to look in default search paths unset NIX_ENFORCE_PURITY export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 @@ -93,6 +96,35 @@ let paths = [ etcPkg ldconfig ] ++ basePkgs ++ targetPaths; extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall; ignoreCollisions = true; + postBuild = '' + if [[ -d $out/share/gsettings-schemas/ ]]; then + # Recreate the standard schemas directory if its a symlink to make it writable + if [[ -L $out/share/glib-2.0 ]]; then + target=$(readlink $out/share/glib-2.0) + rm $out/share/glib-2.0 + mkdir $out/share/glib-2.0 + ln -fs $target/* $out/share/glib-2.0 + fi + + if [[ -L $out/share/glib-2.0/schemas ]]; then + target=$(readlink $out/share/glib-2.0/schemas) + rm $out/share/glib-2.0/schemas + mkdir $out/share/glib-2.0/schemas + ln -fs $target/* $out/share/glib-2.0/schemas + fi + + mkdir -p $out/share/glib-2.0/schemas + + for d in $out/share/gsettings-schemas/*; do + # Force symlink, in case there are duplicates + ln -fs $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas + ln -fs $d/glib-2.0/schemas/*.gschema.override $out/share/glib-2.0/schemas + done + + # and compile them + ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + fi + ''; }; staticUsrProfileMulti = buildEnv { diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix index b9d2de7277eb..32ac43d41556 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "chrootenv"; - src = ./.; + src = ./src; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib ]; diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/src/chrootenv.c similarity index 100% rename from pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c rename to pkgs/build-support/build-fhs-userenv/chrootenv/src/chrootenv.c diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/meson.build b/pkgs/build-support/build-fhs-userenv/chrootenv/src/meson.build similarity index 100% rename from pkgs/build-support/build-fhs-userenv/chrootenv/meson.build rename to pkgs/build-support/build-fhs-userenv/chrootenv/src/meson.build diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 44c8adb06e18..09457caecb86 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -45,7 +45,7 @@ let basePkgs = with pkgs; [ glibcLocales (if isMultiBuild then glibc_multi else glibc) - (toString gcc.cc.lib) bashInteractive coreutils less shadow su + (toString gcc.cc.lib) bashInteractiveFHS coreutils less shadow su gawk diffutils findutils gnused gnugrep gnutar gzip bzip2 xz ]; @@ -60,6 +60,9 @@ let export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" export TZDIR='/etc/zoneinfo' + # XDG_DATA_DIRS is used by pressure-vessel (steam proton) and vulkan loaders to find the corresponding icd + export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share + # Force compilers and other tools to look in default search paths unset NIX_ENFORCE_PURITY export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 @@ -134,6 +137,35 @@ let paths = [ etcPkg ] ++ basePkgs ++ targetPaths; extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall; ignoreCollisions = true; + postBuild = '' + if [[ -d $out/share/gsettings-schemas/ ]]; then + # Recreate the standard schemas directory if its a symlink to make it writable + if [[ -L $out/share/glib-2.0 ]]; then + target=$(readlink $out/share/glib-2.0) + rm $out/share/glib-2.0 + mkdir $out/share/glib-2.0 + ln -fs $target/* $out/share/glib-2.0 + fi + + if [[ -L $out/share/glib-2.0/schemas ]]; then + target=$(readlink $out/share/glib-2.0/schemas) + rm $out/share/glib-2.0/schemas + mkdir $out/share/glib-2.0/schemas + ln -fs $target/* $out/share/glib-2.0/schemas + fi + + mkdir -p $out/share/glib-2.0/schemas + + for d in $out/share/gsettings-schemas/*; do + # Force symlink, in case there are duplicates + ln -fs $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas + ln -fs $d/glib-2.0/schemas/*.gschema.override $out/share/glib-2.0/schemas + done + + # and compile them + ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas + fi + ''; }; staticUsrProfileMulti = buildEnv { diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index a6e991914e6b..c59118d6c09e 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -33,6 +33,20 @@ NIX_CFLAGS_COMPILE_@suffixSalt@="-B@out@/bin/ $NIX_CFLAGS_COMPILE_@suffixSalt@" # Export and assign separately in order that a failing $(..) will fail # the script. +# Currently bootstrap-tools does not split glibc, and gcc files into +# separate directories. As a workaround we want resulting cflags to be +# ordered as: crt1-cflags libc-cflags cc-cflags. Otherwise we mix crt/libc.so +# from different libc as seen in +# https://github.com/NixOS/nixpkgs/issues/158042 +# +# Note that below has reverse ordering as we prepend flags one-by-one. +# Once bootstrap-tools is split into different directories we can stop +# relying on flag ordering below. + +if [ -e @out@/nix-support/cc-cflags ]; then + NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" +fi + if [[ "$cInclude" = 1 ]] && [ -e @out@/nix-support/libc-cflags ]; then NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" fi @@ -49,10 +63,6 @@ if [ -e @out@/nix-support/libcxx-ldflags ]; then NIX_CXXSTDLIB_LINK_@suffixSalt@+=" $(< @out@/nix-support/libcxx-ldflags)" fi -if [ -e @out@/nix-support/cc-cflags ]; then - NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@" -fi - if [ -e @out@/nix-support/gnat-cflags ]; then NIX_GNATFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE_@suffixSalt@" fi diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index 569b07cded63..a681bbda5575 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -16,6 +16,7 @@ in displayVersion ? {}, release ? {}, extraBuildInputs ? [], + extraNativeBuildInputs ? [], namePrefix ? [ "coq" ], enableParallelBuilding ? true, extraInstallFlags ? [], @@ -34,7 +35,7 @@ let args-to-remove = foldl (flip remove) ([ "version" "fetcher" "repo" "owner" "domain" "releaseRev" "displayVersion" "defaultVersion" "useMelquiondRemake" - "release" "extraBuildInputs" "extraPropagatedBuildInputs" "namePrefix" + "release" "extraBuildInputs" "extraNativeBuildInputs" "extraPropagatedBuildInputs" "namePrefix" "meta" "useDune2ifVersion" "useDune2" "opam-name" "extraInstallFlags" "setCOQBIN" "mlPlugin" "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; @@ -67,9 +68,11 @@ stdenv.mkDerivation (removeAttrs ({ inherit (fetched) version src; - buildInputs = [ coq ] - ++ optionals mlPlugin coq.ocamlBuildInputs + nativeBuildInputs = [ coq ] ++ optionals useDune2 [coq.ocaml coq.ocamlPackages.dune_2] + ++ optionals mlPlugin coq.ocamlNativeBuildInputs + ++ extraNativeBuildInputs; + buildInputs = optionals mlPlugin coq.ocamlBuildInputs ++ extraBuildInputs; inherit enableParallelBuilding; diff --git a/pkgs/build-support/coq/meta-fetch/default.nix b/pkgs/build-support/coq/meta-fetch/default.nix index e7b15af4f06e..d5fe31c6ccf7 100644 --- a/pkgs/build-support/coq/meta-fetch/default.nix +++ b/pkgs/build-support/coq/meta-fetch/default.nix @@ -59,10 +59,9 @@ switch arg [ (optionalAttrs has-owner { owner = head splitted; })); }; } { case = isAttrs; - out = let - { version = arg.version or "dev"; - src = (arg.fetcher or fetcher) (location // (arg.location or {})); - }; } + out = { + version = arg.version or "dev"; + src = (arg.fetcher or fetcher) (location // (arg.location or {})); }; } { case = isPath; out = { version = "dev" ; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 1b6c340f7f0c..5718cadd4ffa 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -827,6 +827,8 @@ rec { # this on, but tooling may disable this to insert the store paths more # efficiently via other means, such as bind mounting the host store. includeStorePaths ? true + , # Passthru arguments for the underlying derivation. + passthru ? {} , }: assert @@ -987,7 +989,7 @@ rec { result = runCommand "stream-${baseName}" { inherit (conf) imageName; - passthru = { + passthru = passthru // { inherit (conf) imageTag; # Distinguish tarballs and exes at the Nix level so functions that diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix new file mode 100644 index 000000000000..b5651d72a920 --- /dev/null +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -0,0 +1,141 @@ +{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert }: + +{ name ? "${args.pname}-${args.version}" +, pname ? name +, enableParallelBuilding ? true +, doCheck ? false +# Flags to pass to `makeWrapper`. This is done to avoid double wrapping. +, makeWrapperArgs ? [] + +# Flags to pass to `dotnet restore`. +, dotnetRestoreFlags ? [] +# Flags to pass to `dotnet build`. +, dotnetBuildFlags ? [] +# Flags to pass to `dotnet test`, if running tests is enabled. +, dotnetTestFlags ? [] +# Flags to pass to `dotnet install`. +, dotnetInstallFlags ? [] +# Flags to pass to `dotnet pack`. +, dotnetPackFlags ? [] +# Flags to pass to dotnet in all phases. +, dotnetFlags ? [] + +# The path to publish the project to. When unset, the directory "$out/lib/$pname" is used. +, installPath ? null +# The binaries that should get installed to `$out/bin`, relative to `$out/lib/$pname/`. These get wrapped accordingly. +# Unfortunately, dotnet has no method for doing this automatically. +# If unset, all executables in the projects root will get installed. This may cause bloat! +, executables ? null +# Packs a project as a `nupkg`, and installs it to `$out/share`. If set to `true`, the derivation can be used as a dependency for another dotnet project by adding it to `projectReferences`. +, packNupkg ? false +# The packages project file, which contains instructions on how to compile it. This can be an array of multiple project files as well. +, projectFile ? null +# The NuGet dependency file. This locks all NuGet dependency versions, as otherwise they cannot be deterministically fetched. +# This can be generated by running the `passthru.fetch-deps` script. +, nugetDeps ? null +# A list of derivations containing nupkg packages for local project references. +# Referenced derivations can be built with `buildDotnetModule` with `packNupkg=true` flag. +# Since we are sharing them as nugets they must be added to csproj/fsproj files as `PackageReference` as well. +# For example, your project has a local dependency: +# +# To enable discovery through `projectReferences` you would need to add a line: +# +# +, projectReferences ? [] +# Libraries that need to be available at runtime should be passed through this. +# These get wrapped into `LD_LIBRARY_PATH`. +, runtimeDeps ? [] + +# Tests to disable. This gets passed to `dotnet test --filter "FullyQualifiedName!={}"`, to ensure compatibility with all frameworks. +# See https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details for more details. +, disabledTests ? [] +# The project file to run unit tests against. This is usually referenced in the regular project file, but sometimes it needs to be manually set. +# It gets restored and build, but not installed. You may need to regenerate your nuget lockfile after setting this. +, testProjectFile ? "" + +# The type of build to perform. This is passed to `dotnet` with the `--configuration` flag. Possible values are `Release`, `Debug`, etc. +, buildType ? "Release" +# The dotnet SDK to use. +, dotnet-sdk ? dotnetCorePackages.sdk_5_0 +# The dotnet runtime to use. +, dotnet-runtime ? dotnetCorePackages.runtime_5_0 +# The dotnet SDK to run tests against. This can differentiate from the SDK compiled against. +, dotnet-test-sdk ? dotnet-sdk +, ... } @ args: + +assert projectFile == null -> throw "Defining the `projectFile` attribute is required. This is usually an `.csproj`, or `.sln` file."; + +# TODO: Automatically generate a dependency file when a lockfile is present. +# This file is unfortunately almost never present, as Microsoft recommands not to push this in upstream repositories. +assert nugetDeps == null -> throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated by running the `passthru.fetch-deps` script."; + +let + inherit (callPackage ./hooks { + inherit dotnet-sdk dotnet-test-sdk disabledTests nuget-source dotnet-runtime runtimeDeps buildType; + }) dotnetConfigureHook dotnetBuildHook dotnetCheckHook dotnetInstallHook dotnetFixupHook; + + _nugetDeps = mkNugetDeps { name = "${name}-nuget-deps"; nugetDeps = import nugetDeps; }; + _localDeps = linkFarmFromDrvs "${name}-local-nuget-deps" projectReferences; + + nuget-source = mkNugetSource { + name = "${args.pname}-nuget-source"; + description = "A Nuget source with the dependencies for ${args.pname}"; + deps = [ _nugetDeps _localDeps ]; + }; + +in stdenvNoCC.mkDerivation (args // { + nativeBuildInputs = args.nativeBuildInputs or [] ++ [ + dotnetConfigureHook + dotnetBuildHook + dotnetCheckHook + dotnetInstallHook + dotnetFixupHook + + dotnet-sdk + cacert + makeWrapper + ]; + + # Stripping breaks the executable + dontStrip = args.dontStrip or true; + + # gappsWrapperArgs gets included when wrapping for dotnet, as to avoid double wrapping + dontWrapGApps = args.dontWrapGApps or true; + + passthru = { + fetch-deps = writeScript "fetch-${pname}-deps" '' + set -euo pipefail + cd "$(dirname "''${BASH_SOURCE[0]}")" + + export HOME=$(mktemp -d) + deps_file="/tmp/${pname}-deps.nix" + + store_src="${args.src}" + src="$(mktemp -d /tmp/${pname}.XXX)" + cp -rT "$store_src" "$src" + chmod -R +w "$src" + + trap "rm -rf $src $HOME" EXIT + pushd "$src" + + export DOTNET_NOLOGO=1 + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + + mkdir -p "$HOME/nuget_pkgs" + + for project in "${lib.concatStringsSep "\" \"" ((lib.toList projectFile) ++ lib.optionals (testProjectFile != "") (lib.toList testProjectFile))}"; do + ${dotnet-sdk}/bin/dotnet restore "$project" \ + ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --packages "$HOME/nuget_pkgs" \ + ${lib.optionalString (dotnetRestoreFlags != []) (builtins.toString dotnetRestoreFlags)} \ + ${lib.optionalString (dotnetFlags != []) (builtins.toString dotnetFlags)} + done + + echo "Writing lockfile..." + ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" > "$deps_file" + echo "Succesfully wrote lockfile to: $deps_file" + ''; + } // args.passthru or {}; +}) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix new file mode 100644 index 000000000000..76f7eea5bfec --- /dev/null +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -0,0 +1,62 @@ +{ lib +, callPackage +, makeSetupHook +, makeWrapper +, dotnet-sdk +, dotnet-test-sdk +, disabledTests +, nuget-source +, dotnet-runtime +, runtimeDeps +, buildType +}: + +{ + dotnetConfigureHook = callPackage ({ }: + makeSetupHook { + name = "dotnet-configure-hook"; + deps = [ dotnet-sdk nuget-source ]; + substitutions = { + nugetSource = nuget-source; + }; + } ./dotnet-configure-hook.sh) { }; + + dotnetBuildHook = callPackage ({ }: + makeSetupHook { + name = "dotnet-build-hook"; + deps = [ dotnet-sdk ]; + substitutions = { + inherit buildType; + }; + } ./dotnet-build-hook.sh) { }; + + dotnetCheckHook = callPackage ({ }: + makeSetupHook { + name = "dotnet-check-hook"; + deps = [ dotnet-test-sdk ]; + substitutions = { + inherit buildType; + disabledTests = lib.optionalString (disabledTests != []) + (lib.concatStringsSep "&FullyQualifiedName!=" disabledTests); + }; + } ./dotnet-check-hook.sh) { }; + + dotnetInstallHook = callPackage ({ }: + makeSetupHook { + name = "dotnet-install-hook"; + deps = [ dotnet-sdk ]; + substitutions = { + inherit buildType; + }; + } ./dotnet-install-hook.sh) { }; + + dotnetFixupHook = callPackage ({ }: + makeSetupHook { + name = "dotnet-fixup-hook"; + deps = [ dotnet-runtime makeWrapper ]; + substitutions = { + dotnetRuntime = dotnet-runtime; + runtimeDeps = lib.makeLibraryPath runtimeDeps; + }; + } ./dotnet-fixup-hook.sh) { }; +} diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh new file mode 100644 index 000000000000..a1dc80a77fd7 --- /dev/null +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh @@ -0,0 +1,41 @@ +declare -a projectFile testProjectFile dotnetBuildFlags dotnetFlags + +dotnetBuildHook() { + echo "Executing dotnetBuildHook" + + runHook preBuild + + if [ "${enableParallelBuilding-}" ]; then + maxCpuFlag="$NIX_BUILD_CORES" + parallelBuildFlag="true" + else + maxCpuFlag="1" + parallelBuildFlag="false" + fi + + if [ "${version-}" ]; then + versionFlag="-p:Version=${version-}" + fi + + for project in ${projectFile[@]} ${testProjectFile[@]}; do + env \ + dotnet build "$project" \ + -maxcpucount:$maxCpuFlag \ + -p:BuildInParallel=$parallelBuildFlag \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --configuration "@buildType@" \ + --no-restore \ + ${versionFlag-} \ + "${dotnetBuildFlags[@]}" \ + "${dotnetFlags[@]}" + done + + runHook postBuild + + echo "Finished dotnetBuildHook" +} + +if [[ -z "${dontDotnetBuild-}" && -z "${buildPhase-}" ]]; then + buildPhase=dotnetBuildHook +fi diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh new file mode 100644 index 000000000000..e3098908fe27 --- /dev/null +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh @@ -0,0 +1,33 @@ +declare -a testProjectFile dotnetTestFlags dotnetFlags + +dotnetCheckHook() { + echo "Executing dotnetCheckHook" + + runHook preCheck + + if [ "${disabledTests-}" ]; then + disabledTestsFlag="--filter FullyQualifiedName!=@disabledTests@" + fi + + for project in ${testProjectFile[@]}; do + env \ + dotnet test "$project" \ + -maxcpucount:$maxCpuFlag \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --configuration "@buildType@" \ + --no-build \ + --logger "console;verbosity=normal" \ + ${disabledTestsFlag-} \ + "${dotnetTestFlags[@]}" \ + "${dotnetFlags[@]}" + done + + runHook postCheck + + echo "Finished dotnetCheckHook" +} + +if [[ -z "${dontDotnetCheck-}" && -z "${checkPhase-}" ]]; then + checkPhase=dotnetCheckHook +fi diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh new file mode 100644 index 000000000000..59daacbac0ed --- /dev/null +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-configure-hook.sh @@ -0,0 +1,30 @@ +declare -a projectFile testProjectFile dotnetRestoreFlags dotnetFlags + +dotnetConfigureHook() { + echo "Executing dotnetConfigureHook" + + runHook preConfigure + + if [ -z "${enableParallelBuilding-}" ]; then + parallelFlag="--disable-parallel" + fi + + for project in ${projectFile[@]} ${testProjectFile[@]}; do + env \ + dotnet restore "$project" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --source "@nugetSource@/lib" \ + ${parallelFlag-} \ + "${dotnetRestoreFlags[@]}" \ + "${dotnetFlags[@]}" + done + + runHook postConfigure + + echo "Finished dotnetConfigureHook" +} + +if [[ -z "${dontDotnetConfigure-}" && -z "${configurePhase-}" ]]; then + configurePhase=dotnetConfigureHook +fi diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh new file mode 100644 index 000000000000..f8bbb7b1805b --- /dev/null +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh @@ -0,0 +1,42 @@ +declare -a makeWrapperArgs gappsWrapperArgs + +# First argument is the executable you want to wrap, +# the second is the destination for the wrapper. +wrapDotnetProgram() { + makeWrapper "$1" "$2" \ + --set "DOTNET_ROOT" "@dotnetRuntime@" \ + --suffix "LD_LIBRARY_PATH" : "@runtimeDeps@" \ + "${gappsWrapperArgs[@]}" \ + "${makeWrapperArgs[@]}" + + echo "Installed wrapper to: "$2"" +} + +dotnetFixupHook() { + echo "Executing dotnetFixupPhase" + + if [ "${executables-}" ]; then + for executable in ${executables[@]}; do + execPath="$out/lib/${pname-}/$executable" + + if [[ -f "$execPath" && -x "$execPath" ]]; then + wrapDotnetProgram "$execPath" "$out/bin/$(basename "$executable")" + else + echo "Specified binary \"$executable\" is either not an executable, or does not exist!" + exit 1 + fi + done + else + for executable in $out/lib/${pname-}/*; do + if [[ -f "$executable" && -x "$executable" && "$executable" != *"dll"* ]]; then + wrapDotnetProgram "$executable" "$out/bin/$(basename "$executable")" + fi + done + fi + + echo "Finished dotnetFixupPhase" +} + +if [[ -z "${dontDotnetFixup-}" ]]; then + preFixupPhases+=" dotnetFixupHook" +fi diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh new file mode 100644 index 000000000000..ed2c9160cd2c --- /dev/null +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh @@ -0,0 +1,42 @@ +declare -a projectFile dotnetInstallFlags dotnetFlags + +dotnetInstallHook() { + echo "Executing dotnetInstallHook" + + runHook preInstall + + for project in ${projectFile[@]}; do + env \ + dotnet publish "$project" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --output "$out/lib/${pname}" \ + --configuration "@buildType@" \ + --no-build \ + --no-self-contained \ + "${dotnetInstallFlags[@]}" \ + "${dotnetFlags[@]}" + done + + if [[ "${packNupkg-}" ]]; then + for project in ${projectFile[@]}; do + env \ + dotnet pack "$project" \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --output "$out/share" \ + --configuration "@buildType@" \ + --no-build \ + "${dotnetPackFlags[@]}" \ + "${dotnetFlags[@]}" + done + fi + + runHook postInstall + + echo "Finished dotnetInstallHook" +} + +if [[ -z "${dontDotnetInstall-}" && -z "${installPhase-}" ]]; then + installPhase=dotnetInstallHook +fi diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/dotnet/build-dotnet-package/default.nix similarity index 100% rename from pkgs/build-support/build-dotnet-package/default.nix rename to pkgs/build-support/dotnet/build-dotnet-package/default.nix diff --git a/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/create-pkg-config-for-dll.sh similarity index 100% rename from pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh rename to pkgs/build-support/dotnet/dotnetbuildhelpers/create-pkg-config-for-dll.sh diff --git a/pkgs/build-support/dotnetbuildhelpers/default.nix b/pkgs/build-support/dotnet/dotnetbuildhelpers/default.nix similarity index 100% rename from pkgs/build-support/dotnetbuildhelpers/default.nix rename to pkgs/build-support/dotnet/dotnetbuildhelpers/default.nix diff --git a/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/patch-fsharp-targets.sh similarity index 100% rename from pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh rename to pkgs/build-support/dotnet/dotnetbuildhelpers/patch-fsharp-targets.sh diff --git a/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-nuget.sh similarity index 100% rename from pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh rename to pkgs/build-support/dotnet/dotnetbuildhelpers/placate-nuget.sh diff --git a/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/placate-paket.sh similarity index 100% rename from pkgs/build-support/dotnetbuildhelpers/placate-paket.sh rename to pkgs/build-support/dotnet/dotnetbuildhelpers/placate-paket.sh diff --git a/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh b/pkgs/build-support/dotnet/dotnetbuildhelpers/remove-duplicated-dlls.sh similarity index 100% rename from pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh rename to pkgs/build-support/dotnet/dotnetbuildhelpers/remove-duplicated-dlls.sh diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln b/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper.sln similarity index 100% rename from pkgs/build-support/dotnetenv/Wrapper/Wrapper.sln rename to pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper.sln diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs b/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs similarity index 100% rename from pkgs/build-support/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs rename to pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in b/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in similarity index 100% rename from pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in rename to pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in diff --git a/pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in b/pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in similarity index 100% rename from pkgs/build-support/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in rename to pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnet/dotnetenv/build-solution.nix similarity index 100% rename from pkgs/build-support/dotnetenv/build-solution.nix rename to pkgs/build-support/dotnet/dotnetenv/build-solution.nix diff --git a/pkgs/build-support/dotnetenv/default.nix b/pkgs/build-support/dotnet/dotnetenv/default.nix similarity index 100% rename from pkgs/build-support/dotnetenv/default.nix rename to pkgs/build-support/dotnet/dotnetenv/default.nix diff --git a/pkgs/build-support/dotnetenv/wrapper.nix b/pkgs/build-support/dotnet/dotnetenv/wrapper.nix similarity index 100% rename from pkgs/build-support/dotnetenv/wrapper.nix rename to pkgs/build-support/dotnet/dotnetenv/wrapper.nix diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/dotnet/fetchnuget/default.nix similarity index 100% rename from pkgs/build-support/fetchnuget/default.nix rename to pkgs/build-support/dotnet/fetchnuget/default.nix diff --git a/pkgs/build-support/dotnet/make-nuget-deps/default.nix b/pkgs/build-support/dotnet/make-nuget-deps/default.nix new file mode 100644 index 000000000000..75178d5b7797 --- /dev/null +++ b/pkgs/build-support/dotnet/make-nuget-deps/default.nix @@ -0,0 +1,9 @@ +{ linkFarmFromDrvs, fetchurl }: +{ name, nugetDeps }: + linkFarmFromDrvs "${name}-nuget-deps" (nugetDeps { + fetchNuGet = { pname, version, sha256 }: fetchurl { + name = "${pname}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${pname}/${version}"; + inherit sha256; + }; + }) diff --git a/pkgs/build-support/dotnet/make-nuget-source/default.nix b/pkgs/build-support/dotnet/make-nuget-source/default.nix new file mode 100644 index 000000000000..0690a05aa2bc --- /dev/null +++ b/pkgs/build-support/dotnet/make-nuget-source/default.nix @@ -0,0 +1,30 @@ +{ dotnetPackages, lib, xml2, stdenvNoCC }: +{ name, description ? "", deps ? [] }: +let + _nuget-source = stdenvNoCC.mkDerivation rec { + inherit name; + meta.description = description; + + nativeBuildInputs = [ dotnetPackages.Nuget xml2 ]; + buildCommand = '' + export HOME=$(mktemp -d) + mkdir -p $out/{lib,share} + + nuget sources Add -Name nixos -Source "$out/lib" + ${ lib.concatMapStringsSep "\n" (dep: + ''nuget init "${dep}" "$out/lib"'' + ) deps } + + # Generates a list of all unique licenses' spdx ids. + find "$out/lib" -name "*.nuspec" -exec sh -c \ + "xml2 < {} | grep "license=" | cut -d'=' -f2" \; | sort -u > $out/share/licenses + ''; +} // { # This is done because we need data from `$out` for `meta`. We have to use overrides as to not hit infinite recursion. + meta.licence = let + depLicenses = lib.splitString "\n" (builtins.readFile "${_nuget-source}/share/licenses"); + getLicence = spdx: lib.filter (license: license.spdxId or null == spdx) (builtins.attrValues lib.licenses); + in (lib.flatten (lib.forEach depLicenses (spdx: + if (getLicence spdx) != [] then (getLicence spdx) else [] ++ lib.optional (spdx != "") spdx + ))); +}; +in _nuget-source diff --git a/pkgs/build-support/nuget-to-nix/default.nix b/pkgs/build-support/dotnet/nuget-to-nix/default.nix similarity index 100% rename from pkgs/build-support/nuget-to-nix/default.nix rename to pkgs/build-support/dotnet/nuget-to-nix/default.nix diff --git a/pkgs/build-support/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh similarity index 74% rename from pkgs/build-support/nuget-to-nix/nuget-to-nix.sh rename to pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh index 55a499370181..d2e7882caf6d 100755 --- a/pkgs/build-support/nuget-to-nix/nuget-to-nix.sh +++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh @@ -8,6 +8,8 @@ if [ $# -eq 0 ]; then fi pkgs=$1 +tmpfile=$(mktemp /tmp/nuget-to-nix.XXXXXX) +trap "rm -f ${tmpfile}" EXIT echo "{ fetchNuGet }: [" @@ -17,7 +19,9 @@ while read pkg_spec; do sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkg_spec") pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" - echo " (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; })" -done < <(find $1 -name '*.nuspec' | sort) + echo " (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; })" >> ${tmpfile} +done < <(find $1 -name '*.nuspec') + +LC_ALL=C sort --ignore-case ${tmpfile} echo "]" diff --git a/pkgs/build-support/fetchgit/deterministic-git b/pkgs/build-support/fetchgit/deterministic-git new file mode 100755 index 000000000000..67f585559116 --- /dev/null +++ b/pkgs/build-support/fetchgit/deterministic-git @@ -0,0 +1,45 @@ +#!/bin/sh + +# some git commands print to stdout, which would contaminate our JSON output +clean_git(){ + git "$@" >&2 +} + +# Remove all remote branches, remove tags not reachable from HEAD, do a full +# repack and then garbage collect unreferenced objects. +make_deterministic_repo(){ + local repo="$1" + + # run in sub-shell to not touch current working directory + ( + 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 + + # Remove all remote branches. + git branch -r | while read -r branch; do + clean_git branch -rD "$branch" + done + + # Remove tags not reachable from HEAD. If we're exactly on a tag, don't + # delete it. + maybe_tag=$(git tag --points-at HEAD) + git tag --contains HEAD | while read -r tag; do + if [ "$tag" != "$maybe_tag" ]; then + clean_git tag -d "$tag" + fi + done + + # 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 + + # Garbage collect unreferenced objects. + # Note: --keep-largest-pack prevents non-deterministic ordering of packs + # listed in .git/objects/info/packs by only using a single pack + clean_git gc --prune=all --keep-largest-pack + ) +} diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index 4e4162368b91..27cb8312ea0a 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -5,10 +5,23 @@ , deepClone ? false, private ? false, forceFetchGit ? false , sparseCheckout ? "" , githubBase ? "github.com", varPrefix ? null +, meta ? { } , ... # For hash agility }@args: + let + + position = (if args.meta.description or null != null + then builtins.unsafeGetAttrPos "description" args.meta + else builtins.unsafeGetAttrPos "rev" args + ); baseUrl = "https://${githubBase}/${owner}/${repo}"; + newMeta = meta // { + homepage = meta.homepage or baseUrl; + + # to indicate where derivation originates, similar to make-derivation.nix's mkDerivation + position = "${position.file}:${toString position.line}"; + }; passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "forceFetchGit" "private" "githubBase" "varPrefix" ]; varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_"; useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || (sparseCheckout != ""); @@ -37,4 +50,4 @@ let ) // privateAttrs // passthruAttrs // { inherit name; }; in -fetcher fetcherArgs // { meta.homepage = baseUrl; inherit rev; } +fetcher fetcherArgs // { meta = newMeta; inherit rev; } diff --git a/pkgs/build-support/fetchipfs/default.nix b/pkgs/build-support/fetchipfs/default.nix index 7a66999ec569..0cbb094d6003 100644 --- a/pkgs/build-support/fetchipfs/default.nix +++ b/pkgs/build-support/fetchipfs/default.nix @@ -17,8 +17,6 @@ , preferLocalBuild ? true }: -assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; - let hasHash = (outputHash != "" && outputHashAlgo != "") diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index 71c0d4664983..d46162c97ff4 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -9,30 +9,50 @@ let # 0.3.4 would change hashes: https://github.com/NixOS/nixpkgs/issues/25154 patchutils = buildPackages.patchutils_0_3_3; in -{ stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], revert ? false, ... }@args: - +{ relative ? null +, stripLen ? 0 +, extraPrefix ? null +, excludes ? [] +, includes ? [] +, revert ? false +, postFetch ? "" +, ... +}@args: let - # Make base-64 encoded SRI hash filename-safe using RFC 4648 §5 - tmpname = lib.replaceStrings [ "+" "/" "=" ] [ "-" "_" "" ] args.sha256; + args' = if relative != null then { + stripLen = 1 + lib.length (lib.splitString "/" relative) + stripLen; + extraPrefix = if extraPrefix != null then extraPrefix else ""; + } else { + inherit stripLen extraPrefix; + }; +in let + inherit (args') stripLen extraPrefix; in +lib.throwIfNot (excludes == [] || includes == []) + "fetchpatch: cannot use excludes and includes simultaneously" fetchurl ({ postFetch = '' - tmpfile="$TMPDIR/${tmpname}" + tmpfile="$TMPDIR/patch" + if [ ! -s "$out" ]; then echo "error: Fetched patch file '$out' is empty!" 1>&2 exit 1 fi - "${patchutils}/bin/lsdiff" "$out" \ - | sort -u | sed -e 's/[*?]/\\&/g' \ - | xargs -I{} \ - "${patchutils}/bin/filterdiff" \ - --include={} \ - --strip=${toString stripLen} \ - ${lib.optionalString (extraPrefix != null) '' - --addoldprefix=a/${extraPrefix} \ - --addnewprefix=b/${extraPrefix} \ - ''} \ - --clean "$out" > "$tmpfile" + + "${patchutils}/bin/lsdiff" \ + ${lib.optionalString (relative != null) "-p1 -i ${lib.escapeShellArg relative}/'*'"} \ + "$out" \ + | sort -u | sed -e 's/[*?]/\\&/g' \ + | xargs -I{} \ + "${patchutils}/bin/filterdiff" \ + --include={} \ + --strip=${toString stripLen} \ + ${lib.optionalString (extraPrefix != null) '' + --addoldprefix=a/${lib.escapeShellArg extraPrefix} \ + --addnewprefix=b/${lib.escapeShellArg extraPrefix} \ + ''} \ + --clean "$out" > "$tmpfile" + if [ ! -s "$tmpfile" ]; then echo "error: Normalized patch '$tmpfile' is empty (while the fetched file was not)!" 1>&2 echo "Did you maybe fetch a HTML representation of a patch instead of a raw patch?" 1>&2 @@ -40,6 +60,7 @@ fetchurl ({ cat "$out" 1>&2 exit 1 fi + ${patchutils}/bin/filterdiff \ -p1 \ ${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \ @@ -47,15 +68,16 @@ fetchurl ({ "$tmpfile" > "$out" if [ ! -s "$out" ]; then - echo "error: Filtered patch '$out$' is empty (while the original patch file was not)!" 1>&2 + echo "error: Filtered patch '$out' is empty (while the original patch file was not)!" 1>&2 echo "Check your includes and excludes." 1>&2 - echo "Normalizd patch file was:" 1>&2 + echo "Normalized patch file was:" 1>&2 cat "$tmpfile" 1>&2 exit 1 fi '' + lib.optionalString revert '' ${patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile" mv "$tmpfile" "$out" - '' + (args.postFetch or ""); - meta.broken = excludes != [] && includes != []; -} // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "includes" "revert" "postFetch"]) + '' + postFetch; +} // builtins.removeAttrs args [ + "relative" "stripLen" "extraPrefix" "excludes" "includes" "revert" "postFetch" +]) diff --git a/pkgs/build-support/fetchpatch/tests.nix b/pkgs/build-support/fetchpatch/tests.nix index 4240b325d656..ff2b81bf3a1d 100644 --- a/pkgs/build-support/fetchpatch/tests.nix +++ b/pkgs/build-support/fetchpatch/tests.nix @@ -5,4 +5,20 @@ url = "https://github.com/facebook/zstd/pull/2724/commits/e1f85dbca3a0ed5ef06c8396912a0914db8dea6a.patch"; sha256 = "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg="; }; + + relative = invalidateFetcherByDrvHash fetchpatch { + url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; + relative = "include"; + sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; + }; + + full = invalidateFetcherByDrvHash fetchpatch { + url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; + relative = "test"; + stripLen = 1; + extraPrefix = "foo/bar/"; + excludes = [ "foo/bar/bernoulli_no_atomic_mp.cpp" ]; + revert = true; + sha256 = "sha256-+UKmEbr2rIAweCav/hR/7d4ZrYV84ht/domTrHtm8sM="; + }; } diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 72af03e03d98..dcab471fc839 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -95,9 +95,10 @@ in # Doing the download on a remote machine just duplicates network # traffic, so don't do that by default , preferLocalBuild ? true -}: -assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; + # Additional packages needed as part of a fetch +, nativeBuildInputs ? [ ] +}: let urls_ = @@ -128,7 +129,7 @@ stdenvNoCC.mkDerivation { builder = ./builder.sh; - nativeBuildInputs = [ curl ]; + nativeBuildInputs = [ curl ] ++ nativeBuildInputs; urls = urls_; diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index e4d6f02a94bd..954c88d1bafa 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -1,6 +1,6 @@ { - # Content-addressable Nix mirrors. + # Content-addressable Nix mirrors hashedMirrors = [ "https://tarballs.nixos.org" ]; @@ -8,52 +8,48 @@ # Mirrors for mirror://site/filename URIs, where "site" is # "sourceforge", "gnu", etc. - luarocks = [ - "https://luarocks.org/" - "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/" - "https://luafr.org/moonrocks/" - "http://luarocks.logiceditor.com/rocks/" + # Alsa Project + alsa = [ + "https://www.alsa-project.org/files/pub/" + "ftp://ftp.alsa-project.org/pub/" + "http://alsa.cybermirror.org/" + "http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/" ]; - # SourceForge. - sourceforge = [ - "https://downloads.sourceforge.net/" - "https://prdownloads.sourceforge.net/" - "https://netcologne.dl.sourceforge.net/sourceforge/" - "https://versaweb.dl.sourceforge.net/sourceforge/" - "https://freefr.dl.sourceforge.net/sourceforge/" - "https://osdn.dl.sourceforge.net/sourceforge/" - "https://kent.dl.sourceforge.net/sourceforge/" + # Apache + apache = [ + "https://www-eu.apache.org/dist/" + "https://ftp.wayne.edu/apache/" + "https://www.apache.org/dist/" + "https://archive.apache.org/dist/" # fallback for old releases + "https://apache.cs.uu.nl/" + "https://apache.cs.utah.edu/" + "http://ftp.tudelft.nl/apache/" + "ftp://ftp.funet.fi/pub/mirrors/apache.org/" ]; - # OSDN (formerly SourceForge.jp). - osdn = [ - "https://osdn.dl.osdn.jp/" - "https://osdn.mirror.constant.com/" - "https://mirrors.gigenet.com/OSDN/" - "https://osdn.dl.sourceforge.jp/" - "https://jaist.dl.sourceforge.jp/" + # Bioconductor mirrors (from https://bioconductor.org/about/mirrors/) + # The commented-out ones don't seem to allow direct package downloads; + # they serve error messages that result in hash mismatches instead + bioc = [ + # http://bioc.ism.ac.jp/ + # http://bioc.openanalytics.eu/ + # http://bioconductor.fmrp.usp.br/ + # http://mirror.aarnet.edu.au/pub/bioconductor/ + # http://watson.nci.nih.gov/bioc_mirror/ + "https://bioconductor.statistik.tu-dortmund.de/packages/" + "https://mirrors.ustc.edu.cn/bioc/" + "http://bioconductor.jp/packages/" ]; - # GNU (https://www.gnu.org/prep/ftp.html). - gnu = [ - # This one redirects to a (supposedly) nearby and (supposedly) up-to-date - # mirror. - "https://ftpmirror.gnu.org/" - - "https://ftp.nluug.nl/pub/gnu/" - "https://mirrors.kernel.org/gnu/" - "https://mirror.ibcp.fr/pub/gnu/" - "https://mirror.dogado.de/gnu/" - "https://mirror.tochlab.net/pub/gnu/" - - # This one is the master repository, and thus it's always up-to-date. - "https://ftp.gnu.org/pub/gnu/" - - "ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/" + # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html + bitlbee = [ + "https://get.bitlbee.org/" + "https://ftp.snt.utwente.nl/pub/software/bitlbee/" + "http://bitlbee.intergenia.de/" ]; - # GCC. + # GCC gcc = [ "https://bigsearcher.com/mirrors/gcc/" "https://mirror.koddos.net/gcc/" @@ -63,7 +59,37 @@ "ftp://gcc.gnu.org/pub/gcc/" ]; - # GnuPG. + # GNOME + gnome = [ + # This one redirects to some mirror closeby, so it should be all you need + "https://download.gnome.org/" + + "https://fr2.rpmfind.net/linux/gnome.org/" + "https://ftp.acc.umu.se/pub/GNOME/" + "https://ftp.belnet.be/mirror/ftp.gnome.org/" + "ftp://ftp.cse.buffalo.edu/pub/Gnome/" + "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/" + ]; + + # GNU (https://www.gnu.org/prep/ftp.html) + gnu = [ + # This one redirects to a (supposedly) nearby and (supposedly) up-to-date + # mirror + "https://ftpmirror.gnu.org/" + + "https://ftp.nluug.nl/pub/gnu/" + "https://mirrors.kernel.org/gnu/" + "https://mirror.ibcp.fr/pub/gnu/" + "https://mirror.dogado.de/gnu/" + "https://mirror.tochlab.net/pub/gnu/" + + # This one is the master repository, and thus it's always up-to-date + "https://ftp.gnu.org/pub/gnu/" + + "ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/" + ]; + + # GnuPG gnupg = [ "https://gnupg.org/ftp/gcrypt/" "https://mirrors.dotsrc.org/gcrypt/" @@ -72,11 +98,23 @@ "http://www.ring.gr.jp/pub/net/" ]; - # kernel.org's /pub (/pub/{linux,software}) tree. - kernel = [ - "https://cdn.kernel.org/pub/" - "http://linux-kernel.uio.no/pub/" - "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/" + # IBiblio (former metalab/sunsite) + # Most of the time the expressions refer to the /pub/Linux/ subdirectory; + # however there are other useful files outside it + ibiblioPubLinux = [ + "https://www.ibiblio.org/pub/Linux/" + "ftp://ftp.ibiblio.org/pub/linux/" + "ftp://ftp.gwdg.de/pub/linux/metalab/" + "ftp://ftp.metalab.unc.edu/pub/linux/" + ]; + + # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php + imagemagick = [ + "https://www.imagemagick.org/download/" + "https://mirror.checkdomain.de/imagemagick/" + "https://ftp.nluug.nl/ImageMagick/" + "https://ftp.sunet.se/mirror/imagemagick.org/ftp/" + "ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors ]; # Mirrors from https://download.kde.org/ls-lR.mirrorlist @@ -89,197 +127,43 @@ "https://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/" ]; - # Gentoo files. - gentoo = [ - "https://ftp.snt.utwente.nl/pub/os/linux/gentoo/" - "https://distfiles.gentoo.org/" - "https://mirrors.kernel.org/gentoo/" + # kernel.org's /pub (/pub/{linux,software}) tree + kernel = [ + "https://cdn.kernel.org/pub/" + "http://linux-kernel.uio.no/pub/" + "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/" ]; - savannah = [ - # Mirrors from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html - "https://mirror.easyname.at/nongnu/" - "https://savannah.c3sl.ufpr.br/" - "https://mirror.csclub.uwaterloo.ca/nongnu/" - "https://mirror.cedia.org.ec/nongnu/" - "https://ftp.igh.cnrs.fr/pub/nongnu/" - "https://mirror6.layerjet.com/nongnu" - "https://mirror.netcologne.de/savannah/" - "https://ftp.cc.uoc.gr/mirrors/nongnu.org/" - "https://nongnu.uib.no/" - "https://ftp.acc.umu.se/mirror/gnu.org/savannah/" - "http://mirror2.klaus-uwe.me/nongnu/" - "http://mirrors.fe.up.pt/pub/nongnu/" - "http://ftp.twaren.net/Unix/NonGNU/" - "http://savannah-nongnu-org.ip-connect.vn.ua/" - "http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/" - "http://gnu.mirrors.pair.com/savannah/savannah/" - "ftp://mirror.easyname.at/nongnu/" - "ftp://mirror2.klaus-uwe.me/nongnu/" - "ftp://mirror.csclub.uwaterloo.ca/nongnu/" - "ftp://ftp.igh.cnrs.fr/pub/nongnu/" - "ftp://mirror.netcologne.de/savannah/" - "ftp://nongnu.uib.no/pub/nongnu/" - "ftp://mirrors.fe.up.pt/pub/nongnu/" - "ftp://ftp.twaren.net/Unix/NonGNU/" - "ftp://savannah-nongnu-org.ip-connect.vn.ua/mirror/savannah.nongnu.org/" - "ftp://ftp.mirrorservice.org/sites/download.savannah.gnu.org/releases/" + # MySQL + mysql = [ + "https://cdn.mysql.com/Downloads/" ]; - samba = [ - "https://www.samba.org/ftp/" - "http://www.samba.org/ftp/" + # Maven Central + maven = [ + "https://repo1.maven.org/maven2/" ]; - # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html . - bitlbee = [ - "https://get.bitlbee.org/" - "https://ftp.snt.utwente.nl/pub/software/bitlbee/" - "http://bitlbee.intergenia.de/" + # Mozilla projects + mozilla = [ + "https://download.cdn.mozilla.net/pub/mozilla.org/" + "https://archive.mozilla.org/pub/" ]; - # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php - imagemagick = [ - "https://www.imagemagick.org/download/" - "https://mirror.checkdomain.de/imagemagick/" - "https://ftp.nluug.nl/ImageMagick/" - "https://ftp.sunet.se/mirror/imagemagick.org/ftp/" - "ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors - ]; - - # CPAN mirrors. - cpan = [ - "https://cpan.metacpan.org/" - "https://cpan.perl.org/" - "https://mirrors.kernel.org/CPAN/" - "https://backpan.perl.org/" # for old releases - ]; - - # CentOS. - centos = [ - # For old releases - "https://vault.centos.org/" - "https://archive.kernel.org/centos-vault/" - "https://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/" - "https://mirrors.aliyun.com/centos-vault/" - "https://mirror.chpc.utah.edu/pub/vault.centos.org/" - "https://mirror.math.princeton.edu/pub/centos-vault/" - "https://mirrors.tripadvisor.com/centos-vault/" - "http://mirror.centos.org/centos/" - ]; - - # Debian. - debian = [ - "https://httpredir.debian.org/debian/" - "https://ftp.debian.org/debian/" - "https://mirrors.edge.kernel.org/debian/" - "ftp://ftp.de.debian.org/debian/" - "ftp://ftp.fr.debian.org/debian/" - "ftp://ftp.nl.debian.org/debian/" - "ftp://ftp.ru.debian.org/debian/" - "http://archive.debian.org/debian-archive/debian/" - "ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/" - ]; - - # Ubuntu. - ubuntu = [ - "https://nl.archive.ubuntu.com/ubuntu/" - "https://old-releases.ubuntu.com/ubuntu/" - "https://mirrors.edge.kernel.org/ubuntu/" - "http://de.archive.ubuntu.com/ubuntu/" - "http://archive.ubuntu.com/ubuntu/" - ]; - - # Fedora (please only add full mirrors that carry old Fedora distributions as well). - # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content). - fedora = [ - "https://archives.fedoraproject.org/pub/fedora/" - "https://fedora.osuosl.org/" - "https://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/" - "https://ftp.linux.cz/pub/linux/fedora/" - "https://archives.fedoraproject.org/pub/archive/fedora/" - "http://ftp.nluug.nl/pub/os/Linux/distr/fedora/" - "http://mirror.csclub.uwaterloo.ca/fedora/" - "http://mirror.1000mbps.com/fedora/" - ]; - - # openSUSE. - opensuse = [ - "https://opensuse.hro.nl/opensuse/distribution/" - "https://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/" - "https://ftp.opensuse.org/pub/opensuse/distribution/" - "https://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/" - "https://mirrors.edge.kernel.org/opensuse/distribution/" - "http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/" - ]; - - gnome = [ - # This one redirects to some mirror closeby, so it should be all you need. - "https://download.gnome.org/" - - "https://fr2.rpmfind.net/linux/gnome.org/" - "https://ftp.acc.umu.se/pub/GNOME/" - "https://ftp.belnet.be/mirror/ftp.gnome.org/" - "ftp://ftp.cse.buffalo.edu/pub/Gnome/" - "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/" - ]; - - xfce = [ - "https://archive.xfce.org/" - "https://mirror.netcologne.de/xfce/" - "https://archive.be.xfce.org/xfce/" - "https://archive.al-us.xfce.org/" - "http://archive.se.xfce.org/xfce/" - "http://mirror.perldude.de/archive.xfce.org/" - "http://archive.be2.xfce.org/" - "http://ftp.udc.es/xfce/" - ]; - - # X.org. - xorg = [ - "https://xorg.freedesktop.org/releases/" - "https://ftp.x.org/archive/" - ]; - - apache = [ - "https://www-eu.apache.org/dist/" - "https://ftp.wayne.edu/apache/" - "https://www.apache.org/dist/" - "https://archive.apache.org/dist/" # fallback for old releases - "https://apache.cs.uu.nl/" - "https://apache.cs.utah.edu/" - "http://ftp.tudelft.nl/apache/" - "ftp://ftp.funet.fi/pub/mirrors/apache.org/" + # OSDN (formerly SourceForge.jp) + osdn = [ + "https://osdn.dl.osdn.jp/" + "https://osdn.mirror.constant.com/" + "https://mirrors.gigenet.com/OSDN/" + "https://osdn.dl.sourceforge.jp/" + "https://jaist.dl.sourceforge.jp/" ]; + # PostgreSQL postgresql = [ "https://ftp.postgresql.org/pub/" ]; - metalab = [ - "ftp://ftp.gwdg.de/pub/linux/metalab/" - "ftp://ftp.metalab.unc.edu/pub/linux/" - ]; - - # Bioconductor mirrors (from https://bioconductor.org/about/mirrors/) - # The commented-out ones don't seem to allow direct package downloads; - # they serve error messages that result in hash mismatches instead. - bioc = [ - # http://bioc.ism.ac.jp/ - # http://bioc.openanalytics.eu/ - # http://bioconductor.fmrp.usp.br/ - # http://mirror.aarnet.edu.au/pub/bioconductor/ - # http://watson.nci.nih.gov/bioc_mirror/ - "https://bioconductor.statistik.tu-dortmund.de/packages/" - "https://mirrors.ustc.edu.cn/bioc/" - "http://bioconductor.jp/packages/" - ]; - - # Hackage mirrors - hackage = [ - "https://hackage.haskell.org/package/" - ]; - # Roy marples mirrors roy = [ "https://roy.marples.name/downloads/" @@ -329,25 +213,114 @@ "http://ftp.ntua.gr/pub/sagemath/spkg/upstream/" ]; - # MySQL mirrors - mysql = [ - "https://cdn.mysql.com/Downloads/" + # SAMBA + samba = [ + "https://www.samba.org/ftp/" + "http://www.samba.org/ftp/" ]; - # OpenBSD mirrors - openbsd = [ - "https://ftp.openbsd.org/pub/OpenBSD/" - "ftp://ftp.nluug.nl/pub/OpenBSD/" - "ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/" + # GNU Savannah + savannah = [ + # Mirrors from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html + "https://mirror.easyname.at/nongnu/" + "https://savannah.c3sl.ufpr.br/" + "https://mirror.csclub.uwaterloo.ca/nongnu/" + "https://mirror.cedia.org.ec/nongnu/" + "https://ftp.igh.cnrs.fr/pub/nongnu/" + "https://mirror6.layerjet.com/nongnu" + "https://mirror.netcologne.de/savannah/" + "https://ftp.cc.uoc.gr/mirrors/nongnu.org/" + "https://nongnu.uib.no/" + "https://ftp.acc.umu.se/mirror/gnu.org/savannah/" + "http://mirror2.klaus-uwe.me/nongnu/" + "http://mirrors.fe.up.pt/pub/nongnu/" + "http://ftp.twaren.net/Unix/NonGNU/" + "http://savannah-nongnu-org.ip-connect.vn.ua/" + "http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/" + "http://gnu.mirrors.pair.com/savannah/savannah/" + "ftp://mirror.easyname.at/nongnu/" + "ftp://mirror2.klaus-uwe.me/nongnu/" + "ftp://mirror.csclub.uwaterloo.ca/nongnu/" + "ftp://ftp.igh.cnrs.fr/pub/nongnu/" + "ftp://mirror.netcologne.de/savannah/" + "ftp://nongnu.uib.no/pub/nongnu/" + "ftp://mirrors.fe.up.pt/pub/nongnu/" + "ftp://ftp.twaren.net/Unix/NonGNU/" + "ftp://savannah-nongnu-org.ip-connect.vn.ua/mirror/savannah.nongnu.org/" + "ftp://ftp.mirrorservice.org/sites/download.savannah.gnu.org/releases/" ]; - # Steam Runtime mirrors + # SourceForge + sourceforge = [ + "https://downloads.sourceforge.net/" + "https://prdownloads.sourceforge.net/" + "https://netcologne.dl.sourceforge.net/sourceforge/" + "https://versaweb.dl.sourceforge.net/sourceforge/" + "https://freefr.dl.sourceforge.net/sourceforge/" + "https://osdn.dl.sourceforge.net/sourceforge/" + "https://kent.dl.sourceforge.net/sourceforge/" + ]; + + # Steam Runtime steamrt = [ "https://repo.steampowered.com/steamrt/" "https://public.abbradar.moe/steamrt/" ]; - # Python PyPI mirrors + # TCSH shell + tcsh = [ + "https://astron.com/pub/tcsh/" + "https://astron.com/pub/tcsh/old/" + "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/" + "http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/old/" + "ftp://ftp.astron.com/pub/tcsh/" + "ftp://ftp.astron.com/pub/tcsh/old/" + "ftp://ftp.funet.fi/pub/unix/shells/tcsh/" + "ftp://ftp.funet.fi/pub/unix/shells/tcsh/old/" + ]; + + # XFCE + xfce = [ + "https://archive.xfce.org/" + "https://mirror.netcologne.de/xfce/" + "https://archive.be.xfce.org/xfce/" + "https://archive.al-us.xfce.org/" + "http://archive.se.xfce.org/xfce/" + "http://mirror.perldude.de/archive.xfce.org/" + "http://archive.be2.xfce.org/" + "http://ftp.udc.es/xfce/" + ]; + + # X.org + xorg = [ + "https://xorg.freedesktop.org/releases/" + "https://ftp.x.org/archive/" + ]; + + ### Programming languages' package repos + + # Perl CPAN + cpan = [ + "https://cpan.metacpan.org/" + "https://cpan.perl.org/" + "https://mirrors.kernel.org/CPAN/" + "https://backpan.perl.org/" # for old releases + ]; + + # Haskell Hackage + hackage = [ + "https://hackage.haskell.org/package/" + ]; + + # Lua Rocks + luarocks = [ + "https://luarocks.org/" + "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/" + "https://luafr.org/moonrocks/" + "http://luarocks.logiceditor.com/rocks/" + ]; + + # Python PyPI pypi = [ "https://files.pythonhosted.org/packages/source/" # pypi.io is a more semantic link, but atm it’s referencing @@ -355,27 +328,85 @@ "https://pypi.io/packages/source/" ]; - # Python Test-PyPI mirror + # Python Test-PyPI testpypi = [ "https://test.pypi.io/packages/source/" ]; - # Mozilla projects. - mozilla = [ - "https://download.cdn.mozilla.net/pub/mozilla.org/" - "https://archive.mozilla.org/pub/" + ### Linux distros + + # CentOS + centos = [ + # For old releases + "https://vault.centos.org/" + "https://archive.kernel.org/centos-vault/" + "https://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/" + "https://mirrors.aliyun.com/centos-vault/" + "https://mirror.chpc.utah.edu/pub/vault.centos.org/" + "https://mirror.math.princeton.edu/pub/centos-vault/" + "https://mirrors.tripadvisor.com/centos-vault/" + "http://mirror.centos.org/centos/" ]; - # Maven Central - maven = [ - "https://repo1.maven.org/maven2/" + # Debian + debian = [ + "https://httpredir.debian.org/debian/" + "https://ftp.debian.org/debian/" + "https://mirrors.edge.kernel.org/debian/" + "ftp://ftp.de.debian.org/debian/" + "ftp://ftp.fr.debian.org/debian/" + "ftp://ftp.nl.debian.org/debian/" + "ftp://ftp.ru.debian.org/debian/" + "http://archive.debian.org/debian-archive/debian/" + "ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/" ]; - # Alsa Project - alsa = [ - "https://www.alsa-project.org/files/pub/" - "ftp://ftp.alsa-project.org/pub/" - "http://alsa.cybermirror.org/" - "http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/" + # Fedora + # Please add only full mirrors that carry old Fedora distributions as well + # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content) + fedora = [ + "https://archives.fedoraproject.org/pub/fedora/" + "https://fedora.osuosl.org/" + "https://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/" + "https://ftp.linux.cz/pub/linux/fedora/" + "https://archives.fedoraproject.org/pub/archive/fedora/" + "http://ftp.nluug.nl/pub/os/Linux/distr/fedora/" + "http://mirror.csclub.uwaterloo.ca/fedora/" + "http://mirror.1000mbps.com/fedora/" + ]; + + # Gentoo + gentoo = [ + "https://ftp.snt.utwente.nl/pub/os/linux/gentoo/" + "https://distfiles.gentoo.org/" + "https://mirrors.kernel.org/gentoo/" + ]; + + # openSUSE + opensuse = [ + "https://opensuse.hro.nl/opensuse/distribution/" + "https://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/" + "https://ftp.opensuse.org/pub/opensuse/distribution/" + "https://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/" + "https://mirrors.edge.kernel.org/opensuse/distribution/" + "http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/" + ]; + + # Ubuntu + ubuntu = [ + "https://nl.archive.ubuntu.com/ubuntu/" + "https://old-releases.ubuntu.com/ubuntu/" + "https://mirrors.edge.kernel.org/ubuntu/" + "http://de.archive.ubuntu.com/ubuntu/" + "http://archive.ubuntu.com/ubuntu/" + ]; + + # ... and other OSes in general + + # OpenBSD + openbsd = [ + "https://ftp.openbsd.org/pub/OpenBSD/" + "ftp://ftp.nluug.nl/pub/OpenBSD/" + "ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/" ]; } diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index af38537737eb..a3f22de58c71 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -13,6 +13,7 @@ , urls ? [] , extraPostFetch ? "" , name ? "source" +, nativeBuildInputs ? [ ] , # Allows to set the extension for the intermediate downloaded # file. This can be used as a hint for the unpackCmdHooks to select # an appropriate unpacking tool. @@ -31,6 +32,8 @@ in { downloadToTemp = true; + nativeBuildInputs = [ unzip ] ++ nativeBuildInputs; + postFetch = '' unpackDir="$TMPDIR/unpack" @@ -64,7 +67,4 @@ in { + '' chmod 755 "$out" ''; -} // removeAttrs args [ "stripRoot" "extraPostFetch" "extension" ])).overrideAttrs (x: { - # Hackety-hack: we actually need unzip hooks, too - nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ]; -}) +} // removeAttrs args [ "stripRoot" "extraPostFetch" "extension" "nativeBuildInputs" ])) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix new file mode 100644 index 000000000000..691b2c5c6e60 --- /dev/null +++ b/pkgs/build-support/flutter/default.nix @@ -0,0 +1,284 @@ +{ flutter +, lib +, llvmPackages_13 +, cmake +, ninja +, pkg-config +, wrapGAppsHook +, autoPatchelfHook +, util-linux +, libselinux +, libsepol +, libthai +, libdatrie +, libxkbcommon +, at-spi2-core +, libsecret +, jsoncpp +, xorg +, dbus +, gtk3 +, glib +, pcre +, libepoxy +, stdenvNoCC +, cacert +, git +, dart +, nukeReferences +, targetPlatform +, bash +, curl +, unzip +, which +, xz +}: + +# absolutely no mac support for now + +args: +let + pl = n: "##FLUTTER_${n}_PLACEHOLDER_MARKER##"; + placeholder_deps = pl "DEPS"; + placeholder_flutter = pl "FLUTTER"; + fetchAttrs = [ "src" "sourceRoot" "setSourceRoot" "unpackPhase" "patches" ]; + getAttrsOrNull = names: attrs: lib.genAttrs names (name: if attrs ? ${name} then attrs.${name} else null); + flutterDeps = [ + # flutter deps + flutter.unwrapped + bash + curl + flutter.dart + git + unzip + which + xz + ]; + self = +(self: llvmPackages_13.stdenv.mkDerivation (args // { + deps = stdenvNoCC.mkDerivation (lib.recursiveUpdate (getAttrsOrNull fetchAttrs args) { + name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${targetPlatform.system}.tar.gz"; + + nativeBuildInputs = flutterDeps ++ [ + nukeReferences + ]; + + # avoid pub phase + dontBuild = true; + + installPhase = '' + . ${../fetchgit/deterministic-git} + + TMP=$(mktemp -d) + + export HOME="$TMP" + export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} + export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 + + flutter config --no-analytics &>/dev/null # mute first-run + flutter config --enable-linux-desktop + flutter packages get + flutter build linux || true # so it downloads tools + ${lib.optionalString (args ? flutterExtraFetchCommands) args.flutterExtraFetchCommands} + + RES="$TMP" + + mkdir -p "$RES/f" + + # so we can use lock, diff yaml + cp "pubspec.yaml" "$RES" + cp "pubspec.lock" "$RES" + mv .dart_tool .flutter-plugins .flutter-plugins-dependencies .packages "$RES/f" + + # replace paths with placeholders + find "$RES" -type f -exec sed -i \ + -e s,$TMP,${placeholder_deps},g \ + -e s,${flutter.unwrapped},${placeholder_flutter},g \ + {} + + + remove_line_matching() { + replace_line_matching "$1" "$2" "" + } + + replace_line_matching() { + sed "s|.*$2.*|$3|g" -r -i "$1" + } + + # nuke nondeterminism + + # clientId is random + remove_line_matching "$RES/.flutter" clientId + + # deterministic git repos + find "$RES" -iname .git -type d | while read -r repoGit; do + make_deterministic_repo "$(dirname "$repoGit")" + done + + # dart _fetchedAt, etc + DART_DATE=$(date --date="@$SOURCE_DATE_EPOCH" -In | sed "s|,|.|g" | sed "s|+.*||g") + find "$RES/.pub-cache" -iname "*.json" -exec sed -r 's|.*_fetchedAt.*| "_fetchedAt": "'"$DART_DATE"'",|g' -i {} + + replace_line_matching "$RES/f/.dart_tool/package_config.json" '"generated"' '"generated": "'"$DART_DATE"'",' + replace_line_matching "$RES/f/.flutter-plugins-dependencies" '"date_created"' '"date_created": "'"$DART_DATE"'",' + remove_line_matching "$RES/f/.packages" "Generated by pub" + + # nuke refs + find "$RES" -type f -exec nuke-refs {} + + + # Build a reproducible tar, per instructions at https://reproducible-builds.org/docs/archives/ + tar --owner=0 --group=0 --numeric-owner --format=gnu \ + --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ + -czf "$out" -C "$RES" . + ''; + + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" "NIX_GIT_SSL_CAINFO" "SOCKS_SERVER" + ]; + + # unnecesarry + dontFixup = true; + + outputHashAlgo = if self ? vendorHash then null else "sha256"; + # outputHashMode = "recursive"; + outputHash = if self ? vendorHash then + self.vendorHash + else if self ? vendorSha256 then + self.vendorSha256 + else + lib.fakeSha256; + + }); + + nativeBuildInputs = flutterDeps ++ [ + # flutter dev tools + cmake + ninja + pkg-config + wrapGAppsHook + # flutter likes dynamic linking + autoPatchelfHook + ] ++ lib.optionals (args ? nativeBuildInputs) args.nativeBuildInputs; + + buildInputs = [ + # cmake deps + gtk3 + glib + pcre + util-linux + # also required by cmake, not sure if really needed or dep of all packages + libselinux + libsepol + libthai + libdatrie + xorg.libXdmcp + xorg.libXtst + libxkbcommon + dbus + at-spi2-core + libsecret + jsoncpp + # build deps + xorg.libX11 + # directly required by build + libepoxy + ] ++ lib.optionals (args ? buildInputs) args.buildInputs; + + # TODO: do we need this? + NIX_LDFLAGS = "-rpath ${lib.makeLibraryPath self.buildInputs}"; + NIX_CFLAGS_COMPILE = "-I${xorg.libX11}/include"; + LD_LIBRARY_PATH = lib.makeLibraryPath self.buildInputs; + + configurePhase = '' + runHook preConfigure + + # for some reason fluffychat build breaks without this - seems file gets overriden by some tool + cp pubspec.yaml pubspec-backup + + # we get this from $depsFolder so disabled for now, but we might need it again once deps are fetched properly + # flutter config --no-analytics >/dev/null 2>/dev/null # mute first-run + # flutter config --enable-linux-desktop + + # extract deps + depsFolder=$(mktemp -d) + tar xzf "$deps" -C "$depsFolder" + + # after extracting update paths to point to real paths + find "$depsFolder" -type f -exec sed -i \ + -e s,${placeholder_deps},$depsFolder,g \ + -e s,${placeholder_flutter},${flutter.unwrapped},g \ + {} + + + # ensure we're using a lockfile for the right package version + if [ -e pubspec.lock ]; then + # FIXME: currently this is broken. in theory this should not break, but flutter has it's own way of doing things. + # diff -u pubspec.lock $depsFolder/pubspec.lock + true + else + cp -v "$depsFolder/pubspec.lock" . + fi + diff -u pubspec.yaml $depsFolder/pubspec.yaml + + mv -v $(find $depsFolder/f -type f) . + + # prepare + export HOME=$depsFolder + export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} + export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 + + # binaries need to be patched + autoPatchelf -- "$depsFolder" + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + # for some reason fluffychat build breaks without this - seems file gets overriden by some tool + mv pubspec-backup pubspec.yaml + mkdir -p build/flutter_assets/fonts + + flutter packages get --offline -v + flutter build linux --release -v + + 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 + + # this confuses autopatchelf hook otherwise + rm -rf "$depsFolder" + + # 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 + ''; +})) self; +in + self diff --git a/pkgs/build-support/go/garble.nix b/pkgs/build-support/go/garble.nix index 62fd931643d2..c9bcf2cec153 100644 --- a/pkgs/build-support/go/garble.nix +++ b/pkgs/build-support/go/garble.nix @@ -2,25 +2,25 @@ , buildGoModule , fetchFromGitHub , lib +, git }: buildGoModule rec { pname = "garble"; - version = "20200107"; + version = "0.5.1"; src = fetchFromGitHub { owner = "burrowers"; repo = pname; - rev = "835f4aadf321521acf06aac4d5068473dc4b2ac1"; - sha256 = "sha256-NodsVHRll2YZoxrhmniJvelQOStG82u3kJyc0t8OXD8="; + rev = "v${version}"; + sha256 = "sha256-F8O/33o//yGnum9sZo1dzcvf3ifRalva6SDC36iPbDA=="; }; - vendorSha256 = "sha256-x2fk2QmZDK2yjyfYdK7x+sQjvt7tuggmm8ieVjsNKek="; + vendorSha256 = "sha256-iNH/iBEOTkIhVlDGfI66ZYyVjyH6WrLbUSMyONPjUc4="; - preBuild = '' - # https://github.com/burrowers/garble/issues/184 - substituteInPlace testdata/scripts/tiny.txt \ - --replace "{6,8}" "{4,8}" - '' + lib.optionalString (!stdenv.isx86_64) '' + # Used for some of the tests. + checkInputs = [git]; + + preBuild = lib.optionalString (!stdenv.isx86_64) '' # The test assumex amd64 assembly rm testdata/scripts/asm.txt ''; diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 70884741af3a..0a87d643546a 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -31,7 +31,7 @@ storePaths=$(perl $pathsFromGraph closure-*) # Paths in cpio archives *must* be relative, otherwise the kernel # won't unpack 'em. -(cd root && cp -prd --parents $storePaths .) +(cd root && cp -prP --parents $storePaths .) # Put the closure in a gzipped cpio archive. diff --git a/pkgs/build-support/libredirect/default.nix b/pkgs/build-support/libredirect/default.nix index 9ed00c8a8f63..8f7df3386d14 100644 --- a/pkgs/build-support/libredirect/default.nix +++ b/pkgs/build-support/libredirect/default.nix @@ -57,7 +57,9 @@ else stdenv.mkDerivation rec { ''} if [ -n "$doInstallCheck" ]; then - $CC -Wall -std=c99 -O3 test.c -o test + $CC -Wall -std=c99 \ + ${lib.optionalString (!stdenv.isDarwin) "-D_GNU_SOURCE"} \ + -O3 test.c -o test fi runHook postBuild @@ -97,7 +99,7 @@ else stdenv.mkDerivation rec { installCheckPhase = '' ( source "$hook/nix-support/setup-hook" - NIX_REDIRECTS="/foo/bar/test=${coreutils}/bin/true" ./test + NIX_REDIRECTS="/foo/bar/test=${coreutils}/bin/true:/bar/baz=$(mktemp -d)" ./test ) ''; diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c index 0dc7feb382c3..1222d2ee75c6 100644 --- a/pkgs/build-support/libredirect/libredirect.c +++ b/pkgs/build-support/libredirect/libredirect.c @@ -84,6 +84,13 @@ static const char * rewrite(const char * path, char * buf) return path; } +static char * rewrite_non_const(char * path, char * buf) +{ + // as long as the argument `path` is non-const, we can consider discarding + // the const qualifier of the return value to be safe. + return (char *)rewrite(path, buf); +} + static int open_needs_mode(int flags) { #ifdef O_TMPFILE @@ -354,3 +361,117 @@ WRAPPER(int, mkdirat)(int dirfd, const char *path, mode_t mode) return mkdirat_real(dirfd, rewrite(path, buf), mode); } WRAPPER_DEF(mkdirat) + +WRAPPER(int, unlink)(const char *path) +{ + int (*unlink_real) (const char *path) = LOOKUP_REAL(unlink); + char buf[PATH_MAX]; + return unlink_real(rewrite(path, buf)); +} +WRAPPER_DEF(unlink) + +WRAPPER(int, unlinkat)(int dirfd, const char *path, int flags) +{ + int (*unlinkat_real) (int dirfd, const char *path, int flags) = LOOKUP_REAL(unlinkat); + char buf[PATH_MAX]; + return unlinkat_real(dirfd, rewrite(path, buf), flags); +} +WRAPPER_DEF(unlinkat) + +WRAPPER(int, rmdir)(const char *path) +{ + int (*rmdir_real) (const char *path) = LOOKUP_REAL(rmdir); + char buf[PATH_MAX]; + return rmdir_real(rewrite(path, buf)); +} +WRAPPER_DEF(rmdir) + +static void copy_temp_wildcard(char * dest, char * src, int suffixlen) { + int dest_len = strnlen(dest, PATH_MAX); + int src_len = strnlen(src, PATH_MAX); + memcpy(dest + dest_len - (6 + suffixlen), src + src_len - (6 + suffixlen), 6); +} + +WRAPPER(int, mkstemp)(char *template) +{ + int (*mkstemp_real) (char *template) = LOOKUP_REAL(mkstemp); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + int retval = mkstemp_real(rewritten); + if (retval >= 0 && rewritten != template) { + copy_temp_wildcard(template, rewritten, 0); + } + return retval; +} +WRAPPER_DEF(mkstemp) + +WRAPPER(int, mkostemp)(char *template, int flags) +{ + int (*mkostemp_real) (char *template, int flags) = LOOKUP_REAL(mkostemp); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + int retval = mkostemp_real(rewritten, flags); + if (retval >= 0 && rewritten != template) { + copy_temp_wildcard(template, rewritten, 0); + } + return retval; +} +WRAPPER_DEF(mkostemp) + +WRAPPER(int, mkstemps)(char *template, int suffixlen) +{ + int (*mkstemps_real) (char *template, int suffixlen) = LOOKUP_REAL(mkstemps); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + int retval = mkstemps_real(rewritten, suffixlen); + if (retval >= 0 && rewritten != template) { + copy_temp_wildcard(template, rewritten, suffixlen); + } + return retval; +} +WRAPPER_DEF(mkstemps) + +WRAPPER(int, mkostemps)(char *template, int suffixlen, int flags) +{ + int (*mkostemps_real) (char *template, int suffixlen, int flags) = LOOKUP_REAL(mkostemps); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + int retval = mkostemps_real(rewritten, suffixlen, flags); + if (retval >= 0 && rewritten != template) { + copy_temp_wildcard(template, rewritten, suffixlen); + } + return retval; +} +WRAPPER_DEF(mkostemps) + +WRAPPER(char *, mkdtemp)(char *template) +{ + char * (*mkdtemp_real) (char *template) = LOOKUP_REAL(mkdtemp); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + char * retval = mkdtemp_real(rewritten); + if (retval == NULL) { + return retval; + }; + if (rewritten != template) { + copy_temp_wildcard(template, rewritten, 0); + } + return template; +} +WRAPPER_DEF(mkdtemp) + +WRAPPER(char *, mktemp)(char *template) +{ + char * (*mktemp_real) (char *template) = LOOKUP_REAL(mktemp); + char buf[PATH_MAX]; + char * rewritten = rewrite_non_const(template, buf); + char * retval = mktemp_real(rewritten); + if (retval == NULL) { + return retval; + }; + if (rewritten != template) { + copy_temp_wildcard(template, rewritten, 0); + } + return template; +} +WRAPPER_DEF(mktemp) diff --git a/pkgs/build-support/libredirect/test.c b/pkgs/build-support/libredirect/test.c index 853f26bb5209..144e6d3d66dd 100644 --- a/pkgs/build-support/libredirect/test.c +++ b/pkgs/build-support/libredirect/test.c @@ -1,14 +1,18 @@ #include +#include #include +#include #include #include #include +#include #include #include #include #include +#define TESTDIR "/bar/baz" #define TESTPATH "/foo/bar/test" #define SUBTEST "./test sub" @@ -41,11 +45,25 @@ void test_subprocess(void) { assert(system(SUBTEST) == 0); } +void assert_mktemp_path( + const char * orig_prefix, + const char * orig_suffix, + const char * updated +) { + // prefix unchanged + assert(strncmp(updated, orig_prefix, strlen(orig_prefix)) == 0); + // wildcards replaced + assert(strcmp(updated + strlen(orig_prefix), "XXXXXX") != 0); + // suffix unchanged + assert(strcmp(updated + strlen(orig_prefix) + 6, orig_suffix) == 0); +} + int main(int argc, char *argv[]) { FILE *testfp; int testfd; struct stat testsb; + char buf[PATH_MAX]; testfp = fopen(TESTPATH, "r"); assert(testfp != NULL); @@ -59,6 +77,54 @@ int main(int argc, char *argv[]) assert(stat(TESTPATH, &testsb) != -1); + assert(mkdir(TESTDIR "/dir-mkdir", 0777) == 0); + assert(unlink(TESTDIR "/dir-mkdir") == -1); // it's a directory! +#ifndef __APPLE__ + assert(errno == EISDIR); +#endif + assert(rmdir(TESTDIR "/dir-mkdir") == 0); + assert(unlink(TESTDIR "/dir-mkdir") == -1); + assert(errno == ENOENT); + + assert(mkdirat(123, TESTDIR "/dir-mkdirat", 0777) == 0); + assert(unlinkat(123, TESTDIR "/dir-mkdirat", 0) == -1); // it's a directory! +#ifndef __APPLE__ + assert(errno == EISDIR); +#endif + assert(unlinkat(123, TESTDIR "/dir-mkdirat", AT_REMOVEDIR) == 0); + + strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX); + testfd = mkstemp(buf); + assert(testfd > 0); + assert_mktemp_path(TESTDIR "/temp", "", buf); + close(testfd); + + strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX); + testfd = mkostemp(buf, 0); + assert(testfd > 0); + assert_mktemp_path(TESTDIR "/temp", "", buf); + close(testfd); + + strncpy(buf, TESTDIR "/tempXXXXXX.test", PATH_MAX); + testfd = mkstemps(buf, strlen(".test")); + assert(testfd > 0); + assert_mktemp_path(TESTDIR "/temp", ".test", buf); + close(testfd); + + strncpy(buf, TESTDIR "/tempXXXXXX.test", PATH_MAX); + testfd = mkostemps(buf, strlen(".test"), 0); + assert(testfd > 0); + assert_mktemp_path(TESTDIR "/temp", ".test", buf); + close(testfd); + + strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX); + assert(mkdtemp(buf) == buf); + assert_mktemp_path(TESTDIR "/temp", "", buf); + + strncpy(buf, TESTDIR "/tempXXXXXX", PATH_MAX); + assert(mktemp(buf) == buf); + assert_mktemp_path(TESTDIR "/temp", "", buf); + test_spawn(); test_system(); diff --git a/pkgs/build-support/make-darwin-bundle/default.nix b/pkgs/build-support/make-darwin-bundle/default.nix new file mode 100644 index 000000000000..b8f58882fff3 --- /dev/null +++ b/pkgs/build-support/make-darwin-bundle/default.nix @@ -0,0 +1,26 @@ +# given a package with an executable and an icon, make a darwin bundle for +# it. This package should be used when generating launchers for native Darwin +# applications. If the package conatins a .desktop file use +# `desktopToDarwinLauncher` instead. + +{ lib, writeShellScript, writeDarwinBundle }: + +{ name # The name of the Application file. +, exec # Executable file. +, icon ? "" # Optional icon file. +}: + +writeShellScript "make-darwin-bundle-${name}" ('' + function makeDarwinBundlePhase() { + mkdir -p "$out/Applications/${name}.app/Contents/MacOS" + mkdir -p "$out/Applications/${name}.app/Contents/Resources" + + if [ -n "${icon}" ]; then + ln -s "${icon}" "$out/Applications/${name}.app/Contents/Resources" + fi + + ${writeDarwinBundle}/bin/write-darwin-bundle "$out" "${name}" "${exec}" + } + + preDistPhases+=" makeDarwinBundlePhase" +'') diff --git a/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix b/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix new file mode 100644 index 000000000000..fde977c3636b --- /dev/null +++ b/pkgs/build-support/make-darwin-bundle/write-darwin-bundle.nix @@ -0,0 +1,39 @@ +{ writeScriptBin, lib, ... }: + +let + pListText = lib.generators.toPlist { } { + CFBundleDevelopmentRegion = "English"; + CFBundleExecutable = "$name"; + CFBundleIconFile = "$icon"; + CFBundleIconFiles = [ "$icon" ]; + CFBundleIdentifier = "org.nixos.$name"; + CFBundleInfoDictionaryVersion = "6.0"; + CFBundleName = "$name"; + CFBundlePackageType = "APPL"; + CFBundleSignature = "???"; + }; +in writeScriptBin "write-darwin-bundle" '' + shopt -s nullglob + + readonly prefix=$1 + readonly name=$2 + readonly exec=$3 + readonly icon=$4.icns + readonly squircle=''${5:-1} + readonly plist=$prefix/Applications/$name.app/Contents/Info.plist + + cat > "$plist" <|d' -i "$plist" + fi + + cat > "$prefix/Applications/$name.app/Contents/MacOS/$name" <.*,\1,p') - -# print available versions -for tag in $tags1; do - tags2=$(curl -sS "$archive/$tag/") - tags2=$(echo "$tags2" | sed -rne "s,^.*,\\1,p") - echo "$tags2" -done diff --git a/pkgs/common-updater/scripts/list-archive-two-levels-versions b/pkgs/common-updater/scripts/list-archive-two-levels-versions new file mode 100755 index 000000000000..4263a9de3ca3 --- /dev/null +++ b/pkgs/common-updater/scripts/list-archive-two-levels-versions @@ -0,0 +1,54 @@ +#!/usr/bin/env bash + +# lists all available versions listed for a package in a site (http) + +archive="" # archive url +pname="" # package name +file="" # file for writing debugging information + +while (( $# > 0 )); do + flag="$1" + shift 1 + case "$flag" in + --url=*) + archive="${flag#*=}" + ;; + --pname=*) + pname="${flag#*=}" + ;; + --file=*) + file="${flag#*=}" + ;; + *) + echo "$0: unknown option ‘${flag}’" + exit 1 + ;; + esac +done + +# by default set url to the base dir of the first url in src.urls +if [[ -z "$archive" ]]; then + archive="$(nix-instantiate $systemArg --eval -E \ + "with import ./. {}; dirOf (dirOf (lib.head $UPDATE_NIX_ATTR_PATH.src.urls))" \ + | tr -d '"')" +fi + +if [[ -z "$pname" ]]; then + pname="$UPDATE_NIX_ATTR_PATH" +fi + +# print a debugging message +if [[ -n "$file" ]]; then + echo "# Listing versions for '$pname' at $archive" >> $file +fi + +# list all major-minor versions from archive +tags1=$(curl -sS "$archive/") +tags1=$(echo "$tags1" | sed -rne 's,^.*,\1,p') + +# print available versions +for tag in $tags1; do + tags2=$(curl -sS "$archive/$tag/") + tags2=$(echo "$tags2" | sed -rne "s,^.*,\\1,p") + echo "$tags2" +done diff --git a/pkgs/common-updater/scripts/list-git-tags b/pkgs/common-updater/scripts/list-git-tags index d137552cdd66..176e647eb2ea 100755 --- a/pkgs/common-updater/scripts/list-git-tags +++ b/pkgs/common-updater/scripts/list-git-tags @@ -2,29 +2,50 @@ # lists all available tags from a git repository -scriptName=list-git-tags # do not use the .wrapped name +echo "# pname=$UPDATE_NIX_ATTR_PATH" > /tmp/test.txt -usage() { - echo "Usage: $scriptName [ []]" -} +url="" # git repository url +pname="" # package name +file="" # file for writing debugging information -repo="$1" # git repository url -pname="$2" # package name -file="$3" # file for writing debugging information +while (( $# > 0 )); do + flag="$1" + shift 1 + case "$flag" in + --url=*) + url="${flag#*=}" + ;; + --pname=*) + pname="${flag#*=}" + ;; + --file=*) + file="${flag#*=}" + ;; + *) + echo "$0: unknown option ‘${flag}’" + exit 1 + ;; + esac +done -if [ -z "$repo" ]; then - echo "$scriptName: Missing git repository url" - usage - exit 1 +# By default we set url to src.url or src.meta.homepage +if [[ -z "$url" ]]; then + url="$(nix-instantiate $systemArg --eval -E \ + "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.url or $UPDATE_NIX_ATTR_PATH.src.meta.homepage" \ + | tr -d '"')" +fi + +if [[ -z "$pname" ]]; then + pname="$UPDATE_NIX_ATTR_PATH" fi # print a debugging message -if [ -n "$file" ]; then - echo "# Listing tags for $pname at $repo" >> $file +if [[ -n "$file" ]]; then + echo "# Listing tags for '$pname' at $url" >> $file fi # list all tags from the remote repository -tags=$(git ls-remote --tags --refs "$repo") +tags=$(git ls-remote --tags --refs "$url") # keep only the version part of the tag tags=$(echo "$tags" | cut --delimiter=/ --field=3) diff --git a/pkgs/common-updater/unstable-updater.nix b/pkgs/common-updater/unstable-updater.nix index 01f8ae2533e6..14f25a91601c 100644 --- a/pkgs/common-updater/unstable-updater.nix +++ b/pkgs/common-updater/unstable-updater.nix @@ -10,38 +10,103 @@ # commit. { url ? null # The git url, if empty it will be set to src.url , branch ? null +, stableVersion ? false # Use version format according to RFC 107 (i.e. LAST_TAG+date=YYYY-MM-DD) +, tagPrefix ? "" # strip this prefix from a tag name when using stable version }: let updateScript = writeShellScript "unstable-update-script.sh" '' set -ex - url="$1" + url="" + branch="" + use_stable_version="" + tag_prefix="" + + while (( $# > 0 )); do + flag="$1" + shift 1 + case "$flag" in + --url=*) + url="''${flag#*=}" + ;; + --branch=*) + branch="''${flag#*=}" + ;; + --use-stable-version) + use_stable_version=1 + ;; + --tag-prefix=*) + tag_prefix="''${flag#*=}" + ;; + *) + echo "$0: unknown option ‘''${flag}’" + exit 1 + ;; + esac + done # By default we set url to src.url if [[ -z "$url" ]]; then url="$(${nix}/bin/nix-instantiate $systemArg --eval -E \ - "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.url" \ + "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.url or $UPDATE_NIX_ATTR_PATH.src.meta.homepage" \ | tr -d '"')" fi # Get info about HEAD from a shallow git clone tmpdir="$(${coreutils}/bin/mktemp -d)" - ${git}/bin/git clone --bare --depth=1 \ - ${lib.optionalString (branch != null) "--branch ${branch}"} \ - "$url" "$tmpdir" + + cloneArgs=( + --bare + --depth=1 + ) + + if [[ -n "$branch" ]]; then + cloneArgs+=(--branch="$branch") + fi + + ${git}/bin/git clone "''${cloneArgs[@]}" "$url" "$tmpdir" + pushd "$tmpdir" commit_date="$(${git}/bin/git show -s --pretty='format:%cs')" commit_sha="$(${git}/bin/git show -s --pretty='format:%H')" + if [[ -z "$use_stable_version" ]]; then + new_version="unstable-$commit_date" + else + depth=100 + while (( $depth < 10000 )); do + last_tag="$(${git}/bin/git describe --tags --abbrev=0 2> /dev/null || true)" + if [[ -n "$last_tag" ]]; then + break + fi + ${git}/bin/git fetch --depth="$depth" --tags + depth=$(( $depth * 2 )) + done + if [[ -z "$last_tag" ]]; then + echo "Cound not found a tag within last 10000 commits" > /dev/stderr + exit 1 + fi + if [[ -n "$tag_prefix" ]]; then + last_tag="''${last_tag#$tag_prefix}" + fi + new_version="$last_tag+date=$commit_date" + fi popd - ${coreutils}/bin/rm -rf "$tmpdir" + # ${coreutils}/bin/rm -rf "$tmpdir" # update the nix expression ${common-updater-scripts}/bin/update-source-version \ "$UPDATE_NIX_ATTR_PATH" \ - "unstable-$commit_date" \ + "$new_version" \ --rev="$commit_sha" ''; -in [ updateScript url ] - +in [ + updateScript + "--url=${builtins.toString url}" +] ++ lib.optionals (branch != null) [ + "--branch=${branch}" +] ++ lib.optionals stableVersion [ + "--use-stable-version" + "--tag-prefix=${tagPrefix}" +] diff --git a/pkgs/data/documentation/execline-man-pages/default.nix b/pkgs/data/documentation/execline-man-pages/default.nix index ed4389cad6c9..1a9d9a87ab92 100644 --- a/pkgs/data/documentation/execline-man-pages/default.nix +++ b/pkgs/data/documentation/execline-man-pages/default.nix @@ -2,8 +2,8 @@ buildManPages { pname = "execline-man-pages"; - version = "2.8.1.0.3"; - sha256 = "1n7c75lmyrjzzcbwjl6fxhfs4k29qlr66r1q35799h942cn4li7v"; + version = "2.8.1.0.4"; + sha256 = "1cxi09dlzvjbilmzgmr3xvwvx0l3s1874k3gr85kbjnvp1c1r6cd"; description = "Port of the documentation for the execline suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; } diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index e8f671566d8d..db177006a3dd 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "41.1"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Ve499XfRcX/BUvwq64nQr3qeyoZsiXTGdfYL1jCIjEg="; + sha256 = "srJ9oEEAu90vTw5bw48tBW2V+jZWcgFj9kNqMWfV6QU="; }; nativeBuildInputs = [ diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 60a7e3f229f5..5b33714fc258 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux development manual pages"; homepage = "https://www.kernel.org/doc/man-pages/"; - repositories.git = "https://git.kernel.org/pub/scm/docs/man-pages/man-pages"; license = licenses.gpl2Plus; platforms = with platforms; unix; priority = 30; # if a package comes with its own man page, prefer it diff --git a/pkgs/data/documentation/s6-man-pages/default.nix b/pkgs/data/documentation/s6-man-pages/default.nix index db4d05a91b04..7d407bade416 100644 --- a/pkgs/data/documentation/s6-man-pages/default.nix +++ b/pkgs/data/documentation/s6-man-pages/default.nix @@ -2,7 +2,7 @@ buildManPages { pname = "s6-man-pages"; - version = "2.11.0.0.5"; + version = "2.11.0.1.1"; sha256 = "03gl0vvdaqfb5hs0dfdbs9djxiyq3abcx9vwgkfw22b1rm2fa0r6"; description = "Port of the documentation for the s6 supervision suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; diff --git a/pkgs/data/documentation/s6-networking-man-pages/default.nix b/pkgs/data/documentation/s6-networking-man-pages/default.nix index 769f34348b16..502aab98ca45 100644 --- a/pkgs/data/documentation/s6-networking-man-pages/default.nix +++ b/pkgs/data/documentation/s6-networking-man-pages/default.nix @@ -2,8 +2,8 @@ buildManPages { pname = "s6-networking-man-pages"; - version = "2.5.0.0.2"; - sha256 = "1ix8qrivp9prw0m401d7s9vkxhw16a4sxfhrs7abf9qqhs2zkd1r"; + version = "2.5.1.0.1"; + sha256 = "1h87s3wixsms8ys7gvm1s9d8pzn73q5j4sgybpi3gmr55d4cwra4"; description = "Port of the documentation for the s6-networking suite to mdoc"; maintainers = [ lib.maintainers.sternenseemann ]; } diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index a2f9f005eb93..c9ce9c2bf764 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -1,10 +1,11 @@ { stdenv, lib, fetchurl }: -stdenv.mkDerivation { - name = "std-man-pages-4.4.0"; +stdenv.mkDerivation rec { + pname = "std-man-pages"; + version = "4.4.0"; src = fetchurl { - url = "mirror://gcc/libstdc++/doxygen/libstdc++-man.4.4.0.tar.bz2"; + url = "mirror://gcc/libstdc++/doxygen/libstdc++-man.${version}.tar.bz2"; sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v"; }; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 8c806b87d4b2..de3d7638eb9b 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -9,8 +9,8 @@ mkDerivation rec { src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; - rev = "1ce0e2e446232e7647c5588c1f603f1dd88e0f67"; - sha256 = "0gj5qcm7ck8m5zfmiabay2f7wbxldmrkw8m3xi7v9i8y8hx0jkxr"; + rev = "763edca12ccd6c67e51f10891d1ced8b2510904f"; + sha256 = "sha256-1/wQXkRWvpRia8UDvvvmzHinPG8q2Tz9Uoeegej9uC8="; }; # we only need this if we are using a version that hasn't been released. We diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix index 39ef6e34aaae..d2ecda3a1118 100644 --- a/pkgs/data/fonts/agave/default.nix +++ b/pkgs/data/fonts/agave/default.nix @@ -1,20 +1,31 @@ -{ lib, fetchurl }: +{ lib, fetchurl, stdenv }: let pname = "agave"; - version = "35"; -in fetchurl { - name = "${pname}-${version}"; - url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf"; + version = "37"; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf + mkAg = name: hash: fetchurl { + url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-${name}.ttf"; + sha256 = hash; + name = "Agave-${name}.ttf"; + }; + # There are slashed variants, but with same name so only bundle the default versions for now: + fonts = [ + (mkAg "Regular" "sha256-vX1VhEgqy9rQ7hPmAgBGxKyIs2QSAYqZC/mL/2BIOrA=") + (mkAg "Bold" "sha256-Ax/l/RKyc03law0ThiLac/7HHV4+YxibKzcZnjZs6VI=") + ]; + +in stdenv.mkDerivation { + inherit pname version; + srcs = fonts; + sourceRoot = "."; + + dontUnpack = true; + + installPhase = '' + install -D $srcs -t $out/share/fonts/truetype/ ''; - sha256 = "10shwsl1illdafnc352j439lklrxksip1vlh4jc934cr9qf4c1fz"; - meta = with lib; { description = "truetype monospaced typeface designed for X environments"; homepage = "https://b.agaric.net/page/agave"; diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix index aaa380098a27..02ee29a382ed 100644 --- a/pkgs/data/fonts/andika/default.nix +++ b/pkgs/data/fonts/andika/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "andika-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-ukPFBLjHQbOosQ1h0ImVlz8HhNNMp0e41SjzUhQaZtc="; + sha256 = "sha256-J/Ad+fmCMOxLoo+691LE6Bgi/l3ovIfWScwwVWtqACI="; meta = with lib; { homepage = "https://software.sil.org/andika"; diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/data/fonts/behdad-fonts/default.nix index d5d0b2a3c1dd..be6ed005b166 100644 --- a/pkgs/data/fonts/behdad-fonts/default.nix +++ b/pkgs/data/fonts/behdad-fonts/default.nix @@ -20,6 +20,6 @@ in fetchFromGitHub { description = "A Persian/Arabic Open Source Font"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/borg-sans-mono/default.nix b/pkgs/data/fonts/borg-sans-mono/default.nix new file mode 100644 index 000000000000..57b0a23bf7bc --- /dev/null +++ b/pkgs/data/fonts/borg-sans-mono/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchzip }: + +let + pname = "borg-sans-mono"; + version = "0.2.0"; +in +fetchzip { + name = "${pname}-${version}"; + + # https://github.com/marnen/borg-sans-mono/issues/19 + url = "https://github.com/marnen/borg-sans-mono/files/107663/BorgSansMono.ttf.zip"; + sha256 = "1gz4ab0smw76ih5cs2l3n92c77nv7ld5zghq42avjsfhxrc2n5ri"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; + + meta = with lib; { + description = "Droid Sans Mono Slashed + Hasklig-style ligatures"; + homepage = "https://github.com/marnen/borg-sans-mono"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 011e88dc1d2e..49b4e6354ca4 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,15 +1,36 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, python3 +, gettext +, appstream-glib +, gnome +}: stdenv.mkDerivation rec { pname = "cantarell-fonts"; - version = "0.301"; + version = "0.303.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83"; + sha256 = "+UY6BlnGPlfjgf3XU88ZKSJTlcW0kTWYlCR2GDBTBBE="; }; - nativeBuildInputs = [ meson ninja gettext appstream-glib ]; + nativeBuildInputs = [ + meson + ninja + python3 + python3.pkgs.psautohint + python3.pkgs.cffsubr + python3.pkgs.statmake + python3.pkgs.ufo2ft + python3.pkgs.setuptools + python3.pkgs.ufoLib2 + gettext + appstream-glib + ]; # ad-hoc fix for https://github.com/NixOS/nixpkgs/issues/50855 # until we fix gettext's envHook @@ -19,7 +40,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1sczskw2kv3qy39i9mzw2lkl94a90bjgv5ln9acy5kh4gb2zmy7z"; + outputHash = "XeqHVdTQ7PTzxkjwfzS/BTR7+k/M69sfUKdRXGOTmZE="; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/data/fonts/ccsymbols/default.nix b/pkgs/data/fonts/ccsymbols/default.nix new file mode 100644 index 000000000000..a32d35a08852 --- /dev/null +++ b/pkgs/data/fonts/ccsymbols/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchurl, unzip }: + +let + pname = "ccsymbols"; + version = "2020-04-19"; +in + +fetchurl rec { + name = "${pname}-${version}"; + + url = "https://www.ctrl.blog/file/${version}_cc-symbols.zip"; + sha256 = "sha256-mrNgTS6BAVJrIz9fHOjf8pkSbZtZ55UjyoL9tQ1fiA8="; + recursiveHash = true; + + nativeBuildInputs = [ unzip ]; + + downloadToTemp = true; + postFetch = '' + mkdir -p "$out/share/fonts/ccsymbols" + unzip -d "$out/share/fonts/ccsymbols" "$downloadedFile" + ''; + + passthru = { inherit pname version; }; + + meta = with lib; { + description = "Creative Commons symbol font"; + homepage = "https://www.ctrl.blog/entry/creative-commons-unicode-fallback-font.html"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.publicDomain; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix index 75f1d89be770..3294cb711052 100644 --- a/pkgs/data/fonts/charis-sil/default.nix +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "charis-sil-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-eKSOvYuTMpAnTk4sRiWFUDJrTsF+K5716ALCepaUU08="; + sha256 = "sha256-b1ms9hJ6IPe7W6O9KgzHZvwT4/nAoLOhdydcUrwNfnU="; meta = with lib; { homepage = "https://software.sil.org/charis"; diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix index d7437c3231d6..3248813c3cb0 100644 --- a/pkgs/data/fonts/cm-unicode/default.nix +++ b/pkgs/data/fonts/cm-unicode/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn"; meta = with lib; { - homepage = "http://canopus.iacp.dvo.ru/~panov/cm-unicode/"; + homepage = "https://cm-unicode.sourceforge.io/"; description = "Computer Modern Unicode fonts"; maintainers = with maintainers; [ raskin rycee ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 3550facfc114..1b0b03383664 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "1.8.3"; + version = "1.13.0"; in fetchzip rec { name = "Cozette-${version}"; url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; - sha256 = "1nc4zk6n7cbv9vwlhpm3ady5lc4d4ic1klyywwfg27w8j0jv57hx"; + sha256 = "sha256-xp3BCYfNUxCNewg4FfzmJnKp0PARvvnViMVwT25nWdM="; postFetch = '' mkdir -p $out/share/fonts diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/data/fonts/crimson/default.nix index b8ff43a11288..9400ef06cf9a 100644 --- a/pkgs/data/fonts/crimson/default.nix +++ b/pkgs/data/fonts/crimson/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842"; meta = with lib; { - homepage = "https://aldusleaf.org/crimson.html"; + homepage = "https://github.com/skosch/Crimson"; description = "A font family inspired by beautiful oldstyle typefaces"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/dancing-script/default.nix b/pkgs/data/fonts/dancing-script/default.nix new file mode 100644 index 000000000000..5129f4bc5a5e --- /dev/null +++ b/pkgs/data/fonts/dancing-script/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub }: + +let + pname = "dancing-script"; + version = "2.0"; +in fetchFromGitHub { + name = "${pname}-${version}"; + + owner = "impallari"; + repo = "DancingScript"; + rev = "f7f54bc1b8836601dae8696666bfacd306f77e34"; + sha256 = "dfFvh8h+oMhAQL9XKMrNr07VUkdQdxAsA8+q27KWWCA="; + + postFetch = '' + tar xf $downloadedFile --strip=1 + install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf + ''; + + meta = with lib; { + description = "Dancing Script"; + longDescription = "A lively casual script where the letters bounce and change size slightly."; + homepage = "https://github.com/impallari/DancingScript"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ wdavidw ]; + }; +} diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index aed90b103b4e..ba9fed1be282 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -12,7 +12,7 @@ let This package includes DejaVu Sans, DejaVu Serif, DejaVu Sans Mono, and the TeX Gyre DejaVu Math font. ''; - homepage = "http://dejavu-fonts.org/wiki/Main_Page"; + homepage = "https://dejavu-fonts.github.io/"; # Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/data/fonts/doulos-sil/default.nix index a1e686a320ed..f720c2cac7dc 100644 --- a/pkgs/data/fonts/doulos-sil/default.nix +++ b/pkgs/data/fonts/doulos-sil/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "doulos-sil-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-MkeLLT7EAeSuCMxVVxVfajHufxr+xMLIz2hf3wF3U4o="; + sha256 = "sha256-vYdnudMkkWz6r8pwq98fyO0zcfFBRPmrqlmWxHCOIcc="; meta = with lib; { homepage = "https://software.sil.org/doulos"; diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix index c6bb23b43266..3fd0115ddb48 100644 --- a/pkgs/data/fonts/encode-sans/default.nix +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -23,7 +23,7 @@ fetchzip rec { Designed by Pablo Impallari and Andres Torresi. ''; - homepage = "http://www.impallari.com/projects/overview/encode"; + homepage = "https://github.com/impallari/Encode-Sans"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/gandom-fonts/default.nix b/pkgs/data/fonts/gandom-fonts/default.nix index 54e0020ae687..1b8b3307eb35 100644 --- a/pkgs/data/fonts/gandom-fonts/default.nix +++ b/pkgs/data/fonts/gandom-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "gandom-fonts"; - version = "0.6"; + version = "0.8"; in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; @@ -13,13 +13,13 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/gandom-fonts {} \; ''; - sha256 = "0zsq6s9ziyb5jz0v8aj00dlxd1aly0ibxgszd05dfvykmgz051lc"; + sha256 = "sha256-EDS3wwKwe2BIcOCxu7DxkVLCoEoTPP31k5ID51lqn3M="; meta = with lib; { homepage = "https://github.com/rastikerdar/gandom-font"; description = "A Persian (Farsi) Font - فونت (قلم) فارسی گندم"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index ac8839f075b2..f64f7b341440 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "gentium-${version}"; @@ -23,7 +23,7 @@ in fetchzip rec { -d $out/share/doc/${name}/documentation ''; - sha256 = "sha256-DeoMTJ2nhTBtNQYG55lIMvnulqpk/KTeIqgpb5eiTIA="; + sha256 = "sha256-+T5aUlqQYDWRp4/4AZzsREHgjAnOeUB6qn1GAI0A5hE="; meta = with lib; { homepage = "https://software.sil.org/gentium/"; diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 9689fddd3913..8b11e5d504ae 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -2,15 +2,15 @@ stdenvNoCC.mkDerivation { pname = "google-fonts"; - version = "unstable-2021-06-12"; + version = "unstable-2022-02-26"; outputs = [ "out" "adobeBlank" ]; src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "370c795d7e5f9b02db9a793c2779e2c8f94c6adc"; - sha256 = "sha256-XKjxmupY2KuefCtKZMXWaba1TnNwdYM/P0xGXOtBGmM="; + rev = "2fba0d68602b7eb3374d030c1c34939de56023f9"; + sha256 = "sha256-IFkKwRRyZeOXD8/9n8UDrruUKK6oQK4BD9wYN2dmSAc="; }; patchPhase = '' diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 08c4a1b145e2..3ebaf49abebc 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/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 = "10.1.0"; + version = "15.0.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/update-default.sh b/pkgs/data/fonts/iosevka/update-default.sh index 208ea6101ac2..8d918058988a 100755 --- a/pkgs/data/fonts/iosevka/update-default.sh +++ b/pkgs/data/fonts/iosevka/update-default.sh @@ -8,7 +8,7 @@ repo=https://github.com/be5invis/Iosevka # Discover the latest version. current_version=$(nix-instantiate "$nixpkgs" --eval --strict -A iosevka.version | tr -d '"') -new_version=$(list-git-tags "$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }') +new_version=$(list-git-tags --url="$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }') if [[ "$new_version" == "$current_version" ]]; then echo "iosevka: no update found" exit diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 0ce5212b1311..f67f97dfaaf8 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "09fwk1sm2i0yf2qvwc99g46jhhi9jwmxrqm02m9n348gcsvml7k1"; - iosevka-aile = "07nykjvm5acnxc585y7qfs38d1mm4x654wykq24cwd0qdialz2yn"; - iosevka-curly = "1v9v5xhv4pdihb2q1hgzlw3z54vpg9lvjf753z95x97ah246kbyc"; - iosevka-curly-slab = "0av94y57pi9vy8skb96dbvlcbz7j6hz7cvhsrdpx50nbf9x2ya4b"; - iosevka-etoile = "0vinmfcxs16rx1i86sl7ig7hwwyfwv49vh12k6yx9gx56jyywj51"; - iosevka-slab = "18sjdj5gdg993a0mzvx43l3ll7q2l8w30j12934nlzlw5cadv8gf"; - iosevka-ss01 = "1k08nwzgdz78iiijd6bzfricjbwa23xmzjm6jq72q7cvcqrwpzfj"; - iosevka-ss02 = "139q7ps9y97qzmyqr45xqphw5szr4a119pm1jnwrc5scplnhiisb"; - iosevka-ss03 = "1rbsvrc11skznnk448nj0brfvj58zhgkczlq7skhb8rc3mznhgb8"; - iosevka-ss04 = "0rr7zy9n84lqxj7h0ljd091m8a5yjs0kzpyp3j68mvccsdwncqq4"; - iosevka-ss05 = "035rv0pq7741n6c7zkajjzis2rkdyb75z9zjzyiiylfx19j6d6a7"; - iosevka-ss06 = "0bvbl36zpk79f3h7svs51l0wbllmnnkgxmdk76ikfg4a490nz4g9"; - iosevka-ss07 = "061xngjvznr6syk1y996fmnjqpj0kvnnibibr46lgqcx5xb1w38x"; - iosevka-ss08 = "0szc3iydg3kkg6v42ym52b7nd6ljfwrfcw7n3j1av9vhf5gmn0rv"; - iosevka-ss09 = "1p0hsl6vihly2drh6yiniijcwvwjz35d34d6jfxavjhx028h92mw"; - iosevka-ss10 = "152asnmd7m7q1hligkv4ar8h71xn96586p9whplvmkgfrcr731p7"; - iosevka-ss11 = "0mf3gg1b9x3i1j8c3yqks7sc56j97fwx736pr01bf99lw4jchd2h"; - iosevka-ss12 = "136s3i5dwz0iv8mivq8fraadhbqzjjc5h2c5wqydvmw9i7rpyp2h"; - iosevka-ss13 = "0n9886kn9sr89rwnc0r0q9d2a16fykq5asd0cazrs95jbqq0acix"; - iosevka-ss14 = "128y8dgsawdz20lyjshdl7932222dph6qyiirim6rkh99bp2kdy6"; - iosevka-ss15 = "0h2ywzn2gmaj61n5gzdms7v3yqa3x474icdg10vqds7i86n6g8am"; - iosevka-ss16 = "1c1sr4lphwf8x5xdagciws8dr7ia8jh2cy3zv787g8dhflhzvc1i"; - iosevka-ss17 = "1gqbwx89hcnky7bi1xscz13ykh4srvycbfgf9z4b5j26wflfk2a9"; - iosevka-ss18 = "07h0zcf789g6qw5laznf5y67syh003lwhr6141ifz2zv2sgjl716"; - sgr-iosevka = "0h9yg63cjc0s4kbl5k9lpic48y5iz0hlm8bi7h2h850zhbj405fm"; - sgr-iosevka-aile = "1sv0lb2xb18skwvvw95qzdi9hqr1mr3gi2p4plqlbxq6bjpcvc57"; - sgr-iosevka-curly = "1irg71zrbqnw1r2ar5qkfzdjzb1ziwd22jyvm9g1gynjiwh1idaj"; - sgr-iosevka-curly-slab = "12lc9gqlbnp4crp9qrqf38dlzwaqanyj3l9xyasd96z33wmgnvcr"; - sgr-iosevka-etoile = "0j78cbrdsz9qnvs6y6vkv1ys2spfv9l207z20zkyw5m0i3yvhwi4"; - sgr-iosevka-fixed = "04lirldlmjlvz8q33xb2886d1jqaj1a7a94mnrm1ikw2gzbh7j1m"; - sgr-iosevka-fixed-curly = "1s4xyzlmg9s8jvpvc22bxqc6z9qn0bbgham9kp1w2nwlmlnhl712"; - sgr-iosevka-fixed-curly-slab = "01g6rk0n1xs0bv4vyqv9pwyndzk9k8cfhf0sd640zdkqi51p4raw"; - sgr-iosevka-fixed-slab = "1ipzwxs0jqk4cc8snyy9mxhak1zrj9qlicwwhhhv8pmxs2lcirgq"; - sgr-iosevka-fixed-ss01 = "1vpfgj496yzn5n8zb5hxzlx0kh0yfh27v2naz4zi4gci0k58mj4g"; - sgr-iosevka-fixed-ss02 = "122id78h9lvnm4abflng5572zjdn52wqci9jq88gh5iyk02kja6b"; - sgr-iosevka-fixed-ss03 = "0wa4q1zqp75ja5m34wy3zmx5in225ldr0ah23y7l9kh3x67lfykd"; - sgr-iosevka-fixed-ss04 = "11dxlc3r1gn3psf4bpsiwr283zjpc63d8fgswwbh5d6swk9nxm7v"; - sgr-iosevka-fixed-ss05 = "0jw57byz8rbdc5h1ig5d4kpjklqrm6880sx0z06gw97z3p4aqmb1"; - sgr-iosevka-fixed-ss06 = "0saxvswnrszi3kirv5j1pp96n9fhnqwrmsc8naqdgq342rcy13w5"; - sgr-iosevka-fixed-ss07 = "0bsrpfbcjf2g8vd6f6sv6yxvdi9s6wdjckbjb3m64mdgv25lpdwv"; - sgr-iosevka-fixed-ss08 = "1l5k2y0h4h3fsk2ac7akym4rash6bb63bj9vhh3f9igq062dk10a"; - sgr-iosevka-fixed-ss09 = "09s1x6q7lx4y0462m0ac3jp8jfy4x2sc2irfmxcz2rl5px2smgdg"; - sgr-iosevka-fixed-ss10 = "0j8h200gw60rzknxyg7nvcg9cw1nhvgy3n6n70lf3b8jnp5splzd"; - sgr-iosevka-fixed-ss11 = "0cgxy8gq5wak1a7z3j013l1kadph45ckl865dlkw5jnmndz7a684"; - sgr-iosevka-fixed-ss12 = "1y9grhh3ami6qwdm8a6r7m671n7c9bnxp7qgmk7qxgb8jax31qcp"; - sgr-iosevka-fixed-ss13 = "1a9in4ybl9vjyvxab0hdbjnq46rg3yx9gyalj6x8y3mxsfij0wh2"; - sgr-iosevka-fixed-ss14 = "0wc3yw6rf05wdh8kzz6af1apirvyspkb8bav4pbdxahsy1asij58"; - sgr-iosevka-fixed-ss15 = "1b7ns68lx267y9rwlv47yl0y48nvwyzqdpgpwdfwkmpl6vd9kmnn"; - sgr-iosevka-fixed-ss16 = "07h4zvcll7324r4l7kwwk13874hmjs7vdiiffbjwhi403vbiw1an"; - sgr-iosevka-fixed-ss17 = "1rjb0c3yvww8n3sam49ynj2f7h0xgbdsznk7xbj4sk5pkx3l5zr5"; - sgr-iosevka-fixed-ss18 = "0s39p9khjidasizg1ps3k87ldlkpy3cxy5l6r0c2bkvnfz63k66n"; - sgr-iosevka-slab = "10gx0hlr2iywj3nksc70idjha9wja3fw9fl8yvkmnpbqaxlrlzm8"; - sgr-iosevka-ss01 = "1fzxzx9ky4zrbv3zbjh7c57k8dm949xz356a4jk1lpbmwyd0gry4"; - sgr-iosevka-ss02 = "1qk9f257pq2r4jfilrh02viwgy80kqga4czpc1mvwwbqfalz2lg9"; - sgr-iosevka-ss03 = "0cj2xgpfcxdj4sh2sdp6cvbg08s6c8gvg0h01ylrqnazxddfv1xr"; - sgr-iosevka-ss04 = "02q2xqv1qvdijn53p3nbz2swn39yk2pp5ndq1wkakm5j3w5n52f9"; - sgr-iosevka-ss05 = "0y4f8zkzvxq512ns4qzbq5hnd6zzwdjlc1p2iify0f4m491msx5n"; - sgr-iosevka-ss06 = "154jzvb44h1njzkzsk9x6mk7g9sa5jr7kqjv26ylm0ax0i039ax2"; - sgr-iosevka-ss07 = "08025i39hkinrd0sq0yj3d9dc3fqhv5qfdvxaqg3wp89p5jz2q2q"; - sgr-iosevka-ss08 = "1hj80l9k1qi4cnw5dqfp431z3yiyqvrhby9f4ny84ppkpihp60xk"; - sgr-iosevka-ss09 = "0pl1fz70nx0ls0l4zr8j111flf2mh54miavb0422r2dzprvqaviq"; - sgr-iosevka-ss10 = "1wb03i26g36n6qgzkyza3sbdbgpari5sw0m4qm7yaz3c2f91ic69"; - sgr-iosevka-ss11 = "1mz1mg0pc3nidsl5pb6kvdmmga62fj8x77x0n1xjzcz2iwvdd616"; - sgr-iosevka-ss12 = "0g3i88rhax9am4nfjzq91kdkj1k6vzszia7g79hzsw8nfyrd1i52"; - sgr-iosevka-ss13 = "1jcg4y52xbig8npjd7jbjxqdr9nsbwh120mh9sjy9vvq3hxdsbqh"; - sgr-iosevka-ss14 = "1am7j9ymxgmyb50qziyd3xkal1f82cnx4m21gd2rqxijpa12x1r3"; - sgr-iosevka-ss15 = "0zpwz51xdbckldgycgbmrqf3g9wssanmb2z554n1vbmc5whhwkpp"; - sgr-iosevka-ss16 = "19jzkq3xj0cncs4mk11z8q8mmf6h75i0x2nj4ikcvk01mlrss6s8"; - sgr-iosevka-ss17 = "1zn0xh0h997afjsj6n97bmxanxk441iw6mcdliavfs9l6lj1zhns"; - sgr-iosevka-ss18 = "147w89y3p9s2qanm4wwxv3plpif50fs85hzhhdz23jin5zvh5lz2"; - sgr-iosevka-term = "01aqqniw3r2njv4fc114iymjzp9k5mdl7c5dyxypm71sdlpcjxqj"; - sgr-iosevka-term-curly = "0rh0k1svfsan04q50ihhf2xf2fa8isggpqmfps77q1xrbih9miyc"; - sgr-iosevka-term-curly-slab = "0ys2apprdz1awf6nad6phv2k2kf0qfigb22j930y1gya9vshxqx1"; - sgr-iosevka-term-slab = "0qbiwsllyim81ayh0whrkzc1nq06x9g7hnv8haxh91jg9nf327vw"; - sgr-iosevka-term-ss01 = "0mdgh9hdnz752d7sxv91ayi6lyp6czs6gq21dqigk3wmkgwaraz2"; - sgr-iosevka-term-ss02 = "0zxynyzbngng6ymajd7yf5pmagdzxnr19vnpbmqkvhjnsjmhqpcd"; - sgr-iosevka-term-ss03 = "192fjh0kc8jh0z8y7l74g41jvqfnax5p2shnn0ch1h824vraklvd"; - sgr-iosevka-term-ss04 = "0fjmy0wl8hh38gbhf5h6m064la1dp68lyfimmxvjpf1s2c3g5szd"; - sgr-iosevka-term-ss05 = "0w57k1kjn91srngy297fywi1wnc64bwyymclk0w704sqpx04jv4n"; - sgr-iosevka-term-ss06 = "0n2ifw444z606qm9w4il6inmf5zmbkhrk2wvldfx5bsgv2pfxnjd"; - sgr-iosevka-term-ss07 = "1wwky8pichvr467ypgxrxyfqgr27hqkpmx7c35fzka9c0kap483q"; - sgr-iosevka-term-ss08 = "117c54z898rmsclm23hn4x2wvhypc2vmncrq2mvkqck0wawkwaxw"; - sgr-iosevka-term-ss09 = "0lahhifnar8f716xq63xjhibay7cfqgaa7drxvz4pqxmzijv6r2r"; - sgr-iosevka-term-ss10 = "0fp149a4dn7wgdsms70k162g60jgdg5ric93rhxnkn83x3d5jam1"; - sgr-iosevka-term-ss11 = "16pvy63b194vig5vxy15ylmyl5422vrj9adqqwl82r0l9aqpkqlw"; - sgr-iosevka-term-ss12 = "1gldv3srnm7zx9gkyizi6gvf34b7z7xg17qk77882jczsv95hyh1"; - sgr-iosevka-term-ss13 = "0aznbica0yc4vhp4bp84dflfd6jhzw8lsakknfn8dz10kj1qq7vc"; - sgr-iosevka-term-ss14 = "0x73vwywxj7j6qg3armbhm6rjy308j1rk1fhjfriv51hnkm6ylz2"; - sgr-iosevka-term-ss15 = "0px9y25bx75ppsdaq0rfddd9ljxwa3fv5296kvvkw3mwd0ralflx"; - sgr-iosevka-term-ss16 = "1bmnf7z8v4mbcq97lj2qkf722ww1n500jgv2zgs36vxc22zjjrvk"; - sgr-iosevka-term-ss17 = "0lp5qz8j9xc8n959lm4sbfkjhm3ib79qnv69a57nkv5a10ddk20r"; - sgr-iosevka-term-ss18 = "0jkp6zjx9ih5m4pa95a2rn7j1wx4hvnxg2j24cib9dixr7sc81b6"; + iosevka = "1g8x2bjhnhiq46mx02rhp0wphi7rj21m1nh2gx6rxly2ybms3pnw"; + iosevka-aile = "1hvrzycsilvjl3a90n2sk5sznkjvrn9r6yqaad397rbd309w46ai"; + iosevka-curly = "0df15zbjs9xpqm5032vmjmnp4ay545bs4i8xr6rd37slb8a8x2bf"; + iosevka-curly-slab = "0n57gz1v12l01khy3y0i0yd4w88jz6izwl4iav4679qjfhhd206c"; + iosevka-etoile = "1mq1mqxkj5y3r9xwjy7pbrvnv72zkj2hnh48kac0xr414yrqql3n"; + iosevka-slab = "0srnbwxj03is9d8q0y0k55dr35s747p8xbiz7xany5piljl68f42"; + iosevka-ss01 = "1rm514g3x510dcpn9hn98kl2pv4h9rxmkgp2wvxxhg3s47x0462n"; + iosevka-ss02 = "0p8h1khzxsi4c6wmwri9vvbcv2qy4nksnhmyhksb0b8yw22s9iyk"; + iosevka-ss03 = "1rsw5gx5l5mi8ljvgrrir4bnhy8mvx3rkr9d4vba8wzvvqvc74nv"; + iosevka-ss04 = "02rcdfrnhqdjlks26968mxsrdyfalk3h985bf9vi03sf9nqmmfpz"; + iosevka-ss05 = "1qn323iawpvjqhmx6s7i8irjqkxq9yya5dxp87m452hq9zm2jynq"; + iosevka-ss06 = "0zyg2afzmzdm7gd2c9i9vp751xapajabjm85sri3mcyvgkbcxqai"; + iosevka-ss07 = "1qfalhxl2vxflwn3f73bdq5q1p8zblmswdfw5mrl3b5nzy8y40nw"; + iosevka-ss08 = "0idj19nk7mq6z4yphmxa09c5azgxyi38zlq7y872s0dl9j2qbi5f"; + iosevka-ss09 = "1zwwlb9c34q36kflc6r4wygv3rpkd7y6n1xpkql02w6rb1gp7nd9"; + iosevka-ss10 = "0j01j7frkv2ldz3hqn65r3b56yn63fchhhkghs95v4cln27qzmxx"; + iosevka-ss11 = "0imwzcxh7cqmqcsdlg5nay12jql8dq1hk0h7a0i1igrn3fflga5g"; + iosevka-ss12 = "0z5smyxx5szz5ky4lxmscf44a5pzkjm590cihmcnjw3nxiw84bs1"; + iosevka-ss13 = "0pyq12n7h1adhs5rbkrx9b64rpwvd9nj8vjmwzf3qmdc39bx6rfv"; + iosevka-ss14 = "0v3aipgvw1ygs6v839cw17arm5iag57aqdkr35n0wx3yl5h3v9wg"; + iosevka-ss15 = "0vhwi4b2nmshx7lh5d4fr3swfx58sxwn6w38kvp5p27jp68azbbz"; + iosevka-ss16 = "1rzrd0swjaacbjpxniglkkwsn4dfhvb8f70g8nigc2mah3md62gp"; + iosevka-ss17 = "184acjrqdlw38lzizwxp02lwmc8jznrb55krlvrxkd2lkj4r6gni"; + iosevka-ss18 = "0sza6q6yisjsk5gkkj1z7qbrhpvqv18nykgdwqraa3im66bkl1v9"; + sgr-iosevka = "1n1i12d9891il20ry3vkv5503d9j541w17imh09dbn5r0lrjr40r"; + sgr-iosevka-aile = "0y1nx1xk7fn8dj5jc6zyva593vdxngjc61j717jlqh855fpz5v04"; + sgr-iosevka-curly = "03x2w2arkbhnpl3rlsdgpldqnfrd14q55kf5rf5lsrnmdndg706s"; + sgr-iosevka-curly-slab = "0vncsw3k56cqzpp5rpllz4azklib0vq7rah0ssz2syh43zffsyw3"; + sgr-iosevka-etoile = "0plk2c7ckxm0f7aa9wd1qpi3dfb2gap0222jhx906clx04kb6bp0"; + sgr-iosevka-fixed = "147qjfqwdr0l29ljbn0c73m2wg1vm9qdn5fjika8z1wy7mbrmbsl"; + sgr-iosevka-fixed-curly = "1222ms9kpgcah531ik7h9qkprpq4dd98p41xrsxad3hvr4aa6x05"; + sgr-iosevka-fixed-curly-slab = "1fcg0afhan0ym15c10qikfa4hadgzj0aabymac0qq74l5dn8lmx7"; + sgr-iosevka-fixed-slab = "174xgxrwy50gnm53qhr9mf5cwkbwgalw6ypbz6r68fhyk70dbjvx"; + sgr-iosevka-fixed-ss01 = "16wpj0yvkavhlvz5xzfa5mr219wlynqlfg1am1y1b9w647ypx6q6"; + sgr-iosevka-fixed-ss02 = "1ya9riiiphv6fmirg5r0va06xvcgq8j41vmibqrzld7sjk26yrll"; + sgr-iosevka-fixed-ss03 = "1l6dc7sl5a9p076a7jp2lfwrn1xh0rlp8v3d9k5m9gjghr62b288"; + sgr-iosevka-fixed-ss04 = "1fmbdjgkvaw30x9wycdfzk9n9c1a2vznx8fnxc3xjps4xw5vd4h3"; + sgr-iosevka-fixed-ss05 = "1f66q69wgqxqzkf5r54cjqg66lnfpk7w9lf1hk59v3vmxjxy39xh"; + sgr-iosevka-fixed-ss06 = "1lfjnjn3k6wj03gxpvzc73zj98iy0x447pigxln911ai3v2mcmz5"; + sgr-iosevka-fixed-ss07 = "0567x6rvikpn2cn9prrym0rlw5swa4rb7wihmhpgal64ygysipq4"; + sgr-iosevka-fixed-ss08 = "0b81a3841c2fdfrpsiq8cyly9mzrk0974na53b505wasj5jvikqb"; + sgr-iosevka-fixed-ss09 = "1p5w7m5r11m94icyv8fnwzmpnsih9s8p8iq8hg6iasawqzh60ll3"; + sgr-iosevka-fixed-ss10 = "0c0dhi2c84km1vhbiifv95x4yf03jz12jax2vvc68hhi3w4gmg68"; + sgr-iosevka-fixed-ss11 = "10jp3i36sv4jl2887g1ir1dc2gy1iyhzf2f396jchi5dadzfpgwj"; + sgr-iosevka-fixed-ss12 = "14pq3l6241ylpxlx2n483g1ghlhqahk8dla0frvb572k0bvl4vh5"; + sgr-iosevka-fixed-ss13 = "0js73rildzz24v4alj2xfl5n5wvmlxk18qzdchzrb78lq6bifvvd"; + sgr-iosevka-fixed-ss14 = "0f47d6khi5kr10xlm61pbwr1xk5kqgj82abcaxmvbf5c3jj3v1lr"; + sgr-iosevka-fixed-ss15 = "1nkyfmx4ps8mbnz7ap0vzgwgrxm6nbi4fhvalr6w2dk521inyfn7"; + sgr-iosevka-fixed-ss16 = "0fykkgksdmni80v3q513xwxnay9l73viwj9qbn4bc58ljzd5hffr"; + sgr-iosevka-fixed-ss17 = "09n1vl8m2drg5zs05hvdp7yy47a9s927a8ndxqsa34klanz7c04j"; + sgr-iosevka-fixed-ss18 = "1rmfnnsi9c6alifhnfa4yc9gfgk687zxhrsyrjizwg9r19b2k34m"; + sgr-iosevka-slab = "1nffh7iy3gn5v2yqilq57x6nvk25jh9jmbdmdfyra19nwfn601ja"; + sgr-iosevka-ss01 = "1nwl7psz11jnyldry3wa3wfki28wghqq8f7vz8gmmcvv98caga80"; + sgr-iosevka-ss02 = "1clk233v4ycfqmbv7whmbvm2l1qr1kf75kdca1r4c5y4wjmsh1ap"; + sgr-iosevka-ss03 = "1lxn8hgz0qxs39d1jvr855h8zi3dv1k56v99q0ivrnp5y7aclia5"; + sgr-iosevka-ss04 = "03nz6864i5s6gpjy7jjj52062ivd57wh90j6p8x4lj72479fwfsy"; + sgr-iosevka-ss05 = "1bfgdnc44vmj3hxifz0kb5bfbv3bj9dglp4l7p781chi0m9yrmm8"; + sgr-iosevka-ss06 = "1zcqq2kv080xsfll6zap3hm2l0kx6sr378iq7qrfpavmfifc3rk8"; + sgr-iosevka-ss07 = "1phy7gdx5j5rww54mmzvi5f401lxqxxrwmh0hrhl0bvsxybhdcgm"; + sgr-iosevka-ss08 = "1wyznlzpbv8vb1sny4f1v8x4azfbcp2ajml4aram9k9cx3zkvd8s"; + sgr-iosevka-ss09 = "0q4sla496pdhfv4v15y5ax0h4pr4n47bfrvs27lq26x4p1fhgwdg"; + sgr-iosevka-ss10 = "1iyr4vfs2dp26vi26libv5k18mvdnfzmwmvzdczkh8cyc9hwp36d"; + sgr-iosevka-ss11 = "083pfql4nlq2847csqskb2qxrsnlvfwz198ybnfd97lxa1zczj6k"; + sgr-iosevka-ss12 = "08isy55m7dqpyhbzf5jkamnr8c135850dwpqp380g991h5sp3vnm"; + sgr-iosevka-ss13 = "1vjv198pkvnnxxcbyc5fy54ld4phf52nhybqc9hyf8d7806wrvyn"; + sgr-iosevka-ss14 = "1y4iclzcfb2q0172xag3zqabw03q89jqb7asi0x9zkrhcd1i512y"; + sgr-iosevka-ss15 = "1zxxn6s418gpx2ndknqdwp132p0sr3smsqhavpl5kw5cxrgxa9q6"; + sgr-iosevka-ss16 = "132xmf4rlsa3d0j2s9hmfih6s32wm1na0hs72h7padnh6c7di3rl"; + sgr-iosevka-ss17 = "1bb94ladk0qvzmvb2gc1561xfy7ddgqkqgcgigkkhdab7cfw0cxq"; + sgr-iosevka-ss18 = "15rrngd4qnzqk06whczsmfdf5c1k3nm4m8ga691i1rjxwc5dwycc"; + sgr-iosevka-term = "09m74mqczkm0pirahlisdw2mafyzq7wpzplyqg51221x2m01px7z"; + sgr-iosevka-term-curly = "19ralig26akrabclnniwvimqkcrd0agcwyxakinb7qcbm8p4x30x"; + sgr-iosevka-term-curly-slab = "01zwrlkrp840ah5fclxxl17vckcx4wnv3vwlz6nch2igy965k6qs"; + sgr-iosevka-term-slab = "0520d21x04fvc2b3aa6kzdhwvf24s8yd8vkbl400i0x78gyrlnzv"; + sgr-iosevka-term-ss01 = "0q64vcp4djk0mdfc05a9bz0nqc2a7dr0gdvj2d2kfpbqsg4i32qq"; + sgr-iosevka-term-ss02 = "0h8a4wc5ck1p7gaf1r08h4irj10kqbpm2jkb2p63gybi9gp6ivwg"; + sgr-iosevka-term-ss03 = "0608yhvkbv1hkdj7c347r9q7wbm9bvy6lnhhs6gb0ndkx596pnzm"; + sgr-iosevka-term-ss04 = "1yfpkczgfjfr52ilinzi2dfyw11mmsilxjpl9r9yh0fxmr48c976"; + sgr-iosevka-term-ss05 = "1brrfhkj7wlyhfdfhafkqw8kgsfy7fsi7567ayxii5b05wn9g6mr"; + sgr-iosevka-term-ss06 = "0vksv1k9wvyfiifxnajvmi8b5mx8w72d80y3r9ic7rz36l0rbl3x"; + sgr-iosevka-term-ss07 = "0n5hz3zdp7flbr2xh4yddwkxvpcd0v55m274w15s9q6wln0knwhy"; + sgr-iosevka-term-ss08 = "1qknqr11imcrr0iqpa9qpf70m7505wl81k48igdyqgmimgksrlji"; + sgr-iosevka-term-ss09 = "1j53n5fv2y97bj7n4kx8h8v5isflbmgdqh0hz58ilp06v6rd6j5i"; + sgr-iosevka-term-ss10 = "1bzi39n4x4qa7vyhv5yh875n8gbyjkiaqfhj2xh8pj88b8064cw0"; + sgr-iosevka-term-ss11 = "0xxyh1zxy1jdy0b110f7rallhf0vicsw0snyh3bf3v0mnkimk0y4"; + sgr-iosevka-term-ss12 = "1hpbpqnkd4jzcqkg424y3d6i6nn5gyqlpqsfxrvfvx4igmm75vs5"; + sgr-iosevka-term-ss13 = "12fg2j5xw6vcpczc5kgq6q29cq579l1wyv5ag9r4kxqg541s3frl"; + sgr-iosevka-term-ss14 = "02qkmzr5kn5p69nqk59j6431313apy861yphbzpy56k4g80j0gy4"; + sgr-iosevka-term-ss15 = "0pcb91b8iic6blsgz0sw5hv2d9add355dizpvhc6m8rmp6l5pnqq"; + sgr-iosevka-term-ss16 = "081g07cav6k36k78bmdrx0z9jj2xzx3p1midzsxgsqp3ns2qxk7s"; + sgr-iosevka-term-ss17 = "1bx7mx75344i4807aq1xk0rw03hnv24wn3kj247hv3b1lxx14285"; + sgr-iosevka-term-ss18 = "068vy78d710aszk5s9kwf56rxg17qm8pphd329cmwknxsyan139g"; } diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix index cafd3c16fd4d..5223bc499d5c 100644 --- a/pkgs/data/fonts/ipaexfont/default.nix +++ b/pkgs/data/fonts/ipaexfont/default.nix @@ -1,16 +1,16 @@ { lib, fetchzip }: fetchzip { - name = "ipaexfont-003.01"; + name = "ipaexfont-004.01"; - url = "https://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip"; + url = "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype ''; - sha256 = "02a6sj990cnig5lq0m54nmbmfkr3s57jpxl9fiyzrjmigvd1qmhj"; + sha256 = "0wp369kri33kb1mmiq4lpl9i4xnacw9fj63ycmkmlkq64s8qnjnx"; meta = with lib; { description = "Japanese font package with Mincho and Gothic fonts"; @@ -21,7 +21,7 @@ fetchzip { This is the successor to the IPA fonts. ''; - homepage = "http://ipafont.ipa.go.jp/"; + homepage = "https://moji.or.jp/ipafont/"; license = licenses.ipa; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index eec28db883a8..9bc9b82db0e6 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "ipafont-003.03"; - url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php"; + url = "https://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont00303.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -19,7 +19,7 @@ fetchzip { Promotion Agency of Japan. It provides both Mincho and Gothic fonts, suitable for both display and printing. ''; - homepage = "http://ipafont.ipa.go.jp/ipafont/"; + homepage = "https://moji.or.jp/ipafont/"; license = lib.licenses.ipa; maintainers = [ lib.maintainers.auntie ]; }; diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix index 25ec1e5d11da..2e535255cc6b 100644 --- a/pkgs/data/fonts/ir-standard-fonts/default.nix +++ b/pkgs/data/fonts/ir-standard-fonts/default.nix @@ -21,6 +21,6 @@ in fetchFromGitHub { # License information is unavailable. license = licenses.unfree; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index a1f8f316773e..136a3218761c 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "0.043"; + version = "0.044"; in fetchzip { name = "JuliaMono-ttf-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; - sha256 = "sha256-oxQRrFhTf37OrJSbDlmzh/7xOuKrtxO7v2+j7QcsAmE="; + sha256 = "sha256-KCU1eOSEWjYh6kPda/iCtZUIWIq5lK79uUCLl2w7SEg="; postFetch = '' mkdir -p $out/share/fonts/truetype diff --git a/pkgs/data/fonts/lalezar-fonts/default.nix b/pkgs/data/fonts/lalezar-fonts/default.nix index 01e9d209a317..31a857bfda05 100644 --- a/pkgs/data/fonts/lalezar-fonts/default.nix +++ b/pkgs/data/fonts/lalezar-fonts/default.nix @@ -21,6 +21,6 @@ in fetchFromGitHub { description = "A multi-script display typeface for popular culture"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index 53fc456d7583..af0e70331351 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -1,9 +1,9 @@ { fetchzip }: fetchzip { - name = "lmodern-2.004.5"; + name = "lmodern-2.005"; - url = "mirror://debian/pool/main/l/lmodern/lmodern_2.004.5.orig.tar.gz"; + url = "mirror://debian/pool/main/l/lmodern/lmodern_2.005.orig.tar.gz"; postFetch = '' tar xzvf $downloadedFile @@ -11,13 +11,13 @@ fetchzip { mkdir -p $out/texmf-dist/ mkdir -p $out/share/fonts/ - cp -r lmodern-2.004.5/* $out/texmf-dist/ - cp -r lmodern-2.004.5/fonts/{opentype,type1} $out/share/fonts/ + cp -r lmodern-2.005/* $out/texmf-dist/ + cp -r lmodern-2.005/fonts/{opentype,type1} $out/share/fonts/ ln -s -r $out/texmf* $out/share/ ''; - sha256 = "11f10qnp8a435lhh19zc2znlf9q4isynmvjmvr63g5n5fhvhc192"; + sha256 = "sha256-ySdKUt8o5FqmpdnYSzbGJ1f9t8VmKYXqPt53e1/E/FA="; meta = { description = "Latin Modern font"; diff --git a/pkgs/data/fonts/lxgw-wenkai/default.nix b/pkgs/data/fonts/lxgw-wenkai/default.nix new file mode 100644 index 000000000000..a5ead2274b80 --- /dev/null +++ b/pkgs/data/fonts/lxgw-wenkai/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchzip }: + +let version = "1.222"; in +fetchzip { + name = "lxgw-wenkai-${version}"; + url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/lxgw-wenkai-v${version}.tar.gz"; + + postFetch = '' + tar -xzvf $downloadedFile --strip-components=1 + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + sha256 = "sha256-u2NTEYZrotOHktc2R5RWMFqeZ775/IpYJSUBO6PWijM="; + + meta = with lib; { + homepage = "https://lxgw.github.io/"; + description = "An open-source Chinese font derived from Fontworks' Klee One"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ elliot ]; + }; +} diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix index 41135122f054..7d91f49eb3e4 100644 --- a/pkgs/data/fonts/montserrat/default.nix +++ b/pkgs/data/fonts/montserrat/default.nix @@ -2,13 +2,13 @@ let pname = "montserrat"; - version = "7.210"; + version = "7.222"; in fetchFromGitHub { name = "${pname}-${version}"; owner = "JulietaUla"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C6T0Iz1rFC+EsKFJRil2jGTMQ4X7wR80E3eORL5qi0U="; + sha256 = "sha256-MeNnc1e5X5f0JyaLY6fX22rytHkvL++eM2ygsdlGMv0="; postFetch = '' tar xf $downloadedFile --strip 1 diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 75e8899e664a..d9cfadd5f088 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -1,25 +1,45 @@ -{ lib, fetchzip }: +{ lib, fetchzip, fetchFromGitHub }: -let - version = "063a"; -in fetchzip { - name = "mplus-${version}"; +let pname = "mplus-outline-fonts"; +in { + osdnRelease = fetchzip { + name = "${pname}-osdn"; + url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-063a.tar.xz"; + sha256 = "16jirhkjs46ac8cdk2w4xkpv989gmz7i8gnrq9bck13rbil7wlzr"; + postFetch = '' + mkdir -p $out/share/fonts/truetype/${pname} + tar xvJf $downloadedFile + mv */*.ttf $out/share/fonts/truetype/${pname} + ''; - url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; + meta = with lib; { + description = "M+ Outline Fonts (legacy OSDN release)"; + homepage = "https://mplus-fonts.osdn.jp"; + maintainers = with maintainers; [ henrytill uakci ]; + platforms = platforms.all; + license = licenses.mit; + }; + }; - postFetch = '' - tar -xJf $downloadedFile --strip-components=1 - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype - ''; + githubRelease = fetchFromGitHub { + name = "${pname}-github"; + owner = "coz-m"; + repo = "MPLUS_FONTS"; + rev = "336fec4e9e7c1e61bd22b82e6364686121cf3932"; + sha256 = "1ha92hyzcfbbq682c50k8clbhigc09rcb9mxjzjwqfj9rfp348id"; + postFetch = '' + mkdir -p $out/share/fonts/{truetype,opentype}/${pname} + tar xvzf $downloadedFile + mv */fonts/ttf/* $out/share/fonts/truetype/${pname} + mv */fonts/otf/* $out/share/fonts/opentype/${pname} + ''; - sha256 = "1khbkch2r96ppifc93bmy1v047pgciyhfmcjb98ggncp5ix885xz"; - - meta = with lib; { - description = "M+ Outline Fonts"; - homepage = "https://mplus-fonts.osdn.jp/about-en.html"; - license = licenses.mit; - maintainers = with maintainers; [ henrytill ]; - platforms = platforms.all; + meta = with lib; { + description = "M+ Outline Fonts (GitHub release)"; + homepage = "https://mplusfonts.github.io"; + maintainers = with maintainers; [ henrytill uakci ]; + platforms = platforms.all; + license = licenses.ofl; + }; }; } diff --git a/pkgs/data/fonts/nahid-fonts/default.nix b/pkgs/data/fonts/nahid-fonts/default.nix index 0e08bebea092..fbceb3c927dc 100644 --- a/pkgs/data/fonts/nahid-fonts/default.nix +++ b/pkgs/data/fonts/nahid-fonts/default.nix @@ -20,6 +20,6 @@ in fetchFromGitHub { description = "A Persian (Farsi) Font - قلم (فونت) فارسی ناهید"; license = licenses.free; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/data/fonts/nanum-gothic-coding/default.nix index 4785c1386a62..5066a2aef4dc 100644 --- a/pkgs/data/fonts/nanum-gothic-coding/default.nix +++ b/pkgs/data/fonts/nanum-gothic-coding/default.nix @@ -20,6 +20,6 @@ in fetchzip { homepage = "https://github.com/naver/nanumfont"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ linarcx ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/data/fonts/nika-fonts/default.nix index 5db9bb2a9518..f497a184be01 100644 --- a/pkgs/data/fonts/nika-fonts/default.nix +++ b/pkgs/data/fonts/nika-fonts/default.nix @@ -20,6 +20,6 @@ in fetchFromGitHub { description = "Persian/Arabic Open Source Font"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index a0d3b34c85cd..248d076b997a 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -4,12 +4,13 @@ , fetchFromGitHub , fetchurl , cairo -, python3 +, nixosTests , pkg-config , pngquant , which , imagemagick , zopfli +, buildPackages }: let @@ -70,12 +71,15 @@ let owner = "googlefonts"; repo = "noto-cjk"; inherit rev sha256; + sparseCheckout = "${typeface}/OTC"; }; installPhase = '' install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/OTC/*.ttc ''; + passthru.tests.noto-fonts = nixosTests.noto-fonts; + meta = with lib; { description = "Beautiful and free fonts for CJK languages"; homepage = "https://www.google.com/get/noto/help/cjk/"; @@ -113,21 +117,21 @@ in typeface = "Sans"; version = "2.004"; rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; - sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik="; + sha256 = "sha256-pNC/WJCYHSlU28E/CSFsrEMbyCe/6tjevDlOvDK9RwU="; }; noto-fonts-cjk-serif = mkNotoCJK { typeface = "Serif"; version = "2.000"; rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; - sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik="; + sha256 = "sha256-Iy4lmWj5l+/Us/dJJ/Jl4MEojE9mrFnhNQxX2zhVngY="; }; noto-fonts-emoji = let version = "2.034"; emojiPythonEnv = - python3.withPackages (p: with p; [ fonttools nototools ]); - in stdenv.mkDerivation { + buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]); + in stdenvNoCC.mkDerivation { pname = "noto-fonts-emoji"; inherit version; @@ -138,13 +142,17 @@ in sha256 = "1d6zzk0ii43iqfnjbldwp8sasyx99lbjp1nfgqjla7ixld6yp98l"; }; - nativeBuildInputs = [ + depsBuildBuild = [ + buildPackages.stdenv.cc + pkg-config cairo + ]; + + nativeBuildInputs = [ imagemagick zopfli pngquant which - pkg-config emojiPythonEnv ]; @@ -155,14 +163,6 @@ in # python requirements using python.withPackages sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile - # Remove check for missing zopfli, it doesn't - # work and we guarantee its presence already. - sed -i '/ifdef MISSING_ZOPFLI/,+2d' Makefile - sed -i '/ifeq (,$(shell which $(ZOPFLIPNG)))/,+4d' Makefile - - sed -i '/ZOPFLIPNG = zopflipng/d' Makefile - echo "ZOPFLIPNG = ${zopfli}/bin/zopflipng" >> Makefile - # Make the build verbose so it won't get culled by Hydra thinking that # it somehow got stuck doing nothing. sed -i 's;\t@;\t;' Makefile diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/data/fonts/parastoo-fonts/default.nix index 7c713576a21c..a3d273bb8ae1 100644 --- a/pkgs/data/fonts/parastoo-fonts/default.nix +++ b/pkgs/data/fonts/parastoo-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "parastoo-fonts"; - version = "1.0.0-alpha5"; + version = "2.0.1"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -14,13 +14,13 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/parastoo-fonts {} \; ''; - sha256 = "10jbii6rskcy4akjl5yfcqv4mfwk3nqnx36l6sbxks43va9l04f4"; + sha256 = "sha256-4smobLS43DB7ISmbWDWX0IrtaeiyXpi1QpAiL8NyXoQ="; meta = with lib; { homepage = "https://github.com/rastikerdar/parastoo-font"; description = "A Persian (Farsi) Font - فونت ( قلم ) فارسی پرستو"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix index 37ca9db9fa0b..9daaffd0b4ba 100644 --- a/pkgs/data/fonts/redhat-official/default.nix +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: let - version = "2.3.2"; + version = "4.0.2"; in fetchFromGitHub { name = "redhat-official-${version}"; @@ -11,11 +11,13 @@ fetchFromGitHub { postFetch = '' tar xf $downloadedFile --strip=1 - install -m444 -Dt $out/share/fonts/opentype OTF/*.otf - install -m444 -Dt $out/share/fonts/truetype TTF/*.ttf + for kind in mono proportional; do + install -m444 -Dt $out/share/fonts/opentype fonts/$kind/static/otf/*.otf + install -m444 -Dt $out/share/fonts/truetype fonts/$kind/static/ttf/*.ttf + done ''; - sha256 = "1afvxmgif61hb17g8inmxvq30vkzwh30mydlqpf0zgvaaz8qdwmv"; + sha256 = "sha256-904uQtbAdLx9MJudLk/vVk/+uK0nsPbWbAeXrWxTHm8="; meta = with lib; { homepage = "https://github.com/RedHatOfficial/RedHatFont"; diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index ceed83070040..c8d8ca42f9e4 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, fontforge, python3 }: +{ lib, stdenv, fetchFromGitHub, fontforge, python3 }: stdenv.mkDerivation rec { pname = "rictydiminished-with-firacode"; version = "1.2.2"; - src = fetchgit { - url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git"; + src = fetchFromGitHub { + owner = "hakatashi"; + repo = "RictyDiminished-with-FiraCode"; rev = version; - sha256 = "0khnbp1y5xrd77gfb2b19mzi3ll07im3d0rlbciwbq0cn347f25p"; + sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4="; fetchSubmodules = true; }; diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix index ff86338c26d4..9079ba7fada0 100644 --- a/pkgs/data/fonts/sahel-fonts/default.nix +++ b/pkgs/data/fonts/sahel-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "sahel-fonts"; - version = "1.0.0-alpha22"; + version = "3.4.0"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -14,13 +14,13 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/sahel-fonts {} \; ''; - sha256 = "0vj8ydv50rjanb0favd7rh4r9rv5fl39vqwvzkpgfdcdawn0xjm7"; + sha256 = "sha256-MrKSgz9WpVgLS37uH/7S0LPBD/n3GLXeUCMBD7x5CG8="; meta = with lib; { homepage = "https://github.com/rastikerdar/sahel-font"; description = "A Persian (farsi) Font - فونت (قلم) فارسی ساحل"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/data/fonts/samim-fonts/default.nix index e10249a1afd9..b29114e6b1c4 100644 --- a/pkgs/data/fonts/samim-fonts/default.nix +++ b/pkgs/data/fonts/samim-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "samim-fonts"; - version = "3.1.0"; + version = "4.0.4"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -14,13 +14,13 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/samim-fonts {} \; ''; - sha256 = "0mmhncqg48dp0d7l725dv909zswbkk22dlqzcdfh6k6cgk2gn08q"; + sha256 = "sha256-WYSJ2mAzAe5H0EaMYU3qNVcQ0lRuHsjZ11YmLnZ2FCo="; meta = with lib; { homepage = "https://github.com/rastikerdar/samim-font"; description = "A Persian (Farsi) Font - فونت (قلم) فارسی صمیم"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index c28b3745f942..57c356136748 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, libarchive }: let - version = "0.35.5"; + version = "0.36.1"; in fetchurl { name = "sarasa-gothic-${version}"; # 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"; - sha256 = "sha256-t9BYV9a/rmEr8nLqcdxg4Z5pWsCefvwI47eSwub41u0="; + sha256 = "sha256-w8PVDvbnHFZF7/X4EzO0IJsEKMC7c+GPng1sn8Q8G14="; recursiveHash = true; downloadToTemp = true; diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix index 5cf54697fdf6..d5e7e2b243c3 100644 --- a/pkgs/data/fonts/shabnam-fonts/default.nix +++ b/pkgs/data/fonts/shabnam-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "shabnam-fonts"; - version = "4.0.0"; + version = "5.0.1"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -14,13 +14,13 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/shabnam-fonts {} \; ''; - sha256 = "0wfyaaj2pq2knz12l7rsc4wc703cbz0r8gkcya5x69p0aixch8ba"; + sha256 = "sha256-m4G4UtW/0S9CsvaSF7QfthfIxGQ02E7SucdDm5s3G7A="; meta = with lib; { homepage = "https://github.com/rastikerdar/shabnam-font"; description = "A Persian (Farsi) Font - فونت (قلم) فارسی شبنم"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix new file mode 100644 index 000000000000..879f5083e235 --- /dev/null +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchzip }: + +# Source Sans Pro got renamed to Source Sans 3 (see +# https://github.com/adobe-fonts/source-sans/issues/192). This is the +# last version named "Pro". It is useful for backward compatibility +# with older documents/templates/etc. +let + version = "3.006"; +in fetchzip { + name = "source-sans-pro-${version}"; + + url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/{opentype,truetype,variable} + unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype + unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable + ''; + + sha256 = "sha256-uWr/dFyLF65v0o6+oN/3RQoe4ziPspzGB1rgiBkoTYY="; + + meta = with lib; { + homepage = "https://adobe-fonts.github.io/source-sans/"; + description = "Sans serif font family for user interface environments"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix new file mode 100644 index 000000000000..a4d472d60856 --- /dev/null +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchzip }: + +# Source Serif Pro got renamed to Source Serif 4 (see +# https://github.com/adobe-fonts/source-serif/issues/77). This is the +# last version named "Pro". It is useful for backward compatibility +# with older documents/templates/etc. +let + version = "3.001"; +in fetchzip { + name = "source-serif-pro-${version}"; + + url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-pro-${version}R.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/{opentype,truetype,variable} + unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype + unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable + ''; + + sha256 = "sha256-rYWk8D41QMuuSP+cQMk8ttT7uX3a7gBk4OqjA7K9udk="; + + meta = with lib; { + homepage = "https://adobe-fonts.github.io/source-serif/"; + description = "Typeface for setting text in many sizes, weights, and languages. Designed to complement Source Sans"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 45450a7c20f7..b78880824c74 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.62"; + version = "0.63.1"; in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "sha256-I0E2zYbfEFBEIBNC7nnJb+hOaBgGZkAIg08YpA8awso="; + sha256 = "sha256-z/1Y2eJMrQ+43UIt4HWcLwjYs+hfCY/g4iRxJ+yBAqw="; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index 6cceee558a94..92c01b427e2d 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -14,14 +14,14 @@ }: let - version = "13.0.2"; + version = "14.0.0"; twemojiSrc = fetchFromGitHub { name = "twemoji"; owner = "twitter"; repo = "twemoji"; rev = "v${version}"; - sha256 = "069pyq09jfzwp3xla8vmhbyyam32x2iyp0s29xcxlkj22p99bg6d"; + sha256 = "sha256-ar6rBYudMIMngMVe/IowDV3X8wA77JBA6g0x/M7YLMg="; }; pythonEnv = diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 44c3a2312461..6de709344b12 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,18 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "14.0.01"; + version = "14.0.02"; ttf = fetchurl { - url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; - sha256 = "19algkm4nnixmzshc25rjgh8gfccqinallgi86wgvkcwcmn6ccn6"; + # Unfortunately the 14.0.02 TTF file is not available on the GNU mirror. + # Restore this for next version: "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; + url = "https://unifoundry.com/pub/unifont/${pname}-${version}/font-builds/${pname}-${version}.ttf"; + sha256 = "1c8rdk3xg6j8lrzxddd73jppfgpk253jdkch63rr7n2d7ljp9gc3"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - sha256 = "1aj29pswi6qwpvjwncv5w3ndwy2nzli0200i6dx6f80036z8nz9i"; + sha256 = "0hcl1zihm91xwvh5ds01sybgs0j8zsrrhn4wlz5j6ji99rh797jr"; }; nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 902aba0caa24..92e274fe8ff7 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "14.0.01"; + version = "14.0.02"; in fetchzip rec { name = "unifont_upper-${version}"; @@ -9,7 +9,7 @@ in fetchzip rec { postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - sha256 = "0sb3m2qg0ri7zmxhjvrq8n0jmxxjx8rrx9rpibh5f5fbfkibq4gm"; + sha256 = "0p1c2kkg20jqddy828yj6sxfwgv8k5gxwmg0cybalrjb0s09kcs8"; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix index a41013fd490c..b8885298c084 100755 --- a/pkgs/data/fonts/vazir-fonts/default.nix +++ b/pkgs/data/fonts/vazir-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "vazir-fonts"; - version = "22.1.0"; + version = "32.0.0"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -14,13 +14,13 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; ''; - sha256 = "1nh3pyyw3082aizdwgyihh4z122z7kzp45ry7lzdhq9lshkpzglc"; + sha256 = "sha256-Uy8hgBtCcTLwXu9FkLN1WavUfP74Jf53ChxVGS3UBVM="; meta = with lib; { homepage = "https://github.com/rastikerdar/vazir-font"; description = "A Persian (Farsi) Font - قلم (فونت) فارسی وزیر"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/icons/comixcursors/default.nix b/pkgs/data/icons/comixcursors/default.nix new file mode 100644 index 000000000000..aa744878bcb3 --- /dev/null +++ b/pkgs/data/icons/comixcursors/default.nix @@ -0,0 +1,125 @@ +{ lib, stdenv, fetchFromGitLab, bc, librsvg, xcursorgen }: + +let + dimensions = { + color = [ "Black" "Blue" "Green" "Orange" "Red" "White" ]; + opacity = [ "" "Opaque_" ]; # Translucent or opaque. + thickness = [ "" "Slim_" ]; # Thick or slim edges. + handedness = [ "" "LH_" ]; # Right- or left-handed. + }; + product = lib.cartesianProductOfSets dimensions; + variantName = + { color, opacity, thickness, handedness }: + "${handedness}${opacity}${thickness}${color}"; + variants = + # (The order of this list is already good looking enough to show in the + # meta.longDescription.) + map variantName product; +in +stdenv.mkDerivation rec { + pname = "comixcursors"; + version = "0.9.2"; + + src = fetchFromGitLab { + owner = "limitland"; + repo = "comixcursors"; + # https://gitlab.com/limitland/comixcursors/-/issues/3 + rev = "8c327c8514ab3a352583605c1ddcb7eb3d1d302b"; + sha256 = "0bpxqw4izj7m0zb9lnxnmsjicfw60ppkdyv5nwrrz4x865wb296a"; + }; + + nativeBuildInputs = [ bc librsvg xcursorgen ]; + + patches = [ ./makefile-shell-var.patch ]; + + postPatch = '' + patchShebangs ./install-all ./bin/ + ''; + + # install-all is used instead of the directions in upstream's INSTALL file, + # because using its Makefile directly is broken. Upstream itself seems to use + # its build-distribution script instead, which also uses install-all, but we + # do not use it because it does extra things for other distros. + # + # When not all of the variants, i.e. only a smaller subset of them, are + # desired (i.e. when a subset of outputs are chosen), install-all will still + # build all of them. While upstream appears to provide old functionality for + # building only a subset, it is broken and we do not use it. With prebuilt + # substitutions, installers of this package will get only the outputs they + # chose. + buildPhase = '' + ICONSDIR=$TMP/staged ./install-all + ''; + + installPhase = '' + for outputName in $outputs ; do + if [ $outputName != out ]; then + local outputDir=''${!outputName}; + local iconsDir=$outputDir/share/icons + local cursorName=$(tr _ - <<<"$outputName") + + mkdir -p $iconsDir + cp -r -d $TMP/staged/ComixCursors-$cursorName $iconsDir + + unset outputDir iconsDir cursorName + fi + done + + # Need this directory (empty) to prevent the builder scripts from breaking. + mkdir -p $out + ''; + + outputs = let + default = "Opaque_Black"; + in + # Have the most-traditional variant be the default output (as the first). + # Even with outputsToInstall=[], the default/first still has an effect on + # some Nix tools (e.g. nix-build). + [ default ] ++ (lib.remove default variants) + # Need a dummy "out" output to prevent the builder scripts from breaking. + ++ [ "out" ]; + + # No default output (to the extent possible). Instead, the outputs' + # attributes are used to choose which variant(s) to have. + outputsToInstall = []; + + meta = with lib; { + description = "The Comix Cursors mouse themes"; + longDescription = '' + There are many (${toString ((length outputs) - 1)}) variants of color, + opacity, edge thickness, and right- or left-handedness, for this cursor + theme. This package's derivation has an output for each of these + variants, named following the upstream convention, and the attribute for + an output must be used to install a variant. E.g.: + + environment.systemPackages = [ + comixcursors.Blue + comixcursors.Opaque_Orange + comixcursors.Slim_Red + comixcursors.Opaque_Slim_White + comixcursors.LH_Green + comixcursors.LH_Opaque_Black + comixcursors.LH_Slim_Orange + comixcursors.LH_Opaque_Slim_Blue + ]; + + + Attempting to use just comixcursors, i.e. without an + output attribute, will not install any variants. To install all the + variants, use comixcursors.all (which is a list), e.g.: + + environment.systemPackages = comixcursors.all ++ [...]; + + + The complete list of output attributes is: + + ${concatStringsSep "\n" variants} + + ''; + homepage = "https://gitlab.com/limitland/comixcursors"; + changelog = "https://gitlab.com/limitland/comixcursors/-/blob/HEAD/NEWS"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.DerickEddington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/icons/comixcursors/makefile-shell-var.patch b/pkgs/data/icons/comixcursors/makefile-shell-var.patch new file mode 100644 index 000000000000..4032244c9ef0 --- /dev/null +++ b/pkgs/data/icons/comixcursors/makefile-shell-var.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -22,8 +22,6 @@ + + # Makefile for ComixCursors project. + +-SHELL = /bin/bash +- + CURSORSNAME = ComixCursors + PACKAGENAME ?= ${CURSORSNAME} + SUMMARY ?= The original Comix Cursors diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index 6ccd4c4622fa..1119e248522a 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "faba-icon-theme"; + pname = "faba-icon-theme"; version = "4.3"; src = fetchFromGitHub { owner = "moka-project"; - repo = package-name; + repo = "faba-icon-theme"; rev = "v${version}"; sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n"; }; diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix index 69e18beec32d..a72321ea304c 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "flat-remix-icon-theme"; - version = "20211106"; + version = "20220304"; src = fetchFromGitHub { owner = "daniruiz"; repo = "flat-remix"; rev = version; - sha256 = "1dlz88bg764zzd0s3yqci4m1awhwdrrql9l9plsjjzgdx9r7ndmf"; + sha256 = "sha256-SE3e3lPGLw6gONVQD8Joj6KNnXC/UygT0fy0AgH8us8="; }; nativeBuildInputs = [ @@ -36,7 +36,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flat remix is a pretty simple icon theme inspired on material design"; homepage = "https://drasite.com/flat-remix"; - license = with licenses; [ gpl3 ]; + license = with licenses; [ gpl3Only ]; + # breeze-icons and pantheon.elementary-icon-theme dependencies are restricted to linux platforms = platforms.linux; maintainers = with maintainers; [ mschneider ]; }; diff --git a/pkgs/data/icons/humanity-icon-theme/default.nix b/pkgs/data/icons/humanity-icon-theme/default.nix index 12e2d0a06d62..87ec255d9d4a 100644 --- a/pkgs/data/icons/humanity-icon-theme/default.nix +++ b/pkgs/data/icons/humanity-icon-theme/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, gtk3, gnome, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchurl, gtk3, gnome, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "humanity-icon-theme"; - version = "0.6.15"; + version = "0.6.16"; src = fetchurl { url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}.tar.xz"; - sha256 = "19ja47468s3jfabvakq9wknyfclfr31a9vd11p3mhapfq8jv9g4x"; + sha256 = "sha256-AyHl4zMyFE2/5Cui3Y/SB1yEUuyafDdybFPrafo4Ki0="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 8df63a75ad8d..01572e797612 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-kUgNj7KuxsQ/BvQ0ORl3xzEm9gv69+2PS0Bgv8i/S9U="; + sha256 = "sha256-3TKjd2Lblb+/zFq7rkdgnD1dJU3kis7QZi7Ui74IWzA="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix index f6ac136d4af6..99c31edd2fde 100644 --- a/pkgs/data/icons/luna-icons/default.nix +++ b/pkgs/data/icons/luna-icons/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "1.9"; + version = "1.9.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1l6jxbgq2qnw4qx0khkdxcq75v17cv2ccfnm28sslpzcc1r8amqd"; + sha256 = "sha256-ZUSG9lui07ICG/4M6LBEAhJo9KuKd+wMb2VoKu5Ifmg="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index ca5596be8329..2a5d60898bb2 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "22.01.15"; + version = "22.03.01"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-mOjNztzvSdKN4fgbcwYWA+iaYiRIa8v6EeK7eyX0lTs="; + sha256 = "sha256-adSoFKvemirQtxoS6KrQvXxtIOKFZ73PTktVXytblbM="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 4bfb30760c36..d335911c2461 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "22.01.15"; + version = "22.03.01"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-z1eLDJWvpUh4qSGz9xu/NcZjpC0Asj8v4HuUxiQO0cQ="; + sha256 = "sha256-VCXHInaxn5BKY9Yth6DjoKa/JS2WVjvwAfRMiL2r1B0="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 503e4e1d296a..9b0a2537f631 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20211201"; + version = "20220302"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-lcwQALFQ4zkgDLCX1uthAP3QZwP7UcWcPSOU+UTDykE="; + sha256 = "sha256-X92an2jGRgZ/Q3cr6Q729DA2hs/2y34HoRpB1rxk0hI="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/phinger-cursors/default.nix b/pkgs/data/icons/phinger-cursors/default.nix new file mode 100644 index 000000000000..5afd2fe228f6 --- /dev/null +++ b/pkgs/data/icons/phinger-cursors/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenvNoCC, fetchurl }: + +stdenvNoCC.mkDerivation rec { + pname = "phinger-cursors"; + version = "1.1"; + + src = fetchurl { + url = "https://github.com/phisch/phinger-cursors/releases/download/v${version}/phinger-cursors-variants.tar.bz2"; + sha256 = "sha256-II+1x+rcjGRRVB8GYkVwkKVHNHcNaBKRb6C613901oc="; + }; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons + cp -r ./phinger-cursors* $out/share/icons + runHook postInstall + ''; + + meta = with lib; { + description = "The most over-engineered cursor theme"; + homepage = "https://github.com/phisch/phinger-cursors"; + platforms = platforms.unix; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index 09d0875ca8a3..9e6b0666a118 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tango-icon-theme-0.8.90"; + pname = "tango-icon-theme"; + version = "0.8.90"; src = fetchurl { - url = "http://tango.freedesktop.org/releases/${name}.tar.gz"; + url = "http://tango.freedesktop.org/releases/tango-icon-theme-${version}.tar.gz"; sha256 = "13n8cpml71w6zfm2jz5fa7r1z18qlzk4gv07r6n1in2p5l1xi63f"; }; diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index 3ed389569bdc..dcff587dd357 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -4,6 +4,7 @@ , gtk3 , hicolor-icon-theme , jdupes +, gitUpdater , allColorVariants ? false , circularFolder ? false , colorVariants ? [] # default is standard @@ -16,13 +17,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow stdenvNoCC.mkDerivation rec { inherit pname; - version = "unstable-2021-12-24"; + version = "2022-03-07"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "aa1f1446b6dbc6acfe3ee247e6841369c68e1495"; - sha256 = "03f79h6kv5vbf92fhpi1wivzvcrfvvdvkhbmy805x4b4wl7qynki"; + rev = version; + sha256 = "vQeWGZmurvT/UQJ1dx6t+ZeKdJ1Oq9TdHBADw64x18g="; }; nativeBuildInputs = [ @@ -37,7 +38,7 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; # These fixup steps are slow and unnecessary for this package. - # Package may installs almost 400 000 small files. + # Package may install almost 400 000 small files. dontPatchELF = true; dontRewriteSymlinks = true; @@ -50,16 +51,18 @@ stdenvNoCC.mkDerivation rec { ${lib.optionalString circularFolder "-c"} \ ${if allColorVariants then "-a" else builtins.toString colorVariants} - jdupes -L -r $out/share/icons + jdupes --link-soft --recurse $out/share runHook postInstall ''; + passthru.updateScript = gitUpdater {inherit pname version; }; + meta = with lib; { description = "Flat and colorful personality icon theme"; homepage = "https://github.com/vinceliuice/Tela-circle-icon-theme"; license = licenses.gpl3Only; - platforms = platforms.unix; + platforms = platforms.linux; # darwin use case-insensitive filesystems that cause hash mismatches maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/data/icons/tela-icon-theme/default.nix index 4e2b824be4bc..56491fe4443b 100644 --- a/pkgs/data/icons/tela-icon-theme/default.nix +++ b/pkgs/data/icons/tela-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "tela-icon-theme"; - version = "2021-12-25"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-qlt9jv3lCPVFBeN4aQd4r9NE0YAxWQavMoo13cvhv6E="; + sha256 = "sha256-tnhu//q0Vl7MiMeHopB1Gwokkw/P+nDOo4HKizjxC0Y="; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/pkgs/data/icons/vimix-icon-theme/default.nix b/pkgs/data/icons/vimix-icon-theme/default.nix index 502a8023c9bd..853b1d209abb 100644 --- a/pkgs/data/icons/vimix-icon-theme/default.nix +++ b/pkgs/data/icons/vimix-icon-theme/default.nix @@ -1,7 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }: +{ lib +, stdenv +, fetchFromGitHub +, gtk3 +, hicolor-icon-theme +, jdupes +, colorVariants ? [] # default: all +}: + +let + pname = "vimix-icon-theme"; + +in +lib.checkListOfEnum "${pname}: color variants" [ "standard" "Amethyst" "Beryl" "Doder" "Ruby" "Black" "White" ] colorVariants stdenv.mkDerivation rec { - pname = "vimix-icon-theme"; + inherit pname; version = "2021-11-09"; src = fetchFromGitHub { @@ -23,10 +36,16 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + patchShebangs install.sh - ./install.sh -a -d $out/share/icons + + ./install.sh \ + ${if colorVariants != [] then builtins.toString colorVariants else "-a"} \ + -d $out/share/icons + # replace duplicate files with symlinks - jdupes -l -r $out/share/icons + jdupes -L -r $out/share/icons + runHook postInstall ''; diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix index 27465b828a61..c20a3dfe1950 100644 --- a/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "Whitesur-icon-theme"; - version = "2021-11-08"; + version = "2022-03-18"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "LZ0GLJFUUvzsPhU2sBkfy5mPpQHuPzYhbumwFKnogoA="; + sha256 = "iHLxZqcDLUo62J67MwZ72CSvsHHiI9/Jk31KwkgIPr4="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix index f4e1a6d2905f..45f86f6be21c 100644 --- a/pkgs/data/misc/brise/default.nix +++ b/pkgs/data/misc/brise/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, librime }: stdenv.mkDerivation { - name = "brise-unstable-2017-09-16"; + pname = "brise"; + version = "unstable-2017-09-16"; src = fetchFromGitHub { owner = "rime"; diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index c8a76b98367d..9ac49167f66b 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20210812"; + version = "20220216"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; rev = version; - sha256 = "sha256-dRqyjDC9yNkNOnYQ9fkWPlnyzSqIZ4zxZ2T7t8Bu9FE="; + sha256 = "sha256-Nr8OvxbJRf9t2BUtEX3qBAH2BSs6KWLMzSpykiwYsHQ="; }; preConfigure = '' diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh deleted file mode 100644 index 0bb61d863ece..000000000000 --- a/pkgs/data/misc/geolite-legacy/builder.sh +++ /dev/null @@ -1,20 +0,0 @@ -source "$stdenv/setup" - -mkdir -p $out/share/GeoIP -cd $out/share/GeoIP - -# Iterate over all environment variable names beginning with "src": -for var in "${!src@}"; do - # Store the value of the variable with name $var in $src: - eval src="\$$var" - - # Copy $src to current directory, removing Nix hash from the filename: - dest="${src##*/}" - dest="${dest#*-}" - cp "$src" "$dest" -done - -gzip -dv *.gz - -ln -s GeoLiteCity.dat GeoIPCity.dat -ln -s GeoLiteCityv6.dat GeoIPCityv6.dat diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 735a66089492..ad9560da9a48 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -1,41 +1,34 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, zstd }: -let - fetchDB = src: sha256: fetchurl { - inherit sha256; - url = "https://geolite.maxmind.com/download/geoip/database/${src}"; - }; -in stdenv.mkDerivation { pname = "geolite-legacy"; - version = "2017-12-02"; + version = "2022-01-25"; - srcGeoIP = fetchDB - "GeoLiteCountry/GeoIP.dat.gz" - "1nggml11wzlanmzk6wbw2kla91fj8ggd9kh9yz42lnyckdlf5ac4"; - srcGeoIPv6 = fetchDB - "GeoIPv6.dat.gz" - "0w809xgmr5zi4fgm9q3lhrnh1vl62s49n737bhq4jplm5918ki50"; - srcGeoLiteCity = fetchDB - "GeoLiteCity.dat.gz" - "0cibajsv5xdjpw1qfx22izm5azqcj0d7nvk39irgwflkim9jfjbs"; - srcGeoLiteCityv6 = fetchDB - "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" - "1ldwbzgs64irfgb3kq3jp8fmhwmwqk713dr4kkdqlglrblr9hfkc"; - srcGeoIPASNum = fetchDB - "asnum/GeoIPASNum.dat.gz" - "06qqs8qr8vxqwd80npz7n66k3bpc1vs7w43i2bb4k0di5yxnjwr9"; - srcGeoIPASNumv6 = fetchDB - "asnum/GeoIPASNumv6.dat.gz" - "1qyq4h8cja62giv6q1qqc502vsq53wzz1kx80mgvwngmycrxa21k"; + # We use Arch Linux package as a snapshot, because upstream database is updated in-place. + geoip = fetchurl { + url = "https://archive.archlinux.org/packages/g/geoip-database/geoip-database-20220125-1-any.pkg.tar.zst"; + sha256 = "sha256-ieuLpllJTHYu28UXBGfDWbnr9Ei8pGnos+RPWDsAGcM="; + }; + + extra = fetchurl { + url = "https://archive.archlinux.org/packages/g/geoip-database-extra/geoip-database-extra-20220125-1-any.pkg.tar.zst"; + sha256 = "sha256-xrTnuJvuvtvn+uIARtbuJUlHco3Q+9BXLljt35V3ip0="; + }; + + nativeBuildInputs = [ zstd ]; + + buildCommand = '' + tar -xaf "$geoip" + tar -xaf "$extra" + mkdir -p $out/share + mv usr/share/GeoIP $out/share + ''; meta = with lib; { description = "GeoLite Legacy IP geolocation databases"; - homepage = "https://geolite.maxmind.com/download/geoip"; - license = licenses.cc-by-sa-30; + homepage = "https://mailfud.org/geoip-legacy/"; + license = licenses.cc-by-sa-40; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; - - builder = ./builder.sh; } diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 6b2c5fc92553..d22dccf38cf0 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "6f406277d7106375f7148466c985061d20cb028b", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6f406277d7106375f7148466c985061d20cb028b.tar.gz", - "sha256": "0jvxybgv975lmk268x12dlp8xxv12vmpwc00k3nv6qqp0xd9bwla", - "msg": "Update from Hackage at 2022-01-18T22:54:05Z" + "commit": "aa8f2230d08c540df249147ea681a5c22314d083", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/aa8f2230d08c540df249147ea681a5c22314d083.tar.gz", + "sha256": "1h92r4si1vmf3v2m843xaqwr99hpnn1s0x08qcvd2gwjkc2qq10a", + "msg": "Update from Hackage at 2022-02-14T17:17:31Z" } diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix deleted file mode 100644 index 77b67e48f923..000000000000 --- a/pkgs/data/misc/mime-types/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, fetchzip }: - -let - version = "9"; -in fetchzip rec { - name = "mime-types-${version}"; - url = "https://mirrors.kernel.org/gentoo/distfiles/${name}.tar.bz2"; - postFetch = '' - mkdir -p $out/etc - tar xjvf $downloadedFile --directory=$out/etc --strip-components=1 - ''; - sha256 = "0gyla4wfiaccs0qh0hw7n08kdpnkkssglcg0z2jblb2lsdr4qna0"; - - meta = with lib; { - description = "A database of common mappings of file extensions to MIME types"; - homepage = "https://packages.gentoo.org/packages/app-misc/mime-types"; - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix index 783dc29ecb2d..ad58e5bd7b79 100644 --- a/pkgs/data/misc/miscfiles/default.nix +++ b/pkgs/data/misc/miscfiles/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "miscfiles-1.5"; + pname = "miscfiles"; + version = "1.5"; src = fetchurl { - url = "mirror://gnu/miscfiles/${name}.tar.gz"; + url = "mirror://gnu/miscfiles/miscfiles-${version}.tar.gz"; sha256 = "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka"; }; diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 51598a53d50a..234016175d26 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; - version = "20210805"; + version = "20220315"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-a/ihVY6lVBr7xve0QV50zJ9aqYKbE07Ks+8ch0ElaLw="; + sha256 = "sha256-H82sctF52xQnl4Nm9wG+HDx1Nf1aZYvFzIKCR8b2RcY="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 17a63debdc64..4af6f3b4db40 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,15 +1,25 @@ -{ lib, stdenv, fetchurl, osinfo-db-tools, gettext, libxml2 }: +{ lib +, stdenv +, fetchurl +, osinfo-db-tools +, gettext +, libxml2 +}: stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20210312"; + version = "20220214"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-dUjsCeRFynN4xc65njntyohX+Ck4MeCzy1WPQjCHDhA="; + sha256 = "sha256-E+bJAOuCAPFmD4oe13Xs7NWgH9skv7bu4c5l3XvP06k="; }; - nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; + nativeBuildInputs = [ + osinfo-db-tools + gettext + libxml2 + ]; installPhase = '' osinfo-db-import --dir "$out/share/osinfo" "${src}" @@ -18,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Osinfo database of information about operating systems for virtualization provisioning tools"; homepage = "https://gitlab.com/libosinfo/osinfo-db/"; + changelog = "https://gitlab.com/libosinfo/osinfo-db/-/commits/v${version}"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index d1e0434dc286..6d35279b6de2 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,20 +1,30 @@ -{ fetchurl, lib, stdenv, cmake, ninja }: +{ fetchurl +, lib +, stdenv +, cmake +, ninja +, poppler +}: stdenv.mkDerivation rec { - name = "poppler-data-0.4.11"; + pname = "poppler-data"; + version = "0.4.11"; src = fetchurl { - url = "https://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "sha256-LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw="; + url = "https://poppler.freedesktop.org/${pname}-${version}.tar.gz"; + sha256 = "LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw="; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + ]; meta = with lib; { homepage = "https://poppler.freedesktop.org/"; description = "Encoding files for Poppler, a PDF rendering library"; platforms = platforms.all; license = licenses.free; # more free licenses combined - maintainers = with maintainers; [ ]; + maintainers = poppler.meta.maintainers; }; } diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index 88f9eec8fcad..fd797d8d63f0 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "shared-desktop-ontologies-0.11.0"; + pname = "shared-desktop-ontologies"; + version = "0.11.0"; src = fetchurl { - url = "mirror://sourceforge/oscaf/${name}.tar.bz2"; + url = "mirror://sourceforge/oscaf/shared-desktop-ontologies-${version}.tar.bz2"; sha256 = "1m5vnijg7rnwg41vig2ckg632dlczzdab1gsq51g4x7m9k1fdbw2"; }; diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix index f7f5f64bfd7e..525e96de8e9b 100644 --- a/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,28 +2,45 @@ stdenvNoCC.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.15"; + version = "3.16"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - sha256 = "0r88j00shmhayfq8avswaxsaj1my1vq540rg0srma29862vrjpfk"; + hash = "sha256-FPN9EIwXtz0b1tUZ/AOWK2zj2nfd5+POGmRC52mSzcA="; }; + # List of file formats to package. + _types = [ "html" "json" "jsonld" "rdfa" "rdfnt" "rdfturtle" "rdfxml" "template" "text" ]; + + outputs = [ "out" ] ++ _types; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + installPhase = '' runHook preInstall - install -vDt $out/json json/licenses.json + mkdir -pv $out + for t in $_types + do + _outpath=''${!t} + mkdir -pv $_outpath + cp -ar $t $_outpath && echo "$t format installed" + done runHook postInstall ''; + dontFixup = true; + meta = with lib; { description = "Various data formats for the SPDX License List"; homepage = "https://github.com/spdx/license-list-data"; license = licenses.cc0; - maintainers = with maintainers; [ oxzi ]; + maintainers = with maintainers; [ oxzi c0bw3b ]; platforms = platforms.all; }; } diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 52662b190a74..78c93b05033e 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "BINDIR=$(bin)/bin" "ZICDIR=$(bin)/bin" "ETCDIR=$(TMPDIR)/etc" - "TZDEFAULT=$(TMPDIR)/etc" + "TZDEFAULT=tzdefault-to-remove" "LIBDIR=$(dev)/lib" "MANDIR=$(man)/share/man" "AWK=awk" @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { postInstall = '' rm $out/share/zoneinfo-posix + rm $out/share/zoneinfo/tzdefault-to-remove mkdir $out/share/zoneinfo/posix ( cd $out/share/zoneinfo/posix; ln -s ../* .; rm posix ) mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 89e12785b703..d6fe1a100e7f 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220114024213"; + version = "20220324104603"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-sF9WvXhyfMUvSXmFjkfGq4cZE/MiAnOKbkpv2CHSV3Q="; + sha256 = "sha256-Bd/jwHZ+6cg/cgVggyFI+Nc0FZ9qxI5Rk+y7SmGB08M="; }; vendorSha256 = "sha256-QUbnUnxG1tsNbR49HTl55aiLkBM/ae9mCtzWeN4Ju78="; meta = with lib; { diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 2bed43daeed9..1e0d35d52000 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202201200035"; + version = "202203240042"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "8d388b019028fb6fa9f0756b745331ffb9eb7c03"; - sha256 = "sha256-ymXaDmmMucTuvJRqjJv6n22e7ONRt1awtOMABFJ+Y/w="; + rev = "d7ff77f883216595a4b6674e9507f305195dcda3"; + sha256 = "sha256-wSm24nXz4QIM8e7Z8d08NjluLaBWEdl09FNAL3GR9so="; }; installPhase = '' diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 28737253af5e..735dfdb4f81b 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -63,8 +63,9 @@ let ''; meta = { - homepage = "http://wiki.docbook.org/topic/DocBookXslStylesheets"; + homepage = "https://github.com/docbook/wiki/wiki/DocBookXslStylesheets"; description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats"; + license = lib.licenses.mit; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.all; }; diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/data/soundfonts/fluid/default.nix index 1f84a6fd1eef..193c9a60b9fc 100644 --- a/pkgs/data/soundfonts/fluid/default.nix +++ b/pkgs/data/soundfonts/fluid/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "Fluid-3"; + pname = "Fluid"; + version = "3"; src = fetchurl { url = "https://ftp.osuosl.org/pub/musescore/soundfont/fluid-soundfont.tar.gz"; diff --git a/pkgs/data/soundfonts/generaluser/default.nix b/pkgs/data/soundfonts/generaluser/default.nix new file mode 100644 index 000000000000..5191199e6471 --- /dev/null +++ b/pkgs/data/soundfonts/generaluser/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchzip }: + +stdenv.mkDerivation rec { + pname = "generaluser"; + version = "1.471"; + + # 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: + url = "https://www.dropbox.com/s/4x27l49kxcwamp5/GeneralUser_GS_${version}.zip"; + sha256 = "sha256-lwUlWubXiVZ8fijKuNF54YQjT0uigjNAbjKaNjmC51s="; + }; + + installPhase = '' + install -Dm644 GeneralUser*.sf2 $out/share/soundfonts/GeneralUser-GS.sf2 + ''; + + meta = with lib; { + description = "a SoundFont bank featuring 259 instrument presets and 11 drum kits"; + homepage = "http://www.schristiancollins.com/generaluser.php"; + license = licenses.generaluser; + platforms = platforms.all; + maintainers = with maintainers; [ ckie ]; + }; +} diff --git a/pkgs/data/soundfonts/ydp-grand/default.nix b/pkgs/data/soundfonts/ydp-grand/default.nix new file mode 100644 index 000000000000..635b445f6115 --- /dev/null +++ b/pkgs/data/soundfonts/ydp-grand/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation { + pname = "ydp-grand"; + version = "unstable-2016-08-04"; + + src = fetchurl { + url = "https://freepats.zenvoid.org/Piano/YDP-GrandPiano/YDP-GrandPiano-SF2-20160804.tar.bz2"; + sha256 = "sha256-0kPcPhgqYN8qFukoKMGCHPPrV0i0Xi4r3Pqc968FYCY="; + }; + + installPhase = '' + install -Dm644 YDP-GrandPiano-*.sf2 $out/share/soundfonts/YDP-GrandPiano.sf2 + ''; + + meta = with lib; { + description = "Acoustic grand piano soundfont"; + homepage = "https://freepats.zenvoid.org/Piano/acoustic-grand-piano.html"; + license = licenses.cc-by-30; + platforms = platforms.all; + maintainers = with maintainers; [ ckie ]; + }; +} diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index ea18da119c7e..11e76c202764 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -3,36 +3,33 @@ , sassc , meson , ninja -, pkg-config -, gtk3 , glib , gnome , gtk-engine-murrine -, optipng , inkscape , cinnamon +, makeFontsConf +, python3 }: stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20211018"; + version = "20220223"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "1rrxm5b7l8kq1h0lm08ck54xljzm8w573mxx904n3rhdg3ri9d63"; + sha256 = "sha256-qsZdXDNxT1/gIlkUsC1cfVrULApC+dHreBXXjVTJQiA="; }; nativeBuildInputs = [ meson ninja - pkg-config sassc - optipng inkscape - gtk3 glib # for glib-compile-resources + python3 ]; propagatedUserEnvPkgs = [ @@ -40,17 +37,23 @@ stdenv.mkDerivation rec { gtk-engine-murrine ]; - preBuild = '' - # Shut up inkscape's warnings about creating profile directory - export HOME="$NIX_BUILD_ROOT" + postPatch = '' + patchShebangs meson/install-file.py ''; + preBuild = '' + # Shut up inkscape's warnings about creating profile directory + export HOME="$TMPDIR" + ''; + + # Fontconfig error: Cannot load default config file: No such file: (null) + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + mesonFlags = [ - "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity" - "-Dvariants=light,darker,dark,lighter" + # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity" + # "-Dvariants=light,darker,dark,lighter" "-Dcinnamon_version=${cinnamon.cinnamon-common.version}" "-Dgnome_shell_version=${gnome.gnome-shell.version}" - "-Dgtk3_version=${gtk3.version}" # You will need to patch gdm to make use of this. "-Dgnome_shell_gresource=true" ]; diff --git a/pkgs/data/themes/artim-dark/default.nix b/pkgs/data/themes/artim-dark/default.nix new file mode 100644 index 000000000000..9485f46b19a9 --- /dev/null +++ b/pkgs/data/themes/artim-dark/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec{ + pname = "artim-dark"; + version = "unstable-2021-12-29"; + + src = fetchFromGitHub { + owner="Mrcuve0"; + repo="Aritim-Dark"; + rev = "99cd330a1ab4814260e28f15431e3338a1103668"; + hash = "sha256-xGnw5KpXbVyDdTuAkav1Hec6bitpZdPzZk0xv7WHTdY="; + }; + + dontBuild = true; + installPhase = '' + mkdir -p $out/share/plasma/desktoptheme + cp -R KDE/plasmaTheme/Aritim-Dark* $out/share/plasma/desktoptheme + mkdir -p $out/share/aurorae/themes + cp -R KDE/auroraeTheme $out/share/aurorae/themes/Aritim-Dark + mkdir -p $out/share/color-schemes + cp -R KDE/colorScheme/*.colors $out/share/color-schemes + mkdir -p $out/share/plasma/look-and-feel + cp -R KDE/globalTheme $out/share/plasma/look-and-feel/Aritim-Dark + mkdir -p $out/share/themes + cp -R GTK $out/share/themes/Aritim-Dark + ''; + + meta = { + description = "Dark theme deeply inspired by the Ayu Dark color palette"; + homepage = "https://github.com/Mrcuve0/Aritim-Dark"; + license = with lib.licenses; [ gpl3Only ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.pasqui23 ]; + }; +} diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index cb6fc84723f2..326e004070b3 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall mkdir -p $out/share/themes/${themeName} - cp -a {assets,cinnamon,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,index.theme,metacity-1,unity,xfwm4} $out/share/themes/${themeName} + cp -a {assets,cinnamon,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,gtk-4.0,index.theme,metacity-1,unity,xfwm4} $out/share/themes/${themeName} cp -a kde/{color-schemes,plasma} $out/share/ cp -a kde/kvantum $out/share/Kvantum diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index 68a98337abc6..ec76d48457c5 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20211223"; + version = "20220321"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - sha256 = "sha256-jGE5ud7wEEa4JI1QTaCrOnbDwjQtDOFJX2uMo7t7+Js="; + sha256 = "sha256-QFG/jh3tPO0eflyDQaC1PJL/SavYD/W6rYp26Rxe/2E="; }; dontBuild = true; diff --git a/pkgs/data/themes/gnome-breeze/default.nix b/pkgs/data/themes/gnome-breeze/default.nix index 09f9ecd197a8..38733590a34e 100644 --- a/pkgs/data/themes/gnome-breeze/default.nix +++ b/pkgs/data/themes/gnome-breeze/default.nix @@ -1,12 +1,16 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "gnome-breeze-20160526"; - src = fetchgit { - url = "https://github.com/dirruk1/gnome-breeze"; - sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm"; + pname = "gnome-breeze"; + version = "unstable-2016-05-26"; + + src = fetchFromGitHub { + owner = "dirruk1"; + repo = "gnome-breeze"; rev = "49a5cd67a270e13a4c04a4b904f126ef728e9221"; + sha256 = "sha256-lQYVOhFBDOYT+glUHleuymGTfHEE5bIyqUFnS/EDc0I="; }; + installPhase = '' mkdir -p $out/share/themes cp -r Breeze* $out/share/themes @@ -14,12 +18,12 @@ stdenv.mkDerivation { preferLocalBuild = true; - meta = { + meta = with lib; { description = "A GTK theme built to match KDE's breeze theme"; homepage = "https://github.com/dirruk1/gnome-breeze"; - license = lib.licenses.lgpl2; - maintainers = with lib.maintainers; [ bennofs ]; - platforms = lib.platforms.all; + license = licenses.lgpl2; + maintainers = with maintainers; [ bennofs ]; + platforms = platforms.all; hydraPlatforms = []; }; } diff --git a/pkgs/data/themes/graphite/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix similarity index 70% rename from pkgs/data/themes/graphite/default.nix rename to pkgs/data/themes/graphite-gtk-theme/default.nix index 7f3ee33c039c..132e2e9c3762 100644 --- a/pkgs/data/themes/graphite/default.nix +++ b/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub +, gitUpdater , gnome-themes-extra , gtk-engine-murrine , jdupes @@ -10,6 +11,8 @@ , sizeVariants ? [] # default: standard , tweaks ? [] , wallpapers ? false +, withGrub ? false +, grubScreens ? [] # default: 1080p }: let @@ -19,17 +22,18 @@ in lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "blue" "all" ] themeVariants lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants -lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "midblack" "rimless" "normal" ] tweaks +lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dark" "rimless" "normal" ] tweaks +lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation rec { inherit pname; - version = "unstable-2022-01-07"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "78e5421fee63b4c2a2a3d2e321538367b01a24ec"; - sha256 = "1vfvv1gfbr9yr9mz0kb7c7ij6pxcryni1fjs87gn4hpyzns431wk"; + rev = "7ab6a1b7eda81e914405a9931408b1d5c73e6891"; + sha256 = "maYHA+AICoPiZo62IJ52UFUhOZh+6m2e9z6Kz0zrsSc="; }; nativeBuildInputs = [ @@ -65,11 +69,25 @@ stdenvNoCC.mkDerivation { ''} ''} + ${lib.optionalString withGrub '' + ( + cd other/grub2 + + patchShebangs install.sh + + ./install.sh --justcopy --dest $out/share/grub/themes \ + ${lib.optionalString (builtins.elem "nord" tweaks) "--theme nord"} \ + ${lib.optionalString (grubScreens != []) "--screen " + builtins.toString grubScreens} + ) + ''} + jdupes -L -r $out/share runHook postInstall ''; + passthru.updateScript = gitUpdater { inherit pname version; }; + meta = with lib; { description = "Flat Gtk+ theme based on Elegant Design"; homepage = "https://github.com/vinceliuice/Graphite-gtk-theme"; diff --git a/pkgs/data/themes/graphite-kde-theme/default.nix b/pkgs/data/themes/graphite-kde-theme/default.nix new file mode 100644 index 000000000000..dd3a215a0385 --- /dev/null +++ b/pkgs/data/themes/graphite-kde-theme/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "graphite-kde-theme"; + version = "2022-02-08"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "0pnn5s1vfdgkpsy5sc838731ly1imi8pbyd4asibw4zi238l0nvf"; + }; + + installPhase = '' + runHook preInstall + + patchShebangs install.sh + + substituteInPlace install.sh \ + --replace '$HOME/.local' $out \ + --replace '$HOME/.config' $out/share + + name= ./install.sh --dest $out/share/themes + + mkdir -p $out/share/sddm/themes + cp -a sddm/Graphite $out/share/sddm/themes/ + + runHook postInstall + ''; + + meta = with lib; { + description = "A flat Design theme for KDE Plasma desktop"; + homepage = "https://github.com/vinceliuice/Graphite-kde-theme"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix index 06496ea9be14..a52c0d0357bc 100644 --- a/pkgs/data/themes/greybird/default.nix +++ b/pkgs/data/themes/greybird/default.nix @@ -1,14 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, sassc +, gdk-pixbuf +, librsvg +, gtk-engine-murrine +, gitUpdater +}: stdenv.mkDerivation rec { pname = "greybird"; - version = "3.22.15"; + version = "3.23.1"; src = fetchFromGitHub { owner = "shimmerproject"; repo = pname; rev = "v${version}"; - sha256 = "1fk66fxy2lif9ngazlgkpsziw216i4b1ld2zm97cadf7n97376g9"; + sha256 = "hfi2TBRrZTSN43tYKMPvb/dWwwUE7RakKTMBziHnCWA="; }; nativeBuildInputs = [ @@ -27,6 +38,8 @@ stdenv.mkDerivation rec { gtk-engine-murrine ]; + passthru.updateScript = gitUpdater { inherit pname version; rev-prefix = "v"; }; + meta = with lib; { description = "Grey and blue theme from the Shimmer Project for GTK-based environments"; homepage = "https://github.com/shimmerproject/Greybird"; diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix new file mode 100644 index 000000000000..b77c136e4067 --- /dev/null +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, wrapQtAppsHook +, kwin +, kdelibs4support +, libepoxy +, libXdmcp +, lib +}: + +stdenv.mkDerivation rec { + pname = "kde-rounded-corners"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "matinlotfali"; + repo = "KDE-Rounded-Corners"; + rev = "v${version}"; + hash = "sha256-cXpJabeOHnat7OljtRzduUdOaA6Z3z6vV3aBKwiIrR0="; + }; + + postConfigure = '' + substituteInPlace cmake_install.cmake \ + --replace "${kdelibs4support}" "$out" + ''; + + nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; + buildInputs = [ kwin kdelibs4support libepoxy libXdmcp ]; + + meta = with lib; { + description = "Rounds the corners of your windows"; + homepage = "https://github.com/matinlotfali/KDE-Rounded-Corners"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ flexagoon ]; + }; +} diff --git a/pkgs/data/themes/layan-kde/default.nix b/pkgs/data/themes/layan-kde/default.nix new file mode 100644 index 000000000000..40cd6c055bf1 --- /dev/null +++ b/pkgs/data/themes/layan-kde/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, fetchFromGitHub +, gitUpdater +}: + +stdenv.mkDerivation rec { + pname = "layan-kde"; + version = "2022-02-13"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "09z90g13l26v23nwr8n5bapwldp3hhdrdikynvm4vvb7qsvb4vrp"; + }; + + postPatch = '' + patchShebangs install.sh + + substituteInPlace install.sh \ + --replace '$HOME/.local' $out \ + --replace '$HOME/.config' $out/share + ''; + + installPhase = '' + runHook preInstall + + name= ./install.sh --dest $out/share/themes + + mkdir -p $out/share/sddm/themes + cp -a sddm/Layan* $out/share/sddm/themes/ + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater {inherit pname version; }; + + meta = with lib; { + description = "A flat Design theme for KDE Plasma desktop"; + homepage = "https://github.com/vinceliuice/Layan-kde"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 7a1b79d6d97c..1e9f9041ca12 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -5,17 +5,18 @@ , gtk-engine-murrine , gtk_engines , librsvg +, gitUpdater }: stdenv.mkDerivation rec { pname = "marwaita"; - version = "12.0"; + version = "13.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "10mf1cbm6a9k0b1vcafy3jb7kicpvnf6xqmn1dfxwsq3k81mmy7d"; + sha256 = "sha256-aP/zPM7M8Oru/2AA8w6rKU/AVJJ0bAEC01C60yi2SbM="; }; buildInputs = [ @@ -37,6 +38,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater {inherit pname version; }; + meta = with lib; { description = "GTK theme supporting Budgie, Pantheon, Mate, Xfce4 and GNOME desktops"; homepage = "https://www.pling.com/p/1239855/"; diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index a2a518d3f0a0..d250de15ca9a 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -7,70 +7,70 @@ stdenv.mkDerivation rec { pname = "nordic"; - version = "unstable-2022-01-08"; + version = "unstable-2022-02-26"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "85086324c2a8fa7ca538b85ad0681e03733b2c86"; - sha256 = "sha256-p1nr71iJZm+2123WF67NkunBX2dR4ruK2Afqd7XdeGc="; + rev = "0da58e462e8ba6c71245d13fbddac950b72018ae"; + sha256 = "sha256-w7e3DqQV4L/OvntKHJA4+3Dj6dRnlH73SxvW770QIyU="; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "46c9e6665963ccb54938d7730e520bd8c52f4307"; - sha256 = "sha256-uFnNLshyKOvzaij7tEKb0fw0j3/GGfzznAf/aaKx7XI="; + rev = "9daf11acf3419e2f23d0993ce862a1c944fb8519"; + sha256 = "sha256-zGgw6THLX7q19BDsllPUrWqQcL6FYAewcyqjQdXzLzg="; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "da5c930386427fce65ea185f164709c8a20e362f"; - sha256 = "sha256-Ee9ymuMWs2ZgU+8FVLaviGtHMT4Sz5NWLaEGln2Z4V0="; + rev = "a40819bd00160f987cdf254ce8c34eabebecf0eb"; + sha256 = "sha256-rSNLdxTfvzTFzI5723WIGRS+NZ8iqUOUliDpkznZrwE="; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "fd85fb2712ac1192e35c92149b75bfc3c440b1c7"; - sha256 = "sha256-6WUQBeNq7EKNkYcCt/fUYloue90gxfp8bDYawkQQ6ss="; + rev = "4e69cf6e1798938ab7c5795940c663d866ce8201"; + sha256 = "sha256-p8VaKeKxEiYX4oVqWoyschAq0j/LvPq9yD/awaHKRZw="; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "259e30ce13566214c7594b038dd2c240648a07a0"; - sha256 = "sha256-F6hC6XbT9yJl6SW9qJNlwmmBcvOrOS5yPCQALZFhgbM="; + rev = "866629583187b914725f05683125fde7f6c280f1"; + sha256 = "sha256-TQ4G5W87zpTrLU+f+eb5VHwaWuKSbItXCgXSL33U8As="; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "2a27051d87558dfa595fb94eff34241d3a1b8c30"; - sha256 = "sha256-JIld6GVtr1tz02Do2Ft92qtza6iGrPapasd6jmMFG6k="; + rev = "f3702ae02e3caaf74eab0ef9156af9f2a476021b"; + sha256 = "sha256-drXRfZxCrH2vAXjZSAjWEHcQrehxnM0WLkgbh+cFJhI="; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "0bea76aed39bb2a2669278b8403c4129aa47be0f"; - sha256 = "sha256-OXmz6uHXh1zl93sgv5WEwARkEUCr4PRh0/mJyMLXpnk="; + rev = "4cf3e5c30ebd17a3d53ab0337c191e304feff7b5"; + sha256 = "sha256-LTCJ7AyABQDTDkjuqcXaKXePFwOpmXeKaW2mWYah4ao="; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "8fe52b6c276a7e548e87a558db6734cf9f003b06"; - sha256 = "sha256-/IxlBvMLAK+mGRyaa7bTv/oZS24nSNeE5GsyJIeN6UU="; + rev = "72cbd567212b21ea20769fe244c148f799435536"; + sha256 = "sha256-qNIyr+Eo0dzPVh9PxDCHv0e6pswACbf9nLhAG75YEYc="; name = "Nordic-Polar-standard-buttons"; }) ]; diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index 666166e0a9d2..ccaee7f65522 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -21,13 +21,13 @@ assert lib.assertMsg (unknownTweaks == [ ]) '' stdenvNoCC.mkDerivation rec { pname = "orchis-theme"; - version = "2021-12-13"; + version = "2022-02-18"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - sha256 = "sha256-PN2ucGMDzRv4v86X1zVIs9+GkbMWuja2WaSQLFvJYd0="; + sha256 = "sha256-SqptW8DEDCB6LMHalRlf71TWK93gW+blbu6Q1Oommes="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/pkgs/data/themes/pitch-black/default.nix b/pkgs/data/themes/pitch-black/default.nix new file mode 100644 index 000000000000..95037f90239e --- /dev/null +++ b/pkgs/data/themes/pitch-black/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec{ + pname = "pitch-black"; + version = "unstable-2019-07-23"; + + src = fetchFromGitHub { + repo = pname; + owner = "freefreeno"; + rev = "d8039341419aef1157c030bf3d9237bd926e0b95"; + hash = "sha256-Rn3ZMBD6srIkYFNN3HT5JFP46Akodmeqz5tbV2/2ZDA="; + }; + + dontBuild = true; + + installPhase = '' + rm LICENSE README.md + mkdir -p $out/share + mv GTK $out/share/themes + mv * $out/share + ''; + + meta = with lib; { + description = "A dark plasma theme built with usability in mind"; + homepage = "https://github.com/freefreeno/Pitch-Black"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.pasqui23 ]; + }; +} diff --git a/pkgs/data/themes/plano/default.nix b/pkgs/data/themes/plano/default.nix index 9f05a1991935..c321dc235c49 100644 --- a/pkgs/data/themes/plano/default.nix +++ b/pkgs/data/themes/plano/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "plano-theme"; - version = "3.38-1"; + version = "4.0"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0g2mwvzc04z3dsdfhwqgw9s7987406pv22s9rbazfvprk4ddc5b6"; + sha256 = "sha256-slGr2nsdKng6zaVDeXWFAWKIxZbcnOLU6RH6wM0293E="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/stilo/default.nix b/pkgs/data/themes/stilo/default.nix index bfcda0493294..6401c0e28694 100644 --- a/pkgs/data/themes/stilo/default.nix +++ b/pkgs/data/themes/stilo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stilo-themes"; - version = "3.38-1"; + version = "4.0"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "09xarzp0j0a8cqzcg0447jl5cgvl6ccj5f00dik1hy2nlrz7d8ad"; + sha256 = "sha256-YKEDXrOAn7pGWb0VcOx7cKHnuX120yPzqtUVnzyLrDQ="; }; nativeBuildInputs = [ meson ninja sassc ]; diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index 6833f473664f..825772880d6e 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -4,25 +4,47 @@ , glib , gnome-shell , gnome-themes-extra +, jdupes , libxml2 , sassc , util-linux +, altVariants ? [] # default: normal +, colorVariants ? [] # default: all +, opacityVariants ? [] # default: all +, themeVariants ? [] # default: default (BigSur-like theme) +, nautilusSize ? null # default: 200px +, panelOpacity ? null # default: 15% +, panelSize ? null # default: 32px }: +let + pname = "whitesur-gtk-theme"; + single = x: lib.optional (x != null) x; + +in +lib.checkListOfEnum "${pname}: alt variants" [ "normal" "alt" "all" ] altVariants +lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: opacity variants" [ "normal" "solid" ] opacityVariants +lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants +lib.checkListOfEnum "${pname}: nautilus sidebar minimum width" [ "default" "180" "220" "240" "260" "280" ] (single nautilusSize) +lib.checkListOfEnum "${pname}: panel opacity" [ "default" "30" "45" "60" "75" ] (single panelOpacity) +lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (single panelSize) + stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2021-12-28"; + version = "2022-02-21"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0i81aickccfp8fffilhi335hj5ijz2n38yj3zw2fnbwgm667i0fc"; + sha256 = "1bqgbkx7qhpj9vbqcxb69p67m8ix3avxr81pdpdi56g9gqbnkpfc"; }; nativeBuildInputs = [ glib gnome-shell + jdupes libxml2 sassc util-linux @@ -48,8 +70,21 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + mkdir -p $out/share/themes - ./install.sh --dest $out/share/themes --alt all --theme all + + ./install.sh \ + ${toString (map (x: "--alt " + x) altVariants)} \ + ${toString (map (x: "--color " + x) colorVariants)} \ + ${toString (map (x: "--opacity " + x) opacityVariants)} \ + ${toString (map (x: "--theme " + x) themeVariants)} \ + ${lib.optionalString (nautilusSize != null) ("--size " + nautilusSize)} \ + ${lib.optionalString (panelOpacity != null) ("--panel-opacity " + panelOpacity)} \ + ${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \ + --dest $out/share/themes + + jdupes --link-soft --recurse $out/share + runHook postInstall ''; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 64bd3eb5eebc..67762e747f4a 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "21.10.2"; + version = "22.04.2"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "sha256-VN/jgKGM2Th+2nv91vEz47kmQiBx8xAiEVbtXwhZg6U="; + sha256 = "sha256-oW5OOJPhC3OB3GIQWTQxPgqE7p4bAO1TyVbyKUHnyD0="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/data/themes/zuki/default.nix index 098edf6cc2e1..d557e151d264 100644 --- a/pkgs/data/themes/zuki/default.nix +++ b/pkgs/data/themes/zuki/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zuki-themes"; - version = "3.38-1"; + version = "4.0"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0890i8kavgnrhm8ic4zpl16wc4ngpnf1zi8js9gvki2cl7dlj1xm"; + sha256 = "1q026wa8xgyb6f5k7pqpm5zav30dbnm3b8w59as3sh8rhfgpbf80"; }; nativeBuildInputs = [ meson ninja sassc ]; diff --git a/pkgs/desktops/arcan/arcan/clone-sources.nix b/pkgs/desktops/arcan/arcan/clone-sources.nix index 2ade63e70bfa..c7c6bebb704a 100644 --- a/pkgs/desktops/arcan/arcan/clone-sources.nix +++ b/pkgs/desktops/arcan/arcan/clone-sources.nix @@ -11,7 +11,7 @@ rev = "94cb3a2eb96b3f17a1a3bd0e6f7da97c0e1d8f57"; sha256 = "sha256-LzjqunX/T8khF2UjPlPYiQOwMGem8MqPYneR2LdZ5Fg="; }; - libuvc-src = fetchgit { + libuvc-src = fetchFromGitHub { owner = "libuvc"; repo = "libuvc"; rev = "b2b01ae6a2875d05c99eb256bb15815018d6e837"; diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/desktops/arcan/durden/default.nix index b5fc02127ece..46012d69d2dd 100644 --- a/pkgs/desktops/arcan/durden/default.nix +++ b/pkgs/desktops/arcan/durden/default.nix @@ -5,15 +5,19 @@ stdenv.mkDerivation rec { pname = "durden"; - version = "0.6.1+date=2021-10-17"; + version = "0.6.1+date=2022-03-11"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "5fb8b0f9bc2952ed9cf7dc20a1c5c0cc44c02ff1"; - hash = "sha256-+EIsrCkMe9MrUQOCh0R+rsDg/Rqs3iQWO0GZCgZQ+No="; + rev = "fec2a1051500df28becce188d932645743091efa"; + hash = "sha256-uZ7oTnkWG3P/4ETgn6MQ9v47mRAJnvyzglQS7jlabPA="; }; + dontConfigure = true; + + dontBuild = true; + installPhase = '' runHook preInstall diff --git a/pkgs/desktops/arcan/pipeworld/default.nix b/pkgs/desktops/arcan/pipeworld/default.nix index fa1a09230d9d..09f809aa4718 100644 --- a/pkgs/desktops/arcan/pipeworld/default.nix +++ b/pkgs/desktops/arcan/pipeworld/default.nix @@ -5,15 +5,19 @@ stdenv.mkDerivation rec { pname = "pipeworld"; - version = "0.pre+date=2021-11-26"; + version = "0.pre+date=2021-12-03"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "9f816db154ca5c54af952ad11c2186ccac5bdd2d"; - hash = "sha256-uwnrRsMP0RLEGr2mEVQ6kEtV/c6t5qSCHY0ynywPzkw="; + rev = "c653414670cafb0c73a57492aa3d9510460b16a9"; + hash = "sha256-XuAsuTC+P6yoNlDnsT2fiWoqKW+1JKc9NF+Vn/ta0pk="; }; + dontConfigure = true; + + dontBuild = true; + installPhase = '' runHook preInstall diff --git a/pkgs/desktops/arcan/prio/default.nix b/pkgs/desktops/arcan/prio/default.nix index 34443baa8017..406aea740fc4 100644 --- a/pkgs/desktops/arcan/prio/default.nix +++ b/pkgs/desktops/arcan/prio/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "prio"; - version = "0.pre+unstable=2018-09-13"; + version = "0.pre+date=2018-09-13"; src = fetchFromGitHub { owner = "letoram"; @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { hash = "sha256-Idv/duEYmDk/rO+TI8n+FY3VFDtUEh8C292jh12BJuM="; }; + dontConfigure = true; + + dontBuild = true; + installPhase = '' runHook preInstall diff --git a/pkgs/desktops/arcan/xarcan/default.nix b/pkgs/desktops/arcan/xarcan/default.nix index d72bf4ad5bb3..0668754d6aa4 100644 --- a/pkgs/desktops/arcan/xarcan/default.nix +++ b/pkgs/desktops/arcan/xarcan/default.nix @@ -38,23 +38,15 @@ stdenv.mkDerivation rec { pname = "xarcan"; - version = "0.6.0+unstable=2021-06-14"; + version = "0.6.0+date=2021-08-26"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "98d28a5f2c6860bb191fbc1c9e577c18e4c9a9b7"; - hash = "sha256-UTIVDKnYD/q0K6G7NJUKh1tHcqnsuiJ/cQxWuPMJ2G4="; + rev = "e40f0176e495ffdad6e7405c58378df6532eb70d"; + hash = "sha256-T+1oL7P5MTDkeSfW6OXc1OgfZ8E6e/4YRonf1eXcfIA="; }; - patches = [ - # fix build with meson 0.60 - (fetchpatch { - url = "https://github.com/letoram/xarcan/commit/b67e514dbb59bffc23b75d47ca7f24e96c4aeb05.patch"; - sha256 = "sha256-tSQmNy1Id6nDIN+03dc1+rEEF8fMq0yJBiscNM60xic="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -122,6 +114,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index 7715f4f232ad..77650e71ebe9 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -18,10 +18,10 @@ let }; in stdenv.mkDerivation rec { version = "2.3.2"; - name = "cde-${version}"; + pname = "cde"; src = fetchurl { - url = "mirror://sourceforge/cdesktopenv/${name}.tar.gz"; + url = "mirror://sourceforge/cdesktopenv/cde-${version}.tar.gz"; sha256 = "029rljhi5r483x8rzdpl8625z0wx8r7k2m0364nbw66h5pig9lbx"; }; @@ -46,6 +46,8 @@ in stdenv.mkDerivation rec { bison ncompress gawk autoPatchelfHook makeWrapper fakeroot rpcsvc-proto ]; + # build fails otherwise + enableParallelBuilding = false; makeFlags = [ "World" diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 47e43758447c..e8bf145e5028 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.2.3"; + version = "5.2.4"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-kPxwWciNf4KQx3JG1qPQcZJeOa4B+udMyQmH8A7JcfQ="; + sha256 = "sha256-v63dFiBKtLCmRnwJ6u814lSv+tfPG+IIJtcWCnOEZjk="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapps/default.nix index dfde8773ec06..7927026166a1 100644 --- a/pkgs/desktops/cinnamon/xapps/default.nix +++ b/pkgs/desktops/cinnamon/xapps/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "xapps"; - version = "2.2.5"; + version = "2.2.8"; outputs = [ "out" "dev" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Ev+gTl9jY1HLbXKnCsVVSsY8ZrHyzsIkp+JTaXOTm6I="; + hash = "sha256-70troRGklu5xGjBIrGvshcOX/UT96hIEFXyo4yj2GT4="; }; # TODO: https://github.com/NixOS/nixpkgs/issues/36468 diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index 147c36cbda40..9864e1c0e18b 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.2.2"; + version = "3.3.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-rAPc4RF2uXp1hI8/8PXDYy3DnL5vNR8rF/EEixO0FXI="; + sha256 = "sha256-wBrP5SHGPvH/Gz9QY253zQuf8WSjV19oNB5aIqXGLZ8="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index e8fb0f1f5c99..5f5720c253b0 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.2.2"; + version = "3.2.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-FFRms4yh7TQ/O3ee7igeIslimSWLhue3BE1xCrJ3NQ4="; + sha256 = "sha256-OyHSBXtJ/TExl06NLUAaIZq4u0+fI3YGQ37HRZeNP+0="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index fb67cafd63a3..7ab1bd79c30a 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.26.1"; + version = "1.26.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0hm6i1f2g4mwj726rc6na38xhys1plbv9swrlc9hrpa87mz6gac6"; + sha256 = "071h0pscbd8g341yy5rz9mk1xn8yhryldhl6mmr1y6lafaycyy99"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 3c2dc7f33165..3fe63ade488c 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "enlightenment"; - version = "0.25.1"; + version = "0.25.3"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0i1424vsc929h36hx04646pbrjiya6nc1nqr6s15xwvfv7imzw1c"; + sha256 = "1xngwixp0cckfq3jhrdmmk6zj67125amr7g6xwc6l89pnpmlkz9p"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index a2e4f717f481..7b3ffe2f1124 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl, nixosTests }: stdenv.mkDerivation rec { pname = "terminology"; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { patchShebangs data/colorschemes/*.py ''; + passthru.tests.test = nixosTests.terminal-emulators.terminology; + meta = with lib; { description = "Powerful terminal emulator based on EFL"; homepage = "https://www.enlightenment.org/about-terminology"; diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix deleted file mode 100644 index b997a9ddd1a3..000000000000 --- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkg-config, intltool, gtkmm2, libglade }: - -stdenv.mkDerivation rec { - name = "libglademm-2.6.7"; - - src = fetchurl { - url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2"; - sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q"; - }; - - outputs = [ "out" "devdoc" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool ]; - - propagatedBuildInputs = [ gtkmm2 libglade ]; -} diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 90d6fd0b7aa5..a8ff7b58ed30 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -62,10 +62,6 @@ lib.makeScope pkgs.newScope (self: with self; { autoreconfHook = pkgs.autoreconfHook269; }; -#### BINDINGS - - libglademm = callPackage ./bindings/libglademm { }; - } // lib.optionalAttrs (config.allowAliases or true) { inherit (pkgs) # GTK Libs @@ -89,4 +85,5 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_icon_theme = self.gnome-icon-theme; gnomeicontheme = self.gnome-icon-theme; gnome_common = gnome-common; + libglademm = throw "libglademm has been removed"; # 2022-01-15 }) diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index c4c489dae08e..df8e9548c35e 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , desktop-file-utils , gettext , glibcLocales @@ -17,33 +16,23 @@ , glib , gnome , gtk3 +, libhandy , json-glib , libarchive , libnotify , nautilus -, pantheon , unzip -, withPantheon ? false }: stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.40.0"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "039w1dcpa5ypmv6sm634alk9vbcdkyvy595vkh5gn032jsiqca2a"; + sha256 = "HEOObVPsEP9PLrWyLXu/KKfCqElXq2SnUcHN88UjAsc="; }; - patches = lib.optionals withPantheon [ - # Make this respect dark mode settings from Pantheon - # https://github.com/elementary/fileroller/ - (fetchpatch { - url = "https://raw.githubusercontent.com/elementary/fileroller/f183eac36c68c9c9441e72294d4e305cf5fe36ed/fr-application-prefers-color-scheme.patch"; - sha256 = "sha256-d/sqf4Oen9UrzYqru7Ck15o/6g6WfxRDH/iAGFXgYAA="; - }) - ]; - LANG = "en_US.UTF-8"; # postinstall.py nativeBuildInputs = [ @@ -65,12 +54,11 @@ stdenv.mkDerivation rec { glib gnome.adwaita-icon-theme gtk3 + libhandy json-glib libarchive libnotify nautilus - ] ++ lib.optionals withPantheon [ - pantheon.granite ]; PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; diff --git a/pkgs/desktops/gnome/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix index a6748dfc4174..b8783e4db462 100644 --- a/pkgs/desktops/gnome/apps/gedit/default.nix +++ b/pkgs/desktops/gnome/apps/gedit/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , meson , fetchurl , python3 @@ -7,12 +8,12 @@ , glib , adwaita-icon-theme , libpeas +, libxml2 , gtksourceview4 , gsettings-desktop-schemas , wrapGAppsHook , ninja , libsoup -, tepl , gnome , gspell , perl @@ -23,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "40.1"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "149ngl9qw6h59546lir1pa7hvw23ppsnqlj9mfqphmmn5jl99qsm"; + sha256 = "epsYsViAjRiSmJFl83BsTxooKXkHmrdFinnTwkrU3rU="; }; patches = [ @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils itstool + libxml2 meson ninja perl @@ -57,7 +59,6 @@ stdenv.mkDerivation rec { gtksourceview4 libpeas libsoup - tepl ]; postPatch = '' @@ -81,7 +82,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Gedit"; description = "Official text editor of the GNOME desktop environment"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix index d12c8f61017c..1ec3c9dfdf27 100644 --- a/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -1,7 +1,9 @@ { stdenv , lib , fetchurl +, fetchpatch , pkg-config +, gi-docgen , meson , ninja , python3 @@ -11,23 +13,38 @@ , gettext , itstool , libxml2 -, gtk3 +, gtk4 , glib , atk +, gobject-introspection , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "ghex"; - version = "3.41.1"; + version = "4.beta.1"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/ghex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "i3nPAJ6uXEfK0KtT4hmcOm+y86thh381m+1SR3DuYfc="; + url = "mirror://gnome/sources/ghex/${version}/${pname}-${version}.tar.xz"; + sha256 = "sBS/9cY++uHLGCbLeex8ZW697JJn3dK+HaM6tHBdwJ4="; }; + patches = [ + # Fix build with -Werror=format-security + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/ghex/-/commit/3d35359f3a12b6abb4a3d8a12a0f39b7221be408.patch"; + sha256 = "4z9nUd+/eBOUGwl3MErse+FKLzGqtWKwkIzej57CnYk="; + }) + # Build devhelp index. + # https://gitlab.gnome.org/GNOME/ghex/-/merge_requests/25 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/ghex/-/commit/b26a7b1135ea2fe956a9bc0669b3b6ed818716c3.patch"; + sha256 = "nYjjxds9GNWkW/RhXEe5zJzPF4TnLMsCELEqYR4dXTk="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils gettext @@ -35,12 +52,14 @@ stdenv.mkDerivation rec { meson ninja pkg-config + gi-docgen python3 + gobject-introspection wrapGAppsHook ]; buildInputs = [ - gtk3 + gtk4 atk glib ]; @@ -50,9 +69,18 @@ stdenv.mkDerivation rec { desktop-file-utils ]; + mesonFlags = [ + "-Dgtk_doc=true" + ]; + postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = { diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 29b08aa3c1ed..7853a80f073d 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "41.3"; + version = "42.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "m4QGgNHnOG/d/WoVrU3Q8s2ljv6BjPVHg3tGrovw4Yk="; + sha256 = "GuIS/4mZFVQuxTtU2VtozfJx2VjPUSzcP+3Hgixu4SM="; }; doCheck = true; diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix index db353165c28d..10267a6c8701 100644 --- a/pkgs/desktops/gnome/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -1,40 +1,54 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , meson , ninja , pkg-config -, wrapGAppsHook -, libdazzle +, wrapGAppsHook4 , libgweather , geoclue2 , geocode-glib -, python3 , gettext , libxml2 , gnome -, gtk3 +, gtk4 , evolution-data-server +, libical , libsoup , glib -, gnome-online-accounts , gsettings-desktop-schemas -, libhandy -, adwaita-icon-theme +, libadwaita }: stdenv.mkDerivation rec { pname = "gnome-calendar"; - version = "41.2"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "lWsvGQMiZRxn/mZyI4lviqWs8ztwraWjsFpTYb2mYRo="; + sha256 = "tj9z9VAy/BOQRC+UzfazyrnJHHdN3S5cYez+ydLF6ao="; }; - patches = [ - # https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84 - # A refactor has caused the PR patch to drift enough to need rebasing - ./gtk_image_reset_crash.patch + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + libxml2 + wrapGAppsHook4 + ]; + + buildInputs = [ + gtk4 + evolution-data-server # waiting for GTK4 port + libical + libsoup + glib + libgweather + geoclue2 + geocode-glib + gsettings-desktop-schemas + libadwaita ]; passthru = { @@ -44,41 +58,11 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ - meson - ninja - pkg-config - gettext - libxml2 - wrapGAppsHook - python3 - ]; - - buildInputs = [ - gtk3 - evolution-data-server - libsoup - glib - gnome-online-accounts - libdazzle - libgweather - geoclue2 - geocode-glib - gsettings-desktop-schemas - adwaita-icon-theme - libhandy - ]; - - postPatch = '' - chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file - patchShebangs build-aux/meson/meson_post_install.py - ''; - meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Calendar"; description = "Simple and beautiful calendar application for GNOME"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch b/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch deleted file mode 100644 index 5065295b57b7..000000000000 --- a/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/gui/views/gcal-year-view.c b/src/gui/views/gcal-year-view.c -index ac32a8f9..532425c1 100644 ---- a/src/gui/views/gcal-year-view.c -+++ b/src/gui/views/gcal-year-view.c -@@ -2158,7 +2158,11 @@ update_weather (GcalYearView *self) - if (!updated) - { - gtk_label_set_text (self->temp_label, ""); -- gtk_image_clear (self->weather_icon); -+ /* FIXME: This should never be NULL, but it somehow is. -+ * https://gitlab.gnome.org/GNOME/gnome-calendar/issues/299 -+ */ -+ if (self->weather_icon != NULL) -+ gtk_image_clear (self->weather_icon); - } - } - diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 960a3320472d..b43e0cdecadf 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -7,26 +7,26 @@ , gettext , gnome , glib -, gtk3 +, gtk4 , pango -, wrapGAppsHook +, wrapGAppsHook4 , python3 +, desktop-file-utils , gobject-introspection , gjs , libunistring -, libhandy +, libadwaita , gsettings-desktop-schemas -, adwaita-icon-theme , gnome-desktop }: stdenv.mkDerivation rec { pname = "gnome-characters"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0yw6mimfwn0fij8zncjb4rg8bnazd1z47rmzq85lk6807nlyqag1"; + sha256 = "XaD/uBb4prRPMDdEyoJ6NAgBGMHJONjXmvF7f+Z5gPg="; }; nativeBuildInputs = [ @@ -36,39 +36,39 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + desktop-file-utils + wrapGAppsHook4 ]; buildInputs = [ - adwaita-icon-theme gjs glib gnome-desktop # for typelib gsettings-desktop-schemas - gtk3 + gtk4 libunistring - libhandy + libadwaita pango ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py + + # https://gitlab.gnome.org/GNOME/gnome-characters/-/merge_requests/70 + substituteInPlace meson_post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" ''; dontWrapGApps = true; - # Fixes https://github.com/NixOS/nixpkgs/issues/31168 postFixup = '' - for file in $out/share/org.gnome.Characters/org.gnome.Characters \ - $out/share/org.gnome.Characters/org.gnome.Characters.BackgroundService - do - sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ - -i $file - - wrapGApp "$file" - done + # Fixes https://github.com/NixOS/nixpkgs/issues/31168 + file="$out/share/org.gnome.Characters/org.gnome.Characters" + sed -e $"2iimports.package._findEffectiveEntryPointName = () => \'$(basename $file)\' " \ + -i $file + wrapGApp "$file" ''; passthru = { diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index 2e8ec02bd845..3c57c6272e84 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , meson , ninja @@ -7,35 +8,34 @@ , wrapGAppsHook , itstool , desktop-file-utils -, vala +, vala_0_56 , gobject-introspection , libxml2 -, gtk3 +, gtk4 , glib , gsound , sound-theme-freedesktop , gsettings-desktop-schemas -, adwaita-icon-theme , gnome-desktop , geocode-glib , gnome , gdk-pixbuf , geoclue2 , libgweather -, libhandy +, libadwaita }: stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "34yLBKuS+mGPXe5RGFce+fyeilt5XqAKNcbcZ3ywLaw="; + sha256 = "DnEY20oDLjzqMhLZjLuCjWt88i/gXgxfyLORxqPdb+A="; }; nativeBuildInputs = [ - vala + vala_0_56 meson ninja pkg-config @@ -48,17 +48,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 + gtk4 glib gsettings-desktop-schemas gdk-pixbuf - adwaita-icon-theme gnome-desktop geocode-glib geoclue2 libgweather gsound - libhandy + libadwaita ]; preFixup = '' @@ -81,7 +80,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Clocks"; description = "Clock application designed for GNOME 3"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index 83e88059f806..b8517a833b00 100644 --- a/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, vala +, vala_0_56 , gettext , itstool , python3 @@ -14,6 +14,7 @@ , glib , gtk3 , libhandy +, libsecret , libxml2 , gtk-vnc , gtk-frdp @@ -22,18 +23,18 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "41.2"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-WrmUKPPOn4qDdDK2e3XbxSi5U6QpOotWVE34g0b+VxM="; + hash = "sha256-L3s5u0OPS2oM3Jn2JjGpXbI+W7JC7Gg5pMlQKchwJO0="; }; nativeBuildInputs = [ meson ninja pkg-config - vala + vala_0_56 gettext itstool python3 @@ -48,6 +49,7 @@ stdenv.mkDerivation rec { gtk-vnc gtk3 libhandy + libsecret libxml2 gtk-frdp ]; diff --git a/pkgs/desktops/gnome/apps/gnome-logs/default.nix b/pkgs/desktops/gnome/apps/gnome-logs/default.nix index da06eb4404c1..16d487867b8f 100644 --- a/pkgs/desktops/gnome/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-logs/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -10,6 +10,7 @@ , wrapGAppsHook , gettext , itstool +, libhandy , libxml2 , libxslt , docbook_xsl @@ -21,21 +22,13 @@ stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "3.36.0"; + version = "42.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-logs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0w1nfdxbv3f0wnhmdy21ydvr4swfc108hypda561p7l9lrhnnxj4"; + url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "TV5FFp1r9DkC16npoHk8kW65LaumuoWzXI629nLNq9c="; }; - patches = [ - # https://gitlab.gnome.org/GNOME/gnome-logs/-/issues/52 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-logs/-/commit/b42defceefc775220b525f665a3b662ab9593b81.patch"; - sha256 = "1s0zscmhwy7r0xff17wh8ik8x9xw1vrkipw5vl5i770bxnljps8n"; - }) - ]; - nativeBuildInputs = [ python3 meson @@ -53,9 +46,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 + libhandy systemd gsettings-desktop-schemas - gnome.adwaita-icon-theme ]; mesonFlags = [ @@ -80,7 +73,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Logs"; description = "A log viewer for the systemd journal"; maintainers = teams.gnome.members; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 8fd993080693..0efb5faa3c71 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , gettext @@ -29,13 +31,22 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "41.2"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-gYIbTK/GQc1QDXOzMMY85aBahPBDBxbWPoizyuqs/Qw="; + sha256 = "sha256-BUSG03dAc3BqdqmBQXl40VG+O3Ik1yN3W74xbvoked8="; }; + patches = [ + # Do not pin to GWeather 3.0, the used API did not change in 4.0. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-maps/-/commit/759d3087b70341b2c5f1af575ce44338d926690e.patch"; + sha256 = "Qp9Hta00TLf2lOb9+g9vnPoK17mP3eHpCG2i1ewaw+w="; + revert = true; + }) + ]; + doCheck = true; nativeBuildInputs = [ @@ -78,7 +89,7 @@ stdenv.mkDerivation rec { # entry point to the wrapped binary we get back to a wrapped # binary. substituteInPlace "data/org.gnome.Maps.service.in" \ - --replace "Exec=@pkgdatadir@/org.gnome.Maps" \ + --replace "Exec=@pkgdatadir@/@app-id@" \ "Exec=$out/bin/gnome-maps" ''; diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index 96ec321fa4a9..4676710bfc61 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -15,7 +15,7 @@ , grilo , grilo-plugins , pkg-config -, gtk3 +, gtk4 , pango , glib , desktop-file-utils @@ -23,21 +23,20 @@ , itstool , gnome , gst_all_1 -, libdazzle , libsoup -, libhandy +, libadwaita , gsettings-desktop-schemas }: python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "41.0"; + version = "42.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1llz2aqa3n3ivwl7i09pgylsbgrfzb872vcj1k7pvivxm1kkbcb9"; + sha256 = "nWgZj5hSveD4NFhLlqgSiX0xDLcXKLak8Ji8spsZxdA="; }; nativeBuildInputs = [ @@ -54,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { ]; buildInputs = [ - gtk3 + gtk4 pango glib libmediaart @@ -66,9 +65,8 @@ python3.pkgs.buildPythonApplication rec { grilo grilo-plugins libnotify - libdazzle libsoup - libhandy + libadwaita gsettings-desktop-schemas tracker ] ++ (with gst_all_1; [ @@ -85,13 +83,6 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ]; - postPatch = '' - for f in meson_post_conf.py meson_post_install.py; do - chmod +x $f - patchShebangs $f - done - ''; - # Prevent double wrapping, let the Python wrapper use the args in preFixup. dontWrapGApps = true; diff --git a/pkgs/desktops/gnome/apps/gnome-notes/default.nix b/pkgs/desktops/gnome/apps/gnome-notes/default.nix index 6af206069e29..0ecd1e2ef6fd 100644 --- a/pkgs/desktops/gnome/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-notes/default.nix @@ -1,8 +1,10 @@ -{ lib, stdenv +{ stdenv +, lib , meson , ninja , gettext , fetchurl +, fetchpatch , pkg-config , wrapGAppsHook , itstool @@ -32,6 +34,15 @@ stdenv.mkDerivation rec { sha256 = "1gvvb2klkzbmyzwkjgmscdiqcl8lyz9b0rxb4igjz079csq6z805"; }; + patches = [ + # Fix build with meson 0.61 + # data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-notes/-/commit/994af76ce5144062d55d141129bf6bf5fab002ee.patch"; + sha256 = "sha256-z7dPOLZzaqvdqUIDy6+V3dKossRbG0EDjBu2oJCF6b4="; + }) + ]; + doCheck = true; postPatch = '' diff --git a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix index 29f7aa6e9ee4..cd7259c3ae95 100644 --- a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , pkg-config , gettext @@ -6,7 +7,7 @@ , wrapGAppsHook , gjs , glib -, gtk3 +, gtk4 , gdk-pixbuf , gst_all_1 , gnome @@ -14,16 +15,16 @@ , ninja , python3 , desktop-file-utils -, libhandy +, libadwaita }: stdenv.mkDerivation rec { pname = "gnome-sound-recorder"; - version = "40.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "00b55vsfzx877b7mj744abzjws7zclz71wbvh0axsrbl9l84ranl"; + sha256 = "TAjDFSgvPr96LabyDg/58McdqlIp/NL+C1wKqqoG8K0="; }; nativeBuildInputs = [ @@ -40,9 +41,9 @@ stdenv.mkDerivation rec { buildInputs = [ gjs glib - gtk3 + gtk4 gdk-pixbuf - libhandy + libadwaita ] ++ (with gst_all_1; [ gstreamer gst-plugins-base diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index 22f9ac176aad..ac065aaaec7e 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "41.1"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-YZ7FINbgkF1DEWcCTkPc4Nv2o0Xy1IaTUB1w3HYm+GE="; + sha256 = "sha256-DjIUDuHBNChWO81feE5h7iL/0a0n2MAig7Q1ioHfq1A="; }; nativeBuildInputs = [ @@ -53,14 +53,6 @@ stdenv.mkDerivation rec { pcre ]; - postPatch = '' - chmod +x build-aux/meson/postinstall.py - patchShebangs build-aux/meson/postinstall.py - substituteInPlace build-aux/meson/postinstall.py \ - --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" - ''; - - passthru = { updateScript = gnome.updateScript { packageName = "gnome-text-editor"; diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix index 32eb07fbd62b..cdcf0d69a33b 100644 --- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "gnome-todo"; - version = "unstable-2022-01-01"; + version = "unstable-2022-03-11"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-todo"; - rev = "4a6be8c38510d909a9f94ec34c4da1f31ac9f1ab"; - sha256 = "5UGo9vMb8scPWK91gftYOjqkJs9tGMiH1lqyEqedF2A="; + rev = "07791399742366b4e3a6897430054d91df4594b4"; + sha256 = "821KgxkkW4T6bdGuttAz9ao/WStM1QEfn4hY/b0d0jI="; }; patches = [ diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index aa192a6a3b65..b7921322d994 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -3,8 +3,8 @@ , fetchurl , pkg-config , gnome -, gtk3 -, libhandy +, gtk4 +, libadwaita , wrapGAppsHook , gjs , gobject-introspection @@ -12,18 +12,17 @@ , meson , ninja , geoclue2 -, gnome-desktop , python3 , gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1vidwq768xnrnr24jcfbpwjczz7vm5zmaiv41nb75q4p8avlwqg5"; + sha256 = "V57mkdhT5bs/9Q6Me0P4Wundfls6ZJ4CwlSi2bgHtGU="; }; nativeBuildInputs = [ @@ -35,11 +34,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 - libhandy + gtk4 + libadwaita gjs gobject-introspection - gnome-desktop libgweather gnome.adwaita-icon-theme geoclue2 @@ -70,7 +68,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Weather"; description = "Access current weather conditions and forecasts"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/apps/polari/default.nix b/pkgs/desktops/gnome/apps/polari/default.nix index f207307588a1..c734a5c5c828 100644 --- a/pkgs/desktops/gnome/apps/polari/default.nix +++ b/pkgs/desktops/gnome/apps/polari/default.nix @@ -1,15 +1,40 @@ -{ lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme -, telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils -, pkg-config, gtk4, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib -, gnome, wrapGAppsHook4, telepathy-logger, gspell, gsettings-desktop-schemas }: +{ stdenv +, lib +, itstool +, fetchurl +, gdk-pixbuf +, telepathy-glib +, gjs +, meson +, ninja +, gettext +, telepathy-idle +, libxml2 +, desktop-file-utils +, pkg-config +, gtk4 +, libadwaita +, gtk3 +, glib +, libsecret +, libsoup +, webkitgtk +, gobject-introspection +, appstream-glib +, gnome +, wrapGAppsHook4 +, telepathy-logger +, gspell +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "polari"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "o7BfgWYDcMZ8lCtvRLKYx7eIFv6zjJJuwiEr3iLqQOs="; + sha256 = "WPFbv1tCwLASPv3td1cR07DyRJl1cwlAOMpVZGHgSTw="; }; patches = [ @@ -19,16 +44,38 @@ stdenv.mkDerivation rec { ./make-thumbnailer-wrappable.patch ]; - propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; + propagatedUserEnvPkgs = [ + telepathy-idle + telepathy-logger + ]; nativeBuildInputs = [ - meson ninja pkg-config itstool gettext wrapGAppsHook4 libxml2 - desktop-file-utils gobject-introspection appstream-glib + meson + ninja + pkg-config + itstool + gettext + wrapGAppsHook4 + libxml2 + desktop-file-utils + gobject-introspection + appstream-glib ]; buildInputs = [ - gtk4 gtk3 glib adwaita-icon-theme gsettings-desktop-schemas - telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup webkitgtk + gtk4 + libadwaita + gtk3 # for thumbnailer + glib + gsettings-desktop-schemas + telepathy-glib + telepathy-logger + gjs + gspell + gdk-pixbuf + libsecret + libsoup + webkitgtk # for thumbnailer ]; postFixup = '' @@ -46,7 +93,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Apps/Polari"; description = "IRC chat client designed to integrate with the GNOME desktop"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index c7c85779d3fb..b3c9e1ea62ae 100644 --- a/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "71M52MNfytXRBIG3BICAPw+iCz08vDOSOPys7q7gHro="; + sha256 = "XoW1rcje5maQD8rycbpxf33LnQoD2W2uCPnL0n4YseA="; }; # For convenience, we can specify adwaita-icon-theme only in packages diff --git a/pkgs/desktops/gnome/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix index 40ea18b1af1e..7c463e8ed283 100644 --- a/pkgs/desktops/gnome/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -8,22 +8,22 @@ , ninja , pkg-config , python3 -, gtk3 -, libhandy +, gtk4 +, libadwaita , glib , libxml2 -, wrapGAppsHook +, wrapGAppsHook4 , itstool , gnome }: stdenv.mkDerivation rec { pname = "baobab"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ytYnjS3MgMhLVxBapbtY2KMM6Y1vq9dnUZ3bhshX6FU="; + sha256 = "Sxqr5rqxWCs/6nmigpvOfyQVu25QYvJTV67t1TF6UNw="; }; nativeBuildInputs = [ @@ -37,21 +37,27 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook - # Prevents “error: Package `libhandy-1' not found in specified Vala API + wrapGAppsHook4 + # Prevents “error: Package `libadwaita-1' not found in specified Vala API # directories or GObject-Introspection GIR directories” with strictDeps, # even though it should only be a runtime dependency. - libhandy + libadwaita ]; buildInputs = [ - gtk3 - libhandy + gtk4 + libadwaita glib ]; doCheck = true; + postPatch = '' + # https://gitlab.gnome.org/GNOME/baobab/-/merge_requests/40 + substituteInPlace build-aux/post-install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index cdde96ae43b9..08baf9022f71 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, fetchpatch , meson , ninja , gettext @@ -12,9 +12,9 @@ , libportal-gtk3 , gnome , gtk3 +, libhandy , glib , gsettings-desktop-schemas -, adwaita-icon-theme , gnome-desktop , lcms2 , gdk-pixbuf @@ -24,27 +24,20 @@ , librsvg , libexif , gobject-introspection -, python3 +, gi-docgen }: stdenv.mkDerivation rec { pname = "eog"; - version = "41.1"; + version = "42.0"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-huG5ujnaz3QiavpFermDtBJTuJ9he/VBOcrQiS0C2Kk="; + sha256 = "sha256-+zW/tRZ6QhIfWae5t6wNdbvQUXua/W2Rgx6E01c13fg="; }; - patches = [ - # Fix build with latest libportal - # https://gitlab.gnome.org/GNOME/eog/-/merge_requests/115 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/eog/-/commit/a06e6325907e136678b0bbe7058c25d688034afd.patch"; - sha256 = "ttcsfHubfmIbxA51YLnxXDagLLNutXYmoQyMQ4sHRak="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -52,15 +45,16 @@ stdenv.mkDerivation rec { gettext itstool wrapGAppsHook - libxml2 + libxml2 # for xmllint for xml-stripblanks gobject-introspection - python3 + gi-docgen ]; buildInputs = [ libjpeg libportal-gtk3 gtk3 + libhandy gdk-pixbuf glib libpeas @@ -71,13 +65,11 @@ stdenv.mkDerivation rec { exempi gsettings-desktop-schemas shared-mime-info - adwaita-icon-theme ]; - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; + mesonFlags = [ + "-Dgtk_doc=true" + ]; preFixup = '' gappsWrapperArgs+=( @@ -88,6 +80,11 @@ stdenv.mkDerivation rec { ) ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index eb8caa4f1eff..43b3eb2ee2fc 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -11,7 +11,6 @@ , icu , wrapGAppsHook , gnome -, pantheon , libportal-gtk3 , libxml2 , libxslt @@ -41,37 +40,23 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "41.3"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ugEmjuVPMY39rC4B66OKP8lpQMHL9kDtJhOuKfi8ua0="; + sha256 = "Pb+owA5Ft/ROGCTQHw/r6DcHtfuTMMJhFz9ot/A81eM="; }; patches = lib.optionals withPantheon [ # Pantheon specific patches for epiphany # https://github.com/elementary/browser # - # Make this respect dark mode settings from Pantheon - # https://github.com/elementary/browser/pull/21 - # https://github.com/elementary/browser/pull/41 - (fetchpatch { - url = "https://raw.githubusercontent.com/elementary/browser/cc17559a7ac6effe593712b4f3d0bbefde6e3b62/dark-style.patch"; - sha256 = "sha256-RzMUc9P51UN3tRFefzRtMniXR9duOOmLj5eu5gL2TEQ="; - }) # Patch to unlink nav buttons # https://github.com/elementary/browser/pull/18 (fetchpatch { url = "https://raw.githubusercontent.com/elementary/browser/cc17559a7ac6effe593712b4f3d0bbefde6e3b62/navigation-buttons.patch"; sha256 = "sha256-G1/JUjn/8DyO9sgL/5Kq205KbTOs4EMi4Vf3cJ8FHXU="; }) - ] ++ [ - # Fix build with latest libportal - # https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1051 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/84474398f6e59266b73170838219aa896729ce93.patch"; - sha256 = "SeiLTo3FcOxuml5sJX9GqyGdyGf1jm1A76SOI0JJvoo="; - }) ]; nativeBuildInputs = [ @@ -94,7 +79,6 @@ stdenv.mkDerivation rec { glib glib-networking gnome-desktop - gnome.adwaita-icon-theme gst_all_1.gst-libav gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base @@ -117,8 +101,6 @@ stdenv.mkDerivation rec { p11-kit sqlite webkitgtk - ] ++ lib.optionals withPantheon [ - pantheon.granite ]; # Tests need an X display diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 74987c07a5b9..18451ce239f7 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -32,41 +31,27 @@ , gsettings-desktop-schemas , gnome-desktop , dbus -, pantheon , python3 , texlive -, t1lib , gst_all_1 -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 +, gi-docgen , supportMultimedia ? true # PDF multimedia , libgxps , supportXPS ? true # Open XML Paper Specification via libgxps -, withPantheon ? false +, withLibsecret ? true }: stdenv.mkDerivation rec { pname = "evince"; - version = "41.3"; + version = "42.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "M0awH5vcjy1f/qkvEQoJDGSjYklCtbVDqtRZKp3jO7A="; + sha256 = "skdnuz1RA7TjWw4VzwM9viSI+IcAzdiC0ipDre7C6Ao="; }; - patches = lib.optionals withPantheon [ - # Make this respect dark mode settings from Pantheon - # https://github.com/elementary/evince/pull/21 - # https://github.com/elementary/evince/pull/31 - (fetchpatch { - url = "https://raw.githubusercontent.com/elementary/evince/c8364019ee2c2dffd2a1bccf79b8f4e526aa22af/dark-style.patch"; - sha256 = "sha256-nKELRXnM6gMRTGmWdO1Qqlo9ciy+4HOK5z2CYOoi2Lo="; - }) - ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py @@ -74,11 +59,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream - docbook-xsl-nons - docbook_xml_dtd_43 gettext gobject-introspection - gtk-doc + gi-docgen itstool meson ninja @@ -103,13 +86,13 @@ stdenv.mkDerivation rec { libarchive libhandy librsvg - libsecret libspectre libxml2 pango poppler - t1lib texlive.bin.core # kpathsea for DVI support + ] ++ lib.optionals withLibsecret [ + libsecret ] ++ lib.optionals supportXPS [ libgxps ] ++ lib.optionals supportMultimedia (with gst_all_1; [ @@ -119,13 +102,15 @@ stdenv.mkDerivation rec { gst-plugins-bad gst-plugins-ugly gst-libav - ]) ++ lib.optionals withPantheon [ - pantheon.granite - ]; + ]); mesonFlags = [ "-Dnautilus=false" "-Dps=enabled" + ] ++ lib.optionals (!withLibsecret) [ + "-Dkeyring=disabled" + ] ++ lib.optionals (!supportMultimedia) [ + "-Dmultimedia=disabled" ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; @@ -134,6 +119,11 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 11308bfcf5e9..e43fe60eb7e9 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -1,18 +1,57 @@ -{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome, python3, gobject-introspection -, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit -, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja -, libkrb5, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber -, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas, boost, protobuf }: +{ stdenv +, lib +, fetchurl +, substituteAll +, pkg-config +, gnome +, python3 +, gobject-introspection +, gettext +, libsoup +, libxml2 +, libsecret +, icu +, sqlite +, tzdata +, libcanberra-gtk3 +, gcr +, p11-kit +, db +, nspr +, nss +, libical +, gperf +, wrapGAppsHook +, glib-networking +, pcre +, vala +, cmake +, ninja +, libkrb5 +, openldap +, webkitgtk +, libaccounts-glib +, json-glib +, glib +, gtk3 +, libphonenumber +, gnome-online-accounts +, libgweather +, libgdata +, gsettings-desktop-schemas +, boost +, protobuf +}: stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.42.3"; + version = "3.44.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "b1hHoSNHmQc+lYXbhhwhOBoJ7VUNwKISXwC6X5C9Nh0="; + sha256 = "DYiBtcUeG5F2GxlF2yZKRqq/VKc+6hyo9EiyB4FdWC4="; }; patches = [ @@ -23,19 +62,47 @@ stdenv.mkDerivation rec { ]; prePatch = '' - substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \ + substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \ + --subst-var-by ESD_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} \ --subst-var-by GDS_GSETTINGS_PATH ${glib.getSchemaPath gsettings-desktop-schemas} patches="$patches $PWD/hardcode-gsettings.patch" ''; nativeBuildInputs = [ - cmake ninja pkg-config intltool python3 gperf wrapGAppsHook gobject-introspection vala + cmake + ninja + pkg-config + gettext + python3 + gperf + wrapGAppsHook + gobject-introspection + vala ]; + buildInputs = [ - glib libsoup libxml2 gtk3 gnome-online-accounts - gcr p11-kit libgweather libgdata libaccounts-glib json-glib - icu sqlite libkrb5 openldap webkitgtk glib-networking - libcanberra-gtk3 pcre libphonenumber boost protobuf + glib + libsoup + libxml2 + gtk3 + gnome-online-accounts + gcr + p11-kit + libgweather + libgdata + libaccounts-glib + json-glib + icu + sqlite + libkrb5 + openldap + webkitgtk + glib-networking + libcanberra-gtk3 + pcre + libphonenumber + boost + protobuf ]; propagatedBuildInputs = [ @@ -55,6 +122,7 @@ stdenv.mkDerivation rec { "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" "-DWITH_PHONENUMBER=ON" + "-DWITH_GWEATHER4=ON" ]; passthru = { @@ -67,7 +135,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Unified backend for programs that work with contacts, tasks, and calendar information"; homepage = "https://wiki.gnome.org/Apps/Evolution"; - license = licenses.lgpl2; + license = licenses.lgpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index 392ea61688a6..990f1bef2119 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -19,6 +19,7 @@ , gtk3 , libcanberra-gtk3 , pam +, libgudev , libselinux , keyutils , audit @@ -43,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "gdm"; - version = "41.0"; + version = "42.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "VzjEKTqfWoDUpungb00N8+nzE8p7Yb+02K+rqYPiANw="; + sha256 = "oyisl2k3vsF5lx/weCmhJGuYznJBgcEorjKguketOFU="; }; mesonFlags = [ @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { keyutils libX11 libcanberra-gtk3 + libgudev libselinux pam plymouth diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix index 89a49e4cecb3..ba70570b1f85 100644 --- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gettext }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, gnome +}: stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "HaGsDSYb7fD80shbSAvGVQXiPPUfEUMSbA03cX5pMUU="; - }; - - passthru = { - updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome.gnome-backgrounds"; }; + sha256 = "TH/hoJ9FnF93GJpZglJPzgXYiJRJVdZ5kQ8jRgbBKV0="; }; patches = [ @@ -20,9 +22,22 @@ stdenv.mkDerivation rec { ./stable-dir.patch ]; - nativeBuildInputs = [ meson ninja pkg-config gettext ]; + nativeBuildInputs = [ + meson + ninja + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-backgrounds"; + attrPath = "gnome.gnome-backgrounds"; + }; + }; meta = with lib; { + description = "Default wallpaper set for GNOME"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-backgrounds"; + license = licenses.cc-by-sa-30; platforms = platforms.unix; maintainers = teams.gnome.members; }; diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index 07b77c04994d..7d8fc2bc8674 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -5,15 +5,17 @@ , meson , ninja , pkg-config -, gtk3 +, gtk4 +, libadwaita , gettext , glib , udev +, upower , itstool , libxml2 , wrapGAppsHook , libnotify -, libcanberra-gtk3 +, gsound , gobject-introspection , gtk-doc , docbook-xsl-nons @@ -24,14 +26,14 @@ stdenv.mkDerivation rec { pname = "gnome-bluetooth"; - version = "3.34.5"; + version = "42.0"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c"; + url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "PR4nIGc7yaJCYZ3F0jH9bndsGKSdop9DzcQzBVrbAXA="; }; nativeBuildInputs = [ @@ -51,24 +53,19 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gtk3 + gtk4 + libadwaita udev + upower libnotify - libcanberra-gtk3 - gnome.adwaita-icon-theme + gsound gsettings-desktop-schemas ]; mesonFlags = [ - "-Dicon_update=false" "-Dgtk_doc=true" ]; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = pname; @@ -77,8 +74,8 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; - description = "Application that let you manage Bluetooth in the GNOME destkop"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-bluetooth"; + description = "Application that lets you manage Bluetooth in the GNOME desktop"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 6a7a8ccec06b..889155f19a6d 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -8,29 +8,28 @@ , fetchurl , pkg-config , libxml2 -, gtk3 +, gtk4 , glib -, gtksourceview4 +, gtksourceview5 , wrapGAppsHook , gobject-introspection -, python3 , gnome , mpfr , gmp , libsoup , libmpc -, libhandy +, libadwaita , gsettings-desktop-schemas , libgee }: stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "41.1"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "AmdhSv2yXTi3hBG0Lrq3vFDBtjQMxJu2jA5DLX3fijQ="; + sha256 = "pTWhTr6ljmkaS1oIUlau0GCiw/BzhKw6PQGDIzKifko="; }; nativeBuildInputs = [ @@ -41,32 +40,25 @@ stdenv.mkDerivation rec { gettext itstool wrapGAppsHook - python3 gobject-introspection # for finding vapi files ]; buildInputs = [ - gtk3 + gtk4 glib libxml2 - gtksourceview4 + gtksourceview5 mpfr gmp - gnome.adwaita-icon-theme libgee gsettings-desktop-schemas libsoup libmpc - libhandy + libadwaita ]; doCheck = true; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; - preCheck = '' # Currency conversion test tries to store currency data in $HOME/.cache. export HOME=$TMPDIR diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 1c16c3dd35ea..fac22f0b5785 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -1,18 +1,16 @@ -{ lib, stdenv +{ lib +, stdenv , gettext , fetchurl , evolution-data-server , pkg-config , libxslt -, docbook_xsl +, docbook-xsl-nons , docbook_xml_dtd_42 -, python3 -, gtk3 +, desktop-file-utils +, gtk4 , glib -, cheese -, libchamplain -, clutter-gtk -, geocode-glib +, libportal , gnome-desktop , gnome-online-accounts , wrapGAppsHook @@ -23,17 +21,17 @@ , vala , meson , ninja -, libhandy +, libadwaita , gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Y+MUm10UdbeiaYAFu191DzyApzVxcWDjnfjP3+v8zfA="; + sha256 = "iALDj9wj9SjawSj1O9zx9sow4OHGhIxCzWyEpeIsUhY="; }; propagatedUserEnvPkgs = [ @@ -47,34 +45,25 @@ stdenv.mkDerivation rec { vala gettext libxslt - docbook_xsl + docbook-xsl-nons docbook_xml_dtd_42 - python3 + desktop-file-utils wrapGAppsHook ]; buildInputs = [ - gtk3 + gtk4 glib + libportal evolution-data-server gsettings-desktop-schemas folks gnome-desktop - libhandy + libadwaita libxml2 gnome-online-accounts - cheese - gnome.adwaita-icon-theme - libchamplain - clutter-gtk - geocode-glib ]; - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - doCheck = true; passthru = { diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 85cfa8bf3144..c7da1e43a15c 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -2,13 +2,11 @@ , lib , stdenv , substituteAll +, fetchpatch , accountsservice , adwaita-icon-theme -, cheese -, clutter -, clutter-gtk , colord -, colord-gtk +, colord-gtk4 , cups , docbook-xsl-nons , fontconfig @@ -26,19 +24,17 @@ , gnome , gsettings-desktop-schemas , gsound -, gtk3 +, gtk4 , ibus -, libcanberra-gtk3 , libgnomekbd , libgtop , libgudev -, libhandy +, libadwaita , libkrb5 , libpulseaudio , libpwquality , librsvg , libsecret -, libsoup , libwacom , libxml2 , libxslt @@ -47,7 +43,7 @@ , mutter , networkmanager , networkmanagerapplet -, libnma +, libnma-gtk4 , ninja , pkg-config , polkit @@ -68,11 +64,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "41.2"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-gnH8azPsJBileDBN0+V9Zl8NfMcGqZqXvkGYSGGP4kg="; + sha256 = "sha256-BzLvp8QXHOCg7UEGWAtM41pXsQFSwOo20jkTSRN3fto="; }; patches = [ @@ -83,6 +79,13 @@ stdenv.mkDerivation rec { inherit glibc libgnomekbd tzdata; inherit cups networkmanagerapplet; }) + + # Fix Online Accounts configuration on X11 + # https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1272 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/7fe322b9cedae313cd9af6f403eab9bfc6027674.patch"; + sha256 = "cv1abqv0Kbfkfu7mZzEaZKXPE85yVBcQbjNHW+8ODFE="; + }) ]; nativeBuildInputs = [ @@ -100,11 +103,8 @@ stdenv.mkDerivation rec { buildInputs = [ accountsservice adwaita-icon-theme - cheese - clutter - clutter-gtk colord - colord-gtk + colord-gtk4 libepoxy fontconfig gdk-pixbuf @@ -119,19 +119,17 @@ stdenv.mkDerivation rec { gnome-user-share # optional, sharing panel gsettings-desktop-schemas gsound - gtk3 + gtk4 ibus - libcanberra-gtk3 libgtop libgudev - libhandy + libadwaita libkrb5 - libnma + libnma-gtk4 libpulseaudio libpwquality librsvg libsecret - libsoup libwacom libxml2 modemmanager @@ -145,9 +143,19 @@ stdenv.mkDerivation rec { upower ]; - postPatch = '' - chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file - patchShebangs build-aux/meson/meson_post_install.py + # postPatch = '' + # scriptsToPatch=( + # build-aux/meson/meson_post_install.py + # build-aux/meson/find_xdg_file.py + # ) + # # # patchShebangs requires executable file + # # chmod +x "''${scriptsToPatch[@]}" + # # patchShebangs "''${scriptsToPatch[@]}" + # ''; + + preConfigure = '' + # For ITS rules + addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share" ''; preFixup = '' diff --git a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix index a399c4e85377..6cdb8831c48f 100644 --- a/pkgs/desktops/gnome/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix @@ -1,6 +1,24 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt -, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 -, gnome, gtk3, glib, gsettings-desktop-schemas }: +{ stdenv +, lib +, fetchurl +, fetchpatch +, meson +, ninja +, pkg-config +, desktop-file-utils +, appstream-glib +, libxslt +, libxml2 +, gettext +, itstool +, wrapGAppsHook +, docbook_xsl +, docbook_xml_dtd_43 +, gnome +, gtk3 +, glib +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "gnome-dictionary"; @@ -11,13 +29,44 @@ stdenv.mkDerivation rec { sha256 = "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f"; }; - doCheck = true; + patches = [ + # Fix test dependencies with meson 0.57, can be removed on next bump + # We need to explicitly depend on the generated files. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/-/commit/87c026cfe4acbcfc62d15950f88a71d8d9678c7e.patch"; + sha256 = "tKesWeOK3OqOxrXm4dZvCZHHdTD7AQbYDjtYDCsLd3A="; + }) + # Fix build with meson 0.61, can be removed on next bump + # data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/-/commit/cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68.patch"; + sha256 = "cIRM6ACqsnEo2JWYvr6EBye5o0BudugZMShCe1U5hz8="; + }) + ]; nativeBuildInputs = [ - meson ninja pkg-config wrapGAppsHook libxml2 gettext itstool - desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 + meson + ninja + pkg-config + wrapGAppsHook + libxml2 + gettext + itstool + desktop-file-utils + appstream-glib + libxslt + docbook_xsl + docbook_xml_dtd_43 ]; - buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome.adwaita-icon-theme ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + gnome.adwaita-icon-theme + ]; + + doCheck = true; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index 5f3ef81d905a..89502c8d8830 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-h0PJj9ZWBi74YpM+/jDFvkxrMi7ALu4VTscNCO0Ild8="; + sha256 = "sha256-G2VkRU1nQmMiyzv8WlVYZTv8ff7qKuCCWx0IYp8BCQs="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 4ba915df2dbd..397f0b9838f1 100644 --- a/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -1,20 +1,47 @@ -{ lib, stdenv, meson, ninja, gettext, fetchurl -, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme, libhandy -, wrapGAppsHook, gnome, harfbuzz }: +{ lib +, stdenv +, meson +, ninja +, gettext +, fetchurl +, pkg-config +, gtk4 +, glib +, libxml2 +, gnome-desktop +, libadwaita +, wrapGAppsHook4 +, gnome +, harfbuzz +}: stdenv.mkDerivation rec { pname = "gnome-font-viewer"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "XdQQMxvgcOTgNDl/J1SYDgc4UdUKIRny+/lq3G/i6HY="; + sha256 = "z6K43/8hoQWhoCHa36IT8TYn5qF5p3x7Wf3O2sqEjcw="; }; doCheck = true; - nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook libxml2 ]; - buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz libhandy ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + wrapGAppsHook4 + libxml2 + ]; + + buildInputs = [ + gtk4 + glib + gnome-desktop + harfbuzz + libadwaita + ]; # Do not run meson-postinstall.sh preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; @@ -28,8 +55,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Program that can preview fonts and create thumbnails for fonts"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-font-viewer"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 7ce00ac8f82c..7f6724ce63ae 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -27,6 +27,7 @@ , polkit , webkitgtk , systemd +, libhandy , libnma , tzdata , libgnomekbd @@ -35,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "41.2"; + version = "42.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "GTr79qMILaCjKncU8ejVKo20Vycpde0vNlQ2SjM5Gz8="; + sha256 = "/PQ/L75NwEw6wq5QVjP+se8w2nDKleq8YeIAaxkuXlU="; }; patches = [ @@ -72,6 +73,7 @@ stdenv.mkDerivation rec { json-glib krb5 libgweather + libhandy libnma libpwquality librest diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 8c9815509e2d..afbec6f8c5d1 100644 --- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -5,7 +5,7 @@ , dbus , libgcrypt , pam -, python2 +, python3 , glib , libxslt , gettext @@ -51,8 +51,7 @@ stdenv.mkDerivation rec { p11-kit ]; - # In 3.20.1, tests do not support Python 3 - checkInputs = [ dbus python2 ]; + checkInputs = [ dbus python3 ]; configureFlags = [ "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 0f35b15bee9c..61252d60814c 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -7,6 +7,8 @@ , python3 , wrapGAppsHook , glib +, libepoxy +, libdrm , nv-codec-headers-11 , pipewire , systemd @@ -17,16 +19,20 @@ , gdk-pixbuf , freerdp , fuse3 +, mesa +, libgudev +, xvfb-run +, dbus , gnome }: stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "41.2"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-EBUeabZIwiR8XjPZou9Bn04DfuWyuuSebtasp36xulg="; + hash = "sha256-s9wrt1x4Pe2quWqNu6wW3ZqhOebTooo9s+pAxgRluY8="; }; nativeBuildInputs = [ @@ -43,6 +49,8 @@ stdenv.mkDerivation rec { fuse3 gdk-pixbuf # For libnotify glib + libepoxy + libdrm nv-codec-headers-11 libnotify libsecret @@ -50,17 +58,35 @@ stdenv.mkDerivation rec { libxkbcommon pipewire systemd - ]; + ] ++ checkInputs; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - ''; + checkInputs = [ + mesa # for gbm + libgudev + xvfb-run + python3.pkgs.dbus-python + python3.pkgs.pygobject3 + dbus # for dbus-run-session + ]; mesonFlags = [ "-Dsystemd_user_unit_dir=${placeholder "out"}/lib/systemd/user" ]; + # Too deep of a rabbit hole. + doCheck = false; + + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs \ + tests/vnc-test-runner.sh \ + tests/run-vnc-tests.py \ + meson_post_install.py + + substituteInPlace tests/vnc-test-runner.sh \ + --replace "dbus-run-session" "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome/core/gnome-session/ctl.nix b/pkgs/desktops/gnome/core/gnome-session/ctl.nix index 6a274e35bf56..09fc80bf9ef8 100644 --- a/pkgs/desktops/gnome/core/gnome-session/ctl.nix +++ b/pkgs/desktops/gnome/core/gnome-session/ctl.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "gnome-session-ctl"; - version = "40.0"; + version = "42.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = version; - hash = "sha256-gvBmLx8Qoj1vPsOwaZsd9+pTDvU5D7uUts7ZT1pXwNo="; + hash = "sha256-XGJVmlxqbJ/1frbzn2TI7BJm449xeLk43xMMqFsLYko="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix index 3ba6958fad0e..43bf56eb1fc8 100644 --- a/pkgs/desktops/gnome/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -1,16 +1,42 @@ -{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome, glib, gtk3, gsettings-desktop-schemas -, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 -, libxslt, gettext, makeWrapper, systemd, xorg, libepoxy, gnugrep, bash, gnome-session-ctl }: +{ fetchurl +, lib +, stdenv +, substituteAll +, meson +, ninja +, pkg-config +, gnome +, glib +, gtk3 +, gsettings-desktop-schemas +, gnome-desktop +, dbus +, json-glib +, libICE +, xmlto +, docbook_xsl +, docbook_xml_dtd_412 +, python3 +, libxslt +, gettext +, makeWrapper +, systemd +, xorg +, libepoxy +, bash +, gnome-session-ctl +}: stdenv.mkDerivation rec { pname = "gnome-session"; - version = "40.1.1"; + # Also bump ./ctl.nix when bumping major version. + version = "42.0"; - outputs = ["out" "sessions"]; + outputs = [ "out" "sessions" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "10nzyhmgkrzk6i70kj7690na0hmsv6qy5bmr10akxq9jxqlphy4w"; + sha256 = "PMoGBTq2gpJpIJUafalfjMbXLadMaCxG0KBlMzKWnKo="; }; patches = [ @@ -18,22 +44,41 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; gsettings = "${glib.bin}/bin/gsettings"; dbusLaunch = "${dbus.lib}/bin/dbus-launch"; - grep = "${gnugrep}/bin/grep"; bash = "${bash}/bin/bash"; }) ]; - mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ]; - nativeBuildInputs = [ - meson ninja pkg-config gettext makeWrapper - xmlto libxslt docbook_xsl docbook_xml_dtd_412 python3 + meson + ninja + pkg-config + gettext + makeWrapper + xmlto + libxslt + docbook_xsl + docbook_xml_dtd_412 + python3 dbus # for DTD ]; buildInputs = [ - glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome.adwaita-icon-theme - gnome.gnome-settings-daemon gsettings-desktop-schemas systemd libepoxy + glib + gtk3 + libICE + gnome-desktop + json-glib + xorg.xtrans + gnome.adwaita-icon-theme + gnome.gnome-settings-daemon + gsettings-desktop-schemas + systemd + libepoxy + ]; + + mesonFlags = [ + "-Dsystemd=true" + "-Dsystemd_session=default" ]; postPatch = '' @@ -49,17 +94,6 @@ stdenv.mkDerivation rec { {} + ''; - # `bin/gnome-session` will reset the environment when run in wayland, we - # therefor wrap `libexec/gnome-session-binary` instead which is the actual - # binary needing wrapping - preFixup = '' - wrapProgram "$out/libexec/gnome-session-binary" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share"\ - --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" - ''; - # We move the GNOME sessions to another output since gnome-session is a dependency of # GDM itself. If we do not hide them, it will show broken GNOME sessions when GDM is # enabled without proper GNOME installation. @@ -72,12 +106,26 @@ stdenv.mkDerivation rec { rm -rf $out/libexec/gnome-session-ctl ''; + # `bin/gnome-session` will reset the environment when run in wayland, we + # therefor wrap `libexec/gnome-session-binary` instead which is the actual + # binary needing wrapping + preFixup = '' + wrapProgram "$out/libexec/gnome-session-binary" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share"\ + --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "gnome-session"; attrPath = "gnome.gnome-session"; }; - providedSessions = [ "gnome" "gnome-xorg" ]; + providedSessions = [ + "gnome" + "gnome-xorg" + ]; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch index 320b3024deee..38805c645b95 100644 --- a/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch +++ b/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch @@ -1,17 +1,10 @@ diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in -index ddd1a591..46a3488b 100755 +index b4b1f8fa..99d52cba 100755 --- a/gnome-session/gnome-session.in +++ b/gnome-session/gnome-session.in -@@ -3,17 +3,19 @@ - if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && +@@ -4,13 +4,15 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && - [ -n "$SHELL" ] && -- grep -q "$SHELL" /etc/shells && -- ! (echo "$SHELL" | grep -q "false") && -- ! (echo "$SHELL" | grep -q "nologin"); then -+ @grep@ -q "$SHELL" /etc/shells && -+ ! (echo "$SHELL" | @grep@ -q "false") && -+ ! (echo "$SHELL" | @grep@ -q "nologin"); then + [ -n "$SHELL" ]; then if [ "$1" != '-l' ]; then - exec bash -c "exec -l '$SHELL' -c '$0 -l $*'" + # Make sure the shell actually sets up the environment. @@ -28,7 +21,7 @@ index ddd1a591..46a3488b 100755 REGION=${REGION%\'} diff --git a/gnome-session/main.c b/gnome-session/main.c -index 84edfbe5..e5285489 100644 +index a460a849..9d07898f 100644 --- a/gnome-session/main.c +++ b/gnome-session/main.c @@ -215,7 +215,7 @@ require_dbus_session (int argc, diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix index aae01577a881..8ab848a7dfa8 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchpatch , substituteAll , fetchurl @@ -70,10 +71,28 @@ stdenv.mkDerivation rec { }) # Fix build with new meson + # plugins/power/meson.build:78:7: ERROR: Function does not take positional arguments. + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/283 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch"; + sha256 = "8wxJIKPoZyfs1t0zAsb5SVCdt297NUiGmXIBNI6hbCQ="; + }) + # meson.build:86:3: ERROR: The `==` operator of str does not accept objects of type bool (True) + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/249 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e598342c897ae5ca350d0da6f4aea057b.diff"; sha256 = "U+suR7wYjLWPqmkJpHm6pPOWL7sjL6GhIFX8MHrBRAY="; }) + + # Port to gweather4 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/66cae69ad82cfc59435016fba737ce046ffb7e66.patch"; + sha256 = "zf8/rkKdQQFNV/qx/jo4kx1KoLl7SUSu4/T1OBGrZ4c="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/f390e6e9d56ce7d3e3a725b8204d81c0b6240515.patch"; + sha256 = "8mfnlhkSF9ogjVWE+IESzRQzrxHQSwUWsq5OLBM08iM="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index 307de72cc4f0..03698f865d65 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "41.0"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "5spjYfvR3qst4aHjkNTxQWfPR7HFR9u4tlpdielmOIQ="; + sha256 = "7WWFGuVK3NWKJMhoN9Yk/GoUvYSrIulN9Ao6TP0Z/9s="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 437da36a7a3b..1083fe111066 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "41.1"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0ObyJz8I1S2SX8K7ZrR7KOXvUNG4oUAgh3xmJCPVB9M="; + sha256 = "PuZbdbGv2LzKCioD2psohHh+1A4leogdmqbvfIcnYC8="; }; patches = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 5de52723d007..1ad36f7e96b7 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -46,6 +46,7 @@ , evolution-data-server , gtk3 , gtk4 +, libadwaita , sassc , systemd , pipewire @@ -66,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "41.2"; + version = "42.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "OEZR6wUTk9ur4AbRrQV78p1c1z67h7x3n/Xhwx6AqCc="; + sha256 = "M9QE+zyTud5CmE8BEKKWnWpKckfCf+f14kxn7P7HUJQ="; }; patches = [ @@ -118,7 +119,6 @@ stdenv.mkDerivation rec { sassc desktop-file-utils libxslt.bin - python3 asciidoc ]; @@ -142,6 +142,7 @@ stdenv.mkDerivation rec { libical gtk3 gtk4 + libadwaita gdm geoclue2 adwaita-icon-theme @@ -169,6 +170,9 @@ stdenv.mkDerivation rec { bash-completion gnome-autoar json-glib + + # for tools + pythonEnv ]; mesonFlags = [ @@ -177,14 +181,9 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs src/data-to-c.pl - chmod +x meson/postinstall.py - patchShebangs meson/postinstall.py # We can generate it ourselves. rm -f man/gnome-shell.1 - - substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" - substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" ''; preFixup = '' diff --git a/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch b/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch index bc494caea9dd..5ce4a2fd46d7 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch +++ b/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch @@ -1,7 +1,7 @@ diff --git a/js/dbusServices/dbus-service.in b/js/dbusServices/dbus-service.in old mode 100644 new mode 100755 -index 524166102..100b81a63 +index 524166102..6d0722a1c --- a/js/dbusServices/dbus-service.in +++ b/js/dbusServices/dbus-service.in @@ -1,3 +1,9 @@ @@ -24,18 +24,18 @@ index 3b0d09abe..4fd4bb66d 100644 -Exec=@gjs@ @pkgdatadir@/@service@ +Exec=@pkgdatadir@/@service@ diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build -index c749f45dc..11bcb0c9e 100644 +index eb941ed90..552051e5a 100644 --- a/js/dbusServices/meson.build +++ b/js/dbusServices/meson.build @@ -2,6 +2,7 @@ launcherconf = configuration_data() launcherconf.set('PACKAGE_NAME', meson.project_name()) launcherconf.set('prefix', prefix) launcherconf.set('libdir', libdir) -+launcherconf.set('gjs', gjs.path()) ++launcherconf.set('gjs', gjs.full_path()) dbus_services = { 'org.gnome.Shell.Extensions': 'extensions', -@@ -11,16 +12,17 @@ dbus_services = { +@@ -18,16 +19,17 @@ endif config_dir = '@0@/..'.format(meson.current_build_dir()) foreach service, dir : dbus_services @@ -51,7 +51,7 @@ index c749f45dc..11bcb0c9e 100644 serviceconf = configuration_data() serviceconf.set('service', service) -- serviceconf.set('gjs', gjs.path()) +- serviceconf.set('gjs', gjs.full_path()) serviceconf.set('pkgdatadir', pkgdatadir) configure_file( diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 4103965ce271..e89f616680c7 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -13,7 +13,7 @@ , glib , appstream , libsoup -, libhandy +, libadwaita , polkit , isocodes , gspell @@ -21,7 +21,7 @@ , gobject-introspection , flatpak , fwupd -, gtk3 +, gtk4 , gsettings-desktop-schemas , gnome-desktop , libxmlb @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "41.3"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ZQVjN3q2mxAQXfdxuz8hY3lVO7evQISNjDBljgEAmLw="; + sha256 = "QsaF4u95li6zCo6VjHA8mh899zFQQiOgYos7Yk733B4="; }; patches = [ @@ -73,12 +73,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 + gtk4 glib packagekit appstream libsoup - libhandy + libadwaita gsettings-desktop-schemas gnome-desktop gspell @@ -97,6 +97,8 @@ stdenv.mkDerivation rec { "-Dgudev=false" # FIXME: package malcontent parental controls "-Dmalcontent=false" + # Needs flatpak to upgrade + "-Dsoup2=true" ] ++ lib.optionals (!withFwupd) [ "-Dfwupd=false" ]; diff --git a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index d373d6f358c6..5d24a23e4118 100644 --- a/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -12,7 +12,6 @@ , wrapGAppsHook , meson , ninja -, python3 , gsettings-desktop-schemas , itstool , gnome @@ -24,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "x/xExhlJt5SwKJlo67vMDBX4z8PZ5Fv6qB7UXBITnl8="; + sha256 = "EyOdIgMiAaIr0pgzxXW2hIFnANLeFooVMCI1d8XAddw="; }; nativeBuildInputs = [ @@ -38,7 +37,6 @@ stdenv.mkDerivation rec { wrapGAppsHook meson ninja - python3 ]; buildInputs = [ @@ -58,12 +56,6 @@ stdenv.mkDerivation rec { doCheck = true; - postPatch = '' - chmod +x meson_post_install.py # patchShebangs requires executable file - patchShebangs meson_post_install.py - sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = "gnome-system-monitor"; diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix index 69fb69261f98..85918f0e31c0 100644 --- a/pkgs/desktops/gnome/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -23,15 +23,16 @@ , pcre2 , libxslt , docbook-xsl-nons +, nixosTests }: stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.42.2"; + version = "3.44.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ipyOXvejpzskapR+EZC7COyYk1r4YM8LOqL79GBoF6A="; + sha256 = "qpZxie62CUWebApGigHqcMuMRTDaHVALLT9PxDi4/io="; }; nativeBuildInputs = [ @@ -82,6 +83,8 @@ stdenv.mkDerivation rec { }; }; + passthru.tests.test = nixosTests.terminal-emulators.gnome-terminal; + meta = with lib; { description = "The GNOME Terminal Emulator"; homepage = "https://wiki.gnome.org/Apps/Terminal"; diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix index 7440749e0a9b..cbb33c2b2308 100644 --- a/pkgs/desktops/gnome/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -6,7 +6,7 @@ , ninja , fetchurl , pkg-config -, gtk3 +, gtk4 , glib , gdk-pixbuf , desktop-file-utils @@ -14,7 +14,7 @@ , wrapGAppsHook , python3 , gnome -, libhandy +, libadwaita , librsvg , rustc , cargo @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-tour"; - version = "40.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-cGMiOGmgdHJ0FL7H23ONhQYhbuhMz8O8p9rFLkmMG/k="; + hash = "sha256-/PGsaJBX2oZZaXDsPag1VSHApy6VBj6wWdX+5N6oL08="; }; cargoVendorDir = "vendor"; @@ -49,16 +49,11 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf glib - gtk3 - libhandy + gtk4 + libadwaita librsvg ]; - postPatch = '' - chmod +x build-aux/meson_post_install.py - patchShebangs build-aux/meson_post_install.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome/core/gnome-user-share/default.nix b/pkgs/desktops/gnome/core/gnome-user-share/default.nix index bab13a6ccd19..4c33b76b0124 100644 --- a/pkgs/desktops/gnome/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome/core/gnome-user-share/default.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch"; sha256 = "03clzhrx72pq1cbmg2y24hvw4i1xsvrg9ip113fi5bc3w4gcji7p"; }) + # fix compilation with meson >=0.61 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-user-share/-/commit/c31b0a8f33b95c0077cd5ee2102a71a49bee8abe.patch"; + hash = "sha256-kH+cPBmSErWxsw+IyyjWgENi4I3ZcKjSA9+em8u4DYs="; + }) ]; postPatch = '' diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index 7d15e6b41ef6..3dc08e66357a 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -7,7 +7,7 @@ , pkg-config , python3 , gtk3 -, adwaita-icon-theme +, pcre2 , glib , desktop-file-utils , gtk-doc @@ -45,7 +45,7 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "14.0.0"; + version = "14.0.2"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "sha256-d283zVRH42NZNq+vGmItN3ZBrRrl9gpYDco7osm3RoY="; + sha256 = "sha256-gyOm/S0ae0kX4AFUiglqyGRGB8C/KUuaG/dr/Wf1ug0="; }; nativeBuildInputs = [ @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { gtk3 glib gsettings-desktop-schemas - adwaita-icon-theme + pcre2 ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index 17145ccadfe4..9f3925d0ce50 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -46,13 +46,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "41.2"; + version = "42.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "AN+oEvHEhtdKK3P0IEWuEYL5JGx3lNZ9dLXlQ+pwBhc="; + sha256 = "0eJARGt/jNij/52q4zbByQFhk7p+B2nHml5sA4SQIuU="; }; patches = [ @@ -136,7 +136,7 @@ let self = stdenv.mkDerivation rec { PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; passthru = { - libdir = "${self}/lib/mutter-9"; + libdir = "${self}/lib/mutter-10"; tests = { libdirExists = runCommand "mutter-libdir-exists" {} '' diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 3f61f55db1dc..b3665e46fa43 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl -, fetchpatch , meson , ninja , pkg-config @@ -19,7 +19,6 @@ , libnotify , libexif , libseccomp -, exempi , librsvg , tracker , tracker-miners @@ -35,13 +34,13 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "41.2"; + version = "42.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "hyKFscQKbuQYzile0RX1Qn2nCQfYItlbz1FnXVSYgis="; + sha256 = "PJBPM7otKgeIkr7ir3FITNYIkjzXjsfooVF7whVRE9U="; }; patches = [ @@ -53,17 +52,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit tracker; }) - - # Fix build with latest libportal - # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/749 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/nautilus/-/commit/55cfd66ccca391fc144f5863ff6bfc1f3b137e2d.patch"; - sha256 = "xSb9l7xxEYpAwmdmeWT/t7Z9Ck3DPtsODzbReQW/Q70="; - excludes = [ - "build-aux/flatpak/org.gnome.Nautilus.json" - "build-aux/flatpak/org.gnome.Nautilus.yml" - ]; - }) ]; nativeBuildInputs = [ @@ -79,7 +67,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - exempi gexiv2 glib-networking gnome-desktop diff --git a/pkgs/desktops/gnome/core/simple-scan/default.nix b/pkgs/desktops/gnome/core/simple-scan/default.nix index 0865fbb5aca7..dd96e254109d 100644 --- a/pkgs/desktops/gnome/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome/core/simple-scan/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "40.7"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-fFUYUsta99NKqYn4rV7ePL4xgoz43VrsKytv3NGsPVM="; + sha256 = "sha256-rB+Fev0LyIl90gRQI618VxPlzu/KVrCzzF6aR5UylYY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index 0178c04b53ca..44e1319f8d4a 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -4,8 +4,6 @@ , ninja , gettext , gst_all_1 -, clutter-gtk -, clutter-gst , python3Packages , shared-mime-info , pkg-config @@ -21,6 +19,7 @@ , grilo , grilo-plugins , libpeas +, libhandy , adwaita-icon-theme , gnome-desktop , gsettings-desktop-schemas @@ -30,11 +29,11 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "3.38.2"; + version = "42.0"; src = fetchurl { - url = "mirror://gnome/sources/totem/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/OVi4rJsvPwMZ4U43MgfncFc5g1aie5DWJB79jQwTEA="; + url = "mirror://gnome/sources/totem/${lib.versions.major version}/${pname}-${version}.tar.xz"; + sha256 = "SvBJHduV34szruOZ06UPnHqxfeiNOvYzVlZ8+I9X5qs="; }; nativeBuildInputs = [ @@ -53,17 +52,16 @@ stdenv.mkDerivation rec { gtk3 glib grilo - clutter-gtk - clutter-gst totem-pl-parser grilo-plugins gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good + (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav libpeas + libhandy shared-mime-info gdk-pixbuf libxml2 diff --git a/pkgs/desktops/gnome/core/yelp-xsl/default.nix b/pkgs/desktops/gnome/core/yelp-xsl/default.nix index 6fac906e4ba9..3398e8ddd571 100644 --- a/pkgs/desktops/gnome/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome/core/yelp-xsl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "41.1"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-DW2zesLvgSSD4BBHA/H6nPAy6eCVal8cOvvMI3kfilQ="; + sha256 = "sha256-KbJzzAvRbvtumDRDgD8en9wDUR5cT/Y0j9MKYE1NyEY="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix index 4b3ee62dcee4..4ae54200d09c 100644 --- a/pkgs/desktops/gnome/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -2,9 +2,10 @@ , stdenv , gettext , fetchurl -, webkitgtk_4_1 +, webkitgtk , pkg-config , gtk3 +, libhandy , glib , gnome , sqlite @@ -17,11 +18,11 @@ stdenv.mkDerivation rec { pname = "yelp"; - version = "41.2"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-sAvwM/At15ttPyVQMccd+NbtOOVSyHC485GjdHJMQ8U="; + sha256 = "sha256-JbEUarhUmIilqNoGf2O0cLDw+AC2roicrNEU0B1xO0E="; }; nativeBuildInputs = [ @@ -33,8 +34,9 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 + libhandy glib - webkitgtk_4_1 + webkitgtk sqlite libxml2 libxslt @@ -44,6 +46,10 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good ]; + # To reduce the GNOME ISO closure size. Remove when other packages + # are using webkit2gtk_4_1. + configureFlags = ["--with-webkit2gtk-4-0"]; + passthru = { updateScript = gnome.updateScript { packageName = "yelp"; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 2b36373e2bf9..729a6bd16ca8 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -58,8 +58,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-common = callPackage ./core/gnome-common { }; - gnome-desktop = callPackage ./core/gnome-desktop { }; - gnome-dictionary = callPackage ./core/gnome-dictionary { }; gnome-disk-utility = callPackage ./core/gnome-disk-utility { }; @@ -255,8 +253,6 @@ lib.makeScope pkgs.newScope (self: with self; { gitg = callPackage ./misc/gitg { }; - libgnome-games-support = callPackage ./misc/libgnome-games-support { }; - gnome-applets = callPackage ./misc/gnome-applets { }; gnome-flashback = callPackage ./misc/gnome-flashback { }; @@ -283,13 +279,16 @@ lib.makeScope pkgs.newScope (self: with self; { }) // lib.optionalAttrs (config.allowAliases or true) { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. + gnome-desktop = pkgs.gnome-desktop; # added 2022-03-16 + libgnome-games-support = pkgs.libgnome-games-support; # added 2022-02-19 + bijiben = throw "The ‘gnome.bijiben’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-notes’ directly."; # added 2018-09-26 evolution_data_server = throw "The ‘gnome.evolution_data_server’ alias was removed on 2022-01-13. Please use ‘gnome.evolution-data-server’ directly."; # added 2018-02-25 geocode_glib = throw "The ‘gnome.geocode_glib’ alias was removed on 2022-01-13. Please use ‘pkgs.geocode-glib’ directly."; # added 2018-02-25 glib_networking = throw "The ‘gnome.glib_networking’ alias was removed on 2022-01-13. Please use ‘pkgs.glib-networking’ directly."; # added 2018-02-25 gnome_common = throw "The ‘gnome.gnome_common’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-common’ directly."; # added 2018-02-25 gnome_control_center = throw "The ‘gnome.gnome_control_center’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-control-center’ directly."; # added 2018-02-25 - gnome_desktop = throw "The ‘gnome.gnome_desktop’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-desktop’ directly."; # added 2018-02-25 + gnome_desktop = throw "The ‘gnome.gnome_desktop’ alias was removed on 2022-01-13. Please use pkgs.gnome-desktop’ directly."; # added 2018-02-25 gnome_keyring = throw "The ‘gnome.gnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-keyring’ directly."; # added 2018-02-25 gnome_online_accounts = throw "The ‘gnome.gnome_online_accounts’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-online-accounts’ directly."; # added 2018-02-25 gnome_session = throw "The ‘gnome.gnome_session’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-session’ directly."; # added 2018-02-25 @@ -300,7 +299,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_themes_standard = throw "The ‘gnome.gnome_themes_standard’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-themes-standard’ directly."; # added 2018-02-25 gnome-tweak-tool = throw "The ‘gnome.gnome-tweak-tool’ alias was removed on 2022-01-13. Please use ‘gnome.gnome-tweaks’ directly."; # added 2018-03-21 gsettings_desktop_schemas = throw "The ‘gnome.gsettings_desktop_schemas’ alias was removed on 2022-01-13. Please use ‘gnome.gsettings-desktop-schemas’ directly."; # added 2018-02-25 - libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-games-support’ directly."; # added 2018-03-14 + libgames-support = throw "The ‘gnome.libgames-support’ alias was removed on 2022-01-13. Please use ‘pkgs.libgnome-games-support’ directly."; # added 2018-03-14 libgnome_keyring = throw "The ‘gnome.libgnome_keyring’ alias was removed on 2022-01-13. Please use ‘gnome.libgnome-keyring’ directly."; # added 2018-02-25 rarian = throw "The ‘gnome.rarian’ alias was removed on 2022-01-13. Please use ‘pkgs.rarian’ directly."; # added 2018-04-25 networkmanager_fortisslvpn = throw "The ‘gnome.networkmanager_fortisslvpn’ alias was removed on 2022-01-13. Please use ‘gnome.networkmanager-fortisslvpn’ directly."; # added 2018-02-25 diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index 01656dbee173..7bc997a4bf1a 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-arcmenu"; - version = "20"; + version = "24"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "sha256-HjhOZfXld0gnKOAazT8qbI0Jdq6NY/FsrhzAY9uxxMg="; + sha256 = "sha256-GbZt6JC+uAPkb4GU1Q7WRJ6Pf95Uh48cYwvoTgLimHs="; }; patches = [ diff --git a/pkgs/desktops/gnome/extensions/collisions.json b/pkgs/desktops/gnome/extensions/collisions.json index b43673a13422..d337348e8fd6 100644 --- a/pkgs/desktops/gnome/extensions/collisions.json +++ b/pkgs/desktops/gnome/extensions/collisions.json @@ -43,6 +43,10 @@ "gnome-trash": [ "gnome-trash@gnome-trash.b00f.gitlab.com", "gnome-trash@b00f.github.io" + ], + "volume-scroller": [ + "volume_scroller@trflynn89.pm.me", + "volume_scroller@noskoski" ] }, "40": { @@ -98,6 +102,10 @@ "wireguard-indicator": [ "wireguard-indicator@gregos.me", "wireguard-indicator@atareao.es" + ], + "volume-scroller": [ + "volume_scroller@trflynn89.pm.me", + "volume_scroller@noskoski" ] }, "41": { @@ -129,5 +137,6 @@ "floatingDock@sun.wxg@gmail.com", "floating-dock@nandoferreira_prof@hotmail.com" ] - } + }, + "42": {} } diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix new file mode 100644 index 000000000000..9447de1fd4e7 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, fetchFromGitHub +, glib +, gettext +, sassc +, unstableGitUpdater +}: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-dash-to-dock"; + version = "71+date=2022-02-23"; + + # Temporarily switched to commit hash because stable version is buggy. + src = fetchFromGitHub { + owner = "micheleg"; + repo = "dash-to-dock"; + rev = "6f717302747931de6bf35bc9839fb3bd946e2c2f"; + sha256 = "1J8t0R43jBbqpXyH2uVyEK+OvhrCw18WWheflqwe100="; + }; + + nativeBuildInputs = [ + glib + gettext + sassc + ]; + + makeFlags = [ + "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" + ]; + + passthru = { + extensionUuid = "dash-to-dock@micxgx.gmail.com"; + extensionPortalSlug = "dash-to-dock"; + + updateScript = unstableGitUpdater { + stableVersion = true; + tagPrefix = "extensions.gnome.org-v"; + }; + }; + + meta = with lib; { + description = "A dock for the Gnome Shell"; + homepage = "https://micheleg.github.io/dash-to-dock/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ eperuffo jtojnar rhoriguchi ]; + }; +} diff --git a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix deleted file mode 100644 index 0d1f8df4f275..000000000000 --- a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, glib, gettext }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-dash-to-panel"; - version = "45"; - - src = fetchFromGitHub { - owner = "home-sweet-gnome"; - repo = "dash-to-panel"; - rev = "v${version}"; - sha256 = "05bfd3b1g9zd86pl1rpgfqsmip271lasyfj8phpqf1gdds5yz6f6"; - }; - - buildInputs = [ - glib gettext - ]; - - makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - - passthru = { - extensionUuid = "dash-to-panel@jderose9.github.com"; - extensionPortalSlug = "dash-to-panel"; - }; - - meta = with lib; { - description = "An icon taskbar for Gnome Shell"; - license = licenses.gpl2; - maintainers = with maintainers; [ mounium ]; - homepage = "https://github.com/jderose9/dash-to-panel"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index e2f9bb2c2d9c..d01c28be92c6 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -58,8 +58,9 @@ in rec { gnome38Extensions = mapUuidNames (produceExtensionsList "38"); gnome40Extensions = mapUuidNames (produceExtensionsList "40"); gnome41Extensions = mapUuidNames (produceExtensionsList "41"); + gnome42Extensions = mapUuidNames (produceExtensionsList "42"); - gnomeExtensions = lib.trivial.pipe (gnome40Extensions // gnome41Extensions) [ + gnomeExtensions = lib.trivial.pipe (gnome40Extensions // gnome41Extensions // gnome42Extensions) [ # Apply some custom patches for automatically packaged extensions (callPackage ./extensionOverrides.nix {}) # Add all manually packaged extensions diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index da95f3244095..b1c762a018f4 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -3,8 +3,15 @@ , gjs , gnome , gobject-introspection +, hddtemp +, liquidctl +, lm_sensors +, netcat-gnu +, nvme-cli +, procps , pulseaudio , python3 +, smartmontools , substituteAll , touchegg , vte @@ -28,10 +35,6 @@ super: lib.trivial.pipe super [ meta.maintainers = with lib.maintainers; [ eperuffo ]; })) - (patchExtension "dash-to-dock@micxgx.gmail.com" (old: { - meta.maintainers = with lib.maintainers; [ eperuffo jtojnar rhoriguchi ]; - })) - (patchExtension "ddterm@amezin.github.com" (old: { # Requires gjs, zenity & vte via the typelib nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; @@ -55,6 +58,17 @@ super: lib.trivial.pipe super [ ''; })) + (patchExtension "freon@UshakovVasilii_Github.yahoo.com" (old: { + patches = [ + (substituteAll { + src = ./extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch; + inherit hddtemp liquidctl lm_sensors procps smartmontools; + netcat = netcat-gnu; + nvmecli = nvme-cli; + }) + ]; + })) + (patchExtension "gnome-shell-screenshot@ttll.de" (old: { # Requires gjs # https://github.com/NixOS/nixpkgs/issues/136112 @@ -65,6 +79,16 @@ super: lib.trivial.pipe super [ ''; })) + (patchExtension "screen-autorotate@kosmospredanie.yandex.ru" (old: { + # Requires gjs + # https://github.com/NixOS/nixpkgs/issues/164865 + postPatch = '' + for file in *.js; do + substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs" + done + ''; + })) + (patchExtension "shell-volume-mixer@derhofbauer.at" (old: { patches = [ (substituteAll { diff --git a/pkgs/desktops/gnome/extensions/freon/fix_paths.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch similarity index 72% rename from pkgs/desktops/gnome/extensions/freon/fix_paths.patch rename to pkgs/desktops/gnome/extensions/extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch index b1be13e8ff58..da2e940ba017 100644 --- a/pkgs/desktops/gnome/extensions/freon/fix_paths.patch +++ b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/freon_at_UshakovVasilii_Github.yahoo.com.patch @@ -1,7 +1,7 @@ -diff --git a/freon@UshakovVasilii_Github.yahoo.com/hddtempUtil.js b/freon@UshakovVasilii_Github.yahoo.com/hddtempUtil.js +diff --git a/hddtempUtil.js b/hddtempUtil.js index e5d1d6d..856654b 100644 ---- a/freon@UshakovVasilii_Github.yahoo.com/hddtempUtil.js -+++ b/freon@UshakovVasilii_Github.yahoo.com/hddtempUtil.js +--- a/hddtempUtil.js ++++ b/hddtempUtil.js @@ -7,7 +7,7 @@ var HddtempUtil = class extends CommandLineUtil.CommandLineUtil { constructor() { @@ -31,10 +31,10 @@ index e5d1d6d..856654b 100644 if(output.length) pid = Number(output.trim()); } -diff --git a/freon@UshakovVasilii_Github.yahoo.com/liquidctlUtil.js b/freon@UshakovVasilii_Github.yahoo.com/liquidctlUtil.js +diff --git a/liquidctlUtil.js b/liquidctlUtil.js index 766bf62..7cd4e94 100644 ---- a/freon@UshakovVasilii_Github.yahoo.com/liquidctlUtil.js -+++ b/freon@UshakovVasilii_Github.yahoo.com/liquidctlUtil.js +--- a/liquidctlUtil.js ++++ b/liquidctlUtil.js @@ -8,7 +8,7 @@ const commandLineUtil = Me.imports.commandLineUtil; var LiquidctlUtil = class extends commandLineUtil.CommandLineUtil { constructor() { @@ -44,10 +44,10 @@ index 766bf62..7cd4e94 100644 this._argv = path ? [path, 'status', '--json'] : null; } -diff --git a/freon@UshakovVasilii_Github.yahoo.com/nvmecliUtil.js b/freon@UshakovVasilii_Github.yahoo.com/nvmecliUtil.js +diff --git a/nvmecliUtil.js b/nvmecliUtil.js index ae2ea93..2349b9e 100644 ---- a/freon@UshakovVasilii_Github.yahoo.com/nvmecliUtil.js -+++ b/freon@UshakovVasilii_Github.yahoo.com/nvmecliUtil.js +--- a/nvmecliUtil.js ++++ b/nvmecliUtil.js @@ -3,7 +3,7 @@ const GLib = imports.gi.GLib; const Me = imports.misc.extensionUtils.getCurrentExtension(); @@ -57,10 +57,10 @@ index ae2ea93..2349b9e 100644 return JSON.parse(GLib.spawn_command_line_sync(`${nvme} ${argv} -o json`)[1].toString()) } -diff --git a/freon@UshakovVasilii_Github.yahoo.com/sensorsUtil.js b/freon@UshakovVasilii_Github.yahoo.com/sensorsUtil.js +diff --git a/sensorsUtil.js b/sensorsUtil.js index 62fa580..c017748 100644 ---- a/freon@UshakovVasilii_Github.yahoo.com/sensorsUtil.js -+++ b/freon@UshakovVasilii_Github.yahoo.com/sensorsUtil.js +--- a/sensorsUtil.js ++++ b/sensorsUtil.js @@ -7,7 +7,7 @@ var SensorsUtil = class extends CommandLineUtil.CommandLineUtil { constructor() { @@ -70,10 +70,10 @@ index 62fa580..c017748 100644 // -A: Do not show adapter -j: JSON output this._argv = path ? [path, '-A', '-j'] : null; } -diff --git a/freon@UshakovVasilii_Github.yahoo.com/smartctlUtil.js b/freon@UshakovVasilii_Github.yahoo.com/smartctlUtil.js +diff --git a/smartctlUtil.js b/smartctlUtil.js index 03d469b..6057a3b 100644 ---- a/freon@UshakovVasilii_Github.yahoo.com/smartctlUtil.js -+++ b/freon@UshakovVasilii_Github.yahoo.com/smartctlUtil.js +--- a/smartctlUtil.js ++++ b/smartctlUtil.js @@ -3,7 +3,7 @@ const GLib = imports.gi.GLib; const Me = imports.misc.extensionUtils.getCurrentExtension(); const ByteArray = imports.byteArray; diff --git a/pkgs/desktops/gnome/extensions/extensionRenames.nix b/pkgs/desktops/gnome/extensions/extensionRenames.nix index a90673ebeb8e..5a3eb74db1c3 100644 --- a/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -55,6 +55,9 @@ "extension-list@tu.berry" = "extension-list"; "screen-lock@garciabaameiro.com" = "screen-lock"; # Don't know why they got 'extension-list' as slug + "volume_scroller@trflynn89.pm.me" = "volume-scroller"; + "volume_scroller@noskoski" = "volume-scroller-2"; + # ####### GNOME 3.38 ####### "bottompanel@tmoer93" = "bottompanel"; diff --git a/pkgs/desktops/gnome/extensions/extensions.json b/pkgs/desktops/gnome/extensions/extensions.json index d5bafe73fa0c..941c5c929a2f 100644 --- a/pkgs/desktops/gnome/extensions/extensions.json +++ b/pkgs/desktops/gnome/extensions/extensions.json @@ -1,19 +1,19 @@ [ {"uuid": "Move_Clock@rmy.pobox.com", "name": "Frippery Move Clock", "pname": "move-clock", "description": "Move clock to left of status menu button", "link": "https://extensions.gnome.org/extension/2/move-clock/", "shell_version_map": {"38": {"version": "22", "sha256": "085ardkmrxz6rzh48frpb5z8mjlilqk037gjr84dr39gj9dkb81z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCBvZiBzdGF0dXMgbWVudSBidXR0b24iLAogICJuYW1lIjogIkZyaXBwZXJ5IE1vdmUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHA6Ly9mcmlwcGVyeS5vcmcvZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiTW92ZV9DbG9ja0BybXkucG9ib3guY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}, "40": {"version": "25", "sha256": "06bjswh450dwgns6kycgrzq3c4cf4ja57mraw8f7rlgzqrwlj3ci", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCBvZiBzdGF0dXMgbWVudSBidXR0b24iLAogICJuYW1lIjogIkZyaXBwZXJ5IE1vdmUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cDovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJNb3ZlX0Nsb2NrQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "25", "sha256": "06bjswh450dwgns6kycgrzq3c4cf4ja57mraw8f7rlgzqrwlj3ci", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCBvZiBzdGF0dXMgbWVudSBidXR0b24iLAogICJuYW1lIjogIkZyaXBwZXJ5IE1vdmUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cDovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJNb3ZlX0Nsb2NrQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} , {"uuid": "Bottom_Panel@rmy.pobox.com", "name": "Frippery Bottom Panel", "pname": "bottom-panel", "description": "Add a bottom panel to the shell", "link": "https://extensions.gnome.org/extension/3/bottom-panel/", "shell_version_map": {"38": {"version": "49", "sha256": "09gsbnj564z8f7m593iv8j7s6f32230k0ikfsl1dlv1jsfpfn8zv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJvdHRvbSBwYW5lbCB0byB0aGUgc2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJuYW1lIjogIkZyaXBwZXJ5IEJvdHRvbSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkuYm90dG9tLXBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIkJvdHRvbV9QYW5lbEBybXkucG9ib3guY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "40": {"version": "58", "sha256": "1b69fx42mzc1fhi6c4xv8vyz7mrj551jaf0dbz4vif0g8c83sdc1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJvdHRvbSBwYW5lbCB0byB0aGUgc2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJuYW1lIjogIkZyaXBwZXJ5IEJvdHRvbSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkuYm90dG9tLXBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHA6Ly9mcmlwcGVyeS5vcmcvZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiQm90dG9tX1BhbmVsQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "41": {"version": "58", "sha256": "1b69fx42mzc1fhi6c4xv8vyz7mrj551jaf0dbz4vif0g8c83sdc1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJvdHRvbSBwYW5lbCB0byB0aGUgc2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1ib3R0b20tcGFuZWwiLAogICJuYW1lIjogIkZyaXBwZXJ5IEJvdHRvbSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkuYm90dG9tLXBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHA6Ly9mcmlwcGVyeS5vcmcvZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiQm90dG9tX1BhbmVsQHJteS5wb2JveC5jb20iLAogICJ2ZXJzaW9uIjogNTgKfQ=="}}} , {"uuid": "Panel_Favorites@rmy.pobox.com", "name": "Frippery Panel Favorites", "pname": "panel-favorites", "description": "Add launchers for Favorites to the panel", "link": "https://extensions.gnome.org/extension/4/panel-favorites/", "shell_version_map": {"38": {"version": "39", "sha256": "0jqysp82rhckdlgn1jhf1n6sqqphv97m9dri5pjiqjggvm4ls80j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsYXVuY2hlcnMgZm9yIEZhdm9yaXRlcyB0byB0aGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJuYW1lIjogIkZyaXBwZXJ5IFBhbmVsIEZhdm9yaXRlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkucGFuZWwtZmF2b3JpdGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJQYW5lbF9GYXZvcml0ZXNAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}, "40": {"version": "43", "sha256": "1nic3ds6y8gbrihfbqm9q62258rvrrv0prnkrbg5kx37bbnl2z5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsYXVuY2hlcnMgZm9yIEZhdm9yaXRlcyB0byB0aGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJuYW1lIjogIkZyaXBwZXJ5IFBhbmVsIEZhdm9yaXRlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkucGFuZWwtZmF2b3JpdGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIlBhbmVsX0Zhdm9yaXRlc0BybXkucG9ib3guY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "41": {"version": "43", "sha256": "1nic3ds6y8gbrihfbqm9q62258rvrrv0prnkrbg5kx37bbnl2z5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsYXVuY2hlcnMgZm9yIEZhdm9yaXRlcyB0byB0aGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmlwcGVyeS1wYW5lbC1mYXZvcml0ZXMiLAogICJuYW1lIjogIkZyaXBwZXJ5IFBhbmVsIEZhdm9yaXRlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkucGFuZWwtZmF2b3JpdGVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZnJpcHBlcnkub3JnL2V4dGVuc2lvbnMiLAogICJ1dWlkIjogIlBhbmVsX0Zhdm9yaXRlc0BybXkucG9ib3guY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}}} -, {"uuid": "apps-menu@gnome-shell-extensions.gcampax.github.com", "name": "Applications Menu", "pname": "applications-menu", "description": "Add a category-based menu for applications.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/6/applications-menu/", "shell_version_map": {"38": {"version": "46", "sha256": "1l5fliypxq3s3b6crv7rc6nl741m7hw48dwl0g7vi3yxyw0vyc0x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJhcHBzLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDYKfQ=="}, "40": {"version": "48", "sha256": "0whi4ir3hvz6gby57331hv0a80ssz1b746pj79v43cm15djlsbhv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiYXBwcy1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ4Cn0="}, "41": {"version": "50", "sha256": "1x71mysa80n5nlfk79xgcz6k40qmw02g78pqjsvdinxsqlxi9ak6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBzLW1lbnUiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwcy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImFwcHMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}}} -, {"uuid": "drive-menu@gnome-shell-extensions.gcampax.github.com", "name": "Removable Drive Menu", "pname": "removable-drive-menu", "description": "A status menu for accessing and unmounting removable devices.", "link": "https://extensions.gnome.org/extension/7/removable-drive-menu/", "shell_version_map": {"38": {"version": "45", "sha256": "1f5a9md2gxbl65shbdm498y5dwhhqdpj96gvf2m81ad7gsgxzliv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlJlbW92YWJsZSBEcml2ZSBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyaXZlLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJkcml2ZS1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ1Cn0="}, "40": {"version": "47", "sha256": "0sa694y58jx4yhjb16i25d6h1z5d8vzamwpqlrfs35g0bq93ri5s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlJlbW92YWJsZSBEcml2ZSBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyaXZlLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiZHJpdmUtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Nwp9"}, "41": {"version": "50", "sha256": "1gwi4xwwjps5mm412nck6nqbvcvll2n3h48wc74p9yi34fpr31dq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTAKfQ=="}}} -, {"uuid": "places-menu@gnome-shell-extensions.gcampax.github.com", "name": "Places Status Indicator", "pname": "places-status-indicator", "description": "Add a menu for quickly navigating places in the system.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/8/places-status-indicator/", "shell_version_map": {"38": {"version": "48", "sha256": "05m8nkg2km72iwnmadx6f4br8qnzqagp78mlhz8r2z6hp19nqsh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiUGxhY2VzIFN0YXR1cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGxhY2VzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"}, "40": {"version": "51", "sha256": "159356lnwhxb2d52na679m0wdrsxw89x7m4zkq0kglf01cf8my65", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiUGxhY2VzIFN0YXR1cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGxhY2VzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAicGxhY2VzLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTEKfQ=="}, "41": {"version": "53", "sha256": "0ycb0lgxmal2knz06f8sz638pyq5a14qg5x2cxx76m6ypqwv75h0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mwp9"}}} -, {"uuid": "windowsNavigator@gnome-shell-extensions.gcampax.github.com", "name": "windowNavigator", "pname": "windownavigator", "description": "Allow keyboard selection of windows and workspaces in overlay mode. number selects a workspace, and number selects a window.", "link": "https://extensions.gnome.org/extension/10/windownavigator/", "shell_version_map": {"38": {"version": "49", "sha256": "1rzfnssk0iw1ysaya79ksghikkr1rpm41h2w39cz142fby6kip2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAid2luZG93TmF2aWdhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInphc3BpcmVAcmFtYmxlci5ydSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3dzTmF2aWdhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93c05hdmlnYXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OQp9"}, "40": {"version": "54", "sha256": "0y41w3lxbnhb709n7ynq21nhhc9p4j6fvyjzfw0aw8ysjc8f54iv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAid2luZG93TmF2aWdhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInphc3BpcmVAcmFtYmxlci5ydSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3dzTmF2aWdhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIndpbmRvd3NOYXZpZ2F0b3JAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTQKfQ=="}, "41": {"version": "56", "sha256": "0k404ig42y94j9ysfyvzk0ca5r7f70digwjyjf2cn3py72bs0slg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU2Cn0="}}} +, {"uuid": "apps-menu@gnome-shell-extensions.gcampax.github.com", "name": "Applications Menu", "pname": "applications-menu", "description": "Add a category-based menu for applications.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/6/applications-menu/", "shell_version_map": {"38": {"version": "46", "sha256": "1l5fliypxq3s3b6crv7rc6nl741m7hw48dwl0g7vi3yxyw0vyc0x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJhcHBzLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDYKfQ=="}, "40": {"version": "48", "sha256": "0whi4ir3hvz6gby57331hv0a80ssz1b746pj79v43cm15djlsbhv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiYXBwcy1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ4Cn0="}, "41": {"version": "50", "sha256": "1x71mysa80n5nlfk79xgcz6k40qmw02g78pqjsvdinxsqlxi9ak6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBzLW1lbnUiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwcy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImFwcHMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MAp9"}, "42": {"version": "51", "sha256": "016ngp84g47p904kk9jzfn5mkpy774fj7h70v53dlqc9s7c58r6s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNhdGVnb3J5LWJhc2VkIG1lbnUgZm9yIGFwcGxpY2F0aW9ucy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImFwcHMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBzLW1lbnUiLAogICJuYW1lIjogIkFwcGxpY2F0aW9ucyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlMjAwMkBiay5ydSIsCiAgICAiZGViYXJzaGlyQGdub21lLm9yZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwcy1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImFwcHMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1MQp9"}}} +, {"uuid": "drive-menu@gnome-shell-extensions.gcampax.github.com", "name": "Removable Drive Menu", "pname": "removable-drive-menu", "description": "A status menu for accessing and unmounting removable devices.", "link": "https://extensions.gnome.org/extension/7/removable-drive-menu/", "shell_version_map": {"38": {"version": "45", "sha256": "1f5a9md2gxbl65shbdm498y5dwhhqdpj96gvf2m81ad7gsgxzliv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlJlbW92YWJsZSBEcml2ZSBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyaXZlLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJkcml2ZS1tZW51QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ1Cn0="}, "40": {"version": "47", "sha256": "0sa694y58jx4yhjb16i25d6h1z5d8vzamwpqlrfs35g0bq93ri5s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlJlbW92YWJsZSBEcml2ZSBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyaXZlLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiZHJpdmUtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Nwp9"}, "41": {"version": "50", "sha256": "1gwi4xwwjps5mm412nck6nqbvcvll2n3h48wc74p9yi34fpr31dq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTAKfQ=="}, "42": {"version": "51", "sha256": "1mjxrmlcrn1c9plcmvs4pgmm13jxc7c7v3s4d3xbl2bp096878dc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIGFjY2Vzc2luZyBhbmQgdW5tb3VudGluZyByZW1vdmFibGUgZGV2aWNlcy4iLAogICJleHRlbnNpb24taWQiOiAiZHJpdmUtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kcml2ZS1tZW51IiwKICAibmFtZSI6ICJSZW1vdmFibGUgRHJpdmUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kcml2ZS1tZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImRyaXZlLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTEKfQ=="}}} +, {"uuid": "places-menu@gnome-shell-extensions.gcampax.github.com", "name": "Places Status Indicator", "pname": "places-status-indicator", "description": "Add a menu for quickly navigating places in the system.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/8/places-status-indicator/", "shell_version_map": {"38": {"version": "48", "sha256": "05m8nkg2km72iwnmadx6f4br8qnzqagp78mlhz8r2z6hp19nqsh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiUGxhY2VzIFN0YXR1cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGxhY2VzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"}, "40": {"version": "51", "sha256": "159356lnwhxb2d52na679m0wdrsxw89x7m4zkq0kglf01cf8my65", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiUGxhY2VzIFN0YXR1cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGxhY2VzLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAicGxhY2VzLW1lbnVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTEKfQ=="}, "41": {"version": "53", "sha256": "0ycb0lgxmal2knz06f8sz638pyq5a14qg5x2cxx76m6ypqwv75h0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Mwp9"}, "42": {"version": "54", "sha256": "1sfifdzglmn5x3qxs9k0dn4rwislsyzvp2w3dn47x26mvc90zb90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIG1lbnUgZm9yIHF1aWNrbHkgbmF2aWdhdGluZyBwbGFjZXMgaW4gdGhlIHN5c3RlbS5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBsYWNlcy1tZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBsYWNlcy1tZW51IiwKICAibmFtZSI6ICJQbGFjZXMgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wbGFjZXMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJwbGFjZXMtbWVudUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}}} +, {"uuid": "windowsNavigator@gnome-shell-extensions.gcampax.github.com", "name": "windowNavigator", "pname": "windownavigator", "description": "Allow keyboard selection of windows and workspaces in overlay mode. number selects a workspace, and number selects a window.", "link": "https://extensions.gnome.org/extension/10/windownavigator/", "shell_version_map": {"38": {"version": "49", "sha256": "1rzfnssk0iw1ysaya79ksghikkr1rpm41h2w39cz142fby6kip2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAid2luZG93TmF2aWdhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInphc3BpcmVAcmFtYmxlci5ydSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3dzTmF2aWdhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93c05hdmlnYXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OQp9"}, "40": {"version": "54", "sha256": "0y41w3lxbnhb709n7ynq21nhhc9p4j6fvyjzfw0aw8ysjc8f54iv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAid2luZG93TmF2aWdhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInphc3BpcmVAcmFtYmxlci5ydSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53aW5kb3dzTmF2aWdhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIndpbmRvd3NOYXZpZ2F0b3JAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNTQKfQ=="}, "41": {"version": "56", "sha256": "0k404ig42y94j9ysfyvzk0ca5r7f70digwjyjf2cn3py72bs0slg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU2Cn0="}, "42": {"version": "57", "sha256": "1w3rf6y7l2qgg4ya8cqlj8a6wf8l4yqfjlh17mpmi6gmfzsxplnf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IGtleWJvYXJkIHNlbGVjdGlvbiBvZiB3aW5kb3dzIGFuZCB3b3Jrc3BhY2VzIGluIG92ZXJsYXkgbW9kZS4gPEN0cmw+bnVtYmVyIHNlbGVjdHMgYSB3b3Jrc3BhY2UsIGFuZCA8QWx0Pm51bWJlciBzZWxlY3RzIGEgd2luZG93LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3dzTmF2aWdhdG9yIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd3NOYXZpZ2F0b3IiLAogICJuYW1lIjogIndpbmRvd05hdmlnYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJ6YXNwaXJlQHJhbWJsZXIucnUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93c05hdmlnYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aW5kb3dzTmF2aWdhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU3Cn0="}}} , {"uuid": "Applications_Menu@rmy.pobox.com", "name": "Frippery Applications Menu", "pname": "applications-menu", "description": "Replace Activities button with an Applications menu", "link": "https://extensions.gnome.org/extension/13/applications-menu/", "shell_version_map": {"38": {"version": "45", "sha256": "0kg9dq1ssa11xizb31kcq3p724qzm1cmf30wriqffj043n5nd125", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBidXR0b24gd2l0aCBhbiBBcHBsaWNhdGlvbnMgbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImZyaXBwZXJ5LWFwcGxpY2F0aW9ucy1tZW51IiwKICAibmFtZSI6ICJGcmlwcGVyeSBBcHBsaWNhdGlvbnMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkuYXBwbGljYXRpb25zLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHA6Ly9mcmlwcGVyeS5vcmcvZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiQXBwbGljYXRpb25zX01lbnVAcm15LnBvYm94LmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"}, "40": {"version": "48", "sha256": "1dpgifdf5jk5mz67q8plxrd3952p0a3jzfg3yxxdhb00mdp26azr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBidXR0b24gd2l0aCBhbiBBcHBsaWNhdGlvbnMgbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImZyaXBwZXJ5LWFwcGxpY2F0aW9ucy1tZW51IiwKICAibmFtZSI6ICJGcmlwcGVyeSBBcHBsaWNhdGlvbnMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkuYXBwbGljYXRpb25zLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cDovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJBcHBsaWNhdGlvbnNfTWVudUBybXkucG9ib3guY29tIiwKICAidmVyc2lvbiI6IDQ4Cn0="}, "41": {"version": "48", "sha256": "1dpgifdf5jk5mz67q8plxrd3952p0a3jzfg3yxxdhb00mdp26azr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBidXR0b24gd2l0aCBhbiBBcHBsaWNhdGlvbnMgbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImZyaXBwZXJ5LWFwcGxpY2F0aW9ucy1tZW51IiwKICAibmFtZSI6ICJGcmlwcGVyeSBBcHBsaWNhdGlvbnMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZnJpcHBlcnkuYXBwbGljYXRpb25zLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cDovL2ZyaXBwZXJ5Lm9yZy9leHRlbnNpb25zIiwKICAidXVpZCI6ICJBcHBsaWNhdGlvbnNfTWVudUBybXkucG9ib3guY29tIiwKICAidmVyc2lvbiI6IDQ4Cn0="}}} -, {"uuid": "auto-move-windows@gnome-shell-extensions.gcampax.github.com", "name": "Auto Move Windows", "pname": "auto-move-windows", "description": "Move applications to specific workspaces when they create windows.", "link": "https://extensions.gnome.org/extension/16/auto-move-windows/", "shell_version_map": {"38": {"version": "44", "sha256": "05lmpmyzaawxh3kn030a8sanq7p6g87zfh7nzxfvgi8nbpygd59q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkF1dG8gTW92ZSBXaW5kb3dzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhbGVzc2FuZHJvLmNyaXNtYW5pQGdtYWlsLmNvbSIsCiAgICAidGhvbWFzLmJvdWZmb25AZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLW1vdmUtd2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}, "40": {"version": "46", "sha256": "1hr0z7r0mg1xg9b41d71lqbyra813yrl8i80kin0dmwrcx8xqs8m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkF1dG8gTW92ZSBXaW5kb3dzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhbGVzc2FuZHJvLmNyaXNtYW5pQGdtYWlsLmNvbSIsCiAgICAidGhvbWFzLmJvdWZmb25AZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLW1vdmUtd2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJhdXRvLW1vdmUtd2luZG93c0Bnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Ngp9"}, "41": {"version": "48", "sha256": "1sbxdz0dly2y0zdy5cla3avsnazvw9w31244yjgq1a7zq3dyd2jw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ4Cn0="}}} -, {"uuid": "native-window-placement@gnome-shell-extensions.gcampax.github.com", "name": "Native Window Placement", "pname": "native-window-placement", "description": "Arrange windows in overview in a more compact way.", "link": "https://extensions.gnome.org/extension/18/native-window-placement/", "shell_version_map": {"38": {"version": "45", "sha256": "15vhdcfrfbsinp0m1jfygjl4djccafhvgwc1rsi321jvykqhajmm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTmF0aXZlIFdpbmRvdyBQbGFjZW1lbnQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndlcG1hc2NoZGFAZ214LmRlIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXRpdmUtd2luZG93LXBsYWNlbWVudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ1Cn0="}, "40": {"version": "47", "sha256": "1v424l1svrmw5yikxgbi1j14xx307dg9zy21f34rv2il8bf72vk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTmF0aXZlIFdpbmRvdyBQbGFjZW1lbnQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndlcG1hc2NoZGFAZ214LmRlIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXRpdmUtd2luZG93LXBsYWNlbWVudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJuYXRpdmUtd2luZG93LXBsYWNlbWVudEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Nwp9"}, "41": {"version": "49", "sha256": "12yr2pc1qra962lyadryw64naq6pd30haja38g0svcqj84smqb46", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}}} -, {"uuid": "user-theme@gnome-shell-extensions.gcampax.github.com", "name": "User Themes", "pname": "user-themes", "description": "Load shell themes from user directory.", "link": "https://extensions.gnome.org/extension/19/user-themes/", "shell_version_map": {"38": {"version": "42", "sha256": "0jykwcd8pmvr03dm2vala6nzzhi9i83c11svgx8wymfvxr5qrya8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJVc2VyIFRoZW1lcyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInVzZXItdGhlbWVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "40": {"version": "46", "sha256": "07gbzvbnxah5bws5vc6sivw43j0rgm23n6vsp4a64z7s8s2ay7sm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJVc2VyIFRoZW1lcyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ1c2VyLXRoZW1lQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "41": {"version": "48", "sha256": "0bbm4vbyrp9n3mmqwbhpb6f7dmlx23x1avnp8pilw4p1wr03p7h8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"}}} -, {"uuid": "workspace-indicator@gnome-shell-extensions.gcampax.github.com", "name": "Workspace Indicator", "pname": "workspace-indicator", "description": "Put an indicator on the panel signaling in which workspace you are, and give you the possibility of switching to another one.", "link": "https://extensions.gnome.org/extension/21/workspace-indicator/", "shell_version_map": {"38": {"version": "45", "sha256": "16y7zhlsj0qjwwj78fvcr81m7081i2y30gwjm35qahr3j0gfrk16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgSW5kaWNhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlcmljay5yZWRAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid29ya3NwYWNlLWluZGljYXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"}, "40": {"version": "49", "sha256": "0483k1scq0lwfpg3i3yww7kfzv0qwlp6aqyikkacivh0nkq6v2iy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgSW5kaWNhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlcmljay5yZWRAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3JAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDkKfQ=="}, "41": {"version": "51", "sha256": "1s2mkk41vq9nrlsw26317zh592l59y7cldfmkd3f0d4j2mdiy8bw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUxCn0="}}} -, {"uuid": "gTile@vibou", "name": "gTile", "pname": "gtile", "description": "Tile windows on a grid.", "link": "https://extensions.gnome.org/extension/28/gtile/", "shell_version_map": {"38": {"version": "48", "sha256": "10lldk59j2sfdhcxj8dw83bhc1jkm2343h8yxb2v722qhkz1bhhm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZS9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJ1dWlkIjogImdUaWxlQHZpYm91IiwKICAidmVyc2lvbiI6IDQ4Cn0="}, "40": {"version": "48", "sha256": "10lldk59j2sfdhcxj8dw83bhc1jkm2343h8yxb2v722qhkz1bhhm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZS9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJ1dWlkIjogImdUaWxlQHZpYm91IiwKICAidmVyc2lvbiI6IDQ4Cn0="}, "41": {"version": "48", "sha256": "10lldk59j2sfdhcxj8dw83bhc1jkm2343h8yxb2v722qhkz1bhhm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nVGlsZS9nVGlsZS9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJ1dWlkIjogImdUaWxlQHZpYm91IiwKICAidmVyc2lvbiI6IDQ4Cn0="}}} -, {"uuid": "lockkeys@vaina.lt", "name": "Lock Keys", "pname": "lock-keys", "description": "Numlock & Capslock status on the panel", "link": "https://extensions.gnome.org/extension/36/lock-keys/", "shell_version_map": {"38": {"version": "45", "sha256": "0cqkhi8k8lywjsy9g6nbl5kbv8bvz4nql16k1ciajar4443gbz7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsIiwKICAibmFtZSI6ICJMb2NrIEtleXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEsIFBpZXJyZSBPc3NtYW4sIGVyZ3VpbGxlLCBqb25uaXVzLCBQaGlsaXBwIFdvbGZlciwgTWFyaXVzeiBMaXNvd3NraSwgQ3Jpc3RpYW4gQmVyb2l6YSwgd2FybXN1bjAyMjAsIFJhc211cyBLYWosIFBhYmxvIE1hcnRpbi1Hb21leiBCb3Vza2EsIFJhcGhhXHUwMGVibCBSb2NoZXQsIEx1aXogTmlja2VsLCBKZXNzZSwgRHVcdTAxNjFhbiBLYXppayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxvY2trZXlzIiwKICAidXVpZCI6ICJsb2Nra2V5c0B2YWluYS5sdCIsCiAgInZlcnNpb24iOiA0NQp9"}, "40": {"version": "45", "sha256": "0cqkhi8k8lywjsy9g6nbl5kbv8bvz4nql16k1ciajar4443gbz7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsIiwKICAibmFtZSI6ICJMb2NrIEtleXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEsIFBpZXJyZSBPc3NtYW4sIGVyZ3VpbGxlLCBqb25uaXVzLCBQaGlsaXBwIFdvbGZlciwgTWFyaXVzeiBMaXNvd3NraSwgQ3Jpc3RpYW4gQmVyb2l6YSwgd2FybXN1bjAyMjAsIFJhc211cyBLYWosIFBhYmxvIE1hcnRpbi1Hb21leiBCb3Vza2EsIFJhcGhhXHUwMGVibCBSb2NoZXQsIEx1aXogTmlja2VsLCBKZXNzZSwgRHVcdTAxNjFhbiBLYXppayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxvY2trZXlzIiwKICAidXVpZCI6ICJsb2Nra2V5c0B2YWluYS5sdCIsCiAgInZlcnNpb24iOiA0NQp9"}, "41": {"version": "45", "sha256": "0cqkhi8k8lywjsy9g6nbl5kbv8bvz4nql16k1ciajar4443gbz7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsIiwKICAibmFtZSI6ICJMb2NrIEtleXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkthemltaWVyYXMgVmFpbmEsIFBpZXJyZSBPc3NtYW4sIGVyZ3VpbGxlLCBqb25uaXVzLCBQaGlsaXBwIFdvbGZlciwgTWFyaXVzeiBMaXNvd3NraSwgQ3Jpc3RpYW4gQmVyb2l6YSwgd2FybXN1bjAyMjAsIFJhc211cyBLYWosIFBhYmxvIE1hcnRpbi1Hb21leiBCb3Vza2EsIFJhcGhhXHUwMGVibCBSb2NoZXQsIEx1aXogTmlja2VsLCBKZXNzZSwgRHVcdTAxNjFhbiBLYXppayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxvY2trZXlzIiwKICAidXVpZCI6ICJsb2Nra2V5c0B2YWluYS5sdCIsCiAgInZlcnNpb24iOiA0NQp9"}}} +, {"uuid": "auto-move-windows@gnome-shell-extensions.gcampax.github.com", "name": "Auto Move Windows", "pname": "auto-move-windows", "description": "Move applications to specific workspaces when they create windows.", "link": "https://extensions.gnome.org/extension/16/auto-move-windows/", "shell_version_map": {"38": {"version": "44", "sha256": "05lmpmyzaawxh3kn030a8sanq7p6g87zfh7nzxfvgi8nbpygd59q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkF1dG8gTW92ZSBXaW5kb3dzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhbGVzc2FuZHJvLmNyaXNtYW5pQGdtYWlsLmNvbSIsCiAgICAidGhvbWFzLmJvdWZmb25AZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLW1vdmUtd2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}, "40": {"version": "46", "sha256": "1hr0z7r0mg1xg9b41d71lqbyra813yrl8i80kin0dmwrcx8xqs8m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkF1dG8gTW92ZSBXaW5kb3dzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJhbGVzc2FuZHJvLmNyaXNtYW5pQGdtYWlsLmNvbSIsCiAgICAidGhvbWFzLmJvdWZmb25AZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hdXRvLW1vdmUtd2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJhdXRvLW1vdmUtd2luZG93c0Bnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Ngp9"}, "41": {"version": "48", "sha256": "1sbxdz0dly2y0zdy5cla3avsnazvw9w31244yjgq1a7zq3dyd2jw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ4Cn0="}, "42": {"version": "49", "sha256": "031ppsjqv3y81wcjjsm14rqfh0l7vvaavy01hlqfyglpk8vlfvml", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgYXBwbGljYXRpb25zIHRvIHNwZWNpZmljIHdvcmtzcGFjZXMgd2hlbiB0aGV5IGNyZWF0ZSB3aW5kb3dzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhdXRvLW1vdmUtd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvLW1vdmUtd2luZG93cyIsCiAgIm5hbWUiOiAiQXV0byBNb3ZlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImFsZXNzYW5kcm8uY3Jpc21hbmlAZ21haWwuY29tIiwKICAgICJ0aG9tYXMuYm91ZmZvbkBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF1dG8tbW92ZS13aW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImF1dG8tbW92ZS13aW5kb3dzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}}} +, {"uuid": "native-window-placement@gnome-shell-extensions.gcampax.github.com", "name": "Native Window Placement", "pname": "native-window-placement", "description": "Arrange windows in overview in a more compact way.", "link": "https://extensions.gnome.org/extension/18/native-window-placement/", "shell_version_map": {"38": {"version": "45", "sha256": "15vhdcfrfbsinp0m1jfygjl4djccafhvgwc1rsi321jvykqhajmm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTmF0aXZlIFdpbmRvdyBQbGFjZW1lbnQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndlcG1hc2NoZGFAZ214LmRlIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXRpdmUtd2luZG93LXBsYWNlbWVudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ1Cn0="}, "40": {"version": "47", "sha256": "1v424l1svrmw5yikxgbi1j14xx307dg9zy21f34rv2il8bf72vk4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTmF0aXZlIFdpbmRvdyBQbGFjZW1lbnQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndlcG1hc2NoZGFAZ214LmRlIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXRpdmUtd2luZG93LXBsYWNlbWVudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJuYXRpdmUtd2luZG93LXBsYWNlbWVudEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Nwp9"}, "41": {"version": "49", "sha256": "12yr2pc1qra962lyadryw64naq6pd30haja38g0svcqj84smqb46", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "42": {"version": "50", "sha256": "0zqqisd0k81i0ydrbr1qrw1gdfs0p5y75dbqcsixn0srf5995xvm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBpbiBvdmVydmlldyBpbiBhIG1vcmUgY29tcGFjdCB3YXkuIiwKICAiZXh0ZW5zaW9uLWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAibmFtZSI6ICJOYXRpdmUgV2luZG93IFBsYWNlbWVudCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAid2VwbWFzY2hkYUBnbXguZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIm5hdGl2ZS13aW5kb3ctcGxhY2VtZW50QGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUwCn0="}}} +, {"uuid": "user-theme@gnome-shell-extensions.gcampax.github.com", "name": "User Themes", "pname": "user-themes", "description": "Load shell themes from user directory.", "link": "https://extensions.gnome.org/extension/19/user-themes/", "shell_version_map": {"38": {"version": "42", "sha256": "0jykwcd8pmvr03dm2vala6nzzhi9i83c11svgx8wymfvxr5qrya8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJVc2VyIFRoZW1lcyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInVzZXItdGhlbWVAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "40": {"version": "46", "sha256": "07gbzvbnxah5bws5vc6sivw43j0rgm23n6vsp4a64z7s8s2ay7sm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJVc2VyIFRoZW1lcyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ1c2VyLXRoZW1lQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "41": {"version": "48", "sha256": "0bbm4vbyrp9n3mmqwbhpb6f7dmlx23x1avnp8pilw4p1wr03p7h8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OAp9"}, "42": {"version": "49", "sha256": "0ykaw2602iixn87fc65h6vwxzlcjidpp9hpcsmf66r0f6xibgpah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgc2hlbGwgdGhlbWVzIGZyb20gdXNlciBkaXJlY3RvcnkuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tdXNlci10aGVtZSIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAidXNlci10aGVtZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0OQp9"}}} +, {"uuid": "workspace-indicator@gnome-shell-extensions.gcampax.github.com", "name": "Workspace Indicator", "pname": "workspace-indicator", "description": "Put an indicator on the panel signaling in which workspace you are, and give you the possibility of switching to another one.", "link": "https://extensions.gnome.org/extension/21/workspace-indicator/", "shell_version_map": {"38": {"version": "45", "sha256": "16y7zhlsj0qjwwj78fvcr81m7081i2y30gwjm35qahr3j0gfrk16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgSW5kaWNhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlcmljay5yZWRAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid29ya3NwYWNlLWluZGljYXRvckBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0NQp9"}, "40": {"version": "49", "sha256": "0483k1scq0lwfpg3i3yww7kfzv0qwlp6aqyikkacivh0nkq6v2iy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgSW5kaWNhdG9yIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJlcmljay5yZWRAZ21haWwuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3JAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDkKfQ=="}, "41": {"version": "51", "sha256": "1s2mkk41vq9nrlsw26317zh592l59y7cldfmkd3f0d4j2mdiy8bw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUxCn0="}, "42": {"version": "52", "sha256": "1i0jm0k3rjk97283p0iv0nx2cclij0kx7dqb35a7kd2pxh89jn8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhbiBpbmRpY2F0b3Igb24gdGhlIHBhbmVsIHNpZ25hbGluZyBpbiB3aGljaCB3b3Jrc3BhY2UgeW91IGFyZSwgYW5kIGdpdmUgeW91IHRoZSBwb3NzaWJpbGl0eSBvZiBzd2l0Y2hpbmcgdG8gYW5vdGhlciBvbmUuIiwKICAiZXh0ZW5zaW9uLWlkIjogIndvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24td29ya3NwYWNlLWluZGljYXRvciIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiZXJpY2sucmVkQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUyCn0="}}} +, {"uuid": "gTile@vibou", "name": "gTile", "pname": "gtile", "description": "Tile windows on a grid.", "link": "https://extensions.gnome.org/extension/28/gtile/", "shell_version_map": {"38": {"version": "50", "sha256": "0qqbkhj3j5ysv74gbcp9b5jspqyzs5daijd830nf3vgj9hg5l7pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ1RpbGUiLAogICJ1dWlkIjogImdUaWxlQHZpYm91IiwKICAidmVyc2lvbiI6IDUwCn0="}, "40": {"version": "50", "sha256": "0qqbkhj3j5ysv74gbcp9b5jspqyzs5daijd830nf3vgj9hg5l7pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ1RpbGUiLAogICJ1dWlkIjogImdUaWxlQHZpYm91IiwKICAidmVyc2lvbiI6IDUwCn0="}, "41": {"version": "50", "sha256": "0qqbkhj3j5ysv74gbcp9b5jspqyzs5daijd830nf3vgj9hg5l7pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ1RpbGUiLAogICJ1dWlkIjogImdUaWxlQHZpYm91IiwKICAidmVyc2lvbiI6IDUwCn0="}, "42": {"version": "50", "sha256": "0qqbkhj3j5ysv74gbcp9b5jspqyzs5daijd830nf3vgj9hg5l7pd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGdyaWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RpbGVAdmlib3UiLAogICJuYW1lIjogImdUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmd0aWxlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ1RpbGUiLAogICJ1dWlkIjogImdUaWxlQHZpYm91IiwKICAidmVyc2lvbiI6IDUwCn0="}}} +, {"uuid": "lockkeys@vaina.lt", "name": "Lock Keys", "pname": "lock-keys", "description": "Numlock & Capslock status on the panel. Gnome version 3.30 and earlier users please install 44 version of the extension https://extensions.gnome.org/download-extension/lockkeys%40vaina.lt.shell-extension.zip?version_tag=26229 ", "link": "https://extensions.gnome.org/extension/36/lock-keys/", "shell_version_map": {"38": {"version": "47", "sha256": "1lsnmf6lsp92g1clxl190hx30p03a11w4hs3m9v0pav12cq8agfi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxvY2trZXlzIiwKICAidXVpZCI6ICJsb2Nra2V5c0B2YWluYS5sdCIsCiAgInZlcnNpb24iOiA0Nwp9"}, "40": {"version": "47", "sha256": "1lsnmf6lsp92g1clxl190hx30p03a11w4hs3m9v0pav12cq8agfi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxvY2trZXlzIiwKICAidXVpZCI6ICJsb2Nra2V5c0B2YWluYS5sdCIsCiAgInZlcnNpb24iOiA0Nwp9"}, "41": {"version": "47", "sha256": "1lsnmf6lsp92g1clxl190hx30p03a11w4hs3m9v0pav12cq8agfi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxvY2trZXlzIiwKICAidXVpZCI6ICJsb2Nra2V5c0B2YWluYS5sdCIsCiAgInZlcnNpb24iOiA0Nwp9"}, "42": {"version": "47", "sha256": "1lsnmf6lsp92g1clxl190hx30p03a11w4hs3m9v0pav12cq8agfi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgJiBDYXBzbG9jayBzdGF0dXMgb24gdGhlIHBhbmVsLiBHbm9tZSB2ZXJzaW9uIDMuMzAgYW5kIGVhcmxpZXIgdXNlcnMgcGxlYXNlIGluc3RhbGwgNDQgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZG93bmxvYWQtZXh0ZW5zaW9uL2xvY2trZXlzJTQwdmFpbmEubHQuc2hlbGwtZXh0ZW5zaW9uLnppcD92ZXJzaW9uX3RhZz0yNjIyOSAiLAogICJuYW1lIjogIkxvY2sgS2V5cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSwgUmFwaGFcdTAwZWJsIFJvY2hldCwgTHVpeiBOaWNrZWwsIEplc3NlLCBEdVx1MDE2MWFuIEthemlrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2F6eXNtYXN0ZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxvY2trZXlzIiwKICAidXVpZCI6ICJsb2Nra2V5c0B2YWluYS5sdCIsCiAgInZlcnNpb24iOiA0Nwp9"}}} , {"uuid": "putWindow@clemens.lab21.org", "name": "Put Windows", "pname": "put-windows", "description": "Fully customizable replacement for the old compiz put plugin. \n * Move windows to left/right side, bottom/top, center or corner \n * Move window to other screen \n * Select focused window using the keyboard \n * Application based window placement \n\n Please check github if your gnome-shell version is not supported", "link": "https://extensions.gnome.org/extension/39/put-windows/", "shell_version_map": {"38": {"version": "32", "sha256": "1n4hk2sqdbcn25lxk02vljc9xxbidragimvc4b6dj2m72625lx67", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IGN1c3RvbWl6YWJsZSByZXBsYWNlbWVudCBmb3IgdGhlIG9sZCBjb21waXogcHV0IHBsdWdpbi4gXG4gKiBNb3ZlIHdpbmRvd3MgdG8gbGVmdC9yaWdodCBzaWRlLCBib3R0b20vdG9wLCBjZW50ZXIgb3IgY29ybmVyIFxuICogTW92ZSB3aW5kb3cgdG8gb3RoZXIgc2NyZWVuIFxuICogU2VsZWN0IGZvY3VzZWQgd2luZG93IHVzaW5nIHRoZSBrZXlib2FyZCBcbiAqIEFwcGxpY2F0aW9uIGJhc2VkIHdpbmRvdyBwbGFjZW1lbnQgXG5cbiBQbGVhc2UgY2hlY2sgZ2l0aHViIGlmIHlvdXIgZ25vbWUtc2hlbGwgdmVyc2lvbiBpcyBub3Qgc3VwcG9ydGVkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHV0V2luZG93IiwKICAibmFtZSI6ICJQdXQgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcmctbGFiMjEtcHV0d2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVnZXN0aS9nbm9tZS1zaGVsbC1leHRlbnNpb25zLW5lZ2VzdGkiLAogICJ1dWlkIjogInB1dFdpbmRvd0BjbGVtZW5zLmxhYjIxLm9yZyIsCiAgInZlcnNpb24iOiAzMgp9"}}} -, {"uuid": "permanent-notifications@bonzini.gnu.org", "name": "Permanent notifications", "pname": "permanent-notifications", "description": "Keep notifications on the message tray until clicked", "link": "https://extensions.gnome.org/extension/41/permanent-notifications/", "shell_version_map": {"40": {"version": "7", "sha256": "1zlxvn9c4ydpvkja6vpyvif21rfi1y86rzi0iqms5mk8in4cgx41", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgbm90aWZpY2F0aW9ucyBvbiB0aGUgbWVzc2FnZSB0cmF5IHVudGlsIGNsaWNrZWQiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBlcm1hbmVudCBub3RpZmljYXRpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJib256aW5pQGdudS5vcmciCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuMi4xIiwKICAgICIzLjQiLAogICAgIjMuMy45MCIsCiAgICAiMy4zLjkxIiwKICAgICIzLjMuOTIiLAogICAgIjMuNiIsCiAgICAiMy40LjEiLAogICAgIjMuMy45MyIsCiAgICAiMy4zLjk0IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JvbnppbmkvZ25vbWUtc2hlbGwtcGVybWFuZW50LW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogInBlcm1hbmVudC1ub3RpZmljYXRpb25zQGJvbnppbmkuZ251Lm9yZyIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1zlxvn9c4ydpvkja6vpyvif21rfi1y86rzi0iqms5mk8in4cgx41", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgbm90aWZpY2F0aW9ucyBvbiB0aGUgbWVzc2FnZSB0cmF5IHVudGlsIGNsaWNrZWQiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBlcm1hbmVudCBub3RpZmljYXRpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJib256aW5pQGdudS5vcmciCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuMi4xIiwKICAgICIzLjQiLAogICAgIjMuMy45MCIsCiAgICAiMy4zLjkxIiwKICAgICIzLjMuOTIiLAogICAgIjMuNiIsCiAgICAiMy40LjEiLAogICAgIjMuMy45MyIsCiAgICAiMy4zLjk0IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JvbnppbmkvZ25vbWUtc2hlbGwtcGVybWFuZW50LW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogInBlcm1hbmVudC1ub3RpZmljYXRpb25zQGJvbnppbmkuZ251Lm9yZyIsCiAgInZlcnNpb24iOiA3Cn0="}}} +, {"uuid": "permanent-notifications@bonzini.gnu.org", "name": "Permanent notifications", "pname": "permanent-notifications", "description": "Keep notifications on the message tray until clicked", "link": "https://extensions.gnome.org/extension/41/permanent-notifications/", "shell_version_map": {"40": {"version": "8", "sha256": "13s0h7b9216xi7p6lsnipsm0lrxzr2dc94nm87fn580m43gx24lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgbm90aWZpY2F0aW9ucyBvbiB0aGUgbWVzc2FnZSB0cmF5IHVudGlsIGNsaWNrZWQiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBlcm1hbmVudCBub3RpZmljYXRpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJib256aW5pQGdudS5vcmciCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuMi4xIiwKICAgICIzLjQiLAogICAgIjMuMy45MCIsCiAgICAiMy4zLjkxIiwKICAgICIzLjMuOTIiLAogICAgIjMuNiIsCiAgICAiMy40LjEiLAogICAgIjMuMy45MyIsCiAgICAiMy4zLjk0IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ib256aW5pL2dub21lLXNoZWxsLXBlcm1hbmVudC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJwZXJtYW5lbnQtbm90aWZpY2F0aW9uc0Bib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "13s0h7b9216xi7p6lsnipsm0lrxzr2dc94nm87fn580m43gx24lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgbm90aWZpY2F0aW9ucyBvbiB0aGUgbWVzc2FnZSB0cmF5IHVudGlsIGNsaWNrZWQiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBlcm1hbmVudCBub3RpZmljYXRpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJib256aW5pQGdudS5vcmciCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuMi4xIiwKICAgICIzLjQiLAogICAgIjMuMy45MCIsCiAgICAiMy4zLjkxIiwKICAgICIzLjMuOTIiLAogICAgIjMuNiIsCiAgICAiMy40LjEiLAogICAgIjMuMy45MyIsCiAgICAiMy4zLjk0IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ib256aW5pL2dub21lLXNoZWxsLXBlcm1hbmVudC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJwZXJtYW5lbnQtbm90aWZpY2F0aW9uc0Bib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "13s0h7b9216xi7p6lsnipsm0lrxzr2dc94nm87fn580m43gx24lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgbm90aWZpY2F0aW9ucyBvbiB0aGUgbWVzc2FnZSB0cmF5IHVudGlsIGNsaWNrZWQiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBlcm1hbmVudCBub3RpZmljYXRpb25zIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJib256aW5pQGdudS5vcmciCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuMi4xIiwKICAgICIzLjQiLAogICAgIjMuMy45MCIsCiAgICAiMy4zLjkxIiwKICAgICIzLjMuOTIiLAogICAgIjMuNiIsCiAgICAiMy40LjEiLAogICAgIjMuMy45MyIsCiAgICAiMy4zLjk0IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ib256aW5pL2dub21lLXNoZWxsLXBlcm1hbmVudC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJwZXJtYW5lbnQtbm90aWZpY2F0aW9uc0Bib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "gnome-shell-trash-extension", "name": "Trash", "pname": "trash", "description": "A Trash button for the GNOME shell panel", "link": "https://extensions.gnome.org/extension/48/trash/", "shell_version_map": {"38": {"version": "18", "sha256": "1cysvxrgi7lnig7d8blhqqbxz0phd4fvn7nww6zpihjnw32rvm4z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVHJhc2ggYnV0dG9uIGZvciB0aGUgR05PTUUgc2hlbGwgcGFuZWwiLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJUcmFzaCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiQXhlbCB2b24gQmVydG9sZGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iZXJ0b2xkaWEvZ25vbWUtc2hlbGwtdHJhc2gtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC10cmFzaC1leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}}} , {"uuid": "RecentItems@bananenfisch.net", "name": "Recent Items", "pname": "recent-items", "description": "Adds an icon for recently used items at the top panel; clear list by click; left click: open file, right click: open containing folder; Settings for: number of items, number of items under \"more\" and blacklisting options are defined at the top of extension.js (see https://github.com/bananenfisch/RecentItems for more infos).", "link": "https://extensions.gnome.org/extension/72/recent-items/", "shell_version_map": {"40": {"version": "20", "sha256": "0ys8lanv0xxbwfmqkfvdqvhbnv4vfjpzvpqjj11c1lxbv4wp2mbj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHA6Ly93d3cuYmFuYW5lbmZpc2NoLm5ldC9nbm9tZSIsCiAgInV1aWQiOiAiUmVjZW50SXRlbXNAYmFuYW5lbmZpc2NoLm5ldCIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "20", "sha256": "0ys8lanv0xxbwfmqkfvdqvhbnv4vfjpzvpqjj11c1lxbv4wp2mbj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHA6Ly93d3cuYmFuYW5lbmZpc2NoLm5ldC9nbm9tZSIsCiAgInV1aWQiOiAiUmVjZW50SXRlbXNAYmFuYW5lbmZpc2NoLm5ldCIsCiAgInZlcnNpb24iOiAyMAp9"}}} , {"uuid": "lockscreen@sri.ramkrishna.me", "name": "Lock Screen", "pname": "lock-screen", "description": "Add lock icon to the panel and lock the screen instead of using ctrl-alt-l", "link": "https://extensions.gnome.org/extension/83/lock-screen/", "shell_version_map": {"40": {"version": "13", "sha256": "1zlc6m3mai884mkgyg4mwvb7dc3wwpgysbkpfqw35cxpxf7chfk2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsb2NrIGljb24gdG8gdGhlIHBhbmVsIGFuZCBsb2NrIHRoZSBzY3JlZW4gaW5zdGVhZCBvZiB1c2luZyBjdHJsLWFsdC1sIiwKICAibmFtZSI6ICJMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NyYW1rcmlzaG5hL2dub21lMy1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsb2Nrc2NyZWVuQHNyaS5yYW1rcmlzaG5hLm1lIiwKICAidmVyc2lvbiI6IDEzCn0="}}} @@ -22,7 +22,7 @@ , {"uuid": "favorites@cvine.org", "name": "Favorites Menu", "pname": "favorites-menu", "description": "Provide panel menu for favorites", "link": "https://extensions.gnome.org/extension/115/favorites-menu/", "shell_version_map": {"40": {"version": "15", "sha256": "02s0p33dcr6wrxivjd47rwb42whqc6qswr3qdvd7p6jym4zddbi2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgcGFuZWwgbWVudSBmb3IgZmF2b3JpdGVzIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgTWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHA6Ly93d3cuY3ZpbmUucGx1cy5jb20vZmF2b3JpdGVzL2luZGV4Lmh0bWwiLAogICJ1dWlkIjogImZhdm9yaXRlc0BjdmluZS5vcmciLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "17", "sha256": "1xbm8d4669j727fw3cm5lmdkfq46xwavsiivr7s9l0nnmnafjzbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgcGFuZWwgbWVudSBmb3IgZmF2b3JpdGVzIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgTWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHA6Ly93d3cuY3ZpbmUucGx1cy5jb20vZmF2b3JpdGVzL2luZGV4Lmh0bWwiLAogICJ1dWlkIjogImZhdm9yaXRlc0BjdmluZS5vcmciLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "system-monitor@paradoxxx.zero.gmail.com", "name": "system-monitor", "pname": "system-monitor", "description": "Display system information in GNOME Shell status bar, such as memory, CPU, disk and battery usages, network rates…", "link": "https://extensions.gnome.org/extension/120/system-monitor/", "shell_version_map": {"40": {"version": "40", "sha256": "05xmpbwwjzax5y7p7a492k6mmv9rjiyinnrfkzrzm16yncn3mbvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcmFkb3h4eHplcm8vZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0IiwKICAidXVpZCI6ICJzeXN0ZW0tbW9uaXRvckBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="}}} , {"uuid": "Fuzzy_Clock@dallagi", "name": "Fuzzy Clock", "pname": "fuzzy-clock", "description": "A human-readable clock for the gnome-shell panel", "link": "https://extensions.gnome.org/extension/202/fuzzy-clock/", "shell_version_map": {"38": {"version": "9", "sha256": "1cga3192balji63zmbbyixb4r53j48zhil4hnv57l3b25k4rmk0i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYWxsYWdpL2dub21lLXNoZWxsLWZ1enp5LWNsb2NrIiwKICAidXVpZCI6ICJGdXp6eV9DbG9ja0BkYWxsYWdpIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} -, {"uuid": "PersianCalendar@oxygenws.com", "name": "Persian Calendar", "pname": "persian-calendar", "description": "Shows Persian date in the top panel.\n\nIt shows:\n1- Persian calendar\n2- It can show, today is a holiday or not!\n3- Show notification onDayChanged!\n4- Date converter between Persian, Gregorian and Lunar Hijri\n5- Events:\n5-1- Official solar events.\n5-2- Official lunar events.\n5-3- Official international events.\n5-4- Traditional Persian events.\n5-5- Persian personages.\n\nPlease \"rate\" here and \"star\" the project in GitHub.\nPlease open an issue in GitHub if you've found something or have an idea!", "link": "https://extensions.gnome.org/extension/240/persian-calendar/", "shell_version_map": {"38": {"version": "73", "sha256": "14p27d2h58jam7h97y06safsc2c8rwmjy74nak5w9cv7s0wx4kar", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEtIFBlcnNpYW4gY2FsZW5kYXJcbjItIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy0gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC0gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LSBFdmVudHM6XG41LTEtIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUtMi0gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS0zLSBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUtNC0gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LTUtIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFwicmF0ZVwiIGhlcmUgYW5kIFwic3RhclwiIHRoZSBwcm9qZWN0IGluIEdpdEh1Yi5cblBsZWFzZSBvcGVuIGFuIGlzc3VlIGluIEdpdEh1YiBpZiB5b3UndmUgZm91bmQgc29tZXRoaW5nIG9yIGhhdmUgYW4gaWRlYSEiLAogICJuYW1lIjogIlBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIk9taWQgTW90dGFnaGkgUmFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb21pZC9QZXJzaWFuLUNhbGVuZGFyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiUGVyc2lhbkNhbGVuZGFyQG94eWdlbndzLmNvbSIsCiAgInZlcnNpb24iOiA3Mwp9"}, "40": {"version": "90", "sha256": "08h7jz5i9kx53bfsqirfyk1a2kp30lwqivkcr4wi9lx99byygyfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEtIFBlcnNpYW4gY2FsZW5kYXJcbjItIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy0gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC0gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LSBFdmVudHM6XG41LTEtIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUtMi0gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS0zLSBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUtNC0gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LTUtIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFwicmF0ZVwiIGhlcmUgYW5kIFwic3RhclwiIHRoZSBwcm9qZWN0IGluIEdpdEh1Yi5cblBsZWFzZSBvcGVuIGFuIGlzc3VlIGluIEdpdEh1YiBpZiB5b3UndmUgZm91bmQgc29tZXRoaW5nIG9yIGhhdmUgYW4gaWRlYSEiLAogICJuYW1lIjogIlBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIk9taWQgTW90dGFnaGkgUmFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vbWlkL1BlcnNpYW4tQ2FsZW5kYXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJQZXJzaWFuQ2FsZW5kYXJAb3h5Z2Vud3MuY29tIiwKICAidmVyc2lvbiI6IDkwCn0="}, "41": {"version": "90", "sha256": "08h7jz5i9kx53bfsqirfyk1a2kp30lwqivkcr4wi9lx99byygyfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEtIFBlcnNpYW4gY2FsZW5kYXJcbjItIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy0gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC0gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LSBFdmVudHM6XG41LTEtIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUtMi0gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS0zLSBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUtNC0gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LTUtIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFwicmF0ZVwiIGhlcmUgYW5kIFwic3RhclwiIHRoZSBwcm9qZWN0IGluIEdpdEh1Yi5cblBsZWFzZSBvcGVuIGFuIGlzc3VlIGluIEdpdEh1YiBpZiB5b3UndmUgZm91bmQgc29tZXRoaW5nIG9yIGhhdmUgYW4gaWRlYSEiLAogICJuYW1lIjogIlBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIk9taWQgTW90dGFnaGkgUmFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vbWlkL1BlcnNpYW4tQ2FsZW5kYXItZm9yLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJQZXJzaWFuQ2FsZW5kYXJAb3h5Z2Vud3MuY29tIiwKICAidmVyc2lvbiI6IDkwCn0="}}} +, {"uuid": "PersianCalendar@oxygenws.com", "name": "Persian Calendar", "pname": "persian-calendar", "description": "Shows Persian date in the top panel.\n\nIt shows:\n1- Persian calendar\n2- It can show, today is a holiday or not!\n3- Show notification onDayChanged!\n4- Date converter between Persian, Gregorian and Lunar Hijri\n5- Events:\n5-1- Official solar events.\n5-2- Official lunar events.\n5-3- Official international events.\n5-4- Traditional Persian events.\n5-5- Persian personages.\n\nPlease \"rate\" here and \"star\" the project in GitHub.\nPlease open an issue in GitHub if you've found something or have an idea!", "link": "https://extensions.gnome.org/extension/240/persian-calendar/", "shell_version_map": {"38": {"version": "73", "sha256": "14p27d2h58jam7h97y06safsc2c8rwmjy74nak5w9cv7s0wx4kar", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEtIFBlcnNpYW4gY2FsZW5kYXJcbjItIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy0gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC0gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LSBFdmVudHM6XG41LTEtIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUtMi0gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS0zLSBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUtNC0gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LTUtIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFwicmF0ZVwiIGhlcmUgYW5kIFwic3RhclwiIHRoZSBwcm9qZWN0IGluIEdpdEh1Yi5cblBsZWFzZSBvcGVuIGFuIGlzc3VlIGluIEdpdEh1YiBpZiB5b3UndmUgZm91bmQgc29tZXRoaW5nIG9yIGhhdmUgYW4gaWRlYSEiLAogICJuYW1lIjogIlBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIk9taWQgTW90dGFnaGkgUmFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb21pZC9QZXJzaWFuLUNhbGVuZGFyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiUGVyc2lhbkNhbGVuZGFyQG94eWdlbndzLmNvbSIsCiAgInZlcnNpb24iOiA3Mwp9"}, "40": {"version": "92", "sha256": "1cjiy8gswqlc95277yszihy8nr3n5w33amy1167fyfl1gfsr0k6i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEtIFBlcnNpYW4gY2FsZW5kYXJcbjItIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy0gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC0gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LSBFdmVudHM6XG41LTEtIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUtMi0gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS0zLSBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUtNC0gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LTUtIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFwicmF0ZVwiIGhlcmUgYW5kIFwic3RhclwiIHRoZSBwcm9qZWN0IGluIEdpdEh1Yi5cblBsZWFzZSBvcGVuIGFuIGlzc3VlIGluIEdpdEh1YiBpZiB5b3UndmUgZm91bmQgc29tZXRoaW5nIG9yIGhhdmUgYW4gaWRlYSEiLAogICJuYW1lIjogIlBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIk9taWQgTW90dGFnaGkgUmFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb21pZC9QZXJzaWFuLUNhbGVuZGFyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiUGVyc2lhbkNhbGVuZGFyQG94eWdlbndzLmNvbSIsCiAgInZlcnNpb24iOiA5Mgp9"}, "41": {"version": "92", "sha256": "1cjiy8gswqlc95277yszihy8nr3n5w33amy1167fyfl1gfsr0k6i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEtIFBlcnNpYW4gY2FsZW5kYXJcbjItIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy0gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC0gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LSBFdmVudHM6XG41LTEtIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUtMi0gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS0zLSBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUtNC0gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LTUtIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFwicmF0ZVwiIGhlcmUgYW5kIFwic3RhclwiIHRoZSBwcm9qZWN0IGluIEdpdEh1Yi5cblBsZWFzZSBvcGVuIGFuIGlzc3VlIGluIEdpdEh1YiBpZiB5b3UndmUgZm91bmQgc29tZXRoaW5nIG9yIGhhdmUgYW4gaWRlYSEiLAogICJuYW1lIjogIlBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIk9taWQgTW90dGFnaGkgUmFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb21pZC9QZXJzaWFuLUNhbGVuZGFyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiUGVyc2lhbkNhbGVuZGFyQG94eWdlbndzLmNvbSIsCiAgInZlcnNpb24iOiA5Mgp9"}, "42": {"version": "92", "sha256": "1cjiy8gswqlc95277yszihy8nr3n5w33amy1167fyfl1gfsr0k6i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIFBlcnNpYW4gZGF0ZSBpbiB0aGUgdG9wIHBhbmVsLlxuXG5JdCBzaG93czpcbjEtIFBlcnNpYW4gY2FsZW5kYXJcbjItIEl0IGNhbiBzaG93LCB0b2RheSBpcyBhIGhvbGlkYXkgb3Igbm90IVxuMy0gU2hvdyBub3RpZmljYXRpb24gb25EYXlDaGFuZ2VkIVxuNC0gRGF0ZSBjb252ZXJ0ZXIgYmV0d2VlbiBQZXJzaWFuLCBHcmVnb3JpYW4gYW5kIEx1bmFyIEhpanJpXG41LSBFdmVudHM6XG41LTEtIE9mZmljaWFsIHNvbGFyIGV2ZW50cy5cbjUtMi0gT2ZmaWNpYWwgbHVuYXIgZXZlbnRzLlxuNS0zLSBPZmZpY2lhbCBpbnRlcm5hdGlvbmFsIGV2ZW50cy5cbjUtNC0gVHJhZGl0aW9uYWwgUGVyc2lhbiBldmVudHMuXG41LTUtIFBlcnNpYW4gcGVyc29uYWdlcy5cblxuUGxlYXNlIFwicmF0ZVwiIGhlcmUgYW5kIFwic3RhclwiIHRoZSBwcm9qZWN0IGluIEdpdEh1Yi5cblBsZWFzZSBvcGVuIGFuIGlzc3VlIGluIEdpdEh1YiBpZiB5b3UndmUgZm91bmQgc29tZXRoaW5nIG9yIGhhdmUgYW4gaWRlYSEiLAogICJuYW1lIjogIlBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIk9taWQgTW90dGFnaGkgUmFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb21pZC9QZXJzaWFuLUNhbGVuZGFyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiUGVyc2lhbkNhbGVuZGFyQG94eWdlbndzLmNvbSIsCiAgInZlcnNpb24iOiA5Mgp9"}}} , {"uuid": "kimpanel@kde.org", "name": "Input Method Panel", "pname": "kimpanel", "description": "Input Method Panel using KDE's kimpanel protocol for Gnome-Shell", "link": "https://extensions.gnome.org/extension/261/kimpanel/", "shell_version_map": {"38": {"version": "59", "sha256": "0rh2in9cm9khvmhhzyyw98z6bwvv95v59zcapkjpd7kbs38hqdw2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93ZW5neHQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbXBhbmVsIiwKICAidXVpZCI6ICJraW1wYW5lbEBrZGUub3JnIiwKICAidmVyc2lvbiI6IDU5Cn0="}, "40": {"version": "69", "sha256": "0dyaxcfj2jcmy253b5hmi8kfrz9x3faqm7akyf7aawk2c047y21k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbmd4dC9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2ltcGFuZWwiLAogICJ1dWlkIjogImtpbXBhbmVsQGtkZS5vcmciLAogICJ2ZXJzaW9uIjogNjkKfQ=="}, "41": {"version": "69", "sha256": "0dyaxcfj2jcmy253b5hmi8kfrz9x3faqm7akyf7aawk2c047y21k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklucHV0IE1ldGhvZCBQYW5lbCB1c2luZyBLREUncyBraW1wYW5lbCBwcm90b2NvbCBmb3IgR25vbWUtU2hlbGwiLAogICJleHRlbnNpb24taWQiOiAia2ltcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLWtpbXBhbmVsIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJJbnB1dCBNZXRob2QgUGFuZWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2ltcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dlbmd4dC9nbm9tZS1zaGVsbC1leHRlbnNpb24ta2ltcGFuZWwiLAogICJ1dWlkIjogImtpbXBhbmVsQGtkZS5vcmciLAogICJ2ZXJzaW9uIjogNjkKfQ=="}}} , {"uuid": "impatience@gfxmonk.net", "name": "Impatience", "pname": "impatience", "description": "Speed up the gnome-shell animation speed", "link": "https://extensions.gnome.org/extension/277/impatience/", "shell_version_map": {"40": {"version": "17", "sha256": "10zjxf8swp3n34q3mdid4ni109r1274c2iyd8nmwzyzsi11a14dj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dmeG1vbmsubmV0L2Rpc3QvMGluc3RhbGwvZ25vbWUtc2hlbGwtaW1wYXRpZW5jZS54bWwiLAogICJ1dWlkIjogImltcGF0aWVuY2VAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "10zjxf8swp3n34q3mdid4ni109r1274c2iyd8nmwzyzsi11a14dj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dmeG1vbmsubmV0L2Rpc3QvMGluc3RhbGwvZ25vbWUtc2hlbGwtaW1wYXRpZW5jZS54bWwiLAogICJ1dWlkIjogImltcGF0aWVuY2VAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "windowoverlay-icons@sustmidown.centrum.cz", "name": "WindowOverlay Icons", "pname": "windowoverlay-icons", "description": "Add application icons to window overview", "link": "https://extensions.gnome.org/extension/302/windowoverlay-icons/", "shell_version_map": {"38": {"version": "37", "sha256": "108a5i5v62a9i61av5pib3b0hcpmb6pw3np7c29jfngs25n14wd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhcHBsaWNhdGlvbiBpY29ucyB0byB3aW5kb3cgb3ZlcnZpZXciLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aW5kb3dvdmVybGF5LWljb25zIiwKICAibmFtZSI6ICJXaW5kb3dPdmVybGF5IEljb25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd292ZXJsYXktaWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdXN0bWkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd292ZXJsYXktaWNvbnMiLAogICJ1dWlkIjogIndpbmRvd292ZXJsYXktaWNvbnNAc3VzdG1pZG93bi5jZW50cnVtLmN6IiwKICAidmVyc2lvbiI6IDM3Cn0="}}} @@ -36,37 +36,37 @@ , {"uuid": "caffeine@patapon.info", "name": "Caffeine", "pname": "caffeine", "description": "Disable the screensaver and auto suspend", "link": "https://extensions.gnome.org/extension/517/caffeine/", "shell_version_map": {"38": {"version": "37", "sha256": "05g1910jcwkjl9gmvnk57ip20sbzy09mk4v6q2fm0pg8398v0vhf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZW9ucGF0YXBvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJ1dWlkIjogImNhZmZlaW5lQHBhdGFwb24uaW5mbyIsCiAgInZlcnNpb24iOiAzNwp9"}, "40": {"version": "40", "sha256": "1rza4ppzcimh6qmg14srawv16vas4lbcw4njxjigl29d9qf43sdr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lb25wYXRhcG9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jYWZmZWluZSIsCiAgInV1aWQiOiAiY2FmZmVpbmVAcGF0YXBvbi5pbmZvIiwKICAidmVyc2lvbiI6IDQwCn0="}, "41": {"version": "40", "sha256": "1rza4ppzcimh6qmg14srawv16vas4lbcw4njxjigl29d9qf43sdr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lb25wYXRhcG9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jYWZmZWluZSIsCiAgInV1aWQiOiAiY2FmZmVpbmVAcGF0YXBvbi5pbmZvIiwKICAidmVyc2lvbiI6IDQwCn0="}}} , {"uuid": "backslide@codeisland.org", "name": "BackSlide", "pname": "backslide", "description": "Automatic background-image (wallpaper) slideshow for Gnome Shell", "link": "https://extensions.gnome.org/extension/543/backslide/", "shell_version_map": {"38": {"version": "18", "sha256": "1vm4w61cksj9ya5z4xcy7h96bk0wwi5njp0lyhnqa8j2fgsq5iin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9iaXRidWNrZXQub3JnL0x1a2FzS251dGgvYmFja3NsaWRlIiwKICAidXVpZCI6ICJiYWNrc2xpZGVAY29kZWlzbGFuZC5vcmciLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "40": {"version": "24", "sha256": "0an1w35sbv5w7826xa3k8nl8hc3krxkzc8nhvgcp48z75n2wdksl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvTHVrYXNLbnV0aC9iYWNrc2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAyNAp9"}, "41": {"version": "24", "sha256": "0an1w35sbv5w7826xa3k8nl8hc3krxkzc8nhvgcp48z75n2wdksl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvTHVrYXNLbnV0aC9iYWNrc2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAyNAp9"}}} , {"uuid": "historymanager-prefix-search@sustmidown.centrum.cz", "name": "HistoryManager Prefix Search", "pname": "historymanager-prefix-search", "description": "Use PageUp and PageDown to move in HistoryManager (eg. RunCommand, Looking Glass) according to prefix", "link": "https://extensions.gnome.org/extension/544/historymanager-prefix-search/", "shell_version_map": {"40": {"version": "14", "sha256": "1n6gac80xrk6lhlj29zb03h62ia0a66va0i9pmjgqbg3bs74yds0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBQYWdlVXAgYW5kIFBhZ2VEb3duIHRvIG1vdmUgaW4gSGlzdG9yeU1hbmFnZXIgKGVnLiBSdW5Db21tYW5kLCBMb29raW5nIEdsYXNzKSBhY2NvcmRpbmcgdG8gcHJlZml4IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGlzdG9yeW1hbmFnZXItcHJlZml4LXNlYXJjaCIsCiAgIm5hbWUiOiAiSGlzdG9yeU1hbmFnZXIgUHJlZml4IFNlYXJjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5oaXN0b3J5bWFuYWdlci1wcmVmaXgtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy43LjMiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3VzdG1pL2dub21lLXNoZWxsLWV4dGVuc2lvbi1oaXN0b3J5bWFuYWdlci1wcmVmaXgtc2VhcmNoIiwKICAidXVpZCI6ICJoaXN0b3J5bWFuYWdlci1wcmVmaXgtc2VhcmNoQHN1c3RtaWRvd24uY2VudHJ1bS5jeiIsCiAgInZlcnNpb24iOiAxNAp9"}}} -, {"uuid": "hidetopbar@mathieu.bidon.ca", "name": "Hide Top Bar", "pname": "hide-top-bar", "description": "Hides the top bar, except in overview. However, there is an option to show the panel whenever the mouse pointer approaches the edge of the screen. And if \"intellihide\" is enabled, the panel only hides when a window takes the space.\n\n- Press backspace to remove keyboard shortcut.\n- Log off and on again when there is an error after upgrading.", "link": "https://extensions.gnome.org/extension/545/hide-top-bar/", "shell_version_map": {"38": {"version": "100", "sha256": "19mwdahjj5lyjbhzl7cha129zmccfgxy4yjhrsfk18i4k394rbcj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWx1dGZ5L2hpZGV0b3BiYXIiLAogICJ1dWlkIjogImhpZGV0b3BiYXJAbWF0aGlldS5iaWRvbi5jYSIsCiAgInZlcnNpb24iOiAxMDAKfQ=="}, "40": {"version": "100", "sha256": "19mwdahjj5lyjbhzl7cha129zmccfgxy4yjhrsfk18i4k394rbcj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWx1dGZ5L2hpZGV0b3BiYXIiLAogICJ1dWlkIjogImhpZGV0b3BiYXJAbWF0aGlldS5iaWRvbi5jYSIsCiAgInZlcnNpb24iOiAxMDAKfQ=="}, "41": {"version": "100", "sha256": "19mwdahjj5lyjbhzl7cha129zmccfgxy4yjhrsfk18i4k394rbcj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWx1dGZ5L2hpZGV0b3BiYXIiLAogICJ1dWlkIjogImhpZGV0b3BiYXJAbWF0aGlldS5iaWRvbi5jYSIsCiAgInZlcnNpb24iOiAxMDAKfQ=="}}} +, {"uuid": "hidetopbar@mathieu.bidon.ca", "name": "Hide Top Bar", "pname": "hide-top-bar", "description": "Hides the top bar, except in overview. However, there is an option to show the panel whenever the mouse pointer approaches the edge of the screen. And if \"intellihide\" is enabled, the panel only hides when a window takes the space.\n\n- Press backspace to remove keyboard shortcut.\n- Log off and on again when there is an error after upgrading.", "link": "https://extensions.gnome.org/extension/545/hide-top-bar/", "shell_version_map": {"38": {"version": "104", "sha256": "1d8jlcmcmaq90a2m3j1vhhamxiykfviasqb27xnmk4ghviwxdgqs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21sdXRmeS9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTA0Cn0="}, "40": {"version": "104", "sha256": "1d8jlcmcmaq90a2m3j1vhhamxiykfviasqb27xnmk4ghviwxdgqs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21sdXRmeS9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTA0Cn0="}, "41": {"version": "104", "sha256": "1d8jlcmcmaq90a2m3j1vhhamxiykfviasqb27xnmk4ghviwxdgqs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21sdXRmeS9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTA0Cn0="}, "42": {"version": "104", "sha256": "1d8jlcmcmaq90a2m3j1vhhamxiykfviasqb27xnmk4ghviwxdgqs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21sdXRmeS9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTA0Cn0="}}} , {"uuid": "hdate@hatul.info", "name": "Gnome HDate", "pname": "gnome-hdate", "description": "Show Hebrew Date in the Panel.\nRequires libhdate-glib", "link": "https://extensions.gnome.org/extension/554/gnome-hdate/", "shell_version_map": {"40": {"version": "20", "sha256": "1aj5ry3g93wx1crn8rr2jm9vbz07kz0r7qc6sr2vj352bgjzrlbf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pYWQvZ25vbWUtaGRhdGUiLAogICJ1dWlkIjogImhkYXRlQGhhdHVsLmluZm8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "20", "sha256": "1aj5ry3g93wx1crn8rr2jm9vbz07kz0r7qc6sr2vj352bgjzrlbf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pYWQvZ25vbWUtaGRhdGUiLAogICJ1dWlkIjogImhkYXRlQGhhdHVsLmluZm8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}}} -, {"uuid": "todo.txt@bart.libert.gmail.com", "name": "Todo.txt", "pname": "todotxt", "description": "A Gnome shell interface for todo.txt. \n\nTodo.txt is a future-proof syntax for tasks (not made by me), for more info: http://todotxt.com/\n\nSome examples:\nTask: Basic task\n(A) Task: High priority task\nTask @project +context: Task is part of project and has a certain context\nx 2013-08-22 Task: Task was completed on the 22nd of August\n\nFor more info about the syntax: https://github.com/ginatrapani/todo.txt-cli/wiki/The-Todo.txt-Format\n\nQuick start:\nWhen you first enable the extension, chances are high you'll see a [X] in your top panel. If you click the [X], you will be able to choose between creating the necessary files automatically or selecting your own existing files to be used with the extension.\n\nPlease use the issue tracker on the homepage to report bugs and/or file feature requests, this makes tracking easier for me. Thanks!\n\nSee the included CHANGELOG.md for info about changes between different versions, or see it online: https://gitlab.com/bartl/todo-txt-gnome-shell-extension/raw/master/CHANGELOG.md", "link": "https://extensions.gnome.org/extension/570/todotxt/", "shell_version_map": {"38": {"version": "33", "sha256": "1spq0i8w9xw8zgq3niqzs2dslg01l0gsbcys26p8lpydz0dsy7xa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vYmFydGwvdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3Jhdy9tYXN0ZXIvQ0hBTkdFTE9HLm1kIiwKICAibmFtZSI6ICJUb2RvLnR4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2JhcnRsL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidG9kby50eHRAYmFydC5saWJlcnQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMzCn0="}, "40": {"version": "35", "sha256": "18vc11nls6giskq94kw48kbcx399706rglaqsmla4yvix0jkd8lz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vYmFydGwvdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3Jhdy9tYXN0ZXIvQ0hBTkdFTE9HLm1kIiwKICAibmFtZSI6ICJUb2RvLnR4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iYXJ0bC90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "41": {"version": "36", "sha256": "1pnw1fm38zxacjyz31vw9wfdmk1h6i4grxzi3n1nlz23gpkn3df3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vYmFydGwvdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3Jhdy9tYXN0ZXIvQ0hBTkdFTE9HLm1kIiwKICAibmFtZSI6ICJUb2RvLnR4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iYXJ0bC90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNgp9"}}} +, {"uuid": "todo.txt@bart.libert.gmail.com", "name": "Todo.txt", "pname": "todotxt", "description": "A Gnome shell interface for todo.txt. \n\nTodo.txt is a future-proof syntax for tasks (not made by me), for more info: http://todotxt.com/\n\nSome examples:\nTask: Basic task\n(A) Task: High priority task\nTask @project +context: Task is part of project and has a certain context\nx 2013-08-22 Task: Task was completed on the 22nd of August\n\nFor more info about the syntax: https://github.com/ginatrapani/todo.txt-cli/wiki/The-Todo.txt-Format\n\nQuick start:\nWhen you first enable the extension, chances are high you'll see a [X] in your top panel. If you click the [X], you will be able to choose between creating the necessary files automatically or selecting your own existing files to be used with the extension.\n\nPlease use the issue tracker on the homepage to report bugs and/or file feature requests, this makes tracking easier for me. Thanks!\n\nSee the included CHANGELOG.md for info about changes between different versions, or see it online: https://gitlab.com/bartl/todo-txt-gnome-shell-extension/raw/master/CHANGELOG.md", "link": "https://extensions.gnome.org/extension/570/todotxt/", "shell_version_map": {"38": {"version": "33", "sha256": "1spq0i8w9xw8zgq3niqzs2dslg01l0gsbcys26p8lpydz0dsy7xa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vYmFydGwvdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3Jhdy9tYXN0ZXIvQ0hBTkdFTE9HLm1kIiwKICAibmFtZSI6ICJUb2RvLnR4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2JhcnRsL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidG9kby50eHRAYmFydC5saWJlcnQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMzCn0="}, "40": {"version": "35", "sha256": "18vc11nls6giskq94kw48kbcx399706rglaqsmla4yvix0jkd8lz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vYmFydGwvdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3Jhdy9tYXN0ZXIvQ0hBTkdFTE9HLm1kIiwKICAibmFtZSI6ICJUb2RvLnR4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iYXJ0bC90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNQp9"}, "41": {"version": "37", "sha256": "0nixk7nwn987qrkmcbf5lkq2yj4ijq4hszmhz7fqrvvhlivp8xix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vYmFydGwvdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3Jhdy9tYXN0ZXIvQ0hBTkdFTE9HLm1kIiwKICAibmFtZSI6ICJUb2RvLnR4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYmFydGwvdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0b2RvLnR4dEBiYXJ0LmxpYmVydC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="}, "42": {"version": "37", "sha256": "0nixk7nwn987qrkmcbf5lkq2yj4ijq4hszmhz7fqrvvhlivp8xix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vYmFydGwvdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3Jhdy9tYXN0ZXIvQ0hBTkdFTE9HLm1kIiwKICAibmFtZSI6ICJUb2RvLnR4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYmFydGwvdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0b2RvLnR4dEBiYXJ0LmxpYmVydC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="}}} , {"uuid": "text_translator@awamper.gmail.com", "name": "Text Translator", "pname": "text-translator", "description": "** Needs the package translate-shell **\nTranslation of the text by different translators (currently Google.Translate, Yandex.Translate).\nShortcuts:\nSuper+T - open translator dialog.\nSuper+Shift+T - open translator dialog and translate text from clipboard.\nSuper+Alt+T - open translator dialog and translate from primary selection.\nCtrl+Enter+ - Translate text.\nCtrl+Shift+C - copy translated text to clipboard.\nCtrl+S - swap languages.\nCtrl+D - reset languages to default\nTab+ - toggle transliteration of result text.", "link": "https://extensions.gnome.org/extension/593/text-translator/", "shell_version_map": {"38": {"version": "36", "sha256": "1idzgg4vb791k5dryjvznr6mfwfx59vlgabw2n3spysbwvjv2a48", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIioqIE5lZWRzIHRoZSBwYWNrYWdlIHRyYW5zbGF0ZS1zaGVsbCAqKlxuVHJhbnNsYXRpb24gb2YgdGhlIHRleHQgYnkgZGlmZmVyZW50IHRyYW5zbGF0b3JzIChjdXJyZW50bHkgR29vZ2xlLlRyYW5zbGF0ZSwgWWFuZGV4LlRyYW5zbGF0ZSkuXG5TaG9ydGN1dHM6XG5TdXBlcitUIC0gb3BlbiB0cmFuc2xhdG9yIGRpYWxvZy5cblN1cGVyK1NoaWZ0K1QgLSBvcGVuIHRyYW5zbGF0b3IgZGlhbG9nIGFuZCB0cmFuc2xhdGUgdGV4dCBmcm9tIGNsaXBib2FyZC5cblN1cGVyK0FsdCtUIC0gb3BlbiB0cmFuc2xhdG9yIGRpYWxvZyBhbmQgdHJhbnNsYXRlIGZyb20gcHJpbWFyeSBzZWxlY3Rpb24uXG5DdHJsK0VudGVyKyAtIFRyYW5zbGF0ZSB0ZXh0LlxuQ3RybCtTaGlmdCtDIC0gY29weSB0cmFuc2xhdGVkIHRleHQgdG8gY2xpcGJvYXJkLlxuQ3RybCtTIC0gc3dhcCBsYW5ndWFnZXMuXG5DdHJsK0QgLSByZXNldCBsYW5ndWFnZXMgdG8gZGVmYXVsdFxuVGFiKyAtIHRvZ2dsZSB0cmFuc2xpdGVyYXRpb24gb2YgcmVzdWx0IHRleHQuIiwKICAibmFtZSI6ICJUZXh0IFRyYW5zbGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGV4dC10cmFuc2xhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3Vmb2UvdGV4dC10cmFuc2xhdG9yIiwKICAidXVpZCI6ICJ0ZXh0X3RyYW5zbGF0b3JAYXdhbXBlci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzYKfQ=="}}} , {"uuid": "autohide-battery@sitnik.ru", "name": "Autohide Battery", "pname": "autohide-battery", "description": "Hide battery icon in top panel, if battery is fully charged and AC is connected", "link": "https://extensions.gnome.org/extension/595/autohide-battery/", "shell_version_map": {"40": {"version": "23", "sha256": "1kxcb301ql1q3vyswnwgq8rmdyxj6zrngah2rwrbiy1wjz726xg0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9hdXRvaGlkZS1iYXR0ZXJ5IiwKICAidXVpZCI6ICJhdXRvaGlkZS1iYXR0ZXJ5QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiAyMwp9"}, "41": {"version": "23", "sha256": "1kxcb301ql1q3vyswnwgq8rmdyxj6zrngah2rwrbiy1wjz726xg0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgYmF0dGVyeSBpY29uIGluIHRvcCBwYW5lbCwgaWYgYmF0dGVyeSBpcyBmdWxseSBjaGFyZ2VkIGFuZCBBQyBpcyBjb25uZWN0ZWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhdXRvaGlkZS1iYXR0ZXJ5IiwKICAibmFtZSI6ICJBdXRvaGlkZSBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haS9hdXRvaGlkZS1iYXR0ZXJ5IiwKICAidXVpZCI6ICJhdXRvaGlkZS1iYXR0ZXJ5QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiAyMwp9"}}} -, {"uuid": "launch-new-instance@gnome-shell-extensions.gcampax.github.com", "name": "Launch new instance", "pname": "launch-new-instance", "description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/600/launch-new-instance/", "shell_version_map": {"38": {"version": "29", "sha256": "0qb1ajjwm076zxsd314n7f5vl72ih7j4h9y84bqwb9cxa53mp4g4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJMYXVuY2ggbmV3IGluc3RhbmNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsYXVuY2gtbmV3LWluc3RhbmNlQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "40": {"version": "31", "sha256": "0c667wdrpfd8bh2wygglzk1bp63z6xvknhj2rhw8v3vlmhpn8994", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJMYXVuY2ggbmV3IGluc3RhbmNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAibGF1bmNoLW5ldy1pbnN0YW5jZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"}, "41": {"version": "33", "sha256": "1z2kjrqaziw5v5sig92kng302w3pdkkkcl7dlhwjqlgfhkhpdxlm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} -, {"uuid": "window-list@gnome-shell-extensions.gcampax.github.com", "name": "Window List", "pname": "window-list", "description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/602/window-list/", "shell_version_map": {"38": {"version": "34", "sha256": "06jww5sv3a32plbvnl1xch10y19q807dx6zn6z5gwpvq8n0nvnx3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIldpbmRvdyBMaXN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvdy1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "40": {"version": "41", "sha256": "16vf0b3wqr5s6fqxqlz3ly28nkvsv3ygvfk1sqxgrpqnw823x8bl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="}, "41": {"version": "42", "sha256": "1jhgnzlrpnbhqx4rkr9nf7yrwdbc9h6n46aindfpp7kdgv2spymi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}}} +, {"uuid": "launch-new-instance@gnome-shell-extensions.gcampax.github.com", "name": "Launch new instance", "pname": "launch-new-instance", "description": "Always launch a new instance when clicking in the dash or the application view.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/600/launch-new-instance/", "shell_version_map": {"38": {"version": "29", "sha256": "0qb1ajjwm076zxsd314n7f5vl72ih7j4h9y84bqwb9cxa53mp4g4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJMYXVuY2ggbmV3IGluc3RhbmNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9HTk9NRS9nbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsYXVuY2gtbmV3LWluc3RhbmNlQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "40": {"version": "31", "sha256": "0c667wdrpfd8bh2wygglzk1bp63z6xvknhj2rhw8v3vlmhpn8994", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJMYXVuY2ggbmV3IGluc3RhbmNlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAibGF1bmNoLW5ldy1pbnN0YW5jZUBnbm9tZS1zaGVsbC1leHRlbnNpb25zLmdjYW1wYXguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzMQp9"}, "41": {"version": "33", "sha256": "1z2kjrqaziw5v5sig92kng302w3pdkkkcl7dlhwjqlgfhkhpdxlm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "42": {"version": "34", "sha256": "1vx1dbb8sq5ss3ilqah92nja6ivqnijywj2wkg29akz8ijbss19f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBsYXVuY2ggYSBuZXcgaW5zdGFuY2Ugd2hlbiBjbGlja2luZyBpbiB0aGUgZGFzaCBvciB0aGUgYXBwbGljYXRpb24gdmlldy5cblRoaXMgZXh0ZW5zaW9uIGlzIHBhcnQgb2YgQ2xhc3NpYyBNb2RlIGFuZCBpcyBvZmZpY2lhbGx5IHN1cHBvcnRlZCBieSBHTk9NRS4gUGxlYXNlIGRvIG5vdCByZXBvcnQgYnVncyB1c2luZyB0aGUgZm9ybSBiZWxvdywgdXNlIEdOT01FJ3MgR2l0TGFiIGluc3RhbmNlIGluc3RlYWQuIiwKICAiZXh0ZW5zaW9uLWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2UiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGF1bmNoLW5ldy1pbnN0YW5jZSIsCiAgIm5hbWUiOiAiTGF1bmNoIG5ldyBpbnN0YW5jZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5sYXVuY2gtbmV3LWluc3RhbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogImxhdW5jaC1uZXctaW5zdGFuY2VAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}}} +, {"uuid": "window-list@gnome-shell-extensions.gcampax.github.com", "name": "Window List", "pname": "window-list", "description": "Display a window list at the bottom of the screen.\nThis extension is part of Classic Mode and is officially supported by GNOME. Please do not report bugs using the form below, use GNOME's GitLab instance instead.", "link": "https://extensions.gnome.org/extension/602/window-list/", "shell_version_map": {"38": {"version": "34", "sha256": "06jww5sv3a32plbvnl1xch10y19q807dx6zn6z5gwpvq8n0nvnx3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIldpbmRvdyBMaXN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvdy1saXN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "40": {"version": "41", "sha256": "16vf0b3wqr5s6fqxqlz3ly28nkvsv3ygvfk1sqxgrpqnw823x8bl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="}, "41": {"version": "42", "sha256": "1jhgnzlrpnbhqx4rkr9nf7yrwdbc9h6n46aindfpp7kdgv2spymi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "42": {"version": "43", "sha256": "1dslg2dn48jqjd8mh2bcxrzp98skf1wgfhygw3l9fjaw41jvv1jv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYSB3aW5kb3cgbGlzdCBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uXG5UaGlzIGV4dGVuc2lvbiBpcyBwYXJ0IG9mIENsYXNzaWMgTW9kZSBhbmQgaXMgb2ZmaWNpYWxseSBzdXBwb3J0ZWQgYnkgR05PTUUuIFBsZWFzZSBkbyBub3QgcmVwb3J0IGJ1Z3MgdXNpbmcgdGhlIGZvcm0gYmVsb3csIHVzZSBHTk9NRSdzIEdpdExhYiBpbnN0YW5jZSBpbnN0ZWFkLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aW5kb3ctbGlzdCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi13aW5kb3ctbGlzdCIsCiAgIm5hbWUiOiAiV2luZG93IExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2luZG93LWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAid2luZG93LWxpc3RAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDMKfQ=="}}} , {"uuid": "MultiClock@mibus.org", "name": "MultiClock", "pname": "multiclock", "description": "A clock for showing a second timezone in the panel.", "link": "https://extensions.gnome.org/extension/605/multiclock/", "shell_version_map": {"40": {"version": "8", "sha256": "1pp1cnmpix668mrywpv6mkyb45lw7f6cwibjl6bc7cgb01hkzd53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgY2xvY2sgZm9yIHNob3dpbmcgYSBzZWNvbmQgdGltZXpvbmUgaW4gdGhlIHBhbmVsLiIsCiAgIm5hbWUiOiAiTXVsdGlDbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5taWJ1c011bHRpQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWJ1cy9NdWx0aUNsb2NrIiwKICAidXVpZCI6ICJNdWx0aUNsb2NrQG1pYnVzLm9yZyIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"uuid": "appindicatorsupport@rgcjonas.gmail.com", "name": "AppIndicator and KStatusNotifierItem Support", "pname": "appindicator-support", "description": "Adds AppIndicator, KStatusNotifierItem and legacy Tray icons support to the Shell", "link": "https://extensions.gnome.org/extension/615/appindicator-support/", "shell_version_map": {"38": {"version": "41", "sha256": "0d2pvcw13wr7jbwjds4byxnq3q9vqm2r6fs5plcgl2dp787kmxi2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="}, "40": {"version": "41", "sha256": "0d2pvcw13wr7jbwjds4byxnq3q9vqm2r6fs5plcgl2dp787kmxi2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="}, "41": {"version": "41", "sha256": "0d2pvcw13wr7jbwjds4byxnq3q9vqm2r6fs5plcgl2dp787kmxi2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91YnVudHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcGluZGljYXRvciIsCiAgInV1aWQiOiAiYXBwaW5kaWNhdG9yc3VwcG9ydEByZ2Nqb25hcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDEKfQ=="}}} +, {"uuid": "appindicatorsupport@rgcjonas.gmail.com", "name": "AppIndicator and KStatusNotifierItem Support", "pname": "appindicator-support", "description": "Adds AppIndicator, KStatusNotifierItem and legacy Tray icons support to the Shell", "link": "https://extensions.gnome.org/extension/615/appindicator-support/", "shell_version_map": {"38": {"version": "42", "sha256": "0141f3y8vhk3q9v0w295hb5j679rh04isqnmsnihmsjdnw61b7fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWJ1bnR1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBpbmRpY2F0b3IiLAogICJ1dWlkIjogImFwcGluZGljYXRvcnN1cHBvcnRAcmdjam9uYXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}, "40": {"version": "42", "sha256": "0141f3y8vhk3q9v0w295hb5j679rh04isqnmsnihmsjdnw61b7fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWJ1bnR1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBpbmRpY2F0b3IiLAogICJ1dWlkIjogImFwcGluZGljYXRvcnN1cHBvcnRAcmdjam9uYXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}, "41": {"version": "42", "sha256": "0141f3y8vhk3q9v0w295hb5j679rh04isqnmsnihmsjdnw61b7fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWJ1bnR1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBpbmRpY2F0b3IiLAogICJ1dWlkIjogImFwcGluZGljYXRvcnN1cHBvcnRAcmdjam9uYXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}, "42": {"version": "42", "sha256": "0141f3y8vhk3q9v0w295hb5j679rh04isqnmsnihmsjdnw61b7fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWJ1bnR1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBpbmRpY2F0b3IiLAogICJ1dWlkIjogImFwcGluZGljYXRvcnN1cHBvcnRAcmdjam9uYXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}}} , {"uuid": "bitcoin-markets@ottoallmendinger.github.com", "name": "Bitcoin Markets", "pname": "bitcoin-markets", "description": "Display info on various crypto-currency exchanges.", "link": "https://extensions.gnome.org/extension/648/bitcoin-markets/", "shell_version_map": {"38": {"version": "57", "sha256": "1dbrkr49gi93nps610afvw2q68d1ialkhxsxd0waa8xgwjxwzyxd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjU3IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3R0b0FsbG1lbmRpbmdlci9nbm9tZS1zaGVsbC1iaXRjb2luLW1hcmtldHMvIiwKICAidXVpZCI6ICJiaXRjb2luLW1hcmtldHNAb3R0b2FsbG1lbmRpbmdlci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU3Cn0="}, "40": {"version": "65", "sha256": "10jg1ixk0zfb67licr807wf68bzsdiv9fb9j40xjg49li72c6hrf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY1IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLWJpdGNvaW4tbWFya2V0cy8iLAogICJ1dWlkIjogImJpdGNvaW4tbWFya2V0c0BvdHRvYWxsbWVuZGluZ2VyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="}, "41": {"version": "65", "sha256": "10jg1ixk0zfb67licr807wf68bzsdiv9fb9j40xjg49li72c6hrf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY1IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLWJpdGNvaW4tbWFya2V0cy8iLAogICJ1dWlkIjogImJpdGNvaW4tbWFya2V0c0BvdHRvYWxsbWVuZGluZ2VyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="}}} , {"uuid": "ShellTile@emasab.it", "name": "ShellTile", "pname": "shelltile", "description": "A tiling window extension for GNOME Shell. Just move a window to the edges of the screen to create a tiling, otherwise move a window over another one, holding down the Control key. Grouped windows minimize, resize, raise and change workspace together. Move or maximize a window to remove it from the group.", "link": "https://extensions.gnome.org/extension/657/shelltile/", "shell_version_map": {"38": {"version": "65", "sha256": "0kb7crng8lmkcjjxzd7ma2x0x43rg4j5ygvvpiq5z2j15rx8bcg4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGlsaW5nIHdpbmRvdyBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBKdXN0IG1vdmUgYSB3aW5kb3cgdG8gdGhlIGVkZ2VzIG9mIHRoZSBzY3JlZW4gdG8gY3JlYXRlIGEgdGlsaW5nLCBvdGhlcndpc2UgbW92ZSBhIHdpbmRvdyBvdmVyIGFub3RoZXIgb25lLCBob2xkaW5nIGRvd24gdGhlIENvbnRyb2wga2V5LiBHcm91cGVkIHdpbmRvd3MgbWluaW1pemUsIHJlc2l6ZSwgcmFpc2UgYW5kIGNoYW5nZSB3b3Jrc3BhY2UgdG9nZXRoZXIuIE1vdmUgb3IgbWF4aW1pemUgYSB3aW5kb3cgdG8gcmVtb3ZlIGl0IGZyb20gdGhlIGdyb3VwLiIsCiAgImdldHRleHQtZG9tYWluIjogInNoZWxsdGlsZSIsCiAgIm5hbWUiOiAiU2hlbGxUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNoZWxsdGlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy42IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbWFzYWIvc2hlbGx0aWxlIiwKICAidXVpZCI6ICJTaGVsbFRpbGVAZW1hc2FiLml0IiwKICAidmVyc2lvbiI6IDY1Cn0="}}} -, {"uuid": "lunarcal@ailin.nemui", "name": "Lunar Calendar 农历", "pname": "lunar-calendar", "description": "Display Chinese Lunar Calendar in panel\n\n⚠⚠⚠ dependency: typelib-1_0-LunarDate-3_0 / gir1.2-lunar-date-2.0", "link": "https://extensions.gnome.org/extension/675/lunar-calendar/", "shell_version_map": {"38": {"version": "25", "sha256": "1pj439wdsqpxim6p4d0y09v40kdjga908hagxfyvq0fzjykc51rn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "40": {"version": "27", "sha256": "159iiyw0sblq8jwkm1qfcakgdy3rvk07vzz8q6yj2davp64wpg5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJsdW5hcmNhbEBhaWxpbi5uZW11aSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "159iiyw0sblq8jwkm1qfcakgdy3rvk07vzz8q6yj2davp64wpg5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJsdW5hcmNhbEBhaWxpbi5uZW11aSIsCiAgInZlcnNpb24iOiAyNwp9"}}} -, {"uuid": "EasyScreenCast@iacopodeenosee.gmail.com", "name": "EasyScreenCast", "pname": "easyscreencast", "description": "This extension simplifies the use of the video recording function integrated in gnome shell, allows quickly to change the various settings of the desktop recording.\n\nSOURCE CODE -> https://github.com/EasyScreenCast/EasyScreenCast\n\nVIDEO -> https://youtu.be/81E9AruraKU\n\n**NOTICE**\nif an error occurs during the update is recommended to reload GNOME Shell (Alt + F2, 'r') and reload the extension's installation page.", "link": "https://extensions.gnome.org/extension/690/easyscreencast/", "shell_version_map": {"38": {"version": "41", "sha256": "0irmbbj7jd628agq80f4ms8skawjvsi9a7izair11knydhkab944", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}, "40": {"version": "41", "sha256": "0irmbbj7jd628agq80f4ms8skawjvsi9a7izair11knydhkab944", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}, "41": {"version": "41", "sha256": "0irmbbj7jd628agq80f4ms8skawjvsi9a7izair11knydhkab944", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}}} -, {"uuid": "scroll-workspaces@gfxmonk.net", "name": "Top Panel Workspace Scroll", "pname": "top-panel-workspace-scroll", "description": "Change workspaces by scrolling over the top panel", "link": "https://extensions.gnome.org/extension/701/top-panel-workspace-scroll/", "shell_version_map": {"40": {"version": "27", "sha256": "1jqmfkznm2aaf739n4hj35d00ds8ny0qin249bd0fraxyih3idrz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "1jqmfkznm2aaf739n4hj35d00ds8ny0qin249bd0fraxyih3idrz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyNwp9"}}} +, {"uuid": "lunarcal@ailin.nemui", "name": "Lunar Calendar 农历", "pname": "lunar-calendar", "description": "Display Chinese Lunar Calendar in panel\n\n⚠⚠⚠ dependency: typelib-1_0-LunarDate-3_0 / gir1.2-lunar-date-2.0", "link": "https://extensions.gnome.org/extension/675/lunar-calendar/", "shell_version_map": {"38": {"version": "25", "sha256": "1pj439wdsqpxim6p4d0y09v40kdjga908hagxfyvq0fzjykc51rn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "40": {"version": "28", "sha256": "068y5dy81ykmxy3cxi45xq0a0jg061fp22x9zhd4965kmvzqiq4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "41": {"version": "28", "sha256": "068y5dy81ykmxy3cxi45xq0a0jg061fp22x9zhd4965kmvzqiq4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "42": {"version": "28", "sha256": "068y5dy81ykmxy3cxi45xq0a0jg061fp22x9zhd4965kmvzqiq4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}}} +, {"uuid": "EasyScreenCast@iacopodeenosee.gmail.com", "name": "EasyScreenCast", "pname": "easyscreencast", "description": "This extension simplifies the use of the video recording function integrated in gnome shell, allows quickly to change the various settings of the desktop recording.\n\nSOURCE CODE -> https://github.com/EasyScreenCast/EasyScreenCast\n\nVIDEO -> https://youtu.be/81E9AruraKU\n\n**NOTICE**\nif an error occurs during the update is recommended to reload GNOME Shell (Alt + F2, 'r') and reload the extension's installation page.", "link": "https://extensions.gnome.org/extension/690/easyscreencast/", "shell_version_map": {"38": {"version": "41", "sha256": "04zs03xbidfkhr8l0pi4p7jmri9z7sg729739jmv17lvi3nb0k8l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0mZ3Q7ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLSZndDsgIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}, "40": {"version": "41", "sha256": "04zs03xbidfkhr8l0pi4p7jmri9z7sg729739jmv17lvi3nb0k8l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0mZ3Q7ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLSZndDsgIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}, "41": {"version": "41", "sha256": "04zs03xbidfkhr8l0pi4p7jmri9z7sg729739jmv17lvi3nb0k8l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0mZ3Q7ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLSZndDsgIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3QiLAogICJ1dWlkIjogIkVhc3lTY3JlZW5DYXN0QGlhY29wb2RlZW5vc2VlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MQp9"}}} +, {"uuid": "scroll-workspaces@gfxmonk.net", "name": "Top Panel Workspace Scroll", "pname": "top-panel-workspace-scroll", "description": "Change workspaces by scrolling over the top panel", "link": "https://extensions.gnome.org/extension/701/top-panel-workspace-scroll/", "shell_version_map": {"40": {"version": "29", "sha256": "022pkhylbxwcppsfgs0znk6pr7j160w7l7dm517ksip59zifa7mk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyOQp9"}, "41": {"version": "29", "sha256": "022pkhylbxwcppsfgs0znk6pr7j160w7l7dm517ksip59zifa7mk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZnhtb25rL2dub21lLXNoZWxsLXNjcm9sbC13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzY3JvbGwtd29ya3NwYWNlc0BnZnhtb25rLm5ldCIsCiAgInZlcnNpb24iOiAyOQp9"}}} , {"uuid": "all-windows@ezix.org", "name": "All Windows", "pname": "all-windows", "description": "List open windows of all workspaces", "link": "https://extensions.gnome.org/extension/704/all-windows/", "shell_version_map": {"40": {"version": "13", "sha256": "19cxrgxpim2dca6llbi8cr34hjx3pab2i4687803r96cp2hsg07l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3Qgb3BlbiB3aW5kb3dzIG9mIGFsbCB3b3Jrc3BhY2VzIiwKICAibmFtZSI6ICJBbGwgV2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlvbmVsL2FsbC13aW5kb3dzIiwKICAidXVpZCI6ICJhbGwtd2luZG93c0Bleml4Lm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "19cxrgxpim2dca6llbi8cr34hjx3pab2i4687803r96cp2hsg07l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3Qgb3BlbiB3aW5kb3dzIG9mIGFsbCB3b3Jrc3BhY2VzIiwKICAibmFtZSI6ICJBbGwgV2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlvbmVsL2FsbC13aW5kb3dzIiwKICAidXVpZCI6ICJhbGwtd2luZG93c0Bleml4Lm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "panel-osd@berend.de.schouwer.gmail.com", "name": "Panel OSD", "pname": "panel-osd", "description": "Configuring where on the (main) screen notifications will appear, instead of just above the message tray", "link": "https://extensions.gnome.org/extension/708/panel-osd/", "shell_version_map": {"38": {"version": "39", "sha256": "109qlcckx5z8fwndpr86r2bfggyh4akmi6lqi0ki7gr9bfigdqnv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyaW5nIHdoZXJlIG9uIHRoZSAobWFpbikgc2NyZWVuIG5vdGlmaWNhdGlvbnMgd2lsbCBhcHBlYXIsIGluc3RlYWQgb2YganVzdCBhYm92ZSB0aGUgbWVzc2FnZSB0cmF5IiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJQYW5lbCBPU0QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qZW5zbG9keS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGFuZWwtb3NkIiwKICAidXVpZCI6ICJwYW5lbC1vc2RAYmVyZW5kLmRlLnNjaG91d2VyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}, "40": {"version": "40", "sha256": "0hskvmdnqjihixaxhb7a7apsx0203zmymm5j6ncb2al928p795yx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyaW5nIHdoZXJlIG9uIHRoZSAobWFpbikgc2NyZWVuIG5vdGlmaWNhdGlvbnMgd2lsbCBhcHBlYXIsIGluc3RlYWQgb2YganVzdCBhYm92ZSB0aGUgbWVzc2FnZSB0cmF5IiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJQYW5lbCBPU0QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vamVuc2xvZHkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBhbmVsLW9zZCIsCiAgInV1aWQiOiAicGFuZWwtb3NkQGJlcmVuZC5kZS5zY2hvdXdlci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="}}} -, {"uuid": "pixel-saver@deadalnix.me", "name": "Pixel Saver", "pname": "pixel-saver", "description": "Pixel Saver is designed to save pixel by fusing activity bar and title bar in a natural way.", "link": "https://extensions.gnome.org/extension/723/pixel-saver/", "shell_version_map": {"38": {"version": "25", "sha256": "10bzd0vdqm398xwyj2bn5klxmaazwh39clwp1069qszsxmw0lr86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkuIiwKICAibmFtZSI6ICJQaXhlbCBTYXZlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAuMiIsCiAgICAiNDAuMyIsCiAgICAiNDEuMCIsCiAgICAiNDEuMSIsCiAgICAiNDEuMiIsCiAgICAiNDEuMyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "25", "sha256": "10bzd0vdqm398xwyj2bn5klxmaazwh39clwp1069qszsxmw0lr86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkuIiwKICAibmFtZSI6ICJQaXhlbCBTYXZlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAuMiIsCiAgICAiNDAuMyIsCiAgICAiNDEuMCIsCiAgICAiNDEuMSIsCiAgICAiNDEuMiIsCiAgICAiNDEuMyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "41": {"version": "25", "sha256": "10bzd0vdqm398xwyj2bn5klxmaazwh39clwp1069qszsxmw0lr86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkuIiwKICAibmFtZSI6ICJQaXhlbCBTYXZlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAuMiIsCiAgICAiNDAuMyIsCiAgICAiNDEuMCIsCiAgICAiNDEuMSIsCiAgICAiNDEuMiIsCiAgICAiNDEuMyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI1Cn0="}}} +, {"uuid": "pixel-saver@deadalnix.me", "name": "Pixel Saver", "pname": "pixel-saver", "description": "Pixel Saver is designed to save pixel by fusing activity bar and title bar in a natural way", "link": "https://extensions.gnome.org/extension/723/pixel-saver/", "shell_version_map": {"38": {"version": "26", "sha256": "1i284r5443cypw7jq31rrbc4f075piaq872331qnrrynv4s1k8cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIiwKICAgICI0MS4xIiwKICAgICI0MS4yIiwKICAgICI0MS4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVhZGFsbml4L3BpeGVsLXNhdmVyIiwKICAidXVpZCI6ICJwaXhlbC1zYXZlckBkZWFkYWxuaXgubWUiLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "40": {"version": "26", "sha256": "1i284r5443cypw7jq31rrbc4f075piaq872331qnrrynv4s1k8cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIiwKICAgICI0MS4xIiwKICAgICI0MS4yIiwKICAgICI0MS4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVhZGFsbml4L3BpeGVsLXNhdmVyIiwKICAidXVpZCI6ICJwaXhlbC1zYXZlckBkZWFkYWxuaXgubWUiLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "41": {"version": "26", "sha256": "1i284r5443cypw7jq31rrbc4f075piaq872331qnrrynv4s1k8cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIiwKICAgICI0MS4xIiwKICAgICI0MS4yIiwKICAgICI0MS4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVhZGFsbml4L3BpeGVsLXNhdmVyIiwKICAidXVpZCI6ICJwaXhlbC1zYXZlckBkZWFkYWxuaXgubWUiLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "42": {"version": "26", "sha256": "1i284r5443cypw7jq31rrbc4f075piaq872331qnrrynv4s1k8cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIiwKICAgICI0MS4xIiwKICAgICI0MS4yIiwKICAgICI0MS4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVhZGFsbml4L3BpeGVsLXNhdmVyIiwKICAidXVpZCI6ICJwaXhlbC1zYXZlckBkZWFkYWxuaXgubWUiLAogICJ2ZXJzaW9uIjogMjYKfQ=="}}} , {"uuid": "breakreminder@danielfalk22.gmail.com", "name": "Break Reminder", "pname": "break-reminder", "description": "Get a reminder to take a break", "link": "https://extensions.gnome.org/extension/734/break-reminder/", "shell_version_map": {"38": {"version": "6", "sha256": "0k21wj98ldx52m7s8sgndqziqnn7n0g2j45lsi31kfjydhyj3dmk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBhIHJlbWluZGVyIHRvIHRha2UgYSBicmVhayIsCiAgIm5hbWUiOiAiQnJlYWsgUmVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZWxmYWxrL2dub21lM2JyZWFrcmVtaW5kZXIiLAogICJ1dWlkIjogImJyZWFrcmVtaW5kZXJAZGFuaWVsZmFsazIyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "Hide_Activities@shay.shayel.org", "name": "Hide Activities Button", "pname": "hide-activities-button", "description": "Hides the Activities button from the status bar (the hot corner and keyboard shortcut keeps working). To disable top left hot corner use 'No Topleft Hot Corner' extension — https://extensions.gnome.org/extension/118/no-topleft-hot-corner/ .", "link": "https://extensions.gnome.org/extension/744/hide-activities-button/", "shell_version_map": {"38": {"version": "12", "sha256": "0z7p6xl6axckl6f0gyqaya3l5i4d9mnzkqdylpfhywswb5idabra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiSGlkZV9BY3Rpdml0aWVzQHNoYXkuc2hheWVsLm9yZyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "0z7p6xl6axckl6f0gyqaya3l5i4d9mnzkqdylpfhywswb5idabra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiSGlkZV9BY3Rpdml0aWVzQHNoYXkuc2hheWVsLm9yZyIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0z7p6xl6axckl6f0gyqaya3l5i4d9mnzkqdylpfhywswb5idabra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiSGlkZV9BY3Rpdml0aWVzQHNoYXkuc2hheWVsLm9yZyIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "openweather-extension@jenslody.de", "name": "OpenWeather", "pname": "openweather", "description": "Weather extension to display weather information from https://openweathermap.org/ or https://darksky.net for almost all locations in the world.\nFor openweathermap.org, you can either use the extensions default-key or register at https://openweathermap.org/appid and set the appropriate switch in the preferences dialog to \"off\".\nFor Dark Sky you have to register at https://darksky.net/dev/register and get a personal API-key.\n\nSince version 29 this extensions uses coordinates to store the locations and makes the names editable to support multiple weather-providers!\nIf you update from versions prior to 29 to 29 or greater (with darksky.net - support) you have to recreate your locations.", "link": "https://extensions.gnome.org/extension/750/openweather/", "shell_version_map": {"38": {"version": "105", "sha256": "0xqz924fxy201b0d9l8xn4ykwbsvgazrbc85mbjcqk4laizyn82a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldlYXRoZXIgZXh0ZW5zaW9uIHRvIGRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmcm9tIGh0dHBzOi8vb3BlbndlYXRoZXJtYXAub3JnLyBvciBodHRwczovL2Rhcmtza3kubmV0IGZvciBhbG1vc3QgYWxsIGxvY2F0aW9ucyBpbiB0aGUgd29ybGQuXG5Gb3Igb3BlbndlYXRoZXJtYXAub3JnLCB5b3UgY2FuIGVpdGhlciB1c2UgdGhlIGV4dGVuc2lvbnMgZGVmYXVsdC1rZXkgb3IgcmVnaXN0ZXIgYXQgaHR0cHM6Ly9vcGVud2VhdGhlcm1hcC5vcmcvYXBwaWQgYW5kIHNldCB0aGUgYXBwcm9wcmlhdGUgc3dpdGNoIGluIHRoZSBwcmVmZXJlbmNlcyBkaWFsb2cgdG8gXCJvZmZcIi5cbkZvciBEYXJrIFNreSB5b3UgaGF2ZSB0byByZWdpc3RlciBhdCBodHRwczovL2Rhcmtza3kubmV0L2Rldi9yZWdpc3RlciBhbmQgZ2V0IGEgcGVyc29uYWwgQVBJLWtleS5cblxuU2luY2UgdmVyc2lvbiAyOSB0aGlzIGV4dGVuc2lvbnMgdXNlcyBjb29yZGluYXRlcyB0byBzdG9yZSB0aGUgbG9jYXRpb25zIGFuZCBtYWtlcyB0aGUgbmFtZXMgZWRpdGFibGUgdG8gc3VwcG9ydCBtdWx0aXBsZSB3ZWF0aGVyLXByb3ZpZGVycyFcbklmIHlvdSB1cGRhdGUgZnJvbSB2ZXJzaW9ucyBwcmlvciB0byAyOSB0byAyOSBvciBncmVhdGVyICh3aXRoIGRhcmtza3kubmV0IC0gc3VwcG9ydCkgeW91IGhhdmUgdG8gcmVjcmVhdGUgeW91ciBsb2NhdGlvbnMuIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2plbnNsb2R5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1vcGVud2VhdGhlciIsCiAgInV1aWQiOiAib3BlbndlYXRoZXItZXh0ZW5zaW9uQGplbnNsb2R5LmRlIiwKICAidmVyc2lvbiI6IDEwNQp9"}, "40": {"version": "106", "sha256": "0xs7xd7rfy6lb4izmgsn9lwijbm93l3cpm6avy5jh19jlpq18nkv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldlYXRoZXIgZXh0ZW5zaW9uIHRvIGRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmcm9tIGh0dHBzOi8vb3BlbndlYXRoZXJtYXAub3JnLyBvciBodHRwczovL2Rhcmtza3kubmV0IGZvciBhbG1vc3QgYWxsIGxvY2F0aW9ucyBpbiB0aGUgd29ybGQuXG5Gb3Igb3BlbndlYXRoZXJtYXAub3JnLCB5b3UgY2FuIGVpdGhlciB1c2UgdGhlIGV4dGVuc2lvbnMgZGVmYXVsdC1rZXkgb3IgcmVnaXN0ZXIgYXQgaHR0cHM6Ly9vcGVud2VhdGhlcm1hcC5vcmcvYXBwaWQgYW5kIHNldCB0aGUgYXBwcm9wcmlhdGUgc3dpdGNoIGluIHRoZSBwcmVmZXJlbmNlcyBkaWFsb2cgdG8gXCJvZmZcIi5cbkZvciBEYXJrIFNreSB5b3UgaGF2ZSB0byByZWdpc3RlciBhdCBodHRwczovL2Rhcmtza3kubmV0L2Rldi9yZWdpc3RlciBhbmQgZ2V0IGEgcGVyc29uYWwgQVBJLWtleS5cblxuU2luY2UgdmVyc2lvbiAyOSB0aGlzIGV4dGVuc2lvbnMgdXNlcyBjb29yZGluYXRlcyB0byBzdG9yZSB0aGUgbG9jYXRpb25zIGFuZCBtYWtlcyB0aGUgbmFtZXMgZWRpdGFibGUgdG8gc3VwcG9ydCBtdWx0aXBsZSB3ZWF0aGVyLXByb3ZpZGVycyFcbklmIHlvdSB1cGRhdGUgZnJvbSB2ZXJzaW9ucyBwcmlvciB0byAyOSB0byAyOSBvciBncmVhdGVyICh3aXRoIGRhcmtza3kubmV0IC0gc3VwcG9ydCkgeW91IGhhdmUgdG8gcmVjcmVhdGUgeW91ciBsb2NhdGlvbnMuIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qZW5zbG9keS9nbm9tZS1zaGVsbC1leHRlbnNpb24tb3BlbndlYXRoZXIiLAogICJ1dWlkIjogIm9wZW53ZWF0aGVyLWV4dGVuc2lvbkBqZW5zbG9keS5kZSIsCiAgInZlcnNpb24iOiAxMDYKfQ=="}}} -, {"uuid": "audio-output-switcher@anduchs", "name": "Audio Output Switcher", "pname": "audio-output-switcher", "description": "Adds a switch for choosing audio output to the system menu.", "link": "https://extensions.gnome.org/extension/751/audio-output-switcher/", "shell_version_map": {"38": {"version": "18", "sha256": "1f1crfhqs310bdhv15bhp16ljlcnxbif84fa18pkl00h2lhlyy9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIG91dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUuIiwKICAibmFtZSI6ICJBdWRpbyBPdXRwdXQgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vYWRheGkvYXVkaW8tb3V0cHV0LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhdWRpby1vdXRwdXQtc3dpdGNoZXJAYW5kdWNocyIsCiAgInZlcnNpb24iOiAxOAp9"}, "40": {"version": "18", "sha256": "1f1crfhqs310bdhv15bhp16ljlcnxbif84fa18pkl00h2lhlyy9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIG91dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUuIiwKICAibmFtZSI6ICJBdWRpbyBPdXRwdXQgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vYWRheGkvYXVkaW8tb3V0cHV0LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhdWRpby1vdXRwdXQtc3dpdGNoZXJAYW5kdWNocyIsCiAgInZlcnNpb24iOiAxOAp9"}, "41": {"version": "18", "sha256": "1f1crfhqs310bdhv15bhp16ljlcnxbif84fa18pkl00h2lhlyy9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIG91dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUuIiwKICAibmFtZSI6ICJBdWRpbyBPdXRwdXQgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vYWRheGkvYXVkaW8tb3V0cHV0LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhdWRpby1vdXRwdXQtc3dpdGNoZXJAYW5kdWNocyIsCiAgInZlcnNpb24iOiAxOAp9"}}} +, {"uuid": "audio-output-switcher@anduchs", "name": "Audio Output Switcher", "pname": "audio-output-switcher", "description": "Adds a switch for choosing audio output to the system menu.", "link": "https://extensions.gnome.org/extension/751/audio-output-switcher/", "shell_version_map": {"38": {"version": "19", "sha256": "02z1smlc0k308sr462l9pwf2gsldqdzjalbc364i4b7286qyakxc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIG91dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUuIiwKICAibmFtZSI6ICJBdWRpbyBPdXRwdXQgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL2FkYXhpL2F1ZGlvLW91dHB1dC1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYXVkaW8tb3V0cHV0LXN3aXRjaGVyQGFuZHVjaHMiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "40": {"version": "19", "sha256": "02z1smlc0k308sr462l9pwf2gsldqdzjalbc364i4b7286qyakxc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIG91dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUuIiwKICAibmFtZSI6ICJBdWRpbyBPdXRwdXQgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL2FkYXhpL2F1ZGlvLW91dHB1dC1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYXVkaW8tb3V0cHV0LXN3aXRjaGVyQGFuZHVjaHMiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "41": {"version": "19", "sha256": "02z1smlc0k308sr462l9pwf2gsldqdzjalbc364i4b7286qyakxc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIG91dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUuIiwKICAibmFtZSI6ICJBdWRpbyBPdXRwdXQgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL2FkYXhpL2F1ZGlvLW91dHB1dC1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYXVkaW8tb3V0cHV0LXN3aXRjaGVyQGFuZHVjaHMiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "42": {"version": "19", "sha256": "02z1smlc0k308sr462l9pwf2gsldqdzjalbc364i4b7286qyakxc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIG91dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUuIiwKICAibmFtZSI6ICJBdWRpbyBPdXRwdXQgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL2FkYXhpL2F1ZGlvLW91dHB1dC1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYXVkaW8tb3V0cHV0LXN3aXRjaGVyQGFuZHVjaHMiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} , {"uuid": "hibernate-status@dromi", "name": "Hibernate Status Button", "pname": "hibernate-status-button", "description": "Adds a Hibernate button in Status menu. Using Alt modifier, you can also select Hybrid Sleep instead.", "link": "https://extensions.gnome.org/extension/755/hibernate-status-button/", "shell_version_map": {"38": {"version": "27", "sha256": "0yqzg2nz040vsv0ilwkjkza03qxns18gq4055gq0c3k051jy6d4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAibmFtZSI6ICJIaWJlcm5hdGUgU3RhdHVzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyZWxhbmdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1oaWJlcm5hdGUtc3RhdHVzIiwKICAidXVpZCI6ICJoaWJlcm5hdGUtc3RhdHVzQGRyb21pIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "40": {"version": "32", "sha256": "1jx687q54n14vyn8mmlzq6yrhg5ksda3cph26wzzdhd7nz940rv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlLXN0YXR1cy1idXR0b24iLAogICJuYW1lIjogIkhpYmVybmF0ZSBTdGF0dXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmVsYW5nZS9nbm9tZS1zaGVsbC1leHRlbnNpb24taGliZXJuYXRlLXN0YXR1cyIsCiAgInV1aWQiOiAiaGliZXJuYXRlLXN0YXR1c0Bkcm9taSIsCiAgInZlcnNpb24iOiAzMgp9"}, "41": {"version": "32", "sha256": "1jx687q54n14vyn8mmlzq6yrhg5ksda3cph26wzzdhd7nz940rv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlLXN0YXR1cy1idXR0b24iLAogICJuYW1lIjogIkhpYmVybmF0ZSBTdGF0dXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmVsYW5nZS9nbm9tZS1zaGVsbC1leHRlbnNpb24taGliZXJuYXRlLXN0YXR1cyIsCiAgInV1aWQiOiAiaGliZXJuYXRlLXN0YXR1c0Bkcm9taSIsCiAgInZlcnNpb24iOiAzMgp9"}}} , {"uuid": "minimizeall@scharlessantos.org", "name": "Minimize All", "pname": "minimize-all", "description": "Minimize all windows in current workspace", "link": "https://extensions.gnome.org/extension/760/minimize-all/", "shell_version_map": {"38": {"version": "20", "sha256": "15v6h4wcznrylip57spjdkz0jk6y7hcp47607pj0yx5dmxjaws86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIGFsbCB3aW5kb3dzIGluIGN1cnJlbnQgd29ya3NwYWNlIiwKICAibmFtZSI6ICJNaW5pbWl6ZSBBbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2NoYXJsZXNzYW50b3MvbWluaW1pemVhbGwiLAogICJ1dWlkIjogIm1pbmltaXplYWxsQHNjaGFybGVzc2FudG9zLm9yZyIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "20", "sha256": "15v6h4wcznrylip57spjdkz0jk6y7hcp47607pj0yx5dmxjaws86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIGFsbCB3aW5kb3dzIGluIGN1cnJlbnQgd29ya3NwYWNlIiwKICAibmFtZSI6ICJNaW5pbWl6ZSBBbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2NoYXJsZXNzYW50b3MvbWluaW1pemVhbGwiLAogICJ1dWlkIjogIm1pbmltaXplYWxsQHNjaGFybGVzc2FudG9zLm9yZyIsCiAgInZlcnNpb24iOiAyMAp9"}}} , {"uuid": "fq@megh", "name": "Force Quit", "pname": "force-quit", "description": "Adds a force quit button.\nOn accidental click, right click or press [ESC] to undo.\nCustomize position by tweaking line 50 of extension.js\n\nUPDATE: No longer depends on xkill and should work on Wayland", "link": "https://extensions.gnome.org/extension/770/force-quit/", "shell_version_map": {"38": {"version": "18", "sha256": "07ygqdzgq8q8bmsrpy4wbwgm8n5syhk0gw2pzn62ismaxkr7fqi3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBmb3JjZSBxdWl0IGJ1dHRvbi5cbk9uIGFjY2lkZW50YWwgY2xpY2ssIHJpZ2h0IGNsaWNrIG9yIHByZXNzIFtFU0NdIHRvIHVuZG8uXG5DdXN0b21pemUgcG9zaXRpb24gYnkgdHdlYWtpbmcgbGluZSA1MCBvZiBleHRlbnNpb24uanNcblxuVVBEQVRFOiBObyBsb25nZXIgZGVwZW5kcyBvbiB4a2lsbCBhbmQgc2hvdWxkIHdvcmsgb24gV2F5bGFuZCIsCiAgIm5hbWUiOiAiRm9yY2UgUXVpdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZWdocHJraC9mb3JjZS1xdWl0LyIsCiAgInV1aWQiOiAiZnFAbWVnaCIsCiAgInZlcnNpb24iOiAxOAp9"}, "40": {"version": "21", "sha256": "0gx6vxzg8kqlqa2z5i9dazwy2bd1yfbg8ms7g84ri9hn1064l8g2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBmb3JjZSBxdWl0IGJ1dHRvbi5cbk9uIGFjY2lkZW50YWwgY2xpY2ssIHJpZ2h0IGNsaWNrIG9yIHByZXNzIFtFU0NdIHRvIHVuZG8uXG5DdXN0b21pemUgcG9zaXRpb24gYnkgdHdlYWtpbmcgbGluZSA1MCBvZiBleHRlbnNpb24uanNcblxuVVBEQVRFOiBObyBsb25nZXIgZGVwZW5kcyBvbiB4a2lsbCBhbmQgc2hvdWxkIHdvcmsgb24gV2F5bGFuZCIsCiAgIm5hbWUiOiAiRm9yY2UgUXVpdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVnaHBya2gvZm9yY2UtcXVpdC8iLAogICJ1dWlkIjogImZxQG1lZ2giLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "41": {"version": "21", "sha256": "0gx6vxzg8kqlqa2z5i9dazwy2bd1yfbg8ms7g84ri9hn1064l8g2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBmb3JjZSBxdWl0IGJ1dHRvbi5cbk9uIGFjY2lkZW50YWwgY2xpY2ssIHJpZ2h0IGNsaWNrIG9yIHByZXNzIFtFU0NdIHRvIHVuZG8uXG5DdXN0b21pemUgcG9zaXRpb24gYnkgdHdlYWtpbmcgbGluZSA1MCBvZiBleHRlbnNpb24uanNcblxuVVBEQVRFOiBObyBsb25nZXIgZGVwZW5kcyBvbiB4a2lsbCBhbmQgc2hvdWxkIHdvcmsgb24gV2F5bGFuZCIsCiAgIm5hbWUiOiAiRm9yY2UgUXVpdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVnaHBya2gvZm9yY2UtcXVpdC8iLAogICJ1dWlkIjogImZxQG1lZ2giLAogICJ2ZXJzaW9uIjogMjEKfQ=="}}} , {"uuid": "ProxySwitcher@flannaghan.com", "name": "Proxy Switcher", "pname": "proxy-switcher", "description": "Switches between the system proxy settings profiles defined in Network Settings.", "link": "https://extensions.gnome.org/extension/771/proxy-switcher/", "shell_version_map": {"40": {"version": "15", "sha256": "1vyplw3yv9904sgcjcgc8lz4py3ra59k3afsf2vc35n6vba7k91n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAibmFtZSI6ICJQcm94eSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yMS45MSIsCiAgICAiMy4yMi4yIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21mbGFubmFnaGFuL3Byb3h5LXN3aXRjaGVyIiwKICAidXVpZCI6ICJQcm94eVN3aXRjaGVyQGZsYW5uYWdoYW4uY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "1vyplw3yv9904sgcjcgc8lz4py3ra59k3afsf2vc35n6vba7k91n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAibmFtZSI6ICJQcm94eSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yMS45MSIsCiAgICAiMy4yMi4yIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21mbGFubmFnaGFuL3Byb3h5LXN3aXRjaGVyIiwKICAidXVpZCI6ICJQcm94eVN3aXRjaGVyQGZsYW5uYWdoYW4uY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}}} , {"uuid": "clipboard-indicator@tudmotu.com", "name": "Clipboard Indicator", "pname": "clipboard-indicator", "description": "Clipboard Manager extension for Gnome-Shell - Adds a clipboard indicator to the top panel, and caches clipboard history.", "link": "https://extensions.gnome.org/extension/779/clipboard-indicator/", "shell_version_map": {"38": {"version": "37", "sha256": "1nd6ydp5wmd56zf3vwrsi2wflrw15krdbvqv2fkmla8rndallp1i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsaXBib2FyZCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgR25vbWUtU2hlbGwgLSBBZGRzIGEgY2xpcGJvYXJkIGluZGljYXRvciB0byB0aGUgdG9wIHBhbmVsLCBhbmQgY2FjaGVzIGNsaXBib2FyZCBoaXN0b3J5LiIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1R1ZG1vdHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsaXBib2FyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNsaXBib2FyZC1pbmRpY2F0b3JAdHVkbW90dS5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="}, "40": {"version": "39", "sha256": "19zwg7jnf24cgqv75hzcz2a5w750kfc6yi6pn2azzknmwnsz0i7c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsaXBib2FyZCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgR25vbWUtU2hlbGwgLSBBZGRzIGEgY2xpcGJvYXJkIGluZGljYXRvciB0byB0aGUgdG9wIHBhbmVsLCBhbmQgY2FjaGVzIGNsaXBib2FyZCBoaXN0b3J5LiIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVHVkbW90dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckB0dWRtb3R1LmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}, "41": {"version": "39", "sha256": "19zwg7jnf24cgqv75hzcz2a5w750kfc6yi6pn2azzknmwnsz0i7c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsaXBib2FyZCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgR25vbWUtU2hlbGwgLSBBZGRzIGEgY2xpcGJvYXJkIGluZGljYXRvciB0byB0aGUgdG9wIHBhbmVsLCBhbmQgY2FjaGVzIGNsaXBib2FyZCBoaXN0b3J5LiIsCiAgIm5hbWUiOiAiQ2xpcGJvYXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVHVkbW90dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckB0dWRtb3R1LmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}}} , {"uuid": "pidgin@muffinmad", "name": "Pidgin IM integration", "pname": "pidgin-im-integration", "description": "Integrate Pidgin IMs in the Gnome Shell message tray", "link": "https://extensions.gnome.org/extension/782/pidgin-im-integration/", "shell_version_map": {"40": {"version": "41", "sha256": "1g2iflmb8rjzfc82yv8wcii99df5aaqx5czqkhxpf9pfsrkknhs9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBQaWRnaW4gSU1zIGluIHRoZSBHbm9tZSBTaGVsbCBtZXNzYWdlIHRyYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tcGlkZ2luIiwKICAibmFtZSI6ICJQaWRnaW4gSU0gaW50ZWdyYXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlkZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdWZmaW5tYWQvcGlkZ2luLWltLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicGlkZ2luQG11ZmZpbm1hZCIsCiAgInZlcnNpb24iOiA0MQp9"}, "41": {"version": "41", "sha256": "1g2iflmb8rjzfc82yv8wcii99df5aaqx5czqkhxpf9pfsrkknhs9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBQaWRnaW4gSU1zIGluIHRoZSBHbm9tZSBTaGVsbCBtZXNzYWdlIHRyYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tcGlkZ2luIiwKICAibmFtZSI6ICJQaWRnaW4gSU0gaW50ZWdyYXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlkZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tdWZmaW5tYWQvcGlkZ2luLWltLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAicGlkZ2luQG11ZmZpbm1hZCIsCiAgInZlcnNpb24iOiA0MQp9"}}} -, {"uuid": "ShutdownTimer@neumann", "name": "ShutdownTimer", "pname": "shutdowntimer", "description": "Shutdown/suspend the device after a specific time.\n\nMaximum timer value und default slider position can be modified in the settings.", "link": "https://extensions.gnome.org/extension/792/shutdowntimer/", "shell_version_map": {"38": {"version": "33", "sha256": "1m7rxxjlxfi9bwsxwxnjhpfzhsz3ry79jwd2i17sc3v1i7h6xqsd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "40": {"version": "33", "sha256": "1m7rxxjlxfi9bwsxwxnjhpfzhsz3ry79jwd2i17sc3v1i7h6xqsd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "41": {"version": "33", "sha256": "1m7rxxjlxfi9bwsxwxnjhpfzhsz3ry79jwd2i17sc3v1i7h6xqsd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} +, {"uuid": "ShutdownTimer@neumann", "name": "ShutdownTimer", "pname": "shutdowntimer", "description": "Shutdown/suspend the device after a specific time.\n\nMaximum timer value und default slider position can be modified in the settings.", "link": "https://extensions.gnome.org/extension/792/shutdowntimer/", "shell_version_map": {"38": {"version": "34", "sha256": "1glzjcdv90w5mx0xqj57i0s3qgazr5dcdcin1kwb5mqvc362dd68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "40": {"version": "34", "sha256": "1glzjcdv90w5mx0xqj57i0s3qgazr5dcdcin1kwb5mqvc362dd68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "41": {"version": "34", "sha256": "1glzjcdv90w5mx0xqj57i0s3qgazr5dcdcin1kwb5mqvc362dd68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}}} , {"uuid": "hide-dash@xenatt.github.com", "name": "Hide Dash X", "pname": "hide-dash", "description": "Hide the dash from the activities overview.", "link": "https://extensions.gnome.org/extension/805/hide-dash/", "shell_version_map": {"38": {"version": "10", "sha256": "059cy18awzv9qyn803zjyxiznacnf6pai8px2mb9mrbyf98153xz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGRhc2ggZnJvbSB0aGUgYWN0aXZpdGllcyBvdmVydmlldy4iLAogICJuYW1lIjogIkhpZGUgRGFzaCBYIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInphY2JhcnRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0VkZW5ob2Zlci9NaW5pbWFsaXNtLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJoaWRlLWRhc2hAeGVuYXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"uuid": "hide-workspace@xenatt.github.com", "name": "Hide Workspace Thumbnails", "pname": "hide-workspace-thumbnails", "description": "Hide workspace thumbnails from the overview. But don't worry they are still present and one can switch between them like usual with e.g. shortcuts..", "link": "https://extensions.gnome.org/extension/808/hide-workspace-thumbnails/", "shell_version_map": {"40": {"version": "16", "sha256": "0443zyqr2hwq5fj3h8zch8iav83xzj4bqn1k6qd5f2z46kvzj611", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgd29ya3NwYWNlIHRodW1ibmFpbHMgZnJvbSB0aGUgb3ZlcnZpZXcuIEJ1dCBkb24ndCB3b3JyeSB0aGV5IGFyZSBzdGlsbCBwcmVzZW50IGFuZCBvbmUgY2FuIHN3aXRjaCBiZXR3ZWVuIHRoZW0gbGlrZSB1c3VhbCB3aXRoIGUuZy4gc2hvcnRjdXRzLi4iLAogICJuYW1lIjogIkhpZGUgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWRlbmhvZmVyL01pbmltYWxpc20tR25vbWUtU2hlbGwiLAogICJ1dWlkIjogImhpZGUtd29ya3NwYWNlQHhlbmF0dC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}}} -, {"uuid": "keyman@dpoetzsch.github.com", "name": "KeyMan", "pname": "keyman", "description": "Access passwords from the gnome keyring in a convenient way:\nSimply search for your password and copy it to clipboad by clicking it. After a certain amount of time it will be removed automatically (default is 5 seconds). As this only works if the keyrings are unlocked, this extension also provides easy access to lock/unlock keyrings.", "link": "https://extensions.gnome.org/extension/819/keyman/", "shell_version_map": {"40": {"version": "20", "sha256": "1wd76bdnzs7mxwwyvffw0fm8r8chsblz3dinpwiyc5d5kmlnyv5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBwYXNzd29yZHMgZnJvbSB0aGUgZ25vbWUga2V5cmluZyBpbiBhIGNvbnZlbmllbnQgd2F5OlxuU2ltcGx5IHNlYXJjaCBmb3IgeW91ciBwYXNzd29yZCBhbmQgY29weSBpdCB0byBjbGlwYm9hZCBieSBjbGlja2luZyBpdC4gQWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lIGl0IHdpbGwgYmUgcmVtb3ZlZCBhdXRvbWF0aWNhbGx5IChkZWZhdWx0IGlzIDUgc2Vjb25kcykuIEFzIHRoaXMgb25seSB3b3JrcyBpZiB0aGUga2V5cmluZ3MgYXJlIHVubG9ja2VkLCB0aGlzIGV4dGVuc2lvbiBhbHNvIHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRvIGxvY2svdW5sb2NrIGtleXJpbmdzLiIsCiAgIm5hbWUiOiAiS2V5TWFuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJrZXltYW5AcG9laGUuZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtleW1hbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kcG9ldHpzY2gva2V5bWFuIiwKICAidXVpZCI6ICJrZXltYW5AZHBvZXR6c2NoLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}}} +, {"uuid": "keyman@dpoetzsch.github.com", "name": "KeyMan", "pname": "keyman", "description": "Access passwords from the gnome keyring in a convenient way:\nSimply search for your password and copy it to clipboad by clicking it. After a certain amount of time it will be removed automatically (default is 5 seconds). As this only works if the keyrings are unlocked, this extension also provides easy access to lock/unlock keyrings.", "link": "https://extensions.gnome.org/extension/819/keyman/", "shell_version_map": {"40": {"version": "20", "sha256": "1wd76bdnzs7mxwwyvffw0fm8r8chsblz3dinpwiyc5d5kmlnyv5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBwYXNzd29yZHMgZnJvbSB0aGUgZ25vbWUga2V5cmluZyBpbiBhIGNvbnZlbmllbnQgd2F5OlxuU2ltcGx5IHNlYXJjaCBmb3IgeW91ciBwYXNzd29yZCBhbmQgY29weSBpdCB0byBjbGlwYm9hZCBieSBjbGlja2luZyBpdC4gQWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lIGl0IHdpbGwgYmUgcmVtb3ZlZCBhdXRvbWF0aWNhbGx5IChkZWZhdWx0IGlzIDUgc2Vjb25kcykuIEFzIHRoaXMgb25seSB3b3JrcyBpZiB0aGUga2V5cmluZ3MgYXJlIHVubG9ja2VkLCB0aGlzIGV4dGVuc2lvbiBhbHNvIHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRvIGxvY2svdW5sb2NrIGtleXJpbmdzLiIsCiAgIm5hbWUiOiAiS2V5TWFuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJrZXltYW5AcG9laGUuZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtleW1hbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kcG9ldHpzY2gva2V5bWFuIiwKICAidXVpZCI6ICJrZXltYW5AZHBvZXR6c2NoLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "22", "sha256": "0ijqdsmz6mid30cav7is9ypl0862y2d877zagr75cnq3jshplfbj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBwYXNzd29yZHMgZnJvbSB0aGUgZ25vbWUga2V5cmluZyBpbiBhIGNvbnZlbmllbnQgd2F5OlxuU2ltcGx5IHNlYXJjaCBmb3IgeW91ciBwYXNzd29yZCBhbmQgY29weSBpdCB0byBjbGlwYm9hZCBieSBjbGlja2luZyBpdC4gQWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lIGl0IHdpbGwgYmUgcmVtb3ZlZCBhdXRvbWF0aWNhbGx5IChkZWZhdWx0IGlzIDUgc2Vjb25kcykuIEFzIHRoaXMgb25seSB3b3JrcyBpZiB0aGUga2V5cmluZ3MgYXJlIHVubG9ja2VkLCB0aGlzIGV4dGVuc2lvbiBhbHNvIHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRvIGxvY2svdW5sb2NrIGtleXJpbmdzLiIsCiAgIm5hbWUiOiAiS2V5TWFuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJrZXltYW5AcG9laGUuZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtleW1hbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kcG9ldHpzY2gva2V5bWFuIiwKICAidXVpZCI6ICJrZXltYW5AZHBvZXR6c2NoLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} , {"uuid": "time_tracker_jsnjack@gmail.com", "name": "Time Tracker", "pname": "time-tracker", "description": "Helps track time", "link": "https://extensions.gnome.org/extension/823/time-tracker/", "shell_version_map": {"40": {"version": "23", "sha256": "1q1jh3s6k6pmjssjmhzajmcr1qxdz4854fyfja0vbwcvxd6a8ff2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhlbHBzIHRyYWNrIHRpbWUiLAogICJuYW1lIjogIlRpbWUgVHJhY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aW1lLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pzbmphY2svdGltZS10cmFja2VyLyIsCiAgInV1aWQiOiAidGltZV90cmFja2VyX2pzbmphY2tAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "1q1jh3s6k6pmjssjmhzajmcr1qxdz4854fyfja0vbwcvxd6a8ff2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhlbHBzIHRyYWNrIHRpbWUiLAogICJuYW1lIjogIlRpbWUgVHJhY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aW1lLXRyYWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pzbmphY2svdGltZS10cmFja2VyLyIsCiAgInV1aWQiOiAidGltZV90cmFja2VyX2pzbmphY2tAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}}} , {"uuid": "pwcalc@thilomaurer.de", "name": "Password Calculator", "pname": "password-calculator", "description": "This extension calculates strong passwords for each alias from your single secret. No need to remember dozens of passwords any longer. No need for a password manager any longer. Full freedom in choosing aliases and secret, e.g. alias: \"username@google.com#2014\", secret: \"saFe⚿in漢字\". Recent aliases are kept in a easily accessible drop-down. You may choose between HMAC_SHA1 and SHA1. The formula is as simple as \"[secret][alias]\" → SHA1 → BASE64 ", "link": "https://extensions.gnome.org/extension/825/password-calculator/", "shell_version_map": {"40": {"version": "24", "sha256": "1kcapf1hm7zibjjpfq1qas76xvgvf77snyxm0wy8f35h8g42wc20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNhbGN1bGF0ZXMgc3Ryb25nIHBhc3N3b3JkcyBmb3IgZWFjaCBhbGlhcyBmcm9tIHlvdXIgc2luZ2xlIHNlY3JldC4gTm8gbmVlZCB0byByZW1lbWJlciBkb3plbnMgb2YgcGFzc3dvcmRzIGFueSBsb25nZXIuIE5vIG5lZWQgZm9yIGEgcGFzc3dvcmQgbWFuYWdlciBhbnkgbG9uZ2VyLiBGdWxsIGZyZWVkb20gaW4gY2hvb3NpbmcgYWxpYXNlcyBhbmQgc2VjcmV0LCBlLmcuIGFsaWFzOiBcInVzZXJuYW1lQGdvb2dsZS5jb20jMjAxNFwiLCBzZWNyZXQ6IFwic2FGZVx1MjZiZmluXHU2ZjIyXHU1YjU3XCIuIFJlY2VudCBhbGlhc2VzIGFyZSBrZXB0IGluIGEgZWFzaWx5IGFjY2Vzc2libGUgZHJvcC1kb3duLiBZb3UgbWF5IGNob29zZSBiZXR3ZWVuIEhNQUNfU0hBMSBhbmQgU0hBMS4gVGhlIGZvcm11bGEgaXMgYXMgc2ltcGxlIGFzIFwiW3NlY3JldF1bYWxpYXNdXCIgXHUyMTkyIFNIQTEgXHUyMTkyIEJBU0U2NCAiLAogICJuYW1lIjogIlBhc3N3b3JkIENhbGN1bGF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucHdjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RoaWxvbWF1cmVyL3B3Y2FsYyIsCiAgInV1aWQiOiAicHdjYWxjQHRoaWxvbWF1cmVyLmRlIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} , {"uuid": "SwitchFocusType@romano.rgtti.com", "name": "Switch Focus Type", "pname": "switch-focus-type", "description": "Toggle between focus-follow-mouse and click-to-focus mode", "link": "https://extensions.gnome.org/extension/827/switch-focus-type/", "shell_version_map": {"38": {"version": "7", "sha256": "0fza40yd5ba53725pm82w43r368zams0kci59cddsh2nf8iqkk2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUm1hbm8vZ3NlLXN3aXRjaC1mb2N1cy1tb2RlIiwKICAidXVpZCI6ICJTd2l0Y2hGb2N1c1R5cGVAcm9tYW5vLnJndHRpLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "0fza40yd5ba53725pm82w43r368zams0kci59cddsh2nf8iqkk2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUm1hbm8vZ3NlLXN3aXRjaC1mb2N1cy1tb2RlIiwKICAidXVpZCI6ICJTd2l0Y2hGb2N1c1R5cGVAcm9tYW5vLnJndHRpLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "0fza40yd5ba53725pm82w43r368zams0kci59cddsh2nf8iqkk2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBiZXR3ZWVuIGZvY3VzLWZvbGxvdy1tb3VzZSBhbmQgY2xpY2stdG8tZm9jdXMgbW9kZSIsCiAgIm5hbWUiOiAiU3dpdGNoIEZvY3VzIFR5cGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlJvbWFubyBHaWFubmV0dGkgPHJvbWFuby5naWFubmV0dGlAZ21haWwuY29tPiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUm1hbm8vZ3NlLXN3aXRjaC1mb2N1cy1tb2RlIiwKICAidXVpZCI6ICJTd2l0Y2hGb2N1c1R5cGVAcm9tYW5vLnJndHRpLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} @@ -74,7 +74,7 @@ , {"uuid": "freon@UshakovVasilii_Github.yahoo.com", "name": "Freon", "pname": "freon", "description": "Shows CPU temperature, disk temperature, video card temperature (NVIDIA/Catalyst/Bumblebee&NVIDIA), voltage and fan RPM (forked from xtranophilist/gnome-shell-extension-sensors)", "link": "https://extensions.gnome.org/extension/841/freon/", "shell_version_map": {"38": {"version": "43", "sha256": "06jj01flj6iyx93aqz8ipzijnrammp6xqpgqwxfh0pf2clr6nwrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1VzaGFrb3ZWYXNpbGlpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mcmVvbiIsCiAgInV1aWQiOiAiZnJlb25AVXNoYWtvdlZhc2lsaWlfR2l0aHViLnlhaG9vLmNvbSIsCiAgInZlcnNpb24iOiA0Mwp9"}, "40": {"version": "45", "sha256": "129gpr57qj8c8180hzzszvkvylgg1i6ql4hwf45v49s3q17lrilh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVXNoYWtvdlZhc2lsaWkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZyZW9uIiwKICAidXVpZCI6ICJmcmVvbkBVc2hha292VmFzaWxpaV9HaXRodWIueWFob28uY29tIiwKICAidmVyc2lvbiI6IDQ1Cn0="}, "41": {"version": "45", "sha256": "129gpr57qj8c8180hzzszvkvylgg1i6ql4hwf45v49s3q17lrilh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIENQVSB0ZW1wZXJhdHVyZSwgZGlzayB0ZW1wZXJhdHVyZSwgdmlkZW8gY2FyZCB0ZW1wZXJhdHVyZSAoTlZJRElBL0NhdGFseXN0L0J1bWJsZWJlZSZOVklESUEpLCB2b2x0YWdlIGFuZCBmYW4gUlBNIChmb3JrZWQgZnJvbSB4dHJhbm9waGlsaXN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1zZW5zb3JzKSIsCiAgImdldHRleHQtZG9tYWluIjogImZyZW9uIiwKICAibmFtZSI6ICJGcmVvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVXNoYWtvdlZhc2lsaWkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZyZW9uIiwKICAidXVpZCI6ICJmcmVvbkBVc2hha292VmFzaWxpaV9HaXRodWIueWFob28uY29tIiwKICAidmVyc2lvbiI6IDQ1Cn0="}}} , {"uuid": "shell-volume-mixer@derhofbauer.at", "name": "Volume Mixer", "pname": "volume-mixer", "description": "Applet allowing separate configuration of PulseAudio mixers.\n\nShell Volume Mixer is an extension for GNOME Shell allowing separate configuration of PulseAudio devices and output switches. It features a profile switcher to quickly switch between pinned profiles and devices.\n\nMiddle mouse click on a slider mutes the selected stream.\n\nPlease file bugs and feature requests on the GitHub page.", "link": "https://extensions.gnome.org/extension/858/volume-mixer/", "shell_version_map": {"38": {"version": "39", "sha256": "1cnyapjvqri5k5m4nbcmbcx97b4akwv32h7ddav2ipahqh1lqqzj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxldCBhbGxvd2luZyBzZXBhcmF0ZSBjb25maWd1cmF0aW9uIG9mIFB1bHNlQXVkaW8gbWl4ZXJzLlxuXG5TaGVsbCBWb2x1bWUgTWl4ZXIgaXMgYW4gZXh0ZW5zaW9uIGZvciBHTk9NRSBTaGVsbCBhbGxvd2luZyBzZXBhcmF0ZSBjb25maWd1cmF0aW9uIG9mIFB1bHNlQXVkaW8gZGV2aWNlcyBhbmQgb3V0cHV0IHN3aXRjaGVzLiBJdCBmZWF0dXJlcyBhIHByb2ZpbGUgc3dpdGNoZXIgdG8gcXVpY2tseSBzd2l0Y2ggYmV0d2VlbiBwaW5uZWQgcHJvZmlsZXMgYW5kIGRldmljZXMuXG5cbk1pZGRsZSBtb3VzZSBjbGljayBvbiBhIHNsaWRlciBtdXRlcyB0aGUgc2VsZWN0ZWQgc3RyZWFtLlxuXG5QbGVhc2UgZmlsZSBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZS4iLAogICJuYW1lIjogIlZvbHVtZSBNaXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZWhvL2dub21lLXNoZWxsLXZvbHVtZS1taXhlciIsCiAgInV1aWQiOiAic2hlbGwtdm9sdW1lLW1peGVyQGRlcmhvZmJhdWVyLmF0IiwKICAidmVyc2lvbiI6IDM5Cn0="}, "40": {"version": "40", "sha256": "1s4jzq1iy006k3m0r28qiayb46135y71qqv583k1sn9sppda5b4d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxldCBhbGxvd2luZyBzZXBhcmF0ZSBjb25maWd1cmF0aW9uIG9mIFB1bHNlQXVkaW8gbWl4ZXJzLlxuXG5TaGVsbCBWb2x1bWUgTWl4ZXIgaXMgYW4gZXh0ZW5zaW9uIGZvciBHTk9NRSBTaGVsbCBhbGxvd2luZyBzZXBhcmF0ZSBjb25maWd1cmF0aW9uIG9mIFB1bHNlQXVkaW8gZGV2aWNlcyBhbmQgb3V0cHV0IHN3aXRjaGVzLiBJdCBmZWF0dXJlcyBhIHByb2ZpbGUgc3dpdGNoZXIgdG8gcXVpY2tseSBzd2l0Y2ggYmV0d2VlbiBwaW5uZWQgcHJvZmlsZXMgYW5kIGRldmljZXMuXG5cbk1pZGRsZSBtb3VzZSBjbGljayBvbiBhIHNsaWRlciBtdXRlcyB0aGUgc2VsZWN0ZWQgc3RyZWFtLlxuXG5QbGVhc2UgZmlsZSBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLXNoZWxsLXZvbHVtZS1taXhlciIsCiAgIm5hbWUiOiAiVm9sdW1lIE1peGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNoZWxsLXZvbHVtZS1taXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGVoby9nbm9tZS1zaGVsbC12b2x1bWUtbWl4ZXIiLAogICJ1dWlkIjogInNoZWxsLXZvbHVtZS1taXhlckBkZXJob2ZiYXVlci5hdCIsCiAgInZlcnNpb24iOiA0MAp9"}, "41": {"version": "44", "sha256": "0pbw1w3y9clq1pmxkblsp85kw5h8znhjf223bplqhjb74g89v80z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxldCBhbGxvd2luZyBzZXBhcmF0ZSBjb25maWd1cmF0aW9uIG9mIFB1bHNlQXVkaW8gbWl4ZXJzLlxuXG5TaGVsbCBWb2x1bWUgTWl4ZXIgaXMgYW4gZXh0ZW5zaW9uIGZvciBHTk9NRSBTaGVsbCBhbGxvd2luZyBzZXBhcmF0ZSBjb25maWd1cmF0aW9uIG9mIFB1bHNlQXVkaW8gZGV2aWNlcyBhbmQgb3V0cHV0IHN3aXRjaGVzLiBJdCBmZWF0dXJlcyBhIHByb2ZpbGUgc3dpdGNoZXIgdG8gcXVpY2tseSBzd2l0Y2ggYmV0d2VlbiBwaW5uZWQgcHJvZmlsZXMgYW5kIGRldmljZXMuXG5cbk1pZGRsZSBtb3VzZSBjbGljayBvbiBhIHNsaWRlciBtdXRlcyB0aGUgc2VsZWN0ZWQgc3RyZWFtLlxuXG5QbGVhc2UgZmlsZSBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLXNoZWxsLXZvbHVtZS1taXhlciIsCiAgIm5hbWUiOiAiVm9sdW1lIE1peGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNoZWxsLXZvbHVtZS1taXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGVoby9nbm9tZS1zaGVsbC12b2x1bWUtbWl4ZXIiLAogICJ1dWlkIjogInNoZWxsLXZvbHVtZS1taXhlckBkZXJob2ZiYXVlci5hdCIsCiAgInZlcnNpb24iOiA0NAp9"}}} , {"uuid": "FRC@jcdubacq.dubacq.fr", "name": "French Republican Calendar", "pname": "french-republican-calendar", "description": "Displays the French Republican Calendar in the top panel", "link": "https://extensions.gnome.org/extension/874/french-republican-calendar/", "shell_version_map": {"38": {"version": "11", "sha256": "13mypljavdmy6rj00cphnkjiimdxw1hzj7mhzlq8m99x5h8d9ahg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBGcmVuY2ggUmVwdWJsaWNhbiBDYWxlbmRhciBpbiB0aGUgdG9wIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRlJDIiwKICAibmFtZSI6ICJGcmVuY2ggUmVwdWJsaWNhbiBDYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOC4xIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJGUkNAamNkdWJhY3EuZHViYWNxLmZyIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "13mypljavdmy6rj00cphnkjiimdxw1hzj7mhzlq8m99x5h8d9ahg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBGcmVuY2ggUmVwdWJsaWNhbiBDYWxlbmRhciBpbiB0aGUgdG9wIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRlJDIiwKICAibmFtZSI6ICJGcmVuY2ggUmVwdWJsaWNhbiBDYWxlbmRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOC4xIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJGUkNAamNkdWJhY3EuZHViYWNxLmZyIiwKICAidmVyc2lvbiI6IDExCn0="}}} -, {"uuid": "screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com", "name": "Screenshot Window Sizer", "pname": "screenshot-window-sizer", "description": "Resize windows for GNOME Software screenshots", "link": "https://extensions.gnome.org/extension/881/screenshot-window-sizer/", "shell_version_map": {"38": {"version": "22", "sha256": "18b8f2agv397pdyaicx2qirqfnm0swbnspw43kb2hr0jn8lkzz1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlNjcmVlbnNob3QgV2luZG93IFNpemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Qtd2luZG93LXNpemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "25", "sha256": "0pdf76kf6z7m9wvqsy36v1r02zfk8pgkpf21im2cq9x4qwh9gkf2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlNjcmVlbnNob3QgV2luZG93IFNpemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Qtd2luZG93LXNpemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInNjcmVlbnNob3Qtd2luZG93LXNpemVyQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "41": {"version": "27", "sha256": "0hwnrmbn8aciwbdw9rffrjg5md93bkrvfp8a4gmzrp6v946fd05p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} +, {"uuid": "screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com", "name": "Screenshot Window Sizer", "pname": "screenshot-window-sizer", "description": "Resize windows for GNOME Software screenshots", "link": "https://extensions.gnome.org/extension/881/screenshot-window-sizer/", "shell_version_map": {"38": {"version": "22", "sha256": "18b8f2agv397pdyaicx2qirqfnm0swbnspw43kb2hr0jn8lkzz1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlNjcmVlbnNob3QgV2luZG93IFNpemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Qtd2luZG93LXNpemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "25", "sha256": "0pdf76kf6z7m9wvqsy36v1r02zfk8pgkpf21im2cq9x4qwh9gkf2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlNjcmVlbnNob3QgV2luZG93IFNpemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Qtd2luZG93LXNpemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL2dub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ1dWlkIjogInNjcmVlbnNob3Qtd2luZG93LXNpemVyQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "41": {"version": "27", "sha256": "0hwnrmbn8aciwbdw9rffrjg5md93bkrvfp8a4gmzrp6v946fd05p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "28", "sha256": "1b675z6jb1g5kq2qav7b6wajjw9z7zlkh5z0p99cmh7vhz60q3sy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlc2l6ZSB3aW5kb3dzIGZvciBHTk9NRSBTb2Z0d2FyZSBzY3JlZW5zaG90cyIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW5zaG90LXdpbmRvdy1zaXplciIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBXaW5kb3cgU2l6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuc2hvdC13aW5kb3ctc2l6ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAic2NyZWVuc2hvdC13aW5kb3ctc2l6ZXJAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5nY2FtcGF4LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}}} , {"uuid": "mailnag@pulb.github.com", "name": "Mailnag", "pname": "mailnag", "description": "Mail indicator (GMail, IMAP, POP) for GNOME.\n\nPlease note that this extension requires the mailnag daemon.\nInstall it from your distros package repositories or get it here:\nhttps://github.com/pulb/mailnag\n\nPlease also note that this version of the extension does not support avatars (as shown in the screenshot).\nIf you like to have avatar support install this extension from your distros package repositories or get a package from here:\nhttps://github.com/pulb/mailnag-gnome-shell\n\nIMPORTANT:\nI do not get notifications for user comments. Please always report bugs here:\nhttps://github.com/pulb/mailnag-gnome-shell/issues", "link": "https://extensions.gnome.org/extension/886/mailnag/", "shell_version_map": {"38": {"version": "20", "sha256": "15n816y34qlc7va72q75ngzw1my3n5j7xhg9a6dc0g8q4dd0g2r9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1haWwgaW5kaWNhdG9yIChHTWFpbCwgSU1BUCwgUE9QKSBmb3IgR05PTUUuXG5cblBsZWFzZSBub3RlIHRoYXQgdGhpcyBleHRlbnNpb24gcmVxdWlyZXMgdGhlIG1haWxuYWcgZGFlbW9uLlxuSW5zdGFsbCBpdCBmcm9tIHlvdXIgZGlzdHJvcyBwYWNrYWdlIHJlcG9zaXRvcmllcyBvciBnZXQgaXQgaGVyZTpcbmh0dHBzOi8vZ2l0aHViLmNvbS9wdWxiL21haWxuYWdcblxuUGxlYXNlIGFsc28gbm90ZSB0aGF0IHRoaXMgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGRvZXMgbm90IHN1cHBvcnQgYXZhdGFycyAoYXMgc2hvd24gaW4gdGhlIHNjcmVlbnNob3QpLlxuSWYgeW91IGxpa2UgdG8gaGF2ZSBhdmF0YXIgc3VwcG9ydCBpbnN0YWxsIHRoaXMgZXh0ZW5zaW9uIGZyb20geW91ciBkaXN0cm9zIHBhY2thZ2UgcmVwb3NpdG9yaWVzIG9yIGdldCBhIHBhY2thZ2UgZnJvbSBoZXJlOlxuaHR0cHM6Ly9naXRodWIuY29tL3B1bGIvbWFpbG5hZy1nbm9tZS1zaGVsbFxuXG5JTVBPUlRBTlQ6XG5JIGRvIG5vdCBnZXQgbm90aWZpY2F0aW9ucyBmb3IgdXNlciBjb21tZW50cy4gUGxlYXNlIGFsd2F5cyByZXBvcnQgYnVncyBoZXJlOlxuaHR0cHM6Ly9naXRodWIuY29tL3B1bGIvbWFpbG5hZy1nbm9tZS1zaGVsbC9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJtYWlsbmFnLWdub21lLXNoZWxsIiwKICAibmFtZSI6ICJNYWlsbmFnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1haWxuYWciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibWFpbG5hZ0BwdWxiLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "40": {"version": "21", "sha256": "060lmc6jacjv1p4a6n7c3l0kmfskq012pgrf2gar0kf49lqrp665", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1haWwgaW5kaWNhdG9yIChHTWFpbCwgSU1BUCwgUE9QKSBmb3IgR05PTUUuXG5cblBsZWFzZSBub3RlIHRoYXQgdGhpcyBleHRlbnNpb24gcmVxdWlyZXMgdGhlIG1haWxuYWcgZGFlbW9uLlxuSW5zdGFsbCBpdCBmcm9tIHlvdXIgZGlzdHJvcyBwYWNrYWdlIHJlcG9zaXRvcmllcyBvciBnZXQgaXQgaGVyZTpcbmh0dHBzOi8vZ2l0aHViLmNvbS9wdWxiL21haWxuYWdcblxuUGxlYXNlIGFsc28gbm90ZSB0aGF0IHRoaXMgdmVyc2lvbiBvZiB0aGUgZXh0ZW5zaW9uIGRvZXMgbm90IHN1cHBvcnQgYXZhdGFycyAoYXMgc2hvd24gaW4gdGhlIHNjcmVlbnNob3QpLlxuSWYgeW91IGxpa2UgdG8gaGF2ZSBhdmF0YXIgc3VwcG9ydCBpbnN0YWxsIHRoaXMgZXh0ZW5zaW9uIGZyb20geW91ciBkaXN0cm9zIHBhY2thZ2UgcmVwb3NpdG9yaWVzIG9yIGdldCBhIHBhY2thZ2UgZnJvbSBoZXJlOlxuaHR0cHM6Ly9naXRodWIuY29tL3B1bGIvbWFpbG5hZy1nbm9tZS1zaGVsbFxuXG5JTVBPUlRBTlQ6XG5JIGRvIG5vdCBnZXQgbm90aWZpY2F0aW9ucyBmb3IgdXNlciBjb21tZW50cy4gUGxlYXNlIGFsd2F5cyByZXBvcnQgYnVncyBoZXJlOlxuaHR0cHM6Ly9naXRodWIuY29tL3B1bGIvbWFpbG5hZy1nbm9tZS1zaGVsbC9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJtYWlsbmFnLWdub21lLXNoZWxsIiwKICAibmFtZSI6ICJNYWlsbmFnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1haWxuYWciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm1haWxuYWdAcHVsYi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}}} , {"uuid": "mmod-panel@mmogp.com", "name": "MMOD Panel", "pname": "mmod-panel", "description": "Upgrades the Topbar in Gnome3, creating a customizable panel and providing options for fine-tuning your Desktop Experience.\n\nFeatures include:\n▸ Set comfort levels to provide theme support and fine-tune the overall look and feel of the panel.\n▸ Set the location/position of the panel (bottom by default).\n▸ Add a button to the panel in place of the activities link, using an icon of your preference.\n▸ Auto-hide the panel when not active/in-focus (makes use of pressure/gesture for showing the panel).\n▸ Display and manage your favorites/running apps directly on the panel.\n▸ Move the date menu to the aggregate/tray area.\n▸ Access and manage your extension preferences directly from the aggregate menu.\n▸ Customize behavior of the overview and panel(hot-corners/animations/effects) to suit your preferences.\n▸ More to come soon!\n\nThis project is loosely based on the Panel Settings extension:\nhttps://github.com/eddiefullmetal/gnome-shell-extensions/tree/master/panelSettings%40eddiefullmetal.gr\n\nSadly, Panel Settings has not seen any maintenance in years, though this is why I decided to create MMOD Panel.\n\nI also took inspiration from the following Gnome extensions: System-Monitor, Taskbar, and DashToDock.\n\nFor those of you who are wondering, the theme used in the screen shot is the Zukitwo-Dark-Shell Shell Theme; \neverything else is default Gnome on Debian Buster. However, the author of the aforementioned shell theme has \nchanged the name for various reasons to Ciliora-Prima-Shell - which can be found here:\n\n http://gnome-look.org/content/show.php?content=165096\n\nFor Gnome-Shell: 3.10, 3.12, 3.12.2, 3.14, 3.14.4, 3.16, 3.16.2, 3.18, 3.20, 3.22, 3.24, 3.26, 3.26.2, 3.28, 3.30, 3.32, 3.34, 3.35, 3.35.91, 3.36, 3.36.3, 3.36.4, 3.36.6, 3.38, 3.38.2, 40.0, 40.5, 41.0 (since version 12.0.0) f\nRik \n\nGerman Translation(s) for MMOD-Panel courtesy of Jonius Zeidler \n\nSource Repository: https://gitlab.com/mmod/mmod-panel/\n", "link": "https://extensions.gnome.org/extension/898/mmod-panel/", "shell_version_map": {"38": {"version": "12", "sha256": "00sr6dcn7z5a8p9zq2xvvdac828m8f0akz3skb9sb9v8jay0m0hr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZ3JhZGVzIHRoZSBUb3BiYXIgaW4gR25vbWUzLCBjcmVhdGluZyBhIGN1c3RvbWl6YWJsZSBwYW5lbCBhbmQgcHJvdmlkaW5nIG9wdGlvbnMgZm9yIGZpbmUtdHVuaW5nIHlvdXIgRGVza3RvcCBFeHBlcmllbmNlLlxuXG5GZWF0dXJlcyBpbmNsdWRlOlxuXHUyNWI4IFNldCBjb21mb3J0IGxldmVscyB0byBwcm92aWRlIHRoZW1lIHN1cHBvcnQgYW5kIGZpbmUtdHVuZSB0aGUgb3ZlcmFsbCBsb29rIGFuZCBmZWVsIG9mIHRoZSBwYW5lbC5cblx1MjViOCBTZXQgdGhlIGxvY2F0aW9uL3Bvc2l0aW9uIG9mIHRoZSBwYW5lbCAoYm90dG9tIGJ5IGRlZmF1bHQpLlxuXHUyNWI4IEFkZCBhIGJ1dHRvbiB0byB0aGUgcGFuZWwgaW4gcGxhY2Ugb2YgdGhlIGFjdGl2aXRpZXMgbGluaywgdXNpbmcgYW4gaWNvbiBvZiB5b3VyIHByZWZlcmVuY2UuXG5cdTI1YjggQXV0by1oaWRlIHRoZSBwYW5lbCB3aGVuIG5vdCBhY3RpdmUvaW4tZm9jdXMgKG1ha2VzIHVzZSBvZiBwcmVzc3VyZS9nZXN0dXJlIGZvciBzaG93aW5nIHRoZSBwYW5lbCkuXG5cdTI1YjggRGlzcGxheSBhbmQgbWFuYWdlIHlvdXIgZmF2b3JpdGVzL3J1bm5pbmcgYXBwcyBkaXJlY3RseSBvbiB0aGUgcGFuZWwuXG5cdTI1YjggTW92ZSB0aGUgZGF0ZSBtZW51IHRvIHRoZSBhZ2dyZWdhdGUvdHJheSBhcmVhLlxuXHUyNWI4IEFjY2VzcyBhbmQgbWFuYWdlIHlvdXIgZXh0ZW5zaW9uIHByZWZlcmVuY2VzIGRpcmVjdGx5IGZyb20gdGhlIGFnZ3JlZ2F0ZSBtZW51LlxuXHUyNWI4IEN1c3RvbWl6ZSBiZWhhdmlvciBvZiB0aGUgb3ZlcnZpZXcgYW5kIHBhbmVsKGhvdC1jb3JuZXJzL2FuaW1hdGlvbnMvZWZmZWN0cykgdG8gc3VpdCB5b3VyIHByZWZlcmVuY2VzLlxuXHUyNWI4IE1vcmUgdG8gY29tZSBzb29uIVxuXG5UaGlzIHByb2plY3QgaXMgbG9vc2VseSBiYXNlZCBvbiB0aGUgUGFuZWwgU2V0dGluZ3MgZXh0ZW5zaW9uOlxuaHR0cHM6Ly9naXRodWIuY29tL2VkZGllZnVsbG1ldGFsL2dub21lLXNoZWxsLWV4dGVuc2lvbnMvdHJlZS9tYXN0ZXIvcGFuZWxTZXR0aW5ncyU0MGVkZGllZnVsbG1ldGFsLmdyXG5cblNhZGx5LCBQYW5lbCBTZXR0aW5ncyBoYXMgbm90IHNlZW4gYW55IG1haW50ZW5hbmNlIGluIHllYXJzLCB0aG91Z2ggdGhpcyBpcyB3aHkgSSBkZWNpZGVkIHRvIGNyZWF0ZSBNTU9EIFBhbmVsLlxuXG5JIGFsc28gdG9vayBpbnNwaXJhdGlvbiBmcm9tIHRoZSBmb2xsb3dpbmcgR25vbWUgZXh0ZW5zaW9uczogU3lzdGVtLU1vbml0b3IsIFRhc2tiYXIsIGFuZCBEYXNoVG9Eb2NrLlxuXG5Gb3IgdGhvc2Ugb2YgeW91IHdobyBhcmUgd29uZGVyaW5nLCB0aGUgdGhlbWUgdXNlZCBpbiB0aGUgc2NyZWVuIHNob3QgaXMgdGhlIFp1a2l0d28tRGFyay1TaGVsbCBTaGVsbCBUaGVtZTsgXG5ldmVyeXRoaW5nIGVsc2UgaXMgZGVmYXVsdCBHbm9tZSBvbiBEZWJpYW4gQnVzdGVyLiBIb3dldmVyLCB0aGUgYXV0aG9yIG9mIHRoZSBhZm9yZW1lbnRpb25lZCBzaGVsbCB0aGVtZSBoYXMgXG5jaGFuZ2VkIHRoZSBuYW1lIGZvciB2YXJpb3VzIHJlYXNvbnMgdG8gQ2lsaW9yYS1QcmltYS1TaGVsbCAtIHdoaWNoIGNhbiBiZSBmb3VuZCBoZXJlOlxuXG4gIGh0dHA6Ly9nbm9tZS1sb29rLm9yZy9jb250ZW50L3Nob3cucGhwP2NvbnRlbnQ9MTY1MDk2XG5cbkZvciBHbm9tZS1TaGVsbDogMy4xMCwgMy4xMiwgMy4xMi4yLCAzLjE0LCAzLjE0LjQsIDMuMTYsIDMuMTYuMiwgMy4xOCwgMy4yMCwgMy4yMiwgMy4yNCwgMy4yNiwgMy4yNi4yLCAzLjI4LCAzLjMwLCAzLjMyLCAzLjM0LCAzLjM1LCAzLjM1LjkxLCAzLjM2LCAzLjM2LjMsIDMuMzYuNCwgMy4zNi42LCAzLjM4LCAzLjM4LjIsIDQwLjAsIDQwLjUsIDQxLjAgKHNpbmNlIHZlcnNpb24gMTIuMC4wKSBmXG5SaWsgPHJpa0BtbW9kLmNvPlxuXG5HZXJtYW4gVHJhbnNsYXRpb24ocykgZm9yIE1NT0QtUGFuZWwgY291cnRlc3kgb2YgSm9uaXVzIFplaWRsZXIgPGpvbmF0YW5femVpZGxlckBnbXguZGU+XG5cblNvdXJjZSBSZXBvc2l0b3J5OiBodHRwczovL2dpdGxhYi5jb20vbW1vZC9tbW9kLXBhbmVsL1xuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibW1vZC1wYW5lbCIsCiAgIm5hbWUiOiAiTU1PRCBQYW5lbCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJyaWtAbW1vZC5jbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiMy4zNi4zIiwKICAgICIzLjM2LjQiLAogICAgIjMuMzYuNiIsCiAgICAiMy4zOC4yIiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0MC41IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbW1vZC9tbW9kLXBhbmVsLyIsCiAgInV1aWQiOiAibW1vZC1wYW5lbEBtbW9ncC5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "40": {"version": "12", "sha256": "00sr6dcn7z5a8p9zq2xvvdac828m8f0akz3skb9sb9v8jay0m0hr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZ3JhZGVzIHRoZSBUb3BiYXIgaW4gR25vbWUzLCBjcmVhdGluZyBhIGN1c3RvbWl6YWJsZSBwYW5lbCBhbmQgcHJvdmlkaW5nIG9wdGlvbnMgZm9yIGZpbmUtdHVuaW5nIHlvdXIgRGVza3RvcCBFeHBlcmllbmNlLlxuXG5GZWF0dXJlcyBpbmNsdWRlOlxuXHUyNWI4IFNldCBjb21mb3J0IGxldmVscyB0byBwcm92aWRlIHRoZW1lIHN1cHBvcnQgYW5kIGZpbmUtdHVuZSB0aGUgb3ZlcmFsbCBsb29rIGFuZCBmZWVsIG9mIHRoZSBwYW5lbC5cblx1MjViOCBTZXQgdGhlIGxvY2F0aW9uL3Bvc2l0aW9uIG9mIHRoZSBwYW5lbCAoYm90dG9tIGJ5IGRlZmF1bHQpLlxuXHUyNWI4IEFkZCBhIGJ1dHRvbiB0byB0aGUgcGFuZWwgaW4gcGxhY2Ugb2YgdGhlIGFjdGl2aXRpZXMgbGluaywgdXNpbmcgYW4gaWNvbiBvZiB5b3VyIHByZWZlcmVuY2UuXG5cdTI1YjggQXV0by1oaWRlIHRoZSBwYW5lbCB3aGVuIG5vdCBhY3RpdmUvaW4tZm9jdXMgKG1ha2VzIHVzZSBvZiBwcmVzc3VyZS9nZXN0dXJlIGZvciBzaG93aW5nIHRoZSBwYW5lbCkuXG5cdTI1YjggRGlzcGxheSBhbmQgbWFuYWdlIHlvdXIgZmF2b3JpdGVzL3J1bm5pbmcgYXBwcyBkaXJlY3RseSBvbiB0aGUgcGFuZWwuXG5cdTI1YjggTW92ZSB0aGUgZGF0ZSBtZW51IHRvIHRoZSBhZ2dyZWdhdGUvdHJheSBhcmVhLlxuXHUyNWI4IEFjY2VzcyBhbmQgbWFuYWdlIHlvdXIgZXh0ZW5zaW9uIHByZWZlcmVuY2VzIGRpcmVjdGx5IGZyb20gdGhlIGFnZ3JlZ2F0ZSBtZW51LlxuXHUyNWI4IEN1c3RvbWl6ZSBiZWhhdmlvciBvZiB0aGUgb3ZlcnZpZXcgYW5kIHBhbmVsKGhvdC1jb3JuZXJzL2FuaW1hdGlvbnMvZWZmZWN0cykgdG8gc3VpdCB5b3VyIHByZWZlcmVuY2VzLlxuXHUyNWI4IE1vcmUgdG8gY29tZSBzb29uIVxuXG5UaGlzIHByb2plY3QgaXMgbG9vc2VseSBiYXNlZCBvbiB0aGUgUGFuZWwgU2V0dGluZ3MgZXh0ZW5zaW9uOlxuaHR0cHM6Ly9naXRodWIuY29tL2VkZGllZnVsbG1ldGFsL2dub21lLXNoZWxsLWV4dGVuc2lvbnMvdHJlZS9tYXN0ZXIvcGFuZWxTZXR0aW5ncyU0MGVkZGllZnVsbG1ldGFsLmdyXG5cblNhZGx5LCBQYW5lbCBTZXR0aW5ncyBoYXMgbm90IHNlZW4gYW55IG1haW50ZW5hbmNlIGluIHllYXJzLCB0aG91Z2ggdGhpcyBpcyB3aHkgSSBkZWNpZGVkIHRvIGNyZWF0ZSBNTU9EIFBhbmVsLlxuXG5JIGFsc28gdG9vayBpbnNwaXJhdGlvbiBmcm9tIHRoZSBmb2xsb3dpbmcgR25vbWUgZXh0ZW5zaW9uczogU3lzdGVtLU1vbml0b3IsIFRhc2tiYXIsIGFuZCBEYXNoVG9Eb2NrLlxuXG5Gb3IgdGhvc2Ugb2YgeW91IHdobyBhcmUgd29uZGVyaW5nLCB0aGUgdGhlbWUgdXNlZCBpbiB0aGUgc2NyZWVuIHNob3QgaXMgdGhlIFp1a2l0d28tRGFyay1TaGVsbCBTaGVsbCBUaGVtZTsgXG5ldmVyeXRoaW5nIGVsc2UgaXMgZGVmYXVsdCBHbm9tZSBvbiBEZWJpYW4gQnVzdGVyLiBIb3dldmVyLCB0aGUgYXV0aG9yIG9mIHRoZSBhZm9yZW1lbnRpb25lZCBzaGVsbCB0aGVtZSBoYXMgXG5jaGFuZ2VkIHRoZSBuYW1lIGZvciB2YXJpb3VzIHJlYXNvbnMgdG8gQ2lsaW9yYS1QcmltYS1TaGVsbCAtIHdoaWNoIGNhbiBiZSBmb3VuZCBoZXJlOlxuXG4gIGh0dHA6Ly9nbm9tZS1sb29rLm9yZy9jb250ZW50L3Nob3cucGhwP2NvbnRlbnQ9MTY1MDk2XG5cbkZvciBHbm9tZS1TaGVsbDogMy4xMCwgMy4xMiwgMy4xMi4yLCAzLjE0LCAzLjE0LjQsIDMuMTYsIDMuMTYuMiwgMy4xOCwgMy4yMCwgMy4yMiwgMy4yNCwgMy4yNiwgMy4yNi4yLCAzLjI4LCAzLjMwLCAzLjMyLCAzLjM0LCAzLjM1LCAzLjM1LjkxLCAzLjM2LCAzLjM2LjMsIDMuMzYuNCwgMy4zNi42LCAzLjM4LCAzLjM4LjIsIDQwLjAsIDQwLjUsIDQxLjAgKHNpbmNlIHZlcnNpb24gMTIuMC4wKSBmXG5SaWsgPHJpa0BtbW9kLmNvPlxuXG5HZXJtYW4gVHJhbnNsYXRpb24ocykgZm9yIE1NT0QtUGFuZWwgY291cnRlc3kgb2YgSm9uaXVzIFplaWRsZXIgPGpvbmF0YW5femVpZGxlckBnbXguZGU+XG5cblNvdXJjZSBSZXBvc2l0b3J5OiBodHRwczovL2dpdGxhYi5jb20vbW1vZC9tbW9kLXBhbmVsL1xuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibW1vZC1wYW5lbCIsCiAgIm5hbWUiOiAiTU1PRCBQYW5lbCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJyaWtAbW1vZC5jbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiMy4zNi4zIiwKICAgICIzLjM2LjQiLAogICAgIjMuMzYuNiIsCiAgICAiMy4zOC4yIiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0MC41IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbW1vZC9tbW9kLXBhbmVsLyIsCiAgInV1aWQiOiAibW1vZC1wYW5lbEBtbW9ncC5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "00sr6dcn7z5a8p9zq2xvvdac828m8f0akz3skb9sb9v8jay0m0hr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZ3JhZGVzIHRoZSBUb3BiYXIgaW4gR25vbWUzLCBjcmVhdGluZyBhIGN1c3RvbWl6YWJsZSBwYW5lbCBhbmQgcHJvdmlkaW5nIG9wdGlvbnMgZm9yIGZpbmUtdHVuaW5nIHlvdXIgRGVza3RvcCBFeHBlcmllbmNlLlxuXG5GZWF0dXJlcyBpbmNsdWRlOlxuXHUyNWI4IFNldCBjb21mb3J0IGxldmVscyB0byBwcm92aWRlIHRoZW1lIHN1cHBvcnQgYW5kIGZpbmUtdHVuZSB0aGUgb3ZlcmFsbCBsb29rIGFuZCBmZWVsIG9mIHRoZSBwYW5lbC5cblx1MjViOCBTZXQgdGhlIGxvY2F0aW9uL3Bvc2l0aW9uIG9mIHRoZSBwYW5lbCAoYm90dG9tIGJ5IGRlZmF1bHQpLlxuXHUyNWI4IEFkZCBhIGJ1dHRvbiB0byB0aGUgcGFuZWwgaW4gcGxhY2Ugb2YgdGhlIGFjdGl2aXRpZXMgbGluaywgdXNpbmcgYW4gaWNvbiBvZiB5b3VyIHByZWZlcmVuY2UuXG5cdTI1YjggQXV0by1oaWRlIHRoZSBwYW5lbCB3aGVuIG5vdCBhY3RpdmUvaW4tZm9jdXMgKG1ha2VzIHVzZSBvZiBwcmVzc3VyZS9nZXN0dXJlIGZvciBzaG93aW5nIHRoZSBwYW5lbCkuXG5cdTI1YjggRGlzcGxheSBhbmQgbWFuYWdlIHlvdXIgZmF2b3JpdGVzL3J1bm5pbmcgYXBwcyBkaXJlY3RseSBvbiB0aGUgcGFuZWwuXG5cdTI1YjggTW92ZSB0aGUgZGF0ZSBtZW51IHRvIHRoZSBhZ2dyZWdhdGUvdHJheSBhcmVhLlxuXHUyNWI4IEFjY2VzcyBhbmQgbWFuYWdlIHlvdXIgZXh0ZW5zaW9uIHByZWZlcmVuY2VzIGRpcmVjdGx5IGZyb20gdGhlIGFnZ3JlZ2F0ZSBtZW51LlxuXHUyNWI4IEN1c3RvbWl6ZSBiZWhhdmlvciBvZiB0aGUgb3ZlcnZpZXcgYW5kIHBhbmVsKGhvdC1jb3JuZXJzL2FuaW1hdGlvbnMvZWZmZWN0cykgdG8gc3VpdCB5b3VyIHByZWZlcmVuY2VzLlxuXHUyNWI4IE1vcmUgdG8gY29tZSBzb29uIVxuXG5UaGlzIHByb2plY3QgaXMgbG9vc2VseSBiYXNlZCBvbiB0aGUgUGFuZWwgU2V0dGluZ3MgZXh0ZW5zaW9uOlxuaHR0cHM6Ly9naXRodWIuY29tL2VkZGllZnVsbG1ldGFsL2dub21lLXNoZWxsLWV4dGVuc2lvbnMvdHJlZS9tYXN0ZXIvcGFuZWxTZXR0aW5ncyU0MGVkZGllZnVsbG1ldGFsLmdyXG5cblNhZGx5LCBQYW5lbCBTZXR0aW5ncyBoYXMgbm90IHNlZW4gYW55IG1haW50ZW5hbmNlIGluIHllYXJzLCB0aG91Z2ggdGhpcyBpcyB3aHkgSSBkZWNpZGVkIHRvIGNyZWF0ZSBNTU9EIFBhbmVsLlxuXG5JIGFsc28gdG9vayBpbnNwaXJhdGlvbiBmcm9tIHRoZSBmb2xsb3dpbmcgR25vbWUgZXh0ZW5zaW9uczogU3lzdGVtLU1vbml0b3IsIFRhc2tiYXIsIGFuZCBEYXNoVG9Eb2NrLlxuXG5Gb3IgdGhvc2Ugb2YgeW91IHdobyBhcmUgd29uZGVyaW5nLCB0aGUgdGhlbWUgdXNlZCBpbiB0aGUgc2NyZWVuIHNob3QgaXMgdGhlIFp1a2l0d28tRGFyay1TaGVsbCBTaGVsbCBUaGVtZTsgXG5ldmVyeXRoaW5nIGVsc2UgaXMgZGVmYXVsdCBHbm9tZSBvbiBEZWJpYW4gQnVzdGVyLiBIb3dldmVyLCB0aGUgYXV0aG9yIG9mIHRoZSBhZm9yZW1lbnRpb25lZCBzaGVsbCB0aGVtZSBoYXMgXG5jaGFuZ2VkIHRoZSBuYW1lIGZvciB2YXJpb3VzIHJlYXNvbnMgdG8gQ2lsaW9yYS1QcmltYS1TaGVsbCAtIHdoaWNoIGNhbiBiZSBmb3VuZCBoZXJlOlxuXG4gIGh0dHA6Ly9nbm9tZS1sb29rLm9yZy9jb250ZW50L3Nob3cucGhwP2NvbnRlbnQ9MTY1MDk2XG5cbkZvciBHbm9tZS1TaGVsbDogMy4xMCwgMy4xMiwgMy4xMi4yLCAzLjE0LCAzLjE0LjQsIDMuMTYsIDMuMTYuMiwgMy4xOCwgMy4yMCwgMy4yMiwgMy4yNCwgMy4yNiwgMy4yNi4yLCAzLjI4LCAzLjMwLCAzLjMyLCAzLjM0LCAzLjM1LCAzLjM1LjkxLCAzLjM2LCAzLjM2LjMsIDMuMzYuNCwgMy4zNi42LCAzLjM4LCAzLjM4LjIsIDQwLjAsIDQwLjUsIDQxLjAgKHNpbmNlIHZlcnNpb24gMTIuMC4wKSBmXG5SaWsgPHJpa0BtbW9kLmNvPlxuXG5HZXJtYW4gVHJhbnNsYXRpb24ocykgZm9yIE1NT0QtUGFuZWwgY291cnRlc3kgb2YgSm9uaXVzIFplaWRsZXIgPGpvbmF0YW5femVpZGxlckBnbXguZGU+XG5cblNvdXJjZSBSZXBvc2l0b3J5OiBodHRwczovL2dpdGxhYi5jb20vbW1vZC9tbW9kLXBhbmVsL1xuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibW1vZC1wYW5lbCIsCiAgIm5hbWUiOiAiTU1PRCBQYW5lbCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJyaWtAbW1vZC5jbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiMy4zNi4zIiwKICAgICIzLjM2LjQiLAogICAgIjMuMzYuNiIsCiAgICAiMy4zOC4yIiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0MC41IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbW1vZC9tbW9kLXBhbmVsLyIsCiAgInV1aWQiOiAibW1vZC1wYW5lbEBtbW9ncC5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} , {"uuid": "modern-calc@kaer", "name": "Modern Calc", "pname": "modern-calc", "description": "A full featured calculator for gnome-shell.", "link": "https://extensions.gnome.org/extension/900/modern-calc/", "shell_version_map": {"38": {"version": "11", "sha256": "0f0fmldcr8ywghp8w61wvi2qb29yc82xmgkqb7khj14zgv4l6apw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbCBmZWF0dXJlZCBjYWxjdWxhdG9yIGZvciBnbm9tZS1zaGVsbC4iLAogICJuYW1lIjogIk1vZGVybiBDYWxjIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkthZXIgKHRoZS50aGluLmtpbmcud2F5KzIwMTRAZ21haWwuY29tKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tb2Rlcm4tY2FsYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1vZGVybi1jYWxjIiwKICAidXVpZCI6ICJtb2Rlcm4tY2FsY0BrYWVyIiwKICAidmVyc2lvbiI6IDExCn0="}}} @@ -87,17 +87,18 @@ , {"uuid": "synaptic-button@fthx", "name": "Synaptic Button", "pname": "synaptic-button", "description": "Button that directly starts Synaptic package manager.\n\n For snap management without Snap Store, consider Snap Manager extension.", "link": "https://extensions.gnome.org/extension/938/synaptic-button/", "shell_version_map": {"38": {"version": "4", "sha256": "0wdi35qz5rxs4fvcxlrvlyslrspsgfkryvh0na9vakbvhpmv7skv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiB0aGF0IGRpcmVjdGx5IHN0YXJ0cyBTeW5hcHRpYyBwYWNrYWdlIG1hbmFnZXIuXG5cbiBGb3Igc25hcCBtYW5hZ2VtZW50IHdpdGhvdXQgU25hcCBTdG9yZSwgY29uc2lkZXIgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlN5bmFwdGljIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvc3luYXB0aWMtYnV0dG9uIiwKICAidXVpZCI6ICJzeW5hcHRpYy1idXR0b25AZnRoeCIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "workspace_scroll@squgeim.com.np", "name": "Workspace Scroll", "pname": "workspace-scroll", "description": "Just scroll anywhere in the top panel to change the workspace.", "link": "https://extensions.gnome.org/extension/943/workspace-scroll/", "shell_version_map": {"40": {"version": "6", "sha256": "0pglhzy81zh9wwcmh1ynygkghq64s948k9qaa9vr3k514bq8b8n0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2Nyb2xsIGFueXdoZXJlIGluIHRoZSB0b3AgcGFuZWwgdG8gY2hhbmdlIHRoZSB3b3Jrc3BhY2UuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU2Nyb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0MC4xMCIsCiAgICAiNDAuNSIsCiAgICAiNDAuMTEiLAogICAgIjQwLjkiLAogICAgIjQwLjgiLAogICAgIjQwLjciLAogICAgIjQwLjYiLAogICAgIjQwLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zcXVnZWltL1dvcmtzcGFjZS1TY3JvbGwiLAogICJ1dWlkIjogIndvcmtzcGFjZV9zY3JvbGxAc3F1Z2VpbS5jb20ubnAiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0pglhzy81zh9wwcmh1ynygkghq64s948k9qaa9vr3k514bq8b8n0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2Nyb2xsIGFueXdoZXJlIGluIHRoZSB0b3AgcGFuZWwgdG8gY2hhbmdlIHRoZSB3b3Jrc3BhY2UuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU2Nyb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0MC4xMCIsCiAgICAiNDAuNSIsCiAgICAiNDAuMTEiLAogICAgIjQwLjkiLAogICAgIjQwLjgiLAogICAgIjQwLjciLAogICAgIjQwLjYiLAogICAgIjQwLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zcXVnZWltL1dvcmtzcGFjZS1TY3JvbGwiLAogICJ1dWlkIjogIndvcmtzcGFjZV9zY3JvbGxAc3F1Z2VpbS5jb20ubnAiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "cpupower@mko-sl.de", "name": "CPU Power Manager", "pname": "cpu-power-manager", "description": "Manage your CPU's frequency scaling driver", "link": "https://extensions.gnome.org/extension/945/cpu-power-manager/", "shell_version_map": {"38": {"version": "26", "sha256": "0w4py02s4xw3acl6iy7bamkbzd728ha908pjg5h9hjivqfbipd90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB5b3VyIENQVSdzIGZyZXF1ZW5jeSBzY2FsaW5nIGRyaXZlciIsCiAgImxvY2FsZWRpciI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiQ1BVIFBvd2VyIE1hbmFnZXIiLAogICJzY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVpbnN0YXBlbC9jcHVwb3dlciIsCiAgInV1aWQiOiAiY3B1cG93ZXJAbWtvLXNsLmRlIiwKICAidmVyc2lvbiI6IDI2Cn0="}, "40": {"version": "26", "sha256": "0w4py02s4xw3acl6iy7bamkbzd728ha908pjg5h9hjivqfbipd90", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB5b3VyIENQVSdzIGZyZXF1ZW5jeSBzY2FsaW5nIGRyaXZlciIsCiAgImxvY2FsZWRpciI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiQ1BVIFBvd2VyIE1hbmFnZXIiLAogICJzY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVpbnN0YXBlbC9jcHVwb3dlciIsCiAgInV1aWQiOiAiY3B1cG93ZXJAbWtvLXNsLmRlIiwKICAidmVyc2lvbiI6IDI2Cn0="}}} -, {"uuid": "world_clock_lite@ailin.nemui", "name": "Panel World Clock (Lite)", "pname": "panel-world-clock-lite", "description": "A world clock for the panel\n\nInstall gnome-clocks to get started!\nHint: Eiðar has the same time as UTC\n\nGnome ≤3.14? https://extensions.gnome.org/extension/697/panel-world-clock/", "link": "https://extensions.gnome.org/extension/946/panel-world-clock-lite/", "shell_version_map": {"38": {"version": "11", "sha256": "0sg76mlvyy0m6yqv6qrmyizhjd54qp8knra3z0sna1xxg0i51d42", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCFcbkhpbnQ6IEVpXHUwMGYwYXIgaGFzIHRoZSBzYW1lIHRpbWUgYXMgVVRDXG5cbkdub21lIFx1MjI2NDMuMTQ/IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzY5Ny9wYW5lbC13b3JsZC1jbG9jay8iLAogICJuYW1lIjogIlBhbmVsIFdvcmxkIENsb2NrIChMaXRlKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3JsZC1jbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3JsZF9jbG9ja19saXRlQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "16", "sha256": "1yn28nhqkdpcr0s53wmxb4x9vnpbdz1mxaibkkdz5mnkzc9mz91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCFcbkhpbnQ6IEVpXHUwMGYwYXIgaGFzIHRoZSBzYW1lIHRpbWUgYXMgVVRDXG5cbkdub21lIFx1MjI2NDMuMTQ/IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzY5Ny9wYW5lbC13b3JsZC1jbG9jay8iLAogICJuYW1lIjogIlBhbmVsIFdvcmxkIENsb2NrIChMaXRlKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3JsZC1jbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIndvcmxkX2Nsb2NrX2xpdGVAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "1yn28nhqkdpcr0s53wmxb4x9vnpbdz1mxaibkkdz5mnkzc9mz91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCFcbkhpbnQ6IEVpXHUwMGYwYXIgaGFzIHRoZSBzYW1lIHRpbWUgYXMgVVRDXG5cbkdub21lIFx1MjI2NDMuMTQ/IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzY5Ny9wYW5lbC13b3JsZC1jbG9jay8iLAogICJuYW1lIjogIlBhbmVsIFdvcmxkIENsb2NrIChMaXRlKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3JsZC1jbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIndvcmxkX2Nsb2NrX2xpdGVAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} +, {"uuid": "world_clock_lite@ailin.nemui", "name": "Panel World Clock (Lite)", "pname": "panel-world-clock-lite", "description": "A world clock for the panel\n\nInstall gnome-clocks to get started! (Flatpak or Snap versions NOT supported) \n\nGnome ≤3.14? https://extensions.gnome.org/extension/697/panel-world-clock/", "link": "https://extensions.gnome.org/extension/946/panel-world-clock-lite/", "shell_version_map": {"38": {"version": "11", "sha256": "0a6347p8s9iw1007yc7vlm3hy399prfvqm28ziy8wb8wmj5xd9rn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIndvcmxkX2Nsb2NrX2xpdGVAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "17", "sha256": "1v1s3rcjava822dg4a6syx0apl77vsh7d6n44xy8nq7738s0v6pw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIndvcmxkX2Nsb2NrX2xpdGVAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "1v1s3rcjava822dg4a6syx0apl77vsh7d6n44xy8nq7738s0v6pw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIndvcmxkX2Nsb2NrX2xpdGVAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "42": {"version": "17", "sha256": "1v1s3rcjava822dg4a6syx0apl77vsh7d6n44xy8nq7738s0v6pw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIndvcmxkX2Nsb2NrX2xpdGVAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "dim-on-battery@nailfarmer.nailfarmer.com", "name": "Dim On Battery Power", "pname": "dim-on-battery-power", "description": "Automatically dims the screen when the machine is running on battery power.", "link": "https://extensions.gnome.org/extension/947/dim-on-battery-power/", "shell_version_map": {"38": {"version": "26", "sha256": "0nh8z4by722b9f11lk8akgwz1d8dm1v4r4129lbbvfm2qgg2f1mi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL25haWxmYXJtZXIvZ25vbWUtc2hlbGwtZGltLW9uLWJhdHRlcnktZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaW0tb24tYmF0dGVyeUBuYWlsZmFybWVyLm5haWxmYXJtZXIuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="}, "40": {"version": "26", "sha256": "0nh8z4by722b9f11lk8akgwz1d8dm1v4r4129lbbvfm2qgg2f1mi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL25haWxmYXJtZXIvZ25vbWUtc2hlbGwtZGltLW9uLWJhdHRlcnktZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaW0tb24tYmF0dGVyeUBuYWlsZmFybWVyLm5haWxmYXJtZXIuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="}, "41": {"version": "26", "sha256": "0nh8z4by722b9f11lk8akgwz1d8dm1v4r4129lbbvfm2qgg2f1mi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL25haWxmYXJtZXIvZ25vbWUtc2hlbGwtZGltLW9uLWJhdHRlcnktZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaW0tb24tYmF0dGVyeUBuYWlsZmFybWVyLm5haWxmYXJtZXIuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="}}} , {"uuid": "bottompanel@tmoer93", "name": "BottomPanel", "pname": "bottompanel", "description": "Moves the GNOME panel to the bottom of the screen\n\nSource here: https://github.com/Thoma5/gnome-shell-extension-bottompanel", "link": "https://extensions.gnome.org/extension/949/bottompanel/", "shell_version_map": {"38": {"version": "11", "sha256": "0r4z1pww6w8q0f7gzsmc363hd2178r40ifsppyigj67mwwik3mkq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSBHTk9NRSBwYW5lbCB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW5cblxuU291cmNlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9UaG9tYTUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWJvdHRvbXBhbmVsIiwKICAibmFtZSI6ICJCb3R0b21QYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJib3R0b21wYW5lbEB0bW9lcjkzIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "dejadup-backup@fthx", "name": "Déjà Dup Backup Button", "pname": "deja-dup-backup-button", "description": "Button that directly starts Déjà Dup backup, following Déjà Dup backup settings.\n\n It simply runs 'deja-dup --backup' and shows Déjà Dup window during backup.", "link": "https://extensions.gnome.org/extension/955/deja-dup-backup-button/", "shell_version_map": {"38": {"version": "7", "sha256": "1d5xl18297zlw6g6jqwvwf32yiiqbz7jqyb4pz691d8ngqvvlwpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiB0aGF0IGRpcmVjdGx5IHN0YXJ0cyBEXHUwMGU5alx1MDBlMCBEdXAgYmFja3VwLCBmb2xsb3dpbmcgRFx1MDBlOWpcdTAwZTAgRHVwIGJhY2t1cCBzZXR0aW5ncy5cblxuIEl0IHNpbXBseSBydW5zICdkZWphLWR1cCAtLWJhY2t1cCcgYW5kIHNob3dzIERcdTAwZTlqXHUwMGUwIER1cCB3aW5kb3cgZHVyaW5nIGJhY2t1cC4iLAogICJuYW1lIjogIkRcdTAwZTlqXHUwMGUwIER1cCBCYWNrdXAgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZGVqYWR1cC1iYWNrdXAiLAogICJ1dWlkIjogImRlamFkdXAtYmFja3VwQGZ0aHgiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "1d5xl18297zlw6g6jqwvwf32yiiqbz7jqyb4pz691d8ngqvvlwpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiB0aGF0IGRpcmVjdGx5IHN0YXJ0cyBEXHUwMGU5alx1MDBlMCBEdXAgYmFja3VwLCBmb2xsb3dpbmcgRFx1MDBlOWpcdTAwZTAgRHVwIGJhY2t1cCBzZXR0aW5ncy5cblxuIEl0IHNpbXBseSBydW5zICdkZWphLWR1cCAtLWJhY2t1cCcgYW5kIHNob3dzIERcdTAwZTlqXHUwMGUwIER1cCB3aW5kb3cgZHVyaW5nIGJhY2t1cC4iLAogICJuYW1lIjogIkRcdTAwZTlqXHUwMGUwIER1cCBCYWNrdXAgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZGVqYWR1cC1iYWNrdXAiLAogICJ1dWlkIjogImRlamFkdXAtYmFja3VwQGZ0aHgiLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "ISS_Above@mcepl.cepl.eu", "name": "ISS Above", "pname": "iss-above", "description": "Shows an icon when ISS is above you (+- 1000km)", "link": "https://extensions.gnome.org/extension/956/iss-above/", "shell_version_map": {"40": {"version": "4", "sha256": "00r5clklx8wbwdqyniz1lxf864jk71q7j36icq6jkp65v8av5cjn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGFuIGljb24gd2hlbiBJU1MgaXMgYWJvdmUgeW91ICgrLSAxMDAwa20pIiwKICAibmFtZSI6ICJJU1MgQWJvdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWNlcGwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLUlTU19BYm92ZS8iLAogICJ1dWlkIjogIklTU19BYm92ZUBtY2VwbC5jZXBsLmV1IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "switcher@landau.fi", "name": "Switcher", "pname": "switcher", "description": "Switch windows or launch applications quickly by typing\n\nUse the configured global hotkey (Super+w by default) to open a list of current windows. Type a part of the name or title of the application window you want to activate and hit enter or click on the item you wish to activate. You can use the arrow keys to navigate among the filtered selection and type several space separated search terms to filter further. If your search matches launchable apps, those are shown in the list too. Use Esc or click anywhere outside the switcher to cancel.\n\nYou can customize the look and feel and functionality in the preferences.", "link": "https://extensions.gnome.org/extension/973/switcher/", "shell_version_map": {"38": {"version": "32", "sha256": "188bfj4b0kslja757fc70xhjqj5blk2jcdjfd2pvm6g2cxslfjg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIGxhdW5jaCBhcHBsaWNhdGlvbnMgcXVpY2tseSBieSB0eXBpbmdcblxuVXNlIHRoZSBjb25maWd1cmVkIGdsb2JhbCBob3RrZXkgKFN1cGVyK3cgYnkgZGVmYXVsdCkgdG8gb3BlbiBhIGxpc3Qgb2YgY3VycmVudCB3aW5kb3dzLiBUeXBlIGEgcGFydCBvZiB0aGUgbmFtZSBvciB0aXRsZSBvZiB0aGUgYXBwbGljYXRpb24gd2luZG93IHlvdSB3YW50IHRvIGFjdGl2YXRlIGFuZCBoaXQgZW50ZXIgb3IgY2xpY2sgb24gdGhlIGl0ZW0geW91IHdpc2ggdG8gYWN0aXZhdGUuIFlvdSBjYW4gdXNlIHRoZSBhcnJvdyBrZXlzIHRvIG5hdmlnYXRlIGFtb25nIHRoZSBmaWx0ZXJlZCBzZWxlY3Rpb24gYW5kIHR5cGUgc2V2ZXJhbCBzcGFjZSBzZXBhcmF0ZWQgc2VhcmNoIHRlcm1zIHRvIGZpbHRlciBmdXJ0aGVyLiBJZiB5b3VyIHNlYXJjaCBtYXRjaGVzIGxhdW5jaGFibGUgYXBwcywgdGhvc2UgYXJlIHNob3duIGluIHRoZSBsaXN0IHRvby4gVXNlIEVzYyBvciBjbGljayBhbnl3aGVyZSBvdXRzaWRlIHRoZSBzd2l0Y2hlciB0byBjYW5jZWwuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBsb29rIGFuZCBmZWVsIGFuZCBmdW5jdGlvbmFsaXR5IGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJuYW1lIjogIlN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWVsbGFuZGF1L3N3aXRjaGVyIiwKICAidXVpZCI6ICJzd2l0Y2hlckBsYW5kYXUuZmkiLAogICJ2ZXJzaW9uIjogMzIKfQ=="}, "40": {"version": "33", "sha256": "1dk91bvmjqr4hrsldb6ikvrd6ihk5flbg8wfhfnmq4c18kynsv9i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIGxhdW5jaCBhcHBsaWNhdGlvbnMgcXVpY2tseSBieSB0eXBpbmdcblxuVXNlIHRoZSBjb25maWd1cmVkIGdsb2JhbCBob3RrZXkgKFN1cGVyK3cgYnkgZGVmYXVsdCkgdG8gb3BlbiBhIGxpc3Qgb2YgY3VycmVudCB3aW5kb3dzLiBUeXBlIGEgcGFydCBvZiB0aGUgbmFtZSBvciB0aXRsZSBvZiB0aGUgYXBwbGljYXRpb24gd2luZG93IHlvdSB3YW50IHRvIGFjdGl2YXRlIGFuZCBoaXQgZW50ZXIgb3IgY2xpY2sgb24gdGhlIGl0ZW0geW91IHdpc2ggdG8gYWN0aXZhdGUuIFlvdSBjYW4gdXNlIHRoZSBhcnJvdyBrZXlzIHRvIG5hdmlnYXRlIGFtb25nIHRoZSBmaWx0ZXJlZCBzZWxlY3Rpb24gYW5kIHR5cGUgc2V2ZXJhbCBzcGFjZSBzZXBhcmF0ZWQgc2VhcmNoIHRlcm1zIHRvIGZpbHRlciBmdXJ0aGVyLiBJZiB5b3VyIHNlYXJjaCBtYXRjaGVzIGxhdW5jaGFibGUgYXBwcywgdGhvc2UgYXJlIHNob3duIGluIHRoZSBsaXN0IHRvby4gVXNlIEVzYyBvciBjbGljayBhbnl3aGVyZSBvdXRzaWRlIHRoZSBzd2l0Y2hlciB0byBjYW5jZWwuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBsb29rIGFuZCBmZWVsIGFuZCBmdW5jdGlvbmFsaXR5IGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJuYW1lIjogIlN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmllbGxhbmRhdS9zd2l0Y2hlciIsCiAgInV1aWQiOiAic3dpdGNoZXJAbGFuZGF1LmZpIiwKICAidmVyc2lvbiI6IDMzCn0="}, "41": {"version": "34", "sha256": "1bgj8w7qlz4kv70k6rjmm5f5rygn2n5fp0rd29jj1wfm50hfvzg1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIGxhdW5jaCBhcHBsaWNhdGlvbnMgcXVpY2tseSBieSB0eXBpbmdcblxuVXNlIHRoZSBjb25maWd1cmVkIGdsb2JhbCBob3RrZXkgKFN1cGVyK3cgYnkgZGVmYXVsdCkgdG8gb3BlbiBhIGxpc3Qgb2YgY3VycmVudCB3aW5kb3dzLiBUeXBlIGEgcGFydCBvZiB0aGUgbmFtZSBvciB0aXRsZSBvZiB0aGUgYXBwbGljYXRpb24gd2luZG93IHlvdSB3YW50IHRvIGFjdGl2YXRlIGFuZCBoaXQgZW50ZXIgb3IgY2xpY2sgb24gdGhlIGl0ZW0geW91IHdpc2ggdG8gYWN0aXZhdGUuIFlvdSBjYW4gdXNlIHRoZSBhcnJvdyBrZXlzIHRvIG5hdmlnYXRlIGFtb25nIHRoZSBmaWx0ZXJlZCBzZWxlY3Rpb24gYW5kIHR5cGUgc2V2ZXJhbCBzcGFjZSBzZXBhcmF0ZWQgc2VhcmNoIHRlcm1zIHRvIGZpbHRlciBmdXJ0aGVyLiBJZiB5b3VyIHNlYXJjaCBtYXRjaGVzIGxhdW5jaGFibGUgYXBwcywgdGhvc2UgYXJlIHNob3duIGluIHRoZSBsaXN0IHRvby4gVXNlIEVzYyBvciBjbGljayBhbnl3aGVyZSBvdXRzaWRlIHRoZSBzd2l0Y2hlciB0byBjYW5jZWwuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBsb29rIGFuZCBmZWVsIGFuZCBmdW5jdGlvbmFsaXR5IGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJuYW1lIjogIlN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmllbGxhbmRhdS9zd2l0Y2hlciIsCiAgInV1aWQiOiAic3dpdGNoZXJAbGFuZGF1LmZpIiwKICAidmVyc2lvbiI6IDM0Cn0="}}} -, {"uuid": "keyboard_modifiers_status@sneetsher", "name": "Keyboard Modifiers Status", "pname": "keyboard-modifiers-status", "description": "Shows keyboard modifiers status. It's useful when sticky keys are active.", "link": "https://extensions.gnome.org/extension/975/keyboard-modifiers-status/", "shell_version_map": {"38": {"version": "12", "sha256": "0j4pcn7qkxnwhxshb9m1mh5zhr9hhh3xcjzsgn2csmw064nzb1g9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "0j4pcn7qkxnwhxshb9m1mh5zhr9hhh3xcjzsgn2csmw064nzb1g9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "0j4pcn7qkxnwhxshb9m1mh5zhr9hhh3xcjzsgn2csmw064nzb1g9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEyCn0="}}} -, {"uuid": "harddiskled@bijidroid.gmail.com", "name": "Harddisk LED", "pname": "harddisk-led", "description": "Show harddisk activity (IO speed read/write and LED). Click to change led size", "link": "https://extensions.gnome.org/extension/988/harddisk-led/", "shell_version_map": {"38": {"version": "25", "sha256": "012y9z4hj9iqm5k89g7z6q99agz94p6jdwr4bhw2nkv5balx0x4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IiwKICAgICI0OSIsCiAgICAiNTAiLAogICAgIjUxIiwKICAgICI1MiIsCiAgICAiNTMiLAogICAgIjU0IiwKICAgICI1NSIsCiAgICAiNTYiLAogICAgIjU3IiwKICAgICI1OCIsCiAgICAiNTkiLAogICAgIjYwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9oYXJkZGlza2xlZCIsCiAgInV1aWQiOiAiaGFyZGRpc2tsZWRAYmlqaWRyb2lkLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "40": {"version": "25", "sha256": "012y9z4hj9iqm5k89g7z6q99agz94p6jdwr4bhw2nkv5balx0x4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IiwKICAgICI0OSIsCiAgICAiNTAiLAogICAgIjUxIiwKICAgICI1MiIsCiAgICAiNTMiLAogICAgIjU0IiwKICAgICI1NSIsCiAgICAiNTYiLAogICAgIjU3IiwKICAgICI1OCIsCiAgICAiNTkiLAogICAgIjYwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9oYXJkZGlza2xlZCIsCiAgInV1aWQiOiAiaGFyZGRpc2tsZWRAYmlqaWRyb2lkLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "41": {"version": "25", "sha256": "012y9z4hj9iqm5k89g7z6q99agz94p6jdwr4bhw2nkv5balx0x4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IiwKICAgICI0OSIsCiAgICAiNTAiLAogICAgIjUxIiwKICAgICI1MiIsCiAgICAiNTMiLAogICAgIjU0IiwKICAgICI1NSIsCiAgICAiNTYiLAogICAgIjU3IiwKICAgICI1OCIsCiAgICAiNTkiLAogICAgIjYwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9oYXJkZGlza2xlZCIsCiAgInV1aWQiOiAiaGFyZGRpc2tsZWRAYmlqaWRyb2lkLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}}} +, {"uuid": "keyboard_modifiers_status@sneetsher", "name": "Keyboard Modifiers Status", "pname": "keyboard-modifiers-status", "description": "Shows keyboard modifiers status. It's useful when sticky keys are active.", "link": "https://extensions.gnome.org/extension/975/keyboard-modifiers-status/", "shell_version_map": {"38": {"version": "13", "sha256": "0wfwy67r53ilp96yig70nf75a4bxd7cmn8gbnqlpin8virv66kfh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "13", "sha256": "0wfwy67r53ilp96yig70nf75a4bxd7cmn8gbnqlpin8virv66kfh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "0wfwy67r53ilp96yig70nf75a4bxd7cmn8gbnqlpin8virv66kfh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc25lZXRzaGVyL0tleWJvYXJkLU1vZGlmaWVycy1TdGF0dXMiLAogICJ1dWlkIjogImtleWJvYXJkX21vZGlmaWVyc19zdGF0dXNAc25lZXRzaGVyIiwKICAidmVyc2lvbiI6IDEzCn0="}}} +, {"uuid": "harddiskled@bijidroid.gmail.com", "name": "Harddisk LED", "pname": "harddisk-led", "description": "Show harddisk activity (IO speed read/write and LED). Click to change modes", "link": "https://extensions.gnome.org/extension/988/harddisk-led/", "shell_version_map": {"38": {"version": "29", "sha256": "0yzvkbbkhzqlq6kdnfmfv9p7ypybmz6hyy6ksgya63ql084780j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBtb2RlcyIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL2hhcmRkaXNrbGVkIiwKICAidXVpZCI6ICJoYXJkZGlza2xlZEBiaWppZHJvaWQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "40": {"version": "29", "sha256": "0yzvkbbkhzqlq6kdnfmfv9p7ypybmz6hyy6ksgya63ql084780j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBtb2RlcyIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL2hhcmRkaXNrbGVkIiwKICAidXVpZCI6ICJoYXJkZGlza2xlZEBiaWppZHJvaWQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "41": {"version": "29", "sha256": "0yzvkbbkhzqlq6kdnfmfv9p7ypybmz6hyy6ksgya63ql084780j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBtb2RlcyIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL2hhcmRkaXNrbGVkIiwKICAidXVpZCI6ICJoYXJkZGlza2xlZEBiaWppZHJvaWQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI5Cn0="}, "42": {"version": "25", "sha256": "0gywazb991p8ngwhz9q4baifhhdi32ajxh82w9hr6y6437s8a1rs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBtb2RlcyIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IiwKICAgICI0OSIsCiAgICAiNTAiLAogICAgIjUxIiwKICAgICI1MiIsCiAgICAiNTMiLAogICAgIjU0IiwKICAgICI1NSIsCiAgICAiNTYiLAogICAgIjU3IiwKICAgICI1OCIsCiAgICAiNTkiLAogICAgIjYwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9oYXJkZGlza2xlZCIsCiAgInV1aWQiOiAiaGFyZGRpc2tsZWRAYmlqaWRyb2lkLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}}} , {"uuid": "syncthingicon@jay.strict@posteo.de", "name": "Syncthing Icon", "pname": "syncthing-icon", "description": "Display Syncthing Icon in Top Bar", "link": "https://extensions.gnome.org/extension/989/syncthing-icon/", "shell_version_map": {"40": {"version": "33", "sha256": "0lg2k9p033w9dff5g16xai9rvjmw85qvhrx17dw8f228nfm93fik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qYXlzdHJpY3Rvci9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nIiwKICAidXVpZCI6ICJzeW5jdGhpbmdpY29uQGpheS5zdHJpY3RAcG9zdGVvLmRlIiwKICAidmVyc2lvbiI6IDMzCn0="}, "41": {"version": "33", "sha256": "0lg2k9p033w9dff5g16xai9rvjmw85qvhrx17dw8f228nfm93fik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qYXlzdHJpY3Rvci9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nIiwKICAidXVpZCI6ICJzeW5jdGhpbmdpY29uQGpheS5zdHJpY3RAcG9zdGVvLmRlIiwKICAidmVyc2lvbiI6IDMzCn0="}}} , {"uuid": "window-search-provider@quelltexter.org", "name": "Window Search Provider", "pname": "window-search-provider", "description": "Provide active windows as search results in overview", "link": "https://extensions.gnome.org/extension/1001/window-search-provider/", "shell_version_map": {"38": {"version": "2", "sha256": "030s38akm3fw7nq9v4wfgzhw716b51l2z3szns0gcwc0gx5zpfjv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYWN0aXZlIHdpbmRvd3MgYXMgc2VhcmNoIHJlc3VsdHMgaW4gb3ZlcnZpZXciLAogICJuYW1lIjogIldpbmRvdyBTZWFyY2ggUHJvdmlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjMuNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rbG9yZW56L2dub21lLXNoZWxsLXdpbmRvdy1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogIndpbmRvdy1zZWFyY2gtcHJvdmlkZXJAcXVlbGx0ZXh0ZXIub3JnIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "windowIsReady_Remover@nunofarruca@gmail.com", "name": "Window Is Ready - Notification Remover", "pname": "window-is-ready-notification-remover", "description": "Removes window is ready Notification", "link": "https://extensions.gnome.org/extension/1007/window-is-ready-notification-remover/", "shell_version_map": {"38": {"version": "13", "sha256": "1wxhdbvra0sc22wja9pcrsj5q4ny4iy4d7axlqh7yvm00zp72f3g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL251bm9mYXJydWNhL1dpbmRvd0lzUmVhZHlfUmVtb3ZlciIsCiAgInV1aWQiOiAid2luZG93SXNSZWFkeV9SZW1vdmVyQG51bm9mYXJydWNhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "1wxhdbvra0sc22wja9pcrsj5q4ny4iy4d7axlqh7yvm00zp72f3g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL251bm9mYXJydWNhL1dpbmRvd0lzUmVhZHlfUmVtb3ZlciIsCiAgInV1aWQiOiAid2luZG93SXNSZWFkeV9SZW1vdmVyQG51bm9mYXJydWNhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "1wxhdbvra0sc22wja9pcrsj5q4ny4iy4d7axlqh7yvm00zp72f3g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgd2luZG93IGlzIHJlYWR5IE5vdGlmaWNhdGlvbiIsCiAgImxpY2Vuc2UiOiAiQXBhY2hlLTIuMCIsCiAgIm5hbWUiOiAiV2luZG93IElzIFJlYWR5IC0gTm90aWZpY2F0aW9uIFJlbW92ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL251bm9mYXJydWNhL1dpbmRvd0lzUmVhZHlfUmVtb3ZlciIsCiAgInV1aWQiOiAid2luZG93SXNSZWFkeV9SZW1vdmVyQG51bm9mYXJydWNhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} -, {"uuid": "arch-update@RaphaelRochet", "name": "Arch Linux Updates Indicator", "pname": "archlinux-updates-indicator", "description": "Update indicator for Arch Linux and GNOME Shell.\n** Note : you now need to install the package pacman-contrib to use the checkupdates script. **\n Can support AUR or other distros by changing command used to check for and apply updates.", "link": "https://extensions.gnome.org/extension/1010/archlinux-updates-indicator/", "shell_version_map": {"38": {"version": "39", "sha256": "15s0cs41h01kb8dx231ww06rxalmz7cr173z7pm9sfkvs2106dhl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy4iLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMSIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "40": {"version": "46", "sha256": "0kgl4q52s44fy8d0psq27yd78jx35y4dmw43yzcipx3c9yik7964", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy4iLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogNDYKfQ=="}, "41": {"version": "46", "sha256": "0kgl4q52s44fy8d0psq27yd78jx35y4dmw43yzcipx3c9yik7964", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy4iLAogICJuYW1lIjogIkFyY2ggTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogNDYKfQ=="}}} +, {"uuid": "arch-update@RaphaelRochet", "name": "Arch Linux Updates Indicator", "pname": "archlinux-updates-indicator", "description": "Update indicator for Arch Linux and GNOME Shell.\n** Note : you now need to install the package pacman-contrib to use the checkupdates script. **\n Can support AUR or other distros by changing command used to check for and apply updates.\n See README about Gnome42 Console", "link": "https://extensions.gnome.org/extension/1010/archlinux-updates-indicator/", "shell_version_map": {"38": {"version": "39", "sha256": "0cm66wacw6qpf0lpd38hnic1ydjg11za6pq1bprpm5r3sdl7bmhg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lNDIgQ29uc29sZSIsCiAgIm5hbWUiOiAiQXJjaCBMaW51eCBVcGRhdGVzIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4xIiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFwaGFlbFJvY2hldC9hcmNoLXVwZGF0ZSIsCiAgInV1aWQiOiAiYXJjaC11cGRhdGVAUmFwaGFlbFJvY2hldCIsCiAgInZlcnNpb24iOiAzOQp9"}, "40": {"version": "47", "sha256": "1c7fl0s2izqfw74fnnw44qrsd56l0vj51bd5lk9l3mfcxi6c2sk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lNDIgQ29uc29sZSIsCiAgIm5hbWUiOiAiQXJjaCBMaW51eCBVcGRhdGVzIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogNDcKfQ=="}, "41": {"version": "47", "sha256": "1c7fl0s2izqfw74fnnw44qrsd56l0vj51bd5lk9l3mfcxi6c2sk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lNDIgQ29uc29sZSIsCiAgIm5hbWUiOiAiQXJjaCBMaW51eCBVcGRhdGVzIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogNDcKfQ=="}, "42": {"version": "47", "sha256": "1c7fl0s2izqfw74fnnw44qrsd56l0vj51bd5lk9l3mfcxi6c2sk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEFyY2ggTGludXggYW5kIEdOT01FIFNoZWxsLlxuKiogTm90ZSA6IHlvdSBub3cgbmVlZCB0byBpbnN0YWxsIHRoZSBwYWNrYWdlIHBhY21hbi1jb250cmliIHRvIHVzZSB0aGUgY2hlY2t1cGRhdGVzIHNjcmlwdC4gKipcbiAgQ2FuIHN1cHBvcnQgQVVSIG9yIG90aGVyIGRpc3Ryb3MgYnkgY2hhbmdpbmcgY29tbWFuZCB1c2VkIHRvIGNoZWNrIGZvciBhbmQgYXBwbHkgdXBkYXRlcy5cbiBTZWUgUkVBRE1FIGFib3V0IEdub21lNDIgQ29uc29sZSIsCiAgIm5hbWUiOiAiQXJjaCBMaW51eCBVcGRhdGVzIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXJjaC11cGRhdGUiLAogICJ1dWlkIjogImFyY2gtdXBkYXRlQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogNDcKfQ=="}}} , {"uuid": "dynamic-panel-transparency@rockon999.github.io", "name": "Dynamic Panel Transparency", "pname": "dynamic-panel-transparency", "description": "Miss dynamic panel transparency in 3.32 and up? Try the original dynamic panel with much more customization! This extension will fade your top panel to nothingness when there are no maximized windows present! Never again will the panel be abruptly darkened.\n\nMay be incompatible with some extensions that make extensive changes to the panel.\n\nIf your theme isn't working correctly with this extension enable 'Remove Excessive Panel Styling' in the Background section of preferences. This particularly impacts the default *Ubuntu* theme!", "link": "https://extensions.gnome.org/extension/1011/dynamic-panel-transparency/", "shell_version_map": {"38": {"version": "34", "sha256": "10w5kvmspy4rp4jnwx0rj2crbdyi1lxv81vhi8zx490fhwgmlkvl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pc3MgZHluYW1pYyBwYW5lbCB0cmFuc3BhcmVuY3kgaW4gMy4zMiBhbmQgdXA/IFRyeSB0aGUgb3JpZ2luYWwgZHluYW1pYyBwYW5lbCB3aXRoIG11Y2ggbW9yZSBjdXN0b21pemF0aW9uISBUaGlzIGV4dGVuc2lvbiB3aWxsIGZhZGUgeW91ciB0b3AgcGFuZWwgdG8gbm90aGluZ25lc3Mgd2hlbiB0aGVyZSBhcmUgbm8gbWF4aW1pemVkIHdpbmRvd3MgcHJlc2VudCEgTmV2ZXIgYWdhaW4gd2lsbCB0aGUgcGFuZWwgYmUgYWJydXB0bHkgZGFya2VuZWQuXG5cbk1heSBiZSBpbmNvbXBhdGlibGUgd2l0aCBzb21lIGV4dGVuc2lvbnMgdGhhdCBtYWtlIGV4dGVuc2l2ZSBjaGFuZ2VzIHRvIHRoZSBwYW5lbC5cblxuSWYgeW91ciB0aGVtZSBpc24ndCB3b3JraW5nIGNvcnJlY3RseSB3aXRoIHRoaXMgZXh0ZW5zaW9uIGVuYWJsZSAnUmVtb3ZlIEV4Y2Vzc2l2ZSBQYW5lbCBTdHlsaW5nJyBpbiB0aGUgQmFja2dyb3VuZCBzZWN0aW9uIG9mIHByZWZlcmVuY2VzLiBUaGlzIHBhcnRpY3VsYXJseSBpbXBhY3RzIHRoZSBkZWZhdWx0ICpVYnVudHUqIHRoZW1lISIsCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5IiwKICAibmFtZSI6ICJEeW5hbWljIFBhbmVsIFRyYW5zcGFyZW5jeSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5keW5hbWljLXBhbmVsLXRyYW5zcGFyZW5jeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V3bHNoL2R5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5LyIsCiAgInV1aWQiOiAiZHluYW1pYy1wYW5lbC10cmFuc3BhcmVuY3lAcm9ja29uOTk5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzNAp9"}, "40": {"version": "35", "sha256": "1znc564xd7n4k2klfc0kkip6hmadqdsa50p0sq0717h407m9p0vx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pc3MgZHluYW1pYyBwYW5lbCB0cmFuc3BhcmVuY3kgaW4gMy4zMiBhbmQgdXA/IFRyeSB0aGUgb3JpZ2luYWwgZHluYW1pYyBwYW5lbCB3aXRoIG11Y2ggbW9yZSBjdXN0b21pemF0aW9uISBUaGlzIGV4dGVuc2lvbiB3aWxsIGZhZGUgeW91ciB0b3AgcGFuZWwgdG8gbm90aGluZ25lc3Mgd2hlbiB0aGVyZSBhcmUgbm8gbWF4aW1pemVkIHdpbmRvd3MgcHJlc2VudCEgTmV2ZXIgYWdhaW4gd2lsbCB0aGUgcGFuZWwgYmUgYWJydXB0bHkgZGFya2VuZWQuXG5cbk1heSBiZSBpbmNvbXBhdGlibGUgd2l0aCBzb21lIGV4dGVuc2lvbnMgdGhhdCBtYWtlIGV4dGVuc2l2ZSBjaGFuZ2VzIHRvIHRoZSBwYW5lbC5cblxuSWYgeW91ciB0aGVtZSBpc24ndCB3b3JraW5nIGNvcnJlY3RseSB3aXRoIHRoaXMgZXh0ZW5zaW9uIGVuYWJsZSAnUmVtb3ZlIEV4Y2Vzc2l2ZSBQYW5lbCBTdHlsaW5nJyBpbiB0aGUgQmFja2dyb3VuZCBzZWN0aW9uIG9mIHByZWZlcmVuY2VzLiBUaGlzIHBhcnRpY3VsYXJseSBpbXBhY3RzIHRoZSBkZWZhdWx0ICpVYnVudHUqIHRoZW1lISIsCiAgImdldHRleHQtZG9tYWluIjogImR5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5IiwKICAibmFtZSI6ICJEeW5hbWljIFBhbmVsIFRyYW5zcGFyZW5jeSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5keW5hbWljLXBhbmVsLXRyYW5zcGFyZW5jeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ld2xzaC9keW5hbWljLXBhbmVsLXRyYW5zcGFyZW5jeS8iLAogICJ1dWlkIjogImR5bmFtaWMtcGFuZWwtdHJhbnNwYXJlbmN5QHJvY2tvbjk5OS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} , {"uuid": "icinga-checker@sosulski.net", "name": "Icinga checker", "pname": "icinga-checker", "description": "Icinga/Nagios checker", "link": "https://extensions.gnome.org/extension/1029/icinga-checker/", "shell_version_map": {"38": {"version": "12", "sha256": "194vk0i02zvsxaxw9iq63xjhdld729vrq8wwbl6i0p89xp1mcqcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImljaW5nYS1jaGVja2VyQHNvc3Vsc2tpLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "194vk0i02zvsxaxw9iq63xjhdld729vrq8wwbl6i0p89xp1mcqcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImljaW5nYS1jaGVja2VyQHNvc3Vsc2tpLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "194vk0i02zvsxaxw9iq63xjhdld729vrq8wwbl6i0p89xp1mcqcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkljaW5nYS9OYWdpb3MgY2hlY2tlciIsCiAgImV4dGVuc2lvbi1pZCI6ICJpY2luZ2EtY2hlY2tlciIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIkljaW5nYSBjaGVja2VyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhd2VsQHNvc3Vsc2tpLm5ldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pY2luZ2EtY2hlY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImljaW5nYS1jaGVja2VyQHNvc3Vsc2tpLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "taskwhisperer-extension@infinicode.de", "name": "TaskWhisperer", "pname": "taskwhisperer", "description": "Taskwhisperer is a extension for TaskWarrior Application https://taskwarrior.org. It is to display upcoming tasks and task details as well as to create and modify them.\n", "link": "https://extensions.gnome.org/extension/1039/taskwhisperer/", "shell_version_map": {"38": {"version": "20", "sha256": "067z3j2px4rz5yspfjx2s6p5j4l1svxllclahnf3zmv1nlbhzq8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2t3aGlzcGVyZXIgaXMgYSBleHRlbnNpb24gZm9yIFRhc2tXYXJyaW9yIEFwcGxpY2F0aW9uIGh0dHBzOi8vdGFza3dhcnJpb3Iub3JnLiBJdCBpcyB0byBkaXNwbGF5IHVwY29taW5nIHRhc2tzIGFuZCB0YXNrIGRldGFpbHMgYXMgd2VsbCBhcyB0byBjcmVhdGUgYW5kIG1vZGlmeSB0aGVtLlxuIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUYXNrV2hpc3BlcmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMvdGFza3doaXNwZXJlciIsCiAgInV1aWQiOiAidGFza3doaXNwZXJlci1leHRlbnNpb25AaW5maW5pY29kZS5kZSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "20", "sha256": "067z3j2px4rz5yspfjx2s6p5j4l1svxllclahnf3zmv1nlbhzq8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2t3aGlzcGVyZXIgaXMgYSBleHRlbnNpb24gZm9yIFRhc2tXYXJyaW9yIEFwcGxpY2F0aW9uIGh0dHBzOi8vdGFza3dhcnJpb3Iub3JnLiBJdCBpcyB0byBkaXNwbGF5IHVwY29taW5nIHRhc2tzIGFuZCB0YXNrIGRldGFpbHMgYXMgd2VsbCBhcyB0byBjcmVhdGUgYW5kIG1vZGlmeSB0aGVtLlxuIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJUYXNrV2hpc3BlcmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMvdGFza3doaXNwZXJlciIsCiAgInV1aWQiOiAidGFza3doaXNwZXJlci1leHRlbnNpb25AaW5maW5pY29kZS5kZSIsCiAgInZlcnNpb24iOiAyMAp9"}}} @@ -110,17 +111,17 @@ , {"uuid": "applications-overview-tooltip@RaphaelRochet", "name": "Applications Overview Tooltip", "pname": "applications-overview-tooltip", "description": "Shows a tooltip over applications icons on applications overview with application name and/or description.", "link": "https://extensions.gnome.org/extension/1071/applications-overview-tooltip/", "shell_version_map": {"38": {"version": "11", "sha256": "0alvg0l46hls3jz3a5ic21fgbjbg0kv0nn0pkknzsgjfw5mmwz69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYXBoYWVsUm9jaGV0L2FwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwIiwKICAidXVpZCI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcEBSYXBoYWVsUm9jaGV0IiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "14", "sha256": "1vv5hvmg987vp8rdyvfff089h99m8xqrhyfbrgbipgy7862yf6lq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJ1dWlkIjogImFwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "1vv5hvmg987vp8rdyvfff089h99m8xqrhyfbrgbipgy7862yf6lq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhcGhhZWxSb2NoZXQvYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJ1dWlkIjogImFwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwQFJhcGhhZWxSb2NoZXQiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "TwitchLive_Panel@extensions.maweki.de", "name": "TwitchLive Panel", "pname": "twitchlive-panel", "description": "A panel showing whether your favorite Twitch.tv streamers are streaming.\n\nCycles through the online streamers if multiples are configured. Click on the panel and then on streamer's name to launch the stream with a custom command (your browser or some other application).\n\nNeeds curl and mogrify to fully support streamer logos. For an extension version compatible with shell version 3.30 or earlier visit our github page.", "link": "https://extensions.gnome.org/extension/1078/twitchlive-panel/", "shell_version_map": {"40": {"version": "37", "sha256": "0g1s5f3si8hlgf3m033c1c9fxydhs3wcykf4rr1pkzd54q6a8vq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcGFuZWwgc2hvd2luZyB3aGV0aGVyIHlvdXIgZmF2b3JpdGUgVHdpdGNoLnR2IHN0cmVhbWVycyBhcmUgc3RyZWFtaW5nLlxuXG5DeWNsZXMgdGhyb3VnaCB0aGUgb25saW5lIHN0cmVhbWVycyBpZiBtdWx0aXBsZXMgYXJlIGNvbmZpZ3VyZWQuIENsaWNrIG9uIHRoZSBwYW5lbCBhbmQgdGhlbiBvbiBzdHJlYW1lcidzIG5hbWUgdG8gbGF1bmNoIHRoZSBzdHJlYW0gd2l0aCBhIGN1c3RvbSBjb21tYW5kICh5b3VyIGJyb3dzZXIgb3Igc29tZSBvdGhlciBhcHBsaWNhdGlvbikuXG5cbk5lZWRzIGN1cmwgYW5kIG1vZ3JpZnkgdG8gZnVsbHkgc3VwcG9ydCBzdHJlYW1lciBsb2dvcy4gRm9yIGFuIGV4dGVuc2lvbiB2ZXJzaW9uIGNvbXBhdGlibGUgd2l0aCBzaGVsbCB2ZXJzaW9uIDMuMzAgb3IgZWFybGllciB2aXNpdCBvdXIgZ2l0aHViIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHdpdGNobGl2ZSIsCiAgIm5hbWUiOiAiVHdpdGNoTGl2ZSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2l0Y2hsaXZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXdla2kvdHdpdGNobGl2ZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlR3aXRjaExpdmVfUGFuZWxAZXh0ZW5zaW9ucy5tYXdla2kuZGUiLAogICJ2ZXJzaW9uIjogMzcKfQ=="}, "41": {"version": "37", "sha256": "0g1s5f3si8hlgf3m033c1c9fxydhs3wcykf4rr1pkzd54q6a8vq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcGFuZWwgc2hvd2luZyB3aGV0aGVyIHlvdXIgZmF2b3JpdGUgVHdpdGNoLnR2IHN0cmVhbWVycyBhcmUgc3RyZWFtaW5nLlxuXG5DeWNsZXMgdGhyb3VnaCB0aGUgb25saW5lIHN0cmVhbWVycyBpZiBtdWx0aXBsZXMgYXJlIGNvbmZpZ3VyZWQuIENsaWNrIG9uIHRoZSBwYW5lbCBhbmQgdGhlbiBvbiBzdHJlYW1lcidzIG5hbWUgdG8gbGF1bmNoIHRoZSBzdHJlYW0gd2l0aCBhIGN1c3RvbSBjb21tYW5kICh5b3VyIGJyb3dzZXIgb3Igc29tZSBvdGhlciBhcHBsaWNhdGlvbikuXG5cbk5lZWRzIGN1cmwgYW5kIG1vZ3JpZnkgdG8gZnVsbHkgc3VwcG9ydCBzdHJlYW1lciBsb2dvcy4gRm9yIGFuIGV4dGVuc2lvbiB2ZXJzaW9uIGNvbXBhdGlibGUgd2l0aCBzaGVsbCB2ZXJzaW9uIDMuMzAgb3IgZWFybGllciB2aXNpdCBvdXIgZ2l0aHViIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHdpdGNobGl2ZSIsCiAgIm5hbWUiOiAiVHdpdGNoTGl2ZSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2l0Y2hsaXZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXdla2kvdHdpdGNobGl2ZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlR3aXRjaExpdmVfUGFuZWxAZXh0ZW5zaW9ucy5tYXdla2kuZGUiLAogICJ2ZXJzaW9uIjogMzcKfQ=="}}} , {"uuid": "cpufreq@konkor", "name": "cpufreq", "pname": "cpufreq", "description": "System Monitor and Power Manager.\n\nThis is a lightweight system monitor and power management tool. It needs root permission to able changing governors.\n\nFeatures:\n⚫ Compatible with many hardware architectures;\n⚫ CPU Frequency monitoring;\n⚫ CPU Governor management;\n⚫ CPU Frequency speed limits;\n⚫ CPU Boost supporting;\n⚫ CPU Core Power on/off;\n⚫ Saving/Restoring settings...\n\nFor more information and how-to see README.md", "link": "https://extensions.gnome.org/extension/1082/cpufreq/", "shell_version_map": {"38": {"version": "51", "sha256": "1i6lwb82j21qx38gxy1rdv2bgn2rh6qf9hswasbf26g9k3ay3w1n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29ua29yL2NwdWZyZXEiLAogICJ1dWlkIjogImNwdWZyZXFAa29ua29yIiwKICAidmVyc2lvbiI6IDUxCn0="}, "40": {"version": "51", "sha256": "1i6lwb82j21qx38gxy1rdv2bgn2rh6qf9hswasbf26g9k3ay3w1n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29ua29yL2NwdWZyZXEiLAogICJ1dWlkIjogImNwdWZyZXFAa29ua29yIiwKICAidmVyc2lvbiI6IDUxCn0="}, "41": {"version": "51", "sha256": "1i6lwb82j21qx38gxy1rdv2bgn2rh6qf9hswasbf26g9k3ay3w1n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29ua29yL2NwdWZyZXEiLAogICJ1dWlkIjogImNwdWZyZXFAa29ua29yIiwKICAidmVyc2lvbiI6IDUxCn0="}}} -, {"uuid": "simplenetspeed@biji.extension", "name": "Simple net speed", "pname": "simple-net-speed", "description": "Simply showing network speed. Left click to change modes:\n\n1. Total net speed in bits per second\n2. Total net speed in Bytes per second\n3. Up & down speed in bits per second\n4. Up & down speed in Bytes per second\n5. Total of downloaded in Bytes (Right click to reset counter)\n\nMiddle click to change font size", "link": "https://extensions.gnome.org/extension/1085/simple-net-speed/", "shell_version_map": {"38": {"version": "23", "sha256": "16g6203q6d8il018rf8zhh6gziybpczc6r5v5289kz0i343bmkfj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL3NpbXBsZW5ldHNwZWVkIiwKICAidXVpZCI6ICJzaW1wbGVuZXRzcGVlZEBiaWppLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAyMwp9"}, "40": {"version": "23", "sha256": "16g6203q6d8il018rf8zhh6gziybpczc6r5v5289kz0i343bmkfj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL3NpbXBsZW5ldHNwZWVkIiwKICAidXVpZCI6ICJzaW1wbGVuZXRzcGVlZEBiaWppLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAyMwp9"}, "41": {"version": "23", "sha256": "16g6203q6d8il018rf8zhh6gziybpczc6r5v5289kz0i343bmkfj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL3NpbXBsZW5ldHNwZWVkIiwKICAidXVpZCI6ICJzaW1wbGVuZXRzcGVlZEBiaWppLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAyMwp9"}}} +, {"uuid": "simplenetspeed@biji.extension", "name": "Simple net speed", "pname": "simple-net-speed", "description": "Simply showing network speed. Left click to change modes:\n\n1. Total net speed in bits per second\n2. Total net speed in Bytes per second\n3. Up & down speed in bits per second\n4. Up & down speed in Bytes per second\n5. Total of downloaded in Bytes (Right click to reset counter)\n\nMiddle click to change font size", "link": "https://extensions.gnome.org/extension/1085/simple-net-speed/", "shell_version_map": {"38": {"version": "25", "sha256": "1lvz86mafjpsjwypy24py369wwf5pbrgqgx1yg9yiwxy9jzsqy9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL3NpbXBsZW5ldHNwZWVkIiwKICAidXVpZCI6ICJzaW1wbGVuZXRzcGVlZEBiaWppLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAyNQp9"}, "40": {"version": "25", "sha256": "1lvz86mafjpsjwypy24py369wwf5pbrgqgx1yg9yiwxy9jzsqy9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL3NpbXBsZW5ldHNwZWVkIiwKICAidXVpZCI6ICJzaW1wbGVuZXRzcGVlZEBiaWppLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAyNQp9"}, "41": {"version": "25", "sha256": "1lvz86mafjpsjwypy24py369wwf5pbrgqgx1yg9yiwxy9jzsqy9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iaWppL3NpbXBsZW5ldHNwZWVkIiwKICAidXVpZCI6ICJzaW1wbGVuZXRzcGVlZEBiaWppLmV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiAyNQp9"}, "42": {"version": "21", "sha256": "1zi8lc57zih2b98837lsms0msl9xhnmzng0facq3wr53g9ick4df", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIsCiAgICAiNDQiLAogICAgIjQ1IiwKICAgICI0NiIsCiAgICAiNDciLAogICAgIjQ4IiwKICAgICI0OSIsCiAgICAiNTAiLAogICAgIjUxIiwKICAgICI1MiIsCiAgICAiNTMiLAogICAgIjU0IiwKICAgICI1NSIsCiAgICAiNTYiLAogICAgIjU3IiwKICAgICI1OCIsCiAgICAiNTkiLAogICAgIjYwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9zaW1wbGVuZXRzcGVlZCIsCiAgInV1aWQiOiAic2ltcGxlbmV0c3BlZWRAYmlqaS5leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}}} , {"uuid": "gnome-shell-go-to-last-workspace@github.com", "name": "Go To Last Workspace", "pname": "go-to-last-workspace", "description": "Quickly toggle between two workspaces with one key", "link": "https://extensions.gnome.org/extension/1089/go-to-last-workspace/", "shell_version_map": {"38": {"version": "7", "sha256": "19jyrfhniz65xfrwzpph4i33mwpbfshy5bc79vxd5fy4qa0p6scp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmphbi9nbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2VAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "19jyrfhniz65xfrwzpph4i33mwpbfshy5bc79vxd5fy4qa0p6scp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcmphbi9nbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZ25vbWUtc2hlbGwtZ28tdG8tbGFzdC13b3Jrc3BhY2VAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "KeepAwake@jepfa.de", "name": "Keep awake!", "pname": "keep-awake", "description": "Keep your computer awake! Forbid your computer to activate sceensaver, turn off the screen or suspend when it is idle for a while. Click the indicator icon (in the taskbar) once to keep your computer awake for the session. Click again to enable persistance of this setting between restarts (indicated by a small lock icon on the indicator). Switch off by clicking again.", "link": "https://extensions.gnome.org/extension/1097/keep-awake/", "shell_version_map": {"38": {"version": "6", "sha256": "1lmwq4ng14jvpzd3fnwc8bilvyigya46d8il8m16g1596p3hikdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgRm9yYmlkIHlvdXIgY29tcHV0ZXIgdG8gYWN0aXZhdGUgc2NlZW5zYXZlciwgdHVybiBvZmYgdGhlIHNjcmVlbiBvciBzdXNwZW5kIHdoZW4gaXQgaXMgaWRsZSBmb3IgYSB3aGlsZS4gQ2xpY2sgdGhlIGluZGljYXRvciBpY29uIChpbiB0aGUgdGFza2Jhcikgb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBzZXNzaW9uLiBDbGljayBhZ2FpbiB0byBlbmFibGUgcGVyc2lzdGFuY2Ugb2YgdGhpcyBzZXR0aW5nIGJldHdlZW4gcmVzdGFydHMgKGluZGljYXRlZCBieSBhIHNtYWxsIGxvY2sgaWNvbiBvbiB0aGUgaW5kaWNhdG9yKS4gU3dpdGNoIG9mZiBieSBjbGlja2luZyBhZ2Fpbi4iLAogICJuYW1lIjogIktlZXAgYXdha2UhIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLktlZXBBd2FrZUBqZXBmYS5kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plbnNwZmFobC9LZWVwQXdha2UiLAogICJ1dWlkIjogIktlZXBBd2FrZUBqZXBmYS5kZSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "todolist@tomMoral.org", "name": "Section Todo List", "pname": "section-todo-list", "description": "Manage todo list with an applet\n\n* Add and remove task on your list in different sections.\n* Click an item to rename it.\n* Access the extension using Hot-Key (default: Ctrl+Space)\n", "link": "https://extensions.gnome.org/extension/1104/section-todo-list/", "shell_version_map": {"38": {"version": "11", "sha256": "02b5gccsx6ifgv2jyrniwagdf09jg7lvwzwlgm11qbrv7w7bn0qp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB0b2RvIGxpc3Qgd2l0aCBhbiBhcHBsZXRcblxuKiBBZGQgYW5kIHJlbW92ZSB0YXNrIG9uIHlvdXIgbGlzdCBpbiBkaWZmZXJlbnQgc2VjdGlvbnMuXG4qIENsaWNrIGFuIGl0ZW0gdG8gcmVuYW1lIGl0LlxuKiBBY2Nlc3MgdGhlIGV4dGVuc2lvbiB1c2luZyBIb3QtS2V5IChkZWZhdWx0OiBDdHJsK1NwYWNlKVxuIiwKICAibmFtZSI6ICJTZWN0aW9uIFRvZG8gTGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21Nb3JhbC9Ub0RvTGlzdCIsCiAgInV1aWQiOiAidG9kb2xpc3RAdG9tTW9yYWwub3JnIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "02b5gccsx6ifgv2jyrniwagdf09jg7lvwzwlgm11qbrv7w7bn0qp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB0b2RvIGxpc3Qgd2l0aCBhbiBhcHBsZXRcblxuKiBBZGQgYW5kIHJlbW92ZSB0YXNrIG9uIHlvdXIgbGlzdCBpbiBkaWZmZXJlbnQgc2VjdGlvbnMuXG4qIENsaWNrIGFuIGl0ZW0gdG8gcmVuYW1lIGl0LlxuKiBBY2Nlc3MgdGhlIGV4dGVuc2lvbiB1c2luZyBIb3QtS2V5IChkZWZhdWx0OiBDdHJsK1NwYWNlKVxuIiwKICAibmFtZSI6ICJTZWN0aW9uIFRvZG8gTGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21Nb3JhbC9Ub0RvTGlzdCIsCiAgInV1aWQiOiAidG9kb2xpc3RAdG9tTW9yYWwub3JnIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "add-username-toppanel@brendaw.com", "name": "Add Username to Top Panel", "pname": "add-username-to-top-panel", "description": "Simply add your username to topbar panel aggregate menu", "link": "https://extensions.gnome.org/extension/1108/add-username-to-top-panel/", "shell_version_map": {"38": {"version": "4", "sha256": "1b2p8924id4shzpvj58958r7j422ppkw7bsfmng9sq25k3w4xvb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgYWdncmVnYXRlIG1lbnUiLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QHByb3Rvbm1haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4yMC40IiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icmVuZGF3L2FkZC11c2VybmFtZS10b3BwYW5lbCIsCiAgInV1aWQiOiAiYWRkLXVzZXJuYW1lLXRvcHBhbmVsQGJyZW5kYXcuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "1b2p8924id4shzpvj58958r7j422ppkw7bsfmng9sq25k3w4xvb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgYWdncmVnYXRlIG1lbnUiLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QHByb3Rvbm1haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4yMC40IiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icmVuZGF3L2FkZC11c2VybmFtZS10b3BwYW5lbCIsCiAgInV1aWQiOiAiYWRkLXVzZXJuYW1lLXRvcHBhbmVsQGJyZW5kYXcuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1b2p8924id4shzpvj58958r7j422ppkw7bsfmng9sq25k3w4xvb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBhZGQgeW91ciB1c2VybmFtZSB0byB0b3BiYXIgcGFuZWwgYWdncmVnYXRlIG1lbnUiLAogICJuYW1lIjogIkFkZCBVc2VybmFtZSB0byBUb3AgUGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIndpbGxpYW1icmVuZGF3QHByb3Rvbm1haWwuY29tIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4yMC40IiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9icmVuZGF3L2FkZC11c2VybmFtZS10b3BwYW5lbCIsCiAgInV1aWQiOiAiYWRkLXVzZXJuYW1lLXRvcHBhbmVsQGJyZW5kYXcuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "Hide_Clock@grantmcwilliams.com", "name": "Hide Clock", "pname": "hide-clock", "description": "Hides the Gnome title bar clock. \nThis is useful for anyone recording their desktop as it allows you to edit the video without the titlebar clock jumping time.\nNow supports Gnome 40.", "link": "https://extensions.gnome.org/extension/1110/hide-clock/", "shell_version_map": {"38": {"version": "3", "sha256": "1niax4lw42nvp99wbxiydassgrzsx0pkkxrnbvim0n2b8bizg8rx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBHbm9tZSB0aXRsZSBiYXIgY2xvY2suIFxuVGhpcyBpcyB1c2VmdWwgZm9yIGFueW9uZSByZWNvcmRpbmcgdGhlaXIgZGVza3RvcCBhcyBpdCBhbGxvd3MgeW91IHRvIGVkaXQgdGhlIHZpZGVvIHdpdGhvdXQgdGhlIHRpdGxlYmFyIGNsb2NrIGp1bXBpbmcgdGltZS5cbk5vdyBzdXBwb3J0cyBHbm9tZSA0MC4iLAogICJuYW1lIjogIkhpZGUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkhpZGVfQ2xvY2tAZ3JhbnRtY3dpbGxpYW1zLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "1niax4lw42nvp99wbxiydassgrzsx0pkkxrnbvim0n2b8bizg8rx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBHbm9tZSB0aXRsZSBiYXIgY2xvY2suIFxuVGhpcyBpcyB1c2VmdWwgZm9yIGFueW9uZSByZWNvcmRpbmcgdGhlaXIgZGVza3RvcCBhcyBpdCBhbGxvd3MgeW91IHRvIGVkaXQgdGhlIHZpZGVvIHdpdGhvdXQgdGhlIHRpdGxlYmFyIGNsb2NrIGp1bXBpbmcgdGltZS5cbk5vdyBzdXBwb3J0cyBHbm9tZSA0MC4iLAogICJuYW1lIjogIkhpZGUgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkhpZGVfQ2xvY2tAZ3JhbnRtY3dpbGxpYW1zLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "gnome-shell-screenshot@ttll.de", "name": "Screenshot Tool", "pname": "screenshot-tool", "description": "Conveniently create, copy, store and upload screenshots. Please log out and log in again after updating.", "link": "https://extensions.gnome.org/extension/1112/screenshot-tool/", "shell_version_map": {"38": {"version": "56", "sha256": "1ga2ray64aq1d1vn0rsscfxjiidbiln3vx42rn9i4q2a59b00znq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY1NiIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLXNjcmVlbnNob3QvIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1zY3JlZW5zaG90QHR0bGwuZGUiLAogICJ2ZXJzaW9uIjogNTYKfQ=="}, "40": {"version": "65", "sha256": "0h8affn08zwzgr6zchr13ni6qbc2yj3sndxbpj4ib1c7yljdymx9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2NSIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtc2NyZWVuc2hvdC8iLAogICJ1dWlkIjogImdub21lLXNoZWxsLXNjcmVlbnNob3RAdHRsbC5kZSIsCiAgInZlcnNpb24iOiA2NQp9"}, "41": {"version": "65", "sha256": "0h8affn08zwzgr6zchr13ni6qbc2yj3sndxbpj4ib1c7yljdymx9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2NSIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtc2NyZWVuc2hvdC8iLAogICJ1dWlkIjogImdub21lLXNoZWxsLXNjcmVlbnNob3RAdHRsbC5kZSIsCiAgInZlcnNpb24iOiA2NQp9"}}} -, {"uuid": "nothing-to-say@extensions.gnome.wouter.bolsterl.ee", "name": "Nothing to say", "pname": "nothing-to-say", "description": "Unmute the microphone only when you have something to say.", "link": "https://extensions.gnome.org/extension/1113/nothing-to-say/", "shell_version_map": {"38": {"version": "8", "sha256": "12ngc4dv1ijbvihqn2rjn77bal0gdhdq4cxf1zv5lr2ckz0ishm4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "10", "sha256": "0jn8qd2x25bw2kmz82z4szgx1vm838zkq0wv18jw82bpf7b597k0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93Ym9sc3Rlci9ub3RoaW5nLXRvLXNheSIsCiAgInV1aWQiOiAibm90aGluZy10by1zYXlAZXh0ZW5zaW9ucy5nbm9tZS53b3V0ZXIuYm9sc3RlcmwuZWUiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "0jn8qd2x25bw2kmz82z4szgx1vm838zkq0wv18jw82bpf7b597k0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93Ym9sc3Rlci9ub3RoaW5nLXRvLXNheSIsCiAgInV1aWQiOiAibm90aGluZy10by1zYXlAZXh0ZW5zaW9ucy5nbm9tZS53b3V0ZXIuYm9sc3RlcmwuZWUiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} +, {"uuid": "Hide_Clock@grantmcwilliams.com", "name": "Hide Clock", "pname": "hide-clock", "description": "Hide title bar clock", "link": "https://extensions.gnome.org/extension/1110/hide-clock/", "shell_version_map": {"38": {"version": "4", "sha256": "0vxlc72gzin16xl5h6i0ixlmm6x9ahp3w3phyg0jk8b0q7qdflzq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGl0bGUgYmFyIGNsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiSGlkZV9DbG9ja0BncmFudG1jd2lsbGlhbXMuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0vxlc72gzin16xl5h6i0ixlmm6x9ahp3w3phyg0jk8b0q7qdflzq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGl0bGUgYmFyIGNsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiSGlkZV9DbG9ja0BncmFudG1jd2lsbGlhbXMuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0vxlc72gzin16xl5h6i0ixlmm6x9ahp3w3phyg0jk8b0q7qdflzq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGl0bGUgYmFyIGNsb2NrIiwKICAibmFtZSI6ICJIaWRlIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiSGlkZV9DbG9ja0BncmFudG1jd2lsbGlhbXMuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "gnome-shell-screenshot@ttll.de", "name": "Screenshot Tool", "pname": "screenshot-tool", "description": "Conveniently create, copy, store and upload screenshots. Please log out and log in again after updating.", "link": "https://extensions.gnome.org/extension/1112/screenshot-tool/", "shell_version_map": {"38": {"version": "56", "sha256": "1ga2ray64aq1d1vn0rsscfxjiidbiln3vx42rn9i4q2a59b00znq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY1NiIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLXNjcmVlbnNob3QvIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1zY3JlZW5zaG90QHR0bGwuZGUiLAogICJ2ZXJzaW9uIjogNTYKfQ=="}, "40": {"version": "66", "sha256": "1vy5649vznq9g2aarl61570f8fql1akv7pwwkzsa90z2f787b32k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2NiIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtc2NyZWVuc2hvdC8iLAogICJ1dWlkIjogImdub21lLXNoZWxsLXNjcmVlbnNob3RAdHRsbC5kZSIsCiAgInZlcnNpb24iOiA2Ngp9"}, "41": {"version": "66", "sha256": "1vy5649vznq9g2aarl61570f8fql1akv7pwwkzsa90z2f787b32k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlbmllbnRseSBjcmVhdGUsIGNvcHksIHN0b3JlIGFuZCB1cGxvYWQgc2NyZWVuc2hvdHMuIFBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4gYWZ0ZXIgdXBkYXRpbmcuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtc2NyZWVuc2hvdCIsCiAgImdpdC12ZXJzaW9uIjogInY2NiIsCiAgIm5hbWUiOiAiU2NyZWVuc2hvdCBUb29sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtc2NyZWVuc2hvdC8iLAogICJ1dWlkIjogImdub21lLXNoZWxsLXNjcmVlbnNob3RAdHRsbC5kZSIsCiAgInZlcnNpb24iOiA2Ngp9"}}} +, {"uuid": "nothing-to-say@extensions.gnome.wouter.bolsterl.ee", "name": "Nothing to say", "pname": "nothing-to-say", "description": "Unmute the microphone only when you have something to say.", "link": "https://extensions.gnome.org/extension/1113/nothing-to-say/", "shell_version_map": {"38": {"version": "8", "sha256": "12ngc4dv1ijbvihqn2rjn77bal0gdhdq4cxf1zv5lr2ckz0ishm4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2JvbHN0ZXIvbm90aGluZy10by1zYXkiLAogICJ1dWlkIjogIm5vdGhpbmctdG8tc2F5QGV4dGVuc2lvbnMuZ25vbWUud291dGVyLmJvbHN0ZXJsLmVlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "14", "sha256": "1rh7gbjhxpv63xg1v3jm0108zygycz8vb2jjjab46a4rkcd0xd0g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjMuMzYuOSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dib2xzdGVyL25vdGhpbmctdG8tc2F5IiwKICAidXVpZCI6ICJub3RoaW5nLXRvLXNheUBleHRlbnNpb25zLmdub21lLndvdXRlci5ib2xzdGVybC5lZSIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "1rh7gbjhxpv63xg1v3jm0108zygycz8vb2jjjab46a4rkcd0xd0g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubXV0ZSB0aGUgbWljcm9waG9uZSBvbmx5IHdoZW4geW91IGhhdmUgc29tZXRoaW5nIHRvIHNheS4iLAogICJuYW1lIjogIk5vdGhpbmcgdG8gc2F5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGhpbmctdG8tc2F5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjMuMzYuOSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dib2xzdGVyL25vdGhpbmctdG8tc2F5IiwKICAidXVpZCI6ICJub3RoaW5nLXRvLXNheUBleHRlbnNpb25zLmdub21lLndvdXRlci5ib2xzdGVybC5lZSIsCiAgInZlcnNpb24iOiAxNAp9"}}} , {"uuid": "workspace-switch-wraparound@theychx.org", "name": "Workspace Switch Wraparound", "pname": "workspace-switch-wraparound", "description": "When switching workspaces, going down from the bottom workspace switches to the top workspace. Likewise, up from the top workspace goes to the bottom workspace.", "link": "https://extensions.gnome.org/extension/1116/workspace-switch-wraparound/", "shell_version_map": {"38": {"version": "7", "sha256": "1zc92s0pffsd6mwsmpy8s8gici0q1wzd5s1vwjld4y1cy34kp2ad", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGV5Y2h4L1dvcmtzcGFjZVN3aXRjaGVyV3JhcEFyb3VuZCIsCiAgInV1aWQiOiAid29ya3NwYWNlLXN3aXRjaC13cmFwYXJvdW5kQHRoZXljaHgub3JnIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "1zc92s0pffsd6mwsmpy8s8gici0q1wzd5s1vwjld4y1cy34kp2ad", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldoZW4gc3dpdGNoaW5nIHdvcmtzcGFjZXMsIGdvaW5nIGRvd24gZnJvbSB0aGUgYm90dG9tIHdvcmtzcGFjZSBzd2l0Y2hlcyB0byB0aGUgdG9wIHdvcmtzcGFjZS4gTGlrZXdpc2UsIHVwIGZyb20gdGhlIHRvcCB3b3Jrc3BhY2UgZ29lcyB0byB0aGUgYm90dG9tIHdvcmtzcGFjZS4iLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2ggV3JhcGFyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aGV5Y2h4L1dvcmtzcGFjZVN3aXRjaGVyV3JhcEFyb3VuZCIsCiAgInV1aWQiOiAid29ya3NwYWNlLXN3aXRjaC13cmFwYXJvdW5kQHRoZXljaHgub3JnIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "ibus-font-setting@ibus.github.com", "name": "ibus font setting", "pname": "ibus-font-setting", "description": "use ibus font setting of ibus setup dialog to enhance the user experience", "link": "https://extensions.gnome.org/extension/1121/ibus-font-setting/", "shell_version_map": {"38": {"version": "9", "sha256": "163byvsc3dj2w9xq498py1xjziyi98icyki1cd6wv7vxaxfmk7y6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL3B3dS5mZWRvcmFwZW9wbGUub3JnL2lidXMvaWJ1cy1mb250LXNldHRpbmciLAogICJ1dWlkIjogImlidXMtZm9udC1zZXR0aW5nQGlidXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "11", "sha256": "0rgnv7bwqg30ly6zsmzs5sayi45k2ji5r87z4x32nni3wm7vhnhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vcHd1LmZlZG9yYXBlb3BsZS5vcmcvaWJ1cy9pYnVzLWZvbnQtc2V0dGluZyIsCiAgInV1aWQiOiAiaWJ1cy1mb250LXNldHRpbmdAaWJ1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "0rgnv7bwqg30ly6zsmzs5sayi45k2ji5r87z4x32nni3wm7vhnhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vcHd1LmZlZG9yYXBlb3BsZS5vcmcvaWJ1cy9pYnVzLWZvbnQtc2V0dGluZyIsCiAgInV1aWQiOiAiaWJ1cy1mb250LXNldHRpbmdAaWJ1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}}} -, {"uuid": "github.notifications@alexandre.dufournet.gmail.com", "name": "Github Notifications", "pname": "github-notifications", "description": "Integrate github's notifications within the gnome desktop environment\nSource code is available here: https://github.com/alexduf/gnome-github-notifications", "link": "https://extensions.gnome.org/extension/1125/github-notifications/", "shell_version_map": {"38": {"version": "17", "sha256": "0lj41ngk4kmkz94hn9bi51w8dbhzhxbb3kaza1h68lcvv2cis4sq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBnaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnaXRodWIubm90aWZpY2F0aW9uc0BhbGV4YW5kcmUuZHVmb3VybmV0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}}} +, {"uuid": "github.notifications@alexandre.dufournet.gmail.com", "name": "Github Notifications", "pname": "github-notifications", "description": "Integrate Github's notifications within the gnome desktop environment\nSource code is available here: https://github.com/alexduf/gnome-github-notifications", "link": "https://extensions.gnome.org/extension/1125/github-notifications/", "shell_version_map": {"38": {"version": "17", "sha256": "0ccgbllyak1lyp14ynsg17zngfpxkc5v5asv3zwwmpk44bl984ny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnaXRodWIubm90aWZpY2F0aW9uc0BhbGV4YW5kcmUuZHVmb3VybmV0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "40": {"version": "21", "sha256": "1j5ndicq5jgvf78lxrb2afbpfs10yc3ncc4v1dz1iqnv9kmhk132", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImdpdGh1Yi5ub3RpZmljYXRpb25zQGFsZXhhbmRyZS5kdWZvdXJuZXQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}, "41": {"version": "21", "sha256": "1j5ndicq5jgvf78lxrb2afbpfs10yc3ncc4v1dz1iqnv9kmhk132", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImdpdGh1Yi5ub3RpZmljYXRpb25zQGFsZXhhbmRyZS5kdWZvdXJuZXQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}}} , {"uuid": "desk-changer@eric.gach.gmail.com", "name": "Desk Changer", "pname": "desk-changer", "description": "Simple wallpaper changer with multiple profile support. Integrates into the shell by providing it's own panel icon. The daemon is written using gjs and runs independently of the extension as a background process.", "link": "https://extensions.gnome.org/extension/1131/desk-changer/", "shell_version_map": {"38": {"version": "23", "sha256": "1jwkavj1m6mf690mcyzidyrcv92yr3jk7bpy3ar1y3hm9zbvmpps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaWdFL2Rlc2stY2hhbmdlci8iLAogICJ1dWlkIjogImRlc2stY2hhbmdlckBlcmljLmdhY2guZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "40": {"version": "23", "sha256": "1jwkavj1m6mf690mcyzidyrcv92yr3jk7bpy3ar1y3hm9zbvmpps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaWdFL2Rlc2stY2hhbmdlci8iLAogICJ1dWlkIjogImRlc2stY2hhbmdlckBlcmljLmdhY2guZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "1jwkavj1m6mf690mcyzidyrcv92yr3jk7bpy3ar1y3hm9zbvmpps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaWdFL2Rlc2stY2hhbmdlci8iLAogICJ1dWlkIjogImRlc2stY2hhbmdlckBlcmljLmdhY2guZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}}} , {"uuid": "Shortcuts@kyle.aims.ac.za", "name": "Shortcuts", "pname": "shortcuts", "description": "This shows a pop-up of useful keyboard shortcuts when Super + S is pressed", "link": "https://extensions.gnome.org/extension/1144/shortcuts/", "shell_version_map": {"38": {"version": "10", "sha256": "04kpzrn692cgyv8w2x1c6lrrkpvn9kkafcs8bsji594agwyb4sc5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wYWRkYXRyYXBwZXIvc2hvcnRjdXRzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2hvcnRjdXRzQGt5bGUuYWltcy5hYy56YSIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "04kpzrn692cgyv8w2x1c6lrrkpvn9kkafcs8bsji594agwyb4sc5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wYWRkYXRyYXBwZXIvc2hvcnRjdXRzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2hvcnRjdXRzQGt5bGUuYWltcy5hYy56YSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "04kpzrn692cgyv8w2x1c6lrrkpvn9kkafcs8bsji594agwyb4sc5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wYWRkYXRyYXBwZXIvc2hvcnRjdXRzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2hvcnRjdXRzQGt5bGUuYWltcy5hYy56YSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "sensory-perception@HarlemSquirrel.github.io", "name": "Sensory Perception", "pname": "sensory-perception", "description": "Requires lm-sensors (or lm_sensors). Shows CPU temperature, disk temperature, video card temperature, voltage and fan RPM.", "link": "https://extensions.gnome.org/extension/1145/sensory-perception/", "shell_version_map": {"38": {"version": "13", "sha256": "16wc49khyk5arsis8kzpjgl6nl8gccc2y5sspq8rwnab22jnzwjh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFybGVtU3F1aXJyZWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlbnNvcnktcGVyY2VwdGlvbiIsCiAgInV1aWQiOiAic2Vuc29yeS1wZXJjZXB0aW9uQEhhcmxlbVNxdWlycmVsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "17", "sha256": "1565vy6wy0fjjbhxn90d8w4ifjb2adacijf71k18j7n390k00djw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJsZW1TcXVpcnJlbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAidXVpZCI6ICJzZW5zb3J5LXBlcmNlcHRpb25ASGFybGVtU3F1aXJyZWwuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "41": {"version": "17", "sha256": "1565vy6wy0fjjbhxn90d8w4ifjb2adacijf71k18j7n390k00djw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJsZW1TcXVpcnJlbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAidXVpZCI6ICJzZW5zb3J5LXBlcmNlcHRpb25ASGFybGVtU3F1aXJyZWwuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} @@ -128,17 +129,17 @@ , {"uuid": "shutdown-timer-gnome-shell-extension", "name": "ShutdownTimer", "pname": "shutdowntimer", "description": "Allows to shutdown, restart and suspend computer after selected amount of time or in selected time.", "link": "https://extensions.gnome.org/extension/1152/shutdowntimer/", "shell_version_map": {"40": {"version": "9", "sha256": "1y69lv3mq66xxfxabngnbb104d26i05cyhmx3dqf4kyf1kd6jqvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBzaHV0ZG93biwgcmVzdGFydCBhbmQgc3VzcGVuZCBjb21wdXRlciBhZnRlciBzZWxlY3RlZCBhbW91bnQgb2YgdGltZSBvciBpbiBzZWxlY3RlZCB0aW1lLiIsCiAgImdldHRleHQtZG9tYWluIjogIkF1dG9tYXRpY1NodXRkb3duVGltZXIiLAogICJuYW1lIjogIlNodXRkb3duVGltZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXV0b21hdGljLXNodXRkb3duLXRpbWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21rcmFqbmFrL3NodXRkb3duLXRpbWVyLWdub21lLXNoZWxsLWV4dGVuc2lvbi8iLAogICJ1dWlkIjogInNodXRkb3duLXRpbWVyLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "dash-to-panel@jderose9.github.com", "name": "Dash to Panel", "pname": "dash-to-panel", "description": "An icon taskbar for the Gnome Shell. This extension moves the dash into the gnome main panel so that the application launchers and system tray are combined into a single panel, similar to that found in KDE Plasma and Windows 7+. A separate dock is no longer needed for easy access to running and favorited applications.\n\nFor a more traditional experience, you may also want to use Tweak Tool to enable Windows > Titlebar Buttons > Minimize & Maximize.\n\nFor the best support, please report any issues on Github. Dash-to-panel is developed and maintained by @jderose9 and @charlesg99.", "link": "https://extensions.gnome.org/extension/1160/dash-to-panel/", "shell_version_map": {"38": {"version": "42", "sha256": "052adrf5dv1qfrpkp1wivp8a8vfi851japvx16gy779shfzq0n2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZGVyb3NlOS9kYXNoLXRvLXBhbmVsIiwKICAidXVpZCI6ICJkYXNoLXRvLXBhbmVsQGpkZXJvc2U5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "40": {"version": "44", "sha256": "0kjs01h1ncx9r56pfggw0psqpi1hm0p32bpq08inpzc2wr7ilyfs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRlcm9zZTkvZGFzaC10by1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC10by1wYW5lbEBqZGVyb3NlOS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}, "41": {"version": "45", "sha256": "1md7006ba93p1d6br2bf7qwkf5kbmmwphws0gnmpz18if2q8xd2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gdGFza2JhciBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBpbnRvIHRoZSBnbm9tZSBtYWluIHBhbmVsIHNvIHRoYXQgdGhlIGFwcGxpY2F0aW9uIGxhdW5jaGVycyBhbmQgc3lzdGVtIHRyYXkgYXJlIGNvbWJpbmVkIGludG8gYSBzaW5nbGUgcGFuZWwsIHNpbWlsYXIgdG8gdGhhdCBmb3VuZCBpbiBLREUgUGxhc21hIGFuZCBXaW5kb3dzIDcrLiBBIHNlcGFyYXRlIGRvY2sgaXMgbm8gbG9uZ2VyIG5lZWRlZCBmb3IgZWFzeSBhY2Nlc3MgdG8gcnVubmluZyBhbmQgZmF2b3JpdGVkIGFwcGxpY2F0aW9ucy5cblxuRm9yIGEgbW9yZSB0cmFkaXRpb25hbCBleHBlcmllbmNlLCB5b3UgbWF5IGFsc28gd2FudCB0byB1c2UgVHdlYWsgVG9vbCB0byBlbmFibGUgV2luZG93cyA+IFRpdGxlYmFyIEJ1dHRvbnMgPiBNaW5pbWl6ZSAmIE1heGltaXplLlxuXG5Gb3IgdGhlIGJlc3Qgc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIG9uIEdpdGh1Yi4gRGFzaC10by1wYW5lbCBpcyBkZXZlbG9wZWQgYW5kIG1haW50YWluZWQgYnkgQGpkZXJvc2U5IGFuZCBAY2hhcmxlc2c5OS4iLAogICJleHRlbnNpb24taWQiOiAiZGFzaC10by1wYW5lbCIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtdG8tcGFuZWwiLAogICJuYW1lIjogIkRhc2ggdG8gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRlcm9zZTkvZGFzaC10by1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC10by1wYW5lbEBqZGVyb3NlOS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQ1Cn0="}}} , {"uuid": "emoji-selector@maestroschan.fr", "name": "Emoji Selector", "pname": "emoji-selector", "description": "This extension provides a parametrable popup menu displaying most emojis, clicking on an emoji copies it to the clipboard. An appropriate font like 'Twitter Color Emoji' or 'JoyPixels Color' should be installed on your system for a better visual result.", "link": "https://extensions.gnome.org/extension/1162/emoji-selector/", "shell_version_map": {"38": {"version": "20", "sha256": "1i6py149m46xig5a0ry7y5v887nlzw644mw72gcr2hkfsn8b0gnd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHByb3ZpZGVzIGEgcGFyYW1ldHJhYmxlIHBvcHVwIG1lbnUgZGlzcGxheWluZyBtb3N0IGVtb2ppcywgY2xpY2tpbmcgb24gYW4gZW1vamkgY29waWVzIGl0IHRvIHRoZSBjbGlwYm9hcmQuIEFuIGFwcHJvcHJpYXRlIGZvbnQgbGlrZSAnVHdpdHRlciBDb2xvciBFbW9qaScgb3IgJ0pveVBpeGVscyBDb2xvcicgc2hvdWxkIGJlIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbSBmb3IgYSBiZXR0ZXIgdmlzdWFsIHJlc3VsdC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlbW9qaS1zZWxlY3RvciIsCiAgIm5hbWUiOiAiRW1vamkgU2VsZWN0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZW1vamktc2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovZW1vamktc2VsZWN0b3ItZm9yLWdub21lIiwKICAidXVpZCI6ICJlbW9qaS1zZWxlY3RvckBtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjAKfQ=="}}} -, {"uuid": "gnome-kinit@bonzini.gnu.org", "name": "Kerberos login", "pname": "kerberos-login", "description": "Provide a system menu item to renew Kerberos tickets", "link": "https://extensions.gnome.org/extension/1165/kerberos-login/", "shell_version_map": {"40": {"version": "4", "sha256": "12r1ydal7yxz8ybz1nbxpg51vsf6paqm6fsiy6bx3ndbqh98iiiw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyLjIiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnbm9tZS1raW5pdEBib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "12r1ydal7yxz8ybz1nbxpg51vsf6paqm6fsiy6bx3ndbqh98iiiw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyLjIiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnbm9tZS1raW5pdEBib256aW5pLmdudS5vcmciLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"uuid": "gnome-kinit@bonzini.gnu.org", "name": "Kerberos login", "pname": "kerberos-login", "description": "Provide a system menu item to renew Kerberos tickets", "link": "https://extensions.gnome.org/extension/1165/kerberos-login/", "shell_version_map": {"40": {"version": "5", "sha256": "08rp128drriv5929lwwv9yy77yhn1arfc6snwsipibaby0c5jvsf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyLjIiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZ25vbWUta2luaXRAYm9uemluaS5nbnUub3JnIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "08rp128drriv5929lwwv9yy77yhn1arfc6snwsipibaby0c5jvsf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyLjIiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZ25vbWUta2luaXRAYm9uemluaS5nbnUub3JnIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "08rp128drriv5929lwwv9yy77yhn1arfc6snwsipibaby0c5jvsf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYSBzeXN0ZW0gbWVudSBpdGVtIHRvIHJlbmV3IEtlcmJlcm9zIHRpY2tldHMiLAogICJuYW1lIjogIktlcmJlcm9zIGxvZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyLjIiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZ25vbWUta2luaXRAYm9uemluaS5nbnUub3JnIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "calculator-button@amivaleo", "name": "Calculator Button", "pname": "calculator-button", "description": "A button to easily open gnome-calculator.\n Credits to extensions.gnome.org/extension/939/display-button/\n\nv10:\n1 - added support for gnome 3.38\n2 - added support for flatpak version of gnome-calculator", "link": "https://extensions.gnome.org/extension/1168/calculator-button/", "shell_version_map": {"38": {"version": "10", "sha256": "1c6b53im6xj4yaf4skvchvgipxfjs2yh3i5r75cw9avnw7imnwk6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYnV0dG9uIHRvIGVhc2lseSBvcGVuIGdub21lLWNhbGN1bGF0b3IuXG4gQ3JlZGl0cyB0byBleHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vOTM5L2Rpc3BsYXktYnV0dG9uL1xuXG52MTA6XG4xIC0gYWRkZWQgc3VwcG9ydCBmb3IgZ25vbWUgMy4zOFxuMiAtIGFkZGVkIHN1cHBvcnQgZm9yIGZsYXRwYWsgdmVyc2lvbiBvZiBnbm9tZS1jYWxjdWxhdG9yIiwKICAibmFtZSI6ICJDYWxjdWxhdG9yIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaXZhbGVvL0NhbGN1bGF0b3ItQnV0dG9uIiwKICAidXVpZCI6ICJjYWxjdWxhdG9yLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "screenshotlocations.timur@linux.com", "name": "Screenshot Locations", "pname": "screenshot-locations", "description": "Change the default GNOME screenshot directory", "link": "https://extensions.gnome.org/extension/1179/screenshot-locations/", "shell_version_map": {"38": {"version": "7", "sha256": "0ymb4m8fgxgi964fdfdqwgjw95qbcm906zgqmyqxgd4ggip3mn47", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Rsb2NhdGlvbnMuZGF0YS5ncmVzb3VyY2UiLAogICJkZXNjcmlwdGlvbiI6ICJDaGFuZ2UgdGhlIGRlZmF1bHQgR05PTUUgc2NyZWVuc2hvdCBkaXJlY3RvcnkiLAogICJuYW1lIjogIlNjcmVlbnNob3QgTG9jYXRpb25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNjcmVlbnNob3Rsb2NhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vY29kZWJlcmcub3JnL2tpeXVpL2dub21lLXNoZWxsLXNjcmVlbnNob3Rsb2NhdGlvbnMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzY3JlZW5zaG90bG9jYXRpb25zLnRpbXVyQGxpbnV4LmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "8", "sha256": "0cxsq1zzmgn6q32wbdfw9hai62li92dwvwnzq2pdbskp9qm6v7nd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgZGVmYXVsdCBHTk9NRSBzY3JlZW5zaG90IGRpcmVjdG9yeSIsCiAgImdldHRleHQtZG9tYWluIjogInNjcmVlbnNob3Rsb2NhdGlvbnMudGltdXJAbGludXguY29tIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IExvY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW5zaG90bG9jYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9jb2RlYmVyZy5vcmcva2l5dWkvZ25vbWUtc2hlbGwtc2NyZWVuc2hvdGxvY2F0aW9ucy1leHRlbnNpb24iLAogICJ1dWlkIjogInNjcmVlbnNob3Rsb2NhdGlvbnMudGltdXJAbGludXguY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "utcclock@injcristianrojas.github.com", "name": "UTCClock", "pname": "utcclock", "description": "UTC clock for the top bar. For GNOME 40+", "link": "https://extensions.gnome.org/extension/1183/utcclock/", "shell_version_map": {"38": {"version": "24", "sha256": "1gmj8479a7yvxb3yh76yjs9n7bav3qp4fkr9hg7197qch0rirhlr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIuIEZvciBHTk9NRSA0MCsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL1VUQ0Nsb2NrIiwKICAidXVpZCI6ICJ1dGNjbG9ja0BpbmpjcmlzdGlhbnJvamFzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "40": {"version": "27", "sha256": "0jgrbsn2aqq5zxm553v16ydyzmbwa4ymqfr93mgz1br52clnjj2k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIuIEZvciBHTk9NRSA0MCsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2luamNyaXN0aWFucm9qYXMvVVRDQ2xvY2siLAogICJ1dWlkIjogInV0Y2Nsb2NrQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "0jgrbsn2aqq5zxm553v16ydyzmbwa4ymqfr93mgz1br52clnjj2k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIuIEZvciBHTk9NRSA0MCsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2luamNyaXN0aWFucm9qYXMvVVRDQ2xvY2siLAogICJ1dWlkIjogInV0Y2Nsb2NrQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}}} -, {"uuid": "show-desktop-button@amivaleo", "name": "Show Desktop Button", "pname": "show-desktop-button", "description": "Minimize/unminimize all open windows with a single click.", "link": "https://extensions.gnome.org/extension/1194/show-desktop-button/", "shell_version_map": {"38": {"version": "17", "sha256": "15cym2gka8g10bvprnxf6s0jbwchscw81fh9pvjybqmb9kc8ivvw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pdmFsZW8vU2hvdy1EZXNrdG9wLUJ1dHRvbiIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAxNwp9"}, "40": {"version": "20", "sha256": "0izr04779cl9yy8b6spjjxagp3il9pnxk77rsvk5wqdlkr4k0k3y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWl2YWxlby9TaG93LURlc2t0b3AtQnV0dG9uIiwKICAidXVpZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uQGFtaXZhbGVvIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "0izr04779cl9yy8b6spjjxagp3il9pnxk77rsvk5wqdlkr4k0k3y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWl2YWxlby9TaG93LURlc2t0b3AtQnV0dG9uIiwKICAidXVpZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uQGFtaXZhbGVvIiwKICAidmVyc2lvbiI6IDIwCn0="}}} +, {"uuid": "show-desktop-button@amivaleo", "name": "Show Desktop Button", "pname": "show-desktop-button", "description": "Minimize/unminimize all open windows with a single click.", "link": "https://extensions.gnome.org/extension/1194/show-desktop-button/", "shell_version_map": {"38": {"version": "17", "sha256": "15cym2gka8g10bvprnxf6s0jbwchscw81fh9pvjybqmb9kc8ivvw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pdmFsZW8vU2hvdy1EZXNrdG9wLUJ1dHRvbiIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAxNwp9"}, "40": {"version": "22", "sha256": "0qq16yhii9cbcp09cc1mw5a565nbw7bq5hb2jdgp9lnq2ym0c5rr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWl2YWxlby9TaG93LURlc2t0b3AtQnV0dG9uIiwKICAidXVpZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uQGFtaXZhbGVvIiwKICAidmVyc2lvbiI6IDIyCn0="}, "41": {"version": "22", "sha256": "0qq16yhii9cbcp09cc1mw5a565nbw7bq5hb2jdgp9lnq2ym0c5rr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWl2YWxlby9TaG93LURlc2t0b3AtQnV0dG9uIiwKICAidXVpZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uQGFtaXZhbGVvIiwKICAidmVyc2lvbiI6IDIyCn0="}}} , {"uuid": "walkpaper@walkpaper.blinkbp.github.com", "name": "Walkpaper", "pname": "walkpaper", "description": "Set different wallpaper for each workspace by having the wallpaper switch on workspace change.", "link": "https://extensions.gnome.org/extension/1200/walkpaper/", "shell_version_map": {"40": {"version": "9", "sha256": "1ckrf3y20wp3dv4aig44rycj7kbrxj14gh3rzs17vcqma3aw76bq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBkaWZmZXJlbnQgd2FsbHBhcGVyIGZvciBlYWNoIHdvcmtzcGFjZSBieSBoYXZpbmcgdGhlIHdhbGxwYXBlciBzd2l0Y2ggb24gd29ya3NwYWNlIGNoYW5nZS4iLAogICJleHRlbnNpb24taWQiOiAid2Fsa3BhcGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZW5nbGlzaCIsCiAgIm5hbWUiOiAiV2Fsa3BhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndhbGtwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmxpbmtCUC93YWxrcGFwZXIiLAogICJ1dWlkIjogIndhbGtwYXBlckB3YWxrcGFwZXIuYmxpbmticC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1ckrf3y20wp3dv4aig44rycj7kbrxj14gh3rzs17vcqma3aw76bq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBkaWZmZXJlbnQgd2FsbHBhcGVyIGZvciBlYWNoIHdvcmtzcGFjZSBieSBoYXZpbmcgdGhlIHdhbGxwYXBlciBzd2l0Y2ggb24gd29ya3NwYWNlIGNoYW5nZS4iLAogICJleHRlbnNpb24taWQiOiAid2Fsa3BhcGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZW5nbGlzaCIsCiAgIm5hbWUiOiAiV2Fsa3BhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndhbGtwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmxpbmtCUC93YWxrcGFwZXIiLAogICJ1dWlkIjogIndhbGtwYXBlckB3YWxrcGFwZXIuYmxpbmticC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "nasa_apod@elinvention.ovh", "name": "NASA APOD Wallpaper Changer", "pname": "nasa-apod", "description": "Change your wallpaper daily to the NASA's astronomy picture of the day", "link": "https://extensions.gnome.org/extension/1202/nasa-apod/", "shell_version_map": {"40": {"version": "31", "sha256": "1w3njadkxjnp6b2jsrfd46xla8hak0m2kipa9vii6wsy80czw59b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0VsaW52ZW50aW9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1uYXNhLWFwb2QiLAogICJ1dWlkIjogIm5hc2FfYXBvZEBlbGludmVudGlvbi5vdmgiLAogICJ2ZXJzaW9uIjogMzEKfQ=="}, "41": {"version": "31", "sha256": "1w3njadkxjnp6b2jsrfd46xla8hak0m2kipa9vii6wsy80czw59b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0VsaW52ZW50aW9uL2dub21lLXNoZWxsLWV4dGVuc2lvbi1uYXNhLWFwb2QiLAogICJ1dWlkIjogIm5hc2FfYXBvZEBlbGludmVudGlvbi5vdmgiLAogICJ2ZXJzaW9uIjogMzEKfQ=="}}} , {"uuid": "SystemMenu@jonnius.github.com", "name": "System Menu", "pname": "system-menu", "description": "System menu with usefull shortcuts", "link": "https://extensions.gnome.org/extension/1204/system-menu/", "shell_version_map": {"38": {"version": "5", "sha256": "10zfr3fhqvq0fxqjzqmnxmhmdw5xcw9m5k3jm1apcjqnm38r896w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBtZW51IHdpdGggdXNlZnVsbCBzaG9ydGN1dHMiLAogICJuYW1lIjogIlN5c3RlbSBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlN5c3RlbU1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL2pvbm5pdXMvZ25vbWUtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogIlN5c3RlbU1lbnVAam9ubml1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "undecorate@sun.wxg@gmail.com", "name": "Undecorate Window", "pname": "undecorate", "description": "Add undecorate item in window menu. Use ALT+Space to show window menu.", "link": "https://extensions.gnome.org/extension/1208/undecorate/", "shell_version_map": {"40": {"version": "5", "sha256": "1vmpzk2vwyi5lywfzcpd350h3p09p9l5bkg7bza6b1w904lfd51n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdW5kZWNvcmF0ZSIsCiAgInV1aWQiOiAidW5kZWNvcmF0ZUBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1vmpzk2vwyi5lywfzcpd350h3p09p9l5bkg7bza6b1w904lfd51n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdW5kZWNvcmF0ZSIsCiAgInV1aWQiOiAidW5kZWNvcmF0ZUBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "rcd@criztovyl.space", "name": "Right Click Down", "pname": "right-click-down", "description": "Moves windows one workspace down by right-clicking them in the overview.", "link": "https://extensions.gnome.org/extension/1210/right-click-down/", "shell_version_map": {"38": {"version": "3", "sha256": "1vh9capapzbbwg2zlw9iphdk48q6fqk0qsmaylvsvw59xc7f9bia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHdpbmRvd3Mgb25lIHdvcmtzcGFjZSBkb3duIGJ5IHJpZ2h0LWNsaWNraW5nIHRoZW0gaW4gdGhlIG92ZXJ2aWV3LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJyY2QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbmlvbnMtcmlnaHQtY2xpY2stZG93biIsCiAgIm5hbWUiOiAiUmlnaHQgQ2xpY2sgRG93biIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yaWdodC1jbGljay1kb3duIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4LjAiLAogICAgIjMuMzguMSIsCiAgICAiMy4zOC4yIiwKICAgICI0MC5hbHBoYSIsCiAgICAiNDAuYWxwaGEiLAogICAgIjMuMzguMyIsCiAgICAiMy4zNy45MiIsCiAgICAiMy4zNy45MSIsCiAgICAiMy4zNy45MCIsCiAgICAiMy4zNy4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vY3JpenRvdnlsL2dub21lLXJpZ2h0LWNsaWNrLWRvd24iLAogICJ1dWlkIjogInJjZEBjcml6dG92eWwuc3BhY2UiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1vh9capapzbbwg2zlw9iphdk48q6fqk0qsmaylvsvw59xc7f9bia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHdpbmRvd3Mgb25lIHdvcmtzcGFjZSBkb3duIGJ5IHJpZ2h0LWNsaWNraW5nIHRoZW0gaW4gdGhlIG92ZXJ2aWV3LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJyY2QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbmlvbnMtcmlnaHQtY2xpY2stZG93biIsCiAgIm5hbWUiOiAiUmlnaHQgQ2xpY2sgRG93biIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yaWdodC1jbGljay1kb3duIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4LjAiLAogICAgIjMuMzguMSIsCiAgICAiMy4zOC4yIiwKICAgICI0MC5hbHBoYSIsCiAgICAiNDAuYWxwaGEiLAogICAgIjMuMzguMyIsCiAgICAiMy4zNy45MiIsCiAgICAiMy4zNy45MSIsCiAgICAiMy4zNy45MCIsCiAgICAiMy4zNy4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vY3JpenRvdnlsL2dub21lLXJpZ2h0LWNsaWNrLWRvd24iLAogICJ1dWlkIjogInJjZEBjcml6dG92eWwuc3BhY2UiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "printers@linux-man.org", "name": "Printers", "pname": "printers", "description": "Manage Jobs and Printers\nRequired Package: cups-bsd", "link": "https://extensions.gnome.org/extension/1218/printers/", "shell_version_map": {"38": {"version": "12", "sha256": "19d7pac6mcgq6ddmb63mz0k5g7vjzlryqcsiqx4d15jxm26mjpp2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVyc1xuUmVxdWlyZWQgUGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtbWFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wcmludGVycyIsCiAgInV1aWQiOiAicHJpbnRlcnNAbGludXgtbWFuLm9yZyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "14", "sha256": "1cki2kwccc145khj5b6mj651k68zxgyi8gqcxv3yxlparcw5bd7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVyc1xuUmVxdWlyZWQgUGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9saW51eC1tYW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXByaW50ZXJzIiwKICAidXVpZCI6ICJwcmludGVyc0BsaW51eC1tYW4ub3JnIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "1cki2kwccc145khj5b6mj651k68zxgyi8gqcxv3yxlparcw5bd7k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVyc1xuUmVxdWlyZWQgUGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9saW51eC1tYW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXByaW50ZXJzIiwKICAidXVpZCI6ICJwcmludGVyc0BsaW51eC1tYW4ub3JnIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} +, {"uuid": "printers@linux-man.org", "name": "Printers", "pname": "printers", "description": "Manage Jobs and Printers. Required package: cups-bsd", "link": "https://extensions.gnome.org/extension/1218/printers/", "shell_version_map": {"38": {"version": "12", "sha256": "1q2k5b4z159nfr5mn4ah8fz9x8dq35x5sz99s8yhalbkb0ba0d1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtbWFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wcmludGVycyIsCiAgInV1aWQiOiAicHJpbnRlcnNAbGludXgtbWFuLm9yZyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "18", "sha256": "0ymwfkcb7d20lv5wvsqsbh1n5c6cn90iy8g49fnmaja8gm5wazd6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtbWFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wcmludGVycyIsCiAgInV1aWQiOiAicHJpbnRlcnNAbGludXgtbWFuLm9yZyIsCiAgInZlcnNpb24iOiAxOAp9"}, "41": {"version": "18", "sha256": "0ymwfkcb7d20lv5wvsqsbh1n5c6cn90iy8g49fnmaja8gm5wazd6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtbWFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wcmludGVycyIsCiAgInV1aWQiOiAicHJpbnRlcnNAbGludXgtbWFuLm9yZyIsCiAgInZlcnNpb24iOiAxOAp9"}, "42": {"version": "18", "sha256": "0ymwfkcb7d20lv5wvsqsbh1n5c6cn90iy8g49fnmaja8gm5wazd6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBKb2JzIGFuZCBQcmludGVycy4gUmVxdWlyZWQgcGFja2FnZTogY3Vwcy1ic2QiLAogICJleHRlbnNpb24taWQiOiAicHJpbnRlcnMiLAogICJuYW1lIjogIlByaW50ZXJzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqb2FvLmNhbGRhcy5sb3Blc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW50ZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtbWFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wcmludGVycyIsCiAgInV1aWQiOiAicHJpbnRlcnNAbGludXgtbWFuLm9yZyIsCiAgInZlcnNpb24iOiAxOAp9"}}} , {"uuid": "move-osd-windows@maestroschan.fr", "name": "Move OSD Windows", "pname": "move-osd-windows", "description": "Change the position of OSD windows (sound & luminosity popups).", "link": "https://extensions.gnome.org/extension/1220/move-osd-windows/", "shell_version_map": {"38": {"version": "3", "sha256": "1nmvbx7qbr9a9al5wirnsfwn4qb1qbql2w9f7fpajipasill9hkd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgcG9zaXRpb24gb2YgT1NEIHdpbmRvd3MgKHNvdW5kICYgbHVtaW5vc2l0eSBwb3B1cHMpLiIsCiAgImdldHRleHQtZG9tYWluIjogIm1vdmUtb3NkLXdpbmRvd3MiLAogICJuYW1lIjogIk1vdmUgT1NEIFdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWVzdHJvc2NoYW4vTW92ZS1PU0QtV2luZG93cy1HTk9NRS1FeHRlbnNpb24iLAogICJ1dWlkIjogIm1vdmUtb3NkLXdpbmRvd3NAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "arc-menu@linxgem33.com", "name": "Arc Menu", "pname": "arc-menu", "description": "## UNMAINTAINED ##\n\nThe original version of Arc Menu and all attached repositories apart from the disaster recovery branch will no longer receive updates or further development.\n\nKind Regards - LinxGem33 (Andy C)", "link": "https://extensions.gnome.org/extension/1228/arc-menu/", "shell_version_map": {"38": {"version": "49", "sha256": "0x1kr339qarkviinf13s6ih01ssdh321nw8ncnnrq7ihqpzysf8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIFVOTUFJTlRBSU5FRCAjI1xuXG5UaGUgb3JpZ2luYWwgdmVyc2lvbiBvZiBBcmMgTWVudSBhbmQgYWxsIGF0dGFjaGVkIHJlcG9zaXRvcmllcyBhcGFydCBmcm9tIHRoZSBkaXNhc3RlciByZWNvdmVyeSBicmFuY2ggd2lsbCBubyBsb25nZXIgcmVjZWl2ZSB1cGRhdGVzIG9yIGZ1cnRoZXIgZGV2ZWxvcG1lbnQuXG5cbktpbmQgUmVnYXJkcyAtIExpbnhHZW0zMyAoQW5keSBDKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmMtbWVudSIsCiAgImdldHRleHQtZG9tYWluIjogImFyYy1tZW51IiwKICAibmFtZSI6ICJBcmMgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmMtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0xpbnhHZW0zMy9BcmMtTWVudSIsCiAgInV1aWQiOiAiYXJjLW1lbnVAbGlueGdlbTMzLmNvbSIsCiAgInZlcnNpb24iOiA0OQp9"}}} , {"uuid": "GmailMessageTray@shuming0207.gmail.com", "name": "Gnome Email Notifications", "pname": "gmail-message-tray", "description": "Shows Gmail and Outlook notifications in Gnome Message Tray using Gnome Online Accounts\n", "link": "https://extensions.gnome.org/extension/1230/gmail-message-tray/", "shell_version_map": {"40": {"version": "22", "sha256": "1hsjqhm0gb7iisg3drwyav166w8zvbfbsdwr47v997xf4mfaycbn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEdtYWlsIGFuZCBPdXRsb29rIG5vdGlmaWNhdGlvbnMgaW4gR25vbWUgTWVzc2FnZSBUcmF5IHVzaW5nIEdub21lIE9ubGluZSBBY2NvdW50c1xuIiwKICAibmFtZSI6ICJHbm9tZSBFbWFpbCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NodW1pbmdjaC9nbm9tZS1lbWFpbC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJHbWFpbE1lc3NhZ2VUcmF5QHNodW1pbmcwMjA3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "24", "sha256": "0vldilmp2vzfl99fw0ainnlj9sz0a95zjlqnzybsz7dasin39i9z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEdtYWlsIGFuZCBPdXRsb29rIG5vdGlmaWNhdGlvbnMgaW4gR25vbWUgTWVzc2FnZSBUcmF5IHVzaW5nIEdub21lIE9ubGluZSBBY2NvdW50c1xuIiwKICAibmFtZSI6ICJHbm9tZSBFbWFpbCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NodW1pbmdjaC9nbm9tZS1lbWFpbC1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJHbWFpbE1lc3NhZ2VUcmF5QHNodW1pbmcwMjA3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"}}} @@ -146,8 +147,8 @@ , {"uuid": "noannoyance@sindex.com", "name": "NoAnnoyance", "pname": "noannoyance", "description": "Disable the “Window is ready” notification.", "link": "https://extensions.gnome.org/extension/1236/noannoyance/", "shell_version_map": {"38": {"version": "5", "sha256": "0x7p3i9qws8pgj3y2raw2vfgjwqm6rprrn3s7lck5bjx9ydri5b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIFx1MjAxY1dpbmRvdyBpcyByZWFkeVx1MjAxZCBub3RpZmljYXRpb24uIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaW5kZXgvbm8tYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBzaW5kZXguY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "0x7p3i9qws8pgj3y2raw2vfgjwqm6rprrn3s7lck5bjx9ydri5b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIFx1MjAxY1dpbmRvdyBpcyByZWFkeVx1MjAxZCBub3RpZmljYXRpb24uIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaW5kZXgvbm8tYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBzaW5kZXguY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "SomaFm-Radio@alireza6677.gmail.com", "name": "SomaFM internet radio", "pname": "somafm-internet-radio", "description": "Listen to SomaFm free internet radio in your GNOME desktop\n\n* Featues:\n- 32+ Channels\n- Volume slider\n- Favorites menu\n- Good sound quality\n- Supports most gnome-shell versions\n- Channel logos\n\n* Requirements:\n- Gstreamer and plugins:\nYou need to install 'gstreamer' and multimedia codecs/plugins for your distro.", "link": "https://extensions.gnome.org/extension/1237/somafm-internet-radio/", "shell_version_map": {"38": {"version": "29", "sha256": "07l6sa58azf3sav6858q48cbqazavq9bflfxdn0p9ys29h6mf50c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "40": {"version": "29", "sha256": "07l6sa58azf3sav6858q48cbqazavq9bflfxdn0p9ys29h6mf50c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}}} , {"uuid": "timepp@zagortenay333", "name": "Time ++", "pname": "time", "description": "A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarm clock", "link": "https://extensions.gnome.org/extension/1238/time/", "shell_version_map": {"38": {"version": "155", "sha256": "1v71hlwrw9kbxfvka5w8cfqmvcjw3k9xjdwhwlk4i4q5k6kgjih3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInRyYW5zbGF0aW9uc191cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvdGltZXBwX19nbm9tZS90cmVlL21hc3Rlci9kYXRhL3BvX2ZpbGVzIiwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUiLAogICJ1dWlkIjogInRpbWVwcEB6YWdvcnRlbmF5MzMzIiwKICAidmVyc2lvbiI6IDE1NQp9"}, "40": {"version": "163", "sha256": "0qb28jgpqz4nrigx2vjpsv2wfbnvkfk9rrc6aqgmh1mhhw3f7wfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidHJhbnNsYXRpb25zX3VybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy90aW1lcHBfX2dub21lL3RyZWUvbWFzdGVyL2RhdGEvcG9fZmlsZXMiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvdGltZXBwX19nbm9tZSIsCiAgInV1aWQiOiAidGltZXBwQHphZ29ydGVuYXkzMzMiLAogICJ2ZXJzaW9uIjogMTYzCn0="}, "41": {"version": "163", "sha256": "0qb28jgpqz4nrigx2vjpsv2wfbnvkfk9rrc6aqgmh1mhhw3f7wfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidHJhbnNsYXRpb25zX3VybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy90aW1lcHBfX2dub21lL3RyZWUvbWFzdGVyL2RhdGEvcG9fZmlsZXMiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvdGltZXBwX19nbm9tZSIsCiAgInV1aWQiOiAidGltZXBwQHphZ29ydGVuYXkzMzMiLAogICJ2ZXJzaW9uIjogMTYzCn0="}}} -, {"uuid": "obmin@konkor", "name": "Obmin", "pname": "obmin", "description": "One-Click File Sharing for your network.\nObmin is lightweight HTTP(S) File Server for GNU/Linux systems.\n\nFeatures:\n⚫ Easy installation.\n⚫ Easy setup just choose file(s) locations and tune Obmin on.\n⚫ Doesn't require ROOT privileges.\n⚫ Doesn't require any special client side installation.\n⚫ HTTP transfer protocol available everywhere Linux, OSX, Windows, Android, iOS so.\n⚫ More ...\n\nFor more information and how-to see README.md", "link": "https://extensions.gnome.org/extension/1254/obmin/", "shell_version_map": {"38": {"version": "22", "sha256": "1r7q5p600lqlkagz9gdxj5wi77i5066sgiwxfsj4w1ixd1g44cz5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vb2JtaW4uZ2l0aHViLmlvIiwKICAidXVpZCI6ICJvYm1pbkBrb25rb3IiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "22", "sha256": "1r7q5p600lqlkagz9gdxj5wi77i5066sgiwxfsj4w1ixd1g44cz5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vb2JtaW4uZ2l0aHViLmlvIiwKICAidXVpZCI6ICJvYm1pbkBrb25rb3IiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} -, {"uuid": "BingWallpaper@ineffable-gmail.com", "name": "Bing Wallpaper", "pname": "bing-wallpaper-changer", "description": "Lightweight GNOME shell extension to set your wallpaper to today's Microsoft Bing image of the day (the image you see when you visit Bing.com).\n\n *Disclaimer*: this extension is unofficial and not affiliated with Bing or Microsoft in any way. Images are protected by copyright and are licensed only for use as wallpapers.\n\nThis extension is based extensively on the NASA APOD extension by Elinvention (https://github.com/Elinvention) and inspired by Bing Desktop Wallpaper Changer by Utkarsh Gupta (https://github.com/UtkarshGpta).\n\nFeatures:\n* Fetches Bing wallpaper of the day and sets as both lock screen and desktop wallpaper (user selectable on GNOME versions that support it)\n* Optionally force a specific region (i.e. locale)\n* UHD supported resolutions\n* Only attempts to download wallpapers when they have been updated\n* Doesn't poll continuously - only once per day and on startup (schedules a refresh when Bing is due to update)\n *NEW: random mode\n *NEW: select wallpaper from previously downloaded images\n* English (en), German (de), Dutch (nl), Italian (it), Polish (pl), Chinese (zh_CN), French (fr_FR), Portuguese (pt, pt_BR), Russian (ru_RU), Spanish (es), Korean (ko, ko_KR, ko_KP), Indonesian (id), Catalan (ca), Norwegian Bokmål (nb) & Nynorsk (ni), Swedish (sv), Arabic (ar), Hungarian (hu) and Finnish (fi_FI) - a HUGE thanks to the translators\n\nAlways restart GNOME after manually updating extensions. Please report bugs to the GitHub page below:", "link": "https://extensions.gnome.org/extension/1262/bing-wallpaper-changer/", "shell_version_map": {"38": {"version": "37", "sha256": "1v01vkvphqjr7c2gh61p84jwvr8yj91rnhjgdgi8jv06fwcvnja0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGJhc2VkIGV4dGVuc2l2ZWx5IG9uIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgQmluZyB3YWxscGFwZXIgb2YgdGhlIGRheSBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlciAodXNlciBzZWxlY3RhYmxlIG9uIEdOT01FIHZlcnNpb25zIHRoYXQgc3VwcG9ydCBpdClcbiogT3B0aW9uYWxseSBmb3JjZSBhIHNwZWNpZmljIHJlZ2lvbiAoaS5lLiBsb2NhbGUpXG4qIFVIRCBzdXBwb3J0ZWQgcmVzb2x1dGlvbnNcbiogT25seSBhdHRlbXB0cyB0byBkb3dubG9hZCB3YWxscGFwZXJzIHdoZW4gdGhleSBoYXZlIGJlZW4gdXBkYXRlZFxuKiBEb2Vzbid0IHBvbGwgY29udGludW91c2x5IC0gb25seSBvbmNlIHBlciBkYXkgYW5kIG9uIHN0YXJ0dXAgKHNjaGVkdWxlcyBhIHJlZnJlc2ggd2hlbiBCaW5nIGlzIGR1ZSB0byB1cGRhdGUpXG4gKk5FVzogcmFuZG9tIG1vZGVcbiAqTkVXOiBzZWxlY3Qgd2FsbHBhcGVyIGZyb20gcHJldmlvdXNseSBkb3dubG9hZGVkIGltYWdlc1xuKiBFbmdsaXNoIChlbiksIEdlcm1hbiAoZGUpLCBEdXRjaCAobmwpLCBJdGFsaWFuIChpdCksIFBvbGlzaCAocGwpLCBDaGluZXNlICh6aF9DTiksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbywga29fS1IsIGtvX0tQKSwgSW5kb25lc2lhbiAoaWQpLCBDYXRhbGFuIChjYSksIE5vcndlZ2lhbiBCb2ttXHUwMGU1bCAobmIpICYgTnlub3JzayAobmkpLCBTd2VkaXNoIChzdiksIEFyYWJpYyAoYXIpLCBIdW5nYXJpYW4gKGh1KSBhbmQgRmlubmlzaCAoZmlfRkkpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJuYW1lIjogIkJpbmcgV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJpbmd3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="}, "40": {"version": "37", "sha256": "1v01vkvphqjr7c2gh61p84jwvr8yj91rnhjgdgi8jv06fwcvnja0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGJhc2VkIGV4dGVuc2l2ZWx5IG9uIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgQmluZyB3YWxscGFwZXIgb2YgdGhlIGRheSBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlciAodXNlciBzZWxlY3RhYmxlIG9uIEdOT01FIHZlcnNpb25zIHRoYXQgc3VwcG9ydCBpdClcbiogT3B0aW9uYWxseSBmb3JjZSBhIHNwZWNpZmljIHJlZ2lvbiAoaS5lLiBsb2NhbGUpXG4qIFVIRCBzdXBwb3J0ZWQgcmVzb2x1dGlvbnNcbiogT25seSBhdHRlbXB0cyB0byBkb3dubG9hZCB3YWxscGFwZXJzIHdoZW4gdGhleSBoYXZlIGJlZW4gdXBkYXRlZFxuKiBEb2Vzbid0IHBvbGwgY29udGludW91c2x5IC0gb25seSBvbmNlIHBlciBkYXkgYW5kIG9uIHN0YXJ0dXAgKHNjaGVkdWxlcyBhIHJlZnJlc2ggd2hlbiBCaW5nIGlzIGR1ZSB0byB1cGRhdGUpXG4gKk5FVzogcmFuZG9tIG1vZGVcbiAqTkVXOiBzZWxlY3Qgd2FsbHBhcGVyIGZyb20gcHJldmlvdXNseSBkb3dubG9hZGVkIGltYWdlc1xuKiBFbmdsaXNoIChlbiksIEdlcm1hbiAoZGUpLCBEdXRjaCAobmwpLCBJdGFsaWFuIChpdCksIFBvbGlzaCAocGwpLCBDaGluZXNlICh6aF9DTiksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbywga29fS1IsIGtvX0tQKSwgSW5kb25lc2lhbiAoaWQpLCBDYXRhbGFuIChjYSksIE5vcndlZ2lhbiBCb2ttXHUwMGU1bCAobmIpICYgTnlub3JzayAobmkpLCBTd2VkaXNoIChzdiksIEFyYWJpYyAoYXIpLCBIdW5nYXJpYW4gKGh1KSBhbmQgRmlubmlzaCAoZmlfRkkpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJuYW1lIjogIkJpbmcgV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJpbmd3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="}, "41": {"version": "37", "sha256": "1v01vkvphqjr7c2gh61p84jwvr8yj91rnhjgdgi8jv06fwcvnja0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGJhc2VkIGV4dGVuc2l2ZWx5IG9uIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgQmluZyB3YWxscGFwZXIgb2YgdGhlIGRheSBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlciAodXNlciBzZWxlY3RhYmxlIG9uIEdOT01FIHZlcnNpb25zIHRoYXQgc3VwcG9ydCBpdClcbiogT3B0aW9uYWxseSBmb3JjZSBhIHNwZWNpZmljIHJlZ2lvbiAoaS5lLiBsb2NhbGUpXG4qIFVIRCBzdXBwb3J0ZWQgcmVzb2x1dGlvbnNcbiogT25seSBhdHRlbXB0cyB0byBkb3dubG9hZCB3YWxscGFwZXJzIHdoZW4gdGhleSBoYXZlIGJlZW4gdXBkYXRlZFxuKiBEb2Vzbid0IHBvbGwgY29udGludW91c2x5IC0gb25seSBvbmNlIHBlciBkYXkgYW5kIG9uIHN0YXJ0dXAgKHNjaGVkdWxlcyBhIHJlZnJlc2ggd2hlbiBCaW5nIGlzIGR1ZSB0byB1cGRhdGUpXG4gKk5FVzogcmFuZG9tIG1vZGVcbiAqTkVXOiBzZWxlY3Qgd2FsbHBhcGVyIGZyb20gcHJldmlvdXNseSBkb3dubG9hZGVkIGltYWdlc1xuKiBFbmdsaXNoIChlbiksIEdlcm1hbiAoZGUpLCBEdXRjaCAobmwpLCBJdGFsaWFuIChpdCksIFBvbGlzaCAocGwpLCBDaGluZXNlICh6aF9DTiksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbywga29fS1IsIGtvX0tQKSwgSW5kb25lc2lhbiAoaWQpLCBDYXRhbGFuIChjYSksIE5vcndlZ2lhbiBCb2ttXHUwMGU1bCAobmIpICYgTnlub3JzayAobmkpLCBTd2VkaXNoIChzdiksIEFyYWJpYyAoYXIpLCBIdW5nYXJpYW4gKGh1KSBhbmQgRmlubmlzaCAoZmlfRkkpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJuYW1lIjogIkJpbmcgV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJpbmd3YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM3Cn0="}}} +, {"uuid": "obmin@konkor", "name": "Obmin", "pname": "obmin", "description": "One-Click File Sharing for your network.\nObmin is lightweight HTTP(S) File Server for GNU/Linux systems.\n\nFeatures:\n⚫ Easy installation.\n⚫ Easy setup just choose file(s) locations and tune Obmin on.\n⚫ Doesn't require ROOT privileges.\n⚫ Doesn't require any special client side installation.\n⚫ HTTP transfer protocol available everywhere Linux, OSX, Windows, Android, iOS so.\n⚫ More ...\n\nFor more information and how-to see README.md", "link": "https://extensions.gnome.org/extension/1254/obmin/", "shell_version_map": {"38": {"version": "25", "sha256": "14liv381k2gdgcsgaqsarfg0ycrg0whhq0jzzzdzvnk9vs8jdni8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "25", "sha256": "14liv381k2gdgcsgaqsarfg0ycrg0whhq0jzzzdzvnk9vs8jdni8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "41": {"version": "25", "sha256": "14liv381k2gdgcsgaqsarfg0ycrg0whhq0jzzzdzvnk9vs8jdni8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDI1Cn0="}}} +, {"uuid": "BingWallpaper@ineffable-gmail.com", "name": "Bing Wallpaper", "pname": "bing-wallpaper-changer", "description": "Lightweight GNOME shell extension to set your wallpaper to today's Microsoft Bing image of the day (the image you see when you visit Bing.com).\n\n *Disclaimer*: this extension is unofficial and not affiliated with Bing or Microsoft in any way. Images are protected by copyright and are licensed only for use as wallpapers.\n\nThis extension is based extensively on the NASA APOD extension by Elinvention (https://github.com/Elinvention) and inspired by Bing Desktop Wallpaper Changer by Utkarsh Gupta (https://github.com/UtkarshGpta).\n\nFeatures:\n* Fetches Bing wallpaper of the day and sets as both lock screen and desktop wallpaper (user selectable on GNOME versions that support it)\n* Optionally force a specific region (i.e. locale)\n* UHD supported resolutions\n* Only attempts to download wallpapers when they have been updated\n* Doesn't poll continuously - only once per day and on startup (schedules a refresh when Bing is due to update)\n *NEW: random mode\n *NEW: select wallpaper from previously downloaded images\n* English (en), German (de), Dutch (nl), Italian (it), Polish (pl), Chinese (zh_CN), French (fr_FR), Portuguese (pt, pt_BR), Russian (ru_RU), Spanish (es), Korean (ko, ko_KR, ko_KP), Indonesian (id), Catalan (ca), Norwegian Bokmål (nb) & Nynorsk (ni), Swedish (sv), Arabic (ar), Hungarian (hu) and Finnish (fi_FI) - a HUGE thanks to the translators\n\nAlways restart GNOME after manually updating extensions. Please report bugs to the GitHub page below:", "link": "https://extensions.gnome.org/extension/1262/bing-wallpaper-changer/", "shell_version_map": {"38": {"version": "39", "sha256": "098z2pz1hg11nhkjxxkcmg83g76qyx3ggpyn2xma1mfalv6b6fyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGJhc2VkIGV4dGVuc2l2ZWx5IG9uIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgQmluZyB3YWxscGFwZXIgb2YgdGhlIGRheSBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlciAodXNlciBzZWxlY3RhYmxlIG9uIEdOT01FIHZlcnNpb25zIHRoYXQgc3VwcG9ydCBpdClcbiogT3B0aW9uYWxseSBmb3JjZSBhIHNwZWNpZmljIHJlZ2lvbiAoaS5lLiBsb2NhbGUpXG4qIFVIRCBzdXBwb3J0ZWQgcmVzb2x1dGlvbnNcbiogT25seSBhdHRlbXB0cyB0byBkb3dubG9hZCB3YWxscGFwZXJzIHdoZW4gdGhleSBoYXZlIGJlZW4gdXBkYXRlZFxuKiBEb2Vzbid0IHBvbGwgY29udGludW91c2x5IC0gb25seSBvbmNlIHBlciBkYXkgYW5kIG9uIHN0YXJ0dXAgKHNjaGVkdWxlcyBhIHJlZnJlc2ggd2hlbiBCaW5nIGlzIGR1ZSB0byB1cGRhdGUpXG4gKk5FVzogcmFuZG9tIG1vZGVcbiAqTkVXOiBzZWxlY3Qgd2FsbHBhcGVyIGZyb20gcHJldmlvdXNseSBkb3dubG9hZGVkIGltYWdlc1xuKiBFbmdsaXNoIChlbiksIEdlcm1hbiAoZGUpLCBEdXRjaCAobmwpLCBJdGFsaWFuIChpdCksIFBvbGlzaCAocGwpLCBDaGluZXNlICh6aF9DTiksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbywga29fS1IsIGtvX0tQKSwgSW5kb25lc2lhbiAoaWQpLCBDYXRhbGFuIChjYSksIE5vcndlZ2lhbiBCb2ttXHUwMGU1bCAobmIpICYgTnlub3JzayAobmkpLCBTd2VkaXNoIChzdiksIEFyYWJpYyAoYXIpLCBIdW5nYXJpYW4gKGh1KSBhbmQgRmlubmlzaCAoZmlfRkkpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVmZm8vYmluZy13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJCaW5nV2FsbHBhcGVyQGluZWZmYWJsZS1nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "40": {"version": "39", "sha256": "098z2pz1hg11nhkjxxkcmg83g76qyx3ggpyn2xma1mfalv6b6fyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGJhc2VkIGV4dGVuc2l2ZWx5IG9uIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgQmluZyB3YWxscGFwZXIgb2YgdGhlIGRheSBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlciAodXNlciBzZWxlY3RhYmxlIG9uIEdOT01FIHZlcnNpb25zIHRoYXQgc3VwcG9ydCBpdClcbiogT3B0aW9uYWxseSBmb3JjZSBhIHNwZWNpZmljIHJlZ2lvbiAoaS5lLiBsb2NhbGUpXG4qIFVIRCBzdXBwb3J0ZWQgcmVzb2x1dGlvbnNcbiogT25seSBhdHRlbXB0cyB0byBkb3dubG9hZCB3YWxscGFwZXJzIHdoZW4gdGhleSBoYXZlIGJlZW4gdXBkYXRlZFxuKiBEb2Vzbid0IHBvbGwgY29udGludW91c2x5IC0gb25seSBvbmNlIHBlciBkYXkgYW5kIG9uIHN0YXJ0dXAgKHNjaGVkdWxlcyBhIHJlZnJlc2ggd2hlbiBCaW5nIGlzIGR1ZSB0byB1cGRhdGUpXG4gKk5FVzogcmFuZG9tIG1vZGVcbiAqTkVXOiBzZWxlY3Qgd2FsbHBhcGVyIGZyb20gcHJldmlvdXNseSBkb3dubG9hZGVkIGltYWdlc1xuKiBFbmdsaXNoIChlbiksIEdlcm1hbiAoZGUpLCBEdXRjaCAobmwpLCBJdGFsaWFuIChpdCksIFBvbGlzaCAocGwpLCBDaGluZXNlICh6aF9DTiksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbywga29fS1IsIGtvX0tQKSwgSW5kb25lc2lhbiAoaWQpLCBDYXRhbGFuIChjYSksIE5vcndlZ2lhbiBCb2ttXHUwMGU1bCAobmIpICYgTnlub3JzayAobmkpLCBTd2VkaXNoIChzdiksIEFyYWJpYyAoYXIpLCBIdW5nYXJpYW4gKGh1KSBhbmQgRmlubmlzaCAoZmlfRkkpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVmZm8vYmluZy13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJCaW5nV2FsbHBhcGVyQGluZWZmYWJsZS1nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "41": {"version": "39", "sha256": "098z2pz1hg11nhkjxxkcmg83g76qyx3ggpyn2xma1mfalv6b6fyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGJhc2VkIGV4dGVuc2l2ZWx5IG9uIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgQmluZyB3YWxscGFwZXIgb2YgdGhlIGRheSBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlciAodXNlciBzZWxlY3RhYmxlIG9uIEdOT01FIHZlcnNpb25zIHRoYXQgc3VwcG9ydCBpdClcbiogT3B0aW9uYWxseSBmb3JjZSBhIHNwZWNpZmljIHJlZ2lvbiAoaS5lLiBsb2NhbGUpXG4qIFVIRCBzdXBwb3J0ZWQgcmVzb2x1dGlvbnNcbiogT25seSBhdHRlbXB0cyB0byBkb3dubG9hZCB3YWxscGFwZXJzIHdoZW4gdGhleSBoYXZlIGJlZW4gdXBkYXRlZFxuKiBEb2Vzbid0IHBvbGwgY29udGludW91c2x5IC0gb25seSBvbmNlIHBlciBkYXkgYW5kIG9uIHN0YXJ0dXAgKHNjaGVkdWxlcyBhIHJlZnJlc2ggd2hlbiBCaW5nIGlzIGR1ZSB0byB1cGRhdGUpXG4gKk5FVzogcmFuZG9tIG1vZGVcbiAqTkVXOiBzZWxlY3Qgd2FsbHBhcGVyIGZyb20gcHJldmlvdXNseSBkb3dubG9hZGVkIGltYWdlc1xuKiBFbmdsaXNoIChlbiksIEdlcm1hbiAoZGUpLCBEdXRjaCAobmwpLCBJdGFsaWFuIChpdCksIFBvbGlzaCAocGwpLCBDaGluZXNlICh6aF9DTiksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbywga29fS1IsIGtvX0tQKSwgSW5kb25lc2lhbiAoaWQpLCBDYXRhbGFuIChjYSksIE5vcndlZ2lhbiBCb2ttXHUwMGU1bCAobmIpICYgTnlub3JzayAobmkpLCBTd2VkaXNoIChzdiksIEFyYWJpYyAoYXIpLCBIdW5nYXJpYW4gKGh1KSBhbmQgRmlubmlzaCAoZmlfRkkpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVmZm8vYmluZy13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJCaW5nV2FsbHBhcGVyQGluZWZmYWJsZS1nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "42": {"version": "39", "sha256": "098z2pz1hg11nhkjxxkcmg83g76qyx3ggpyn2xma1mfalv6b6fyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGJhc2VkIGV4dGVuc2l2ZWx5IG9uIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgQmluZyB3YWxscGFwZXIgb2YgdGhlIGRheSBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlciAodXNlciBzZWxlY3RhYmxlIG9uIEdOT01FIHZlcnNpb25zIHRoYXQgc3VwcG9ydCBpdClcbiogT3B0aW9uYWxseSBmb3JjZSBhIHNwZWNpZmljIHJlZ2lvbiAoaS5lLiBsb2NhbGUpXG4qIFVIRCBzdXBwb3J0ZWQgcmVzb2x1dGlvbnNcbiogT25seSBhdHRlbXB0cyB0byBkb3dubG9hZCB3YWxscGFwZXJzIHdoZW4gdGhleSBoYXZlIGJlZW4gdXBkYXRlZFxuKiBEb2Vzbid0IHBvbGwgY29udGludW91c2x5IC0gb25seSBvbmNlIHBlciBkYXkgYW5kIG9uIHN0YXJ0dXAgKHNjaGVkdWxlcyBhIHJlZnJlc2ggd2hlbiBCaW5nIGlzIGR1ZSB0byB1cGRhdGUpXG4gKk5FVzogcmFuZG9tIG1vZGVcbiAqTkVXOiBzZWxlY3Qgd2FsbHBhcGVyIGZyb20gcHJldmlvdXNseSBkb3dubG9hZGVkIGltYWdlc1xuKiBFbmdsaXNoIChlbiksIEdlcm1hbiAoZGUpLCBEdXRjaCAobmwpLCBJdGFsaWFuIChpdCksIFBvbGlzaCAocGwpLCBDaGluZXNlICh6aF9DTiksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbywga29fS1IsIGtvX0tQKSwgSW5kb25lc2lhbiAoaWQpLCBDYXRhbGFuIChjYSksIE5vcndlZ2lhbiBCb2ttXHUwMGU1bCAobmIpICYgTnlub3JzayAobmkpLCBTd2VkaXNoIChzdiksIEFyYWJpYyAoYXIpLCBIdW5nYXJpYW4gKGh1KSBhbmQgRmlubmlzaCAoZmlfRkkpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVmZm8vYmluZy13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJCaW5nV2FsbHBhcGVyQGluZWZmYWJsZS1nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="}}} , {"uuid": "gnomesome@chwick.github.com", "name": "Gnomesome", "pname": "gnomesome", "description": "Tiling window manager with awesome keybindings", "link": "https://extensions.gnome.org/extension/1268/gnomesome/", "shell_version_map": {"38": {"version": "15", "sha256": "1dn67is3qk80xxfkc2pd43jrsyylmsprd7v3axvl677wdjgaq83z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGF3ZXNvbWUga2V5YmluZGluZ3MiLAogICJuYW1lIjogIkdub21lc29tZSIsCiAgInNldHRpbmdzLWtleWJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lc29tZS5rZXliaW5kaW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nod2ljay9nbm9tZXNvbWUiLAogICJ1dWlkIjogImdub21lc29tZUBjaHdpY2suZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}}} , {"uuid": "gnome-vagrant-indicator@gnome-shell-exstensions.fffilo.github.com", "name": "GNOME Vagrant Indicator", "pname": "gnome-vagrant-indicator", "description": "Easily manage your vagrant machines from status area", "link": "https://extensions.gnome.org/extension/1269/gnome-vagrant-indicator/", "shell_version_map": {"40": {"version": "14", "sha256": "194kfjbv8wc4krxcdazm03c0rnzz11n5xa0m11zq3nczw9pasvwf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEiLAogICJkZXNjcmlwdGlvbi1odG1sIjogIkluc3BpcmVkIGJ5IDxhIGhyZWY9XCJodHRwczovL2dpdGh1Yi5jb20vY2FuZGlkdGltL3ZhZ3JhbnQtYXBwaW5kaWNhdG9yXCI+dmdhcHBsZXQ8L2E+LFxuPGI+R05PTUUgVmFncmFudCBJbmRpY2F0b3I8L2I+IGxldHMgeW91IGVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJsaWNlbnNlIjogIkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjAiLAogICJsaWNlbnNlLWh0bWwiOiAiVGhpcyBwcm9ncmFtIGNvbWVzIHdpdGggQUJTT0xVVEVMWSBOTyBXQVJSQU5UWS5cblNlZSB0aGUgPGEgaHJlZj1cImh0dHBzOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvZ3BsLTMuMC5odG1sXCI+R05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMDwvYT4gZm9yIGRldGFpbHMuIiwKICAibmFtZSI6ICJHTk9NRSBWYWdyYW50IEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyA8YSBocmVmPVwibWFpbHRvOmZmZmlsbzY2NkBnbWFpbC5jb21cIj4mbHQ7ZmZmaWxvNjY2QGdtYWlsLmNvbSZndDs8L2E+IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXZhZ3JhbnQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZmZmlsby9nbm9tZS12YWdyYW50LWluZGljYXRvciIsCiAgInV1aWQiOiAiZ25vbWUtdmFncmFudC1pbmRpY2F0b3JAZ25vbWUtc2hlbGwtZXhzdGVuc2lvbnMuZmZmaWxvLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "prime-indicator@gnome-shell-exstensions.fffilo.github.com", "name": "Prime Indicator", "pname": "prime-indicator", "description": "Intel/NVIDIA GPU Switch", "link": "https://extensions.gnome.org/extension/1275/prime-indicator/", "shell_version_map": {"40": {"version": "9", "sha256": "144qshljqc680w296w49fbfdf63zggl1in12y7dfmhra5ph4mk3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL05WSURJQSBHUFUgU3dpdGNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICJHTk9NRSBzaGVsbCBleHRlbnNpb24gdGhhdCBhZGRzIEludGVsL05WSURJQSBHUFUgc3dpdGNoIHRvIGFnZ3JlZ2F0ZSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInByaW1lLWluZGljYXRvciIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIlByaW1lIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyAmbHQ7PGEgaHJlZj1cIm1haWx0bzpmZmZpbG82NjZAZ21haWwuY29tXCI+ZmZmaWxvNjY2QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW1lLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmZpbG8vcHJpbWUtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJwcmltZS1pbmRpY2F0b3JAZ25vbWUtc2hlbGwtZXhzdGVuc2lvbnMuZmZmaWxvLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} @@ -155,79 +156,79 @@ , {"uuid": "fuzzy-clock@keepawayfromfire.co.uk", "name": "Fuzzy Clock", "pname": "fuzzy-clock", "description": "Make the top bar clock fuzzy", "link": "https://extensions.gnome.org/extension/1281/fuzzy-clock/", "shell_version_map": {"38": {"version": "4", "sha256": "1dvpkwkzagw23fhvmz9ncjldmhlv4493gn08r6rqslp4hqlmwqfy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHRvcCBiYXIgY2xvY2sgZnV6enkiLAogICJuYW1lIjogIkZ1enp5IENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2otTWFsb25lL0Z1enp5LUNsb2NrIiwKICAidXVpZCI6ICJmdXp6eS1jbG9ja0BrZWVwYXdheWZyb21maXJlLmNvLnVrIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "1dvpkwkzagw23fhvmz9ncjldmhlv4493gn08r6rqslp4hqlmwqfy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHRvcCBiYXIgY2xvY2sgZnV6enkiLAogICJuYW1lIjogIkZ1enp5IENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2otTWFsb25lL0Z1enp5LUNsb2NrIiwKICAidXVpZCI6ICJmdXp6eS1jbG9ja0BrZWVwYXdheWZyb21maXJlLmNvLnVrIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1dvpkwkzagw23fhvmz9ncjldmhlv4493gn08r6rqslp4hqlmwqfy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHRvcCBiYXIgY2xvY2sgZnV6enkiLAogICJuYW1lIjogIkZ1enp5IENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2otTWFsb25lL0Z1enp5LUNsb2NrIiwKICAidXVpZCI6ICJmdXp6eS1jbG9ja0BrZWVwYXdheWZyb21maXJlLmNvLnVrIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "ds4battery@slie.ru", "name": "Dual Shock 4 battery percentage", "pname": "dual-shock-4-battery-percentage", "description": "Show DS4/DS3 battery remaining power percentage at the top panel", "link": "https://extensions.gnome.org/extension/1283/dual-shock-4-battery-percentage/", "shell_version_map": {"38": {"version": "7", "sha256": "0yb1j3hlza96zbd82gjc7wyjqkj5vjzcaj8l5n8xhfrdi7icxf6j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgRFM0L0RTMyBiYXR0ZXJ5IHJlbWFpbmluZyBwb3dlciBwZXJjZW50YWdlIGF0IHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIkR1YWwgU2hvY2sgNCBiYXR0ZXJ5IHBlcmNlbnRhZ2UiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIm1lQHNsaWUucnUiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGhhbmtqdXJhL2RzNGJhdHRlcnkiLAogICJ1dWlkIjogImRzNGJhdHRlcnlAc2xpZS5ydSIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "0yb1j3hlza96zbd82gjc7wyjqkj5vjzcaj8l5n8xhfrdi7icxf6j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgRFM0L0RTMyBiYXR0ZXJ5IHJlbWFpbmluZyBwb3dlciBwZXJjZW50YWdlIGF0IHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIkR1YWwgU2hvY2sgNCBiYXR0ZXJ5IHBlcmNlbnRhZ2UiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIm1lQHNsaWUucnUiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGhhbmtqdXJhL2RzNGJhdHRlcnkiLAogICJ1dWlkIjogImRzNGJhdHRlcnlAc2xpZS5ydSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "hotel-manager@hardpixel.eu", "name": "Hotel Manager", "pname": "hotel-manager", "description": "Hotel Manager allows to start and stop the Hotel daemon and your development servers via a menu in the status area.", "link": "https://extensions.gnome.org/extension/1285/hotel-manager/", "shell_version_map": {"38": {"version": "14", "sha256": "0ag9rbfcaw2naa1qg92dl0pclb0d3lx1bsra83cdcx6m853mff6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhvdGVsIE1hbmFnZXIgYWxsb3dzIHRvIHN0YXJ0IGFuZCBzdG9wIHRoZSBIb3RlbCBkYWVtb24gYW5kIHlvdXIgZGV2ZWxvcG1lbnQgc2VydmVycyB2aWEgYSBtZW51IGluIHRoZSBzdGF0dXMgYXJlYS4iLAogICJuYW1lIjogIkhvdGVsIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9ob3RlbC1tYW5hZ2VyIiwKICAidXVpZCI6ICJob3RlbC1tYW5hZ2VyQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiAxNAp9"}, "40": {"version": "14", "sha256": "0ag9rbfcaw2naa1qg92dl0pclb0d3lx1bsra83cdcx6m853mff6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhvdGVsIE1hbmFnZXIgYWxsb3dzIHRvIHN0YXJ0IGFuZCBzdG9wIHRoZSBIb3RlbCBkYWVtb24gYW5kIHlvdXIgZGV2ZWxvcG1lbnQgc2VydmVycyB2aWEgYSBtZW51IGluIHRoZSBzdGF0dXMgYXJlYS4iLAogICJuYW1lIjogIkhvdGVsIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9ob3RlbC1tYW5hZ2VyIiwKICAidXVpZCI6ICJob3RlbC1tYW5hZ2VyQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "0ag9rbfcaw2naa1qg92dl0pclb0d3lx1bsra83cdcx6m853mff6k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhvdGVsIE1hbmFnZXIgYWxsb3dzIHRvIHN0YXJ0IGFuZCBzdG9wIHRoZSBIb3RlbCBkYWVtb24gYW5kIHlvdXIgZGV2ZWxvcG1lbnQgc2VydmVycyB2aWEgYSBtZW51IGluIHRoZSBzdGF0dXMgYXJlYS4iLAogICJuYW1lIjogIkhvdGVsIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9ob3RlbC1tYW5hZ2VyIiwKICAidXVpZCI6ICJob3RlbC1tYW5hZ2VyQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiAxNAp9"}}} -, {"uuid": "unite@hardpixel.eu", "name": "Unite", "pname": "unite", "description": "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell.\n\n- Adds window buttons to the top panel for maximized windows.\n- Shows current window title in the app menu for maximized windows.\n- Removes titlebars on maximized windows.\n- Hides window controls on maximized windows with headerbars.\n- Moves the date to the right, reduces panel spacing and removes dropdown arrows.\n- Moves legacy tray icons to the top panel.\n- Moves notifications to the right.\n- Hides activities button.\n- Adds desktop name to the top panel.\n\nThis extension depends on some Xorg utilities. To install them:\n- Debian/Ubuntu: apt install x11-utils\n- Fedora/RHEL: dnf install xprop\n- Fedora Silverblue: rpm-ostree install xprop\n- Arch: pacman -S xorg-xprop\n\n*Settings are provided to enable/disable or customize the available tweaks.\n* Since version 2 applications on wayland with client side decorations are supported using CSS.", "link": "https://extensions.gnome.org/extension/1287/unite/", "shell_version_map": {"38": {"version": "59", "sha256": "1a0cn11c09wa2rxw18f86z8zm33bp496xi1yjl5amw7zx9ki6sl5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuaXRlIGlzIGEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHdoaWNoIG1ha2VzIGEgZmV3IGxheW91dCB0d2Vha3MgdG8gdGhlIHRvcCBwYW5lbCBhbmQgcmVtb3ZlcyB3aW5kb3cgZGVjb3JhdGlvbnMgdG8gbWFrZSBpdCBsb29rIGxpa2UgVWJ1bnR1IFVuaXR5IFNoZWxsLlxuXG4tIEFkZHMgd2luZG93IGJ1dHRvbnMgdG8gdGhlIHRvcCBwYW5lbCBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFNob3dzIGN1cnJlbnQgd2luZG93IHRpdGxlIGluIHRoZSBhcHAgbWVudSBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFJlbW92ZXMgdGl0bGViYXJzIG9uIG1heGltaXplZCB3aW5kb3dzLlxuLSBIaWRlcyB3aW5kb3cgY29udHJvbHMgb24gbWF4aW1pemVkIHdpbmRvd3Mgd2l0aCBoZWFkZXJiYXJzLlxuLSBNb3ZlcyB0aGUgZGF0ZSB0byB0aGUgcmlnaHQsIHJlZHVjZXMgcGFuZWwgc3BhY2luZyBhbmQgcmVtb3ZlcyBkcm9wZG93biBhcnJvd3MuXG4tIE1vdmVzIGxlZ2FjeSB0cmF5IGljb25zIHRvIHRoZSB0b3AgcGFuZWwuXG4tIE1vdmVzIG5vdGlmaWNhdGlvbnMgdG8gdGhlIHJpZ2h0LlxuLSBIaWRlcyBhY3Rpdml0aWVzIGJ1dHRvbi5cbi0gQWRkcyBkZXNrdG9wIG5hbWUgdG8gdGhlIHRvcCBwYW5lbC5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBzb21lIFhvcmcgdXRpbGl0aWVzLiBUbyBpbnN0YWxsIHRoZW06XG4tIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuLSBGZWRvcmEvUkhFTDogZG5mIGluc3RhbGwgeHByb3Bcbi0gRmVkb3JhIFNpbHZlcmJsdWU6IHJwbS1vc3RyZWUgaW5zdGFsbCB4cHJvcFxuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIG9yIGN1c3RvbWl6ZSB0aGUgYXZhaWxhYmxlIHR3ZWFrcy5cbiogU2luY2UgdmVyc2lvbiAyIGFwcGxpY2F0aW9ucyBvbiB3YXlsYW5kIHdpdGggY2xpZW50IHNpZGUgZGVjb3JhdGlvbnMgYXJlIHN1cHBvcnRlZCB1c2luZyBDU1MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidW5pdGUiLAogICJuYW1lIjogIlVuaXRlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVuaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvdW5pdGUtc2hlbGwiLAogICJ1dWlkIjogInVuaXRlQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiA1OQp9"}, "40": {"version": "59", "sha256": "1a0cn11c09wa2rxw18f86z8zm33bp496xi1yjl5amw7zx9ki6sl5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuaXRlIGlzIGEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHdoaWNoIG1ha2VzIGEgZmV3IGxheW91dCB0d2Vha3MgdG8gdGhlIHRvcCBwYW5lbCBhbmQgcmVtb3ZlcyB3aW5kb3cgZGVjb3JhdGlvbnMgdG8gbWFrZSBpdCBsb29rIGxpa2UgVWJ1bnR1IFVuaXR5IFNoZWxsLlxuXG4tIEFkZHMgd2luZG93IGJ1dHRvbnMgdG8gdGhlIHRvcCBwYW5lbCBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFNob3dzIGN1cnJlbnQgd2luZG93IHRpdGxlIGluIHRoZSBhcHAgbWVudSBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFJlbW92ZXMgdGl0bGViYXJzIG9uIG1heGltaXplZCB3aW5kb3dzLlxuLSBIaWRlcyB3aW5kb3cgY29udHJvbHMgb24gbWF4aW1pemVkIHdpbmRvd3Mgd2l0aCBoZWFkZXJiYXJzLlxuLSBNb3ZlcyB0aGUgZGF0ZSB0byB0aGUgcmlnaHQsIHJlZHVjZXMgcGFuZWwgc3BhY2luZyBhbmQgcmVtb3ZlcyBkcm9wZG93biBhcnJvd3MuXG4tIE1vdmVzIGxlZ2FjeSB0cmF5IGljb25zIHRvIHRoZSB0b3AgcGFuZWwuXG4tIE1vdmVzIG5vdGlmaWNhdGlvbnMgdG8gdGhlIHJpZ2h0LlxuLSBIaWRlcyBhY3Rpdml0aWVzIGJ1dHRvbi5cbi0gQWRkcyBkZXNrdG9wIG5hbWUgdG8gdGhlIHRvcCBwYW5lbC5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBzb21lIFhvcmcgdXRpbGl0aWVzLiBUbyBpbnN0YWxsIHRoZW06XG4tIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuLSBGZWRvcmEvUkhFTDogZG5mIGluc3RhbGwgeHByb3Bcbi0gRmVkb3JhIFNpbHZlcmJsdWU6IHJwbS1vc3RyZWUgaW5zdGFsbCB4cHJvcFxuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIG9yIGN1c3RvbWl6ZSB0aGUgYXZhaWxhYmxlIHR3ZWFrcy5cbiogU2luY2UgdmVyc2lvbiAyIGFwcGxpY2F0aW9ucyBvbiB3YXlsYW5kIHdpdGggY2xpZW50IHNpZGUgZGVjb3JhdGlvbnMgYXJlIHN1cHBvcnRlZCB1c2luZyBDU1MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidW5pdGUiLAogICJuYW1lIjogIlVuaXRlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVuaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvdW5pdGUtc2hlbGwiLAogICJ1dWlkIjogInVuaXRlQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiA1OQp9"}, "41": {"version": "59", "sha256": "1a0cn11c09wa2rxw18f86z8zm33bp496xi1yjl5amw7zx9ki6sl5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuaXRlIGlzIGEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHdoaWNoIG1ha2VzIGEgZmV3IGxheW91dCB0d2Vha3MgdG8gdGhlIHRvcCBwYW5lbCBhbmQgcmVtb3ZlcyB3aW5kb3cgZGVjb3JhdGlvbnMgdG8gbWFrZSBpdCBsb29rIGxpa2UgVWJ1bnR1IFVuaXR5IFNoZWxsLlxuXG4tIEFkZHMgd2luZG93IGJ1dHRvbnMgdG8gdGhlIHRvcCBwYW5lbCBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFNob3dzIGN1cnJlbnQgd2luZG93IHRpdGxlIGluIHRoZSBhcHAgbWVudSBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFJlbW92ZXMgdGl0bGViYXJzIG9uIG1heGltaXplZCB3aW5kb3dzLlxuLSBIaWRlcyB3aW5kb3cgY29udHJvbHMgb24gbWF4aW1pemVkIHdpbmRvd3Mgd2l0aCBoZWFkZXJiYXJzLlxuLSBNb3ZlcyB0aGUgZGF0ZSB0byB0aGUgcmlnaHQsIHJlZHVjZXMgcGFuZWwgc3BhY2luZyBhbmQgcmVtb3ZlcyBkcm9wZG93biBhcnJvd3MuXG4tIE1vdmVzIGxlZ2FjeSB0cmF5IGljb25zIHRvIHRoZSB0b3AgcGFuZWwuXG4tIE1vdmVzIG5vdGlmaWNhdGlvbnMgdG8gdGhlIHJpZ2h0LlxuLSBIaWRlcyBhY3Rpdml0aWVzIGJ1dHRvbi5cbi0gQWRkcyBkZXNrdG9wIG5hbWUgdG8gdGhlIHRvcCBwYW5lbC5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBzb21lIFhvcmcgdXRpbGl0aWVzLiBUbyBpbnN0YWxsIHRoZW06XG4tIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuLSBGZWRvcmEvUkhFTDogZG5mIGluc3RhbGwgeHByb3Bcbi0gRmVkb3JhIFNpbHZlcmJsdWU6IHJwbS1vc3RyZWUgaW5zdGFsbCB4cHJvcFxuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIG9yIGN1c3RvbWl6ZSB0aGUgYXZhaWxhYmxlIHR3ZWFrcy5cbiogU2luY2UgdmVyc2lvbiAyIGFwcGxpY2F0aW9ucyBvbiB3YXlsYW5kIHdpdGggY2xpZW50IHNpZGUgZGVjb3JhdGlvbnMgYXJlIHN1cHBvcnRlZCB1c2luZyBDU1MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidW5pdGUiLAogICJuYW1lIjogIlVuaXRlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVuaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvdW5pdGUtc2hlbGwiLAogICJ1dWlkIjogInVuaXRlQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiA1OQp9"}}} +, {"uuid": "unite@hardpixel.eu", "name": "Unite", "pname": "unite", "description": "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell.\n\n- Adds window buttons to the top panel for maximized windows.\n- Shows current window title in the app menu for maximized windows.\n- Removes titlebars on maximized windows.\n- Hides window controls on maximized windows with headerbars.\n- Moves the date to the right, reduces panel spacing and removes dropdown arrows.\n- Moves legacy tray icons to the top panel.\n- Moves notifications to the right.\n- Hides activities button.\n- Adds desktop name to the top panel.\n\nThis extension depends on some Xorg utilities. To install them:\n- Debian/Ubuntu: apt install x11-utils\n- Fedora/RHEL: dnf install xprop\n- Fedora Silverblue: rpm-ostree install xprop\n- Arch: pacman -S xorg-xprop\n\n*Settings are provided to enable/disable or customize the available tweaks.\n* Since version 2 applications on wayland with client side decorations are supported using CSS.", "link": "https://extensions.gnome.org/extension/1287/unite/", "shell_version_map": {"38": {"version": "61", "sha256": "1852f9wmzpcpbgdpwx8p2f04i0jnpkzw18rh1cxsw407xskvs6gg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuaXRlIGlzIGEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHdoaWNoIG1ha2VzIGEgZmV3IGxheW91dCB0d2Vha3MgdG8gdGhlIHRvcCBwYW5lbCBhbmQgcmVtb3ZlcyB3aW5kb3cgZGVjb3JhdGlvbnMgdG8gbWFrZSBpdCBsb29rIGxpa2UgVWJ1bnR1IFVuaXR5IFNoZWxsLlxuXG4tIEFkZHMgd2luZG93IGJ1dHRvbnMgdG8gdGhlIHRvcCBwYW5lbCBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFNob3dzIGN1cnJlbnQgd2luZG93IHRpdGxlIGluIHRoZSBhcHAgbWVudSBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFJlbW92ZXMgdGl0bGViYXJzIG9uIG1heGltaXplZCB3aW5kb3dzLlxuLSBIaWRlcyB3aW5kb3cgY29udHJvbHMgb24gbWF4aW1pemVkIHdpbmRvd3Mgd2l0aCBoZWFkZXJiYXJzLlxuLSBNb3ZlcyB0aGUgZGF0ZSB0byB0aGUgcmlnaHQsIHJlZHVjZXMgcGFuZWwgc3BhY2luZyBhbmQgcmVtb3ZlcyBkcm9wZG93biBhcnJvd3MuXG4tIE1vdmVzIGxlZ2FjeSB0cmF5IGljb25zIHRvIHRoZSB0b3AgcGFuZWwuXG4tIE1vdmVzIG5vdGlmaWNhdGlvbnMgdG8gdGhlIHJpZ2h0LlxuLSBIaWRlcyBhY3Rpdml0aWVzIGJ1dHRvbi5cbi0gQWRkcyBkZXNrdG9wIG5hbWUgdG8gdGhlIHRvcCBwYW5lbC5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBzb21lIFhvcmcgdXRpbGl0aWVzLiBUbyBpbnN0YWxsIHRoZW06XG4tIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuLSBGZWRvcmEvUkhFTDogZG5mIGluc3RhbGwgeHByb3Bcbi0gRmVkb3JhIFNpbHZlcmJsdWU6IHJwbS1vc3RyZWUgaW5zdGFsbCB4cHJvcFxuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIG9yIGN1c3RvbWl6ZSB0aGUgYXZhaWxhYmxlIHR3ZWFrcy5cbiogU2luY2UgdmVyc2lvbiAyIGFwcGxpY2F0aW9ucyBvbiB3YXlsYW5kIHdpdGggY2xpZW50IHNpZGUgZGVjb3JhdGlvbnMgYXJlIHN1cHBvcnRlZCB1c2luZyBDU1MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidW5pdGUiLAogICJuYW1lIjogIlVuaXRlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVuaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL3VuaXRlLXNoZWxsIiwKICAidXVpZCI6ICJ1bml0ZUBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogNjEKfQ=="}, "40": {"version": "61", "sha256": "1852f9wmzpcpbgdpwx8p2f04i0jnpkzw18rh1cxsw407xskvs6gg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuaXRlIGlzIGEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHdoaWNoIG1ha2VzIGEgZmV3IGxheW91dCB0d2Vha3MgdG8gdGhlIHRvcCBwYW5lbCBhbmQgcmVtb3ZlcyB3aW5kb3cgZGVjb3JhdGlvbnMgdG8gbWFrZSBpdCBsb29rIGxpa2UgVWJ1bnR1IFVuaXR5IFNoZWxsLlxuXG4tIEFkZHMgd2luZG93IGJ1dHRvbnMgdG8gdGhlIHRvcCBwYW5lbCBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFNob3dzIGN1cnJlbnQgd2luZG93IHRpdGxlIGluIHRoZSBhcHAgbWVudSBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFJlbW92ZXMgdGl0bGViYXJzIG9uIG1heGltaXplZCB3aW5kb3dzLlxuLSBIaWRlcyB3aW5kb3cgY29udHJvbHMgb24gbWF4aW1pemVkIHdpbmRvd3Mgd2l0aCBoZWFkZXJiYXJzLlxuLSBNb3ZlcyB0aGUgZGF0ZSB0byB0aGUgcmlnaHQsIHJlZHVjZXMgcGFuZWwgc3BhY2luZyBhbmQgcmVtb3ZlcyBkcm9wZG93biBhcnJvd3MuXG4tIE1vdmVzIGxlZ2FjeSB0cmF5IGljb25zIHRvIHRoZSB0b3AgcGFuZWwuXG4tIE1vdmVzIG5vdGlmaWNhdGlvbnMgdG8gdGhlIHJpZ2h0LlxuLSBIaWRlcyBhY3Rpdml0aWVzIGJ1dHRvbi5cbi0gQWRkcyBkZXNrdG9wIG5hbWUgdG8gdGhlIHRvcCBwYW5lbC5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBzb21lIFhvcmcgdXRpbGl0aWVzLiBUbyBpbnN0YWxsIHRoZW06XG4tIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuLSBGZWRvcmEvUkhFTDogZG5mIGluc3RhbGwgeHByb3Bcbi0gRmVkb3JhIFNpbHZlcmJsdWU6IHJwbS1vc3RyZWUgaW5zdGFsbCB4cHJvcFxuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIG9yIGN1c3RvbWl6ZSB0aGUgYXZhaWxhYmxlIHR3ZWFrcy5cbiogU2luY2UgdmVyc2lvbiAyIGFwcGxpY2F0aW9ucyBvbiB3YXlsYW5kIHdpdGggY2xpZW50IHNpZGUgZGVjb3JhdGlvbnMgYXJlIHN1cHBvcnRlZCB1c2luZyBDU1MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidW5pdGUiLAogICJuYW1lIjogIlVuaXRlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVuaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL3VuaXRlLXNoZWxsIiwKICAidXVpZCI6ICJ1bml0ZUBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogNjEKfQ=="}, "41": {"version": "61", "sha256": "1852f9wmzpcpbgdpwx8p2f04i0jnpkzw18rh1cxsw407xskvs6gg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuaXRlIGlzIGEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHdoaWNoIG1ha2VzIGEgZmV3IGxheW91dCB0d2Vha3MgdG8gdGhlIHRvcCBwYW5lbCBhbmQgcmVtb3ZlcyB3aW5kb3cgZGVjb3JhdGlvbnMgdG8gbWFrZSBpdCBsb29rIGxpa2UgVWJ1bnR1IFVuaXR5IFNoZWxsLlxuXG4tIEFkZHMgd2luZG93IGJ1dHRvbnMgdG8gdGhlIHRvcCBwYW5lbCBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFNob3dzIGN1cnJlbnQgd2luZG93IHRpdGxlIGluIHRoZSBhcHAgbWVudSBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFJlbW92ZXMgdGl0bGViYXJzIG9uIG1heGltaXplZCB3aW5kb3dzLlxuLSBIaWRlcyB3aW5kb3cgY29udHJvbHMgb24gbWF4aW1pemVkIHdpbmRvd3Mgd2l0aCBoZWFkZXJiYXJzLlxuLSBNb3ZlcyB0aGUgZGF0ZSB0byB0aGUgcmlnaHQsIHJlZHVjZXMgcGFuZWwgc3BhY2luZyBhbmQgcmVtb3ZlcyBkcm9wZG93biBhcnJvd3MuXG4tIE1vdmVzIGxlZ2FjeSB0cmF5IGljb25zIHRvIHRoZSB0b3AgcGFuZWwuXG4tIE1vdmVzIG5vdGlmaWNhdGlvbnMgdG8gdGhlIHJpZ2h0LlxuLSBIaWRlcyBhY3Rpdml0aWVzIGJ1dHRvbi5cbi0gQWRkcyBkZXNrdG9wIG5hbWUgdG8gdGhlIHRvcCBwYW5lbC5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBzb21lIFhvcmcgdXRpbGl0aWVzLiBUbyBpbnN0YWxsIHRoZW06XG4tIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuLSBGZWRvcmEvUkhFTDogZG5mIGluc3RhbGwgeHByb3Bcbi0gRmVkb3JhIFNpbHZlcmJsdWU6IHJwbS1vc3RyZWUgaW5zdGFsbCB4cHJvcFxuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIG9yIGN1c3RvbWl6ZSB0aGUgYXZhaWxhYmxlIHR3ZWFrcy5cbiogU2luY2UgdmVyc2lvbiAyIGFwcGxpY2F0aW9ucyBvbiB3YXlsYW5kIHdpdGggY2xpZW50IHNpZGUgZGVjb3JhdGlvbnMgYXJlIHN1cHBvcnRlZCB1c2luZyBDU1MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidW5pdGUiLAogICJuYW1lIjogIlVuaXRlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVuaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL3VuaXRlLXNoZWxsIiwKICAidXVpZCI6ICJ1bml0ZUBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogNjEKfQ=="}, "42": {"version": "61", "sha256": "1852f9wmzpcpbgdpwx8p2f04i0jnpkzw18rh1cxsw407xskvs6gg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuaXRlIGlzIGEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIHdoaWNoIG1ha2VzIGEgZmV3IGxheW91dCB0d2Vha3MgdG8gdGhlIHRvcCBwYW5lbCBhbmQgcmVtb3ZlcyB3aW5kb3cgZGVjb3JhdGlvbnMgdG8gbWFrZSBpdCBsb29rIGxpa2UgVWJ1bnR1IFVuaXR5IFNoZWxsLlxuXG4tIEFkZHMgd2luZG93IGJ1dHRvbnMgdG8gdGhlIHRvcCBwYW5lbCBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFNob3dzIGN1cnJlbnQgd2luZG93IHRpdGxlIGluIHRoZSBhcHAgbWVudSBmb3IgbWF4aW1pemVkIHdpbmRvd3MuXG4tIFJlbW92ZXMgdGl0bGViYXJzIG9uIG1heGltaXplZCB3aW5kb3dzLlxuLSBIaWRlcyB3aW5kb3cgY29udHJvbHMgb24gbWF4aW1pemVkIHdpbmRvd3Mgd2l0aCBoZWFkZXJiYXJzLlxuLSBNb3ZlcyB0aGUgZGF0ZSB0byB0aGUgcmlnaHQsIHJlZHVjZXMgcGFuZWwgc3BhY2luZyBhbmQgcmVtb3ZlcyBkcm9wZG93biBhcnJvd3MuXG4tIE1vdmVzIGxlZ2FjeSB0cmF5IGljb25zIHRvIHRoZSB0b3AgcGFuZWwuXG4tIE1vdmVzIG5vdGlmaWNhdGlvbnMgdG8gdGhlIHJpZ2h0LlxuLSBIaWRlcyBhY3Rpdml0aWVzIGJ1dHRvbi5cbi0gQWRkcyBkZXNrdG9wIG5hbWUgdG8gdGhlIHRvcCBwYW5lbC5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBzb21lIFhvcmcgdXRpbGl0aWVzLiBUbyBpbnN0YWxsIHRoZW06XG4tIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuLSBGZWRvcmEvUkhFTDogZG5mIGluc3RhbGwgeHByb3Bcbi0gRmVkb3JhIFNpbHZlcmJsdWU6IHJwbS1vc3RyZWUgaW5zdGFsbCB4cHJvcFxuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIG9yIGN1c3RvbWl6ZSB0aGUgYXZhaWxhYmxlIHR3ZWFrcy5cbiogU2luY2UgdmVyc2lvbiAyIGFwcGxpY2F0aW9ucyBvbiB3YXlsYW5kIHdpdGggY2xpZW50IHNpZGUgZGVjb3JhdGlvbnMgYXJlIHN1cHBvcnRlZCB1c2luZyBDU1MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidW5pdGUiLAogICJuYW1lIjogIlVuaXRlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVuaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL3VuaXRlLXNoZWxsIiwKICAidXVpZCI6ICJ1bml0ZUBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogNjEKfQ=="}}} , {"uuid": "GoogleEarthWallpaper@neffo.github.com", "name": "Google Earth View wallpaper", "pname": "google-earth-wallpaper", "description": "Lightweight GNOME shell extension to set your wallpaper to a random photo from the curated Google Earth View collection (2600+ photos).\n\n*Disclaimer*: this extension is unofficial and not affiliated with Google in any way. Images are protected by copyright and are licensed only for use as wallpapers.\n\nSee also my other extension, Bing Wallpaper Changer (https://github.com/neffo/bing-wallpaper-gnome-extension).\n\nFeatures:\n* Fetches a random Google Earth wallpaper and sets as both lock screen and desktop wallpaper\n* User selectable refresh intervals (default is once per day)\n* View location on Google Maps, Bing Maps, Gnome Maps, OpenStreetMaps\n* German, Dutch and Chinese translations\n\nPlease report any bugs or suggestions to extension GitHub page below.", "link": "https://extensions.gnome.org/extension/1295/google-earth-wallpaper/", "shell_version_map": {"38": {"version": "13", "sha256": "0s8xf16fxzizvpwg3lky0gkvsh732rh84wayj9nq3vq71ph2g4jz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gYSByYW5kb20gcGhvdG8gZnJvbSB0aGUgY3VyYXRlZCBHb29nbGUgRWFydGggVmlldyBjb2xsZWN0aW9uICgyNjAwKyBwaG90b3MpLlxuXG4qRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggR29vZ2xlIGluIGFueSB3YXkuIEltYWdlcyBhcmUgcHJvdGVjdGVkIGJ5IGNvcHlyaWdodCBhbmQgYXJlIGxpY2Vuc2VkIG9ubHkgZm9yIHVzZSBhcyB3YWxscGFwZXJzLlxuXG5TZWUgYWxzbyBteSBvdGhlciBleHRlbnNpb24sIEJpbmcgV2FsbHBhcGVyIENoYW5nZXIgKGh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24pLlxuXG5GZWF0dXJlczpcbiogRmV0Y2hlcyBhIHJhbmRvbSBHb29nbGUgRWFydGggd2FsbHBhcGVyIGFuZCBzZXRzIGFzIGJvdGggbG9jayBzY3JlZW4gYW5kIGRlc2t0b3Agd2FsbHBhcGVyXG4qIFVzZXIgc2VsZWN0YWJsZSByZWZyZXNoIGludGVydmFscyAoZGVmYXVsdCBpcyBvbmNlIHBlciBkYXkpXG4qIFZpZXcgbG9jYXRpb24gb24gR29vZ2xlIE1hcHMsIEJpbmcgTWFwcywgR25vbWUgTWFwcywgT3BlblN0cmVldE1hcHNcbiogIEdlcm1hbiwgRHV0Y2ggYW5kIENoaW5lc2UgdHJhbnNsYXRpb25zXG5cblBsZWFzZSByZXBvcnQgYW55IGJ1Z3Mgb3Igc3VnZ2VzdGlvbnMgdG8gZXh0ZW5zaW9uIEdpdEh1YiBwYWdlIGJlbG93LiIsCiAgIm5hbWUiOiAiR29vZ2xlIEVhcnRoIFZpZXcgd2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvb2dsZWVhcnRod2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9lYXJ0aC12aWV3LXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIkdvb2dsZUVhcnRoV2FsbHBhcGVyQG5lZmZvLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "0s8xf16fxzizvpwg3lky0gkvsh732rh84wayj9nq3vq71ph2g4jz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gYSByYW5kb20gcGhvdG8gZnJvbSB0aGUgY3VyYXRlZCBHb29nbGUgRWFydGggVmlldyBjb2xsZWN0aW9uICgyNjAwKyBwaG90b3MpLlxuXG4qRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggR29vZ2xlIGluIGFueSB3YXkuIEltYWdlcyBhcmUgcHJvdGVjdGVkIGJ5IGNvcHlyaWdodCBhbmQgYXJlIGxpY2Vuc2VkIG9ubHkgZm9yIHVzZSBhcyB3YWxscGFwZXJzLlxuXG5TZWUgYWxzbyBteSBvdGhlciBleHRlbnNpb24sIEJpbmcgV2FsbHBhcGVyIENoYW5nZXIgKGh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24pLlxuXG5GZWF0dXJlczpcbiogRmV0Y2hlcyBhIHJhbmRvbSBHb29nbGUgRWFydGggd2FsbHBhcGVyIGFuZCBzZXRzIGFzIGJvdGggbG9jayBzY3JlZW4gYW5kIGRlc2t0b3Agd2FsbHBhcGVyXG4qIFVzZXIgc2VsZWN0YWJsZSByZWZyZXNoIGludGVydmFscyAoZGVmYXVsdCBpcyBvbmNlIHBlciBkYXkpXG4qIFZpZXcgbG9jYXRpb24gb24gR29vZ2xlIE1hcHMsIEJpbmcgTWFwcywgR25vbWUgTWFwcywgT3BlblN0cmVldE1hcHNcbiogIEdlcm1hbiwgRHV0Y2ggYW5kIENoaW5lc2UgdHJhbnNsYXRpb25zXG5cblBsZWFzZSByZXBvcnQgYW55IGJ1Z3Mgb3Igc3VnZ2VzdGlvbnMgdG8gZXh0ZW5zaW9uIEdpdEh1YiBwYWdlIGJlbG93LiIsCiAgIm5hbWUiOiAiR29vZ2xlIEVhcnRoIFZpZXcgd2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvb2dsZWVhcnRod2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9lYXJ0aC12aWV3LXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIkdvb2dsZUVhcnRoV2FsbHBhcGVyQG5lZmZvLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "0s8xf16fxzizvpwg3lky0gkvsh732rh84wayj9nq3vq71ph2g4jz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gYSByYW5kb20gcGhvdG8gZnJvbSB0aGUgY3VyYXRlZCBHb29nbGUgRWFydGggVmlldyBjb2xsZWN0aW9uICgyNjAwKyBwaG90b3MpLlxuXG4qRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggR29vZ2xlIGluIGFueSB3YXkuIEltYWdlcyBhcmUgcHJvdGVjdGVkIGJ5IGNvcHlyaWdodCBhbmQgYXJlIGxpY2Vuc2VkIG9ubHkgZm9yIHVzZSBhcyB3YWxscGFwZXJzLlxuXG5TZWUgYWxzbyBteSBvdGhlciBleHRlbnNpb24sIEJpbmcgV2FsbHBhcGVyIENoYW5nZXIgKGh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9iaW5nLXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24pLlxuXG5GZWF0dXJlczpcbiogRmV0Y2hlcyBhIHJhbmRvbSBHb29nbGUgRWFydGggd2FsbHBhcGVyIGFuZCBzZXRzIGFzIGJvdGggbG9jayBzY3JlZW4gYW5kIGRlc2t0b3Agd2FsbHBhcGVyXG4qIFVzZXIgc2VsZWN0YWJsZSByZWZyZXNoIGludGVydmFscyAoZGVmYXVsdCBpcyBvbmNlIHBlciBkYXkpXG4qIFZpZXcgbG9jYXRpb24gb24gR29vZ2xlIE1hcHMsIEJpbmcgTWFwcywgR25vbWUgTWFwcywgT3BlblN0cmVldE1hcHNcbiogIEdlcm1hbiwgRHV0Y2ggYW5kIENoaW5lc2UgdHJhbnNsYXRpb25zXG5cblBsZWFzZSByZXBvcnQgYW55IGJ1Z3Mgb3Igc3VnZ2VzdGlvbnMgdG8gZXh0ZW5zaW9uIEdpdEh1YiBwYWdlIGJlbG93LiIsCiAgIm5hbWUiOiAiR29vZ2xlIEVhcnRoIFZpZXcgd2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvb2dsZWVhcnRod2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uZWZmby9lYXJ0aC12aWV3LXdhbGxwYXBlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIkdvb2dsZUVhcnRoV2FsbHBhcGVyQG5lZmZvLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} -, {"uuid": "gsconnect@andyholmes.github.io", "name": "GSConnect", "pname": "gsconnect", "description": "GSConnect is a complete implementation of KDE Connect especially for GNOME Shell with Nautilus, Chrome and Firefox integration. It does not rely on the KDE Connect desktop application and will not work with it installed.\n\nKDE Connect allows devices to securely share content like notifications or files and other features like SMS messaging and remote control. The KDE Connect team has applications for Linux, BSD, Android, Sailfish and Windows.\n\nPlease report issues on Github!", "link": "https://extensions.gnome.org/extension/1319/gsconnect/", "shell_version_map": {"38": {"version": "45", "sha256": "11hpgh2bhizdrgl4xc5iszsi6jxb9j80lph74226rnw6pi2nc19f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmR5aG9sbWVzL2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQ1Cn0="}, "40": {"version": "47", "sha256": "0s6a762n4r0fcvsi2a27qaxs0b4z12grqrq7sqj4vb498xyx14qv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5keWhvbG1lcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZ3Njb25uZWN0L3dpa2kiLAogICJ1dWlkIjogImdzY29ubmVjdEBhbmR5aG9sbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Nwp9"}, "41": {"version": "48", "sha256": "1mgwmnzkqlmlccw7z1f7bvn7ixp22kln52l2qy55553m59yxsswj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5keWhvbG1lcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZ3Njb25uZWN0L3dpa2kiLAogICJ1dWlkIjogImdzY29ubmVjdEBhbmR5aG9sbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0OAp9"}}} +, {"uuid": "gsconnect@andyholmes.github.io", "name": "GSConnect", "pname": "gsconnect", "description": "GSConnect is a complete implementation of KDE Connect especially for GNOME Shell with Nautilus, Chrome and Firefox integration. It does not rely on the KDE Connect desktop application and will not work with it installed.\n\nKDE Connect allows devices to securely share content like notifications or files and other features like SMS messaging and remote control. The KDE Connect team has applications for Linux, BSD, Android, Sailfish and Windows.\n\nPlease report issues on Github!", "link": "https://extensions.gnome.org/extension/1319/gsconnect/", "shell_version_map": {"38": {"version": "51", "sha256": "00mb2w724526gs0jskav00bc0y5dq1qybzczlahgc2znykqf1x8l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HU0Nvbm5lY3QvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWdzY29ubmVjdC93aWtpIiwKICAidXVpZCI6ICJnc2Nvbm5lY3RAYW5keWhvbG1lcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNTEKfQ=="}, "40": {"version": "47", "sha256": "0795yd6j8z2rgcv3fc8y2i4cnl4c8mni512jf776cfk745j5ck6p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQ3Cn0="}, "41": {"version": "49", "sha256": "15dh5qn9bmizgq9mcbk7nbja2arnc1bd9fvkkvhqm4kf4zlzf018", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "42": {"version": "50", "sha256": "1px9dm4zrn79zgvdc05mppi3jh09sjmkw07pbxrb8yhix3lhzal4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdTQ29ubmVjdCBpcyBhIGNvbXBsZXRlIGltcGxlbWVudGF0aW9uIG9mIEtERSBDb25uZWN0IGVzcGVjaWFsbHkgZm9yIEdOT01FIFNoZWxsIHdpdGggTmF1dGlsdXMsIENocm9tZSBhbmQgRmlyZWZveCBpbnRlZ3JhdGlvbi4gSXQgZG9lcyBub3QgcmVseSBvbiB0aGUgS0RFIENvbm5lY3QgZGVza3RvcCBhcHBsaWNhdGlvbiBhbmQgd2lsbCBub3Qgd29yayB3aXRoIGl0IGluc3RhbGxlZC5cblxuS0RFIENvbm5lY3QgYWxsb3dzIGRldmljZXMgdG8gc2VjdXJlbHkgc2hhcmUgY29udGVudCBsaWtlIG5vdGlmaWNhdGlvbnMgb3IgZmlsZXMgYW5kIG90aGVyIGZlYXR1cmVzIGxpa2UgU01TIG1lc3NhZ2luZyBhbmQgcmVtb3RlIGNvbnRyb2wuIFRoZSBLREUgQ29ubmVjdCB0ZWFtIGhhcyBhcHBsaWNhdGlvbnMgZm9yIExpbnV4LCBCU0QsIEFuZHJvaWQsIFNhaWxmaXNoIGFuZCBXaW5kb3dzLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBHaXRodWIhIiwKICAibmFtZSI6ICJHU0Nvbm5lY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR1NDb25uZWN0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1nc2Nvbm5lY3Qvd2lraSIsCiAgInV1aWQiOiAiZ3Njb25uZWN0QGFuZHlob2xtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUwCn0="}}} , {"uuid": "nvidiautil@ethanwharris", "name": "NVIDIA GPU Stats Tool", "pname": "nvidia-gpu-stats-tool", "description": "Shows NVIDIA GPU stats in the toolbar. Requires nvidia-settings or nvidia-smi. Includes Bumblebee support.", "link": "https://extensions.gnome.org/extension/1320/nvidia-gpu-stats-tool/", "shell_version_map": {"38": {"version": "8", "sha256": "12yi2kcq2rm1ddb8djjlffvk6dhpfd996wjhwdf4jch1r85r8a30", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIE5WSURJQSBHUFUgc3RhdHMgaW4gdGhlIHRvb2xiYXIuIFJlcXVpcmVzIG52aWRpYS1zZXR0aW5ncyBvciBudmlkaWEtc21pLiBJbmNsdWRlcyBCdW1ibGViZWUgc3VwcG9ydC4iLAogICJuYW1lIjogIk5WSURJQSBHUFUgU3RhdHMgVG9vbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5udmlkaWF1dGlsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXRoYW53aGFycmlzL2dub21lLW52aWRpYS1leHRlbnNpb24iLAogICJ1dWlkIjogIm52aWRpYXV0aWxAZXRoYW53aGFycmlzIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "pause-night-light@tijnschuurmans.nl", "name": "Pause Night Light", "pname": "pause-night-light", "description": "Disable Night Light for 10 seconds. This short interruption allows you to scan a colour code (e.g. Crontosign) from your screen.", "link": "https://extensions.gnome.org/extension/1327/pause-night-light/", "shell_version_map": {"40": {"version": "8", "sha256": "1j4yywvmwplbyjjwp79rxmfgsf7kv67v0d9rhbg6bnqw04bq91ki", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgTmlnaHQgTGlnaHQgZm9yIDEwIHNlY29uZHMuIFRoaXMgc2hvcnQgaW50ZXJydXB0aW9uIGFsbG93cyB5b3UgdG8gc2NhbiBhIGNvbG91ciBjb2RlIChlLmcuIENyb250b3NpZ24pIGZyb20geW91ciBzY3JlZW4uIiwKICAibmFtZSI6ICJQYXVzZSBOaWdodCBMaWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Rpam4vcGF1c2UtbmlnaHQtbGlnaHQiLAogICJ1dWlkIjogInBhdXNlLW5pZ2h0LWxpZ2h0QHRpam5zY2h1dXJtYW5zLm5sIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "disableworkspaceanim@owilliams.mixxx.org", "name": "Disable Workspace Switch Animation", "pname": "disable-workspace-switch-animation", "description": "Makes switching between workspaces instant without disabling other animations", "link": "https://extensions.gnome.org/extension/1328/disable-workspace-switch-animation/", "shell_version_map": {"38": {"version": "4", "sha256": "0yy5yddzaswfl5yv19layls3g2nwfj47x5zg131f43y7abgp7z4l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHN3aXRjaGluZyBiZXR3ZWVuIHdvcmtzcGFjZXMgaW5zdGFudCB3aXRob3V0IGRpc2FibGluZyBvdGhlciBhbmltYXRpb25zIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRpc2FibGV3b3Jrc3BhY2VhbmltQG93aWxsaWFtcy5taXh4eC5vcmciLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "5", "sha256": "1w7gxcgz5729vwfw3ih2ha4y3r07cgqh1kykqfnrhraqrjd4zvfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHN3aXRjaGluZyBiZXR3ZWVuIHdvcmtzcGFjZXMgaW5zdGFudCB3aXRob3V0IGRpc2FibGluZyBvdGhlciBhbmltYXRpb25zIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZXdvcmtzcGFjZWFuaW1Ab3dpbGxpYW1zLm1peHh4Lm9yZyIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1w7gxcgz5729vwfw3ih2ha4y3r07cgqh1kykqfnrhraqrjd4zvfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHN3aXRjaGluZyBiZXR3ZWVuIHdvcmtzcGFjZXMgaW5zdGFudCB3aXRob3V0IGRpc2FibGluZyBvdGhlciBhbmltYXRpb25zIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZXdvcmtzcGFjZWFuaW1Ab3dpbGxpYW1zLm1peHh4Lm9yZyIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "app-switcher_current_workspace_first@fawtytoo", "name": "App-Switcher Current Workspace First", "pname": "app-switcher-current-workspace-first", "description": "App-Switcher modification that sorts applications by current workspace first. It separates apps into 2 separate icons if the app also has windows on other workspaces.\n\nNOTE: The App Switcher is invoked by a keyboard shortcut which you can set in Gnome Settings > Navigation > Switch applications", "link": "https://extensions.gnome.org/extension/1329/app-switcher-current-workspace-first/", "shell_version_map": {"38": {"version": "12", "sha256": "0d1kjgi3f08msm900kf27y5vv1z8mbiy5ansh23gi60bj8bnalij", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcC1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyBhcHBsaWNhdGlvbnMgYnkgY3VycmVudCB3b3Jrc3BhY2UgZmlyc3QuIEl0IHNlcGFyYXRlcyBhcHBzIGludG8gMiBzZXBhcmF0ZSBpY29ucyBpZiB0aGUgYXBwIGFsc28gaGFzIHdpbmRvd3Mgb24gb3RoZXIgd29ya3NwYWNlcy5cblxuTk9URTogVGhlIEFwcCBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIGFwcGxpY2F0aW9ucyIsCiAgIm5hbWUiOiAiQXBwLVN3aXRjaGVyIEN1cnJlbnQgV29ya3NwYWNlIEZpcnN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mYXd0eXRvby9BcHAtU3dpdGNoZXItQ3VycmVudC1Xb3Jrc3BhY2UtRmlyc3QiLAogICJ1dWlkIjogImFwcC1zd2l0Y2hlcl9jdXJyZW50X3dvcmtzcGFjZV9maXJzdEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "0d1kjgi3f08msm900kf27y5vv1z8mbiy5ansh23gi60bj8bnalij", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcC1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyBhcHBsaWNhdGlvbnMgYnkgY3VycmVudCB3b3Jrc3BhY2UgZmlyc3QuIEl0IHNlcGFyYXRlcyBhcHBzIGludG8gMiBzZXBhcmF0ZSBpY29ucyBpZiB0aGUgYXBwIGFsc28gaGFzIHdpbmRvd3Mgb24gb3RoZXIgd29ya3NwYWNlcy5cblxuTk9URTogVGhlIEFwcCBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIGFwcGxpY2F0aW9ucyIsCiAgIm5hbWUiOiAiQXBwLVN3aXRjaGVyIEN1cnJlbnQgV29ya3NwYWNlIEZpcnN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mYXd0eXRvby9BcHAtU3dpdGNoZXItQ3VycmVudC1Xb3Jrc3BhY2UtRmlyc3QiLAogICJ1dWlkIjogImFwcC1zd2l0Y2hlcl9jdXJyZW50X3dvcmtzcGFjZV9maXJzdEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0d1kjgi3f08msm900kf27y5vv1z8mbiy5ansh23gi60bj8bnalij", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcC1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyBhcHBsaWNhdGlvbnMgYnkgY3VycmVudCB3b3Jrc3BhY2UgZmlyc3QuIEl0IHNlcGFyYXRlcyBhcHBzIGludG8gMiBzZXBhcmF0ZSBpY29ucyBpZiB0aGUgYXBwIGFsc28gaGFzIHdpbmRvd3Mgb24gb3RoZXIgd29ya3NwYWNlcy5cblxuTk9URTogVGhlIEFwcCBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIGFwcGxpY2F0aW9ucyIsCiAgIm5hbWUiOiAiQXBwLVN3aXRjaGVyIEN1cnJlbnQgV29ya3NwYWNlIEZpcnN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mYXd0eXRvby9BcHAtU3dpdGNoZXItQ3VycmVudC1Xb3Jrc3BhY2UtRmlyc3QiLAogICJ1dWlkIjogImFwcC1zd2l0Y2hlcl9jdXJyZW50X3dvcmtzcGFjZV9maXJzdEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "window-switcher_current_workspace_first@fawtytoo", "name": "Window-Switcher Current Workspace First", "pname": "window-switcher-current-workspace-first", "description": "Window-Switcher modification that sorts windows by current workspace first. The other windows are added according to their workspace.\n\nNOTE: The Window Switcher is invoked by a keyboard shortcut which you can set in Gnome Settings > Navigation > Switch windows", "link": "https://extensions.gnome.org/extension/1330/window-switcher-current-workspace-first/", "shell_version_map": {"38": {"version": "14", "sha256": "1rfdrcqxrp85cn65xnrg5ajcknhxsy2hpsygz0y15rld7hwqnsiy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF3dHl0b28vV2luZG93LVN3aXRjaGVyLUN1cnJlbnQtV29ya3NwYWNlLUZpcnN0IiwKICAidXVpZCI6ICJ3aW5kb3ctc3dpdGNoZXJfY3VycmVudF93b3Jrc3BhY2VfZmlyc3RAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "40": {"version": "14", "sha256": "1rfdrcqxrp85cn65xnrg5ajcknhxsy2hpsygz0y15rld7hwqnsiy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF3dHl0b28vV2luZG93LVN3aXRjaGVyLUN1cnJlbnQtV29ya3NwYWNlLUZpcnN0IiwKICAidXVpZCI6ICJ3aW5kb3ctc3dpdGNoZXJfY3VycmVudF93b3Jrc3BhY2VfZmlyc3RAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "1rfdrcqxrp85cn65xnrg5ajcknhxsy2hpsygz0y15rld7hwqnsiy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdy1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzb3J0cyB3aW5kb3dzIGJ5IGN1cnJlbnQgd29ya3NwYWNlIGZpcnN0LiBUaGUgb3RoZXIgd2luZG93cyBhcmUgYWRkZWQgYWNjb3JkaW5nIHRvIHRoZWlyIHdvcmtzcGFjZS5cblxuTk9URTogVGhlIFdpbmRvdyBTd2l0Y2hlciBpcyBpbnZva2VkIGJ5IGEga2V5Ym9hcmQgc2hvcnRjdXQgd2hpY2ggeW91IGNhbiBzZXQgaW4gR25vbWUgU2V0dGluZ3MgPiBOYXZpZ2F0aW9uID4gU3dpdGNoIHdpbmRvd3MiLAogICJuYW1lIjogIldpbmRvdy1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF3dHl0b28vV2luZG93LVN3aXRjaGVyLUN1cnJlbnQtV29ya3NwYWNlLUZpcnN0IiwKICAidXVpZCI6ICJ3aW5kb3ctc3dpdGNoZXJfY3VycmVudF93b3Jrc3BhY2VfZmlyc3RAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} -, {"uuid": "run-or-raise@edvard.cz", "name": "Run or raise", "pname": "run-or-raise", "description": "Launch or focus the window or define custom shortcuts in a text file", "link": "https://extensions.gnome.org/extension/1336/run-or-raise/", "shell_version_map": {"38": {"version": "15", "sha256": "04dnc1991a7g7f1lgvymiy9nzz74dfi9bnzgyn9mvzn3m02cqvxy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjMyLjEiLAogICAgIjMuMzYiLAogICAgIjMuMzguMSIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ1otTklDL3J1bi1vci1yYWlzZSIsCiAgInV1aWQiOiAicnVuLW9yLXJhaXNlQGVkdmFyZC5jeiIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "15", "sha256": "04dnc1991a7g7f1lgvymiy9nzz74dfi9bnzgyn9mvzn3m02cqvxy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjMyLjEiLAogICAgIjMuMzYiLAogICAgIjMuMzguMSIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ1otTklDL3J1bi1vci1yYWlzZSIsCiAgInV1aWQiOiAicnVuLW9yLXJhaXNlQGVkdmFyZC5jeiIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "04dnc1991a7g7f1lgvymiy9nzz74dfi9bnzgyn9mvzn3m02cqvxy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjMyLjEiLAogICAgIjMuMzYiLAogICAgIjMuMzguMSIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ1otTklDL3J1bi1vci1yYWlzZSIsCiAgInV1aWQiOiAicnVuLW9yLXJhaXNlQGVkdmFyZC5jeiIsCiAgInZlcnNpb24iOiAxNQp9"}}} +, {"uuid": "run-or-raise@edvard.cz", "name": "Run or raise", "pname": "run-or-raise", "description": "Launch or focus the window or define custom shortcuts in a text file", "link": "https://extensions.gnome.org/extension/1336/run-or-raise/", "shell_version_map": {"38": {"version": "16", "sha256": "0v7w4i849s9iz61wrnbz19q96xdbx4642r2ga02mx0zpq96grjvs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjMyLjEiLAogICAgIjMuMzYiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ1otTklDL3J1bi1vci1yYWlzZSIsCiAgInV1aWQiOiAicnVuLW9yLXJhaXNlQGVkdmFyZC5jeiIsCiAgInZlcnNpb24iOiAxNgp9"}, "40": {"version": "16", "sha256": "0v7w4i849s9iz61wrnbz19q96xdbx4642r2ga02mx0zpq96grjvs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjMyLjEiLAogICAgIjMuMzYiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ1otTklDL3J1bi1vci1yYWlzZSIsCiAgInV1aWQiOiAicnVuLW9yLXJhaXNlQGVkdmFyZC5jeiIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "0v7w4i849s9iz61wrnbz19q96xdbx4642r2ga02mx0zpq96grjvs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxhdW5jaCBvciBmb2N1cyB0aGUgd2luZG93IG9yIGRlZmluZSBjdXN0b20gc2hvcnRjdXRzIGluIGEgdGV4dCBmaWxlIiwKICAiZGlzYWJsZS1leHRlbnNpb24tdmVyc2lvbi12YWxpZGF0aW9uIjogdHJ1ZSwKICAibmFtZSI6ICJSdW4gb3IgcmFpc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucnVuLW9yLXJhaXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICIzLjMyLjEiLAogICAgIjMuMzYiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ1otTklDL3J1bi1vci1yYWlzZSIsCiAgInV1aWQiOiAicnVuLW9yLXJhaXNlQGVkdmFyZC5jeiIsCiAgInZlcnNpb24iOiAxNgp9"}}} , {"uuid": "show_applications_instead_of_overview@fawtytoo", "name": "Show Applications Instead Of Workspaces", "pname": "show-applications-instead-of-overview", "description": "The Overview will show Applications instead of Workspaces when invoked.", "link": "https://extensions.gnome.org/extension/1337/show-applications-instead-of-overview/", "shell_version_map": {"38": {"version": "7", "sha256": "1vx5hakip909pp4drh5rq3abcmhzal9g918dsh7gcgxsp2mdv08z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBPdmVydmlldyB3aWxsIHNob3cgQXBwbGljYXRpb25zIGluc3RlYWQgb2YgV29ya3NwYWNlcyB3aGVuIGludm9rZWQuIiwKICAibmFtZSI6ICJTaG93IEFwcGxpY2F0aW9ucyBJbnN0ZWFkIE9mIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzaG93X2FwcGxpY2F0aW9uc19pbnN0ZWFkX29mX292ZXJ2aWV3QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "1vx5hakip909pp4drh5rq3abcmhzal9g918dsh7gcgxsp2mdv08z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBPdmVydmlldyB3aWxsIHNob3cgQXBwbGljYXRpb25zIGluc3RlYWQgb2YgV29ya3NwYWNlcyB3aGVuIGludm9rZWQuIiwKICAibmFtZSI6ICJTaG93IEFwcGxpY2F0aW9ucyBJbnN0ZWFkIE9mIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzaG93X2FwcGxpY2F0aW9uc19pbnN0ZWFkX29mX292ZXJ2aWV3QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "1vx5hakip909pp4drh5rq3abcmhzal9g918dsh7gcgxsp2mdv08z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBPdmVydmlldyB3aWxsIHNob3cgQXBwbGljYXRpb25zIGluc3RlYWQgb2YgV29ya3NwYWNlcyB3aGVuIGludm9rZWQuIiwKICAibmFtZSI6ICJTaG93IEFwcGxpY2F0aW9ucyBJbnN0ZWFkIE9mIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzaG93X2FwcGxpY2F0aW9uc19pbnN0ZWFkX29mX292ZXJ2aWV3QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "hplip-menu@grizzlysmit.smit.id.au", "name": "Alternate Menu for Hplip", "pname": "hplip-menu", "description": "control your hp printers by calling the device manager hp-toolbox, also some useful links\nMotivation: the hp-systray doesn't work reliably under gnome shell\nyou need to have installed hplip in order to use this\nChoice of using a printer icon or a hp_logo.png if it's installed in the same place as mine on Ubuntu\nyou could use symbolic links to fake the path.", "link": "https://extensions.gnome.org/extension/1339/hplip-menu/", "shell_version_map": {"38": {"version": "11", "sha256": "1754xb6mn0jbkizm79kyjwbhyf1yld0jw8blddia9fn4s223j2rs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLiIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhwbGlwLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzguMSIsCiAgICAiMy4zOC4yIiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImhwbGlwLW1lbnVAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "1754xb6mn0jbkizm79kyjwbhyf1yld0jw8blddia9fn4s223j2rs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLiIsCiAgIm5hbWUiOiAiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhwbGlwLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzguMSIsCiAgICAiMy4zOC4yIiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImhwbGlwLW1lbnVAZ3JpenpseXNtaXQuc21pdC5pZC5hdSIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "notes@maestroschan.fr", "name": "Notes", "pname": "notes", "description": "Sticky notes for the GNOME Shell desktop.", "link": "https://extensions.gnome.org/extension/1357/notes/", "shell_version_map": {"38": {"version": "22", "sha256": "0svx60711cphswiigd1sswczk17cjxr7gr3davk4krkhya04llp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0aWNreSBub3RlcyBmb3IgdGhlIEdOT01FIFNoZWxsIGRlc2t0b3AuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90ZXMtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJOb3RlcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3Rlcy1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovbm90ZXMtZXh0ZW5zaW9uLWdub21lIiwKICAidXVpZCI6ICJub3Rlc0BtYWVzdHJvc2NoYW4uZnIiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} , {"uuid": "slinger@gfxmonk.net", "name": "slinger", "pname": "slinger", "description": "Sling windows around efficiently", "link": "https://extensions.gnome.org/extension/1372/slinger/", "shell_version_map": {"40": {"version": "7", "sha256": "1hpzcslqln0yz4kv216z8qqq9639sh1awp6q8c33d7jp11ydwhlj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaW5nIHdpbmRvd3MgYXJvdW5kIGVmZmljaWVudGx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2xpbmdlciIsCiAgIm5hbWUiOiAic2xpbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aW1iZXJ0c29uL3NsaW5nZXIiLAogICJ1dWlkIjogInNsaW5nZXJAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "unix-timestamp-clock@se1exin.github.com", "name": "Unix Timestamp Clock", "pname": "unix-timestamp-clock", "description": "Show the current unix timestamp as a clock in the top bar.\n\nCopy-paste currently shown timestamp (left mouse button) or current timestamp (any other mouse button) to clipboard", "link": "https://extensions.gnome.org/extension/1375/unix-timestamp-clock/", "shell_version_map": {"38": {"version": "5", "sha256": "11awssml3n1kza1inny4j89bkmgpldzcglwa26pyr432i4la0jh6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGN1cnJlbnQgdW5peCB0aW1lc3RhbXAgYXMgYSBjbG9jayBpbiB0aGUgdG9wIGJhci5cblxuQ29weS1wYXN0ZSBjdXJyZW50bHkgc2hvd24gdGltZXN0YW1wIChsZWZ0IG1vdXNlIGJ1dHRvbikgb3IgY3VycmVudCB0aW1lc3RhbXAgKGFueSBvdGhlciBtb3VzZSBidXR0b24pIHRvIGNsaXBib2FyZCIsCiAgIm5hbWUiOiAiVW5peCBUaW1lc3RhbXAgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZTFleGluL3VuaXgtdGltZXN0YW1wLWNsb2NrIiwKICAidXVpZCI6ICJ1bml4LXRpbWVzdGFtcC1jbG9ja0BzZTFleGluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "11awssml3n1kza1inny4j89bkmgpldzcglwa26pyr432i4la0jh6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGN1cnJlbnQgdW5peCB0aW1lc3RhbXAgYXMgYSBjbG9jayBpbiB0aGUgdG9wIGJhci5cblxuQ29weS1wYXN0ZSBjdXJyZW50bHkgc2hvd24gdGltZXN0YW1wIChsZWZ0IG1vdXNlIGJ1dHRvbikgb3IgY3VycmVudCB0aW1lc3RhbXAgKGFueSBvdGhlciBtb3VzZSBidXR0b24pIHRvIGNsaXBib2FyZCIsCiAgIm5hbWUiOiAiVW5peCBUaW1lc3RhbXAgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZTFleGluL3VuaXgtdGltZXN0YW1wLWNsb2NrIiwKICAidXVpZCI6ICJ1bml4LXRpbWVzdGFtcC1jbG9ja0BzZTFleGluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} -, {"uuid": "mprisindicatorbutton@JasonLG1979.github.io", "name": "Mpris Indicator Button", "pname": "mpris-indicator-button", "description": "A full featured MPRIS indicator.", "link": "https://extensions.gnome.org/extension/1379/mpris-indicator-button/", "shell_version_map": {"38": {"version": "19", "sha256": "03fs6j4xznzn6p81fw476faxyf0bag0jalsri3imwmpw1mfg18di", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbCBmZWF0dXJlZCBNUFJJUyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJNcHJpcyBJbmRpY2F0b3IgQnV0dG9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSmFzb25MRzE5NzkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1wcmlzLWluZGljYXRvci1idXR0b24vIiwKICAidXVpZCI6ICJtcHJpc2luZGljYXRvcmJ1dHRvbkBKYXNvbkxHMTk3OS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "40": {"version": "19", "sha256": "03fs6j4xznzn6p81fw476faxyf0bag0jalsri3imwmpw1mfg18di", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbCBmZWF0dXJlZCBNUFJJUyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJNcHJpcyBJbmRpY2F0b3IgQnV0dG9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSmFzb25MRzE5NzkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1wcmlzLWluZGljYXRvci1idXR0b24vIiwKICAidXVpZCI6ICJtcHJpc2luZGljYXRvcmJ1dHRvbkBKYXNvbkxHMTk3OS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "41": {"version": "19", "sha256": "03fs6j4xznzn6p81fw476faxyf0bag0jalsri3imwmpw1mfg18di", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbCBmZWF0dXJlZCBNUFJJUyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJNcHJpcyBJbmRpY2F0b3IgQnV0dG9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSmFzb25MRzE5NzkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1wcmlzLWluZGljYXRvci1idXR0b24vIiwKICAidXVpZCI6ICJtcHJpc2luZGljYXRvcmJ1dHRvbkBKYXNvbkxHMTk3OS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} +, {"uuid": "mprisindicatorbutton@JasonLG1979.github.io", "name": "Mpris Indicator Button", "pname": "mpris-indicator-button", "description": "A full featured MPRIS indicator.", "link": "https://extensions.gnome.org/extension/1379/mpris-indicator-button/", "shell_version_map": {"38": {"version": "20", "sha256": "0srkykxh1g9i3cih0rqkbwhbnylpx6qh0f6h2bzzmkpw4algf2ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbCBmZWF0dXJlZCBNUFJJUyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJNcHJpcyBJbmRpY2F0b3IgQnV0dG9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0phc29uTEcxOTc5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1tcHJpcy1pbmRpY2F0b3ItYnV0dG9uLyIsCiAgInV1aWQiOiAibXByaXNpbmRpY2F0b3JidXR0b25ASmFzb25MRzE5NzkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIwCn0="}, "40": {"version": "20", "sha256": "0srkykxh1g9i3cih0rqkbwhbnylpx6qh0f6h2bzzmkpw4algf2ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbCBmZWF0dXJlZCBNUFJJUyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJNcHJpcyBJbmRpY2F0b3IgQnV0dG9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0phc29uTEcxOTc5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1tcHJpcy1pbmRpY2F0b3ItYnV0dG9uLyIsCiAgInV1aWQiOiAibXByaXNpbmRpY2F0b3JidXR0b25ASmFzb25MRzE5NzkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "0srkykxh1g9i3cih0rqkbwhbnylpx6qh0f6h2bzzmkpw4algf2ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbCBmZWF0dXJlZCBNUFJJUyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJNcHJpcyBJbmRpY2F0b3IgQnV0dG9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0phc29uTEcxOTc5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1tcHJpcy1pbmRpY2F0b3ItYnV0dG9uLyIsCiAgInV1aWQiOiAibXByaXNpbmRpY2F0b3JidXR0b25ASmFzb25MRzE5NzkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIwCn0="}, "42": {"version": "20", "sha256": "0srkykxh1g9i3cih0rqkbwhbnylpx6qh0f6h2bzzmkpw4algf2ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZnVsbCBmZWF0dXJlZCBNUFJJUyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJNcHJpcyBJbmRpY2F0b3IgQnV0dG9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIkphc29uTEcxOTc5QGdpdGh1Yi5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0phc29uTEcxOTc5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1tcHJpcy1pbmRpY2F0b3ItYnV0dG9uLyIsCiAgInV1aWQiOiAibXByaXNpbmRpY2F0b3JidXR0b25ASmFzb25MRzE5NzkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIwCn0="}}} , {"uuid": "weatherintheclock@JasonLG1979.github.io", "name": "Weather In The Clock", "pname": "weather-in-the-clock", "description": "Display the current Weather in the Clock. GNOME Weather is required for this extension to function.", "link": "https://extensions.gnome.org/extension/1380/weather-in-the-clock/", "shell_version_map": {"38": {"version": "7", "sha256": "02aszdk2iswlqwkwi83gi69qzw0jwhill66qacrc7gg59mpfpq3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgV2VhdGhlciBpbiB0aGUgQ2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uLiIsCiAgIm5hbWUiOiAiV2VhdGhlciBJbiBUaGUgQ2xvY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiSmFzb25MRzE5NzlAZ2l0aHViLmlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0phc29uTEcxOTc5L2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLWluLXRoZS1jbG9jay8iLAogICJ1dWlkIjogIndlYXRoZXJpbnRoZWNsb2NrQEphc29uTEcxOTc5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "02aszdk2iswlqwkwi83gi69qzw0jwhill66qacrc7gg59mpfpq3b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgV2VhdGhlciBpbiB0aGUgQ2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uLiIsCiAgIm5hbWUiOiAiV2VhdGhlciBJbiBUaGUgQ2xvY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiSmFzb25MRzE5NzlAZ2l0aHViLmlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0phc29uTEcxOTc5L2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLWluLXRoZS1jbG9jay8iLAogICJ1dWlkIjogIndlYXRoZXJpbnRoZWNsb2NrQEphc29uTEcxOTc5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "LyricsFinder@alireza6677.gmail.com", "name": "Lyrics Finder", "pname": "lyrics-finder", "description": "Finding lyrics has never been easier\nJust play some music!\n\nIf you want to report a bug please don't forget to mention:\n- Gnome shell version\n- Your Linux distro\n- Extension version\n- Error messages (If you see any)\n", "link": "https://extensions.gnome.org/extension/1383/lyrics-finder/", "shell_version_map": {"40": {"version": "14", "sha256": "1x9d3npil0wgf44p276dslw5adw4gziij03r0jlw174yy87mn2lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbmRpbmcgbHlyaWNzIGhhcyBuZXZlciBiZWVuIGVhc2llclxuSnVzdCBwbGF5IHNvbWUgbXVzaWMhXG5cbklmIHlvdSB3YW50IHRvIHJlcG9ydCBhIGJ1ZyBwbGVhc2UgZG9uJ3QgZm9yZ2V0IHRvIG1lbnRpb246XG4tIEdub21lIHNoZWxsIHZlcnNpb25cbi0gWW91ciBMaW51eCBkaXN0cm9cbi0gRXh0ZW5zaW9uIHZlcnNpb25cbi0gRXJyb3IgbWVzc2FnZXMgKElmIHlvdSBzZWUgYW55KVxuIiwKICAibmFtZSI6ICJMeXJpY3MgRmluZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmx5cmljcy1maW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL1RoZVdlaXJkRGV2L2x5cmljcy1maW5kZXItZ25vbWUtZXh0IiwKICAidXVpZCI6ICJMeXJpY3NGaW5kZXJAYWxpcmV6YTY2NzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "NotificationCounter@coolllsk", "name": "Notification Counter", "pname": "notification-counter", "description": "Shows number of notifications in queue.", "link": "https://extensions.gnome.org/extension/1386/notification-counter/", "shell_version_map": {"40": {"version": "4", "sha256": "0lld50jlnqgrm66030s6djy1gs5wd29l5l2is6mwqzxm8kypxpx7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG51bWJlciBvZiBub3RpZmljYXRpb25zIGluIHF1ZXVlLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIENvdW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmtyaXphbi9Ob3RpZmljYXRpb25Db3VudGVyIiwKICAidXVpZCI6ICJOb3RpZmljYXRpb25Db3VudGVyQGNvb2xsbHNrIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "you2ber@konkor", "name": "you2ber", "pname": "you2ber", "description": "Gnome Youtube Downloader\n\n Simple helper for youtube-dl project. It allows you to save locally desired media content without any browser extensions. Just copy URL address of a media content to the clipboard and select desired quality profile or custom format for the item in the extension menu to store it.\n * Required the installation of ffmpeg (youtube-dl dependency for media manipulation)\n\nFor more information and how-to see README.md", "link": "https://extensions.gnome.org/extension/1392/you2ber/", "shell_version_map": {"40": {"version": "10", "sha256": "0dx5x22imwagx2j07xnayvd7zgsk7cyby7gh4jl935ndxmdp05fc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIFlvdXR1YmUgRG93bmxvYWRlclxuXG4gU2ltcGxlIGhlbHBlciBmb3IgeW91dHViZS1kbCBwcm9qZWN0LiBJdCBhbGxvd3MgeW91IHRvIHNhdmUgbG9jYWxseSBkZXNpcmVkIG1lZGlhIGNvbnRlbnQgd2l0aG91dCBhbnkgYnJvd3NlciBleHRlbnNpb25zLiBKdXN0IGNvcHkgVVJMIGFkZHJlc3Mgb2YgYSBtZWRpYSBjb250ZW50IHRvIHRoZSBjbGlwYm9hcmQgYW5kIHNlbGVjdCBkZXNpcmVkIHF1YWxpdHkgcHJvZmlsZSBvciBjdXN0b20gZm9ybWF0IGZvciB0aGUgaXRlbSBpbiB0aGUgZXh0ZW5zaW9uIG1lbnUgdG8gc3RvcmUgaXQuXG4gKiBSZXF1aXJlZCB0aGUgaW5zdGFsbGF0aW9uIG9mIGZmbXBlZyAoeW91dHViZS1kbCBkZXBlbmRlbmN5IGZvciBtZWRpYSBtYW5pcHVsYXRpb24pXG5cbkZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCBob3ctdG8gc2VlIFJFQURNRS5tZCIsCiAgIm5hbWUiOiAieW91MmJlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcua29ua29yLnlvdTJiZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29ua29yL3lvdTJiZXIiLAogICJ1dWlkIjogInlvdTJiZXJAa29ua29yIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "files-view@argonauta.framagit.org", "name": "Files View", "pname": "files-view", "description": "", "link": "https://extensions.gnome.org/extension/1395/files-view/", "shell_version_map": {"38": {"version": "11", "sha256": "0367kzrpzbx1b2l1m68n2pmazlsy4207a1anvyr2n1a4xpq3vwb0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiIsCiAgImdldHRleHQtZG9tYWluIjogImZpbGVzLXZpZXciLAogICJuYW1lIjogIkZpbGVzIFZpZXciLAogICJyZWNlbnRseS1vcGVuLXBlcnNpc3RlbnQtZmlsZW5hbWUiOiAicmVjZW50bHktb3Blbi1mb2xkZXJzLWZpbGVzLXZpZXctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLmpzb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZmlsZXMtdmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJmaWxlcy12aWV3QGFyZ29uYXV0YS5mcmFtYWdpdC5vcmciLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "bluetooth-quick-connect@bjarosze.gmail.com", "name": "Bluetooth Quick Connect", "pname": "bluetooth-quick-connect", "description": "Allow to connect to paired devices from gnome control panel.\n", "link": "https://extensions.gnome.org/extension/1401/bluetooth-quick-connect/", "shell_version_map": {"38": {"version": "16", "sha256": "1fkx12xx1m8pchyfvq0vmyd21m79s9s0jw4ackqg1nqcpwyqd1c3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmphcm9zemUvZ25vbWUtYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJ1dWlkIjogImJsdWV0b290aC1xdWljay1jb25uZWN0QGJqYXJvc3plLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}, "40": {"version": "26", "sha256": "1yg5prjxi4zg98bm0ni44qg037iybvpjr8jg4kr5l82vxxf6bvk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iamFyb3N6ZS9nbm9tZS1ibHVldG9vdGgtcXVpY2stY29ubmVjdCIsCiAgInV1aWQiOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3RAYmphcm9zemUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="}, "41": {"version": "26", "sha256": "1yg5prjxi4zg98bm0ni44qg037iybvpjr8jg4kr5l82vxxf6bvk1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIGNvbm5lY3QgdG8gcGFpcmVkIGRldmljZXMgZnJvbSBnbm9tZSBjb250cm9sIHBhbmVsLlxuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3QiLAogICJuYW1lIjogIkJsdWV0b290aCBRdWljayBDb25uZWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aC1xdWljay1jb25uZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iamFyb3N6ZS9nbm9tZS1ibHVldG9vdGgtcXVpY2stY29ubmVjdCIsCiAgInV1aWQiOiAiYmx1ZXRvb3RoLXF1aWNrLWNvbm5lY3RAYmphcm9zemUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="}}} -, {"uuid": "syspeek-gs@gs.eros2.info", "name": "SysPeek-GS", "pname": "syspeek-gs", "description": "Minimalistic CPU load monitor widget inspired by SysPeek indicator", "link": "https://extensions.gnome.org/extension/1409/syspeek-gs/", "shell_version_map": {"38": {"version": "8", "sha256": "0f4xwh74icf2hs6cg59d5drq89pwcb1hhr96m4k58gvqswfgxi00", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "0f4xwh74icf2hs6cg59d5drq89pwcb1hhr96m4k58gvqswfgxi00", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "0f4xwh74icf2hs6cg59d5drq89pwcb1hhr96m4k58gvqswfgxi00", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS9zeXNwZWVrLWdzIiwKICAidXVpZCI6ICJzeXNwZWVrLWdzQGdzLmVyb3MyLmluZm8iLAogICJ2ZXJzaW9uIjogOAp9"}}} -, {"uuid": "discrete-brightness@gs.eros2.info", "name": "Discrete brightness", "pname": "discrete-brightness", "description": "Discrete brightness indicator change brightness in discrete steps, unlike default smooth brightness bar in Gnome Shell", "link": "https://extensions.gnome.org/extension/1410/discrete-brightness/", "shell_version_map": {"38": {"version": "6", "sha256": "0j7nxjkx6qgnggwy8jx5cy9qjn2rxgmbjjvadwkxh0rqk2mcvfq1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZSBicmlnaHRuZXNzIGluIGRpc2NyZXRlIHN0ZXBzLCB1bmxpa2UgZGVmYXVsdCBzbW9vdGggYnJpZ2h0bmVzcyBiYXIgaW4gR25vbWUgU2hlbGwiLAogICJuYW1lIjogIkRpc2NyZXRlIGJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vZGlzY3JldGUtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZGlzY3JldGUtYnJpZ2h0bmVzc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "0j7nxjkx6qgnggwy8jx5cy9qjn2rxgmbjjvadwkxh0rqk2mcvfq1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZSBicmlnaHRuZXNzIGluIGRpc2NyZXRlIHN0ZXBzLCB1bmxpa2UgZGVmYXVsdCBzbW9vdGggYnJpZ2h0bmVzcyBiYXIgaW4gR25vbWUgU2hlbGwiLAogICJuYW1lIjogIkRpc2NyZXRlIGJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vZGlzY3JldGUtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZGlzY3JldGUtYnJpZ2h0bmVzc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0j7nxjkx6qgnggwy8jx5cy9qjn2rxgmbjjvadwkxh0rqk2mcvfq1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZSBicmlnaHRuZXNzIGluIGRpc2NyZXRlIHN0ZXBzLCB1bmxpa2UgZGVmYXVsdCBzbW9vdGggYnJpZ2h0bmVzcyBiYXIgaW4gR25vbWUgU2hlbGwiLAogICJuYW1lIjogIkRpc2NyZXRlIGJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vZGlzY3JldGUtYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZGlzY3JldGUtYnJpZ2h0bmVzc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} +, {"uuid": "syspeek-gs@gs.eros2.info", "name": "SysPeek-GS", "pname": "syspeek-gs", "description": "Minimalistic CPU load monitor widget inspired by SysPeek indicator", "link": "https://extensions.gnome.org/extension/1409/syspeek-gs/", "shell_version_map": {"38": {"version": "10", "sha256": "1hv65wfhd24i773pngr4s5if9n0ailb1lmn9dk01b93nhcxdbynf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vc3lzcGVlay1ncyIsCiAgInV1aWQiOiAic3lzcGVlay1nc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "1hv65wfhd24i773pngr4s5if9n0ailb1lmn9dk01b93nhcxdbynf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vc3lzcGVlay1ncyIsCiAgInV1aWQiOiAic3lzcGVlay1nc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1hv65wfhd24i773pngr4s5if9n0ailb1lmn9dk01b93nhcxdbynf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vc3lzcGVlay1ncyIsCiAgInV1aWQiOiAic3lzcGVlay1nc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "1hv65wfhd24i773pngr4s5if9n0ailb1lmn9dk01b93nhcxdbynf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltYWxpc3RpYyBDUFUgbG9hZCBtb25pdG9yIHdpZGdldCBpbnNwaXJlZCBieSBTeXNQZWVrIGluZGljYXRvciIsCiAgIm5hbWUiOiAiU3lzUGVlay1HUyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2V1Z2VuZS1yb20vc3lzcGVlay1ncyIsCiAgInV1aWQiOiAic3lzcGVlay1nc0Bncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"uuid": "discrete-brightness@gs.eros2.info", "name": "Discrete brightness", "pname": "discrete-brightness", "description": "Discrete brightness indicator change brightness in discrete steps, unlike default smooth brightness bar in Gnome Shell", "link": "https://extensions.gnome.org/extension/1410/discrete-brightness/", "shell_version_map": {"38": {"version": "7", "sha256": "0kn8c4zm9d7n56qg5wmj8q3cqqhrzd2h2jj6r7x718gyv84m14mv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZSBicmlnaHRuZXNzIGluIGRpc2NyZXRlIHN0ZXBzLCB1bmxpa2UgZGVmYXVsdCBzbW9vdGggYnJpZ2h0bmVzcyBiYXIgaW4gR25vbWUgU2hlbGwiLAogICJuYW1lIjogIkRpc2NyZXRlIGJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL2Rpc2NyZXRlLWJyaWdodG5lc3MiLAogICJ1dWlkIjogImRpc2NyZXRlLWJyaWdodG5lc3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "0kn8c4zm9d7n56qg5wmj8q3cqqhrzd2h2jj6r7x718gyv84m14mv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZSBicmlnaHRuZXNzIGluIGRpc2NyZXRlIHN0ZXBzLCB1bmxpa2UgZGVmYXVsdCBzbW9vdGggYnJpZ2h0bmVzcyBiYXIgaW4gR25vbWUgU2hlbGwiLAogICJuYW1lIjogIkRpc2NyZXRlIGJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL2Rpc2NyZXRlLWJyaWdodG5lc3MiLAogICJ1dWlkIjogImRpc2NyZXRlLWJyaWdodG5lc3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "0kn8c4zm9d7n56qg5wmj8q3cqqhrzd2h2jj6r7x718gyv84m14mv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZSBicmlnaHRuZXNzIGluIGRpc2NyZXRlIHN0ZXBzLCB1bmxpa2UgZGVmYXVsdCBzbW9vdGggYnJpZ2h0bmVzcyBiYXIgaW4gR25vbWUgU2hlbGwiLAogICJuYW1lIjogIkRpc2NyZXRlIGJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL2Rpc2NyZXRlLWJyaWdodG5lc3MiLAogICJ1dWlkIjogImRpc2NyZXRlLWJyaWdodG5lc3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "0kn8c4zm9d7n56qg5wmj8q3cqqhrzd2h2jj6r7x718gyv84m14mv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2NyZXRlIGJyaWdodG5lc3MgaW5kaWNhdG9yIGNoYW5nZSBicmlnaHRuZXNzIGluIGRpc2NyZXRlIHN0ZXBzLCB1bmxpa2UgZGVmYXVsdCBzbW9vdGggYnJpZ2h0bmVzcyBiYXIgaW4gR25vbWUgU2hlbGwiLAogICJuYW1lIjogIkRpc2NyZXRlIGJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL2Rpc2NyZXRlLWJyaWdodG5lc3MiLAogICJ1dWlkIjogImRpc2NyZXRlLWJyaWdodG5lc3NAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "quake-mode@repsac-by.github.com", "name": "quake-mode", "pname": "quake-mode", "description": "Drop-down mode for any application", "link": "https://extensions.gnome.org/extension/1411/quake-mode/", "shell_version_map": {"38": {"version": "3", "sha256": "17498v2jw85fhrsldvgnj3x01h00wqarsp9zqp6ym4h7syzbjxrw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyb3AtZG93biBtb2RlIGZvciBhbnkgYXBwbGljYXRpb24iLAogICJuYW1lIjogInF1YWtlLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yZXBzYWMtYnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXF1YWtlLW1vZGUiLAogICJ1dWlkIjogInF1YWtlLW1vZGVAcmVwc2FjLWJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "5", "sha256": "07vhkpgck80facrds1zy6c6hk10fb06yhj1x5gay1vykv7msnqi7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyb3AtZG93biBtb2RlIGZvciBhbnkgYXBwbGljYXRpb24iLAogICJuYW1lIjogInF1YWtlLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JlcHNhYy1ieS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcXVha2UtbW9kZSIsCiAgInV1aWQiOiAicXVha2UtbW9kZUByZXBzYWMtYnkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "07vhkpgck80facrds1zy6c6hk10fb06yhj1x5gay1vykv7msnqi7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyb3AtZG93biBtb2RlIGZvciBhbnkgYXBwbGljYXRpb24iLAogICJuYW1lIjogInF1YWtlLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JlcHNhYy1ieS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcXVha2UtbW9kZSIsCiAgInV1aWQiOiAicXVha2UtbW9kZUByZXBzYWMtYnkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "unblank@sun.wxg@gmail.com", "name": "Unblank lock screen", "pname": "unblank", "description": "Unblank lock screen.", "link": "https://extensions.gnome.org/extension/1414/unblank/", "shell_version_map": {"38": {"version": "20", "sha256": "0fb2vbjgl93a0maw9wxw1x47ndfg40gf087rmfk7lgxr8b6vp9si", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuYmxhbmsgbG9jayBzY3JlZW4uIiwKICAibmFtZSI6ICJVbmJsYW5rIGxvY2sgc2NyZWVuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdW5ibGFuayIsCiAgInV1aWQiOiAidW5ibGFua0BzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "22", "sha256": "1kb7l1q7dvz5z5xrmhgm48jabblh81n8cm34ck711psy4rv1ljy2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuYmxhbmsgbG9jayBzY3JlZW4uIiwKICAibmFtZSI6ICJVbmJsYW5rIGxvY2sgc2NyZWVuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuYmxhbmsiLAogICJ1dWlkIjogInVuYmxhbmtAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "26", "sha256": "1ifjqawnnksnfhh05yxpzz7jk3nz3sd3rzdg12i6g35kf7w0gmln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVuYmxhbmsgbG9jayBzY3JlZW4uIiwKICAibmFtZSI6ICJVbmJsYW5rIGxvY2sgc2NyZWVuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuYmxhbmsiLAogICJ1dWlkIjogInVuYmxhbmtAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjYKfQ=="}}} -, {"uuid": "vbox-applet@gs.eros2.info", "name": "VirtualBox applet", "pname": "virtualbox-applet", "description": "Provide menu to run VirtualBox machines and switch between running VMs", "link": "https://extensions.gnome.org/extension/1415/virtualbox-applet/", "shell_version_map": {"38": {"version": "9", "sha256": "1dpda9g9nknjbc7wfzhdahly3w3mvqw6r4qqdrhylsc3kqq858ay", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "9", "sha256": "1dpda9g9nknjbc7wfzhdahly3w3mvqw6r4qqdrhylsc3kqq858ay", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1dpda9g9nknjbc7wfzhdahly3w3mvqw6r4qqdrhylsc3kqq858ay", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ldWdlbmUtcm9tL3Zib3gtYXBwbGV0IiwKICAidXVpZCI6ICJ2Ym94LWFwcGxldEBncy5lcm9zMi5pbmZvIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} +, {"uuid": "vbox-applet@gs.eros2.info", "name": "VirtualBox applet", "pname": "virtualbox-applet", "description": "Provide menu to run VirtualBox machines and switch between running VMs", "link": "https://extensions.gnome.org/extension/1415/virtualbox-applet/", "shell_version_map": {"38": {"version": "11", "sha256": "0sw84xiz1r2i0iza76ybywd9mcw0npgls08hzms4kl4fpbd1g3ym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS92Ym94LWFwcGxldCIsCiAgInV1aWQiOiAidmJveC1hcHBsZXRAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "0sw84xiz1r2i0iza76ybywd9mcw0npgls08hzms4kl4fpbd1g3ym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS92Ym94LWFwcGxldCIsCiAgInV1aWQiOiAidmJveC1hcHBsZXRAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "0sw84xiz1r2i0iza76ybywd9mcw0npgls08hzms4kl4fpbd1g3ym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS92Ym94LWFwcGxldCIsCiAgInV1aWQiOiAidmJveC1hcHBsZXRAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "0sw84xiz1r2i0iza76ybywd9mcw0npgls08hzms4kl4fpbd1g3ym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgbWVudSB0byBydW4gVmlydHVhbEJveCBtYWNoaW5lcyBhbmQgc3dpdGNoIGJldHdlZW4gcnVubmluZyBWTXMiLAogICJuYW1lIjogIlZpcnR1YWxCb3ggYXBwbGV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnZib3gtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXVnZW5lLXJvbS92Ym94LWFwcGxldCIsCiAgInV1aWQiOiAidmJveC1hcHBsZXRAZ3MuZXJvczIuaW5mbyIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "stocks@infinicode.de", "name": "Stocks Extension", "pname": "stocks-extension", "description": "Stocks Extension brings stock quotes to your GNOME Shell Panel", "link": "https://extensions.gnome.org/extension/1422/stocks-extension/", "shell_version_map": {"38": {"version": "19", "sha256": "1414cksayqpv0w0q632yi33ifqlwyfggwf684aci6qj81fs644y2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0b2NrcyBFeHRlbnNpb24gYnJpbmdzIHN0b2NrIHF1b3RlcyB0byB5b3VyIEdOT01FIFNoZWxsIFBhbmVsIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTdG9ja3MgRXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMvc3RvY2tzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RvY2tzQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "40": {"version": "19", "sha256": "1414cksayqpv0w0q632yi33ifqlwyfggwf684aci6qj81fs644y2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0b2NrcyBFeHRlbnNpb24gYnJpbmdzIHN0b2NrIHF1b3RlcyB0byB5b3VyIEdOT01FIFNoZWxsIFBhbmVsIiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTdG9ja3MgRXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMvc3RvY2tzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RvY2tzQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} , {"uuid": "showtime@xenlism.github.io", "name": "Showtime - Desktop Widget", "pname": "showtime", "description": "Date &amp;amp;amp;amp;amp;amp; Clock Desktop Widget\n\nMove Widget by Press Super + Drag Widget\nhttps://github.com/xenlism/showtime", "link": "https://extensions.gnome.org/extension/1429/showtime/", "shell_version_map": {"38": {"version": "4", "sha256": "12k6spjhg2ykgh5x3mily0dps450pyj9vyv1bay5w919y9swplaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRhdGUgJmFtcDthbXA7YW1wO2FtcDthbXA7YW1wO2FtcDsgQ2xvY2sgRGVza3RvcCBXaWRnZXRcblxuTW92ZSBXaWRnZXQgYnkgUHJlc3MgU3VwZXIgKyBEcmFnIFdpZGdldFxuaHR0cHM6Ly9naXRodWIuY29tL3hlbmxpc20vc2hvd3RpbWUiLAogICJuYW1lIjogIlNob3d0aW1lICAtIERlc2t0b3AgV2lkZ2V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3d0aW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veGVubGlzbS9zaG93dGltZSIsCiAgInV1aWQiOiAic2hvd3RpbWVAeGVubGlzbS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "5", "sha256": "0p10as2k6lkh3vj5860hvmj98by18ih8r2k7y36iqrxqpl3s8fd4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRhdGUgJmFtcDthbXA7YW1wO2FtcDthbXA7YW1wO2FtcDsgQ2xvY2sgRGVza3RvcCBXaWRnZXRcblxuTW92ZSBXaWRnZXQgYnkgUHJlc3MgU3VwZXIgKyBEcmFnIFdpZGdldFxuaHR0cHM6Ly9naXRodWIuY29tL3hlbmxpc20vc2hvd3RpbWUiLAogICJuYW1lIjogIlNob3d0aW1lICAtIERlc2t0b3AgV2lkZ2V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3d0aW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hlbmxpc20vc2hvd3RpbWUiLAogICJ1dWlkIjogInNob3d0aW1lQHhlbmxpc20uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "Current_screen_only_for_Alternate_Tab@bourcereau.fr", "name": "Current screen only on window switcher", "pname": "current-screen-only-for-alternate-tab", "description": "Limits the windows shown on the switcher to those of the current monitor", "link": "https://extensions.gnome.org/extension/1437/current-screen-only-for-alternate-tab/", "shell_version_map": {"40": {"version": "8", "sha256": "0x4idd6ba55qxsnx8fplgamdjj0f2hmv2sv2vbn3m3wavd4n0w27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpbWl0cyB0aGUgd2luZG93cyBzaG93biBvbiB0aGUgc3dpdGNoZXIgdG8gdGhvc2Ugb2YgdGhlIGN1cnJlbnQgbW9uaXRvciIsCiAgIm5hbWUiOiAiQ3VycmVudCBzY3JlZW4gb25seSBvbiB3aW5kb3cgc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21tYWkvQ3VycmVudF9zY3JlZW5fb25seV9vbl93aW5kb3dfc3dpdGNoZXIiLAogICJ1dWlkIjogIkN1cnJlbnRfc2NyZWVuX29ubHlfZm9yX0FsdGVybmF0ZV9UYWJAYm91cmNlcmVhdS5mciIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0x4idd6ba55qxsnx8fplgamdjj0f2hmv2sv2vbn3m3wavd4n0w27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpbWl0cyB0aGUgd2luZG93cyBzaG93biBvbiB0aGUgc3dpdGNoZXIgdG8gdGhvc2Ugb2YgdGhlIGN1cnJlbnQgbW9uaXRvciIsCiAgIm5hbWUiOiAiQ3VycmVudCBzY3JlZW4gb25seSBvbiB3aW5kb3cgc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21tYWkvQ3VycmVudF9zY3JlZW5fb25seV9vbl93aW5kb3dfc3dpdGNoZXIiLAogICJ1dWlkIjogIkN1cnJlbnRfc2NyZWVuX29ubHlfZm9yX0FsdGVybmF0ZV9UYWJAYm91cmNlcmVhdS5mciIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "kube_config@vvbogdanov87.gmail.com", "name": "Kube Config", "pname": "kube-config", "description": "Switches kube config context", "link": "https://extensions.gnome.org/extension/1442/kube-config/", "shell_version_map": {"40": {"version": "14", "sha256": "125gbiim4d3kpycjncvqmxqgz3i1c15kkyx2rmgkc2wpzx0gyc6i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGt1YmUgY29uZmlnIGNvbnRleHQiLAogICJuYW1lIjogIkt1YmUgQ29uZmlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmUtY29uZmlnIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92dmJvZ2Rhbm92ODcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWt1YmVjb25maWciLAogICJ1dWlkIjogImt1YmVfY29uZmlnQHZ2Ym9nZGFub3Y4Ny5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "125gbiim4d3kpycjncvqmxqgz3i1c15kkyx2rmgkc2wpzx0gyc6i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGt1YmUgY29uZmlnIGNvbnRleHQiLAogICJuYW1lIjogIkt1YmUgQ29uZmlnIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmUtY29uZmlnIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92dmJvZ2Rhbm92ODcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWt1YmVjb25maWciLAogICJ1dWlkIjogImt1YmVfY29uZmlnQHZ2Ym9nZGFub3Y4Ny5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} -, {"uuid": "transparent-window-moving@noobsai.github.com", "name": "Transparent Window Moving", "pname": "transparent-window-moving", "description": "Makes the window semi-transparent when moving or resizing", "link": "https://extensions.gnome.org/extension/1446/transparent-window-moving/", "shell_version_map": {"38": {"version": "6", "sha256": "0vllnrscjaqx77wb44803q6n3wk590dxacjfsw7ympbgqhikzc0p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS90cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "9", "sha256": "1da8vldknv6v5b4wdxd9a7q9i4mla92wxj5l48g3ja8xa1rz8bgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL3RyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmciLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmdAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1da8vldknv6v5b4wdxd9a7q9i4mla92wxj5l48g3ja8xa1rz8bgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL3RyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmciLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXdpbmRvdy1tb3ZpbmdAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} +, {"uuid": "transparent-window-moving@noobsai.github.com", "name": "Transparent Window Moving", "pname": "transparent-window-moving", "description": "Makes the window semi-transparent when moving or resizing", "link": "https://extensions.gnome.org/extension/1446/transparent-window-moving/", "shell_version_map": {"38": {"version": "6", "sha256": "0vllnrscjaqx77wb44803q6n3wk590dxacjfsw7ympbgqhikzc0p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS90cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "10", "sha256": "1cygayp1kaykm7ldsdbn6qpxi80ddipvlhl6i89sca33yrwisz3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS90cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1cygayp1kaykm7ldsdbn6qpxi80ddipvlhl6i89sca33yrwisz3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS90cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "1cygayp1kaykm7ldsdbn6qpxi80ddipvlhl6i89sca33yrwisz3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSB3aW5kb3cgc2VtaS10cmFuc3BhcmVudCB3aGVuIG1vdmluZyBvciByZXNpemluZyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgV2luZG93IE1vdmluZyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS90cmFuc3BhcmVudC13aW5kb3ctbW92aW5nIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC13aW5kb3ctbW92aW5nQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "transparent-window@pbxqdown.github.com", "name": "Transparent Window", "pname": "transparent-window", "description": "Change the opacity of windows by compiz-style shortcut Alt+scroll.\nYou can customize hotkey in Preference page if Alt key doesn't work.", "link": "https://extensions.gnome.org/extension/1454/transparent-window/", "shell_version_map": {"38": {"version": "7", "sha256": "09nhn8f7d8c1kp8hgw49y0d9165ckvgn6my339k0pzga02d277a6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "miniview@thesecretaryofwar.com", "name": "Miniview", "pname": "miniview", "description": "Shows a mini preview of another window (like picture-in-picture on a TV)\n- Left-mouse drag: move preview window\n- Right-mouse drag (or ctrl + left mouse drag): resize preview window\n- Scroll wheel: change target window\n- Double click: raise target window\n- Shift + F12: toggle preview window (this can be changed or disabled in preferences)\n- Ctrl + scroll wheel: adjust opacity", "link": "https://extensions.gnome.org/extension/1459/miniview/", "shell_version_map": {"38": {"version": "13", "sha256": "0nf2jxd9kvw7nzb992730xidg7kf4iywy8yr5mj9152bi2nmblz6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgbWluaSBwcmV2aWV3IG9mIGFub3RoZXIgd2luZG93IChsaWtlIHBpY3R1cmUtaW4tcGljdHVyZSBvbiBhIFRWKVxuLSBMZWZ0LW1vdXNlIGRyYWc6IG1vdmUgcHJldmlldyB3aW5kb3dcbi0gUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuLSBTY3JvbGwgd2hlZWw6IGNoYW5nZSB0YXJnZXQgd2luZG93XG4tIERvdWJsZSBjbGljazogcmFpc2UgdGFyZ2V0IHdpbmRvd1xuLSBTaGlmdCArIEYxMjogdG9nZ2xlIHByZXZpZXcgd2luZG93ICh0aGlzIGNhbiBiZSBjaGFuZ2VkIG9yIGRpc2FibGVkIGluIHByZWZlcmVuY2VzKVxuLSBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWFtbGVtZWMvbWluaXZpZXciLAogICJ1dWlkIjogIm1pbml2aWV3QHRoZXNlY3JldGFyeW9md2FyLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "12", "sha256": "0p26h4dgxja8iww5mjzxzwmr2fx0hz8wphxqal14xm83k1nsl4ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgbWluaSBwcmV2aWV3IG9mIGFub3RoZXIgd2luZG93IChsaWtlIHBpY3R1cmUtaW4tcGljdHVyZSBvbiBhIFRWKVxuLSBMZWZ0LW1vdXNlIGRyYWc6IG1vdmUgcHJldmlldyB3aW5kb3dcbi0gUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuLSBTY3JvbGwgd2hlZWw6IGNoYW5nZSB0YXJnZXQgd2luZG93XG4tIERvdWJsZSBjbGljazogcmFpc2UgdGFyZ2V0IHdpbmRvd1xuLSBTaGlmdCArIEYxMjogdG9nZ2xlIHByZXZpZXcgd2luZG93ICh0aGlzIGNhbiBiZSBjaGFuZ2VkIG9yIGRpc2FibGVkIGluIHByZWZlcmVuY2VzKVxuLSBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5hbHBoYSIsCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWFtbGVtZWMvbWluaXZpZXciLAogICJ1dWlkIjogIm1pbml2aWV3QHRoZXNlY3JldGFyeW9md2FyLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0p26h4dgxja8iww5mjzxzwmr2fx0hz8wphxqal14xm83k1nsl4ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgbWluaSBwcmV2aWV3IG9mIGFub3RoZXIgd2luZG93IChsaWtlIHBpY3R1cmUtaW4tcGljdHVyZSBvbiBhIFRWKVxuLSBMZWZ0LW1vdXNlIGRyYWc6IG1vdmUgcHJldmlldyB3aW5kb3dcbi0gUmlnaHQtbW91c2UgZHJhZyAob3IgY3RybCArIGxlZnQgbW91c2UgZHJhZyk6IHJlc2l6ZSBwcmV2aWV3IHdpbmRvd1xuLSBTY3JvbGwgd2hlZWw6IGNoYW5nZSB0YXJnZXQgd2luZG93XG4tIERvdWJsZSBjbGljazogcmFpc2UgdGFyZ2V0IHdpbmRvd1xuLSBTaGlmdCArIEYxMjogdG9nZ2xlIHByZXZpZXcgd2luZG93ICh0aGlzIGNhbiBiZSBjaGFuZ2VkIG9yIGRpc2FibGVkIGluIHByZWZlcmVuY2VzKVxuLSBDdHJsICsgc2Nyb2xsIHdoZWVsOiBhZGp1c3Qgb3BhY2l0eSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtaW5pdmlldyIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIk1pbml2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aGVzZWNyZXRhcnlvZndhckBnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pbml2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5hbHBoYSIsCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWFtbGVtZWMvbWluaXZpZXciLAogICJ1dWlkIjogIm1pbml2aWV3QHRoZXNlY3JldGFyeW9md2FyLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}}} -, {"uuid": "Vitals@CoreCoding.com", "name": "Vitals", "pname": "vitals", "description": "A glimpse into your computer's temperature, voltage, fan speed, memory usage, processor load, system resources, network speed and storage stats. This is a one stop shop to monitor all of your vital sensors. Uses asynchronous polling to provide a smooth user experience. Feature requests or bugs? Please use GitHub.", "link": "https://extensions.gnome.org/extension/1460/vitals/", "shell_version_map": {"38": {"version": "46", "sha256": "1vmyymqvdwgfkhlkav0yjariis1r708pm08d0d1l1nzl5g20vgyy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb3JlY29kaW5nL1ZpdGFscyIsCiAgInV1aWQiOiAiVml0YWxzQENvcmVDb2RpbmcuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "40": {"version": "46", "sha256": "1vmyymqvdwgfkhlkav0yjariis1r708pm08d0d1l1nzl5g20vgyy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb3JlY29kaW5nL1ZpdGFscyIsCiAgInV1aWQiOiAiVml0YWxzQENvcmVDb2RpbmcuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "41": {"version": "46", "sha256": "1vmyymqvdwgfkhlkav0yjariis1r708pm08d0d1l1nzl5g20vgyy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jb3JlY29kaW5nL1ZpdGFscyIsCiAgInV1aWQiOiAiVml0YWxzQENvcmVDb2RpbmcuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}}} -, {"uuid": "panel-date-format@keiii.github.com", "name": "Panel Date Format", "pname": "panel-date-format", "description": "Allows to customize the date format on the panel.", "link": "https://extensions.gnome.org/extension/1462/panel-date-format/", "shell_version_map": {"40": {"version": "4", "sha256": "0138as8506ql2k4v0y0qp66zbgqxxmb0g4ymcjkxyi4w9lmp9pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LRUlJSS9nbm9tZS1zaGVsbC1wYW5lbC1kYXRlLWZvcm1hdCIsCiAgInV1aWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAa2VpaWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "0138as8506ql2k4v0y0qp66zbgqxxmb0g4ymcjkxyi4w9lmp9pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LRUlJSS9nbm9tZS1zaGVsbC1wYW5lbC1kYXRlLWZvcm1hdCIsCiAgInV1aWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAa2VpaWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "Vitals@CoreCoding.com", "name": "Vitals", "pname": "vitals", "description": "A glimpse into your computer's temperature, voltage, fan speed, memory usage, processor load, system resources, network speed and storage stats. This is a one stop shop to monitor all of your vital sensors. Uses asynchronous polling to provide a smooth user experience. Feature requests or bugs? Please use GitHub.", "link": "https://extensions.gnome.org/extension/1460/vitals/", "shell_version_map": {"38": {"version": "52", "sha256": "07v6g5yg3pzzghja1yvzgafvzw8mn9zfydx3mxk8phixbkj93cdn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "40": {"version": "52", "sha256": "07v6g5yg3pzzghja1yvzgafvzw8mn9zfydx3mxk8phixbkj93cdn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "41": {"version": "52", "sha256": "07v6g5yg3pzzghja1yvzgafvzw8mn9zfydx3mxk8phixbkj93cdn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "42": {"version": "52", "sha256": "07v6g5yg3pzzghja1yvzgafvzw8mn9zfydx3mxk8phixbkj93cdn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}}} +, {"uuid": "panel-date-format@keiii.github.com", "name": "Panel Date Format", "pname": "panel-date-format", "description": "Allows to customize the date format on the panel.", "link": "https://extensions.gnome.org/extension/1462/panel-date-format/", "shell_version_map": {"40": {"version": "7", "sha256": "0afqf8hkmg1fmnz0nn6jq6k7yl7vs69w0malqhf1bqfsn5w7ksdw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS0VJSUkvZ25vbWUtc2hlbGwtcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGtlaWlpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0afqf8hkmg1fmnz0nn6jq6k7yl7vs69w0malqhf1bqfsn5w7ksdw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS0VJSUkvZ25vbWUtc2hlbGwtcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGtlaWlpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "0afqf8hkmg1fmnz0nn6jq6k7yl7vs69w0malqhf1bqfsn5w7ksdw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS0VJSUkvZ25vbWUtc2hlbGwtcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGtlaWlpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "desktop-icons@csoriano", "name": "Desktop Icons", "pname": "desktop-icons", "description": "Add icons to the desktop", "link": "https://extensions.gnome.org/extension/1465/desktop-icons/", "shell_version_map": {"38": {"version": "19", "sha256": "01qdh1kigl3ck1mzgha1a9218lpam5b54ai72mpvr64gkaax2mcv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBpY29ucyB0byB0aGUgZGVza3RvcCIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvV29ybGQvU2hlbGxFeHRlbnNpb25zL2Rlc2t0b3AtaWNvbnMiLAogICJ1dWlkIjogImRlc2t0b3AtaWNvbnNAY3Nvcmlhbm8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} , {"uuid": "fullbattery@categulario.tk", "name": "Full Battery indicator", "pname": "full-battery-indicator", "description": "Notifies when battery is full", "link": "https://extensions.gnome.org/extension/1466/full-battery-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "167d84phf68fi5bg9fvm4l7l8jq7k86a80adm0l56ngqygxqsyy8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWVzIHdoZW4gYmF0dGVyeSBpcyBmdWxsIiwKICAibmFtZSI6ICJGdWxsIEJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICIzLjI4LjMiLAogICAgIjMuMzQuNCIsCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2F0ZWd1bGFyaW8vZnVsbC1iYXR0ZXJ5LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnVsbGJhdHRlcnlAY2F0ZWd1bGFyaW8udGsiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "167d84phf68fi5bg9fvm4l7l8jq7k86a80adm0l56ngqygxqsyy8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWVzIHdoZW4gYmF0dGVyeSBpcyBmdWxsIiwKICAibmFtZSI6ICJGdWxsIEJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICIzLjI4LjMiLAogICAgIjMuMzQuNCIsCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2F0ZWd1bGFyaW8vZnVsbC1iYXR0ZXJ5LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnVsbGJhdHRlcnlAY2F0ZWd1bGFyaW8udGsiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "rdesktop-menu@bastien.git.geekwu.org", "name": "Rdesktop launcher", "pname": "rdesktop-launcher", "description": "Add a servers status menu for quickly running rdesktop", "link": "https://extensions.gnome.org/extension/1467/rdesktop-launcher/", "shell_version_map": {"38": {"version": "13", "sha256": "10mmyanmwhk3l5q0db1lrd5qwl1yj4i6n66syi3ii8dvlwx1xg55", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdC5nZWVrd3Uub3JnL2Jhc3RpZW4vcmRlc2t0b3AtbWVudSIsCiAgInV1aWQiOiAicmRlc2t0b3AtbWVudUBiYXN0aWVuLmdpdC5nZWVrd3Uub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "13", "sha256": "10mmyanmwhk3l5q0db1lrd5qwl1yj4i6n66syi3ii8dvlwx1xg55", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdC5nZWVrd3Uub3JnL2Jhc3RpZW4vcmRlc2t0b3AtbWVudSIsCiAgInV1aWQiOiAicmRlc2t0b3AtbWVudUBiYXN0aWVuLmdpdC5nZWVrd3Uub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "10mmyanmwhk3l5q0db1lrd5qwl1yj4i6n66syi3ii8dvlwx1xg55", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdC5nZWVrd3Uub3JnL2Jhc3RpZW4vcmRlc2t0b3AtbWVudSIsCiAgInV1aWQiOiAicmRlc2t0b3AtbWVudUBiYXN0aWVuLmdpdC5nZWVrd3Uub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "tint-all@amarovita.github.com", "name": "Tint All", "pname": "tint-all", "description": "Colorize the entire gnome workspace. Amber, green, cyan, sepia and grayscale - just keep clicking extension icon. Scroll over extension icon to change fx level.", "link": "https://extensions.gnome.org/extension/1471/tint-all/", "shell_version_map": {"38": {"version": "7", "sha256": "1lflpza6kbdh4ql338vidij9c2gh2r116gfgih7lk4inkj1hqmmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yaXplIHRoZSBlbnRpcmUgZ25vbWUgd29ya3NwYWNlLiBBbWJlciwgZ3JlZW4sIGN5YW4sIHNlcGlhIGFuZCBncmF5c2NhbGUgLSBqdXN0IGtlZXAgY2xpY2tpbmcgZXh0ZW5zaW9uIGljb24uIFNjcm9sbCBvdmVyIGV4dGVuc2lvbiBpY29uIHRvIGNoYW5nZSBmeCBsZXZlbC4iLAogICJuYW1lIjogIlRpbnQgQWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidGludC1hbGxAYW1hcm92aXRhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "1lflpza6kbdh4ql338vidij9c2gh2r116gfgih7lk4inkj1hqmmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yaXplIHRoZSBlbnRpcmUgZ25vbWUgd29ya3NwYWNlLiBBbWJlciwgZ3JlZW4sIGN5YW4sIHNlcGlhIGFuZCBncmF5c2NhbGUgLSBqdXN0IGtlZXAgY2xpY2tpbmcgZXh0ZW5zaW9uIGljb24uIFNjcm9sbCBvdmVyIGV4dGVuc2lvbiBpY29uIHRvIGNoYW5nZSBmeCBsZXZlbC4iLAogICJuYW1lIjogIlRpbnQgQWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidGludC1hbGxAYW1hcm92aXRhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "1lflpza6kbdh4ql338vidij9c2gh2r116gfgih7lk4inkj1hqmmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yaXplIHRoZSBlbnRpcmUgZ25vbWUgd29ya3NwYWNlLiBBbWJlciwgZ3JlZW4sIGN5YW4sIHNlcGlhIGFuZCBncmF5c2NhbGUgLSBqdXN0IGtlZXAgY2xpY2tpbmcgZXh0ZW5zaW9uIGljb24uIFNjcm9sbCBvdmVyIGV4dGVuc2lvbiBpY29uIHRvIGNoYW5nZSBmeCBsZXZlbC4iLAogICJuYW1lIjogIlRpbnQgQWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidGludC1hbGxAYW1hcm92aXRhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"uuid": "batime@martin.zurowietz.de", "name": "Battery Time", "pname": "battery-time", "description": "Show the remaining time until fully charged/discharged instead of the battery charge in percent in the panel.", "link": "https://extensions.gnome.org/extension/1475/battery-time/", "shell_version_map": {"40": {"version": "9", "sha256": "1xhh65f8h4k41f3vc90k4wwkjg9bgrihbzi0asjjaf10hvwzmfn4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYmF0aW1lIiwKICAidXVpZCI6ICJiYXRpbWVAbWFydGluLnp1cm93aWV0ei5kZSIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "1xhh65f8h4k41f3vc90k4wwkjg9bgrihbzi0asjjaf10hvwzmfn4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYmF0aW1lIiwKICAidXVpZCI6ICJiYXRpbWVAbWFydGluLnp1cm93aWV0ei5kZSIsCiAgInZlcnNpb24iOiA5Cn0="}}} +, {"uuid": "batime@martin.zurowietz.de", "name": "Battery Time", "pname": "battery-time", "description": "Show the remaining time until fully charged/discharged instead of the battery charge in percent in the panel.", "link": "https://extensions.gnome.org/extension/1475/battery-time/", "shell_version_map": {"40": {"version": "10", "sha256": "0kfajnbkg7xgqsqhkxl111j21k3jr35yxbylip6iryyxjmsxx5bl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYmF0aW1lIiwKICAidXVpZCI6ICJiYXRpbWVAbWFydGluLnp1cm93aWV0ei5kZSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0kfajnbkg7xgqsqhkxl111j21k3jr35yxbylip6iryyxjmsxx5bl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIHJlbWFpbmluZyB0aW1lIHVudGlsIGZ1bGx5IGNoYXJnZWQvZGlzY2hhcmdlZCBpbnN0ZWFkIG9mIHRoZSBiYXR0ZXJ5IGNoYXJnZSBpbiBwZXJjZW50IGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXRpbWUiLAogICJuYW1lIjogIkJhdHRlcnkgVGltZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtYmF0aW1lIiwKICAidXVpZCI6ICJiYXRpbWVAbWFydGluLnp1cm93aWV0ei5kZSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "unlockDialogBackground@sun.wxg@gmail.com", "name": "Lock screen background", "pname": "unlock-dialog-background", "description": "Change lock screen background.\nIf you use Ubuntu, install package gir1.2-clutter-1.0 first.", "link": "https://extensions.gnome.org/extension/1476/unlock-dialog-background/", "shell_version_map": {"38": {"version": "18", "sha256": "1j9m4qkd0i6l4nxwpxjwvp3nh0zifpzvp0xwp4cqqlr2flb6lwps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiMy4zNi40IiwKICAgICIzLjM2LjUiLAogICAgIjMuMzYuNiIsCiAgICAiMy4zNi43IiwKICAgICIzLjM2LjgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVubG9ja0RpYWxvZ0JhY2tncm91bmQiLAogICJ1dWlkIjogInVubG9ja0RpYWxvZ0JhY2tncm91bmRAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "40": {"version": "20", "sha256": "1gin7mpafmx8h177alhhlrjqpq5354napc0jqaj4l4f7ynzn4843", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVubG9ja0RpYWxvZ0JhY2tncm91bmQiLAogICJ1dWlkIjogInVubG9ja0RpYWxvZ0JhY2tncm91bmRAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "23", "sha256": "0j4mhrdmkwwsf52lcqbl0ln7rl3s64nb24862gahs26y4kpbaiv3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBsb2NrIHNjcmVlbiBiYWNrZ3JvdW5kLlxuSWYgeW91IHVzZSBVYnVudHUsIGluc3RhbGwgcGFja2FnZSBnaXIxLjItY2x1dHRlci0xLjAgZmlyc3QuIiwKICAibmFtZSI6ICJMb2NrIHNjcmVlbiBiYWNrZ3JvdW5kIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVubG9ja0RpYWxvZ0JhY2tncm91bmQiLAogICJ1dWlkIjogInVubG9ja0RpYWxvZ0JhY2tncm91bmRAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} , {"uuid": "wsmatrix@martin.zurowietz.de", "name": "Workspace Matrix", "pname": "workspace-matrix", "description": "Arrange workspaces in a two dimensional grid with workspace thumbnails.", "link": "https://extensions.gnome.org/extension/1485/workspace-matrix/", "shell_version_map": {"38": {"version": "27", "sha256": "0b76x0li5a8x42l67ykbw34k4cfmbxqvz36zighhfw4qmxsc36cr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLXdzbWF0cml4IiwKICAidXVpZCI6ICJ3c21hdHJpeEBtYXJ0aW4uenVyb3dpZXR6LmRlIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "40": {"version": "33", "sha256": "1pfq2sgz3h97xyqnxjzzjij3abd6132xjibhl2y3423ylwqg5xf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "41": {"version": "33", "sha256": "1pfq2sgz3h97xyqnxjzzjij3abd6132xjibhl2y3423ylwqg5xf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd29ya3NwYWNlcyBpbiBhIHR3byBkaW1lbnNpb25hbCBncmlkIHdpdGggd29ya3NwYWNlIHRodW1ibmFpbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid3NtYXRyaXgiLAogICJrZXliaW5kaW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgta2V5YmluZGluZ3MiLAogICJuYW1lIjogIldvcmtzcGFjZSBNYXRyaXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud3NtYXRyaXgtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL216dXIvZ25vbWUtc2hlbGwtd3NtYXRyaXgiLAogICJ1dWlkIjogIndzbWF0cml4QG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} -, {"uuid": "extensions-sync@elhan.io", "name": "Extensions Sync", "pname": "extensions-sync", "description": "Sync all extensions and their configurations across all gnome instances", "link": "https://extensions.gnome.org/extension/1486/extensions-sync/", "shell_version_map": {"38": {"version": "12", "sha256": "0yb0brjnqvvlqpdyh841qwh3q2d02vi1an0s93gb2b6kagy1g7zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtc3luYyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zeW5jQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "16", "sha256": "1bl8la3yg94mmzqh28n47kznaaivfbnxm3dwb71ddsr6gaf3n5p2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vYWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1zeW5jIiwKICAidXVpZCI6ICJleHRlbnNpb25zLXN5bmNAZWxoYW4uaW8iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "1bl8la3yg94mmzqh28n47kznaaivfbnxm3dwb71ddsr6gaf3n5p2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vYWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1zeW5jIiwKICAidXVpZCI6ICJleHRlbnNpb25zLXN5bmNAZWxoYW4uaW8iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} +, {"uuid": "extensions-sync@elhan.io", "name": "Extensions Sync", "pname": "extensions-sync", "description": "Sync all extensions and their configurations across all gnome instances", "link": "https://extensions.gnome.org/extension/1486/extensions-sync/", "shell_version_map": {"38": {"version": "12", "sha256": "0yb0brjnqvvlqpdyh841qwh3q2d02vi1an0s93gb2b6kagy1g7zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtc3luYyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zeW5jQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "17", "sha256": "0ssnci70lrvn1f909ldwffm3ssrc45pscdi17ncj8fjjcb9wwf09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtc3luYyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zeW5jQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "41": {"version": "17", "sha256": "0ssnci70lrvn1f909ldwffm3ssrc45pscdi17ncj8fjjcb9wwf09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtc3luYyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zeW5jQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "42": {"version": "17", "sha256": "0ssnci70lrvn1f909ldwffm3ssrc45pscdi17ncj8fjjcb9wwf09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgYWxsIGV4dGVuc2lvbnMgYW5kIHRoZWlyIGNvbmZpZ3VyYXRpb25zIGFjcm9zcyBhbGwgZ25vbWUgaW5zdGFuY2VzIiwKICAibmFtZSI6ICJFeHRlbnNpb25zIFN5bmMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9ucy1zeW5jIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb2FlL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtc3luYyIsCiAgInV1aWQiOiAiZXh0ZW5zaW9ucy1zeW5jQGVsaGFuLmlvIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} , {"uuid": "containers@royg", "name": "Containers", "pname": "containers", "description": "Manage podman containers through a gnome-shell menu", "link": "https://extensions.gnome.org/extension/1500/containers/", "shell_version_map": {"40": {"version": "19", "sha256": "16z5978jwpf6cbasnfdi5w8s9dx929r8yh7a4dsrd5isnrnyi22x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAxOQp9"}, "41": {"version": "19", "sha256": "16z5978jwpf6cbasnfdi5w8s9dx929r8yh7a4dsrd5isnrnyi22x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBwb2RtYW4gY29udGFpbmVycyB0aHJvdWdoIGEgZ25vbWUtc2hlbGwgbWVudSIsCiAgIm5hbWUiOiAiQ29udGFpbmVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmdvbGFuZ2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbnRhaW5lcnMiLAogICJ1dWlkIjogImNvbnRhaW5lcnNAcm95ZyIsCiAgInZlcnNpb24iOiAxOQp9"}}} -, {"uuid": "fullscreenworkspace@satran.in", "name": "Fullscreen On New Workspace", "pname": "fullscreen-on-new-workspace", "description": "Move window to a new workspace when you maximize or make it fullscreen.", "link": "https://extensions.gnome.org/extension/1502/fullscreen-on-new-workspace/", "shell_version_map": {"38": {"version": "5", "sha256": "1qqi4rhlfdwys1h0hhrwry86kzh3mv63axrsqhjpmhp9q4qsiib7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhdHJhbi9mdWxsc2NyZWVud29ya3NwYWNlLXNhdHJhbi5pbiIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbndvcmtzcGFjZUBzYXRyYW4uaW4iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1qqi4rhlfdwys1h0hhrwry86kzh3mv63axrsqhjpmhp9q4qsiib7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhdHJhbi9mdWxsc2NyZWVud29ya3NwYWNlLXNhdHJhbi5pbiIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbndvcmtzcGFjZUBzYXRyYW4uaW4iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1qqi4rhlfdwys1h0hhrwry86kzh3mv63axrsqhjpmhp9q4qsiib7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhdHJhbi9mdWxsc2NyZWVud29ya3NwYWNlLXNhdHJhbi5pbiIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbndvcmtzcGFjZUBzYXRyYW4uaW4iLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "fullscreenworkspace@satran.in", "name": "Fullscreen On New Workspace", "pname": "fullscreen-on-new-workspace", "description": "Move window to a new workspace when you maximize or make it fullscreen.", "link": "https://extensions.gnome.org/extension/1502/fullscreen-on-new-workspace/", "shell_version_map": {"38": {"version": "6", "sha256": "1lyfn0p9djdkmhaxj9f95jf6iknb688d81ls3ycf667i4jk5qnrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhdHJhbi9mdWxsc2NyZWVud29ya3NwYWNlLXNhdHJhbi5pbiIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbndvcmtzcGFjZUBzYXRyYW4uaW4iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1lyfn0p9djdkmhaxj9f95jf6iknb688d81ls3ycf667i4jk5qnrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhdHJhbi9mdWxsc2NyZWVud29ya3NwYWNlLXNhdHJhbi5pbiIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbndvcmtzcGFjZUBzYXRyYW4uaW4iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "1lyfn0p9djdkmhaxj9f95jf6iknb688d81ls3ycf667i4jk5qnrq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd2luZG93IHRvIGEgbmV3IHdvcmtzcGFjZSB3aGVuIHlvdSBtYXhpbWl6ZSBvciBtYWtlIGl0IGZ1bGxzY3JlZW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnVsbHNjcmVlbndvcmtzcGFjZSIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBPbiBOZXcgV29ya3NwYWNlIiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW53b3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhdHJhbi9mdWxsc2NyZWVud29ya3NwYWNlLXNhdHJhbi5pbiIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbndvcmtzcGFjZUBzYXRyYW4uaW4iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "tray-icons@zhangkaizhao.com", "name": "Tray Icons", "pname": "tray-icons", "description": "Tray icons", "link": "https://extensions.gnome.org/extension/1503/tray-icons/", "shell_version_map": {"38": {"version": "6", "sha256": "0q5kk8yp7cg61d4hcimrxrghsq7v8qaxjbmzvkj5apbg4cmz3s7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgaWNvbnMiLAogICJuYW1lIjogIlRyYXkgSWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3poYW5na2Fpemhhby9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJheS1pY29ucyIsCiAgInV1aWQiOiAidHJheS1pY29uc0B6aGFuZ2thaXpoYW8uY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "0q5kk8yp7cg61d4hcimrxrghsq7v8qaxjbmzvkj5apbg4cmz3s7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgaWNvbnMiLAogICJuYW1lIjogIlRyYXkgSWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3poYW5na2Fpemhhby9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJheS1pY29ucyIsCiAgInV1aWQiOiAidHJheS1pY29uc0B6aGFuZ2thaXpoYW8uY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "new-mail-indicator@fthx", "name": "New Mail Indicator", "pname": "new-mail-indicator", "description": "An icon beside the date in the topbar to show if there are unread emails when running your default email client.\n\n It checks the notifications in the message tray related to a new mail, no extra configuration needed, very light extension. Click on the icon does toggle your email client window.*** Do not disable the notifications of your default email client! *** It is not a standalone mail checker, you need your email client to be running. *** Please check that the xdg-utils package is installed.\n\n Email clients verified at the moment are: Thunderbird, Evolution, Geary, Mailspring. Please ask to add the client, including special packaging (snap/flatpak), that you need. If you report an error, please provide at least the distribution and the email client you use through the GitHub link.\n\n For persistent notifications only, see: https://extensions.gnome.org/extension/3951/persistent-email-notifications .", "link": "https://extensions.gnome.org/extension/1505/new-mail-indicator/", "shell_version_map": {"38": {"version": "33", "sha256": "1azppcny8f70ish2p1gzmyf0dy4ycj5x8ccwb1c73m452ac561vm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gYmVzaWRlIHRoZSBkYXRlIGluIHRoZSB0b3BiYXIgdG8gc2hvdyBpZiB0aGVyZSBhcmUgdW5yZWFkIGVtYWlscyB3aGVuIHJ1bm5pbmcgeW91ciBkZWZhdWx0IGVtYWlsIGNsaWVudC5cblxuIEl0IGNoZWNrcyB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbWVzc2FnZSB0cmF5IHJlbGF0ZWQgdG8gYSBuZXcgbWFpbCwgbm8gZXh0cmEgY29uZmlndXJhdGlvbiBuZWVkZWQsIHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBDbGljayBvbiB0aGUgaWNvbiBkb2VzIHRvZ2dsZSB5b3VyIGVtYWlsIGNsaWVudCB3aW5kb3cuKioqIERvIG5vdCBkaXNhYmxlIHRoZSBub3RpZmljYXRpb25zIG9mIHlvdXIgZGVmYXVsdCBlbWFpbCBjbGllbnQhICoqKiBJdCBpcyBub3QgYSBzdGFuZGFsb25lIG1haWwgY2hlY2tlciwgeW91IG5lZWQgeW91ciBlbWFpbCBjbGllbnQgdG8gYmUgcnVubmluZy4gKioqIFBsZWFzZSBjaGVjayB0aGF0IHRoZSB4ZGctdXRpbHMgcGFja2FnZSBpcyBpbnN0YWxsZWQuXG5cbiBFbWFpbCBjbGllbnRzIHZlcmlmaWVkIGF0IHRoZSBtb21lbnQgYXJlOiBUaHVuZGVyYmlyZCwgRXZvbHV0aW9uLCBHZWFyeSwgTWFpbHNwcmluZy4gUGxlYXNlIGFzayB0byBhZGQgdGhlIGNsaWVudCwgaW5jbHVkaW5nIHNwZWNpYWwgcGFja2FnaW5nIChzbmFwL2ZsYXRwYWspLCB0aGF0IHlvdSBuZWVkLiBJZiB5b3UgcmVwb3J0IGFuIGVycm9yLCBwbGVhc2UgcHJvdmlkZSBhdCBsZWFzdCB0aGUgZGlzdHJpYnV0aW9uIGFuZCB0aGUgZW1haWwgY2xpZW50IHlvdSB1c2UgdGhyb3VnaCB0aGUgR2l0SHViIGxpbmsuXG5cbiBGb3IgcGVyc2lzdGVudCBub3RpZmljYXRpb25zIG9ubHksIHNlZTogaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzk1MS9wZXJzaXN0ZW50LWVtYWlsLW5vdGlmaWNhdGlvbnMgLiIsCiAgIm5hbWUiOiAiTmV3IE1haWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L25ldy1tYWlsLWluZGljYXRvciIsCiAgInV1aWQiOiAibmV3LW1haWwtaW5kaWNhdG9yQGZ0aHgiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "40": {"version": "33", "sha256": "1azppcny8f70ish2p1gzmyf0dy4ycj5x8ccwb1c73m452ac561vm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gYmVzaWRlIHRoZSBkYXRlIGluIHRoZSB0b3BiYXIgdG8gc2hvdyBpZiB0aGVyZSBhcmUgdW5yZWFkIGVtYWlscyB3aGVuIHJ1bm5pbmcgeW91ciBkZWZhdWx0IGVtYWlsIGNsaWVudC5cblxuIEl0IGNoZWNrcyB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbWVzc2FnZSB0cmF5IHJlbGF0ZWQgdG8gYSBuZXcgbWFpbCwgbm8gZXh0cmEgY29uZmlndXJhdGlvbiBuZWVkZWQsIHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBDbGljayBvbiB0aGUgaWNvbiBkb2VzIHRvZ2dsZSB5b3VyIGVtYWlsIGNsaWVudCB3aW5kb3cuKioqIERvIG5vdCBkaXNhYmxlIHRoZSBub3RpZmljYXRpb25zIG9mIHlvdXIgZGVmYXVsdCBlbWFpbCBjbGllbnQhICoqKiBJdCBpcyBub3QgYSBzdGFuZGFsb25lIG1haWwgY2hlY2tlciwgeW91IG5lZWQgeW91ciBlbWFpbCBjbGllbnQgdG8gYmUgcnVubmluZy4gKioqIFBsZWFzZSBjaGVjayB0aGF0IHRoZSB4ZGctdXRpbHMgcGFja2FnZSBpcyBpbnN0YWxsZWQuXG5cbiBFbWFpbCBjbGllbnRzIHZlcmlmaWVkIGF0IHRoZSBtb21lbnQgYXJlOiBUaHVuZGVyYmlyZCwgRXZvbHV0aW9uLCBHZWFyeSwgTWFpbHNwcmluZy4gUGxlYXNlIGFzayB0byBhZGQgdGhlIGNsaWVudCwgaW5jbHVkaW5nIHNwZWNpYWwgcGFja2FnaW5nIChzbmFwL2ZsYXRwYWspLCB0aGF0IHlvdSBuZWVkLiBJZiB5b3UgcmVwb3J0IGFuIGVycm9yLCBwbGVhc2UgcHJvdmlkZSBhdCBsZWFzdCB0aGUgZGlzdHJpYnV0aW9uIGFuZCB0aGUgZW1haWwgY2xpZW50IHlvdSB1c2UgdGhyb3VnaCB0aGUgR2l0SHViIGxpbmsuXG5cbiBGb3IgcGVyc2lzdGVudCBub3RpZmljYXRpb25zIG9ubHksIHNlZTogaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzk1MS9wZXJzaXN0ZW50LWVtYWlsLW5vdGlmaWNhdGlvbnMgLiIsCiAgIm5hbWUiOiAiTmV3IE1haWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L25ldy1tYWlsLWluZGljYXRvciIsCiAgInV1aWQiOiAibmV3LW1haWwtaW5kaWNhdG9yQGZ0aHgiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "41": {"version": "33", "sha256": "1azppcny8f70ish2p1gzmyf0dy4ycj5x8ccwb1c73m452ac561vm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGljb24gYmVzaWRlIHRoZSBkYXRlIGluIHRoZSB0b3BiYXIgdG8gc2hvdyBpZiB0aGVyZSBhcmUgdW5yZWFkIGVtYWlscyB3aGVuIHJ1bm5pbmcgeW91ciBkZWZhdWx0IGVtYWlsIGNsaWVudC5cblxuIEl0IGNoZWNrcyB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbWVzc2FnZSB0cmF5IHJlbGF0ZWQgdG8gYSBuZXcgbWFpbCwgbm8gZXh0cmEgY29uZmlndXJhdGlvbiBuZWVkZWQsIHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBDbGljayBvbiB0aGUgaWNvbiBkb2VzIHRvZ2dsZSB5b3VyIGVtYWlsIGNsaWVudCB3aW5kb3cuKioqIERvIG5vdCBkaXNhYmxlIHRoZSBub3RpZmljYXRpb25zIG9mIHlvdXIgZGVmYXVsdCBlbWFpbCBjbGllbnQhICoqKiBJdCBpcyBub3QgYSBzdGFuZGFsb25lIG1haWwgY2hlY2tlciwgeW91IG5lZWQgeW91ciBlbWFpbCBjbGllbnQgdG8gYmUgcnVubmluZy4gKioqIFBsZWFzZSBjaGVjayB0aGF0IHRoZSB4ZGctdXRpbHMgcGFja2FnZSBpcyBpbnN0YWxsZWQuXG5cbiBFbWFpbCBjbGllbnRzIHZlcmlmaWVkIGF0IHRoZSBtb21lbnQgYXJlOiBUaHVuZGVyYmlyZCwgRXZvbHV0aW9uLCBHZWFyeSwgTWFpbHNwcmluZy4gUGxlYXNlIGFzayB0byBhZGQgdGhlIGNsaWVudCwgaW5jbHVkaW5nIHNwZWNpYWwgcGFja2FnaW5nIChzbmFwL2ZsYXRwYWspLCB0aGF0IHlvdSBuZWVkLiBJZiB5b3UgcmVwb3J0IGFuIGVycm9yLCBwbGVhc2UgcHJvdmlkZSBhdCBsZWFzdCB0aGUgZGlzdHJpYnV0aW9uIGFuZCB0aGUgZW1haWwgY2xpZW50IHlvdSB1c2UgdGhyb3VnaCB0aGUgR2l0SHViIGxpbmsuXG5cbiBGb3IgcGVyc2lzdGVudCBub3RpZmljYXRpb25zIG9ubHksIHNlZTogaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzk1MS9wZXJzaXN0ZW50LWVtYWlsLW5vdGlmaWNhdGlvbnMgLiIsCiAgIm5hbWUiOiAiTmV3IE1haWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L25ldy1tYWlsLWluZGljYXRvciIsCiAgInV1aWQiOiAibmV3LW1haWwtaW5kaWNhdG9yQGZ0aHgiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} , {"uuid": "drop-down-terminal-x@bigbn.pro", "name": "Drop Down Terminal X", "pname": "drop-down-terminal-x", "description": "THIS EXTENSION IS NO LONGER SUPPORTED.\n\nIf you are looking for an alternative please look at that https://extensions.gnome.org/extension/3780/ddterm \nawesome extension.\n\nA GNOME Shell drop down terminal with extra feautures.\n \nSpecial thanks to:\n- Osman Alperen Elhan (https://github.com/oae)\n- Balder Claassen (https://github.com/balderclaassen)\n- Adrien Pyke (https://github.com/kufii)\n- Alan J Carvajal (https://github.com/ajcarvajal)\n- Massimo Mund (https://github.com/masmu)\n- Jakub Żywiec (https://github.com/jakubzet)\n- Mattias Eriksson (https://github.com/snaggen)\n- Henry78 (https://github.com/Henry78)\n- Maxim Toropov (https://github.com/MaxMaxoff)\nfor active contribution.\n\nBased on original extension \"gs-extensions-drop-down-terminal\" from Stéphane Démurget (https://github.com/zzrough)", "link": "https://extensions.gnome.org/extension/1509/drop-down-terminal-x/", "shell_version_map": {"38": {"version": "17", "sha256": "1k90g6bndw1xr56k7lwlxyw89aqbl47spkfmj1lq224z83w6hzdw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRISVMgRVhURU5TSU9OIElTIE5PIExPTkdFUiBTVVBQT1JURUQuXG5cbklmIHlvdSBhcmUgbG9va2luZyBmb3IgYW4gYWx0ZXJuYXRpdmUgcGxlYXNlIGxvb2sgYXQgdGhhdCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zNzgwL2RkdGVybSBcbmF3ZXNvbWUgZXh0ZW5zaW9uLlxuXG5BIEdOT01FIFNoZWxsIGRyb3AgZG93biB0ZXJtaW5hbCB3aXRoIGV4dHJhIGZlYXV0dXJlcy5cbiBcblNwZWNpYWwgdGhhbmtzIHRvOlxuLSBPc21hbiBBbHBlcmVuIEVsaGFuIChodHRwczovL2dpdGh1Yi5jb20vb2FlKVxuLSBCYWxkZXIgQ2xhYXNzZW4gKGh0dHBzOi8vZ2l0aHViLmNvbS9iYWxkZXJjbGFhc3Nlbilcbi0gQWRyaWVuIFB5a2UgKGh0dHBzOi8vZ2l0aHViLmNvbS9rdWZpaSlcbi0gQWxhbiBKIENhcnZhamFsIChodHRwczovL2dpdGh1Yi5jb20vYWpjYXJ2YWphbClcbi0gTWFzc2ltbyBNdW5kIChodHRwczovL2dpdGh1Yi5jb20vbWFzbXUpXG4tIEpha3ViIFx1MDE3Ynl3aWVjIChodHRwczovL2dpdGh1Yi5jb20vamFrdWJ6ZXQpXG4tIE1hdHRpYXMgRXJpa3Nzb24gKGh0dHBzOi8vZ2l0aHViLmNvbS9zbmFnZ2VuKVxuLSBIZW5yeTc4IChodHRwczovL2dpdGh1Yi5jb20vSGVucnk3OClcbi0gTWF4aW0gVG9yb3BvdiAoaHR0cHM6Ly9naXRodWIuY29tL01heE1heG9mZilcbmZvciBhY3RpdmUgY29udHJpYnV0aW9uLlxuXG5CYXNlZCBvbiBvcmlnaW5hbCBleHRlbnNpb24gXCJncy1leHRlbnNpb25zLWRyb3AtZG93bi10ZXJtaW5hbFwiIGZyb20gU3RcdTAwZTlwaGFuZSBEXHUwMGU5bXVyZ2V0IChodHRwczovL2dpdGh1Yi5jb20venpyb3VnaCkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcm9wLWRvd24tdGVybWluYWwteCIsCiAgImlkIjogImRyb3AtZG93bi10ZXJtaW5hbC14IiwKICAibmFtZSI6ICJEcm9wIERvd24gVGVybWluYWwgWCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4wIiwKICAgICIzLjI4LjEiLAogICAgIjMuMjguMiIsCiAgICAiMy4zMC4wIiwKICAgICIzLjMwLjEiLAogICAgIjMuMzAuMiIsCiAgICAiMy4zMi4wIiwKICAgICIzLjMyLjEiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zNC4wIiwKICAgICIzLjM0LjQiLAogICAgIjMuMzYuMCIsCiAgICAiMy4zNi4xIiwKICAgICIzLjM2LjIiLAogICAgIjMuMzguMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JpZ2JuL2dzLWV4dGVuc2lvbnMtZHJvcC1kb3duLXRlcm1pbmFsIiwKICAidXVpZCI6ICJkcm9wLWRvd24tdGVybWluYWwteEBiaWdibi5wcm8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} -, {"uuid": "Rounded_Corners@lennart-k", "name": "Rounded Corners", "pname": "rounded-corners", "description": "Creates rounded corners for every monitor", "link": "https://extensions.gnome.org/extension/1514/rounded-corners/", "shell_version_map": {"38": {"version": "5", "sha256": "1lli47bjlrr5g3548jjvvvbbml6g0sg5mm6py9j7kjcgg84sscnc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGVubmFydC1rL2dub21lLXJvdW5kZWQtY29ybmVycyIsCiAgInV1aWQiOiAiUm91bmRlZF9Db3JuZXJzQGxlbm5hcnQtayIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "1lli47bjlrr5g3548jjvvvbbml6g0sg5mm6py9j7kjcgg84sscnc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGVubmFydC1rL2dub21lLXJvdW5kZWQtY29ybmVycyIsCiAgInV1aWQiOiAiUm91bmRlZF9Db3JuZXJzQGxlbm5hcnQtayIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"uuid": "Rounded_Corners@lennart-k", "name": "Rounded Corners", "pname": "rounded-corners", "description": "Creates rounded corners for every monitor", "link": "https://extensions.gnome.org/extension/1514/rounded-corners/", "shell_version_map": {"38": {"version": "4", "sha256": "0pvbnv97g2mjbklszxvp6df50iw9kyr1ssfza8ia9779x5zq9bk9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sZW5uYXJ0LWsvZ25vbWUtcm91bmRlZC1jb3JuZXJzIiwKICAidXVpZCI6ICJSb3VuZGVkX0Nvcm5lcnNAbGVubmFydC1rIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "7", "sha256": "11accb4w8cx3gfrrs2x15h53arjkpqk566cp24c3k32alvqx1jgs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlbm5hcnQtay9nbm9tZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogIlJvdW5kZWRfQ29ybmVyc0BsZW5uYXJ0LWsiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "11accb4w8cx3gfrrs2x15h53arjkpqk566cp24c3k32alvqx1jgs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgcm91bmRlZCBjb3JuZXJzIGZvciBldmVyeSBtb25pdG9yIiwKICAibmFtZSI6ICJSb3VuZGVkIENvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlbm5hcnQtay9nbm9tZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogIlJvdW5kZWRfQ29ybmVyc0BsZW5uYXJ0LWsiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "scrovol@andyholmes.github.io", "name": "Scrovol", "pname": "scrovol", "description": "Change the volume by scrolling anywhere on the System Tray.\n\nWith this extension, you can scroll over Night Light, WiFi, Volume, Battery or any other icon in the system status tray to change the volume, instead of just the Volume icon.", "link": "https://extensions.gnome.org/extension/1519/scrovol/", "shell_version_map": {"40": {"version": "4", "sha256": "1md52ygz481nvhq00bkq2ymby7f647cfvw4wx1wqkwp7b796d59c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgdm9sdW1lIGJ5IHNjcm9sbGluZyBhbnl3aGVyZSBvbiB0aGUgU3lzdGVtIFRyYXkuXG5cbldpdGggdGhpcyBleHRlbnNpb24sIHlvdSBjYW4gc2Nyb2xsIG92ZXIgTmlnaHQgTGlnaHQsIFdpRmksIFZvbHVtZSwgQmF0dGVyeSBvciBhbnkgb3RoZXIgaWNvbiBpbiB0aGUgc3lzdGVtIHN0YXR1cyB0cmF5IHRvIGNoYW5nZSB0aGUgdm9sdW1lLCBpbnN0ZWFkIG9mIGp1c3QgdGhlIFZvbHVtZSBpY29uLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzY3Jvdm9sIiwKICAibmFtZSI6ICJTY3Jvdm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5keWhvbG1lcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2Nyb3ZvbC8iLAogICJ1dWlkIjogInNjcm92b2xAYW5keWhvbG1lcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "notification-center@Selenium-H", "name": "Notification Center", "pname": "notification-centerselenium-h", "description": "Detach notification center to top panel and customizations.Please reset the extension after updating.\nThe Extension will stop when upgraded to an incompatible version.\nIn that case an Update tab is created to easily reset the extension.\nA Reset button is also always present in Preferences option in the Top Right Application menu of the extension preferences window.", "link": "https://extensions.gnome.org/extension/1526/notification-centerselenium-h/", "shell_version_map": {"38": {"version": "24", "sha256": "1449kl7fss2fyj1ks8ra3qy60jvn5fcl1iyv813s8vdkkp5dv8a2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiRGV0YWNoIG5vdGlmaWNhdGlvbiBjZW50ZXIgdG8gdG9wIHBhbmVsIGFuZCBjdXN0b21pemF0aW9ucy4iLAogICJkZXNjcmlwdGlvbiI6ICJEZXRhY2ggbm90aWZpY2F0aW9uIGNlbnRlciB0byB0b3AgcGFuZWwgYW5kIGN1c3RvbWl6YXRpb25zLlBsZWFzZSByZXNldCB0aGUgZXh0ZW5zaW9uIGFmdGVyIHVwZGF0aW5nLlxuVGhlIEV4dGVuc2lvbiB3aWxsIHN0b3Agd2hlbiB1cGdyYWRlZCB0byBhbiBpbmNvbXBhdGlibGUgdmVyc2lvbi5cbkluIHRoYXQgY2FzZSBhbiBVcGRhdGUgdGFiIGlzIGNyZWF0ZWQgdG8gZWFzaWx5IHJlc2V0IHRoZSBleHRlbnNpb24uXG5BIFJlc2V0IGJ1dHRvbiBpcyBhbHNvIGFsd2F5cyBwcmVzZW50IGluIFByZWZlcmVuY2VzIG9wdGlvbiBpbiB0aGUgVG9wIFJpZ2h0IEFwcGxpY2F0aW9uIG1lbnUgb2YgdGhlIGV4dGVuc2lvbiBwcmVmZXJlbmNlcyB3aW5kb3cuIiwKICAibmFtZSI6ICJOb3RpZmljYXRpb24gQ2VudGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGlmaWNhdGlvbi1jZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInN0YXR1cyI6ICIiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NlbGVuaXVtLUgvTm90aWZpY2F0aW9uLUNlbnRlciIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWNlbnRlckBTZWxlbml1bS1IIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "40": {"version": "24", "sha256": "1449kl7fss2fyj1ks8ra3qy60jvn5fcl1iyv813s8vdkkp5dv8a2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiRGV0YWNoIG5vdGlmaWNhdGlvbiBjZW50ZXIgdG8gdG9wIHBhbmVsIGFuZCBjdXN0b21pemF0aW9ucy4iLAogICJkZXNjcmlwdGlvbiI6ICJEZXRhY2ggbm90aWZpY2F0aW9uIGNlbnRlciB0byB0b3AgcGFuZWwgYW5kIGN1c3RvbWl6YXRpb25zLlBsZWFzZSByZXNldCB0aGUgZXh0ZW5zaW9uIGFmdGVyIHVwZGF0aW5nLlxuVGhlIEV4dGVuc2lvbiB3aWxsIHN0b3Agd2hlbiB1cGdyYWRlZCB0byBhbiBpbmNvbXBhdGlibGUgdmVyc2lvbi5cbkluIHRoYXQgY2FzZSBhbiBVcGRhdGUgdGFiIGlzIGNyZWF0ZWQgdG8gZWFzaWx5IHJlc2V0IHRoZSBleHRlbnNpb24uXG5BIFJlc2V0IGJ1dHRvbiBpcyBhbHNvIGFsd2F5cyBwcmVzZW50IGluIFByZWZlcmVuY2VzIG9wdGlvbiBpbiB0aGUgVG9wIFJpZ2h0IEFwcGxpY2F0aW9uIG1lbnUgb2YgdGhlIGV4dGVuc2lvbiBwcmVmZXJlbmNlcyB3aW5kb3cuIiwKICAibmFtZSI6ICJOb3RpZmljYXRpb24gQ2VudGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5vdGlmaWNhdGlvbi1jZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInN0YXR1cyI6ICIiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NlbGVuaXVtLUgvTm90aWZpY2F0aW9uLUNlbnRlciIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWNlbnRlckBTZWxlbml1bS1IIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} , {"uuid": "lockkeys@fawtytoo", "name": "Lock Keys", "pname": "lock-keys", "description": "Numlock and Capslock status on the panel. Icons are auto hidden. Simplified with no menus, notifications or settings.\n\nWayland is only supported for Gnome Shell 3.38.", "link": "https://extensions.gnome.org/extension/1532/lock-keys/", "shell_version_map": {"38": {"version": "13", "sha256": "0a444cxwnbgp45w84lq4x3b81kx0vldiixsc2kh3mijqh3rca9vr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgYW5kIENhcHNsb2NrIHN0YXR1cyBvbiB0aGUgcGFuZWwuIEljb25zIGFyZSBhdXRvIGhpZGRlbi4gU2ltcGxpZmllZCB3aXRoIG5vIG1lbnVzLCBub3RpZmljYXRpb25zIG9yIHNldHRpbmdzLlxuXG5XYXlsYW5kIGlzIG9ubHkgc3VwcG9ydGVkIGZvciBHbm9tZSBTaGVsbCAzLjM4LiIsCiAgIm5hbWUiOiAiTG9jayBLZXlzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTdGV2ZSBDbGFyaywgS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImxvY2trZXlzQGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "13", "sha256": "0a444cxwnbgp45w84lq4x3b81kx0vldiixsc2kh3mijqh3rca9vr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgYW5kIENhcHNsb2NrIHN0YXR1cyBvbiB0aGUgcGFuZWwuIEljb25zIGFyZSBhdXRvIGhpZGRlbi4gU2ltcGxpZmllZCB3aXRoIG5vIG1lbnVzLCBub3RpZmljYXRpb25zIG9yIHNldHRpbmdzLlxuXG5XYXlsYW5kIGlzIG9ubHkgc3VwcG9ydGVkIGZvciBHbm9tZSBTaGVsbCAzLjM4LiIsCiAgIm5hbWUiOiAiTG9jayBLZXlzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTdGV2ZSBDbGFyaywgS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImxvY2trZXlzQGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "0a444cxwnbgp45w84lq4x3b81kx0vldiixsc2kh3mijqh3rca9vr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk51bWxvY2sgYW5kIENhcHNsb2NrIHN0YXR1cyBvbiB0aGUgcGFuZWwuIEljb25zIGFyZSBhdXRvIGhpZGRlbi4gU2ltcGxpZmllZCB3aXRoIG5vIG1lbnVzLCBub3RpZmljYXRpb25zIG9yIHNldHRpbmdzLlxuXG5XYXlsYW5kIGlzIG9ubHkgc3VwcG9ydGVkIGZvciBHbm9tZSBTaGVsbCAzLjM4LiIsCiAgIm5hbWUiOiAiTG9jayBLZXlzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTdGV2ZSBDbGFyaywgS2F6aW1pZXJhcyBWYWluYSwgUGllcnJlIE9zc21hbiwgZXJndWlsbGUsIGpvbm5pdXMsIFBoaWxpcHAgV29sZmVyLCBNYXJpdXN6IExpc293c2tpLCBDcmlzdGlhbiBCZXJvaXphLCB3YXJtc3VuMDIyMCwgUmFzbXVzIEthaiwgUGFibG8gTWFydGluLUdvbWV6IEJvdXNrYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImxvY2trZXlzQGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "LetItSnow@mateusz.banaszek.op.pl", "name": "Let it snow", "pname": "let-it-snow", "description": "Bring winter to your desktop: unicode snowflakes falling on your screens.\n\nFeatures:\n- snow doesn't fall over currently active window\n- use slider to choose how much snow you want\n- works with multiple monitors\n\nInspired by gsnow (https://extensions.gnome.org/extension/1156/gsnow/).", "link": "https://extensions.gnome.org/extension/1547/let-it-snow/", "shell_version_map": {"38": {"version": "5", "sha256": "07znrbba154277lxx1bvidn4kz5bgkxpgy7rv3sm472qdbsljl35", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIHdpbnRlciB0byB5b3VyIGRlc2t0b3A6IHVuaWNvZGUgc25vd2ZsYWtlcyBmYWxsaW5nIG9uIHlvdXIgc2NyZWVucy5cblxuRmVhdHVyZXM6XG4tIHNub3cgZG9lc24ndCBmYWxsIG92ZXIgY3VycmVudGx5IGFjdGl2ZSB3aW5kb3dcbi0gdXNlIHNsaWRlciB0byBjaG9vc2UgaG93IG11Y2ggc25vdyB5b3Ugd2FudFxuLSB3b3JrcyB3aXRoIG11bHRpcGxlIG1vbml0b3JzXG5cbkluc3BpcmVkIGJ5IGdzbm93IChodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTU2L2dzbm93LykuIiwKICAibmFtZSI6ICJMZXQgaXQgc25vdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9iaXRidWNrZXQub3JnL21hdGJhbi9sZXQtaXQtc25vdyIsCiAgInV1aWQiOiAiTGV0SXRTbm93QG1hdGV1c3ouYmFuYXN6ZWsub3AucGwiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "fullscreen-hot-corner@sorrow.about.alice.pm.me", "name": "Fullscreen Hot Corner", "pname": "fullscreen-hot-corner", "description": "Enables hot corner in fullscreen mode", "link": "https://extensions.gnome.org/extension/1562/fullscreen-hot-corner/", "shell_version_map": {"38": {"version": "6", "sha256": "1lcpw06aqja4q7qqfvds5nv2zvzrjh56lymj1al4kiql92gbwzp1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZnVsbHNjcmVlbi1ob3QtY29ybmVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWhvdC1jb3JuZXJAc29ycm93LmFib3V0LmFsaWNlLnBtLm1lIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "9", "sha256": "0zx11gpacjd259cxd80ggffixpyqprvzcx1971ysvm7jrayrm058", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29hbC9nbm9tZS1zaGVsbC1mdWxsc2NyZWVuLWhvdC1jb3JuZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4taG90LWNvcm5lckBzb3Jyb3cuYWJvdXQuYWxpY2UucG0ubWUiLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "0zx11gpacjd259cxd80ggffixpyqprvzcx1971ysvm7jrayrm058", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgaG90IGNvcm5lciBpbiBmdWxsc2NyZWVuIG1vZGUiLAogICJuYW1lIjogIkZ1bGxzY3JlZW4gSG90IENvcm5lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29hbC9nbm9tZS1zaGVsbC1mdWxsc2NyZWVuLWhvdC1jb3JuZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4taG90LWNvcm5lckBzb3Jyb3cuYWJvdXQuYWxpY2UucG0ubWUiLAogICJ2ZXJzaW9uIjogOQp9"}}} -, {"uuid": "worksets@blipk.xyz", "name": "Customised Workspaces", "pname": "worksets", "description": "Customised Workspaces enables creating isolated and customised workspaces.\n\n* Customise the dash to be unique for each workspace, each with their own favourites\n* Only show running applications on the dash in their respective workspace\n* Choose a custom background image for each workspace\n* Minor UI tweaks to the overview workspaces\n* Save each customisation, set them to autoload on specific workspaces\n* Hide the extension once you've configured your preferences to enjoy seamlessly upgraded workspaces in gnome shell\n\nCompatible for use with any of these extensions to complete your workspace upgrade:\n\n* Dash to Panel - https://extensions.gnome.org/extension/1160/dash-to-panel/\n* Dash to Dock - https://extensions.gnome.org/extension/307/dash-to-dock/\n* Auto Move Windows - https://extensions.gnome.org/extension/16/auto-move-windows/\n* Vertical Overview - https://github.com/RensAlthuis/vertical-overview", "link": "https://extensions.gnome.org/extension/1583/worksets/", "shell_version_map": {"38": {"version": "30", "sha256": "0mjah9nx66caqmfbz8wrvg6iyhxp7jmbgwx1gnp8k2a2z536n1iw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIEN1c3RvbWlzZSB0aGUgZGFzaCB0byBiZSB1bmlxdWUgZm9yIGVhY2ggd29ya3NwYWNlLCBlYWNoIHdpdGggdGhlaXIgb3duIGZhdm91cml0ZXNcbiogT25seSBzaG93IHJ1bm5pbmcgYXBwbGljYXRpb25zIG9uIHRoZSBkYXNoIGluIHRoZWlyIHJlc3BlY3RpdmUgd29ya3NwYWNlXG4qIENob29zZSBhIGN1c3RvbSBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBNaW5vciBVSSB0d2Vha3MgdG8gdGhlIG92ZXJ2aWV3IHdvcmtzcGFjZXNcbiogU2F2ZSBlYWNoIGN1c3RvbWlzYXRpb24sIHNldCB0aGVtIHRvIGF1dG9sb2FkIG9uIHNwZWNpZmljIHdvcmtzcGFjZXNcbiogSGlkZSB0aGUgZXh0ZW5zaW9uIG9uY2UgeW91J3ZlIGNvbmZpZ3VyZWQgeW91ciBwcmVmZXJlbmNlcyB0byBlbmpveSBzZWFtbGVzc2x5IHVwZ3JhZGVkIHdvcmtzcGFjZXMgaW4gZ25vbWUgc2hlbGxcblxuQ29tcGF0aWJsZSBmb3IgdXNlIHdpdGggYW55IG9mIHRoZXNlIGV4dGVuc2lvbnMgdG8gY29tcGxldGUgeW91ciB3b3Jrc3BhY2UgdXBncmFkZTpcblxuKiBEYXNoIHRvIFBhbmVsIC0gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuKiBEYXNoIHRvIERvY2sgLSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zMDcvZGFzaC10by1kb2NrL1xuKiBBdXRvIE1vdmUgV2luZG93cyAtIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE2L2F1dG8tbW92ZS13aW5kb3dzL1xuKiBWZXJ0aWNhbCBPdmVydmlldyAtIGh0dHBzOi8vZ2l0aHViLmNvbS9SZW5zQWx0aHVpcy92ZXJ0aWNhbC1vdmVydmlldyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc2V0cyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYWRtaW5Aa3Jvbm9zb3VsLnh5eiIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsaXBrL0N1c3RvbWlzZWQtV29ya3NwYWNlcyIsCiAgInV1aWQiOiAid29ya3NldHNAYmxpcGsueHl6IiwKICAidmVyc2lvbiI6IDMwCn0="}, "40": {"version": "42", "sha256": "01cq0904ki57ymsil1s5d1m0r3rzm082z02c43arw0am6q9fnbar", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIEN1c3RvbWlzZSB0aGUgZGFzaCB0byBiZSB1bmlxdWUgZm9yIGVhY2ggd29ya3NwYWNlLCBlYWNoIHdpdGggdGhlaXIgb3duIGZhdm91cml0ZXNcbiogT25seSBzaG93IHJ1bm5pbmcgYXBwbGljYXRpb25zIG9uIHRoZSBkYXNoIGluIHRoZWlyIHJlc3BlY3RpdmUgd29ya3NwYWNlXG4qIENob29zZSBhIGN1c3RvbSBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBNaW5vciBVSSB0d2Vha3MgdG8gdGhlIG92ZXJ2aWV3IHdvcmtzcGFjZXNcbiogU2F2ZSBlYWNoIGN1c3RvbWlzYXRpb24sIHNldCB0aGVtIHRvIGF1dG9sb2FkIG9uIHNwZWNpZmljIHdvcmtzcGFjZXNcbiogSGlkZSB0aGUgZXh0ZW5zaW9uIG9uY2UgeW91J3ZlIGNvbmZpZ3VyZWQgeW91ciBwcmVmZXJlbmNlcyB0byBlbmpveSBzZWFtbGVzc2x5IHVwZ3JhZGVkIHdvcmtzcGFjZXMgaW4gZ25vbWUgc2hlbGxcblxuQ29tcGF0aWJsZSBmb3IgdXNlIHdpdGggYW55IG9mIHRoZXNlIGV4dGVuc2lvbnMgdG8gY29tcGxldGUgeW91ciB3b3Jrc3BhY2UgdXBncmFkZTpcblxuKiBEYXNoIHRvIFBhbmVsIC0gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuKiBEYXNoIHRvIERvY2sgLSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zMDcvZGFzaC10by1kb2NrL1xuKiBBdXRvIE1vdmUgV2luZG93cyAtIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE2L2F1dG8tbW92ZS13aW5kb3dzL1xuKiBWZXJ0aWNhbCBPdmVydmlldyAtIGh0dHBzOi8vZ2l0aHViLmNvbS9SZW5zQWx0aHVpcy92ZXJ0aWNhbC1vdmVydmlldyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc2V0cyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYmxpcGsiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc2V0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogNDIKfQ=="}, "41": {"version": "42", "sha256": "01cq0904ki57ymsil1s5d1m0r3rzm082z02c43arw0am6q9fnbar", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIEN1c3RvbWlzZSB0aGUgZGFzaCB0byBiZSB1bmlxdWUgZm9yIGVhY2ggd29ya3NwYWNlLCBlYWNoIHdpdGggdGhlaXIgb3duIGZhdm91cml0ZXNcbiogT25seSBzaG93IHJ1bm5pbmcgYXBwbGljYXRpb25zIG9uIHRoZSBkYXNoIGluIHRoZWlyIHJlc3BlY3RpdmUgd29ya3NwYWNlXG4qIENob29zZSBhIGN1c3RvbSBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBNaW5vciBVSSB0d2Vha3MgdG8gdGhlIG92ZXJ2aWV3IHdvcmtzcGFjZXNcbiogU2F2ZSBlYWNoIGN1c3RvbWlzYXRpb24sIHNldCB0aGVtIHRvIGF1dG9sb2FkIG9uIHNwZWNpZmljIHdvcmtzcGFjZXNcbiogSGlkZSB0aGUgZXh0ZW5zaW9uIG9uY2UgeW91J3ZlIGNvbmZpZ3VyZWQgeW91ciBwcmVmZXJlbmNlcyB0byBlbmpveSBzZWFtbGVzc2x5IHVwZ3JhZGVkIHdvcmtzcGFjZXMgaW4gZ25vbWUgc2hlbGxcblxuQ29tcGF0aWJsZSBmb3IgdXNlIHdpdGggYW55IG9mIHRoZXNlIGV4dGVuc2lvbnMgdG8gY29tcGxldGUgeW91ciB3b3Jrc3BhY2UgdXBncmFkZTpcblxuKiBEYXNoIHRvIFBhbmVsIC0gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuKiBEYXNoIHRvIERvY2sgLSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zMDcvZGFzaC10by1kb2NrL1xuKiBBdXRvIE1vdmUgV2luZG93cyAtIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE2L2F1dG8tbW92ZS13aW5kb3dzL1xuKiBWZXJ0aWNhbCBPdmVydmlldyAtIGh0dHBzOi8vZ2l0aHViLmNvbS9SZW5zQWx0aHVpcy92ZXJ0aWNhbC1vdmVydmlldyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc2V0cyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYmxpcGsiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc2V0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogNDIKfQ=="}}} +, {"uuid": "worksets@blipk.xyz", "name": "Customised Workspaces", "pname": "worksets", "description": "Customised Workspaces enables creating isolated and customised workspaces.\n\n* Customise the dash to be unique for each workspace, each with their own favourites\n* Only show running applications on the dash in their respective workspace\n* Choose a custom background image for each workspace\n* Minor UI tweaks to the overview workspaces\n* Save each customisation, set them to autoload on specific workspaces\n* Hide the extension once you've configured your preferences to enjoy seamlessly upgraded workspaces in gnome shell\n\nCompatible for use with any of these extensions to complete your workspace upgrade:\n\n* Dash to Panel - https://extensions.gnome.org/extension/1160/dash-to-panel/\n* Dash to Dock - https://extensions.gnome.org/extension/307/dash-to-dock/\n* Auto Move Windows - https://extensions.gnome.org/extension/16/auto-move-windows/\n* Vertical Overview - https://github.com/RensAlthuis/vertical-overview", "link": "https://extensions.gnome.org/extension/1583/worksets/", "shell_version_map": {"38": {"version": "30", "sha256": "0mjah9nx66caqmfbz8wrvg6iyhxp7jmbgwx1gnp8k2a2z536n1iw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIEN1c3RvbWlzZSB0aGUgZGFzaCB0byBiZSB1bmlxdWUgZm9yIGVhY2ggd29ya3NwYWNlLCBlYWNoIHdpdGggdGhlaXIgb3duIGZhdm91cml0ZXNcbiogT25seSBzaG93IHJ1bm5pbmcgYXBwbGljYXRpb25zIG9uIHRoZSBkYXNoIGluIHRoZWlyIHJlc3BlY3RpdmUgd29ya3NwYWNlXG4qIENob29zZSBhIGN1c3RvbSBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBNaW5vciBVSSB0d2Vha3MgdG8gdGhlIG92ZXJ2aWV3IHdvcmtzcGFjZXNcbiogU2F2ZSBlYWNoIGN1c3RvbWlzYXRpb24sIHNldCB0aGVtIHRvIGF1dG9sb2FkIG9uIHNwZWNpZmljIHdvcmtzcGFjZXNcbiogSGlkZSB0aGUgZXh0ZW5zaW9uIG9uY2UgeW91J3ZlIGNvbmZpZ3VyZWQgeW91ciBwcmVmZXJlbmNlcyB0byBlbmpveSBzZWFtbGVzc2x5IHVwZ3JhZGVkIHdvcmtzcGFjZXMgaW4gZ25vbWUgc2hlbGxcblxuQ29tcGF0aWJsZSBmb3IgdXNlIHdpdGggYW55IG9mIHRoZXNlIGV4dGVuc2lvbnMgdG8gY29tcGxldGUgeW91ciB3b3Jrc3BhY2UgdXBncmFkZTpcblxuKiBEYXNoIHRvIFBhbmVsIC0gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuKiBEYXNoIHRvIERvY2sgLSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zMDcvZGFzaC10by1kb2NrL1xuKiBBdXRvIE1vdmUgV2luZG93cyAtIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE2L2F1dG8tbW92ZS13aW5kb3dzL1xuKiBWZXJ0aWNhbCBPdmVydmlldyAtIGh0dHBzOi8vZ2l0aHViLmNvbS9SZW5zQWx0aHVpcy92ZXJ0aWNhbC1vdmVydmlldyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc2V0cyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYWRtaW5Aa3Jvbm9zb3VsLnh5eiIsCiAgInJlc291cmNlLXBhdGgiOiAiL29yZy9rcm9ub3NvdWwvd29ya3NldHMvIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvd29ya3NldHMvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsaXBrL0N1c3RvbWlzZWQtV29ya3NwYWNlcyIsCiAgInV1aWQiOiAid29ya3NldHNAYmxpcGsueHl6IiwKICAidmVyc2lvbiI6IDMwCn0="}, "40": {"version": "43", "sha256": "0crrciyngn4jb005hb2dl9pmyd5j4n5spladk395czwi9h4df7l4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIEN1c3RvbWlzZSB0aGUgZGFzaCB0byBiZSB1bmlxdWUgZm9yIGVhY2ggd29ya3NwYWNlLCBlYWNoIHdpdGggdGhlaXIgb3duIGZhdm91cml0ZXNcbiogT25seSBzaG93IHJ1bm5pbmcgYXBwbGljYXRpb25zIG9uIHRoZSBkYXNoIGluIHRoZWlyIHJlc3BlY3RpdmUgd29ya3NwYWNlXG4qIENob29zZSBhIGN1c3RvbSBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBNaW5vciBVSSB0d2Vha3MgdG8gdGhlIG92ZXJ2aWV3IHdvcmtzcGFjZXNcbiogU2F2ZSBlYWNoIGN1c3RvbWlzYXRpb24sIHNldCB0aGVtIHRvIGF1dG9sb2FkIG9uIHNwZWNpZmljIHdvcmtzcGFjZXNcbiogSGlkZSB0aGUgZXh0ZW5zaW9uIG9uY2UgeW91J3ZlIGNvbmZpZ3VyZWQgeW91ciBwcmVmZXJlbmNlcyB0byBlbmpveSBzZWFtbGVzc2x5IHVwZ3JhZGVkIHdvcmtzcGFjZXMgaW4gZ25vbWUgc2hlbGxcblxuQ29tcGF0aWJsZSBmb3IgdXNlIHdpdGggYW55IG9mIHRoZXNlIGV4dGVuc2lvbnMgdG8gY29tcGxldGUgeW91ciB3b3Jrc3BhY2UgdXBncmFkZTpcblxuKiBEYXNoIHRvIFBhbmVsIC0gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuKiBEYXNoIHRvIERvY2sgLSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zMDcvZGFzaC10by1kb2NrL1xuKiBBdXRvIE1vdmUgV2luZG93cyAtIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE2L2F1dG8tbW92ZS13aW5kb3dzL1xuKiBWZXJ0aWNhbCBPdmVydmlldyAtIGh0dHBzOi8vZ2l0aHViLmNvbS9SZW5zQWx0aHVpcy92ZXJ0aWNhbC1vdmVydmlldyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc2V0cyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYmxpcGsiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc2V0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogNDMKfQ=="}, "41": {"version": "43", "sha256": "0crrciyngn4jb005hb2dl9pmyd5j4n5spladk395czwi9h4df7l4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwud29ya3NldHMiLAogICJkZXNjcmlwdGlvbiI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMgZW5hYmxlcyBjcmVhdGluZyBpc29sYXRlZCBhbmQgY3VzdG9taXNlZCB3b3Jrc3BhY2VzLlxuXG4qIEN1c3RvbWlzZSB0aGUgZGFzaCB0byBiZSB1bmlxdWUgZm9yIGVhY2ggd29ya3NwYWNlLCBlYWNoIHdpdGggdGhlaXIgb3duIGZhdm91cml0ZXNcbiogT25seSBzaG93IHJ1bm5pbmcgYXBwbGljYXRpb25zIG9uIHRoZSBkYXNoIGluIHRoZWlyIHJlc3BlY3RpdmUgd29ya3NwYWNlXG4qIENob29zZSBhIGN1c3RvbSBiYWNrZ3JvdW5kIGltYWdlIGZvciBlYWNoIHdvcmtzcGFjZVxuKiBNaW5vciBVSSB0d2Vha3MgdG8gdGhlIG92ZXJ2aWV3IHdvcmtzcGFjZXNcbiogU2F2ZSBlYWNoIGN1c3RvbWlzYXRpb24sIHNldCB0aGVtIHRvIGF1dG9sb2FkIG9uIHNwZWNpZmljIHdvcmtzcGFjZXNcbiogSGlkZSB0aGUgZXh0ZW5zaW9uIG9uY2UgeW91J3ZlIGNvbmZpZ3VyZWQgeW91ciBwcmVmZXJlbmNlcyB0byBlbmpveSBzZWFtbGVzc2x5IHVwZ3JhZGVkIHdvcmtzcGFjZXMgaW4gZ25vbWUgc2hlbGxcblxuQ29tcGF0aWJsZSBmb3IgdXNlIHdpdGggYW55IG9mIHRoZXNlIGV4dGVuc2lvbnMgdG8gY29tcGxldGUgeW91ciB3b3Jrc3BhY2UgdXBncmFkZTpcblxuKiBEYXNoIHRvIFBhbmVsIC0gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuKiBEYXNoIHRvIERvY2sgLSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zMDcvZGFzaC10by1kb2NrL1xuKiBBdXRvIE1vdmUgV2luZG93cyAtIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE2L2F1dG8tbW92ZS13aW5kb3dzL1xuKiBWZXJ0aWNhbCBPdmVydmlldyAtIGh0dHBzOi8vZ2l0aHViLmNvbS9SZW5zQWx0aHVpcy92ZXJ0aWNhbC1vdmVydmlldyIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3b3Jrc2V0cyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJDdXN0b21pc2VkIFdvcmtzcGFjZXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYmxpcGsiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3dvcmtzZXRzLyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc2V0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvQ3VzdG9taXNlZC1Xb3Jrc3BhY2VzIiwKICAidXVpZCI6ICJ3b3Jrc2V0c0BibGlway54eXoiLAogICJ2ZXJzaW9uIjogNDMKfQ=="}}} , {"uuid": "NordVPN_Connect@poilrouge.fr", "name": "NordVPN Connect", "pname": "nordvpn-connect", "description": "Unofficial Gnome-Shell Extension to provide a GUI for the official NordVPN CLI Tool.", "link": "https://extensions.gnome.org/extension/1595/nordvpn-connect/", "shell_version_map": {"38": {"version": "15", "sha256": "0xccvy3kqgglhcjhixlxi65sa49lbm896lra2sks65arkx3fh63k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgR25vbWUtU2hlbGwgRXh0ZW5zaW9uIHRvIHByb3ZpZGUgYSBHVUkgZm9yIHRoZSBvZmZpY2lhbCBOb3JkVlBOIENMSSBUb29sLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMtbnZwbmNvbm5lY3QiLAogICJuYW1lIjogIk5vcmRWUE4gQ29ubmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5udnBuY29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsZXhQb2lscm91Z2UvTm9yZFZQTi1jb25uZWN0IiwKICAidXVpZCI6ICJOb3JkVlBOX0Nvbm5lY3RAcG9pbHJvdWdlLmZyIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "40": {"version": "18", "sha256": "0isn56fj58aikld1fy8q3afqg2acsz4wbfskzip25xsbc0hpy9qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgR25vbWUtU2hlbGwgRXh0ZW5zaW9uIHRvIHByb3ZpZGUgYSBHVUkgZm9yIHRoZSBvZmZpY2lhbCBOb3JkVlBOIENMSSBUb29sLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMtbnZwbmNvbm5lY3QiLAogICJuYW1lIjogIk5vcmRWUE4gQ29ubmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5udnBuY29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxleFBvaWxyb3VnZS9Ob3JkVlBOLWNvbm5lY3QiLAogICJ1dWlkIjogIk5vcmRWUE5fQ29ubmVjdEBwb2lscm91Z2UuZnIiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "41": {"version": "18", "sha256": "0isn56fj58aikld1fy8q3afqg2acsz4wbfskzip25xsbc0hpy9qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgR25vbWUtU2hlbGwgRXh0ZW5zaW9uIHRvIHByb3ZpZGUgYSBHVUkgZm9yIHRoZSBvZmZpY2lhbCBOb3JkVlBOIENMSSBUb29sLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMtbnZwbmNvbm5lY3QiLAogICJuYW1lIjogIk5vcmRWUE4gQ29ubmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5udnBuY29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxleFBvaWxyb3VnZS9Ob3JkVlBOLWNvbm5lY3QiLAogICJ1dWlkIjogIk5vcmRWUE5fQ29ubmVjdEBwb2lscm91Z2UuZnIiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}}} , {"uuid": "arrangeWindows@sun.wxg@gmail.com", "name": "Arrange Windows", "pname": "arrange-windows", "description": "Arrange windows on the monitors\n\nHotkeys:\n Ctrl+Alt+1 Cascade windows\n Ctrl+Alt+2 Tiling windows\n Ctrl+Alt+3 Side by side windows\n Ctrl+Alt+4 Stack windows", "link": "https://extensions.gnome.org/extension/1604/arrange-windows/", "shell_version_map": {"38": {"version": "21", "sha256": "0dhcawzc2ljxjc31jnk7ihbvngw9sbbcgk7qvhz5syjvsbwzc8c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAibmFtZSI6ICJBcnJhbmdlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFycmFuZ2VXaW5kb3dzIiwKICAidXVpZCI6ICJhcnJhbmdlV2luZG93c0BzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}, "40": {"version": "21", "sha256": "0dhcawzc2ljxjc31jnk7ihbvngw9sbbcgk7qvhz5syjvsbwzc8c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAibmFtZSI6ICJBcnJhbmdlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFycmFuZ2VXaW5kb3dzIiwKICAidXVpZCI6ICJhcnJhbmdlV2luZG93c0BzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}, "41": {"version": "21", "sha256": "0dhcawzc2ljxjc31jnk7ihbvngw9sbbcgk7qvhz5syjvsbwzc8c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFycmFuZ2Ugd2luZG93cyBvbiB0aGUgbW9uaXRvcnNcblxuSG90a2V5czpcbiBDdHJsK0FsdCsxIENhc2NhZGUgd2luZG93c1xuIEN0cmwrQWx0KzIgVGlsaW5nIHdpbmRvd3NcbiBDdHJsK0FsdCszIFNpZGUgYnkgc2lkZSB3aW5kb3dzXG4gQ3RybCtBbHQrNCBTdGFjayB3aW5kb3dzIiwKICAibmFtZSI6ICJBcnJhbmdlIFdpbmRvd3MiLAogICJvcmlnaW5hbC1hdXRob3JzIjogInN1bi53eGdAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFycmFuZ2VXaW5kb3dzIiwKICAidXVpZCI6ICJhcnJhbmdlV2luZG93c0BzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}}} , {"uuid": "fullscreen-notifications@sorrow.about.alice.pm.me", "name": "Fullscreen Notifications", "pname": "fullscreen-notifications", "description": "Enables all notifications in fullscreen mode", "link": "https://extensions.gnome.org/extension/1610/fullscreen-notifications/", "shell_version_map": {"38": {"version": "3", "sha256": "1g1dgrhbif7qcxga7302bhhdjrr2v3vkp6dfavyclzsdkkrr2wwh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzAuMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZ1bGxzY3JlZW4tbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1ub3RpZmljYXRpb25zQHNvcnJvdy5hYm91dC5hbGljZS5wbS5tZSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "5", "sha256": "1cxpgvkpm1r8d14wvl8pic7p6wd4im8cj3dklnzb7ni2ks2h0cps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZ1bGxzY3JlZW4tbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1ub3RpZmljYXRpb25zQHNvcnJvdy5hYm91dC5hbGljZS5wbS5tZSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1cxpgvkpm1r8d14wvl8pic7p6wd4im8cj3dklnzb7ni2ks2h0cps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgYWxsIG5vdGlmaWNhdGlvbnMgaW4gZnVsbHNjcmVlbiBtb2RlIiwKICAibmFtZSI6ICJGdWxsc2NyZWVuIE5vdGlmaWNhdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NvYWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZ1bGxzY3JlZW4tbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1ub3RpZmljYXRpb25zQHNvcnJvdy5hYm91dC5hbGljZS5wbS5tZSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "panelScroll@sun.wxg@gmail.com", "name": "panel scroll", "pname": "panel-scroll", "description": "Switch windows or workspace by mouse scroll on the panel.\nPointer on left of panel, switch windows.\nPointer on right of panel, switch workspaces.", "link": "https://extensions.gnome.org/extension/1616/panel-scroll/", "shell_version_map": {"38": {"version": "10", "sha256": "1llw16wszrkrrzrlyd1ppw8kn1cqp2z4irzi9q7v2nr47hrk14kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIHdvcmtzcGFjZSBieSBtb3VzZSBzY3JvbGwgb24gdGhlIHBhbmVsLlxuUG9pbnRlciBvbiBsZWZ0IG9mIHBhbmVsLCBzd2l0Y2ggd2luZG93cy5cblBvaW50ZXIgb24gcmlnaHQgb2YgcGFuZWwsIHN3aXRjaCB3b3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAicGFuZWwgc2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGFuZWxTY3JvbGwiLAogICJ1dWlkIjogInBhbmVsU2Nyb2xsQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "15", "sha256": "0q4yvmkri1wzhav1va25ffcpw8c4882dgifkwnzmg9fgv0i3vgh3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIHdvcmtzcGFjZSBieSBtb3VzZSBzY3JvbGwgb24gdGhlIHBhbmVsLlxuUG9pbnRlciBvbiBsZWZ0IG9mIHBhbmVsLCBzd2l0Y2ggd2luZG93cy5cblBvaW50ZXIgb24gcmlnaHQgb2YgcGFuZWwsIHN3aXRjaCB3b3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAicGFuZWwgc2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wYW5lbFNjcm9sbCIsCiAgInV1aWQiOiAicGFuZWxTY3JvbGxAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "0q4yvmkri1wzhav1va25ffcpw8c4882dgifkwnzmg9fgv0i3vgh3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIHdvcmtzcGFjZSBieSBtb3VzZSBzY3JvbGwgb24gdGhlIHBhbmVsLlxuUG9pbnRlciBvbiBsZWZ0IG9mIHBhbmVsLCBzd2l0Y2ggd2luZG93cy5cblBvaW50ZXIgb24gcmlnaHQgb2YgcGFuZWwsIHN3aXRjaCB3b3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAicGFuZWwgc2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1wYW5lbFNjcm9sbCIsCiAgInV1aWQiOiAicGFuZWxTY3JvbGxAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} , {"uuid": "soft-brightness@fifi.org", "name": "Soft brightness", "pname": "soft-brightness", "description": "Add or override the brightness slider to change the brightness via an alpha layer (and optionally stop using or cooperate with the exising backlight, if present).\nEither internal, external or all monitors can be dimmed.\nSee the GitHub page for details.\n\nNote that this extension will keep running on the lock screen, as you'd also want the brightness setting to apply to the lock screen as well. Please report on GitHub if this gives you any trouble.", "link": "https://extensions.gnome.org/extension/1625/soft-brightness/", "shell_version_map": {"38": {"version": "29", "sha256": "1bkcjlax2s6ly68lpc53axxrmsicdkqg8kjr91n02nlqjdxsaz6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzb2Z0LWJyaWdodG5lc3MiLAogICJuYW1lIjogIlNvZnQgYnJpZ2h0bmVzcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zb2Z0LWJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzMuOTAiLAogICAgIjMuMzYiLAogICAgIjMuMzUuMSIsCiAgICAiMy4zNS45MiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc29mdC1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJzb2Z0LWJyaWdodG5lc3NAZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjI5LTAtZ2JiMTA1ZTQiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "40": {"version": "29", "sha256": "1bkcjlax2s6ly68lpc53axxrmsicdkqg8kjr91n02nlqjdxsaz6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzb2Z0LWJyaWdodG5lc3MiLAogICJuYW1lIjogIlNvZnQgYnJpZ2h0bmVzcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zb2Z0LWJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzMuOTAiLAogICAgIjMuMzYiLAogICAgIjMuMzUuMSIsCiAgICAiMy4zNS45MiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc29mdC1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJzb2Z0LWJyaWdodG5lc3NAZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjI5LTAtZ2JiMTA1ZTQiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "41": {"version": "29", "sha256": "1bkcjlax2s6ly68lpc53axxrmsicdkqg8kjr91n02nlqjdxsaz6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBvciBvdmVycmlkZSB0aGUgYnJpZ2h0bmVzcyBzbGlkZXIgdG8gY2hhbmdlIHRoZSBicmlnaHRuZXNzIHZpYSBhbiBhbHBoYSBsYXllciAoYW5kIG9wdGlvbmFsbHkgc3RvcCB1c2luZyBvciBjb29wZXJhdGUgd2l0aCB0aGUgZXhpc2luZyBiYWNrbGlnaHQsIGlmIHByZXNlbnQpLlxuRWl0aGVyIGludGVybmFsLCBleHRlcm5hbCBvciBhbGwgbW9uaXRvcnMgY2FuIGJlIGRpbW1lZC5cblNlZSB0aGUgR2l0SHViIHBhZ2UgZm9yIGRldGFpbHMuXG5cbk5vdGUgdGhhdCB0aGlzIGV4dGVuc2lvbiB3aWxsIGtlZXAgcnVubmluZyBvbiB0aGUgbG9jayBzY3JlZW4sIGFzIHlvdSdkIGFsc28gd2FudCB0aGUgYnJpZ2h0bmVzcyBzZXR0aW5nIHRvIGFwcGx5IHRvIHRoZSBsb2NrIHNjcmVlbiBhcyB3ZWxsLiBQbGVhc2UgcmVwb3J0IG9uIEdpdEh1YiBpZiB0aGlzIGdpdmVzIHlvdSBhbnkgdHJvdWJsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzb2Z0LWJyaWdodG5lc3MiLAogICJuYW1lIjogIlNvZnQgYnJpZ2h0bmVzcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zb2Z0LWJyaWdodG5lc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzMuOTAiLAogICAgIjMuMzYiLAogICAgIjMuMzUuMSIsCiAgICAiMy4zNS45MiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc29mdC1icmlnaHRuZXNzIiwKICAidXVpZCI6ICJzb2Z0LWJyaWdodG5lc3NAZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjI5LTAtZ2JiMTA1ZTQiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}}} , {"uuid": "Resource_Monitor@Ory0n", "name": "Resource Monitor", "pname": "resource-monitor", "description": "Monitor the use of system resources like cpu, ram, disk, network and display them in gnome shell top bar.", "link": "https://extensions.gnome.org/extension/1634/resource-monitor/", "shell_version_map": {"38": {"version": "14", "sha256": "0mg6b54cinplc4i3kzn6p397a8flyivcyzg30pnfq7phhgpcnxwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJHaXVzZXBwZSBTaWx2ZXN0cm8iLAogICJkZXNjcmlwdGlvbiI6ICJNb25pdG9yIHRoZSB1c2Ugb2Ygc3lzdGVtIHJlc291cmNlcyBsaWtlIGNwdSwgcmFtLCBkaXNrLCBuZXR3b3JrIGFuZCBkaXNwbGF5IHRoZW0gaW4gZ25vbWUgc2hlbGwgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjb20tZ2l0aHViLU9yeTBuLVJlc291cmNlX01vbml0b3IiLAogICJuYW1lIjogIlJlc291cmNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAiY29tLmdpdGh1Yi5Pcnkwbi5SZXNvdXJjZV9Nb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMHJ5MG4vUmVzb3VyY2VfTW9uaXRvci8iLAogICJ1dWlkIjogIlJlc291cmNlX01vbml0b3JAT3J5MG4iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "40": {"version": "16", "sha256": "0jpamw200p1q0g7h1llvaq3hrqijgzkp7apgyvbgw8mg529q3xyj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJHaXVzZXBwZSBTaWx2ZXN0cm8iLAogICJkZXNjcmlwdGlvbiI6ICJNb25pdG9yIHRoZSB1c2Ugb2Ygc3lzdGVtIHJlc291cmNlcyBsaWtlIGNwdSwgcmFtLCBkaXNrLCBuZXR3b3JrIGFuZCBkaXNwbGF5IHRoZW0gaW4gZ25vbWUgc2hlbGwgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjb20tZ2l0aHViLU9yeTBuLVJlc291cmNlX01vbml0b3IiLAogICJuYW1lIjogIlJlc291cmNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAiY29tLmdpdGh1Yi5Pcnkwbi5SZXNvdXJjZV9Nb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8wcnkwbi9SZXNvdXJjZV9Nb25pdG9yLyIsCiAgInV1aWQiOiAiUmVzb3VyY2VfTW9uaXRvckBPcnkwbiIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "0jpamw200p1q0g7h1llvaq3hrqijgzkp7apgyvbgw8mg529q3xyj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJHaXVzZXBwZSBTaWx2ZXN0cm8iLAogICJkZXNjcmlwdGlvbiI6ICJNb25pdG9yIHRoZSB1c2Ugb2Ygc3lzdGVtIHJlc291cmNlcyBsaWtlIGNwdSwgcmFtLCBkaXNrLCBuZXR3b3JrIGFuZCBkaXNwbGF5IHRoZW0gaW4gZ25vbWUgc2hlbGwgdG9wIGJhci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjb20tZ2l0aHViLU9yeTBuLVJlc291cmNlX01vbml0b3IiLAogICJuYW1lIjogIlJlc291cmNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAiY29tLmdpdGh1Yi5Pcnkwbi5SZXNvdXJjZV9Nb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8wcnkwbi9SZXNvdXJjZV9Nb25pdG9yLyIsCiAgInV1aWQiOiAiUmVzb3VyY2VfTW9uaXRvckBPcnkwbiIsCiAgInZlcnNpb24iOiAxNgp9"}}} -, {"uuid": "tweaks-system-menu@extensions.gnome-shell.fifi.org", "name": "Tweaks & Extensions in System Menu", "pname": "tweaks-in-system-menu", "description": "Put Gnome Tweaks and Extensions (on Shell 40 and later) in the System menu.", "link": "https://extensions.gnome.org/extension/1653/tweaks-in-system-menu/", "shell_version_map": {"38": {"version": "17", "sha256": "0qhl6a3999clrghkllgw9xnh8n963dzmsacvqnj7h4znzjhixkdl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MgYW5kIEV4dGVuc2lvbnMgKG9uIFNoZWxsIDQwIGFuZCBsYXRlcikgaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzUuOTIiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0YtaS1mL3R3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgInV1aWQiOiAidHdlYWtzLXN5c3RlbS1tZW51QGV4dGVuc2lvbnMuZ25vbWUtc2hlbGwuZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjE3LTAtZ2IzMWYxZGUiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "40": {"version": "17", "sha256": "0qhl6a3999clrghkllgw9xnh8n963dzmsacvqnj7h4znzjhixkdl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MgYW5kIEV4dGVuc2lvbnMgKG9uIFNoZWxsIDQwIGFuZCBsYXRlcikgaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzUuOTIiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0YtaS1mL3R3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgInV1aWQiOiAidHdlYWtzLXN5c3RlbS1tZW51QGV4dGVuc2lvbnMuZ25vbWUtc2hlbGwuZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjE3LTAtZ2IzMWYxZGUiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "0qhl6a3999clrghkllgw9xnh8n963dzmsacvqnj7h4znzjhixkdl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MgYW5kIEV4dGVuc2lvbnMgKG9uIFNoZWxsIDQwIGFuZCBsYXRlcikgaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzUuOTIiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0YtaS1mL3R3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgInV1aWQiOiAidHdlYWtzLXN5c3RlbS1tZW51QGV4dGVuc2lvbnMuZ25vbWUtc2hlbGwuZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjE3LTAtZ2IzMWYxZGUiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} +, {"uuid": "tweaks-system-menu@extensions.gnome-shell.fifi.org", "name": "Tweaks & Extensions in System Menu", "pname": "tweaks-in-system-menu", "description": "Put Gnome Tweaks and Extensions (on Shell 40 and later) in the System menu.", "link": "https://extensions.gnome.org/extension/1653/tweaks-in-system-menu/", "shell_version_map": {"38": {"version": "18", "sha256": "0wzpzn3pq05p9qqibb0436kckgh4y16xcm3wgr7xmxx68zpd87p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MgYW5kIEV4dGVuc2lvbnMgKG9uIFNoZWxsIDQwIGFuZCBsYXRlcikgaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzUuOTIiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi90d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogInR3ZWFrcy1zeXN0ZW0tbWVudUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxOC0wLWczMTE4ZmI4IiwKICAidmVyc2lvbiI6IDE4Cn0="}, "40": {"version": "18", "sha256": "0wzpzn3pq05p9qqibb0436kckgh4y16xcm3wgr7xmxx68zpd87p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MgYW5kIEV4dGVuc2lvbnMgKG9uIFNoZWxsIDQwIGFuZCBsYXRlcikgaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzUuOTIiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi90d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogInR3ZWFrcy1zeXN0ZW0tbWVudUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxOC0wLWczMTE4ZmI4IiwKICAidmVyc2lvbiI6IDE4Cn0="}, "41": {"version": "18", "sha256": "0wzpzn3pq05p9qqibb0436kckgh4y16xcm3wgr7xmxx68zpd87p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MgYW5kIEV4dGVuc2lvbnMgKG9uIFNoZWxsIDQwIGFuZCBsYXRlcikgaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzUuOTIiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi90d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogInR3ZWFrcy1zeXN0ZW0tbWVudUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxOC0wLWczMTE4ZmI4IiwKICAidmVyc2lvbiI6IDE4Cn0="}, "42": {"version": "18", "sha256": "0wzpzn3pq05p9qqibb0436kckgh4y16xcm3wgr7xmxx68zpd87p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBHbm9tZSBUd2Vha3MgYW5kIEV4dGVuc2lvbnMgKG9uIFNoZWxsIDQwIGFuZCBsYXRlcikgaW4gdGhlIFN5c3RlbSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInR3ZWFrcy1zeXN0ZW0tbWVudSIsCiAgIm5hbWUiOiAiVHdlYWtzICYgRXh0ZW5zaW9ucyBpbiBTeXN0ZW0gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzUuOTIiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi90d2Vha3Mtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogInR3ZWFrcy1zeXN0ZW0tbWVudUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxOC0wLWczMTE4ZmI4IiwKICAidmVyc2lvbiI6IDE4Cn0="}}} , {"uuid": "topiconsfix@aleskva@devnullmail.com", "name": "TopIconsFix", "pname": "topiconsfix", "description": "Shows legacy tray icons on top – the fixed version of https://extensions.gnome.org/extension/495/topicons/", "link": "https://extensions.gnome.org/extension/1674/topiconsfix/", "shell_version_map": {"38": {"version": "12", "sha256": "1zxihxmbc2hx6f8whv8mqzbl55k3wdgw108q97kadf9v67gpcp0n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGxlZ2FjeSB0cmF5IGljb25zIG9uIHRvcCBcdTIwMTMgdGhlIGZpeGVkIHZlcnNpb24gb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDk1L3RvcGljb25zLyIsCiAgIm5hbWUiOiAiVG9wSWNvbnNGaXgiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0b3BpY29uc2ZpeEBhbGVza3ZhQGRldm51bGxtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "1zxihxmbc2hx6f8whv8mqzbl55k3wdgw108q97kadf9v67gpcp0n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGxlZ2FjeSB0cmF5IGljb25zIG9uIHRvcCBcdTIwMTMgdGhlIGZpeGVkIHZlcnNpb24gb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDk1L3RvcGljb25zLyIsCiAgIm5hbWUiOiAiVG9wSWNvbnNGaXgiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0b3BpY29uc2ZpeEBhbGVza3ZhQGRldm51bGxtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "1zxihxmbc2hx6f8whv8mqzbl55k3wdgw108q97kadf9v67gpcp0n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGxlZ2FjeSB0cmF5IGljb25zIG9uIHRvcCBcdTIwMTMgdGhlIGZpeGVkIHZlcnNpb24gb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDk1L3RvcGljb25zLyIsCiAgIm5hbWUiOiAiVG9wSWNvbnNGaXgiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0b3BpY29uc2ZpeEBhbGVza3ZhQGRldm51bGxtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "animation-tweaks@Selenium-H", "name": "Animation Tweaks", "pname": "animation-tweaks", "description": "Add animations to different items and customize them.\n\nPlease reset the extension after updating.\nThe Extension will stop when upgraded to an incompatible version.\nIn that case an Update tab is created to easily reset the extension.\nA Reset menu entry is also always present in in the Top Right Application menu of the extension preferences window.\nA Default shortcut combination of Super Key + t is provided to disable the extension.\n\nSome effects might not work properly on wayland, for which an option to integrate with wayland is provided on Integrations tab.\nHowever, some animations might not work properly.\n\nTo manage effect Delay time enable Show delay time in preferences Window from Top Right Application menu -> Preferences\nand reopen preferences.", "link": "https://extensions.gnome.org/extension/1680/animation-tweaks/", "shell_version_map": {"38": {"version": "18", "sha256": "07niv7biy9yxmxdg498kqypyqva6y8slm3gmn70dpx9f9ng8ya55", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiQWRkIGFuaW1hdGlvbnMgdG8gZGlmZmVyZW50IGl0ZW1zIGFuZCBjdXN0b21pemUgdGhlbS4iLAogICJkZXNjcmlwdGlvbiI6ICJBZGQgYW5pbWF0aW9ucyB0byBkaWZmZXJlbnQgaXRlbXMgYW5kIGN1c3RvbWl6ZSB0aGVtLlxuXG5QbGVhc2UgcmVzZXQgdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGluZy5cblRoZSBFeHRlbnNpb24gd2lsbCBzdG9wIHdoZW4gdXBncmFkZWQgdG8gYW4gaW5jb21wYXRpYmxlIHZlcnNpb24uXG5JbiB0aGF0IGNhc2UgYW4gVXBkYXRlIHRhYiBpcyBjcmVhdGVkIHRvIGVhc2lseSByZXNldCB0aGUgZXh0ZW5zaW9uLlxuQSBSZXNldCBtZW51IGVudHJ5IGlzIGFsc28gYWx3YXlzIHByZXNlbnQgaW4gaW4gdGhlIFRvcCBSaWdodCBBcHBsaWNhdGlvbiBtZW51IG9mIHRoZSBleHRlbnNpb24gcHJlZmVyZW5jZXMgd2luZG93LlxuQSBEZWZhdWx0IHNob3J0Y3V0IGNvbWJpbmF0aW9uIG9mIFN1cGVyIEtleSArIHQgaXMgcHJvdmlkZWQgdG8gZGlzYWJsZSB0aGUgZXh0ZW5zaW9uLlxuXG5Tb21lIGVmZmVjdHMgbWlnaHQgbm90IHdvcmsgcHJvcGVybHkgb24gd2F5bGFuZCwgZm9yIHdoaWNoIGFuIG9wdGlvbiB0byBpbnRlZ3JhdGUgd2l0aCB3YXlsYW5kIGlzIHByb3ZpZGVkIG9uIEludGVncmF0aW9ucyB0YWIuXG5Ib3dldmVyLCBzb21lIGFuaW1hdGlvbnMgbWlnaHQgbm90IHdvcmsgcHJvcGVybHkuXG5cblRvIG1hbmFnZSBlZmZlY3QgRGVsYXkgdGltZSBlbmFibGUgU2hvdyBkZWxheSB0aW1lIGluIHByZWZlcmVuY2VzIFdpbmRvdyBmcm9tIFRvcCBSaWdodCBBcHBsaWNhdGlvbiBtZW51IC0+IFByZWZlcmVuY2VzXG5hbmQgcmVvcGVuIHByZWZlcmVuY2VzLiIsCiAgIm5hbWUiOiAiQW5pbWF0aW9uIFR3ZWFrcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInN0YXR1cyI6ICIiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NlbGVuaXVtLUgvQW5pbWF0aW9uLVR3ZWFrcyIsCiAgInV1aWQiOiAiYW5pbWF0aW9uLXR3ZWFrc0BTZWxlbml1bS1IIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "40": {"version": "18", "sha256": "07niv7biy9yxmxdg498kqypyqva6y8slm3gmn70dpx9f9ng8ya55", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiQWRkIGFuaW1hdGlvbnMgdG8gZGlmZmVyZW50IGl0ZW1zIGFuZCBjdXN0b21pemUgdGhlbS4iLAogICJkZXNjcmlwdGlvbiI6ICJBZGQgYW5pbWF0aW9ucyB0byBkaWZmZXJlbnQgaXRlbXMgYW5kIGN1c3RvbWl6ZSB0aGVtLlxuXG5QbGVhc2UgcmVzZXQgdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGluZy5cblRoZSBFeHRlbnNpb24gd2lsbCBzdG9wIHdoZW4gdXBncmFkZWQgdG8gYW4gaW5jb21wYXRpYmxlIHZlcnNpb24uXG5JbiB0aGF0IGNhc2UgYW4gVXBkYXRlIHRhYiBpcyBjcmVhdGVkIHRvIGVhc2lseSByZXNldCB0aGUgZXh0ZW5zaW9uLlxuQSBSZXNldCBtZW51IGVudHJ5IGlzIGFsc28gYWx3YXlzIHByZXNlbnQgaW4gaW4gdGhlIFRvcCBSaWdodCBBcHBsaWNhdGlvbiBtZW51IG9mIHRoZSBleHRlbnNpb24gcHJlZmVyZW5jZXMgd2luZG93LlxuQSBEZWZhdWx0IHNob3J0Y3V0IGNvbWJpbmF0aW9uIG9mIFN1cGVyIEtleSArIHQgaXMgcHJvdmlkZWQgdG8gZGlzYWJsZSB0aGUgZXh0ZW5zaW9uLlxuXG5Tb21lIGVmZmVjdHMgbWlnaHQgbm90IHdvcmsgcHJvcGVybHkgb24gd2F5bGFuZCwgZm9yIHdoaWNoIGFuIG9wdGlvbiB0byBpbnRlZ3JhdGUgd2l0aCB3YXlsYW5kIGlzIHByb3ZpZGVkIG9uIEludGVncmF0aW9ucyB0YWIuXG5Ib3dldmVyLCBzb21lIGFuaW1hdGlvbnMgbWlnaHQgbm90IHdvcmsgcHJvcGVybHkuXG5cblRvIG1hbmFnZSBlZmZlY3QgRGVsYXkgdGltZSBlbmFibGUgU2hvdyBkZWxheSB0aW1lIGluIHByZWZlcmVuY2VzIFdpbmRvdyBmcm9tIFRvcCBSaWdodCBBcHBsaWNhdGlvbiBtZW51IC0+IFByZWZlcmVuY2VzXG5hbmQgcmVvcGVuIHByZWZlcmVuY2VzLiIsCiAgIm5hbWUiOiAiQW5pbWF0aW9uIFR3ZWFrcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInN0YXR1cyI6ICIiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NlbGVuaXVtLUgvQW5pbWF0aW9uLVR3ZWFrcyIsCiAgInV1aWQiOiAiYW5pbWF0aW9uLXR3ZWFrc0BTZWxlbml1bS1IIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "41": {"version": "18", "sha256": "07niv7biy9yxmxdg498kqypyqva6y8slm3gmn70dpx9f9ng8ya55", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiQWRkIGFuaW1hdGlvbnMgdG8gZGlmZmVyZW50IGl0ZW1zIGFuZCBjdXN0b21pemUgdGhlbS4iLAogICJkZXNjcmlwdGlvbiI6ICJBZGQgYW5pbWF0aW9ucyB0byBkaWZmZXJlbnQgaXRlbXMgYW5kIGN1c3RvbWl6ZSB0aGVtLlxuXG5QbGVhc2UgcmVzZXQgdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGluZy5cblRoZSBFeHRlbnNpb24gd2lsbCBzdG9wIHdoZW4gdXBncmFkZWQgdG8gYW4gaW5jb21wYXRpYmxlIHZlcnNpb24uXG5JbiB0aGF0IGNhc2UgYW4gVXBkYXRlIHRhYiBpcyBjcmVhdGVkIHRvIGVhc2lseSByZXNldCB0aGUgZXh0ZW5zaW9uLlxuQSBSZXNldCBtZW51IGVudHJ5IGlzIGFsc28gYWx3YXlzIHByZXNlbnQgaW4gaW4gdGhlIFRvcCBSaWdodCBBcHBsaWNhdGlvbiBtZW51IG9mIHRoZSBleHRlbnNpb24gcHJlZmVyZW5jZXMgd2luZG93LlxuQSBEZWZhdWx0IHNob3J0Y3V0IGNvbWJpbmF0aW9uIG9mIFN1cGVyIEtleSArIHQgaXMgcHJvdmlkZWQgdG8gZGlzYWJsZSB0aGUgZXh0ZW5zaW9uLlxuXG5Tb21lIGVmZmVjdHMgbWlnaHQgbm90IHdvcmsgcHJvcGVybHkgb24gd2F5bGFuZCwgZm9yIHdoaWNoIGFuIG9wdGlvbiB0byBpbnRlZ3JhdGUgd2l0aCB3YXlsYW5kIGlzIHByb3ZpZGVkIG9uIEludGVncmF0aW9ucyB0YWIuXG5Ib3dldmVyLCBzb21lIGFuaW1hdGlvbnMgbWlnaHQgbm90IHdvcmsgcHJvcGVybHkuXG5cblRvIG1hbmFnZSBlZmZlY3QgRGVsYXkgdGltZSBlbmFibGUgU2hvdyBkZWxheSB0aW1lIGluIHByZWZlcmVuY2VzIFdpbmRvdyBmcm9tIFRvcCBSaWdodCBBcHBsaWNhdGlvbiBtZW51IC0+IFByZWZlcmVuY2VzXG5hbmQgcmVvcGVuIHByZWZlcmVuY2VzLiIsCiAgIm5hbWUiOiAiQW5pbWF0aW9uIFR3ZWFrcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInN0YXR1cyI6ICIiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NlbGVuaXVtLUgvQW5pbWF0aW9uLVR3ZWFrcyIsCiAgInV1aWQiOiAiYW5pbWF0aW9uLXR3ZWFrc0BTZWxlbml1bS1IIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} , {"uuid": "drawOnYourScreen@abakkk.framagit.org", "name": "Draw On You Screen", "pname": "draw-on-you-screen", "description": "", "link": "https://extensions.gnome.org/extension/1683/draw-on-you-screen/", "shell_version_map": {"38": {"version": "11", "sha256": "0kbgngcb2n234snnavbm8giwi6zhvr48bs0qy4f511d52l2wyawy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZGlyIjogImRyYXdPbllvdXJTY3JlZW4iLAogICJkZXNjcmlwdGlvbiI6ICIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcmF3LW9uLXlvdXItc2NyZWVuIiwKICAibmFtZSI6ICJEcmF3IE9uIFlvdSBTY3JlZW4iLAogICJwZXJzaXN0ZW50LWZpbGUtbmFtZSI6ICJwZXJzaXN0ZW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyYXctb24teW91ci1zY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAic3ZnLWZpbGUtbmFtZSI6ICJEcmF3T25Zb3VyU2NyZWVuIiwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZHJhd09uWW91clNjcmVlbkBhYmFra2suZnJhbWFnaXQub3JnIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "Always-Show-Titles-In-Overview@gmail.com", "name": "Always Show Titles In Overview", "pname": "always-show-titles-in-overview", "description": "Customize Gnome 3 overview.\n\n- Always show titles of all window thumbnails\n- Show/hide app icons\n- App icon position: Bottom, Center\n- Show/hide the app icon when a window is in fullscreen mode\n- Tweak the window thumbnail active size increment (from 5 to 60, the default is 15)\n- Show/hide the background\n- Hide/show icons for Video/TV players, like SMPlayer \n\n", "link": "https://extensions.gnome.org/extension/1689/always-show-titles-in-overview/", "shell_version_map": {"38": {"version": "10", "sha256": "1vnbj1li9ci5n25b49swxps9zqajgr10vfgv5lcn9f9brzm373fp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHbm9tZSAzIG92ZXJ2aWV3LlxuXG4tIEFsd2F5cyBzaG93IHRpdGxlcyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gU2hvdy9oaWRlIGFwcCBpY29uc1xuLSBBcHAgaWNvbiBwb3NpdGlvbjogQm90dG9tLCBDZW50ZXJcbi0gU2hvdy9oaWRlIHRoZSBhcHAgaWNvbiB3aGVuIGEgd2luZG93IGlzIGluIGZ1bGxzY3JlZW4gbW9kZVxuLSBUd2VhayB0aGUgd2luZG93IHRodW1ibmFpbCBhY3RpdmUgc2l6ZSBpbmNyZW1lbnQgKGZyb20gNSB0byA2MCwgdGhlIGRlZmF1bHQgaXMgMTUpXG4tIFNob3cvaGlkZSB0aGUgYmFja2dyb3VuZFxuLSBIaWRlL3Nob3cgaWNvbnMgZm9yIFZpZGVvL1RWIHBsYXllcnMsIGxpa2UgU01QbGF5ZXIgXG5cbiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgVGl0bGVzIEluIE92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9BbHdheXMtU2hvdy1UaXRsZXMtSW4tT3ZlcnZpZXciLAogICJ1dWlkIjogIkFsd2F5cy1TaG93LVRpdGxlcy1Jbi1PdmVydmlld0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "19", "sha256": "01b9cqjwh0i5xf31ri28va4ax775lw5cymsd73ghlzp69p35yc4n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHbm9tZSAzIG92ZXJ2aWV3LlxuXG4tIEFsd2F5cyBzaG93IHRpdGxlcyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gU2hvdy9oaWRlIGFwcCBpY29uc1xuLSBBcHAgaWNvbiBwb3NpdGlvbjogQm90dG9tLCBDZW50ZXJcbi0gU2hvdy9oaWRlIHRoZSBhcHAgaWNvbiB3aGVuIGEgd2luZG93IGlzIGluIGZ1bGxzY3JlZW4gbW9kZVxuLSBUd2VhayB0aGUgd2luZG93IHRodW1ibmFpbCBhY3RpdmUgc2l6ZSBpbmNyZW1lbnQgKGZyb20gNSB0byA2MCwgdGhlIGRlZmF1bHQgaXMgMTUpXG4tIFNob3cvaGlkZSB0aGUgYmFja2dyb3VuZFxuLSBIaWRlL3Nob3cgaWNvbnMgZm9yIFZpZGVvL1RWIHBsYXllcnMsIGxpa2UgU01QbGF5ZXIgXG5cbiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgVGl0bGVzIEluIE92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL0Fsd2F5cy1TaG93LVRpdGxlcy1Jbi1PdmVydmlldyIsCiAgInV1aWQiOiAiQWx3YXlzLVNob3ctVGl0bGVzLUluLU92ZXJ2aWV3QGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "41": {"version": "19", "sha256": "01b9cqjwh0i5xf31ri28va4ax775lw5cymsd73ghlzp69p35yc4n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSBHbm9tZSAzIG92ZXJ2aWV3LlxuXG4tIEFsd2F5cyBzaG93IHRpdGxlcyBvZiBhbGwgd2luZG93IHRodW1ibmFpbHNcbi0gU2hvdy9oaWRlIGFwcCBpY29uc1xuLSBBcHAgaWNvbiBwb3NpdGlvbjogQm90dG9tLCBDZW50ZXJcbi0gU2hvdy9oaWRlIHRoZSBhcHAgaWNvbiB3aGVuIGEgd2luZG93IGlzIGluIGZ1bGxzY3JlZW4gbW9kZVxuLSBUd2VhayB0aGUgd2luZG93IHRodW1ibmFpbCBhY3RpdmUgc2l6ZSBpbmNyZW1lbnQgKGZyb20gNSB0byA2MCwgdGhlIGRlZmF1bHQgaXMgMTUpXG4tIFNob3cvaGlkZSB0aGUgYmFja2dyb3VuZFxuLSBIaWRlL3Nob3cgaWNvbnMgZm9yIFZpZGVvL1RWIHBsYXllcnMsIGxpa2UgU01QbGF5ZXIgXG5cbiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgVGl0bGVzIEluIE92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL0Fsd2F5cy1TaG93LVRpdGxlcy1Jbi1PdmVydmlldyIsCiAgInV1aWQiOiAiQWx3YXlzLVNob3ctVGl0bGVzLUluLU92ZXJ2aWV3QGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}}} , {"uuid": "overview-navigation@nathanielsimard.github.com", "name": "Overview Navigation", "pname": "overview-navigation", "description": "This extension aims to make Gnome Shell easier to navigate using only the keyboard. It is inspired by the vim plugins of Firefox and Chrome.", "link": "https://extensions.gnome.org/extension/1702/overview-navigation/", "shell_version_map": {"38": {"version": "14", "sha256": "10i2j0klcyi22qakmw1f338ldc87w54a0jlg1bwq84ifflmnm8nq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFpbXMgdG8gbWFrZSBHbm9tZSBTaGVsbCBlYXNpZXIgdG8gbmF2aWdhdGUgdXNpbmcgb25seSB0aGUga2V5Ym9hcmQuIEl0IGlzIGluc3BpcmVkIGJ5IHRoZSB2aW0gcGx1Z2lucyBvZiBGaXJlZm94IGFuZCBDaHJvbWUuIiwKICAibmFtZSI6ICJPdmVydmlldyBOYXZpZ2F0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm92ZXJ2aWV3LW5hdmlnYXRpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uYXRoYW5pZWxzaW1hcmQvb3ZlcnZpZXctbmF2aWdhdGlvbiIsCiAgInV1aWQiOiAib3ZlcnZpZXctbmF2aWdhdGlvbkBuYXRoYW5pZWxzaW1hcmQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNAp9"}, "40": {"version": "15", "sha256": "03ah1cx6kjw7698b9wwhz7ag8pag15g8zkxzfrsrcmving9syynd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFpbXMgdG8gbWFrZSBHbm9tZSBTaGVsbCBlYXNpZXIgdG8gbmF2aWdhdGUgdXNpbmcgb25seSB0aGUga2V5Ym9hcmQuIEl0IGlzIGluc3BpcmVkIGJ5IHRoZSB2aW0gcGx1Z2lucyBvZiBGaXJlZm94IGFuZCBDaHJvbWUuIiwKICAibmFtZSI6ICJPdmVydmlldyBOYXZpZ2F0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm92ZXJ2aWV3LW5hdmlnYXRpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmF0aGFuaWVsc2ltYXJkL292ZXJ2aWV3LW5hdmlnYXRpb24iLAogICJ1dWlkIjogIm92ZXJ2aWV3LW5hdmlnYXRpb25AbmF0aGFuaWVsc2ltYXJkLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "16", "sha256": "1qdqbsrmxnvx01hlaq17nps124xah1rkqvr0rpxms7f3klkgkw0d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFpbXMgdG8gbWFrZSBHbm9tZSBTaGVsbCBlYXNpZXIgdG8gbmF2aWdhdGUgdXNpbmcgb25seSB0aGUga2V5Ym9hcmQuIEl0IGlzIGluc3BpcmVkIGJ5IHRoZSB2aW0gcGx1Z2lucyBvZiBGaXJlZm94IGFuZCBDaHJvbWUuIiwKICAibmFtZSI6ICJPdmVydmlldyBOYXZpZ2F0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm92ZXJ2aWV3LW5hdmlnYXRpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmF0aGFuaWVsc2ltYXJkL292ZXJ2aWV3LW5hdmlnYXRpb24iLAogICJ1dWlkIjogIm92ZXJ2aWV3LW5hdmlnYXRpb25AbmF0aGFuaWVsc2ltYXJkLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} , {"uuid": "transparent-top-bar@zhanghai.me", "name": "Transparent Top Bar", "pname": "transparent-top-bar", "description": "Bring back the transparent top bar when free-floating in GNOME Shell 3.32.\n\nThis basically comes from the feature implementation removed in GNOME Shell 3.32, and I modified the code a bit to make it an extension. Enjoy!", "link": "https://extensions.gnome.org/extension/1708/transparent-top-bar/", "shell_version_map": {"38": {"version": "9", "sha256": "0i34ns1rm2iis9mvbyjvckb0l1b0zzzczzan7591y8lqfjplsmzr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIGJhY2sgdGhlIHRyYW5zcGFyZW50IHRvcCBiYXIgd2hlbiBmcmVlLWZsb2F0aW5nIGluIEdOT01FIFNoZWxsIDMuMzIuXG5cblRoaXMgYmFzaWNhbGx5IGNvbWVzIGZyb20gdGhlIGZlYXR1cmUgaW1wbGVtZW50YXRpb24gcmVtb3ZlZCBpbiBHTk9NRSBTaGVsbCAzLjMyLCBhbmQgSSBtb2RpZmllZCB0aGUgY29kZSBhIGJpdCB0byBtYWtlIGl0IGFuIGV4dGVuc2lvbi4gRW5qb3khIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3poYW5naGFpL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQHpoYW5naGFpLm1lIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "13", "sha256": "1ppsii29lv4jaqdrjrav3j19ynv7kwl7mf7pn27lsgiga25n4wyh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIGJhY2sgdGhlIHRyYW5zcGFyZW50IHRvcCBiYXIgd2hlbiBmcmVlLWZsb2F0aW5nIGluIEdOT01FIFNoZWxsIDMuMzIuXG5cblRoaXMgYmFzaWNhbGx5IGNvbWVzIGZyb20gdGhlIGZlYXR1cmUgaW1wbGVtZW50YXRpb24gcmVtb3ZlZCBpbiBHTk9NRSBTaGVsbCAzLjMyLCBhbmQgSSBtb2RpZmllZCB0aGUgY29kZSBhIGJpdCB0byBtYWtlIGl0IGFuIGV4dGVuc2lvbi4gRW5qb3khIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhciIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtdG9wLWJhckB6aGFuZ2hhaS5tZSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "1ppsii29lv4jaqdrjrav3j19ynv7kwl7mf7pn27lsgiga25n4wyh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIGJhY2sgdGhlIHRyYW5zcGFyZW50IHRvcCBiYXIgd2hlbiBmcmVlLWZsb2F0aW5nIGluIEdOT01FIFNoZWxsIDMuMzIuXG5cblRoaXMgYmFzaWNhbGx5IGNvbWVzIGZyb20gdGhlIGZlYXR1cmUgaW1wbGVtZW50YXRpb24gcmVtb3ZlZCBpbiBHTk9NRSBTaGVsbCAzLjMyLCBhbmQgSSBtb2RpZmllZCB0aGUgY29kZSBhIGJpdCB0byBtYWtlIGl0IGFuIGV4dGVuc2lvbi4gRW5qb3khIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhciIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtdG9wLWJhckB6aGFuZ2hhaS5tZSIsCiAgInZlcnNpb24iOiAxMwp9"}}} -, {"uuid": "ssh-search-provider@extensions.gnome-shell.fifi.org", "name": "SSH Search Provider Reborn", "pname": "ssh-search-provider-reborn", "description": "Provide SSH search results in overview.\n\nThis is a fork of the original \"SSH Search Provider\", updated to work with newer Gnome-Shells.", "link": "https://extensions.gnome.org/extension/1714/ssh-search-provider-reborn/", "shell_version_map": {"38": {"version": "10", "sha256": "00b7arbds38bybh3f8w8jk2nglfkwkq2van2nzhqhzscklll0k0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi9zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyQGV4dGVuc2lvbnMuZ25vbWUtc2hlbGwuZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjEwLTAtZ2E4ZDA0YjIiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "00b7arbds38bybh3f8w8jk2nglfkwkq2van2nzhqhzscklll0k0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi9zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyQGV4dGVuc2lvbnMuZ25vbWUtc2hlbGwuZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjEwLTAtZ2E4ZDA0YjIiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "00b7arbds38bybh3f8w8jk2nglfkwkq2van2nzhqhzscklll0k0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi9zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyQGV4dGVuc2lvbnMuZ25vbWUtc2hlbGwuZmlmaS5vcmciLAogICJ2Y3NfcmV2aXNpb24iOiAidjEwLTAtZ2E4ZDA0YjIiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} -, {"uuid": "weeks-start-on-monday@extensions.gnome-shell.fifi.org", "name": "Weeks Start on Monday Again...", "pname": "weeks-start-on-monday-again", "description": "... or maybe not, and that's why the start day is configurable in the preferences.\n\nThis is an updated version of the \"Weeks Start on Monday\" extension for newer Gnome Shells.", "link": "https://extensions.gnome.org/extension/1720/weeks-start-on-monday-again/", "shell_version_map": {"38": {"version": "11", "sha256": "00gjfnhl6hpx5g3hjh50dciwjxhcmw5b4vqb6azjlg71nwjm9a3j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi93ZWVrcy1zdGFydC1vbi1tb25kYXkiLAogICJ1dWlkIjogIndlZWtzLXN0YXJ0LW9uLW1vbmRheUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxMS0wLWc2OTc1ZGNkIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "00gjfnhl6hpx5g3hjh50dciwjxhcmw5b4vqb6azjlg71nwjm9a3j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi93ZWVrcy1zdGFydC1vbi1tb25kYXkiLAogICJ1dWlkIjogIndlZWtzLXN0YXJ0LW9uLW1vbmRheUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxMS0wLWc2OTc1ZGNkIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "00gjfnhl6hpx5g3hjh50dciwjxhcmw5b4vqb6azjlg71nwjm9a3j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9GLWktZi93ZWVrcy1zdGFydC1vbi1tb25kYXkiLAogICJ1dWlkIjogIndlZWtzLXN0YXJ0LW9uLW1vbmRheUBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxMS0wLWc2OTc1ZGNkIiwKICAidmVyc2lvbiI6IDExCn0="}}} +, {"uuid": "ssh-search-provider@extensions.gnome-shell.fifi.org", "name": "SSH Search Provider Reborn", "pname": "ssh-search-provider-reborn", "description": "Provide SSH search results in overview.\n\nThis is a fork of the original \"SSH Search Provider\", updated to work with newer Gnome-Shells.", "link": "https://extensions.gnome.org/extension/1714/ssh-search-provider-reborn/", "shell_version_map": {"38": {"version": "11", "sha256": "1dyzkbzy2lg2h3ixz1i86hbrh69irw70whbrl8vw0m5yypfm15wm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc3NoLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAic3NoLXNlYXJjaC1wcm92aWRlckBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxMS0wLWc2M2M0NjZjIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "1dyzkbzy2lg2h3ixz1i86hbrh69irw70whbrl8vw0m5yypfm15wm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc3NoLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAic3NoLXNlYXJjaC1wcm92aWRlckBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxMS0wLWc2M2M0NjZjIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "1dyzkbzy2lg2h3ixz1i86hbrh69irw70whbrl8vw0m5yypfm15wm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc3NoLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAic3NoLXNlYXJjaC1wcm92aWRlckBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxMS0wLWc2M2M0NjZjIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "1dyzkbzy2lg2h3ixz1i86hbrh69irw70whbrl8vw0m5yypfm15wm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgU1NIIHNlYXJjaCByZXN1bHRzIGluIG92ZXJ2aWV3LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgb3JpZ2luYWwgXCJTU0ggU2VhcmNoIFByb3ZpZGVyXCIsIHVwZGF0ZWQgdG8gd29yayB3aXRoIG5ld2VyIEdub21lLVNoZWxscy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAibmFtZSI6ICJTU0ggU2VhcmNoIFByb3ZpZGVyIFJlYm9ybiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zc2gtc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvc3NoLXNlYXJjaC1wcm92aWRlciIsCiAgInV1aWQiOiAic3NoLXNlYXJjaC1wcm92aWRlckBleHRlbnNpb25zLmdub21lLXNoZWxsLmZpZmkub3JnIiwKICAidmNzX3JldmlzaW9uIjogInYxMS0wLWc2M2M0NjZjIiwKICAidmVyc2lvbiI6IDExCn0="}}} +, {"uuid": "weeks-start-on-monday@extensions.gnome-shell.fifi.org", "name": "Weeks Start on Monday Again...", "pname": "weeks-start-on-monday-again", "description": "... or maybe not, and that's why the start day is configurable in the preferences.\n\nThis is an updated version of the \"Weeks Start on Monday\" extension for newer Gnome Shells.", "link": "https://extensions.gnome.org/extension/1720/weeks-start-on-monday-again/", "shell_version_map": {"38": {"version": "12", "sha256": "1xfl3kid3nymarf696271ixsdxd6vvhadrh5lmp46k11s0dds64m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvd2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAidXVpZCI6ICJ3ZWVrcy1zdGFydC1vbi1tb25kYXlAZXh0ZW5zaW9ucy5nbm9tZS1zaGVsbC5maWZpLm9yZyIsCiAgInZjc19yZXZpc2lvbiI6ICJ2MTItMC1nOTI1NzQxZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "1xfl3kid3nymarf696271ixsdxd6vvhadrh5lmp46k11s0dds64m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvd2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAidXVpZCI6ICJ3ZWVrcy1zdGFydC1vbi1tb25kYXlAZXh0ZW5zaW9ucy5nbm9tZS1zaGVsbC5maWZpLm9yZyIsCiAgInZjc19yZXZpc2lvbiI6ICJ2MTItMC1nOTI1NzQxZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "1xfl3kid3nymarf696271ixsdxd6vvhadrh5lmp46k11s0dds64m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvd2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAidXVpZCI6ICJ3ZWVrcy1zdGFydC1vbi1tb25kYXlAZXh0ZW5zaW9ucy5nbm9tZS1zaGVsbC5maWZpLm9yZyIsCiAgInZjc19yZXZpc2lvbiI6ICJ2MTItMC1nOTI1NzQxZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "1xfl3kid3nymarf696271ixsdxd6vvhadrh5lmp46k11s0dds64m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIi4uLiBvciBtYXliZSBub3QsIGFuZCB0aGF0J3Mgd2h5IHRoZSBzdGFydCBkYXkgaXMgY29uZmlndXJhYmxlIGluIHRoZSBwcmVmZXJlbmNlcy5cblxuVGhpcyBpcyBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdGhlIFwiV2Vla3MgU3RhcnQgb24gTW9uZGF5XCIgZXh0ZW5zaW9uIGZvciBuZXdlciBHbm9tZSBTaGVsbHMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAibmFtZSI6ICJXZWVrcyBTdGFydCBvbiBNb25kYXkgQWdhaW4uLi4iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMud2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjMzLjkwIiwKICAgICIzLjM2IiwKICAgICIzLjM1LjkyIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRi1pLWYvd2Vla3Mtc3RhcnQtb24tbW9uZGF5IiwKICAidXVpZCI6ICJ3ZWVrcy1zdGFydC1vbi1tb25kYXlAZXh0ZW5zaW9ucy5nbm9tZS1zaGVsbC5maWZpLm9yZyIsCiAgInZjc19yZXZpc2lvbiI6ICJ2MTItMC1nOTI1NzQxZSIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "wintile@nowsci.com", "name": "WinTile: Windows 10 window tiling for GNOME", "pname": "wintile-windows-10-window-tiling-for-gnome", "description": "[NOTE] When upgrading to V7, you may get an ERROR. Log out and back in and V7 will begin to work.\n\nWinTile is a hotkey driven window tiling system for GNOME that imitates the standard Win-Arrow keys of Windows 10, allowing you to maximize, maximize to sides, or 1/4 sized to corner across a single or multiple monitors using just Super+Arrow.\n\nAs of v3, WinTile also supports:\n- 2, 3, or 4 columns for standard or ultrawide monitors\n- Top/bottom half support\n- Mouse preview and snapping for placing windows\n- Toggling of 'maximize' mode, which adds/removes GNOME animations\n\nAs of v6, supports installs in GNOME 3.38+\n\nAs of v7, supports installs in GNOME 40+", "link": "https://extensions.gnome.org/extension/1723/wintile-windows-10-window-tiling-for-gnome/", "shell_version_map": {"38": {"version": "7", "sha256": "1nx0psgaj33ipfsnxinvz2vjmdhhvms0bqdflhmkbh1003m6103x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIltOT1RFXSBXaGVuIHVwZ3JhZGluZyB0byBWNywgeW91IG1heSBnZXQgYW4gRVJST1IuIExvZyBvdXQgYW5kIGJhY2sgaW4gYW5kIFY3IHdpbGwgYmVnaW4gdG8gd29yay5cblxuV2luVGlsZSBpcyBhIGhvdGtleSBkcml2ZW4gd2luZG93IHRpbGluZyBzeXN0ZW0gZm9yIEdOT01FIHRoYXQgaW1pdGF0ZXMgdGhlIHN0YW5kYXJkIFdpbi1BcnJvdyBrZXlzIG9mIFdpbmRvd3MgMTAsIGFsbG93aW5nIHlvdSB0byBtYXhpbWl6ZSwgbWF4aW1pemUgdG8gc2lkZXMsIG9yIDEvNCBzaXplZCB0byBjb3JuZXIgYWNyb3NzIGEgc2luZ2xlIG9yIG11bHRpcGxlIG1vbml0b3JzIHVzaW5nIGp1c3QgU3VwZXIrQXJyb3cuXG5cbkFzIG9mIHYzLCBXaW5UaWxlIGFsc28gc3VwcG9ydHM6XG4tIDIsIDMsIG9yIDQgY29sdW1ucyBmb3Igc3RhbmRhcmQgb3IgdWx0cmF3aWRlIG1vbml0b3JzXG4tIFRvcC9ib3R0b20gaGFsZiBzdXBwb3J0XG4tIE1vdXNlIHByZXZpZXcgYW5kIHNuYXBwaW5nIGZvciBwbGFjaW5nIHdpbmRvd3Ncbi0gVG9nZ2xpbmcgb2YgJ21heGltaXplJyBtb2RlLCB3aGljaCBhZGRzL3JlbW92ZXMgR05PTUUgYW5pbWF0aW9uc1xuXG5BcyBvZiB2Niwgc3VwcG9ydHMgaW5zdGFsbHMgaW4gR05PTUUgMy4zOCtcblxuQXMgb2YgdjcsIHN1cHBvcnRzIGluc3RhbGxzIGluIEdOT01FIDQwKyIsCiAgIm5hbWUiOiAiV2luVGlsZTogV2luZG93cyAxMCB3aW5kb3cgdGlsaW5nIGZvciBHTk9NRSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Ztc3RyYXQvd2ludGlsZSIsCiAgInV1aWQiOiAid2ludGlsZUBub3dzY2kuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "1nx0psgaj33ipfsnxinvz2vjmdhhvms0bqdflhmkbh1003m6103x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIltOT1RFXSBXaGVuIHVwZ3JhZGluZyB0byBWNywgeW91IG1heSBnZXQgYW4gRVJST1IuIExvZyBvdXQgYW5kIGJhY2sgaW4gYW5kIFY3IHdpbGwgYmVnaW4gdG8gd29yay5cblxuV2luVGlsZSBpcyBhIGhvdGtleSBkcml2ZW4gd2luZG93IHRpbGluZyBzeXN0ZW0gZm9yIEdOT01FIHRoYXQgaW1pdGF0ZXMgdGhlIHN0YW5kYXJkIFdpbi1BcnJvdyBrZXlzIG9mIFdpbmRvd3MgMTAsIGFsbG93aW5nIHlvdSB0byBtYXhpbWl6ZSwgbWF4aW1pemUgdG8gc2lkZXMsIG9yIDEvNCBzaXplZCB0byBjb3JuZXIgYWNyb3NzIGEgc2luZ2xlIG9yIG11bHRpcGxlIG1vbml0b3JzIHVzaW5nIGp1c3QgU3VwZXIrQXJyb3cuXG5cbkFzIG9mIHYzLCBXaW5UaWxlIGFsc28gc3VwcG9ydHM6XG4tIDIsIDMsIG9yIDQgY29sdW1ucyBmb3Igc3RhbmRhcmQgb3IgdWx0cmF3aWRlIG1vbml0b3JzXG4tIFRvcC9ib3R0b20gaGFsZiBzdXBwb3J0XG4tIE1vdXNlIHByZXZpZXcgYW5kIHNuYXBwaW5nIGZvciBwbGFjaW5nIHdpbmRvd3Ncbi0gVG9nZ2xpbmcgb2YgJ21heGltaXplJyBtb2RlLCB3aGljaCBhZGRzL3JlbW92ZXMgR05PTUUgYW5pbWF0aW9uc1xuXG5BcyBvZiB2Niwgc3VwcG9ydHMgaW5zdGFsbHMgaW4gR05PTUUgMy4zOCtcblxuQXMgb2YgdjcsIHN1cHBvcnRzIGluc3RhbGxzIGluIEdOT01FIDQwKyIsCiAgIm5hbWUiOiAiV2luVGlsZTogV2luZG93cyAxMCB3aW5kb3cgdGlsaW5nIGZvciBHTk9NRSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Ztc3RyYXQvd2ludGlsZSIsCiAgInV1aWQiOiAid2ludGlsZUBub3dzY2kuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "focusli@armonge.info", "name": "Focusli", "pname": "focusli", "description": "Improve focus and increase your productive by listening to different sounds", "link": "https://extensions.gnome.org/extension/1726/focusli/", "shell_version_map": {"40": {"version": "7", "sha256": "0061krhxrp5wrqi4dflmd8anw3szqq335y2z2ka48pf662vkp7km", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmUgZm9jdXMgYW5kIGluY3JlYXNlIHlvdXIgcHJvZHVjdGl2ZSBieSBsaXN0ZW5pbmcgdG8gZGlmZmVyZW50IHNvdW5kcyIsCiAgIm5hbWUiOiAiRm9jdXNsaSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcm1vbmdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1c2xpIiwKICAidXVpZCI6ICJmb2N1c2xpQGFybW9uZ2UuaW5mbyIsCiAgInZlcnNpb24iOiA3Cn0="}}} -, {"uuid": "gtktitlebar@velitasali.github.io", "name": "GTK Title Bar", "pname": "gtk-title-bar", "description": "Remove title bars for non-GTK apps with minimal interference with the default workflow", "link": "https://extensions.gnome.org/extension/1732/gtk-title-bar/", "shell_version_map": {"40": {"version": "10", "sha256": "100mb5ga559jcv0f3a7drcki682vpgnkl8p1hga7w8mbckkybwkx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aXRsZSBiYXJzIGZvciBub24tR1RLIGFwcHMgd2l0aCBtaW5pbWFsIGludGVyZmVyZW5jZSB3aXRoIHRoZSBkZWZhdWx0IHdvcmtmbG93IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrdGl0bGViYXIiLAogICJuYW1lIjogIkdUSyBUaXRsZSBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrdGl0bGViYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2d0a3RpdGxlYmFyIiwKICAidXVpZCI6ICJndGt0aXRsZWJhckB2ZWxpdGFzYWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "100mb5ga559jcv0f3a7drcki682vpgnkl8p1hga7w8mbckkybwkx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aXRsZSBiYXJzIGZvciBub24tR1RLIGFwcHMgd2l0aCBtaW5pbWFsIGludGVyZmVyZW5jZSB3aXRoIHRoZSBkZWZhdWx0IHdvcmtmbG93IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrdGl0bGViYXIiLAogICJuYW1lIjogIkdUSyBUaXRsZSBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrdGl0bGViYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2d0a3RpdGxlYmFyIiwKICAidXVpZCI6ICJndGt0aXRsZWJhckB2ZWxpdGFzYWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} +, {"uuid": "gtktitlebar@velitasali.github.io", "name": "GTK Title Bar", "pname": "gtk-title-bar", "description": "Remove title bars for non-GTK apps with minimal interference with the default workflow", "link": "https://extensions.gnome.org/extension/1732/gtk-title-bar/", "shell_version_map": {"40": {"version": "10", "sha256": "100mb5ga559jcv0f3a7drcki682vpgnkl8p1hga7w8mbckkybwkx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aXRsZSBiYXJzIGZvciBub24tR1RLIGFwcHMgd2l0aCBtaW5pbWFsIGludGVyZmVyZW5jZSB3aXRoIHRoZSBkZWZhdWx0IHdvcmtmbG93IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrdGl0bGViYXIiLAogICJuYW1lIjogIkdUSyBUaXRsZSBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrdGl0bGViYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2d0a3RpdGxlYmFyIiwKICAidXVpZCI6ICJndGt0aXRsZWJhckB2ZWxpdGFzYWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "100mb5ga559jcv0f3a7drcki682vpgnkl8p1hga7w8mbckkybwkx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aXRsZSBiYXJzIGZvciBub24tR1RLIGFwcHMgd2l0aCBtaW5pbWFsIGludGVyZmVyZW5jZSB3aXRoIHRoZSBkZWZhdWx0IHdvcmtmbG93IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrdGl0bGViYXIiLAogICJuYW1lIjogIkdUSyBUaXRsZSBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrdGl0bGViYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2d0a3RpdGxlYmFyIiwKICAidXVpZCI6ICJndGt0aXRsZWJhckB2ZWxpdGFzYWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "100mb5ga559jcv0f3a7drcki682vpgnkl8p1hga7w8mbckkybwkx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aXRsZSBiYXJzIGZvciBub24tR1RLIGFwcHMgd2l0aCBtaW5pbWFsIGludGVyZmVyZW5jZSB3aXRoIHRoZSBkZWZhdWx0IHdvcmtmbG93IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3RrdGl0bGViYXIiLAogICJuYW1lIjogIkdUSyBUaXRsZSBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrdGl0bGViYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2d0a3RpdGxlYmFyIiwKICAidXVpZCI6ICJndGt0aXRsZWJhckB2ZWxpdGFzYWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "quicklists@maestroschan.fr", "name": "Quicklists", "pname": "quicklists", "description": "Add dynamic quicklists to app icons, such as file manager bookmarks and recent files.", "link": "https://extensions.gnome.org/extension/1747/quicklists/", "shell_version_map": {"38": {"version": "7", "sha256": "1cck1k1kf116z85m5fby0hhaa7fplhryv0nv1pdc3h8200i39580", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBkeW5hbWljIHF1aWNrbGlzdHMgdG8gYXBwIGljb25zLCBzdWNoIGFzIGZpbGUgbWFuYWdlciBib29rbWFya3MgYW5kIHJlY2VudCBmaWxlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdWlja2xpc3RzIiwKICAibmFtZSI6ICJRdWlja2xpc3RzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1aWNrbGlzdHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovcXVpY2tsaXN0cy1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInF1aWNrbGlzdHNAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "lan-ip-address@mrhuber.com", "name": "LAN IP Address", "pname": "lan-ip-address", "description": "Show LAN IP address on GNOME panel. Do not show loopback addresses (127.0.0.0/8) or Docker networks.", "link": "https://extensions.gnome.org/extension/1762/lan-ip-address/", "shell_version_map": {"38": {"version": "8", "sha256": "0l81fiznq3q7q2m0ryjcmba9kzqhf0a7hq8j2sahr49acd6ih9wq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3Nob2xpdGgvZ25vbWUtZXh0ZW5zaW9uLWxhbi1pcC1hZGRyZXNzIiwKICAidXVpZCI6ICJsYW4taXAtYWRkcmVzc0Btcmh1YmVyLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "0l81fiznq3q7q2m0ryjcmba9kzqhf0a7hq8j2sahr49acd6ih9wq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3Nob2xpdGgvZ25vbWUtZXh0ZW5zaW9uLWxhbi1pcC1hZGRyZXNzIiwKICAidXVpZCI6ICJsYW4taXAtYWRkcmVzc0Btcmh1YmVyLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0l81fiznq3q7q2m0ryjcmba9kzqhf0a7hq8j2sahr49acd6ih9wq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgTEFOIElQIGFkZHJlc3Mgb24gR05PTUUgcGFuZWwuIERvIG5vdCBzaG93IGxvb3BiYWNrIGFkZHJlc3NlcyAoMTI3LjAuMC4wLzgpIG9yIERvY2tlciBuZXR3b3Jrcy4iLAogICJuYW1lIjogIkxBTiBJUCBBZGRyZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3Nob2xpdGgvZ25vbWUtZXh0ZW5zaW9uLWxhbi1pcC1hZGRyZXNzIiwKICAidXVpZCI6ICJsYW4taXAtYWRkcmVzc0Btcmh1YmVyLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "TransparentTopbar@enrico.sorio.net", "name": "Transparent Topbar", "pname": "transparent-topbar", "description": "Transparent Topbar with Multi monitors support", "link": "https://extensions.gnome.org/extension/1765/transparent-topbar/", "shell_version_map": {"38": {"version": "2", "sha256": "0rv7ddwrsmk7zrwyf2fkjhiv38pm4h0ijx1mppwji7vgvips0602", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IFRvcGJhciB3aXRoIE11bHRpIG1vbml0b3JzIHN1cHBvcnQiLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiVHJhbnNwYXJlbnRUb3BiYXJAZW5yaWNvLnNvcmlvLm5ldCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "0rv7ddwrsmk7zrwyf2fkjhiv38pm4h0ijx1mppwji7vgvips0602", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IFRvcGJhciB3aXRoIE11bHRpIG1vbml0b3JzIHN1cHBvcnQiLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiVHJhbnNwYXJlbnRUb3BiYXJAZW5yaWNvLnNvcmlvLm5ldCIsCiAgInZlcnNpb24iOiAyCn0="}}} @@ -236,23 +237,23 @@ , {"uuid": "dict@sun.wxg@gmail.com", "name": "Screen word translate", "pname": "screen-word-translate", "description": "Translate word on the screen.\nDefault web address is translate.google.com, you can add the web address for your own language. Also you can contribute your web address to my github repo.\nUse hotkey Ctrl+Alt+j to toggle the function.\nUse hotkey Ctrl+Alt+o to show popup window", "link": "https://extensions.gnome.org/extension/1849/screen-word-translate/", "shell_version_map": {"38": {"version": "32", "sha256": "0wh9d0siggr49bfcx1308xx8rxc58nadnhp3mjj53i6fvja3cx62", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRpY3QiLAogICJ1dWlkIjogImRpY3RAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzIKfQ=="}, "40": {"version": "38", "sha256": "19rpi2hqznwzngzw9zsar00mhmqav8v7wbij4r7cai4jgvmk8459", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGljdCIsCiAgInV1aWQiOiAiZGljdEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"}, "41": {"version": "38", "sha256": "19rpi2hqznwzngzw9zsar00mhmqav8v7wbij4r7cai4jgvmk8459", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3b3JkIG9uIHRoZSBzY3JlZW4uXG5EZWZhdWx0IHdlYiBhZGRyZXNzIGlzIHRyYW5zbGF0ZS5nb29nbGUuY29tLCB5b3UgY2FuIGFkZCB0aGUgd2ViIGFkZHJlc3MgZm9yIHlvdXIgb3duIGxhbmd1YWdlLiBBbHNvIHlvdSBjYW4gY29udHJpYnV0ZSB5b3VyIHdlYiBhZGRyZXNzIHRvIG15IGdpdGh1YiByZXBvLlxuVXNlIGhvdGtleSBDdHJsK0FsdCtqIHRvIHRvZ2dsZSB0aGUgZnVuY3Rpb24uXG5Vc2UgaG90a2V5IEN0cmwrQWx0K28gdG8gc2hvdyBwb3B1cCB3aW5kb3ciLAogICJuYW1lIjogIlNjcmVlbiB3b3JkIHRyYW5zbGF0ZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAic3VuLnd4Z0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGljdCIsCiAgInV1aWQiOiAiZGljdEBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOAp9"}}} , {"uuid": "gamemode@christian.kellner.me", "name": "GameMode", "pname": "gamemode", "description": "Status indicator for GameMode", "link": "https://extensions.gnome.org/extension/1852/gamemode/", "shell_version_map": {"38": {"version": "6", "sha256": "05256a7rcw1db983w557cpl5vilkb0wg82xpja91j2lqnp7als5l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naWNtby9nYW1lbW9kZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdhbWVtb2RlQGNocmlzdGlhbi5rZWxsbmVyLm1lIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "05256a7rcw1db983w557cpl5vilkb0wg82xpja91j2lqnp7als5l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naWNtby9nYW1lbW9kZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdhbWVtb2RlQGNocmlzdGlhbi5rZWxsbmVyLm1lIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "05256a7rcw1db983w557cpl5vilkb0wg82xpja91j2lqnp7als5l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBpbmRpY2F0b3IgZm9yIEdhbWVNb2RlIiwKICAiZXh0ZW5zaW9uLWlkIjogImdhbWVtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ2FtZW1vZGUtZXh0ZW5zaW9uIiwKICAibmFtZSI6ICJHYW1lTW9kZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJja2VsbG5lckByZWRoYXQuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdhbWVtb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naWNtby9nYW1lbW9kZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdhbWVtb2RlQGNocmlzdGlhbi5rZWxsbmVyLm1lIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "unredirect@vaina.lt", "name": "Disable unredirect fullscreen windows", "pname": "disable-unredirect-fullscreen-windows", "description": "Disables unredirect fullscreen windows in gnome-shell", "link": "https://extensions.gnome.org/extension/1873/disable-unredirect-fullscreen-windows/", "shell_version_map": {"38": {"version": "4", "sha256": "114536ils1avmwzqxf41q78wg50ynpiyq9kiw7smbxnx6l4pds0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIiwKICAibmFtZSI6ICJEaXNhYmxlIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJLYXppbWllcmFzIFZhaW5hIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuNCIsCiAgICAiMy42IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "114536ils1avmwzqxf41q78wg50ynpiyq9kiw7smbxnx6l4pds0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIiwKICAibmFtZSI6ICJEaXNhYmxlIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJLYXppbWllcmFzIFZhaW5hIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuNCIsCiAgICAiMy42IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "114536ils1avmwzqxf41q78wg50ynpiyq9kiw7smbxnx6l4pds0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIiwKICAibmFtZSI6ICJEaXNhYmxlIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJLYXppbWllcmFzIFZhaW5hIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIiLAogICAgIjMuNCIsCiAgICAiMy42IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMzAiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thenlzbWFzdGVyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAdmFpbmEubHQiLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "krypto@sereneblue", "name": "krypto", "pname": "krypto", "description": "Cryptocurrency utility", "link": "https://extensions.gnome.org/extension/1913/krypto/", "shell_version_map": {"38": {"version": "5", "sha256": "0pmga4iqpm0i853lgqfhvnkxhji8m79pk9hgf24lvbpv8alkxzz3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtyeXB0byIsCiAgInV1aWQiOiAia3J5cHRvQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "14", "sha256": "04nplrnqbbg449yrbzlz6250ra9ai21swx1k4rx1r7z9x7pd8g74", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3J5cHRvIiwKICAidXVpZCI6ICJrcnlwdG9Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "04nplrnqbbg449yrbzlz6250ra9ai21swx1k4rx1r7z9x7pd8g74", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24ta3J5cHRvIiwKICAidXVpZCI6ICJrcnlwdG9Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiAxNAp9"}}} +, {"uuid": "krypto@sereneblue", "name": "krypto", "pname": "krypto", "description": "Cryptocurrency utility", "link": "https://extensions.gnome.org/extension/1913/krypto/", "shell_version_map": {"38": {"version": "5", "sha256": "0pmga4iqpm0i853lgqfhvnkxhji8m79pk9hgf24lvbpv8alkxzz3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtyeXB0byIsCiAgInV1aWQiOiAia3J5cHRvQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "17", "sha256": "0s6xv3ndjj2bhliyp9rxkxk3sqbbiff1x886ca03j5f8ywcg7x7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtyeXB0byIsCiAgInV1aWQiOiAia3J5cHRvQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "0s6xv3ndjj2bhliyp9rxkxk3sqbbiff1x886ca03j5f8ywcg7x7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtyeXB0byIsCiAgInV1aWQiOiAia3J5cHRvQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "42": {"version": "17", "sha256": "0s6xv3ndjj2bhliyp9rxkxk3sqbbiff1x886ca03j5f8ywcg7x7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyeXB0b2N1cnJlbmN5IHV0aWxpdHkiLAogICJuYW1lIjogImtyeXB0byIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtyeXB0byIsCiAgInV1aWQiOiAia3J5cHRvQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "cmus-status@yagreg7.gmail.com", "name": "cmus status", "pname": "cmus-status", "description": "Shows cmus status", "link": "https://extensions.gnome.org/extension/1934/cmus-status/", "shell_version_map": {"38": {"version": "8", "sha256": "1a6b10kirzbjlllcnffznjlljicah172kpvs0p8rmwhcpn88i8hx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGNtdXMgc3RhdHVzIiwKICAibmFtZSI6ICJjbXVzIHN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbXVzLXN0YXR1cy5nc2NoZW1hLnhtbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dyZWdUaGVNYWRNb25rL2dub21lLWNtdXMtc3RhdHVzIiwKICAidXVpZCI6ICJjbXVzLXN0YXR1c0B5YWdyZWc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "10", "sha256": "0a1g8l2w46nky88db7vjpv3iz87jk967vfm3vnvi7rw9wqphkn9z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGNtdXMgc3RhdHVzIiwKICAibmFtZSI6ICJjbXVzIHN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbXVzLXN0YXR1cy5nc2NoZW1hLnhtbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3JlZ1RoZU1hZE1vbmsvZ25vbWUtY211cy1zdGF0dXMiLAogICJ1dWlkIjogImNtdXMtc3RhdHVzQHlhZ3JlZzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0a1g8l2w46nky88db7vjpv3iz87jk967vfm3vnvi7rw9wqphkn9z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGNtdXMgc3RhdHVzIiwKICAibmFtZSI6ICJjbXVzIHN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jbXVzLXN0YXR1cy5nc2NoZW1hLnhtbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3JlZ1RoZU1hZE1vbmsvZ25vbWUtY211cy1zdGF0dXMiLAogICJ1dWlkIjogImNtdXMtc3RhdHVzQHlhZ3JlZzcuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "no-title-bar@jonaspoehler.de", "name": "No Title Bar - Forked", "pname": "no-title-bar-forked", "description": "No Title Bar removes the title bar from non-GTK applications and moves the window title and buttons to the top panel.\n\nTitlebars are also hidden for Wayland-native clients that don't use CSD. Some of the options may be incompatible with this. For issues on Wayland please visit github!\n\nThis is a fork of https://extensions.gnome.org/extension/1267/no-title-bar/ with added compatibility for Gnome 3.32+.\n\nThis extension depends on some Xorg utilities. To install them:\n\n⚫ Debian/Ubuntu: apt install x11-utils\n⚫ Fedora/RHEL: dnf install xorg-x11-utils\n⚫ Arch: pacman -S xorg-xprop", "link": "https://extensions.gnome.org/extension/2015/no-title-bar-forked/", "shell_version_map": {"38": {"version": "5", "sha256": "0kch8yra13813gg3wa90lm57skqshmj3j1147lrqwhl9va9rk4q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIFRpdGxlIEJhciByZW1vdmVzIHRoZSB0aXRsZSBiYXIgZnJvbSBub24tR1RLIGFwcGxpY2F0aW9ucyBhbmQgbW92ZXMgdGhlIHdpbmRvdyB0aXRsZSBhbmQgYnV0dG9ucyB0byB0aGUgdG9wIHBhbmVsLlxuXG5UaXRsZWJhcnMgYXJlIGFsc28gaGlkZGVuIGZvciBXYXlsYW5kLW5hdGl2ZSBjbGllbnRzIHRoYXQgZG9uJ3QgdXNlIENTRC4gU29tZSBvZiB0aGUgb3B0aW9ucyBtYXkgYmUgaW5jb21wYXRpYmxlIHdpdGggdGhpcy4gRm9yIGlzc3VlcyBvbiBXYXlsYW5kIHBsZWFzZSB2aXNpdCBnaXRodWIhXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyNjcvbm8tdGl0bGUtYmFyLyB3aXRoIGFkZGVkIGNvbXBhdGliaWxpdHkgZm9yIEdub21lIDMuMzIrLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcblxuXHUyNmFiIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuXHUyNmFiIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuXHUyNmFiIEFyY2g6IHBhY21hbiAtUyB4b3JnLXhwcm9wIiwKICAibmFtZSI6ICJObyBUaXRsZSBCYXIgLSBGb3JrZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wb2VobGVyai9uby10aXRsZS1iYXIiLAogICJ1dWlkIjogIm5vLXRpdGxlLWJhckBqb25hc3BvZWhsZXIuZGUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "6", "sha256": "1plnj999qynsfvab6s01rfrdvw6m0s19b4zirhmlqrpax9vjl3zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIFRpdGxlIEJhciByZW1vdmVzIHRoZSB0aXRsZSBiYXIgZnJvbSBub24tR1RLIGFwcGxpY2F0aW9ucyBhbmQgbW92ZXMgdGhlIHdpbmRvdyB0aXRsZSBhbmQgYnV0dG9ucyB0byB0aGUgdG9wIHBhbmVsLlxuXG5UaXRsZWJhcnMgYXJlIGFsc28gaGlkZGVuIGZvciBXYXlsYW5kLW5hdGl2ZSBjbGllbnRzIHRoYXQgZG9uJ3QgdXNlIENTRC4gU29tZSBvZiB0aGUgb3B0aW9ucyBtYXkgYmUgaW5jb21wYXRpYmxlIHdpdGggdGhpcy4gRm9yIGlzc3VlcyBvbiBXYXlsYW5kIHBsZWFzZSB2aXNpdCBnaXRodWIhXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyNjcvbm8tdGl0bGUtYmFyLyB3aXRoIGFkZGVkIGNvbXBhdGliaWxpdHkgZm9yIEdub21lIDMuMzIrLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcblxuXHUyNmFiIERlYmlhbi9VYnVudHU6IGFwdCBpbnN0YWxsIHgxMS11dGlsc1xuXHUyNmFiIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuXHUyNmFiIEFyY2g6IHBhY21hbiAtUyB4b3JnLXhwcm9wIiwKICAibmFtZSI6ICJObyBUaXRsZSBCYXIgLSBGb3JrZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9laGxlcmovbm8tdGl0bGUtYmFyIiwKICAidXVpZCI6ICJuby10aXRsZS1iYXJAam9uYXNwb2VobGVyLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "application_view_when_empty@fawtytoo", "name": "Show Application View When Workspace Empty", "pname": "show-application-view-when-workspace-empty", "description": "Shows the application view when the workspace is or becomes empty, such as switching to an empty workspace, when all windows on a workspace are closed, or after login. Starting applications or switching to a workspace with open windows will hide the application view if it's showing.\nFrom version 22, this extension waits for any window closing animation to complete (if enabled) before showing the application view.", "link": "https://extensions.gnome.org/extension/2036/show-application-view-when-workspace-empty/", "shell_version_map": {"38": {"version": "24", "sha256": "1g8c9pz8i35kap730ly0h3lzz2qrzc9057zw9mpcwqkqkp6v1aw4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mYXd0eXRvby9TaG93LUFwcGxpY2F0aW9uLVZpZXctV2hlbi1Xb3Jrc3BhY2UtRW1wdHkiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNAp9"}, "40": {"version": "24", "sha256": "1g8c9pz8i35kap730ly0h3lzz2qrzc9057zw9mpcwqkqkp6v1aw4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mYXd0eXRvby9TaG93LUFwcGxpY2F0aW9uLVZpZXctV2hlbi1Xb3Jrc3BhY2UtRW1wdHkiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNAp9"}, "41": {"version": "24", "sha256": "1g8c9pz8i35kap730ly0h3lzz2qrzc9057zw9mpcwqkqkp6v1aw4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mYXd0eXRvby9TaG93LUFwcGxpY2F0aW9uLVZpZXctV2hlbi1Xb3Jrc3BhY2UtRW1wdHkiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNAp9"}}} , {"uuid": "activities_icon_menu@fawtytoo", "name": "Activities Icon Menu", "pname": "activities-menu-for-apps-and-windows", "description": "This extension turns the Activities button into a popup menu with icons for selecting either Applications or Workspaces in the Overview. Selecting the same view again will hide the overview.\n\nThis is particularly useful for tablet users that find the Activities button difficult to click on, whereas a menu can be more easily invoked.", "link": "https://extensions.gnome.org/extension/2048/activities-menu-for-apps-and-windows/", "shell_version_map": {"38": {"version": "10", "sha256": "1ggr5il7fvh07zabh3mk3rhy68daqpj2wzqh9qxh76ykcswzd8kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHR1cm5zIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBpbnRvIGEgcG9wdXAgbWVudSB3aXRoIGljb25zIGZvciBzZWxlY3RpbmcgZWl0aGVyIEFwcGxpY2F0aW9ucyBvciBXb3Jrc3BhY2VzIGluIHRoZSBPdmVydmlldy4gU2VsZWN0aW5nIHRoZSBzYW1lIHZpZXcgYWdhaW4gd2lsbCBoaWRlIHRoZSBvdmVydmlldy5cblxuVGhpcyBpcyBwYXJ0aWN1bGFybHkgdXNlZnVsIGZvciB0YWJsZXQgdXNlcnMgdGhhdCBmaW5kIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBkaWZmaWN1bHQgdG8gY2xpY2sgb24sIHdoZXJlYXMgYSBtZW51IGNhbiBiZSBtb3JlIGVhc2lseSBpbnZva2VkLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29uIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhY3Rpdml0aWVzX2ljb25fbWVudUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "1ggr5il7fvh07zabh3mk3rhy68daqpj2wzqh9qxh76ykcswzd8kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHR1cm5zIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBpbnRvIGEgcG9wdXAgbWVudSB3aXRoIGljb25zIGZvciBzZWxlY3RpbmcgZWl0aGVyIEFwcGxpY2F0aW9ucyBvciBXb3Jrc3BhY2VzIGluIHRoZSBPdmVydmlldy4gU2VsZWN0aW5nIHRoZSBzYW1lIHZpZXcgYWdhaW4gd2lsbCBoaWRlIHRoZSBvdmVydmlldy5cblxuVGhpcyBpcyBwYXJ0aWN1bGFybHkgdXNlZnVsIGZvciB0YWJsZXQgdXNlcnMgdGhhdCBmaW5kIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBkaWZmaWN1bHQgdG8gY2xpY2sgb24sIHdoZXJlYXMgYSBtZW51IGNhbiBiZSBtb3JlIGVhc2lseSBpbnZva2VkLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29uIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhY3Rpdml0aWVzX2ljb25fbWVudUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1ggr5il7fvh07zabh3mk3rhy68daqpj2wzqh9qxh76ykcswzd8kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHR1cm5zIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBpbnRvIGEgcG9wdXAgbWVudSB3aXRoIGljb25zIGZvciBzZWxlY3RpbmcgZWl0aGVyIEFwcGxpY2F0aW9ucyBvciBXb3Jrc3BhY2VzIGluIHRoZSBPdmVydmlldy4gU2VsZWN0aW5nIHRoZSBzYW1lIHZpZXcgYWdhaW4gd2lsbCBoaWRlIHRoZSBvdmVydmlldy5cblxuVGhpcyBpcyBwYXJ0aWN1bGFybHkgdXNlZnVsIGZvciB0YWJsZXQgdXNlcnMgdGhhdCBmaW5kIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBkaWZmaWN1bHQgdG8gY2xpY2sgb24sIHdoZXJlYXMgYSBtZW51IGNhbiBiZSBtb3JlIGVhc2lseSBpbnZva2VkLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29uIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhY3Rpdml0aWVzX2ljb25fbWVudUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "Gold_Price_Monitor@wotmshuaisi_github", "name": "Gold Price Monitor", "pname": "gold-price-monitor", "description": "simple gnome extension helps you tracking gold price in realtime", "link": "https://extensions.gnome.org/extension/2075/gold-price-monitor/", "shell_version_map": {"40": {"version": "22", "sha256": "04gqhg2am27iifzgfibcs28cqqq6lkb5lmmhzvba6pyqa9i175lr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9nb2xkcHJpY2Vtb25pdG9yIiwKICAidXVpZCI6ICJHb2xkX1ByaWNlX01vbml0b3JAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDIyCn0="}, "41": {"version": "22", "sha256": "04gqhg2am27iifzgfibcs28cqqq6lkb5lmmhzvba6pyqa9i175lr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9nb2xkcHJpY2Vtb25pdG9yIiwKICAidXVpZCI6ICJHb2xkX1ByaWNlX01vbml0b3JAd290bXNodWFpc2lfZ2l0aHViIiwKICAidmVyc2lvbiI6IDIyCn0="}}} -, {"uuid": "ding@rastersoft.com", "name": "Desktop Icons NG (DING)", "pname": "desktop-icons-ng-ding", "description": "Adds icons to the desktop. Fork of the original Desktop Icons extension, with several enhancements .", "link": "https://extensions.gnome.org/extension/2087/desktop-icons-ng-ding/", "shell_version_map": {"38": {"version": "38", "sha256": "12vp6fbclzw3n0x8zj24rhpv3y1sw1ws0h619xkxl51d1822k1xk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="}, "40": {"version": "38", "sha256": "12vp6fbclzw3n0x8zj24rhpv3y1sw1ws0h619xkxl51d1822k1xk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="}, "41": {"version": "38", "sha256": "12vp6fbclzw3n0x8zj24rhpv3y1sw1ws0h619xkxl51d1822k1xk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="}}} +, {"uuid": "ding@rastersoft.com", "name": "Desktop Icons NG (DING)", "pname": "desktop-icons-ng-ding", "description": "Adds icons to the desktop. Fork of the original Desktop Icons extension, with several enhancements .", "link": "https://extensions.gnome.org/extension/2087/desktop-icons-ng-ding/", "shell_version_map": {"38": {"version": "39", "sha256": "072q0s0vvjij0vkqww33vwmfkdxhcp1h2khnldp8dk6dyf6r16fk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "40": {"version": "39", "sha256": "072q0s0vvjij0vkqww33vwmfkdxhcp1h2khnldp8dk6dyf6r16fk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="}, "41": {"version": "39", "sha256": "072q0s0vvjij0vkqww33vwmfkdxhcp1h2khnldp8dk6dyf6r16fk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9yYXN0ZXJzb2Z0L2Rlc2t0b3AtaWNvbnMtbmciLAogICJ1dWlkIjogImRpbmdAcmFzdGVyc29mdC5jb20iLAogICJ2ZXJzaW9uIjogMzkKfQ=="}}} , {"uuid": "order-extensions@wa4557.github.com", "name": "Order Gnome Shell extensions", "pname": "order-gnome-shell-extensions", "description": "Fixes order of gnome-shell extensions", "link": "https://extensions.gnome.org/extension/2114/order-gnome-shell-extensions/", "shell_version_map": {"38": {"version": "6", "sha256": "0hcbjrhrg11f5p23bhss75nhc9sqlh6p1bmfq7p7m7d276ckdmkk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICIzLjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm9yZGVyLWV4dGVuc2lvbnNAd2E0NTU3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "horizontal-workspaces@gnome-shell-extensions.gcampax.github.com", "name": "Horizontal workspaces", "pname": "horizontal-workspaces", "description": "Use a horizontal workspace layout", "link": "https://extensions.gnome.org/extension/2141/horizontal-workspaces/", "shell_version_map": {"38": {"version": "5", "sha256": "0kbqcrs96v72yk0rf8jghy1a31651fyvgpi97yp46n4wmvc41vk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBhIGhvcml6b250YWwgd29ya3NwYWNlIGxheW91dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJIb3Jpem9udGFsIHdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiaG9yaXpvbnRhbC13b3Jrc3BhY2VzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "threefingerwindowmove@do.sch.dev.gmail.com", "name": "Three Finger Window Move", "pname": "three-finger-window-move", "description": "Allows moving windows around with a three finger trackpad gesture (Wayland only)", "link": "https://extensions.gnome.org/extension/2164/three-finger-window-move/", "shell_version_map": {"38": {"version": "7", "sha256": "1m7vwr6s6w297b0x0bmnj8fs2hl73pbys6m93lnb9inh5pmgiv1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBtb3Zpbmcgd2luZG93cyBhcm91bmQgd2l0aCBhIHRocmVlIGZpbmdlciB0cmFja3BhZCBnZXN0dXJlIChXYXlsYW5kIG9ubHkpIiwKICAibmFtZSI6ICJUaHJlZSBGaW5nZXIgV2luZG93IE1vdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kby1zY2gvZ25vbWUtc2hlbGwtdG91Y2hwYWQtd2luZG93LW1vdmUiLAogICJ1dWlkIjogInRocmVlZmluZ2Vyd2luZG93bW92ZUBkby5zY2guZGV2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} -, {"uuid": "spotify-ad-block@danigm.net", "name": "Mute spotify ads", "pname": "mute-spotify-ads", "description": "Mute spotify ads", "link": "https://extensions.gnome.org/extension/2176/mute-spotify-ads/", "shell_version_map": {"38": {"version": "11", "sha256": "1cqrbzhb02k4nacjhpych5fqw17gbly1f04ahhx6xhz9a6p3gq36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "1cqrbzhb02k4nacjhpych5fqw17gbly1f04ahhx6xhz9a6p3gq36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1cqrbzhb02k4nacjhpych5fqw17gbly1f04ahhx6xhz9a6p3gq36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}}} -, {"uuid": "noannoyance@daase.net", "name": "NoAnnoyance v2", "pname": "noannoyance", "description": "Another extension, that removes the 'Window is ready' notification and puts the window into focus. In contrast to all the other extensions, this uses ES6 syntax and is actively maintained.", "link": "https://extensions.gnome.org/extension/2182/noannoyance/", "shell_version_map": {"38": {"version": "11", "sha256": "11rrrfpvyp7rxyfqj0bkf62y8a55jkjs4ydqs2vsgkpmf2bbfwrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2Uvbm9hbm5veWFuY2UiLAogICJ1dWlkIjogIm5vYW5ub3lhbmNlQGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "11rrrfpvyp7rxyfqj0bkf62y8a55jkjs4ydqs2vsgkpmf2bbfwrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2Uvbm9hbm5veWFuY2UiLAogICJ1dWlkIjogIm5vYW5ub3lhbmNlQGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "11rrrfpvyp7rxyfqj0bkf62y8a55jkjs4ydqs2vsgkpmf2bbfwrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmpvZXJuRGFhc2Uvbm9hbm5veWFuY2UiLAogICJ1dWlkIjogIm5vYW5ub3lhbmNlQGRhYXNlLm5ldCIsCiAgInZlcnNpb24iOiAxMQp9"}}} +, {"uuid": "spotify-ad-block@danigm.net", "name": "Mute spotify ads", "pname": "mute-spotify-ads", "description": "Mute spotify ads", "link": "https://extensions.gnome.org/extension/2176/mute-spotify-ads/", "shell_version_map": {"38": {"version": "12", "sha256": "1hlayym3nnj5i547ffr1vcpjvzjqpzsmz7diqwgii99xr0qqy8dh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "1hlayym3nnj5i547ffr1vcpjvzjqpzsmz7diqwgii99xr0qqy8dh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "1hlayym3nnj5i547ffr1vcpjvzjqpzsmz7diqwgii99xr0qqy8dh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9zcG90aWZ5LWFkLWJsb2NrZXIiLAogICJ1dWlkIjogInNwb3RpZnktYWQtYmxvY2tAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiAxMgp9"}}} +, {"uuid": "noannoyance@daase.net", "name": "NoAnnoyance v2", "pname": "noannoyance", "description": "Another extension, that removes the 'Window is ready' notification and puts the window into focus. In contrast to all the other extensions, this uses ES6 syntax and is actively maintained.", "link": "https://extensions.gnome.org/extension/2182/noannoyance/", "shell_version_map": {"38": {"version": "12", "sha256": "1wr1wxmaxb569m3wsfdhs0jdpq1zqx3bkk6dgn9iswbbr060bnd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "40": {"version": "12", "sha256": "1wr1wxmaxb569m3wsfdhs0jdpq1zqx3bkk6dgn9iswbbr060bnd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "1wr1wxmaxb569m3wsfdhs0jdpq1zqx3bkk6dgn9iswbbr060bnd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "42": {"version": "12", "sha256": "1wr1wxmaxb569m3wsfdhs0jdpq1zqx3bkk6dgn9iswbbr060bnd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} , {"uuid": "vim-altTab@kokong.info", "name": "VIM Alt-Tab", "pname": "vim-alt-tab", "description": "Add the ability to switch between windows and applications using vim-like keypresses (h, j, k, l)", "link": "https://extensions.gnome.org/extension/2212/vim-alt-tab/", "shell_version_map": {"38": {"version": "5", "sha256": "0r69cnr4r1vwny8jxc6yymmmiyy5fac4634r8kr0k5b7j1y6f0cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29rby1uZy92aW0tYWx0VGFiIiwKICAidXVpZCI6ICJ2aW0tYWx0VGFiQGtva29uZy5pbmZvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "0r69cnr4r1vwny8jxc6yymmmiyy5fac4634r8kr0k5b7j1y6f0cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29rby1uZy92aW0tYWx0VGFiIiwKICAidXVpZCI6ICJ2aW0tYWx0VGFiQGtva29uZy5pbmZvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "0r69cnr4r1vwny8jxc6yymmmiyy5fac4634r8kr0k5b7j1y6f0cw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29rby1uZy92aW0tYWx0VGFiIiwKICAidXVpZCI6ICJ2aW0tYWx0VGFiQGtva29uZy5pbmZvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "easy_docker_containers@red.software.systems", "name": "Easy Docker Containers", "pname": "easy-docker-containers", "description": "A GNOME Shell extension (GNOME Panel applet) to be able to generally control your available Docker containers.", "link": "https://extensions.gnome.org/extension/2224/easy-docker-containers/", "shell_version_map": {"38": {"version": "13", "sha256": "1hq6ispaq7vyn8vigacbwv58hrishb1g09vhffwsldahx4iz4pnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "1hq6ispaq7vyn8vigacbwv58hrishb1g09vhffwsldahx4iz4pnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "1hq6ispaq7vyn8vigacbwv58hrishb1g09vhffwsldahx4iz4pnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SZWRTb2Z0d2FyZVN5c3RlbXMvZWFzeV9kb2NrZXJfY29udGFpbmVycyIsCiAgInV1aWQiOiAiZWFzeV9kb2NrZXJfY29udGFpbmVyc0ByZWQuc29mdHdhcmUuc3lzdGVtcyIsCiAgInZlcnNpb24iOiAxMwp9"}}} -, {"uuid": "nightthemeswitcher@romainvigier.fr", "name": "Night Theme Switcher", "pname": "night-theme-switcher", "description": "Make your desktop easy on the eye, day and night.\n\nAutomatically toggle your light and dark GTK, GNOME Shell, icon and cursor themes variants, switch backgrounds and run custom commands at sunset and sunrise.\n\nSupports Night Light, Location Services, manual schedule and on-demand switch modes.", "link": "https://extensions.gnome.org/extension/2236/night-theme-switcher/", "shell_version_map": {"38": {"version": "46", "sha256": "13vq56mhxkh61zza1j4pszbbbz96z2yjzgkzq8qi51jidpdby521", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgeW91ciBsaWdodCBhbmQgZGFyayBHVEssIEdOT01FIFNoZWxsLCBpY29uIGFuZCBjdXJzb3IgdGhlbWVzIHZhcmlhbnRzLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA0Ngp9"}, "40": {"version": "51", "sha256": "1lbfbb6acc70y70v5g3mvqhzn6240jdq0zzlnh43yg1kvry20d2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgeW91ciBsaWdodCBhbmQgZGFyayBHVEssIEdOT01FIFNoZWxsLCBpY29uIGFuZCBjdXJzb3IgdGhlbWVzIHZhcmlhbnRzLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL25pZ2h0dGhlbWVzd2l0Y2hlci5yb21haW52aWdpZXIuZnIiLAogICJ1dWlkIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJ2ZXJzaW9uIjogNTEKfQ=="}, "41": {"version": "55", "sha256": "1sv0wm9fq6f1j384qz91f8vkxk3ffb02ih1x6apa70k2ybmrc06g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgeW91ciBsaWdodCBhbmQgZGFyayBHVEssIEdOT01FIFNoZWxsLCBpY29uIGFuZCBjdXJzb3IgdGhlbWVzIHZhcmlhbnRzLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL25pZ2h0dGhlbWVzd2l0Y2hlci5yb21haW52aWdpZXIuZnIiLAogICJ1dWlkIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJ2ZXJzaW9uIjogNTUKfQ=="}}} +, {"uuid": "nightthemeswitcher@romainvigier.fr", "name": "Night Theme Switcher", "pname": "night-theme-switcher", "description": "Make your desktop easy on the eye, day and night.\n\nAutomatically toggle the color scheme between light and dark, switch backgrounds and run custom commands at sunset and sunrise.\n\nSupports Night Light, Location Services, manual schedule and on-demand switch modes.", "link": "https://extensions.gnome.org/extension/2236/night-theme-switcher/", "shell_version_map": {"38": {"version": "46", "sha256": "0x3mggffn6ydfkv09gwq62wgkm8zga214616jp60mpwp4ly0xphm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA0Ngp9"}, "40": {"version": "51", "sha256": "1pnljdl2syh0lv2ih2ps2im2pnyzkwsbzsvv3f8q7zf669jxca9g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL25pZ2h0dGhlbWVzd2l0Y2hlci5yb21haW52aWdpZXIuZnIiLAogICJ1dWlkIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJ2ZXJzaW9uIjogNTEKfQ=="}, "41": {"version": "55", "sha256": "151lwn6qlh1b91f9c58s7xw5jd7ygvqpr68299qqgn7hvjg0qh6z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL25pZ2h0dGhlbWVzd2l0Y2hlci5yb21haW52aWdpZXIuZnIiLAogICJ1dWlkIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJ2ZXJzaW9uIjogNTUKfQ=="}, "42": {"version": "60", "sha256": "1ichrz2458wvn7vjsz8sylnvinb3w2scrmb9rg32gg1lby7czvnz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAibmFtZSI6ICJOaWdodCBUaGVtZSBTd2l0Y2hlciIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidW5sb2NrLWRpYWxvZyIsCiAgICAidXNlciIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmlnaHR0aGVtZXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9uaWdodHRoZW1lc3dpdGNoZXIucm9tYWludmlnaWVyLmZyIiwKICAidXVpZCI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAidmVyc2lvbiI6IDYwCn0="}}} , {"uuid": "binaryclock@vancha.march", "name": "binaryclock", "pname": "binaryclock", "description": "adds a binary clock to the gnome bar", "link": "https://extensions.gnome.org/extension/2284/binaryclock/", "shell_version_map": {"38": {"version": "6", "sha256": "1bvzlqfhwlk1sh9q3538yipjwzgndd4wnn2l8wc3sshb93ggvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIGJhciIsCiAgIm5hbWUiOiAiYmluYXJ5Y2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zOCIsCiAgICAiMy4zNi43IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZhbmNoYS9nbm9tZVNoZWxsQmluYXJ5Q2xvY2svIiwKICAidXVpZCI6ICJiaW5hcnljbG9ja0B2YW5jaGEubWFyY2giLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1bvzlqfhwlk1sh9q3538yipjwzgndd4wnn2l8wc3sshb93ggvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIGJhciIsCiAgIm5hbWUiOiAiYmluYXJ5Y2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zOCIsCiAgICAiMy4zNi43IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZhbmNoYS9nbm9tZVNoZWxsQmluYXJ5Q2xvY2svIiwKICAidXVpZCI6ICJiaW5hcnljbG9ja0B2YW5jaGEubWFyY2giLAogICJ2ZXJzaW9uIjogNgp9"}}} -, {"uuid": "lgbutton@glerro.gnome.gitlab.io", "name": "Looking Glass Button", "pname": "looking-glass-button", "description": "Toggle the Looking Glass visibility by clicking on a panel icon.", "link": "https://extensions.gnome.org/extension/2296/looking-glass-button/", "shell_version_map": {"38": {"version": "7", "sha256": "01sbrsfvxwvzgxd5cdvrzb6gl573hw30hy50ihqy43hari95jk8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJuYW1lIjogIkxvb2tpbmcgR2xhc3MgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "01sbrsfvxwvzgxd5cdvrzb6gl573hw30hy50ihqy43hari95jk8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJuYW1lIjogIkxvb2tpbmcgR2xhc3MgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "01sbrsfvxwvzgxd5cdvrzb6gl573hw30hy50ihqy43hari95jk8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJuYW1lIjogIkxvb2tpbmcgR2xhc3MgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9nbGVycm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAidXVpZCI6ICJsZ2J1dHRvbkBnbGVycm8uZ25vbWUuZ2l0bGFiLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} +, {"uuid": "lgbutton@glerro.gnome.gitlab.io", "name": "Looking Glass Button", "pname": "looking-glass-button", "description": "Toggle the Looking Glass visibility by clicking on a panel icon.\n\nAnd from version 4 left clicking on the icon show a menu with new features like Restart Gnome Shell (not available on Wayland), Reload Theme, Open Extension Folder and Open Theme Folder (the last two require that xdg-open is installed).\n\nVersion 4 also drop the compatibility with Gnome Shell 3.30.", "link": "https://extensions.gnome.org/extension/2296/looking-glass-button/", "shell_version_map": {"38": {"version": "8", "sha256": "0rkk1mivq0drvpjbg89gi7plpaza71r08cyvkymygwwi2sfwpy9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJ1dWlkIjogImxnYnV0dG9uQGdsZXJyby5nbm9tZS5naXRsYWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "0rkk1mivq0drvpjbg89gi7plpaza71r08cyvkymygwwi2sfwpy9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJ1dWlkIjogImxnYnV0dG9uQGdsZXJyby5nbm9tZS5naXRsYWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "0rkk1mivq0drvpjbg89gi7plpaza71r08cyvkymygwwi2sfwpy9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJ1dWlkIjogImxnYnV0dG9uQGdsZXJyby5nbm9tZS5naXRsYWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "0rkk1mivq0drvpjbg89gi7plpaza71r08cyvkymygwwi2sfwpy9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJ1dWlkIjogImxnYnV0dG9uQGdsZXJyby5nbm9tZS5naXRsYWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "tp_wattmeter@gistart", "name": "tp_wattmeter", "pname": "tp_wattmeter", "description": "Shows battery power consumption of ThinkPad laptops", "link": "https://extensions.gnome.org/extension/2308/tp_wattmeter/", "shell_version_map": {"40": {"version": "4", "sha256": "1v8rw7msfy2d8nwnppdpci62sl6iw8973z5gsl8024awl27ni38z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGJhdHRlcnkgcG93ZXIgY29uc3VtcHRpb24gb2YgVGhpbmtQYWQgbGFwdG9wcyIsCiAgIm5hbWUiOiAidHBfd2F0dG1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2LjAiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naXN0YXJ0L3RwX3dhdHRtZXRlciIsCiAgInV1aWQiOiAidHBfd2F0dG1ldGVyQGdpc3RhcnQiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "Denon_AVR_controler@sylter.fr", "name": "Denon AVR controler", "pname": "denon-avr-controler", "description": "Control a Denon audio video receiver through the network.\n- on/off switch\n- volume adjustment", "link": "https://extensions.gnome.org/extension/2371/denon-avr-controler/", "shell_version_map": {"38": {"version": "4", "sha256": "0c8ky3v70arnblix717jz9fsksr42673as9nmzfyh2p2h1zm03wq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYSBEZW5vbiBhdWRpbyB2aWRlbyByZWNlaXZlciB0aHJvdWdoIHRoZSBuZXR3b3JrLlxuLSBvbi9vZmYgc3dpdGNoXG4tIHZvbHVtZSBhZGp1c3RtZW50IiwKICAibmFtZSI6ICJEZW5vbiBBVlIgY29udHJvbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2ZyYW1hZ2l0Lm9yZy9zeWx0ZXIvZGVub24tYXZyLWNvbnRyb2xlciIsCiAgInV1aWQiOiAiRGVub25fQVZSX2NvbnRyb2xlckBzeWx0ZXIuZnIiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "hide-universal-access@akiirui.github.io", "name": "Hide Universal Access", "pname": "hide-universal-access", "description": "Hide Universal Access icon from the status bar", "link": "https://extensions.gnome.org/extension/2398/hide-universal-access/", "shell_version_map": {"38": {"version": "10", "sha256": "08sjlxfw19905lbxc8jkb3z8m5kqq7gfxcd57w64wb5xhpwrf379", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWtpaXJ1aS9oaWRlLXVuaXZlcnNhbC1hY2Nlc3MiLAogICJ1dWlkIjogImhpZGUtdW5pdmVyc2FsLWFjY2Vzc0Bha2lpcnVpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "08sjlxfw19905lbxc8jkb3z8m5kqq7gfxcd57w64wb5xhpwrf379", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWtpaXJ1aS9oaWRlLXVuaXZlcnNhbC1hY2Nlc3MiLAogICJ1dWlkIjogImhpZGUtdW5pdmVyc2FsLWFjY2Vzc0Bha2lpcnVpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "08sjlxfw19905lbxc8jkb3z8m5kqq7gfxcd57w64wb5xhpwrf379", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWtpaXJ1aS9oaWRlLXVuaXZlcnNhbC1hY2Nlc3MiLAogICJ1dWlkIjogImhpZGUtdW5pdmVyc2FsLWFjY2Vzc0Bha2lpcnVpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} @@ -264,27 +265,27 @@ , {"uuid": "kernel-indicator@elboulangero.gitlab.com", "name": "Kernel Indicator", "pname": "kernel-indicator", "description": "Display the kernel version in the top bar", "link": "https://extensions.gnome.org/extension/2512/kernel-indicator/", "shell_version_map": {"40": {"version": "4", "sha256": "0v3vxk9adzwk18vpvhpwxp7893wh7my8bh8j5vp4fdiq3l06v4sp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9lbGJvdWxhbmdlcm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtlcm5lbC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImtlcm5lbC1pbmRpY2F0b3JAZWxib3VsYW5nZXJvLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0v3vxk9adzwk18vpvhpwxp7893wh7my8bh8j5vp4fdiq3l06v4sp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9lbGJvdWxhbmdlcm8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtlcm5lbC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImtlcm5lbC1pbmRpY2F0b3JAZWxib3VsYW5nZXJvLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "floatingDock@sun.wxg@gmail.com", "name": "Floating Dock", "pname": "floating-dock", "description": "Move dock anywhere on the desktop\n\nPress Ctrl+Alt+k to vi mode\nPress lowercase alphabet, open new window or active the window\nPress uppercase alphabet, force to open new window\n\nPoint on the main button, change workspace by mouse scroll\nRight click the main button, show some selections", "link": "https://extensions.gnome.org/extension/2542/floating-dock/", "shell_version_map": {"38": {"version": "12", "sha256": "1844hhr0z4wd0wvh29q0sxh6xmwq7chg3kr3sa3c46q8n97i78x2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmdEb2NrIiwKICAidXVpZCI6ICJmbG9hdGluZ0RvY2tAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "40": {"version": "21", "sha256": "0qj1vqd44clpr72j5lccvva48kzaz76zd48k6nxzvnkgh2n5dh29", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nRG9jayIsCiAgInV1aWQiOiAiZmxvYXRpbmdEb2NrQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}, "41": {"version": "23", "sha256": "0ag8pq9sgk885912mqiyhsacfmgkn9n4jvyp0rk4nw0fghd1mgd9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nRG9jayIsCiAgInV1aWQiOiAiZmxvYXRpbmdEb2NrQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}}} , {"uuid": "maxi@darkretailer.github.com", "name": "Maxi", "pname": "maxi", "description": "Maximize your windows vertical and/or horizontal (based on https://github.com/aXe1/gnome-shell-extension-maximized-by-default)", "link": "https://extensions.gnome.org/extension/2554/maxi/", "shell_version_map": {"40": {"version": "5", "sha256": "121nd6ggr9id3yfsrkiza7rjq19638p156ym83i3j57ikz6r3ky5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1heGltaXplIHlvdXIgd2luZG93cyB2ZXJ0aWNhbCBhbmQvb3IgaG9yaXpvbnRhbCAoYmFzZWQgb24gaHR0cHM6Ly9naXRodWIuY29tL2FYZTEvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplZC1ieS1kZWZhdWx0KSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtYXhpIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWF4aSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhcmtyZXRhaWxlci9nbm9tZS1zaGVsbC1leHRlbnNpb25fbWF4aSIsCiAgInV1aWQiOiAibWF4aUBkYXJrcmV0YWlsZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"uuid": "gnordvpn-local@isopolito", "name": "gNordVPN-Local", "pname": "gnordvpn-local", "description": "A Gnome extension that shows the NordVPN status in the top bar and provides the ability to configure certain aspects of the connection.", "link": "https://extensions.gnome.org/extension/2569/gnordvpn-local/", "shell_version_map": {"38": {"version": "8", "sha256": "1bn9n7q8wi909gyys27dmqhay6hx9y7dl1pxy6zrmh7baijz2gr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzguMSIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSXNvcG9saXRvL2dOb3JkVlBOLUxvY2FsIiwKICAidXVpZCI6ICJnbm9yZHZwbi1sb2NhbEBpc29wb2xpdG8iLAogICJ2ZXJzaW9uIjogOAp9"}}} +, {"uuid": "gnordvpn-local@isopolito", "name": "gNordVPN-Local", "pname": "gnordvpn-local", "description": "A Gnome extension that shows the NordVPN status in the top bar and provides the ability to configure certain aspects of the connection.", "link": "https://extensions.gnome.org/extension/2569/gnordvpn-local/", "shell_version_map": {"38": {"version": "9", "sha256": "103ddz7n14n4ahks90w60sqgq8w07mpjqln5va7kxnjh3rdwlk3s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICIzLjM4LjQiLAogICAgIjQwLjUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "9", "sha256": "103ddz7n14n4ahks90w60sqgq8w07mpjqln5va7kxnjh3rdwlk3s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICIzLjM4LjQiLAogICAgIjQwLjUiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "fully-transparent-top-bar@aunetx", "name": "Smart transparent topbar", "pname": "fully-transparent-top-bar", "description": "Permits to change topbar's look and feel when free-floating.\n\nIf you have issues or recommandations, you can tell me on github so I can see them!", "link": "https://extensions.gnome.org/extension/2588/fully-transparent-top-bar/", "shell_version_map": {"38": {"version": "11", "sha256": "1mksqaxw7jzzdghzii1bhhkbsccxb23qa69f3x6hg32ig9qi762x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBlcm1pdHMgdG8gY2hhbmdlIHRvcGJhcidzIGxvb2sgYW5kIGZlZWwgd2hlbiBmcmVlLWZsb2F0aW5nLlxuXG5JZiB5b3UgaGF2ZSBpc3N1ZXMgb3IgcmVjb21tYW5kYXRpb25zLCB5b3UgY2FuIHRlbGwgbWUgb24gZ2l0aHViIHNvIEkgY2FuIHNlZSB0aGVtISIsCiAgIm5hbWUiOiAiU21hcnQgdHJhbnNwYXJlbnQgdG9wYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJmdWxseS10cmFuc3BhcmVudC10b3AtYmFyQGF1bmV0eCIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "always-indicator@martin.zurowietz.de", "name": "Always Indicator", "pname": "always-indicator", "description": "Always show the new messages indicator on new messages. Features: 1) New message indicator is always shown if there are notifications. 2) The color of the indicator can be customized. 3) If 'do not disturb' is active, the icon is displayed in the custom color if there are notifications.", "link": "https://extensions.gnome.org/extension/2594/always-indicator/", "shell_version_map": {"40": {"version": "7", "sha256": "1hryk0ispnxpfmfskj29nii72vwbaly4bcb4idyg2z3c1c71qhdy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLWFsd2F5cy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImFsd2F5cy1pbmRpY2F0b3JAbWFydGluLnp1cm93aWV0ei5kZSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1hryk0ispnxpfmfskj29nii72vwbaly4bcb4idyg2z3c1c71qhdy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tenVyL2dub21lLXNoZWxsLWFsd2F5cy1pbmRpY2F0b3IiLAogICJ1dWlkIjogImFsd2F5cy1pbmRpY2F0b3JAbWFydGluLnp1cm93aWV0ei5kZSIsCiAgInZlcnNpb24iOiA3Cn0="}}} -, {"uuid": "eruption-profile-switcher@x3n0m0rph59.org", "name": "Eruption Profile Switcher", "pname": "eruption-profile-switcher", "description": "Runtime profile switcher for the Eruption Linux input and LED driver for keyboards, mice and other devices", "link": "https://extensions.gnome.org/extension/2621/eruption-profile-switcher/", "shell_version_map": {"38": {"version": "15", "sha256": "1jy9m2inx8jjwsy666hg67i7d8py2ar4drn2i8si7d80cba45al4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgcHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIExpbnV4IGlucHV0IGFuZCBMRUQgZHJpdmVyIGZvciBrZXlib2FyZHMsIG1pY2UgYW5kIG90aGVyIGRldmljZXMiLAogICJuYW1lIjogIkVydXB0aW9uIFByb2ZpbGUgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLmJldGEiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWDNuMG0wcnBoNTkvZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlckB4M24wbTBycGg1OS5vcmciLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "40": {"version": "20", "sha256": "0mfy34n9gqa1k8sw6b1xcsxygvjnjqnd88bs49jd6l7hwisyns15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgcHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIExpbnV4IGlucHV0IGFuZCBMRUQgZHJpdmVyIGZvciBrZXlib2FyZHMsIG1pY2UgYW5kIG90aGVyIGRldmljZXMiLAogICJuYW1lIjogIkVydXB0aW9uIFByb2ZpbGUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWDNuMG0wcnBoNTkvZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlckB4M24wbTBycGg1OS5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "20", "sha256": "0mfy34n9gqa1k8sw6b1xcsxygvjnjqnd88bs49jd6l7hwisyns15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgcHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIExpbnV4IGlucHV0IGFuZCBMRUQgZHJpdmVyIGZvciBrZXlib2FyZHMsIG1pY2UgYW5kIG90aGVyIGRldmljZXMiLAogICJuYW1lIjogIkVydXB0aW9uIFByb2ZpbGUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWDNuMG0wcnBoNTkvZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlckB4M24wbTBycGg1OS5vcmciLAogICJ2ZXJzaW9uIjogMjAKfQ=="}}} +, {"uuid": "eruption-profile-switcher@x3n0m0rph59.org", "name": "Eruption Profile Switcher", "pname": "eruption-profile-switcher", "description": "Runtime profile switcher for the Eruption Linux input and LED driver for keyboards, mice and other devices", "link": "https://extensions.gnome.org/extension/2621/eruption-profile-switcher/", "shell_version_map": {"38": {"version": "15", "sha256": "1jy9m2inx8jjwsy666hg67i7d8py2ar4drn2i8si7d80cba45al4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgcHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIExpbnV4IGlucHV0IGFuZCBMRUQgZHJpdmVyIGZvciBrZXlib2FyZHMsIG1pY2UgYW5kIG90aGVyIGRldmljZXMiLAogICJuYW1lIjogIkVydXB0aW9uIFByb2ZpbGUgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLmJldGEiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWDNuMG0wcnBoNTkvZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlckB4M24wbTBycGg1OS5vcmciLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "40": {"version": "24", "sha256": "1nnzwk3p89hc765y7xym5xghadr4b2iq2gzzk2acj07fli8f60n2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgcHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIExpbnV4IGlucHV0IGFuZCBMRUQgZHJpdmVyIGZvciBrZXlib2FyZHMsIG1pY2UgYW5kIG90aGVyIGRldmljZXMiLAogICJuYW1lIjogIkVydXB0aW9uIFByb2ZpbGUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWDNuMG0wcnBoNTkvZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlckB4M24wbTBycGg1OS5vcmciLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "41": {"version": "24", "sha256": "1nnzwk3p89hc765y7xym5xghadr4b2iq2gzzk2acj07fli8f60n2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgcHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIExpbnV4IGlucHV0IGFuZCBMRUQgZHJpdmVyIGZvciBrZXlib2FyZHMsIG1pY2UgYW5kIG90aGVyIGRldmljZXMiLAogICJuYW1lIjogIkVydXB0aW9uIFByb2ZpbGUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWDNuMG0wcnBoNTkvZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlckB4M24wbTBycGg1OS5vcmciLAogICJ2ZXJzaW9uIjogMjQKfQ=="}}} , {"uuid": "nbfcindicator@mgokcaykdev.gmail.com", "name": "Nbfc Indicator", "pname": "nbfc-indicator", "description": "Notebook Fan Control Indicator for Gnome Shell", "link": "https://extensions.gnome.org/extension/2624/nbfc-indicator/", "shell_version_map": {"40": {"version": "7", "sha256": "0hp7giwdcsk8p442q0x9214dv59ziyjswli6mccyb8v814k3p8ic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGVib29rIEZhbiBDb250cm9sIEluZGljYXRvciBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYmZjaW5kaWNhdG9yIiwKICAibmFtZSI6ICJOYmZjIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYmZjaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01Hb2tjYXlLL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtbmJmY2luZGljYXRvciIsCiAgInV1aWQiOiAibmJmY2luZGljYXRvckBtZ29rY2F5a2Rldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"uuid": "user-id-in-top-panel@fthx", "name": "User id in top panel", "pname": "user-id-in-top-panel", "description": "Add ( user name :: user id @ host ) in top panel.", "link": "https://extensions.gnome.org/extension/2633/user-id-in-top-panel/", "shell_version_map": {"38": {"version": "6", "sha256": "16s1782mzb5ckshsy86ac9xj5xfk15hwzvzk4cfiimphfvkkw8x4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "16s1782mzb5ckshsy86ac9xj5xfk15hwzvzk4cfiimphfvkkw8x4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "16s1782mzb5ckshsy86ac9xj5xfk15hwzvzk4cfiimphfvkkw8x4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}}} +, {"uuid": "user-id-in-top-panel@fthx", "name": "User id in top panel", "pname": "user-id-in-top-panel", "description": "Add ( user name :: user id @ host ) in top panel.", "link": "https://extensions.gnome.org/extension/2633/user-id-in-top-panel/", "shell_version_map": {"38": {"version": "6", "sha256": "16s1782mzb5ckshsy86ac9xj5xfk15hwzvzk4cfiimphfvkkw8x4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "16s1782mzb5ckshsy86ac9xj5xfk15hwzvzk4cfiimphfvkkw8x4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "16s1782mzb5ckshsy86ac9xj5xfk15hwzvzk4cfiimphfvkkw8x4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "16s1782mzb5ckshsy86ac9xj5xfk15hwzvzk4cfiimphfvkkw8x4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "hide-minimized@danigm.net", "name": "Hide minimized", "pname": "hide-minimized", "description": "Hide minimized in overview", "link": "https://extensions.gnome.org/extension/2639/hide-minimized/", "shell_version_map": {"38": {"version": "4", "sha256": "0v2vrm3p5czzvs2kc8dh3h1ijh7i8x6z2b9gdvqbfny45g7blfaa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2hpZGUtbWluaW1pemVkIiwKICAidXVpZCI6ICJoaWRlLW1pbmltaXplZEBkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0v2vrm3p5czzvs2kc8dh3h1ijh7i8x6z2b9gdvqbfny45g7blfaa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2hpZGUtbWluaW1pemVkIiwKICAidXVpZCI6ICJoaWRlLW1pbmltaXplZEBkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0v2vrm3p5czzvs2kc8dh3h1ijh7i8x6z2b9gdvqbfny45g7blfaa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWdtL2hpZGUtbWluaW1pemVkIiwKICAidXVpZCI6ICJoaWRlLW1pbmltaXplZEBkYW5pZ20ubmV0IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "display-brightness-ddcutil@themightydeity.github.com", "name": "Brightness control using ddcutil", "pname": "brightness-control-using-ddcutil", "description": "Brightness control for all the monitors detected by ddcutil\nThis tool uses ddcutil as backend for communication with your display.\n\nUpdated 2022-Jan-05: There are multiple ways of listing the control sliders, either in top bar or in system menu, with or without value labels.\n\nRead setup instructions from: https://github.com/daitj/gnome-display-brightness-ddcutil/blob/master/README.md", "link": "https://extensions.gnome.org/extension/2645/brightness-control-using-ddcutil/", "shell_version_map": {"38": {"version": "10", "sha256": "0r8l1iipfxrsmmch0pgi9jpxk58cqn93igs1cp8sx73l1cxr5ik4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJuYW1lIjogIkJyaWdodG5lc3MgY29udHJvbCB1c2luZyBkZGN1dGlsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "24", "sha256": "10sd7hr4zldigqca0f687xka1azld4a8nrf0d83lfl6l9wjx3bkj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAidXVpZCI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbEB0aGVtaWdodHlkZWl0eS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "41": {"version": "24", "sha256": "10sd7hr4zldigqca0f687xka1azld4a8nrf0d83lfl6l9wjx3bkj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAidXVpZCI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbEB0aGVtaWdodHlkZWl0eS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} +, {"uuid": "display-brightness-ddcutil@themightydeity.github.com", "name": "Brightness control using ddcutil", "pname": "brightness-control-using-ddcutil", "description": "Brightness control for all the monitors detected by ddcutil\nThis tool uses ddcutil as backend for communication with your display.\n\nUpdated 2022-Jan-05: There are multiple ways of listing the control sliders, either in top bar or in system menu, with or without value labels.\n\nRead setup instructions from: https://github.com/daitj/gnome-display-brightness-ddcutil/blob/master/README.md", "link": "https://extensions.gnome.org/extension/2645/brightness-control-using-ddcutil/", "shell_version_map": {"38": {"version": "10", "sha256": "0r8l1iipfxrsmmch0pgi9jpxk58cqn93igs1cp8sx73l1cxr5ik4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJuYW1lIjogIkJyaWdodG5lc3MgY29udHJvbCB1c2luZyBkZGN1dGlsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFpdGovZ25vbWUtZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJ1dWlkIjogImRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsQHRoZW1pZ2h0eWRlaXR5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "28", "sha256": "0bb27sraknlqbdpavf0hrwcz4kl4bmrkc70491g9fbfhvr37jyq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAidXVpZCI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbEB0aGVtaWdodHlkZWl0eS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI4Cn0="}, "41": {"version": "28", "sha256": "0bb27sraknlqbdpavf0hrwcz4kl4bmrkc70491g9fbfhvr37jyq3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaWdodG5lc3MgY29udHJvbCBmb3IgYWxsIHRoZSBtb25pdG9ycyBkZXRlY3RlZCBieSBkZGN1dGlsXG5UaGlzIHRvb2wgdXNlcyBkZGN1dGlsIGFzIGJhY2tlbmQgZm9yIGNvbW11bmljYXRpb24gd2l0aCB5b3VyIGRpc3BsYXkuXG5cblVwZGF0ZWQgMjAyMi1KYW4tMDU6IFRoZXJlIGFyZSBtdWx0aXBsZSB3YXlzIG9mIGxpc3RpbmcgdGhlIGNvbnRyb2wgc2xpZGVycywgZWl0aGVyIGluIHRvcCBiYXIgb3IgaW4gc3lzdGVtIG1lbnUsIHdpdGggb3Igd2l0aG91dCB2YWx1ZSBsYWJlbHMuXG5cblJlYWQgc2V0dXAgaW5zdHJ1Y3Rpb25zIGZyb206IGh0dHBzOi8vZ2l0aHViLmNvbS9kYWl0ai9nbm9tZS1kaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbC9ibG9iL21hc3Rlci9SRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbCIsCiAgIm5hbWUiOiAiQnJpZ2h0bmVzcyBjb250cm9sIHVzaW5nIGRkY3V0aWwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1icmlnaHRuZXNzLWRkY3V0aWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhaXRqL2dub21lLWRpc3BsYXktYnJpZ2h0bmVzcy1kZGN1dGlsIiwKICAidXVpZCI6ICJkaXNwbGF5LWJyaWdodG5lc3MtZGRjdXRpbEB0aGVtaWdodHlkZWl0eS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI4Cn0="}}} , {"uuid": "timezones@masquerade-circus.net", "name": "Timezones extension", "pname": "timezones-extension", "description": "Show multiple clocks in the panel. For those who need more than one additional clock.", "link": "https://extensions.gnome.org/extension/2657/timezones-extension/", "shell_version_map": {"38": {"version": "2", "sha256": "0vkqwrn0kvmng003h26zvzd5ym4h971hvcspb5iq7042lhxxc2hf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFzcXVlcmFkZS1DaXJjdXMvZ25vbWUtdGltZXpvbmVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "0vkqwrn0kvmng003h26zvzd5ym4h971hvcspb5iq7042lhxxc2hf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFzcXVlcmFkZS1DaXJjdXMvZ25vbWUtdGltZXpvbmVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "0vkqwrn0kvmng003h26zvzd5ym4h971hvcspb5iq7042lhxxc2hf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbXVsdGlwbGUgY2xvY2tzIGluIHRoZSBwYW5lbC4gRm9yIHRob3NlIHdobyBuZWVkIG1vcmUgdGhhbiBvbmUgYWRkaXRpb25hbCBjbG9jay4iLAogICJuYW1lIjogIlRpbWV6b25lcyBleHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFzcXVlcmFkZS1DaXJjdXMvZ25vbWUtdGltZXpvbmVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGltZXpvbmVzQG1hc3F1ZXJhZGUtY2lyY3VzLm5ldCIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "transparent-panel@fthx", "name": "Ubuntu-like Panel", "pname": "transparent-panel", "description": "Panel: transparent, straight, reduced height, non-bold fonts. Nothing more.\n\nLooks roughly like Ubuntu session's panel (Yaru). You can easily modify the transparency level through the CSS stylesheet in the extensions's folder.", "link": "https://extensions.gnome.org/extension/2660/transparent-panel/", "shell_version_map": {"40": {"version": "3", "sha256": "042cbxdvh4nxv72dd6ikm37brgb2wc1yaxsznyavjwr53awjbbzm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsOiB0cmFuc3BhcmVudCwgc3RyYWlnaHQsIHJlZHVjZWQgaGVpZ2h0LCBub24tYm9sZCBmb250cy4gTm90aGluZyBtb3JlLlxuXG5Mb29rcyByb3VnaGx5IGxpa2UgVWJ1bnR1IHNlc3Npb24ncyBwYW5lbCAoWWFydSkuIFlvdSBjYW4gZWFzaWx5IG1vZGlmeSB0aGUgdHJhbnNwYXJlbmN5IGxldmVsIHRocm91Z2ggdGhlIENTUyBzdHlsZXNoZWV0IGluIHRoZSBleHRlbnNpb25zJ3MgZm9sZGVyLiIsCiAgIm5hbWUiOiAiVWJ1bnR1LWxpa2UgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "042cbxdvh4nxv72dd6ikm37brgb2wc1yaxsznyavjwr53awjbbzm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsOiB0cmFuc3BhcmVudCwgc3RyYWlnaHQsIHJlZHVjZWQgaGVpZ2h0LCBub24tYm9sZCBmb250cy4gTm90aGluZyBtb3JlLlxuXG5Mb29rcyByb3VnaGx5IGxpa2UgVWJ1bnR1IHNlc3Npb24ncyBwYW5lbCAoWWFydSkuIFlvdSBjYW4gZWFzaWx5IG1vZGlmeSB0aGUgdHJhbnNwYXJlbmN5IGxldmVsIHRocm91Z2ggdGhlIENTUyBzdHlsZXNoZWV0IGluIHRoZSBleHRlbnNpb25zJ3MgZm9sZGVyLiIsCiAgIm5hbWUiOiAiVWJ1bnR1LWxpa2UgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "transparent-panel@fthx", "name": "Ubuntu-like Panel", "pname": "transparent-panel", "description": "Panel: transparent, straight, reduced height, non-bold fonts. Nothing more.\n\nLooks roughly like Ubuntu session's panel (Yaru). You can easily modify the transparency level through the CSS stylesheet in the extensions's folder.", "link": "https://extensions.gnome.org/extension/2660/transparent-panel/", "shell_version_map": {"40": {"version": "3", "sha256": "042cbxdvh4nxv72dd6ikm37brgb2wc1yaxsznyavjwr53awjbbzm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsOiB0cmFuc3BhcmVudCwgc3RyYWlnaHQsIHJlZHVjZWQgaGVpZ2h0LCBub24tYm9sZCBmb250cy4gTm90aGluZyBtb3JlLlxuXG5Mb29rcyByb3VnaGx5IGxpa2UgVWJ1bnR1IHNlc3Npb24ncyBwYW5lbCAoWWFydSkuIFlvdSBjYW4gZWFzaWx5IG1vZGlmeSB0aGUgdHJhbnNwYXJlbmN5IGxldmVsIHRocm91Z2ggdGhlIENTUyBzdHlsZXNoZWV0IGluIHRoZSBleHRlbnNpb25zJ3MgZm9sZGVyLiIsCiAgIm5hbWUiOiAiVWJ1bnR1LWxpa2UgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "042cbxdvh4nxv72dd6ikm37brgb2wc1yaxsznyavjwr53awjbbzm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsOiB0cmFuc3BhcmVudCwgc3RyYWlnaHQsIHJlZHVjZWQgaGVpZ2h0LCBub24tYm9sZCBmb250cy4gTm90aGluZyBtb3JlLlxuXG5Mb29rcyByb3VnaGx5IGxpa2UgVWJ1bnR1IHNlc3Npb24ncyBwYW5lbCAoWWFydSkuIFlvdSBjYW4gZWFzaWx5IG1vZGlmeSB0aGUgdHJhbnNwYXJlbmN5IGxldmVsIHRocm91Z2ggdGhlIENTUyBzdHlsZXNoZWV0IGluIHRoZSBleHRlbnNpb25zJ3MgZm9sZGVyLiIsCiAgIm5hbWUiOiAiVWJ1bnR1LWxpa2UgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "4", "sha256": "1af8hyfvrpl7slqc1sdnc82zkrqrrvw16qw47qqxfdiybyk7381z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBhbmVsOiB0cmFuc3BhcmVudCwgc3RyYWlnaHQsIHJlZHVjZWQgaGVpZ2h0LCBub24tYm9sZCBmb250cy4gTm90aGluZyBtb3JlLlxuXG5Mb29rcyByb3VnaGx5IGxpa2UgVWJ1bnR1IHNlc3Npb24ncyBwYW5lbCAoWWFydSkuIFlvdSBjYW4gZWFzaWx5IG1vZGlmeSB0aGUgdHJhbnNwYXJlbmN5IGxldmVsIHRocm91Z2ggdGhlIENTUyBzdHlsZXNoZWV0IGluIHRoZSBleHRlbnNpb25zJ3MgZm9sZGVyLiIsCiAgIm5hbWUiOiAiVWJ1bnR1LWxpa2UgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "mounter@heartmire", "name": "Mounter", "pname": "mounter", "description": "Mount and umount fstab entries with 'noauto,user' options.\n\n/etc/fstab example that will be picked up and listed by the extension:\n192.168.1.1:/mnt/data/users/martin /mnt/server-martin nfs noauto,user,noatime,rw 0 0\n\nToggle the menu with the shortcut: CTRL + ALT + m", "link": "https://extensions.gnome.org/extension/2666/mounter/", "shell_version_map": {"38": {"version": "5", "sha256": "13nxnpiv8f9bzxqgv3iinb92ib9zk3jmmx273acs25lcjcw8v6l0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdW50IGFuZCB1bW91bnQgZnN0YWIgZW50cmllcyB3aXRoICdub2F1dG8sdXNlcicgb3B0aW9ucy5cblxuL2V0Yy9mc3RhYiBleGFtcGxlIHRoYXQgd2lsbCBiZSBwaWNrZWQgdXAgYW5kIGxpc3RlZCBieSB0aGUgZXh0ZW5zaW9uOlxuMTkyLjE2OC4xLjE6L21udC9kYXRhL3VzZXJzL21hcnRpbiAgL21udC9zZXJ2ZXItbWFydGluICBuZnMgIG5vYXV0byx1c2VyLG5vYXRpbWUscncgIDAgIDBcblxuVG9nZ2xlIHRoZSBtZW51IHdpdGggdGhlIHNob3J0Y3V0OiBDVFJMICsgQUxUICsgbSIsCiAgIm5hbWUiOiAiTW91bnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tb3VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbW91bnRlciIsCiAgInV1aWQiOiAibW91bnRlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "13nxnpiv8f9bzxqgv3iinb92ib9zk3jmmx273acs25lcjcw8v6l0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdW50IGFuZCB1bW91bnQgZnN0YWIgZW50cmllcyB3aXRoICdub2F1dG8sdXNlcicgb3B0aW9ucy5cblxuL2V0Yy9mc3RhYiBleGFtcGxlIHRoYXQgd2lsbCBiZSBwaWNrZWQgdXAgYW5kIGxpc3RlZCBieSB0aGUgZXh0ZW5zaW9uOlxuMTkyLjE2OC4xLjE6L21udC9kYXRhL3VzZXJzL21hcnRpbiAgL21udC9zZXJ2ZXItbWFydGluICBuZnMgIG5vYXV0byx1c2VyLG5vYXRpbWUscncgIDAgIDBcblxuVG9nZ2xlIHRoZSBtZW51IHdpdGggdGhlIHNob3J0Y3V0OiBDVFJMICsgQUxUICsgbSIsCiAgIm5hbWUiOiAiTW91bnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tb3VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbW91bnRlciIsCiAgInV1aWQiOiAibW91bnRlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "13nxnpiv8f9bzxqgv3iinb92ib9zk3jmmx273acs25lcjcw8v6l0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdW50IGFuZCB1bW91bnQgZnN0YWIgZW50cmllcyB3aXRoICdub2F1dG8sdXNlcicgb3B0aW9ucy5cblxuL2V0Yy9mc3RhYiBleGFtcGxlIHRoYXQgd2lsbCBiZSBwaWNrZWQgdXAgYW5kIGxpc3RlZCBieSB0aGUgZXh0ZW5zaW9uOlxuMTkyLjE2OC4xLjE6L21udC9kYXRhL3VzZXJzL21hcnRpbiAgL21udC9zZXJ2ZXItbWFydGluICBuZnMgIG5vYXV0byx1c2VyLG5vYXRpbWUscncgIDAgIDBcblxuVG9nZ2xlIHRoZSBtZW51IHdpdGggdGhlIHNob3J0Y3V0OiBDVFJMICsgQUxUICsgbSIsCiAgIm5hbWUiOiAiTW91bnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tb3VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJ0aW5oamFydG15ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbW91bnRlciIsCiAgInV1aWQiOiAibW91bnRlckBoZWFydG1pcmUiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "simple-task-bar@fthx", "name": "Simple Task Bar", "pname": "simple-task-bar", "description": "*** Superseeded by https://extensions.gnome.org/extension/4000/babar. ***\n\nTask bar in the top panel, tasks on all workspaces.\n\n Basic actions, nothing more : activate, minimize, switch, per-desktop overview. Some settings through GNOME Extensions manager, thanks @leleat.\n\n This extension can hide the Activities button and makes the Places Menu extension's label become a folder icon.\n\n This extension is *light* and should *not interfere* with GNOME Shell behaviour+logic. If you want more, please consider installing Dash to Panel.", "link": "https://extensions.gnome.org/extension/2672/simple-task-bar/", "shell_version_map": {"38": {"version": "33", "sha256": "0rsvfymmnljqikarihmgs2fdi14pclfdhwrsz06zxzxd6nvmj4x1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIioqKiBTdXBlcnNlZWRlZCBieSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80MDAwL2JhYmFyLiAqKipcblxuVGFzayBiYXIgaW4gdGhlIHRvcCBwYW5lbCwgdGFza3Mgb24gYWxsIHdvcmtzcGFjZXMuXG5cbiBCYXNpYyBhY3Rpb25zLCBub3RoaW5nIG1vcmUgOiBhY3RpdmF0ZSwgbWluaW1pemUsIHN3aXRjaCwgcGVyLWRlc2t0b3Agb3ZlcnZpZXcuIFNvbWUgc2V0dGluZ3MgdGhyb3VnaCBHTk9NRSBFeHRlbnNpb25zIG1hbmFnZXIsIHRoYW5rcyBAbGVsZWF0LlxuXG4gVGhpcyBleHRlbnNpb24gY2FuIGhpZGUgdGhlIEFjdGl2aXRpZXMgYnV0dG9uIGFuZCBtYWtlcyB0aGUgUGxhY2VzIE1lbnUgZXh0ZW5zaW9uJ3MgbGFiZWwgYmVjb21lIGEgZm9sZGVyIGljb24uXG5cbiBUaGlzIGV4dGVuc2lvbiBpcyAqbGlnaHQqIGFuZCBzaG91bGQgKm5vdCBpbnRlcmZlcmUqIHdpdGggR05PTUUgU2hlbGwgYmVoYXZpb3VyK2xvZ2ljLiBJZiB5b3Ugd2FudCBtb3JlLCBwbGVhc2UgY29uc2lkZXIgaW5zdGFsbGluZyBEYXNoIHRvIFBhbmVsLiIsCiAgIm5hbWUiOiAiU2ltcGxlIFRhc2sgQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zaW1wbGUtdGFzay1iYXIiLAogICJ1dWlkIjogInNpbXBsZS10YXNrLWJhckBmdGh4IiwKICAidmVyc2lvbiI6IDMzCn0="}}} -, {"uuid": "minimize-shelf@etenil", "name": "Minimize Shelf", "pname": "minimize-shelf", "description": "Minimize shelf in the top panel, with minimized windows of the current workspace.\n\n No settings but you can easily play around with CSS file. This extension is light and should not interfere with GNOME Shell behaviour+logic.", "link": "https://extensions.gnome.org/extension/2735/minimize-shelf/", "shell_version_map": {"40": {"version": "7", "sha256": "0phvhc13qqrdcbdmysbhah7rixfs2xf927rhif86ba1wxsbffp6q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIHNoZWxmIGluIHRoZSB0b3AgcGFuZWwsIHdpdGggbWluaW1pemVkIHdpbmRvd3Mgb2YgdGhlIGN1cnJlbnQgd29ya3NwYWNlLlxuXG4gTm8gc2V0dGluZ3MgYnV0IHlvdSBjYW4gZWFzaWx5IHBsYXkgYXJvdW5kIHdpdGggQ1NTIGZpbGUuIFRoaXMgZXh0ZW5zaW9uIGlzIGxpZ2h0IGFuZCBzaG91bGQgbm90IGludGVyZmVyZSB3aXRoIEdOT01FIFNoZWxsIGJlaGF2aW91citsb2dpYy4iLAogICJuYW1lIjogIk1pbmltaXplIFNoZWxmIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmF0aXN0ZW8vbWluaW1pemUtc2hlbGYiLAogICJ1dWlkIjogIm1pbmltaXplLXNoZWxmQGV0ZW5pbCIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "0phvhc13qqrdcbdmysbhah7rixfs2xf927rhif86ba1wxsbffp6q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIHNoZWxmIGluIHRoZSB0b3AgcGFuZWwsIHdpdGggbWluaW1pemVkIHdpbmRvd3Mgb2YgdGhlIGN1cnJlbnQgd29ya3NwYWNlLlxuXG4gTm8gc2V0dGluZ3MgYnV0IHlvdSBjYW4gZWFzaWx5IHBsYXkgYXJvdW5kIHdpdGggQ1NTIGZpbGUuIFRoaXMgZXh0ZW5zaW9uIGlzIGxpZ2h0IGFuZCBzaG91bGQgbm90IGludGVyZmVyZSB3aXRoIEdOT01FIFNoZWxsIGJlaGF2aW91citsb2dpYy4iLAogICJuYW1lIjogIk1pbmltaXplIFNoZWxmIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmF0aXN0ZW8vbWluaW1pemUtc2hlbGYiLAogICJ1dWlkIjogIm1pbmltaXplLXNoZWxmQGV0ZW5pbCIsCiAgInZlcnNpb24iOiA3Cn0="}}} -, {"uuid": "remove-alt-tab-delay@daase.net", "name": "Remove Alt+Tab Delay v2", "pname": "remove-alttab-delay-v2", "description": "Another extension that removes the 0.15 second popup delay in switcher pop-ups. This extension is actively maintained. It fixes at least this known issue: https://gitlab.gnome.org/GNOME/mutter/issues/888.", "link": "https://extensions.gnome.org/extension/2741/remove-alttab-delay-v2/", "shell_version_map": {"38": {"version": "6", "sha256": "02s82kndphmhx5vxldh08ig04jzhyg4dw73fi2j7vxs1hg9drv9a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL3JlbW92ZS1hbHQtdGFiLWRlbGF5IiwKICAidXVpZCI6ICJyZW1vdmUtYWx0LXRhYi1kZWxheUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "02s82kndphmhx5vxldh08ig04jzhyg4dw73fi2j7vxs1hg9drv9a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL3JlbW92ZS1hbHQtdGFiLWRlbGF5IiwKICAidXVpZCI6ICJyZW1vdmUtYWx0LXRhYi1kZWxheUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "02s82kndphmhx5vxldh08ig04jzhyg4dw73fi2j7vxs1hg9drv9a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL3JlbW92ZS1hbHQtdGFiLWRlbGF5IiwKICAidXVpZCI6ICJyZW1vdmUtYWx0LXRhYi1kZWxheUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}}} +, {"uuid": "minimize-shelf@etenil", "name": "Minimize Shelf", "pname": "minimize-shelf", "description": "Minimize shelf in the top panel, with minimized windows of the current workspace.\nThis extension is light and should not interfere with GNOME Shell behaviour+logic.", "link": "https://extensions.gnome.org/extension/2735/minimize-shelf/", "shell_version_map": {"40": {"version": "10", "sha256": "0kslw9nikb6nza9axvw0salkdx2nx1bpgfrlznprw7xf43x2dqyd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIHNoZWxmIGluIHRoZSB0b3AgcGFuZWwsIHdpdGggbWluaW1pemVkIHdpbmRvd3Mgb2YgdGhlIGN1cnJlbnQgd29ya3NwYWNlLlxuVGhpcyBleHRlbnNpb24gaXMgbGlnaHQgYW5kIHNob3VsZCBub3QgaW50ZXJmZXJlIHdpdGggR05PTUUgU2hlbGwgYmVoYXZpb3VyK2xvZ2ljLiIsCiAgIm5hbWUiOiAiTWluaW1pemUgU2hlbGYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXRpc3Rlby9taW5pbWl6ZS1zaGVsZiIsCiAgInV1aWQiOiAibWluaW1pemUtc2hlbGZAZXRlbmlsIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0kslw9nikb6nza9axvw0salkdx2nx1bpgfrlznprw7xf43x2dqyd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIHNoZWxmIGluIHRoZSB0b3AgcGFuZWwsIHdpdGggbWluaW1pemVkIHdpbmRvd3Mgb2YgdGhlIGN1cnJlbnQgd29ya3NwYWNlLlxuVGhpcyBleHRlbnNpb24gaXMgbGlnaHQgYW5kIHNob3VsZCBub3QgaW50ZXJmZXJlIHdpdGggR05PTUUgU2hlbGwgYmVoYXZpb3VyK2xvZ2ljLiIsCiAgIm5hbWUiOiAiTWluaW1pemUgU2hlbGYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXRpc3Rlby9taW5pbWl6ZS1zaGVsZiIsCiAgInV1aWQiOiAibWluaW1pemUtc2hlbGZAZXRlbmlsIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "0kslw9nikb6nza9axvw0salkdx2nx1bpgfrlznprw7xf43x2dqyd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIHNoZWxmIGluIHRoZSB0b3AgcGFuZWwsIHdpdGggbWluaW1pemVkIHdpbmRvd3Mgb2YgdGhlIGN1cnJlbnQgd29ya3NwYWNlLlxuVGhpcyBleHRlbnNpb24gaXMgbGlnaHQgYW5kIHNob3VsZCBub3QgaW50ZXJmZXJlIHdpdGggR05PTUUgU2hlbGwgYmVoYXZpb3VyK2xvZ2ljLiIsCiAgIm5hbWUiOiAiTWluaW1pemUgU2hlbGYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXRpc3Rlby9taW5pbWl6ZS1zaGVsZiIsCiAgInV1aWQiOiAibWluaW1pemUtc2hlbGZAZXRlbmlsIiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"uuid": "remove-alt-tab-delay@daase.net", "name": "Remove Alt+Tab Delay v2", "pname": "remove-alttab-delay-v2", "description": "Another extension that removes the 0.15 second popup delay in switcher pop-ups. This extension is actively maintained. It fixes at least this known issue: https://gitlab.gnome.org/GNOME/mutter/issues/888.", "link": "https://extensions.gnome.org/extension/2741/remove-alttab-delay-v2/", "shell_version_map": {"38": {"version": "7", "sha256": "0zzckr3w5547ja42pq4gyfqkvd7xfnh5pwsbdqbxrdjd5d0sh7rv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Cam9lcm5EYWFzZS9yZW1vdmUtYWx0LXRhYi1kZWxheSIsCiAgInV1aWQiOiAicmVtb3ZlLWFsdC10YWItZGVsYXlAZGFhc2UubmV0IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "0zzckr3w5547ja42pq4gyfqkvd7xfnh5pwsbdqbxrdjd5d0sh7rv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Cam9lcm5EYWFzZS9yZW1vdmUtYWx0LXRhYi1kZWxheSIsCiAgInV1aWQiOiAicmVtb3ZlLWFsdC10YWItZGVsYXlAZGFhc2UubmV0IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0zzckr3w5547ja42pq4gyfqkvd7xfnh5pwsbdqbxrdjd5d0sh7rv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Cam9lcm5EYWFzZS9yZW1vdmUtYWx0LXRhYi1kZWxheSIsCiAgInV1aWQiOiAicmVtb3ZlLWFsdC10YWItZGVsYXlAZGFhc2UubmV0IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "0zzckr3w5547ja42pq4gyfqkvd7xfnh5pwsbdqbxrdjd5d0sh7rv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyB0aGUgMC4xNSBzZWNvbmQgcG9wdXAgZGVsYXkgaW4gc3dpdGNoZXIgcG9wLXVwcy4gVGhpcyBleHRlbnNpb24gaXMgYWN0aXZlbHkgbWFpbnRhaW5lZC4gSXQgZml4ZXMgYXQgbGVhc3QgdGhpcyBrbm93biBpc3N1ZTogaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL0dOT01FL211dHRlci9pc3N1ZXMvODg4LiIsCiAgIm5hbWUiOiAiUmVtb3ZlIEFsdCtUYWIgRGVsYXkgdjIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Cam9lcm5EYWFzZS9yZW1vdmUtYWx0LXRhYi1kZWxheSIsCiAgInV1aWQiOiAicmVtb3ZlLWFsdC10YWItZGVsYXlAZGFhc2UubmV0IiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "corona-tracker@lachhebo.github.io", "name": "corona-tracker", "pname": "corona-tracker", "description": "A GNOME Shell extension (GNOME Panel applet) to notify you every day with information about the COVID-19 virus spread.", "link": "https://extensions.gnome.org/extension/2767/corona-tracker/", "shell_version_map": {"38": {"version": "14", "sha256": "12mnlkh2l23wdx6m28x332lhqd0yq16zhfnmdhk6bzma7wq73sxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIG5vdGlmeSB5b3UgZXZlcnkgZGF5IHdpdGggaW5mb3JtYXRpb24gYWJvdXQgdGhlIENPVklELTE5IHZpcnVzIHNwcmVhZC4iLAogICJuYW1lIjogImNvcm9uYS10cmFja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhY2hoZWJvL2Nvcm9uYS10cmFja2VyIiwKICAidXVpZCI6ICJjb3JvbmEtdHJhY2tlckBsYWNoaGViby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "40": {"version": "14", "sha256": "12mnlkh2l23wdx6m28x332lhqd0yq16zhfnmdhk6bzma7wq73sxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIG5vdGlmeSB5b3UgZXZlcnkgZGF5IHdpdGggaW5mb3JtYXRpb24gYWJvdXQgdGhlIENPVklELTE5IHZpcnVzIHNwcmVhZC4iLAogICJuYW1lIjogImNvcm9uYS10cmFja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhY2hoZWJvL2Nvcm9uYS10cmFja2VyIiwKICAidXVpZCI6ICJjb3JvbmEtdHJhY2tlckBsYWNoaGViby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "gnome-trash@gnome-trash.b00f.gitlab.com", "name": "Gnome Trash - UNMAINTAINED", "pname": "gnome-trash", "description": "MOVED HERE:\n\nhttps://github.com/b00f/gnome-trash", "link": "https://extensions.gnome.org/extension/2773/gnome-trash/", "shell_version_map": {"38": {"version": "13", "sha256": "1z7da74nvl4wvy6ckv55xkl3sc5qzcv6lz5k6bdfa0xcshifhl6h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1PVkVEIEhFUkU6XG5cbmh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLXRyYXNoIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtdHJhc2giLAogICJuYW1lIjogIkdub21lIFRyYXNoIC0gVU5NQUlOVEFJTkVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYjAwZi9nbm9tZS10cmFzaCIsCiAgInV1aWQiOiAiZ25vbWUtdHJhc2hAZ25vbWUtdHJhc2guYjAwZi5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "customgestures@raushankumar27.github.com", "name": "Custom 3 Finger Gestures", "pname": "custom-3-finger-gestures", "description": "3 Finger touchpad gestures into gnome-shell", "link": "https://extensions.gnome.org/extension/2781/custom-3-finger-gestures/", "shell_version_map": {"38": {"version": "7", "sha256": "1a51rlf5fjlzlm2y3cv1ncf4glqa48rkpi0z1b8hd5m1fzgdx6m9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIjMgRmluZ2VyIHRvdWNocGFkIGdlc3R1cmVzIGludG8gZ25vbWUtc2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b21nZXN0dXJlcyIsCiAgIm5hbWUiOiAiQ3VzdG9tIDMgRmluZ2VyIEdlc3R1cmVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbWdlc3R1cmVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmF1c2hhbmt1bWFyMjcvY3VzdG9tZ2VzdHVyZSIsCiAgInV1aWQiOiAiY3VzdG9tZ2VzdHVyZXNAcmF1c2hhbmt1bWFyMjcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "overview-improved@human.experience", "name": "Overview Improved", "pname": "overview-improved", "description": "Improved, more Unity like overview\n\n* Dash-To-Dock or Ubuntu Dock integration creates Unity-like experience showing windows of specific type\n* Windows search in overview\nConfigurable keybinding (Super+w) to trigger current window overlay\n* Clicking empty space in overview closes\n* Do not show overview when showing application on multiple monitors\n* Multi Monitors Add-On Overview integration\n\nCaveat: may clash with other extensions that modify overview experience", "link": "https://extensions.gnome.org/extension/2802/overview-improved/", "shell_version_map": {"38": {"version": "8", "sha256": "0pzk6kzhbm15rmd540gv2sc0yqbiv31lil4ra3k5k7cpnr9ipsy6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmVkLCBtb3JlIFVuaXR5IGxpa2Ugb3ZlcnZpZXdcblxuKiBEYXNoLVRvLURvY2sgb3IgVWJ1bnR1IERvY2sgaW50ZWdyYXRpb24gY3JlYXRlcyBVbml0eS1saWtlIGV4cGVyaWVuY2Ugc2hvd2luZyB3aW5kb3dzIG9mIHNwZWNpZmljIHR5cGVcbiogV2luZG93cyBzZWFyY2ggaW4gb3ZlcnZpZXdcbkNvbmZpZ3VyYWJsZSBrZXliaW5kaW5nIChTdXBlcit3KSB0byB0cmlnZ2VyIGN1cnJlbnQgd2luZG93IG92ZXJsYXlcbiogQ2xpY2tpbmcgZW1wdHkgc3BhY2UgaW4gb3ZlcnZpZXcgY2xvc2VzXG4qIERvIG5vdCBzaG93IG92ZXJ2aWV3IHdoZW4gc2hvd2luZyBhcHBsaWNhdGlvbiBvbiBtdWx0aXBsZSBtb25pdG9yc1xuKiBNdWx0aSBNb25pdG9ycyBBZGQtT24gT3ZlcnZpZXcgaW50ZWdyYXRpb25cblxuQ2F2ZWF0OiBtYXkgY2xhc2ggd2l0aCBvdGhlciBleHRlbnNpb25zIHRoYXQgbW9kaWZ5IG92ZXJ2aWV3IGV4cGVyaWVuY2UiLAogICJuYW1lIjogIk92ZXJ2aWV3IEltcHJvdmVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm92ZXJ2aWV3LWltcHJvdmVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9odW1hbi5leHBlcmllbmNlL2dub21lLXNoZWxsLW92ZXJ2aWV3LWltcHJvdmVkIiwKICAidXVpZCI6ICJvdmVydmlldy1pbXByb3ZlZEBodW1hbi5leHBlcmllbmNlIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "brightnesspanelmenuindicator@do.sch.dev.gmail.com", "name": "Brightness Panel Menu Indicator", "pname": "brightness-panel-menu-indicator", "description": "If a backlight device is available, this extension shows a brightness indicator on panel menu, that allows changing brightness through scrolling on it. Useful, when using ddcci-driver-linux on a desktop PC without native keyboard buttons to change brightness.", "link": "https://extensions.gnome.org/extension/2808/brightness-panel-menu-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "14c6klkpi0y6lxi0vkpgq86kjwf2ckkjl80530sybqfbfvbcffvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklmIGEgYmFja2xpZ2h0IGRldmljZSBpcyBhdmFpbGFibGUsIHRoaXMgZXh0ZW5zaW9uIHNob3dzIGEgYnJpZ2h0bmVzcyBpbmRpY2F0b3Igb24gcGFuZWwgbWVudSwgdGhhdCBhbGxvd3MgY2hhbmdpbmcgYnJpZ2h0bmVzcyB0aHJvdWdoIHNjcm9sbGluZyBvbiBpdC4gVXNlZnVsLCB3aGVuIHVzaW5nIGRkY2NpLWRyaXZlci1saW51eCBvbiBhIGRlc2t0b3AgUEMgd2l0aG91dCBuYXRpdmUga2V5Ym9hcmQgYnV0dG9ucyB0byBjaGFuZ2UgYnJpZ2h0bmVzcy4iLAogICJuYW1lIjogIkJyaWdodG5lc3MgUGFuZWwgTWVudSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RvLXNjaC9nbm9tZS1zaGVsbC1icmlnaHRuZXNzLXBhbmVsLW1lbnUtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJicmlnaHRuZXNzcGFuZWxtZW51aW5kaWNhdG9yQGRvLnNjaC5kZXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "14c6klkpi0y6lxi0vkpgq86kjwf2ckkjl80530sybqfbfvbcffvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklmIGEgYmFja2xpZ2h0IGRldmljZSBpcyBhdmFpbGFibGUsIHRoaXMgZXh0ZW5zaW9uIHNob3dzIGEgYnJpZ2h0bmVzcyBpbmRpY2F0b3Igb24gcGFuZWwgbWVudSwgdGhhdCBhbGxvd3MgY2hhbmdpbmcgYnJpZ2h0bmVzcyB0aHJvdWdoIHNjcm9sbGluZyBvbiBpdC4gVXNlZnVsLCB3aGVuIHVzaW5nIGRkY2NpLWRyaXZlci1saW51eCBvbiBhIGRlc2t0b3AgUEMgd2l0aG91dCBuYXRpdmUga2V5Ym9hcmQgYnV0dG9ucyB0byBjaGFuZ2UgYnJpZ2h0bmVzcy4iLAogICJuYW1lIjogIkJyaWdodG5lc3MgUGFuZWwgTWVudSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RvLXNjaC9nbm9tZS1zaGVsbC1icmlnaHRuZXNzLXBhbmVsLW1lbnUtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJicmlnaHRuZXNzcGFuZWxtZW51aW5kaWNhdG9yQGRvLnNjaC5kZXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "14c6klkpi0y6lxi0vkpgq86kjwf2ckkjl80530sybqfbfvbcffvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklmIGEgYmFja2xpZ2h0IGRldmljZSBpcyBhdmFpbGFibGUsIHRoaXMgZXh0ZW5zaW9uIHNob3dzIGEgYnJpZ2h0bmVzcyBpbmRpY2F0b3Igb24gcGFuZWwgbWVudSwgdGhhdCBhbGxvd3MgY2hhbmdpbmcgYnJpZ2h0bmVzcyB0aHJvdWdoIHNjcm9sbGluZyBvbiBpdC4gVXNlZnVsLCB3aGVuIHVzaW5nIGRkY2NpLWRyaXZlci1saW51eCBvbiBhIGRlc2t0b3AgUEMgd2l0aG91dCBuYXRpdmUga2V5Ym9hcmQgYnV0dG9ucyB0byBjaGFuZ2UgYnJpZ2h0bmVzcy4iLAogICJuYW1lIjogIkJyaWdodG5lc3MgUGFuZWwgTWVudSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RvLXNjaC9nbm9tZS1zaGVsbC1icmlnaHRuZXNzLXBhbmVsLW1lbnUtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJicmlnaHRuZXNzcGFuZWxtZW51aW5kaWNhdG9yQGRvLnNjaC5kZXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "crypto@alipirpiran.github", "name": "Crypto Price Tracker", "pname": "crypto-price-tracker", "description": "Simple extension to track price of Crypto Currencies\n\nadd coins by Binance symbols, for example: \"BTCUSDT\"\ncomplete list on binance: https://www.binance.com/indexSpa.html", "link": "https://extensions.gnome.org/extension/2817/crypto-price-tracker/", "shell_version_map": {"40": {"version": "13", "sha256": "1kiq0h3vyw9nvc6al0w892khmc99bmaafb21rm6zin6qpm22dz7r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdG8gdHJhY2sgcHJpY2Ugb2YgQ3J5cHRvIEN1cnJlbmNpZXNcblxuYWRkIGNvaW5zIGJ5IEJpbmFuY2Ugc3ltYm9scywgZm9yIGV4YW1wbGU6IFwiQlRDVVNEVFwiXG5jb21wbGV0ZSBsaXN0IG9uIGJpbmFuY2U6IGh0dHBzOi8vd3d3LmJpbmFuY2UuY29tL2luZGV4U3BhLmh0bWwiLAogICJuYW1lIjogIkNyeXB0byBQcmljZSBUcmFja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNyeXB0by10cmFja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsaXBpcnBpcmFuL0NyeXB0by1QcmljZS1UcmFja2VyLWZvci1Hbm9tZS1TaGVsbCIsCiAgInV1aWQiOiAiY3J5cHRvQGFsaXBpcnBpcmFuLmdpdGh1YiIsCiAgInZlcnNpb24iOiAxMwp9"}}} -, {"uuid": "ibus-tweaker@tuberry.github.com", "name": "IBus Tweaker", "pname": "ibus-tweaker", "description": "Tweaker of IBus for orientation, theme, font, input mode and clipboard history\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/2820/ibus-tweaker/", "shell_version_map": {"38": {"version": "28", "sha256": "1ahhcq8hpxkdvq1fp8gd8qp1cfsgqsm9swn4ph9kyrzr7j8jvc3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpYnVzLXR3ZWFrZXIiLAogICJuYW1lIjogIklCdXMgVHdlYWtlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pYnVzLXR3ZWFrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2lidXMtdHdlYWtlciIsCiAgInV1aWQiOiAiaWJ1cy10d2Vha2VyQHR1YmVycnkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}, "40": {"version": "34", "sha256": "0fs0hlxdnhssx9vcghbicg1fn3clws9q2f3nzdi4virpm8wksf3f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpYnVzLXR3ZWFrZXIiLAogICJuYW1lIjogIklCdXMgVHdlYWtlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pYnVzLXR3ZWFrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9pYnVzLXR3ZWFrZXIiLAogICJ1dWlkIjogImlidXMtdHdlYWtlckB0dWJlcnJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "41": {"version": "36", "sha256": "0f819v8n1rvvwrir7qf8fp0bvn5zk899lpc4dr8f9jk9g8w57q7d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24taWJ1cy10d2Vha2VyIiwKICAibmFtZSI6ICJJQnVzIFR3ZWFrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWJ1cy10d2Vha2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvaWJ1cy10d2Vha2VyIiwKICAidXVpZCI6ICJpYnVzLXR3ZWFrZXJAdHViZXJyeS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM2Cn0="}}} +, {"uuid": "ibus-tweaker@tuberry.github.com", "name": "IBus Tweaker", "pname": "ibus-tweaker", "description": "Tweaker of IBus for orientation, theme, font, input mode and clipboard history\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/2820/ibus-tweaker/", "shell_version_map": {"38": {"version": "28", "sha256": "1ahhcq8hpxkdvq1fp8gd8qp1cfsgqsm9swn4ph9kyrzr7j8jvc3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpYnVzLXR3ZWFrZXIiLAogICJuYW1lIjogIklCdXMgVHdlYWtlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pYnVzLXR3ZWFrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2lidXMtdHdlYWtlciIsCiAgInV1aWQiOiAiaWJ1cy10d2Vha2VyQHR1YmVycnkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}, "40": {"version": "34", "sha256": "0fs0hlxdnhssx9vcghbicg1fn3clws9q2f3nzdi4virpm8wksf3f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpYnVzLXR3ZWFrZXIiLAogICJuYW1lIjogIklCdXMgVHdlYWtlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5pYnVzLXR3ZWFrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9pYnVzLXR3ZWFrZXIiLAogICJ1dWlkIjogImlidXMtdHdlYWtlckB0dWJlcnJ5LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "41": {"version": "36", "sha256": "0f819v8n1rvvwrir7qf8fp0bvn5zk899lpc4dr8f9jk9g8w57q7d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24taWJ1cy10d2Vha2VyIiwKICAibmFtZSI6ICJJQnVzIFR3ZWFrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWJ1cy10d2Vha2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvaWJ1cy10d2Vha2VyIiwKICAidXVpZCI6ICJpYnVzLXR3ZWFrZXJAdHViZXJyeS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM2Cn0="}, "42": {"version": "38", "sha256": "0crdw1z2yan0mbc36v8vw0iinqbv4lyqzsvdyhz8zsi9q4asrlg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrZXIgb2YgSUJ1cyBmb3Igb3JpZW50YXRpb24sIHRoZW1lLCBmb250LCBpbnB1dCBtb2RlIGFuZCBjbGlwYm9hcmQgaGlzdG9yeVxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24taWJ1cy10d2Vha2VyIiwKICAibmFtZSI6ICJJQnVzIFR3ZWFrZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaWJ1cy10d2Vha2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvaWJ1cy10d2Vha2VyIiwKICAidXVpZCI6ICJpYnVzLXR3ZWFrZXJAdHViZXJyeS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDM4Cn0="}}} , {"uuid": "generic-monitor@gnome-shell-extensions", "name": "Generic Monitor", "pname": "generic-monitor", "description": "Display text & icon on systray using DBUS", "link": "https://extensions.gnome.org/extension/2826/generic-monitor/", "shell_version_map": {"38": {"version": "9", "sha256": "1gryq7agphzkcfnf3q4x4azp1d0wa0pim8xasddmdgk922qfb41q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cDovL2luZGVmZXJvLnNvdXRhZGUuZnIvcC9nZW5lcmljbW9uaXRvciIsCiAgInV1aWQiOiAiZ2VuZXJpYy1tb25pdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "1gryq7agphzkcfnf3q4x4azp1d0wa0pim8xasddmdgk922qfb41q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cDovL2luZGVmZXJvLnNvdXRhZGUuZnIvcC9nZW5lcmljbW9uaXRvciIsCiAgInV1aWQiOiAiZ2VuZXJpYy1tb25pdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "1gryq7agphzkcfnf3q4x4azp1d0wa0pim8xasddmdgk922qfb41q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGV4dCAmIGljb24gb24gc3lzdHJheSB1c2luZyBEQlVTIiwKICAibmFtZSI6ICJHZW5lcmljIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cDovL2luZGVmZXJvLnNvdXRhZGUuZnIvcC9nZW5lcmljbW9uaXRvciIsCiAgInV1aWQiOiAiZ2VuZXJpYy1tb25pdG9yQGdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "hide-keyboard-layout@sitnik.ru", "name": "Hide Keyboard Layout", "pname": "hide-keyboard-layout", "description": "Hide keyboard layout indicator in status bar", "link": "https://extensions.gnome.org/extension/2848/hide-keyboard-layout/", "shell_version_map": {"38": {"version": "3", "sha256": "06l7x3nhrabiii93zgpxv4qyd525sxxn687x6lraxqlx1i824qzd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWkvaGlkZS1rZXlib2FyZC1sYXlvdXQiLAogICJ1dWlkIjogImhpZGUta2V5Ym9hcmQtbGF5b3V0QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "06l7x3nhrabiii93zgpxv4qyd525sxxn687x6lraxqlx1i824qzd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWkvaGlkZS1rZXlib2FyZC1sYXlvdXQiLAogICJ1dWlkIjogImhpZGUta2V5Ym9hcmQtbGF5b3V0QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "06l7x3nhrabiii93zgpxv4qyd525sxxn687x6lraxqlx1i824qzd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUga2V5Ym9hcmQgbGF5b3V0IGluZGljYXRvciBpbiBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJIaWRlIEtleWJvYXJkIExheW91dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWkvaGlkZS1rZXlib2FyZC1sYXlvdXQiLAogICJ1dWlkIjogImhpZGUta2V5Ym9hcmQtbGF5b3V0QHNpdG5pay5ydSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "poweroff-button-on-topbar@darknico.com", "name": "Poweroff Button on Topbar", "pname": "poweroff-button-on-topbar", "description": "Add poweroff button on topbar", "link": "https://extensions.gnome.org/extension/2851/poweroff-button-on-topbar/", "shell_version_map": {"38": {"version": "4", "sha256": "1x3d68pflicccxiqlwiflxrw5xnnw4096bdh7hypi40jdw3b5njz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwb3dlcm9mZiBidXR0b24gb24gdG9wYmFyIiwKICAibmFtZSI6ICJQb3dlcm9mZiBCdXR0b24gb24gVG9wYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RhcmtuaWNvL0dOT01FLVNoZWxsLUV4dGVuc2lvbnMiLAogICJ1dWlkIjogInBvd2Vyb2ZmLWJ1dHRvbi1vbi10b3BiYXJAZGFya25pY28uY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "1x3d68pflicccxiqlwiflxrw5xnnw4096bdh7hypi40jdw3b5njz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBwb3dlcm9mZiBidXR0b24gb24gdG9wYmFyIiwKICAibmFtZSI6ICJQb3dlcm9mZiBCdXR0b24gb24gVG9wYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RhcmtuaWNvL0dOT01FLVNoZWxsLUV4dGVuc2lvbnMiLAogICJ1dWlkIjogInBvd2Vyb2ZmLWJ1dHRvbi1vbi10b3BiYXJAZGFya25pY28uY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} @@ -292,69 +293,69 @@ , {"uuid": "activities_icons@fawtytoo", "name": "Activities Icons", "pname": "activities-icons", "description": "The Activities button becomes 2 icons for selecting either Applications or Workspaces in the overview. Selecting the same view again will hide the overview.\nScrolling on the icons allows switching windows on a workspace or cycling through the Workspaces.", "link": "https://extensions.gnome.org/extension/2872/activities-icons/", "shell_version_map": {"38": {"version": "8", "sha256": "048ckyp65iv7hcb1qq4c1qfp9hwxh2fagn87hmzmvi5km14l0dba", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBiZWNvbWVzIDIgaWNvbnMgZm9yIHNlbGVjdGluZyBlaXRoZXIgQXBwbGljYXRpb25zIG9yIFdvcmtzcGFjZXMgaW4gdGhlIG92ZXJ2aWV3LiBTZWxlY3RpbmcgdGhlIHNhbWUgdmlldyBhZ2FpbiB3aWxsIGhpZGUgdGhlIG92ZXJ2aWV3LlxuU2Nyb2xsaW5nIG9uIHRoZSBpY29ucyBhbGxvd3Mgc3dpdGNoaW5nIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2Ugb3IgY3ljbGluZyB0aHJvdWdoIHRoZSBXb3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF3dHl0b28vYWN0aXZpdGllcy1pY29ucyIsCiAgInV1aWQiOiAiYWN0aXZpdGllc19pY29uc0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "048ckyp65iv7hcb1qq4c1qfp9hwxh2fagn87hmzmvi5km14l0dba", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBiZWNvbWVzIDIgaWNvbnMgZm9yIHNlbGVjdGluZyBlaXRoZXIgQXBwbGljYXRpb25zIG9yIFdvcmtzcGFjZXMgaW4gdGhlIG92ZXJ2aWV3LiBTZWxlY3RpbmcgdGhlIHNhbWUgdmlldyBhZ2FpbiB3aWxsIGhpZGUgdGhlIG92ZXJ2aWV3LlxuU2Nyb2xsaW5nIG9uIHRoZSBpY29ucyBhbGxvd3Mgc3dpdGNoaW5nIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2Ugb3IgY3ljbGluZyB0aHJvdWdoIHRoZSBXb3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF3dHl0b28vYWN0aXZpdGllcy1pY29ucyIsCiAgInV1aWQiOiAiYWN0aXZpdGllc19pY29uc0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "048ckyp65iv7hcb1qq4c1qfp9hwxh2fagn87hmzmvi5km14l0dba", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBiZWNvbWVzIDIgaWNvbnMgZm9yIHNlbGVjdGluZyBlaXRoZXIgQXBwbGljYXRpb25zIG9yIFdvcmtzcGFjZXMgaW4gdGhlIG92ZXJ2aWV3LiBTZWxlY3RpbmcgdGhlIHNhbWUgdmlldyBhZ2FpbiB3aWxsIGhpZGUgdGhlIG92ZXJ2aWV3LlxuU2Nyb2xsaW5nIG9uIHRoZSBpY29ucyBhbGxvd3Mgc3dpdGNoaW5nIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2Ugb3IgY3ljbGluZyB0aHJvdWdoIHRoZSBXb3Jrc3BhY2VzLiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmF3dHl0b28vYWN0aXZpdGllcy1pY29ucyIsCiAgInV1aWQiOiAiYWN0aXZpdGllc19pY29uc0BmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "transparent_panel@fawtytoo", "name": "Transparent Top Panel", "pname": "transparent-top-panel", "description": "Totally transparent top panel in the Overview.\nAlso adds drop shadows to text and icons for those using GS 3.38.", "link": "https://extensions.gnome.org/extension/2878/transparent-top-panel/", "shell_version_map": {"38": {"version": "10", "sha256": "01bb054zf774pzb35di5z6y0bxrhr1fykhfk6rzmkb8izbfqciql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvdGFsbHkgdHJhbnNwYXJlbnQgdG9wIHBhbmVsIGluIHRoZSBPdmVydmlldy5cbkFsc28gYWRkcyBkcm9wIHNoYWRvd3MgdG8gdGV4dCBhbmQgaWNvbnMgZm9yIHRob3NlIHVzaW5nIEdTIDMuMzguIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudF9wYW5lbEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "01bb054zf774pzb35di5z6y0bxrhr1fykhfk6rzmkb8izbfqciql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvdGFsbHkgdHJhbnNwYXJlbnQgdG9wIHBhbmVsIGluIHRoZSBPdmVydmlldy5cbkFsc28gYWRkcyBkcm9wIHNoYWRvd3MgdG8gdGV4dCBhbmQgaWNvbnMgZm9yIHRob3NlIHVzaW5nIEdTIDMuMzguIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudF9wYW5lbEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "01bb054zf774pzb35di5z6y0bxrhr1fykhfk6rzmkb8izbfqciql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvdGFsbHkgdHJhbnNwYXJlbnQgdG9wIHBhbmVsIGluIHRoZSBPdmVydmlldy5cbkFsc28gYWRkcyBkcm9wIHNoYWRvd3MgdG8gdGV4dCBhbmQgaWNvbnMgZm9yIHRob3NlIHVzaW5nIEdTIDMuMzguIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudF9wYW5lbEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "overview_full_bright@fawtytoo", "name": "Overview Full Bright", "pname": "overview-full-bright", "description": "Shows the Overview in full brightness and without the vignette.\n\nNOTE: This will not be developed beyond GS 3.38.", "link": "https://extensions.gnome.org/extension/2884/overview-full-bright/", "shell_version_map": {"38": {"version": "4", "sha256": "1dm5h1kl40lsly9a80ch4mfi67ppwd7dgg4idx8vrcx5iksnzxil", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBPdmVydmlldyBpbiBmdWxsIGJyaWdodG5lc3MgYW5kIHdpdGhvdXQgdGhlIHZpZ25ldHRlLlxuXG5OT1RFOiBUaGlzIHdpbGwgbm90IGJlIGRldmVsb3BlZCBiZXlvbmQgR1MgMy4zOC4iLAogICJuYW1lIjogIk92ZXJ2aWV3IEZ1bGwgQnJpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm92ZXJ2aWV3X2Z1bGxfYnJpZ2h0QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "trayIconsReloaded@selfmade.pl", "name": "Tray Icons: Reloaded", "pname": "tray-icons-reloaded", "description": "Tray Icons Reloaded is a GNOME Shell extension which bring back Tray Icons to top panel, with additional features.\n\n>>> Read compatibility note on GitHub there is also bug reporting <<<", "link": "https://extensions.gnome.org/extension/2890/tray-icons-reloaded/", "shell_version_map": {"38": {"version": "11", "sha256": "19icczlk4j8a1fdl19lqzinx9l82lwnvj5q8xaazvgm4yicxmh4b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLlxuXG4+Pj4gUmVhZCBjb21wYXRpYmlsaXR5IG5vdGUgb24gR2l0SHViIHRoZXJlIGlzIGFsc28gYnVnIHJlcG9ydGluZyA8PDwiLAogICJuYW1lIjogIlRyYXkgSWNvbnM6IFJlbG9hZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYXlJY29uc1JlbG9hZGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvVHJheS1JY29ucy1SZWxvYWRlZCIsCiAgInV1aWQiOiAidHJheUljb25zUmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "16", "sha256": "0bwpxfc2wjvv254fnr05q3cvs1r0jw0fdj7n8b20vdwry48n30vb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLlxuXG4+Pj4gUmVhZCBjb21wYXRpYmlsaXR5IG5vdGUgb24gR2l0SHViIHRoZXJlIGlzIGFsc28gYnVnIHJlcG9ydGluZyA8PDwiLAogICJuYW1lIjogIlRyYXkgSWNvbnM6IFJlbG9hZGVkIiwKICAib3Blbi1ibGFja2xpc3QiOiBbCiAgICAiRWxlY3Ryb24iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYXlJY29uc1JlbG9hZGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hcnRpblBML1RyYXktSWNvbnMtUmVsb2FkZWQiLAogICJ1dWlkIjogInRyYXlJY29uc1JlbG9hZGVkQHNlbGZtYWRlLnBsIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "41": {"version": "19", "sha256": "00sgwpkfwfaqjf58j3i3w4brinmrc6x0dr6pf06vbp8vpzf51vdc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLlxuXG4+Pj4gUmVhZCBjb21wYXRpYmlsaXR5IG5vdGUgb24gR2l0SHViIHRoZXJlIGlzIGFsc28gYnVnIHJlcG9ydGluZyA8PDwiLAogICJuYW1lIjogIlRyYXkgSWNvbnM6IFJlbG9hZGVkIiwKICAib3Blbi1ibGFja2xpc3QiOiBbCiAgICAiRWxlY3Ryb24iLAogICAgIllhZCIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJheUljb25zUmVsb2FkZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvVHJheS1JY29ucy1SZWxvYWRlZCIsCiAgInV1aWQiOiAidHJheUljb25zUmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} -, {"uuid": "messagingmenu@lauinger-clan.de", "name": "Messaging Menu", "pname": "messaging-menu", "description": "A Messaging Menu for the Gnome Shell. All Email and Chat Applications in one Place.", "link": "https://extensions.gnome.org/extension/2896/messaging-menu/", "shell_version_map": {"38": {"version": "4", "sha256": "1xa0hyvs2aw1z7kg5gcsgh2pjn7b13zhps98j4xpwfiv6zm0sa73", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "8", "sha256": "1pxf5rk8nqm6scm38np546g5z9xlnf2nghzbayrxk91b67qq6znv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "1pxf5rk8nqm6scm38np546g5z9xlnf2nghzbayrxk91b67qq6znv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9tZXNzYWdpbmdtZW51IiwKICAidXVpZCI6ICJtZXNzYWdpbmdtZW51QGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogOAp9"}}} -, {"uuid": "SettingsCenter@lauinger-clan.de", "name": "SettingsCenter", "pname": "settingscenter", "description": "Settings Center is a customizable drop-down menu for quickly launching frequently used apps in Gnome:Shell via the user/aggregate menu. Originally created by XES.\n\nv10: fix for older versions, i havent tested this on anything below 3.10, v9: minor cleanup, now has an icon for the main menu entry. \n\nSettings shortcuts : gnome-tweak-tool, dconf-editor, gconf-editor, gnome-session-properties, gnome-shell-extension-prefs, seahorse and nvidia-settings. You can add your own\n\nOriginal source : http://svn.xesnet.fr/gnomeextensions (3.8 replace Settings code credit IsacDaavid)\n\nCredit to @peaceseeker for updating this with a working repo, i do wish it could have been pushed to me but my blank repo was deleted as it was stale, i failed to push to git before going back to work around 1.5 years ago and i hadn't been active enough to notice anything other than emails(these things help people!)", "link": "https://extensions.gnome.org/extension/2899/settingscenter/", "shell_version_map": {"38": {"version": "2", "sha256": "150x8xp9xm28scw5lcmxq7xcfa17wbzy2y381xsv0mv0b03kvyqy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSB1c2VyL2FnZ3JlZ2F0ZSBtZW51LiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG52MTA6IGZpeCBmb3Igb2xkZXIgdmVyc2lvbnMsIGkgaGF2ZW50IHRlc3RlZCB0aGlzIG9uIGFueXRoaW5nIGJlbG93IDMuMTAsIHY5OiBtaW5vciBjbGVhbnVwLCBub3cgaGFzIGFuIGljb24gZm9yIHRoZSBtYWluIG1lbnUgZW50cnkuIFxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyAoMy44IHJlcGxhY2UgU2V0dGluZ3MgY29kZSBjcmVkaXQgSXNhY0RhYXZpZClcblxuQ3JlZGl0IHRvIEBwZWFjZXNlZWtlciBmb3IgdXBkYXRpbmcgdGhpcyB3aXRoIGEgd29ya2luZyByZXBvLCBpIGRvIHdpc2ggaXQgY291bGQgaGF2ZSBiZWVuIHB1c2hlZCB0byBtZSBidXQgbXkgYmxhbmsgcmVwbyB3YXMgZGVsZXRlZCBhcyBpdCB3YXMgc3RhbGUsIGkgZmFpbGVkIHRvIHB1c2ggdG8gZ2l0IGJlZm9yZSBnb2luZyBiYWNrIHRvIHdvcmsgYXJvdW5kIDEuNSB5ZWFycyBhZ28gYW5kIGkgaGFkbid0IGJlZW4gYWN0aXZlIGVub3VnaCB0byBub3RpY2UgYW55dGhpbmcgb3RoZXIgdGhhbiBlbWFpbHModGhlc2UgdGhpbmdzIGhlbHAgcGVvcGxlISkiLAogICJsb2NhbGUiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlNldHRpbmdzQ2VudGVyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIlhlcywgbDMwMGx2bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuNS40IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvWEVTLVNldHRpbmdzLUNlbnRlci1FeHRlbnNpb24iLAogICJ1dWlkIjogIlNldHRpbmdzQ2VudGVyQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "6", "sha256": "0vbvkvrx9yd2jci452m1wdqhx1d1a858kgg45abqds8d7vdmlph1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSB1c2VyL2FnZ3JlZ2F0ZSBtZW51LiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG52MTA6IGZpeCBmb3Igb2xkZXIgdmVyc2lvbnMsIGkgaGF2ZW50IHRlc3RlZCB0aGlzIG9uIGFueXRoaW5nIGJlbG93IDMuMTAsIHY5OiBtaW5vciBjbGVhbnVwLCBub3cgaGFzIGFuIGljb24gZm9yIHRoZSBtYWluIG1lbnUgZW50cnkuIFxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyAoMy44IHJlcGxhY2UgU2V0dGluZ3MgY29kZSBjcmVkaXQgSXNhY0RhYXZpZClcblxuQ3JlZGl0IHRvIEBwZWFjZXNlZWtlciBmb3IgdXBkYXRpbmcgdGhpcyB3aXRoIGEgd29ya2luZyByZXBvLCBpIGRvIHdpc2ggaXQgY291bGQgaGF2ZSBiZWVuIHB1c2hlZCB0byBtZSBidXQgbXkgYmxhbmsgcmVwbyB3YXMgZGVsZXRlZCBhcyBpdCB3YXMgc3RhbGUsIGkgZmFpbGVkIHRvIHB1c2ggdG8gZ2l0IGJlZm9yZSBnb2luZyBiYWNrIHRvIHdvcmsgYXJvdW5kIDEuNSB5ZWFycyBhZ28gYW5kIGkgaGFkbid0IGJlZW4gYWN0aXZlIGVub3VnaCB0byBub3RpY2UgYW55dGhpbmcgb3RoZXIgdGhhbiBlbWFpbHModGhlc2UgdGhpbmdzIGhlbHAgcGVvcGxlISkiLAogICJsb2NhbGUiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlNldHRpbmdzQ2VudGVyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIlhlcywgbDMwMGx2bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0vbvkvrx9yd2jci452m1wdqhx1d1a858kgg45abqds8d7vdmlph1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSB1c2VyL2FnZ3JlZ2F0ZSBtZW51LiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG52MTA6IGZpeCBmb3Igb2xkZXIgdmVyc2lvbnMsIGkgaGF2ZW50IHRlc3RlZCB0aGlzIG9uIGFueXRoaW5nIGJlbG93IDMuMTAsIHY5OiBtaW5vciBjbGVhbnVwLCBub3cgaGFzIGFuIGljb24gZm9yIHRoZSBtYWluIG1lbnUgZW50cnkuIFxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyAoMy44IHJlcGxhY2UgU2V0dGluZ3MgY29kZSBjcmVkaXQgSXNhY0RhYXZpZClcblxuQ3JlZGl0IHRvIEBwZWFjZXNlZWtlciBmb3IgdXBkYXRpbmcgdGhpcyB3aXRoIGEgd29ya2luZyByZXBvLCBpIGRvIHdpc2ggaXQgY291bGQgaGF2ZSBiZWVuIHB1c2hlZCB0byBtZSBidXQgbXkgYmxhbmsgcmVwbyB3YXMgZGVsZXRlZCBhcyBpdCB3YXMgc3RhbGUsIGkgZmFpbGVkIHRvIHB1c2ggdG8gZ2l0IGJlZm9yZSBnb2luZyBiYWNrIHRvIHdvcmsgYXJvdW5kIDEuNSB5ZWFycyBhZ28gYW5kIGkgaGFkbid0IGJlZW4gYWN0aXZlIGVub3VnaCB0byBub3RpY2UgYW55dGhpbmcgb3RoZXIgdGhhbiBlbWFpbHModGhlc2UgdGhpbmdzIGhlbHAgcGVvcGxlISkiLAogICJsb2NhbGUiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlNldHRpbmdzQ2VudGVyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIlhlcywgbDMwMGx2bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} +, {"uuid": "trayIconsReloaded@selfmade.pl", "name": "Tray Icons: Reloaded", "pname": "tray-icons-reloaded", "description": "Tray Icons Reloaded is a GNOME Shell extension which bring back Tray Icons to top panel, with additional features.\n\n>>> Read compatibility note on GitHub there is also bug reporting <<<", "link": "https://extensions.gnome.org/extension/2890/tray-icons-reloaded/", "shell_version_map": {"38": {"version": "11", "sha256": "19icczlk4j8a1fdl19lqzinx9l82lwnvj5q8xaazvgm4yicxmh4b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLlxuXG4+Pj4gUmVhZCBjb21wYXRpYmlsaXR5IG5vdGUgb24gR2l0SHViIHRoZXJlIGlzIGFsc28gYnVnIHJlcG9ydGluZyA8PDwiLAogICJuYW1lIjogIlRyYXkgSWNvbnM6IFJlbG9hZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYXlJY29uc1JlbG9hZGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvVHJheS1JY29ucy1SZWxvYWRlZCIsCiAgInV1aWQiOiAidHJheUljb25zUmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "16", "sha256": "0bwpxfc2wjvv254fnr05q3cvs1r0jw0fdj7n8b20vdwry48n30vb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLlxuXG4+Pj4gUmVhZCBjb21wYXRpYmlsaXR5IG5vdGUgb24gR2l0SHViIHRoZXJlIGlzIGFsc28gYnVnIHJlcG9ydGluZyA8PDwiLAogICJuYW1lIjogIlRyYXkgSWNvbnM6IFJlbG9hZGVkIiwKICAib3Blbi1ibGFja2xpc3QiOiBbCiAgICAiRWxlY3Ryb24iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRyYXlJY29uc1JlbG9hZGVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hcnRpblBML1RyYXktSWNvbnMtUmVsb2FkZWQiLAogICJ1dWlkIjogInRyYXlJY29uc1JlbG9hZGVkQHNlbGZtYWRlLnBsIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "41": {"version": "22", "sha256": "116vy94imzaicqpmh13ynixqx7fgybpgzcnss6k8zwk3m0m13hqg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLlxuXG4+Pj4gUmVhZCBjb21wYXRpYmlsaXR5IG5vdGUgb24gR2l0SHViIHRoZXJlIGlzIGFsc28gYnVnIHJlcG9ydGluZyA8PDwiLAogICJuYW1lIjogIlRyYXkgSWNvbnM6IFJlbG9hZGVkIiwKICAib3Blbi1ibGFja2xpc3QiOiBbCiAgICAiRWxlY3Ryb24iLAogICAgIllhZCIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJheUljb25zUmVsb2FkZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvVHJheS1JY29ucy1SZWxvYWRlZCIsCiAgInV1aWQiOiAidHJheUljb25zUmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "23", "sha256": "1q9qbvqzz8kjmakj6y1zx2xhlq63yp9vawcpxngi8m8q6vj7wmrb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLlxuXG4+Pj4gUmVhZCBjb21wYXRpYmlsaXR5IG5vdGUgb24gR2l0SHViIHRoZXJlIGlzIGFsc28gYnVnIHJlcG9ydGluZyA8PDwiLAogICJuYW1lIjogIlRyYXkgSWNvbnM6IFJlbG9hZGVkIiwKICAib3Blbi1ibGFja2xpc3QiOiBbCiAgICAiRWxlY3Ryb24iLAogICAgIllhZCIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJheUljb25zUmVsb2FkZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvVHJheS1JY29ucy1SZWxvYWRlZCIsCiAgInV1aWQiOiAidHJheUljb25zUmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} +, {"uuid": "messagingmenu@lauinger-clan.de", "name": "Messaging Menu", "pname": "messaging-menu", "description": "A Messaging Menu for the Gnome Shell. All Email and Chat Applications in one Place.", "link": "https://extensions.gnome.org/extension/2896/messaging-menu/", "shell_version_map": {"38": {"version": "4", "sha256": "1xa0hyvs2aw1z7kg5gcsgh2pjn7b13zhps98j4xpwfiv6zm0sa73", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "11", "sha256": "0jywlzqaw7ag4s9bwpg9g641h8j7psfj9csnhl5phrychky45xbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "0jywlzqaw7ag4s9bwpg9g641h8j7psfj9csnhl5phrychky45xbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "0jywlzqaw7ag4s9bwpg9g641h8j7psfj9csnhl5phrychky45xbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}}} +, {"uuid": "SettingsCenter@lauinger-clan.de", "name": "SettingsCenter", "pname": "settingscenter", "description": "Settings Center is a customizable drop-down menu for quickly launching frequently used apps in Gnome:Shell via the user/aggregate menu. Originally created by XES.\n\nv10: fix for older versions, i havent tested this on anything below 3.10, v9: minor cleanup, now has an icon for the main menu entry. \n\nSettings shortcuts : gnome-tweak-tool, dconf-editor, gconf-editor, gnome-session-properties, gnome-shell-extension-prefs, seahorse and nvidia-settings. You can add your own\n\nOriginal source : http://svn.xesnet.fr/gnomeextensions (3.8 replace Settings code credit IsacDaavid)\n\nCredit to @peaceseeker for updating this with a working repo, i do wish it could have been pushed to me but my blank repo was deleted as it was stale, i failed to push to git before going back to work around 1.5 years ago and i hadn't been active enough to notice anything other than emails(these things help people!)", "link": "https://extensions.gnome.org/extension/2899/settingscenter/", "shell_version_map": {"38": {"version": "2", "sha256": "150x8xp9xm28scw5lcmxq7xcfa17wbzy2y381xsv0mv0b03kvyqy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSB1c2VyL2FnZ3JlZ2F0ZSBtZW51LiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG52MTA6IGZpeCBmb3Igb2xkZXIgdmVyc2lvbnMsIGkgaGF2ZW50IHRlc3RlZCB0aGlzIG9uIGFueXRoaW5nIGJlbG93IDMuMTAsIHY5OiBtaW5vciBjbGVhbnVwLCBub3cgaGFzIGFuIGljb24gZm9yIHRoZSBtYWluIG1lbnUgZW50cnkuIFxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyAoMy44IHJlcGxhY2UgU2V0dGluZ3MgY29kZSBjcmVkaXQgSXNhY0RhYXZpZClcblxuQ3JlZGl0IHRvIEBwZWFjZXNlZWtlciBmb3IgdXBkYXRpbmcgdGhpcyB3aXRoIGEgd29ya2luZyByZXBvLCBpIGRvIHdpc2ggaXQgY291bGQgaGF2ZSBiZWVuIHB1c2hlZCB0byBtZSBidXQgbXkgYmxhbmsgcmVwbyB3YXMgZGVsZXRlZCBhcyBpdCB3YXMgc3RhbGUsIGkgZmFpbGVkIHRvIHB1c2ggdG8gZ2l0IGJlZm9yZSBnb2luZyBiYWNrIHRvIHdvcmsgYXJvdW5kIDEuNSB5ZWFycyBhZ28gYW5kIGkgaGFkbid0IGJlZW4gYWN0aXZlIGVub3VnaCB0byBub3RpY2UgYW55dGhpbmcgb3RoZXIgdGhhbiBlbWFpbHModGhlc2UgdGhpbmdzIGhlbHAgcGVvcGxlISkiLAogICJsb2NhbGUiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlNldHRpbmdzQ2VudGVyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIlhlcywgbDMwMGx2bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuNS40IiwKICAgICIzLjgiLAogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvWEVTLVNldHRpbmdzLUNlbnRlci1FeHRlbnNpb24iLAogICJ1dWlkIjogIlNldHRpbmdzQ2VudGVyQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "9", "sha256": "1687rhzy0ckpfph1x7ga05wmg6515p5y5yd5sq585hc8y2bclp7m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSB1c2VyL2FnZ3JlZ2F0ZSBtZW51LiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG52MTA6IGZpeCBmb3Igb2xkZXIgdmVyc2lvbnMsIGkgaGF2ZW50IHRlc3RlZCB0aGlzIG9uIGFueXRoaW5nIGJlbG93IDMuMTAsIHY5OiBtaW5vciBjbGVhbnVwLCBub3cgaGFzIGFuIGljb24gZm9yIHRoZSBtYWluIG1lbnUgZW50cnkuIFxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyAoMy44IHJlcGxhY2UgU2V0dGluZ3MgY29kZSBjcmVkaXQgSXNhY0RhYXZpZClcblxuQ3JlZGl0IHRvIEBwZWFjZXNlZWtlciBmb3IgdXBkYXRpbmcgdGhpcyB3aXRoIGEgd29ya2luZyByZXBvLCBpIGRvIHdpc2ggaXQgY291bGQgaGF2ZSBiZWVuIHB1c2hlZCB0byBtZSBidXQgbXkgYmxhbmsgcmVwbyB3YXMgZGVsZXRlZCBhcyBpdCB3YXMgc3RhbGUsIGkgZmFpbGVkIHRvIHB1c2ggdG8gZ2l0IGJlZm9yZSBnb2luZyBiYWNrIHRvIHdvcmsgYXJvdW5kIDEuNSB5ZWFycyBhZ28gYW5kIGkgaGFkbid0IGJlZW4gYWN0aXZlIGVub3VnaCB0byBub3RpY2UgYW55dGhpbmcgb3RoZXIgdGhhbiBlbWFpbHModGhlc2UgdGhpbmdzIGhlbHAgcGVvcGxlISkiLAogICJsb2NhbGUiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlNldHRpbmdzQ2VudGVyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIlhlcywgbDMwMGx2bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "1687rhzy0ckpfph1x7ga05wmg6515p5y5yd5sq585hc8y2bclp7m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSB1c2VyL2FnZ3JlZ2F0ZSBtZW51LiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG52MTA6IGZpeCBmb3Igb2xkZXIgdmVyc2lvbnMsIGkgaGF2ZW50IHRlc3RlZCB0aGlzIG9uIGFueXRoaW5nIGJlbG93IDMuMTAsIHY5OiBtaW5vciBjbGVhbnVwLCBub3cgaGFzIGFuIGljb24gZm9yIHRoZSBtYWluIG1lbnUgZW50cnkuIFxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyAoMy44IHJlcGxhY2UgU2V0dGluZ3MgY29kZSBjcmVkaXQgSXNhY0RhYXZpZClcblxuQ3JlZGl0IHRvIEBwZWFjZXNlZWtlciBmb3IgdXBkYXRpbmcgdGhpcyB3aXRoIGEgd29ya2luZyByZXBvLCBpIGRvIHdpc2ggaXQgY291bGQgaGF2ZSBiZWVuIHB1c2hlZCB0byBtZSBidXQgbXkgYmxhbmsgcmVwbyB3YXMgZGVsZXRlZCBhcyBpdCB3YXMgc3RhbGUsIGkgZmFpbGVkIHRvIHB1c2ggdG8gZ2l0IGJlZm9yZSBnb2luZyBiYWNrIHRvIHdvcmsgYXJvdW5kIDEuNSB5ZWFycyBhZ28gYW5kIGkgaGFkbid0IGJlZW4gYWN0aXZlIGVub3VnaCB0byBub3RpY2UgYW55dGhpbmcgb3RoZXIgdGhhbiBlbWFpbHModGhlc2UgdGhpbmdzIGhlbHAgcGVvcGxlISkiLAogICJsb2NhbGUiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlNldHRpbmdzQ2VudGVyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIlhlcywgbDMwMGx2bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "1687rhzy0ckpfph1x7ga05wmg6515p5y5yd5sq585hc8y2bclp7m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSB1c2VyL2FnZ3JlZ2F0ZSBtZW51LiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG52MTA6IGZpeCBmb3Igb2xkZXIgdmVyc2lvbnMsIGkgaGF2ZW50IHRlc3RlZCB0aGlzIG9uIGFueXRoaW5nIGJlbG93IDMuMTAsIHY5OiBtaW5vciBjbGVhbnVwLCBub3cgaGFzIGFuIGljb24gZm9yIHRoZSBtYWluIG1lbnUgZW50cnkuIFxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyAoMy44IHJlcGxhY2UgU2V0dGluZ3MgY29kZSBjcmVkaXQgSXNhY0RhYXZpZClcblxuQ3JlZGl0IHRvIEBwZWFjZXNlZWtlciBmb3IgdXBkYXRpbmcgdGhpcyB3aXRoIGEgd29ya2luZyByZXBvLCBpIGRvIHdpc2ggaXQgY291bGQgaGF2ZSBiZWVuIHB1c2hlZCB0byBtZSBidXQgbXkgYmxhbmsgcmVwbyB3YXMgZGVsZXRlZCBhcyBpdCB3YXMgc3RhbGUsIGkgZmFpbGVkIHRvIHB1c2ggdG8gZ2l0IGJlZm9yZSBnb2luZyBiYWNrIHRvIHdvcmsgYXJvdW5kIDEuNSB5ZWFycyBhZ28gYW5kIGkgaGFkbid0IGJlZW4gYWN0aXZlIGVub3VnaCB0byBub3RpY2UgYW55dGhpbmcgb3RoZXIgdGhhbiBlbWFpbHModGhlc2UgdGhpbmdzIGhlbHAgcGVvcGxlISkiLAogICJsb2NhbGUiOiAiL3Vzci9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlNldHRpbmdzQ2VudGVyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIlhlcywgbDMwMGx2bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "auto-mute-toggle@garotosopa.github.io", "name": "Auto-mute toggle", "pname": "auto-mute-toggle", "description": "Toggle whether to auto-mute speakers when headphones are plugged in.", "link": "https://extensions.gnome.org/extension/2905/auto-mute-toggle/", "shell_version_map": {"40": {"version": "6", "sha256": "1lyh51gvsh9ydip77vjj8rigjiah97lh8gp91jcpqblwx69fs3dk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB3aGV0aGVyIHRvIGF1dG8tbXV0ZSBzcGVha2VycyB3aGVuIGhlYWRwaG9uZXMgYXJlIHBsdWdnZWQgaW4uIiwKICAibmFtZSI6ICJBdXRvLW11dGUgdG9nZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dhcm90b3NvcGEvZ3NlLWF1dG8tbXV0ZS10b2dnbGUiLAogICJ1dWlkIjogImF1dG8tbXV0ZS10b2dnbGVAZ2Fyb3Rvc29wYS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "optimus-manager-indicator@andr3slelouch.github.com", "name": "Optimus Manager Indicator", "pname": "optimus-manager-indicator", "description": "Intel/Hybrid/NVIDIA GPU Switch Note: The GPU mode activated doesn't show up in the options, by example: When you turn on the PC you are gonna be in Intel mode so Intel option is not gonna be shown. Note: Optimus Manager Indicator is made(for the moment) for Arch based distributions with optimus-manager.", "link": "https://extensions.gnome.org/extension/2908/optimus-manager-indicator/", "shell_version_map": {"38": {"version": "5", "sha256": "1mqgnwfdbd2460ngkkq6wiswvb9bvwgm5n32j7jgvn1xhb3mqn58", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL0h5YnJpZC9OVklESUEgR1BVIFN3aXRjaCBOb3RlOiBUaGUgR1BVIG1vZGUgYWN0aXZhdGVkIGRvZXNuJ3Qgc2hvdyB1cCBpbiB0aGUgb3B0aW9ucywgYnkgZXhhbXBsZTogV2hlbiB5b3UgdHVybiBvbiB0aGUgUEMgeW91IGFyZSBnb25uYSBiZSBpbiBJbnRlbCBtb2RlIHNvIEludGVsIG9wdGlvbiBpcyBub3QgZ29ubmEgYmUgc2hvd24uIE5vdGU6IE9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IgaXMgbWFkZShmb3IgdGhlIG1vbWVudCkgZm9yIEFyY2ggYmFzZWQgZGlzdHJpYnV0aW9ucyB3aXRoIG9wdGltdXMtbWFuYWdlci4iLAogICJuYW1lIjogIk9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmRyM3NsZWxvdWNoL09wdGltdXMtTWFuYWdlci1JbmRpY2F0b3IiLAogICJ1dWlkIjogIm9wdGltdXMtbWFuYWdlci1pbmRpY2F0b3JAYW5kcjNzbGVsb3VjaC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "1mqgnwfdbd2460ngkkq6wiswvb9bvwgm5n32j7jgvn1xhb3mqn58", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL0h5YnJpZC9OVklESUEgR1BVIFN3aXRjaCBOb3RlOiBUaGUgR1BVIG1vZGUgYWN0aXZhdGVkIGRvZXNuJ3Qgc2hvdyB1cCBpbiB0aGUgb3B0aW9ucywgYnkgZXhhbXBsZTogV2hlbiB5b3UgdHVybiBvbiB0aGUgUEMgeW91IGFyZSBnb25uYSBiZSBpbiBJbnRlbCBtb2RlIHNvIEludGVsIG9wdGlvbiBpcyBub3QgZ29ubmEgYmUgc2hvd24uIE5vdGU6IE9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IgaXMgbWFkZShmb3IgdGhlIG1vbWVudCkgZm9yIEFyY2ggYmFzZWQgZGlzdHJpYnV0aW9ucyB3aXRoIG9wdGltdXMtbWFuYWdlci4iLAogICJuYW1lIjogIk9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmRyM3NsZWxvdWNoL09wdGltdXMtTWFuYWdlci1JbmRpY2F0b3IiLAogICJ1dWlkIjogIm9wdGltdXMtbWFuYWdlci1pbmRpY2F0b3JAYW5kcjNzbGVsb3VjaC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} -, {"uuid": "BringOutSubmenuOfPowerOffLogoutButton@pratap.fastmail.fm", "name": "Bring Out Submenu Of Power Off/Logout Button", "pname": "bring-out-submenu-of-power-offlogout-button", "description": "Bring Out Submenu Of Power Off/Logout Button and Rearrange the Order of System Menu.", "link": "https://extensions.gnome.org/extension/2917/bring-out-submenu-of-power-offlogout-button/", "shell_version_map": {"38": {"version": "26", "sha256": "01zwpmawzqfqzr4zjhvkc8k9padip01yr07l2xpavzwj5c8zkz2z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0JyaW5nLU91dC1TdWJtZW51LW9mLVBvd2VyLU9mZi1Mb2dvdXQiLAogICJ1dWlkIjogIkJyaW5nT3V0U3VibWVudU9mUG93ZXJPZmZMb2dvdXRCdXR0b25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDI2Cn0="}, "40": {"version": "26", "sha256": "01zwpmawzqfqzr4zjhvkc8k9padip01yr07l2xpavzwj5c8zkz2z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0JyaW5nLU91dC1TdWJtZW51LW9mLVBvd2VyLU9mZi1Mb2dvdXQiLAogICJ1dWlkIjogIkJyaW5nT3V0U3VibWVudU9mUG93ZXJPZmZMb2dvdXRCdXR0b25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDI2Cn0="}, "41": {"version": "26", "sha256": "01zwpmawzqfqzr4zjhvkc8k9padip01yr07l2xpavzwj5c8zkz2z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0JyaW5nLU91dC1TdWJtZW51LW9mLVBvd2VyLU9mZi1Mb2dvdXQiLAogICJ1dWlkIjogIkJyaW5nT3V0U3VibWVudU9mUG93ZXJPZmZMb2dvdXRCdXR0b25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDI2Cn0="}}} +, {"uuid": "BringOutSubmenuOfPowerOffLogoutButton@pratap.fastmail.fm", "name": "Bring Out Submenu Of Power Off/Logout Button", "pname": "bring-out-submenu-of-power-offlogout-button", "description": "Bring Out Submenu Of Power Off/Logout Button and Rearrange the Order of System Menu.", "link": "https://extensions.gnome.org/extension/2917/bring-out-submenu-of-power-offlogout-button/", "shell_version_map": {"38": {"version": "27", "sha256": "0dfslg3vk1g5fah9jdrp3jjdvymk34ac5ms3v6iamp38aji0d6y8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0JyaW5nLU91dC1TdWJtZW51LW9mLVBvd2VyLU9mZi1Mb2dvdXQiLAogICJ1dWlkIjogIkJyaW5nT3V0U3VibWVudU9mUG93ZXJPZmZMb2dvdXRCdXR0b25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "40": {"version": "27", "sha256": "0dfslg3vk1g5fah9jdrp3jjdvymk34ac5ms3v6iamp38aji0d6y8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0JyaW5nLU91dC1TdWJtZW51LW9mLVBvd2VyLU9mZi1Mb2dvdXQiLAogICJ1dWlkIjogIkJyaW5nT3V0U3VibWVudU9mUG93ZXJPZmZMb2dvdXRCdXR0b25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "41": {"version": "27", "sha256": "0dfslg3vk1g5fah9jdrp3jjdvymk34ac5ms3v6iamp38aji0d6y8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0JyaW5nLU91dC1TdWJtZW51LW9mLVBvd2VyLU9mZi1Mb2dvdXQiLAogICJ1dWlkIjogIkJyaW5nT3V0U3VibWVudU9mUG93ZXJPZmZMb2dvdXRCdXR0b25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDI3Cn0="}}} , {"uuid": "batterytimepercentagecompact@sagrland.de", "name": "Battery Time (Percentage) Compact", "pname": "battery-time-percentage-compact", "description": "Shows the remaining time until fully charged/discharged as well as percentage of battery charge in the panel.", "link": "https://extensions.gnome.org/extension/2929/battery-time-percentage-compact/", "shell_version_map": {"38": {"version": "5", "sha256": "1ybq8k2nv1ym6dr9lkimrpbi9fhs2pnrm27382wpfly7qq1nflg9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSByZW1haW5pbmcgdGltZSB1bnRpbCBmdWxseSBjaGFyZ2VkL2Rpc2NoYXJnZWQgYXMgd2VsbCBhcyBwZXJjZW50YWdlIG9mIGJhdHRlcnkgY2hhcmdlIGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAibmFtZSI6ICJCYXR0ZXJ5IFRpbWUgKFBlcmNlbnRhZ2UpIENvbXBhY3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "1ybq8k2nv1ym6dr9lkimrpbi9fhs2pnrm27382wpfly7qq1nflg9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSByZW1haW5pbmcgdGltZSB1bnRpbCBmdWxseSBjaGFyZ2VkL2Rpc2NoYXJnZWQgYXMgd2VsbCBhcyBwZXJjZW50YWdlIG9mIGJhdHRlcnkgY2hhcmdlIGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAibmFtZSI6ICJCYXR0ZXJ5IFRpbWUgKFBlcmNlbnRhZ2UpIENvbXBhY3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1ybq8k2nv1ym6dr9lkimrpbi9fhs2pnrm27382wpfly7qq1nflg9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSByZW1haW5pbmcgdGltZSB1bnRpbCBmdWxseSBjaGFyZ2VkL2Rpc2NoYXJnZWQgYXMgd2VsbCBhcyBwZXJjZW50YWdlIG9mIGJhdHRlcnkgY2hhcmdlIGluIHRoZSBwYW5lbC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5dGltZXBlcmNlbnRhZ2Vjb21wYWN0IiwKICAibmFtZSI6ICJCYXR0ZXJ5IFRpbWUgKFBlcmNlbnRhZ2UpIENvbXBhY3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtYmF0dGVyeS10aW1lLXBlcmNlbnRhZ2UtY29tcGFjdCIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVwZXJjZW50YWdlY29tcGFjdEBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"uuid": "executor@raujonas.github.io", "name": "Executor", "pname": "executor", "description": "Execute multiple shell commands periodically with separate intervals and display the output in gnome top bar.", "link": "https://extensions.gnome.org/extension/2932/executor/", "shell_version_map": {"38": {"version": "17", "sha256": "1g24qy5cai3kvl929mhr0hgqmknddbklncmjpj7fabr02fjsbprv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhdWpvbmFzL2V4ZWN1dG9yIiwKICAidXVpZCI6ICJleGVjdXRvckByYXVqb25hcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "40": {"version": "17", "sha256": "1g24qy5cai3kvl929mhr0hgqmknddbklncmjpj7fabr02fjsbprv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhdWpvbmFzL2V4ZWN1dG9yIiwKICAidXVpZCI6ICJleGVjdXRvckByYXVqb25hcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "1g24qy5cai3kvl929mhr0hgqmknddbklncmjpj7fabr02fjsbprv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhdWpvbmFzL2V4ZWN1dG9yIiwKICAidXVpZCI6ICJleGVjdXRvckByYXVqb25hcy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} +, {"uuid": "executor@raujonas.github.io", "name": "Executor", "pname": "executor", "description": "Execute multiple shell commands periodically with separate intervals and display the output in gnome top bar.", "link": "https://extensions.gnome.org/extension/2932/executor/", "shell_version_map": {"38": {"version": "18", "sha256": "0qrpjz455jx4kd82y9wkmdl6mj46kpknbs2bh4fjm5jlvrjb92ak", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYXVqb25hcy9leGVjdXRvciIsCiAgInV1aWQiOiAiZXhlY3V0b3JAcmF1am9uYXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "40": {"version": "18", "sha256": "0qrpjz455jx4kd82y9wkmdl6mj46kpknbs2bh4fjm5jlvrjb92ak", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYXVqb25hcy9leGVjdXRvciIsCiAgInV1aWQiOiAiZXhlY3V0b3JAcmF1am9uYXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "41": {"version": "18", "sha256": "0qrpjz455jx4kd82y9wkmdl6mj46kpknbs2bh4fjm5jlvrjb92ak", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYXVqb25hcy9leGVjdXRvciIsCiAgInV1aWQiOiAiZXhlY3V0b3JAcmF1am9uYXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "42": {"version": "18", "sha256": "0qrpjz455jx4kd82y9wkmdl6mj46kpknbs2bh4fjm5jlvrjb92ak", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4ZWN1dGUgbXVsdGlwbGUgc2hlbGwgY29tbWFuZHMgcGVyaW9kaWNhbGx5IHdpdGggc2VwYXJhdGUgaW50ZXJ2YWxzIGFuZCBkaXNwbGF5IHRoZSBvdXRwdXQgaW4gZ25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIkV4ZWN1dG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwLjIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYXVqb25hcy9leGVjdXRvciIsCiAgInV1aWQiOiAiZXhlY3V0b3JAcmF1am9uYXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} , {"uuid": "ControlBlurEffectOnLockScreen@pratap.fastmail.fm", "name": "Control Blur Effect On Lock Screen", "pname": "control-blur-effect-on-lock-screen", "description": "Control the Blur Effect On Lock Screen.", "link": "https://extensions.gnome.org/extension/2935/control-blur-effect-on-lock-screen/", "shell_version_map": {"38": {"version": "14", "sha256": "176qxx2zykzzjq2xf8sf1c83r1skaxa2mzmp51v8bq3vbbxp0wij", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9Db250cm9sX0JsdXJfRWZmZWN0X09uX0xvY2tfU2NyZWVuIiwKICAidXVpZCI6ICJDb250cm9sQmx1ckVmZmVjdE9uTG9ja1NjcmVlbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "40": {"version": "17", "sha256": "1n8442n54hwjx1z4qww5mvb3w5v322d9zc78wm0kx378p4s3shsq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0NvbnRyb2xfQmx1cl9FZmZlY3RfT25fTG9ja19TY3JlZW4iLAogICJ1dWlkIjogIkNvbnRyb2xCbHVyRWZmZWN0T25Mb2NrU2NyZWVuQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "17", "sha256": "1n8442n54hwjx1z4qww5mvb3w5v322d9zc78wm0kx378p4s3shsq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdGhlIEJsdXIgRWZmZWN0IE9uIExvY2sgU2NyZWVuLiIsCiAgIm5hbWUiOiAiQ29udHJvbCBCbHVyIEVmZmVjdCBPbiBMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0NvbnRyb2xfQmx1cl9FZmZlY3RfT25fTG9ja19TY3JlZW4iLAogICJ1dWlkIjogIkNvbnRyb2xCbHVyRWZmZWN0T25Mb2NrU2NyZWVuQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAxNwp9"}}} , {"uuid": "compiz-alike-windows-effect@hermes83.github.com", "name": "Compiz alike windows effect", "pname": "compiz-alike-windows-effect", "description": "Wobbly windows effect inspired by the Compiz ones\n\nNB\nIn case of update error please restart Gnome Shell (on Xorg press ALT+F2 then write r and press enter, on Wayland end the session and log in again)\n\n-----------------------------------\n ALTERNATIVE\n-----------------------------------\nalternative extension to obtain an effect more similar to the original:\nhttps://extensions.gnome.org/extension/3210/compiz-windows-effect/", "link": "https://extensions.gnome.org/extension/2950/compiz-alike-windows-effect/", "shell_version_map": {"38": {"version": "22", "sha256": "0zkc9lcirqg224m46jjz2vapfg4lg9x7s0h0kvv57rfmkhrxcgbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvYmJseSB3aW5kb3dzIGVmZmVjdCBpbnNwaXJlZCBieSB0aGUgQ29tcGl6IG9uZXNcblxuTkJcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuIEFMVEVSTkFUSVZFXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuYWx0ZXJuYXRpdmUgZXh0ZW5zaW9uIHRvIG9idGFpbiBhbiBlZmZlY3QgbW9yZSBzaW1pbGFyIHRvIHRoZSBvcmlnaW5hbDpcbmh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzMyMTAvY29tcGl6LXdpbmRvd3MtZWZmZWN0LyIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIHdpbmRvd3MgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2Utd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}, "40": {"version": "22", "sha256": "0zkc9lcirqg224m46jjz2vapfg4lg9x7s0h0kvv57rfmkhrxcgbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvYmJseSB3aW5kb3dzIGVmZmVjdCBpbnNwaXJlZCBieSB0aGUgQ29tcGl6IG9uZXNcblxuTkJcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuIEFMVEVSTkFUSVZFXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuYWx0ZXJuYXRpdmUgZXh0ZW5zaW9uIHRvIG9idGFpbiBhbiBlZmZlY3QgbW9yZSBzaW1pbGFyIHRvIHRoZSBvcmlnaW5hbDpcbmh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzMyMTAvY29tcGl6LXdpbmRvd3MtZWZmZWN0LyIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIHdpbmRvd3MgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2Utd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}, "41": {"version": "22", "sha256": "0zkc9lcirqg224m46jjz2vapfg4lg9x7s0h0kvv57rfmkhrxcgbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvYmJseSB3aW5kb3dzIGVmZmVjdCBpbnNwaXJlZCBieSB0aGUgQ29tcGl6IG9uZXNcblxuTkJcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKVxuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuIEFMVEVSTkFUSVZFXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuYWx0ZXJuYXRpdmUgZXh0ZW5zaW9uIHRvIG9idGFpbiBhbiBlZmZlY3QgbW9yZSBzaW1pbGFyIHRvIHRoZSBvcmlnaW5hbDpcbmh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzMyMTAvY29tcGl6LXdpbmRvd3MtZWZmZWN0LyIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIHdpbmRvd3MgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2Utd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIyCn0="}}} -, {"uuid": "light-dict@tuberry.github.io", "name": "Light Dict", "pname": "light-dict", "description": "Lightweight extension for on-the-fly manipulation to primary selections, especially optimized for Dictionary lookups.\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/2959/light-dict/", "shell_version_map": {"38": {"version": "47", "sha256": "1l36l9qmcz7c6i81w5fv083bg01qsgz681c2lan8f87hqdipl4r7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsaWdodC1kaWN0IiwKICAibmFtZSI6ICJMaWdodCBEaWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxpZ2h0LWRpY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2xpZ2h0LWRpY3QiLAogICJ1dWlkIjogImxpZ2h0LWRpY3RAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}, "40": {"version": "58", "sha256": "0x3rk3p2vlyd2n23jlmwqfc1akbbjfhyn9w1v44byw1nfc3b0n8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1OAp9"}, "41": {"version": "65", "sha256": "1hjaw62pxrpgismg6dhxqp04qhk1d4xkwlgzymmra7d428qjnxf2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2NQp9"}}} -, {"uuid": "InternetSpeedMeter@alshakib.dev", "name": "Internet Speed Meter", "pname": "internet-speed-meter", "description": "Simple and minimal internet speed meter extension for gnome shell", "link": "https://extensions.gnome.org/extension/2980/internet-speed-meter/", "shell_version_map": {"38": {"version": "9", "sha256": "1m8nlhk6zixbi3i081fcafdp07swfsrqjs2z81ghi7kj93hmj8vk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIGdub21lIHNoZWxsIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "9", "sha256": "1m8nlhk6zixbi3i081fcafdp07swfsrqjs2z81ghi7kj93hmj8vk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIGdub21lIHNoZWxsIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1m8nlhk6zixbi3i081fcafdp07swfsrqjs2z81ghi7kj93hmj8vk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIGdub21lIHNoZWxsIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxTaGFraWIvSW50ZXJuZXRTcGVlZE1ldGVyIiwKICAidXVpZCI6ICJJbnRlcm5ldFNwZWVkTWV0ZXJAYWxzaGFraWIuZGV2IiwKICAidmVyc2lvbiI6IDkKfQ=="}}} +, {"uuid": "light-dict@tuberry.github.io", "name": "Light Dict", "pname": "light-dict", "description": "Lightweight extension for on-the-fly manipulation to primary selections, especially optimized for Dictionary lookups.\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/2959/light-dict/", "shell_version_map": {"38": {"version": "47", "sha256": "1l36l9qmcz7c6i81w5fv083bg01qsgz681c2lan8f87hqdipl4r7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsaWdodC1kaWN0IiwKICAibmFtZSI6ICJMaWdodCBEaWN0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxpZ2h0LWRpY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2xpZ2h0LWRpY3QiLAogICJ1dWlkIjogImxpZ2h0LWRpY3RAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNDcKfQ=="}, "40": {"version": "58", "sha256": "0x3rk3p2vlyd2n23jlmwqfc1akbbjfhyn9w1v44byw1nfc3b0n8z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1OAp9"}, "41": {"version": "65", "sha256": "1hjaw62pxrpgismg6dhxqp04qhk1d4xkwlgzymmra7d428qjnxf2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2NQp9"}, "42": {"version": "67", "sha256": "05nxmlsik60nmci7x1zvdfwjymab10ikb4pdgq4cmpim3mrpp3xn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IGV4dGVuc2lvbiBmb3Igb24tdGhlLWZseSBtYW5pcHVsYXRpb24gdG8gcHJpbWFyeSBzZWxlY3Rpb25zLCBlc3BlY2lhbGx5IG9wdGltaXplZCBmb3IgRGljdGlvbmFyeSBsb29rdXBzLlxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tbGlnaHQtZGljdCIsCiAgIm5hbWUiOiAiTGlnaHQgRGljdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5saWdodC1kaWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvbGlnaHQtZGljdCIsCiAgInV1aWQiOiAibGlnaHQtZGljdEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Nwp9"}}} +, {"uuid": "InternetSpeedMeter@alshakib.dev", "name": "Internet Speed Meter", "pname": "internet-speed-meter", "description": "Simple and minimal internet speed meter extension for gnome shell", "link": "https://extensions.gnome.org/extension/2980/internet-speed-meter/", "shell_version_map": {"38": {"version": "10", "sha256": "0q6cdiswixzg0j5ndjmqcxv6jznzsgjh0zplgsnfw42n2mzvmw32", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIGdub21lIHNoZWxsIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsU2hha2liL0ludGVybmV0U3BlZWRNZXRlciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1ldGVyQGFsc2hha2liLmRldiIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "0q6cdiswixzg0j5ndjmqcxv6jznzsgjh0zplgsnfw42n2mzvmw32", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIGdub21lIHNoZWxsIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsU2hha2liL0ludGVybmV0U3BlZWRNZXRlciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1ldGVyQGFsc2hha2liLmRldiIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0q6cdiswixzg0j5ndjmqcxv6jznzsgjh0zplgsnfw42n2mzvmw32", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIGdub21lIHNoZWxsIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsU2hha2liL0ludGVybmV0U3BlZWRNZXRlciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1ldGVyQGFsc2hha2liLmRldiIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "0q6cdiswixzg0j5ndjmqcxv6jznzsgjh0zplgsnfw42n2mzvmw32", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbWluaW1hbCBpbnRlcm5ldCBzcGVlZCBtZXRlciBleHRlbnNpb24gZm9yIGdub21lIHNoZWxsIiwKICAibmFtZSI6ICJJbnRlcm5ldCBTcGVlZCBNZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FsU2hha2liL0ludGVybmV0U3BlZWRNZXRlciIsCiAgInV1aWQiOiAiSW50ZXJuZXRTcGVlZE1ldGVyQGFsc2hha2liLmRldiIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "IP-Finder@linxgem33.com", "name": "IP Finder", "pname": "ip-finder", "description": "Displays useful information about your public IP Address\n\nIP Finder displays information about your public IP address, hostname, country, AS Block, as well as a map tile of your Geolocation and country flag, this extension is Also Useful for informational purposes to monitor VPN changes and public network IP Addresses.\n\n=====================\nIP Finder can monitor in real time\n=====================\n*Wireguard connections\n*OpenVPN connections\n*IPV4/6 connections\n*Proxy connections\n*VPN vendor applications\n*Manual static IP changes\n\n====================\nIP Finder has added security\n====================\nNewly developed revised code base using open technologies and using API's for Public IP and Map Tile image locations using GET requests over HTTPS for a added layer of encrypted Security, Please see source code for more details.\n\n====================\nCompatible GNOME shell - 3.36 and newer.", "link": "https://extensions.gnome.org/extension/2983/ip-finder/", "shell_version_map": {"38": {"version": "7", "sha256": "0qnmmg8q6xdv0rg90rzimqzsnggnsq2x8nmz998x59q2ik67kqgq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzXG5cbklQIEZpbmRlciBkaXNwbGF5cyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBhZGRyZXNzLCBob3N0bmFtZSwgY291bnRyeSwgQVMgQmxvY2ssIGFzIHdlbGwgYXMgIGEgbWFwIHRpbGUgb2YgeW91ciBHZW9sb2NhdGlvbiBhbmQgY291bnRyeSBmbGFnLCAgdGhpcyBleHRlbnNpb24gaXMgQWxzbyBVc2VmdWwgZm9yIGluZm9ybWF0aW9uYWwgcHVycG9zZXMgdG8gbW9uaXRvciBWUE4gY2hhbmdlcyBhbmQgcHVibGljIG5ldHdvcmsgSVAgQWRkcmVzc2VzLlxuXG49PT09PT09PT09PT09PT09PT09PT1cbklQIEZpbmRlciBjYW4gbW9uaXRvciBpbiByZWFsIHRpbWVcbj09PT09PT09PT09PT09PT09PT09PVxuKldpcmVndWFyZCBjb25uZWN0aW9uc1xuKk9wZW5WUE4gY29ubmVjdGlvbnNcbipJUFY0LzYgY29ubmVjdGlvbnNcbipQcm94eSBjb25uZWN0aW9uc1xuKlZQTiB2ZW5kb3IgYXBwbGljYXRpb25zXG4qTWFudWFsIHN0YXRpYyBJUCBjaGFuZ2VzXG5cbj09PT09PT09PT09PT09PT09PT09XG5JUCBGaW5kZXIgaGFzIGFkZGVkIHNlY3VyaXR5XG49PT09PT09PT09PT09PT09PT09PVxuTmV3bHkgZGV2ZWxvcGVkIHJldmlzZWQgY29kZSBiYXNlIHVzaW5nIG9wZW4gdGVjaG5vbG9naWVzIGFuZCB1c2luZyBBUEkncyBmb3IgUHVibGljIElQIGFuZCBNYXAgVGlsZSBpbWFnZSBsb2NhdGlvbnMgdXNpbmcgR0VUIHJlcXVlc3RzIG92ZXIgSFRUUFMgZm9yIGEgYWRkZWQgbGF5ZXIgb2YgZW5jcnlwdGVkICBTZWN1cml0eSwgUGxlYXNlIHNlZSBzb3VyY2UgY29kZSBmb3IgbW9yZSBkZXRhaWxzLlxuXG49PT09PT09PT09PT09PT09PT09PVxuQ29tcGF0aWJsZSBHTk9NRSBzaGVsbCAtIDMuMzYgYW5kIG5ld2VyLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJpcC1maW5kZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpcC1maW5kZXIiLAogICJuYW1lIjogIklQIEZpbmRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wdWJsaWMtaXAtYWRkcmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0xpbnhHZW0zMy9JUC1GaW5kZXIiLAogICJ1dWlkIjogIklQLUZpbmRlckBsaW54Z2VtMzMuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "9", "sha256": "1iglj9l7c69ics43r675w4azc7x680n21vfr6jkdha8j47a79sn3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzXG5cbklQIEZpbmRlciBkaXNwbGF5cyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBhZGRyZXNzLCBob3N0bmFtZSwgY291bnRyeSwgQVMgQmxvY2ssIGFzIHdlbGwgYXMgIGEgbWFwIHRpbGUgb2YgeW91ciBHZW9sb2NhdGlvbiBhbmQgY291bnRyeSBmbGFnLCAgdGhpcyBleHRlbnNpb24gaXMgQWxzbyBVc2VmdWwgZm9yIGluZm9ybWF0aW9uYWwgcHVycG9zZXMgdG8gbW9uaXRvciBWUE4gY2hhbmdlcyBhbmQgcHVibGljIG5ldHdvcmsgSVAgQWRkcmVzc2VzLlxuXG49PT09PT09PT09PT09PT09PT09PT1cbklQIEZpbmRlciBjYW4gbW9uaXRvciBpbiByZWFsIHRpbWVcbj09PT09PT09PT09PT09PT09PT09PVxuKldpcmVndWFyZCBjb25uZWN0aW9uc1xuKk9wZW5WUE4gY29ubmVjdGlvbnNcbipJUFY0LzYgY29ubmVjdGlvbnNcbipQcm94eSBjb25uZWN0aW9uc1xuKlZQTiB2ZW5kb3IgYXBwbGljYXRpb25zXG4qTWFudWFsIHN0YXRpYyBJUCBjaGFuZ2VzXG5cbj09PT09PT09PT09PT09PT09PT09XG5JUCBGaW5kZXIgaGFzIGFkZGVkIHNlY3VyaXR5XG49PT09PT09PT09PT09PT09PT09PVxuTmV3bHkgZGV2ZWxvcGVkIHJldmlzZWQgY29kZSBiYXNlIHVzaW5nIG9wZW4gdGVjaG5vbG9naWVzIGFuZCB1c2luZyBBUEkncyBmb3IgUHVibGljIElQIGFuZCBNYXAgVGlsZSBpbWFnZSBsb2NhdGlvbnMgdXNpbmcgR0VUIHJlcXVlc3RzIG92ZXIgSFRUUFMgZm9yIGEgYWRkZWQgbGF5ZXIgb2YgZW5jcnlwdGVkICBTZWN1cml0eSwgUGxlYXNlIHNlZSBzb3VyY2UgY29kZSBmb3IgbW9yZSBkZXRhaWxzLlxuXG49PT09PT09PT09PT09PT09PT09PVxuQ29tcGF0aWJsZSBHTk9NRSBzaGVsbCAtIDMuMzYgYW5kIG5ld2VyLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJpcC1maW5kZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpcC1maW5kZXIiLAogICJuYW1lIjogIklQIEZpbmRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wdWJsaWMtaXAtYWRkcmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vTGlueEdlbTMzL0lQLUZpbmRlciIsCiAgInV1aWQiOiAiSVAtRmluZGVyQGxpbnhnZW0zMy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "1iglj9l7c69ics43r675w4azc7x680n21vfr6jkdha8j47a79sn3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHVzZWZ1bCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBBZGRyZXNzXG5cbklQIEZpbmRlciBkaXNwbGF5cyBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIHB1YmxpYyBJUCBhZGRyZXNzLCBob3N0bmFtZSwgY291bnRyeSwgQVMgQmxvY2ssIGFzIHdlbGwgYXMgIGEgbWFwIHRpbGUgb2YgeW91ciBHZW9sb2NhdGlvbiBhbmQgY291bnRyeSBmbGFnLCAgdGhpcyBleHRlbnNpb24gaXMgQWxzbyBVc2VmdWwgZm9yIGluZm9ybWF0aW9uYWwgcHVycG9zZXMgdG8gbW9uaXRvciBWUE4gY2hhbmdlcyBhbmQgcHVibGljIG5ldHdvcmsgSVAgQWRkcmVzc2VzLlxuXG49PT09PT09PT09PT09PT09PT09PT1cbklQIEZpbmRlciBjYW4gbW9uaXRvciBpbiByZWFsIHRpbWVcbj09PT09PT09PT09PT09PT09PT09PVxuKldpcmVndWFyZCBjb25uZWN0aW9uc1xuKk9wZW5WUE4gY29ubmVjdGlvbnNcbipJUFY0LzYgY29ubmVjdGlvbnNcbipQcm94eSBjb25uZWN0aW9uc1xuKlZQTiB2ZW5kb3IgYXBwbGljYXRpb25zXG4qTWFudWFsIHN0YXRpYyBJUCBjaGFuZ2VzXG5cbj09PT09PT09PT09PT09PT09PT09XG5JUCBGaW5kZXIgaGFzIGFkZGVkIHNlY3VyaXR5XG49PT09PT09PT09PT09PT09PT09PVxuTmV3bHkgZGV2ZWxvcGVkIHJldmlzZWQgY29kZSBiYXNlIHVzaW5nIG9wZW4gdGVjaG5vbG9naWVzIGFuZCB1c2luZyBBUEkncyBmb3IgUHVibGljIElQIGFuZCBNYXAgVGlsZSBpbWFnZSBsb2NhdGlvbnMgdXNpbmcgR0VUIHJlcXVlc3RzIG92ZXIgSFRUUFMgZm9yIGEgYWRkZWQgbGF5ZXIgb2YgZW5jcnlwdGVkICBTZWN1cml0eSwgUGxlYXNlIHNlZSBzb3VyY2UgY29kZSBmb3IgbW9yZSBkZXRhaWxzLlxuXG49PT09PT09PT09PT09PT09PT09PVxuQ29tcGF0aWJsZSBHTk9NRSBzaGVsbCAtIDMuMzYgYW5kIG5ld2VyLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJpcC1maW5kZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpcC1maW5kZXIiLAogICJuYW1lIjogIklQIEZpbmRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wdWJsaWMtaXAtYWRkcmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vTGlueEdlbTMzL0lQLUZpbmRlciIsCiAgInV1aWQiOiAiSVAtRmluZGVyQGxpbnhnZW0zMy5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} -, {"uuid": "runcat@kolesnikov.se", "name": "RunCat", "pname": "runcat", "description": "The cat tells you the CPU usage by running speed", "link": "https://extensions.gnome.org/extension/2986/runcat/", "shell_version_map": {"38": {"version": "15", "sha256": "0crmi0n4vp7rhc6pnml0b1d4pszyhnp30cvj1r80agslvr8x7hgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgIm5hbWUiOiAiUnVuQ2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93aW4wZXJyL2dub21lLXJ1bmNhdCIsCiAgInV1aWQiOiAicnVuY2F0QGtvbGVzbmlrb3Yuc2UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "40": {"version": "15", "sha256": "0crmi0n4vp7rhc6pnml0b1d4pszyhnp30cvj1r80agslvr8x7hgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgIm5hbWUiOiAiUnVuQ2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93aW4wZXJyL2dub21lLXJ1bmNhdCIsCiAgInV1aWQiOiAicnVuY2F0QGtvbGVzbmlrb3Yuc2UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "0crmi0n4vp7rhc6pnml0b1d4pszyhnp30cvj1r80agslvr8x7hgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgIm5hbWUiOiAiUnVuQ2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93aW4wZXJyL2dub21lLXJ1bmNhdCIsCiAgInV1aWQiOiAicnVuY2F0QGtvbGVzbmlrb3Yuc2UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} +, {"uuid": "runcat@kolesnikov.se", "name": "RunCat", "pname": "runcat", "description": "The cat tells you the CPU usage by running speed", "link": "https://extensions.gnome.org/extension/2986/runcat/", "shell_version_map": {"38": {"version": "18", "sha256": "142qhz0ry330gcj9wg2hwa83d9xlsnrcajj0d9c4xaar9mhqc22d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgIm5hbWUiOiAiUnVuQ2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2luMGVyci9nbm9tZS1ydW5jYXQiLAogICJ1dWlkIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "40": {"version": "18", "sha256": "142qhz0ry330gcj9wg2hwa83d9xlsnrcajj0d9c4xaar9mhqc22d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgIm5hbWUiOiAiUnVuQ2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2luMGVyci9nbm9tZS1ydW5jYXQiLAogICJ1dWlkIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "41": {"version": "18", "sha256": "142qhz0ry330gcj9wg2hwa83d9xlsnrcajj0d9c4xaar9mhqc22d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgIm5hbWUiOiAiUnVuQ2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2luMGVyci9nbm9tZS1ydW5jYXQiLAogICJ1dWlkIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "42": {"version": "18", "sha256": "142qhz0ry330gcj9wg2hwa83d9xlsnrcajj0d9c4xaar9mhqc22d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBjYXQgdGVsbHMgeW91IHRoZSBDUFUgdXNhZ2UgYnkgcnVubmluZyBzcGVlZCIsCiAgIm5hbWUiOiAiUnVuQ2F0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vd2luMGVyci9nbm9tZS1ydW5jYXQiLAogICJ1dWlkIjogInJ1bmNhdEBrb2xlc25pa292LnNlIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} , {"uuid": "bowser-gnome@kronosoul.xyz", "name": "Bowser Gnome Extension", "pname": "bowser-gnome-extension", "description": "Create rules to open specific websites in specific web browsers for links clicked in any application on your computer. (emails, chat etc)", "link": "https://extensions.gnome.org/extension/2989/bowser-gnome-extension/", "shell_version_map": {"38": {"version": "10", "sha256": "0y41xz4j24lc50ai8dcvl1l773ral59ixcpvkjq1l82x7baq60pk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwuQm93c2VyIiwKICAiZGVzY3JpcHRpb24iOiAiQ3JlYXRlIHJ1bGVzIHRvIG9wZW4gc3BlY2lmaWMgd2Vic2l0ZXMgaW4gc3BlY2lmaWMgd2ViIGJyb3dzZXJzIGZvciBsaW5rcyBjbGlja2VkIGluIGFueSBhcHBsaWNhdGlvbiBvbiB5b3VyIGNvbXB1dGVyLiAoZW1haWxzLCBjaGF0IGV0YykiLAogICJleHRlbnNpb24taWQiOiAiYm93c2VyLWdub21lIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYm93c2VyLWdub21lIiwKICAibmFtZSI6ICJCb3dzZXIgR25vbWUgRXh0ZW5zaW9uIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImFkbWluQGtyb25vc291bC54eXoiLAogICJyZXNvdXJjZS1wYXRoIjogIi9vcmcva3Jvbm9zb3VsL0Jvd3Nlci8iLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9Cb3dzZXIvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkJvd3NlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsaXBrL2Jvd3Nlci1nbm9tZSIsCiAgInV1aWQiOiAiYm93c2VyLWdub21lQGtyb25vc291bC54eXoiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"uuid": "ideapad@laurento.frittella", "name": "IdeaPad", "pname": "ideapad", "description": "Lenovo IdeaPad goodies for Gnome Shell\n\nAt the moment the extension only provides an easy and user-friendly way to toggle battery conservation mode available on Levono Ideapad laptops and visually get its current state.\n\nConfiguration needed! Please check the instruction on the homepage.", "link": "https://extensions.gnome.org/extension/2992/ideapad/", "shell_version_map": {"38": {"version": "10", "sha256": "0qmgvdhv1s16av3n1nhr366mkx0zci6z9h60yfkk88yk17k3d244", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sYXVyZW50by9nbm9tZS1zaGVsbC1leHRlbnNpb24taWRlYXBhZCIsCiAgInV1aWQiOiAiaWRlYXBhZEBsYXVyZW50by5mcml0dGVsbGEiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "0qmgvdhv1s16av3n1nhr366mkx0zci6z9h60yfkk88yk17k3d244", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sYXVyZW50by9nbm9tZS1zaGVsbC1leHRlbnNpb24taWRlYXBhZCIsCiAgInV1aWQiOiAiaWRlYXBhZEBsYXVyZW50by5mcml0dGVsbGEiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "0qmgvdhv1s16av3n1nhr366mkx0zci6z9h60yfkk88yk17k3d244", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxlbm92byBJZGVhUGFkIGdvb2RpZXMgZm9yIEdub21lIFNoZWxsXG5cbkF0IHRoZSBtb21lbnQgdGhlIGV4dGVuc2lvbiBvbmx5IHByb3ZpZGVzIGFuIGVhc3kgYW5kIHVzZXItZnJpZW5kbHkgd2F5IHRvIHRvZ2dsZSBiYXR0ZXJ5IGNvbnNlcnZhdGlvbiBtb2RlIGF2YWlsYWJsZSBvbiBMZXZvbm8gSWRlYXBhZCBsYXB0b3BzIGFuZCB2aXN1YWxseSBnZXQgaXRzIGN1cnJlbnQgc3RhdGUuXG5cbkNvbmZpZ3VyYXRpb24gbmVlZGVkISBQbGVhc2UgY2hlY2sgdGhlIGluc3RydWN0aW9uIG9uIHRoZSBob21lcGFnZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJpZGVhcGFkIiwKICAibmFtZSI6ICJJZGVhUGFkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sYXVyZW50by9nbm9tZS1zaGVsbC1leHRlbnNpb24taWRlYXBhZCIsCiAgInV1aWQiOiAiaWRlYXBhZEBsYXVyZW50by5mcml0dGVsbGEiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} -, {"uuid": "system-monitor-next@paradoxxx.zero.gmail.com", "name": "system-monitor-next", "pname": "system-monitor-next", "description": "Display system information in GNOME Shell status bar, such as memory, CPU, disk and battery usages, network rates…\n\nThis fork of paradoxxxzero/gnome-shell-system-monitor-applet is for packaging purposes only. This extension is built and updated continuously with the upstream master branch.\n\nThis is preferable for users on bleeding edge distributions that prefer not to wait for a stable release from the main repo. Of course, since we're releasing directly from master some instability is inevitable.\n\nIf you get an error after updating, try restarting Gnome Shell with Alt-F2 then 'r'.", "link": "https://extensions.gnome.org/extension/3010/system-monitor-next/", "shell_version_map": {"40": {"version": "38", "sha256": "0ppfn202x8s97yjd40xkm66pvf4fjddyil720xdpghriggxg5xpl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLlxuXG5UaGlzIGlzIHByZWZlcmFibGUgZm9yIHVzZXJzIG9uIGJsZWVkaW5nIGVkZ2UgZGlzdHJpYnV0aW9ucyB0aGF0IHByZWZlciBub3QgdG8gd2FpdCBmb3IgYSBzdGFibGUgcmVsZWFzZSBmcm9tIHRoZSBtYWluIHJlcG8uIE9mIGNvdXJzZSwgc2luY2Ugd2UncmUgcmVsZWFzaW5nIGRpcmVjdGx5IGZyb20gbWFzdGVyIHNvbWUgaW5zdGFiaWxpdHkgaXMgaW5ldml0YWJsZS5cblxuSWYgeW91IGdldCBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgdHJ5IHJlc3RhcnRpbmcgR25vbWUgU2hlbGwgd2l0aCBBbHQtRjIgdGhlbiAncicuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yLW5leHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3lzdGVtLW1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21nYWxncy9nbm9tZS1zaGVsbC1zeXN0ZW0tbW9uaXRvci1hcHBsZXQiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yLW5leHRAcGFyYWRveHh4Lnplcm8uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM4Cn0="}, "41": {"version": "38", "sha256": "0ppfn202x8s97yjd40xkm66pvf4fjddyil720xdpghriggxg5xpl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLlxuXG5UaGlzIGlzIHByZWZlcmFibGUgZm9yIHVzZXJzIG9uIGJsZWVkaW5nIGVkZ2UgZGlzdHJpYnV0aW9ucyB0aGF0IHByZWZlciBub3QgdG8gd2FpdCBmb3IgYSBzdGFibGUgcmVsZWFzZSBmcm9tIHRoZSBtYWluIHJlcG8uIE9mIGNvdXJzZSwgc2luY2Ugd2UncmUgcmVsZWFzaW5nIGRpcmVjdGx5IGZyb20gbWFzdGVyIHNvbWUgaW5zdGFiaWxpdHkgaXMgaW5ldml0YWJsZS5cblxuSWYgeW91IGdldCBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgdHJ5IHJlc3RhcnRpbmcgR25vbWUgU2hlbGwgd2l0aCBBbHQtRjIgdGhlbiAncicuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yLW5leHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3lzdGVtLW1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21nYWxncy9nbm9tZS1zaGVsbC1zeXN0ZW0tbW9uaXRvci1hcHBsZXQiLAogICJ1dWlkIjogInN5c3RlbS1tb25pdG9yLW5leHRAcGFyYWRveHh4Lnplcm8uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM4Cn0="}}} -, {"uuid": "user-theme-x@tuberry.github.io", "name": "User Themes X", "pname": "user-themes-x", "description": "Customizable user-theme with user stylesheet and dark theme auto-switch support\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3019/user-themes-x/", "shell_version_map": {"38": {"version": "21", "sha256": "08992jny17mbw3gvlfwzgis1ld3wfkkd5fwdyq2c4s6l412fr0mz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogInVzZXItdGhlbWUteCIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMgWCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvdXNlci10aGVtZS14IiwKICAidXVpZCI6ICJ1c2VyLXRoZW1lLXhAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "40": {"version": "24", "sha256": "12scyi48nfbrl2bvhq4rwdcj7vyvpdc86sa8iw1fg3y0cw6vlvq6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogInVzZXItdGhlbWUteCIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMgWCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3VzZXItdGhlbWUteCIsCiAgInV1aWQiOiAidXNlci10aGVtZS14QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "41": {"version": "25", "sha256": "101y4msarf1dglh0g4wybz4dx8zsz2yg8ny2q5rz3xy1cjj8ac5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11c2VyLXRoZW1lLXgiLAogICJuYW1lIjogIlVzZXIgVGhlbWVzIFgiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS91c2VyLXRoZW1lLXgiLAogICJ1dWlkIjogInVzZXItdGhlbWUteEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNQp9"}}} +, {"uuid": "system-monitor-next@paradoxxx.zero.gmail.com", "name": "system-monitor-next", "pname": "system-monitor-next", "description": "Display system information in GNOME Shell status bar, such as memory, CPU, disk and battery usages, network rates…\n\nThis fork of paradoxxxzero/gnome-shell-system-monitor-applet is for packaging purposes only. This extension is built and updated continuously with the upstream master branch.\n\nThis is preferable for users on bleeding edge distributions that prefer not to wait for a stable release from the main repo. Of course, since we're releasing directly from master some instability is inevitable.\n\nIf you get an error after updating, try restarting Gnome Shell with Alt-F2 then 'r'.", "link": "https://extensions.gnome.org/extension/3010/system-monitor-next/", "shell_version_map": {"40": {"version": "39", "sha256": "1nbn2h4izwbbajpyx65n8rhvcpc56irdz6736pg2apzkmkvhqqj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLlxuXG5UaGlzIGlzIHByZWZlcmFibGUgZm9yIHVzZXJzIG9uIGJsZWVkaW5nIGVkZ2UgZGlzdHJpYnV0aW9ucyB0aGF0IHByZWZlciBub3QgdG8gd2FpdCBmb3IgYSBzdGFibGUgcmVsZWFzZSBmcm9tIHRoZSBtYWluIHJlcG8uIE9mIGNvdXJzZSwgc2luY2Ugd2UncmUgcmVsZWFzaW5nIGRpcmVjdGx5IGZyb20gbWFzdGVyIHNvbWUgaW5zdGFiaWxpdHkgaXMgaW5ldml0YWJsZS5cblxuSWYgeW91IGdldCBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgdHJ5IHJlc3RhcnRpbmcgR25vbWUgU2hlbGwgd2l0aCBBbHQtRjIgdGhlbiAncicuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yLW5leHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3lzdGVtLW1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZ2FsZ3MvZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0IiwKICAidXVpZCI6ICJzeXN0ZW0tbW9uaXRvci1uZXh0QHBhcmFkb3h4eC56ZXJvLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}, "41": {"version": "39", "sha256": "1nbn2h4izwbbajpyx65n8rhvcpc56irdz6736pg2apzkmkvhqqj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLlxuXG5UaGlzIGlzIHByZWZlcmFibGUgZm9yIHVzZXJzIG9uIGJsZWVkaW5nIGVkZ2UgZGlzdHJpYnV0aW9ucyB0aGF0IHByZWZlciBub3QgdG8gd2FpdCBmb3IgYSBzdGFibGUgcmVsZWFzZSBmcm9tIHRoZSBtYWluIHJlcG8uIE9mIGNvdXJzZSwgc2luY2Ugd2UncmUgcmVsZWFzaW5nIGRpcmVjdGx5IGZyb20gbWFzdGVyIHNvbWUgaW5zdGFiaWxpdHkgaXMgaW5ldml0YWJsZS5cblxuSWYgeW91IGdldCBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgdHJ5IHJlc3RhcnRpbmcgR25vbWUgU2hlbGwgd2l0aCBBbHQtRjIgdGhlbiAncicuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yLW5leHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3lzdGVtLW1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZ2FsZ3MvZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0IiwKICAidXVpZCI6ICJzeXN0ZW0tbW9uaXRvci1uZXh0QHBhcmFkb3h4eC56ZXJvLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}, "42": {"version": "39", "sha256": "1nbn2h4izwbbajpyx65n8rhvcpc56irdz6736pg2apzkmkvhqqj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2XG5cblRoaXMgZm9yayBvZiBwYXJhZG94eHh6ZXJvL2dub21lLXNoZWxsLXN5c3RlbS1tb25pdG9yLWFwcGxldCBpcyBmb3IgcGFja2FnaW5nIHB1cnBvc2VzIG9ubHkuIFRoaXMgZXh0ZW5zaW9uIGlzIGJ1aWx0IGFuZCB1cGRhdGVkIGNvbnRpbnVvdXNseSB3aXRoIHRoZSB1cHN0cmVhbSBtYXN0ZXIgYnJhbmNoLlxuXG5UaGlzIGlzIHByZWZlcmFibGUgZm9yIHVzZXJzIG9uIGJsZWVkaW5nIGVkZ2UgZGlzdHJpYnV0aW9ucyB0aGF0IHByZWZlciBub3QgdG8gd2FpdCBmb3IgYSBzdGFibGUgcmVsZWFzZSBmcm9tIHRoZSBtYWluIHJlcG8uIE9mIGNvdXJzZSwgc2luY2Ugd2UncmUgcmVsZWFzaW5nIGRpcmVjdGx5IGZyb20gbWFzdGVyIHNvbWUgaW5zdGFiaWxpdHkgaXMgaW5ldml0YWJsZS5cblxuSWYgeW91IGdldCBhbiBlcnJvciBhZnRlciB1cGRhdGluZywgdHJ5IHJlc3RhcnRpbmcgR25vbWUgU2hlbGwgd2l0aCBBbHQtRjIgdGhlbiAncicuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yLW5leHQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3lzdGVtLW1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZ2FsZ3MvZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0IiwKICAidXVpZCI6ICJzeXN0ZW0tbW9uaXRvci1uZXh0QHBhcmFkb3h4eC56ZXJvLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzOQp9"}}} +, {"uuid": "user-theme-x@tuberry.github.io", "name": "User Themes X", "pname": "user-themes-x", "description": "Customizable user-theme with user stylesheet and dark theme auto-switch support\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3019/user-themes-x/", "shell_version_map": {"38": {"version": "21", "sha256": "08992jny17mbw3gvlfwzgis1ld3wfkkd5fwdyq2c4s6l412fr0mz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogInVzZXItdGhlbWUteCIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMgWCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvdXNlci10aGVtZS14IiwKICAidXVpZCI6ICJ1c2VyLXRoZW1lLXhAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "40": {"version": "24", "sha256": "12scyi48nfbrl2bvhq4rwdcj7vyvpdc86sa8iw1fg3y0cw6vlvq6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogInVzZXItdGhlbWUteCIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMgWCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3VzZXItdGhlbWUteCIsCiAgInV1aWQiOiAidXNlci10aGVtZS14QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "41": {"version": "25", "sha256": "101y4msarf1dglh0g4wybz4dx8zsz2yg8ny2q5rz3xy1cjj8ac5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11c2VyLXRoZW1lLXgiLAogICJuYW1lIjogIlVzZXIgVGhlbWVzIFgiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS91c2VyLXRoZW1lLXgiLAogICJ1dWlkIjogInVzZXItdGhlbWUteEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNQp9"}, "42": {"version": "28", "sha256": "0bszimlk03j49v9f8ab6kv3chg8p29zg6ms3l1nvicdifxyp534g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11c2VyLXRoZW1lLXgiLAogICJuYW1lIjogIlVzZXIgVGhlbWVzIFgiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS91c2VyLXRoZW1lLXgiLAogICJ1dWlkIjogInVzZXItdGhlbWUteEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyOAp9"}}} , {"uuid": "app_view_text@fawtytoo", "name": "Application View Text", "pname": "application-view-text", "description": "The text in the Application view can be hard to read on a light coloured background. This extension makes the text bolder with a drop shadow.\nAlso improves the visibility of the app running dot.", "link": "https://extensions.gnome.org/extension/3028/application-view-text/", "shell_version_map": {"38": {"version": "7", "sha256": "1dnf1rqg27y1c50sfmqcnswac93lkgml1hdaalq6lfzm8pbnpx0d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB0ZXh0IGluIHRoZSBBcHBsaWNhdGlvbiB2aWV3IGNhbiBiZSBoYXJkIHRvIHJlYWQgb24gYSBsaWdodCBjb2xvdXJlZCBiYWNrZ3JvdW5kLiBUaGlzIGV4dGVuc2lvbiBtYWtlcyB0aGUgdGV4dCBib2xkZXIgd2l0aCBhIGRyb3Agc2hhZG93LlxuQWxzbyBpbXByb3ZlcyB0aGUgdmlzaWJpbGl0eSBvZiB0aGUgYXBwIHJ1bm5pbmcgZG90LiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb24gVmlldyBUZXh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwX3ZpZXdfdGV4dEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "1dnf1rqg27y1c50sfmqcnswac93lkgml1hdaalq6lfzm8pbnpx0d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB0ZXh0IGluIHRoZSBBcHBsaWNhdGlvbiB2aWV3IGNhbiBiZSBoYXJkIHRvIHJlYWQgb24gYSBsaWdodCBjb2xvdXJlZCBiYWNrZ3JvdW5kLiBUaGlzIGV4dGVuc2lvbiBtYWtlcyB0aGUgdGV4dCBib2xkZXIgd2l0aCBhIGRyb3Agc2hhZG93LlxuQWxzbyBpbXByb3ZlcyB0aGUgdmlzaWJpbGl0eSBvZiB0aGUgYXBwIHJ1bm5pbmcgZG90LiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb24gVmlldyBUZXh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwX3ZpZXdfdGV4dEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1dnf1rqg27y1c50sfmqcnswac93lkgml1hdaalq6lfzm8pbnpx0d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB0ZXh0IGluIHRoZSBBcHBsaWNhdGlvbiB2aWV3IGNhbiBiZSBoYXJkIHRvIHJlYWQgb24gYSBsaWdodCBjb2xvdXJlZCBiYWNrZ3JvdW5kLiBUaGlzIGV4dGVuc2lvbiBtYWtlcyB0aGUgdGV4dCBib2xkZXIgd2l0aCBhIGRyb3Agc2hhZG93LlxuQWxzbyBpbXByb3ZlcyB0aGUgdmlzaWJpbGl0eSBvZiB0aGUgYXBwIHJ1bm5pbmcgZG90LiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb24gVmlldyBUZXh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwX3ZpZXdfdGV4dEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "vpn-snx-indicator@als.kz", "name": "VPN and SNX Indicator", "pname": "vpn-and-snx-indicator", "description": "A status indicator for a VPN and SNX(Check Point) connection.", "link": "https://extensions.gnome.org/extension/3049/vpn-and-snx-indicator/", "shell_version_map": {"38": {"version": "8", "sha256": "1mns39frrabpfdvmc7jcqxrlxs1mnjimdwa69hv5lawf0r498h9g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgYSBWUE4gYW5kIFNOWChDaGVjayBQb2ludCkgY29ubmVjdGlvbi4iLAogICJuYW1lIjogIlZQTiBhbmQgU05YIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L3Zwbi1pbmRpY2F0b3Itc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ2cG4tc254LWluZGljYXRvckBhbHMua3oiLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "1mns39frrabpfdvmc7jcqxrlxs1mnjimdwa69hv5lawf0r498h9g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgYSBWUE4gYW5kIFNOWChDaGVjayBQb2ludCkgY29ubmVjdGlvbi4iLAogICJuYW1lIjogIlZQTiBhbmQgU05YIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L3Zwbi1pbmRpY2F0b3Itc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ2cG4tc254LWluZGljYXRvckBhbHMua3oiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "vlan-switcher@darcato.github.io", "name": "VLAN Switcher", "pname": "vlan-switcher", "description": "Activate and deactivate VLAN connections from the system panel.", "link": "https://extensions.gnome.org/extension/3061/vlan-switcher/", "shell_version_map": {"38": {"version": "2", "sha256": "10qly2cldlrca96akywhw0cg5rmihh5b2mqs6sfrrincmnf0vnfw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIGFuZCBkZWFjdGl2YXRlIFZMQU4gY29ubmVjdGlvbnMgZnJvbSB0aGUgc3lzdGVtIHBhbmVsLiIsCiAgIm5hbWUiOiAiVkxBTiBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYXJjYXRvL2dub21lLXZsYW4tc3dpdGNoZXIiLAogICJ1dWlkIjogInZsYW4tc3dpdGNoZXJAZGFyY2F0by5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "10qly2cldlrca96akywhw0cg5rmihh5b2mqs6sfrrincmnf0vnfw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIGFuZCBkZWFjdGl2YXRlIFZMQU4gY29ubmVjdGlvbnMgZnJvbSB0aGUgc3lzdGVtIHBhbmVsLiIsCiAgIm5hbWUiOiAiVkxBTiBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYXJjYXRvL2dub21lLXZsYW4tc3dpdGNoZXIiLAogICJ1dWlkIjogInZsYW4tc3dpdGNoZXJAZGFyY2F0by5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}}} -, {"uuid": "ssss@tu.berry", "name": "Simple Subscriber", "pname": "ss-subscriber", "description": "Simple shadowsocks subscriber (SSD only), yet another proxy switcher for GNOME Shell\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3073/ss-subscriber/", "shell_version_map": {"38": {"version": "18", "sha256": "03gryl577559h2l1s3adi5gxa8ivp454p4lq7jng1db6smlpj95a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcy1zdWJzY3JpYmVyIiwKICAibmFtZSI6ICJTaW1wbGUgU3Vic2NyaWJlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcy1zdWJzY3JpYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9zcy1zdWJzY3JpYmVyIiwKICAidXVpZCI6ICJzc3NzQHR1LmJlcnJ5IiwKICAidmVyc2lvbiI6IDE4Cn0="}, "40": {"version": "20", "sha256": "075d00xsbmr4qs554p2anddhkmgcx7xd4nn8prgmf4wpyfk87552", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcy1zdWJzY3JpYmVyIiwKICAibmFtZSI6ICJTaW1wbGUgU3Vic2NyaWJlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcy1zdWJzY3JpYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc3Mtc3Vic2NyaWJlciIsCiAgInV1aWQiOiAic3Nzc0B0dS5iZXJyeSIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "21", "sha256": "06ybzk62fbi88iqssl4pw0amsbcp09pnw99wxanh2jlvaakqgday", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3Mtc3Vic2NyaWJlciIsCiAgIm5hbWUiOiAiU2ltcGxlIFN1YnNjcmliZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3Mtc3Vic2NyaWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NzLXN1YnNjcmliZXIiLAogICJ1dWlkIjogInNzc3NAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}}} -, {"uuid": "extension-list@tu.berry", "name": "Extension List", "pname": "extension-list", "description": "Simple GNOME Shell extension manager in the top panel\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3088/extension-list/", "shell_version_map": {"38": {"version": "25", "sha256": "0cwabswbb5p0z156488ag095h558hf541650vfnjgw4nas7v2ccx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVuc2lvbi1saXN0IiwKICAibmFtZSI6ICJFeHRlbnNpb24gTGlzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHRlbnNpb24tbGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvZXh0ZW5zaW9uLWxpc3QiLAogICJ1dWlkIjogImV4dGVuc2lvbi1saXN0QHR1LmJlcnJ5IiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "27", "sha256": "0m13qzzbbx5rnq8a9xn09nvr3dy9zqkp8y9529y12250wyjafl1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVuc2lvbi1saXN0IiwKICAibmFtZSI6ICJFeHRlbnNpb24gTGlzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHRlbnNpb24tbGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2V4dGVuc2lvbi1saXN0IiwKICAidXVpZCI6ICJleHRlbnNpb24tbGlzdEB0dS5iZXJyeSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "29", "sha256": "1yl2b9phvrgsdpkwqjfqpaqi2xcj5bcd4zabqkrfwngqsg17s85j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}}} +, {"uuid": "ssss@tu.berry", "name": "Simple Subscriber", "pname": "ss-subscriber", "description": "Simple shadowsocks subscriber (SSD only), yet another proxy switcher for GNOME Shell\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3073/ss-subscriber/", "shell_version_map": {"38": {"version": "18", "sha256": "03gryl577559h2l1s3adi5gxa8ivp454p4lq7jng1db6smlpj95a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcy1zdWJzY3JpYmVyIiwKICAibmFtZSI6ICJTaW1wbGUgU3Vic2NyaWJlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcy1zdWJzY3JpYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9zcy1zdWJzY3JpYmVyIiwKICAidXVpZCI6ICJzc3NzQHR1LmJlcnJ5IiwKICAidmVyc2lvbiI6IDE4Cn0="}, "40": {"version": "20", "sha256": "075d00xsbmr4qs554p2anddhkmgcx7xd4nn8prgmf4wpyfk87552", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcy1zdWJzY3JpYmVyIiwKICAibmFtZSI6ICJTaW1wbGUgU3Vic2NyaWJlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcy1zdWJzY3JpYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc3Mtc3Vic2NyaWJlciIsCiAgInV1aWQiOiAic3Nzc0B0dS5iZXJyeSIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "21", "sha256": "06ybzk62fbi88iqssl4pw0amsbcp09pnw99wxanh2jlvaakqgday", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3Mtc3Vic2NyaWJlciIsCiAgIm5hbWUiOiAiU2ltcGxlIFN1YnNjcmliZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3Mtc3Vic2NyaWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NzLXN1YnNjcmliZXIiLAogICJ1dWlkIjogInNzc3NAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "42": {"version": "23", "sha256": "078111h68zv03n6i4yw9jgdn9idxb91qpami64xl5g1rc75sc91w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3Mtc3Vic2NyaWJlciIsCiAgIm5hbWUiOiAiU2ltcGxlIFN1YnNjcmliZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3Mtc3Vic2NyaWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NzLXN1YnNjcmliZXIiLAogICJ1dWlkIjogInNzc3NAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} +, {"uuid": "extension-list@tu.berry", "name": "Extension List", "pname": "extension-list", "description": "Simple GNOME Shell extension manager in the top panel\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3088/extension-list/", "shell_version_map": {"38": {"version": "25", "sha256": "0cwabswbb5p0z156488ag095h558hf541650vfnjgw4nas7v2ccx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVuc2lvbi1saXN0IiwKICAibmFtZSI6ICJFeHRlbnNpb24gTGlzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHRlbnNpb24tbGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvZXh0ZW5zaW9uLWxpc3QiLAogICJ1dWlkIjogImV4dGVuc2lvbi1saXN0QHR1LmJlcnJ5IiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "27", "sha256": "0m13qzzbbx5rnq8a9xn09nvr3dy9zqkp8y9529y12250wyjafl1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVuc2lvbi1saXN0IiwKICAibmFtZSI6ICJFeHRlbnNpb24gTGlzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHRlbnNpb24tbGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2V4dGVuc2lvbi1saXN0IiwKICAidXVpZCI6ICJleHRlbnNpb24tbGlzdEB0dS5iZXJyeSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "29", "sha256": "1yl2b9phvrgsdpkwqjfqpaqi2xcj5bcd4zabqkrfwngqsg17s85j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "42": {"version": "30", "sha256": "1hnidb1f6cawfhmkql4y8kz3rq0ibqcfk678yz1n12l2gp3vvvz3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMzAKfQ=="}}} , {"uuid": "MaximizeToEmptyWorkspace-extension@kaisersite.de", "name": "Maximize To Empty Workspace", "pname": "maximize-to-empty-workspace", "description": "New and maximized windows will be moved to empty workspaces.\nSupports multiple monitors.", "link": "https://extensions.gnome.org/extension/3100/maximize-to-empty-workspace/", "shell_version_map": {"38": {"version": "10", "sha256": "05gi4r8wq8bnb1b5476w5h737swg0rdkm7fq1g2l2c9hg0h9r007", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlIiwKICAidXVpZCI6ICJNYXhpbWl6ZVRvRW1wdHlXb3Jrc3BhY2UtZXh0ZW5zaW9uQGthaXNlcnNpdGUuZGUiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "05gi4r8wq8bnb1b5476w5h737swg0rdkm7fq1g2l2c9hg0h9r007", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlIiwKICAidXVpZCI6ICJNYXhpbWl6ZVRvRW1wdHlXb3Jrc3BhY2UtZXh0ZW5zaW9uQGthaXNlcnNpdGUuZGUiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "05gi4r8wq8bnb1b5476w5h737swg0rdkm7fq1g2l2c9hg0h9r007", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thaXNlcmFjbS9nbm9tZS1zaGVsbC1leHRlbnNpb24tbWF4aW1pemUtdG8tZW1wdHktd29ya3NwYWNlIiwKICAidXVpZCI6ICJNYXhpbWl6ZVRvRW1wdHlXb3Jrc3BhY2UtZXh0ZW5zaW9uQGthaXNlcnNpdGUuZGUiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"uuid": "eye-extended@als.kz", "name": "Eye and Mouse Extended", "pname": "eye-extended", "description": "Adds an eye to the indicator bar that follows your cursor \nYou can also display the mouse indicator, perhaps it will help you with the problem of displaying the mouse cursor in Skype", "link": "https://extensions.gnome.org/extension/3139/eye-extended/", "shell_version_map": {"38": {"version": "9", "sha256": "1y2bgk2kww0g3f1d93s1w15g5xihjbipq40wr08f41jr8l53v9ay", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gZXllIHRvIHRoZSBpbmRpY2F0b3IgYmFyIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvciBcbllvdSBjYW4gYWxzbyBkaXNwbGF5IHRoZSBtb3VzZSBpbmRpY2F0b3IsIHBlcmhhcHMgaXQgd2lsbCBoZWxwIHlvdSB3aXRoIHRoZSBwcm9ibGVtIG9mIGRpc3BsYXlpbmcgdGhlIG1vdXNlIGN1cnNvciBpbiBTa3lwZSIsCiAgImdldHRleHQtZG9tYWluIjogIkV5ZUV4dGVuZGVkIiwKICAibmFtZSI6ICJFeWUgYW5kIE1vdXNlIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImt6LmFscy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMCIsCiAgICAiMy4zOC4wIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZXlsb3ZjaGlrb3YvZXllLWV4dGVuZGVkLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZXllLWV4dGVuZGVkQGFscy5reiIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "9", "sha256": "1y2bgk2kww0g3f1d93s1w15g5xihjbipq40wr08f41jr8l53v9ay", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gZXllIHRvIHRoZSBpbmRpY2F0b3IgYmFyIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvciBcbllvdSBjYW4gYWxzbyBkaXNwbGF5IHRoZSBtb3VzZSBpbmRpY2F0b3IsIHBlcmhhcHMgaXQgd2lsbCBoZWxwIHlvdSB3aXRoIHRoZSBwcm9ibGVtIG9mIGRpc3BsYXlpbmcgdGhlIG1vdXNlIGN1cnNvciBpbiBTa3lwZSIsCiAgImdldHRleHQtZG9tYWluIjogIkV5ZUV4dGVuZGVkIiwKICAibmFtZSI6ICJFeWUgYW5kIE1vdXNlIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImt6LmFscy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMCIsCiAgICAiMy4zOC4wIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZXlsb3ZjaGlrb3YvZXllLWV4dGVuZGVkLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZXllLWV4dGVuZGVkQGFscy5reiIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "1y2bgk2kww0g3f1d93s1w15g5xihjbipq40wr08f41jr8l53v9ay", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gZXllIHRvIHRoZSBpbmRpY2F0b3IgYmFyIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvciBcbllvdSBjYW4gYWxzbyBkaXNwbGF5IHRoZSBtb3VzZSBpbmRpY2F0b3IsIHBlcmhhcHMgaXQgd2lsbCBoZWxwIHlvdSB3aXRoIHRoZSBwcm9ibGVtIG9mIGRpc3BsYXlpbmcgdGhlIG1vdXNlIGN1cnNvciBpbiBTa3lwZSIsCiAgImdldHRleHQtZG9tYWluIjogIkV5ZUV4dGVuZGVkIiwKICAibmFtZSI6ICJFeWUgYW5kIE1vdXNlIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImt6LmFscy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMCIsCiAgICAiMy4zOC4wIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZXlsb3ZjaGlrb3YvZXllLWV4dGVuZGVkLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZXllLWV4dGVuZGVkQGFscy5reiIsCiAgInZlcnNpb24iOiA5Cn0="}}} -, {"uuid": "wireguard-indicator@gregos.me", "name": "Wireguard Indicator", "pname": "wireguard-indicator", "description": "Enable, disable, and view details of Wireguard.\nDeveloped by Gregos-Winus.", "link": "https://extensions.gnome.org/extension/3160/wireguard-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "blur-my-shell@aunetx", "name": "Blur my Shell", "pname": "blur-my-shell", "description": "Adds a blur look to different parts of the GNOME Shell, including the top panel, dash and overview.\n\nYou can support my work by sponsoring me on:\n- github: https://github.com/sponsors/aunetx\n- ko-fi: https://ko-fi.com/aunetx", "link": "https://extensions.gnome.org/extension/3193/blur-my-shell/", "shell_version_map": {"38": {"version": "22", "sha256": "03vvxjdk7dfzx1crr5axp9qf4gg9lsh043zddcir8sj64m3mkz2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eCIsCiAgIm5hbWUiOiAiQmx1ciBteSBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "27", "sha256": "0v0m4gy46wlv33vz2kxi69mdjmny262p2pb4qj3zshkcqh03mswz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eCIsCiAgIm5hbWUiOiAiQmx1ciBteSBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1ibHVyLW15LXNoZWxsIiwKICAidXVpZCI6ICJibHVyLW15LXNoZWxsQGF1bmV0eCIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "0v0m4gy46wlv33vz2kxi69mdjmny262p2pb4qj3zshkcqh03mswz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eCIsCiAgIm5hbWUiOiAiQmx1ciBteSBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1ibHVyLW15LXNoZWxsIiwKICAidXVpZCI6ICJibHVyLW15LXNoZWxsQGF1bmV0eCIsCiAgInZlcnNpb24iOiAyNwp9"}}} +, {"uuid": "wireguard-indicator@gregos.me", "name": "Wireguard Indicator", "pname": "wireguard-indicator", "description": "Enable, disable, and view details of Wireguard.\nDeveloped by Gregos-Winus.", "link": "https://extensions.gnome.org/extension/3160/wireguard-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "blur-my-shell@aunetx", "name": "Blur my Shell", "pname": "blur-my-shell", "description": "Adds a blur look to different parts of the GNOME Shell, including the top panel, dash and overview.\n\nYou can support my work by sponsoring me on:\n- github: https://github.com/sponsors/aunetx\n- ko-fi: https://ko-fi.com/aunetx", "link": "https://extensions.gnome.org/extension/3193/blur-my-shell/", "shell_version_map": {"38": {"version": "22", "sha256": "03vvxjdk7dfzx1crr5axp9qf4gg9lsh043zddcir8sj64m3mkz2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eCIsCiAgIm5hbWUiOiAiQmx1ciBteSBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "28", "sha256": "1b1vz0ixns3ssbfkyijjvmdf29j1sqig58wdsmixfgsl48ql9d56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eCIsCiAgIm5hbWUiOiAiQmx1ciBteSBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "41": {"version": "28", "sha256": "1b1vz0ixns3ssbfkyijjvmdf29j1sqig58wdsmixfgsl48ql9d56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eCIsCiAgIm5hbWUiOiAiQmx1ciBteSBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "42": {"version": "28", "sha256": "1b1vz0ixns3ssbfkyijjvmdf29j1sqig58wdsmixfgsl48ql9d56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eCIsCiAgIm5hbWUiOiAiQmx1ciBteSBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}}} , {"uuid": "escape-overview@raelgc", "name": "ESCape Overview", "pname": "escape-overview", "description": "Close the Overview with a single ESC press when searchbox is empty.\n\nThe default gnome-shell behaviour is, during first ESC press, clean the searchbox, then second ESC press get back to Activities overview and then third ESC press will finally close the overview.", "link": "https://extensions.gnome.org/extension/3204/escape-overview/", "shell_version_map": {"38": {"version": "4", "sha256": "1yzba3d57s57wvviyr1gm1k5l15lnm7krhdcq6gv8gd5c80l3f02", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBPdmVydmlldyB3aXRoIGEgc2luZ2xlIEVTQyBwcmVzcyB3aGVuIHNlYXJjaGJveCBpcyBlbXB0eS5cblxuVGhlIGRlZmF1bHQgZ25vbWUtc2hlbGwgYmVoYXZpb3VyIGlzLCBkdXJpbmcgZmlyc3QgRVNDIHByZXNzLCBjbGVhbiB0aGUgc2VhcmNoYm94LCB0aGVuIHNlY29uZCBFU0MgcHJlc3MgZ2V0IGJhY2sgdG8gQWN0aXZpdGllcyBvdmVydmlldyBhbmQgdGhlbiB0aGlyZCBFU0MgcHJlc3Mgd2lsbCBmaW5hbGx5IGNsb3NlIHRoZSBvdmVydmlldy4iLAogICJuYW1lIjogIkVTQ2FwZSBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFlbGdjL2VzY2FwZS1vdmVydmlldyIsCiAgInV1aWQiOiAiZXNjYXBlLW92ZXJ2aWV3QHJhZWxnYyIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1yzba3d57s57wvviyr1gm1k5l15lnm7krhdcq6gv8gd5c80l3f02", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBPdmVydmlldyB3aXRoIGEgc2luZ2xlIEVTQyBwcmVzcyB3aGVuIHNlYXJjaGJveCBpcyBlbXB0eS5cblxuVGhlIGRlZmF1bHQgZ25vbWUtc2hlbGwgYmVoYXZpb3VyIGlzLCBkdXJpbmcgZmlyc3QgRVNDIHByZXNzLCBjbGVhbiB0aGUgc2VhcmNoYm94LCB0aGVuIHNlY29uZCBFU0MgcHJlc3MgZ2V0IGJhY2sgdG8gQWN0aXZpdGllcyBvdmVydmlldyBhbmQgdGhlbiB0aGlyZCBFU0MgcHJlc3Mgd2lsbCBmaW5hbGx5IGNsb3NlIHRoZSBvdmVydmlldy4iLAogICJuYW1lIjogIkVTQ2FwZSBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFlbGdjL2VzY2FwZS1vdmVydmlldyIsCiAgInV1aWQiOiAiZXNjYXBlLW92ZXJ2aWV3QHJhZWxnYyIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1yzba3d57s57wvviyr1gm1k5l15lnm7krhdcq6gv8gd5c80l3f02", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBPdmVydmlldyB3aXRoIGEgc2luZ2xlIEVTQyBwcmVzcyB3aGVuIHNlYXJjaGJveCBpcyBlbXB0eS5cblxuVGhlIGRlZmF1bHQgZ25vbWUtc2hlbGwgYmVoYXZpb3VyIGlzLCBkdXJpbmcgZmlyc3QgRVNDIHByZXNzLCBjbGVhbiB0aGUgc2VhcmNoYm94LCB0aGVuIHNlY29uZCBFU0MgcHJlc3MgZ2V0IGJhY2sgdG8gQWN0aXZpdGllcyBvdmVydmlldyBhbmQgdGhlbiB0aGlyZCBFU0MgcHJlc3Mgd2lsbCBmaW5hbGx5IGNsb3NlIHRoZSBvdmVydmlldy4iLAogICJuYW1lIjogIkVTQ2FwZSBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFlbGdjL2VzY2FwZS1vdmVydmlldyIsCiAgInV1aWQiOiAiZXNjYXBlLW92ZXJ2aWV3QHJhZWxnYyIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "compiz-windows-effect@hermes83.github.com", "name": "Compiz windows effect", "pname": "compiz-windows-effect", "description": "Compiz wobbly windows effect thanks to libanimation engine.\n\nThe use of the \"js engine\" option NOT requires any external library, orherwise you need to install the LIBANIMATION library patched for Gnome Shell: \nhttps://github.com/hermes83/libanimation\n\nNB:\nIn case of update error please restart Gnome Shell (on Xorg press ALT+F2 then write r and press enter, on Wayland end the session and log in again)\n\n-----------------------------------\n Video\n-----------------------------------\nhttps://youtu.be/G8bAVIB9A7A", "link": "https://extensions.gnome.org/extension/3210/compiz-windows-effect/", "shell_version_map": {"38": {"version": "10", "sha256": "0s2pprlc0wi2ln45c6bj9gzh6rg3bkc1dxn85dq1c7r4h6ib14x2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGxpYmFuaW1hdGlvbiBlbmdpbmUuXG5cblRoZSB1c2Ugb2YgdGhlIFwianMgZW5naW5lXCIgb3B0aW9uIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeSwgb3JoZXJ3aXNlIHlvdSBuZWVkIHRvIGluc3RhbGwgdGhlIExJQkFOSU1BVElPTiBsaWJyYXJ5IHBhdGNoZWQgZm9yIEdub21lIFNoZWxsOiBcbmh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9saWJhbmltYXRpb25cblxuTkI6XG5JbiBjYXNlIG9mIHVwZGF0ZSBlcnJvciBwbGVhc2UgcmVzdGFydCBHbm9tZSBTaGVsbCAob24gWG9yZyBwcmVzcyBBTFQrRjIgdGhlbiB3cml0ZSByIGFuZCBwcmVzcyBlbnRlciwgb24gV2F5bGFuZCBlbmQgdGhlIHNlc3Npb24gYW5kIGxvZyBpbiBhZ2FpbilcblxuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgVmlkZW9cbi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5odHRwczovL3lvdXR1LmJlL0c4YkFWSUI5QTdBIiwKICAibmFtZSI6ICJDb21waXogd2luZG93cyBlZmZlY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei13aW5kb3dzLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LXdpbmRvd3MtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "0s2pprlc0wi2ln45c6bj9gzh6rg3bkc1dxn85dq1c7r4h6ib14x2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGxpYmFuaW1hdGlvbiBlbmdpbmUuXG5cblRoZSB1c2Ugb2YgdGhlIFwianMgZW5naW5lXCIgb3B0aW9uIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeSwgb3JoZXJ3aXNlIHlvdSBuZWVkIHRvIGluc3RhbGwgdGhlIExJQkFOSU1BVElPTiBsaWJyYXJ5IHBhdGNoZWQgZm9yIEdub21lIFNoZWxsOiBcbmh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9saWJhbmltYXRpb25cblxuTkI6XG5JbiBjYXNlIG9mIHVwZGF0ZSBlcnJvciBwbGVhc2UgcmVzdGFydCBHbm9tZSBTaGVsbCAob24gWG9yZyBwcmVzcyBBTFQrRjIgdGhlbiB3cml0ZSByIGFuZCBwcmVzcyBlbnRlciwgb24gV2F5bGFuZCBlbmQgdGhlIHNlc3Npb24gYW5kIGxvZyBpbiBhZ2FpbilcblxuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgVmlkZW9cbi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5odHRwczovL3lvdXR1LmJlL0c4YkFWSUI5QTdBIiwKICAibmFtZSI6ICJDb21waXogd2luZG93cyBlZmZlY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei13aW5kb3dzLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LXdpbmRvd3MtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "0s2pprlc0wi2ln45c6bj9gzh6rg3bkc1dxn85dq1c7r4h6ib14x2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGxpYmFuaW1hdGlvbiBlbmdpbmUuXG5cblRoZSB1c2Ugb2YgdGhlIFwianMgZW5naW5lXCIgb3B0aW9uIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeSwgb3JoZXJ3aXNlIHlvdSBuZWVkIHRvIGluc3RhbGwgdGhlIExJQkFOSU1BVElPTiBsaWJyYXJ5IHBhdGNoZWQgZm9yIEdub21lIFNoZWxsOiBcbmh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9saWJhbmltYXRpb25cblxuTkI6XG5JbiBjYXNlIG9mIHVwZGF0ZSBlcnJvciBwbGVhc2UgcmVzdGFydCBHbm9tZSBTaGVsbCAob24gWG9yZyBwcmVzcyBBTFQrRjIgdGhlbiB3cml0ZSByIGFuZCBwcmVzcyBlbnRlciwgb24gV2F5bGFuZCBlbmQgdGhlIHNlc3Npb24gYW5kIGxvZyBpbiBhZ2FpbilcblxuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgVmlkZW9cbi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5odHRwczovL3lvdXR1LmJlL0c4YkFWSUI5QTdBIiwKICAibmFtZSI6ICJDb21waXogd2luZG93cyBlZmZlY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlcm1lczgzL2NvbXBpei13aW5kb3dzLWVmZmVjdCIsCiAgInV1aWQiOiAiY29tcGl6LXdpbmRvd3MtZWZmZWN0QGhlcm1lczgzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} +, {"uuid": "compiz-windows-effect@hermes83.github.com", "name": "Compiz windows effect", "pname": "compiz-windows-effect", "description": "Compiz wobbly windows effect thanks to libanimation engine.\n\nThe use of the \"js engine\" option NOT requires any external library, orherwise you need to install the LIBANIMATION library patched for Gnome Shell: \nhttps://github.com/hermes83/libanimation\n\nNB:\nIn case of update error please restart Gnome Shell (on Xorg press ALT+F2 then write r and press enter, on Wayland end the session and log in again)\n\n-----------------------------------\n Video\n-----------------------------------\nhttps://youtu.be/G8bAVIB9A7A", "link": "https://extensions.gnome.org/extension/3210/compiz-windows-effect/", "shell_version_map": {"38": {"version": "12", "sha256": "10jdlgjbk2xa1qkk7hq4g17lbjdp5bk3pxwrf5irfdjix05l1zpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGxpYmFuaW1hdGlvbiBlbmdpbmUuXG5cblRoZSB1c2Ugb2YgdGhlIFwianMgZW5naW5lXCIgb3B0aW9uIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeSwgb3JoZXJ3aXNlIHlvdSBuZWVkIHRvIGluc3RhbGwgdGhlIExJQkFOSU1BVElPTiBsaWJyYXJ5IHBhdGNoZWQgZm9yIEdub21lIFNoZWxsOiBcbmh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9saWJhbmltYXRpb25cblxuTkI6XG5JbiBjYXNlIG9mIHVwZGF0ZSBlcnJvciBwbGVhc2UgcmVzdGFydCBHbm9tZSBTaGVsbCAob24gWG9yZyBwcmVzcyBBTFQrRjIgdGhlbiB3cml0ZSByIGFuZCBwcmVzcyBlbnRlciwgb24gV2F5bGFuZCBlbmQgdGhlIHNlc3Npb24gYW5kIGxvZyBpbiBhZ2FpbilcblxuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgVmlkZW9cbi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5odHRwczovL3lvdXR1LmJlL0c4YkFWSUI5QTdBIiwKICAibmFtZSI6ICJDb21waXogd2luZG93cyBlZmZlY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "10jdlgjbk2xa1qkk7hq4g17lbjdp5bk3pxwrf5irfdjix05l1zpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGxpYmFuaW1hdGlvbiBlbmdpbmUuXG5cblRoZSB1c2Ugb2YgdGhlIFwianMgZW5naW5lXCIgb3B0aW9uIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeSwgb3JoZXJ3aXNlIHlvdSBuZWVkIHRvIGluc3RhbGwgdGhlIExJQkFOSU1BVElPTiBsaWJyYXJ5IHBhdGNoZWQgZm9yIEdub21lIFNoZWxsOiBcbmh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9saWJhbmltYXRpb25cblxuTkI6XG5JbiBjYXNlIG9mIHVwZGF0ZSBlcnJvciBwbGVhc2UgcmVzdGFydCBHbm9tZSBTaGVsbCAob24gWG9yZyBwcmVzcyBBTFQrRjIgdGhlbiB3cml0ZSByIGFuZCBwcmVzcyBlbnRlciwgb24gV2F5bGFuZCBlbmQgdGhlIHNlc3Npb24gYW5kIGxvZyBpbiBhZ2FpbilcblxuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgVmlkZW9cbi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5odHRwczovL3lvdXR1LmJlL0c4YkFWSUI5QTdBIiwKICAibmFtZSI6ICJDb21waXogd2luZG93cyBlZmZlY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "10jdlgjbk2xa1qkk7hq4g17lbjdp5bk3pxwrf5irfdjix05l1zpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGxpYmFuaW1hdGlvbiBlbmdpbmUuXG5cblRoZSB1c2Ugb2YgdGhlIFwianMgZW5naW5lXCIgb3B0aW9uIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeSwgb3JoZXJ3aXNlIHlvdSBuZWVkIHRvIGluc3RhbGwgdGhlIExJQkFOSU1BVElPTiBsaWJyYXJ5IHBhdGNoZWQgZm9yIEdub21lIFNoZWxsOiBcbmh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9saWJhbmltYXRpb25cblxuTkI6XG5JbiBjYXNlIG9mIHVwZGF0ZSBlcnJvciBwbGVhc2UgcmVzdGFydCBHbm9tZSBTaGVsbCAob24gWG9yZyBwcmVzcyBBTFQrRjIgdGhlbiB3cml0ZSByIGFuZCBwcmVzcyBlbnRlciwgb24gV2F5bGFuZCBlbmQgdGhlIHNlc3Npb24gYW5kIGxvZyBpbiBhZ2FpbilcblxuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgVmlkZW9cbi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5odHRwczovL3lvdXR1LmJlL0c4YkFWSUI5QTdBIiwKICAibmFtZSI6ICJDb21waXogd2luZG93cyBlZmZlY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "10jdlgjbk2xa1qkk7hq4g17lbjdp5bk3pxwrf5irfdjix05l1zpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbXBpeiB3b2JibHkgd2luZG93cyBlZmZlY3QgdGhhbmtzIHRvIGxpYmFuaW1hdGlvbiBlbmdpbmUuXG5cblRoZSB1c2Ugb2YgdGhlIFwianMgZW5naW5lXCIgb3B0aW9uIE5PVCByZXF1aXJlcyBhbnkgZXh0ZXJuYWwgbGlicmFyeSwgb3JoZXJ3aXNlIHlvdSBuZWVkIHRvIGluc3RhbGwgdGhlIExJQkFOSU1BVElPTiBsaWJyYXJ5IHBhdGNoZWQgZm9yIEdub21lIFNoZWxsOiBcbmh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9saWJhbmltYXRpb25cblxuTkI6XG5JbiBjYXNlIG9mIHVwZGF0ZSBlcnJvciBwbGVhc2UgcmVzdGFydCBHbm9tZSBTaGVsbCAob24gWG9yZyBwcmVzcyBBTFQrRjIgdGhlbiB3cml0ZSByIGFuZCBwcmVzcyBlbnRlciwgb24gV2F5bGFuZCBlbmQgdGhlIHNlc3Npb24gYW5kIGxvZyBpbiBhZ2FpbilcblxuLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS1cbiAgVmlkZW9cbi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5odHRwczovL3lvdXR1LmJlL0c4YkFWSUI5QTdBIiwKICAibmFtZSI6ICJDb21waXogd2luZG93cyBlZmZlY3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotd2luZG93cy1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei13aW5kb3dzLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"uuid": "EndSessionTimer@pratap.fastmail.fm", "name": "End Session Timer", "pname": "end-session-timer", "description": "Set End Session Timer between 5 to 60 Seconds", "link": "https://extensions.gnome.org/extension/3216/end-session-timer/", "shell_version_map": {"38": {"version": "7", "sha256": "0c3wfx1iksb67fq3hm8cprhwb2f6xykkr4fv4y4drf78f15sh5gm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBFbmQgU2Vzc2lvbiBUaW1lciBiZXR3ZWVuIDUgdG8gNjAgU2Vjb25kcyIsCiAgIm5hbWUiOiAiRW5kIFNlc3Npb24gVGltZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiRW5kU2Vzc2lvblRpbWVyQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "8", "sha256": "0mm9g2ldl2lw52plx3hpbaniqlci1c10q9blkbdpwcmyv53z1dq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBFbmQgU2Vzc2lvbiBUaW1lciBiZXR3ZWVuIDUgdG8gNjAgU2Vjb25kcyIsCiAgIm5hbWUiOiAiRW5kIFNlc3Npb24gVGltZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkVuZFNlc3Npb25UaW1lckBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "block-caribou-36@lxylxy123456.ercli.dev", "name": "Block Caribou 36", "pname": "block-caribou-36", "description": "Blocks caribou (the on screen keyboard) from popping up when you use a touchscreen. Even if it's disabled in the accessibility services menu. Continuation of keringar's work. Tested on GNOME Shell version 3.36 - 41 on Fedora 32 - 35. For a higher version see https://github.com/lxylxy123456/cariboublocker#installing-on-high-gnome-shell-version .", "link": "https://extensions.gnome.org/extension/3222/block-caribou-36/", "shell_version_map": {"40": {"version": "4", "sha256": "1bnkwdsmsjr7x9cx31lfzs3dnfqzmdy8cq1zc26hgpvchd02ac60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsb2NrcyBjYXJpYm91ICh0aGUgb24gc2NyZWVuIGtleWJvYXJkKSBmcm9tIHBvcHBpbmcgdXAgd2hlbiB5b3UgdXNlIGEgdG91Y2hzY3JlZW4uIEV2ZW4gaWYgaXQncyBkaXNhYmxlZCBpbiB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlcyBtZW51LiBDb250aW51YXRpb24gb2Yga2VyaW5nYXIncyB3b3JrLiBUZXN0ZWQgb24gR05PTUUgU2hlbGwgdmVyc2lvbiAzLjM2IC0gNDEgb24gRmVkb3JhIDMyIC0gMzUuIEZvciBhIGhpZ2hlciB2ZXJzaW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyI2luc3RhbGxpbmctb24taGlnaC1nbm9tZS1zaGVsbC12ZXJzaW9uIC4iLAogICJuYW1lIjogIkJsb2NrIENhcmlib3UgMzYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x4eWx4eTEyMzQ1Ni9jYXJpYm91YmxvY2tlciIsCiAgInV1aWQiOiAiYmxvY2stY2FyaWJvdS0zNkBseHlseHkxMjM0NTYuZXJjbGkuZGV2IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1bnkwdsmsjr7x9cx31lfzs3dnfqzmdy8cq1zc26hgpvchd02ac60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsb2NrcyBjYXJpYm91ICh0aGUgb24gc2NyZWVuIGtleWJvYXJkKSBmcm9tIHBvcHBpbmcgdXAgd2hlbiB5b3UgdXNlIGEgdG91Y2hzY3JlZW4uIEV2ZW4gaWYgaXQncyBkaXNhYmxlZCBpbiB0aGUgYWNjZXNzaWJpbGl0eSBzZXJ2aWNlcyBtZW51LiBDb250aW51YXRpb24gb2Yga2VyaW5nYXIncyB3b3JrLiBUZXN0ZWQgb24gR05PTUUgU2hlbGwgdmVyc2lvbiAzLjM2IC0gNDEgb24gRmVkb3JhIDMyIC0gMzUuIEZvciBhIGhpZ2hlciB2ZXJzaW9uIHNlZSBodHRwczovL2dpdGh1Yi5jb20vbHh5bHh5MTIzNDU2L2Nhcmlib3VibG9ja2VyI2luc3RhbGxpbmctb24taGlnaC1nbm9tZS1zaGVsbC12ZXJzaW9uIC4iLAogICJuYW1lIjogIkJsb2NrIENhcmlib3UgMzYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x4eWx4eTEyMzQ1Ni9jYXJpYm91YmxvY2tlciIsCiAgInV1aWQiOiAiYmxvY2stY2FyaWJvdS0zNkBseHlseHkxMjM0NTYuZXJjbGkuZGV2IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "unmaximize_double_click@gonza.gmail.com", "name": "Unmaximize Double Click Panel", "pname": "unmaximize-double-click-panel", "description": "Unmaximize the current window on double click on the top panel. You can also maximize horizontally and vertically with middle and right click.", "link": "https://extensions.gnome.org/extension/3228/unmaximize-double-click-panel/", "shell_version_map": {"38": {"version": "3", "sha256": "17xpxzxqx6zgr484xxa9sz78f90mmdq7ihgnhfmlmscsz10v5h3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbnphYXJjci91bm1heGltaXplLWdub21lLWV4dCIsCiAgInV1aWQiOiAidW5tYXhpbWl6ZV9kb3VibGVfY2xpY2tAZ29uemEuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "17xpxzxqx6zgr484xxa9sz78f90mmdq7ihgnhfmlmscsz10v5h3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbnphYXJjci91bm1heGltaXplLWdub21lLWV4dCIsCiAgInV1aWQiOiAidW5tYXhpbWl6ZV9kb3VibGVfY2xpY2tAZ29uemEuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "unity-like-appswitcher@gonza.com", "name": "Unity-like App Switcher", "pname": "unity-like-app-switcher", "description": "A bigger and more colourfull AppSwitcher", "link": "https://extensions.gnome.org/extension/3231/unity-like-app-switcher/", "shell_version_map": {"38": {"version": "6", "sha256": "0s5mza4x2hk6k95hm7xsyxhariffhb896676fhh5qriphxsrif2q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VuaXR5LWxpa2Utc3dpdGNoZXItZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bml0eS1saWtlLWFwcHN3aXRjaGVyQGdvbnphLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "0s5mza4x2hk6k95hm7xsyxhariffhb896676fhh5qriphxsrif2q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VuaXR5LWxpa2Utc3dpdGNoZXItZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bml0eS1saWtlLWFwcHN3aXRjaGVyQGdvbnphLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} +, {"uuid": "unmaximize_double_click@gonza.gmail.com", "name": "Unmaximize Double Click Panel", "pname": "unmaximize-double-click-panel", "description": "Unmaximize the current window on double click on the top panel. You can also maximize horizontally and vertically with middle and right click.", "link": "https://extensions.gnome.org/extension/3228/unmaximize-double-click-panel/", "shell_version_map": {"38": {"version": "5", "sha256": "1frrdzf5c5pn259ibz3fncgh8jgjjdkhy4ymb08h0klkfncgjgkh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VubWF4aW1pemUtZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bm1heGltaXplX2RvdWJsZV9jbGlja0Bnb256YS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1frrdzf5c5pn259ibz3fncgh8jgjjdkhy4ymb08h0klkfncgjgkh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VubWF4aW1pemUtZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bm1heGltaXplX2RvdWJsZV9jbGlja0Bnb256YS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1frrdzf5c5pn259ibz3fncgh8jgjjdkhy4ymb08h0klkfncgjgkh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VubWF4aW1pemUtZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bm1heGltaXplX2RvdWJsZV9jbGlja0Bnb256YS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "1frrdzf5c5pn259ibz3fncgh8jgjjdkhy4ymb08h0klkfncgjgkh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VubWF4aW1pemUtZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bm1heGltaXplX2RvdWJsZV9jbGlja0Bnb256YS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "unity-like-appswitcher@gonza.com", "name": "Unity-like App Switcher", "pname": "unity-like-app-switcher", "description": "A bigger and more colourfull AppSwitcher", "link": "https://extensions.gnome.org/extension/3231/unity-like-app-switcher/", "shell_version_map": {"38": {"version": "11", "sha256": "17bgnl10ycb8mrw0g2f8vi3fkbjh8n9f52w243mkdi4kcwjqpgwa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "17bgnl10ycb8mrw0g2f8vi3fkbjh8n9f52w243mkdi4kcwjqpgwa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "17bgnl10ycb8mrw0g2f8vi3fkbjh8n9f52w243mkdi4kcwjqpgwa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "17bgnl10ycb8mrw0g2f8vi3fkbjh8n9f52w243mkdi4kcwjqpgwa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "add-to-desktop@tommimon.github.com", "name": "Add to Desktop", "pname": "add-to-desktop", "description": "An easy way to create desktop app shortcut in gnome", "link": "https://extensions.gnome.org/extension/3240/add-to-desktop/", "shell_version_map": {"38": {"version": "5", "sha256": "0kchr5daz3s4q18s6aphfyb50wglmlgmjnh3i9ka6d219r0srh64", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLmJldGEiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tbWltb24vYWRkLXRvLWRlc2t0b3AiLAogICJ1dWlkIjogImFkZC10by1kZXNrdG9wQHRvbW1pbW9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "0kchr5daz3s4q18s6aphfyb50wglmlgmjnh3i9ka6d219r0srh64", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLmJldGEiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tbWltb24vYWRkLXRvLWRlc2t0b3AiLAogICJ1dWlkIjogImFkZC10by1kZXNrdG9wQHRvbW1pbW9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "6", "sha256": "04vk49629c9fhvix04h8r3mbnqyncvyzdkbm7bh3wyjhghnczbps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tbWltb24vYWRkLXRvLWRlc2t0b3AiLAogICJ1dWlkIjogImFkZC10by1kZXNrdG9wQHRvbW1pbW9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "wifi-power-management-toggle@rthery", "name": "Wi-Fi Power Management Toggle", "pname": "wi-fi-power-management-toggle", "description": "Add a toggle to limit Wi-Fi power consumption (when supported by the card) in Gnome System Menu.", "link": "https://extensions.gnome.org/extension/3258/wi-fi-power-management-toggle/", "shell_version_map": {"38": {"version": "2", "sha256": "009r1pswkmisfw0zghk2cawx4qw6av5yldbnw7fcla13qpyj90zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBsaW1pdCBXaS1GaSBwb3dlciBjb25zdW1wdGlvbiAod2hlbiBzdXBwb3J0ZWQgYnkgdGhlIGNhcmQpIGluIEdub21lIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiV2ktRmkgUG93ZXIgTWFuYWdlbWVudCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3J0aGVyeS9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaS1wb3dlci1tYW5hZ2VtZW50LXRvZ2dsZSIsCiAgInV1aWQiOiAid2lmaS1wb3dlci1tYW5hZ2VtZW50LXRvZ2dsZUBydGhlcnkiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "009r1pswkmisfw0zghk2cawx4qw6av5yldbnw7fcla13qpyj90zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBsaW1pdCBXaS1GaSBwb3dlciBjb25zdW1wdGlvbiAod2hlbiBzdXBwb3J0ZWQgYnkgdGhlIGNhcmQpIGluIEdub21lIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiV2ktRmkgUG93ZXIgTWFuYWdlbWVudCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3J0aGVyeS9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaS1wb3dlci1tYW5hZ2VtZW50LXRvZ2dsZSIsCiAgInV1aWQiOiAid2lmaS1wb3dlci1tYW5hZ2VtZW50LXRvZ2dsZUBydGhlcnkiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "009r1pswkmisfw0zghk2cawx4qw6av5yldbnw7fcla13qpyj90zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBsaW1pdCBXaS1GaSBwb3dlciBjb25zdW1wdGlvbiAod2hlbiBzdXBwb3J0ZWQgYnkgdGhlIGNhcmQpIGluIEdub21lIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiV2ktRmkgUG93ZXIgTWFuYWdlbWVudCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3J0aGVyeS9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaS1wb3dlci1tYW5hZ2VtZW50LXRvZ2dsZSIsCiAgInV1aWQiOiAid2lmaS1wb3dlci1tYW5hZ2VtZW50LXRvZ2dsZUBydGhlcnkiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "touchpad_window_switcher@gonza.com", "name": "Touchpad Window Switcher", "pname": "tocuhpad-window-switcher", "description": "3 fingers window switcher. To make it work on Xorg check the service on github.\n\nUp - down: toggle between overview and show desktop (Needs Super+D shorcut to be set on Xorg. Set it with `gsettings set org.gnome.desktop.wm.keybindings show-desktop 'd'`).\n\nYou can also change windows by going to the overview (up) and moving to the left and right, and choosing the window with down. The overview is modified so it’s shown in chronological order.\n", "link": "https://extensions.gnome.org/extension/3294/tocuhpad-window-switcher/", "shell_version_map": {"38": {"version": "8", "sha256": "1x016p30z0pci3qlhpmfqrsgy0vwcfxqladny66ppbb32qisbkac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIjMgZmluZ2VycyB3aW5kb3cgc3dpdGNoZXIuIFRvIG1ha2UgaXQgd29yayBvbiBYb3JnIGNoZWNrIHRoZSBzZXJ2aWNlIG9uIGdpdGh1Yi5cblxuVXAgLSBkb3duOiB0b2dnbGUgYmV0d2VlbiBvdmVydmlldyBhbmQgc2hvdyBkZXNrdG9wIChOZWVkcyBTdXBlcitEIHNob3JjdXQgdG8gYmUgc2V0IG9uIFhvcmcuIFNldCBpdCB3aXRoIGBnc2V0dGluZ3Mgc2V0IG9yZy5nbm9tZS5kZXNrdG9wLndtLmtleWJpbmRpbmdzIHNob3ctZGVza3RvcCAnPFN1cGVyPmQnYCkuXG5cbllvdSBjYW4gYWxzbyBjaGFuZ2Ugd2luZG93cyBieSBnb2luZyB0byB0aGUgb3ZlcnZpZXcgKHVwKSBhbmQgbW92aW5nIHRvIHRoZSBsZWZ0IGFuZCByaWdodCwgYW5kIGNob29zaW5nIHRoZSB3aW5kb3cgd2l0aCBkb3duLiBUaGUgb3ZlcnZpZXcgaXMgbW9kaWZpZWQgc28gaXRcdTIwMTlzIHNob3duIGluIGNocm9ub2xvZ2ljYWwgb3JkZXIuXG4iLAogICJuYW1lIjogIlRvdWNocGFkIFdpbmRvdyBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbnphYXJjci90b3VjaHBhZC13aW5kb3ctc3dpdGNoZXItZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ0b3VjaHBhZF93aW5kb3dfc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "gnome-shell-duckduckgo-search-provider@keithcirkel.co.uk", "name": "DuckDuckGo Search Provider", "pname": "duckduckgo-search-provider", "description": "Add DuckDuckGo search suggestions to Gnome Shell Search", "link": "https://extensions.gnome.org/extension/3306/duckduckgo-search-provider/", "shell_version_map": {"38": {"version": "3", "sha256": "1id10vxz5dfq53wbiz8spqkr6d9qvs9dsykxpff29an96lzybj1w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "1id10vxz5dfq53wbiz8spqkr6d9qvs9dsykxpff29an96lzybj1w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "translate-indicator@athenstaedt.net", "name": "Translate Indicator", "pname": "translate-indicator", "description": "Translate extension for Gnome-Shell - based on translate-shell, inspired by Tudmotu's clipboard-indicator and gufoe's text-translator", "link": "https://extensions.gnome.org/extension/3318/translate-indicator/", "shell_version_map": {"38": {"version": "3", "sha256": "04c3hjbcbn8y9d94swmc3qiv63sjynn71jnwp08sgqa79nrn4cyg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsIC0gYmFzZWQgb24gdHJhbnNsYXRlLXNoZWxsLCBpbnNwaXJlZCBieSBUdWRtb3R1J3MgY2xpcGJvYXJkLWluZGljYXRvciBhbmQgZ3Vmb2UncyB0ZXh0LXRyYW5zbGF0b3IiLAogICJuYW1lIjogIlRyYW5zbGF0ZSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXZlbnV6L2dub21lLXRyYW5zbGF0ZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1pbmRpY2F0b3JAYXRoZW5zdGFlZHQubmV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "material-shell@papyelgringo", "name": "Material Shell", "pname": "material-shell", "description": "Disclaimer: If you experience instability try to disable other extensions since they can be incompatible and cause Material Shell to missbehave.\nA modern desktop interface for Linux - packaged as an extension for GNOME Shell. Improve your user experience and get rid of the anarchy of traditional desktop workflows. Designed to simplify navigation and reduce the need to manipulate windows in order to improve productivity. It's meant to be 100% predictable and bring the benefits of tools coveted by professionals to everyone.", "link": "https://extensions.gnome.org/extension/3357/material-shell/", "shell_version_map": {"38": {"version": "12", "sha256": "01izrrnichjk3bn2d0blr0dyqqz3dqhq85yw1xqmp4ccfnqnydy7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJEaXNjbGFpbWVyOiBJZiB5b3UgZXhwZXJpZW5jZSBpbnN0YWJpbGl0eSB0cnkgdG8gZGlzYWJsZSBvdGhlciBleHRlbnNpb25zIHNpbmNlIHRoZXkgY2FuIGJlIGluY29tcGF0aWJsZSBhbmQgY2F1c2UgTWF0ZXJpYWwgU2hlbGwgdG8gbWlzc2JlaGF2ZS5cbkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidGhlbWUiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50aGVtZSIsCiAgInR3ZWFrcyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLnR3ZWFrcyIsCiAgInVybCI6ICJodHRwczovL21hdGVyaWFsLXNoZWxsLmNvbSIsCiAgInV1aWQiOiAibWF0ZXJpYWwtc2hlbGxAcGFweWVsZ3JpbmdvIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "17", "sha256": "0y1pbsr8fgvk1fqj52kq0ima26mf01xyzk3pyv8lhhjgmxjzqhhz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJEaXNjbGFpbWVyOiBJZiB5b3UgZXhwZXJpZW5jZSBpbnN0YWJpbGl0eSB0cnkgdG8gZGlzYWJsZSBvdGhlciBleHRlbnNpb25zIHNpbmNlIHRoZXkgY2FuIGJlIGluY29tcGF0aWJsZSBhbmQgY2F1c2UgTWF0ZXJpYWwgU2hlbGwgdG8gbWlzc2JlaGF2ZS5cbkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ0aGVtZSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLnRoZW1lIiwKICAidHdlYWtzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudHdlYWtzIiwKICAidXJsIjogImh0dHBzOi8vbWF0ZXJpYWwtc2hlbGwuY29tIiwKICAidXVpZCI6ICJtYXRlcmlhbC1zaGVsbEBwYXB5ZWxncmluZ28iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "0y1pbsr8fgvk1fqj52kq0ima26mf01xyzk3pyv8lhhjgmxjzqhhz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJEaXNjbGFpbWVyOiBJZiB5b3UgZXhwZXJpZW5jZSBpbnN0YWJpbGl0eSB0cnkgdG8gZGlzYWJsZSBvdGhlciBleHRlbnNpb25zIHNpbmNlIHRoZXkgY2FuIGJlIGluY29tcGF0aWJsZSBhbmQgY2F1c2UgTWF0ZXJpYWwgU2hlbGwgdG8gbWlzc2JlaGF2ZS5cbkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ0aGVtZSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLnRoZW1lIiwKICAidHdlYWtzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudHdlYWtzIiwKICAidXJsIjogImh0dHBzOi8vbWF0ZXJpYWwtc2hlbGwuY29tIiwKICAidXVpZCI6ICJtYXRlcmlhbC1zaGVsbEBwYXB5ZWxncmluZ28iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} +, {"uuid": "material-shell@papyelgringo", "name": "Material Shell", "pname": "material-shell", "description": "A modern desktop interface for Linux - packaged as an extension for GNOME Shell. Improve your user experience and get rid of the anarchy of traditional desktop workflows. Designed to simplify navigation and reduce the need to manipulate windows in order to improve productivity. It's meant to be 100% predictable and bring the benefits of tools coveted by professionals to everyone.", "link": "https://extensions.gnome.org/extension/3357/material-shell/", "shell_version_map": {"38": {"version": "12", "sha256": "1rjybqlgbjmflg21cm7js2gjzvdhw14lpzncpzwf18rh4mp2adnr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJBIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "18", "sha256": "1qnldrad5kkm2km4qdkwagp8m2x30bq56jzaba01h6j7mgw90ai6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJBIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidGhlbWUiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50aGVtZSIsCiAgInR3ZWFrcyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLnR3ZWFrcyIsCiAgInVybCI6ICJodHRwczovL21hdGVyaWFsLXNoZWxsLmNvbSIsCiAgInV1aWQiOiAibWF0ZXJpYWwtc2hlbGxAcGFweWVsZ3JpbmdvIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "41": {"version": "18", "sha256": "1qnldrad5kkm2km4qdkwagp8m2x30bq56jzaba01h6j7mgw90ai6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJBIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidGhlbWUiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50aGVtZSIsCiAgInR3ZWFrcyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLnR3ZWFrcyIsCiAgInVybCI6ICJodHRwczovL21hdGVyaWFsLXNoZWxsLmNvbSIsCiAgInV1aWQiOiAibWF0ZXJpYWwtc2hlbGxAcGFweWVsZ3JpbmdvIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} , {"uuid": "proxyprofiles@massamany.github.com", "name": "Proxy Profiles", "pname": "proxy-profiles", "description": "Swich easily between several proxy profiles.", "link": "https://extensions.gnome.org/extension/3379/proxy-profiles/", "shell_version_map": {"38": {"version": "5", "sha256": "1b2mabrvpkadxc6v5fczamh2hqh7va2990k10awxy18c0vm3p5kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aWNoIGVhc2lseSBiZXR3ZWVuIHNldmVyYWwgcHJveHkgcHJvZmlsZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJveHlwcm9maWxlcyIsCiAgIm5hbWUiOiAiUHJveHkgUHJvZmlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFzc2FtYW55L3Byb3h5cHJvZmlsZXMiLAogICJ1dWlkIjogInByb3h5cHJvZmlsZXNAbWFzc2FtYW55LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1b2mabrvpkadxc6v5fczamh2hqh7va2990k10awxy18c0vm3p5kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aWNoIGVhc2lseSBiZXR3ZWVuIHNldmVyYWwgcHJveHkgcHJvZmlsZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJveHlwcm9maWxlcyIsCiAgIm5hbWUiOiAiUHJveHkgUHJvZmlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFzc2FtYW55L3Byb3h5cHJvZmlsZXMiLAogICJ1dWlkIjogInByb3h5cHJvZmlsZXNAbWFzc2FtYW55LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "galaxy-buds-battery@pemmoura", "name": "Galaxy Buds Battery", "pname": "galaxy-buds-battery", "description": "Galaxy Buds battery indicator.", "link": "https://extensions.gnome.org/extension/3383/galaxy-buds-battery/", "shell_version_map": {"38": {"version": "6", "sha256": "1f25mc5idqaw3v9b2xffiij9y0pcrl8msz85p8cz2x5l2r3sc7wm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdhbGF4eSBCdWRzIGJhdHRlcnkgaW5kaWNhdG9yLiIsCiAgIm5hbWUiOiAiR2FsYXh5IEJ1ZHMgQmF0dGVyeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BlbW1vdXJhL2dhbGF4eWJ1ZHMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnYWxheHktYnVkcy1iYXR0ZXJ5QHBlbW1vdXJhIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} -, {"uuid": "color-picker@tuberry", "name": "Color Picker", "pname": "color-picker", "description": "Simple color picker for gnome shell\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3396/color-picker/", "shell_version_map": {"38": {"version": "20", "sha256": "1ss4r8dpa7smxbyz41rw3wl1gy20bvy89xdvwfz6zfhv3db5vl86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yLXBpY2tlciIsCiAgIm5hbWUiOiAiQ29sb3IgUGlja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yLXBpY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvY29sb3ItcGlja2VyIiwKICAidXVpZCI6ICJjb2xvci1waWNrZXJAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "25", "sha256": "0lx4bs7yfqkphb5cwmakl6xjf14q89m0yn70a882drakfhzgnagw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yLXBpY2tlciIsCiAgIm5hbWUiOiAiQ29sb3IgUGlja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yLXBpY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2NvbG9yLXBpY2tlciIsCiAgInV1aWQiOiAiY29sb3ItcGlja2VyQHR1YmVycnkiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "27", "sha256": "1scc0cgdzrg9rmpr090myrsxhfgp03aqld9jh4grqbfza6lrz4jd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDI3Cn0="}}} +, {"uuid": "color-picker@tuberry", "name": "Color Picker", "pname": "color-picker", "description": "Simple color picker for gnome shell\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3396/color-picker/", "shell_version_map": {"38": {"version": "20", "sha256": "1ss4r8dpa7smxbyz41rw3wl1gy20bvy89xdvwfz6zfhv3db5vl86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yLXBpY2tlciIsCiAgIm5hbWUiOiAiQ29sb3IgUGlja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yLXBpY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvY29sb3ItcGlja2VyIiwKICAidXVpZCI6ICJjb2xvci1waWNrZXJAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "25", "sha256": "0lx4bs7yfqkphb5cwmakl6xjf14q89m0yn70a882drakfhzgnagw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yLXBpY2tlciIsCiAgIm5hbWUiOiAiQ29sb3IgUGlja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yLXBpY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2NvbG9yLXBpY2tlciIsCiAgInV1aWQiOiAiY29sb3ItcGlja2VyQHR1YmVycnkiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "27", "sha256": "1scc0cgdzrg9rmpr090myrsxhfgp03aqld9jh4grqbfza6lrz4jd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDI3Cn0="}, "42": {"version": "29", "sha256": "1hkjym4nkx3d984bm2j7lppg9k837vbm50wb65z1rjnm872r4vk8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDI5Cn0="}}} , {"uuid": "yaru-remix-theme-toggle@muqtxdir.me", "name": "Yaru remix theme toggle", "pname": "yaru-remix-theme-toggle", "description": "Switches GTK3, Gnome-shell, cursor and icon themes to Yaru-remix variants", "link": "https://extensions.gnome.org/extension/3402/yaru-remix-theme-toggle/", "shell_version_map": {"38": {"version": "2", "sha256": "04dh163dshjnq3fa1y5kbkgl94q4cifvffq6i2pr4zd1v7d4zrf6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvcnMiOiBbCiAgICAibXVxdGFkaXI1NTU1QGdtYWlsLmNvbSIKICBdLAogICJkZXNjcmlwdGlvbiI6ICJTd2l0Y2hlcyBHVEszLCBHbm9tZS1zaGVsbCwgY3Vyc29yIGFuZCBpY29uIHRoZW1lcyB0byBZYXJ1LXJlbWl4IHZhcmlhbnRzIiwKICAibmFtZSI6ICJZYXJ1IHJlbWl4IHRoZW1lIHRvZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL011cXR4ZGlyL3lhcnUtcmVtaXgtdGhlbWUtdG9nZ2xlIiwKICAidXVpZCI6ICJ5YXJ1LXJlbWl4LXRoZW1lLXRvZ2dsZUBtdXF0eGRpci5tZSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "ascii_emoji_buckets@HarshKhandeparkar", "name": "ASCII Emoji Buckets", "pname": "ascii-emoji-buckets", "description": "Buckets of ASCII emojis for your messaging pleasure. A fork of Emoji Buckets.", "link": "https://extensions.gnome.org/extension/3408/ascii-emoji-buckets/", "shell_version_map": {"38": {"version": "9", "sha256": "1srqsjzcywywlhapaca41v4pc99w503m5532g6cc6qwz9f2r4w5h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1Y2tldHMgb2YgQVNDSUkgZW1vamlzIGZvciB5b3VyIG1lc3NhZ2luZyBwbGVhc3VyZS4gQSBmb3JrIG9mIEVtb2ppIEJ1Y2tldHMuIiwKICAibmFtZSI6ICJBU0NJSSBFbW9qaSBCdWNrZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFzY2lpLWVtb2ppLWJ1Y2tldHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjMuMzguMSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0hhcnNoS2hhbmRlcGFya2FyL2dub21lLWFzY2lpLWVtb2ppLWJ1Y2tldHMiLAogICJ1dWlkIjogImFzY2lpX2Vtb2ppX2J1Y2tldHNASGFyc2hLaGFuZGVwYXJrYXIiLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "user-stylesheet@tomaszgasior.pl", "name": "User style sheet & font", "pname": "user-stylesheet-font", "description": "Load custom style sheet from ~/.config/gnome-shell/gnome-shell.css. Use GTK font family and font size from GNOME Tweaks in GNOME Shell.", "link": "https://extensions.gnome.org/extension/3414/user-stylesheet-font/", "shell_version_map": {"38": {"version": "4", "sha256": "1ibmhj1ixw063r7p8fwnanf4k21k8vxmll78ydqia5gdwkv79i8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "1ibmhj1ixw063r7p8fwnanf4k21k8vxmll78ydqia5gdwkv79i8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1ibmhj1ixw063r7p8fwnanf4k21k8vxmll78ydqia5gdwkv79i8a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvYWQgY3VzdG9tIHN0eWxlIHNoZWV0IGZyb20gfi8uY29uZmlnL2dub21lLXNoZWxsL2dub21lLXNoZWxsLmNzcy4gVXNlIEdUSyBmb250IGZhbWlseSBhbmQgZm9udCBzaXplIGZyb20gR05PTUUgVHdlYWtzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiVXNlciBzdHlsZSBzaGVldCAmIGZvbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbWFzekdhc2lvci9nbm9tZS1zaGVsbC11c2VyLXN0eWxlc2hlZXQtYW5kLWZvbnQiLAogICJ1dWlkIjogInVzZXItc3R5bGVzaGVldEB0b21hc3pnYXNpb3IucGwiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "wg-indicator@dpf12110.gmail.com", "name": "WG Indicator", "pname": "wg-indicator", "description": "A status indicator for Wireguard connections.", "link": "https://extensions.gnome.org/extension/3418/wg-indicator/", "shell_version_map": {"40": {"version": "13", "sha256": "126n9gbvh1yshbvx74af01f7jyrjr4p0299x9ki171d1f40djrvs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgV2lyZWd1YXJkIGNvbm5lY3Rpb25zLiIsCiAgIm5hbWUiOiAiV0cgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyLjEiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N5bmMxMjExL3dnLWluZGljYXRvciIsCiAgInV1aWQiOiAid2ctaW5kaWNhdG9yQGRwZjEyMTEwLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "126n9gbvh1yshbvx74af01f7jyrjr4p0299x9ki171d1f40djrvs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgV2lyZWd1YXJkIGNvbm5lY3Rpb25zLiIsCiAgIm5hbWUiOiAiV0cgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyLjEiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N5bmMxMjExL3dnLWluZGljYXRvciIsCiAgInV1aWQiOiAid2ctaW5kaWNhdG9yQGRwZjEyMTEwLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} -, {"uuid": "flypie@schneegans.github.com", "name": "Fly-Pie", "pname": "fly-pie", "description": "A marking menu which can be used to launch applications, simulate hotkeys, open URLs and much more.", "link": "https://extensions.gnome.org/extension/3433/fly-pie/", "shell_version_map": {"38": {"version": "13", "sha256": "0spqd46cyzlazg29rdnpkqcyiqyrkx610265hdf2whbh5y5cmvpc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImZseXBpZSIsCiAgIm5hbWUiOiAiRmx5LVBpZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbHlwaWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRmx5LVBpZSIsCiAgInV1aWQiOiAiZmx5cGllQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "0spqd46cyzlazg29rdnpkqcyiqyrkx610265hdf2whbh5y5cmvpc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImZseXBpZSIsCiAgIm5hbWUiOiAiRmx5LVBpZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbHlwaWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRmx5LVBpZSIsCiAgInV1aWQiOiAiZmx5cGllQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "0spqd46cyzlazg29rdnpkqcyiqyrkx610265hdf2whbh5y5cmvpc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImZseXBpZSIsCiAgIm5hbWUiOiAiRmx5LVBpZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbHlwaWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRmx5LVBpZSIsCiAgInV1aWQiOiAiZmx5cGllQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} +, {"uuid": "flypie@schneegans.github.com", "name": "Fly-Pie", "pname": "fly-pie", "description": "A marking menu which can be used to launch applications, simulate hotkeys, open URLs and much more.", "link": "https://extensions.gnome.org/extension/3433/fly-pie/", "shell_version_map": {"38": {"version": "14", "sha256": "09bhaqjrjmdgabqiagsqc1166hjniq5yhfla1glhn6pr8ymhyh4l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImZseXBpZSIsCiAgIm5hbWUiOiAiRmx5LVBpZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbHlwaWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0ZseS1QaWUiLAogICJ1dWlkIjogImZseXBpZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "40": {"version": "14", "sha256": "09bhaqjrjmdgabqiagsqc1166hjniq5yhfla1glhn6pr8ymhyh4l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImZseXBpZSIsCiAgIm5hbWUiOiAiRmx5LVBpZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbHlwaWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0ZseS1QaWUiLAogICJ1dWlkIjogImZseXBpZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "09bhaqjrjmdgabqiagsqc1166hjniq5yhfla1glhn6pr8ymhyh4l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImZseXBpZSIsCiAgIm5hbWUiOiAiRmx5LVBpZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbHlwaWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0ZseS1QaWUiLAogICJ1dWlkIjogImZseXBpZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "42": {"version": "14", "sha256": "09bhaqjrjmdgabqiagsqc1166hjniq5yhfla1glhn6pr8ymhyh4l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWFya2luZyBtZW51IHdoaWNoIGNhbiBiZSB1c2VkIHRvIGxhdW5jaCBhcHBsaWNhdGlvbnMsIHNpbXVsYXRlIGhvdGtleXMsIG9wZW4gVVJMcyBhbmQgbXVjaCBtb3JlLiIsCiAgImdldHRleHQtZG9tYWluIjogImZseXBpZSIsCiAgIm5hbWUiOiAiRmx5LVBpZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbHlwaWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0ZseS1QaWUiLAogICJ1dWlkIjogImZseXBpZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "jiggle@jeffchannell.com", "name": "Jiggle", "pname": "jiggle", "description": "Jiggle is a Gnome Shell extension that highlights the cursor position when the mouse is moved rapidly.", "link": "https://extensions.gnome.org/extension/3438/jiggle/", "shell_version_map": {"38": {"version": "8", "sha256": "0f5zwvcqz648sn11nl49r0ki6zy5c2hp4imgba0dlc02fags7pxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkppZ2dsZSBpcyBhIEdub21lIFNoZWxsIGV4dGVuc2lvbiB0aGF0IGhpZ2hsaWdodHMgdGhlIGN1cnNvciBwb3NpdGlvbiB3aGVuIHRoZSBtb3VzZSBpcyBtb3ZlZCByYXBpZGx5LiIsCiAgIm5hbWUiOiAiSmlnZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2LjMiLAogICAgIjMuMzguMSIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plZmZjaGFubmVsbC9qaWdnbGUiLAogICJ1dWlkIjogImppZ2dsZUBqZWZmY2hhbm5lbGwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "0f5zwvcqz648sn11nl49r0ki6zy5c2hp4imgba0dlc02fags7pxz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkppZ2dsZSBpcyBhIEdub21lIFNoZWxsIGV4dGVuc2lvbiB0aGF0IGhpZ2hsaWdodHMgdGhlIGN1cnNvciBwb3NpdGlvbiB3aGVuIHRoZSBtb3VzZSBpcyBtb3ZlZCByYXBpZGx5LiIsCiAgIm5hbWUiOiAiSmlnZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2LjMiLAogICAgIjMuMzguMSIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plZmZjaGFubmVsbC9qaWdnbGUiLAogICJ1dWlkIjogImppZ2dsZUBqZWZmY2hhbm5lbGwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "showtime-horizontal@xenlism.github.io", "name": "Showtime Horizontal - Desktop Widget", "pname": "showtime-horizontal", "description": "Horizontal Style Date & Clock Widget base on Budgie Desktop Widget", "link": "https://extensions.gnome.org/extension/3442/showtime-horizontal/", "shell_version_map": {"38": {"version": "5", "sha256": "1rdf1alxfyi29wnz2bzm20j9k5q8sn3a6d4si841cjbhmvqdcqhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhvcml6b250YWwgU3R5bGUgRGF0ZSAmYW1wOyBDbG9jayBXaWRnZXQgYmFzZSBvbiBCdWRnaWUgRGVza3RvcCBXaWRnZXQiLAogICJleHRlbnNpb24taWQiOiAic2hvd3RpbWUtaG9yaXpvbnRhbCIsCiAgIm5hbWUiOiAiU2hvd3RpbWUgSG9yaXpvbnRhbCAtIERlc2t0b3AgV2lkZ2V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3d0aW1lLWhvcml6b250YWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS94ZW5saXNtL3Nob3d0aW1lIiwKICAidXVpZCI6ICJzaG93dGltZS1ob3Jpem9udGFsQHhlbmxpc20uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "6", "sha256": "1zy7lkkmcjxkc30hys98s0xlmi93cyc6jz6qx7zfv1v7w03iw3ld", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhvcml6b250YWwgU3R5bGUgRGF0ZSAmYW1wOyBDbG9jayBXaWRnZXQgYmFzZSBvbiBCdWRnaWUgRGVza3RvcCBXaWRnZXQiLAogICJleHRlbnNpb24taWQiOiAic2hvd3RpbWUtaG9yaXpvbnRhbCIsCiAgIm5hbWUiOiAiU2hvd3RpbWUgSG9yaXpvbnRhbCAtIERlc2t0b3AgV2lkZ2V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNob3d0aW1lLWhvcml6b250YWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veGVubGlzbS9zaG93dGltZSIsCiAgInV1aWQiOiAic2hvd3RpbWUtaG9yaXpvbnRhbEB4ZW5saXNtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "display-switcher@iyadk.com", "name": "Display Switcher 2", "pname": "display-switcher", "description": "This extension allows you to toggle between display modes quickly using Super + I. You can switch between Extended, Primary, Clone, and Secondary Only modes quickly. Selecting Extended mode multiple times will flip your secondary monitor's relative position to the primary (to the left or right of it). This extension was originally developed by Lucas Diedrich - https://extensions.gnome.org/extension/1030/display-switcher/ and has been adapted to support Gnome Shell's v3.36.", "link": "https://extensions.gnome.org/extension/3459/display-switcher/", "shell_version_map": {"38": {"version": "2", "sha256": "13vb68xfmcx525yk2vgfny6xvi06nzv103an5zab90hvmj6ggzlj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyB5b3UgdG8gdG9nZ2xlIGJldHdlZW4gZGlzcGxheSBtb2RlcyBxdWlja2x5IHVzaW5nIFN1cGVyICsgSS4gIFlvdSBjYW4gc3dpdGNoIGJldHdlZW4gRXh0ZW5kZWQsIFByaW1hcnksIENsb25lLCBhbmQgU2Vjb25kYXJ5IE9ubHkgbW9kZXMgcXVpY2tseS4gIFNlbGVjdGluZyBFeHRlbmRlZCBtb2RlIG11bHRpcGxlIHRpbWVzIHdpbGwgZmxpcCB5b3VyIHNlY29uZGFyeSBtb25pdG9yJ3MgcmVsYXRpdmUgcG9zaXRpb24gdG8gdGhlIHByaW1hcnkgKHRvIHRoZSBsZWZ0IG9yIHJpZ2h0IG9mIGl0KS4gIFRoaXMgZXh0ZW5zaW9uIHdhcyBvcmlnaW5hbGx5IGRldmVsb3BlZCBieSBMdWNhcyBEaWVkcmljaCAtIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEwMzAvZGlzcGxheS1zd2l0Y2hlci8gYW5kIGhhcyBiZWVuIGFkYXB0ZWQgdG8gc3VwcG9ydCBHbm9tZSBTaGVsbCdzIHYzLjM2LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNwbGF5LXN3aXRjaGVyIiwKICAibmFtZSI6ICJEaXNwbGF5IFN3aXRjaGVyIDIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiTHVjYXMgRGllZHJpY2giLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGlzcGxheS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2l5YWRrYW5kYWxhZnQvZ25vbWUtZGlzcGxheS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZGlzcGxheS1zd2l0Y2hlckBpeWFkay5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "panel-date-format@atareao.es", "name": "Panel Date Format", "pname": "panel-date-format", "description": "Allows to customize the date format on the panel.", "link": "https://extensions.gnome.org/extension/3465/panel-date-format/", "shell_version_map": {"40": {"version": "5", "sha256": "1x6f55d650mnw57fds70bdy9n2h5v7hmb43fsah33m4h4rk1svnc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJleHRlbnNpb24taWQiOiAicGFuZWwtZGF0ZS1mb3JtYXRAYXRhcmVhby5lcyIsCiAgImdldHRleHQtZG9tYWluIjogInBhbmVsLWRhdGUtZm9ybWF0QGF0YXJlYW8uZXMiLAogICJpY29uIjogInBhbmVsLWRhdGUtZm9ybWF0IiwKICAibmFtZSI6ICJQYW5lbCBEYXRlIEZvcm1hdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F0YXJlYW8vcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGF0YXJlYW8uZXMiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "myHiddenTopBar@lendoK.github.com", "name": "myHiddenTopBar", "pname": "myhiddentopbar", "description": "really hides the toppanel", "link": "https://extensions.gnome.org/extension/3481/myhiddentopbar/", "shell_version_map": {"38": {"version": "2", "sha256": "1vrj1ih0rvds9xng0i4n2cah9akm2j2vhma3a7zjyvljxmw82w5x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlYWxseSBoaWRlcyB0aGUgdG9wcGFuZWwiLAogICJuYW1lIjogIm15SGlkZGVuVG9wQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm15SGlkZGVuVG9wQmFyQGxlbmRvSy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "3", "sha256": "0fl9rcdxn2l2lpc8fhcbvzm9lx0i12674kk15rpgbzfj8xn26qkw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlYWxseSBoaWRlcyB0aGUgdG9wcGFuZWwiLAogICJuYW1lIjogIm15SGlkZGVuVG9wQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm15SGlkZGVuVG9wQmFyQGxlbmRvSy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "5", "sha256": "01b5d3bza10mcy0dj662dp1lk2if7pl71q3cfr7zwyk1fkkraizy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlYWxseSBoaWRlcyB0aGUgdG9wcGFuZWwiLAogICJuYW1lIjogIm15SGlkZGVuVG9wQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJteUhpZGRlblRvcEJhckBsZW5kb0suZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "big-avatar@gustavoperedo.org", "name": "Big Avatar", "pname": "big-avatar", "description": "Adds your user avatar and name to the menu panel. Big thanks to: db0x and 'I like 'em curvy' extension developer", "link": "https://extensions.gnome.org/extension/3488/big-avatar/", "shell_version_map": {"38": {"version": "6", "sha256": "1p278iaqfl39kimk3041wvzvmgag8dr2q1bmka3n7srkd2n71vlf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciB1c2VyIGF2YXRhciBhbmQgbmFtZSB0byB0aGUgbWVudSBwYW5lbC4gQmlnIHRoYW5rcyB0bzogZGIweCBhbmQgJ0kgbGlrZSAnZW0gY3VydnknIGV4dGVuc2lvbiBkZXZlbG9wZXIiLAogICJleHRlbnNpb24taWQiOiAiYmlnLWF2YXRhciIsCiAgIm5hbWUiOiAiQmlnIEF2YXRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaWctYXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3VzdGF2b1BlcmVkby9CaWctQXZhdGFyLUdub21lLVNoZWxsLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmlnLWF2YXRhckBndXN0YXZvcGVyZWRvLm9yZyIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "11", "sha256": "1ajh11619r8v6mvkmv142ivykd5b20jx64ca8fxhicfn6i6di923", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciB1c2VyIGF2YXRhciBhbmQgbmFtZSB0byB0aGUgbWVudSBwYW5lbC4gQmlnIHRoYW5rcyB0bzogZGIweCBhbmQgJ0kgbGlrZSAnZW0gY3VydnknIGV4dGVuc2lvbiBkZXZlbG9wZXIiLAogICJleHRlbnNpb24taWQiOiAiYmlnLWF2YXRhciIsCiAgIm5hbWUiOiAiQmlnIEF2YXRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaWctYXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0d1c3Rhdm9QZXJlZG8vQmlnLUF2YXRhci1Hbm9tZS1TaGVsbC1FeHRlbnNpb24iLAogICJ1dWlkIjogImJpZy1hdmF0YXJAZ3VzdGF2b3BlcmVkby5vcmciLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} -, {"uuid": "volume-mixer@evermiss.net", "name": "Application Volume Mixer", "pname": "application-volume-mixer", "description": "Control volume output per-application", "link": "https://extensions.gnome.org/extension/3499/application-volume-mixer/", "shell_version_map": {"38": {"version": "8", "sha256": "0xwgp3j91nryv7sk68hkrxpfk29hgsy9c3pgv61hhjykas7jsbv5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb24iLAogICJuYW1lIjogIkFwcGxpY2F0aW9uIFZvbHVtZSBNaXhlciIsCiAgIm9yZ2luYWwtYXV0aG9yIjogIm15bWluZHN0b3JtQGV2ZXJtaXNzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXltaW5kc3Rvcm0vZ25vbWUtdm9sdW1lLW1peGVyIiwKICAidXVpZCI6ICJ2b2x1bWUtbWl4ZXJAZXZlcm1pc3MubmV0IiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "0xwgp3j91nryv7sk68hkrxpfk29hgsy9c3pgv61hhjykas7jsbv5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb24iLAogICJuYW1lIjogIkFwcGxpY2F0aW9uIFZvbHVtZSBNaXhlciIsCiAgIm9yZ2luYWwtYXV0aG9yIjogIm15bWluZHN0b3JtQGV2ZXJtaXNzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXltaW5kc3Rvcm0vZ25vbWUtdm9sdW1lLW1peGVyIiwKICAidXVpZCI6ICJ2b2x1bWUtbWl4ZXJAZXZlcm1pc3MubmV0IiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "0xwgp3j91nryv7sk68hkrxpfk29hgsy9c3pgv61hhjykas7jsbv5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb24iLAogICJuYW1lIjogIkFwcGxpY2F0aW9uIFZvbHVtZSBNaXhlciIsCiAgIm9yZ2luYWwtYXV0aG9yIjogIm15bWluZHN0b3JtQGV2ZXJtaXNzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXltaW5kc3Rvcm0vZ25vbWUtdm9sdW1lLW1peGVyIiwKICAidXVpZCI6ICJ2b2x1bWUtbWl4ZXJAZXZlcm1pc3MubmV0IiwKICAidmVyc2lvbiI6IDgKfQ=="}}} +, {"uuid": "volume-mixer@evermiss.net", "name": "Application Volume Mixer", "pname": "application-volume-mixer", "description": "Control volume output per-application", "link": "https://extensions.gnome.org/extension/3499/application-volume-mixer/", "shell_version_map": {"38": {"version": "10", "sha256": "1rw73vgim4lkliy7prn3mfyc2jzk0yi72maf74iybk9kqpyiv5wp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb24iLAogICJuYW1lIjogIkFwcGxpY2F0aW9uIFZvbHVtZSBNaXhlciIsCiAgIm9yZ2luYWwtYXV0aG9yIjogIm15bWluZHN0b3JtQGV2ZXJtaXNzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL215bWluZHN0b3JtL2dub21lLXZvbHVtZS1taXhlciIsCiAgInV1aWQiOiAidm9sdW1lLW1peGVyQGV2ZXJtaXNzLm5ldCIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "1rw73vgim4lkliy7prn3mfyc2jzk0yi72maf74iybk9kqpyiv5wp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb24iLAogICJuYW1lIjogIkFwcGxpY2F0aW9uIFZvbHVtZSBNaXhlciIsCiAgIm9yZ2luYWwtYXV0aG9yIjogIm15bWluZHN0b3JtQGV2ZXJtaXNzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL215bWluZHN0b3JtL2dub21lLXZvbHVtZS1taXhlciIsCiAgInV1aWQiOiAidm9sdW1lLW1peGVyQGV2ZXJtaXNzLm5ldCIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1rw73vgim4lkliy7prn3mfyc2jzk0yi72maf74iybk9kqpyiv5wp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb24iLAogICJuYW1lIjogIkFwcGxpY2F0aW9uIFZvbHVtZSBNaXhlciIsCiAgIm9yZ2luYWwtYXV0aG9yIjogIm15bWluZHN0b3JtQGV2ZXJtaXNzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL215bWluZHN0b3JtL2dub21lLXZvbHVtZS1taXhlciIsCiAgInV1aWQiOiAidm9sdW1lLW1peGVyQGV2ZXJtaXNzLm5ldCIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "1rw73vgim4lkliy7prn3mfyc2jzk0yi72maf74iybk9kqpyiv5wp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb24iLAogICJuYW1lIjogIkFwcGxpY2F0aW9uIFZvbHVtZSBNaXhlciIsCiAgIm9yZ2luYWwtYXV0aG9yIjogIm15bWluZHN0b3JtQGV2ZXJtaXNzLm5ldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL215bWluZHN0b3JtL2dub21lLXZvbHVtZS1taXhlciIsCiAgInV1aWQiOiAidm9sdW1lLW1peGVyQGV2ZXJtaXNzLm5ldCIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "creative-control@sau.li", "name": "Creative Sound Blaster control", "pname": "creative-sound-blaster-control", "description": "Control Creative Sound Blaster", "link": "https://extensions.gnome.org/extension/3505/creative-sound-blaster-control/", "shell_version_map": {"38": {"version": "2", "sha256": "0pqps21c2p8fqndy9hd77j979h0wjbw0yzbmv6jmwk7rskv6zysg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNhdWwzMi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3JlYXRpdmUtY29udHJvbCIsCiAgInV1aWQiOiAiY3JlYXRpdmUtY29udHJvbEBzYXUubGkiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "day-night-wallpaper@swapnilmadavi.github.io", "name": "Day Night Wallpaper", "pname": "day-night-wallpaper", "description": "Set separate wallpapers for day and night time.", "link": "https://extensions.gnome.org/extension/3512/day-night-wallpaper/", "shell_version_map": {"38": {"version": "2", "sha256": "082wrffxsa6qnp120ghlvhkb3isnnf9qizxfk6bbgqbzcvsax059", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBzZXBhcmF0ZSB3YWxscGFwZXJzIGZvciBkYXkgYW5kIG5pZ2h0IHRpbWUuIiwKICAibmFtZSI6ICJEYXkgTmlnaHQgV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRheS1uaWdodC13YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zd2FwbmlsbWFkYXZpL2RheS1uaWdodC13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkYXktbmlnaHQtd2FsbHBhcGVyQHN3YXBuaWxtYWRhdmkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "transparent-shell@siroj42.github.io", "name": "Transparent Shell", "pname": "transparent-shell", "description": "Make the main shell components (Top bar, dash, search box) transparent.", "link": "https://extensions.gnome.org/extension/3518/transparent-shell/", "shell_version_map": {"38": {"version": "6", "sha256": "109c5w2p7w9arfy4wrqmyyi7vd5fwdr8n2cz250bpxiij6zq140k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgc2VhcmNoIGJveCkgdHJhbnNwYXJlbnQuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1Npcm9qNDIvZ25vbWUtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXNoZWxsIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC1zaGVsbEBzaXJvajQyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "7", "sha256": "0nzx401vvzn8n9xnkd13v5jim0l7zd01p1lf0lbgydrr8gh67i95", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgc2VhcmNoIGJveCkgdHJhbnNwYXJlbnQuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBTaGVsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TaXJvajQyL2dub21lLWV4dGVuc2lvbi10cmFuc3BhcmVudC1zaGVsbCIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtc2hlbGxAc2lyb2o0Mi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "true-color-invert@jackkenney", "name": "True Color Invert", "pname": "true-color-invert", "description": "Inverts the color of individual windows so they are hue-preserved.\nDefault shortcut is Super+I", "link": "https://extensions.gnome.org/extension/3530/true-color-invert/", "shell_version_map": {"38": {"version": "8", "sha256": "0l8sz8w8l6cmkn19sg34gmbh79sx49jdx1gk8xzh7yyxgqxhayzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFja2tlbm5leS9nbm9tZS10cnVlLWNvbG9yLWludmVydCIsCiAgInV1aWQiOiAidHJ1ZS1jb2xvci1pbnZlcnRAamFja2tlbm5leSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "0l8sz8w8l6cmkn19sg34gmbh79sx49jdx1gk8xzh7yyxgqxhayzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFja2tlbm5leS9nbm9tZS10cnVlLWNvbG9yLWludmVydCIsCiAgInV1aWQiOiAidHJ1ZS1jb2xvci1pbnZlcnRAamFja2tlbm5leSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0l8sz8w8l6cmkn19sg34gmbh79sx49jdx1gk8xzh7yyxgqxhayzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFja2tlbm5leS9nbm9tZS10cnVlLWNvbG9yLWludmVydCIsCiAgInV1aWQiOiAidHJ1ZS1jb2xvci1pbnZlcnRAamFja2tlbm5leSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "gitlab-extension@infinicode.de", "name": "GitLab Extension", "pname": "gitlab-extension", "description": "GitLab extension utilizes the official GitLab API to provide a comfortable overview about your projects, commits & pipelines.\n", "link": "https://extensions.gnome.org/extension/3535/gitlab-extension/", "shell_version_map": {"38": {"version": "4", "sha256": "04hclkbj95alqv9lq5qa5dnf7wb8ssd08q0lzd9wxzw95hiqcvwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdExhYiBleHRlbnNpb24gdXRpbGl6ZXMgdGhlIG9mZmljaWFsIEdpdExhYiBBUEkgdG8gcHJvdmlkZSBhIGNvbWZvcnRhYmxlIG92ZXJ2aWV3IGFib3V0IHlvdXIgcHJvamVjdHMsIGNvbW1pdHMgJiBwaXBlbGluZXMuXG4iLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIkdpdExhYiBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2luYXRpYy9naXRsYWItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnaXRsYWItZXh0ZW5zaW9uQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "04hclkbj95alqv9lq5qa5dnf7wb8ssd08q0lzd9wxzw95hiqcvwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdExhYiBleHRlbnNpb24gdXRpbGl6ZXMgdGhlIG9mZmljaWFsIEdpdExhYiBBUEkgdG8gcHJvdmlkZSBhIGNvbWZvcnRhYmxlIG92ZXJ2aWV3IGFib3V0IHlvdXIgcHJvamVjdHMsIGNvbW1pdHMgJiBwaXBlbGluZXMuXG4iLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIkdpdExhYiBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2luYXRpYy9naXRsYWItZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnaXRsYWItZXh0ZW5zaW9uQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "downfall@torculus.github.com", "name": "DownFall", "pname": "downfall", "description": "Moves text of your choice across the screen. Can simulate leaves, snow, fireworks, ufos, and more!", "link": "https://extensions.gnome.org/extension/3539/downfall/", "shell_version_map": {"38": {"version": "18", "sha256": "0x271szv8gjkzh04sp3gif6y5yxs6rvhxnwa3q3j7bxhlwscjx7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9yY3VsdXMvRG93bkZhbGwiLAogICJ1dWlkIjogImRvd25mYWxsQHRvcmN1bHVzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "40": {"version": "18", "sha256": "0x271szv8gjkzh04sp3gif6y5yxs6rvhxnwa3q3j7bxhlwscjx7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9yY3VsdXMvRG93bkZhbGwiLAogICJ1dWlkIjogImRvd25mYWxsQHRvcmN1bHVzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "41": {"version": "18", "sha256": "0x271szv8gjkzh04sp3gif6y5yxs6rvhxnwa3q3j7bxhlwscjx7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdG9yY3VsdXMvRG93bkZhbGwiLAogICJ1dWlkIjogImRvd25mYWxsQHRvcmN1bHVzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTgKfQ=="}}} -, {"uuid": "time-awareness@gnome-extensions.kapranoff.ru", "name": "Time Awareness", "pname": "time-awareness", "description": "Tracks the time you have been actively using your computer", "link": "https://extensions.gnome.org/extension/3556/time-awareness/", "shell_version_map": {"38": {"version": "6", "sha256": "0kfw4s2y0r51plmchzga7fkd69ynksccz881xh683k4as6af4mcg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vc3IuaHQvfmthcHBhL2dub21lLXNoZWxsLXRpbWUtYXdhcmVuZXNzLyIsCiAgInV1aWQiOiAidGltZS1hd2FyZW5lc3NAZ25vbWUtZXh0ZW5zaW9ucy5rYXByYW5vZmYucnUiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "0kfw4s2y0r51plmchzga7fkd69ynksccz881xh683k4as6af4mcg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vc3IuaHQvfmthcHBhL2dub21lLXNoZWxsLXRpbWUtYXdhcmVuZXNzLyIsCiAgInV1aWQiOiAidGltZS1hd2FyZW5lc3NAZ25vbWUtZXh0ZW5zaW9ucy5rYXByYW5vZmYucnUiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0kfw4s2y0r51plmchzga7fkd69ynksccz881xh683k4as6af4mcg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vc3IuaHQvfmthcHBhL2dub21lLXNoZWxsLXRpbWUtYXdhcmVuZXNzLyIsCiAgInV1aWQiOiAidGltZS1hd2FyZW5lc3NAZ25vbWUtZXh0ZW5zaW9ucy5rYXByYW5vZmYucnUiLAogICJ2ZXJzaW9uIjogNgp9"}}} +, {"uuid": "downfall@torculus.github.com", "name": "DownFall", "pname": "downfall", "description": "Moves text of your choice across the screen. Can simulate leaves, snow, fireworks, ufos, and more!", "link": "https://extensions.gnome.org/extension/3539/downfall/", "shell_version_map": {"38": {"version": "19", "sha256": "0dmkjqmn2x7bg7fndq4fdvllhpzd3in39z2ykm1g6f0zyv4gq2i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvcmN1bHVzL0Rvd25GYWxsIiwKICAidXVpZCI6ICJkb3duZmFsbEB0b3JjdWx1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "40": {"version": "19", "sha256": "0dmkjqmn2x7bg7fndq4fdvllhpzd3in39z2ykm1g6f0zyv4gq2i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvcmN1bHVzL0Rvd25GYWxsIiwKICAidXVpZCI6ICJkb3duZmFsbEB0b3JjdWx1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "0dmkjqmn2x7bg7fndq4fdvllhpzd3in39z2ykm1g6f0zyv4gq2i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvcmN1bHVzL0Rvd25GYWxsIiwKICAidXVpZCI6ICJkb3duZmFsbEB0b3JjdWx1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "19", "sha256": "0dmkjqmn2x7bg7fndq4fdvllhpzd3in39z2ykm1g6f0zyv4gq2i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRleHQgb2YgeW91ciBjaG9pY2UgYWNyb3NzIHRoZSBzY3JlZW4uIENhbiBzaW11bGF0ZSBsZWF2ZXMsIHNub3csIGZpcmV3b3JrcywgdWZvcywgYW5kIG1vcmUhIiwKICAibmFtZSI6ICJEb3duRmFsbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvcmN1bHVzL0Rvd25GYWxsIiwKICAidXVpZCI6ICJkb3duZmFsbEB0b3JjdWx1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} +, {"uuid": "time-awareness@gnome-extensions.kapranoff.ru", "name": "Time Awareness", "pname": "time-awareness", "description": "Tracks the time you have been actively using your computer", "link": "https://extensions.gnome.org/extension/3556/time-awareness/", "shell_version_map": {"38": {"version": "7", "sha256": "0a9a7524ddwb2hxf3q5amgbd57fy17m994vj3gbkddk7mp8m06a7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3NyLmh0L35rYXBwYS9nbm9tZS1zaGVsbC10aW1lLWF3YXJlbmVzcy8iLAogICJ1dWlkIjogInRpbWUtYXdhcmVuZXNzQGdub21lLWV4dGVuc2lvbnMua2FwcmFub2ZmLnJ1IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "0a9a7524ddwb2hxf3q5amgbd57fy17m994vj3gbkddk7mp8m06a7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3NyLmh0L35rYXBwYS9nbm9tZS1zaGVsbC10aW1lLWF3YXJlbmVzcy8iLAogICJ1dWlkIjogInRpbWUtYXdhcmVuZXNzQGdub21lLWV4dGVuc2lvbnMua2FwcmFub2ZmLnJ1IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0a9a7524ddwb2hxf3q5amgbd57fy17m994vj3gbkddk7mp8m06a7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3NyLmh0L35rYXBwYS9nbm9tZS1zaGVsbC10aW1lLWF3YXJlbmVzcy8iLAogICJ1dWlkIjogInRpbWUtYXdhcmVuZXNzQGdub21lLWV4dGVuc2lvbnMua2FwcmFub2ZmLnJ1IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "0a9a7524ddwb2hxf3q5amgbd57fy17m994vj3gbkddk7mp8m06a7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYWNrcyB0aGUgdGltZSB5b3UgaGF2ZSBiZWVuIGFjdGl2ZWx5IHVzaW5nIHlvdXIgY29tcHV0ZXIiLAogICJuYW1lIjogIlRpbWUgQXdhcmVuZXNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3NyLmh0L35rYXBwYS9nbm9tZS1zaGVsbC10aW1lLWF3YXJlbmVzcy8iLAogICJ1dWlkIjogInRpbWUtYXdhcmVuZXNzQGdub21lLWV4dGVuc2lvbnMua2FwcmFub2ZmLnJ1IiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "mullvadindicator@pobega.github.com", "name": "Mullvad Indicator", "pname": "mullvad-indicator", "description": "Mullvad connection status indicator", "link": "https://extensions.gnome.org/extension/3560/mullvad-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "05vcb7g51byvnk7bzajb1i7knj4zwjiksia97wabk41a2bagc4jc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bGx2YWQgY29ubmVjdGlvbiBzdGF0dXMgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJNdWxsdmFkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUG9iZWdhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tdWxsdmFkLWluZGljYXRvciIsCiAgInV1aWQiOiAibXVsbHZhZGluZGljYXRvckBwb2JlZ2EuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "05vcb7g51byvnk7bzajb1i7knj4zwjiksia97wabk41a2bagc4jc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bGx2YWQgY29ubmVjdGlvbiBzdGF0dXMgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJNdWxsdmFkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUG9iZWdhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tdWxsdmFkLWluZGljYXRvciIsCiAgInV1aWQiOiAibXVsbHZhZGluZGljYXRvckBwb2JlZ2EuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "05vcb7g51byvnk7bzajb1i7knj4zwjiksia97wabk41a2bagc4jc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11bGx2YWQgY29ubmVjdGlvbiBzdGF0dXMgaW5kaWNhdG9yIiwKICAibmFtZSI6ICJNdWxsdmFkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUG9iZWdhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tdWxsdmFkLWluZGljYXRvciIsCiAgInV1aWQiOiAibXVsbHZhZGluZGljYXRvckBwb2JlZ2EuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "task-widget@juozasmiskinis.gitlab.io", "name": "Task Widget", "pname": "task-widget", "description": "Display tasks next to the calendar widget.\n\nVisit our Wiki page for more information and troubleshooting.", "link": "https://extensions.gnome.org/extension/3569/task-widget/", "shell_version_map": {"38": {"version": "10", "sha256": "16nx63qcaih4812hyvhw0kypvik88g8423i5sp1360bwkrdppc36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMCwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}, "40": {"version": "10", "sha256": "16nx63qcaih4812hyvhw0kypvik88g8423i5sp1360bwkrdppc36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMCwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}, "41": {"version": "10", "sha256": "16nx63qcaih4812hyvhw0kypvik88g8423i5sp1360bwkrdppc36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMCwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}}} +, {"uuid": "task-widget@juozasmiskinis.gitlab.io", "name": "Task Widget", "pname": "task-widget", "description": "Display tasks next to the calendar widget.\n\nVisit our Wiki page for more information and troubleshooting.", "link": "https://extensions.gnome.org/extension/3569/task-widget/", "shell_version_map": {"38": {"version": "11", "sha256": "0bn43w6smfihr220k6abazq6lwd5qc3xyrl9crh9m6m09c0x7hln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMSwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}, "40": {"version": "11", "sha256": "0bn43w6smfihr220k6abazq6lwd5qc3xyrl9crh9m6m09c0x7hln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMSwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}, "41": {"version": "11", "sha256": "0bn43w6smfihr220k6abazq6lwd5qc3xyrl9crh9m6m09c0x7hln", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJhc2UiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGFzay13aWRnZXQiLAogICJjb2ZmZWUiOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9uYnh3ZnBtIiwKICAiZGVwZW5kZW5jaWVzIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qbWlza2luaXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2std2lkZ2V0L3dpa2lzL0luc3RhbGxhdGlvbiIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGFza3MgbmV4dCB0byB0aGUgY2FsZW5kYXIgd2lkZ2V0LlxuXG5WaXNpdCBvdXIgV2lraSBwYWdlIGZvciBtb3JlIGluZm9ybWF0aW9uIGFuZCB0cm91Ymxlc2hvb3RpbmcuIiwKICAiZXBhdGgiOiAiL29yZy9nbm9tZS9zaGVsbC9leHRlbnNpb25zL3Rhc2std2lkZ2V0IiwKICAiZ3Jlc291cmNlIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhc2std2lkZ2V0LmdyZXNvdXJjZSIsCiAgImxpYmVyYXBheSI6ICJodHRwczovL2xpYmVyYXBheS5jb20vam9hc2lzLyIsCiAgImxvY2FsZSI6ICJ1c2VyLXNwZWNpZmljIiwKICAibmFtZSI6ICJUYXNrIFdpZGdldCIsCiAgInBheXBhbCI6ICJodHRwczovL3BheXBhbC5tZS9qbWlza2luaXMiLAogICJzY2hlbWFzIjogInVzZXItc3BlY2lmaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2ptaXNraW5pcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGFzay13aWRnZXQiLAogICJ1dWlkIjogInRhc2std2lkZ2V0QGp1b3phc21pc2tpbmlzLmdpdGxhYi5pbyIsCiAgInZlcnNpb24iOiAxMSwKICAid2lraSI6ICJodHRwczovL2dpdGxhYi5jb20vam1pc2tpbmlzL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrLXdpZGdldC93aWtpcyIKfQ=="}}} , {"uuid": "air-quality@mcardillo55", "name": "Air Quality", "pname": "air-quality", "description": "View local air quality from PurpleAir in the top bar", "link": "https://extensions.gnome.org/extension/3574/air-quality/", "shell_version_map": {"40": {"version": "2", "sha256": "037hbbb6z3gj818hqxqq96yszd1hka57pn4gj9f5kps7ak5hca4l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbG9jYWwgYWlyIHF1YWxpdHkgZnJvbSBQdXJwbGVBaXIgaW4gdGhlIHRvcCBiYXIiLAogICJuYW1lIjogIkFpciBRdWFsaXR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21jYXJkaWxsbzU1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1haXItcXVhbGl0eSIsCiAgInV1aWQiOiAiYWlyLXF1YWxpdHlAbWNhcmRpbGxvNTUiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "oclock@ortega.tech", "name": "OClock", "pname": "oclock", "description": "Shows an analog clock on the panel", "link": "https://extensions.gnome.org/extension/3578/oclock/", "shell_version_map": {"40": {"version": "2", "sha256": "1pp155a51c1fsmlwfsr1hxsv79xra3sbqrda3fkvhrv4jif7n7s8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJKZXJlbWlhcyBPcnRlZ2EiLAogICJkZXNjcmlwdGlvbiI6ICJTaG93cyBhbiBhbmFsb2cgY2xvY2sgb24gdGhlIHBhbmVsIiwKICAibmFtZSI6ICJPQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly93d3cuZ2l0aHViLmNvbS9qZXJlLW9ydGVnYTI0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1vY2xvY2svIiwKICAidXVpZCI6ICJvY2xvY2tAb3J0ZWdhLnRlY2giLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1pp155a51c1fsmlwfsr1hxsv79xra3sbqrda3fkvhrv4jif7n7s8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJKZXJlbWlhcyBPcnRlZ2EiLAogICJkZXNjcmlwdGlvbiI6ICJTaG93cyBhbiBhbmFsb2cgY2xvY2sgb24gdGhlIHBhbmVsIiwKICAibmFtZSI6ICJPQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly93d3cuZ2l0aHViLmNvbS9qZXJlLW9ydGVnYTI0L2dub21lLXNoZWxsLWV4dGVuc2lvbi1vY2xvY2svIiwKICAidXVpZCI6ICJvY2xvY2tAb3J0ZWdhLnRlY2giLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "azan@hatem.masmoudi.org", "name": "Azan Islamic Prayer Times", "pname": "azan-islamic-prayer-times", "description": "Azan is an Islamic prayer times extension for Gnome Shell based on the extension by Fahrinh.\n\nFeatures\n- List compulsory prayer times\n Optionally display Imsak, Sunrise, Sunset and Midnight\n- Show remaining time for the upcoming prayer.\n- Show current date in Hijri calendar.\n- Display a notification when it's time for prayer.\n- Automatic Geoclue2 location detection\n- Show times in 24 hour and 12 hour formats\n- Hijri date adjusment\n- Moon status icon", "link": "https://extensions.gnome.org/extension/3602/azan-islamic-prayer-times/", "shell_version_map": {"38": {"version": "2", "sha256": "1z58m1w04mdddq9p3102jv852zks41f2l7xbx7j8jcljy4ahiqll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF6YW4gaXMgYW4gSXNsYW1pYyBwcmF5ZXIgdGltZXMgZXh0ZW5zaW9uIGZvciBHbm9tZSBTaGVsbCBiYXNlZCBvbiB0aGUgZXh0ZW5zaW9uIGJ5IEZhaHJpbmguXG5cbkZlYXR1cmVzXG4tIExpc3QgY29tcHVsc29yeSBwcmF5ZXIgdGltZXNcbiBPcHRpb25hbGx5IGRpc3BsYXkgSW1zYWssIFN1bnJpc2UsIFN1bnNldCBhbmQgTWlkbmlnaHRcbi0gU2hvdyByZW1haW5pbmcgdGltZSBmb3IgdGhlIHVwY29taW5nIHByYXllci5cbi0gU2hvdyBjdXJyZW50IGRhdGUgaW4gSGlqcmkgY2FsZW5kYXIuXG4tIERpc3BsYXkgYSBub3RpZmljYXRpb24gd2hlbiBpdCdzIHRpbWUgZm9yIHByYXllci5cbi0gQXV0b21hdGljIEdlb2NsdWUyIGxvY2F0aW9uIGRldGVjdGlvblxuLSBTaG93IHRpbWVzIGluIDI0IGhvdXIgYW5kIDEyIGhvdXIgZm9ybWF0c1xuLSBIaWpyaSBkYXRlIGFkanVzbWVudFxuLSBNb29uIHN0YXR1cyBpY29uIiwKICAibmFtZSI6ICJBemFuIElzbGFtaWMgUHJheWVyIFRpbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF6YW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYuMSIsCiAgICAiMy4zOC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vaG1hc21vdWRpL2F6YW4tZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhemFuQGhhdGVtLm1hc21vdWRpLm9yZyIsCiAgInZlcnNpb24iOiAyCn0="}}} @@ -362,7 +363,7 @@ , {"uuid": "wireguard-indicator@atareao.es", "name": "WireGuard Indicator", "pname": "wireguard-indicator", "description": "Manage WireGuard VPN from Desktop", "link": "https://extensions.gnome.org/extension/3612/wireguard-indicator/", "shell_version_map": {"40": {"version": "6", "sha256": "0qddl83x30y6jqm4nyjk6faklmv7cii2czmgmagcyllgkh0simav", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBXaXJlR3VhcmQgVlBOIGZyb20gRGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJpY29uIjogIndpcmVndWFyZC1pY29uIiwKICAibmFtZSI6ICJXaXJlR3VhcmQgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImVzLmF0YXJlYW8ud2lyZWd1YXJkLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL3dpcmVndWFyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogIndpcmVndWFyZC1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "shamsi-calendar@gnome.scr.ir", "name": "Iranian Persian Calendar", "pname": "shamsi-calendar", "description": "تقویم هجری شمسی،قمری و میلادی در میز‌کار گنوم لینوکس\nقابلیت نمایش اوقات شرعی و پخش اذان\nدرج تعطیلی‌ها و مناسبت‌های رسمی تقویم\nزبان کاملاً فارسی\nتاریخ قمری هلالی ایران\nسازگار با اکثر نسخه‌های گنوم\nدر حال توسعه...\n\nShows Persian + Islamic + Gregorian date in the panel of gnome.\n\nIt shows:\n1- Persian calendar\n2- It can show, today is holiday or not!\n3- Show notification onDayChanged!\n4- Date converter between Persian, Gregorian and Lunar Hijri(Islamic)\n5- Show calendar Events.\n6- Show PrayTimes and play sound (Azan).\n\nPlease \"rate\" here and \"star\" project in GitHub.\nPlease open an issue in GitHub if you found something or have an idea!\nگزارش مشکلات:\nhttps://github.com/SCR-IR/gnome-shamsi-calendar/issues", "link": "https://extensions.gnome.org/extension/3618/shamsi-calendar/", "shell_version_map": {"38": {"version": "16", "sha256": "1aqhj1lmwqy6wlbd105bl85grs749q4hilsz253n45s25jjzw5p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Njci1pci9nbm9tZS1zaGFtc2ktY2FsZW5kYXIiLAogICJ1dWlkIjogInNoYW1zaS1jYWxlbmRhckBnbm9tZS5zY3IuaXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "40": {"version": "16", "sha256": "1aqhj1lmwqy6wlbd105bl85grs749q4hilsz253n45s25jjzw5p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Njci1pci9nbm9tZS1zaGFtc2ktY2FsZW5kYXIiLAogICJ1dWlkIjogInNoYW1zaS1jYWxlbmRhckBnbm9tZS5zY3IuaXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "1aqhj1lmwqy6wlbd105bl85grs749q4hilsz253n45s25jjzw5p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1MDYyYVx1MDY0Mlx1MDY0OFx1MDZjY1x1MDY0NSBcdTA2NDdcdTA2MmNcdTA2MzFcdTA2Y2MgXHUwNjM0XHUwNjQ1XHUwNjMzXHUwNmNjXHUwNjBjXHUwNjQyXHUwNjQ1XHUwNjMxXHUwNmNjIFx1MDY0OCBcdTA2NDVcdTA2Y2NcdTA2NDRcdTA2MjdcdTA2MmZcdTA2Y2MgXHUwNjJmXHUwNjMxIFx1MDY0NVx1MDZjY1x1MDYzMlx1MjAwY1x1MDZhOVx1MDYyN1x1MDYzMSBcdTA2YWZcdTA2NDZcdTA2NDhcdTA2NDUgXHUwNjQ0XHUwNmNjXHUwNjQ2XHUwNjQ4XHUwNmE5XHUwNjMzXG5cdTA2NDJcdTA2MjdcdTA2MjhcdTA2NDRcdTA2Y2NcdTA2MmEgXHUwNjQ2XHUwNjQ1XHUwNjI3XHUwNmNjXHUwNjM0IFx1MDYyN1x1MDY0OFx1MDY0Mlx1MDYyN1x1MDYyYSBcdTA2MzRcdTA2MzFcdTA2MzlcdTA2Y2MgXHUwNjQ4IFx1MDY3ZVx1MDYyZVx1MDYzNCBcdTA2MjdcdTA2MzBcdTA2MjdcdTA2NDZcblx1MDYyZlx1MDYzMVx1MDYyYyBcdTA2MmFcdTA2MzlcdTA2MzdcdTA2Y2NcdTA2NDRcdTA2Y2NcdTIwMGNcdTA2NDdcdTA2MjcgXHUwNjQ4IFx1MDY0NVx1MDY0Nlx1MDYyN1x1MDYzM1x1MDYyOFx1MDYyYVx1MjAwY1x1MDY0N1x1MDYyN1x1MDZjYyBcdTA2MzFcdTA2MzNcdTA2NDVcdTA2Y2MgXHUwNjJhXHUwNjQyXHUwNjQ4XHUwNmNjXHUwNjQ1XG5cdTA2MzJcdTA2MjhcdTA2MjdcdTA2NDYgXHUwNmE5XHUwNjI3XHUwNjQ1XHUwNjQ0XHUwNjI3XHUwNjRiIFx1MDY0MVx1MDYyN1x1MDYzMVx1MDYzM1x1MDZjY1xuXHUwNjJhXHUwNjI3XHUwNjMxXHUwNmNjXHUwNjJlIFx1MDY0Mlx1MDY0NVx1MDYzMVx1MDZjYyBcdTA2NDdcdTA2NDRcdTA2MjdcdTA2NDRcdTA2Y2MgXHUwNjI3XHUwNmNjXHUwNjMxXHUwNjI3XHUwNjQ2XG5cdTA2MzNcdTA2MjdcdTA2MzJcdTA2YWZcdTA2MjdcdTA2MzEgXHUwNjI4XHUwNjI3IFx1MDYyN1x1MDZhOVx1MDYyYlx1MDYzMSBcdTA2NDZcdTA2MzNcdTA2MmVcdTA2NDdcdTIwMGNcdTA2NDdcdTA2MjdcdTA2Y2MgXHUwNmFmXHUwNjQ2XHUwNjQ4XHUwNjQ1XG5cdTA2MmZcdTA2MzEgXHUwNjJkXHUwNjI3XHUwNjQ0IFx1MDYyYVx1MDY0OFx1MDYzM1x1MDYzOVx1MDY0Ny4uLlxuXG5TaG93cyBQZXJzaWFuICsgSXNsYW1pYyArIEdyZWdvcmlhbiBkYXRlIGluIHRoZSBwYW5lbCBvZiBnbm9tZS5cblxuSXQgc2hvd3M6XG4xLSBQZXJzaWFuIGNhbGVuZGFyXG4yLSBJdCBjYW4gc2hvdywgdG9kYXkgaXMgaG9saWRheSBvciBub3QhXG4zLSBTaG93IG5vdGlmaWNhdGlvbiBvbkRheUNoYW5nZWQhXG40LSBEYXRlIGNvbnZlcnRlciBiZXR3ZWVuIFBlcnNpYW4sIEdyZWdvcmlhbiBhbmQgTHVuYXIgSGlqcmkoSXNsYW1pYylcbjUtIFNob3cgY2FsZW5kYXIgRXZlbnRzLlxuNi0gU2hvdyBQcmF5VGltZXMgYW5kIHBsYXkgc291bmQgKEF6YW4pLlxuXG5QbGVhc2UgXCJyYXRlXCIgaGVyZSBhbmQgXCJzdGFyXCIgcHJvamVjdCBpbiBHaXRIdWIuXG5QbGVhc2Ugb3BlbiBhbiBpc3N1ZSBpbiBHaXRIdWIgaWYgeW91IGZvdW5kIHNvbWV0aGluZyBvciBoYXZlIGFuIGlkZWEhXG5cdTA2YWZcdTA2MzJcdTA2MjdcdTA2MzFcdTA2MzQgXHUwNjQ1XHUwNjM0XHUwNmE5XHUwNjQ0XHUwNjI3XHUwNjJhOlxuaHR0cHM6Ly9naXRodWIuY29tL1NDUi1JUi9nbm9tZS1zaGFtc2ktY2FsZW5kYXIvaXNzdWVzIiwKICAibmFtZSI6ICJJcmFuaWFuIFBlcnNpYW4gQ2FsZW5kYXIiLAogICJvcmlnaW5hbC1hdXRob3JzIjogImpkZi5zY3IuaXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Njci1pci9nbm9tZS1zaGFtc2ktY2FsZW5kYXIiLAogICJ1dWlkIjogInNoYW1zaS1jYWxlbmRhckBnbm9tZS5zY3IuaXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} , {"uuid": "tunnel-indicator@atareao.es", "name": "Tunnel Indicator", "pname": "tunnel-indicator", "description": "Manage SSH Tunnels from Desktop", "link": "https://extensions.gnome.org/extension/3622/tunnel-indicator/", "shell_version_map": {"40": {"version": "2", "sha256": "0ma4a711mgjxyhy4d21p2m7wvbnmmwlfdsf6xk9i36ranjcqs9as", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBTU0ggVHVubmVscyBmcm9tIERlc2t0b3AiLAogICJleHRlbnNpb24taWQiOiAidHVubmVsLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHVubmVsLWluZGljYXRvckBhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJ0dW5uZWwtaWNvbiIsCiAgIm5hbWUiOiAiVHVubmVsIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLnR1bm5lbC1pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXRhcmVhby90dW5uZWwtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJ0dW5uZWwtaW5kaWNhdG9yQGF0YXJlYW8uZXMiLAogICJ2ZXJzaW9uIjogMgp9"}}} -, {"uuid": "arcmenu@arcmenu.com", "name": "ArcMenu", "pname": "arcmenu", "description": "Application Menu for GNOME, with various layouts to choose from!\n\nSupports GNOME shell 3.36, 3.38, 40, and 41.\n\nFor older GNOME shell versions visit https://extensions.gnome.org/extension/1228/arc-menu/\n\nCommon solutions for ERROR message:\n-Restart your GNOME session after updating ArcMenu.\n-Install one of the following packages: 'gir1.2-gmenu-3.0' or 'gnome-menus'\n\nGeneral Help:\n-Visit https://gitlab.com/arcmenu/ArcMenu/-/wikis/home\n\nPlease report all bugs or issues at https://gitlab.com/arcmenu/ArcMenu", "link": "https://extensions.gnome.org/extension/3628/arcmenu/", "shell_version_map": {"38": {"version": "17", "sha256": "0llq0zkvgxarr30s304n1ilidbwc0kx4l2impby5y2sdsvr7zafv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "40": {"version": "20", "sha256": "0v537d5sf8bpbqmh2f4p79zdxfrx67x85wkf2p1d245836k56s25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "20", "sha256": "0v537d5sf8bpbqmh2f4p79zdxfrx67x85wkf2p1d245836k56s25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIE1lbnUgZm9yIEdOT01FLCB3aXRoIHZhcmlvdXMgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSFcblxuU3VwcG9ydHMgR05PTUUgc2hlbGwgMy4zNiwgMy4zOCwgNDAsIGFuZCA0MS5cblxuRm9yIG9sZGVyIEdOT01FIHNoZWxsIHZlcnNpb25zIHZpc2l0IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzEyMjgvYXJjLW1lbnUvXG5cbkNvbW1vbiBzb2x1dGlvbnMgZm9yIEVSUk9SIG1lc3NhZ2U6XG4tUmVzdGFydCB5b3VyIEdOT01FIHNlc3Npb24gYWZ0ZXIgdXBkYXRpbmcgQXJjTWVudS5cbi1JbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4tVmlzaXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudS8tL3dpa2lzL2hvbWVcblxuUGxlYXNlIHJlcG9ydCBhbGwgYnVncyBvciBpc3N1ZXMgYXQgaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgImV4dGVuc2lvbi1pZCI6ICJhcmNtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXJjbWVudSIsCiAgIm5hbWUiOiAiQXJjTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcmNtZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}}} +, {"uuid": "arcmenu@arcmenu.com", "name": "ArcMenu", "pname": "arcmenu", "description": "ArcMenu is an application menu for GNOME Shell, designed to provide a more familiar user experience and workflow.\n\nFeatures include: numerous menu layouts to choose from, built in GNOME search, quick access to system shortcuts, and much more!\n\nCommon solutions for ERROR message:\n - Restart your GNOME session after updating ArcMenu.\n - Install one of the following packages: 'gir1.2-gmenu-3.0' or 'gnome-menus'\n\nGeneral Help:\n - Visit https://gitlab.com/arcmenu/ArcMenu/-/wikis/home\n\nPlease report all bugs or issues at https://gitlab.com/arcmenu/ArcMenu", "link": "https://extensions.gnome.org/extension/3628/arcmenu/", "shell_version_map": {"38": {"version": "17", "sha256": "14waq244pzfcbs2vd63s87x29hb61nvrwx50yikx4q6k01w35v83", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFyY01lbnUgaXMgYW4gYXBwbGljYXRpb24gbWVudSBmb3IgR05PTUUgU2hlbGwsIGRlc2lnbmVkIHRvIHByb3ZpZGUgYSBtb3JlIGZhbWlsaWFyIHVzZXIgZXhwZXJpZW5jZSBhbmQgd29ya2Zsb3cuXG5cbkZlYXR1cmVzIGluY2x1ZGU6IG51bWVyb3VzIG1lbnUgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSwgYnVpbHQgaW4gR05PTUUgc2VhcmNoLCBxdWljayBhY2Nlc3MgdG8gc3lzdGVtIHNob3J0Y3V0cywgYW5kIG11Y2ggbW9yZSFcblxuQ29tbW9uIHNvbHV0aW9ucyBmb3IgRVJST1IgbWVzc2FnZTpcbiAtIFJlc3RhcnQgeW91ciBHTk9NRSBzZXNzaW9uIGFmdGVyIHVwZGF0aW5nIEFyY01lbnUuXG4gLSBJbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4gLSBWaXNpdCBodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51Ly0vd2lraXMvaG9tZVxuXG5QbGVhc2UgcmVwb3J0IGFsbCBidWdzIG9yIGlzc3VlcyBhdCBodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAiZXh0ZW5zaW9uLWlkIjogImFyY21lbnUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcmNtZW51IiwKICAibmFtZSI6ICJBcmNNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFyY21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hcmNtZW51L0FyY01lbnUiLAogICJ1dWlkIjogImFyY21lbnVAYXJjbWVudS5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "40": {"version": "27", "sha256": "11jf6jlfaff479z1in3vnjxz19bfjczrhlix90y2w61kvs708g88", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFyY01lbnUgaXMgYW4gYXBwbGljYXRpb24gbWVudSBmb3IgR05PTUUgU2hlbGwsIGRlc2lnbmVkIHRvIHByb3ZpZGUgYSBtb3JlIGZhbWlsaWFyIHVzZXIgZXhwZXJpZW5jZSBhbmQgd29ya2Zsb3cuXG5cbkZlYXR1cmVzIGluY2x1ZGU6IG51bWVyb3VzIG1lbnUgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSwgYnVpbHQgaW4gR05PTUUgc2VhcmNoLCBxdWljayBhY2Nlc3MgdG8gc3lzdGVtIHNob3J0Y3V0cywgYW5kIG11Y2ggbW9yZSFcblxuQ29tbW9uIHNvbHV0aW9ucyBmb3IgRVJST1IgbWVzc2FnZTpcbiAtIFJlc3RhcnQgeW91ciBHTk9NRSBzZXNzaW9uIGFmdGVyIHVwZGF0aW5nIEFyY01lbnUuXG4gLSBJbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4gLSBWaXNpdCBodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51Ly0vd2lraXMvaG9tZVxuXG5QbGVhc2UgcmVwb3J0IGFsbCBidWdzIG9yIGlzc3VlcyBhdCBodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAiZXh0ZW5zaW9uLWlkIjogImFyY21lbnUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcmNtZW51IiwKICAibmFtZSI6ICJBcmNNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFyY21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "11jf6jlfaff479z1in3vnjxz19bfjczrhlix90y2w61kvs708g88", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFyY01lbnUgaXMgYW4gYXBwbGljYXRpb24gbWVudSBmb3IgR05PTUUgU2hlbGwsIGRlc2lnbmVkIHRvIHByb3ZpZGUgYSBtb3JlIGZhbWlsaWFyIHVzZXIgZXhwZXJpZW5jZSBhbmQgd29ya2Zsb3cuXG5cbkZlYXR1cmVzIGluY2x1ZGU6IG51bWVyb3VzIG1lbnUgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSwgYnVpbHQgaW4gR05PTUUgc2VhcmNoLCBxdWljayBhY2Nlc3MgdG8gc3lzdGVtIHNob3J0Y3V0cywgYW5kIG11Y2ggbW9yZSFcblxuQ29tbW9uIHNvbHV0aW9ucyBmb3IgRVJST1IgbWVzc2FnZTpcbiAtIFJlc3RhcnQgeW91ciBHTk9NRSBzZXNzaW9uIGFmdGVyIHVwZGF0aW5nIEFyY01lbnUuXG4gLSBJbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4gLSBWaXNpdCBodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51Ly0vd2lraXMvaG9tZVxuXG5QbGVhc2UgcmVwb3J0IGFsbCBidWdzIG9yIGlzc3VlcyBhdCBodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAiZXh0ZW5zaW9uLWlkIjogImFyY21lbnUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcmNtZW51IiwKICAibmFtZSI6ICJBcmNNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFyY21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FyY21lbnUvQXJjTWVudSIsCiAgInV1aWQiOiAiYXJjbWVudUBhcmNtZW51LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "42": {"version": "28", "sha256": "1j1zj320zr4ga08526plpyr9yv1hwim2cp153shfc11dc1w3nf58", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFyY01lbnUgaXMgYW4gYXBwbGljYXRpb24gbWVudSBmb3IgR05PTUUgU2hlbGwsIGRlc2lnbmVkIHRvIHByb3ZpZGUgYSBtb3JlIGZhbWlsaWFyIHVzZXIgZXhwZXJpZW5jZSBhbmQgd29ya2Zsb3cuXG5cbkZlYXR1cmVzIGluY2x1ZGU6IG51bWVyb3VzIG1lbnUgbGF5b3V0cyB0byBjaG9vc2UgZnJvbSwgYnVpbHQgaW4gR05PTUUgc2VhcmNoLCBxdWljayBhY2Nlc3MgdG8gc3lzdGVtIHNob3J0Y3V0cywgYW5kIG11Y2ggbW9yZSFcblxuQ29tbW9uIHNvbHV0aW9ucyBmb3IgRVJST1IgbWVzc2FnZTpcbiAtIFJlc3RhcnQgeW91ciBHTk9NRSBzZXNzaW9uIGFmdGVyIHVwZGF0aW5nIEFyY01lbnUuXG4gLSBJbnN0YWxsIG9uZSBvZiB0aGUgZm9sbG93aW5nIHBhY2thZ2VzOiAnZ2lyMS4yLWdtZW51LTMuMCcgb3IgJ2dub21lLW1lbnVzJ1xuXG5HZW5lcmFsIEhlbHA6XG4gLSBWaXNpdCBodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51Ly0vd2lraXMvaG9tZVxuXG5QbGVhc2UgcmVwb3J0IGFsbCBidWdzIG9yIGlzc3VlcyBhdCBodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAiZXh0ZW5zaW9uLWlkIjogImFyY21lbnUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcmNtZW51IiwKICAibmFtZSI6ICJBcmNNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFyY21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYXJjbWVudS9BcmNNZW51IiwKICAidXVpZCI6ICJhcmNtZW51QGFyY21lbnUuY29tIiwKICAidmVyc2lvbiI6IDI4Cn0="}}} , {"uuid": "fixedimelist@alynx.one", "name": "Fixed IME List", "pname": "fixed-ime-list", "description": "Make the IME list in fixed sequence instead of MRU.", "link": "https://extensions.gnome.org/extension/3663/fixed-ime-list/", "shell_version_map": {"38": {"version": "6", "sha256": "0v99flnb23cjv32wr7r077q29jvgs7j5fjx6dc6qm2n04f1qiibz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "0v99flnb23cjv32wr7r077q29jvgs7j5fjx6dc6qm2n04f1qiibz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIElNRSBsaXN0IGluIGZpeGVkIHNlcXVlbmNlIGluc3RlYWQgb2YgTVJVLiIsCiAgIm5hbWUiOiAiRml4ZWQgSU1FIExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWx5bnhaaG91L2dub21lLXNoZWxsLWV4dGVuc2lvbi1maXhlZC1pbWUtbGlzdC8iLAogICJ1dWlkIjogImZpeGVkaW1lbGlzdEBhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "topindicatorapp@quiro9.com", "name": "Top Indicator App", "pname": "top-indicator-app", "description": "This extension is 'appindicators' from ubuntu, renamed 'top indicator app' under the terms of the GPL v2 +. it is the extension itself that Ubuntu offers as a native experience on your system, but so you can install it in other distros since the current one in gnome-extensions is empty.I will offer stable updates when possible.", "link": "https://extensions.gnome.org/extension/3681/top-indicator-app/", "shell_version_map": {"38": {"version": "2", "sha256": "12r4fxgsgd7jn001vlzqrsd86ci62zxk0b9p3bkdqh6g5hj3la35", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGlzICdhcHBpbmRpY2F0b3JzJyBmcm9tIHVidW50dSwgcmVuYW1lZCAndG9wIGluZGljYXRvciBhcHAnIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR1BMIHYyICsuIGl0IGlzIHRoZSBleHRlbnNpb24gaXRzZWxmIHRoYXQgVWJ1bnR1IG9mZmVycyBhcyBhIG5hdGl2ZSBleHBlcmllbmNlIG9uIHlvdXIgc3lzdGVtLCBidXQgc28geW91IGNhbiBpbnN0YWxsIGl0IGluIG90aGVyIGRpc3Ryb3Mgc2luY2UgdGhlIGN1cnJlbnQgb25lIGluIGdub21lLWV4dGVuc2lvbnMgaXMgZW1wdHkuSSB3aWxsIG9mZmVyIHN0YWJsZSB1cGRhdGVzIHdoZW4gcG9zc2libGUuIiwKICAibmFtZSI6ICJUb3AgSW5kaWNhdG9yIEFwcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VidW50dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXBwaW5kaWNhdG9yIiwKICAidXVpZCI6ICJ0b3BpbmRpY2F0b3JhcHBAcXVpcm85LmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "reorder-workspaces@jer.dev", "name": "Reorder Workspaces", "pname": "reorder-workspaces", "description": "Move workspaces up or down in the overview with Alt+Up/Alt+Down", "link": "https://extensions.gnome.org/extension/3685/reorder-workspaces/", "shell_version_map": {"38": {"version": "6", "sha256": "1f0hl2dzl75dwcv8jzx3rk1laqd9y9m32g219nvbhsmk8rjxfc31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgd29ya3NwYWNlcyB1cCBvciBkb3duIGluIHRoZSBvdmVydmlldyB3aXRoIEFsdCtVcC9BbHQrRG93biIsCiAgIm5hbWUiOiAiUmVvcmRlciBXb3Jrc3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlb3JkZXItd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2plcmVtaWFobWVnZWwvZ25vbWUtcmVvcmRlci13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJyZW9yZGVyLXdvcmtzcGFjZXNAamVyLmRldiIsCiAgInZlcnNpb24iOiA2Cn0="}}} @@ -375,67 +376,68 @@ , {"uuid": "cpupower-governors@icar.github.com", "name": "CPU Power Governor", "pname": "cpu-power-governor", "description": "Enables the ability to swap between kernel governors for the CPU useful for laptops.\n\nRequires: polkit, cpupower\nGithub: https://github.com/juxuanu/cpupower-governors", "link": "https://extensions.gnome.org/extension/3727/cpu-power-governor/", "shell_version_map": {"38": {"version": "2", "sha256": "1hb239w4cpz6yzs3pzd3hhrwswh6w5c5xw6dqn57m26cazh843qk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgdGhlIGFiaWxpdHkgdG8gc3dhcCBiZXR3ZWVuIGtlcm5lbCBnb3Zlcm5vcnMgZm9yIHRoZSBDUFUgdXNlZnVsIGZvciBsYXB0b3BzLlxuXG5SZXF1aXJlczogcG9sa2l0LCBjcHVwb3dlclxuR2l0aHViOiBodHRwczovL2dpdGh1Yi5jb20vanV4dWFudS9jcHVwb3dlci1nb3Zlcm5vcnMiLAogICJuYW1lIjogIkNQVSBQb3dlciBHb3Zlcm5vciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjcHVwb3dlci1nb3Zlcm5vcnNAaWNhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "floating-dock@nandoferreira_prof@hotmail.com", "name": "Floating Dock", "pname": "floating-dock", "description": "A Custom Floating Dock fork, now you can change the margin and border radius of the dock.", "link": "https://extensions.gnome.org/extension/3730/floating-dock/", "shell_version_map": {"38": {"version": "1", "sha256": "0giksm5fvrj412v8xnf2hi4s0yi2mqd9prd84npv8jxkfv78y414", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQ3VzdG9tIEZsb2F0aW5nIERvY2sgZm9yaywgbm93IHlvdSBjYW4gY2hhbmdlIHRoZSBtYXJnaW4gYW5kIGJvcmRlciByYWRpdXMgb2YgdGhlIGRvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmxvYXRpbmdkb2NrIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm5hbmRvZmVycmVpcmFfcHJvZkBob3RtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Zlci1tb3JlaXJhL2Zsb2F0aW5nLWRvY2siLAogICJ1dWlkIjogImZsb2F0aW5nLWRvY2tAbmFuZG9mZXJyZWlyYV9wcm9mQGhvdG1haWwuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "4", "sha256": "0ca22s5vbs6d32ppikmg0xcf5335qmighq6cpvly51q44hlqjamg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQ3VzdG9tIEZsb2F0aW5nIERvY2sgZm9yaywgbm93IHlvdSBjYW4gY2hhbmdlIHRoZSBtYXJnaW4gYW5kIGJvcmRlciByYWRpdXMgb2YgdGhlIGRvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmxvYXRpbmdkb2NrIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Zlci1tb3JlaXJhL2Zsb2F0aW5nLWRvY2siLAogICJ1dWlkIjogImZsb2F0aW5nLWRvY2tAbmFuZG9mZXJyZWlyYV9wcm9mQGhvdG1haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0ca22s5vbs6d32ppikmg0xcf5335qmighq6cpvly51q44hlqjamg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQ3VzdG9tIEZsb2F0aW5nIERvY2sgZm9yaywgbm93IHlvdSBjYW4gY2hhbmdlIHRoZSBtYXJnaW4gYW5kIGJvcmRlciByYWRpdXMgb2YgdGhlIGRvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmxvYXRpbmdkb2NrIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Zlci1tb3JlaXJhL2Zsb2F0aW5nLWRvY2siLAogICJ1dWlkIjogImZsb2F0aW5nLWRvY2tAbmFuZG9mZXJyZWlyYV9wcm9mQGhvdG1haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "tiling-assistant@leleat-on-github", "name": "Tiling Assistant", "pname": "tiling-assistant", "description": "Expand GNOME's 2 column tiling and add a Windows-snap-assist-inspired popup...", "link": "https://extensions.gnome.org/extension/3733/tiling-assistant/", "shell_version_map": {"38": {"version": "23", "sha256": "1b9hpll26ggwhw4f52wgflzjfqksmyfy5wyg1rpz41lr1dmva8vk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L1RpbGluZy1Bc3Npc3RhbnQiLAogICJ1dWlkIjogInRpbGluZy1hc3Npc3RhbnRAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAyMwp9"}, "40": {"version": "32", "sha256": "14kvgygfia1961i4v933bg7j2l4mzy7hv7f53sc5giwpmcsj3b5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDMyCn0="}, "41": {"version": "32", "sha256": "14kvgygfia1961i4v933bg7j2l4mzy7hv7f53sc5giwpmcsj3b5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDMyCn0="}}} -, {"uuid": "airpods-battery-status@ju.wtf", "name": "Airpods Battery status", "pname": "airpods-battery-status", "description": "Show Airpods battery level in top bar", "link": "https://extensions.gnome.org/extension/3736/airpods-battery-status/", "shell_version_map": {"38": {"version": "6", "sha256": "0smryqirmjcswbs0gaz6v0kf1hisga1r949c3k7wnyjw9rqxhpc8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXIiLAogICJuYW1lIjogIkFpcnBvZHMgQmF0dGVyeSBzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL2dub21lLWFpcnBvZHMtYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImFpcnBvZHMtYmF0dGVyeS1zdGF0dXNAanUud3RmIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "0smryqirmjcswbs0gaz6v0kf1hisga1r949c3k7wnyjw9rqxhpc8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXIiLAogICJuYW1lIjogIkFpcnBvZHMgQmF0dGVyeSBzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL2dub21lLWFpcnBvZHMtYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImFpcnBvZHMtYmF0dGVyeS1zdGF0dXNAanUud3RmIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0smryqirmjcswbs0gaz6v0kf1hisga1r949c3k7wnyjw9rqxhpc8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXIiLAogICJuYW1lIjogIkFpcnBvZHMgQmF0dGVyeSBzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL2dub21lLWFpcnBvZHMtYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImFpcnBvZHMtYmF0dGVyeS1zdGF0dXNAanUud3RmIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} -, {"uuid": "hue-lights@chlumskyvaclav.gmail.com", "name": "Hue Lights", "pname": "hue-lights", "description": "This extension controls Philips Hue compatible lights using Philips Hue Bridge on your local network, it also allows controlling Philips Hue Sync Box. If you are experiencing an error on the upgrade, please log out and log in again.", "link": "https://extensions.gnome.org/extension/3737/hue-lights/", "shell_version_map": {"38": {"version": "19", "sha256": "049vi65qprgiknpxbz1sv4vyhp749xb7g9369hjsg8fqs0jfwvgd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL2h1ZS1saWdodHMiLAogICJ1dWlkIjogImh1ZS1saWdodHNAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "40": {"version": "19", "sha256": "049vi65qprgiknpxbz1sv4vyhp749xb7g9369hjsg8fqs0jfwvgd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL2h1ZS1saWdodHMiLAogICJ1dWlkIjogImh1ZS1saWdodHNAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "049vi65qprgiknpxbz1sv4vyhp749xb7g9369hjsg8fqs0jfwvgd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL2h1ZS1saWdodHMiLAogICJ1dWlkIjogImh1ZS1saWdodHNAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} -, {"uuid": "compiz-alike-magic-lamp-effect@hermes83.github.com", "name": "Compiz alike magic lamp effect", "pname": "compiz-alike-magic-lamp-effect", "description": "Magic lamp effect inspired by the Compiz ones\n\nNB:\nIn case of update error please restart Gnome Shell (on Xorg press ALT+F2 then write r and press enter, on Wayland end the session and log in again)", "link": "https://extensions.gnome.org/extension/3740/compiz-alike-magic-lamp-effect/", "shell_version_map": {"38": {"version": "10", "sha256": "1mkykm2ql888bksgw94wgvwfqlqnzr19rn629a4k6hph4b5rw5sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "1mkykm2ql888bksgw94wgvwfqlqnzr19rn629a4k6hph4b5rw5sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1mkykm2ql888bksgw94wgvwfqlqnzr19rn629a4k6hph4b5rw5sf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oZXJtZXM4My9jb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3QiLAogICJ1dWlkIjogImNvbXBpei1hbGlrZS1tYWdpYy1sYW1wLWVmZmVjdEBoZXJtZXM4My5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"uuid": "airpods-battery-status@ju.wtf", "name": "Airpods Battery status", "pname": "airpods-battery-status", "description": "Show Airpods battery level in top bar\n\n/!\\ Needs AirStatus to work: https://github.com/delphiki/AirStatus", "link": "https://extensions.gnome.org/extension/3736/airpods-battery-status/", "shell_version_map": {"38": {"version": "6", "sha256": "1ahvqcmcy3n8h66svryi77pm4n86qrcpkqilv5n3avv5bxn3v5d0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVscGhpa2kvZ25vbWUtYWlycG9kcy1iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYWlycG9kcy1iYXR0ZXJ5LXN0YXR1c0BqdS53dGYiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1ahvqcmcy3n8h66svryi77pm4n86qrcpkqilv5n3avv5bxn3v5d0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVscGhpa2kvZ25vbWUtYWlycG9kcy1iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYWlycG9kcy1iYXR0ZXJ5LXN0YXR1c0BqdS53dGYiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "1ahvqcmcy3n8h66svryi77pm4n86qrcpkqilv5n3avv5bxn3v5d0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgQWlycG9kcyBiYXR0ZXJ5IGxldmVsIGluIHRvcCBiYXJcblxuLyFcXCBOZWVkcyBBaXJTdGF0dXMgdG8gd29yazogaHR0cHM6Ly9naXRodWIuY29tL2RlbHBoaWtpL0FpclN0YXR1cyIsCiAgIm5hbWUiOiAiQWlycG9kcyBCYXR0ZXJ5IHN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVscGhpa2kvZ25vbWUtYWlycG9kcy1iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYWlycG9kcy1iYXR0ZXJ5LXN0YXR1c0BqdS53dGYiLAogICJ2ZXJzaW9uIjogNgp9"}}} +, {"uuid": "hue-lights@chlumskyvaclav.gmail.com", "name": "Hue Lights", "pname": "hue-lights", "description": "🇺🇦 Glory to Ukraine! This extension controls Philips Hue compatible lights using Philips Hue Bridge on your local network, it also allows controlling Philips Hue Sync Box. If you are experiencing an error on the upgrade, please log out and log in again.", "link": "https://extensions.gnome.org/extension/3737/hue-lights/", "shell_version_map": {"38": {"version": "21", "sha256": "07bkkj0aaz6p8ych9dij772r67p7ga8pxf8ln3gqvs674ra5w3y7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1ZDgzY1x1ZGRmYVx1ZDgzY1x1ZGRlNiBHbG9yeSB0byBVa3JhaW5lISBUaGlzIGV4dGVuc2lvbiBjb250cm9scyBQaGlsaXBzIEh1ZSBjb21wYXRpYmxlIGxpZ2h0cyB1c2luZyBQaGlsaXBzIEh1ZSBCcmlkZ2Ugb24geW91ciBsb2NhbCBuZXR3b3JrLCBpdCBhbHNvIGFsbG93cyBjb250cm9sbGluZyBQaGlsaXBzIEh1ZSBTeW5jIEJveC4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaHVlLWxpZ2h0cyIsCiAgIm5hbWUiOiAiSHVlIExpZ2h0cyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "40": {"version": "21", "sha256": "07bkkj0aaz6p8ych9dij772r67p7ga8pxf8ln3gqvs674ra5w3y7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1ZDgzY1x1ZGRmYVx1ZDgzY1x1ZGRlNiBHbG9yeSB0byBVa3JhaW5lISBUaGlzIGV4dGVuc2lvbiBjb250cm9scyBQaGlsaXBzIEh1ZSBjb21wYXRpYmxlIGxpZ2h0cyB1c2luZyBQaGlsaXBzIEh1ZSBCcmlkZ2Ugb24geW91ciBsb2NhbCBuZXR3b3JrLCBpdCBhbHNvIGFsbG93cyBjb250cm9sbGluZyBQaGlsaXBzIEh1ZSBTeW5jIEJveC4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaHVlLWxpZ2h0cyIsCiAgIm5hbWUiOiAiSHVlIExpZ2h0cyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "41": {"version": "21", "sha256": "07bkkj0aaz6p8ych9dij772r67p7ga8pxf8ln3gqvs674ra5w3y7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1ZDgzY1x1ZGRmYVx1ZDgzY1x1ZGRlNiBHbG9yeSB0byBVa3JhaW5lISBUaGlzIGV4dGVuc2lvbiBjb250cm9scyBQaGlsaXBzIEh1ZSBjb21wYXRpYmxlIGxpZ2h0cyB1c2luZyBQaGlsaXBzIEh1ZSBCcmlkZ2Ugb24geW91ciBsb2NhbCBuZXR3b3JrLCBpdCBhbHNvIGFsbG93cyBjb250cm9sbGluZyBQaGlsaXBzIEh1ZSBTeW5jIEJveC4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaHVlLWxpZ2h0cyIsCiAgIm5hbWUiOiAiSHVlIExpZ2h0cyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "42": {"version": "21", "sha256": "07bkkj0aaz6p8ych9dij772r67p7ga8pxf8ln3gqvs674ra5w3y7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1ZDgzY1x1ZGRmYVx1ZDgzY1x1ZGRlNiBHbG9yeSB0byBVa3JhaW5lISBUaGlzIGV4dGVuc2lvbiBjb250cm9scyBQaGlsaXBzIEh1ZSBjb21wYXRpYmxlIGxpZ2h0cyB1c2luZyBQaGlsaXBzIEh1ZSBCcmlkZ2Ugb24geW91ciBsb2NhbCBuZXR3b3JrLCBpdCBhbHNvIGFsbG93cyBjb250cm9sbGluZyBQaGlsaXBzIEh1ZSBTeW5jIEJveC4gSWYgeW91IGFyZSBleHBlcmllbmNpbmcgYW4gZXJyb3Igb24gdGhlIHVwZ3JhZGUsIHBsZWFzZSBsb2cgb3V0IGFuZCBsb2cgaW4gYWdhaW4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaHVlLWxpZ2h0cyIsCiAgIm5hbWUiOiAiSHVlIExpZ2h0cyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92Y2hsdW0vaHVlLWxpZ2h0cyIsCiAgInV1aWQiOiAiaHVlLWxpZ2h0c0BjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}}} +, {"uuid": "compiz-alike-magic-lamp-effect@hermes83.github.com", "name": "Compiz alike magic lamp effect", "pname": "compiz-alike-magic-lamp-effect", "description": "Magic lamp effect inspired by the Compiz ones\n\nNB:\nIn case of update error please restart Gnome Shell (on Xorg press ALT+F2 then write r and press enter, on Wayland end the session and log in again)", "link": "https://extensions.gnome.org/extension/3740/compiz-alike-magic-lamp-effect/", "shell_version_map": {"38": {"version": "11", "sha256": "1ffki7rmdxrz3xr285jnlyxp1a4h6h4q17y4dj3c8p64hy145yyp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "11", "sha256": "1ffki7rmdxrz3xr285jnlyxp1a4h6h4q17y4dj3c8p64hy145yyp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1ffki7rmdxrz3xr285jnlyxp1a4h6h4q17y4dj3c8p64hy145yyp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "1ffki7rmdxrz3xr285jnlyxp1a4h6h4q17y4dj3c8p64hy145yyp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "latency-monitor@gitlab.labsatho.me", "name": "Latency Monitor", "pname": "latency-monitor", "description": "A simple extension for displaying latency information using pings in GNOME Shell.", "link": "https://extensions.gnome.org/extension/3746/latency-monitor/", "shell_version_map": {"38": {"version": "6", "sha256": "0k2y1qrq7irkn2c72pk4c5x4fwzaxkfp3jj7qvhzih6zmkifdzcd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZGlzcGxheWluZyBsYXRlbmN5IGluZm9ybWF0aW9uIHVzaW5nIHBpbmdzIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiTGF0ZW5jeSBNb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxhdGVuY3ktbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3dhbGthZndhbGthL2dub21lLXNoZWxsLWV4dGVuc2lvbi1sYXRlbmN5LW1vbml0b3IiLAogICJ1dWlkIjogImxhdGVuY3ktbW9uaXRvckBnaXRsYWIubGFic2F0aG8ubWUiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "the-circles-widget@xenlism.github.io", "name": "The Circles - Desktop Widget", "pname": "the-circles-desktop-widget", "description": "Show System Infomations on Desktop as Circles Desktop Widget\n\nmore info \nhttps://www.linuxuprising.com/2020/11/display-clock-ram-and-cpu-usage-as.html", "link": "https://extensions.gnome.org/extension/3748/the-circles-desktop-widget/", "shell_version_map": {"38": {"version": "6", "sha256": "0kxync9gdjgcfq3vfhf5z0065n30jw5y5jl00hdgarsh4pkbji04", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgU3lzdGVtIEluZm9tYXRpb25zIG9uIERlc2t0b3AgYXMgQ2lyY2xlcyBEZXNrdG9wIFdpZGdldFxuXG5tb3JlIGluZm8gXG5odHRwczovL3d3dy5saW51eHVwcmlzaW5nLmNvbS8yMDIwLzExL2Rpc3BsYXktY2xvY2stcmFtLWFuZC1jcHUtdXNhZ2UtYXMuaHRtbCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0aGUtY2lyY2xlcy13aWRnZXQiLAogICJuYW1lIjogIlRoZSBDaXJjbGVzIC0gRGVza3RvcCBXaWRnZXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGhlLWNpcmNsZXMtd2lkZ2V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veGVubGlzbS9zaG93dGltZSIsCiAgInV1aWQiOiAidGhlLWNpcmNsZXMtd2lkZ2V0QHhlbmxpc20uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "12", "sha256": "0ngn00y97dqv667z47xahfv53dlb2asm0jbk9harlv4516jdrg0s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgU3lzdGVtIEluZm9tYXRpb25zIG9uIERlc2t0b3AgYXMgQ2lyY2xlcyBEZXNrdG9wIFdpZGdldFxuXG5tb3JlIGluZm8gXG5odHRwczovL3d3dy5saW51eHVwcmlzaW5nLmNvbS8yMDIwLzExL2Rpc3BsYXktY2xvY2stcmFtLWFuZC1jcHUtdXNhZ2UtYXMuaHRtbCIsCiAgImV4dGVuc2lvbi1pZCI6ICJ0aGUtY2lyY2xlcy13aWRnZXQiLAogICJuYW1lIjogIlRoZSBDaXJjbGVzIC0gRGVza3RvcCBXaWRnZXQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGhlLWNpcmNsZXMtd2lkZ2V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hlbmxpc20vc2hvd3RpbWUiLAogICJ1dWlkIjogInRoZS1jaXJjbGVzLXdpZGdldEB4ZW5saXNtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMgp9"}}} -, {"uuid": "overview_cleaner@gonza.com", "name": "Cleaner Overview", "pname": "cleaner-overview", "description": "Makes all the windows in the overview the same height and orders them by last recent used.", "link": "https://extensions.gnome.org/extension/3759/cleaner-overview/", "shell_version_map": {"38": {"version": "2", "sha256": "0k1q3b0x83ygjlysp39pv2i076zrhsxdlzf7yg3dq76nk98q3l2n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIGFsbCB0aGUgd2luZG93cyBpbiB0aGUgb3ZlcnZpZXcgdGhlIHNhbWUgaGVpZ2h0IGFuZCBvcmRlcnMgdGhlbSBieSBsYXN0IHJlY2VudCB1c2VkLiIsCiAgIm5hbWUiOiAiQ2xlYW5lciBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdG91Y2hwYWQtd2luZG93LXN3aXRjaGVyLWdub21lLWV4dC9ibG9iL21hc3Rlci90b3VjaHBhZF93aW5kb3dfc3dpdGNoZXIlNDBnb256YS5jb20vb3ZlcnZpZXdDbGVhbmVyLmpzIiwKICAidXVpZCI6ICJvdmVydmlld19jbGVhbmVyQGdvbnphLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "0k1q3b0x83ygjlysp39pv2i076zrhsxdlzf7yg3dq76nk98q3l2n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIGFsbCB0aGUgd2luZG93cyBpbiB0aGUgb3ZlcnZpZXcgdGhlIHNhbWUgaGVpZ2h0IGFuZCBvcmRlcnMgdGhlbSBieSBsYXN0IHJlY2VudCB1c2VkLiIsCiAgIm5hbWUiOiAiQ2xlYW5lciBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdG91Y2hwYWQtd2luZG93LXN3aXRjaGVyLWdub21lLWV4dC9ibG9iL21hc3Rlci90b3VjaHBhZF93aW5kb3dfc3dpdGNoZXIlNDBnb256YS5jb20vb3ZlcnZpZXdDbGVhbmVyLmpzIiwKICAidXVpZCI6ICJvdmVydmlld19jbGVhbmVyQGdvbnphLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "overview_cleaner@gonza.com", "name": "Cleaner Overview", "pname": "cleaner-overview", "description": "Makes all the windows in the overview the same height and orders them by last recent used.", "link": "https://extensions.gnome.org/extension/3759/cleaner-overview/", "shell_version_map": {"38": {"version": "3", "sha256": "16xljs0ym9cp7lxa36ls7p4z79s7h9q7azg32pvhflylx4bsyv2c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIGFsbCB0aGUgd2luZG93cyBpbiB0aGUgb3ZlcnZpZXcgdGhlIHNhbWUgaGVpZ2h0IGFuZCBvcmRlcnMgdGhlbSBieSBsYXN0IHJlY2VudCB1c2VkLiIsCiAgIm5hbWUiOiAiQ2xlYW5lciBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3RvdWNocGFkLXdpbmRvdy1zd2l0Y2hlci1nbm9tZS1leHQvYmxvYi9tYXN0ZXIvdG91Y2hwYWRfd2luZG93X3N3aXRjaGVyJTQwZ29uemEuY29tL292ZXJ2aWV3Q2xlYW5lci5qcyIsCiAgInV1aWQiOiAib3ZlcnZpZXdfY2xlYW5lckBnb256YS5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "16xljs0ym9cp7lxa36ls7p4z79s7h9q7azg32pvhflylx4bsyv2c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIGFsbCB0aGUgd2luZG93cyBpbiB0aGUgb3ZlcnZpZXcgdGhlIHNhbWUgaGVpZ2h0IGFuZCBvcmRlcnMgdGhlbSBieSBsYXN0IHJlY2VudCB1c2VkLiIsCiAgIm5hbWUiOiAiQ2xlYW5lciBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3RvdWNocGFkLXdpbmRvdy1zd2l0Y2hlci1nbm9tZS1leHQvYmxvYi9tYXN0ZXIvdG91Y2hwYWRfd2luZG93X3N3aXRjaGVyJTQwZ29uemEuY29tL292ZXJ2aWV3Q2xlYW5lci5qcyIsCiAgInV1aWQiOiAib3ZlcnZpZXdfY2xlYW5lckBnb256YS5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "16xljs0ym9cp7lxa36ls7p4z79s7h9q7azg32pvhflylx4bsyv2c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIGFsbCB0aGUgd2luZG93cyBpbiB0aGUgb3ZlcnZpZXcgdGhlIHNhbWUgaGVpZ2h0IGFuZCBvcmRlcnMgdGhlbSBieSBsYXN0IHJlY2VudCB1c2VkLiIsCiAgIm5hbWUiOiAiQ2xlYW5lciBPdmVydmlldyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3RvdWNocGFkLXdpbmRvdy1zd2l0Y2hlci1nbm9tZS1leHQvYmxvYi9tYXN0ZXIvdG91Y2hwYWRfd2luZG93X3N3aXRjaGVyJTQwZ29uemEuY29tL292ZXJ2aWV3Q2xlYW5lci5qcyIsCiAgInV1aWQiOiAib3ZlcnZpZXdfY2xlYW5lckBnb256YS5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "battery-status@atareao.es", "name": "Battery Status", "pname": "battery-status", "description": "Get information about your battery status", "link": "https://extensions.gnome.org/extension/3763/battery-status/", "shell_version_map": {"40": {"version": "5", "sha256": "0mg30q1cgzmf70ikbm623fflhz392xkan0d8cpslnmkgx0z6nczv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGJhdHRlcnkgc3RhdHVzIiwKICAiZXh0ZW5zaW9uLWlkIjogImJhdHRlcnktc3RhdHVzQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXN0YXR1c0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJiYXR0ZXJ5LXN0YXR1cy1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLmJhdHRlcnktc3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F0YXJlYW8vYmF0dGVyeS1zdGF0dXMiLAogICJ1dWlkIjogImJhdHRlcnktc3RhdHVzQGF0YXJlYW8uZXMiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "distinct@sireliah.com", "name": "Distinct Windows", "pname": "distinct-windows", "description": "Visually differentiate windows with colors and symbols", "link": "https://extensions.gnome.org/extension/3769/distinct-windows/", "shell_version_map": {"38": {"version": "4", "sha256": "1iqga92l9mk3ykf8bdy9igvqfx9k78jasdmqsrrz9zcz33d7k4h7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc3VhbGx5IGRpZmZlcmVudGlhdGUgd2luZG93cyB3aXRoIGNvbG9ycyBhbmQgc3ltYm9scyIsCiAgIm5hbWUiOiAiRGlzdGluY3QgV2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NpcmVsaWFoL2Rpc3RpbmN0LXdpbmRvd3MiLAogICJ1dWlkIjogImRpc3RpbmN0QHNpcmVsaWFoLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "miniCal2@breiq", "name": "Minimalist Calendar 2", "pname": "minimalist-calendar-2", "description": "Remove event list and clock/calendar app buttons from the calendar window.", "link": "https://extensions.gnome.org/extension/3775/minimalist-calendar-2/", "shell_version_map": {"38": {"version": "1", "sha256": "1nh10ik3zk3r4jr31mr8nw8nnamgj3mk1f3im06657wv18x9wvam", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBldmVudCBsaXN0IGFuZCBjbG9jay9jYWxlbmRhciBhcHAgYnV0dG9ucyBmcm9tIHRoZSBjYWxlbmRhciB3aW5kb3cuIiwKICAibmFtZSI6ICJNaW5pbWFsaXN0IENhbGVuZGFyIDIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibWluaUNhbDJAYnJlaXEiLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "ddterm@amezin.github.com", "name": "ddterm", "pname": "ddterm", "description": "Another drop down terminal extension for GNOME Shell. With tabs. Works on Wayland natively", "link": "https://extensions.gnome.org/extension/3780/ddterm/", "shell_version_map": {"38": {"version": "25", "sha256": "09f6v6xm88za18a8ravly6rvixpy8q1xdl9z0466shnkwdcfbqwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1lemluL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZHRlcm0iLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "40": {"version": "25", "sha256": "09f6v6xm88za18a8ravly6rvixpy8q1xdl9z0466shnkwdcfbqwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1lemluL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZHRlcm0iLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "41": {"version": "25", "sha256": "09f6v6xm88za18a8ravly6rvixpy8q1xdl9z0466shnkwdcfbqwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1lemluL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZHRlcm0iLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}}} +, {"uuid": "ddterm@amezin.github.com", "name": "ddterm", "pname": "ddterm", "description": "Another drop down terminal extension for GNOME Shell. With tabs. Works on Wayland natively", "link": "https://extensions.gnome.org/extension/3780/ddterm/", "shell_version_map": {"38": {"version": "28", "sha256": "1fn7rzqwqpcc46c1yz7swz7gg9x8x04wzqcc0xscgyqcfhg64p98", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}, "40": {"version": "28", "sha256": "1fn7rzqwqpcc46c1yz7swz7gg9x8x04wzqcc0xscgyqcfhg64p98", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}, "41": {"version": "28", "sha256": "1fn7rzqwqpcc46c1yz7swz7gg9x8x04wzqcc0xscgyqcfhg64p98", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}}} , {"uuid": "favorites-only-dash@nahuelwexd.github.io", "name": "Favorites-only Dash", "pname": "favorites-only-dash", "description": "Show only favorite apps on Dash", "link": "https://extensions.gnome.org/extension/3789/favorites-only-dash/", "shell_version_map": {"38": {"version": "1", "sha256": "110h019563j33gksaq5fs0z71sz1mslq1sbsmhk9mj3qggd9vs65", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgb25seSBmYXZvcml0ZSBhcHBzIG9uIERhc2giLAogICJuYW1lIjogIkZhdm9yaXRlcy1vbmx5IERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZmF2b3JpdGVzLW9ubHktZGFzaEBuYWh1ZWx3ZXhkLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "notification-timeout@chlumskyvaclav.gmail.com", "name": "Notification Timeout", "pname": "notification-timeout", "description": "This extension allows configuring the same timeout for all notifications. It also allows ignoring the idle state.", "link": "https://extensions.gnome.org/extension/3795/notification-timeout/", "shell_version_map": {"38": {"version": "4", "sha256": "14hns3mw3rk6az31pck3rnsj74n98swaiv1ky57d0gs9409zha6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25vdGlmaWNhdGlvbi10aW1lb3V0IiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tdGltZW91dEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "14hns3mw3rk6az31pck3rnsj74n98swaiv1ky57d0gs9409zha6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25vdGlmaWNhdGlvbi10aW1lb3V0IiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tdGltZW91dEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "14hns3mw3rk6az31pck3rnsj74n98swaiv1ky57d0gs9409zha6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmNobHVtL25vdGlmaWNhdGlvbi10aW1lb3V0IiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tdGltZW91dEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "podman-as-docker@alberto.yomerengues.xyz", "name": "Podman and Docker", "pname": "podman-as-docker", "description": "podman extension as docker\nIn order to get it work on podman, you just need to create an alias\nSimply put: alias docker=podman\nand install podman-docker", "link": "https://extensions.gnome.org/extension/3799/podman-as-docker/", "shell_version_map": {"38": {"version": "1", "sha256": "18bkd6z5hm6zidh7xv8v3jvj36lmxzx4dar7nwa7nq3p51km6crz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInBvZG1hbiBleHRlbnNpb24gYXMgZG9ja2VyXG5JbiBvcmRlciB0byBnZXQgaXQgd29yayBvbiBwb2RtYW4sIHlvdSBqdXN0IG5lZWQgdG8gY3JlYXRlIGFuIGFsaWFzXG5TaW1wbHkgcHV0OiBhbGlhcyBkb2NrZXI9cG9kbWFuXG5hbmQgaW5zdGFsbCBwb2RtYW4tZG9ja2VyIiwKICAibmFtZSI6ICJQb2RtYW4gYW5kIERvY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJwb2RtYW4tYXMtZG9ja2VyQGFsYmVydG8ueW9tZXJlbmd1ZXMueHl6IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "wacom-indicator@fthx", "name": "Wacom Indicator", "pname": "wacom-indicator", "description": "Wacom tablet indicator in the top bar: connection state and power level.\n\n On click: open GNOME Settings Wacom section. On hover or every minute: update connection state and power level.\n\n Settings (in extension.js file headers): show/hide model label, refresh delay, update/do nothing on indicator hover, show/hide if disconnected.", "link": "https://extensions.gnome.org/extension/3809/wacom-indicator/", "shell_version_map": {"38": {"version": "7", "sha256": "1sda66n1s3d28jd98xcznw5ljv10iwndpcbq7bfm5hqzrk8zimid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhY29tIHRhYmxldCBpbmRpY2F0b3IgaW4gdGhlIHRvcCBiYXI6IGNvbm5lY3Rpb24gc3RhdGUgYW5kIHBvd2VyIGxldmVsLlxuXG4gT24gY2xpY2s6IG9wZW4gR05PTUUgU2V0dGluZ3MgV2Fjb20gc2VjdGlvbi4gT24gaG92ZXIgb3IgZXZlcnkgbWludXRlOiB1cGRhdGUgY29ubmVjdGlvbiBzdGF0ZSBhbmQgcG93ZXIgbGV2ZWwuXG5cbiBTZXR0aW5ncyAoaW4gZXh0ZW5zaW9uLmpzIGZpbGUgaGVhZGVycyk6IHNob3cvaGlkZSBtb2RlbCBsYWJlbCwgcmVmcmVzaCBkZWxheSwgdXBkYXRlL2RvIG5vdGhpbmcgb24gaW5kaWNhdG9yIGhvdmVyLCBzaG93L2hpZGUgaWYgZGlzY29ubmVjdGVkLiIsCiAgIm5hbWUiOiAiV2Fjb20gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd2Fjb20taW5kaWNhdG9yIiwKICAidXVpZCI6ICJ3YWNvbS1pbmRpY2F0b3JAZnRoeCIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "1sda66n1s3d28jd98xcznw5ljv10iwndpcbq7bfm5hqzrk8zimid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhY29tIHRhYmxldCBpbmRpY2F0b3IgaW4gdGhlIHRvcCBiYXI6IGNvbm5lY3Rpb24gc3RhdGUgYW5kIHBvd2VyIGxldmVsLlxuXG4gT24gY2xpY2s6IG9wZW4gR05PTUUgU2V0dGluZ3MgV2Fjb20gc2VjdGlvbi4gT24gaG92ZXIgb3IgZXZlcnkgbWludXRlOiB1cGRhdGUgY29ubmVjdGlvbiBzdGF0ZSBhbmQgcG93ZXIgbGV2ZWwuXG5cbiBTZXR0aW5ncyAoaW4gZXh0ZW5zaW9uLmpzIGZpbGUgaGVhZGVycyk6IHNob3cvaGlkZSBtb2RlbCBsYWJlbCwgcmVmcmVzaCBkZWxheSwgdXBkYXRlL2RvIG5vdGhpbmcgb24gaW5kaWNhdG9yIGhvdmVyLCBzaG93L2hpZGUgaWYgZGlzY29ubmVjdGVkLiIsCiAgIm5hbWUiOiAiV2Fjb20gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd2Fjb20taW5kaWNhdG9yIiwKICAidXVpZCI6ICJ3YWNvbS1pbmRpY2F0b3JAZnRoeCIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "hibernate@dafne.rocks", "name": "System Action - Hibernate", "pname": "system-action-hibernate", "description": "A GNOME extension that adds the option to hibernate amongst other system actions", "link": "https://extensions.gnome.org/extension/3814/system-action-hibernate/", "shell_version_map": {"38": {"version": "8", "sha256": "1rriknzx54f4wlfjm6wrcy9s86vchi5n3p3qp8lx52dsv36a22an", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "1rriknzx54f4wlfjm6wrcy9s86vchi5n3p3qp8lx52dsv36a22an", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "click-to-close-overview@l3nn4rt.github.io", "name": "Click to close overview", "pname": "click-to-close-overview", "description": "Close the overview by clicking empty space.", "link": "https://extensions.gnome.org/extension/3826/click-to-close-overview/", "shell_version_map": {"38": {"version": "3", "sha256": "17xd3k1xpsn8ma6f11f4sr26y5xbcs3hiw7lv1qqrn80lyjj2vz1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbDNubjRydC9jbGljay10by1jbG9zZS1vdmVydmlldyIsCiAgInV1aWQiOiAiY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "5", "sha256": "1h12bhqac4zyvsj6xbjr7hnyah3bnbbx0r8ihblkw5l7a67ix1ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sM25uNHJ0L2NsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJjbGljay10by1jbG9zZS1vdmVydmlld0BsM25uNHJ0LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1h12bhqac4zyvsj6xbjr7hnyah3bnbbx0r8ihblkw5l7a67ix1ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sM25uNHJ0L2NsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJjbGljay10by1jbG9zZS1vdmVydmlld0BsM25uNHJ0LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"uuid": "just-perfection-desktop@just-perfection", "name": "Just Perfection", "pname": "just-perfection", "description": "Tweak Tool to Customize GNOME Shell and Disable UI Elements\n\n- Accessibility Menu Visibility\n- Activities Button Icon Visibility\n- Activities button Visibility\n- Always Show Workspace Switcher on Dynamic Workspaces (40, 41)\n- Animation Speed or Disable it\n- App Gesture (3.36, 3.38)\n- Applications Button Visibility\n- App Menu Icon Visibility\n- App Menu Visibility\n- Background Menu Visibility\n- Clock Menu Position\n- Clock Menu Visibility\n- Dash Icon Size\n- Dash Visibility\n- Disable Type to Search\n- Double Super Key to App Grid\n- GNOME Shell Theme Override\n- Hot Corner\n- Keyboard Layout Visibility\n- Notification Banner Position\n- OSD Visibility\n- Panel Arrow Visibility(3.36, 3.38)\n- Panel Button Padding Size\n- Panel Height\n- Panel Indicator Padding Size\n- Panel Notification icon Visibility\n- Panel Position\n- Panel Round Corner Size\n- Panel Visibility\n- Panel Visibility in Overview\n- Power Icon Visibility\n- Ripple Box\n- Search Visibility\n- Startup Status(40, 41)\n- System Menu (Aggregate Menu) Visibility\n- Window Demands Attention Focus\n- Window Picker Caption Visibility\n- Window Picker Close Button Visibility\n- Window Picker Icon(40, 41)\n- Workspace Background Corner Size in Overview(40, 41)\n- Workspace Popup Visibility\n- Workspaces in app grid Visibility (40, 41)\n- Workspace Switcher Size (40, 41)\n- Workspace Switcher Visibility\n- Workspace Wraparound", "link": "https://extensions.gnome.org/extension/3843/just-perfection/", "shell_version_map": {"38": {"version": "16", "sha256": "1y03n2p1jpdz7chzw3jrfbgy6zaav30rj6cc4cf6j1p0xl8wrn31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lclxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEpXG4tIFN5c3RlbSBNZW51IChBZ2dyZWdhdGUgTWVudSkgVmlzaWJpbGl0eVxuLSBXaW5kb3cgRGVtYW5kcyBBdHRlbnRpb24gRm9jdXNcbi0gV2luZG93IFBpY2tlciBDYXB0aW9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBDbG9zZSBCdXR0b24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIEljb24oNDAsIDQxKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyg0MCwgNDEpXG4tIFdvcmtzcGFjZSBQb3B1cCBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZXMgaW4gYXBwIGdyaWQgVmlzaWJpbGl0eSAoNDAsIDQxKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZCIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "40": {"version": "16", "sha256": "1y03n2p1jpdz7chzw3jrfbgy6zaav30rj6cc4cf6j1p0xl8wrn31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lclxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEpXG4tIFN5c3RlbSBNZW51IChBZ2dyZWdhdGUgTWVudSkgVmlzaWJpbGl0eVxuLSBXaW5kb3cgRGVtYW5kcyBBdHRlbnRpb24gRm9jdXNcbi0gV2luZG93IFBpY2tlciBDYXB0aW9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBDbG9zZSBCdXR0b24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIEljb24oNDAsIDQxKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyg0MCwgNDEpXG4tIFdvcmtzcGFjZSBQb3B1cCBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZXMgaW4gYXBwIGdyaWQgVmlzaWJpbGl0eSAoNDAsIDQxKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZCIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "41": {"version": "16", "sha256": "1y03n2p1jpdz7chzw3jrfbgy6zaav30rj6cc4cf6j1p0xl8wrn31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lclxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBOb3RpZmljYXRpb24gQmFubmVyIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEpXG4tIFN5c3RlbSBNZW51IChBZ2dyZWdhdGUgTWVudSkgVmlzaWJpbGl0eVxuLSBXaW5kb3cgRGVtYW5kcyBBdHRlbnRpb24gRm9jdXNcbi0gV2luZG93IFBpY2tlciBDYXB0aW9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBDbG9zZSBCdXR0b24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIEljb24oNDAsIDQxKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyg0MCwgNDEpXG4tIFdvcmtzcGFjZSBQb3B1cCBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZXMgaW4gYXBwIGdyaWQgVmlzaWJpbGl0eSAoNDAsIDQxKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2UgV3JhcGFyb3VuZCIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDE2Cn0="}}} +, {"uuid": "just-perfection-desktop@just-perfection", "name": "Just Perfection", "pname": "just-perfection", "description": "Tweak Tool to Customize GNOME Shell, Change the Behavior and Disable UI Elements\n\n- Accessibility Menu Visibility\n- Activities Button Icon Visibility\n- Activities button Visibility\n- Always Show Workspace Switcher on Dynamic Workspaces (40, 41)\n- Animation Speed or Disable it\n- App Gesture (3.36, 3.38)\n- Applications Button Visibility\n- App Menu Icon Visibility\n- App Menu Visibility\n- Background Menu Visibility\n- Clock Menu Position\n- Clock Menu Visibility\n- Dash Icon Size\n- Dash Visibility\n- Disable Type to Search\n- Double Super Key to App Grid\n- GNOME Shell Theme Override\n- Hot Corner (3.36, 3.38, 40)\n- Keyboard Layout Visibility\n- Notification Banner Position\n- OSD Visibility\n- Panel Arrow Visibility(3.36, 3.38)\n- Panel Button Padding Size\n- Panel Height\n- Panel icon size \n- Panel Indicator Padding Size\n- Panel Notification icon Visibility\n- Panel Position\n- Panel Round Corner Size (3.36, 3.38, 40, 41)\n- Panel Visibility\n- Panel Visibility in Overview\n- Power Icon Visibility\n- Ripple Box\n- Search Visibility\n- Startup Status(40, 41)\n- System Menu (Aggregate Menu) Visibility\n- Weather Visibility\n- Window Demands Attention Focus\n- Window Picker Caption Visibility\n- Window Picker Close Button Visibility\n- Window Picker Icon(40, 41)\n- Workspace Background Corner Size in Overview(40, 41)\n- Workspace Popup Visibility\n- Workspaces in app grid Visibility (40, 41)\n- Workspace Switcher Size (40, 41)\n- Workspace Switcher Visibility\n- Workspace Wraparound\n- World Clock Visibility", "link": "https://extensions.gnome.org/extension/3843/just-perfection/", "shell_version_map": {"38": {"version": "19", "sha256": "03rw7lwzd481ynrgc3vhnhjnw7vyrjcfn80cy7af8dmvlqcx0299", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lciAoMy4zNiwgMy4zOCwgNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNiwgMy4zOCwgNDAsIDQxKVxuLSBQYW5lbCBWaXNpYmlsaXR5XG4tIFBhbmVsIFZpc2liaWxpdHkgaW4gT3ZlcnZpZXdcbi0gUG93ZXIgSWNvbiBWaXNpYmlsaXR5XG4tIFJpcHBsZSBCb3hcbi0gU2VhcmNoIFZpc2liaWxpdHlcbi0gU3RhcnR1cCBTdGF0dXMoNDAsIDQxKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbig0MCwgNDEpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3KDQwLCA0MSlcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBTaXplICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "40": {"version": "19", "sha256": "03rw7lwzd481ynrgc3vhnhjnw7vyrjcfn80cy7af8dmvlqcx0299", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lciAoMy4zNiwgMy4zOCwgNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNiwgMy4zOCwgNDAsIDQxKVxuLSBQYW5lbCBWaXNpYmlsaXR5XG4tIFBhbmVsIFZpc2liaWxpdHkgaW4gT3ZlcnZpZXdcbi0gUG93ZXIgSWNvbiBWaXNpYmlsaXR5XG4tIFJpcHBsZSBCb3hcbi0gU2VhcmNoIFZpc2liaWxpdHlcbi0gU3RhcnR1cCBTdGF0dXMoNDAsIDQxKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbig0MCwgNDEpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3KDQwLCA0MSlcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBTaXplICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "41": {"version": "19", "sha256": "03rw7lwzd481ynrgc3vhnhjnw7vyrjcfn80cy7af8dmvlqcx0299", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lciAoMy4zNiwgMy4zOCwgNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNiwgMy4zOCwgNDAsIDQxKVxuLSBQYW5lbCBWaXNpYmlsaXR5XG4tIFBhbmVsIFZpc2liaWxpdHkgaW4gT3ZlcnZpZXdcbi0gUG93ZXIgSWNvbiBWaXNpYmlsaXR5XG4tIFJpcHBsZSBCb3hcbi0gU2VhcmNoIFZpc2liaWxpdHlcbi0gU3RhcnR1cCBTdGF0dXMoNDAsIDQxKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbig0MCwgNDEpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3KDQwLCA0MSlcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBTaXplICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "42": {"version": "19", "sha256": "03rw7lwzd481ynrgc3vhnhjnw7vyrjcfn80cy7af8dmvlqcx0299", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx3YXlzIFNob3cgV29ya3NwYWNlIFN3aXRjaGVyIG9uIER5bmFtaWMgV29ya3NwYWNlcyAoNDAsIDQxKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBWaXNpYmlsaXR5XG4tIEJhY2tncm91bmQgTWVudSBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gR05PTUUgU2hlbGwgVGhlbWUgT3ZlcnJpZGVcbi0gSG90IENvcm5lciAoMy4zNiwgMy4zOCwgNDApXG4tIEtleWJvYXJkIExheW91dCBWaXNpYmlsaXR5XG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSgzLjM2LCAzLjM4KVxuLSBQYW5lbCBCdXR0b24gUGFkZGluZyBTaXplXG4tIFBhbmVsIEhlaWdodFxuLSBQYW5lbCBpY29uIHNpemUgXG4tIFBhbmVsIEluZGljYXRvciBQYWRkaW5nIFNpemVcbi0gUGFuZWwgTm90aWZpY2F0aW9uIGljb24gVmlzaWJpbGl0eVxuLSBQYW5lbCBQb3NpdGlvblxuLSBQYW5lbCBSb3VuZCBDb3JuZXIgU2l6ZSAoMy4zNiwgMy4zOCwgNDAsIDQxKVxuLSBQYW5lbCBWaXNpYmlsaXR5XG4tIFBhbmVsIFZpc2liaWxpdHkgaW4gT3ZlcnZpZXdcbi0gUG93ZXIgSWNvbiBWaXNpYmlsaXR5XG4tIFJpcHBsZSBCb3hcbi0gU2VhcmNoIFZpc2liaWxpdHlcbi0gU3RhcnR1cCBTdGF0dXMoNDAsIDQxKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHlcbi0gV2VhdGhlciBWaXNpYmlsaXR5XG4tIFdpbmRvdyBEZW1hbmRzIEF0dGVudGlvbiBGb2N1c1xuLSBXaW5kb3cgUGlja2VyIENhcHRpb24gVmlzaWJpbGl0eVxuLSBXaW5kb3cgUGlja2VyIENsb3NlIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgSWNvbig0MCwgNDEpXG4tIFdvcmtzcGFjZSBCYWNrZ3JvdW5kIENvcm5lciBTaXplIGluIE92ZXJ2aWV3KDQwLCA0MSlcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBTaXplICg0MCwgNDEpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} , {"uuid": "workspaces-bar@fthx", "name": "Workspaces Bar", "pname": "workspaces-bar", "description": "Replace 'Activities' button by all current workspaces buttons. Switch workspace or toggle overview by clicking on these buttons.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.", "link": "https://extensions.gnome.org/extension/3851/workspaces-bar/", "shell_version_map": {"38": {"version": "12", "sha256": "1rskz8llic5g8cix4mb6iha9v789fg6yn2i25zj0ywb9qn063ld5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC93b3Jrc3BhY2VzLWJhciIsCiAgInV1aWQiOiAid29ya3NwYWNlcy1iYXJAZnRoeCIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "1rskz8llic5g8cix4mb6iha9v789fg6yn2i25zj0ywb9qn063ld5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC93b3Jrc3BhY2VzLWJhciIsCiAgInV1aWQiOiAid29ya3NwYWNlcy1iYXJAZnRoeCIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "1rskz8llic5g8cix4mb6iha9v789fg6yn2i25zj0ywb9qn063ld5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC93b3Jrc3BhY2VzLWJhciIsCiAgInV1aWQiOiAid29ya3NwYWNlcy1iYXJAZnRoeCIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "scanlines-effect@muratcileli.com", "name": "Scanlines Effect", "pname": "scanlines-effect", "description": "Retro monitor / CRT TV effect.", "link": "https://extensions.gnome.org/extension/3860/scanlines-effect/", "shell_version_map": {"38": {"version": "1", "sha256": "1xcsd700s9hkqmrqlv56ldiya2jk0d46j8k4a4i3m9c6k40c5z7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJldHJvIG1vbml0b3IgLyBDUlQgVFYgZWZmZWN0LiIsCiAgIm5hbWUiOiAiU2NhbmxpbmVzIEVmZmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJjb20ubXVyYXRjaWxlbGkuc2NhbmxpbmVzLWVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211cmF0LWNpbGVsaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NhbmxpbmVzLWVmZmVjdCIsCiAgInV1aWQiOiAic2NhbmxpbmVzLWVmZmVjdEBtdXJhdGNpbGVsaS5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "workspaces-thumbnails-applet@blogdron", "name": "Workspaces Thumbnails Applet", "pname": "workspaces-thumbnails-applet", "description": "Notice!\n\nThis is a fork of the extension https://extensions.gnome.org/extension/2557/workspaces-thumbnails/ It hasn't been updated in a long time, but it only needs a small fix to work. Until the author fixes the problem, I will keep this fork. Please, if you have the opportunity to contact the author of the original extension, let him fix the problem for himself.\n\n\nPut an indicator on the panel showing all the workspaces thumbnails, allowing to switch between them or moving windows to another workspace.\n\n This is a very tiny fork of the original (GNOME official extension) Workspace Indicator, allowing to use it like when the Horizontal Workspaces extension is activated. The vertical workspaces layout is not modified; the workspaces layout is horizontal only in the top panel and the workspaces switcher in the overview is still showed. Please note that any global bug should be reported against the Workspace Indicator extension. https://extensions.gnome.org/extension/21/workspace-indicator", "link": "https://extensions.gnome.org/extension/3872/workspaces-thumbnails-applet/", "shell_version_map": {"38": {"version": "1", "sha256": "02823b6rfnibb0mhnx848pdxc3birw2aqp8607wjf93mvy5388hm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGljZSFcblxuVGhpcyBpcyBhIGZvcmsgb2YgdGhlIGV4dGVuc2lvbiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8yNTU3L3dvcmtzcGFjZXMtdGh1bWJuYWlscy8gSXQgaGFzbid0IGJlZW4gdXBkYXRlZCBpbiBhIGxvbmcgdGltZSwgYnV0IGl0IG9ubHkgbmVlZHMgYSBzbWFsbCBmaXggdG8gd29yay4gVW50aWwgdGhlIGF1dGhvciBmaXhlcyB0aGUgcHJvYmxlbSwgSSB3aWxsIGtlZXAgdGhpcyBmb3JrLiBQbGVhc2UsIGlmIHlvdSBoYXZlIHRoZSBvcHBvcnR1bml0eSB0byBjb250YWN0IHRoZSBhdXRob3Igb2YgdGhlIG9yaWdpbmFsIGV4dGVuc2lvbiwgbGV0IGhpbSBmaXggdGhlIHByb2JsZW0gZm9yIGhpbXNlbGYuXG5cblxuUHV0IGFuIGluZGljYXRvciBvbiB0aGUgcGFuZWwgc2hvd2luZyBhbGwgdGhlIHdvcmtzcGFjZXMgdGh1bWJuYWlscywgYWxsb3dpbmcgdG8gc3dpdGNoIGJldHdlZW4gdGhlbSBvciBtb3Zpbmcgd2luZG93cyB0byBhbm90aGVyIHdvcmtzcGFjZS5cblxuIFRoaXMgaXMgYSB2ZXJ5IHRpbnkgZm9yayBvZiB0aGUgb3JpZ2luYWwgKEdOT01FIG9mZmljaWFsIGV4dGVuc2lvbikgV29ya3NwYWNlIEluZGljYXRvciwgYWxsb3dpbmcgdG8gdXNlIGl0IGxpa2Ugd2hlbiB0aGUgSG9yaXpvbnRhbCBXb3Jrc3BhY2VzIGV4dGVuc2lvbiBpcyBhY3RpdmF0ZWQuIFRoZSB2ZXJ0aWNhbCB3b3Jrc3BhY2VzIGxheW91dCBpcyBub3QgbW9kaWZpZWQ7IHRoZSB3b3Jrc3BhY2VzIGxheW91dCBpcyBob3Jpem9udGFsIG9ubHkgaW4gdGhlIHRvcCBwYW5lbCBhbmQgdGhlIHdvcmtzcGFjZXMgc3dpdGNoZXIgaW4gdGhlIG92ZXJ2aWV3IGlzIHN0aWxsIHNob3dlZC4gUGxlYXNlIG5vdGUgdGhhdCBhbnkgZ2xvYmFsIGJ1ZyBzaG91bGQgYmUgcmVwb3J0ZWQgYWdhaW5zdCB0aGUgV29ya3NwYWNlIEluZGljYXRvciBleHRlbnNpb24uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzIxL3dvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJleHRlbnNpb24taWQiOiAid29ya3NwYWNlcy10aHVtYm5haWxzLWFwcGxldCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIldvcmtzcGFjZXMgVGh1bWJuYWlscyBBcHBsZXQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiLAogICAgImJsb2dkcm9uIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtdGh1bWJuYWlscy1hcHBsZXRAYmxvZ2Ryb24iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "simple-monitor@fcaballerop.github.io", "name": "Simple monitor", "pname": "simple-monitor", "description": "It cases stuttering in videos for some users, this extension is not being updated.\nA simple panel button that shows CPU and RAM memory usage. Clicking shows the top 10 processes using CPU and memory.", "link": "https://extensions.gnome.org/extension/3891/simple-monitor/", "shell_version_map": {"38": {"version": "5", "sha256": "1gff73ddb7yinxzdqq1cliqf1xlav16j31wlc7nsnl899zj0cd5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGNhc2VzIHN0dXR0ZXJpbmcgaW4gdmlkZW9zIGZvciBzb21lIHVzZXJzLCB0aGlzIGV4dGVuc2lvbiBpcyBub3QgYmVpbmcgdXBkYXRlZC5cbkEgc2ltcGxlIHBhbmVsIGJ1dHRvbiB0aGF0IHNob3dzIENQVSBhbmQgUkFNIG1lbW9yeSB1c2FnZS4gQ2xpY2tpbmcgc2hvd3MgdGhlIHRvcCAxMCBwcm9jZXNzZXMgdXNpbmcgQ1BVIGFuZCBtZW1vcnkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXhhbXBsZSIsCiAgIm5hbWUiOiAiU2ltcGxlIG1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc21vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2ltcGxlLW1vbml0b3JAZmNhYmFsbGVyb3AuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "NetworkSpeed@m0hithreddy", "name": "Network Speed", "pname": "network-speed", "description": "Highly customizable Network Speed Monitor.\n\nQuick install: \n\n/bin/bash -c \"$(curl -sL https://git.io/JkFoh)\"\n\nWhat's in this extension:\n\n* Preference Menu to customize the extension.\n* Five configurable network speed modes.\n 1. Total net speed in [g, m, k]b/s.\n 2. Total net speed in [G, M, K]B/s.\n 3. Up and down the speed in [g, m, k]b/s.\n 4. Up and down the speed in [G, M, K]B/s.\n 5. Total Downloaded in [G, M, K]B.\n* Extension color can be customizable.\n* Option to show upload speed first in modes 3 and 4.\n* Align the extension horizontally or vertically.\n* Different font sizes.\n* Option to autohide the extension, when idle.\n\nMouse click events on the extension:\n\n* Left click: Cycle through the modes.\n* Right-click in the first four modes: Toggle the visibility of total downloaded.\n* Right-click in the fifth mode: Reset total downloaded.\n* Four consecutive right-clicks: Toggle the horizontal/vertical alignment.\n* Middle click: Cycle through the font sizes.\n\nThanks to bijignome of creating the extension. Special thanks to prateekmedia for giving rebirth to the extension.\n\nWhat I added:\n\n* Revamping the whole codebase to create a roadmap for many feature additions.\n* Color customizations, Upload speed first, AutoHide.\n* Adopted Make build system to manage the extension (for developers).\n* Quick install method.", "link": "https://extensions.gnome.org/extension/3896/network-speed/", "shell_version_map": {"38": {"version": "1", "sha256": "0029mjirbg2hdk1ms95p29hmf8ahvfjyrsw9079nbds9p7za9f9n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgTmV0d29yayBTcGVlZCBNb25pdG9yLlxuXG5RdWljayBpbnN0YWxsOiBcblxuL2Jpbi9iYXNoIC1jIFwiJChjdXJsIC1zTCBodHRwczovL2dpdC5pby9Ka0ZvaClcIlxuXG5XaGF0J3MgaW4gdGhpcyBleHRlbnNpb246XG5cbiogUHJlZmVyZW5jZSBNZW51IHRvIGN1c3RvbWl6ZSB0aGUgZXh0ZW5zaW9uLlxuKiBGaXZlIGNvbmZpZ3VyYWJsZSBuZXR3b3JrIHNwZWVkIG1vZGVzLlxuICAgMS4gVG90YWwgbmV0IHNwZWVkIGluIFtnLCBtLCBrXWIvcy5cbiAgIDIuIFRvdGFsIG5ldCBzcGVlZCBpbiBbRywgTSwgS11CL3MuXG4gICAzLiBVcCBhbmQgZG93biB0aGUgc3BlZWQgaW4gW2csIG0sIGtdYi9zLlxuICAgNC4gVXAgYW5kIGRvd24gdGhlIHNwZWVkIGluIFtHLCBNLCBLXUIvcy5cbiAgIDUuIFRvdGFsIERvd25sb2FkZWQgaW4gW0csIE0sIEtdQi5cbiogRXh0ZW5zaW9uIGNvbG9yIGNhbiBiZSBjdXN0b21pemFibGUuXG4qIE9wdGlvbiB0byBzaG93IHVwbG9hZCBzcGVlZCBmaXJzdCBpbiBtb2RlcyAzIGFuZCA0LlxuKiBBbGlnbiB0aGUgZXh0ZW5zaW9uIGhvcml6b250YWxseSBvciB2ZXJ0aWNhbGx5LlxuKiBEaWZmZXJlbnQgZm9udCBzaXplcy5cbiogT3B0aW9uIHRvIGF1dG9oaWRlIHRoZSBleHRlbnNpb24sIHdoZW4gaWRsZS5cblxuTW91c2UgY2xpY2sgZXZlbnRzIG9uIHRoZSBleHRlbnNpb246XG5cbiogTGVmdCBjbGljazogQ3ljbGUgdGhyb3VnaCB0aGUgbW9kZXMuXG4qIFJpZ2h0LWNsaWNrIGluIHRoZSBmaXJzdCBmb3VyIG1vZGVzOiBUb2dnbGUgdGhlIHZpc2liaWxpdHkgb2YgdG90YWwgZG93bmxvYWRlZC5cbiogUmlnaHQtY2xpY2sgaW4gdGhlIGZpZnRoIG1vZGU6IFJlc2V0IHRvdGFsIGRvd25sb2FkZWQuXG4qIEZvdXIgY29uc2VjdXRpdmUgcmlnaHQtY2xpY2tzOiBUb2dnbGUgdGhlIGhvcml6b250YWwvdmVydGljYWwgYWxpZ25tZW50LlxuKiBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuXG5cblRoYW5rcyB0byBiaWppZ25vbWUgb2YgY3JlYXRpbmcgdGhlIGV4dGVuc2lvbi4gU3BlY2lhbCB0aGFua3MgdG8gcHJhdGVla21lZGlhIGZvciBnaXZpbmcgcmViaXJ0aCB0byB0aGUgZXh0ZW5zaW9uLlxuXG5XaGF0IEkgYWRkZWQ6XG5cbiogUmV2YW1waW5nIHRoZSB3aG9sZSBjb2RlYmFzZSB0byBjcmVhdGUgYSByb2FkbWFwIGZvciBtYW55IGZlYXR1cmUgYWRkaXRpb25zLlxuKiBDb2xvciBjdXN0b21pemF0aW9ucywgVXBsb2FkIHNwZWVkIGZpcnN0LCBBdXRvSGlkZS5cbiogQWRvcHRlZCBNYWtlIGJ1aWxkIHN5c3RlbSB0byBtYW5hZ2UgdGhlIGV4dGVuc2lvbiAoZm9yIGRldmVsb3BlcnMpLlxuKiBRdWljayBpbnN0YWxsIG1ldGhvZC4iLAogICJuYW1lIjogIk5ldHdvcmsgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tMGhpdGhyZWRkeS9OZXR3b3JrU3BlZWQiLAogICJ1dWlkIjogIk5ldHdvcmtTcGVlZEBtMGhpdGhyZWRkeSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "eye-extended-fix@als.kz", "name": "Eye and Mouse Extended", "pname": "eye-and-mouse-extended", "description": "Adds an eye to the indicator bar that follows your cursor \nYou can also display the mouse indicator, perhaps it will help you with the problem of displaying the mouse cursor in Skype. Import fix of original extension https://github.com/alexeylovchikov/eye-extended-shell-extension", "link": "https://extensions.gnome.org/extension/3902/eye-and-mouse-extended/", "shell_version_map": {"38": {"version": "1", "sha256": "1yxs70vlxyf4ns0nd37fl85lp188j84662lsl2l16rdm39w2c2wf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gZXllIHRvIHRoZSBpbmRpY2F0b3IgYmFyIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvciBcbllvdSBjYW4gYWxzbyBkaXNwbGF5IHRoZSBtb3VzZSBpbmRpY2F0b3IsIHBlcmhhcHMgaXQgd2lsbCBoZWxwIHlvdSB3aXRoIHRoZSBwcm9ibGVtIG9mIGRpc3BsYXlpbmcgdGhlIG1vdXNlIGN1cnNvciBpbiBTa3lwZS4gSW1wb3J0IGZpeCBvZiBvcmlnaW5hbCBleHRlbnNpb24gaHR0cHM6Ly9naXRodWIuY29tL2FsZXhleWxvdmNoaWtvdi9leWUtZXh0ZW5kZWQtc2hlbGwtZXh0ZW5zaW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRXllRXh0ZW5kZWQiLAogICJuYW1lIjogIkV5ZSBhbmQgTW91c2UgRXh0ZW5kZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAia3ouYWxzLmV5ZS1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOC4xIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXBlYWNvY2tzL2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZC1maXhAYWxzLmt6IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} -, {"uuid": "RemoveAppMenu@Dragon8oy.com", "name": "Remove App Menu", "pname": "remove-app-menu", "description": "Remove the application menu from the top bar", "link": "https://extensions.gnome.org/extension/3906/remove-app-menu/", "shell_version_map": {"38": {"version": "8", "sha256": "0sjiiyr56b4vj75kn4mi8zj3vx0i1gsxk50n9h0bbxxmhjagz6cg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgYXBwbGljYXRpb24gbWVudSBmcm9tIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJSZW1vdmUgQXBwIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L3JlbW92ZS1hcHAtbWVudS1leHRlbnNpb24iLAogICJ1dWlkIjogIlJlbW92ZUFwcE1lbnVARHJhZ29uOG95LmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "0sjiiyr56b4vj75kn4mi8zj3vx0i1gsxk50n9h0bbxxmhjagz6cg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgYXBwbGljYXRpb24gbWVudSBmcm9tIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJSZW1vdmUgQXBwIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L3JlbW92ZS1hcHAtbWVudS1leHRlbnNpb24iLAogICJ1dWlkIjogIlJlbW92ZUFwcE1lbnVARHJhZ29uOG95LmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0sjiiyr56b4vj75kn4mi8zj3vx0i1gsxk50n9h0bbxxmhjagz6cg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgYXBwbGljYXRpb24gbWVudSBmcm9tIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJSZW1vdmUgQXBwIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L3JlbW92ZS1hcHAtbWVudS1leHRlbnNpb24iLAogICJ1dWlkIjogIlJlbW92ZUFwcE1lbnVARHJhZ29uOG95LmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} +, {"uuid": "RemoveAppMenu@Dragon8oy.com", "name": "Remove App Menu", "pname": "remove-app-menu", "description": "Remove the application menu from the top bar", "link": "https://extensions.gnome.org/extension/3906/remove-app-menu/", "shell_version_map": {"38": {"version": "9", "sha256": "17w1vgx2hl8lv5vh3hsck2gad9z2g9bvz2x252zvq9f4pg9dx9cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgYXBwbGljYXRpb24gbWVudSBmcm9tIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJSZW1vdmUgQXBwIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9yZW1vdmUtYXBwLW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJSZW1vdmVBcHBNZW51QERyYWdvbjhveS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "17w1vgx2hl8lv5vh3hsck2gad9z2g9bvz2x252zvq9f4pg9dx9cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgYXBwbGljYXRpb24gbWVudSBmcm9tIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJSZW1vdmUgQXBwIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9yZW1vdmUtYXBwLW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJSZW1vdmVBcHBNZW51QERyYWdvbjhveS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "17w1vgx2hl8lv5vh3hsck2gad9z2g9bvz2x252zvq9f4pg9dx9cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgYXBwbGljYXRpb24gbWVudSBmcm9tIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJSZW1vdmUgQXBwIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9yZW1vdmUtYXBwLW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJSZW1vdmVBcHBNZW51QERyYWdvbjhveS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "17w1vgx2hl8lv5vh3hsck2gad9z2g9bvz2x252zvq9f4pg9dx9cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgYXBwbGljYXRpb24gbWVudSBmcm9tIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJSZW1vdmUgQXBwIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9yZW1vdmUtYXBwLW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJSZW1vdmVBcHBNZW51QERyYWdvbjhveS5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "snow@endlessos.org", "name": "Snow", "pname": "snow", "description": "Let it snow", "link": "https://extensions.gnome.org/extension/3912/snow/", "shell_version_map": {"38": {"version": "4", "sha256": "08sm2vxzrfb72yvncg7qzj4k5smbc1lfm750xh2pwipyzxl841gy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBpdCBzbm93IiwKICAibmFtZSI6ICJTbm93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic25vd0BlbmRsZXNzb3Mub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "08sm2vxzrfb72yvncg7qzj4k5smbc1lfm750xh2pwipyzxl841gy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBpdCBzbm93IiwKICAibmFtZSI6ICJTbm93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic25vd0BlbmRsZXNzb3Mub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "08sm2vxzrfb72yvncg7qzj4k5smbc1lfm750xh2pwipyzxl841gy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBpdCBzbm93IiwKICAibmFtZSI6ICJTbm93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic25vd0BlbmRsZXNzb3Mub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "sticky-terminal@fthx", "name": "Sticky Terminal", "pname": "sticky-terminal", "description": "Toggle a sticky GNOME terminal window. Your terminal window will always be in foreground while you use another app.\n\nA button in panel allows to toggle the visibility of the terminal. Window is resizeable.\n\nYou can easily change it to default another terminal app or another app. Some other settings. See comments in extension.js file.", "link": "https://extensions.gnome.org/extension/3915/sticky-terminal/", "shell_version_map": {"38": {"version": "2", "sha256": "0j65ihfhama6scp2b8qbqr1h4gamy4v0w1ygxrfglhvl3jhjm5zz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBhIHN0aWNreSBHTk9NRSB0ZXJtaW5hbCB3aW5kb3cuIFlvdXIgdGVybWluYWwgd2luZG93IHdpbGwgYWx3YXlzIGJlIGluIGZvcmVncm91bmQgd2hpbGUgeW91IHVzZSBhbm90aGVyIGFwcC5cblxuQSBidXR0b24gaW4gcGFuZWwgYWxsb3dzIHRvIHRvZ2dsZSB0aGUgdmlzaWJpbGl0eSBvZiB0aGUgdGVybWluYWwuIFdpbmRvdyBpcyByZXNpemVhYmxlLlxuXG5Zb3UgY2FuIGVhc2lseSBjaGFuZ2UgaXQgdG8gZGVmYXVsdCBhbm90aGVyIHRlcm1pbmFsIGFwcCBvciBhbm90aGVyIGFwcC4gU29tZSBvdGhlciBzZXR0aW5ncy4gU2VlIGNvbW1lbnRzIGluIGV4dGVuc2lvbi5qcyBmaWxlLiIsCiAgIm5hbWUiOiAiU3RpY2t5IFRlcm1pbmFsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zdGlja3ktdGVybWluYWwiLAogICJ1dWlkIjogInN0aWNreS10ZXJtaW5hbEBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "sticky-r-terminal@fthx", "name": "Sticky R Terminal", "pname": "sticky-r-terminal", "description": "Toggle a sticky R terminal window. Your R window will always be in foreground while you use another app.\n\nYou can easily change it to default another terminal app or another app. Some other settings. See comments in extension.js file. Same extension only running a terminal: https://extensions.gnome.org/extension/3915/sticky-terminal . You can use it with R if this extension does not work for your R installation setup.\n\nKeywords: stat, stats, statistics, statistical, r-cran.", "link": "https://extensions.gnome.org/extension/3916/sticky-r-terminal/", "shell_version_map": {"38": {"version": "1", "sha256": "17x84g6fb785jmcl5jz41nw4rgzaad48mc5zllh5b3a485731f0s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBhIHN0aWNreSBSIHRlcm1pbmFsIHdpbmRvdy4gWW91ciBSIHdpbmRvdyB3aWxsIGFsd2F5cyBiZSBpbiBmb3JlZ3JvdW5kIHdoaWxlIHlvdSB1c2UgYW5vdGhlciBhcHAuXG5cbllvdSBjYW4gZWFzaWx5IGNoYW5nZSBpdCB0byBkZWZhdWx0IGFub3RoZXIgdGVybWluYWwgYXBwIG9yIGFub3RoZXIgYXBwLiBTb21lIG90aGVyIHNldHRpbmdzLiBTZWUgY29tbWVudHMgaW4gZXh0ZW5zaW9uLmpzIGZpbGUuIFNhbWUgZXh0ZW5zaW9uIG9ubHkgcnVubmluZyBhIHRlcm1pbmFsOiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8zOTE1L3N0aWNreS10ZXJtaW5hbCAuIFlvdSBjYW4gdXNlIGl0IHdpdGggUiBpZiB0aGlzIGV4dGVuc2lvbiBkb2VzIG5vdCB3b3JrIGZvciB5b3VyIFIgaW5zdGFsbGF0aW9uIHNldHVwLlxuXG5LZXl3b3Jkczogc3RhdCwgc3RhdHMsIHN0YXRpc3RpY3MsIHN0YXRpc3RpY2FsLCByLWNyYW4uIiwKICAibmFtZSI6ICJTdGlja3kgUiBUZXJtaW5hbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvc3RpY2t5LXItdGVybWluYWwiLAogICJ1dWlkIjogInN0aWNreS1yLXRlcm1pbmFsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "onedrive@diegobazzanella.com", "name": "One Drive", "pname": "one-drive", "description": "One Drive extension", "link": "https://extensions.gnome.org/extension/3919/one-drive/", "shell_version_map": {"38": {"version": "4", "sha256": "0h37rr9hw6azrlf465ngl7w7miii9bm4sh33wkr0x8q51rz62ydd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24iLAogICJuYW1lIjogIk9uZSBEcml2ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RiYXp6YS9vbmVEcml2ZSIsCiAgInV1aWQiOiAib25lZHJpdmVAZGllZ29iYXp6YW5lbGxhLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "snowy@exposedcat", "name": "Snowy", "pname": "snowy", "description": "Make you festive mood with falling snow on your GNOME DE system", "link": "https://extensions.gnome.org/extension/3921/snowy/", "shell_version_map": {"40": {"version": "12", "sha256": "17y10r06dmfilbax4f55jxn2xxsjfbykrijxc4b96p3szi69110r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0V4cG9zZWRDYXQvc25vd3kiLAogICJ1dWlkIjogInNub3d5QGV4cG9zZWRjYXQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "17y10r06dmfilbax4f55jxn2xxsjfbykrijxc4b96p3szi69110r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91IGZlc3RpdmUgbW9vZCB3aXRoIGZhbGxpbmcgc25vdyBvbiB5b3VyIEdOT01FIERFIHN5c3RlbSIsCiAgIm5hbWUiOiAiU25vd3kiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0V4cG9zZWRDYXQvc25vd3kiLAogICJ1dWlkIjogInNub3d5QGV4cG9zZWRjYXQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} -, {"uuid": "focus@scaryrawr.github.io", "name": "Focus", "pname": "focus", "description": "Transparent inactive windows", "link": "https://extensions.gnome.org/extension/3924/focus/", "shell_version_map": {"38": {"version": "6", "sha256": "1ks47h0m50hssq5m25586lv5fa3yhwhdnb1jxgkfnb547k6qxb6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NhcnlyYXdyL2dub21lLWZvY3VzIiwKICAidXVpZCI6ICJmb2N1c0BzY2FyeXJhd3IuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "1ks47h0m50hssq5m25586lv5fa3yhwhdnb1jxgkfnb547k6qxb6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2NhcnlyYXdyL2dub21lLWZvY3VzIiwKICAidXVpZCI6ICJmb2N1c0BzY2FyeXJhd3IuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} -, {"uuid": "autoselectheadset@josephlbarnett.github.com", "name": "Auto select headset", "pname": "auto-select-headset", "description": "Auto selects headsets when possible instead of showing a dialog", "link": "https://extensions.gnome.org/extension/3928/auto-select-headset/", "shell_version_map": {"38": {"version": "3", "sha256": "097q3xgkm5g75vjy76v9y8q7n5jb1wvxv2ffvj1f0nk0ag7y909d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb3NlcGhsYmFybmV0dC9hdXRvc2VsZWN0aGVhZHNldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImF1dG9zZWxlY3RoZWFkc2V0QGpvc2VwaGxiYXJuZXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "097q3xgkm5g75vjy76v9y8q7n5jb1wvxv2ffvj1f0nk0ag7y909d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qb3NlcGhsYmFybmV0dC9hdXRvc2VsZWN0aGVhZHNldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImF1dG9zZWxlY3RoZWFkc2V0QGpvc2VwaGxiYXJuZXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"uuid": "focus@scaryrawr.github.io", "name": "Focus", "pname": "focus", "description": "Transparent inactive windows", "link": "https://extensions.gnome.org/extension/3924/focus/", "shell_version_map": {"38": {"version": "7", "sha256": "01sh4wxnizgszwggrkp5l5j7iiayrz1wys06hnrq03014kgkd829", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zY2FyeXJhd3IvZ25vbWUtZm9jdXMiLAogICJ1dWlkIjogImZvY3VzQHNjYXJ5cmF3ci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "01sh4wxnizgszwggrkp5l5j7iiayrz1wys06hnrq03014kgkd829", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zY2FyeXJhd3IvZ25vbWUtZm9jdXMiLAogICJ1dWlkIjogImZvY3VzQHNjYXJ5cmF3ci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "01sh4wxnizgszwggrkp5l5j7iiayrz1wys06hnrq03014kgkd829", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zcGFyZW50IGluYWN0aXZlIHdpbmRvd3MiLAogICJuYW1lIjogIkZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zY2FyeXJhd3IvZ25vbWUtZm9jdXMiLAogICJ1dWlkIjogImZvY3VzQHNjYXJ5cmF3ci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "autoselectheadset@josephlbarnett.github.com", "name": "Auto select headset", "pname": "auto-select-headset", "description": "Auto selects headsets when possible instead of showing a dialog", "link": "https://extensions.gnome.org/extension/3928/auto-select-headset/", "shell_version_map": {"38": {"version": "5", "sha256": "1lzn5ah6djggb8qcj9r70fmnvs5dpd342f5izx1scpk6h48rna8q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pvc2VwaGxiYXJuZXR0L2F1dG9zZWxlY3RoZWFkc2V0LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXV0b3NlbGVjdGhlYWRzZXRAam9zZXBobGJhcm5ldHQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "1lzn5ah6djggb8qcj9r70fmnvs5dpd342f5izx1scpk6h48rna8q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pvc2VwaGxiYXJuZXR0L2F1dG9zZWxlY3RoZWFkc2V0LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXV0b3NlbGVjdGhlYWRzZXRAam9zZXBobGJhcm5ldHQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1lzn5ah6djggb8qcj9r70fmnvs5dpd342f5izx1scpk6h48rna8q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pvc2VwaGxiYXJuZXR0L2F1dG9zZWxlY3RoZWFkc2V0LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXV0b3NlbGVjdGhlYWRzZXRAam9zZXBobGJhcm5ldHQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1lzn5ah6djggb8qcj9r70fmnvs5dpd342f5izx1scpk6h48rna8q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG8gc2VsZWN0cyBoZWFkc2V0cyB3aGVuIHBvc3NpYmxlIGluc3RlYWQgb2Ygc2hvd2luZyBhIGRpYWxvZyIsCiAgIm5hbWUiOiAiQXV0byBzZWxlY3QgaGVhZHNldCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pvc2VwaGxiYXJuZXR0L2F1dG9zZWxlY3RoZWFkc2V0LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXV0b3NlbGVjdGhlYWRzZXRAam9zZXBobGJhcm5ldHQuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "toggle-night-light@cansozbir.github.io", "name": "Toggle Night Light", "pname": "toggle-night-light", "description": "This extension lets you toggle night-light from the top-bar by clicking it.", "link": "https://extensions.gnome.org/extension/3933/toggle-night-light/", "shell_version_map": {"38": {"version": "5", "sha256": "1r7mjixc2r8p5cmgk94sbj7gsx9xfx5sfnaxa01prqrpd3pqlhzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IHRvZ2dsZSBuaWdodC1saWdodCBmcm9tIHRoZSB0b3AtYmFyIGJ5IGNsaWNraW5nIGl0LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jYW5zb3piaXIvZ25vbWUtc2hlbGwtdG9nZ2xlLW5pZ2h0LWxpZ2h0LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidG9nZ2xlLW5pZ2h0LWxpZ2h0QGNhbnNvemJpci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1r7mjixc2r8p5cmgk94sbj7gsx9xfx5sfnaxa01prqrpd3pqlhzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IHRvZ2dsZSBuaWdodC1saWdodCBmcm9tIHRoZSB0b3AtYmFyIGJ5IGNsaWNraW5nIGl0LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jYW5zb3piaXIvZ25vbWUtc2hlbGwtdG9nZ2xlLW5pZ2h0LWxpZ2h0LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidG9nZ2xlLW5pZ2h0LWxpZ2h0QGNhbnNvemJpci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1r7mjixc2r8p5cmgk94sbj7gsx9xfx5sfnaxa01prqrpd3pqlhzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IHRvZ2dsZSBuaWdodC1saWdodCBmcm9tIHRoZSB0b3AtYmFyIGJ5IGNsaWNraW5nIGl0LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jYW5zb3piaXIvZ25vbWUtc2hlbGwtdG9nZ2xlLW5pZ2h0LWxpZ2h0LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidG9nZ2xlLW5pZ2h0LWxpZ2h0QGNhbnNvemJpci5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "adwaita-theme-switcher@fthx", "name": "Adwaita Theme Switcher", "pname": "adwaita-theme-switcher", "description": "Button in panel: switch between Adwaita dark and light themes.", "link": "https://extensions.gnome.org/extension/3936/adwaita-theme-switcher/", "shell_version_map": {"38": {"version": "4", "sha256": "0015j3vqwvb0fs2n90lz0i66f23nr7mmvqzgwnsah46x8lkm2kpr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiBpbiBwYW5lbDogc3dpdGNoIGJldHdlZW4gQWR3YWl0YSBkYXJrIGFuZCBsaWdodCB0aGVtZXMuIiwKICAibmFtZSI6ICJBZHdhaXRhIFRoZW1lIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Fkd2FpdGEtdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogImFkd2FpdGEtdGhlbWUtc3dpdGNoZXJAZnRoeCIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "0015j3vqwvb0fs2n90lz0i66f23nr7mmvqzgwnsah46x8lkm2kpr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiBpbiBwYW5lbDogc3dpdGNoIGJldHdlZW4gQWR3YWl0YSBkYXJrIGFuZCBsaWdodCB0aGVtZXMuIiwKICAibmFtZSI6ICJBZHdhaXRhIFRoZW1lIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Fkd2FpdGEtdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogImFkd2FpdGEtdGhlbWUtc3dpdGNoZXJAZnRoeCIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "0015j3vqwvb0fs2n90lz0i66f23nr7mmvqzgwnsah46x8lkm2kpr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiBpbiBwYW5lbDogc3dpdGNoIGJldHdlZW4gQWR3YWl0YSBkYXJrIGFuZCBsaWdodCB0aGVtZXMuIiwKICAibmFtZSI6ICJBZHdhaXRhIFRoZW1lIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Fkd2FpdGEtdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogImFkd2FpdGEtdGhlbWUtc3dpdGNoZXJAZnRoeCIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "fnlock-switch-tp-comp-usb-kb@goloshubov.github.io", "name": "FnLock switch (ThinkPad Compact USB Keyboard) ", "pname": "fnlock-switch-thinkpad-compact-usb-keyboard", "description": "FnLock switch for Lenovo ThinkPad Compact USB Keyboard ", "link": "https://extensions.gnome.org/extension/3939/fnlock-switch-thinkpad-compact-usb-keyboard/", "shell_version_map": {"38": {"version": "4", "sha256": "1nybwgfp354zn1z1lkl3wvvz2zddk6nbm9n2h5f5gbp58vhl8mw4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1nybwgfp354zn1z1lkl3wvvz2zddk6nbm9n2h5f5gbp58vhl8mw4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1nybwgfp354zn1z1lkl3wvvz2zddk6nbm9n2h5f5gbp58vhl8mw4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZuTG9jayBzd2l0Y2ggZm9yIExlbm92byBUaGlua1BhZCBDb21wYWN0IFVTQiBLZXlib2FyZCAiLAogICJuYW1lIjogIkZuTG9jayBzd2l0Y2ggKFRoaW5rUGFkIENvbXBhY3QgVVNCIEtleWJvYXJkKSAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbG9zaHVib3YvZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYiIsCiAgInV1aWQiOiAiZm5sb2NrLXN3aXRjaC10cC1jb21wLXVzYi1rYkBnb2xvc2h1Ym92LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "toggle-alacritty@itstime.tech", "name": "Toggle Alacritty", "pname": "toggle-alacritty", "description": "Toggles Alacritty window via hotkey: Alt+z\n\nIf Alacritty is not launched, attempts to start it (/usr/bin/alacritty)\n\nWorks under both Wayland and X11\n\nTo change hotkey please follow instruction in the README.md:", "link": "https://extensions.gnome.org/extension/3942/toggle-alacritty/", "shell_version_map": {"38": {"version": "4", "sha256": "1kz5a8x9fpvilcd4p9pn6cmsj6gvq44cg85yhkgdi9x2qpd52fn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLWFsYWNyaXR0eS10b2dnbGUiLAogICJ1dWlkIjogInRvZ2dsZS1hbGFjcml0dHlAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "1kz5a8x9fpvilcd4p9pn6cmsj6gvq44cg85yhkgdi9x2qpd52fn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLWFsYWNyaXR0eS10b2dnbGUiLAogICJ1dWlkIjogInRvZ2dsZS1hbGFjcml0dHlAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1kz5a8x9fpvilcd4p9pn6cmsj6gvq44cg85yhkgdi9x2qpd52fn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLWFsYWNyaXR0eS10b2dnbGUiLAogICJ1dWlkIjogInRvZ2dsZS1hbGFjcml0dHlAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "hide-panel@fthx", "name": "Hide Panel", "pname": "hide-panel", "description": "Hide top panel except in overview. Switch button in panel.\n\nVery very light extension. There is a 1 pixel wide line at the top of the screen that allows to blindly use the panel menus. This is needed to keep the native hot corner active without having to recreate it.", "link": "https://extensions.gnome.org/extension/3948/hide-panel/", "shell_version_map": {"38": {"version": "8", "sha256": "0nrj0kxfdxx7nmw0zai070ca5lv5r43bpgm2binv31xjyh385849", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy4gU3dpdGNoIGJ1dHRvbiBpbiBwYW5lbC5cblxuVmVyeSB2ZXJ5IGxpZ2h0IGV4dGVuc2lvbi4gVGhlcmUgaXMgYSAxIHBpeGVsIHdpZGUgbGluZSBhdCB0aGUgdG9wIG9mIHRoZSBzY3JlZW4gdGhhdCBhbGxvd3MgdG8gYmxpbmRseSB1c2UgdGhlIHBhbmVsIG1lbnVzLiBUaGlzIGlzIG5lZWRlZCB0byBrZWVwIHRoZSBuYXRpdmUgaG90IGNvcm5lciBhY3RpdmUgd2l0aG91dCBoYXZpbmcgdG8gcmVjcmVhdGUgaXQuIiwKICAibmFtZSI6ICJIaWRlIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbCIsCiAgInV1aWQiOiAiaGlkZS1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "0nrj0kxfdxx7nmw0zai070ca5lv5r43bpgm2binv31xjyh385849", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy4gU3dpdGNoIGJ1dHRvbiBpbiBwYW5lbC5cblxuVmVyeSB2ZXJ5IGxpZ2h0IGV4dGVuc2lvbi4gVGhlcmUgaXMgYSAxIHBpeGVsIHdpZGUgbGluZSBhdCB0aGUgdG9wIG9mIHRoZSBzY3JlZW4gdGhhdCBhbGxvd3MgdG8gYmxpbmRseSB1c2UgdGhlIHBhbmVsIG1lbnVzLiBUaGlzIGlzIG5lZWRlZCB0byBrZWVwIHRoZSBuYXRpdmUgaG90IGNvcm5lciBhY3RpdmUgd2l0aG91dCBoYXZpbmcgdG8gcmVjcmVhdGUgaXQuIiwKICAibmFtZSI6ICJIaWRlIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbCIsCiAgInV1aWQiOiAiaGlkZS1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "persistent-email-notifications@fthx", "name": "Persistent Email Notifications", "pname": "persistent-email-notifications", "description": "Never hide a new mail notification, except if you close it.\n\nVery very light extension. Email clients supported: Thunderbird, Evolution, Geary, Mailspring, TypeApp, BlueMail. Please ask for another email client if needed.", "link": "https://extensions.gnome.org/extension/3951/persistent-email-notifications/", "shell_version_map": {"38": {"version": "3", "sha256": "06m6fhs50vlrwkgdk6cvkcl5f155a1w8szs1g9pzryf8mmldgmdd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbWFpbCBub3RpZmljYXRpb24sIGV4Y2VwdCBpZiB5b3UgY2xvc2UgaXQuXG5cblZlcnkgdmVyeSBsaWdodCBleHRlbnNpb24uIEVtYWlsIGNsaWVudHMgc3VwcG9ydGVkOiBUaHVuZGVyYmlyZCwgRXZvbHV0aW9uLCBHZWFyeSwgTWFpbHNwcmluZywgVHlwZUFwcCwgQmx1ZU1haWwuIFBsZWFzZSBhc2sgZm9yIGFub3RoZXIgZW1haWwgY2xpZW50IGlmIG5lZWRlZC4iLAogICJuYW1lIjogIlBlcnNpc3RlbnQgRW1haWwgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3BlcnNpc3RlbnQtZW1haWwtbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAicGVyc2lzdGVudC1lbWFpbC1ub3RpZmljYXRpb25zQGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "06m6fhs50vlrwkgdk6cvkcl5f155a1w8szs1g9pzryf8mmldgmdd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbWFpbCBub3RpZmljYXRpb24sIGV4Y2VwdCBpZiB5b3UgY2xvc2UgaXQuXG5cblZlcnkgdmVyeSBsaWdodCBleHRlbnNpb24uIEVtYWlsIGNsaWVudHMgc3VwcG9ydGVkOiBUaHVuZGVyYmlyZCwgRXZvbHV0aW9uLCBHZWFyeSwgTWFpbHNwcmluZywgVHlwZUFwcCwgQmx1ZU1haWwuIFBsZWFzZSBhc2sgZm9yIGFub3RoZXIgZW1haWwgY2xpZW50IGlmIG5lZWRlZC4iLAogICJuYW1lIjogIlBlcnNpc3RlbnQgRW1haWwgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3BlcnNpc3RlbnQtZW1haWwtbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAicGVyc2lzdGVudC1lbWFpbC1ub3RpZmljYXRpb25zQGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "horizontal-workspace-indicator@tty2.io", "name": "Workspace indicator", "pname": "workspace-indicator", "description": "Workspace indicator shows the amount of opened workspaces and highlights the current one using unicode characters.\n\nYou can use it as an indicator only but widget is clickable. Left button click: move to left, right click: move right.\n\nPay attention:\n1) there could be an error with the extension after install or update. The solution is to logout and login again.\n2) there could be an error if you have another extension with the same name \"workspace indicator\" already installed. The solution is to remove the old one.", "link": "https://extensions.gnome.org/extension/3952/workspace-indicator/", "shell_version_map": {"38": {"version": "8", "sha256": "15j1w86s9j796bf5mil8sn6hnq4js3by3gygkskzxwp02gy224n3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cblBheSBhdHRlbnRpb246XG4xKSB0aGVyZSBjb3VsZCBiZSBhbiBlcnJvciB3aXRoIHRoZSBleHRlbnNpb24gYWZ0ZXIgaW5zdGFsbCBvciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLlxuMikgdGhlcmUgY291bGQgYmUgYW4gZXJyb3IgaWYgeW91IGhhdmUgYW5vdGhlciBleHRlbnNpb24gd2l0aCB0aGUgc2FtZSBuYW1lIFwid29ya3NwYWNlIGluZGljYXRvclwiIGFscmVhZHkgaW5zdGFsbGVkLiBUaGUgc29sdXRpb24gaXMgdG8gcmVtb3ZlIHRoZSBvbGQgb25lLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "15j1w86s9j796bf5mil8sn6hnq4js3by3gygkskzxwp02gy224n3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cblBheSBhdHRlbnRpb246XG4xKSB0aGVyZSBjb3VsZCBiZSBhbiBlcnJvciB3aXRoIHRoZSBleHRlbnNpb24gYWZ0ZXIgaW5zdGFsbCBvciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLlxuMikgdGhlcmUgY291bGQgYmUgYW4gZXJyb3IgaWYgeW91IGhhdmUgYW5vdGhlciBleHRlbnNpb24gd2l0aCB0aGUgc2FtZSBuYW1lIFwid29ya3NwYWNlIGluZGljYXRvclwiIGFscmVhZHkgaW5zdGFsbGVkLiBUaGUgc29sdXRpb24gaXMgdG8gcmVtb3ZlIHRoZSBvbGQgb25lLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "15j1w86s9j796bf5mil8sn6hnq4js3by3gygkskzxwp02gy224n3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cblBheSBhdHRlbnRpb246XG4xKSB0aGVyZSBjb3VsZCBiZSBhbiBlcnJvciB3aXRoIHRoZSBleHRlbnNpb24gYWZ0ZXIgaW5zdGFsbCBvciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLlxuMikgdGhlcmUgY291bGQgYmUgYW4gZXJyb3IgaWYgeW91IGhhdmUgYW5vdGhlciBleHRlbnNpb24gd2l0aCB0aGUgc2FtZSBuYW1lIFwid29ya3NwYWNlIGluZGljYXRvclwiIGFscmVhZHkgaW5zdGFsbGVkLiBUaGUgc29sdXRpb24gaXMgdG8gcmVtb3ZlIHRoZSBvbGQgb25lLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} +, {"uuid": "horizontal-workspace-indicator@tty2.io", "name": "Workspace indicator", "pname": "workspace-indicator", "description": "Workspace indicator shows the amount of opened workspaces and highlights the current one using unicode characters.\n\nYou can use it as an indicator only but widget is clickable. Left button click: move to left, right click: move right.\n\nYou can change the widgets position with preferences. The widget can be pinned to right corner (status area) default, center (data time area) and left corner (activities area).\n\nThere could be an error with the extension after update. The solution is to logout and login again.", "link": "https://extensions.gnome.org/extension/3952/workspace-indicator/", "shell_version_map": {"38": {"version": "9", "sha256": "1zzgxr6iq8c3drpd2n9hqly5pv827qpfy2kbjyzzzgxcvz5002df", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cbllvdSBjYW4gY2hhbmdlIHRoZSB3aWRnZXRzIHBvc2l0aW9uIHdpdGggcHJlZmVyZW5jZXMuIFRoZSB3aWRnZXQgY2FuIGJlIHBpbm5lZCB0byByaWdodCBjb3JuZXIgKHN0YXR1cyBhcmVhKSBkZWZhdWx0LCBjZW50ZXIgKGRhdGEgdGltZSBhcmVhKSBhbmQgbGVmdCBjb3JuZXIgKGFjdGl2aXRpZXMgYXJlYSkuXG5cblRoZXJlIGNvdWxkIGJlIGFuIGVycm9yIHdpdGggdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "11", "sha256": "1y2ykdqcifhmps9lqpcpkpp8a7vfs5n48y9y9cm0pflxn6zzdqsb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cbllvdSBjYW4gY2hhbmdlIHRoZSB3aWRnZXRzIHBvc2l0aW9uIHdpdGggcHJlZmVyZW5jZXMuIFRoZSB3aWRnZXQgY2FuIGJlIHBpbm5lZCB0byByaWdodCBjb3JuZXIgKHN0YXR1cyBhcmVhKSBkZWZhdWx0LCBjZW50ZXIgKGRhdGEgdGltZSBhcmVhKSBhbmQgbGVmdCBjb3JuZXIgKGFjdGl2aXRpZXMgYXJlYSkuXG5cblRoZXJlIGNvdWxkIGJlIGFuIGVycm9yIHdpdGggdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1y2ykdqcifhmps9lqpcpkpp8a7vfs5n48y9y9cm0pflxn6zzdqsb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuXG5cbllvdSBjYW4gY2hhbmdlIHRoZSB3aWRnZXRzIHBvc2l0aW9uIHdpdGggcHJlZmVyZW5jZXMuIFRoZSB3aWRnZXQgY2FuIGJlIHBpbm5lZCB0byByaWdodCBjb3JuZXIgKHN0YXR1cyBhcmVhKSBkZWZhdWx0LCBjZW50ZXIgKGRhdGEgdGltZSBhcmVhKSBhbmQgbGVmdCBjb3JuZXIgKGFjdGl2aXRpZXMgYXJlYSkuXG5cblRoZXJlIGNvdWxkIGJlIGFuIGVycm9yIHdpdGggdGhlIGV4dGVuc2lvbiBhZnRlciB1cGRhdGUuIFRoZSBzb2x1dGlvbiBpcyB0byBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiIsCiAgIm5hbWUiOiAiV29ya3NwYWNlIGluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "kitchentimer@blackjackshellac.ca", "name": "Kitchen Timer", "pname": "kitchen-timer", "description": "General purpose timer extension for Gnome Shell\n\nPlease report issues on github\n\nIf updating the extension reports an ERROR, it should work after the next reboot or if you logout and login again.", "link": "https://extensions.gnome.org/extension/3955/kitchen-timer/", "shell_version_map": {"38": {"version": "28", "sha256": "0k1ahswl2ipjz1v1z1j96lndbk26rgfr2ra2g78lvzjiv6j42sdf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYWwgcHVycG9zZSB0aW1lciBleHRlbnNpb24gZm9yIEdub21lIFNoZWxsXG5cblBsZWFzZSByZXBvcnQgaXNzdWVzIG9uIGdpdGh1YlxuXG5JZiB1cGRhdGluZyB0aGUgZXh0ZW5zaW9uIHJlcG9ydHMgYW4gRVJST1IsIGl0IHNob3VsZCB3b3JrIGFmdGVyIHRoZSBuZXh0IHJlYm9vdCBvciBpZiB5b3UgbG9nb3V0IGFuZCBsb2dpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJraXRjaGVuLXRpbWVyLWJsYWNramFja3NoZWxsYWMiLAogICJuYW1lIjogIktpdGNoZW4gVGltZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2l0Y2hlbi10aW1lci1ibGFja2phY2tzaGVsbGFjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsYWNramFja3NoZWxsYWMva2l0Y2hlblRpbWVyIiwKICAidXVpZCI6ICJraXRjaGVudGltZXJAYmxhY2tqYWNrc2hlbGxhYy5jYSIsCiAgInZlcnNpb24iOiAyOAp9"}, "40": {"version": "28", "sha256": "0k1ahswl2ipjz1v1z1j96lndbk26rgfr2ra2g78lvzjiv6j42sdf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYWwgcHVycG9zZSB0aW1lciBleHRlbnNpb24gZm9yIEdub21lIFNoZWxsXG5cblBsZWFzZSByZXBvcnQgaXNzdWVzIG9uIGdpdGh1YlxuXG5JZiB1cGRhdGluZyB0aGUgZXh0ZW5zaW9uIHJlcG9ydHMgYW4gRVJST1IsIGl0IHNob3VsZCB3b3JrIGFmdGVyIHRoZSBuZXh0IHJlYm9vdCBvciBpZiB5b3UgbG9nb3V0IGFuZCBsb2dpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJraXRjaGVuLXRpbWVyLWJsYWNramFja3NoZWxsYWMiLAogICJuYW1lIjogIktpdGNoZW4gVGltZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2l0Y2hlbi10aW1lci1ibGFja2phY2tzaGVsbGFjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsYWNramFja3NoZWxsYWMva2l0Y2hlblRpbWVyIiwKICAidXVpZCI6ICJraXRjaGVudGltZXJAYmxhY2tqYWNrc2hlbGxhYy5jYSIsCiAgInZlcnNpb24iOiAyOAp9"}}} -, {"uuid": "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com", "name": "GNOME Fuzzy App Search", "pname": "gnome-fuzzy-app-search", "description": "Fuzzy application search results for Gnome Search", "link": "https://extensions.gnome.org/extension/3956/gnome-fuzzy-app-search/", "shell_version_map": {"38": {"version": "3", "sha256": "0jxh2wcckwnijgabg9k7b7mi785j63pjkbjya4pbvnmiw4n4qbn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjIxLjIiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "0jxh2wcckwnijgabg9k7b7mi785j63pjkbjya4pbvnmiw4n4qbn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjIxLjIiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "0jxh2wcckwnijgabg9k7b7mi785j63pjkbjya4pbvnmiw4n4qbn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjIxLjIiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "e-ink-mode@fujimo-t.github.io", "name": "E Ink Mode", "pname": "e-ink-mode", "description": "# GNOME Shell Extension: E Ink Mode\nMake desktop suitable for E Ink monitors.\n\n## Features\n* Switch Shell, GTK and icon theme to light high contrast one\n* Disable animations\n* Change background to white color\n\n## Dependencies\n* `High Constrast` theme for GTK and icon", "link": "https://extensions.gnome.org/extension/3957/e-ink-mode/", "shell_version_map": {"40": {"version": "3", "sha256": "1bzcv10c9wd2qga4z3swlyf0v0bv1s0j90vjxlmvylfr1nnbsjc9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMgR05PTUUgU2hlbGwgRXh0ZW5zaW9uOiBFIEluayBNb2RlXG5NYWtlIGRlc2t0b3Agc3VpdGFibGUgZm9yIEUgSW5rIG1vbml0b3JzLlxuXG4jIyBGZWF0dXJlc1xuKiBTd2l0Y2ggU2hlbGwsIEdUSyBhbmQgaWNvbiB0aGVtZSB0byBsaWdodCBoaWdoIGNvbnRyYXN0IG9uZVxuKiBEaXNhYmxlIGFuaW1hdGlvbnNcbiogQ2hhbmdlIGJhY2tncm91bmQgdG8gd2hpdGUgY29sb3JcblxuIyMgRGVwZW5kZW5jaWVzXG4qIGBIaWdoIENvbnN0cmFzdGAgdGhlbWUgZm9yIEdUSyBhbmQgaWNvbiIsCiAgIm5hbWUiOiAiRSBJbmsgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdWppbW8tdC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZS1pbmstbW9kZSIsCiAgInV1aWQiOiAiZS1pbmstbW9kZUBmdWppbW8tdC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "transparent-top-bar@ftpix.com", "name": "Transparent Top Bar (Adjustable transparency)", "pname": "transparent-top-bar-adjustable-transparency", "description": "Fork of: https://github.com/zhanghai/gnome-shell-extension-transparent-top-bar\n\nBring back the transparent top bar in GNOME Shell with adjustable transparency.\n\nDoes not work well with custom shell themes.", "link": "https://extensions.gnome.org/extension/3960/transparent-top-bar-adjustable-transparency/", "shell_version_map": {"38": {"version": "5", "sha256": "09mym8h6lpb53b18c72vzl2y7myl1xg1lyg9jryf3nijna9adnr9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "10", "sha256": "0i37h2jcj2j64cc3y67irmmj1g7iqz5pzcdz9y8ws702jpg0pz2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhbWFyaW9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQGZ0cGl4LmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0i37h2jcj2j64cc3y67irmmj1g7iqz5pzcdz9y8ws702jpg0pz2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhbWFyaW9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJ0cmFuc3BhcmVudC10b3AtYmFyQGZ0cGl4LmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} -, {"uuid": "improved-workspace-indicator@michaelaquilina.github.io", "name": "Improved Workspace Indicator", "pname": "improved-workspace-indicator", "description": "Slightly improved workspace indicator that shows both current and in use workspaces similar to i3/sway", "link": "https://extensions.gnome.org/extension/3968/improved-workspace-indicator/", "shell_version_map": {"38": {"version": "8", "sha256": "0jgs5hl6qh56j6zash5n1gbgn93qwcf75fi7mrr80bdkyay0wv5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "0jgs5hl6qh56j6zash5n1gbgn93qwcf75fi7mrr80bdkyay0wv5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0jgs5hl6qh56j6zash5n1gbgn93qwcf75fi7mrr80bdkyay0wv5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}}} +, {"uuid": "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com", "name": "GNOME Fuzzy App Search", "pname": "gnome-fuzzy-app-search", "description": "Fuzzy application search results for Gnome Search", "link": "https://extensions.gnome.org/extension/3956/gnome-fuzzy-app-search/", "shell_version_map": {"38": {"version": "13", "sha256": "0q553m2yjwxsygxjj2nc4wrg4xbf5cnakdyxfgnxvgywkh1mv8dh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9DemFybGllL2dub21lLWZ1enp5LWFwcC1zZWFyY2giLAogICJ1dWlkIjogImdub21lLWZ1enp5LWFwcC1zZWFyY2hAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5DemFybGllLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "0q553m2yjwxsygxjj2nc4wrg4xbf5cnakdyxfgnxvgywkh1mv8dh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9DemFybGllL2dub21lLWZ1enp5LWFwcC1zZWFyY2giLAogICJ1dWlkIjogImdub21lLWZ1enp5LWFwcC1zZWFyY2hAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5DemFybGllLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "0q553m2yjwxsygxjj2nc4wrg4xbf5cnakdyxfgnxvgywkh1mv8dh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9DemFybGllL2dub21lLWZ1enp5LWFwcC1zZWFyY2giLAogICJ1dWlkIjogImdub21lLWZ1enp5LWFwcC1zZWFyY2hAZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5DemFybGllLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} +, {"uuid": "e-ink-mode@fujimo-t.github.io", "name": "E Ink Mode", "pname": "e-ink-mode", "description": "Make desktop suitable for E Ink monitors.\n\nUnmaintenanced.\nPlease migrate to theme:\nhttps://github.com/fujimo-t/gnome-shell-theme-e-ink\nSee below to detail:\nhttps://github.com/fujimo-t/gnome-shell-extension-e-ink-mode/issues/3#issuecomment-1019159171", "link": "https://extensions.gnome.org/extension/3957/e-ink-mode/", "shell_version_map": {"40": {"version": "3", "sha256": "0khqna60a0vblygriiky0jzg92ib8i44i6wkr8s3vxi0bcfa2zhm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZGVza3RvcCBzdWl0YWJsZSBmb3IgRSBJbmsgbW9uaXRvcnMuXG5cblVubWFpbnRlbmFuY2VkLlxuUGxlYXNlIG1pZ3JhdGUgdG8gdGhlbWU6XG5odHRwczovL2dpdGh1Yi5jb20vZnVqaW1vLXQvZ25vbWUtc2hlbGwtdGhlbWUtZS1pbmtcblNlZSBiZWxvdyB0byBkZXRhaWw6XG5odHRwczovL2dpdGh1Yi5jb20vZnVqaW1vLXQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWUtaW5rLW1vZGUvaXNzdWVzLzMjaXNzdWVjb21tZW50LTEwMTkxNTkxNzEiLAogICJuYW1lIjogIkUgSW5rIE1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnVqaW1vLXQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWUtaW5rLW1vZGUiLAogICJ1dWlkIjogImUtaW5rLW1vZGVAZnVqaW1vLXQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "transparent-top-bar@ftpix.com", "name": "Transparent Top Bar (Adjustable transparency)", "pname": "transparent-top-bar-adjustable-transparency", "description": "Fork of: https://github.com/zhanghai/gnome-shell-extension-transparent-top-bar\n\nBring back the transparent top bar in GNOME Shell with adjustable transparency.\n\nDoes not work well with custom shell themes.", "link": "https://extensions.gnome.org/extension/3960/transparent-top-bar-adjustable-transparency/", "shell_version_map": {"38": {"version": "5", "sha256": "09mym8h6lpb53b18c72vzl2y7myl1xg1lyg9jryf3nijna9adnr9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "11", "sha256": "1illvhj3916g081cd42lx108fssg5m60w118ihj19qqkvpdq96gw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sYW1hcmlvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhciIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtdG9wLWJhckBmdHBpeC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "1illvhj3916g081cd42lx108fssg5m60w118ihj19qqkvpdq96gw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sYW1hcmlvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhciIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtdG9wLWJhckBmdHBpeC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "1illvhj3916g081cd42lx108fssg5m60w118ihj19qqkvpdq96gw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sYW1hcmlvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhciIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtdG9wLWJhckBmdHBpeC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} +, {"uuid": "improved-workspace-indicator@michaelaquilina.github.io", "name": "Improved Workspace Indicator", "pname": "improved-workspace-indicator", "description": "Slightly improved workspace indicator that shows both current and in use workspaces similar to i3/sway", "link": "https://extensions.gnome.org/extension/3968/improved-workspace-indicator/", "shell_version_map": {"38": {"version": "10", "sha256": "077acz5i10jvnqc0kf0yivlzq40xz03jb9gacpr8rm9my0yvdlp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "077acz5i10jvnqc0kf0yivlzq40xz03jb9gacpr8rm9my0yvdlp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "077acz5i10jvnqc0kf0yivlzq40xz03jb9gacpr8rm9my0yvdlp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFlbEFxdWlsaW5hL2ltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImltcHJvdmVkLXdvcmtzcGFjZS1pbmRpY2F0b3JAbWljaGFlbGFxdWlsaW5hLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "gnome4synology@psasse.gmx.de", "name": "Movie Search provider for Synology®", "pname": "gnome-movie-search-provider-for-synology", "description": "search provider for movie titles on Synology® NAS including offline search (yet to come)", "link": "https://extensions.gnome.org/extension/3969/gnome-movie-search-provider-for-synology/", "shell_version_map": {"40": {"version": "14", "sha256": "133jgh7s8mdc4dbcwr623yyrpfb8nv96iggsk2kb18lkw2rcf3xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInNlYXJjaCBwcm92aWRlciBmb3IgbW92aWUgdGl0bGVzIG9uIFN5bm9sb2d5XHUwMGFlIE5BUyBpbmNsdWRpbmcgb2ZmbGluZSBzZWFyY2ggKHlldCB0byBjb21lKSIsCiAgIm5hbWUiOiAiTW92aWUgU2VhcmNoIHByb3ZpZGVyIGZvciBTeW5vbG9neVx1MDBhZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wc2Fzc2U3Mi9tb3ZpZXM0c3lub2xvZ3kiLAogICJ1dWlkIjogImdub21lNHN5bm9sb2d5QHBzYXNzZS5nbXguZGUiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} -, {"uuid": "guillotine@fopdoodle.net", "name": "Guillotine", "pname": "guillotine", "description": "Guillotine is a gnome extension designed for efficiently carrying out executions of commands from a customizable menu. Simply speaking: it is a highly customizable menu that enables you to launch commands and toggle services.", "link": "https://extensions.gnome.org/extension/3981/guillotine/", "shell_version_map": {"38": {"version": "3", "sha256": "0jpm8q47naxv5ld9yx6jjsnlm5snlqybilkmr8kvxq1an6pj36yw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZW50ZTc2L2d1aWxsb3RpbmUvIiwKICAidXVpZCI6ICJndWlsbG90aW5lQGZvcGRvb2RsZS5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "9", "sha256": "06mxhyxzfwgx2daqnkxw9mrxmi1p606miq5almnfaw2hk17sc45a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbnRlNzYvZ3VpbGxvdGluZS8iLAogICJ1dWlkIjogImd1aWxsb3RpbmVAZm9wZG9vZGxlLm5ldCIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "06mxhyxzfwgx2daqnkxw9mrxmi1p606miq5almnfaw2hk17sc45a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbnRlNzYvZ3VpbGxvdGluZS8iLAogICJ1dWlkIjogImd1aWxsb3RpbmVAZm9wZG9vZGxlLm5ldCIsCiAgInZlcnNpb24iOiA5Cn0="}}} -, {"uuid": "shuzhi@tuberry", "name": "Shu Zhi", "pname": "shu-zhi", "description": "Wallpaper generation extension for GNOME Shell, inspired by Jizhi\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3985/shu-zhi/", "shell_version_map": {"38": {"version": "7", "sha256": "1yk39q1ydv7kmb8shi4cp7pf5zvpmj99gjl9svack4773dj9rrwi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogInNodXpoaSIsCiAgIm5hbWUiOiAiU2h1IFpoaSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV6aGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NodXpoaSIsCiAgInV1aWQiOiAic2h1emhpQHR1YmVycnkiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "17", "sha256": "1n0ajmm6d7y6kify6k9g3j2kc3ass9s7zyif5jhr1djzsi6knpq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "19", "sha256": "1ib82yf7gh97hygbrxccpsh75jpg65rp834vygi25kyf0b8fykff", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxOQp9"}}} +, {"uuid": "guillotine@fopdoodle.net", "name": "Guillotine", "pname": "guillotine", "description": "Guillotine is a gnome extension designed for efficiently carrying out executions of commands from a customizable menu. Simply speaking: it is a highly customizable menu that enables you to launch commands and toggle services.", "link": "https://extensions.gnome.org/extension/3981/guillotine/", "shell_version_map": {"38": {"version": "3", "sha256": "0r171an47d1fdhzwiq7kg59hasibmcvvcsv9z9xd1kh5jahzmam5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZW50ZTc2L2d1aWxsb3RpbmUvIiwKICAidXVpZCI6ICJndWlsbG90aW5lQGZvcGRvb2RsZS5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "13", "sha256": "15mva65wi2wjy3wb7l71v9qag3wrswifrh53kx6nf8dkqpqir03y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9lbnRlNzYvZ3VpbGxvdGluZS8iLAogICJ1dWlkIjogImd1aWxsb3RpbmVAZm9wZG9vZGxlLm5ldCIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "15mva65wi2wjy3wb7l71v9qag3wrswifrh53kx6nf8dkqpqir03y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9lbnRlNzYvZ3VpbGxvdGluZS8iLAogICJ1dWlkIjogImd1aWxsb3RpbmVAZm9wZG9vZGxlLm5ldCIsCiAgInZlcnNpb24iOiAxMwp9"}}} +, {"uuid": "shuzhi@tuberry", "name": "Shu Zhi", "pname": "shu-zhi", "description": "Wallpaper generation extension for GNOME Shell, inspired by Jizhi\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3985/shu-zhi/", "shell_version_map": {"38": {"version": "7", "sha256": "1yk39q1ydv7kmb8shi4cp7pf5zvpmj99gjl9svack4773dj9rrwi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogInNodXpoaSIsCiAgIm5hbWUiOiAiU2h1IFpoaSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV6aGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NodXpoaSIsCiAgInV1aWQiOiAic2h1emhpQHR1YmVycnkiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "17", "sha256": "1n0ajmm6d7y6kify6k9g3j2kc3ass9s7zyif5jhr1djzsi6knpq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "19", "sha256": "1ib82yf7gh97hygbrxccpsh75jpg65rp834vygi25kyf0b8fykff", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "21", "sha256": "1pbldn51jjfq45d3bl7nfciff1mn3krl7dhiwp9hqrp3hchlassd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyMQp9"}}} , {"uuid": "zilence@apankowski.github.com", "name": "Zilence", "pname": "zilence", "description": "Turns off notifications while sharing screen during a Zoom call", "link": "https://extensions.gnome.org/extension/3988/zilence/", "shell_version_map": {"38": {"version": "2", "sha256": "0ffpwwhx4pn8dfpcbi6yvxvaybwfxklyw5ig9ns71ydckzvn1n9y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICIyYzdiZjFhNDJlMTFkODM4YTU2NGE2NWQ4MzY5YTgwNjM3M2I2NjdiIiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXBhbmtvd3NraS96aWxlbmNlIiwKICAidXVpZCI6ICJ6aWxlbmNlQGFwYW5rb3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "bluetooth-battery@michalw.github.com", "name": "Bluetooth battery indicator", "pname": "bluetooth-battery", "description": "Bluetooth battery indicator", "link": "https://extensions.gnome.org/extension/3991/bluetooth-battery/", "shell_version_map": {"38": {"version": "19", "sha256": "17wnkw6js16ivbpkizj9ph55nj2z2wcdj73c2yh4lvyifpks54ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "40": {"version": "19", "sha256": "17wnkw6js16ivbpkizj9ph55nj2z2wcdj73c2yh4lvyifpks54ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "41": {"version": "19", "sha256": "17wnkw6js16ivbpkizj9ph55nj2z2wcdj73c2yh4lvyifpks54ih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}}} +, {"uuid": "bluetooth-battery@michalw.github.com", "name": "Bluetooth battery indicator", "pname": "bluetooth-battery", "description": "Bluetooth battery indicator", "link": "https://extensions.gnome.org/extension/3991/bluetooth-battery/", "shell_version_map": {"38": {"version": "22", "sha256": "0gl179krab1s8szxsm498n0hlfm914fi4p2skxsfb8056brz9j1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "40": {"version": "22", "sha256": "0gl179krab1s8szxsm498n0hlfm914fi4p2skxsfb8056brz9j1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "22", "sha256": "0gl179krab1s8szxsm498n0hlfm914fi4p2skxsfb8056brz9j1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}}} , {"uuid": "gnome-extension-all-ip-addresses@havekes.eu", "name": "All IP Addresses", "pname": "all-ip-addresses", "description": "Show IP addresses for LAN, WAN IPv6 and VPN in the GNOME panel. Click on the address to cycle trough different interfaces.", "link": "https://extensions.gnome.org/extension/3994/all-ip-addresses/", "shell_version_map": {"38": {"version": "3", "sha256": "1s08inwbr9g50g275sxsjggqgwh59gz664ay944ngn755vnr9y1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9waGF2ZWtlcy9nbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3NlcyIsCiAgInV1aWQiOiAiZ25vbWUtZXh0ZW5zaW9uLWFsbC1pcC1hZGRyZXNzZXNAaGF2ZWtlcy5ldSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "1s08inwbr9g50g275sxsjggqgwh59gz664ay944ngn755vnr9y1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9waGF2ZWtlcy9nbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3NlcyIsCiAgInV1aWQiOiAiZ25vbWUtZXh0ZW5zaW9uLWFsbC1pcC1hZGRyZXNzZXNAaGF2ZWtlcy5ldSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "1s08inwbr9g50g275sxsjggqgwh59gz664ay944ngn755vnr9y1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9waGF2ZWtlcy9nbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3NlcyIsCiAgInV1aWQiOiAiZ25vbWUtZXh0ZW5zaW9uLWFsbC1pcC1hZGRyZXNzZXNAaGF2ZWtlcy5ldSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "app-grid-tweaks@Selenium-H", "name": "App Grid Tweaks", "pname": "app-grid-tweaks", "description": "Customize the application grid view.\n\nSet the rows, columns and the app icon size for a particular configuration to work.\nIf the screen space is out numbered, reduce the icon size to fit all the rows and columns.\nOr reduce the number of rows and columns.\n\nPress the Refresh button on the left of header bar to apply changes", "link": "https://extensions.gnome.org/extension/3997/app-grid-tweaks/", "shell_version_map": {"38": {"version": "4", "sha256": "17hriwcwhkjp3n20q7bm7iylr8862ghvnagf2xk0ci2hxwwbyc92", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuIiwKICAiZGVzY3JpcHRpb24iOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuXG5cblNldCB0aGUgcm93cywgY29sdW1ucyBhbmQgdGhlIGFwcCBpY29uIHNpemUgZm9yIGEgcGFydGljdWxhciBjb25maWd1cmF0aW9uIHRvIHdvcmsuXG5JZiB0aGUgc2NyZWVuIHNwYWNlIGlzIG91dCBudW1iZXJlZCwgcmVkdWNlIHRoZSBpY29uIHNpemUgdG8gZml0IGFsbCB0aGUgcm93cyBhbmQgY29sdW1ucy5cbk9yIHJlZHVjZSB0aGUgbnVtYmVyIG9mIHJvd3MgYW5kIGNvbHVtbnMuXG5cblByZXNzIHRoZSBSZWZyZXNoIGJ1dHRvbiBvbiB0aGUgbGVmdCBvZiBoZWFkZXIgYmFyIHRvIGFwcGx5IGNoYW5nZXMiLAogICJuYW1lIjogIkFwcCBHcmlkIFR3ZWFrcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHAtZ3JpZC10d2Vha3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJzdGF0dXMiOiAiIiwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TZWxlbml1bS1IL0FwcC1HcmlkLVR3ZWFrcyIsCiAgInV1aWQiOiAiYXBwLWdyaWQtdHdlYWtzQFNlbGVuaXVtLUgiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "17hriwcwhkjp3n20q7bm7iylr8862ghvnagf2xk0ci2hxwwbyc92", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuIiwKICAiZGVzY3JpcHRpb24iOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuXG5cblNldCB0aGUgcm93cywgY29sdW1ucyBhbmQgdGhlIGFwcCBpY29uIHNpemUgZm9yIGEgcGFydGljdWxhciBjb25maWd1cmF0aW9uIHRvIHdvcmsuXG5JZiB0aGUgc2NyZWVuIHNwYWNlIGlzIG91dCBudW1iZXJlZCwgcmVkdWNlIHRoZSBpY29uIHNpemUgdG8gZml0IGFsbCB0aGUgcm93cyBhbmQgY29sdW1ucy5cbk9yIHJlZHVjZSB0aGUgbnVtYmVyIG9mIHJvd3MgYW5kIGNvbHVtbnMuXG5cblByZXNzIHRoZSBSZWZyZXNoIGJ1dHRvbiBvbiB0aGUgbGVmdCBvZiBoZWFkZXIgYmFyIHRvIGFwcGx5IGNoYW5nZXMiLAogICJuYW1lIjogIkFwcCBHcmlkIFR3ZWFrcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHAtZ3JpZC10d2Vha3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJzdGF0dXMiOiAiIiwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TZWxlbml1bS1IL0FwcC1HcmlkLVR3ZWFrcyIsCiAgInV1aWQiOiAiYXBwLWdyaWQtdHdlYWtzQFNlbGVuaXVtLUgiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "17hriwcwhkjp3n20q7bm7iylr8862ghvnagf2xk0ci2hxwwbyc92", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuIiwKICAiZGVzY3JpcHRpb24iOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuXG5cblNldCB0aGUgcm93cywgY29sdW1ucyBhbmQgdGhlIGFwcCBpY29uIHNpemUgZm9yIGEgcGFydGljdWxhciBjb25maWd1cmF0aW9uIHRvIHdvcmsuXG5JZiB0aGUgc2NyZWVuIHNwYWNlIGlzIG91dCBudW1iZXJlZCwgcmVkdWNlIHRoZSBpY29uIHNpemUgdG8gZml0IGFsbCB0aGUgcm93cyBhbmQgY29sdW1ucy5cbk9yIHJlZHVjZSB0aGUgbnVtYmVyIG9mIHJvd3MgYW5kIGNvbHVtbnMuXG5cblByZXNzIHRoZSBSZWZyZXNoIGJ1dHRvbiBvbiB0aGUgbGVmdCBvZiBoZWFkZXIgYmFyIHRvIGFwcGx5IGNoYW5nZXMiLAogICJuYW1lIjogIkFwcCBHcmlkIFR3ZWFrcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHAtZ3JpZC10d2Vha3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJzdGF0dXMiOiAiIiwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TZWxlbml1bS1IL0FwcC1HcmlkLVR3ZWFrcyIsCiAgInV1aWQiOiAiYXBwLWdyaWQtdHdlYWtzQFNlbGVuaXVtLUgiLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "babar@fthx", "name": "BaBar Task Bar", "pname": "babar", "description": "Task bar. App grid, favorites, workspaces and tasks in panel. Light extension.\n\n Replace 'Activities' button by all current workspaces and apps buttons. Switch workspace/app or toggle overview by clicking on these buttons. Drag and drop favorite, task, dash item or app grid item to any workspace (you cannot reorder tasks inside a workspace). Persistent window preview with right-click (right-click again or click on preview to close it). You can move this preview anywhere. Change 'Places' label to an icon. Settings in preferences UI.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.\n\n Changelog: https://github.com/fthx/babar/issues/2", "link": "https://extensions.gnome.org/extension/4000/babar/", "shell_version_map": {"38": {"version": "58", "sha256": "0sgsz9skc0d3rx9lap6g8fnmb5ki4ylr8s5f8yk5wkpvzvh3gkgy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBQZXJzaXN0ZW50IHdpbmRvdyBwcmV2aWV3IHdpdGggcmlnaHQtY2xpY2sgKHJpZ2h0LWNsaWNrIGFnYWluIG9yIGNsaWNrIG9uIHByZXZpZXcgdG8gY2xvc2UgaXQpLiBZb3UgY2FuIG1vdmUgdGhpcyBwcmV2aWV3IGFueXdoZXJlLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gU2V0dGluZ3MgaW4gcHJlZmVyZW5jZXMgVUkuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cbiBDaGFuZ2Vsb2c6IGh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JhYmFyL2lzc3Vlcy8yIiwKICAibmFtZSI6ICJCYUJhciBUYXNrIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXIiLAogICJ1dWlkIjogImJhYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "40": {"version": "58", "sha256": "0sgsz9skc0d3rx9lap6g8fnmb5ki4ylr8s5f8yk5wkpvzvh3gkgy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBQZXJzaXN0ZW50IHdpbmRvdyBwcmV2aWV3IHdpdGggcmlnaHQtY2xpY2sgKHJpZ2h0LWNsaWNrIGFnYWluIG9yIGNsaWNrIG9uIHByZXZpZXcgdG8gY2xvc2UgaXQpLiBZb3UgY2FuIG1vdmUgdGhpcyBwcmV2aWV3IGFueXdoZXJlLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gU2V0dGluZ3MgaW4gcHJlZmVyZW5jZXMgVUkuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cbiBDaGFuZ2Vsb2c6IGh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JhYmFyL2lzc3Vlcy8yIiwKICAibmFtZSI6ICJCYUJhciBUYXNrIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXIiLAogICJ1dWlkIjogImJhYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "41": {"version": "58", "sha256": "0sgsz9skc0d3rx9lap6g8fnmb5ki4ylr8s5f8yk5wkpvzvh3gkgy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBQZXJzaXN0ZW50IHdpbmRvdyBwcmV2aWV3IHdpdGggcmlnaHQtY2xpY2sgKHJpZ2h0LWNsaWNrIGFnYWluIG9yIGNsaWNrIG9uIHByZXZpZXcgdG8gY2xvc2UgaXQpLiBZb3UgY2FuIG1vdmUgdGhpcyBwcmV2aWV3IGFueXdoZXJlLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gU2V0dGluZ3MgaW4gcHJlZmVyZW5jZXMgVUkuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cbiBDaGFuZ2Vsb2c6IGh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JhYmFyL2lzc3Vlcy8yIiwKICAibmFtZSI6ICJCYUJhciBUYXNrIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXIiLAogICJ1dWlkIjogImJhYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}}} +, {"uuid": "babar@fthx", "name": "BaBar Task Bar", "pname": "babar", "description": "Task bar. App grid, favorites, workspaces and tasks in panel. Light extension.\n\n Replace 'Activities' button by all current workspaces and apps buttons. Switch workspace/app or toggle overview by clicking on these buttons. Drag and drop favorite, task, dash item or app grid item to any workspace (you cannot reorder tasks inside a workspace). Persistent window preview with right-click (right-click again or click on preview to close it). You can move this preview anywhere. Change 'Places' label to an icon. Settings in preferences UI.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.\n\n Changelog: https://github.com/fthx/babar/issues/2", "link": "https://extensions.gnome.org/extension/4000/babar/", "shell_version_map": {"38": {"version": "58", "sha256": "0sgsz9skc0d3rx9lap6g8fnmb5ki4ylr8s5f8yk5wkpvzvh3gkgy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBQZXJzaXN0ZW50IHdpbmRvdyBwcmV2aWV3IHdpdGggcmlnaHQtY2xpY2sgKHJpZ2h0LWNsaWNrIGFnYWluIG9yIGNsaWNrIG9uIHByZXZpZXcgdG8gY2xvc2UgaXQpLiBZb3UgY2FuIG1vdmUgdGhpcyBwcmV2aWV3IGFueXdoZXJlLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gU2V0dGluZ3MgaW4gcHJlZmVyZW5jZXMgVUkuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cbiBDaGFuZ2Vsb2c6IGh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JhYmFyL2lzc3Vlcy8yIiwKICAibmFtZSI6ICJCYUJhciBUYXNrIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXIiLAogICJ1dWlkIjogImJhYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "40": {"version": "58", "sha256": "0sgsz9skc0d3rx9lap6g8fnmb5ki4ylr8s5f8yk5wkpvzvh3gkgy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBQZXJzaXN0ZW50IHdpbmRvdyBwcmV2aWV3IHdpdGggcmlnaHQtY2xpY2sgKHJpZ2h0LWNsaWNrIGFnYWluIG9yIGNsaWNrIG9uIHByZXZpZXcgdG8gY2xvc2UgaXQpLiBZb3UgY2FuIG1vdmUgdGhpcyBwcmV2aWV3IGFueXdoZXJlLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gU2V0dGluZ3MgaW4gcHJlZmVyZW5jZXMgVUkuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cbiBDaGFuZ2Vsb2c6IGh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JhYmFyL2lzc3Vlcy8yIiwKICAibmFtZSI6ICJCYUJhciBUYXNrIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXIiLAogICJ1dWlkIjogImJhYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "41": {"version": "58", "sha256": "0sgsz9skc0d3rx9lap6g8fnmb5ki4ylr8s5f8yk5wkpvzvh3gkgy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBQZXJzaXN0ZW50IHdpbmRvdyBwcmV2aWV3IHdpdGggcmlnaHQtY2xpY2sgKHJpZ2h0LWNsaWNrIGFnYWluIG9yIGNsaWNrIG9uIHByZXZpZXcgdG8gY2xvc2UgaXQpLiBZb3UgY2FuIG1vdmUgdGhpcyBwcmV2aWV3IGFueXdoZXJlLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gU2V0dGluZ3MgaW4gcHJlZmVyZW5jZXMgVUkuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cbiBDaGFuZ2Vsb2c6IGh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JhYmFyL2lzc3Vlcy8yIiwKICAibmFtZSI6ICJCYUJhciBUYXNrIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXIiLAogICJ1dWlkIjogImJhYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "42": {"version": "58", "sha256": "0sgsz9skc0d3rx9lap6g8fnmb5ki4ylr8s5f8yk5wkpvzvh3gkgy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBQZXJzaXN0ZW50IHdpbmRvdyBwcmV2aWV3IHdpdGggcmlnaHQtY2xpY2sgKHJpZ2h0LWNsaWNrIGFnYWluIG9yIGNsaWNrIG9uIHByZXZpZXcgdG8gY2xvc2UgaXQpLiBZb3UgY2FuIG1vdmUgdGhpcyBwcmV2aWV3IGFueXdoZXJlLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gU2V0dGluZ3MgaW4gcHJlZmVyZW5jZXMgVUkuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cbiBDaGFuZ2Vsb2c6IGh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JhYmFyL2lzc3Vlcy8yIiwKICAibmFtZSI6ICJCYUJhciBUYXNrIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXIiLAogICJ1dWlkIjogImJhYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}}} , {"uuid": "kitsch@fopdoodle.net", "name": "Kitsch", "pname": "kitsch", "description": "Kitsch is a collection of cheap, popular, and marketable improvements to Gnome. One could consider it applying a cosmetic surgery to Gnome.\n\nKitsch can easily be configured and offers the following features:\n- remove application menu from the top bar\n- remove the activity button from the top bar\n- periodically change the background picture\n\nThis extension does not come with any button on the panel. Visit the website for a documentation.", "link": "https://extensions.gnome.org/extension/4001/kitsch/", "shell_version_map": {"38": {"version": "2", "sha256": "16zwz0p4f8zizr14k4jmdixgnjd0a67d0i3w6clrqgfl49cpdcdv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktpdHNjaCBpcyBhIGNvbGxlY3Rpb24gb2YgY2hlYXAsIHBvcHVsYXIsIGFuZCBtYXJrZXRhYmxlIGltcHJvdmVtZW50cyB0byBHbm9tZS4gT25lIGNvdWxkIGNvbnNpZGVyIGl0IGFwcGx5aW5nIGEgY29zbWV0aWMgc3VyZ2VyeSB0byBHbm9tZS5cblxuS2l0c2NoIGNhbiBlYXNpbHkgYmUgY29uZmlndXJlZCBhbmQgb2ZmZXJzIHRoZSBmb2xsb3dpbmcgZmVhdHVyZXM6XG4tIHJlbW92ZSBhcHBsaWNhdGlvbiBtZW51IGZyb20gdGhlIHRvcCBiYXJcbi0gcmVtb3ZlIHRoZSBhY3Rpdml0eSBidXR0b24gZnJvbSB0aGUgdG9wIGJhclxuLSBwZXJpb2RpY2FsbHkgY2hhbmdlIHRoZSBiYWNrZ3JvdW5kIHBpY3R1cmVcblxuVGhpcyBleHRlbnNpb24gZG9lcyBub3QgY29tZSB3aXRoIGFueSBidXR0b24gb24gdGhlIHBhbmVsLiBWaXNpdCB0aGUgd2Vic2l0ZSBmb3IgYSBkb2N1bWVudGF0aW9uLiIsCiAgIm5hbWUiOiAiS2l0c2NoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtpdHNjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VudGU3Ni9raXRzY2gvIiwKICAidXVpZCI6ICJraXRzY2hAZm9wZG9vZGxlLm5ldCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "5", "sha256": "1bbbdhf73sv240bid4s604g6r8axd40ph2yyf23z5fpj3679g2xr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktpdHNjaCBpcyBhIGNvbGxlY3Rpb24gb2YgY2hlYXAsIHBvcHVsYXIsIGFuZCBtYXJrZXRhYmxlIGltcHJvdmVtZW50cyB0byBHbm9tZS4gT25lIGNvdWxkIGNvbnNpZGVyIGl0IGFwcGx5aW5nIGEgY29zbWV0aWMgc3VyZ2VyeSB0byBHbm9tZS5cblxuS2l0c2NoIGNhbiBlYXNpbHkgYmUgY29uZmlndXJlZCBhbmQgb2ZmZXJzIHRoZSBmb2xsb3dpbmcgZmVhdHVyZXM6XG4tIHJlbW92ZSBhcHBsaWNhdGlvbiBtZW51IGZyb20gdGhlIHRvcCBiYXJcbi0gcmVtb3ZlIHRoZSBhY3Rpdml0eSBidXR0b24gZnJvbSB0aGUgdG9wIGJhclxuLSBwZXJpb2RpY2FsbHkgY2hhbmdlIHRoZSBiYWNrZ3JvdW5kIHBpY3R1cmVcblxuVGhpcyBleHRlbnNpb24gZG9lcyBub3QgY29tZSB3aXRoIGFueSBidXR0b24gb24gdGhlIHBhbmVsLiBWaXNpdCB0aGUgd2Vic2l0ZSBmb3IgYSBkb2N1bWVudGF0aW9uLiIsCiAgIm5hbWUiOiAiS2l0c2NoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtpdHNjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lbnRlNzYva2l0c2NoLyIsCiAgInV1aWQiOiAia2l0c2NoQGZvcGRvb2RsZS5uZXQiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "gnome-visuals-top-bar@evendanan.net", "name": "Top Bar Visuals - transparent and blur", "pname": "top-bar-visuals-transparent-and-blur", "description": "Fork of: https://github.com/lamarios/gnome-shell-extension-transparent-top-bar\n\nBring back the adjustable transparency top bar (panel) in GNOME Shell and add blur while at it.\n\nDoes not work well with custom shell themes.", "link": "https://extensions.gnome.org/extension/4003/top-bar-visuals-transparent-and-blur/", "shell_version_map": {"38": {"version": "2", "sha256": "0h1qx7bh4gb3xkc8g8byynfa3imxkx332kh88pm4g9zaa20fxzwr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS9sYW1hcmlvcy9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSBhZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSB0b3AgYmFyIChwYW5lbCkgaW4gR05PTUUgU2hlbGwgYW5kIGFkZCBibHVyIHdoaWxlIGF0IGl0LlxuXG5Eb2VzIG5vdCB3b3JrIHdlbGwgd2l0aCBjdXN0b20gc2hlbGwgdGhlbWVzLiIsCiAgIm5hbWUiOiAiVG9wIEJhciBWaXN1YWxzIC0gdHJhbnNwYXJlbnQgYW5kIGJsdXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tZW5ueS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhciIsCiAgInV1aWQiOiAiZ25vbWUtdmlzdWFscy10b3AtYmFyQGV2ZW5kYW5hbi5uZXQiLAogICJ2ZXJzaW9uIjogMgp9"}}} -, {"uuid": "desktop-lyric@tuberry", "name": "Desktop Lyric", "pname": "desktop-lyric", "description": "Show the lyric of playing songs on the desktop\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/4006/desktop-lyric/", "shell_version_map": {"38": {"version": "3", "sha256": "1fxlszj21ppdl5k2x2samggxlnay5bqly604szv1sjsnfriqzz3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVza3RvcC1seXJpYyIsCiAgIm5hbWUiOiAiRGVza3RvcCBMeXJpYyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kZXNrdG9wLWx5cmljIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9kZXNrdG9wLWx5cmljIiwKICAidXVpZCI6ICJkZXNrdG9wLWx5cmljQHR1YmVycnkiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "7", "sha256": "1dd8i7845fshc2d04fgzjr1chrnwsfr7qyjjki1svw36mx1qsjm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVza3RvcC1seXJpYyIsCiAgIm5hbWUiOiAiRGVza3RvcCBMeXJpYyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kZXNrdG9wLWx5cmljIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvZGVza3RvcC1seXJpYyIsCiAgInV1aWQiOiAiZGVza3RvcC1seXJpY0B0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "12", "sha256": "056cdiw7rlqpxkmca3f1aic7wr9dppvhp1z7wfxl905xn21p9pqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlc2t0b3AtbHlyaWMiLAogICJuYW1lIjogIkRlc2t0b3AgTHlyaWMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVza3RvcC1seXJpYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2Rlc2t0b3AtbHlyaWMiLAogICJ1dWlkIjogImRlc2t0b3AtbHlyaWNAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxMgp9"}}} +, {"uuid": "desktop-lyric@tuberry", "name": "Desktop Lyric", "pname": "desktop-lyric", "description": "Show the lyric of playing songs on the desktop\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/4006/desktop-lyric/", "shell_version_map": {"38": {"version": "3", "sha256": "1fxlszj21ppdl5k2x2samggxlnay5bqly604szv1sjsnfriqzz3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVza3RvcC1seXJpYyIsCiAgIm5hbWUiOiAiRGVza3RvcCBMeXJpYyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kZXNrdG9wLWx5cmljIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9kZXNrdG9wLWx5cmljIiwKICAidXVpZCI6ICJkZXNrdG9wLWx5cmljQHR1YmVycnkiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "7", "sha256": "1dd8i7845fshc2d04fgzjr1chrnwsfr7qyjjki1svw36mx1qsjm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVza3RvcC1seXJpYyIsCiAgIm5hbWUiOiAiRGVza3RvcCBMeXJpYyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kZXNrdG9wLWx5cmljIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvZGVza3RvcC1seXJpYyIsCiAgInV1aWQiOiAiZGVza3RvcC1seXJpY0B0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "12", "sha256": "056cdiw7rlqpxkmca3f1aic7wr9dppvhp1z7wfxl905xn21p9pqf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlc2t0b3AtbHlyaWMiLAogICJuYW1lIjogIkRlc2t0b3AgTHlyaWMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVza3RvcC1seXJpYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2Rlc2t0b3AtbHlyaWMiLAogICJ1dWlkIjogImRlc2t0b3AtbHlyaWNAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "13", "sha256": "0j23i2gl956r2wffqky5vg6ca24gn3hkibhrhsvkqd87g90cjdq6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIGx5cmljIG9mIHBsYXlpbmcgc29uZ3Mgb24gdGhlIGRlc2t0b3BcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlc2t0b3AtbHlyaWMiLAogICJuYW1lIjogIkRlc2t0b3AgTHlyaWMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVza3RvcC1seXJpYyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2Rlc2t0b3AtbHlyaWMiLAogICJ1dWlkIjogImRlc2t0b3AtbHlyaWNAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "alttab-mod@leleat-on-github", "name": "AltTab Mod", "pname": "alttab-mod", "description": "Alt/Super+Tab can also be navigated with WASD and hjkl. Q just closes the selected item and only the first window will be raised on app activation. Optionally, only show windows from the current workspace or monitor and remove the slight popup delay.", "link": "https://extensions.gnome.org/extension/4007/alttab-mod/", "shell_version_map": {"38": {"version": "6", "sha256": "069086j1855s0zrawx49h40l3qmzbsjl0n58wr74lxfk1s6sirww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdC9TdXBlcitUYWIgY2FuIGFsc28gYmUgbmF2aWdhdGVkIHdpdGggV0FTRCBhbmQgaGprbC4gUSBqdXN0IGNsb3NlcyB0aGUgc2VsZWN0ZWQgaXRlbSBhbmQgb25seSB0aGUgZmlyc3Qgd2luZG93IHdpbGwgYmUgcmFpc2VkIG9uIGFwcCBhY3RpdmF0aW9uLiBPcHRpb25hbGx5LCBvbmx5IHNob3cgd2luZG93cyBmcm9tIHRoZSBjdXJyZW50IHdvcmtzcGFjZSBvciBtb25pdG9yIGFuZCByZW1vdmUgdGhlIHNsaWdodCBwb3B1cCBkZWxheS4iLAogICJuYW1lIjogIkFsdFRhYiBNb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9BbHRUYWItTW9kIiwKICAidXVpZCI6ICJhbHR0YWItbW9kQGxlbGVhdC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "7", "sha256": "1qnbga30wvsj6xny7ajvy8y6c4vm3cpwz3zkm5njr2d0qg4svsq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdC9TdXBlcitUYWIgY2FuIGFsc28gYmUgbmF2aWdhdGVkIHdpdGggV0FTRCBhbmQgaGprbC4gUSBqdXN0IGNsb3NlcyB0aGUgc2VsZWN0ZWQgaXRlbSBhbmQgb25seSB0aGUgZmlyc3Qgd2luZG93IHdpbGwgYmUgcmFpc2VkIG9uIGFwcCBhY3RpdmF0aW9uLiBPcHRpb25hbGx5LCBvbmx5IHNob3cgd2luZG93cyBmcm9tIHRoZSBjdXJyZW50IHdvcmtzcGFjZSBvciBtb25pdG9yIGFuZCByZW1vdmUgdGhlIHNsaWdodCBwb3B1cCBkZWxheS4iLAogICJuYW1lIjogIkFsdFRhYiBNb2QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx0VGFiLW1vZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L0FsdFRhYi1Nb2QiLAogICJ1dWlkIjogImFsdHRhYi1tb2RAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1qnbga30wvsj6xny7ajvy8y6c4vm3cpwz3zkm5njr2d0qg4svsq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsdC9TdXBlcitUYWIgY2FuIGFsc28gYmUgbmF2aWdhdGVkIHdpdGggV0FTRCBhbmQgaGprbC4gUSBqdXN0IGNsb3NlcyB0aGUgc2VsZWN0ZWQgaXRlbSBhbmQgb25seSB0aGUgZmlyc3Qgd2luZG93IHdpbGwgYmUgcmFpc2VkIG9uIGFwcCBhY3RpdmF0aW9uLiBPcHRpb25hbGx5LCBvbmx5IHNob3cgd2luZG93cyBmcm9tIHRoZSBjdXJyZW50IHdvcmtzcGFjZSBvciBtb25pdG9yIGFuZCByZW1vdmUgdGhlIHNsaWdodCBwb3B1cCBkZWxheS4iLAogICJuYW1lIjogIkFsdFRhYiBNb2QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx0VGFiLW1vZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L0FsdFRhYi1Nb2QiLAogICJ1dWlkIjogImFsdHRhYi1tb2RAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "personalize@Selenium-H", "name": "Personalize", "pname": "personalize", "description": "Personalize the looks of GNOME Desktop.\n\nSet the theme variant, window corner curvature and select accent color.\nThe Colors section contains colors generated from the selected accent color.\nThe color generation is not accurate. However, individual colors can be customised.\n\nNot all settings are applied automatically.\nPress Refresh button on the left of the headerbar to reload the extension \n\nCurrently, only Adwaita theme is supported. Also, Adwaita and Adwaita-dark gtk-2 themes\nmust be installed for the extension to work properly. Not all widgets are themed perfectly.", "link": "https://extensions.gnome.org/extension/4010/personalize/", "shell_version_map": {"38": {"version": "1", "sha256": "1rgh2zq7086ymf0222pbrx5n8q11v3f45095w4x3ikw7k12j9s0n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiUGVyc29uYWxpemUgR05PTUUgdGhlbWUgYW5kIGN1c3RvbWl6ZSB0aGVtLiIsCiAgImRlc2NyaXB0aW9uIjogIlBlcnNvbmFsaXplIHRoZSBsb29rcyBvZiBHTk9NRSBEZXNrdG9wLlxuXG5TZXQgdGhlIHRoZW1lIHZhcmlhbnQsIHdpbmRvdyBjb3JuZXIgY3VydmF0dXJlIGFuZCBzZWxlY3QgYWNjZW50IGNvbG9yLlxuVGhlIENvbG9ycyBzZWN0aW9uIGNvbnRhaW5zIGNvbG9ycyBnZW5lcmF0ZWQgZnJvbSB0aGUgc2VsZWN0ZWQgYWNjZW50IGNvbG9yLlxuVGhlIGNvbG9yIGdlbmVyYXRpb24gaXMgbm90IGFjY3VyYXRlLiBIb3dldmVyLCBpbmRpdmlkdWFsIGNvbG9ycyBjYW4gYmUgY3VzdG9taXNlZC5cblxuTm90IGFsbCBzZXR0aW5ncyBhcmUgYXBwbGllZCBhdXRvbWF0aWNhbGx5LlxuUHJlc3MgUmVmcmVzaCBidXR0b24gb24gdGhlIGxlZnQgb2YgdGhlIGhlYWRlcmJhciB0byByZWxvYWQgdGhlIGV4dGVuc2lvbiBcblxuQ3VycmVudGx5LCBvbmx5IEFkd2FpdGEgdGhlbWUgaXMgc3VwcG9ydGVkLiBBbHNvLCBBZHdhaXRhIGFuZCBBZHdhaXRhLWRhcmsgZ3RrLTIgdGhlbWVzXG5tdXN0IGJlIGluc3RhbGxlZCBmb3IgdGhlIGV4dGVuc2lvbiB0byB3b3JrIHByb3Blcmx5LiBOb3QgYWxsIHdpZGdldHMgYXJlIHRoZW1lZCBwZXJmZWN0bHkuIiwKICAibmFtZSI6ICJQZXJzb25hbGl6ZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wZXJzb25hbGl6ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJzdGF0dXMiOiAiICIsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2VsZW5pdW0tSC9QZXJzb25hbGl6ZSIsCiAgInV1aWQiOiAicGVyc29uYWxpemVAU2VsZW5pdW0tSCIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "gnomebedtime@ionutbortis.gmail.com", "name": "Bedtime Mode", "pname": "gnome-bedtime", "description": "Hey Gnome, it's bedtime! Converts to grayscale the entire Gnome workspace by using a smooth transition. Best to use during evening/night.\n\nThis behaviour is similar to Android's bedtime mode which converts the phone screen to grayscale. It should somewhat make your device less appealing and limit the usage of it before bedtime. On my side, at least, it still requires a fair amount of self control in order to make that happen.\n\nThe extension has a nice Settings UI where you can customize it to your liking:\n- Set an automatic schedule for turning on/off the Bedtime Mode\n- Add an On Demand button to Top Bar or System Menu to manually toggle the mode\n- Control the On Demand button visibility, appearance and position in Top Bar\n- Choose another color preset and intensity, if you prefer a different color scheme\n- Change color intensity on the fly by scrolling over the On Demand button in Top Bar\n\nMulti language support is also available, please check the GitHub page if you want to help with the translations. So far, the extension is fully translated to Spanish, Dutch, German, Romanian and English.\n\nIf you want to use a keyboard shortcut in order to toggle the Bedtime Mode then you can use this command for the shortcut:\n\nbash -c 'schema_id=org.gnome.shell.extensions.bedtime-mode; schema_dir=~/.local/share/gnome-shell/extensions/gnomebedtime@ionutbortis.gmail.com/schemas/; if [[ $(gsettings --schemadir $schema_dir get $schema_id bedtime-mode-active) == \"true\" ]]; then turn_on=false; else turn_on=true; fi; gsettings --schemadir $schema_dir set $schema_id bedtime-mode-active $turn_on;'", "link": "https://extensions.gnome.org/extension/4012/gnome-bedtime/", "shell_version_map": {"38": {"version": "7", "sha256": "1ibar09d05ggc3v4c1gndpznarnq5xx2pqx7cglg0mbhc0lbpr3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmVkdGltZS1tb2RlIiwKICAibmFtZSI6ICJCZWR0aW1lIE1vZGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "1ibar09d05ggc3v4c1gndpznarnq5xx2pqx7cglg0mbhc0lbpr3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmVkdGltZS1tb2RlIiwKICAibmFtZSI6ICJCZWR0aW1lIE1vZGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "1ibar09d05ggc3v4c1gndpznarnq5xx2pqx7cglg0mbhc0lbpr3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmVkdGltZS1tb2RlIiwKICAibmFtZSI6ICJCZWR0aW1lIE1vZGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "gnomebedtime@ionutbortis.gmail.com", "name": "Bedtime Mode", "pname": "gnome-bedtime", "description": "Hey Gnome, it's bedtime! Converts to grayscale the entire Gnome workspace by using a smooth transition. Best to use during evening/night.\n\nThis behaviour is similar to Android's bedtime mode which converts the phone screen to grayscale. It should somewhat make your device less appealing and limit the usage of it before bedtime. On my side, at least, it still requires a fair amount of self control in order to make that happen.\n\nThe extension has a nice Settings UI where you can customize it to your liking:\n- Set an automatic schedule for turning on/off the Bedtime Mode\n- Add an On Demand button to Top Bar or System Menu to manually toggle the mode\n- Control the On Demand button visibility, appearance and position in Top Bar\n- Choose another color preset and intensity, if you prefer a different color scheme\n- Change color intensity on the fly by scrolling over the On Demand button in Top Bar\n\nMulti language support is also available, please check the GitHub page if you want to help with the translations. So far, the extension is fully translated to Spanish, Dutch, German, Romanian and English.\n\nIf you want to use a keyboard shortcut in order to toggle the Bedtime Mode then you can use this command for the shortcut:\n\nbash -c 'schema_id=org.gnome.shell.extensions.bedtime-mode; schema_dir=~/.local/share/gnome-shell/extensions/gnomebedtime@ionutbortis.gmail.com/schemas/; if [[ $(gsettings --schemadir $schema_dir get $schema_id bedtime-mode-active) == \"true\" ]]; then turn_on=false; else turn_on=true; fi; gsettings --schemadir $schema_dir set $schema_id bedtime-mode-active $turn_on;'\n", "link": "https://extensions.gnome.org/extension/4012/gnome-bedtime/", "shell_version_map": {"38": {"version": "8", "sha256": "11ay06wgi8mq4n6il16rq06pmpy70apmjw0s521bw94vpvhw64kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "11ay06wgi8mq4n6il16rq06pmpy70apmjw0s521bw94vpvhw64kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "11ay06wgi8mq4n6il16rq06pmpy70apmjw0s521bw94vpvhw64kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "11ay06wgi8mq4n6il16rq06pmpy70apmjw0s521bw94vpvhw64kd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhleSBHbm9tZSwgaXQncyBiZWR0aW1lISBDb252ZXJ0cyB0byBncmF5c2NhbGUgdGhlIGVudGlyZSBHbm9tZSB3b3Jrc3BhY2UgYnkgdXNpbmcgYSBzbW9vdGggdHJhbnNpdGlvbi4gQmVzdCB0byB1c2UgZHVyaW5nIGV2ZW5pbmcvbmlnaHQuXG5cblRoaXMgYmVoYXZpb3VyIGlzIHNpbWlsYXIgdG8gQW5kcm9pZCdzIGJlZHRpbWUgbW9kZSB3aGljaCBjb252ZXJ0cyB0aGUgcGhvbmUgc2NyZWVuIHRvIGdyYXlzY2FsZS4gSXQgc2hvdWxkIHNvbWV3aGF0IG1ha2UgeW91ciBkZXZpY2UgbGVzcyBhcHBlYWxpbmcgYW5kIGxpbWl0IHRoZSB1c2FnZSBvZiBpdCBiZWZvcmUgYmVkdGltZS4gT24gbXkgc2lkZSwgYXQgbGVhc3QsIGl0IHN0aWxsIHJlcXVpcmVzIGEgZmFpciBhbW91bnQgb2Ygc2VsZiBjb250cm9sIGluIG9yZGVyIHRvIG1ha2UgdGhhdCBoYXBwZW4uXG5cblRoZSBleHRlbnNpb24gaGFzIGEgbmljZSBTZXR0aW5ncyBVSSB3aGVyZSB5b3UgY2FuIGN1c3RvbWl6ZSBpdCB0byB5b3VyIGxpa2luZzpcbi0gU2V0IGFuIGF1dG9tYXRpYyBzY2hlZHVsZSBmb3IgdHVybmluZyBvbi9vZmYgdGhlIEJlZHRpbWUgTW9kZVxuLSBBZGQgYW4gT24gRGVtYW5kIGJ1dHRvbiB0byBUb3AgQmFyIG9yIFN5c3RlbSBNZW51IHRvIG1hbnVhbGx5IHRvZ2dsZSB0aGUgbW9kZVxuLSBDb250cm9sIHRoZSBPbiBEZW1hbmQgYnV0dG9uIHZpc2liaWxpdHksIGFwcGVhcmFuY2UgYW5kIHBvc2l0aW9uIGluIFRvcCBCYXJcbi0gQ2hvb3NlIGFub3RoZXIgY29sb3IgcHJlc2V0IGFuZCBpbnRlbnNpdHksIGlmIHlvdSBwcmVmZXIgYSBkaWZmZXJlbnQgY29sb3Igc2NoZW1lXG4tIENoYW5nZSBjb2xvciBpbnRlbnNpdHkgb24gdGhlIGZseSBieSBzY3JvbGxpbmcgb3ZlciB0aGUgT24gRGVtYW5kIGJ1dHRvbiBpbiBUb3AgQmFyXG5cbk11bHRpIGxhbmd1YWdlIHN1cHBvcnQgaXMgYWxzbyBhdmFpbGFibGUsIHBsZWFzZSBjaGVjayB0aGUgR2l0SHViIHBhZ2UgaWYgeW91IHdhbnQgdG8gaGVscCB3aXRoIHRoZSB0cmFuc2xhdGlvbnMuIFNvIGZhciwgdGhlIGV4dGVuc2lvbiBpcyBmdWxseSB0cmFuc2xhdGVkIHRvIFNwYW5pc2gsIER1dGNoLCBHZXJtYW4sIFJvbWFuaWFuIGFuZCBFbmdsaXNoLlxuXG5JZiB5b3Ugd2FudCB0byB1c2UgYSBrZXlib2FyZCBzaG9ydGN1dCBpbiBvcmRlciB0byB0b2dnbGUgdGhlIEJlZHRpbWUgTW9kZSB0aGVuIHlvdSBjYW4gdXNlIHRoaXMgY29tbWFuZCBmb3IgdGhlIHNob3J0Y3V0OlxuXG5iYXNoIC1jICdzY2hlbWFfaWQ9b3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYmVkdGltZS1tb2RlOyBzY2hlbWFfZGlyPX4vLmxvY2FsL3NoYXJlL2dub21lLXNoZWxsL2V4dGVuc2lvbnMvZ25vbWViZWR0aW1lQGlvbnV0Ym9ydGlzLmdtYWlsLmNvbS9zY2hlbWFzLzsgaWYgW1sgJChnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgZ2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSkgPT0gXCJ0cnVlXCIgXV07IHRoZW4gdHVybl9vbj1mYWxzZTsgZWxzZSB0dXJuX29uPXRydWU7IGZpOyBnc2V0dGluZ3MgLS1zY2hlbWFkaXIgJHNjaGVtYV9kaXIgc2V0ICRzY2hlbWFfaWQgYmVkdGltZS1tb2RlLWFjdGl2ZSAkdHVybl9vbjsnXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiZWR0aW1lLW1vZGUiLAogICJuYW1lIjogIkJlZHRpbWUgTW9kZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iZWR0aW1lLW1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pb251dGJvcnRpcy9nbm9tZS1iZWR0aW1lLW1vZGUiLAogICJ1dWlkIjogImdub21lYmVkdGltZUBpb251dGJvcnRpcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}}} +, {"uuid": "spotify-controller@koolskateguy89", "name": "Spotify Controller", "pname": "spotify-controller", "description": "Control Spotify from the topbar!\n\nCredit to Marcus Heine (https://github.com/mheine) for most of the code in this extension.", "link": "https://extensions.gnome.org/extension/4013/spotify-controller/", "shell_version_map": {"38": {"version": "8", "sha256": "08wdv54rkp18b4b6152b55jqc9b0j37pr8rvh0ixl7wsdmkxga4r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb29sc2thdGVndXk4OS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3BvdGlmeS1jb250cm9sbGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWNvbnRyb2xsZXJAa29vbHNrYXRlZ3V5ODkiLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "08wdv54rkp18b4b6152b55jqc9b0j37pr8rvh0ixl7wsdmkxga4r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgU3BvdGlmeSBmcm9tIHRoZSB0b3BiYXIhXG5cbkNyZWRpdCB0byBNYXJjdXMgSGVpbmUgKGh0dHBzOi8vZ2l0aHViLmNvbS9taGVpbmUpIGZvciBtb3N0IG9mIHRoZSBjb2RlIGluIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiU3BvdGlmeSBDb250cm9sbGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwb3RpZnktY29udHJvbGxlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rb29sc2thdGVndXk4OS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3BvdGlmeS1jb250cm9sbGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWNvbnRyb2xsZXJAa29vbHNrYXRlZ3V5ODkiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "transparentwindows.mdirshad07", "name": "Transparent Window", "pname": "transparent-window", "description": "Change the opacity of windows by compiz-style shortcut Alt+scroll.\nYou can customize hotkey in Preference page if Alt key doesn't work.", "link": "https://extensions.gnome.org/extension/4016/transparent-window/", "shell_version_map": {"38": {"version": "2", "sha256": "12d8ad0s3b2cd8gczsa2l2x5wf3rag9xfr12ljw2jlrzf99vnr70", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BieHFkb3duL2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC13aW5kb3ciLAogICJ1dWlkIjogInRyYW5zcGFyZW50d2luZG93cy5tZGlyc2hhZDA3IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "wandering-pixel@justinrdonnelly.github.com", "name": "Wandering Pixel", "pname": "wandering-pixel", "description": "Slide 1 pixel back and forth in the top bar as a workaround for various bugs in GNOME Shell and/or Mutter.", "link": "https://extensions.gnome.org/extension/4028/wandering-pixel/", "shell_version_map": {"38": {"version": "4", "sha256": "03hq51krmqm43vkrm3fpvy5da0y75wfpkjhfnch1cz5y3112d13q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWRlIDEgcGl4ZWwgYmFjayBhbmQgZm9ydGggaW4gdGhlIHRvcCBiYXIgYXMgYSB3b3JrYXJvdW5kIGZvciB2YXJpb3VzIGJ1Z3MgaW4gR05PTUUgU2hlbGwgYW5kL29yIE11dHRlci4iLAogICJuYW1lIjogIldhbmRlcmluZyBQaXhlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanVzdGlucmRvbm5lbGx5L3dhbmRlcmluZy1waXhlbCIsCiAgInV1aWQiOiAid2FuZGVyaW5nLXBpeGVsQGp1c3RpbnJkb25uZWxseS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "03hq51krmqm43vkrm3fpvy5da0y75wfpkjhfnch1cz5y3112d13q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWRlIDEgcGl4ZWwgYmFjayBhbmQgZm9ydGggaW4gdGhlIHRvcCBiYXIgYXMgYSB3b3JrYXJvdW5kIGZvciB2YXJpb3VzIGJ1Z3MgaW4gR05PTUUgU2hlbGwgYW5kL29yIE11dHRlci4iLAogICJuYW1lIjogIldhbmRlcmluZyBQaXhlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanVzdGlucmRvbm5lbGx5L3dhbmRlcmluZy1waXhlbCIsCiAgInV1aWQiOiAid2FuZGVyaW5nLXBpeGVsQGp1c3RpbnJkb25uZWxseS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "03hq51krmqm43vkrm3fpvy5da0y75wfpkjhfnch1cz5y3112d13q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWRlIDEgcGl4ZWwgYmFjayBhbmQgZm9ydGggaW4gdGhlIHRvcCBiYXIgYXMgYSB3b3JrYXJvdW5kIGZvciB2YXJpb3VzIGJ1Z3MgaW4gR05PTUUgU2hlbGwgYW5kL29yIE11dHRlci4iLAogICJuYW1lIjogIldhbmRlcmluZyBQaXhlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanVzdGlucmRvbm5lbGx5L3dhbmRlcmluZy1waXhlbCIsCiAgInV1aWQiOiAid2FuZGVyaW5nLXBpeGVsQGp1c3RpbnJkb25uZWxseS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "screenshot-directory@fawtytoo", "name": "Screenshot Directory", "pname": "screenshot-directory", "description": "The default screenshot directory is ~/Pictures. This extension changes that to use whatever is set if you used the Gnome Screenshot app. This can be found in the dconf setting: /org/gnome/gnome-screenshot/last-save-directory. If that directory doesn't exist, the extension will use the Home directory instead.\n\nNote: If the dconf setting doesn't exist, you need to install the Gnome Screenshot app.\n\nThe idea was taken from the extension: Screenshot Locations.", "link": "https://extensions.gnome.org/extension/4031/screenshot-directory/", "shell_version_map": {"38": {"version": "7", "sha256": "0ll7s1ydlqiz8h8yawflxcd6drxjsxwbqansxnb4jwyd41mr9rxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBkZWZhdWx0IHNjcmVlbnNob3QgZGlyZWN0b3J5IGlzIH4vUGljdHVyZXMuIFRoaXMgZXh0ZW5zaW9uIGNoYW5nZXMgdGhhdCB0byB1c2Ugd2hhdGV2ZXIgaXMgc2V0IGlmIHlvdSB1c2VkIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC4gVGhpcyBjYW4gYmUgZm91bmQgaW4gdGhlIGRjb25mIHNldHRpbmc6IC9vcmcvZ25vbWUvZ25vbWUtc2NyZWVuc2hvdC9sYXN0LXNhdmUtZGlyZWN0b3J5LiBJZiB0aGF0IGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0aGUgZXh0ZW5zaW9uIHdpbGwgdXNlIHRoZSBIb21lIGRpcmVjdG9yeSBpbnN0ZWFkLlxuXG5Ob3RlOiBJZiB0aGUgZGNvbmYgc2V0dGluZyBkb2Vzbid0IGV4aXN0LCB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC5cblxuVGhlIGlkZWEgd2FzIHRha2VuIGZyb20gdGhlIGV4dGVuc2lvbjogU2NyZWVuc2hvdCBMb2NhdGlvbnMuIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IERpcmVjdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInV1aWQiOiAic2NyZWVuc2hvdC1kaXJlY3RvcnlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogNwp9Cg=="}, "40": {"version": "7", "sha256": "0ll7s1ydlqiz8h8yawflxcd6drxjsxwbqansxnb4jwyd41mr9rxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBkZWZhdWx0IHNjcmVlbnNob3QgZGlyZWN0b3J5IGlzIH4vUGljdHVyZXMuIFRoaXMgZXh0ZW5zaW9uIGNoYW5nZXMgdGhhdCB0byB1c2Ugd2hhdGV2ZXIgaXMgc2V0IGlmIHlvdSB1c2VkIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC4gVGhpcyBjYW4gYmUgZm91bmQgaW4gdGhlIGRjb25mIHNldHRpbmc6IC9vcmcvZ25vbWUvZ25vbWUtc2NyZWVuc2hvdC9sYXN0LXNhdmUtZGlyZWN0b3J5LiBJZiB0aGF0IGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0aGUgZXh0ZW5zaW9uIHdpbGwgdXNlIHRoZSBIb21lIGRpcmVjdG9yeSBpbnN0ZWFkLlxuXG5Ob3RlOiBJZiB0aGUgZGNvbmYgc2V0dGluZyBkb2Vzbid0IGV4aXN0LCB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC5cblxuVGhlIGlkZWEgd2FzIHRha2VuIGZyb20gdGhlIGV4dGVuc2lvbjogU2NyZWVuc2hvdCBMb2NhdGlvbnMuIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IERpcmVjdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInV1aWQiOiAic2NyZWVuc2hvdC1kaXJlY3RvcnlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogNwp9Cg=="}, "41": {"version": "7", "sha256": "0ll7s1ydlqiz8h8yawflxcd6drxjsxwbqansxnb4jwyd41mr9rxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBkZWZhdWx0IHNjcmVlbnNob3QgZGlyZWN0b3J5IGlzIH4vUGljdHVyZXMuIFRoaXMgZXh0ZW5zaW9uIGNoYW5nZXMgdGhhdCB0byB1c2Ugd2hhdGV2ZXIgaXMgc2V0IGlmIHlvdSB1c2VkIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC4gVGhpcyBjYW4gYmUgZm91bmQgaW4gdGhlIGRjb25mIHNldHRpbmc6IC9vcmcvZ25vbWUvZ25vbWUtc2NyZWVuc2hvdC9sYXN0LXNhdmUtZGlyZWN0b3J5LiBJZiB0aGF0IGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0aGUgZXh0ZW5zaW9uIHdpbGwgdXNlIHRoZSBIb21lIGRpcmVjdG9yeSBpbnN0ZWFkLlxuXG5Ob3RlOiBJZiB0aGUgZGNvbmYgc2V0dGluZyBkb2Vzbid0IGV4aXN0LCB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC5cblxuVGhlIGlkZWEgd2FzIHRha2VuIGZyb20gdGhlIGV4dGVuc2lvbjogU2NyZWVuc2hvdCBMb2NhdGlvbnMuIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IERpcmVjdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInV1aWQiOiAic2NyZWVuc2hvdC1kaXJlY3RvcnlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogNwp9Cg=="}}} -, {"uuid": "x11gestures@joseexposito.github.io", "name": "X11 Gestures", "pname": "x11-gestures", "description": "Enable GNOME Shell multi-touch gestures on X11.\nRequires Touchégg https://github.com/JoseExposito/touchegg#readme", "link": "https://extensions.gnome.org/extension/4033/x11-gestures/", "shell_version_map": {"38": {"version": "13", "sha256": "1fp2wx763cdvlbr4aa69c3ljdzzkngmzp9qf9gf11nrrxbkraaw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0pvc2VFeHBvc2l0by9nbm9tZS1zaGVsbC1leHRlbnNpb24teDExZ2VzdHVyZXMiLAogICJ1dWlkIjogIngxMWdlc3R1cmVzQGpvc2VleHBvc2l0by5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "1fp2wx763cdvlbr4aa69c3ljdzzkngmzp9qf9gf11nrrxbkraaw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0pvc2VFeHBvc2l0by9nbm9tZS1zaGVsbC1leHRlbnNpb24teDExZ2VzdHVyZXMiLAogICJ1dWlkIjogIngxMWdlc3R1cmVzQGpvc2VleHBvc2l0by5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "1fp2wx763cdvlbr4aa69c3ljdzzkngmzp9qf9gf11nrrxbkraaw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0pvc2VFeHBvc2l0by9nbm9tZS1zaGVsbC1leHRlbnNpb24teDExZ2VzdHVyZXMiLAogICJ1dWlkIjogIngxMWdlc3R1cmVzQGpvc2VleHBvc2l0by5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} +, {"uuid": "x11gestures@joseexposito.github.io", "name": "X11 Gestures", "pname": "x11-gestures", "description": "Enable GNOME Shell multi-touch gestures on X11.\nRequires Touchégg https://github.com/JoseExposito/touchegg#readme", "link": "https://extensions.gnome.org/extension/4033/x11-gestures/", "shell_version_map": {"38": {"version": "14", "sha256": "17jnh27fj32sbmxilbjzl6lra5rgmsbnk0s4s6f3d0ahrxmn6x1d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXgxMWdlc3R1cmVzIiwKICAidXVpZCI6ICJ4MTFnZXN0dXJlc0Bqb3NlZXhwb3NpdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "40": {"version": "14", "sha256": "17jnh27fj32sbmxilbjzl6lra5rgmsbnk0s4s6f3d0ahrxmn6x1d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXgxMWdlc3R1cmVzIiwKICAidXVpZCI6ICJ4MTFnZXN0dXJlc0Bqb3NlZXhwb3NpdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "17jnh27fj32sbmxilbjzl6lra5rgmsbnk0s4s6f3d0ahrxmn6x1d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXgxMWdlc3R1cmVzIiwKICAidXVpZCI6ICJ4MTFnZXN0dXJlc0Bqb3NlZXhwb3NpdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "17jnh27fj32sbmxilbjzl6lra5rgmsbnk0s4s6f3d0ahrxmn6x1d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXgxMWdlc3R1cmVzIiwKICAidXVpZCI6ICJ4MTFnZXN0dXJlc0Bqb3NlZXhwb3NpdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "get-out-of-the-way@michaelmob.com", "name": "Get Out Of The Way!", "pname": "get-out-of-the-way", "description": "Push 'Always-on-Top' windows out of the way of the focused window.", "link": "https://extensions.gnome.org/extension/4034/get-out-of-the-way/", "shell_version_map": {"38": {"version": "1", "sha256": "1jpjqi2l6wjn9zbgpck04gm9vbspi066chby1j6k9km6dwljfbk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1c2ggJ0Fsd2F5cy1vbi1Ub3AnIHdpbmRvd3Mgb3V0IG9mIHRoZSB3YXkgb2YgdGhlIGZvY3VzZWQgd2luZG93LiIsCiAgIm5hbWUiOiAiR2V0IE91dCBPZiBUaGUgV2F5ISIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnZXQtb3V0LW9mLXRoZS13YXlAbWljaGFlbG1vYi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "VPNStatus@jesusalc@intuivo.com", "name": "VPNStatus Indicator", "pname": "vpnstatus-indicator", "description": "displays the current state of VPNStatus VPN\n\nchecks, if /proc/net/route contains entries for device nmcli?, this is the VPNStatus network device.\n", "link": "https://extensions.gnome.org/extension/4039/vpnstatus-indicator/", "shell_version_map": {"38": {"version": "1", "sha256": "1y4ym6lpwfi03rc6186yjc7mns01q5nrwiqizghls7hiyfg3kqrn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImRpc3BsYXlzIHRoZSBjdXJyZW50IHN0YXRlIG9mIFZQTlN0YXR1cyBWUE5cblxuY2hlY2tzLCBpZiAvcHJvYy9uZXQvcm91dGUgY29udGFpbnMgZW50cmllcyBmb3IgZGV2aWNlIG5tY2xpPywgdGhpcyBpcyB0aGUgVlBOU3RhdHVzIG5ldHdvcmsgZGV2aWNlLlxuIiwKICAibmFtZSI6ICJWUE5TdGF0dXMgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIlZQTlN0YXR1c0BqZXN1c2FsY0BpbnR1aXZvLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "switchtwolayouts@qtmax.dev", "name": "Switch Two Layouts", "pname": "switch-two-layouts", "description": "This extension makes XKB shortcuts to switch keyboard layouts (such as Caps Lock, Ctrl+Shift, etc.) cycle between the two first layouts. The other ones still can be selected via the menu or using GNOME's shortcuts (Super+Space, Shift+Super+Space). It's useful when you have two primary layouts and more additional, which are used more rarely.", "link": "https://extensions.gnome.org/extension/4042/switch-two-layouts/", "shell_version_map": {"38": {"version": "3", "sha256": "0lzr3nx55842w7x60kx20fm8p07gz9gxh1lkqk9sic2784cbydsc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "0lzr3nx55842w7x60kx20fm8p07gz9gxh1lkqk9sic2784cbydsc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0lzr3nx55842w7x60kx20fm8p07gz9gxh1lkqk9sic2784cbydsc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3dpdGNodHdvbGF5b3V0c0BxdG1heC5kZXYiLAogICJ2ZXJzaW9uIjogMwp9"}}} @@ -446,35 +448,36 @@ , {"uuid": "spotify-artwork-fixer@wjt.me.uk", "name": "Spotify Artwork Fixer", "pname": "spotify-artwork-fixer", "description": "Fix Spotify artwork missing in media notification", "link": "https://extensions.gnome.org/extension/4055/spotify-artwork-fixer/", "shell_version_map": {"38": {"version": "6", "sha256": "0jvvz9p576x95l6592icnswcbs2nhm0i01wpb8a45xy6iwb07nfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBTcG90aWZ5IGFydHdvcmsgbWlzc2luZyBpbiBtZWRpYSBub3RpZmljYXRpb24iLAogICJuYW1lIjogIlNwb3RpZnkgQXJ0d29yayBGaXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvZ25vbWUtc2hlbGwtc3BvdGlmeS1hcnR3b3JrLWZpeGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFydHdvcmstZml4ZXJAd2p0Lm1lLnVrIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "0jvvz9p576x95l6592icnswcbs2nhm0i01wpb8a45xy6iwb07nfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBTcG90aWZ5IGFydHdvcmsgbWlzc2luZyBpbiBtZWRpYSBub3RpZmljYXRpb24iLAogICJuYW1lIjogIlNwb3RpZnkgQXJ0d29yayBGaXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvZ25vbWUtc2hlbGwtc3BvdGlmeS1hcnR3b3JrLWZpeGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFydHdvcmstZml4ZXJAd2p0Lm1lLnVrIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0jvvz9p576x95l6592icnswcbs2nhm0i01wpb8a45xy6iwb07nfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBTcG90aWZ5IGFydHdvcmsgbWlzc2luZyBpbiBtZWRpYSBub3RpZmljYXRpb24iLAogICJuYW1lIjogIlNwb3RpZnkgQXJ0d29yayBGaXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvZ25vbWUtc2hlbGwtc3BvdGlmeS1hcnR3b3JrLWZpeGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFydHdvcmstZml4ZXJAd2p0Lm1lLnVrIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "custom-vpn-toggler@giteduberger.fr", "name": "Custom VPN Toggler (and indicator)", "pname": "custom-vpn-toggler", "description": "Custom VPN Toggler (and indicator) allows to see the status of a VPN (with its icon), see IP address associated and permit to start and stop VPN (from a menu).\n\nThis plugin required an additional script to interact with VPN. \nAn example for netExtender and GlobalProtect are available on extension repository. \nFollow the link to Extension Web Site and see README.", "link": "https://extensions.gnome.org/extension/4061/custom-vpn-toggler/", "shell_version_map": {"38": {"version": "5", "sha256": "09axc2jx7s2bak956yyv6c5826yl54ghriiwdgsajly5lncmypxw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbSBWUE4gVG9nZ2xlciAoYW5kIGluZGljYXRvcikgYWxsb3dzIHRvIHNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSwgc2VlIElQIGFkZHJlc3MgYXNzb2NpYXRlZCBhbmQgcGVybWl0IHRvIHN0YXJ0IGFuZCBzdG9wIFZQTiAoZnJvbSBhIG1lbnUpLlxuXG5UaGlzIHBsdWdpbiByZXF1aXJlZCBhbiBhZGRpdGlvbmFsIHNjcmlwdCB0byBpbnRlcmFjdCB3aXRoIFZQTi4gXG5BbiBleGFtcGxlIGZvciBuZXRFeHRlbmRlciBhbmQgR2xvYmFsUHJvdGVjdCBhcmUgYXZhaWxhYmxlIG9uIGV4dGVuc2lvbiByZXBvc2l0b3J5LiBcbkZvbGxvdyB0aGUgbGluayB0byBFeHRlbnNpb24gV2ViIFNpdGUgYW5kIHNlZSBSRUFETUUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgIm5hbWUiOiAiQ3VzdG9tIFZQTiBUb2dnbGVyIChhbmQgaW5kaWNhdG9yKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJmci5naXRlZHViZXJnZXIuY3VzdG9tLXZwbi10b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vWGF2aWVyQmVyZ2VyL2N1c3RvbS12cG4tdG9nZ2xlciIsCiAgInV1aWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "geary-tray-icon@taylantatli.github.com", "name": "Geary Tray Icon", "pname": "geary-tray-icon", "description": "Show a tray icon for Geary\n\nhttps://github.com/TaylanTatli/geary-tray-icon", "link": "https://extensions.gnome.org/extension/4073/geary-tray-icon/", "shell_version_map": {"38": {"version": "1", "sha256": "11kv47pz5p69j10r23zf8ls3fmanldx7diwsy34fhyxqfxjcd614", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYSB0cmF5IGljb24gZm9yIEdlYXJ5XG5cbmh0dHBzOi8vZ2l0aHViLmNvbS9UYXlsYW5UYXRsaS9nZWFyeS10cmF5LWljb24iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnZWFyeS10cmF5LWljb25AdGF5bGFudGF0bGkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "shell-restarter@koolskateguy89.github.io", "name": "Shell Restarter", "pname": "shell-restarter", "description": "Tired of pressing Alt+F2+R?\nWell you can restart GNOME Shell with just the press of a button! (May or may not work on Wayland)", "link": "https://extensions.gnome.org/extension/4075/shell-restarter/", "shell_version_map": {"38": {"version": "5", "sha256": "19v3sxbsrk0cskq7cikwz6w95m8q2v56hyrkwj595c8m8i0x6i1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpcmVkIG9mIHByZXNzaW5nIEFsdCtGMitSP1xuV2VsbCB5b3UgY2FuIHJlc3RhcnQgR05PTUUgU2hlbGwgd2l0aCBqdXN0IHRoZSBwcmVzcyBvZiBhIGJ1dHRvbiEgKE1heSBvciBtYXkgbm90IHdvcmsgb24gV2F5bGFuZCkiLAogICJuYW1lIjogIlNoZWxsIFJlc3RhcnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaGVsbC1yZXN0YXJ0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29vbHNrYXRlZ3V5ODkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNoZWxsLXJlc3RhcnRlciIsCiAgInV1aWQiOiAic2hlbGwtcmVzdGFydGVyQGtvb2xza2F0ZWd1eTg5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "19v3sxbsrk0cskq7cikwz6w95m8q2v56hyrkwj595c8m8i0x6i1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpcmVkIG9mIHByZXNzaW5nIEFsdCtGMitSP1xuV2VsbCB5b3UgY2FuIHJlc3RhcnQgR05PTUUgU2hlbGwgd2l0aCBqdXN0IHRoZSBwcmVzcyBvZiBhIGJ1dHRvbiEgKE1heSBvciBtYXkgbm90IHdvcmsgb24gV2F5bGFuZCkiLAogICJuYW1lIjogIlNoZWxsIFJlc3RhcnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaGVsbC1yZXN0YXJ0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29vbHNrYXRlZ3V5ODkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNoZWxsLXJlc3RhcnRlciIsCiAgInV1aWQiOiAic2hlbGwtcmVzdGFydGVyQGtvb2xza2F0ZWd1eTg5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "iqair@wotmshuaisi_github", "name": "Iqair Gnome Extension", "pname": "iqair-gnome-extension", "description": "Gnome extension for tracking air quality in real-time. data provider: https://iqair.com/. to get an API token: https://www.iqair.com/us/dashboard/api", "link": "https://extensions.gnome.org/extension/4082/iqair-gnome-extension/", "shell_version_map": {"38": {"version": "6", "sha256": "150rn9gk6nzba30g38bjpgjyqr2a25cysg6fd6p1is92w8lknls4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "12", "sha256": "0iz36hq4m8xxn26sar69dwd32n8y78097yj2fwrclcgs5n131d4c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2lxYWlyR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogImlxYWlyQHdvdG1zaHVhaXNpX2dpdGh1YiIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0iz36hq4m8xxn26sar69dwd32n8y78097yj2fwrclcgs5n131d4c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2lxYWlyR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogImlxYWlyQHdvdG1zaHVhaXNpX2dpdGh1YiIsCiAgInZlcnNpb24iOiAxMgp9"}}} -, {"uuid": "bigSur-StatusArea@ordissimo.com", "name": "Big Sur Status Area", "pname": "big-sur-status-area", "description": "Move the Power/Network/Volume/User/Date/Notifications menus to the status area. It is a fork of :https://github.com/Fausto-Korpsvart/Big-Sur-StatusArea", "link": "https://extensions.gnome.org/extension/4085/big-sur-status-area/", "shell_version_map": {"38": {"version": "25", "sha256": "0syp7ka1rakzw4rlhhl1klszg56pbhyz787hvkg738j9ycl1spyq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PcmRpc3NpbW8vQmlnLVN1ci1TdGF0dXNBcmVhL3RyZWUvNDEiLAogICJ1dWlkIjogImJpZ1N1ci1TdGF0dXNBcmVhQG9yZGlzc2ltby5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "40": {"version": "26", "sha256": "0yb0r44h7qv9agncwr2aw6dj1qm82xxvr3811b77nyapcha9cagh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwLjAiLAogICAgIjQwLnJjIiwKICAgICI0MC4xIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3JkaXNzaW1vL0JpZy1TdXItU3RhdHVzQXJlYS90cmVlLzQxIiwKICAidXVpZCI6ICJiaWdTdXItU3RhdHVzQXJlYUBvcmRpc3NpbW8uY29tIiwKICAidmVyc2lvbiI6IDI2Cn0="}, "41": {"version": "27", "sha256": "17dxs5hgk1iq2d21rvjjswnlgjvlcb8jn30xi752gz94l0y66kcy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3JkaXNzaW1vL0JpZy1TdXItU3RhdHVzQXJlYS90cmVlLzQxIiwKICAidXVpZCI6ICJiaWdTdXItU3RhdHVzQXJlYUBvcmRpc3NpbW8uY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}}} +, {"uuid": "bigSur-StatusArea@ordissimo.com", "name": "Big Sur Status Area", "pname": "big-sur-status-area", "description": "Move the Power/Network/Volume/User/Date/Notifications menus to the status area. It is a fork of :https://github.com/Fausto-Korpsvart/Big-Sur-StatusArea", "link": "https://extensions.gnome.org/extension/4085/big-sur-status-area/", "shell_version_map": {"38": {"version": "25", "sha256": "0dg2fg98l0wxr4hgaz2lwb30p93asbm5693svm8kq51v3g3wpdw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PcmRpc3NpbW8vQmlnLVN1ci1TdGF0dXNBcmVhIiwKICAidXVpZCI6ICJiaWdTdXItU3RhdHVzQXJlYUBvcmRpc3NpbW8uY29tIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "37", "sha256": "0ak7h8y2ivzj188nkn37bfj6y2sfpilby8xxvfizhn8vqvid45bg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL09yZGlzc2ltby9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJ1dWlkIjogImJpZ1N1ci1TdGF0dXNBcmVhQG9yZGlzc2ltby5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="}, "41": {"version": "37", "sha256": "0ak7h8y2ivzj188nkn37bfj6y2sfpilby8xxvfizhn8vqvid45bg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIFBvd2VyL05ldHdvcmsvVm9sdW1lL1VzZXIvRGF0ZS9Ob3RpZmljYXRpb25zIG1lbnVzIHRvIHRoZSBzdGF0dXMgYXJlYS4gSXQgaXMgYSBmb3JrIG9mIDpodHRwczovL2dpdGh1Yi5jb20vRmF1c3RvLUtvcnBzdmFydC9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJuYW1lIjogIkJpZyBTdXIgU3RhdHVzIEFyZWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL09yZGlzc2ltby9CaWctU3VyLVN0YXR1c0FyZWEiLAogICJ1dWlkIjogImJpZ1N1ci1TdGF0dXNBcmVhQG9yZGlzc2ltby5jb20iLAogICJ2ZXJzaW9uIjogMzcKfQ=="}}} , {"uuid": "disable-touch-osk@pardus.org.tr", "name": "disable-touch-osk", "pname": "disable-touch-osk", "description": "Disable on screen keyboard for touchscreens", "link": "https://extensions.gnome.org/extension/4087/disable-touch-osk/", "shell_version_map": {"38": {"version": "3", "sha256": "10ljbjbswzn9y30n2h39iiz673hhmazr2h14lhhws05m71xvbbfy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgb24gc2NyZWVuIGtleWJvYXJkIGZvciB0b3VjaHNjcmVlbnMiLAogICJuYW1lIjogImRpc2FibGUtdG91Y2gtb3NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5wYXJkdXMub3JnLnRyLyIsCiAgInV1aWQiOiAiZGlzYWJsZS10b3VjaC1vc2tAcGFyZHVzLm9yZy50ciIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "mprispanel@kennedn.msn.com", "name": "MPRIS Panel Player", "pname": "mpris-panel-player", "description": "Implements playback controls for MPRIS enabled players in panel.", "link": "https://extensions.gnome.org/extension/4088/mpris-panel-player/", "shell_version_map": {"40": {"version": "4", "sha256": "1kk8y8l1ybknja58xh1smavja97rkrp8l5xx7aqy7xn4fl1ghjis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcGxlbWVudHMgcGxheWJhY2sgY29udHJvbHMgZm9yIE1QUklTIGVuYWJsZWQgcGxheWVycyBpbiBwYW5lbC4iLAogICJuYW1lIjogIk1QUklTIFBhbmVsIFBsYXllciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VubmVkbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXByaXNwYW5lbCIsCiAgInV1aWQiOiAibXByaXNwYW5lbEBrZW5uZWRuLm1zbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1kk8y8l1ybknja58xh1smavja97rkrp8l5xx7aqy7xn4fl1ghjis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcGxlbWVudHMgcGxheWJhY2sgY29udHJvbHMgZm9yIE1QUklTIGVuYWJsZWQgcGxheWVycyBpbiBwYW5lbC4iLAogICJuYW1lIjogIk1QUklTIFBhbmVsIFBsYXllciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VubmVkbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXByaXNwYW5lbCIsCiAgInV1aWQiOiAibXByaXNwYW5lbEBrZW5uZWRuLm1zbi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "right_click_for_apps@briansayre", "name": "Right Click for Apps", "pname": "right-click-for-apps", "description": "Allows you to right-click the Activities button to reveal the application menu.", "link": "https://extensions.gnome.org/extension/4090/right-click-for-apps/", "shell_version_map": {"38": {"version": "1", "sha256": "1rzx8ksl48badrwyqxwbgvfgf48z642mdwl57aq280ng61nrndaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB5b3UgdG8gcmlnaHQtY2xpY2sgdGhlIEFjdGl2aXRpZXMgYnV0dG9uIHRvIHJldmVhbCB0aGUgYXBwbGljYXRpb24gbWVudS4iLAogICJuYW1lIjogIlJpZ2h0IENsaWNrIGZvciBBcHBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJpYW5zYXlyZS9SaWdodC1DbGljay1Gb3ItQXBwcyIsCiAgInV1aWQiOiAicmlnaHRfY2xpY2tfZm9yX2FwcHNAYnJpYW5zYXlyZSIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "devbar@ludvigbostrom", "name": "DevBar", "pname": "devbar", "description": "This extension helps you keep track of your development workflow.", "link": "https://extensions.gnome.org/extension/4091/devbar/", "shell_version_map": {"38": {"version": "7", "sha256": "0gpmrsd5dva2d6aisr9fazipfxr2qw8p8bsn9avq8rijkya67c0v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "0gpmrsd5dva2d6aisr9fazipfxr2qw8p8bsn9avq8rijkya67c0v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0gpmrsd5dva2d6aisr9fazipfxr2qw8p8bsn9avq8rijkya67c0v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} +, {"uuid": "devbar@ludvigbostrom", "name": "DevBar", "pname": "devbar", "description": "This extension helps you keep track of your development workflow.", "link": "https://extensions.gnome.org/extension/4091/devbar/", "shell_version_map": {"38": {"version": "8", "sha256": "1yj7qpadlcgq1p85rk76gdffyp9mm2h6a7p5c43xqjqnjdpf561f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "1yj7qpadlcgq1p85rk76gdffyp9mm2h6a7p5c43xqjqnjdpf561f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1yj7qpadlcgq1p85rk76gdffyp9mm2h6a7p5c43xqjqnjdpf561f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "notifications_to_file@fawtytoo", "name": "Notifications To File", "pname": "notifications-to-file", "description": "Notifications are appended to a file in $HOME/.notifications/ with one file created per day.\nEntries show the following information:\nTimestamp\nWhether the banner was shown\nThe urgency\nThe title\nBanner text", "link": "https://extensions.gnome.org/extension/4093/notifications-to-file/", "shell_version_map": {"38": {"version": "3", "sha256": "09idm84il85jsciz1fsrj66jj59dyx8mkcms627smb77jz0928py", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWNhdGlvbnMgYXJlIGFwcGVuZGVkIHRvIGEgZmlsZSBpbiAkSE9NRS8ubm90aWZpY2F0aW9ucy8gd2l0aCBvbmUgZmlsZSBjcmVhdGVkIHBlciBkYXkuXG5FbnRyaWVzIHNob3cgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjpcblRpbWVzdGFtcFxuV2hldGhlciB0aGUgYmFubmVyIHdhcyBzaG93blxuVGhlIHVyZ2VuY3lcblRoZSB0aXRsZVxuQmFubmVyIHRleHQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgVG8gRmlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnNfdG9fZmlsZUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "09idm84il85jsciz1fsrj66jj59dyx8mkcms627smb77jz0928py", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWNhdGlvbnMgYXJlIGFwcGVuZGVkIHRvIGEgZmlsZSBpbiAkSE9NRS8ubm90aWZpY2F0aW9ucy8gd2l0aCBvbmUgZmlsZSBjcmVhdGVkIHBlciBkYXkuXG5FbnRyaWVzIHNob3cgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjpcblRpbWVzdGFtcFxuV2hldGhlciB0aGUgYmFubmVyIHdhcyBzaG93blxuVGhlIHVyZ2VuY3lcblRoZSB0aXRsZVxuQmFubmVyIHRleHQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgVG8gRmlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnNfdG9fZmlsZUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "09idm84il85jsciz1fsrj66jj59dyx8mkcms627smb77jz0928py", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWNhdGlvbnMgYXJlIGFwcGVuZGVkIHRvIGEgZmlsZSBpbiAkSE9NRS8ubm90aWZpY2F0aW9ucy8gd2l0aCBvbmUgZmlsZSBjcmVhdGVkIHBlciBkYXkuXG5FbnRyaWVzIHNob3cgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjpcblRpbWVzdGFtcFxuV2hldGhlciB0aGUgYmFubmVyIHdhcyBzaG93blxuVGhlIHVyZ2VuY3lcblRoZSB0aXRsZVxuQmFubmVyIHRleHQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgVG8gRmlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnNfdG9fZmlsZUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "change_desktop_background_when_empty@fawtytoo", "name": "Change Desktop Background When Workspace Empty", "pname": "change-desktop-background-when-workspace-empty", "description": "Changes the desktop background when the workspace is or becomes empty, such as switching to an empty workspace, when all windows on a workspace are closed, or after login.\nNo folder needs to be set explicitly, as it will use the folder that the current background is in.", "link": "https://extensions.gnome.org/extension/4096/change-desktop-background-when-workspace-empty/", "shell_version_map": {"38": {"version": "13", "sha256": "09ynllxj1r4s9dh782srigzpnjzda49wlr2lj71k2g2w807vdv60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjaGFuZ2VfZGVza3RvcF9iYWNrZ3JvdW5kX3doZW5fZW1wdHlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "09ynllxj1r4s9dh782srigzpnjzda49wlr2lj71k2g2w807vdv60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjaGFuZ2VfZGVza3RvcF9iYWNrZ3JvdW5kX3doZW5fZW1wdHlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "09ynllxj1r4s9dh782srigzpnjzda49wlr2lj71k2g2w807vdv60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjaGFuZ2VfZGVza3RvcF9iYWNrZ3JvdW5kX3doZW5fZW1wdHlAZmF3dHl0b28iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} -, {"uuid": "translate-clipboard@lsnow.github.io", "name": "Translate clipboard", "pname": "translate-clipboard", "description": "Translate clipboard text", "link": "https://extensions.gnome.org/extension/4097/translate-clipboard/", "shell_version_map": {"38": {"version": "1", "sha256": "071x3q6y7s8qx4i3lis79g5nc68ld8ln5q8qgc713nvjgfsg05hs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xzbm93L3RyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1jbGlwYm9hcmRAbHNub3cuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "13", "sha256": "02q14rccib29cyb4ln60grcbfkqq0lzsahns1v602pp4ab0hgwb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "02q14rccib29cyb4ln60grcbfkqq0lzsahns1v602pp4ab0hgwb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} -, {"uuid": "no-overview@fthx", "name": "No overview at start-up", "pname": "no-overview", "description": "No overview at start-up. For GNOME Shell 40+.", "link": "https://extensions.gnome.org/extension/4099/no-overview/", "shell_version_map": {"40": {"version": "11", "sha256": "15abz4w5n4md1b0f7c403hiyifslgw7dw2jlhzpn47r7k7giwpdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "15abz4w5n4md1b0f7c403hiyifslgw7dw2jlhzpn47r7k7giwpdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxMQp9"}}} +, {"uuid": "translate-clipboard@lsnow.github.io", "name": "Translate clipboard", "pname": "translate-clipboard", "description": "Translate clipboard text", "link": "https://extensions.gnome.org/extension/4097/translate-clipboard/", "shell_version_map": {"38": {"version": "1", "sha256": "071x3q6y7s8qx4i3lis79g5nc68ld8ln5q8qgc713nvjgfsg05hs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xzbm93L3RyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1jbGlwYm9hcmRAbHNub3cuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "15", "sha256": "0src5bifp77iiznszp9j0xygfarsm2qa0rwy4axvbag9bs3ym42v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "0src5bifp77iiznszp9j0xygfarsm2qa0rwy4axvbag9bs3ym42v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MS4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHNub3cvdHJhbnNsYXRlLWNsaXBib2FyZCIsCiAgInV1aWQiOiAidHJhbnNsYXRlLWNsaXBib2FyZEBsc25vdy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} +, {"uuid": "no-overview@fthx", "name": "No overview at start-up", "pname": "no-overview", "description": "No overview at start-up. For GNOME Shell 40+.", "link": "https://extensions.gnome.org/extension/4099/no-overview/", "shell_version_map": {"40": {"version": "11", "sha256": "15abz4w5n4md1b0f7c403hiyifslgw7dw2jlhzpn47r7k7giwpdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "15abz4w5n4md1b0f7c403hiyifslgw7dw2jlhzpn47r7k7giwpdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "15abz4w5n4md1b0f7c403hiyifslgw7dw2jlhzpn47r7k7giwpdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "notification-position@drugo.dev", "name": "Notification Banner Position", "pname": "notification-banner-position", "description": "Changes position of the notification banner from the default to the right side of the screen.", "link": "https://extensions.gnome.org/extension/4105/notification-banner-position/", "shell_version_map": {"38": {"version": "5", "sha256": "0svmx8767hpbmmvm2m90ksqbxqij5f3k5bamz05p73czqk58dizy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "0svmx8767hpbmmvm2m90ksqbxqij5f3k5bamz05p73czqk58dizy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "0svmx8767hpbmmvm2m90ksqbxqij5f3k5bamz05p73czqk58dizy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJ1bm9kcnVnb3dpY2svbm90aWZpY2F0aW9uLXBvc2l0aW9uLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXBvc2l0aW9uQGRydWdvLmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "volume_scroller@trflynn89.pm.me", "name": "Volume Scroller", "pname": "volume-scroller", "description": "Scroll up or down in the Top Bar to adjust volume.", "link": "https://extensions.gnome.org/extension/4109/volume-scroller/", "shell_version_map": {"38": {"version": "5", "sha256": "035gkl1g3k3jqmksgmh2aip3v4k8kkbc6gdnndg6lnhz6czn9c12", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "035gkl1g3k3jqmksgmh2aip3v4k8kkbc6gdnndg6lnhz6czn9c12", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RyZmx5bm44OS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckB0cmZseW5uODkucG0ubWUiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "Mock-Universal-Menu@zacharygough", "name": "Mock Universal Menu", "pname": "mock-universal-menu", "description": "Creates a Mock Apple Menu (THIS DOES NOTHING WHEN CLICKED)", "link": "https://extensions.gnome.org/extension/4111/mock-universal-menu/", "shell_version_map": {"40": {"version": "5", "sha256": "0irq4aamfdvnsjcb9cj4grp7z0s2rg5dv349v095ss7n7jxcmdx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgYSBNb2NrIEFwcGxlIE1lbnUgKFRISVMgRE9FUyBOT1RISU5HIFdIRU4gQ0xJQ0tFRCkiLAogICJuYW1lIjogIk1vY2sgVW5pdmVyc2FsIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1phbnktWmFjaGFyeTEvTW9jay1Vbml2ZXJzYWwtTWVudSIsCiAgInV1aWQiOiAiTW9jay1Vbml2ZXJzYWwtTWVudUB6YWNoYXJ5Z291Z2giLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "0irq4aamfdvnsjcb9cj4grp7z0s2rg5dv349v095ss7n7jxcmdx2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNyZWF0ZXMgYSBNb2NrIEFwcGxlIE1lbnUgKFRISVMgRE9FUyBOT1RISU5HIFdIRU4gQ0xJQ0tFRCkiLAogICJuYW1lIjogIk1vY2sgVW5pdmVyc2FsIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1phbnktWmFjaGFyeTEvTW9jay1Vbml2ZXJzYWwtTWVudSIsCiAgInV1aWQiOiAiTW9jay1Vbml2ZXJzYWwtTWVudUB6YWNoYXJ5Z291Z2giLAogICJ2ZXJzaW9uIjogNQp9"}}} -, {"uuid": "customize-ibus@hollowman.ml", "name": "Customize IBus", "pname": "customize-ibus", "description": "Full customization of appearance, behavior, system tray and input source indicator for IBus\n\nSupport Customization of:\n* Candidate Box Orientation\n* Candidate Box Animation\n* Right-click Candidate Box to Switch the Input Mode or Open the Tray Menu\n* Scroll on Candidate Box to Switch among Pages or Candidates\n* Fix Candidate Box to Not Follow the Caret and Set Fixed Position\n* Candidate Box Font\n* Input Mode Remember and Auto-switch by APP\n* Change Candidate Box Opacity\n* Fix IME List Order\n* Drag Candidate Box to Reposition\n* Show or Hide Candidate Box Page Buttons\n* System Tray Menus and Interaction Settings\n* * Show or Hide Tray Icon\n* * Directly Click Tray Icon to Switch Input Mode\n* * Add Additional Menu\n* Input Source Indicator Appearance and Interaction Settings\n* * Enable Indicator\n* * Only Indicate when Switching Input Mode\n* * Only Indicate when Using ASCII Input Mode\n* * Not Indicate when Using Single Mode IME\n* * Right-click Indicator to Hide\n* * Scroll on Indicator to Switch Input Mode\n* * Indicator Animation\n* * Customize Font\n* * Left-click Indicator to Drag to Move Indicator or Switch Input Mode\n* * Change Opacity\n* * Enable Indicator Show Delay and Configure Showing Timeout\n* * Enable Auto-hide Indicator and Configure Auto-hide Timeout\n* Theme (Stylesheet Provided or Extracted from GNOME Shell Themes, Refer to Help Instructions in Extension for More)\n* Candidate Box Background and its Displaying Style\n* Theme and Background Picture Follow GNOME Night Light Mode\n\nUser Guide: https://hollowmansblog.wordpress.com/2021/08/21/customize-ibus-user-guide/\n\n深度定制 IBus 的外观、行为、系统托盘以及输入指示\n\n支持自定义：\n* 候选框方向\n* 候选框动画\n* 右键单击候选框以切换输入源或打开任务栏菜单\n* 候选框上滚动以切换页面或候选词\n* 固定候选框使其不跟随光标以及设定固定位置\n* 候选框字体\n* 输入模式根据应用记忆并自动切换\n* 更改候选框透明度\n* 固定输入法列表顺序\n* 拖拽移动候选框\n* 显示或隐藏候选框调页按钮\n* 系统任务栏托盘显示和交互设置\n* * 显示或隐藏托盘图标\n* * 直接点击托盘图标切换输入源\n* * 添加额外菜单\n* 输入源指示器及其显示和交互设置\n* * 启用指示器\n* * 仅在切换输入法时指示\n* * 仅在英文输入时指示\n* * 使用单模式输入法时不指示\n* * 右击指示器来将其隐藏\n* * 指示器上滚动来切换输入源\n* * 指示器显示动画\n* * 自定义字体\n* * 左击指示器以拖拽移动或者切换输入源\n* * 更改透明度\n* * 启用延时显示以及配置显示时延\n* * 启用自动隐藏以及配置自动隐藏时延\n* 皮肤样式主题（提供的或者从GNOME Shell主题中提取的样式表，参见扩展的帮助部分来获取更多指导）\n* 候选框背景图片及其显示样式\n* 主题和背景图片跟随GNOME夜灯\n\n使用指南：https://blog.csdn.net/qq_18572023/article/details/116331601", "link": "https://extensions.gnome.org/extension/4112/customize-ibus/", "shell_version_map": {"38": {"version": "80", "sha256": "0w4mgjin6s5h8bc50830nd0b34hvij6vzsmp4ppw52ghnb46813p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5AaG9sbG93bWFuLm1sIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4MAp9"}, "40": {"version": "80", "sha256": "0w4mgjin6s5h8bc50830nd0b34hvij6vzsmp4ppw52ghnb46813p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5AaG9sbG93bWFuLm1sIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4MAp9"}, "41": {"version": "80", "sha256": "0w4mgjin6s5h8bc50830nd0b34hvij6vzsmp4ppw52ghnb46813p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5AaG9sbG93bWFuLm1sIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3BlblNVU0UvQ3VzdG9taXplLUlCdXMiLAogICJ1dWlkIjogImN1c3RvbWl6ZS1pYnVzQGhvbGxvd21hbi5tbCIsCiAgInZlcnNpb24iOiA4MAp9"}}} -, {"uuid": "fildemGMenu@gonza.com", "name": "Fildem global menu", "pname": "fildem-global-menu", "description": "Global menu and HUD for Gnome\n\nThis extension requires the installation of an external program. Please, check the instructions on Github.\n\nThis extension works on gnome 40 but the preferences doesn’t work, if you want you can install it manually modifing the version supported on metadata.", "link": "https://extensions.gnome.org/extension/4114/fildem-global-menu/", "shell_version_map": {"38": {"version": "1", "sha256": "0zgkf4cb4hl0r6r1kzwlvnr4f2svlpwayrw7xqs39fa19cc1zasv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdsb2JhbCBtZW51IGFuZCBIVUQgZm9yIEdub21lXG5cblRoaXMgZXh0ZW5zaW9uIHJlcXVpcmVzIHRoZSBpbnN0YWxsYXRpb24gb2YgYW4gZXh0ZXJuYWwgcHJvZ3JhbS4gUGxlYXNlLCBjaGVjayB0aGUgaW5zdHJ1Y3Rpb25zIG9uIEdpdGh1Yi5cblxuVGhpcyBleHRlbnNpb24gd29ya3Mgb24gZ25vbWUgNDAgYnV0IHRoZSBwcmVmZXJlbmNlcyBkb2Vzblx1MjAxOXQgd29yaywgaWYgeW91IHdhbnQgeW91IGNhbiBpbnN0YWxsIGl0IG1hbnVhbGx5IG1vZGlmaW5nIHRoZSB2ZXJzaW9uIHN1cHBvcnRlZCBvbiBtZXRhZGF0YS4iLAogICJuYW1lIjogIkZpbGRlbSBnbG9iYWwgbWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5maWxkZW0tZ2xvYmFsLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvRmlsZGVtIiwKICAidXVpZCI6ICJmaWxkZW1HTWVudUBnb256YS5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "customize-ibus@hollowman.ml", "name": "Customize IBus", "pname": "customize-ibus", "description": "Full customization of appearance, behavior, system tray and input source indicator for IBus\n\nSupport Customization of:\n* Candidate Box Orientation\n* Candidate Box Animation\n* Right-click Candidate Box to Switch the Input Mode or Open the Tray Menu\n* Scroll on Candidate Box to Switch among Pages or Candidates\n* Fix Candidate Box to Not Follow the Caret and Set Fixed Position\n* Candidate Box Font\n* Input Mode Remember and Auto-switch by APP\n* Change Candidate Box Opacity\n* Fix IME List Order\n* Drag Candidate Box to Reposition\n* Show or Hide Candidate Box Page Buttons\n* System Tray Menus and Interaction Settings\n* * Show or Hide Tray Icon\n* * Directly Click Tray Icon to Switch Input Mode\n* * Add Additional Menu\n* Input Source Indicator Appearance and Interaction Settings\n* * Enable Indicator\n* * Only Indicate when Switching Input Mode\n* * Only Indicate when Using ASCII Input Mode\n* * Not Indicate when Using Single Mode IME\n* * Right-click Indicator to Hide\n* * Scroll on Indicator to Switch Input Mode\n* * Indicator Animation\n* * Customize Font\n* * Left-click Indicator to Drag to Move Indicator or Switch Input Mode\n* * Change Opacity\n* * Enable Indicator Show Delay and Configure Showing Timeout\n* * Enable Auto-hide Indicator and Configure Auto-hide Timeout\n* Theme (Stylesheet Provided or Extracted from GNOME Shell Themes, Refer to Help Instructions in Extension for More)\n* Candidate Box Background and its Displaying Style\n* Theme and Background Picture Follow GNOME Night Light Mode\n\nUser Guide: https://hollowmansblog.wordpress.com/2021/08/21/customize-ibus-user-guide/\n\n深度定制 IBus 的外观、行为、系统托盘以及输入指示\n\n支持自定义：\n* 候选框方向\n* 候选框动画\n* 右键单击候选框以切换输入源或打开任务栏菜单\n* 候选框上滚动以切换页面或候选词\n* 固定候选框使其不跟随光标以及设定固定位置\n* 候选框字体\n* 输入模式根据应用记忆并自动切换\n* 更改候选框透明度\n* 固定输入法列表顺序\n* 拖拽移动候选框\n* 显示或隐藏候选框调页按钮\n* 系统任务栏托盘显示和交互设置\n* * 显示或隐藏托盘图标\n* * 直接点击托盘图标切换输入源\n* * 添加额外菜单\n* 输入源指示器及其显示和交互设置\n* * 启用指示器\n* * 仅在切换输入法时指示\n* * 仅在英文输入时指示\n* * 使用单模式输入法时不指示\n* * 右击指示器来将其隐藏\n* * 指示器上滚动来切换输入源\n* * 指示器显示动画\n* * 自定义字体\n* * 左击指示器以拖拽移动或者切换输入源\n* * 更改透明度\n* * 启用延时显示以及配置显示时延\n* * 启用自动隐藏以及配置自动隐藏时延\n* 皮肤样式主题（提供的或者从GNOME Shell主题中提取的样式表，参见扩展的帮助部分来获取更多指导）\n* 候选框背景图片及其显示样式\n* 主题和背景图片跟随GNOME夜灯\n\n使用指南：https://blog.csdn.net/qq_18572023/article/details/116331601", "link": "https://extensions.gnome.org/extension/4112/customize-ibus/", "shell_version_map": {"38": {"version": "82", "sha256": "1rn0zskj5s7xp11p8sbgybghngqyf5chs469w51vn8n24k4bgdp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29wZW5TVVNFL0N1c3RvbWl6ZS1JQnVzIiwKICAidXVpZCI6ICJjdXN0b21pemUtaWJ1c0Bob2xsb3dtYW4ubWwiLAogICJ2ZXJzaW9uIjogODIKfQ=="}, "40": {"version": "82", "sha256": "1rn0zskj5s7xp11p8sbgybghngqyf5chs469w51vn8n24k4bgdp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29wZW5TVVNFL0N1c3RvbWl6ZS1JQnVzIiwKICAidXVpZCI6ICJjdXN0b21pemUtaWJ1c0Bob2xsb3dtYW4ubWwiLAogICJ2ZXJzaW9uIjogODIKfQ=="}, "41": {"version": "82", "sha256": "1rn0zskj5s7xp11p8sbgybghngqyf5chs469w51vn8n24k4bgdp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29wZW5TVVNFL0N1c3RvbWl6ZS1JQnVzIiwKICAidXVpZCI6ICJjdXN0b21pemUtaWJ1c0Bob2xsb3dtYW4ubWwiLAogICJ2ZXJzaW9uIjogODIKfQ=="}, "42": {"version": "82", "sha256": "1rn0zskj5s7xp11p8sbgybghngqyf5chs469w51vn8n24k4bgdp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGwgY3VzdG9taXphdGlvbiBvZiBhcHBlYXJhbmNlLCBiZWhhdmlvciwgc3lzdGVtIHRyYXkgYW5kIGlucHV0IHNvdXJjZSBpbmRpY2F0b3IgZm9yIElCdXNcblxuU3VwcG9ydCBDdXN0b21pemF0aW9uIG9mOlxuKiBDYW5kaWRhdGUgQm94IE9yaWVudGF0aW9uXG4qIENhbmRpZGF0ZSBCb3ggQW5pbWF0aW9uXG4qIFJpZ2h0LWNsaWNrIENhbmRpZGF0ZSBCb3ggdG8gU3dpdGNoIHRoZSBJbnB1dCBNb2RlIG9yIE9wZW4gdGhlIFRyYXkgTWVudVxuKiBTY3JvbGwgb24gQ2FuZGlkYXRlIEJveCB0byBTd2l0Y2ggYW1vbmcgUGFnZXMgb3IgQ2FuZGlkYXRlc1xuKiBGaXggQ2FuZGlkYXRlIEJveCB0byBOb3QgRm9sbG93IHRoZSBDYXJldCBhbmQgU2V0IEZpeGVkIFBvc2l0aW9uXG4qIENhbmRpZGF0ZSBCb3ggRm9udFxuKiBJbnB1dCBNb2RlIFJlbWVtYmVyIGFuZCBBdXRvLXN3aXRjaCBieSBBUFBcbiogQ2hhbmdlIENhbmRpZGF0ZSBCb3ggT3BhY2l0eVxuKiBGaXggSU1FIExpc3QgT3JkZXJcbiogRHJhZyBDYW5kaWRhdGUgQm94IHRvIFJlcG9zaXRpb25cbiogU2hvdyBvciBIaWRlIENhbmRpZGF0ZSBCb3ggUGFnZSBCdXR0b25zXG4qIFN5c3RlbSBUcmF5IE1lbnVzIGFuZCBJbnRlcmFjdGlvbiBTZXR0aW5nc1xuKiAqIFNob3cgb3IgSGlkZSBUcmF5IEljb25cbiogKiBEaXJlY3RseSBDbGljayBUcmF5IEljb24gdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBBZGQgQWRkaXRpb25hbCBNZW51XG4qIElucHV0IFNvdXJjZSBJbmRpY2F0b3IgQXBwZWFyYW5jZSBhbmQgSW50ZXJhY3Rpb24gU2V0dGluZ3NcbiogKiBFbmFibGUgSW5kaWNhdG9yXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFN3aXRjaGluZyBJbnB1dCBNb2RlXG4qICogT25seSBJbmRpY2F0ZSB3aGVuIFVzaW5nIEFTQ0lJIElucHV0IE1vZGVcbiogKiBOb3QgSW5kaWNhdGUgd2hlbiBVc2luZyBTaW5nbGUgTW9kZSBJTUVcbiogKiBSaWdodC1jbGljayBJbmRpY2F0b3IgdG8gSGlkZVxuKiAqIFNjcm9sbCBvbiBJbmRpY2F0b3IgdG8gU3dpdGNoIElucHV0IE1vZGVcbiogKiBJbmRpY2F0b3IgQW5pbWF0aW9uXG4qICogQ3VzdG9taXplIEZvbnRcbiogKiBMZWZ0LWNsaWNrIEluZGljYXRvciB0byBEcmFnIHRvIE1vdmUgSW5kaWNhdG9yIG9yIFN3aXRjaCBJbnB1dCBNb2RlXG4qICogQ2hhbmdlIE9wYWNpdHlcbiogKiBFbmFibGUgSW5kaWNhdG9yIFNob3cgRGVsYXkgYW5kIENvbmZpZ3VyZSBTaG93aW5nIFRpbWVvdXRcbiogKiBFbmFibGUgQXV0by1oaWRlIEluZGljYXRvciBhbmQgQ29uZmlndXJlIEF1dG8taGlkZSBUaW1lb3V0XG4qIFRoZW1lIChTdHlsZXNoZWV0IFByb3ZpZGVkIG9yIEV4dHJhY3RlZCBmcm9tIEdOT01FIFNoZWxsIFRoZW1lcywgUmVmZXIgdG8gSGVscCBJbnN0cnVjdGlvbnMgaW4gRXh0ZW5zaW9uIGZvciBNb3JlKVxuKiBDYW5kaWRhdGUgQm94IEJhY2tncm91bmQgYW5kIGl0cyBEaXNwbGF5aW5nIFN0eWxlXG4qIFRoZW1lIGFuZCBCYWNrZ3JvdW5kIFBpY3R1cmUgRm9sbG93IEdOT01FIE5pZ2h0IExpZ2h0IE1vZGVcblxuVXNlciBHdWlkZTogaHR0cHM6Ly9ob2xsb3dtYW5zYmxvZy53b3JkcHJlc3MuY29tLzIwMjEvMDgvMjEvY3VzdG9taXplLWlidXMtdXNlci1ndWlkZS9cblxuXHU2ZGYxXHU1ZWE2XHU1YjlhXHU1MjM2IElCdXMgXHU3Njg0XHU1OTE2XHU4OWMyXHUzMDAxXHU4ODRjXHU0ZTNhXHUzMDAxXHU3Y2ZiXHU3ZWRmXHU2MjU4XHU3NmQ4XHU0ZWU1XHU1M2NhXHU4ZjkzXHU1MTY1XHU2MzA3XHU3OTNhXG5cblx1NjUyZlx1NjMwMVx1ODFlYVx1NWI5YVx1NGU0OVx1ZmYxYVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTY1YjlcdTU0MTFcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU1MmE4XHU3NTNiXG4qIFx1NTNmM1x1OTUyZVx1NTM1NVx1NTFmYlx1NTAxOVx1OTAwOVx1Njg0Nlx1NGVlNVx1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFx1NjIxNlx1NjI1M1x1NWYwMFx1NGVmYlx1NTJhMVx1NjgwZlx1ODNkY1x1NTM1NVxuKiBcdTUwMTlcdTkwMDlcdTY4NDZcdTRlMGFcdTZlZGFcdTUyYThcdTRlZTVcdTUyMDdcdTYzNjJcdTk4NzVcdTk3NjJcdTYyMTZcdTUwMTlcdTkwMDlcdThiY2RcbiogXHU1NmZhXHU1YjlhXHU1MDE5XHU5MDA5XHU2ODQ2XHU0ZjdmXHU1MTc2XHU0ZTBkXHU4ZGRmXHU5NjhmXHU1MTQ5XHU2ODA3XHU0ZWU1XHU1M2NhXHU4YmJlXHU1YjlhXHU1NmZhXHU1YjlhXHU0ZjRkXHU3ZjZlXG4qIFx1NTAxOVx1OTAwOVx1Njg0Nlx1NWI1N1x1NGY1M1xuKiBcdThmOTNcdTUxNjVcdTZhMjFcdTVmMGZcdTY4MzlcdTYzNmVcdTVlOTRcdTc1MjhcdThiYjBcdTVmYzZcdTVlNzZcdTgxZWFcdTUyYThcdTUyMDdcdTYzNjJcbiogXHU2NmY0XHU2NTM5XHU1MDE5XHU5MDA5XHU2ODQ2XHU5MDBmXHU2NjBlXHU1ZWE2XG4qIFx1NTZmYVx1NWI5YVx1OGY5M1x1NTE2NVx1NmNkNVx1NTIxN1x1ODg2OFx1OTg3YVx1NWU4ZlxuKiBcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTUwMTlcdTkwMDlcdTY4NDZcbiogXHU2NjNlXHU3OTNhXHU2MjE2XHU5NjkwXHU4NWNmXHU1MDE5XHU5MDA5XHU2ODQ2XHU4YzAzXHU5ODc1XHU2MzA5XHU5NGFlXG4qIFx1N2NmYlx1N2VkZlx1NGVmYlx1NTJhMVx1NjgwZlx1NjI1OFx1NzZkOFx1NjYzZVx1NzkzYVx1NTQ4Y1x1NGVhNFx1NGU5Mlx1OGJiZVx1N2Y2ZVxuKiAqIFx1NjYzZVx1NzkzYVx1NjIxNlx1OTY5MFx1ODVjZlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1xuKiAqIFx1NzZmNFx1NjNhNVx1NzBiOVx1NTFmYlx1NjI1OFx1NzZkOFx1NTZmZVx1NjgwN1x1NTIwN1x1NjM2Mlx1OGY5M1x1NTE2NVx1NmU5MFxuKiAqIFx1NmRmYlx1NTJhMFx1OTg5ZFx1NTkxNlx1ODNkY1x1NTM1NVxuKiBcdThmOTNcdTUxNjVcdTZlOTBcdTYzMDdcdTc5M2FcdTU2NjhcdTUzY2FcdTUxNzZcdTY2M2VcdTc5M2FcdTU0OGNcdTRlYTRcdTRlOTJcdThiYmVcdTdmNmVcbiogKiBcdTU0MmZcdTc1MjhcdTYzMDdcdTc5M2FcdTU2NjhcbiogKiBcdTRlYzVcdTU3MjhcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRlYzVcdTU3MjhcdTgyZjFcdTY1ODdcdThmOTNcdTUxNjVcdTY1ZjZcdTYzMDdcdTc5M2FcbiogKiBcdTRmN2ZcdTc1MjhcdTUzNTVcdTZhMjFcdTVmMGZcdThmOTNcdTUxNjVcdTZjZDVcdTY1ZjZcdTRlMGRcdTYzMDdcdTc5M2FcbiogKiBcdTUzZjNcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTY3NjVcdTVjMDZcdTUxNzZcdTk2OTBcdTg1Y2ZcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTRlMGFcdTZlZGFcdTUyYThcdTY3NjVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTYzMDdcdTc5M2FcdTU2NjhcdTY2M2VcdTc5M2FcdTUyYThcdTc1M2JcbiogKiBcdTgxZWFcdTViOWFcdTRlNDlcdTViNTdcdTRmNTNcbiogKiBcdTVkZTZcdTUxZmJcdTYzMDdcdTc5M2FcdTU2NjhcdTRlZTVcdTYyZDZcdTYyZmRcdTc5ZmJcdTUyYThcdTYyMTZcdTgwMDVcdTUyMDdcdTYzNjJcdThmOTNcdTUxNjVcdTZlOTBcbiogKiBcdTY2ZjRcdTY1MzlcdTkwMGZcdTY2MGVcdTVlYTZcbiogKiBcdTU0MmZcdTc1MjhcdTVlZjZcdTY1ZjZcdTY2M2VcdTc5M2FcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTY2M2VcdTc5M2FcdTY1ZjZcdTVlZjZcbiogKiBcdTU0MmZcdTc1MjhcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTRlZTVcdTUzY2FcdTkxNGRcdTdmNmVcdTgxZWFcdTUyYThcdTk2OTBcdTg1Y2ZcdTY1ZjZcdTVlZjZcbiogXHU3NmFlXHU4MGE0XHU2ODM3XHU1ZjBmXHU0ZTNiXHU5ODk4XHVmZjA4XHU2M2QwXHU0ZjliXHU3Njg0XHU2MjE2XHU4MDA1XHU0ZWNlR05PTUUgU2hlbGxcdTRlM2JcdTk4OThcdTRlMmRcdTYzZDBcdTUzZDZcdTc2ODRcdTY4MzdcdTVmMGZcdTg4NjhcdWZmMGNcdTUzYzJcdTg5YzFcdTYyNjlcdTVjNTVcdTc2ODRcdTVlMmVcdTUyYTlcdTkwZThcdTUyMDZcdTY3NjVcdTgzYjdcdTUzZDZcdTY2ZjRcdTU5MWFcdTYzMDdcdTViZmNcdWZmMDlcbiogXHU1MDE5XHU5MDA5XHU2ODQ2XHU4MGNjXHU2NjZmXHU1NmZlXHU3MjQ3XHU1M2NhXHU1MTc2XHU2NjNlXHU3OTNhXHU2ODM3XHU1ZjBmXG4qIFx1NGUzYlx1OTg5OFx1NTQ4Y1x1ODBjY1x1NjY2Zlx1NTZmZVx1NzI0N1x1OGRkZlx1OTY4ZkdOT01FXHU1OTFjXHU3MDZmXG5cblx1NGY3Zlx1NzUyOFx1NjMwN1x1NTM1N1x1ZmYxYWh0dHBzOi8vYmxvZy5jc2RuLm5ldC9xcV8xODU3MjAyMy9hcnRpY2xlL2RldGFpbHMvMTE2MzMxNjAxIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbWl6ZS1pYnVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9taXplLWlidXMiLAogICJuYW1lIjogIkN1c3RvbWl6ZSBJQnVzIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJob2xsb3dtYW5Ab3BlbnN1c2Uub3JnIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b21pemUtaWJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL29wZW5TVVNFL0N1c3RvbWl6ZS1JQnVzIiwKICAidXVpZCI6ICJjdXN0b21pemUtaWJ1c0Bob2xsb3dtYW4ubWwiLAogICJ2ZXJzaW9uIjogODIKfQ=="}}} +, {"uuid": "fildemGMenu@gonza.com", "name": "Fildem global menu", "pname": "fildem-global-menu", "description": "Global menu for Gnome", "link": "https://extensions.gnome.org/extension/4114/fildem-global-menu/", "shell_version_map": {"38": {"version": "2", "sha256": "0776vx09b1nxf6j5w9gmzg1gmzijh1mpsnfzv41svbfqyfc8zv2w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdsb2JhbCBtZW51IGZvciBHbm9tZSIsCiAgIm5hbWUiOiAiRmlsZGVtIGdsb2JhbCBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpbGRlbS1nbG9iYWwtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL0ZpbGRlbSIsCiAgInV1aWQiOiAiZmlsZGVtR01lbnVAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "0776vx09b1nxf6j5w9gmzg1gmzijh1mpsnfzv41svbfqyfc8zv2w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdsb2JhbCBtZW51IGZvciBHbm9tZSIsCiAgIm5hbWUiOiAiRmlsZGVtIGdsb2JhbCBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpbGRlbS1nbG9iYWwtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL0ZpbGRlbSIsCiAgInV1aWQiOiAiZmlsZGVtR01lbnVAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0776vx09b1nxf6j5w9gmzg1gmzijh1mpsnfzv41svbfqyfc8zv2w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdsb2JhbCBtZW51IGZvciBHbm9tZSIsCiAgIm5hbWUiOiAiRmlsZGVtIGdsb2JhbCBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZpbGRlbS1nbG9iYWwtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL0ZpbGRlbSIsCiAgInV1aWQiOiAiZmlsZGVtR01lbnVAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "remove-panel@sulincix", "name": "RemovePanel", "pname": "removepanel", "description": "remove top panel from gnome-shell", "link": "https://extensions.gnome.org/extension/4118/removepanel/", "shell_version_map": {"38": {"version": "5", "sha256": "022cznjpi2a3ld31cjk1942cyc4r6s6k58ik5qd49xh8wl8y2b3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlbW92ZSB0b3AgcGFuZWwgZnJvbSBnbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiUmVtb3ZlUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJyZW1vdmUtcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "022cznjpi2a3ld31cjk1942cyc4r6s6k58ik5qd49xh8wl8y2b3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlbW92ZSB0b3AgcGFuZWwgZnJvbSBnbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiUmVtb3ZlUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJyZW1vdmUtcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "022cznjpi2a3ld31cjk1942cyc4r6s6k58ik5qd49xh8wl8y2b3z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlbW92ZSB0b3AgcGFuZWwgZnJvbSBnbm9tZS1zaGVsbCIsCiAgIm5hbWUiOiAiUmVtb3ZlUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJyZW1vdmUtcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "bottom-triggers-activities@papjul", "name": "Bottom triggers Activities overview", "pname": "bottom-triggers-activities-overview", "description": "DEPRECATION NOTICE: No longer maintained. Please migrate to another extension such as Hot Edge https://extensions.gnome.org/extension/4222/hot-edge/\n\nAllows to toggle Activities overview when the mouse reaches the bottom edge of the screen.\nPLEASE report your bugs to the extension homepage link below. I cannot reply to you if you write a review here.\n\nThis is a fork of Dash to Dock focusing only on doing this, it adds support for Gnome Shell 40 and is mainly aimed at Gnome Shell 40 users to reduce mouse travel.\n\nI may backport fixes from upstream, but I don't intend to add any new feature and may not fix any bug if I'm not affected/cannot reproduce. However, I will accept pull requests that keep the extension in the KISS principle. It could be adding a prefs UI for toggle delay and edge(s) triggered, or supporting multiple monitors.\n\nYou can customize the following parameters from the constructor of extension.js:\n this._position = St.Side.BOTTOM;\n this._toggleDelay = 0.25;", "link": "https://extensions.gnome.org/extension/4120/bottom-triggers-activities-overview/", "shell_version_map": {"38": {"version": "2", "sha256": "1q1ahz612w2fzbvky8ydwns2kykbj2vqcr5ddyncg16lhrfzx9vq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRFUFJFQ0FUSU9OIE5PVElDRTogTm8gbG9uZ2VyIG1haW50YWluZWQuIFBsZWFzZSBtaWdyYXRlIHRvIGFub3RoZXIgZXh0ZW5zaW9uIHN1Y2ggYXMgSG90IEVkZ2UgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDIyMi9ob3QtZWRnZS9cblxuQWxsb3dzIHRvIHRvZ2dsZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IHdoZW4gdGhlIG1vdXNlIHJlYWNoZXMgdGhlIGJvdHRvbSBlZGdlIG9mIHRoZSBzY3JlZW4uXG5QTEVBU0UgcmVwb3J0IHlvdXIgYnVncyB0byB0aGUgZXh0ZW5zaW9uIGhvbWVwYWdlIGxpbmsgYmVsb3cuIEkgY2Fubm90IHJlcGx5IHRvIHlvdSBpZiB5b3Ugd3JpdGUgYSByZXZpZXcgaGVyZS5cblxuVGhpcyBpcyBhIGZvcmsgb2YgRGFzaCB0byBEb2NrIGZvY3VzaW5nIG9ubHkgb24gZG9pbmcgdGhpcywgaXQgYWRkcyBzdXBwb3J0IGZvciBHbm9tZSBTaGVsbCA0MCBhbmQgaXMgbWFpbmx5IGFpbWVkIGF0IEdub21lIFNoZWxsIDQwIHVzZXJzIHRvIHJlZHVjZSBtb3VzZSB0cmF2ZWwuXG5cbkkgbWF5IGJhY2twb3J0IGZpeGVzIGZyb20gdXBzdHJlYW0sIGJ1dCBJIGRvbid0IGludGVuZCB0byBhZGQgYW55IG5ldyBmZWF0dXJlIGFuZCBtYXkgbm90IGZpeCBhbnkgYnVnIGlmIEknbSBub3QgYWZmZWN0ZWQvY2Fubm90IHJlcHJvZHVjZS4gSG93ZXZlciwgSSB3aWxsIGFjY2VwdCBwdWxsIHJlcXVlc3RzIHRoYXQga2VlcCB0aGUgZXh0ZW5zaW9uIGluIHRoZSBLSVNTIHByaW5jaXBsZS4gSXQgY291bGQgYmUgYWRkaW5nIGEgcHJlZnMgVUkgZm9yIHRvZ2dsZSBkZWxheSBhbmQgZWRnZShzKSB0cmlnZ2VyZWQsIG9yIHN1cHBvcnRpbmcgbXVsdGlwbGUgbW9uaXRvcnMuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBmb2xsb3dpbmcgcGFyYW1ldGVycyBmcm9tIHRoZSBjb25zdHJ1Y3RvciBvZiBleHRlbnNpb24uanM6XG4gICAgICAgIHRoaXMuX3Bvc2l0aW9uID0gU3QuU2lkZS5CT1RUT007XG4gICAgICAgIHRoaXMuX3RvZ2dsZURlbGF5ID0gMC4yNTsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJib3R0b210cmlnZ2Vyc2FjdGl2aXRpZXMiLAogICJuYW1lIjogIkJvdHRvbSB0cmlnZ2VycyBBY3Rpdml0aWVzIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhcGp1bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXBqdWwvYm90dG9tLXRyaWdnZXJzLWFjdGl2aXRpZXMiLAogICJ1dWlkIjogImJvdHRvbS10cmlnZ2Vycy1hY3Rpdml0aWVzQHBhcGp1bCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1q1ahz612w2fzbvky8ydwns2kykbj2vqcr5ddyncg16lhrfzx9vq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRFUFJFQ0FUSU9OIE5PVElDRTogTm8gbG9uZ2VyIG1haW50YWluZWQuIFBsZWFzZSBtaWdyYXRlIHRvIGFub3RoZXIgZXh0ZW5zaW9uIHN1Y2ggYXMgSG90IEVkZ2UgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDIyMi9ob3QtZWRnZS9cblxuQWxsb3dzIHRvIHRvZ2dsZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IHdoZW4gdGhlIG1vdXNlIHJlYWNoZXMgdGhlIGJvdHRvbSBlZGdlIG9mIHRoZSBzY3JlZW4uXG5QTEVBU0UgcmVwb3J0IHlvdXIgYnVncyB0byB0aGUgZXh0ZW5zaW9uIGhvbWVwYWdlIGxpbmsgYmVsb3cuIEkgY2Fubm90IHJlcGx5IHRvIHlvdSBpZiB5b3Ugd3JpdGUgYSByZXZpZXcgaGVyZS5cblxuVGhpcyBpcyBhIGZvcmsgb2YgRGFzaCB0byBEb2NrIGZvY3VzaW5nIG9ubHkgb24gZG9pbmcgdGhpcywgaXQgYWRkcyBzdXBwb3J0IGZvciBHbm9tZSBTaGVsbCA0MCBhbmQgaXMgbWFpbmx5IGFpbWVkIGF0IEdub21lIFNoZWxsIDQwIHVzZXJzIHRvIHJlZHVjZSBtb3VzZSB0cmF2ZWwuXG5cbkkgbWF5IGJhY2twb3J0IGZpeGVzIGZyb20gdXBzdHJlYW0sIGJ1dCBJIGRvbid0IGludGVuZCB0byBhZGQgYW55IG5ldyBmZWF0dXJlIGFuZCBtYXkgbm90IGZpeCBhbnkgYnVnIGlmIEknbSBub3QgYWZmZWN0ZWQvY2Fubm90IHJlcHJvZHVjZS4gSG93ZXZlciwgSSB3aWxsIGFjY2VwdCBwdWxsIHJlcXVlc3RzIHRoYXQga2VlcCB0aGUgZXh0ZW5zaW9uIGluIHRoZSBLSVNTIHByaW5jaXBsZS4gSXQgY291bGQgYmUgYWRkaW5nIGEgcHJlZnMgVUkgZm9yIHRvZ2dsZSBkZWxheSBhbmQgZWRnZShzKSB0cmlnZ2VyZWQsIG9yIHN1cHBvcnRpbmcgbXVsdGlwbGUgbW9uaXRvcnMuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBmb2xsb3dpbmcgcGFyYW1ldGVycyBmcm9tIHRoZSBjb25zdHJ1Y3RvciBvZiBleHRlbnNpb24uanM6XG4gICAgICAgIHRoaXMuX3Bvc2l0aW9uID0gU3QuU2lkZS5CT1RUT007XG4gICAgICAgIHRoaXMuX3RvZ2dsZURlbGF5ID0gMC4yNTsiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJib3R0b210cmlnZ2Vyc2FjdGl2aXRpZXMiLAogICJuYW1lIjogIkJvdHRvbSB0cmlnZ2VycyBBY3Rpdml0aWVzIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInBhcGp1bCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wYXBqdWwvYm90dG9tLXRyaWdnZXJzLWFjdGl2aXRpZXMiLAogICJ1dWlkIjogImJvdHRvbS10cmlnZ2Vycy1hY3Rpdml0aWVzQHBhcGp1bCIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "gnome-shell-Google-search-provider@MrNinso", "name": "Google Search Provider", "pname": "google-search-provider", "description": "Add Google search to Gnome Shell Search \n TODO: \n - Add google suggestions (For now using duckduckGo suggestions)", "link": "https://extensions.gnome.org/extension/4132/google-search-provider/", "shell_version_map": {"38": {"version": "6", "sha256": "1pk1a6k21a1yj78rkwkx0r91lyjybjvfncymhl1hbzzyq0fxqy82", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBHb29nbGUgc2VhcmNoIHRvIEdub21lIFNoZWxsIFNlYXJjaCBcbiBUT0RPOiBcbiAtIEFkZCBnb29nbGUgc3VnZ2VzdGlvbnMgKEZvciBub3cgdXNpbmcgZHVja2R1Y2tHbyBzdWdnZXN0aW9ucykiLAogICJuYW1lIjogIkdvb2dsZSBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29vZ2xlLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTXJOaW5zby9nbm9tZS1zaGVsbC1nb29nbGUtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1Hb29nbGUtc2VhcmNoLXByb3ZpZGVyQE1yTmluc28iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1pk1a6k21a1yj78rkwkx0r91lyjybjvfncymhl1hbzzyq0fxqy82", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBHb29nbGUgc2VhcmNoIHRvIEdub21lIFNoZWxsIFNlYXJjaCBcbiBUT0RPOiBcbiAtIEFkZCBnb29nbGUgc3VnZ2VzdGlvbnMgKEZvciBub3cgdXNpbmcgZHVja2R1Y2tHbyBzdWdnZXN0aW9ucykiLAogICJuYW1lIjogIkdvb2dsZSBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29vZ2xlLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTXJOaW5zby9nbm9tZS1zaGVsbC1nb29nbGUtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1Hb29nbGUtc2VhcmNoLXByb3ZpZGVyQE1yTmluc28iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "1pk1a6k21a1yj78rkwkx0r91lyjybjvfncymhl1hbzzyq0fxqy82", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBHb29nbGUgc2VhcmNoIHRvIEdub21lIFNoZWxsIFNlYXJjaCBcbiBUT0RPOiBcbiAtIEFkZCBnb29nbGUgc3VnZ2VzdGlvbnMgKEZvciBub3cgdXNpbmcgZHVja2R1Y2tHbyBzdWdnZXN0aW9ucykiLAogICJuYW1lIjogIkdvb2dsZSBTZWFyY2ggUHJvdmlkZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29vZ2xlLXNlYXJjaC1wcm92aWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTXJOaW5zby9nbm9tZS1zaGVsbC1nb29nbGUtc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1Hb29nbGUtc2VhcmNoLXByb3ZpZGVyQE1yTmluc28iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "disable-menu-switching@selfmade.pl", "name": "Disable Menu Switching", "pname": "disable-menu-switching", "description": "Disable changing menu on hover another panel button.", "link": "https://extensions.gnome.org/extension/4133/disable-menu-switching/", "shell_version_map": {"40": {"version": "3", "sha256": "12879vn6knafdcphg3wwbpbram5hrw79v68z9c9d5z4f9k781ksq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgY2hhbmdpbmcgbWVudSBvbiBob3ZlciBhbm90aGVyIHBhbmVsIGJ1dHRvbi4iLAogICJuYW1lIjogIkRpc2FibGUgTWVudSBTd2l0Y2hpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvRGlzYWJsZS1NZW51LVN3aXRjaGluZyIsCiAgInV1aWQiOiAiZGlzYWJsZS1tZW51LXN3aXRjaGluZ0BzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "4", "sha256": "0fnzlmr12l8y689p6kclm3yd3b653jl9f1bhhy7652c1b4g515m0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgY2hhbmdpbmcgbWVudSBvbiBob3ZlciBhbm90aGVyIHBhbmVsIGJ1dHRvbi4iLAogICJuYW1lIjogIkRpc2FibGUgTWVudSBTd2l0Y2hpbmciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvRGlzYWJsZS1NZW51LVN3aXRjaGluZyIsCiAgInV1aWQiOiAiZGlzYWJsZS1tZW51LXN3aXRjaGluZ0BzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "espresso@coadmunkee.github.com", "name": "Espresso", "pname": "espresso", "description": "Set conditions to disable the screensaver and auto suspend. Espresso is a fork of the Caffeine extension, and Espresso only supports Gnome 40 and Gnome 41. Please leave feedback or report issues through the Extension Homepage", "link": "https://extensions.gnome.org/extension/4135/espresso/", "shell_version_map": {"40": {"version": "4", "sha256": "1cvbi9yb4iz9178sjf3fppr1c4n8pm345b66njf1ij81qbllm9aw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBjb25kaXRpb25zIHRvIGRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQuIEVzcHJlc3NvIGlzIGEgZm9yayBvZiB0aGUgQ2FmZmVpbmUgZXh0ZW5zaW9uLCBhbmQgRXNwcmVzc28gb25seSBzdXBwb3J0cyBHbm9tZSA0MCBhbmQgR25vbWUgNDEuIFBsZWFzZSBsZWF2ZSBmZWVkYmFjayBvciByZXBvcnQgaXNzdWVzIHRocm91Z2ggdGhlIEV4dGVuc2lvbiBIb21lcGFnZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1lc3ByZXNzbyIsCiAgIm5hbWUiOiAiRXNwcmVzc28iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXNwcmVzc28iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvYWRtdW5rZWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAidXVpZCI6ICJlc3ByZXNzb0Bjb2FkbXVua2VlLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1cvbi9yb4iz9178sjf3fppr1c4n8pm345b66njf1ij81qbllm9aw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBjb25kaXRpb25zIHRvIGRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQuIEVzcHJlc3NvIGlzIGEgZm9yayBvZiB0aGUgQ2FmZmVpbmUgZXh0ZW5zaW9uLCBhbmQgRXNwcmVzc28gb25seSBzdXBwb3J0cyBHbm9tZSA0MCBhbmQgR25vbWUgNDEuIFBsZWFzZSBsZWF2ZSBmZWVkYmFjayBvciByZXBvcnQgaXNzdWVzIHRocm91Z2ggdGhlIEV4dGVuc2lvbiBIb21lcGFnZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1lc3ByZXNzbyIsCiAgIm5hbWUiOiAiRXNwcmVzc28iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXNwcmVzc28iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvYWRtdW5rZWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAidXVpZCI6ICJlc3ByZXNzb0Bjb2FkbXVua2VlLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"uuid": "espresso@coadmunkee.github.com", "name": "Espresso", "pname": "espresso", "description": "Control when to disable the usual auto suspend and screensaver functionality and optionally Night Light as well. Options to show as an icon in the top panel, enable when a fullscreen app is running, restore state across reboots, provide notifications, enable when specific app are running, pause Night Light when Espresso is enabled or only when specific apps are running. Espresso also supports docking stations with options to enable when charging or when docked to external monitors.\n\nEspresso is a fork of the Caffeine extension.\n\nPlease leave feedback or report issues through the Extension Homepage", "link": "https://extensions.gnome.org/extension/4135/espresso/", "shell_version_map": {"40": {"version": "6", "sha256": "0crkisqgrqh7lgls9mh59hziajkzwn08mcpcifmd8gr95qvrdmgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgd2hlbiB0byBkaXNhYmxlIHRoZSB1c3VhbCBhdXRvIHN1c3BlbmQgYW5kIHNjcmVlbnNhdmVyIGZ1bmN0aW9uYWxpdHkgYW5kIG9wdGlvbmFsbHkgTmlnaHQgTGlnaHQgYXMgd2VsbC4gT3B0aW9ucyB0byBzaG93IGFzIGFuIGljb24gaW4gdGhlIHRvcCBwYW5lbCwgZW5hYmxlIHdoZW4gYSBmdWxsc2NyZWVuIGFwcCBpcyBydW5uaW5nLCByZXN0b3JlIHN0YXRlIGFjcm9zcyByZWJvb3RzLCBwcm92aWRlIG5vdGlmaWNhdGlvbnMsIGVuYWJsZSB3aGVuIHNwZWNpZmljIGFwcCBhcmUgcnVubmluZywgcGF1c2UgTmlnaHQgTGlnaHQgd2hlbiBFc3ByZXNzbyBpcyBlbmFibGVkIG9yIG9ubHkgd2hlbiBzcGVjaWZpYyBhcHBzIGFyZSBydW5uaW5nLiBFc3ByZXNzbyBhbHNvIHN1cHBvcnRzIGRvY2tpbmcgc3RhdGlvbnMgd2l0aCBvcHRpb25zIHRvIGVuYWJsZSB3aGVuIGNoYXJnaW5nIG9yIHdoZW4gZG9ja2VkIHRvIGV4dGVybmFsIG1vbml0b3JzLlxuXG5Fc3ByZXNzbyBpcyBhIGZvcmsgb2YgdGhlIENhZmZlaW5lIGV4dGVuc2lvbi5cblxuUGxlYXNlIGxlYXZlIGZlZWRiYWNrIG9yIHJlcG9ydCBpc3N1ZXMgdGhyb3VnaCB0aGUgRXh0ZW5zaW9uIEhvbWVwYWdlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAibmFtZSI6ICJFc3ByZXNzbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lc3ByZXNzbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvYWRtdW5rZWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAidXVpZCI6ICJlc3ByZXNzb0Bjb2FkbXVua2VlLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0crkisqgrqh7lgls9mh59hziajkzwn08mcpcifmd8gr95qvrdmgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgd2hlbiB0byBkaXNhYmxlIHRoZSB1c3VhbCBhdXRvIHN1c3BlbmQgYW5kIHNjcmVlbnNhdmVyIGZ1bmN0aW9uYWxpdHkgYW5kIG9wdGlvbmFsbHkgTmlnaHQgTGlnaHQgYXMgd2VsbC4gT3B0aW9ucyB0byBzaG93IGFzIGFuIGljb24gaW4gdGhlIHRvcCBwYW5lbCwgZW5hYmxlIHdoZW4gYSBmdWxsc2NyZWVuIGFwcCBpcyBydW5uaW5nLCByZXN0b3JlIHN0YXRlIGFjcm9zcyByZWJvb3RzLCBwcm92aWRlIG5vdGlmaWNhdGlvbnMsIGVuYWJsZSB3aGVuIHNwZWNpZmljIGFwcCBhcmUgcnVubmluZywgcGF1c2UgTmlnaHQgTGlnaHQgd2hlbiBFc3ByZXNzbyBpcyBlbmFibGVkIG9yIG9ubHkgd2hlbiBzcGVjaWZpYyBhcHBzIGFyZSBydW5uaW5nLiBFc3ByZXNzbyBhbHNvIHN1cHBvcnRzIGRvY2tpbmcgc3RhdGlvbnMgd2l0aCBvcHRpb25zIHRvIGVuYWJsZSB3aGVuIGNoYXJnaW5nIG9yIHdoZW4gZG9ja2VkIHRvIGV4dGVybmFsIG1vbml0b3JzLlxuXG5Fc3ByZXNzbyBpcyBhIGZvcmsgb2YgdGhlIENhZmZlaW5lIGV4dGVuc2lvbi5cblxuUGxlYXNlIGxlYXZlIGZlZWRiYWNrIG9yIHJlcG9ydCBpc3N1ZXMgdGhyb3VnaCB0aGUgRXh0ZW5zaW9uIEhvbWVwYWdlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAibmFtZSI6ICJFc3ByZXNzbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lc3ByZXNzbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvYWRtdW5rZWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAidXVpZCI6ICJlc3ByZXNzb0Bjb2FkbXVua2VlLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "0crkisqgrqh7lgls9mh59hziajkzwn08mcpcifmd8gr95qvrdmgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgd2hlbiB0byBkaXNhYmxlIHRoZSB1c3VhbCBhdXRvIHN1c3BlbmQgYW5kIHNjcmVlbnNhdmVyIGZ1bmN0aW9uYWxpdHkgYW5kIG9wdGlvbmFsbHkgTmlnaHQgTGlnaHQgYXMgd2VsbC4gT3B0aW9ucyB0byBzaG93IGFzIGFuIGljb24gaW4gdGhlIHRvcCBwYW5lbCwgZW5hYmxlIHdoZW4gYSBmdWxsc2NyZWVuIGFwcCBpcyBydW5uaW5nLCByZXN0b3JlIHN0YXRlIGFjcm9zcyByZWJvb3RzLCBwcm92aWRlIG5vdGlmaWNhdGlvbnMsIGVuYWJsZSB3aGVuIHNwZWNpZmljIGFwcCBhcmUgcnVubmluZywgcGF1c2UgTmlnaHQgTGlnaHQgd2hlbiBFc3ByZXNzbyBpcyBlbmFibGVkIG9yIG9ubHkgd2hlbiBzcGVjaWZpYyBhcHBzIGFyZSBydW5uaW5nLiBFc3ByZXNzbyBhbHNvIHN1cHBvcnRzIGRvY2tpbmcgc3RhdGlvbnMgd2l0aCBvcHRpb25zIHRvIGVuYWJsZSB3aGVuIGNoYXJnaW5nIG9yIHdoZW4gZG9ja2VkIHRvIGV4dGVybmFsIG1vbml0b3JzLlxuXG5Fc3ByZXNzbyBpcyBhIGZvcmsgb2YgdGhlIENhZmZlaW5lIGV4dGVuc2lvbi5cblxuUGxlYXNlIGxlYXZlIGZlZWRiYWNrIG9yIHJlcG9ydCBpc3N1ZXMgdGhyb3VnaCB0aGUgRXh0ZW5zaW9uIEhvbWVwYWdlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAibmFtZSI6ICJFc3ByZXNzbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lc3ByZXNzbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvYWRtdW5rZWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAidXVpZCI6ICJlc3ByZXNzb0Bjb2FkbXVua2VlLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "salat-dz@salat-dz.com", "name": "Salat Dz", "pname": "salat-dz", "description": "Show next salat using Salat Dz API", "link": "https://extensions.gnome.org/extension/4136/salat-dz/", "shell_version_map": {"38": {"version": "1", "sha256": "1kga5w2yp375h6lj3fmzr1agg43phyj5f45d7hjv04c405d32p8s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbmV4dCBzYWxhdCB1c2luZyBTYWxhdCBEeiBBUEkiLAogICJuYW1lIjogIlNhbGF0IER6IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL3NhbGF0LnB5dGhvbmFueXdoZXJlLmNvbSIsCiAgInV1aWQiOiAic2FsYXQtZHpAc2FsYXQtZHouY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "user-at-host@cmm.github.com", "name": "Add user@host to top panel", "pname": "add-userhost-to-panel", "description": "Adds user@host to the top panel, on the left.\n\nNothing fancy, no support -- fork at will, the thing is very simple.", "link": "https://extensions.gnome.org/extension/4141/add-userhost-to-panel/", "shell_version_map": {"38": {"version": "6", "sha256": "0ypil2vcv0fx10gh8q3slvf2mbqf8y53mzrb2irxdbqjkn4mdnax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlckBob3N0IHRvIHRoZSB0b3AgcGFuZWwsIG9uIHRoZSBsZWZ0LlxuXG5Ob3RoaW5nIGZhbmN5LCBubyBzdXBwb3J0IC0tIGZvcmsgYXQgd2lsbCwgdGhlIHRoaW5nIGlzIHZlcnkgc2ltcGxlLiIsCiAgIm5hbWUiOiAiQWRkIHVzZXJAaG9zdCB0byB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZGFuZGFtYW45NiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY21tL2dub21lLXVzZXItYXQtaG9zdCIsCiAgInV1aWQiOiAidXNlci1hdC1ob3N0QGNtbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "0ypil2vcv0fx10gh8q3slvf2mbqf8y53mzrb2irxdbqjkn4mdnax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlckBob3N0IHRvIHRoZSB0b3AgcGFuZWwsIG9uIHRoZSBsZWZ0LlxuXG5Ob3RoaW5nIGZhbmN5LCBubyBzdXBwb3J0IC0tIGZvcmsgYXQgd2lsbCwgdGhlIHRoaW5nIGlzIHZlcnkgc2ltcGxlLiIsCiAgIm5hbWUiOiAiQWRkIHVzZXJAaG9zdCB0byB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZGFuZGFtYW45NiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY21tL2dub21lLXVzZXItYXQtaG9zdCIsCiAgInV1aWQiOiAidXNlci1hdC1ob3N0QGNtbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0ypil2vcv0fx10gh8q3slvf2mbqf8y53mzrb2irxdbqjkn4mdnax", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlckBob3N0IHRvIHRoZSB0b3AgcGFuZWwsIG9uIHRoZSBsZWZ0LlxuXG5Ob3RoaW5nIGZhbmN5LCBubyBzdXBwb3J0IC0tIGZvcmsgYXQgd2lsbCwgdGhlIHRoaW5nIGlzIHZlcnkgc2ltcGxlLiIsCiAgIm5hbWUiOiAiQWRkIHVzZXJAaG9zdCB0byB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZGFuZGFtYW45NiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY21tL2dub21lLXVzZXItYXQtaG9zdCIsCiAgInV1aWQiOiAidXNlci1hdC1ob3N0QGNtbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "vertical-overview@RensAlthuis.github.com", "name": "Vertical overview", "pname": "vertical-overview", "description": "Bringing back vertically stacked workspaces", "link": "https://extensions.gnome.org/extension/4144/vertical-overview/", "shell_version_map": {"40": {"version": "8", "sha256": "0h865ipn97k9yrj4r0qhfdj2vnwk92720ahim22sw86605ljc77z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5naW5nIGJhY2sgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInJlbnMuYWx0aHVpc0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC1vdmVydmlld0BSZW5zQWx0aHVpcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "0h865ipn97k9yrj4r0qhfdj2vnwk92720ahim22sw86605ljc77z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5naW5nIGJhY2sgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInJlbnMuYWx0aHVpc0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC1vdmVydmlld0BSZW5zQWx0aHVpcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "workspace-isolated_app-switcher@lestibournes", "name": "Workspace-Isolated App-Switcher", "pname": "workspace-isolated-app-switcher", "description": "App-Switcher modification that shows only the apps that are running on the current workspace. Fork of App-Switcher Current Workspace First by fawtytoo.", "link": "https://extensions.gnome.org/extension/4145/workspace-isolated-app-switcher/", "shell_version_map": {"38": {"version": "1", "sha256": "0bcf8l1sb73f0ggvavkfjk10s67k7w4f3yr0s9inil6z8pbk7bsr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcC1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzaG93cyBvbmx5IHRoZSBhcHBzIHRoYXQgYXJlIHJ1bm5pbmcgb24gdGhlIGN1cnJlbnQgd29ya3NwYWNlLiBGb3JrIG9mIEFwcC1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCBieSBmYXd0eXRvby4iLAogICJuYW1lIjogIldvcmtzcGFjZS1Jc29sYXRlZCBBcHAtU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAid29ya3NwYWNlLWlzb2xhdGVkX2FwcC1zd2l0Y2hlckBsZXN0aWJvdXJuZXMiLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "kubectl@infinicode.de", "name": "Kubectl Extension", "pname": "kubectl-extension", "description": "Quick panel access to kubernetes resources utilizing kubectl CLI", "link": "https://extensions.gnome.org/extension/4147/kubectl-extension/", "shell_version_map": {"38": {"version": "4", "sha256": "1lcmkyns6s4nv9ag9h80vs4cxrjxw907b3bxzqvs7ig9s1h41rqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHBhbmVsIGFjY2VzcyB0byBrdWJlcm5ldGVzIHJlc291cmNlcyB1dGlsaXppbmcga3ViZWN0bCBDTEkiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIkt1YmVjdGwgRXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMva3ViZWN0bC1leHRlbnNpb24iLAogICJ1dWlkIjogImt1YmVjdGxAaW5maW5pY29kZS5kZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1lcmkyns6s4nv9ag9h80vs4cxrjxw907b3bxzqvs7ig9s1h41rqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHBhbmVsIGFjY2VzcyB0byBrdWJlcm5ldGVzIHJlc291cmNlcyB1dGlsaXppbmcga3ViZWN0bCBDTEkiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIkt1YmVjdGwgRXh0ZW5zaW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NpbmF0aWMva3ViZWN0bC1leHRlbnNpb24iLAogICJ1dWlkIjogImt1YmVjdGxAaW5maW5pY29kZS5kZSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "alwaysshowworkspacethumbnails@alynx.one", "name": "Always Show Workspace Thumbnails", "pname": "always-show-workspace-thumbnails", "description": "Always show workspace thumbnails even there is only one workspace.", "link": "https://extensions.gnome.org/extension/4156/always-show-workspace-thumbnails/", "shell_version_map": {"40": {"version": "3", "sha256": "08z8ij9cj198g7cw3mr9spy1pirqhxkhmqwhg2vysql9bwhc3w1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHdvcmtzcGFjZSB0aHVtYm5haWxzIGV2ZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FseW54WmhvdS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYWx3YXlzLXNob3ctd29ya3NwYWNlLXRodW1ibmFpbHMvIiwKICAidXVpZCI6ICJhbHdheXNzaG93d29ya3NwYWNldGh1bWJuYWlsc0BhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "08z8ij9cj198g7cw3mr9spy1pirqhxkhmqwhg2vysql9bwhc3w1q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHdvcmtzcGFjZSB0aHVtYm5haWxzIGV2ZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FseW54WmhvdS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYWx3YXlzLXNob3ctd29ya3NwYWNlLXRodW1ibmFpbHMvIiwKICAidXVpZCI6ICJhbHdheXNzaG93d29ya3NwYWNldGh1bWJuYWlsc0BhbHlueC5vbmUiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "gnome-ui-tune@itstime.tech", "name": "Gnome 4x UI Improvements", "pname": "gnome-40-ui-improvements", "description": "Tunes gnome 40/41's Overview UI to make it more usable.\n\nChanges:\n- Search textbox is hidden by default and shown only when user begins to type-to-search\n- Scale of workspaces' thumbnails increased 2x\n- Restores wallpaper on workspaces' thumbnails. No more gray background\n- Show workspaces' thumbnails even when there is only one workspace\n- Firefox's PIP (picture in picture) window is now displayed on the overview screen\n\nAll modifications can be disabled in the extension's settings.\n\nATTENTION!\nAfter extension update, gnome-shell restart is required:\nX11: Alt+F2 => r\nWayland: logout => login", "link": "https://extensions.gnome.org/extension/4158/gnome-40-ui-improvements/", "shell_version_map": {"40": {"version": "7", "sha256": "1da7vqkjjqix29x7j3zv6plkzs45jcfz89i5d9pfk1jsmfcph2k4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLzQxJ3MgT3ZlcnZpZXcgVUkgdG8gbWFrZSBpdCBtb3JlIHVzYWJsZS5cblxuQ2hhbmdlczpcbi0gU2VhcmNoIHRleHRib3ggaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYW5kIHNob3duIG9ubHkgd2hlbiB1c2VyIGJlZ2lucyB0byB0eXBlLXRvLXNlYXJjaFxuLSBTY2FsZSBvZiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGluY3JlYXNlZCAyeFxuLSBSZXN0b3JlcyB3YWxscGFwZXIgb24gd29ya3NwYWNlcycgdGh1bWJuYWlscy4gTm8gbW9yZSBncmF5IGJhY2tncm91bmRcbi0gU2hvdyB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGV2ZW4gd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSB3b3Jrc3BhY2Vcbi0gRmlyZWZveCdzIFBJUCAocGljdHVyZSBpbiBwaWN0dXJlKSB3aW5kb3cgaXMgbm93IGRpc3BsYXllZCBvbiB0aGUgb3ZlcnZpZXcgc2NyZWVuXG5cbkFsbCBtb2RpZmljYXRpb25zIGNhbiBiZSBkaXNhYmxlZCBpbiB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MuXG5cbkFUVEVOVElPTiFcbkFmdGVyIGV4dGVuc2lvbiB1cGRhdGUsIGdub21lLXNoZWxsIHJlc3RhcnQgaXMgcmVxdWlyZWQ6XG5YMTE6IEFsdCtGMiA9PiByXG5XYXlsYW5kOiBsb2dvdXQgPT4gbG9naW4iLAogICJuYW1lIjogIkdub21lIDR4IFVJIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS11aS10dW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtdWktdHVuZSIsCiAgInV1aWQiOiAiZ25vbWUtdWktdHVuZUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "1da7vqkjjqix29x7j3zv6plkzs45jcfz89i5d9pfk1jsmfcph2k4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLzQxJ3MgT3ZlcnZpZXcgVUkgdG8gbWFrZSBpdCBtb3JlIHVzYWJsZS5cblxuQ2hhbmdlczpcbi0gU2VhcmNoIHRleHRib3ggaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYW5kIHNob3duIG9ubHkgd2hlbiB1c2VyIGJlZ2lucyB0byB0eXBlLXRvLXNlYXJjaFxuLSBTY2FsZSBvZiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGluY3JlYXNlZCAyeFxuLSBSZXN0b3JlcyB3YWxscGFwZXIgb24gd29ya3NwYWNlcycgdGh1bWJuYWlscy4gTm8gbW9yZSBncmF5IGJhY2tncm91bmRcbi0gU2hvdyB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGV2ZW4gd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSB3b3Jrc3BhY2Vcbi0gRmlyZWZveCdzIFBJUCAocGljdHVyZSBpbiBwaWN0dXJlKSB3aW5kb3cgaXMgbm93IGRpc3BsYXllZCBvbiB0aGUgb3ZlcnZpZXcgc2NyZWVuXG5cbkFsbCBtb2RpZmljYXRpb25zIGNhbiBiZSBkaXNhYmxlZCBpbiB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MuXG5cbkFUVEVOVElPTiFcbkFmdGVyIGV4dGVuc2lvbiB1cGRhdGUsIGdub21lLXNoZWxsIHJlc3RhcnQgaXMgcmVxdWlyZWQ6XG5YMTE6IEFsdCtGMiA9PiByXG5XYXlsYW5kOiBsb2dvdXQgPT4gbG9naW4iLAogICJuYW1lIjogIkdub21lIDR4IFVJIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS11aS10dW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtdWktdHVuZSIsCiAgInV1aWQiOiAiZ25vbWUtdWktdHVuZUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "gnome-ui-tune@itstime.tech", "name": "Gnome 4x UI Improvements", "pname": "gnome-40-ui-improvements", "description": "Tunes gnome 40/41/42's Overview UI to make it more usable.\n\nChanges:\n- Search textbox is hidden by default and shown only when user begins to type-to-search\n- Scale of workspaces' thumbnails increased 2x\n- Restores wallpaper on workspaces' thumbnails. No more gray background\n- Show workspaces' thumbnails even when there is only one workspace\n- Firefox's PIP (picture in picture) window is now displayed on the overview screen\n\nAll modifications can be disabled in the extension's settings.\n\nATTENTION!\nAfter extension update, gnome-shell restart is required:\nX11: Alt+F2 => r\nWayland: logout => login", "link": "https://extensions.gnome.org/extension/4158/gnome-40-ui-improvements/", "shell_version_map": {"40": {"version": "9", "sha256": "1712psni5pnqi99pgk27aan3iw5v6z8pv7qszgjkwl6ckzjijcnx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLzQxLzQyJ3MgT3ZlcnZpZXcgVUkgdG8gbWFrZSBpdCBtb3JlIHVzYWJsZS5cblxuQ2hhbmdlczpcbi0gU2VhcmNoIHRleHRib3ggaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYW5kIHNob3duIG9ubHkgd2hlbiB1c2VyIGJlZ2lucyB0byB0eXBlLXRvLXNlYXJjaFxuLSBTY2FsZSBvZiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGluY3JlYXNlZCAyeFxuLSBSZXN0b3JlcyB3YWxscGFwZXIgb24gd29ya3NwYWNlcycgdGh1bWJuYWlscy4gTm8gbW9yZSBncmF5IGJhY2tncm91bmRcbi0gU2hvdyB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGV2ZW4gd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSB3b3Jrc3BhY2Vcbi0gRmlyZWZveCdzIFBJUCAocGljdHVyZSBpbiBwaWN0dXJlKSB3aW5kb3cgaXMgbm93IGRpc3BsYXllZCBvbiB0aGUgb3ZlcnZpZXcgc2NyZWVuXG5cbkFsbCBtb2RpZmljYXRpb25zIGNhbiBiZSBkaXNhYmxlZCBpbiB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MuXG5cbkFUVEVOVElPTiFcbkFmdGVyIGV4dGVuc2lvbiB1cGRhdGUsIGdub21lLXNoZWxsIHJlc3RhcnQgaXMgcmVxdWlyZWQ6XG5YMTE6IEFsdCtGMiA9PiByXG5XYXlsYW5kOiBsb2dvdXQgPT4gbG9naW4iLAogICJuYW1lIjogIkdub21lIDR4IFVJIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS11aS10dW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLXVpLXR1bmUiLAogICJ1dWlkIjogImdub21lLXVpLXR1bmVAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1712psni5pnqi99pgk27aan3iw5v6z8pv7qszgjkwl6ckzjijcnx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLzQxLzQyJ3MgT3ZlcnZpZXcgVUkgdG8gbWFrZSBpdCBtb3JlIHVzYWJsZS5cblxuQ2hhbmdlczpcbi0gU2VhcmNoIHRleHRib3ggaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYW5kIHNob3duIG9ubHkgd2hlbiB1c2VyIGJlZ2lucyB0byB0eXBlLXRvLXNlYXJjaFxuLSBTY2FsZSBvZiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGluY3JlYXNlZCAyeFxuLSBSZXN0b3JlcyB3YWxscGFwZXIgb24gd29ya3NwYWNlcycgdGh1bWJuYWlscy4gTm8gbW9yZSBncmF5IGJhY2tncm91bmRcbi0gU2hvdyB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGV2ZW4gd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSB3b3Jrc3BhY2Vcbi0gRmlyZWZveCdzIFBJUCAocGljdHVyZSBpbiBwaWN0dXJlKSB3aW5kb3cgaXMgbm93IGRpc3BsYXllZCBvbiB0aGUgb3ZlcnZpZXcgc2NyZWVuXG5cbkFsbCBtb2RpZmljYXRpb25zIGNhbiBiZSBkaXNhYmxlZCBpbiB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MuXG5cbkFUVEVOVElPTiFcbkFmdGVyIGV4dGVuc2lvbiB1cGRhdGUsIGdub21lLXNoZWxsIHJlc3RhcnQgaXMgcmVxdWlyZWQ6XG5YMTE6IEFsdCtGMiA9PiByXG5XYXlsYW5kOiBsb2dvdXQgPT4gbG9naW4iLAogICJuYW1lIjogIkdub21lIDR4IFVJIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS11aS10dW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLXVpLXR1bmUiLAogICJ1dWlkIjogImdub21lLXVpLXR1bmVAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "1712psni5pnqi99pgk27aan3iw5v6z8pv7qszgjkwl6ckzjijcnx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLzQxLzQyJ3MgT3ZlcnZpZXcgVUkgdG8gbWFrZSBpdCBtb3JlIHVzYWJsZS5cblxuQ2hhbmdlczpcbi0gU2VhcmNoIHRleHRib3ggaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYW5kIHNob3duIG9ubHkgd2hlbiB1c2VyIGJlZ2lucyB0byB0eXBlLXRvLXNlYXJjaFxuLSBTY2FsZSBvZiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGluY3JlYXNlZCAyeFxuLSBSZXN0b3JlcyB3YWxscGFwZXIgb24gd29ya3NwYWNlcycgdGh1bWJuYWlscy4gTm8gbW9yZSBncmF5IGJhY2tncm91bmRcbi0gU2hvdyB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGV2ZW4gd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSB3b3Jrc3BhY2Vcbi0gRmlyZWZveCdzIFBJUCAocGljdHVyZSBpbiBwaWN0dXJlKSB3aW5kb3cgaXMgbm93IGRpc3BsYXllZCBvbiB0aGUgb3ZlcnZpZXcgc2NyZWVuXG5cbkFsbCBtb2RpZmljYXRpb25zIGNhbiBiZSBkaXNhYmxlZCBpbiB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MuXG5cbkFUVEVOVElPTiFcbkFmdGVyIGV4dGVuc2lvbiB1cGRhdGUsIGdub21lLXNoZWxsIHJlc3RhcnQgaXMgcmVxdWlyZWQ6XG5YMTE6IEFsdCtGMiA9PiByXG5XYXlsYW5kOiBsb2dvdXQgPT4gbG9naW4iLAogICJuYW1lIjogIkdub21lIDR4IFVJIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS11aS10dW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLXVpLXR1bmUiLAogICJ1dWlkIjogImdub21lLXVpLXR1bmVAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "monitor-window-switcher@thefungusrocket.com", "name": "Monitor window switcher", "pname": "monitor-window-switcher", "description": "Improves the window switcher on dual (or more) monitor setups", "link": "https://extensions.gnome.org/extension/4164/monitor-window-switcher/", "shell_version_map": {"38": {"version": "6", "sha256": "0pazjbi0aikpnvnfxyamqy70xi1xclydyxdkf908c6ybwnc5956z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmVzIHRoZSB3aW5kb3cgc3dpdGNoZXIgb24gZHVhbCAob3IgbW9yZSkgbW9uaXRvciBzZXR1cHMiLAogICJuYW1lIjogIk1vbml0b3Igd2luZG93IHN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZWR6ZXBwZWxpbi9tb25pdG9yLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAibW9uaXRvci13aW5kb3ctc3dpdGNoZXJAdGhlZnVuZ3Vzcm9ja2V0LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "0pazjbi0aikpnvnfxyamqy70xi1xclydyxdkf908c6ybwnc5956z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmVzIHRoZSB3aW5kb3cgc3dpdGNoZXIgb24gZHVhbCAob3IgbW9yZSkgbW9uaXRvciBzZXR1cHMiLAogICJuYW1lIjogIk1vbml0b3Igd2luZG93IHN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZWR6ZXBwZWxpbi9tb25pdG9yLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAibW9uaXRvci13aW5kb3ctc3dpdGNoZXJAdGhlZnVuZ3Vzcm9ja2V0LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0pazjbi0aikpnvnfxyamqy70xi1xclydyxdkf908c6ybwnc5956z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmVzIHRoZSB3aW5kb3cgc3dpdGNoZXIgb24gZHVhbCAob3IgbW9yZSkgbW9uaXRvciBzZXR1cHMiLAogICJuYW1lIjogIk1vbml0b3Igd2luZG93IHN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZWR6ZXBwZWxpbi9tb25pdG9yLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAibW9uaXRvci13aW5kb3ctc3dpdGNoZXJAdGhlZnVuZ3Vzcm9ja2V0LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"uuid": "custom-hot-corners-extended@G-dH.github.com", "name": "Custom Hot Corners - Extended", "pname": "custom-hot-corners-extended", "description": "Give a function to any corner or edge of your monitors and expand your keyboard's capabilities. Mouse pointer pressure, clicks and scrolls over the corners/edges or keyboard shortcuts can trigger any of dozens of built-in actions or your own shell commands.\nThis extension is a big collection of actions that lets you navigate and control the Gnome Shell environment and windows and launch applications and scripts not only through the corners and edges of your monitors, but also using the custom keyboard shortcuts.\nSignificant part of available actions are visual adjustments (contrast, brightness, opacity) and color filters (red, green, desaturate, lightness and color inversions) , including correction filters for colorblind users and cb simulation filters for developers.\n\nRestart your Gnome Shell after each update of the extension to load new code, and reload this site to get rid of the error message, before you post a bug report.\nPlease report bugs/issues on GitHub linked below and add output from these two commands:\njournalctl /usr/bin/gnome-shell --since \"2 days ago\" | grep corners-extended\njournalctl /usr/bin/gjs --since \"2 days ago\" | grep corners-extended\n\nkeywords: overview, app grid, command, brightness, contrast, transparent, opacity, color effect, invert lightness, color tint, color blind filter, simulation, desaturate, night lights, dark theme, volume, mute, magnifier, zoom, screen keyboard, reader, large text, force close, kill -9, show desktop, reorder workspace, window thumbnail / preview, looking glass, custom menu, window, workspace, switcher, hide panel", "link": "https://extensions.gnome.org/extension/4167/custom-hot-corners-extended/", "shell_version_map": {"38": {"version": "11", "sha256": "101rw54gg991bmr7ggkl5km4r5h0bbjdh9861kji84dl4s9s9bf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQncyBjYXBhYmlsaXRpZXMuIE1vdXNlIHBvaW50ZXIgcHJlc3N1cmUsIGNsaWNrcyBhbmQgc2Nyb2xscyBvdmVyIHRoZSBjb3JuZXJzL2VkZ2VzIG9yIGtleWJvYXJkIHNob3J0Y3V0cyBjYW4gdHJpZ2dlciBhbnkgb2YgZG96ZW5zIG9mIGJ1aWx0LWluIGFjdGlvbnMgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGJpZyBjb2xsZWN0aW9uIG9mIGFjdGlvbnMgdGhhdCBsZXRzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB0aGUgR25vbWUgU2hlbGwgZW52aXJvbm1lbnQgYW5kIHdpbmRvd3MgYW5kIGxhdW5jaCBhcHBsaWNhdGlvbnMgYW5kIHNjcmlwdHMgbm90IG9ubHkgdGhyb3VnaCB0aGUgY29ybmVycyBhbmQgZWRnZXMgb2YgeW91ciBtb25pdG9ycywgYnV0IGFsc28gdXNpbmcgdGhlIGN1c3RvbSBrZXlib2FyZCBzaG9ydGN1dHMuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gR2l0SHViIGxpbmtlZCBiZWxvdyBhbmQgYWRkIG91dHB1dCBmcm9tIHRoZXNlIHR3byBjb21tYW5kczpcbmpvdXJuYWxjdGwgL3Vzci9iaW4vZ25vbWUtc2hlbGwgLS1zaW5jZSBcIjIgZGF5cyBhZ29cIiB8IGdyZXAgY29ybmVycy1leHRlbmRlZFxuam91cm5hbGN0bCAvdXNyL2Jpbi9nanMgLS1zaW5jZSBcIjIgZGF5cyBhZ29cIiB8IGdyZXAgY29ybmVycy1leHRlbmRlZFxuXG5rZXl3b3Jkczogb3ZlcnZpZXcsIGFwcCBncmlkLCBjb21tYW5kLCBicmlnaHRuZXNzLCBjb250cmFzdCwgdHJhbnNwYXJlbnQsIG9wYWNpdHksIGNvbG9yIGVmZmVjdCwgaW52ZXJ0IGxpZ2h0bmVzcywgY29sb3IgdGludCwgY29sb3IgYmxpbmQgZmlsdGVyLCBzaW11bGF0aW9uLCBkZXNhdHVyYXRlLCBuaWdodCBsaWdodHMsIGRhcmsgdGhlbWUsIHZvbHVtZSwgbXV0ZSwgbWFnbmlmaWVyLCB6b29tLCBzY3JlZW4ga2V5Ym9hcmQsIHJlYWRlciwgbGFyZ2UgdGV4dCwgZm9yY2UgY2xvc2UsIGtpbGwgLTksIHNob3cgZGVza3RvcCwgcmVvcmRlciB3b3Jrc3BhY2UsIHdpbmRvdyB0aHVtYm5haWwgLyBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzL3RyZWUvZ2RoIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "101rw54gg991bmr7ggkl5km4r5h0bbjdh9861kji84dl4s9s9bf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQncyBjYXBhYmlsaXRpZXMuIE1vdXNlIHBvaW50ZXIgcHJlc3N1cmUsIGNsaWNrcyBhbmQgc2Nyb2xscyBvdmVyIHRoZSBjb3JuZXJzL2VkZ2VzIG9yIGtleWJvYXJkIHNob3J0Y3V0cyBjYW4gdHJpZ2dlciBhbnkgb2YgZG96ZW5zIG9mIGJ1aWx0LWluIGFjdGlvbnMgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGJpZyBjb2xsZWN0aW9uIG9mIGFjdGlvbnMgdGhhdCBsZXRzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB0aGUgR25vbWUgU2hlbGwgZW52aXJvbm1lbnQgYW5kIHdpbmRvd3MgYW5kIGxhdW5jaCBhcHBsaWNhdGlvbnMgYW5kIHNjcmlwdHMgbm90IG9ubHkgdGhyb3VnaCB0aGUgY29ybmVycyBhbmQgZWRnZXMgb2YgeW91ciBtb25pdG9ycywgYnV0IGFsc28gdXNpbmcgdGhlIGN1c3RvbSBrZXlib2FyZCBzaG9ydGN1dHMuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gR2l0SHViIGxpbmtlZCBiZWxvdyBhbmQgYWRkIG91dHB1dCBmcm9tIHRoZXNlIHR3byBjb21tYW5kczpcbmpvdXJuYWxjdGwgL3Vzci9iaW4vZ25vbWUtc2hlbGwgLS1zaW5jZSBcIjIgZGF5cyBhZ29cIiB8IGdyZXAgY29ybmVycy1leHRlbmRlZFxuam91cm5hbGN0bCAvdXNyL2Jpbi9nanMgLS1zaW5jZSBcIjIgZGF5cyBhZ29cIiB8IGdyZXAgY29ybmVycy1leHRlbmRlZFxuXG5rZXl3b3Jkczogb3ZlcnZpZXcsIGFwcCBncmlkLCBjb21tYW5kLCBicmlnaHRuZXNzLCBjb250cmFzdCwgdHJhbnNwYXJlbnQsIG9wYWNpdHksIGNvbG9yIGVmZmVjdCwgaW52ZXJ0IGxpZ2h0bmVzcywgY29sb3IgdGludCwgY29sb3IgYmxpbmQgZmlsdGVyLCBzaW11bGF0aW9uLCBkZXNhdHVyYXRlLCBuaWdodCBsaWdodHMsIGRhcmsgdGhlbWUsIHZvbHVtZSwgbXV0ZSwgbWFnbmlmaWVyLCB6b29tLCBzY3JlZW4ga2V5Ym9hcmQsIHJlYWRlciwgbGFyZ2UgdGV4dCwgZm9yY2UgY2xvc2UsIGtpbGwgLTksIHNob3cgZGVza3RvcCwgcmVvcmRlciB3b3Jrc3BhY2UsIHdpbmRvdyB0aHVtYm5haWwgLyBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzL3RyZWUvZ2RoIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "101rw54gg991bmr7ggkl5km4r5h0bbjdh9861kji84dl4s9s9bf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQncyBjYXBhYmlsaXRpZXMuIE1vdXNlIHBvaW50ZXIgcHJlc3N1cmUsIGNsaWNrcyBhbmQgc2Nyb2xscyBvdmVyIHRoZSBjb3JuZXJzL2VkZ2VzIG9yIGtleWJvYXJkIHNob3J0Y3V0cyBjYW4gdHJpZ2dlciBhbnkgb2YgZG96ZW5zIG9mIGJ1aWx0LWluIGFjdGlvbnMgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGJpZyBjb2xsZWN0aW9uIG9mIGFjdGlvbnMgdGhhdCBsZXRzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB0aGUgR25vbWUgU2hlbGwgZW52aXJvbm1lbnQgYW5kIHdpbmRvd3MgYW5kIGxhdW5jaCBhcHBsaWNhdGlvbnMgYW5kIHNjcmlwdHMgbm90IG9ubHkgdGhyb3VnaCB0aGUgY29ybmVycyBhbmQgZWRnZXMgb2YgeW91ciBtb25pdG9ycywgYnV0IGFsc28gdXNpbmcgdGhlIGN1c3RvbSBrZXlib2FyZCBzaG9ydGN1dHMuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gR2l0SHViIGxpbmtlZCBiZWxvdyBhbmQgYWRkIG91dHB1dCBmcm9tIHRoZXNlIHR3byBjb21tYW5kczpcbmpvdXJuYWxjdGwgL3Vzci9iaW4vZ25vbWUtc2hlbGwgLS1zaW5jZSBcIjIgZGF5cyBhZ29cIiB8IGdyZXAgY29ybmVycy1leHRlbmRlZFxuam91cm5hbGN0bCAvdXNyL2Jpbi9nanMgLS1zaW5jZSBcIjIgZGF5cyBhZ29cIiB8IGdyZXAgY29ybmVycy1leHRlbmRlZFxuXG5rZXl3b3Jkczogb3ZlcnZpZXcsIGFwcCBncmlkLCBjb21tYW5kLCBicmlnaHRuZXNzLCBjb250cmFzdCwgdHJhbnNwYXJlbnQsIG9wYWNpdHksIGNvbG9yIGVmZmVjdCwgaW52ZXJ0IGxpZ2h0bmVzcywgY29sb3IgdGludCwgY29sb3IgYmxpbmQgZmlsdGVyLCBzaW11bGF0aW9uLCBkZXNhdHVyYXRlLCBuaWdodCBsaWdodHMsIGRhcmsgdGhlbWUsIHZvbHVtZSwgbXV0ZSwgbWFnbmlmaWVyLCB6b29tLCBzY3JlZW4ga2V5Ym9hcmQsIHJlYWRlciwgbGFyZ2UgdGV4dCwgZm9yY2UgY2xvc2UsIGtpbGwgLTksIHNob3cgZGVza3RvcCwgcmVvcmRlciB3b3Jrc3BhY2UsIHdpbmRvdyB0aHVtYm5haWwgLyBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzL3RyZWUvZ2RoIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}}} +, {"uuid": "custom-hot-corners-extended@G-dH.github.com", "name": "Custom Hot Corners - Extended", "pname": "custom-hot-corners-extended", "description": "Give a function to any corner or edge of your monitors and expand your keyboard capabilities.\nMouse pointer pressure, clicks and scrolls over the corners/edges or keyboard shortcuts can trigger any of dozens of built-in actions that helps you navigate and control your desktop environment or your own shell commands.\n\nThis extension is a big collection of actions that allows you navigate and control the Gnome Shell environment and windows and launch applications and scripts not only through the corners and edges of your monitors, but also using the custom keyboard shortcuts.\nSignificant part of available actions are visual adjustments (contrast, brightness, opacity) and color filters (red, green, desaturate, lightness and color inversions) , including correction filters for colorblind users and cb simulation filters for developers.\n\nRestart your Gnome Shell after each update of the extension to load new code, and reload this site to get rid of the error message, before you post a bug report.\nPlease report bugs/issues on GitHub linked below.\n\nkeywords: overview, app grid, command, brightness, contrast, transparent, opacity, color effect, invert lightness, color tint, color blind filter, simulation, desaturate, night lights, dark theme, volume, mute, magnifier, zoom, screen keyboard, reader, large text, force close, kill -9, show desktop, reorder workspace, window thumbnail / preview, looking glass, custom menu, window, workspace, switcher, hide panel", "link": "https://extensions.gnome.org/extension/4167/custom-hot-corners-extended/", "shell_version_map": {"38": {"version": "15", "sha256": "1sx830zkf5w00d9j5kw1l8hk3mpm35ifqd250jbhaag0b3j2bqy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3Iga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgb2YgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgYmlnIGNvbGxlY3Rpb24gb2YgYWN0aW9ucyB0aGF0IGFsbG93cyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgdGhlIEdub21lIFNoZWxsIGVudmlyb25tZW50IGFuZCB3aW5kb3dzIGFuZCBsYXVuY2ggYXBwbGljYXRpb25zIGFuZCBzY3JpcHRzIG5vdCBvbmx5IHRocm91Z2ggdGhlIGNvcm5lcnMgYW5kIGVkZ2VzIG9mIHlvdXIgbW9uaXRvcnMsIGJ1dCBhbHNvIHVzaW5nIHRoZSBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzLlxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIEdpdEh1YiBsaW5rZWQgYmVsb3cuXG5cbmtleXdvcmRzOiBvdmVydmlldywgYXBwIGdyaWQsIGNvbW1hbmQsIGJyaWdodG5lc3MsIGNvbnRyYXN0LCB0cmFuc3BhcmVudCwgb3BhY2l0eSwgY29sb3IgZWZmZWN0LCBpbnZlcnQgbGlnaHRuZXNzLCBjb2xvciB0aW50LCBjb2xvciBibGluZCBmaWx0ZXIsIHNpbXVsYXRpb24sIGRlc2F0dXJhdGUsIG5pZ2h0IGxpZ2h0cywgZGFyayB0aGVtZSwgdm9sdW1lLCBtdXRlLCBtYWduaWZpZXIsIHpvb20sIHNjcmVlbiBrZXlib2FyZCwgcmVhZGVyLCBsYXJnZSB0ZXh0LCBmb3JjZSBjbG9zZSwga2lsbCAtOSwgc2hvdyBkZXNrdG9wLCByZW9yZGVyIHdvcmtzcGFjZSwgd2luZG93IHRodW1ibmFpbCAvIHByZXZpZXcsIGxvb2tpbmcgZ2xhc3MsIGN1c3RvbSBtZW51LCB3aW5kb3csIHdvcmtzcGFjZSwgc3dpdGNoZXIsIGhpZGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzL3RyZWUvZ2RoIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "40": {"version": "15", "sha256": "1sx830zkf5w00d9j5kw1l8hk3mpm35ifqd250jbhaag0b3j2bqy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3Iga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgb2YgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgYmlnIGNvbGxlY3Rpb24gb2YgYWN0aW9ucyB0aGF0IGFsbG93cyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgdGhlIEdub21lIFNoZWxsIGVudmlyb25tZW50IGFuZCB3aW5kb3dzIGFuZCBsYXVuY2ggYXBwbGljYXRpb25zIGFuZCBzY3JpcHRzIG5vdCBvbmx5IHRocm91Z2ggdGhlIGNvcm5lcnMgYW5kIGVkZ2VzIG9mIHlvdXIgbW9uaXRvcnMsIGJ1dCBhbHNvIHVzaW5nIHRoZSBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzLlxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIEdpdEh1YiBsaW5rZWQgYmVsb3cuXG5cbmtleXdvcmRzOiBvdmVydmlldywgYXBwIGdyaWQsIGNvbW1hbmQsIGJyaWdodG5lc3MsIGNvbnRyYXN0LCB0cmFuc3BhcmVudCwgb3BhY2l0eSwgY29sb3IgZWZmZWN0LCBpbnZlcnQgbGlnaHRuZXNzLCBjb2xvciB0aW50LCBjb2xvciBibGluZCBmaWx0ZXIsIHNpbXVsYXRpb24sIGRlc2F0dXJhdGUsIG5pZ2h0IGxpZ2h0cywgZGFyayB0aGVtZSwgdm9sdW1lLCBtdXRlLCBtYWduaWZpZXIsIHpvb20sIHNjcmVlbiBrZXlib2FyZCwgcmVhZGVyLCBsYXJnZSB0ZXh0LCBmb3JjZSBjbG9zZSwga2lsbCAtOSwgc2hvdyBkZXNrdG9wLCByZW9yZGVyIHdvcmtzcGFjZSwgd2luZG93IHRodW1ibmFpbCAvIHByZXZpZXcsIGxvb2tpbmcgZ2xhc3MsIGN1c3RvbSBtZW51LCB3aW5kb3csIHdvcmtzcGFjZSwgc3dpdGNoZXIsIGhpZGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzL3RyZWUvZ2RoIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "1sx830zkf5w00d9j5kw1l8hk3mpm35ifqd250jbhaag0b3j2bqy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3Iga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgb2YgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgYmlnIGNvbGxlY3Rpb24gb2YgYWN0aW9ucyB0aGF0IGFsbG93cyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgdGhlIEdub21lIFNoZWxsIGVudmlyb25tZW50IGFuZCB3aW5kb3dzIGFuZCBsYXVuY2ggYXBwbGljYXRpb25zIGFuZCBzY3JpcHRzIG5vdCBvbmx5IHRocm91Z2ggdGhlIGNvcm5lcnMgYW5kIGVkZ2VzIG9mIHlvdXIgbW9uaXRvcnMsIGJ1dCBhbHNvIHVzaW5nIHRoZSBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzLlxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIEdpdEh1YiBsaW5rZWQgYmVsb3cuXG5cbmtleXdvcmRzOiBvdmVydmlldywgYXBwIGdyaWQsIGNvbW1hbmQsIGJyaWdodG5lc3MsIGNvbnRyYXN0LCB0cmFuc3BhcmVudCwgb3BhY2l0eSwgY29sb3IgZWZmZWN0LCBpbnZlcnQgbGlnaHRuZXNzLCBjb2xvciB0aW50LCBjb2xvciBibGluZCBmaWx0ZXIsIHNpbXVsYXRpb24sIGRlc2F0dXJhdGUsIG5pZ2h0IGxpZ2h0cywgZGFyayB0aGVtZSwgdm9sdW1lLCBtdXRlLCBtYWduaWZpZXIsIHpvb20sIHNjcmVlbiBrZXlib2FyZCwgcmVhZGVyLCBsYXJnZSB0ZXh0LCBmb3JjZSBjbG9zZSwga2lsbCAtOSwgc2hvdyBkZXNrdG9wLCByZW9yZGVyIHdvcmtzcGFjZSwgd2luZG93IHRodW1ibmFpbCAvIHByZXZpZXcsIGxvb2tpbmcgZ2xhc3MsIGN1c3RvbSBtZW51LCB3aW5kb3csIHdvcmtzcGFjZSwgc3dpdGNoZXIsIGhpZGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzL3RyZWUvZ2RoIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "15", "sha256": "1sx830zkf5w00d9j5kw1l8hk3mpm35ifqd250jbhaag0b3j2bqy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3Iga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgb2YgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQgb3IgeW91ciBvd24gc2hlbGwgY29tbWFuZHMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgYmlnIGNvbGxlY3Rpb24gb2YgYWN0aW9ucyB0aGF0IGFsbG93cyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgdGhlIEdub21lIFNoZWxsIGVudmlyb25tZW50IGFuZCB3aW5kb3dzIGFuZCBsYXVuY2ggYXBwbGljYXRpb25zIGFuZCBzY3JpcHRzIG5vdCBvbmx5IHRocm91Z2ggdGhlIGNvcm5lcnMgYW5kIGVkZ2VzIG9mIHlvdXIgbW9uaXRvcnMsIGJ1dCBhbHNvIHVzaW5nIHRoZSBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzLlxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIEdpdEh1YiBsaW5rZWQgYmVsb3cuXG5cbmtleXdvcmRzOiBvdmVydmlldywgYXBwIGdyaWQsIGNvbW1hbmQsIGJyaWdodG5lc3MsIGNvbnRyYXN0LCB0cmFuc3BhcmVudCwgb3BhY2l0eSwgY29sb3IgZWZmZWN0LCBpbnZlcnQgbGlnaHRuZXNzLCBjb2xvciB0aW50LCBjb2xvciBibGluZCBmaWx0ZXIsIHNpbXVsYXRpb24sIGRlc2F0dXJhdGUsIG5pZ2h0IGxpZ2h0cywgZGFyayB0aGVtZSwgdm9sdW1lLCBtdXRlLCBtYWduaWZpZXIsIHpvb20sIHNjcmVlbiBrZXlib2FyZCwgcmVhZGVyLCBsYXJnZSB0ZXh0LCBmb3JjZSBjbG9zZSwga2lsbCAtOSwgc2hvdyBkZXNrdG9wLCByZW9yZGVyIHdvcmtzcGFjZSwgd2luZG93IHRodW1ibmFpbCAvIHByZXZpZXcsIGxvb2tpbmcgZ2xhc3MsIGN1c3RvbSBtZW51LCB3aW5kb3csIHdvcmtzcGFjZSwgc3dpdGNoZXIsIGhpZGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzL3RyZWUvZ2RoIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}}} , {"uuid": "hass-gshell@geoph9-on-github", "name": "Home Assistant Extension", "pname": "home-assistant-extension", "description": "A simple gnome shell extension for Home Assistant. Check the README on github for additional help!\n\nMain points:\n- You need to provide the url of your hass, a long live access token obtained from your profile page (on your hass web instance) and the entity ids of the entities you want to have as togglable.\n- In order to add some local temperature/humidity sensor, you may also provide a temperature and/or a humidity entity id (which should match the corresponding ids of your hass instance).", "link": "https://extensions.gnome.org/extension/4170/home-assistant-extension/", "shell_version_map": {"38": {"version": "3", "sha256": "04p2hvxyyc1zv441sv0l1dcxbdvzqp46mii3zvw0nhq8jg5pz8rr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgIm5hbWUiOiAiSG9tZSBBc3Npc3RhbnQgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhhc3MtZGF0YSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dlb3BoOS9oYXNzLWdzaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImhhc3MtZ3NoZWxsQGdlb3BoOS1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "6", "sha256": "1wajx49ci9146wi10z2nvhgc1iw7mfqp8a8z5gr708f90vfy93lc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgIm5hbWUiOiAiSG9tZSBBc3Npc3RhbnQgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhhc3MtZGF0YSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1wajx49ci9146wi10z2nvhgc1iw7mfqp8a8z5gr708f90vfy93lc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgIm5hbWUiOiAiSG9tZSBBc3Npc3RhbnQgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhhc3MtZGF0YSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "clear-top-bar@superterran.net", "name": "Clear Top Bar", "pname": "clear-top-bar", "description": "Fully transparent topbar, pairs with the zhanghai transparent top bar extension to make bar opaque when window is maximized", "link": "https://extensions.gnome.org/extension/4173/clear-top-bar/", "shell_version_map": {"40": {"version": "5", "sha256": "12msvdg82rj34v338vsxqimy1p35isvl4db8k1sjq23ln1b6jak2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IHRyYW5zcGFyZW50IHRvcGJhciwgcGFpcnMgd2l0aCB0aGUgemhhbmdoYWkgdHJhbnNwYXJlbnQgdG9wIGJhciBleHRlbnNpb24gdG8gbWFrZSBiYXIgb3BhcXVlIHdoZW4gd2luZG93IGlzIG1heGltaXplZCIsCiAgIm5hbWUiOiAiQ2xlYXIgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3VwZXJ0ZXJyYW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsZWFyLXRvcC1iYXIiLAogICJ1dWlkIjogImNsZWFyLXRvcC1iYXJAc3VwZXJ0ZXJyYW4ubmV0IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "12msvdg82rj34v338vsxqimy1p35isvl4db8k1sjq23ln1b6jak2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IHRyYW5zcGFyZW50IHRvcGJhciwgcGFpcnMgd2l0aCB0aGUgemhhbmdoYWkgdHJhbnNwYXJlbnQgdG9wIGJhciBleHRlbnNpb24gdG8gbWFrZSBiYXIgb3BhcXVlIHdoZW4gd2luZG93IGlzIG1heGltaXplZCIsCiAgIm5hbWUiOiAiQ2xlYXIgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3VwZXJ0ZXJyYW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsZWFyLXRvcC1iYXIiLAogICJ1dWlkIjogImNsZWFyLXRvcC1iYXJAc3VwZXJ0ZXJyYW4ubmV0IiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "systemd-manager@hardpixel.eu", "name": "Systemd Manager", "pname": "systemd-manager", "description": "Toggle systemd services on/off from a popup menu in the top gnome panel. Can be used to start services like apache2, mysql, postgres. It uses `pkexec' to run `sytemctl'. If you want to start services without entering a password you have to polkit policy file. An example policy file can be found in the github repository.", "link": "https://extensions.gnome.org/extension/4174/systemd-manager/", "shell_version_map": {"38": {"version": "5", "sha256": "1df0xz4m2ysqk3bk7kqjjh04qwsffwc04jgihmid4whd3n2kglk5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL3N5c3RlbWQtbWFuYWdlciIsCiAgInV1aWQiOiAic3lzdGVtZC1tYW5hZ2VyQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "1df0xz4m2ysqk3bk7kqjjh04qwsffwc04jgihmid4whd3n2kglk5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL3N5c3RlbWQtbWFuYWdlciIsCiAgInV1aWQiOiAic3lzdGVtZC1tYW5hZ2VyQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1df0xz4m2ysqk3bk7kqjjh04qwsffwc04jgihmid4whd3n2kglk5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFyZHBpeGVsL3N5c3RlbWQtbWFuYWdlciIsCiAgInV1aWQiOiAic3lzdGVtZC1tYW5hZ2VyQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiA1Cn0="}}} @@ -485,24 +488,24 @@ , {"uuid": "dash-to-plank@hardpixel.eu", "name": "Dash to Plank", "pname": "dash-to-plank", "description": "GNOME Shell integration for Plank, the simplest dock on the planet. To use this extension, you must have Plank installed on your system.\n\nThis extension depends on Plank. To install it:\n- Debian/Ubuntu: apt install plank\n- Fedora/RHEL: dnf install plank\n- Arch: pacman -S plank\n\n** This extension does NOT WORK on WAYLAND.", "link": "https://extensions.gnome.org/extension/4198/dash-to-plank/", "shell_version_map": {"38": {"version": "12", "sha256": "14pjbqjgg9aksjgk6mm1hkxn08qpzxiimy5qsfcrkjp31qjldan3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvZGFzaC10by1wbGFuayIsCiAgInV1aWQiOiAiZGFzaC10by1wbGFua0BoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "40": {"version": "12", "sha256": "14pjbqjgg9aksjgk6mm1hkxn08qpzxiimy5qsfcrkjp31qjldan3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvZGFzaC10by1wbGFuayIsCiAgInV1aWQiOiAiZGFzaC10by1wbGFua0BoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "14pjbqjgg9aksjgk6mm1hkxn08qpzxiimy5qsfcrkjp31qjldan3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvZGFzaC10by1wbGFuayIsCiAgInV1aWQiOiAiZGFzaC10by1wbGFua0BoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} , {"uuid": "rrc@ogarcia.me", "name": "Remove Rounded Corners", "pname": "remove-rounded-corners", "description": "Removes rounded corners from main panel or top bar", "link": "https://extensions.gnome.org/extension/4201/remove-rounded-corners/", "shell_version_map": {"40": {"version": "5", "sha256": "1rj9wxa0mazkr29ggwqx0r043cskpw7r4clgvpiw18psrn148c8f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgcm91bmRlZCBjb3JuZXJzIGZyb20gbWFpbiBwYW5lbCBvciB0b3AgYmFyIiwKICAibmFtZSI6ICJSZW1vdmUgUm91bmRlZCBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vZ2FyY2lhL3JlbW92ZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogInJyY0BvZ2FyY2lhLm1lIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1rj9wxa0mazkr29ggwqx0r043cskpw7r4clgvpiw18psrn148c8f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgcm91bmRlZCBjb3JuZXJzIGZyb20gbWFpbiBwYW5lbCBvciB0b3AgYmFyIiwKICAibmFtZSI6ICJSZW1vdmUgUm91bmRlZCBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vZ2FyY2lhL3JlbW92ZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogInJyY0BvZ2FyY2lhLm1lIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "private-switcher@dziban.com", "name": "Private Switcher", "pname": "private-switcher", "description": "Simple extension that allows you do have independent app switcher (alt-tab) for each workspace.", "link": "https://extensions.gnome.org/extension/4204/private-switcher/", "shell_version_map": {"38": {"version": "1", "sha256": "1awjnic8zca2f6viah2l4ai0pyfdyisxna9ys1zzpya11rwj6jk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBhbGxvd3MgeW91IGRvIGhhdmUgaW5kZXBlbmRlbnQgYXBwIHN3aXRjaGVyIChhbHQtdGFiKSBmb3IgZWFjaCB3b3Jrc3BhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJpdmF0ZS1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiUHJpdmF0ZSBTd2l0Y2hlciIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcml2YXRlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tIiwKICAidXVpZCI6ICJwcml2YXRlLXN3aXRjaGVyQGR6aWJhbi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "1awjnic8zca2f6viah2l4ai0pyfdyisxna9ys1zzpya11rwj6jk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBhbGxvd3MgeW91IGRvIGhhdmUgaW5kZXBlbmRlbnQgYXBwIHN3aXRjaGVyIChhbHQtdGFiKSBmb3IgZWFjaCB3b3Jrc3BhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJpdmF0ZS1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiUHJpdmF0ZSBTd2l0Y2hlciIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcml2YXRlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tIiwKICAidXVpZCI6ICJwcml2YXRlLXN3aXRjaGVyQGR6aWJhbi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "colosseum@sereneblue", "name": "Colosseum", "pname": "colosseum", "description": "View live scores for your favorite sports teams.", "link": "https://extensions.gnome.org/extension/4207/colosseum/", "shell_version_map": {"40": {"version": "6", "sha256": "1gpv6d4jxsx842wjlj7g9fz870jl9fcwp0fhxbrsgp8jhk6jnpcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1gpv6d4jxsx842wjlj7g9fz870jl9fcwp0fhxbrsgp8jhk6jnpcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXJlbmVibHVlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvc3NldW0iLAogICJ1dWlkIjogImNvbG9zc2V1bUBzZXJlbmVibHVlIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} +, {"uuid": "colosseum@sereneblue", "name": "Colosseum", "pname": "colosseum", "description": "View live scores for your favorite sports teams.", "link": "https://extensions.gnome.org/extension/4207/colosseum/", "shell_version_map": {"40": {"version": "9", "sha256": "1lkccmr32l58pb7fb566jy3wg1v7hr2x0w6zdwv5ys8fxgrjaq6r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY29sb3NzZXVtIiwKICAidXVpZCI6ICJjb2xvc3NldW1Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "1lkccmr32l58pb7fb566jy3wg1v7hr2x0w6zdwv5ys8fxgrjaq6r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY29sb3NzZXVtIiwKICAidXVpZCI6ICJjb2xvc3NldW1Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "1lkccmr32l58pb7fb566jy3wg1v7hr2x0w6zdwv5ys8fxgrjaq6r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2VyZW5lYmx1ZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY29sb3NzZXVtIiwKICAidXVpZCI6ICJjb2xvc3NldW1Ac2VyZW5lYmx1ZSIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "gnome-plat-workspace@stonegate.me", "name": "Gnome 40 Flat Workspace", "pname": "gnome-40-plat-workspace", "description": "Remove shadow for workspace background in gnome 40.\nSource code https://github.com/stonega/gnome-extension-flat-workspace", "link": "https://extensions.gnome.org/extension/4215/gnome-40-plat-workspace/", "shell_version_map": {"40": {"version": "3", "sha256": "0ly2dab9c0l7w1axnqs7xk2szd5jm2ifgniz2snw5mwkr5pw76nb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBzaGFkb3cgZm9yIHdvcmtzcGFjZSBiYWNrZ3JvdW5kIGluIGdub21lIDQwLlxuU291cmNlIGNvZGUgaHR0cHM6Ly9naXRodWIuY29tL3N0b25lZ2EvZ25vbWUtZXh0ZW5zaW9uLWZsYXQtd29ya3NwYWNlIiwKICAibmFtZSI6ICJHbm9tZSA0MCBGbGF0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1wbGF0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZ25vbWUtcGxhdC13b3Jrc3BhY2VAc3RvbmVnYXRlLm1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "hotedge@jonathan.jdoda.ca", "name": "Hot Edge", "pname": "hot-edge", "description": "Add a hot edge that activates the overview to the bottom of the screen. This minimizes the pointer travel required to access the dash when using the new GNOME Shell 40 overview layout.\n\nYou can find more documentation at https://github.com/jdoda/hotedge/blob/main/README.md and report issues at https://github.com/jdoda/hotedge/issues .", "link": "https://extensions.gnome.org/extension/4222/hot-edge/", "shell_version_map": {"40": {"version": "8", "sha256": "1ybbjm4m6zix1f762jnhaa4jl15qrlc83m9fcmmsvi9rlqnxnlha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuWW91IGNhbiBmaW5kIG1vcmUgZG9jdW1lbnRhdGlvbiBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9ibG9iL21haW4vUkVBRE1FLm1kIGFuZCByZXBvcnQgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9qZG9kYS9ob3RlZGdlL2lzc3VlcyAuIiwKICAibmFtZSI6ICJIb3QgRWRnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1ybbjm4m6zix1f762jnhaa4jl15qrlc83m9fcmmsvi9rlqnxnlha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuWW91IGNhbiBmaW5kIG1vcmUgZG9jdW1lbnRhdGlvbiBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9ibG9iL21haW4vUkVBRE1FLm1kIGFuZCByZXBvcnQgaXNzdWVzIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9qZG9kYS9ob3RlZGdlL2lzc3VlcyAuIiwKICAibmFtZSI6ICJIb3QgRWRnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiA4Cn0="}}} +, {"uuid": "hotedge@jonathan.jdoda.ca", "name": "Hot Edge", "pname": "hot-edge", "description": "Add a hot edge that activates the overview to the bottom of the screen. This minimizes the pointer travel required to access the dash when using the new GNOME Shell 40 overview layout.\n\nNow with preference dialog!\n\nYou can find more documentation at https://github.com/jdoda/hotedge/blob/main/README.md and report issues at https://github.com/jdoda/hotedge/issues .", "link": "https://extensions.gnome.org/extension/4222/hot-edge/", "shell_version_map": {"40": {"version": "14", "sha256": "0b0l1qfjkql7xzp5qkqixmdr6rmfdz7i7y319qqwn31mwslrc1nl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZG9kYS9ob3RlZGdlIiwKICAidXVpZCI6ICJob3RlZGdlQGpvbmF0aGFuLmpkb2RhLmNhIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "0b0l1qfjkql7xzp5qkqixmdr6rmfdz7i7y319qqwn31mwslrc1nl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZG9kYS9ob3RlZGdlIiwKICAidXVpZCI6ICJob3RlZGdlQGpvbmF0aGFuLmpkb2RhLmNhIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "0b0l1qfjkql7xzp5qkqixmdr6rmfdz7i7y319qqwn31mwslrc1nl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qZG9kYS9ob3RlZGdlIiwKICAidXVpZCI6ICJob3RlZGdlQGpvbmF0aGFuLmpkb2RhLmNhIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "gnome-citeurl-search-provider@raindrum.github.io", "name": "Legal Citation Search", "pname": "gnome-citeurl-search-provider", "description": "This extension lets you look up U.S. state and federal laws and court cases by typing citations (like \"42 USC 1983\" or \"U.S. Constitution Art. I, Sec. 3\") into the search bar.\nBy default, the search supports the U.S. Code and federal constitution, as well as nearly all codified state laws and constitutions, among other sources of law. You can also add more types of citation by following the instructions on the GitHub page.", "link": "https://extensions.gnome.org/extension/4225/gnome-citeurl-search-provider/", "shell_version_map": {"38": {"version": "6", "sha256": "024d98642smciv5n2vc4l2f8rglfrv180paj1g2rrq9k4pvg6yym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IGxvb2sgdXAgVS5TLiBzdGF0ZSBhbmQgZmVkZXJhbCBsYXdzIGFuZCBjb3VydCBjYXNlcyBieSB0eXBpbmcgY2l0YXRpb25zIChsaWtlIFwiNDIgVVNDIDE5ODNcIiBvciBcIlUuUy4gQ29uc3RpdHV0aW9uIEFydC4gSSwgU2VjLiAzXCIpIGludG8gdGhlIHNlYXJjaCBiYXIuXG5CeSBkZWZhdWx0LCB0aGUgc2VhcmNoIHN1cHBvcnRzIHRoZSBVLlMuIENvZGUgYW5kIGZlZGVyYWwgY29uc3RpdHV0aW9uLCBhcyB3ZWxsIGFzIG5lYXJseSBhbGwgY29kaWZpZWQgc3RhdGUgbGF3cyBhbmQgY29uc3RpdHV0aW9ucywgYW1vbmcgb3RoZXIgc291cmNlcyBvZiBsYXcuIFlvdSBjYW4gYWxzbyBhZGQgbW9yZSB0eXBlcyBvZiBjaXRhdGlvbiBieSBmb2xsb3dpbmcgdGhlIGluc3RydWN0aW9ucyBvbiB0aGUgR2l0SHViIHBhZ2UuIiwKICAibmFtZSI6ICJMZWdhbCBDaXRhdGlvbiBTZWFyY2giLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFpbmRydW0vZ25vbWUtY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogImdub21lLWNpdGV1cmwtc2VhcmNoLXByb3ZpZGVyQHJhaW5kcnVtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "024d98642smciv5n2vc4l2f8rglfrv180paj1g2rrq9k4pvg6yym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IGxvb2sgdXAgVS5TLiBzdGF0ZSBhbmQgZmVkZXJhbCBsYXdzIGFuZCBjb3VydCBjYXNlcyBieSB0eXBpbmcgY2l0YXRpb25zIChsaWtlIFwiNDIgVVNDIDE5ODNcIiBvciBcIlUuUy4gQ29uc3RpdHV0aW9uIEFydC4gSSwgU2VjLiAzXCIpIGludG8gdGhlIHNlYXJjaCBiYXIuXG5CeSBkZWZhdWx0LCB0aGUgc2VhcmNoIHN1cHBvcnRzIHRoZSBVLlMuIENvZGUgYW5kIGZlZGVyYWwgY29uc3RpdHV0aW9uLCBhcyB3ZWxsIGFzIG5lYXJseSBhbGwgY29kaWZpZWQgc3RhdGUgbGF3cyBhbmQgY29uc3RpdHV0aW9ucywgYW1vbmcgb3RoZXIgc291cmNlcyBvZiBsYXcuIFlvdSBjYW4gYWxzbyBhZGQgbW9yZSB0eXBlcyBvZiBjaXRhdGlvbiBieSBmb2xsb3dpbmcgdGhlIGluc3RydWN0aW9ucyBvbiB0aGUgR2l0SHViIHBhZ2UuIiwKICAibmFtZSI6ICJMZWdhbCBDaXRhdGlvbiBTZWFyY2giLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFpbmRydW0vZ25vbWUtY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogImdub21lLWNpdGV1cmwtc2VhcmNoLXByb3ZpZGVyQHJhaW5kcnVtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "wireless-hid@chlumskyvaclav.gmail.com", "name": "Wireless HID", "pname": "wireless-hid", "description": "This extension shows the battery of the wireless keyboards, mice, and game controllers in percentages and colors. Multiple devices are supported.", "link": "https://extensions.gnome.org/extension/4228/wireless-hid/", "shell_version_map": {"38": {"version": "4", "sha256": "09qws1w9d6ik18c2fkhwfrxiallx4bq2k6wnlc7d2fvrfdm32kqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "09qws1w9d6ik18c2fkhwfrxiallx4bq2k6wnlc7d2fvrfdm32kqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "09qws1w9d6ik18c2fkhwfrxiallx4bq2k6wnlc7d2fvrfdm32kqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNob3dzIHRoZSBiYXR0ZXJ5IG9mIHRoZSB3aXJlbGVzcyBrZXlib2FyZHMsIG1pY2UsIGFuZCBnYW1lIGNvbnRyb2xsZXJzIGluIHBlcmNlbnRhZ2VzIGFuZCBjb2xvcnMuIE11bHRpcGxlIGRldmljZXMgYXJlIHN1cHBvcnRlZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aXJlbGVzcy1oaWQiLAogICJuYW1lIjogIldpcmVsZXNzIEhJRCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJjaGx1bXNreXZhY2xhdkBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS93aXJlbGVzcy1oaWQiLAogICJ1dWlkIjogIndpcmVsZXNzLWhpZEBjaGx1bXNreXZhY2xhdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "better-osd@hllvc", "name": "Better OSD - Gnome 40", "pname": "better-osd-gnome-40", "description": "Customize your OSD popups. Move, resize, set delay and transparency!", "link": "https://extensions.gnome.org/extension/4231/better-osd-gnome-40/", "shell_version_map": {"40": {"version": "5", "sha256": "0z24civcgjsif2gyxkjamzx2nlxxzfnkg4fwip4jbxy5v3d090nq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIE9TRCBwb3B1cHMuIE1vdmUsIHJlc2l6ZSwgc2V0IGRlbGF5IGFuZCB0cmFuc3BhcmVuY3khIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmV0dGVyLW9zZCIsCiAgIm5hbWUiOiAiQmV0dGVyIE9TRCAtIEdub21lIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9obGx2Yy9iZXR0ZXItb3NkIiwKICAidXVpZCI6ICJiZXR0ZXItb3NkQGhsbHZjIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "0z24civcgjsif2gyxkjamzx2nlxxzfnkg4fwip4jbxy5v3d090nq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIE9TRCBwb3B1cHMuIE1vdmUsIHJlc2l6ZSwgc2V0IGRlbGF5IGFuZCB0cmFuc3BhcmVuY3khIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmV0dGVyLW9zZCIsCiAgIm5hbWUiOiAiQmV0dGVyIE9TRCAtIEdub21lIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9obGx2Yy9iZXR0ZXItb3NkIiwKICAidXVpZCI6ICJiZXR0ZXItb3NkQGhsbHZjIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} +, {"uuid": "better-osd@hllvc", "name": "Better OSD - Gnome 40", "pname": "better-osd-gnome-40", "description": "Customize your OSD popups. Move, resize, set delay and transparency!", "link": "https://extensions.gnome.org/extension/4231/better-osd-gnome-40/", "shell_version_map": {"40": {"version": "6", "sha256": "0945xh7a607x3f9796gi3l5zylqa8gj1pnw44hcaak5sc6zpahgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIE9TRCBwb3B1cHMuIE1vdmUsIHJlc2l6ZSwgc2V0IGRlbGF5IGFuZCB0cmFuc3BhcmVuY3khIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmV0dGVyLW9zZCIsCiAgIm5hbWUiOiAiQmV0dGVyIE9TRCAtIEdub21lIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQxLjEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9obGx2Yy9iZXR0ZXItb3NkIiwKICAidXVpZCI6ICJiZXR0ZXItb3NkQGhsbHZjIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0945xh7a607x3f9796gi3l5zylqa8gj1pnw44hcaak5sc6zpahgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6ZSB5b3VyIE9TRCBwb3B1cHMuIE1vdmUsIHJlc2l6ZSwgc2V0IGRlbGF5IGFuZCB0cmFuc3BhcmVuY3khIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYmV0dGVyLW9zZCIsCiAgIm5hbWUiOiAiQmV0dGVyIE9TRCAtIEdub21lIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQxLjEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9obGx2Yy9iZXR0ZXItb3NkIiwKICAidXVpZCI6ICJiZXR0ZXItb3NkQGhsbHZjIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "arbttstats@gervasioperez.ar", "name": "Arbtt stats", "pname": "arbtt-stats", "description": "Show simple arbtt stats on the panel\n*** This extension requires arbtt running and configured", "link": "https://extensions.gnome.org/extension/4234/arbtt-stats/", "shell_version_map": {"38": {"version": "9", "sha256": "0x3sxg8dv9gfq1f4m9bk4rb3395rdcf0srijxqphpwjmm0nsizql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc2ltcGxlIGFyYnR0IHN0YXRzIG9uIHRoZSBwYW5lbFxuKioqIFRoaXMgZXh0ZW5zaW9uIHJlcXVpcmVzIGFyYnR0IHJ1bm5pbmcgYW5kIGNvbmZpZ3VyZWQiLAogICJuYW1lIjogIkFyYnR0IHN0YXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZXJ3b29kaW5jL2FyYnR0LXN0YXRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXJidHRzdGF0c0BnZXJ2YXNpb3BlcmV6LmFyIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "9", "sha256": "0x3sxg8dv9gfq1f4m9bk4rb3395rdcf0srijxqphpwjmm0nsizql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgc2ltcGxlIGFyYnR0IHN0YXRzIG9uIHRoZSBwYW5lbFxuKioqIFRoaXMgZXh0ZW5zaW9uIHJlcXVpcmVzIGFyYnR0IHJ1bm5pbmcgYW5kIGNvbmZpZ3VyZWQiLAogICJuYW1lIjogIkFyYnR0IHN0YXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoZXJ3b29kaW5jL2FyYnR0LXN0YXRzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXJidHRzdGF0c0BnZXJ2YXNpb3BlcmV6LmFyIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "blur-me@nunchucks", "name": "Blur Me", "pname": "blur-me", "description": "Blur: Applications | Top Panel | Overview | Dash | More!\n\n\nCredit where it's due: Overview and dash blur are based on blur my shell", "link": "https://extensions.gnome.org/extension/4236/blur-me/", "shell_version_map": {"40": {"version": "13", "sha256": "0sdmp9q6g8xyaxvvmk47niad5csnlfpdnmx0lnlfm1dc6kchyaxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdXI6IEFwcGxpY2F0aW9ucyB8IFRvcCBQYW5lbCB8IE92ZXJ2aWV3IHwgRGFzaCB8IE1vcmUhXG5cblxuQ3JlZGl0IHdoZXJlIGl0J3MgZHVlOiBPdmVydmlldyBhbmQgZGFzaCBibHVyIGFyZSBiYXNlZCBvbiBibHVyIG15IHNoZWxsIiwKICAibmFtZSI6ICJCbHVyIE1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ja2lzc2FuZS9ibHVyLW1lIiwKICAidXVpZCI6ICJibHVyLW1lQG51bmNodWNrcyIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "0sdmp9q6g8xyaxvvmk47niad5csnlfpdnmx0lnlfm1dc6kchyaxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdXI6IEFwcGxpY2F0aW9ucyB8IFRvcCBQYW5lbCB8IE92ZXJ2aWV3IHwgRGFzaCB8IE1vcmUhXG5cblxuQ3JlZGl0IHdoZXJlIGl0J3MgZHVlOiBPdmVydmlldyBhbmQgZGFzaCBibHVyIGFyZSBiYXNlZCBvbiBibHVyIG15IHNoZWxsIiwKICAibmFtZSI6ICJCbHVyIE1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4xIiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ja2lzc2FuZS9ibHVyLW1lIiwKICAidXVpZCI6ICJibHVyLW1lQG51bmNodWNrcyIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "gestureImprovements@gestures", "name": "Gesture Improvements", "pname": "gesture-improvements", "description": "Improve touchpad gestures for Wayland/X11\n\nThis extension adds following features:\n\n• Switch windows from current workspace using 3-finger horizontal swipe\n• Cyclic gestures between Desktop/Overview/AppGrid using 4 vertical swipe\n• Switch app-pages using 3-finger swipe gesture on AppGrid\n• Unmaximize/maximize/fullscreen/half-tiling using 3-finger vertical & horizontal gesture\n• Optional minimize a window gesture\n• Override 3-finger gesture with 4-finger for switching workspace\n• Pinch to show desktop\n• Configure speed of gestures\n• Support for X11\n \nOn X11, you need to install https://github.com/harshadgavali/gnome-x11-gesture-daemon\n\nReport any bugs/requests on GitHub (link directly below)\n", "link": "https://extensions.gnome.org/extension/4245/gesture-improvements/", "shell_version_map": {"40": {"version": "19", "sha256": "06s4igjx5r7k01yvylr0clg8j2m6sdywn00hr5xdp1a9v2r5v5ry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmUgdG91Y2hwYWQgZ2VzdHVyZXMgZm9yIFdheWxhbmQvWDExXG5cblRoaXMgZXh0ZW5zaW9uIGFkZHMgZm9sbG93aW5nIGZlYXR1cmVzOlxuXG5cdTIwMjIgU3dpdGNoIHdpbmRvd3MgZnJvbSBjdXJyZW50IHdvcmtzcGFjZSB1c2luZyAzLWZpbmdlciBob3Jpem9udGFsIHN3aXBlXG5cdTIwMjIgQ3ljbGljIGdlc3R1cmVzIGJldHdlZW4gRGVza3RvcC9PdmVydmlldy9BcHBHcmlkIHVzaW5nIDQgdmVydGljYWwgc3dpcGVcblx1MjAyMiBTd2l0Y2ggYXBwLXBhZ2VzIHVzaW5nIDMtZmluZ2VyIHN3aXBlIGdlc3R1cmUgb24gQXBwR3JpZFxuXHUyMDIyIFVubWF4aW1pemUvbWF4aW1pemUvZnVsbHNjcmVlbi9oYWxmLXRpbGluZyB1c2luZyAzLWZpbmdlciB2ZXJ0aWNhbCAmIGhvcml6b250YWwgZ2VzdHVyZVxuXHUyMDIyIE9wdGlvbmFsIG1pbmltaXplIGEgd2luZG93IGdlc3R1cmVcblx1MjAyMiBPdmVycmlkZSAzLWZpbmdlciBnZXN0dXJlIHdpdGggNC1maW5nZXIgZm9yIHN3aXRjaGluZyB3b3Jrc3BhY2Vcblx1MjAyMiBQaW5jaCB0byBzaG93IGRlc2t0b3Bcblx1MjAyMiBDb25maWd1cmUgc3BlZWQgb2YgZ2VzdHVyZXNcblx1MjAyMiBTdXBwb3J0IGZvciBYMTFcbiAgIFxuT24gWDExLCB5b3UgbmVlZCB0byBpbnN0YWxsIGh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLXgxMS1nZXN0dXJlLWRhZW1vblxuXG5SZXBvcnQgYW55IGJ1Z3MvcmVxdWVzdHMgb24gR2l0SHViIChsaW5rIGRpcmVjdGx5IGJlbG93KVxuIiwKICAibmFtZSI6ICJHZXN0dXJlIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nZXN0dXJlSW1wcm92ZW1lbnRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLWdlc3R1cmUtaW1wcm92ZW1lbnRzIiwKICAidXVpZCI6ICJnZXN0dXJlSW1wcm92ZW1lbnRzQGdlc3R1cmVzIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "06s4igjx5r7k01yvylr0clg8j2m6sdywn00hr5xdp1a9v2r5v5ry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmUgdG91Y2hwYWQgZ2VzdHVyZXMgZm9yIFdheWxhbmQvWDExXG5cblRoaXMgZXh0ZW5zaW9uIGFkZHMgZm9sbG93aW5nIGZlYXR1cmVzOlxuXG5cdTIwMjIgU3dpdGNoIHdpbmRvd3MgZnJvbSBjdXJyZW50IHdvcmtzcGFjZSB1c2luZyAzLWZpbmdlciBob3Jpem9udGFsIHN3aXBlXG5cdTIwMjIgQ3ljbGljIGdlc3R1cmVzIGJldHdlZW4gRGVza3RvcC9PdmVydmlldy9BcHBHcmlkIHVzaW5nIDQgdmVydGljYWwgc3dpcGVcblx1MjAyMiBTd2l0Y2ggYXBwLXBhZ2VzIHVzaW5nIDMtZmluZ2VyIHN3aXBlIGdlc3R1cmUgb24gQXBwR3JpZFxuXHUyMDIyIFVubWF4aW1pemUvbWF4aW1pemUvZnVsbHNjcmVlbi9oYWxmLXRpbGluZyB1c2luZyAzLWZpbmdlciB2ZXJ0aWNhbCAmIGhvcml6b250YWwgZ2VzdHVyZVxuXHUyMDIyIE9wdGlvbmFsIG1pbmltaXplIGEgd2luZG93IGdlc3R1cmVcblx1MjAyMiBPdmVycmlkZSAzLWZpbmdlciBnZXN0dXJlIHdpdGggNC1maW5nZXIgZm9yIHN3aXRjaGluZyB3b3Jrc3BhY2Vcblx1MjAyMiBQaW5jaCB0byBzaG93IGRlc2t0b3Bcblx1MjAyMiBDb25maWd1cmUgc3BlZWQgb2YgZ2VzdHVyZXNcblx1MjAyMiBTdXBwb3J0IGZvciBYMTFcbiAgIFxuT24gWDExLCB5b3UgbmVlZCB0byBpbnN0YWxsIGh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLXgxMS1nZXN0dXJlLWRhZW1vblxuXG5SZXBvcnQgYW55IGJ1Z3MvcmVxdWVzdHMgb24gR2l0SHViIChsaW5rIGRpcmVjdGx5IGJlbG93KVxuIiwKICAibmFtZSI6ICJHZXN0dXJlIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nZXN0dXJlSW1wcm92ZW1lbnRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL2dub21lLWdlc3R1cmUtaW1wcm92ZW1lbnRzIiwKICAidXVpZCI6ICJnZXN0dXJlSW1wcm92ZW1lbnRzQGdlc3R1cmVzIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} , {"uuid": "eclipse@blackjackshellac.ca", "name": "eclipse", "pname": "eclipse", "description": "eclipse clipboard interface with item encryption\n\nAdded encryption of clipboard items. Encrypted items can be\nsaved to disk in a folder of your choice. These items are persisted\nbetween sessions using openssl to encrypt the content.\n\nEclipse uses dbus to communicate with the gpaste daemon.\n\nThe following utilities are required,\n\n# for example, on fedora (add gpaste-ui for gpaste settings gui)\n$ sudo dnf install gpaste openssl\n# ubuntu\n$ sudo apt install gpaste openssl\n\nNow works with Gpaste 1 and Gpaste 2 on GS 3.36, 3.38 and 40\n\nIf updating the extension reports an ERROR it should work after the next reboot or if you logout and login again. If you're not running on Wayland you should be able to just restart the shell (Alt+F2,r).\n\nPlease report issues on github.\n", "link": "https://extensions.gnome.org/extension/4246/eclipse/", "shell_version_map": {"38": {"version": "8", "sha256": "09j5f8p23m4v2bdad582497r194z05x4izc2wywp9nhv1nldcs3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImVjbGlwc2UgY2xpcGJvYXJkIGludGVyZmFjZSB3aXRoIGl0ZW0gZW5jcnlwdGlvblxuXG5BZGRlZCBlbmNyeXB0aW9uIG9mIGNsaXBib2FyZCBpdGVtcy4gRW5jcnlwdGVkIGl0ZW1zIGNhbiBiZVxuc2F2ZWQgdG8gZGlzayBpbiBhIGZvbGRlciBvZiB5b3VyIGNob2ljZS4gVGhlc2UgaXRlbXMgYXJlIHBlcnNpc3RlZFxuYmV0d2VlbiBzZXNzaW9ucyB1c2luZyBvcGVuc3NsIHRvIGVuY3J5cHQgdGhlIGNvbnRlbnQuXG5cbkVjbGlwc2UgdXNlcyBkYnVzIHRvIGNvbW11bmljYXRlIHdpdGggdGhlIGdwYXN0ZSBkYWVtb24uXG5cblRoZSBmb2xsb3dpbmcgdXRpbGl0aWVzIGFyZSByZXF1aXJlZCxcblxuIyBmb3IgZXhhbXBsZSwgb24gZmVkb3JhIChhZGQgZ3Bhc3RlLXVpIGZvciBncGFzdGUgc2V0dGluZ3MgZ3VpKVxuJCBzdWRvIGRuZiBpbnN0YWxsIGdwYXN0ZSBvcGVuc3NsXG4jIHVidW50dVxuJCBzdWRvIGFwdCBpbnN0YWxsIGdwYXN0ZSBvcGVuc3NsXG5cbk5vdyB3b3JrcyB3aXRoIEdwYXN0ZSAxIGFuZCBHcGFzdGUgMiBvbiBHUyAzLjM2LCAzLjM4IGFuZCA0MFxuXG5JZiB1cGRhdGluZyB0aGUgZXh0ZW5zaW9uIHJlcG9ydHMgYW4gRVJST1IgaXQgc2hvdWxkIHdvcmsgYWZ0ZXIgdGhlIG5leHQgcmVib290IG9yIGlmIHlvdSBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiBJZiB5b3UncmUgbm90IHJ1bm5pbmcgb24gV2F5bGFuZCB5b3Ugc2hvdWxkIGJlIGFibGUgdG8ganVzdCByZXN0YXJ0IHRoZSBzaGVsbCAoQWx0K0YyLHIpLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBnaXRodWIuXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlY2xpcHNlLWJsYWNramFja3NoZWxsYWMiLAogICJuYW1lIjogImVjbGlwc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZWNsaXBzZS1ibGFja2phY2tzaGVsbGFjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsYWNramFja3NoZWxsYWMvZWNsaXBzZSIsCiAgInV1aWQiOiAiZWNsaXBzZUBibGFja2phY2tzaGVsbGFjLmNhIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "09j5f8p23m4v2bdad582497r194z05x4izc2wywp9nhv1nldcs3n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImVjbGlwc2UgY2xpcGJvYXJkIGludGVyZmFjZSB3aXRoIGl0ZW0gZW5jcnlwdGlvblxuXG5BZGRlZCBlbmNyeXB0aW9uIG9mIGNsaXBib2FyZCBpdGVtcy4gRW5jcnlwdGVkIGl0ZW1zIGNhbiBiZVxuc2F2ZWQgdG8gZGlzayBpbiBhIGZvbGRlciBvZiB5b3VyIGNob2ljZS4gVGhlc2UgaXRlbXMgYXJlIHBlcnNpc3RlZFxuYmV0d2VlbiBzZXNzaW9ucyB1c2luZyBvcGVuc3NsIHRvIGVuY3J5cHQgdGhlIGNvbnRlbnQuXG5cbkVjbGlwc2UgdXNlcyBkYnVzIHRvIGNvbW11bmljYXRlIHdpdGggdGhlIGdwYXN0ZSBkYWVtb24uXG5cblRoZSBmb2xsb3dpbmcgdXRpbGl0aWVzIGFyZSByZXF1aXJlZCxcblxuIyBmb3IgZXhhbXBsZSwgb24gZmVkb3JhIChhZGQgZ3Bhc3RlLXVpIGZvciBncGFzdGUgc2V0dGluZ3MgZ3VpKVxuJCBzdWRvIGRuZiBpbnN0YWxsIGdwYXN0ZSBvcGVuc3NsXG4jIHVidW50dVxuJCBzdWRvIGFwdCBpbnN0YWxsIGdwYXN0ZSBvcGVuc3NsXG5cbk5vdyB3b3JrcyB3aXRoIEdwYXN0ZSAxIGFuZCBHcGFzdGUgMiBvbiBHUyAzLjM2LCAzLjM4IGFuZCA0MFxuXG5JZiB1cGRhdGluZyB0aGUgZXh0ZW5zaW9uIHJlcG9ydHMgYW4gRVJST1IgaXQgc2hvdWxkIHdvcmsgYWZ0ZXIgdGhlIG5leHQgcmVib290IG9yIGlmIHlvdSBsb2dvdXQgYW5kIGxvZ2luIGFnYWluLiBJZiB5b3UncmUgbm90IHJ1bm5pbmcgb24gV2F5bGFuZCB5b3Ugc2hvdWxkIGJlIGFibGUgdG8ganVzdCByZXN0YXJ0IHRoZSBzaGVsbCAoQWx0K0YyLHIpLlxuXG5QbGVhc2UgcmVwb3J0IGlzc3VlcyBvbiBnaXRodWIuXG4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJlY2xpcHNlLWJsYWNramFja3NoZWxsYWMiLAogICJuYW1lIjogImVjbGlwc2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZWNsaXBzZS1ibGFja2phY2tzaGVsbGFjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsYWNramFja3NoZWxsYWMvZWNsaXBzZSIsCiAgInV1aWQiOiAiZWNsaXBzZUBibGFja2phY2tzaGVsbGFjLmNhIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "audio-switcher@albertomosconi", "name": "Audio Switcher 40", "pname": "audio-switcher-40", "description": "Adds a switch for choosing audio input/output to the system menu in GNOME 40. (Makes InputSlider always visible)", "link": "https://extensions.gnome.org/extension/4248/audio-switcher-40/", "shell_version_map": {"38": {"version": "4", "sha256": "0mvc4f6i7vsqijq8l4adcixdyycfxmd7kvw13d5h0vx4hg6vam1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIGlucHV0L291dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUgaW4gR05PTUUgNDAuIChNYWtlcyBJbnB1dFNsaWRlciBhbHdheXMgdmlzaWJsZSkiLAogICJuYW1lIjogIkF1ZGlvIFN3aXRjaGVyIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4xIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vYWxiZXJ0b21vc2NvbmkvYXVkaW8tc3dpdGNoZXIiLAogICJ1dWlkIjogImF1ZGlvLXN3aXRjaGVyQGFsYmVydG9tb3Njb25pIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0mvc4f6i7vsqijq8l4adcixdyycfxmd7kvw13d5h0vx4hg6vam1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIGlucHV0L291dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUgaW4gR05PTUUgNDAuIChNYWtlcyBJbnB1dFNsaWRlciBhbHdheXMgdmlzaWJsZSkiLAogICJuYW1lIjogIkF1ZGlvIFN3aXRjaGVyIDQwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4xIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vYWxiZXJ0b21vc2NvbmkvYXVkaW8tc3dpdGNoZXIiLAogICJ1dWlkIjogImF1ZGlvLXN3aXRjaGVyQGFsYmVydG9tb3Njb25pIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "shell-configurator@adeswanta", "name": "Shell Configurator", "pname": "shell-configurator", "description": "Configure and customize GNOME Shell with advanced settings.", "link": "https://extensions.gnome.org/extension/4254/shell-configurator/", "shell_version_map": {"38": {"version": "4", "sha256": "18dcbxizgj295v34m2dsz1dq9wxlk1s9cgqcgwd1k6r2v2f4p00z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBhbmQgY3VzdG9taXplIEdOT01FIFNoZWxsIHdpdGggYWR2YW5jZWQgc2V0dGluZ3MuIiwKICAiaWQiOiAic2hlbGwtY29uZmlndXJhdG9yIiwKICAiaW5zdGFsbC10eXBlIjogIlVzZXIiLAogICJuYW1lIjogIlNoZWxsIENvbmZpZ3VyYXRvciIsCiAgInJlbGVhc2Utc3RhdGUiOiAicmVsZWFzZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYWRlc3dhbnRhVGVjaHMvc2hlbGwtY29uZmlndXJhdG9yIiwKICAidXVpZCI6ICJzaGVsbC1jb25maWd1cmF0b3JAYWRlc3dhbnRhIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "18dcbxizgj295v34m2dsz1dq9wxlk1s9cgqcgwd1k6r2v2f4p00z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBhbmQgY3VzdG9taXplIEdOT01FIFNoZWxsIHdpdGggYWR2YW5jZWQgc2V0dGluZ3MuIiwKICAiaWQiOiAic2hlbGwtY29uZmlndXJhdG9yIiwKICAiaW5zdGFsbC10eXBlIjogIlVzZXIiLAogICJuYW1lIjogIlNoZWxsIENvbmZpZ3VyYXRvciIsCiAgInJlbGVhc2Utc3RhdGUiOiAicmVsZWFzZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYWRlc3dhbnRhVGVjaHMvc2hlbGwtY29uZmlndXJhdG9yIiwKICAidXVpZCI6ICJzaGVsbC1jb25maWd1cmF0b3JAYWRlc3dhbnRhIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "io.github.mreditor.gnome-shell-extensions.scroll-panel", "name": "Scroll Panel", "pname": "scroll-panel", "description": "This extension allows switching between windows or workspaces by scrolling Gnome Shell topbar with mouse (both in overview and workspace modes).", "link": "https://extensions.gnome.org/extension/4257/scroll-panel/", "shell_version_map": {"40": {"version": "7", "sha256": "0j1yig77q5n44phkaw2p4jyikdkd8z5kd983993v04fvrv38i1jl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIG9yIHdvcmtzcGFjZXMgYnkgc2Nyb2xsaW5nIEdub21lIFNoZWxsIHRvcGJhciB3aXRoIG1vdXNlIChib3RoIGluIG92ZXJ2aWV3IGFuZCB3b3Jrc3BhY2UgbW9kZXMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgIm5hbWUiOiAiU2Nyb2xsIFBhbmVsIiwKICAic2VtYW50aWMtdmVyc2lvbiI6ICI0LjEuNStnaXQtODcxZmZiNCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJpby5naXRodWIubXJlZGl0b3IuZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5zY3JvbGwtcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21yRURpdG9yL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JvbGwtcGFuZWwiLAogICJ1dWlkIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "0j1yig77q5n44phkaw2p4jyikdkd8z5kd983993v04fvrv38i1jl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIG9yIHdvcmtzcGFjZXMgYnkgc2Nyb2xsaW5nIEdub21lIFNoZWxsIHRvcGJhciB3aXRoIG1vdXNlIChib3RoIGluIG92ZXJ2aWV3IGFuZCB3b3Jrc3BhY2UgbW9kZXMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgIm5hbWUiOiAiU2Nyb2xsIFBhbmVsIiwKICAic2VtYW50aWMtdmVyc2lvbiI6ICI0LjEuNStnaXQtODcxZmZiNCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJpby5naXRodWIubXJlZGl0b3IuZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5zY3JvbGwtcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21yRURpdG9yL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JvbGwtcGFuZWwiLAogICJ1dWlkIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgInZlcnNpb24iOiA3Cn0="}}} +, {"uuid": "io.github.mreditor.gnome-shell-extensions.scroll-panel", "name": "Scroll Panel", "pname": "scroll-panel", "description": "This extension allows switching between windows or workspaces by scrolling Gnome Shell topbar with mouse (both in overview and workspace modes).", "link": "https://extensions.gnome.org/extension/4257/scroll-panel/", "shell_version_map": {"40": {"version": "6", "sha256": "0505zv1sbdd00pk1nfsjwqycq4mzih19r128aqpm35q4wj6frpn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIG9yIHdvcmtzcGFjZXMgYnkgc2Nyb2xsaW5nIEdub21lIFNoZWxsIHRvcGJhciB3aXRoIG1vdXNlIChib3RoIGluIG92ZXJ2aWV3IGFuZCB3b3Jrc3BhY2UgbW9kZXMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgIm5hbWUiOiAiU2Nyb2xsIFBhbmVsIiwKICAic2VtYW50aWMtdmVyc2lvbiI6ICI0LjEuNCtnaXQtMzdmMGM3YyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJpby5naXRodWIubXJlZGl0b3IuZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5zY3JvbGwtcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21yRURpdG9yL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JvbGwtcGFuZWwiLAogICJ1dWlkIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0505zv1sbdd00pk1nfsjwqycq4mzih19r128aqpm35q4wj6frpn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIG9yIHdvcmtzcGFjZXMgYnkgc2Nyb2xsaW5nIEdub21lIFNoZWxsIHRvcGJhciB3aXRoIG1vdXNlIChib3RoIGluIG92ZXJ2aWV3IGFuZCB3b3Jrc3BhY2UgbW9kZXMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgIm5hbWUiOiAiU2Nyb2xsIFBhbmVsIiwKICAic2VtYW50aWMtdmVyc2lvbiI6ICI0LjEuNCtnaXQtMzdmMGM3YyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJpby5naXRodWIubXJlZGl0b3IuZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5zY3JvbGwtcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21yRURpdG9yL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JvbGwtcGFuZWwiLAogICJ1dWlkIjogImlvLmdpdGh1Yi5tcmVkaXRvci5nbm9tZS1zaGVsbC1leHRlbnNpb25zLnNjcm9sbC1wYW5lbCIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "wb@pwall.github.com", "name": "WindowButtons", "pname": "windowbuttons", "description": "This is an extension for Gnome 3.38 which puts minimize and close buttons in the top panel.", "link": "https://extensions.gnome.org/extension/4261/windowbuttons/", "shell_version_map": {"38": {"version": "6", "sha256": "1w9j3rmn8yhppfkxrgyfvws2hsr24ki60vi8d73hdhifpnfps2sy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgaXMgYW4gZXh0ZW5zaW9uIGZvciBHbm9tZSAzLjM4IHdoaWNoIHB1dHMgbWluaW1pemUgYW5kIGNsb3NlIGJ1dHRvbnMgaW4gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIldpbmRvd0J1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QV2FsbDIyMjIvV0IiLAogICJ1dWlkIjogIndiQHB3YWxsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "rippleremove@slippinggitty", "name": "Ripple Remove", "pname": "ripple-remove", "description": "Removes the ripple effect from the Activities hot corner", "link": "https://extensions.gnome.org/extension/4264/ripple-remove/", "shell_version_map": {"40": {"version": "1", "sha256": "1dnk8nfnv5hp8c11fzhn5vscicij4lk9i1vz25fz6sjc3rn1a9pq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlIHJpcHBsZSBlZmZlY3QgZnJvbSB0aGUgQWN0aXZpdGllcyBob3QgY29ybmVyIiwKICAibmFtZSI6ICJSaXBwbGUgUmVtb3ZlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5zbGlwcGluZ2l0dHkucmlwcGxlcmVtb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJyaXBwbGVyZW1vdmVAc2xpcHBpbmdnaXR0eSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "quickmenu@slippinggitty", "name": "Quick Menu [DEAD]", "pname": "quick-menu", "description": "This is a fork of fedoramenu (which is a fork of Big Sur Menu by fausto) that scrubs references of Fedora by replacing the icon with the GNOME logo.\n\nQuick Menu is a panel applet similar to the Apple menu found on macOS.\n\nEDIT: This extension's purpose is dead. Check out Tofu Menu, which is fedoramenu, but with the ability to change the icon. https://extensions.gnome.org/extension/4272/tofu-menu/", "link": "https://extensions.gnome.org/extension/4266/quick-menu/", "shell_version_map": {"40": {"version": "1", "sha256": "1qla029n79366a7xvg2d9v0wa7272bqj40ggvbjrfsbd8x066aca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgaXMgYSBmb3JrIG9mIGZlZG9yYW1lbnUgKHdoaWNoIGlzIGEgZm9yayBvZiBCaWcgU3VyIE1lbnUgYnkgZmF1c3RvKSB0aGF0IHNjcnVicyByZWZlcmVuY2VzIG9mIEZlZG9yYSBieSByZXBsYWNpbmcgdGhlIGljb24gd2l0aCB0aGUgR05PTUUgbG9nby5cblxuUXVpY2sgTWVudSBpcyBhIHBhbmVsIGFwcGxldCBzaW1pbGFyIHRvIHRoZSBBcHBsZSBtZW51IGZvdW5kIG9uIG1hY09TLlxuXG5FRElUOiBUaGlzIGV4dGVuc2lvbidzIHB1cnBvc2UgaXMgZGVhZC4gQ2hlY2sgb3V0IFRvZnUgTWVudSwgd2hpY2ggaXMgZmVkb3JhbWVudSwgYnV0IHdpdGggdGhlIGFiaWxpdHkgdG8gY2hhbmdlIHRoZSBpY29uLiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80MjcyL3RvZnUtbWVudS8iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdWljay1tZW51IiwKICAibmFtZSI6ICJRdWljayBNZW51IFtERUFEXSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuc2xpcHBpbmdpdHR5LnF1aWNrLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2xpcHBpbmdHaXR0eS9xdWlja21lbnUiLAogICJ1dWlkIjogInF1aWNrbWVudUBzbGlwcGluZ2dpdHR5IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "show-desktop-applet@valent-in", "name": "Show Desktop Applet", "pname": "show-desktop-applet", "description": "Minimize/unminimize all open windows with a single click.\n\nForked from https://extensions.gnome.org/extension/1194/show-desktop-button/\n\nFeatures:\n- Windows-like behavior\n- Can be placed at the end of panel\n- Hotkey support (can be activated in settings)", "link": "https://extensions.gnome.org/extension/4267/show-desktop-applet/", "shell_version_map": {"38": {"version": "3", "sha256": "1cm3mfcijjgm9wy2m5hvc6q4ra4b4nqpwl8zhvpf2gxp7vrg4l2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WYWxlbnQtaW4vU2hvdy1EZXNrdG9wLUFwcGxldCIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWFwcGxldEB2YWxlbnQtaW4iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1cm3mfcijjgm9wy2m5hvc6q4ra4b4nqpwl8zhvpf2gxp7vrg4l2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WYWxlbnQtaW4vU2hvdy1EZXNrdG9wLUFwcGxldCIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWFwcGxldEB2YWxlbnQtaW4iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1cm3mfcijjgm9wy2m5hvc6q4ra4b4nqpwl8zhvpf2gxp7vrg4l2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WYWxlbnQtaW4vU2hvdy1EZXNrdG9wLUFwcGxldCIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWFwcGxldEB2YWxlbnQtaW4iLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "AlphabeticalAppGrid@stuarthayhurst", "name": "Alphabetical App Grid", "pname": "alphabetical-app-grid", "description": "Restore the alphabetical ordering of the app grid", "link": "https://extensions.gnome.org/extension/4269/alphabetical-app-grid/", "shell_version_map": {"38": {"version": "17", "sha256": "1rd14ixx5macghy3pdv7jk9wqlrgp1ndq6xr2al5g1bp4y7aa59c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9hbHBoYWJldGljYWwtZ3JpZC1leHRlbnNpb24iLAogICJ1dWlkIjogIkFscGhhYmV0aWNhbEFwcEdyaWRAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "40": {"version": "17", "sha256": "1rd14ixx5macghy3pdv7jk9wqlrgp1ndq6xr2al5g1bp4y7aa59c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9hbHBoYWJldGljYWwtZ3JpZC1leHRlbnNpb24iLAogICJ1dWlkIjogIkFscGhhYmV0aWNhbEFwcEdyaWRAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "1rd14ixx5macghy3pdv7jk9wqlrgp1ndq6xr2al5g1bp4y7aa59c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9hbHBoYWJldGljYWwtZ3JpZC1leHRlbnNpb24iLAogICJ1dWlkIjogIkFscGhhYmV0aWNhbEFwcEdyaWRAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} +, {"uuid": "AlphabeticalAppGrid@stuarthayhurst", "name": "Alphabetical App Grid", "pname": "alphabetical-app-grid", "description": "Restore the alphabetical ordering of the app grid", "link": "https://extensions.gnome.org/extension/4269/alphabetical-app-grid/", "shell_version_map": {"38": {"version": "20", "sha256": "1yb8v4qld98mnvx77m8xfm49jdnm636j5z7p0mkgjbg586f67dmi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvYWxwaGFiZXRpY2FsLWdyaWQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDIwCn0="}, "40": {"version": "20", "sha256": "1yb8v4qld98mnvx77m8xfm49jdnm636j5z7p0mkgjbg586f67dmi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvYWxwaGFiZXRpY2FsLWdyaWQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "1yb8v4qld98mnvx77m8xfm49jdnm636j5z7p0mkgjbg586f67dmi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvYWxwaGFiZXRpY2FsLWdyaWQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDIwCn0="}, "42": {"version": "20", "sha256": "1yb8v4qld98mnvx77m8xfm49jdnm636j5z7p0mkgjbg586f67dmi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvYWxwaGFiZXRpY2FsLWdyaWQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDIwCn0="}}} , {"uuid": "tofumenu@tofu", "name": "Tofu Menu", "pname": "tofu-menu", "description": "Quick access menu for the GNOME panel with options that help ease the workflow for newcomers and power users alike.\n\nhttps://github.com/tofutech/tofumenu", "link": "https://extensions.gnome.org/extension/4272/tofu-menu/", "shell_version_map": {"40": {"version": "2", "sha256": "05ndbjvvz0v1y8iq6ngqylz4z1ld6q5ibhkr5dh24wqc4wiky30v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyBtZW51IGZvciB0aGUgR05PTUUgcGFuZWwgd2l0aCBvcHRpb25zIHRoYXQgaGVscCBlYXNlIHRoZSB3b3JrZmxvdyBmb3IgbmV3Y29tZXJzIGFuZCBwb3dlciB1c2VycyBhbGlrZS5cblxuaHR0cHM6Ly9naXRodWIuY29tL3RvZnV0ZWNoL3RvZnVtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmVkb3JhLW1lbnUiLAogICJuYW1lIjogIlRvZnUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcudG9mdS5mZWRvcmEtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidG9mdW1lbnVAdG9mdSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "cryptostash@filidorwiese.nl", "name": "CryptoStash", "pname": "cryptostash", "description": "Keep an eye on the real time value of your crypto coins collections.\n\nYou can create multiple \"stashes\" (portfolios) of coins and monitor the accumulated value in USD or EUR. Or if you prefer, you can simply track the current value of your favorite coin.", "link": "https://extensions.gnome.org/extension/4276/cryptostash/", "shell_version_map": {"38": {"version": "4", "sha256": "0n1452ky1dppcxazgqxv5jc91l4piwp64rmc9b41ak3792j1sgbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvcl91cmwiOiAiaHR0cHM6Ly9maWxpZG9yd2llc2UubmwiLAogICJkZXNjcmlwdGlvbiI6ICJLZWVwIGFuIGV5ZSBvbiB0aGUgcmVhbCB0aW1lIHZhbHVlIG9mIHlvdXIgY3J5cHRvIGNvaW5zIGNvbGxlY3Rpb25zLlxuXG5Zb3UgY2FuIGNyZWF0ZSBtdWx0aXBsZSBcInN0YXNoZXNcIiAocG9ydGZvbGlvcykgb2YgY29pbnMgYW5kIG1vbml0b3IgdGhlIGFjY3VtdWxhdGVkIHZhbHVlIGluIFVTRCBvciBFVVIuIE9yIGlmIHlvdSBwcmVmZXIsIHlvdSBjYW4gc2ltcGx5IHRyYWNrIHRoZSBjdXJyZW50IHZhbHVlIG9mIHlvdXIgZmF2b3JpdGUgY29pbi4iLAogICJuYW1lIjogIkNyeXB0b1N0YXNoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNyeXB0by1zdGFzaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ0YWciOiAxLjMsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmlsaWRvcndpZXNlL2dub21lLXNoZWxsLWNyeXB0by1zdGFzaCIsCiAgInV1aWQiOiAiY3J5cHRvc3Rhc2hAZmlsaWRvcndpZXNlLm5sIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "xmlfix@pwall.github.com", "name": "XML-Fix", "pname": "xml-fix", "description": "Fixes the XML-Codes displaying instead of the characters on notifications.", "link": "https://extensions.gnome.org/extension/4279/xml-fix/", "shell_version_map": {"38": {"version": "2", "sha256": "1c9qa3ky873hkckylsbv0s7q9bmsnia7h8mlc36i7xz7h1ml6fpx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeGVzIHRoZSBYTUwtQ29kZXMgZGlzcGxheWluZyBpbnN0ZWFkIG9mIHRoZSBjaGFyYWN0ZXJzIG9uIG5vdGlmaWNhdGlvbnMuIiwKICAibmFtZSI6ICJYTUwtRml4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFdhbGwyMjIyL1hNTEZpeCIsCiAgInV1aWQiOiAieG1sZml4QHB3YWxsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} @@ -514,11 +517,11 @@ , {"uuid": "spindown-harddisk@johannes.bittner.gmail.com", "name": "Spin down hard disk", "pname": "spin-down-hard-disk", "description": "Spins down the hard disk (and keeps it spun down)", "link": "https://extensions.gnome.org/extension/4299/spin-down-hard-disk/", "shell_version_map": {"38": {"version": "2", "sha256": "0cfjjbfk7rbj9dsy56sq8ga6i5wkz5p3xqbykxv16xbhgh4i2n01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwaW5zIGRvd24gdGhlIGhhcmQgZGlzayAoYW5kIGtlZXBzIGl0IHNwdW4gZG93bikiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcGluZG93bi1oYXJkZGlzayIsCiAgIm5hbWUiOiAiU3BpbiBkb3duIGhhcmQgZGlzayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcGluZG93bi1oYXJkZGlzayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3BpbmRvd24taGFyZGRpc2tAam9oYW5uZXMuYml0dG5lci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "0cfjjbfk7rbj9dsy56sq8ga6i5wkz5p3xqbykxv16xbhgh4i2n01", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwaW5zIGRvd24gdGhlIGhhcmQgZGlzayAoYW5kIGtlZXBzIGl0IHNwdW4gZG93bikiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcGluZG93bi1oYXJkZGlzayIsCiAgIm5hbWUiOiAiU3BpbiBkb3duIGhhcmQgZGlzayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcGluZG93bi1oYXJkZGlzayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3BpbmRvd24taGFyZGRpc2tAam9oYW5uZXMuYml0dG5lci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "user-pics@comfy", "name": "User Pics", "pname": "user-pics", "description": "lucasalveslm's User Account Image for gnome-shell 3.38", "link": "https://extensions.gnome.org/extension/4301/user-pics/", "shell_version_map": {"38": {"version": "3", "sha256": "1rv6x551dm3hynfkm291b4c552j9d6q89ixmrq0x97xgw75n14fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImx1Y2FzYWx2ZXNsbSdzIFVzZXIgQWNjb3VudCBJbWFnZSBmb3IgZ25vbWUtc2hlbGwgMy4zOCIsCiAgIm5hbWUiOiAiVXNlciBQaWNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInVzZXItcGljc0Bjb21meSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "screendarker@yingshaoxo.github.com", "name": "Screen Darker", "pname": "screen-darker", "description": "Help you do a switch between a darker screen and brighter screen by one click.", "link": "https://extensions.gnome.org/extension/4304/screen-darker/", "shell_version_map": {"38": {"version": "1", "sha256": "1zlncw0y5crq6n0slhq1f9npzvkkcyh0187z88mzycr55nl4rsx8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhlbHAgeW91IGRvIGEgc3dpdGNoIGJldHdlZW4gYSBkYXJrZXIgc2NyZWVuIGFuZCBicmlnaHRlciBzY3JlZW4gYnkgb25lIGNsaWNrLiIsCiAgIm5hbWUiOiAiU2NyZWVuIERhcmtlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbmdzaGFveG8vZ25vbWUtc2hlbGwtc2NyZWVuLWRhcmtlciIsCiAgInV1aWQiOiAic2NyZWVuZGFya2VyQHlpbmdzaGFveG8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "umi-coin-rate@exposedcat", "name": "UMI Coin Rate", "pname": "umi-coin-rate", "description": "Add UMI coin rate to the panel", "link": "https://extensions.gnome.org/extension/4307/umi-coin-rate/", "shell_version_map": {"38": {"version": "5", "sha256": "13fh82kwma7qdis6ny0c5bw9fxx103p6mj2434fsgfra3d1k8aqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBVTUkgY29pbiByYXRlIHRvIHRoZSBwYW5lbCIsCiAgIm5hbWUiOiAiVU1JIENvaW4gUmF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FeHBvc2VkQ2F0L3VtaS1jb2luLXJhdGUiLAogICJ1dWlkIjogInVtaS1jb2luLXJhdGVAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "13fh82kwma7qdis6ny0c5bw9fxx103p6mj2434fsgfra3d1k8aqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBVTUkgY29pbiByYXRlIHRvIHRoZSBwYW5lbCIsCiAgIm5hbWUiOiAiVU1JIENvaW4gUmF0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FeHBvc2VkQ2F0L3VtaS1jb2luLXJhdGUiLAogICJ1dWlkIjogInVtaS1jb2luLXJhdGVAZXhwb3NlZGNhdCIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"uuid": "network-stats@gnome.noroadsleft.xyz", "name": "Network Stats", "pname": "network-stats", "description": "Displays internet upload speed, download speed, bandwidth, data usage. \n\n visit github page for instructions, suggestions and feature requests. \n\n ERROR while updating extension ? restart your system or reload gnome shell. Alt + F2 then r + Enter", "link": "https://extensions.gnome.org/extension/4308/network-stats/", "shell_version_map": {"38": {"version": "10", "sha256": "1kmbaja0nhqjayjcy6rnm2wqzv1gw3divd7d15nanbh0igmwm32a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "1kmbaja0nhqjayjcy6rnm2wqzv1gw3divd7d15nanbh0igmwm32a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3JvYWRzbGVmdDAwMC9nbm9tZS1uZXR3b3JrLXN0YXRzIiwKICAidXVpZCI6ICJuZXR3b3JrLXN0YXRzQGdub21lLm5vcm9hZHNsZWZ0Lnh5eiIsCiAgInZlcnNpb24iOiAxMAp9"}}} +, {"uuid": "umi-coin-rate@exposedcat", "name": "UMI Coin Rate [Unmaintained]", "pname": "umi-coin-rate", "description": "", "link": "https://extensions.gnome.org/extension/4307/umi-coin-rate/", "shell_version_map": {"38": {"version": "5", "sha256": "0rhprnxnsmy834lkc2vmp0zgbj1ngc3bq7m3yac4vd3g40r015nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiIsCiAgIm5hbWUiOiAiVU1JIENvaW4gUmF0ZSBbVW5tYWludGFpbmVkXSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidW1pLWNvaW4tcmF0ZUBleHBvc2VkY2F0IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "0rhprnxnsmy834lkc2vmp0zgbj1ngc3bq7m3yac4vd3g40r015nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiIsCiAgIm5hbWUiOiAiVU1JIENvaW4gUmF0ZSBbVW5tYWludGFpbmVkXSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidW1pLWNvaW4tcmF0ZUBleHBvc2VkY2F0IiwKICAidmVyc2lvbiI6IDUKfQ=="}}} +, {"uuid": "network-stats@gnome.noroadsleft.xyz", "name": "Network Stats", "pname": "network-stats", "description": "Displays internet upload speed, download speed, bandwidth, data usage. \n\n visit github page for instructions, suggestions and feature requests. \n\n ERROR while updating extension ? restart your system or reload gnome shell. Alt + F2 then r + Enter", "link": "https://extensions.gnome.org/extension/4308/network-stats/", "shell_version_map": {"38": {"version": "13", "sha256": "1h1gpgcxqx8iilk4dm9708f3p94qv7adz42pgg08njhh9fabapxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9yb2Fkc2xlZnQwMDAvZ25vbWUtbmV0d29yay1zdGF0cyIsCiAgInV1aWQiOiAibmV0d29yay1zdGF0c0Bnbm9tZS5ub3JvYWRzbGVmdC54eXoiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "1h1gpgcxqx8iilk4dm9708f3p94qv7adz42pgg08njhh9fabapxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9yb2Fkc2xlZnQwMDAvZ25vbWUtbmV0d29yay1zdGF0cyIsCiAgInV1aWQiOiAibmV0d29yay1zdGF0c0Bnbm9tZS5ub3JvYWRzbGVmdC54eXoiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "1h1gpgcxqx8iilk4dm9708f3p94qv7adz42pgg08njhh9fabapxa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9yb2Fkc2xlZnQwMDAvZ25vbWUtbmV0d29yay1zdGF0cyIsCiAgInV1aWQiOiAibmV0d29yay1zdGF0c0Bnbm9tZS5ub3JvYWRzbGVmdC54eXoiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} , {"uuid": "screen-lock@garciabaameiro.com", "name": "Screen lock", "pname": "extension-list", "description": "Simple gnome shell extension to use xscreensaver in top panel", "link": "https://extensions.gnome.org/extension/4311/extension-list/", "shell_version_map": {"40": {"version": "1", "sha256": "1jas7pcn3a28fnfs3azrbiqf22gx337js6if8v8vsb15994pbak6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBnbm9tZSBzaGVsbCBleHRlbnNpb24gdG8gdXNlIHhzY3JlZW5zYXZlciBpbiB0b3AgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzY3JlZW4tbG9jayIsCiAgIm5hbWUiOiAiU2NyZWVuIGxvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuLWxvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2F3eWVyMTMvc2NyZWVuLWxvY2siLAogICJ1dWlkIjogInNjcmVlbi1sb2NrQGdhcmNpYWJhYW1laXJvLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "force-show-osk@bruh.ltd", "name": "Force Show OSK", "pname": "force-show-osk", "description": "Show the on-screen keyboard regardless of whether the touch mode is enabled", "link": "https://extensions.gnome.org/extension/4316/force-show-osk/", "shell_version_map": {"40": {"version": "3", "sha256": "0p2v36bliaa6i85b4r0g38ih9fidn95dwmyhc3dygvynjzvvv56b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2tpcmJ5a2V2aW5zb24vZm9yY2Utc2hvdy1vc2siLAogICJ1dWlkIjogImZvcmNlLXNob3ctb3NrQGJydWgubHRkIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0p2v36bliaa6i85b4r0g38ih9fidn95dwmyhc3dygvynjzvvv56b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2tpcmJ5a2V2aW5zb24vZm9yY2Utc2hvdy1vc2siLAogICJ1dWlkIjogImZvcmNlLXNob3ctb3NrQGJydWgubHRkIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "asusctl-gex@asus-linux.org", "name": "asusctl-gex", "pname": "asusctl-gex", "description": "asusctl-gex is a frontend for some functionalities of asusctl and supergfxctl that were born inside the asus-linux.org community.\n\nasusctl is not required\nsupergfxctl is required if you have a dual GPU laptop and want to switch between various GPU modes. It is tested on a variaty of laptops including Intel / Nvidia, AMD / Nvidia, Intel / AMD and AMD / AMD GPU combinations.\n\nTo learn more about it, please have a look at:\nhttps://gitlab.com/asus-linux/asusctl\nhttps://gitlab.com/asus-linux/supergfxctl\nhttps://gitlab.com/asus-linux/asusctl-gex\n\nhttps://asus-linux.org/", "link": "https://extensions.gnome.org/extension/4320/asusctl-gex/", "shell_version_map": {"40": {"version": "9", "sha256": "0ivnw4bw494l5zi82yap54zd035kvr4pg6rfkz7ivwccf3y0gfzg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFzdXNjdGwtZ2V4IGlzIGEgZnJvbnRlbmQgZm9yIHNvbWUgZnVuY3Rpb25hbGl0aWVzIG9mIGFzdXNjdGwgYW5kIHN1cGVyZ2Z4Y3RsIHRoYXQgd2VyZSBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LlxuXG5hc3VzY3RsIGlzIG5vdCByZXF1aXJlZFxuc3VwZXJnZnhjdGwgaXMgcmVxdWlyZWQgaWYgeW91IGhhdmUgYSBkdWFsIEdQVSBsYXB0b3AgYW5kIHdhbnQgdG8gc3dpdGNoIGJldHdlZW4gdmFyaW91cyBHUFUgbW9kZXMuIEl0IGlzIHRlc3RlZCBvbiBhIHZhcmlhdHkgb2YgbGFwdG9wcyBpbmNsdWRpbmcgSW50ZWwgLyBOdmlkaWEsIEFNRCAvIE52aWRpYSwgSW50ZWwgLyBBTUQgYW5kIEFNRCAvIEFNRCBHUFUgY29tYmluYXRpb25zLlxuXG5UbyBsZWFybiBtb3JlIGFib3V0IGl0LCBwbGVhc2UgaGF2ZSBhIGxvb2sgYXQ6XG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9hc3VzY3RsXG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9zdXBlcmdmeGN0bFxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvYXN1c2N0bC1nZXhcblxuaHR0cHM6Ly9hc3VzLWxpbnV4Lm9yZy8iLAogICJuYW1lIjogImFzdXNjdGwtZ2V4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFzdXNjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFzdXNjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAiYXN1c2N0bC1nZXgtZGV2QGFzdXMtbGludXgub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "0ivnw4bw494l5zi82yap54zd035kvr4pg6rfkz7ivwccf3y0gfzg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFzdXNjdGwtZ2V4IGlzIGEgZnJvbnRlbmQgZm9yIHNvbWUgZnVuY3Rpb25hbGl0aWVzIG9mIGFzdXNjdGwgYW5kIHN1cGVyZ2Z4Y3RsIHRoYXQgd2VyZSBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LlxuXG5hc3VzY3RsIGlzIG5vdCByZXF1aXJlZFxuc3VwZXJnZnhjdGwgaXMgcmVxdWlyZWQgaWYgeW91IGhhdmUgYSBkdWFsIEdQVSBsYXB0b3AgYW5kIHdhbnQgdG8gc3dpdGNoIGJldHdlZW4gdmFyaW91cyBHUFUgbW9kZXMuIEl0IGlzIHRlc3RlZCBvbiBhIHZhcmlhdHkgb2YgbGFwdG9wcyBpbmNsdWRpbmcgSW50ZWwgLyBOdmlkaWEsIEFNRCAvIE52aWRpYSwgSW50ZWwgLyBBTUQgYW5kIEFNRCAvIEFNRCBHUFUgY29tYmluYXRpb25zLlxuXG5UbyBsZWFybiBtb3JlIGFib3V0IGl0LCBwbGVhc2UgaGF2ZSBhIGxvb2sgYXQ6XG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9hc3VzY3RsXG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9zdXBlcmdmeGN0bFxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvYXN1c2N0bC1nZXhcblxuaHR0cHM6Ly9hc3VzLWxpbnV4Lm9yZy8iLAogICJuYW1lIjogImFzdXNjdGwtZ2V4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFzdXNjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFzdXNjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAiYXN1c2N0bC1nZXgtZGV2QGFzdXMtbGludXgub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} +, {"uuid": "asusctl-gex@asus-linux.org", "name": "asusctl-gex", "pname": "asusctl-gex", "description": "asusctl-gex is a frontend for some functionalities of asusctl and supergfxctl that were born inside the asus-linux.org community.\n\nasusctl is not required\nsupergfxctl is required if you have a dual GPU laptop and want to switch between various GPU modes. It is tested on a variaty of laptops including Intel / Nvidia, AMD / Nvidia, Intel / AMD and AMD / AMD GPU combinations.\n\nTo learn more about it, please have a look at:\nhttps://gitlab.com/asus-linux/asusctl\nhttps://gitlab.com/asus-linux/supergfxctl\nhttps://gitlab.com/asus-linux/asusctl-gex\n\nhttps://asus-linux.org/", "link": "https://extensions.gnome.org/extension/4320/asusctl-gex/", "shell_version_map": {"40": {"version": "9", "sha256": "0ivnw4bw494l5zi82yap54zd035kvr4pg6rfkz7ivwccf3y0gfzg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFzdXNjdGwtZ2V4IGlzIGEgZnJvbnRlbmQgZm9yIHNvbWUgZnVuY3Rpb25hbGl0aWVzIG9mIGFzdXNjdGwgYW5kIHN1cGVyZ2Z4Y3RsIHRoYXQgd2VyZSBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LlxuXG5hc3VzY3RsIGlzIG5vdCByZXF1aXJlZFxuc3VwZXJnZnhjdGwgaXMgcmVxdWlyZWQgaWYgeW91IGhhdmUgYSBkdWFsIEdQVSBsYXB0b3AgYW5kIHdhbnQgdG8gc3dpdGNoIGJldHdlZW4gdmFyaW91cyBHUFUgbW9kZXMuIEl0IGlzIHRlc3RlZCBvbiBhIHZhcmlhdHkgb2YgbGFwdG9wcyBpbmNsdWRpbmcgSW50ZWwgLyBOdmlkaWEsIEFNRCAvIE52aWRpYSwgSW50ZWwgLyBBTUQgYW5kIEFNRCAvIEFNRCBHUFUgY29tYmluYXRpb25zLlxuXG5UbyBsZWFybiBtb3JlIGFib3V0IGl0LCBwbGVhc2UgaGF2ZSBhIGxvb2sgYXQ6XG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9hc3VzY3RsXG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9zdXBlcmdmeGN0bFxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvYXN1c2N0bC1nZXhcblxuaHR0cHM6Ly9hc3VzLWxpbnV4Lm9yZy8iLAogICJuYW1lIjogImFzdXNjdGwtZ2V4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFzdXNjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFzdXNjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAiYXN1c2N0bC1nZXgtZGV2QGFzdXMtbGludXgub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "0ivnw4bw494l5zi82yap54zd035kvr4pg6rfkz7ivwccf3y0gfzg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFzdXNjdGwtZ2V4IGlzIGEgZnJvbnRlbmQgZm9yIHNvbWUgZnVuY3Rpb25hbGl0aWVzIG9mIGFzdXNjdGwgYW5kIHN1cGVyZ2Z4Y3RsIHRoYXQgd2VyZSBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LlxuXG5hc3VzY3RsIGlzIG5vdCByZXF1aXJlZFxuc3VwZXJnZnhjdGwgaXMgcmVxdWlyZWQgaWYgeW91IGhhdmUgYSBkdWFsIEdQVSBsYXB0b3AgYW5kIHdhbnQgdG8gc3dpdGNoIGJldHdlZW4gdmFyaW91cyBHUFUgbW9kZXMuIEl0IGlzIHRlc3RlZCBvbiBhIHZhcmlhdHkgb2YgbGFwdG9wcyBpbmNsdWRpbmcgSW50ZWwgLyBOdmlkaWEsIEFNRCAvIE52aWRpYSwgSW50ZWwgLyBBTUQgYW5kIEFNRCAvIEFNRCBHUFUgY29tYmluYXRpb25zLlxuXG5UbyBsZWFybiBtb3JlIGFib3V0IGl0LCBwbGVhc2UgaGF2ZSBhIGxvb2sgYXQ6XG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9hc3VzY3RsXG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9zdXBlcmdmeGN0bFxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvYXN1c2N0bC1nZXhcblxuaHR0cHM6Ly9hc3VzLWxpbnV4Lm9yZy8iLAogICJuYW1lIjogImFzdXNjdGwtZ2V4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFzdXNjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFzdXNjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAiYXN1c2N0bC1nZXgtZGV2QGFzdXMtbGludXgub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "0ivnw4bw494l5zi82yap54zd035kvr4pg6rfkz7ivwccf3y0gfzg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFzdXNjdGwtZ2V4IGlzIGEgZnJvbnRlbmQgZm9yIHNvbWUgZnVuY3Rpb25hbGl0aWVzIG9mIGFzdXNjdGwgYW5kIHN1cGVyZ2Z4Y3RsIHRoYXQgd2VyZSBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LlxuXG5hc3VzY3RsIGlzIG5vdCByZXF1aXJlZFxuc3VwZXJnZnhjdGwgaXMgcmVxdWlyZWQgaWYgeW91IGhhdmUgYSBkdWFsIEdQVSBsYXB0b3AgYW5kIHdhbnQgdG8gc3dpdGNoIGJldHdlZW4gdmFyaW91cyBHUFUgbW9kZXMuIEl0IGlzIHRlc3RlZCBvbiBhIHZhcmlhdHkgb2YgbGFwdG9wcyBpbmNsdWRpbmcgSW50ZWwgLyBOdmlkaWEsIEFNRCAvIE52aWRpYSwgSW50ZWwgLyBBTUQgYW5kIEFNRCAvIEFNRCBHUFUgY29tYmluYXRpb25zLlxuXG5UbyBsZWFybiBtb3JlIGFib3V0IGl0LCBwbGVhc2UgaGF2ZSBhIGxvb2sgYXQ6XG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9hc3VzY3RsXG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9zdXBlcmdmeGN0bFxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvYXN1c2N0bC1nZXhcblxuaHR0cHM6Ly9hc3VzLWxpbnV4Lm9yZy8iLAogICJuYW1lIjogImFzdXNjdGwtZ2V4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFzdXNjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFzdXNjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAiYXN1c2N0bC1nZXgtZGV2QGFzdXMtbGludXgub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "hide-activities-button@nmingori.gnome-shell-extensions.org", "name": "Hide Activities Button", "pname": "hide-activities-button", "description": "Hide Activities Button on the top panel. For Gnome 40 or 3.6+", "link": "https://extensions.gnome.org/extension/4325/hide-activities-button/", "shell_version_map": {"38": {"version": "1", "sha256": "0644h9cqy07h1fgr9wcjp4agvszrcpk6f0yr725hxfil600k5m9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24gb24gdGhlIHRvcCBwYW5lbC4gRm9yIEdub21lIDQwIG9yIDMuNisiLAogICJuYW1lIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuNiIsCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25taW5nb3JpL2dub21lLWhpZGUtYWN0aXRpdmllcy1idXR0b24iLAogICJ1dWlkIjogImhpZGUtYWN0aXZpdGllcy1idXR0b25Abm1pbmdvcmkuZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5vcmciLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "0644h9cqy07h1fgr9wcjp4agvszrcpk6f0yr725hxfil600k5m9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24gb24gdGhlIHRvcCBwYW5lbC4gRm9yIEdub21lIDQwIG9yIDMuNisiLAogICJuYW1lIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuNiIsCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25taW5nb3JpL2dub21lLWhpZGUtYWN0aXRpdmllcy1idXR0b24iLAogICJ1dWlkIjogImhpZGUtYWN0aXZpdGllcy1idXR0b25Abm1pbmdvcmkuZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5vcmciLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "apt-shortcuts@rx1310", "name": "Shortcuts for APT", "pname": "shortcuts-for-apt", "description": "A small extension that adds buttons to the panel to check for APT updates through the terminal without entering commands.", "link": "https://extensions.gnome.org/extension/4328/shortcuts-for-apt/", "shell_version_map": {"38": {"version": "2", "sha256": "1dagzbryg85hgdksxqb90j6ia1b4rfpm46jihviivc8jz1iqb6f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgQVBUIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgQVBUIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3J4MTMxMC9nbm9tZS1leHRlbnNpb25fYXB0dXBkYXRlIiwKICAidXVpZCI6ICJhcHQtc2hvcnRjdXRzQHJ4MTMxMCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1dagzbryg85hgdksxqb90j6ia1b4rfpm46jihviivc8jz1iqb6f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgQVBUIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgQVBUIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3J4MTMxMC9nbm9tZS1leHRlbnNpb25fYXB0dXBkYXRlIiwKICAidXVpZCI6ICJhcHQtc2hvcnRjdXRzQHJ4MTMxMCIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "ideapad-mode@annexhack.inceptive.ru", "name": "ideapad mode", "pname": "ideapad-mode", "description": "Chargning mode indicator for laptops. Allows to switch the charging mode from conservative or healthy to normal mode. Indicates also which mode you are using now. Works on Lenovo Slim 7.\n\nPlease Report Problems or issues on Gitlab at:\n\nhttps://gitlab.com/annexhack/conservation-mode-lenovo", "link": "https://extensions.gnome.org/extension/4331/ideapad-mode/", "shell_version_map": {"40": {"version": "3", "sha256": "0hd0rqkrly27c2bqg7403ng192blrcidb2hrykx4i170i2x604fv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYXJnbmluZyBtb2RlIGluZGljYXRvciBmb3IgbGFwdG9wcy4gQWxsb3dzIHRvIHN3aXRjaCB0aGUgY2hhcmdpbmcgbW9kZSBmcm9tIGNvbnNlcnZhdGl2ZSBvciBoZWFsdGh5IHRvIG5vcm1hbCBtb2RlLiBJbmRpY2F0ZXMgYWxzbyB3aGljaCBtb2RlIHlvdSBhcmUgdXNpbmcgbm93LiBXb3JrcyBvbiBMZW5vdm8gU2xpbSA3LlxuXG5QbGVhc2UgUmVwb3J0IFByb2JsZW1zIG9yIGlzc3VlcyBvbiBHaXRsYWIgYXQ6XG5cbmh0dHBzOi8vZ2l0bGFiLmNvbS9hbm5leGhhY2svY29uc2VydmF0aW9uLW1vZGUtbGVub3ZvIiwKICAibmFtZSI6ICJpZGVhcGFkIG1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FubmV4aGFjay9jb25zZXJ2YXRpb24tbW9kZS1sZW5vdm8iLAogICJ1dWlkIjogImlkZWFwYWQtbW9kZUBhbm5leGhhY2suaW5jZXB0aXZlLnJ1IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0hd0rqkrly27c2bqg7403ng192blrcidb2hrykx4i170i2x604fv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYXJnbmluZyBtb2RlIGluZGljYXRvciBmb3IgbGFwdG9wcy4gQWxsb3dzIHRvIHN3aXRjaCB0aGUgY2hhcmdpbmcgbW9kZSBmcm9tIGNvbnNlcnZhdGl2ZSBvciBoZWFsdGh5IHRvIG5vcm1hbCBtb2RlLiBJbmRpY2F0ZXMgYWxzbyB3aGljaCBtb2RlIHlvdSBhcmUgdXNpbmcgbm93LiBXb3JrcyBvbiBMZW5vdm8gU2xpbSA3LlxuXG5QbGVhc2UgUmVwb3J0IFByb2JsZW1zIG9yIGlzc3VlcyBvbiBHaXRsYWIgYXQ6XG5cbmh0dHBzOi8vZ2l0bGFiLmNvbS9hbm5leGhhY2svY29uc2VydmF0aW9uLW1vZGUtbGVub3ZvIiwKICAibmFtZSI6ICJpZGVhcGFkIG1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2FubmV4aGFjay9jb25zZXJ2YXRpb24tbW9kZS1sZW5vdm8iLAogICJ1dWlkIjogImlkZWFwYWQtbW9kZUBhbm5leGhhY2suaW5jZXB0aXZlLnJ1IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} @@ -531,10 +534,10 @@ , {"uuid": "fluoroom-gnome-top-bar@fluoroom.github.com", "name": "fluoroom's Top Bar", "pname": "fluorooms-top-bar", "description": "Persistent top bar based on Gnome's default style, with some modifications.\n\nThis extension makes black background and screen corners persistent and makes buttons round, but it will respect your current theme's fonts, margins and icons.", "link": "https://extensions.gnome.org/extension/4350/fluorooms-top-bar/", "shell_version_map": {"40": {"version": "4", "sha256": "1gm6ijr66nrs4r7cp2ksdy4sppf3vrg88lvf1gs993q6r894li89", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBlcnNpc3RlbnQgdG9wIGJhciBiYXNlZCBvbiBHbm9tZSdzIGRlZmF1bHQgc3R5bGUsIHdpdGggc29tZSBtb2RpZmljYXRpb25zLlxuXG5UaGlzIGV4dGVuc2lvbiBtYWtlcyBibGFjayBiYWNrZ3JvdW5kIGFuZCBzY3JlZW4gY29ybmVycyBwZXJzaXN0ZW50IGFuZCBtYWtlcyBidXR0b25zIHJvdW5kLCBidXQgaXQgd2lsbCByZXNwZWN0IHlvdXIgY3VycmVudCB0aGVtZSdzIGZvbnRzLCBtYXJnaW5zIGFuZCBpY29ucy4iLAogICJuYW1lIjogImZsdW9yb29tJ3MgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbHVvcm9vbS9mbHVvcm9vbS1nbm9tZS10b3AtYmFyIiwKICAidXVpZCI6ICJmbHVvcm9vbS1nbm9tZS10b3AtYmFyQGZsdW9yb29tLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "mbpbat@prithvivishak.gmail.com", "name": "MacBook Battery Percentage Corrector", "pname": "macbook-battery-percentage-corrector", "description": "Corrects only the battery percentage shown in the panel aggregate menu.\nDoes not mess with UPower or other subsystems. Special thanks to @andenlol.", "link": "https://extensions.gnome.org/extension/4353/macbook-battery-percentage-corrector/", "shell_version_map": {"38": {"version": "3", "sha256": "1vaklxwql5n92iq47bw5p37libhgf5dr5lf6frvvmzwxwk6pha5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcnJlY3RzIG9ubHkgdGhlIGJhdHRlcnkgcGVyY2VudGFnZSBzaG93biBpbiB0aGUgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5Eb2VzIG5vdCBtZXNzIHdpdGggVVBvd2VyIG9yIG90aGVyIHN1YnN5c3RlbXMuIFNwZWNpYWwgdGhhbmtzIHRvIEBhbmRlbmxvbC4iLAogICJuYW1lIjogIk1hY0Jvb2sgQmF0dGVyeSBQZXJjZW50YWdlIENvcnJlY3RvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcHZwdWJsaWMvbWJwYmF0L3NyYy9tYXN0ZXIvIiwKICAidXVpZCI6ICJtYnBiYXRAcHJpdGh2aXZpc2hhay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1vaklxwql5n92iq47bw5p37libhgf5dr5lf6frvvmzwxwk6pha5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcnJlY3RzIG9ubHkgdGhlIGJhdHRlcnkgcGVyY2VudGFnZSBzaG93biBpbiB0aGUgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5Eb2VzIG5vdCBtZXNzIHdpdGggVVBvd2VyIG9yIG90aGVyIHN1YnN5c3RlbXMuIFNwZWNpYWwgdGhhbmtzIHRvIEBhbmRlbmxvbC4iLAogICJuYW1lIjogIk1hY0Jvb2sgQmF0dGVyeSBQZXJjZW50YWdlIENvcnJlY3RvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcHZwdWJsaWMvbWJwYmF0L3NyYy9tYXN0ZXIvIiwKICAidXVpZCI6ICJtYnBiYXRAcHJpdGh2aXZpc2hhay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1vaklxwql5n92iq47bw5p37libhgf5dr5lf6frvvmzwxwk6pha5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcnJlY3RzIG9ubHkgdGhlIGJhdHRlcnkgcGVyY2VudGFnZSBzaG93biBpbiB0aGUgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5Eb2VzIG5vdCBtZXNzIHdpdGggVVBvd2VyIG9yIG90aGVyIHN1YnN5c3RlbXMuIFNwZWNpYWwgdGhhbmtzIHRvIEBhbmRlbmxvbC4iLAogICJuYW1lIjogIk1hY0Jvb2sgQmF0dGVyeSBQZXJjZW50YWdlIENvcnJlY3RvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcHZwdWJsaWMvbWJwYmF0L3NyYy9tYXN0ZXIvIiwKICAidXVpZCI6ICJtYnBiYXRAcHJpdGh2aXZpc2hhay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "top-bar-organizer@julian.gse.jsts.xyz", "name": "Top Bar Organizer", "pname": "top-bar-organizer", "description": "Organize the items of the top (menu)bar.\nThis extension required Gnome Shell version 40.\nOrganize the items by going into the extensions settings.\n\n!!! Please make sure you're fully on Gnome 40 / you're using a distribution, which is fully on Gnome 40, since otherwise this extension might not work correctly. This was the case for Manjaro Stable until recently and is probably the case for Ubuntu 21.04 right now. !!!", "link": "https://extensions.gnome.org/extension/4356/top-bar-organizer/", "shell_version_map": {"40": {"version": "3", "sha256": "121a8r063ifv4lv5s07pglxj4h90n3lp6f0jyw4lnbg38v0nqv28", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci5cblRoaXMgZXh0ZW5zaW9uIHJlcXVpcmVkIEdub21lIFNoZWxsIHZlcnNpb24gNDAuXG5Pcmdhbml6ZSB0aGUgaXRlbXMgYnkgZ29pbmcgaW50byB0aGUgZXh0ZW5zaW9ucyBzZXR0aW5ncy5cblxuISEhIFBsZWFzZSBtYWtlIHN1cmUgeW91J3JlIGZ1bGx5IG9uIEdub21lIDQwIC8geW91J3JlIHVzaW5nIGEgZGlzdHJpYnV0aW9uLCB3aGljaCBpcyBmdWxseSBvbiBHbm9tZSA0MCwgc2luY2Ugb3RoZXJ3aXNlIHRoaXMgZXh0ZW5zaW9uIG1pZ2h0IG5vdCB3b3JrIGNvcnJlY3RseS4gVGhpcyB3YXMgdGhlIGNhc2UgZm9yIE1hbmphcm8gU3RhYmxlIHVudGlsIHJlY2VudGx5IGFuZCBpcyBwcm9iYWJseSB0aGUgY2FzZSBmb3IgVWJ1bnR1IDIxLjA0IHJpZ2h0IG5vdy4gISEhIiwKICAibmFtZSI6ICJUb3AgQmFyIE9yZ2FuaXplciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3AtYmFyLW9yZ2FuaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qdWxpYW5zY2hhY2hlci90b3AtYmFyLW9yZ2FuaXplciIsCiAgInV1aWQiOiAidG9wLWJhci1vcmdhbml6ZXJAanVsaWFuLmdzZS5qc3RzLnh5eiIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "fullscreen-avoider@noobsai.github.com", "name": "Fullscreen Avoider", "pname": "fullscreen-avoider", "description": "Moves the top panel to the secondary monitor if the primary is in fullscreen", "link": "https://extensions.gnome.org/extension/4362/fullscreen-avoider/", "shell_version_map": {"38": {"version": "4", "sha256": "10vm28p2xpvwhzyjw1yfpgsbhahg1w673n73kq9ndx5vlnf9fji9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWF2b2lkZXJAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "5", "sha256": "0j757f5zlam7713hnkg8xx5k24z9a0kjqalxnkipvy0kqak0416s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "0j757f5zlam7713hnkg8xx5k24z9a0kjqalxnkipvy0kqak0416s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "fullscreen-avoider@noobsai.github.com", "name": "Fullscreen Avoider", "pname": "fullscreen-avoider", "description": "Moves the top panel to the secondary monitor if the primary is in fullscreen", "link": "https://extensions.gnome.org/extension/4362/fullscreen-avoider/", "shell_version_map": {"38": {"version": "4", "sha256": "10vm28p2xpvwhzyjw1yfpgsbhahg1w673n73kq9ndx5vlnf9fji9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWF2b2lkZXJAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "6", "sha256": "04vlmrwlv58ps3v0flc2m8l18q52kz3yyk6yh9i543aiknprm40x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "04vlmrwlv58ps3v0flc2m8l18q52kz3yyk6yh9i543aiknprm40x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTm9vYnNhaS9mdWxsc2NyZWVuLWF2b2lkZXIiLAogICJ1dWlkIjogImZ1bGxzY3JlZW4tYXZvaWRlckBub29ic2FpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "shell-isw@zamraky.cz", "name": "MSI Fan Control", "pname": "msi-fan-control", "description": "Use isw to change MSI laptop fan settings", "link": "https://extensions.gnome.org/extension/4363/msi-fan-control/", "shell_version_map": {"38": {"version": "1", "sha256": "0pl9dxwkw47r4c0f5sxjhh8bxl82r0sjlwsji7pwypkb6m0hh342", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBpc3cgdG8gY2hhbmdlIE1TSSBsYXB0b3AgZmFuIHNldHRpbmdzIiwKICAibmFtZSI6ICJNU0kgRmFuIENvbnRyb2wiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hlbGwtaXN3QHphbXJha3kuY3oiLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "vertical-window-list@student.gitlab.com", "name": "Vertical Window List", "pname": "vertical-window-list", "description": "Displays opened windows in vertical panel with productivity perks\n\n- left click to open favorites/activate window\n- right click to close\n- middle click to rename\n- drag-and-drop to re-arrange\n- Alt-Tab to cycle\n- adjust panel width, transparency and icon size in extension settings", "link": "https://extensions.gnome.org/extension/4369/vertical-window-list/", "shell_version_map": {"40": {"version": "6", "sha256": "1gaaxw4j3p0g3jbnn8y93j7hpqvn67l36ws02h3nky1nfnyji4nz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3N0dWRlbnQvdmVydGljYWwtd2luZG93LWxpc3QiLAogICJ1dWlkIjogInZlcnRpY2FsLXdpbmRvdy1saXN0QHN0dWRlbnQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1gaaxw4j3p0g3jbnn8y93j7hpqvn67l36ws02h3nky1nfnyji4nz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3N0dWRlbnQvdmVydGljYWwtd2luZG93LWxpc3QiLAogICJ1dWlkIjogInZlcnRpY2FsLXdpbmRvdy1saXN0QHN0dWRlbnQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"uuid": "ShutdownTimer@deminder", "name": "Shutdown Timer", "pname": "shutdowntimer", "description": "Shutdown/reboot/suspend the device after a specific time or wake with a rtc alarm.\n\nThe screen saver will not interrupt the timer. A privileged control script may be installed to control shutdown and rtcwake as user. Additionally, a check command may be configured before shutdown.", "link": "https://extensions.gnome.org/extension/4372/shutdowntimer/", "shell_version_map": {"38": {"version": "19", "sha256": "1lgq1gmwqz8a55bqblg973ypw45a9zr3zgn7rrarcfgzx3ncj332", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbiBzYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLWRlbWluZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "40": {"version": "19", "sha256": "1lgq1gmwqz8a55bqblg973ypw45a9zr3zgn7rrarcfgzx3ncj332", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbiBzYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLWRlbWluZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "1lgq1gmwqz8a55bqblg973ypw45a9zr3zgn7rrarcfgzx3ncj332", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbiBzYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLWRlbWluZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} +, {"uuid": "vertical-window-list@student.gitlab.com", "name": "Vertical Window List", "pname": "vertical-window-list", "description": "Displays opened windows in vertical panel with productivity perks\n\n- left click to open favorites/activate window\n- right click to close\n- middle click to rename\n- drag-and-drop to re-arrange\n- Alt-Tab to cycle\n- adjust panel width, transparency and icon size in extension settings", "link": "https://extensions.gnome.org/extension/4369/vertical-window-list/", "shell_version_map": {"40": {"version": "7", "sha256": "1gakw5c0gjygj61h9lhd3s7vg14vry055qnxrrdvm6vaingkzqhr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3N0dWRlbnQvdmVydGljYWwtd2luZG93LWxpc3QiLAogICJ1dWlkIjogInZlcnRpY2FsLXdpbmRvdy1saXN0QHN0dWRlbnQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1gakw5c0gjygj61h9lhd3s7vg14vry055qnxrrdvm6vaingkzqhr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIG9wZW5lZCB3aW5kb3dzIGluIHZlcnRpY2FsIHBhbmVsIHdpdGggcHJvZHVjdGl2aXR5IHBlcmtzXG5cbi0gbGVmdCBjbGljayB0byBvcGVuIGZhdm9yaXRlcy9hY3RpdmF0ZSB3aW5kb3dcbi0gcmlnaHQgY2xpY2sgdG8gY2xvc2Vcbi0gbWlkZGxlIGNsaWNrIHRvIHJlbmFtZVxuLSBkcmFnLWFuZC1kcm9wIHRvIHJlLWFycmFuZ2Vcbi0gQWx0LVRhYiB0byBjeWNsZVxuLSBhZGp1c3QgcGFuZWwgd2lkdGgsIHRyYW5zcGFyZW5jeSBhbmQgaWNvbiBzaXplIGluIGV4dGVuc2lvbiBzZXR0aW5ncyIsCiAgIm5hbWUiOiAiVmVydGljYWwgV2luZG93IExpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3N0dWRlbnQvdmVydGljYWwtd2luZG93LWxpc3QiLAogICJ1dWlkIjogInZlcnRpY2FsLXdpbmRvdy1saXN0QHN0dWRlbnQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} +, {"uuid": "ShutdownTimer@deminder", "name": "Shutdown Timer", "pname": "shutdowntimer", "description": "Shutdown/reboot/suspend the device after a specific time or wake with a rtc alarm.\n\nThe screen-saver will not interrupt the timer. A privileged control script may be installed to control shutdown and rtcwake as user. Additionally, a check command may be configured before shutdown.", "link": "https://extensions.gnome.org/extension/4372/shutdowntimer/", "shell_version_map": {"38": {"version": "19", "sha256": "1jagvd6a4xw0vm18qi6czfglp16bywms1y55vii2dwvb1xlm4sjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLWRlbWluZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "40": {"version": "19", "sha256": "1jagvd6a4xw0vm18qi6czfglp16bywms1y55vii2dwvb1xlm4sjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLWRlbWluZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "1jagvd6a4xw0vm18qi6czfglp16bywms1y55vii2dwvb1xlm4sjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLWRlbWluZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "22", "sha256": "0g9qb52i8bbi5sqadarmc8sfgicryjjw13ys8q6nlhvqb4albmqc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3JlYm9vdC9zdXNwZW5kIHRoZSBkZXZpY2UgYWZ0ZXIgYSBzcGVjaWZpYyB0aW1lIG9yIHdha2Ugd2l0aCBhIHJ0YyBhbGFybS5cblxuVGhlIHNjcmVlbi1zYXZlciB3aWxsIG5vdCBpbnRlcnJ1cHQgdGhlIHRpbWVyLiBBIHByaXZpbGVnZWQgY29udHJvbCBzY3JpcHQgbWF5IGJlIGluc3RhbGxlZCB0byBjb250cm9sIHNodXRkb3duIGFuZCBydGN3YWtlIGFzIHVzZXIuIEFkZGl0aW9uYWxseSwgYSBjaGVjayBjb21tYW5kIG1heSBiZSBjb25maWd1cmVkIGJlZm9yZSBzaHV0ZG93bi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTaHV0ZG93blRpbWVyIiwKICAibmFtZSI6ICJTaHV0ZG93biBUaW1lciIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1dGRvd250aW1lci1kZW1pbmRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EZW1pbmRlci9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDIyCn0="}}} , {"uuid": "docker_status2@gpouilloux", "name": "Docker Integration", "pname": "docker-integration", "description": "A status menu for managing docker containers.", "link": "https://extensions.gnome.org/extension/4374/docker-integration/", "shell_version_map": {"40": {"version": "1", "sha256": "1ia763h3wbc3d3p9ddb1b9rg5f486y5x3m2k4pblq9f9ca9cjrdy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIG1lbnUgZm9yIG1hbmFnaW5nIGRvY2tlciBjb250YWluZXJzLiIsCiAgIm5hbWUiOiAiRG9ja2VyIEludGVncmF0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ3BvdWlsbG91eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tZG9ja2VyIiwKICAidXVpZCI6ICJkb2NrZXJfc3RhdHVzMkBncG91aWxsb3V4IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "bifocals@shiznatix", "name": "Bifocals", "pname": "bifocals", "description": "Gnome extension adding more window management keyboard shortcuts.\n\n* Left / right 'view split' anchoring cycles through 3 sizes: 1/3, 1/2, and 2/3 of the current screen width.\n*Adds 'mid screen' of centering the window with 3/4 screen height and width.", "link": "https://extensions.gnome.org/extension/4375/bifocals/", "shell_version_map": {"38": {"version": "1", "sha256": "02j0if3bwaws0svaz98054jznrx9pj8zkhy4avsnnhchv2dwmgdi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBhZGRpbmcgbW9yZSB3aW5kb3cgbWFuYWdlbWVudCBrZXlib2FyZCBzaG9ydGN1dHMuXG5cbiogTGVmdCAvIHJpZ2h0ICd2aWV3IHNwbGl0JyBhbmNob3JpbmcgY3ljbGVzIHRocm91Z2ggMyBzaXplczogMS8zLCAxLzIsIGFuZCAyLzMgb2YgdGhlIGN1cnJlbnQgc2NyZWVuIHdpZHRoLlxuKkFkZHMgJ21pZCBzY3JlZW4nIG9mIGNlbnRlcmluZyB0aGUgd2luZG93IHdpdGggMy80IHNjcmVlbiBoZWlnaHQgYW5kIHdpZHRoLiIsCiAgIm5hbWUiOiAiQmlmb2NhbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hpem5hdGl4L2JpZm9jYWxzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmlmb2NhbHNAc2hpem5hdGl4IiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "1", "sha256": "02j0if3bwaws0svaz98054jznrx9pj8zkhy4avsnnhchv2dwmgdi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBhZGRpbmcgbW9yZSB3aW5kb3cgbWFuYWdlbWVudCBrZXlib2FyZCBzaG9ydGN1dHMuXG5cbiogTGVmdCAvIHJpZ2h0ICd2aWV3IHNwbGl0JyBhbmNob3JpbmcgY3ljbGVzIHRocm91Z2ggMyBzaXplczogMS8zLCAxLzIsIGFuZCAyLzMgb2YgdGhlIGN1cnJlbnQgc2NyZWVuIHdpZHRoLlxuKkFkZHMgJ21pZCBzY3JlZW4nIG9mIGNlbnRlcmluZyB0aGUgd2luZG93IHdpdGggMy80IHNjcmVlbiBoZWlnaHQgYW5kIHdpZHRoLiIsCiAgIm5hbWUiOiAiQmlmb2NhbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hpem5hdGl4L2JpZm9jYWxzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmlmb2NhbHNAc2hpem5hdGl4IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "kubectl-context@bernot.dev", "name": "kubectl context", "pname": "kubectl-context", "description": "Displays kubectl current-context", "link": "https://extensions.gnome.org/extension/4377/kubectl-context/", "shell_version_map": {"38": {"version": "1", "sha256": "1040dy3m5bpbqqgc60a3l5ia4g0cddfvd8iwiwxm4f7hbi9kksk8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGt1YmVjdGwgY3VycmVudC1jb250ZXh0IiwKICAibmFtZSI6ICJrdWJlY3RsIGNvbnRleHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iZXJub3QtZGV2L2t1YmVjdGwtY29udGV4dCIsCiAgInV1aWQiOiAia3ViZWN0bC1jb250ZXh0QGJlcm5vdC5kZXYiLAogICJ2ZXJzaW9uIjogMQp9"}}} @@ -547,35 +550,35 @@ , {"uuid": "print-website@ermeso.com", "name": "Print Website", "pname": "print-website", "description": "A extension for print websites.", "link": "https://extensions.gnome.org/extension/4404/print-website/", "shell_version_map": {"40": {"version": "9", "sha256": "1cg1awvfyhhc7ri7vppsjr28c1zwgw9rasyv1jcclgxr558n3n6w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZXh0ZW5zaW9uIGZvciBwcmludCB3ZWJzaXRlcy4iLAogICJuYW1lIjogIlByaW50IFdlYnNpdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZXJtZXNvbnNhbXBhaW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXByaW50LXdlYnNpdGUiLAogICJ1dWlkIjogInByaW50LXdlYnNpdGVAZXJtZXNvLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "replaceActivitiesText@pratap.fastmail.fm", "name": "Replace Activities Text", "pname": "replace-activities-text", "description": "A Simple Extension to Change 'Activities' Label with Logo and Text.\nYou can Keep Either\n1. Logo or\n2. Text or\n3. Both or\n4. None at all", "link": "https://extensions.gnome.org/extension/4405/replace-activities-text/", "shell_version_map": {"38": {"version": "8", "sha256": "04adx4043d3ni510h44pi3gr0k15a4n0zwr4k5fxisr4yjl1510w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgU2ltcGxlIEV4dGVuc2lvbiB0byBDaGFuZ2UgJ0FjdGl2aXRpZXMnIExhYmVsIHdpdGggTG9nbyBhbmQgVGV4dC5cbllvdSBjYW4gS2VlcCBFaXRoZXJcbjEuIExvZ28gb3JcbjIuIFRleHQgb3JcbjMuIEJvdGggb3JcbjQuIE5vbmUgYXQgYWxsIiwKICAibmFtZSI6ICJSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9BY3Rpdml0aWVzVGV4dCIsCiAgInV1aWQiOiAicmVwbGFjZUFjdGl2aXRpZXNUZXh0QHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "10", "sha256": "0fkpphd6ly5n7fybrla1a31sqg10cdll44ilz1vc1achphmbxlk6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgU2ltcGxlIEV4dGVuc2lvbiB0byBDaGFuZ2UgJ0FjdGl2aXRpZXMnIExhYmVsIHdpdGggTG9nbyBhbmQgVGV4dC5cbllvdSBjYW4gS2VlcCBFaXRoZXJcbjEuIExvZ28gb3JcbjIuIFRleHQgb3JcbjMuIEJvdGggb3JcbjQuIE5vbmUgYXQgYWxsIiwKICAibmFtZSI6ICJSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0FjdGl2aXRpZXNUZXh0IiwKICAidXVpZCI6ICJyZXBsYWNlQWN0aXZpdGllc1RleHRAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0fkpphd6ly5n7fybrla1a31sqg10cdll44ilz1vc1achphmbxlk6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgU2ltcGxlIEV4dGVuc2lvbiB0byBDaGFuZ2UgJ0FjdGl2aXRpZXMnIExhYmVsIHdpdGggTG9nbyBhbmQgVGV4dC5cbllvdSBjYW4gS2VlcCBFaXRoZXJcbjEuIExvZ28gb3JcbjIuIFRleHQgb3JcbjMuIEJvdGggb3JcbjQuIE5vbmUgYXQgYWxsIiwKICAibmFtZSI6ICJSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFJBVEFQLUtVTUFSL0FjdGl2aXRpZXNUZXh0IiwKICAidXVpZCI6ICJyZXBsYWNlQWN0aXZpdGllc1RleHRAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "appMenuIcon@pratap.fastmail.fm", "name": "Colored Application Menu Icon", "pname": "app-menu-icon-remove-symbolic", "description": "Remove Symbolic Icons and Saturation Effect for App Menu Icon", "link": "https://extensions.gnome.org/extension/4408/app-menu-icon-remove-symbolic/", "shell_version_map": {"38": {"version": "2", "sha256": "1ggj4c7knbsjwg7n1g7sqjz188ivlihsq8p2a8jd71iw49b917cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwTWVudUljb25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "1ggj4c7knbsjwg7n1g7sqjz188ivlihsq8p2a8jd71iw49b917cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwTWVudUljb25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1ggj4c7knbsjwg7n1g7sqjz188ivlihsq8p2a8jd71iw49b917cj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBTeW1ib2xpYyBJY29ucyBhbmQgU2F0dXJhdGlvbiBFZmZlY3QgZm9yIEFwcCBNZW51IEljb24iLAogICJuYW1lIjogIkNvbG9yZWQgQXBwbGljYXRpb24gTWVudSBJY29uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwTWVudUljb25AcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "gnome-trash@b00f.github.io", "name": "Gnome Trash", "pname": "gnome-trash", "description": "A gnome shell extension to manage your home trash. You can manage trash items from the panel and open or empty the trash.", "link": "https://extensions.gnome.org/extension/4410/gnome-trash/", "shell_version_map": {"38": {"version": "3", "sha256": "03pyala1i21izg5rl4qqh5bxk36fp8d52bs9ggrik2kav420xhhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLXRyYXNoIiwKICAidXVpZCI6ICJnbm9tZS10cmFzaEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "5", "sha256": "1z1k9908ajm7r52v1x4i633q2lk8w4m967h078lbdd5i8dzvgybb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtdHJhc2giLAogICJ1dWlkIjogImdub21lLXRyYXNoQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1z1k9908ajm7r52v1x4i633q2lk8w4m967h078lbdd5i8dzvgybb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtdHJhc2giLAogICJ1dWlkIjogImdub21lLXRyYXNoQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} -, {"uuid": "advanced-alt-tab@G-dH.github.com", "name": "AATWS - Advanced Alt-Tab Window Switcher", "pname": "advanced-alttab-window-switcher", "description": "Highly customizable replacement for the Alt-Tab window/app switchers that offers 'type to search' mode, various filtering and sorting options, workspace and monitor navigation, VIM navigation hotkeys, window control and an app launcher.\nAATWS is compatible with Custom Hot Corners - Extended extension, allows to configure any mouse button and scroll wheel and can be used as a mouse controlled dock.\n\nNote that GNOME has 3 built-in window switcher popups and this extension replaces all of them. The first one is grouping windows by applications and is used as default in vanilla GNOME distributions. The second one offers window list and the third one windows of currently focused application. You can set keyboard shortcuts for all the switchers in the Gnome Settings.\n\nFollow the link below for more information and bug reports.\n\nKeywords: alttab, search, find, windows, popup delay, applications, apps, dock, monitor, thumbnail, preview, move windows, launch app, switch windows", "link": "https://extensions.gnome.org/extension/4412/advanced-alttab-window-switcher/", "shell_version_map": {"38": {"version": "10", "sha256": "0jxjhyhp2yb5cia2rgz3cmdl0j6l7qcv0xpq6kk783q6y59x5g07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQtVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIFZJTSBuYXZpZ2F0aW9uIGhvdGtleXMsIHdpbmRvdyBjb250cm9sIGFuZCBhbiBhcHAgbGF1bmNoZXIuXG5BQVRXUyBpcyBjb21wYXRpYmxlIHdpdGggQ3VzdG9tIEhvdCBDb3JuZXJzIC0gRXh0ZW5kZWQgZXh0ZW5zaW9uLCBhbGxvd3MgdG8gY29uZmlndXJlIGFueSBtb3VzZSBidXR0b24gYW5kIHNjcm9sbCB3aGVlbCBhbmQgY2FuIGJlIHVzZWQgYXMgYSBtb3VzZSBjb250cm9sbGVkIGRvY2suXG5cbk5vdGUgdGhhdCBHTk9NRSBoYXMgMyBidWlsdC1pbiB3aW5kb3cgc3dpdGNoZXIgcG9wdXBzIGFuZCB0aGlzIGV4dGVuc2lvbiByZXBsYWNlcyBhbGwgb2YgdGhlbS4gVGhlIGZpcnN0IG9uZSBpcyBncm91cGluZyB3aW5kb3dzIGJ5IGFwcGxpY2F0aW9ucyBhbmQgaXMgdXNlZCBhcyBkZWZhdWx0IGluIHZhbmlsbGEgR05PTUUgZGlzdHJpYnV0aW9ucy4gVGhlIHNlY29uZCBvbmUgb2ZmZXJzIHdpbmRvdyBsaXN0IGFuZCB0aGUgdGhpcmQgb25lIHdpbmRvd3Mgb2YgY3VycmVudGx5IGZvY3VzZWQgYXBwbGljYXRpb24uIFlvdSBjYW4gc2V0IGtleWJvYXJkIHNob3J0Y3V0cyBmb3IgYWxsIHRoZSBzd2l0Y2hlcnMgaW4gdGhlIEdub21lIFNldHRpbmdzLlxuXG5Gb2xsb3cgdGhlIGxpbmsgYmVsb3cgZm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGJ1ZyByZXBvcnRzLlxuXG5LZXl3b3JkczogYWx0dGFiLCBzZWFyY2gsIGZpbmQsIHdpbmRvd3MsIHBvcHVwIGRlbGF5LCBhcHBsaWNhdGlvbnMsIGFwcHMsIGRvY2ssIG1vbml0b3IsIHRodW1ibmFpbCwgcHJldmlldywgbW92ZSB3aW5kb3dzLCBsYXVuY2ggYXBwLCBzd2l0Y2ggd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2FkdmFuY2VkLWFsdHRhYi13aW5kb3ctc3dpdGNoZXIiLAogICJ1dWlkIjogImFkdmFuY2VkLWFsdC10YWJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "0jxjhyhp2yb5cia2rgz3cmdl0j6l7qcv0xpq6kk783q6y59x5g07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQtVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIFZJTSBuYXZpZ2F0aW9uIGhvdGtleXMsIHdpbmRvdyBjb250cm9sIGFuZCBhbiBhcHAgbGF1bmNoZXIuXG5BQVRXUyBpcyBjb21wYXRpYmxlIHdpdGggQ3VzdG9tIEhvdCBDb3JuZXJzIC0gRXh0ZW5kZWQgZXh0ZW5zaW9uLCBhbGxvd3MgdG8gY29uZmlndXJlIGFueSBtb3VzZSBidXR0b24gYW5kIHNjcm9sbCB3aGVlbCBhbmQgY2FuIGJlIHVzZWQgYXMgYSBtb3VzZSBjb250cm9sbGVkIGRvY2suXG5cbk5vdGUgdGhhdCBHTk9NRSBoYXMgMyBidWlsdC1pbiB3aW5kb3cgc3dpdGNoZXIgcG9wdXBzIGFuZCB0aGlzIGV4dGVuc2lvbiByZXBsYWNlcyBhbGwgb2YgdGhlbS4gVGhlIGZpcnN0IG9uZSBpcyBncm91cGluZyB3aW5kb3dzIGJ5IGFwcGxpY2F0aW9ucyBhbmQgaXMgdXNlZCBhcyBkZWZhdWx0IGluIHZhbmlsbGEgR05PTUUgZGlzdHJpYnV0aW9ucy4gVGhlIHNlY29uZCBvbmUgb2ZmZXJzIHdpbmRvdyBsaXN0IGFuZCB0aGUgdGhpcmQgb25lIHdpbmRvd3Mgb2YgY3VycmVudGx5IGZvY3VzZWQgYXBwbGljYXRpb24uIFlvdSBjYW4gc2V0IGtleWJvYXJkIHNob3J0Y3V0cyBmb3IgYWxsIHRoZSBzd2l0Y2hlcnMgaW4gdGhlIEdub21lIFNldHRpbmdzLlxuXG5Gb2xsb3cgdGhlIGxpbmsgYmVsb3cgZm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGJ1ZyByZXBvcnRzLlxuXG5LZXl3b3JkczogYWx0dGFiLCBzZWFyY2gsIGZpbmQsIHdpbmRvd3MsIHBvcHVwIGRlbGF5LCBhcHBsaWNhdGlvbnMsIGFwcHMsIGRvY2ssIG1vbml0b3IsIHRodW1ibmFpbCwgcHJldmlldywgbW92ZSB3aW5kb3dzLCBsYXVuY2ggYXBwLCBzd2l0Y2ggd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2FkdmFuY2VkLWFsdHRhYi13aW5kb3ctc3dpdGNoZXIiLAogICJ1dWlkIjogImFkdmFuY2VkLWFsdC10YWJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0jxjhyhp2yb5cia2rgz3cmdl0j6l7qcv0xpq6kk783q6y59x5g07", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQtVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIFZJTSBuYXZpZ2F0aW9uIGhvdGtleXMsIHdpbmRvdyBjb250cm9sIGFuZCBhbiBhcHAgbGF1bmNoZXIuXG5BQVRXUyBpcyBjb21wYXRpYmxlIHdpdGggQ3VzdG9tIEhvdCBDb3JuZXJzIC0gRXh0ZW5kZWQgZXh0ZW5zaW9uLCBhbGxvd3MgdG8gY29uZmlndXJlIGFueSBtb3VzZSBidXR0b24gYW5kIHNjcm9sbCB3aGVlbCBhbmQgY2FuIGJlIHVzZWQgYXMgYSBtb3VzZSBjb250cm9sbGVkIGRvY2suXG5cbk5vdGUgdGhhdCBHTk9NRSBoYXMgMyBidWlsdC1pbiB3aW5kb3cgc3dpdGNoZXIgcG9wdXBzIGFuZCB0aGlzIGV4dGVuc2lvbiByZXBsYWNlcyBhbGwgb2YgdGhlbS4gVGhlIGZpcnN0IG9uZSBpcyBncm91cGluZyB3aW5kb3dzIGJ5IGFwcGxpY2F0aW9ucyBhbmQgaXMgdXNlZCBhcyBkZWZhdWx0IGluIHZhbmlsbGEgR05PTUUgZGlzdHJpYnV0aW9ucy4gVGhlIHNlY29uZCBvbmUgb2ZmZXJzIHdpbmRvdyBsaXN0IGFuZCB0aGUgdGhpcmQgb25lIHdpbmRvd3Mgb2YgY3VycmVudGx5IGZvY3VzZWQgYXBwbGljYXRpb24uIFlvdSBjYW4gc2V0IGtleWJvYXJkIHNob3J0Y3V0cyBmb3IgYWxsIHRoZSBzd2l0Y2hlcnMgaW4gdGhlIEdub21lIFNldHRpbmdzLlxuXG5Gb2xsb3cgdGhlIGxpbmsgYmVsb3cgZm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGJ1ZyByZXBvcnRzLlxuXG5LZXl3b3JkczogYWx0dGFiLCBzZWFyY2gsIGZpbmQsIHdpbmRvd3MsIHBvcHVwIGRlbGF5LCBhcHBsaWNhdGlvbnMsIGFwcHMsIGRvY2ssIG1vbml0b3IsIHRodW1ibmFpbCwgcHJldmlldywgbW92ZSB3aW5kb3dzLCBsYXVuY2ggYXBwLCBzd2l0Y2ggd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2FkdmFuY2VkLWFsdHRhYi13aW5kb3ctc3dpdGNoZXIiLAogICJ1dWlkIjogImFkdmFuY2VkLWFsdC10YWJARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} -, {"uuid": "improvedosk@nick-shmyrev.dev", "name": "Improved OSK", "pname": "improved-osk", "description": "Makes Gnome's onscreen keyboard more useable with e.g. more keys.\nThis extension is a fork of https://extensions.gnome.org/extension/3330/improved-onscreen-keyboard/ by SebastianLuebke.", "link": "https://extensions.gnome.org/extension/4413/improved-osk/", "shell_version_map": {"38": {"version": "5", "sha256": "0kwcrks0g3f4f4hxy3h6jb0gpbqrbzg6l53cdcwljrq3q0q93r2l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uaWNrLXNobXlyZXYvaW1wcm92ZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiaW1wcm92ZWRvc2tAbmljay1zaG15cmV2LmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "0kwcrks0g3f4f4hxy3h6jb0gpbqrbzg6l53cdcwljrq3q0q93r2l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uaWNrLXNobXlyZXYvaW1wcm92ZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiaW1wcm92ZWRvc2tAbmljay1zaG15cmV2LmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "0kwcrks0g3f4f4hxy3h6jb0gpbqrbzg6l53cdcwljrq3q0q93r2l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uaWNrLXNobXlyZXYvaW1wcm92ZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiaW1wcm92ZWRvc2tAbmljay1zaG15cmV2LmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"uuid": "fedora-update@pepe386", "name": "Fedora Linux Updates Indicator", "pname": "fedora-linux-updates-indicator", "description": "Update indicator for Fedora Linux and GNOME Shell.", "link": "https://extensions.gnome.org/extension/4415/fedora-linux-updates-indicator/", "shell_version_map": {"40": {"version": "1", "sha256": "0sz69rs6z1fybva20xs8587bs4xaflb4frd14d729lqq5h1m8b2p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGVwZTM4Ni9mZWRvcmEtdXBkYXRlIiwKICAidXVpZCI6ICJmZWRvcmEtdXBkYXRlQHBlcGUzODYiLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "readingstrip@lupantano.gihthub", "name": "Reading Strip", "pname": "reading-strip", "description": "It is a extension for Gnome-Shell with an equivalent function to a reading guide on the computer, that's really useful for people with dyslexia.", "link": "https://extensions.gnome.org/extension/4419/reading-strip/", "shell_version_map": {"40": {"version": "9", "sha256": "0r6ccgha8gqdqyy9z8sqxgpm1prbxfbh7cc8iyfhba5g40b4lh9g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGlzIGEgZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbCB3aXRoIGFuIGVxdWl2YWxlbnQgZnVuY3Rpb24gdG8gYSByZWFkaW5nIGd1aWRlIG9uIHRoZSBjb21wdXRlciwgdGhhdCdzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSB3aXRoIGR5c2xleGlhLiIsCiAgIm5hbWUiOiAiUmVhZGluZyBTdHJpcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZWFkaW5nc3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVwYW50YW5vL3JlYWRpbmdzdHJpcCIsCiAgInV1aWQiOiAicmVhZGluZ3N0cmlwQGx1cGFudGFuby5naWh0aHViIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} +, {"uuid": "gnome-trash@b00f.github.io", "name": "Gnome Trash", "pname": "gnome-trash", "description": "A gnome shell extension to manage your home trash. You can manage trash items from the panel and open or empty the trash.", "link": "https://extensions.gnome.org/extension/4410/gnome-trash/", "shell_version_map": {"38": {"version": "3", "sha256": "03pyala1i21izg5rl4qqh5bxk36fp8d52bs9ggrik2kav420xhhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iMDBmL2dub21lLXRyYXNoIiwKICAidXVpZCI6ICJnbm9tZS10cmFzaEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "6", "sha256": "0hkpkpxd1xpg0rsvf007wzc6s6sx1gsycl6hg69fa5bqf451r0db", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtdHJhc2giLAogICJ1dWlkIjogImdub21lLXRyYXNoQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0hkpkpxd1xpg0rsvf007wzc6s6sx1gsycl6hg69fa5bqf451r0db", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGhvbWUgdHJhc2guIFlvdSBjYW4gbWFuYWdlIHRyYXNoIGl0ZW1zIGZyb20gdGhlIHBhbmVsIGFuZCBvcGVuIG9yIGVtcHR5IHRoZSB0cmFzaC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS10cmFzaCIsCiAgIm5hbWUiOiAiR25vbWUgVHJhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtdHJhc2giLAogICJ1dWlkIjogImdub21lLXRyYXNoQGIwMGYuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} +, {"uuid": "advanced-alt-tab@G-dH.github.com", "name": "AATWS - Advanced Alt-Tab Window Switcher", "pname": "advanced-alttab-window-switcher", "description": "Highly customizable replacement for the Alt/Super+Tab window/app switchers that offers 'type to search' mode, various filtering and sorting options, workspace and monitor navigation, configurable hotkeys for navigation and window/app control and an app launcher.\nAATWS is compatible with Custom Hot Corners - Extended extension, allows to configure any mouse button and scroll wheel and can be used as a mouse controlled 'dock'.\n\nNote that GNOME has 3 built-in window switcher popups and this extension replaces all of them. The first one is grouping windows by applications and is used as default in vanilla GNOME distributions. The second one offers window list and the third one windows of the currently focused application. You can set keyboard shortcuts for all the switchers in the Gnome Settings.\n\nFollow the link below for more information and bug reports.\n\nKeywords: alttab, search, find, window search, popup delay, applications, apps, dock, monitor, thumbnail, preview, move windows, launch app, switch, VIM.", "link": "https://extensions.gnome.org/extension/4412/advanced-alttab-window-switcher/", "shell_version_map": {"38": {"version": "12", "sha256": "05v1libn5prmmlshkiylmipkmqvyhkv986fr8fsmgapb98r000wb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "05v1libn5prmmlshkiylmipkmqvyhkv986fr8fsmgapb98r000wb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "05v1libn5prmmlshkiylmipkmqvyhkv986fr8fsmgapb98r000wb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "05v1libn5prmmlshkiylmipkmqvyhkv986fr8fsmgapb98r000wb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}}} +, {"uuid": "improvedosk@nick-shmyrev.dev", "name": "Improved OSK", "pname": "improved-osk", "description": "Makes Gnome's onscreen keyboard more useable with e.g. more keys.\nThis extension is a fork of https://extensions.gnome.org/extension/3330/improved-onscreen-keyboard/ by SebastianLuebke.", "link": "https://extensions.gnome.org/extension/4413/improved-osk/", "shell_version_map": {"38": {"version": "7", "sha256": "06niqzicxp8i9ivznblf2qgwl924h77ld3cz8qgl4x8hl0bb6q0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uaWNrLXNobXlyZXYvaW1wcm92ZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiaW1wcm92ZWRvc2tAbmljay1zaG15cmV2LmRldiIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "06niqzicxp8i9ivznblf2qgwl924h77ld3cz8qgl4x8hl0bb6q0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uaWNrLXNobXlyZXYvaW1wcm92ZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiaW1wcm92ZWRvc2tAbmljay1zaG15cmV2LmRldiIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "06niqzicxp8i9ivznblf2qgwl924h77ld3cz8qgl4x8hl0bb6q0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9uaWNrLXNobXlyZXYvaW1wcm92ZWQtb3NrLWdub21lLWV4dCIsCiAgInV1aWQiOiAiaW1wcm92ZWRvc2tAbmljay1zaG15cmV2LmRldiIsCiAgInZlcnNpb24iOiA3Cn0="}}} +, {"uuid": "fedora-update@pepe386", "name": "Fedora Linux Updates Indicator", "pname": "fedora-linux-updates-indicator", "description": "Update indicator for Fedora Linux and GNOME Shell.", "link": "https://extensions.gnome.org/extension/4415/fedora-linux-updates-indicator/", "shell_version_map": {"40": {"version": "4", "sha256": "1pmh16ijc9p34qx7019z1imswnxzf9mbbbh7vg5i1acy2dgb3vfw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BlcGUzODYvZmVkb3JhLXVwZGF0ZSIsCiAgInV1aWQiOiAiZmVkb3JhLXVwZGF0ZUBwZXBlMzg2IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1pmh16ijc9p34qx7019z1imswnxzf9mbbbh7vg5i1acy2dgb3vfw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BlcGUzODYvZmVkb3JhLXVwZGF0ZSIsCiAgInV1aWQiOiAiZmVkb3JhLXVwZGF0ZUBwZXBlMzg2IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "readingstrip@lupantano.gihthub", "name": "Reading Strip", "pname": "reading-strip", "description": "It is a extension for Gnome-Shell with an equivalent function to a reading guide on the computer, that's really useful for people with dyslexia.", "link": "https://extensions.gnome.org/extension/4419/reading-strip/", "shell_version_map": {"40": {"version": "15", "sha256": "0lqd5xhq9f60lrsw51z33mlxzfh8qbw2k0sgvi405jmz4q4gna69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGlzIGEgZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbCB3aXRoIGFuIGVxdWl2YWxlbnQgZnVuY3Rpb24gdG8gYSByZWFkaW5nIGd1aWRlIG9uIHRoZSBjb21wdXRlciwgdGhhdCdzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSB3aXRoIGR5c2xleGlhLiIsCiAgIm5hbWUiOiAiUmVhZGluZyBTdHJpcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZWFkaW5nc3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "0lqd5xhq9f60lrsw51z33mlxzfh8qbw2k0sgvi405jmz4q4gna69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGlzIGEgZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbCB3aXRoIGFuIGVxdWl2YWxlbnQgZnVuY3Rpb24gdG8gYSByZWFkaW5nIGd1aWRlIG9uIHRoZSBjb21wdXRlciwgdGhhdCdzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSB3aXRoIGR5c2xleGlhLiIsCiAgIm5hbWUiOiAiUmVhZGluZyBTdHJpcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZWFkaW5nc3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "42": {"version": "15", "sha256": "0lqd5xhq9f60lrsw51z33mlxzfh8qbw2k0sgvi405jmz4q4gna69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGlzIGEgZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbCB3aXRoIGFuIGVxdWl2YWxlbnQgZnVuY3Rpb24gdG8gYSByZWFkaW5nIGd1aWRlIG9uIHRoZSBjb21wdXRlciwgdGhhdCdzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSB3aXRoIGR5c2xleGlhLiIsCiAgIm5hbWUiOiAiUmVhZGluZyBTdHJpcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZWFkaW5nc3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} , {"uuid": "gnome-clipboard@b00f.github.io", "name": "Gnome Clipboard", "pname": "gnome-clipboard", "description": "A gnome shell extension to manage your clipboard.", "link": "https://extensions.gnome.org/extension/4422/gnome-clipboard/", "shell_version_map": {"38": {"version": "8", "sha256": "1zgymry549c6pmj1c0f6gvpyyfj0z93fwbhhxa67fx3nf95gb3kv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJnbm9tZS1jbGlwYm9hcmRAYjAwZi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "10", "sha256": "193n38mi38pr07cch1ma5rpkdkk6jkf37m3yfrhmndcqb6brm6i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYjAwZi9nbm9tZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogImdub21lLWNsaXBib2FyZEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "193n38mi38pr07cch1ma5rpkdkk6jkf37m3yfrhmndcqb6brm6i0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYjAwZi9nbm9tZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogImdub21lLWNsaXBib2FyZEBiMDBmLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} -, {"uuid": "thanatophobia@yatx.one", "name": "Thanatophobia", "pname": "thanatophobia", "description": "Displays your age in real time. \n\nGreat source of motivation according to terror management theory!", "link": "https://extensions.gnome.org/extension/4425/thanatophobia/", "shell_version_map": {"40": {"version": "7", "sha256": "0rk4yf62pv2mqfzmy56p5c57zjdml1953kycs78305c005ckcycc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXG5cbkdyZWF0IHNvdXJjZSBvZiBtb3RpdmF0aW9uIGFjY29yZGluZyB0byB0ZXJyb3IgbWFuYWdlbWVudCB0aGVvcnkhIiwKICAibmFtZSI6ICJUaGFuYXRvcGhvYmlhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aW9uc3ZlcnJ5ZnVsL3RoYW5hdG9waG9iaWEiLAogICJ1dWlkIjogInRoYW5hdG9waG9iaWFAeWF0eC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0rk4yf62pv2mqfzmy56p5c57zjdml1953kycs78305c005ckcycc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXG5cbkdyZWF0IHNvdXJjZSBvZiBtb3RpdmF0aW9uIGFjY29yZGluZyB0byB0ZXJyb3IgbWFuYWdlbWVudCB0aGVvcnkhIiwKICAibmFtZSI6ICJUaGFuYXRvcGhvYmlhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90aW9uc3ZlcnJ5ZnVsL3RoYW5hdG9waG9iaWEiLAogICJ1dWlkIjogInRoYW5hdG9waG9iaWFAeWF0eC5vbmUiLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "thanatophobia@yatx.one", "name": "Thanatophobia", "pname": "thanatophobia", "description": "Displays your age in real time. \r\n\r\nGreat source of motivation according to terror management theory!", "link": "https://extensions.gnome.org/extension/4425/thanatophobia/", "shell_version_map": {"40": {"version": "7", "sha256": "0r7j13mgr5fd0v3q1ncmwj7mb5wg8yrxxr0hda197728lmwq0i8x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXHJcblxyXG5HcmVhdCBzb3VyY2Ugb2YgbW90aXZhdGlvbiBhY2NvcmRpbmcgdG8gdGVycm9yIG1hbmFnZW1lbnQgdGhlb3J5ISIsCiAgIm5hbWUiOiAiVGhhbmF0b3Bob2JpYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGlvbnN2ZXJyeWZ1bC90aGFuYXRvcGhvYmlhIiwKICAidXVpZCI6ICJ0aGFuYXRvcGhvYmlhQHlhdHgub25lIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0r7j13mgr5fd0v3q1ncmwj7mb5wg8yrxxr0hda197728lmwq0i8x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXHJcblxyXG5HcmVhdCBzb3VyY2Ugb2YgbW90aXZhdGlvbiBhY2NvcmRpbmcgdG8gdGVycm9yIG1hbmFnZW1lbnQgdGhlb3J5ISIsCiAgIm5hbWUiOiAiVGhhbmF0b3Bob2JpYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGlvbnN2ZXJyeWZ1bC90aGFuYXRvcGhvYmlhIiwKICAidXVpZCI6ICJ0aGFuYXRvcGhvYmlhQHlhdHgub25lIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "typewriter-kb@zzzheka97.gmail.com", "name": "Typewriter Keyboard", "pname": "typewriter-keyboard", "description": "Add a typewriter effect to your keyboard.\n \nThis extension is based on typewriter-kb application \n(https://github.com/ZhekehZ/linux-typewriter-kb), which \nis required to run the extension, but is not part of it.\n \n-------------------------------------------\nIcons made by Freepik from www.flaticon.com", "link": "https://extensions.gnome.org/extension/4427/typewriter-keyboard/", "shell_version_map": {"38": {"version": "2", "sha256": "1zmlmijkm6sgpp00qbrwnxmd4q5dfh07g9w9nynq3ciwxs9fjnai", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHR5cGV3cml0ZXIgZWZmZWN0IHRvIHlvdXIga2V5Ym9hcmQuXG4gXG5UaGlzIGV4dGVuc2lvbiBpcyBiYXNlZCBvbiB0eXBld3JpdGVyLWtiIGFwcGxpY2F0aW9uIFxuKGh0dHBzOi8vZ2l0aHViLmNvbS9aaGVrZWhaL2xpbnV4LXR5cGV3cml0ZXIta2IpLCB3aGljaCBcbmlzIHJlcXVpcmVkIHRvIHJ1biB0aGUgZXh0ZW5zaW9uLCBidXQgaXMgbm90IHBhcnQgb2YgaXQuXG4gXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5JY29ucyBtYWRlIGJ5IEZyZWVwaWsgZnJvbSB3d3cuZmxhdGljb24uY29tIiwKICAibmFtZSI6ICJUeXBld3JpdGVyIEtleWJvYXJkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInR5cGV3cml0ZXIta2JAenp6aGVrYTk3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "dark-side@kamil-galek.pl", "name": "Dark side of Gnome", "pname": "dark-side-of-gnome", "description": "Join the dark side with some of your apps. For now it won't work with every app.", "link": "https://extensions.gnome.org/extension/4430/dark-side-of-gnome/", "shell_version_map": {"40": {"version": "2", "sha256": "08kzwpn22qwgyrps4khwkarn4rakr1rn57wg94wpfgd9pfbgb7ri", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkpvaW4gdGhlIGRhcmsgc2lkZSB3aXRoIHNvbWUgb2YgeW91ciBhcHBzLiBGb3Igbm93IGl0IHdvbid0IHdvcmsgd2l0aCBldmVyeSBhcHAuIiwKICAibmFtZSI6ICJEYXJrIHNpZGUgb2YgR25vbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRhcmstc2lkZUBrYW1pbC1nYWxlay5wbCIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "wizlight@iabhilashjoshi", "name": "Wiz Light", "pname": "wiz-light", "description": "Control Wiz Connected Lights Through Gnome Shell\n\nRequirements:\n #Wiz enabled smart bulb\n #python3 (To install use command \"sudo apt install python3\")\n #pywizlight (To install use command \"pip3 install pywizlight\")\n\nTo Use go to the location where extension is installed (usually stored in \"~/.local/share/gnome-shell/extensions\") and change IP address in extension.js file to your smart bulb's IP address and then extension should work.", "link": "https://extensions.gnome.org/extension/4436/wiz-light/", "shell_version_map": {"38": {"version": "4", "sha256": "0pby93ivqz2ymdskyjp6ajc2c588dbpq7vjj7b7d8mc03hvkap5z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgV2l6IENvbm5lY3RlZCBMaWdodHMgVGhyb3VnaCBHbm9tZSBTaGVsbFxuXG5SZXF1aXJlbWVudHM6XG4gICAgICAgICNXaXogZW5hYmxlZCBzbWFydCBidWxiXG4gICAgICAgICNweXRob24zICAoVG8gaW5zdGFsbCAgdXNlIGNvbW1hbmQgXCJzdWRvIGFwdCBpbnN0YWxsIHB5dGhvbjNcIilcbiAgICAgICAgI3B5d2l6bGlnaHQgKFRvIGluc3RhbGwgdXNlIGNvbW1hbmQgXCJwaXAzIGluc3RhbGwgcHl3aXpsaWdodFwiKVxuXG5UbyBVc2UgZ28gdG8gdGhlIGxvY2F0aW9uIHdoZXJlIGV4dGVuc2lvbiBpcyBpbnN0YWxsZWQgKHVzdWFsbHkgc3RvcmVkIGluIFwifi8ubG9jYWwvc2hhcmUvZ25vbWUtc2hlbGwvZXh0ZW5zaW9uc1wiKSBhbmQgY2hhbmdlIElQIGFkZHJlc3MgaW4gZXh0ZW5zaW9uLmpzIGZpbGUgdG8geW91ciBzbWFydCBidWxiJ3MgSVAgYWRkcmVzcyBhbmQgdGhlbiBleHRlbnNpb24gc2hvdWxkIHdvcmsuIiwKICAibmFtZSI6ICJXaXogTGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbHBoYXNwZWFyL1dpei1MaWdodCIsCiAgInV1aWQiOiAid2l6bGlnaHRAaWFiaGlsYXNoam9zaGkiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "gSnap@micahosborne", "name": "gSnap", "pname": "gsnap", "description": "Organize windows in customizable snap zones like FancyZones on windows.", "link": "https://extensions.gnome.org/extension/4442/gsnap/", "shell_version_map": {"40": {"version": "6", "sha256": "1sm3kmc4i5m9jimly95bf39p5vjl2rnavkkkiiqq0blk725fsa2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIHdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNhaG9zYm9ybmUvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "appswitcheronlyoncurrentworkspace@ermesonsampaio.com", "name": "Alt + Tab only on current workspace", "pname": "alt-tab-only-on-current-workspace", "description": "Force alt + tab to switch only in the current workspace.", "link": "https://extensions.gnome.org/extension/4443/alt-tab-only-on-current-workspace/", "shell_version_map": {"40": {"version": "3", "sha256": "1jl7gi45gz9fliggkwdg44rdqcirh6qxfkvc639vbw2sgmpbmcvw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmNlIGFsdCArIHRhYiB0byBzd2l0Y2ggb25seSBpbiB0aGUgY3VycmVudCB3b3Jrc3BhY2UuIiwKICAibmFtZSI6ICJBbHQgKyBUYWIgb25seSBvbiBjdXJyZW50IHdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lcm1lc29uc2FtcGFpby9hcHAtc3dpdGNoZXItb25seS1vbi1jdXJyZW50LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiYXBwc3dpdGNoZXJvbmx5b25jdXJyZW50d29ya3NwYWNlQGVybWVzb25zYW1wYWlvLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "logomenu@aryan_k", "name": "Logo Menu", "pname": "logo-menu", "description": "Logo Menu - Menu similar to Apple's macOS menu for the GNOME Desktop\nThis extension gives a simple menu along with the ability to get the icon of your distro on top left part of the panel for a great look.\nThe Icon can be customized through settings, it has both Linux and BSD logos.\nfor more screenshots, visit GitHub.\n\nThe default Terminal and Software center can also be changed.\n\nThis extension is a fork of - https://github.com/tofutech/tofumenu\n\nThe original project is no more supported thus I made this.", "link": "https://extensions.gnome.org/extension/4451/logo-menu/", "shell_version_map": {"38": {"version": "8", "sha256": "1kga9gcf1w55ynf99rgd1vy1yzdar00wy746ya9ndc1xzd0k9rjl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FyeWFuMjAvTG9nb21lbnUiLAogICJ1dWlkIjogImxvZ29tZW51QGFyeWFuX2siLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "1kga9gcf1w55ynf99rgd1vy1yzdar00wy746ya9ndc1xzd0k9rjl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FyeWFuMjAvTG9nb21lbnUiLAogICJ1dWlkIjogImxvZ29tZW51QGFyeWFuX2siLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "1kga9gcf1w55ynf99rgd1vy1yzdar00wy746ya9ndc1xzd0k9rjl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FyeWFuMjAvTG9nb21lbnUiLAogICJ1dWlkIjogImxvZ29tZW51QGFyeWFuX2siLAogICJ2ZXJzaW9uIjogOAp9"}}} +, {"uuid": "logomenu@aryan_k", "name": "Logo Menu", "pname": "logo-menu", "description": "Logo Menu - Menu similar to Apple's macOS menu for the GNOME Desktop\nThis extension gives a simple menu along with the ability to get the icon of your distro on top left part of the panel for a great look.\nThe Icon can be customized through settings, it has both Linux and BSD logos.\nfor more screenshots, visit GitHub.\n\nThe default Terminal and Software center can also be changed.\n\nThis extension is a fork of - https://github.com/tofutech/tofumenu\n\nThe original project is no more supported thus I made this.", "link": "https://extensions.gnome.org/extension/4451/logo-menu/", "shell_version_map": {"38": {"version": "10", "sha256": "0d7xmiyj07d8sfw6fsvj5i8pjkmn5m44l0lh0hvbaxsk9h72gj00", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IiwKICAidXVpZCI6ICJsb2dvbWVudUBhcnlhbl9rIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "0d7xmiyj07d8sfw6fsvj5i8pjkmn5m44l0lh0hvbaxsk9h72gj00", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IiwKICAidXVpZCI6ICJsb2dvbWVudUBhcnlhbl9rIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0d7xmiyj07d8sfw6fsvj5i8pjkmn5m44l0lh0hvbaxsk9h72gj00", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IiwKICAidXVpZCI6ICJsb2dvbWVudUBhcnlhbl9rIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "0d7xmiyj07d8sfw6fsvj5i8pjkmn5m44l0lh0hvbaxsk9h72gj00", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IiwKICAidXVpZCI6ICJsb2dvbWVudUBhcnlhbl9rIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "rog-manager@rog", "name": "Rog Asus Manager", "pname": "rog-asus-manager", "description": "Asus ROG manager", "link": "https://extensions.gnome.org/extension/4452/rog-asus-manager/", "shell_version_map": {"38": {"version": "4", "sha256": "194k3qzjd05rki20ww0nv8001aiyp4ih9abv82g64058x8rmnff5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzdXMgUk9HIG1hbmFnZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyb2ctbWFuYWdlciIsCiAgIm5hbWUiOiAiUm9nIEFzdXMgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yb2dtYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxlamFuZHJvLW1vdXJhcy9yb2ctbWFuYWdlciIsCiAgInV1aWQiOiAicm9nLW1hbmFnZXJAcm9nIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "titlebar-screenshot@jmaargh.github.com", "name": "Titlebar Screenshot", "pname": "titlebar-screenshot", "description": "Take screenshots by right-clicking on window titlebars.\n\nVarious configuration options include screenshots can be taken to the clipboard, to a file, or by opening the interactive tool.\n\nAll feedback and bug reports to Issues on the github page.", "link": "https://extensions.gnome.org/extension/4458/titlebar-screenshot/", "shell_version_map": {"38": {"version": "3", "sha256": "1vhphrjq2vyzlknfl3i7f8i3v9f8jcrpwiz26sigklmv3bmzb059", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2Ugc2NyZWVuc2hvdHMgYnkgcmlnaHQtY2xpY2tpbmcgb24gd2luZG93IHRpdGxlYmFycy5cblxuVmFyaW91cyBjb25maWd1cmF0aW9uIG9wdGlvbnMgaW5jbHVkZSBzY3JlZW5zaG90cyBjYW4gYmUgdGFrZW4gdG8gdGhlIGNsaXBib2FyZCwgdG8gYSBmaWxlLCBvciBieSBvcGVuaW5nIHRoZSBpbnRlcmFjdGl2ZSB0b29sLlxuXG5BbGwgZmVlZGJhY2sgYW5kIGJ1ZyByZXBvcnRzIHRvIElzc3VlcyBvbiB0aGUgZ2l0aHViIHBhZ2UuIiwKICAibmFtZSI6ICJUaXRsZWJhciBTY3JlZW5zaG90IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpdGxlYmFyLXNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam1hYXJnaC90aXRsZWJhci1zY3JlZW5zaG90LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGl0bGViYXItc2NyZWVuc2hvdEBqbWFhcmdoLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1vhphrjq2vyzlknfl3i7f8i3v9f8jcrpwiz26sigklmv3bmzb059", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2Ugc2NyZWVuc2hvdHMgYnkgcmlnaHQtY2xpY2tpbmcgb24gd2luZG93IHRpdGxlYmFycy5cblxuVmFyaW91cyBjb25maWd1cmF0aW9uIG9wdGlvbnMgaW5jbHVkZSBzY3JlZW5zaG90cyBjYW4gYmUgdGFrZW4gdG8gdGhlIGNsaXBib2FyZCwgdG8gYSBmaWxlLCBvciBieSBvcGVuaW5nIHRoZSBpbnRlcmFjdGl2ZSB0b29sLlxuXG5BbGwgZmVlZGJhY2sgYW5kIGJ1ZyByZXBvcnRzIHRvIElzc3VlcyBvbiB0aGUgZ2l0aHViIHBhZ2UuIiwKICAibmFtZSI6ICJUaXRsZWJhciBTY3JlZW5zaG90IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpdGxlYmFyLXNjcmVlbnNob3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam1hYXJnaC90aXRsZWJhci1zY3JlZW5zaG90LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGl0bGViYXItc2NyZWVuc2hvdEBqbWFhcmdoLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "expandable-notifications@kaan.g.inam.org", "name": "Expandable Notifications", "pname": "expandable-notifications", "description": "Makes the notifications in the notification list expandable. Using gsettings, you can choose between three modes: AUTO, ARROW and CRITICAL.\n\nAUTO will expand the notifications in the notification list automatically. \nARROW adds an arrow that lets you choose what to expand or unexpand. \nCRITICAL is similar to arrow, but expands notifications with the urgency critical automatically. \n\nFor more information and an example command to change the mode, I recommend to look at the repository.\"\n\nThe old repository has been deleted, however I reposted the extension on GitHub.", "link": "https://extensions.gnome.org/extension/4463/expandable-notifications/", "shell_version_map": {"40": {"version": "8", "sha256": "04i0hxsv41wfxg8z590mgn2klma47mgcz7qr52ca2llpd4dkrjj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC5cblxuQVVUTyB3aWxsIGV4cGFuZCB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbm90aWZpY2F0aW9uIGxpc3QgYXV0b21hdGljYWxseS4gXG5BUlJPVyBhZGRzIGFuIGFycm93IHRoYXQgbGV0cyB5b3UgY2hvb3NlIHdoYXQgdG8gZXhwYW5kIG9yIHVuZXhwYW5kLiBcbkNSSVRJQ0FMIGlzIHNpbWlsYXIgdG8gYXJyb3csIGJ1dCBleHBhbmRzIG5vdGlmaWNhdGlvbnMgd2l0aCB0aGUgdXJnZW5jeSBjcml0aWNhbCBhdXRvbWF0aWNhbGx5LiBcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGFuIGV4YW1wbGUgY29tbWFuZCB0byBjaGFuZ2UgdGhlIG1vZGUsIEkgcmVjb21tZW5kIHRvIGxvb2sgYXQgdGhlIHJlcG9zaXRvcnkuXCJcblxuVGhlIG9sZCByZXBvc2l0b3J5IGhhcyBiZWVuIGRlbGV0ZWQsIGhvd2V2ZXIgSSByZXBvc3RlZCB0aGUgZXh0ZW5zaW9uIG9uIEdpdEh1Yi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thYW5naW5hbS9leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogImV4cGFuZGFibGUtbm90aWZpY2F0aW9uc0BrYWFuLmcuaW5hbS5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "04i0hxsv41wfxg8z590mgn2klma47mgcz7qr52ca2llpd4dkrjj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC5cblxuQVVUTyB3aWxsIGV4cGFuZCB0aGUgbm90aWZpY2F0aW9ucyBpbiB0aGUgbm90aWZpY2F0aW9uIGxpc3QgYXV0b21hdGljYWxseS4gXG5BUlJPVyBhZGRzIGFuIGFycm93IHRoYXQgbGV0cyB5b3UgY2hvb3NlIHdoYXQgdG8gZXhwYW5kIG9yIHVuZXhwYW5kLiBcbkNSSVRJQ0FMIGlzIHNpbWlsYXIgdG8gYXJyb3csIGJ1dCBleHBhbmRzIG5vdGlmaWNhdGlvbnMgd2l0aCB0aGUgdXJnZW5jeSBjcml0aWNhbCBhdXRvbWF0aWNhbGx5LiBcblxuRm9yIG1vcmUgaW5mb3JtYXRpb24gYW5kIGFuIGV4YW1wbGUgY29tbWFuZCB0byBjaGFuZ2UgdGhlIG1vZGUsIEkgcmVjb21tZW5kIHRvIGxvb2sgYXQgdGhlIHJlcG9zaXRvcnkuXCJcblxuVGhlIG9sZCByZXBvc2l0b3J5IGhhcyBiZWVuIGRlbGV0ZWQsIGhvd2V2ZXIgSSByZXBvc3RlZCB0aGUgZXh0ZW5zaW9uIG9uIEdpdEh1Yi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2thYW5naW5hbS9leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogImV4cGFuZGFibGUtbm90aWZpY2F0aW9uc0BrYWFuLmcuaW5hbS5vcmciLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "orange-share@Yannis4444.github.com", "name": "Orange Share", "pname": "orange-share", "description": "A small python server that accepts requests from an apple shortcut to allow sharing all sorts of media from iOS. It allows sending content right from the share sheet - similar to AirDrop between Apple Devices", "link": "https://extensions.gnome.org/extension/4469/orange-share/", "shell_version_map": {"40": {"version": "7", "sha256": "14xc3j2k6fjh0nif22j3q0xk52ba2qpj96rq80g6cv3cyy8ihi2b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgcHl0aG9uIHNlcnZlciB0aGF0IGFjY2VwdHMgcmVxdWVzdHMgZnJvbSBhbiBhcHBsZSBzaG9ydGN1dCB0byBhbGxvdyBzaGFyaW5nIGFsbCBzb3J0cyBvZiBtZWRpYSBmcm9tIGlPUy4gSXQgYWxsb3dzIHNlbmRpbmcgY29udGVudCByaWdodCBmcm9tIHRoZSBzaGFyZSBzaGVldCAtIHNpbWlsYXIgdG8gQWlyRHJvcCBiZXR3ZWVuIEFwcGxlIERldmljZXMiLAogICJuYW1lIjogIk9yYW5nZSBTaGFyZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ZYW5uaXM0NDQ0L09yYW5nZS1TaGFyZS8iLAogICJ1dWlkIjogIm9yYW5nZS1zaGFyZUBZYW5uaXM0NDQ0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "mediacontrols@cliffniff.github.com", "name": "Media Controls", "pname": "media-controls", "description": "Show controls and information of the currently playing media in the panel.\n\n - Highly customizable\n - Support GNOME 3.36(beta) , 3.38, 40, 41\n - Caches album art\n - Control every element in the extension", "link": "https://extensions.gnome.org/extension/4470/media-controls/", "shell_version_map": {"38": {"version": "20", "sha256": "0cvn15w11vgjpgrwb7436gyy6v7zlbnfk8bd34wyijfd9ny7d0xj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MVxuICAgIC0gQ2FjaGVzIGFsYnVtIGFydFxuICAgIC0gQ29udHJvbCBldmVyeSBlbGVtZW50IGluIHRoZSBleHRlbnNpb24iLAogICJuYW1lIjogIk1lZGlhIENvbnRyb2xzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lZGlhY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "20", "sha256": "0cvn15w11vgjpgrwb7436gyy6v7zlbnfk8bd34wyijfd9ny7d0xj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MVxuICAgIC0gQ2FjaGVzIGFsYnVtIGFydFxuICAgIC0gQ29udHJvbCBldmVyeSBlbGVtZW50IGluIHRoZSBleHRlbnNpb24iLAogICJuYW1lIjogIk1lZGlhIENvbnRyb2xzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lZGlhY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "20", "sha256": "0cvn15w11vgjpgrwb7436gyy6v7zlbnfk8bd34wyijfd9ny7d0xj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MVxuICAgIC0gQ2FjaGVzIGFsYnVtIGFydFxuICAgIC0gQ29udHJvbCBldmVyeSBlbGVtZW50IGluIHRoZSBleHRlbnNpb24iLAogICJuYW1lIjogIk1lZGlhIENvbnRyb2xzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lZGlhY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}}} -, {"uuid": "sp-tray@sp-tray.esenliyim.github.com", "name": "spotify-tray", "pname": "spotify-tray", "description": "Adds a simple label to the panel that shows currently playing song on Spotify, nothing more", "link": "https://extensions.gnome.org/extension/4472/spotify-tray/", "shell_version_map": {"38": {"version": "10", "sha256": "0j8sisaidsmybkf6agf580pqppamvs43dbmqjb8j769i1gdq0jp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzaW1wbGUgbGFiZWwgdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgY3VycmVudGx5IHBsYXlpbmcgc29uZyBvbiBTcG90aWZ5LCBub3RoaW5nIG1vcmUiLAogICJuYW1lIjogInNwb3RpZnktdHJheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcC10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "0j8sisaidsmybkf6agf580pqppamvs43dbmqjb8j769i1gdq0jp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzaW1wbGUgbGFiZWwgdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgY3VycmVudGx5IHBsYXlpbmcgc29uZyBvbiBTcG90aWZ5LCBub3RoaW5nIG1vcmUiLAogICJuYW1lIjogInNwb3RpZnktdHJheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcC10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0j8sisaidsmybkf6agf580pqppamvs43dbmqjb8j769i1gdq0jp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzaW1wbGUgbGFiZWwgdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgY3VycmVudGx5IHBsYXlpbmcgc29uZyBvbiBTcG90aWZ5LCBub3RoaW5nIG1vcmUiLAogICJuYW1lIjogInNwb3RpZnktdHJheSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcC10cmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"uuid": "sp-tray@sp-tray.esenliyim.github.com", "name": "spotify-tray", "pname": "spotify-tray", "description": "Adds a simple label to the panel that shows currently playing song or podcast on Spotify, nothing more", "link": "https://extensions.gnome.org/extension/4472/spotify-tray/", "shell_version_map": {"38": {"version": "11", "sha256": "0w3wvq4qaz9y34pmrs0c9vq9zg9jnqssl9is7lip9957xq3k0him", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzaW1wbGUgbGFiZWwgdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgY3VycmVudGx5IHBsYXlpbmcgc29uZyBvciBwb2RjYXN0IG9uIFNwb3RpZnksIG5vdGhpbmcgbW9yZSIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VzZW5saXlpbS9zcC10cmF5IiwKICAidXVpZCI6ICJzcC10cmF5QHNwLXRyYXkuZXNlbmxpeWltLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "0w3wvq4qaz9y34pmrs0c9vq9zg9jnqssl9is7lip9957xq3k0him", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzaW1wbGUgbGFiZWwgdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgY3VycmVudGx5IHBsYXlpbmcgc29uZyBvciBwb2RjYXN0IG9uIFNwb3RpZnksIG5vdGhpbmcgbW9yZSIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VzZW5saXlpbS9zcC10cmF5IiwKICAidXVpZCI6ICJzcC10cmF5QHNwLXRyYXkuZXNlbmxpeWltLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0w3wvq4qaz9y34pmrs0c9vq9zg9jnqssl9is7lip9957xq3k0him", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzaW1wbGUgbGFiZWwgdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgY3VycmVudGx5IHBsYXlpbmcgc29uZyBvciBwb2RjYXN0IG9uIFNwb3RpZnksIG5vdGhpbmcgbW9yZSIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VzZW5saXlpbS9zcC10cmF5IiwKICAidXVpZCI6ICJzcC10cmF5QHNwLXRyYXkuZXNlbmxpeWltLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "aws-default-profile-switcher@kevin-chappell.com", "name": "AWS Default Profile Switcher", "pname": "aws-default-profile-switcher", "description": "Gnome shell extension for quickly setting named profiles as the default", "link": "https://extensions.gnome.org/extension/4473/aws-default-profile-switcher/", "shell_version_map": {"38": {"version": "3", "sha256": "0mal1290kdvqv60m0ps42hnx801knh5vd4mlwg1z7ydj9sw31cfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgcXVpY2tseSBzZXR0aW5nIG5hbWVkIHByb2ZpbGVzIGFzIHRoZSBkZWZhdWx0IiwKICAibmFtZSI6ICJBV1MgRGVmYXVsdCBQcm9maWxlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5jaGFwcGVsbC9hd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJhd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyQGtldmluLWNoYXBwZWxsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "hide-panel-for-fullscreen-windows-only@github.freder", "name": "Hide panel (only when active window is fullscreen)", "pname": "hide-panel-only-when-active-window-is-fullscreen", "description": "hide top panel only when a fullscreen application has focus", "link": "https://extensions.gnome.org/extension/4475/hide-panel-only-when-active-window-is-fullscreen/", "shell_version_map": {"40": {"version": "2", "sha256": "1hd5agdjq73qiqip0m3grmlxk8klp26pd71cz555414mi3f9mww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGUgdG9wIHBhbmVsIG9ubHkgd2hlbiBhIGZ1bGxzY3JlZW4gYXBwbGljYXRpb24gaGFzIGZvY3VzIiwKICAibmFtZSI6ICJIaWRlIHBhbmVsIChvbmx5IHdoZW4gYWN0aXZlIHdpbmRvdyBpcyBmdWxsc2NyZWVuKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZXIvaGlkZS1wYW5lbC1mb3ItZnVsbHNjcmVlbi13aW5kb3dzLW9ubHkiLAogICJ1dWlkIjogImhpZGUtcGFuZWwtZm9yLWZ1bGxzY3JlZW4td2luZG93cy1vbmx5QGdpdGh1Yi5mcmVkZXIiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "netspeed@alynx.one", "name": "Net Speed", "pname": "net-speed", "description": "Show current net speed on panel.", "link": "https://extensions.gnome.org/extension/4478/net-speed/", "shell_version_map": {"40": {"version": "2", "sha256": "0j48ai7nqkpr0ymypsicdp7nw59hx9rgya8qws58wx56q9bznl69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBuZXQgc3BlZWQgb24gcGFuZWwuIiwKICAibmFtZSI6ICJOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5ldHNwZWVkQGFseW54Lm9uZSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "forge@jmmaranan.com", "name": "Forge", "pname": "forge", "description": "Tiling and window manager for GNOME\n\nMAJOR CHANGES\n\n - New Tabbed Tiling Implementation via St.Widget.\n - New style declarations will reset the custom stylesheets for users when updating. Old styles will be backed up as $HOME/.config/forge/stylesheet/forge/stylesheet.css.bak.\n\n Please report bugs/issues on https://github.com/jmmaranan/forge/issues", "link": "https://extensions.gnome.org/extension/4481/forge/", "shell_version_map": {"38": {"version": "38", "sha256": "0hniflq2x8b1cwh5imlwbbmb703jd46w8828xng6gbw966l093cf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbk1BSk9SIENIQU5HRVNcblxuIC0gTmV3IFRhYmJlZCBUaWxpbmcgSW1wbGVtZW50YXRpb24gdmlhIFN0LldpZGdldC5cbiAtIE5ldyBzdHlsZSBkZWNsYXJhdGlvbnMgd2lsbCByZXNldCB0aGUgY3VzdG9tIHN0eWxlc2hlZXRzIGZvciB1c2VycyB3aGVuIHVwZGF0aW5nLiBPbGQgc3R5bGVzIHdpbGwgYmUgYmFja2VkIHVwIGFzICRIT01FLy5jb25maWcvZm9yZ2Uvc3R5bGVzaGVldC9mb3JnZS9zdHlsZXNoZWV0LmNzcy5iYWsuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIGh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZm9yZ2UiLAogICJuYW1lIjogIkZvcmdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlIiwKICAidXVpZCI6ICJmb3JnZUBqbW1hcmFuYW4uY29tIiwKICAidmVyc2lvbiI6IDM4Cn0="}, "40": {"version": "43", "sha256": "07qa8rlh9rls0hfqylzh7ivdn5s01lrbvh4kva620sw7qcr14l1j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbk1BSk9SIENIQU5HRVNcblxuIC0gTmV3IFRhYmJlZCBUaWxpbmcgSW1wbGVtZW50YXRpb24gdmlhIFN0LldpZGdldC5cbiAtIE5ldyBzdHlsZSBkZWNsYXJhdGlvbnMgd2lsbCByZXNldCB0aGUgY3VzdG9tIHN0eWxlc2hlZXRzIGZvciB1c2VycyB3aGVuIHVwZGF0aW5nLiBPbGQgc3R5bGVzIHdpbGwgYmUgYmFja2VkIHVwIGFzICRIT01FLy5jb25maWcvZm9yZ2Uvc3R5bGVzaGVldC9mb3JnZS9zdHlsZXNoZWV0LmNzcy5iYWsuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIGh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZm9yZ2UiLAogICJuYW1lIjogIkZvcmdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNDMKfQ=="}, "41": {"version": "43", "sha256": "07qa8rlh9rls0hfqylzh7ivdn5s01lrbvh4kva620sw7qcr14l1j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbk1BSk9SIENIQU5HRVNcblxuIC0gTmV3IFRhYmJlZCBUaWxpbmcgSW1wbGVtZW50YXRpb24gdmlhIFN0LldpZGdldC5cbiAtIE5ldyBzdHlsZSBkZWNsYXJhdGlvbnMgd2lsbCByZXNldCB0aGUgY3VzdG9tIHN0eWxlc2hlZXRzIGZvciB1c2VycyB3aGVuIHVwZGF0aW5nLiBPbGQgc3R5bGVzIHdpbGwgYmUgYmFja2VkIHVwIGFzICRIT01FLy5jb25maWcvZm9yZ2Uvc3R5bGVzaGVldC9mb3JnZS9zdHlsZXNoZWV0LmNzcy5iYWsuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIGh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZm9yZ2UiLAogICJuYW1lIjogIkZvcmdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNDMKfQ=="}}} +, {"uuid": "forge@jmmaranan.com", "name": "Forge", "pname": "forge", "description": "Tiling and window manager for GNOME\n\nMAJOR CHANGES\n\n - New Tabbed Tiling Implementation via St.Widget.\n - New style declarations will reset the custom stylesheets for users when updating. Old styles will be backed up as $HOME/.config/forge/stylesheet/forge/stylesheet.css.bak.\n\n Please report bugs/issues on https://github.com/jmmaranan/forge/issues", "link": "https://extensions.gnome.org/extension/4481/forge/", "shell_version_map": {"38": {"version": "38", "sha256": "0hniflq2x8b1cwh5imlwbbmb703jd46w8828xng6gbw966l093cf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbk1BSk9SIENIQU5HRVNcblxuIC0gTmV3IFRhYmJlZCBUaWxpbmcgSW1wbGVtZW50YXRpb24gdmlhIFN0LldpZGdldC5cbiAtIE5ldyBzdHlsZSBkZWNsYXJhdGlvbnMgd2lsbCByZXNldCB0aGUgY3VzdG9tIHN0eWxlc2hlZXRzIGZvciB1c2VycyB3aGVuIHVwZGF0aW5nLiBPbGQgc3R5bGVzIHdpbGwgYmUgYmFja2VkIHVwIGFzICRIT01FLy5jb25maWcvZm9yZ2Uvc3R5bGVzaGVldC9mb3JnZS9zdHlsZXNoZWV0LmNzcy5iYWsuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIGh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZm9yZ2UiLAogICJuYW1lIjogIkZvcmdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vam1tYXJhbmFuL2ZvcmdlIiwKICAidXVpZCI6ICJmb3JnZUBqbW1hcmFuYW4uY29tIiwKICAidmVyc2lvbiI6IDM4Cn0="}, "40": {"version": "44", "sha256": "138nmvjlpc2gszbnav5kp649mhhp7fhk9c4y9jqlsc7rzjcy7kzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbk1BSk9SIENIQU5HRVNcblxuIC0gTmV3IFRhYmJlZCBUaWxpbmcgSW1wbGVtZW50YXRpb24gdmlhIFN0LldpZGdldC5cbiAtIE5ldyBzdHlsZSBkZWNsYXJhdGlvbnMgd2lsbCByZXNldCB0aGUgY3VzdG9tIHN0eWxlc2hlZXRzIGZvciB1c2VycyB3aGVuIHVwZGF0aW5nLiBPbGQgc3R5bGVzIHdpbGwgYmUgYmFja2VkIHVwIGFzICRIT01FLy5jb25maWcvZm9yZ2Uvc3R5bGVzaGVldC9mb3JnZS9zdHlsZXNoZWV0LmNzcy5iYWsuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIGh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZm9yZ2UiLAogICJuYW1lIjogIkZvcmdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "41": {"version": "44", "sha256": "138nmvjlpc2gszbnav5kp649mhhp7fhk9c4y9jqlsc7rzjcy7kzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyBhbmQgd2luZG93IG1hbmFnZXIgZm9yIEdOT01FXG5cbk1BSk9SIENIQU5HRVNcblxuIC0gTmV3IFRhYmJlZCBUaWxpbmcgSW1wbGVtZW50YXRpb24gdmlhIFN0LldpZGdldC5cbiAtIE5ldyBzdHlsZSBkZWNsYXJhdGlvbnMgd2lsbCByZXNldCB0aGUgY3VzdG9tIHN0eWxlc2hlZXRzIGZvciB1c2VycyB3aGVuIHVwZGF0aW5nLiBPbGQgc3R5bGVzIHdpbGwgYmUgYmFja2VkIHVwIGFzICRIT01FLy5jb25maWcvZm9yZ2Uvc3R5bGVzaGVldC9mb3JnZS9zdHlsZXNoZWV0LmNzcy5iYWsuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MvaXNzdWVzIG9uIGh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UvaXNzdWVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZm9yZ2UiLAogICJuYW1lIjogIkZvcmdlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZvcmdlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qbW1hcmFuYW4vZm9yZ2UiLAogICJ1dWlkIjogImZvcmdlQGptbWFyYW5hbi5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}}} , {"uuid": "autonightlight@zefty.github.io", "name": "Auto Night Light", "pname": "auto-night-light", "description": "Automatically adjust night light", "link": "https://extensions.gnome.org/extension/4482/auto-night-light/", "shell_version_map": {"38": {"version": "7", "sha256": "0v76v4z82agn1ay8c0mb2jgnzjf1h9kcp13jhvypcigalfq9qp4n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgYWRqdXN0IG5pZ2h0IGxpZ2h0IiwKICAibmFtZSI6ICJBdXRvIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aZWZ0eS9BdXRvTmlnaHRMaWdodCIsCiAgInV1aWQiOiAiYXV0b25pZ2h0bGlnaHRAemVmdHkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "0v76v4z82agn1ay8c0mb2jgnzjf1h9kcp13jhvypcigalfq9qp4n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgYWRqdXN0IG5pZ2h0IGxpZ2h0IiwKICAibmFtZSI6ICJBdXRvIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aZWZ0eS9BdXRvTmlnaHRMaWdodCIsCiAgInV1aWQiOiAiYXV0b25pZ2h0bGlnaHRAemVmdHkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0v76v4z82agn1ay8c0mb2jgnzjf1h9kcp13jhvypcigalfq9qp4n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgYWRqdXN0IG5pZ2h0IGxpZ2h0IiwKICAibmFtZSI6ICJBdXRvIE5pZ2h0IExpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aZWZ0eS9BdXRvTmlnaHRMaWdodCIsCiAgInV1aWQiOiAiYXV0b25pZ2h0bGlnaHRAemVmdHkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} -, {"uuid": "favourites-in-appgrid@harshadgavali.gitlab.org", "name": "Favourites in AppGrid", "pname": "favourites-in-appgrid", "description": "Keep favourite applications in AppGrid", "link": "https://extensions.gnome.org/extension/4485/favourites-in-appgrid/", "shell_version_map": {"40": {"version": "1", "sha256": "1zcbs36kcmw50wgxkqn22abh8g1nx17p48vbpzk5x2842mn8shaz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2hhcnNoYWRnYXZhbGkvZmF2b3VyaXRlcy1pbi1hcHBncmlkLyIsCiAgInV1aWQiOiAiZmF2b3VyaXRlcy1pbi1hcHBncmlkQGhhcnNoYWRnYXZhbGkuZ2l0bGFiLm9yZyIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "1zcbs36kcmw50wgxkqn22abh8g1nx17p48vbpzk5x2842mn8shaz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2hhcnNoYWRnYXZhbGkvZmF2b3VyaXRlcy1pbi1hcHBncmlkLyIsCiAgInV1aWQiOiAiZmF2b3VyaXRlcy1pbi1hcHBncmlkQGhhcnNoYWRnYXZhbGkuZ2l0bGFiLm9yZyIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "favourites-in-appgrid@harshadgavali.gitlab.org", "name": "Favourites in AppGrid", "pname": "favourites-in-appgrid", "description": "Keep favourite applications in AppGrid", "link": "https://extensions.gnome.org/extension/4485/favourites-in-appgrid/", "shell_version_map": {"40": {"version": "2", "sha256": "0cbz05qmn0i7c3591c5h5znq4fp90xc9dz1jdaj213pybynqdphl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9oYXJzaGFkZ2F2YWxpL2Zhdm91cml0ZXMtaW4tYXBwZ3JpZC8iLAogICJ1dWlkIjogImZhdm91cml0ZXMtaW4tYXBwZ3JpZEBoYXJzaGFkZ2F2YWxpLmdpdGxhYi5vcmciLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "0cbz05qmn0i7c3591c5h5znq4fp90xc9dz1jdaj213pybynqdphl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9oYXJzaGFkZ2F2YWxpL2Zhdm91cml0ZXMtaW4tYXBwZ3JpZC8iLAogICJ1dWlkIjogImZhdm91cml0ZXMtaW4tYXBwZ3JpZEBoYXJzaGFkZ2F2YWxpLmdpdGxhYi5vcmciLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "0cbz05qmn0i7c3591c5h5znq4fp90xc9dz1jdaj213pybynqdphl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgZmF2b3VyaXRlIGFwcGxpY2F0aW9ucyBpbiBBcHBHcmlkIiwKICAibmFtZSI6ICJGYXZvdXJpdGVzIGluIEFwcEdyaWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9oYXJzaGFkZ2F2YWxpL2Zhdm91cml0ZXMtaW4tYXBwZ3JpZC8iLAogICJ1dWlkIjogImZhdm91cml0ZXMtaW4tYXBwZ3JpZEBoYXJzaGFkZ2F2YWxpLmdpdGxhYi5vcmciLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "dark-variant@hardpixel.eu", "name": "Dark Variant", "pname": "dark-variant", "description": "Enable dark window decorations on applications. This extension is not compatible with applications that use Client Side Decorations (CSD).\n\nThis extension depends on some Xorg utilities. To install them:\n- Debian/Ubuntu: apt install x11-utils\n- Fedora/RHEL: dnf install xorg-x11-utils\n- Arch: pacman -S xorg-xprop\n\n*Settings are provided to enable/disable applications.", "link": "https://extensions.gnome.org/extension/4488/dark-variant/", "shell_version_map": {"40": {"version": "3", "sha256": "08ywrbcqzijfw9hxlxn56j0dbavq413sbf2qlf6xpc9mi825jhin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXJrLXZhcmlhbnQiLAogICJ1dWlkIjogImRhcmstdmFyaWFudEBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "08ywrbcqzijfw9hxlxn56j0dbavq413sbf2qlf6xpc9mi825jhin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBkYXJrIHdpbmRvdyBkZWNvcmF0aW9ucyBvbiBhcHBsaWNhdGlvbnMuIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBjb21wYXRpYmxlIHdpdGggYXBwbGljYXRpb25zIHRoYXQgdXNlIENsaWVudCBTaWRlIERlY29yYXRpb25zIChDU0QpLlxuXG5UaGlzIGV4dGVuc2lvbiBkZXBlbmRzIG9uIHNvbWUgWG9yZyB1dGlsaXRpZXMuIFRvIGluc3RhbGwgdGhlbTpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgeDExLXV0aWxzXG4tIEZlZG9yYS9SSEVMOiBkbmYgaW5zdGFsbCB4b3JnLXgxMS11dGlsc1xuLSBBcmNoOiBwYWNtYW4gLVMgeG9yZy14cHJvcFxuXG4qU2V0dGluZ3MgYXJlIHByb3ZpZGVkIHRvIGVuYWJsZS9kaXNhYmxlIGFwcGxpY2F0aW9ucy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXJrLXZhcmlhbnQiLAogICJuYW1lIjogIkRhcmsgVmFyaWFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXJrLXZhcmlhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXJrLXZhcmlhbnQiLAogICJ1dWlkIjogImRhcmstdmFyaWFudEBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "PrivacyMenu@stuarthayhurst", "name": "Privacy Settings Menu", "pname": "privacy-settings-menu", "description": "Add a privacy menu to the top bar for quick access to privacy settings", "link": "https://extensions.gnome.org/extension/4491/privacy-settings-menu/", "shell_version_map": {"38": {"version": "4", "sha256": "1kdkm032xz72cycaj85q1yjb7s6bv3srysp4sn69phclldyg6bhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBTZXR0aW5ncyBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9wcml2YWN5LW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1kdkm032xz72cycaj85q1yjb7s6bv3srysp4sn69phclldyg6bhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBTZXR0aW5ncyBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9wcml2YWN5LW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1kdkm032xz72cycaj85q1yjb7s6bv3srysp4sn69phclldyg6bhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBTZXR0aW5ncyBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdHVhcnRoYXlodXJzdC9wcml2YWN5LW1lbnUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "hide-panel-lite@fthx", "name": "Hide Panel Lite", "pname": "hide-panel-light-version-without-hot-corner", "description": "Hide top panel except in overview.\n\nFor those who don't need a hot corner (e.g. running GNOME 40+ with three fingers gestures). Very very light extension. No options, no bugs. ;-)", "link": "https://extensions.gnome.org/extension/4496/hide-panel-light-version-without-hot-corner/", "shell_version_map": {"38": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "ssm-gnome@lgiki.net", "name": "Simple System Monitor", "pname": "simple-system-monitor", "description": "Show current CPU usage, memory usage and net speed on panel.\n\nThis is a fork of https://extensions.gnome.org/extension/4478/net-speed/.", "link": "https://extensions.gnome.org/extension/4506/simple-system-monitor/", "shell_version_map": {"38": {"version": "6", "sha256": "0xggfkx15yxjm4mpi2nxg1704j7k37xfwxmj6sklm0l3b0v1x029", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuXG5UaGlzIGlzIGEgZm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80NDc4L25ldC1zcGVlZC8uIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xHaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW1wbGUtc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogInNzbS1nbm9tZUBsZ2lraS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "0xggfkx15yxjm4mpi2nxg1704j7k37xfwxmj6sklm0l3b0v1x029", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuXG5UaGlzIGlzIGEgZm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80NDc4L25ldC1zcGVlZC8uIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xHaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW1wbGUtc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogInNzbS1nbm9tZUBsZ2lraS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0xggfkx15yxjm4mpi2nxg1704j7k37xfwxmj6sklm0l3b0v1x029", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuXG5UaGlzIGlzIGEgZm9yayBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80NDc4L25ldC1zcGVlZC8uIiwKICAibmFtZSI6ICJTaW1wbGUgU3lzdGVtIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xHaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW1wbGUtc3lzdGVtLW1vbml0b3IiLAogICJ1dWlkIjogInNzbS1nbm9tZUBsZ2lraS5uZXQiLAogICJ2ZXJzaW9uIjogNgp9"}}} +, {"uuid": "PrivacyMenu@stuarthayhurst", "name": "Privacy Settings Menu", "pname": "privacy-settings-menu", "description": "Add a privacy menu to the top bar for quick access to privacy settings", "link": "https://extensions.gnome.org/extension/4491/privacy-settings-menu/", "shell_version_map": {"38": {"version": "5", "sha256": "1x6rza2gv7qchkv75cpcy8jx7nl5f8dg5wrjvawvqv4h0kdlcgc9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBTZXR0aW5ncyBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvcHJpdmFjeS1tZW51LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1x6rza2gv7qchkv75cpcy8jx7nl5f8dg5wrjvawvqv4h0kdlcgc9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBTZXR0aW5ncyBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvcHJpdmFjeS1tZW51LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1x6rza2gv7qchkv75cpcy8jx7nl5f8dg5wrjvawvqv4h0kdlcgc9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBTZXR0aW5ncyBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvcHJpdmFjeS1tZW51LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "1x6rza2gv7qchkv75cpcy8jx7nl5f8dg5wrjvawvqv4h0kdlcgc9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHByaXZhY3kgbWVudSB0byB0aGUgdG9wIGJhciBmb3IgcXVpY2sgYWNjZXNzIHRvIHByaXZhY3kgc2V0dGluZ3MiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJQcml2YWN5TWVudUBzdHVhcnRoYXlodXJzdCIsCiAgIm5hbWUiOiAiUHJpdmFjeSBTZXR0aW5ncyBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvcHJpdmFjeS1tZW51LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiUHJpdmFjeU1lbnVAc3R1YXJ0aGF5aHVyc3QiLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "hide-panel-lite@fthx", "name": "Hide Panel Lite", "pname": "hide-panel-light-version-without-hot-corner", "description": "Hide top panel except in overview.\n\nFor those who don't need a hot corner (e.g. running GNOME 40+ with three fingers gestures). Very very light extension. No options, no bugs. ;-)", "link": "https://extensions.gnome.org/extension/4496/hide-panel-light-version-without-hot-corner/", "shell_version_map": {"38": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "13kwd7sh0w34881wwaqvv0mchd7ym7av5s658jcrq2n8n2zma4xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy5cblxuRm9yIHRob3NlIHdobyBkb24ndCBuZWVkIGEgaG90IGNvcm5lciAoZS5nLiBydW5uaW5nIEdOT01FIDQwKyB3aXRoIHRocmVlIGZpbmdlcnMgZ2VzdHVyZXMpLiBWZXJ5IHZlcnkgbGlnaHQgZXh0ZW5zaW9uLiBObyBvcHRpb25zLCBubyBidWdzLiA7LSkiLAogICJuYW1lIjogIkhpZGUgUGFuZWwgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbC1saXRlIiwKICAidXVpZCI6ICJoaWRlLXBhbmVsLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "ssm-gnome@lgiki.net", "name": "Simple System Monitor", "pname": "simple-system-monitor", "description": "Show current CPU usage, memory usage and net speed on panel.\nFor best experience, please use monospaced font.\n\nThis is a fork of https://extensions.gnome.org/extension/4478/net-speed/.", "link": "https://extensions.gnome.org/extension/4506/simple-system-monitor/", "shell_version_map": {"38": {"version": "7", "sha256": "034ajnkdj3npjzlj3n8glxanjnhv12904sshkbjjrx6swmklcqs3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJuYW1lIjogIlNpbXBsZSBTeXN0ZW0gTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTEdpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXBsZS1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAic3NtLWdub21lQGxnaWtpLm5ldCIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "034ajnkdj3npjzlj3n8glxanjnhv12904sshkbjjrx6swmklcqs3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJuYW1lIjogIlNpbXBsZSBTeXN0ZW0gTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTEdpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXBsZS1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAic3NtLWdub21lQGxnaWtpLm5ldCIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "034ajnkdj3npjzlj3n8glxanjnhv12904sshkbjjrx6swmklcqs3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBDUFUgdXNhZ2UsIG1lbW9yeSB1c2FnZSBhbmQgbmV0IHNwZWVkIG9uIHBhbmVsLlxuRm9yIGJlc3QgZXhwZXJpZW5jZSwgcGxlYXNlIHVzZSBtb25vc3BhY2VkIGZvbnQuXG5cblRoaXMgaXMgYSBmb3JrIG9mIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ0NzgvbmV0LXNwZWVkLy4iLAogICJuYW1lIjogIlNpbXBsZSBTeXN0ZW0gTW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTEdpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXBsZS1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAic3NtLWdub21lQGxnaWtpLm5ldCIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "unredirect@aunetx", "name": "Disable unredirect fullscreen windows", "pname": "disable-unredirect-fullscreen-windows", "description": "Disables unredirect fullscreen windows in gnome-shell to prevent artifacts when in fullscreen.\n\nThis version makes sure the unredirect option is not re-enabled automatically by the shell.", "link": "https://extensions.gnome.org/extension/4509/disable-unredirect-fullscreen-windows/", "shell_version_map": {"40": {"version": "3", "sha256": "1mgvpzzfdzn5qsxwz5911a8qgq0r34az6xpmqr72ksx6yf13l85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHByZXZlbnQgYXJ0aWZhY3RzIHdoZW4gaW4gZnVsbHNjcmVlbi5cblxuVGhpcyB2ZXJzaW9uIG1ha2VzIHN1cmUgdGhlIHVucmVkaXJlY3Qgb3B0aW9uIGlzIG5vdCByZS1lbmFibGVkIGF1dG9tYXRpY2FsbHkgYnkgdGhlIHNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB1bnJlZGlyZWN0IGZ1bGxzY3JlZW4gd2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAYXVuZXR4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1mgvpzzfdzn5qsxwz5911a8qgq0r34az6xpmqr72ksx6yf13l85z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHVucmVkaXJlY3QgZnVsbHNjcmVlbiB3aW5kb3dzIGluIGdub21lLXNoZWxsIHRvIHByZXZlbnQgYXJ0aWZhY3RzIHdoZW4gaW4gZnVsbHNjcmVlbi5cblxuVGhpcyB2ZXJzaW9uIG1ha2VzIHN1cmUgdGhlIHVucmVkaXJlY3Qgb3B0aW9uIGlzIG5vdCByZS1lbmFibGVkIGF1dG9tYXRpY2FsbHkgYnkgdGhlIHNoZWxsLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSB1bnJlZGlyZWN0IGZ1bGxzY3JlZW4gd2luZG93cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiS2F6aW1pZXJhcyBWYWluYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi1kaXNhYmxlLXVucmVkaXJlY3QiLAogICJ1dWlkIjogInVucmVkaXJlY3RAYXVuZXR4IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "nepali-date@biplab", "name": "Nepali Date", "pname": "nepali-calendar", "description": "Shows nepali date on the panel.", "link": "https://extensions.gnome.org/extension/4518/nepali-calendar/", "shell_version_map": {"40": {"version": "11", "sha256": "1g4zdhypy553wbdq0pnxva05ab6p3dv5dp4jcw8vrf8f0kblxxa5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaXBsYWItRHV0dGEvTmVwYWxpX0RhdGUiLAogICJ1dWlkIjogIm5lcGFsaS1kYXRlQGJpcGxhYiIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1g4zdhypy553wbdq0pnxva05ab6p3dv5dp4jcw8vrf8f0kblxxa5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG5lcGFsaSBkYXRlIG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIk5lcGFsaSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9CaXBsYWItRHV0dGEvTmVwYWxpX0RhdGUiLAogICJ1dWlkIjogIm5lcGFsaS1kYXRlQGJpcGxhYiIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "clock-left@mapuut", "name": "Clock Left", "pname": "clock-left", "description": "Move clock to left", "link": "https://extensions.gnome.org/extension/4526/clock-left/", "shell_version_map": {"38": {"version": "2", "sha256": "027wlahy8pwic90cyx677456miaj1kpmfw85r0y0iwr66i3k00qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCIsCiAgIm5hbWUiOiAiQ2xvY2sgTGVmdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImNsb2NrLWxlZnRAbWFwdXV0IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "027wlahy8pwic90cyx677456miaj1kpmfw85r0y0iwr66i3k00qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCIsCiAgIm5hbWUiOiAiQ2xvY2sgTGVmdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImNsb2NrLWxlZnRAbWFwdXV0IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "027wlahy8pwic90cyx677456miaj1kpmfw85r0y0iwr66i3k00qf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgY2xvY2sgdG8gbGVmdCIsCiAgIm5hbWUiOiAiQ2xvY2sgTGVmdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImNsb2NrLWxlZnRAbWFwdXV0IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} @@ -584,8 +587,8 @@ , {"uuid": "toggle-mute-on-middle-click-updated@konradmb", "name": "Toggle Mute on Middle Click", "pname": "toggle-mute-on-middle-click", "description": "Toggle mute by middle-clicking the volume indicator. Updated for Gnome 40 from: https://extensions.gnome.org/extension/1473/toggle-mute-on-middle-click/", "link": "https://extensions.gnome.org/extension/4538/toggle-mute-on-middle-click/", "shell_version_map": {"40": {"version": "1", "sha256": "0ag52arddv2dypfr1bs28c6dnfq0lrccibbl6cdzjx4d26j4cv4z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBtdXRlIGJ5IG1pZGRsZS1jbGlja2luZyB0aGUgdm9sdW1lIGluZGljYXRvci4gVXBkYXRlZCBmb3IgR25vbWUgNDAgZnJvbTogaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTQ3My90b2dnbGUtbXV0ZS1vbi1taWRkbGUtY2xpY2svIiwKICAibmFtZSI6ICJUb2dnbGUgTXV0ZSBvbiBNaWRkbGUgQ2xpY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRvZ2dsZS1tdXRlLW9uLW1pZGRsZS1jbGljay11cGRhdGVkQGtvbnJhZG1iIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "autohide-volume@unboiled.info", "name": "Autohide Volume", "pname": "autohide-volume", "description": "Autohide volume indicator when muted\n\nI'm not interested in the fact my output audio device is muted: this is how it's supposed to be. But if it's unmuted, then I want to see the icon.\n\nExcept when the mic is on, then I'm probably in a call, frantically figuring out what's wrong.", "link": "https://extensions.gnome.org/extension/4539/autohide-volume/", "shell_version_map": {"41": {"version": "1", "sha256": "1kiki2gks6jvngx62jz1mdg3xpi4npc4sv9v4mc7fz4s91ibsykr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZFxuXG5JJ20gbm90IGludGVyZXN0ZWQgaW4gdGhlIGZhY3QgbXkgb3V0cHV0IGF1ZGlvIGRldmljZSBpcyBtdXRlZDogdGhpcyBpcyBob3cgaXQncyBzdXBwb3NlZCB0byBiZS4gQnV0IGlmIGl0J3MgdW5tdXRlZCwgdGhlbiBJIHdhbnQgdG8gc2VlIHRoZSBpY29uLlxuXG5FeGNlcHQgd2hlbiB0aGUgbWljIGlzIG9uLCB0aGVuIEknbSBwcm9iYWJseSBpbiBhIGNhbGwsIGZyYW50aWNhbGx5IGZpZ3VyaW5nIG91dCB3aGF0J3Mgd3JvbmcuIiwKICAibmFtZSI6ICJBdXRvaGlkZSBWb2x1bWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS90MTg0MjU2L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvaGlkZS12b2x1bWUiLAogICJ1dWlkIjogImF1dG9oaWRlLXZvbHVtZUB1bmJvaWxlZC5pbmZvIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "cloudflare@adam.gadmz", "name": "Cloudflare", "pname": "cloudflare", "description": "Warp Connect", "link": "https://extensions.gnome.org/extension/4542/cloudflare/", "shell_version_map": {"38": {"version": "7", "sha256": "0wizvqfcsyh43786zhci4j5b8z28y95cjajvqrb51x4r489l67lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvQ2xvdWRmbGFyZV9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImNsb3VkZmxhcmVAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "0wizvqfcsyh43786zhci4j5b8z28y95cjajvqrb51x4r489l67lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvQ2xvdWRmbGFyZV9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImNsb3VkZmxhcmVAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA3Cn0="}}} -, {"uuid": "dell-command-configure-menu@vsimkus.github.io", "name": "Dell Command Configure menu", "pname": "dell-command-configure-menu", "description": "Adds submenu in gnome shell to access Dell Command Configure options.\n\nCurrently, only battery charge settings are implemented.\n\nThe Dell Command Configure tool must be installed separately from Dell https://www.dell.com/support/kbdoc/en-uk/000178000/dell-command-configure#Downloads.", "link": "https://extensions.gnome.org/extension/4545/dell-command-configure-menu/", "shell_version_map": {"38": {"version": "3", "sha256": "0mf9vibjzq1l9g6f3y7l7hx6dvqxbasdyhbrc8vfbczy9lar4v7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdnNpbWt1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAidXVpZCI6ICJkZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnVAdnNpbWt1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "4", "sha256": "1dcb05c8aii2cnryjwn392991jk010gx6ihb4ld30ylkvd45v0lr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdnNpbWt1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAidXVpZCI6ICJkZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnVAdnNpbWt1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1dcb05c8aii2cnryjwn392991jk010gx6ihb4ld30ylkvd45v0lr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdnNpbWt1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAidXVpZCI6ICJkZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnVAdnNpbWt1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "tactile@lundal.io", "name": "Tactile", "pname": "tactile", "description": "Tile windows on a custom grid using your keyboard. Type Super-T to show the grid, then type two tiles (or the same tile twice) to move the active window.\n\nThe grid can be up to 4x3 (corresponding to one hand on the keyboard) and each row/column can be weighted to take up more or less space.", "link": "https://extensions.gnome.org/extension/4548/tactile/", "shell_version_map": {"38": {"version": "10", "sha256": "0asz4jp2vbjxln7c2js35cl7smghjgglmhd9jk7qb4s0bxqsax8q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "0asz4jp2vbjxln7c2js35cl7smghjgglmhd9jk7qb4s0bxqsax8q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0asz4jp2vbjxln7c2js35cl7smghjgglmhd9jk7qb4s0bxqsax8q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxMAp9"}}} +, {"uuid": "dell-command-configure-menu@vsimkus.github.io", "name": "Dell Command Configure menu", "pname": "dell-command-configure-menu", "description": "Adds submenu in gnome shell to access Dell Command Configure options.\n\nCurrently, only battery charge settings are implemented.\n\nThe Dell Command Configure tool must be installed separately from Dell https://www.dell.com/support/kbdoc/en-uk/000178000/dell-command-configure#Downloads.", "link": "https://extensions.gnome.org/extension/4545/dell-command-configure-menu/", "shell_version_map": {"38": {"version": "3", "sha256": "0mf9vibjzq1l9g6f3y7l7hx6dvqxbasdyhbrc8vfbczy9lar4v7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdnNpbWt1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAidXVpZCI6ICJkZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnVAdnNpbWt1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "7", "sha256": "03n0xyadr41s4izrckljrw04nv23izshlga8h8as9kkxcpq6msc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdnNpbWt1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAidXVpZCI6ICJkZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnVAdnNpbWt1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "03n0xyadr41s4izrckljrw04nv23izshlga8h8as9kkxcpq6msc3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdnNpbWt1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAidXVpZCI6ICJkZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnVAdnNpbWt1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "tactile@lundal.io", "name": "Tactile", "pname": "tactile", "description": "Tile windows on a custom grid using your keyboard. Type Super-T to show the grid, then type two tiles (or the same tile twice) to move the active window.\n\nThe grid can be up to 4x3 (corresponding to one hand on the keyboard) and each row/column can be weighted to take up more or less space.", "link": "https://extensions.gnome.org/extension/4548/tactile/", "shell_version_map": {"38": {"version": "14", "sha256": "0ndp53kmg3mc5jsrjlqv22ajpmrn8r13f6nrkmmbx6x541g1h9rl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "40": {"version": "14", "sha256": "0ndp53kmg3mc5jsrjlqv22ajpmrn8r13f6nrkmmbx6x541g1h9rl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "0ndp53kmg3mc5jsrjlqv22ajpmrn8r13f6nrkmmbx6x541g1h9rl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2x1bmRhbC90YWN0aWxlIiwKICAidXVpZCI6ICJ0YWN0aWxlQGx1bmRhbC5pbyIsCiAgInZlcnNpb24iOiAxNAp9"}}} , {"uuid": "killapp@adam.gadmz", "name": "Kill App", "pname": "kill-app", "description": "Force quit or kill application", "link": "https://extensions.gnome.org/extension/4551/kill-app/", "shell_version_map": {"38": {"version": "3", "sha256": "0gc6bk4piblqmm6qhb0jicdg571b23b0mns6mqhws4glznn4ckry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2R1b25nZ2lha2hhbmhiL0tpbGxhcHBfR05PTUVfRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJraWxsYXBwQGFkYW0uZ2FkbXoiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "0gc6bk4piblqmm6qhb0jicdg571b23b0mns6mqhws4glznn4ckry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2R1b25nZ2lha2hhbmhiL0tpbGxhcHBfR05PTUVfRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJraWxsYXBwQGFkYW0uZ2FkbXoiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "hotkeys-popup@pimsnel.com", "name": "Hotkeys Popup", "pname": "hotkeys-popup", "description": "Pop-up cheatsheet with currently configured keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4553/hotkeys-popup/", "shell_version_map": {"40": {"version": "4", "sha256": "080ch8zg8y1ha9gq6hihjkqzymkwqarxsy3p8da8j6p6621w63y5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtaG90a2V5cy1wb3B1cCIsCiAgInV1aWQiOiAiaG90a2V5cy1wb3B1cEBwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "080ch8zg8y1ha9gq6hihjkqzymkwqarxsy3p8da8j6p6621w63y5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtaG90a2V5cy1wb3B1cCIsCiAgInV1aWQiOiAiaG90a2V5cy1wb3B1cEBwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "inotch@alynx.one", "name": "iNotch", "pname": "inotch", "description": "Add a useless notch to your screen.", "link": "https://extensions.gnome.org/extension/4556/inotch/", "shell_version_map": {"40": {"version": "3", "sha256": "0x4zx4ph20maf5gw08j0j6v2whvviqs220vlr903nbcc5cxy7yil", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHVzZWxlc3Mgbm90Y2ggdG8geW91ciBzY3JlZW4uIiwKICAibmFtZSI6ICJpTm90Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FseW54WmhvdS9nbm9tZS1zaGVsbC1leHRlbnNpb24taW5vdGNoLyIsCiAgInV1aWQiOiAiaW5vdGNoQGFseW54Lm9uZSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "0x4zx4ph20maf5gw08j0j6v2whvviqs220vlr903nbcc5cxy7yil", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHVzZWxlc3Mgbm90Y2ggdG8geW91ciBzY3JlZW4uIiwKICAibmFtZSI6ICJpTm90Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FseW54WmhvdS9nbm9tZS1zaGVsbC1leHRlbnNpb24taW5vdGNoLyIsCiAgInV1aWQiOiAiaW5vdGNoQGFseW54Lm9uZSIsCiAgInZlcnNpb24iOiAzCn0="}}} @@ -594,11 +597,11 @@ , {"uuid": "pcalc@mgeck64.github.com", "name": "Panel Calculator", "pname": "panel-calculator", "description": "A text-based calculator that lives on the gnome panel, out of the way of your work.", "link": "https://extensions.gnome.org/extension/4567/panel-calculator/", "shell_version_map": {"38": {"version": "6", "sha256": "0rr98m2l20165mf8dcc2gwizqmksczkpbk8sqwhsppkvx6racz1m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGV4dC1iYXNlZCBjYWxjdWxhdG9yIHRoYXQgbGl2ZXMgb24gdGhlIGdub21lIHBhbmVsLCBvdXQgb2YgdGhlIHdheSBvZiB5b3VyIHdvcmsuIiwKICAibmFtZSI6ICJQYW5lbCBDYWxjdWxhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21nZWNrNjQvcGNhbGMtbWdlY2s2NC5naXRodWIuY29tIiwKICAidXVpZCI6ICJwY2FsY0BtZ2VjazY0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "0rr98m2l20165mf8dcc2gwizqmksczkpbk8sqwhsppkvx6racz1m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGV4dC1iYXNlZCBjYWxjdWxhdG9yIHRoYXQgbGl2ZXMgb24gdGhlIGdub21lIHBhbmVsLCBvdXQgb2YgdGhlIHdheSBvZiB5b3VyIHdvcmsuIiwKICAibmFtZSI6ICJQYW5lbCBDYWxjdWxhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21nZWNrNjQvcGNhbGMtbWdlY2s2NC5naXRodWIuY29tIiwKICAidXVpZCI6ICJwY2FsY0BtZ2VjazY0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "zfs-status-monitor@chris.hubick.com", "name": "ZFS Status Monitor", "pname": "zfs-status-monitor", "description": "Display status of ZFS filesystem pools currently present on the system, updating every 60 seconds.", "link": "https://extensions.gnome.org/extension/4568/zfs-status-monitor/", "shell_version_map": {"40": {"version": "1", "sha256": "07g6b3y2dpvb41qd0j5rkakxpvyfgwnwcqzfr00h6zfvrx32nnp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3RhdHVzIG9mIFpGUyBmaWxlc3lzdGVtIHBvb2xzIGN1cnJlbnRseSBwcmVzZW50IG9uIHRoZSBzeXN0ZW0sIHVwZGF0aW5nIGV2ZXJ5IDYwIHNlY29uZHMuIiwKICAibmFtZSI6ICJaRlMgU3RhdHVzIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2h1Ymljay9nbm9tZS1zaGVsbC1leHRlbnNpb24temZzLXN0YXR1cy1tb25pdG9yIiwKICAidXVpZCI6ICJ6ZnMtc3RhdHVzLW1vbml0b3JAY2hyaXMuaHViaWNrLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "07g6b3y2dpvb41qd0j5rkakxpvyfgwnwcqzfr00h6zfvrx32nnp0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3RhdHVzIG9mIFpGUyBmaWxlc3lzdGVtIHBvb2xzIGN1cnJlbnRseSBwcmVzZW50IG9uIHRoZSBzeXN0ZW0sIHVwZGF0aW5nIGV2ZXJ5IDYwIHNlY29uZHMuIiwKICAibmFtZSI6ICJaRlMgU3RhdHVzIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2h1Ymljay9nbm9tZS1zaGVsbC1leHRlbnNpb24temZzLXN0YXR1cy1tb25pdG9yIiwKICAidXVpZCI6ICJ6ZnMtc3RhdHVzLW1vbml0b3JAY2hyaXMuaHViaWNrLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "dollar@dotpyc.com", "name": "Dollar", "pname": "dollar", "description": "Cotações do (USD Dólar Americano) convertido para (BRL Real Brasileiro).\n\nAs atualizações são recebidas a cada 30 segundos e utiliza como base informações disponiblizadas pela API AwesomeAPI, que pode ser consultada diretamente acessando o endereço eletronico https://docs.awesomeapi.com.br.", "link": "https://extensions.gnome.org/extension/4573/dollar/", "shell_version_map": {"38": {"version": "2", "sha256": "0100dspvm8ryqday9dqm76ykc9n9sikv3098yn6a92kpz9kgxacm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdGFcdTAwZTdcdTAwZjVlcyBkbyAoVVNEIERcdTAwZjNsYXIgQW1lcmljYW5vKSBjb252ZXJ0aWRvIHBhcmEgKEJSTCBSZWFsIEJyYXNpbGVpcm8pLlxuXG5BcyBhdHVhbGl6YVx1MDBlN1x1MDBmNWVzIHNcdTAwZTNvIHJlY2ViaWRhcyBhIGNhZGEgMzAgc2VndW5kb3MgZSB1dGlsaXphIGNvbW8gYmFzZSBpbmZvcm1hXHUwMGU3XHUwMGY1ZXMgZGlzcG9uaWJsaXphZGFzIHBlbGEgQVBJIEF3ZXNvbWVBUEksIHF1ZSBwb2RlIHNlciBjb25zdWx0YWRhIGRpcmV0YW1lbnRlIGFjZXNzYW5kbyBvIGVuZGVyZVx1MDBlN28gZWxldHJvbmljbyBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hhZWxkZW1hdHRvcy9kb2xsYXItZG90cHljLmNvbSIsCiAgInV1aWQiOiAiZG9sbGFyQGRvdHB5Yy5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "0100dspvm8ryqday9dqm76ykc9n9sikv3098yn6a92kpz9kgxacm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdGFcdTAwZTdcdTAwZjVlcyBkbyAoVVNEIERcdTAwZjNsYXIgQW1lcmljYW5vKSBjb252ZXJ0aWRvIHBhcmEgKEJSTCBSZWFsIEJyYXNpbGVpcm8pLlxuXG5BcyBhdHVhbGl6YVx1MDBlN1x1MDBmNWVzIHNcdTAwZTNvIHJlY2ViaWRhcyBhIGNhZGEgMzAgc2VndW5kb3MgZSB1dGlsaXphIGNvbW8gYmFzZSBpbmZvcm1hXHUwMGU3XHUwMGY1ZXMgZGlzcG9uaWJsaXphZGFzIHBlbGEgQVBJIEF3ZXNvbWVBUEksIHF1ZSBwb2RlIHNlciBjb25zdWx0YWRhIGRpcmV0YW1lbnRlIGFjZXNzYW5kbyBvIGVuZGVyZVx1MDBlN28gZWxldHJvbmljbyBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hhZWxkZW1hdHRvcy9kb2xsYXItZG90cHljLmNvbSIsCiAgInV1aWQiOiAiZG9sbGFyQGRvdHB5Yy5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "0100dspvm8ryqday9dqm76ykc9n9sikv3098yn6a92kpz9kgxacm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdGFcdTAwZTdcdTAwZjVlcyBkbyAoVVNEIERcdTAwZjNsYXIgQW1lcmljYW5vKSBjb252ZXJ0aWRvIHBhcmEgKEJSTCBSZWFsIEJyYXNpbGVpcm8pLlxuXG5BcyBhdHVhbGl6YVx1MDBlN1x1MDBmNWVzIHNcdTAwZTNvIHJlY2ViaWRhcyBhIGNhZGEgMzAgc2VndW5kb3MgZSB1dGlsaXphIGNvbW8gYmFzZSBpbmZvcm1hXHUwMGU3XHUwMGY1ZXMgZGlzcG9uaWJsaXphZGFzIHBlbGEgQVBJIEF3ZXNvbWVBUEksIHF1ZSBwb2RlIHNlciBjb25zdWx0YWRhIGRpcmV0YW1lbnRlIGFjZXNzYW5kbyBvIGVuZGVyZVx1MDBlN28gZWxldHJvbmljbyBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2hhZWxkZW1hdHRvcy9kb2xsYXItZG90cHljLmNvbSIsCiAgInV1aWQiOiAiZG9sbGFyQGRvdHB5Yy5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} -, {"uuid": "activate_gnome@isjerryxiao", "name": "Activate Gnome", "pname": "activate_gnome", "description": "Shows Activate Gnome watermark on your screen.", "link": "https://extensions.gnome.org/extension/4574/activate_gnome/", "shell_version_map": {"40": {"version": "3", "sha256": "1hmadwwzm6m9vg4wxz6lvalh9bvi2fnhzjyg9f4whzb5zp8klc4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdub21lIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4iLAogICJuYW1lIjogIkFjdGl2YXRlIEdub21lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFjdGl2YXRlX2dub21lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pc2plcnJ5eGlhby9nbm9tZS1zaGVsbC1leHRlbnNpb24tYWN0aXZhdGUtZ25vbWUiLAogICJ1dWlkIjogImFjdGl2YXRlX2dub21lQGlzamVycnl4aWFvIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1hmadwwzm6m9vg4wxz6lvalh9bvi2fnhzjyg9f4whzb5zp8klc4p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdub21lIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4iLAogICJuYW1lIjogIkFjdGl2YXRlIEdub21lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFjdGl2YXRlX2dub21lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pc2plcnJ5eGlhby9nbm9tZS1zaGVsbC1leHRlbnNpb24tYWN0aXZhdGUtZ25vbWUiLAogICJ1dWlkIjogImFjdGl2YXRlX2dub21lQGlzamVycnl4aWFvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "huawei-wmi@apps.sdore.me", "name": "Huawei WMI controls", "pname": "huawei-wmi-controls", "description": "Control various Huawei & Honor laptops WMI functions, such as battery protection, Fn-lock and keyboard backlight (just not yet).", "link": "https://extensions.gnome.org/extension/4580/huawei-wmi-controls/", "shell_version_map": {"40": {"version": "2", "sha256": "12qmk8k8hyaa9d4zsy9j2778yj7k6nlfhry0x81197nxkbfqqf1c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgJiBIb25vciBsYXB0b3BzIFdNSSBmdW5jdGlvbnMsIHN1Y2ggYXMgYmF0dGVyeSBwcm90ZWN0aW9uLCBGbi1sb2NrIGFuZCBrZXlib2FyZCBiYWNrbGlnaHQgKGp1c3Qgbm90IHlldCkuIiwKICAibmFtZSI6ICJIdWF3ZWkgV01JIGNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYXBwcy5zZG9yZS5tZS9nbm9tZS1leHRlbnNpb24taHVhd2VpLXdtaSIsCiAgInV1aWQiOiAiaHVhd2VpLXdtaUBhcHBzLnNkb3JlLm1lIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "12qmk8k8hyaa9d4zsy9j2778yj7k6nlfhry0x81197nxkbfqqf1c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgJiBIb25vciBsYXB0b3BzIFdNSSBmdW5jdGlvbnMsIHN1Y2ggYXMgYmF0dGVyeSBwcm90ZWN0aW9uLCBGbi1sb2NrIGFuZCBrZXlib2FyZCBiYWNrbGlnaHQgKGp1c3Qgbm90IHlldCkuIiwKICAibmFtZSI6ICJIdWF3ZWkgV01JIGNvbnRyb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYXBwcy5zZG9yZS5tZS9nbm9tZS1leHRlbnNpb24taHVhd2VpLXdtaSIsCiAgInV1aWQiOiAiaHVhd2VpLXdtaUBhcHBzLnNkb3JlLm1lIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "username-hotname@it-und-entwicklung-fg.de", "name": "Add Username and Hostname to panel", "pname": "username-and-hostname-to-panel", "description": "Adds your avatar icon, user displayname und username to the menu panel. Also it adds the hostname to the left of the panel.", "link": "https://extensions.gnome.org/extension/4583/username-and-hostname-to-panel/", "shell_version_map": {"38": {"version": "3", "sha256": "1vsm7r2i30pmkasb47ia29isrzn40hhhl52z7jq1wpwz0ip3k3g5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJBZGQgVXNlcm5hbWUgYW5kIEhvc3RuYW1lIHRvIHBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXQtZW50d2lja2x1bmctZmcvVXNlcm5hbWUtYW5kLUhvc3RuYW1lIiwKICAidXVpZCI6ICJ1c2VybmFtZS1ob3RuYW1lQGl0LXVuZC1lbnR3aWNrbHVuZy1mZy5kZSIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "activate_gnome@isjerryxiao", "name": "Activate Gnome", "pname": "activate_gnome", "description": "Shows Activate Gnome watermark on your screen.", "link": "https://extensions.gnome.org/extension/4574/activate_gnome/", "shell_version_map": {"40": {"version": "5", "sha256": "1jng0xwqchvan08klq8i6rziwi1fn7spfzh151fv1n56fxay48f8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdub21lIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4iLAogICJuYW1lIjogIkFjdGl2YXRlIEdub21lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFjdGl2YXRlX2dub21lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNqZXJyeXhpYW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFjdGl2YXRlLWdub21lIiwKICAidXVpZCI6ICJhY3RpdmF0ZV9nbm9tZUBpc2plcnJ5eGlhbyIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1jng0xwqchvan08klq8i6rziwi1fn7spfzh151fv1n56fxay48f8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdub21lIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4iLAogICJuYW1lIjogIkFjdGl2YXRlIEdub21lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFjdGl2YXRlX2dub21lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNqZXJyeXhpYW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFjdGl2YXRlLWdub21lIiwKICAidXVpZCI6ICJhY3RpdmF0ZV9nbm9tZUBpc2plcnJ5eGlhbyIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1jng0xwqchvan08klq8i6rziwi1fn7spfzh151fv1n56fxay48f8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIEFjdGl2YXRlIEdub21lIHdhdGVybWFyayBvbiB5b3VyIHNjcmVlbi4iLAogICJuYW1lIjogIkFjdGl2YXRlIEdub21lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFjdGl2YXRlX2dub21lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNqZXJyeXhpYW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFjdGl2YXRlLWdub21lIiwKICAidXVpZCI6ICJhY3RpdmF0ZV9nbm9tZUBpc2plcnJ5eGlhbyIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"uuid": "huawei-wmi@apps.sdore.me", "name": "Huawei WMI controls", "pname": "huawei-wmi-controls", "description": "Control various Huawei and Honor laptops WMI functions, such as battery protection, Fn-lock, power unlock and keyboard backlight.\n\nSee repository for requirements:", "link": "https://extensions.gnome.org/extension/4580/huawei-wmi-controls/", "shell_version_map": {"40": {"version": "4", "sha256": "1dpkgs0zifbq09pmsqirr1ndh2yd8x8z4gzzjpv0mazvxpqlzdm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LlxuXG5TZWUgcmVwb3NpdG9yeSBmb3IgcmVxdWlyZW1lbnRzOiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2FwcHMuc2RvcmUubWUvZ25vbWUtZXh0ZW5zaW9uLWh1YXdlaS13bWkiLAogICJ1dWlkIjogImh1YXdlaS13bWlAYXBwcy5zZG9yZS5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1dpkgs0zifbq09pmsqirr1ndh2yd8x8z4gzzjpv0mazvxpqlzdm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdmFyaW91cyBIdWF3ZWkgYW5kIEhvbm9yIGxhcHRvcHMgV01JIGZ1bmN0aW9ucywgc3VjaCBhcyBiYXR0ZXJ5IHByb3RlY3Rpb24sIEZuLWxvY2ssIHBvd2VyIHVubG9jayBhbmQga2V5Ym9hcmQgYmFja2xpZ2h0LlxuXG5TZWUgcmVwb3NpdG9yeSBmb3IgcmVxdWlyZW1lbnRzOiIsCiAgIm5hbWUiOiAiSHVhd2VpIFdNSSBjb250cm9scyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2FwcHMuc2RvcmUubWUvZ25vbWUtZXh0ZW5zaW9uLWh1YXdlaS13bWkiLAogICJ1dWlkIjogImh1YXdlaS13bWlAYXBwcy5zZG9yZS5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "username-hotname@it-und-entwicklung-fg.de", "name": "Username and Hostname to panel", "pname": "username-and-hostname-to-panel", "description": "Adds your avatar icon, user displayname und username to the menu panel. Also it adds the hostname to the left of the panel.", "link": "https://extensions.gnome.org/extension/4583/username-and-hostname-to-panel/", "shell_version_map": {"38": {"version": "4", "sha256": "0v98gymiw2pdczvndrvj3lsyhwi8ps0jldry1ykm9aghb05s13gx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2l0LWVudHdpY2tsdW5nLWZnL1VzZXJuYW1lLWFuZC1Ib3N0bmFtZSIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "0v98gymiw2pdczvndrvj3lsyhwi8ps0jldry1ykm9aghb05s13gx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2l0LWVudHdpY2tsdW5nLWZnL1VzZXJuYW1lLWFuZC1Ib3N0bmFtZSIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0v98gymiw2pdczvndrvj3lsyhwi8ps0jldry1ykm9aghb05s13gx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgeW91ciBhdmF0YXIgaWNvbiwgdXNlciBkaXNwbGF5bmFtZSB1bmQgdXNlcm5hbWUgdG8gdGhlIG1lbnUgcGFuZWwuIEFsc28gaXQgYWRkcyB0aGUgaG9zdG5hbWUgdG8gdGhlIGxlZnQgb2YgdGhlIHBhbmVsLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJ1c2VybmFtZS1ob3RuYW1lIiwKICAibmFtZSI6ICJVc2VybmFtZSBhbmQgSG9zdG5hbWUgdG8gcGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2l0LWVudHdpY2tsdW5nLWZnL1VzZXJuYW1lLWFuZC1Ib3N0bmFtZSIsCiAgInV1aWQiOiAidXNlcm5hbWUtaG90bmFtZUBpdC11bmQtZW50d2lja2x1bmctZmcuZGUiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "InternetSpeedMonitor@Rishu", "name": "Internet Speed Monitor", "pname": "internet-speed-monitor", "description": "Extension to Monitor Internet Speed and Daily Data Usage minimally.\n\nNew update for shell version 3.34+ : Added option to choose what to display in settings menu", "link": "https://extensions.gnome.org/extension/4585/internet-speed-monitor/", "shell_version_map": {"38": {"version": "5", "sha256": "0v4za9lcc7p861vyrnwwza1sizgzj2nv3yz1aixlsbq22d7zf0ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cblxuTmV3IHVwZGF0ZSBmb3Igc2hlbGwgdmVyc2lvbiAzLjM0KyA6IEFkZGVkIG9wdGlvbiB0byBjaG9vc2Ugd2hhdCB0byBkaXNwbGF5IGluIHNldHRpbmdzIG1lbnUiLAogICJuYW1lIjogIkludGVybmV0IFNwZWVkIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Jpc2h1aW5maW5pdHkvSW50ZXJuZXRTcGVlZE1vbml0b3IiLAogICJ1dWlkIjogIkludGVybmV0U3BlZWRNb25pdG9yQFJpc2h1IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "0v4za9lcc7p861vyrnwwza1sizgzj2nv3yz1aixlsbq22d7zf0ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cblxuTmV3IHVwZGF0ZSBmb3Igc2hlbGwgdmVyc2lvbiAzLjM0KyA6IEFkZGVkIG9wdGlvbiB0byBjaG9vc2Ugd2hhdCB0byBkaXNwbGF5IGluIHNldHRpbmdzIG1lbnUiLAogICJuYW1lIjogIkludGVybmV0IFNwZWVkIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Jpc2h1aW5maW5pdHkvSW50ZXJuZXRTcGVlZE1vbml0b3IiLAogICJ1dWlkIjogIkludGVybmV0U3BlZWRNb25pdG9yQFJpc2h1IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "0v4za9lcc7p861vyrnwwza1sizgzj2nv3yz1aixlsbq22d7zf0ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBNb25pdG9yIEludGVybmV0IFNwZWVkIGFuZCBEYWlseSBEYXRhIFVzYWdlIG1pbmltYWxseS5cblxuTmV3IHVwZGF0ZSBmb3Igc2hlbGwgdmVyc2lvbiAzLjM0KyA6IEFkZGVkIG9wdGlvbiB0byBjaG9vc2Ugd2hhdCB0byBkaXNwbGF5IGluIHNldHRpbmdzIG1lbnUiLAogICJuYW1lIjogIkludGVybmV0IFNwZWVkIE1vbml0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Jpc2h1aW5maW5pdHkvSW50ZXJuZXRTcGVlZE1vbml0b3IiLAogICJ1dWlkIjogIkludGVybmV0U3BlZWRNb25pdG9yQFJpc2h1IiwKICAidmVyc2lvbiI6IDUKfQ=="}}} -, {"uuid": "simulate-switching-workspaces-on-active-monitor@micheledaros.com", "name": "Switch workspaces on active monitor", "pname": "switch-workspaces-on-active-monitor", "description": "Simulates switching the workspace on the active monitor only. Ctrl+Alt+q switches to the previous workspace, Ctrl+Alt+a switches to the next", "link": "https://extensions.gnome.org/extension/4586/switch-workspaces-on-active-monitor/", "shell_version_map": {"38": {"version": "7", "sha256": "13wm1xq452ik57mxx3v9h56dlhhjng326kw2cqgj365h7k6bjs99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoZWxlZGFyb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJzaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvckBtaWNoZWxlZGFyb3MuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "13wm1xq452ik57mxx3v9h56dlhhjng326kw2cqgj365h7k6bjs99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoZWxlZGFyb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJzaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvckBtaWNoZWxlZGFyb3MuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "13wm1xq452ik57mxx3v9h56dlhhjng326kw2cqgj365h7k6bjs99", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taWNoZWxlZGFyb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJzaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvckBtaWNoZWxlZGFyb3MuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} +, {"uuid": "simulate-switching-workspaces-on-active-monitor@micheledaros.com", "name": "Switch workspaces on active monitor", "pname": "switch-workspaces-on-active-monitor", "description": "Simulates switching the workspace on the active monitor only. Ctrl+Alt+q switches to the previous workspace, Ctrl+Alt+a switches to the next", "link": "https://extensions.gnome.org/extension/4586/switch-workspaces-on-active-monitor/", "shell_version_map": {"38": {"version": "8", "sha256": "1yakh03r6qz08994bigzr9m5qqgm9ab2c02s1rab5rwym0a4d0vq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGVsZWRhcm9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvciIsCiAgInV1aWQiOiAic2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3JAbWljaGVsZWRhcm9zLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "1yakh03r6qz08994bigzr9m5qqgm9ab2c02s1rab5rwym0a4d0vq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGVsZWRhcm9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvciIsCiAgInV1aWQiOiAic2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3JAbWljaGVsZWRhcm9zLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1yakh03r6qz08994bigzr9m5qqgm9ab2c02s1rab5rwym0a4d0vq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGVsZWRhcm9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvciIsCiAgInV1aWQiOiAic2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3JAbWljaGVsZWRhcm9zLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1yakh03r6qz08994bigzr9m5qqgm9ab2c02s1rab5rwym0a4d0vq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGVsZWRhcm9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvciIsCiAgInV1aWQiOiAic2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3JAbWljaGVsZWRhcm9zLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "newworkspaceshortcut@barnix.io", "name": "New Workspace Shortcut", "pname": "new-workspace-shortcut", "description": "This extension will enable the following:\n\nMove-window-to-new-workspace Shortcut:\nUse a shortcut to move the in-focus window to a new workspace on the right of your current workspace: Super + Alt + Shift + n\nOr to the left / backward: Super + Alt + Shift + b\n\nNew-empty-workspace Shortcut:\nUse a shortcut to create an empty workspace on the right: Super + Alt + n\nOr to the left / backward: Super + Alt + b\n\nReorder-workspace Shortcut:\nUse a shortcut to move an entire workspace left or right of the current workspace: Ctl + Super + Left or Ctl + Super + Right\nBy default, this shorcut with automatically trigger the Overview to provide a limited form of visual feedback. However, this preference can be changed via the extension's Settings panel.\n\nThese shortcuts are created to work logically with the vanilla gnome shortcuts including change-workspace (Super + ALT + Left/Right) and move-window-to-next-workspace (Shift + Super + ALT + Left/Right).", "link": "https://extensions.gnome.org/extension/4597/new-workspace-shortcut/", "shell_version_map": {"41": {"version": "5", "sha256": "0anj72nb9wf80xyhymzr0v97v6hkpi95nmpmpajg5a3w05dz8y7n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6XG5Vc2UgYSBzaG9ydGN1dCB0byBtb3ZlIHRoZSBpbi1mb2N1cyB3aW5kb3cgdG8gYSBuZXcgd29ya3NwYWNlIG9uIHRoZSByaWdodCBvZiB5b3VyIGN1cnJlbnQgd29ya3NwYWNlOiBTdXBlciArIEFsdCArIFNoaWZ0ICsgblxuT3IgdG8gdGhlIGxlZnQgLyBiYWNrd2FyZDogU3VwZXIgKyBBbHQgKyBTaGlmdCArIGJcblxuTmV3LWVtcHR5LXdvcmtzcGFjZSBTaG9ydGN1dDpcblVzZSBhIHNob3J0Y3V0IHRvIGNyZWF0ZSBhbiBlbXB0eSB3b3Jrc3BhY2Ugb24gdGhlIHJpZ2h0OiBTdXBlciArIEFsdCArIG5cbk9yIHRvIHRoZSBsZWZ0IC8gYmFja3dhcmQ6IFN1cGVyICsgQWx0ICsgYlxuXG5SZW9yZGVyLXdvcmtzcGFjZSBTaG9ydGN1dDpcblVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgYW4gZW50aXJlIHdvcmtzcGFjZSBsZWZ0IG9yIHJpZ2h0IG9mIHRoZSBjdXJyZW50IHdvcmtzcGFjZTogQ3RsICsgU3VwZXIgKyBMZWZ0IG9yIEN0bCArIFN1cGVyICsgUmlnaHRcbkJ5IGRlZmF1bHQsIHRoaXMgc2hvcmN1dCB3aXRoIGF1dG9tYXRpY2FsbHkgdHJpZ2dlciB0aGUgT3ZlcnZpZXcgdG8gcHJvdmlkZSBhIGxpbWl0ZWQgZm9ybSBvZiB2aXN1YWwgZmVlZGJhY2suIEhvd2V2ZXIsIHRoaXMgcHJlZmVyZW5jZSBjYW4gYmUgY2hhbmdlZCB2aWEgdGhlIGV4dGVuc2lvbidzIFNldHRpbmdzIHBhbmVsLlxuXG5UaGVzZSBzaG9ydGN1dHMgYXJlIGNyZWF0ZWQgdG8gd29yayBsb2dpY2FsbHkgd2l0aCB0aGUgdmFuaWxsYSBnbm9tZSBzaG9ydGN1dHMgaW5jbHVkaW5nIGNoYW5nZS13b3Jrc3BhY2UgKFN1cGVyICsgQUxUICsgTGVmdC9SaWdodCkgYW5kIG1vdmUtd2luZG93LXRvLW5leHQtd29ya3NwYWNlIChTaGlmdCArIFN1cGVyICsgQUxUICsgTGVmdC9SaWdodCkuIiwKICAibmFtZSI6ICJOZXcgV29ya3NwYWNlIFNob3J0Y3V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ld3dvcmtzcGFjZXNob3J0Y3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Jhcm5zY290dC9uZXd3b3Jrc3BhY2VzaG9ydGN1dC1iYXJuaXguaW8iLAogICJ1dWlkIjogIm5ld3dvcmtzcGFjZXNob3J0Y3V0QGJhcm5peC5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "p.stonham@switcheroo.org", "name": "Switcheroo", "pname": "switcheroo", "description": "Switch to the first window with the title x\n\nA very small extension to allow you to switch windows via gdbus. This is particularly useful if you are using wayland as utilities such as wmctrl won't work.\n\nSince Gnome 41 removed org.gnome.Shell.Eval for security reasons, if you ever used a command such as:\n\ngdbus call --session --dest org.gnome.Shell --object-path /org/gnome/Shell --method org.gnome.Shell.Eval\"var mw = global.get_window_actors().map(w=>w.meta_window).find(mw=>mw.get_title().includes('Firefox'));mw && mw.activate(0)\"\n\nthis can now be replaced with:\n\ngdbus call --session --dest org.gnome.Shell --object-path /org/switcheroo/Switcheroo --method org.switcheroo.Switcheroo.Set Firefox\n\nThis can then be assigned to a shortcut key in Gnome settings or called programmatically.", "link": "https://extensions.gnome.org/extension/4600/switcheroo/", "shell_version_map": {"41": {"version": "3", "sha256": "0pfjhx8pm26zpizazd2pbpfqsr8vwc6znrm1cbf4ydcyvfxsnwwh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB0byB0aGUgZmlyc3Qgd2luZG93IHdpdGggdGhlIHRpdGxlIHhcblxuQSB2ZXJ5IHNtYWxsIGV4dGVuc2lvbiB0byBhbGxvdyB5b3UgdG8gc3dpdGNoIHdpbmRvd3MgdmlhIGdkYnVzLiBUaGlzIGlzIHBhcnRpY3VsYXJseSB1c2VmdWwgaWYgeW91IGFyZSB1c2luZyB3YXlsYW5kIGFzIHV0aWxpdGllcyBzdWNoIGFzIHdtY3RybCB3b24ndCB3b3JrLlxuXG5TaW5jZSBHbm9tZSA0MSByZW1vdmVkIG9yZy5nbm9tZS5TaGVsbC5FdmFsIGZvciBzZWN1cml0eSByZWFzb25zLCBpZiB5b3UgZXZlciB1c2VkIGEgY29tbWFuZCBzdWNoIGFzOlxuXG5nZGJ1cyBjYWxsIC0tc2Vzc2lvbiAtLWRlc3Qgb3JnLmdub21lLlNoZWxsIC0tb2JqZWN0LXBhdGggL29yZy9nbm9tZS9TaGVsbCAtLW1ldGhvZCBvcmcuZ25vbWUuU2hlbGwuRXZhbFwidmFyIG13ID0gZ2xvYmFsLmdldF93aW5kb3dfYWN0b3JzKCkubWFwKHc9Jmd0O3cubWV0YV93aW5kb3cpLmZpbmQobXc9Jmd0O213LmdldF90aXRsZSgpLmluY2x1ZGVzKCdGaXJlZm94JykpO213ICZhbXA7JmFtcDsgbXcuYWN0aXZhdGUoMClcIlxuXG50aGlzIGNhbiBub3cgYmUgcmVwbGFjZWQgd2l0aDpcblxuZ2RidXMgY2FsbCAtLXNlc3Npb24gLS1kZXN0IG9yZy5nbm9tZS5TaGVsbCAtLW9iamVjdC1wYXRoIC9vcmcvc3dpdGNoZXJvby9Td2l0Y2hlcm9vIC0tbWV0aG9kIG9yZy5zd2l0Y2hlcm9vLlN3aXRjaGVyb28uU2V0IEZpcmVmb3hcblxuVGhpcyBjYW4gdGhlbiBiZSBhc3NpZ25lZCB0byBhIHNob3J0Y3V0IGtleSBpbiBHbm9tZSBzZXR0aW5ncyBvciBjYWxsZWQgcHJvZ3JhbW1hdGljYWxseS4iLAogICJuYW1lIjogIlN3aXRjaGVyb28iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInAuc3RvbmhhbUBzd2l0Y2hlcm9vLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "sane-airplane-mode@kippi", "name": "Sane Airplane Mode", "pname": "sane-airplane-mode", "description": "Make airplane mode sane again! This extension gives you better control over the airplane mode. \nHint: With this extension you can also turn off the annoying \"Bluetooth gets turned on when I disable airplane mode\" behaviour.", "link": "https://extensions.gnome.org/extension/4604/sane-airplane-mode/", "shell_version_map": {"40": {"version": "7", "sha256": "0y79lqhc4ps7nhzpm0jwcpmy8y5pq4fz06jdxsiplfp6x95kkbny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veEtpcHBpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zYW5lLWFpcnBsYW5lLW1vZGUiLAogICJ1dWlkIjogInNhbmUtYWlycGxhbmUtbW9kZUBraXBwaSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "0y79lqhc4ps7nhzpm0jwcpmy8y5pq4fz06jdxsiplfp6x95kkbny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veEtpcHBpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zYW5lLWFpcnBsYW5lLW1vZGUiLAogICJ1dWlkIjogInNhbmUtYWlycGxhbmUtbW9kZUBraXBwaSIsCiAgInZlcnNpb24iOiA3Cn0="}}} @@ -610,10 +613,10 @@ , {"uuid": "alphatint@saifulbkhan.github.com", "name": "AlphaTint", "pname": "alphatint", "description": "Artificially reduce brightness of your displays (including external monitors).\n\nIt is a fork of ColorTint modified to reduce brightness without an alpha channel.", "link": "https://extensions.gnome.org/extension/4624/alphatint/", "shell_version_map": {"40": {"version": "4", "sha256": "0yzip19k148y7yjkgxirhmi5sqj8brgnxij310ka5sl3big95rqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFydGlmaWNpYWxseSByZWR1Y2UgYnJpZ2h0bmVzcyBvZiB5b3VyIGRpc3BsYXlzIChpbmNsdWRpbmcgZXh0ZXJuYWwgbW9uaXRvcnMpLlxuXG5JdCBpcyBhIGZvcmsgb2YgQ29sb3JUaW50IG1vZGlmaWVkIHRvIHJlZHVjZSBicmlnaHRuZXNzIHdpdGhvdXQgYW4gYWxwaGEgY2hhbm5lbC4iLAogICJuYW1lIjogIkFscGhhVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FpZnVsYmtoYW4vYWxwaGEtdGludCIsCiAgInV1aWQiOiAiYWxwaGF0aW50QHNhaWZ1bGJraGFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0yzip19k148y7yjkgxirhmi5sqj8brgnxij310ka5sl3big95rqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFydGlmaWNpYWxseSByZWR1Y2UgYnJpZ2h0bmVzcyBvZiB5b3VyIGRpc3BsYXlzIChpbmNsdWRpbmcgZXh0ZXJuYWwgbW9uaXRvcnMpLlxuXG5JdCBpcyBhIGZvcmsgb2YgQ29sb3JUaW50IG1vZGlmaWVkIHRvIHJlZHVjZSBicmlnaHRuZXNzIHdpdGhvdXQgYW4gYWxwaGEgY2hhbm5lbC4iLAogICJuYW1lIjogIkFscGhhVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FpZnVsYmtoYW4vYWxwaGEtdGludCIsCiAgInV1aWQiOiAiYWxwaGF0aW50QHNhaWZ1bGJraGFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "focus-changer@heartmire", "name": "Focus changer", "pname": "focus-changer", "description": "Change focus between windows in all directions.\n\nThe extension will first try to find a suitable window within the same monitor. If there is none, it will try to find one on the next monitor in that direction (in a multi-monitor setup).\n\nDefault shortcuts (can be changed in preferences):\n+h = Focus left\n+j = Focus down\n+k = Focus up\n+l = Focus right", "link": "https://extensions.gnome.org/extension/4627/focus-changer/", "shell_version_map": {"38": {"version": "9", "sha256": "0ngn0bw0f2fpp0vv4hq7gb0vx2xq2gk3nkkb6p393i9qbr42l3y1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcnRpbmhqYXJ0bXlyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1cy1jaGFuZ2VyIiwKICAidXVpZCI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "8", "sha256": "0lcws0mgf72pl8q9q4finfkkzxic22f6gfljfkv5yghl8v1ksv06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFydGluaGphcnRteXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZvY3VzLWNoYW5nZXIiLAogICJ1dWlkIjogImZvY3VzLWNoYW5nZXJAaGVhcnRtaXJlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "0lcws0mgf72pl8q9q4finfkkzxic22f6gfljfkv5yghl8v1ksv06", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFydGluaGphcnRteXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZvY3VzLWNoYW5nZXIiLAogICJ1dWlkIjogImZvY3VzLWNoYW5nZXJAaGVhcnRtaXJlIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "no-titlebar-when-maximized@alec.ninja", "name": "No Titlebar When Maximized", "pname": "no-titlebar-when-maximized", "description": "Hides the classic title bar of maximized X.Org windows", "link": "https://extensions.gnome.org/extension/4630/no-titlebar-when-maximized/", "shell_version_map": {"41": {"version": "4", "sha256": "08vdlmv471b7v0c3h0p2yky7rmrrjrazn3in7qqmfvlp28j3hasl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBjbGFzc2ljIHRpdGxlIGJhciBvZiBtYXhpbWl6ZWQgWC5Pcmcgd2luZG93cyIsCiAgIm5hbWUiOiAiTm8gVGl0bGViYXIgV2hlbiBNYXhpbWl6ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxlY2RvdG5pbmphL25vLXRpdGxlYmFyLXdoZW4tbWF4aW1pemVkIiwKICAidXVpZCI6ICJuby10aXRsZWJhci13aGVuLW1heGltaXplZEBhbGVjLm5pbmphIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "cryptowatch@d0x2f.github.com", "name": "CryptoWatch", "pname": "cryptowatch", "description": "Display live crypto portfolio balances.", "link": "https://extensions.gnome.org/extension/4633/cryptowatch/", "shell_version_map": {"40": {"version": "5", "sha256": "1yxlqbqw1j2gsydfqiz6xqdl6yv6iww90c1l8f1y6601p8979rc0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZDB4MmYvQ3J5cHRvV2F0Y2giLAogICJ1dWlkIjogImNyeXB0b3dhdGNoQGQweDJmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1yxlqbqw1j2gsydfqiz6xqdl6yv6iww90c1l8f1y6601p8979rc0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZDB4MmYvQ3J5cHRvV2F0Y2giLAogICJ1dWlkIjogImNyeXB0b3dhdGNoQGQweDJmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "cryptowatch@d0x2f.github.com", "name": "CryptoWatch", "pname": "cryptowatch", "description": "Display live crypto portfolio balances.", "link": "https://extensions.gnome.org/extension/4633/cryptowatch/", "shell_version_map": {"40": {"version": "7", "sha256": "0wrvkj0ls103wzxbx8xsl79srmg5rfy046nr1nkrf83h06dn65pv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZDB4MmYvQ3J5cHRvV2F0Y2giLAogICJ1dWlkIjogImNyeXB0b3dhdGNoQGQweDJmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0wrvkj0ls103wzxbx8xsl79srmg5rfy046nr1nkrf83h06dn65pv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZDB4MmYvQ3J5cHRvV2F0Y2giLAogICJ1dWlkIjogImNyeXB0b3dhdGNoQGQweDJmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "mousefollowsfocus@matthes.biz", "name": "Mouse Follows Focus", "pname": "mouse-follows-focus", "description": "Are you a power-user?\nDo you like using Super+1,2,3 to access your favorite apps?\nAre you annoyed that you have to manually move your mouse between screens because it can't keep up with your keyboard shortcuts?\nThen this extension is for you!\n\nThis simple GNOME shell extension does the opposite of the 'focus follows mouse' setting. It makes the mouse follow your keyboard focus. Whenever you focus a window, if the cursor isn't already in it, it will jump to the windows center, making it easy to interact with it.", "link": "https://extensions.gnome.org/extension/4642/mouse-follows-focus/", "shell_version_map": {"41": {"version": "4", "sha256": "1zsy76sab87s74p30sxdp1cki1w956gm0sw27anpx1z6yih50rdv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFyZSB5b3UgYSBwb3dlci11c2VyP1xuRG8geW91IGxpa2UgdXNpbmcgU3VwZXIrMSwyLDMgdG8gYWNjZXNzIHlvdXIgZmF2b3JpdGUgYXBwcz9cbkFyZSB5b3UgYW5ub3llZCB0aGF0IHlvdSBoYXZlIHRvIG1hbnVhbGx5IG1vdmUgeW91ciBtb3VzZSBiZXR3ZWVuIHNjcmVlbnMgYmVjYXVzZSBpdCBjYW4ndCBrZWVwIHVwIHdpdGggeW91ciBrZXlib2FyZCBzaG9ydGN1dHM/XG5UaGVuIHRoaXMgZXh0ZW5zaW9uIGlzIGZvciB5b3UhXG5cblRoaXMgc2ltcGxlIEdOT01FIHNoZWxsIGV4dGVuc2lvbiBkb2VzIHRoZSBvcHBvc2l0ZSBvZiB0aGUgJ2ZvY3VzIGZvbGxvd3MgbW91c2UnIHNldHRpbmcuIEl0IG1ha2VzIHRoZSBtb3VzZSBmb2xsb3cgeW91ciBrZXlib2FyZCBmb2N1cy4gV2hlbmV2ZXIgeW91IGZvY3VzIGEgd2luZG93LCBpZiB0aGUgY3Vyc29yIGlzbid0IGFscmVhZHkgaW4gaXQsIGl0IHdpbGwganVtcCB0byB0aGUgd2luZG93cyBjZW50ZXIsIG1ha2luZyBpdCBlYXN5IHRvIGludGVyYWN0IHdpdGggaXQuIiwKICAibmFtZSI6ICJNb3VzZSBGb2xsb3dzIEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlb25NYXR0aGVzL21vdXNlZm9sbG93c2ZvY3VzIiwKICAidXVpZCI6ICJtb3VzZWZvbGxvd3Nmb2N1c0BtYXR0aGVzLmJpeiIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "gnome-extension-pass-search-provider.lavrov.github.com", "name": "Pass Search Provider", "pname": "pass-search-provider", "description": "Shows matching pass entries in gnome search", "link": "https://extensions.gnome.org/extension/4645/pass-search-provider/", "shell_version_map": {"40": {"version": "6", "sha256": "06msk4zds1q6jjdw6g7akbsiyfz0avwvydpykcylhhc9ribzsncn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG1hdGNoaW5nIHBhc3MgZW50cmllcyBpbiBnbm9tZSBzZWFyY2giLAogICJuYW1lIjogIlBhc3MgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdnJvdi9nbm9tZS1leHRlbnNpb24tcGFzcy1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogImdub21lLWV4dGVuc2lvbi1wYXNzLXNlYXJjaC1wcm92aWRlci5sYXZyb3YuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"uuid": "desktop-cube@schneegans.github.com", "name": "Desktop Cube", "pname": "desktop-cube", "description": "Indulge in nostalgia with useless 3D effects.", "link": "https://extensions.gnome.org/extension/4648/desktop-cube/", "shell_version_map": {"40": {"version": "7", "sha256": "03valwb8s7i1l0sl8k7h060m8wryj9dwix2wpjbzz8skrsh9vjgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9EZXNrdG9wLUN1YmUiLAogICJ1dWlkIjogImRlc2t0b3AtY3ViZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "03valwb8s7i1l0sl8k7h060m8wryj9dwix2wpjbzz8skrsh9vjgn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9EZXNrdG9wLUN1YmUiLAogICJ1dWlkIjogImRlc2t0b3AtY3ViZUBzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "desktop-cube@schneegans.github.com", "name": "Desktop Cube", "pname": "desktop-cube", "description": "Indulge in nostalgia with useless 3D effects.", "link": "https://extensions.gnome.org/extension/4648/desktop-cube/", "shell_version_map": {"40": {"version": "9", "sha256": "0ijp96f1xyr7md04v5ls9pn7i7i0pibvrn60fsm71jl0f8i9v6i7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "0ijp96f1xyr7md04v5ls9pn7i7i0pibvrn60fsm71jl0f8i9v6i7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "0ijp96f1xyr7md04v5ls9pn7i7i0pibvrn60fsm71jl0f8i9v6i7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "notification-banner-reloaded@marcinjakubowski.github.com", "name": "Notification Banner Reloaded", "pname": "notification-banner-reloaded", "description": "Configure notification banner position and animation to your liking", "link": "https://extensions.gnome.org/extension/4651/notification-banner-reloaded/", "shell_version_map": {"40": {"version": "3", "sha256": "0bpk2s1q6r7bzq8cxyga7dy90liwhmlpga74l9zigr2m9p8kp97p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9ub3RpZmljYXRpb24tcG9zaXRpb24tcmVsb2FkZWQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1iYW5uZXItcmVsb2FkZWRAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0bpk2s1q6r7bzq8cxyga7dy90liwhmlpga74l9zigr2m9p8kp97p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFyY2luamFrdWJvd3NraS9ub3RpZmljYXRpb24tcG9zaXRpb24tcmVsb2FkZWQiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1iYW5uZXItcmVsb2FkZWRAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "gnome-extension-brightness@bruno.englert.gitlab.com", "name": "Adjust Display Brightness", "pname": "adjust-display-brightness", "description": "Simple GNOME extension to control displays' brightness via DDC. It requires ddcutil to be installed, I2C permissions for non-root users configured.", "link": "https://extensions.gnome.org/extension/4652/adjust-display-brightness/", "shell_version_map": {"40": {"version": "20", "sha256": "0ldlghrlvlifqpnjpysacahfm4v504k7vhzrvay6w36w8v0yadav", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYnJ1bm8uZW5nbGVydC9nbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZ25vbWUtZXh0ZW5zaW9uLWJyaWdodG5lc3NAYnJ1bm8uZW5nbGVydC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "0ldlghrlvlifqpnjpysacahfm4v504k7vhzrvay6w36w8v0yadav", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYnJ1bm8uZW5nbGVydC9nbm9tZS1leHRlbnNpb24tYnJpZ2h0bmVzcyIsCiAgInV1aWQiOiAiZ25vbWUtZXh0ZW5zaW9uLWJyaWdodG5lc3NAYnJ1bm8uZW5nbGVydC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}}} , {"uuid": "date-menu-formatter@marcinjakubowski.github.com", "name": "Date Menu Formatter", "pname": "date-menu-formatter", "description": "Allows customization of the date display in the panel.\n\nMight be especially useful if you're using a horizontal panel which does not at all work well with the default date display.\n\nCHANGELOG\nVersion 5: added support for multiple Dash To Panel panels\nVersion 6: fixed issues on earlier Gnome Shell versions", "link": "https://extensions.gnome.org/extension/4655/date-menu-formatter/", "shell_version_map": {"40": {"version": "6", "sha256": "0w2qy8hr569hq66dnpq5ajii66wrmpdxhr7ws0kj992f0nlrs78i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0w2qy8hr569hq66dnpq5ajii66wrmpdxhr7ws0kj992f0nlrs78i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGF0ZS1tZW51LWZvcm1hdHRlckBtYXJjaW5qYWt1Ym93c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} @@ -624,35 +627,82 @@ , {"uuid": "cloudflare-warp-gnome@harshan01", "name": "Cloudflare 1.1.1.1 WARP Switcher", "pname": "cloudflare-1111-warp-switcher", "description": "Unofficial Cloudflare 1.1.1.1 WARP Switcher extension for GNOME shell", "link": "https://extensions.gnome.org/extension/4670/cloudflare-1111-warp-switcher/", "shell_version_map": {"38": {"version": "2", "sha256": "0r4m8ga3l31gbi3pxvpnc4w98ik4ixn609hj1nqj3c95f3ld97z3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFyc2hhbjAxL0Nsb3VkZmxhcmUtV0FSUC1HTk9NRS1Td2l0Y2hlciIsCiAgInV1aWQiOiAiY2xvdWRmbGFyZS13YXJwLWdub21lQGhhcnNoYW4wMSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "0r4m8ga3l31gbi3pxvpnc4w98ik4ixn609hj1nqj3c95f3ld97z3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFyc2hhbjAxL0Nsb3VkZmxhcmUtV0FSUC1HTk9NRS1Td2l0Y2hlciIsCiAgInV1aWQiOiAiY2xvdWRmbGFyZS13YXJwLWdub21lQGhhcnNoYW4wMSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "alt-tab-move-mouse@buzztaiki.github.com", "name": "Alt-Tab Move Mouse", "pname": "alt-tab-move-mouse", "description": "Move mouse pointer onto active window after Alt-Tab. This extension is workaround of some sloppy focus problems", "link": "https://extensions.gnome.org/extension/4673/alt-tab-move-mouse/", "shell_version_map": {"40": {"version": "1", "sha256": "0dl2v61v2iqnf1qk7dsi60bm68kk4kc16jbrk9knw4ys8n35bxy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgbW91c2UgcG9pbnRlciBvbnRvIGFjdGl2ZSB3aW5kb3cgYWZ0ZXIgQWx0LVRhYi4gVGhpcyBleHRlbnNpb24gaXMgd29ya2Fyb3VuZCBvZiBzb21lIHNsb3BweSBmb2N1cyBwcm9ibGVtcyIsCiAgIm5hbWUiOiAiQWx0LVRhYiBNb3ZlIE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXp6dGFpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFsdC10YWItbW92ZS1tb3VzZSIsCiAgInV1aWQiOiAiYWx0LXRhYi1tb3ZlLW1vdXNlQGJ1enp0YWlraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "41": {"version": "1", "sha256": "0dl2v61v2iqnf1qk7dsi60bm68kk4kc16jbrk9knw4ys8n35bxy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgbW91c2UgcG9pbnRlciBvbnRvIGFjdGl2ZSB3aW5kb3cgYWZ0ZXIgQWx0LVRhYi4gVGhpcyBleHRlbnNpb24gaXMgd29ya2Fyb3VuZCBvZiBzb21lIHNsb3BweSBmb2N1cyBwcm9ibGVtcyIsCiAgIm5hbWUiOiAiQWx0LVRhYiBNb3ZlIE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXp6dGFpa2kvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFsdC10YWItbW92ZS1tb3VzZSIsCiAgInV1aWQiOiAiYWx0LXRhYi1tb3ZlLW1vdXNlQGJ1enp0YWlraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "Server@sven.kramer", "name": "Server", "pname": "server", "description": "A simple Indicator that shows my home-server status (online / offline) on the main panel. Furthermore a wake on lan can be triggered. For WOL functionality, its necessary that you have 'wakeonlan' installed. This extension is only tested with Gnome 40+. Didnt test it yet with older versions.", "link": "https://extensions.gnome.org/extension/4676/server/", "shell_version_map": {"38": {"version": "3", "sha256": "1dcy5kw5797wjjdg85hc16vh82c3xjs2xdn3m573rqs3fjayy507", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiBUaGlzIGV4dGVuc2lvbiBpcyBvbmx5IHRlc3RlZCB3aXRoIEdub21lIDQwKy4gRGlkbnQgdGVzdCBpdCB5ZXQgd2l0aCBvbGRlciB2ZXJzaW9ucy4iLAogICJuYW1lIjogIlNlcnZlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5TZXJ2ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJTZXJ2ZXJAc3Zlbi5rcmFtZXIiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1dcy5kw5797wjjdg85hc16vh82c3xjs2xdn3m573rqs3fjayy507", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiBUaGlzIGV4dGVuc2lvbiBpcyBvbmx5IHRlc3RlZCB3aXRoIEdub21lIDQwKy4gRGlkbnQgdGVzdCBpdCB5ZXQgd2l0aCBvbGRlciB2ZXJzaW9ucy4iLAogICJuYW1lIjogIlNlcnZlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5TZXJ2ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJTZXJ2ZXJAc3Zlbi5rcmFtZXIiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1dcy5kw5797wjjdg85hc16vh82c3xjs2xdn3m573rqs3fjayy507", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiBUaGlzIGV4dGVuc2lvbiBpcyBvbmx5IHRlc3RlZCB3aXRoIEdub21lIDQwKy4gRGlkbnQgdGVzdCBpdCB5ZXQgd2l0aCBvbGRlciB2ZXJzaW9ucy4iLAogICJuYW1lIjogIlNlcnZlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5TZXJ2ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJTZXJ2ZXJAc3Zlbi5rcmFtZXIiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "burn-my-windows@schneegans.github.com", "name": "Burn My Windows", "pname": "burn-my-windows", "description": "Disintegrate your apps with style.", "link": "https://extensions.gnome.org/extension/4679/burn-my-windows/", "shell_version_map": {"38": {"version": "9", "sha256": "09nlh3i783i9yiiv64vw3jzfllmv5ciwvxzw3lsp0402k5gg38a6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIGFwcHMgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "9", "sha256": "09nlh3i783i9yiiv64vw3jzfllmv5ciwvxzw3lsp0402k5gg38a6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIGFwcHMgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "09nlh3i783i9yiiv64vw3jzfllmv5ciwvxzw3lsp0402k5gg38a6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIGFwcHMgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvQnVybi1NeS1XaW5kb3dzIiwKICAidXVpZCI6ICJidXJuLW15LXdpbmRvd3NAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} -, {"uuid": "babar-lite@fthx", "name": "BaBar Lite", "pname": "babar-task-bar-lite-for-gnome-40", "description": "Task bar. App grid, favorites, workspaces and tasks in panel. Light extension.\n\n Replace 'Activities' button by all current workspaces and apps buttons. Switch workspace/app or toggle overview by clicking on these buttons. Drag and drop favorite, task, dash item or app grid item to any workspace (you cannot reorder tasks inside a workspace). Change 'Places' label to an icon. No settings, use BaBar classic for that.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.", "link": "https://extensions.gnome.org/extension/4681/babar-task-bar-lite-for-gnome-40/", "shell_version_map": {"40": {"version": "2", "sha256": "01m48bwpn1as90ahpnl9ari3s2bj8423032nw12ac45wwcnb9yvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gTm8gc2V0dGluZ3MsIHVzZSBCYUJhciBjbGFzc2ljIGZvciB0aGF0LlxuXG4gWW91IGNhbiB1c2UgbmFtZXMgZm9yIHdvcmtzcGFjZXM6IHRoZXJlIGFyZSB0d28gd2F5cyBmb3IgdGhhdC4gMSkgRWRpdCB0aGUgc3RyaW5nIGFycmF5ICdvcmcuZ25vbWUuZGVza3RvcC53bS5wcmVmZXJlbmNlcy53b3Jrc3BhY2UtbmFtZXMnIGdzZXR0aW5ncyBrZXkgKHRocm91Z2ggZGNvbmYgZWRpdG9yLCBlLmcuKS4gMikgVXNlIG9mZmljaWFsIEdOT01FIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEluZGljYXRvcidzIHNldHRpbmdzLiBZb3UgZG9uJ3QgaGF2ZSB0byB3cml0ZSBhIGxvbmcgZW5vdWdoIGxpc3Q6IG51bWJlcnMgYXJlIGRpc3BsYXllZCBpZiBubyB3b3Jrc3BhY2UgbmFtZSBpcyBkZWZpbmVkLiIsCiAgIm5hbWUiOiAiQmFCYXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXItbGl0ZSIsCiAgInV1aWQiOiAiYmFiYXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "01m48bwpn1as90ahpnl9ari3s2bj8423032nw12ac45wwcnb9yvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gTm8gc2V0dGluZ3MsIHVzZSBCYUJhciBjbGFzc2ljIGZvciB0aGF0LlxuXG4gWW91IGNhbiB1c2UgbmFtZXMgZm9yIHdvcmtzcGFjZXM6IHRoZXJlIGFyZSB0d28gd2F5cyBmb3IgdGhhdC4gMSkgRWRpdCB0aGUgc3RyaW5nIGFycmF5ICdvcmcuZ25vbWUuZGVza3RvcC53bS5wcmVmZXJlbmNlcy53b3Jrc3BhY2UtbmFtZXMnIGdzZXR0aW5ncyBrZXkgKHRocm91Z2ggZGNvbmYgZWRpdG9yLCBlLmcuKS4gMikgVXNlIG9mZmljaWFsIEdOT01FIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEluZGljYXRvcidzIHNldHRpbmdzLiBZb3UgZG9uJ3QgaGF2ZSB0byB3cml0ZSBhIGxvbmcgZW5vdWdoIGxpc3Q6IG51bWJlcnMgYXJlIGRpc3BsYXllZCBpZiBubyB3b3Jrc3BhY2UgbmFtZSBpcyBkZWZpbmVkLiIsCiAgIm5hbWUiOiAiQmFCYXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXItbGl0ZSIsCiAgInV1aWQiOiAiYmFiYXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "useless-gaps@pimsnel.com", "name": "Useless Gaps", "pname": "useless-gaps", "description": "For aesthetic purposes, adds \"useless gaps\" around tiled and maximized windows.", "link": "https://extensions.gnome.org/extension/4684/useless-gaps/", "shell_version_map": {"38": {"version": "4", "sha256": "11d3i2hmgrzpcfbfni68ikjp53wlvkdzwx1664wrcdsmkwddywzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMsIGFkZHMgXCJ1c2VsZXNzIGdhcHNcIiBhcm91bmQgdGlsZWQgYW5kIG1heGltaXplZCB3aW5kb3dzLiIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "11d3i2hmgrzpcfbfni68ikjp53wlvkdzwx1664wrcdsmkwddywzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMsIGFkZHMgXCJ1c2VsZXNzIGdhcHNcIiBhcm91bmQgdGlsZWQgYW5kIG1heGltaXplZCB3aW5kb3dzLiIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "11d3i2hmgrzpcfbfni68ikjp53wlvkdzwx1664wrcdsmkwddywzl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMsIGFkZHMgXCJ1c2VsZXNzIGdhcHNcIiBhcm91bmQgdGlsZWQgYW5kIG1heGltaXplZCB3aW5kb3dzLiIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "serverstatus@footeware.ca", "name": "Server Status Indicator", "pname": "server-status-indicator", "description": "Indicator displaying status of an entered web server url, green for up, red for down.", "link": "https://extensions.gnome.org/extension/4687/server-status-indicator/", "shell_version_map": {"40": {"version": "5", "sha256": "1pkbkzsa7hydin9sbkxnj92nxllr35zy9jqan97yra6wh438rlgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBhbiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJsLCBncmVlbiBmb3IgdXAsIHJlZCBmb3IgZG93bi4iLAogICJuYW1lIjogIlNlcnZlciBTdGF0dXMgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"uuid": "burn-my-windows@schneegans.github.com", "name": "Burn My Windows", "pname": "burn-my-windows", "description": "Disintegrate your windows with style.", "link": "https://extensions.gnome.org/extension/4679/burn-my-windows/", "shell_version_map": {"38": {"version": "12", "sha256": "0h40gzbm1kf3mm6xsdibjkbwhgy7vjqyp3nnjs97apfz99pm5a60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0J1cm4tTXktV2luZG93cyIsCiAgInV1aWQiOiAiYnVybi1teS13aW5kb3dzQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "0h40gzbm1kf3mm6xsdibjkbwhgy7vjqyp3nnjs97apfz99pm5a60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0J1cm4tTXktV2luZG93cyIsCiAgInV1aWQiOiAiYnVybi1teS13aW5kb3dzQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0h40gzbm1kf3mm6xsdibjkbwhgy7vjqyp3nnjs97apfz99pm5a60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0J1cm4tTXktV2luZG93cyIsCiAgInV1aWQiOiAiYnVybi1teS13aW5kb3dzQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "0h40gzbm1kf3mm6xsdibjkbwhgy7vjqyp3nnjs97apfz99pm5a60", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TY2huZWVnYW5zL0J1cm4tTXktV2luZG93cyIsCiAgInV1aWQiOiAiYnVybi1teS13aW5kb3dzQHNjaG5lZWdhbnMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}}} +, {"uuid": "babar-lite@fthx", "name": "BaBar Lite", "pname": "babar-task-bar-lite-for-gnome-40", "description": "Task bar. App grid, favorites, workspaces and tasks in panel. Light extension.\n\n Replace 'Activities' button by all current workspaces and apps buttons. Switch workspace/app or toggle overview by clicking on these buttons. Drag and drop favorite, task, dash item or app grid item to any workspace (you cannot reorder tasks inside a workspace). Change 'Places' label to an icon. No settings, use BaBar classic for that.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.", "link": "https://extensions.gnome.org/extension/4681/babar-task-bar-lite-for-gnome-40/", "shell_version_map": {"40": {"version": "2", "sha256": "01m48bwpn1as90ahpnl9ari3s2bj8423032nw12ac45wwcnb9yvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gTm8gc2V0dGluZ3MsIHVzZSBCYUJhciBjbGFzc2ljIGZvciB0aGF0LlxuXG4gWW91IGNhbiB1c2UgbmFtZXMgZm9yIHdvcmtzcGFjZXM6IHRoZXJlIGFyZSB0d28gd2F5cyBmb3IgdGhhdC4gMSkgRWRpdCB0aGUgc3RyaW5nIGFycmF5ICdvcmcuZ25vbWUuZGVza3RvcC53bS5wcmVmZXJlbmNlcy53b3Jrc3BhY2UtbmFtZXMnIGdzZXR0aW5ncyBrZXkgKHRocm91Z2ggZGNvbmYgZWRpdG9yLCBlLmcuKS4gMikgVXNlIG9mZmljaWFsIEdOT01FIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEluZGljYXRvcidzIHNldHRpbmdzLiBZb3UgZG9uJ3QgaGF2ZSB0byB3cml0ZSBhIGxvbmcgZW5vdWdoIGxpc3Q6IG51bWJlcnMgYXJlIGRpc3BsYXllZCBpZiBubyB3b3Jrc3BhY2UgbmFtZSBpcyBkZWZpbmVkLiIsCiAgIm5hbWUiOiAiQmFCYXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXItbGl0ZSIsCiAgInV1aWQiOiAiYmFiYXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "01m48bwpn1as90ahpnl9ari3s2bj8423032nw12ac45wwcnb9yvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gTm8gc2V0dGluZ3MsIHVzZSBCYUJhciBjbGFzc2ljIGZvciB0aGF0LlxuXG4gWW91IGNhbiB1c2UgbmFtZXMgZm9yIHdvcmtzcGFjZXM6IHRoZXJlIGFyZSB0d28gd2F5cyBmb3IgdGhhdC4gMSkgRWRpdCB0aGUgc3RyaW5nIGFycmF5ICdvcmcuZ25vbWUuZGVza3RvcC53bS5wcmVmZXJlbmNlcy53b3Jrc3BhY2UtbmFtZXMnIGdzZXR0aW5ncyBrZXkgKHRocm91Z2ggZGNvbmYgZWRpdG9yLCBlLmcuKS4gMikgVXNlIG9mZmljaWFsIEdOT01FIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEluZGljYXRvcidzIHNldHRpbmdzLiBZb3UgZG9uJ3QgaGF2ZSB0byB3cml0ZSBhIGxvbmcgZW5vdWdoIGxpc3Q6IG51bWJlcnMgYXJlIGRpc3BsYXllZCBpZiBubyB3b3Jrc3BhY2UgbmFtZSBpcyBkZWZpbmVkLiIsCiAgIm5hbWUiOiAiQmFCYXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXItbGl0ZSIsCiAgInV1aWQiOiAiYmFiYXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "01m48bwpn1as90ahpnl9ari3s2bj8423032nw12ac45wwcnb9yvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gTm8gc2V0dGluZ3MsIHVzZSBCYUJhciBjbGFzc2ljIGZvciB0aGF0LlxuXG4gWW91IGNhbiB1c2UgbmFtZXMgZm9yIHdvcmtzcGFjZXM6IHRoZXJlIGFyZSB0d28gd2F5cyBmb3IgdGhhdC4gMSkgRWRpdCB0aGUgc3RyaW5nIGFycmF5ICdvcmcuZ25vbWUuZGVza3RvcC53bS5wcmVmZXJlbmNlcy53b3Jrc3BhY2UtbmFtZXMnIGdzZXR0aW5ncyBrZXkgKHRocm91Z2ggZGNvbmYgZWRpdG9yLCBlLmcuKS4gMikgVXNlIG9mZmljaWFsIEdOT01FIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEluZGljYXRvcidzIHNldHRpbmdzLiBZb3UgZG9uJ3QgaGF2ZSB0byB3cml0ZSBhIGxvbmcgZW5vdWdoIGxpc3Q6IG51bWJlcnMgYXJlIGRpc3BsYXllZCBpZiBubyB3b3Jrc3BhY2UgbmFtZSBpcyBkZWZpbmVkLiIsCiAgIm5hbWUiOiAiQmFCYXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXItbGl0ZSIsCiAgInV1aWQiOiAiYmFiYXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "useless-gaps@pimsnel.com", "name": "Useless Gaps", "pname": "useless-gaps", "description": "For aesthetic purposes adds useless gaps around tiled and maximized windows", "link": "https://extensions.gnome.org/extension/4684/useless-gaps/", "shell_version_map": {"38": {"version": "5", "sha256": "1nd5xxwvf2wxm863029xwij99v6zdpbw86465i5kdrxrgwsgcn9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1nd5xxwvf2wxm863029xwij99v6zdpbw86465i5kdrxrgwsgcn9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "1nd5xxwvf2wxm863029xwij99v6zdpbw86465i5kdrxrgwsgcn9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "serverstatus@footeware.ca", "name": "Server Status Indicator", "pname": "server-status-indicator", "description": "Indicator displaying status of entered web server urls, green for up, red for down.", "link": "https://extensions.gnome.org/extension/4687/server-status-indicator/", "shell_version_map": {"40": {"version": "7", "sha256": "16csdmbvjcahvkihq3gw4rympyc80jjchf68p1hwvcx338pdx8ga", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ3JhaWdGb290ZS9jYS5mb290ZXdhcmUuZ25vbWVzaGVsbC5zZXJ2ZXJzdGF0dXMuZ2l0IiwKICAidXVpZCI6ICJzZXJ2ZXJzdGF0dXNAZm9vdGV3YXJlLmNhIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "focus-follows-workspace@christopher.luebbemeier.gmail.com", "name": "Focus Follows Workspace", "pname": "focus-follows-workspace", "description": "Focus the primary monitor after switching workspaces via keyboard.\n\nThis extension is meant to be used with a multi-monitor setup with the setting \"Workspaces on primary display only\". It enables quick switching to an application on a given workspace via keyboard by preventing the focus from being restored to a window on a secondary monitor.", "link": "https://extensions.gnome.org/extension/4688/focus-follows-workspace/", "shell_version_map": {"41": {"version": "1", "sha256": "1xllg9wp7phrqa9897m9al740k60v01zird49vwwm24wzpmyby9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBtZWFudCB0byBiZSB1c2VkIHdpdGggYSBtdWx0aS1tb25pdG9yIHNldHVwIHdpdGggdGhlIHNldHRpbmcgXCJXb3Jrc3BhY2VzIG9uIHByaW1hcnkgZGlzcGxheSBvbmx5XCIuIEl0IGVuYWJsZXMgcXVpY2sgc3dpdGNoaW5nIHRvIGFuIGFwcGxpY2F0aW9uIG9uIGEgZ2l2ZW4gd29ya3NwYWNlIHZpYSBrZXlib2FyZCBieSBwcmV2ZW50aW5nIHRoZSBmb2N1cyBmcm9tIGJlaW5nIHJlc3RvcmVkIHRvIGEgd2luZG93IG9uIGEgc2Vjb25kYXJ5IG1vbml0b3IuIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpc3RvcGhlci1sL2ZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlIiwKICAidXVpZCI6ICJmb2N1cy1mb2xsb3dzLXdvcmtzcGFjZUBjaHJpc3RvcGhlci5sdWViYmVtZWllci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "pip-on-top@rafostar.github.com", "name": "PiP on top", "pname": "pip-on-top", "description": "Makes \"Picture-in-Picture\" windows stay on top (even on Wayland session). Compatible with Firefox and Clapper media player.", "link": "https://extensions.gnome.org/extension/4691/pip-on-top/", "shell_version_map": {"38": {"version": "1", "sha256": "0gizz4r89pbmhw4ijv2qqlhdxnzlz0bnx659pmizgvmh966za3k2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "0gizz4r89pbmhw4ijv2qqlhdxnzlz0bnx659pmizgvmh966za3k2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "0gizz4r89pbmhw4ijv2qqlhdxnzlz0bnx659pmizgvmh966za3k2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "roundedSystemMenuButtons@pratap.fastmail.fm", "name": "Rounded System Menu Buttons", "pname": "rounded-system-menu-buttons", "description": "Rounded System Menu Buttons", "link": "https://extensions.gnome.org/extension/4693/rounded-system-menu-buttons/", "shell_version_map": {"38": {"version": "15", "sha256": "0ffkgb2cxv8qcyqly0wcq1vi58d5wliawc3n6qf1wwjzmm6snh3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "40": {"version": "15", "sha256": "0ffkgb2cxv8qcyqly0wcq1vi58d5wliawc3n6qf1wwjzmm6snh3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "0ffkgb2cxv8qcyqly0wcq1vi58d5wliawc3n6qf1wwjzmm6snh3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} +, {"uuid": "roundedSystemMenuButtons@pratap.fastmail.fm", "name": "Rounded System Menu Buttons", "pname": "rounded-system-menu-buttons", "description": "Rounded System Menu Buttons", "link": "https://extensions.gnome.org/extension/4693/rounded-system-menu-buttons/", "shell_version_map": {"38": {"version": "17", "sha256": "1cwjyw4sc4i4vdm458qdnjzvmiqyz9vscicwarsd9cvik57p44f5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "40": {"version": "17", "sha256": "1cwjyw4sc4i4vdm458qdnjzvmiqyz9vscicwarsd9cvik57p44f5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "1cwjyw4sc4i4vdm458qdnjzvmiqyz9vscicwarsd9cvik57p44f5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "static-background@denizaksimsek.com", "name": "Static background in overview", "pname": "static-background-in-overview", "description": "The background, always clearly visible.", "link": "https://extensions.gnome.org/extension/4696/static-background-in-overview/", "shell_version_map": {"40": {"version": "2", "sha256": "1wr4xp0jj74fjp4yjizyvy1qvmbaclk59cjjhwigxh3glkgdy8ph", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBiYWNrZ3JvdW5kLCBhbHdheXMgY2xlYXJseSB2aXNpYmxlLiIsCiAgIm5hbWUiOiAiU3RhdGljIGJhY2tncm91bmQgaW4gb3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3IiOiAicmVucy5hbHRodWlzQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHo0ay9nbm9tZS1zdGF0aWMtYmFja2dyb3VuZCIsCiAgInV1aWQiOiAic3RhdGljLWJhY2tncm91bmRAZGVuaXpha3NpbXNlay5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1wr4xp0jj74fjp4yjizyvy1qvmbaclk59cjjhwigxh3glkgdy8ph", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBiYWNrZ3JvdW5kLCBhbHdheXMgY2xlYXJseSB2aXNpYmxlLiIsCiAgIm5hbWUiOiAiU3RhdGljIGJhY2tncm91bmQgaW4gb3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3IiOiAicmVucy5hbHRodWlzQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHo0ay9nbm9tZS1zdGF0aWMtYmFja2dyb3VuZCIsCiAgInV1aWQiOiAic3RhdGljLWJhY2tncm91bmRAZGVuaXpha3NpbXNlay5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "highlight-focus@pimsnel.com", "name": "Highlight Focus", "pname": "highlight-focus", "description": "Highlights the focussed window with a temporary border", "link": "https://extensions.gnome.org/extension/4699/highlight-focus/", "shell_version_map": {"38": {"version": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "awesome-tiles@velitasali.com", "name": "Awesome Tiles", "pname": "awesome-tiles", "description": "Tile windows using keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4702/awesome-tiles/", "shell_version_map": {"40": {"version": "3", "sha256": "1byqxbbyxdqji79pjp7c5m1hrbp83sbq6rr8mmm202q1jc0hsp38", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1byqxbbyxdqji79pjp7c5m1hrbp83sbq6rr8mmm202q1jc0hsp38", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZlbGl0YXNhbGkvZ25vbWUtYXdlc29tZS10aWxlcy1leHRlbnNpb24iLAogICJ1dWlkIjogImF3ZXNvbWUtdGlsZXNAdmVsaXRhc2FsaS5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "dock-from-dash@fthx", "name": "Dock from Dash", "pname": "dock-from-dash", "description": "Dock for GNOME 40+. Does use native GNOME Shell Dash. Very light extension.\n\n Hover the bottom of your screen and GNOME Shell dash will appear without overview. Native GNOME Shell click behavior is modified: minimize if one window is open, overview if many windows are open.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4703/dock-from-dash/", "shell_version_map": {"40": {"version": "19", "sha256": "1hmhrnw8hyf6g8bk68qxkrmjl2b6747pifd9k3ipi6hkbxj0gb7n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3LiBOYXRpdmUgR05PTUUgU2hlbGwgY2xpY2sgYmVoYXZpb3IgaXMgbW9kaWZpZWQ6IG1pbmltaXplIGlmIG9uZSB3aW5kb3cgaXMgb3Blbiwgb3ZlcnZpZXcgaWYgbWFueSB3aW5kb3dzIGFyZSBvcGVuLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzIHRocm91Z2ggR2l0SHViLiIsCiAgIm5hbWUiOiAiRG9jayBmcm9tIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stZnJvbS1kYXNoIiwKICAidXVpZCI6ICJkb2NrLWZyb20tZGFzaEBmdGh4IiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "1hmhrnw8hyf6g8bk68qxkrmjl2b6747pifd9k3ipi6hkbxj0gb7n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3LiBOYXRpdmUgR05PTUUgU2hlbGwgY2xpY2sgYmVoYXZpb3IgaXMgbW9kaWZpZWQ6IG1pbmltaXplIGlmIG9uZSB3aW5kb3cgaXMgb3Blbiwgb3ZlcnZpZXcgaWYgbWFueSB3aW5kb3dzIGFyZSBvcGVuLlxuXG4gUGxlYXNlIHJlcG9ydCBidWdzIHRocm91Z2ggR2l0SHViLiIsCiAgIm5hbWUiOiAiRG9jayBmcm9tIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2RvY2stZnJvbS1kYXNoIiwKICAidXVpZCI6ICJkb2NrLWZyb20tZGFzaEBmdGh4IiwKICAidmVyc2lvbiI6IDE5Cn0="}}} -, {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": "A Gnome shell extension to close and save open windows. And restore saved windows. Most importantly, it supports both X11 and Wayland!", "link": "https://extensions.gnome.org/extension/4709/another-window-session-manager/", "shell_version_map": {"40": {"version": "9", "sha256": "0s3k3xvzj10lbcilkzfng0d0jqxwjlzlm99sp5y24hvhphv7rhdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIGNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgc2F2ZWQgd2luZG93cy4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhIiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciIsCiAgInV1aWQiOiAiYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "0s3k3xvzj10lbcilkzfng0d0jqxwjlzlm99sp5y24hvhphv7rhdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIGNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgc2F2ZWQgd2luZG93cy4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhIiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciIsCiAgInV1aWQiOiAiYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}}} +, {"uuid": "awesome-tiles@velitasali.com", "name": "Awesome Tiles", "pname": "awesome-tiles", "description": "Tile windows using keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4702/awesome-tiles/", "shell_version_map": {"40": {"version": "4", "sha256": "18im4m362yp5cv03j1acb4nqs496dz2nxxiy7zirf4qzd98hsh29", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2dub21lLWF3ZXNvbWUtdGlsZXMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhd2Vzb21lLXRpbGVzQHZlbGl0YXNhbGkuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "18im4m362yp5cv03j1acb4nqs496dz2nxxiy7zirf4qzd98hsh29", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2dub21lLWF3ZXNvbWUtdGlsZXMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhd2Vzb21lLXRpbGVzQHZlbGl0YXNhbGkuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "18im4m362yp5cv03j1acb4nqs496dz2nxxiy7zirf4qzd98hsh29", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2dub21lLWF3ZXNvbWUtdGlsZXMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhd2Vzb21lLXRpbGVzQHZlbGl0YXNhbGkuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "dock-from-dash@fthx", "name": "Dock from Dash", "pname": "dock-from-dash", "description": "Dock for GNOME Shell 40+. Does use native GNOME Shell Dash. Very light extension.\n\n Hover the bottom of your screen and GNOME Shell dash will appear without overview and will hide when you leave the dash. Native GNOME Shell click behavior is modified: minimize if one window is open, overview if many windows are open.\n\n There are some variables you can easily set in extension.js code (opacity, timeouts...). There will be no preferences UI.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4703/dock-from-dash/", "shell_version_map": {"40": {"version": "30", "sha256": "0j31s6h9a8igrip4apliyciqwhzg3yrb5yn9m2qyq4kpqi4sq2zz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uXG5cbiBUaGVyZSBhcmUgc29tZSB2YXJpYWJsZXMgeW91IGNhbiBlYXNpbHkgc2V0IGluIGV4dGVuc2lvbi5qcyBjb2RlIChvcGFjaXR5LCB0aW1lb3V0cy4uLikuIFRoZXJlIHdpbGwgYmUgbm8gcHJlZmVyZW5jZXMgVUkuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEb2NrIGZyb20gRGFzaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "41": {"version": "30", "sha256": "0j31s6h9a8igrip4apliyciqwhzg3yrb5yn9m2qyq4kpqi4sq2zz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uXG5cbiBUaGVyZSBhcmUgc29tZSB2YXJpYWJsZXMgeW91IGNhbiBlYXNpbHkgc2V0IGluIGV4dGVuc2lvbi5qcyBjb2RlIChvcGFjaXR5LCB0aW1lb3V0cy4uLikuIFRoZXJlIHdpbGwgYmUgbm8gcHJlZmVyZW5jZXMgVUkuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEb2NrIGZyb20gRGFzaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "42": {"version": "30", "sha256": "0j31s6h9a8igrip4apliyciqwhzg3yrb5yn9m2qyq4kpqi4sq2zz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uXG5cbiBUaGVyZSBhcmUgc29tZSB2YXJpYWJsZXMgeW91IGNhbiBlYXNpbHkgc2V0IGluIGV4dGVuc2lvbi5qcyBjb2RlIChvcGFjaXR5LCB0aW1lb3V0cy4uLikuIFRoZXJlIHdpbGwgYmUgbm8gcHJlZmVyZW5jZXMgVUkuXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEb2NrIGZyb20gRGFzaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogMzAKfQ=="}}} +, {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": "Close and save open windows. And restore the saved windows. Most importantly, it supports both X11 and Wayland!\n\nFeatures:\n- Close open windows\n- Save open windows\n- Restore saved open windows\n- Restore window state, including Always on Top, Always on Visible Workspace and maximization\n- Restore window workspace, size and position\n- Move windows to their own workspace according to a saved session\n- Support multi-monitor\n- Trash saved session\n- Search saved session by the session name fuzzily", "link": "https://extensions.gnome.org/extension/4709/another-window-session-manager/", "shell_version_map": {"40": {"version": "11", "sha256": "0d1d0178nvcxvsay1wqm5wclfhs7a2g500xmh3khmvc981pg83j4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgdGhlIHNhdmVkIHdpbmRvd3MuIE1vc3QgaW1wb3J0YW50bHksIGl0IHN1cHBvcnRzIGJvdGggWDExIGFuZCBXYXlsYW5kIVxuXG5GZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2F2ZWQgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgd2luZG93IHN0YXRlLCBpbmNsdWRpbmcgQWx3YXlzIG9uIFRvcCwgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBUcmFzaCBzYXZlZCBzZXNzaW9uXG4tIFNlYXJjaCBzYXZlZCBzZXNzaW9uIGJ5IHRoZSBzZXNzaW9uIG5hbWUgZnV6emlseSIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIiLAogICJ1dWlkIjogImFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlckBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0d1d0178nvcxvsay1wqm5wclfhs7a2g500xmh3khmvc981pg83j4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgdGhlIHNhdmVkIHdpbmRvd3MuIE1vc3QgaW1wb3J0YW50bHksIGl0IHN1cHBvcnRzIGJvdGggWDExIGFuZCBXYXlsYW5kIVxuXG5GZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2F2ZWQgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgd2luZG93IHN0YXRlLCBpbmNsdWRpbmcgQWx3YXlzIG9uIFRvcCwgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBUcmFzaCBzYXZlZCBzZXNzaW9uXG4tIFNlYXJjaCBzYXZlZCBzZXNzaW9uIGJ5IHRoZSBzZXNzaW9uIG5hbWUgZnV6emlseSIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIiLAogICJ1dWlkIjogImFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlckBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "prevent-double-empty-window@silliewous.nl", "name": "Prevent double empty window", "pname": "prevent-double-empty-window", "description": "Set MIN_NUMBER_WORKSPACES to 1 so there is only one empty workspace when there are no windows open.\n\nhttps://gitlab.com/g3786/prevent-double-empty-window", "link": "https://extensions.gnome.org/extension/4711/prevent-double-empty-window/", "shell_version_map": {"40": {"version": "1", "sha256": "18f1pflvv4sw1r182rrjz2jdy1ym1ipm5lid2sm518h8c3iiabb2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInByZXZlbnQtZG91YmxlLWVtcHR5LXdpbmRvd0BzaWxsaWV3b3VzLm5sIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "display-ddc-brightness-volume@sagrland.de", "name": "Display DDC Brightness Volume", "pname": "display-ddc-brightness-volume", "description": "Control external displays' brightness and audio volume via DDC. It requires ddcutil to be installed and i2c permissions for non-root users.", "link": "https://extensions.gnome.org/extension/4712/display-ddc-brightness-volume/", "shell_version_map": {"40": {"version": "1", "sha256": "1pad0q2a04lak6601vj2qz029g86l9r5m65bf0m97b21fd46a9s8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgZXh0ZXJuYWwgZGlzcGxheXMnIGJyaWdodG5lc3MgYW5kIGF1ZGlvIHZvbHVtZSB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCBhbmQgaTJjIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2Vycy4iLAogICJuYW1lIjogIkRpc3BsYXkgRERDIEJyaWdodG5lc3MgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "41": {"version": "1", "sha256": "1pad0q2a04lak6601vj2qz029g86l9r5m65bf0m97b21fd46a9s8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgZXh0ZXJuYWwgZGlzcGxheXMnIGJyaWdodG5lc3MgYW5kIGF1ZGlvIHZvbHVtZSB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCBhbmQgaTJjIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2Vycy4iLAogICJuYW1lIjogIkRpc3BsYXkgRERDIEJyaWdodG5lc3MgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TYUdyTGFuZC9nbm9tZS1zaGVsbC1kaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZS8iLAogICJ1dWlkIjogImRpc3BsYXktZGRjLWJyaWdodG5lc3Mtdm9sdW1lQHNhZ3JsYW5kLmRlIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "disable_hover@fawtytoo", "name": "Disable Hover On App & Window Switcher Popups", "pname": "disable-hover-on-app-window-switcher-popups", "description": "Prevents the mouse cursor interfering with either the App Switcher or the Window Switcher popups. For those users that like to use the keyboard only with these switchers.\nNote: It doesn't prevent mouse clicks.\n\nThese are the switcher popups that are invoked from keyboard shortcuts, e.g. Alt+Tab or Super+Tab.", "link": "https://extensions.gnome.org/extension/4714/disable-hover-on-app-window-switcher-popups/", "shell_version_map": {"38": {"version": "1", "sha256": "1h3ja9wjj5lxb2qb1p95si9q3hz2j5rj193jg1dxgjkgjkiprpjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy4gRm9yIHRob3NlIHVzZXJzIHRoYXQgbGlrZSB0byB1c2UgdGhlIGtleWJvYXJkIG9ubHkgd2l0aCB0aGVzZSBzd2l0Y2hlcnMuXG5Ob3RlOiBJdCBkb2Vzbid0IHByZXZlbnQgbW91c2UgY2xpY2tzLlxuXG5UaGVzZSBhcmUgdGhlIHN3aXRjaGVyIHBvcHVwcyB0aGF0IGFyZSBpbnZva2VkIGZyb20ga2V5Ym9hcmQgc2hvcnRjdXRzLCBlLmcuIEFsdCtUYWIgb3IgU3VwZXIrVGFiLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSBIb3ZlciBPbiBBcHAgJiBXaW5kb3cgU3dpdGNoZXIgUG9wdXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "1h3ja9wjj5lxb2qb1p95si9q3hz2j5rj193jg1dxgjkgjkiprpjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy4gRm9yIHRob3NlIHVzZXJzIHRoYXQgbGlrZSB0byB1c2UgdGhlIGtleWJvYXJkIG9ubHkgd2l0aCB0aGVzZSBzd2l0Y2hlcnMuXG5Ob3RlOiBJdCBkb2Vzbid0IHByZXZlbnQgbW91c2UgY2xpY2tzLlxuXG5UaGVzZSBhcmUgdGhlIHN3aXRjaGVyIHBvcHVwcyB0aGF0IGFyZSBpbnZva2VkIGZyb20ga2V5Ym9hcmQgc2hvcnRjdXRzLCBlLmcuIEFsdCtUYWIgb3IgU3VwZXIrVGFiLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSBIb3ZlciBPbiBBcHAgJiBXaW5kb3cgU3dpdGNoZXIgUG9wdXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "1h3ja9wjj5lxb2qb1p95si9q3hz2j5rj193jg1dxgjkgjkiprpjk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy4gRm9yIHRob3NlIHVzZXJzIHRoYXQgbGlrZSB0byB1c2UgdGhlIGtleWJvYXJkIG9ubHkgd2l0aCB0aGVzZSBzd2l0Y2hlcnMuXG5Ob3RlOiBJdCBkb2Vzbid0IHByZXZlbnQgbW91c2UgY2xpY2tzLlxuXG5UaGVzZSBhcmUgdGhlIHN3aXRjaGVyIHBvcHVwcyB0aGF0IGFyZSBpbnZva2VkIGZyb20ga2V5Ym9hcmQgc2hvcnRjdXRzLCBlLmcuIEFsdCtUYWIgb3IgU3VwZXIrVGFiLiIsCiAgIm5hbWUiOiAiRGlzYWJsZSBIb3ZlciBPbiBBcHAgJiBXaW5kb3cgU3dpdGNoZXIgUG9wdXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "countdown-timer@eexpss.gmail.com", "name": "Countdown & Timer", "pname": "countdown-timer", "description": "Countdown in minutes, or enter text containing HH:MM format to set the Timer.", "link": "https://extensions.gnome.org/extension/4720/countdown-timer/", "shell_version_map": {"40": {"version": "8", "sha256": "0p5hwymm6grn7rclpy637jxflw5h3y1fc2q8b1n3pkvj977861md", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "0p5hwymm6grn7rclpy637jxflw5h3y1fc2q8b1n3pkvj977861md", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} +, {"uuid": "countdown-timer@eexpss.gmail.com", "name": "Countdown & Timer", "pname": "countdown-timer", "description": "Countdown in minutes, or enter text containing HH:MM format to set the Timer.", "link": "https://extensions.gnome.org/extension/4720/countdown-timer/", "shell_version_map": {"40": {"version": "9", "sha256": "08va385j93b9d1n8w7b3sia656abl4x25ka1kff4kzg0rd0b74c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY291bnRkb3duLXRpbWVyIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "08va385j93b9d1n8w7b3sia656abl4x25ka1kff4kzg0rd0b74c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY291bnRkb3duLXRpbWVyIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "08va385j93b9d1n8w7b3sia656abl4x25ka1kff4kzg0rd0b74c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY291bnRkb3duLXRpbWVyIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "workspace-dry-names@benmoussatmouad.github.io", "name": "Worksapce Dry Names", "pname": "worksapce-dry-names", "description": "Workspace dry-names is a simple gnome extension that enables tags for desktop workspaces. It shows text labels on the left side of the main panel with randomly generated cities names (or an other category of names). Names can also be modified.\n\nhttps://github.com/benmoussatMouad/gnome-workspace-dry-names.git", "link": "https://extensions.gnome.org/extension/4721/worksapce-dry-names/", "shell_version_map": {"38": {"version": "1", "sha256": "0ljprv3ar01p1y24p6j7hc8g7afca7ir0b2zyapjpzndz7mv1zcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBkcnktbmFtZXMgaXMgYSBzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIHRoYXQgZW5hYmxlcyB0YWdzIGZvciBkZXNrdG9wIHdvcmtzcGFjZXMuIEl0IHNob3dzIHRleHQgbGFiZWxzIG9uIHRoZSBsZWZ0IHNpZGUgb2YgdGhlIG1haW4gcGFuZWwgd2l0aCByYW5kb21seSBnZW5lcmF0ZWQgY2l0aWVzIG5hbWVzIChvciBhbiBvdGhlciBjYXRlZ29yeSBvZiBuYW1lcykuIE5hbWVzIGNhbiBhbHNvIGJlIG1vZGlmaWVkLlxuXG5odHRwczovL2dpdGh1Yi5jb20vYmVubW91c3NhdE1vdWFkL2dub21lLXdvcmtzcGFjZS1kcnktbmFtZXMuZ2l0IiwKICAibmFtZSI6ICJXb3Jrc2FwY2UgRHJ5IE5hbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1kcnktbmFtZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtZHJ5LW5hbWVzQGJlbm1vdXNzYXRtb3VhZC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "0ljprv3ar01p1y24p6j7hc8g7afca7ir0b2zyapjpzndz7mv1zcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBkcnktbmFtZXMgaXMgYSBzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIHRoYXQgZW5hYmxlcyB0YWdzIGZvciBkZXNrdG9wIHdvcmtzcGFjZXMuIEl0IHNob3dzIHRleHQgbGFiZWxzIG9uIHRoZSBsZWZ0IHNpZGUgb2YgdGhlIG1haW4gcGFuZWwgd2l0aCByYW5kb21seSBnZW5lcmF0ZWQgY2l0aWVzIG5hbWVzIChvciBhbiBvdGhlciBjYXRlZ29yeSBvZiBuYW1lcykuIE5hbWVzIGNhbiBhbHNvIGJlIG1vZGlmaWVkLlxuXG5odHRwczovL2dpdGh1Yi5jb20vYmVubW91c3NhdE1vdWFkL2dub21lLXdvcmtzcGFjZS1kcnktbmFtZXMuZ2l0IiwKICAibmFtZSI6ICJXb3Jrc2FwY2UgRHJ5IE5hbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1kcnktbmFtZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtZHJ5LW5hbWVzQGJlbm1vdXNzYXRtb3VhZC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "0ljprv3ar01p1y24p6j7hc8g7afca7ir0b2zyapjpzndz7mv1zcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBkcnktbmFtZXMgaXMgYSBzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIHRoYXQgZW5hYmxlcyB0YWdzIGZvciBkZXNrdG9wIHdvcmtzcGFjZXMuIEl0IHNob3dzIHRleHQgbGFiZWxzIG9uIHRoZSBsZWZ0IHNpZGUgb2YgdGhlIG1haW4gcGFuZWwgd2l0aCByYW5kb21seSBnZW5lcmF0ZWQgY2l0aWVzIG5hbWVzIChvciBhbiBvdGhlciBjYXRlZ29yeSBvZiBuYW1lcykuIE5hbWVzIGNhbiBhbHNvIGJlIG1vZGlmaWVkLlxuXG5odHRwczovL2dpdGh1Yi5jb20vYmVubW91c3NhdE1vdWFkL2dub21lLXdvcmtzcGFjZS1kcnktbmFtZXMuZ2l0IiwKICAibmFtZSI6ICJXb3Jrc2FwY2UgRHJ5IE5hbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1kcnktbmFtZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtZHJ5LW5hbWVzQGJlbm1vdXNzYXRtb3VhZC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "window-calls@domandoman.xyz", "name": "Window Calls", "pname": "window-calls", "description": "Add new dbus call for windows to get windows list and some of theirs properties", "link": "https://extensions.gnome.org/extension/4724/window-calls/", "shell_version_map": {"41": {"version": "2", "sha256": "02z265maw4a0rkw5y4an2j7spjqif44nxf47q5qr6cwnvmfpw6ci", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMiLAogICJuYW1lIjogIldpbmRvdyBDYWxscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2t5aWNreS93aW5kb3ctY2FsbHMiLAogICJ1dWlkIjogIndpbmRvdy1jYWxsc0Bkb21hbmRvbWFuLnh5eiIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "primary_input_on_lockscreen@sagidayan.com", "name": "Primary Input on LockScreen", "pname": "primary-input-on-lockscreen", "description": "Automatically change input layout to primary on lock screen", "link": "https://extensions.gnome.org/extension/4727/primary-input-on-lockscreen/", "shell_version_map": {"40": {"version": "2", "sha256": "0m1hk3hhr5y4i7fk3x2pc9ln6rjlq7y9fvcv3imygs3w5q1bx1ll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NhZ2lkYXlhbi9wcmltYXJ5LWlucHV0LW9uLWxvY2tzY3JlZW4iLAogICJ1dWlkIjogInByaW1hcnlfaW5wdXRfb25fbG9ja3NjcmVlbkBzYWdpZGF5YW4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0m1hk3hhr5y4i7fk3x2pc9ln6rjlq7y9fvcv3imygs3w5q1bx1ll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NhZ2lkYXlhbi9wcmltYXJ5LWlucHV0LW9uLWxvY2tzY3JlZW4iLAogICJ1dWlkIjogInByaW1hcnlfaW5wdXRfb25fbG9ja3NjcmVlbkBzYWdpZGF5YW4uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "browser-tabs@com.github.harshadgavali", "name": "Browser tabs", "pname": "browser-tabs", "description": "Search provider for browser tabs\n\nSee following github link for installing browser extension and host app for searches to appear!", "link": "https://extensions.gnome.org/extension/4733/browser-tabs/", "shell_version_map": {"40": {"version": "4", "sha256": "1ag30ai0frxbw3s67ir1i5jdxpzx52b9rp47sqpnjcqw46xc97b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBwcm92aWRlciBmb3IgYnJvd3NlciB0YWJzXG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgYnJvd3NlciBleHRlbnNpb24gYW5kIGhvc3QgYXBwIGZvciBzZWFyY2hlcyB0byBhcHBlYXIhIiwKICAibmFtZSI6ICJCcm93c2VyIHRhYnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL3NlYXJjaHByb3ZpZGVyLWZvci1icm93c2VyLXRhYnMuZ2l0LyIsCiAgInV1aWQiOiAiYnJvd3Nlci10YWJzQGNvbS5naXRodWIuaGFyc2hhZGdhdmFsaSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1ag30ai0frxbw3s67ir1i5jdxpzx52b9rp47sqpnjcqw46xc97b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBwcm92aWRlciBmb3IgYnJvd3NlciB0YWJzXG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgYnJvd3NlciBleHRlbnNpb24gYW5kIGhvc3QgYXBwIGZvciBzZWFyY2hlcyB0byBhcHBlYXIhIiwKICAibmFtZSI6ICJCcm93c2VyIHRhYnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL3NlYXJjaHByb3ZpZGVyLWZvci1icm93c2VyLXRhYnMuZ2l0LyIsCiAgInV1aWQiOiAiYnJvd3Nlci10YWJzQGNvbS5naXRodWIuaGFyc2hhZGdhdmFsaSIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "smart-auto-move@khimaros.com", "name": "Smart Auto Move", "pname": "smart-auto-move", "description": "Smart Auto Move learns the size and position of your application windows and restores them to the correct place on subsequent launches. Supports Wayland.", "link": "https://extensions.gnome.org/extension/4736/smart-auto-move/", "shell_version_map": {"41": {"version": "10", "sha256": "04jp82c5ib4dvg1pl3191n5m182x85gyb7pbqmpga4jr608iiczx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLiIsCiAgIm5hbWUiOiAiU21hcnQgQXV0byBNb3ZlIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImtoaW1hcm9zIiwKICAic2V0dGluZ3MtcGF0aCI6ICIvb3JnL2dub21lL3NoZWxsL2V4dGVuc2lvbnMvc21hcnQtYXV0by1tb3ZlLyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zbWFydC1hdXRvLW1vdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2hpbWFyb3Mvc21hcnQtYXV0by1tb3ZlIiwKICAidXVpZCI6ICJzbWFydC1hdXRvLW1vdmVAa2hpbWFyb3MuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} -, {"uuid": "hplip-menu2@grizzlysmit.smit.id.au", "name": "Alternate Menu for Hplip2", "pname": "alternate-menu-for-hplip2", "description": "control your hp printers by calling the device manager hp-toolbox, also some useful links\nMotivation: the hp-systray doesn't work reliably under gnome shell\nyou need to have installed hplip in order to use this\nChoice of using a printer icon or a hp_logo.png if it's installed in the same place as mine on Ubuntu\nyou could use symbolic links to fake the path.\nThis is a replacement for the old \"Alternate Menu for Hplip\" which doesn't work under the new Gome-Shell I have cleaned it up a bit and it has a few new menu's but it is still basically the same thing.\n Added even more menus all most all system settings ones.\n\nNote: the menu will be too big if your resolution is way too low like 800x600 I have no soln for this just now.", "link": "https://extensions.gnome.org/extension/4739/alternate-menu-for-hplip2/", "shell_version_map": {"40": {"version": "3", "sha256": "034dh32qhq2gzkbhfsyrsp4nh642nhp2y9lrvnnk8391185s229q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy4iLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "034dh32qhq2gzkbhfsyrsp4nh642nhp2y9lrvnnk8391185s229q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy4iLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dyaXp6bHlzbWl0L2hwbGlwLW1lbnUyLWdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ1dWlkIjogImhwbGlwLW1lbnUyQGdyaXp6bHlzbWl0LnNtaXQuaWQuYXUiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "dash-from-panel@fthx", "name": "Dash from Panel", "pname": "dash-from-panel", "description": "Top dock for GNOME 40+. Hover top panel and GNOME Shell dash appears without overview.\n\n Does use native GNOME Shell Dash. Very light extension.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4741/dash-from-panel/", "shell_version_map": {"40": {"version": "1", "sha256": "1ba7pk05f3s4z32pargrfcsg7b84jx8g0avl71q6xzj1syinlsb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "1ba7pk05f3s4z32pargrfcsg7b84jx8g0avl71q6xzj1syinlsb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "clip-translator@eexpss.gmail.com", "name": "Clip Translator", "pname": "clip-translator", "description": "Translate from Clipboard content", "link": "https://extensions.gnome.org/extension/4744/clip-translator/", "shell_version_map": {"40": {"version": "10", "sha256": "1w42d11ald1kpmv43c6v7qxvx55yv3i64nnkicfgwy6a3bdah1pr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBmcm9tIENsaXBib2FyZCBjb250ZW50IiwKICAibmFtZSI6ICJDbGlwIFRyYW5zbGF0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1jbGlwLXRyYW5zbGF0b3IiLAogICJ1dWlkIjogImNsaXAtdHJhbnNsYXRvckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1w42d11ald1kpmv43c6v7qxvx55yv3i64nnkicfgwy6a3bdah1pr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBmcm9tIENsaXBib2FyZCBjb250ZW50IiwKICAibmFtZSI6ICJDbGlwIFRyYW5zbGF0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1jbGlwLXRyYW5zbGF0b3IiLAogICJ1dWlkIjogImNsaXAtdHJhbnNsYXRvckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} -, {"uuid": "hidedate@hidedate.com", "name": "Hide Date", "pname": "hide-date", "description": "hides date and clocks", "link": "https://extensions.gnome.org/extension/4747/hide-date/", "shell_version_map": {"38": {"version": "2", "sha256": "0mgchdll76ml8zzznznlrpm2wb6frw9ff44ql0zhhc9mqy1fwgiy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaGlkZWRhdGVAaGlkZWRhdGUuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "0mgchdll76ml8zzznznlrpm2wb6frw9ff44ql0zhhc9mqy1fwgiy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaGlkZWRhdGVAaGlkZWRhdGUuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0mgchdll76ml8zzznznlrpm2wb6frw9ff44ql0zhhc9mqy1fwgiy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiaGlkZWRhdGVAaGlkZWRhdGUuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "browser-tabs@com.github.harshadgavali", "name": "Browser tabs", "pname": "browser-tabs", "description": "Search provider for browser tabs\n\nSee following github link for installing browser extension and host app for searches to appear!", "link": "https://extensions.gnome.org/extension/4733/browser-tabs/", "shell_version_map": {"40": {"version": "4", "sha256": "1ag30ai0frxbw3s67ir1i5jdxpzx52b9rp47sqpnjcqw46xc97b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBwcm92aWRlciBmb3IgYnJvd3NlciB0YWJzXG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgYnJvd3NlciBleHRlbnNpb24gYW5kIGhvc3QgYXBwIGZvciBzZWFyY2hlcyB0byBhcHBlYXIhIiwKICAibmFtZSI6ICJCcm93c2VyIHRhYnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL3NlYXJjaHByb3ZpZGVyLWZvci1icm93c2VyLXRhYnMuZ2l0LyIsCiAgInV1aWQiOiAiYnJvd3Nlci10YWJzQGNvbS5naXRodWIuaGFyc2hhZGdhdmFsaSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1ag30ai0frxbw3s67ir1i5jdxpzx52b9rp47sqpnjcqw46xc97b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBwcm92aWRlciBmb3IgYnJvd3NlciB0YWJzXG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgYnJvd3NlciBleHRlbnNpb24gYW5kIGhvc3QgYXBwIGZvciBzZWFyY2hlcyB0byBhcHBlYXIhIiwKICAibmFtZSI6ICJCcm93c2VyIHRhYnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL3NlYXJjaHByb3ZpZGVyLWZvci1icm93c2VyLXRhYnMuZ2l0LyIsCiAgInV1aWQiOiAiYnJvd3Nlci10YWJzQGNvbS5naXRodWIuaGFyc2hhZGdhdmFsaSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1ag30ai0frxbw3s67ir1i5jdxpzx52b9rp47sqpnjcqw46xc97b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBwcm92aWRlciBmb3IgYnJvd3NlciB0YWJzXG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgYnJvd3NlciBleHRlbnNpb24gYW5kIGhvc3QgYXBwIGZvciBzZWFyY2hlcyB0byBhcHBlYXIhIiwKICAibmFtZSI6ICJCcm93c2VyIHRhYnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJzaGFkZ2F2YWxpL3NlYXJjaHByb3ZpZGVyLWZvci1icm93c2VyLXRhYnMuZ2l0LyIsCiAgInV1aWQiOiAiYnJvd3Nlci10YWJzQGNvbS5naXRodWIuaGFyc2hhZGdhdmFsaSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "smart-auto-move@khimaros.com", "name": "Smart Auto Move", "pname": "smart-auto-move", "description": "Smart Auto Move learns the size and position of your application windows and restores them to the correct place on subsequent launches. Supports Wayland.\n\nNOTE: Optimized for use with static workspaces. For more control, can be set to default IGNORE and then selectively RESTORE only desired apps.", "link": "https://extensions.gnome.org/extension/4736/smart-auto-move/", "shell_version_map": {"41": {"version": "15", "sha256": "1i5czxzkhd3h19q4din4psj6swl8s7fjlb93blz0zvj6y6mx948g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9raGltYXJvcy9zbWFydC1hdXRvLW1vdmUiLAogICJ1dWlkIjogInNtYXJ0LWF1dG8tbW92ZUBraGltYXJvcy5jb20iLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} +, {"uuid": "hplip-menu2@grizzlysmit.smit.id.au", "name": "Alternate Menu for Hplip2", "pname": "alternate-menu-for-hplip2", "description": "control your hp printers by calling the device manager hp-toolbox, also some useful links\nMotivation: the hp-systray doesn't work reliably under gnome shell\nyou need to have installed hplip in order to use this\nChoice of using a printer icon or a hp_logo.png if it's installed in the same place as mine on Ubuntu\nyou could use symbolic links to fake the path.\nThis is a replacement for the old \"Alternate Menu for Hplip\" which doesn't work under the new Gome-Shell I have cleaned it up a bit and it has a few new menu's but it is still basically the same thing.\n Added even more menus all most all system settings ones.\n\nNote: the menu will be too big if your resolution is way too low like 800x600 I have no soln for this just now.", "link": "https://extensions.gnome.org/extension/4739/alternate-menu-for-hplip2/", "shell_version_map": {"40": {"version": "4", "sha256": "1l1b0ybii5ilvk1x4jdr70wbvl3k4jw53yxapmkj2naskq1gasb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy4iLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1l1b0ybii5ilvk1x4jdr70wbvl3k4jw53yxapmkj2naskq1gasb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy4iLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "1l1b0ybii5ilvk1x4jdr70wbvl3k4jw53yxapmkj2naskq1gasb3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy4iLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "dash-from-panel@fthx", "name": "Dash from Panel", "pname": "dash-from-panel", "description": "Top dock for GNOME 40+. Hover top panel and GNOME Shell dash appears without overview.\n\n Does use native GNOME Shell Dash. Very light extension.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4741/dash-from-panel/", "shell_version_map": {"40": {"version": "1", "sha256": "1ba7pk05f3s4z32pargrfcsg7b84jx8g0avl71q6xzj1syinlsb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "1ba7pk05f3s4z32pargrfcsg7b84jx8g0avl71q6xzj1syinlsb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}, "42": {"version": "1", "sha256": "1ba7pk05f3s4z32pargrfcsg7b84jx8g0avl71q6xzj1syinlsb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "clip-translator@eexpss.gmail.com", "name": "Clip Translator", "pname": "clip-translator", "description": "* Translate from Clipboard content", "link": "https://extensions.gnome.org/extension/4744/clip-translator/", "shell_version_map": {"40": {"version": "13", "sha256": "08jfqm96vz8xf52z60d5dhpgb1s9lc6fx8ii1gjwfmzq14k8ycha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogVHJhbnNsYXRlIGZyb20gQ2xpcGJvYXJkIGNvbnRlbnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLXRyYW5zbGF0b3IiLAogICJuYW1lIjogIkNsaXAgVHJhbnNsYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtdHJhbnNsYXRvciIsCiAgInV1aWQiOiAiY2xpcC10cmFuc2xhdG9yQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "08jfqm96vz8xf52z60d5dhpgb1s9lc6fx8ii1gjwfmzq14k8ycha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogVHJhbnNsYXRlIGZyb20gQ2xpcGJvYXJkIGNvbnRlbnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLXRyYW5zbGF0b3IiLAogICJuYW1lIjogIkNsaXAgVHJhbnNsYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtdHJhbnNsYXRvciIsCiAgInV1aWQiOiAiY2xpcC10cmFuc2xhdG9yQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "08jfqm96vz8xf52z60d5dhpgb1s9lc6fx8ii1gjwfmzq14k8ycha", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogVHJhbnNsYXRlIGZyb20gQ2xpcGJvYXJkIGNvbnRlbnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLXRyYW5zbGF0b3IiLAogICJuYW1lIjogIkNsaXAgVHJhbnNsYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtdHJhbnNsYXRvciIsCiAgInV1aWQiOiAiY2xpcC10cmFuc2xhdG9yQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} +, {"uuid": "hidedate@hidedate.com", "name": "Hide Date", "pname": "hide-date", "description": "hides date and clocks", "link": "https://extensions.gnome.org/extension/4747/hide-date/", "shell_version_map": {"38": {"version": "3", "sha256": "1k0dbq26lnc2dj6w0jmjv2xyih405k02w9c7m220nspbwhspzpw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXNyYWNhZ2xpeWFuL0dub21lLUV4dGVuc2lvbi1FeGFtcGxlcy90cmVlL21haW4vaGlkZWRhdGUlNDBoaWRlZGF0ZS5jb20iLAogICJ1dWlkIjogImhpZGVkYXRlQGhpZGVkYXRlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "1k0dbq26lnc2dj6w0jmjv2xyih405k02w9c7m220nspbwhspzpw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXNyYWNhZ2xpeWFuL0dub21lLUV4dGVuc2lvbi1FeGFtcGxlcy90cmVlL21haW4vaGlkZWRhdGUlNDBoaWRlZGF0ZS5jb20iLAogICJ1dWlkIjogImhpZGVkYXRlQGhpZGVkYXRlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "1k0dbq26lnc2dj6w0jmjv2xyih405k02w9c7m220nspbwhspzpw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXNyYWNhZ2xpeWFuL0dub21lLUV4dGVuc2lvbi1FeGFtcGxlcy90cmVlL21haW4vaGlkZWRhdGUlNDBoaWRlZGF0ZS5jb20iLAogICJ1dWlkIjogImhpZGVkYXRlQGhpZGVkYXRlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "toggleimwheel@mijorus.it", "name": "Toggle imwheel", "pname": "toggle-imwheel", "description": "This simple extension wants to mitigate the lack of a dedicated mouse wheel control on most of the modern linux distributions. Many are using imwheel as a temporary fix; however, if you are using laptop, you might want to have two different settings for the touchpad and the mouse. \n This extension will add an icon in the top bar which lets you toggle imwheel between two custom settings.\n\n\nhttps://github.com/mijorus/toggle-imwheel", "link": "https://extensions.gnome.org/extension/4748/toggle-imwheel/", "shell_version_map": {"40": {"version": "2", "sha256": "1fjqap51g7gy3jra7r1qq4j61iifx13l5lj8sw2csbvzliacsr62", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2ltcGxlIGV4dGVuc2lvbiB3YW50cyB0byBtaXRpZ2F0ZSB0aGUgbGFjayBvZiBhIGRlZGljYXRlZCBtb3VzZSB3aGVlbCBjb250cm9sIG9uIG1vc3Qgb2YgdGhlIG1vZGVybiBsaW51eCBkaXN0cmlidXRpb25zLiBNYW55IGFyZSB1c2luZyBpbXdoZWVsIGFzIGEgdGVtcG9yYXJ5IGZpeDsgaG93ZXZlciwgaWYgeW91IGFyZSB1c2luZyBsYXB0b3AsIHlvdSBtaWdodCB3YW50IHRvIGhhdmUgdHdvIGRpZmZlcmVudCBzZXR0aW5ncyBmb3IgdGhlIHRvdWNocGFkIGFuZCB0aGUgbW91c2UuIFxuIFRoaXMgZXh0ZW5zaW9uIHdpbGwgYWRkIGFuIGljb24gaW4gdGhlIHRvcCBiYXIgd2hpY2ggbGV0cyB5b3UgdG9nZ2xlIGltd2hlZWwgYmV0d2VlbiB0d28gY3VzdG9tIHNldHRpbmdzLlxuXG5cbmh0dHBzOi8vZ2l0aHViLmNvbS9taWpvcnVzL3RvZ2dsZS1pbXdoZWVsIiwKICAibmFtZSI6ICJUb2dnbGUgaW13aGVlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidG9nZ2xlaW13aGVlbEBtaWpvcnVzLml0IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "yakuake-extension@kde.org", "name": "Yakuake", "pname": "yakuake", "description": "A Gnome shell extension to use Yakuake on Gnome. Adds a global shortcut to show/hide yakuake and makes the console appear focussed.", "link": "https://extensions.gnome.org/extension/4757/yakuake/", "shell_version_map": {"40": {"version": "4", "sha256": "0rdrcbsscchvi8i9f6c9sjgnn4546i33l0q135jvav7c1a6bb9mq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJlcnR2YWthL3lha3Vha2UtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ5YWt1YWtlLWV4dGVuc2lvbkBrZGUub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0rdrcbsscchvi8i9f6c9sjgnn4546i33l0q135jvav7c1a6bb9mq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJlcnR2YWthL3lha3Vha2UtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ5YWt1YWtlLWV4dGVuc2lvbkBrZGUub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "dnf-shotcuts@rx1310", "name": "Shortcuts for DNF", "pname": "shortcuts-for-dnf", "description": "A small extension that adds buttons to the panel to check for DNF updates through the terminal without entering commands.", "link": "https://extensions.gnome.org/extension/4758/shortcuts-for-dnf/", "shell_version_map": {"38": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "speedbackground@luke.vader", "name": "Speed background", "pname": "speed-background", "description": "Increase how often Gnome will check the background.", "link": "https://extensions.gnome.org/extension/4761/speed-background/", "shell_version_map": {"41": {"version": "4", "sha256": "1dkmnkrag8fgyfdda4f9bpvsrkvx8h8xfb6wm83dyra1z8jq82fs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MdWtlVmFkZXItSVYvZ25vbWUtc3BlZWQtYmFja2dyb3VuZC1leHRlbnNpb24vIiwKICAidXVpZCI6ICJzcGVlZGJhY2tncm91bmRAbHVrZS52YWRlciIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "bottom-panel@sulincix", "name": "BottomPanel", "pname": "bottompanel", "description": "move top panel to bottom", "link": "https://extensions.gnome.org/extension/4764/bottompanel/", "shell_version_map": {"38": {"version": "1", "sha256": "07aqkjqz85v8p5nmjlhq304ksfz4vp4yz3sf23mv03zz7j38jqn3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJib3R0b20tcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "07aqkjqz85v8p5nmjlhq304ksfz4vp4yz3sf23mv03zz7j38jqn3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJib3R0b20tcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "07aqkjqz85v8p5nmjlhq304ksfz4vp4yz3sf23mv03zz7j38jqn3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJib3R0b20tcGFuZWxAc3VsaW5jaXgiLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "FuzzyClock@johngoetz", "name": "Fuzzy Clock", "pname": "fuzzy-clock", "description": "A human-readable clock for the gnome-shell panel", "link": "https://extensions.gnome.org/extension/4771/fuzzy-clock/", "shell_version_map": {"40": {"version": "2", "sha256": "039z2mp28hv4iciyik2g52q6xyzkpr76sn3vcn5f8zvv12jg63lp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2pvaG5nb2V0ei9GdXp6eUNsb2NrIiwKICAidXVpZCI6ICJGdXp6eUNsb2NrQGpvaG5nb2V0eiIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "039z2mp28hv4iciyik2g52q6xyzkpr76sn3vcn5f8zvv12jg63lp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2pvaG5nb2V0ei9GdXp6eUNsb2NrIiwKICAidXVpZCI6ICJGdXp6eUNsb2NrQGpvaG5nb2V0eiIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "clip-note@eexpss.gmail.com", "name": "Clip Note", "pname": "clip-note", "description": "Save clip contents to multiple notes with separate tags. Notes locate at ~/.local/share/clip-note/. Dots in filename means splited tags.", "link": "https://extensions.gnome.org/extension/4774/clip-note/", "shell_version_map": {"40": {"version": "1", "sha256": "1r2i0c6rnz7v2dpq09n4v3zvxg7s1ad0mbs1v8pdfksiwjj74kr4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "1r2i0c6rnz7v2dpq09n4v3zvxg7s1ad0mbs1v8pdfksiwjj74kr4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "bottom-panel@sulincix", "name": "Bottom Panel", "pname": "bottompanel", "description": "move top panel to bottom", "link": "https://extensions.gnome.org/extension/4764/bottompanel/", "shell_version_map": {"38": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "FuzzyClock@johngoetz", "name": "Fuzzy Clock", "pname": "fuzzy-clock", "description": "A human-readable (english) clock for the gnome-shell panel", "link": "https://extensions.gnome.org/extension/4771/fuzzy-clock/", "shell_version_map": {"40": {"version": "2", "sha256": "18y8r6f0czadrpamrribqq6rvwa57hpdpffpy864vqp7kq6i6s0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgKGVuZ2xpc2gpIGNsb2NrIGZvciB0aGUgZ25vbWUtc2hlbGwgcGFuZWwiLAogICJuYW1lIjogIkZ1enp5IENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "18y8r6f0czadrpamrribqq6rvwa57hpdpffpy864vqp7kq6i6s0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgKGVuZ2xpc2gpIGNsb2NrIGZvciB0aGUgZ25vbWUtc2hlbGwgcGFuZWwiLAogICJuYW1lIjogIkZ1enp5IENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "clip-note@eexpss.gmail.com", "name": "Clip Note", "pname": "clip-note", "description": "Save clip contents to multiple notes with separate tags. Notes locate at ~/.local/share/clip-note/. Dots in filename means splited tags.", "link": "https://extensions.gnome.org/extension/4774/clip-note/", "shell_version_map": {"40": {"version": "11", "sha256": "0bfpxlvyibcpd7vi1a65r5awggmh8i9yc705mfb6vpm92ry7iny3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLW5vdGUiLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0bfpxlvyibcpd7vi1a65r5awggmh8i9yc705mfb6vpm92ry7iny3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLW5vdGUiLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0bfpxlvyibcpd7vi1a65r5awggmh8i9yc705mfb6vpm92ry7iny3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLW5vdGUiLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} +, {"uuid": "ssh-tray@mario.cardia.com.br", "name": "SSH Tray", "pname": "ssh-tray", "description": "Simple SSH extension to allow you to connect to your hosts at ~/.ssh/config and ~/ssh/know_hosts file from Gnome top bar.", "link": "https://extensions.gnome.org/extension/4779/ssh-tray/", "shell_version_map": {"41": {"version": "1", "sha256": "1c7ndcv3bnsc95sijdkq39fshybpaq9fqdk3gvwm1lx40r1ibgih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBTU0ggZXh0ZW5zaW9uIHRvIGFsbG93IHlvdSB0byBjb25uZWN0IHRvIHlvdXIgaG9zdHMgYXQgfi8uc3NoL2NvbmZpZyBhbmQgfi9zc2gva25vd19ob3N0cyBmaWxlIGZyb20gR25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIlNTSCBUcmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzc2gtdHJheUBtYXJpby5jYXJkaWEuY29tLmJyIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} +, {"uuid": "glasa@lyrahgames.github.io", "name": "Glasa", "pname": "glasa", "description": "This extension puts an icon in the panel consisting of two comic-like eyes following the cursor.", "link": "https://extensions.gnome.org/extension/4780/glasa/", "shell_version_map": {"38": {"version": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "avatar@pawel.swiszcz.com", "name": "Avatar", "pname": "avatar", "description": "Adds an avatar to the panel. Controllability: shades, buttons (turn notifications on/off, sleep, off), visibility of username and hostname", "link": "https://extensions.gnome.org/extension/4782/avatar/", "shell_version_map": {"41": {"version": "9", "sha256": "0xhn3yl7h3n1jdnk8r8srfwpx6xcjxpp7m65cqi36kzs3h1zq6yn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gYXZhdGFyIHRvIHRoZSBwYW5lbC4gQ29udHJvbGxhYmlsaXR5OiBzaGFkZXMsIGJ1dHRvbnMgKHR1cm4gbm90aWZpY2F0aW9ucyBvbi9vZmYsIHNsZWVwLCBvZmYpLCB2aXNpYmlsaXR5IG9mIHVzZXJuYW1lIGFuZCBob3N0bmFtZSIsCiAgIm5hbWUiOiAiQXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Bhd2Vsc3dpc3pjei9BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhdmF0YXJAcGF3ZWwuc3dpc3pjei5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} +, {"uuid": "default-workspace@mateusrodcosta.com", "name": "Default Workspace", "pname": "default-workspace", "description": "Switches to the specified workspace on login.\nUseful for fixed number of workspace setups where the first workspace isn't the main one.", "link": "https://extensions.gnome.org/extension/4783/default-workspace/", "shell_version_map": {"40": {"version": "2", "sha256": "05s1bzh917vv3j7xfx2gljwfzxkb9lsvp8zgcgch75hfvywvpgb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "05s1bzh917vv3j7xfx2gljwfzxkb9lsvp8zgcgch75hfvywvpgb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "alt-mouse@eexpss.gmail.com", "name": "Alt Mouse", "pname": "alt-mouse", "description": "* Alt + Mouse control window, Detailed instructions are on the home page and an alt-mouse-diagram.png in extension directory. Disable desktop BackgroundMenu, Disable Panel dragMode, Add a gap at right screen edge. Add Top-Left and Top-Right corner as hot coner.", "link": "https://extensions.gnome.org/extension/4786/alt-mouse/", "shell_version_map": {"40": {"version": "10", "sha256": "1rm3z9n34w2hivg8mggfvj5l9frwk39kc92nkis2a208wq57p21k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQWx0ICsgTW91c2UgY29udHJvbCB3aW5kb3csIERldGFpbGVkIGluc3RydWN0aW9ucyBhcmUgb24gdGhlIGhvbWUgcGFnZSBhbmQgYW4gYWx0LW1vdXNlLWRpYWdyYW0ucG5nIGluIGV4dGVuc2lvbiBkaXJlY3RvcnkuIERpc2FibGUgZGVza3RvcCBCYWNrZ3JvdW5kTWVudSwgRGlzYWJsZSBQYW5lbCBkcmFnTW9kZSwgQWRkIGEgZ2FwIGF0IHJpZ2h0IHNjcmVlbiBlZGdlLiBBZGQgVG9wLUxlZnQgYW5kIFRvcC1SaWdodCBjb3JuZXIgYXMgaG90IGNvbmVyLiIsCiAgIm5hbWUiOiAiQWx0IE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtYWx0LW1vdXNlIiwKICAidXVpZCI6ICJhbHQtbW91c2VAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1rm3z9n34w2hivg8mggfvj5l9frwk39kc92nkis2a208wq57p21k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQWx0ICsgTW91c2UgY29udHJvbCB3aW5kb3csIERldGFpbGVkIGluc3RydWN0aW9ucyBhcmUgb24gdGhlIGhvbWUgcGFnZSBhbmQgYW4gYWx0LW1vdXNlLWRpYWdyYW0ucG5nIGluIGV4dGVuc2lvbiBkaXJlY3RvcnkuIERpc2FibGUgZGVza3RvcCBCYWNrZ3JvdW5kTWVudSwgRGlzYWJsZSBQYW5lbCBkcmFnTW9kZSwgQWRkIGEgZ2FwIGF0IHJpZ2h0IHNjcmVlbiBlZGdlLiBBZGQgVG9wLUxlZnQgYW5kIFRvcC1SaWdodCBjb3JuZXIgYXMgaG90IGNvbmVyLiIsCiAgIm5hbWUiOiAiQWx0IE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtYWx0LW1vdXNlIiwKICAidXVpZCI6ICJhbHQtbW91c2VAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "1rm3z9n34w2hivg8mggfvj5l9frwk39kc92nkis2a208wq57p21k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQWx0ICsgTW91c2UgY29udHJvbCB3aW5kb3csIERldGFpbGVkIGluc3RydWN0aW9ucyBhcmUgb24gdGhlIGhvbWUgcGFnZSBhbmQgYW4gYWx0LW1vdXNlLWRpYWdyYW0ucG5nIGluIGV4dGVuc2lvbiBkaXJlY3RvcnkuIERpc2FibGUgZGVza3RvcCBCYWNrZ3JvdW5kTWVudSwgRGlzYWJsZSBQYW5lbCBkcmFnTW9kZSwgQWRkIGEgZ2FwIGF0IHJpZ2h0IHNjcmVlbiBlZGdlLiBBZGQgVG9wLUxlZnQgYW5kIFRvcC1SaWdodCBjb3JuZXIgYXMgaG90IGNvbmVyLiIsCiAgIm5hbWUiOiAiQWx0IE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtYWx0LW1vdXNlIiwKICAidXVpZCI6ICJhbHQtbW91c2VAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} +, {"uuid": "workspace-switcher-manager@G-dH.github.com", "name": "Workspace Switcher Manager", "pname": "workspace-switcher-manager", "description": "Make the workspace switcher popup useful! Customize your workspace switcher behavior and content, dimensions, position, orientation and colors of its popup indicator.\n\n- all GNOME workspace related options at one place\n- adds ws switcher Wraparoud and Ignore Last (empty) Workspace options\n- allows to disable or customize switcher popup\n- allows adding content to the workspace switcher popup - Workspace Name, Current Application Name, Workspace Index\n- ws switcher popup appearance customization includes position on screen, timings, size, colors , orientation", "link": "https://extensions.gnome.org/extension/4788/workspace-switcher-manager/", "shell_version_map": {"38": {"version": "2", "sha256": "1zxsi1pclxm01y0mj2hs5xa6j401k9fl85d4z592667gshnr9y0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgY29udGVudCwgZGltZW5zaW9ucywgcG9zaXRpb24sIG9yaWVudGF0aW9uIGFuZCBjb2xvcnMgb2YgaXRzIHBvcHVwIGluZGljYXRvci5cblxuLSBhbGwgR05PTUUgd29ya3NwYWNlIHJlbGF0ZWQgb3B0aW9ucyBhdCBvbmUgcGxhY2Vcbi0gYWRkcyB3cyBzd2l0Y2hlciBXcmFwYXJvdWQgYW5kIElnbm9yZSBMYXN0IChlbXB0eSkgV29ya3NwYWNlIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdzIHN3aXRjaGVyIHBvcHVwIGFwcGVhcmFuY2UgY3VzdG9taXphdGlvbiBpbmNsdWRlcyBwb3NpdGlvbiBvbiBzY3JlZW4sIHRpbWluZ3MsIHNpemUsIGNvbG9ycyAsIG9yaWVudGF0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2hlciBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "1zxsi1pclxm01y0mj2hs5xa6j401k9fl85d4z592667gshnr9y0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgY29udGVudCwgZGltZW5zaW9ucywgcG9zaXRpb24sIG9yaWVudGF0aW9uIGFuZCBjb2xvcnMgb2YgaXRzIHBvcHVwIGluZGljYXRvci5cblxuLSBhbGwgR05PTUUgd29ya3NwYWNlIHJlbGF0ZWQgb3B0aW9ucyBhdCBvbmUgcGxhY2Vcbi0gYWRkcyB3cyBzd2l0Y2hlciBXcmFwYXJvdWQgYW5kIElnbm9yZSBMYXN0IChlbXB0eSkgV29ya3NwYWNlIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdzIHN3aXRjaGVyIHBvcHVwIGFwcGVhcmFuY2UgY3VzdG9taXphdGlvbiBpbmNsdWRlcyBwb3NpdGlvbiBvbiBzY3JlZW4sIHRpbWluZ3MsIHNpemUsIGNvbG9ycyAsIG9yaWVudGF0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2hlciBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1zxsi1pclxm01y0mj2hs5xa6j401k9fl85d4z592667gshnr9y0f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgY29udGVudCwgZGltZW5zaW9ucywgcG9zaXRpb24sIG9yaWVudGF0aW9uIGFuZCBjb2xvcnMgb2YgaXRzIHBvcHVwIGluZGljYXRvci5cblxuLSBhbGwgR05PTUUgd29ya3NwYWNlIHJlbGF0ZWQgb3B0aW9ucyBhdCBvbmUgcGxhY2Vcbi0gYWRkcyB3cyBzd2l0Y2hlciBXcmFwYXJvdWQgYW5kIElnbm9yZSBMYXN0IChlbXB0eSkgV29ya3NwYWNlIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdzIHN3aXRjaGVyIHBvcHVwIGFwcGVhcmFuY2UgY3VzdG9taXphdGlvbiBpbmNsdWRlcyBwb3NpdGlvbiBvbiBzY3JlZW4sIHRpbWluZ3MsIHNpemUsIGNvbG9ycyAsIG9yaWVudGF0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAid29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJuYW1lIjogIldvcmtzcGFjZSBTd2l0Y2hlciBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "compare@eexpss.gmail.com", "name": "Compare or Open", "pname": "compare-filedir-from-clip", "description": "Copy/Select two Dirs/Files from anywhere such as `nautilus` or `gnome-terminal`, and then compare them (use `meld`) or open with Ctrl-O or open with context-menu.", "link": "https://extensions.gnome.org/extension/4789/compare-filedir-from-clip/", "shell_version_map": {"40": {"version": "13", "sha256": "04ps81aqn3vinlqwcp5pacj77cmbrhaz6wsby0c7v9yc1cjcazvz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "04ps81aqn3vinlqwcp5pacj77cmbrhaz6wsby0c7v9yc1cjcazvz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "04ps81aqn3vinlqwcp5pacj77cmbrhaz6wsby0c7v9yc1cjcazvz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} +, {"uuid": "freq-boost-switch@metal03326", "name": "Frequency Boost Switch", "pname": "frequency-boost-switch", "description": "Add a toggle to enable/disable CPU frequency boost in Gnome Power Profiles menu.\n\nMain features:\n\n- Toggle Frequency Boost from the same place you set power profile\n- Toggle Frequency Boost regardless of the set power profile\n- Lightweight (no service is installed) 1 3\n- Option to set on boot (Persist) 2 3\n- Translation (currently only English and Bulgarian)\n\n1 Asks for permission every time user flips the switch\n2 Will prompt user for permission 5s after login, if boost needs to be changed\n3 Permission prompt can be removed by adding Polkit rules. Check extension preferences.\n\nRequirements:\n\n- GNOME >= 41 (power profiles menu doesn't exist before that)\n- power-profiles-daemon (power profiles menu doesn't show if not installed and enabled)\n- pkexec (needed to ask the user for permissions)\n\nAll tests are done on Fedora.\n\nIf you have any issues, please first check FAQ (https://gitlab.com/metal03326/gnome-frequency-boost-switch#faq) and if that doesn't help, open an issue (https://gitlab.com/metal03326/gnome-frequency-boost-switch/-/issues)", "link": "https://extensions.gnome.org/extension/4792/frequency-boost-switch/", "shell_version_map": {"41": {"version": "3", "sha256": "0cw3npc3ypp0cpzy0k2iim748dc7d4abkfmkd9cs6h27g9wgmfk6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuXG5cbk1haW4gZmVhdHVyZXM6XG5cbi0gVG9nZ2xlIEZyZXF1ZW5jeSBCb29zdCBmcm9tIHRoZSBzYW1lIHBsYWNlIHlvdSBzZXQgcG93ZXIgcHJvZmlsZVxuLSBUb2dnbGUgRnJlcXVlbmN5IEJvb3N0IHJlZ2FyZGxlc3Mgb2YgdGhlIHNldCBwb3dlciBwcm9maWxlXG4tIExpZ2h0d2VpZ2h0IChubyBzZXJ2aWNlIGlzIGluc3RhbGxlZCkgMSAzXG4tIE9wdGlvbiB0byBzZXQgb24gYm9vdCAoUGVyc2lzdCkgMiAzXG4tIFRyYW5zbGF0aW9uIChjdXJyZW50bHkgb25seSBFbmdsaXNoIGFuZCBCdWxnYXJpYW4pXG5cbjEgQXNrcyBmb3IgcGVybWlzc2lvbiBldmVyeSB0aW1lIHVzZXIgZmxpcHMgdGhlIHN3aXRjaFxuMiBXaWxsIHByb21wdCB1c2VyIGZvciBwZXJtaXNzaW9uIDVzIGFmdGVyIGxvZ2luLCBpZiBib29zdCBuZWVkcyB0byBiZSBjaGFuZ2VkXG4zIFBlcm1pc3Npb24gcHJvbXB0IGNhbiBiZSByZW1vdmVkIGJ5IGFkZGluZyBQb2xraXQgcnVsZXMuIENoZWNrIGV4dGVuc2lvbiBwcmVmZXJlbmNlcy5cblxuUmVxdWlyZW1lbnRzOlxuXG4tIEdOT01FID49IDQxIChwb3dlciBwcm9maWxlcyBtZW51IGRvZXNuJ3QgZXhpc3QgYmVmb3JlIHRoYXQpXG4tIHBvd2VyLXByb2ZpbGVzLWRhZW1vbiAocG93ZXIgcHJvZmlsZXMgbWVudSBkb2Vzbid0IHNob3cgaWYgbm90IGluc3RhbGxlZCBhbmQgZW5hYmxlZClcbi0gcGtleGVjIChuZWVkZWQgdG8gYXNrIHRoZSB1c2VyIGZvciBwZXJtaXNzaW9ucylcblxuQWxsIHRlc3RzIGFyZSBkb25lIG9uIEZlZG9yYS5cblxuSWYgeW91IGhhdmUgYW55IGlzc3VlcywgcGxlYXNlIGZpcnN0IGNoZWNrIEZBUSAoaHR0cHM6Ly9naXRsYWIuY29tL21ldGFsMDMzMjYvZ25vbWUtZnJlcXVlbmN5LWJvb3N0LXN3aXRjaCNmYXEpIGFuZCBpZiB0aGF0IGRvZXNuJ3QgaGVscCwgb3BlbiBhbiBpc3N1ZSAoaHR0cHM6Ly9naXRsYWIuY29tL21ldGFsMDMzMjYvZ25vbWUtZnJlcXVlbmN5LWJvb3N0LXN3aXRjaC8tL2lzc3VlcykiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJmcmVxLWJvb3N0LXN3aXRjaEBtZXRhbDAzMzI2IiwKICAibmFtZSI6ICJGcmVxdWVuY3kgQm9vc3QgU3dpdGNoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZyZXEtYm9vc3Qtc3dpdGNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21ldGFsMDMzMjYvZ25vbWUtZnJlcXVlbmN5LWJvb3N0LXN3aXRjaCIsCiAgInV1aWQiOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "pop-launcher-super-key@ManeLippert", "name": "Pop Launcher Super-Key", "pname": "pop-launcher-super-key", "description": "Fork of Pop COSMIC: Binds Pop Launcher on Super-Key when Pop COSMIC Extension is disabled", "link": "https://extensions.gnome.org/extension/4797/pop-launcher-super-key/", "shell_version_map": {"38": {"version": "3", "sha256": "04bln8wkn0s6di03qqxa7bzclb2p8w5ic4mbmh31ar041plzj778", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "04bln8wkn0s6di03qqxa7bzclb2p8w5ic4mbmh31ar041plzj778", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "04bln8wkn0s6di03qqxa7bzclb2p8w5ic4mbmh31ar041plzj778", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYW5lTGlwcGVydC9wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAidXVpZCI6ICJwb3AtbGF1bmNoZXItc3VwZXIta2V5QE1hbmVMaXBwZXJ0IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "thinkpad-battery-threshold@marcosdalvarez.org", "name": "Thinkpad Battery Threshold", "pname": "thinkpad-battery-threshold", "description": "Enable/Disable battery threshold on Lenovo Thinkpad laptops (If available)\n\nTo check if the function is available, see if the files 'charge_control_start_threshold' and 'charge_control_end_threshold' (valid alternatives: 'charge_start_threshold' and 'charge_stop_threshold') exist in the /sys/class/power_supply/BAT0 directory, also you must have permissions to read and write (in case you do not have write permissions, the root password will be requested to modify the values).\n\nv6: Added option to control second battery (dock) thresholds. Try this! I don't have a dock!!!", "link": "https://extensions.gnome.org/extension/4798/thinkpad-battery-threshold/", "shell_version_map": {"41": {"version": "6", "sha256": "146jpic7zyap68z2q6qw81n6lpgcx5sy55i06j1qiazv0x3rv9zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzIChJZiBhdmFpbGFibGUpXG5cblRvIGNoZWNrIGlmIHRoZSBmdW5jdGlvbiBpcyBhdmFpbGFibGUsIHNlZSBpZiB0aGUgZmlsZXMgJ2NoYXJnZV9jb250cm9sX3N0YXJ0X3RocmVzaG9sZCcgYW5kICdjaGFyZ2VfY29udHJvbF9lbmRfdGhyZXNob2xkJyAodmFsaWQgYWx0ZXJuYXRpdmVzOiAnY2hhcmdlX3N0YXJ0X3RocmVzaG9sZCcgYW5kICdjaGFyZ2Vfc3RvcF90aHJlc2hvbGQnKSBleGlzdCBpbiB0aGUgL3N5cy9jbGFzcy9wb3dlcl9zdXBwbHkvQkFUMCBkaXJlY3RvcnksIGFsc28geW91IG11c3QgaGF2ZSBwZXJtaXNzaW9ucyB0byByZWFkIGFuZCB3cml0ZSAoaW4gY2FzZSB5b3UgZG8gbm90IGhhdmUgd3JpdGUgcGVybWlzc2lvbnMsIHRoZSByb290IHBhc3N3b3JkIHdpbGwgYmUgcmVxdWVzdGVkIHRvIG1vZGlmeSB0aGUgdmFsdWVzKS5cblxudjY6IEFkZGVkIG9wdGlvbiB0byBjb250cm9sIHNlY29uZCBiYXR0ZXJ5IChkb2NrKSB0aHJlc2hvbGRzLiBUcnkgdGhpcyEgSSBkb24ndCBoYXZlIGEgZG9jayEhISIsCiAgImdldHRleHQtZG9tYWluIjogInRoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgIm5hbWUiOiAiVGhpbmtwYWQgQmF0dGVyeSBUaHJlc2hvbGQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWFyY29zZGFsdmFyZXovdGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZEBtYXJjb3NkYWx2YXJlei5vcmciLAogICJ2ZXJzaW9uIjogNgp9"}}} +, {"uuid": "lock-screen-message@advendradeswanta.gitlab.com", "name": "Lock Screen Message", "pname": "lock-screen-message", "description": "Simple extension that let's you add your message to the lock screen (unlockDialog)", "link": "https://extensions.gnome.org/extension/4801/lock-screen-message/", "shell_version_map": {"40": {"version": "2", "sha256": "12q3z5wdbbg9sa570ig5sw6qk70ykhy5zsx7ygvi2zgla52v0hq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubG9jay1zY3JlZW4tbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQWR2ZW5kcmFEZXN3YW50YS9sb2NrLXNjcmVlbi1tZXNzYWdlIiwKICAidXVpZCI6ICJsb2NrLXNjcmVlbi1tZXNzYWdlQGFkdmVuZHJhZGVzd2FudGEuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "12q3z5wdbbg9sa570ig5sw6qk70ykhy5zsx7ygvi2zgla52v0hq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubG9jay1zY3JlZW4tbWVzc2FnZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQWR2ZW5kcmFEZXN3YW50YS9sb2NrLXNjcmVlbi1tZXNzYWdlIiwKICAidXVpZCI6ICJsb2NrLXNjcmVlbi1tZXNzYWdlQGFkdmVuZHJhZGVzd2FudGEuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "panel-corners@aunetx", "name": "Panel corners", "pname": "panel-corners", "description": "A GNOME shell extension to keep the old topbar corners, which were removed for GNOME 42. It also allows you to customize the rounded corners, even if you use GNOME 40 or 41.\n\nIt is widely based on already existing gnome-shell code, and on a merge request by Alexander Mikhaylenko: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1328", "link": "https://extensions.gnome.org/extension/4805/panel-corners/", "shell_version_map": {"40": {"version": "3", "sha256": "0piacfxwa5ca5cnvrz0s8pqykfixynmvvdmh1rznfsh407v1kw1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0piacfxwa5ca5cnvrz0s8pqykfixynmvvdmh1rznfsh407v1kw1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "4", "sha256": "13mc18sds1z0ij1x8plx5d4b4mk4zkwx3hngh3z2ib7db8la7wdw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L3BhbmVsLWNvcm5lcnMiLAogICJ1dWlkIjogInBhbmVsLWNvcm5lcnNAYXVuZXR4IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "WhatWatch@Zappo-II.github.io", "name": "What Watch", "pname": "what-watch", "description": "Shows a customizeable analog desktop clock.\nPlease visit the GitHub repository for documentation and to report any issues.", "link": "https://extensions.gnome.org/extension/4806/what-watch/", "shell_version_map": {"38": {"version": "4", "sha256": "1cd9cci0nhpif104x7lc3i5xiqlsnlr0xg764gj0p3hrn0bf9icj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWmFwcG8tSUkvV2hhdFdhdGNoIiwKICAidXVpZCI6ICJXaGF0V2F0Y2hAWmFwcG8tSUkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "1cd9cci0nhpif104x7lc3i5xiqlsnlr0xg764gj0p3hrn0bf9icj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWmFwcG8tSUkvV2hhdFdhdGNoIiwKICAidXVpZCI6ICJXaGF0V2F0Y2hAWmFwcG8tSUkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1cd9cci0nhpif104x7lc3i5xiqlsnlr0xg764gj0p3hrn0bf9icj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWmFwcG8tSUkvV2hhdFdhdGNoIiwKICAidXVpZCI6ICJXaGF0V2F0Y2hAWmFwcG8tSUkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "cairo@eexpss.gmail.com", "name": "Cairo Clock", "pname": "cairo-clock", "description": "Cairo Clock. \n Click the clock face to set the alarm, click the center circle to enable the alarm.\n Alt + click on main icon, background of icon become green, this enable Popup per hour function. \n Ctrl + click on main icon, can test the alarm effect.\n In case of alarm, the clock will swing dynamically.", "link": "https://extensions.gnome.org/extension/4809/cairo-clock/", "shell_version_map": {"40": {"version": "16", "sha256": "0m0b30frbs4667vavr6y5sy7zfg5fsa38qa2140ij8wqcznz9m7b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrLiBcbiBDbGljayB0aGUgY2xvY2sgZmFjZSB0byBzZXQgdGhlIGFsYXJtLCBjbGljayB0aGUgY2VudGVyIGNpcmNsZSB0byBlbmFibGUgdGhlIGFsYXJtLlxuIEFsdCArIGNsaWNrIG9uIG1haW4gaWNvbiwgYmFja2dyb3VuZCBvZiBpY29uIGJlY29tZSBncmVlbiwgdGhpcyBlbmFibGUgUG9wdXAgcGVyIGhvdXIgZnVuY3Rpb24uIFxuIEN0cmwgKyBjbGljayBvbiBtYWluIGljb24sIGNhbiB0ZXN0IHRoZSBhbGFybSBlZmZlY3QuXG4gSW4gY2FzZSBvZiBhbGFybSwgdGhlIGNsb2NrIHdpbGwgc3dpbmcgZHluYW1pY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2Fpcm8tY2xvY2siLAogICJuYW1lIjogIkNhaXJvIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY2Fpcm8iLAogICJ1dWlkIjogImNhaXJvQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "0m0b30frbs4667vavr6y5sy7zfg5fsa38qa2140ij8wqcznz9m7b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrLiBcbiBDbGljayB0aGUgY2xvY2sgZmFjZSB0byBzZXQgdGhlIGFsYXJtLCBjbGljayB0aGUgY2VudGVyIGNpcmNsZSB0byBlbmFibGUgdGhlIGFsYXJtLlxuIEFsdCArIGNsaWNrIG9uIG1haW4gaWNvbiwgYmFja2dyb3VuZCBvZiBpY29uIGJlY29tZSBncmVlbiwgdGhpcyBlbmFibGUgUG9wdXAgcGVyIGhvdXIgZnVuY3Rpb24uIFxuIEN0cmwgKyBjbGljayBvbiBtYWluIGljb24sIGNhbiB0ZXN0IHRoZSBhbGFybSBlZmZlY3QuXG4gSW4gY2FzZSBvZiBhbGFybSwgdGhlIGNsb2NrIHdpbGwgc3dpbmcgZHluYW1pY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2Fpcm8tY2xvY2siLAogICJuYW1lIjogIkNhaXJvIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY2Fpcm8iLAogICJ1dWlkIjogImNhaXJvQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "42": {"version": "16", "sha256": "0m0b30frbs4667vavr6y5sy7zfg5fsa38qa2140ij8wqcznz9m7b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrLiBcbiBDbGljayB0aGUgY2xvY2sgZmFjZSB0byBzZXQgdGhlIGFsYXJtLCBjbGljayB0aGUgY2VudGVyIGNpcmNsZSB0byBlbmFibGUgdGhlIGFsYXJtLlxuIEFsdCArIGNsaWNrIG9uIG1haW4gaWNvbiwgYmFja2dyb3VuZCBvZiBpY29uIGJlY29tZSBncmVlbiwgdGhpcyBlbmFibGUgUG9wdXAgcGVyIGhvdXIgZnVuY3Rpb24uIFxuIEN0cmwgKyBjbGljayBvbiBtYWluIGljb24sIGNhbiB0ZXN0IHRoZSBhbGFybSBlZmZlY3QuXG4gSW4gY2FzZSBvZiBhbGFybSwgdGhlIGNsb2NrIHdpbGwgc3dpbmcgZHluYW1pY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2Fpcm8tY2xvY2siLAogICJuYW1lIjogIkNhaXJvIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY2Fpcm8iLAogICJ1dWlkIjogImNhaXJvQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} +, {"uuid": "WallpaperSwitcher@Rishu", "name": "Wallpaper Switcher", "pname": "wallpaper-switcher", "description": "Takes in the path of the folder containing wallpapers. Changes the wallpaper after given time interval. Option to switch them randomly or sequentially.", "link": "https://extensions.gnome.org/extension/4812/wallpaper-switcher/", "shell_version_map": {"38": {"version": "2", "sha256": "12biy68q57ayqxqbr8x0m4nnibrn94kb6y2rk7ly38y0qy31096a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2VzIGluIHRoZSBwYXRoIG9mIHRoZSBmb2xkZXIgY29udGFpbmluZyB3YWxscGFwZXJzLiBDaGFuZ2VzIHRoZSB3YWxscGFwZXIgYWZ0ZXIgZ2l2ZW4gdGltZSBpbnRlcnZhbC4gT3B0aW9uIHRvIHN3aXRjaCB0aGVtIHJhbmRvbWx5IG9yIHNlcXVlbnRpYWxseS4iLAogICJuYW1lIjogIldhbGxwYXBlciBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "12biy68q57ayqxqbr8x0m4nnibrn94kb6y2rk7ly38y0qy31096a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2VzIGluIHRoZSBwYXRoIG9mIHRoZSBmb2xkZXIgY29udGFpbmluZyB3YWxscGFwZXJzLiBDaGFuZ2VzIHRoZSB3YWxscGFwZXIgYWZ0ZXIgZ2l2ZW4gdGltZSBpbnRlcnZhbC4gT3B0aW9uIHRvIHN3aXRjaCB0aGVtIHJhbmRvbWx5IG9yIHNlcXVlbnRpYWxseS4iLAogICJuYW1lIjogIldhbGxwYXBlciBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "12biy68q57ayqxqbr8x0m4nnibrn94kb6y2rk7ly38y0qy31096a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2VzIGluIHRoZSBwYXRoIG9mIHRoZSBmb2xkZXIgY29udGFpbmluZyB3YWxscGFwZXJzLiBDaGFuZ2VzIHRoZSB3YWxscGFwZXIgYWZ0ZXIgZ2l2ZW4gdGltZSBpbnRlcnZhbC4gT3B0aW9uIHRvIHN3aXRjaCB0aGVtIHJhbmRvbWx5IG9yIHNlcXVlbnRpYWxseS4iLAogICJuYW1lIjogIldhbGxwYXBlciBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "areustatus@carissimi.eu", "name": "AREU Status", "pname": "areu-status", "description": "Displays the number of ambulances that are in a mission in Lombardy, Italy", "link": "https://extensions.gnome.org/extension/4814/areu-status/", "shell_version_map": {"38": {"version": "2", "sha256": "1jycm5xgzp1ph4h9j9m5ki0rn5wabh6gwblc1bc3fn6bx1zplymy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBudW1iZXIgb2YgYW1idWxhbmNlcyB0aGF0IGFyZSBpbiBhIG1pc3Npb24gaW4gTG9tYmFyZHksIEl0YWx5IiwKICAibmFtZSI6ICJBUkVVIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vci1jYXJpc3NpbWkvYXJldS1zdGF0dXMtZ25vbWUiLAogICJ1dWlkIjogImFyZXVzdGF0dXNAY2FyaXNzaW1pLmV1IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "1jycm5xgzp1ph4h9j9m5ki0rn5wabh6gwblc1bc3fn6bx1zplymy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBudW1iZXIgb2YgYW1idWxhbmNlcyB0aGF0IGFyZSBpbiBhIG1pc3Npb24gaW4gTG9tYmFyZHksIEl0YWx5IiwKICAibmFtZSI6ICJBUkVVIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vci1jYXJpc3NpbWkvYXJldS1zdGF0dXMtZ25vbWUiLAogICJ1dWlkIjogImFyZXVzdGF0dXNAY2FyaXNzaW1pLmV1IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1jycm5xgzp1ph4h9j9m5ki0rn5wabh6gwblc1bc3fn6bx1zplymy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBudW1iZXIgb2YgYW1idWxhbmNlcyB0aGF0IGFyZSBpbiBhIG1pc3Npb24gaW4gTG9tYmFyZHksIEl0YWx5IiwKICAibmFtZSI6ICJBUkVVIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vci1jYXJpc3NpbWkvYXJldS1zdGF0dXMtZ25vbWUiLAogICJ1dWlkIjogImFyZXVzdGF0dXNAY2FyaXNzaW1pLmV1IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "colorful-battery-indicator@aneruam", "name": "Colorful Battery Indicator", "pname": "colorful-battery-indicator", "description": "Make the color of the battery indicator change with the level of battery charge.", "link": "https://extensions.gnome.org/extension/4817/colorful-battery-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "0ypm2scrfffk6pl9plk7h8p7bnw0n29a1xyf9r4xdgb32j2fvs3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIGNvbG9yIG9mIHRoZSBiYXR0ZXJ5IGluZGljYXRvciBjaGFuZ2Ugd2l0aCB0aGUgbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UuIiwKICAibmFtZSI6ICJDb2xvcmZ1bCBCYXR0ZXJ5IEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmVydWEvZ25vbWUtY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNvbG9yZnVsLWJhdHRlcnktaW5kaWNhdG9yQGFuZXJ1YW0iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "0ypm2scrfffk6pl9plk7h8p7bnw0n29a1xyf9r4xdgb32j2fvs3k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIGNvbG9yIG9mIHRoZSBiYXR0ZXJ5IGluZGljYXRvciBjaGFuZ2Ugd2l0aCB0aGUgbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UuIiwKICAibmFtZSI6ICJDb2xvcmZ1bCBCYXR0ZXJ5IEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmVydWEvZ25vbWUtY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNvbG9yZnVsLWJhdHRlcnktaW5kaWNhdG9yQGFuZXJ1YW0iLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"uuid": "inactivity@fedeantuna.github.io", "name": "Inactivity", "pname": "inactivity", "description": "Hide Activities Button on the top panel.", "link": "https://extensions.gnome.org/extension/4818/inactivity/", "shell_version_map": {"41": {"version": "1", "sha256": "1qc16xhgp2wachcxw9ivf8r4nai2k0xj9vph8k0zvc0shwkpjzag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24gb24gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIkluYWN0aXZpdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmVkZWFudHVuYS9pbmFjdGl2aXR5IiwKICAidXVpZCI6ICJpbmFjdGl2aXR5QGZlZGVhbnR1bmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} +, {"uuid": "m3u8-play@eexpss.gmail.com", "name": "M3U8 Play", "pname": "m3u8-play", "description": "* M3U8 Play. Search and select to play (use `ffplay/ffmpeg`). `m3u8` files need put into `~/.local/share/m3u8-play/`", "link": "https://extensions.gnome.org/extension/4824/m3u8-play/", "shell_version_map": {"40": {"version": "7", "sha256": "0vqnmpcd6aqqq5g206288ziqzbdv6vcbg61ki6lvgg6j0in5bc83", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogTTNVOCBQbGF5LiBTZWFyY2ggYW5kIHNlbGVjdCB0byBwbGF5ICh1c2UgYGZmcGxheS9mZm1wZWdgKS4gYG0zdThgIGZpbGVzIG5lZWQgcHV0IGludG8gYH4vLmxvY2FsL3NoYXJlL20zdTgtcGxheS9gIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibTN1OC1wbGF5IiwKICAibmFtZSI6ICJNM1U4IFBsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1tM3U4LXBsYXkvIiwKICAidXVpZCI6ICJtM3U4LXBsYXlAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "0vqnmpcd6aqqq5g206288ziqzbdv6vcbg61ki6lvgg6j0in5bc83", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogTTNVOCBQbGF5LiBTZWFyY2ggYW5kIHNlbGVjdCB0byBwbGF5ICh1c2UgYGZmcGxheS9mZm1wZWdgKS4gYG0zdThgIGZpbGVzIG5lZWQgcHV0IGludG8gYH4vLmxvY2FsL3NoYXJlL20zdTgtcGxheS9gIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibTN1OC1wbGF5IiwKICAibmFtZSI6ICJNM1U4IFBsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1tM3U4LXBsYXkvIiwKICAidXVpZCI6ICJtM3U4LXBsYXlAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "0vqnmpcd6aqqq5g206288ziqzbdv6vcbg61ki6lvgg6j0in5bc83", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogTTNVOCBQbGF5LiBTZWFyY2ggYW5kIHNlbGVjdCB0byBwbGF5ICh1c2UgYGZmcGxheS9mZm1wZWdgKS4gYG0zdThgIGZpbGVzIG5lZWQgcHV0IGludG8gYH4vLmxvY2FsL3NoYXJlL20zdTgtcGxheS9gIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibTN1OC1wbGF5IiwKICAibmFtZSI6ICJNM1U4IFBsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9nbm9tZS1zaGVsbC1tM3U4LXBsYXkvIiwKICAidXVpZCI6ICJtM3U4LXBsYXlAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} +, {"uuid": "gnome-edge-gap@necropolina", "name": "Edge Gap", "pname": "edge-gap", "description": "add configurable-width gaps around the edge of your screen", "link": "https://extensions.gnome.org/extension/4827/edge-gap/", "shell_version_map": {"40": {"version": "3", "sha256": "12shbvqdj6834lvw23s9z4f3ayhvma363yvzga0m85x0fzs6bna5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZCBjb25maWd1cmFibGUtd2lkdGggZ2FwcyBhcm91bmQgdGhlIGVkZ2Ugb2YgeW91ciBzY3JlZW4iLAogICJuYW1lIjogIkVkZ2UgR2FwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLWVkZ2UtZ2FwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVjcm9wb2xpbmEvZ25vbWUtZWRnZS1nYXAiLAogICJ1dWlkIjogImdub21lLWVkZ2UtZ2FwQG5lY3JvcG9saW5hIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "12shbvqdj6834lvw23s9z4f3ayhvma363yvzga0m85x0fzs6bna5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZCBjb25maWd1cmFibGUtd2lkdGggZ2FwcyBhcm91bmQgdGhlIGVkZ2Ugb2YgeW91ciBzY3JlZW4iLAogICJuYW1lIjogIkVkZ2UgR2FwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLWVkZ2UtZ2FwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVjcm9wb2xpbmEvZ25vbWUtZWRnZS1nYXAiLAogICJ1dWlkIjogImdub21lLWVkZ2UtZ2FwQG5lY3JvcG9saW5hIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "12shbvqdj6834lvw23s9z4f3ayhvma363yvzga0m85x0fzs6bna5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZCBjb25maWd1cmFibGUtd2lkdGggZ2FwcyBhcm91bmQgdGhlIGVkZ2Ugb2YgeW91ciBzY3JlZW4iLAogICJuYW1lIjogIkVkZ2UgR2FwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLWVkZ2UtZ2FwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVjcm9wb2xpbmEvZ25vbWUtZWRnZS1nYXAiLAogICJ1dWlkIjogImdub21lLWVkZ2UtZ2FwQG5lY3JvcG9saW5hIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "overview-keyboard-navigation@G-dH.github.com", "name": "Overview Keyboard Navigation Fix", "pname": "overview-keyboard-navigation-fix", "description": "Fix for GNOME Shell 40 and 41 that initiates keyboard navigation in the Activities overview and App Grid by pressing Tab or Arrow keys. It also changes Esc key behavior in the App Grid view - Esc closes the Overview instead of activating Windows Overview.", "link": "https://extensions.gnome.org/extension/4830/overview-keyboard-navigation-fix/", "shell_version_map": {"40": {"version": "2", "sha256": "12l9j8rcs61j1l375nm7dxbhhs3qw4y5i0hsdxcpq9jn7880y4f3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBmb3IgR05PTUUgU2hlbGwgNDAgYW5kIDQxIHRoYXQgaW5pdGlhdGVzIGtleWJvYXJkIG5hdmlnYXRpb24gaW4gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXcgYW5kIEFwcCBHcmlkIGJ5IHByZXNzaW5nIFRhYiBvciBBcnJvdyBrZXlzLiBJdCBhbHNvIGNoYW5nZXMgRXNjIGtleSBiZWhhdmlvciBpbiB0aGUgQXBwIEdyaWQgdmlldyAtIEVzYyBjbG9zZXMgdGhlIE92ZXJ2aWV3IGluc3RlYWQgb2YgYWN0aXZhdGluZyBXaW5kb3dzIE92ZXJ2aWV3LiIsCiAgImdldHRleHQtZG9tYWluIjogIm92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb24tZml4IiwKICAibmFtZSI6ICJPdmVydmlldyBLZXlib2FyZCBOYXZpZ2F0aW9uIEZpeCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb24iLAogICJ1dWlkIjogIm92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb25ARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "12l9j8rcs61j1l375nm7dxbhhs3qw4y5i0hsdxcpq9jn7880y4f3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBmb3IgR05PTUUgU2hlbGwgNDAgYW5kIDQxIHRoYXQgaW5pdGlhdGVzIGtleWJvYXJkIG5hdmlnYXRpb24gaW4gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXcgYW5kIEFwcCBHcmlkIGJ5IHByZXNzaW5nIFRhYiBvciBBcnJvdyBrZXlzLiBJdCBhbHNvIGNoYW5nZXMgRXNjIGtleSBiZWhhdmlvciBpbiB0aGUgQXBwIEdyaWQgdmlldyAtIEVzYyBjbG9zZXMgdGhlIE92ZXJ2aWV3IGluc3RlYWQgb2YgYWN0aXZhdGluZyBXaW5kb3dzIE92ZXJ2aWV3LiIsCiAgImdldHRleHQtZG9tYWluIjogIm92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb24tZml4IiwKICAibmFtZSI6ICJPdmVydmlldyBLZXlib2FyZCBOYXZpZ2F0aW9uIEZpeCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb24iLAogICJ1dWlkIjogIm92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb25ARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "12l9j8rcs61j1l375nm7dxbhhs3qw4y5i0hsdxcpq9jn7880y4f3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBmb3IgR05PTUUgU2hlbGwgNDAgYW5kIDQxIHRoYXQgaW5pdGlhdGVzIGtleWJvYXJkIG5hdmlnYXRpb24gaW4gdGhlIEFjdGl2aXRpZXMgb3ZlcnZpZXcgYW5kIEFwcCBHcmlkIGJ5IHByZXNzaW5nIFRhYiBvciBBcnJvdyBrZXlzLiBJdCBhbHNvIGNoYW5nZXMgRXNjIGtleSBiZWhhdmlvciBpbiB0aGUgQXBwIEdyaWQgdmlldyAtIEVzYyBjbG9zZXMgdGhlIE92ZXJ2aWV3IGluc3RlYWQgb2YgYWN0aXZhdGluZyBXaW5kb3dzIE92ZXJ2aWV3LiIsCiAgImdldHRleHQtZG9tYWluIjogIm92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb24tZml4IiwKICAibmFtZSI6ICJPdmVydmlldyBLZXlib2FyZCBOYXZpZ2F0aW9uIEZpeCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb24iLAogICJ1dWlkIjogIm92ZXJ2aWV3LWtleWJvYXJkLW5hdmlnYXRpb25ARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "all-windows-srwp@jkavery.github.io", "name": "All Windows + Save/Restore Window Positions", "pname": "all-windows-saverestore-window-positions", "description": "List open windows of all workspaces, plus Save/Restore window positions (run automatically on Suspend/Resume, a workaround for Ubuntu bug #1778983).", "link": "https://extensions.gnome.org/extension/4833/all-windows-saverestore-window-positions/", "shell_version_map": {"40": {"version": "1", "sha256": "1ppgrvmf7lxzqig02p80bh3laxx8bhq6harza82qm8djj62g6kkk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3Qgb3BlbiB3aW5kb3dzIG9mIGFsbCB3b3Jrc3BhY2VzLCBwbHVzIFNhdmUvUmVzdG9yZSB3aW5kb3cgcG9zaXRpb25zIChydW4gYXV0b21hdGljYWxseSBvbiBTdXNwZW5kL1Jlc3VtZSwgYSB3b3JrYXJvdW5kIGZvciBVYnVudHUgYnVnICMxNzc4OTgzKS4iLAogICJuYW1lIjogIkFsbCBXaW5kb3dzICsgU2F2ZS9SZXN0b3JlIFdpbmRvdyBQb3NpdGlvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamthdmVyeS9hbGwtd2luZG93cyIsCiAgInV1aWQiOiAiYWxsLXdpbmRvd3Mtc3J3cEBqa2F2ZXJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "clipboard-history@alexsaveau.dev", "name": "Clipboard History", "pname": "clipboard-history", "description": "Gnome Clipboard History is a Gnome extension that saves items you've copied into an easily accessible, searchable history panel.", "link": "https://extensions.gnome.org/extension/4839/clipboard-history/", "shell_version_map": {"40": {"version": "10", "sha256": "1cg1l3l9ixyszzckhahyy1zhzyzhzzjajdgm9vsyjwlzdp5ljk2h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIENsaXBib2FyZCBIaXN0b3J5IGlzIGEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2F2ZXMgaXRlbXMgeW91J3ZlIGNvcGllZCBpbnRvIGFuIGVhc2lseSBhY2Nlc3NpYmxlLCBzZWFyY2hhYmxlIGhpc3RvcnkgcGFuZWwuIiwKICAibmFtZSI6ICJDbGlwYm9hcmQgSGlzdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NVUEVSQ0lMRVgvZ25vbWUtY2xpcGJvYXJkLWhpc3RvcnkiLAogICJ1dWlkIjogImNsaXBib2FyZC1oaXN0b3J5QGFsZXhzYXZlYXUuZGV2IiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1cg1l3l9ixyszzckhahyy1zhzyzhzzjajdgm9vsyjwlzdp5ljk2h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIENsaXBib2FyZCBIaXN0b3J5IGlzIGEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2F2ZXMgaXRlbXMgeW91J3ZlIGNvcGllZCBpbnRvIGFuIGVhc2lseSBhY2Nlc3NpYmxlLCBzZWFyY2hhYmxlIGhpc3RvcnkgcGFuZWwuIiwKICAibmFtZSI6ICJDbGlwYm9hcmQgSGlzdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NVUEVSQ0lMRVgvZ25vbWUtY2xpcGJvYXJkLWhpc3RvcnkiLAogICJ1dWlkIjogImNsaXBib2FyZC1oaXN0b3J5QGFsZXhzYXZlYXUuZGV2IiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "1cg1l3l9ixyszzckhahyy1zhzyzhzzjajdgm9vsyjwlzdp5ljk2h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIENsaXBib2FyZCBIaXN0b3J5IGlzIGEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2F2ZXMgaXRlbXMgeW91J3ZlIGNvcGllZCBpbnRvIGFuIGVhc2lseSBhY2Nlc3NpYmxlLCBzZWFyY2hhYmxlIGhpc3RvcnkgcGFuZWwuIiwKICAibmFtZSI6ICJDbGlwYm9hcmQgSGlzdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NVUEVSQ0lMRVgvZ25vbWUtY2xpcGJvYXJkLWhpc3RvcnkiLAogICJ1dWlkIjogImNsaXBib2FyZC1oaXN0b3J5QGFsZXhzYXZlYXUuZGV2IiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"uuid": "strongdm@andybrown668.github.com", "name": "StrongDM", "pname": "strongdm", "description": "Access StrongDM resources", "link": "https://extensions.gnome.org/extension/4841/strongdm/", "shell_version_map": {"40": {"version": "1", "sha256": "0bk75y3i8f82bmv20vnhar37yni6ydlcdixc89npc9iiyj1a5mwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBTdHJvbmdETSByZXNvdXJjZXMiLAogICJuYW1lIjogIlN0cm9uZ0RNIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZHlicm93bjY2OC9zdHJvbmdkbS1nbm9tZS1zaGVsbC1leHRlbnNpb24uZ2l0IiwKICAidXVpZCI6ICJzdHJvbmdkbUBhbmR5YnJvd242NjguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "pop-theme-switcher@dimitris47", "name": "Pop Theme Switcher", "pname": "pop-theme-switcher", "description": "Switch between Pop dark and light themes. It is a fork of adwaita-theme-switcher (https://github.com/fthx/adwaita-theme-switcher).", "link": "https://extensions.gnome.org/extension/4844/pop-theme-switcher/", "shell_version_map": {"38": {"version": "2", "sha256": "0z28xmqdbhvx6cvs4r2rrlyg3r22y5rldlm7dir5hjwyad1qwar2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBiZXR3ZWVuIFBvcCBkYXJrIGFuZCBsaWdodCB0aGVtZXMuIEl0IGlzIGEgZm9yayBvZiBhZHdhaXRhLXRoZW1lLXN3aXRjaGVyIChodHRwczovL2dpdGh1Yi5jb20vZnRoeC9hZHdhaXRhLXRoZW1lLXN3aXRjaGVyKS4iLAogICJuYW1lIjogIlBvcCBUaGVtZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGltaXRyaXM0Ny9wb3AtdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvcC10aGVtZS1zd2l0Y2hlckBkaW1pdHJpczQ3IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "0z28xmqdbhvx6cvs4r2rrlyg3r22y5rldlm7dir5hjwyad1qwar2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBiZXR3ZWVuIFBvcCBkYXJrIGFuZCBsaWdodCB0aGVtZXMuIEl0IGlzIGEgZm9yayBvZiBhZHdhaXRhLXRoZW1lLXN3aXRjaGVyIChodHRwczovL2dpdGh1Yi5jb20vZnRoeC9hZHdhaXRhLXRoZW1lLXN3aXRjaGVyKS4iLAogICJuYW1lIjogIlBvcCBUaGVtZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGltaXRyaXM0Ny9wb3AtdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvcC10aGVtZS1zd2l0Y2hlckBkaW1pdHJpczQ3IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0z28xmqdbhvx6cvs4r2rrlyg3r22y5rldlm7dir5hjwyad1qwar2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCBiZXR3ZWVuIFBvcCBkYXJrIGFuZCBsaWdodCB0aGVtZXMuIEl0IGlzIGEgZm9yayBvZiBhZHdhaXRhLXRoZW1lLXN3aXRjaGVyIChodHRwczovL2dpdGh1Yi5jb20vZnRoeC9hZHdhaXRhLXRoZW1lLXN3aXRjaGVyKS4iLAogICJuYW1lIjogIlBvcCBUaGVtZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGltaXRyaXM0Ny9wb3AtdGhlbWUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvcC10aGVtZS1zd2l0Y2hlckBkaW1pdHJpczQ3IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "dash-to-dock-toggle@kavoyaa.github.com", "name": "Dash to Dock Toggle", "pname": "dash-to-dock-toggle", "description": "Adds a button to top panel to switch Dash to Dock mode between \"always visible\" and \"autohide\".\n\n(Works only with the Dash-to-Dock extension)", "link": "https://extensions.gnome.org/extension/4845/dash-to-dock-toggle/", "shell_version_map": {"40": {"version": "2", "sha256": "0fy9wv78qhipsy5rqdbygi74ycgryvqm98svmpbzhbgg3rb8mdxs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdG9wIHBhbmVsIHRvIHN3aXRjaCBEYXNoIHRvIERvY2sgbW9kZSBiZXR3ZWVuIFwiYWx3YXlzIHZpc2libGVcIiBhbmQgXCJhdXRvaGlkZVwiLlxuXG4oV29ya3Mgb25seSB3aXRoIHRoZSBEYXNoLXRvLURvY2sgZXh0ZW5zaW9uKSIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIFRvZ2dsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrLXRvZ2dsZUBrYXZveWFhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "open@eexpss.gmail.com", "name": "Open Anywhere", "pname": "open-anywhere", "description": "* Copy / Select a full path file / directory name, or incomplete path, or pure file name. Open a context menu to let you choose how to open it, or press Ctrl-Shift-O directlly.", "link": "https://extensions.gnome.org/extension/4848/open-anywhere/", "shell_version_map": {"40": {"version": "4", "sha256": "1bgja2rrggli16k991m88hbr54rj570ryp3if8kqcs75hn2cgf0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQ29weSAvIFNlbGVjdCBhIGZ1bGwgcGF0aCBmaWxlIC8gZGlyZWN0b3J5IG5hbWUsIG9yIGluY29tcGxldGUgcGF0aCwgb3IgcHVyZSBmaWxlIG5hbWUuIE9wZW4gYSBjb250ZXh0IG1lbnUgdG8gbGV0IHlvdSBjaG9vc2UgaG93IHRvIG9wZW4gaXQsIG9yIHByZXNzIEN0cmwtU2hpZnQtTyBkaXJlY3RsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3BlbiIsCiAgIm5hbWUiOiAiT3BlbiBBbnl3aGVyZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtb3BlbiIsCiAgInV1aWQiOiAib3BlbkBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1bgja2rrggli16k991m88hbr54rj570ryp3if8kqcs75hn2cgf0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQ29weSAvIFNlbGVjdCBhIGZ1bGwgcGF0aCBmaWxlIC8gZGlyZWN0b3J5IG5hbWUsIG9yIGluY29tcGxldGUgcGF0aCwgb3IgcHVyZSBmaWxlIG5hbWUuIE9wZW4gYSBjb250ZXh0IG1lbnUgdG8gbGV0IHlvdSBjaG9vc2UgaG93IHRvIG9wZW4gaXQsIG9yIHByZXNzIEN0cmwtU2hpZnQtTyBkaXJlY3RsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3BlbiIsCiAgIm5hbWUiOiAiT3BlbiBBbnl3aGVyZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtb3BlbiIsCiAgInV1aWQiOiAib3BlbkBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "1bgja2rrggli16k991m88hbr54rj570ryp3if8kqcs75hn2cgf0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQ29weSAvIFNlbGVjdCBhIGZ1bGwgcGF0aCBmaWxlIC8gZGlyZWN0b3J5IG5hbWUsIG9yIGluY29tcGxldGUgcGF0aCwgb3IgcHVyZSBmaWxlIG5hbWUuIE9wZW4gYSBjb250ZXh0IG1lbnUgdG8gbGV0IHlvdSBjaG9vc2UgaG93IHRvIG9wZW4gaXQsIG9yIHByZXNzIEN0cmwtU2hpZnQtTyBkaXJlY3RsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3BlbiIsCiAgIm5hbWUiOiAiT3BlbiBBbnl3aGVyZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtb3BlbiIsCiAgInV1aWQiOiAib3BlbkBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "command-menu@arunk140.com", "name": "Command Menu", "pname": "command-menu", "description": "A GNOME Shell Extension to manage shortcuts in Top Bar (Inspired by Shuttle and SSHMenu). Edit the .commands.json file to add your own shortcuts.\n\nSample Config in the README - https://github.com/arunk140/gnome-command-menu/blob/main/README.md", "link": "https://extensions.gnome.org/extension/4850/command-menu/", "shell_version_map": {"40": {"version": "3", "sha256": "0sf063fkwfjnp56406hirsiadmpv79za162k80n82pl6r837qw1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgRXh0ZW5zaW9uIHRvIG1hbmFnZSBzaG9ydGN1dHMgaW4gVG9wIEJhciAoSW5zcGlyZWQgYnkgU2h1dHRsZSBhbmQgU1NITWVudSkuIEVkaXQgdGhlIC5jb21tYW5kcy5qc29uIGZpbGUgdG8gYWRkIHlvdXIgb3duIHNob3J0Y3V0cy5cblxuU2FtcGxlIENvbmZpZyBpbiB0aGUgUkVBRE1FIC0gaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudS9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJDb21tYW5kIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudSIsCiAgInV1aWQiOiAiY29tbWFuZC1tZW51QGFydW5rMTQwLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "0sf063fkwfjnp56406hirsiadmpv79za162k80n82pl6r837qw1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgRXh0ZW5zaW9uIHRvIG1hbmFnZSBzaG9ydGN1dHMgaW4gVG9wIEJhciAoSW5zcGlyZWQgYnkgU2h1dHRsZSBhbmQgU1NITWVudSkuIEVkaXQgdGhlIC5jb21tYW5kcy5qc29uIGZpbGUgdG8gYWRkIHlvdXIgb3duIHNob3J0Y3V0cy5cblxuU2FtcGxlIENvbmZpZyBpbiB0aGUgUkVBRE1FIC0gaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudS9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJDb21tYW5kIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FydW5rMTQwL2dub21lLWNvbW1hbmQtbWVudSIsCiAgInV1aWQiOiAiY29tbWFuZC1tZW51QGFydW5rMTQwLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "s76-scheduler@mattjakeman.com", "name": "System76 Scheduler", "pname": "system76-scheduler", "description": "Integrates with System76 Scheduler to prioritise foreground processes.\nNote: system76-scheduler must be installed separately!\nThis extension is not affiliated with nor supported by System76.", "link": "https://extensions.gnome.org/extension/4854/system76-scheduler/", "shell_version_map": {"40": {"version": "2", "sha256": "0sa3skad3vxbiqq9cy74r6s2nfadxjnjwyl9hnp4p9qwnr5qiwhq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgd2l0aCBTeXN0ZW03NiBTY2hlZHVsZXIgdG8gcHJpb3JpdGlzZSBmb3JlZ3JvdW5kIHByb2Nlc3Nlcy5cbk5vdGU6IHN5c3RlbTc2LXNjaGVkdWxlciBtdXN0IGJlIGluc3RhbGxlZCBzZXBhcmF0ZWx5IVxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQgd2l0aCBub3Igc3VwcG9ydGVkIGJ5IFN5c3RlbTc2LiIsCiAgIm5hbWUiOiAiU3lzdGVtNzYgU2NoZWR1bGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWpha2VtYW4vczc2LXNjaGVkdWxlci1wbHVnaW4vIiwKICAidXVpZCI6ICJzNzYtc2NoZWR1bGVyQG1hdHRqYWtlbWFuLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "0sa3skad3vxbiqq9cy74r6s2nfadxjnjwyl9hnp4p9qwnr5qiwhq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgd2l0aCBTeXN0ZW03NiBTY2hlZHVsZXIgdG8gcHJpb3JpdGlzZSBmb3JlZ3JvdW5kIHByb2Nlc3Nlcy5cbk5vdGU6IHN5c3RlbTc2LXNjaGVkdWxlciBtdXN0IGJlIGluc3RhbGxlZCBzZXBhcmF0ZWx5IVxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQgd2l0aCBub3Igc3VwcG9ydGVkIGJ5IFN5c3RlbTc2LiIsCiAgIm5hbWUiOiAiU3lzdGVtNzYgU2NoZWR1bGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWpha2VtYW4vczc2LXNjaGVkdWxlci1wbHVnaW4vIiwKICAidXVpZCI6ICJzNzYtc2NoZWR1bGVyQG1hdHRqYWtlbWFuLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "0sa3skad3vxbiqq9cy74r6s2nfadxjnjwyl9hnp4p9qwnr5qiwhq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgd2l0aCBTeXN0ZW03NiBTY2hlZHVsZXIgdG8gcHJpb3JpdGlzZSBmb3JlZ3JvdW5kIHByb2Nlc3Nlcy5cbk5vdGU6IHN5c3RlbTc2LXNjaGVkdWxlciBtdXN0IGJlIGluc3RhbGxlZCBzZXBhcmF0ZWx5IVxuVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQgd2l0aCBub3Igc3VwcG9ydGVkIGJ5IFN5c3RlbTc2LiIsCiAgIm5hbWUiOiAiU3lzdGVtNzYgU2NoZWR1bGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWpha2VtYW4vczc2LXNjaGVkdWxlci1wbHVnaW4vIiwKICAidXVpZCI6ICJzNzYtc2NoZWR1bGVyQG1hdHRqYWtlbWFuLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "quarterwindows@troyready.com", "name": "Quarter Windows", "pname": "quarter-windows", "description": "Add additional window management shortcuts.\n\nSee extension homepage for list of shortcuts and commands to customize them.", "link": "https://extensions.gnome.org/extension/4857/quarter-windows/", "shell_version_map": {"41": {"version": "2", "sha256": "00yiqgswcl3psijxi46sb8bxqfxb1a9i93frb90a5292a0x7lmzi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhZGRpdGlvbmFsIHdpbmRvdyBtYW5hZ2VtZW50IHNob3J0Y3V0cy5cblxuU2VlIGV4dGVuc2lvbiBob21lcGFnZSBmb3IgbGlzdCBvZiBzaG9ydGN1dHMgYW5kIGNvbW1hbmRzIHRvIGN1c3RvbWl6ZSB0aGVtLiIsCiAgIm5hbWUiOiAiUXVhcnRlciBXaW5kb3dzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Ryb3lyZWFkeS9xdWFydGVyd2luZG93cyIsCiAgInV1aWQiOiAicXVhcnRlcndpbmRvd3NAdHJveXJlYWR5LmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "batt_consumption_wattmetter@wennaspeedy", "name": "Battery Consumption Watt Meter", "pname": "bat_consumption_wattmeter", "description": "Shows actual charging/discharging consumption (+/-) in Watt next to battery percentage level.\nEnable percentage label when disabled.\nSync reload set to 4 seconds.\nNo consumption info when battery is full.", "link": "https://extensions.gnome.org/extension/4862/bat_consumption_wattmeter/", "shell_version_map": {"40": {"version": "4", "sha256": "0sx8pszlig69wha6xj8ll4l1kwi8avxhi148fq55r0z25yz6pq27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGFjdHVhbCBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRW5hYmxlIHBlcmNlbnRhZ2UgbGFiZWwgd2hlbiBkaXNhYmxlZC5cblN5bmMgcmVsb2FkIHNldCB0byA0IHNlY29uZHMuXG5ObyBjb25zdW1wdGlvbiBpbmZvIHdoZW4gYmF0dGVyeSBpcyBmdWxsLiIsCiAgIm5hbWUiOiAiQmF0dGVyeSBDb25zdW1wdGlvbiBXYXR0IE1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93ZW5uYXNwZWVkeS9iYXR0X2NvbnN1bXB0aW9uX3dhdHRtZXR0ZXIiLAogICJ1dWlkIjogImJhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlckB3ZW5uYXNwZWVkeSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "0sx8pszlig69wha6xj8ll4l1kwi8avxhi148fq55r0z25yz6pq27", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGFjdHVhbCBjaGFyZ2luZy9kaXNjaGFyZ2luZyBjb25zdW1wdGlvbiAoKy8tKSBpbiBXYXR0IG5leHQgdG8gYmF0dGVyeSBwZXJjZW50YWdlIGxldmVsLlxuRW5hYmxlIHBlcmNlbnRhZ2UgbGFiZWwgd2hlbiBkaXNhYmxlZC5cblN5bmMgcmVsb2FkIHNldCB0byA0IHNlY29uZHMuXG5ObyBjb25zdW1wdGlvbiBpbmZvIHdoZW4gYmF0dGVyeSBpcyBmdWxsLiIsCiAgIm5hbWUiOiAiQmF0dGVyeSBDb25zdW1wdGlvbiBXYXR0IE1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93ZW5uYXNwZWVkeS9iYXR0X2NvbnN1bXB0aW9uX3dhdHRtZXR0ZXIiLAogICJ1dWlkIjogImJhdHRfY29uc3VtcHRpb25fd2F0dG1ldHRlckB3ZW5uYXNwZWVkeSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "tl@l.pnx.me", "name": "tl Integration", "pname": "pnx-time-logger", "description": "Integration for github.com/larowlan/tl", "link": "https://extensions.gnome.org/extension/4866/pnx-time-logger/", "shell_version_map": {"41": {"version": "1", "sha256": "06bf9hl0xdxmpyhh0qk2zbfhx8m2gw1fwfym9rv1znh1m9ymjr8h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0aW9uIGZvciBnaXRodWIuY29tL2xhcm93bGFuL3RsIiwKICAibmFtZSI6ICJ0bCBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidGxAbC5wbngubWUiLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "dollar-pkr@shoaibzs.github.com", "name": "Dollar-PKR", "pname": "dollar-pkr", "description": "(USD US Dollar) converted to (PKR Pakistan Rs). Updates are received every 30 seconds and are based on information provided by AwesomeAPI API, which can be consulted directly by accessing the address https://docs.awesomeapi.com.br. (based on michael.mattos's Dollar https://extensions.gnome.org/extension/4573/dollar/)", "link": "https://extensions.gnome.org/extension/4869/dollar-pkr/", "shell_version_map": {"38": {"version": "2", "sha256": "09cb6f7v3j3zfanzblj9x4wj6bpnca3v9yjfh3kjz5zl3lxy8gqs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKFBLUiBQYWtpc3RhbiBScykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMgYW5kIGFyZSBiYXNlZCBvbiBpbmZvcm1hdGlvbiBwcm92aWRlZCBieSBBd2Vzb21lQVBJIEFQSSwgd2hpY2ggY2FuIGJlIGNvbnN1bHRlZCBkaXJlY3RseSBieSBhY2Nlc3NpbmcgdGhlIGFkZHJlc3MgaHR0cHM6Ly9kb2NzLmF3ZXNvbWVhcGkuY29tLmJyLiAoYmFzZWQgb24gbWljaGFlbC5tYXR0b3MncyBEb2xsYXIgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDU3My9kb2xsYXIvKSIsCiAgIm5hbWUiOiAiRG9sbGFyLVBLUiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hvYWlienMvZG9sbGFyLXBrciIsCiAgInV1aWQiOiAiZG9sbGFyLXBrckBzaG9haWJ6cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "09cb6f7v3j3zfanzblj9x4wj6bpnca3v9yjfh3kjz5zl3lxy8gqs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKFBLUiBQYWtpc3RhbiBScykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMgYW5kIGFyZSBiYXNlZCBvbiBpbmZvcm1hdGlvbiBwcm92aWRlZCBieSBBd2Vzb21lQVBJIEFQSSwgd2hpY2ggY2FuIGJlIGNvbnN1bHRlZCBkaXJlY3RseSBieSBhY2Nlc3NpbmcgdGhlIGFkZHJlc3MgaHR0cHM6Ly9kb2NzLmF3ZXNvbWVhcGkuY29tLmJyLiAoYmFzZWQgb24gbWljaGFlbC5tYXR0b3MncyBEb2xsYXIgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDU3My9kb2xsYXIvKSIsCiAgIm5hbWUiOiAiRG9sbGFyLVBLUiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hvYWlienMvZG9sbGFyLXBrciIsCiAgInV1aWQiOiAiZG9sbGFyLXBrckBzaG9haWJ6cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "09cb6f7v3j3zfanzblj9x4wj6bpnca3v9yjfh3kjz5zl3lxy8gqs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKFBLUiBQYWtpc3RhbiBScykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMgYW5kIGFyZSBiYXNlZCBvbiBpbmZvcm1hdGlvbiBwcm92aWRlZCBieSBBd2Vzb21lQVBJIEFQSSwgd2hpY2ggY2FuIGJlIGNvbnN1bHRlZCBkaXJlY3RseSBieSBhY2Nlc3NpbmcgdGhlIGFkZHJlc3MgaHR0cHM6Ly9kb2NzLmF3ZXNvbWVhcGkuY29tLmJyLiAoYmFzZWQgb24gbWljaGFlbC5tYXR0b3MncyBEb2xsYXIgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDU3My9kb2xsYXIvKSIsCiAgIm5hbWUiOiAiRG9sbGFyLVBLUiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2hvYWlienMvZG9sbGFyLXBrciIsCiAgInV1aWQiOiAiZG9sbGFyLXBrckBzaG9haWJ6cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "dozenalclock@mble.dk", "name": "Dozenal Clock", "pname": "dozenal-clock", "description": "Converts the clock to a dozenal one", "link": "https://extensions.gnome.org/extension/4877/dozenal-clock/", "shell_version_map": {"38": {"version": "3", "sha256": "1p7bsv89k3pz16kcjldmdnsilwc3jx1v419nvn5vj7n2xg4zvk0j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnRzIHRoZSBjbG9jayB0byBhIGRvemVuYWwgb25lIiwKICAibmFtZSI6ICJEb3plbmFsIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21ibGVkL2RvemVuYWwtY2xvY2stZ25vbWUiLAogICJ1dWlkIjogImRvemVuYWxjbG9ja0BtYmxlLmRrIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "1p7bsv89k3pz16kcjldmdnsilwc3jx1v419nvn5vj7n2xg4zvk0j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnRzIHRoZSBjbG9jayB0byBhIGRvemVuYWwgb25lIiwKICAibmFtZSI6ICJEb3plbmFsIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21ibGVkL2RvemVuYWwtY2xvY2stZ25vbWUiLAogICJ1dWlkIjogImRvemVuYWxjbG9ja0BtYmxlLmRrIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1p7bsv89k3pz16kcjldmdnsilwc3jx1v419nvn5vj7n2xg4zvk0j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnRzIHRoZSBjbG9jayB0byBhIGRvemVuYWwgb25lIiwKICAibmFtZSI6ICJEb3plbmFsIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4LjEiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21ibGVkL2RvemVuYWwtY2xvY2stZ25vbWUiLAogICJ1dWlkIjogImRvemVuYWxjbG9ja0BtYmxlLmRrIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "wattmeter-forked@clementherve.fr", "name": "wattmeter-forked", "pname": "wattmeter-forked", "description": "A fork of the Wattmeter extension by blackBriar, compatible with gnome 40. Original version: https://extensions.gnome.org/extension/1867/wattmeter/", "link": "https://extensions.gnome.org/extension/4886/wattmeter-forked/", "shell_version_map": {"40": {"version": "3", "sha256": "0hg6faz9j1vvxx8dyjhwx8nc2c0zbwxi9gdg2nhx839kyl3bk9kn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZm9yayBvZiB0aGUgV2F0dG1ldGVyIGV4dGVuc2lvbiBieSBibGFja0JyaWFyLCBjb21wYXRpYmxlIHdpdGggZ25vbWUgNDAuIE9yaWdpbmFsIHZlcnNpb246IGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzE4Njcvd2F0dG1ldGVyLyIsCiAgIm5hbWUiOiAid2F0dG1ldGVyLWZvcmtlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jbGVtZW50aGVydmUvd2F0dG1ldGVyLWZvcmtlZCIsCiAgInV1aWQiOiAid2F0dG1ldGVyLWZvcmtlZEBjbGVtZW50aGVydmUuZnIiLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"uuid": "Hitokoto@teaper.dev", "name": "Hitokoto", "pname": "hitokoto", "description": "一言短句", "link": "https://extensions.gnome.org/extension/4887/hitokoto/", "shell_version_map": {"41": {"version": "1", "sha256": "1dmsrgxnajwifc5wlrqhcddyf10a5m94wycnx5411j538607v83k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlx1NGUwMFx1OGEwMFx1NzdlZFx1NTNlNSIsCiAgIm5hbWUiOiAiSGl0b2tvdG8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxLjEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90ZWFwZXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWhpdG9rb3RvIiwKICAidXVpZCI6ICJIaXRva290b0B0ZWFwZXIuZGV2IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} +, {"uuid": "snap-manager-lite@fthx", "name": "Snap Manager Lite", "pname": "snap-manager-lite", "description": "Popup menu in the top bar to easily manage usual snap tasks (list, changes, refresh, remove, install...).\n\n No update notification at session start-up: use Snap Manager extension for that.\n\n All the results of actions are displayed in GNOME Terminal, so you can exactly know what you are doing and what is processing. Very light extension, no background process, no periodic background task.\n\n You can disable snaps auto updates for a limited time (up to one month, renewable), consequently be notified of snap updates and manually install them.\n\n This is not an official Ubuntu/Canonical extension.", "link": "https://extensions.gnome.org/extension/4889/snap-manager-lite/", "shell_version_map": {"38": {"version": "2", "sha256": "19x72pjbyqnk871680v88c40brq33ap99xv32wk9dknmiaa5bfd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gTm8gdXBkYXRlIG5vdGlmaWNhdGlvbiBhdCBzZXNzaW9uIHN0YXJ0LXVwOiB1c2UgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgdGhhdC5cblxuIEFsbCB0aGUgcmVzdWx0cyBvZiBhY3Rpb25zIGFyZSBkaXNwbGF5ZWQgaW4gR05PTUUgVGVybWluYWwsIHNvIHlvdSBjYW4gZXhhY3RseSBrbm93IHdoYXQgeW91IGFyZSBkb2luZyBhbmQgd2hhdCBpcyBwcm9jZXNzaW5nLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbiwgbm8gYmFja2dyb3VuZCBwcm9jZXNzLCBubyBwZXJpb2RpYyBiYWNrZ3JvdW5kIHRhc2suXG5cbiBZb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIGxpbWl0ZWQgdGltZSAodXAgdG8gb25lIG1vbnRoLCByZW5ld2FibGUpLCBjb25zZXF1ZW50bHkgYmUgbm90aWZpZWQgb2Ygc25hcCB1cGRhdGVzIGFuZCBtYW51YWxseSBpbnN0YWxsIHRoZW0uXG5cbiBUaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "19x72pjbyqnk871680v88c40brq33ap99xv32wk9dknmiaa5bfd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gTm8gdXBkYXRlIG5vdGlmaWNhdGlvbiBhdCBzZXNzaW9uIHN0YXJ0LXVwOiB1c2UgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgdGhhdC5cblxuIEFsbCB0aGUgcmVzdWx0cyBvZiBhY3Rpb25zIGFyZSBkaXNwbGF5ZWQgaW4gR05PTUUgVGVybWluYWwsIHNvIHlvdSBjYW4gZXhhY3RseSBrbm93IHdoYXQgeW91IGFyZSBkb2luZyBhbmQgd2hhdCBpcyBwcm9jZXNzaW5nLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbiwgbm8gYmFja2dyb3VuZCBwcm9jZXNzLCBubyBwZXJpb2RpYyBiYWNrZ3JvdW5kIHRhc2suXG5cbiBZb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIGxpbWl0ZWQgdGltZSAodXAgdG8gb25lIG1vbnRoLCByZW5ld2FibGUpLCBjb25zZXF1ZW50bHkgYmUgbm90aWZpZWQgb2Ygc25hcCB1cGRhdGVzIGFuZCBtYW51YWxseSBpbnN0YWxsIHRoZW0uXG5cbiBUaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "19x72pjbyqnk871680v88c40brq33ap99xv32wk9dknmiaa5bfd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gTm8gdXBkYXRlIG5vdGlmaWNhdGlvbiBhdCBzZXNzaW9uIHN0YXJ0LXVwOiB1c2UgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgdGhhdC5cblxuIEFsbCB0aGUgcmVzdWx0cyBvZiBhY3Rpb25zIGFyZSBkaXNwbGF5ZWQgaW4gR05PTUUgVGVybWluYWwsIHNvIHlvdSBjYW4gZXhhY3RseSBrbm93IHdoYXQgeW91IGFyZSBkb2luZyBhbmQgd2hhdCBpcyBwcm9jZXNzaW5nLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbiwgbm8gYmFja2dyb3VuZCBwcm9jZXNzLCBubyBwZXJpb2RpYyBiYWNrZ3JvdW5kIHRhc2suXG5cbiBZb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIGxpbWl0ZWQgdGltZSAodXAgdG8gb25lIG1vbnRoLCByZW5ld2FibGUpLCBjb25zZXF1ZW50bHkgYmUgbm90aWZpZWQgb2Ygc25hcCB1cGRhdGVzIGFuZCBtYW51YWxseSBpbnN0YWxsIHRoZW0uXG5cbiBUaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "19x72pjbyqnk871680v88c40brq33ap99xv32wk9dknmiaa5bfd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcHVwIG1lbnUgaW4gdGhlIHRvcCBiYXIgdG8gZWFzaWx5IG1hbmFnZSB1c3VhbCBzbmFwIHRhc2tzIChsaXN0LCBjaGFuZ2VzLCByZWZyZXNoLCByZW1vdmUsIGluc3RhbGwuLi4pLlxuXG4gTm8gdXBkYXRlIG5vdGlmaWNhdGlvbiBhdCBzZXNzaW9uIHN0YXJ0LXVwOiB1c2UgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgdGhhdC5cblxuIEFsbCB0aGUgcmVzdWx0cyBvZiBhY3Rpb25zIGFyZSBkaXNwbGF5ZWQgaW4gR05PTUUgVGVybWluYWwsIHNvIHlvdSBjYW4gZXhhY3RseSBrbm93IHdoYXQgeW91IGFyZSBkb2luZyBhbmQgd2hhdCBpcyBwcm9jZXNzaW5nLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbiwgbm8gYmFja2dyb3VuZCBwcm9jZXNzLCBubyBwZXJpb2RpYyBiYWNrZ3JvdW5kIHRhc2suXG5cbiBZb3UgY2FuIGRpc2FibGUgc25hcHMgYXV0byB1cGRhdGVzIGZvciBhIGxpbWl0ZWQgdGltZSAodXAgdG8gb25lIG1vbnRoLCByZW5ld2FibGUpLCBjb25zZXF1ZW50bHkgYmUgbm90aWZpZWQgb2Ygc25hcCB1cGRhdGVzIGFuZCBtYW51YWxseSBpbnN0YWxsIHRoZW0uXG5cbiBUaGlzIGlzIG5vdCBhbiBvZmZpY2lhbCBVYnVudHUvQ2Fub25pY2FsIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlNuYXAgTWFuYWdlciBMaXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9zbmFwLW1hbmFnZXItbGl0ZSIsCiAgInV1aWQiOiAic25hcC1tYW5hZ2VyLWxpdGVAZnRoeCIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "move-panel@lzbz.gitlab.com", "name": "Move Panel", "pname": "move-panel", "description": "Moves panel to secondary monitor on startup, without changing the primary display. Only works on Wayland.", "link": "https://extensions.gnome.org/extension/4890/move-panel/", "shell_version_map": {"41": {"version": "2", "sha256": "1rr585an3ryfyyfcvkj8g2d76vqk6kr1qr8yzbm7z0aava16syzb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHBhbmVsIHRvIHNlY29uZGFyeSBtb25pdG9yIG9uIHN0YXJ0dXAsIHdpdGhvdXQgY2hhbmdpbmcgdGhlIHByaW1hcnkgZGlzcGxheS4gT25seSB3b3JrcyBvbiBXYXlsYW5kLiIsCiAgIm5hbWUiOiAiTW92ZSBQYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9semJ6L21vdmUtcGFuZWwiLAogICJ1dWlkIjogIm1vdmUtcGFuZWxAbHpiei5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "usable-overview@mechtifs", "name": "Usable Overview", "pname": "usable-overview", "description": "Right clicking when activating the top-left hot corner brings up the application grid. It makes way more sense than moving your cursor all the way down the screen then click that stinky icon.", "link": "https://extensions.gnome.org/extension/4895/usable-overview/", "shell_version_map": {"40": {"version": "1", "sha256": "0pkjsgw8f5m2a9wzph5fim6g4ky842qi5ncfxi5nbcdm7y6gj74f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNraW5nIHdoZW4gYWN0aXZhdGluZyB0aGUgdG9wLWxlZnQgaG90IGNvcm5lciBicmluZ3MgdXAgdGhlIGFwcGxpY2F0aW9uIGdyaWQuIEl0IG1ha2VzIHdheSBtb3JlIHNlbnNlIHRoYW4gbW92aW5nIHlvdXIgY3Vyc29yIGFsbCAgdGhlIHdheSBkb3duIHRoZSBzY3JlZW4gdGhlbiBjbGljayB0aGF0IHN0aW5reSBpY29uLiIsCiAgIm5hbWUiOiAiVXNhYmxlIE92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "0pkjsgw8f5m2a9wzph5fim6g4ky842qi5ncfxi5nbcdm7y6gj74f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNraW5nIHdoZW4gYWN0aXZhdGluZyB0aGUgdG9wLWxlZnQgaG90IGNvcm5lciBicmluZ3MgdXAgdGhlIGFwcGxpY2F0aW9uIGdyaWQuIEl0IG1ha2VzIHdheSBtb3JlIHNlbnNlIHRoYW4gbW92aW5nIHlvdXIgY3Vyc29yIGFsbCAgdGhlIHdheSBkb3duIHRoZSBzY3JlZW4gdGhlbiBjbGljayB0aGF0IHN0aW5reSBpY29uLiIsCiAgIm5hbWUiOiAiVXNhYmxlIE92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMQp9"}, "42": {"version": "1", "sha256": "0pkjsgw8f5m2a9wzph5fim6g4ky842qi5ncfxi5nbcdm7y6gj74f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJpZ2h0IGNsaWNraW5nIHdoZW4gYWN0aXZhdGluZyB0aGUgdG9wLWxlZnQgaG90IGNvcm5lciBicmluZ3MgdXAgdGhlIGFwcGxpY2F0aW9uIGdyaWQuIEl0IG1ha2VzIHdheSBtb3JlIHNlbnNlIHRoYW4gbW92aW5nIHlvdXIgY3Vyc29yIGFsbCAgdGhlIHdheSBkb3duIHRoZSBzY3JlZW4gdGhlbiBjbGljayB0aGF0IHN0aW5reSBpY29uLiIsCiAgIm5hbWUiOiAiVXNhYmxlIE92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVjaHRpZnMvdXNhYmxlLW92ZXJ2aWV3IiwKICAidXVpZCI6ICJ1c2FibGUtb3ZlcnZpZXdAbWVjaHRpZnMiLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "overview-clicking@mechtifs", "name": "Overview Clicking", "pname": "overview-clicking", "description": "Close the overview or show up application grid by left/right clicking empty space. Forked from click-to-close-overview@l3nn4rt.github.io.", "link": "https://extensions.gnome.org/extension/4898/overview-clicking/", "shell_version_map": {"40": {"version": "1", "sha256": "10f08rn9m66ynrs5jsgxg4qzrimcjdslgs36s8fgcblr5r31kw8i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBvciBzaG93IHVwIGFwcGxpY2F0aW9uIGdyaWQgYnkgbGVmdC9yaWdodCBjbGlja2luZyBlbXB0eSBzcGFjZS4gRm9ya2VkIGZyb20gY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8uIiwKICAibmFtZSI6ICJPdmVydmlldyBDbGlja2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lY2h0aWZzL292ZXJ2aWV3LWNsaWNraW5nIiwKICAidXVpZCI6ICJvdmVydmlldy1jbGlja2luZ0BtZWNodGlmcyIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "10f08rn9m66ynrs5jsgxg4qzrimcjdslgs36s8fgcblr5r31kw8i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBvciBzaG93IHVwIGFwcGxpY2F0aW9uIGdyaWQgYnkgbGVmdC9yaWdodCBjbGlja2luZyBlbXB0eSBzcGFjZS4gRm9ya2VkIGZyb20gY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8uIiwKICAibmFtZSI6ICJPdmVydmlldyBDbGlja2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lY2h0aWZzL292ZXJ2aWV3LWNsaWNraW5nIiwKICAidXVpZCI6ICJvdmVydmlldy1jbGlja2luZ0BtZWNodGlmcyIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "10f08rn9m66ynrs5jsgxg4qzrimcjdslgs36s8fgcblr5r31kw8i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBvciBzaG93IHVwIGFwcGxpY2F0aW9uIGdyaWQgYnkgbGVmdC9yaWdodCBjbGlja2luZyBlbXB0eSBzcGFjZS4gRm9ya2VkIGZyb20gY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8uIiwKICAibmFtZSI6ICJPdmVydmlldyBDbGlja2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lY2h0aWZzL292ZXJ2aWV3LWNsaWNraW5nIiwKICAidXVpZCI6ICJvdmVydmlldy1jbGlja2luZ0BtZWNodGlmcyIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "speed@eexpss.gmail.com", "name": "Screen Net Speed", "pname": "screen-net-speed", "description": "* Animation net speed show on the screen. You can click it to have fun and pass the time. Can be turned on / off at any time.", "link": "https://extensions.gnome.org/extension/4901/screen-net-speed/", "shell_version_map": {"40": {"version": "2", "sha256": "0ypq91cdl5jjf8l59w6yrp8068w69ykd3y366b5vnq8h75ikrd3y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQW5pbWF0aW9uIG5ldCBzcGVlZCBzaG93IG9uIHRoZSBzY3JlZW4uIFlvdSBjYW4gY2xpY2sgaXQgdG8gaGF2ZSBmdW4gYW5kIHBhc3MgdGhlIHRpbWUuIENhbiBiZSB0dXJuZWQgb24gLyBvZmYgYXQgYW55IHRpbWUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2NyZWVuLW5ldC1zcGVlZCIsCiAgIm5hbWUiOiAiU2NyZWVuIE5ldCBTcGVlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3BlZWRAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "addshutbutton@jerom@olika.ovh", "name": "Add Shutdown Button", "pname": "add-shutdown-button", "description": "Add a button power off", "link": "https://extensions.gnome.org/extension/4905/add-shutdown-button/", "shell_version_map": {"40": {"version": "2", "sha256": "1yq7cakknjq7inzg1bq6z4isivj25vkml89vmv4913fparvsx7n2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJ1dHRvbiBwb3dlciBvZmYiLAogICJuYW1lIjogIkFkZCBTaHV0ZG93biBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFkZHNodXRidXR0b25AamVyb21Ab2xpa2Eub3ZoIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "eepresetselector@ulville.github.io", "name": "EasyEffects Preset Selector", "pname": "easyeffects-preset-selector", "description": "Quickly show and load EasyEffects Presets", "link": "https://extensions.gnome.org/extension/4907/easyeffects-preset-selector/", "shell_version_map": {"38": {"version": "3", "sha256": "09fa3hv3jjcl1c200kw4qg9m0rkwf6pf516rmhypzz8xw8ylcsl7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VsdmlsbGUvZWVwcmVzZXRzZWxlY3RvciIsCiAgInV1aWQiOiAiZWVwcmVzZXRzZWxlY3RvckB1bHZpbGxlLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "09fa3hv3jjcl1c200kw4qg9m0rkwf6pf516rmhypzz8xw8ylcsl7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VsdmlsbGUvZWVwcmVzZXRzZWxlY3RvciIsCiAgInV1aWQiOiAiZWVwcmVzZXRzZWxlY3RvckB1bHZpbGxlLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "09fa3hv3jjcl1c200kw4qg9m0rkwf6pf516rmhypzz8xw8ylcsl7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3VsdmlsbGUvZWVwcmVzZXRzZWxlY3RvciIsCiAgInV1aWQiOiAiZWVwcmVzZXRzZWxlY3RvckB1bHZpbGxlLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "volume_scroller@noskoski", "name": "Volume Scroller", "pname": "volume-scroller", "description": "Scroll up or down in the Top Bar to adjust volume.", "link": "https://extensions.gnome.org/extension/4916/volume-scroller/", "shell_version_map": {"38": {"version": "1", "sha256": "1v6h7mjsflysczrbqfkycfiswmpvn8wyz96farpj9z19cdy379q2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3Nrb3NraS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckBub3Nrb3NraSIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "1v6h7mjsflysczrbqfkycfiswmpvn8wyz96farpj9z19cdy379q2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3Nrb3NraS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckBub3Nrb3NraSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "1v6h7mjsflysczrbqfkycfiswmpvn8wyz96farpj9z19cdy379q2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ub3Nrb3NraS9nbm9tZS1zaGVsbC12b2x1bWUtc2Nyb2xsZXIiLAogICJ1dWlkIjogInZvbHVtZV9zY3JvbGxlckBub3Nrb3NraSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "weather@eexpss.gmail.com", "name": "Weather", "pname": "weather", "description": "Animation Weather. \nMouse 1: show weather\nMouse 2: refresh weather\nMouse 3: dismiss\nScrollUp: increase day\nScrollDown: decrease day\nYou need to fill in the correct longitude and latitude in the coord.json file.", "link": "https://extensions.gnome.org/extension/4919/weather/", "shell_version_map": {"40": {"version": "3", "sha256": "17fc87vppdzs29qvknlnwrll1c5j0x9m2jsap086p4g5lzyxqrqq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXlcbllvdSBuZWVkIHRvIGZpbGwgaW4gdGhlIGNvcnJlY3QgbG9uZ2l0dWRlIGFuZCBsYXRpdHVkZSBpbiB0aGUgY29vcmQuanNvbiBmaWxlLiIsCiAgIm5hbWUiOiAiV2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3ZWF0aGVyQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "17fc87vppdzs29qvknlnwrll1c5j0x9m2jsap086p4g5lzyxqrqq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXlcbllvdSBuZWVkIHRvIGZpbGwgaW4gdGhlIGNvcnJlY3QgbG9uZ2l0dWRlIGFuZCBsYXRpdHVkZSBpbiB0aGUgY29vcmQuanNvbiBmaWxlLiIsCiAgIm5hbWUiOiAiV2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3ZWF0aGVyQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "17fc87vppdzs29qvknlnwrll1c5j0x9m2jsap086p4g5lzyxqrqq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXlcbllvdSBuZWVkIHRvIGZpbGwgaW4gdGhlIGNvcnJlY3QgbG9uZ2l0dWRlIGFuZCBsYXRpdHVkZSBpbiB0aGUgY29vcmQuanNvbiBmaWxlLiIsCiAgIm5hbWUiOiAiV2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3ZWF0aGVyQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"uuid": "whiteborder@aaronbpaden.gmail.com", "name": "White Border Overlay", "pname": "white-border-overlay", "description": "Draw a white border around the desktop to enable (hopefully) universal application support for the Sinden Lightgun.", "link": "https://extensions.gnome.org/extension/4922/white-border-overlay/", "shell_version_map": {"41": {"version": "1", "sha256": "000sk4a2db3r7yx6dxpxv9parh0gpsanif1zlmz2xr69hbl48hwk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} ] diff --git a/pkgs/desktops/gnome/extensions/freon/default.nix b/pkgs/desktops/gnome/extensions/freon/default.nix deleted file mode 100644 index 90909608052b..000000000000 --- a/pkgs/desktops/gnome/extensions/freon/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, glib -, substituteAll -, hddtemp -, liquidctl -, lm_sensors -, netcat-gnu -, nvme-cli -, procps -, smartmontools -}: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-freon"; - version = "45"; - - passthru = { - extensionUuid = "freon@UshakovVasilii_Github.yahoo.com"; - extensionPortalSlug = "freon"; - }; - - src = fetchFromGitHub { - owner = "UshakovVasilii"; - repo = "gnome-shell-extension-freon"; - rev = "EGO-${version}"; - sha256 = "sha256-tPb7SzHSwvz7VV+kZTmcw1eAdtL1J7FJ3BOtg4Us8jc="; - }; - - nativeBuildInputs = [ glib ]; - - patches = [ - (substituteAll { - src = ./fix_paths.patch; - inherit hddtemp liquidctl lm_sensors procps smartmontools; - netcat = netcat-gnu; - nvmecli = nvme-cli; - }) - ]; - - buildPhase = '' - runHook preBuild - glib-compile-schemas --strict --targetdir="freon@UshakovVasilii_Github.yahoo.com/schemas" "freon@UshakovVasilii_Github.yahoo.com/schemas" - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r "freon@UshakovVasilii_Github.yahoo.com" $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "GNOME Shell extension for displaying CPU, GPU, disk temperatures, voltage and fan RPM in the top panel"; - license = licenses.gpl2; - maintainers = with maintainers; [ justinas ]; - homepage = "https://github.com/UshakovVasilii/gnome-shell-extension-freon"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 2d3d2415db24..5f915a4b5af8 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -19,15 +19,15 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-gsconnect"; - version = "48"; + version = "50"; outputs = [ "out" "installedTests" ]; src = fetchFromGitHub { - owner = "andyholmes"; + owner = "GSConnect"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "sha256-cKEFTF8DnQIQAXVW9NvE34mUqueQP/OtxTzMUy1dT5U="; + hash = "sha256-uUpdjBsVeS99AYDpGlXP9fMqGxWj+XfVubNoGJs76G0="; }; patches = [ @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "KDE Connect implementation for Gnome Shell"; - homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki"; + homepage = "https://github.com/GSConnect/gnome-shell-extension-gsconnect/wiki"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index a08af5734e47..6e2f1f6f2620 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -2,11 +2,10 @@ { "arcmenu@arcmenu.com" = callPackage ./arcmenu { }; "clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { }; - "dash-to-panel@jderose9.github.com" = callPackage ./dash-to-panel { }; + "dash-to-dock@micxgx.gmail.com" = callPackage ./dash-to-dock { }; "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; "emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { }; - "freon@UshakovVasilii_Github.yahoo.com" = callPackage ./freon { }; "gsconnect@andyholmes.github.io" = callPackage ./gsconnect { }; "icon-hider@kalnitsky.org" = callPackage ./icon-hider { }; "impatience@gfxmonk.net" = callPackage ./impatience { }; diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix index e4f8dfa03cd6..381a82e5bdf0 100644 --- a/pkgs/desktops/gnome/extensions/pop-shell/default.nix +++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix @@ -26,6 +26,16 @@ stdenv.mkDerivation rec { extensionPortalSlug = "pop-shell"; }; + postPatch = '' + for file in */main.js; do + substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs" + done + ''; + + preFixup = '' + chmod +x $out/share/gnome-shell/extensions/pop-shell@system76.com/*/main.js + ''; + meta = with lib; { description = "Keyboard-driven layer for GNOME Shell"; license = licenses.gpl3Only; diff --git a/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch index e1e6fb7a839a..2f2a0bcfd094 100644 --- a/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch +++ b/pkgs/desktops/gnome/extensions/pop-shell/fix-gjs.patch @@ -1,20 +1,3 @@ -diff --git a/src/color_dialog/src/main.ts b/src/color_dialog/src/main.ts -index 9522499..9911530 100644 ---- a/src/color_dialog/src/main.ts -+++ b/src/color_dialog/src/main.ts -@@ -1,4 +1,4 @@ --#!/usr/bin/gjs -+#!/usr/bin/env gjs - - imports.gi.versions.Gtk = '3.0'; - -@@ -84,4 +84,4 @@ function launch_color_dialog() { - - Gtk.init(null); - --launch_color_dialog() -\ No newline at end of file -+launch_color_dialog() diff --git a/src/extension.ts b/src/extension.ts index 7417c46..00d5829 100644 --- a/src/extension.ts @@ -28,23 +11,6 @@ index 7417c46..00d5829 100644 if (ipc) { const generator = (stdout: any, res: any) => { -diff --git a/src/floating_exceptions/src/main.ts b/src/floating_exceptions/src/main.ts -index f298ec7..87a6bc4 100644 ---- a/src/floating_exceptions/src/main.ts -+++ b/src/floating_exceptions/src/main.ts -@@ -1,4 +1,4 @@ --#!/usr/bin/gjs -+#!/usr/bin/env gjs - - imports.gi.versions.Gtk = '3.0' - -@@ -329,4 +329,4 @@ function main() { - Gtk.main() - } - --main() -\ No newline at end of file -+main() diff --git a/src/panel_settings.ts b/src/panel_settings.ts index 83ff56c..1bc1e98 100644 --- a/src/panel_settings.ts diff --git a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix index cf4b916b2010..72b4ef744fb7 100644 --- a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix @@ -1,19 +1,21 @@ { lib, stdenv , substituteAll , fetchFromGitHub +, fetchpatch , libpulseaudio , python3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-sound-output-device-chooser"; - version = "39"; + # For gnome 42 support many commits not tagged yet are needed. + version = "unstable-2022-03-29"; src = fetchFromGitHub { owner = "kgshank"; repo = "gse-sound-output-device-chooser"; - rev = version; - sha256 = "sha256-RFdBdpKsz2MjdzxWX4UFwah+e68dqrkvm7ql0RAZZwg="; + rev = "76f7f59d23f5ffcd66555c7662f43c9cc1ce4742"; + sha256 = "sha256-iPc95LmDsYizLg45wpU+vFx/N6MR2hewSHqoRsePC/4="; }; patches = [ diff --git a/pkgs/desktops/gnome/extensions/update-extensions.py b/pkgs/desktops/gnome/extensions/update-extensions.py index 0582d3ca942d..d1fdfc1f1a53 100755 --- a/pkgs/desktops/gnome/extensions/update-extensions.py +++ b/pkgs/desktops/gnome/extensions/update-extensions.py @@ -18,6 +18,7 @@ supported_versions = { "38": "3.38", "40": "40", "41": "41", + "42": "42", } diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index 21e38c548e98..5a7446862bdc 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitLab , nix-update-script , pkg-config @@ -9,8 +10,7 @@ , librsvg , libxml2 , desktop-file-utils -, pysolfc -, guile +, guile_3_0 , libcanberra-gtk3 , ninja , appstream-glib @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.20"; + version = "3.22.21"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = version; - sha256 = "sha256-5xFwlhT9qjtvNDQ8kfGd2BeK2KcJDzpfsEC8z4Ei3ns="; + sha256 = "sha256-dpzuePxSoJcwUlj314r5G9A8aF1Yz49r+DxNTfA8/Ks="; }; nativeBuildInputs = [ @@ -44,9 +44,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 librsvg - guile + guile_3_0 libcanberra-gtk3 - pysolfc ]; prePatch = '' diff --git a/pkgs/desktops/gnome/games/gnome-2048/default.nix b/pkgs/desktops/gnome/games/gnome-2048/default.nix new file mode 100644 index 000000000000..90bd99e4a7bf --- /dev/null +++ b/pkgs/desktops/gnome/games/gnome-2048/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchurl +, wrapGAppsHook +, meson +, vala +, pkg-config +, ninja +, itstool +, clutter-gtk +, libgee +, libgnome-games-support +, gnome +, gtk3 +}: + +stdenv.mkDerivation rec { + pname = "gnome-twenty-forty-eight"; + version = "3.38.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor version}/gnome-2048-${version}.tar.xz"; + sha256 = "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2"; + }; + + nativeBuildInputs = [ + itstool + meson + ninja + pkg-config + vala + wrapGAppsHook + ]; + + buildInputs = [ + clutter-gtk + libgee + libgnome-games-support + gtk3 + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-2048"; + }; + }; + + meta = with lib; { + homepage = "https://wiki.gnome.org/Apps/2048"; + description = "Obtain the 2048 tile"; + maintainers = teams.gnome.members; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index e47e77d9c0ab..5690355a0ce2 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -14,16 +14,17 @@ , gnome , glib , gtk4 +, libadwaita , librsvg }: stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "41.1"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "62GYhlljlrQDOj8oo8LjAEtU6+Gzi0DWQiwXufLMF9A="; + sha256 = "Eq9Uk6YiBaxrt0VA8KhYQT2okolmo0boVDMLQdc7w5M="; }; nativeBuildInputs = [ @@ -42,8 +43,8 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk4 + libadwaita librsvg - gnome.adwaita-icon-theme ]; postPatch = '' diff --git a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix index 7ef68e470e1d..698741ba8366 100644 --- a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix @@ -1,6 +1,20 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook -, librsvg, gettext, itstool, libxml2 -, meson, ninja, glib, vala, desktop-file-utils +{ stdenv +, lib +, fetchurl +, fetchpatch +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, librsvg +, gettext +, itstool +, libxml2 +, meson +, ninja +, glib +, vala +, desktop-file-utils }: stdenv.mkDerivation rec { @@ -12,12 +26,30 @@ stdenv.mkDerivation rec { sha256 = "144ia3zn9rhwa1xbdkvsz6m0dsysl6mxvqw9bnrlh845hmyy9cfj"; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:24:0: ERROR: Function does not take positional arguments. + # data/meson.build:45:0: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-mahjongg/-/commit/a2037b0747163601a5d5b57856d037eecf3a4db7.patch"; + sha256 = "Wcder6Y9H6c1f8I+IPDvST3umaCU21HgxfXn809JDz0="; + }) + ]; + nativeBuildInputs = [ - meson ninja vala desktop-file-utils - pkg-config gnome.adwaita-icon-theme - libxml2 itstool gettext wrapGAppsHook + meson + ninja + vala + desktop-file-utils + pkg-config + gnome.adwaita-icon-theme + libxml2 + itstool + gettext + wrapGAppsHook glib # for glib-compile-schemas ]; + buildInputs = [ glib gtk3 diff --git a/pkgs/desktops/gnome/games/gnome-mines/default.nix b/pkgs/desktops/gnome/games/gnome-mines/default.nix index 6a7168badbfe..d60a58a83c95 100644 --- a/pkgs/desktops/gnome/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mines/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-mines"; - version = "40.0"; + version = "40.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0sf6kdvhr4pr3hddnj6ql9larz2wy108sri31id6x9g459nbly8z"; + sha256 = "NQLps/ccs7LnEcDmAZGH/rzCvKh349RW3KtwD3vjEnI="; }; # gobject-introspection for finding vapi files diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 1431a6179493..87e7c467d04c 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "40.2"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "NhIFMePHE5WB6jgA+/48KzFpTEQBRezIl6w05WLXVKM="; + sha256 = "HS603bgCa0Q2Rc81hbjfEkTjgo7hwHUYBSslmeHFwo8="; }; nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix index a1cdf98d9a15..6578bf7c0589 100644 --- a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix @@ -1,6 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook -, libxml2, gettext, itstool, meson, ninja, python3 -, vala, desktop-file-utils +{ stdenv +, lib +, fetchurl +, fetchpatch +, pkg-config +, gnome +, gtk3 +, wrapGAppsHook +, libxml2 +, gettext +, itstool +, meson +, ninja +, python3 +, vala +, desktop-file-utils }: stdenv.mkDerivation rec { @@ -12,14 +25,31 @@ stdenv.mkDerivation rec { sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z"; }; - passthru = { - updateScript = gnome.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome.gnome-tetravex"; }; - }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:37:0: ERROR: Function does not take positional arguments. + # data/meson.build:59:0: ERROR: Function does not take positional arguments. + # Taken from https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-tetravex/-/commit/80912d06f5e588f6aca966fa516103275e58d94e.patch"; + sha256 = "2+nFw5sJzbInibKaq3J10Ufbl3CnZWlgnUtzRTZ5G0I="; + }) + ]; nativeBuildInputs = [ - wrapGAppsHook itstool libxml2 gnome.adwaita-icon-theme - pkg-config gettext meson ninja python3 vala desktop-file-utils + wrapGAppsHook + itstool + libxml2 + gnome.adwaita-icon-theme + pkg-config + gettext + meson + ninja + python3 + vala + desktop-file-utils ]; + buildInputs = [ gtk3 ]; @@ -29,6 +59,13 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson_post_install.py ''; + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-tetravex"; + attrPath = "gnome.gnome-tetravex"; + }; + }; + meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Tetravex"; description = "Complete the puzzle by matching numbered tiles"; diff --git a/pkgs/desktops/gnome/games/hitori/default.nix b/pkgs/desktops/gnome/games/hitori/default.nix index 15759c681984..bb210c2fffb1 100644 --- a/pkgs/desktops/gnome/games/hitori/default.nix +++ b/pkgs/desktops/gnome/games/hitori/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -25,6 +27,15 @@ stdenv.mkDerivation rec { sha256 = "99cQPLBjP7ATcwExqYw646IWK5+5SZ/H8ZUS1YG/ZWk="; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:3:0: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/hitori/-/commit/d25728e122f1d7b985029a5ba96810c3e57c27f7.patch"; + sha256 = "LwBpFFr+vLacLTpto7PwvO1p2lku6epyEv9YZvUvW+g="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix index a940a6f2cd63..c12853e5daee 100644 --- a/pkgs/desktops/gnome/games/tali/default.nix +++ b/pkgs/desktops/gnome/games/tali/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "40.4"; + version = "40.6"; src = fetchurl { url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "AsrMdvTuQjD2eqAK2hlOnFSPidJ6DnLyANi9U67nGhc="; + sha256 = "g/ugR+3s0ZbTBxmnDi9NCYa7Jswr1flVoKkgDqY/BhI="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/misc/gitg/default.nix b/pkgs/desktops/gnome/misc/gitg/default.nix index 8f73bdaeb7da..31e6bd7f2ed1 100644 --- a/pkgs/desktops/gnome/misc/gitg/default.nix +++ b/pkgs/desktops/gnome/misc/gitg/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , vala , gettext , pkg-config @@ -12,11 +13,11 @@ , bash , gobject-introspection , libsoup -, gtksourceview +, gtksourceview4 , gsettings-desktop-schemas , adwaita-icon-theme , gnome -, gtkspell3 +, gspell , shared-mime-info , libgee , libgit2-glib @@ -29,13 +30,22 @@ stdenv.mkDerivation rec { pname = "gitg"; - version = "3.32.1"; + version = "41"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914"; + sha256 = "f7Ybn7EPuqVI0j1wZbq9cq1j5iHeVYQMBlzm45hsRik="; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:8:5: ERROR: Function does not take positional arguments. + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gitg/-/commit/1978973b12848741b08695ec2020bac98584d636.patch"; + sha256 = "sha256-RzaGPGGiKMgjy0waFqt48rV2yWBGZgC3kHehhVhxktk="; + }) + ]; + nativeBuildInputs = [ gobject-introspection gettext @@ -52,8 +62,8 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas gtk3 - gtksourceview - gtkspell3 + gtksourceview4 + gspell json-glib libdazzle libgee diff --git a/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/desktops/gnome/misc/gnome-applets/default.nix index 2cdafcc23b30..a03b356c21f3 100644 --- a/pkgs/desktops/gnome/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-applets/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-applets"; - version = "3.42.0"; + version = "3.44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/RaXR7kv7/Rs05/mLyPd+WZ8EAaPRigDOF0TjvxIedQ="; + sha256 = "MDlifKknGeSAWH1yT0aXEJw9Em7BUPFPOy4Gkk2576c="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix index 3a158e7ddf81..683b5c22626f 100644 --- a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "gnome-autoar"; - version = "0.4.2"; + version = "0.4.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HSBpQHkwDhL+q9t3MEqWnRzBkNHRKpSb6EXK0Bx4pdM="; + sha256 = "e98HiVU0lqvdw8ljsM5zY4BcDALAJf7d68qsx4cknog="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 9e796670aa02..34d2b6eea3c2 100644 --- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -30,7 +30,7 @@ }: let pname = "gnome-flashback"; - version = "3.42.1"; + version = "3.44.0"; # From data/sessions/Makefile.am requiredComponentsCommon = enableGnomePanel: @@ -61,7 +61,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "sha256:0kl4m05whm03m2v0y3jd69lghkggn8s0hxdhvchcas7jmhh940n8"; + sha256 = "sha256-HfCDgSfGJG7s2J0cUP+I/IKr9t47MGjlLd5JWkK9VQo="; }; # make .desktop Execs absolute diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix index aa472230e9cd..139e161352a1 100644 --- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gnome-panel"; - version = "3.42.0"; + version = "3.44.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-rqjA78LtuiDpetRpUXnNCiU45kwpBHAsyMWU6OCJhwM="; + hash = "sha256-mWVfddAxh2wTDtI8TaIsCZ57zEBIsCVaPDo7vHh7Mao="; }; patches = [ diff --git a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index 6a9f4f19385d..5643741aceb4 100644 --- a/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -6,6 +6,7 @@ , gettext , glib , gnome +, gnome-desktop , gobject-introspection , gsettings-desktop-schemas , gtk3 @@ -20,13 +21,13 @@ python3Packages.buildPythonApplication rec { pname = "gnome-tweaks"; - version = "40.0"; + version = "42.beta"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "+V8/4DGwsBwC95oWWfiJFS03cq4+RN+EA9FGC6Xuw2o="; + sha256 = "g/RMwdyK3HcM2tcXtAPLmmzDwN5Q445vHmeLQ0Aa2Gg="; }; nativeBuildInputs = [ @@ -43,7 +44,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gdk-pixbuf glib - gnome.gnome-desktop + gnome-desktop gnome.gnome-settings-daemon gnome.gnome-shell # Makes it possible to select user themes through the `user-theme` extension diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index 83928c04827b..ba42a8028369 100644 --- a/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub , fetchpatch , appstream-glib @@ -7,6 +8,8 @@ , glib , gobject-introspection , gtk3 +, gtk4 +, libadwaita , meson , mutter , ninja @@ -17,14 +20,14 @@ }: stdenv.mkDerivation rec { - version = "3.42.2"; + version = "42.1"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-VWtq1jPwUHHIDpVaSYQ0FiihlfulRofFmacMyv/buMw="; + sha256 = "sha256-A5NZ4NiPVZUr7vPdDuNywLsLrejZ4SCg7+3//ZNRmLY="; }; patches = [ @@ -38,7 +41,7 @@ stdenv.mkDerivation rec { --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" substituteInPlace src/gnome-shell/prefs.js \ --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" - substituteInPlace src/libgpaste/settings/gpaste-settings.c \ + substituteInPlace src/libgpaste/gpaste/gpaste-settings.c \ --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"} ''; @@ -57,6 +60,8 @@ stdenv.mkDerivation rec { gjs glib gtk3 + gtk4 + libadwaita mutter pango ]; diff --git a/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch b/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch index 46e30ce2e2cb..2ec807b61c05 100644 --- a/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch +++ b/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch @@ -1,3 +1,5 @@ +diff --git a/src/gnome-shell/extension.js b/src/gnome-shell/extension.js +index c8773fd6..9efbed67 100644 --- a/src/gnome-shell/extension.js +++ b/src/gnome-shell/extension.js @@ -6,6 +6,8 @@ @@ -8,21 +10,25 @@ + imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION; imports.gi.versions.GLib = '2.0'; - imports.gi.versions.GPaste = '1.0'; + imports.gi.versions.GPaste = '2'; +diff --git a/src/gnome-shell/prefs.js b/src/gnome-shell/prefs.js +index 32244ab2..74b85572 100644 --- a/src/gnome-shell/prefs.js +++ b/src/gnome-shell/prefs.js @@ -6,6 +6,8 @@ - const Gettext = imports.gettext; + imports.gi.versions.GPasteGtk = '4'; +imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@'); + - //const { GPaste } = imports.gi; - const ExtensionUtils = imports.misc.extensionUtils; ---- a/src/libgpaste/settings/gpaste-settings.c -+++ b/src/libgpaste/settings/gpaste-settings.c -@@ -1013,7 +1013,11 @@ + + const { GPasteGtk } = imports.gi; +diff --git a/src/libgpaste/gpaste/gpaste-settings.c b/src/libgpaste/gpaste/gpaste-settings.c +index 7e53eb64..57c399fc 100644 +--- a/src/libgpaste/gpaste/gpaste-settings.c ++++ b/src/libgpaste/gpaste/gpaste-settings.c +@@ -1013,7 +1013,11 @@ create_g_settings (void) } else { diff --git a/pkgs/desktops/gnome/misc/metacity/default.nix b/pkgs/desktops/gnome/misc/metacity/default.nix index 8dcef7922659..ef3e31f1032f 100644 --- a/pkgs/desktops/gnome/misc/metacity/default.nix +++ b/pkgs/desktops/gnome/misc/metacity/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "metacity"; - version = "3.42.0"; + version = "3.44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "2J1nnc/tm17vGPBuLcszp6tUPVOzWPqJzmVZPCMe7rw="; + sha256 = "GcPF150hcfRbqg9jLMiZX4YHvxIxoWAUQ5usm6Flp8A="; }; patches = [ diff --git a/pkgs/desktops/gnome/update.nix b/pkgs/desktops/gnome/update.nix index 928eac45160a..f5db71174ad8 100644 --- a/pkgs/desktops/gnome/update.nix +++ b/pkgs/desktops/gnome/update.nix @@ -1,26 +1,42 @@ -{ stdenv, pkgs, lib, writeScript, python3, common-updater-scripts }: +{ stdenv, bash, pkgs, lib, writeScript, python3, common-updater-scripts }: { packageName, attrPath ? packageName, versionPolicy ? "tagged", freeze ? false }: let python = python3.withPackages (p: [ p.requests p.libversion ]); - upperBoundFlag = + package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs; + packageVersion = lib.getVersion package; + upperBound = let - package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs; - packageVersion = lib.getVersion package; versionComponents = lib.versions.splitVersion packageVersion; minorVersion = lib.versions.minor packageVersion; minorAvailable = builtins.length versionComponents > 1 && builtins.match "[0-9]+" minorVersion != null; nextMinor = builtins.fromJSON minorVersion + 1; upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}"; - in lib.optionalString (freeze && minorAvailable) ''--upper-bound="${upperBound}"''; + in lib.optionals (freeze && minorAvailable) [ upperBound ]; updateScript = writeScript "gnome-update-script" '' - #!${stdenv.shell} + #!${bash}/bin/bash set -o errexit - package_name="$1" - attr_path="$2" - version_policy="$3" + attr_path="$1" + package_name="$2" + package_version="$3" + version_policy="$4" + + flvFlags=("$package_name" "$version_policy" "''${GNOME_UPDATE_STABILITY:-stable}") + + if (( $# >= 5 )); then + upper_bound="$5" + flvFlags+=("--upper-bound=$upper_bound") + fi + PATH=${lib.makeBinPath [ common-updater-scripts python ]} - latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable" ${upperBoundFlag}) + latest_tag=$(python "${./find-latest-version.py}" "''${flvFlags[@]}") update-source-version "$attr_path" "$latest_tag" + echo '[ { "commitBody": "https://gitlab.gnome.org/GNOME/'$package_name'/-/compare/'$package_version'...'$latest_tag'" } ]' ''; -in [ updateScript packageName attrPath versionPolicy ] +in { + name = "gnome-update-script"; + command = [ updateScript attrPath packageName packageVersion versionPolicy ] ++ upperBound; + supportedFeatures = [ + "commit" + ]; +} diff --git a/pkgs/desktops/gnustep/gworkspace/default.nix b/pkgs/desktops/gnustep/gworkspace/default.nix index d5018a4350f8..cdc6612d1c06 100644 --- a/pkgs/desktops/gnustep/gworkspace/default.nix +++ b/pkgs/desktops/gnustep/gworkspace/default.nix @@ -3,13 +3,13 @@ , system_preferences }: let - version = "0.9.4"; + version = "1.0.0"; in gsmakeDerivation { name = "gworkspace-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-${version}.tar.gz"; - sha256 = "0cjn83m7qmbwdpldlyhs239nwswgip3yaz01ahls130dq5qq7hgk"; + sha256 = "sha256-M7dV7RVatw8gdYHQlRi5wNBd6MGT9GqW04R/DoKNu6I="; }; # additional dependencies: # - PDFKit framework from http://gap.nongnu.org/ diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 062ca4abfe86..5404c0c7753a 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -4,10 +4,9 @@ let # Update script tailored to LXQt packages from git repository lxqtUpdateScript = { pname, version, src }: - pkgs.genericUpdater { + pkgs.gitUpdater { inherit pname version; attrPath = "lxqt.${pname}"; - versionLister = "${pkgs.common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; # For compiling information, see: diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 15bc1941af3f..5d5134d38d29 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -22,11 +22,16 @@ mkDerivation rec { sha256 = "1hb04zgpalxv6da3myf1dxsbjix15dczzfq8a24g5dg2zfhwpx21"; }; - # Nix clang on darwin identifies as 'Clang', not 'AppleClang' - # Without this, dependants fail to link. postPatch = '' + # Nix clang on darwin identifies as 'Clang', not 'AppleClang' + # Without this, dependants fail to link. substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \ --replace AppleClang Clang + + # GLib 2.72 moved the file from gio-unix-2.0 to gio-2.0. + # https://github.com/lxqt/lxqt-build-tools/pull/74 + substituteInPlace cmake/find-modules/FindGLIB.cmake \ + --replace gio/gunixconnection.h gio/gunixfdlist.h ''; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 18d3f9899b41..db27bfbbd3f4 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "obconf-qt"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1nw2r3h7ynmygpslnzjn40vvickd988nm31wy2b645xcck89q4rm"; + sha256 = "zxwQfKowgpLjfxSV2t7Ly8o7DFqoIxi60zIVCcKDQWo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index e93e404762a2..9412506385b3 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -8,6 +8,7 @@ , qttools , qtx11extras , lxqtUpdateScript +, nixosTests }: mkDerivation rec { @@ -35,6 +36,8 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + passthru.tests.test = nixosTests.terminal-emulators.qterminal; + meta = with lib; { homepage = "https://github.com/lxqt/qterminal"; description = "A lightweight Qt-based terminal emulator"; diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index e9822f0242d6..2c5b45a653e5 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -7,10 +7,9 @@ let # Update script tailored to mate packages from git repository mateUpdateScript = { pname, version, odd-unstable ? true, url ? "https://pub.mate-desktop.org/releases" }: - pkgs.genericUpdater { - inherit pname version odd-unstable; + pkgs.httpTwoLevelsUpdater { + inherit pname version odd-unstable url; attrPath = "mate.${pname}"; - versionLister = "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions ${url}"; }; atril = callPackage ./atril { }; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 9384d49e2a3d..3076a7170cbf 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, mateUpdateScript }: +{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-backgrounds"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0379hngy3ap1r5kmqvmzs9r710k2c9nal2ps3hq765df4ir15j8d"; }; + patches = [ + # Fix build with meson 0.61, can be removed on next update. + # https://github.com/mate-desktop/mate-backgrounds/pull/39 + (fetchpatch { + url = "https://github.com/mate-desktop/mate-backgrounds/commit/0096e237d420e6247a75a1c6940a818e309ac2a7.patch"; + sha256 = "HEF8VWunFO+NCG18fZA7lbE2l8pc6Z3jcD+rSZ1Jsqg="; + }) + ]; + nativeBuildInputs = [ gettext meson diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 7c1be60b20db..3a2f57a86270 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-panel"; - 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 = "038irkjl9ap7kqacf1c0i74h0rwkcpaw685vyml50vj5hg23hc38"; + sha256 = "rsT5jInFnnbMBlbtBILx2CkS9N7MZg8hyNAE5JPgVBA="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 19fa5697f969..fcae87a869ee 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript, nixosTests }: stdenv.mkDerivation rec { pname = "mate-terminal"; @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.tests.test = nixosTests.terminal-emulators.mate-terminal; + meta = with lib; { description = "MATE desktop terminal emulator"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index e379f5369f5b..7874586ce8e9 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -9,19 +9,18 @@ , gobject-introspection , wrapGAppsHook , glib -, genericUpdater -, common-updater-scripts +, gitUpdater }: python3Packages.buildPythonApplication rec { pname = "mate-tweak"; - version = "21.10.0"; + version = "22.04.4"; src = fetchFromGitHub { owner = "ubuntu-mate"; repo = pname; rev = version; - sha256 = "0m61p6idajsrrbjps7s1pnl6nfzwpy7j6l9bdhqi9gaaij687shn"; + sha256 = "ncBN1wjCcMtuasnXk7WMge+9MK7BMmTu89/R+hiY/Ks="; }; nativeBuildInputs = [ @@ -74,10 +73,9 @@ python3Packages.buildPythonApplication rec { done ''; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; attrPath = "mate.${pname}"; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; meta = with lib; { diff --git a/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch b/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch deleted file mode 100644 index bd519c292c26..000000000000 --- a/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch +++ /dev/null @@ -1,240 +0,0 @@ -From b5d7cb20713eff3b3729e5c5fdd2f15680a29385 Mon Sep 17 00:00:00 2001 -From: Bobby Rong -Date: Sun, 31 Oct 2021 23:12:46 +0800 -Subject: [PATCH] build: add packagekit_backend option - ---- - .github/workflows/main.yml | 7 +++++++ - meson_options.txt | 1 + - src/Application.vala | 4 ++++ - src/Core/BackendAggregator.vala | 2 ++ - src/Core/Package.vala | 21 +++++++++++++-------- - src/Core/UpdateManager.vala | 6 ++++++ - src/Views/Homepage.vala | 4 ++++ - src/meson.build | 10 ++++++++-- - 8 files changed, 45 insertions(+), 10 deletions(-) - -diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml -index daf13654..5dc5a2fb 100644 ---- a/.github/workflows/main.yml -+++ b/.github/workflows/main.yml -@@ -42,6 +42,13 @@ jobs: - meson configure -Dcurated=false -Dpayments=false -Dsharing=false -Dname=Pop\!_Shop build - ninja -C build install - -+ - name: Build (NixOS) -+ env: -+ DESTDIR: out -+ run: | -+ meson configure -Dcurated=false -Dpayments=false -Dpackagekit_backend=false build -+ ninja -C build install -+ - lint: - - runs-on: ubuntu-latest -diff --git a/meson_options.txt b/meson_options.txt -index 0ae93d07..37a6cd8a 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,3 +4,4 @@ option('name', type : 'string', value : 'AppCenter', description : 'The name of - option('payments', type : 'boolean', value : true, description : 'Enable payment features and display paid apps') - option('sharing', type : 'boolean', value : true, description : 'Display sharing features, i.e. copyable URLs to appcenter.elementary.io') - option('hide_upstream_distro_apps', type : 'boolean', value : true, description : 'Used for hiding Ubuntu repo apps on elementary OS') -+option('packagekit_backend', type : 'boolean', value : true, description : 'Enable PackageKit backend') -diff --git a/src/Application.vala b/src/Application.vala -index 65fae5aa..7c075076 100644 ---- a/src/Application.vala -+++ b/src/Application.vala -@@ -167,9 +167,11 @@ public class AppCenter.App : Gtk.Application { - - var client = AppCenterCore.Client.get_default (); - -+#if PACKAGEKIT_BACKEND - if (fake_update_packages != null) { - AppCenterCore.PackageKitBackend.get_default ().fake_packages = fake_update_packages; - } -+#endif - - if (silent) { - NetworkMonitor.get_default ().network_changed.connect ((available) => { -@@ -183,6 +185,7 @@ public class AppCenter.App : Gtk.Application { - return; - } - -+#if PACKAGEKIT_BACKEND - if (local_path != null) { - var file = File.new_for_commandline_arg (local_path); - -@@ -192,6 +195,7 @@ public class AppCenter.App : Gtk.Application { - warning ("Failed to load local AppStream XML file: %s", e.message); - } - } -+#endif - - if (main_window == null) { - main_window = new MainWindow (this); -diff --git a/src/Core/BackendAggregator.vala b/src/Core/BackendAggregator.vala -index 539dba98..feb1eaa9 100644 ---- a/src/Core/BackendAggregator.vala -+++ b/src/Core/BackendAggregator.vala -@@ -26,8 +26,10 @@ public class AppCenterCore.BackendAggregator : Backend, Object { - - construct { - backends = new Gee.ArrayList (); -+#if PACKAGEKIT_BACKEND - backends.add (PackageKitBackend.get_default ()); - backends.add (UbuntuDriversBackend.get_default ()); -+#endif - backends.add (FlatpakBackend.get_default ()); - - unowned Gtk.Application app = (Gtk.Application) GLib.Application.get_default (); -diff --git a/src/Core/Package.vala b/src/Core/Package.vala -index d6f12f15..8dbd7a22 100644 ---- a/src/Core/Package.vala -+++ b/src/Core/Package.vala -@@ -328,7 +328,14 @@ public class AppCenterCore.Package : Object { - public string origin_description { - owned get { - unowned string origin = component.get_origin (); -- if (backend is PackageKitBackend) { -+ if (backend is FlatpakBackend) { -+ var fp_package = this as FlatpakPackage; -+ if (fp_package != null && fp_package.installation == FlatpakBackend.system_installation) { -+ return _("%s (system-wide)").printf (origin); -+ } -+ return origin; -+#if PACKAGEKIT_BACKEND -+ } else if (backend is PackageKitBackend) { - if (origin == APPCENTER_PACKAGE_ORIGIN) { - return _("AppCenter"); - } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) { -@@ -336,15 +343,9 @@ public class AppCenterCore.Package : Object { - } else if (origin.has_prefix ("ubuntu-")) { - return _("Ubuntu (non-curated)"); - } -- } else if (backend is FlatpakBackend) { -- var fp_package = this as FlatpakPackage; -- if (fp_package != null && fp_package.installation == FlatpakBackend.system_installation) { -- return _("%s (system-wide)").printf (origin); -- } -- -- return origin; - } else if (backend is UbuntuDriversBackend) { - return _("Ubuntu Drivers"); -+#endif - } - - return _("Unknown Origin (non-curated)"); -@@ -434,11 +435,15 @@ public class AppCenterCore.Package : Object { - _author_title = null; - backend_details = null; - -+#if PACKAGEKIT_BACKEND - // The version on a PackageKit package comes from the package not AppStream, so only reset the version - // on other backends - if (!(backend is PackageKitBackend)) { - _latest_version = null; - } -+#else -+ _latest_version = null; -+#endif - - this.component = component; - } -diff --git a/src/Core/UpdateManager.vala b/src/Core/UpdateManager.vala -index 9deceaf5..c92c0d37 100644 ---- a/src/Core/UpdateManager.vala -+++ b/src/Core/UpdateManager.vala -@@ -52,6 +52,7 @@ public class AppCenterCore.UpdateManager : Object { - installed_package.update_state (); - } - -+#if PACKAGEKIT_BACKEND - Pk.Results pk_updates; - unowned PackageKitBackend client = PackageKitBackend.get_default (); - try { -@@ -60,10 +61,12 @@ public class AppCenterCore.UpdateManager : Object { - warning ("Unable to get updates from PackageKit backend: %s", e.message); - return 0; - } -+#endif - - uint os_count = 0; - string os_desc = ""; - -+#if PACKAGEKIT_BACKEND - var package_array = pk_updates.get_package_array (); - debug ("PackageKit backend reports %d updates", package_array.length); - -@@ -87,6 +90,7 @@ public class AppCenterCore.UpdateManager : Object { - ); - } - }); -+#endif - - os_updates.component.set_pkgnames ({}); - os_updates.change_information.clear_update_info (); -@@ -159,6 +163,7 @@ public class AppCenterCore.UpdateManager : Object { - count += 1; - } - -+#if PACKAGEKIT_BACKEND - pk_updates.get_details_array ().foreach ((pk_detail) => { - var pk_package = new Pk.Package (); - try { -@@ -181,6 +186,7 @@ public class AppCenterCore.UpdateManager : Object { - critical (e.message); - } - }); -+#endif - - os_updates.update_state (); - return count; -diff --git a/src/Views/Homepage.vala b/src/Views/Homepage.vala -index 3673903f..2e128e77 100644 ---- a/src/Views/Homepage.vala -+++ b/src/Views/Homepage.vala -@@ -107,9 +107,13 @@ public class AppCenter.Homepage : AbstractView { - column_spacing = 24, - orientation = Gtk.Orientation.VERTICAL - }; -+#if PACKAGEKIT_BACKEND - grid.add (banner_revealer); - grid.add (recently_updated_revealer); - grid.add (categories_label); -+#else -+ category_flow.margin_top = 12; -+#endif - grid.add (category_flow); - - scrolled_window = new Gtk.ScrolledWindow (null, null) { -diff --git a/src/meson.build b/src/meson.build -index 7b319fc6..d1d77931 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -12,10 +12,8 @@ appcenter_files = files( - 'Core/FlatpakBackend.vala', - 'Core/Job.vala', - 'Core/Package.vala', -- 'Core/PackageKitBackend.vala', - 'Core/ScreenshotCache.vala', - 'Core/Task.vala', -- 'Core/UbuntuDriversBackend.vala', - 'Core/UpdateManager.vala', - 'Dialogs/InstallFailDialog.vala', - 'Dialogs/NonCuratedWarningDialog.vala', -@@ -76,6 +74,14 @@ if get_option('hide_upstream_distro_apps') - args += '--define=HIDE_UPSTREAM_DISTRO_APPS' - endif - -+if get_option('packagekit_backend') -+ args += '--define=PACKAGEKIT_BACKEND' -+ appcenter_files += files( -+ 'Core/PackageKitBackend.vala', -+ 'Core/UbuntuDriversBackend.vala', -+ ) -+endif -+ - executable( - meson.project_name(), - appcenter_files, diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index bdc2fbca591a..bfbfb6d53d3d 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -5,9 +5,8 @@ , appstream-glib , dbus , desktop-file-utils -, elementary-gtk-theme -, elementary-icon-theme , fetchFromGitHub +, fetchpatch , flatpak , gettext , glib @@ -40,10 +39,14 @@ stdenv.mkDerivation rec { }; patches = [ - # Introduces a packagekit_backend meson flag. - # Makes appcenter actually work by using only the flatpak backend. - # https://github.com/elementary/appcenter/pull/1739 - ./add-packagekit-backend-option.patch + # Fix AppStream.PoolFlags being renamed + # Though the API break has been fixed in latest appstream, + # let's use the non-deprecated version anyway. + # https://github.com/elementary/appcenter/pull/1794 + (fetchpatch { + url = "https://github.com/elementary/appcenter/commit/84bc6400713484aa9365f0ba73f59c495da3f08b.patch"; + sha256 = "sha256-HNRCJ/5mRbEVjCq9nrXtdQOOk1Jj5jalApkghD8ecpk="; + }) ]; nativeBuildInputs = [ @@ -61,8 +64,6 @@ stdenv.mkDerivation rec { buildInputs = [ appstream - elementary-gtk-theme - elementary-icon-theme flatpak glib granite @@ -79,8 +80,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dpayments=false" "-Dcurated=false" - # This option is introduced in add-packagekit-backend-option.patch - "-Dpackagekit_backend=false" ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 115622e81435..703913998a45 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -14,7 +13,6 @@ , granite , libgee , libhandy -, elementary-icon-theme , appstream , wrapGAppsHook }: @@ -43,7 +41,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme granite gtk3 libgee diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 8cb9dcd18c62..f3bd37b00e06 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -2,28 +2,25 @@ , stdenv , fetchFromGitHub , nix-update-script -, pkg-config +, appstream-glib +, desktop-file-utils , meson , ninja +, pkg-config +, python3 , vala -, desktop-file-utils -, gtk3 +, wrapGAppsHook +, clutter +, evolution-data-server +, folks +, geoclue2 +, geocode-glib , granite +, gtk3 +, libchamplain , libgee , libhandy -, geoclue2 -, libchamplain -, clutter -, folks -, geocode-glib -, python3 -, libnotify , libical -, libgdata -, evolution-data-server -, appstream-glib -, elementary-icon-theme -, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -50,7 +47,6 @@ stdenv.mkDerivation rec { buildInputs = [ clutter - elementary-icon-theme evolution-data-server folks geoclue2 @@ -61,7 +57,6 @@ stdenv.mkDerivation rec { libgee libhandy libical - libnotify ]; postPatch = '' diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 7135795914d9..31dfa369818f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -3,25 +3,23 @@ , fetchFromGitHub , fetchpatch , nix-update-script -, pkg-config -, meson -, ninja -, vala +, appstream , desktop-file-utils -, python3 , gettext , libxml2 -, gtk3 +, meson +, ninja +, pkg-config +, python3 +, vala +, wrapGAppsHook +, glib , granite +, gst_all_1 +, gtk3 +, libcanberra , libgee , libhandy -, gst_all_1 -, libcanberra -, clutter-gtk -, clutter-gst -, elementary-icon-theme -, appstream -, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -58,19 +56,21 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - clutter-gst - clutter-gtk - elementary-icon-theme + glib granite - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) - gst_all_1.gstreamer gtk3 libcanberra libgee libhandy - ]; + ] ++ (with gst_all_1; [ + gst-plugins-bad + gst-plugins-base + # gtkSupport needed for gtksink + # https://github.com/elementary/camera/issues/181 + (gst-plugins-good.override { gtkSupport = true; }) + gst-plugins-ugly + gstreamer + ]); postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 073ea45cbc9b..f1cd335459e7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -3,29 +3,27 @@ , fetchFromGitHub , fetchpatch , nix-update-script -, pkg-config +, appstream +, desktop-file-utils , meson , ninja -, vala +, pkg-config +, polkit , python3 -, desktop-file-utils -, gtk3 -, granite -, libgee -, libhandy -, elementary-icon-theme -, appstream -, libpeas +, vala +, wrapGAppsHook , editorconfig-core-c +, granite +, gtk3 , gtksourceview4 , gtkspell3 +, libgee +, libgit2-glib +, libhandy +, libpeas , libsoup , vte -, webkitgtk , ctags -, libgit2-glib -, wrapGAppsHook -, polkit }: stdenv.mkDerivation rec { @@ -61,9 +59,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - ctags editorconfig-core-c - elementary-icon-theme granite gtk3 gtksourceview4 @@ -74,7 +70,6 @@ stdenv.mkDerivation rec { libpeas libsoup vte - webkitgtk ]; # ctags needed in path by outline plugin diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 9b760515ff8f..f589f4234ca5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -13,8 +13,6 @@ , granite , libgee , libhandy -, elementary-icon-theme -, elementary-gtk-theme , gettext , wrapGAppsHook , appstream @@ -52,10 +50,8 @@ stdenv.mkDerivation rec { buildInputs = [ appstream - elementary-icon-theme granite gtk3 - elementary-gtk-theme libgee libhandy glib diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 4b829321c37e..9147324b8867 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -21,10 +20,8 @@ , elementary-dock , bamf , sqlite -, libdbusmenu-gtk3 , zeitgeist , glib-networking -, elementary-icon-theme , libcloudproviders , libgit2-glib , wrapGAppsHook @@ -33,7 +30,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.1.1"; + version = "6.1.2"; outputs = [ "out" "dev" ]; @@ -41,18 +38,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-5TSzV8MQG81aCCR8yiCPhKJaLrp/fwf4mjP32KkcbbY="; + sha256 = "sha256-g9g4wJXjjudk4Qt96XGUiV/X86Ae2lqhM+psh9h+XFE="; }; - patches = [ - # Fix build with meson 0.61 - # https://github.com/elementary/files/pull/1973 - (fetchpatch { - url = "https://github.com/elementary/files/commit/28428fbda905ece59d3427a3a40e986fdf71a916.patch"; - sha256 = "sha256-GZTHAH9scQWrBqdrDI14cj57f61HD8o79zFcPCXjKmc="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils gettext @@ -68,13 +56,11 @@ stdenv.mkDerivation rec { buildInputs = [ bamf elementary-dock - elementary-icon-theme glib granite gtk3 libcanberra libcloudproviders - libdbusmenu-gtk3 libgee libgit2-glib libhandy diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 2963f98db40b..e56f85005de7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -16,7 +17,6 @@ , libgdata , sqlite , granite -, elementary-icon-theme , evolution-data-server , appstream , wrapGAppsHook @@ -34,6 +34,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-ooqVNMgeAqGlFcfachPPfhSiKTEEcNGv5oWdM7VLWOc="; }; + patches = [ + # Fix build with vala 0.56 + # https://github.com/elementary/mail/pull/765 + (fetchpatch { + url = "https://github.com/elementary/mail/commit/c3aa61d226f49147d7685cc00013469ff4df369a.patch"; + sha256 = "sha256-OxNBGIC1hrEaFSufQ59Wb0AMfdzqPt6diL4g3hbL/Ig="; + }) + ]; + nativeBuildInputs = [ appstream desktop-file-utils @@ -47,7 +56,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme evolution-data-server folks granite diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index d71835a6531a..f43234faa405 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -3,31 +3,24 @@ , fetchFromGitHub , fetchpatch , nix-update-script -, pkg-config +, desktop-file-utils , meson , ninja -, vala -, desktop-file-utils -, gtk3 -, granite +, pkg-config , python3 -, libgee -, clutter-gtk -, json-glib +, vala +, wrapGAppsHook +, glib +, granite +, gst_all_1 +, gtk3 , libgda +, libgee , libgpod , libhandy -, libnotify , libpeas -, libsoup -, zeitgeist -, gst_all_1 , taglib -, libdbusmenu -, libsignon-glib -, libaccounts-glib -, elementary-icon-theme -, wrapGAppsHook +, zeitgeist }: stdenv.mkDerivation rec { @@ -66,34 +59,24 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = with gst_all_1; [ - clutter-gtk - elementary-icon-theme + buildInputs = [ + glib granite + gtk3 + libgda + libgee + libgpod + libhandy + libpeas + taglib + zeitgeist + ] ++ (with gst_all_1; [ gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gstreamer - gtk3 - json-glib - libaccounts-glib - libdbusmenu - libgda - libgee - libgpod - libhandy - libnotify - libpeas - libsignon-glib - libsoup - taglib - zeitgeist - ]; - - mesonFlags = [ - "-Dplugins=audioplayer,cdrom,ipod" - ]; + ]); postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 12f6242eaafd..48cfda3df76d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , meson , ninja @@ -8,7 +9,6 @@ , vala , desktop-file-utils , gtk3 -, libaccounts-glib , libexif , libgee , libhandy @@ -24,25 +24,32 @@ , libsoup , sqlite , python3 -, scour , webkitgtk , libwebp , appstream , wrapGAppsHook -, elementary-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "elementary"; repo = "photos"; rev = version; - sha256 = "sha256-ja4ElW0FNm9oNyn+00SdI2Cxep6LyWTYM8Blc6bnuiY="; + sha256 = "sha256-NhF/WgS6IOwgALSCNyFNxz8ROVTb+mUX+lBtnWEyhEI="; }; + patches = [ + # Fix build with vala 0.56 + # https://github.com/elementary/photos/pull/711 + (fetchpatch { + url = "https://github.com/elementary/photos/commit/6594f1323726fb0d38519a7bdafe16f9170353cb.patch"; + sha256 = "sha256-Ie9ULC8Xw4KLQJANPXh4LDywMjWfniPX/P76eHW8LHc="; + }) + ]; + nativeBuildInputs = [ appstream desktop-file-utils @@ -54,19 +61,12 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = with gst_all_1; [ - elementary-icon-theme + buildInputs = [ geocode-glib gexiv2 granite - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gstreamer gtk3 json-glib - libaccounts-glib libexif libgee libgphoto2 @@ -76,10 +76,15 @@ stdenv.mkDerivation rec { librest libsoup libwebp - scour sqlite webkitgtk - ]; + ] ++ (with gst_all_1; [ + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gstreamer + ]); mesonFlags = [ "-Dplugins=false" diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index 9e65a562875a..48a68860dd94 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -14,7 +14,6 @@ , libgee , libhandy , libcanberra -, elementary-icon-theme , wrapGAppsHook }: @@ -49,7 +48,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme granite gtk3 libcanberra @@ -71,7 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Screenshot tool designed for elementary OS"; homepage = "https://github.com/elementary/screenshot"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = teams.pantheon.members; mainProgram = "io.elementary.screenshot"; diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index f220db8868de..c101e57e1ace 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -11,7 +11,6 @@ , vala , wrapGAppsHook , clutter-gtk -, elementary-icon-theme , evolution-data-server , granite , geoclue2 @@ -48,7 +47,6 @@ stdenv.mkDerivation rec { buildInputs = [ clutter-gtk - elementary-icon-theme evolution-data-server granite geoclue2 diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index f3402299ff78..fe6e5a40fa4d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -16,7 +16,6 @@ , libnotify , vte , libgee -, elementary-icon-theme , appstream , pcre2 , wrapGAppsHook @@ -55,7 +54,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme granite gtk3 libgee @@ -86,7 +84,7 @@ stdenv.mkDerivation rec { smart copy/paste, and little to no configuration. ''; homepage = "https://github.com/elementary/terminal"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = teams.pantheon.members; mainProgram = "io.elementary.terminal"; diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 494b50605e97..d4c03a076579 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -15,7 +15,6 @@ , clutter-gst , clutter-gtk , gst_all_1 -, elementary-icon-theme , wrapGAppsHook }: @@ -40,21 +39,21 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = with gst_all_1; [ + buildInputs = [ clutter-gst clutter-gtk - elementary-icon-theme granite + gtk3 + libgee + libhandy + ] ++ (with gst_all_1; [ gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gstreamer - gtk3 - libgee - libhandy - ]; + ]); postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index d93b158168f9..11ce2048ae41 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -2,8 +2,6 @@ , stdenv , desktop-file-utils , nix-update-script -, elementary-gtk-theme -, elementary-icon-theme , fetchFromGitHub , flatpak , gettext @@ -44,8 +42,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-gtk-theme - elementary-icon-theme flatpak glib granite diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch new file mode 100644 index 000000000000..657ea7a260c9 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch @@ -0,0 +1,82 @@ +From cc47fa33893e6840463ef8d59f9f4de4b7563726 Mon Sep 17 00:00:00 2001 +From: Bobby Rong +Date: Sat, 4 Dec 2021 22:00:38 +0800 +Subject: [PATCH] Add meson option for overlaying logo on wallpaper + +--- + meson.build | 8 ++++++++ + meson_options.txt | 1 + + src/Views/OperatingSystemView.vala | 8 ++++++++ + 3 files changed, 17 insertions(+) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index 2125de6e..cbe3cadd 100644 +--- a/meson.build ++++ b/meson.build +@@ -20,6 +20,14 @@ add_project_arguments( + vapi_dir = join_paths(meson.current_source_dir(), 'vapi') + add_project_arguments(['--vapidir', vapi_dir], language: 'vala') + ++vala_flags = [] ++ ++if get_option('wallpaper') ++ vala_flags += ['--define', 'WALLPAPER'] ++endif ++ ++add_project_arguments(vala_flags, language: 'vala') ++ + subdir('data') + subdir('src') + subdir('po') +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 00000000..8cef0bb3 +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1 @@ ++option('wallpaper', type : 'boolean', value : true, description : 'Overlay logo on default wallpaper') +diff --git a/src/Views/OperatingSystemView.vala b/src/Views/OperatingSystemView.vala +index fdb92e7e..6110d1aa 100644 +--- a/src/Views/OperatingSystemView.vala ++++ b/src/Views/OperatingSystemView.vala +@@ -39,6 +39,7 @@ public class About.OperatingSystemView : Gtk.Grid { + logo_icon_name = "distributor-logo"; + } + ++#if WALLPAPER + var logo = new Hdy.Avatar (128, "", false) { + // In case the wallpaper can't be loaded, we don't want an icon or text + icon_name = "invalid-icon-name", +@@ -53,6 +54,7 @@ public class About.OperatingSystemView : Gtk.Grid { + } + }); + logo.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++#endif + + var icon = new Gtk.Image () { + icon_name = logo_icon_name + "-symbolic", +@@ -64,9 +66,11 @@ public class About.OperatingSystemView : Gtk.Grid { + icon_style_context.add_class ("logo"); + icon_style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + ++#if WALLPAPER + var logo_overlay = new Gtk.Overlay (); + logo_overlay.add (logo); + logo_overlay.add_overlay (icon); ++#endif + + // Intentionally not using GLib.OsInfoKey.PRETTY_NAME here because we + // want more granular control over text formatting +@@ -145,7 +149,11 @@ public class About.OperatingSystemView : Gtk.Grid { + valign = Gtk.Align.CENTER, + vexpand = true + }; ++#if WALLPAPER + software_grid.attach (logo_overlay, 0, 0, 1, 4); ++#else ++ software_grid.attach (icon, 0, 0, 1, 4); ++#endif + software_grid.attach (title, 1, 0, 3); + + software_grid.attach (kernel_version_label, 1, 2, 3); diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 03964284ed73..82eece370dd8 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , nix-update-script -, substituteAll , meson , ninja , pkg-config @@ -15,7 +14,6 @@ , switchboard , fwupd , appstream -, nixos-artwork }: stdenv.mkDerivation rec { @@ -30,11 +28,10 @@ stdenv.mkDerivation rec { }; patches = [ - # Use NixOS's default wallpaper - (substituteAll { - src = ./fix-background-path.patch; - default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; - }) + # Introduces a wallpaper meson flag. + # The wallpapaper path does not exist on NixOS, let's just remove the wallpaper. + # https://github.com/elementary/switchboard-plug-about/pull/236 + ./add-wallpaper-option.patch ]; nativeBuildInputs = [ @@ -55,6 +52,11 @@ stdenv.mkDerivation rec { switchboard ]; + mesonFlags = [ + # This option is introduced in add-wallpaper-option.patch + "-Dwallpaper=false" + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-background-path.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-background-path.patch deleted file mode 100644 index 6fea88691331..000000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-background-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Views/OperatingSystemView.vala b/src/Views/OperatingSystemView.vala -index fdb92e7e..4161538e 100644 ---- a/src/Views/OperatingSystemView.vala -+++ b/src/Views/OperatingSystemView.vala -@@ -47,7 +47,7 @@ public class About.OperatingSystemView : Gtk.Grid { - }; - logo.set_image_load_func ((size) => { - try { -- return new Gdk.Pixbuf.from_file_at_scale ("/usr/share/backgrounds/elementaryos-default", -1, size, true); -+ return new Gdk.Pixbuf.from_file_at_scale ("@default_wallpaper@", -1, size, true); - } catch (Error e) { - critical (e.message); - } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 64a3083c6c2c..fbad5aa7a012 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-network"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0nqihsbrpjw4nx1c50g854bqybniw38adi78vzg8nyl6ikj2r0z4"; + sha256 = "sha256-CdSX4p98HQNC0VF5Ae/ZnDqm000+9KJ6JhQWhSHC4CI="; }; patches = [ diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 209fa1202f3b..ee43903a00a1 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -13,7 +13,6 @@ , libhandy , granite , gettext -, elementary-icon-theme , wrapGAppsHook }: @@ -39,7 +38,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme granite gtk3 libgee diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index 7953105951c6..e42df9bee060 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -19,7 +19,8 @@ let testingName = lib.optionalString (testName != null) "${testName}-"; in stdenv.mkDerivation rec { - name = "${testingName}${switchboard.name}-with-plugs"; + pname = "${testingName}${switchboard.pname}-with-plugs"; + inherit (switchboard) version; src = null; diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 304e07749c85..558c61d986ad 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GTK theme designed to be smooth, attractive, fast, and usable"; homepage = "https://github.com/elementary/stylesheet"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = teams.pantheon.members; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 40522bbf02a6..046f1fbdc979 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { An original set of vector icons designed specifically for elementary OS and its desktop environment: Pantheon. ''; homepage = "https://github.com/elementary/icons"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = teams.pantheon.members; }; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 617c6ed086da..a3d5f873cbcb 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -83,10 +83,6 @@ lib.makeScope pkgs.newScope (self: with self; { epiphany = pkgs.epiphany.override { withPantheon = true; }; - evince = pkgs.evince.override { withPantheon = true; }; - - file-roller = pkgs.gnome.file-roller.override { withPantheon = true; }; - sideload = callPackage ./apps/sideload { }; #### DESKTOP @@ -109,9 +105,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (gnome) file-roller; }; - gala = callPackage ./desktop/gala { - inherit (gnome) gnome-desktop; - }; + gala = callPackage ./desktop/gala { }; gnome-bluetooth-contract = callPackage ./desktop/gnome-bluetooth-contract { inherit (gnome) gnome-bluetooth; @@ -161,7 +155,9 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-notifications = callPackage ./desktop/wingpanel-indicators/notifications { }; - wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { }; + wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { + inherit (gnome) gnome-power-manager; + }; wingpanel-indicator-session = callPackage ./desktop/wingpanel-indicators/session { }; @@ -197,9 +193,7 @@ lib.makeScope pkgs.newScope (self: with self; { switchboard-plug-onlineaccounts = callPackage ./apps/switchboard-plugs/onlineaccounts { }; - switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell { - inherit (gnome) gnome-desktop; - }; + switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell { }; switchboard-plug-power = callPackage ./apps/switchboard-plugs/power { }; @@ -232,18 +226,24 @@ lib.makeScope pkgs.newScope (self: with self; { # Please call these packages in pkgs/top-level/all-packages.nix instead of this file. # https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654 -} // lib.optionalAttrs (config.allowAliases or true) { +}) // lib.optionalAttrs (config.allowAliases or true) { ### ALIASES - inherit (pkgs) vala; # added 2019-10-10 + # They need to be outside the scope or they will shadow the attributes from parent scope. - cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1."; + vala = throw "The ‘pantheon.vala’ alias was removed on 2022-02-02, please use ‘pkgs.vala’ directly."; # added 2019-10-10 - elementary-screenshot-tool = elementary-screenshot; # added 2021-07-21 + cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1."; # added 2020-04-06 + + elementary-screenshot-tool = throw "The ‘pantheon.elementary-screenshot-tool’ alias was removed on 2022-02-02, please use ‘pantheon.elementary-screenshot’ directly."; # added 2021-07-21 + + evince = pkgs.gnome.evince; # added 2022-03-18 extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01 - inherit (pkgs) notes-up; # added 2021-12-18 + file-roller = pkgs.gnome.file-roller; # added 2022-03-12 -}) + notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18 + +} diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 393186325baf..a42ae92e97af 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -47,8 +47,7 @@ stdenv.mkDerivation rec { ''; preInstall = '' - # Install our override for plank dockitems as Appcenter is not ready to be preinstalled. - # See: https://github.com/NixOS/nixpkgs/issues/70214. + # Install our override for plank dockitems as the desktop file path is different. schema_dir=$out/share/glib-2.0/schemas install -D ${./overrides/plank-dockitems.gschema.override} $schema_dir/plank-dockitems.gschema.override diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem new file mode 100644 index 000000000000..586a74df2447 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.appcenter.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///run/current-system/sw/share/applications/io.elementary.appcenter.desktop diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override b/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override index 426368e8473b..0ba89fa4b40b 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override @@ -1,2 +1,2 @@ [net.launchpad.plank.dock.settings] -dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem'] +dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.tasks.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem'] diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 38de716394db..06fbfdc078e2 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , linkFarm , substituteAll @@ -31,13 +30,13 @@ stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = "greeter"; rev = version; - sha256 = "1f606ds56sp1c58q8dblfpaq9pwwkqw9i4gkwksw45m2xkwlbflq"; + sha256 = "sha256-0chBM8JuCYgZXHneiSxSICZwBVm2Vgx+bas9wUjbnyg="; }; patches = [ @@ -47,24 +46,6 @@ stdenv.mkDerivation rec { src = ./hardcode-fallback-background.patch; default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; }) - # Revert "UserCard: use accent color for logged_in check (#566)" - # https://github.com/elementary/greeter/pull/566 - # Fixes crash issue reported in: - # https://github.com/elementary/greeter/issues/578 - # https://github.com/NixOS/nixpkgs/issues/151609 - # Probably also fixes: - # https://github.com/elementary/greeter/issues/568 - # https://github.com/elementary/greeter/issues/583 - # https://github.com/NixOS/nixpkgs/issues/140513 - # Revisit this when the greeter is ported to GTK 4: - # https://github.com/elementary/greeter/pull/591 - ./revert-pr566.patch - # Fix build with meson 0.61 - # https://github.com/elementary/greeter/pull/590 - (fetchpatch { - url = "https://github.com/elementary/greeter/commit/a4b25244058fce794a9f13f6b22a8ff7735ebde9.patch"; - sha256 = "sha256-qPXhdvmYG8YMDU/CjbEkfZ0glgRzxnu0TsOPtvWHxLY="; - }) ]; nativeBuildInputs = [ @@ -79,7 +60,6 @@ stdenv.mkDerivation rec { buildInputs = [ accountsservice clutter-gtk # else we get could not generate cargs for mutter-clutter-2 - elementary-gtk-theme elementary-icon-theme gnome-settings-daemon gdk-pixbuf @@ -89,7 +69,6 @@ stdenv.mkDerivation rec { libhandy lightdm mutter - wingpanel-with-indicators ]; mesonFlags = [ @@ -111,8 +90,11 @@ stdenv.mkDerivation rec { # for the compositor --prefix PATH : "$out/bin" - # the theme is hardcoded + # the GTK theme is hardcoded --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share" + + # the icon theme is hardcoded + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ) ''; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/revert-pr566.patch b/pkgs/desktops/pantheon/desktop/elementary-greeter/revert-pr566.patch deleted file mode 100644 index ed05ba24b86a..000000000000 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/revert-pr566.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 572a73cbc84dd9a0f5a7667a60c75ed5580d84a1 Mon Sep 17 00:00:00 2001 -From: Bobby Rong -Date: Tue, 25 Jan 2022 10:03:31 +0800 -Subject: [PATCH] Revert "UserCard: use accent color for logged_in check - (#566)" - -This reverts commit 6f18c79c780582e43039032f6926816efa82e206. ---- - data/Check.css | 11 ----------- - data/greeter.gresource.xml | 1 - - src/Cards/UserCard.vala | 29 +++-------------------------- - 3 files changed, 3 insertions(+), 38 deletions(-) - delete mode 100644 data/Check.css - -diff --git a/data/Check.css b/data/Check.css -deleted file mode 100644 -index 947db6b..0000000 ---- a/data/Check.css -+++ /dev/null -@@ -1,11 +0,0 @@ --check { -- background-color: @accent_color; -- border-radius: 99px; -- color: white; -- margin: 2px; -- min-height: 20px; -- min-width: 20px; -- -gtk-icon-shadow: 0 1px 1px shade(@accent_color, 0.7); -- -gtk-icon-source: -gtk-icontheme("check-active-symbolic"); -- -gtk-icon-transform: scale(0.6); --} -diff --git a/data/greeter.gresource.xml b/data/greeter.gresource.xml -index 604c89a..ce9be29 100644 ---- a/data/greeter.gresource.xml -+++ b/data/greeter.gresource.xml -@@ -2,7 +2,6 @@ - - - Card.css -- Check.css - DateTime.css - MainWindow.css - -diff --git a/src/Cards/UserCard.vala b/src/Cards/UserCard.vala -index 83df22c..02d2b0a 100644 ---- a/src/Cards/UserCard.vala -+++ b/src/Cards/UserCard.vala -@@ -42,7 +42,6 @@ public class Greeter.UserCard : Greeter.BaseCard { - private Gtk.Stack login_stack; - private Greeter.PasswordEntry password_entry; - -- private unowned Gtk.StyleContext logged_in_context; - private weak Gtk.StyleContext main_grid_style_context; - private weak Gtk.StyleContext password_entry_context; - -@@ -214,14 +213,10 @@ public class Greeter.UserCard : Greeter.BaseCard { - }; - avatar_overlay.add (avatar); - -- var logged_in = new SelectionCheck () { -- halign = Gtk.Align.END, -- valign = Gtk.Align.END -- }; -- -- logged_in_context = logged_in.get_style_context (); -- - if (lightdm_user.logged_in) { -+ var logged_in = new Gtk.Image.from_icon_name ("selection-checked", Gtk.IconSize.LARGE_TOOLBAR); -+ logged_in.halign = logged_in.valign = Gtk.Align.END; -+ - avatar_overlay.add_overlay (logged_in); - - session_button.sensitive = false; -@@ -304,7 +299,6 @@ public class Greeter.UserCard : Greeter.BaseCard { - gtksettings.gtk_theme_name = "io.elementary.stylesheet." + accent_to_string (prefers_accent_color); - - var style_provider = Gtk.CssProvider.get_named (gtksettings.gtk_theme_name, null); -- logged_in_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - password_entry_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - } - -@@ -451,21 +445,4 @@ public class Greeter.UserCard : Greeter.BaseCard { - return GLib.Source.REMOVE; - }); - } -- -- private class SelectionCheck : Gtk.Spinner { -- private static Gtk.CssProvider check_provider; -- -- class construct { -- set_css_name (Gtk.STYLE_CLASS_CHECK); -- } -- -- static construct { -- check_provider = new Gtk.CssProvider (); -- check_provider.load_from_resource ("/io/elementary/greeter/Check.css"); -- } -- -- construct { -- get_style_context ().add_provider (check_provider, Gtk.STYLE_PROVIDER_PRIORITY_USER); -- } -- } - } diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index 1f8c811d9d10..dd6b10f5c830 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -2,7 +2,6 @@ , runCommand , mutter , elementary-default-settings -, nixos-artwork , glib , gala , epiphany diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index c5c8810c6c5e..fa4ff7edf12e 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -13,8 +13,6 @@ , glib , granite , libgee -, elementary-icon-theme -, elementary-gtk-theme , elementary-settings-daemon , gettext , libhandy @@ -57,8 +55,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-gtk-theme - elementary-icon-theme elementary-settings-daemon # settings schema glib granite diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 1d4a1cb74146..3cf7cd365f16 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -14,7 +14,6 @@ , granite , libgee , libhandy -, elementary-icon-theme , wrapGAppsHook }: @@ -49,7 +48,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-icon-theme glib granite gtk3 diff --git a/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix b/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix index 9f4d275f2462..c9a24b4906c7 100644 --- a/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix +++ b/pkgs/desktops/pantheon/desktop/file-roller-contract/default.nix @@ -1,13 +1,14 @@ { lib , stdenv , fetchFromGitHub +, unstableGitUpdater , substituteAll , file-roller }: stdenv.mkDerivation rec { pname = "file-roller-contract"; - version = "unstable-2021-02-23"; + version = "unstable-2021-02-22"; src = fetchFromGitHub { owner = "elementary"; @@ -36,6 +37,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = unstableGitUpdater { + url = "https://github.com/elementary/file-roller-contract.git"; + }; + }; + meta = with lib; { description = "Contractor extension for File Roller"; homepage = "https://github.com/elementary/file-roller-contract"; diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 5a5af9ca5b98..75447adf4a26 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -19,7 +19,6 @@ , gnome-desktop , mutter , clutter -, elementary-icon-theme , gnome-settings-daemon , wrapGAppsHook , gexiv2 @@ -67,7 +66,6 @@ stdenv.mkDerivation rec { buildInputs = [ bamf clutter - elementary-icon-theme gnome-settings-daemon gexiv2 gnome-desktop diff --git a/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix b/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix index 36f4d3e539f0..190514392098 100644 --- a/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix +++ b/pkgs/desktops/pantheon/desktop/gnome-bluetooth-contract/default.nix @@ -1,13 +1,14 @@ { lib , stdenv , fetchFromGitHub +, unstableGitUpdater , substituteAll , gnome-bluetooth }: stdenv.mkDerivation rec { pname = "gnome-bluetooth-contract"; - version = "unstable-2021-02-23"; + version = "unstable-2021-02-22"; src = fetchFromGitHub { owner = "elementary"; @@ -36,11 +37,20 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + updateScript = unstableGitUpdater { + url = "https://github.com/elementary/gnome-bluetooth-contract.git"; + }; + }; + meta = with lib; { description = "Contractor extension for GNOME Bluetooth"; homepage = "https://github.com/elementary/gnome-bluetooth-contract"; license = licenses.gpl3Plus; maintainers = teams.pantheon.members; platforms = platforms.linux; + # sendto device selection is removed in gnome-bluetooth 42 + # https://github.com/elementary/gnome-bluetooth-contract/issues/1 + broken = true; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 6c300536b2f8..ac9803495574 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , substituteAll , nix-update-script -, gnome +, gnome-power-manager , pkg-config , meson , python3 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - gnome_power_manager = gnome.gnome-power-manager; + gnome_power_manager = gnome-power-manager; }) ]; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 2e3f51b4a6a6..b996fdfdd6e5 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - elementary-gtk-theme elementary-icon-theme gala granite @@ -64,8 +63,11 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - # this theme is required + # this GTK theme is required --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share" + + # the icon theme is required + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ) ''; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix index ca887d45dc39..89a359a4c9d2 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix @@ -17,7 +17,8 @@ let else indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators); in stdenv.mkDerivation rec { - name = "${wingpanel.name}-with-indicators"; + pname = "${wingpanel.pname}-with-indicators"; + inherit (wingpanel) version; src = null; diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index ec2255bbbc19..f817a3017b7a 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, nix-update-script , python3 , meson , ninja @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "6.2.0"; + version = "6.2.0"; # nixpkgs-update: no auto update outputs = [ "out" "dev" ]; @@ -52,12 +51,6 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - meta = with lib; { description = "An extension to GTK used by elementary OS"; longDescription = '' diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 588061b22e1b..24ce7b5ad56b 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -20,24 +19,15 @@ stdenv.mkDerivation rec { pname = "elementary-capnet-assist"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "elementary"; repo = "capnet-assist"; rev = version; - sha256 = "sha256-UdkS+w61c8z2TCJyG7YsDb0n0b2LOpFyaHzMbdCJsZI="; + sha256 = "sha256-8hhp37EBzZxEVvPaRw9PohjaPWKQZ/AfqqvwLxQCBKk="; }; - patches = [ - # Fix build with meson 0.61 - # https://github.com/elementary/capnet-assist/pull/76 - (fetchpatch { - url = "https://github.com/elementary/capnet-assist/commit/0e77bf8023ba1b35e3a5badb72c246cabf6552b9.patch"; - sha256 = "sha256-B/KEs/TCxR+i3uQSRtWxTi2+cu0n6QLcfKCbMCvSsvs="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils meson diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix index 3ceff2095d2b..614be5603a8e 100644 --- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-pantheon"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "portals"; rev = version; - sha256 = "sha256-8gBMjCMEzrFmKHhkXsgcIESC93EOT0ADkRUIJMmerjw="; + sha256 = "sha256-YICNOeNrpO2tJFyULjQEhZQCrrMyQau59EC7c5K9q40="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix index 6e3fbf5777bc..7e153293bbc0 100644 --- a/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix +++ b/pkgs/desktops/pantheon/third-party/wingpanel-indicator-ayatana/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, unstableGitUpdater , substituteAll , meson , ninja @@ -45,6 +46,12 @@ stdenv.mkDerivation rec { pantheon.wingpanel ]; + passthru = { + updateScript = unstableGitUpdater { + url = "https://github.com/Lafydev/wingpanel-indicator-ayatana.git"; + }; + }; + meta = with lib; { description = "Ayatana Compatibility Indicator for Wingpanel"; homepage = "https://github.com/Lafydev/wingpanel-indicator-ayatana"; diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix index 3e9920cf6299..cfa58c0078ea 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "bismuth"; - version = "2.2.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "Bismuth-Forge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ntfLijYPaOHvQToiAxuBZ5ayHPyQyevP9l6++SL0vUw="; + sha256 = "sha256-6kSqZtJijQBqvYcyAoSRLl/RxgUubst2SJw/adiBIj4="; }; cmakeFlags = [ diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix new file mode 100644 index 000000000000..caf3819a3611 --- /dev/null +++ b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchFromGitLab, python3 }: +let + pythonEnv = python3.withPackages (p: with p; [ dbus-python pygobject3 ]); +in +stdenv.mkDerivation rec { + pname = "krunner-ssh"; + version = "1.0"; + + src = fetchFromGitLab { + owner = "Programie"; + repo = "krunner-ssh"; + rev = version; + sha256 = "sha256-rFTTvmetDeN6t0axVc+8t1TRiuyPBpwqhvsq2IFxa/A="; + }; + + postPatch = '' + sed -e "s|Exec=.*|Exec=$out/libexec/runner.py|" -i ssh-runner.service + ''; + + nativeBuildInputs = [ + pythonEnv + ]; + + installPhase = '' + runHook preInstall + + patchShebangs runner.py + + install -m 0755 -D runner.py $out/libexec/runner.py + install -m 0755 -D ssh-runner.desktop $out/share/kservices5/ssh-runner.desktop + install -m 0755 -D ssh-runner.service $out/share/dbus-1/services/com.selfcoders.ssh-runner.service + + runHook postInstall + ''; + + meta = with lib; { + description = "A simple backend for KRunner providing SSH hosts from your .ssh/known_hosts file as search results"; + homepage = "https://selfcoders.com/projects/krunner-ssh"; + license = licenses.mit; + maintainers = with maintainers; [ aanderse ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix index 95480bc5b968..23802bef97bd 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "krohnkite"; - version = "0.7"; + version = "0.8.2"; src = fetchFromGitHub { owner = "esjeon"; repo = "krohnkite"; rev = "v${version}"; - sha256 = "0j3rm1w6d545qlmx02xs72b5zsigm48hp7lp7yh30z3cjqm00aap"; + hash = "sha256-HZCD5884pHuHey+d+HRx/F/Sp1b6ZUy7MdqqZ08H0lU="; }; buildInputs = [ diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix index d7816de30422..5de935b9ec23 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix @@ -30,7 +30,7 @@ mkDerivation rec { meta = with lib; { description = "Look at your windows and desktops from above."; license = licenses.gpl3Only; - maintainers = with maintainers; [ mjlbach ]; + maintainers = with maintainers; [ ]; inherit (src.meta) homepage; inherit (kwindowsystem.meta) platforms; }; diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index db1e46f6d4e8..0474d875997f 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "bluedevil"; + pname = "bluedevil"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ qtbase qtdeclarative bluez-qt diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix index eed396b54375..24d0c96cad97 100644 --- a/pkgs/desktops/plasma-5/breeze-grub.nix +++ b/pkgs/desktops/plasma-5/breeze-grub.nix @@ -3,7 +3,7 @@ }: mkDerivation { - name = "breeze-grub"; + pname = "breeze-grub"; installPhase = '' runHook preInstall diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix index bff3546aa330..b499ab034e50 100644 --- a/pkgs/desktops/plasma-5/breeze-gtk.nix +++ b/pkgs/desktops/plasma-5/breeze-gtk.nix @@ -3,7 +3,7 @@ let inherit (lib) getLib; in mkDerivation { - name = "breeze-gtk"; + pname = "breeze-gtk"; nativeBuildInputs = [ extra-cmake-modules sassc python3 python3.pkgs.pycairo breeze-qt5 ]; buildInputs = [ qtbase ]; patches = [ diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix index 9127b7fecb6e..bc60662b434a 100644 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix @@ -24,7 +24,7 @@ in mkDerivation { - name = "breeze-plymouth"; + pname = "breeze-plymouth"; nativeBuildInputs = [ extra-cmake-modules ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ]; buildInputs = [ plymouth ]; patches = [ diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix index 3f3222e05cdb..13a426bb2587 100644 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5/breeze-qt5.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "breeze-qt5"; + pname = "breeze-qt5"; sname = "breeze"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 0eafc182e46f..54534f63f7d1 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -76,8 +76,8 @@ let mkDerivation = args: let - inherit (args) name; - sname = args.sname or name; + inherit (args) pname; + sname = args.sname or pname; inherit (srcs.${sname}) src version; outputs = args.outputs or [ "out" ]; @@ -98,8 +98,7 @@ let }; in mkDerivation (args // { - name = "${name}-${version}"; - inherit meta outputs setupHook src; + inherit pname version meta outputs setupHook src; }); }; @@ -134,10 +133,10 @@ let milou = callPackage ./milou.nix {}; oxygen = callPackage ./oxygen.nix {}; plasma-browser-integration = callPackage ./plasma-browser-integration.nix {}; - plasma-phone-components = callPackage ./plasma-phone-components {}; plasma-desktop = callPackage ./plasma-desktop {}; plasma-disks = callPackage ./plasma-disks.nix {}; plasma-integration = callPackage ./plasma-integration {}; + plasma-mobile = callPackage ./plasma-mobile {}; plasma-nano = callPackage ./plasma-nano {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; @@ -161,6 +160,7 @@ let kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; + krunner-ssh = callPackage ./3rdparty/addons/krunner-ssh.nix { }; krunner-symbols = callPackage ./3rdparty/addons/krunner-symbols.nix { }; lightly = callPackage ./3rdparty/lightly { }; parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { }; @@ -168,6 +168,7 @@ let } // lib.optionalAttrs (config.allowAliases or true) { ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor"; + plasma-phone-components = throw "'plasma-phone-components' has been renamed to/replaced by 'plasma-mobile'"; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix index e065837cd2fd..dd6c7a3008ca 100644 --- a/pkgs/desktops/plasma-5/discover.nix +++ b/pkgs/desktops/plasma-5/discover.nix @@ -32,7 +32,7 @@ }: mkDerivation { - name = "discover"; + pname = "discover"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 ]; buildInputs = [ # discount is needed for libmarkdown diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index b0e706602b69..f517cc6371f2 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.23.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.3/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix index 47543da11144..57800c316aa7 100644 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kactivitymanagerd"; + pname = "kactivitymanagerd"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix index d84b7bc98019..02694b085f89 100644 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kde-cli-tools"; + pname = "kde-cli-tools"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index 798f8d807af1..6949f73a9ce7 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kde-gtk-config"; + pname = "kde-gtk-config"; nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ]; dontWrapGApps = true; # There is nothing to wrap buildInputs = [ diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix index 9b67d7bc5293..86d146c8b41a 100644 --- a/pkgs/desktops/plasma-5/kdecoration.nix +++ b/pkgs/desktops/plasma-5/kdecoration.nix @@ -1,8 +1,8 @@ -{ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n }: +{ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n, kcoreaddons }: mkDerivation { - name = "kdecoration"; + pname = "kdecoration"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ki18n ]; + buildInputs = [ qtbase ki18n kcoreaddons ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index 77e3cad8d487..5be47327d723 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kdeplasma-addons"; + pname = "kdeplasma-addons"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets kcoreaddons kcmutils kholidays kio diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index d371ce815107..be5b191c3de7 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kgamma5"; + pname = "kgamma5"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ]; } diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index fd366443861b..dfd5d4668a22 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "khotkeys"; + pname = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index e9b9f5148164..662662cdb2fd 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kinfocenter"; + pname = "kinfocenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix index c0cfebcdc0c2..6a9d055abe43 100644 --- a/pkgs/desktops/plasma-5/kmenuedit.nix +++ b/pkgs/desktops/plasma-5/kmenuedit.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kmenuedit"; + pname = "kmenuedit"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdbusaddons khotkeys ki18n kiconthemes kio kxmlgui sonnet diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index 11b0f38fed05..36eea905739e 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kscreen"; + pname = "kscreen"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index e6c70f8e8cc2..b37bbc6c8456 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kscreenlocker"; + pname = "kscreenlocker"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcrash kdeclarative kglobalaccel kidletime kwayland diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix index bc6702ed6d3f..4cbf08044934 100644 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ksshaskpass"; + pname = "ksshaskpass"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ]; } diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix index f117872ce5c4..d5f96e42981b 100644 --- a/pkgs/desktops/plasma-5/ksystemstats.nix +++ b/pkgs/desktops/plasma-5/ksystemstats.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "ksystemstats"; + pname = "ksystemstats"; NIX_CFLAGS_COMPILE = [ "-I${lib.getBin libksysguard}/share" ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libksysguard libnl lm_sensors networkmanager-qt ]; diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix index 590c523e9d74..dcc139bcafdf 100644 --- a/pkgs/desktops/plasma-5/kwallet-pam.nix +++ b/pkgs/desktops/plasma-5/kwallet-pam.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, kwallet, }: mkDerivation { - name = "kwallet-pam"; + pname = "kwallet-pam"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ pam socat libgcrypt qtbase kwallet ]; postPatch = '' diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index 02e963ba9049..5462814e8de2 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kwayland-integration"; + pname = "kwayland-integration"; nativeBuildInputs = [ extra-cmake-modules wayland-scanner ]; buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase wayland-protocols wayland ]; } diff --git a/pkgs/desktops/plasma-5/kwayland-server/default.nix b/pkgs/desktops/plasma-5/kwayland-server/default.nix index f24e0e6d6a04..e71b98b1b946 100644 --- a/pkgs/desktops/plasma-5/kwayland-server/default.nix +++ b/pkgs/desktops/plasma-5/kwayland-server/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kwayland-server"; + pname = "kwayland-server"; nativeBuildInputs = [ cmake extra-cmake-modules #kdoctools diff --git a/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch b/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch index e6ab62caf714..9bade4eab6a9 100644 --- a/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch +++ b/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch @@ -63,11 +63,11 @@ index 0000000..726065d + +}// namespace + -+#endif // SERVICE_UTILS_H -diff --git a/src/service_utils.h b/src/service_utils.h ++#endif // NIXOS_UTILS_H +diff --git a/src/utils/serviceutils.h b/src/utils/serviceutils.h index 8a70c1f..475b15d 100644 ---- a/src/service_utils.h -+++ b/src/service_utils.h +--- a/src/utils/serviceutils.h ++++ b/src/utils/serviceutils.h @@ -19,6 +19,7 @@ #include //KF diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 36f0da9e9611..db0485db8873 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -18,7 +18,7 @@ # TODO (ttuegel): investigate qmlplugindump failure mkDerivation { - name = "kwin"; + pname = "kwin"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix index bb8798d2d0e0..9ba1afaf9f83 100644 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ b/pkgs/desktops/plasma-5/kwrited.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kwrited"; + pname = "kwrited"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ]; } diff --git a/pkgs/desktops/plasma-5/layer-shell-qt.nix b/pkgs/desktops/plasma-5/layer-shell-qt.nix index 9e18bbb4bff5..812637795531 100644 --- a/pkgs/desktops/plasma-5/layer-shell-qt.nix +++ b/pkgs/desktops/plasma-5/layer-shell-qt.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "layer-shell-qt"; + pname = "layer-shell-qt"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase wayland-scanner wayland wayland-protocols ]; } diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index ae623a80d7d9..6798a2cdcb0e 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "libkscreen"; + pname = "libkscreen"; nativeBuildInputs = [ extra-cmake-modules wayland-scanner ]; buildInputs = [ kwayland plasma-wayland-protocols wayland libXrandr qtx11extras ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch index cda82e08442e..ec4a34037dcb 100644 --- a/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch @@ -11,11 +11,10 @@ diff --git a/processui/scripting.cpp b/processui/scripting.cpp index efed8ff..841761a 100644 --- a/processui/scripting.cpp +++ b/processui/scripting.cpp -@@ -167,7 +167,7 @@ void Scripting::loadContextMenu() { - QStringList scripts; +@@ -293,7 +293,7 @@ void Scripting::loadContextMenu() const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("ksysguard/scripts/"), QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { + for (const QString &dir : dirs) { - QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); + QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); while (it.hasNext()) { diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index 19bbc6390c98..ef4e44384448 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "libksysguard"; + pname = "libksysguard"; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index 0e7169abf6f6..8ae5061436d1 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "milou"; + pname = "milou"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix index 6eea3c923197..78603c3c306a 100644 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ b/pkgs/desktops/plasma-5/oxygen.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "oxygen"; + pname = "oxygen"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons diff --git a/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/pkgs/desktops/plasma-5/plasma-browser-integration.nix index e9ad3c28c101..1ddd844444d8 100644 --- a/pkgs/desktops/plasma-5/plasma-browser-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-browser-integration.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "plasma-browser-integration"; + pname = "plasma-browser-integration"; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 457902ad1855..6c8d8a3bc4b6 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -17,7 +17,7 @@ }: mkDerivation { - name = "plasma-desktop"; + pname = "plasma-desktop"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver diff --git a/pkgs/desktops/plasma-5/plasma-disks.nix b/pkgs/desktops/plasma-5/plasma-disks.nix index f97b061292a5..8ddd53548e75 100644 --- a/pkgs/desktops/plasma-5/plasma-disks.nix +++ b/pkgs/desktops/plasma-5/plasma-disks.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "plasma-disks"; + pname = "plasma-disks"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice diff --git a/pkgs/desktops/plasma-5/plasma-integration/default.nix b/pkgs/desktops/plasma-5/plasma-integration/default.nix index f69644287624..9febc5172d48 100644 --- a/pkgs/desktops/plasma-5/plasma-integration/default.nix +++ b/pkgs/desktops/plasma-5/plasma-integration/default.nix @@ -8,7 +8,7 @@ # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration mkDerivation { - name = "plasma-integration"; + pname = "plasma-integration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland diff --git a/pkgs/desktops/plasma-5/plasma-phone-components/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix similarity index 90% rename from pkgs/desktops/plasma-5/plasma-phone-components/default.nix rename to pkgs/desktops/plasma-5/plasma-mobile/default.nix index d925d7e408b5..be628de65408 100644 --- a/pkgs/desktops/plasma-5/plasma-phone-components/default.nix +++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix @@ -7,7 +7,7 @@ kdeclarative, kdelibs4support, kpeople, kconfig, krunner, kinit, kwayland, kwin, plasma-framework, telepathy, libphonenumber, protobuf, libqofono, modemmanager-qt, - plasma-workspace, + networkmanager-qt, plasma-workspace, maliit-framework, maliit-keyboard, qtwayland, qttools @@ -16,14 +16,14 @@ let inherit (lib) getBin getLib; in mkDerivation { - name = "plasma-phone-components"; + pname = "plasma-mobile"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ appstream libdbusmenu pam wayland kdeclarative kdelibs4support kpeople kconfig krunner kinit kwayland kwin plasma-framework telepathy libphonenumber protobuf libqofono modemmanager-qt - maliit-framework maliit-keyboard + networkmanager-qt maliit-framework maliit-keyboard ]; postPatch = '' diff --git a/pkgs/desktops/plasma-5/plasma-nano/default.nix b/pkgs/desktops/plasma-5/plasma-nano/default.nix index 0960eec33f2d..6e2608c7f97b 100644 --- a/pkgs/desktops/plasma-5/plasma-nano/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nano/default.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "plasma-nano"; + pname = "plasma-nano"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ plasma-framework diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index 5c82112f3b15..54c8079cf5f4 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -11,7 +11,7 @@ }: mkDerivation { - name = "plasma-nm"; + pname = "plasma-nm"; nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ kdeclarative ki18n kio kwindowsystem plasma-framework kcompletion diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index bc39e520f8a6..9e47356579e3 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "plasma-pa"; + pname = "plasma-pa"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop diff --git a/pkgs/desktops/plasma-5/plasma-sdk.nix b/pkgs/desktops/plasma-5/plasma-sdk.nix index e82fc4d0602c..8ab2d635b28d 100644 --- a/pkgs/desktops/plasma-5/plasma-sdk.nix +++ b/pkgs/desktops/plasma-5/plasma-sdk.nix @@ -20,7 +20,7 @@ }: mkDerivation { - name = "plasma-sdk"; + pname = "plasma-sdk"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive diff --git a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix index f69808bf4528..80a54c93d58b 100644 --- a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix +++ b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix @@ -11,11 +11,14 @@ , kitemviews , knewstuff , libksysguard +, kquickcharts +, ksystemstats +, qqc2-desktop-style , qtbase }: mkDerivation { - name = "plasma-systemmonitor"; + pname = "plasma-systemmonitor"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ qtquickcontrols2 @@ -27,5 +30,8 @@ mkDerivation { knewstuff kiconthemes libksysguard + kquickcharts + ksystemstats + qqc2-desktop-style ]; } diff --git a/pkgs/desktops/plasma-5/plasma-thunderbolt.nix b/pkgs/desktops/plasma-5/plasma-thunderbolt.nix index 1bb79c327ebf..c35f1bf09701 100644 --- a/pkgs/desktops/plasma-5/plasma-thunderbolt.nix +++ b/pkgs/desktops/plasma-5/plasma-thunderbolt.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "plasma-thunderbolt"; + pname = "plasma-thunderbolt"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcmutils diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix index 453ba2b107a1..b6ceb37a71ff 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/default.nix +++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix @@ -14,7 +14,7 @@ }: mkDerivation { - name = "plasma-vault"; + pname = "plasma-vault"; nativeBuildInputs = [ extra-cmake-modules ]; patches = [ diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix index cb068166c1d9..8ae136ac78ba 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix @@ -1,6 +1,6 @@ { mkDerivation , extra-cmake-modules }: mkDerivation { - name = "plasma-workspace-wallpapers"; + pname = "plasma-workspace-wallpapers"; nativeBuildInputs = [ extra-cmake-modules ]; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch index 508d39498840..8254f7b4c403 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch @@ -14,33 +14,33 @@ diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/start index 270744053..356160e96 100644 --- a/startkde/plasma-session/startup.cpp +++ b/startkde/plasma-session/startup.cpp -@@ -143,7 +143,7 @@ Startup::Startup(QObject *parent) - const AutoStart autostart; +@@ -179,7 +179,7 @@ Startup::Startup(QObject *parent) + } // Keep for KF5; remove in KF6 (KInit will be gone then) - QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), QStringList()); + QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), QStringList()); - KJob *windowManagerJob = nullptr; - if (qEnvironmentVariable("XDG_SESSION_TYPE") != QLatin1String("wayland")) { -diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp + KJob *phase1 = nullptr; + m_lock.reset(new QEventLoopLocker); +diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp index 3a054a04f..b2e7ab3fb 100644 ---- a/startkde/startplasma-waylandsession.cpp -+++ b/startkde/startplasma-waylandsession.cpp -@@ -33,7 +33,7 @@ int main(int argc, char **argv) - out << "startplasma-waylandsession: Shutting down...\n"; +--- a/startkde/startplasma-wayland.cpp ++++ b/startkde/startplasma-wayland.cpp +@@ -91,7 +91,7 @@ int main(int argc, char **argv) + out << "startplasma-wayland: Shutting down...\n"; // Keep for KF5; remove in KF6 (KInit will be gone then) - runSync(QStringLiteral("kdeinit5_shutdown"), {}); + runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {}); - out << "startplasma-waylandsession: Done.\n"; - + out << "startplasmacompositor: Shutting down...\n"; + cleanupPlasmaEnvironment(oldSystemdEnvironment); diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp index d6b2c5439..534eeb0e5 100644 --- a/startkde/startplasma-x11.cpp +++ b/startkde/startplasma-x11.cpp -@@ -90,7 +90,7 @@ int main(int argc, char **argv) +@@ -89,7 +89,7 @@ int main(int argc, char **argv) out << "startkde: Shutting down...\n"; // Keep for KF5; remove in KF6 (KInit will be gone then) @@ -53,7 +53,7 @@ diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp index 008fdfcaf..72468f21c 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp -@@ -39,7 +39,7 @@ QTextStream out(stderr); +@@ -50,7 +50,7 @@ QTextStream out(stderr); void messageBox(const QString &text) { out << text; @@ -62,7 +62,7 @@ index 008fdfcaf..72468f21c 100644 } QStringList allServices(const QLatin1String &prefix) -@@ -340,7 +340,7 @@ void setupX11() +@@ -412,7 +412,7 @@ void setupX11() // If the user has overwritten fonts, the cursor font may be different now // so don't move this up. @@ -70,20 +70,11 @@ index 008fdfcaf..72468f21c 100644 + runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); } - void cleanupPlasmaEnvironment(const std::optional &oldSystemdEnvironment) -@@ -403,7 +403,7 @@ void setupFontDpi() - // TODO port to c++? - const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0)); - QProcess p; -- p.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")}); -+ p.start(QStringLiteral(NIXPKGS_XRDB), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")}); - p.setProcessChannelMode(QProcess::ForwardedChannels); - p.write(input); - p.closeWriteChannel(); -@@ -425,7 +425,7 @@ QProcess *setupKSplash() - KConfigGroup ksplashCfg = cfg.group("KSplash"); + void cleanupPlasmaEnvironment(const std::optional &oldSystemdEnvironment) +@@ -501,7 +501,7 @@ QProcess *setupKSplash() if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { p = new QProcess; + p->setProcessChannelMode(QProcess::ForwardedChannels); - p->start(QStringLiteral("ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))}); + p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))}); } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch index 633551f6e3c2..211316e24736 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch @@ -15,8 +15,8 @@ index a560da3..f723c1e 100644 type=image color=#1d99f3 fontSize=10 --background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png -+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png +-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg ++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg needsFullUserModel=false -- 2.30.0 diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index fac10cf31d41..68b6d1d675fe 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -23,7 +23,7 @@ let inherit (lib) getBin getLib; in mkDerivation { - name = "plasma-workspace"; + pname = "plasma-workspace"; passthru.providedSessions = [ "plasma" "plasmawayland" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix index 72217204b35d..82ebf3e31365 100644 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "polkit-kde-agent"; + pname = "polkit-kde-agent"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index 9d2dc183cf16..229810edde1d 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "powerdevil"; + pname = "powerdevil"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth diff --git a/pkgs/desktops/plasma-5/qqc2-breeze-style.nix b/pkgs/desktops/plasma-5/qqc2-breeze-style.nix index 420529eb1749..a45488c287d2 100644 --- a/pkgs/desktops/plasma-5/qqc2-breeze-style.nix +++ b/pkgs/desktops/plasma-5/qqc2-breeze-style.nix @@ -12,7 +12,7 @@ }: mkDerivation { - name = "qqc2-breeze-style"; + pname = "qqc2-breeze-style"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix index 7c44e0f140d4..50801d31774b 100644 --- a/pkgs/desktops/plasma-5/sddm-kcm.nix +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -17,7 +17,7 @@ }: mkDerivation { - name = "sddm-kcm"; + pname = "sddm-kcm"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ libpthreadstubs diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 9de087f10e8c..e98a769f60fe 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/bluedevil-5.23.5.tar.xz"; - sha256 = "1nbnmfdaisqngygyz1478fswsm1xp28v9l78xlw70yvvyjk2kc6v"; - name = "bluedevil-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/bluedevil-5.24.3.tar.xz"; + sha256 = "1hlyqhn14yq7960zfjwjygkpkvbmrlsanm1g1wrr7dwbmrp5dlcx"; + name = "bluedevil-5.24.3.tar.xz"; }; }; breeze = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/breeze-5.23.5.tar.xz"; - sha256 = "1pyw7rhzkbd9kwsm8l7iz867jhwlbmkarc5iihg0bkbcg1ds18ic"; - name = "breeze-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/breeze-5.24.3.tar.xz"; + sha256 = "0h19m6wmhjw8v6ys47kgzcb0h2nb9w2fcjzypnvmkvbjbkjr53sb"; + name = "breeze-5.24.3.tar.xz"; }; }; breeze-grub = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/breeze-grub-5.23.5.tar.xz"; - sha256 = "12rm9a3vrmb3sm04l2c4vcj8psfyjxplp9wgh87q3k1rcyqz7fqk"; - name = "breeze-grub-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/breeze-grub-5.24.3.tar.xz"; + sha256 = "15cpmqp7klp4dhcil3i78iff4kjasfx273v36ml8y05hm8w0igjq"; + name = "breeze-grub-5.24.3.tar.xz"; }; }; breeze-gtk = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/breeze-gtk-5.23.5.tar.xz"; - sha256 = "1ynbvfgy2nlxg5svjqazj70m7py58ixxa7xyj13dcj6i2ikbcjld"; - name = "breeze-gtk-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/breeze-gtk-5.24.3.tar.xz"; + sha256 = "1922s17mh4ifaqbf4b7p6yj8pwd6z3qwpbf21j1fqhmdk4pvn499"; + name = "breeze-gtk-5.24.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/breeze-plymouth-5.23.5.tar.xz"; - sha256 = "1sllcrhz8hniqkgybk5bbb36fzjcdp5drjbf7v7jn4ih4wvybwmk"; - name = "breeze-plymouth-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/breeze-plymouth-5.24.3.tar.xz"; + sha256 = "0nkf0ll4hcawmkd7nrh8gcf6hhbl0ajxiz2azf9njab9pv2lcz1j"; + name = "breeze-plymouth-5.24.3.tar.xz"; }; }; discover = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/discover-5.23.5.tar.xz"; - sha256 = "1kzp7jpw2kgml2yc3cx9n5syln3kyd9fxa5klh3sa1xn6bz9f8zr"; - name = "discover-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/discover-5.24.3.tar.xz"; + sha256 = "097m5njz86vi4innap1mvizas60r1qcrdzdgsid1hd6p5a92rwca"; + name = "discover-5.24.3.tar.xz"; }; }; drkonqi = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/drkonqi-5.23.5.tar.xz"; - sha256 = "08jjh52r6dmgp7dyxjxvavb4cxhmvzirwdn7hnmfhdbwkm09fqm5"; - name = "drkonqi-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/drkonqi-5.24.3.tar.xz"; + sha256 = "1n6psvr3washk796zrc8ag011fwy677h2mdkw9ijx8dhrk80br0k"; + name = "drkonqi-5.24.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kactivitymanagerd-5.23.5.tar.xz"; - sha256 = "09v6pia34a694g0amj0miqi0j42yqvhfcv6yr9zfix4gf1qcdidn"; - name = "kactivitymanagerd-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kactivitymanagerd-5.24.3.tar.xz"; + sha256 = "0qxf3j36dj1yklnl27znsi9qdjmn6nr779cnzms38x76dq9kxblw"; + name = "kactivitymanagerd-5.24.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kde-cli-tools-5.23.5.tar.xz"; - sha256 = "1203z87i4dmhq1vlrfj4kiw157i5zkccd2bwc7p7qwhgbddaw5jd"; - name = "kde-cli-tools-5.23.5.tar.xz"; - }; - }; - kde-gtk-config = { - version = "5.23.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kde-gtk-config-5.23.5.tar.xz"; - sha256 = "14qqxy2vz9004kfam9biv6q0601sn9yhrkx0i8y0958a58s5z3hp"; - name = "kde-gtk-config-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kde-cli-tools-5.24.3.tar.xz"; + sha256 = "00z8yxic5ibk05x8c25dsc4ijvk6yv0aw1iyfhnpnzmdwdydlr7y"; + name = "kde-cli-tools-5.24.3.tar.xz"; }; }; kdecoration = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kdecoration-5.23.5.tar.xz"; - sha256 = "1kqj8l95wy46kfsw3f1crxwba9zwdlbgi7345mamhyks74wj1628"; - name = "kdecoration-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kdecoration-5.24.3.tar.xz"; + sha256 = "0dpnaf5myn1h368cnkq9g6xfm1sqmyam6bxyidbd5j3dyy1kvz5v"; + name = "kdecoration-5.24.3.tar.xz"; + }; + }; + kde-gtk-config = { + version = "5.24.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.24.3/kde-gtk-config-5.24.3.tar.xz"; + sha256 = "0p50kf34csdrgck1y09d3lnz0r9ly0ca4778achrc59yr4qcsjzv"; + name = "kde-gtk-config-5.24.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kdeplasma-addons-5.23.5.tar.xz"; - sha256 = "0cq0g8nqrkwv12010rsrmzqvxsa5arjpa87gvws8pah3v9k1xnkq"; - name = "kdeplasma-addons-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kdeplasma-addons-5.24.3.tar.xz"; + sha256 = "0g7jcvd6abnlzz9ibnc7phzm58pn6dv3795w4hhy47738jkhizl6"; + name = "kdeplasma-addons-5.24.3.tar.xz"; }; }; kgamma5 = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kgamma5-5.23.5.tar.xz"; - sha256 = "17j0kv00ibs2g9jxfvflk965221iznm0ydgj3i05i6j2bd8301zn"; - name = "kgamma5-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kgamma5-5.24.3.tar.xz"; + sha256 = "0rwqvz14a50s43p74n19v1zzd9y8f2lylfappxmhrdyxmbgkpnk6"; + name = "kgamma5-5.24.3.tar.xz"; }; }; khotkeys = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/khotkeys-5.23.5.tar.xz"; - sha256 = "13562p0bv0jkamx9q07wi5vs78bdrhd0h3qg5rxajc5s36gyh63a"; - name = "khotkeys-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/khotkeys-5.24.3.tar.xz"; + sha256 = "1jxg91rpz09sh13fz270pxfw40qdy6p50j5xw7cpnyqlk2l5zx0p"; + name = "khotkeys-5.24.3.tar.xz"; }; }; kinfocenter = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kinfocenter-5.23.5.tar.xz"; - sha256 = "0f7ik3gg1pimjlc94dp6psk0sha8k7pinx50nvmgsglap4k1xbk7"; - name = "kinfocenter-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kinfocenter-5.24.3.tar.xz"; + sha256 = "08z2044bl0v4ydlx2chv849y6m4py0yd4lnw76sycd14lnvsrxfj"; + name = "kinfocenter-5.24.3.tar.xz"; }; }; kmenuedit = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kmenuedit-5.23.5.tar.xz"; - sha256 = "0k3dbip98zwia6m8nlgiw4mz09pkw7bik4cn3j73v2x3n7y3c542"; - name = "kmenuedit-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kmenuedit-5.24.3.tar.xz"; + sha256 = "1yivrdix4jiycfbw9g6pzx8zkmdq4g8g51ndc7sy3r0qxzgx1icb"; + name = "kmenuedit-5.24.3.tar.xz"; }; }; kscreen = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kscreen-5.23.5.tar.xz"; - sha256 = "0j5rgzj132j7qy1pgi12mhihf1a89a3xh8j5f7dp5s1f8kyjq0yi"; - name = "kscreen-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kscreen-5.24.3.tar.xz"; + sha256 = "1wjbd33h8473v8i5qxdccxrsv04v6jyd7scrqdxqaln9n8ylp08f"; + name = "kscreen-5.24.3.tar.xz"; }; }; kscreenlocker = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kscreenlocker-5.23.5.tar.xz"; - sha256 = "07vhwvcyz9ynjzh44zny1f6di2knzy3fkiji3bhrki8p3zc9vjpm"; - name = "kscreenlocker-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kscreenlocker-5.24.3.tar.xz"; + sha256 = "1dh3z55hwakj11ffn2fm79vnlw7gcg1nkcxbxvcdcpq84ahpq583"; + name = "kscreenlocker-5.24.3.tar.xz"; }; }; ksshaskpass = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/ksshaskpass-5.23.5.tar.xz"; - sha256 = "0p8aka60mc8p96v3bx954jy99n9lf0a4b09sig307clwinfr23if"; - name = "ksshaskpass-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/ksshaskpass-5.24.3.tar.xz"; + sha256 = "0ivq9nyyqm1rrm6ck26jlsh8qv9q98dz5qwvcnpgpmxb3mr1dgiv"; + name = "ksshaskpass-5.24.3.tar.xz"; }; }; ksystemstats = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/ksystemstats-5.23.5.tar.xz"; - sha256 = "1xmr0yk5xynja6z7xc6l1zd529q5si5qs71f72dba2zna22hb7hb"; - name = "ksystemstats-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/ksystemstats-5.24.3.tar.xz"; + sha256 = "03ikpd3m0qk8cb92g63i7q9c8bks7ggf1pmmig559cmg7gbknc2c"; + name = "ksystemstats-5.24.3.tar.xz"; }; }; kwallet-pam = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kwallet-pam-5.23.5.tar.xz"; - sha256 = "1cha41wiqsfgyrqb8di5qnnz0mnvmchprxay48czrn3r5mz49pw9"; - name = "kwallet-pam-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kwallet-pam-5.24.3.tar.xz"; + sha256 = "0zxdrpjq8sg3qw2gfkvjs567b41labi940cq4qrix395v7251p9k"; + name = "kwallet-pam-5.24.3.tar.xz"; }; }; kwayland-integration = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kwayland-integration-5.23.5.tar.xz"; - sha256 = "0gs68v4rriknn59fv0yjcgrmcryv7wxgskswdgi1xx18v0rlc4ag"; - name = "kwayland-integration-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kwayland-integration-5.24.3.tar.xz"; + sha256 = "1kq5vrrplbdxri8610h89apfz07a6xi1gnlvmr8gbsvas5zicvwz"; + name = "kwayland-integration-5.24.3.tar.xz"; }; }; kwayland-server = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kwayland-server-5.23.5.tar.xz"; - sha256 = "0b8c1mkh36cgxhx18v9j23n9gnvzy22x50gpiw3dbkjzsmr1n7by"; - name = "kwayland-server-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kwayland-server-5.24.3.tar.xz"; + sha256 = "0fq61qk3cp4xg9759ylqqw5ncx9s7kayjf0bilg5m725bfhj02sn"; + name = "kwayland-server-5.24.3.tar.xz"; }; }; kwin = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kwin-5.23.5.tar.xz"; - sha256 = "00azqmdgkh72bg4d8868cin984vxxk6s6pk5x4dfvlaknzlyfjgp"; - name = "kwin-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kwin-5.24.3.tar.xz"; + sha256 = "0szlrcsj4h4fa5yf27nmza7c4dyc0xcwdrihs05pl5qk5bivfkfq"; + name = "kwin-5.24.3.tar.xz"; }; }; kwrited = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/kwrited-5.23.5.tar.xz"; - sha256 = "0aj911kfzd100jq1k1sg7i1nhiixnl7qiphc2bczn47f1jj64iqv"; - name = "kwrited-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/kwrited-5.24.3.tar.xz"; + sha256 = "1sgd3iik647pz2zr5cpsbwm2ll8f11xyw2jv2sfxkbiiw53qaxid"; + name = "kwrited-5.24.3.tar.xz"; }; }; layer-shell-qt = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/layer-shell-qt-5.23.5.tar.xz"; - sha256 = "1ah66z9hiricw6h3j7x2k7d49y7g4l2s9w2658wjrava2qng9bsr"; - name = "layer-shell-qt-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/layer-shell-qt-5.24.3.tar.xz"; + sha256 = "0h3xlvmgyxyzxvazgbbn0a9l14hg5d38cl9hclnwmrnpwbn0bqax"; + name = "layer-shell-qt-5.24.3.tar.xz"; }; }; libkscreen = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/libkscreen-5.23.5.tar.xz"; - sha256 = "08wgg96clp685fl5lflrfd4kmf5c2p5ms7n1q2izvg0n6qr37m1i"; - name = "libkscreen-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/libkscreen-5.24.3.tar.xz"; + sha256 = "18777lwn5j0isc347dks25731byyfdyls79lj6hnxqb6807lz1x6"; + name = "libkscreen-5.24.3.tar.xz"; }; }; libksysguard = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/libksysguard-5.23.5.tar.xz"; - sha256 = "1gy1grkkz7vwglby52vv4gr8zbzsv8rbvwbp6rqvvhmqg7ascc1h"; - name = "libksysguard-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/libksysguard-5.24.3.tar.xz"; + sha256 = "18piiy24rd5fzvp4cnhgx0d4x4m6fnxx01zm1mx0sh676g7m31hl"; + name = "libksysguard-5.24.3.tar.xz"; }; }; milou = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/milou-5.23.5.tar.xz"; - sha256 = "05bc6hc5pn5rz4zp6b2akjdbssv7xppvzsw3pidkqb8pincl01gh"; - name = "milou-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/milou-5.24.3.tar.xz"; + sha256 = "06xx4afym92hfpvbiqrv7mx30bdm3dhdfn8vki5zxq2k0rv0pmri"; + name = "milou-5.24.3.tar.xz"; }; }; oxygen = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/oxygen-5.23.5.tar.xz"; - sha256 = "1vvy9yqllqq9dx2riwv4bmxfq13wph5wagy84f1hhl7zxnbcyv0c"; - name = "oxygen-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/oxygen-5.24.3.tar.xz"; + sha256 = "02j0drc24mf2pfhdgzri5sdcscq1bbj4lhhmhp6bn1v74wybv381"; + name = "oxygen-5.24.3.tar.xz"; }; }; plasma-browser-integration = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-browser-integration-5.23.5.tar.xz"; - sha256 = "0jw9jircgbilig4pryyjxhby8qc7nag9a1s5nk1zdsnlaqr08jyp"; - name = "plasma-browser-integration-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-browser-integration-5.24.3.tar.xz"; + sha256 = "1msib3c8arybqbv1vfj1ijx74a34a02hn8gvjy4sf95zcl07mc20"; + name = "plasma-browser-integration-5.24.3.tar.xz"; }; }; plasma-desktop = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-desktop-5.23.5.tar.xz"; - sha256 = "0ym8cssw351ygw2vy27cyxql05y0gaflnqnq4fwkdgidldvmi45k"; - name = "plasma-desktop-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-desktop-5.24.3.tar.xz"; + sha256 = "1lwizprs6nk6nibydwkwmpi9c7c50lvg2k188pb6ddz2sb7pwgjq"; + name = "plasma-desktop-5.24.3.tar.xz"; }; }; plasma-disks = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-disks-5.23.5.tar.xz"; - sha256 = "0197zyj5p7j8y80g0vvf5d9bq86qxkhwpa9dzb5l3is50y8lkj6p"; - name = "plasma-disks-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-disks-5.24.3.tar.xz"; + sha256 = "0nklcimxyvci3xa6nc5jxbcxds4a14vkkwihgc6xfpc7xcca0wcy"; + name = "plasma-disks-5.24.3.tar.xz"; }; }; plasma-firewall = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-firewall-5.23.5.tar.xz"; - sha256 = "0fhycjrb89blh6wf24rvq7bafqqrxj37ir0daj5jlph9f1w4laq0"; - name = "plasma-firewall-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-firewall-5.24.3.tar.xz"; + sha256 = "0r7gh3asnc5lbfsp1jb33lmgcxfpjmlrqlyz41g0wv9aj9x6pwxz"; + name = "plasma-firewall-5.24.3.tar.xz"; }; }; plasma-integration = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-integration-5.23.5.tar.xz"; - sha256 = "03c0cqvr5cdpvxgm145sqpbbr8wv0qv4pqjl69v3bs010pd755lg"; - name = "plasma-integration-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-integration-5.24.3.tar.xz"; + sha256 = "031w205icblf50ps7bw7wp5q4azbqpcp4bnig2wh5d1lc8xqzvvs"; + name = "plasma-integration-5.24.3.tar.xz"; + }; + }; + plasma-mobile = { + version = "5.24.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.24.3/plasma-mobile-5.24.3.tar.xz"; + sha256 = "1bwmy7xvd8wmh0snqqjh9jjgawib8ks2g30w48sqxwhplhf3da58"; + name = "plasma-mobile-5.24.3.tar.xz"; }; }; plasma-nano = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-nano-5.23.5.tar.xz"; - sha256 = "1yh67bh1smk7zx35hd72pafjbjdv7wwwhm76ga5sj251m61ncxim"; - name = "plasma-nano-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-nano-5.24.3.tar.xz"; + sha256 = "13jxhfi3c3dhg7zdyfqnsii661h1am0w9dsv82dalqvwr1mw28l5"; + name = "plasma-nano-5.24.3.tar.xz"; }; }; plasma-nm = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-nm-5.23.5.tar.xz"; - sha256 = "14sknzy4v4xx1ihjn1s6x0lv5difnp4gi24zsdqvnkxkmxzhcij3"; - name = "plasma-nm-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-nm-5.24.3.tar.xz"; + sha256 = "1z9vzj2mbvqklnjxf2izpx9s6cq097im0kz41fy4c5cjxna4xxic"; + name = "plasma-nm-5.24.3.tar.xz"; }; }; plasma-pa = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-pa-5.23.5.tar.xz"; - sha256 = "1pcnf59qj7rgmcbc5xhad5zl487r48i2kyp6nc3yrlgj1xcfpfxg"; - name = "plasma-pa-5.23.5.tar.xz"; - }; - }; - plasma-phone-components = { - version = "5.23.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-phone-components-5.23.5.tar.xz"; - sha256 = "08c03pycvv7ald21d8ckxpv6d25qlxs28gjm99hdn6x8m74j7frn"; - name = "plasma-phone-components-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-pa-5.24.3.tar.xz"; + sha256 = "0n87rb04izd0ix50iy2dgj6yzzr626vhpfk76lnqr57jz6fbx3z1"; + name = "plasma-pa-5.24.3.tar.xz"; }; }; plasma-sdk = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-sdk-5.23.5.tar.xz"; - sha256 = "1s0l09lgqipks0w0jplaaipcs4a1ny4iclkz9hkfx4xjgcvk5m2j"; - name = "plasma-sdk-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-sdk-5.24.3.tar.xz"; + sha256 = "0g6nypqsbmsp9msixd7p25lk58zismdamkp41f5lx3cbb49x1fpr"; + name = "plasma-sdk-5.24.3.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-systemmonitor-5.23.5.tar.xz"; - sha256 = "1snzabxgja9rsk000h97qjadb9fs8zdbqpr4zqa9sk0jjgm011lf"; - name = "plasma-systemmonitor-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-systemmonitor-5.24.3.tar.xz"; + sha256 = "17a3q1az4d3xpk2ifqsj6sz7r4apxy58kk2r2l14p6s6aszhqk4h"; + name = "plasma-systemmonitor-5.24.3.tar.xz"; }; }; plasma-tests = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-tests-5.23.5.tar.xz"; - sha256 = "125b0sf7h0ibjl7msw1sc3cccms8nrrkx6cgwd46a9xi5svrsfg2"; - name = "plasma-tests-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-tests-5.24.3.tar.xz"; + sha256 = "1x5hr465kj3dg6c335lji2lxvp7cbn86181l78qk4l75sj1ss721"; + name = "plasma-tests-5.24.3.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-thunderbolt-5.23.5.tar.xz"; - sha256 = "1ich92w479llvq1vjlfyvxh3dvqc4pgycfi97hz4sfhn7dnaw3vr"; - name = "plasma-thunderbolt-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-thunderbolt-5.24.3.tar.xz"; + sha256 = "1px5vfk37ak6hj6q3ipljj2dpazdbgdsga6nbkwcfn31708c7gjj"; + name = "plasma-thunderbolt-5.24.3.tar.xz"; }; }; plasma-vault = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-vault-5.23.5.tar.xz"; - sha256 = "1gf531q29qnvvsdxqgb1zyxwh5ck25kb0h1kk0d95pjkkylgyv0d"; - name = "plasma-vault-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-vault-5.24.3.tar.xz"; + sha256 = "0f5yhz7qz4bqj7mc7hv7mvh2ji82pp02c901ws5cwwsh23yrhjcd"; + name = "plasma-vault-5.24.3.tar.xz"; }; }; plasma-workspace = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-workspace-5.23.5.tar.xz"; - sha256 = "0x950nb56xmmdf7hfpbrd9hvgq1a8vca0x8g1qsvrjhh5ymydgif"; - name = "plasma-workspace-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-workspace-5.24.3.tar.xz"; + sha256 = "1d1a8k75q0rdbbwkx8p1i38hc6xv9kggvfm6973lh3q0pc75qk0h"; + name = "plasma-workspace-5.24.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plasma-workspace-wallpapers-5.23.5.tar.xz"; - sha256 = "0nr631yz8v671a87vh9f2a5kfjhn4f9147b339p09fwgfpx06vfx"; - name = "plasma-workspace-wallpapers-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plasma-workspace-wallpapers-5.24.3.tar.xz"; + sha256 = "0j1qqjc27grh3k02dgfb657ps11gym28lc9hzcw3qdxkf3djw9fs"; + name = "plasma-workspace-wallpapers-5.24.3.tar.xz"; }; }; plymouth-kcm = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/plymouth-kcm-5.23.5.tar.xz"; - sha256 = "0ynyqfm6az8yj3d30yxza5mjcsgfw6mmdkcgr3v95r6db112hqbx"; - name = "plymouth-kcm-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/plymouth-kcm-5.24.3.tar.xz"; + sha256 = "196nx8h54bnnrly12zvnwl22ksr9nk2mi6g39k4xmp28agw94jv5"; + name = "plymouth-kcm-5.24.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.23.5"; + version = "1-5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/polkit-kde-agent-1-5.23.5.tar.xz"; - sha256 = "1wgpgbq987qa6fdayw4155fwym6rcn2z7w66s8faqv94x78njzln"; - name = "polkit-kde-agent-1-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/polkit-kde-agent-1-5.24.3.tar.xz"; + sha256 = "1mbr8xpjvd8w9b5nd6k8fxcnjykzzygwqk19il4wirqyh4n3k3bq"; + name = "polkit-kde-agent-1-5.24.3.tar.xz"; }; }; powerdevil = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/powerdevil-5.23.5.tar.xz"; - sha256 = "1lxjqd4w3jvnffcn9751j9k1fzsyasd1z8b1gm2iaf38iys21116"; - name = "powerdevil-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/powerdevil-5.24.3.tar.xz"; + sha256 = "047h4lz8d1kdyakh5x7fr3kpk35r38z39vm7wb974rd9hjz7alj9"; + name = "powerdevil-5.24.3.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/qqc2-breeze-style-5.23.5.tar.xz"; - sha256 = "15i9h2md54a1h7isvma4x9pni3iy0bk84z8ibn3a36ydimyq5hra"; - name = "qqc2-breeze-style-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/qqc2-breeze-style-5.24.3.tar.xz"; + sha256 = "1y21ldxwlb12kfqzxpyhdw9lkcaf5sfamwhg68r512hy785sg490"; + name = "qqc2-breeze-style-5.24.3.tar.xz"; }; }; sddm-kcm = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/sddm-kcm-5.23.5.tar.xz"; - sha256 = "0csj1gml8w29dzv62zpbia9g10qz5k1nzv1yywsvay1q8rbqccxv"; - name = "sddm-kcm-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/sddm-kcm-5.24.3.tar.xz"; + sha256 = "15n6drklwk3lmiaklw1af98qcixml4w83hngy23lwwv2lbnirl6h"; + name = "sddm-kcm-5.24.3.tar.xz"; }; }; systemsettings = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/systemsettings-5.23.5.tar.xz"; - sha256 = "0shsqancxbxy6f4fd9m2a30x7gnjmd6gb8kq4nhlj6rramcwn3jh"; - name = "systemsettings-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/systemsettings-5.24.3.tar.xz"; + sha256 = "11fmjdh6v0a4gacqshhrk374i07px989p3x70w8438gr6y0n2032"; + name = "systemsettings-5.24.3.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.23.5"; + version = "5.24.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.23.5/xdg-desktop-portal-kde-5.23.5.tar.xz"; - sha256 = "09s3fpjdrnxqvnyxmxva0rx612d6pxv28qqvm00hzrb23nxz6qgb"; - name = "xdg-desktop-portal-kde-5.23.5.tar.xz"; + url = "${mirror}/stable/plasma/5.24.3/xdg-desktop-portal-kde-5.24.3.tar.xz"; + sha256 = "06qdr7j2m9s9l60mk8vspb2173va10zdv6sinhmkhxxp78h857z6"; + name = "xdg-desktop-portal-kde-5.24.3.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index 9ff906f79745..c83bbcecf567 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "systemsettings"; + pname = "systemsettings"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index 60d4867cb47f..00533367d4ce 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "xdg-desktop-portal-kde"; + pname = "xdg-desktop-portal-kde"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; buildInputs = [ cups libepoxy mesa pcre pipewire wayland wayland-protocols diff --git a/pkgs/desktops/xfce/applications/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix index f38dacf0dbbc..102f8e9c2128 100644 --- a/pkgs/desktops/xfce/applications/orage/default.nix +++ b/pkgs/desktops/xfce/applications/orage/default.nix @@ -1,25 +1,34 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, dbus-glib, gtk2, libical, libnotify, tzdata -, popt, libxfce4ui, xfce4-panel, withPanelPlugin ? true, wrapGAppsHook, xfce }: +{ lib +, mkXfceDerivation +, dbus-glib +, gtk3 +, libical +, libnotify +, libxfce4ui +, popt +, tzdata +, xfce4-panel +, withPanelPlugin ? true +}: -assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null; - -let - inherit (lib) optionals; -in - -stdenv.mkDerivation rec { +mkXfceDerivation { + category = "apps"; pname = "orage"; - version = "4.12.1"; + version = "4.16.0"; + odd-unstable = false; + sha256 = "sha256-Q2vTjfhbhG7TrkGeU5oVBB+UvrV5QFtl372wgHU4cxw="; - src = fetchurl { - url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-PPmqRBroPIaIhl+CIXAlzfPrqhUszkVxd3uMKqjdkGI="; - }; - - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; - - buildInputs = [ dbus-glib gtk2 libical libnotify popt ] - ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ]; + buildInputs = [ + dbus-glib + gtk3 + libical + libnotify + libxfce4ui + popt + ] + ++ lib.optionals withPanelPlugin [ + xfce4-panel + ]; postPatch = '' substituteInPlace src/parameters.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" @@ -27,28 +36,13 @@ stdenv.mkDerivation rec { substituteInPlace tz_convert/tz_convert.c --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; - postConfigure = "rm -rf libical"; # ensure pkgs.libical is used instead of one included in the orage sources - - patches = [ - # Fix build with libical 3.0 - (fetchpatch { - name = "fix-libical3.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/libical3.patch?h=orage-4.10"; - sha256 = "sha256-bsnQMGmeo4mRNGM/7UYXez2bNopXMHRFX7VFVg0IGtE="; - }) - ]; - - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister "apps" pname; - }; + postConfigure = '' + # ensure pkgs.libical is used instead of one included in the orage sources + rm -rf libical + ''; meta = with lib; { - description = "Simple calendar application with reminders"; - homepage = "https://git.xfce.org/archive/orage/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; + description = "Simple calendar application for Xfce"; maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index 75a57ae037a1..8a50a0d0fa7c 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.6.2"; + version = "0.6.3"; - sha256 = "sha256-Gomehef68+mOgGFDaH48jG51nbaV4ruN925h71w7FuE="; + sha256 = "sha256-JcHxqKLl4F4FQv7lE64gWUorCvl5g5mSD+jEmj1ORfY="; buildInputs = [ gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index 99e5457a0106..1e8a9230661f 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.9.9"; + version = "1.9.10"; odd-unstable = false; - sha256 = "sha256-QOYJl+bxRk0+spgtGADPgkw2lPLfQOwTZQuZNHWq39c="; + sha256 = "sha256-i3QdQij58JYv3fWdESUeTV0IW3A8RVGNtmuxUc6FUMg="; buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ]; diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 4d887f96ffd2..65611f73a1d2 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl }: +{ lib, mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl, nixosTests }: mkXfceDerivation { category = "apps"; @@ -11,6 +11,8 @@ mkXfceDerivation { buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; + passthru.tests.test = nixosTests.terminal-emulators.xfce4-terminal; + meta = with lib; { description = "A modern terminal emulator"; maintainers = with maintainers; [ ] ++ teams.xfce.members; diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix index 8c4dff80747d..8c37dde65ccb 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix @@ -28,11 +28,7 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://www.xfce.org/"; diff --git a/pkgs/desktops/xfce/art/xfwm4-themes/default.nix b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix index 2c84c619c64f..3665263ede05 100644 --- a/pkgs/desktops/xfce/art/xfwm4-themes/default.nix +++ b/pkgs/desktops/xfce/art/xfwm4-themes/default.nix @@ -13,11 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-MhTV8A6XA7XoyefDKH1gbe3scoXOtNXbMy6TraZv1XU="; }; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://www.xfce.org/"; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 4b057bea7946..0205a7226398 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -3,13 +3,14 @@ lib.makeScope pkgs.newScope (self: with self; { #### NixOS support - updateScript = pkgs.genericUpdater; + genericUpdater = pkgs.genericUpdater; - gitLister = url: - "${pkgs.common-updater-scripts}/bin/list-git-tags ${url}"; - - archiveLister = category: name: - "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions https://archive.xfce.org/src/${category}/${name}"; + archiveUpdater = { category, pname, version }: + pkgs.httpTwoLevelsUpdater { + inherit pname version; + attrPath = "xfce.${pname}"; + url = "https://archive.xfce.org/src/${category}/${pname}"; + }; mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; @@ -168,8 +169,6 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4_power_manager = xfce4-power-manager; xfce4_appfinder = xfce4-appfinder; xfce4_dev_tools = xfce4-dev-tools; - xfce4mixer = xfce4-mixer; - xfce4mixer_pulse = xfce4-mixer-pulse; xfce4notifyd = xfce4-notifyd; xfce4taskmanager = xfce4-taskmanager; xfce4terminal = xfce4-terminal; @@ -203,8 +202,6 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4_windowck_plugin = xfce4-windowck-plugin; xfce4_pulseaudio_plugin = xfce4-pulseaudio-plugin; - xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18 - gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17 xfce4-dict-plugin = throw "deprecated 2020-04-19: xfce4-dict-plugin is now part of xfce4-dict."; # added 2020-04-19 # added 2019-11-04 @@ -214,9 +211,8 @@ lib.makeScope pkgs.newScope (self: with self; { gtk = pkgs.gtk2; libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library"; xinitrc = xfce4-session.xinitrc; - inherit (pkgs.gnome2) libglade; + libglade = throw "libglade has been removed"; inherit (pkgs.gnome) gtksourceview; - xfce4-mixer-pulse = xfce4-mixer; thunar-bare = thunar.override { thunarPlugins = []; }; diff --git a/pkgs/desktops/xfce/mkXfceDerivation.nix b/pkgs/desktops/xfce/mkXfceDerivation.nix index 8ff0d83cae38..261178381e4e 100644 --- a/pkgs/desktops/xfce/mkXfceDerivation.nix +++ b/pkgs/desktops/xfce/mkXfceDerivation.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitLab, pkg-config, xfce4-dev-tools, hicolor-icon-theme, xfce, wrapGAppsHook, gitUpdater }: { category , pname @@ -41,9 +41,8 @@ let pos = builtins.unsafeGetAttrPos "pname" args; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = gitUpdater { inherit pname version attrPath rev-prefix odd-unstable patchlevel-unstable; - versionLister = xfce.gitLister src.meta.homepage; }; meta = with lib; { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix index e382e8024dad..fb070ed3652d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin/default.nix @@ -3,8 +3,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-cpufreq-plugin"; - version = "1.2.5"; - sha256 = "sha256-r783SIGbVKxmLjCxexrMWjYdK7EgbgcHDFTG8KGjWMc="; + version = "1.2.7"; + sha256 = "sha256-M+BehEYcHZlnuYwBlI7F0aPxPGwExTL5I9Jf6W5ugOY="; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix index 0d0bf49161d2..33bdb052b6a9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix @@ -20,11 +20,11 @@ let category = "panel-plugins"; in stdenv.mkDerivation rec { pname = "xfce4-cpugraph-plugin"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-wvbb1/g8ebY7g8mCMsedBQ4YZA6CRkueyNNkOpLDobA="; + sha256 = "sha256-dzJG9XwYJKhUaNQRnBeusHFw7R66zo+kBsf7z1tHr5k="; }; nativeBuildInputs = [ @@ -45,11 +45,7 @@ in stdenv.mkDerivation rec { hicolor-icon-theme ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix index 76868bcd550a..cc4ce861e724 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin/default.nix @@ -33,11 +33,7 @@ in stdenv.mkDerivation rec { gtk2 ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib;{ homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix index 3ee90788137e..08434ad25227 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin/default.nix @@ -35,11 +35,7 @@ in stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-eyes-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix index 084cb764c627..81498aea96f4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin/default.nix @@ -35,11 +35,7 @@ in stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix index 9700d515fbca..1b794ff2b836 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix @@ -33,11 +33,7 @@ in stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix index 455370ca38bb..fdd3af5fe402 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin/default.nix @@ -27,11 +27,7 @@ stdenv.mkDerivation rec { libgcrypt ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix index 1f935ac4a4d4..566475869345 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin/default.nix @@ -27,11 +27,7 @@ stdenv.mkDerivation rec { exo ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index ec64a60fb54a..e7f20a0ec7a8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -1,5 +1,7 @@ { lib, stdenv, pkg-config, fetchFromGitHub, python3, vala -, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce }: +, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce +, gitUpdater +}: stdenv.mkDerivation rec { pname = "xfce4-namebar-plugin"; @@ -20,10 +22,9 @@ stdenv.mkDerivation rec { substituteInPlace src/preferences.vala --replace 'var dir_strings = Environment.get_system_data_dirs()' "string[] dir_strings = { \"$out/share\" }" ''; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = gitUpdater { inherit pname version; attrPath = "xfce.${pname}"; - versionLister = xfce.gitLister src.meta.homepage; rev-prefix = "v"; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix index c2a7aa694d7d..6cb2fcc66c02 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin/default.nix @@ -31,11 +31,7 @@ in stdenv.mkDerivation rec { xfconf ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-notes-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index fa221e65ea1a..22b4d8c4f40f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-sensors-plugin"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-2pDxLmrplbzRyBvjVHmnqdMjCMZezWTlaLqMlZLTn8s="; + sha256 = "sha256-FxwCNfcMZfD/7lh+lg2dp5soSFXfIhMCOerCYnLsBsk="; }; nativeBuildInputs = [ @@ -38,11 +38,7 @@ stdenv.mkDerivation rec { "--with-pathnetcat=${netcat-gnu}/bin/netcat" ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix index 7236eb97d6de..d264181bd48f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin/default.nix @@ -31,11 +31,7 @@ in stdenv.mkDerivation rec { xfconf ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix index 35840b9d244b..c3cb16dfa830 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix @@ -28,11 +28,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-timer-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix index 4ce0fae5a391..5ceda9cb8bd3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin/default.nix @@ -31,11 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; + passthru.updateScript = xfce.archiveUpdater { inherit category pname version; }; meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin"; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix index 6a2386e0f89e..5e5e6c8aa694 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce }: +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, python3, imagemagick, libwnck, libxfce4ui, xfce4-panel, xfconf, xfce4-dev-tools, xfce, gitUpdater }: stdenv.mkDerivation rec { pname = "xfce4-windowck-plugin"; @@ -33,10 +33,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = gitUpdater { inherit pname version; attrPath = "xfce.${pname}"; - versionLister = xfce.gitLister src.meta.homepage; rev-prefix = "v"; }; diff --git a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix index 75ef2491fe15..e056c90a5502 100644 --- a/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix +++ b/pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix @@ -6,6 +6,7 @@ , cmake , ninja , xfce +, gitUpdater }: stdenv.mkDerivation rec { @@ -30,10 +31,9 @@ stdenv.mkDerivation rec { gtk3 ]; - passthru.updateScript = xfce.updateScript { + passthru.updateScript = gitUpdater { inherit pname version; attrPath = "xfce.thunar-dropbox-plugin"; - versionLister = xfce.gitLister src.meta.homepage; }; meta = with lib; { diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix index e077040c69c6..810486e2bc45 100644 --- a/pkgs/development/beam-modules/elvis-erlang/default.nix +++ b/pkgs/development/beam-modules/elvis-erlang/default.nix @@ -24,7 +24,7 @@ in rebar3Relx rec { set -euo pipefail - latest=$(list-git-tags https://github.com/${owner}/${repo}.git | sort -V | tail -1) + latest=$(list-git-tags --url=https://github.com/${owner}/${repo}.git | sort -V | tail -1) if [ "$latest" != "${version}" ]; then nixpkgs="$(git rev-parse --show-toplevel)" nix_path="$nixpkgs/pkgs/development/beam-modules/elvis-erlang" diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index f8e6f423bdae..be9c647437ec 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.21.2"; + version = "0.23.1"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -19,7 +19,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-CiA71mvmq3HrJvgrEDMwp3CQ4Dl05BpTO5HusAL5FAQ="; + sha256 = "sha256-N0jkdzwNi9dx0dmN4qL+mb8S60OII4C/MnR/y8G3GUY="; rev = version; }; releaseType = "escript"; @@ -51,7 +51,7 @@ rebar3Relx { #! nix-shell -i bash -p common-updater-scripts coreutils git gnused gnutar gzip "rebar3WithPlugins { globalPlugins = [ beamPackages.rebar3-nix ]; }" set -ox errexit - latest=$(list-git-tags https://github.com/${owner}/${repo}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) + latest=$(list-git-tags --url=https://github.com/${owner}/${repo}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) if [[ "$latest" != "${version}" ]]; then nixpkgs="$(git rev-parse --show-toplevel)" nix_path="$nixpkgs/pkgs/development/beam-modules/erlang-ls" diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix index 2bc8b18a003b..9d1fa9aef067 100644 --- a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix +++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -137,11 +137,12 @@ let }; erlfmt = builder { name = "erlfmt"; - version = "1.0.0"; - src = fetchHex { - pkg = "erlfmt"; - version = "1.0.0"; - sha256 = "sha256-RL4L4DzmmQLcbc2PZeezre1qr10L5wlkGIyr1K0k8E4="; + version = "git"; + src = fetchFromGitHub { + owner = "gomoripeti"; + repo = "erlfmt"; + rev = "d4422d1fd79a73ef534c2bcbe5b5da4da5338833"; + sha256 = "07jp4g6a41w7318lh8ndsvgivkj0ahz3spnrsnx4cqkdb97yjaid"; }; beamDeps = [ ]; }; @@ -157,11 +158,11 @@ let }; elvis_core = builder { name = "elvis_core"; - version = "1.1.1"; + version = "1.3.1"; src = fetchHex { pkg = "elvis_core"; - version = "1.1.1"; - sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI="; + version = "1.3.1"; + sha256 = "sha256-eoiQv4GFoyUs1OvYJv5fita5MCTt+IV26yeunl3BnWk="; }; beamDeps = [ katana_code zipper ]; }; diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/development/chez-modules/chez-mit/default.nix index b3a2a44d2780..10407598fb96 100644 --- a/pkgs/development/chez-modules/chez-mit/default.nix +++ b/pkgs/development/chez-modules/chez-mit/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchgit, chez, chez-srfi }: +{ stdenv, lib, fetchFromGitHub, chez, chez-srfi }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "chez-mit"; - version = "1.0"; + version = "0.1"; - src = fetchgit { - url = "https://github.com/fedeinthemix/chez-mit.git"; - rev = "68f3d7562e77f694847dc74dabb5ecbd106cd6be"; - sha256 = "0c7i3b6i90xk96nmxn1pc9272a4yal4v40dm1a4ybdi87x53zkk0"; + src = fetchFromGitHub { + owner = "fedeinthemix"; + repo = "chez-mit"; + rev = "v${version}"; + sha256 = "sha256-YM4/Sj8otuWJCrUBsglVnihxRGI32F6tSbODFM0a8TA="; }; buildInputs = [ chez chez-srfi ]; diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/development/chez-modules/chez-scmutils/default.nix index 39c1f73003e9..59aedd29f0ec 100644 --- a/pkgs/development/chez-modules/chez-scmutils/default.nix +++ b/pkgs/development/chez-modules/chez-scmutils/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchgit, chez, chez-srfi, chez-mit }: +{ stdenv, lib, fetchFromGitHub, chez, chez-srfi, chez-mit }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "chez-scmutils"; - version = "1.0"; + version = "0.1"; - src = fetchgit { - url = "https://github.com/fedeinthemix/chez-scmutils.git"; - rev = "5eaeea6289fd239358d7eed99cc9588528fb52b2"; - sha256 = "0lb05wlf8qpgg8y0gdsyaxg1nbfx1qbaqdjvygrp64ndn8fnhq7l"; + src = fetchFromGitHub { + owner = "fedeinthemix"; + repo = "chez-scmutils"; + rev = "v${version}"; + sha256 = "sha256-9GBoHbLNEnPz81s2rBYO3S0bXldetwc8eu9i5CgvYFE="; }; buildInputs = [ chez chez-srfi chez-mit ]; diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/pkgs/development/chez-modules/chez-srfi/default.nix index 1d8579ae106e..1780a1356c5c 100644 --- a/pkgs/development/chez-modules/chez-srfi/default.nix +++ b/pkgs/development/chez-modules/chez-srfi/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchgit, chez }: +{ stdenv, lib, fetchFromGitHub, chez }: stdenv.mkDerivation { pname = "chez-srfi"; version = "1.0"; - src = fetchgit { - url = "https://github.com/fedeinthemix/chez-srfi.git"; + src = fetchFromGitHub { + owner = "fedeinthemix"; + repo = "chez-srfi"; rev = "5770486c2a85d0e3dd4ac62a97918e7c394ea507"; - sha256 = "1s47v7b7w0ycd2g6gyv8qbzmh4jjln5iday8n9l3m996ns8is9zj"; + sha256 = "sha256-8icdkbYmpTpossirFoulUhJY/8Jo+2eeaMwDftbZh+g="; }; buildInputs = [ chez ]; diff --git a/pkgs/development/compilers/4th/001-install-manual-fixup.diff b/pkgs/development/compilers/4th/001-install-manual-fixup.diff new file mode 100644 index 000000000000..6002e7a0d99f --- /dev/null +++ b/pkgs/development/compilers/4th/001-install-manual-fixup.diff @@ -0,0 +1,12 @@ +diff -Naur 4th-3.64.0-old/sources/Makefile 4th-3.64.0-new/sources/Makefile +--- 4th-3.64.0-old/sources/Makefile 2022-03-15 12:37:45.925122854 -0300 ++++ 4th-3.64.0-new/sources/Makefile 2022-03-15 12:38:50.987870211 -0300 +@@ -125,7 +125,7 @@ + + install: mostlyinstall + install -Dm644 ../documentation/4th.1 $(MANDIR)/man1/4th.1 +- install -Dm644 ../documentation/4tHmanual.txt $(DOCDIR)/4th/ ++ install -Dm644 ../documentation/4tHmanual.pdf $(DOCDIR)/4th/ + + uninstall: + -rm -f $(LIBRARIES)/lib4th.{a,so*} diff --git a/pkgs/development/compilers/4th/default.nix b/pkgs/development/compilers/4th/default.nix index a8923879c06a..d76a5cc733c9 100644 --- a/pkgs/development/compilers/4th/default.nix +++ b/pkgs/development/compilers/4th/default.nix @@ -2,13 +2,18 @@ stdenv.mkDerivation rec { pname = "4th"; - version = "3.62.5"; + version = "3.64.0"; src = fetchurl { url = "https://sourceforge.net/projects/forth-4th/files/${pname}-${version}/${pname}-${version}-unix.tar.gz"; - sha256 = "sha256-+CL33Yz7CxdEpi1lPG7+kzV4rheJ7GCgiFCaOLyktPw="; + hash = "sha256-wJBekjFsFRIkhY/P/yHBQ8he+k+fGyrePGTP2Yjgpqg="; }; + patches = [ + # Fix install manual; report this patch to upstream + ./001-install-manual-fixup.diff + ]; + dontConfigure = true; makeFlags = [ @@ -31,9 +36,11 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A portable Forth compiler"; homepage = "https://thebeez.home.xs4all.nl/4tH/index.html"; - license = licenses.lgpl3; - platforms = platforms.all; + description = "A portable Forth compiler"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; }; } +# TODO: set Makefile according to platform diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index 1b87b508b6a1..ace8a3d2de39 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -1,14 +1,15 @@ -{ fetchgit, lib, stdenv, gmp, which, flex, bison, makeWrapper +{ fetchFromGitHub, lib, stdenv, gmp, which, flex, bison, makeWrapper , autoconf, automake, libtool, jdk, perl }: stdenv.mkDerivation { pname = "aldor"; version = "1.2.0"; - src = fetchgit { - url = "https://github.com/pippijn/aldor"; - sha256 = "19v07ffq4r1gjnmg7a8ifgjkwan9a3rwbj0qjz8fycwy221844m6"; + src = fetchFromGitHub { + owner = "aldorlang"; + repo = "aldor"; rev = "15471e75f3d65b93150f414ebcaf59a03054b68d"; + sha256 = "sha256-phKCghCeM+/QlxjIxfNQySo+5XMRqfOqlS9kgp07YKc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index c75600b5341a..e8c3af5d7e1e 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -36,6 +36,10 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; + # Disable parallel build, errors: + # *** No rule to make target 'patscc.dats', needed by 'patscc_dats.c'. Stop. + enableParallelBuilding = false; + setupHook = with lib; let hookFiles = diff --git a/pkgs/development/compilers/bs-platform/ocaml.nix b/pkgs/development/compilers/bs-platform/ocaml.nix index d650d767a8d8..05fb8b6b17ea 100644 --- a/pkgs/development/compilers/bs-platform/ocaml.nix +++ b/pkgs/development/compilers/bs-platform/ocaml.nix @@ -1,7 +1,7 @@ { lib, stdenv, src, version }: stdenv.mkDerivation rec { inherit src version; - name = "ocaml-${version}+bs"; + pname = "ocaml-bs"; configurePhase = '' ./configure -prefix $out ''; diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/development/compilers/ciao/default.nix index a5cdcb82bc05..2ce32631562a 100644 --- a/pkgs/development/compilers/ciao/default.nix +++ b/pkgs/development/compilers/ciao/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ciao"; - version = "1.20.0"; + version = "1.21.0-m1"; src = fetchFromGitHub { owner = "ciao-lang"; repo = "ciao"; rev = "v${version}"; - sha256 = "sha256-Xp0ZQRi7mOO2WN/2hO6zgobDG3S0BEV+SgsaduBZ30U="; + sha256 = "sha256-o9EQS7KsoTg458Uw+1shgKE6NlZO495XE/rLq6/1S4g="; }; configurePhase = '' diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 3f32be22bd10..bb6b65e40a46 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20211107"; + version = "20220202"; src = fetchurl { url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "sha256-cz8A8KFlHJ1UCdkWLm+U8KPmFGNiiSXT1u9mvmDsFKY="; + sha256 = "sha256-I9kcK9oL6AMStI7eGfruJ+CYQuAsVsixTzkh0JWJrw8="; }; dontUnpack = true; diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index 2328e76ad770..1bdc8989cf1d 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -1,4 +1,15 @@ -{ stdenv, lib, crystal, shards, git, pkg-config, which, linkFarm, fetchFromGitHub, installShellFiles }: +{ stdenv +, lib +, crystal +, shards +, git +, pkg-config +, which +, linkFarm +, fetchFromGitHub +, installShellFiles +, removeReferencesTo +}: { # Some projects do not include a lock file, so you can pass one @@ -60,7 +71,13 @@ stdenv.mkDerivation (mkDerivationArgs // { buildInputs = args.buildInputs or [ ] ++ [ crystal ] ++ lib.optional (format != "crystal") shards; - nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkg-config which ]; + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ + git + installShellFiles + removeReferencesTo + pkg-config + which + ]; buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([ "runHook preBuild" @@ -77,7 +94,7 @@ stdenv.mkDerivation (mkDerivationArgs // { '') crystalBinaries) ++ lib.optional (format == "shards") - "shards build --local --production ${lib.concatStringsSep " " defaultOptions}" + "shards build --local --production ${lib.concatStringsSep " " (args.options or defaultOptions)}" ++ [ "runHook postBuild" ])); installPhase = args.installPhase or (lib.concatStringsSep "\n" ([ @@ -102,6 +119,7 @@ stdenv.mkDerivation (mkDerivationArgs // { installManPage man/*.? fi '') ++ [ + "remove-references-to -t ${lib.getLib crystal} $out/bin/*" "runHook postInstall" ])); diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 330cf851ab1b..280e0fdd2307 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -32,19 +32,28 @@ let x86_64-linux = "linux-x86_64"; i686-linux = "linux-i686"; x86_64-darwin = "darwin-x86_64"; + aarch64-darwin = "darwin-universal"; + aarch64-linux = "linux-aarch64"; }; arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported"); + isAarch64Darwin = stdenv.system == "aarch64-darwin"; checkInputs = [ git gmp openssl readline libxml2 libyaml ]; + binaryUrl = version: rel: + if arch == archs.aarch64-linux then + "https://dev.alpinelinux.org/archive/crystal/crystal-${version}-aarch64-alpine-linux-musl.tar.gz" + else + "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; + genericBinary = { version, sha256s, rel ? 1 }: stdenv.mkDerivation rec { pname = "crystal-binary"; inherit version; src = fetchurl { - url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; + url = binaryUrl version rel; sha256 = sha256s.${stdenv.system}; }; @@ -53,6 +62,8 @@ let tar --strip-components=1 -C $out -xf ${src} patchShebangs $out/bin/crystal ''; + + meta.broken = lib.versionOlder version "1.2.0" && isAarch64Darwin; }; commonBuildInputs = extraBuildInputs: [ @@ -206,7 +217,8 @@ let homepage = "https://crystal-lang.org/"; license = licenses.asl20; maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ]; - platforms = builtins.attrNames archs; + platforms = let archNames = builtins.attrNames archs; in + if (lib.versionOlder version "1.2.0") then remove "aarch64-darwin" archNames else archNames; broken = lib.versionOlder version "0.36.1" && stdenv.isDarwin; }; }) @@ -220,6 +232,14 @@ rec { x86_64-linux = "1949argajiyqyq09824yj3wjyv88gd8wbf20xh895saqfykiq880"; i686-linux = "0w0f4fwr2ijhx59i7ppicbh05hfmq7vffmgl7lal6im945m29vch"; x86_64-darwin = "01n0rf8zh551vv8wq3h0ifnsai0fz9a77yq87xx81y9dscl9h099"; + aarch64-linux = "0sns7l4q3z82qi3dc2r4p63f4s8hvifqzgq56ykwyrvawynjhd53"; + }; + }; + + binaryCrystal_1_2 = genericBinary { + version = "1.2.0"; + sha256s = { + aarch64-darwin = "1hrs8cpjxdkcf8mr9qgzilwbg6bakq87sd4yydfsk2f4pqd6g7nf"; }; }; @@ -238,10 +258,8 @@ rec { crystal_1_2 = generic { version = "1.2.2"; sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; - binary = crystal_1_1; + binary = if isAarch64Darwin then binaryCrystal_1_2 else crystal_1_1; }; crystal = crystal_1_2; - - crystal2nix = callPackage ./crystal2nix.nix { }; } diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index f408d7b33121..46832e1cc2de 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -61,8 +61,6 @@ stdenv.mkDerivation rec { gtk2 glib fontconfig freetype unixODBC alsa-lib ]; - rpath = "${lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc.lib}/lib64"; - unpackPhase = '' sh $src --keep --noexec @@ -119,6 +117,12 @@ stdenv.mkDerivation rec { fi done mv pkg/builds/cuda_nvcc/nvvm $out/nvvm + + mv pkg/builds/cuda_sanitizer_api $out/cuda_sanitizer_api + ln -s $out/cuda_sanitizer_api/compute-sanitizer/compute-sanitizer $out/bin/compute-sanitizer + + mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64 + mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64 ''} rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why? @@ -184,22 +188,35 @@ stdenv.mkDerivation rec { done ''; - preFixup = '' - while IFS= read -r -d ''$'\0' i; do - if ! isELF "$i"; then continue; fi - echo "patching $i..." - if [[ ! $i =~ \.so ]]; then - patchelf \ - --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i - fi - if [[ $i =~ libcudart ]]; then - patchelf --remove-rpath $i - else - rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 - patchelf --set-rpath "$rpath2" --force-rpath $i - fi - done < <(find $out $lib $doc -type f -print0) - ''; + preFixup = + let rpath = lib.concatStringsSep ":" [ + (lib.makeLibraryPath (runtimeDependencies ++ [ "$lib" "$out" "$out/nvvm" ])) + "${stdenv.cc.cc.lib}/lib64" + "$out/jre/lib/amd64/jli" + "$out/lib64" + "$out/nvvm/lib64" + ]; + in + '' + while IFS= read -r -d $'\0' i; do + if ! isELF "$i"; then continue; fi + echo "patching $i..." + if [[ ! $i =~ \.so ]]; then + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $i + fi + if [[ $i =~ libcudart ]]; then + patchelf --remove-rpath $i + else + patchelf --set-rpath "${rpath}" --force-rpath $i + fi + done < <(find $out $lib $doc -type f -print0) + '' + lib.optionalString (lib.versionAtLeast version "11") '' + for file in $out/target-linux-x64/*.so; do + echo "patching $file..." + patchelf --set-rpath "${rpath}:\$ORIGIN" $file + done + ''; # Set RPATH so that libcuda and other libraries in # /run/opengl-driver(-32)/lib can be found. See the explanation in @@ -208,6 +225,10 @@ stdenv.mkDerivation rec { # --force-rpath prevents changing RPATH (set above) to RUNPATH. postFixup = '' addOpenGLRunpath --force-rpath {$out,$lib}/lib/lib*.so + '' + lib.optionalString (lib.versionAtLeast version "11") '' + addOpenGLRunpath $out/cuda_sanitizer_api/compute-sanitizer/* + addOpenGLRunpath $out/cuda_sanitizer_api/compute-sanitizer/x86/* + addOpenGLRunpath $out/target-linux-x64/* ''; # cuda-gdb doesn't run correctly when not using sandboxing, so diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 33a386cfb926..65e9eb827605 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -79,5 +79,12 @@ rec { gcc = gcc10; # can bump to 11 along with stdenv.cc }; - cudatoolkit_11 = cudatoolkit_11_4; + cudatoolkit_11_6 = common { + version = "11.6.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.6.1/local_installers/cuda_11.6.1_510.47.03_linux.run"; + sha256 = "sha256-qyGa/OALdCABEyaYZvv/derQN7z8I1UagzjCaEyYTX4="; + gcc = gcc10; # can bump to 11 along with stdenv.cc + }; + + cudatoolkit_11 = cudatoolkit_11_5; } diff --git a/pkgs/development/compilers/dictu/default.nix b/pkgs/development/compilers/dictu/default.nix index 8ff6a5120f75..94871fd7d7ca 100644 --- a/pkgs/development/compilers/dictu/default.nix +++ b/pkgs/development/compilers/dictu/default.nix @@ -13,13 +13,13 @@ assert enableLTO -> stdenv.cc.isGNU; stdenv.mkDerivation rec { pname = "dictu"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "dictu-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K/RbkRK8nCkmaNwWplWe2nWtULhn/GCNPXYStfMeUPg="; + sha256 = "sha256-EYoLEyK8jh4z3/9aMuUBt0pCwks7NIevsK2mOh8x6bQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 21cc6c8227cd..bfc2ab7f9b05 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -1,12 +1,14 @@ { type , version -, sha512 +, srcs }: assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; + { lib , stdenv , fetchurl +, writeText , libunwind , openssl , icu @@ -23,17 +25,7 @@ let "dotnet-runtime" else "dotnet-sdk"; - platform = { - x86_64-linux = "linux-x64"; - aarch64-linux = "linux-arm64"; - x86_64-darwin = "osx-x64"; - aarch64-darwin = "osx-arm64"; - }.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - urls = { - aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-${platform}.tar.gz"; - runtime = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-${platform}.tar.gz"; - sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-${platform}.tar.gz"; - }; + descriptions = { aspnetcore = "ASP.NET Core Runtime ${version}"; runtime = ".NET Runtime ${version}"; @@ -56,11 +48,8 @@ in stdenv.mkDerivation rec { lttng-ust_2_12 ]); - src = fetchurl { - url = builtins.getAttr type urls; - sha512 = sha512."${stdenv.hostPlatform.system}" or (throw - "Missing hash for host system: ${stdenv.hostPlatform.system}"); - }; + src = fetchurl (srcs."${stdenv.hostPlatform.system}" or (throw + "Missing source (url and hash) for host system: ${stdenv.hostPlatform.system}")); sourceRoot = "."; @@ -87,10 +76,20 @@ in stdenv.mkDerivation rec { $out/bin/dotnet --info ''; + setupHook = writeText "dotnet-setup-hook" '' + if [ ! -w "$HOME" ]; then + export HOME=$(mktemp -d) # Dotnet expects a writable home directory for its configuration files + fi + + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Dont try to expand NuGetFallbackFolder to disk + export DOTNET_NOLOGO=1 # Disables the welcome message + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + ''; + meta = with lib; { homepage = "https://dotnet.github.io/"; description = builtins.getAttr type descriptions; - platforms = builtins.attrNames sha512; + platforms = builtins.attrNames srcs; maintainers = with maintainers; [ kuznero ]; license = licenses.mit; }; diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index c4eabac489d6..6ae8240c7f03 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -2,7 +2,7 @@ How to combine packages for use in development: dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_5_0 aspnetcore_5_0 ]; -Hashes below are retrived from: +Hashes and urls below are retrieved from: https://dotnet.microsoft.com/download/dotnet */ { callPackage }: @@ -16,98 +16,184 @@ rec { combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; # EOL - sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; - # v3.1 (LTS) - + # v3.1 (lts) aspnetcore_3_1 = buildAspNetCore { version = "3.1.21"; - sha512 = { - x86_64-linux = "f59252166dbfe11a78373226222d6a34484b9132e24283222aea8a950a5e9657da2e4d4e9ff8cbcc2fd7c7705e13bf42a31232a6012d1e247efc718e3d8e2df1"; - aarch64-linux = "f3d014431064362c29361e3d3b33b7aaaffe46e22f324cd42ba6fc6a6d5b712153e9ec82f10cf1bee416360a68fb4520dc9c0b0a8860316c4c9fce75f1adae80"; - x86_64-darwin = "477912671e21c7c61f5666323ad9e9c246550d40b4d127ccc71bcb296c86e07051e3c75251beef11806f198eebd0cd4b36790950f24c730dc6723156c0dc11b5"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/c4565012-97e8-4a5a-9edf-8d6c94f0ac5c/dd227c01d532bcb731b026243a51f55f/aspnetcore-runtime-3.1.21-linux-x64.tar.gz"; + sha512 = "f59252166dbfe11a78373226222d6a34484b9132e24283222aea8a950a5e9657da2e4d4e9ff8cbcc2fd7c7705e13bf42a31232a6012d1e247efc718e3d8e2df1"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/5d245f70-4e8f-457a-9c4f-d4140136e496/56193e7de38e0f4101eb6f3fd2c60c41/aspnetcore-runtime-3.1.21-linux-arm64.tar.gz"; + sha512 = "f3d014431064362c29361e3d3b33b7aaaffe46e22f324cd42ba6fc6a6d5b712153e9ec82f10cf1bee416360a68fb4520dc9c0b0a8860316c4c9fce75f1adae80"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/dd423a05-c133-464d-a117-d2e73d6dfeb5/a2d7c629802b8a283819a445a3024944/aspnetcore-runtime-3.1.21-osx-x64.tar.gz"; + sha512 = "477912671e21c7c61f5666323ad9e9c246550d40b4d127ccc71bcb296c86e07051e3c75251beef11806f198eebd0cd4b36790950f24c730dc6723156c0dc11b5"; + }; }; }; runtime_3_1 = buildNetRuntime { version = "3.1.21"; - sha512 = { - x86_64-linux = "cc4b2fef46e94df88bf0fc11cb15439e79bd48da524561dffde80d3cd6db218133468ad2f6785803cf0c13f000d95ff71eb258cec76dd8eb809676ec1cb38fac"; - aarch64-linux = "80971125650a2fa0163e39a2de98bc2e871c295b723559e6081a3ab59d99195aa5b794450f8182c5eb4e7e472ca1c13340ef1cc8a5588114c494bbb5981f19c4"; - x86_64-darwin = "049257f680fe7dfb8e98a2ae4da6aa184f171b04b81c506e7a83509e46b1ea81ea6000c4d01c5bed46d5495328c6d9a0eeecbc0dc7c2c698296251fb04b5e855"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/286e526e-282b-47e5-afeb-4f99ee481972/495908d6a6019e47249bd05f8346aeb5/dotnet-runtime-3.1.21-linux-x64.tar.gz"; + sha512 = "cc4b2fef46e94df88bf0fc11cb15439e79bd48da524561dffde80d3cd6db218133468ad2f6785803cf0c13f000d95ff71eb258cec76dd8eb809676ec1cb38fac"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/45b3ad17-6ce6-4cd6-a975-d4f152203750/c6df44d802c52e65ad5d9c783ccd46ab/dotnet-runtime-3.1.21-linux-arm64.tar.gz"; + sha512 = "80971125650a2fa0163e39a2de98bc2e871c295b723559e6081a3ab59d99195aa5b794450f8182c5eb4e7e472ca1c13340ef1cc8a5588114c494bbb5981f19c4"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/3896eba4-4ef4-47a7-846c-8acb44b15feb/4920ee69b26772423edc686e499da061/dotnet-runtime-3.1.21-osx-x64.tar.gz"; + sha512 = "049257f680fe7dfb8e98a2ae4da6aa184f171b04b81c506e7a83509e46b1ea81ea6000c4d01c5bed46d5495328c6d9a0eeecbc0dc7c2c698296251fb04b5e855"; + }; }; }; sdk_3_1 = buildNetSdk { version = "3.1.415"; - sha512 = { - x86_64-linux = "df7a6d1abed609c382799a8f69f129ec72ce68236b2faecf01aed4c957a40a9cfbbc9126381bf517dff3dbe0e488f1092188582701dd0fef09a68b8c5707c747"; - aarch64-linux = "7a5b9922988bcbde63d39f97e283ca1d373d5521cca0ab8946e2f86deaef6e21f00244228a0d5d8c38c2b9634b38bc7338b61984f0e12dd8fdb8b2e6eed5dd34"; - x86_64-darwin = "e26529714021d1828687c404dd0800c61eb267c9da62ee629b91f5ffa8af77d156911bd3c1a58bf11e5c589cfe4a852a95c14a7cb25f731e92a484348868964d"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/6425056e-bfd5-48be-8b00-223c03a4d0f3/08a801489b7f18e9e73a1378082fbe66/dotnet-sdk-3.1.415-linux-x64.tar.gz"; + sha512 = "df7a6d1abed609c382799a8f69f129ec72ce68236b2faecf01aed4c957a40a9cfbbc9126381bf517dff3dbe0e488f1092188582701dd0fef09a68b8c5707c747"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/4a78a923-e891-40fe-88d2-4bff2c90519f/126bee4399caeabde4f34f4ace7f44e3/dotnet-sdk-3.1.415-linux-arm64.tar.gz"; + sha512 = "7a5b9922988bcbde63d39f97e283ca1d373d5521cca0ab8946e2f86deaef6e21f00244228a0d5d8c38c2b9634b38bc7338b61984f0e12dd8fdb8b2e6eed5dd34"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/7d663efa-2180-4562-8735-be11d8ba465d/605910e63a687d8c9e72ba108ffb1da4/dotnet-sdk-3.1.415-osx-x64.tar.gz"; + sha512 = "e26529714021d1828687c404dd0800c61eb267c9da62ee629b91f5ffa8af77d156911bd3c1a58bf11e5c589cfe4a852a95c14a7cb25f731e92a484348868964d"; + }; }; }; - # v5.0 (Current) - + # v5.0 (current) aspnetcore_5_0 = buildAspNetCore { version = "5.0.12"; - sha512 = { - x86_64-linux = "0529f23ffa651ac2c2807b70d6e5034f6ae4c88204afdaaa76965ef604d6533f9440d68d9f2cdd3a9f2ca37e9140e6c61a9f9207d430c71140094c7d5c33bf79"; - aarch64-linux = "70570177896943613f0cddeb046ffccaafb1c8245c146383e45fbcfb27779c70dff1ab22c2b13a14bf096173c9279e0a386f61665106a3abb5f623b50281a652"; - x86_64-darwin = "bd9e7dd7f48c220121dde85b3acc4ce7eb2a1944d472f9340276718ef72d033f05fd9a62ffb9de93b8e7633843e731ff1cb5e8c836315f7571f519fdb0a119e1"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/ad0a54ca-4b88-4762-a790-aebeaba6b9e7/0f796fb90696d078046d90d8a05c027e/aspnetcore-runtime-5.0.12-linux-x64.tar.gz"; + sha512 = "0529f23ffa651ac2c2807b70d6e5034f6ae4c88204afdaaa76965ef604d6533f9440d68d9f2cdd3a9f2ca37e9140e6c61a9f9207d430c71140094c7d5c33bf79"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/bfc8ae06-2830-4082-a09e-63b3c7134096/880a4712d4ba3491c88aa566553c4e8a/aspnetcore-runtime-5.0.12-linux-arm64.tar.gz"; + sha512 = "70570177896943613f0cddeb046ffccaafb1c8245c146383e45fbcfb27779c70dff1ab22c2b13a14bf096173c9279e0a386f61665106a3abb5f623b50281a652"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/06d71ed5-0755-40d6-8b8e-14a24b8a9cb7/47a8b4deda0deecf3658716b642c69bf/aspnetcore-runtime-5.0.12-osx-x64.tar.gz"; + sha512 = "bd9e7dd7f48c220121dde85b3acc4ce7eb2a1944d472f9340276718ef72d033f05fd9a62ffb9de93b8e7633843e731ff1cb5e8c836315f7571f519fdb0a119e1"; + }; }; }; runtime_5_0 = buildNetRuntime { version = "5.0.12"; - sha512 = { - x86_64-linux = "32b5f86db3b1d4c21e3cf616d22f0e4a7374385dac0cf03cdebf3520dcf846460d9677ec1829a180920740a0237d64f6eaa2421d036a67f4fe9fb15d4f6b1db9"; - aarch64-linux = "a8089fad8d21a4b582aa6c3d7162d56a21fee697fd400f050a772f67c2ace5e4196d1c4261d3e861d6dc2e5439666f112c406104d6271e5ab60cda80ef2ffc64"; - x86_64-darwin = "a3160eaec15d0e2b62a4a2cdbb6663ef2e817fd26a3a3b8b3d75c5e3538b2947ff66eaddafb39cc297b9f087794d5fbd5a0e097ec8522ab6fea562f230055264"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/781b7ae6-166c-4114-97f8-926d2bf74d34/fe51479e3138d672c512ef0322be23d3/dotnet-runtime-5.0.12-linux-x64.tar.gz"; + sha512 = "32b5f86db3b1d4c21e3cf616d22f0e4a7374385dac0cf03cdebf3520dcf846460d9677ec1829a180920740a0237d64f6eaa2421d036a67f4fe9fb15d4f6b1db9"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/7c342ad2-2dae-471b-ae46-c0c820321c1f/a480ad8ca0bc826a48c9b1e56efd972b/dotnet-runtime-5.0.12-linux-arm64.tar.gz"; + sha512 = "a8089fad8d21a4b582aa6c3d7162d56a21fee697fd400f050a772f67c2ace5e4196d1c4261d3e861d6dc2e5439666f112c406104d6271e5ab60cda80ef2ffc64"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/8f990fa6-6b13-40ad-95f6-383391ff3d91/7531048d16c01efdf3885da367aa8b89/dotnet-runtime-5.0.12-osx-x64.tar.gz"; + sha512 = "a3160eaec15d0e2b62a4a2cdbb6663ef2e817fd26a3a3b8b3d75c5e3538b2947ff66eaddafb39cc297b9f087794d5fbd5a0e097ec8522ab6fea562f230055264"; + }; }; }; sdk_5_0 = buildNetSdk { version = "5.0.403"; - sha512 = { - x86_64-linux = "7ba5f7f898dba64ea7027dc66184d60ac5ac35fabe750bd509711628442e098413878789fad5766be163fd2867cf22ef482a951e187cf629bbc6f54dd9293a4a"; - aarch64-linux = "6cc705fe45c0d8df6a493eb2923539ef5b62d048d5218859bf3af06fb3934c9c716c16f98ee1a28c818d77adff8430bf39a2ae54a59a1468b704b4ba192234ac"; - x86_64-darwin = "70beea069db182cca211cf04d7a80f3d6a3987d76cbd2bb60590ee76b93a4041b1b86ad91057cddbbaddd501c72327c1bc0a5fec630f38063f84bd60ba2b4792"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/b77183fa-c045-4058-82c5-d37742ed5f2d/ddaccef3e448a6df348cae4d1d271339/dotnet-sdk-5.0.403-linux-x64.tar.gz"; + sha512 = "7ba5f7f898dba64ea7027dc66184d60ac5ac35fabe750bd509711628442e098413878789fad5766be163fd2867cf22ef482a951e187cf629bbc6f54dd9293a4a"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/91015c72-ce5a-4840-9e87-5bfa4bb80224/b39692ac418d790ff7a2e092eb07de98/dotnet-sdk-5.0.403-linux-arm64.tar.gz"; + sha512 = "6cc705fe45c0d8df6a493eb2923539ef5b62d048d5218859bf3af06fb3934c9c716c16f98ee1a28c818d77adff8430bf39a2ae54a59a1468b704b4ba192234ac"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/5ccdb916-531f-4064-84e8-5475b273a4de/80dcfa0c2eb528f8b0e7c313ed36f4f1/dotnet-sdk-5.0.403-osx-x64.tar.gz"; + sha512 = "70beea069db182cca211cf04d7a80f3d6a3987d76cbd2bb60590ee76b93a4041b1b86ad91057cddbbaddd501c72327c1bc0a5fec630f38063f84bd60ba2b4792"; + }; }; }; - # v6.0 (LTS) - + # v6.0 (lts) aspnetcore_6_0 = buildAspNetCore { - version = "6.0.0"; - sha512 = { - x86_64-linux = "6a1ae878efdc9f654e1914b0753b710c3780b646ac160fb5a68850b2fd1101675dc71e015dbbea6b4fcf1edac0822d3f7d470e9ed533dd81d0cfbcbbb1745c6c"; - aarch64-linux = "e61eade344b686180b8a709229d6b3180ea6f085523e5e4e4b0d23dd00cf9edce3e51a920c986b1bab7d04d8cab5aae219c3b533b6feb84b32a02810936859b0"; - x86_64-darwin = "76029272ff50fbf9fcc513109b98c0db5f74dbf970c1380be4dfac0dae7558824d68a167d0a8ceb39042ff4a7ca973cdcc15afed2d1ffef55b0adba8e40c9073"; - aarch64-darwin = "e459ddf33243d680baecc5378b9c4182daf42b8c36a9a996205d91146a614d048a385f953c43727350ad55b1221c5f5d43b383d03e3883e862bf12faeaa02dfb"; + version = "6.0.3"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/3af854b6-80fb-425a-972f-c7f0d693bf1b/cd458a4feae5a98646ee12a14ab34151/aspnetcore-runtime-6.0.3-linux-x64.tar.gz"; + sha512 = "9ea54220468d922ef2c40433c4b8c70df6c60d8ea63a3ac1ff5e5ce712606ae5cfe1e57d321b87eff1b5dc34d7823a4b4b964180587383f22d9a0ff5bb3a8c88"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/1e7933b2-1202-4aeb-bb70-a6f9cecac61a/b12b5666b3d4cf508f8575581abd4033/aspnetcore-runtime-6.0.3-linux-arm64.tar.gz"; + sha512 = "745586b64d3e01f856c366821f6fb8ca97c55b2a90ba36d528fdf99c98938574805153e7d4fff0560afe8382bea14b35ddeba391a2dc2328285f02e125c9b702"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/2cfe2a02-dd59-4cb7-9788-76c620eaa0ff/dfd0d449289a042be9bc62e4466bf350/aspnetcore-runtime-6.0.3-osx-x64.tar.gz"; + sha512 = "bda83cf36fc9aa62ff3e16a26b5f8f37efa3221ab826467fe26f3072517a428c64e44bc52f8a90f5c77bc60eeeddb8c3d59d2a509999edce3b51b835dd7edf83"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/d7cf4456-d9ba-4a31-98e9-4681e1b0d8b8/b9c4cfded00e9940756e62c4486f64c6/aspnetcore-runtime-6.0.3-osx-arm64.tar.gz"; + sha512 = "03d1d4e8a8370856120e045ed4a83b3383d00fb56b5fdaf7db0de8bab5e3de60d03c02deaed6f72bde0d6b0e12511fe1202c4e2c25fdeeb489ad61a5902d71d3"; + }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.0"; - sha512 = { - x86_64-linux = "7cc8d93f9495b516e1b33bf82af3af605f1300bcfeabdd065d448cc126bd97ab4da5ec5e95b7775ee70ab4baf899ff43671f5c6f647523fb41cda3d96f334ae5"; - aarch64-linux = "b0f0f2b4dc0a31b06cc3af541a3c44260317ca3a4414a5d50e6cf859d93821b3d2c2246baec9f96004aeb1eb0e353631283b11cf3acc134d4694f0ed71c9503d"; - x86_64-darwin = "d6842bddd9652dd7ad1d8156c3e9012f9412b3d89b4cfc0b6d644fd76744298aa5ed2cde8a80d14bb2b247ee162bae255875ee2ca62033a422dacb7adaeece2d"; - aarch64-darwin = "5cfc3c8a70f0e90f09047d3eeccd699e7210756b60fabbf1a30d6fdc121df084e5d8c3210557273739d5421f031dc9e4d07c611406734ca0671585de6e28e028"; + version = "6.0.3"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/4e766615-57e6-4b1d-a574-25eeb7a71107/9f95f74c33711e085302ffd644ef86ee/dotnet-runtime-6.0.3-linux-x64.tar.gz"; + sha512 = "083d9e6e72f0d8f175b341f5229277374e630c5358cfd3602fe611aeef59abec715edbe18d62135a5d13a650e99ef49f19b17e8c81663d0b5bee757519bec894"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/89b5d16e-cb5e-4e6c-90f6-7332e93d20ae/7a0146aa4fc59154a3256c5196a622c7/dotnet-runtime-6.0.3-linux-arm64.tar.gz"; + sha512 = "f0f9fb191054dea2e4151a86c3de1a11ce574cc843cde429850db0996c7df403dfa348a277f1af96f13fec718ae77f3be75379ed3829b027e561564ff22c7258"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/1f354e35-ff3f-4de7-b6be-f5001b7c3976/b7c8814ab28a6f00f063440e63903105/dotnet-runtime-6.0.3-osx-x64.tar.gz"; + sha512 = "98c457cbc0ac8f5f0acd7807bb45726b78e87d4f554fd30123cc8d9568b5341cc5bba16c8e4c85537ec4798d7e4d7f2f11701d2045b124f1b36bca75d80458e8"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/03047609-269e-4ca6-bf2e-406c496b27e3/3b19ad4d3fbc5d9a92f436db13e9e3d1/dotnet-runtime-6.0.3-osx-arm64.tar.gz"; + sha512 = "1debd4acab3c6408c849323e6dfba28a626850c40f93a0debe46c54f0c0b39526f4118d5b2bcf0307efeba0bc2656a92187a685400095ae078227698a0aabfb3"; + }; }; }; sdk_6_0 = buildNetSdk { - version = "6.0.100"; - sha512 = { - x86_64-linux = "cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b"; - aarch64-linux = "e5983c1c599d6dc7c3c7496b9698e47c68247f04a5d0d1e3162969d071471297bce1c2fd3a1f9fb88645006c327ae79f880dcbdd8eefc9166fd717331f2716e7"; - x86_64-darwin = "6e2f502a84f712d60daed31c4076c5b55ee98a03259adf4bdc01659afcac2be7050e5a404dcda35fdc598bf5cd766772c08abc483ed94f6985c9501057b0186a"; - aarch64-darwin = "92ead34c7e082dbed2786db044385ddfc68673e096a3edf64bc0bf70c76ea1c5cb816cde99aab2d8c528a44c86593b812877d075486dd0ae565f0e01e9eaa562"; + version = "6.0.201"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/c505a449-9ecf-4352-8629-56216f521616/bd6807340faae05b61de340c8bf161e8/dotnet-sdk-6.0.201-linux-x64.tar.gz"; + sha512 = "a4d96b6ca2abb7d71cc2c64282f9bd07cedc52c03d8d6668346ae0cd33a9a670d7185ab0037c8f0ecd6c212141038ed9ea9b19a188d1df2aae10b2683ce818ce"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/33c6e1e3-e81f-44e8-9de8-91934fba3c94/9105f95a9e37cda6bd0c33651be2b90a/dotnet-sdk-6.0.201-linux-arm64.tar.gz"; + sha512 = "2ea443c27ab7ca9d566e4df0e842063642394fd22fe2a8620371171c8207ae6a4a72c8c54fc6af5b6b053be25cf9c09a74504f08b963e5bd84544619aed9afc2"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/cecaa095-3254-4987-b105-6bb9b594a89c/df29881aea827565a96d5e47dc337749/dotnet-sdk-6.0.201-osx-x64.tar.gz"; + sha512 = "1df27ca5a1db1a8712acd95083aa00ec7b266618770e164d6460d0cf781b3643a7365ef35232140c83b588f7aa4e2d7e5f5b6d627f1851b2d0ec197172f9fb4d"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/628be5e6-7fc7-42b6-99c9-ea46fbcc3d14/d94bb4198af2d5013c75b1c70751ec8f/dotnet-sdk-6.0.201-osx-arm64.tar.gz"; + sha512 = "0796a81339788fbc160885548983889dcffd26a5c0ac935b497b290ae99920386f3929cebfbef9bb22f644a207ba329cf8b90ffe7bbb49d1d99d0d8a05ce50c9"; + }; }; }; } diff --git a/pkgs/development/compilers/dotnet/print-hashes.sh b/pkgs/development/compilers/dotnet/print-hashes.sh index 5c97c3132338..966f0a9c0614 100755 --- a/pkgs/development/compilers/dotnet/print-hashes.sh +++ b/pkgs/development/compilers/dotnet/print-hashes.sh @@ -1,69 +1,110 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl +#!nix-shell -i bash -p curl jq set -eu -if [[ $# -lt 1 ]]; then - echo \"usage: $0 version\" >&2 +release () { + local content="$1" + local version="$2" + + jq -r '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content" +} + +release_files () { + local release="$1" + local type="$2" + + jq -r '[."'"$type"'".files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" +} + +release_platform_attr () { + local release_files="$1" + local platform="$2" + local attr="$3" + + jq -r '.[] | select(.rid == "'"$platform"'") | ."'"$attr"'"' <<< "$release_files" +} + +platform_sources () { + local release_files="$1" + local platforms=( \ + "x86_64-linux linux-x64" \ + "aarch64-linux linux-arm64" \ + "x86_64-darwin osx-x64" \ + "aarch64-darwin osx-arm64" \ + ) + + echo "srcs = {" + for kv in "${platforms[@]}"; do + local nix_platform=${kv%% *} + local ms_platform=${kv##* } + + local url=$(release_platform_attr "$release_files" "$ms_platform" url) + local hash=$(release_platform_attr "$release_files" "$ms_platform" hash) + + [[ -z "$url" || -z "$hash" ]] && continue + echo " $nix_platform = { + url = \"$url\"; + sha512 = \"$hash\"; + }; " + done + echo " };" +} + +main () { + pname=$(basename "$0") + if [[ ! "$*" =~ ^.*[0-9]{1,}\.[0-9]{1,}.*$ ]]; then + echo "Usage: $pname [sem-versions] +Get updated dotnet src (platform - url & sha512) expressions for specified versions + +Examples: + $pname 3.1.21 5.0.12 - specific x.y.z versions + $pname 3.1 5.0 6.0 - latest x.y versions +" >&2 exit 1 -fi + fi -VERSION=$1 -HASHFILE=$(mktemp /tmp/dotnet.hashes.XXXXXXXX) -trap "rm -f $HASHFILE" EXIT + for sem_version in "$@"; do + patch_specified=false + if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$ ]]; then + patch_specified=true + elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then + continue + fi -curl -L https://dotnetcli.blob.core.windows.net/dotnet/checksums/$VERSION-sha.txt -o $HASHFILE + major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") + content=$(curl -sL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) + major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content") -ASPNETCORE_VERSION=$(grep aspnetcore-runtime- $HASHFILE | grep -- -linux-x64.tar.gz | tail -n -1 | sed -e 's:.*aspnetcore-runtime-::' -e 's:-linux-x64.tar.gz.*$::' ) -ASPNETCORE_HASH_LINUX_X64=$(grep aspnetcore-runtime- $HASHFILE | grep -- -linux-x64.tar.gz | cut -d ' ' -f 1) -ASPNETCORE_HASH_LINUX_ARM64=$(grep aspnetcore-runtime- $HASHFILE | grep -- -linux-arm64.tar.gz | cut -d ' ' -f 1) -ASPNETCORE_HASH_OSX_X64=$(grep aspnetcore-runtime- $HASHFILE | grep -- -osx-x64.tar.gz | cut -d ' ' -f 1) -ASPNETCORE_HASH_OSX_ARM64=$(grep aspnetcore-runtime- $HASHFILE | grep -- -osx-arm64.tar.gz | cut -d ' ' -f 1) + release_content=$(release "$content" "$major_minor_patch") + aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") + runtime_version=$(jq -r '.runtime.version' <<< "$release_content") + sdk_version=$(jq -r '.sdk.version' <<< "$release_content") -RUNTIME_VERSION=$(grep dotnet-runtime- $HASHFILE | grep -- -linux-x64.tar.gz | tail -n -1 | sed -e 's:.*dotnet-runtime-::' -e 's:-linux-x64.tar.gz.*$::' ) -RUNTIME_HASH_LINUX_X64=$(grep dotnet-runtime- $HASHFILE | grep -- -linux-x64.tar.gz | cut -d ' ' -f 1) -RUNTIME_HASH_LINUX_ARM64=$(grep dotnet-runtime- $HASHFILE | grep -- -linux-arm64.tar.gz | cut -d ' ' -f 1) -RUNTIME_HASH_OSX_X64=$(grep dotnet-runtime- $HASHFILE | grep -- -osx-x64.tar.gz | cut -d ' ' -f 1) -RUNTIME_HASH_OSX_ARM64=$(grep dotnet-runtime- $HASHFILE | grep -- -osx-arm64.tar.gz | cut -d ' ' -f 1) + aspnetcore_files="$(release_files "$release_content" "aspnetcore-runtime")" + runtime_files="$(release_files "$release_content" "runtime")" + sdk_files="$(release_files "$release_content" "sdk")" -# dotnet-sdk has multiple entries in file, but the latest is the newest -SDK_VERSION=$(grep dotnet-sdk- $HASHFILE | grep -- -linux-x64.tar.gz | tail -n -1 | sed -e 's:.*dotnet-sdk-::' -e 's:-linux-x64.tar.gz.*$::' ) -SDK_HASH_LINUX_X64=$(grep dotnet-sdk- $HASHFILE | grep -- -linux-x64.tar.gz | tail -n 1 | cut -d ' ' -f 1) -SDK_HASH_LINUX_ARM64=$(grep dotnet-sdk- $HASHFILE | grep -- -linux-arm64.tar.gz | tail -n 1 | cut -d ' ' -f 1) -SDK_HASH_OSX_X64=$(grep dotnet-sdk- $HASHFILE | grep -- -osx-x64.tar.gz | tail -n 1 | cut -d ' ' -f 1) -SDK_HASH_OSX_ARM64=$(grep dotnet-sdk- $HASHFILE | grep -- -osx-arm64.tar.gz | tail -n 1 | cut -d ' ' -f 1) - -V=${VERSION/./_} -MAJOR_MINOR_VERSION=${V%%.*} - -echo """ - aspnetcore_${MAJOR_MINOR_VERSION} = buildAspNetCore { - version = \"${ASPNETCORE_VERSION}\"; - sha512 = { - x86_64-linux = \"${ASPNETCORE_HASH_LINUX_X64}\"; - aarch64-linux = \"${ASPNETCORE_HASH_LINUX_ARM64}\"; - x86_64-darwin = \"${ASPNETCORE_HASH_OSX_X64}\"; - aarch64-darwin = \"${ASPNETCORE_HASH_OSX_ARM64}\"; - }; + major_minor_underscore=${major_minor/./_} + channel_version=$(jq -r '."channel-version"' <<< "$content") + support_phase=$(jq -r '."support-phase"' <<< "$content") + echo " + # v$channel_version ($support_phase) + aspnetcore_$major_minor_underscore = buildAspNetCore { + version = \"${aspnetcore_version}\"; + $(platform_sources "$aspnetcore_files") }; - runtime_${MAJOR_MINOR_VERSION} = buildNetRuntime { - version = \"${RUNTIME_VERSION}\"; - sha512 = { - x86_64-linux = \"${RUNTIME_HASH_LINUX_X64}\"; - aarch64-linux = \"${RUNTIME_HASH_LINUX_ARM64}\"; - x86_64-darwin = \"${RUNTIME_HASH_OSX_X64}\"; - aarch64-darwin = \"${RUNTIME_HASH_OSX_ARM64}\"; - }; + runtime_$major_minor_underscore = buildNetRuntime { + version = \"${runtime_version}\"; + $(platform_sources "$runtime_files") }; - sdk_${MAJOR_MINOR_VERSION} = buildNetSdk { - version = \"${SDK_VERSION}\"; - sha512 = { - x86_64-linux = \"${SDK_HASH_LINUX_X64}\"; - aarch64-linux = \"${SDK_HASH_LINUX_ARM64}\"; - x86_64-darwin = \"${SDK_HASH_OSX_X64}\"; - aarch64-darwin = \"${SDK_HASH_OSX_ARM64}\"; - }; - }; -""" + sdk_$major_minor_underscore = buildNetSdk { + version = \"${sdk_version}\"; + $(platform_sources "$sdk_files") + }; " + done +} + +main "$@" diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index e60d647f6d38..47ea90482b6d 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -33,7 +33,7 @@ buildType = if stdenv.isDarwin then edk2 = buildStdenv.mkDerivation { pname = "edk2"; - version = "202108"; + version = "202202"; # submodules src = fetchFromGitHub { @@ -41,21 +41,9 @@ edk2 = buildStdenv.mkDerivation { repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - sha256 = "1ps244f7y43afxxw6z95xscy24f9mpp8g0mfn90rd4229f193ba2"; + sha256 = "0srmhi6c27n5vyl01nhh0fq8k4vngbwn79siyjvcacjbj2ivhh8d"; }; - patches = [ - # Pull upstream fix for gcc-11 build. - (fetchpatch { - name = "gcc-11-vla.patch"; - url = "https://github.com/google/brotli/commit/0a3944c8c99b8d10cc4325f721b7c273d2b41f7b.patch"; - sha256 = "10c6ibnxh4f8lrh9i498nywgva32jxy2c1zzvr9mcqgblf9d19pj"; - # Apply submodule patch to subdirectory: "a/" -> "BaseTools/Source/C/BrotliCompress/brotli/" - stripLen = 1; - extraPrefix = "BaseTools/Source/C/BrotliCompress/brotli/"; - }) - ]; - buildInputs = [ libuuid pythonEnv ]; makeFlags = [ "-C BaseTools" ] @@ -75,7 +63,7 @@ edk2 = buildStdenv.mkDerivation { meta = with lib; { description = "Intel EFI development kit"; - homepage = "https://sourceforge.net/projects/edk2/"; + homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/"; license = licenses.bsd2; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ]; }; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 11b5f58a12d8..ab19ac42d24c 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -1,95 +1,101 @@ -{ lib, stdenv, pkgs -, haskell, haskellPackages, nodejs-14_x -, fetchurl, fetchpatch, makeWrapper, writeScriptBin - # Rust dependecies -, curl, rustPlatform, openssl, pkg-config, Security, darwin -}: +{ pkgs, lib }: + let + # To controll nodejs version we pass down - nodejs = nodejs-14_x; + nodejs = pkgs.nodejs-14_x; - fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; + fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; - hsPkgs = haskellPackages.override { - overrides = self: super: with haskell.lib.compose; with lib; - let elmPkgs = rec { - elm = overrideCabal (drv: { - # sadly with parallelism most of the time breaks compilation - enableParallelBuilding = false; - preConfigure = self.fetchElmDeps { - elmPackages = (import ./packages/elm-srcs.nix); - elmVersion = drv.version; - registryDat = ./registry.dat; - }; - buildTools = drv.buildTools or [] ++ [ makeWrapper ]; - jailbreak = true; - postInstall = '' - wrapProgram $out/bin/elm \ - --prefix PATH ':' ${lib.makeBinPath [ nodejs ]} - ''; + hsPkgs = self: pkgs.haskell.packages.ghc8107.override { + overrides = self: super: with pkgs.haskell.lib.compose; with lib; + let elmPkgs = rec { + elm = overrideCabal (drv: { + # sadly with parallelism most of the time breaks compilation + enableParallelBuilding = false; + preConfigure = fetchElmDeps { + elmPackages = (import ./packages/elm-srcs.nix); + elmVersion = drv.version; + registryDat = ./registry.dat; + }; + buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ]; + jailbreak = true; + postInstall = '' + wrapProgram $out/bin/elm \ + --prefix PATH ':' ${lib.makeBinPath [ nodejs ]} + ''; - description = "A delightful language for reliable webapps"; - homepage = "https://elm-lang.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ domenkozar turbomack ]; - }) (self.callPackage ./packages/elm.nix { }); + description = "A delightful language for reliable webapps"; + homepage = "https://elm-lang.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ domenkozar turbomack ]; + }) (self.callPackage ./packages/elm.nix { }); - /* - The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo: - `package/nix/build.sh` - */ - elm-format = justStaticExecutables (overrideCabal (drv: { - jailbreak = true; + /* + The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo: + `package/nix/build.sh` + */ + elm-format = justStaticExecutables (overrideCabal (drv: { + jailbreak = true; - description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide"; - homepage = "https://github.com/avh4/elm-format"; - license = licenses.bsd3; - maintainers = with maintainers; [ avh4 turbomack ]; - }) (self.callPackage ./packages/elm-format.nix {})); + description = "Formats Elm source code according to a standard set of rules based on the official Elm Style Guide"; + homepage = "https://github.com/avh4/elm-format"; + license = licenses.bsd3; + maintainers = with maintainers; [ avh4 turbomack ]; + }) (self.callPackage ./packages/elm-format.nix {})); - elmi-to-json = justStaticExecutables (overrideCabal (drv: { - prePatch = '' - substituteInPlace package.yaml --replace "- -Werror" "" - hpack - ''; - jailbreak = true; + elmi-to-json = justStaticExecutables (overrideCabal (drv: { + prePatch = '' + substituteInPlace package.yaml --replace "- -Werror" "" + hpack + ''; + jailbreak = true; - description = "Tool that reads .elmi files (Elm interface file) generated by the elm compiler"; - homepage = "https://github.com/stoeffel/elmi-to-json"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }) (self.callPackage ./packages/elmi-to-json.nix {})); + description = "Tool that reads .elmi files (Elm interface file) generated by the elm compiler"; + homepage = "https://github.com/stoeffel/elmi-to-json"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }) (self.callPackage ./packages/elmi-to-json.nix {})); - elm-instrument = justStaticExecutables (overrideCabal (drv: { - prePatch = '' - sed "s/desc <-.*/let desc = \"${drv.version}\"/g" Setup.hs --in-place - ''; - jailbreak = true; - # Tests are failing because of missing instances for Eq and Show type classes - doCheck = false; + elm-instrument = justStaticExecutables (overrideCabal (drv: { + prePatch = '' + sed "s/desc <-.*/let desc = \"${drv.version}\"/g" Setup.hs --in-place + ''; + jailbreak = true; + # Tests are failing because of missing instances for Eq and Show type classes + doCheck = false; - description = "Instrument Elm code as a preprocessing step for elm-coverage"; - homepage = "https://github.com/zwilias/elm-instrument"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }) (self.callPackage ./packages/elm-instrument.nix {})); + description = "Instrument Elm code as a preprocessing step for elm-coverage"; + homepage = "https://github.com/zwilias/elm-instrument"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }) (self.callPackage ./packages/elm-instrument.nix {})); - inherit fetchElmDeps; - elmVersion = elmPkgs.elm.version; - }; - in elmPkgs // { - inherit elmPkgs; + inherit fetchElmDeps; + elmVersion = elmPkgs.elm.version; + }; + in elmPkgs // { + inherit elmPkgs; - # Needed for elm-format - indents = self.callPackage ./packages/indents.nix {}; - bimap = self.callPackage ./packages/bimap.nix {}; - avh4-lib = doJailbreak (self.callPackage ./packages/avh4-lib.nix {}); - elm-format-lib = doJailbreak (self.callPackage ./packages/elm-format-lib.nix {}); - elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {}; - elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {}; - }; + # Needed for elm-format + indents = self.callPackage ./packages/indents.nix {}; + bimap = self.callPackage ./packages/bimap.nix {}; + avh4-lib = doJailbreak (self.callPackage ./packages/avh4-lib.nix {}); + elm-format-lib = doJailbreak (self.callPackage ./packages/elm-format-lib.nix {}); + elm-format-test-lib = self.callPackage ./packages/elm-format-test-lib.nix {}; + elm-format-markdown = self.callPackage ./packages/elm-format-markdown.nix {}; + }; }; + nodePkgs = pkgs.callPackage ./packages/node-composition.nix { + inherit pkgs; + nodejs = pkgs.nodejs-14_x; + inherit (pkgs.stdenv.hostPlatform) system; + }; + +in lib.makeScope pkgs.newScope (self: with self; { + inherit fetchElmDeps nodejs; + /* Node/NPM based dependecies can be upgraded using script `packages/generate-node-packages.sh`. * Packages which rely on `bin-wrap` will fail by default @@ -98,110 +104,83 @@ let * Packages which depend on npm installation of elm can be patched using `patchNpmElm` function also defined in `packages/lib.nix`. */ - elmLib = import ./packages/lib.nix { - inherit lib writeScriptBin stdenv; - inherit (hsPkgs.elmPkgs) elm; + elmLib = let + hsElmPkgs = hsPkgs self; + in import ./packages/lib.nix { + inherit lib; + inherit (pkgs) writeScriptBin stdenv; + inherit (hsElmPkgs.elmPkgs) elm; }; - elmRustPackages = { - elm-json = import ./packages/elm-json.nix { - inherit curl lib rustPlatform fetchurl openssl stdenv pkg-config Security; - } // { - meta = with lib; { - description = "Install, upgrade and uninstall Elm dependencies"; - homepage = "https://github.com/zwilias/elm-json"; + elm-json = callPackage ./packages/elm-json.nix { }; + + elm-test-rs = callPackage ./packages/elm-test-rs.nix { }; + + elm-test = nodePkgs.elm-test // { + meta = with lib; nodePkgs.elm-test.meta // { + description = "Runs elm-test suites from Node.js"; + homepage = "https://github.com/rtfeldman/node-test-runner"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }; + }; +} // (hsPkgs self).elmPkgs // (with elmLib; with (hsPkgs self).elmPkgs; { + elm-verify-examples = patchBinwrap [elmi-to-json] nodePkgs.elm-verify-examples // { + meta = with lib; nodePkgs.elm-verify-examples.meta // { + description = "Verify examples in your docs"; + homepage = "https://github.com/stoeffel/elm-verify-examples"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }; + }; + + elm-coverage = let + patched = patchNpmElm (patchBinwrap [elmi-to-json] nodePkgs.elm-coverage); + in patched.override (old: { + # Symlink Elm instrument binary + preRebuild = (old.preRebuild or "") + '' + # Noop custom installation script + sed 's/\"install\".*/\"install\":\"echo no-op\"/g' --in-place package.json + + # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done + # in case of just this package + # TODO: investigate + sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json + ''; + postInstall = (old.postInstall or "") + '' + mkdir -p unpacked_bin + ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument + ''; + meta = with lib; nodePkgs.elm-coverage.meta // { + description = "Work in progress - Code coverage tooling for Elm"; + homepage = "https://github.com/zwilias/elm-coverage"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }; + }); + + create-elm-app = patchNpmElm + nodePkgs.create-elm-app // { + meta = with lib; nodePkgs.create-elm-app.meta // { + description = "Create Elm apps with no build configuration"; + homepage = "https://github.com/halfzebra/create-elm-app"; license = licenses.mit; maintainers = [ maintainers.turbomack ]; }; }; - elm-test-rs = import ./packages/elm-test-rs.nix { - inherit lib rustPlatform fetchurl openssl stdenv Security darwin; - } // { - meta = with lib; { - description = "Fast and portable executable to run your Elm tests"; - homepage = "https://github.com/mpizenberg/elm-test-rs"; - license = licenses.bsd3; - maintainers = [ maintainers.jpagex ]; + elm-review = + nodePkgs.elm-review // { + meta = with lib; nodePkgs.elm-review.meta // { + description = "Analyzes Elm projects, to help find mistakes before your users find them"; + homepage = "https://package.elm-lang.org/packages/jfmengels/elm-review/${nodePkgs.elm-review.version}"; + license = licenses.bsd3; + maintainers = [ maintainers.turbomack ]; + }; }; - }; - }; - - elmNodePackages = with elmLib; - let - nodePkgs = import ./packages/node-composition.nix { - inherit nodejs pkgs; - inherit (stdenv.hostPlatform) system; - }; - in with hsPkgs.elmPkgs; { - - elm-test = - nodePkgs.elm-test // { - meta = with lib; { - description = "Runs elm-test suites from Node.js"; - homepage = "https://github.com/rtfeldman/node-test-runner"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }; - }; - - elm-verify-examples = patchBinwrap [elmi-to-json] - nodePkgs.elm-verify-examples // { - meta = with lib; { - description = "Verify examples in your docs"; - homepage = "https://github.com/stoeffel/elm-verify-examples"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }; - }; - - elm-coverage = - let patched = patchNpmElm (patchBinwrap [elmi-to-json] nodePkgs.elm-coverage); - in patched.override (old: { - # Symlink Elm instrument binary - preRebuild = (old.preRebuild or "") + '' - # Noop custom installation script - sed 's/\"install\".*/\"install\":\"echo no-op\"/g' --in-place package.json - - # This should not be needed (thanks to binwrap* being nooped) but for some reason it still needs to be done - # in case of just this package - # TODO: investigate - sed 's/\"install\".*/\"install\":\"echo no-op\",/g' --in-place node_modules/elmi-to-json/package.json - ''; - postInstall = (old.postInstall or "") + '' - mkdir -p unpacked_bin - ln -sf ${elm-instrument}/bin/elm-instrument unpacked_bin/elm-instrument - ''; - meta = with lib; { - description = "Work in progress - Code coverage tooling for Elm"; - homepage = "https://github.com/zwilias/elm-coverage"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }; - }); - - create-elm-app = patchNpmElm - nodePkgs.create-elm-app // { - meta = with lib; { - description = "Create Elm apps with no build configuration"; - homepage = "https://github.com/halfzebra/create-elm-app"; - license = licenses.mit; - maintainers = [ maintainers.turbomack ]; - }; - }; - - elm-review = - nodePkgs.elm-review // { - meta = with lib; { - description = "Analyzes Elm projects, to help find mistakes before your users find them"; - homepage = "https://package.elm-lang.org/packages/jfmengels/elm-review/${nodePkgs.elm-review.version}"; - license = licenses.bsd3; - maintainers = [ maintainers.turbomack ]; - }; - }; elm-language-server = nodePkgs."@elm-tooling/elm-language-server" // { - meta = with lib; { + meta = with lib; nodePkgs."@elm-tooling/elm-language-server".meta // { description = "Language server implementation for Elm"; homepage = "https://github.com/elm-tooling/elm-language-server"; license = licenses.mit; @@ -210,7 +189,7 @@ let }; elm-optimize-level-2 = nodePkgs."elm-optimize-level-2" // { - meta = with lib; { + meta = with lib; nodePkgs."elm-optimize-level-2".meta // { description = "A second level of optimization for the Javascript that the Elm Compiler produces"; homepage = "https://github.com/mdgriffith/elm-optimize-level-2"; license = licenses.bsd3; @@ -219,8 +198,5 @@ let }; inherit (nodePkgs) elm-doc-preview elm-live elm-upgrade elm-xref elm-analyse elm-git-install; - }; - -in hsPkgs.elmPkgs // elmNodePackages // elmRustPackages // { - lib = elmLib; -} + }) + ) diff --git a/pkgs/development/compilers/elm/packages/elm-json.nix b/pkgs/development/compilers/elm/packages/elm-json.nix index a480b9e0e1eb..faf6ffd8a2e1 100644 --- a/pkgs/development/compilers/elm/packages/elm-json.nix +++ b/pkgs/development/compilers/elm/packages/elm-json.nix @@ -1,4 +1,13 @@ -{ lib, curl, rustPlatform, fetchurl, openssl, stdenv, pkg-config, Security }: +{ lib +, curl +, rustPlatform +, fetchurl +, openssl +, stdenv +, pkg-config +, darwin +}: + rustPlatform.buildRustPackage rec { pname = "elm-json"; version = "0.2.10"; @@ -12,10 +21,19 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ curl openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ + curl openssl + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; cargoSha256 = "sha256:01zasrqf1va58i52s3kwdkj1rnwy80gv00xi6npfshjirj3ix07f"; # Tests perform networking and therefore can't work in sandbox doCheck = false; + + meta = with lib; { + description = "Install, upgrade and uninstall Elm dependencies"; + homepage = "https://github.com/zwilias/elm-json"; + license = licenses.mit; + maintainers = [ maintainers.turbomack ]; + }; } diff --git a/pkgs/development/compilers/elm/packages/elm-test-rs.nix b/pkgs/development/compilers/elm/packages/elm-test-rs.nix index a482809ab50d..09d453b00f83 100644 --- a/pkgs/development/compilers/elm/packages/elm-test-rs.nix +++ b/pkgs/development/compilers/elm/packages/elm-test-rs.nix @@ -1,4 +1,5 @@ -{ lib, rustPlatform, fetchurl, openssl, stdenv, Security, darwin }: +{ lib, rustPlatform, fetchurl, openssl, stdenv, darwin }: + rustPlatform.buildRustPackage rec { pname = "elm-test-rs"; version = "2.0"; @@ -8,11 +9,23 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256:1manr42w613r9vyji7pxx5gb08jcgkdxv29qqylrqlwxa8d5dcid"; }; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security darwin.apple_sdk.frameworks.CoreServices ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ + openssl + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Security + CoreServices + ]); cargoSha256 = "sha256:1dpdlzv96kpc25yf5jgsz9qldghyw35x382qpxhkadkn5dryzjvd"; verifyCargoDeps = true; # Tests perform networking and therefore can't work in sandbox doCheck = false; + + meta = with lib; { + description = "Fast and portable executable to run your Elm tests"; + homepage = "https://github.com/mpizenberg/elm-test-rs"; + license = licenses.bsd3; + maintainers = [ maintainers.jpagex ]; + }; } diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix index c012d59d8ae3..e24ece00ffef 100644 --- a/pkgs/development/compilers/elm/packages/elm.nix +++ b/pkgs/development/compilers/elm/packages/elm.nix @@ -6,6 +6,7 @@ , snap-core, snap-server, lib, template-haskell, time , unordered-containers, utf8-string, vector, zip-archive }: + mkDerivation { pname = "elm"; version = "0.19.1"; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index c514b86a6c42..af78b56c097f 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "2.0.27"; + version = "3.0.0"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "1dpfib2nmbvskqlaqw3kvaay69qpa7d155hd4w05c2xgmahmrd4n"; + sha256 = "sha256-HlXcPKlmBTwEKgTfeMg6QoMKMbK++bpv2fu1DyolrHs="; rev = version; }; diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index 9f4263b08ed5..d9f809c0a0ae 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.29"; + version = "1.73.30"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "sha256-Yyj02DRo9wTkJ01ukOwElHr1ZyZFPOMTibwyAkqYISs="; + sha256 = "sha256-dRlQUaWIHbu+DwQBFh6Tf4o2u0LTRw/Ehp2hT9LC8QE="; }; installPhase = '' diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index a91105adc33e..9eba67734485 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -4,20 +4,20 @@ let getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - version = "2.8.0"; + version = "2.10.1"; channel = "stable"; filename = "flutter_linux_${version}-${channel}.tar.xz"; # Decouples flutter derivation from dart derivation, # use specific dart version to not need to bump dart derivation when bumping flutter. - dartVersion = "2.15.0"; + dartVersion = "2.16.1"; dartSourceBase = "https://storage.googleapis.com/dart-archive/channels"; dartForFlutter = dart.override { version = dartVersion; sources = { "${dartVersion}-x86_64-linux" = fetchurl { url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "sha256-U1V1OPmFeNZCdBxFy7yqAbAE0cxh9f2UqKQmreJu9YA="; + sha256 = "sha256-PMY6DCFQC8XrlnFzOEPcwgBAs5/cAvNd78969Z+I1Fk="; }; }; }; @@ -29,7 +29,7 @@ in { pname = "flutter"; src = fetchurl { url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}"; - sha256 = "sha256-sSz/owGdCMB5b9+cAWvLkrfFcIIq5665Xopd4JKv1G4="; + sha256 = "sha256-rSfwcglDV2rvJl10j7FByAWmghd2FYxrlkgYnvRO54Y="; }; patches = getPatches ./patches; }; diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 4b0789e35eb8..43538ede339e 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -32,6 +32,7 @@ , nss , systemd , which +, callPackage }: let drvName = "flutter-${version}"; @@ -146,6 +147,8 @@ let }; in +let +self = (self: runCommand drvName { startScript = '' @@ -159,6 +162,9 @@ runCommand drvName passthru = { unwrapped = flutter; inherit dart; + mkFlutterApp = callPackage ../../../build-support/flutter { + flutter = self; + }; }; meta = with lib; { description = "Flutter is Google's SDK for building mobile, web and desktop with Dart"; @@ -179,4 +185,6 @@ runCommand drvName echo -n "$startScript" > $out/bin/${pname} chmod +x $out/bin/${pname} -'' +'') self; +in +self diff --git a/pkgs/development/compilers/flutter/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/disable-auto-update.patch index d0fd363d3c64..e799f6e1550b 100644 --- a/pkgs/development/compilers/flutter/patches/disable-auto-update.patch +++ b/pkgs/development/compilers/flutter/patches/disable-auto-update.patch @@ -1,8 +1,8 @@ diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh -index be9320210e..6eb50aae95 100644 +index 05cba4393b..2a775bf24f 100644 --- a/bin/internal/shared.sh +++ b/bin/internal/shared.sh -@@ -218,8 +218,6 @@ function shared::execute() { +@@ -217,8 +217,6 @@ function shared::execute() { # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" @@ -12,19 +12,19 @@ index be9320210e..6eb50aae95 100644 case "$BIN_NAME" in flutter*) diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -index 550a75bc65..c98a4591cc 100644 +index 396756808e..d324a6df59 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart -@@ -244,7 +244,6 @@ class FlutterCommandRunner extends CommandRunner { +@@ -241,7 +241,6 @@ class FlutterCommandRunner extends CommandRunner { globals.flutterUsage.suppressAnalytics = true; } - globals.flutterVersion.ensureVersionFile(); - final bool machineFlag = topLevelResults['machine'] as bool; + final bool machineFlag = topLevelResults['machine'] as bool? ?? false; final bool ci = await globals.botDetector.isRunningOnBot; final bool redirectedCompletion = !globals.stdio.hasTerminal && -@@ -253,10 +252,6 @@ class FlutterCommandRunner extends CommandRunner { - final bool versionCheckFlag = topLevelResults['version-check'] as bool; +@@ -250,10 +249,6 @@ class FlutterCommandRunner extends CommandRunner { + final bool versionCheckFlag = topLevelResults['version-check'] as bool? ?? false; final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag; - if (topLevelResults.command?.name != 'upgrade' && @@ -33,4 +33,4 @@ index 550a75bc65..c98a4591cc 100644 - } // See if the user specified a specific device. - globals.deviceManager.specifiedDeviceId = topLevelResults['device-id'] as String; + globals.deviceManager?.specifiedDeviceId = topLevelResults['device-id'] as String?; diff --git a/pkgs/development/compilers/flutter/patches/move-cache.patch b/pkgs/development/compilers/flutter/patches/move-cache.patch index 701cab54d807..a81d2def242c 100644 --- a/pkgs/development/compilers/flutter/patches/move-cache.patch +++ b/pkgs/development/compilers/flutter/patches/move-cache.patch @@ -1,5 +1,5 @@ diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index ed42baea29..fee2fb1d62 100644 +index ed42baea29..12941f733a 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart @@ -11,11 +11,11 @@ import 'base/file_system.dart'; @@ -25,7 +25,7 @@ index ed42baea29..fee2fb1d62 100644 entryUri: entryUri, package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index 7870c7807f..3fcf92f20d 100644 +index defc86cc20..7fdf14d112 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -22,6 +22,7 @@ import 'base/user_messages.dart'; @@ -36,7 +36,7 @@ index 7870c7807f..3fcf92f20d 100644 const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo) const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo) -@@ -302,8 +303,13 @@ class Cache { +@@ -322,8 +323,13 @@ class Cache { return; } assert(_lock == null); @@ -51,7 +51,17 @@ index 7870c7807f..3fcf92f20d 100644 try { _lock = lockFile.openSync(mode: FileMode.write); } on FileSystemException catch (e) { -@@ -453,7 +459,7 @@ class Cache { +@@ -382,8 +388,7 @@ class Cache { + + String get devToolsVersion { + if (_devToolsVersion == null) { +- const String devToolsDirPath = 'dart-sdk/bin/resources/devtools'; +- final Directory devToolsDir = getCacheDir(devToolsDirPath, shouldCreate: false); ++ final Directory devToolsDir = _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin/cache/dart-sdk/bin/resources/devtools')); + if (!devToolsDir.existsSync()) { + throw Exception('Could not find directory at ${devToolsDir.path}'); + } +@@ -536,7 +541,7 @@ class Cache { if (_rootOverride != null) { return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache')); } else { diff --git a/pkgs/development/compilers/fpc/default.upstream b/pkgs/development/compilers/fpc/default.upstream deleted file mode 100644 index 9f16c1b645cd..000000000000 --- a/pkgs/development/compilers/fpc/default.upstream +++ /dev/null @@ -1,6 +0,0 @@ -url https://sourceforge.net/projects/freepascal/files/Source/ -SF_version_dir -version_link 'fpcbuild-[0-9.]+[.]tar[.]gz/download$' -SF_redirect -version '.*-([0-9.]+)[.]tar[.]gz' '\1' -do_overwrite () { do_overwrite_just_version; } diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 5cd0609960df..5ddaa7c429f2 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withQt [ libqt5pas qtbase ]; + # Disable parallel build, errors: + # Fatal: (1018) Compilation aborted + enableParallelBuilding = false; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional withQt wrapQtAppsHook; diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 25abd7949071..fc0f50d0797f 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -11,20 +11,26 @@ stdenv.mkDerivation rec { sha256 = "sha256-bK3McF/wTjT9q6luihPaEXjx7Lu6+ZbQ9G61Mc4KoB0="; }; - nativeBuildInputs = [ makeWrapper installShellFiles ]; + strictDeps = true; - buildInputs = [ - z3 + nativeBuildInputs = [ + makeWrapper + installShellFiles ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild + menhir + ]); + + buildInputs = [ + z3 + ] ++ (with ocamlPackages; [ batteries zarith stdint yojson fileutils - menhir menhirLib pprint sedlex_2 diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 4493fd936ec3..a26aaf771af3 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -14,7 +14,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index a9498b1060db..b78ca339fb85 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -14,7 +14,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index c192c603c883..bc7868cc4606 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -14,7 +14,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java , gmp, mpfr, libmpc, gettext, which, patchelf diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 70278c237d4c..bb1a3dd7d636 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -14,7 +14,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java , gmp, mpfr, libmpc, gettext, which, patchelf diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 1809d7ae42ef..7548ec56c759 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -15,7 +15,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , flex , perl ? null # optional, for texi2pod (then pod2man); required for Java diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index dcb7d0b91f6f..dfac97104eb6 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -13,7 +13,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 01deb2727b85..609dfa722a65 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -13,7 +13,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 9d21ed667f6c..ea4296826661 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -15,7 +15,7 @@ # we can't rebuild those without also rebuilding the compiler itself, # we opt to always build everything unlike our usual policy. enableShared ? true -, enableLTO ? true +, enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) , gmp, mpfr, libmpc, gettext, which, patchelf diff --git a/pkgs/development/compilers/gforth/boot-forth.nix b/pkgs/development/compilers/gforth/boot-forth.nix new file mode 100644 index 000000000000..fc7b5ffa982d --- /dev/null +++ b/pkgs/development/compilers/gforth/boot-forth.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchurl, m4 }: + +let + version = "0.7.3"; +in +stdenv.mkDerivation { + pname = "gforth-boot"; + inherit version; + src = fetchurl { + url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; + sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; + }; + + buildInputs = [ m4 ]; + + configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; + + meta = { + description = "The Forth implementation of the GNU project (outdated version used to bootstrap)"; + homepage = "https://www.gnu.org/software/gforth/"; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index bdf172cb9b99..3b60d9fb179f 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -1,17 +1,30 @@ -{ lib, stdenv, fetchurl, m4 }: +{ lib, stdenv, fetchFromGitHub, callPackage +, autoreconfHook, texinfo, libffi +}: let - version = "0.7.3"; -in -stdenv.mkDerivation { + swig = callPackage ./swig.nix { }; + bootForth = callPackage ./boot-forth.nix { }; +in stdenv.mkDerivation rec { + pname = "gforth"; - inherit version; - src = fetchurl { - url = "https://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; - sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; + version = "0.7.9_20220127"; + + src = fetchFromGitHub { + owner = "forthy42"; + repo = "gforth"; + rev = version; + sha256 = "sha256-3+ObHhsPvW44UFiN0GWOhwo7aiqhjwxNY8hw2Wv4MK0="; }; - buildInputs = [ m4 ]; + nativeBuildInputs = [ + autoreconfHook texinfo bootForth swig + ]; + buildInputs = [ + libffi + ]; + + passthru = { inherit bootForth; }; configureFlags = lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ]; @@ -22,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "The Forth implementation of the GNU project"; - homepage = "https://www.gnu.org/software/gforth/"; + homepage = "https://github.com/forthy42/gforth"; license = lib.licenses.gpl3; platforms = lib.platforms.all; }; diff --git a/pkgs/development/compilers/gforth/swig.nix b/pkgs/development/compilers/gforth/swig.nix new file mode 100644 index 000000000000..8de29407cc46 --- /dev/null +++ b/pkgs/development/compilers/gforth/swig.nix @@ -0,0 +1,16 @@ +{ swig3, fetchFromGitHub }: + +## for updating to swig4, see +## https://github.com/GeraldWodni/swig/pull/6 +swig3.overrideDerivation (old: { + version = "3.0.9-forth"; + src = fetchFromGitHub { + owner = "GeraldWodni"; + repo = "swig"; + rev = "a45b807e5f9d8ca1a43649c8265d2741a393862a"; + sha256 = "sha256-6nOOPFGFNaQInEkul0ZAh+ks9n3wqCQ6/tbduvG/To0="; + }; + configureFlags = old.configureFlags ++ [ + "--enable-forth" + ]; +}) diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index d21ac4411f15..a8f05d6f15c1 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -212,6 +212,15 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; }) + ] ++ lib.optionals (stdenv.isDarwin && stdenv.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-paths.patch ]; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index 8ca5df085151..56b16c5d48c4 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -20,9 +20,10 @@ # build-time dependency too. buildTargetLlvmPackages, llvmPackages -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp +, # 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) +, gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -61,7 +62,7 @@ disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: -assert !enableIntegerSimple -> gmp != null; +assert !enableNativeBignum -> gmp != null; # Cross cannot currently build the `haddock` program for silly reasons, # see note [HADDOCK_DOCS]. @@ -98,7 +99,7 @@ let '' HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} @@ -114,7 +115,7 @@ let # Splicer will pull out correct variations libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (!enableNativeBignum) gmp ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; # TODO(@sternenseemann): is buildTarget LLVM unnecessary? @@ -152,7 +153,7 @@ let # 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 enableIntegerSimple "-integer-simple") + (lib.optionalString enableNativeBignum "-native-bignum") ]; in @@ -251,7 +252,7 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ 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) [ diff --git a/pkgs/development/compilers/ghc/9.2.1.nix b/pkgs/development/compilers/ghc/9.2.1.nix index 4714a19a5359..75c728510eba 100644 --- a/pkgs/development/compilers/ghc/9.2.1.nix +++ b/pkgs/development/compilers/ghc/9.2.1.nix @@ -21,9 +21,10 @@ # build-time dependency too. buildTargetLlvmPackages, llvmPackages -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp +, # 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) +, gmp , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform @@ -62,7 +63,7 @@ disableLargeAddressSpace ? stdenv.targetPlatform.isiOS }: -assert !enableIntegerSimple -> gmp != null; +assert !enableNativeBignum -> gmp != null; # Cross cannot currently build the `haddock` program for silly reasons, # see note [HADDOCK_DOCS]. @@ -99,7 +100,7 @@ let '' HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} '' + lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} @@ -115,7 +116,7 @@ let # Splicer will pull out correct variations libDeps = platform: lib.optional enableTerminfo ncurses ++ [libffi] - ++ lib.optional (!enableIntegerSimple) gmp + ++ lib.optional (!enableNativeBignum) gmp ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; # TODO(@sternenseemann): is buildTarget LLVM unnecessary? @@ -153,7 +154,7 @@ let # 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 enableIntegerSimple "-integer-simple") + (lib.optionalString enableNativeBignum "-native-bignum") ]; in @@ -252,7 +253,7 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ 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) [ diff --git a/pkgs/development/compilers/ghc/cabal-paths.patch b/pkgs/development/compilers/ghc/cabal-paths.patch new file mode 100644 index 000000000000..19adcf5388bb --- /dev/null +++ b/pkgs/development/compilers/ghc/cabal-paths.patch @@ -0,0 +1,99 @@ +diff --git a/Cabal/Distribution/Simple/Build/PathsModule.hs b/Cabal/Distribution/Simple/Build/PathsModule.hs +index 5e660e8d6..1ae603c94 100644 +--- a/libraries/Cabal/Cabal/Distribution/Simple/Build/PathsModule.hs ++++ b/libraries/Cabal/Cabal/Distribution/Simple/Build/PathsModule.hs +@@ -37,6 +37,9 @@ import System.FilePath ( pathSeparator ) + -- * Building Paths_.hs + -- ------------------------------------------------------------ + ++splitPath :: FilePath -> [ String ] ++splitPath = unintersperse pathSeparator ++ + generatePathsModule :: PackageDescription -> LocalBuildInfo -> ComponentLocalBuildInfo -> String + generatePathsModule pkg_descr lbi clbi = + let pragmas = +@@ -78,12 +81,44 @@ generatePathsModule pkg_descr lbi clbi = + "import System.Environment (getExecutablePath)\n" + | otherwise = "" + ++ dirs = [ (flat_libdir, "LibDir") ++ , (flat_dynlibdir, "DynLibDir") ++ , (flat_datadir, "DataDir") ++ , (flat_libexecdir, "LibexecDir") ++ , (flat_sysconfdir, "SysconfDir") ]; ++ ++ shouldEmitPath p ++ | (splitPath flat_prefix) `isPrefixOf` (splitPath flat_bindir) = True ++ | (splitPath flat_prefix) `isPrefixOf` (splitPath p) = False ++ | otherwise = True ++ ++ shouldEmitDataDir = shouldEmitPath flat_datadir ++ ++ nixEmitPathFn (path, name) = let ++ varName = toLower <$> name ++ fnName = "get"++name ++ in if shouldEmitPath path then ++ varName ++ " :: FilePath\n"++ ++ varName ++ " = " ++ show path ++ ++ "\n" ++ fnName ++ " :: IO FilePath" ++ ++ "\n" ++ fnName ++ " = " ++ mkGetEnvOr varName ("return " ++ varName)++"\n" ++ else "" ++ ++ absBody = intercalate "\n" $ nixEmitPathFn <$> dirs ++ ++ warnPragma = case filter (not . shouldEmitPath . fst) dirs of ++ [] -> "" ++ omittedDirs -> "{-# WARNING \"The functions: "++omittedFns++" Have been omitted by the Nix build system.\" #-}" ++ where omittedFns = intercalate ", " $ map snd omittedDirs ++ ++ importList = intercalate ", " $ ("get" ++) . snd <$> filter (shouldEmitPath . fst) dirs ++ + header = + pragmas++ +- "module " ++ prettyShow paths_modulename ++ " (\n"++ +- " version,\n"++ +- " getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir,\n"++ +- " getDataFileName, getSysconfDir\n"++ ++ "module " ++ prettyShow paths_modulename ++ " " ++ warnPragma ++ " (\n"++ ++ " version, getBinDir,\n"++ ++ (if shouldEmitDataDir then " getDataFileName, \n" else "\n")++ ++ " " ++ importList ++"\n"++ + " ) where\n"++ + "\n"++ + foreign_imports++ +@@ -136,26 +171,18 @@ generatePathsModule pkg_descr lbi clbi = + "\n"++ + filename_stuff + | absolute = +- "\nbindir, libdir, dynlibdir, datadir, libexecdir, sysconfdir :: FilePath\n"++ ++ "\nbindir :: FilePath\n"++ + "\nbindir = " ++ show flat_bindir ++ +- "\nlibdir = " ++ show flat_libdir ++ +- "\ndynlibdir = " ++ show flat_dynlibdir ++ +- "\ndatadir = " ++ show flat_datadir ++ +- "\nlibexecdir = " ++ show flat_libexecdir ++ +- "\nsysconfdir = " ++ show flat_sysconfdir ++ + "\n"++ +- "\ngetBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath\n"++ ++ "\ngetBinDir :: IO FilePath\n"++ + "getBinDir = "++mkGetEnvOr "bindir" "return bindir"++"\n"++ +- "getLibDir = "++mkGetEnvOr "libdir" "return libdir"++"\n"++ +- "getDynLibDir = "++mkGetEnvOr "dynlibdir" "return dynlibdir"++"\n"++ +- "getDataDir = "++mkGetEnvOr "datadir" "return datadir"++"\n"++ +- "getLibexecDir = "++mkGetEnvOr "libexecdir" "return libexecdir"++"\n"++ +- "getSysconfDir = "++mkGetEnvOr "sysconfdir" "return sysconfdir"++"\n"++ +- "\n"++ +- "getDataFileName :: FilePath -> IO FilePath\n"++ +- "getDataFileName name = do\n"++ +- " dir <- getDataDir\n"++ +- " return (dir ++ "++path_sep++" ++ name)\n" ++ absBody ++ "\n"++ ++ (if shouldEmitDataDir then ++ "getDataFileName :: FilePath -> IO FilePath\n"++ ++ "getDataFileName name = do\n"++ ++ " dir <- getDataDir\n"++ ++ " return (dir ++ "++path_sep++" ++ name)\n" ++ else "\n") + | otherwise = + "\nprefix, bindirrel :: FilePath" ++ + "\nprefix = " ++ show flat_prefix ++ diff --git a/pkgs/development/compilers/ghcjs/ghcjs-base.nix b/pkgs/development/compilers/ghcjs/ghcjs-base.nix index ca0086a918ab..b0c604a4aeac 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs-base.nix +++ b/pkgs/development/compilers/ghcjs/ghcjs-base.nix @@ -1,5 +1,5 @@ { mkDerivation, aeson, array, attoparsec, base, binary, bytestring -, containers, deepseq, directory, dlist, fetchgit, ghc-prim +, containers, deepseq, directory, dlist, fetchFromGitHub, ghc-prim , ghcjs-prim, hashable, HUnit, integer-gmp, primitive, QuickCheck , quickcheck-unicode, random, scientific, test-framework , test-framework-hunit, test-framework-quickcheck2, text, time @@ -9,10 +9,11 @@ mkDerivation { pname = "ghcjs-base"; version = "0.2.0.3"; - src = fetchgit { - url = "git://github.com/ghcjs/ghcjs-base"; - sha256 = "15fdkjv0l7hpbbsn5238xxgzfdg61g666nzbv2sgxkwryn5rycv0"; + src = fetchFromGitHub { + owner = "ghcjs"; + repo = "ghcjs-base"; rev = "85e31beab9beffc3ea91b954b61a5d04e708b8f2"; + sha256 = "sha256-YDOfi/WZz/602OtbY8wL5jX3X+9oiGL1WhceCraczZU="; }; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers deepseq dlist diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 891751a6ad6b..3f704b525722 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.19.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pJ4RSijuwdKAL24WzcDIQen1RGofN1tUlbAA18zUvBE="; + sha256 = "sha256-AK+eb0eJyI7ALn7sg0wz4GzHthxrJWd1PVT5bL9LKWA="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-f/6LdvKRykpBX2GlRuyUcSD719f6XzhbMHzhrGNU0Cg="; + cargoSha256 = "sha256-kFTAPbP42sbhsvP069ua0ys1Dw7W+Gdsv2YaGrzorIk="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index 2b7c6a2f0715..25bedd397b2f 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testVersion }: -buildGoModule rec { +let self = buildGoModule rec { pname = "go-jsonnet"; version = "0.18.0"; @@ -15,12 +15,19 @@ buildGoModule rec { doCheck = false; - subPackages = [ "cmd/jsonnet" "cmd/jsonnetfmt" ]; + subPackages = [ "cmd/jsonnet*" ]; + + passthru.tests.version = testVersion { + package = self; + version = "v${version}"; + }; meta = with lib; { description = "An implementation of Jsonnet in pure Go"; homepage = "https://github.com/google/go-jsonnet"; license = licenses.asl20; - maintainers = with maintainers; [ nshalman ]; + maintainers = with maintainers; [ nshalman aaronjheng ]; + mainProgram = "jsonnet"; }; -} +}; +in self diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index 50fad5efe23a..add1e70bbe3d 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -45,7 +45,8 @@ let "riscv64" = "riscv64"; "s390x" = "s390x"; "powerpc64le" = "ppc64le"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + "mips64el" = "mips64le"; + }.${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 @@ -54,11 +55,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.13"; + version = "1.16.15"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-sJJmVOrrAe9DgWY49C17FoHy0/QblVnwdzVSK3r61Bo="; + sha256 = "sha256-kKCMaJJ54184ZbpRCZjDOmMlXDYImz7CBskS/AVow9M="; }; # perl is used for testing go vet @@ -168,6 +169,7 @@ stdenv.mkDerivation rec { ./creds-test.patch ./go-1.9-skip-flaky-19608.patch ./go-1.9-skip-flaky-20072.patch + ./skip-chown-tests-1.16.patch ./skip-external-network-tests-1.16.patch ./skip-nohup-tests.patch ./skip-cgo-tests-1.15.patch diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index 35c16f49f708..69537dc899e8 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -45,7 +45,8 @@ let "riscv64" = "riscv64"; "s390x" = "s390x"; "powerpc64le" = "ppc64le"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + "mips64el" = "mips64le"; + }.${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 @@ -54,11 +55,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.17.6"; + version = "1.17.7"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-TcG78/9h8MH/Kxk1Xm2IFRpwEmJopHx2FHdobvlHSMg="; + sha256 = "sha256-wQjNM7c7GRGgK2l3Qd896kPgGlxOCOQJ6LOg43RdK00="; }; # perl is used for testing go vet @@ -168,6 +169,7 @@ stdenv.mkDerivation rec { ./creds-test.patch ./go-1.9-skip-flaky-19608.patch ./go-1.9-skip-flaky-20072.patch + ./skip-chown-tests-1.16.patch ./skip-external-network-tests-1.16.patch ./skip-nohup-tests.patch ./skip-cgo-tests-1.15.patch diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.18.nix similarity index 90% rename from pkgs/development/compilers/go/1.15.nix rename to pkgs/development/compilers/go/1.18.nix index 5cba6be88999..a4cb013d94f2 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -13,11 +13,11 @@ , cacert , Security , Foundation +, xcbuild , mailcap , runtimeShell , buildPackages , pkgsBuildTarget -, fetchpatch , callPackage }: @@ -40,9 +40,13 @@ let "armv5tel" = "arm"; "armv6l" = "arm"; "armv7l" = "arm"; - "powerpc64le" = "ppc64le"; "mips" = "mips"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + "mipsel" = "mipsle"; + "riscv64" = "riscv64"; + "s390x" = "s390x"; + "powerpc64le" = "ppc64le"; + "mips64el" = "mips64le"; + }.${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 @@ -51,11 +55,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.15"; + version = "1.18"; src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-BmKuOBMzAoDV8al6LuI7vb46Wnz6YAGySphzoZoNx+w="; + url = "https://go.dev/dl/go${version}.src.tar.gz"; + sha256 = "sha256-OPQj20zINIg/K1I0QoL6ejn7uTZQ3GKhH98L5kCb2tY="; }; # perl is used for testing go vet @@ -64,6 +68,8 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; + depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; @@ -158,27 +164,14 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.11.patch - ./ssl-cert-file-1.15.patch + ./ssl-cert-file-1.16.patch ./remove-test-pie-1.15.patch ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ./skip-external-network-tests-1.15.patch + ./skip-chown-tests-1.16.patch + ./skip-external-network-tests-1.16.patch ./skip-nohup-tests.patch ./skip-cgo-tests-1.15.patch - ./go_no_vendor_checks.patch - - # support TZ environment variable starting with colon - (fetchpatch { - name = "tz-support-colon.patch"; - url = "https://github.com/golang/go/commit/58fe2cd4022c77946ce4b598cf3e30ccc8367143.patch"; - sha256 = "0vphwiqrm0qykfj3rfayr65qzk22fksg7qkamvaz0lmf6fqvbd2f"; - }) - ] ++ [ - # breaks under load: https://github.com/golang/go/issues/25628 - (if stdenv.isAarch32 - then ./skip-test-extra-files-on-aarch32-1.14.patch - else ./skip-test-extra-files-on-386-1.14.patch) + ./go_no_vendor_checks-1.16.patch ]; postPatch = '' @@ -207,7 +200,7 @@ stdenv.mkDerivation rec { null; GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); - GO386 = 387; # from Arch: don't assume sse2 on i686 + GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; # Hopefully avoids test timeouts on Hydra GO_TEST_TIMEOUT_SCALE = 3; @@ -279,6 +272,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = teams.golang.members; platforms = platforms.linux ++ platforms.darwin; - badPlatforms = [ "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/go/go_no_vendor_checks.patch b/pkgs/development/compilers/go/go_no_vendor_checks.patch deleted file mode 100644 index 45ff4360f0dd..000000000000 --- a/pkgs/development/compilers/go/go_no_vendor_checks.patch +++ /dev/null @@ -1,23 +0,0 @@ -Starting from go1.14, go verifes that vendor/modules.txt matches the requirements -and replacements listed in the main module go.mod file, and it is a hard failure if -vendor/modules.txt is missing. - -Relax module consistency checks and switch back to pre go1.14 behaviour if -vendor/modules.txt is missing regardless of go version requirement in go.mod. - -This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 -See https://github.com/golang/go/issues/37948 for discussion. - -diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go -index 71f68efbcc..3c566d04dd 100644 ---- a/src/cmd/go/internal/modload/vendor.go -+++ b/src/cmd/go/internal/modload/vendor.go -@@ -133,7 +133,7 @@ func checkVendorConsistency() { - readVendorList() - - pre114 := false -- if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 { -+ if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/go/skip-chown-tests-1.16.patch b/pkgs/development/compilers/go/skip-chown-tests-1.16.patch new file mode 100644 index 000000000000..783446cdf317 --- /dev/null +++ b/pkgs/development/compilers/go/skip-chown-tests-1.16.patch @@ -0,0 +1,42 @@ +From 9a6718a6355d89b73011fbd1eb1bba8dcfa021e6 Mon Sep 17 00:00:00 2001 +From: regnat +Date: Wed, 3 Nov 2021 10:17:28 +0100 +Subject: [PATCH] Disable the chown tests + +See https://github.com/golang/go/issues/42525 and +https://github.com/NixOS/nix/issues/3245 +--- + os/os_unix_test.go | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/os/os_unix_test.go b/os/os_unix_test.go +index 51693fd..0936542 100644 +--- a/src/os/os_unix_test.go ++++ b/src/os/os_unix_test.go +@@ -40,6 +40,7 @@ func checkUidGid(t *testing.T, path string, uid, gid int) { + } + + func TestChown(t *testing.T) { ++ t.Skipf("https://github.com/golang/go/issues/42525") + // Use TempDir() to make sure we're on a local file system, + // so that the group ids returned by Getgroups will be allowed + // on the file. On NFS, the Getgroups groups are +@@ -83,6 +84,7 @@ func TestChown(t *testing.T) { + } + + func TestFileChown(t *testing.T) { ++ t.Skipf("https://github.com/golang/go/issues/42525") + // Use TempDir() to make sure we're on a local file system, + // so that the group ids returned by Getgroups will be allowed + // on the file. On NFS, the Getgroups groups are +@@ -126,6 +128,7 @@ func TestFileChown(t *testing.T) { + } + + func TestLchown(t *testing.T) { ++ t.Skipf("https://github.com/golang/go/issues/42525") + // Use TempDir() to make sure we're on a local file system, + // so that the group ids returned by Getgroups will be allowed + // on the file. On NFS, the Getgroups groups are +-- +2.31.1 + diff --git a/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch b/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch deleted file mode 100644 index 0ea1050cd8e3..000000000000 --- a/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/net/dial_test.go b/src/net/dial_test.go -index 01582489de..5b5faa5424 100644 ---- a/src/net/dial_test.go -+++ b/src/net/dial_test.go -@@ -990,6 +990,8 @@ func TestDialerControl(t *testing.T) { - // except that it won't skip testing on non-mobile builders. - func mustHaveExternalNetwork(t *testing.T) { - t.Helper() -+ t.Skipf("Nix sandbox does not have networking") -+ - mobile := runtime.GOOS == "android" || runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" - if testenv.Builder() == "" || mobile { - testenv.MustHaveExternalNetwork(t) diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.15.patch b/pkgs/development/compilers/go/ssl-cert-file-1.15.patch deleted file mode 100644 index 1884c681ca30..000000000000 --- a/pkgs/development/compilers/go/ssl-cert-file-1.15.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/src/crypto/x509/root_darwin_amd64.go b/src/crypto/x509/root_darwin_amd64.go -index ce88de025e..258ecc45d1 100644 ---- a/src/crypto/x509/root_darwin_amd64.go -+++ b/src/crypto/x509/root_darwin_amd64.go -@@ -10,6 +10,7 @@ import ( - "bytes" - macOS "crypto/x509/internal/macos" - "fmt" -+ "io/ioutil" - "os" - "strings" - ) -@@ -25,6 +26,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - var loadSystemRootsWithCgo func() (*CertPool, error) - - func loadSystemRoots() (*CertPool, error) { -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots := NewCertPool() -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - var trustedRoots []*Certificate - untrustedRoots := make(map[string]bool) - -diff --git a/src/crypto/x509/root_darwin_ios.go b/src/crypto/x509/root_darwin_ios.go -index 5ecc4911b3..14b4205c00 100644 ---- a/src/crypto/x509/root_darwin_ios.go -+++ b/src/crypto/x509/root_darwin_ios.go -@@ -6,6 +6,11 @@ - - package x509 - -+import ( -+ "io/ioutil" -+ "os" -+) -+ - func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { - return nil, nil - } -@@ -14,6 +19,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - var loadSystemRootsWithCgo func() (*CertPool, error) - - func loadSystemRoots() (*CertPool, error) { -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots := NewCertPool() -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - p := NewCertPool() - p.AppendCertsFromPEM([]byte(systemRootsPEM)) - return p, nil -diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go -index b48e618a65..195c1ff25a 100644 ---- a/src/crypto/x509/root_unix.go -+++ b/src/crypto/x509/root_unix.go -@@ -42,6 +42,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - files := certFiles - if f := os.Getenv(certFileEnv); f != "" { diff --git a/pkgs/development/compilers/graalvm/community-edition/default.nix b/pkgs/development/compilers/graalvm/community-edition/default.nix index 9ce6a98e1cd9..f53e9a038963 100644 --- a/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -9,7 +9,7 @@ in inherit mkGraal; graalvm11-ce = mkGraal rec { - version = "21.3.0"; + version = "22.0.0.2"; javaVersion = "11"; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; }; @@ -20,7 +20,7 @@ in # directory"/tmp/SVM-4194439592488143713"): error=0, Failed to exec spawn # helper: pid: 19865, exit value: 1" graalvm17-ce = mkGraal rec { - version = "21.3.0"; + version = "22.0.0.2"; javaVersion = "17"; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; diff --git a/pkgs/development/compilers/graalvm/community-edition/hashes.nix b/pkgs/development/compilers/graalvm/community-edition/hashes.nix index 98f3b2703c4f..f21fdb252708 100644 --- a/pkgs/development/compilers/graalvm/community-edition/hashes.nix +++ b/pkgs/development/compilers/graalvm/community-edition/hashes.nix @@ -3,55 +3,55 @@ [ { sha256 = { - "11-linux-aarch64" = "0hsjxp6ly7jsn9k94fddcl7afc5gda66jyppcnfvslishbizqd0i"; - "17-linux-aarch64" = "09hzl80m7f5ppmcvryz9aq0yw9scdkp5dqhblrqnkzyhvdjl5ycn"; - "11-linux-amd64" = "1ylk5l933z813k0k1xlayiv8fa0f1gmpr66bma51532iy3mch6rs"; - "17-linux-amd64" = "1xn3shwkai61vvzsg595k8776a21ds00w2pjlscvfcbs1ag07n0i"; - "11-darwin-amd64" = "0qpqnnmqxvxzj3mwz05acpg4n8ffqsz0sji8lbl03fgswpvgfavc"; - "17-darwin-amd64" = "1akpsrd9r2igcls0cvhpqw3jrnh59m8z80knx83lmj0cj836a8v0"; + "11-linux-aarch64" = "0n1cgd9rn5aw7rzbd45nlzpnqif095zwl3999vddlhpnjlyjdh0w"; + "17-linux-aarch64" = "1iw27igiyzzl43yfgid1h6h7hd0xnv0rfdkp4r7r8i51sa3q7my7"; + "11-linux-amd64" = "00vipkrhc7d5xxznm07pjrdjahhfg5s5vxg49xz8qxz2nwxhi1mw"; + "17-linux-amd64" = "1m4v2s1b2878r6dqpcxvbqpc3s2l8l0xcbna37bbfx6rsc73wx2g"; + "11-darwin-amd64" = "08v37avg439hywx2yqx0bnfpazwaja2xhyc0kj1imib6iadib042"; + "17-darwin-amd64" = "16lg3qfx7j8w8cxc3abl7c19nj6jhkni99wmff153lyhyk8zjjnm"; }.${javaVersionPlatform} or null; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/graalvm-ce-java${javaVersionPlatform}-21.3.0.tar.gz"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java${javaVersionPlatform}-22.0.0.2.tar.gz"; } { sha256 = { - "11-linux-aarch64" = "0qlmg5fwvqsb5ab3irj2hrcd5jc94mibnlz1gvzpnq85rw1zcb6h"; - "17-linux-aarch64" = "0jmarhwngs6vpbcgsix0dxhj42qj9vnk3vln8fhdxmydwnns8r1m"; - "11-linux-amd64" = "0kvnjr55rizy53vn0ff9w27z1qh9d1vp3s7r1kdl0wyhrbhd8n49"; - "17-linux-amd64" = "0h14sml42jda54agjs1prfnyjaxxsc67350fr51n8p20nl28lj6z"; - "11-darwin-amd64" = "1mg8c8hh8wmbwsisgarmp35jd0dall1fwdv49mggp74hicbc32h3"; - "17-darwin-amd64" = "0qz0xf2ph9gi45vvri7vphxh35m11nk7sa8nkwxl28l8bza0kb40"; + "11-linux-aarch64" = "17h0yfw0lxsiblqv1nzpc6i71vh6hbwf1x6lp7kziass1a4ixm2i"; + "17-linux-aarch64" = "1nvm04smzbis1jy9znac2a4yf9ajqvvmadcf5ffr521rm784g2br"; + "11-linux-amd64" = "07g7fab0zj1h77a30kiswqm0hvr1m5s6crszcbyvha2v3x2a6145"; + "17-linux-amd64" = "0c8qi7b63zkjrz3sz01bbmfni7pcz9nq1jv1f34lj9lcsm8gc9cc"; + "11-darwin-amd64" = "0xn1frj1f4pzrd5gm6xwq31blgvz8l9249c97q3yh7p6rkk7vhh3"; + "17-darwin-amd64" = "1dr80314fxcklmhi19jn3pqrsz3iivbvcxnphdzl978krm1afzq0"; }.${javaVersionPlatform} or null; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/native-image-installable-svm-java${javaVersionPlatform}-21.3.0.jar"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/native-image-installable-svm-java${javaVersionPlatform}-22.0.0.2.jar"; } { sha256 = { - "11-linux-aarch64" = "02rvwl1nng8d3qn226rjx5yq2blxs4yz009ab928qanhmb4vhv8b"; - "17-linux-aarch64" = "13kaxbgfp9pm6s28i5hfyg957iiwzrxf0ibibkv2yndgj64vj8xg"; - "11-linux-amd64" = "0zz62zr7imjaw9a3j5m66xs7c72cqb1i74ab3rnlh0dgs1mdpljg"; - "17-linux-amd64" = "1v2iwznlav8dsjj30nlhvsvv7pxmyzkhkp1p7spjjma09d34q4iv"; - "11-darwin-amd64" = "1wiv0299b2xrc229alczmjfj1bsn90p0wdm64rr39xnyyhbqrr80"; - "17-darwin-amd64" = "095sii8ibjcvvc6wnxk77ax151c4zgj8bpp81q3kyaazgpzvrk5s"; + "11-linux-aarch64" = "103d91sz2dmlc5hcbi9v3d3irgb83755hz16vkknfhbbkhm5iyz0"; + "17-linux-aarch64" = "0vas98knpvpajmv8bkgcf0fh7n5fy361nd47002cpppg6hrp7k9q"; + "11-linux-amd64" = "0h4s1dgx2wn63pabdckl85s70s1kw97vp0c8z7izihdn2fy7w3z9"; + "17-linux-amd64" = "1g98ashyvscwyn1k8mamih6qhcbxsk62x6ynd7x81ndy1karlv6q"; + "11-darwin-amd64" = "1y8d6c2ri7hrvsv3aqbcp49pmxh9yppcsfnx0jcwm88wlach0p52"; + "17-darwin-amd64" = "13a6rchnaczpmxga6g405z55913ayq5gwihzlvyy6shk6gwbcppw"; }.${javaVersionPlatform} or null; - url = "https://github.com/oracle/truffleruby/releases/download/vm-21.3.0/ruby-installable-svm-java${javaVersionPlatform}-21.3.0.jar"; + url = "https://github.com/oracle/truffleruby/releases/download/vm-22.0.0.2/ruby-installable-svm-java${javaVersionPlatform}-22.0.0.2.jar"; } { sha256 = { - "11-linux-aarch64" = "1ck4c1z98h1zn4i6xhh1hb6w2jab6n17ddykb72xxw4vig9nhlc7"; - "17-linux-aarch64" = "0p9gx5iq730br9wvacxs4403anxnjln6mx8v0dl4w4lhikjxsy8x"; - "11-linux-amd64" = "0gy8jj9d9msmj0i44sysiwq3j2k2w2g47fhq6y1aq47n3kmwj9kv"; - "17-linux-amd64" = "0qk8rgbmnk84isnb33x5bbh17bnnmq9yqasfgy5p953min6pbxj7"; - "11-darwin-amd64" = "0agw6k3jn2jh8wyc9h8rvzlgs96qh4nlj0y8nyzsmidvwq2ahl00"; - "17-darwin-amd64" = "0l1il0rq48sw6sha9jr0xphjgrm7q0kywy8z94mabm9maqh7l3rn"; + "11-linux-aarch64" = "135zkpqm8z5nzcyn5h6vdx3c09f9wb6jgzmp0llcnx8w76p71154"; + "17-linux-aarch64" = "0pij3kh70lxrzmbzx8zw97f9nb0rr492l7x3n13wcr859cr8akas"; + "11-linux-amd64" = "0ppvsgs216jmm5p8m34lqg2kv0awadh1dlkxb7qzcw2b6x0grzf0"; + "17-linux-amd64" = "1gf0jfmqy8lp6w7bimjp0j5abzmi0ndsn4hcjvfv7123lbj52zkz"; + "11-darwin-amd64" = "1mq6013crjmrpf3yvxwv9p4yn0rcdzg5z9hq9l6fpf47i8522k6p"; + "17-darwin-amd64" = "15l7p48vsca4cvqxbpb9lcmafysmdsxpv6avrpxajz705j3nsvmp"; }.${javaVersionPlatform} or null; - url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.3.0/wasm-installable-svm-java${javaVersionPlatform}-21.3.0.jar"; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/wasm-installable-svm-java${javaVersionPlatform}-22.0.0.2.jar"; } { sha256 = { - "11-linux-amd64" = "1l5av2v459q88zfl83877h7b3426z3d86kp6wqjvz2441brvidi0"; - "17-linux-amd64" = "100p1cgw0z4yfy4axb3gr32m8jnyx1f8bj6f6kk0mf3l8fv2kb7p"; - "11-darwin-amd64" = "06694n74dzsfwlli1sjdsrfbj9ngw7bhrcayvy4sgy2va5qpdjs0"; - "17-darwin-amd64" = "1qwg45q0760lsa62h0nk2zdv0r1npr82bh6p1z3md6pjppm7i025"; + "11-linux-amd64" = "0m8cqqqdks34b2zv7i6qw9kzqxi1rfqsmknqa9wm0b7dqaxx209g"; + "17-linux-amd64" = "12nszxp2yv35y8zkm94bnd0mnanah48y41r61ypymd19plaqmdxk"; + "11-darwin-amd64" = "00g6akpv0gkw8gcxfbgcyipn6gj25yr32k1lb7iqj08bq4f2zvk7"; + "17-darwin-amd64" = "1hd71qg0nmklyakl4cc29vl10fxalbyd2b5yn7x9iv6m0h1pp25g"; }.${javaVersionPlatform} or null; - url = "https://github.com/graalvm/graalpython/releases/download/vm-21.3.0/python-installable-svm-java${javaVersionPlatform}-21.3.0.jar"; + url = "https://github.com/graalvm/graalpython/releases/download/vm-22.0.0.2/python-installable-svm-java${javaVersionPlatform}-22.0.0.2.jar"; } ] diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index d5277899892e..4ac022be6a9f 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -3,7 +3,7 @@ let ocamlDependencies = version: if lib.versionAtLeast version "4.2" - then with ocaml-ng.ocamlPackages; [ + then with ocaml-ng.ocamlPackages_4_12; [ ocaml findlib sedlex_2 diff --git a/pkgs/development/compilers/hip/default.nix b/pkgs/development/compilers/hip/default.nix index 62d8f65ff8f6..2153a30cb160 100644 --- a/pkgs/development/compilers/hip/default.nix +++ b/pkgs/development/compilers/hip/default.nix @@ -16,7 +16,7 @@ , makeWrapper , numactl , perl -, python2 +, python3 , rocclr , rocm-comgr , rocm-device-libs @@ -31,13 +31,13 @@ let hip = stdenv.mkDerivation rec { pname = "hip"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "HIP"; rev = "rocm-${version}"; - sha256 = "sha256-AuA5ubRPywXaBBrjdHg5AT8rrVKULKog6Lh8jPaUcXY="; + hash = "sha256-w023vBLJaiFbRdvz9UfZLPasRjk3VqM9zwctCIJ5hGU="; }; # - fix bash paths @@ -56,7 +56,7 @@ let substituteInPlace bin/hip_embed_pch.sh \ --replace '$LLVM_DIR/bin/' "" - sed 's,#!/usr/bin/python,#!${python2}/bin/python,' -i hip_prof_gen.py + sed 's,#!/usr/bin/python,#!${python3.interpreter},' -i hip_prof_gen.py sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \ -e 's,^\($DEVICE_LIB_PATH=\).*$,\1"${rocm-device-libs}/amdgcn/bitcode";,' \ @@ -68,14 +68,14 @@ let -e 's,`file,`${file}/bin/file,g' \ -e 's,`readelf,`${binutils-unwrapped}/bin/readelf,' \ -e 's, ar , ${binutils-unwrapped}/bin/ar ,g' \ - -i bin/hipcc + -i bin/hipcc.pl sed -e 's,^\($HSA_PATH=\).*$,\1"${rocm-runtime}";,' \ -e 's,^\($HIP_CLANG_PATH=\).*$,\1"${clang}/bin";,' \ -e 's,^\($HIP_PLATFORM=\).*$,\1"amd";,' \ -e 's,$HIP_CLANG_PATH/llc,${llvm}/bin/llc,' \ -e 's, abs_path, Cwd::abs_path,' \ - -i bin/hipconfig + -i bin/hipconfig.pl sed -e 's, abs_path, Cwd::abs_path,' -i bin/hipvars.pm ''; @@ -102,16 +102,16 @@ let in stdenv.mkDerivation rec { pname = "hip"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "hipamd"; rev = "rocm-${version}"; - sha256 = "WvOuQu/EN81Kwcoc3ZtGlhb996edQJ3OWFsmPuqeNXE="; + hash = "sha256-hhTwKG0wDpbIBI8S61AhdNldX+STO8C66xi2EzmJSBs="; }; - nativeBuildInputs = [ cmake python2 makeWrapper perl ]; + nativeBuildInputs = [ cmake python3 makeWrapper perl ]; buildInputs = [ libxml2 numactl libglvnd libX11 ]; propagatedBuildInputs = [ clang @@ -135,6 +135,7 @@ stdenv.mkDerivation rec { "-DAMD_OPENCL_PATH=${rocm-opencl-runtime.src}" "-DHIP_COMMON_DIR=${hip}" "-DROCCLR_PATH=${rocclr}" + "-DHIP_VERSION_BUILD_ID=0" ]; postInstall = '' diff --git a/pkgs/development/compilers/inklecate/deps-darwin.nix b/pkgs/development/compilers/inklecate/deps-darwin.nix index b8aaefebc5b5..bd7e4399c95c 100644 --- a/pkgs/development/compilers/inklecate/deps-darwin.nix +++ b/pkgs/development/compilers/inklecate/deps-darwin.nix @@ -1,6 +1,6 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.21"; sha256 = "1s5g9gk0hvs268q2zpc32m0my2m2ivlmsmza86797a9vkxr6pzw6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.23"; sha256 = "0r2jd4ys31sgp2zcf8lzkji1xkyaxzgrkrh5rkk7p3r8b5f7fkcv"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) diff --git a/pkgs/development/compilers/inklecate/deps-linux.nix b/pkgs/development/compilers/inklecate/deps-linux.nix index 8f26b91eeacc..1d5345147ed6 100644 --- a/pkgs/development/compilers/inklecate/deps-linux.nix +++ b/pkgs/development/compilers/inklecate/deps-linux.nix @@ -1,6 +1,6 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.21"; sha256 = "01kbhi29lhv6mg1zfsyakz3z8hfbxnc0kxy0fczl8xqviik9svx7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.23"; sha256 = "09cy79swsmrfczv92wmxrwin7djpdl22yzhriac7r1xcg2sc36yk"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix index 688ca15177a8..ea1af60993f9 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2.nix +++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix @@ -4,7 +4,7 @@ automake, autoconf, libtool, clangStdenv } : clangStdenv.mkDerivation rec { - name = "ios-cross-compile-${version}"; + pname = "ios-cross-compile"; version = "9.2"; sdk = "iPhoneOS9.2.sdk"; cctools_port = fetchFromGitHub { diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index e36dedf3c875..bfff07aabcb2 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -2,12 +2,13 @@ openjdk11.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk"; - version = "11_0_11-b1504.13"; + version = "11_0_13-b1751.25"; + src = fetchFromGitHub { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - sha256 = "1xpgsgmmj5jp5qyw98hqmik6a7z3hfwmij023ij3qqymyj3nhm2i"; + sha256 = "sha256-TPNYZUkAoiZfp7Ci3fslKnRNGY1lnyIhXYUt6J31lwI="; }; patches = []; meta = with lib; { diff --git a/pkgs/development/compilers/julia/1.7-bin.nix b/pkgs/development/compilers/julia/1.7-bin.nix index dab58674f9d2..788825d90be9 100644 --- a/pkgs/development/compilers/julia/1.7-bin.nix +++ b/pkgs/development/compilers/julia/1.7-bin.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.7.1"; + version = "1.7.2"; 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 = "04czipzai5628v1npa2y2xff0bd4rj8d2fcjnnsvkqj5gff8wra4"; + sha256 = "15dsfdcxvx0wizkkn85ldz0mg0h7cjziz1lw4kky0b9v9xr48lm7"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 33a0ad49bd3d..36ec5bba2e20 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -1,17 +1,19 @@ { lib , fetchFromGitLab +, git , coq , cacert }: coq.ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "0.34.0"; + version = "0.36.0"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-MHkIr+XkW/zrRt+Cg48q4fOWTkNGH0hbf+oU7cAivNE="; + sha256 = "0zx8ai79ha3npm3aybzgisil27v9i052cqdllfri0fsc67dig78b"; + fetchSubmodules = true; }; # The build picks this up for ligo --version @@ -19,32 +21,59 @@ coq.ocamlPackages.buildDunePackage rec { useDune2 = true; + strictDeps = true; + + nativeBuildInputs = [ + git + coq + coq.ocamlPackages.menhir + coq.ocamlPackages.ocaml-recovery-parser + ]; + buildInputs = with coq.ocamlPackages; [ coq menhir menhirLib qcheck ocamlgraph + bisect_ppx ppx_deriving ppx_deriving_yojson ppx_expect - tezos-base - tezos-shell-services - tezos-010-PtGRANAD-test-helpers - tezos-011-PtHangz2-test-helpers - tezos-protocol-010-PtGRANAD-parameters - tezos-protocol-010-PtGRANAD - tezos-protocol-environment + ppx_import + terminal_size + ocaml-recovery-parser yojson getopt - terminal_size + core pprint linenoise + + # Test helpers deps + qcheck + qcheck-alcotest + alcotest-lwt + + # vendored tezos' deps + ctypes + hacl-star + hacl-star-raw + lwt-canceler + ipaddr + bls12-381-unix + bls12-381-legacy + ptime + mtime + lwt_log + ringo + ringo-lwt + secp256k1-internal + resto + resto-directory + resto-cohttp-self-serving-client + irmin-pack + ezjsonm data-encoding - bisect_ppx - cmdliner - core - ocaml-recovery-parser ]; checkInputs = [ diff --git a/pkgs/development/compilers/llvm/10/lld/default.nix b/pkgs/development/compilers/llvm/10/lld/default.nix index 5d590aec35ac..4b7d4eafcbf3 100644 --- a/pkgs/development/compilers/llvm/10/lld/default.nix +++ b/pkgs/development/compilers/llvm/10/lld/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/11/lld/default.nix b/pkgs/development/compilers/llvm/11/lld/default.nix index d344d3d3c117..8a9daf317c24 100644 --- a/pkgs/development/compilers/llvm/11/lld/default.nix +++ b/pkgs/development/compilers/llvm/11/lld/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/12/libcxx/default.nix b/pkgs/development/compilers/llvm/12/libcxx/default.nix index 30dc3f4f206c..3ddcb7997505 100644 --- a/pkgs/development/compilers/llvm/12/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxx/default.nix @@ -23,12 +23,6 @@ stdenv.mkDerivation { ../../libcxx-0001-musl-hacks.patch ]; - # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" - postPatch = '' - substituteInPlace include/__config \ - --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" - ''; - preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; diff --git a/pkgs/development/compilers/llvm/12/lld/default.nix b/pkgs/development/compilers/llvm/12/lld/default.nix index f9b0effbff30..cc476259612c 100644 --- a/pkgs/development/compilers/llvm/12/lld/default.nix +++ b/pkgs/development/compilers/llvm/12/lld/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/13/clang/add-nostdlibinc-flag.patch b/pkgs/development/compilers/llvm/13/clang/add-nostdlibinc-flag.patch new file mode 100644 index 000000000000..8007ba05f6e1 --- /dev/null +++ b/pkgs/development/compilers/llvm/13/clang/add-nostdlibinc-flag.patch @@ -0,0 +1,18 @@ +diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp +index 94a7553e273b..8a1d455950b2 100644 +--- a/lib/Driver/Driver.cpp ++++ b/lib/Driver/Driver.cpp +@@ -412,6 +412,13 @@ DerivedArgList *Driver::TranslateInputArgs(const InputArgList &Args) const { + } + #endif + ++ { ++ Arg *A = DAL->MakeFlagArg(/*BaseArg=*/nullptr, ++ Opts.getOption(options::OPT_nostdlibinc)); ++ A->claim(); ++ DAL->append(A); ++ } ++ + return DAL; + } + diff --git a/pkgs/development/compilers/llvm/13/clang/default.nix b/pkgs/development/compilers/llvm/13/clang/default.nix index 6c227f1ae72b..62b9e0470a61 100644 --- a/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/pkgs/development/compilers/llvm/13/clang/default.nix @@ -42,6 +42,7 @@ let # mis-compilation in firefox. # See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454 ./revert-malloc-alignment-assumption.patch + ./add-nostdlibinc-flag.patch (substituteAll { src = ../../clang-11-12-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; @@ -51,10 +52,6 @@ let postPatch = '' (cd tools && ln -s ../../clang-tools-extra extra) - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ - -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ - lib/Driver/ToolChains/*.cpp - # Patch for standalone doc building sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt '' + lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index be5e9404cdd4..874be111ade0 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -18,7 +18,7 @@ }: let - release_version = "13.0.0"; + release_version = "13.0.1"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; rev = ""; # When using a Git commit @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "0cjl0vssi4y2g4nfr710fb6cdhxmn5r0vis15sf088zsc5zydfhw"; + sha256 = "06dv6h5dmvzdxbif2s8njki6h32796v368dyb5945x8gjj72xh7k"; }; llvm_meta = { diff --git a/pkgs/development/compilers/llvm/13/libcxx/default.nix b/pkgs/development/compilers/llvm/13/libcxx/default.nix index ddf51d9a2fa4..0ce73ed97af6 100644 --- a/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -25,12 +25,6 @@ stdenv.mkDerivation rec { ../../libcxx-0001-musl-hacks.patch ]; - # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" - postPatch = '' - substituteInPlace include/__config \ - --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" - ''; - preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; diff --git a/pkgs/development/compilers/llvm/13/lld/default.nix b/pkgs/development/compilers/llvm/13/lld/default.nix index 2b5e9e965d07..d37a380c6397 100644 --- a/pkgs/development/compilers/llvm/13/lld/default.nix +++ b/pkgs/development/compilers/llvm/13/lld/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/14/bintools/default.nix b/pkgs/development/compilers/llvm/14/bintools/default.nix new file mode 100644 index 000000000000..53f7941e3369 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/bintools/default.nix @@ -0,0 +1,29 @@ +{ runCommand, stdenv, llvm, lld, version }: + +let + prefix = + if stdenv.hostPlatform != stdenv.targetPlatform + then "${stdenv.targetPlatform.config}-" + else ""; +in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' + mkdir -p $out/bin + for prog in ${lld}/bin/*; do + ln -s $prog $out/bin/${prefix}$(basename $prog) + done + for prog in ${llvm}/bin/*; do + ln -sf $prog $out/bin/${prefix}$(basename $prog) + done + + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar + ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as + ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp + ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm + ln -s ${llvm}/bin/llvm-objcopy $out/bin/${prefix}objcopy + ln -s ${llvm}/bin/llvm-objdump $out/bin/${prefix}objdump + ln -s ${llvm}/bin/llvm-ranlib $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-readelf $out/bin/${prefix}readelf + ln -s ${llvm}/bin/llvm-size $out/bin/${prefix}size + ln -s ${llvm}/bin/llvm-strip $out/bin/${prefix}strip + + ln -s ${lld}/bin/lld $out/bin/${prefix}ld +'' diff --git a/pkgs/development/compilers/llvm/14/clang/default.nix b/pkgs/development/compilers/llvm/14/clang/default.nix new file mode 100644 index 000000000000..9544494b356e --- /dev/null +++ b/pkgs/development/compilers/llvm/14/clang/default.nix @@ -0,0 +1,131 @@ +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, substituteAll, cmake, libxml2, libllvm, version, python3 +, buildLlvmTools +, fixDarwinDylibNames +, enableManpages ? false +}: + +let + self = stdenv.mkDerivation (rec { + pname = "clang"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ cmake python3 ] + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + buildInputs = [ libxml2 libllvm ]; + + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-std=c++14" + "-DCLANGD_BUILD_XPC=OFF" + "-DLLVM_ENABLE_RTTI=ON" + ] ++ lib.optionals enableManpages [ + "-DCLANG_INCLUDE_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" + ]; + + patches = [ + ./purity.patch + # https://reviews.llvm.org/D51899 + ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-11-12-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) + ]; + + postPatch = '' + (cd tools && ln -s ../../clang-tools-extra extra) + + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ + -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ + lib/Driver/ToolChains/*.cpp + + # Patch for standalone doc building + sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp + ''; + + outputs = [ "out" "lib" "dev" "python" ]; + + postInstall = '' + ln -sv $out/bin/clang $out/bin/cpp + + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + moveToOutput "lib/libclang-cpp.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi + mv $out/share/clang/*.py $python/share/clang + rm $out/bin/c-index-test + + mkdir -p $dev/bin + cp bin/clang-tblgen $dev/bin + ''; + + passthru = { + isClang = true; + inherit libllvm; + }; + + meta = llvm_meta // { + homepage = "https://clang.llvm.org/"; + description = "A C language family frontend for LLVM"; + longDescription = '' + The Clang project provides a language front-end and tooling + infrastructure for languages in the C language family (C, C++, Objective + C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. + It aims to deliver amazingly fast compiles, extremely useful error and + warning messages and to provide a platform for building great source + level tools. The Clang Static Analyzer and clang-tidy are tools that + automatically find bugs in your code, and are great examples of the sort + of tools that can be built using the Clang frontend as a library to + parse C/C++ code. + ''; + }; + } // lib.optionalAttrs enableManpages { + pname = "clang-manpages"; + + buildPhase = '' + make docs-clang-man + ''; + + installPhase = '' + mkdir -p $out/share/man/man1 + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man page for Clang ${version}"; + }; + }); +in self diff --git a/pkgs/development/compilers/llvm/14/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/clang/gnu-install-dirs.patch new file mode 100644 index 000000000000..57c54e18c37b --- /dev/null +++ b/pkgs/development/compilers/llvm/14/clang/gnu-install-dirs.patch @@ -0,0 +1,50 @@ +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index 9bbbfc032b7d..947bd0da865d 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -119,8 +119,8 @@ macro(add_clang_library name) + install(TARGETS ${lib} + COMPONENT ${lib} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + if (NOT LLVM_ENABLE_IDE) +@@ -175,7 +175,7 @@ endmacro() + macro(add_clang_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() + + function(clang_target_link_libraries target type) +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index 078988980c52..14b58614b40a 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -234,7 +234,7 @@ set_target_properties(clang-resource-headers PROPERTIES + FOLDER "Misc" + RUNTIME_OUTPUT_DIRECTORY "${output_dir}") + +-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + install( + FILES ${files} ${generated_files} +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 4e0647971ab4..68dd67fcc476 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -216,7 +216,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) + COMPONENT + libclang-python-bindings + DESTINATION +- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") ++ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") + endforeach() + if(NOT LLVM_ENABLE_IDE) + add_custom_target(libclang-python-bindings) diff --git a/pkgs/development/compilers/llvm/14/clang/purity.patch b/pkgs/development/compilers/llvm/14/clang/purity.patch new file mode 100644 index 000000000000..deb230a36c5b --- /dev/null +++ b/pkgs/development/compilers/llvm/14/clang/purity.patch @@ -0,0 +1,28 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -487,12 +487,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + if (!IsStatic) { + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); +- +- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) { +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + +- ToolChain.getDynamicLinker(Args))); +- } + } + + CmdArgs.push_back("-o"); +-- +2.11.0 diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/X86-support-extension.patch b/pkgs/development/compilers/llvm/14/compiler-rt/X86-support-extension.patch new file mode 100644 index 000000000000..66742e5b1498 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/compiler-rt/X86-support-extension.patch @@ -0,0 +1,21 @@ +diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt +index 3a66dd9c3fb..7efc85d9f9f 100644 +--- a/lib/builtins/CMakeLists.txt ++++ b/lib/builtins/CMakeLists.txt +@@ -345,4 +345,8 @@ if (NOT MSVC) + ++ set(i486_SOURCES ${i386_SOURCES}) ++ set(i586_SOURCES ${i386_SOURCES}) ++ set(i686_SOURCES ${i386_SOURCES}) ++ + if (WIN32) + set(i386_SOURCES + ${i386_SOURCES} +@@ -608,6 +612,7 @@ else () + endif() + + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) ++ message("arch: ${arch}") + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported + if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch new file mode 100644 index 000000000000..120cfe6feb2a --- /dev/null +++ b/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch @@ -0,0 +1,32 @@ +diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900 ++++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900 ++++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900 +@@ -474,6 +474,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -595,7 +596,7 @@ + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") + check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) + if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/rocm/compiler-rt/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/14/compiler-rt/codesign.patch similarity index 80% rename from pkgs/development/compilers/llvm/rocm/compiler-rt/compiler-rt-codesign.patch rename to pkgs/development/compilers/llvm/14/compiler-rt/codesign.patch index 3cc12b94b200..065959d14d46 100644 --- a/pkgs/development/compilers/llvm/rocm/compiler-rt/compiler-rt-codesign.patch +++ b/pkgs/development/compilers/llvm/14/compiler-rt/codesign.patch @@ -11,10 +11,10 @@ Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that 3 files changed, 107 deletions(-) diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index bc5fb9ff7..b64eb4246 100644 +index bc69ec95c419..9f100fdcec2f 100644 --- a/cmake/Modules/AddCompilerRT.cmake +++ b/cmake/Modules/AddCompilerRT.cmake -@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) +@@ -366,14 +366,6 @@ function(add_compiler_rt_runtime name type) set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") endif() @@ -23,11 +23,11 @@ index bc5fb9ff7..b64eb4246 100644 - add_custom_command(TARGET ${libname} - POST_BUILD - COMMAND codesign --sign - $ -- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} +- WORKING_DIRECTORY ${COMPILER_RT_OUTPUT_LIBRARY_DIR} - ) - endif() endif() - install(TARGETS ${libname} - ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} + + set(parent_target_arg) 2.14.1 diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch b/pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch new file mode 100644 index 000000000000..425dc2af01e7 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/compiler-rt/darwin-targetconditionals.patch @@ -0,0 +1,71 @@ +diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp +--- a/lib/sanitizer_common/sanitizer_mac.cpp ++++ b/lib/sanitizer_common/sanitizer_mac.cpp +@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { + // Offset example: + // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 + constexpr u16 GetOSMajorKernelOffset() { +- if (TARGET_OS_OSX) return 4; +- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; +- if (TARGET_OS_WATCH) return 13; ++#if TARGET_OS_OSX ++ return 4; ++#endif ++#if TARGET_OS_IOS || TARGET_OS_TV ++ return 6; ++#endif ++#if TARGET_OS_WATCH ++ return 13; ++#endif + } + + using VersStr = char[64]; +@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { + u16 os_major = kernel_major - offset; + + const char *format = "%d.0"; +- if (TARGET_OS_OSX) { +- if (os_major >= 16) { // macOS 11+ +- os_major -= 5; +- } else { // macOS 10.15 and below +- format = "10.%d"; +- } ++#if TARGET_OS_OSX ++ if (os_major >= 16) { // macOS 11+ ++ os_major -= 5; ++ } else { // macOS 10.15 and below ++ format = "10.%d"; + } ++#endif + return internal_snprintf(vers, sizeof(VersStr), format, os_major); + } + +@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { + // Aligned versions example: + // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 + static void MapToMacos(u16 *major, u16 *minor) { +- if (TARGET_OS_OSX) +- return; +- +- if (TARGET_OS_IOS || TARGET_OS_TV) ++#if !TARGET_OS_OSX ++#if TARGET_OS_IOS || TARGET_OS_TV + *major += 2; +- else if (TARGET_OS_WATCH) ++#elif TARGET_OS_WATCH + *major += 9; +- else ++#else + UNREACHABLE("unsupported platform"); ++#endif + + if (*major >= 16) { // macOS 11+ + *major -= 5; +@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { + *minor = *major; + *major = 10; + } ++#endif + } + + static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/default.nix b/pkgs/development/compilers/llvm/14/compiler-rt/default.nix new file mode 100644 index 000000000000..59ca5348fed4 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/compiler-rt/default.nix @@ -0,0 +1,126 @@ +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake, python3, libllvm, libcxxabi +}: + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + haveLibc = stdenv.cc.libc != null; + inherit (stdenv.hostPlatform) isMusl; + + baseName = "compiler-rt"; + + src = runCommand "${baseName}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${baseName} "$out" + ''; +in + +stdenv.mkDerivation { + pname = baseName + lib.optionalString (haveLibc) "-libc"; + inherit version; + + inherit src; + sourceRoot = "${src.name}/${baseName}"; + + nativeBuildInputs = [ cmake python3 libllvm.dev ]; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + + NIX_CFLAGS_COMPILE = [ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ]; + + cmakeFlags = [ + "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" + "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" + ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" + "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary + ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ lib.optionals (useLLVM && !haveLibc) [ + "-DCMAKE_C_FLAGS=-nodefaultlibs" + ] ++ lib.optionals (useLLVM) [ + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program + "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" + ] ++ lib.optionals (bareMetal) [ + "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" + "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" + ]; + + outputs = [ "out" "dev" ]; + + patches = [ + ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config + ./gnu-install-dirs.patch + # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the + # extra `/`. + ./normalize-var.patch + ] # Prevent a compilation error on darwin + ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch + ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; + + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)' + substituteInPlace cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + '' + lib.optionalString (useLLVM) '' + substituteInPlace lib/builtins/int_util.c \ + --replace "#include " "" + substituteInPlace lib/builtins/clear_cache.c \ + --replace "#include " "" + substituteInPlace lib/builtins/cpu_model.c \ + --replace "#include " "" + ''; + + # Hack around weird upsream RPATH bug + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + ln -s "$out/lib"/*/* "$out/lib" + '' + lib.optionalString (useLLVM) '' + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o + ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o + ''; + + meta = llvm_meta // { + homepage = "https://compiler-rt.llvm.org/"; + description = "Compiler runtime libraries"; + longDescription = '' + The compiler-rt project provides highly tuned implementations of the + low-level code generator support routines like "__fixunsdfdi" and other + calls generated when a target doesn't have a short sequence of native + instructions to implement a core IR operation. It also provides + implementations of run-time libraries for dynamic testing tools such as + AddressSanitizer, ThreadSanitizer, MemorySanitizer, and DataFlowSanitizer. + ''; + # "All of the code in the compiler-rt project is dual licensed under the MIT + # license and the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 000000000000..55837bd8e45b --- /dev/null +++ b/pkgs/development/compilers/llvm/14/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3a41aa43e406..f000cee6eae0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,8 @@ + + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index d7b0124f3546..3e111146df4d 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -67,7 +67,7 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") + set(COMPILER_RT_INSTALL_PATH "" CACHE PATH +@@ -99,13 +99,13 @@ endif() + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib) ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}") ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + endif() diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/normalize-var.patch b/pkgs/development/compilers/llvm/14/compiler-rt/normalize-var.patch new file mode 100644 index 000000000000..135cf625ef78 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/compiler-rt/normalize-var.patch @@ -0,0 +1,16 @@ +diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +index f1f46fb9599c..6f19e69507ba 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -302,8 +302,9 @@ macro(load_llvm_config) + # Get some LLVM variables from LLVMConfig. + include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake") + +- set(LLVM_LIBRARY_OUTPUT_INTDIR +- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR ++ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} ++ REALPATH) + endif() + endmacro() + diff --git a/pkgs/development/compilers/llvm/14/default.nix b/pkgs/development/compilers/llvm/14/default.nix new file mode 100644 index 000000000000..93cacafdc555 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/default.nix @@ -0,0 +1,278 @@ +{ lowPrio, newScope, pkgs, lib, stdenv, cmake +, gccForLibs, preLibcCrossHeaders +, libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross +# This is the default binutils, but with *this* version of LLD rather +# than the default LLVM verion's, if LLD is the choice. We use these for +# the `useLLVM` bootstrapping below. +, bootBintoolsNoLibc ? + if stdenv.targetPlatform.linker == "lld" + then null + else pkgs.bintoolsNoLibc +, bootBintools ? + if stdenv.targetPlatform.linker == "lld" + then null + else pkgs.bintools +, darwin +}: + +let + release_version = "14.0.0"; + candidate = ""; # empty or "rcN" + dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; + rev = ""; # When using a Git commit + rev-version = ""; # When using a Git commit + version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; + targetConfig = stdenv.targetPlatform.config; + + monorepoSrc = fetchFromGitHub { + owner = "llvm"; + repo = "llvm-project"; + rev = if rev != "" then rev else "llvmorg-${version}"; + sha256 = "1ixqzjzq4ad3mv1w44gwcg1shy34c2b3i9ja71vx1wa7l2ms2376"; + }; + + llvm_meta = { + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + platforms = lib.platforms.all; + }; + + tools = lib.makeExtensible (tools: let + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc buildLlvmTools; }); + mkExtraBuildCommands0 = cc: '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + ''; + mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + ''; + + bintoolsNoLibc' = + if bootBintoolsNoLibc == null + then tools.bintoolsNoLibc + else bootBintoolsNoLibc; + bintools' = + if bootBintools == null + then tools.bintools + else bootBintools; + + in { + + libllvm = callPackage ./llvm { + inherit llvm_meta; + }; + + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputSpecified = false; }; + + libclang = callPackage ./clang { + inherit llvm_meta; + }; + + clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + + llvm-manpages = lowPrio (tools.libllvm.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + clang-manpages = lowPrio (tools.libclang.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + # TODO: lldb/docs/index.rst:155:toctree contains reference to nonexisting document 'design/structureddataplugins' + # lldb-manpages = lowPrio (tools.lldb.override { + # enableManpages = true; + # python3 = pkgs.python3; # don't use python-boot + # }); + + # pick clang appropriate for package set we are targeting + clang = + /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM + else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang + else tools.libcxxClang; + + libstdcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. + libcxx = null; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + libcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + extraPackages = [ + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + lld = callPackage ./lld { + inherit llvm_meta; + }; + + lldb = callPackage ./lldb { + inherit llvm_meta; + inherit (darwin) libobjc bootstrap_cmds; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; + }; + + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + + bintools-unwrapped = callPackage ./bintools {}; + + bintoolsNoLibc = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + libc = preLibcCrossHeaders; + }; + + bintools = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + }; + + clangUseLLVM = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + bintools = bintools'; + extraPackages = [ + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' + echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' + echo "-lunwind" >> $out/nix-support/cc-ldflags + '' + lib.optionalString stdenv.targetPlatform.isWasm '' + echo "-fno-exceptions" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + clangNoLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + echo "-nostdlib++" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + clangNoLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + clangNoCompilerRt = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ ]; + extraBuildCommands = '' + echo "-nostartfiles" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands0 cc; + }; + + clangNoCompilerRtWithLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ ]; + extraBuildCommands = mkExtraBuildCommands0 cc; + }; + + }); + + libraries = lib.makeExtensible (libraries: let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc; }); + in { + + compiler-rt-libc = callPackage ./compiler-rt { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc + else stdenv; + }; + + compiler-rt-no-libc = callPackage ./compiler-rt { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoCompilerRt + else stdenv; + }; + + # N.B. condition is safe because without useLLVM both are the same. + compiler-rt = if stdenv.hostPlatform.isAndroid + then libraries.compiler-rt-libc + else libraries.compiler-rt-no-libc; + + stdenv = overrideCC stdenv buildLlvmTools.clang; + + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; + + libcxx = callPackage ./libcxx { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoLibcxx + else stdenv; + }; + + libcxxabi = let + stdenv_ = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoLibcxx + else stdenv; + cxx-headers = callPackage ./libcxx { + inherit llvm_meta; + stdenv = stdenv_; + headersOnly = true; + }; + in callPackage ./libcxxabi { + stdenv = stdenv_; + inherit llvm_meta cxx-headers; + }; + + libunwind = callPackage ./libunwind { + inherit llvm_meta; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + }; + + openmp = callPackage ./openmp { + inherit llvm_meta; + }; + }); + +in { inherit tools libraries release_version; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/14/libcxx/default.nix b/pkgs/development/compilers/llvm/14/libcxx/default.nix new file mode 100644 index 000000000000..8891a69937ab --- /dev/null +++ b/pkgs/development/compilers/llvm/14/libcxx/default.nix @@ -0,0 +1,89 @@ +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, cmake, python3, fixDarwinDylibNames, version +, libcxxabi +, enableShared ? !stdenv.hostPlatform.isStatic + +# If headersOnly is true, the resulting package would only include the headers. +# Use this to break the circular dependency between libcxx and libcxxabi. +# +# Some context: +# https://reviews.llvm.org/rG1687f2bbe2e2aaa092f942d4a97d41fad43eedfb +, headersOnly ? false +}: + +let + basename = "libcxx"; +in + +stdenv.mkDerivation rec { + pname = basename + lib.optionalString headersOnly "-headers"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${basename} "$out" + mkdir -p "$out/libcxxabi" + cp -r ${monorepoSrc}/libcxxabi/include "$out/libcxxabi" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + ''; + + sourceRoot = "${src.name}/${basename}"; + + outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + ../../libcxx-0001-musl-hacks.patch + ]; + + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + patchShebangs utils/cat_files.py + ''; + + nativeBuildInputs = [ cmake python3 ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + buildInputs = lib.optionals (!headersOnly) [ libcxxabi ]; + + cmakeFlags = [ "-DLIBCXX_CXX_ABI=libcxxabi" ] + ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" + ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXX_ENABLE_THREADS=OFF" + "-DLIBCXX_ENABLE_FILESYSTEM=OFF" + "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + + buildFlags = lib.optional headersOnly "generate-cxx-headers"; + installTargets = lib.optional headersOnly "install-cxx-headers"; + + # At this point, cxxabi headers would be installed in the dev output, which + # prevents moveToOutput from doing its job later in the build process. + postInstall = lib.optionalString (!headersOnly) '' + mv "$dev/include/c++/v1/"* "$out/include/c++/v1/" + pushd "$dev" + rmdir -p include/c++/v1 + popd + ''; + + passthru = { + isLLVM = true; + }; + + meta = llvm_meta // { + homepage = "https://libcxx.llvm.org/"; + description = "C++ standard library"; + longDescription = '' + libc++ is an implementation of the C++ standard library, targeting C++11, + C++14 and above. + ''; + # "All of the code in libc++ is dual licensed under the MIT license and the + # UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch new file mode 100644 index 000000000000..0f1d5c411ab8 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/libcxx/gnu-install-dirs.patch @@ -0,0 +1,85 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b0569a4a54ca..7d665f5a3258 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,8 @@ endif() + #=============================================================================== + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -415,13 +417,13 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH + "Path where built libc++ libraries should be installed.") +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH + "Path where target-specific libc++ headers should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) +@@ -431,11 +433,11 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++ libraries should be installed.") +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}/c++/v1" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH + "Path where target-specific libc++ headers should be installed.") +@@ -443,11 +445,11 @@ else() + set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++ libraries should be installed.") +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH + "Path where target-agnostic libc++ headers should be installed.") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH + "Path where target-specific libc++ headers should be installed.") +diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake +index 5a8a4a270a1a..d69405ddeeac 100644 +--- a/cmake/Modules/HandleLibCXXABI.cmake ++++ b/cmake/Modules/HandleLibCXXABI.cmake +@@ -1,8 +1,9 @@ +- + #=============================================================================== + # Add an ABI library if appropriate + #=============================================================================== + ++include(GNUInstallDirs) ++ + # + # _setup_abi: Set up the build to use an ABI library + # +@@ -63,7 +64,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) + + if (LIBCXX_INSTALL_HEADERS) + install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" +- DESTINATION include/c++/v1/${dstdir} ++ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir}" + COMPONENT cxx-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) diff --git a/pkgs/development/compilers/llvm/14/libcxxabi/default.nix b/pkgs/development/compilers/llvm/14/libcxxabi/default.nix new file mode 100644 index 000000000000..07aaa2737cea --- /dev/null +++ b/pkgs/development/compilers/llvm/14/libcxxabi/default.nix @@ -0,0 +1,87 @@ +{ lib, stdenv, llvm_meta, cmake, python3 +, monorepoSrc, runCommand +, cxx-headers, libunwind, version +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "libcxxabi"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx/src" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/include "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/src/include "$out/libcxx/src" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; + + outputs = [ "out" "dev" ]; + + postUnpack = lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + '' + lib.optionalString stdenv.hostPlatform.isWasm '' + patch -p1 -d llvm -i ${./wasm.patch} + ''; + + patches = [ + ./gnu-install-dirs.patch + ]; + + nativeBuildInputs = [ cmake python3 ]; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; + + cmakeFlags = [ + "-DLIBCXXABI_LIBCXX_INCLUDES=${cxx-headers}/include/c++/v1" + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXXABI_ENABLE_THREADS=OFF" + "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optionals (!enableShared) [ + "-DLIBCXXABI_ENABLE_SHARED=OFF" + ]; + + installPhase = if stdenv.isDarwin + then '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + make install + install -d 755 $out/include + install -m 644 ../include/*.h $out/include + '' + else '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.a $out/lib + install -m 644 ../include/cxxabi.h $out/include + '' + lib.optionalString enableShared '' + install -m 644 lib/libc++abi.so.1.0 $out/lib + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; + + meta = llvm_meta // { + homepage = "https://libcxxabi.llvm.org/"; + description = "Provides C++ standard library support"; + longDescription = '' + libc++abi is a new implementation of low level support for a standard C++ library. + ''; + # "All of the code in libc++abi is dual licensed under the MIT license and + # the UIUC License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; + broken = true; # TODO: gnu-install-dirs.patch fails to apply + }; +} diff --git a/pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch new file mode 100644 index 000000000000..a93348ded0c1 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/libcxxabi/gnu-install-dirs.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 858f5d5cfd7f..16c67d7062be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,8 @@ endif() + + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -213,9 +215,9 @@ set(CMAKE_MODULE_PATH + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) +@@ -224,16 +226,16 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + elseif(LLVM_LIBRARY_OUTPUT_INTDIR) + set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") + else() + set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") + endif() + diff --git a/pkgs/development/compilers/llvm/14/libcxxabi/wasm.patch b/pkgs/development/compilers/llvm/14/libcxxabi/wasm.patch new file mode 100644 index 000000000000..4ebfe46aa813 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/libcxxabi/wasm.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake +index 15497d405e0..33f7f18193a 100644 +--- a/cmake/modules/HandleLLVMOptions.cmake ++++ b/cmake/modules/HandleLLVMOptions.cmake +@@ -127,7 +127,10 @@ else(WIN32) + set(LLVM_HAVE_LINK_VERSION_SCRIPT 1) + endif() + else(FUCHSIA OR UNIX) +- MESSAGE(SEND_ERROR "Unable to determine platform") ++ if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi") ++ else() ++ MESSAGE(SEND_ERROR "Unable to determine platform") ++ endif() + endif(FUCHSIA OR UNIX) + endif(WIN32) + diff --git a/pkgs/development/compilers/llvm/14/libunwind/default.nix b/pkgs/development/compilers/llvm/14/libunwind/default.nix new file mode 100644 index 000000000000..109b92f1e027 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/libunwind/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "libunwind"; + inherit version; + + # I am not so comfortable giving libc++ and friends the whole monorepo as + # requested, so I filter it to what is needed. + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/utils "$out/libcxx" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + + meta = llvm_meta // { + # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst + homepage = "https://clang.llvm.org/docs/Toolchain.html#unwind-library"; + description = "LLVM's unwinder library"; + longDescription = '' + The unwind library provides a family of _Unwind_* functions implementing + the language-neutral stack unwinding portion of the Itanium C++ ABI (Level + I). It is a dependency of the C++ ABI library, and sometimes is a + dependency of other runtimes. + ''; + broken = true; # TODO: gnu-install-dirs.patch fails to apply + }; +} diff --git a/pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch new file mode 100644 index 000000000000..3f05d2a87269 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/libunwind/gnu-install-dirs.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e3cc66dd2226..1299b596ce0d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ endif() + + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -139,25 +141,27 @@ set(CMAKE_MODULE_PATH + + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH ++ "Path where built libunwind headers should be installed.") ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libunwind runtime libraries should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) + endif() +-elseif(LLVM_LIBRARY_OUTPUT_INTDIR) +- set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH +- "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH +- "Path where built libunwind runtime libraries should be installed.") + else() +- set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH ++ if(LLVM_LIBRARY_OUTPUT_INTDIR) ++ set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) ++ else() ++ set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ endif() ++ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH ++ "Path where built libunwind headers should be installed.") ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH + "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libunwind runtime libraries should be installed.") + endif() + +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index c3bb1dd0f69f..adf1766c44cb 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -14,7 +14,7 @@ if(LIBUNWIND_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) + install(FILES ${file} +- DESTINATION "include/${dir}" ++ DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}" + COMPONENT unwind-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) diff --git a/pkgs/development/compilers/llvm/14/lld/default.nix b/pkgs/development/compilers/llvm/14/lld/default.nix new file mode 100644 index 000000000000..1ae6d4ea6fce --- /dev/null +++ b/pkgs/development/compilers/llvm/14/lld/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, llvm_meta +, buildLlvmTools +, monorepoSrc, runCommand +, cmake +, libxml2 +, libllvm +, version +}: + +stdenv.mkDerivation rec { + pname = "lld"; + inherit version; + + # Blank llvm dir just so relative path works + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libunwind" + cp -r ${monorepoSrc}/libunwind/include "$out/libunwind" + mkdir -p "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + # On Darwin the llvm-config is perhaps not working fine as the + # LLVM_MAIN_SRC_DIR is not getting set correctly, and the build fails as + # the include path is not correct. + ./fix-root-src-dir.patch + ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libllvm libxml2 ]; + + cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; + + outputs = [ "out" "lib" "dev" ]; + + meta = llvm_meta // { + homepage = "https://lld.llvm.org/"; + description = "The LLVM linker (unwrapped)"; + longDescription = '' + LLD is a linker from the LLVM project that is a drop-in replacement for + system linkers and runs much faster than them. It also provides features + that are useful for toolchain developers. + The linker supports ELF (Unix), PE/COFF (Windows), Mach-O (macOS), and + WebAssembly in descending order of completeness. Internally, LLD consists + of several different linkers. + ''; + }; +} diff --git a/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch b/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch new file mode 100644 index 000000000000..38fb965b472a --- /dev/null +++ b/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9bcc135665d0..d38679ed41e9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,7 +74,7 @@ if(LLD_BUILT_STANDALONE) + + set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include") + set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree") +- set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree") ++ set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") + + find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} + NO_DEFAULT_PATH) diff --git a/pkgs/development/compilers/llvm/14/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/lld/gnu-install-dirs.patch new file mode 100644 index 000000000000..89a5822df49c --- /dev/null +++ b/pkgs/development/compilers/llvm/14/lld/gnu-install-dirs.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index dd2898ce6236..ebbea040ff54 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -18,8 +18,8 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) +@@ -62,5 +62,5 @@ endmacro() + macro(add_lld_symlink name dest) + add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) + # Always generate install targets +- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) ++ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) + endmacro() diff --git a/pkgs/development/compilers/llvm/14/lldb/default.nix b/pkgs/development/compilers/llvm/14/lldb/default.nix new file mode 100644 index 000000000000..fdfb550c2802 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/lldb/default.nix @@ -0,0 +1,145 @@ +{ lib, stdenv, llvm_meta +, runCommand +, monorepoSrc +, cmake +, zlib +, ncurses +, swig +, which +, libedit +, libxml2 +, libllvm +, libclang +, python3 +, version +, libobjc +, xpc +, Foundation +, bootstrap_cmds +, Carbon +, Cocoa +, lit +, makeWrapper +, enableManpages ? false +}: + +stdenv.mkDerivation (rec { + pname = "lldb"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./procfs.patch + (runCommand "resource-dir.patch" { + clangLibDir = "${libclang.lib}/lib"; + } '' + substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir + '') + ./gnu-install-dirs.patch + ]; + + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ + cmake python3 which swig lit makeWrapper + ] ++ lib.optionals enableManpages [ + python3.pkgs.sphinx python3.pkgs.recommonmark + ]; + + buildInputs = [ + ncurses + zlib + libedit + libxml2 + libllvm + ] ++ lib.optionals stdenv.isDarwin [ + libobjc + xpc + Foundation + bootstrap_cmds + Carbon + Cocoa + ]; + + hardeningDisable = [ "format" ]; + + cmakeFlags = [ + "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" + "-DLLVM_ENABLE_RTTI=OFF" + "-DClang_DIR=${libclang.dev}/lib/cmake" + "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" + ] ++ lib.optionals stdenv.isDarwin [ + "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ] ++ lib.optionals enableManpages [ + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + ] ++ lib.optionals doCheck [ + "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" + ]; + + doCheck = false; + + installCheckPhase = '' + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + + postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + + # Editor support + # vscode: + install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json + mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ''; + + meta = llvm_meta // { + homepage = "https://lldb.llvm.org/"; + description = "A next-generation high-performance debugger"; + longDescription = '' + LLDB is a next generation, high-performance debugger. It is built as a set + of reusable components which highly leverage existing libraries in the + larger LLVM Project, such as the Clang expression parser and LLVM + disassembler. + ''; + broken = stdenv.isDarwin; # error: use of undeclared identifier 'CPU_SUBTYPE_ARM64E' + }; +} // lib.optionalAttrs enableManpages { + pname = "lldb-manpages"; + + buildPhase = '' + make docs-lldb-man + ''; + + propagatedBuildInputs = []; + + # manually install lldb man page + installPhase = '' + mkdir -p $out/share/man/man1 + install docs/man/lldb.1 -t $out/share/man/man1/ + ''; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man pages for LLDB ${version}"; + }; +}) diff --git a/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch new file mode 100644 index 000000000000..f69ed9e162fb --- /dev/null +++ b/pkgs/development/compilers/llvm/14/lldb/gnu-install-dirs.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 79d451965ed4..78188978d6de 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,6 +12,8 @@ set(CMAKE_MODULE_PATH + # If we are not building as part of LLVM, build LLDB as a standalone project, + # using LLVM as an external library. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) ++ include(GNUInstallDirs) ++ + project(lldb) + include(LLDBStandalone) + +diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake +index 3291a7c808e1..b27d27ce6a87 100644 +--- a/cmake/modules/AddLLDB.cmake ++++ b/cmake/modules/AddLLDB.cmake +@@ -109,7 +109,7 @@ function(add_lldb_library name) + endif() + + if(PARAM_SHARED) +- set(install_dest lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(PARAM_INSTALL_PREFIX) + set(install_dest ${PARAM_INSTALL_PREFIX}) + endif() +diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt +index 7d48491ec89a..c04543585588 100644 +--- a/tools/intel-features/CMakeLists.txt ++++ b/tools/intel-features/CMakeLists.txt +@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED + ) + + install(TARGETS lldbIntelFeatures +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/pkgs/development/compilers/llvm/14/lldb/procfs.patch b/pkgs/development/compilers/llvm/14/lldb/procfs.patch new file mode 100644 index 000000000000..b075dbaeee0a --- /dev/null +++ b/pkgs/development/compilers/llvm/14/lldb/procfs.patch @@ -0,0 +1,31 @@ +--- a/source/Plugins/Process/Linux/Procfs.h ++++ b/source/Plugins/Process/Linux/Procfs.h +@@ -11,21 +11,12 @@ + // sys/procfs.h on Android/Linux for all supported architectures. + + #include ++#include + +-#ifdef __ANDROID__ +-#if defined(__arm64__) || defined(__aarch64__) +-typedef unsigned long elf_greg_t; +-typedef elf_greg_t +- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; +-typedef struct user_fpsimd_state elf_fpregset_t; +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#elif defined(__mips__) +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#endif +-#else // __ANDROID__ ++#if !defined(__GLIBC__) && defined(__powerpc__) ++#define pt_regs musl_pt_regs ++#include ++#undef pt_regs ++#else + #include +-#endif // __ANDROID__ ++#endif diff --git a/pkgs/development/compilers/llvm/14/lldb/resource-dir.patch b/pkgs/development/compilers/llvm/14/lldb/resource-dir.patch new file mode 100644 index 000000000000..e0db80afeb9f --- /dev/null +++ b/pkgs/development/compilers/llvm/14/lldb/resource-dir.patch @@ -0,0 +1,13 @@ +diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake +index 37364341ff8b..7f74c1a3e257 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -257,7 +257,7 @@ if (NOT TARGET clang-resource-headers) + # Iterate over the possible places where the external resource directory + # could be and pick the first that exists. + foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}" +- "${LLVM_BUILD_LIBRARY_DIR}" ++ "${LLVM_BUILD_LIBRARY_DIR}" "@clangLibDir@" + "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}") + # Build the resource directory path by appending 'clang/'. + set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}") diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix new file mode 100644 index 000000000000..05aac728b452 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -0,0 +1,257 @@ +{ lib, stdenv, llvm_meta +, pkgsBuildBuild +, monorepoSrc +, runCommand +, fetchpatch +, cmake +, python3 +, libffi +, libbfd +, libpfm +, libxml2 +, ncurses +, version +, release_version +, zlib +, which +, buildLlvmTools +, debugVersion ? false +, enableManpages ? false +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic +, enablePFM ? !(stdenv.isDarwin + || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder +) +, enablePolly ? false +} @args: + +let + inherit (lib) optional optionals optionalString; + + # Used when creating a version-suffixed symlink of libLLVM.dylib + shortVersion = with lib; + concatStringsSep "." (take 1 (splitString "." release_version)); + +in stdenv.mkDerivation (rec { + pname = "llvm"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} ('' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" + '' + lib.optionalString enablePolly '' + cp -r ${monorepoSrc}/polly "$out/llvm/tools" + ''); + + sourceRoot = "${src.name}/${pname}"; + + outputs = [ "out" "lib" "dev" "python" ]; + + nativeBuildInputs = [ cmake python3 ] + ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; + + buildInputs = [ libxml2 libffi ] + ++ optional enablePFM libpfm; # exegesis + + propagatedBuildInputs = [ ncurses zlib ]; + + checkInputs = [ which ]; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + + postPatch = optionalString stdenv.isDarwin '' + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + '' + '' + # FileSystem permissions tests fail with various special bits + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + rm unittests/Support/Path.cpp + substituteInPlace unittests/IR/CMakeLists.txt \ + --replace "PassBuilderCallbacksTest.cpp" "" + rm unittests/IR/PassBuilderCallbacksTest.cpp + rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + '' + optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -i ${../../TLI-musl.patch} + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "add_subdirectory(DynamicLibrary)" "" + rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + # valgrind unhappy with musl or glibc, but fails w/musl only + rm test/CodeGen/AArch64/wineh4.mir + '' + optionalString stdenv.hostPlatform.isAarch32 '' + # skip failing X86 test cases on 32-bit ARM + rm test/DebugInfo/X86/convert-debugloc.ll + rm test/DebugInfo/X86/convert-inlined.ll + rm test/DebugInfo/X86/convert-linked.ll + rm test/tools/dsymutil/X86/op-convert.test + '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' + # Seems to require certain floating point hardware (NEON?) + rm test/ExecutionEngine/frem.ll + '' + '' + patchShebangs test/BugPoint/compile-custom.ll.py + ''; + + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + + # E.g. mesa.drivers use the build-id as a cache key (see #93946): + LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + + cmakeFlags = with stdenv; let + # These flags influence llvm-config's BuildVariables.inc in addition to the + # general build. We need to make sure these are also passed via + # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native + # will return different results from the cross llvm-config. + # + # Some flags don't need to be repassed because LLVM already does so (like + # CMAKE_BUILD_TYPE), others are irrelevant to the result. + flagsForLlvmConfig = [ + "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" + "-DLLVM_ENABLE_RTTI=ON" + ] ++ optionals enableSharedLibraries [ + "-DLLVM_LINK_LLVM_DYLIB=ON" + ]; + in flagsForLlvmConfig ++ [ + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_ENABLE_DUMP=ON" + ] ++ optionals stdenv.hostPlatform.isStatic [ + # Disables building of shared libs, -fPIC is still injected by cc-wrapper + "-DLLVM_ENABLE_PIC=OFF" + "-DLLVM_BUILD_STATIC=ON" + # libxml2 needs to be disabled because the LLVM build system ignores its .la + # file and doesn't link zlib as well. + # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812 + "-DLLVM_ENABLE_LIBXML2=OFF" + ] ++ optionals enableManpages [ + "-DLLVM_BUILD_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ optionals (!isDarwin) [ + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" + ] ++ optionals isDarwin [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DCAN_TARGET_i386=false" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCMAKE_CROSSCOMPILING=True" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + # We need to repass the custom GNUInstallDirs values, otherwise CMake + # will choose them for us, leading to wrong results in llvm-config-native + nativeInstallFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" + "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" + "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" + "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" + + lib.concatStringsSep ";" (lib.concatLists [ + flagsForLlvmConfig + nativeToolchainFlags + nativeInstallFlags + ]) + ) + ]; + + postBuild = '' + rm -fR $out + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib + ''; + + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' + '' + + optionalString (stdenv.isDarwin && enableSharedLibraries) '' + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native + ''; + + doCheck = stdenv.isLinux && (!stdenv.isx86_32) && (!stdenv.hostPlatform.isMusl) + && (stdenv.hostPlatform == stdenv.buildPlatform); + + checkTarget = "check-all"; + + # For the update script: + passthru.monorepoSrc = monorepoSrc; + + requiredSystemFeatures = [ "big-parallel" ]; + meta = llvm_meta // { + homepage = "https://llvm.org/"; + description = "A collection of modular and reusable compiler and toolchain technologies"; + longDescription = '' + The LLVM Project is a collection of modular and reusable compiler and + toolchain technologies. Despite its name, LLVM has little to do with + traditional virtual machines. The name "LLVM" itself is not an acronym; it + is the full name of the project. + LLVM began as a research project at the University of Illinois, with the + goal of providing a modern, SSA-based compilation strategy capable of + supporting both static and dynamic compilation of arbitrary programming + languages. Since then, LLVM has grown to be an umbrella project consisting + of a number of subprojects, many of which are being used in production by + a wide variety of commercial and open source projects as well as being + widely used in academic research. Code in the LLVM project is licensed + under the "Apache 2.0 License with LLVM exceptions". + ''; + }; +} // lib.optionalAttrs enableManpages { + pname = "llvm-manpages"; + + buildPhase = '' + make docs-llvm-man + ''; + + propagatedBuildInputs = []; + + installPhase = '' + make -C docs install + ''; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man pages for LLVM ${version}"; + }; +}) diff --git a/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 000000000000..98e998e65a96 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,102 @@ +diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt +index ca7c04c565bb..6a6155806ffa 100644 +--- a/tools/polly/CMakeLists.txt ++++ b/tools/polly/CMakeLists.txt +@@ -3,6 +3,8 @@ if (NOT DEFINED LLVM_MAIN_SRC_DIR) + project(Polly) + cmake_minimum_required(VERSION 3.13.4) + ++ include(GNUInstallDirs) ++ + # Where is LLVM installed? + find_package(LLVM CONFIG REQUIRED) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) +@@ -122,13 +124,13 @@ include_directories( + + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) + install(DIRECTORY include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + ) + + install(DIRECTORY ${POLLY_BINARY_DIR}/include/ +- DESTINATION include ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE +diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt +index 7cc129ba2e90..137be25e4b80 100644 +--- a/tools/polly/cmake/CMakeLists.txt ++++ b/tools/polly/cmake/CMakeLists.txt +@@ -79,18 +79,18 @@ file(GENERATE + + # Generate PollyConfig.cmake for the install tree. + unset(POLLY_EXPORTS) +-set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") ++set(POLLY_INSTALL_PREFIX "") + set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") +-set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") ++set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") ++set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + if (POLLY_BUNDLED_ISL) + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" +- "${POLLY_INSTALL_PREFIX}/include/polly" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" + ) + else() + set(POLLY_CONFIG_INCLUDE_DIRS +- "${POLLY_INSTALL_PREFIX}/include" ++ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" + ${ISL_INCLUDE_DIRS} + ) + endif() +@@ -100,12 +100,12 @@ endif() + foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) + get_target_property(tgt_type ${tgt} TYPE) + if (tgt_type STREQUAL "EXECUTABLE") +- set(tgt_prefix "bin/") ++ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") + else() +- set(tgt_prefix "lib/") ++ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") + endif() + +- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$") ++ set(tgt_path "${tgt_prefix}$") + file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) + + if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") +diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake +index 518a09b45a42..bd9d6f5542ad 100644 +--- a/tools/polly/cmake/polly_macros.cmake ++++ b/tools/polly/cmake/polly_macros.cmake +@@ -44,8 +44,8 @@ macro(add_polly_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") + install(TARGETS ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endmacro(add_polly_library) +diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt +index e3a5683fccdc..293b482eb28a 100644 +--- a/tools/polly/lib/External/CMakeLists.txt ++++ b/tools/polly/lib/External/CMakeLists.txt +@@ -290,7 +290,7 @@ if (POLLY_BUNDLED_ISL) + install(DIRECTORY + ${ISL_SOURCE_DIR}/include/ + ${ISL_BINARY_DIR}/include/ +- DESTINATION include/polly ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly + FILES_MATCHING + PATTERN "*.h" + PATTERN "CMakeFiles" EXCLUDE diff --git a/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs.patch new file mode 100644 index 000000000000..55862ab39304 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/llvm/gnu-install-dirs.patch @@ -0,0 +1,220 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fec956091cd5..5a766f5c5d7c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -303,6 +303,9 @@ set(LLVM_EXAMPLES_INSTALL_DIR "examples" CACHE STRING + "Path for examples subdirectory (enabled by LLVM_BUILD_EXAMPLES=ON) (defaults to 'examples')") + mark_as_advanced(LLVM_EXAMPLES_INSTALL_DIR) + ++set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING ++ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) ++ + # They are used as destination of target generators. + set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) + set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index fed1fec7d72e..4baed19b9e98 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -838,8 +838,8 @@ macro(add_llvm_library name) + get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) + install(TARGETS ${name} + ${export_to_llvmexports} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) + + if (NOT LLVM_ENABLE_IDE) +@@ -1056,7 +1056,7 @@ function(process_llvm_pass_plugins) + "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") + install(FILES + ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake +- DESTINATION ${LLVM_INSTALL_PACKAGE_DIR} ++ DESTINATION ${LLVM_INSTALL_CMAKE_DIR} + COMPONENT cmake-exports) + + set(ExtensionDef "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") +@@ -1902,7 +1902,7 @@ function(llvm_install_library_symlink name dest type) + set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) + set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir bin) + endif() +@@ -1913,7 +1913,7 @@ function(llvm_install_library_symlink name dest type) + + endfunction() + +-function(llvm_install_symlink name dest) ++function(llvm_install_symlink name dest output_dir) + cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) + foreach(path ${CMAKE_MODULE_PATH}) + if(EXISTS ${path}/LLVMInstallSymlink.cmake) +@@ -1936,7 +1936,7 @@ function(llvm_install_symlink name dest) + set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) + + install(SCRIPT ${INSTALL_SYMLINK} +- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" ++ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" + COMPONENT ${component}) + + if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) +@@ -2019,7 +2019,8 @@ function(add_llvm_tool_symlink link_name target) + endif() + + if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) +- llvm_install_symlink(${link_name} ${target}) ++ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) ++ llvm_install_symlink(${link_name} ${target} ${output_dir}) + endif() + endif() + endfunction() +@@ -2148,9 +2149,9 @@ function(llvm_setup_rpath name) + # Since BUILD_SHARED_LIBS is only recommended for use by developers, + # hardcode the rpath to build/install lib dir first in this mode. + # FIXME: update this when there is better solution. +- set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + elseif(UNIX) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 891c9e6d618c..8d963f3b0069 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -147,9 +147,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index cea0c1df0a14..eedcd9450312 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -2,7 +2,7 @@ include(ExtendPath) + include(LLVMDistributionSupport) + include(FindPrefixFromConfig) + +-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) ++set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") + set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") + + # First for users who use an installed LLVM, create the LLVMExports.cmake file. +@@ -122,7 +122,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS + ) + list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) + +-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}") ++extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_LIBRARY_DIRS + "${LLVM_CONFIG_LIBRARY_DIR}" + # FIXME: Should there be other entries here? +diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake +index b5c35f706cb7..9261ab797de6 100644 +--- a/cmake/modules/LLVMInstallSymlink.cmake ++++ b/cmake/modules/LLVMInstallSymlink.cmake +@@ -6,7 +6,7 @@ include(GNUInstallDirs) + + function(install_symlink name target outdir) + set(DESTDIR $ENV{DESTDIR}) +- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}") ++ set(bindir "${DESTDIR}${outdir}/") + + message(STATUS "Creating ${name}") + +diff --git a/docs/CMake.rst b/docs/CMake.rst +index 044ec8a4d39d..504d0eac3ade 100644 +--- a/docs/CMake.rst ++++ b/docs/CMake.rst +@@ -224,7 +224,7 @@ description is in `LLVM-related variables`_ below. + **LLVM_LIBDIR_SUFFIX**:STRING + Extra suffix to append to the directory where libraries are to be + installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` +- to install libraries to ``/usr/lib64``. ++ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. + + **LLVM_PARALLEL_{COMPILE,LINK}_JOBS**:STRING + Building the llvm toolchain can use a lot of resources, particularly +@@ -910,9 +910,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + + This file is available in two different locations. + +-* ``/lib/cmake/llvm/LLVMConfig.cmake`` where +- ```` is the install prefix of an installed version of LLVM. +- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. ++* ``LLVMConfig.cmake`` where ++ ```` is the location where LLVM CMake modules are ++ installed as part of an installed version of LLVM. This is typically ++ ``cmake/llvm/`` within the lib directory. On Linux, this is typically ++ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. + + * ``/lib/cmake/llvm/LLVMConfig.cmake`` where + ```` is the root of the LLVM build tree. **Note: this is only +diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt +index b46319f24fc8..2feabd1954e4 100644 +--- a/include/llvm/CMakeLists.txt ++++ b/include/llvm/CMakeLists.txt +@@ -5,5 +5,5 @@ add_subdirectory(Frontend) + # If we're doing an out-of-tree build, copy a module map for generated + # header files into the build area. + if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +- configure_file(module.modulemap.build module.modulemap COPYONLY) ++ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) + endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index abbb8a450da6..70c497be12f5 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -23,7 +23,10 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" + #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" ++#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" + #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" + #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 8ed88f33ead4..5e7184bab90d 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -363,12 +363,20 @@ int main(int argc, char **argv) { + ActiveIncludeDir = std::string(Path.str()); + } + { +- SmallString<256> Path(LLVM_TOOLS_INSTALL_DIR); ++ SmallString<256> Path(LLVM_INSTALL_BINDIR); + sys::fs::make_absolute(ActivePrefix, Path); + ActiveBinDir = std::string(Path.str()); + } +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; +- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; ++ { ++ SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveLibDir = std::string(Path.str()); ++ } ++ { ++ SmallString<256> Path(LLVM_INSTALL_CMAKEDIR); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveCMakeDir = std::string(Path.str()); ++ } + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + diff --git a/pkgs/development/compilers/llvm/14/openmp/default.nix b/pkgs/development/compilers/llvm/14/openmp/default.nix new file mode 100644 index 000000000000..622072b53e18 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/openmp/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, llvm_meta +, monorepoSrc +, runCommand +, cmake +, llvm +, lit +, clang-unwrapped +, perl +, pkg-config +, version +}: + +stdenv.mkDerivation rec { + pname = "openmp"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + ./run-lit-directly.patch + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake perl pkg-config lit ]; + buildInputs = [ llvm ]; + + # Unsup:Pass:XFail:Fail + # 26:267:16:8 + doCheck = false; + checkTarget = "check-openmp"; + + preCheck = '' + patchShebangs ../tools/archer/tests/deflake.bash + ''; + + cmakeFlags = [ + "-DCLANG_TOOL=${clang-unwrapped}/bin/clang" + "-DOPT_TOOL=${llvm}/bin/opt" + "-DLINK_TOOL=${llvm}/bin/llvm-link" + ]; + + meta = llvm_meta // { + homepage = "https://openmp.llvm.org/"; + description = "Support for the OpenMP language"; + longDescription = '' + The OpenMP subproject of LLVM contains the components required to build an + executable OpenMP program that are outside the compiler itself. + Contains the code for the runtime library against which code compiled by + "clang -fopenmp" must be linked before it can run and the library that + supports offload to target devices. + ''; + # "All of the code is dual licensed under the MIT license and the UIUC + # License (a BSD-like license)": + license = with lib.licenses; [ mit ncsa ]; + }; +} diff --git a/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch new file mode 100644 index 000000000000..e85fde46ca3f --- /dev/null +++ b/pkgs/development/compilers/llvm/14/openmp/gnu-install-dirs.patch @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,7 @@ if (OPENMP_STANDALONE_BUILD) + set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING + "Suffix of lib installation directory, e.g. 64 => lib64") + # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR. +- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") + + # Group test settings. + set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING +@@ -35,7 +35,7 @@ if (OPENMP_STANDALONE_BUILD) + else() + set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) + # If building in tree, we honor the same install suffix LLVM uses. +- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + + if (NOT MSVC) + set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) +diff --git a/libomptarget/plugins/amdgpu/CMakeLists.txt b/libomptarget/plugins/amdgpu/CMakeLists.txt +--- a/libomptarget/plugins/amdgpu/CMakeLists.txt ++++ b/libomptarget/plugins/amdgpu/CMakeLists.txt +@@ -74,7 +74,7 @@ add_library(omptarget.rtl.amdgpu SHARED + + # Install plugin under the lib destination folder. + # When we build for debug, OPENMP_LIBDIR_SUFFIX get set to -debug +-install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "lib${OPENMP_LIBDIR_SUFFIX}") ++install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") + set_property(TARGET omptarget.rtl.amdgpu PROPERTY INSTALL_RPATH_USE_LINK_PATH ON) + + if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +diff --git a/libomptarget/plugins/ve/CMakeLists.txt b/libomptarget/plugins/ve/CMakeLists.txt +--- a/libomptarget/plugins/ve/CMakeLists.txt ++++ b/libomptarget/plugins/ve/CMakeLists.txt +@@ -32,7 +32,7 @@ if(${LIBOMPTARGET_DEP_VEO_FOUND}) + + # Install plugin under the lib destination folder. + install(TARGETS "omptarget.rtl.${tmachine_libname}" +- LIBRARY DESTINATION lib${OPENMP_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}) + + target_link_libraries( + "omptarget.rtl.${tmachine_libname}" diff --git a/pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch b/pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch new file mode 100644 index 000000000000..1e952fdc36a8 --- /dev/null +++ b/pkgs/development/compilers/llvm/14/openmp/run-lit-directly.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/OpenMPTesting.cmake b/cmake/OpenMPTesting.cmake +--- a/cmake/OpenMPTesting.cmake ++++ b/cmake/OpenMPTesting.cmake +@@ -185,7 +185,7 @@ function(add_openmp_testsuite target comment) + if (${OPENMP_STANDALONE_BUILD}) + set(LIT_ARGS ${OPENMP_LIT_ARGS} ${ARG_ARGS}) + add_custom_target(${target} +- COMMAND ${PYTHON_EXECUTABLE} ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} ++ COMMAND ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} + COMMENT ${comment} + DEPENDS ${ARG_DEPENDS} + USES_TERMINAL diff --git a/pkgs/development/compilers/llvm/5/lld/default.nix b/pkgs/development/compilers/llvm/5/lld/default.nix index 7e74e79a15c7..239cb84c2ceb 100644 --- a/pkgs/development/compilers/llvm/5/lld/default.nix +++ b/pkgs/development/compilers/llvm/5/lld/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/6/lld/default.nix b/pkgs/development/compilers/llvm/6/lld/default.nix index 83b1991f453c..81dd39c39eb8 100644 --- a/pkgs/development/compilers/llvm/6/lld/default.nix +++ b/pkgs/development/compilers/llvm/6/lld/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/7/lld/default.nix b/pkgs/development/compilers/llvm/7/lld/default.nix index 09a0a68e2572..7858599990ca 100644 --- a/pkgs/development/compilers/llvm/7/lld/default.nix +++ b/pkgs/development/compilers/llvm/7/lld/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/8/lld/default.nix b/pkgs/development/compilers/llvm/8/lld/default.nix index 66b59937e5f1..30be084fa814 100644 --- a/pkgs/development/compilers/llvm/8/lld/default.nix +++ b/pkgs/development/compilers/llvm/8/lld/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/9/lld/default.nix b/pkgs/development/compilers/llvm/9/lld/default.nix index d13e6a107dd9..73cfe630bbbb 100644 --- a/pkgs/development/compilers/llvm/9/lld/default.nix +++ b/pkgs/development/compilers/llvm/9/lld/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/git/clang/default.nix b/pkgs/development/compilers/llvm/git/clang/default.nix index 3873bda2b6d5..9544494b356e 100644 --- a/pkgs/development/compilers/llvm/git/clang/default.nix +++ b/pkgs/development/compilers/llvm/git/clang/default.nix @@ -1,16 +1,23 @@ -{ lib, stdenv, llvm_meta, src, substituteAll, cmake, libxml2, libllvm, version, python3 +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, substituteAll, cmake, libxml2, libllvm, version, python3 , buildLlvmTools , fixDarwinDylibNames , enableManpages ? false }: let - self = stdenv.mkDerivation ({ + self = stdenv.mkDerivation (rec { pname = "clang"; inherit version; - inherit src; - sourceRoot = "source/clang"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; nativeBuildInputs = [ cmake python3 ] ++ lib.optional enableManpages python3.pkgs.sphinx diff --git a/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch index b834d386b4eb..a8825f08850e 100644 --- a/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/clang/gnu-install-dirs.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9e74014134a0..976e6a1757fd 100644 +index 7ea37850ad60..ac0f2d4f60b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.13.4) - if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) + if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) project(Clang) + include(GNUInstallDirs) @@ -11,7 +11,7 @@ index 9e74014134a0..976e6a1757fd 100644 set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to") set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_EXTENSIONS NO) -@@ -416,7 +418,7 @@ include_directories(BEFORE +@@ -424,7 +426,7 @@ include_directories(BEFORE if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(DIRECTORY include/clang include/clang-c @@ -20,7 +20,7 @@ index 9e74014134a0..976e6a1757fd 100644 COMPONENT clang-headers FILES_MATCHING PATTERN "*.def" -@@ -425,7 +427,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +@@ -433,7 +435,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) ) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang @@ -29,7 +29,7 @@ index 9e74014134a0..976e6a1757fd 100644 COMPONENT clang-headers FILES_MATCHING PATTERN "CMakeFiles" EXCLUDE -@@ -445,7 +447,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +@@ -453,7 +455,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh) install(PROGRAMS utils/bash-autocomplete.sh @@ -39,10 +39,10 @@ index 9e74014134a0..976e6a1757fd 100644 if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-bash-autocomplete diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake -index 704278a0e93b..d25c8d325c71 100644 +index 5752f4277444..5bf08dbf5e83 100644 --- a/cmake/modules/AddClang.cmake +++ b/cmake/modules/AddClang.cmake -@@ -123,9 +123,9 @@ macro(add_clang_library name) +@@ -118,9 +118,9 @@ macro(add_clang_library name) install(TARGETS ${lib} COMPONENT ${lib} ${export_to_clangtargets} @@ -55,8 +55,8 @@ index 704278a0e93b..d25c8d325c71 100644 if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-${lib} -@@ -170,7 +170,7 @@ macro(add_clang_tool name) - +@@ -159,7 +159,7 @@ macro(add_clang_tool name) + get_target_export_arg(${name} Clang export_to_clangtargets) install(TARGETS ${name} ${export_to_clangtargets} - RUNTIME DESTINATION bin @@ -64,7 +64,7 @@ index 704278a0e93b..d25c8d325c71 100644 COMPONENT ${name}) if(NOT LLVM_ENABLE_IDE) -@@ -185,7 +185,7 @@ endmacro() +@@ -174,7 +174,7 @@ endmacro() macro(add_clang_symlink name dest) add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) # Always generate install targets @@ -74,10 +74,10 @@ index 704278a0e93b..d25c8d325c71 100644 function(clang_target_link_libraries target type) diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index b2c0ce8dd4a0..19e5443d8c25 100644 +index 078988980c52..14b58614b40a 100644 --- a/lib/Headers/CMakeLists.txt +++ b/lib/Headers/CMakeLists.txt -@@ -215,7 +215,7 @@ set_target_properties(clang-resource-headers PROPERTIES +@@ -234,7 +234,7 @@ set_target_properties(clang-resource-headers PROPERTIES FOLDER "Misc" RUNTIME_OUTPUT_DIRECTORY "${output_dir}") @@ -87,10 +87,10 @@ index b2c0ce8dd4a0..19e5443d8c25 100644 install( FILES ${files} ${generated_files} diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt -index ceef4b08637c..8efad5520ca4 100644 +index 99c6081db2d6..0887102febb3 100644 --- a/tools/c-index-test/CMakeLists.txt +++ b/tools/c-index-test/CMakeLists.txt -@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) +@@ -49,7 +49,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH "@executable_path/../../lib") else() @@ -146,10 +146,10 @@ index cda8e29ec5b1..0134d8ccd70b 100644 + DESTINATION ${CMAKE_INSTALL_DATADIR}/clang COMPONENT clang-rename) diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt -index 51ff2e7e1565..1ed5f8a079a1 100644 +index bf88dca0a34b..7a10181e7738 100644 --- a/tools/libclang/CMakeLists.txt +++ b/tools/libclang/CMakeLists.txt -@@ -166,7 +166,7 @@ endif() +@@ -186,7 +186,7 @@ endif() if(INTERNAL_INSTALL_PREFIX) set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") else() @@ -158,7 +158,7 @@ index 51ff2e7e1565..1ed5f8a079a1 100644 endif() install(DIRECTORY ../../include/clang-c -@@ -196,7 +196,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) +@@ -216,7 +216,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) COMPONENT libclang-python-bindings DESTINATION @@ -168,7 +168,7 @@ index 51ff2e7e1565..1ed5f8a079a1 100644 if(NOT LLVM_ENABLE_IDE) add_custom_target(libclang-python-bindings) diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt -index ec0702d76f18..d25d982f51da 100644 +index 74334e53c9b1..ebaae33e4324 100644 --- a/tools/scan-build/CMakeLists.txt +++ b/tools/scan-build/CMakeLists.txt @@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD) @@ -199,10 +199,10 @@ index ec0702d76f18..d25d982f51da 100644 endforeach() diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt -index dd3d33439299..fea19c12ce70 100644 +index eccc6b83195b..ff72d9cf0666 100644 --- a/tools/scan-view/CMakeLists.txt +++ b/tools/scan-view/CMakeLists.txt -@@ -19,7 +19,7 @@ if(CLANG_INSTALL_SCANVIEW) +@@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS bin/${BinFile} @@ -211,7 +211,7 @@ index dd3d33439299..fea19c12ce70 100644 COMPONENT scan-view) endforeach() -@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) +@@ -34,7 +34,7 @@ if(CLANG_INSTALL_SCANVIEW) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) install(FILES share/${ShareFile} diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 019148039d17..59ca5348fed4 100644 --- a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, llvm_meta, version, src, cmake, python3, libllvm, libcxxabi }: +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake, python3, libllvm, libcxxabi +}: let @@ -7,14 +10,21 @@ let haveLibc = stdenv.cc.libc != null; inherit (stdenv.hostPlatform) isMusl; + baseName = "compiler-rt"; + + src = runCommand "${baseName}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${baseName} "$out" + ''; in stdenv.mkDerivation { - pname = "compiler-rt" + lib.optionalString (haveLibc) "-libc"; + pname = baseName + lib.optionalString (haveLibc) "-libc"; inherit version; inherit src; - sourceRoot = "source/compiler-rt"; + sourceRoot = "${src.name}/${baseName}"; nativeBuildInputs = [ cmake python3 libllvm.dev ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; @@ -58,6 +68,7 @@ stdenv.mkDerivation { patches = [ ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config + ./gnu-install-dirs.patch # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the # extra `/`. ./normalize-var.patch diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 000000000000..909b5193ffd8 --- /dev/null +++ b/pkgs/development/compilers/llvm/git/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5003b5efa1d..4fffb9721284 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,8 @@ + + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) ++ + # Check if compiler-rt is built as a standalone project. + if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) + project(CompilerRT C CXX ASM) +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index 1ada0ab30ba0..b4be6c4a3c73 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -66,7 +66,7 @@ if (LLVM_TREE_AVAILABLE) + else() + # Take output dir and install path from the user. + set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH +- "Path where built compiler-rt libraries should be stored.") ++ "Path where built compiler-rt build artifacts should be stored.") + set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH + "Path where built compiler-rt executables should be stored.") + set(COMPILER_RT_INSTALL_PATH "" CACHE PATH +@@ -98,23 +98,23 @@ endif() + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib) ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}") ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + endif() +-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" bin) ++extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_BINDIR}") + set(COMPILER_RT_INSTALL_BINARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt executables should be installed.") +-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" include) ++extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_INCLUDEDIR}") + set(COMPILER_RT_INSTALL_INCLUDE_DIR "${default_install_path}" CACHE PATH + "Path where compiler-rt headers should be installed.") +-extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" share) ++extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_DATADIR}") + set(COMPILER_RT_INSTALL_DATA_DIR "${default_install_path}" CACHE PATH + "Path where compiler-rt data files should be installed.") + diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 890270c851db..0f45acffb279 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -21,16 +21,16 @@ let release_version = "14.0.0"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; - rev = "ee65938357d5fffe9e586fa155b37268b5a358ac"; # When using a Git commit - rev-version = "unstable-2021-08-13"; # When using a Git commit + rev = "fb1582f6c54422995c6fb61ba4c55126b357f64e"; # When using a Git commit + rev-version = "unstable-2022-01-07"; # When using a Git commit version = if rev != "" then rev-version else "${release_version}${dash-candidate}"; targetConfig = stdenv.targetPlatform.config; - src = fetchFromGitHub { + monorepoSrc = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "10ahc108wbg2rsp50j3mc8h018a453ykg1rivjkhizng80pyllm1"; + sha256 = "1pkgdsscvf59i22ix763lp2z3sg0v2z2ywh0n07k3ki7q1qpqbhk"; }; llvm_meta = { @@ -40,7 +40,7 @@ let }; tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version src buildLlvmTools; }); + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc buildLlvmTools; }); mkExtraBuildCommands0 = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -218,7 +218,7 @@ let }); libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version src; }); + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc; }); in { compiler-rt-libc = callPackage ./compiler-rt { diff --git a/pkgs/development/compilers/llvm/git/libcxx/default.nix b/pkgs/development/compilers/llvm/git/libcxx/default.nix index bedfd5afee15..8891a69937ab 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, llvm_meta, src, cmake, python3, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, cmake, python3, fixDarwinDylibNames, version , libcxxabi , enableShared ? !stdenv.hostPlatform.isStatic @@ -10,12 +12,26 @@ , headersOnly ? false }: +let + basename = "libcxx"; +in + stdenv.mkDerivation rec { - pname = if headersOnly then "cxx-headers" else "libcxx"; + pname = basename + lib.optionalString headersOnly "-headers"; inherit version; - inherit src; - sourceRoot = "source/libcxx"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${basename} "$out" + mkdir -p "$out/libcxxabi" + cp -r ${monorepoSrc}/libcxxabi/include "$out/libcxxabi" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + ''; + + sourceRoot = "${src.name}/${basename}"; outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; @@ -25,12 +41,6 @@ stdenv.mkDerivation rec { ../../libcxx-0001-musl-hacks.patch ]; - # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" - postPatch = '' - substituteInPlace include/__config \ - --replace "# define _LIBCPP_USE_AVAILABILITY_APPLE" "" - ''; - preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; diff --git a/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch index 744967a6ee0b..0f1d5c411ab8 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/libcxx/gnu-install-dirs.patch @@ -1,82 +1,85 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1e25358d41a..7fe1f4d85401 100644 +index b0569a4a54ca..7d665f5a3258 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -26,6 +26,8 @@ set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build") - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXX_STANDALONE_BUILD) - project(libcxx CXX C) +@@ -10,6 +10,8 @@ endif() + #=============================================================================== + cmake_minimum_required(VERSION 3.13.4) -+ include(GNUInstallDirs) ++include(GNUInstallDirs) + - set(PACKAGE_NAME libcxx) - set(PACKAGE_VERSION 13.0.0git) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -412,7 +414,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -415,13 +417,13 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") - set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH -+ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH "Path where built libc++ libraries should be installed.") - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH "Path where target-agnostic libc++ headers should be installed.") -@@ -426,7 +428,7 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) +- set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH + "Path where target-specific libc++ headers should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXX_LIBRARY_DIR /${LIBCXX_LIBDIR_SUBDIR}) +@@ -431,11 +433,11 @@ elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") - set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH "Path where built libc++ libraries should be installed.") - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}/c++/v1" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH "Path where target-agnostic libc++ headers should be installed.") -@@ -436,7 +438,7 @@ else() + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH + "Path where target-specific libc++ headers should be installed.") +@@ -443,11 +445,11 @@ else() set(LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXX_LIBDIR_SUFFIX}) set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") - set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH "Path where built libc++ libraries should be installed.") - set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH +- set(LIBCXX_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++ runtime libraries should be installed.") +- set(LIBCXX_INSTALL_INCLUDE_DIR "include/c++/v1" CACHE PATH ++ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE PATH "Path where target-agnostic libc++ headers should be installed.") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH + "Path where target-specific libc++ headers should be installed.") diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake -index 5a8a4a270a1a..c06bae0001aa 100644 +index 5a8a4a270a1a..d69405ddeeac 100644 --- a/cmake/Modules/HandleLibCXXABI.cmake +++ b/cmake/Modules/HandleLibCXXABI.cmake -@@ -63,7 +63,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) +@@ -1,8 +1,9 @@ +- + #=============================================================================== + # Add an ABI library if appropriate + #=============================================================================== + ++include(GNUInstallDirs) ++ + # + # _setup_abi: Set up the build to use an ABI library + # +@@ -63,7 +64,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs) if (LIBCXX_INSTALL_HEADERS) install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" - DESTINATION include/c++/v1/${dstdir} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} ++ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir}" COMPONENT cxx-headers PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 496429f3841e..1a0c9c0a3159 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -376,21 +376,21 @@ if (LIBCXX_INSTALL_SHARED_LIBRARY) - install(TARGETS cxx_shared - ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION bin COMPONENT cxx) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) - endif() - - if (LIBCXX_INSTALL_STATIC_LIBRARY) - install(TARGETS cxx_static - ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION bin COMPONENT cxx) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) - endif() - - if(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY) - install(TARGETS cxx_experimental - LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx - ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx -- RUNTIME DESTINATION bin COMPONENT cxx) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT cxx) - endif() - - # NOTE: This install command must go after the cxx install command otherwise diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 9f14f87a7a02..d64708ab040a 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, llvm_meta, cmake, python3, src, cxx-headers, libunwind, version +{ lib, stdenv, llvm_meta, cmake, python3 +, monorepoSrc, runCommand +, cxx-headers, libunwind, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -6,8 +8,19 @@ stdenv.mkDerivation rec { pname = "libcxxabi"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx/src" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/include "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/src/include "$out/libcxx/src" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch index 5d562dd59a99..a93348ded0c1 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/libcxxabi/gnu-install-dirs.patch @@ -1,37 +1,46 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9fb35860d483..5739d9e8af62 100644 +index 858f5d5cfd7f..16c67d7062be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -27,6 +27,8 @@ set(LIBCXXABI_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBCXXABI_STANDALONE_BUILD) - project(libcxxabi CXX C) +@@ -10,6 +10,8 @@ endif() -+ include(GNUInstallDirs) + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) + - set(PACKAGE_NAME libcxxabi) - set(PACKAGE_VERSION 11.0.0git) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -195,7 +197,7 @@ set(CMAKE_MODULE_PATH + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -213,9 +215,9 @@ set(CMAKE_MODULE_PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) - set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) -@@ -204,12 +206,12 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) +@@ -224,16 +226,16 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) elseif(LLVM_LIBRARY_OUTPUT_INTDIR) set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") else() set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) - set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH "Path where built libc++abi libraries should be installed.") +- set(LIBCXXABI_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libc++abi runtime libraries should be installed.") endif() diff --git a/pkgs/development/compilers/llvm/git/libunwind/default.nix b/pkgs/development/compilers/llvm/git/libunwind/default.nix index b6017e741728..c6d9eda5e474 100644 --- a/pkgs/development/compilers/llvm/git/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/git/libunwind/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, llvm_meta, version, src, cmake +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -6,8 +8,20 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + # I am not so comfortable giving libc++ and friends the whole monorepo as + # requested, so I filter it to what is needed. + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/utils "$out/libcxx" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch index 8cd25c56f8cc..3f05d2a87269 100644 --- a/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/libunwind/gnu-install-dirs.patch @@ -1,36 +1,65 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 81eddbc24879..e2afb2002150 100644 +index e3cc66dd2226..1299b596ce0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -23,6 +23,8 @@ set(LIBUNWIND_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR LIBUNWIND_STANDALONE_BUILD) - project(libunwind LANGUAGES C CXX ASM) +@@ -8,6 +8,8 @@ endif() -+ include(GNUInstallDirs) + cmake_minimum_required(VERSION 3.13.4) + ++include(GNUInstallDirs) + - set(PACKAGE_NAME libunwind) - set(PACKAGE_VERSION 13.0.0git) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -@@ -116,7 +118,7 @@ set(CMAKE_MODULE_PATH + set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") + + # Add path for custom modules +@@ -139,25 +141,27 @@ set(CMAKE_MODULE_PATH if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) - set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}" CACHE PATH ++ "Path where built libunwind headers should be installed.") + set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libunwind runtime libraries should be installed.") if(LIBCXX_LIBDIR_SUBDIR) string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) -@@ -124,11 +126,11 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + string(APPEND LIBUNWIND_INSTALL_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) endif() - elseif(LLVM_LIBRARY_OUTPUT_INTDIR) - set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) +-elseif(LLVM_LIBRARY_OUTPUT_INTDIR) +- set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) - set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} CACHE PATH - "Path where built libunwind libraries should be installed.") +- "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH +- "Path where built libunwind runtime libraries should be installed.") else() - set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) +- set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) - set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH -+ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} CACHE PATH ++ if(LLVM_LIBRARY_OUTPUT_INTDIR) ++ set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) ++ else() ++ set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) ++ endif() ++ set(LIBUNWIND_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH ++ "Path where built libunwind headers should be installed.") ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH "Path where built libunwind libraries should be installed.") +- set(LIBUNWIND_INSTALL_RUNTIME_DIR bin CACHE PATH ++ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path where built libunwind runtime libraries should be installed.") endif() +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index c3bb1dd0f69f..adf1766c44cb 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -14,7 +14,7 @@ if(LIBUNWIND_INSTALL_HEADERS) + foreach(file ${files}) + get_filename_component(dir ${file} DIRECTORY) + install(FILES ${file} +- DESTINATION "include/${dir}" ++ DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}" + COMPONENT unwind-headers + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + ) diff --git a/pkgs/development/compilers/llvm/git/lld/default.nix b/pkgs/development/compilers/llvm/git/lld/default.nix index 34ac265f4bfd..1ae6d4ea6fce 100644 --- a/pkgs/development/compilers/llvm/git/lld/default.nix +++ b/pkgs/development/compilers/llvm/git/lld/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta , buildLlvmTools -, src +, monorepoSrc, runCommand , cmake , libxml2 , libllvm @@ -11,19 +11,30 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + # Blank llvm dir just so relative path works + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libunwind" + cp -r ${monorepoSrc}/libunwind/include "$out/libunwind" + mkdir -p "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; patches = [ ./gnu-install-dirs.patch + # On Darwin the llvm-config is perhaps not working fine as the + # LLVM_MAIN_SRC_DIR is not getting set correctly, and the build fails as + # the include path is not correct. + ./fix-root-src-dir.patch ]; nativeBuildInputs = [ cmake ]; buildInputs = [ libllvm libxml2 ]; - cmakeFlags = [ - "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" ]; @@ -31,7 +42,7 @@ stdenv.mkDerivation rec { meta = llvm_meta // { homepage = "https://lld.llvm.org/"; - description = "The LLVM linker"; + description = "The LLVM linker (unwrapped)"; longDescription = '' LLD is a linker from the LLVM project that is a drop-in replacement for system linkers and runs much faster than them. It also provides features diff --git a/pkgs/development/compilers/llvm/git/lld/fix-root-src-dir.patch b/pkgs/development/compilers/llvm/git/lld/fix-root-src-dir.patch new file mode 100644 index 000000000000..26ecef256495 --- /dev/null +++ b/pkgs/development/compilers/llvm/git/lld/fix-root-src-dir.patch @@ -0,0 +1,13 @@ +diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt +index e1a29b884d17..9d542f8fbfc1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,7 +64,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + + set(LLVM_MAIN_INCLUDE_DIR ${MAIN_INCLUDE_DIR} CACHE PATH "Path to llvm/include") + set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree") +- set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree") ++ set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") + + find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} + NO_DEFAULT_PATH) diff --git a/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch index 61e2f0e48653..89a5822df49c 100644 --- a/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/lld/gnu-install-dirs.patch @@ -1,68 +1,22 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d4e561b50d8f..cfa5bdd79c2a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(LLD_BUILT_STANDALONE TRUE) - -+ include(GNUInstallDirs) -+ - find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") - if(NOT LLVM_CONFIG_PATH) - message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") -@@ -179,7 +181,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - ) diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake -index 23df41312403..d62372c88de7 100644 +index dd2898ce6236..ebbea040ff54 100644 --- a/cmake/modules/AddLLD.cmake +++ b/cmake/modules/AddLLD.cmake -@@ -20,9 +20,9 @@ macro(add_lld_library name) +@@ -18,8 +18,8 @@ macro(add_lld_library name) install(TARGETS ${name} COMPONENT ${name} ${export_to_lldtargets} - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) - add_llvm_install_targets(install-${name} -@@ -54,7 +54,7 @@ macro(add_lld_tool name) - - install(TARGETS ${name} - ${export_to_lldtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT CMAKE_CONFIGURATION_TYPES) -@@ -69,5 +69,5 @@ endmacro() +@@ -62,5 +62,5 @@ endmacro() macro(add_lld_symlink name dest) add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) # Always generate install targets - llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) + llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) endmacro() -diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt -index 5cff736ff57f..64e775c771b9 100644 ---- a/tools/lld/CMakeLists.txt -+++ b/tools/lld/CMakeLists.txt -@@ -21,7 +21,7 @@ target_link_libraries(lld - ) - - install(TARGETS lld -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if(NOT LLD_SYMLINKS_TO_CREATE) - set(LLD_SYMLINKS_TO_CREATE diff --git a/pkgs/development/compilers/llvm/git/lldb/default.nix b/pkgs/development/compilers/llvm/git/lldb/default.nix index 96d8b19ee419..a2c68b224775 100644 --- a/pkgs/development/compilers/llvm/git/lldb/default.nix +++ b/pkgs/development/compilers/llvm/git/lldb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, llvm_meta , runCommand -, src +, monorepoSrc , cmake , zlib , ncurses @@ -27,8 +27,13 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; patches = [ ./procfs.patch diff --git a/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch index afc945ce2614..f69ed9e162fb 100644 --- a/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/lldb/gnu-install-dirs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b5633e21c56a..f2f1035e9238 100644 +index 79d451965ed4..78188978d6de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -10,6 +10,8 @@ set(CMAKE_MODULE_PATH +@@ -12,6 +12,8 @@ set(CMAKE_MODULE_PATH # If we are not building as part of LLVM, build LLDB as a standalone project, # using LLVM as an external library. if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) @@ -12,10 +12,10 @@ index b5633e21c56a..f2f1035e9238 100644 include(LLDBStandalone) diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake -index 4ed5c647c5d2..89f96e710d55 100644 +index 3291a7c808e1..b27d27ce6a87 100644 --- a/cmake/modules/AddLLDB.cmake +++ b/cmake/modules/AddLLDB.cmake -@@ -107,13 +107,13 @@ function(add_lldb_library name) +@@ -109,7 +109,7 @@ function(add_lldb_library name) endif() if(PARAM_SHARED) @@ -24,68 +24,13 @@ index 4ed5c647c5d2..89f96e710d55 100644 if(PARAM_INSTALL_PREFIX) set(install_dest ${PARAM_INSTALL_PREFIX}) endif() - # RUNTIME is relevant for DLL platforms, FRAMEWORK for macOS - install(TARGETS ${name} COMPONENT ${name} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${install_dest} - ARCHIVE DESTINATION ${install_dest} - FRAMEWORK DESTINATION ${install_dest}) -diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake -index 2fdf1502d055..37364341ff8b 100644 ---- a/cmake/modules/LLDBConfig.cmake -+++ b/cmake/modules/LLDBConfig.cmake -@@ -225,7 +225,7 @@ include_directories(BEFORE - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ - COMPONENT lldb-headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".cmake" EXCLUDE -@@ -233,7 +233,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ - COMPONENT lldb-headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".cmake" EXCLUDE diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt -index 734167e51bc5..f95761b5df58 100644 +index 7d48491ec89a..c04543585588 100644 --- a/tools/intel-features/CMakeLists.txt +++ b/tools/intel-features/CMakeLists.txt -@@ -65,4 +65,4 @@ if (LLDB_ENABLE_PYTHON AND LLDB_BUILD_INTEL_PT) - endif() +@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED + ) install(TARGETS lldbIntelFeatures - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) -diff --git a/cmake/modules/LLDBStandalone.cmake b/cmake/modules/LLDBStandalone.cmake -index 752113b..010f187 100644 ---- a/cmake/modules/LLDBStandalone.cmake -+++ b/cmake/modules/LLDBStandalone.cmake -@@ -62,7 +62,7 @@ endif() - - # They are used as destination of target generators. - set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) --set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -+set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(WIN32 OR CYGWIN) - # DLL platform -- put DLLs into bin. - set(LLVM_SHLIB_OUTPUT_INTDIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b5633e2..86e4738 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -79,7 +79,7 @@ if (LLDB_ENABLE_PYTHON) - if(LLDB_BUILD_FRAMEWORK) - set(lldb_python_target_dir "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb") - else() -- set(lldb_python_target_dir "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LLDB_PYTHON_RELATIVE_PATH}/lldb") -+ set(lldb_python_target_dir "${CMAKE_INSTALL_LIBDIR}/../${LLDB_PYTHON_RELATIVE_PATH}/lldb") - endif() - get_target_property(lldb_python_bindings_dir swig_wrapper_python BINARY_DIR) - finish_swig_python("lldb-python" "${lldb_python_bindings_dir}" "${lldb_python_target_dir}") diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index fc7030810c5b..d2059cc66ba2 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, llvm_meta , pkgsBuildBuild -, src +, monorepoSrc +, runCommand , fetchpatch , cmake , python3 @@ -22,7 +23,7 @@ || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? false -}: +} @args: let inherit (lib) optional optionals optionalString; @@ -35,8 +36,16 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + src = runCommand "${pname}-src-${version}" {} ('' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" + '' + lib.optionalString enablePolly '' + cp -r ${monorepoSrc}/polly "$out/llvm/tools" + ''); + + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "lib" "dev" "python" ]; @@ -51,12 +60,6 @@ in stdenv.mkDerivation (rec { checkInputs = [ which ]; patches = [ - # When cross-compiling we configure llvm-config-native with an approximation - # of the flags used for the normal LLVM build. To avoid the need for building - # a native libLLVM.so (which would fail) we force llvm-config to be linked - # statically against the necessary LLVM components always. - ../../llvm-config-link-static.patch - ./gnu-install-dirs.patch ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; diff --git a/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch index 68f3c45396f6..98e998e65a96 100644 --- a/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch +++ b/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch @@ -1,20 +1,17 @@ diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt -index ca7c04c565bb..6ed5db5dd4f8 100644 +index ca7c04c565bb..6a6155806ffa 100644 --- a/tools/polly/CMakeLists.txt +++ b/tools/polly/CMakeLists.txt -@@ -2,7 +2,11 @@ - if (NOT DEFINED LLVM_MAIN_SRC_DIR) +@@ -3,6 +3,8 @@ if (NOT DEFINED LLVM_MAIN_SRC_DIR) project(Polly) cmake_minimum_required(VERSION 3.13.4) -+endif() -+ -+include(GNUInstallDirs) -+if (NOT DEFINED LLVM_MAIN_SRC_DIR) ++ include(GNUInstallDirs) ++ # Where is LLVM installed? find_package(LLVM CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) -@@ -122,13 +126,13 @@ include_directories( +@@ -122,13 +124,13 @@ include_directories( if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) install(DIRECTORY include/ @@ -91,10 +88,10 @@ index 518a09b45a42..bd9d6f5542ad 100644 set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) endmacro(add_polly_library) diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt -index 8991094d92c7..178d8ad606bb 100644 +index e3a5683fccdc..293b482eb28a 100644 --- a/tools/polly/lib/External/CMakeLists.txt +++ b/tools/polly/lib/External/CMakeLists.txt -@@ -275,7 +275,7 @@ if (POLLY_BUNDLED_ISL) +@@ -290,7 +290,7 @@ if (POLLY_BUNDLED_ISL) install(DIRECTORY ${ISL_SOURCE_DIR}/include/ ${ISL_BINARY_DIR}/include/ diff --git a/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch index 18fa5fc6d89c..55862ab39304 100644 --- a/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs.patch @@ -1,23 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 135036f509d2..265c36f8211b 100644 +index fec956091cd5..5a766f5c5d7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -270,15 +270,21 @@ if (CMAKE_BUILD_TYPE AND - message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") - endif() - -+include(GNUInstallDirs) -+ - set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) - --set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") -+set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING -+ "Path for binary subdirectory (defaults to 'bin')") - mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) - - set(LLVM_UTILS_INSTALL_DIR "${LLVM_TOOLS_INSTALL_DIR}" CACHE STRING - "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") - mark_as_advanced(LLVM_UTILS_INSTALL_DIR) +@@ -303,6 +303,9 @@ set(LLVM_EXAMPLES_INSTALL_DIR "examples" CACHE STRING + "Path for examples subdirectory (enabled by LLVM_BUILD_EXAMPLES=ON) (defaults to 'examples')") + mark_as_advanced(LLVM_EXAMPLES_INSTALL_DIR) +set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING + "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) @@ -25,70 +12,22 @@ index 135036f509d2..265c36f8211b 100644 # They are used as destination of target generators. set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -@@ -581,9 +587,9 @@ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) - option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) - option (LLVM_ENABLE_BINDINGS "Build bindings." ON) - --set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" -+set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" - CACHE STRING "Doxygen-generated HTML documentation install directory") --set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" -+set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" - CACHE STRING "OCamldoc-generated HTML documentation install directory") - - option (LLVM_BUILD_EXTERNAL_COMPILER_RT -@@ -1048,7 +1054,7 @@ endif() - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/llvm include/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -@@ -1059,7 +1065,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -@@ -1073,13 +1079,13 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - - if (LLVM_INSTALL_MODULEMAPS) - install(DIRECTORY include/llvm include/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "module.modulemap" - ) - install(FILES include/llvm/module.install.modulemap -- DESTINATION include/llvm -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm - COMPONENT llvm-headers - RENAME "module.extern.modulemap" - ) diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 9c2b85374307..5531ceeb2eeb 100644 +index fed1fec7d72e..4baed19b9e98 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake -@@ -818,9 +818,9 @@ macro(add_llvm_library name) +@@ -838,8 +838,8 @@ macro(add_llvm_library name) get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) install(TARGETS ${name} ${export_to_llvmexports} - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} -- RUNTIME DESTINATION bin COMPONENT ${name}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${name}) ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) if (NOT LLVM_ENABLE_IDE) - add_llvm_install_targets(install-${name} -@@ -1036,7 +1036,7 @@ function(process_llvm_pass_plugins) +@@ -1056,7 +1056,7 @@ function(process_llvm_pass_plugins) "set(LLVM_STATIC_EXTENSIONS ${LLVM_STATIC_EXTENSIONS})") install(FILES ${llvm_cmake_builddir}/LLVMConfigExtensions.cmake @@ -97,16 +36,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 COMPONENT cmake-exports) set(ExtensionDef "${LLVM_BINARY_DIR}/include/llvm/Support/Extension.def") -@@ -1250,7 +1250,7 @@ macro(add_llvm_example name) - endif() - add_llvm_executable(${name} ${ARGN}) - if( LLVM_BUILD_EXAMPLES ) -- install(TARGETS ${name} RUNTIME DESTINATION examples) -+ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Examples") - endmacro(add_llvm_example name) -@@ -1868,7 +1868,7 @@ function(llvm_install_library_symlink name dest type) +@@ -1902,7 +1902,7 @@ function(llvm_install_library_symlink name dest type) set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) @@ -115,7 +45,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 if(WIN32 AND "${type}" STREQUAL "SHARED") set(output_dir bin) endif() -@@ -1879,7 +1879,7 @@ function(llvm_install_library_symlink name dest type) +@@ -1913,7 +1913,7 @@ function(llvm_install_library_symlink name dest type) endfunction() @@ -124,7 +54,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) foreach(path ${CMAKE_MODULE_PATH}) if(EXISTS ${path}/LLVMInstallSymlink.cmake) -@@ -1902,7 +1902,7 @@ function(llvm_install_symlink name dest) +@@ -1936,7 +1936,7 @@ function(llvm_install_symlink name dest) set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) install(SCRIPT ${INSTALL_SYMLINK} @@ -133,7 +63,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 COMPONENT ${component}) if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE) -@@ -1985,7 +1985,8 @@ function(add_llvm_tool_symlink link_name target) +@@ -2019,7 +2019,8 @@ function(add_llvm_tool_symlink link_name target) endif() if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) @@ -143,7 +73,7 @@ index 9c2b85374307..5531ceeb2eeb 100644 endif() endif() endfunction() -@@ -2114,9 +2115,9 @@ function(llvm_setup_rpath name) +@@ -2148,9 +2149,9 @@ function(llvm_setup_rpath name) # Since BUILD_SHARED_LIBS is only recommended for use by developers, # hardcode the rpath to build/install lib dir first in this mode. # FIXME: update this when there is better solution. @@ -156,10 +86,10 @@ index 9c2b85374307..5531ceeb2eeb 100644 set_property(TARGET ${name} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-z,origin ") diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake -index 554046b20edf..4d1ad980641e 100644 +index 891c9e6d618c..8d963f3b0069 100644 --- a/cmake/modules/AddOCaml.cmake +++ b/cmake/modules/AddOCaml.cmake -@@ -144,9 +144,9 @@ function(add_ocaml_library name) +@@ -147,9 +147,9 @@ function(add_ocaml_library name) endforeach() if( APPLE ) @@ -171,86 +101,55 @@ index 554046b20edf..4d1ad980641e 100644 endif() list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") -diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake -index e80c3b5c1cac..482f6d715ef5 100644 ---- a/cmake/modules/AddSphinxTarget.cmake -+++ b/cmake/modules/AddSphinxTarget.cmake -@@ -90,7 +90,7 @@ function (add_sphinx_target builder project) - endif() - elseif (builder STREQUAL html) - string(TOUPPER "${project}" project_upper) -- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" -+ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" - CACHE STRING "HTML documentation install directory for ${project}") - - # '/.' indicates: copy the contents of the directory directly into diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index 51b6a4fdc284..4adc2acfc074 100644 +index cea0c1df0a14..eedcd9450312 100644 --- a/cmake/modules/CMakeLists.txt +++ b/cmake/modules/CMakeLists.txt -@@ -1,6 +1,6 @@ +@@ -2,7 +2,7 @@ include(ExtendPath) include(LLVMDistributionSupport) + include(FindPrefixFromConfig) -set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) +set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") # First for users who use an installed LLVM, create the LLVMExports.cmake file. -@@ -109,13 +109,13 @@ foreach(p ${_count}) - set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} - get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") - endforeach(p) --set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") -+set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") - set(LLVM_CONFIG_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") - set(LLVM_CONFIG_MAIN_INCLUDE_DIR "${LLVM_CONFIG_INCLUDE_DIRS}") --set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") -+set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") - set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") - set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") --set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") -+set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") +@@ -122,7 +122,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS + ) + list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) - # Generate a default location for lit - if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS) +-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}") ++extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_LIBRARY_DIRS + "${LLVM_CONFIG_LIBRARY_DIR}" + # FIXME: Should there be other entries here? diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake -index 3e6a2c9a2648..52e14d955c60 100644 +index b5c35f706cb7..9261ab797de6 100644 --- a/cmake/modules/LLVMInstallSymlink.cmake +++ b/cmake/modules/LLVMInstallSymlink.cmake -@@ -4,7 +4,7 @@ +@@ -6,7 +6,7 @@ include(GNUInstallDirs) function(install_symlink name target outdir) set(DESTDIR $ENV{DESTDIR}) -- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") +- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}") + set(bindir "${DESTDIR}${outdir}/") message(STATUS "Creating ${name}") diff --git a/docs/CMake.rst b/docs/CMake.rst -index f1ac2c7d4934..c6e1469b5e13 100644 +index 044ec8a4d39d..504d0eac3ade 100644 --- a/docs/CMake.rst +++ b/docs/CMake.rst -@@ -202,7 +202,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. +@@ -224,7 +224,7 @@ description is in `LLVM-related variables`_ below. **LLVM_LIBDIR_SUFFIX**:STRING Extra suffix to append to the directory where libraries are to be installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` - to install libraries to ``/usr/lib64``. + to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. - Rarely-used CMake variables - --------------------------- -@@ -551,8 +551,8 @@ LLVM-specific variables - - **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING - The path to install Doxygen-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/doxygen-html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. - - **LLVM_LINK_LLVM_DYLIB**:BOOL - If enabled, tools will be linked with the libLLVM shared library. Defaults -@@ -792,9 +792,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). + **LLVM_PARALLEL_{COMPILE,LINK}_JOBS**:STRING + Building the llvm toolchain can use a lot of resources, particularly +@@ -910,9 +910,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). This file is available in two different locations. @@ -265,18 +164,6 @@ index f1ac2c7d4934..c6e1469b5e13 100644 * ``/lib/cmake/llvm/LLVMConfig.cmake`` where ```` is the root of the LLVM build tree. **Note: this is only -diff --git a/examples/Bye/CMakeLists.txt b/examples/Bye/CMakeLists.txt -index bb96edb4b4bf..678c22fb43c8 100644 ---- a/examples/Bye/CMakeLists.txt -+++ b/examples/Bye/CMakeLists.txt -@@ -14,6 +14,6 @@ if (NOT WIN32) - BUILDTREE_ONLY - ) - -- install(TARGETS ${name} RUNTIME DESTINATION examples) -+ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) - set_target_properties(${name} PROPERTIES FOLDER "Examples") - endif() diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt index b46319f24fc8..2feabd1954e4 100644 --- a/include/llvm/CMakeLists.txt @@ -289,93 +176,45 @@ index b46319f24fc8..2feabd1954e4 100644 + configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index ebe5b73a5c65..70c497be12f5 100644 +index abbb8a450da6..70c497be12f5 100644 --- a/tools/llvm-config/BuildVariables.inc.in +++ b/tools/llvm-config/BuildVariables.inc.in -@@ -23,6 +23,10 @@ +@@ -23,7 +23,10 @@ #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" +#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" +#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" -+#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" + #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" +#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 1a2f04552d13..44fa7d3eec6b 100644 +index 8ed88f33ead4..5e7184bab90d 100644 --- a/tools/llvm-config/llvm-config.cpp +++ b/tools/llvm-config/llvm-config.cpp -@@ -357,12 +357,26 @@ int main(int argc, char **argv) { - ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); - } else { - ActivePrefix = CurrentExecPrefix; -- ActiveIncludeDir = ActivePrefix + "/include"; -- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); -- sys::fs::make_absolute(ActivePrefix, path); -- ActiveBinDir = std::string(path.str()); +@@ -363,12 +363,20 @@ int main(int argc, char **argv) { + ActiveIncludeDir = std::string(Path.str()); + } + { +- SmallString<256> Path(LLVM_TOOLS_INSTALL_DIR); ++ SmallString<256> Path(LLVM_INSTALL_BINDIR); + sys::fs::make_absolute(ActivePrefix, Path); + ActiveBinDir = std::string(Path.str()); + } - ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; - ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; + { -+ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveIncludeDir = std::string(path.str()); ++ SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveLibDir = std::string(Path.str()); + } + { -+ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveBinDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveLibDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveCMakeDir = std::string(path.str()); ++ SmallString<256> Path(LLVM_INSTALL_CMAKEDIR); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveCMakeDir = std::string(Path.str()); + } ActiveIncludeOption = "-I" + ActiveIncludeDir; } -diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt -index 0af29ad762c5..37b99b83e35c 100644 ---- a/tools/lto/CMakeLists.txt -+++ b/tools/lto/CMakeLists.txt -@@ -33,7 +33,7 @@ add_llvm_library(${LTO_LIBRARY_NAME} ${LTO_LIBRARY_TYPE} INSTALL_WITH_TOOLCHAIN - ${SOURCES} DEPENDS intrinsics_gen) - - install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h -- DESTINATION include/llvm-c -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c - COMPONENT LTO) - - if (APPLE) -diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt -index ead73ec13a8f..250362021f17 100644 ---- a/tools/opt-viewer/CMakeLists.txt -+++ b/tools/opt-viewer/CMakeLists.txt -@@ -8,7 +8,7 @@ set (files - - foreach (file ${files}) - install(PROGRAMS ${file} -- DESTINATION share/opt-viewer -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer - COMPONENT opt-viewer) - endforeach (file) - -diff --git a/tools/remarks-shlib/CMakeLists.txt b/tools/remarks-shlib/CMakeLists.txt -index 865436247270..ce1daa62f6ab 100644 ---- a/tools/remarks-shlib/CMakeLists.txt -+++ b/tools/remarks-shlib/CMakeLists.txt -@@ -19,7 +19,7 @@ if(LLVM_ENABLE_PIC) - endif() - - install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h -- DESTINATION include/llvm-c -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c - COMPONENT Remarks) - - if (APPLE) diff --git a/pkgs/development/compilers/llvm/git/openmp/default.nix b/pkgs/development/compilers/llvm/git/openmp/default.nix index c5a33df97560..7add0c7ed465 100644 --- a/pkgs/development/compilers/llvm/git/openmp/default.nix +++ b/pkgs/development/compilers/llvm/git/openmp/default.nix @@ -1,10 +1,13 @@ { lib , stdenv , llvm_meta -, src +, monorepoSrc +, runCommand , cmake , llvm +, clang-unwrapped , perl +, pkg-config , version }: @@ -12,10 +15,22 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - inherit src; - sourceRoot = "source/${pname}"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; - nativeBuildInputs = [ cmake perl ]; + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + ./fix-find-tool.patch + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake perl pkg-config clang-unwrapped ]; buildInputs = [ llvm ]; cmakeFlags = [ diff --git a/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch b/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch new file mode 100644 index 000000000000..b5d0e7b41775 --- /dev/null +++ b/pkgs/development/compilers/llvm/git/openmp/fix-find-tool.patch @@ -0,0 +1,54 @@ +diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt +index 242df638f80d..a4654e96371f 100644 +--- a/libomptarget/DeviceRTL/CMakeLists.txt ++++ b/libomptarget/DeviceRTL/CMakeLists.txt +@@ -25,16 +25,16 @@ endif() + + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} +- NO_DEFAULT_PATH) +- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ REQUIRED) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + libomptarget_say("Building DeviceRTL. Using clang: ${CLANG_TOOL}") + elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD) + # LLVM in-tree builds may use CMake target names to discover the tools. +- set(CLANG_TOOL $) +- set(LINK_TOOL $) +- set(OPT_TOOL $) ++ set(CLANG_TOOL $ REQUIRED) ++ set(LINK_TOOL $ REQUIRED) ++ set(OPT_TOOL $ REQUIRED) + libomptarget_say("Building DeviceRTL. Using clang from in-tree build") + else() + libomptarget_say("Not building DeviceRTL. No appropriate clang found") +diff --git a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt +index 3f4c02671aeb..be9f4677d7b5 100644 +--- a/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt ++++ b/libomptarget/deviceRTLs/amdgcn/CMakeLists.txt +@@ -38,16 +38,16 @@ endif() + + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} +- NO_DEFAULT_PATH) +- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ REQUIRED) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} REQUIRED) + libomptarget_say("Building AMDGCN device RTL. Using clang: ${CLANG_TOOL}") + elseif (LLVM_TOOL_CLANG_BUILD AND NOT CMAKE_CROSSCOMPILING AND NOT OPENMP_STANDALONE_BUILD) + # LLVM in-tree builds may use CMake target names to discover the tools. +- set(CLANG_TOOL $) +- set(LINK_TOOL $) +- set(OPT_TOOL $) ++ set(CLANG_TOOL $ REQUIRED) ++ set(LINK_TOOL $ REQUIRED) ++ set(OPT_TOOL $ REQUIRED) + libomptarget_say("Building AMDGCN device RTL. Using clang from in-tree build") + else() + libomptarget_say("Not building AMDGCN device RTL. No appropriate clang found") diff --git a/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch new file mode 100644 index 000000000000..352a46923115 --- /dev/null +++ b/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch @@ -0,0 +1,89 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7f11a05f5622..fb90f8f6a49b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + set(OPENMP_STANDALONE_BUILD TRUE) + project(openmp C CXX) + ++ include(GNUInstallDirs) ++ + # CMAKE_BUILD_TYPE was not set, default to Release. + if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) +@@ -19,7 +21,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING + "Suffix of lib installation directory, e.g. 64 => lib64") + # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR. +- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") + + # Group test settings. + set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING +@@ -30,7 +32,7 @@ if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_S + else() + set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) + # If building in tree, we honor the same install suffix LLVM uses. +- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + + if (NOT MSVC) + set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) +index 0e1ce2afd154..8b3810f83713 100644 +--- a/libomptarget/plugins/amdgpu/CMakeLists.txt ++++ b/libomptarget/plugins/amdgpu/CMakeLists.txt +@@ -80,7 +80,7 @@ add_library(omptarget.rtl.amdgpu SHARED + + # Install plugin under the lib destination folder. + # When we build for debug, OPENMP_LIBDIR_SUFFIX get set to -debug +-install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "lib${OPENMP_LIBDIR_SUFFIX}") ++install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") + set_property(TARGET omptarget.rtl.amdgpu PROPERTY INSTALL_RPATH_USE_LINK_PATH ON) + + if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +diff --git a/libomptarget/plugins/ve/CMakeLists.txt b/libomptarget/plugins/ve/CMakeLists.txt +index 16ce0891ca23..db30ee9c769f 100644 +--- a/libomptarget/plugins/ve/CMakeLists.txt ++++ b/libomptarget/plugins/ve/CMakeLists.txt +@@ -32,7 +32,7 @@ if(${LIBOMPTARGET_DEP_VEO_FOUND}) + + # Install plugin under the lib destination folder. + install(TARGETS "omptarget.rtl.${tmachine_libname}" +- LIBRARY DESTINATION lib${OPENMP_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}) + + target_link_libraries( + "omptarget.rtl.${tmachine_libname}" +diff --git a/runtime/src/CMakeLists.txt b/runtime/src/CMakeLists.txt +index e4f4e6e1e73f..1164b3b22b0e 100644 +--- a/runtime/src/CMakeLists.txt ++++ b/runtime/src/CMakeLists.txt +@@ -346,13 +346,13 @@ add_dependencies(libomp-micro-tests libomp-test-deps) + # We want to install libomp in DESTDIR/CMAKE_INSTALL_PREFIX/lib + # We want to install headers in DESTDIR/CMAKE_INSTALL_PREFIX/include + if(${OPENMP_STANDALONE_BUILD}) +- set(LIBOMP_HEADERS_INSTALL_PATH include) ++ set(LIBOMP_HEADERS_INSTALL_PATH "${CMAKE_INSTALL_INCLUDEDIR}") + else() + string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION ${PACKAGE_VERSION}) + set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include") + endif() + if(WIN32) +- install(TARGETS omp RUNTIME DESTINATION bin) ++ install(TARGETS omp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(TARGETS ${LIBOMP_IMP_LIB_TARGET} ARCHIVE DESTINATION "${OPENMP_INSTALL_LIBDIR}") + # Create aliases (regular copies) of the library for backwards compatibility + set(LIBOMP_ALIASES "libiomp5md") +diff --git a/tools/multiplex/CMakeLists.txt b/tools/multiplex/CMakeLists.txt +index 64317c112176..4002784da736 100644 +--- a/tools/multiplex/CMakeLists.txt ++++ b/tools/multiplex/CMakeLists.txt +@@ -4,7 +4,7 @@ if(LIBOMP_OMPT_SUPPORT) + add_library(ompt-multiplex INTERFACE) + target_include_directories(ompt-multiplex INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) + +- install(FILES ompt-multiplex.h DESTINATION include) ++ install(FILES ompt-multiplex.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + add_subdirectory(tests) + endif() diff --git a/pkgs/development/compilers/llvm/rocm/compiler-rt/68d5235cb58f988c71b403334cd9482d663841ab.patch b/pkgs/development/compilers/llvm/rocm/compiler-rt/68d5235cb58f988c71b403334cd9482d663841ab.patch deleted file mode 100644 index 43803164a00f..000000000000 --- a/pkgs/development/compilers/llvm/rocm/compiler-rt/68d5235cb58f988c71b403334cd9482d663841ab.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -+++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -@@ -370,15 +370,6 @@ - - #if SANITIZER_GLIBC - // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE -- _(CYGETDEFTHRESH, WRITE, sizeof(int)); -- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); -- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); -- _(CYGETTHRESH, WRITE, sizeof(int)); -- _(CYGETTIMEOUT, WRITE, sizeof(int)); -- _(CYSETDEFTHRESH, NONE, 0); -- _(CYSETDEFTIMEOUT, NONE, 0); -- _(CYSETTHRESH, NONE, 0); -- _(CYSETTIMEOUT, NONE, 0); - _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); - _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); - _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -143,7 +143,6 @@ - # include - #endif - #include --#include - #include - #include - #include -@@ -460,7 +459,6 @@ - - #if SANITIZER_GLIBC - unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); -- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); - #if EV_VERSION > (0x010000) - unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); - #else -@@ -824,15 +822,6 @@ - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; -- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; -- unsigned IOCTL_CYGETMON = CYGETMON; -- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; -- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; -- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; -- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; -- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; -- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; - unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; - unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; - unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -983,7 +983,6 @@ - - #if SANITIZER_LINUX && !SANITIZER_ANDROID - extern unsigned struct_ax25_parms_struct_sz; --extern unsigned struct_cyclades_monitor_sz; - extern unsigned struct_input_keymap_entry_sz; - extern unsigned struct_ipx_config_data_sz; - extern unsigned struct_kbdiacrs_sz; -@@ -1328,15 +1327,6 @@ - #endif // SANITIZER_LINUX - - #if SANITIZER_LINUX && !SANITIZER_ANDROID --extern unsigned IOCTL_CYGETDEFTHRESH; --extern unsigned IOCTL_CYGETDEFTIMEOUT; --extern unsigned IOCTL_CYGETMON; --extern unsigned IOCTL_CYGETTHRESH; --extern unsigned IOCTL_CYGETTIMEOUT; --extern unsigned IOCTL_CYSETDEFTHRESH; --extern unsigned IOCTL_CYSETDEFTIMEOUT; --extern unsigned IOCTL_CYSETTHRESH; --extern unsigned IOCTL_CYSETTIMEOUT; - extern unsigned IOCTL_EQL_EMANCIPATE; - extern unsigned IOCTL_EQL_ENSLAVE; - extern unsigned IOCTL_EQL_GETMASTRCFG; diff --git a/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix b/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix index 575082905fed..dfc21e7fe013 100644 --- a/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/rocm/compiler-rt/default.nix @@ -29,12 +29,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - patches = [ - ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - # https://github.com/llvm/llvm-project/commit/68d5235cb58f988c71b403334cd9482d663841ab.diff but the compiler-rt part of the path is stripped - ./68d5235cb58f988c71b403334cd9482d663841ab.patch - ]; - + prePatch = '' + cd compiler-rt + ''; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index b1297d7d0d1f..18fd44612f10 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, buildPackages, fetchFromGitHub, callPackage, wrapCCWith, overrideCC }: let - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - hash = "sha256-XWh81+2yyXQEPO+5SgxHh66fzFG1bVbvnjPfvXDC+fU="; + hash = "sha256-wPzwbeQUFE6RAytrz5lBa6UUPoVL0UeMyY3qa4M6W6M="; }; in rec { clang = wrapCCWith rec { @@ -47,7 +47,7 @@ in rec { compiler-rt = callPackage ./compiler-rt { inherit version llvm; - src = "${src}/compiler-rt"; + inherit src; stdenv = overrideCC stdenv clangNoCompilerRt; }; diff --git a/pkgs/development/compilers/llvm/rocm/llvm/default.nix b/pkgs/development/compilers/llvm/rocm/llvm/default.nix index 724fd6b63f76..722ca1a762a8 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm/default.nix @@ -12,7 +12,7 @@ , zlib , debugVersion ? false , enableManpages ? false -, enableSharedLibraries ? !stdenv.hostPlatform.isStatic +, enableSharedLibraries ? false , version , src @@ -60,6 +60,8 @@ in stdenv.mkDerivation rec { ]; postPatch = '' + patchShebangs lib/OffloadArch/make_generated_offload_arch_h.sh + '' + lib.optionalString enableSharedLibraries '' substitute '${./outputs.patch}' ./outputs.patch --subst-var lib patch -p1 < ./outputs.patch ''; diff --git a/pkgs/development/compilers/llvm/update.sh b/pkgs/development/compilers/llvm/update.sh index 603c603f275b..95ad356dbd9a 100755 --- a/pkgs/development/compilers/llvm/update.sh +++ b/pkgs/development/compilers/llvm/update.sh @@ -20,7 +20,11 @@ sed -Ei \ readonly ATTRSET="llvmPackages_$VERSION_MAJOR" -if [ "$VERSION_MAJOR" -ge "13" ]; then +if [ "$VERSION_MAJOR" -ge "14" ]; then + readonly SOURCES=( + "llvm.monorepoSrc" + ) +elif [ "$VERSION_MAJOR" -eq "13" ]; then readonly SOURCES=( "llvm.src" ) @@ -43,7 +47,7 @@ fi for SOURCE in "${SOURCES[@]}"; do echo "Updating the hash of $SOURCE:" declare ATTR="$ATTRSET.$SOURCE" - declare OLD_HASH="$(nix eval -f . $ATTR.outputHash)" + declare OLD_HASH="$(nix --extra-experimental-features nix-command eval -f . $ATTR.outputHash)" declare NEW_HASH="\"$(nix-prefetch-url -A $ATTR)\"" find "$DIR" -type f -exec sed -i "s/$OLD_HASH/$NEW_HASH/" {} + done diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix index 23c75ae28bb7..4f2b081b4db2 100644 --- a/pkgs/development/compilers/mezzo/default.nix +++ b/pkgs/development/compilers/mezzo/default.nix @@ -28,6 +28,10 @@ stdenv.mkDerivation { prePatch = lib.optionalString (check-ocaml-version "4.02") '' substituteInPlace myocamlbuild.pre.ml \ --replace '@1..3' '@1..2+3' + '' + # Compatibility with PPrint ≥ 20220103 + + '' + substituteInPlace typing/Fact.ml --replace PPrintOCaml PPrint.OCaml ''; createFindlibDestdir = true; diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index c67f8d2f72ff..75b3d1128e45 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -12,7 +12,8 @@ let "-x86-64"; in stdenv.mkDerivation { - name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}"; + pname = "mit-scheme" + lib.optionalString enableX11 "-x11"; + inherit version; # MIT/GNU Scheme is not bootstrappable, so it's recommended to compile from # the platform-specific tarballs, which contain pre-built binaries. It diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix index ec0b96bbf23a..b91e6c7480da 100644 --- a/pkgs/development/compilers/mlton/from-git-source.nix +++ b/pkgs/development/compilers/mlton/from-git-source.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation { buildInputs = [mltonBootstrap gmp]; + # build fails otherwise + enableParallelBuilding = false; + preBuild = '' find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@" sed -i "s|/tmp|$TMPDIR|" bin/regression diff --git a/pkgs/development/compilers/myrddin/default.nix b/pkgs/development/compilers/myrddin/default.nix index 3120426210bf..a7aa84a1aa8d 100644 --- a/pkgs/development/compilers/myrddin/default.nix +++ b/pkgs/development/compilers/myrddin/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ luc65r ]; platforms = platforms.all; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/myrddin.x86_64-darwin }; } diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 06b19b547b67..4b0e6e618e3a 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -78,11 +78,11 @@ let pname = "nim-bootstrap"; version = "g${lib.substring 0 7 revision}"; - src = fetchgit { - # A Git checkout is much smaller than a GitHub tarball. - url = "https://github.com/nim-lang/csources_v1.git"; + src = fetchFromGitHub { + owner = "nim-lang"; + repo = "csources_v1"; rev = revision; - sha256 = "1c2k681knrha1zmf4abhb32i2wwd3nwflzylnqryxk753swla043"; + sha256 = "sha256-gwBFuR7lzO4zttR/6rgdjXMRxVhwKeLqDwpmOwMyU7A="; }; enableParallelBuilding = true; @@ -98,12 +98,12 @@ in { nim-unwrapped = stdenv.mkDerivation rec { pname = "nim-unwrapped"; - version = "1.6.2"; + version = "1.6.4"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${version}.tar.xz"; - hash = "sha256-msRxT6bDFdaR2n9diUHBsZDU1Dc5fZdC4yfC1RiT43M="; + hash = "sha256-f8MJKFW1wiAM2f7tEz0EYFgj8lDXO01KxQEwA3DgoMI="; }; buildInputs = [ boehmgc openssl pcre readline sqlite ]; diff --git a/pkgs/development/compilers/ocaml/4.12.nix b/pkgs/development/compilers/ocaml/4.12.nix index 0662e66e0b6a..4be2bcf5f9d0 100644 --- a/pkgs/development/compilers/ocaml/4.12.nix +++ b/pkgs/development/compilers/ocaml/4.12.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "12"; - patch_version = "0"; - sha256 = "1hxy349jfa2vkfgmxf6pvd9w4z5bmcgsg0fxfdabcghyvjw9vvir"; + patch_version = "1"; + sha256 = "1jbjjnmqq6ymsy81x188i256bz4z5jrz1pws8g1qf59c32ganjkf"; } diff --git a/pkgs/development/compilers/ocaml/4.14.nix b/pkgs/development/compilers/ocaml/4.14.nix new file mode 100644 index 000000000000..558a1491ca7f --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.14.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "14"; + patch_version = "0-rc2"; + src = fetchTarball { + url = "https://caml.inria.fr/pub/distrib/ocaml-4.14/ocaml-4.14.0~rc2.tar.xz"; + sha256 = "sha256:0ch8nyfk2mzwhmlxb434cyamp7n14zxhwsq1h8033g629kw50kb0"; + }; +} diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index de2dae156ee6..dc2af6e7835d 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -2,24 +2,24 @@ , lib , fetchFromGitHub , unstableGitUpdater +, dosbox # Docs cause an immense increase in build time, up to 2 additional hours , withDocs ? false -, dosbox , ghostscript , withGUI ? false }: stdenv.mkDerivation rec { pname = "open-watcom-v2"; - version = "unstable-2022-01-18"; + version = "unstable-2022-03-14"; name = "${pname}-unwrapped-${version}"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "f09e0c969c45679c048180f2dc6b3dbbe69e42a0"; - sha256 = "dEjG4L/VVufSAerKcXPUqZ7esz4m8/210ZshVz4SNAA="; + rev = "22627ccc1bd3de70aff9ac056e0dc9ecf7f7b6ec"; + sha256 = "khy/fhmQjTGKfx6iOUBt+ySwpEx0df/7meyNvBnJAPY="; }; postPatch = '' @@ -41,8 +41,7 @@ stdenv.mkDerivation rec { --replace '-static' "" ''; - nativeBuildInputs = [ ] - ++ lib.optional (withDocs || withGUI) dosbox + nativeBuildInputs = [ dosbox ] ++ lib.optional withDocs ghostscript; configurePhase = '' @@ -55,7 +54,7 @@ stdenv.mkDerivation rec { export OWGUINOBUILD=${if withGUI then "0" else "1"} export OWNOBUILD= export OWDISTRBUILD=0 - export OWDOSBOX=${lib.optionalString (withDocs || withGUI) "${dosbox}/bin/dosbox"} + export OWDOSBOX=${dosbox}/bin/dosbox export OWVERBOSE=0 export OWRELROOT=$out diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 1ffc85a6ada5..f9ab0714b470 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -1,14 +1,15 @@ # Build Open Dylan from source using the binary builds to bootstrap. -{lib, stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: +{lib, stdenv, fetchFromGitHub, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: stdenv.mkDerivation { pname = "opendylan"; version = "2016.1pre"; - src = fetchgit { - url = "https://github.com/dylan-lang/opendylan"; + src = fetchFromGitHub { + owner = "dylan-lang"; + repo = "opendylan"; rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd"; - sha256 = "00r1dm7mjy5p4hfm13vc4b6qryap40zinia3y15rhvalc3i2np4b"; + sha256 = "sha256-i1wr4mBUbZhL8ENFGz8gV/mMzSJsj1AdJLd4WU9tIQM="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 8d68c2a6010e..dae405ff3b2f 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkg-config, lndir, bash, cpio, file, which, unzip, zip +{ stdenv, lib, fetchFromGitHub, pkg-config, lndir, bash, cpio, file, which, unzip, zip , cups, freetype, alsa-lib, cacert, perl, liberation_ttf, fontconfig, zlib , libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib @@ -19,68 +19,19 @@ let aarch64-linux = "aarch64"; }.${stdenv.system} or (throw "Unsupported platform"); - update = "272"; - build = if stdenv.isAarch64 then "b10" else "b10"; - baseurl = if stdenv.isAarch64 then "https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah" - else "https://hg.openjdk.java.net/jdk8u/jdk8u"; - repover = lib.optionalString stdenv.isAarch64 "aarch64-shenandoah-" - + "jdk8u${update}-${build}"; + update = "322"; + build = "ga"; - jdk8 = fetchurl { - name = "jdk8-${repover}.tar.gz"; - url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "db98897d6fddce85996a9b0daf4352abce4578be0b51eada41702ee1469dd415" - else "8f0e8324d3500432e8ed642b4cc7dff90a617dbb2a18a94c07c1020d32f93b7a"; - }; - langtools = fetchurl { - name = "langtools-${repover}.tar.gz"; - url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "6544c1cc455844bbbb3d2914ffc716b1cee7f19e6aa223764d41a7cddc41322c" - else "632417b0b067c929eda6958341352e29c5810056a5fec138641eb3503f9635b7"; - }; - hotspot = fetchurl { - name = "hotspot-${repover}.tar.gz"; - url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "37abb89e66641607dc6f372946bfc6bd413f23fec0b9c3baf75f41ce517e21d8" - else "2142f3b769800a955613b51ffe192551bab1db95b0c219900cf34febc6f20245"; - }; - corba = fetchurl { - name = "corba-${repover}.tar.gz"; - url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "5da82f7b4aceff32e02d2f559033e3b62b9509d79f1a6891af871502e1d125b1" - else "320098d64c843c1ff2ae62579817f9fb4a81772bc0313a543ce68976ad7a6d98"; - }; - jdk = fetchurl { - name = "jdk-${repover}.tar.gz"; - url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "ee613296d823605dcd1a0fe2f89b4c7393bdb8ae5f2659f48f5cbc0012bb1a47" - else "957c24fc58ac723c8cd808ab60c77d7853710148944c8b9a59f470c4c809e1a0"; - }; - jaxws = fetchurl { - name = "jaxws-${repover}.tar.gz"; - url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "7c426b85f0d378125fa46e6d1b25ddc27ad29d93514d38c5935c84fc540b26ce" - else "4efb0ee143dfe86c8ee06db2429fb81a0c8c65af9ea8fc18daa05148c8a1162f"; - }; - jaxp = fetchurl { - name = "jaxp-${repover}.tar.gz"; - url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "928e363877afa7e0ad0c350bb18be6ab056b23708c0624a0bd7f01c4106c2a14" - else "25a651c670d5b036042f7244617a3eb11fec80c07745c1c8181a1cdebeda3d8e"; - }; - nashorn = fetchurl { - name = "nashorn-${repover}.tar.gz"; - url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "f060e08c5924457d4f5047c02ad6a987bdbdcd1cea53d2208322073ba4f398c3" - else "a28b41d86f0c87ceacd2b686dd31c9bf391d851b1b5187a49ef5e565fc2cbc84"; - }; - openjdk8 = stdenv.mkDerivation { + openjdk8 = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; version = "8u${update}-${build}"; - srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ]; - sourceRoot = "."; - + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jdk8u"; + rev = "jdk${version}"; + sha256 = "sha256-e39Yv+NDQG7z6fGmpKEnkKd5MoHZ50SXlq/Q7lzWcDA="; + }; outputs = [ "out" "jre" ]; nativeBuildInputs = [ pkg-config lndir unzip ]; @@ -92,16 +43,6 @@ let gtk2 gnome_vfs GConf glib ]; - # move the seven other source dirs under the main jdk8u directory, - # with version suffixes removed, as the remainder of the build will expect - prePatch = '' - mainDir=$(find . -maxdepth 1 -name jdk8u\*); - find . -maxdepth 1 -name \*jdk\* -not -name jdk8u\* | awk -F- '{print $1}' | while read p; do - mv $p-* $mainDir/$p - done - cd $mainDir - ''; - patches = [ ./fix-java-home-jdk8.patch ./read-truststore-from-env-jdk8.patch diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index 1d829450a1ed..009802b29234 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -23,7 +23,7 @@ let zuluVersion = "8.54.0.21"; jdkVersion = "8.0.292"; sha256 = - if enableJavaFX then "1b05b2e40f707a151b063ebba821270fa930ebfc05712bc1f5a8a112395731a6" + if enableJavaFX then "8e901075cde2c31f531a34e8321ea4201970936abf54240a232e9389952afe84" else "05w89wfjlfbpqfjnv6wisxmaf13qb28b2223f9264jyx30qszw1c"; }; }."${stdenv.hostPlatform.system}"; diff --git a/pkgs/development/compilers/openjdk/jre.nix b/pkgs/development/compilers/openjdk/jre.nix index 78dec7885d93..02f6da928cdd 100644 --- a/pkgs/development/compilers/openjdk/jre.nix +++ b/pkgs/development/compilers/openjdk/jre.nix @@ -7,7 +7,7 @@ let jre = stdenv.mkDerivation { - name = "${jdk.name}-minimal-jre"; + pname = "${jdk.pname}-minimal-jre"; version = jdk.version; buildInputs = [ jdk ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index e977d2b00203..ff243372b4a5 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, writeText, gradle_4, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python2, ruby +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4, python2, ruby , openjdk11-bootstrap }: let @@ -19,7 +19,7 @@ let sha256 = "1h7qsylr7rnwnbimqjyn3whszp9kv4h3gpicsrb3mradxc9yv194"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python2 ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index 26c16895c5d4..3feda519b084 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_5 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg, python3, ruby }: +, ffmpeg_4, python3, ruby }: let major = "15"; @@ -21,7 +21,7 @@ let sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix new file mode 100644 index 000000000000..12bac4c4d9d8 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -0,0 +1,106 @@ +{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 +, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib +, ffmpeg, python3, ruby, icu68 }: + +let + major = "17"; + update = ".0.0.1"; + build = "+1"; + repover = "${major}${update}${build}"; + gradle_ = (gradle_7.override { + java = openjdk17_headless; + }); + + makePackage = args: stdenv.mkDerivation ({ + version = "${major}${update}${build}"; + + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx"; + rev = repover; + sha256 = "sha256-PSiE9KbF/4u9VyBl9PAMLGzKyGFB86/XByeh7vhL6Kw="; + }; + + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg icu68 ]; + nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" ('' + CONF = Release + JDK_HOME = ${openjdk17_headless.home} + '' + args.gradleProperties or ""); + + buildPhase = '' + runHook preBuild + + export GRADLE_USER_HOME=$(mktemp -d) + ln -s $config gradle.properties + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + gradle --no-daemon $gradleFlags sdk + + runHook postBuild + ''; + } // args); + + # Fake build to pre-download deps into fixed-output derivation. + # We run nearly full build because I see no other way to download everything that's needed. + # Anyone who knows a better way? + deps = makePackage { + pname = "openjfx-deps"; + + # 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 -type f -regex '.*/modules.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + rm -rf $out/tmp + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + }; + +in makePackage { + pname = "openjfx-modular-sdk"; + + gradleProperties = '' + COMPILE_MEDIA = true + COMPILE_WEBKIT = false + ''; + + preBuild = '' + swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" + substituteInPlace build.gradle \ + --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ + --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + ''; + + installPhase = '' + cp -r build/modular-sdk $out + ''; + + stripDebugList = [ "." ]; + + postFixup = '' + # Remove references to bootstrap. + export openjdkOutPath='${openjdk17_headless.outPath}' + find "$out" -name \*.so | while read lib; do + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" + patchelf --set-rpath "$new_refs" "$lib" + done + ''; + + disallowedReferences = [ openjdk17_headless ]; + + passthru.deps = deps; + + meta = with lib; { + homepage = "http://openjdk.java.net/projects/openjfx/"; + license = licenses.gpl2; + description = "The next-generation Java client toolkit"; + maintainers = with maintainers; [ abbradar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 713b32a349b4..40681faae8ae 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -66,7 +66,7 @@ let in let result = stdenv.mkDerivation rec { - pname = if installjdk then "oraclejdk" else "oraclejre"; + pname = if installjdk then "oraclejdk" else "oraclejre" + lib.optionalString pluginSupport "-with-plugin"; version = "${productVersion}u${patchVersion}"; src = diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 736a9d3c34c6..53b05c16d9ab 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -7,7 +7,7 @@ let boost_static = boost165.override { enableStatic = true; }; in clangStdenv.mkDerivation rec { # In theory this could use GCC + Clang rather than just Clang, # but https://github.com/NixOS/nixpkgs/issues/29877 stops this - name = "openshadinglanguage-${version}"; + pname = "openshadinglanguage"; version = "1.10.9"; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/passerine/default.nix b/pkgs/development/compilers/passerine/default.nix index e9427f892e64..e5f88e586746 100644 --- a/pkgs/development/compilers/passerine/default.nix +++ b/pkgs/development/compilers/passerine/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "passerine"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "vrtbl"; repo = "passerine"; - rev = "dd8a6f5efc5dcb03d45b102f61cc8a50d46e8e98"; - sha256 = "sha256-/QzqKLkxAVqvTY4Uft1qk7nJat6nozykB/4X1YGqu/I="; + rev = "v${version}"; + hash = "sha256-TrbcULIJ9+DgQ4QsLYD5okxHoIusGJDw1PqJQwq1zu0="; }; - cargoSha256 = "sha256-8WiiDLIJ/abXELF8S+4s+BPA/Lr/rpKmC1NWPCLzQWA="; + cargoHash = "sha256-A+sOT0rloAktDdVXe2HEPK25euh9T7c0rXybZmZpqC0="; meta = with lib; { description = "A small extensible programming language designed for concise expression with little code"; - homepage = "https://github.com/vrtbl/passerine"; + homepage = "https://www.passerine.io/"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; }; diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index daa8a542b76d..cbf36516465b 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.14.5"; + version = "0.14.7"; # These hashes can be updated automatically by running the ./update.sh script. src = @@ -26,12 +26,12 @@ in stdenv.mkDerivation rec { then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "1brvbpzr3cwls809fl0sjrm9cbh8v7maf5d7ic2mha0xapabgfpv"; + sha256 = "0pc07xv5h7jgiy04rcrnsjb97nk5zs7jrvcsqggn0izlnrcyi8rc"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1mvxvn30iyrq0ck6g08f925gxnnhbfgl29b2gjjsmm3m9mpll7ws"; + sha256 = "0vcjxb1v76wg4hmisnw0pp6wl0pwp4fa19cw08zdhgy62w06mqfa"; }; diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index 1751da3e8f30..80182fc9de65 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { pname = "qbe"; - version = "unstable-2021-11-22"; + version = "unstable-2022-03-17"; src = fetchgit { url = "git://c9x.me/qbe.git"; - rev = "bf153b359e9ce3ebef9bca899eb7ed5bd9045c11"; - sha256 = "sha256-13Mvq4VWZxlye/kncJibCnfSECx4PeHMYLuX0xMkN3A="; + rev = "c6b41eb8c8cece8266b2173a83216e1ce77eb2be"; + sha256 = "sha256-vpNZNED+C9VMzWyyyntQuBgTvbpZpJ/EwOztdOEP7vI="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 0937ff8bd840..cc99aa078f9a 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,16 +1,14 @@ -{ lib, callPackage, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2 +{ lib, callPackage, stdenv, makeWrapper, fetchurl, ocaml, findlib, dune_2 , fix, menhir, menhirLib, menhirSdk, merlin-extend, ppxlib, utop, cppo, ppx_derivers }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; - version = "3.7.0"; + version = "3.8.0"; - src = fetchFromGitHub { - owner = "facebook"; - repo = "reason"; - rev = "daa11255cb4716ce1c370925251021bd6e3bd974"; - sha256 = "0m6ldrci1a4j0qv1cbwh770zni3al8qxsphl353rv19f6rblplhs"; + src = fetchurl { + url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; + sha256 = "sha256:0yc94m3ddk599crg33yxvkphxpy54kmdsl599c320wvn055p4y4l"; }; nativeBuildInputs = [ @@ -39,11 +37,13 @@ stdenv.mkDerivation rec { buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed installPhase = '' + runHook preInstall dune install --prefix=$out --libdir=$OCAMLFIND_DESTDIR wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH" \ --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR" + runHook postInstall ''; passthru.tests = { diff --git a/pkgs/development/compilers/roslyn/create-deps.sh b/pkgs/development/compilers/roslyn/create-deps.sh index 5bdc37956b52..f5da4acd8bff 100755 --- a/pkgs/development/compilers/roslyn/create-deps.sh +++ b/pkgs/development/compilers/roslyn/create-deps.sh @@ -48,7 +48,7 @@ do sha256=$(nix-prefetch-url "$url" 2>/dev/null) cat << EOL { - name = "$package"; + pname = "$package"; version = "$version"; src = fetchurl { url = "$url"; diff --git a/pkgs/development/compilers/roslyn/default.nix b/pkgs/development/compilers/roslyn/default.nix index df07eea54e2d..69cca6b13d9b 100644 --- a/pkgs/development/compilers/roslyn/default.nix +++ b/pkgs/development/compilers/roslyn/default.nix @@ -13,8 +13,7 @@ let deps = map (package: stdenv.mkDerivation (with package; { - pname = name; - inherit version src; + inherit pname version src; buildInputs = [ unzip ]; unpackPhase = '' @@ -40,7 +39,7 @@ let installPhase = '' runHook preInstall - package=$out/lib/dotnet/${name}/${version} + package=$out/lib/dotnet/${pname}/${version} mkdir -p $package cp -r . $package echo "{}" > $package/.nupkg.metadata diff --git a/pkgs/development/compilers/roslyn/deps.nix b/pkgs/development/compilers/roslyn/deps.nix index b08bd0740a42..61835f74e766 100644 --- a/pkgs/development/compilers/roslyn/deps.nix +++ b/pkgs/development/compilers/roslyn/deps.nix @@ -1,6 +1,6 @@ { fetchurl }: [ { - name = "microsoft.aspnetcore.app.ref"; + pname = "microsoft.aspnetcore.app.ref"; version = "3.1.10"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/3.1.10/microsoft.aspnetcore.app.ref.3.1.10.nupkg"; @@ -8,7 +8,7 @@ }; } { - name = "microsoft.build.framework"; + pname = "microsoft.build.framework"; version = "15.3.409"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/15.3.409/microsoft.build.framework.15.3.409.nupkg"; @@ -16,7 +16,7 @@ }; } { - name = "microsoft.build.tasks.core"; + pname = "microsoft.build.tasks.core"; version = "15.3.409"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/15.3.409/microsoft.build.tasks.core.15.3.409.nupkg"; @@ -24,7 +24,7 @@ }; } { - name = "microsoft.build.tasks.git"; + pname = "microsoft.build.tasks.git"; version = "1.1.0-beta-20206-02"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.build.tasks.git/1.1.0-beta-20206-02/microsoft.build.tasks.git.1.1.0-beta-20206-02.nupkg"; @@ -32,7 +32,7 @@ }; } { - name = "microsoft.build.utilities.core"; + pname = "microsoft.build.utilities.core"; version = "15.3.409"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/15.3.409/microsoft.build.utilities.core.15.3.409.nupkg"; @@ -40,7 +40,7 @@ }; } { - name = "microsoft.codeanalysis.analyzers"; + pname = "microsoft.codeanalysis.analyzers"; version = "3.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.0.0/microsoft.codeanalysis.analyzers.3.0.0.nupkg"; @@ -48,7 +48,7 @@ }; } { - name = "microsoft.codeanalysis.bannedapianalyzers"; + pname = "microsoft.codeanalysis.bannedapianalyzers"; version = "3.3.2-beta1.20562.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.3.2-beta1.20562.1/microsoft.codeanalysis.bannedapianalyzers.3.3.2-beta1.20562.1.nupkg"; @@ -56,7 +56,7 @@ }; } { - name = "microsoft.codeanalysis.common"; + pname = "microsoft.codeanalysis.common"; version = "3.8.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/3.8.0/microsoft.codeanalysis.common.3.8.0.nupkg"; @@ -64,7 +64,7 @@ }; } { - name = "microsoft.codeanalysis.csharp.codestyle"; + pname = "microsoft.codeanalysis.csharp.codestyle"; version = "3.8.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.csharp.codestyle/3.8.0/microsoft.codeanalysis.csharp.codestyle.3.8.0.nupkg"; @@ -72,7 +72,7 @@ }; } { - name = "microsoft.codeanalysis.netanalyzers"; + pname = "microsoft.codeanalysis.netanalyzers"; version = "6.0.0-preview1.21054.10"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.netanalyzers/6.0.0-preview1.21054.10/microsoft.codeanalysis.netanalyzers.6.0.0-preview1.21054.10.nupkg"; @@ -80,7 +80,7 @@ }; } { - name = "microsoft.codeanalysis.performancesensitiveanalyzers"; + pname = "microsoft.codeanalysis.performancesensitiveanalyzers"; version = "3.3.2-beta1.20562.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.performancesensitiveanalyzers/3.3.2-beta1.20562.1/microsoft.codeanalysis.performancesensitiveanalyzers.3.3.2-beta1.20562.1.nupkg"; @@ -88,7 +88,7 @@ }; } { - name = "microsoft.codeanalysis.publicapianalyzers"; + pname = "microsoft.codeanalysis.publicapianalyzers"; version = "3.3.2-beta1.20562.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.3.2-beta1.20562.1/microsoft.codeanalysis.publicapianalyzers.3.3.2-beta1.20562.1.nupkg"; @@ -96,7 +96,7 @@ }; } { - name = "microsoft.codeanalysis.visualbasic.codestyle"; + pname = "microsoft.codeanalysis.visualbasic.codestyle"; version = "3.8.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.visualbasic.codestyle/3.8.0/microsoft.codeanalysis.visualbasic.codestyle.3.8.0.nupkg"; @@ -104,7 +104,7 @@ }; } { - name = "microsoft.csharp"; + pname = "microsoft.csharp"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.3.0/microsoft.csharp.4.3.0.nupkg"; @@ -112,7 +112,7 @@ }; } { - name = "microsoft.diasymreader.native"; + pname = "microsoft.diasymreader.native"; version = "16.9.0-beta1.21055.5"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader.native/16.9.0-beta1.21055.5/microsoft.diasymreader.native.16.9.0-beta1.21055.5.nupkg"; @@ -120,7 +120,7 @@ }; } { - name = "microsoft.dotnet.arcade.sdk"; + pname = "microsoft.dotnet.arcade.sdk"; version = "1.0.0-beta.21072.7"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/1.0.0-beta.21072.7/microsoft.dotnet.arcade.sdk.1.0.0-beta.21072.7.nupkg"; @@ -128,7 +128,7 @@ }; } { - name = "microsoft.net.compilers.toolset"; + pname = "microsoft.net.compilers.toolset"; version = "3.10.0-1.21101.2"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/3.10.0-1.21101.2/microsoft.net.compilers.toolset.3.10.0-1.21101.2.nupkg"; @@ -136,7 +136,7 @@ }; } { - name = "microsoft.netcore.app.host.linux-x64"; + pname = "microsoft.netcore.app.host.linux-x64"; version = "3.1.21"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.21/microsoft.netcore.app.host.linux-x64.3.1.21.nupkg"; @@ -144,7 +144,7 @@ }; } { - name = "microsoft.netcore.app.host.linux-arm64"; + pname = "microsoft.netcore.app.host.linux-arm64"; version = "3.1.21"; src = fetchurl { url = "https://globalcdn.nuget.org/packages/microsoft.netcore.app.host.linux-arm64.3.1.21.nupkg"; @@ -152,7 +152,7 @@ }; } { - name = "microsoft.netcore.app.ref"; + pname = "microsoft.netcore.app.ref"; version = "3.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/3.1.0/microsoft.netcore.app.ref.3.1.0.nupkg"; @@ -160,7 +160,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "1.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; @@ -168,7 +168,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "1.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; @@ -176,7 +176,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "2.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/2.1.0/microsoft.netcore.platforms.2.1.0.nupkg"; @@ -184,7 +184,7 @@ }; } { - name = "microsoft.netcore.platforms"; + pname = "microsoft.netcore.platforms"; version = "2.1.2"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg"; @@ -192,7 +192,7 @@ }; } { - name = "microsoft.netcore.targets"; + pname = "microsoft.netcore.targets"; version = "1.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; @@ -200,7 +200,7 @@ }; } { - name = "microsoft.netcore.targets"; + pname = "microsoft.netcore.targets"; version = "1.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; @@ -208,7 +208,7 @@ }; } { - name = "microsoft.netframework.referenceassemblies"; + pname = "microsoft.netframework.referenceassemblies"; version = "1.0.0-preview.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.0-preview.1/microsoft.netframework.referenceassemblies.1.0.0-preview.1.nupkg"; @@ -216,7 +216,7 @@ }; } { - name = "microsoft.netframework.referenceassemblies.net472"; + pname = "microsoft.netframework.referenceassemblies.net472"; version = "1.0.0-preview.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.0-preview.1/microsoft.netframework.referenceassemblies.net472.1.0.0-preview.1.nupkg"; @@ -224,7 +224,7 @@ }; } { - name = "microsoft.sourcelink.azurerepos.git"; + pname = "microsoft.sourcelink.azurerepos.git"; version = "1.1.0-beta-20206-02"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.azurerepos.git/1.1.0-beta-20206-02/microsoft.sourcelink.azurerepos.git.1.1.0-beta-20206-02.nupkg"; @@ -232,7 +232,7 @@ }; } { - name = "microsoft.sourcelink.common"; + pname = "microsoft.sourcelink.common"; version = "1.1.0-beta-20206-02"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.common/1.1.0-beta-20206-02/microsoft.sourcelink.common.1.1.0-beta-20206-02.nupkg"; @@ -240,7 +240,7 @@ }; } { - name = "microsoft.sourcelink.github"; + pname = "microsoft.sourcelink.github"; version = "1.1.0-beta-20206-02"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.sourcelink.github/1.1.0-beta-20206-02/microsoft.sourcelink.github.1.1.0-beta-20206-02.nupkg"; @@ -248,7 +248,7 @@ }; } { - name = "microsoft.visualstudio.threading.analyzers"; + pname = "microsoft.visualstudio.threading.analyzers"; version = "16.8.55"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/16.8.55/microsoft.visualstudio.threading.analyzers.16.8.55.nupkg"; @@ -256,7 +256,7 @@ }; } { - name = "microsoft.win32.primitives"; + pname = "microsoft.win32.primitives"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.0.1/microsoft.win32.primitives.4.0.1.nupkg"; @@ -264,7 +264,7 @@ }; } { - name = "microsoft.win32.registry"; + pname = "microsoft.win32.registry"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/4.0.0/microsoft.win32.registry.4.0.0.nupkg"; @@ -272,7 +272,7 @@ }; } { - name = "netstandard.library"; + pname = "netstandard.library"; version = "2.0.3"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"; @@ -280,7 +280,7 @@ }; } { - name = "richcodenav.envvardump"; + pname = "richcodenav.envvardump"; version = "0.1.1643-alpha"; src = fetchurl { url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg"; @@ -288,7 +288,7 @@ }; } { - name = "roslyn.diagnostics.analyzers"; + pname = "roslyn.diagnostics.analyzers"; version = "3.3.2-beta1.20562.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/825db618-e3eb-4426-ba54-b1d6e6c944d8/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.3.2-beta1.20562.1/roslyn.diagnostics.analyzers.3.3.2-beta1.20562.1.nupkg"; @@ -296,7 +296,7 @@ }; } { - name = "runtime.native.system"; + pname = "runtime.native.system"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.0.0/runtime.native.system.4.0.0.nupkg"; @@ -304,7 +304,7 @@ }; } { - name = "runtime.native.system.net.http"; + pname = "runtime.native.system.net.http"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.net.http/4.0.1/runtime.native.system.net.http.4.0.1.nupkg"; @@ -312,7 +312,7 @@ }; } { - name = "runtime.native.system.security.cryptography"; + pname = "runtime.native.system.security.cryptography"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography/4.0.0/runtime.native.system.security.cryptography.4.0.0.nupkg"; @@ -320,7 +320,7 @@ }; } { - name = "system.appcontext"; + pname = "system.appcontext"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.appcontext/4.1.0/system.appcontext.4.1.0.nupkg"; @@ -328,7 +328,7 @@ }; } { - name = "system.buffers"; + pname = "system.buffers"; version = "4.5.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; @@ -336,7 +336,7 @@ }; } { - name = "system.collections"; + pname = "system.collections"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.0.11/system.collections.4.0.11.nupkg"; @@ -344,7 +344,7 @@ }; } { - name = "system.collections"; + pname = "system.collections"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg"; @@ -352,7 +352,7 @@ }; } { - name = "system.collections.concurrent"; + pname = "system.collections.concurrent"; version = "4.0.12"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.concurrent/4.0.12/system.collections.concurrent.4.0.12.nupkg"; @@ -360,7 +360,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "1.2.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.2.0/system.collections.immutable.1.2.0.nupkg"; @@ -368,7 +368,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "1.3.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/1.3.1/system.collections.immutable.1.3.1.nupkg"; @@ -376,7 +376,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "5.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"; @@ -384,7 +384,7 @@ }; } { - name = "system.collections.nongeneric"; + pname = "system.collections.nongeneric"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.nongeneric/4.0.1/system.collections.nongeneric.4.0.1.nupkg"; @@ -392,7 +392,7 @@ }; } { - name = "system.console"; + pname = "system.console"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.console/4.0.0/system.console.4.0.0.nupkg"; @@ -400,7 +400,7 @@ }; } { - name = "system.diagnostics.debug"; + pname = "system.diagnostics.debug"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg"; @@ -408,7 +408,7 @@ }; } { - name = "system.diagnostics.debug"; + pname = "system.diagnostics.debug"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; @@ -416,7 +416,7 @@ }; } { - name = "system.diagnostics.process"; + pname = "system.diagnostics.process"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.process/4.1.0/system.diagnostics.process.4.1.0.nupkg"; @@ -424,7 +424,7 @@ }; } { - name = "system.diagnostics.tools"; + pname = "system.diagnostics.tools"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tools/4.0.1/system.diagnostics.tools.4.0.1.nupkg"; @@ -432,7 +432,7 @@ }; } { - name = "system.diagnostics.tracesource"; + pname = "system.diagnostics.tracesource"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracesource/4.0.0/system.diagnostics.tracesource.4.0.0.nupkg"; @@ -440,7 +440,7 @@ }; } { - name = "system.diagnostics.tracing"; + pname = "system.diagnostics.tracing"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.1.0/system.diagnostics.tracing.4.1.0.nupkg"; @@ -448,7 +448,7 @@ }; } { - name = "system.dynamic.runtime"; + pname = "system.dynamic.runtime"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg"; @@ -456,7 +456,7 @@ }; } { - name = "system.globalization"; + pname = "system.globalization"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; @@ -464,7 +464,7 @@ }; } { - name = "system.globalization"; + pname = "system.globalization"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; @@ -472,7 +472,7 @@ }; } { - name = "system.globalization.calendars"; + pname = "system.globalization.calendars"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization.calendars/4.0.1/system.globalization.calendars.4.0.1.nupkg"; @@ -480,7 +480,7 @@ }; } { - name = "system.io"; + pname = "system.io"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.1.0/system.io.4.1.0.nupkg"; @@ -488,7 +488,7 @@ }; } { - name = "system.io"; + pname = "system.io"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg"; @@ -496,7 +496,7 @@ }; } { - name = "system.io.filesystem"; + pname = "system.io.filesystem"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg"; @@ -504,7 +504,7 @@ }; } { - name = "system.io.filesystem.primitives"; + pname = "system.io.filesystem.primitives"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg"; @@ -512,7 +512,7 @@ }; } { - name = "system.io.pipes.accesscontrol"; + pname = "system.io.pipes.accesscontrol"; version = "4.5.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipes.accesscontrol/4.5.1/system.io.pipes.accesscontrol.4.5.1.nupkg"; @@ -520,7 +520,7 @@ }; } { - name = "system.linq"; + pname = "system.linq"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.1.0/system.linq.4.1.0.nupkg"; @@ -528,7 +528,7 @@ }; } { - name = "system.linq"; + pname = "system.linq"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq/4.3.0/system.linq.4.3.0.nupkg"; @@ -536,7 +536,7 @@ }; } { - name = "system.linq.expressions"; + pname = "system.linq.expressions"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg"; @@ -544,7 +544,7 @@ }; } { - name = "system.linq.parallel"; + pname = "system.linq.parallel"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.linq.parallel/4.0.1/system.linq.parallel.4.0.1.nupkg"; @@ -552,7 +552,7 @@ }; } { - name = "system.memory"; + pname = "system.memory"; version = "4.5.4"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.4/system.memory.4.5.4.nupkg"; @@ -560,7 +560,7 @@ }; } { - name = "system.numerics.vectors"; + pname = "system.numerics.vectors"; version = "4.4.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; @@ -568,7 +568,7 @@ }; } { - name = "system.numerics.vectors"; + pname = "system.numerics.vectors"; version = "4.5.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; @@ -576,7 +576,7 @@ }; } { - name = "system.objectmodel"; + pname = "system.objectmodel"; version = "4.0.12"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg"; @@ -584,7 +584,7 @@ }; } { - name = "system.objectmodel"; + pname = "system.objectmodel"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg"; @@ -592,7 +592,7 @@ }; } { - name = "system.private.datacontractserialization"; + pname = "system.private.datacontractserialization"; version = "4.1.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.datacontractserialization/4.1.1/system.private.datacontractserialization.4.1.1.nupkg"; @@ -600,7 +600,7 @@ }; } { - name = "system.reflection"; + pname = "system.reflection"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; @@ -608,7 +608,7 @@ }; } { - name = "system.reflection"; + pname = "system.reflection"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; @@ -616,7 +616,7 @@ }; } { - name = "system.reflection.emit"; + pname = "system.reflection.emit"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg"; @@ -624,7 +624,7 @@ }; } { - name = "system.reflection.emit"; + pname = "system.reflection.emit"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg"; @@ -632,7 +632,7 @@ }; } { - name = "system.reflection.emit.ilgeneration"; + pname = "system.reflection.emit.ilgeneration"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg"; @@ -640,7 +640,7 @@ }; } { - name = "system.reflection.emit.ilgeneration"; + pname = "system.reflection.emit.ilgeneration"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.3.0/system.reflection.emit.ilgeneration.4.3.0.nupkg"; @@ -648,7 +648,7 @@ }; } { - name = "system.reflection.emit.lightweight"; + pname = "system.reflection.emit.lightweight"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg"; @@ -656,7 +656,7 @@ }; } { - name = "system.reflection.emit.lightweight"; + pname = "system.reflection.emit.lightweight"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg"; @@ -664,7 +664,7 @@ }; } { - name = "system.reflection.extensions"; + pname = "system.reflection.extensions"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg"; @@ -672,7 +672,7 @@ }; } { - name = "system.reflection.extensions"; + pname = "system.reflection.extensions"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg"; @@ -680,7 +680,7 @@ }; } { - name = "system.reflection.metadata"; + pname = "system.reflection.metadata"; version = "1.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/1.3.0/system.reflection.metadata.1.3.0.nupkg"; @@ -688,7 +688,7 @@ }; } { - name = "system.reflection.metadata"; + pname = "system.reflection.metadata"; version = "5.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"; @@ -696,7 +696,7 @@ }; } { - name = "system.reflection.primitives"; + pname = "system.reflection.primitives"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; @@ -704,7 +704,7 @@ }; } { - name = "system.reflection.primitives"; + pname = "system.reflection.primitives"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; @@ -712,7 +712,7 @@ }; } { - name = "system.reflection.typeextensions"; + pname = "system.reflection.typeextensions"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; @@ -720,7 +720,7 @@ }; } { - name = "system.reflection.typeextensions"; + pname = "system.reflection.typeextensions"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.typeextensions/4.3.0/system.reflection.typeextensions.4.3.0.nupkg"; @@ -728,7 +728,7 @@ }; } { - name = "system.resources.reader"; + pname = "system.resources.reader"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.reader/4.0.0/system.resources.reader.4.0.0.nupkg"; @@ -736,7 +736,7 @@ }; } { - name = "system.resources.resourcemanager"; + pname = "system.resources.resourcemanager"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; @@ -744,7 +744,7 @@ }; } { - name = "system.resources.resourcemanager"; + pname = "system.resources.resourcemanager"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; @@ -752,7 +752,7 @@ }; } { - name = "system.resources.writer"; + pname = "system.resources.writer"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.writer/4.0.0/system.resources.writer.4.0.0.nupkg"; @@ -760,7 +760,7 @@ }; } { - name = "system.runtime"; + pname = "system.runtime"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; @@ -768,7 +768,7 @@ }; } { - name = "system.runtime"; + pname = "system.runtime"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; @@ -776,7 +776,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.7.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg"; @@ -784,7 +784,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "5.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg"; @@ -792,7 +792,7 @@ }; } { - name = "system.runtime.extensions"; + pname = "system.runtime.extensions"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; @@ -800,7 +800,7 @@ }; } { - name = "system.runtime.extensions"; + pname = "system.runtime.extensions"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; @@ -808,7 +808,7 @@ }; } { - name = "system.runtime.handles"; + pname = "system.runtime.handles"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; @@ -816,7 +816,7 @@ }; } { - name = "system.runtime.handles"; + pname = "system.runtime.handles"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; @@ -824,7 +824,7 @@ }; } { - name = "system.runtime.interopservices"; + pname = "system.runtime.interopservices"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; @@ -832,7 +832,7 @@ }; } { - name = "system.runtime.interopservices"; + pname = "system.runtime.interopservices"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; @@ -840,7 +840,7 @@ }; } { - name = "system.runtime.interopservices.runtimeinformation"; + pname = "system.runtime.interopservices.runtimeinformation"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg"; @@ -848,7 +848,7 @@ }; } { - name = "system.runtime.interopservices.runtimeinformation"; + pname = "system.runtime.interopservices.runtimeinformation"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg"; @@ -856,7 +856,7 @@ }; } { - name = "system.runtime.loader"; + pname = "system.runtime.loader"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.loader/4.3.0/system.runtime.loader.4.3.0.nupkg"; @@ -864,7 +864,7 @@ }; } { - name = "system.runtime.numerics"; + pname = "system.runtime.numerics"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.numerics/4.0.1/system.runtime.numerics.4.0.1.nupkg"; @@ -872,7 +872,7 @@ }; } { - name = "system.runtime.serialization.primitives"; + pname = "system.runtime.serialization.primitives"; version = "4.1.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg"; @@ -880,7 +880,7 @@ }; } { - name = "system.runtime.serialization.xml"; + pname = "system.runtime.serialization.xml"; version = "4.1.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.serialization.xml/4.1.1/system.runtime.serialization.xml.4.1.1.nupkg"; @@ -888,7 +888,7 @@ }; } { - name = "system.security.accesscontrol"; + pname = "system.security.accesscontrol"; version = "4.5.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/4.5.0/system.security.accesscontrol.4.5.0.nupkg"; @@ -896,7 +896,7 @@ }; } { - name = "system.security.cryptography.algorithms"; + pname = "system.security.cryptography.algorithms"; version = "4.2.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.algorithms/4.2.0/system.security.cryptography.algorithms.4.2.0.nupkg"; @@ -904,7 +904,7 @@ }; } { - name = "system.security.cryptography.cng"; + pname = "system.security.cryptography.cng"; version = "4.2.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.cng/4.2.0/system.security.cryptography.cng.4.2.0.nupkg"; @@ -912,7 +912,7 @@ }; } { - name = "system.security.cryptography.csp"; + pname = "system.security.cryptography.csp"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.csp/4.0.0/system.security.cryptography.csp.4.0.0.nupkg"; @@ -920,7 +920,7 @@ }; } { - name = "system.security.cryptography.encoding"; + pname = "system.security.cryptography.encoding"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.encoding/4.0.0/system.security.cryptography.encoding.4.0.0.nupkg"; @@ -928,7 +928,7 @@ }; } { - name = "system.security.cryptography.openssl"; + pname = "system.security.cryptography.openssl"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.openssl/4.0.0/system.security.cryptography.openssl.4.0.0.nupkg"; @@ -936,7 +936,7 @@ }; } { - name = "system.security.cryptography.primitives"; + pname = "system.security.cryptography.primitives"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.primitives/4.0.0/system.security.cryptography.primitives.4.0.0.nupkg"; @@ -944,7 +944,7 @@ }; } { - name = "system.security.cryptography.x509certificates"; + pname = "system.security.cryptography.x509certificates"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.x509certificates/4.1.0/system.security.cryptography.x509certificates.4.1.0.nupkg"; @@ -952,7 +952,7 @@ }; } { - name = "system.security.principal.windows"; + pname = "system.security.principal.windows"; version = "4.5.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/4.5.0/system.security.principal.windows.4.5.0.nupkg"; @@ -960,7 +960,7 @@ }; } { - name = "system.text.encoding"; + pname = "system.text.encoding"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; @@ -968,7 +968,7 @@ }; } { - name = "system.text.encoding"; + pname = "system.text.encoding"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; @@ -976,7 +976,7 @@ }; } { - name = "system.text.encoding.codepages"; + pname = "system.text.encoding.codepages"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; @@ -984,7 +984,7 @@ }; } { - name = "system.text.encoding.codepages"; + pname = "system.text.encoding.codepages"; version = "4.5.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg"; @@ -992,7 +992,7 @@ }; } { - name = "system.text.encoding.extensions"; + pname = "system.text.encoding.extensions"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg"; @@ -1000,7 +1000,7 @@ }; } { - name = "system.text.regularexpressions"; + pname = "system.text.regularexpressions"; version = "4.1.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg"; @@ -1008,7 +1008,7 @@ }; } { - name = "system.threading"; + pname = "system.threading"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.0.11/system.threading.4.0.11.nupkg"; @@ -1016,7 +1016,7 @@ }; } { - name = "system.threading"; + pname = "system.threading"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; @@ -1024,7 +1024,7 @@ }; } { - name = "system.threading.tasks"; + pname = "system.threading.tasks"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; @@ -1032,7 +1032,7 @@ }; } { - name = "system.threading.tasks"; + pname = "system.threading.tasks"; version = "4.3.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; @@ -1040,7 +1040,7 @@ }; } { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg"; @@ -1048,7 +1048,7 @@ }; } { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; version = "4.5.4"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg"; @@ -1056,7 +1056,7 @@ }; } { - name = "system.threading.thread"; + pname = "system.threading.thread"; version = "4.0.0"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.0.0/system.threading.thread.4.0.0.nupkg"; @@ -1064,7 +1064,7 @@ }; } { - name = "system.threading.threadpool"; + pname = "system.threading.threadpool"; version = "4.0.10"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.threadpool/4.0.10/system.threading.threadpool.4.0.10.nupkg"; @@ -1072,7 +1072,7 @@ }; } { - name = "system.threading.timer"; + pname = "system.threading.timer"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.timer/4.0.1/system.threading.timer.4.0.1.nupkg"; @@ -1080,7 +1080,7 @@ }; } { - name = "system.xml.readerwriter"; + pname = "system.xml.readerwriter"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg"; @@ -1088,7 +1088,7 @@ }; } { - name = "system.xml.xdocument"; + pname = "system.xml.xdocument"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xdocument/4.0.11/system.xml.xdocument.4.0.11.nupkg"; @@ -1096,7 +1096,7 @@ }; } { - name = "system.xml.xmldocument"; + pname = "system.xml.xmldocument"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmldocument/4.0.1/system.xml.xmldocument.4.0.1.nupkg"; @@ -1104,7 +1104,7 @@ }; } { - name = "system.xml.xmlserializer"; + pname = "system.xml.xmlserializer"; version = "4.0.11"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xmlserializer/4.0.11/system.xml.xmlserializer.4.0.11.nupkg"; @@ -1112,7 +1112,7 @@ }; } { - name = "system.xml.xpath"; + pname = "system.xml.xpath"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath/4.0.1/system.xml.xpath.4.0.1.nupkg"; @@ -1120,7 +1120,7 @@ }; } { - name = "system.xml.xpath.xmldocument"; + pname = "system.xml.xpath.xmldocument"; version = "4.0.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.xml.xpath.xmldocument/4.0.1/system.xml.xpath.xmldocument.4.0.1.nupkg"; @@ -1128,7 +1128,7 @@ }; } { - name = "xlifftasks"; + pname = "xlifftasks"; version = "1.0.0-beta.20206.1"; src = fetchurl { url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/xlifftasks/1.0.0-beta.20206.1/xlifftasks.1.0.0-beta.20206.1.nupkg"; diff --git a/pkgs/development/compilers/rust/1_57.nix b/pkgs/development/compilers/rust/1_58.nix similarity index 58% rename from pkgs/development/compilers/rust/1_57.nix rename to pkgs/development/compilers/rust/1_58.nix index f6b9d3c72a32..c854bfdd37a4 100644 --- a/pkgs/development/compilers/rust/1_57.nix +++ b/pkgs/development/compilers/rust/1_58.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.57.0"; - rustcSha256 = "06jw8ka2p3kls8p0gd4p0chhhb1ia1mlvj96zn78n7qvp71zjiim"; + rustcVersion = "1.58.1"; + rustcSha256 = "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8"; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_13.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_13.libllvm.override { enableSharedLibraries = true; }; @@ -37,24 +37,24 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.56.1"; + bootstrapVersion = "1.57.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "84db34603ce22d93312ff8bccd5580fe112e932bbeb0361e7cc37668a9803a27"; - x86_64-unknown-linux-gnu = "a6be5d045183a0b12dddf0d81633e2a64e63e4c2dfa44eb7593970c1ef93a98f"; - x86_64-unknown-linux-musl = "3c09058d104d9a88943fb343af1fb70422f9c4a987e6703666ee8a8051211190"; - arm-unknown-linux-gnueabihf = "c445706d109bb74de4c889687ae08a48af5808676fda15b84b7ef5970a82a5f6"; - armv7-unknown-linux-gnueabihf = "29ec65af502370c0c1a49faecd7131f1243fe3005b419ead4b40b267af2b2db0"; - aarch64-unknown-linux-gnu = "69792887357c8dd78c5424f0b4a624578296796d99edf6c30ebe2acc2b939aa3"; - aarch64-unknown-linux-musl = "971d13d41657e50e3ac54f17f52b4198c3d8bc25ec489a6a9e6d12c18226dda5"; - x86_64-apple-darwin = "8d65ef02a123c23be00101fb204d28b60498b9145dd2ee8edabf0afde6e01e55"; - aarch64-apple-darwin = "e71c14c1368048a22e4d1851f301872ac2e6f4c574f04d2a7ae4d64b0e7c7235"; - powerpc64le-unknown-linux-gnu = "fa78b28fe1ef3cd4add9ec151e5eab756dfc83c8bc3e5a576a6eddd350c4de7a"; - riscv64gc-unknown-linux-gnu = "5ec327d1bd3ba8d00afbe9be4a1f0fb8ab845063fcf9be479be9493c52a4dbb6"; + i686-unknown-linux-gnu = "7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa"; + x86_64-unknown-linux-gnu = "ea0253784b2e5c22659ff148d492a68d2e11da734491714ebc61cc93896efcda"; + x86_64-unknown-linux-musl = "56876ebca0e46236208c8bd3c3425dba553abe49639e1040ee8b95bc66a45d33"; + arm-unknown-linux-gnueabihf = "b4448f7a96da4feee99a2c4b16b5738b99ab7e86e22d284ea6f7dca5921bca9b"; + armv7-unknown-linux-gnueabihf = "577682b1405e8901f971839407daaad06d8ae68ad370305b75d569ba293c4fb4"; + aarch64-unknown-linux-gnu = "d66847f7cf7b548ecb328c400ac4f691ee2aea6ff5cd9286ad8733239569556c"; + aarch64-unknown-linux-musl = "91c8e5171e5715261f7f635142a10a9415a4e5ba55374daf76f0b713c8b08132"; + x86_64-apple-darwin = "15ceffc4743434c19d08f73fb4edd6642b7fd8162ed7101d3e6ca2c691fcb699"; + aarch64-apple-darwin = "7511075e28b715e2d9c7ee74221779f8444681a4bb60ac3a0270a5fdf08bdd5a"; + powerpc64le-unknown-linux-gnu = "3ddc1abed6b7535c4150bf54291901fa856806c948bc21b711e24a3c8d810be7"; + riscv64gc-unknown-linux-gnu = "f809df1c6ac0adc9bd37eb871dfb0d9809f3ed7f61ba611f9305e9eb8f8c9226"; }; - selectRustPackage = pkgs: pkgs.rust_1_57; + selectRustPackage = pkgs: pkgs.rust_1_58; rustcPatches = [ ]; diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index 7ebdaa474ad6..23b8e7effe12 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -1,6 +1,6 @@ { stdenv, lib, rustPlatform, rustc, Security, patchelf }: rustPlatform.buildRustPackage { - name = "clippy-${rustc.version}"; + pname = "clippy"; inherit (rustc) version src; # the rust source tarball already has all the dependencies vendored, no need to fetch them again @@ -20,10 +20,6 @@ rustPlatform.buildRustPackage { # (/private/tmp/nix-build-clippy-1.36.0.drv-0/rustc-1.36.0-src/src/librustc_llvm) doCheck = false; - preBuild = '' - export CARGO_TARGET_DIR="$(pwd)/target" - ''; - preFixup = lib.optionalString stdenv.isDarwin '' install_name_tool -add_rpath "${rustc}/lib" $out/bin/clippy-driver ''; diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index f479b052019e..b859d01dc085 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -1,4 +1,4 @@ -{ buildPackages, callPackage, stdenv }@prev: +{ buildPackages, callPackage, stdenv, runCommand }@prev: { rustc, cargo, stdenv ? prev.stdenv, ... }: @@ -21,15 +21,15 @@ rec { importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {}; rustcSrc = callPackage ./rust-src.nix { - inherit stdenv rustc; + inherit runCommand rustc; }; rustLibSrc = callPackage ./rust-lib-src.nix { - inherit stdenv rustc; + inherit runCommand rustc; }; # Hooks inherit (callPackage ../../../build-support/rust/hooks { inherit stdenv cargo rustc; - }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook; + }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook bindgenHook; } diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index ebf8d900bb3b..dd2c116a341b 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -19,6 +19,7 @@ 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/pkgs/development/compilers/rust/rust-lib-src.nix b/pkgs/development/compilers/rust/rust-lib-src.nix index 67a7fa3641ad..aa914338639d 100644 --- a/pkgs/development/compilers/rust/rust-lib-src.nix +++ b/pkgs/development/compilers/rust/rust-lib-src.nix @@ -1,11 +1,6 @@ -{ stdenv, rustc }: +{ runCommand, rustc }: -stdenv.mkDerivation { - name = "rust-lib-src"; - src = rustc.src; - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mv library $out - ''; -} +runCommand "rust-lib-src" { } '' + tar --strip-components=1 -xzf ${rustc.src} + mv library $out +'' diff --git a/pkgs/development/compilers/rust/rust-src.nix b/pkgs/development/compilers/rust/rust-src.nix index 4239e92b0363..69bdb37ac2fd 100644 --- a/pkgs/development/compilers/rust/rust-src.nix +++ b/pkgs/development/compilers/rust/rust-src.nix @@ -1,25 +1,21 @@ -{ lib, stdenv, rustc, minimalContent ? true }: +{ lib, runCommand, rustc, minimalContent ? true }: -stdenv.mkDerivation { - name = "rust-src"; - src = rustc.src; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' - mv src $out - rm -rf $out/{${lib.concatStringsSep "," ([ - "ci" - "doc" - "etc" - "grammar" - "llvm-project" - "llvm-emscripten" - "rtstartup" - "rustllvm" - "test" - "vendor" - ] ++ lib.optionals minimalContent [ - "tools" - "stdarch" - ])}} - ''; -} +runCommand "rust-src" { } '' + tar -xzf ${rustc.src} + mv rustc-${rustc.version}-src $out + rm -rf $out/{${lib.concatStringsSep "," ([ + "ci" + "doc" + "etc" + "grammar" + "llvm-project" + "llvm-emscripten" + "rtstartup" + "rustllvm" + "test" + "vendor" + ] ++ lib.optionals minimalContent [ + "tools" + "stdarch" + ])}} +'' diff --git a/pkgs/development/compilers/sbcl/common.nix b/pkgs/development/compilers/sbcl/common.nix index 9cfb38109f7b..6a3b40066d99 100644 --- a/pkgs/development/compilers/sbcl/common.nix +++ b/pkgs/development/compilers/sbcl/common.nix @@ -119,7 +119,5 @@ stdenv.mkDerivation rec { } ''); - meta = sbclBootstrap.meta // { - updateWalker = true; - }; + meta = sbclBootstrap.meta; } diff --git a/pkgs/development/compilers/scala/dotty.nix b/pkgs/development/compilers/scala/dotty.nix index c99ed24c2149..1cd187f2e540 100644 --- a/pkgs/development/compilers/scala/dotty.nix +++ b/pkgs/development/compilers/scala/dotty.nix @@ -7,7 +7,8 @@ let in stdenv.mkDerivation { - name = "dotty-${dotty-bare.version}"; + pname = "dotty"; + inherit (dotty-bare) version; dontUnpack = true; diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index 28a461b09883..8f6bc5e6dac0 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "sdcc"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${version}.tar.bz2"; - sha256 = "0gskzli17ghnn5qllvn4d56qf9bvvclqjh63nnj63p52smvggvc1"; + sha256 = "sha256-tJuuHSO81gV6gsT/5WE/nNDLz9HpQOnYTEv+nfCowFM="; }; buildInputs = [ boost gputils texinfo zlib ]; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index eea60786f4af..06aa048a260d 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -34,14 +34,21 @@ let sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh"; }; + fmtlibVersion = "8.0.1"; + fmtlibUrl = "https://github.com/fmtlib/fmt/archive/${fmtlibVersion}.tar.gz"; + fmtlib = fetchzip { + url = fmtlibUrl; + sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw"; + }; + solc = gccStdenv.mkDerivation rec { pname = "solc"; - version = "0.8.2"; + version = "0.8.13"; # upstream suggests avoid using archive generated by github src = fetchzip { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "11w7sa1y2dirzh84k04fkwbfc6xpjp5jr65w1pmb2pnkjvvf46xq"; + hash = "sha256-cFC9M65kSYgYq9rhBXZKEdfvIMbMaDiDwdPmU8v9s7k="; }; postPatch = '' @@ -49,6 +56,8 @@ let --replace "${jsoncppUrl}" ${jsoncpp} substituteInPlace cmake/range-v3.cmake \ --replace "${range3Url}" ${range3} + substituteInPlace cmake/fmtlib.cmake \ + --replace "${fmtlibUrl}" ${fmtlib} ''; cmakeFlags = [ diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index dada4dfe9e81..df8ad5d360e2 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, perl, ncurses, zlib, sqlite, libffi -, autoreconfHook, mcpp, bison, flex, doxygen, graphviz +{ lib, stdenv, fetchFromGitHub +, bash-completion, perl, ncurses, zlib, sqlite, libffi +, mcpp, cmake, bison, flex, doxygen, graphviz , makeWrapper }: @@ -10,42 +10,23 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "2.0.2"; + version = "2.2"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5"; + sha256 = "sha256-whvC+DL9XbQLc4wf2kFxUKXSyJnGkYq0/0uLCLbliJU="; }; - patches = [ - # Pull pending unstream inclusion fix for ncurses-6.3: - # https://github.com/souffle-lang/souffle/pull/2134 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/souffle-lang/souffle/commit/9e4bdf86d051ef2e1b1a1be64aff7e498fd5dd20.patch"; - sha256 = "0jw1b6qfdf49dx2qlzn1b2yzrgpnkil4w9y3as1m28w8ws7iphpa"; - }) - ]; - - nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; - buildInputs = [ ncurses zlib sqlite libffi ]; - + nativeBuildInputs = [ bison cmake flex mcpp doxygen graphviz makeWrapper perl ]; + buildInputs = [ bash-completion ncurses zlib sqlite libffi ]; # these propagated inputs are needed for the compiled Souffle mode to work, # since generated compiler code uses them. TODO: maybe write a g++ wrapper # that adds these so we can keep the propagated inputs clean? propagatedBuildInputs = [ ncurses zlib sqlite libffi ]; - # see 565a8e73e80a1bedbb6cc037209c39d631fc393f and parent commits upstream for - # Wno-error fixes - postPatch = '' - substituteInPlace ./src/Makefile.am \ - --replace '-Werror' '-Werror -Wno-error=deprecated -Wno-error=other' - - substituteInPlace configure.ac \ - --replace "m4_esyscmd([git describe --tags --always | tr -d '\n'])" "${version}" - ''; + cmakeFlags = [ "-DSOUFFLE_GIT=OFF" ]; postInstall = '' wrapProgram "$out/bin/souffle" --prefix PATH : "${toolsPath}" diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 7d531181d1d0..158c2639f112 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -1,45 +1,197 @@ -{ lib, stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused -, libpthreadstubs, pango, pkg-config, libpulseaudio, which }: +{ lib, stdenv, fetchFromGitHub, fetchurl, fetchzip +, autoconf, automake, autoreconfHook, bash, clang, dos2unix, file, gzip, perl +, pkg-config +, alsa-lib, coreutils, freetype, glib, glibc, gnugrep, libpulseaudio, libtool +, libuuid, openssl, pango, xorg +, squeakImageHash ? null, squeakSourcesHash ? null, squeakSourcesVersion ? null +, squeakVersion ? null, squeakVmCommitHash ? null, squeakVmCommitHashHash ? null +, squeakVmVersion ? null +} @ args: -stdenv.mkDerivation rec { +let + inherit (builtins) elemAt; + nullableOr = o: default: if o == null then default else o; + + bits = stdenv.hostPlatform.parsed.cpu.bits; + + squeakVersion = nullableOr args.squeakVersion or null "5.3-19459"; + squeakVersionSplit = builtins.split "-" squeakVersion; + squeakVersionBase = elemAt squeakVersionSplit 0; + squeakVersionBaseSplit = lib.splitVersion squeakVersionBase; + squeakVersionMajor = elemAt squeakVersionBaseSplit 0; + squeakVersionMinor = elemAt squeakVersionBaseSplit 1; + + squeakImageVersion = elemAt squeakVersionSplit 2; + + squeakSourcesVersion = nullableOr args.squeakSourcesVersion or null "50"; + + squeakVmVersion = nullableOr args.squeakVmVersion or null "5.0-202003021730"; + squeakVmVersionSplit = builtins.split "-" squeakVmVersion; + squeakVmVersionBase = elemAt squeakVmVersionSplit 0; + squeakVmVersionBaseSplit = lib.splitVersion squeakVmVersionBase; + squeakVmVersionMajor = elemAt squeakVmVersionBaseSplit 0; + squeakVmVersionMinor = elemAt squeakVmVersionBaseSplit 1; + squeakVmVersionRelease = elemAt squeakVmVersionSplit 2; + + squeakVmCommitHash = nullableOr args.squeakVmCommitHash or null (fetchurl { + url = "https://api.github.com/repos/OpenSmalltalk/opensmalltalk-vm/commits/${squeakVmVersionRelease}"; + curlOpts = "--header Accept:application/vnd.github.v3.sha"; + hash = nullableOr args.squeakVmCommitHashHash or null + "sha256-quwmhpJlb2fp0fI9b03fBxSR44j1xmHPW20wkSqTOhQ="; + }); +in stdenv.mkDerivation { pname = "squeak"; - version = "4.10.2.2614"; + version = squeakVersion; - src = fetchurl { - sha256 = "0bpwbnpy2sb4gylchfx50sha70z36bwgdxraym4vrr93l8pd3dix"; - url = "http://squeakvm.org/unix/release/Squeak-${version}-src.tar.gz"; + vmVersionRelease = squeakVmVersionRelease; # "202003021730" + vmHash = squeakVmCommitHash; + + vmSrcUrl = "https://github.com/OpenSmalltalk/opensmalltalk-vm.git"; + src = fetchFromGitHub { + owner = "OpenSmalltalk"; + repo = "opensmalltalk-vm"; + rev = squeakVmVersionRelease; + hash = nullableOr args.squeakVmHash or null + "sha256-rNJn5ya+7ggC21MpwSrl2ByJDjVycONKHADboH7dQLM="; + }; + imageSrc = let + squeakImageName = "Squeak${squeakVersionBase}-${squeakImageVersion}-${toString bits}bit"; + in fetchzip { + url = "https://files.squeak.org/${squeakVersionBase}/${squeakImageName}/${squeakImageName}.zip"; + name = "source"; + stripRoot = false; + hash = nullableOr args.squeakImageHash or null + "sha256-wDuRyc/DNqG1D4DzyBkUvrzFkBlXBtbpnANZlRV/Fas="; + }; + sourcesSrc = fetchurl { + url = "https://files.squeak.org/sources_files/SqueakV${squeakSourcesVersion}.sources.gz"; + hash = nullableOr args.squeakSourcesHash or null + "sha256-ZViZ1VgI32LwLTEyw7utp8oaAK3UmCNJnHqsGm1IKYE="; }; - buildInputs = [ coreutils dbus freetype glib gnused libpthreadstubs - pango libpulseaudio which ]; - nativeBuildInputs = [ cmake pkg-config ]; + vmBuild = "linux64x64"; - postPatch = '' - for i in squeak.in squeak.sh.in; do - substituteInPlace unix/cmake/$i --replace "PATH=" \ - "PATH=${lib.makeBinPath [ coreutils gnused which ]} #" + nativeBuildInputs = [ + autoconf + automake + autoreconfHook + bash + clang + dos2unix + file + gzip + perl + pkg-config + ]; + buildInputs = [ + alsa-lib + coreutils + freetype + glib + glibc + gnugrep + libpulseaudio + libtool + libuuid + openssl + pango + xorg.libX11 + ]; + + postUnpack = '' + for file in "$imageSrc"/*.{image,changes}; do + gzip -c "$file" > "$sourceRoot/''${file##"$imageSrc"/}.gz" done ''; - configurePhase = '' - unix/cmake/configure --prefix=$out --enable-mpg-{mmx,pthreads} + prePatch = '' + dos2unix platforms/unix/plugins/*/{Makefile.inc,acinclude.m4} ''; - hardeningDisable = [ "format" ]; + patches = [ + ./squeak-configure-version.patch + ./squeak-plugins-discovery.patch + ./squeak-squeaksh-nixpkgs.patch + ]; + + postPatch = '' + vmVersionDate=$(sed 's/\([0-9][0-9][0-9][0-9]\)\([0-9][0-9]\)\([0-9][0-9]\)\([0-9][0-9]\)\([0-9][0-9]\)/\1-\2-\3T\4:\5+0000/' <<< "$vmVersionRelease") + vmVersionDate=$(date -u '+%a %b %-d %T %Y %z' -d "$vmVersionDate") + vmVersionFiles=$(sed -n 's/^versionfiles="\(.*\)"/\1/p' ./scripts/updateSCCSVersions) + vmHash=$(< "$vmHash") + vmAbbrevHash=''${vmHash:0:12} + printf '%s\n' "$vmAbbrevHash" + for vmVersionFile in $vmVersionFiles; do + substituteInPlace "$vmVersionFile" \ + --replace "\$Date\$" "\$Date: ''${vmVersionDate} \$" \ + --replace "\$URL\$" "\$URL: ''${vmSrcUrl} \$" \ + --replace "\$Rev\$" "\$Rev: ''${vmVersionRelease} \$" \ + --replace "\$CommitHash\$" "\$CommitHash: ''${vmAbbrevHash} \$" + done + patchShebangs --build ./"build.$vmBuild"/squeak.cog.spur ./scripts + for squeaksh in ./platforms/unix/config/{,bin.}squeak.sh.in; do + substituteInPlace "$squeaksh" \ + --subst-var-by 'glibc' ${lib.escapeShellArg (lib.getBin glibc)} \ + --subst-var-by 'gnugrep' ${lib.escapeShellArg (lib.getBin gnugrep)} + done + substituteInPlace ./platforms/unix/config/mkmf \ + --replace '/bin/rm ' '${coreutils}/bin/rm ' + ''; + + preAutoreconf = '' + pushd ./platforms/unix/config > /dev/null + ./mkacinc > ./acplugins.m4 + ''; + postAutoreconf = '' + rm ./acplugins.m4 + popd > /dev/null + ''; + + preConfigure = '' + if [ -z "''${dontFixLibtool:-}" ]; then + local i + find ./platforms/unix/config -iname "ltmain.sh" -print0 | while IFS=''' read -r -d ''' i; do + echo "fixing libtool script $i" + fixLibtool "$i" + done + fi + + substituteInPlace ./platforms/unix/config/configure \ + --replace "/usr/bin/file" "${file}/bin/file" + cd ./"build.$vmBuild"/squeak.cog.spur/build + substituteInPlace ./mvm \ + --replace 'read a' 'a=y' \ + --replace $'if [ $# -ge 1 ]; then\n\tINSTALLDIR="$1"; shift\nfi\n' "" \ + --replace 'config/configure' 'config/configure "$@"' \ + --replace 'make install' '# make install' + ''; + + configureFlags = [ + "--disable-dynamicopenssl" + "SQ_MAJOR=${squeakVersionMajor}" + "SQ_MINOR=${squeakVersionMinor}" + "SQ_UPDATE=${squeakImageVersion}" + "SQ_VERSION=${squeakVersion}-${toString bits}bit" + "SQ_SRC_VERSION=${squeakSourcesVersion}" + "VM_MAJOR=${squeakVmVersionMajor}" + "VM_MINOR=${squeakVmVersionMinor}" + "VM_RELEASE=${squeakVmVersionRelease}" + "VM_VERSION=${squeakVmVersion}" + ]; + configureScript = "./mvm"; + + installTargets = [ "install" "install-image" ]; + + postInstall = '' + rm "$out/squeak" + cp --no-preserve mode "$sourcesSrc" "$out"/lib/squeak/SqueakV${lib.escapeShellArg squeakSourcesVersion}.sources + ''; meta = with lib; { - description = "Smalltalk programming language and environment"; - longDescription = '' - Squeak is a full-featured implementation of the Smalltalk programming - language and environment based on (and largely compatible with) the - original Smalltalk-80 system. Squeak has very powerful 2- and 3-D - graphics, sound, video, MIDI, animation and other multimedia - capabilities. It also includes a customisable framework for creating - dynamic HTTP servers and interactively extensible Web sites. - ''; - homepage = "http://squeakvm.org/"; - downloadPage = "http://squeakvm.org/unix/index.html"; + description = "Squeak virtual machine"; + homepage = "https://opensmalltalk.org/"; license = with licenses; [ asl20 mit ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ ehmry ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/squeak/squeak-configure-version.patch b/pkgs/development/compilers/squeak/squeak-configure-version.patch new file mode 100644 index 000000000000..46ba8e0448cb --- /dev/null +++ b/pkgs/development/compilers/squeak/squeak-configure-version.patch @@ -0,0 +1,94 @@ +--- a/platforms/unix/config/Makefile.install ++++ b/platforms/unix/config/Makefile.install +@@ -101,10 +101,10 @@ uninstall-image : getversion + + install-sources : + $(MKINSTALLDIRS) $(ROOT)$(imgdir) +- $(INSTALL_DATA) $(topdir)/SqueakV$(SQ_MAJOR).sources $(ROOT)$(imgdir) ++ $(INSTALL_DATA) $(topdir)/SqueakV$(SQ_SRC_VERSION).sources $(ROOT)$(imgdir) + + uninstall-sources : +- @$(UNINSTALL) $(ROOT)$(imgdir) SqueakV$(SQ_MAJOR).sources ++ @$(UNINSTALL) $(ROOT)$(imgdir) SqueakV$(SQ_SRC_VERSION).sources + + # npsqueak + +--- a/platforms/unix/config/configure.ac ++++ b/platforms/unix/config/configure.ac +@@ -122,7 +122,7 @@ AC_SUBST(vmpdir) + AC_SUBST(vmmcfg) + AC_SUBST(blddir) + +-SQ_VERSION=${SQ_MAJOR}.${SQ_MINOR}-${SQ_UPDATE} ++AS_VAR_SET_IF([SQ_VERSION], [], [SQ_VERSION=${SQ_MAJOR}.${SQ_MINOR}-${SQ_UPDATE}]) + + AC_DEFINE_UNQUOTED(SQ_VERSION, "${SQ_VERSION}", [Squeak version]) + +@@ -131,21 +131,24 @@ AC_SUBST(SQ_MINOR) + AC_SUBST(SQ_UPDATE) + AC_SUBST(SQ_VERSION) + ++AS_VAR_SET_IF([SQ_SRC_VERSION], [], [SQ_SRC_VERSION=${SQ_MAJOR}]) ++AC_SUBST(SQ_SRC_VERSION) ++ + #VM_VERSION=${VM_MAJOR}.${VM_MINOR}-${VM_RELEASE} + + #AC_DEFINE_UNQUOTED(VM_VERSION, "${VM_VERSION}", [VM version]) + +-#AC_SUBST(VM_MAJOR) +-#AC_SUBST(VM_MINOR) +-#AC_SUBST(VM_RELEASE) +-#AC_SUBST(VM_VERSION) ++AC_SUBST(VM_MAJOR) ++AC_SUBST(VM_MINOR) ++AC_SUBST(VM_RELEASE) ++AC_SUBST(VM_VERSION) + + # libdir contains ${exec_prefix}, so we have to default and expand early + test "x$prefix" = xNONE && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + imgdir=`eval echo ${libdir}/squeak` + expanded_relative_imgdir=`eval echo lib/squeak/${VM_VERSION}` +-plgdir='${imgdir}/`${blddir}/getversion VERSION_TAG`' ++plgdir=`eval echo '${imgdir}'/${VM_VERSION}` + + AC_SUBST(imgdir) + AC_SUBST(expanded_relative_imgdir) +--- a/platforms/unix/config/inisqueak.in ++++ b/platforms/unix/config/inisqueak.in +@@ -32,6 +32,7 @@ + + MAJOR=@SQ_MAJOR@ + VERSION=@SQ_VERSION@ ++SRC_VERSION=@SQ_SRC_VERSION@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +@@ -77,7 +78,7 @@ if test "$1" != ""; then + fi + + SQUEAK=${bindir}/squeak +-SOURCES=SqueakV${MAJOR}.sources ++SOURCES=SqueakV${SRC_VERSION}.sources + IMAGE=squeak.image.gz + CHANGES=squeak.changes.gz + +--- a/platforms/unix/config/make.cfg.in ++++ b/platforms/unix/config/make.cfg.in +@@ -96,6 +96,16 @@ X_INCLUDES= @X_INCLUDES@ + X_LIBS= @X_LIBS@ + + ++SQ_MAJOR= @SQ_MAJOR@ ++SQ_MINOR= @SQ_MINOR@ ++SQ_UPDATE= @SQ_UPDATE@ ++SQ_VERSION= @SQ_VERSION@ ++SQ_SRC_VERSION= @SQ_SRC_VERSION@ ++VM_MAJOR= @VM_MAJOR@ ++VM_MINOR= @VM_MINOR@ ++VM_RELEASE= @VM_RELEASE@ ++VM_VERSION= @VM_VERSION@ ++ + INTERP= @INTERP@ + + VM_APP_ICONS= @VM_APP_ICONS@ diff --git a/pkgs/development/compilers/squeak/squeak-plugins-discovery.patch b/pkgs/development/compilers/squeak/squeak-plugins-discovery.patch new file mode 100644 index 000000000000..8d1aa20a6f35 --- /dev/null +++ b/pkgs/development/compilers/squeak/squeak-plugins-discovery.patch @@ -0,0 +1,34 @@ +--- a/platforms/unix/plugins/UnicodePlugin/Makefile.inc ++++ b/platforms/unix/plugins/UnicodePlugin/Makefile.inc +@@ -1,2 +1,2 @@ +-XCPPFLAGS= -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include ++XCPPFLAGS= [unicode_plugin_cflags] +-XLDFLAGS= -lpangocairo-1.0 -lcairo -lpango-1.0 -lgobject-2.0 -lglib-2.0 ++XLDFLAGS= [unicode_plugin_libs] +--- a/platforms/unix/plugins/UnicodePlugin/acinclude.m4 ++++ b/platforms/unix/plugins/UnicodePlugin/acinclude.m4 +@@ -2,9 +2,14 @@ + + AC_MSG_CHECKING([for PangoCairo libraries]) + save_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="-I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include" ++CPPFLAGS=`pkg-config --cflags glib-2.0 pangocairo` + AC_TRY_COMPILE([#include ],[{}],[ + AC_MSG_RESULT(yes) ++ PKG_CHECK_MODULES([UNICODE_PLUGIN],[glib-2.0 pangocairo]) ++ AC_SUBST([UNICODE_PLUGIN_CFLAGS]) ++ AC_SUBST([UNICODE_PLUGIN_LIBS]) ++ AC_PLUGIN_DEFINE_UNQUOTED([unicode_plugin_cflags],[$UNICODE_PLUGIN_CFLAGS]) ++ AC_PLUGIN_DEFINE_UNQUOTED([unicode_plugin_libs],[$UNICODE_PLUGIN_LIBS]) + ],[ + AC_MSG_RESULT(no) + AC_PLUGIN_DISABLE +--- a/platforms/unix/plugins/XDisplayControlPlugin/acinclude.m4 ++++ b/platforms/unix/plugins/XDisplayControlPlugin/acinclude.m4 +@@ -1,5 +1,3 @@ + # Require X11 + +-AC_CHECK_LIB(X11,XOpenDisplay, +- [AC_PLUGIN_USE_LIB(X11)], +- [AC_PLUGIN_DISABLE]) ++AC_PLUGIN_CHECK_LIB(X11,XOpenDisplay) diff --git a/pkgs/development/compilers/squeak/squeak-squeaksh-nixpkgs.patch b/pkgs/development/compilers/squeak/squeak-squeaksh-nixpkgs.patch new file mode 100644 index 000000000000..e5fa380676f2 --- /dev/null +++ b/pkgs/development/compilers/squeak/squeak-squeaksh-nixpkgs.patch @@ -0,0 +1,40 @@ +--- a/platforms/unix/config/bin.squeak.sh.in ++++ b/platforms/unix/config/bin.squeak.sh.in +@@ -1,7 +1,7 @@ + #!/bin/sh + # Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory + # if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory. +-BIN=`/usr/bin/dirname "$0"`/../@expanded_relative_imgdir@ ++BIN=`dirname "$0"`/../@expanded_relative_imgdir@ + GDB= + if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then + export SQUEAK_PLUGINS="$BIN" +@@ -26,7 +26,7 @@ fi + # libc (e.g. through the FFI) then it must use the same version that the VM uses + # and so it should take precedence over /lib libc. This is done by setting + # LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM. +-LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`" ++LIBC_SO="`@glibc@/bin/ldd "$BIN/squeak" | @gnugrep@/bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`" + PLATFORMLIBDIR=`expr "$LIBC_SO" : '\(.*\)/libc.*'` + + if [ "$PLATFORMLIBDIR" = "" ]; then +--- a/platforms/unix/config/squeak.sh.in ++++ b/platforms/unix/config/squeak.sh.in +@@ -1,7 +1,7 @@ + #!/bin/sh + # Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory + # if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory. +-BIN=`/usr/bin/dirname "$0"`/@expanded_relative_imgdir@ ++BIN=`dirname "$0"`/@expanded_relative_imgdir@ + GDB= + if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then + export SQUEAK_PLUGINS="$BIN" +@@ -26,7 +26,7 @@ fi + # libc (e.g. through the FFI) then it must use the same version that the VM uses + # and so it should take precedence over /lib libc. This is done by setting + # LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM. +-LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`" ++LIBC_SO="`@glibc@/bin/ldd "$BIN/squeak" | @gnugrep@/bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`" + PLATFORMLIBDIR=`expr "$LIBC_SO" : '\(.*\)/libc.*'` + + if [ "$PLATFORMLIBDIR" = "" ]; then diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index b5009195ba7c..f47d4cd818f3 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -36,26 +36,50 @@ }: let - version = "5.4.2"; + # The Swift toolchain script builds projects with separate repos. By convention, some of them share + # the same version with the main Swift compiler project per release. We fetch these with + # `fetchSwiftRelease`. The rest have their own versions locked to each Swift release, as defined in the + # Swift compiler repo: + # utils/update_checkout/update_checkout-config.json. + # + # ... among projects listed in that file, we provide our own: + # - CMake + # - ninja + # - icu + # + # ... we'd like to include the following in the future: + # - stress-tester + # - integration-tests - # These dependency versions can be found in utils/update_checkout/update-checkout-config.json. - swiftArgumentParserVersion = "0.3.0"; - yamsVersion = "3.0.1"; - swiftFormatVersion = "0.50400.0"; + versions = { + swift = "5.5.3"; + yams = "4.0.2"; + argumentParser = "0.4.3"; + format = "swift-5.5-branch"; + crypto = "1.1.5"; + }; + + fetchAppleRepo = { repo, rev, sha256 }: + fetchFromGitHub { + owner = "apple"; + inherit repo rev sha256; + name = "${repo}-${rev}-src"; + }; fetchSwiftRelease = { repo, sha256, fetchSubmodules ? false }: fetchFromGitHub { owner = "apple"; inherit repo sha256 fetchSubmodules; - rev = "swift-${version}-RELEASE"; - name = "${repo}-${version}-src"; + rev = "swift-${versions.swift}-RELEASE"; + name = "${repo}-${versions.swift}-src"; }; - # Sources based on utils/update_checkout/update_checkout-config.json. sources = { + # Projects that share `versions.swift` for each release. + swift = fetchSwiftRelease { repo = "swift"; - sha256 = "0qrkqkwpmk312fi12kwwyihin01qb7sphhdz5c6an8j1rjfd9wbv"; + sha256 = "0ma96sfvwiv2f4qhzrvcwxi9igzd80930gnaw4r7ra4w190cnag7"; }; cmark = fetchSwiftRelease { repo = "swift-cmark"; @@ -63,75 +87,73 @@ let }; llbuild = fetchSwiftRelease { repo = "swift-llbuild"; - sha256 = "0d7sj5a9b5c1ry2209cpccic5radf9s48sp1lahqzmd1pdx3n7pi"; - }; - argumentParser = fetchFromGitHub { - owner = "apple"; - repo = "swift-argument-parser"; - rev = swiftArgumentParserVersion; - sha256 = "15vv7hnffa84142q97dwjcn196p2bg8nfh89d6nnix0i681n1qfd"; - name = "swift-argument-parser-${swiftArgumentParserVersion}"; + sha256 = "1xmiv7yp9r9iscx3fc3zdp25mriz134k9ny2rchxzi4kifz8h0zc"; }; driver = fetchSwiftRelease { repo = "swift-driver"; - sha256 = "1j08273haqv7786rkwsmw7g103glfwy1d2807490id9lagq3r66z"; + sha256 = "1pb7fidgdqxzragqkillkv03vdilrwmcx6x2r4czqvdqj37gy6b6"; }; toolsSupportCore = fetchSwiftRelease { repo = "swift-tools-support-core"; - sha256 = "07gm28ki4px7xzrplvk9nd1pp5r9nyi87l21i0rcbb3r6wrikxb4"; + sha256 = "0a63193nycir4lffvmb3ky8cfly5kdr2libki2gx4fn6fxmb3a2f"; }; swiftpm = fetchSwiftRelease { repo = "swift-package-manager"; - sha256 = "05linnzlidxamzl3723zhyrfm24pk2cf1x66a3nk0cxgnajw0vzx"; + sha256 = "0z90mg837jzwh516pypn48r3wsjf0lqymsyigdhgr7j2sgcckrr1"; }; syntax = fetchSwiftRelease { repo = "swift-syntax"; - sha256 = "1y9agx9bg037xjhkwc28xm28kjyqydgv21s4ijgy5l51yg1g0daj"; + sha256 = "0kdgh9a8n28yh12hj8lbz2j66ag83l0lcfyfdg7zdr614zs6i3p1"; }; - # TODO: possibly re-add stress-tester. corelibsXctest = fetchSwiftRelease { repo = "swift-corelibs-xctest"; - sha256 = "00c68580yr12yxshl0hxyhp8psm15fls3c7iqp52hignyl4v745r"; + sha256 = "12fp3xzsqwcrmyc55h91d3dm64wn3wln47x2fl7sj0s8cn7q12b3"; }; corelibsFoundation = fetchSwiftRelease { repo = "swift-corelibs-foundation"; - sha256 = "1jyadm2lm7hhik8n8wacfiffpdwqsgnilwmcw22qris5s2drj499"; + sha256 = "06gkdliihl1l86jx5khzwkjmjk45fq290x033rscramzcdxh7d1b"; }; corelibsLibdispatch = fetchSwiftRelease { repo = "swift-corelibs-libdispatch"; - sha256 = "1s46c0hrxi42r43ff5f1pq2imb3hs05adfpwfxkilgqyb5svafsp"; + sha256 = "1bim5x9z9bqfgs6gdm4nlz1zrwl2x7xh4dn6i5md9ygsplr4ibzf"; fetchSubmodules = true; }; - # TODO: possibly re-add integration-tests. - # Linux does not support Xcode playgrounds. - # We provide our own ninja. - # We provider our own icu. - yams = fetchFromGitHub { - owner = "jpsim"; - repo = "Yams"; - rev = yamsVersion; - sha256 = "13md54y7lalrpynrw1s0w5yw6rrjpw46fml9dsk2m3ph1bnlrqrq"; - name = "Yams-${yamsVersion}"; - }; - # We provide our own CMake. indexstoreDb = fetchSwiftRelease { repo = "indexstore-db"; - sha256 = "1ap3hiq2jd3cn10d8d674xysq27by878mvq087a80681r8cdivn3"; + sha256 = "1l1xlzf5kx7x80kf4b7r36glv0jc64d08d1688kmzjq1cfgn6gm2"; }; sourcekitLsp = fetchSwiftRelease { repo = "sourcekit-lsp"; - sha256 = "02m9va0lsn2hnwkmgrbgj452sbyaswwmq14lqvxgnb7gssajv4gc"; - }; - format = fetchFromGitHub { - owner = "apple"; - repo = "swift-format"; - rev = swiftFormatVersion; - sha256 = "0skmmggsh31f3rnqcrx43178bc7scrjihibnwn68axagasgbqn4k"; - name = "swift-format-${swiftFormatVersion}-src"; + sha256 = "00fcmd7x5v62n6ajsc0dmzwz6nzy2p72mcs9w6p90adcx7pffqkn"; }; llvmProject = fetchSwiftRelease { repo = "llvm-project"; - sha256 = "166hd9d2i55zj70xjb1qmbblbfyk8hdb2qv974i07j6cvynn30lm"; + sha256 = "18rn5xg5hpxxsacs0ygjmjpzpc8pq85898kknzc0s0z5m55h45z8"; + }; + + # Projects that have their own versions during each release + + argumentParser = fetchAppleRepo { + repo = "swift-argument-parser"; + rev = "${versions.argumentParser}"; + sha256 = "1jkq72fphxzsnynjxk72azp0iz5r2ji7adxrz6w1y2a19pgjdqrp"; + }; + format = fetchAppleRepo { + repo = "swift-format"; + rev = "${versions.format}"; + sha256 = "1hg888ps3fk23q2zf6djkvxyk6zndqvwypmy0s800hmnyf0hzgv4"; + }; + crypto = fetchAppleRepo { + repo = "swift-crypto"; + rev = "${versions.crypto}"; + sha256 = "0918pj3x3wgli3bnrjbvpzck2n6qz5n6f4yc5kljky45wd15f34g"; + }; + yams = fetchFromGitHub { + owner = "jpsim"; + repo = "Yams"; + rev = versions.yams; + sha256 = "1nk9b7l6m3wwjkl81npl2l1iwpsxaxb9za53jpwwsbbi1h1h4fbi"; + name = "Yams-${versions.yams}-src"; }; }; @@ -160,7 +182,8 @@ let in stdenv.mkDerivation { - name = "swift-${version}"; + pname = "swift"; + version = versions.swift; nativeBuildInputs = [ autoconf @@ -207,15 +230,14 @@ stdenv.mkDerivation { cp -r ${sources.toolsSupportCore} swift-tools-support-core cp -r ${sources.swiftpm} swiftpm cp -r ${sources.syntax} swift-syntax - # TODO: possibly re-add stress-tester. cp -r ${sources.corelibsXctest} swift-corelibs-xctest cp -r ${sources.corelibsFoundation} swift-corelibs-foundation cp -r ${sources.corelibsLibdispatch} swift-corelibs-libdispatch - # TODO: possibly re-add integration-tests. cp -r ${sources.yams} yams cp -r ${sources.indexstoreDb} indexstore-db cp -r ${sources.sourcekitLsp} sourcekit-lsp cp -r ${sources.format} swift-format + cp -r ${sources.crypto} swift-crypto cp -r ${sources.llvmProject} llvm-project chmod -R u+w . @@ -378,7 +400,7 @@ stdenv.mkDerivation { meta = with lib; { description = "The Swift Programming Language"; homepage = "https://github.com/apple/swift"; - maintainers = with maintainers; [ dtzWill trepetti ]; + maintainers = with maintainers; [ dtzWill trepetti dduan ]; license = licenses.asl20; # Swift doesn't support 32-bit Linux, unknown on other platforms. platforms = platforms.linux; diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix index 2bb8b9d5be30..c148e522015e 100644 --- a/pkgs/development/compilers/tvm/default.nix +++ b/pkgs/development/compilers/tvm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tvm"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "apache"; repo = "incubator-tvm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0qflpd3lw0jslyk5lqpv2v42lkqs8mkvnn6i3fdms32iskdfk6p5"; + sha256 = "sha256-fv2hhPGbr/AbwuN8rAF9PI/QTTqxNgwjYl9arg5GjKY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/development/compilers/uasm/default.nix new file mode 100644 index 000000000000..f440208e947b --- /dev/null +++ b/pkgs/development/compilers/uasm/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "uasm"; + version = "2.53"; + + src = fetchFromGitHub { + owner = "Terraspace"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Aohwrcb/KTKUFFpfmqVDPNjJh1dMYSNnBJ2eFaP20pM="; + }; + + # https://github.com/Terraspace/UASM/pull/154 + patches = [ + # fix `invalid operands to binary - (have 'char *' and 'uint_8 *' {aka 'unsigned char *'})` + (fetchpatch { + name = "fix_pointers_compare.patch"; + url = "https://github.com/clouds56/UASM/commit/9cd3a400990e230571e06d4c758bd3bd35f90ab6.patch"; + sha256 = "sha256-8mY36dn+g2QNJ1JbWt/y4p0Ha9RSABnOE3vlWANuhsA="; + }) + # fix `dbgcv.c:*:*: fatal error: direct.h: No such file or directory` + (fetchpatch { + name = "fix_build_dbgcv_c_on_unix.patch"; + url = "https://github.com/clouds56/UASM/commit/806d54cf778246c96dcbe61a4649bf0aebcb0eba.patch"; + sha256 = "sha256-uc1LaizdYEh1Ry55Cq+6wrCa1OeBPFo74H5iBpmteAE="; + }) + ]; + + enableParallelBuilding = true; + + makefile = "gccLinux64.mak"; + + installPhase = '' + runHook preInstall + + install -Dt "$out/bin" -m0755 GccUnixR/uasm + install -Dt "$out/share/doc/${pname}" -m0644 {Readme,History}.txt Doc/* + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://www.terraspace.co.uk/uasm.html"; + description = "A free MASM-compatible assembler based on JWasm"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ thiagokokada ]; + license = licenses.watcom; + }; +} diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 025fc8c3fa7d..d027898cf9d6 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://unisonweb.org/"; license = with licenses; [ mit bsd3 ]; maintainers = [ maintainers.virusdave ]; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix index 7381e7c89fec..66f1bda6d5f9 100644 --- a/pkgs/development/compilers/urn/default.nix +++ b/pkgs/development/compilers/urn/default.nix @@ -21,7 +21,8 @@ let in stdenv.mkDerivation { - name = "urn-${optionalString (extraLibraries != []) "with-libraries-"}${version}"; + pname = "urn${optionalString (extraLibraries != []) "-with-libraries"}"; + inherit version; src = fetchFromGitLab { owner = "urn"; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 17ba5b14214c..230f6ee19a20 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -18,10 +18,10 @@ let { "0.48" = ./disable-graphviz-0.46.1.patch; - "0.52" = ./disable-graphviz-0.46.1.patch; - "0.54" = ./disable-graphviz-0.46.1.patch; + "0.56" = ./disable-graphviz-0.46.1.patch; + }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz; @@ -70,7 +70,10 @@ let passthru = { updateScript = gnome.updateScript { - attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; + attrPath = + let + roundUpToEven = num: num + lib.mod num 2; + in "${pname}_${lib.versions.major version}_${builtins.toString (roundUpToEven (lib.toInt (lib.versions.minor version)))}"; packageName = pname; freeze = true; }; @@ -87,18 +90,18 @@ let in rec { vala_0_48 = generic { - version = "0.48.22"; - sha256 = "sha256-27NHjEvjZvCTFkrGHNOu29zz5EQE2eNkFK4VEk525os="; - }; - - vala_0_52 = generic { - version = "0.52.10"; - sha256 = "sha256-nCAb+BLZh04hveU/jZwU9lF0ixqBRB/1ySkSJESQEAg="; + version = "0.48.23"; + sha256 = "sha256-3jzIWNmV4HR0IZ4lo+Hw7ZmAcNLiBtOjE9Q3ml93oGo="; }; vala_0_54 = generic { - version = "0.54.6"; - sha256 = "SdYNlqP99sQoc5dEK8bW2Vv0CqffZ47kkSjEsRum5Gk="; + version = "0.54.8"; + sha256 = "7fs+eUhqS/SM666pKR5X/HfakyK2lh6VSd9tlz0EvIA="; + }; + + vala_0_56 = generic { + version = "0.56.0"; + sha256 = "2SvRPFYwkF7rapg9y3AiBNqXMUYMKm5OOfhnmW83EEA="; }; vala = vala_0_54; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 30b9b8393987..ecdebdda849a 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -72,13 +72,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.12+54"; + version = "0.15"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "59a71503448401d2476cf0872808e0a99c3a4d81"; - hash = "sha256-cz4PQymaA9UW91lN+6iniFhbcPRpFNIAeC8ZkwYeg0U="; + rev = "${pname}-${version}"; + hash = "sha256-1NCcsq0otVKTTSSmnX2kCvvngF1yzqYWlRVzu+XY65w="; }; enableParallelBuilding = true; @@ -143,7 +143,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Open RTL synthesis framework and tools"; - homepage = "http://www.clifford.at/yosys/"; + homepage = "https://yosyshq.net/yosys/"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ shell thoughtpolice emily ]; diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index d4eb57815a80..a2cd8f44ce28 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -11,19 +11,20 @@ let in stdenv.mkDerivation rec { pname = "zig"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ziglang"; repo = pname; rev = version; - hash = "sha256-Hfl1KKtGcopMrn+U9r0/qr/wReWJIgb8+IgwMoguv/0="; + hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k="; }; nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; + buildInputs = [ libxml2 zlib diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index 1ba8080e0b10..2f7437fd74fd 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -5,7 +5,7 @@ with lib; mkCoqDerivation rec { owner = "DeepSpec"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.10" "8.14"; out = "4.0.0"; } + { case = range "8.10" "8.15"; out = "4.0.0"; } ] null; release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; releaseRev = v: "${v}"; diff --git a/pkgs/development/coq-modules/LibHyps/default.nix b/pkgs/development/coq-modules/LibHyps/default.nix new file mode 100644 index 000000000000..36272ff207f5 --- /dev/null +++ b/pkgs/development/coq-modules/LibHyps/default.nix @@ -0,0 +1,21 @@ +{ lib, mkCoqDerivation, coq, version ? null }: + +with lib; +mkCoqDerivation { + pname = "LibHyps"; + owner = "Matafou"; + inherit version; + defaultVersion = if (versions.range "8.11" "8.15") coq.version then "2.0.4.1" else null; + release = { + "2.0.4.1".sha256 = "09p89701zhrfdmqlpxw3mziw8yylj1w1skb4b0xpbdwd1vsn4k3h"; + }; + + configureScript = "./configure.sh"; + + releaseRev = (v: "libhyps-${v}"); + + meta = { + description = "Hypotheses manipulation library"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index fcaaaac615e7..56ce94ecc6f3 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -34,10 +34,10 @@ mkCoqDerivation { "substituteInPlace Makefile --replace quickChickTool.byte quickChickTool.native"; mlPlugin = true; + extraNativeBuildInputs = lib.optional recent coq.ocamlPackages.ocamlbuild; extraBuildInputs = lib.optional recent coq.ocamlPackages.num; propagatedBuildInputs = [ ssreflect ] - ++ lib.optionals recent [ coq-ext-lib simple-io ] - ++ lib.optional recent coq.ocamlPackages.ocamlbuild; + ++ lib.optionals recent [ coq-ext-lib simple-io ]; extraInstallFlags = [ "-f Makefile.coq" ]; enableParallelBuilding = false; diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 1d2a1a3c05fc..a5dee94d045d 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -1,5 +1,7 @@ { lib, mkCoqDerivation, coq, compcert, ITree, version ? null }: +with lib; + # A few modules that are not built and installed by default # but that may be useful to some users. # They depend on ITree. @@ -7,12 +9,15 @@ let extra_floyd_files = [ "ASTsize.v" "io_events.v" "powerlater.v" - "printf.v" + ] + # floyd/printf.v is broken in VST 2.9 + ++ optional (!versions.isGe "8.13" coq.coq-version) "printf.v" + ++ [ "quickprogram.v" ]; in -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coq${coq.coq-version}-VST"; namePrefix = []; displayVersion = { coq = false; }; @@ -20,8 +25,10 @@ with lib; mkCoqDerivation { repo = "VST"; inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.13" "8.15"; out = "2.9"; } { case = range "8.12" "8.13"; out = "2.8"; } ] null; + release."2.9".sha256 = "sha256:1adwzbl1pprrrwrm7cm493098fizxanxpv7nyfbvwdhgbhcnv6qf"; release."2.8".sha256 = "sha256-cyK88uzorRfjapNQ6XgQEmlbWnDsiyLve5po1VG52q0="; releaseRev = v: "v${v}"; extraBuildInputs = [ ITree ]; @@ -30,6 +37,7 @@ with lib; mkCoqDerivation { preConfigure = '' patchShebangs util substituteInPlace Makefile \ + --replace 'COQVERSION= ' 'COQVERSION= 8.15.1 or-else '\ --replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}' ''; diff --git a/pkgs/development/coq-modules/addition-chains/default.nix b/pkgs/development/coq-modules/addition-chains/default.nix index 929d23c81869..8a0248c952cb 100644 --- a/pkgs/development/coq-modules/addition-chains/default.nix +++ b/pkgs/development/coq-modules/addition-chains/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp-ssreflect, mathcomp-algebra, paramcoq +{ lib, mkCoqDerivation, coq, mathcomp-ssreflect, mathcomp-algebra, mathcomp-fingroup, paramcoq , version ? null }: with lib; @@ -8,15 +8,16 @@ mkCoqDerivation { release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp"; release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk"; + release."0.6".sha256 = "1dri4sisa7mhclf8w4kw7ixs5zxm8xyjr034r1377p96rdk3jj0j"; releaseRev = (v: "v${v}"); inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.13" "8.14"; out = "0.5"; } + { case = range "8.13" "8.15"; out = "0.6"; } { case = range "8.11" "8.12"; out = "0.4"; } ] null; - propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-algebra paramcoq ]; + propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-algebra mathcomp-fingroup paramcoq ]; useDune2 = true; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 9757b3e43c8b..092bb58d174f 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -16,7 +16,8 @@ let compcert = mkCoqDerivation rec { defaultVersion = with versions; switch coq.version [ { case = range "8.8" "8.11"; out = "3.8"; } - { case = range "8.12" "8.14"; out = "3.10"; } + { case = isEq "8.12" ; out = "3.9"; } + { case = range "8.12" "8.15"; out = "3.10"; } ] null; release = { @@ -106,13 +107,23 @@ compcert.overrideAttrs (o: }) ]; } - { cases = [ (isEq "8.14") "3.10" ]; + { cases = [ (range "8.14" "8.15") "3.10" ]; out = [ # Support for Coq 8.14.1 (fetchpatch { url = "https://github.com/AbsInt/CompCert/commit/a79f0f99831aa0b0742bf7cce459cc9353bd7cd0.patch"; sha256 = "sha256:0g20x8gfzvplpad9y9vr1p33k6qv6rsp691x6687v9ffvz7zsz94"; }) + # Support for Coq 8.15.0 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/a882f78c069f7337dd9f4abff117d4df98ef38a6.patch"; + sha256 = "sha256:16i87s608fj9ni7cvd5wrd7gicqniad7w78wi26pxdy0pacl7bjg"; + }) + # Support for Coq 8.15.1 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/10a976994d7fd30d143354c289ae735d210ccc09.patch"; + sha256 = "sha256:0bg58gpkgxlmxzp6sg0dvybrfk0pxnm7qd6vxlrbsbm2w6wk03jv"; + }) ]; } ] []; diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index 1da0a0d17ea9..6cb6bb3c813e 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -22,6 +22,7 @@ with lib; mkCoqDerivation { }; }; + extraBuildInputs = [ mathcomp.ssreflect mathcomp.fingroup ]; propagatedBuildInputs = [ mathcomp.algebra ]; installPhase = '' diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 9adcbaaa8c75..55423047caa7 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -6,6 +6,7 @@ with builtins; with lib; let { case = "8.12"; out = { version = "1.12.0"; };} { case = "8.13"; out = { version = "1.13.7"; };} { case = "8.14"; out = { version = "1.13.7"; };} + { case = "8.15"; out = { version = "1.14.1"; };} ] {}); in mkCoqDerivation { pname = "elpi"; @@ -13,11 +14,14 @@ in mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.15"; out = "1.13.0"; } { case = "8.14"; out = "1.11.2"; } { case = "8.13"; out = "1.11.1"; } { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."1.13.0".sha256 = "1j7s7dlnjbw222gnbrsjgmjck1yrx7h6hwm8zikcyxi0zys17w7n"; + release."1.12.1".sha256 = "sha256-4mO6/co7NcIQSGIQJyoO8lNWXr6dqz+bIYPO/G0cPkY="; release."1.11.2".sha256 = "0qk5cfh15y2zrja7267629dybd3irvxk1raz7z8qfir25a81ckd4"; release."1.11.1".sha256 = "10j076vc2hdcbm15m6s7b6xdzibgfcbzlkgjnlkr2vv9k13qf8kc"; release."1.10.1".sha256 = "1zsyx26dvj7pznfd2msl2w7zbw51q1nsdw0bdvdha6dga7ijf7xk"; @@ -44,9 +48,8 @@ in mkCoqDerivation { release."1.6.0".sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; releaseRev = v: "v${v}"; - nativeBuildInputs = [ which ]; + extraNativeBuildInputs = [ which elpi ]; mlPlugin = true; - extraBuildInputs = [ elpi ]; meta = { description = "Coq plugin embedding ELPI."; diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index cbbddefffffe..3b8b23618d23 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -10,7 +10,7 @@ with lib; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.1.0"; } + { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; } { cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; } { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; } { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; } diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 7cb859b202a2..66a3dd222dd5 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -5,6 +5,7 @@ with lib; mkCoqDerivation { pname = "coqhammer"; owner = "lukaszcz"; defaultVersion = with versions; switch coq.coq-version [ + { case = "8.15"; out = "1.3.2-coq8.15"; } { case = "8.14"; out = "1.3.2-coq8.14"; } { case = "8.13"; out = "1.3.2-coq8.13"; } { case = "8.12"; out = "1.3.2-coq8.12"; } @@ -13,6 +14,8 @@ with lib; mkCoqDerivation { { case = "8.9"; out = "1.1.1-coq8.9"; } { case = "8.8"; out = "1.1-coq8.8"; } ] null; + release."1.3.2-coq8.15".sha256 = "sha256:0n0y9wda8bx88r17ls9541ibxw013ghp73zshgb65bi7ibznbhha"; + release."1.3.2-coq8.15".rev = "9a3e689036f12c09800ca3bac05054af0cc49233"; release."1.3.2-coq8.14".sha256 = "sha256:1pvs4p95lr31jb86f33p2q9v8zq3xbci1fk6s6a2g2snfxng1574"; release."1.3.2-coq8.13".sha256 = "sha256:0krsm8qj9lgfbggxv2jhkbk3vy2cz63qypnarnl31fdmpykchi4b"; release."1.3.2-coq8.12".sha256 = "sha256:08mnr13lrdnpims6kf8pk6axf4s8qqs0a71hzg3frkx21d6nawhh"; diff --git a/pkgs/development/coq-modules/coqtail-math/default.nix b/pkgs/development/coq-modules/coqtail-math/default.nix index 891d1fae62c0..c9c3915414c3 100644 --- a/pkgs/development/coq-modules/coqtail-math/default.nix +++ b/pkgs/development/coq-modules/coqtail-math/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation { release."20201124".rev = "5c22c3d7dcd8cf4c47cf84a281780f5915488e9e"; release."20201124".sha256 = "sha256-wd+Lh7dpAD4zfpyKuztDmSFEZo5ZiFrR8ti2jUCVvoQ="; - buildInputs = with coq.ocamlPackages; [ ocaml findlib ]; + extraNativeBuildInputs = with coq.ocamlPackages; [ ocaml findlib ]; meta = { license = licenses.lgpl3Only; diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index b7f5802b9d40..1a6dba9b0c08 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -16,7 +16,7 @@ with lib; mkCoqDerivation { release."3.0.2".sha256 = "1rqfbbskgz7b1bcpva8wh3v3456sq2364y804f94sc8y5sij23nl"; releaseRev = v: "coquelicot-${v}"; - nativeBuildInputs = [ which autoconf ]; + extraNativeBuildInputs = [ which autoconf ]; propagatedBuildInputs = [ ssreflect ]; useMelquiondRemake.logpath = "Coquelicot"; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index d8d189ed5c19..7cf6132bf6a9 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -9,6 +9,7 @@ mkCoqDerivation { repo = "coq-dpdgraph"; inherit version; defaultVersion = switch coq.coq-version [ + { case = "8.15"; out = "1.0+8.15"; } { case = "8.14"; out = "1.0+8.14"; } { case = "8.13"; out = "1.0+8.13"; } { case = "8.12"; out = "0.6.8"; } @@ -21,6 +22,7 @@ mkCoqDerivation { { case = "8.5"; out = "0.6"; } ] null; + release."1.0+8.15".sha256 = "sha256:1pxr0gakcz297y8hhrnssv5j07ccd58pv7rh7qv5g7855pfqrkg7"; release."1.0+8.14".sha256 = "sha256:01pmi7jcc77431jii6x6nd4m8jg4vycachiyi1h6dx9rp3a2508s"; release."1.0+8.13".sha256 = "sha256:0f8lj8b99n8nsq2jf5m0snblfs8yz50hmlqqq9nlw4qklq7j4z5z"; release."0.6.9".sha256 = "11mbydpcgk7y8pqzickbzx0ig7g9k9al71i9yfrcscd2xj8fwj8z"; @@ -37,7 +39,7 @@ mkCoqDerivation { release."0.6".sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; releaseRev = v: "v${v}"; - nativeBuildInputs = [ autoreconfHook ]; + extraNativeBuildInputs = [ autoreconfHook ]; mlPlugin = true; extraBuildInputs = [ coq.ocamlPackages.ocamlgraph ]; diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index c78c6ca03fc3..58c6caa9e6ff 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -10,12 +10,14 @@ with lib; inherit version; defaultVersion = with versions; switch [coq.coq-version ssreflect.version] [ + { cases = [(isGe "8.11") (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"; } ] null; releaseRev = v: "v${v}"; + 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/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index 1ac76b38c72c..ca82bbbed069 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -7,9 +7,10 @@ with lib; mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.7" "8.14"; out = "3.4.2"; } + { case = range "8.7" "8.15"; out = "3.4.3"; } { case = range "8.5" "8.8"; out = "2.6.1"; } ] null; + release."3.4.3".sha256 = "sha256-YTdWlEmFJjCcHkl47jSOgrGqdXoApJY4u618ofCaCZE="; release."3.4.2".sha256 = "1s37hvxyffx8ccc8mg5aba7ivfc39p216iibvd7f2cb9lniqk1pw"; release."3.3.1".sha256 = "1mk8adhi5hrllsr0hamzk91vf2405sjr4lh5brg9201mcw11abkz"; release."2.6.1".sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj"; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 84cd739ed6ab..a9c5d021077b 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -7,13 +7,16 @@ mkCoqDerivation { release."1.2.3".rev = "v1.2.3"; release."1.2.3".sha256 = "sha256-gwKfUa74fIP7j+2eQgnLD7AswjCtOFGHGaIWb4qI0n4="; + release."1.2.4".rev = "v1.2.4"; + release."1.2.4".sha256 = "sha256-iSW2O1kuunvOqTolmGGXmsYTxo2MJYCdW3BnEhp6Ksg="; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (isGe "8.11") (isGe "1.11.0") ]; out = "1.2.4"; } { cases = [ (isLe "8.13") (pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; - propagatedBuildInputs = [ mathcomp.algebra ]; + propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; meta = { description = "Formal proof of the Four Color Theorem "; diff --git a/pkgs/development/coq-modules/gaia-hydras/default.nix b/pkgs/development/coq-modules/gaia-hydras/default.nix index 5b76cb9148f0..d4bcaa8ef81f 100644 --- a/pkgs/development/coq-modules/gaia-hydras/default.nix +++ b/pkgs/development/coq-modules/gaia-hydras/default.nix @@ -6,10 +6,12 @@ with lib; mkCoqDerivation rec { repo = "hydra-battles"; release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk"; + release."0.6".sha256 = "1dri4sisa7mhclf8w4kw7ixs5zxm8xyjr034r1377p96rdk3jj0j"; releaseRev = (v: "v${v}"); inherit version; defaultVersion = with versions; switch [coq.coq-version mathcomp.version] [ + { cases = [ (range "8.14" "8.15") (isGe "1.12.0") ]; out = "0.6"; } { cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; } ] null; diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index cf52916605e9..53c317db87ca 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -10,12 +10,12 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.13"; } + { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.13"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } ] null; propagatedBuildInputs = - [ mathcomp.ssreflect mathcomp.algebra ]; + [ mathcomp.ssreflect mathcomp.algebra mathcomp.fingroup ]; meta = { description = "Implementation of books from Bourbaki's Elements of Mathematics in Coq"; diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index 440c9395a37f..02905dcffed5 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -12,7 +12,7 @@ with lib; mkCoqDerivation { release."1.4.4".sha256 = "114q2hgw64j6kqa9mg3qcp1nlf0ia46z2xadq81fnkxqm856ml7l"; releaseRev = v: "gappalib-coq-${v}"; - nativeBuildInputs = [ which autoconf ]; + extraNativeBuildInputs = [ which autoconf ]; mlPlugin = true; propagatedBuildInputs = [ flocq ]; useMelquiondRemake.logpath = "Gappa"; diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index 6374ede7970b..eedbe6fb5d88 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap +{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap, mathcomp-fingroup , hierarchy-builder, version ? null }: with lib; @@ -15,7 +15,7 @@ mkCoqDerivation { { case = range "8.13" "8.14"; out = "0.9"; } ] null; - propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap hierarchy-builder ]; + propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ]; meta = { description = "Library of formalized graph theory results in Coq"; diff --git a/pkgs/development/coq-modules/hierarchy-builder/default.nix b/pkgs/development/coq-modules/hierarchy-builder/default.nix index e950741d81ca..c0fa2d7c8e00 100644 --- a/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,17 +5,19 @@ with lib; let hb = mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.15"; out = "1.2.1"; } { case = range "8.13" "8.14"; out = "1.2.0"; } { case = range "8.12" "8.13"; out = "1.1.0"; } { case = isEq "8.11"; out = "0.10.0"; } ] null; + release."1.2.1".sha256 = "sha256-pQYZJ34YzvdlRSGLwsrYgPdz3p/l5f+KhJjkYT08Mj0="; release."1.2.0".sha256 = "0sk01rvvk652d86aibc8rik2m8iz7jn6mw9hh6xkbxlsvh50719d"; release."1.1.0".sha256 = "sha256-spno5ty4kU4WWiOfzoqbXF8lWlNSlySWcRReR3zE/4Q="; release."1.0.0".sha256 = "0yykygs0z6fby6vkiaiv3azy1i9yx4rqg8xdlgkwnf2284hffzpp"; release."0.10.0".sha256 = "1a3vry9nzavrlrdlq3cys3f8kpq3bz447q8c4c7lh2qal61wb32h"; releaseRev = v: "v${v}"; - nativeBuildInputs = [ which ]; + extraNativeBuildInputs = [ which ]; propagatedBuildInputs = [ coq-elpi ]; diff --git a/pkgs/development/coq-modules/hydra-battles/default.nix b/pkgs/development/coq-modules/hydra-battles/default.nix index faec5d3e330c..7977363d83f5 100644 --- a/pkgs/development/coq-modules/hydra-battles/default.nix +++ b/pkgs/development/coq-modules/hydra-battles/default.nix @@ -1,22 +1,21 @@ -{ lib, mkCoqDerivation, coq, equations, version ? null }: +{ lib, mkCoqDerivation, coq, equations, LibHyps, version ? null }: with lib; -mkCoqDerivation { +(mkCoqDerivation { pname = "hydra-battles"; owner = "coq-community"; release."0.4".sha256 = "1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp"; release."0.5".sha256 = "121pcbn6v59l0c165ha9n00whbddpy11npx2y9cn7g879sfk2nqk"; + release."0.6".sha256 = "1dri4sisa7mhclf8w4kw7ixs5zxm8xyjr034r1377p96rdk3jj0j"; releaseRev = (v: "v${v}"); inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.13" "8.14"; out = "0.5"; } + { case = range "8.13" "8.15"; out = "0.6"; } { case = range "8.11" "8.12"; out = "0.4"; } ] null; - propagatedBuildInputs = [ equations ]; - useDune2 = true; meta = { @@ -32,4 +31,7 @@ mkCoqDerivation { license = licenses.mit; platforms = platforms.unix; }; -} +}).overrideAttrs(o: + let inherit (o) version; in { + propagatedBuildInputs = [ equations ] ++ optional (versions.isGe "0.6" version || version == "dev") LibHyps; + }) diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 117eafae9239..b9257d415e57 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, bignums ? null, gnuplot_qt, version ? null }: +{ lib, mkCoqDerivation, which, autoconf, coq, coquelicot, flocq, mathcomp-ssreflect, mathcomp-fingroup, bignums ? null, gnuplot_qt, version ? null }: mkCoqDerivation rec { pname = "interval"; @@ -6,11 +6,12 @@ mkCoqDerivation rec { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.8" "8.14"; out = "4.3.0"; } + { case = isGe "8.8"; out = "4.4.0"; } { case = range "8.8" "8.12"; out = "4.0.0"; } { case = range "8.7" "8.11"; out = "3.4.2"; } { case = range "8.5" "8.6"; out = "3.3.0"; } ] null; + release."4.4.0".sha256 = "sha256-0+9AatTIEsjul0RXoOw6zWGEbGDVmuy7XuyrZNBZ8Kk="; release."4.3.0".sha256 = "sha256-k8DLC4HYYpHeEEgXUafS8jkaECqlM+/CoYaInmUTYko="; release."4.2.0".sha256 = "sha256-SD5thgpirs3wmZBICjXGpoefg9AAXyExb5t8tz3iZhE="; release."4.1.1".sha256 = "sha256-h2NJ6sZt1C/88v7W2xyuftEDoyRt3H6kqm5g2hc1aoU="; @@ -19,8 +20,8 @@ mkCoqDerivation rec { release."3.3.0".sha256 = "0lz2hgggzn4cvklvm8rpaxvwaryf37i8mzqajqgdxdbd8f12acsz"; releaseRev = v: "interval-${v}"; - nativeBuildInputs = [ which autoconf ]; - propagatedBuildInputs = [ bignums coquelicot flocq ] + extraNativeBuildInputs = [ which autoconf ]; + propagatedBuildInputs = [ bignums coquelicot flocq mathcomp-ssreflect mathcomp-fingroup ] ++ lib.optionals (lib.versions.isGe "4.2.0" defaultVersion) [ gnuplot_qt ]; useMelquiondRemake.logpath = "Interval"; mlPlugin = true; diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix index 4fceb7a2fd94..7839c42067b5 100644 --- a/pkgs/development/coq-modules/iris/default.nix +++ b/pkgs/development/coq-modules/iris/default.nix @@ -6,10 +6,12 @@ with lib; mkCoqDerivation rec { owner = "iris"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isEq "8.14"; out = "3.5.0"; } + { case = range "8.13" "8.15"; out = "3.6.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."3.6.0".sha256 = "sha256:02vbq597fjxd5znzxdb54wfp36412wz2d4yash4q8yddgl1kakmj"; release."3.5.0".sha256 = "0hh14m0anfcv65rxm982ps2vp95vk9fwrpv4br8bxd9vz0091d70"; release."3.4.0".sha256 = "0vdc2mdqn5jjd6yz028c0c6blzrvpl0c7apx6xas7ll60136slrb"; release."3.3.0".sha256 = "0az4gkp5m8sq0p73dlh0r7ckkzhk7zkg5bndw01bdsy5ywj0vilp"; diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix index 843a99de4be6..af535993362a 100644 --- a/pkgs/development/coq-modules/itauto/default.nix +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -13,7 +13,7 @@ mkCoqDerivation rec { ] null; mlPlugin = true; - extraBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); + extraNativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); enableParallelBuilding = false; meta = { diff --git a/pkgs/development/coq-modules/mathcomp-abel/default.nix b/pkgs/development/coq-modules/mathcomp-abel/default.nix index 2ada5ee1c91c..06cfd12b07eb 100644 --- a/pkgs/development/coq-modules/mathcomp-abel/default.nix +++ b/pkgs/development/coq-modules/mathcomp-abel/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib; with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.14") (range "1.12.0" "1.13.0") ]; out = "1.2.0"; } + { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.2.0"; } { cases = [ (range "8.10" "8.14") (range "1.11.0" "1.12.0") ]; out = "1.1.2"; } ] null; diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 5901fe2bb396..f842bc3b6dbe 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -8,6 +8,7 @@ let mca = mkCoqDerivation { pname = "analysis"; owner = "math-comp"; + release."0.3.13".sha256 = "sha256-Yaztew79KWRC933kGFOAUIIoqukaZOdNOdw4XszR1Hg="; release."0.3.10".sha256 = "sha256-FBH2c8QRibq5Ycw/ieB8mZl0fDiPrYdIzZ6W/A3pIhI="; release."0.3.9".sha256 = "sha256-uUU9diBwUqBrNRLiDc0kz0CGkwTZCUmigPwLbpDOeg4="; release."0.3.6".sha256 = "0g2j7b2hca4byz62ssgg90bkbc8wwp7xkb2d3225bbvihi92b4c5"; @@ -18,6 +19,7 @@ let mca = mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (isGe "8.13") (isGe "1.12.0") ]; out = "0.3.13"; } { cases = [ (range "8.11" "8.14") (isGe "1.12.0") ]; out = "0.3.10"; } { cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; } diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 6a72f73a01b8..744d5ea98514 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -7,7 +7,7 @@ with lib; mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.10") (range "1.11" "1.13") ]; out = "1.5.1"; } + { cases = [ (isGe "8.10") (isGe "1.11") ]; 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"; } { cases = [ (range "8.7" "8.11.0") (range "1.8" "1.10") ]; out = "1.4.0"; } diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index 0f0937d1e458..0364ad09578e 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -24,7 +24,14 @@ with lib; mkCoqDerivation { { cases = [ (isGe "8.7") "1.7.0" ]; out = "1.0.1"; } ] null; - propagatedBuildInputs = [ mathcomp.ssreflect mathcomp.field mathcomp-bigenough ]; + propagatedBuildInputs = [ + mathcomp.ssreflect + mathcomp.algebra + mathcomp.field + mathcomp.fingroup + mathcomp.solvable + mathcomp-bigenough + ]; meta = { description = "Mathematical Components Library on real closed fields"; diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index b7f613ccfcc1..9c74edd54712 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -14,10 +14,10 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.12" "8.14") (range "1.12" "1.13") ]; out = "1.0"; } + { cases = [ (range "8.12" "8.14") (isGe "1.12") ]; out = "1.0"; } ] null; - propagatedBuildInputs = [ mathcomp.algebra ]; + propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; meta = { description = "Yet Another Coq Library on Machine Words"; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index fd3f31d3fe0d..2e2593669f32 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }: +{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-ssreflect, mathcomp-fingroup, version ? null }: with lib; mkCoqDerivation rec { namePrefix = [ "coq" "mathcomp" ]; @@ -9,13 +9,13 @@ with lib; mkCoqDerivation rec { defaultVersion = with versions; switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (range "8.13" "8.14") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; } + { cases = [ (range "8.13" "8.15") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; } ] null; release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k"; release."1.1.0+1.12+8.13".sha256 = "1plf4v6q5j7wvmd5gsqlpiy0vwlw6hy5daq2x42gqny23w9mi2pr"; - propagatedBuildInputs = [ mathcomp-algebra ]; + propagatedBuildInputs = [ mathcomp-algebra mathcomp-ssreflect mathcomp-fingroup ]; meta = { description = "Micromega tactics for Mathematical Components"; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 562d1f949250..0f562fec287c 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -19,7 +19,8 @@ let owner = "math-comp"; withDoc = single && (args.withDoc or false); defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.14"; out = "1.13.0"; } + { case = isGe "8.11"; out = "1.14.0"; } + { case = range "8.11" "8.15"; out = "1.13.0"; } { case = range "8.10" "8.13"; out = "1.12.0"; } { case = range "8.7" "8.12"; out = "1.11.0"; } { case = range "8.7" "8.11"; out = "1.10.0"; } @@ -29,6 +30,7 @@ let { case = range "8.5" "8.7"; out = "1.6.4"; } ] null; release = { + "1.14.0".sha256 = "07yamlp1c0g5nahkd2gpfhammcca74ga2s6qr7a3wm6y6j5pivk9"; "1.13.0".sha256 = "0j4cz2y1r1aw79snkcf1pmicgzf8swbaf9ippz0vg99a572zqzri"; "1.12.0".sha256 = "1ccfny1vwgmdl91kz5xlmhq4wz078xm4z5wpd0jy5rn890dx03wp"; "1.11.0".sha256 = "06a71d196wd5k4wg7khwqb7j7ifr7garhwkd54s86i0j7d6nhl3c"; @@ -57,10 +59,9 @@ let derivation = mkCoqDerivation ({ inherit version pname defaultVersion release releaseRev repo owner; - nativeBuildInputs = optionals withDoc [ graphviz lua ]; mlPlugin = versions.isLe "8.6" coq.coq-version; - extraBuildInputs = [ ncurses which ]; - propagatedBuildInputs = mathcomp-deps; + extraNativeBuildInputs = [ which ] ++ optionals withDoc [ graphviz lua ]; + extraBuildInputs = [ ncurses ] ++ mathcomp-deps; buildFlags = optional withDoc "doc"; diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index c29669625a9d..8144d87b9fbf 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -9,7 +9,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.5.4"; } + { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.5.5"; } { cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; } { cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; } { cases = [ (range "8.7" "8.11") (range "1.8" "1.10") ]; out = "1.5.0"; } @@ -17,6 +17,7 @@ with lib; mkCoqDerivation { { cases = [ "8.6" (range "1.6" "1.7") ]; out = "1.1"; } ] null; release = { + "1.5.5".sha256 = "sha256-VdXA51vr7DZl/wT/15YYMywdD7Gh91dMP9t7ij47qNQ="; "1.5.4".sha256 = "0s4sbh4y88l125hdxahr56325hdhxxdmqmrz7vv8524llyv3fciq"; "1.5.3".sha256 = "1462x40y2qydjd2wcg8r6qr8cx3xv4ixzh2h8vp9h7arylkja1qd"; "1.5.2".sha256 = "15aspf3jfykp1xgsxf8knqkxv8aav2p39c2fyirw7pwsfbsv2c4s"; @@ -37,7 +38,7 @@ with lib; mkCoqDerivation { ''; propagatedBuildInputs = - [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp-bigenough ]; + [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp.fingroup mathcomp-bigenough ]; meta = { description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; diff --git a/pkgs/development/coq-modules/odd-order/default.nix b/pkgs/development/coq-modules/odd-order/default.nix index 912d523d3bf7..0d2005326c54 100644 --- a/pkgs/development/coq-modules/odd-order/default.nix +++ b/pkgs/development/coq-modules/odd-order/default.nix @@ -5,15 +5,26 @@ mkCoqDerivation { pname = "odd-order"; owner = "math-comp"; + release."1.13.0".rev = "mathcomp-odd-order.1.13.0"; + release."1.13.0".sha256 = "sha256-EzNKR/JzM8T17sMhPhgZNs14e50X4dY3OwFi133IsT0="; release."1.12.0".rev = "mathcomp-odd-order.1.12.0"; release."1.12.0".sha256 = "sha256-omsfdc294CxKAHNMMeqJCcVimvyRCHgxcQ4NJOWSfNM="; inherit version; defaultVersion = with versions; switch mathcomp.character.version [ + { case = (range "1.12.0" "1.14.0"); out = "1.13.0"; } { case = (range "1.10.0" "1.12.0"); out = "1.12.0"; } ] null; - propagatedBuildInputs = [ mathcomp.character ]; + propagatedBuildInputs = [ + mathcomp.character + mathcomp.ssreflect + mathcomp.fingroup + mathcomp.algebra + mathcomp.solvable + mathcomp.field + mathcomp.all + ]; meta = { description = "Formal proof of the Odd Order Theorem"; diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index d73d14c84a0c..7f65e6643c55 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -4,10 +4,11 @@ with lib; mkCoqDerivation { pname = "paramcoq"; inherit version; defaultVersion = with versions; switch coq.version [ - { case = range "8.10" "8.14"; out = "1.1.3+coq${coq.coq-version}"; } + { case = range "8.10" "8.15"; out = "1.1.3+coq${coq.coq-version}"; } { case = range "8.7" "8.13"; out = "1.1.2+coq${coq.coq-version}"; } ] null; displayVersion = { paramcoq = "..."; }; + release."1.1.3+coq8.15".sha256 = "0sl7ihznwz05d2x2v78w1zd4q55c1sgy06vxasbcls4v2pkw53hl"; release."1.1.3+coq8.14".sha256 = "00zqq9dc2p5v0ib1jgizl25xkwxrs9mrlylvy0zvb96dpridjc71"; release."1.1.3+coq8.13".sha256 = "06ndly736k4pmdn4baqa7fblp6lx7a9pxm9gvz1vzd6ic51825wp"; release."1.1.3+coq8.12".sha256 = "sha256:10j23ws8ymqpxhapni75sxbzz0dl4n9sgasrx618i7s7b705y2rh"; diff --git a/pkgs/development/coq-modules/semantics/default.nix b/pkgs/development/coq-modules/semantics/default.nix index 9b8bb10a5f26..89567d401b22 100644 --- a/pkgs/development/coq-modules/semantics/default.nix +++ b/pkgs/development/coq-modules/semantics/default.nix @@ -24,7 +24,8 @@ mkCoqDerivation rec { ] null; mlPlugin = true; - extraBuildInputs = (with coq.ocamlPackages; [ num ocamlbuild ]); + extraNativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); + extraBuildInputs = (with coq.ocamlPackages; [ num ]); postPatch = '' for p in Make Makefile.coq.local diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index 383151a1cb5e..b3bff95b5eaf 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -1,22 +1,9 @@ { lib, fetchzip, mkCoqDerivation, coq, version ? null }: let - ocamlPackages = - coq.ocamlPackages.overrideScope' - (self: super: { - ppxlib = super.ppxlib.override { version = "0.15.0"; }; - # the following does not work - ppx_sexp_conv = super.ppx_sexp_conv.overrideAttrs (_: { - src = fetchzip { - url = "https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.1.tar.gz"; - sha256 = "04bx5id99clrgvkg122nx03zig1m7igg75piphhyx04w33shgkz2"; - }; - }); - }); - release = { - "8.14.0+0.14.0".sha256 = "sha256:1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d"; - "8.14+rc1+0.14.0".sha256 = "1w7d7anvcfx8vz51mnrf1jkw6rlpzjkjlr06avf58wlhymww7pja"; + "8.15.0+0.15.0".sha256 = "1vh99ya2dq6a8xl2jrilgs0rpj4j227qx8zvzd2v5xylx0p4bbrp"; + "8.14.0+0.14.0".sha256 = "1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d"; "8.13.0+0.13.0".sha256 = "0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy"; "8.12.0+0.12.1".sha256 = "048x3sgcq4h845hi6hm4j4dsfca8zfj70dm42w68n63qcm6xf9hn"; "8.11.0+0.11.1".sha256 = "1phmh99yqv71vlwklqgfxiq2vj99zrzxmryj2j4qvg5vav3y3y6c"; @@ -29,9 +16,8 @@ in inherit version release; defaultVersion = with versions; - if isGe "4.12" coq.ocamlPackages.ocaml.version then null - else switch coq.version [ + { case = isEq "8.15"; out = "8.15.0+0.15.0"; } { case = isEq "8.14"; out = "8.14.0+0.14.0"; } { case = isEq "8.13"; out = "8.13.0+0.13.0"; } { case = isEq "8.12"; out = "8.12.0+0.12.1"; } @@ -42,7 +28,7 @@ in useDune2 = true; propagatedBuildInputs = - with ocamlPackages; [ + with coq.ocamlPackages; [ cmdliner findlib # run time dependency of SerAPI ppx_deriving @@ -70,9 +56,6 @@ in let inherit (o) version; in { src = fetchzip { url = - if version == "8.14+rc1+0.14.0" - then "https://github.com/ejgallego/coq-serapi/archive/refs/tags/8.14+rc1+0.14.0.tar.gz" - else "https://github.com/ejgallego/coq-serapi/releases/download/${version}/coq-serapi-${ if version == "8.11.0+0.11.1" then version else builtins.replaceStrings [ "+" ] [ "." ] version diff --git a/pkgs/development/coq-modules/simple-io/default.nix b/pkgs/development/coq-modules/simple-io/default.nix index 3631bdd54bf4..693ff2b01d6f 100644 --- a/pkgs/development/coq-modules/simple-io/default.nix +++ b/pkgs/development/coq-modules/simple-io/default.nix @@ -7,7 +7,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = if versions.range "8.7" "8.13" coq.coq-version then "1.3.0" else null; release."1.3.0".sha256 = "1yp7ca36jyl9kz35ghxig45x6cd0bny2bpmy058359p94wc617ax"; - extraBuildInputs = (with coq.ocamlPackages; [ ocaml ocamlbuild ]); + extraNativeBuildInputs = (with coq.ocamlPackages; [ ocaml ocamlbuild ]); propagatedBuildInputs = [ coq-ext-lib ]; doCheck = true; diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix index 097293d58161..3f6e20c5d7dd 100644 --- a/pkgs/development/coq-modules/stdpp/default.nix +++ b/pkgs/development/coq-modules/stdpp/default.nix @@ -6,10 +6,12 @@ with lib; mkCoqDerivation rec { domain = "gitlab.mpi-sws.org"; owner = "iris"; defaultVersion = with versions; switch coq.coq-version [ - { case = isEq "8.14"; out = "1.6.0"; } + { case = range "8.13" "8.15"; out = "1.7.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.7.0".sha256 = "sha256:0447wbzm23f9rl8byqf6vglasfn6c1wy6cxrrwagqjwsh3i5lx8y"; release."1.6.0".sha256 = "1l1w6srzydjg0h3f4krrfgvz455h56shyy2lbcnwdbzjkahibl7v"; release."1.5.0".sha256 = "1ym0fy620imah89p8b6rii8clx2vmnwcrbwxl3630h24k42092nf"; release."1.4.0".sha256 = "1m6c7ibwc99jd4cv14v3r327spnfvdf3x2mnq51f9rz99rffk68r"; diff --git a/pkgs/development/dotnet-modules/python-language-server/default.nix b/pkgs/development/dotnet-modules/python-language-server/default.nix index 420475806a0e..a433840b7bca 100644 --- a/pkgs/development/dotnet-modules/python-language-server/default.nix +++ b/pkgs/development/dotnet-modules/python-language-server/default.nix @@ -10,13 +10,13 @@ buildDotnetModule rec { pname = "python-language-server"; - version = "2021-09-08"; + version = "2022-02-18"; src = fetchFromGitHub { owner = "microsoft"; repo = "python-language-server"; - rev = "26ea18997f45f7d7bc5a3c5a9efc723a8dbb02fa"; - sha256 = "1m8pf9k20wy4fzv27v3bswvc8s01ag6ka2qm9nn6bgq0s0lq78mh"; + rev = "52c1afd34b5acb0b44597bb8681232876fe94084"; + sha256 = "05s8mwi3dqzjghgpr1mfs1b7cgrq818bbj1v7aly6axc8c2n4gny"; }; projectFile = "src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj"; diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix index 8fd4cf0a35ae..dc463c9fc4db 100644 --- a/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/pkgs/development/embedded/arduino/arduino-cli/default.nix @@ -4,18 +4,18 @@ let pkg = buildGoModule rec { pname = "arduino-cli"; - version = "0.18.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "arduino"; repo = pname; rev = version; - sha256 = "sha256-EtkONrP/uaetsdC47WsyQOE71Gsz0wKUiTiYThj8Kq8="; + sha256 = "sha256-q2uaJTfCcS/kv6xU5NjafzfcM3TixJlH5KzgEpLJKkQ="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-kPIhG6lsH+0IrYfdlzdv/X/cUQb22Xza9Q6ywjKae/4="; + vendorSha256 = "sha256-VWoKHIRQfs4dbsOzV3AQpqWsCPDm/rVKGMsc4xZvbhU="; doCheck = false; diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index 6b2c6203a392..71f3c884868b 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -79,33 +79,33 @@ let in stdenv.mkDerivation rec { pname = (if withTeensyduino then "teensyduino" else "arduino") + lib.optionalString (!withGui) "-core"; - version = "1.8.16"; + version = "1.8.19"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = version; - sha256 = "sha256-6d+y0Lgr+h0qYpCsa/ihvSMNuAdRMNQRuxZFpkWLDvg="; + sha256 = "sha256-I+PvfGc5F8H/NJOGRa18z7dKyKcO8I8Cg7Tj5yxkYAQ="; }; - teensyduino_version = "155"; + teensyduino_version = "156"; teensyduino_src = fetchurl { url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}"; sha256 = { - linux64 = "sha256-DypCbCm4RKYgnFJRwoHyPht6dFG48YvWM4RzEDdJE6U="; - linux32 = "sha256-MJ4xsTAZPO8BhO/VWSjBAjBVLrKM+3PNi1fiF8dsuVQ="; - linuxarm = "sha256-x5JdYflLThohos9RTAWt4XrzvksB7VWfXTKqgXZ1d6Q="; - linuxaarch64 = "sha256-N18nvavEMhvt2jOrdI+tsXtbWIdsj1n4aMVeaaBlcT4="; + linux64 = "sha256-4DbhmmYrx+rCBpDrYFaC0A88Qv9UEeNlQAkFi3zAstk="; + linux32 = "sha256-DlRPOtDxmMPv2Qzhib7vNZdKNZCxmm9YmVNnwUKXK/E="; + linuxarm = "sha256-d+DbpER/4lFPcPDFeMG5f3WaUGn8pFchdIDo7Hm0XWs="; + linuxaarch64 = "sha256-8keQzhWq7QlAGIbfHEe3lfxpJleMMvBORuPaNrLmM6Y="; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; # Used because teensyduino requires jars be a specific size arduino_dist_src = fetchurl { url = "https://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz"; sha256 = { - linux64 = "sha256-VK+Skl2xjqPWYEEKt1CCLwBZRxoyRfYQ3/60Byen9po="; - linux32 = "sha256-fjqV4avddmWAdFqMuUNUcDguxv3SI45m5QHFiWP8EKE="; - linuxarm = "sha256-Br8vUN7njI7VCH+ZvUh44l8LcgW+61+Q0x2AiXxIhTM="; - linuxaarch64 = "sha256-bOizBUUuyINg0/EqEatBq9lECT97JXxKbesCGyCA3YQ="; + linux64 = "sha256-62i93B0cASC+L8oTUKA+40Uxzzf1GEeyEhC25wVFvJs="; + linux32 = "sha256-wSxtx3BqXMQCeWQDK8PHkWLlQqQM1Csao8bIk98FrFg="; + linuxarm = "sha256-lJ/R1ePq7YtDk3bvloFcn8jswrJH+L63tvH5QpTqfXs="; + linuxaarch64 = "sha256-gm8cDjLKNfpcaeO7fw6Kyv1TnWV/ZmH4u++nun9X6jo="; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; diff --git a/pkgs/development/embedded/bossa/default.nix b/pkgs/development/embedded/bossa/default.nix index 4e35ff35f660..fbb1b4c1fd40 100644 --- a/pkgs/development/embedded/bossa/default.nix +++ b/pkgs/development/embedded/bossa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, wxGTK, libX11, readline }: +{ lib, stdenv, fetchFromGitHub, wxGTK, libX11, readline }: let # BOSSA needs a "bin2c" program to embed images. @@ -13,14 +13,15 @@ let }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "bossa"; version = "1.8"; - src = fetchgit { - url = "https://github.com/shumatech/BOSSA"; - rev = "3be622ca0aa6214a2fc51c1ec682c4a58a423d62"; - sha256 = "19ik86qbffcb04cgmi4mnascbkck4ynfj87ha65qdk6fmp5q35vm"; + src = fetchFromGitHub { + owner = "shumatech"; + repo = "BOSSA"; + rev = version; + sha256 = "sha256-dZeBy63OzIaLUfAg6awnk83FtLKVxPoYAYs5t7BBM6Y="; }; patches = [ ./bossa-no-applet-build.patch ]; diff --git a/pkgs/development/embedded/gputils/default.nix b/pkgs/development/embedded/gputils/default.nix index c07949e80968..69a901ea80f7 100644 --- a/pkgs/development/embedded/gputils/default.nix +++ b/pkgs/development/embedded/gputils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gputils"; - version = "1.5.0-1"; + version = "1.5.2"; src = fetchurl { url = "mirror://sourceforge/gputils/${pname}-${version}.tar.bz2"; - sha256 = "055v83fdgqljprapf7rmh8x66mr13fj0qypj49xba5spx0ca123g"; + sha256 = "sha256-j7iCCzHXwffHdhQcyzxPBvQK+RXaY3QSjXUtHu463fI="; }; meta = with lib; { diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index 31255aaca534..f19458fa84fb 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -9,54 +9,32 @@ let python = python3.override { packageOverrides = self: super: { - aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { - version = "0.8.0"; - src = fetchFromGitHub { - owner = "Tinche"; - repo = "aiofiles"; - rev = "v${version}"; - sha256 = "0mr9pzji4vqyf2yzh8yxz5q7fm8mgmkimx1xh49wh625m72pxcap"; - }; - }); - - asgiref = super.asgiref.overridePythonAttrs (oldAttrs: rec { - version = "3.4.1"; - src = fetchFromGitHub { - owner = "django"; - repo = "asgiref"; - rev = version; - sha256 = "0440321alpqb1cdsmfzmiiy8rpq0ic0wvraalzk39cgrl7mghw39"; - }; - }); - - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "8.0.3"; - src = fetchFromGitHub { - owner = "pallets"; - repo = "click"; - rev = version; - sha256 = "0pxvxgfhqjgsjbgfnilqjki1l24r0rdfd98cl77i71yqdd2f497g"; + semantic-version = super.semantic-version.overridePythonAttrs (oldAttrs: rec { + version = "2.9.0"; + src = fetchPypi { + pname = "semantic_version"; + version = version; + sha256 = "1chjd8019wnwb5mnd4x4jw9f8nhzg0xnapsdznk0fpiyamrlixdb"; }; }); starlette = super.starlette.overridePythonAttrs (oldAttrs: rec { - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "encode"; repo = "starlette"; rev = version; - sha256 = "1g76qpvqzivmwll5ir4bf45jx5kilnkadvy6b7qjisvr402i3qmw"; + sha256 = "1dpj33cggjjvpd3qdf6hv04z5ckcn9f5dfn98p5a8hx262kgsr9p"; }; - disabledTestPaths = []; }); uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec { - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "encode"; repo = "uvicorn"; rev = version; - sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s"; + sha256 = "142x8skb1yfys6gndfaay2r240j56dkr006p49pw4y9i0v85kynp"; }; }); }; @@ -80,6 +58,7 @@ with python.pkgs; buildPythonApplication rec { pyserial requests semantic-version + spdx-license-list-data.json starlette tabulate uvicorn @@ -171,7 +150,7 @@ with python.pkgs; buildPythonApplication rec { postPatch = '' substitute platformio/package/manifest/schema.py platformio/package/manifest/schema.py \ - --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data}' + --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data.json}' substituteInPlace setup.py \ --replace "zeroconf==0.37.*" "zeroconf" @@ -180,7 +159,7 @@ with python.pkgs; buildPythonApplication rec { meta = with lib; { broken = stdenv.isAarch64; description = "An open source ecosystem for IoT development"; - homepage = "http://platformio.org"; + homepage = "https://platformio.org"; license = licenses.asl20; maintainers = with maintainers; [ mog makefu ]; }; diff --git a/pkgs/development/embedded/platformio/default.nix b/pkgs/development/embedded/platformio/default.nix index 5bbc54916369..31b7b8d49518 100644 --- a/pkgs/development/embedded/platformio/default.nix +++ b/pkgs/development/embedded/platformio/default.nix @@ -4,14 +4,14 @@ let callPackage = newScope self; - version = "5.2.4"; + version = "5.2.5"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "1dhyxrdxrca669qm6alxxn2jmvcwlpqrx9kfwh4iqy9za5717ag9"; + sha256 = "1x1jqprwzpb09ca953rqbh2jvizh7bz8yj30krphb6007bnjilwy"; }; self = { diff --git a/pkgs/development/embedded/platformio/fix-searchpath.patch b/pkgs/development/embedded/platformio/fix-searchpath.patch index 46e84d15a82f..fe7f9f127a7a 100644 --- a/pkgs/development/embedded/platformio/fix-searchpath.patch +++ b/pkgs/development/embedded/platformio/fix-searchpath.patch @@ -2,7 +2,7 @@ diff --git a/platformio/proc.py b/platformio/proc.py index 80e50201..15cee5a5 100644 --- a/platformio/proc.py +++ b/platformio/proc.py -@@ -167,7 +167,7 @@ def copy_pythonpath_to_osenv(): +@@ -181,7 +181,7 @@ def copy_pythonpath_to_osenv(): conditions.append(isdir(join(p, "click")) or isdir(join(p, "platformio"))) if all(conditions): _PYTHONPATH.append(p) diff --git a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch index b56018902858..342fb120a0f7 100644 --- a/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch @@ -6,7 +6,7 @@ index 416dccfd..896c3649 100644 @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- version = "3.15" +- version = "3.16" - spdx_data_url = ( - "https://raw.githubusercontent.com/spdx/license-list-data/" - "v%s/json/licenses.json" % version diff --git a/pkgs/development/embedded/stm32/stm32cubemx/default.nix b/pkgs/development/embedded/stm32/stm32cubemx/default.nix index 9652a95ee27f..e6ead8dd3723 100644 --- a/pkgs/development/embedded/stm32/stm32cubemx/default.nix +++ b/pkgs/development/embedded/stm32/stm32cubemx/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "stm32cubemx"; - version = "6.4.0"; + version = "6.5.0"; src = fetchzip { url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${builtins.replaceStrings ["."] [""] version}-lin.zip"; - sha256 = "sha256-5qotjAyaNFtYUjHlNKwywmBJGAzS/IM9bF+dmONE4bk="; + sha256 = "sha256-19RG+bJCmkaytMtDpDLbDvfKo27Z+Mo/sOrs8lOVV44="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { name = "stm32CubeMX"; exec = "stm32cubemx"; desktopName = "STM32CubeMX"; - categories = "Development;"; + categories = [ "Development" ]; comment = "STM32Cube initialization code generator"; icon = "stm32cubemx"; }) diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix index 027cfde2669a..23bab058c594 100644 --- a/pkgs/development/embedded/tytools/default.nix +++ b/pkgs/development/embedded/tytools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tytools"; - version = "0.9.3"; + version = "0.9.7"; src = fetchFromGitHub { owner = "Koromix"; repo = pname; rev = "v${version}"; - sha256 = "0ax6j17f5nm0q4sp8sg1412hd48qp7whdy7dd699kwjcm763bl5j"; + sha256 = "sha256-iF2XyWSBBCO23iY/ni+QlpgtOuWKN2JTMTz+9OLEadk="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix deleted file mode 100644 index ead08ce0231b..000000000000 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, stdenv -, fetchurl -, gconf -, glib -, gnome_vfs -, gtk2 -, guile -, guile-cairo -, guile-lib -, gwrap -, libglade -, libgnome -, libgnomecanvas -, libgnomeui -, pango -, pkg-config -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "guile-gnome-platform"; - version = "2.16.4"; - - src = fetchurl { - url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-ravUjtWZPYUo/WBOCqDZatgaYdBtps3WgyNXKtbCFsM="; - }; - - nativeBuildInputs = [ - pkg-config - texinfo - ]; - buildInputs = [ - gconf - glib - gnome_vfs - gtk2 - guile - guile-cairo - gwrap - libglade - libgnome - libgnomecanvas - libgnomeui - pango - ] ++ lib.optional doCheck guile-lib; - - # The test suite tries to open an X display, which fails. - doCheck = false; - - makeFlags = [ - "GUILE_AUTO_COMPILE=0" - ]; - - meta = with lib; { - homepage = "https://www.gnu.org/software/guile-gnome/"; - description = "GNOME bindings for GNU Guile"; - longDescription = '' - GNU guile-gnome brings the power of Scheme to your graphical application. - guile-gnome modules support the entire Gnome library stack: from Pango to - GnomeCanvas, GTK to GStreamer, Glade to GtkSourceView, you will find in - guile-gnome a comprehensive environment for developing modern - applications. - ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/guile-modules/guile-json/default.nix b/pkgs/development/guile-modules/guile-json/default.nix index 5433bbb1aa64..1ca6c21c97c8 100644 --- a/pkgs/development/guile-modules/guile-json/default.nix +++ b/pkgs/development/guile-modules/guile-json/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "guile-json"; - version = "4.5.2"; + version = "4.7.0"; src = fetchurl { url = "mirror://savannah/guile-json/${pname}-${version}.tar.gz"; - sha256 = "GrBG7DaxxEwEGsJ1Vo2Bh4TXH6uaXZX5Eoz+iiUFGTM="; + sha256 = "sha256-q70TV3qUUULrkZrpDGosqFZ4STO/9VgQ7l+LM7NBU5c="; }; postConfigure = '' diff --git a/pkgs/development/guile-modules/guile-ssh/default.nix b/pkgs/development/guile-modules/guile-ssh/default.nix index b7e742384df6..2ed949ee45ce 100644 --- a/pkgs/development/guile-modules/guile-ssh/default.nix +++ b/pkgs/development/guile-modules/guile-ssh/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "guile-ssh"; - version = "0.13.1"; + version = "0.15.1"; src = fetchFromGitHub { owner = "artyom-poptsov"; repo = pname; rev = "v${version}"; - sha256 = "LzTR1QuK3mle0Q6a4YRn9ZTkcs1sygYKoezxI9+e/fY="; + sha256 = "sha256-+BhyaBieqMwTgsSLci3HJdCrNQmfPN/jK2Od5DQs9n8="; }; configureFlags = [ "--with-guilesitedir=\${out}/share/guile/site" ]; diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index 72066313ecaa..ba66635be50c 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , guile , pkg-config , texinfo @@ -10,9 +10,11 @@ stdenv.mkDerivation rec { pname = "guile-xcb"; version = "1.3"; - src = fetchurl { - url = "http://www.markwitmer.com/dist/${pname}-${version}.tar.gz"; - hash = "sha256-iYR6AYSTgUsURAEJTWcdHlc0f8LzEftAIsfonBteuxE="; + src = fetchFromGitHub { + owner = "mwitmer"; + repo = pname; + rev = version; + hash = "sha256-8iaYil2wiqnu9p7Gj93GE5akta1A0zqyApRwHct5RSs="; }; nativeBuildInputs = [ @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html"; + homepage = "https://github.com/mwitmer/guile-xcb"; description = "XCB bindings for Guile"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index 9e95e0bdad2a..2ea0f56634b8 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -96,6 +96,9 @@ self: super: { hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin; hls-module-name-plugin = dontCheck super.hls-module-name-plugin; hls-brittany-plugin = dontCheck super.hls-brittany-plugin; + hls-qualify-imported-names-plugin = dontCheck super.hls-qualify-imported-names-plugin; + hls-class-plugin = dontCheck super.hls-class-plugin; + hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin; # Similar RTS issue in test suite: # rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed. diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ddc9f47c0453..25b80f8c25d5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -54,15 +54,21 @@ self: super: { # There's an open PR updating the lower bound for `network`: # > https://github.com/abhinav/pinch/pull/46 # With that said version tracked for `network` right now is 3.1.1.1 so we're - # replacing the network pinch uses with `network_3_1_2_5` for now. + # replacing the network pinch uses with `network_3_1_2_7` for now. pinch = super.pinch.overrideScope (self : super: { - network = self.network_3_1_2_5; + network = self.network_3_1_2_7; }); # We can remove this once fakedata version gets to 1.0.1 as the test suite # works fine there. fakedata = dontCheck super.fakedata; + # The latest release on hackage has an upper bound on containers which + # breaks the build, though it works with the version of containers present + # and the upper bound doesn't exist in code anymore: + # > https://github.com/roelvandijk/numerals + numerals = doJailbreak (dontCheck super.numerals); + # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; @@ -77,7 +83,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 = "14zzs4j9dpc6rdnna80m0vi7s1awlz0mrmwfh8l4zvglx75avpw5"; + sha256 = "11idvicisp4wnw15lk7f9fs0kqpssngs1j8f98050f3jrqsccj0j"; # 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 @@ -86,6 +92,12 @@ self: super: { rm -r $out/doc/?ndroid* ''; }; + + # Git annex provides a restricted login shell. Setting + # passthru.shellPath here allows a user's login shell to be set to + # `git-annex-shell` by making `shell = haskellPackages.git-annex`. + # https://git-annex.branchable.com/git-annex-shell/ + passthru.shellPath = "/bin/git-annex-shell"; }) super.git-annex; # Fix test trying to access /home directory @@ -307,7 +319,6 @@ self: super: { network-dbus = dontCheck super.network-dbus; notcpp = dontCheck super.notcpp; ntp-control = dontCheck super.ntp-control; - numerals = dontCheck super.numerals; odpic-raw = dontCheck super.odpic-raw; # needs a running oracle database server opaleye = dontCheck super.opaleye; openpgp = dontCheck super.openpgp; @@ -848,9 +859,8 @@ self: super: { (pkgs.fetchpatch { name = "hledger-properly-escape-quotes-csv.patch"; url = "https://github.com/simonmichael/hledger/commit/c9a72e1615e2ddc2824f2e248456e1042eb31e1d.patch"; - sha256 = "10knvrd5bl9nrmi27i0pm82sfr64jy04xgbjp228qywyijpr3pqv"; - includes = [ "Hledger/Read/CsvReader.hs" ]; - stripLen = 1; + relative = "hledger-lib"; + sha256 = "sha256-gjYYo0eq1gWNAAFF3dKt9QDq0VpLnN5/648r/NXEPVE="; }) super.hledger-lib; @@ -1263,13 +1273,6 @@ self: super: { # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 reflex-dom-core = doDistribute (unmarkBroken (dontCheck (doJailbreak super.reflex-dom-core))); - # add unreleased commit fixing version constraint as a patch - # Can be removed if https://github.com/lpeterse/haskell-utc/issues/8 is resolved - utc = appendPatch (pkgs.fetchpatch { - url = "https://github.com/lpeterse/haskell-utc/commit/e4502c08591e80d411129bb7c0414539f6302aaf.diff"; - sha256 = "0v6kv1d4syjzgzc2s7a76c6k4vminlcq62n7jg3nn9xd00gwmmv7"; - }) super.utc; - # Tests disabled because they assume to run in the whole jsaddle repo and not the hackage tarbal of jsaddle-warp. jsaddle-warp = dontCheck super.jsaddle-warp; @@ -1454,10 +1457,6 @@ self: super: { # https://github.com/haskell/haskell-language-server/issues/2375 hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin; - # 2021-11-23: Too strict bounds on ghcide, pending new release - hls-rename-plugin = assert super.hls-rename-plugin.version == "1.0.0.0"; - doJailbreak super.hls-rename-plugin; - # 2021-03-21: Test hangs # https://github.com/haskell/haskell-language-server/issues/1562 # 2021-11-13: Too strict upper bound on implicit-hie-cradle @@ -1524,10 +1523,7 @@ self: super: { # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129 servant-swagger = dontCheck super.servant-swagger; - # substituteInPlace: https://github.com/hercules-ci/hercules-ci-agent/issues/363 - hercules-ci-agent = overrideCabal { preConfigure = '' - substituteInPlace hercules-ci-agent/Hercules/Agent/Cachix/Init.hs --replace "Cachix.Client.Env" "Cachix.Client.Version" - ''; } (generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent); + hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent; hercules-ci-cli = pkgs.lib.pipe super.hercules-ci-cli [ unmarkBroken @@ -1822,10 +1818,8 @@ self: super: { # Presumably to be removed at the next release yi-language = appendPatch (pkgs.fetchpatch { url = "https://github.com/yi-editor/yi/commit/0d3bcb5ba4c237d57ce33a3dc39b63c56d890765.patch"; - sha256 = "0r4mzngs0x1akqpajzx7ssa9rax977fvj5ra8d3grfbpx6z0nm01"; - includes = [ "yi-language.cabal" ]; - stripLen = 2; - extraPrefix = ""; + relative = "yi-language"; + sha256 = "sha256-AVQLvul3ufxGQyoXud05qauclNanf6kunip0oJ/9lWQ="; }) super.yi-language; # https://github.com/ghcjs/jsaddle/issues/123 @@ -2041,13 +2035,13 @@ self: super: { # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. streamly-posix = doJailbreak super.streamly-posix; - # 2021-09-13: hls 1.3 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1) + # 2021-09-13: hls 1.6 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1) # (hls is nearly the only consumer, but consists of 18 packages, so we bump lsp globally.) - lsp = doDistribute self.lsp_1_2_0_1; - lsp-types = doDistribute self.lsp-types_1_3_0_1; + lsp = doDistribute self.lsp_1_4_0_0; + lsp-types = doDistribute self.lsp-types_1_4_0_1; # Not running the "example" test because it requires a binary from lsps test # suite which is not part of the output of lsp. - lsp-test = doDistribute (overrideCabal (old: { testTarget = "tests func-test"; }) self.lsp-test_0_14_0_1); + lsp-test = doDistribute (overrideCabal (old: { testTarget = "tests func-test"; }) self.lsp-test_0_14_0_2); # 2021-09-14: Tests are flaky. hls-splice-plugin = dontCheck super.hls-splice-plugin; @@ -2065,11 +2059,11 @@ self: super: { # Needs network >= 3.1.2 quic = super.quic.overrideScope (self: super: { - network = self.network_3_1_2_5; + network = self.network_3_1_2_7; }); http3 = super.http3.overrideScope (self: super: { - network = self.network_3_1_2_5; + network = self.network_3_1_2_7; }); # Fixes https://github.com/NixOS/nixpkgs/issues/140613 @@ -2104,7 +2098,7 @@ self: super: { # Needs brick > 0.64 nix-tree = super.nix-tree.override { - brick = self.brick_0_66; + brick = self.brick_0_67; }; # build newer version for `pkgs.shellcheck` diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 558e43469dca..30a12b35e5b7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -60,6 +60,7 @@ self: super: { lukko = doJailbreak super.lukko; parallel = doJailbreak super.parallel; primitive = doJailbreak (dontCheck super.primitive); + primitive-extras = doDistribute (self.primitive-extras_0_10_1_4); regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; @@ -71,8 +72,8 @@ self: super: { vector-th-unbox = doJailbreak super.vector-th-unbox; zlib = doJailbreak super.zlib; weeder = self.weeder_2_3_0; - generic-lens-core = self.generic-lens-core_2_2_0_0; - generic-lens = self.generic-lens_2_2_0_0; + generic-lens-core = self.generic-lens-core_2_2_1_0; + generic-lens = self.generic-lens_2_2_1_0; th-desugar = self.th-desugar_1_13; # 2021-11-08: Fixed in autoapply-0.4.2 autoapply = doJailbreak self.autoapply_0_4_1_1; @@ -83,13 +84,9 @@ self: super: { }); # Upstream also disables test for GHC 9: https://github.com/kcsongor/generic-lens/pull/130 - generic-lens_2_2_0_0 = dontCheck super.generic-lens_2_2_0_0; + generic-lens_2_2_1_0 = dontCheck super.generic-lens_2_2_1_0; # Apply patches from head.hackage. - alex = appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch"; - sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4"; - }) (dontCheck super.alex); doctest = dontCheck (doJailbreak super.doctest_0_18_2); language-haskell-extract = appendPatch (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch"; @@ -149,23 +146,14 @@ self: super: { # Fixes a bug triggered on GHC 9.0.1 text-short = self.text-short_0_1_5; - # 2021-09-18: The following plugins don‘t work yet on ghc9. - haskell-language-server = appendConfigureFlags [ - "-f-tactic" - "-f-splice" - "-f-refineimports" - "-f-class" + fourmolu = doJailbreak self.fourmolu_0_4_0_0; - "-f-fourmolu" + # 2022-02-05: The following plugins don‘t work yet on ghc9. + # Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html + haskell-language-server = appendConfigureFlags [ "-f-brittany" "-f-stylishhaskell" ] (super.haskell-language-server.override { - hls-tactics-plugin = null; # No upstream support, generic-lens-core fail - hls-splice-plugin = null; # No upstream support in hls 1.4.0, should be fixed in 1.5 - hls-refine-imports-plugin = null; # same issue es splice-plugin - hls-class-plugin = null; # No upstream support - - hls-fourmolu-plugin = null; # No upstream support, needs new fourmolu release hls-stylish-haskell-plugin = null; # No upstream support hls-brittany-plugin = null; # Dependencies don't build with 9.0.1 }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 5c388504bcc9..49bfd64324a9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -112,6 +112,7 @@ self: super: { libraryHaskellDepends = [ self.fail self.ordered-containers + self.data-default ] ++ drv.libraryHaskellDepends or []; }) super.ghc-exactprint; ghc-lib = self.ghc-lib_9_2_1_20220109; @@ -127,7 +128,7 @@ self: super: { indexed-traversable-instances = doJailbreak super.indexed-traversable-instances; lifted-async = doJailbreak super.lifted-async; lukko = doJailbreak super.lukko; - network = super.network_3_1_2_5; + network = super.network_3_1_2_7; ormolu = self.ormolu_0_4_0_0; OneTuple = super.OneTuple_0_3_1; parallel = doJailbreak super.parallel; @@ -137,7 +138,7 @@ self: super: { quickcheck-instances = super.quickcheck-instances_0_3_27; regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; - retrie = doDistribute self.retrie_1_2_0_1; + retrie = doDistribute (dontCheck self.retrie_1_2_0_1); semialign = super.semialign_1_2_0_1; singleton-bool = doJailbreak super.singleton-bool; scientific = doJailbreak super.scientific; @@ -188,11 +189,6 @@ self: super: { sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv"; }) (doJailbreak super.language-haskell-extract); - haskell-src-meta = appendPatch (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/haskell-src-meta-0.8.7.patch"; - sha256 = "013k8hpxac226j47cdzgdf9a1j91kmm0cvv7n8zwlajbj3y9bzjp"; - }) (doJailbreak super.haskell-src-meta); - # Tests depend on `parseTime` which is no longer available hourglass = dontCheck super.hourglass; @@ -245,4 +241,37 @@ self: super: { # need bytestring >= 0.11 which is only bundled with GHC >= 9.2 regex-rure = doDistribute (markUnbroken super.regex-rure); jacinda = doDistribute super.jacinda; + some = doJailbreak super.some; + fourmolu = super.fourmolu_0_5_0_1; + implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; + lucid = doJailbreak super.lucid; + hashtables = doJailbreak super.hashtables; + primitive-extras = super.primitive-extras_0_10_1_4; + hiedb = doJailbreak super.hiedb; + + # 2022-02-05: The following plugins don‘t work yet on ghc9.2. + # Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html + haskell-language-server = appendConfigureFlags [ + "-f-alternateNumberFormat" + "-f-class" + "-f-eval" + "-f-haddockComments" + "-f-hlint" + "-f-retrie" + "-f-splice" + "-f-tactics" + "-f-brittany" + "-f-stylish-haskell" + ] (super.haskell-language-server.override { + hls-alternate-number-format-plugin = null; + hls-class-plugin = null; + hls-eval-plugin = null; + hls-haddock-comments-plugin = null; + hls-hlint-plugin = null; + hls-retrie-plugin = null; + hls-splice-plugin = null; + hls-tactics-plugin = null; + hls-brittany-plugin = null; + hls-stylish-haskell-plugin = null; + }); } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index afc2a63bffae..09ce57fe1d34 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -201,6 +201,7 @@ broken-packages: - arrow-list - arrowp - arrowp-qq + - arrow-utils - ArrowVHDL - artery - artifact @@ -413,6 +414,7 @@ broken-packages: - bkr - blakesum - blas + - blatex - blaze-html-contrib - blaze-html-hexpat - blaze-html-truncate @@ -829,8 +831,8 @@ broken-packages: - ContextAlgebra - context-free-grammar - context-stack - - contiguous - contiguous-checked + - contiguous-fft - continue - Contract - control-iso @@ -985,7 +987,6 @@ broken-packages: - data-validation - data-variant - DataVersion - - dates - datetime - datetime-sb - dawdle @@ -1004,6 +1005,7 @@ broken-packages: - dclabel - dclabel-eci11 - dcpu16 + - ddate - ddc-base - ddc-code - dead-code-detection @@ -1087,6 +1089,7 @@ broken-packages: - DigitalOcean - digitalocean-kzs - digits + - dijkstra-simple - DimensionalHash - dimensional-tf - diophantine @@ -1118,6 +1121,7 @@ broken-packages: - dmcc - dmenu - dnscache + - dns-patterns - dnsrbl - dnssd - dobutok @@ -1132,6 +1136,7 @@ broken-packages: - doctest-discover-configurator - doctest-parallel - doctest-prop + - docusign-base - docusign-example - docvim - doi @@ -1981,7 +1986,6 @@ broken-packages: - haskell-mpi - haskell-names - haskell-neo4j-client - - HaskellNet-SSL - HaskellNN - Haskelloids - haskell-openflow @@ -2032,6 +2036,7 @@ broken-packages: - hasql-dynamic-statements - hasql-generic - hasql-simple + - hasql-transaction-io - hastache - haste - haste-prim @@ -2246,6 +2251,7 @@ broken-packages: - hobbes - hocilib - hocker + - hocon - hodatime - HODE - hoe @@ -2375,6 +2381,7 @@ broken-packages: - hsns - hsnsq - hsntp + - hs-opentelemetry-instrumentation-persistent - hsoptions - hsoz - hsparql @@ -2598,6 +2605,7 @@ broken-packages: - introduction - intro-prelude - invert + - invertible - invertible-syntax - io-capture - io-choice @@ -2723,6 +2731,7 @@ broken-packages: - katydid - kawaii - kawhi + - kazura-queue - kdesrc-build-extra - kd-tree - keccak @@ -2741,6 +2750,7 @@ broken-packages: - kmp-dfa - koellner-phonetic - koji-install + - koneko - Konf - kontra-config - kparams @@ -2995,6 +3005,7 @@ broken-packages: - lye - lz4-frame-conduit - lzip + - lzlib - lzma-streams - lzo - maam @@ -3306,6 +3317,7 @@ broken-packages: - nanomsg - nanomsg-haskell - nanoparsec + - nanopass - NanoProlog - nanovg-simple - nanq @@ -3429,7 +3441,6 @@ broken-packages: - numbered-semigroups - NumberSieves - NumberTheory - - numerals - numerals-base - numeric-qq - numeric-ranges @@ -3691,7 +3702,6 @@ broken-packages: - persistent-discover - persistent-documentation - persistent-equivalence - - persistent-migration - persistent-mongoDB - persistent-mysql-haskell - persistent-odbc @@ -3890,6 +3900,7 @@ broken-packages: - PrimitiveArray-Pretty - primitive-atomic - primitive-checked + - primitive-containers - primitive-convenience - primitive-foreign - primitive-indexed @@ -3903,6 +3914,7 @@ broken-packages: - prints - PriorityChansConverger - priority-queue + - pro-abstract - probable - process-conduit - processing @@ -4195,6 +4207,7 @@ broken-packages: - riemann - riff - ring-buffer + - ring-buffers - riscv-isa - Ritt-Wu - rivers @@ -4806,6 +4819,7 @@ broken-packages: - SybWidget - syb-with-class-instances-text - sydtest-aeson + - sydtest-hedgehog - sydtest-hedis - sydtest-hspec - sydtest-mongo @@ -5030,6 +5044,7 @@ broken-packages: - tkyprof - tmp-proc-example - todo + - todos - tofromxml - to-haskell - toilet @@ -5182,7 +5197,6 @@ broken-packages: - unfix-binders - unfoldable - unicode-prelude - - unicode-show - unicode-symbols - unicode-tricks - uniform-fileio @@ -5235,6 +5249,7 @@ broken-packages: - urxml - users-mysql-haskell - users-persistent + - utc - utf - utf8-prelude - utf8-validator @@ -5286,6 +5301,7 @@ broken-packages: - vector-space-points - vector-static - Vec-Transform + - velma - Verba - verbalexpressions - verdict @@ -5376,8 +5392,10 @@ broken-packages: - wavefront-obj - weak-bag - weather-api + - web3-polkadot - webapi - webapp + - webauthn - WebBits - webby - webcloud @@ -5418,6 +5436,7 @@ broken-packages: - windowslive - winerror - Wired + - wireguard-hs - wires - wiring - witty @@ -5541,6 +5560,7 @@ broken-packages: - yeshql-postgresql-simple - yesod-angular - yesod-angular-ui + - yesod-articles - yesod-auth-account - yesod-auth-account-fork - yesod-auth-bcrypt diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 72c6cebb7bb4..2ecfb76784d5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -82,8 +82,6 @@ default-package-overrides: - reflex-dom-pandoc < 1.0.0.0 # 2021-09-07: pin to our current GHC version - ghc-api-compat == 8.10.7 - # 2021-09-14: Pin hiedb to version needed by ghcide - - hiedb == 0.4.0.* # 2021-10-13: weeder 2.3.0 require GHC == 9.0.*; remove pin when GHC version changes - weeder < 2.3.0 # 2021-10-10: taskwarrior 0.4 requires aeson > 2.0.1.0 @@ -136,6 +134,8 @@ default-package-overrides: # On the recommendation of hnix author: # https://github.com/NixOS/nixpkgs/pull/154461#issuecomment-1015511883 - hnix < 0.15 + # needs http-client >= 0.7.11 which isn't part of Stackage LTS 18 + - http-client-restricted < 0.0.5 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. @@ -169,10 +169,8 @@ extra-packages: - brick == 0.64.* # 2021-12-03: matterhorn depends on brick < 0.65 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - ormolu == 0.3.* # 2021-12-03: for HLS with GHC 9.0.2 - # 2022-01-08 hls-plugin-api 1.2.0.2 needs lsp < 1.3, but newer than stackage - - lsp < 1.3 - - lsp-types < 1.4 - - lsp-test < 0.14.0.2 + - fourmolu == 0.4.* # 2022-02-05: for HLS with GHC 9.0.2 + - ghc-exactprint == 1.4.* # 2022-02-07: preserve for now, 1.5.0 has a breaking change without type changes package-maintainers: abbradar: @@ -607,7 +605,6 @@ dont-distribute-packages: - dialog - ghcjs-dom-webkit - gi-webkit - - hs-mesos - hsqml - hsqml-datamodel - hsqml-demo-manic @@ -630,3 +627,6 @@ dont-distribute-packages: # glade relies on system libglade which is deprecated - glade + + # mesos was removed from nixpkgs + - hs-mesos diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 5365abd0ad26..77be3013a48b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.22 +# Stackage LTS 18.25 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -38,7 +38,7 @@ default-package-overrides: - al ==0.1.4.2 - alarmclock ==0.7.0.5 - alerts ==0.1.2.0 - - alex ==3.2.6 + - alex ==3.2.7.1 - alex-meta ==0.3.0.13 - alg ==0.2.13.1 - algebraic-graphs ==0.5 @@ -139,7 +139,7 @@ default-package-overrides: - amazonka-waf ==1.6.1 - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - - amqp ==0.22.0 + - amqp ==0.22.1 - amqp-utils ==0.6.3.2 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.11.1 @@ -192,10 +192,10 @@ default-package-overrides: - attoparsec-expr ==0.1.1.2 - attoparsec-iso8601 ==1.0.2.0 - attoparsec-path ==0.0.0.1 - - audacity ==0.0.2 + - audacity ==0.0.2.1 - aur ==7.0.7 - aura ==3.2.5 - - authenticate ==1.3.5 + - authenticate ==1.3.5.1 - authenticate-oauth ==1.6.0.1 - autoexporter ==1.1.20 - auto-update ==0.1.6 @@ -280,6 +280,7 @@ default-package-overrides: - BNFC ==2.9.3 - BNFC-meta ==0.6.1 - board-games ==0.3 + - bodhi ==0.1.0 - boltzmann-samplers ==0.1.1.0 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 @@ -337,6 +338,7 @@ default-package-overrides: - cabal-flatpak ==0.1.0.2 - cabal-plan ==0.7.2.0 - cabal-rpm ==2.0.10 + - Cabal-syntax ==3.6.0.0 - cache ==0.1.3.0 - cached-json-file ==0.1.1 - cacophony ==0.10.1 @@ -396,16 +398,16 @@ default-package-overrides: - circle-packing ==0.1.0.6 - circular ==0.4.0.1 - citeproc ==0.4.0.1 - - clash-ghc ==1.4.6 - - clash-lib ==1.4.6 - - clash-prelude ==1.4.6 + - clash-ghc ==1.4.7 + - clash-lib ==1.4.7 + - clash-prelude ==1.4.7 - classy-prelude ==1.5.0.2 - classy-prelude-conduit ==1.5.0 - clay ==0.13.3 - clientsession ==0.9.1.2 - climb ==0.3.3 - Clipboard ==2.3.2.0 - - clock ==0.8.2 + - clock ==0.8.3 - closed ==0.2.0.1 - clumpiness ==0.17.0.2 - ClustalParser ==1.3.0 @@ -442,7 +444,7 @@ default-package-overrides: - concise ==0.1.0.1 - concurrency ==1.11.0.2 - concurrent-extra ==0.7.0.12 - - concurrent-output ==1.10.14 + - concurrent-output ==1.10.15 - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 @@ -466,7 +468,7 @@ default-package-overrides: - connection-pool ==0.2.2 - console-style ==0.0.2.1 - constraint ==0.1.4.0 - - constraints ==0.13.2 + - constraints ==0.13.3 - constraints-extras ==0.3.2.1 - constraint-tuples ==0.1.2 - construct ==0.3.0.2 @@ -478,6 +480,7 @@ default-package-overrides: - control-monad-omega ==0.3.2 - convertible ==1.1.1.0 - cookie ==0.4.5 + - copr-api ==0.1.0 - core-data ==0.2.1.11 - core-program ==0.2.12.0 - core-text ==0.3.5.0 @@ -490,7 +493,7 @@ default-package-overrides: - crackNum ==3.1 - crc32c ==0.0.0 - credential-store ==0.1.2 - - criterion ==1.5.12.0 + - criterion ==1.5.13.0 - criterion-measurement ==0.1.3.0 - cron ==0.7.0 - crypto-api ==0.13.3 @@ -579,7 +582,7 @@ default-package-overrides: - declarative ==0.5.4 - deepseq-generics ==0.2.0.0 - deepseq-instances ==0.1.0.1 - - deferred-folds ==0.9.18 + - deferred-folds ==0.9.18.1 - dejafu ==2.4.0.3 - dense-linear-algebra ==0.1.0.0 - dependent-map ==0.4.0.0 @@ -588,7 +591,7 @@ default-package-overrides: - depq ==0.4.2 - deque ==0.4.4 - deriveJsonNoPrefix ==0.1.0.1 - - derive-topdown ==0.0.2.2 + - derive-topdown ==0.0.3.0 - deriving-aeson ==0.2.8 - deriving-compat ==0.5.10 - derulo ==1.0.10 @@ -612,7 +615,7 @@ default-package-overrides: - discount ==0.1.1 - disk-free-space ==0.1.0.1 - distributed-closure ==0.4.2.0 - - distribution-opensuse ==1.1.1 + - distribution-opensuse ==1.1.3 - distributive ==0.6.2.1 - dlist ==1.0 - dlist-instances ==0.1.1.1 @@ -766,7 +769,7 @@ default-package-overrides: - filtrable ==0.1.4.0 - fin ==0.2 - FindBin ==0.0.5 - - fingertree ==0.1.4.2 + - fingertree ==0.1.5.0 - finite-typelits ==0.1.4.2 - first-class-families ==0.8.0.1 - first-class-patterns ==0.3.2.5 @@ -896,7 +899,7 @@ default-package-overrides: - ghc-parser ==0.2.3.0 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.9 - - ghc-source-gen ==0.4.2.0 + - ghc-source-gen ==0.4.3.0 - ghc-syntax-highlighter ==0.0.6.0 - ghc-tcplugins-extra ==0.4.2 - ghc-trace-events ==0.1.2.4 @@ -964,14 +967,14 @@ default-package-overrides: - guarded-allocation ==0.0.1 - H ==0.9.0.1 - hackage-db ==2.1.2 - - hackage-security ==0.6.0.1 + - hackage-security ==0.6.2.0 - haddock-library ==1.10.0 - hadoop-streaming ==0.2.0.3 - hakyll-convert ==0.3.0.4 - hal ==0.4.8 - half ==0.3.1 - hall-symbols ==0.1.0.6 - - hamtsolo ==1.0.3 + - hamtsolo ==1.0.4 - HandsomeSoup ==0.4.2 - hapistrano ==0.4.3.0 - happstack-server ==7.7.1.2 @@ -981,7 +984,7 @@ default-package-overrides: - hasbolt ==0.1.6.1 - hashable ==1.3.0.0 - hashable-time ==0.2.1 - - hashids ==1.0.2.4 + - hashids ==1.0.2.7 - hashing ==0.1.0.1 - hashmap ==1.3.3 - hashtables ==1.2.4.2 @@ -996,33 +999,33 @@ default-package-overrides: - haskell-lsp-types ==0.24.0.0 - haskell-names ==0.9.9 - HaskellNet ==0.6 - - haskell-src ==1.0.3.1 + - haskell-src ==1.0.4 - haskell-src-exts ==1.23.1 - haskell-src-exts-util ==0.2.5 - - haskell-src-meta ==0.8.7 + - haskell-src-meta ==0.8.9 - haskey-btree ==0.3.0.1 - hasktags ==0.72.0 - hasql ==1.4.5.3 - hasql-notifications ==0.2.0.0 - - hasql-optparse-applicative ==0.3.0.7 + - hasql-optparse-applicative ==0.3.0.8 - hasql-pool ==0.5.2.2 - hasql-queue ==1.2.0.2 - hasql-transaction ==1.0.1.1 - hasty-hamiltonian ==1.3.4 - - HaTeX ==3.22.3.0 + - HaTeX ==3.22.3.1 - HaXml ==1.25.8 - haxr ==3000.11.4.1 - HCodecs ==0.5.2 - hdaemonize ==0.5.6 - HDBC ==2.4.0.3 - HDBC-session ==0.1.2.0 - - headroom ==0.4.2.0 + - headroom ==0.4.3.0 - heap ==1.0.4 - heaps ==0.4 - hebrew-time ==0.1.2 - hedgehog ==1.0.5 - hedgehog-corpus ==0.2.0 - - hedgehog-fakedata ==0.0.1.4 + - hedgehog-fakedata ==0.0.1.5 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - hedis ==0.14.4 @@ -1069,7 +1072,7 @@ default-package-overrides: - hmm-lapack ==0.4 - hmpfr ==0.4.4 - hnock ==0.4.0 - - hoauth2 ==1.16.1 + - hoauth2 ==1.16.2 - hoogle ==5.0.18.3 - hOpenPGP ==2.9.7 - hopenpgp-tools ==0.23.6 @@ -1130,6 +1133,7 @@ default-package-overrides: - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 - hspec-tables ==0.0.1 + - hspec-tmp-proc ==0.5.0.1 - hspec-wai ==0.11.0 - hspec-wai-json ==0.11.0 - hs-php-session ==0.0.9.3 @@ -1164,13 +1168,13 @@ default-package-overrides: - http-media ==0.8.0.0 - http-query ==0.1.1 - http-reverse-proxy ==0.6.0 - - http-streams ==0.8.9.4 + - http-streams ==0.8.9.6 - http-types ==0.12.3 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.2.0 - HUnit-approx ==1.1.1.1 - hunit-dejafu ==2.0.0.5 - - hvect ==0.4.0.0 + - hvect ==0.4.0.1 - hvega ==0.11.0.1 - hw-balancedparens ==0.4.1.1 - hw-bits ==0.7.2.1 @@ -1292,7 +1296,7 @@ default-package-overrides: - java-adt ==0.2018.11.4 - jira-wiki-markup ==1.4.0 - jose ==0.8.4 - - jose-jwt ==0.9.2 + - jose-jwt ==0.9.3 - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 @@ -1321,8 +1325,8 @@ default-package-overrides: - keycode ==0.2.2 - keys ==3.12.3 - ki ==0.2.0.1 - - kind-apply ==0.3.2.0 - - kind-generics ==0.4.1.2 + - kind-apply ==0.3.2.1 + - kind-generics ==0.4.1.4 - kind-generics-th ==0.2.2.2 - kmeans ==0.1.3 - koji ==0.0.2 @@ -1335,7 +1339,7 @@ default-package-overrides: - lambdabot-core ==5.3.0.2 - LambdaHack ==0.10.3.0 - lame ==0.2.0 - - language-avro ==0.1.3.1 + - language-avro ==0.1.4.0 - language-bash ==0.9.2 - language-c ==0.9.0.1 - language-c-quote ==0.13 @@ -1349,7 +1353,7 @@ default-package-overrides: - lapack-carray ==0.0.3 - lapack-comfort-array ==0.0.1 - lapack-ffi ==0.0.3 - - lapack-ffi-tools ==0.1.2.1 + - lapack-ffi-tools ==0.1.3 - largeword ==1.2.5 - latex ==0.1.0.4 - lattices ==2.0.2 @@ -1470,7 +1474,7 @@ default-package-overrides: - mcmc-types ==1.0.3 - medea ==1.2.0 - median-stream ==0.7.0.0 - - med-module ==0.1.2.1 + - med-module ==0.1.2.2 - megaparsec ==9.0.1 - megaparsec-tests ==9.0.1 - membrain ==0.0.0.2 @@ -1512,8 +1516,6 @@ default-package-overrides: - mltool ==0.2.0.1 - mmap ==0.5.9 - mmark ==0.0.7.2 - - mmark-cli ==0.0.5.0 - - mmark-ext ==0.2.1.3 - mmorph ==1.1.5 - mnist-idx ==0.1.2.8 - mnist-idx-conduit ==0.4.0.0 @@ -1521,7 +1523,7 @@ default-package-overrides: - mock-time ==0.1.0 - mod ==0.1.2.2 - model ==0.5 - - modern-uri ==0.3.4.2 + - modern-uri ==0.3.4.3 - modular ==0.1.0.8 - monad-chronicle ==1.0.0.1 - monad-control ==1.0.3.1 @@ -1554,7 +1556,7 @@ default-package-overrides: - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - mongoDB ==2.7.1.1 - - monoid-subclasses ==1.1.2 + - monoid-subclasses ==1.1.3 - monoid-transformer ==0.0.4 - mono-traversable ==1.0.15.3 - mono-traversable-instances ==0.1.1.0 @@ -1577,7 +1579,7 @@ default-package-overrides: - multimap ==1.2.1 - multipart ==0.2.1 - multiset ==0.3.4.3 - - multistate ==0.8.0.3 + - multistate ==0.8.0.4 - murmur3 ==1.0.5 - murmur-hash ==0.1.0.10 - MusicBrainz ==0.4.1 @@ -1615,7 +1617,7 @@ default-package-overrides: - network-bsd ==2.8.1.0 - network-byte-order ==0.1.6 - network-conduit-tls ==1.3.2 - - network-info ==0.2.0.10 + - network-info ==0.2.1 - network-ip ==0.3.0.3 - network-messagepack-rpc ==0.1.2.0 - network-messagepack-rpc-websocket ==0.1.1.1 @@ -1644,9 +1646,9 @@ default-package-overrides: - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.3 - - nri-env-parser ==0.1.0.7 - - nri-observability ==0.1.1.3 - - nri-prelude ==0.6.0.5 + - nri-env-parser ==0.1.0.8 + - nri-observability ==0.1.1.4 + - nri-prelude ==0.6.0.6 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 @@ -1661,8 +1663,8 @@ default-package-overrides: - nvim-hs-ghcid ==2.0.0.0 - oauthenticated ==0.2.1.0 - ObjectName ==1.1.0.2 - - o-clock ==1.2.1 - - odbc ==0.2.5 + - o-clock ==1.2.1.1 + - odbc ==0.2.6 - oeis2 ==1.0.6 - ofx ==0.4.4.0 - old-locale ==1.0.0.7 @@ -1706,6 +1708,7 @@ default-package-overrides: - packdeps ==0.6.0.0 - pager ==0.1.1.0 - pagination ==0.2.2 + - pagure ==0.1.0 - pagure-cli ==0.2 - pandoc ==2.14.0.3 - pandoc-dhall-decoder ==0.1.0.1 @@ -1747,6 +1750,7 @@ default-package-overrides: - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.2 + - pdc ==0.1.1 - pdfinfo ==1.5.4 - peano ==0.1.0.1 - pem ==0.2.4 @@ -1757,15 +1761,15 @@ default-package-overrides: - persist ==0.1.1.5 - persistable-record ==0.6.0.5 - persistable-types-HDBC-pg ==0.0.3.5 - - persistent ==2.13.2.1 + - persistent ==2.13.3.0 - persistent-mtl ==0.2.2.0 - - persistent-mysql ==2.13.0.2 + - persistent-mysql ==2.13.1.0 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.13.2.1 - - persistent-qq ==2.12.0.1 - - persistent-sqlite ==2.13.0.3 + - persistent-postgresql ==2.13.4.0 + - persistent-qq ==2.12.0.2 + - persistent-sqlite ==2.13.1.0 - persistent-template ==2.12.0.0 - - persistent-test ==2.13.0.3 + - persistent-test ==2.13.1.0 - persistent-typed-db ==0.1.0.5 - pg-harness-client ==0.6.0 - pgp-wordlist ==0.1.0.3 @@ -1895,7 +1899,7 @@ default-package-overrides: - quickcheck-assertions ==0.3.0 - quickcheck-classes ==0.6.5.0 - quickcheck-classes-base ==0.6.2.0 - - quickcheck-higherorder ==0.1.0.0 + - quickcheck-higherorder ==0.1.0.1 - quickcheck-instances ==0.3.25.2 - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.1.1 @@ -1942,10 +1946,10 @@ default-package-overrides: - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - reanimate ==1.1.4.0 + - reanimate ==1.1.5.0 - reanimate-svg ==0.13.0.1 - rebase ==1.13.2 - - record-dot-preprocessor ==0.2.13 + - record-dot-preprocessor ==0.2.14 - record-hasfield ==1.0 - records-sop ==0.1.1.0 - record-wrangler ==0.1.1.0 @@ -2086,10 +2090,10 @@ default-package-overrides: - serf ==0.1.1.0 - serialise ==0.2.4.0 - servant ==0.18.3 - - servant-auth ==0.4.0.0 + - servant-auth ==0.4.1.0 - servant-auth-client ==0.4.1.0 - servant-auth-docs ==0.2.10.0 - - servant-auth-server ==0.4.6.0 + - servant-auth-server ==0.4.7.0 - servant-auth-swagger ==0.2.10.1 - servant-auth-wordpress ==1.0.0.2 - servant-blaze ==0.9.1 @@ -2111,7 +2115,7 @@ default-package-overrides: - servant-rawm ==1.0.0.0 - servant-server ==0.18.3 - servant-swagger ==1.1.10 - - servant-swagger-ui ==0.3.5.3.52.5 + - servant-swagger-ui ==0.3.5.4.5.0 - servant-swagger-ui-core ==0.3.5 - serverless-haskell ==0.12.6 - serversession ==1.0.2 @@ -2248,14 +2252,14 @@ default-package-overrides: - streaming ==0.2.3.1 - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.2.1 - - streaming-commons ==0.2.2.3 + - streaming-commons ==0.2.2.4 - streamly ==0.7.3 - streams ==3.3 - streamt ==0.5.0.0 - strict ==0.4.0.1 - strict-concurrency ==0.2.4.3 - strict-list ==0.1.6 - - strict-tuple ==0.1.4 + - strict-tuple ==0.1.5 - strict-tuple-lens ==0.1.0.1 - stringbuilder ==0.5.1 - string-class ==0.1.7.0 @@ -2264,7 +2268,7 @@ default-package-overrides: - string-conversions ==0.4.0.1 - string-interpolate ==0.3.1.1 - string-qq ==0.0.4 - - string-random ==0.1.4.1 + - string-random ==0.1.4.2 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 - stripe-concepts ==1.0.3.1 @@ -2429,13 +2433,14 @@ default-package-overrides: - tinylog ==0.15.0 - titlecase ==1.0.1 - tldr ==0.9.2 - - tls ==1.5.6 + - tls ==1.5.7 - tls-debug ==0.4.8 - tls-session-manager ==0.0.4 - tlynx ==0.5.1.1 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==1.34.1.0 + - tmp-proc ==0.5.0.1 - tomland ==1.3.2.0 - tonalude ==0.1.1.1 - topograph ==1.0.0.1 @@ -2461,7 +2466,7 @@ default-package-overrides: - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.23 + - turtle ==1.5.24 - typecheck-plugin-nat-simple ==0.1.0.2 - TypeCompose ==0.9.14 - typed-process ==0.2.8.0 @@ -2483,7 +2488,7 @@ default-package-overrides: - type-operators ==0.2.0.0 - typerep-map ==0.3.3.0 - type-spec ==0.4.0.0 - - tzdata ==0.2.20201021.0 + - tzdata ==0.2.20211021.0 - ua-parser ==0.7.6.0 - uglymemo ==0.1.0.1 - unagi-chan ==0.4.1.4 @@ -2522,7 +2527,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.6 - unix-compat ==0.5.4 - unix-time ==0.4.7 - - unliftio ==0.2.20 + - unliftio ==0.2.21.0 - unliftio-core ==0.2.0.1 - unliftio-pool ==0.2.1.1 - unliftio-streams ==0.1.1.1 @@ -2567,7 +2572,7 @@ default-package-overrides: - vector-buffer ==0.4.1 - vector-builder ==0.3.8.3 - vector-bytes-instances ==0.1.1 - - vector-circular ==0.1.3 + - vector-circular ==0.1.4 - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.1 @@ -2576,7 +2581,7 @@ default-package-overrides: - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.2 - verbosity ==0.4.0.0 - - versions ==5.0.1 + - versions ==5.0.2 - vformat ==0.14.1.0 - vformat-aeson ==0.1.0.1 - vformat-time ==0.1.0.0 @@ -2597,6 +2602,7 @@ default-package-overrides: - wai-middleware-auth ==0.2.5.1 - wai-middleware-caching ==0.1.0.2 - wai-middleware-clacks ==0.1.0.1 + - wai-middleware-delegate ==0.1.2.4 - wai-middleware-prometheus ==1.0.0.1 - wai-middleware-static ==0.9.1 - wai-rate-limit ==0.1.0.0 @@ -2607,7 +2613,7 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - - warp ==3.3.18 + - warp ==3.3.19 - warp-tls ==3.3.2 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 @@ -2653,10 +2659,10 @@ default-package-overrides: - X11 ==1.10.2 - X11-xft ==0.3.4 - x11-xim ==0.0.9.0 - - x509 ==1.7.5 - - x509-store ==1.6.7 - - x509-system ==1.6.6 - - x509-validation ==1.6.11 + - x509 ==1.7.6 + - x509-store ==1.6.9 + - x509-system ==1.6.7 + - x509-validation ==1.6.12 - Xauth ==0.1 - xdg-basedir ==0.2.2 - xdg-userdirs ==0.1.0.2 @@ -2684,11 +2690,11 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.7.0 - yamlparse-applicative ==0.2.0.1 - - yesod ==1.6.1.2 - - yesod-auth ==1.6.10.5 + - yesod ==1.6.2 + - yesod-auth ==1.6.11 - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.6.3.4 - - yesod-bin ==1.6.1 + - yesod-bin ==1.6.2 - yesod-core ==1.6.21.0 - yesod-fb ==0.6.1 - yesod-form ==1.7.0 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index a0b69748b21d..fc5ece3e0698 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -474,14 +474,12 @@ dont-distribute-packages: - atomic-primops-foreign - atp - attoparsec-enumerator - - attoparsec-ip - attoparsec-iteratee - attoparsec-text-enumerator - - attoparsec-uri - atuin - audiovisual - aura - - aura_3_2_6 + - aura_3_2_7 - authoring - autonix-deps-kf5 - avers @@ -527,6 +525,9 @@ dont-distribute-packages: - base64-bytes - baserock-schema - batchd + - batchd-core + - batchd-docker + - batchd-libvirt - batching - battlenet-yesod - battleships @@ -588,7 +589,6 @@ dont-distribute-packages: - bla - blakesum-demo - blastxml - - blatex - blaze-builder-enumerator - blaze-colonnade - blink1 @@ -637,7 +637,6 @@ dont-distribute-packages: - bv-sized-lens - bytehash - bytelog - - bytesmith - bytestring-read - c0check - cabal-bounds @@ -700,7 +699,6 @@ dont-distribute-packages: - chainweb-mining-client - chalkboard-viewer - charade - - chart-cli - chart-svg - chart-svg-various - chart-unit @@ -716,7 +714,6 @@ dont-distribute-packages: - chr-core - chr-lang - chromatin - - chronos_1_1_3 - chu2 - chuchu - chunks @@ -729,8 +726,12 @@ dont-distribute-packages: - claferwiki - clash - clash-ghc + - clash-ghc_1_6_1 - clash-lib + - clash-lib-hedgehog + - clash-lib_1_6_1 - clash-multisignal + - clash-prelude-hedgehog - clash-prelude-quickcheck - clash-shake - clash-systemverilog @@ -752,6 +753,7 @@ dont-distribute-packages: - clckwrks-theme-clckwrks - clckwrks-theme-geo-bootstrap - cless + - cleveland - click-clack - clifford - clippings @@ -787,6 +789,7 @@ dont-distribute-packages: - comic - commsec-keyexchange - comonad-random + - compaREST - compact-mutable - complexity - computational-algebra @@ -814,7 +817,6 @@ dont-distribute-packages: - consumers - container - containers-accelerate - - contiguous-fft - continuum - continuum-client - control @@ -837,6 +839,7 @@ dont-distribute-packages: - coroutine-iteratee - couch-simple - couchdb-enumerator + - cpkg - cprng-aes-effect - cql-io-tinylog - cqrs-example @@ -896,10 +899,8 @@ dont-distribute-packages: - data-structure-inferrer - datadog-tracing - dataflow - - date-conversions - dbjava - dbus-client - - ddate - ddc-build - ddc-core - ddc-core-babel @@ -1030,6 +1031,7 @@ dont-distribute-packages: - edges - editable - effective-aspects-mzv + - eflint - egison - egison-pattern-src-haskell-mode - egison-pattern-src-th-mode @@ -1194,7 +1196,7 @@ dont-distribute-packages: - funnyprint - funsat - fused-effects-squeal - - futhark_0_21_4 + - futhark_0_21_6 - fwgl-glfw - fwgl-javascript - fxpak @@ -1485,6 +1487,12 @@ dont-distribute-packages: - hasql-cursor-query - hasql-postgres - hasql-postgres-options + - hasql-streams-conduit + - hasql-streams-core + - hasql-streams-example + - hasql-streams-pipes + - hasql-streams-streaming + - hasql-streams-streamly - hasql-th - hastache-aeson - haste-app @@ -1625,6 +1633,7 @@ dont-distribute-packages: - hreader-lens - hreq-client - hreq-conduit + - hriemann - hs-blake2 - hs-brotli - hs-duktape @@ -1770,6 +1779,7 @@ dont-distribute-packages: - indentation-trifecta - indexation - indieweb-algorithms + - indigo - infernu - inline-java - inspector-wrecker @@ -1784,8 +1794,8 @@ dont-distribute-packages: - introduction-test - intset - invertible-hlist + - invertible-hxt - ion - - ip - ipatch - ipc - ipld-cid @@ -2090,7 +2100,6 @@ dont-distribute-packages: - markdown-pap - markdown2svg - markov-processes - - markup - marmalade-upload - marquise - marvin @@ -2136,9 +2145,7 @@ dont-distribute-packages: - mkbndl - mlist - mmark-cli - - mmark-cli_0_0_5_1 - mmark-ext - - mmark-ext_0_2_1_4 - mmtl-base - moan - modify-fasta @@ -2159,6 +2166,8 @@ dont-distribute-packages: - moo - moo-nad - morley + - morley-client + - morley-upgradeable - morloc - morpheus-graphql-client_0_18_0 - morpheus-graphql_0_18_0 @@ -2172,7 +2181,6 @@ dont-distribute-packages: - mpretty - mprover - mps - - mptcp - mptcpanalyzer - msgpack-aeson - msgpack-idl @@ -2308,7 +2316,7 @@ dont-distribute-packages: - pairing - panda - pandoc-japanese-filters - - pandoc_2_17_0_1 + - pandoc_2_17_1_1 - papa - papa-base - papa-base-implement @@ -2431,8 +2439,6 @@ dont-distribute-packages: - prednote-test - presto-hdbc - preview - - primitive-containers - - primitive-sort - primula-board - primula-bot - proc @@ -2624,7 +2630,6 @@ dont-distribute-packages: - ribosome-root - ribosome-test - ridley-extras - - ring-buffers - rio-process-pool - riot - ripple @@ -2698,7 +2703,6 @@ dont-distribute-packages: - scholdoc - scholdoc-citeproc - scholdoc-texmath - - scientific-notation - scion - scion-browser - scope @@ -2801,7 +2805,6 @@ dont-distribute-packages: - smallstring - smartword - smcdel - - smith - smith-cli - smith-client - smtlib2-debug @@ -3032,7 +3035,6 @@ dont-distribute-packages: - tn - to-string-instances - toboggan - - todos - toktok - too-many-cells - top @@ -3057,6 +3059,7 @@ dont-distribute-packages: - trasa-reflex - trasa-server - trasa-th + - traverse-code - treemap-html-tools - treersec - trek-app @@ -3140,8 +3143,6 @@ dont-distribute-packages: - urembed - uri-enumerator - uri-enumerator-file - - url-bytes - - urlpath - usb - usb-enumerator - usb-hid @@ -3153,7 +3154,6 @@ dont-distribute-packages: - uu-cco-examples - uu-cco-hut-parsing - uu-cco-uu-parsinglib - - uuid-bytes - uuid-crypto - uvector-algorithms - v4l2 @@ -3201,7 +3201,6 @@ dont-distribute-packages: - wai-middleware-cache - wai-middleware-cache-redis - wai-middleware-consul - - wai-middleware-content-type - wai-middleware-rollbar - wai-middleware-route - wai-session-tokyocabinet @@ -3210,12 +3209,14 @@ dont-distribute-packages: - warped - wavesurfer - wavy + - web-inv-route - web-mongrel2 - web-page - web-rep - web-routes-regular - web-routing - web3 + - web3-ethereum - webcrank-wai - webdriver-w3c - webserver @@ -3241,7 +3242,6 @@ dont-distribute-packages: - wrecker-ui - wright - writer-cps-full - - ws - wss-client - wtk-gtk - wu-wei @@ -3269,7 +3269,6 @@ dont-distribute-packages: - xml-push - xml-query-xml-conduit - xml-query-xml-types - - xml-syntax - xml-tydom-conduit - xml2x - xmltv @@ -3301,7 +3300,6 @@ dont-distribute-packages: - ycextra - yeamer - yeshql - - yesod-articles - yesod-auth-ldap - yesod-colonnade - yesod-continuations diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index e6b2ff48c945..b93dcb183442 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -163,6 +163,7 @@ self: super: builtins.intersectAttrs super { network-transport-tcp = dontCheck super.network-transport-tcp; network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30 oidc-client = dontCheck super.oidc-client; # the spec runs openid against google.com + persistent-migration = dontCheck super.persistent-migration; # spec requires pg_ctl binary pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw pixiv = dontCheck super.pixiv; raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw @@ -209,16 +210,6 @@ self: super: builtins.intersectAttrs super { # Help the test suite find system timezone data. tz = overrideCabal (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; - patches = [ - # Fix tests failing with libSystem, musl etc. due to a lack of - # support for glibc's non-POSIX TZDIR environment variable. - # https://github.com/nilcons/haskell-tz/pull/29 - (pkgs.fetchpatch { - name = "support-non-glibc-tzset.patch"; - url = "https://github.com/sternenseemann/haskell-tz/commit/64928f1a50a1a276a718491ae3eeef63abcdb393.patch"; - sha256 = "1f53w8k1vpy39hzalyykpvm946ykkarj2714w988jdp4c2c4l4cf"; - }) - ] ++ (drv.patches or []); }) super.tz; # Nix-specific workaround @@ -605,21 +596,6 @@ self: super: builtins.intersectAttrs super { sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; }; - spagoWithPatches = appendPatch ( - # Spago needs a small patch to work with versions-5.0.0: - # https://github.com/purescript/spago/pull/798 - # This can probably be removed with >spago-0.20.3. - pkgs.fetchpatch { - url = "https://github.com/purescript/spago/commit/dd4bf4413d9675c1c8065d24d0ed7b345c7fa5dd.patch"; - sha256 = "1i1r3f4n9mlkckx15bfrdy5m7gjf0zx7ycwyqra6qn34zpcbzpmf"; - } - ) super.spago; - - spagoWithOverrides = spagoWithPatches.override { - # spago has not yet been updated for the latest dhall. - dhall = self.dhall_1_38_1; - }; - spagoDocs = overrideCabal (drv: { postUnpack = (drv.postUnpack or "") + '' # Spago includes the following two files directly into the binary @@ -645,7 +621,7 @@ self: super: builtins.intersectAttrs super { "$sourceRoot/templates/docs-search-app-0.0.11.js" \ "$sourceRoot/templates/purescript-docs-search-0.0.11" ''; - }) spagoWithOverrides; + }) super.spago; # Tests require network access. spagoWithoutChecks = dontCheck spagoDocs; @@ -725,12 +701,11 @@ self: super: builtins.intersectAttrs super { testToolDepends = [ pkgs.git pkgs.mercurial ] ++ drv.testToolDepends or []; }) super.retrie_1_2_0_0; - nix-output-monitor = overrideCabal { - # Can't ran the golden-tests with nix, because they call nix - testTarget = "unit-tests"; - } super.nix-output-monitor; - haskell-language-server = overrideCabal (drv: { + # starting with 1.6.1.1 haskell-language-server wants to be linked dynamically + # by default. Unless we reflect this in the generic builder, GHC is going to + # produce some illegal references to /build/. + enableSharedExecutables = true; postInstall = "ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${self.ghc.version}"; testToolDepends = [ self.cabal-install pkgs.git ]; testTarget = "func-test"; # wrapper test accesses internet @@ -755,12 +730,9 @@ self: super: builtins.intersectAttrs super { # based on https://github.com/gibiansky/IHaskell/blob/aafeabef786154d81ab7d9d1882bbcd06fc8c6c4/release.nix ihaskell = overrideCabal (drv: { - configureFlags = (drv.configureFlags or []) ++ [ - # ihaskell's cabal file forces building a shared executable, - # but without passing --enable-executable-dynamic, the RPATH - # contains /build/ and leads to a build failure with nix - "--enable-executable-dynamic" - ]; + # ihaskell's cabal file forces building a shared executable, which we need + # to reflect here or RPATH will contain a reference to /build/. + enableSharedExecutables = true; preCheck = '' export HOME=$TMPDIR/home export PATH=$PWD/dist/build/ihaskell:$PATH @@ -824,90 +796,11 @@ self: super: builtins.intersectAttrs super { '' + drv.postInstall or ""; }) super.hlint; - hls-brittany-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-brittany-plugin; - hls-class-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-class-plugin; - hls-ormolu-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-ormolu-plugin; - hls-fourmolu-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-fourmolu-plugin; - hls-module-name-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-module-name-plugin; - hls-rename-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - '' + (drv.preCheck or ""); - }) super.hls-rename-plugin; - hls-splice-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-splice-plugin; - hls-floskell-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-floskell-plugin; - hls-pragmas-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-pragmas-plugin; - hls-hlint-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-hlint-plugin; hiedb = overrideCabal (drv: { preCheck = '' export PATH=$PWD/dist/build/hiedb:$PATH ''; }) super.hiedb; - hls-call-hierarchy-plugin = overrideCabal (drv: { - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-call-hierarchy-plugin; - # Tests have file permissions expections that don‘t work with the nix store. - hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; - hls-haddock-comments-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-haddock-comments-plugin; - hls-eval-plugin = overrideCabal (drv: { - testToolDepends = [ pkgs.git ]; - preCheck = '' - export HOME=$TMPDIR/home - ''; - }) super.hls-eval-plugin; taglib = overrideCabal (drv: { librarySystemDepends = [ @@ -972,11 +865,11 @@ self: super: builtins.intersectAttrs super { rel8 = addTestToolDepend pkgs.postgresql super.rel8; - cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nix_2_4; }); + cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_4; }); - hercules-ci-agent = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-agent.override { nix = pkgs.nix_2_4; }); - hercules-ci-cnix-expr = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-expr.override { nix = pkgs.nix_2_4; }); - hercules-ci-cnix-store = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-store.override { nix = pkgs.nix_2_4; }); + hercules-ci-agent = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_4; }); + hercules-ci-cnix-expr = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_4; }); + hercules-ci-cnix-store = appendConfigureFlag "-fnix-2_4" (super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_4; }); # Enable extra optimisations which increase build time, but also # later compiler performance, so we should do this for user's benefit. @@ -1072,4 +965,35 @@ self: super: builtins.intersectAttrs super { install -Dm644 test/examples/*.jac -t "$docDir/examples" ''; }) super.jacinda; + +# haskell-language-server plugins all use the same test harness so we give them what we want in this loop. +} // pkgs.lib.mapAttrs + (_: overrideCabal (drv: { + testToolDepends = (drv.testToolDepends or [ ]) ++ [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + '' + (drv.preCheck or ""); + })) +{ + inherit (super) + hls-brittany-plugin + hls-call-hierarchy-plugin + hls-class-plugin + hls-eval-plugin + hls-floskell-plugin + hls-fourmolu-plugin + hls-module-name-plugin + hls-ormolu-plugin + hls-pragmas-plugin + hls-rename-plugin + hls-selection-range-plugin + hls-splice-plugin; + # Tests have file permissions expections that don‘t work with the nix store. + hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; + + # Flaky tests + hls-hlint-plugin = dontCheck super.hls-hlint-plugin; + hls-alternate-number-format-plugin = dontCheck super.hls-alternate-number-format-plugin; + hls-qualify-imported-names-plugin = dontCheck super.hls-qualify-imported-names-plugin; + hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 222534de8aa2..a16396d316ef 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -811,8 +811,8 @@ self: { pname = "Agda"; version = "2.6.2.1"; sha256 = "03dw7jfqr3ffik6avigm525djqh2gn5c3qwnb2h6298zkr9lch9w"; - revision = "2"; - editedCabalFile = "1n037ql18gayqmdiaf592c4iw9cmwyjz12vvj6wbxrbcwylhc6ji"; + revision = "4"; + editedCabalFile = "0spsj8nk28lfvsv6063d1nif5hag8yal47iwicm7yln0626xsxcd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -2857,6 +2857,18 @@ self: { broken = true; }) {}; + "Cabal-syntax" = callPackage + ({ mkDerivation, Cabal }: + mkDerivation { + pname = "Cabal-syntax"; + version = "3.6.0.0"; + sha256 = "0lcj4g55sj5iv727g7k57pscgyj0fx3smwapm1gmd5qkc3yfa9fa"; + libraryHaskellDepends = [ Cabal ]; + doHaddock = false; + description = "A library for working with .cabal files"; + license = lib.licenses.bsd3; + }) {}; + "CabalSearch" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HDBC , HDBC-sqlite3, process, unix @@ -4683,6 +4695,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "DigitGroup" = callPackage + ({ mkDerivation, base, split }: + mkDerivation { + pname = "DigitGroup"; + version = "0.1.0.0"; + sha256 = "1g9bxrawx2ard4pm6rs9li0kk3wj5f5ll0b2l2dwc74i23anb9lz"; + libraryHaskellDepends = [ base split ]; + description = "Group the digits of numbers by lots"; + license = lib.licenses.bsd3; + }) {}; + "DigitalOcean" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions , hspec, lens, mtl, text, transformers, unordered-containers @@ -9724,8 +9747,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.22.3.0"; - sha256 = "0v9vgql7a9rpkwlrgw8nsy9m2rv3l2gczngc7a1xkndxi214m4kl"; + version = "3.22.3.1"; + sha256 = "0vgyixd8j3nzpy8s04cy3q7gj2gfblba2z0ppr58rdm8qgj16j5c"; libraryHaskellDepends = [ base bibtex bytestring containers hashable matrix parsec prettyprinter QuickCheck text transformers @@ -10177,8 +10200,6 @@ self: { ]; description = "Helpers to connect to SSL/TLS mail servers with HaskellNet"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "HaskellTorrent" = callPackage @@ -10968,6 +10989,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.1"; sha256 = "139hqd07hkr8ykvrgmcshh9f3vp9dnrj6ks5nl8hgrpi990jsy5r"; + revision = "1"; + editedCabalFile = "0d9gih7mkm0k47351539x9vdjvjjysk1rvba88r214qsjxnh4kym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11781,8 +11804,8 @@ self: { pname = "JuicyPixels-blurhash"; version = "0.1.0.3"; sha256 = "0kgl2j7990p8q5yrkn0wgaszc9fzva1pc3277j11k1lbjsymz360"; - revision = "6"; - editedCabalFile = "13zdfmj6p6awpy74h09czpcjs0y642aawqb7y87vsz6pfm6zqwjz"; + revision = "8"; + editedCabalFile = "09mlq9874j1lc33mk9f7qx6nwyz58hywnb8r4l1nkmnnbnc56alj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -13618,25 +13641,22 @@ self: { }) {}; "MissingH" = callPackage - ({ mkDerivation, array, base, containers, directory - , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network - , network-bsd, old-locale, old-time, parsec, process, random - , regex-compat, time, unix + ({ 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.4.3.0"; - sha256 = "196cniya5wzcv2d777nr0f7hinclpals4ia1mkzzv35870pqr6lw"; - revision = "2"; - editedCabalFile = "0p5md995w0nh2m89v3jsb1bvhfkrnp2s14smjbnh3g0pbq3fgfzg"; + version = "1.5.0.0"; + sha256 = "100x3315lk0zs58cv951jxcy6cgip18cq25r8f2bsgwbvv6gh2by"; libraryHaskellDepends = [ array base containers directory filepath hslogger mtl network - network-bsd old-locale old-time parsec process random regex-compat - time unix + network-bsd old-locale old-time parsec process regex-compat time + unix ]; testHaskellDepends = [ - base containers directory errorcall-eq-instance filepath HUnit - old-time parsec regex-compat time unix + base containers directory filepath HUnit old-time parsec + regex-compat time unix ]; description = "Large utility library"; license = lib.licenses.bsd3; @@ -14310,8 +14330,8 @@ self: { }: mkDerivation { pname = "NanoID"; - version = "3.1.1"; - sha256 = "10zjp9675nxa7nx7qhr5cxw43fy06s5ggb39idlr87b90vm8wkw8"; + version = "3.2.0"; + sha256 = "16h4mhr16b2fkf37vpsalnzjmg06sghb86gh1n1w3z64dvad0849"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -17749,8 +17769,8 @@ self: { }: mkDerivation { pname = "SJW"; - version = "0.1.2.3"; - sha256 = "10ky2pd83wng5bgpqimdyxvhlfpwbssgh576ss28f1rzm6b8wqcm"; + version = "0.1.2.4"; + sha256 = "1flr9dp3v4cyn8fs6sybibbim5spzab7kxi6rxpczjcwmnn1cv78"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21000,8 +21020,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.7.5"; - sha256 = "0wcq09q5jhvigfp8vshgs3yc170g7c39jz2m6jk2j6v0nji2lp40"; + version = "0.9"; + sha256 = "1avq9njgqbvmqn5277q66bqq01jj6syyrnw82qy4477r5yln2wh2"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -23315,6 +23335,8 @@ self: { pname = "acid-state"; version = "0.16.0.1"; sha256 = "0n8qp002w972lf7z9hhn5bbz2rslh8m6am07c88y755nj5xk6y88"; + revision = "1"; + editedCabalFile = "0jz3826gx6chsa2bipzdpqvl2risp3bm6g4nrr79wb403qrqwbf4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24157,8 +24179,8 @@ self: { pname = "acts"; version = "0.3.1.0"; sha256 = "06bpayfa8vwj8dqlqp71nw2s9iwbffdknkk4hpazd4r1wvhnrg37"; - revision = "3"; - editedCabalFile = "01vjb8mp9ifbfknnibzc1yhimn5yli2vafpxs6adk0cdjna99g4w"; + revision = "4"; + editedCabalFile = "081arnkkll6xkni350ywsnwzagnki2ly5in42cx5zcpfp1xbssmk"; libraryHaskellDepends = [ base deepseq finitary finite-typelits groups ]; @@ -25488,20 +25510,15 @@ self: { }) {}; "aeson-tiled" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hspec, text - , vector + ({ mkDerivation, aeson, base, bytestring, containers, text, vector }: mkDerivation { pname = "aeson-tiled"; - version = "0.0.0.1"; - sha256 = "147rm19czz8bvzmjj4mmcvjyz02mr3cisyprzdfpx1q5msi7aghk"; - isLibrary = true; - isExecutable = true; + version = "0.0.1.0"; + sha256 = "1szlwkww2sbqrz6d8mbq20nzkba70a41if33bcka0vhfq5lrp224"; libraryHaskellDepends = [ aeson base bytestring containers text vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ aeson base hspec ]; description = "Aeson instances for the Tiled map editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -25639,6 +25656,8 @@ self: { pname = "aeson-yaml"; version = "1.1.0.1"; sha256 = "06x1l0a0dvzf8n2xmqny5qpsgdsl03xlh2z9x7wdxiykl8p4xd24"; + revision = "1"; + editedCabalFile = "16jz8x7dbc66vcnfam52pzxcic6c40rmixc5p1y3xds2f695i1xl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26404,8 +26423,8 @@ self: { }: mkDerivation { pname = "alex"; - version = "3.2.6"; - sha256 = "042lrkn0dbpjn5ivj6j26jzb1fwrj8c1aj18ykxja89isg0hiali"; + version = "3.2.7.1"; + sha256 = "1v0vm1l4xvybzwj1p6j5j58yiw5nhbnx7yxjnpyjy6wggsig3llv"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -26933,6 +26952,8 @@ self: { pname = "align-audio"; version = "0.0"; sha256 = "0sa7q5fzkc0z4vzibs5l21pvrkil0swdpbl27qn30vb6giy3yh7a"; + revision = "1"; + editedCabalFile = "1599vbnfalrnq0zgwmh47k62y9yq30agpjyyfwdzxzszhc0vfq6n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -30053,8 +30074,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.22.0"; - sha256 = "1yr81pwmjnap5bir9nrmpwakg4rz4fwcjzbkdr8azqbp9x0hr9k2"; + version = "0.22.1"; + sha256 = "0z1w35ar0bswbjzgana52nh4ilxbidnfkvli29w2zr7cak9dgzg1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32733,8 +32754,8 @@ self: { }: mkDerivation { pname = "arch-hs"; - version = "0.9.1.0"; - sha256 = "0k9xi2k4ifrnnh6p80pf1xhf45cbhrs1zdwy0ayp08p0ajdlh74b"; + version = "0.10.0.0"; + sha256 = "1qpd1a5jv4g4chbc5rqbf067zgcxb222qx7gpj37i83sp2rys68m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32955,8 +32976,8 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.5.6"; - sha256 = "06aqavds6lh4iazrlz62dhdxim0q8xqdgafj7y3f8nnmv8w37g41"; + version = "1.5.7"; + sha256 = "06qhad2v4qc5izza3j7wnfafzsidz232qqlq1iy3l8sbmdc8kw37"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative temporary @@ -33032,8 +33053,8 @@ self: { }: mkDerivation { pname = "argo"; - version = "0.2022.1.15"; - sha256 = "0wqsrmisbgalf8p0f1zs1jfpf5iws0zb98r1krgg2adghbllg770"; + version = "0.2022.2.2"; + sha256 = "133k1jqx737y8bj92w7afvs5hxh28gcv6yyf7mdwlnvq1xphy7pa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33049,8 +33070,8 @@ self: { tasty-quickcheck template-haskell text transformers ]; benchmarkHaskellDepends = [ - base bytestring containers deepseq tasty-bench template-haskell - text transformers + base bytestring containers deepseq tasty tasty-bench + template-haskell text transformers ]; description = "Parse and render JSON"; license = lib.licenses.mit; @@ -33649,16 +33670,16 @@ self: { }: mkDerivation { pname = "arrow-utils"; - version = "0.1.0.0"; - sha256 = "1l8njh623a00hvfd3cczvb4ngh7c39z6f0kfhr8hr6xhbkrgwqnc"; - revision = "1"; - editedCabalFile = "1jdl1jmr8hbjiybrjnfr8rraqdf95l4qia3nna3nh9pvh8c69jln"; + version = "0.1.1"; + sha256 = "112g74g844lnqfphkxqmp8ysnvi11iii9gcn70ml1ag6m5bdr7lc"; libraryHaskellDepends = [ base vector-sized ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; description = "functions for working with arrows"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "arrowapply-utils" = callPackage @@ -35728,7 +35749,6 @@ self: { ]; description = "Parse IP data types with attoparsec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-iso8601" = callPackage @@ -35881,7 +35901,6 @@ self: { ]; description = "URI parser / printer using attoparsec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-varword" = callPackage @@ -35939,8 +35958,8 @@ self: { }: mkDerivation { pname = "audacity"; - version = "0.0.2"; - sha256 = "1916phnj3m12apyjarmda48xr2bq19rfn7sn6nskkbg6qjqxzlnr"; + version = "0.0.2.1"; + sha256 = "04r36gy8z0d2fz1l5px6yajp7izf3zpda9vci6q0wc273pxc8ck6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36089,7 +36108,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "aura_3_2_6" = callPackage + "aura_3_2_7" = callPackage ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring , containers, filepath, hashable, http-client, http-client-tls , http-types, language-bash, megaparsec, network-uri @@ -36099,10 +36118,10 @@ self: { }: mkDerivation { pname = "aura"; - version = "3.2.6"; - sha256 = "07sry2nf41f101ldcfcf2x5pp0w7qvlvl6m4j5bbkvxp3rmsjbx2"; - revision = "2"; - editedCabalFile = "02vbh06llfj3f1crf5nqkx8crkh3lhv3mi2zqanjhj1wx98r4g7v"; + version = "3.2.7"; + sha256 = "07ya2vd94grh6fs7k5kq25yh95xfk5mdqcgqq84anjz0phprq5z3"; + revision = "1"; + editedCabalFile = "16z28nkj5ladbbrg2h5sc1qcl3335g3i37x02h0by8bpqbkld6xr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36134,10 +36153,8 @@ self: { }: mkDerivation { pname = "authenticate"; - version = "1.3.5"; - sha256 = "10df40ycd4r45p58xzdh0vcsa401909fa99nkgd18fx5alqh84sz"; - revision = "1"; - editedCabalFile = "0lmb1m5d1l2scnm2fqxfk348m8xqbc7f7kvk7zvpsvcdcpxinafz"; + version = "1.3.5.1"; + sha256 = "1rhbvdgwdr68gp13p5piddfdqf3l9lmx4w7k249lc98y23780c3x"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring case-insensitive conduit containers html-conduit http-conduit http-types network-uri @@ -36860,7 +36877,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "avro_0_6_0_0" = callPackage + "avro_0_6_0_1" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, bytestring, containers, data-binary-ieee754, deepseq , directory, doctest, doctest-discover, extra, fail, gauge @@ -36872,8 +36889,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.6.0.0"; - sha256 = "056nd6cgl9lqv0ij8a2s0rca1f0qcxr2mfr0i8pkh84h9y84nzv9"; + version = "0.6.0.1"; + sha256 = "1kl7dp0vm2klvijszjhwj2x9m4bmw044s085fyq86cszqrsrrn6w"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail HasBigDecimal hashable @@ -37076,6 +37093,8 @@ self: { pname = "aws-cloudfront-signed-cookies"; version = "0.2.0.10"; sha256 = "1mzsg6wfzgiippl8kw54m16i1m7zxwfqfwx3wbb3m372pg4h9sza"; + revision = "3"; + editedCabalFile = "0yswkjkx4xhmy11k3zcgcrmwr19dcaxw15vbl52nqsrhamw60fh3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39632,37 +39651,99 @@ self: { }) {}; "batchd" = callPackage - ({ mkDerivation, aeson, base, bytestring, connection, containers - , cryptonite, data-default, dates, directory, esqueleto, filepath - , Glob, http-client, http-client-tls, http-types, libssh2 - , monad-logger, monad-logger-syslog, mtl, optparse-applicative - , parsec, persistent, persistent-postgresql, persistent-sqlite - , persistent-template, process, readline, resourcet, scotty, syb - , template, template-haskell, text, th-lift, time, tls - , transformers, unix, unordered-containers, vault, wai, wai-cors - , wai-extra, wai-middleware-static, warp, x509-store, yaml + ({ mkDerivation, aeson, base, batchd-core, boxes, bytestring + , conduit, conduit-combinators, conduit-extra, connection + , containers, cryptonite, data-default, dates, directory, ekg-core + , ekg-json, esqueleto, exceptions, fast-logger, filepath, Glob + , haskeline, heavy-logger, heavy-logger-instances, hsyslog + , http-client, http-client-tls, http-types, libssh2 + , libssh2-conduit, localize, microlens, monad-metrics, mtl + , optparse-applicative, parsec, persistent, persistent-postgresql + , persistent-sqlite, persistent-template, process, resourcet + , scotty, syb, text, text-format-heavy, th-lift, time, tls, unix + , unliftio-core, unordered-containers, vault, vector, wai, wai-cors + , wai-extra, wai-middleware-metrics, wai-middleware-static, warp + , x509-store, yaml }: mkDerivation { pname = "batchd"; - version = "0.1.0.0"; - sha256 = "1axj4w0g34fgnn89l6f2zxbx172z6yq98clksp2bqxmnswza7di2"; + version = "0.1.1.0"; + sha256 = "19ka8xgrnyg4pkrgl8qp9l74y7qizj9r370hlwldcj19gidp9lhb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bytestring connection containers cryptonite data-default - dates directory esqueleto filepath Glob http-client http-client-tls - http-types libssh2 monad-logger monad-logger-syslog mtl - optparse-applicative parsec persistent persistent-postgresql - persistent-sqlite persistent-template process readline resourcet - scotty syb template template-haskell text th-lift time tls - transformers unix unordered-containers vault wai wai-cors wai-extra - wai-middleware-static warp x509-store yaml + aeson base batchd-core boxes bytestring conduit conduit-combinators + conduit-extra connection containers cryptonite data-default dates + directory ekg-core ekg-json esqueleto exceptions fast-logger + filepath Glob haskeline heavy-logger heavy-logger-instances hsyslog + http-client http-client-tls http-types libssh2 libssh2-conduit + localize microlens monad-metrics mtl optparse-applicative parsec + persistent persistent-postgresql persistent-sqlite + persistent-template process resourcet scotty syb text + text-format-heavy th-lift time tls unix unliftio-core + unordered-containers vault vector wai wai-cors wai-extra + wai-middleware-metrics wai-middleware-static warp x509-store yaml ]; description = "Batch processing toolset for Linux / Unix"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; + "batchd-core" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dates + , directory, filepath, heavy-logger, hsyslog, localize, mtl + , persistent, persistent-template, resourcet, scotty, syb + , template-haskell, text, text-format-heavy, th-lift, time + , unordered-containers, wai, yaml + }: + mkDerivation { + pname = "batchd-core"; + version = "0.1.0.0"; + sha256 = "0kk1crifbynpri8wkhnni3wms759fxc6jmdm0919xlzjfkxj5psr"; + libraryHaskellDepends = [ + aeson base bytestring containers dates directory filepath + heavy-logger hsyslog localize mtl persistent persistent-template + resourcet scotty syb template-haskell text text-format-heavy + th-lift time unordered-containers wai yaml + ]; + description = "Core modules of batchd, to use in batchd extensions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "batchd-docker" = callPackage + ({ mkDerivation, aeson, base, batchd-core, docker, exceptions, mtl + , text, unliftio-core + }: + mkDerivation { + pname = "batchd-docker"; + version = "0.1.0.0"; + sha256 = "11kwj1c43kqrclvg5waj0n3lw9k8an7npz23jwsi3f8nwqi86rzv"; + libraryHaskellDepends = [ + aeson base batchd-core docker exceptions mtl text unliftio-core + ]; + description = "docker containers host controller for batchd"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "batchd-libvirt" = callPackage + ({ mkDerivation, aeson, base, batchd-core, heavy-logger, libvirt-hs + , text, text-format-heavy, time + }: + mkDerivation { + pname = "batchd-libvirt"; + version = "0.1.0.0"; + sha256 = "1l9mw11pxda3w8lw6blk7b8q4220hfm9qnvr4v0rcaxrzjyrh9bb"; + libraryHaskellDepends = [ + aeson base batchd-core heavy-logger libvirt-hs text + text-format-heavy time + ]; + description = "host controller for batchd, which controls virtual machines via libvirt library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "batching" = callPackage ({ mkDerivation, base, primitive, QuickCheck, short-vec, sint , test-framework, test-framework-quickcheck2 @@ -40136,8 +40217,8 @@ self: { }: mkDerivation { pname = "beam-core"; - version = "0.9.2.0"; - sha256 = "1b1xk4pi9j49fmh9lywgqcg61gbd6i7905gv5prnf0799iqz68g9"; + version = "0.9.2.1"; + sha256 = "0js10ai2dqdv6fm99ni6ckiq1rbq1wm82s73h81hln0qf1xnk3ra"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable microlens mtl network-uri scientific tagged text time vector @@ -40158,8 +40239,8 @@ self: { }: mkDerivation { pname = "beam-migrate"; - version = "0.5.1.1"; - sha256 = "1amfm0lzy220blpkpvdh3b9kiypxz9gbvz2f20abfrvh6vdcd3hv"; + version = "0.5.1.2"; + sha256 = "1h1nb5y6lzc5zclkz925kr446kc05sdj94hbvpf41lypx0b133xv"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl @@ -40216,8 +40297,8 @@ self: { }: mkDerivation { pname = "beam-postgres"; - version = "0.5.2.0"; - sha256 = "1n3hpya8g7lx0y0nmz5fhcdjzq5qaxnn3hbnnzaf9kk5v6xw7qd5"; + version = "0.5.2.1"; + sha256 = "028aqd7r49avmwlf97612f98a5maw01l0d5vlbg0nj7kqi03ghj4"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring case-insensitive conduit free hashable haskell-src-exts lifted-base @@ -40242,8 +40323,8 @@ self: { }: mkDerivation { pname = "beam-sqlite"; - version = "0.5.1.1"; - sha256 = "1kzn8d7xjp8grkjqdzj1hqckfibrw6apa8ki078zhpszl787ffql"; + version = "0.5.1.2"; + sha256 = "0d5s6r54aamkr91ji3z05cn7vjmbl0xaysnx3dmalx75r5jhmhzq"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring dlist free hashable monad-control mtl network-uri scientific sqlite-simple @@ -40503,8 +40584,8 @@ self: { pname = "bench"; version = "1.0.12"; sha256 = "1sy97qpv6paar2d5syppk6lc06wjx6qyz5aidsmh30jq853nydx6"; - revision = "2"; - editedCabalFile = "055482m81h7pijiszdkk2k65p208i3c3pxs955pv6h0gwrialcsh"; + revision = "3"; + editedCabalFile = "1lprgyc8jnfys70mxnpynrkgy1m4ss2dhf7mhj9kvxkahkkqdqm2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -40534,15 +40615,12 @@ self: { "bench-show" = callPackage ({ mkDerivation, ansi-wl-pprint, base, Chart, Chart-diagrams, csv , directory, filepath, mwc-random, optparse-applicative - , optparse-simple, semigroups, split, statistics, text - , transformers, vector + , optparse-simple, split, statistics, text, transformers, vector }: mkDerivation { pname = "bench-show"; - version = "0.3.1"; - sha256 = "0z1fdcdl9chwia9kd5pa9572mc5pmy5bld72axkzg20r7v53sr7k"; - revision = "1"; - editedCabalFile = "08a95i3xwy2yz549hqfwd3j0j6gbsbc62jjmpxnk43yk5dl8dk63"; + version = "0.3.2"; + sha256 = "1f0zx572d54dyyjifv4p550ci90gdr4mrifhwww4z6p87fbdi32j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40550,9 +40628,7 @@ self: { mwc-random split statistics transformers vector ]; executableHaskellDepends = [ - ansi-wl-pprint base Chart Chart-diagrams csv directory filepath - mwc-random optparse-applicative optparse-simple semigroups split - statistics transformers vector + base optparse-applicative optparse-simple ]; testHaskellDepends = [ base split text ]; description = "Show, plot and compare benchmark results"; @@ -41020,6 +41096,8 @@ self: { pname = "bidirectionalization-combined"; version = "0.1.0.1"; sha256 = "0bclazwhg3ra7zv19xfx5rw2z3p8h8scw5r4m281524qzrkm9j6m"; + revision = "1"; + editedCabalFile = "1fvqr3g7i57ybszqaa279nvrciw3yv1sj8hpjs3pa0z0cvxvvr42"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -44540,6 +44618,7 @@ self: { description = "Blog in LaTeX"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "blaze" = callPackage @@ -44658,8 +44737,8 @@ self: { pname = "blaze-html"; version = "0.9.1.2"; sha256 = "0k1r1hddjgqighazcazxrx6xfhvy2gm8il8l82ainv3cai13yl30"; - revision = "1"; - editedCabalFile = "0wvlfb3rd9cm3p894p5rl9kggrsr5da3n8x9ydrbagx91yvkxns9"; + revision = "2"; + editedCabalFile = "1hjxvz62wlg0x7svc51zascgc96f5ly9xkkiyllgb4aqcvx9zf3l"; libraryHaskellDepends = [ base blaze-builder blaze-markup bytestring text ]; @@ -44750,8 +44829,8 @@ self: { pname = "blaze-markup"; version = "0.8.2.8"; sha256 = "0jd30wg5yz0a97b36zwqg4hv8faifza1n2gys3l1p3fwf9l3zz23"; - revision = "1"; - editedCabalFile = "1azqgw61l5zqjrjg176glx2m4nlyrmrz7a7vrpvbbkfqymwp7mfr"; + revision = "2"; + editedCabalFile = "074zslyx5dxzz242n5rzhgdw9i58akrkm2jd37wazbk3062a7mrq"; libraryHaskellDepends = [ base blaze-builder bytestring text ]; testHaskellDepends = [ base blaze-builder bytestring containers HUnit QuickCheck tasty @@ -45002,8 +45081,8 @@ self: { }: mkDerivation { pname = "blockfrost-api"; - version = "0.2.1.0"; - sha256 = "1mczzhpbdch3m5wmw9zr8pzwmg5jpg3qx167pxv548ykd0nvfjiq"; + version = "0.3.0.0"; + sha256 = "1773mklwigyqhgbxsp2zz4yzwsq0s2sapifzisrk56qix74z9md4"; libraryHaskellDepends = [ aeson base bytestring data-default-class deriving-aeson lens QuickCheck quickcheck-instances safe-money servant servant-docs @@ -45026,8 +45105,8 @@ self: { }: mkDerivation { pname = "blockfrost-client"; - version = "0.2.1.0"; - sha256 = "19jw8dr49ahfy5ln8d7fnaxw07mqzj71dawv6bx0p5j0dqdhzxky"; + version = "0.3.0.0"; + sha256 = "0n49qbqlghgqw0nnx6bpkfiiyaqzzscl6hr0rh7xxw56955r55p0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46501,17 +46580,17 @@ self: { }) {}; "box" = callPackage - ({ mkDerivation, attoparsec, base, concurrency, containers - , contravariant, exceptions, lens, mmorph, mtl, profunctors, text - , time, transformers + ({ mkDerivation, base, concurrency, containers, contravariant + , dlist, exceptions, kan-extensions, mtl, profunctors + , semigroupoids, text, time, transformers }: mkDerivation { pname = "box"; - version = "0.7.0"; - sha256 = "0fxrhfzf4xsfma2x355ij3ky1h83wq3khd08vkix1lnmw9vnvk37"; + version = "0.8.1"; + sha256 = "18f7waxmnrfk205aacwlzzv18bhyff9vpq3xcna955p9qgm47lg5"; libraryHaskellDepends = [ - attoparsec base concurrency containers contravariant exceptions - lens mmorph mtl profunctors text time transformers + base concurrency containers contravariant dlist exceptions + kan-extensions mtl profunctors semigroupoids text time transformers ]; description = "boxes"; license = lib.licenses.bsd3; @@ -46520,16 +46599,12 @@ self: { }) {}; "box-csv" = callPackage - ({ mkDerivation, attoparsec, base, box, generic-lens, lens - , scientific, text, time - }: + ({ mkDerivation, attoparsec, base, box, text, time }: mkDerivation { pname = "box-csv"; - version = "0.1.0"; - sha256 = "0h62za6qirm003bwrsjb9pj4d9gnrypvqchzhnv3nj37niscmddy"; - libraryHaskellDepends = [ - attoparsec base box generic-lens lens scientific text time - ]; + version = "0.2.0"; + sha256 = "0m3zx6m267hsnhvjspbd8132phkkbpm18cvii2if02bd3kj1x7rb"; + libraryHaskellDepends = [ attoparsec base box text time ]; description = "CSV parsing in a box"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -46537,22 +46612,20 @@ self: { "box-socket" = callPackage ({ mkDerivation, async, base, box, bytestring, concurrency - , exceptions, generic-lens, lens, network, network-simple - , optparse-generic, text, websockets + , exceptions, network, network-simple, optparse-generic, text + , websockets }: mkDerivation { pname = "box-socket"; - version = "0.2.0"; - sha256 = "198llmb67g348apjrhp180x2ykjlp2mnbhvkw90yh5nm7pnd0j3c"; + version = "0.3.0"; + sha256 = "1z9qlmpbq2ppc13viyf0sha95d7cm0jswnabjvg5fvx9ln1c5ivp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base box bytestring concurrency exceptions generic-lens lens - network network-simple text websockets - ]; - executableHaskellDepends = [ - base box concurrency generic-lens lens optparse-generic text + async base box bytestring concurrency exceptions network + network-simple text websockets ]; + executableHaskellDepends = [ base optparse-generic ]; description = "Box websockets"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -46823,7 +46896,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "brick_0_66" = callPackage + "brick_0_67" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -46832,8 +46905,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.66"; - sha256 = "0iaa22vjjrgasd7mhchib6r8hr73b540iqmcw5dkidg95y9jr00z"; + version = "0.67"; + sha256 = "02f8qmc3y2pyqysc9qan2l05vk3ryvlc7mgs8hdh18fp96x88669"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48752,7 +48825,6 @@ self: { ]; description = "Nonresumable byte parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bytestring_0_11_2_0" = callPackage @@ -48906,8 +48978,8 @@ self: { }: mkDerivation { pname = "bytestring-encoding"; - version = "0.1.1.0"; - sha256 = "0m2w1nvj5izmb4j08c57lk89i3rnhhb0n0rz511pb6s75ijqrb71"; + version = "0.1.2.0"; + sha256 = "1j1gli2aa7kflirvnaqdwg212s85v4j2fak5qy79y8zsb3l62p44"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base bytestring deepseq QuickCheck tasty tasty-hunit @@ -49542,6 +49614,8 @@ self: { pname = "c2hs"; version = "0.28.8"; sha256 = "0k482wv94jbpwd96a2c2lc7qz9k8072slx7l7943472nzk7k41ir"; + revision = "1"; + editedCabalFile = "0hbv1j9b04gm617c5xqndr4iqidabwdpcn2dcrnaacc04ylchvl2"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -50060,6 +50134,8 @@ self: { pname = "cabal-flatpak"; version = "0.1.0.3"; sha256 = "1k0fzhyvlcq1l09fnf3f3wig4g9l61wsm1dmsjd3nwsgh52xb37v"; + revision = "1"; + editedCabalFile = "1468f116hza0l9z4n4zqy1y65q322ypx5kh646fsfi78fimwj34a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -50865,6 +50941,27 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "cabal2spec_2_6_3" = callPackage + ({ mkDerivation, base, Cabal, filepath, optparse-applicative, tasty + , tasty-golden, time + }: + mkDerivation { + pname = "cabal2spec"; + version = "2.6.3"; + sha256 = "1mxqllc6mbxbyr5iz6qs0sxmvzrn5jf9wbs6zqnlygg23ml043kr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base Cabal filepath time ]; + executableHaskellDepends = [ + base Cabal filepath optparse-applicative + ]; + testHaskellDepends = [ base Cabal filepath tasty tasty-golden ]; + description = "Convert Cabal files into rpm spec files"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "cabalQuery" = callPackage ({ mkDerivation, base, Cabal, containers, directory, MissingH , pretty @@ -54504,8 +54601,8 @@ self: { }: mkDerivation { pname = "cgroup-rts-threads"; - version = "0.2.0.0"; - sha256 = "1anlrgjlkjdljxnj4a1y2f5wd3rzd1b9maz97dkg95djh20wcmig"; + version = "0.2.1.0"; + sha256 = "1fzv3bgfr7r1c8m02z887ml2mzh2j571zcjjp6al272iaax8ymx0"; libraryHaskellDepends = [ base directory megaparsec path text ]; testHaskellDepends = [ base hspec-core hspec-expectations path path-io @@ -54846,7 +54943,6 @@ self: { ]; description = "Command-line utility to draw charts from input data easily"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "chart-histogram" = callPackage @@ -54863,26 +54959,21 @@ self: { }) {}; "chart-svg" = callPackage - ({ mkDerivation, attoparsec, base, Color, containers, cubicbezier - , foldl, generic-lens, JuicyPixels, lens, linear, lucid, mtl - , numhask, numhask-space, reanimate, reanimate-svg, scientific - , tagsoup, text, time, transformers, unordered-containers + ({ mkDerivation, adjunctions, attoparsec, base, Color, containers + , cubicbezier, foldl, formatn, lucid, mtl, neat-interpolation + , numhask, numhask-array, numhask-space, optics-core, random + , scientific, tagsoup, text, time, transformers }: mkDerivation { pname = "chart-svg"; - version = "0.2.3"; - sha256 = "1j96l71gi2nrvwrwsvww9x7whvv3vmnc0ywgiy6ak1yh71hmivm1"; - revision = "1"; - editedCabalFile = "1zanv288hlir51yv4zqkcf2b4wxqivwd5y6f1s1n9zdn9k6b7c64"; - isLibrary = true; - isExecutable = true; + version = "0.3.0"; + sha256 = "07k8r0njywbgb77mjzmsyfhmzv01spyjcdvlj6jd4h2fhjmqpmwb"; libraryHaskellDepends = [ - attoparsec base Color containers cubicbezier foldl generic-lens - JuicyPixels lens linear lucid mtl numhask numhask-space reanimate - reanimate-svg scientific tagsoup text time transformers - unordered-containers + adjunctions attoparsec base Color containers cubicbezier foldl + formatn lucid mtl neat-interpolation numhask numhask-array + numhask-space optics-core random scientific tagsoup text time + transformers ]; - executableHaskellDepends = [ base lens reanimate ]; description = "Charting library targetting SVGs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -56146,17 +56237,19 @@ self: { "cimple" = callPackage ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, base , bytestring, containers, data-fix, filepath, groom, happy, hspec - , hspec-discover, mtl, recursion-schemes, text, transformers-compat + , hspec-discover, monad-parallel, mtl, recursion-schemes, split + , text, transformers-compat }: mkDerivation { pname = "cimple"; - version = "0.0.11"; - sha256 = "1n7633c6w4n4996i3k9v60yhpiddd8b7600c7hpam2axm9cqb19i"; + version = "0.0.14"; + sha256 = "1n287ybpl4h8laklw4s0gqf7hn8w12yv3wxm1xjh7rx9fivnim2v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers data-fix - filepath groom mtl recursion-schemes text transformers-compat + filepath groom monad-parallel mtl recursion-schemes split text + transformers-compat ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base bytestring groom text ]; @@ -56938,8 +57031,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "1.4.6"; - sha256 = "0bxzfbpz0kz3f6jdq66vcv1h039ww90xdkivbadaz034ngzallfr"; + version = "1.4.7"; + sha256 = "06r97diqy6px1pf06dbnvf6ns0kmqy5gc5mr6k9xam1d2pk37xwd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56957,6 +57050,37 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-ghc_1_6_1" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, clash-lib + , clash-prelude, concurrent-supply, containers, data-binary-ieee754 + , deepseq, directory, exceptions, extra, filepath, ghc, ghc-boot + , ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp + , lens, mtl, primitive, process, reflection, split + , template-haskell, text, time, transformers, uniplate, unix + , unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "clash-ghc"; + version = "1.6.1"; + sha256 = "0kkwrp2ch01s75gyy3xa3lf305xi9czw0v4sgqcb4cds4qb47ih2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring Cabal clash-lib clash-prelude + concurrent-supply containers data-binary-ieee754 deepseq directory + exceptions extra filepath ghc ghc-boot ghc-prim ghc-typelits-extra + ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable + haskeline integer-gmp lens mtl primitive process reflection split + template-haskell text time transformers uniplate unix + unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ base ]; + description = "Clash: a functional hardware description language - GHC frontend"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-lib" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array , attoparsec, base, base16-bytestring, binary, bytestring @@ -56974,8 +57098,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "1.4.6"; - sha256 = "0lw0cx2in4qfr8h43qhbxfn5s0srbp2a90nfsrnjbhfsh37aza0b"; + version = "1.4.7"; + sha256 = "03wj0i926x8lc09nwgwh48plqxc49i5zzwil88bgnxdcwv9ncv18"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array attoparsec base @@ -57000,6 +57124,74 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-lib_1_6_1" = 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-boot-th + , ghc-typelits-knownnat, Glob, hashable, haskell-src-exts + , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl + , ordered-containers, pretty-show, prettyprinter, primitive + , quickcheck-text, stringsearch, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, terminal-size + , text, time, transformers, trifecta, unordered-containers, vector + , vector-binary-instances, yaml + }: + mkDerivation { + pname = "clash-lib"; + version = "1.6.1"; + sha256 = "0qghvgl4x1lskmadn14kgbilfq9m2cb6n3ik513p27cvv5k8ahpj"; + 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-boot-th + hashable haskell-src-meta hint integer-gmp 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 + ]; + 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 + quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell + text transformers unordered-containers + ]; + description = "Clash: a functional hardware description language - As a library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + + "clash-lib-hedgehog" = callPackage + ({ mkDerivation, base, clash-lib, containers, data-binary-ieee754 + , fakedata, ghc-typelits-knownnat, ghc-typelits-natnormalise + , hedgehog, hedgehog-fakedata, mmorph, mtl, pretty-show, primitive + , text, transformers + }: + mkDerivation { + pname = "clash-lib-hedgehog"; + version = "1.6.1"; + sha256 = "0mm5wr80aylkp8xr71r40n90n5piipyfq7nrrj1ppqmb7lcs8gwj"; + libraryHaskellDepends = [ + base clash-lib containers data-binary-ieee754 fakedata + ghc-typelits-knownnat ghc-typelits-natnormalise hedgehog + hedgehog-fakedata mmorph mtl pretty-show primitive text + transformers + ]; + description = "Hedgehog Generators for clash-lib"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-multisignal" = callPackage ({ mkDerivation, base, clash-prelude, deepseq , ghc-typelits-knownnat, QuickCheck @@ -57019,9 +57211,9 @@ self: { ({ mkDerivation, array, arrows, base, bifunctors, binary , bytestring, Cabal, cabal-doctest, constraints, containers , criterion, data-binary-ieee754, data-default-class, deepseq - , doctest, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, half, hashable, hedgehog, hint - , integer-gmp, interpolate, lens, QuickCheck + , doctest, extra, ghc-prim, ghc-typelits-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, half, hashable + , hedgehog, hint, integer-gmp, interpolate, lens, QuickCheck , quickcheck-classes-base, recursion-schemes, reflection , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck , tasty-th, template-haskell, text, text-show, th-abstraction @@ -57030,17 +57222,17 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "1.4.6"; - sha256 = "1m6sk0sss5hsh9x0614vr81pdv715wbdkdf119wnyy0sfjjnmbzi"; + version = "1.4.7"; + sha256 = "1ba7w8d9532gd6ahvmdbxsby2rx9wpxblkgmkrn6df1xdp3aqi9w"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array arrows base bifunctors binary bytestring constraints - containers data-binary-ieee754 data-default-class deepseq ghc-prim - ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise - half hashable integer-gmp interpolate lens QuickCheck - recursion-schemes reflection singletons template-haskell text - text-show th-abstraction th-lift th-orphans time transformers - type-errors uniplate vector + containers data-binary-ieee754 data-default-class deepseq extra + ghc-prim ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise half hashable integer-gmp interpolate + lens QuickCheck recursion-schemes reflection singletons + template-haskell text text-show th-abstraction th-lift th-orphans + time transformers type-errors uniplate vector ]; testHaskellDepends = [ base deepseq doctest ghc-typelits-extra ghc-typelits-knownnat @@ -57057,6 +57249,63 @@ self: { broken = true; }) {}; + "clash-prelude_1_6_1" = callPackage + ({ mkDerivation, array, arrows, base, binary, bytestring + , constraints, containers, criterion, data-binary-ieee754 + , data-default-class, deepseq, directory, doctest-parallel, extra + , filepath, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, half, hashable, hedgehog, hint + , integer-gmp, interpolate, lens, QuickCheck + , quickcheck-classes-base, recursion-schemes, reflection + , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck + , tasty-th, template-haskell, text, th-abstraction, th-lift + , th-orphans, time, transformers, type-errors, uniplate, vector + }: + mkDerivation { + pname = "clash-prelude"; + version = "1.6.1"; + sha256 = "18fhkk2icwk8jm7d6ni0l2l7jgh0isdkmlzj2dpvqrwla6qf40j2"; + libraryHaskellDepends = [ + array arrows base binary bytestring constraints containers + data-binary-ieee754 data-default-class deepseq extra ghc-prim + ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise + half hashable integer-gmp interpolate lens QuickCheck + recursion-schemes reflection singletons template-haskell text + th-abstraction th-lift th-orphans time transformers type-errors + uniplate vector + ]; + testHaskellDepends = [ + base bytestring deepseq doctest-parallel filepath + ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise + hedgehog hint quickcheck-classes-base tasty tasty-hedgehog + tasty-hunit tasty-quickcheck tasty-th template-haskell + ]; + benchmarkHaskellDepends = [ + base criterion deepseq directory template-haskell + ]; + description = "Clash: a functional hardware description language - Prelude library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "clash-prelude-hedgehog" = callPackage + ({ mkDerivation, base, clash-prelude, ghc-typelits-knownnat + , ghc-typelits-natnormalise, hedgehog, text + }: + mkDerivation { + pname = "clash-prelude-hedgehog"; + version = "1.6.1"; + sha256 = "12p3rnfxi0l249l7w6cbvp2l4hlzxzppi9nca7vn9awr20shi2r4"; + libraryHaskellDepends = [ + base clash-prelude ghc-typelits-knownnat ghc-typelits-natnormalise + hedgehog text + ]; + description = "Hedgehog Generators for clash-prelude"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-prelude-quickcheck" = callPackage ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { @@ -57077,10 +57326,8 @@ self: { }: mkDerivation { pname = "clash-shake"; - version = "0.2.1"; - sha256 = "0lxv3ihlhnibi7vmfa4pqmf04524vlr3ksmdzgrlcarximi122kd"; - revision = "1"; - editedCabalFile = "07yb41fg6s5r8cs4xvax8nk3mly33shbbclql0q24wz5g7h4w06d"; + version = "0.2.2"; + sha256 = "10gj6764qhdy6ki0dyy75ycpj5il26jgxxjcr0xy9kkixi3wgsrb"; libraryHaskellDepends = [ aeson base bytestring clash-ghc clash-lib clash-prelude directory shake split stache text unordered-containers @@ -57151,8 +57398,8 @@ self: { }: mkDerivation { pname = "clashilator"; - version = "0.1.1"; - sha256 = "0d95h9dflclzgfph4as4bzz0442z0a9w59d97snzih9wc1cg4vbp"; + version = "0.1.2"; + sha256 = "1p58zn6m85zgn4f6pj6v6vqhhcazbid7gi9vg7cm52i1sx1jdbb8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57373,8 +57620,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.26.4"; - sha256 = "0gvfplid34idkfg5s7dvcwg22ij3fryn82hz958z2960a4jb7ngv"; + version = "0.27.2"; + sha256 = "088wx15f81h45ykhibq7ays5yn2ivwvgffaa459r6b6v53npkqkr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring @@ -57400,8 +57647,8 @@ self: { }: mkDerivation { pname = "clckwrks-cli"; - version = "0.3.0.3"; - sha256 = "03dyhfnmqhqjahd36cdhjvrqp68grzvdl69cqk2z2aa34z0agd4a"; + version = "0.3.0.4"; + sha256 = "17ifv0awgx7fylc1pbdcdq9l8wl2shr6fy65rgb0xjv3zxnwx4i8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57547,8 +57794,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.24"; - sha256 = "0zsf8j8l99cxskjql8zh407ar7920ph6xn42j8nxnh6qir16wdar"; + version = "0.4.3.25"; + sha256 = "0ii9984y7792i7kiwnqmgn9mfyky2k9dkx3fnzkirypqbxyri92s"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -57572,8 +57819,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-redirect"; - version = "0.0.1"; - sha256 = "1946m4fxdj8kr7n1q39j2q9j6srdz97srq0fifnk7mil23lw2vyj"; + version = "0.0.1.2"; + sha256 = "1vb0knjy0qkbpzni10bgvznnjxc7bv7pbp1l9frdffdsrssgyx8w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57594,8 +57841,8 @@ self: { }: mkDerivation { pname = "clckwrks-theme-bootstrap"; - version = "0.4.3"; - sha256 = "01hs4rh89zp0y2gkfam27kdwywh5fqr10pzwf1d4c92kpnz9xd5d"; + version = "0.4.3.2"; + sha256 = "0ag94kc0csjnh88vw6ljifv6cqqwc8wizyizqk0mj4qpp73z6qd2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro @@ -57680,6 +57927,30 @@ self: { broken = true; }) {}; + "cleff" = callPackage + ({ mkDerivation, atomic-primops, base, containers, exceptions + , extra, hspec, lifted-base, microlens, monad-control, primitive + , QuickCheck, rec-smallarray, template-haskell, th-abstraction + , transformers-base, unliftio + }: + mkDerivation { + pname = "cleff"; + version = "0.2.1.0"; + sha256 = "1a9gvmz9s71c1m9d1f5mxnhid8096fdhmgw4j9l358gg4i6lzvrw"; + libraryHaskellDepends = [ + atomic-primops base containers exceptions microlens monad-control + primitive rec-smallarray template-haskell th-abstraction + transformers-base unliftio + ]; + testHaskellDepends = [ + atomic-primops base containers exceptions extra hspec lifted-base + microlens monad-control primitive QuickCheck rec-smallarray + template-haskell th-abstraction transformers-base unliftio + ]; + description = "Fast and concise extensible effects"; + license = lib.licenses.bsd3; + }) {}; + "cless" = callPackage ({ mkDerivation, base, highlighting-kate, optparse-applicative , process, terminfo, wl-pprint-extras, wl-pprint-terminfo @@ -57699,6 +57970,51 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "cleveland" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base-noprelude + , bimap, bytestring, constraints, containers, criterion, cryptonite + , data-default, directory, either, exceptions, file-embed, filepath + , first-class-families, fmt, gauge, hedgehog, hex-text, hspec + , hspec-expectations, HUnit, lens, lorentz, megaparsec, MonadRandom + , morley, morley-client, morley-prelude, mtl, named, o-clock + , optparse-applicative, safe-exceptions, servant-client + , servant-client-core, silently, singletons, spoon, statistics, syb + , tagged, tasty, tasty-ant-xml, tasty-discover, tasty-hedgehog + , tasty-hspec, tasty-hunit-compat, template-haskell, text, time + , type-spec, unordered-containers, vinyl, with-utf8 + }: + mkDerivation { + pname = "cleveland"; + version = "0.1.0"; + sha256 = "0px16j08fakmxzsf6rgx9gs91g61ygxzkf7sngj06a76yzfj4hlw"; + libraryHaskellDepends = [ + aeson base-noprelude constraints containers criterion cryptonite + data-default directory either exceptions file-embed fmt hedgehog + hex-text hspec hspec-expectations HUnit lens lorentz MonadRandom + morley morley-client morley-prelude mtl named o-clock + optparse-applicative safe-exceptions servant-client-core singletons + statistics tagged tasty tasty-ant-xml tasty-hedgehog + tasty-hunit-compat template-haskell text time with-utf8 + ]; + testHaskellDepends = [ + aeson aeson-pretty aeson-qq base-noprelude bimap bytestring + constraints containers data-default directory either filepath + first-class-families fmt hedgehog hex-text hspec hspec-expectations + HUnit lens lorentz megaparsec morley morley-client morley-prelude + mtl named o-clock servant-client silently singletons spoon syb + tasty tasty-hedgehog tasty-hspec tasty-hunit-compat text time + type-spec unordered-containers vinyl with-utf8 + ]; + testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base-noprelude data-default gauge megaparsec morley morley-prelude + with-utf8 + ]; + description = "Testing framework for Morley"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "clevercss" = callPackage ({ mkDerivation, base, containers, mtl, parsec }: mkDerivation { @@ -58166,8 +58482,8 @@ self: { ({ mkDerivation, base, criterion, tasty, tasty-quickcheck }: mkDerivation { pname = "clock"; - version = "0.8.2"; - sha256 = "0qg4ljwmw28vvxjzr4sknh8220abjcx2b0sq3ljqprh3qw8b2p8b"; + version = "0.8.3"; + sha256 = "1l850pf1dxjf3i15wc47d64gzkpzgvw0bq13fd8zvklq9kdyap44"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ base criterion ]; @@ -59284,23 +59600,25 @@ self: { }) {}; "cobot-io" = callPackage - ({ mkDerivation, array, attoparsec, base, binary, bytestring + ({ mkDerivation, array, attoparsec, base, binary, bytestring, cobot , containers, data-msgpack, deepseq, directory, hspec, http-conduit - , hyraxAbif, lens, linear, mtl, neat-interpolation, QuickCheck - , split, text, vector + , hyraxAbif, lens, linear, megaparsec, mtl, neat-interpolation + , parser-combinators, QuickCheck, split, text, vector }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.20"; - sha256 = "075s6rhzyldm5c9g27ljwhs8xyxghk8cpm2742l3h69j9y7v3xnc"; + version = "0.1.4.2"; + sha256 = "1gh51097r6z35vbvdfg8fasv00midmdxgya0b2acm3hbrjnrdvp4"; libraryHaskellDepends = [ - array attoparsec base binary bytestring containers data-msgpack - deepseq http-conduit hyraxAbif lens linear mtl split text vector + array attoparsec base binary bytestring cobot containers + data-msgpack deepseq http-conduit hyraxAbif lens linear megaparsec + mtl parser-combinators split text vector ]; testHaskellDepends = [ - array attoparsec base binary bytestring containers data-msgpack - deepseq directory hspec http-conduit hyraxAbif lens linear mtl - neat-interpolation QuickCheck split text vector + array attoparsec base binary bytestring cobot containers + data-msgpack deepseq directory hspec http-conduit hyraxAbif lens + linear megaparsec mtl neat-interpolation parser-combinators + QuickCheck split text vector ]; description = "Biological data file formats and IO"; license = lib.licenses.bsd3; @@ -60868,8 +61186,8 @@ self: { ({ mkDerivation, base, hspec, mtl }: mkDerivation { pname = "commandert"; - version = "0.1.1.0"; - sha256 = "0li8ja7j8386k5j7l6vczq3g74bnj0qrz4n4f1hkgf82sg333jxz"; + version = "0.1.1.1"; + sha256 = "02sdmba5ri40qx5j2bdx11h8k7b0ndik8wwzf3wki8c00y2jpmnd"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hspec mtl ]; description = "A monad for commanders"; @@ -60981,6 +61299,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-simple" = callPackage + ({ mkDerivation, aeson, base, commonmark, commonmark-extensions + , commonmark-pandoc, containers, megaparsec, pandoc-types, parsec + , parser-combinators, relude, yaml + }: + mkDerivation { + pname = "commonmark-simple"; + version = "0.1.0.0"; + sha256 = "0fvpykqvqi12nsc95pv3xwd67sdamxc79r24w5xf30f87p0f9kna"; + libraryHaskellDepends = [ + aeson base commonmark commonmark-extensions commonmark-pandoc + containers megaparsec pandoc-types parsec parser-combinators relude + yaml + ]; + description = "Simple interface to commonmark-hs"; + license = lib.licenses.mit; + }) {}; + "commsec" = callPackage ({ mkDerivation, base, bytestring, cipher-aes128, crypto-api , network @@ -61034,6 +61370,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "commutative-semigroups" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "commutative-semigroups"; + version = "0.0.1.0"; + sha256 = "0vpg3vl84pwv7rnrmh0g6dzg0x61w919c84bry6gpmdkil55zlll"; + libraryHaskellDepends = [ base ]; + description = "Commutative semigroups"; + license = lib.licenses.bsd3; + }) {}; + "comonad" = callPackage ({ mkDerivation, base, containers, distributive , indexed-traversable, tagged, transformers, transformers-compat @@ -61104,6 +61451,43 @@ self: { license = lib.licenses.bsd3; }) {}; + "compaREST" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad + , containers, data-default, directory, doctemplates, envy + , file-embed, filepath, free, freer-simple, generic-data, github + , hashable, http-media, insert-ordered-containers, lattices, lens + , mtl, open-union, openapi3, optparse-applicative + , ordered-containers, pandoc, pandoc-types, pcre2, scientific + , tagged, tasty, tasty-golden, text, transformers, type-fun + , typerep-map, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "compaREST"; + version = "0.1.0.0"; + sha256 = "06y2qxl0vgka4vby5vv1njzgwbaq3615qic15iqnnm9dqwg7cczx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring comonad containers data-default + doctemplates file-embed free generic-data hashable http-media + insert-ordered-containers lattices mtl open-union openapi3 + ordered-containers pandoc-types pcre2 scientific tagged text + transformers type-fun typerep-map unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers data-default doctemplates envy + filepath freer-simple github mtl optparse-applicative pandoc + pandoc-types text vector yaml + ]; + testHaskellDepends = [ + base bytestring data-default directory filepath lens pandoc + pandoc-types tasty tasty-golden text yaml + ]; + description = "Compatibility checker for OpenAPI"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "compact" = callPackage ({ mkDerivation, base, binary, bytestring, directory, ghc-compact }: @@ -62619,8 +63003,8 @@ self: { }: mkDerivation { pname = "concurrent-output"; - version = "1.10.14"; - sha256 = "01d5zq7ja55jjn65fj5rs11kzqnc6baysxkzkq0jfd23wdqf9f92"; + version = "1.10.15"; + sha256 = "1n02ck0zci6y2w8dm03j2qypgbc176skapixrmnxrp9dnbwcprc0"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -64468,10 +64852,8 @@ self: { }: mkDerivation { pname = "constraints"; - version = "0.13.2"; - sha256 = "1zfijh3jpdfrh8nwn5xv2z05jnxyf0ciqlfaja6g6ls654svrj70"; - revision = "1"; - editedCabalFile = "1h46cskb4ci2jigqlrd9x87n1i1d6q6w4r0in6i47ywmhjdv7xwg"; + version = "0.13.3"; + sha256 = "0jhdix263zxsiki0pmdpyrg7vcfxx2x9w7pjiypva3wsr9agdjzr"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable mtl transformers transformers-compat type-equality @@ -64962,8 +65344,6 @@ self: { ]; description = "Unified interface for primitive arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "contiguous-checked" = callPackage @@ -64989,6 +65369,7 @@ self: { description = "dft of contiguous memory structures"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "continue" = callPackage @@ -65891,15 +66272,15 @@ self: { license = lib.licenses.mit; }) {}; - "core-data_0_3_0_2" = callPackage + "core-data_0_3_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, core-text , hashable, prettyprinter, scientific, text, unordered-containers , vector }: mkDerivation { pname = "core-data"; - version = "0.3.0.2"; - sha256 = "0rfx7086ilv2rld2nnq96jkygvxxsnfs81mh4b4nmb4drdw02jl0"; + version = "0.3.1.1"; + sha256 = "0i11m2k1xb97f0plvp9g7l4zhp9d1njn9z7xfhcmghbvlkk82vx2"; libraryHaskellDepends = [ aeson base bytestring containers core-text hashable prettyprinter scientific text unordered-containers vector @@ -65947,7 +66328,7 @@ self: { license = lib.licenses.mit; }) {}; - "core-program_0_4_2_0" = callPackage + "core-program_0_4_4_0" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-text, directory, exceptions, filepath, fsnotify, hashable , hourglass, mtl, prettyprinter, safe-exceptions, stm @@ -65956,8 +66337,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.4.2.0"; - sha256 = "1xbfshfy6h7afpnlaafyq4mj3x0q4i83sxk6720k0dd0hhszb6b0"; + version = "0.4.4.0"; + sha256 = "1mp694llk3b04yqv8gr7i2rwcld99xmx1m55f5fhk1vgks816kih"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -65972,17 +66353,17 @@ self: { "core-telemetry" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-program, core-text, exceptions, http-streams, io-streams - , locators, mtl, random, safe-exceptions, scientific, stm - , template-haskell, text, unix, uuid + , mtl, network-info, random, safe-exceptions, scientific, stm + , template-haskell, text, unix }: mkDerivation { pname = "core-telemetry"; - version = "0.1.8.1"; - sha256 = "024npp0cm5f3v1h70iw03hv2lj0r2ylsp7w2pm1iv6zr8j63k1iy"; + version = "0.1.9.1"; + sha256 = "11b106gs96l20zb0lyr0qw49bnm8wxfc4wcncjaip6mdvgcc8cza"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-program - core-text exceptions http-streams io-streams locators mtl random - safe-exceptions scientific stm template-haskell text unix uuid + core-text exceptions http-streams io-streams mtl network-info + random safe-exceptions scientific stm template-haskell text unix ]; description = "Advanced telemetry"; license = lib.licenses.mit; @@ -66132,8 +66513,8 @@ self: { }: mkDerivation { pname = "cornea"; - version = "0.4.0.0"; - sha256 = "0hm17g350gnklvgi5nsx03lgbx2zs9h4q11y2gi9zjnm6gv6gjrn"; + version = "0.4.0.1"; + sha256 = "1i6c2j90rban9hq7hzhf0rcq6dgzrin9jalbx2pjvqy1i6m49kn4"; libraryHaskellDepends = [ base either lens lifted-base monad-control mtl relude template-haskell th-abstraction transformers @@ -66537,6 +66918,7 @@ self: { testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ]; description = "Build tool for C"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "cplex-hs" = callPackage @@ -67254,18 +67636,21 @@ self: { "crdt-event-fold" = callPackage ({ mkDerivation, aeson, base, binary, containers - , data-default-class, data-dword, hspec, monad-logger, mtl - , transformers + , data-default-class, data-dword, exceptions, hspec, monad-logger + , mtl, transformers }: mkDerivation { pname = "crdt-event-fold"; - version = "1.4.0.0"; - sha256 = "0hagrbsgw58kchiifhq69s4hii7pv8zsvfzl3ijgxkb8iqp515gc"; + version = "1.5.1.1"; + sha256 = "1625x6zk6znfzz76pk1d1wkh2qvybdpwaxpm20kk88jsakhvg0br"; libraryHaskellDepends = [ aeson base binary containers data-default-class data-dword - monad-logger mtl transformers + exceptions monad-logger mtl transformers + ]; + testHaskellDepends = [ + aeson base binary containers data-default-class data-dword + exceptions hspec monad-logger mtl transformers ]; - testHaskellDepends = [ base hspec ]; description = "Garbage collected event folding CRDT"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -67484,10 +67869,10 @@ self: { }: mkDerivation { pname = "criterion"; - version = "1.5.12.0"; - sha256 = "0wrb48byp906f9wc9ii2mi2b2k008ycbi8ffrrj86plhp5rpvzz5"; + version = "1.5.13.0"; + sha256 = "19vrlldgw2kz5426j0iwsvvhxkbnrnan859vr6ryqh13nrg59a72"; revision = "1"; - editedCabalFile = "154jscaip9y081mvf70vcwqw0acynfb9hwxgqwmzqq9q6d8b1wfw"; + editedCabalFile = "1xpbvax71yrnilq4iixjfi3by2n8wz5r5nb2r4v9wn85xz0r8dwh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -69406,8 +69791,8 @@ self: { }: mkDerivation { pname = "curl-runnings"; - version = "0.16.0"; - sha256 = "1dghvwmwl9x7v7dn52kadp3i72k8cgyhir5adc6hw61bgk49qll0"; + version = "0.16.4"; + sha256 = "1900v9gs4mmap4xp0bypq0wz14mw2mmak9861z4rl954pz25v9pv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70059,6 +70444,8 @@ self: { pname = "d10"; version = "1.0.0.2"; sha256 = "10jc4sa986r194py1gg90mixvb2h4d1m12zwi6y5hffmrc910qva"; + revision = "1"; + editedCabalFile = "1ffwq8kfg90a5gfdm41fid7n4aszzl4j2mpnr4pp95ri174awqbz"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base hedgehog template-haskell ]; description = "Digits 0-9"; @@ -72876,25 +73263,22 @@ self: { testHaskellDepends = [ base dates hspec QuickCheck time ]; description = "Date conversions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "dates" = callPackage ({ mkDerivation, base, base-unicode-symbols, hspec, parsec, syb - , time + , template-haskell, time }: mkDerivation { pname = "dates"; - version = "0.2.3.0"; - sha256 = "1l9df5815gb8lxgl1kmsn4q58qrjqii5b957z5gn4hk5cjnr456k"; + version = "0.2.3.2"; + sha256 = "15x7nyzdzqqknxff4v08hij1gp8p1prwpzpl6ayva548xq70jz39"; libraryHaskellDepends = [ - base base-unicode-symbols parsec syb time + base base-unicode-symbols parsec syb template-haskell time ]; testHaskellDepends = [ base hspec ]; description = "Small library for parsing different dates formats"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "datetime" = callPackage @@ -73372,6 +73756,7 @@ self: { description = "Discordian Date Types for Haskell"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ddc-base" = callPackage @@ -73743,8 +74128,8 @@ self: { }: mkDerivation { pname = "dear-imgui"; - version = "1.3.0"; - sha256 = "1b8yafkgr41lizgg3zvzwf5rx1hwr84pqsrhzyfbpjhl0kbwvn54"; + version = "1.4.0"; + sha256 = "02s649lbfil4c5hqvqrqp93sag21g45hmfw2nxbnpazj1cn1bk7w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74379,28 +74764,6 @@ 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 - }: - mkDerivation { - pname = "deferred-folds"; - version = "0.9.18"; - sha256 = "15yd5wqkksainhwwiq8vlf49ih2789wz9njv7050s5mr20b2rqy1"; - libraryHaskellDepends = [ - base bytestring containers foldl hashable primitive text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Abstractions over deferred folds"; - license = lib.licenses.mit; - }) {}; - - "deferred-folds_0_9_18_1" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable , primitive, QuickCheck, quickcheck-instances, rerebase, tasty , tasty-hunit, tasty-quickcheck, text, transformers @@ -74420,7 +74783,6 @@ self: { ]; description = "Abstractions over deferred folds"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "definitive-base" = callPackage @@ -75019,6 +75381,8 @@ self: { pname = "dependent-monoidal-map"; version = "0.1.1.2"; sha256 = "11qcrxji3lvq4blzh1qk9wkhhzjkvz3maxfv63zgby98dpmkxa2x"; + revision = "1"; + editedCabalFile = "0149hmhqlj69pjg325p3da1z96czbjc18vp4i4acrvzbjh060nd4"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans @@ -75400,8 +75764,8 @@ self: { }: mkDerivation { pname = "derive-topdown"; - version = "0.0.2.2"; - sha256 = "1rymdadqwryr7ipxrw9j3m3g1n2c8l3j7wc3wphcak2nk6x2b60k"; + version = "0.0.3.0"; + sha256 = "1w36nczl0rl91sgm3vcd4gvm3lr6zdjqvmfdikkjq664xwnxrn8h"; libraryHaskellDepends = [ base mtl primitive syb template-haskell th-expand-syns transformers ]; @@ -75510,17 +75874,17 @@ self: { }) {}; "deriving-trans" = callPackage - ({ mkDerivation, base, lifted-base, monad-control, mtl - , transformers, transformers-base + ({ mkDerivation, base, monad-control, mtl, transformers + , transformers-base }: mkDerivation { pname = "deriving-trans"; - version = "0.1.0.0"; - sha256 = "1yphl0wjp67b7hc3ys6snlvzk67by070p5vfmwcv7ic688vh1dw4"; + version = "0.3.1.0"; + sha256 = "0x7kk9b08f9fplkycw2202qil3rh5l2x7l7whjlv30b0v5k885xz"; libraryHaskellDepends = [ - base lifted-base monad-control mtl transformers transformers-base + base monad-control mtl transformers transformers-base ]; - description = "Derive transformer type classes with DerivingVia"; + description = "Derive instances for monad transformer stacks"; license = lib.licenses.bsd3; }) {}; @@ -76169,8 +76533,8 @@ self: { pname = "dhall"; version = "1.40.2"; sha256 = "14wh497fipvz01zc9s31gv144spg1iqfwp6x5mlk1hjk0v9qs5by"; - revision = "1"; - editedCabalFile = "1dfnyin9rcq7ily0dlm94s7xnrsjg8ix24zsp52hl7wg4fkfc46c"; + revision = "2"; + editedCabalFile = "0mxq3knz1wpvs6jcdw6p0mnwpyy7aqriy2qdyxqzmhcbw2yn3hc1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -76317,8 +76681,8 @@ self: { pname = "dhall-docs"; version = "1.0.8"; sha256 = "1rkwvk6vd8l52nxv186fw3qdmsjvi8098yccnnbysmf41rz80fi7"; - revision = "1"; - editedCabalFile = "0z2xrvbfprgq5zzd862s2g8w4zr4k5wrl3vmb9vzds72yk65h3sk"; + revision = "2"; + editedCabalFile = "12virkq759imppdzpx75fyka8kqfw01xfwb0lm9mir86gjb34n2q"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -76415,8 +76779,8 @@ self: { pname = "dhall-json"; version = "1.7.9"; sha256 = "11rl46vn6lzcm9kznpfc43c3a2cbq2si2zba3k2x4j360kvg9fgn"; - revision = "1"; - editedCabalFile = "07izgs7x8ssmalv0m6r9clhx5gbs48f1bxxr3qsyxs26liqvppzq"; + revision = "2"; + editedCabalFile = "0f1jb37f5k214dzxbbhw2hij7j7srydkdp0hpkapgs5k73vjvqm4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76545,8 +76909,8 @@ self: { pname = "dhall-nixpkgs"; version = "1.0.7"; sha256 = "1s7md4b2jzgmf557clln9fc5lmdrd9xjs55dd97dv8q6krm8nabg"; - revision = "2"; - editedCabalFile = "06cz8iszdgxyy9v95ppcr5zjkrxw4mx01kvc68h88jdf8g5fgp6g"; + revision = "3"; + editedCabalFile = "135j5m3dgiyvjlw67rbx1jjnnzb5v777g6a8kkplpiv92swwslfd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -76569,8 +76933,8 @@ self: { pname = "dhall-openapi"; version = "1.0.3"; sha256 = "0k7yq7g77ws7wjfzd35ydsjwaq2kc1y0rhwjwb6yvkyvljmr0ykz"; - revision = "1"; - editedCabalFile = "0jmbgjrinlsgdw4ksqmn0lr15m6r0kxw33c5g7slnqgbnimbjrgw"; + revision = "2"; + editedCabalFile = "0cqvwbpn3njl3xm4jxcsb2dvfi6y1nm6inxanqxda7pgbysqrn8j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76595,8 +76959,8 @@ self: { pname = "dhall-recursive-adt"; version = "0.1.0.1"; sha256 = "09s3m86vflj5im2walab8d0wpvihsvxc5mzy55m10pfzr3gxsd11"; - revision = "1"; - editedCabalFile = "0phfa1y6fic6wyvm3bp56z4sj43wbf75rzggzgf763vivlnvc7xw"; + revision = "2"; + editedCabalFile = "14a524zh3vi06cnf5glhd1kdl4wsmzsaqgvsvxg5096kzn6cijqx"; libraryHaskellDepends = [ base data-fix dhall recursion-schemes ]; testHaskellDepends = [ base dhall either hedgehog recursion-schemes tasty tasty-hedgehog @@ -76723,8 +77087,8 @@ self: { pname = "dhall-yaml"; version = "1.2.9"; sha256 = "0gn9jrqihimjs8i9ksgmlkh8c64km52rmsgz2y6k3ab0igkv8dw6"; - revision = "1"; - editedCabalFile = "1mq7si8d9mkwnh6kw4041dhfppam507blr2ji3m6xw8f1pg70rcd"; + revision = "2"; + editedCabalFile = "18qshgn6vfry37sfmdwi1lijqdrhbrximbwcyi5zzz1b5nb7sa0v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76966,8 +77330,8 @@ self: { }: mkDerivation { pname = "diagrams-braille"; - version = "0.1.0.2"; - sha256 = "1jrhc8k0n9jabhg6rz22js9k3nj3v6r6klxskiksf6ajbqbzqg69"; + version = "0.1.1"; + sha256 = "1h9j1hrhpzl5rqhjnwp92sv0shc9i7yhnzpbs1dxfpyn8baws7mc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77024,10 +77388,10 @@ self: { }: mkDerivation { pname = "diagrams-cairo"; - version = "1.4.1.1"; - sha256 = "0vyd2yr55n7x71194i18lnbcshdjpnqw4qyq7vj5zx377rsz711k"; - revision = "3"; - editedCabalFile = "16jm9g9rfc7d1dy2kwq3n9wfgcj8l6c0d54lym1r6b0arc7yjqlb"; + version = "1.4.2"; + sha256 = "094vavgsfn7hxn2h7phvmx82wdhw51vqqv29p8hsvmijf1gxa7c1"; + revision = "1"; + editedCabalFile = "1pcc4vh1sb6h4bq4x2nxpynjvmif2bn1w3ddi24jbjhgr5b6ln59"; libraryHaskellDepends = [ array base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -77047,8 +77411,8 @@ self: { pname = "diagrams-canvas"; version = "1.4.1"; sha256 = "1ihmv42412d8dk3s894zd70xd386wrk9ycxkid19barry1vz5plj"; - revision = "2"; - editedCabalFile = "0x8iv0998nn42l0ph90xq50ca514m3zhac4s9zl1hc5hzivj10sl"; + revision = "3"; + editedCabalFile = "0yajv3bnzhqwr673rch0wd9vhc4kcfdpdw5p5a2x1xbrpzghksac"; libraryHaskellDepends = [ base blank-canvas cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances @@ -77224,8 +77588,8 @@ self: { pname = "diagrams-lib"; version = "1.4.5.1"; sha256 = "1hkxp549i99s45qk8zmhjvz1xyyv3i0ffl8155bifkic6fd8y2gz"; - revision = "1"; - editedCabalFile = "0yqpasggmdkzg2n67a6m20rbhzcgchnfhs66m95lnp5n9vl7v8mn"; + revision = "2"; + editedCabalFile = "12zif237fhf8r016225wsfkshwsxpqq0bm0h3k1ys5yjyk6m3x90"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -77298,6 +77662,8 @@ self: { pname = "diagrams-pgf"; version = "1.4.2"; sha256 = "1x7qz8683rsfi0gpmfmhicswmmxppil779d4mhfwkp537b6l2zmh"; + revision = "1"; + editedCabalFile = "14vfl9rihrpvdjvlndg86w1ap12lp98049jz741giy94rfbj3knp"; libraryHaskellDepends = [ base bytestring bytestring-builder colour containers diagrams-core diagrams-lib directory filepath hashable JuicyPixels mtl @@ -77354,6 +77720,8 @@ self: { pname = "diagrams-rasterific"; version = "1.4.2.2"; sha256 = "1q0b3yh7wbi3yq0y8qswhvfmcz52f6njl4dawq9gl71jyfb2g8nq"; + revision = "1"; + editedCabalFile = "1cijmn8bc2j0v3a0qp7a7zl3hrn99gwmd7vl3lv9754f5s1l1m13"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels @@ -77425,8 +77793,8 @@ self: { pname = "diagrams-svg"; version = "1.4.3.1"; sha256 = "002lgmq78c6rsvds9bgm6m4w8j6qpg260mc52hf97wj6m050l237"; - revision = "2"; - editedCabalFile = "056nfj2srbhh68jc5al8hffcfrqlr89173pjf6bhpmnzxhwlv55k"; + revision = "3"; + editedCabalFile = "03yh2nj88c91m8xq5gzcyxj55jr8sfypfgs361c90ncwn7jxz3ly"; libraryHaskellDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl @@ -77507,6 +77875,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "dialogue" = callPackage + ({ mkDerivation, base, bytestring, directory }: + mkDerivation { + pname = "dialogue"; + version = "0.1.0"; + sha256 = "03rlcyvkzm9fyqdsgswx9sgw2jdiplngw9a1rknngwnwnx5mqbpm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring directory ]; + executableHaskellDepends = [ base ]; + description = "I/O in Haskell Report 1.2"; + license = lib.licenses.bsd3; + }) {}; + "dib" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, digest, directory, filepath, mtl, process, text, time @@ -78205,6 +78587,8 @@ self: { testHaskellDepends = [ base containers fingertree hspec ]; description = "A simpler Dijkstra shortest paths implementation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dimensional" = callPackage @@ -78360,8 +78744,8 @@ self: { }: mkDerivation { pname = "diohsc"; - version = "0.1.9"; - sha256 = "1mxccj0fwj8n8zh8h997ljd4r179zyn6k63xgnhw7bgi1pjv4301"; + version = "0.1.10"; + sha256 = "1k6027dq5x156xw50pjjr8713ibqbycal653mfa8q59y6h8jvzjf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78602,20 +78986,22 @@ self: { }) {}; "directory-contents" = callPackage - ({ mkDerivation, base, containers, directory, filepath, text - , transformers, witherable + ({ mkDerivation, base, containers, coquina, directory, filepath + , here, process, text, transformers, witherable }: mkDerivation { pname = "directory-contents"; - version = "0.2.0.0"; - sha256 = "15irmkg3ll6s3dqwl4hn7mmr5kygcl11slba3mzkdhlyg567is6x"; + version = "0.2.0.1"; + sha256 = "12c157lxqn910x7x3jwzv70fhb01bszxp0r00107igddrd6dqffv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory filepath text transformers witherable ]; executableHaskellDepends = [ base filepath text ]; - testHaskellDepends = [ base filepath ]; + testHaskellDepends = [ + base coquina directory filepath here process text + ]; description = "Recursively build, navigate, and operate on a tree of directory contents"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -78783,8 +79169,8 @@ self: { }: mkDerivation { pname = "disco"; - version = "0.1.0.0"; - sha256 = "1pnqqx6dlqzxk7am66d25lcs596xfh0fw81yhyikfcb5sf1z3mx1"; + version = "0.1.2.0"; + sha256 = "0c8d7ly5v6x9pf9xhs1rlnd627d6lsna0x40qrz59xcc77n78xr3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -78870,8 +79256,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.11.0"; - sha256 = "10vak5aar5fx25ani676pi870mnnvzrn6n1b1akhdyags1hrsghm"; + version = "1.12.0"; + sha256 = "02gxfpwrxg7i9n0wca4g0dfsndrdxasdsdbp79ixwp51pvd04cad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78887,6 +79273,35 @@ self: { broken = true; }) {}; + "discord-haskell-voice" = callPackage + ({ mkDerivation, aeson, async, base, binary, BoundedChan + , bytestring, conduit, discord-haskell, lens, mtl, network + , optparse-applicative, opus, process, safe-exceptions, saltine + , stm, stm-containers, text, time, unliftio, websockets, wuss + }: + mkDerivation { + pname = "discord-haskell-voice"; + version = "2.2.1"; + sha256 = "07vwd9l9aa87wfs8gpqdi39h0j2jvc7mdn48yzkn68canv1wf95q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base binary BoundedChan bytestring conduit + discord-haskell lens mtl network opus process safe-exceptions + saltine text time unliftio websockets wuss + ]; + executableHaskellDepends = [ + aeson async base binary BoundedChan bytestring conduit + discord-haskell lens mtl network optparse-applicative opus process + safe-exceptions saltine stm stm-containers text time unliftio + websockets wuss + ]; + description = "Voice support for discord-haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {opus = null;}; + "discord-hs" = callPackage ({ mkDerivation, base, discord-gateway, discord-rest, discord-types , hashable, mtl, url, websockets @@ -79893,8 +80308,8 @@ self: { }: mkDerivation { pname = "distribution-opensuse"; - version = "1.1.1"; - sha256 = "1drjlcakv48djnqyrl50c6l974zrxm1gq3z8cx58xndfb2j0hzq6"; + version = "1.1.3"; + sha256 = "1yrir5x70nsw5rajcphmr7bzi7k2m05iw97bl7b3v3a5q1i69as5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80307,6 +80722,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "dns-patterns" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, HUnit + , parser-combinators, text + }: + mkDerivation { + pname = "dns-patterns"; + version = "0.1"; + sha256 = "01ap0j5ar81v5k9dm0vsd03271xkqwi0a1dx3s9yflg7ll98yjs8"; + libraryHaskellDepends = [ + attoparsec base bytestring parser-combinators text + ]; + testHaskellDepends = [ attoparsec base bytestring HUnit text ]; + description = "DNS name parsing and pattern matching utilities"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "dnscache" = callPackage ({ mkDerivation, base, bytestring, containers, contstuff, dns , iproute, time @@ -81161,6 +81594,8 @@ self: { ]; description = "Low-level bindings to the DocuSign API"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "docusign-base-minimal" = callPackage @@ -81733,6 +82168,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "double-conversion_2_0_4_1" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, HUnit, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "double-conversion"; + version = "2.0.4.1"; + sha256 = "1hrpqh8lbw0kkryqsya95mfnnnj0pj7zswxrn6kvfy4rf7z8v2d4"; + libraryHaskellDepends = [ base bytestring ghc-prim text ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + description = "Fast conversion between single and double precision floating point and text"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "double-extra" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, deepseq , double-conversion, rawstring-qm, text @@ -84788,6 +85241,31 @@ self: { broken = true; }) {}; + "eflint" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , exploring-interpreters, fgl, filepath, gll, haskeline, hxt, mtl + , network, regex-applicative, text, time, transformers + }: + mkDerivation { + pname = "eflint"; + version = "3.0.0.2"; + sha256 = "14rhc9kmsb9krf5h8a8041pirp8mnlfc6kxidmdz2d4r4pd8yd8k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory exploring-interpreters + fgl filepath gll hxt mtl network regex-applicative time + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory exploring-interpreters + fgl filepath gll haskeline hxt mtl network regex-applicative text + time transformers + ]; + description = "Simulation interpreter for FLINT policy descriptions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "egison" = callPackage ({ mkDerivation, base, containers, criterion, directory, exceptions , filepath, Glob, hashable, haskeline, HUnit, megaparsec, mtl @@ -86371,28 +86849,23 @@ self: { }) {}; "ema" = callPackage - ({ mkDerivation, aeson, async, base, blaze-html, blaze-markup - , commonmark, commonmark-extensions, commonmark-pandoc, containers - , data-default, directory, filepath, filepattern, fsnotify - , http-types, lvar, megaparsec, monad-logger, monad-logger-extras - , neat-interpolation, optparse-applicative, pandoc-types, parsec - , parser-combinators, relude, safe-exceptions, stm, text, time - , unicode-transforms, unionmount, unliftio, uri-encode, wai - , wai-middleware-static, wai-websockets, warp, websockets, yaml + ({ mkDerivation, aeson, async, base, constraints-extras, containers + , data-default, dependent-sum, dependent-sum-template, directory + , filepath, filepattern, http-types, lvar, monad-logger + , monad-logger-extras, neat-interpolation, optparse-applicative + , relude, text, unliftio, url-slug, wai, wai-middleware-static + , wai-websockets, warp, websockets }: mkDerivation { pname = "ema"; - version = "0.2.0.0"; - sha256 = "1pjgpy4rvpwvrdszppb51nys281aglbpjgx4yci9hklp0kbkkh9i"; + version = "0.6.0.0"; + sha256 = "0xha83himdaj64pm09dpvl0lrjvs6alk6mxh73d7ah1dbfsm79h1"; libraryHaskellDepends = [ - aeson async base blaze-html blaze-markup commonmark - commonmark-extensions commonmark-pandoc containers data-default - directory filepath filepattern fsnotify http-types lvar megaparsec - monad-logger monad-logger-extras neat-interpolation - optparse-applicative pandoc-types parsec parser-combinators relude - safe-exceptions stm text time unicode-transforms unionmount - unliftio uri-encode wai wai-middleware-static wai-websockets warp - websockets yaml + aeson async base constraints-extras containers data-default + dependent-sum dependent-sum-template directory filepath filepattern + http-types lvar monad-logger monad-logger-extras neat-interpolation + optparse-applicative relude text unliftio url-slug wai + wai-middleware-static wai-websockets warp websockets ]; description = "Static site generator library with hot reload"; license = lib.licenses.agpl3Only; @@ -87807,6 +88280,8 @@ self: { pname = "equivalence"; version = "0.3.5"; sha256 = "167njzd1cf32aa7br90rjafrxy6hw3fxkk8awifqbxjrcwm5maqp"; + revision = "1"; + editedCabalFile = "0rc68zqj518lmlp58kbgfb945gp0iszfjn6h3y777cjrbm1jp5k4"; libraryHaskellDepends = [ base containers fail mtl STMonadTrans transformers transformers-compat @@ -87819,6 +88294,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "equivalence_0_4" = callPackage + ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans + , template-haskell, transformers, transformers-compat + }: + mkDerivation { + pname = "equivalence"; + version = "0.4"; + sha256 = "0xyj7knshfjknjd13cm7ym9hxllnbr4wvqnz8pgq8154hn7j2f1d"; + libraryHaskellDepends = [ + base containers mtl STMonadTrans transformers transformers-compat + ]; + testHaskellDepends = [ + base containers mtl QuickCheck STMonadTrans template-haskell + transformers transformers-compat + ]; + description = "Maintaining an equivalence relation implemented as union-find using STT"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "erd" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , gitrev, graphviz, parsec, raw-strings-qq, tasty, tasty-hunit @@ -89763,13 +90258,13 @@ self: { "evm-opcodes" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, data-dword - , hedgehog, hspec, tasty, tasty-discover, tasty-hedgehog - , tasty-hspec, text + , hedgehog, hspec, tasty, tasty-bench, tasty-discover + , tasty-hedgehog, tasty-hspec, text }: mkDerivation { pname = "evm-opcodes"; - version = "0.1.0"; - sha256 = "1bjn8i6d6vccms4xzs877cpmd75v0kgd349a024gig3rfsxqadn5"; + version = "0.1.1"; + sha256 = "07y2j1d6q9mnq3qaz2nf9394p88rnil6naanfxb608d9qa0cxbg9"; libraryHaskellDepends = [ base bytestring cereal containers data-dword text ]; @@ -89778,6 +90273,9 @@ self: { tasty-discover tasty-hedgehog tasty-hspec text ]; testToolDepends = [ tasty-discover ]; + benchmarkHaskellDepends = [ + base bytestring cereal containers data-dword tasty-bench text + ]; description = "Opcode types for Ethereum Virtual Machine (EVM)"; license = lib.licenses.mit; }) {}; @@ -91884,36 +92382,36 @@ self: { license = lib.licenses.bsd3; }) {}; - "fakedata_1_0_1" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq - , directory, exceptions, fakedata-parser, filepath, gauge, hashable - , hspec, hspec-discover, QuickCheck, random, regex-tdfa + "fakedata_1_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , deepseq, directory, exceptions, fakedata-parser, filepath, gauge + , hashable, hspec, hspec-discover, QuickCheck, random, regex-tdfa , string-random, template-haskell, text, time, transformers , unordered-containers, vector, yaml }: mkDerivation { pname = "fakedata"; - version = "1.0.1"; - sha256 = "08z3qhj93smpd2ksix3i7wcxqkz5533pkx9xf4xjq60qm99scmw6"; + version = "1.0.2"; + sha256 = "1xbp0wif3dfk4880f8lr8zj07jdqhbxalqm7bfpw6r0cv354w3l8"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - attoparsec base bytestring containers directory exceptions + aeson attoparsec base bytestring containers directory exceptions fakedata-parser filepath hashable random string-random template-haskell text time transformers unordered-containers vector yaml ]; testHaskellDepends = [ - attoparsec base bytestring containers directory exceptions + aeson attoparsec base bytestring containers directory exceptions fakedata-parser filepath hashable hspec QuickCheck random regex-tdfa string-random template-haskell text time transformers unordered-containers vector yaml ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - attoparsec base bytestring containers deepseq directory exceptions - fakedata-parser filepath gauge hashable random string-random - template-haskell text time transformers unordered-containers vector - yaml + aeson attoparsec base bytestring containers deepseq directory + exceptions fakedata-parser filepath gauge hashable random + string-random template-haskell text time transformers + unordered-containers vector yaml ]; description = "Library for producing fake data"; license = lib.licenses.bsd3; @@ -92267,15 +92765,15 @@ self: { maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; - "fast-logger_3_1_0" = callPackage + "fast-logger_3_1_1" = callPackage ({ mkDerivation, array, auto-update, base, bytestring, directory , easy-file, filepath, hspec, hspec-discover, text, unix-compat , unix-time }: mkDerivation { pname = "fast-logger"; - version = "3.1.0"; - sha256 = "1qry775yd962zcx16k1syhx001hlkk15v6m6l3yylibhqh9b753y"; + version = "3.1.1"; + sha256 = "1rx866swvqq7lzngv4bx7qinnwmm3aa2la8caljvbfbi0xz6wps3"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text unix-compat unix-time @@ -92524,10 +93022,8 @@ self: { }: mkDerivation { pname = "fastsum"; - version = "0.1.1.1"; - sha256 = "0j9jd068xgk7nn2ilgdkv1pxngflqqgxz1pnhdssgiih04v8zw5l"; - revision = "1"; - editedCabalFile = "0mmdkpgxlc6fsl5pq8kgdh41h08m86s0y4wnan293h3c74q1xd6x"; + version = "0.2.0.0"; + sha256 = "1yjsmk8ws6y5rbv23d3jqyqz4pvkzn44dmx1gflldgdfm9xi31ac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -93174,6 +93670,22 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "fedora-dists_2_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, cached-json-file, pdc + , text, time + }: + mkDerivation { + pname = "fedora-dists"; + version = "2.0.0"; + sha256 = "1igw3rl99g48c46qzclj15896c97qd8g02pdscjwm0zid83pbimk"; + libraryHaskellDepends = [ + aeson base bytestring cached-json-file pdc text time + ]; + description = "Library for Fedora distribution versions"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "fedora-haskell-tools" = callPackage ({ mkDerivation, base, csv, directory, fedora-dists, filepath, HTTP , optparse-applicative, process, simple-cmd, simple-cmd-args, split @@ -93193,6 +93705,28 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "fedora-haskell-tools_1_0" = callPackage + ({ mkDerivation, base, bytestring, csv, directory, extra + , fedora-dists, filepath, http-conduit, http-types + , optparse-applicative, process, simple-cmd, simple-cmd-args, split + , time, unix + }: + mkDerivation { + pname = "fedora-haskell-tools"; + version = "1.0"; + sha256 = "13nqsf4p5cm9zzdryl09hcxsya5qn3h8q8wl1sz02jswkhwlhlzb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring csv directory extra fedora-dists filepath + http-conduit http-types optparse-applicative process simple-cmd + simple-cmd-args split time unix + ]; + description = "Building and maintenance tools for Fedora Haskell"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "fedora-img-dl" = callPackage ({ mkDerivation, base, bytestring, directory, filepath , http-directory, http-types, optparse-applicative, simple-cmd @@ -94852,8 +95386,8 @@ self: { }: mkDerivation { pname = "fingertree"; - version = "0.1.4.2"; - sha256 = "0zvandj8fysck7ygpn0dw5bhrhmj1s63i326nalxbfkh2ls4iacm"; + version = "0.1.5.0"; + sha256 = "0wdzpli8bpgk8lrsp105zb0y5gn1r2029laclvhz264bza93q9pk"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -97884,12 +98418,12 @@ self: { }) {}; "formatn" = callPackage - ({ mkDerivation, base, containers, text }: + ({ mkDerivation, base, containers, QuickCheck, text }: mkDerivation { pname = "formatn"; - version = "0.1.0"; - sha256 = "1svixdvwzxmf5n6vx3pgx065z2gkabk563pp38bmp5z4mxvf67d9"; - libraryHaskellDepends = [ base containers text ]; + version = "0.2.0"; + sha256 = "1hgrii092rlxhmf23ckj51rj53qkwljh3rahnm0rz4rpnrm6xxjq"; + libraryHaskellDepends = [ base containers QuickCheck text ]; description = "Formatting of doubles"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -97927,6 +98461,8 @@ self: { pname = "formatting"; version = "7.1.3"; sha256 = "1vrc2i1b6lxx2aq5hysfl3gl6miq2wbhxc384axvgrkqjbibnqc0"; + revision = "2"; + editedCabalFile = "1i3qkhxqhvqd7mqfdc1mbizw1fin7vp4dwzayc2y0sqcbg7kkns7"; libraryHaskellDepends = [ base clock double-conversion ghc-prim old-locale scientific text time transformers @@ -98261,6 +98797,8 @@ self: { pname = "foundation"; version = "0.0.26.1"; sha256 = "1hri3raqf6nhh6631gfm2yrkv4039gb0cqfa9cqmjp8bbqv28w5d"; + revision = "1"; + editedCabalFile = "0ylg660ldg20jdy61jwlvj7x606m2wjs67djijk2i9db36sgpx00"; libraryHaskellDepends = [ base basement ghc-prim ]; testHaskellDepends = [ base basement ]; benchmarkHaskellDepends = [ base basement gauge ]; @@ -98320,6 +98858,40 @@ self: { license = lib.licenses.bsd3; }) {}; + "fourmolu_0_4_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , containers, Diff, directory, dlist, exceptions, filepath + , ghc-lib-parser, gitrev, hspec, hspec-discover, HsYAML + , HsYAML-aeson, mtl, optparse-applicative, path, path-io, syb + , temporary, text + }: + mkDerivation { + pname = "fourmolu"; + version = "0.4.0.0"; + sha256 = "1mq0h6nsl7ssfwh6zqhyja7w212vn8msmlm5iwwimca279hzwywb"; + revision = "1"; + editedCabalFile = "03bwhqj547brmgk191gy3k9xayi6fqqk2f5sbz3ail1bk7b73xnq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal containers Diff directory + dlist exceptions filepath ghc-lib-parser HsYAML HsYAML-aeson mtl + syb text + ]; + executableHaskellDepends = [ + base directory filepath ghc-lib-parser gitrev optparse-applicative + text + ]; + testHaskellDepends = [ + base containers directory filepath hspec path path-io temporary + text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fourmolu_0_5_0_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring , Cabal, containers, Diff, directory, dlist, exceptions, filepath @@ -98331,6 +98903,8 @@ self: { pname = "fourmolu"; version = "0.5.0.1"; sha256 = "1dal9nl08g4c8pjkn8nbk5rxbdlnl9bbavybv52kzry7qhlg71px"; + revision = "1"; + editedCabalFile = "1jkam52bff82id2bhwmwxi52d3k85pami2530qp6xci1h488gqyh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98706,8 +99280,8 @@ self: { }: mkDerivation { pname = "freckle-app"; - version = "1.0.2.3"; - sha256 = "05khvp1gr3ngrcfz4ly9zjmxp8pdiyjmmbrc4pv2rrlpgmnj1zfk"; + version = "1.0.2.8"; + sha256 = "072jq8bqxa7h067hplhwp8zfnx1ygfcg1yxjyj10lwxdmr3barsw"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring case-insensitive conduit containers data-default datadog doctest ekg-core errors exceptions @@ -101027,7 +101601,7 @@ self: { license = lib.licenses.isc; }) {}; - "futhark_0_21_4" = callPackage + "futhark_0_21_6" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base , base16-bytestring, binary, blaze-html, bmp, bytestring , bytestring-to-vector, cmark-gfm, containers, cryptohash-md5 @@ -101042,8 +101616,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.21.4"; - sha256 = "0ij7sc9zq3l8i100kf7acwvrmqnq3f6x78wv5a7r8mfmb8bs51b3"; + version = "0.21.6"; + sha256 = "1981w3yzzfhlqs5p98mdb5b3yhhck1lvcxx12j3krsa4raclf8s6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101115,8 +101689,8 @@ self: { }: mkDerivation { pname = "futhark-server"; - version = "1.1.2.0"; - sha256 = "09kc04j5lajzc4k335sc9vcj0i0is939qvrkk10k4ib9a64nrli1"; + version = "1.1.2.1"; + sha256 = "0hbglw570j09r8f7cxcyn7dr99iykw94p6fglncw8l210jvcffbm"; libraryHaskellDepends = [ base binary bytestring directory futhark-data mtl process temporary text @@ -102894,14 +103468,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "generic-lens_2_2_0_0" = callPackage + "generic-lens_2_2_1_0" = callPackage ({ mkDerivation, base, doctest, generic-lens-core, HUnit , inspection-testing, lens, profunctors, text }: mkDerivation { pname = "generic-lens"; - version = "2.2.0.0"; - sha256 = "0n61hrfciryl33w6vxd5p1yqjfxl02n717dahlvb6fxlg9339nxp"; + version = "2.2.1.0"; + sha256 = "17an4669igzs6pwzqxnpkx9gmxwz64p32d1zcinhh5agd56y70pa"; libraryHaskellDepends = [ base generic-lens-core profunctors text ]; @@ -102924,12 +103498,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "generic-lens-core_2_2_0_0" = callPackage + "generic-lens-core_2_2_1_0" = callPackage ({ mkDerivation, base, indexed-profunctors, text }: mkDerivation { pname = "generic-lens-core"; - version = "2.2.0.0"; - sha256 = "0nj6ldwfidbyid85076gy8f5sa02xnbdhn51pkyg4dfqqz4r4hg8"; + version = "2.2.1.0"; + sha256 = "08i4c9yb6z84iknrnl9f3f343121j7ilp0a679v81nsjm9xz3rlf"; libraryHaskellDepends = [ base indexed-profunctors text ]; description = "Generically derive traversals, lenses and prisms"; license = lib.licenses.bsd3; @@ -103042,14 +103616,14 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "generic-optics_2_2_0_0" = callPackage + "generic-optics_2_2_1_0" = callPackage ({ mkDerivation, base, doctest, generic-lens-core, HUnit , inspection-testing, optics-core, text }: mkDerivation { pname = "generic-optics"; - version = "2.2.0.0"; - sha256 = "1iy7m5rs7rhk38zipwc018vcbkvlkpyr0rljkms6v0ajsvgkb783"; + version = "2.2.1.0"; + sha256 = "1bw7bbkrd1sfshzx7v1nbdnkxc82krw96x7vnl7myz9748m4472z"; libraryHaskellDepends = [ base generic-lens-core optics-core text ]; @@ -105675,6 +106249,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-events_0_17_0_2" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers, text + , vector + }: + mkDerivation { + pname = "ghc-events"; + version = "0.17.0.2"; + sha256 = "0dkzxpfiqpd1i1lhrssp1b242111228ap113iavarr9hb7y8rl72"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers text vector + ]; + executableHaskellDepends = [ base containers ]; + testHaskellDepends = [ base ]; + description = "Library and tool for parsing .eventlog files from GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-events-analyze" = callPackage ({ mkDerivation, base, blaze-svg, bytestring, containers , diagrams-lib, diagrams-svg, filepath, ghc-events, hashable, lens @@ -105761,6 +106355,19 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-exactprint_1_5_0" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "ghc-exactprint"; + version = "1.5.0"; + sha256 = "07m4cg47knrrvpyimnbc0nq9176vkzwwa64b2iqfj6azn6q2hagp"; + isLibrary = true; + isExecutable = true; + description = "ExactPrint for GHC"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -105831,6 +106438,24 @@ self: { broken = true; }) {}; + "ghc-hs-meta" = callPackage + ({ mkDerivation, base, bytestring, ghc, ghc-boot, hspec + , template-haskell + }: + mkDerivation { + pname = "ghc-hs-meta"; + version = "0.1.0.0"; + sha256 = "0csbhd6agq3siwrlkjc063jynzxplpwi3x288kw3hhaz5nz1v3ck"; + libraryHaskellDepends = [ + base bytestring ghc ghc-boot template-haskell + ]; + testHaskellDepends = [ + base bytestring ghc ghc-boot hspec template-haskell + ]; + description = "Translate Haskell source to Template Haskell expression"; + license = lib.licenses.bsd3; + }) {}; + "ghc-imported-from" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , exceptions, filepath, ghc, ghc-mod, ghc-paths, ghc-syb-utils @@ -106459,8 +107084,8 @@ self: { }: mkDerivation { pname = "ghc-source-gen"; - version = "0.4.2.0"; - sha256 = "1cb4yb48xzpdlrbw3gp6gf6nmjgyy0i9yzh63scl872allv8jfm3"; + version = "0.4.3.0"; + sha256 = "1lhqsklibgiv51hs8mnrkn784rc5sxf5z8cfv8hf9jqlny50720f"; libraryHaskellDepends = [ base ghc ]; testHaskellDepends = [ base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck @@ -106694,6 +107319,8 @@ self: { pname = "ghc-typelits-extra"; version = "0.4.3"; sha256 = "06g40q0n2d10c2zksx5rrjkvm5ywi3rh41hbiwy4zs28x9idsv18"; + revision = "1"; + editedCabalFile = "0m6z24zmi169zifz1jg4zri0izr5z37qx33c9mphy74vd6ds3zzz"; libraryHaskellDepends = [ base containers ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp @@ -107013,46 +107640,46 @@ self: { "ghcide" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base - , base16-bytestring, binary, bytestring, bytestring-encoding - , case-insensitive, containers, cryptohash-sha1, data-default - , deepseq, dependent-map, dependent-sum, Diff, directory, dlist - , exceptions, extra, filepath, fingertree, fuzzy, ghc, ghc-boot - , ghc-boot-th, ghc-check, ghc-exactprint, ghc-paths - , ghc-trace-events, ghc-typelits-knownnat, gitrev, Glob - , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb - , hls-graph, hls-plugin-api, hp2pretty, hslogger, implicit-hie - , implicit-hie-cradle, lens, lsp, lsp-test, lsp-types - , monoid-subclasses, mtl, network-uri, opentelemetry - , optparse-applicative, parallel, prettyprinter - , prettyprinter-ansi-terminal, process, QuickCheck - , quickcheck-instances, record-dot-preprocessor, record-hasfield - , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions - , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unliftio - , unliftio-core, unordered-containers, utf8-string, vector - , vector-algorithms, yaml + , base16-bytestring, binary, bytestring, case-insensitive + , containers, cryptohash-sha1, data-default, deepseq, dependent-map + , dependent-sum, Diff, directory, dlist, exceptions, extra + , filepath, fingertree, focus, fuzzy, ghc, ghc-boot, ghc-boot-th + , ghc-check, ghc-exactprint, ghc-paths, ghc-trace-events + , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable + , heapsize, hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api + , hp2pretty, hslogger, 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, process, QuickCheck + , quickcheck-instances, random, record-dot-preprocessor + , record-hasfield, regex-tdfa, retrie, rope-utf16-splay, safe + , safe-exceptions, shake, shake-bench, sorted-list, sqlite-simple + , stm, stm-containers, syb, tasty, tasty-expected-failure + , tasty-hunit, tasty-quickcheck, tasty-rerun, text, time + , transformers, unix, unliftio, unliftio-core, unordered-containers + , utf8-string, vector, vector-algorithms, yaml }: mkDerivation { pname = "ghcide"; - version = "1.5.0.1"; - sha256 = "0z6fq9p6wikcgacnqg8brq0bkphd14h7g5absw53ya047vgp02gc"; + version = "1.6.0.0"; + sha256 = "0clmpgkywzrgsnmawi5l1n2hgymrkyijpqkqc38xsgxf8nsvmh8c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array async base base16-bytestring binary - bytestring bytestring-encoding case-insensitive containers - cryptohash-sha1 data-default deepseq dependent-map dependent-sum - Diff directory dlist exceptions extra filepath fingertree fuzzy ghc - ghc-boot ghc-boot-th ghc-check ghc-exactprint ghc-paths - ghc-trace-events Glob haddock-library hashable heapsize hie-bios - hie-compat hiedb hls-graph hls-plugin-api hslogger - implicit-hie-cradle lens lsp lsp-types monoid-subclasses mtl - network-uri opentelemetry optparse-applicative parallel - prettyprinter prettyprinter-ansi-terminal regex-tdfa retrie + bytestring case-insensitive containers cryptohash-sha1 data-default + deepseq dependent-map dependent-sum Diff directory dlist exceptions + extra filepath fingertree focus fuzzy ghc ghc-boot ghc-boot-th + ghc-check ghc-exactprint ghc-paths ghc-trace-events Glob + haddock-library hashable heapsize hie-bios hie-compat hiedb + hls-graph hls-plugin-api hslogger implicit-hie-cradle lens list-t + lsp lsp-types monoid-subclasses mtl network-uri opentelemetry + optparse-applicative parallel prettyprinter + prettyprinter-ansi-terminal random regex-tdfa retrie rope-utf16-splay safe safe-exceptions sorted-list sqlite-simple stm - syb text time transformers unix unliftio unliftio-core - unordered-containers utf8-string vector vector-algorithms + stm-containers syb text time transformers unix unliftio + unliftio-core unordered-containers utf8-string vector + vector-algorithms ]; executableHaskellDepends = [ aeson base bytestring containers data-default directory extra @@ -107063,11 +107690,12 @@ self: { testHaskellDepends = [ aeson async base binary bytestring containers data-default directory extra filepath ghc ghc-typelits-knownnat haddock-library - hls-graph hls-plugin-api lens lsp lsp-test lsp-types network-uri - optparse-applicative process QuickCheck quickcheck-instances - record-dot-preprocessor record-hasfield regex-tdfa rope-utf16-splay - safe safe-exceptions shake tasty tasty-expected-failure tasty-hunit - tasty-quickcheck tasty-rerun text unordered-containers + hls-graph hls-plugin-api lens list-t lsp lsp-test lsp-types + network-uri optparse-applicative process QuickCheck + quickcheck-instances random record-dot-preprocessor record-hasfield + regex-tdfa rope-utf16-splay safe safe-exceptions shake + sqlite-simple stm stm-containers tasty tasty-expected-failure + tasty-hunit tasty-quickcheck tasty-rerun text unordered-containers ]; testToolDepends = [ implicit-hie ]; benchmarkHaskellDepends = [ @@ -109853,8 +110481,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20211231"; - sha256 = "0cpa3rl8vcm0arima8x9m5q0a9r05z0851ibr1vcria2z0mmwmi7"; + version = "10.20220127"; + sha256 = "06s80fa91cnn2r5n6d52lqqp3hpc4ksag82razs7sj19iwixan2w"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -112029,8 +112657,8 @@ self: { }: mkDerivation { pname = "gmail-simple"; - version = "0.1.0.2"; - sha256 = "03zqp5gl3jxn2y5mx3qpb9xxj1zsbsbqapz9jdmvfrxdsb1xsa56"; + version = "0.1.0.4"; + sha256 = "1xjgww7hn27x4vmj23ji3i2r2552kkinbc0170k6sc5f2bxdda6f"; libraryHaskellDepends = [ aeson base base64 blaze-html bytestring containers cryptonite http-api-data http-conduit http-media jwt text time @@ -112213,6 +112841,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "gnuplot_0_5_7" = callPackage + ({ mkDerivation, array, base, containers, data-accessor + , data-accessor-transformers, deepseq, filepath, process + , semigroups, temporary, time, transformers, utility-ht + }: + mkDerivation { + pname = "gnuplot"; + version = "0.5.7"; + sha256 = "1glahh3si5bpazsklnpwxx4h4ivgb4wyngc032797zq1496fhhm3"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base containers data-accessor data-accessor-transformers + deepseq filepath process semigroups temporary time transformers + utility-ht + ]; + description = "2D and 3D plots using gnuplot"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "gnutls" = callPackage ({ mkDerivation, base, bytestring, gnutls, monads-tf, transformers }: @@ -114604,8 +115254,8 @@ self: { pname = "goldplate"; version = "0.2.0"; sha256 = "1f2n981676ykrv08fgdj87mj5r4841a18ywvgpc2hgapsgwbgma1"; - revision = "1"; - editedCabalFile = "09lsr2pvdrlaik4icyd18yiwnm4p87831pl3bbljmdsdc4rbwkp0"; + revision = "2"; + editedCabalFile = "1wnpg7147k48nca58lp3xg8dv38jnj8k2hdbv0312d9ndqpiws8b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -115009,14 +115659,14 @@ self: { ({ mkDerivation, aeson, base, bytestring, containers, exceptions , filepath, generic-deriving, generic-random, HUnit, lens , lens-aeson, mtl, QuickCheck, quickcheck-instances, random - , raw-strings-qq, retry, tasty, tasty-hunit, tasty-quickcheck, text - , time, transformers, unix, unliftio, unordered-containers, vector - , wreq + , raw-strings-qq, retry, tasty, tasty-discover, tasty-hunit + , tasty-quickcheck, text, time, transformers, unix, unliftio + , unordered-containers, vector, wreq }: mkDerivation { pname = "gopro-plus"; - version = "0.6.0.3"; - sha256 = "1mqfp7r7l4p3xfh9scnqa0fh23vm50klg5aw1l15xh8slip11qx7"; + version = "0.6.1.1"; + sha256 = "1nip991jcv1pqa5zb83wdbf6pnimzp9d39az9zbvlvgkrrnkf522"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving generic-random lens lens-aeson mtl QuickCheck @@ -115027,9 +115677,10 @@ self: { aeson base bytestring containers exceptions filepath generic-deriving generic-random HUnit lens lens-aeson mtl QuickCheck quickcheck-instances random raw-strings-qq retry tasty - tasty-hunit tasty-quickcheck text time transformers unix unliftio - unordered-containers vector wreq + tasty-discover tasty-hunit tasty-quickcheck text time transformers + unix unliftio unordered-containers vector wreq ]; + testToolDepends = [ tasty-discover ]; description = "GoPro Plus Client API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -115936,8 +116587,8 @@ self: { }: mkDerivation { pname = "graph-trace"; - version = "0.1.0.0"; - sha256 = "1nxmj3gd77ffy0441ikvassy5figb5cgav3qbwmgir10jnrqhhbl"; + version = "0.1.0.1"; + sha256 = "1pwlgn5w4rxrd0bx69d76li2cadfzfii79ynxvay9fp719bqgbqn"; libraryHaskellDepends = [ base bytestring containers ghc ghc-boot ghc-prim random syb template-haskell transformers @@ -115952,8 +116603,8 @@ self: { }: mkDerivation { pname = "graph-trace-dot"; - version = "0.1.1.1"; - sha256 = "11hwxccy7yaz3mwixp1gjlpdfi9525ydqlbmpgyasg9ndg7dvl8i"; + version = "0.1.1.2"; + sha256 = "0wq6addzcigp21f5caljszzwcr8rhws49s93yr156c35nlcw98jl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119603,50 +120254,21 @@ self: { "hackage-security" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring - , bytestring, Cabal, containers, cryptohash-sha256, directory - , ed25519, filepath, ghc-prim, lukko, mtl, network, network-uri - , parsec, pretty, QuickCheck, tar, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, time, transformers - , unordered-containers, vector, zlib - }: - mkDerivation { - pname = "hackage-security"; - version = "0.6.0.1"; - sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli"; - revision = "9"; - editedCabalFile = "14g1zr05qcvrn5ghhjmk6pz9h2ypa84bgqddxm0sk0qxbzpnxmqi"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring Cabal - containers cryptohash-sha256 directory ed25519 filepath ghc-prim - lukko mtl network network-uri parsec pretty tar template-haskell - time transformers zlib - ]; - testHaskellDepends = [ - aeson base bytestring Cabal containers network-uri QuickCheck tar - tasty tasty-hunit tasty-quickcheck temporary time - unordered-containers vector zlib - ]; - description = "Hackage security library"; - license = lib.licenses.bsd3; - }) {}; - - "hackage-security_0_6_1_0" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring - , bytestring, Cabal, containers, cryptohash-sha256, directory - , ed25519, filepath, ghc-prim, lukko, mtl, network, network-uri - , parsec, pretty, QuickCheck, tar, tasty, tasty-hunit + , bytestring, Cabal, Cabal-syntax, containers, cryptohash-sha256 + , directory, ed25519, filepath, ghc-prim, lukko, mtl, network + , network-uri, parsec, pretty, QuickCheck, tar, tasty, tasty-hunit , tasty-quickcheck, template-haskell, temporary, text, time , transformers, unordered-containers, vector, zlib }: mkDerivation { pname = "hackage-security"; - version = "0.6.1.0"; - sha256 = "063p07hc1v1whlrwrzf0rzb6gzmba2x208ij1f2wz03zx2gsxwwb"; + version = "0.6.2.0"; + sha256 = "1jqpxcpsrixpvficqw5vdfrksg568967ncmisnd3j3jw3sxja5q8"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal - containers cryptohash-sha256 directory ed25519 filepath ghc-prim - lukko mtl network network-uri parsec pretty tar template-haskell - time transformers zlib + Cabal-syntax containers cryptohash-sha256 directory ed25519 + filepath ghc-prim lukko mtl network network-uri parsec pretty tar + template-haskell time transformers zlib ]; testHaskellDepends = [ aeson base bytestring Cabal containers network-uri QuickCheck tar @@ -119655,7 +120277,6 @@ self: { ]; description = "Hackage security library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hackage-security-HTTP" = callPackage @@ -120659,10 +121280,10 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.15.1.0"; - sha256 = "18nhpnhi63xvmb14khw1ad8rwj2lxdyhpc58gnmr9vb5zz2db6bh"; + version = "4.15.1.1"; + sha256 = "0b3bw275q1xbx8qs9a6gzzs3c9z3qdj7skqhpp09jkchi5kdvhvi"; revision = "1"; - editedCabalFile = "1kxdvh7250nvfdz5wnchyqhghhp05i06sfnjg9ar17p0wyqzv46z"; + editedCabalFile = "020nb84lc4xl87zysy5v81f91aw494r5aa917z08vw2zsd3jdl9g"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -121543,8 +122164,8 @@ self: { }: mkDerivation { pname = "hamtsolo"; - version = "1.0.3"; - sha256 = "0dbhpdfmbs6ydin2p75wqia9lcrw82gfv3kx8659gnw2ll3dmpnh"; + version = "1.0.4"; + sha256 = "1zgkwj2q3jpg6x6acrq2dbp0n0gps2wrrg2wx4ybpvy9vbw9qppc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -122106,8 +122727,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.4.1.1"; - sha256 = "164pjybk054a3h3ydfakzibngpmp8a4cbzg0sip9slfb739nz25j"; + version = "2.5.1"; + sha256 = "13v128xcjdflzqiszal8iwbnp0ia02p2n52hwlhvb5ip2c4gipkm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -123042,8 +123663,8 @@ self: { }: mkDerivation { pname = "has-transformers"; - version = "0.1.0.3"; - sha256 = "0mrz11hxm7nyxyirfz8f63w1mxf3snprrxvh2vvhmmi8p3wlay6n"; + version = "0.1.0.4"; + sha256 = "1wm8dwgcg1m2104lzgk3vdvng5mvh4xcn736nyarb9q6p99i0bq3"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base hspec operational ]; testToolDepends = [ hspec-discover ]; @@ -123555,18 +124176,6 @@ self: { }) {}; "hashids" = callPackage - ({ mkDerivation, base, bytestring, containers, split }: - mkDerivation { - pname = "hashids"; - version = "1.0.2.4"; - sha256 = "1kzkyni9hfwpvyq9rdv62iziwiax5avzd05ghsh7dgnylv41z697"; - libraryHaskellDepends = [ base bytestring containers split ]; - testHaskellDepends = [ base bytestring containers split ]; - description = "Hashids generates short, unique, non-sequential ids from numbers"; - license = lib.licenses.mit; - }) {}; - - "hashids_1_0_2_7" = callPackage ({ mkDerivation, base, bytestring, containers, hedgehog, split }: mkDerivation { pname = "hashids"; @@ -123576,7 +124185,6 @@ self: { testHaskellDepends = [ base bytestring containers hedgehog split ]; description = "Hashids generates short, unique, non-sequential ids from numbers"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hashing" = callPackage @@ -124761,29 +125369,31 @@ self: { ({ mkDerivation, aeson, aeson-pretty, async, base , base16-bytestring, binary, bytestring, containers , cryptohash-sha1, data-default, deepseq, directory, extra - , filepath, ghc, ghc-boot-th, ghc-paths, ghcide, gitrev, hashable - , hie-bios, hiedb, hls-brittany-plugin, hls-call-hierarchy-plugin - , hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin - , hls-floskell-plugin, hls-fourmolu-plugin, hls-graph - , hls-haddock-comments-plugin, hls-hlint-plugin - , hls-module-name-plugin, hls-ormolu-plugin, hls-plugin-api - , hls-pragmas-plugin, hls-refine-imports-plugin, hls-retrie-plugin - , hls-splice-plugin, hls-stylish-haskell-plugin, hls-tactics-plugin - , hls-test-utils, hslogger, hspec-expectations, lens, lsp, lsp-test + , filepath, ghc, ghc-boot-th, ghc-paths, ghcide, githash, gitrev + , hashable, hie-bios, hiedb, hls-alternate-number-format-plugin + , hls-brittany-plugin, hls-call-hierarchy-plugin, hls-class-plugin + , hls-eval-plugin, hls-explicit-imports-plugin, hls-floskell-plugin + , hls-fourmolu-plugin, hls-graph, hls-haddock-comments-plugin + , hls-hlint-plugin, hls-module-name-plugin, hls-ormolu-plugin + , hls-plugin-api, hls-pragmas-plugin + , hls-qualify-imported-names-plugin, hls-refine-imports-plugin + , hls-retrie-plugin, hls-selection-range-plugin, hls-splice-plugin + , hls-stylish-haskell-plugin, hls-tactics-plugin, hls-test-utils + , hslogger, hspec-expectations, lens, lens-aeson, lsp, lsp-test , lsp-types, mtl, optparse-applicative, optparse-simple, process - , regex-tdfa, safe-exceptions, sqlite-simple, temporary, text + , regex-tdfa, safe-exceptions, sqlite-simple, stm, temporary, text , transformers, unordered-containers }: mkDerivation { pname = "haskell-language-server"; - version = "1.5.1.0"; - sha256 = "0aixq570sbrg9nnhaxlj8lv3k1dskbz53iwp5c1ljgrlmsz786ky"; + version = "1.6.1.1"; + sha256 = "03z650zk7ma0gsmb7mirzarwg0535kwmwyf0h8a89s8bqfcd5mxf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson-pretty async base base16-bytestring bytestring containers cryptohash-sha1 data-default directory extra filepath ghc ghcide - gitrev hie-bios hiedb hls-graph hls-plugin-api hslogger lsp + githash hie-bios hiedb hls-graph hls-plugin-api hslogger lsp optparse-applicative optparse-simple process safe-exceptions sqlite-simple text unordered-containers ]; @@ -124791,20 +125401,24 @@ self: { aeson async base base16-bytestring binary bytestring containers cryptohash-sha1 data-default deepseq directory extra filepath ghc ghc-boot-th ghc-paths ghcide gitrev hashable hie-bios hiedb - hls-brittany-plugin hls-call-hierarchy-plugin hls-class-plugin - hls-eval-plugin hls-explicit-imports-plugin hls-floskell-plugin - hls-fourmolu-plugin hls-graph hls-haddock-comments-plugin - hls-hlint-plugin hls-module-name-plugin hls-ormolu-plugin - hls-plugin-api hls-pragmas-plugin hls-refine-imports-plugin - hls-retrie-plugin hls-splice-plugin hls-stylish-haskell-plugin - hls-tactics-plugin hslogger lens lsp mtl optparse-applicative - optparse-simple process regex-tdfa safe-exceptions sqlite-simple - temporary text transformers unordered-containers + hls-alternate-number-format-plugin hls-brittany-plugin + hls-call-hierarchy-plugin hls-class-plugin hls-eval-plugin + hls-explicit-imports-plugin hls-floskell-plugin hls-fourmolu-plugin + hls-graph hls-haddock-comments-plugin hls-hlint-plugin + hls-module-name-plugin hls-ormolu-plugin hls-plugin-api + hls-pragmas-plugin hls-qualify-imported-names-plugin + hls-refine-imports-plugin hls-retrie-plugin + hls-selection-range-plugin hls-splice-plugin + hls-stylish-haskell-plugin hls-tactics-plugin hslogger lens lsp mtl + optparse-applicative optparse-simple process regex-tdfa + safe-exceptions sqlite-simple stm temporary text transformers + unordered-containers ]; testHaskellDepends = [ aeson base bytestring containers data-default directory extra filepath ghcide hls-plugin-api hls-test-utils hspec-expectations - lens lsp-test lsp-types process text unordered-containers + lens lens-aeson lsp-test lsp-types process text + unordered-containers ]; testToolDepends = [ ghcide ]; description = "LSP server for GHC"; @@ -125355,10 +125969,8 @@ self: { ({ mkDerivation, array, base, happy, pretty, syb }: mkDerivation { pname = "haskell-src"; - version = "1.0.3.1"; - sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746"; - revision = "5"; - editedCabalFile = "1qaibp1b1szb3ci5lhsxa3lh7iwyfzr5gjnmb4nypqwjqs05dk2c"; + version = "1.0.4"; + sha256 = "1spkhv83hy5v1lxs44l3w53vk8zj7gnx42c40hrkj4fcz6apdiwb"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; @@ -125502,10 +126114,8 @@ self: { }: mkDerivation { pname = "haskell-src-meta"; - version = "0.8.7"; - sha256 = "1yy2dfb1ip1zqx3xh28g92209555abzvxrxiwcl95j27zzqxc6in"; - revision = "1"; - editedCabalFile = "1xf1rrbqa6fsr072xv4j4h687kk3glr9vlf16as6pdfaq7h5mz73"; + version = "0.8.9"; + sha256 = "0y3hnqg33pqzc66nl58va8lvwvmb0mx5q0p9r55i6cc3xwjahiyx"; libraryHaskellDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans ]; @@ -125517,26 +126127,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "haskell-src-meta_0_8_8" = callPackage - ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty - , syb, tasty, tasty-hunit, template-haskell, th-orphans - }: - mkDerivation { - pname = "haskell-src-meta"; - version = "0.8.8"; - sha256 = "0fg5h6k8m6hf7vwmczp8my2p1js5srhj7bcl7q0pdgd2d0lx43dd"; - libraryHaskellDepends = [ - base haskell-src-exts pretty syb template-haskell th-orphans - ]; - testHaskellDepends = [ - base containers haskell-src-exts HUnit pretty syb tasty tasty-hunit - template-haskell - ]; - description = "Parse source to template-haskell abstract syntax"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "haskell-src-meta-mwotton" = callPackage ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts , pretty, syb, template-haskell @@ -126526,8 +127116,8 @@ self: { }: mkDerivation { pname = "haskellish"; - version = "0.3.1"; - sha256 = "1a3lsdy78f4lfgrag2ppy4yp2snvn1dg5krhbxwarl70sd2j4fhg"; + version = "0.3.2"; + sha256 = "1rrzgzgajga1gvw6cfmlif1crzy7zr0dq7wyx1r6rp7sf0drrgxr"; libraryHaskellDepends = [ base containers haskell-src-exts mtl template-haskell text ]; @@ -127037,8 +127627,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.64.16"; - sha256 = "13dbx5szx87zhb5xq007lbpisr94593sf3a144a5052pbghcyj4s"; + version = "0.64.19"; + sha256 = "1vbq7wq26lc1kknrfcrxlvfbadkxjrzbv6biqkvwylg3m7iwdd7d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127085,8 +127675,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.64.16"; - sha256 = "01fgnbvwhxz4829ksv01165bvnhqyd3djjqm96819jp5r1ifzjin"; + version = "0.64.19"; + sha256 = "1ik200gd6lzd86kcfksjs49025ym47byih1k4aghck6hc55dh3jf"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -127948,7 +128538,7 @@ self: { license = lib.licenses.mit; }) {}; - "hasql_1_5_0_1" = callPackage + "hasql_1_5_0_2" = callPackage ({ mkDerivation, attoparsec, base, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , dlist, gauge, hashable, hashtables, mtl, postgresql-binary @@ -127958,8 +128548,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.5.0.1"; - sha256 = "0y8q3jh6lf9nc3xj4l1rql2g1r0id5j7gjmicqq6rqz6k0njs8h9"; + version = "1.5.0.2"; + sha256 = "1f9faq0f2bilylc0rd64s0icrp086qb0q70w4z4vih2hs0sx6fs0"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-strict-builder contravariant dlist hashable hashtables mtl postgresql-binary postgresql-libpq @@ -128120,20 +128710,20 @@ self: { "hasql-interpolate" = callPackage ({ mkDerivation, aeson, array, base, bytestring, containers , haskell-src-meta, hasql, megaparsec, mtl, scientific, tasty - , tasty-hunit, template-haskell, text, time, transformers, uuid - , vector + , tasty-hunit, template-haskell, text, time, tmp-postgres + , transformers, uuid, vector }: mkDerivation { pname = "hasql-interpolate"; - version = "0.1.0.1"; - sha256 = "134h9jrqdnvki97dq3cagzwabcnbcbls72l5f32m9s44dbrnq5bl"; + version = "0.1.0.2"; + sha256 = "1snayn9g5xa9q4c38p8s0ir6ij32js17b02qsacif6v080hqw94b"; libraryHaskellDepends = [ aeson array base bytestring containers haskell-src-meta hasql megaparsec mtl scientific template-haskell text time transformers uuid vector ]; testHaskellDepends = [ - base hasql tasty tasty-hunit template-haskell text + base hasql tasty tasty-hunit template-haskell text tmp-postgres ]; description = "QuasiQuoter that supports expression interpolation for hasql"; license = lib.licenses.bsd3; @@ -128185,8 +128775,8 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.3.0.7"; - sha256 = "1ncv3xs9kxgzibmxddrxii1ik9z6iw2p1q0lbli8n56d4y1rs570"; + version = "0.3.0.8"; + sha256 = "1yx56vi1dpymxk5c3rkk74bbghcxfp6x333xn2j4x2ls38676dvg"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -128324,6 +128914,111 @@ self: { broken = true; }) {}; + "hasql-streams-conduit" = callPackage + ({ mkDerivation, base, conduit, hasql, hasql-streams-core + , hasql-transaction-io, transformers + }: + mkDerivation { + pname = "hasql-streams-conduit"; + version = "0.1.0.0"; + sha256 = "0cv6lzn6pax98ch1qm5yjxdg3p4z6k4bjvmcz1srr9hqda2bv15b"; + libraryHaskellDepends = [ + base conduit hasql hasql-streams-core hasql-transaction-io + transformers + ]; + description = "Stream Hasql queries with Conduit"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "hasql-streams-core" = callPackage + ({ mkDerivation, base, hasql, hasql-transaction-io }: + mkDerivation { + pname = "hasql-streams-core"; + version = "0.1.0.0"; + sha256 = "01dqqs0daknyz4zn6dq13zyw5fky8ahq2mwv9kra1zl30f6xd3kh"; + libraryHaskellDepends = [ base hasql hasql-transaction-io ]; + description = "Stream Hasql queries"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "hasql-streams-example" = callPackage + ({ mkDerivation, base, bytestring, conduit, hasql + , hasql-streams-conduit, hasql-streams-pipes + , hasql-streams-streaming, hasql-streams-streamly, hasql-th + , hasql-transaction, hasql-transaction-io, mtl, pipes, rel8 + , resourcet, safe-exceptions, streaming, streamly, text + , unliftio-core + }: + mkDerivation { + pname = "hasql-streams-example"; + version = "0.1.0.0"; + sha256 = "1mj5jg1mjsn08yn1ndia1wyygbrn62dbj7fw6y2gkmqz5aysip86"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring conduit hasql hasql-streams-conduit + hasql-streams-pipes hasql-streams-streaming hasql-streams-streamly + hasql-th hasql-transaction hasql-transaction-io mtl pipes rel8 + resourcet safe-exceptions streaming streamly text unliftio-core + ]; + description = "An example program that shows how to use Hasql streams with Rel8"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "hasql-streams-pipes" = callPackage + ({ mkDerivation, base, hasql, hasql-streams-core + , hasql-transaction-io, pipes, transformers + }: + mkDerivation { + pname = "hasql-streams-pipes"; + version = "0.1.0.0"; + sha256 = "1gnlz8zq1k9gngg7qyxbiyvypmjfd1idykad8vq3q3rjwxjp4i0j"; + libraryHaskellDepends = [ + base hasql hasql-streams-core hasql-transaction-io pipes + transformers + ]; + description = "Stream Hasql queries with Pipes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "hasql-streams-streaming" = callPackage + ({ mkDerivation, base, hasql, hasql-streams-core + , hasql-transaction-io, streaming, transformers + }: + mkDerivation { + pname = "hasql-streams-streaming"; + version = "0.1.0.0"; + sha256 = "0qmwm6skp8llsj43rzkkl55if7qmgrg3lrc8nknil3z9282pbx9r"; + libraryHaskellDepends = [ + base hasql hasql-streams-core hasql-transaction-io streaming + transformers + ]; + description = "Stream Hasql queries with Streaming"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + + "hasql-streams-streamly" = callPackage + ({ mkDerivation, base, hasql, hasql-streams-core + , hasql-transaction-io, streamly, transformers + }: + mkDerivation { + pname = "hasql-streams-streamly"; + version = "0.1.0.0"; + sha256 = "08afl6cb86q46cfr86y3zzdrh6rfvj5s6l91v3y2v9mr56yr1knl"; + libraryHaskellDepends = [ + base hasql hasql-streams-core hasql-transaction-io streamly + transformers + ]; + description = "Stream Hasql queries with Streamly"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-th" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant, foldl , hasql, postgresql-syntax, template-haskell @@ -128361,6 +129056,24 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-transaction-io" = callPackage + ({ mkDerivation, base, bytestring, bytestring-tree-builder, hasql + , mtl, resourcet, safe-exceptions, transformers, unliftio-core + }: + mkDerivation { + pname = "hasql-transaction-io"; + version = "0.1.0.0"; + sha256 = "0cqm6c4axivxvw5r35ass9qa0bmgxnz7n8d8l12vz78nsfxp76ci"; + libraryHaskellDepends = [ + base bytestring bytestring-tree-builder hasql mtl resourcet + safe-exceptions transformers unliftio-core + ]; + description = "Perform IO actions during transactions for Hasql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hasql-url" = callPackage ({ mkDerivation, base, bytestring, hasql, network-uri, split, tasty , tasty-quickcheck @@ -130194,21 +130907,23 @@ self: { "headroom" = callPackage ({ mkDerivation, aeson, base, doctest, either, extra, file-embed , generic-data, hspec, hspec-discover, http-client, http-types - , microlens, microlens-th, modern-uri, mtl, mustache - , optparse-applicative, pcre-heavy, pcre-light, QuickCheck, req - , rio, string-interpolate, template-haskell, time, vcs-ignore, yaml + , microlens, microlens-aeson, microlens-th, modern-uri, mtl + , mustache, optparse-applicative, pcre-heavy, pcre-light + , persistent, persistent-sqlite, QuickCheck, req, rio + , string-interpolate, template-haskell, time, vcs-ignore, yaml }: mkDerivation { pname = "headroom"; - version = "0.4.2.0"; - sha256 = "1rg1n3pa6lh1a1flk8g8r5m1s77hl0cyd0c129rw8h1w2w2kkpj0"; + version = "0.4.3.0"; + sha256 = "17y1v6kfh1zbyqww5a4v54xqn06ix4ba8rr5dk8nfh5qsgf211d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base either extra file-embed generic-data http-client - http-types microlens microlens-th modern-uri mtl mustache - optparse-applicative pcre-heavy pcre-light req rio - string-interpolate template-haskell time vcs-ignore yaml + http-types microlens microlens-aeson microlens-th modern-uri mtl + mustache optparse-applicative pcre-heavy pcre-light persistent + persistent-sqlite req rio string-interpolate template-haskell time + vcs-ignore yaml ]; executableHaskellDepends = [ base optparse-applicative rio ]; testHaskellDepends = [ @@ -130440,8 +131155,8 @@ self: { }: mkDerivation { pname = "heavy-logger"; - version = "0.3.2.1"; - sha256 = "09m8wqldmiwys4g5fjisgfc192g55y88gr9akgfhs18nm1gggix6"; + version = "0.3.2.2"; + sha256 = "0cav6m9h4wbawzy1kpbhlm3lqsgbvsl41znya1vpdmbgn0a416mf"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default fast-logger hsyslog lifted-base monad-control monad-logger mtl stm @@ -130471,19 +131186,19 @@ self: { "heavy-logger-instances" = callPackage ({ mkDerivation, base, binary, exceptions, heavy-logger, hsyslog - , mtl, template-haskell, text, text-format-heavy + , mtl, template-haskell, text, text-format-heavy, unliftio-core }: mkDerivation { pname = "heavy-logger-instances"; - version = "0.2.0.0"; - sha256 = "0flh5j79ijkvdwhjg1gn3qkhybzspvg1jh8nib18fgzmvcx8zckm"; + version = "0.2.1.1"; + sha256 = "18pcg16v0azjzvc9dsr46s3y7wx5sz4i4lmly3d1rk2hwxc29r2q"; libraryHaskellDepends = [ base binary exceptions heavy-logger hsyslog mtl template-haskell - text text-format-heavy + text text-format-heavy unliftio-core ]; testHaskellDepends = [ base binary exceptions heavy-logger hsyslog mtl template-haskell - text text-format-heavy + text text-format-heavy unliftio-core ]; description = "Orphan instances for data types in heavy-logger package"; license = lib.licenses.bsd3; @@ -130591,8 +131306,8 @@ self: { pname = "hedgehog"; version = "1.0.5"; sha256 = "1qsqs8lmxa3wmw228cwi98vvvh9hqbc9d43i1sy2c9igw9xlhfi6"; - revision = "1"; - editedCabalFile = "0vqjjjvnbb601f6lwm90x80wb6rxhnvi4p8g04g15bfs3kxqw44z"; + revision = "2"; + editedCabalFile = "1p6vixwflgz2y1fc94kqxiv8s5jvq63xhp56cqwpw2s7d7g5chx1"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers deepseq directory erf exceptions lifted-async mmorph monad-control @@ -130607,6 +131322,33 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "hedgehog_1_1_1" = callPackage + ({ mkDerivation, ansi-terminal, async, barbies, base, bytestring + , concurrent-output, containers, deepseq, directory, erf + , exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show + , primitive, random, resourcet, stm, template-haskell, text, time + , transformers, transformers-base, wl-pprint-annotated + }: + mkDerivation { + pname = "hedgehog"; + version = "1.1.1"; + sha256 = "1qx7bjcdgczvz5xhrqz25lray9rk3wrhzqfc5vpjnvgkzvnj3mny"; + libraryHaskellDepends = [ + ansi-terminal async barbies base bytestring concurrent-output + containers deepseq directory erf exceptions lifted-async mmorph + monad-control mtl pretty-show primitive random resourcet stm + template-haskell text time transformers transformers-base + wl-pprint-annotated + ]; + testHaskellDepends = [ + base containers mmorph mtl pretty-show text transformers + ]; + description = "Release with confidence"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "hedgehog-checkers" = callPackage ({ mkDerivation, base, containers, either, hedgehog, semigroupoids , semigroups @@ -130645,6 +131387,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.5.3"; sha256 = "1qanfnvciykm5hmiqyf0icn4xn16v6zvlfal98lphhcmym26m9x1"; + revision = "1"; + editedCabalFile = "0nq1qj1hmyihyvbj0l6hdbrpk8fjf2kn97abiap5v8hdvcnznhjy"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers vector wl-pprint-annotated @@ -130671,8 +131415,8 @@ self: { ({ mkDerivation, base, containers, fakedata, hedgehog, random }: mkDerivation { pname = "hedgehog-fakedata"; - version = "0.0.1.4"; - sha256 = "1pa8kf6pxsvmfy8r29xk486cdi38881blqj1lcnjya98ilb6ldx3"; + version = "0.0.1.5"; + sha256 = "00k26d83v0646klrg0k3cf94r4fnnx3ykxv7i8shjjgbkbzlzz78"; libraryHaskellDepends = [ base fakedata hedgehog random ]; testHaskellDepends = [ base containers fakedata hedgehog ]; description = "Use 'fakedata' with 'hedgehog'"; @@ -130685,6 +131429,8 @@ self: { pname = "hedgehog-fn"; version = "1.0"; sha256 = "05drd7jsz54kgwxr5z9vifmql6xif7ma7878qddw2nss5s6wa2qp"; + revision = "1"; + editedCabalFile = "1rl2mf182yrlpgcm2130lsnq5jwrcpp16x6p47i27kjrpbm55g54"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130783,8 +131529,8 @@ self: { pname = "hedgehog-quickcheck"; version = "0.1.1"; sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp"; - revision = "1"; - editedCabalFile = "0ddmwz3ngamij2k4paf7508dnzqn4qjpgwypbpr8d6s2y95jbvfh"; + revision = "2"; + editedCabalFile = "1n7icqychb94j7s8msmih3h573vf17pn1sq79nkqric3wwf74rdp"; libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; description = "Use QuickCheck generators in Hedgehog and vice versa"; license = lib.licenses.bsd3; @@ -130842,23 +131588,21 @@ self: { license = lib.licenses.bsd3; }) {}; - "hedis_0_15_0" = callPackage + "hedis_0_15_1" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , containers, deepseq, doctest, errors, exceptions, HTTP, HUnit , mtl, network, network-uri, resource-pool, scanner, stm , test-framework, test-framework-hunit, text, time, tls - , unordered-containers, vector + , unliftio-core, unordered-containers, vector }: mkDerivation { pname = "hedis"; - version = "0.15.0"; - sha256 = "1wcsjvya9hnvgjl9vnimi3928fx2gy0glgdc30slfwnjpijs97n0"; - revision = "1"; - editedCabalFile = "0njy7nh5r935xb0za9r0hligqy0nzwlfnzlfqcvb1frkzxissydp"; + version = "0.15.1"; + sha256 = "1a09i21qmzjcx171452bm69cj188f1jha2gwj0yi7shimcqz3l8m"; libraryHaskellDepends = [ async base bytestring bytestring-lexing containers deepseq errors exceptions HTTP mtl network network-uri resource-pool scanner stm - text time tls unordered-containers vector + text time tls unliftio-core unordered-containers vector ]; testHaskellDepends = [ async base bytestring doctest HUnit mtl stm test-framework @@ -131633,8 +132377,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.8.4"; - sha256 = "1w93027i5kddn1rj5dgnmvgsadfv3s6ziyga4k3mp094wx2g6syy"; + version = "0.8.5"; + sha256 = "1m1hak1ckch84ld2x0pg7jz6gixxanbjdhslmlygpgxaq1757hax"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133805,8 +134549,8 @@ self: { }: mkDerivation { pname = "hie-compat"; - version = "0.2.1.0"; - sha256 = "0dl48y5ijr73dc1lrarvfz6bivxg42ll4y339saw1y5xmgw1c5w7"; + version = "0.2.1.1"; + sha256 = "054ll31b2j31a2yjcz7q7zxqyyszrkbaz4kzxhih4k84v9h0nhk6"; libraryHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot transformers @@ -133854,31 +134598,6 @@ self: { }) {}; "hiedb" = callPackage - ({ mkDerivation, algebraic-graphs, ansi-terminal, array, base - , bytestring, containers, directory, extra, filepath, ghc - , ghc-paths, hie-compat, hspec, lucid, mtl, optparse-applicative - , process, sqlite-simple, temporary, terminal-size, text - }: - mkDerivation { - pname = "hiedb"; - version = "0.4.0.0"; - sha256 = "1frcl9mxmn97qc97l3kw21ksapyndn6jq7yfxxrr0fvzn7jji7wv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - algebraic-graphs ansi-terminal array base bytestring containers - directory extra filepath ghc hie-compat lucid mtl - optparse-applicative sqlite-simple terminal-size text - ]; - executableHaskellDepends = [ base ghc-paths ]; - testHaskellDepends = [ - base directory filepath ghc ghc-paths hspec process temporary - ]; - description = "Generates a references DB from .hie files"; - license = lib.licenses.bsd3; - }) {}; - - "hiedb_0_4_1_0" = callPackage ({ mkDerivation, algebraic-graphs, ansi-terminal, array, base , bytestring, containers, directory, extra, filepath, ghc , ghc-paths, hie-compat, hspec, lucid, mtl, optparse-applicative @@ -133901,7 +134620,6 @@ self: { ]; description = "Generates a references DB from .hie files"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hieraclus" = callPackage @@ -136535,19 +137253,41 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hls-alternate-number-format-plugin" = callPackage + ({ mkDerivation, aeson, base, containers, filepath, ghc-boot-th + , ghcide, hie-compat, hls-graph, hls-plugin-api, hls-test-utils + , lens, lsp, mtl, QuickCheck, regex-tdfa, syb, tasty-quickcheck + , text, unordered-containers + }: + mkDerivation { + pname = "hls-alternate-number-format-plugin"; + version = "1.0.1.0"; + sha256 = "1xr4rizv1k6dx32mnny55s33cngmvy0a52sswpk17fl4zx3bd0pp"; + libraryHaskellDepends = [ + aeson base containers ghc-boot-th ghcide hie-compat hls-graph + hls-plugin-api lens lsp mtl regex-tdfa syb text + unordered-containers + ]; + testHaskellDepends = [ + base filepath hls-test-utils lsp QuickCheck regex-tdfa + tasty-quickcheck text + ]; + description = "Provide Alternate Number Formats plugin for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + "hls-brittany-plugin" = callPackage - ({ mkDerivation, base, brittany, czipwith, extra, filepath, ghc + ({ mkDerivation, base, brittany, czipwith, extra, filepath , ghc-boot-th, ghc-exactprint, ghcide, hls-plugin-api , hls-test-utils, lens, lsp-types, text, transformers }: mkDerivation { pname = "hls-brittany-plugin"; - version = "1.0.1.1"; - sha256 = "09j40rh3nn5i8h8k5hpqy1vwjjmfma8n8lf59180ravia4pfddli"; + version = "1.0.2.0"; + sha256 = "0vxlhggmbrfmf81qgpxmrpsflmi32hafhy21dxain1as5hrnxw8g"; libraryHaskellDepends = [ - base brittany czipwith extra filepath ghc ghc-boot-th - ghc-exactprint ghcide hls-plugin-api lens lsp-types text - transformers + base brittany czipwith extra filepath ghc-boot-th ghc-exactprint + ghcide hls-plugin-api lens lsp-types text transformers ]; testHaskellDepends = [ base filepath hls-test-utils ]; description = "Integration with the Brittany code formatter"; @@ -136561,8 +137301,8 @@ self: { }: mkDerivation { pname = "hls-call-hierarchy-plugin"; - version = "1.0.1.1"; - sha256 = "10faqaj4zhpl2aqlmqr8l96dij31x47vj2sfbpxhpcm5j3zxqwni"; + version = "1.0.2.0"; + sha256 = "0772kxdp6ww91a1b0c8lfxjlpvwr8smcf8ayvaxazw76hisxrrj5"; libraryHaskellDepends = [ aeson base bytestring containers extra ghc ghcide hiedb hls-plugin-api lens lsp sqlite-simple text unordered-containers @@ -136582,8 +137322,10 @@ self: { }: mkDerivation { pname = "hls-class-plugin"; - version = "1.0.1.2"; - sha256 = "1ybg6dd3m8ynhkn80189nqc8ng2lfplk3xrq7cq4mdx4bgdnjbgq"; + version = "1.0.2.0"; + sha256 = "0drpxrazhwd228skgky7xdzcf22gi1pi2lby0dj0nzpzhrdl0pw0"; + revision = "1"; + editedCabalFile = "18x8k0gwpxv0vs4d8rbl5p0pjf75apb142i0p8vssbpvjwiwx33i"; libraryHaskellDepends = [ aeson base containers ghc ghc-exactprint ghcide hls-plugin-api lens lsp text transformers @@ -136606,8 +137348,8 @@ self: { }: mkDerivation { pname = "hls-eval-plugin"; - version = "1.2.0.2"; - sha256 = "0nrlfs40hmbjjw6r01b3fcxwh01b4ap9v2ij6jyqrgkbs19qfp49"; + version = "1.2.1.0"; + sha256 = "18xjq664b8aj199gd1sswa7gndwikch77v3p1c36yshfa0rviwi8"; libraryHaskellDepends = [ aeson base containers data-default deepseq Diff directory dlist extra filepath ghc ghc-boot-th ghc-paths ghcide hashable hls-graph @@ -136649,8 +137391,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "1.0.1.2"; - sha256 = "12m0idqxx47ixyn6i03jzwp4z9xwnb5q0p0655ik03xhibwjja7d"; + version = "1.0.2.0"; + sha256 = "04v6sgzsjqk4qj586qzvfvq405z0zpc08xljxb12glmqghvi5xjg"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api lsp text unordered-containers @@ -136666,8 +137408,8 @@ self: { }: mkDerivation { pname = "hls-floskell-plugin"; - version = "1.0.0.2"; - sha256 = "0b9dil7sc334iv4kn1gbkvjg78pamlhrw12r6k2vsz57xkz1b7ls"; + version = "1.0.1.0"; + sha256 = "1slzv2c5lzxprh8yhfk8iabmmlhh3sx97m393nrnwrjcbpzq0vai"; libraryHaskellDepends = [ base floskell ghcide hls-plugin-api lsp-types text transformers ]; @@ -136682,8 +137424,8 @@ self: { }: mkDerivation { pname = "hls-fourmolu-plugin"; - version = "1.0.1.2"; - sha256 = "1w7rnb18fn71aqzspq7wic0nd1qwh5r2vr9j2yiwvp95p42zxf0n"; + version = "1.0.2.0"; + sha256 = "0n9yk539wc046i6sx68gsbrc4jfmp1nsm2nir00q4sdcf7flcvff"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens lsp text @@ -136695,19 +137437,19 @@ self: { "hls-graph" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers - , deepseq, directory, exceptions, extra, filepath, hashable - , js-dgtable, js-flot, js-jquery, primitive, time, transformers - , unordered-containers + , deepseq, directory, exceptions, extra, filepath, focus, hashable + , js-dgtable, js-flot, js-jquery, list-t, primitive, stm + , stm-containers, time, transformers, unordered-containers }: mkDerivation { pname = "hls-graph"; - version = "1.5.1.1"; - sha256 = "1ak6i03ch5xm6r4ym09k9vxfq7y5xwr9c6d84cgl8288g2i0fnpz"; + version = "1.6.0.0"; + sha256 = "0raz4gkfhxzbmg5rf65yp5p0i3mpd0rlraz90gwbvf5l1z9jlqml"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson async base bytestring containers deepseq directory exceptions - extra filepath hashable js-dgtable js-flot js-jquery primitive time - transformers unordered-containers + extra filepath focus hashable js-dgtable js-flot js-jquery list-t + primitive stm stm-containers time transformers unordered-containers ]; description = "Haskell Language Server internal graph API"; license = lib.licenses.asl20; @@ -136720,8 +137462,8 @@ self: { }: mkDerivation { pname = "hls-haddock-comments-plugin"; - version = "1.0.0.4"; - sha256 = "0c4s10jmp5whi7k48llqs51vp22fav5ldzyxq1cv38ai1wqma3g8"; + version = "1.0.1.0"; + sha256 = "1jlz6vg5ff2j2vba4yg8nymxfs7vmg5h3kzjhsj6bs2jn8kh722r"; libraryHaskellDepends = [ base containers ghc ghc-exactprint ghcide hls-plugin-api lsp-types text unordered-containers @@ -136736,18 +137478,18 @@ self: { , containers, data-default, deepseq, Diff, directory, extra , filepath, ghc, ghc-exactprint, ghc-lib, ghc-lib-parser-ex, ghcide , hashable, hlint, hls-plugin-api, hls-test-utils, hslogger, lens - , lsp, lsp-types, regex-tdfa, temporary, text, transformers + , lsp, lsp-types, regex-tdfa, stm, temporary, text, transformers , unordered-containers }: mkDerivation { pname = "hls-hlint-plugin"; - version = "1.0.2.1"; - sha256 = "11a6gkz4af137zdg0m4bipjy2vn8bmarjd127sdrwli3vy7jzs3s"; + version = "1.0.3.0"; + sha256 = "0vzgsh6x8bjgi3l6nc9kfgbczxnd7fws5bmglac5khr0z042babb"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc ghc-exactprint ghc-lib ghc-lib-parser-ex ghcide hashable hlint hls-plugin-api hslogger - lens lsp regex-tdfa temporary text transformers + lens lsp regex-tdfa stm temporary text transformers unordered-containers ]; testHaskellDepends = [ @@ -136765,8 +137507,8 @@ self: { }: mkDerivation { pname = "hls-module-name-plugin"; - version = "1.0.0.3"; - sha256 = "0nymxfwvqalmwgv3a0a5a10vk8yi6k7r3gb1yyd0iz6vkz6k10p3"; + version = "1.0.1.0"; + sha256 = "108p9j01d2s14akbwgwmpwb2a5r5d14vqzy6lw8n5cymgfdlza4a"; libraryHaskellDepends = [ aeson base directory filepath ghcide hls-plugin-api lsp text transformers unordered-containers @@ -136783,8 +137525,8 @@ self: { }: mkDerivation { pname = "hls-ormolu-plugin"; - version = "1.0.1.2"; - sha256 = "1kp63ydmczvjbwzkmxzd8m4fnm8yljzxraisa85sd7pagv2djh7q"; + version = "1.0.2.0"; + sha256 = "1jbh16z4yzl3lx9q7pcrkfrmip6rifif3rirfn7dvyj1q7cf1fk4"; libraryHaskellDepends = [ base filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp ormolu text @@ -136796,37 +137538,41 @@ self: { "hls-plugin-api" = callPackage ({ mkDerivation, aeson, base, containers, data-default - , dependent-map, dependent-sum, Diff, dlist, ghc, hashable - , hls-graph, hslogger, lens, lsp, opentelemetry - , optparse-applicative, process, regex-tdfa, text, unix + , dependent-map, dependent-sum, Diff, dlist, extra, ghc, hashable + , hls-graph, hslogger, lens, lens-aeson, lsp, lsp-types + , opentelemetry, optparse-applicative, process, regex-tdfa, tasty + , tasty-hunit, tasty-rerun, text, transformers, unix , unordered-containers }: mkDerivation { pname = "hls-plugin-api"; - version = "1.2.0.2"; - sha256 = "0mrfkqrkgvg53za026rfk6yqyyr1irk9k6k375dylaas7qlh0f0p"; + version = "1.3.0.0"; + sha256 = "0dkpamqgw2icx6zns79cpzsnsr33qg0i3ix66hvcl5fhhp363g9m"; libraryHaskellDepends = [ aeson base containers data-default dependent-map dependent-sum Diff - dlist ghc hashable hls-graph hslogger lens lsp opentelemetry - optparse-applicative process regex-tdfa text unix - unordered-containers + dlist extra ghc hashable hls-graph hslogger lens lens-aeson lsp + opentelemetry optparse-applicative process regex-tdfa text + transformers unix unordered-containers + ]; + testHaskellDepends = [ + base lsp-types tasty tasty-hunit tasty-rerun ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; }) {}; "hls-pragmas-plugin" = callPackage - ({ mkDerivation, base, extra, filepath, fuzzy, ghcide - , hls-plugin-api, hls-test-utils, lens, lsp, lsp-types, text - , transformers, unordered-containers + ({ mkDerivation, base, containers, extra, filepath, fuzzy, ghc + , ghcide, hls-plugin-api, hls-test-utils, lens, lsp, lsp-types + , text, transformers, unordered-containers }: mkDerivation { pname = "hls-pragmas-plugin"; - version = "1.0.1.1"; - sha256 = "1yy6avwff8swxrkhfcslckx6ql26w2chcv19z217s00y30z70xmq"; + version = "1.0.2.0"; + sha256 = "0bmifvjhcvwhivnx6s971nidjdb2ichphp70pahx72ai24ffqqx9"; libraryHaskellDepends = [ - base extra fuzzy ghcide hls-plugin-api lens lsp text transformers - unordered-containers + base containers extra fuzzy ghc ghcide hls-plugin-api lens lsp text + transformers unordered-containers ]; testHaskellDepends = [ base filepath hls-test-utils lens lsp-types text @@ -136835,6 +137581,24 @@ self: { license = lib.licenses.asl20; }) {}; + "hls-qualify-imported-names-plugin" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, dlist, filepath + , ghc, ghcide, hls-graph, hls-plugin-api, hls-test-utils, lsp, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "hls-qualify-imported-names-plugin"; + version = "1.0.1.0"; + sha256 = "0h456cq3qvksrkzfzpq2qsabsl3vpg4gh2mwyxc39xh4qm7ifban"; + libraryHaskellDepends = [ + aeson base containers deepseq dlist ghc ghcide hls-graph + hls-plugin-api lsp text transformers unordered-containers + ]; + testHaskellDepends = [ base filepath hls-test-utils text ]; + description = "A Haskell Language Server plugin that qualifies imported names"; + license = lib.licenses.asl20; + }) {}; + "hls-refine-imports-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, filepath, ghc , ghcide, hls-explicit-imports-plugin, hls-graph, hls-plugin-api @@ -136842,8 +137606,8 @@ self: { }: mkDerivation { pname = "hls-refine-imports-plugin"; - version = "1.0.0.2"; - sha256 = "0spxczjf85z8zvkqyqrmwjacw9f44zminm8k8ygyn6b2wh9bzyqr"; + version = "1.0.1.0"; + sha256 = "10q5yjpny5aah245ivazqn2h05ak428qc9arpzlg5ks2n4n293lf"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-explicit-imports-plugin hls-graph hls-plugin-api lsp text @@ -136856,19 +137620,16 @@ self: { "hls-rename-plugin" = callPackage ({ mkDerivation, base, containers, extra, filepath, ghc - , ghc-exactprint, ghcide, hiedb, hls-plugin-api, hls-retrie-plugin - , hls-test-utils, lsp, lsp-types, syb, text, transformers + , ghc-exactprint, ghcide, hiedb, hls-plugin-api, hls-test-utils + , lsp, lsp-types, syb, text, transformers }: mkDerivation { pname = "hls-rename-plugin"; - version = "1.0.0.0"; - sha256 = "0j13nh3fvvmj1sd11fiq9fccq23s6p7jz3m96b49kprkayx65zhh"; - revision = "1"; - editedCabalFile = "193q5qz563lvwm1vpfadr7cy7yxk15z2va5p9bw0xjz2x8yhc5fq"; + version = "1.0.0.1"; + sha256 = "04l2w3x60ayxa9a6cdmscrfvyx9fsnbl4q05m8f0s1s18zlgjf86"; libraryHaskellDepends = [ base containers extra ghc ghc-exactprint ghcide hiedb - hls-plugin-api hls-retrie-plugin lsp lsp-types syb text - transformers + hls-plugin-api lsp lsp-types syb text transformers ]; testHaskellDepends = [ base filepath hls-test-utils ]; description = "Rename plugin for Haskell Language Server"; @@ -136876,23 +137637,45 @@ self: { }) {}; "hls-retrie-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, directory, extra - , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie - , safe-exceptions, text, transformers, unordered-containers + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , directory, extra, ghc, ghcide, hashable, hls-plugin-api, lsp + , lsp-types, retrie, safe-exceptions, stm, text, transformers + , unordered-containers }: mkDerivation { pname = "hls-retrie-plugin"; - version = "1.0.1.4"; - sha256 = "18ldvywi8zl08xfd1z4dhj84xhxa9kq0hdminv6d3xf470ghkrdv"; + version = "1.0.2.0"; + sha256 = "0w41di7rqy8xrcaavzlfhai73yw0whmnyqxhyfjwx93y1sy1l6zg"; libraryHaskellDepends = [ - aeson base containers deepseq directory extra ghc ghcide hashable - hls-plugin-api lsp lsp-types retrie safe-exceptions text - transformers unordered-containers + aeson base bytestring containers deepseq directory extra ghc ghcide + hashable hls-plugin-api lsp lsp-types retrie safe-exceptions stm + text transformers unordered-containers ]; description = "Retrie integration plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; + "hls-selection-range-plugin" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, extra + , filepath, ghcide, hls-plugin-api, hls-test-utils, lens, lsp + , lsp-test, mtl, semigroupoids, text, transformers + }: + mkDerivation { + pname = "hls-selection-range-plugin"; + version = "1.0.0.0"; + sha256 = "1pfgxz7nyqr8gaxxv7nc0d4rpfc4rbgdkafy1fpgcsbkqx9llkn0"; + libraryHaskellDepends = [ + aeson base containers extra ghcide hls-plugin-api lsp mtl + semigroupoids text transformers + ]; + testHaskellDepends = [ + base bytestring containers filepath hls-test-utils lens lsp + lsp-test text + ]; + description = "HLS Plugin to support smart selection range"; + license = lib.licenses.asl20; + }) {}; + "hls-splice-plugin" = callPackage ({ mkDerivation, aeson, base, containers, dlist, extra, filepath , foldl, ghc, ghc-exactprint, ghcide, hls-plugin-api @@ -136901,8 +137684,8 @@ self: { }: mkDerivation { pname = "hls-splice-plugin"; - version = "1.0.0.6"; - sha256 = "0cnm0kaimbcyrjgphz61fhs9wg4wscv8bj9c09pxxwz6npf2r3wz"; + version = "1.0.1.0"; + sha256 = "07v4rgss140vfc4xqibccimm48ys4awz7yficr0wf440p6i83qdc"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api lens lsp retrie syb text transformers unliftio-core @@ -136920,8 +137703,8 @@ self: { }: mkDerivation { pname = "hls-stylish-haskell-plugin"; - version = "1.0.0.4"; - sha256 = "0p6cqjslf9qnb2df6dvznyzily55mcs13f0kd0x64p8kf2chc6ic"; + version = "1.0.1.0"; + sha256 = "1f9g113xrb167cpdjifd2zp8ps1w2apvkghdiagc9rzw1fl0l7l4"; libraryHaskellDepends = [ base directory filepath ghc ghc-boot-th ghcide hls-plugin-api lsp-types stylish-haskell text @@ -136943,8 +137726,8 @@ self: { }: mkDerivation { pname = "hls-tactics-plugin"; - version = "1.5.0.1"; - sha256 = "1fji3m1dczswzsrvvsg00jflsq9h4jpgclyma91rcncdrl7j4ylz"; + version = "1.6.1.0"; + sha256 = "15ynxlafrs0hss5qcn4aj8iip8iy631hfgqql0irqskvf3x5yxlx"; libraryHaskellDepends = [ aeson base containers deepseq directory extra filepath fingertree generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide @@ -136971,8 +137754,8 @@ self: { }: mkDerivation { pname = "hls-test-utils"; - version = "1.1.0.2"; - sha256 = "1506438g4bzc05f8km5kcjq8hv1sk56bllbcnjkx3fdqdamr3piv"; + version = "1.2.0.0"; + sha256 = "1y3g101n7z78f5shfqfklg5zgl8gpkic0dwvpr5072dq1vvpfdvf"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default directory extra filepath ghcide hls-graph hls-plugin-api hspec @@ -138031,8 +138814,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "1.16.1"; - sha256 = "17845a9p2k2390xwnh1k2v9a1sdwjn5r5riww54nknxv2vqdkf42"; + version = "1.16.2"; + sha256 = "0yw9fnpac1ryk0pn0ikf4g1p687mvschrnpj7szlcj6am78ldqzx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138044,6 +138827,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "hoauth2_2_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, exceptions + , hashable, http-conduit, http-types, microlens, text + , unordered-containers, uri-bytestring, uri-bytestring-aeson + }: + mkDerivation { + pname = "hoauth2"; + version = "2.0.0"; + sha256 = "1052ibfliwjg6p0r9y32i5j25dankp2zcy9hjm6sxag0wjgqz3wb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring exceptions hashable http-conduit + http-types microlens text unordered-containers uri-bytestring + uri-bytestring-aeson + ]; + description = "Haskell OAuth2 authentication client"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -138183,6 +138987,8 @@ self: { testHaskellDepends = [ base hspec MissingH parsec split ]; description = "Small library for typesafe's configuration specification"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hodatime" = callPackage @@ -140899,6 +141705,7 @@ self: { ]; description = "A Riemann Client for Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hruby" = callPackage @@ -141473,8 +142280,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-api"; - version = "0.0.3.0"; - sha256 = "03h84hks4g7nvkr38li5f59vcm48if7zjjcwcyx6kakk6hikmwx1"; + version = "0.0.3.1"; + sha256 = "04mhiqk8xbm07dfqc33vwzxd0kwb9jxqbfzd3pc4qvfpkkygmy7v"; libraryHaskellDepends = [ async attoparsec base binary bytestring charset clock containers ghc-prim hashable http-types memory mtl template-haskell text @@ -141549,8 +142356,8 @@ self: { }: mkDerivation { pname = "hs-opentelemetry-instrumentation-http-client"; - version = "0.0.1.1"; - sha256 = "0rhskdibz7g87b04yr44yqxfjf28iavf2akp4m9104yp8vf099hb"; + version = "0.0.2.0"; + sha256 = "1miw1p8dzwsnmdl63jyrbw8lygb5gk1j76dix9pmpsjp2520977j"; libraryHaskellDepends = [ aeson base bytestring case-insensitive conduit hs-opentelemetry-api hs-opentelemetry-instrumentation-conduit http-client @@ -141564,6 +142371,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "hs-opentelemetry-instrumentation-persistent" = callPackage + ({ mkDerivation, base, hs-opentelemetry-api, mtl, persistent + , resourcet, text, unliftio, vault + }: + mkDerivation { + pname = "hs-opentelemetry-instrumentation-persistent"; + version = "0.0.1.0"; + sha256 = "0windpdg269g376mhza26swsvl32pfsfzqjrd9psybp9mdsw1lwq"; + libraryHaskellDepends = [ + base hs-opentelemetry-api mtl persistent resourcet text unliftio + vault + ]; + testHaskellDepends = [ + base hs-opentelemetry-api mtl persistent resourcet text unliftio + vault + ]; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "hs-opentelemetry-instrumentation-postgresql-simple" = callPackage ({ mkDerivation, base, bytestring, hs-opentelemetry-api, iproute , network, postgresql-libpq, postgresql-simple, text, unliftio @@ -142307,8 +143135,8 @@ self: { }: mkDerivation { pname = "hsaml2"; - version = "0.1.1"; - sha256 = "1jlsmsnrr3ya7az4mpb6f2spwcw3m45yzix2p3lkajbz8a6kfzac"; + version = "0.1.2"; + sha256 = "06vnnq5lvx3wrh6jl64vcm14fi4yj2yv9q424p2ixn55x0bsfk3i"; libraryHaskellDepends = [ asn1-encoding asn1-types base base64-bytestring bytestring cryptonite data-default http-types hxt hxt-charproperties @@ -142317,8 +143145,8 @@ self: { ]; libraryPkgconfigDepends = [ libxml2 ]; testHaskellDepends = [ - base base64-bytestring bytestring cryptonite HUnit hxt hxt-http - network-uri semigroups string-conversions time x509 + base base64-bytestring bytestring cryptonite http-types HUnit hxt + hxt-http network-uri semigroups string-conversions time x509 ]; description = "OASIS Security Assertion Markup Language (SAML) V2.0"; license = lib.licenses.asl20; @@ -142335,8 +143163,8 @@ self: { pname = "hsass"; version = "0.8.0"; sha256 = "1bnjvj6dpmcbpkbi4g5m5hvr0w5rmd7y5zkiwbqc8n9y4l2dkd5g"; - revision = "1"; - editedCabalFile = "0d085g21zvawl2jv6ap5fyk70c9igbjiwknvk1mgdydxbm1kvyq5"; + revision = "2"; + editedCabalFile = "11xmb3mssql6ksdra03h9cqv0pdxgyj3askapbgpx6rmziw7a136"; libraryHaskellDepends = [ base bytestring data-default-class filepath hlibsass monad-loops transformers @@ -143396,17 +144224,17 @@ self: { "hsendxmpp" = callPackage ({ mkDerivation, base, hslogger, pontarius-xmpp - , pontarius-xmpp-extras, string-class, text + , pontarius-xmpp-extras, string-class, text, tls }: mkDerivation { pname = "hsendxmpp"; - version = "0.1.2.6"; - sha256 = "1w3jm8lsll65i57iqlspw1vzvw5rr4q9qwarq896s0vr8kz68irh"; + version = "0.1.3"; + sha256 = "01zwrq37877jb39yji622ibmb8nmgqhgflb9bbl7pnf7ck7cj0aq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hslogger pontarius-xmpp pontarius-xmpp-extras string-class - text + text tls ]; description = "sendxmpp clone, sending XMPP messages via CLI"; license = lib.licenses.agpl3Only; @@ -143973,7 +144801,7 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; - "hslua_2_0_1" = callPackage + "hslua_2_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions , hslua-classes, hslua-core, hslua-marshalling , hslua-objectorientation, hslua-packaging, mtl, tasty, tasty-hslua @@ -143981,8 +144809,8 @@ self: { }: mkDerivation { pname = "hslua"; - version = "2.0.1"; - sha256 = "1qbxd2bsi7yybawjvisbkbqb6kl0jvlir53p37jq0ya1pqr5y9z0"; + version = "2.1.0"; + sha256 = "0adii64aaq20dmsxkrac8smgwa9vm1ld1rpzz3m33vyyp1yfsjka"; libraryHaskellDepends = [ base bytestring containers exceptions hslua-classes hslua-core hslua-marshalling hslua-objectorientation hslua-packaging mtl text @@ -144018,27 +144846,26 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-aeson_2_0_1" = callPackage + "hslua-aeson_2_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable - , hslua-core, hslua-marshalling, ieee754, mtl, QuickCheck - , quickcheck-instances, scientific, tasty, tasty-hunit - , tasty-quickcheck, text, unordered-containers, vector + , hslua-core, hslua-marshalling, mtl, QuickCheck + , quickcheck-instances, scientific, tasty, tasty-quickcheck, text + , unordered-containers, vector }: mkDerivation { pname = "hslua-aeson"; - version = "2.0.1"; - sha256 = "17j5gz8pjysq1dgvfqdzbcg3x7nrianzv707rrhj578661hg8h5h"; + version = "2.1.0"; + sha256 = "0x966djzb9blrs586407qx6lz8bh23s048jv9nbgzy99qwxm20db"; libraryHaskellDepends = [ aeson base bytestring containers hashable hslua-core hslua-marshalling mtl scientific text unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring containers hashable hslua-core - hslua-marshalling ieee754 mtl QuickCheck quickcheck-instances - scientific tasty tasty-hunit tasty-quickcheck text - unordered-containers vector + hslua-marshalling mtl QuickCheck quickcheck-instances scientific + tasty tasty-quickcheck text unordered-containers vector ]; - description = "Allow aeson data types to be used with lua"; + description = "Allow aeson data types to be used with Lua"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; }) {}; @@ -144051,8 +144878,8 @@ self: { }: mkDerivation { pname = "hslua-classes"; - version = "2.0.0"; - sha256 = "1vnck29395dc4rcyr082vxyf8pz5llz73rpvkl3sq8029pj9jwsl"; + version = "2.1.0"; + sha256 = "0gz30ppa7fjm555mxmwfjq767wn6z60jkw36sdmryrby1raspz4s"; libraryHaskellDepends = [ base bytestring containers exceptions hslua-core hslua-marshalling text @@ -144073,8 +144900,8 @@ self: { }: mkDerivation { pname = "hslua-core"; - version = "2.0.0.2"; - sha256 = "0hbabk6q3lfkj82v11aicnq52bibn8xnapmws8g639fnbslp66id"; + version = "2.1.0"; + sha256 = "1iaii879b13j8a8lgv78wja85ik2y5xlkv1mzckjl4nqn91968wq"; libraryHaskellDepends = [ base bytestring exceptions lua mtl text ]; @@ -144092,8 +144919,8 @@ self: { }: mkDerivation { pname = "hslua-examples"; - version = "2.0.0"; - sha256 = "12wkhs83yrragwfrgl7xdgzs4bgm3zawrkxkh16dxn619brh7n8z"; + version = "2.0.1"; + sha256 = "0llh0cq1qzy4yl03vmvyipjq83apfx5f01qnbs84a2dad9nd8bm7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -144112,8 +144939,8 @@ self: { }: mkDerivation { pname = "hslua-marshalling"; - version = "2.0.1"; - sha256 = "1s64cpy220wnjb2s2y8v96jn3dqids7wny3hwmb35pjyffaykrwl"; + version = "2.1.0"; + sha256 = "0rp2bbk3smmx223c8x781311s29c0dhk0c5z3p8z1vxr3m3lhz1c"; libraryHaskellDepends = [ base bytestring containers hslua-core mtl text ]; @@ -144142,14 +144969,14 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-module-doclayout_1_0_0" = callPackage + "hslua-module-doclayout_1_0_2" = callPackage ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit , tasty-lua, text }: mkDerivation { pname = "hslua-module-doclayout"; - version = "1.0.0"; - sha256 = "1lzyb23bg0rjxlhz7q08r30yaqbx0h74869l212bimzq2df3fvmq"; + version = "1.0.2"; + sha256 = "06r1vz2xpvmwd6pghq0g38h3xzagy9043zjqx0ilnxhdx5v5fwcd"; libraryHaskellDepends = [ base doclayout hslua text ]; testHaskellDepends = [ base doclayout hslua tasty tasty-hunit tasty-lua @@ -144175,19 +145002,21 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-module-path_1_0_0" = callPackage - ({ mkDerivation, base, filepath, hslua, hslua-marshalling + "hslua-module-path_1_0_1" = callPackage + ({ mkDerivation, base, filepath, hslua-core, hslua-marshalling , hslua-packaging, tasty, tasty-hunit, tasty-lua, text }: mkDerivation { pname = "hslua-module-path"; - version = "1.0.0"; - sha256 = "1yhalkvz2pyhv6fw1a5sd1a4zcd3qarrcbhfk6z80wh1j23cabzg"; + version = "1.0.1"; + sha256 = "1ffqfkyk4nqvk03mrdp5bz6miq0d06d1nwdklpchs55n6s95wl6x"; + revision = "1"; + editedCabalFile = "110bdz2pwnvcsnq1vlm17x91mdqfif839qgji2gjzddcj9q5pbqa"; libraryHaskellDepends = [ - base filepath hslua hslua-marshalling hslua-packaging text + base filepath hslua-core hslua-marshalling hslua-packaging text ]; testHaskellDepends = [ - base filepath hslua hslua-marshalling hslua-packaging tasty + base filepath hslua-core hslua-marshalling hslua-packaging tasty tasty-hunit tasty-lua text ]; description = "Lua module to work with file paths"; @@ -144213,15 +145042,17 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-module-system_1_0_0" = callPackage + "hslua-module-system_1_0_1" = callPackage ({ mkDerivation, base, directory, exceptions, hslua-core , hslua-marshalling, hslua-packaging, tasty, tasty-hunit, tasty-lua , temporary, text }: mkDerivation { pname = "hslua-module-system"; - version = "1.0.0"; - sha256 = "1qvc2200mi1pqckjhav3d488nc4bfh1qv4mgaqx35njda8an6l9q"; + version = "1.0.1"; + sha256 = "0mbp7yh1m167fpsvscpa1mhpdi9h2xpwghr2bxl6swg8ab4s2lzw"; + revision = "1"; + editedCabalFile = "14ixzwii8y1mab6z9c20w4p3q4in3zknffmarr02gmgl1ksrl2cw"; libraryHaskellDepends = [ base directory exceptions hslua-core hslua-marshalling hslua-packaging temporary text @@ -144252,14 +145083,16 @@ self: { license = lib.licenses.mit; }) {}; - "hslua-module-text_1_0_0" = callPackage + "hslua-module-text_1_0_1" = callPackage ({ mkDerivation, base, hslua-core, hslua-marshalling , hslua-packaging, tasty, tasty-hunit, tasty-lua, text }: mkDerivation { pname = "hslua-module-text"; - version = "1.0.0"; - sha256 = "0ymmca9nmxhwghyrbs08g0d0k49zby5rrvqjzxz332yh2nvi2fg1"; + version = "1.0.1"; + sha256 = "0p6fw5vx77999yfbc2i77x5mnlxgi7bgwhx23017q5zbvs09c739"; + revision = "1"; + editedCabalFile = "18zvaqzdphqisisvpffpkwkms7mh556zxxbwp2n2h1bv2s8f0x5s"; libraryHaskellDepends = [ base hslua-core hslua-marshalling hslua-packaging text ]; @@ -144272,18 +145105,20 @@ self: { }) {}; "hslua-module-version" = callPackage - ({ mkDerivation, base, filepath, hslua, hslua-marshalling + ({ mkDerivation, base, filepath, hslua-core, hslua-marshalling , hslua-packaging, tasty, tasty-hunit, tasty-lua, text }: mkDerivation { pname = "hslua-module-version"; - version = "1.0.0"; - sha256 = "1kbk0iva5g4garpx0d5l1gr6zlcfi565mscqr602dr88as87nfyn"; + version = "1.0.1"; + sha256 = "125kpfypq5hync80f1g1w618xrfqvi5bsqks9pg2rq1d57qxk5yc"; + revision = "1"; + editedCabalFile = "0gl9gn1pkpa3cg0sx971q45hj23kq9czcswli9yaz0mij5wqyh57"; libraryHaskellDepends = [ - base filepath hslua hslua-marshalling hslua-packaging text + base filepath hslua-core hslua-marshalling hslua-packaging text ]; testHaskellDepends = [ - base filepath hslua hslua-marshalling hslua-packaging tasty + base filepath hslua-core hslua-marshalling hslua-packaging tasty tasty-hunit tasty-lua text ]; description = "Lua module to work with version specifiers"; @@ -144300,8 +145135,8 @@ self: { }: mkDerivation { pname = "hslua-objectorientation"; - version = "2.0.1"; - sha256 = "15bz27fkfqbmqrqd0vv8z4a0yjby0s8mrkijp9d54ji9f5cbjbwd"; + version = "2.1.0"; + sha256 = "01ghqsaknl4b8l3f6src8q7b54r5crmja62mhfwhz8a35px3rzrx"; libraryHaskellDepends = [ base bytestring containers exceptions hslua-core hslua-marshalling mtl text @@ -144322,8 +145157,8 @@ self: { }: mkDerivation { pname = "hslua-packaging"; - version = "2.0.0"; - sha256 = "0zb9cdbrsqs882r56vbxi9v6r34kqhacb4dwm85j5yhdmpdy0p7d"; + version = "2.1.0"; + sha256 = "0n8vhfi59q6dzcvi4fgsjp8w0slbl8l2s5l6rxgypb6vqgm759l9"; libraryHaskellDepends = [ base containers hslua-core hslua-marshalling hslua-objectorientation mtl text @@ -145170,18 +146005,18 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-junit-formatter_1_1_0_0" = callPackage + "hspec-junit-formatter_1_1_0_1" = callPackage ({ mkDerivation, base, conduit, containers, directory, exceptions - , filepath, hspec, hspec-core, markdown-unlit, temporary, text - , time, xml-conduit, xml-types + , filepath, hspec, hspec-core, iso8601-time, markdown-unlit + , temporary, text, time, xml-conduit, xml-types }: mkDerivation { pname = "hspec-junit-formatter"; - version = "1.1.0.0"; - sha256 = "024xvpnyhlgg435bhh4klf2bl8siy7vx0k5y2nccyhv16bchhl96"; + version = "1.1.0.1"; + sha256 = "194r8bxfn525mn8vq4dcfkbsn668s11yz4mdqbfr5qy29i1bzm5p"; libraryHaskellDepends = [ base conduit containers directory exceptions filepath hspec-core - text time xml-conduit xml-types + iso8601-time text time xml-conduit xml-types ]; testHaskellDepends = [ base containers filepath hspec hspec-core markdown-unlit temporary @@ -145469,8 +146304,8 @@ self: { }: mkDerivation { pname = "hspec-snap"; - version = "1.0.2.0"; - sha256 = "1rqqyrnny5wk4xql1ddavq72qcvdhblm7ga8728i42v14n6z80i4"; + version = "1.0.3.0"; + sha256 = "19kpxxmfampssas8xjicsxka3lyscgg8yh04vxvnyiz48rr00194"; libraryHaskellDepends = [ aeson base bytestring containers digestive-functors HandsomeSoup hspec hspec-core HUnit hxt lens mtl snap snap-core text @@ -146968,8 +147803,8 @@ self: { ({ mkDerivation, base, cli-arguments, lists-flines }: mkDerivation { pname = "html-presentation-text"; - version = "0.2.0.0"; - sha256 = "08fxj4nbjz3smx7h552id5z984jbbfyfj9m5aabh5vj5gi5i9jwl"; + version = "0.2.1.0"; + sha256 = "16lnshmxhxwx31kb9nji68imb492bigcb11mngyi94xbs40jayrr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cli-arguments lists-flines ]; @@ -147147,6 +147982,8 @@ self: { pname = "htoml-megaparsec"; version = "2.1.0.4"; sha256 = "08pka0z97b461bf45nvh9gymbvbwhn2dh70dy7x22xmzrigxnxw1"; + revision = "1"; + editedCabalFile = "0sziwadc2wlkfpip65d0v2wl6ldlcbn1fww4bwgw4rvmfhyrwbbc"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector @@ -147391,20 +148228,20 @@ self: { license = lib.licenses.mit; }) {}; - "http-client_0_7_10" = callPackage + "http-client_0_7_11" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec - , http-types, iproute, mime-types, monad-control, network - , network-uri, random, stm, streaming-commons, text, time + , hspec-discover, http-types, iproute, mime-types, monad-control + , network, network-uri, random, stm, streaming-commons, text, time , transformers, zlib }: mkDerivation { pname = "http-client"; - version = "0.7.10"; - sha256 = "1rypq8hvnsb5g5hhhfhjym5lvvkz82z7yg5d8078scmhzb3r2ck2"; + version = "0.7.11"; + sha256 = "12j7vkpkm2djws6ny7vm2324c7916d0iaf1mbvf4mfjxzy2w7imv"; libraryHaskellDepends = [ - array base base64-bytestring blaze-builder bytestring + array async base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types iproute mime-types network network-uri random stm streaming-commons text time transformers @@ -147414,6 +148251,7 @@ self: { cookie deepseq directory hspec http-types monad-control network network-uri streaming-commons text time transformers zlib ]; + testToolDepends = [ hspec-discover ]; doCheck = false; description = "An HTTP client engine"; license = lib.licenses.mit; @@ -147526,6 +148364,8 @@ self: { pname = "http-client-openssl"; version = "0.3.3"; sha256 = "03rr1wz1907v3gx5qsqdkd850hy47glb574s69265pv6yspaivdx"; + revision = "1"; + editedCabalFile = "0f2x40wdd09svjylg1zwapnnqgvxid1fcakvwgxlz61a16w8sfb6"; libraryHaskellDepends = [ base bytestring HsOpenSSL HsOpenSSL-x509-system http-client network ]; @@ -147594,6 +148434,23 @@ self: { license = lib.licenses.mit; }) {}; + "http-client-restricted_0_0_5" = callPackage + ({ mkDerivation, base, connection, data-default, http-client + , http-client-tls, network, network-bsd, utf8-string + }: + mkDerivation { + pname = "http-client-restricted"; + version = "0.0.5"; + sha256 = "1vfm9qc3zr0rmq2ddgyg13i67020cdk8xqhyzfc2zcn1km2p6r85"; + libraryHaskellDepends = [ + base connection data-default http-client http-client-tls network + network-bsd utf8-string + ]; + description = "restricting the servers that http-client will use"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-client-session" = callPackage ({ mkDerivation, base-prelude, bytestring, either, http-client , mtl-prelude @@ -147655,6 +148512,31 @@ self: { license = lib.licenses.mit; }) {}; + "http-client-tls_0_3_6_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, connection + , containers, cryptonite, data-default-class, exceptions, gauge + , hspec, http-client, http-types, memory, network, network-uri + , text, tls, transformers + }: + mkDerivation { + pname = "http-client-tls"; + version = "0.3.6.1"; + sha256 = "03f8p9gxdzl6slyw1r6vpv2dqhsyjvbaawbjv75kaq0vlj3gz7xi"; + libraryHaskellDepends = [ + base bytestring case-insensitive connection containers cryptonite + data-default-class exceptions http-client http-types memory network + network-uri text tls transformers + ]; + testHaskellDepends = [ + base connection hspec http-client http-types + ]; + benchmarkHaskellDepends = [ base gauge http-client ]; + doCheck = false; + description = "http-client backend using the connection package and tls library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "http-client-websockets" = callPackage ({ mkDerivation, base, bytestring, hspec, http-client , http-client-tls, network-uri, text, websockets @@ -148316,13 +149198,12 @@ self: { , 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, system-fileio, system-filepath, text, transformers - , unordered-containers + , snap-server, text, transformers, unordered-containers }: mkDerivation { pname = "http-streams"; - version = "0.8.9.4"; - sha256 = "03xdcb0v735xdrkjlm1w56mskh3x08cbsjrcd7wn4li65ixc20xa"; + version = "0.8.9.6"; + sha256 = "1h8nnp1y4ngv6mwr3fxv428kcvrd3ming179sza8fkn49pcwdlxs"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring case-insensitive directory filepath HsOpenSSL http-common @@ -148334,8 +149215,7 @@ self: { 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 - system-fileio system-filepath text transformers - unordered-containers + text transformers unordered-containers ]; description = "An HTTP client using io-streams"; license = lib.licenses.bsd3; @@ -148444,6 +149324,41 @@ self: { license = lib.licenses.bsd3; }) {}; + "http2_3_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, filepath, gauge, Glob, heaps, hspec + , hspec-discover, http-types, mwc-random, network + , network-byte-order, network-run, psqueues, stm, text + , time-manager, typed-process, unix-time, unordered-containers + , vector + }: + mkDerivation { + pname = "http2"; + version = "3.0.3"; + sha256 = "1kv99i3pnnx31xndlkaczrpd2j5mvzbqlfz1kaw6cwlwkdnl5bhv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager unix-time + ]; + testHaskellDepends = [ + aeson aeson-pretty async base base16-bytestring bytestring + cryptonite directory filepath Glob hspec http-types network + network-byte-order network-run text typed-process + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge heaps + mwc-random network-byte-order psqueues 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 @@ -149385,8 +150300,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "hvect"; - version = "0.4.0.0"; - sha256 = "1dihbqfjwgd92khlrc8mwjxsjbwbassma3bxg8hqr7qqgwdfyl6b"; + version = "0.4.0.1"; + sha256 = "01fh0nr4dfkn4aj1fx6chiaijwg9azp8qics48n5arlwn2c4kn5p"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Simple strict heterogeneous lists"; @@ -151682,6 +152597,17 @@ self: { broken = true; }) {}; + "hypergeometric" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "hypergeometric"; + version = "0.1.2.0"; + sha256 = "19vxqc9ng2vfvqxslxb950ygdqdd3cbqs4m6nqw8mbyjgld2wqd8"; + libraryHaskellDepends = [ base ]; + description = "Hypergeometric functions"; + license = lib.licenses.agpl3Only; + }) {}; + "hyperion" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, clock , containers, deepseq, directory, exceptions, filepath @@ -151763,6 +152689,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hyperscript" = callPackage + ({ mkDerivation, base, megaparsec, text }: + mkDerivation { + pname = "hyperscript"; + version = "0.1.0.1"; + sha256 = "01rhw8i34j600x6i31z53ab4gzbdqry9src37vq51w2wk64ll7lb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base megaparsec text ]; + executableHaskellDepends = [ base megaparsec text ]; + testHaskellDepends = [ base megaparsec text ]; + description = "A parser for the _hyperscript programming language"; + license = lib.licenses.bsd3; + }) {}; + "hypertypes" = callPackage ({ mkDerivation, array, base, base-compat, binary, constraints , containers, criterion, deepseq, generic-constraints, generic-data @@ -152172,8 +153113,8 @@ self: { }: mkDerivation { pname = "ice40-prim"; - version = "0.3.1.2"; - sha256 = "1jsqisqpwvnj9fibnrs88255hqarmssq62nkm080g7h0n8a14ggr"; + version = "0.3.1.3"; + sha256 = "02971h72z9k6rv7p3lkyrf8apkk4angk71n6dyqfkvg2phark2d1"; libraryHaskellDepends = [ base clash-prelude ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise interpolate @@ -154640,8 +155581,7 @@ self: { description = "Convenient imperative eDSL over Lorentz"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; - }) {cleveland = null;}; + }) {}; "inf-interval" = callPackage ({ mkDerivation, array, base, deepseq, QuickCheck, text, vector }: @@ -155008,8 +155948,8 @@ self: { }: mkDerivation { pname = "inline-asm"; - version = "0.5.0.0"; - sha256 = "02zxgkaa4wgacgj6si4158cxgk3cdf0gkvl5avmyrivbcc18xkdi"; + version = "0.5.0.1"; + sha256 = "1h1g9k71cihc1g0jfprvklcwlcw9ymihlvnsa1fy2mfr759xgjzy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156156,15 +157096,16 @@ self: { }) {}; "interval-algebra" = callPackage - ({ mkDerivation, base, containers, foldl, hspec, QuickCheck, safe - , time, witherable + ({ mkDerivation, base, binary, containers, deepseq, foldl, hspec + , QuickCheck, safe, time, witherable }: mkDerivation { pname = "interval-algebra"; - version = "1.2.0"; - sha256 = "1n9db9p3v7da1d3j21lrm46s2py0m1rdfjpvilx43n7yd6630i81"; + version = "1.3.0"; + sha256 = "0qb23l8jsam2j58pvmqv3gcmxri1bsb1m8nayspssnrapwis0ig6"; libraryHaskellDepends = [ - base containers foldl QuickCheck safe time witherable + base binary containers deepseq foldl QuickCheck safe time + witherable ]; testHaskellDepends = [ base containers hspec QuickCheck safe time witherable @@ -156448,6 +157389,8 @@ self: { testHaskellDepends = [ base QuickCheck transformers ]; description = "bidirectional arrows, bijective functions, and invariant functors"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "invertible-grammar" = callPackage @@ -156492,6 +157435,7 @@ self: { ]; description = "invertible transformer instances for HXT Picklers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "invertible-syntax" = callPackage @@ -156840,7 +157784,6 @@ self: { ]; description = "Library for IP and MAC addresses"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ip-quoter" = callPackage @@ -157171,6 +158114,8 @@ self: { pname = "ipynb"; version = "0.2"; sha256 = "1iwia4sxg40m4d290gys72wabqmkqx24ywsaranwzk2wx5s3sx4s"; + revision = "1"; + editedCabalFile = "0fl9x5amq0g5dg57dcgc0g4ir0r1fdbx06aldsqdwzdc9zs97v6k"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring containers text unordered-containers @@ -158708,26 +159653,30 @@ self: { }) {}; "jacinda" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers, happy - , microlens, microlens-mtl, mtl, optparse-applicative - , prettyprinter, recursion, regex-rure, tasty, tasty-hunit, text + ({ mkDerivation, alex, array, base, bytestring, containers + , criterion, deepseq, directory, filepath, happy, microlens + , microlens-mtl, mtl, optparse-applicative, prettyprinter + , recursion, regex-rure, split, tasty, tasty-hunit, text , transformers, vector }: mkDerivation { pname = "jacinda"; - version = "0.2.1.0"; - sha256 = "0p7ng81dfilj277lq6sy6xb89jd8a0kr20wcndsqjg7pgp4rxpy2"; + version = "0.3.1.0"; + sha256 = "1nn3c91fhq46ng2yh9425cpxlk5mksalx5wrv1d7z0xn5m1v1387"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base bytestring containers microlens microlens-mtl mtl - prettyprinter recursion regex-rure text transformers vector + array base bytestring containers directory filepath microlens + microlens-mtl mtl prettyprinter recursion regex-rure split text + transformers vector ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base bytestring optparse-applicative ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; doHaddock = false; description = "Functional, expression-oriented data processing language"; license = lib.licenses.agpl3Only; @@ -159840,8 +160789,8 @@ self: { }: mkDerivation { pname = "jose-jwt"; - version = "0.9.2"; - sha256 = "1iwzrpgd9lhp0c2hhyv3nfcv5pw344vp1llqf9vdw5mliz116jn4"; + version = "0.9.3"; + sha256 = "1sdcf55mynij8bcwj65j3izay65q2h8dl7lqlhkm3670h3v3f91h"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal containers cryptonite memory mtl text time transformers transformers-compat @@ -161847,6 +162796,8 @@ self: { pname = "jwt"; version = "0.11.0"; sha256 = "1l9qblq11kbrrmcfnh0hcjqnhmi3qm6va3z4pmi4i32wqh3bwjnx"; + revision = "1"; + editedCabalFile = "0afy7kpsw9x2nx7d7fk3jc4rjm6mpiaihihqr5dnqg09wig760h6"; libraryHaskellDepends = [ aeson base bytestring containers cryptonite cryptostore http-types memory network-uri scientific semigroups text time @@ -162363,6 +163314,8 @@ self: { pname = "katip"; version = "0.8.7.0"; sha256 = "1m74n6fyxczfgg3swkkgr6864mzji1l0dpwpxk5zd93488zrij9v"; + revision = "1"; + editedCabalFile = "14a0j9i7vn81qwsd343pswcamldhpyiic2nld57xw2lg50rdshfj"; libraryHaskellDepends = [ aeson async auto-update base bytestring containers either hostname microlens microlens-th monad-control mtl old-locale resourcet @@ -162575,8 +163528,8 @@ self: { }: mkDerivation { pname = "katip-wai"; - version = "0.1.0.0"; - sha256 = "1y7f7a0pa9gdp9cvbdqd4xfrd5gazp2wy92hjmrf1fvp35xv1b2f"; + version = "0.1.1.0"; + sha256 = "0ajwa6ya0azbffcz2cpsd2kd8fy2s2hbklyj604f27pghl7fki06"; libraryHaskellDepends = [ aeson base bytestring clock http-types katip network text uuid wai ]; @@ -162739,6 +163692,8 @@ self: { ]; description = "Fast concurrent queues much inspired by unagi-chan"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "kbq-gu" = callPackage @@ -163270,8 +164225,8 @@ self: { }: mkDerivation { pname = "keid-core"; - version = "0.1.4.0"; - sha256 = "10jdkcp256q1n63v0pqqml9nvq0fp3paww2fy742f5xvyid927qr"; + version = "0.1.5.1"; + sha256 = "09b9zjfsk03xrp34b8z7a48ym1vyhqjwpfv7hdkn3nr3pkgljkf1"; libraryHaskellDepends = [ adjunctions base binary bytestring cryptohash-md5 derive-storable derive-storable-plugin distributive file-embed foldl geomancy @@ -163309,8 +164264,8 @@ self: { }: mkDerivation { pname = "keid-render-basic"; - version = "0.1.4.0"; - sha256 = "0dyhainb14q3gi1spdfsz31yf6xiisjyp06hzxrqz3q5fg7in0c9"; + version = "0.1.5.0"; + sha256 = "0ral2p8i7kjxhil70q2fkirbl0nq3kfrvqzk3x2ykbmx91c90ds0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ adjunctions aeson base bytestring derive-storable @@ -163537,6 +164492,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "kewar" = callPackage + ({ mkDerivation, array, base, containers, HUnit, split }: + mkDerivation { + pname = "kewar"; + version = "0.1.1.1"; + sha256 = "02bqjql9y0kp58wasr1myjf3kd6g2acmzp4f4mb8g8qfbrj15lr1"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ array base containers split ]; + executableHaskellDepends = [ array base containers split ]; + testHaskellDepends = [ array base containers HUnit split ]; + description = "CLI and library to generate QR codes"; + license = lib.licenses.mit; + }) {}; + "key" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -163901,8 +164872,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "kind-apply"; - version = "0.3.2.0"; - sha256 = "0wq0jfi8jdah6mwc6amrfjs5ld0bz86y53va9sm0hzvpiyb4bpcq"; + version = "0.3.2.1"; + sha256 = "0si02ps0aivra87sc57fss088vimvs9j32r7xhbaqv8vh0wi0ng9"; libraryHaskellDepends = [ base ]; description = "Utilities to work with lists of types"; license = lib.licenses.bsd3; @@ -163912,8 +164883,8 @@ self: { ({ mkDerivation, base, kind-apply }: mkDerivation { pname = "kind-generics"; - version = "0.4.1.2"; - sha256 = "0p5svycdf3vwfz871acv2a66qm0ab67ygl0hjdpn01qcl1mzghhm"; + version = "0.4.1.4"; + sha256 = "11l1n57wfh1gr9mn0gb9kbkjbrfghmf3qasl0l6fjlbjcl8yvzbm"; libraryHaskellDepends = [ base kind-apply ]; description = "Generic programming in GHC style for arbitrary kinds and GADTs"; license = lib.licenses.bsd3; @@ -164281,8 +165252,8 @@ self: { }: mkDerivation { pname = "koji-tool"; - version = "0.6.1"; - sha256 = "1l2w0dcy4fcv865z27661j7jmfy3blf8q321mv18dn44f3wr0xax"; + version = "0.7"; + sha256 = "1gyg76fajs7qc7mr86i0hiz5m4a0y2lqmqk67cb0glgbg53z47b7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -164296,6 +165267,40 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "koneko" = callPackage + ({ mkDerivation, aeson, array, async, base, bytestring, cmdargs + , deepseq, directory, doctest, filepath, hashtables, megaparsec + , random, regex-pcre, safe, silently, split, text, unix + , unordered-containers, vector + }: + mkDerivation { + pname = "koneko"; + version = "0.0.2"; + sha256 = "0s6wa3alj7z3jhadghf2rqkdphlr9mbx0n1lhgxljw25nj7x5z00"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson array async base bytestring cmdargs deepseq directory + filepath hashtables megaparsec random regex-pcre safe silently + split text unix unordered-containers vector + ]; + executableHaskellDepends = [ + aeson array async base bytestring cmdargs deepseq directory + filepath hashtables megaparsec random regex-pcre safe silently + split text unix unordered-containers vector + ]; + testHaskellDepends = [ + aeson array async base bytestring cmdargs deepseq directory doctest + filepath hashtables megaparsec random regex-pcre safe silently + split text unix unordered-containers vector + ]; + description = "a concatenative not-quite-lisp for kittens"; + license = lib.licenses.gpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "kontra-config" = callPackage ({ mkDerivation, base, bytestring, data-default, exceptions, text , transformers-base, unjson, utf8-string, yaml @@ -164557,20 +165562,15 @@ self: { }) {egl = null; inherit (pkgs) glew;}; "ktx-codec" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, directory - , filepath, shower, text, vector + ({ mkDerivation, base, binary, bytestring, containers, text, vector }: mkDerivation { pname = "ktx-codec"; - version = "0.0.1.3"; - sha256 = "0mm6lf8fm8zmi33s4zg8c3ar42aghdqmb3g7hv6qpcm1vc5krld4"; + version = "0.0.1.4"; + sha256 = "1n9vh7la5c359nczlla7jpf6qwbs6dx7n3fd9bnb4s2i6fpb5k0a"; libraryHaskellDepends = [ base binary bytestring containers text vector ]; - testHaskellDepends = [ - base binary bytestring containers directory filepath shower text - vector - ]; description = "Khronos texture format"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -165960,8 +166960,8 @@ self: { }: mkDerivation { pname = "language-avro"; - version = "0.1.3.1"; - sha256 = "0b54041z1sfrd7fck975i8d69agxij6jml6mxlcr41y7ywvizq0l"; + version = "0.1.4.0"; + sha256 = "1x7279nk306pc9db8bav6aj5g36g338mzjnhkgl21dqxh1qb43rx"; libraryHaskellDepends = [ avro base containers directory filepath megaparsec text vector ]; @@ -166021,6 +167021,8 @@ self: { pname = "language-c"; version = "0.9.0.1"; sha256 = "01yj353n85qcv9zvaf19f1260rip26h6gxqahplkx9fy7ybbnk6l"; + revision = "1"; + editedCabalFile = "0wvrvfphz5r2yqxgxfn0ki9vmqhxh49qx41xdidmibp5i826c2mn"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath mtl pretty process @@ -167380,10 +168382,8 @@ self: { }: mkDerivation { pname = "lapack-ffi-tools"; - version = "0.1.2.1"; - sha256 = "0hk54psm066acgn24mw5dbbhz4a0nqvyks75302cabijbp524gdh"; - revision = "1"; - editedCabalFile = "1h5chlb66ycg96ab56hwqr4qk82l19gq1pg1zfzhfdl5byg24fln"; + version = "0.1.3"; + sha256 = "0qk5a43w8xn8pp9bhmjmjyvriiin2dyf4nvk13w858hsxyx6xqkx"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -169485,8 +170485,8 @@ self: { pname = "lentil"; version = "1.5.3.2"; sha256 = "0knc3g5n6h0yzr0kpgmgk44kbwh200qafjdvwpca92n3s0wf76py"; - revision = "1"; - editedCabalFile = "07f2bmplq73fvr2qylaz5w1p5ma20nrs32jwf1gbndp3cqklwjzi"; + revision = "2"; + editedCabalFile = "0n5wklh6f33c9yzblxwbx3mx04fxdx7mmqp551z9xfy6nnwg8hrp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -169930,16 +170930,16 @@ self: { "libarchive" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, chs-cabal , composition-prelude, cpphs, criterion, deepseq, dir-traverse - , directory, dlist, filepath, hspec, hspec-core, libarchive, mtl + , directory, dlist, filepath, hspec, libarchive, mtl , pathological-bytestrings, tar, tar-conduit, temporary , unix-compat }: mkDerivation { pname = "libarchive"; - version = "3.0.3.1"; - sha256 = "1rkm6n2p41i6lxdfsrvpv5sbz2p3mgyp3xx6g437fcgjjbdsyx3q"; - revision = "1"; - editedCabalFile = "0r48nmczidz00l19cbmq05f766wipc9dwkqb3xsvbwwcazapbjkz"; + version = "3.0.3.2"; + sha256 = "000yq98nm151p0j95nm6dy2pp4g0dz8sh704ga3gcsp2dhk3vrji"; + isLibrary = true; + isExecutable = true; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -169949,7 +170949,7 @@ self: { libraryToolDepends = [ c2hs cpphs ]; testHaskellDepends = [ base bytestring composition-prelude deepseq dir-traverse directory - filepath hspec hspec-core mtl pathological-bytestrings temporary + filepath hspec mtl pathological-bytestrings temporary ]; testToolDepends = [ cpphs ]; benchmarkHaskellDepends = [ @@ -170332,8 +171332,8 @@ self: { }: mkDerivation { pname = "libmdbx"; - version = "0.2.1.0"; - sha256 = "1v5gjp1hr4c1r5nbf4r2j3pd2kxl36b9xpphmmxqin7jfmpj5fjj"; + version = "0.2.1.1"; + sha256 = "0rh6zq1p6yz858m3mb5jfqydglw54gr7pvniyjvd3zprsr0pa0jf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171300,8 +172300,8 @@ self: { }: mkDerivation { pname = "lifx-lan"; - version = "0.6.0.1"; - sha256 = "0fld72ndissfkpqzkzxvqgqqpjvii8slb5vdz4h9w5s1fzpz8rvj"; + version = "0.6.2"; + sha256 = "1lshzfgx0cgjqpxlknbsqwvhkmn2jc30zgyzj7lsr3jqqr41zssn"; libraryHaskellDepends = [ base binary bytestring composition containers extra monad-loops mtl network random safe text time transformers @@ -173517,15 +174517,15 @@ self: { license = lib.licenses.mit; }) {}; - "literatex_0_2_0_1" = callPackage + "literatex_0_2_0_2" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, conduit , filepath, optparse-applicative, tasty, tasty-hunit, text, ttc , unliftio }: mkDerivation { pname = "literatex"; - version = "0.2.0.1"; - sha256 = "0rc8ks4z9sb99ziv1ancdypsbfhb7qpyi4ha76rmq4jhs7kznkcq"; + version = "0.2.0.2"; + sha256 = "1j82z5q6dzgi7b8si0fzxa3zv8rgqdhwm82sxh3wqsb6z1jfwk37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174128,8 +175128,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "12.0"; - sha256 = "1j1cfx2ja45nyzv8yivh1803yx6cywikj4pryp74pl0bkdjszv60"; + version = "12.0.0.1"; + sha256 = "0l576wi605lqj8lgvqz1a4kd99bk93fi09gpppifbizw1vgihhy1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174408,6 +175408,8 @@ self: { pname = "loc"; version = "0.1.3.16"; sha256 = "0bizqfczhc5higdzrrhinr5q3s971a3klfl3gpffnq9gyzd16nrq"; + revision = "1"; + editedCabalFile = "1j3xgxyfqby8nca2xs0x5lvvq1pyhadkzkgrwzlkckxvhghv231h"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest hedgehog ]; description = "Types representing line and column positions and ranges in text files"; @@ -174420,6 +175422,8 @@ self: { pname = "loc-test"; version = "0.1.3.10"; sha256 = "0mppiz4nv86mfdk43w83jx3wn8c6w7g9k3m3jhgmwlgqpcpdrryd"; + revision = "1"; + editedCabalFile = "0cv2w939gdz5n8mip3d6rp7zs2s28synll1k3pbgp9w42mcw52lw"; libraryHaskellDepends = [ base containers hedgehog loc ]; description = "Test-related utilities related to the /loc/ package"; license = lib.licenses.asl20; @@ -174473,8 +175477,8 @@ self: { }: mkDerivation { pname = "localize"; - version = "0.2.0.0"; - sha256 = "1c0y3blyr36qrbqwnrb802h7nl6m3qzch4ivzajjan9xj5cbbswh"; + version = "0.2.0.1"; + sha256 = "1h1jarc6rg0ncb8grk0xf8jzjkxpiyc08jiz9qryh495v8fshdcm"; libraryHaskellDepends = [ base binary bytestring containers data-default directory filepath Glob haskell-gettext mtl setlocale text text-format-heavy time @@ -175814,8 +176818,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.13.1"; - sha256 = "1cg2y15nz193s1mwm0c6x1z8nmdwv9n8qljl1a2irh3z3nb33sd2"; + version = "0.13.2"; + sha256 = "1kb611xj1rl8jbx3bibcqdklv8kls3xkis77vix2vdf6y6fhjhfr"; libraryHaskellDepends = [ aeson-pretty base-noprelude bimap bytestring constraints containers cryptonite data-default first-class-families fmt lens morley @@ -175983,8 +176987,8 @@ self: { ({ mkDerivation, base, lua, tasty, tasty-hunit }: mkDerivation { pname = "lpeg"; - version = "1.0.1"; - sha256 = "0zhg7d85s6rx1dh3mndpjjy3k8b5ixyz28wl6i8zvn2mxyx40y98"; + version = "1.0.2"; + sha256 = "0b1khwgmvlnvan6vp46mlvhzdrhawl5s1v971bm660aq0q8jjv1k"; libraryHaskellDepends = [ base lua ]; testHaskellDepends = [ base lua tasty tasty-hunit ]; description = "LPeg – Parsing Expression Grammars For Lua"; @@ -176121,39 +177125,6 @@ self: { license = lib.licenses.mit; }) {}; - "lsp_1_2_0_1" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , containers, data-default, dependent-map, exceptions, filepath - , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl - , network-uri, QuickCheck, quickcheck-instances, random - , rope-utf16-splay, scientific, sorted-list, stm, text, time - , transformers, unliftio-core, unordered-containers, uuid - }: - mkDerivation { - pname = "lsp"; - version = "1.2.0.1"; - sha256 = "1bdgbxakdyhkrddj58f0al2wrx1mckp6hia7hk2wqjix20my8v49"; - revision = "1"; - editedCabalFile = "193y4b3l6agm83ng2c0ngvd0j9a71q237g9i5v57p502lhzfaag2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async attoparsec base bytestring containers data-default - dependent-map exceptions hashable hslogger lens lsp-types mtl - network-uri random scientific sorted-list stm text time - transformers unliftio-core unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base containers filepath hspec lens network-uri QuickCheck - quickcheck-instances rope-utf16-splay sorted-list text - unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "lsp_1_4_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, exceptions, filepath, hashable @@ -176212,34 +177183,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "lsp-test_0_14_0_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base - , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, extra, filepath, Glob, hspec, lens, lsp - , lsp-types, mtl, parser-combinators, process, some, text, time - , transformers, unix, unliftio, unordered-containers - }: - mkDerivation { - pname = "lsp-test"; - version = "0.14.0.1"; - sha256 = "0fr1812dnzv9hljb77khspaz666wqr6m1gj963v0z2j6xgvw2ipy"; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal async base bytestring conduit - conduit-parse containers data-default Diff directory filepath Glob - lens lsp-types mtl parser-combinators process some text time - transformers unix unordered-containers - ]; - testHaskellDepends = [ - aeson async base data-default directory filepath hspec lens lsp mtl - parser-combinators process text unliftio unordered-containers - ]; - testToolDepends = [ lsp ]; - benchmarkHaskellDepends = [ base extra lsp process ]; - description = "Functional test framework for LSP servers"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "lsp-test_0_14_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default @@ -176291,31 +177234,7 @@ self: { license = lib.licenses.mit; }) {}; - "lsp-types_1_3_0_1" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , data-default, deepseq, dependent-sum, dependent-sum-template - , Diff, directory, dlist, filepath, hashable, hslogger, lens, mtl - , network-uri, rope-utf16-splay, scientific, some, template-haskell - , temporary, text, unordered-containers - }: - mkDerivation { - pname = "lsp-types"; - version = "1.3.0.1"; - sha256 = "05zgd99y7xnxnydisq5x24n1af2isar172p247hb5q0mp12hdd3z"; - revision = "1"; - editedCabalFile = "031b69fxi8m4fcwwgqb7cf4k806ikkmjqnn3wv6bn3sny1hn5gg7"; - libraryHaskellDepends = [ - aeson base binary bytestring containers data-default deepseq - dependent-sum dependent-sum-template Diff directory dlist filepath - hashable hslogger lens mtl network-uri rope-utf16-splay scientific - some template-haskell temporary text unordered-containers - ]; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - - "lsp-types_1_4_0_0" = callPackage + "lsp-types_1_4_0_1" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, deepseq, Diff, directory, dlist, filepath, hashable , hslogger, lens, mod, mtl, network-uri, rope-utf16-splay @@ -176324,8 +177243,8 @@ self: { }: mkDerivation { pname = "lsp-types"; - version = "1.4.0.0"; - sha256 = "0rzvjfn26qrgb7h21m20rvdc7x730z93lgmrz4m4l7g9s2xa7s3s"; + version = "1.4.0.1"; + sha256 = "0dxf5nnaxs2564hgjldkclhm5gvszjxxvz6gk00jmx0gf8k6dm8z"; libraryHaskellDepends = [ aeson base binary bytestring containers data-default deepseq Diff directory dlist filepath hashable hslogger lens mod mtl network-uri @@ -176486,8 +177405,8 @@ self: { ({ mkDerivation, base, lua5_3, tasty, tasty-hunit }: mkDerivation { pname = "lua"; - version = "2.0.2"; - sha256 = "0hsbwws16p9xrpmx4j8f9hmz8lhjjz9b8ngb3y7pxi6lx08mypgw"; + version = "2.1.0"; + sha256 = "00fcx1by3b2bjb3sc86azr3gmy9jd1b0gilbz48pkbb7cw4p5z1c"; configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; libraryHaskellDepends = [ base ]; librarySystemDepends = [ lua5_3 ]; @@ -176502,6 +177421,8 @@ self: { pname = "lua-arbitrary"; version = "1.0.0"; sha256 = "13kfpiyln1i3d1a47fpf00lrcj4m9dyg80zrqclx7wzy9p8ixh7l"; + revision = "1"; + editedCabalFile = "19cc5vn27izx5cnpq1xj915ax16czvxaarvigggwi73cgk11hbf1"; libraryHaskellDepends = [ base lua QuickCheck ]; description = "Arbitrary instances for Lua types"; license = lib.licenses.mit; @@ -176658,12 +177579,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "lucid-alpine_0_1_0_5" = callPackage + "lucid-alpine_0_1_0_7" = callPackage ({ mkDerivation, base, lucid, text }: mkDerivation { pname = "lucid-alpine"; - version = "0.1.0.5"; - sha256 = "1prcr3rfpg3saybfjmfik9xznj0knvfxy5dwllkq6s5szi2bqyaz"; + version = "0.1.0.7"; + sha256 = "1p6cmjxbin7wj3b3cbg15gv43mcfqzm791swmhcwx0x41x41jygx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base lucid text ]; @@ -176741,12 +177662,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "lucid-htmx_0_1_0_4" = callPackage + "lucid-htmx_0_1_0_5" = callPackage ({ mkDerivation, base, lucid, servant, text }: mkDerivation { pname = "lucid-htmx"; - version = "0.1.0.4"; - sha256 = "0rq25ixsyvnp3zh3wsfmijlyv4dg94d1k1bhhwq8y624v819yg8r"; + version = "0.1.0.5"; + sha256 = "1zbk1fdril0cm4cs5scrvk1fvfkds8pgkwnb5c9vxawv5v3kgpl5"; libraryHaskellDepends = [ base lucid servant text ]; testHaskellDepends = [ base lucid servant text ]; description = "Use htmx in your lucid templates"; @@ -176754,6 +177675,21 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "lucid-hyperscript" = callPackage + ({ mkDerivation, base, lucid, template-haskell, text }: + mkDerivation { + pname = "lucid-hyperscript"; + version = "0.1.0.2"; + sha256 = "1gf6q1ckxpswd550dgr8nr6ghd5hv0iz73scab2rgiv7fsjchcnl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base lucid template-haskell text ]; + executableHaskellDepends = [ base lucid template-haskell text ]; + testHaskellDepends = [ base lucid template-haskell text ]; + description = "Use _hyperscript with lucid"; + license = lib.licenses.bsd3; + }) {}; + "lucid-svg" = callPackage ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { @@ -177236,8 +178172,8 @@ self: { }: mkDerivation { pname = "lzlib"; - version = "1.0.7.1"; - sha256 = "18y6diahfvqvv3qp6ch1jbi9jwz6li4xm1y1c5pi2895h4c51ljf"; + version = "1.0.7.2"; + sha256 = "00hjq15jc94bf3lgzh33w7ksf3daw2l7x1qljn11lbr48a8a2zmi"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ @@ -177248,6 +178184,8 @@ self: { ]; description = "lzlib bindings"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lzma" = callPackage @@ -178789,8 +179727,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.5.5.0"; - sha256 = "1zq7kfs513zh7v5y4hafh5d6ly4jhmxsl3rfjavh2faw4i19fy3n"; + version = "0.5.6.0"; + sha256 = "1p58c83dqbpsl0a41s6xnnwbygk04gmsg51gfqprjkvzbgl2h7zq"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types microlens-th @@ -179327,7 +180265,6 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "markup-preview" = callPackage @@ -179437,8 +180374,8 @@ self: { pname = "marshal-contt"; version = "0.2.0.0"; sha256 = "1dv2jl7gm3b3kcchgwz4v6rch5w50ak43gc6fjvpms81xkdjfzmb"; - revision = "1"; - editedCabalFile = "1cfkcb3zpddikzg610zbrwr00vn3y8sakr3m8vis5cw25hxra1c0"; + revision = "2"; + editedCabalFile = "12krz2lzqfkhqwa8dbq0rfbl9vz1dns2q7ddfzcwk9ck3gfsz8c7"; libraryHaskellDepends = [ base bytestring kan-extensions lens mtl ]; @@ -180268,22 +181205,22 @@ self: { "matrix-client" = callPackage ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base, base64 , bytestring, containers, exceptions, hashable, hspec, http-client - , http-client-tls, http-types, profunctors, retry, SHA, text, time - , unordered-containers + , http-client-tls, http-types, network-uri, profunctors, retry, SHA + , text, time, unordered-containers }: mkDerivation { pname = "matrix-client"; - version = "0.1.3.0"; - sha256 = "14vsz507l93zdddr3k6rwvqwpwdmsansv5ryq87k58v04fyfmvz6"; + version = "0.1.4.0"; + sha256 = "1adcg3c3lar5c0cxhbgy8whlcm28xhnvbhk5qgfnss6b35bhsajk"; libraryHaskellDepends = [ aeson aeson-casing base base64 bytestring containers exceptions - hashable http-client http-client-tls http-types profunctors retry - SHA text time unordered-containers + hashable http-client http-client-tls http-types network-uri + profunctors retry SHA text time unordered-containers ]; testHaskellDepends = [ aeson aeson-casing aeson-pretty base base64 bytestring containers exceptions hashable hspec http-client http-client-tls http-types - profunctors retry SHA text time unordered-containers + network-uri profunctors retry SHA text time unordered-containers ]; description = "A matrix client library"; license = lib.licenses.asl20; @@ -181047,18 +181984,18 @@ self: { }) {}; "mealy" = callPackage - ({ mkDerivation, adjunctions, base, containers, folds, generic-lens - , lens, matrix, mwc-probability, numhask, numhask-array, primitive + ({ mkDerivation, adjunctions, base, containers, folds, matrix + , mwc-probability, numhask, numhask-array, optics-core, primitive , profunctors, tdigest, text, vector, vector-algorithms }: mkDerivation { pname = "mealy"; - version = "0.1.0"; - sha256 = "14xdhb39aa548sswbkasx546pzpgyl9msabi2w5gd7qwvlhxsmg3"; + version = "0.2.0"; + sha256 = "0rc1c7l2g7b1xr66dga3p6lg49pykxhsy24jg5rl4ag255axlfyv"; libraryHaskellDepends = [ - adjunctions base containers folds generic-lens lens matrix - mwc-probability numhask numhask-array primitive profunctors tdigest - text vector vector-algorithms + adjunctions base containers folds matrix mwc-probability numhask + numhask-array optics-core primitive profunctors tdigest text vector + vector-algorithms ]; description = "Mealy machines for processing time-series and ordered data"; license = lib.licenses.bsd3; @@ -181135,8 +182072,8 @@ self: { }: mkDerivation { pname = "med-module"; - version = "0.1.2.1"; - sha256 = "0f1yjdix89g6z2kigj08iq88jmi0x59la7764ixfha5sbjnwz0pp"; + version = "0.1.2.2"; + sha256 = "0qvwz49xz4bbhkkh9c7zjqzvbdhmgnraxpj8a4fc5lf0yb1k79ba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181369,18 +182306,18 @@ self: { }) {}; "mega-sdist" = callPackage - ({ mkDerivation, base, bytestring, optparse-simple, pantry, path - , path-io, rio, rio-orphans, yaml + ({ mkDerivation, aeson, base, bytestring, optparse-simple, pantry + , path, path-io, rio, rio-orphans, yaml }: mkDerivation { pname = "mega-sdist"; - version = "0.4.1.0"; - sha256 = "124wa7v8vx82gd04brgv3kphyqs0p5x9hp1vlp39bkha9w1yab7w"; + version = "0.4.2.1"; + sha256 = "00c1cc2cgwr6p01xc8sf570aly5hw6p932anjjra7rw7a3mcmc96"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring optparse-simple pantry path path-io rio rio-orphans - yaml + aeson base bytestring optparse-simple pantry path path-io rio + rio-orphans yaml ]; description = "Handles uploading to Hackage from mega repos"; license = lib.licenses.mit; @@ -181980,6 +182917,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "memory-hexstring" = callPackage + ({ mkDerivation, aeson, base, bytestring, memory, scale + , template-haskell, text + }: + mkDerivation { + pname = "memory-hexstring"; + version = "1.0.0.0"; + sha256 = "1sm7jj75mv8p7f33h619zm10xbzyjg1jds87cg36mrj8hfb32q48"; + libraryHaskellDepends = [ + aeson base bytestring memory scale template-haskell text + ]; + description = "Hex-string type for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -182985,15 +183937,15 @@ self: { license = lib.licenses.mit; }) {}; - "microlens-aeson_2_4_0" = callPackage + "microlens-aeson_2_4_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq , hashable, microlens, scientific, tasty, tasty-hunit, text , unordered-containers, vector }: mkDerivation { pname = "microlens-aeson"; - version = "2.4.0"; - sha256 = "103r9i4ky58y34rb82dmw20npbzzk4brn9nn4650m7mdzcgmz0zm"; + version = "2.4.1"; + sha256 = "0h11h1vg467aq1w6gfb0jvzvhk6xsl1i1bl7qfw5kdsnvrd3nbg9"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq hashable microlens scientific text unordered-containers vector @@ -183284,8 +184236,8 @@ self: { pname = "midi-music-box"; version = "0.0.1.2"; sha256 = "0rnjwis6y0lnyfjxnxqk3zsh78ylccq5v21avb97vybmj0pld1l9"; - revision = "1"; - editedCabalFile = "1z8ahx8hkg1gciddin86w7x136y49i6ymwvkjmf28a397kkxmcb7"; + revision = "2"; + editedCabalFile = "1w595kidg493vnv871ga2xsh94g2f80yxn4k5mlrm0jip45xxi7m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -183353,18 +184305,18 @@ self: { "midimory" = callPackage ({ mkDerivation, alsa-core, alsa-seq, array, base, containers - , optparse-applicative, random, transformers, utility-ht, wx - , wxcore + , optparse-applicative, random, shell-utility, transformers + , utility-ht, wx, wxcore }: mkDerivation { pname = "midimory"; - version = "0.0.2.1"; - sha256 = "07p0f7a0nm7h8li8rl6adrszrz7hhzn19mfy0vgkw8axdaira66r"; + version = "0.0.2.2"; + sha256 = "01zbwkx9aalxyqa7x59sqb3qagkabvsn6q57j8f7xavgch6cljiq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ alsa-core alsa-seq array base containers optparse-applicative - random transformers utility-ht wx wxcore + random shell-utility transformers utility-ht wx wxcore ]; description = "A Memory-like (Concentration, Pairs, ...) game for tones"; license = lib.licenses.bsd3; @@ -184819,8 +185771,8 @@ self: { pname = "mmark"; version = "0.0.7.4"; sha256 = "0flsg9jsnzab74hfidrfdmjvarj3n86db4ysv007j2hlr3iynnxx"; - revision = "1"; - editedCabalFile = "05021pxrdgymlk51zs72mbf6lg3j0zf9f0sim1qlhviwp0dwk5nv"; + revision = "2"; + editedCabalFile = "06sq65cmqr5yva4spf14bkdsvw465m73hjmvxcfh7vxn0nslp2bc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers deepseq dlist email-validate @@ -184840,30 +185792,6 @@ self: { }) {}; "mmark-cli" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory - , ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark - , mmark-ext, optparse-applicative, stache, text - , unordered-containers - }: - mkDerivation { - pname = "mmark-cli"; - version = "0.0.5.0"; - sha256 = "15qrp2q1flx9csqvj8zx9w1jqg8pwfi0v7wpia7n7vg09jgydhby"; - revision = "6"; - editedCabalFile = "1qki0f2iwr9phma4wby3alnsxigzl5qc1ims8cvhszkill9yfi4z"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring directory ghc-syntax-highlighter gitrev lucid - megaparsec mmark mmark-ext optparse-applicative stache text - unordered-containers - ]; - description = "Command line interface to the MMark markdown processor"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - - "mmark-cli_0_0_5_1" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , ghc-syntax-highlighter, gitrev, lucid, megaparsec, mmark , mmark-ext, optparse-applicative, stache, text @@ -184872,6 +185800,8 @@ self: { pname = "mmark-cli"; version = "0.0.5.1"; sha256 = "1an1rc7gdl2209d3agxx1dfl61zsc2wg5nx9cwdf50spmlgs3cr0"; + revision = "1"; + editedCabalFile = "0x4lpxga127f37z43w4rgccw9w05j23ppy7k19kz6gh3p43gnx1m"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -184884,29 +185814,6 @@ self: { }) {}; "mmark-ext" = callPackage - ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec - , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting - , text - }: - mkDerivation { - pname = "mmark-ext"; - version = "0.2.1.3"; - sha256 = "1hc95gvw4dyjlf2y4nli68zavjd0aj9br55n7417r7g70si1m82s"; - revision = "2"; - editedCabalFile = "1jnx5g34k7l5vxds8f7amsjn9cqpvwy1g6hvfq8kjrdnxv6rzyfs"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri - skylighting text - ]; - testHaskellDepends = [ base hspec lucid mmark skylighting text ]; - testToolDepends = [ hspec-discover ]; - description = "Commonly useful extensions for the MMark markdown processor"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - - "mmark-ext_0_2_1_4" = callPackage ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting , text @@ -185433,10 +186340,8 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.3.4.2"; - sha256 = "018hiiqx6n272mwbmhd5j9wlzyz0x7ppa9jsrv4zx1nb6n7shkh5"; - revision = "1"; - editedCabalFile = "01v497wkcida80xlkg25yhppb711ynyx2zyv9hdyzrflq8pz4g6w"; + version = "0.3.4.3"; + sha256 = "0904ff8pzcbk1swp0s1v5js468qnf3ccyzfcvaa62nsaj4qb7shq"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -187766,8 +188671,8 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "1.1.2"; - sha256 = "0c9amb4yw6487kbpy3gslhpzjkzz3kiwhzz9qrmv8l7cvc2m1cb3"; + version = "1.1.3"; + sha256 = "1nglki10rlpi872p55pa8g809q5sna7yzh3zw4rqfhq89kb15wcv"; libraryHaskellDepends = [ base bytestring containers primes text vector ]; @@ -187865,10 +188770,10 @@ self: { }: mkDerivation { pname = "monomer"; - version = "1.2.0.0"; - sha256 = "1hd65flmygy2afvnpjcj7l06ic1lycb6x5gbxhgmxxb2ilj6h6wf"; - revision = "1"; - editedCabalFile = "146sy318bf3bdv2xjnpxv0i8g5q04hq32grdjqs2nw2javx2qlc1"; + version = "1.3.0.0"; + sha256 = "19k31vppid5lyvqg4q4r07yzw9yisydhx012yn1fzlfjwc89g9bp"; + revision = "3"; + editedCabalFile = "1jz12ww843d0qk7gy6f8fw4l2mpynkcs9knxfc865zyhcjvimfw2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188207,8 +189112,8 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.16.1"; - sha256 = "0kb4v5fwlxy80swqvjbrdc2qafiqrzw5zhihfjz4hc3vp5pcfizs"; + version = "1.16.2"; + sha256 = "1b236yp37pahx3njn0cwdbnkr7yj62ckhfsicgm2crb4l6sjkyas"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -188232,6 +189137,50 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "morley-client" = callPackage + ({ mkDerivation, aeson, aeson-casing, base-noprelude, binary + , bytestring, co-log, co-log-core, colourista, constraints + , containers, data-default, exceptions, fmt, hex-text + , hspec-expectations, http-client, http-client-tls, http-types + , HUnit, lens, lorentz, megaparsec, memory, morley, morley-prelude + , mtl, named, optparse-applicative, process, random + , safe-exceptions, scientific, servant, servant-client + , servant-client-core, singletons, syb, tasty, tasty-ant-xml + , tasty-discover, tasty-hunit-compat, template-haskell, text + , th-reify-many, time, universum, unliftio, vector + }: + mkDerivation { + pname = "morley-client"; + version = "0.1.0"; + sha256 = "1xhmksv745dvf8axbihbdn9r9402na381czckab844whkdmnag0y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base-noprelude binary bytestring co-log + co-log-core colourista constraints containers data-default fmt + hex-text http-client http-client-tls http-types lens lorentz + megaparsec memory morley morley-prelude mtl named + optparse-applicative process random safe-exceptions scientific + servant servant-client servant-client-core singletons syb + template-haskell text th-reify-many time universum unliftio vector + ]; + executableHaskellDepends = [ + aeson base-noprelude data-default fmt morley morley-prelude + optparse-applicative safe-exceptions + ]; + testHaskellDepends = [ + aeson base-noprelude bytestring co-log co-log-core containers + exceptions fmt hex-text hspec-expectations http-types HUnit lens + lorentz memory morley morley-prelude safe-exceptions + servant-client-core singletons syb tasty tasty-ant-xml + tasty-hunit-compat template-haskell time + ]; + testToolDepends = [ tasty-discover ]; + description = "Client to interact with the Tezos blockchain"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morley-prelude" = callPackage ({ mkDerivation, base-noprelude, int-cast, lens, universum }: mkDerivation { @@ -188273,8 +189222,7 @@ self: { description = "Upgradeability infrastructure based on Morley"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; - broken = true; - }) {cleveland = null; morley-client = null;}; + }) {}; "morloc" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory @@ -189282,7 +190230,6 @@ self: { testHaskellDepends = [ base hspec ip text ]; description = "Datastructures to describe TCP and MPTCP connections"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "mptcp-pm" = callPackage @@ -189568,16 +190515,18 @@ self: { "msgpack-binary" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , data-binary-ieee754, deepseq, groom, hashable, hspec - , msgpack-types, QuickCheck, text, unordered-containers, vector + , monad-validate, msgpack-types, QuickCheck, text + , unordered-containers, vector }: mkDerivation { pname = "msgpack-binary"; - version = "0.0.14"; - sha256 = "1pf0fzxkrd2f1jzm3mkybayd94pxq28a49nvjzx8i2lxrdmynkp6"; + version = "0.0.15"; + sha256 = "0i3m4n5gw4a5ryikmy2drzh95g7766pdfsb5bahin8cmi1bq5bj5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring data-binary-ieee754 msgpack-types text + base binary bytestring data-binary-ieee754 monad-validate + msgpack-types text ]; executableHaskellDepends = [ base bytestring groom ]; testHaskellDepends = [ @@ -189615,6 +190564,32 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "msgpack-persist" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , groom, hashable, hspec, monad-validate, msgpack-types, persist + , QuickCheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "msgpack-persist"; + version = "0.0.15"; + sha256 = "07ibjg1pkr9005qydw87hll1f5x03ip5qqxvm9vpnnk9fi1jckl4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring monad-validate msgpack-types persist text + ]; + executableHaskellDepends = [ base bytestring groom ]; + testHaskellDepends = [ + base bytestring containers hashable hspec msgpack-types QuickCheck + text unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq QuickCheck + ]; + description = "A Haskell implementation of MessagePack"; + license = lib.licenses.bsd3; + }) {}; + "msgpack-rpc" = callPackage ({ mkDerivation, async, base, binary, binary-conduit, bytestring , conduit, conduit-extra, exceptions, monad-control, msgpack, mtl @@ -189638,19 +190613,18 @@ self: { "msgpack-rpc-conduit" = callPackage ({ mkDerivation, async, base, binary, binary-conduit, bytestring - , conduit, conduit-extra, data-default-class - , data-default-instances-base, exceptions, hspec, monad-control - , msgpack-binary, msgpack-types, mtl, network, text, unliftio-core + , conduit, conduit-extra, data-default-class, exceptions, hspec + , monad-control, monad-validate, msgpack-binary, msgpack-types, mtl + , network, text, unliftio-core }: mkDerivation { pname = "msgpack-rpc-conduit"; - version = "0.0.6"; - sha256 = "000aycbvxac4li8rxqxmj3a020fwl08wnq01fv8jdlx3qg7k57hf"; + version = "0.0.7"; + sha256 = "1x9zzv70vwkqiiazx9gyj8nqqid3k6b0725znszcm7ai3f5rgd43"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra - data-default-class data-default-instances-base exceptions - monad-control msgpack-binary msgpack-types mtl network text - unliftio-core + data-default-class exceptions monad-control monad-validate + msgpack-binary msgpack-types mtl network text unliftio-core ]; testHaskellDepends = [ async base bytestring hspec mtl network ]; description = "A MessagePack-RPC Implementation"; @@ -189658,22 +190632,41 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "msgpack-testsuite" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, hspec + , monad-validate, msgpack-types, QuickCheck, text + , unordered-containers, vector + }: + mkDerivation { + pname = "msgpack-testsuite"; + version = "0.0.15"; + sha256 = "0dy7knji7nckdkp0kpnxxc7nmqyzbkq7j0aas59p3yg0n1nsd2bd"; + libraryHaskellDepends = [ + base bytestring containers hashable hspec monad-validate + msgpack-types QuickCheck text unordered-containers vector + ]; + testHaskellDepends = [ base hspec ]; + description = "A Haskell implementation of MessagePack"; + license = lib.licenses.bsd3; + }) {}; + "msgpack-types" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq - , generic-arbitrary, hashable, hspec, hspec-discover, QuickCheck - , text, unordered-containers, vector + , generic-arbitrary, hashable, hspec, hspec-discover + , monad-validate, QuickCheck, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "msgpack-types"; - version = "0.1.0"; - sha256 = "1q28xxv6093h6xp6mih515cid5dm08dz5ak2y1jvcb1b2lf29s01"; + version = "0.2.1"; + sha256 = "1s6i7y2mr04z6bdhq307xqm78h1d8f7a17i3fbdknsiw5lvfsj49"; libraryHaskellDepends = [ - base bytestring containers deepseq hashable QuickCheck text - unordered-containers vector + base bytestring containers deepseq hashable monad-validate + QuickCheck text transformers unordered-containers vector ]; testHaskellDepends = [ base bytestring containers deepseq generic-arbitrary hashable hspec - QuickCheck text unordered-containers vector + monad-validate QuickCheck text unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "A Haskell implementation of MessagePack"; @@ -189905,8 +190898,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "mtl-uplift"; - version = "0.1.0.0"; - sha256 = "1y75za4xl941aadn3bmc3rsa2jklv8z0l4vkwz7x92pbxv5ym8xq"; + version = "0.1.0.1"; + sha256 = "01f70cwsy8qinwsmh27js8165bmqkr6ykzmwi2r3svlpxpaiiazk"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base mtl ]; description = "Lift substacks of monad transformer stacks"; @@ -191036,8 +192029,8 @@ self: { }: mkDerivation { pname = "multistate"; - version = "0.8.0.3"; - sha256 = "0sbrm28rjw4qgpn8p0974ljkgi30d4akbngjm58kf96x9zp7ln8g"; + version = "0.8.0.4"; + sha256 = "0y42c21ha0chqhrn40a4bikdbirsw7aqg4i866frpagz1ivr915q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -191612,6 +192605,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "mustache_2_4_0" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring + , cmdargs, containers, directory, filepath, hspec, lens, mtl + , parsec, process, scientific, tar, template-haskell, temporary + , text, th-lift, unordered-containers, vector, wreq, yaml, zlib + }: + mkDerivation { + pname = "mustache"; + version = "2.4.0"; + sha256 = "0g7bwfc1yx59lk2l12wbh67ydk4rnwam2kv6ypc85qxd0pjbcd4n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath mtl parsec + scientific template-haskell text th-lift unordered-containers + vector + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs filepath text yaml + ]; + testHaskellDepends = [ + aeson base base-unicode-symbols bytestring directory filepath hspec + lens process tar temporary text unordered-containers wreq yaml zlib + ]; + description = "A mustache template parser library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mustache-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , optparse-applicative, parsec, pretty-show, scientific, text @@ -192952,6 +193974,28 @@ self: { broken = true; }) {}; + "nanopass" = callPackage + ({ mkDerivation, base, containers, mtl, pretty-simple + , template-haskell, transformers + }: + mkDerivation { + pname = "nanopass"; + version = "0.0.2.0"; + sha256 = "0pymmshr81pckiixqyxz985lx402d0srhcnz31vv27pyn9xvi6xf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl template-haskell transformers + ]; + executableHaskellDepends = [ + base pretty-simple template-haskell transformers + ]; + description = "An EDSL for creating compilers using small passes and many intermediate representations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "nanospec" = callPackage ({ mkDerivation, base, hspec, silently }: mkDerivation { @@ -192972,8 +194016,8 @@ self: { pname = "nanovg"; version = "0.8.0.0"; sha256 = "1il4305wv7f53225jv5s04nf7gf5rw6cfxm8j3v1di2xvhdingz5"; - revision = "1"; - editedCabalFile = "0m69iqs8jaqh1gq1vfp92j2adf05v0isakl3ijxf7akxs5j2i3da"; + revision = "2"; + editedCabalFile = "1vvlmbvpafvqawfph2aicysy9nklm8rqdz2bdpkq0kg4dgi72jr2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers text vector ]; @@ -194551,14 +195595,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "network_3_1_2_5" = callPackage + "network_3_1_2_7" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit, QuickCheck, temporary }: mkDerivation { pname = "network"; - version = "3.1.2.5"; - sha256 = "0l8qn0m1pza4iv0x14izgpggisbk91yfipwmwpjbmcb73j7c08zj"; + version = "3.1.2.7"; + sha256 = "119xqsyj44ix0z79mzfpww0cd9936bki1xa7cwykvbx1y7z20xkz"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -194966,10 +196010,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "network-info"; - version = "0.2.0.10"; - sha256 = "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n"; - revision = "1"; - editedCabalFile = "07kiw56lhc56kqrnvpa11f5nnnid6by3aq00jrkcbbg7w0q71a6d"; + version = "0.2.1"; + sha256 = "015lm3b8n8sb16qsffjxz1jvijyy0z600ch0sm8h6a685wqqhbcv"; libraryHaskellDepends = [ base ]; description = "Access the local computer's basic network configuration"; license = lib.licenses.bsd3; @@ -198045,8 +199087,8 @@ self: { }: mkDerivation { pname = "nri-env-parser"; - version = "0.1.0.7"; - sha256 = "1mm879mqpgl040p789wcjm5bhrqia5czn18c5dgni8bwa4y61ank"; + version = "0.1.0.8"; + sha256 = "0hwl363iya38hi021an2l4cinclz1p96n4lck2x9yi9cf4yfqzk8"; libraryHaskellDepends = [ base modern-uri network-uri nri-prelude text ]; @@ -198061,8 +199103,8 @@ self: { }: mkDerivation { pname = "nri-http"; - version = "0.1.0.3"; - sha256 = "1km4jv0g79455m3687cpihzz14pxg3wxw4r5b21mby7c8knzd1vl"; + version = "0.1.0.4"; + sha256 = "1zf55k4c4zlx2229xxs2hfl7y5c0fb3ab7vrms08imfp0hblj91x"; libraryHaskellDepends = [ aeson base bytestring conduit http-client http-client-tls http-types mime-types network-uri nri-observability nri-prelude @@ -198084,8 +199126,8 @@ self: { }: mkDerivation { pname = "nri-kafka"; - version = "0.1.0.2"; - sha256 = "0bqpfcivp2hx5s2dmx2jwndia4pwfppslzr3krqwmph1qy3h2v9i"; + version = "0.1.0.4"; + sha256 = "1cmrssyr32ks7wy8ypk6wq5daljk26a7yx61jlq2m56p5b0nvam2"; libraryHaskellDepends = [ aeson async base bytestring conduit containers hw-kafka-client nri-env-parser nri-observability nri-prelude safe-exceptions stm @@ -198110,8 +199152,8 @@ self: { }: mkDerivation { pname = "nri-observability"; - version = "0.1.1.3"; - sha256 = "0brjddl4ff8881ld41sp7ix3skxgj10jign4xx8l3ad89f91621b"; + version = "0.1.1.4"; + sha256 = "077zj96iapjp6cn38z0g6didpwq866xz5m03d8kbp3pwdmfpr65c"; libraryHaskellDepends = [ aeson aeson-pretty async base bugsnag-hs bytestring conduit directory hostname http-client http-client-tls nri-env-parser @@ -198136,8 +199178,8 @@ self: { }: mkDerivation { pname = "nri-postgresql"; - version = "0.1.0.3"; - sha256 = "0v07b6yq2i2pnfmiaks2vp3yj2ncfr9c3f2fx9sq6hr9z56q8hqd"; + version = "0.1.0.4"; + sha256 = "0g5wvpzd6p648hvqrwiadqfzlfsqh2fm2yxmi1ix76a2lsfhbnb9"; libraryHaskellDepends = [ attoparsec base bytestring filepath network nri-env-parser nri-observability nri-prelude postgresql-typed resource-pool @@ -198157,25 +199199,27 @@ self: { "nri-prelude" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base , bytestring, containers, directory, exceptions, filepath, ghc - , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text - , safe-coloured-text-terminfo, safe-exceptions, terminal-size, text - , time, unix, vector + , hedgehog, junit-xml, lens, pretty-diff, pretty-show + , safe-coloured-text, safe-coloured-text-terminfo, safe-exceptions + , terminal-size, text, time, unix, vector }: mkDerivation { pname = "nri-prelude"; - version = "0.6.0.5"; - sha256 = "0qam6bamjp92mky193iddpq3v7knsxx4kcyc8fw3a8nkbrx6gigh"; + version = "0.6.0.6"; + sha256 = "1i1y16pc8rph7ahj53jxrhr18qnw114zfb9z0fnd4k2cs0sryyqz"; libraryHaskellDepends = [ aeson aeson-pretty async auto-update base bytestring containers - directory exceptions filepath ghc hedgehog junit-xml pretty-diff - pretty-show safe-coloured-text safe-coloured-text-terminfo - safe-exceptions terminal-size text time unix vector + directory exceptions filepath ghc hedgehog junit-xml lens + pretty-diff pretty-show safe-coloured-text + safe-coloured-text-terminfo safe-exceptions terminal-size text time + unix vector ]; testHaskellDepends = [ aeson aeson-pretty async auto-update base bytestring containers - directory exceptions filepath ghc hedgehog junit-xml pretty-diff - pretty-show safe-coloured-text safe-coloured-text-terminfo - safe-exceptions terminal-size text time unix vector + directory exceptions filepath ghc hedgehog junit-xml lens + pretty-diff pretty-show safe-coloured-text + safe-coloured-text-terminfo safe-exceptions terminal-size text time + unix vector ]; description = "A Prelude inspired by the Elm programming language"; license = lib.licenses.bsd3; @@ -198188,8 +199232,8 @@ self: { }: mkDerivation { pname = "nri-redis"; - version = "0.1.0.3"; - sha256 = "1mdzqvnx7gzr8j99c8nza40y518jg8ajxfrvdvf90gvbglknimb0"; + version = "0.1.0.4"; + sha256 = "1ws5j8r4ny8dhw2bf2zqvq42ab9h44ly562cjrl6ha5mlk78mvpq"; libraryHaskellDepends = [ aeson async base bytestring conduit hedis nri-env-parser nri-observability nri-prelude resourcet safe-exceptions text @@ -198211,8 +199255,8 @@ self: { }: mkDerivation { pname = "nri-test-encoding"; - version = "0.1.1.1"; - sha256 = "07hrkjbyp07p0yryx92q0bjqkkjji4d952sxcm9j2w5mdvlc08mq"; + version = "0.1.1.2"; + sha256 = "1b2k4g1vm3mc72g4j979pk5y9jqn4y1aa394wfzwck7n1jhg8rzb"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring filepath nri-prelude nri-redis servant servant-auth-server servant-server text @@ -198515,8 +199559,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Convert numbers to number words"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "numerals-base" = callPackage @@ -198767,13 +199809,14 @@ self: { broken = true; }) {}; - "numhask_0_8_1_0" = callPackage - ({ mkDerivation, base }: + "numhask_0_10_0_0" = callPackage + ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "numhask"; - version = "0.8.1.0"; - sha256 = "0qq9fr4nm5swarc266mnz5xly296db4nwzm7k5cwsn2pjijmyknk"; + version = "0.10.0.0"; + sha256 = "132s0yccg8fhigd6a463lrg2cqx032xfpdirvvfhrczdzirbm7xy"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck ]; description = "A numeric class hierarchy"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -198785,8 +199828,8 @@ self: { }: mkDerivation { pname = "numhask-array"; - version = "0.9.1"; - sha256 = "02xklvpk21h97005xs1ywll83qn3h6845zxp9baljk12b9j4ls1r"; + version = "0.10.0"; + sha256 = "0dsjh20y46774hih4ijmr1d50mgm7kz5imah6ynggxmdd595lp0x"; libraryHaskellDepends = [ adjunctions base distributive numhask vector ]; @@ -198889,8 +199932,8 @@ self: { }: mkDerivation { pname = "numhask-space"; - version = "0.8.1.0"; - sha256 = "1j117m1qfnl5h286x6c8kbm06xpm8rqqkipv1qbw0sp7a0cc022z"; + version = "0.10.0.0"; + sha256 = "09x53pmn2skbv1zhjmd4wq5wxhi7sshzg3ksjx1n0fy0x16d19lf"; libraryHaskellDepends = [ adjunctions base containers distributive numhask random semigroupoids tdigest text time vector @@ -199077,7 +200120,7 @@ self: { license = lib.licenses.asl20; }) {}; - "nvim-hs_2_1_0_7" = callPackage + "nvim-hs_2_2_0_1" = callPackage ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit , containers, data-default, deepseq, foreign-store, hslogger, hspec , hspec-discover, HUnit, megaparsec, messagepack, mtl, network @@ -199090,8 +200133,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "2.1.0.7"; - sha256 = "0vbqlrjwfg5pl4f9xymdlx0k01jziqrmqf8m0vm7iiy0vnjzx19j"; + version = "2.2.0.1"; + sha256 = "1jj9n792cgv964rpgbbhc491wvyfyiplsg30n20x62gxclmjvir7"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -199261,19 +200304,17 @@ self: { }) {}; "o-clock" = callPackage - ({ mkDerivation, base, doctest, ghc-prim, Glob, hedgehog - , hspec-expectations, markdown-unlit, tasty, tasty-hedgehog - , tasty-hunit-compat, type-spec + ({ mkDerivation, base, doctest, Glob, hedgehog, hspec-expectations + , markdown-unlit, tasty, tasty-hedgehog, tasty-hunit-compat + , type-spec }: mkDerivation { pname = "o-clock"; - version = "1.2.1"; - sha256 = "17y44aajipysw1p268rq8a6lhv9cdhkvxjcpcdij93sqp818q96z"; - revision = "1"; - editedCabalFile = "1n8ns0f4ljbarb5xmlwfs1lq24jg30m3hv0gmpgd26y666d3hh95"; + version = "1.2.1.1"; + sha256 = "0rq9bn9lxsmgjw6w55r3c15y1pjq36vi246qldr53csr0pa9ggfy"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ghc-prim ]; + libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob hedgehog hspec-expectations markdown-unlit tasty @@ -199775,8 +200816,8 @@ self: { }: mkDerivation { pname = "odbc"; - version = "0.2.5"; - sha256 = "157g6ys5j5kj4cc1jp2rmcpwrax4fh7bx1zvvicmrf88qaq56v2h"; + version = "0.2.6"; + sha256 = "0yyyjnnlnd3zpvnh55l5gsvakrciml91jaqy5hdgnlpqfslz330r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200617,7 +201658,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "opaleye_0_8_0_1" = callPackage + "opaleye_0_9_2_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -200627,8 +201668,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.8.0.1"; - sha256 = "1py950js9k80manm3xj1sfls0xnw1kd609hw268wr9izd0syfva4"; + version = "0.9.2.0"; + sha256 = "0zvms42pmsg6ish76mvk0ksz4apxvs4iyjfvgkm7zwadq3i9v8l3"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -200718,28 +201759,29 @@ self: { ({ mkDerivation, acc, attoparsec, attoparsec-data, base, base64 , binary, bytestring, caerbannog, containers, data-default, domain , domain-optics, hashable, hashable-time, http-client, QuickCheck - , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , quickcheck-instances, scientific, tasty, tasty-hunit , tasty-quickcheck, text, text-builder, time, transformers , unordered-containers, vector, vector-instances, xml-conduit , xml-parser }: mkDerivation { pname = "opc-xml-da-client"; - version = "0.1"; - sha256 = "0wi2qv4594fz3z6jqdmqnxv17w1yp5ds8xwflnxawb6lpadprskp"; + version = "0.1.2"; + sha256 = "1hfm6ky5zh27z1iv0f4p53d4nbpragaiq734si4q8hkk0aafldw5"; libraryHaskellDepends = [ acc attoparsec attoparsec-data base base64 bytestring containers data-default domain domain-optics hashable hashable-time - http-client QuickCheck rerebase scientific text text-builder time - transformers unordered-containers vector vector-instances - xml-conduit xml-parser + http-client scientific text text-builder time transformers + unordered-containers vector vector-instances xml-conduit xml-parser ]; testHaskellDepends = [ - attoparsec binary caerbannog data-default http-client QuickCheck - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck - text-builder xml-conduit xml-parser + acc attoparsec attoparsec-data base base64 binary bytestring + caerbannog containers data-default domain domain-optics hashable + hashable-time http-client QuickCheck quickcheck-instances + scientific tasty tasty-hunit tasty-quickcheck text text-builder + time transformers unordered-containers vector vector-instances + xml-conduit xml-parser ]; - doHaddock = false; description = "OPC XML-DA Client"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -200916,8 +201958,8 @@ self: { }: mkDerivation { pname = "openai-hs"; - version = "0.2.1.0"; - sha256 = "1b92hkah0ac3mac8lcfvq9c37wfk9hfgcd0nzhpznqsk72zhb4v6"; + version = "0.2.2.0"; + sha256 = "07jyz6bgz2s21j5w5avpi7hllcxw9ix3m3r1lyjb0kwa5rvvpl7d"; libraryHaskellDepends = [ aeson base bytestring casing cpphs http-client http-types openai-servant servant servant-client servant-multipart-client text @@ -200939,8 +201981,8 @@ self: { }: mkDerivation { pname = "openai-servant"; - version = "0.2.1.0"; - sha256 = "0cwr8mz1kdc3xp5a5g5d08amgy9y6h79k0l0w6ypafr9yf6braw8"; + version = "0.2.2.0"; + sha256 = "1h9g7sak3142hlw83dlb8h5q5fkdgy6rz81syidq0cvg8hzx9bzq"; libraryHaskellDepends = [ aeson base bytestring casing servant servant-multipart-api text time vector @@ -201051,7 +202093,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "openapi3_3_2_0" = callPackage + "openapi3_3_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries , bytestring, Cabal, cabal-doctest, containers, cookie, doctest , generics-sop, Glob, hashable, hspec, hspec-discover, http-media @@ -201062,10 +202104,8 @@ self: { }: mkDerivation { pname = "openapi3"; - version = "3.2.0"; - sha256 = "0xlfjpcl8l7xf8g65hqbiynhqh9yzsm11gm0qaax8mn7hc8k7jji"; - revision = "1"; - editedCabalFile = "0mhfsg1mgkanxy9rzhvsn3zibqhbqwsvqj6pawhsnbfn9fcyjmgb"; + version = "3.2.1"; + sha256 = "0xspxp5rma3mx5p0qy6mmq94540agl44vkc65sylp5k62x68588d"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -201131,18 +202171,20 @@ self: { }) {}; "opencc" = callPackage - ({ mkDerivation, base, bytestring, mtl, text, transformers }: + ({ mkDerivation, base, bytestring, mtl, opencc, text, transformers + }: mkDerivation { pname = "opencc"; - version = "0.1.0.0"; - sha256 = "09gsd816xh0237m94bnysdpjzqngsva3rl29f171rvhdpashcjx2"; + version = "0.1.1.0"; + sha256 = "06jz04352bgqnfvzds75n65x352x07ffj8aan01q6m2mjs3xidfa"; libraryHaskellDepends = [ base bytestring mtl text transformers ]; + librarySystemDepends = [ opencc ]; testHaskellDepends = [ base bytestring mtl text transformers ]; description = "OpenCC bindings"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {}; + }) {inherit (pkgs) opencc;}; "opench-meteo" = callPackage ({ mkDerivation, aeson, base, data-default, text, time }: @@ -202449,8 +203491,8 @@ self: { }: mkDerivation { pname = "optima"; - version = "0.4.0.2"; - sha256 = "05jpgf4lyq4pg4j98cl2jlax1jjy27knsgjqcbbg38p1n33m7gki"; + version = "0.4.0.3"; + sha256 = "0pah3p4f5j8ah2ccb5mpq1dcjrlzvwg6pf0yfqhnq4m7j1nqhzlj"; libraryHaskellDepends = [ attoparsec attoparsec-data base optparse-applicative text text-builder @@ -202647,6 +203689,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "optparse-applicative_0_17_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck + , transformers, transformers-compat + }: + mkDerivation { + pname = "optparse-applicative"; + version = "0.17.0.0"; + sha256 = "097p1bkvw9r3rvcr65w53yw14drb0s46ldkkl1jbmq5g7m6jwnw2"; + libraryHaskellDepends = [ + ansi-wl-pprint base process transformers transformers-compat + ]; + testHaskellDepends = [ base QuickCheck ]; + description = "Utilities and combinators for parsing command line options"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "optparse-applicative-simple" = callPackage ({ mkDerivation, attoparsec, attoparsec-data, base-prelude , optparse-applicative, rerebase, text @@ -202699,8 +203758,8 @@ self: { pname = "optparse-generic"; version = "1.4.7"; sha256 = "03s6iwfr2iiypnx3wmnrb37zz7kflk40dj38v8j4ccqxkkf9h0kk"; - revision = "1"; - editedCabalFile = "0q3nq4qnsnx875a9vp08hgzhrbq463cdjdc4xlswcalip2qjw4y2"; + revision = "2"; + editedCabalFile = "1qypq8841xym39kmlnm0608lghh258azr6d424is96kj340bwlwz"; libraryHaskellDepends = [ base bytestring Only optparse-applicative system-filepath text time transformers transformers-compat void @@ -203309,6 +204368,8 @@ self: { pname = "ormolu"; version = "0.3.1.0"; sha256 = "1517z6bi8ifzdmfclmqdiipi6zcnxagymf1sxr43sj2ipkglg2rs"; + revision = "1"; + editedCabalFile = "1ns76yw44hp84lrxdhl23aa2d14jjf4m6fd906672a4b4x3cr64l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203338,6 +204399,8 @@ self: { pname = "ormolu"; version = "0.4.0.0"; sha256 = "1alibf9ya2igwwjx23pjd0fi2kdaldrkfdpyr2w211irf9agy0j9"; + revision = "2"; + editedCabalFile = "11r9j19xiaf1kpzr1kz41i8ldchf6ygqp0zxrkgmrzvidpvh6q62"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204200,6 +205263,27 @@ self: { license = lib.licenses.mit; }) {}; + "padic" = callPackage + ({ mkDerivation, base, constraints, criterion, integer-gmp, mod + , QuickCheck, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "padic"; + version = "0.1.0.0"; + sha256 = "1r54aav4305sjp0wg4kkhvgqsgs9pxd3mn2l99iyabc3vd4wzmrr"; + libraryHaskellDepends = [ base constraints integer-gmp mod ]; + testHaskellDepends = [ + base constraints integer-gmp mod QuickCheck tasty + tasty-expected-failure tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base constraints criterion integer-gmp mod + ]; + description = "Fast, type-safe p-adic arithmetic"; + license = lib.licenses.mit; + }) {}; + "pads-haskell" = callPackage ({ mkDerivation, base, byteorder, bytestring, containers, ghc-prim , haskell-src-meta, HUnit, mainland-pretty, mtl, mwc-random, parsec @@ -204557,7 +205641,7 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; - "pandoc_2_17_0_1" = callPackage + "pandoc_2_17_1_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -204577,8 +205661,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.17.0.1"; - sha256 = "1xh5vwwnwwrxdkqm72qcd67hc0a1ffhkki1f1ls9bm1mhgq6fr17"; + version = "2.17.1.1"; + sha256 = "1l8spmsyg2c5j16q7a7fd5i6kcvkyipq4jrhrv2k0ca1s4lcb7k4"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -204680,8 +205764,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.12.1"; - sha256 = "036lw5qa23bg292hgfj3ybfykbqj80fb2f8a26rnivj5pfqblm3w"; + version = "0.3.12.2"; + sha256 = "1d2g4aggv47gv83p4382bcy1x97z0bs4nqww37ay92n9r4jh6m4l"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -204925,8 +206009,8 @@ self: { }: mkDerivation { pname = "pandoc-lua-marshal"; - version = "0.1.3.1"; - sha256 = "04q433gpqkydyy2gx6jhyvv7lahx186b1d90clkggach1x0rg8ii"; + version = "0.1.4"; + sha256 = "09l601d50h4ymnfcspwf1sl6hks8skvd1wpb9j3y2znyciq2pdkq"; libraryHaskellDepends = [ base bytestring containers exceptions hslua hslua-marshalling lua pandoc-types safe text @@ -205237,8 +206321,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.5.0"; - sha256 = "144k1cqb4gkwyh3w01cwsax58n9w3h1giggdb8b0dw64pnhsq8zd"; + version = "0.5.1"; + sha256 = "0xx3fjdkxrabwnqhz3bs3rai1q83zkkhq90z50pzam08nng34sw5"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -205443,7 +206527,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "pantry_0_5_3" = callPackage + "pantry_0_5_4" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -205457,8 +206541,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.3"; - sha256 = "1pb9vr615rhh0lyi392ghxdnxq5pr15y0w8f372xh046i9dinj39"; + version = "0.5.4"; + sha256 = "080j0pw8fmyb05klbi8vy3dpahiw3zxmykvqamvziwrznl1p4b2m"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -206293,6 +207377,18 @@ self: { broken = true; }) {}; + "pareto-front" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "pareto-front"; + version = "0.1.0.1"; + sha256 = "0c375bbsgbv6agjks0n01zxvjsh7zpnph212cf4jbpmjm0rgixsa"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Monoids for dealing with Pareto efficiency"; + license = lib.licenses.bsd3; + }) {}; + "paripari" = callPackage ({ mkDerivation, base, bytestring, parser-combinators, random , tasty, tasty-hunit, text @@ -206322,6 +207418,8 @@ self: { pname = "park-bench"; version = "0.1.0"; sha256 = "0ygj4x3s0s53pwp256ypwarfiwccg3mr7drgjxp41bpc8hs66v4y"; + revision = "1"; + editedCabalFile = "07qczda4bmijbz5ci4bazikizbz4fy51c4gw1sqq7hkcfm4rz7ga"; libraryHaskellDepends = [ base bytestring text ]; description = "A quick-and-dirty, low-friction benchmark tool with immediate feedback"; license = lib.licenses.bsd3; @@ -207763,6 +208861,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "path-io_1_7_0" = callPackage + ({ mkDerivation, base, containers, directory, dlist, exceptions + , filepath, hspec, path, temporary, time, transformers, unix-compat + }: + mkDerivation { + pname = "path-io"; + version = "1.7.0"; + sha256 = "1jr1inh3x0a42rdh4q0jipbw8jsprdza1j5xkzd7nxcq0a143g9l"; + libraryHaskellDepends = [ + base containers directory dlist exceptions filepath path temporary + time transformers unix-compat + ]; + testHaskellDepends = [ + base directory exceptions filepath hspec path transformers + unix-compat + ]; + description = "Interface to ‘directory’ package for users of ‘path’"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "path-like" = callPackage ({ mkDerivation, base, path }: mkDerivation { @@ -208443,15 +209562,15 @@ self: { license = lib.licenses.asl20; }) {}; - "pcre2_2_0_4" = callPackage + "pcre2_2_1_0" = callPackage ({ mkDerivation, base, containers, criterion, hspec, microlens , microlens-platform, mtl, pcre-light, regex-pcre-builtin , template-haskell, text }: mkDerivation { pname = "pcre2"; - version = "2.0.4"; - sha256 = "15zbwsv4kic58znngw1ff8vxqjqqglsds9xnn1s4f9hnzd87vwx2"; + version = "2.1.0"; + sha256 = "0ina14prysmh6njfcpyhzhyz0r6qsixvli3fifh46biqryx2whaw"; libraryHaskellDepends = [ base containers microlens mtl template-haskell text ]; @@ -209697,20 +210816,18 @@ self: { , monad-logger, mtl, path-pieces, QuickCheck, quickcheck-instances , resource-pool, resourcet, scientific, shakespeare, silently , template-haskell, text, th-lift-instances, time, transformers - , unliftio, unliftio-core, unordered-containers, vector + , unliftio, unliftio-core, unordered-containers, vault, vector }: mkDerivation { pname = "persistent"; - version = "2.13.2.1"; - sha256 = "13lp9i94f57qhifdmr1vnsrra34526f7kqa1sybcaj2jh2v3q85k"; - revision = "1"; - editedCabalFile = "15lx2kd8ijn91h65nhzxmd50hmmybhs6x6qfg5wnl3ylcmgi6glg"; + version = "2.13.3.0"; + sha256 = "059y0wyd74rb0aa32b54vj9n0g5pz9nfcbx2h3iil2qbgjvzvw9w"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger mtl path-pieces resource-pool resourcet scientific silently template-haskell text th-lift-instances time transformers unliftio - unliftio-core unordered-containers vector + unliftio-core unordered-containers vault vector ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring @@ -209912,6 +211029,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "persistent-lens" = callPackage + ({ mkDerivation, base, lens, persistent }: + mkDerivation { + pname = "persistent-lens"; + version = "1.0.0"; + sha256 = "1pmk79m3p71sbcnzz27ji7305v4s8pbqghphl6nmkviswdy430xl"; + libraryHaskellDepends = [ base lens persistent ]; + description = "lens helpers for persistent"; + license = lib.licenses.mit; + }) {}; + "persistent-map" = callPackage ({ mkDerivation, base, binary, containers, directory, EdisonAPI , EdisonCore, filepath, LRU, mtl, stm-io-hooks @@ -209951,8 +211079,6 @@ self: { ]; description = "Manual migrations for the persistent library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "persistent-mongoDB" = callPackage @@ -210043,18 +211169,18 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.13.0.2"; - sha256 = "18ji7a7lb1mjgqvi2mv2cg4vlgjkyzg2hgp09s7c9v071p3ll732"; + version = "2.13.1.0"; + sha256 = "16balbklf4800pqivmvnamjhy3xvnr9939fz3qkicfs4ba68m62k"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger mysql mysql-simple persistent resource-pool resourcet text transformers unliftio-core ]; testHaskellDepends = [ - aeson base bytestring containers fast-logger hspec http-api-data - HUnit monad-logger mysql path-pieces persistent persistent-qq - persistent-test QuickCheck quickcheck-instances resourcet text time - transformers unliftio-core + aeson base bytestring conduit containers fast-logger hspec + http-api-data HUnit monad-logger mysql path-pieces persistent + persistent-qq persistent-test QuickCheck quickcheck-instances + resourcet text time transformers unliftio-core ]; description = "Backend for the persistent library using MySQL database server"; license = lib.licenses.mit; @@ -210157,19 +211283,19 @@ self: { , postgresql-libpq, postgresql-simple, QuickCheck , quickcheck-instances, resource-pool, resourcet , string-conversions, text, time, transformers, unliftio - , unliftio-core, unordered-containers, vector + , unliftio-core, unordered-containers, vault, vector }: mkDerivation { pname = "persistent-postgresql"; - version = "2.13.2.1"; - sha256 = "07pnr8m0nk43jaz6l293lzx4ivyqgnw94fjypazzm008b4irh7ir"; + version = "2.13.4.0"; + sha256 = "1hvk7fvknq27nfpyv32b7062cs4c3h2s62ssr133abq78ymcfcll"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring conduit containers monad-logger mtl persistent postgresql-libpq postgresql-simple resource-pool resourcet string-conversions text time transformers - unliftio-core + unliftio-core vault ]; testHaskellDepends = [ aeson base bytestring containers fast-logger hspec @@ -210226,8 +211352,8 @@ self: { }: mkDerivation { pname = "persistent-qq"; - version = "2.12.0.1"; - sha256 = "1dvniapxjaw2vmdqd5cplwxdxiy2l6z6gns8gp3ci3rn3xp0pf6p"; + version = "2.12.0.2"; + sha256 = "0pzlhwl4h9q358zc6d0m5zv0ii2yhf2lzw0a3v2spfc1ch4a014a"; libraryHaskellDepends = [ base haskell-src-meta mtl persistent template-haskell text ]; @@ -210345,8 +211471,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.13.0.3"; - sha256 = "12za89crbk74mya4qxpw5fp5fqp64vwz5s8vbjd7m8r3j3vbw338"; + version = "2.13.1.0"; + sha256 = "1z8650nv10f6yldn9sihk54c7mlcnkxwaj956igvs6q3x3s8aa1b"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -210412,8 +211538,8 @@ self: { }: mkDerivation { pname = "persistent-test"; - version = "2.13.0.3"; - sha256 = "07q53jvhz00cf10k7a8fkvykgwcl10fgzh8k9gv1d248f336crvs"; + version = "2.13.1.0"; + sha256 = "1ccv9rrnjngwf8av3zyq28myd1iyb6831nnqjpllwlyrpgnmafvr"; libraryHaskellDepends = [ aeson base blaze-html bytestring conduit containers exceptions hspec hspec-expectations http-api-data HUnit monad-control @@ -211226,8 +212352,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-phonetics-basics"; - version = "0.8.4.0"; - sha256 = "1sxc7qsp93qdf11lp09www1ynrzpnxnc0k00pidz1bpka2hqcjh1"; + version = "0.9.0.0"; + sha256 = "1sbsywylcmjf592618rs727k1lfc42yll541cqwm34ffhzsvfzij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211337,8 +212463,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.16.2.2"; - sha256 = "0s8n0nds142nlp2p9h9i78i31822akyyd0zm38hfc4ygkhpgzpkm"; + version = "0.16.3.0"; + sha256 = "12hqxk3fga9k6xw8wns834n12wcpmxki2cbyq03jgz22n00css0f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211374,8 +212500,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.4.1.0"; - sha256 = "158v8x7i4h4z60xckpav14p9b0hhhz5jqp48glq1wscrp94qqpjv"; + version = "0.4.2.0"; + sha256 = "05ghrqxjlpgdxdcfzj5l0shwmria2c9xkkbps1j1vdsn2qlwihxy"; libraryHaskellDepends = [ base heaps phonetic-languages-constraints-array phonetic-languages-ukrainian-array @@ -211398,8 +212524,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.14.1.0"; - sha256 = "0cs0h9dh39cxbdgnajbh5j1mc0fqbqd6q8mkgc1an7n463m756vr"; + version = "0.15.0.0"; + sha256 = "1rayhhyvqskxw374jrl5h92lhx0n3k3wda7vw4wkgw3kbargwm7q"; libraryHaskellDepends = [ base cli-arguments heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array @@ -211421,8 +212547,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-common"; - version = "0.3.0.0"; - sha256 = "1ajgp4wyfdzvvnj5272r0cpl9jykps5bwzn93asmfbilzfdjaynz"; + version = "0.4.0.0"; + sha256 = "0bhjmnj1k54c7xg3m9p5rlnqq4csf872ap2a2axf4d6caizz29cf"; libraryHaskellDepends = [ base heaps phonetic-languages-phonetics-basics ]; @@ -211437,8 +212563,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.8.5.0"; - sha256 = "18a1a7509gajp5yf7kbsgd1iak5rghqr0qky8yhmb4n8j2mz8wfa"; + version = "0.9.0.0"; + sha256 = "17zr8j9slvimjv1vx6bzq1d86n5ap1j17yglxvviyd3xbhnp2qq2"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -211554,8 +212680,8 @@ self: { ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "phonetic-languages-ukrainian-array"; - version = "0.9.1.0"; - sha256 = "0m20ifxzdycmcymkrhm5c7x4ccq63znfwa4jvbxyvgxnp6bd92aa"; + version = "0.9.2.0"; + sha256 = "0x0llv91r0837qiajnxhln6ddf8qyc7m13rc87x8rg7f5rqpzqip"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; @@ -212376,8 +213502,8 @@ self: { pname = "pipes"; version = "4.3.16"; sha256 = "163lx5sf68zx5kik5h1fjsyckwr9shdsn5k2dsjq3mhg077nxqgl"; - revision = "1"; - editedCabalFile = "1b2hkxrb3sv2jgxw3pwhzkskdbgwmli1ckmnycba4llajn9yczmh"; + revision = "2"; + editedCabalFile = "1djfzrqq5dz9gpljyf3kbrz7vhp4rvbrk5z7r3x9n3yhw00dwiwp"; libraryHaskellDepends = [ base exceptions mmorph mtl transformers void ]; @@ -215450,8 +216576,8 @@ self: { }: mkDerivation { pname = "polysemy-RandomFu"; - version = "0.4.4.0"; - sha256 = "0mh6iiyz859446l8r54bqg8hmaig40kdapq9k4niry35nba6fdr1"; + version = "0.4.4.1"; + sha256 = "1zw8n16dm2l8rwrf014kb9jhp3q4a719bp8p08s4fnlksqkf88vl"; libraryHaskellDepends = [ base polysemy polysemy-plugin polysemy-zoo random-fu random-source ]; @@ -215682,8 +216808,8 @@ self: { }: mkDerivation { pname = "polysemy-log"; - version = "0.4.2.0"; - sha256 = "106b9y3apffc84k9idb1vmfjjfwjww4xlpqn4mphrf7w2cxyn6gv"; + version = "0.4.3.0"; + sha256 = "0n7szglzj8jkb6cpkbj0496wd5k4cy4lvih026r6bcb7m943ki71"; libraryHaskellDepends = [ ansi-terminal async base polysemy polysemy-conc polysemy-time relude template-haskell text time @@ -215702,8 +216828,8 @@ self: { }: mkDerivation { pname = "polysemy-log-co"; - version = "0.4.2.0"; - sha256 = "03ipk2085zr3mm7m2qyiixxf4gpmv0bbyw1s1ykqngh7f6d6f2pp"; + version = "0.4.3.0"; + sha256 = "1qhhhlbkvx4jxanfwgnnhn0yvhi2zp7sm3ssn3nc48vm1gzmb867"; libraryHaskellDepends = [ base co-log co-log-core co-log-polysemy polysemy polysemy-conc polysemy-log polysemy-time @@ -215723,8 +216849,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.4.2.0"; - sha256 = "0kmrwyfsldpaafkimfi4plx6ngppq0jj5mhrpknfg5v2ca9j691k"; + version = "0.4.3.0"; + sha256 = "0cy1iwybb4m6n2rivmzzp4ikj8n1qhw1k4f13xiwf98s7abasa5l"; libraryHaskellDepends = [ base di-polysemy polysemy polysemy-conc polysemy-log polysemy-time ]; @@ -218496,17 +219622,18 @@ self: { "powerdns" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, containers, deepseq, http-client, servant - , servant-client, servant-client-core, tasty, tasty-hunit, text - , time + , case-insensitive, containers, deepseq, hashable, http-client + , servant, servant-client, servant-client-core, tasty, tasty-hunit + , text, time }: mkDerivation { pname = "powerdns"; - version = "0.2.1"; - sha256 = "09amgmzyypjilz6armsvyjjxj8frx48aq3nq8vjkp30j2xs7a7a4"; + version = "0.3.0"; + sha256 = "1gm9rwxs6iyvwnyigxdihs3djq83z75w74rkbrmlwdrmz21pww13"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers - deepseq servant servant-client servant-client-core text time + deepseq hashable servant servant-client servant-client-core text + time ]; testHaskellDepends = [ base http-client servant-client servant-client-core tasty @@ -220143,6 +221270,7 @@ self: { description = "containers backed by arrays"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "primitive-convenience" = callPackage @@ -220293,7 +221421,6 @@ self: { benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ]; description = "Sort primitive arrays"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "primitive-stablename" = callPackage @@ -220606,6 +221733,49 @@ self: { license = lib.licenses.bsd3; }) {}; + "pro-abstract" = callPackage + ({ mkDerivation, base, containers, deepseq, hashable, hedgehog + , neat-interpolation, optics-core, text + }: + mkDerivation { + pname = "pro-abstract"; + version = "0.1.0.0"; + sha256 = "0w8dmf8n35z414j4591gvix7q9dn7zn1pai4mg93p9fkd09453fm"; + libraryHaskellDepends = [ + base containers deepseq hashable optics-core text + ]; + testHaskellDepends = [ + base containers deepseq hashable hedgehog neat-interpolation + optics-core text + ]; + doHaddock = false; + description = "Abstract syntax for writing documents"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "pro-source" = callPackage + ({ mkDerivation, base, deepseq, hashable, optics-core + , prettyprinter, tasty, tasty-hunit, tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "pro-source"; + version = "0.1.0.0"; + sha256 = "0c3xhdggw6cw8h8jxlkh4vi2xmcaibvj1c5klm9mf8cfyr4f6722"; + revision = "1"; + editedCabalFile = "1mxc6lbwdhk1d5in711ma1vvd60nckfb17ss8xbj68b8irw160ng"; + libraryHaskellDepends = [ + base deepseq hashable optics-core prettyprinter text vector + ]; + testHaskellDepends = [ + base deepseq hashable optics-core prettyprinter tasty tasty-hunit + tasty-quickcheck text vector + ]; + description = "Utilities for tracking source locations"; + license = lib.licenses.mpl20; + }) {}; + "probability" = callPackage ({ mkDerivation, base, containers, random, transformers, utility-ht }: @@ -222937,6 +224107,77 @@ self: { license = lib.licenses.bsd3; }) {}; + "ptera" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest + , enummapset-th, hspec, hspec-discover, membership, ptera-core + , QuickCheck, unordered-containers + }: + mkDerivation { + pname = "ptera"; + version = "0.2.0.0"; + sha256 = "0lf9d2mcigrmn4asr6cjh5hbp1yl048v57a7az8aszhpsz4k8vkp"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers enummapset-th membership ptera-core + unordered-containers + ]; + testHaskellDepends = [ + base containers doctest enummapset-th hspec membership ptera-core + QuickCheck unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "A parser generator"; + license = "(Apache-2.0 OR MPL-2.0)"; + }) {}; + + "ptera-core" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, containers + , doctest, enummapset-th, hashable, hspec, hspec-discover + , membership, QuickCheck, transformers, unordered-containers + }: + mkDerivation { + pname = "ptera-core"; + version = "0.1.0.0"; + sha256 = "1bpgnd68c070i1azig6r0ck843hvxjcg17yhmy3nizm1bx4nppk1"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base containers enummapset-th hashable membership + transformers unordered-containers + ]; + testHaskellDepends = [ + array base containers doctest enummapset-th hashable hspec + membership QuickCheck transformers unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "A parser generator"; + license = "(Apache-2.0 OR MPL-2.0)"; + }) {}; + + "ptera-th" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, containers + , doctest, enummapset-th, ghc-prim, hspec, hspec-discover + , membership, ptera, ptera-core, QuickCheck, template-haskell + , unordered-containers + }: + mkDerivation { + pname = "ptera-th"; + version = "0.2.0.0"; + sha256 = "15djvwgivi2gxqhq65j3qkfh2w9z07yjh4nrg42ydv6n3ps4s9i8"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base containers enummapset-th ghc-prim membership ptera + ptera-core template-haskell unordered-containers + ]; + testHaskellDepends = [ + array base containers doctest enummapset-th ghc-prim hspec + membership ptera ptera-core QuickCheck template-haskell + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "A parser generator"; + license = "(Apache-2.0 OR MPL-2.0)"; + }) {}; + "pthread" = callPackage ({ mkDerivation, base, generic-deriving, hspec, hspec-discover }: mkDerivation { @@ -225333,10 +226574,8 @@ self: { }: mkDerivation { pname = "quickcheck-higherorder"; - version = "0.1.0.0"; - sha256 = "1gv7r1h9fjg6qi6gj8cg66d7z51kddishxp4hp6cnk55zx1wgy6w"; - revision = "1"; - editedCabalFile = "1xlfpnfbjlihl021b1l6mnl195fcpsjpmdnszf0bfh7q8mrdwr3j"; + version = "0.1.0.1"; + sha256 = "17bnbq6hndlvfv2ryingw181vhv6ab5npkjxkxs0bijv654dca2h"; libraryHaskellDepends = [ base QuickCheck test-fun ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; description = "QuickCheck extension for higher-order properties"; @@ -225631,8 +226870,8 @@ self: { }: mkDerivation { pname = "quickcheck-string-random"; - version = "0.1.4.0"; - sha256 = "08ikiqgzhizg4acv9kba6glwa47xzpdzrpzcz95kcw7b90q9qqp9"; + version = "0.1.4.2"; + sha256 = "1r03w9ypvc063fhcd7sqs654gg0sz66jfll84bwg5709ws3y9bh6"; libraryHaskellDepends = [ base QuickCheck string-random text ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck text @@ -229192,8 +230431,8 @@ self: { }: mkDerivation { pname = "reanimate"; - version = "1.1.4.0"; - sha256 = "0gz651ipn5w6w7adxkvkcgi6nb1d2vs72l8glz5jdll44mchdk55"; + version = "1.1.5.0"; + sha256 = "0gy5s68d00szs1ljfcyisp19g3vz4i1mlbxpym0mymzc5v723wfa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring @@ -229346,6 +230585,18 @@ self: { license = lib.licenses.mit; }) {}; + "rec-smallarray" = callPackage + ({ mkDerivation, base, hspec, primitive }: + mkDerivation { + pname = "rec-smallarray"; + version = "0.1.0.0"; + sha256 = "1a4vsag2h955i2pgcwiy9rzs1dpvd3j2lc1drhyg6svpm7h82amk"; + libraryHaskellDepends = [ base primitive ]; + testHaskellDepends = [ base hspec primitive ]; + description = "SmallArray-based extensible records for small-scale fast reads"; + license = lib.licenses.bsd3; + }) {}; + "recaptcha" = callPackage ({ mkDerivation, base, HTTP, network, network-uri, xhtml }: mkDerivation { @@ -229412,8 +230663,8 @@ self: { }: mkDerivation { pname = "record-dot-preprocessor"; - version = "0.2.13"; - sha256 = "0kqk8iiqhpqrr0b0bxcy0vqp159cnsf9zri45hbp4npqm2lvcw37"; + version = "0.2.14"; + sha256 = "07hq90pk30p14jqk016wchmqrc1qhwa9qajaj90i363g3arcb24p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base extra ghc uniplate ]; @@ -230527,8 +231778,8 @@ self: { }: mkDerivation { pname = "reflex-dom-core"; - version = "0.7.0.0"; - sha256 = "0g96z0qd658g5zhcb01f7gzpk3kb016w6w67wcyrigvg4zxk2vyn"; + version = "0.7.0.1"; + sha256 = "0lhi04i5wfkgblcifah6znkwi6v7294pna48527ns74f0bjc7yy3"; libraryHaskellDepends = [ aeson base bifunctors bimap blaze-builder bytestring case-insensitive constraints containers contravariant data-default @@ -231551,6 +232802,8 @@ self: { pname = "regex-pcre-builtin"; version = "0.95.2.3.8.44"; sha256 = "0pn55ssrwr05c9sa9jvp0knvzjksz04wn3pmzf5dz4xgbyjadkna"; + revision = "1"; + editedCabalFile = "1j7wcw3f8fmd0m1iqndliw2w4jrm4rr7lyydn3xi7wxyvy8a0kmf"; libraryHaskellDepends = [ array base bytestring containers regex-base text ]; @@ -231641,8 +232894,8 @@ self: { }: mkDerivation { pname = "regex-rure"; - version = "0.1.0.2"; - sha256 = "1nqly1c2pg7c44jaajl3kj8hibybm5w8ly4ndyfgmrs60d2kzhyw"; + version = "0.1.2.0"; + sha256 = "1my3rmj2766bd00qg25wijgvw7ffk8fq965y2b97s5v00fjds33r"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ rure ]; libraryToolDepends = [ c2hs ]; @@ -231662,8 +232915,8 @@ self: { pname = "regex-tdfa"; version = "1.3.1.1"; sha256 = "1msrq31k4jmn2lmrdzn87jqarqhw265ca69rfg5jpa5adrzm3gmi"; - revision = "2"; - editedCabalFile = "06zs654j7lrap69fqvmsas7f9x50kbxba7qzq4yihd94f03ba911"; + revision = "3"; + editedCabalFile = "11c7kqjf86jmm6pcxypbvlqb3iim5rcv9gxy1046iappasapampd"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; @@ -232301,7 +233554,7 @@ self: { maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; - "rel8_1_2_2_0" = callPackage + "rel8_1_3_0_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring , case-insensitive, comonad, containers, contravariant, hasql , hasql-transaction, hedgehog, mmorph, opaleye, pretty @@ -232311,8 +233564,8 @@ self: { }: mkDerivation { pname = "rel8"; - version = "1.2.2.0"; - sha256 = "1jbss5liyz8r747yzva1ciadacd63lida1gzrw9g7075hsawfwjf"; + version = "1.3.0.0"; + sha256 = "00iw5fzfx81j7phzjqzmk2bfxvg9q21sn3gw42a3xbnqk1ivrhjy"; libraryHaskellDepends = [ aeson base bifunctors bytestring case-insensitive comonad contravariant hasql opaleye pretty product-profunctors profunctors @@ -233586,7 +234839,7 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "req_3_9_2" = callPackage + "req_3_10_0" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, exceptions, hspec , hspec-core, hspec-discover, http-api-data, http-client @@ -233596,8 +234849,8 @@ self: { }: mkDerivation { pname = "req"; - version = "3.9.2"; - sha256 = "17xkj5pypn4k6ncsahjc0h827kg3cyx5iy5q6iv1gvk8dwdiim0g"; + version = "3.10.0"; + sha256 = "176zl3ihmp8iz4fwfi5dalmiz658dis0hxni6bqzqgnaxhd0230w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring @@ -233689,8 +234942,8 @@ self: { }: mkDerivation { pname = "reqcatcher"; - version = "0.2.2.1"; - sha256 = "0xc8ffz46m3hn7v9vjslh5z7yzqcbyijqfk8wl629539nishgsl9"; + version = "0.2.2.2"; + sha256 = "12p2mb215n7f0smczr5cfxkd89blchyyp5dsl6yzfij1ykf0yr9x"; libraryHaskellDepends = [ base http-types network text wai warp ]; testHaskellDepends = [ base http-client http-types HUnit lens tasty tasty-hunit wai wreq @@ -233808,12 +235061,12 @@ self: { license = lib.licenses.mit; }) {}; - "rerebase_1_15" = callPackage + "rerebase_1_15_0_3" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.15"; - sha256 = "034i8g44w5sfx1770wn95vyh809ar0f6mjwfg96dpszs78b4bzr5"; + version = "1.15.0.3"; + sha256 = "0jxlssdxgh5ldgkdpmhpk8vy5fxmq95171b3jl57r9m2f7zqrcd2"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = lib.licenses.mit; @@ -234331,24 +235584,17 @@ self: { }: mkDerivation { pname = "rest-rewrite"; - version = "0.1.1"; - sha256 = "0absln2c3ia5bj473wr6lahms9x9xj6szk9lgpb9382px038wxrn"; - revision = "1"; - editedCabalFile = "0nzzqg9m7b01g574mm37yiqaqkff4p7hskgj98nb4v7cdp46nypb"; - isLibrary = true; - isExecutable = true; + version = "0.2.0"; + sha256 = "05s5c9j6afswy0ix8m543csk1blknncrh4kz2ihyw90yfgpjjb3b"; libraryHaskellDepends = [ - base containers hashable mtl parsec process text - unordered-containers - ]; - executableHaskellDepends = [ base containers hashable monad-loops mtl parsec process QuickCheck text time unordered-containers ]; testHaskellDepends = [ - base containers hashable mtl parsec process QuickCheck text + base containers hashable mtl QuickCheck text time unordered-containers ]; + doHaddock = false; description = "Rewriting library with online termination checking"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -234697,16 +235943,16 @@ self: { ({ mkDerivation, barbies, base, clash-ghc, clash-lib, clash-prelude , containers, ghc-typelits-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, lens, lift-type, monoidal-containers - , mtl, template-haskell, th-orphans, transformers + , mtl, template-haskell, transformers }: mkDerivation { pname = "retroclash-lib"; - version = "0.1.0.1"; - sha256 = "1wcnr6hk05xj3qyq6wdwyn5qv820wi6djlcllyv8nc2cz8zgc3v7"; + version = "0.1.1"; + sha256 = "1v8xw37cbnz16gqmf65hgk0kvh0vgmq8sj6nh4ngz48l6i5wylv6"; libraryHaskellDepends = [ barbies base clash-ghc clash-lib clash-prelude containers ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise - lens lift-type monoidal-containers mtl template-haskell th-orphans + lens lift-type monoidal-containers mtl template-haskell transformers ]; description = "Code shared across the code samples in the book \"Retrocomputing with Clash\""; @@ -234722,8 +235968,8 @@ self: { }: mkDerivation { pname = "retroclash-sim"; - version = "0.1.0"; - sha256 = "1wv8is17ds9y49an832dlgixly9b98h8x6ybc5dj7zzf1jwplyp8"; + version = "0.1.1"; + sha256 = "147i7nbxyxgsvyj2wiaiipi0s8sp14y1av33yba4s148k38zsiw3"; libraryHaskellDepends = [ array arrows base clash-ghc clash-lib clash-prelude ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise @@ -234754,15 +236000,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "retry_0_9_0_0" = callPackage + "retry_0_9_1_0" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl , random, stm, tasty, tasty-hedgehog, tasty-hunit, time , transformers }: mkDerivation { pname = "retry"; - version = "0.9.0.0"; - sha256 = "0n304r6vyx238558z62kz7nii8y58h2z4iyx54gbkxmz9dsck4ff"; + version = "0.9.1.0"; + sha256 = "1scrkd6bd061h8s4d7sjs21m2ydz2mxiw95gs72rliikh2k3cj7v"; libraryHaskellDepends = [ base exceptions ghc-prim random transformers ]; @@ -234856,6 +236102,17 @@ self: { broken = true; }) {}; + "reverse-list" = callPackage + ({ mkDerivation, base, containers, contiguous, deepseq }: + mkDerivation { + pname = "reverse-list"; + version = "0.2.0"; + sha256 = "0r4bjrc1vksx3j61qb0g1a7nngkzvsybr0v0admls3ffqf3y4zgh"; + libraryHaskellDepends = [ base containers contiguous deepseq ]; + description = "reversed lists/snoc lists"; + license = lib.licenses.bsd3; + }) {}; + "reversi" = callPackage ({ mkDerivation, array, base, process }: mkDerivation { @@ -235659,6 +236916,7 @@ self: { description = "mutable ring buffers with atomic updates in GHC Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rings" = callPackage @@ -235873,8 +237131,8 @@ self: { }: mkDerivation { pname = "risc386"; - version = "0.0.20210812"; - sha256 = "0fxwmah8f4jhs480hrvbvchkmxgfmnsswg0d5zlbdgsiqfln42qv"; + version = "0.0.20220128"; + sha256 = "01bmmz6l5fq825ni1dk5d38x0p8k5fw2ingc3gzj8yzjmhfwp318"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers mtl pretty ]; @@ -236263,8 +237521,8 @@ self: { }: mkDerivation { pname = "robots-txt"; - version = "0.4.1.5"; - sha256 = "025dm3rv4cpig8j02yzkr7xinzfcqmfiaaj8x5kzjw8mgcb1qpn3"; + version = "0.4.1.7"; + sha256 = "0krmqznkkrq16bf78hs98ck6793nl68sn6lb5dv6skn8f10pzyfg"; libraryHaskellDepends = [ attoparsec base bytestring old-locale time ]; @@ -240196,6 +241454,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "scale" = callPackage + ({ mkDerivation, base, bitvec, bytestring, cereal, data-default + , generics-sop, hspec, hspec-contrib, hspec-discover + , hspec-expectations, memory, template-haskell, text, vector + }: + mkDerivation { + pname = "scale"; + version = "1.0.0.0"; + sha256 = "1c1khgy83402lqfqdvq5amf9pgn5a6m4m5zmqkkw6iw0wbjw7p3a"; + libraryHaskellDepends = [ + base bitvec bytestring cereal data-default generics-sop memory + template-haskell text vector + ]; + testHaskellDepends = [ + base bitvec bytestring cereal data-default generics-sop hspec + hspec-contrib hspec-discover hspec-expectations memory + template-haskell text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "SCALE v2.0 codec for Haskell Web3 library."; + license = lib.licenses.asl20; + }) {}; + "scaleimage" = callPackage ({ mkDerivation, base, filepath, gd }: mkDerivation { @@ -240952,7 +242233,6 @@ self: { ]; description = "Scientific notation intended for tokenization"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "scion" = callPackage @@ -242074,6 +243354,8 @@ self: { pname = "sdp"; version = "0.2.1.1"; sha256 = "19s78i5aaj24wbbqkfa6xjkj95fgl23gyqan57pkdjcnknwpymqq"; + revision = "1"; + editedCabalFile = "1bq7gnbdk5fvxd8zbfzqxwg3xxz9k42f7xxjxqrpd3rm2m4ciski"; libraryHaskellDepends = [ base data-default-class fmr ghc-prim ]; libraryToolDepends = [ cpphs ]; description = "Simple Data Processing"; @@ -243960,8 +245242,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, unix }: mkDerivation { pname = "serialport"; - version = "0.5.3"; - sha256 = "0f0q26n27s6b9mfqc9xb9j8p4qrfjfddwiz1wslxk4rh176qw96i"; + version = "0.5.4"; + sha256 = "0hw9vcmxfhjad0jcq0c7m2klcnhilk5ag7byymyny0kzg4js27vr"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring HUnit ]; description = "Cross platform serial port library"; @@ -244086,6 +245368,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant_0_19" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors + , bytestring, case-insensitive, constraints, deepseq, hspec + , hspec-discover, http-api-data, http-media, http-types, mmorph + , mtl, network-uri, QuickCheck, quickcheck-instances + , singleton-bool, sop-core, string-conversions, tagged, text + , transformers, vault + }: + mkDerivation { + pname = "servant"; + version = "0.19"; + sha256 = "1rahn436vc3xajn563ni25jqkg87fvhqkpswan1xy6qsfr0ikdjb"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bifunctors bytestring + case-insensitive constraints deepseq http-api-data http-media + http-types mmorph mtl network-uri QuickCheck singleton-bool + sop-core string-conversions tagged text transformers vault + ]; + testHaskellDepends = [ + aeson base base-compat bytestring hspec http-media mtl QuickCheck + quickcheck-instances string-conversions text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-JuicyPixels" = callPackage ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant , servant-server, wai, warp @@ -244136,17 +245446,15 @@ self: { }) {}; "servant-auth" = callPackage - ({ mkDerivation, aeson, base, jose, lens, servant, text + ({ mkDerivation, aeson, base, containers, jose, lens, servant, text , unordered-containers }: mkDerivation { pname = "servant-auth"; - version = "0.4.0.0"; - sha256 = "0v2g80kakjwpws92bk3anzy4k8vgxq99y7g3ib4amc5x6kxcmjh1"; - revision = "3"; - editedCabalFile = "1hq0mz4fm2f6v57jzyahk5wfip285v3yh20dawvmwdh7wq6104zr"; + version = "0.4.1.0"; + sha256 = "08ggnlknhzdpf49zjm1qpzm12gckss7yr8chmzm6h6ycigz77ndd"; libraryHaskellDepends = [ - aeson base jose lens servant text unordered-containers + aeson base containers jose lens servant text unordered-containers ]; description = "Authentication combinators for servant"; license = lib.licenses.bsd3; @@ -244163,8 +245471,8 @@ self: { pname = "servant-auth-client"; version = "0.4.1.0"; sha256 = "16rmwdrx0qyqa821ipayczzl3gv8gvqgx8k9q8qaw19w87hwkh83"; - revision = "2"; - editedCabalFile = "0mq9nhrlh44jxkngj06pasrrjzv5193lj6d2szprnncgrk36zi31"; + revision = "3"; + editedCabalFile = "102p6mcafxsp41kzqzp59dm5d58r7mdhdijxnhhw25913qzi2pl3"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core ]; @@ -244219,8 +245527,8 @@ self: { pname = "servant-auth-docs"; version = "0.2.10.0"; sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd"; - revision = "8"; - editedCabalFile = "01mb003lajxs1x82k20dbnxzdvxdla51vi4dh4f0a1xycvyhfpyi"; + revision = "9"; + editedCabalFile = "0bqs4l7iwzdx0ppyh7v4b4rmy8va3p3ijknp2dc2lwj5yclzfl32"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -244283,10 +245591,8 @@ self: { }: mkDerivation { pname = "servant-auth-server"; - version = "0.4.6.0"; - sha256 = "0isl9pzzhfbs8pgh3qr2vbgfp0bh741dfa59sq7n3cmbkc6ndpkk"; - revision = "3"; - editedCabalFile = "0iasfns12wab45hf4qkwm5bx1z63ass9n5sh926wnn82g1v6qdyw"; + version = "0.4.7.0"; + sha256 = "1m145xxqg1xy7i1br9yfh3avwkb30zh808nr658ljl7j2imlknj2"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring case-insensitive cookie data-default-class entropy http-types jose @@ -244311,8 +245617,8 @@ self: { pname = "servant-auth-swagger"; version = "0.2.10.1"; sha256 = "029nvb4wxwl98ah26bgcq1b7izrnvssxwn1682liimvsh4a8bady"; - revision = "3"; - editedCabalFile = "1hkszdp7c7c34b2yp2gb7khzlzq8iw5ma066r30kq2nw5jj895k0"; + revision = "4"; + editedCabalFile = "1rwywxhiz7fl5gp90nvdlc0gw0f0lg3pnigj6cpah1fsay4arscf"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -244458,6 +245764,8 @@ self: { pname = "servant-auth-wordpress"; version = "1.0.0.2"; sha256 = "0j4n5anlw3a2cgclmyblg01dcls91hzlmxgc2jkcdpwd49i0pv5n"; + revision = "1"; + editedCabalFile = "0d3sy1i3jcknfgca13a9ajjr65rpam2rahw0634rnmx0wdd30s0w"; libraryHaskellDepends = [ base mtl servant-server text time wai wordpress-auth ]; @@ -244518,6 +245826,8 @@ self: { pname = "servant-blaze"; version = "0.9.1"; sha256 = "08fvy904mz5xjqda702kq4ch25m3nda1yhpp4g7i62j0jmxs2ji6"; + revision = "1"; + editedCabalFile = "1y38lzmh5jr3bix0cqrcx9zkjdr1598hz7rvpnm827qw0ln3cmra"; libraryHaskellDepends = [ base blaze-html http-media servant ]; testHaskellDepends = [ base blaze-html servant-server wai warp ]; description = "Blaze-html support for servant"; @@ -244645,6 +245955,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-client_0_19" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , deepseq, entropy, exceptions, hspec, hspec-discover + , http-api-data, http-client, http-media, http-types, HUnit + , kan-extensions, markdown-unlit, monad-control, mtl, network + , QuickCheck, semigroupoids, servant, servant-client-core + , servant-server, sop-core, stm, tdigest, text, time, transformers + , transformers-base, transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.19"; + sha256 = "1bdapsr6il0f019ss8wsxndpc8cd5czj40xczay5qhl7fqnxg5pa"; + libraryHaskellDepends = [ + base base-compat bytestring containers deepseq exceptions + http-client http-media http-types kan-extensions monad-control mtl + semigroupoids servant servant-client-core stm text time + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring entropy hspec http-api-data + http-client http-types HUnit kan-extensions markdown-unlit mtl + network QuickCheck servant servant-client-core servant-server + sop-core stm tdigest text transformers transformers-compat wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-client-core" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, deepseq, exceptions, free, hspec @@ -244666,6 +246007,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-client-core_0_19" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, constraints, containers, deepseq, exceptions, free + , hspec, hspec-discover, http-media, http-types, network-uri + , QuickCheck, safe, servant, sop-core, template-haskell, text + , transformers + }: + mkDerivation { + pname = "servant-client-core"; + version = "0.19"; + sha256 = "0cisc5cyl367cwrch1gr812aspd36a21hkwi6mwj708rpspwvrmc"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring constraints + containers deepseq exceptions free http-media http-types + network-uri safe servant sop-core template-haskell text + transformers + ]; + testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Core functionality and class for client function generation for servant APIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-client-js" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive , containers, exceptions, http-media, http-types, jsaddle @@ -244718,8 +246083,8 @@ self: { pname = "servant-conduit"; version = "0.15.1"; sha256 = "1vy3ihypb0zm2yd16rq120qw3898i3c0mahh2jysssv65g0avdwp"; - revision = "1"; - editedCabalFile = "0j7jrwyj6vnfr8wyyzjjm6gakx401aylrq8shc2y9ciy0mhf8lrv"; + revision = "3"; + editedCabalFile = "1rcxn2m95zvxqvjbagk9gmwcyvx9wanhxmafwar4y4p15mvzd8d1"; libraryHaskellDepends = [ base bytestring conduit mtl resourcet servant unliftio-core ]; @@ -244841,6 +246206,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-docs_0_12" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , case-insensitive, hashable, http-media, http-types, lens, servant + , string-conversions, tasty, tasty-golden, tasty-hunit, text + , transformers, universe-base, unordered-containers + }: + mkDerivation { + pname = "servant-docs"; + version = "0.12"; + sha256 = "0531jldq35sl1qlna0s1n8bakbsplg15611305dk48z80vcpa933"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring case-insensitive + hashable http-media http-types lens servant string-conversions text + universe-base unordered-containers + ]; + executableHaskellDepends = [ + aeson base lens servant string-conversions text + ]; + testHaskellDepends = [ + aeson base base-compat lens servant string-conversions tasty + tasty-golden tasty-hunit transformers + ]; + description = "generate API docs for your servant webservice"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-docs-simple" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hspec , hspec-core, prettyprinter, raw-strings-qq, servant, text @@ -245068,6 +246462,8 @@ self: { pname = "servant-foreign"; version = "0.15.4"; sha256 = "0bznb73rbgfgkg7n4pxghkqsfca0yw9vak73c6w8sqvc2mjnc7mz"; + revision = "1"; + editedCabalFile = "0lwz3cjbz072xpg6ak0q4grs2c6i7fvvpcsbmc4ngqm695vd9ff8"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -245219,6 +246615,21 @@ self: { broken = true; }) {}; + "servant-htmx" = callPackage + ({ mkDerivation, base, servant-server, text }: + mkDerivation { + pname = "servant-htmx"; + version = "0.1.0.1"; + sha256 = "1plqqaa3vhmwg37bai6xpi415fd772fx6rf0dr919mc79ms0zcfx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base servant-server text ]; + executableHaskellDepends = [ base servant-server text ]; + testHaskellDepends = [ base servant-server text ]; + description = "A library for using htmx with servant"; + license = lib.licenses.bsd3; + }) {}; + "servant-http-streams" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring , case-insensitive, containers, deepseq, entropy, exceptions, hspec @@ -245254,6 +246665,41 @@ self: { broken = true; }) {}; + "servant-http-streams_0_18_4" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring + , case-insensitive, containers, deepseq, entropy, exceptions, hspec + , hspec-discover, http-api-data, http-common, http-media + , http-streams, http-types, HUnit, io-streams, kan-extensions + , markdown-unlit, monad-control, mtl, network, QuickCheck + , semigroupoids, servant, servant-client-core, servant-server, stm + , tdigest, text, time, transformers, transformers-base + , transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-http-streams"; + version = "0.18.4"; + sha256 = "15f24rcgz839cb38q4gs1liqrdyqjbazcqzjdxmv4307x072pv3a"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive containers deepseq + exceptions http-common http-media http-streams http-types + io-streams kan-extensions monad-control mtl semigroupoids servant + servant-client-core text time transformers transformers-base + transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring deepseq entropy hspec + http-api-data http-streams http-types HUnit kan-extensions + markdown-unlit mtl network QuickCheck servant servant-client-core + servant-server stm tdigest text transformers transformers-compat + wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "servant-http2-client" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring , case-insensitive, containers, data-default-class, exceptions @@ -245324,8 +246770,8 @@ self: { pname = "servant-js"; version = "0.9.4.2"; sha256 = "15n5s3i491cxjxj70wa8yhpipaz47q46s04l4ysc64wgijlnm8xy"; - revision = "1"; - editedCabalFile = "0lka70i2qjjj9x8i1ilsfgqq5hwdlrcyd2cj1qcpyhj85c9anxl3"; + revision = "2"; + editedCabalFile = "1wi3q1rn384h9gvxv6dmk31h0wwb6j4yjimz01cz6sgs7fs77ndj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245416,8 +246862,8 @@ self: { }: mkDerivation { pname = "servant-lucid"; - version = "0.9.0.4"; - sha256 = "1m02z60l1knzpcc41ccqmg8fblg2wzdn60vy3cwjbk15girjpxaw"; + version = "0.9.0.5"; + sha256 = "0yhxj62hhqk0269wk3062dpb39qp7khz1gjqyqqmzfbb4v5x8mfz"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -245433,8 +246879,8 @@ self: { pname = "servant-machines"; version = "0.15.1"; sha256 = "0k8abcc72s5bzcf2vmjkxxjnhk45rww6hr3l93msm2510hi6gda4"; - revision = "1"; - editedCabalFile = "0zplgs1kqfmnnx8yv8ay594misiamgmvy41b8w1h3mr7n4vrgk8j"; + revision = "2"; + editedCabalFile = "0231278v3vs5ca3cx43711kzfbhqj2s7g67zcwrj39ly8i9kxm2n"; libraryHaskellDepends = [ base bytestring machines mtl servant ]; testHaskellDepends = [ base base-compat bytestring http-client http-media machines servant @@ -245521,6 +246967,8 @@ self: { pname = "servant-multipart"; version = "0.12.1"; sha256 = "1p55kb3zhq25ncp7wimhggssn68abfgsnlldk13rk1iajaj6y8y5"; + revision = "1"; + editedCabalFile = "1vjdly7n614gzzxyf2sdkgmhkfqxbdvaf0f2pyk9mr9fxlss1g2q"; libraryHaskellDepends = [ base bytestring directory lens resourcet servant servant-docs servant-foreign servant-multipart-api servant-server @@ -245540,6 +246988,8 @@ self: { pname = "servant-multipart-api"; version = "0.12.1"; sha256 = "1gifa9g7ggs0plzffrd9a8j24dmqvgbkkdkfzyy7mpmwrjqw7mcj"; + revision = "1"; + editedCabalFile = "0nwk49xmzwxxlgcsqa62nwvyfqmxb0ab1ncnn96gpqyxkqbv2gxd"; libraryHaskellDepends = [ base bytestring servant text transformers ]; @@ -245557,6 +247007,8 @@ self: { pname = "servant-multipart-client"; version = "0.12.1"; sha256 = "07haaf9nq96lfv2dhqf4319vl321f53v0mypbbg3swzb6rrfkw9h"; + revision = "1"; + editedCabalFile = "1mzh1a37hmq4zl0annnk3xabgli2jndkvx80amhsn97111fiz7lz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -245639,8 +247091,8 @@ self: { pname = "servant-openapi3"; version = "2.0.1.3"; sha256 = "1nvxaskizv5qgznvxdg4crdh4dra5rj7abiky5bd927gnwvbir6s"; - revision = "1"; - editedCabalFile = "08ajlbydnklqdv8gyrqihdn27h5hjvlvjv628xg05w7waa2c15vy"; + revision = "2"; + editedCabalFile = "08cfsqx530kyc90p83kf35pyyl90vx85kz1xvmd9lm54785d2znv"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -245720,6 +247172,8 @@ self: { pname = "servant-pipes"; version = "0.15.3"; sha256 = "1sd01f95rkraa0zdqqg2vwx91zsih0i0hqqkz55nnw9bsbsqhq1n"; + revision = "2"; + editedCabalFile = "1idjvfr8w5hr9dvhj9x08sfpy5xvjf0l7a5jhx9hdlfmrxk1cd8c"; libraryHaskellDepends = [ base bytestring monad-control mtl pipes pipes-safe servant ]; @@ -246105,21 +247559,18 @@ self: { }) {}; "servant-serf" = callPackage - ({ mkDerivation, attoparsec, base, hpack, mtl, optparse-applicative - , regex-base, regex-tdfa, text - }: + ({ mkDerivation, base, Cabal, directory, exceptions, filepath }: mkDerivation { pname = "servant-serf"; - version = "0.2.1"; - sha256 = "1xbjjf243ml2mavvizp6a7llw9c43mnncp7yk0ksjqcnchvsx43w"; + version = "0.3.0.1"; + sha256 = "0qa7ycz9nr214fdhkfvpfwhznshwbxn42mh90a4f8ddlqvbj3is2"; isLibrary = true; isExecutable = true; - executableHaskellDepends = [ - attoparsec base hpack mtl optparse-applicative regex-base - regex-tdfa text + libraryHaskellDepends = [ + base Cabal directory exceptions filepath ]; - doHaddock = false; - description = "Generates a servant API module"; + executableHaskellDepends = [ base ]; + description = "Automatically generate Servant API modules"; license = lib.licenses.mit; }) {}; @@ -246158,6 +247609,44 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-server_0_19" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, constraints, containers, directory, exceptions + , filepath, hspec, hspec-discover, hspec-wai, http-api-data + , http-media, http-types, monad-control, mtl, network, network-uri + , QuickCheck, resourcet, safe, servant, should-not-typecheck + , sop-core, string-conversions, tagged, temporary, text + , transformers, transformers-base, transformers-compat, wai + , wai-app-static, wai-extra, warp, word8 + }: + mkDerivation { + pname = "servant-server"; + version = "0.19"; + sha256 = "0d7z1r9g86cshqqacnw1ls4h5ijpwznbprk2kvnc8j8drjcmnrf1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat base64-bytestring bytestring constraints + containers exceptions filepath http-api-data http-media http-types + monad-control mtl network network-uri resourcet servant sop-core + string-conversions tagged text transformers transformers-base wai + wai-app-static word8 + ]; + executableHaskellDepends = [ + aeson base base-compat servant text wai warp + ]; + testHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring directory hspec + hspec-wai http-types mtl QuickCheck resourcet safe servant + should-not-typecheck sop-core string-conversions temporary text + transformers transformers-compat wai wai-extra + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs and serving them"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-server-namedargs" = callPackage ({ mkDerivation, base, bytestring, http-api-data, http-types, named , servant, servant-namedargs, servant-server, string-conversions @@ -246437,6 +247926,8 @@ self: { pname = "servant-swagger"; version = "1.1.10"; sha256 = "0y6zylhs4z0nfz75d4i2azcq0yh2bd4inanwblx4035dgkk1q78a"; + revision = "1"; + editedCabalFile = "1x18nl7sriqwphdyy8v819vbcx27my5mcx9h9hnds2ph82p3zywc"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -246476,8 +247967,8 @@ self: { }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.3.5.3.52.5"; - sha256 = "1m7scy7fm19zk6xq5mb9l12ajdhm0ml9zl60rqr2m86x4q2i6gq0"; + version = "0.3.5.4.5.0"; + sha256 = "12w75z23bnygyr3ki9w3zfy9nhxyjawf9pyzhfg6rp2mq3nji9gg"; libraryHaskellDepends = [ aeson base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core text @@ -246495,8 +247986,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.5"; sha256 = "0ckvrwrb3x39hfl2hixcj3fhibh0vqsh6y7n1lsm25yvzfrg02zd"; - revision = "1"; - editedCabalFile = "0fk7bj8fndxf1aw8xhhacjp8rrvx10gj7kh9d2pvjavnz310ymxg"; + revision = "2"; + editedCabalFile = "02g98dy08wj7ryrrbk8547s6ad4a59d6z4pczmf6pc59kdjvjx3n"; libraryHaskellDepends = [ aeson base blaze-markup bytestring http-media servant servant-blaze servant-server text transformers transformers-compat wai-app-static @@ -246513,8 +248004,8 @@ self: { pname = "servant-swagger-ui-jensoleg"; version = "0.3.4"; sha256 = "04s4syfmnjwa52xqm29x2sfi1ka6p7fpjff0pxry099rh0d59hkm"; - revision = "1"; - editedCabalFile = "0yvgbyqdkjp5qv88gm7wgcl5rb4haijc4jfmmfcq8g63ya7msx9x"; + revision = "2"; + editedCabalFile = "0a98f9xxy69741fj4cqx7qgh9cpbjk03bgga3h3yx2kjidps0cdm"; libraryHaskellDepends = [ aeson base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core text @@ -246531,8 +248022,8 @@ self: { pname = "servant-swagger-ui-redoc"; version = "0.3.4.1.22.3"; sha256 = "0ln2sz7ffhddk4dqvczpxb5g8f6bic7sandn5zifpz2jg7lgzy0f"; - revision = "1"; - editedCabalFile = "1w6h6g8hlsyv87xxxyrsjz5gdkphmxgc4y63g8mmv4hgdncrb1jk"; + revision = "2"; + editedCabalFile = "0pd85v4fbz6la90qll5mb9v2f2v8c5x1iwy4s3kk6mxcvzxih968"; libraryHaskellDepends = [ aeson base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core text @@ -247261,6 +248752,8 @@ self: { pname = "set-monad"; version = "0.3.0.0"; sha256 = "0iv1mphhhqla4bbr2lhy6zj8bp963jlcxqkib2nnl7vyw1ya1cd1"; + revision = "1"; + editedCabalFile = "1wlg93dx439kvwd5ndsgcyb6v4yqp3w3ql3md62far7cvajrfylc"; libraryHaskellDepends = [ base containers deepseq ]; description = "Set monad"; license = lib.licenses.bsd3; @@ -247943,15 +249436,16 @@ self: { "shake-bench" = callPackage ({ mkDerivation, aeson, base, Chart, Chart-diagrams , diagrams-contrib, diagrams-core, diagrams-lib, diagrams-svg - , directory, extra, filepath, shake, text + , directory, extra, filepath, lens, lens-aeson, shake, text }: mkDerivation { pname = "shake-bench"; - version = "0.1.0.2"; - sha256 = "14p9887qa2i34pbwfg2v2zzvdsbcpzf1d0mr0y2rzjy703356xsm"; + version = "0.1.0.3"; + sha256 = "04pngr9a1g7dr7kb0xp9k2yrbg6vqk3lfpksz6bbyydbmypix3ay"; libraryHaskellDepends = [ aeson base Chart Chart-diagrams diagrams-contrib diagrams-core - diagrams-lib diagrams-svg directory extra filepath shake text + diagrams-lib diagrams-svg directory extra filepath lens lens-aeson + shake text ]; description = "Build rules for historical benchmarking"; license = lib.licenses.asl20; @@ -248899,8 +250393,8 @@ self: { pname = "shelly"; version = "1.9.0"; sha256 = "1kma77gixhyciimh19p64h1ndbcrs9qhk8fgyv71iqh5q57zvday"; - revision = "2"; - editedCabalFile = "0d08dlfgwi2m3wvcmcrcsn2g8lpqzkmxwxw74sysh94qb1gasr0y"; + revision = "3"; + editedCabalFile = "0jgd4jx16sm055riacqfvccnm3r5mz33ynxf41ckvkx42wxd98hp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -248918,6 +250412,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "shelly_1_10_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib + , HUnit, lifted-async, lifted-base, monad-control, mtl, process + , text, time, transformers, transformers-base, unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.10.0"; + sha256 = "0hgzh0rrhipir8378civ5mwvkvcsd063jm2pyx8dqngdynph0h65"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath lifted-async lifted-base monad-control mtl + process text time transformers transformers-base unix-compat + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec hspec-contrib HUnit + lifted-async mtl text transformers unix-compat + ]; + description = "shell-like (systems) programming in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "shelly-extra" = callPackage ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore , shelly, text @@ -251058,48 +252578,47 @@ self: { ({ mkDerivation, aeson, ansi-terminal, asn1-encoding, asn1-types , async, attoparsec, base, base64-bytestring, bytestring , composition, constraints, containers, cryptonite, cryptostore - , data-default, direct-sqlite, directory, file-embed, filepath - , generic-random, hspec, hspec-core, http-types, HUnit, ini - , iso8601-time, memory, mtl, network, network-transport - , optparse-applicative, process, QuickCheck, random, simple-logger - , sqlite-simple, stm, template-haskell, text, time, timeit, tls - , transformers, unliftio, unliftio-core, websockets, x509 - , x509-store, x509-validation + , data-default, direct-sqlite, directory, filepath, generic-random + , hspec, hspec-core, http-types, HUnit, ini, iso8601-time, memory + , mtl, network, network-transport, optparse-applicative, process + , QuickCheck, random, simple-logger, sqlite-simple, stm + , template-haskell, text, time, timeit, tls, transformers, unliftio + , unliftio-core, websockets, x509, x509-store, x509-validation }: mkDerivation { pname = "simplexmq"; - version = "1.0.0"; - sha256 = "0ldri2kp1hadsx9kbypkkijijak1c6zy2h5apj6kgnh7f9a851pm"; + version = "1.0.2"; + sha256 = "142jpsy8myjffx4c1iw21iv210wgnyikmr66bih4gm3xgbqniz9q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal asn1-encoding asn1-types async attoparsec base base64-bytestring bytestring composition constraints containers cryptonite cryptostore data-default direct-sqlite directory - file-embed filepath generic-random http-types iso8601-time memory - mtl network network-transport QuickCheck random simple-logger - sqlite-simple stm template-haskell text time tls transformers - unliftio unliftio-core websockets x509 x509-store x509-validation + filepath generic-random http-types iso8601-time memory mtl network + network-transport QuickCheck random simple-logger sqlite-simple stm + template-haskell text time tls transformers unliftio unliftio-core + websockets x509 x509-store x509-validation ]; executableHaskellDepends = [ aeson ansi-terminal asn1-encoding asn1-types async attoparsec base base64-bytestring bytestring composition constraints containers cryptonite cryptostore data-default direct-sqlite directory - file-embed filepath generic-random http-types ini iso8601-time - memory mtl network network-transport optparse-applicative process - QuickCheck random simple-logger sqlite-simple stm template-haskell - text time tls transformers unliftio unliftio-core websockets x509 - x509-store x509-validation + filepath generic-random http-types ini iso8601-time memory mtl + network network-transport optparse-applicative process QuickCheck + random simple-logger sqlite-simple stm template-haskell text time + tls transformers unliftio unliftio-core websockets x509 x509-store + x509-validation ]; testHaskellDepends = [ aeson ansi-terminal asn1-encoding asn1-types async attoparsec base base64-bytestring bytestring composition constraints containers cryptonite cryptostore data-default direct-sqlite directory - file-embed filepath generic-random hspec hspec-core http-types - HUnit iso8601-time memory mtl network network-transport QuickCheck - random simple-logger sqlite-simple stm template-haskell text time - timeit tls transformers unliftio unliftio-core websockets x509 - x509-store x509-validation + filepath generic-random hspec hspec-core http-types HUnit + iso8601-time memory mtl network network-transport QuickCheck random + simple-logger sqlite-simple stm template-haskell text time timeit + tls transformers unliftio unliftio-core websockets x509 x509-store + x509-validation ]; description = "SimpleXMQ message broker"; license = lib.licenses.agpl3Only; @@ -252021,14 +253540,14 @@ self: { license = lib.licenses.gpl2Only; }) {}; - "skylighting_0_12_1" = callPackage + "skylighting_0_12_2" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , pretty-show, skylighting-core, text }: mkDerivation { pname = "skylighting"; - version = "0.12.1"; - sha256 = "0aaxw2b6lwdnabm5p7nj7xv39lscypvzyivnsjrxham5qvgsvnn8"; + version = "0.12.2"; + sha256 = "11qzlbzw66ryp1n3fkkhh4g0g29zajs3kf7rv3byjvy9bny5qfi6"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -252074,7 +253593,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "skylighting-core_0_12_1" = callPackage + "skylighting-core_0_12_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -252084,8 +253603,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.12.1"; - sha256 = "0lyiax1smgv729109h3yhbpm0l6r7rwrfmp2df2ypmh3k6s88rhf"; + version = "0.12.2"; + sha256 = "0zgwzk69ww8w88gaga9fnk2inf6rsqhy5hmj0i29xhd6pb78v92v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -253165,7 +254684,6 @@ self: { libraryHaskellDepends = [ base bytesmith primitive ]; description = "Parse arrays of tokens"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "smith-cli" = callPackage @@ -255920,6 +257438,8 @@ self: { pname = "sound-collage"; version = "0.2.1"; sha256 = "09g63b3k0l30z3lxmcz0zpggqqhnr7m01wh2vpm5v561rbnl8rsi"; + revision = "1"; + editedCabalFile = "07zs924gils8nsb5b8q6lmh4g6iln6dkj3qic8p8cpwkrazjfwsx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -256675,8 +258195,8 @@ self: { pname = "special-values"; version = "0.1.0.0"; sha256 = "1kkdw2c4d2hha99v9f89ahmifjxp7fxmxyfwq9a8xk6s0h9xs51w"; - revision = "1"; - editedCabalFile = "10pbx4px4kmg6nwb78bayi26dlzbzvji5zv9fa6f45rk19p2sdlc"; + revision = "2"; + editedCabalFile = "1vv5gydjd65jniifl3mnch8bzvpvdahi913gsa3kv5zijwhad699"; libraryHaskellDepends = [ base bytestring ieee754 scientific text ]; @@ -256730,6 +258250,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "spectacle" = callPackage + ({ mkDerivation, base, comonad, containers, hashable, hedgehog + , logict, microlens, microlens-mtl, mtl, optparse-applicative + , prettyprinter, prettyprinter-ansi-terminal, tasty, tasty-hedgehog + , text, transformers + }: + mkDerivation { + pname = "spectacle"; + version = "1.0.0"; + sha256 = "0zbxbhjid1j44f31n9h8hsildfx2lf92p1s9dw62gr0xn30kf4gj"; + libraryHaskellDepends = [ + base comonad containers hashable logict microlens microlens-mtl mtl + optparse-applicative prettyprinter prettyprinter-ansi-terminal text + transformers + ]; + testHaskellDepends = [ + base comonad containers hashable hedgehog microlens tasty + tasty-hedgehog + ]; + description = "Embedded specification language & model checker in Haskell"; + license = lib.licenses.asl20; + }) {}; + "spectral-clustering" = callPackage ({ mkDerivation, base, clustering, containers, hmatrix , hmatrix-svdlibc, mwc-random, safe, sparse-linear-algebra @@ -258347,12 +259890,12 @@ self: { }) {}; "st2" = callPackage - ({ mkDerivation, base, gdp, ghc-prim, primitive }: + ({ mkDerivation, base, gdp, primitive }: mkDerivation { pname = "st2"; - version = "0.1.0.2"; - sha256 = "0i7v9yacwgf6aj67c4r2n8zcm07jrcff9nl52sx7ylsjs65ym2qz"; - libraryHaskellDepends = [ base gdp ghc-prim primitive ]; + version = "0.1.1"; + sha256 = "1agmrzdgil899zjighm946syf41v3ygddbqsg1659n6s4hl5k96k"; + libraryHaskellDepends = [ base gdp primitive ]; description = "shared heap regions between local mutable state threads"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -258455,6 +259998,8 @@ self: { pname = "stache"; version = "2.3.0"; sha256 = "1gfmr9gcq9zm7ljp2nqmc41lpig11d19xsqzazr2mvm5ddsi69cr"; + revision = "1"; + editedCabalFile = "0akyrm2zf2aq73fqi07fnkns3waxqciyzawv0nmr8yhkdaqj6plj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -258488,8 +260033,8 @@ self: { pname = "stache"; version = "2.3.1"; sha256 = "1a26pwg6y90588yf9sp18w4b2ahr64fxdhy1c3zv0c9pw7bv6k6q"; - revision = "1"; - editedCabalFile = "0yfy56ax3zbikvmdyplx5l3rzq50fjwz6rcb9l8iwz167h7gzjpr"; + revision = "2"; + editedCabalFile = "1bmnpm7galndl2a87vhbbrhxn1wn09x2l6bqwasfmczyjisn78a8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -258537,8 +260082,8 @@ self: { pname = "stack"; version = "2.7.3"; sha256 = "0i2v5i6bg90n6i4clcaww8m8702d3y5z8r03xdizdisjhf0zijj7"; - revision = "1"; - editedCabalFile = "0j99hh3lf886qvf86xwgv9a0ps9vp40z2s3xnl4lr4mgn9f0lrvb"; + revision = "2"; + editedCabalFile = "0i1fgairidy8g8zcf9wim4cg2y2xsvknkyz7dnb1mzy02ls6kqjb"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -258616,8 +260161,8 @@ self: { }: mkDerivation { pname = "stack-all"; - version = "0.3.1"; - sha256 = "0jsz28p1xpzh77r3mhjh98jsz3lnzirfvh9w64rcgxpacdyajwhf"; + version = "0.4"; + sha256 = "0m9wiy233lw6bp6gz4h2x8bdi0lwsjl36bzx6544cdp91vllkzj1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -258660,14 +260205,14 @@ self: { }: mkDerivation { pname = "stack-clean-old"; - version = "0.4.5"; - sha256 = "04qc3z7xgs8p814lnpwyqgwza7i6wz9mkmzzk0ggq6mv32zzz7kb"; + version = "0.4.6"; + sha256 = "0ymzri4pxs0dvqbs3nyrc6hq2lp6y6glva1kbjzpkzgk9r93x3kn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory extra filemanip filepath simple-cmd simple-cmd-args ]; - description = "Clean away old stack build artefacts"; + description = "Clean away old stack build artifacts"; license = lib.licenses.bsd3; }) {}; @@ -260611,8 +262156,8 @@ self: { }: mkDerivation { pname = "stm-actor"; - version = "0.2.3.1"; - sha256 = "1gl4hladndwbjdb02hcb5mdirm9gnz23ayclh0wws8xsq23dv2b4"; + version = "0.2.3.2"; + sha256 = "0h81amww5caa8950nn124sn5804vdsvxz2nahwvx88hbgsgldpkg"; libraryHaskellDepends = [ base mtl stm stm-queue transformers unliftio-core ]; @@ -261730,8 +263275,8 @@ self: { }: mkDerivation { pname = "streaming-commons"; - version = "0.2.2.3"; - sha256 = "12zhy0nk9cxijhc66sjg1zgyv5qrvvrpxwzfvjpdxncv3v606w32"; + version = "0.2.2.4"; + sha256 = "1wnc2hi90djilj1m0la3h3xri723pbpmfdyp0kxxs33irs6418an"; libraryHaskellDepends = [ array async base bytestring directory network process random stm text transformers unix zlib @@ -262269,8 +263814,8 @@ self: { }: mkDerivation { pname = "streamly-examples"; - version = "0.1.0"; - sha256 = "0ny22z33wwkg9bbziwcj77k6gb8lwj1v0y5z6mw8sw20k4ca93q3"; + version = "0.1.1"; + sha256 = "174283sarx0ccjzzxill9l06hi7g9jz76sxwlb4fyc03db5q027i"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -262319,14 +263864,14 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) lmdb;}; - "streamly-lmdb_0_3_0" = callPackage + "streamly-lmdb_0_4_0" = callPackage ({ mkDerivation, async, base, bytestring, directory, lmdb , QuickCheck, streamly, tasty, tasty-quickcheck, temporary }: mkDerivation { pname = "streamly-lmdb"; - version = "0.3.0"; - sha256 = "1da87rbmh9sgffjy5367pzy1d80f7zlxhszi9sq87jfws4i20pk7"; + version = "0.4.0"; + sha256 = "10749fl4dgm89z1d6sas1ngwxkkfl385465yxnrhxcc63wz53p5d"; libraryHaskellDepends = [ async base bytestring streamly ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ @@ -262723,10 +264268,8 @@ self: { ({ mkDerivation, base, bifunctors, deepseq, hashable }: mkDerivation { pname = "strict-tuple"; - version = "0.1.4"; - sha256 = "06fyf58kl3c5xpfdd5h7368ggbfadm5n67h3kqajrsgh3yl84hrq"; - revision = "1"; - editedCabalFile = "127byff30qm6vfnpdb2jfhag6dfv8zz306hkdnlkryx4gf5aab86"; + version = "0.1.5"; + sha256 = "1n0rw1vvvsgznx4i21480qzzs44iw35hcdiw0d160war7nf2pyp5"; libraryHaskellDepends = [ base bifunctors deepseq hashable ]; testHaskellDepends = [ base ]; description = "Strict tuples"; @@ -263021,8 +264564,8 @@ self: { }: mkDerivation { pname = "string-random"; - version = "0.1.4.1"; - sha256 = "1ggz48mzyzch3ga4682jd9y4g1j6px1anv7k8cczjlz9f4lh73nd"; + version = "0.1.4.2"; + sha256 = "0rqh0cwywlzg4xyb1s80mghl3kq3sngg8xjbh4g9x4p8fc6maiw9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263494,18 +265037,19 @@ self: { }) {}; "strong-path" = callPackage - ({ mkDerivation, base, exceptions, filepath, hspec, path, tasty - , tasty-discover, tasty-hspec, tasty-quickcheck, template-haskell + ({ mkDerivation, base, exceptions, filepath, hashable, hspec, path + , tasty, tasty-discover, tasty-hspec, tasty-quickcheck + , template-haskell }: mkDerivation { pname = "strong-path"; - version = "1.1.2.0"; - sha256 = "1rz3rxdq3apah0ixj9dzd1wlicjj0l5lspv9bz79kfjvlxn15yib"; + version = "1.1.3.0"; + sha256 = "0jy8qmyixsi3d71qkrj4v3r9nrppb2hs4p5pbpj7yq964ryyg9am"; libraryHaskellDepends = [ - base exceptions filepath path template-haskell + base exceptions filepath hashable path template-haskell ]; testHaskellDepends = [ - base filepath hspec path tasty tasty-discover tasty-hspec + base filepath hashable hspec path tasty tasty-discover tasty-hspec tasty-quickcheck ]; testToolDepends = [ tasty-discover ]; @@ -264018,6 +265562,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "subcategories_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default, foldl + , hashable, inspection-testing, mono-traversable, pointed + , primitive, QuickCheck, reflection, semialign, tasty + , tasty-discover, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, template-haskell, text, these + , unordered-containers, vector, vector-algorithms, vector-builder + }: + mkDerivation { + pname = "subcategories"; + version = "0.2.0.0"; + sha256 = "0qxiccv9xpl6ms8j9lfvl8jps9gr979ya441fghy1jvfza0fxd1x"; + libraryHaskellDepends = [ + base containers data-default foldl hashable mono-traversable + pointed primitive reflection semialign template-haskell text these + unordered-containers vector vector-algorithms vector-builder + ]; + testHaskellDepends = [ + base bytestring containers data-default foldl hashable + inspection-testing mono-traversable pointed primitive QuickCheck + reflection semialign tasty tasty-expected-failure tasty-hunit + tasty-quickcheck template-haskell text these unordered-containers + vector vector-algorithms vector-builder + ]; + testToolDepends = [ tasty-discover ]; + description = "Subcategories induced by class constraints"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "subhask" = callPackage ({ mkDerivation, approximate, array, base, bloomfilter, bytes , bytestring, cassava, containers, criterion, deepseq, erf, gamma @@ -265253,7 +266827,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "swagger2_2_7" = callPackage + "swagger2_2_8_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries , bytestring, Cabal, cabal-doctest, containers, cookie, doctest , generics-sop, Glob, hashable, hspec, hspec-discover, http-media @@ -265264,8 +266838,8 @@ self: { }: mkDerivation { pname = "swagger2"; - version = "2.7"; - sha256 = "1p3vi90siylgg94s7izmdvp2i36g017q2hnl90d1rpphi0nd1f6b"; + version = "2.8.2"; + sha256 = "0vxqmc3wx01fx04cqq9l0gvcas7njsj6q2r960rb1gbmggydpysc"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat-batteries bytestring containers @@ -265584,7 +267158,7 @@ self: { license = "unknown"; }) {}; - "sydtest_0_7_0_1" = callPackage + "sydtest_0_8_0_0" = callPackage ({ mkDerivation, async, autodocodec, autodocodec-yaml, base , bytestring, containers, Diff, dlist, envparse, filepath , MonadRandom, mtl, optparse-applicative, path, path-io @@ -265594,8 +267168,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.7.0.1"; - sha256 = "09qvl0j8bx5v1i8mvvmzkfaxj7jrcbpbkxrnjcanml60dfp0s444"; + version = "0.8.0.0"; + sha256 = "1b2i4w58k0mrb5lk4hjbwfmm065gmmll6jm3k6jydjjkkpf1zfap"; libraryHaskellDepends = [ async autodocodec autodocodec-yaml base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path @@ -265671,6 +267245,23 @@ self: { license = "unknown"; }) {}; + "sydtest-hedgehog" = callPackage + ({ mkDerivation, base, containers, hedgehog, sydtest + , sydtest-discover + }: + mkDerivation { + pname = "sydtest-hedgehog"; + version = "0.0.0.0"; + sha256 = "0kxx2r4hjqzkrhplgfby2x7zcya05n42hna86zk27k2i9hkabhnh"; + libraryHaskellDepends = [ base containers hedgehog sydtest ]; + testHaskellDepends = [ base hedgehog sydtest ]; + testToolDepends = [ sydtest-discover ]; + description = "A Hedgehog companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "sydtest-hedis" = callPackage ({ mkDerivation, base, bytestring, hedis, network, path, path-io , port-utils, sydtest, sydtest-discover, sydtest-typed-process @@ -266131,13 +267722,13 @@ self: { }: mkDerivation { pname = "symantic-base"; - version = "0.3.0.20211007"; - sha256 = "1ia79d3ih3yr6fpm85hvn42jpq0d41qvm96v58b2rsxlivrnibsq"; + version = "0.4.0.20211106"; + sha256 = "0fbw0fg78b8wh3fcbvcm9v3qrsvpyymhwd7f9a70yqj90mggl7sc"; libraryHaskellDepends = [ base containers hashable template-haskell transformers unordered-containers ]; - description = "Basic symantics combinators for Embedded Domain-Specific Languages (EDSL)"; + description = "Basic symantic combinators for Embedded Domain-Specific Languages (EDSL)"; license = lib.licenses.agpl3Plus; }) {}; @@ -267009,6 +268600,8 @@ self: { pname = "synthesizer-llvm"; version = "0.9"; sha256 = "0bqncysaq164235792657yyf1ngkr7gm9vkzkbiqy6f7g7a62shd"; + revision = "1"; + editedCabalFile = "04z0s3hkpdcmri4w34s2ssz9wwf60z1ccc0bc3bphs1caz8i61j2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -268327,8 +269920,8 @@ self: { }: mkDerivation { pname = "tailwind"; - version = "0.1.0.0"; - sha256 = "1wvmygaf8dmy9h0wzxb3623rpdmzvhzr879yc4sm94bzd42y8cy6"; + version = "0.2.0.0"; + sha256 = "08m4mkk3fsrzpna3747gc2ln981nd7x17p3kzzvirs7p6js513yh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -269200,8 +270793,8 @@ self: { pname = "tasty-hedgehog"; version = "1.1.0.0"; sha256 = "0cy49z8n124xh2ra2482vfy5if1n6d9lbdjma2zg1mxfj0k0zyfb"; - revision = "1"; - editedCabalFile = "0zn29qgsb5v4y7s4lrrhav9wqaz6pm97rcj1gl88qvvvi000jjbx"; + revision = "3"; + editedCabalFile = "1i7i2yws3bdmsg2hl7dh65zvh9sna3gnlv0l4m1sqqdx5dji1a3w"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -269239,8 +270832,8 @@ self: { }: mkDerivation { pname = "tasty-hslua"; - version = "1.0.0"; - sha256 = "07il3h282lj7m9y7cgc2w0gbffzndibwgxqfdv5m2n4kf1c3finl"; + version = "1.0.1"; + sha256 = "1zmxvhmmj6f0jw19v25pkhschrvzhwfr20jqg1sxdg15aaa3gjf7"; libraryHaskellDepends = [ base bytestring hslua-core tasty tasty-hunit ]; @@ -269502,20 +271095,22 @@ self: { license = lib.licenses.mit; }) {}; - "tasty-lua_1_0_0" = callPackage + "tasty-lua_1_0_1" = callPackage ({ mkDerivation, base, bytestring, directory, file-embed, filepath - , hslua-core, hslua-marshalling, tasty, tasty-hunit, text + , hslua-core, hslua-marshalling, lua-arbitrary, QuickCheck, tasty + , tasty-hunit, text }: mkDerivation { pname = "tasty-lua"; - version = "1.0.0"; - sha256 = "1ykl3by81ivz59zy3cqd6xsa4g8g7axwr9hajdbvmwn1b5y4h880"; + version = "1.0.1"; + sha256 = "0izkj9miws0w8320mfaxhj2bnwri3x338qvdz73wbzmbjwibmg23"; libraryHaskellDepends = [ - base bytestring file-embed hslua-core hslua-marshalling tasty text + base bytestring file-embed hslua-core hslua-marshalling + lua-arbitrary QuickCheck tasty text ]; testHaskellDepends = [ - base directory filepath hslua-core hslua-marshalling tasty - tasty-hunit + base bytestring directory filepath hslua-core hslua-marshalling + lua-arbitrary QuickCheck tasty tasty-hunit ]; description = "Write tests in Lua, integrate into tasty"; license = lib.licenses.mit; @@ -269833,8 +271428,8 @@ self: { pname = "tasty-wai"; version = "0.1.1.1"; sha256 = "1bnq2mbgv1ksn9sq33dq1q91pzndy7gn61mlnkybk89k0bsw5i7y"; - revision = "2"; - editedCabalFile = "13f0rmdyfd8wx9w9d6vj40akskq763gjj89p7dzy6zyaiyllgk64"; + revision = "3"; + editedCabalFile = "1bjmzxnrypv1nqhc37rwwcgilnrrjm8scwnb4ca6z99bldi95b27"; libraryHaskellDepends = [ base bytestring http-types HUnit tasty wai wai-extra ]; @@ -270435,17 +272030,20 @@ self: { }) {}; "telegram-bot-simple" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron - , filepath, hashable, http-api-data, http-client, http-client-tls - , monad-control, mtl, pretty-show, profunctors, servant - , servant-client, servant-multipart, servant-multipart-api - , servant-multipart-client, split, stm, template-haskell, text - , time, transformers, unordered-containers + ({ mkDerivation, aeson, aeson-pretty, base, blaze-html, bytestring + , cookie, cron, dhall, filepath, hashable, http-api-data + , http-client, http-client-tls, http-types, monad-control, mtl + , optparse-applicative, pretty-show, prettyprinter, profunctors + , QuickCheck, random, servant, servant-blaze, servant-client + , servant-multipart, servant-multipart-api + , servant-multipart-client, servant-server, split, stm + , template-haskell, text, time, transformers, unix + , unordered-containers, uuid, warp }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.3.8"; - sha256 = "0nqzghd3apfic1idrx03g5a6xihghi35ha28mcksgji9zp42595q"; + version = "0.4"; + sha256 = "1c73vyhl8xlac0vjgyjh8rfszm9zri4absmxpdr79djs9rrfwk2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -270456,11 +272054,13 @@ self: { template-haskell text time transformers unordered-containers ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring cron filepath hashable - http-api-data http-client http-client-tls monad-control mtl - pretty-show profunctors servant servant-client servant-multipart - servant-multipart-api servant-multipart-client split stm - template-haskell text time transformers unordered-containers + aeson aeson-pretty base blaze-html bytestring cookie cron dhall + filepath hashable http-api-data http-client http-client-tls + http-types monad-control mtl optparse-applicative pretty-show + prettyprinter profunctors QuickCheck random servant servant-blaze + servant-client servant-multipart servant-multipart-api + servant-multipart-client servant-server split stm template-haskell + text time transformers unix unordered-containers uuid warp ]; description = "Easy to use library for building Telegram bots"; license = lib.licenses.bsd3; @@ -272838,6 +274438,29 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) icu;}; + "text-icu_0_8_0_1" = callPackage + ({ mkDerivation, array, base, bytestring, deepseq, directory + , ghc-prim, HUnit, icu, icu-i18n, QuickCheck, random + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time + }: + mkDerivation { + pname = "text-icu"; + version = "0.8.0.1"; + sha256 = "1bxhaxyvhag26airz870lc6rjlf14xigdx3cml13kp7bshwgl7wi"; + libraryHaskellDepends = [ base bytestring deepseq text time ]; + librarySystemDepends = [ icu ]; + libraryPkgconfigDepends = [ icu-i18n ]; + testHaskellDepends = [ + array base bytestring deepseq directory ghc-prim HUnit QuickCheck + random test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + description = "Bindings to the ICU library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) icu; icu-i18n = null;}; + "text-icu-normalized" = callPackage ({ mkDerivation, base, base-unicode-symbols, bytestring, containers , exceptions, filepath, HUnit, lens, parsec, QuickCheck @@ -273220,6 +274843,22 @@ self: { broken = true; }) {}; + "text-rope" = callPackage + ({ mkDerivation, base, deepseq, random, tasty, tasty-bench + , tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "text-rope"; + version = "0.1"; + sha256 = "0dfn8hjnw38zh9nw7wy2jfyg0acg9jpfhngj65aczb9qxv6yj3hv"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base deepseq text vector ]; + testHaskellDepends = [ base tasty tasty-quickcheck text ]; + benchmarkHaskellDepends = [ base random tasty-bench text ]; + description = "Text lines and ropes"; + license = lib.licenses.bsd3; + }) {}; + "text-short" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, ghc-prim , hashable, quickcheck-instances, tasty, tasty-hunit @@ -274412,12 +276051,13 @@ self: { "thank-you-stars" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , directory, filepath, hackage-db, hspec, req, split, text + , directory, filepath, hackage-db, hspec, hspec-discover, req + , split, text }: mkDerivation { pname = "thank-you-stars"; - version = "0.3.0"; - sha256 = "0cks475c8ivhikci7h8zkvxhxmp7n9w85b16wvx998q3bjrbkj04"; + version = "1.0.1"; + sha256 = "1nlmfpm05fsn18rygj33vf4sydn6zk4sx6sp72s1f73llvqrpvhs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -274428,6 +276068,7 @@ self: { testHaskellDepends = [ base Cabal containers directory filepath hspec ]; + testToolDepends = [ hspec-discover ]; description = "Give your dependencies stars on GitHub!"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -276983,8 +278624,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "1.5.6"; - sha256 = "0mr5p1h161bdhnkfx4mvlk1hqq89z0fh7z37jgrbx4i8aa61cs96"; + version = "1.5.7"; + sha256 = "16pp6q0r4l23l3qi8v4yn4gjdsck8mg2jy3x7m7z5g6v9047v7mq"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring cereal cryptonite data-default-class hourglass memory mtl network transformers x509 @@ -277460,6 +279101,7 @@ self: { description = "Easy-to-use TODOs manager"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tofromxml" = callPackage @@ -278981,14 +280623,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "transformers_0_6_0_2" = callPackage + "transformers_0_6_0_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.6.0.2"; - sha256 = "1d907i06lgmis4s1mhjn6f4f3991vpycv9pl61h4xn2hwxasq3k2"; - revision = "1"; - editedCabalFile = "0g536mmdq72j72jy6437q64vsxj8yba0mamm15xirs67j551azn1"; + version = "0.6.0.3"; + sha256 = "070v6kwxinls0w48mfyjqz6rfz03sphyig2ar13lplqjr01kaa67"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = lib.licenses.bsd3; @@ -279479,6 +281119,27 @@ self: { broken = true; }) {}; + "traverse-code" = callPackage + ({ mkDerivation, array, base, containers, ghc-prim, linear-generics + , primitive, tasty, tasty-hunit, template-haskell + }: + mkDerivation { + pname = "traverse-code"; + version = "0.1.1.1"; + sha256 = "0nz3zmmcvfsm6xsl6sy7c88dzdxglhjpk8h8sah2xdy58gwdgjd2"; + libraryHaskellDepends = [ + array base containers ghc-prim linear-generics primitive + template-haskell + ]; + testHaskellDepends = [ + base containers linear-generics primitive tasty tasty-hunit + template-haskell + ]; + description = "General data structure lifting for Template Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "traverse-with-class" = callPackage ({ mkDerivation, base, tasty, tasty-hunit, template-haskell , transformers @@ -281159,10 +282820,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.23"; - sha256 = "02g0a6az01lfikrinx2027zqrp8wyivldwi36s2yqk9a5qm3ap5c"; - revision = "2"; - editedCabalFile = "0i8fnwzqc6j599d19rzcggk29ky45izy5wc9y9ii54lc95d8c7xg"; + version = "1.5.24"; + sha256 = "06n9k8cchmy090k6azl6ld8ygkljw8wrpw3cigsgz48hqchq8c2p"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -283412,22 +285071,21 @@ self: { "tz" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion - , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , test-framework-th, thyme, time, timezone-olson, timezone-series - , tzdata, vector + , data-default, deepseq, HUnit, lens, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, thyme + , time, timezone-olson, timezone-series, tzdata, vector }: mkDerivation { pname = "tz"; - version = "0.1.3.5"; - sha256 = "1svqcpcpy5mydkmf42a78khxa053jxbvrbdh5jzprh2b7g0dpvlb"; + version = "0.1.3.6"; + sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector ]; testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th time tzdata + base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck tasty-th + time tzdata ]; benchmarkHaskellDepends = [ base criterion lens thyme time timezone-olson timezone-series @@ -283440,20 +285098,18 @@ self: { "tzdata" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, HUnit - , test-framework, test-framework-hunit, test-framework-th, unix - , vector + , tasty, tasty-hunit, tasty-th, unix, vector }: mkDerivation { pname = "tzdata"; - version = "0.2.20201021.0"; - sha256 = "0bkd7k0q8dflp21hzf71kbqyk0jq279z7sgwlq1pdzs2ggmnrwm9"; + version = "0.2.20211021.0"; + sha256 = "0x1pqdlbhh8qhbbfpc01jlcamk2ihwxbs9m8kgm8abd9fk0bwa0a"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers deepseq vector ]; testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit - test-framework-th unix + base bytestring HUnit tasty tasty-hunit tasty-th unix ]; description = "Time zone database (as files and as a module)"; license = lib.licenses.asl20; @@ -284632,8 +286288,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "print and show in unicode"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "unicode-symbols" = callPackage @@ -285926,8 +287580,8 @@ self: { }: mkDerivation { pname = "unliftio"; - version = "0.2.20"; - sha256 = "0mbm57h7r16qd7kpglbm50qrnfjmazd70avbrl647n4jwhlrp7my"; + version = "0.2.21.0"; + sha256 = "0z3g4hnwzianh8a564zfwj4rvs1ayggxm0wcwi97hc1g0ndz5hic"; libraryHaskellDepends = [ async base bytestring deepseq directory filepath process stm time transformers unix unliftio-core @@ -286794,8 +288448,8 @@ self: { pname = "uri-encode"; version = "1.5.0.7"; sha256 = "0lj2h701af12539p957rw24bxr07mfqd5r4h52i42f43ax165767"; - revision = "1"; - editedCabalFile = "172mgdd8dgy8wphgl9vbvp26lrzp01prr5jshbng4rlhpyd340p1"; + revision = "2"; + editedCabalFile = "03pmvbi56gmg1z2wr3glncc7dbyh666bqp565inh31qzsp9zwmgj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -286953,7 +288607,6 @@ self: { ]; description = "Memory efficient url type and parser"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "url-decoders" = callPackage @@ -286995,6 +288648,21 @@ self: { broken = true; }) {}; + "url-slug" = callPackage + ({ mkDerivation, aeson, base, relude, text, unicode-transforms + , uri-encode + }: + mkDerivation { + pname = "url-slug"; + version = "0.1.0.0"; + sha256 = "0x5xkfxzml1cnqcmmyvm3gj0ikw2371jbsqya6ng7pfjlcsmdfzn"; + libraryHaskellDepends = [ + aeson base relude text unicode-transforms uri-encode + ]; + description = "Encoding and decoding of URL slugs"; + license = lib.licenses.mit; + }) {}; + "urlcheck" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, network , old-time @@ -287072,7 +288740,6 @@ self: { ]; description = "Painfully simple URL deployment"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "urn" = callPackage @@ -287370,7 +289037,9 @@ self: { ]; description = "A pragmatic time and date library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ sternenseemann ]; + broken = true; }) {}; "utf" = callPackage @@ -287852,7 +289521,6 @@ self: { ]; description = "UUID parsing using byteverse packages"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "uuid-crypto" = callPackage @@ -289357,19 +291025,19 @@ self: { }) {}; "vector-circular" = callPackage - ({ mkDerivation, base, deepseq, doctest, hedgehog, hedgehog-classes + ({ mkDerivation, base, deepseq, hedgehog, hedgehog-classes , nonempty-vector, primitive, semigroupoids, template-haskell , vector }: mkDerivation { pname = "vector-circular"; - version = "0.1.3"; - sha256 = "0xz2ih8x7a5731bbirhmkl7hyarzijnwgvj8zm9wxs1nky8yjyb7"; + version = "0.1.4"; + sha256 = "18aijs6yn01bv3zal7l0wsck0hd54bbhckjc67cvr8wmpqdk2xxw"; libraryHaskellDepends = [ base deepseq nonempty-vector primitive semigroupoids template-haskell vector ]; - testHaskellDepends = [ base doctest hedgehog hedgehog-classes ]; + testHaskellDepends = [ base hedgehog hedgehog-classes ]; description = "circular vectors"; license = lib.licenses.mit; }) {}; @@ -289447,8 +291115,8 @@ self: { }: mkDerivation { pname = "vector-extras"; - version = "0.2.4"; - sha256 = "0aiycxljvwakvfigbm9wbg7b4jahd3ijckzgrfwdjpnxcqhjr0p9"; + version = "0.2.6"; + sha256 = "08zf1h6inqziy52q2nmgkvnaccpbg389pz41yyg6h0drsg5x8r4h"; libraryHaskellDepends = [ base containers deferred-folds foldl hashable unordered-containers vector @@ -289845,6 +291513,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "velma" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, filepath + , hspec, text + }: + mkDerivation { + pname = "velma"; + version = "0.2022.2.13"; + sha256 = "0dzq9py5k6hz9pqfv8cnfaj84q3y4j8p6pmpncd1crj1nkl10mr5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal containers directory filepath + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base Cabal filepath hspec text ]; + description = "Automatically add files to exposed-modules and other-modules"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "venzone" = callPackage ({ mkDerivation, ansi-terminal-game, base, containers, directory , file-embed, filepath, fsnotify, hspec, line-drawing, megaparsec @@ -290054,8 +291743,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, hspec, semigroupoids }: mkDerivation { pname = "versioning"; - version = "0.3.1.0"; - sha256 = "0m5hgl6n8znxn63pkvv7yb2nx7is4wivbzvbyh698cv5d92jb7cp"; + version = "0.3.2.0"; + sha256 = "0lwhcyb4g2j7wz16b7qp6vzmawlxx8k0xfvr9sdw5maljir0hykx"; libraryHaskellDepends = [ aeson base bytestring semigroupoids ]; testHaskellDepends = [ aeson base bytestring hspec ]; description = "Type-safe data versioning"; @@ -290092,8 +291781,8 @@ self: { }: mkDerivation { pname = "versions"; - version = "5.0.1"; - sha256 = "0m7c0iiws3j716a5wksv9dxfcsz6dlvpw147m7ah2b8pfjwqg48c"; + version = "5.0.2"; + sha256 = "1955mng820n4bmk5vb8h7whlcwnnvxmwbdp7bxabyfy536bkdb77"; libraryHaskellDepends = [ base deepseq hashable megaparsec parser-combinators text ]; @@ -290106,23 +291795,23 @@ self: { }) {}; "vessel" = callPackage - ({ mkDerivation, aeson, aeson-gadt-th, base, bifunctors - , constraints, constraints-extras, containers, dependent-map - , dependent-monoidal-map, dependent-sum + ({ mkDerivation, aeson, aeson-gadt-th, base, base-orphans + , bifunctors, constraints, constraints-extras, containers + , dependent-map, dependent-monoidal-map, dependent-sum , dependent-sum-aeson-orphans, dependent-sum-template, lens , markdown-unlit, monoidal-containers, mtl, patch, reflex , semialign, text, these, witherable }: mkDerivation { pname = "vessel"; - version = "0.2.0.0"; - sha256 = "04zdcl4pbqf4b9nvgp7dnv91i1mbm60lnldxijgpnmlhrrff2dd4"; + version = "0.2.1.0"; + sha256 = "04pvn5rs3pgi917m0rsfmjxc035ns8sd79vza72qh0skvsg81pq6"; libraryHaskellDepends = [ - aeson aeson-gadt-th base bifunctors constraints constraints-extras - containers dependent-map dependent-monoidal-map dependent-sum - dependent-sum-aeson-orphans dependent-sum-template lens - markdown-unlit monoidal-containers mtl patch reflex semialign text - these witherable + aeson aeson-gadt-th base base-orphans bifunctors constraints + constraints-extras containers dependent-map dependent-monoidal-map + dependent-sum dependent-sum-aeson-orphans dependent-sum-template + lens markdown-unlit monoidal-containers mtl patch reflex semialign + text these witherable ]; libraryToolDepends = [ markdown-unlit ]; doHaddock = false; @@ -290500,6 +292189,29 @@ self: { license = lib.licenses.mit; }) {}; + "vinyl_0_14_1" = callPackage + ({ mkDerivation, aeson, array, base, criterion, deepseq, ghc-prim + , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random + , primitive, should-not-typecheck, tagged, text + , unordered-containers, vector + }: + mkDerivation { + pname = "vinyl"; + version = "0.14.1"; + sha256 = "06qyy3g1msnwl8491rp0pabr7g7xk4jjidsixigd8if4kxl7dcdk"; + libraryHaskellDepends = [ array base deepseq ghc-prim ]; + testHaskellDepends = [ + aeson base hspec lens lens-aeson microlens mtl should-not-typecheck + text unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion linear microlens mwc-random primitive tagged vector + ]; + description = "Extensible Records"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "vinyl-generics" = callPackage ({ mkDerivation, aeson, base, generics-sop, hspec, hspec-core , QuickCheck, records-sop, text, vinyl @@ -291276,8 +292988,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.14.2"; - sha256 = "0zd6zki6hx0bhqvy20yhvd3597nxaasl2665s7m64bi02qjgjwsj"; + version = "3.16.2"; + sha256 = "1wawlq1x9nw9g5iynf8mhlv36876skpvfalfpnvdh55hfw4qznzh"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -291309,8 +293021,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.5.4"; - sha256 = "1mkx2h7yjmq8djgg1pi3vlx2pq4armasa1hvam955p3x09vwbisk"; + version = "0.5.6"; + sha256 = "1d8nnv31f35k2qn232vx8g3w06vbvik0ih98g7m7lrv0bqi74i12"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -292094,6 +293806,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "wai-logger_2_4_0" = callPackage + ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest + , doctest, fast-logger, http-types, network, wai + }: + mkDerivation { + pname = "wai-logger"; + version = "2.4.0"; + sha256 = "02i9jsy5gdglqwwk5gcvax8y498lz9flrfp4v9nrv8rmrmd66zh5"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base byteorder bytestring fast-logger http-types network wai + ]; + testHaskellDepends = [ base doctest ]; + description = "A logging system for WAI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "wai-logger-buffered" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , http-types, time, wai, warp @@ -292409,7 +294139,6 @@ self: { ]; description = "Route to different middlewares based on the incoming Accept header"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "wai-middleware-crowd" = callPackage @@ -293518,8 +295247,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.3.18"; - sha256 = "1m93s3p2zz00fdgkisl6sbnqnc6vvq0vz997i5y4mk9a3ssjflqw"; + version = "3.3.19"; + sha256 = "1wq63wrxk4p6ziig9qgqimmd1mx167868qiczd1avh8896p1f6rb"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types http2 iproute @@ -294009,6 +295738,7 @@ self: { testHaskellDepends = [ base bytestring HUnit network-uri text ]; description = "Composable, reversible, efficient web routing using invertible invariants and bijections"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "web-mongrel2" = callPackage @@ -294110,21 +295840,21 @@ self: { "web-rep" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, box, box-socket - , clay, concurrency, generic-lens, interpolatedstring-perl6 - , language-javascript, lens, lucid, mtl, optparse-generic, scotty + , clay, concurrency, interpolatedstring-perl6, language-javascript + , lucid, mtl, optics-core, optics-extra, optparse-generic, scotty , text, transformers, unordered-containers, wai-middleware-static , wai-websockets, websockets }: mkDerivation { pname = "web-rep"; - version = "0.8.0"; - sha256 = "1ri1sczacxy351jsdaiz7iwsl8b19a1jvzppyxf56grm6zr94dmg"; + version = "0.9.0"; + sha256 = "1xcrmm5yk19nh08gllnfg6ck0jijkxzl3ma4klwlnxp2ky75q7ds"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base bifunctors box box-socket clay concurrency - generic-lens interpolatedstring-perl6 language-javascript lens - lucid mtl scotty text transformers unordered-containers + interpolatedstring-perl6 language-javascript lucid mtl optics-core + optics-extra scotty text transformers unordered-containers wai-middleware-static wai-websockets websockets ]; executableHaskellDepends = [ base optparse-generic ]; @@ -294304,45 +296034,185 @@ self: { }) {}; "web3" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, base58string - , basement, bitvec, bytestring, cereal, cryptonite, data-default - , errors, exceptions, generics-sop, hspec, hspec-contrib - , hspec-discover, hspec-expectations, http-client, http-client-tls - , http-media, http-types, machines, memory, microlens - , microlens-aeson, microlens-mtl, microlens-th, mtl, network - , OneTuple, parsec, random, relapse, servant, servant-client, split - , stm, tagged, tar, template-haskell, text, time, transformers - , unordered-containers, uuid-types, vector, vinyl, websockets + ({ mkDerivation, base, web3-ethereum, web3-polkadot, web3-provider }: mkDerivation { pname = "web3"; - version = "0.9.1.0"; - sha256 = "12nx9hgwx61yj44iym7na9jxf05jry3aa82j2s8l5rpw3qdv7dis"; + version = "1.0.0.0"; + sha256 = "0bnamwvdxl3i1p8bflnhaxxpn0bqcnf174gwplqjkxdc9pzfhiig"; libraryHaskellDepends = [ - aeson async attoparsec base base58string basement bitvec bytestring - cereal cryptonite data-default errors exceptions generics-sop hspec - http-client http-client-tls http-media http-types machines memory - microlens microlens-aeson microlens-mtl microlens-th mtl network - OneTuple parsec relapse servant servant-client tagged tar - template-haskell text transformers unordered-containers uuid-types - vector vinyl websockets + base web3-ethereum web3-polkadot web3-provider + ]; + description = "Haskell Web3 library"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + + "web3-bignum" = callPackage + ({ mkDerivation, base, cereal, hspec, hspec-contrib, hspec-discover + , hspec-expectations, memory, memory-hexstring, scale, wide-word + }: + mkDerivation { + pname = "web3-bignum"; + version = "1.0.0.0"; + sha256 = "140qv8y6b63by81z0k5by8vqr7x0gc106a67r35qbhdfmbhv71n0"; + libraryHaskellDepends = [ + base cereal memory memory-hexstring scale wide-word ]; testHaskellDepends = [ - aeson async attoparsec base base58string basement bitvec bytestring - cereal cryptonite data-default errors exceptions generics-sop hspec - hspec-contrib hspec-discover hspec-expectations http-client - http-client-tls http-media http-types machines memory microlens - microlens-aeson microlens-mtl microlens-th mtl network OneTuple - parsec random relapse servant servant-client split stm tagged tar - template-haskell text time transformers unordered-containers - uuid-types vector vinyl websockets + base cereal hspec hspec-contrib hspec-discover hspec-expectations + memory memory-hexstring scale wide-word ]; testToolDepends = [ hspec-discover ]; - description = "Web3 API for Haskell"; - license = lib.licenses.bsd3; + description = "Fixed size big integers for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + + "web3-crypto" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, cryptonite + , hspec, hspec-contrib, hspec-discover, hspec-expectations, memory + , memory-hexstring, text, uuid-types, vector + }: + mkDerivation { + pname = "web3-crypto"; + version = "1.0.0.0"; + sha256 = "16ygvnkxcalh7a0h7l1bj5gyir79gihcwzzqk31qibvd1r17mwd6"; + libraryHaskellDepends = [ + aeson base bytestring containers cryptonite memory memory-hexstring + text uuid-types vector + ]; + testHaskellDepends = [ + aeson base bytestring containers cryptonite hspec hspec-contrib + hspec-discover hspec-expectations memory memory-hexstring text + uuid-types vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Cryptograhical primitives for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + + "web3-ethereum" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, exceptions + , generics-sop, hspec, hspec-contrib, hspec-discover + , hspec-expectations, jsonrpc-tinyclient, machines, memory + , memory-hexstring, microlens, microlens-aeson, mtl, OneTuple + , relapse, tagged, template-haskell, text, transformers, vinyl + , web3-crypto, web3-solidity + }: + mkDerivation { + pname = "web3-ethereum"; + version = "1.0.0.0"; + sha256 = "1vsvxhl6w6hjiv6b61sn8f2bnj6p55b4qyvblrfpk60k7pqq774c"; + libraryHaskellDepends = [ + aeson base bytestring data-default exceptions generics-sop + jsonrpc-tinyclient machines memory memory-hexstring microlens + microlens-aeson mtl OneTuple relapse tagged template-haskell text + transformers vinyl web3-crypto web3-solidity + ]; + testHaskellDepends = [ + aeson base bytestring data-default exceptions generics-sop hspec + hspec-contrib hspec-discover hspec-expectations jsonrpc-tinyclient + machines memory memory-hexstring microlens microlens-aeson mtl + OneTuple relapse tagged template-haskell text transformers vinyl + web3-crypto web3-solidity + ]; + testToolDepends = [ hspec-discover ]; + description = "Ethereum support for Haskell Web3 library"; + license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; }) {}; + "web3-ipfs" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client, http-media + , http-types, mtl, servant, servant-client, tar, text + , unordered-containers + }: + mkDerivation { + pname = "web3-ipfs"; + version = "1.0.0.0"; + sha256 = "0m6rqk5vd53gl7mykwzzqblhgdqrjzjyqb5mqkagb1z0llwqxafg"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-media http-types mtl servant + servant-client tar text unordered-containers + ]; + description = "IPFS support for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + + "web3-polkadot" = callPackage + ({ mkDerivation, aeson, animalcase, base, base58-bytestring + , bytestring, containers, cryptonite, generics-sop, hspec + , hspec-contrib, hspec-discover, hspec-expectations + , hspec-expectations-json, jsonrpc-tinyclient, memory + , memory-hexstring, microlens, microlens-mtl, microlens-th, mtl + , parsec, scale, text, web3-bignum, web3-crypto + }: + mkDerivation { + pname = "web3-polkadot"; + version = "1.0.0.0"; + sha256 = "0sx9lj7px6m5ag4bk4imllh4bmy7kfgkfy1zb9hqjkdmjwn2i2w5"; + libraryHaskellDepends = [ + aeson animalcase base base58-bytestring bytestring containers + cryptonite generics-sop jsonrpc-tinyclient memory memory-hexstring + microlens microlens-mtl microlens-th mtl parsec scale text + web3-bignum web3-crypto + ]; + testHaskellDepends = [ + aeson animalcase base base58-bytestring bytestring containers + cryptonite generics-sop hspec hspec-contrib hspec-discover + hspec-expectations hspec-expectations-json jsonrpc-tinyclient + memory memory-hexstring microlens microlens-mtl microlens-th mtl + parsec scale text web3-bignum web3-crypto + ]; + testToolDepends = [ hspec-discover ]; + description = "Polkadot support for Haskell Web3 library"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + + "web3-provider" = callPackage + ({ mkDerivation, async, base, data-default, exceptions, http-client + , jsonrpc-tinyclient, mtl, network, text, transformers, websockets + }: + mkDerivation { + pname = "web3-provider"; + version = "1.0.0.0"; + sha256 = "03c892xj7yxwbb4r1vpqzwgsf4fyk9389rqivpr6bwklnx9230ic"; + libraryHaskellDepends = [ + async base data-default exceptions http-client jsonrpc-tinyclient + mtl network text transformers websockets + ]; + description = "Node connection provider for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + + "web3-solidity" = callPackage + ({ mkDerivation, aeson, base, basement, bytestring, cereal + , data-default, generics-sop, hspec, hspec-contrib, hspec-discover + , hspec-expectations, memory, memory-hexstring, microlens, OneTuple + , parsec, tagged, template-haskell, text, web3-crypto + }: + mkDerivation { + pname = "web3-solidity"; + version = "1.0.0.0"; + sha256 = "1n5jf9vdxps8sxcaa3k2a4m3qn5w3kphvvn7f4jy0dh0zkr7i5nm"; + libraryHaskellDepends = [ + aeson base basement bytestring cereal data-default generics-sop + memory memory-hexstring microlens OneTuple parsec tagged + template-haskell text web3-crypto + ]; + testHaskellDepends = [ + aeson base basement bytestring cereal data-default generics-sop + hspec hspec-contrib hspec-discover hspec-expectations memory + memory-hexstring microlens OneTuple parsec tagged template-haskell + text web3-crypto + ]; + testToolDepends = [ hspec-discover ]; + description = "Solidity language for Haskell Web3 library"; + license = lib.licenses.asl20; + }) {}; + "webapi" = callPackage ({ mkDerivation, aeson, base, binary, blaze-builder, bytestring , bytestring-lexing, bytestring-trie, case-insensitive, containers @@ -294396,22 +296266,35 @@ self: { }) {}; "webauthn" = callPackage - ({ mkDerivation, aeson, asn1-encoding, asn1-types, base - , base16-bytestring, base64-bytestring, bytestring, cborg, cereal - , containers, cryptonite, hashable, memory, serialise, text, x509 - , x509-validation + ({ mkDerivation, aeson, asn1-encoding, asn1-parse, asn1-types, base + , base16-bytestring, base64-bytestring, binary, bytestring, cborg + , containers, cryptonite, directory, file-embed, filepath, hashable + , hourglass, hspec, hspec-expectations-json, jose, lens, memory + , monad-time, mtl, pem, QuickCheck, quickcheck-instances, serialise + , singletons, text, time, unordered-containers, uuid, validation + , x509, x509-store, x509-validation }: mkDerivation { pname = "webauthn"; - version = "0"; - sha256 = "1nmrxpc0q7bs4z7gnkxbm02qpp8c2rn48hxi52y1k4iqglp9mmp0"; + version = "0.3.0.0"; + sha256 = "0nn6nx6f0wlbfipfhs4irkqhk4bknhcy83n3wxpml9lkgvf8m1kj"; libraryHaskellDepends = [ - aeson asn1-encoding asn1-types base base16-bytestring - base64-bytestring bytestring cborg cereal containers cryptonite - hashable memory serialise text x509 x509-validation + aeson asn1-encoding asn1-parse asn1-types base base16-bytestring + base64-bytestring binary bytestring cborg containers cryptonite + file-embed hashable hourglass jose lens memory monad-time mtl + serialise singletons text time unordered-containers uuid validation + x509 x509-store x509-validation ]; - description = "Web Authentication API"; - license = lib.licenses.bsd3; + testHaskellDepends = [ + aeson asn1-encoding base bytestring containers cryptonite directory + filepath hourglass hspec hspec-expectations-json memory mtl pem + QuickCheck quickcheck-instances serialise singletons text + unordered-containers uuid validation x509 x509-store + ]; + description = "Relying party (server) implementation of the WebAuthn 2 specification"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "webby" = callPackage @@ -295705,8 +297588,8 @@ self: { pname = "wide-word"; version = "0.1.1.2"; sha256 = "10sj7nca2sba74bkiicnp95xrfq2j1al93ggw3z24982nm9x3j8r"; - revision = "3"; - editedCabalFile = "15k9saqnib9vc9s4dsvamvnb3m6cjmnlwsy1brwfnd90vzzxmwjz"; + revision = "4"; + editedCabalFile = "150ikl5cf15lbk383pv1w8smpwbp0dzc0vby653fbzm8a2svcx76"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base bytestring ghc-prim hedgehog primitive QuickCheck @@ -296044,6 +297927,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "wireguard-hs" = callPackage + ({ mkDerivation, base, clock, cryptonite, ip, memory, network, text + , time, vector, vector-sized, wide-word + }: + mkDerivation { + pname = "wireguard-hs"; + version = "0.1.0"; + sha256 = "0nh1vjmz74i4c7254whp8d8si1bvzyq8s6x0ljcidahd1w0hv3i0"; + revision = "1"; + editedCabalFile = "0vf7akywcdh1k9x4d5kvlqrzkxz124lhg1l9547gfcsirlrhlb3n"; + libraryHaskellDepends = [ + base clock cryptonite ip memory network text time vector + vector-sized wide-word + ]; + description = "API for Linux Kernel Wireguard device management"; + license = "LGPL"; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "wires" = callPackage ({ mkDerivation, base, deepseq, mtl, profunctors, semigroupoids , these @@ -296370,6 +298273,8 @@ self: { pname = "wl-pprint-annotated"; version = "0.1.0.1"; sha256 = "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb"; + revision = "1"; + editedCabalFile = "1qizgsiqsraj8w0qndcyw7grcmiylx63vp3lgw2dplchva8p3hp7"; libraryHaskellDepends = [ base containers deepseq text ]; testHaskellDepends = [ base containers deepseq tasty tasty-hunit text @@ -297608,7 +299513,6 @@ self: { ]; description = "A simple CLI utility for interacting with a websocket"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ws-chans" = callPackage @@ -297735,27 +299639,29 @@ self: { "wstunnel" = callPackage ({ mkDerivation, async, base, base64-bytestring, binary, bytestring - , classy-prelude, cmdargs, connection, hslogger, hspec, iproute - , mtl, network, network-conduit-tls, streaming-commons, text - , unordered-containers, websockets + , case-insensitive, classy-prelude, cmdargs, connection, hslogger + , hspec, iproute, mtl, network, network-conduit-tls + , streaming-commons, text, unordered-containers, websockets }: mkDerivation { pname = "wstunnel"; - version = "0.3.1.0"; - sha256 = "14f790bya156ffdp2rrxzibz54yd714p59h56amfnsakrn8ygghy"; + version = "0.4.1.0"; + sha256 = "022x4g1ya5676v7q0q3rzwn6rzlnz74f8xwwp3mnvyih025cx770"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base base64-bytestring binary bytestring classy-prelude - connection hslogger iproute mtl network network-conduit-tls - streaming-commons text unordered-containers websockets + async base base64-bytestring binary bytestring case-insensitive + classy-prelude connection hslogger iproute mtl network + network-conduit-tls streaming-commons text unordered-containers + websockets ]; executableHaskellDepends = [ - async base bytestring classy-prelude cmdargs hslogger text + async base bytestring case-insensitive classy-prelude cmdargs + hslogger text ]; testHaskellDepends = [ - async base binary bytestring classy-prelude hspec network - network-conduit-tls streaming-commons text + async base binary bytestring case-insensitive classy-prelude hspec + network network-conduit-tls streaming-commons text ]; description = "Tunneling program over websocket protocol"; license = lib.licenses.bsd3; @@ -298167,29 +300073,6 @@ self: { }) {inherit (pkgs.xorg) libXi;}; "x509" = callPackage - ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base - , bytestring, containers, cryptonite, hourglass, memory, mtl, pem - , tasty, tasty-quickcheck - }: - mkDerivation { - pname = "x509"; - version = "1.7.5"; - sha256 = "1j67c35g8334jx7x32hh6awhr43dplp0qwal5gnlkmx09axzrc5i"; - revision = "1"; - editedCabalFile = "1z98llpggldy4yb7afcsn3r3q4vklvx2pqyrhy9fir5y2yd5l601"; - libraryHaskellDepends = [ - asn1-encoding asn1-parse asn1-types base bytestring containers - cryptonite hourglass memory mtl pem - ]; - testHaskellDepends = [ - asn1-types base bytestring cryptonite hourglass mtl tasty - tasty-quickcheck - ]; - description = "X509 reader and writer"; - license = lib.licenses.bsd3; - }) {}; - - "x509_1_7_6" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base , bytestring, containers, cryptonite, hourglass, memory, mtl, pem , tasty, tasty-quickcheck @@ -298208,30 +300091,9 @@ self: { ]; description = "X509 reader and writer"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "x509-store" = callPackage - ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , containers, cryptonite, directory, filepath, mtl, pem, tasty - , tasty-hunit, x509 - }: - mkDerivation { - pname = "x509-store"; - version = "1.6.7"; - sha256 = "1y8yyr1i95jkllg8k0z54k5v4vachp848clc07m33xpxidn3b1lp"; - revision = "1"; - editedCabalFile = "04h2h8kdzhd2fp3w4a834xc1n88b1jgrxlgcsynfn0iwpbsb41x7"; - libraryHaskellDepends = [ - asn1-encoding asn1-types base bytestring containers cryptonite - directory filepath mtl pem x509 - ]; - testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ]; - description = "X.509 collection accessing and storing methods"; - license = lib.licenses.bsd3; - }) {}; - - "x509-store_1_6_9" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, directory, filepath, mtl, pem, tasty , tasty-hunit, x509 @@ -298247,26 +300109,9 @@ self: { testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ]; description = "X.509 collection accessing and storing methods"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "x509-system" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pem, process, x509, x509-store - }: - mkDerivation { - pname = "x509-system"; - version = "1.6.6"; - sha256 = "06a4m9c7vlr9nhp9gmqbb46arf0yj1dkdm4nip03hzy67spdmp20"; - libraryHaskellDepends = [ - base bytestring containers directory filepath mtl pem process x509 - x509-store - ]; - description = "Handle per-operating-system X.509 accessors and storage"; - license = lib.licenses.bsd3; - }) {}; - - "x509-system_1_6_7" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pem, process, x509, x509-store }: @@ -298280,7 +300125,6 @@ self: { ]; description = "Handle per-operating-system X.509 accessors and storage"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "x509-util" = callPackage @@ -298303,28 +300147,6 @@ self: { }) {}; "x509-validation" = callPackage - ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , containers, cryptonite, data-default-class, hourglass, memory - , mtl, pem, tasty, tasty-hunit, x509, x509-store - }: - mkDerivation { - pname = "x509-validation"; - version = "1.6.11"; - sha256 = "16yihzljql3z8w5rgdl95fv3hgk7yd86kbl9b3glllsark5j2hzr"; - libraryHaskellDepends = [ - asn1-encoding asn1-types base bytestring containers cryptonite - data-default-class hourglass memory mtl pem x509 x509-store - ]; - testHaskellDepends = [ - asn1-encoding asn1-types base bytestring cryptonite - data-default-class hourglass memory tasty tasty-hunit x509 - x509-store - ]; - description = "X.509 Certificate and CRL validation"; - license = lib.licenses.bsd3; - }) {}; - - "x509-validation_1_6_12" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, data-default-class, hourglass, memory , mtl, pem, tasty, tasty-hunit, x509, x509-store @@ -298344,7 +300166,6 @@ self: { ]; description = "X.509 Certificate and CRL validation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "x86-64bit" = callPackage @@ -298675,6 +300496,8 @@ self: { pname = "xhb"; version = "0.6.2015.8.1"; sha256 = "1rq6g96v1fs66kdmnkvlkcxrv614ha77czclm3sfw274f7q2r2kb"; + revision = "1"; + editedCabalFile = "0f2vhak11kijd74il1r27h1zbcsj36yyv5x02h3kq6vdx0h0zyd9"; libraryHaskellDepends = [ base binary byteorder bytestring containers network parsec stm Xauth @@ -299402,8 +301225,8 @@ self: { }: mkDerivation { pname = "xml-parser"; - version = "0.1.0.1"; - sha256 = "079ggb9bhad9px6gqbjhbir423hds389p42jc853caz7232dc6vx"; + version = "0.1.1"; + sha256 = "06a8pci3jr3mdrsh8708i61rqd2rsgqyf86s269ycca6xlbrgwzh"; libraryHaskellDepends = [ attoparsec base bytestring containers hashable text text-builder transformers unordered-containers xml-conduit @@ -299461,6 +301284,29 @@ self: { broken = true; }) {}; + "xml-prettify-text" = callPackage + ({ mkDerivation, base, filepath, gauge, mtl, optparse-applicative + , protolude, tasty, tasty-golden, text, text-show, with-utf8 + }: + mkDerivation { + pname = "xml-prettify-text"; + version = "1.0.0.3"; + sha256 = "1bxp9dvy3js7az1c1kbrgjhhp4ssg7mb1gxgfj2qcaggv2b97v7i"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base mtl protolude text text-show ]; + executableHaskellDepends = [ + base optparse-applicative protolude text with-utf8 + ]; + testHaskellDepends = [ + base filepath protolude tasty tasty-golden text + ]; + benchmarkHaskellDepends = [ base gauge protolude ]; + description = "XML pretty printer"; + license = lib.licenses.gpl2Only; + }) {}; + "xml-push" = callPackage ({ mkDerivation, base, bytestring, crypto-random, handle-like , monad-control, monads-tf, peyotls, random, sasl, simple-pipe, stm @@ -299554,7 +301400,6 @@ self: { ]; description = "Parse XML from bytes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "xml-to-json" = callPackage @@ -301773,8 +303618,8 @@ self: { pname = "yasi"; version = "0.1.2.1"; sha256 = "0647z79wva7apkp0swj7gax780vqmhr5czxrvg88gl3bi03wcapl"; - revision = "3"; - editedCabalFile = "0laibkj367wqnq95jiw1rca9b2jb5hanhvlclsdflyzg8kfknmhc"; + revision = "4"; + editedCabalFile = "0vljbnfrcscb468mcqx62r0xcdnz73glam67v73jqq6g4vhyaimr"; libraryHaskellDepends = [ base bytestring template-haskell text ]; testHaskellDepends = [ base hedgehog tasty tasty-hedgehog tasty-hunit text @@ -302106,8 +303951,8 @@ self: { }: mkDerivation { pname = "yesod"; - version = "1.6.1.2"; - sha256 = "13r0ispprj41kgn2rkc7zhy1rxfmgpjbmdlnys15h0ihhh3zhw2f"; + version = "1.6.2"; + sha256 = "0krvg1ykzqg1aaj385rnrqr0a5ga3z5xl1s422q05y9csj0w1ami"; libraryHaskellDepends = [ aeson base bytestring conduit data-default-class directory fast-logger file-embed monad-logger shakespeare streaming-commons @@ -302193,6 +304038,7 @@ self: { description = "Automatically generate article previews for a yesod site"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yesod-auth" = callPackage @@ -302208,8 +304054,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.10.5"; - sha256 = "11nywgjnivbfrbn8mg3lfr8r8lfpygn30vhnn0bzy9pa07nvgxnz"; + version = "1.6.11"; + sha256 = "0fdahk5mc63g0zsafk8axry01qaxahmclpmmwygp2lhfsjy8mby2"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup bytestring conduit @@ -302561,6 +304407,31 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-auth-oauth2_0_7_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, cryptonite, errors + , hoauth2, hspec, http-client, http-conduit, http-types, memory + , microlens, mtl, safe-exceptions, text, unliftio, uri-bytestring + , yesod-auth, yesod-core + }: + mkDerivation { + pname = "yesod-auth-oauth2"; + version = "0.7.0.0"; + sha256 = "183ck29b43nvvih2vcpavzvj0ajdwpcjsa6lq6f5labqqk929cww"; + revision = "1"; + editedCabalFile = "1vpcb40a3f5dblfdvqw0v55gzh97kp7d2b9pri153v5ri60pgvw5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cryptonite errors hoauth2 http-client + http-conduit http-types memory microlens mtl safe-exceptions text + unliftio uri-bytestring yesod-auth yesod-core + ]; + testHaskellDepends = [ base hspec uri-bytestring ]; + description = "OAuth 2.0 authentication plugins"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-auth-oidc" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html, broch , bytestring, classy-prelude, classy-prelude-yesod, containers @@ -302685,22 +304556,22 @@ self: { }) {}; "yesod-bin" = callPackage - ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra - , containers, data-default-class, directory, file-embed, filepath - , fsnotify, http-client, http-client-tls, http-reverse-proxy - , http-types, network, optparse-applicative, process - , project-template, say, split, stm, streaming-commons, tar, text - , time, transformers, transformers-compat, unliftio + ({ mkDerivation, aeson, base, bytestring, Cabal, conduit + , conduit-extra, containers, data-default-class, directory + , file-embed, filepath, fsnotify, http-client, http-client-tls + , http-reverse-proxy, http-types, network, optparse-applicative + , process, project-template, say, split, stm, streaming-commons + , tar, text, time, transformers, transformers-compat, unliftio , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib }: mkDerivation { pname = "yesod-bin"; - version = "1.6.1"; - sha256 = "0saz5dcygyf91f8hqvsy9wpcc5pg7vd9gcp891fiz4cywsrqpzwx"; + version = "1.6.2"; + sha256 = "12dwix5q3xk83d0d4715h680dbalbz4556wk3r89gps3rp9pib7f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring Cabal conduit conduit-extra containers + aeson base bytestring Cabal conduit conduit-extra containers data-default-class directory file-embed filepath fsnotify http-client http-client-tls http-reverse-proxy http-types network optparse-applicative process project-template say split stm @@ -305904,6 +307775,18 @@ self: { broken = true; }) {}; + "zigzag" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck }: + mkDerivation { + pname = "zigzag"; + version = "0.0.1.0"; + sha256 = "1gy2hv4ggxfwrxg9v3qyxpfrm1j5sixckc2j3h37ckzsh5v06mga"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + description = "Zigzag encoding of integers into unsigned integers"; + license = lib.licenses.bsd3; + }) {}; + "zim-parser" = callPackage ({ mkDerivation, array, base, base-compat, binary, binary-conduit , bytestring, conduit, conduit-extra, hspec, lzma diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 0b3f71995c99..8518a5391de7 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -46,6 +46,13 @@ buildPackages.stdenv.mkDerivation { name = "hoogle-with-packages"; buildInputs = [ghc hoogle]; + # compiling databases takes less time than copying the results + # between machines. + preferLocalBuild = true; + # Plus, you need a complete database for each possible combination + # of dependencies, caching them does not make sense. + allowSubstitutes = false; + inherit docPackages; passAsFile = ["buildCommand"]; diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index e9ce4f127051..80dc94af4df6 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -124,20 +124,17 @@ let haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let sha256Arg = if sha256 == null then "--sha256=" else ''--sha256="${sha256}"''; - in buildPackages.stdenv.mkDerivation { - name = "cabal2nix-${name}"; + in buildPackages.runCommand "cabal2nix-${name}" { nativeBuildInputs = [ buildPackages.cabal2nix-unwrapped ]; preferLocalBuild = true; allowSubstitutes = false; - phases = ["installPhase"]; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = pkgs.lib.optionalString (buildPlatform.libc == "glibc") "${buildPackages.glibcLocales}/lib/locale/locale-archive"; - installPhase = '' - export HOME="$TMP" - mkdir -p "$out" - cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" - ''; - }; + } '' + export HOME="$TMP" + mkdir -p "$out" + cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.config} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix" + ''; all-cabal-hashes-component = name: version: buildPackages.runCommand "all-cabal-hashes-component-${name}-${version}" {} '' tar --wildcards -xzvf ${all-cabal-hashes} \*/${name}/${version}/${name}.{json,cabal} @@ -387,6 +384,18 @@ in package-set { inherit pkgs lib callPackage; } self // { # for the "shellFor" environment (ensuring that any test/benchmark # dependencies for "foo" will be available within the nix-shell). , genericBuilderArgsModifier ? (args: args) + + # Extra dependencies, in the form of cabal2nix build attributes. + # + # An example use case is when you have Haskell scripts that use + # libraries that don't occur in your packages' dependencies. + # + # Example: + # + # extraDependencies = p: { + # libraryHaskellDepends = [ p.releaser ]; + # }; + , extraDependencies ? p: {} , ... } @ args: let @@ -477,7 +486,7 @@ in package-set { inherit pkgs lib callPackage; } self // { # See the Note in `zipperCombinedPkgs` for what gets filtered out from # each of these dependency lists. packageInputs = - pkgs.lib.zipAttrsWith (_name: zipperCombinedPkgs) cabalDepsForSelected; + pkgs.lib.zipAttrsWith (_name: zipperCombinedPkgs) (cabalDepsForSelected ++ [ (extraDependencies self) ]); # A attribute set to pass to `haskellPackages.mkDerivation`. # @@ -517,7 +526,7 @@ in package-set { inherit pkgs lib callPackage; } self // { # pkgWithCombinedDepsDevDrv :: Derivation pkgWithCombinedDepsDevDrv = pkgWithCombinedDeps.envFunc { inherit withHoogle; }; - mkDerivationArgs = builtins.removeAttrs args [ "genericBuilderArgsModifier" "packages" "withHoogle" "doBenchmark" ]; + mkDerivationArgs = builtins.removeAttrs args [ "genericBuilderArgsModifier" "packages" "withHoogle" "doBenchmark" "extraDependencies" ]; in pkgWithCombinedDepsDevDrv.overrideAttrs (old: mkDerivationArgs // { nativeBuildInputs = old.nativeBuildInputs ++ mkDerivationArgs.nativeBuildInputs or []; diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 4aead5d18800..e06f9d30d2da 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -24,8 +24,6 @@ self: super: { nix-linter = self.callPackage ../../development/tools/analysis/nix-linter { }; - nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { }; - # hasura graphql-engine is not released to hackage. # https://github.com/hasura/graphql-engine/issues/7391 ci-info = self.callPackage ../misc/haskell/hasura/ci-info.nix {}; diff --git a/pkgs/development/haskell-modules/package-list.nix b/pkgs/development/haskell-modules/package-list.nix index 64f4be3a7722..688844bcc46c 100644 --- a/pkgs/development/haskell-modules/package-list.nix +++ b/pkgs/development/haskell-modules/package-list.nix @@ -1,10 +1,16 @@ { runCommand, haskellPackages, lib, all-cabal-hashes, writeShellScript }: let + # Checks if the version looks like a Haskell PVP version which is the format + # Hackage enforces. This will return false if the version strings is empty or + # we've overridden the package to ship an unstable version of the package + # (sadly there's no good way to show something useful on hackage in this case). + isPvpVersion = v: builtins.match "([0-9]+)(\\.[0-9]+)*" v != null; + pkgLine = name: pkg: let version = pkg.version or ""; in - if version != "" then + if isPvpVersion version then ''"${name}","${version}","http://hydra.nixos.org/job/nixpkgs/trunk/haskellPackages.${name}.x86_64-linux"'' else ""; all-haskellPackages = builtins.toFile "all-haskellPackages" (lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.mapAttrsToList pkgLine haskellPackages))); diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 3c645999a1a3..7c7add61679d 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -164,5 +164,20 @@ symlinkJoin { passthru = { preferLocalBuild = true; inherit (ghc) version meta; + + # Inform users about backwards incompatibilities with <= 21.05 + override = _: throw '' + The ghc.withPackages wrapper itself can now be overridden, but no longer + the result of calling it (as before). Consequently overrides need to be + adjusted: Instead of + + (ghc.withPackages (p: [ p.my-package ])).override { withLLLVM = true; } + + use + + (ghc.withPackages.override { useLLVM = true; }) (p: [ p.my-package ]) + + Also note that withLLVM has been renamed to useLLVM for consistency with + the GHC Nix expressions.''; }; } diff --git a/pkgs/development/idris-modules/array.nix b/pkgs/development/idris-modules/array.nix index faed6443c48c..ef8159e9a873 100644 --- a/pkgs/development/idris-modules/array.nix +++ b/pkgs/development/idris-modules/array.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "array"; + pname = "array"; version = "2016-10-14"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix index 51f6497e1821..ec1f9a13bcdd 100644 --- a/pkgs/development/idris-modules/bi.nix +++ b/pkgs/development/idris-modules/bi.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "bi"; + pname = "bi"; version = "2018-06-25"; ipkgName = "Bi"; diff --git a/pkgs/development/idris-modules/bifunctors.nix b/pkgs/development/idris-modules/bifunctors.nix index 15c7a6dd013f..3461bb37fddb 100644 --- a/pkgs/development/idris-modules/bifunctors.nix +++ b/pkgs/development/idris-modules/bifunctors.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "bifunctors"; + pname = "bifunctors"; version = "2017-02-07"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/build-builtin-package.nix b/pkgs/development/idris-modules/build-builtin-package.nix index ff19e52135c8..fe23728e0848 100644 --- a/pkgs/development/idris-modules/build-builtin-package.nix +++ b/pkgs/development/idris-modules/build-builtin-package.nix @@ -1,13 +1,13 @@ # Build one of the packages that comes with idris -# name: The name of the package +# pname: The pname of the package # deps: The dependencies of the package -{ idris, build-idris-package }: name: deps: +{ idris, build-idris-package }: pname: deps: let inherit (builtins.parseDrvName idris.name) version; in build-idris-package { - inherit name version; + inherit pname version; inherit (idris) src; noPrelude = true; @@ -16,10 +16,10 @@ build-idris-package { idrisDeps = deps; postUnpack = '' - sourceRoot=$sourceRoot/libs/${name} + sourceRoot=$sourceRoot/libs/${pname} ''; meta = idris.meta // { - description = "${name} builtin Idris library"; + description = "${pname} builtin Idris library"; }; } diff --git a/pkgs/development/idris-modules/build-idris-package.nix b/pkgs/development/idris-modules/build-idris-package.nix index 7869c2706999..b21826eac384 100644 --- a/pkgs/development/idris-modules/build-idris-package.nix +++ b/pkgs/development/idris-modules/build-idris-package.nix @@ -3,9 +3,9 @@ { idrisDeps ? [] , noPrelude ? false , noBase ? false - , name + , pname , version - , ipkgName ? name + , ipkgName ? pname , extraBuildInputs ? [] , idrisBuildOptions ? [] , idrisTestOptions ? [] @@ -20,7 +20,7 @@ let idris-with-packages = with-packages allIdrisDeps; newAttrs = builtins.removeAttrs attrs [ "idrisDeps" "noPrelude" "noBase" - "name" "version" "ipkgName" "extraBuildInputs" + "pname" "version" "ipkgName" "extraBuildInputs" ] // { meta = attrs.meta // { platforms = attrs.meta.platforms or idris.meta.platforms; @@ -28,7 +28,8 @@ let }; in stdenv.mkDerivation ({ - name = "idris-${name}-${version}"; + pname = "idris-${pname}"; + inherit version; buildInputs = [ idris-with-packages gmp ] ++ extraBuildInputs; propagatedBuildInputs = allIdrisDeps; diff --git a/pkgs/development/idris-modules/bytes.nix b/pkgs/development/idris-modules/bytes.nix index eaff512d5d39..0fd9b05f88d4 100644 --- a/pkgs/development/idris-modules/bytes.nix +++ b/pkgs/development/idris-modules/bytes.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "bytes"; + pname = "bytes"; version = "2018-02-10"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/canvas.nix b/pkgs/development/idris-modules/canvas.nix index 77851c87179b..3c74879eab6c 100644 --- a/pkgs/development/idris-modules/canvas.nix +++ b/pkgs/development/idris-modules/canvas.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "canvas"; + pname = "canvas"; version = "2017-11-09"; ipkgName = "idriscanvas"; diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix index adbe6d4f8ad4..0c64218bcd82 100644 --- a/pkgs/development/idris-modules/categories.nix +++ b/pkgs/development/idris-modules/categories.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "categories"; + pname = "categories"; version = "2018-07-02"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/coda.nix b/pkgs/development/idris-modules/coda.nix index ecd7af443689..d1529ceb994e 100644 --- a/pkgs/development/idris-modules/coda.nix +++ b/pkgs/development/idris-modules/coda.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "coda"; + pname = "coda"; version = "2018-01-25"; ipkgName = "Coda"; diff --git a/pkgs/development/idris-modules/comonad.nix b/pkgs/development/idris-modules/comonad.nix index 31fd8dbc9aa8..d7bf499ea22d 100644 --- a/pkgs/development/idris-modules/comonad.nix +++ b/pkgs/development/idris-modules/comonad.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "comonad"; + pname = "comonad"; version = "2018-02-26"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/composition.nix b/pkgs/development/idris-modules/composition.nix index 5d6d2f891a63..831a1f32655c 100644 --- a/pkgs/development/idris-modules/composition.nix +++ b/pkgs/development/idris-modules/composition.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "composition"; + pname = "composition"; version = "2017-11-12"; idrisDeps = [ hezarfen ]; diff --git a/pkgs/development/idris-modules/config.nix b/pkgs/development/idris-modules/config.nix index 3771313d1784..49c6efdd737e 100644 --- a/pkgs/development/idris-modules/config.nix +++ b/pkgs/development/idris-modules/config.nix @@ -7,7 +7,7 @@ , lib }: build-idris-package { - name = "config"; + pname = "config"; version = "2017-11-06"; idrisDeps = [ effects containers lightyear test ]; diff --git a/pkgs/development/idris-modules/console.nix b/pkgs/development/idris-modules/console.nix index e60ac20f4d40..30cefa45810d 100644 --- a/pkgs/development/idris-modules/console.nix +++ b/pkgs/development/idris-modules/console.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "console"; + pname = "console"; version = "2017-04-20"; idrisDeps = [ idrisscript hrtime webgl ]; diff --git a/pkgs/development/idris-modules/containers.nix b/pkgs/development/idris-modules/containers.nix index e98285ca9306..dfe85aa7b8af 100644 --- a/pkgs/development/idris-modules/containers.nix +++ b/pkgs/development/idris-modules/containers.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "containers"; + pname = "containers"; version = "2017-09-10"; idrisDeps = [ effects test ]; diff --git a/pkgs/development/idris-modules/cube.nix b/pkgs/development/idris-modules/cube.nix index 8a0f66829d85..eac71fb8797c 100644 --- a/pkgs/development/idris-modules/cube.nix +++ b/pkgs/development/idris-modules/cube.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "cube"; + pname = "cube"; version = "2017-07-05"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index d6fb1ac78bd6..ea8697482dab 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, idris-no-deps, overrides ? (self: super: {}) }: let +{ pkgs, config, idris-no-deps, overrides ? (self: super: {}) }: let inherit (pkgs.lib) callPackageWith fix' extends; /* Taken from haskell-modules/default.nix, should probably abstract this away */ @@ -145,8 +145,6 @@ posix = callPackage ./posix.nix {}; - protobuf = callPackage ./protobuf.nix {}; - quantities = callPackage ./quantities.nix {}; rationals = callPackage ./rationals.nix {}; @@ -207,5 +205,8 @@ yampa = callPackage ./yampa.nix {}; - } // builtins_; + } // builtins_ // pkgs.lib.optionalAttrs (config.allowAliases or true) { + # removed packages + protobuf = throw "idrisPackages.protobuf has been removed: abandoned by upstream"; # Added 2022-02-06 + }; in fix' (extends overrides idrisPackages) diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix index 7ab87d71d063..1ceca662e8a3 100644 --- a/pkgs/development/idris-modules/derive.nix +++ b/pkgs/development/idris-modules/derive.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "derive"; + pname = "derive"; version = "2018-07-02"; idrisDeps = [ contrib pruviloj ]; diff --git a/pkgs/development/idris-modules/descncrunch.nix b/pkgs/development/idris-modules/descncrunch.nix index 95f49a524bc0..3c82e23ec7ec 100644 --- a/pkgs/development/idris-modules/descncrunch.nix +++ b/pkgs/development/idris-modules/descncrunch.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "descncrunch"; + pname = "descncrunch"; version = "2017-11-15"; idrisDeps = [ pruviloj ]; diff --git a/pkgs/development/idris-modules/dict.nix b/pkgs/development/idris-modules/dict.nix index 24cc7c0359d1..3aa15287bd8d 100644 --- a/pkgs/development/idris-modules/dict.nix +++ b/pkgs/development/idris-modules/dict.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "dict"; + pname = "dict"; version = "2016-12-26"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/dom.nix b/pkgs/development/idris-modules/dom.nix index f88827fb2654..2698cbab4847 100644 --- a/pkgs/development/idris-modules/dom.nix +++ b/pkgs/development/idris-modules/dom.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "dom"; + pname = "dom"; version = "2017-04-22"; idrisDeps = [ idrisscript html xhr ]; diff --git a/pkgs/development/idris-modules/electron.nix b/pkgs/development/idris-modules/electron.nix index 172f1980a90b..769b0b3fe8c0 100644 --- a/pkgs/development/idris-modules/electron.nix +++ b/pkgs/development/idris-modules/electron.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "electron"; + pname = "electron"; version = "2016-03-07"; idrisDeps = [ contrib jheiling-extras jheiling-js ]; diff --git a/pkgs/development/idris-modules/eternal.nix b/pkgs/development/idris-modules/eternal.nix index 673df485a380..9ca38907fe74 100644 --- a/pkgs/development/idris-modules/eternal.nix +++ b/pkgs/development/idris-modules/eternal.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "eternal"; + pname = "eternal"; version = "2018-07-02"; idrisDeps = [ effects ]; diff --git a/pkgs/development/idris-modules/farrp.nix b/pkgs/development/idris-modules/farrp.nix index 88f852ba20c0..4326aeeadb6a 100644 --- a/pkgs/development/idris-modules/farrp.nix +++ b/pkgs/development/idris-modules/farrp.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "farrp"; + pname = "farrp"; version = "2018-02-13"; idrisDeps = [ effects ]; diff --git a/pkgs/development/idris-modules/free.nix b/pkgs/development/idris-modules/free.nix index 6f7a5f56d4f9..557dc30ff96a 100644 --- a/pkgs/development/idris-modules/free.nix +++ b/pkgs/development/idris-modules/free.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "free"; + pname = "free"; version = "2017-07-03"; ipkgName = "idris-free"; diff --git a/pkgs/development/idris-modules/fsm.nix b/pkgs/development/idris-modules/fsm.nix index 5da5f01da348..1342e90f29bb 100644 --- a/pkgs/development/idris-modules/fsm.nix +++ b/pkgs/development/idris-modules/fsm.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "fsm"; + pname = "fsm"; version = "2017-04-16"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/glfw.nix b/pkgs/development/idris-modules/glfw.nix index c63cf8acb0f3..f67b65bb71f7 100644 --- a/pkgs/development/idris-modules/glfw.nix +++ b/pkgs/development/idris-modules/glfw.nix @@ -5,7 +5,7 @@ , pkgs }: build-idris-package { - name = "glfw"; + pname = "glfw"; version = "2016-12-05"; idrisDeps = [ effects ]; diff --git a/pkgs/development/idris-modules/graphviz.nix b/pkgs/development/idris-modules/graphviz.nix index 650f0e0b99bc..28ab24a2ada6 100644 --- a/pkgs/development/idris-modules/graphviz.nix +++ b/pkgs/development/idris-modules/graphviz.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "graphviz"; + pname = "graphviz"; version = "2017-01-16"; idrisDeps = [ lightyear ]; diff --git a/pkgs/development/idris-modules/hamt.nix b/pkgs/development/idris-modules/hamt.nix index 3c6868fcc592..97a72e8c9059 100644 --- a/pkgs/development/idris-modules/hamt.nix +++ b/pkgs/development/idris-modules/hamt.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "hamt"; + pname = "hamt"; version = "2016-11-15"; idrisDeps = [ contrib effects ]; diff --git a/pkgs/development/idris-modules/hezarfen.nix b/pkgs/development/idris-modules/hezarfen.nix index acbc2770ea52..881b65b2b8b4 100644 --- a/pkgs/development/idris-modules/hezarfen.nix +++ b/pkgs/development/idris-modules/hezarfen.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "hezarfen"; + pname = "hezarfen"; version = "2018-02-03"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/hrtime.nix b/pkgs/development/idris-modules/hrtime.nix index 7f4d0769cc41..3d1c0f4abf91 100644 --- a/pkgs/development/idris-modules/hrtime.nix +++ b/pkgs/development/idris-modules/hrtime.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "hrtime"; + pname = "hrtime"; version = "2017-04-16"; ipkgName = "hrTime"; diff --git a/pkgs/development/idris-modules/html.nix b/pkgs/development/idris-modules/html.nix index 2ab7534936aa..8eb2f7f12d75 100644 --- a/pkgs/development/idris-modules/html.nix +++ b/pkgs/development/idris-modules/html.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "html"; + pname = "html"; version = "2017-04-23"; idrisDeps = [ idrisscript hrtime webgl ]; diff --git a/pkgs/development/idris-modules/http.nix b/pkgs/development/idris-modules/http.nix index 45e505be056b..d952dca54a3d 100644 --- a/pkgs/development/idris-modules/http.nix +++ b/pkgs/development/idris-modules/http.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "http"; + pname = "http"; version = "2018-02-25"; idrisDeps = [ contrib lightyear bytes ]; diff --git a/pkgs/development/idris-modules/http4idris.nix b/pkgs/development/idris-modules/http4idris.nix index 11e9d62c051e..6959e33f48a8 100644 --- a/pkgs/development/idris-modules/http4idris.nix +++ b/pkgs/development/idris-modules/http4idris.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "http4idris"; + pname = "http4idris"; version = "2018-01-16"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/iaia.nix b/pkgs/development/idris-modules/iaia.nix index 865d533750f9..1c631280eac9 100644 --- a/pkgs/development/idris-modules/iaia.nix +++ b/pkgs/development/idris-modules/iaia.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "iaia"; + pname = "iaia"; version = "2017-11-10"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/idrishighlighter.nix b/pkgs/development/idris-modules/idrishighlighter.nix index 6b1ae30ad403..759ea354747f 100644 --- a/pkgs/development/idris-modules/idrishighlighter.nix +++ b/pkgs/development/idris-modules/idrishighlighter.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "idrishighlighter"; + pname = "idrishighlighter"; version = "2018-02-22"; ipkgName = "idris-code-highlighter"; diff --git a/pkgs/development/idris-modules/idrisscript.nix b/pkgs/development/idris-modules/idrisscript.nix index 805facda84c6..2a2693c623e0 100644 --- a/pkgs/development/idris-modules/idrisscript.nix +++ b/pkgs/development/idris-modules/idrisscript.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "idrisscript"; + pname = "idrisscript"; version = "2017-07-01"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/ipkgparser.nix b/pkgs/development/idris-modules/ipkgparser.nix index 6bdcd9e9f557..4cd966d8b851 100644 --- a/pkgs/development/idris-modules/ipkgparser.nix +++ b/pkgs/development/idris-modules/ipkgparser.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "ipkgparser"; + pname = "ipkgparser"; version = "2017-11-14"; idrisDeps = [ contrib effects lightyear ]; diff --git a/pkgs/development/idris-modules/jheiling-extras.nix b/pkgs/development/idris-modules/jheiling-extras.nix index ae933b264ae4..da84ea268009 100644 --- a/pkgs/development/idris-modules/jheiling-extras.nix +++ b/pkgs/development/idris-modules/jheiling-extras.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "extras"; + pname = "extras"; version = "2018-03-06"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/jheiling-js.nix b/pkgs/development/idris-modules/jheiling-js.nix index b192e8ff1c0b..425acceb4e6c 100644 --- a/pkgs/development/idris-modules/jheiling-js.nix +++ b/pkgs/development/idris-modules/jheiling-js.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "jheiling-js"; + pname = "jheiling-js"; version = "2016-03-09"; ipkgName = "js"; diff --git a/pkgs/development/idris-modules/js.nix b/pkgs/development/idris-modules/js.nix index 61ce415e6056..4b96ca1a4862 100644 --- a/pkgs/development/idris-modules/js.nix +++ b/pkgs/development/idris-modules/js.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "js"; + pname = "js"; version = "2018-11-27"; idrisDeps = [ contrib pruviloj ]; diff --git a/pkgs/development/idris-modules/lens.nix b/pkgs/development/idris-modules/lens.nix index e829309fbc01..c9a8c2aa257d 100644 --- a/pkgs/development/idris-modules/lens.nix +++ b/pkgs/development/idris-modules/lens.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "lens"; + pname = "lens"; version = "2017-09-25"; idrisDeps = [ bifunctors ]; diff --git a/pkgs/development/idris-modules/lightyear.nix b/pkgs/development/idris-modules/lightyear.nix index 34c19eea4ac4..e8f94a82d2f1 100644 --- a/pkgs/development/idris-modules/lightyear.nix +++ b/pkgs/development/idris-modules/lightyear.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "lightyear"; + pname = "lightyear"; version = "2017-09-10"; idrisDeps = [ effects ]; diff --git a/pkgs/development/idris-modules/logic.nix b/pkgs/development/idris-modules/logic.nix index 35670462dcf3..f20d16e9a190 100644 --- a/pkgs/development/idris-modules/logic.nix +++ b/pkgs/development/idris-modules/logic.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "logic"; + pname = "logic"; version = "2016-12-02"; idrisDeps = [ bifunctors ]; diff --git a/pkgs/development/idris-modules/mapping.nix b/pkgs/development/idris-modules/mapping.nix index 6f978fccd5e0..fbfb34ddbf9d 100644 --- a/pkgs/development/idris-modules/mapping.nix +++ b/pkgs/development/idris-modules/mapping.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "mapping"; + pname = "mapping"; version = "2018-02-27"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/mhd.nix b/pkgs/development/idris-modules/mhd.nix index 1ef304bbf1c8..dc3a05f2b5a1 100644 --- a/pkgs/development/idris-modules/mhd.nix +++ b/pkgs/development/idris-modules/mhd.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "mhd"; + pname = "mhd"; version = "2016-04-22"; ipkgName = "MHD"; diff --git a/pkgs/development/idris-modules/pacman.nix b/pkgs/development/idris-modules/pacman.nix index cda3662dce27..dbc3c9ced72d 100644 --- a/pkgs/development/idris-modules/pacman.nix +++ b/pkgs/development/idris-modules/pacman.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "pacman"; + pname = "pacman"; version = "2017-11-10"; idrisDeps = [ contrib sdl2 ]; diff --git a/pkgs/development/idris-modules/patricia.nix b/pkgs/development/idris-modules/patricia.nix index 586c33837d65..a5cb0c6af00e 100644 --- a/pkgs/development/idris-modules/patricia.nix +++ b/pkgs/development/idris-modules/patricia.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "patricia"; + pname = "patricia"; version = "2017-10-27"; idrisDeps = [ specdris ]; diff --git a/pkgs/development/idris-modules/permutations.nix b/pkgs/development/idris-modules/permutations.nix index b11bce39e1ee..6f4e299d223b 100644 --- a/pkgs/development/idris-modules/permutations.nix +++ b/pkgs/development/idris-modules/permutations.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "permutations"; + pname = "permutations"; version = "2018-01-19"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/pfds.nix b/pkgs/development/idris-modules/pfds.nix index d82ec4901856..db3004a72be0 100644 --- a/pkgs/development/idris-modules/pfds.nix +++ b/pkgs/development/idris-modules/pfds.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "pfds"; + pname = "pfds"; version = "2017-09-25"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/pipes.nix b/pkgs/development/idris-modules/pipes.nix index 69b8d721705a..1402a2facee1 100644 --- a/pkgs/development/idris-modules/pipes.nix +++ b/pkgs/development/idris-modules/pipes.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "pipes"; + pname = "pipes"; version = "2017-12-02"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/posix.nix b/pkgs/development/idris-modules/posix.nix index 30bff9eb7e7a..13588155989a 100644 --- a/pkgs/development/idris-modules/posix.nix +++ b/pkgs/development/idris-modules/posix.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "posix"; + pname = "posix"; version = "2017-11-18"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/protobuf.nix b/pkgs/development/idris-modules/protobuf.nix deleted file mode 100644 index ebfc3c275082..000000000000 --- a/pkgs/development/idris-modules/protobuf.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ build-idris-package -, fetchFromGitHub -, lightyear -, lib -}: -build-idris-package { - name = "protobuf"; - version = "2017-08-12"; - - idrisDeps = [ lightyear ]; - - src = fetchFromGitHub { - owner = "artagnon"; - repo = "idris-protobuf"; - rev = "c21212534639518453d16ae1b0f07d94464ff8eb"; - sha256 = "0n5w7bdbxqca3b7hzg95md01mx4sfvl9fi82xjm0hzds33akmn05"; - }; - - meta = { - description = "A partial implementation of Protocol Buffers in Idris"; - homepage = "https://github.com/artagnon/idris-protobuf"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.brainrape ]; - }; -} diff --git a/pkgs/development/idris-modules/quantities.nix b/pkgs/development/idris-modules/quantities.nix index 8141465d751b..76242c5d2299 100644 --- a/pkgs/development/idris-modules/quantities.nix +++ b/pkgs/development/idris-modules/quantities.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "quantities"; + pname = "quantities"; version = "2018-04-17"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/rationals.nix b/pkgs/development/idris-modules/rationals.nix index 91aa294d1c55..9513b79e1aa7 100644 --- a/pkgs/development/idris-modules/rationals.nix +++ b/pkgs/development/idris-modules/rationals.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "rationals"; + pname = "rationals"; version = "2017-04-29"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/recursion_schemes.nix b/pkgs/development/idris-modules/recursion_schemes.nix index b326113c6351..3e9510563eee 100644 --- a/pkgs/development/idris-modules/recursion_schemes.nix +++ b/pkgs/development/idris-modules/recursion_schemes.nix @@ -8,7 +8,7 @@ , lib }: build-idris-package { - name = "recursion_schemes"; + pname = "recursion_schemes"; version = "2018-01-19"; idrisDeps = [ free composition comonad bifunctors hezarfen ]; diff --git a/pkgs/development/idris-modules/refined.nix b/pkgs/development/idris-modules/refined.nix index 11fd6b782818..c841f633b41f 100644 --- a/pkgs/development/idris-modules/refined.nix +++ b/pkgs/development/idris-modules/refined.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "refined"; + pname = "refined"; version = "2017-12-28"; ipkgName = "idris-refined"; diff --git a/pkgs/development/idris-modules/sdl.nix b/pkgs/development/idris-modules/sdl.nix index 105cfdce65b7..59e3ac916e4f 100644 --- a/pkgs/development/idris-modules/sdl.nix +++ b/pkgs/development/idris-modules/sdl.nix @@ -6,7 +6,7 @@ , SDL_gfx }: build-idris-package { - name = "sdl"; + pname = "sdl"; version = "2017-03-24"; idrisDeps = [ effects ]; diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix index 2e06b0368255..36eb7395dde1 100644 --- a/pkgs/development/idris-modules/sdl2.nix +++ b/pkgs/development/idris-modules/sdl2.nix @@ -7,7 +7,7 @@ , SDL2_gfx }: build-idris-package rec { - name = "sdl2"; + pname = "sdl2"; version = "0.1.1"; idrisDeps = [ effects ]; diff --git a/pkgs/development/idris-modules/semidirect.nix b/pkgs/development/idris-modules/semidirect.nix index 30cc144003ee..e3ca18fd2a26 100644 --- a/pkgs/development/idris-modules/semidirect.nix +++ b/pkgs/development/idris-modules/semidirect.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "semidirect"; + pname = "semidirect"; version = "2018-07-02"; idrisDeps = [ contrib patricia ]; diff --git a/pkgs/development/idris-modules/setoids.nix b/pkgs/development/idris-modules/setoids.nix index aa66d8475959..49e7bc5e8a0e 100644 --- a/pkgs/development/idris-modules/setoids.nix +++ b/pkgs/development/idris-modules/setoids.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "setoids"; + pname = "setoids"; version = "2018-06-18"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/smproc.nix b/pkgs/development/idris-modules/smproc.nix index 4917f7628555..b3780c9af3b8 100644 --- a/pkgs/development/idris-modules/smproc.nix +++ b/pkgs/development/idris-modules/smproc.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "smproc"; + pname = "smproc"; version = "2018-02-08"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/snippets.nix b/pkgs/development/idris-modules/snippets.nix index 2d5473545c54..fa4f3226dcca 100644 --- a/pkgs/development/idris-modules/snippets.nix +++ b/pkgs/development/idris-modules/snippets.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "snippets"; + pname = "snippets"; version = "2018-03-17"; ipkgName = "idris-snippets"; diff --git a/pkgs/development/idris-modules/software_foundations.nix b/pkgs/development/idris-modules/software_foundations.nix index 0f45da3ed67b..cbbf959576f3 100644 --- a/pkgs/development/idris-modules/software_foundations.nix +++ b/pkgs/development/idris-modules/software_foundations.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "software_foundations"; + pname = "software_foundations"; version = "2017-11-04"; idrisDeps = [ pruviloj ]; diff --git a/pkgs/development/idris-modules/specdris.nix b/pkgs/development/idris-modules/specdris.nix index b20902d74328..172a46b65a55 100644 --- a/pkgs/development/idris-modules/specdris.nix +++ b/pkgs/development/idris-modules/specdris.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "specdris"; + pname = "specdris"; version = "2018-01-23"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/tap.nix b/pkgs/development/idris-modules/tap.nix index 9edbbaea359c..8db71b9cb0ab 100644 --- a/pkgs/development/idris-modules/tap.nix +++ b/pkgs/development/idris-modules/tap.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "tap"; + pname = "tap"; version = "2017-04-08"; ipkgName = "TAP"; diff --git a/pkgs/development/idris-modules/test.nix b/pkgs/development/idris-modules/test.nix index 073b4e20b850..9c14422cc8d2 100644 --- a/pkgs/development/idris-modules/test.nix +++ b/pkgs/development/idris-modules/test.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "test"; + pname = "test"; version = "2017-03-30"; idrisDeps = [ effects ]; diff --git a/pkgs/development/idris-modules/tfrandom.nix b/pkgs/development/idris-modules/tfrandom.nix index 8249259075c0..b07f5253005e 100644 --- a/pkgs/development/idris-modules/tfrandom.nix +++ b/pkgs/development/idris-modules/tfrandom.nix @@ -4,7 +4,7 @@ }: build-idris-package { - name = "tf-random"; + pname = "tf-random"; version = "2020-01-15"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/tlhydra.nix b/pkgs/development/idris-modules/tlhydra.nix index e2c07ac5fb71..3b33367c8890 100644 --- a/pkgs/development/idris-modules/tlhydra.nix +++ b/pkgs/development/idris-modules/tlhydra.nix @@ -6,7 +6,7 @@ , lib }: build-idris-package { - name = "tlhydra"; + pname = "tlhydra"; version = "2017-13-26"; idrisDeps = [ effects contrib lightyear ]; diff --git a/pkgs/development/idris-modules/tomladris.nix b/pkgs/development/idris-modules/tomladris.nix index 64728ab305ec..8a0e7847f507 100644 --- a/pkgs/development/idris-modules/tomladris.nix +++ b/pkgs/development/idris-modules/tomladris.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "tomladris"; + pname = "tomladris"; version = "2017-11-14"; idrisDeps = [ lightyear contrib ]; diff --git a/pkgs/development/idris-modules/tp.nix b/pkgs/development/idris-modules/tp.nix index 0cfdc78f6673..0aedc3f48596 100644 --- a/pkgs/development/idris-modules/tp.nix +++ b/pkgs/development/idris-modules/tp.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "tp"; + pname = "tp"; version = "2017-08-15"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index ce040bebe355..ddf24f7c9d9f 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "tparsec"; + pname = "tparsec"; version = "2020-02-11"; ipkgName = "TParsec"; diff --git a/pkgs/development/idris-modules/transducers.nix b/pkgs/development/idris-modules/transducers.nix index 39a4cdf0cc7b..455e5c72a644 100644 --- a/pkgs/development/idris-modules/transducers.nix +++ b/pkgs/development/idris-modules/transducers.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "transducers"; + pname = "transducers"; version = "2017-07-28"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/trees.nix b/pkgs/development/idris-modules/trees.nix index 8fda8d138ad1..5c6e69471c78 100644 --- a/pkgs/development/idris-modules/trees.nix +++ b/pkgs/development/idris-modules/trees.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "trees"; + pname = "trees"; version = "2018-03-19"; idrisDeps = [ contrib bi ]; diff --git a/pkgs/development/idris-modules/union_type.nix b/pkgs/development/idris-modules/union_type.nix index 2ad8f280fce5..99f160a72d86 100644 --- a/pkgs/development/idris-modules/union_type.nix +++ b/pkgs/development/idris-modules/union_type.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "union_type"; + pname = "union_type"; version = "2018-01-30"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/vdom.nix b/pkgs/development/idris-modules/vdom.nix index 3ece0056a3f1..9e3f151ee891 100644 --- a/pkgs/development/idris-modules/vdom.nix +++ b/pkgs/development/idris-modules/vdom.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "vdom"; + pname = "vdom"; version = "0.6.0"; ipkgName = "idris-vdom"; diff --git a/pkgs/development/idris-modules/vecspace.nix b/pkgs/development/idris-modules/vecspace.nix index 2336291338b3..dea3c9b18dd0 100644 --- a/pkgs/development/idris-modules/vecspace.nix +++ b/pkgs/development/idris-modules/vecspace.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "vecspace"; + pname = "vecspace"; version = "2018-01-12"; idrisDeps = [ contrib ]; diff --git a/pkgs/development/idris-modules/webgl.nix b/pkgs/development/idris-modules/webgl.nix index 271501aa5298..849cad2590c1 100644 --- a/pkgs/development/idris-modules/webgl.nix +++ b/pkgs/development/idris-modules/webgl.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "webgl"; + pname = "webgl"; version = "2017-05-08"; idrisDeps = [ idrisscript ]; diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix index a368e0582d82..a6c7b78f5527 100644 --- a/pkgs/development/idris-modules/wl-pprint.nix +++ b/pkgs/development/idris-modules/wl-pprint.nix @@ -3,7 +3,7 @@ , lib }: build-idris-package { - name = "wl-pprint"; + pname = "wl-pprint"; version = "2017-03-13"; src = fetchFromGitHub { diff --git a/pkgs/development/idris-modules/wyvern.nix b/pkgs/development/idris-modules/wyvern.nix index 750b5dd2fd07..3a8742d9fe5d 100644 --- a/pkgs/development/idris-modules/wyvern.nix +++ b/pkgs/development/idris-modules/wyvern.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "wyvern"; + pname = "wyvern"; version = "2017-06-26"; idrisDeps = [ contrib effects ]; diff --git a/pkgs/development/idris-modules/xhr.nix b/pkgs/development/idris-modules/xhr.nix index 9c198e289389..e8dc37d43989 100644 --- a/pkgs/development/idris-modules/xhr.nix +++ b/pkgs/development/idris-modules/xhr.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "xhr"; + pname = "xhr"; version = "2017-04-22"; idrisDeps = [ idrisscript ]; diff --git a/pkgs/development/idris-modules/yaml.nix b/pkgs/development/idris-modules/yaml.nix index b7fffd3953d6..2c8b8087576e 100644 --- a/pkgs/development/idris-modules/yaml.nix +++ b/pkgs/development/idris-modules/yaml.nix @@ -5,7 +5,7 @@ , lib }: build-idris-package { - name = "yaml"; + pname = "yaml"; version = "2018-01-25"; ipkgName = "Yaml"; diff --git a/pkgs/development/idris-modules/yampa.nix b/pkgs/development/idris-modules/yampa.nix index 33ebacc6d55b..ae790aa4bdaa 100644 --- a/pkgs/development/idris-modules/yampa.nix +++ b/pkgs/development/idris-modules/yampa.nix @@ -4,7 +4,7 @@ , lib }: build-idris-package { - name = "yampa"; + pname = "yampa"; version = "2016-07-05"; ipkgName = "idris-yampa"; diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/development/interpreters/alda/default.nix index ec46a5e3923d..355551d5ad0d 100644 --- a/pkgs/development/interpreters/alda/default.nix +++ b/pkgs/development/interpreters/alda/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "alda"; - version = "2.0.6"; + version = "2.2.0"; src_alda = fetchurl { url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/client/linux-amd64/alda"; - sha256 = "1078hywl3gim5wfgxb0xwbk1dn80ls3i7y33n76qsdd4b0x0sn7i"; + sha256 = "0z3n81fmv3fxwgr641r6jjn1dmi5d3rw8d6r8jdfjhgpxanyi9a7"; }; src_player = fetchurl { url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/player/non-windows/alda-player"; - sha256 = "1g7k2qnh4vcw63604z7zbvhbpn7l1v3m9mx4j4vywfq6qar1r6ck"; + sha256 = "11kji846hbn1f2w1s7rc1ing203jkamy89j1jmysajvirdpp8nha"; }; dontUnpack = true; diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index f8fe2a46cc70..3379d1370af1 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -1,30 +1,54 @@ -{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, coreutils, gnugrep, ncurses, doCheck ? true }: +{ resholvePackage +, lib +, stdenv +, fetchFromGitHub +, bash +, coreutils +, gnugrep +, ncurses +, lsof +, doInstallCheck ? true +}: -stdenv.mkDerivation rec { +resholvePackage rec { pname = "bats"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-core"; rev = "v${version}"; - sha256 = "sha256-MEkMi2w8G9FZhE3JvzzbqObcErQ9WFXy5mtKwQOoxbk="; + sha256 = "sha256-s+SAqX70WeTz6s5ObXYFBVPVUEqvD1d7AX2sGHkjVQ4="; }; - nativeBuildInputs = [ makeWrapper ]; - patchPhase = '' patchShebangs . ''; installPhase = '' ./install.sh $out - wrapProgram $out/bin/bats --suffix PATH : "${lib.makeBinPath [ bash coreutils gnugrep ]}" ''; - inherit doCheck; - checkInputs = [ ncurses ]; - checkPhase = '' + solutions = { + bats = { + scripts = [ "bin/bats" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ bash coreutils gnugrep ]; + fake = { + external = [ "greadlink" ]; + }; + fix = { + "$BATS_ROOT" = [ "${placeholder "out"}" ]; + }; + keep = { + "${placeholder "out"}/libexec/bats-core/bats" = true; + }; + }; + }; + + inherit doInstallCheck; + installCheckInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ lsof ]; + installCheckPhase = '' # TODO: cut if https://github.com/bats-core/bats-core/issues/418 allows sed -i '/test works even if PATH is reset/a skip' test/bats.bats diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index 56d37dd4e947..9771a8f72d2a 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchgit, mlton }: +{ lib, stdenv, fetchFromGitHub, mlton }: stdenv.mkDerivation { pname = "ceptre"; version = "unstable-2016-11-27"; - src = fetchgit { - url = "https://github.com/chrisamaphone/interactive-lp"; + src = fetchFromGitHub { + owner = "chrisamaphone"; + repo = "interactive-lp"; rev = "e436fda2ccd44e9c9d226feced9d204311deacf5"; - sha256 = "174pxfnw3qyn2w8qxmx45fa68iddf106mkfi0kcmyqxzsc9jprh8"; + sha256 = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w="; + fetchSubmodules = true; }; nativeBuildInputs = [ mlton ]; diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index c0ee8988c094..4a8b639071ab 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,18 +1,8 @@ { lib, stdenv, fetchFromGitHub, makeWrapper }: -let - version = "0.10"; - name = "chibi-scheme-${version}"; -in -stdenv.mkDerivation { - inherit name; - meta = { - homepage = "https://github.com/ashinn/chibi-scheme"; - description = "Small Footprint Scheme for use as a C Extension Language"; - platforms = lib.platforms.all; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.DerGuteMoritz ]; - }; +stdenv.mkDerivation rec { + version = "0.10"; + pname = "chibi-scheme"; src = fetchFromGitHub { owner = "ashinn"; @@ -36,4 +26,12 @@ stdenv.mkDerivation { --replace "/usr/bin/env chibi-scheme" "$out/bin/chibi-scheme" done ''; + + meta = { + homepage = "https://github.com/ashinn/chibi-scheme"; + description = "Small Footprint Scheme for use as a C Extension Language"; + platforms = lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.DerGuteMoritz ]; + }; } diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 2a387d34f470..926308f0d30c 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -24,11 +24,11 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xorgproto != null && libXext != null); stdenv.mkDerivation rec { - v = "2.49"; - name = "clisp-${v}"; + version = "2.49"; + pname = "clisp"; src = fetchurl { - url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2"; + url = "mirror://gnu/clisp/release/${version}/clisp-${version}.tar.bz2"; sha256 = "8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890"; }; diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index 7ab4134facb9..7b10d2cad0e5 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -23,8 +23,8 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null && libXpm != null && xorgproto != null && libXext != null); stdenv.mkDerivation rec { - v = "2.50pre20171114"; - name = "clisp-${v}"; + version = "2.50pre20171114"; + pname = "clisp"; src = fetchhg { url = "http://hg.code.sf.net/p/clisp/clisp"; diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 93755e83a3d6..c3dcd0a0f71f 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.7.3"; + version = "0.7.8"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-zbxFMc02hbsU2ERlUzqMBHwHYfORB7TkMINrKC52PPU="; + sha256 = "sha256-VbDivl92YYWzIbkbOgDijzf9bZ5ZyodcapPPG4EiGXc="; }; executable = "bb"; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 45dc35681c38..cd63e506a55f 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.1058"; + version = "1.11.0.1100"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "guIQjiWyulITZZSjt/kCtU5qo4FG/2IK2rwBI6Ttfe0="; + sha256 = "sha256-9KEsO32118fvKE1Gls+9nAeRdlhTKfmJylsiSYCoKKU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/clojure/obb.nix b/pkgs/development/interpreters/clojure/obb.nix index 9583be923939..adb7a9261739 100644 --- a/pkgs/development/interpreters/clojure/obb.nix +++ b/pkgs/development/interpreters/clojure/obb.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "obb"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "babashka"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WxQjBg6el6XMiHTurmSo1GgZnTdaJjRmcV3+3X4yohc="; + sha256 = "1Gxh4IMtytQCuPS+BWOc5AgjEBxa43ebYfDsxLSPeY0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index d41c0a3c1f59..366b7df3edd4 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , unzip -, version ? "2.14.3" +, version ? "2.15.1" , sources ? let base = "https://storage.googleapis.com/dart-archive/channels"; x86_64 = "x64"; @@ -10,24 +10,24 @@ aarch64 = "arm64"; # Make sure that if the user overrides version parameter they're # also need to override sources, to avoid mistakes - version = "2.14.3"; + version = "2.15.1"; in { "${version}-x86_64-darwin" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; - sha256 = "0is4gz99i06yb4jisxcz2c15jqkaz6ayhg9b8zb3s0s8yp59r2iq"; + sha256 = "sha256-s6bkwh2m5KdRr/WxWXwItO9YaDpp/HI3xjnS2UHmN+I="; }; "${version}-x86_64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "0wg1mnj4qrv22z510032jnwb3z39gvzlrv5wic2ci5mg7316xlya"; + sha256 = "sha256-D0XcqlO0CQtpsne4heqaTLOkFYnJEZET4bl4rVXOM18="; }; "${version}-i686-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "0gnjk3lh63m0naaw67g9w7wys5cgx2ipzd1dznqnlvxp2vj1gj5p"; + sha256 = "sha256-SRq5TtxS+bwCqVxa0U2Zhn8J1Wtm4Onq+3uQS+951sw="; }; "${version}-aarch64-linux" = fetchurl { url = "${base}/stable/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "1j7snnf3a0jly85njq8npqikrdhz9lkirhvik1hkpd9sv7qfbvd6"; + sha256 = "sha256-iDbClCNDUsxT6K6koc4EQuu7dppTbOfzCVedpQIKI5U="; }; } }: diff --git a/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix index 7fe1b46e3a55..f7c730c92772 100644 --- a/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix +++ b/pkgs/development/interpreters/dhall/build-dhall-directory-package.nix @@ -24,7 +24,6 @@ lib.makePackageOverridable code = "${src}/${file}"; } - // lib.optionalAttrs document { documentationRoot = src; } + // lib.optionalAttrs document { documentationRoot = "${src}"; } ) ) - diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index ba533a172761..912fc691dd91 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "duktape"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { url = "http://duktape.org/duktape-${version}.tar.xz"; - sha256 = "19szwxzvl2g65fw95ggvb8h0ma5bd9vvnnccn59hwnc4dida1x4n"; + sha256 = "sha256-kPjS+otVZ8aJmDDd7ywD88J5YLEayiIvoXqnrGE8KJA="; }; nativeBuildInputs = [ validatePkgConfig ]; diff --git a/pkgs/development/interpreters/elixir/1.13.nix b/pkgs/development/interpreters/elixir/1.13.nix index e5eb36e752ad..0e1ddcc19bf0 100644 --- a/pkgs/development/interpreters/elixir/1.13.nix +++ b/pkgs/development/interpreters/elixir/1.13.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.13.2"; - sha256 = "sha256-qv85aDP3RPCa1YBo45ykWRRZNanL6brNKDMPu9SZdbQ="; + version = "1.13.3"; + sha256 = "sha256-xOIGMpjemPi1xLiYmFpQR4FD6PzeFBxSJP4QpNnEUSE="; minimumOTPVersion = "22"; } diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 646fd70ff8f9..5f08386c9f51 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -25,7 +25,7 @@ in assert versionAtLeast (getVersion erlang) minimumOTPVersion; stdenv.mkDerivation ({ - name = "${baseName}-${version}"; + pname = "${baseName}"; inherit src version debugInfo; diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index f4f7d6483545..667fb749d330 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation ({ #!${stdenv.shell} set -ox errexit PATH=${lib.makeBinPath [ common-updater-scripts coreutils git gnused ]} - latest=$(list-git-tags https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1) + latest=$(list-git-tags --url=https://github.com/erlang/otp.git | sed -n 's/^OTP-${major}/${major}/p' | sort -V | tail -1) if [ "$latest" != "${version}" ]; then nixpkgs="$(git rev-parse --show-toplevel)" nix_file="$nixpkgs/pkgs/development/interpreters/erlang/R${major}.nix" diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index 19ef0e608485..04c60e80e8fc 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -83,9 +83,9 @@ builder rec { # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - # don't have "libgcc_s.so.1" on darwin + # don't have "libgcc_s.so.1" on clang LDFLAGS = lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s"; + (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 76aa0c4404fc..d0f5aa5573b6 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -14,6 +14,7 @@ , pkg-config , pkgsBuildBuild , readline +, writeScript }: let @@ -24,11 +25,11 @@ let in builder rec { pname = "guile"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9X2GxwYgJxv863qb4MgXRKAz8IrcfOuoMsmRerPmkbc="; + sha256 = "sha256-2qcGClbygE6bdMjX5/6L7tErQ6qyeJo4WFGD/MF7ihM="; }; outputs = [ "out" "dev" "info" ]; @@ -81,9 +82,9 @@ builder rec { # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - # don't have "libgcc_s.so.1" on darwin + # don't have "libgcc_s.so.1" on clang LDFLAGS = lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s"; + (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" @@ -102,7 +103,10 @@ builder rec { ] # 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"; + ++ 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"; postInstall = '' wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" @@ -126,6 +130,20 @@ builder rec { setupHook = ./setup-hook-3.0.sh; + passthru = { + updateScript = writeScript "update-guile-3" '' + #!/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 '"https://ftp.gnu.org/gnu/guile/guile-3.0.8.tar.gz"' + new_version="$(curl -s https://www.gnu.org/software/guile/download/ | + pcregrep -o1 '"https://ftp.gnu.org/gnu/guile/guile-(3[.0-9]+).tar.gz"')" + update-source-version guile_3_0 "$new_version" + ''; + }; + meta = with lib; { homepage = "https://www.gnu.org/software/guile/"; description = "Embeddable Scheme implementation"; diff --git a/pkgs/development/interpreters/janet/darwin-remove-net-test.patch b/pkgs/development/interpreters/janet/darwin-remove-net-test.patch new file mode 100644 index 000000000000..b2a66d5465ea --- /dev/null +++ b/pkgs/development/interpreters/janet/darwin-remove-net-test.patch @@ -0,0 +1,20 @@ +diff --git a/test/suite0009.janet b/test/suite0009.janet +index 6095bc60..25360d60 100644 +--- a/test/suite0009.janet ++++ b/test/suite0009.janet +@@ -174,15 +174,6 @@ + (defer (:close stream) + (check-matching-names stream))) + +-# Test localname and peername +-(repeat 20 +- (with [s (net/server "127.0.0.1" "8000" names-handler)] +- (defn test-names [] +- (with [conn (net/connect "127.0.0.1" "8000")] +- (check-matching-names conn))) +- (repeat 20 (test-names))) +- (gccollect)) +- + # Create pipe + + (var pipe-counter 0) \ No newline at end of file diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 35631174e260..4601faafb06d 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,25 +2,22 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.16.1"; + version = "1.21.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TzJbHmHIySlf3asQ02HOdehMR+s0KkPifBiaQ4FvFCg="; + sha256 = "sha256-wJwlGliXoj0XmC9qb6SCo8mUy4aqHvJtFiigUB7PFLE="; }; - # we don't have /usr/bin/env in the sandbox, so substitute for a proper, - # absolute path to janet - postPatch = '' - substituteInPlace jpm \ - --replace '/usr/bin/env janet' $out/bin/janet \ - --replace /usr/local/lib/janet $out/lib \ - --replace /usr/local $out + # This release fails the test suite on darwin, remove when debugged. + # See https://github.com/NixOS/nixpkgs/pull/150618 for discussion. + patches = lib.optionals stdenv.isDarwin ./darwin-remove-net-test.patch; + postPatch = '' substituteInPlace janet.1 \ - --replace /usr/local/lib/janet $out/lib + --replace /usr/local/ $out/ ''; nativeBuildInputs = [ meson ninja ]; @@ -35,5 +32,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ andrewchambers peterhoeg ]; platforms = platforms.all; + # Marked as broken when patch is applied, see comment above patch. + broken = stdenv.isDarwin; }; } diff --git a/pkgs/development/interpreters/janet/jpm.nix b/pkgs/development/interpreters/janet/jpm.nix new file mode 100644 index 000000000000..708930851255 --- /dev/null +++ b/pkgs/development/interpreters/janet/jpm.nix @@ -0,0 +1,59 @@ +{ lib, stdenv, fetchFromGitHub, janet }: + +let + platformFiles = { + aarch64-darwin = "macos_config.janet"; + aarch64-linux = "linux_config.janet"; + x86_64-darwin = "macos_config.janet"; + x86_64-linux = "linux_config.janet"; + }; + + platformFile = platformFiles.${stdenv.hostPlatform.system}; + +in +stdenv.mkDerivation rec { + pname = "jpm"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "janet-lang"; + repo = pname; + rev = version; + sha256 = "sha256-nv+vkDjEY711L+C5ibw48DUSNqq2UJiFC2i5LntuBNM="; + }; + + # `auto-shebangs true` gives us a shebang line that points to janet inside the + # jpm bin folder + postPatch = '' + substituteInPlace configs/${platformFile} \ + --replace 'auto-shebang true' 'auto-shebang false' \ + --replace /usr/local $out + ''; + + dontConfigure = true; + + buildInputs = [ janet ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{lib/janet,share/man/man1} + + janet bootstrap.janet configs/${platformFile} + + runHook postInstall + ''; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/jpm help + ''; + + meta = janet.meta // { + description = "Janet Project Manager for the Janet programming language"; + platforms = lib.attrNames platformFiles; + }; +} diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 78b9e40b6470..158d99e3b214 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -1,20 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }: +{ lib +, stdenv +, fetchFromGitHub -let - makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL"); +, asciidoc +, pkg-config +, inetutils -in stdenv.mkDerivation rec { +, sqlite +, readline +, SDL +, SDL_gfx +}: + +stdenv.mkDerivation rec { pname = "jimtcl"; - version = "0.79"; + version = "0.81"; src = fetchFromGitHub { owner = "msteveb"; repo = "jimtcl"; rev = version; - sha256 = "1k88hz0v3bi19xdvlp0i9nsx38imzwpjh632w7326zwbv2wldf0h"; + sha256 = "sha256-OpM9y7fQ+18qxl3/5wUCrNA9qiCdA0vTHqLYSw2lvJs="; }; nativeBuildInputs = [ + pkg-config asciidoc ]; @@ -35,8 +45,6 @@ in stdenv.mkDerivation rec { "--ipv6" ]; - NIX_CFLAGS_COMPILE = toString (makeSDLFlags [ SDL SDL_gfx ]); - enableParallelBuilding = true; doCheck = true; @@ -45,6 +53,9 @@ in stdenv.mkDerivation rec { rm tests/exec2.test ''; + # test posix-1.6 needs the "hostname" command + checkInputs = [ inetutils ]; + postInstall = '' ln -sr $out/lib/libjim.so.${version} $out/lib/libjim.so ''; @@ -54,6 +65,6 @@ in stdenv.mkDerivation rec { homepage = "http://jim.tcl.tk/"; license = lib.licenses.bsd2; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ dbohdan vrthra ]; + maintainers = with lib.maintainers; [ dbohdan fgaz vrthra ]; }; } diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 4c19a2da8739..468f9fac64c1 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" ""; jruby = stdenv.mkDerivation rec { pname = "jruby"; - version = "9.3.2.0"; + version = "9.3.3.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "sha256-JmmcoCvur6gyZXPBElxXpZcbqLlNFfhOazuvJZQkTzM="; + sha256 = "sha256-Pagoy+KH1UaFB/HCxCvvbPNLxTYbzWpdmcIHshuf3Fw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index 41778270f7a5..2719008bbd9e 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "love"; - version = "0.10.2"; + version = "11.4"; src = fetchFromGitHub { owner = "love2d"; repo = "love"; rev = version; - sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; + sha256 = "sha256-C/Ifd0KjmaM5Y2fxBiDNz1GQoT4GeH/vyUCiira57U4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/interpreters/lunatic/default.nix b/pkgs/development/interpreters/lunatic/default.nix index bf53e71a221c..425060e240d4 100644 --- a/pkgs/development/interpreters/lunatic/default.nix +++ b/pkgs/development/interpreters/lunatic/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "lunatic"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "lunatic-solutions"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RX8JarGpY6dhPGpvOX1FuUjirEPff0wGqLkGFxOa+bc="; + sha256 = "sha256-HqDrGoyYzdx8OTanlRd95L1wAtFeew7Xs2rZ7nK2Zus="; }; - cargoSha256 = "sha256-UvrDqxaZSgUJ/a6abigTuiUOfw+C7UolBApt5kVR+yo="; + cargoSha256 = "sha256-t3EwVYrKx7dvUcSp0B1iUAklg7WdQDld/T0O1HgHw54="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/nextflow/default.nix b/pkgs/development/interpreters/nextflow/default.nix new file mode 100644 index 000000000000..c182214ccbb0 --- /dev/null +++ b/pkgs/development/interpreters/nextflow/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, jre +, wget +, which +, gnused +, gawk +, coreutils +}: + +stdenv.mkDerivation rec { + pname = "nextflow"; + version = "21.10.6"; + + src = fetchurl { + url = "https://github.com/nextflow-io/nextflow/releases/download/v${version}/nextflow-${version}-all"; + sha256 = "0l9hi51vrhvfx3px2pxw7lp4h21n8ks50x4icfk3hbgl2hwf7fvx"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre wget which gnused gawk coreutils ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 $src $out/bin/nextflow + + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/nextflow --prefix PATH : ${lib.makeBinPath buildInputs} + ''; + + meta = with lib; { + description = "A DSL for data-driven computational pipelines"; + longDescription = '' + Nextflow is a bioinformatics workflow manager that enables the development of portable and reproducible workflows. + + It supports deploying workflows on a variety of execution platforms including local, HPC schedulers, AWS Batch, Google Cloud Life Sciences, and Kubernetes. + + Additionally, it provides support for manage your workflow dependencies through built-in support for Conda, Docker, Singularity, and Modules. + ''; + homepage = "https://www.nextflow.io/"; + changelog = "https://github.com/nextflow-io/nextflow/releases"; + license = licenses.asl20; + maintainers = [ maintainers.Etjean ]; + mainProgram = "nextflow"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 316b37f2e099..4bd00811b5fb 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "7.4.27"; - sha256 = "184aaef313fbf28c9987f6aa07b655cd1b0eae9e7e17061775a3e7d880185563"; + version = "7.4.28"; + sha256 = "sha256-IIUIaoY0RLDjlUfeGklp/RxAoMGI61j6spOLZJsMS1g="; }); in diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index b34f5974ff4e..3332c9d5a420 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.14"; - sha256 = "0jydl388mpysrrxa7h9sxf3fpp38mmygg9ryq8j7rb8p93giyf5v"; + version = "8.0.17"; + sha256 = "52811ee2dde71660ca32737a4ac696c24591eb22e846dd8e09ee77122660283f"; }); in diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index d339e7801018..aa98204b9979 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.2"; - sha256 = "1aakbfgjffha4v7fl6229wwzavw59s1qkb547sipyhl88gfwfgci"; + version = "8.1.4"; + sha256 = "b3f688cb69758523838b8e7f509aaef0152133d9b84a84a0b7cf68eeafc1df76"; }); in diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index 2c674754935c..47e18cbdcd8f 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + postPatch = '' substituteInPlace Makefile --replace '`svnversion -n`' "${version}" ''; @@ -46,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/zsaleeba/picoc"; downloadPage = "https://code.google.com/p/picoc/downloads/list"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index ca55eceaedbf..5b93357b2665 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc, +{ lib, stdenv, fetchFromGitHub, fetchurl, python2, makeWrapper, pkg-config, gcc, pypy, libffi, libedit, libuv, boost, zlib, variant ? "jit", buildWithPypy ? false }: @@ -11,10 +11,11 @@ let no-jit = { flags = ""; target = "target.py"; }; no-jit-preload = { flags = ""; target = "target_preload.py"; }; }; - pixie-src = fetchgit { - url = "https://github.com/pixie-lang/pixie.git"; + pixie-src = fetchFromGitHub { + owner = "pixie-lang"; + repo = "pixie"; rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62"; - sha256 = "0pf31x5h2m6dpxlidv98qay1y179qw40cw4cb4v4xa88gmq2f3vm"; + sha256 = "sha256-dQ8ncH0IqU42WYxwBgjH6QQfvMIo7RZpv81UAUsPw10="; }; pypy-tag = "91db1a9"; pypy-src = fetchurl { diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 7a2a79b8cfed..02ecf8d25b1e 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -4,7 +4,7 @@ , libffi , gdbm , xz -, mime-types ? null, mimetypesSupport ? true +, mailcap, mimetypesSupport ? true , ncurses , openssl , readline @@ -17,6 +17,7 @@ , configd , autoreconfHook , autoconf-archive +, pkg-config , python-setup-hook , nukeReferences # For the Python package set @@ -62,8 +63,6 @@ assert x11Support -> tcl != null assert bluezSupport -> bluez != null; -assert mimetypesSupport -> mime-types != null; - assert lib.assertMsg (enableOptimizations -> (!stdenv.cc.isClang)) "Optimizations with clang are not supported. configure: error: llvm-profdata is required for a --enable-optimizations build but could not be found."; @@ -105,7 +104,7 @@ let nativeBuildInputs = optionals (!stdenv.isDarwin) [ autoreconfHook - ] ++ optionals (!stdenv.isDarwin && passthru.pythonAtLeast "3.10") [ + pkg-config autoconf-archive # needed for AX_CHECK_COMPILE_FLAG ] ++ [ nukeReferences @@ -192,7 +191,6 @@ in with passthru; stdenv.mkDerivation { prePatch = optionalString stdenv.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' - substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' ' '' + optionalString (pythonOlder "3.9" && stdenv.isDarwin && x11Support) '' # Broken on >= 3.9; replaced with ./3.9/darwin-tcl-tk.patch substituteInPlace setup.py --replace /Library/Frameworks /no-such-path @@ -277,7 +275,7 @@ in with passthru; stdenv.mkDerivation { --replace "'/bin/sh'" "'${bash}/bin/sh'" '' + optionalString mimetypesSupport '' substituteInPlace Lib/mimetypes.py \ - --replace "@mime-types@" "${mime-types}" + --replace "@mime-types@" "${mailcap}" '' + optionalString (x11Support && (tix != null)) '' substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; @@ -343,8 +341,6 @@ in with passthru; stdenv.mkDerivation { substituteInPlace ./setup.py --replace $i /no-such-path done '' + optionalString stdenv.isDarwin '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" - export MACOSX_DEPLOYMENT_TARGET=10.6 # Override the auto-detection in setup.py, which assumes a universal build export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.isAarch64 then "uint128" else "x64"} '' + optionalString (isPy3k && pythonOlder "3.7") '' diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 5cdba9d3204b..579e3a05c58a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -120,23 +120,23 @@ with pkgs; }; sources = { - python38 = { - sourceVersion = { - major = "3"; - minor = "8"; - patch = "12"; - suffix = ""; - }; - sha256 = "1si8hw2xpagh4iji89zdx69p3dv5mjqwwbx2x2sl6lrp41jaglxi"; - }; python39 = { sourceVersion = { major = "3"; minor = "9"; - patch = "9"; + patch = "10"; suffix = ""; }; - sha256 = "sha256-BoKMBKVzwHOk5RxCkqJ8G+SuJmIcPtx8+TGEGM47bSc="; + sha256 = "sha256-Co+/tSh+vDoT6brz1U4I+gZ3j/7M9jEa74Ibs6ZYbMg="; + }; + python310 = { + sourceVersion = { + major = "3"; + minor = "10"; + patch = "2"; + suffix = ""; + }; + sha256 = "sha256-F946x9qfJRmqnWQ3jGA6c6DprVjf+ogS5FFgwIbeZMc="; }; }; @@ -160,19 +160,26 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "12"; + patch = "13"; suffix = ""; }; - sha256 = "041jqjl5wf7gsw84zd3jgvg91skq20l2fy5zbhz237w38zxzfyzp"; + sha256 = "sha256-mfEGJ134iZw+jLnXwBzmhsIC7ydZUzAUJxlGk95b74Q="; inherit (darwin) configd; inherit passthruFun; }; - python38 = callPackage ./cpython ({ + python38 = callPackage ./cpython { self = python38; + sourceVersion = { + major = "3"; + minor = "8"; + patch = "13"; + suffix = ""; + }; + sha256 = "sha256-bzCQdwEgQKo5/o8MYduMD6HEUTZ2MpnTdcnldW8Jz1c="; inherit (darwin) configd; inherit passthruFun; - } // sources.python38); + }; python39 = callPackage ./cpython ({ self = python39; @@ -180,18 +187,11 @@ in { inherit passthruFun; } // sources.python39); - python310 = callPackage ./cpython { + python310 = callPackage ./cpython ({ self = python310; - sourceVersion = { - major = "3"; - minor = "10"; - patch = "1"; - suffix = ""; - }; - sha256 = "0xz1wrd6xi20sbli30vm6jclc4rlnnd03irybknf2p8sdrdjdwd7"; inherit (darwin) configd; inherit passthruFun; - }; + } // sources.python310); python311 = callPackage ./cpython { self = python311; @@ -199,9 +199,9 @@ in { major = "3"; minor = "11"; patch = "0"; - suffix = "a2"; + suffix = "a6"; }; - sha256 = "sha256-aKjE1s4lSKe2F9aZ+9s0iTe9rODPltsaoIOEnfXa0T8="; + sha256 = "sha256-HFOi/3WHljPjDKwp0qpregEONVuV8L+axpG+zPX50So="; inherit (darwin) configd; inherit passthruFun; }; @@ -280,9 +280,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "6"; + patch = "8"; }; - sha256 = "sha256-ghJ/Q/rmznXUfWxFOfjB6jcunC2/pA+ui1g1HVInk6Q="; # linux64 + sha256 = "0h493q0lhpz035afi4g09f4mz5a72vqx4sa7qcry5z4zagxq8bhz"; # linux64 pythonVersion = "2.7"; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index 460af1cc67b4..877a00efa483 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -7,7 +7,6 @@ # Dependencies , bzip2 , zlib -, openssl_1_0_2 , expat , ncurses6 , tcl-8_5 @@ -50,7 +49,6 @@ let deps = [ bzip2 zlib - openssl_1_0_2 expat ncurses6 tcl-8_5 diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index ee610b262026..5f55ed5ecaf1 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -340,13 +340,19 @@ def _update_package(path, target): raise ValueError("no file available for {}.".format(pname)) text = _replace_value('version', new_version, text) + # hashes from pypi are 16-bit encoded sha256's, normalize it to sri to avoid merge conflicts + # sri hashes have been the default format since nix 2.4+ + try: + sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() + except subprocess.CalledProcessError: + # nix<2.4 compat + sri_hash = subprocess.check_output(["nix", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() + # fetchers can specify a sha256, or a sri hash try: - text = _replace_value('sha256', new_sha256, text) + text = _replace_value('sha256', sri_hash, text) except ValueError: - # hashes from pypi are 16-bit encoded sha256's, need translate to an sri hash if used with "hash" - sri_hash = subprocess.check_output(["nix", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip() text = _replace_value('hash', sri_hash, text) if fetcher == 'fetchFromGitHub': diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix index 4bc0ec528a01..cc5487183db3 100644 --- a/pkgs/development/interpreters/quickjs/default.nix +++ b/pkgs/development/interpreters/quickjs/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ stesie AndersonTorres ]; platforms = platforms.linux; license = licenses.mit; + mainProgram = "qjs"; }; } diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 73ce0c1bc81b..bd96562d9e5d 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -37,6 +37,7 @@ let libjpeg libpng mpfr + ncurses openssl pango poppler @@ -48,7 +49,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "8.3"; # always change at once with ./minimal.nix + version = "8.4"; # always change at once with ./minimal.nix src = (lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "sha256-M90MIIRsfF/fhK8twlD3ZRBO0ztQkb4VKp9o8eJUFFc="; + sha256 = "sha256-uJ+vL+FtBNILkFbwi7qZ6yBA1Rcr7o886zmZ/tFuatM="; }; FONTCONFIG_FILE = fontsConf; @@ -69,14 +70,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cacert wrapGAppsHook ]; - buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] - ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ncurses ]; + buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ncurses ] + ++ lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; patches = [ # Hardcode variant detection because we wrap the Racket binary making it # fail to detect its variant at runtime. # See: https://github.com/NixOS/nixpkgs/issues/114993#issuecomment-812951247 ./force-cs-variant.patch + + # The entry point binary $out/bin/racket is codesigned at least once. The + # following error is triggered as a result. + # (error 'add-ad-hoc-signature "file already has a signature") + # We always remove the existing signature then call add-ad-hoc-signature to + # circumvent this error. + ./force-remove-codesign-then-add.patch ]; preConfigure = '' @@ -89,10 +97,34 @@ stdenv.mkDerivation rec { --replace /bin/rm ${coreutils}/bin/rm \ --replace /bin/true ${coreutils}/bin/true done + + # The configure script forces using `libtool -o` as AR on Darwin. But, the + # `-o` option is only available from Apple libtool. GNU ar works here. + substituteInPlace src/ChezScheme/zlib/configure \ + --replace 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"' + mkdir src/build cd src/build - gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${LD_LIBRARY_PATH}) + '' + lib.optionalString stdenv.isLinux '' + gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" ${libPath}) + '' + lib.optionalString stdenv.isDarwin '' + gappsWrapperArgs+=("--prefix" "DYLD_LIBRARY_PATH" ":" ${libPath}) + '' + ; + + preBuild = lib.optionalString stdenv.isDarwin '' + # Cannot set DYLD_LIBRARY_PATH as an attr of this drv, becasue dynamic + # linker environment variables like this are purged. + # See: https://apple.stackexchange.com/a/212954/167199 + + # Make builders feed it to dlopen(...). Do not expose all of $libPath to + # DYLD_LIBRARY_PATH as the order of looking up symbols like + # `__cg_jpeg_resync_to_restart` will be messed up. Our libJPEG.dyllib + # expects it from our libTIFF.dylib, but instead it could not be found from + # the system `libTIFF.dylib`. DYLD_FALLBACK_LIBRARY_PATH has its own problem + # , too. + export DYLD_FALLBACK_LIBRARY_PATH="${libPath}" ''; shared = if stdenv.isDarwin then "dylib" else "shared"; @@ -118,6 +150,6 @@ stdenv.mkDerivation rec { homepage = "https://racket-lang.org/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ kkallio henrytill vrthra ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; }; } diff --git a/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch b/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch new file mode 100644 index 000000000000..c34457ceb950 --- /dev/null +++ b/pkgs/development/interpreters/racket/force-remove-codesign-then-add.patch @@ -0,0 +1,11 @@ +--- old/src/mac/codesign.rkt 2022-01-08 18:25:53.000000000 -0500 ++++ new/src/mac/codesign.rkt 2022-02-15 15:49:51.000000000 -0500 +@@ -17,6 +17,5 @@ + #:args (file) + file)) + +-(if remove? +- (remove-signature file) +- (add-ad-hoc-signature file)) ++(remove-signature file) ++(add-ad-hoc-signature file) diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index c7defc8bfa6b..b73cdaff5d3e 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -2,10 +2,11 @@ }: racket.overrideAttrs (oldAttrs: rec { - name = "racket-minimal-${oldAttrs.version}"; + pname = "racket-minimal"; + version = oldAttrs.version; src = oldAttrs.src.override { - inherit name; - sha256 = "sha256-3GdnP1D0XMW34u4mAronxKXe08A3tawM8cpSC7nDfWI="; + name = "${pname}-${version}"; + sha256 = "sha256-FZlUWvjtioe4S8gPetj7vdneVX6jEFguJo4j2wJsKAw="; }; meta = oldAttrs.meta // { @@ -14,7 +15,7 @@ racket.overrideAttrs (oldAttrs: rec { as well as libraries that live in collections. In particular, raco and the pkg library are still bundled. ''; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; broken = false; # Minimal build does not require working FFI }; }) diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 254228ea55bb..9de6c1b12398 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2021.12"; + version = "2022.02"; src = fetchurl { url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "sha256-f1PSxxONE6sBaS1b19vCjz8p7Ya9ltUoCFb1WhqwVAY="; + sha256 = "sha256-am6dvMbZoWEKNMbsZ+LT9pTXsz6eCg8iRUMIn6f3EzI="; }; nativeBuildInputs = [ removeReferencesTo ]; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index cbc283ce25f2..41462e67a4c9 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2021.12"; + version = "2022.02"; src = fetchurl { url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "sha256-1Ju+sQ2WFsLYen+t0ca7elzhHBnHxEu7i+928ltQXE8="; + sha256 = "sha256-T5PNzmuKVloyKCuzjMlxzv63H10CLIUMM47oFFV07pY="; }; postPatch = '' diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 8a64430d24a0..57cdef94c02d 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2021.12"; + version = "2022.02"; src = fetchurl { url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "sha256-Dh1TT9HuYaTIByMJuvvARmDprnLYhhjaoOjxUCLw2RM="; + sha256 = "sha256-JdPJl0XNhPQEmpvZzya7XcgXklq6r+ccm9tohBzbGLE="; }; buildInputs = [ perl ]; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index d151c6765bf3..7a809875111f 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.13.4"; + version = "0.13.7"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-zTgXMICuLn612bmL5e6GP5aBQ4uOcSLfce0PCRYGob0="; + sha256 = "sha256-FEQwe9MkP+tFZgXiR3hrNS+Jyavj85oYql3uOLP3nwc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/regina/default.upstream b/pkgs/development/interpreters/regina/default.upstream deleted file mode 100644 index 481d9848f830..000000000000 --- a/pkgs/development/interpreters/regina/default.upstream +++ /dev/null @@ -1,5 +0,0 @@ -url https://sourceforge.net/projects/regina-rexx/files/regina-rexx/ -SF_version_dir -SF_version_tarball -SF_redirect -minimize_overwrite diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 8a20fa92857e..ea31f354d0d7 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -166,6 +166,8 @@ let # Bundler tries to create this directory postInstall = '' rbConfig=$(find $out/lib/ruby -name rbconfig.rb) + # Remove references to the build environment from the closure + sed -i '/^ CONFIG\["\(BASERUBY\|SHELL\|GREP\|EGREP\|MKDIR_P\|MAKEDIRS\|INSTALL\)"\]/d' $rbConfig # Remove unnecessary groff reference from runtime closure, since it's big sed -i '/NROFF/d' $rbConfig ${ @@ -203,7 +205,6 @@ let # Add rbconfig shim so ri can find docs mkdir -p $devdoc/lib/ruby/site_ruby cp ${./rbconfig.rb} $devdoc/lib/ruby/site_ruby/rbconfig.rb - sed -i '/^ CONFIG\["\(BASERUBY\|SHELL\|GREP\|EGREP\|MKDIR_P\|MAKEDIRS\|INSTALL\)"\]/d' $rbConfig '' + opString useBaseRuby '' # Prevent the baseruby from being included in the closure. ${removeReferencesTo}/bin/remove-references-to \ @@ -267,10 +268,10 @@ in { }; ruby_3_1 = generic { - version = rubyVersion "3" "1" "0" ""; + version = rubyVersion "3" "1" "1" ""; sha256 = { - src = "sha256-UKBQTG7ctNYc5rjP292qlXBxlfqw7Ne16SZUsqlBKFQ="; - git = "sha256-TcsoWY+zVZeue1/ypV1L0WERp1UVK35WtVtYPYiJh4c="; + src = "sha256-/m5Hgt6XRDl43bqLpL440iKqJNw+PwKmqOdwHA7rYZ0="; + git = "sha256-76t/tGyK5nz7nvcRdHJTjjckU+Kv+/kbTMiNWJ93jU8="; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 2e51670a9f81..b76dc1a23b16 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -10,6 +10,6 @@ "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" ]; - "3.1.0" = ops useRailsExpress [ # no patches yet (2021-12-25) + "3.1.1" = ops useRailsExpress [ # no patches yet (2021-12-25) ]; } diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index ce44624497da..b57cc64fb8d7 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchgit, autoreconfHook, scheme48 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, scheme48 }: stdenv.mkDerivation { pname = "scsh"; version = "0.7pre"; - src = fetchgit { - url = "git://github.com/scheme/scsh.git"; + src = fetchFromGitHub { + owner = "scheme"; + repo = "scsh"; rev = "f99b8c5293628cfeaeb792019072e3a96841104f"; + sha256 = "sha256-vcVtqoUhozdJq1beUN8/rcI2qOJYUN+0CPSiDWGCIjI="; fetchSubmodules = true; - sha256 = "0ci2h9hhv8pl12sdyl2qwal3dhmd7zgm1pjnmd4kg8r1hnm6vidx"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/interpreters/spidermonkey/68.nix b/pkgs/development/interpreters/spidermonkey/68.nix deleted file mode 100644 index a71805f50563..000000000000 --- a/pkgs/development/interpreters/spidermonkey/68.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages -, which, readline, zlib, icu, cargo, rustc, llvmPackages }: - -with lib; - -let - python3Env = buildPackages.python3.withPackages (p: [p.six]); -in stdenv.mkDerivation rec { - pname = "spidermonkey"; - version = "68.12.0"; - - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "1k17pi4zh9hrvkzbw4rzzw879a15hpvwriylp75wl22rl7r2nsdf"; - }; - - patches = [ - # Backport a change from Firefox 75 that fixes finding the - # location of clang and libclang. - (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/ccd1356fc8f1d0bfa9d896e88d3cc924425623da"; - sha256 = "005g3mfmal9nw32khrgyiv3221z7pazfhhm2qvgc8d48i2yzj3j0"; - }) - ]; - - outputs = [ "out" "dev" ]; - setOutputFlags = false; # Configure script only understands --includedir - - nativeBuildInputs = [ - autoconf213 - pkg-config - perl - which - python2 - zip - cargo - rustc - llvmPackages.llvm - ]; - - buildInputs = [ - readline - zlib - icu - ]; - - preConfigure = '' - export CXXFLAGS="-fpermissive" - export LIBXUL_DIST=$out - export PYTHON3="${python3Env.interpreter}" - - # We can't build in js/src/, so create a build dir - mkdir obj - cd obj/ - configureScript=../js/src/configure - ''; - - configureFlags = [ - # Reccommended by gjs upstream - "--disable-jemalloc" - "--enable-unaligned-private-values" - "--with-intl-api" - "--enable-posix-nspr-emulation" - "--with-system-zlib" - "--with-system-icu" - - "--enable-shared-js" - "--enable-readline" - # Fedora and Arch disable optimize, but it doesn't seme to be necessary - # It turns on -O3 which some gcc version had a problem with: - # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e - "--enable-optimize" - "--enable-release" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # Spidermonkey seems to use different host/build terminology for cross - # compilation here. - "--host=${stdenv.buildPlatform.config}" - "--target=${stdenv.hostPlatform.config}" - ]; - - # mkDerivation by default appends --build/--host to configureFlags when cross compiling - # These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list - configurePlatforms = []; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - # Remove unnecessary static lib - preFixup = '' - moveToOutput bin/js60-config "$dev" - rm $out/lib/libjs_static.ajs - ln -s $out/bin/js60 $out/bin/js - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://developer.mozilla.org/en/SpiderMonkey"; - license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. - maintainers = [ maintainers.abbradar ]; - badPlatforms = [ "riscv32-linux" "riscv64-linux" ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix index 4f525c8f0a5b..f2a68158266b 100644 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ b/pkgs/development/interpreters/spidermonkey/78.nix @@ -15,7 +15,6 @@ , rustc , rust-cbindgen , yasm -, llvmPackages_12 , nspr }: @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf213 cargo - llvmPackages_12.llvm # for llvm-objdump + rustc.llvmPackages.llvm # for llvm-objdump perl pkg-config python3 diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index 61b340ac185f..fede01c0ada7 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -13,18 +13,17 @@ , rustc , rust-cbindgen , yasm -, llvmPackages_latest , nspr , m4 }: stdenv.mkDerivation rec { pname = "spidermonkey"; - version = "91.5.0"; + version = "91.7.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "04y8nj1f065b3dn354f1ns3cm9xp4kljr5ippvmfdqr7cb4xjp7l"; + sha512 = "925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301"; }; outputs = [ "out" "dev" ]; @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cargo - llvmPackages_latest.llvm # for llvm-objdump + rustc.llvmPackages.llvm # for llvm-objdump perl pkg-config python3 diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix index 6c6268011a73..d6dc01348a1d 100644 --- a/pkgs/development/interpreters/trealla/default.nix +++ b/pkgs/development/interpreters/trealla/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trealla"; - version = "1.12.0"; + version = "1.20.31"; src = fetchFromGitHub { owner = "infradig"; repo = "trealla"; rev = "v${version}"; - sha256 = "sha256-5gMf62WSGf46Bg8CaI9weSMRjrdGiuxtaDV9FrS2xO8="; + sha256 = "sha256-Yol+bbxC5cCtCIZxP5Sa8R3ev1LAopc/oQa6Zd1nS8A="; }; postPatch = '' diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 6022245cac73..816b854b99eb 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, lib, python2, cmake, llvmPackages, clang, stdenv, darwin }: +{ rustPlatform, fetchFromGitHub, lib, python3, cmake, llvmPackages, clang, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "wasmtime"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1wlig9gls7s1k1swxwhl82vfga30bady8286livxc4y2zp0vb18w"; - nativeBuildInputs = [ python2 cmake clang ]; + nativeBuildInputs = [ python3 cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix index d0a13f62520f..f223e205220d 100644 --- a/pkgs/development/java-modules/m2install.nix +++ b/pkgs/development/java-modules/m2install.nix @@ -2,15 +2,15 @@ { version, artifactId, groupId, sha512, type ? "jar", suffix ? "" }: let - name = "${artifactId}-${version}"; m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}"; - m2File = "${name}${suffix}.${type}"; + m2File = "${artifactId}-${version}${suffix}.${type}"; src = fetchurl { inherit sha512; url = "mirror://maven/${m2Path}/${m2File}"; }; in stdenv.mkDerivation { - inherit name m2Path m2File src; + inherit version m2Path m2File src; + pname = artifactId; dontUnpack = true; diff --git a/pkgs/development/java-modules/maven-fod.nix b/pkgs/development/java-modules/maven-fod.nix new file mode 100644 index 000000000000..5b65c83c659c --- /dev/null +++ b/pkgs/development/java-modules/maven-fod.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, maven +}: + +{ src +, patches ? [] +, pname +, version +, mvnSha256 ? "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" +, mvnHash ? "sha256-${mvnSha256}" +, mvnFetchExtraArgs ? {} +, mvnParameters ? "" +, ... +} @args: + +# originally extracted from dbeaver +# created to allow using maven packages in the same style as rust + +stdenv.mkDerivation (rec { + fetchedMavenDeps = stdenv.mkDerivation ({ + name = "${pname}-${version}-maven-deps"; + inherit src; + + buildInputs = [ + maven + ]; + + buildPhase = '' + mvn package -Dmaven.repo.local=$out/.m2 ${mvnParameters} + ''; + + # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside + installPhase = '' + find $out -type f \ + -name \*.lastUpdated -or \ + -name resolver-status.properties -or \ + -name _remote.repositories \ + -delete + ''; + + # don't do any fixup + dontFixup = true; + outputHashMode = "recursive"; + outputHash = mvnHash; + } // mvnFetchExtraArgs); + + buildPhase = '' + runHook preBuild + + mvnDeps=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd) + mvn package --offline "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnParameters} + + runHook postBuild + ''; +} // args) diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix index a1d3c183b8e2..9c0305ec077d 100644 --- a/pkgs/development/libraries/CGAL/4.nix +++ b/pkgs/development/libraries/CGAL/4.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "4.14.2"; - name = "cgal-" + version; + pname = "cgal"; src = fetchFromGitHub { owner = "CGAL"; @@ -18,18 +18,14 @@ stdenv.mkDerivation rec { (fetchpatch { name = "gcc-12-prereq.patch"; url = "https://github.com/CGAL/cgal/commit/4581f1b7a8e97d1a136830e64b77cdae3546c4bf.patch"; - sha256 = "1gzrvbrwxylv80v0m3j2s1znlysmr69lp3ggagnh38lp6423i6pq"; - # Upstream slightly reordered directory structure since. - stripLen = 1; - # Fill patch does not apply: touches too many parts of the source. - includes = [ "include/CGAL/CORE/BigFloatRep.h" ]; + relative = "CGAL_Core"; # Upstream slightly reordered directory structure since. + sha256 = "sha256-4+7mzGSBwAv5RHBQPAecPPKNN/LQBgvYq5mq+fHAteo="; }) (fetchpatch { name = "gcc-12.patch"; url = "https://github.com/CGAL/cgal/commit/6680a6e6f994b2c5b9f068eb3014d12ee1134d53.patch"; - sha256 = "1c0h1lh8zng60yx78qc8wx714b517mil8mac87v6xr21q0b11wk7"; - # Upstream slightly reordered directory structure since. - stripLen = 1; + relative = "CGAL_Core"; # Upstream slightly reordered directory structure since. + sha256 = "sha256-8kxJDT47jXI9kQNFI/ARWl9JBNS4AfU57/D0tYlgW0M="; }) ]; diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 630ff8a6964f..2f2a0905d542 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.3.1"; + version = "5.4"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "sha256-atILY/d2b99v0Kk226KwJ/qEcJnWBhtge52wkz6Bgcg="; + sha256 = "sha256-flrVWsvGAdGVCZ1Ygy9z30w6aU8WAzpMLv+JbP2CKjE="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/development/libraries/LAStools/default.nix index f9f3b09ba0ac..80641446d4d0 100644 --- a/pkgs/development/libraries/LAStools/default.nix +++ b/pkgs/development/libraries/LAStools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "LAStools"; - version = "201003"; # LAStools makes release-ish commits with a message containing their version number as YYMMDD; these align with their website changelog + version = "2.0.1"; src = fetchFromGitHub { owner = "LAStools"; repo = "LAStools"; - rev = "635b76b42cc4912762da31b92f875df5310e1714"; - sha256 = "0682ca3bp51lmfp46vsjnd1bqpn05g95pf4kclvjv1y8qivkxsaq"; + rev = "v${version}"; + sha256 = "sha256-Mxic/zLk/qkB/rSlvkLZPgtNscrTrzSzrxiqXAMeDVU="; }; patches = [ diff --git a/pkgs/development/libraries/SDL2/Fix-build-against-wayland-1.20.patch b/pkgs/development/libraries/SDL2/Fix-build-against-wayland-1.20.patch deleted file mode 100644 index 1be600bedb35..000000000000 --- a/pkgs/development/libraries/SDL2/Fix-build-against-wayland-1.20.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a31d1f1683ef2e9c063c3fa1db79d111cca99414 Mon Sep 17 00:00:00 2001 -From: David Redondo -Date: Fri, 10 Dec 2021 16:22:34 +0100 -Subject: [PATCH] Fix build against wayland 1.20 - -Fixes #5088 - -(cherry picked from commit e2ade2bfc46d915cd306c63c830b81d800b2575f) ---- - src/video/wayland/SDL_waylanddyn.h | 2 ++ - src/video/wayland/SDL_waylandsym.h | 4 ++++ - 2 files changed, 6 insertions(+) - -diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h -index 485a9c19f..37070e946 100644 ---- a/src/video/wayland/SDL_waylanddyn.h -+++ b/src/video/wayland/SDL_waylanddyn.h -@@ -81,6 +81,8 @@ void SDL_WAYLAND_UnloadSymbols(void); - #define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener) - #define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor) - #define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned) -+#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags) -+#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags) - - #define wl_seat_interface (*WAYLAND_wl_seat_interface) - #define wl_surface_interface (*WAYLAND_wl_surface_interface) -diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h -index c4c189d3c..789f49e27 100644 ---- a/src/video/wayland/SDL_waylandsym.h -+++ b/src/video/wayland/SDL_waylandsym.h -@@ -71,6 +71,10 @@ SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_prox - SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10) - SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, ...)) - -+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20) -+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...)) -+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, uint32_t flags, union wl_argument *args)) -+ - SDL_WAYLAND_INTERFACE(wl_seat_interface) - SDL_WAYLAND_INTERFACE(wl_surface_interface) - SDL_WAYLAND_INTERFACE(wl_shm_pool_interface) --- -2.33.1 diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 95022211d2f7..d1086de3718d 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,20 +1,50 @@ -{ lib, stdenv, config, fetchurl, pkg-config +{ lib +, stdenv +, config +, fetchurl +, pkg-config , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, openglSupport ? libGLSupported, libGL -, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsa-lib +, openglSupport ? libGLSupported +, libGL +, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, alsa-lib , x11Support ? !stdenv.targetPlatform.isWindows && !stdenv.hostPlatform.isAndroid -, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor -, libXinerama, libXext, libXxf86vm, libXrandr +, libX11 +, xorgproto +, libICE +, libXi +, libXScrnSaver +, libXcursor +, libXinerama +, libXext +, libXxf86vm +, libXrandr , waylandSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid -, wayland, wayland-protocols, libxkbcommon -, dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, dbus -, udevSupport ? false, udev -, ibusSupport ? false, ibus -, fcitxSupport ? false, fcitx +, wayland +, wayland-protocols +, libxkbcommon +, dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, dbus +, udevSupport ? false +, udev +, ibusSupport ? false +, ibus +, fcitxSupport ? false +, fcitx +, libdecorSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, libdecor +, pipewireSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid +, pipewire # NOTE: must be built with SDL2 without pipewire support , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux && !stdenv.hostPlatform.isAndroid , libpulseaudio -, AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL -, audiofile, libiconv +, AudioUnit +, Cocoa +, CoreAudio +, CoreServices +, ForceFeedback +, OpenGL +, audiofile +, libiconv , withStatic ? false }: @@ -25,32 +55,16 @@ with lib; stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.0.14"; + version = "2.0.20"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "1g1jahknv5r4yhh1xq5sf0md20ybdw1zh1i15lry26sq39bmn8fq"; + sha256 = "sha256-xWq6HXtbDn6Znkp2mMcLY6M5T/lwS19uHFfgwW8E3QY="; }; dontDisableStatic = withStatic; outputs = [ "out" "dev" ]; outputBin = "dev"; # sdl-config - patches = [ - ./find-headers.patch - # To fix the build with wayland 1.20.0: - ./Fix-build-against-wayland-1.20.patch - ]; - - # Fix with mesa 19.2: https://bugzilla.libsdl.org/show_bug.cgi?id=4797 - postPatch = '' - substituteInPlace include/SDL_opengl_glext.h \ - --replace "typedef ptrdiff_t GLsizeiptr;" "typedef signed long int khronos_ssize_t; typedef khronos_ssize_t GLsizeiptr;" \ - --replace "typedef ptrdiff_t GLintptr;" "typedef signed long int khronos_intptr_t; typedef khronos_intptr_t GLintptr;" - - substituteInPlace configure \ - --replace 'WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`' 'WAYLAND_SCANNER=`pkg-config --variable=wayland_scanner wayland-scanner`' - ''; - depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland ]; @@ -63,18 +77,19 @@ stdenv.mkDerivation rec { # Propagated for #include and in SDL_syswm.h. ++ optionals x11Support [ libX11 xorgproto ]; - dlopenBuildInputs = [ ] - ++ optionals alsaSupport [ alsa-lib audiofile ] - ++ optional dbusSupport dbus - ++ optional pulseaudioSupport libpulseaudio - ++ optional udevSupport udev + dlopenBuildInputs = optionals alsaSupport [ alsa-lib audiofile ] + ++ optional dbusSupport dbus + ++ optional libdecorSupport libdecor + ++ optional pipewireSupport pipewire + ++ optional pulseaudioSupport libpulseaudio + ++ optional udevSupport udev ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ]; buildInputs = [ libiconv ] ++ dlopenBuildInputs - ++ optional ibusSupport ibus - ++ optional fcitxSupport fcitx + ++ optional ibusSupport ibus + ++ optional fcitxSupport fcitx ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; enableParallelBuilding = true; @@ -82,9 +97,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-oss" ] ++ optional (!x11Support) "--without-x" - ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" - ++ optional stdenv.targetPlatform.isWindows "--disable-video-opengles" - ++ optional stdenv.isDarwin "--disable-sdltest"; + ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" + ++ optional stdenv.targetPlatform.isWindows "--disable-video-opengles" + ++ optional stdenv.isDarwin "--disable-sdltest"; # We remove libtool .la files when static libs are requested, # because they make the builds of downstream libs like `SDL_tff` @@ -117,15 +132,17 @@ stdenv.mkDerivation rec { # # You can grep SDL sources with `grep -rE 'SDL_(NAME|.*_SYM)'` to # list the symbols used in this way. - postFixup = let - rpath = makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs); - in optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") '' - for lib in $out/lib/*.so* ; do - if ! [[ -L "$lib" ]]; then - patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib" - fi - done - ''; + postFixup = + let + rpath = makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs); + in + optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") '' + for lib in $out/lib/*.so* ; do + if ! [[ -L "$lib" ]]; then + patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib" + fi + done + ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch deleted file mode 100644 index a2e0c4837031..000000000000 --- a/pkgs/development/libraries/SDL2/find-headers.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ru3 SDL2-2.0.14/sdl2-config.cmake.in SDL2-2.0.14-new/sdl2-config.cmake.in ---- SDL2-2.0.14/sdl2-config.cmake.in 2020-12-21 18:44:36.000000000 +0100 -+++ SDL2-2.0.14-new/sdl2-config.cmake.in 2021-01-16 23:53:40.721121792 +0100 -@@ -6,7 +6,8 @@ - set(SDL2_PREFIX "@prefix@") - set(SDL2_EXEC_PREFIX "@prefix@") - set(SDL2_LIBDIR "@libdir@") --set(SDL2_INCLUDE_DIRS "@includedir@/SDL2") -+set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH}) -+separate_arguments(SDL2_INCLUDE_DIRS) - set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") - string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES) - -@@ -20,14 +21,14 @@ - - add_library(SDL2::SDL2 SHARED IMPORTED) - set_target_properties(SDL2::SDL2 PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" -+ INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "@libdir@/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2${CMAKE_SHARED_LIBRARY_SUFFIX}" - INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}") - - add_library(SDL2::SDL2-static STATIC IMPORTED) - set_target_properties(SDL2::SDL2-static PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2" -+ INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "@libdir@/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2${CMAKE_STATIC_LIBRARY_SUFFIX}" - INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}") -diff -ru3 SDL2-2.0.14/sdl2-config.in SDL2-2.0.14-new/sdl2-config.in ---- SDL2-2.0.14/sdl2-config.in 2020-12-21 18:44:36.000000000 +0100 -+++ SDL2-2.0.14-new/sdl2-config.in 2021-01-16 23:57:11.940353171 +0100 -@@ -42,7 +42,11 @@ - echo @SDL_VERSION@ - ;; - --cflags) -- echo -I@includedir@/SDL2 @SDL_CFLAGS@ -+ SDL_CFLAGS="" -+ for i in @includedir@/SDL2 $SDL2_PATH; do -+ SDL_CFLAGS="$SDL_CFLAGS -I$i" -+ done -+ echo $SDL_CFLAGS @SDL_CFLAGS@ - ;; - @ENABLE_SHARED_TRUE@ --libs) - @ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ diff --git a/pkgs/development/libraries/SDL2_sound/default.nix b/pkgs/development/libraries/SDL2_sound/default.nix new file mode 100644 index 000000000000..3a2d05c31a10 --- /dev/null +++ b/pkgs/development/libraries/SDL2_sound/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, SDL2 +, flac +, libmikmod +, libvorbis +, timidity +, AudioToolbox +, CoreAudio +}: + +stdenv.mkDerivation rec { + pname = "SDL2_sound"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "icculus"; + repo = "SDL_sound"; + rev = "v${version}"; + sha256 = "sha256-N2znqy58tMHgYa07vEsSedWLRhoJzDoINcsUu0UYLnA="; + }; + + patches = [ + (fetchpatch { + # https://github.com/icculus/SDL_sound/pull/32 - fix build on darwin + # can be dropped on the next update + url = "https://github.com/icculus/SDL_sound/commit/c15d75b7720113b28639baad284f45f943846294.patch"; + sha256 = "sha256-4GL8unsZ7eNkzjLXq9QdaxFQMzX2tdP0cBR1jTaRLc0="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DSDLSOUND_DECODER_MIDI=1" ]; + + buildInputs = [ SDL2 flac libmikmod libvorbis timidity ] + ++ lib.optionals stdenv.isDarwin [ AudioToolbox CoreAudio ]; + + meta = with lib; { + description = "SDL2 sound library"; + platforms = platforms.unix; + license = licenses.zlib; + homepage = "https://www.icculus.org/SDL_sound/"; + }; +} diff --git a/pkgs/development/libraries/SDL2_ttf/2.0.15.nix b/pkgs/development/libraries/SDL2_ttf/2.0.15.nix new file mode 100644 index 000000000000..a5057c0fbec8 --- /dev/null +++ b/pkgs/development/libraries/SDL2_ttf/2.0.15.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, libGL }: + +stdenv.mkDerivation rec { + pname = "SDL2_ttf"; + version = "2.0.15"; + + src = fetchurl { + url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; + sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"; + }; + + configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ SDL2 freetype libGL ] + ++ lib.optional stdenv.isDarwin darwin.libobjc; + + meta = with lib; { + description = "SDL TrueType library"; + platforms = platforms.unix; + license = licenses.zlib; + homepage = "https://www.libsdl.org/projects/SDL_ttf/"; + }; +} diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index a5057c0fbec8..6975dfff24ae 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SDL2_ttf"; - version = "2.0.15"; + version = "2.0.18"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_ttf/release/${pname}-${version}.tar.gz"; - sha256 = "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"; + sha256 = "sha256-cjTriINRTgGed0fHA+SndFdbGNQ1wipKKdBoy3aKIlE="; }; configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin darwin.libobjc; meta = with lib; { - description = "SDL TrueType library"; + description = "Support for TrueType (.ttf) font files with Simple Directmedia Layer"; platforms = platforms.unix; license = licenses.zlib; - homepage = "https://www.libsdl.org/projects/SDL_ttf/"; + homepage = "https://github.com/libsdl-org/SDL_ttf"; }; } diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/202103.nix similarity index 94% rename from pkgs/development/libraries/abseil-cpp/default.nix rename to pkgs/development/libraries/abseil-cpp/202103.nix index 2ade512de310..d2a1f389324c 100644 --- a/pkgs/development/libraries/abseil-cpp/default.nix +++ b/pkgs/development/libraries/abseil-cpp/202103.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "abseil"; repo = "abseil-cpp"; rev = version; - sha256 = "0g9rbhk3mwjdfxk7cscd04vm8fphd5flz9yykpgvyy1nwa34zk3x"; + sha256 = "sha256-fcxPhuI2eL/fnd6nT11p8DpUNwGNaXZmd03yOiZcOT0="; }; patches = [ diff --git a/pkgs/development/libraries/abseil-cpp/202111.nix b/pkgs/development/libraries/abseil-cpp/202111.nix new file mode 100644 index 000000000000..d40ca0bd4ab2 --- /dev/null +++ b/pkgs/development/libraries/abseil-cpp/202111.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, static ? stdenv.hostPlatform.isStatic +, cxxStandard ? null +}: + +stdenv.mkDerivation rec { + pname = "abseil-cpp"; + version = "20211102.0"; + + src = fetchFromGitHub { + owner = "abseil"; + repo = "abseil-cpp"; + rev = version; + sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk="; + }; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + ] ++ lib.optionals (cxxStandard != null) [ + "-DCMAKE_CXX_STANDARD=${cxxStandard}" + ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "An open-source collection of C++ code designed to augment the C++ standard library"; + homepage = "https://abseil.io/"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.andersk ]; + }; +} diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index bd6f2545b3b0..efe9640af6fd 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , substituteAll , pkg-config , glib @@ -14,20 +13,39 @@ , dbus , ninja , python3 +, vala , gettext }: stdenv.mkDerivation rec { pname = "accountsservice"; - version = "0.6.55"; + version = "22.08.8"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "16wwd633jak9ajyr1f1h047rmd09fhf3kzjz6g5xjsz0lwcj8azz"; + url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; + sha256 = "kJmXp2kZ/n3BOKmgHOpwvWItWpMtvJ+xMBARMCOno5E="; }; + patches = [ + # Hardcode dependency paths. + (substituteAll { + src = ./fix-paths.patch; + inherit shadow coreutils; + }) + + # Do not try to create directories in /var, that will not work in Nix sandbox. + ./no-create-dirs.patch + + # Disable mutating D-Bus methods with immutable /etc. + ./Disable-methods-that-change-files-in-etc.patch + + # Do not ignore third-party (e.g Pantheon) extensions not matching FHS path scheme. + # Fixes https://github.com/NixOS/nixpkgs/issues/72396 + ./drop-prefix-check-extensions.patch + ]; + nativeBuildInputs = [ dbus gettext @@ -36,6 +54,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 + vala ]; buildInputs = [ @@ -48,7 +67,6 @@ stdenv.mkDerivation rec { "-Dadmin_group=wheel" "-Dlocalstatedir=/var" "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" - "-Dsystemd=true" ]; postPatch = '' @@ -56,42 +74,11 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - patches = [ - # https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/55 - (fetchpatch { - url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/-/merge_requests/58.patch"; - sha256 = "1pnwq4ycnryb2kkgvnz44qzm71240ybqj6507wynlkdsw8180fdw"; - }) - (substituteAll { - src = ./fix-paths.patch; - inherit shadow coreutils; - }) - ./no-create-dirs.patch - ./Disable-methods-that-change-files-in-etc.patch - # Fixes https://github.com/NixOS/nixpkgs/issues/72396 - ./drop-prefix-check-extensions.patch - # Systemd unit improvements. Notably using StateDirectory eliminating the - # need of an ad-hoc script. - (fetchpatch { - url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/commit/152b845bbd3ca2a64516691493a160825f1a2046.patch"; - sha256 = "114wrf5mwj5bgc5v1g05md4ridcnwdrwppr3bjz96sknwh5hk8s5"; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/commit/0e712e935abd26499ff5995ab363e5bfd9ee7c4c.patch"; - sha256 = "1y60a5fmgfqjzprwpizilrazqn3mggdlgc5sgcpsprsp62fv78rl"; - }) - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://gitlab.freedesktop.org/accountsservice/accountsservice/commit/ced73d0fcbd2a54085a660d260482fc70d79bd5c.patch"; - sha256 = "0s7fknfgxl8hnf6givmhfg4586fjb2n64i9arh1w7xnq7x9x8d4c"; - }) - ]; - meta = with lib; { description = "D-Bus interface for user account query and manipulation"; homepage = "https://www.freedesktop.org/wiki/Software/AccountsService"; - license = licenses.gpl3; - maintainers = with maintainers; [ pSub ]; + license = licenses.gpl3Plus; + maintainers = teams.freedesktop.members ++ (with maintainers; [ pSub ]); platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/accountsservice/fix-paths.patch b/pkgs/development/libraries/accountsservice/fix-paths.patch index 78d7a8081bfd..0ed8e04579f4 100644 --- a/pkgs/development/libraries/accountsservice/fix-paths.patch +++ b/pkgs/development/libraries/accountsservice/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/daemon.c b/src/daemon.c -index c52bda3..75d214e 100644 +index c8b6320..2b74949 100644 --- a/src/daemon.c +++ b/src/daemon.c -@@ -1106,7 +1106,7 @@ daemon_create_user_authorized_cb (Daemon *daemon, +@@ -1102,7 +1102,7 @@ daemon_create_user_authorized_cb (Daemon *daemon, sys_log (context, "create user '%s'", cd->user_name); @@ -11,9 +11,9 @@ index c52bda3..75d214e 100644 argv[1] = "-m"; argv[2] = "-c"; argv[3] = cd->real_name; -@@ -1318,7 +1318,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon, - - user_set_saved (user, FALSE); +@@ -1335,7 +1335,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon, + } + free (resolved_homedir); - argv[0] = "/usr/sbin/userdel"; + argv[0] = "@shadow@/bin/userdel"; @@ -21,19 +21,19 @@ index c52bda3..75d214e 100644 argv[1] = "-f"; argv[2] = "-r"; diff --git a/src/user.c b/src/user.c -index 9f57af5..e65289d 100644 +index 189b2c5..5358c02 100644 --- a/src/user.c +++ b/src/user.c -@@ -844,7 +844,7 @@ user_change_real_name_authorized_cb (Daemon *daemon, - accounts_user_get_uid (ACCOUNTS_USER (user)), - name); +@@ -1145,7 +1145,7 @@ user_change_real_name_authorized_cb (Daemon *daemon, + new_gecos = g_strdup (name); + } - argv[0] = "/usr/sbin/usermod"; + argv[0] = "@shadow@/bin/usermod"; argv[1] = "-c"; - argv[2] = name; + argv[2] = new_gecos; argv[3] = "--"; -@@ -913,7 +913,7 @@ user_change_user_name_authorized_cb (Daemon *daemon, +@@ -1218,7 +1218,7 @@ user_change_user_name_authorized_cb (Daemon *daemon, accounts_user_get_uid (ACCOUNTS_USER (user)), name); @@ -42,7 +42,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-l"; argv[2] = name; argv[3] = "--"; -@@ -1321,7 +1321,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon, +@@ -1627,7 +1627,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon, accounts_user_get_uid (ACCOUNTS_USER (user)), home_dir); @@ -51,7 +51,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-m"; argv[2] = "-d"; argv[3] = home_dir; -@@ -1378,7 +1378,7 @@ user_change_shell_authorized_cb (Daemon *daemon, +@@ -1683,7 +1683,7 @@ user_change_shell_authorized_cb (Daemon *daemon, accounts_user_get_uid (ACCOUNTS_USER (user)), shell); @@ -60,7 +60,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-s"; argv[2] = shell; argv[3] = "--"; -@@ -1520,7 +1520,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon, +@@ -1824,7 +1824,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon, return; } @@ -69,7 +69,7 @@ index 9f57af5..e65289d 100644 argv[1] = filename; argv[2] = NULL; -@@ -1601,7 +1601,7 @@ user_change_locked_authorized_cb (Daemon *daemon, +@@ -1904,7 +1904,7 @@ user_change_locked_authorized_cb (Daemon *daemon, locked ? "locking" : "unlocking", accounts_user_get_user_name (ACCOUNTS_USER (user)), accounts_user_get_uid (ACCOUNTS_USER (user))); @@ -78,7 +78,7 @@ index 9f57af5..e65289d 100644 argv[1] = locked ? "-L" : "-U"; argv[2] = "--"; argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -1726,7 +1726,7 @@ user_change_account_type_authorized_cb (Daemon *daemon, +@@ -2026,7 +2026,7 @@ user_change_account_type_authorized_cb (Daemon *daemon, g_free (groups); @@ -87,7 +87,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-G"; argv[2] = str->str; argv[3] = "--"; -@@ -1794,7 +1794,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, +@@ -2093,7 +2093,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, if (mode == PASSWORD_MODE_SET_AT_LOGIN || mode == PASSWORD_MODE_NONE) { @@ -96,7 +96,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-d"; argv[2] = "--"; argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -1806,7 +1806,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, +@@ -2105,7 +2105,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, } if (mode == PASSWORD_MODE_SET_AT_LOGIN) { @@ -105,7 +105,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-d"; argv[2] = "0"; argv[3] = "--"; -@@ -1827,7 +1827,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, +@@ -2126,7 +2126,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, accounts_user_set_locked (ACCOUNTS_USER (user), FALSE); } else if (accounts_user_get_locked (ACCOUNTS_USER (user))) { @@ -114,7 +114,7 @@ index 9f57af5..e65289d 100644 argv[1] = "-U"; argv[2] = "--"; argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -1905,7 +1905,7 @@ user_change_password_authorized_cb (Daemon *daemon, +@@ -2203,7 +2203,7 @@ user_change_password_authorized_cb (Daemon *daemon, g_object_freeze_notify (G_OBJECT (user)); diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/pkgs/development/libraries/accountsservice/no-create-dirs.patch index 0333f925d267..5d137eb52a11 100644 --- a/pkgs/development/libraries/accountsservice/no-create-dirs.patch +++ b/pkgs/development/libraries/accountsservice/no-create-dirs.patch @@ -1,15 +1,17 @@ diff --git a/meson_post_install.py b/meson_post_install.py -index 5cc2dc4..dd27ad5 100644 +index d8c3dd1..620f714 100644 --- a/meson_post_install.py +++ b/meson_post_install.py -@@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1]) +@@ -9,9 +9,9 @@ localstatedir = os.path.normpath(destdir + os.sep + sys.argv[1]) # FIXME: meson will not track the creation of these directories # https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39 dst_dirs = [ +- (os.path.join(localstatedir, 'lib'), 0o755), - (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), - (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), -+# (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), -+# (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), ++ # (os.path.join(localstatedir, 'lib'), 0o755), ++ # (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775), ++ # (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700), ] for (dst_dir, dst_dir_mode) in dst_dirs: diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index df390ec1668d..9616c13cc40c 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ace"; - version = "7.0.5"; + version = "7.0.6"; src = fetchurl { url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "sha256-Q4v0HhhKUmLit5+V7bb9g4T7fqaeJJxU512vBZqNl1c="; + sha256 = "sha256-SgzX2khR92n9388z9mPrpK+tgk7+/59Z8TTEZA7oAhY="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/aften/default.nix b/pkgs/development/libraries/aften/default.nix index 488c5b6e729a..11ed0f1b28b7 100644 --- a/pkgs/development/libraries/aften/default.nix +++ b/pkgs/development/libraries/aften/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "http://aften.sourceforge.net/"; license = licenses.lgpl21Only; platforms = platforms.unix; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/libraries/alglib/default.nix b/pkgs/development/libraries/alglib/default.nix new file mode 100644 index 000000000000..1ff34a8d1f16 --- /dev/null +++ b/pkgs/development/libraries/alglib/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, cmake, clang }: + +stdenv.mkDerivation rec { + pname = "alglib3"; + version = "3.18.0"; + + src = fetchurl { + url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz"; + sha256 = "0ag8dvcxzzp9riqvk4lhcbwhvh0lq54lbdnsbyr107rjfi2p1vlq"; + }; + + nativeBuildInputs = [ + cmake + clang + ]; + + patches = [ + ./patch-alglib-CMakeLists.patch + ]; + + meta = with lib; { + description = "Numerical analysis and data processing library"; + homepage = "https://www.alglib.net/"; + license = lib.licenses.gpl2Plus; + maintainers = [ maintainers.paperdigits ]; + longDescription = '' + ALGLIB is a cross-platform numerical analysis and data processing library. It supports several programming languages (C++, C#, Delphi) and several operating systems (Windows and POSIX, including Linux). ALGLIB features include: + + * Data analysis (classification/regression, statistics) + * Optimization and nonlinear solvers + * Interpolation and linear/nonlinear least-squares fitting + * Linear algebra (direct algorithms, EVD/SVD), direct and iterative linear solvers + * Fast Fourier Transform and many other algorithms + ''; + }; +} diff --git a/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch b/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch new file mode 100644 index 000000000000..b91a0c0aefd6 --- /dev/null +++ b/pkgs/development/libraries/alglib/patch-alglib-CMakeLists.patch @@ -0,0 +1,23 @@ +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,20 @@ ++cmake_minimum_required(VERSION 2.8) ++ ++project(alglib3 CXX) ++ ++file(GLOB_RECURSE sources src/*.cpp) ++file(GLOB_RECURSE headers src/*.h) ++ ++add_library(${PROJECT_NAME} STATIC ${sources} ${headers}) ++ ++install( ++ TARGETS ${PROJECT_NAME} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++ ++install( ++ FILES ${headers} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alglib ++) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 16fb32cf011f..1001dc62673a 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2022.Q1.1"; + version = "2022.Q1.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "jdAFIC2JYPqCADx/73KM6E3rLFWF4SlEdY9lCK1NOhU="; + sha256 = "UBvHWgC/s00XPn87DAmQ65NszFMoZSXwbrVG064HFng="; }; buildInputs = [ diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index b188754607d5..9776e85b4350 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-activemq"; - version = "5.16.3"; + version = "5.16.4"; src = fetchurl { - sha256 = "sha256-GEbaKYXsZCU+zEGlTxR3cx60dQ/oQKndn9/uiOXJQlI="; + sha256 = "sha256-+OBNioEBQbOGpcnDlgtfAej+c0YfTJmxkeEV1JOEBwE="; url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; }; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index c39ea78a7757..9b07697a6a9a 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -14,27 +14,31 @@ , glib , xapian , libxml2 +, libxmlb , libyaml , gobject-introspection , pcre , itstool , gperf , vala -, lmdb , curl +, nixosTests }: stdenv.mkDerivation rec { pname = "appstream"; - version = "0.14.4"; + version = "0.15.2"; + # When bumping this package, please also check whether + # fix-build-for-qt-olderthan-514.patch still applies by + # building libsForQt512.appstream-qt. - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "installedTests" ]; src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; rev = "v${version}"; - sha256 = "sha256-DJXCw50f+8c58bJw6xx0ECfkc9/KcWaeA+ne2zmTyhg="; + sha256 = "sha256-/JZ49wjtcInbGUOVVjevVSrLCHcA60FMT165rhfb78Q="; }; patches = [ @@ -43,6 +47,9 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; libstemmer_includedir = "${lib.getDev libstemmer}/include"; }) + + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch ]; nativeBuildInputs = [ @@ -65,9 +72,9 @@ stdenv.mkDerivation rec { glib xapian libxml2 + libxmlb libyaml gperf - lmdb curl ]; @@ -75,8 +82,15 @@ stdenv.mkDerivation rec { "-Dapidocs=false" "-Ddocs=false" "-Dvapi=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; + passthru = { + tests = { + installed-tests = nixosTests.installed-tests.appstream; + }; + }; + meta = with lib; { description = "Software metadata handling library"; homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; @@ -88,5 +102,5 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.unix; - }; + }; } diff --git a/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch b/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch new file mode 100644 index 000000000000..35db2bec914e --- /dev/null +++ b/pkgs/development/libraries/appstream/fix-build-for-qt-olderthan-514.patch @@ -0,0 +1,43 @@ +diff --git a/qt/component.h b/qt/component.h +index 47abd1f3..74de943c 100644 +--- a/qt/component.h ++++ b/qt/component.h +@@ -90,7 +90,7 @@ class APPSTREAMQT_EXPORT Component { + UrlKindContact, + + // deprecated +- UrlTranslate [[deprecated]] = UrlKindTranslate, ++ UrlTranslate = UrlKindTranslate, + }; + Q_ENUM(UrlKind) + +diff --git a/qt/pool.h b/qt/pool.h +index b59829b7..5237f613 100644 +--- a/qt/pool.h ++++ b/qt/pool.h +@@ -70,9 +70,9 @@ public: + FlagMonitor = 1 << 7, + + // deprecated +- FlagReadCollection [[deprecated]] = FlagLoadOsCollection, +- FlagReadMetainfo [[deprecated]] = FlagLoadOsMetainfo, +- FlagReadDesktopFiles [[deprecated]] = FlagLoadOsDesktopFiles, ++ FlagReadCollection = FlagLoadOsCollection, ++ FlagReadMetainfo = FlagLoadOsMetainfo, ++ FlagReadDesktopFiles = FlagLoadOsDesktopFiles, + }; + + /** +@@ -84,9 +84,9 @@ public: + * Flags on how caching should be used. + **/ + enum CacheFlags { +- CacheFlagNone [[deprecated]] = 0, +- CacheFlagUseUser [[deprecated]] = 1 << 0, +- CacheFlagUseSystem [[deprecated]] = 1 << 1, ++ CacheFlagNone = 0, ++ CacheFlagUseUser = 1 << 0, ++ CacheFlagUseSystem = 1 << 1, + }; + + /** diff --git a/pkgs/development/libraries/appstream/fix-paths.patch b/pkgs/development/libraries/appstream/fix-paths.patch index 0da72a78cbcf..2f1249daef41 100644 --- a/pkgs/development/libraries/appstream/fix-paths.patch +++ b/pkgs/development/libraries/appstream/fix-paths.patch @@ -1,18 +1,21 @@ diff --git a/data/meson.build b/data/meson.build -index 1eb3dfb0..623b66ec 100644 +index 53f31cb4..90f40e77 100644 --- a/data/meson.build +++ b/data/meson.build -@@ -26,4 +26,4 @@ i18n.merge_file ( +@@ -68,7 +68,7 @@ test('as-validate_metainfo.cli', ) - install_data ('appstream.conf', -- install_dir: get_option('sysconfdir')) -+ install_dir: get_option('prefix') / 'etc') + install_data('appstream.conf', +- install_dir: get_option('sysconfdir')) ++ install_dir: get_option('prefix') / 'etc') + + if get_option('compose') + ascompose_metainfo = 'org.freedesktop.appstream.compose.metainfo.xml' diff --git a/meson.build b/meson.build -index dc1fb1a5..5ee03b73 100644 +index 2efe86b7..9dc79e28 100644 --- a/meson.build +++ b/meson.build -@@ -108,12 +108,12 @@ if get_option ('gir') +@@ -107,12 +107,12 @@ if get_option ('gir') dependency('gobject-introspection-1.0', version: '>=1.56') endif diff --git a/pkgs/development/libraries/appstream/installed-tests-path.patch b/pkgs/development/libraries/appstream/installed-tests-path.patch new file mode 100644 index 000000000000..188c1e525890 --- /dev/null +++ b/pkgs/development/libraries/appstream/installed-tests-path.patch @@ -0,0 +1,27 @@ +diff --git a/meson_options.txt b/meson_options.txt +index 8dd8e0c7..e2a30b06 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -44,6 +44,11 @@ option('install-docs', + value : true, + description : 'Install documentation for API and specification' + ) ++option('installed_test_prefix', ++ type : 'string', ++ value : '', ++ description : 'Prefix for installed tests' ++) + + # + # For development +diff --git a/tests/installed-tests/meson.build b/tests/installed-tests/meson.build +index 405820ce..f592a753 100644 +--- a/tests/installed-tests/meson.build ++++ b/tests/installed-tests/meson.build +@@ -10,5 +10,5 @@ configure_file( + output : 'metainfo-validate.test', + configuration : itconf, + install: true, +- install_dir: join_paths('share', 'installed-tests', 'appstream'), ++ install_dir: join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', 'appstream'), + ) diff --git a/pkgs/development/libraries/appstream/qt.nix b/pkgs/development/libraries/appstream/qt.nix index 0bcb4741ff12..3704332119e2 100644 --- a/pkgs/development/libraries/appstream/qt.nix +++ b/pkgs/development/libraries/appstream/qt.nix @@ -1,12 +1,12 @@ -{ mkDerivation, appstream, qtbase, qttools }: +{ lib, mkDerivation, appstream, qtbase, qttools, nixosTests }: # TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here mkDerivation { pname = "appstream-qt"; - inherit (appstream) version src patches; + inherit (appstream) version src; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "installedTests" ]; buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; @@ -14,11 +14,26 @@ mkDerivation { mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ]; + patches = (appstream.patches or []) ++ lib.optionals (lib.versionOlder qtbase.version "5.14") [ + # Fix darwin build for libsForQt5.appstream-qt + # Old Qt moc doesn't know about fancy C++14 features + # ../qt/component.h:93: Parse error at "UrlTranslate" + # Remove both this patch and related comment in default.nix + # once Qt 5.14 or later becomes default on darwin + ./fix-build-for-qt-olderthan-514.patch + ]; + postFixup = '' sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \ -e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${PACKAGE_PREFIX_DIR}@$dev@" ''; + passthru = appstream.passthru // { + tests = { + installed-tests = nixosTests.installed-tests.appstream-qt; + }; + }; + meta = appstream.meta // { description = "Software metadata handling library - Qt"; }; diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 1cb253774d4e..57bf47f3abf1 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; outputBin = "dev"; + nativeBuildInputs = [ makeWrapper ]; buildInputs = optional stdenv.isFreeBSD autoreconfHook; configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] @@ -38,7 +39,15 @@ stdenv.mkDerivation rec { "--without-freetds" "--without-berkeley-db" "--without-crypto" ] ; - propagatedBuildInputs = [ makeWrapper apr expat libiconv ] + # For some reason, db version 6.9 is selected when cross-compiling. + # It's unclear as to why, it requires someone with more autotools / configure knowledge to go deeper into that. + # Always replacing the link flag with a generic link flag seems to help though, so let's do that for now. + postConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace Makefile \ + --replace "-ldb-6.9" "-ldb" + ''; + + propagatedBuildInputs = [ apr expat libiconv ] ++ optional sslSupport openssl ++ optional bdbSupport db ++ optional ldapSupport openldap diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 64b7aefe8b92..527db0e2c1e6 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -61,8 +61,8 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "OS abstraction functions used by aqbanking and related tools"; - homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1"; - license = licenses.lgpl21; + homepage = "https://www.aquamaniac.de/rdm/projects/gwenhywfar"; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index e47dcd8e0ba2..dc160c37ad23 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "arb"; - version = "2.21.1"; + version = "2.22.1"; src = fetchFromGitHub { owner = "fredrik-johansson"; repo = pname; rev = version; - sha256 = "sha256-OBY2gKVnvrZLVrv+d6rXQLo026mrGB9eyNV4LESgrNI="; + sha256 = "sha256-Xd3dy7zr4i3pULLFOYtedpS5Yj9Ljwyu6r4kfhRynmE="; }; buildInputs = [ mpir gmp mpfr flint ]; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { "--with-flint=${flint}" ]; + enableParallelBuilding = true; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 850d48ca345d..14400f8ebf95 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.7.5"; + version = "10.8.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-XQ2f1rNO/Lpqb87/VMDS0T/L6RXXr4owxecs8xfSCU8="; + sha256 = "sha256-if3YmL9r/3X278OjAYF+Tt51K5qAkn+wfuNYsT41OSI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 031b4fc46cc1..806df81a7080 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -19,9 +19,9 @@ , grpc , gtest , jemalloc -, libnsl , lz4 , minio +, ninja , nlohmann_json , openssl , perl @@ -30,6 +30,7 @@ , rapidjson , re2 , snappy +, sqlite , thrift , tzdata , utf8proc @@ -37,7 +38,7 @@ , zlib , zstd , enableShared ? !stdenv.hostPlatform.isStatic -, enableFlight ? !stdenv.isDarwin # libnsl is not supported on darwin +, enableFlight ? true , enableJemalloc ? !(stdenv.isAarch64 && stdenv.isDarwin) # boost/process is broken in 1.69 on darwin, but fixed in 1.70 and # non-existent in older versions @@ -54,26 +55,26 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "1d8525e109a12a8c67c489eba48715a199609153"; - hash = "sha256-tesDW/1yRyhZtpLbPvCVEsocs6KtstYofxB5GiSMEFM="; + rev = "634739c664433cec366b4b9a81d1e1044a8c5eda"; + hash = "sha256-r1WVgJJsI7v485L6Qb+5i7kFO4Tvxyk1T0JBb4og6pg="; }; parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "d4d485956a643c693b5549e1a62d52ca61c170f1"; - hash = "sha256-GmOAS8gGhzDI0WzORMkWHRRUl/XBwmNen2d3VefZxxc="; + rev = "acd375eb86a81cd856476fca0f52ba6036a067ff"; + hash = "sha256-z/kmi+4dBO/dsVkJA4NgUoxl0pXi8RWIGvI8MGu/gcc="; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "6.0.1"; + version = "7.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-N4az0t+VTQeLPmj5jS5a7Lqj+irM8HXXo6E8GHucUpQ="; + hash = "sha256-6PSbFJoV7O9OQPz6sbh8ETxrHuGGAFwWnlzfldMamd4="; }; sourceRoot = "apache-arrow-${version}/cpp"; @@ -85,8 +86,8 @@ stdenv.mkDerivation rec { # ./cpp/thirdparty/versions.txt owner = "microsoft"; repo = "mimalloc"; - rev = "v1.7.2"; - hash = "sha256-yHupYFgC8mJuLUSpuEAfwF7l6Ue4EiuO1Q4qN4T6wWc="; + rev = "v1.7.3"; + hash = "sha256-Ca877VitpWyKmZNHavqgewk/P+tyd2xHDNVqveKh87M="; }; ARROW_XSIMD_URL = fetchFromGitHub { @@ -103,6 +104,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + ninja autoconf # for vendored jemalloc flatbuffers ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -126,7 +128,6 @@ stdenv.mkDerivation rec { python3.pkgs.numpy ] ++ lib.optionals enableFlight [ grpc - libnsl openssl protobuf ] ++ lib.optionals enableS3 [ aws-sdk-cpp openssl ] @@ -156,6 +157,11 @@ stdenv.mkDerivation rec { "-DARROW_COMPUTE=ON" "-DARROW_CSV=ON" "-DARROW_DATASET=ON" + "-DARROW_ENGINE=ON" + "-DARROW_FILESYSTEM=ON" + "-DARROW_FLIGHT_SQL=${if enableFlight then "ON" else "OFF"}" + "-DARROW_HDFS=ON" + "-DARROW_IPC=ON" "-DARROW_JEMALLOC=${if enableJemalloc then "ON" else "OFF"}" "-DARROW_JSON=ON" "-DARROW_PLASMA=ON" @@ -201,13 +207,10 @@ stdenv.mkDerivation rec { "TestMinioServer.Connect" "TestS3FS.*" "TestS3FSGeneric.*" - ] ++ lib.optionals enableGcs [ - "GcsFileSystem.FileSystemCompare" - "GcsIntegrationTest.*" ]; in lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}"; - installCheckInputs = [ perl which ] ++ lib.optional enableS3 minio; + installCheckInputs = [ perl which sqlite ] ++ lib.optional enableS3 minio; installCheckPhase = let excludedTests = lib.optionals stdenv.isDarwin [ @@ -215,7 +218,7 @@ stdenv.mkDerivation rec { # path on Darwin. See https://github.com/NixOS/nix/pull/1085 "plasma-external-store-tests" "plasma-client-tests" - ]; + ] ++ [ "arrow-gcsfs-test" ]; in '' runHook preInstallCheck diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 66b0c13646b5..675c930d9edd 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -1,48 +1,66 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl - , meson , ninja , pkg-config , gobject-introspection , gsettings-desktop-schemas , makeWrapper - , dbus , glib , dconf , libX11 -, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case +, libXtst , libXi , libXext - -, gnome # To pass updateScript +, gnome }: stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.42.0"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11p3lvmbm0hfck3p5xwxxycln8x0cf7l68jjz6an2g7sjh7a2pab"; - }; + version = "2.44.0"; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection makeWrapper ]; - # libXext is a transitive dependency of libXi - buildInputs = [ libX11 libXtst libXi libXext ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "fu488oWwiQYP1rblGz6yys91LMo6CCx/TCxauEHlE1M="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + makeWrapper + ]; + + buildInputs = [ + libX11 + # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case + libXtst + libXi + # libXext is a transitive dependency of libXi + libXext + ]; + # In atspi-2.pc dbus-1 glib-2.0 - propagatedBuildInputs = [ dbus glib ]; + propagatedBuildInputs = [ + dbus + glib + ]; - doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?" + # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?" + doCheck = false; - # Provide dbus-daemon fallback when it is not already running when - # at-spi2-bus-launcher is executed. This allows us to avoid - # including the entire dbus closure in libraries linked with - # the at-spi2-core libraries. - mesonFlags = [ "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" ]; + mesonFlags = [ + # Provide dbus-daemon fallback when it is not already running when + # at-spi2-bus-launcher is executed. This allows us to avoid + # including the entire dbus closure in libraries linked with + # the at-spi2-core libraries. + "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" + ]; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 22cac39dbe10..2e8bdc50ca63 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ]; strictDeps = true; + dontAddWafCrossFlags = true; + wafFlags = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-tests"; meta = with lib; { description = "Library for audio labelling"; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index a630d0420b49..a29fda0ec2b2 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,9 +1,15 @@ -{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook }: +{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook + +# test derivations +, pipewire +}: stdenv.mkDerivation rec { pname = "lilv"; version = "0.24.12"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; sha256 = "sha256-JqN3kIkMnB+DggO0f1sjIDNP6SwCpNJuu+Jmnb12kGE="; @@ -15,6 +21,10 @@ stdenv.mkDerivation rec { buildInputs = [ serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; + passthru.tests = { + inherit pipewire; + }; + meta = with lib; { homepage = "http://drobilla.net/software/lilv"; description = "A C library to make the use of LV2 plugins"; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index 616ad5b0c892..d0ef2e65c598 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -1,24 +1,50 @@ -{ lib, stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }: +{ stdenv +, lib +, fetchurl +, libsndfile +, pkg-config +, python3 +, wafHook +, pipewire +}: stdenv.mkDerivation rec { pname = "lv2"; version = "1.18.2"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "https://lv2plug.in/spec/${pname}-${version}.tar.bz2"; sha256 = "sha256-TokfvHRMBYVb6136gugisUkX3Wbpj4K4Iw29HHqy4F4="; }; - nativeBuildInputs = [ pkg-config wafHook ]; - buildInputs = [ gtk2 libsndfile python3 ]; + nativeBuildInputs = [ + pkg-config + wafHook + ]; - wafConfigureFlags = lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ]; + buildInputs = [ + libsndfile + python3 + ]; + + wafConfigureFlags = [ + "--includedir=${placeholder "dev"}/include" + "--bindir=${placeholder "dev"}/bin" + ] ++ lib.optionals stdenv.isDarwin [ + "--lv2dir=${placeholder "out"}/lib/lv2" + ]; + + passthru.tests = { + inherit pipewire; + }; meta = with lib; { homepage = "https://lv2plug.in"; description = "A plugin standard for audio systems"; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch b/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch new file mode 100644 index 000000000000..e13dda549705 --- /dev/null +++ b/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch @@ -0,0 +1,24 @@ +From abdfbb94df98fe88be4dd92ca587500126558411 Mon Sep 17 00:00:00 2001 +From: Victor Gaydov +Date: Sun, 26 Jul 2020 11:54:52 +0300 +Subject: [PATCH] Remove deprecated scons call + +--- + SConstruct | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/SConstruct b/SConstruct +index 407025d8..04afa91f 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -49,7 +49,6 @@ env = Environment(ENV=os.environ, tools=[ + # performance tuning + env.Decider('MD5-timestamp') + env.SetOption('implicit_cache', 1) +-env.SourceCode('.', None) + + # provide absolute path to force single sconsign file + # per-directory sconsign files seems to be buggy with generated sources +-- +2.34.1 + diff --git a/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch b/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch new file mode 100644 index 000000000000..097f1b3ff479 --- /dev/null +++ b/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch @@ -0,0 +1,31 @@ +From 15b37bb12a362c7889ac431eca4a47d6b2bdb97c Mon Sep 17 00:00:00 2001 +From: Victor Gaydov +Date: Sat, 5 Dec 2020 18:38:36 +0300 +Subject: [PATCH] Fix compatibility with new SCons + +--- + site_scons/site_tools/roc/config.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/site_scons/site_tools/roc/config.py b/site_scons/site_tools/roc/config.py +index b42b3adb..03b76be7 100644 +--- a/site_scons/site_tools/roc/config.py ++++ b/site_scons/site_tools/roc/config.py +@@ -13,7 +13,13 @@ def _run_prog(context, src, suffix): + # RunProg may incorrectly use cached results from a previous run saved for + # different file contents but the same invocation number. To prevent this, we + # monkey patch its global counter with a hashsum of the file contents. +- SCons.SConf._ac_build_counter = int(hashlib.md5(src.encode()).hexdigest(), 16) ++ # The workaround is needed only for older versions of SCons, where ++ # _ac_build_counter was an integer. ++ try: ++ if type(SCons.SConf._ac_build_counter) is int: ++ SCons.SConf._ac_build_counter = int(hashlib.md5(src.encode()).hexdigest(), 16) ++ except: ++ pass + return context.RunProg(src, suffix) + + def CheckLibWithHeaderExt(context, libs, headers, language, expr='1', run=True): +-- +2.34.1 + diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/development/libraries/audio/roc-toolkit/default.nix index 728e52b26701..98c088ed5495 100644 --- a/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ b/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, - sconsPackages, + scons, ragel, gengetopt, pkg-config, @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - sconsPackages.scons_3_0_1 + scons ragel gengetopt pkg-config @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { "--host=${stdenv.hostPlatform.config}" "--prefix=${placeholder "out"}" "--disable-sox" + "--disable-doc" "--disable-tests" ] ++ lib.optional (!libunwindSupport) "--disable-libunwind" ++ lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++ @@ -55,6 +56,12 @@ stdenv.mkDerivation rec { prePatch = lib.optionalString stdenv.isAarch64 "sed -i 's/c++98/c++11/g' SConstruct"; + # TODO: Remove these patches in the next version. + patches = [ + ./0001-Remove-deprecated-scons-call.patch + ./0002-Fix-compatibility-with-new-SCons.patch + ]; + meta = with lib; { description = "Roc is a toolkit for real-time audio streaming over the network"; homepage = "https://github.com/roc-streaming/roc-toolkit"; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index 2ba981ae46ed..0780d2978805 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -15,43 +15,31 @@ }: stdenv.mkDerivation rec { - version = "4.0.0"; pname = "rtmidi"; + version = "5.0.0"; src = fetchFromGitHub { owner = "thestk"; repo = "rtmidi"; rev = version; - sha256 = "1g31p6a96djlbk9jh5r4pjly3x76lhccva9hrw6xzdma8dsjzgyq"; + sha256 = "1r1sqmdi499zfh6z6kjkab6d4a7kz3il5kkcdfz9saa6ry992211"; }; patches = [ - # PR #230, fix CMake problems + # Remove when https://github.com/thestk/rtmidi/pull/278 merged (fetchpatch { - name = "RtMidi-Fix-JACK_HAS_PORT_RENAME-define.patch"; - url = "https://github.com/thestk/rtmidi/pull/230/commits/768a30a61b60240b66cc2d43bc27a544ff9f1622.patch"; - sha256 = "1sym4f7nb2qyyxfhi1l0xsm2hfh6gddn81y36qvfq4mcs33vvid0"; + name = "0001-rtmidi-Use-posix-sched_yield-instead-of-pthread_yield.patch"; + url = "https://github.com/thestk/rtmidi/pull/278/commits/cfe34c02112c256235b62b45895fc2c401fd874d.patch"; + sha256 = "0yzq7zbdkl5r4i0r6vy2kq986cqdxz2cpzb7s977mvh09kdikrw1"; }) + # Remove when https://github.com/thestk/rtmidi/pull/277 merged (fetchpatch { - name = "RtMidi-Add-prefix-define-for-pkgconfig.patch"; - url = "https://github.com/thestk/rtmidi/pull/230/commits/7a32e23e3f6cb43c0d2d58443ce205d438e76f44.patch"; - sha256 = "06im8mb05wah6bnkadw2gpkhmilxb8p84pxqr50b205cchpq304w"; + name = "0002-rtmidi-include-TargetConditionals.h-on-Apple-platforms.patch"; + url = "https://github.com/thestk/rtmidi/pull/277/commits/9d863beb28f03ec53f3e4c22cc0d3c34a1e1789b.patch"; + sha256 = "1hlrg23c1ycnwdvxpic8wvypiril04rlph0g820qn1naf92imfjg"; }) - (fetchpatch { - name = "RtMidi-Adjust-public-header-installs-to-match-autotools.patch"; - url = "https://github.com/thestk/rtmidi/pull/230/commits/892fe5492f0e787484fa4a37027b08c265ce001f.patch"; - sha256 = "0ca9m42xa3gmycimzvzvl67wa266xq9pfp1b4v555rh2fp52kbcj"; - }) - - # https://github.com/thestk/rtmidi/pull/277 - ./macos_include_targetconditionals.patch ]; - postPatch = '' - substituteInPlace rtmidi.pc.in \ - --replace 'Requires:' 'Requires.private:' - ''; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = lib.optional alsaSupport alsa-lib diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix index 01b3caa24ea2..65ce6580dcec 100644 --- a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix +++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { buildInputs = [ libsndfile ]; enableParallelBuilding = true; + makeFlags = [ + "AR:=$(AR)" + "RANLIB:=$(RANLIB)" + ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-o test"; meta = with lib; { description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index 7ff60b965953..743740fddb0d 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "avro-c++"; - version = "1.8.2"; + version = "1.10.2"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; - sha256 = "1ars58bfw83s8f1iqbhnqp4n9wc9cxsph0gs2a8k7r9fi09vja2k"; + sha256 = "1qv2wxh5q2iq48m5g3xci9p05znzcl0v3314bhcsyr5bkpdjvzs1"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index ee43daf2d044..76d5839402cf 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "avro-c"; - version = "1.10.2"; + version = "1.11.0"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "sha256-rj+zK+xKBon1Rn4JIBGS7cbo80ITTvBq1FLKhw9Wt+I="; + sha256 = "sha256-BlJZClStjkqliiuf8fTOcaZKQbCgXEUp0cUYxh52BkM="; }; postPatch = '' diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index ad1f3483cff0..b6fcb11c3158 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.8"; + version = "0.6.11"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-cZyWe3kX5JiB6th1VkkBFKa2MEilRtU+tHvu7c9e+Yw="; + sha256 = "sha256-3pFOnXDvB4CUUG992i5ErKMe3lAiyYoMTSvm6eKyLjs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 87d66e15355d..e7f0c0854dbb 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.5.12"; + version = "0.5.14"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KzuaT9c1l9Uhyj6IEy8JfDYzEYI2OcUkq+KRDoJx+Cc="; + sha256 = "sha256-+hWiDlL0GVVmMajoC+hfyvT4rm16RoAWhUr04B8JZts="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 79296a8e04f6..ab52fa5aa746 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-common"; - version = "0.6.18"; + version = "0.6.19"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5Y+cfiVtZGmExPuE3s5m8hnd0HrPwSiKptj0DM1mtUY="; + sha256 = "sha256-oB5kAzIRyr8kfl4sILuIw343ghDZDXSEH97qkUeTqXI="; }; nativeBuildInputs = [ cmake ]; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests + ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ + "-DCMAKE_C_FLAGS=-fasynchronous-unwind-tables" ]; # aws-c-common misuses cmake modules, so we need diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 2cfba1bd2046..f19a69fc4573 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.10.13"; + version = "0.10.19"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wdsSxEY9FwJoqdi0S8TNoyq8oxoZORKWeorsSpn+1IY="; + sha256 = "sha256-dPstIWB+wuMJi+EfecPKw0WD1c3IvHS+L1XU72xrAoc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index f75b744c3a91..11ba67fe6f5a 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.7.9"; + version = "0.7.10"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "sha256-YMAqK4DOFA5TkMNwLHRk1m14V8lN6X5SDAwrTYWdGMc="; + sha256 = "sha256-efkRr36FbLyS9tgE/ZF3tcmhQ4f5C5ySTlgzThbqv2I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index bd8ac2365a41..2868e6b80b86 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.1.30"; + version = "0.1.33"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-vsKQJPYdaBveb9kpZitmXFTqEeWWA4h0BkqxRzdOu28="; + sha256 = "sha256-lP5Luh/jFmlbb11rE5qYev+DMXjyMNwni0LcNvQGY4o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index 9042dc561544..058e4ea6a5f7 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-checksums"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fXu7GI2UR9QiBGP2n2pEFRjz9ZwA+BAK9zxhNnoYWt4="; + sha256 = "sha256-k3hIGk92HncRAktpuvNcZnaBZiLj63/wQBz2WScUjhQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index 9f70be5eb8d0..391ecc26fb86 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.17.8"; + version = "0.17.16"; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-eHABIg3v5ycpQzacW/8C74PT6yDOXGmJqDa9P1hN7Mo="; + sha256 = "sha256-RNcx/Enm1bd/NZOcNosNnYsT9Ot7AMQU7wsg+moT16c="; }; patches = [ diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index c0765922de5f..7a3c8bc727be 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -10,13 +12,21 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.88"; + version = "0.1.90"; outputs = [ "out" "dev" ]; + patches = [ + # Fix darwin build + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/babl/-/commit/33b18e74c9589fd4d5507ab88bd1fb19c15965dd.patch"; + sha256 = "bEjjOjHGTF55o1z31G9GNDqERxn/7vUuWZQYHosSEBQ="; + }) + ]; + src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Tw1/SqoLsucl80mt97NRqVfZ+ybVVdmJWnr4FrQWcDk="; + sha256 = "sha256-bi67Y283WBWI49AkmbPS9p+axz40omL0KRHX9ZBqkkM="; }; nativeBuildInputs = [ @@ -34,6 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Image pixel format conversion library"; homepage = "https://gegl.org/babl/"; + changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${lib.replaceStrings [ "." ] [ "_" ] version}/NEWS"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 406ff81fe8ee..96b677b27b5b 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -1,8 +1,7 @@ -{ lib, stdenv -, pantheon -, autoconf -, automake -, libtool +{ stdenv +, lib +, autoreconfHook +, gitUpdater , gnome , which , fetchgit @@ -23,26 +22,24 @@ stdenv.mkDerivation rec { pname = "bamf"; - version = "0.5.5"; + version = "0.5.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchgit { url = "https://git.launchpad.net/~unity-team/bamf"; - rev = "${version}+21.10.20210710-0ubuntu1"; - sha256 = "0iwz5z5cz9r56pmfjvjd2kcjlk416dw6g38svs33ynssjgsqbdm0"; + rev = version; + sha256 = "7U+2GcuDjPU8quZjkd8bLADGlG++tl6wSo0mUQkjAXQ="; }; nativeBuildInputs = [ (python3.withPackages (ps: with ps; [ lxml ])) # Tests - autoconf - automake + autoreconfHook dbus docbook_xsl gnome.gnome-common gobject-introspection gtk-doc - libtool pkg-config vala which @@ -69,22 +66,23 @@ stdenv.mkDerivation rec { "--enable-headless-tests" ]; - # fix paths + # Fix paths makeFlags = [ "INTROSPECTION_GIRDIR=${placeholder "dev"}/share/gir-1.0/" "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0" ]; - preConfigure = '' - ./autogen.sh - ''; - # TODO: Requires /etc/machine-id doCheck = false; - # glib-2.62 deprecations + # Ignore deprecation errors NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; + passthru.updateScript = gitUpdater { + inherit pname version; + ignoredVersions = ".ubuntu.*"; + }; + meta = with lib; { description = "Application matching framework"; longDescription = '' diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 2d8ddb27ad4a..869f38622418 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.0.58"; + version = "5.1.12"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-N7XxGTZkMSL+zyKHteVeRoZ63ZdT5Pq60xi9v6QURxA="; + sha256 = "sha256-tmZ1XC8z4NUww58pvvqxZifOxFNXSrEBMY2biCJ55XM="; }; # Do not build static libraries diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index dbc85992ba4e..740dbeee6487 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "4.5.3"; + version = "5.1.10"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-+7vqTbg1QergWPx2LQ2wkVehOma6Ix02IfwnJTJ/E5I="; + sha256 = "sha256-ZxO0Y4R04T+3K+08fEJ9krWfYSodQLrjBZYbGrKOrXI="; }; buildInputs = [ bctoolbox belr ]; diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index 90e27a6a9dc1..05d6573beb8a 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "belr"; - version = "4.5.3"; + version = "5.1.3"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-TTfBOhnyyAvQe+HXfr2GkuDTx07cHLqcsssW0dA7GlQ="; + sha256 = "sha256-0JDwNKqPkzbXqDhgMV+okPMHPFJwmLwLsDrdD55Jcs4="; }; buildInputs = [ bctoolbox ]; diff --git a/pkgs/development/libraries/boca/default.nix b/pkgs/development/libraries/boca/default.nix index ffbc99f79f7d..2c86bf981b70 100644 --- a/pkgs/development/libraries/boca/default.nix +++ b/pkgs/development/libraries/boca/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "BoCA"; - version = "1.0.5"; + version = "1.0.6a"; src = fetchFromGitHub { owner = "enzo1982"; repo = "boca"; rev = "v${version}"; - sha256 = "sha256-ooLPpwTxG7QBAGhEGhta4T06ZDWlPysocHbb/Sq7Wyo="; + sha256 = "sha256-LndlwdM5NlTv73Z1lMkHuIZkVfn48P/LssBnE4X9Sgc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 944fba33d6ec..d5057a614843 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,9 +1,7 @@ { lib, stdenv, fetchurl , autoreconfHook , enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v8.0.6/doc/README.macros (LARGE_CONFIG) -, nix -, nix_2_3 -, nixUnstable +, nixVersions }: stdenv.mkDerivation rec { @@ -21,10 +19,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; - preConfigure = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - export NIX_CFLAGS_COMPILE+=" -D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR" - ''; - # boehm-gc whitelists GCC threading models patches = lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch; @@ -39,16 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru = { - tests = { - # Assuming this package is picked up by these packages as expected. - inherit - nix - nixUnstable - nix_2_3 - ; - }; - }; + passthru.tests = nixVersions; meta = { description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++"; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 6358df1a555c..c0fce3ae5760 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -31,8 +31,8 @@ assert enableShared || enableStatic; assert enablePython -> stdenv.hostPlatform == stdenv.buildPlatform; assert enableNumpy -> enablePython; -# Boost <1.69 can't be build with clang >8, because pth was removed -assert with lib; ((toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69")); +# Boost <1.69 can't be built on linux with clang >8, because pth was removed +assert with lib; ((stdenv.isLinux && toolset == "clang" && !(versionOlder stdenv.cc.version "8.0.0")) -> !(versionOlder version "1.69")); with lib; let @@ -126,8 +126,20 @@ stdenv.mkDerivation { stripLen = 1; extraPrefix = "libs/context/"; }) + # Fix compiler warning with GCC >= 8; TODO: patch may apply to older versions + ++ optional (versionAtLeast version "1.65" && versionOlder version "1.67") + (fetchpatch { + url = "https://github.com/boostorg/mpl/commit/f48fd09d021db9a28bd7b8452c175897e1af4485.patch"; + sha256 = "15d2a636hhsb1xdyp44x25dyqfcaws997vnp9kl1mhzvxjzz7hb0"; + stripLen = 1; + }) ++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch - ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch; + ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch + ++ optional (version == "1.77.0") (fetchpatch { + url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; + relative = "include"; + sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; + }); meta = { homepage = "http://boost.org/"; diff --git a/pkgs/development/libraries/botan/2.0.upstream b/pkgs/development/libraries/botan/2.0.upstream deleted file mode 100644 index 74eb1a2ca83f..000000000000 --- a/pkgs/development/libraries/botan/2.0.upstream +++ /dev/null @@ -1,10 +0,0 @@ -url https://botan.randombit.net/ -version_link 'Botan-[0-9]+([.][0-9]+)*[.](tgz|tbz|tbz2|tar[.]bz2)$' -ensure_version -attribute_name botan2 -do_overwrite(){ - ensure_hash - set_var_value sha256 $CURRENT_HASH - set_var_value baseVersion ${CURRENT_VERSION%.*} - set_var_value revision ${CURRENT_VERSION##*.} -} diff --git a/pkgs/development/libraries/botan/default.upstream b/pkgs/development/libraries/botan/default.upstream deleted file mode 100644 index 43f6a3b268ee..000000000000 --- a/pkgs/development/libraries/botan/default.upstream +++ /dev/null @@ -1,9 +0,0 @@ -url http://botan.randombit.net/download.html -version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$' -ensure_version -do_overwrite(){ - ensure_hash - set_var_value sha256 $CURRENT_HASH - set_var_value baseVersion ${CURRENT_VERSION%.*} - set_var_value revision ${CURRENT_VERSION##*.} -} diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index 1144f4afaf54..29b665fec628 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "5.0.55"; + version = "5.1.0"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-+rUDKdMUeVnGsvG7NgQkN6e+DY2bThIyuPTvqxG6uDk="; + sha256 = "sha256-GsHVuNXzLkbKUaHtnyXAr7bR9Emc55zcmKt3RGjCMtA="; }; buildInputs = [ bctoolbox sqlite ]; diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index cda5f005f9a2..75b5f14d67ce 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional (!(stdenv.hostPlatform.isCompatible stdenv.buildPlatform)) "-DEXTERNAL_CAPNP"; + # Upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c, modified to apply to v0.9.1. Drop on update. + patches = lib.optional stdenv.hostPlatform.isMusl ./musl-no-fibers.patch; + meta = with lib; { homepage = "https://capnproto.org/"; description = "Cap'n Proto cerealization protocol"; diff --git a/pkgs/development/libraries/capnproto/musl-no-fibers.patch b/pkgs/development/libraries/capnproto/musl-no-fibers.patch new file mode 100644 index 000000000000..bb7804fb0abb --- /dev/null +++ b/pkgs/development/libraries/capnproto/musl-no-fibers.patch @@ -0,0 +1,244 @@ +From 3d983eff304c28574c330a52d70a60145c9e157e Mon Sep 17 00:00:00 2001 +From: Jonas Vautherin +Date: Fri, 14 Jan 2022 00:14:26 +0100 +Subject: [PATCH] Add support for musl + +--- +Based on upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c, +modified slightly by dtzWill to apply to v0.9.1. + +(drop whitespace change to a cmake "if (WITH_OPENSSL)", +leave the other instance of that change since it applies) +--- + +Co-authored-by: Guillaume Papin +(cherry picked from commit 77ac9154440bcc216fda1092fd5bb51da62ae09c) +--- + .github/workflows/quick-test.yml | 9 ++++++ + c++/CMakeLists.txt | 46 ++++++++++++++++++++++++++++- + c++/cmake/CapnProtoConfig.cmake.in | 32 ++++++++++++++++++++ + c++/configure.ac | 47 ++++++++++++++++++++++++++++-- + c++/src/kj/CMakeLists.txt | 11 ++++++- + 5 files changed, 141 insertions(+), 4 deletions(-) + +diff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml +index c18ef6a6..773ff043 100644 +--- a/.github/workflows/quick-test.yml ++++ b/.github/workflows/quick-test.yml +@@ -10,6 +10,15 @@ on: + - 'release-*' + + jobs: ++ Linux-musl: ++ runs-on: ubuntu-latest ++ container: alpine:latest ++ steps: ++ - uses: actions/checkout@v2 ++ - name: install dependencies ++ run: apk add autoconf automake build-base cmake libtool libucontext-dev linux-headers openssl-dev ++ - name: super-test ++ run: ./super-test.sh quick + Linux: + runs-on: ubuntu-latest + strategy: +diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt +index 548dfd1f..5de7ab26 100644 +--- a/c++/CMakeLists.txt ++++ b/c++/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.4) ++cmake_minimum_required(VERSION 3.6) + project("Cap'n Proto" CXX) + set(VERSION 0.9.1) + +@@ -64,6 +64,50 @@ elseif (WITH_OPENSSL) + find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL) + endif() + ++set(WITH_FIBERS "AUTO" CACHE STRING ++ "Whether or not to build libkj-async with fibers") ++# define list of values GUI will offer for the variable ++set_property(CACHE WITH_FIBERS PROPERTY STRINGS AUTO ON OFF) ++ ++# CapnProtoConfig.cmake.in needs this variable. ++set(_WITH_LIBUCONTEXT OFF) ++ ++if (WITH_FIBERS OR WITH_FIBERS STREQUAL "AUTO") ++ set(_capnp_fibers_found OFF) ++ if (WIN32 OR CYGWIN) ++ set(_capnp_fibers_found ON) ++ else() ++ # Fibers need makecontext, setcontext, getcontext, swapcontext that may be in libc, ++ # or in libucontext (e.g. for musl). ++ # We assume that makecontext implies that the others are present. ++ include(CheckLibraryExists) ++ check_library_exists(c makecontext "" HAVE_UCONTEXT_LIBC) ++ if (HAVE_UCONTEXT_LIBC) ++ set(_capnp_fibers_found ON) ++ else() ++ # Try with libucontext ++ find_package(PkgConfig) ++ if (PKG_CONFIG_FOUND) ++ pkg_check_modules(libucontext IMPORTED_TARGET libucontext) ++ if (libucontext_FOUND) ++ set(_WITH_LIBUCONTEXT ON) ++ set(_capnp_fibers_found ON) ++ endif() ++ else() ++ set(_capnp_fibers_found OFF) ++ endif() ++ endif() ++ endif() ++ ++ if (_capnp_fibers_found) ++ set(WITH_FIBERS ON) ++ elseif(WITH_FIBERS STREQUAL "AUTO") ++ set(WITH_FIBERS OFF) ++ else() ++ message(FATAL_ERROR "Missing 'makecontext', 'getcontext', 'setcontext' or 'swapcontext' symbol in libc and no libucontext found: KJ won't be able to build with fibers. Disable fibers (-DWITH_FIBERS=OFF).") ++ endif() ++endif() ++ + if(MSVC) + # TODO(cleanup): Enable higher warning level in MSVC, but make sure to test + # build with that warning level and clean out false positives. +diff --git a/c++/cmake/CapnProtoConfig.cmake.in b/c++/cmake/CapnProtoConfig.cmake.in +index 667f502f..0580b11a 100644 +--- a/c++/cmake/CapnProtoConfig.cmake.in ++++ b/c++/cmake/CapnProtoConfig.cmake.in +@@ -62,6 +62,38 @@ if (@WITH_OPENSSL@) # WITH_OPENSSL + endif() + endif() + ++if (@_WITH_LIBUCONTEXT@) # _WITH_LIBUCONTEXT ++ set(forwarded_config_flags) ++ if(CapnProto_FIND_QUIETLY) ++ list(APPEND forwarded_config_flags QUIET) ++ endif() ++ if(CapnProto_FIND_REQUIRED) ++ list(APPEND forwarded_config_flags REQUIRED) ++ endif() ++ # If the consuming project called find_package(CapnProto) with the QUIET or REQUIRED flags, forward ++ # them to calls to find_package(PkgConfig) and pkg_check_modules(). Note that find_dependency() ++ # would do this for us in the former case, but there is no such forwarding wrapper for ++ # pkg_check_modules(). ++ ++ find_package(PkgConfig ${forwarded_config_flags}) ++ if(NOT ${PkgConfig_FOUND}) ++ # If we're here, the REQUIRED flag must not have been passed, else we would have had a fatal ++ # error. Nevertheless, a diagnostic for this case is probably nice. ++ if(NOT CapnProto_FIND_QUIETLY) ++ message(WARNING "pkg-config cannot be found") ++ endif() ++ set(CapnProto_FOUND OFF) ++ return() ++ endif() ++ ++ if (CMAKE_VERSION VERSION_LESS 3.6) ++ # CMake >= 3.6 required due to the use of IMPORTED_TARGET ++ message(SEND_ERROR "libucontext support requires CMake >= 3.6.") ++ endif() ++ ++ pkg_check_modules(libucontext IMPORTED_TARGET ${forwarded_config_flags} libucontext) ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/CapnProtoTargets.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/CapnProtoMacros.cmake") + +diff --git a/c++/configure.ac b/c++/configure.ac +index 72fe8456..b627bec8 100644 +--- a/c++/configure.ac ++++ b/c++/configure.ac +@@ -32,6 +32,11 @@ AC_ARG_WITH([openssl], + [build libkj-tls by linking against openssl @<:@default=check@:>@])], + [],[with_openssl=check]) + ++AC_ARG_WITH([fibers], ++ [AS_HELP_STRING([--with-fibers], ++ [build libkj-async with fibers @<:@default=check@:>@])], ++ [],[with_fibers=check]) ++ + AC_ARG_ENABLE([reflection], [ + AS_HELP_STRING([--disable-reflection], [ + compile Cap'n Proto in "lite mode", in which all reflection APIs (schema.h, dynamic.h, etc.) +@@ -195,8 +200,46 @@ AS_IF([test "$with_openssl" != no], [ + ]) + AM_CONDITIONAL([BUILD_KJ_TLS], [test "$with_openssl" != no]) + +-# CapnProtoConfig.cmake.in needs this variable. +-AC_SUBST(WITH_OPENSSL, $with_openssl) ++# Fibers need the symbols getcontext, setcontext, swapcontext and makecontext. ++# We assume that makecontext implies the rest. ++AS_IF([test "$with_fibers" != no], [ ++ libc_supports_fibers=yes ++ AC_SEARCH_LIBS([makecontext], [], [], [ ++ libc_supports_fibers=no ++ ]) ++ ++ AS_IF([test "$libc_supports_fibers" = yes], [ ++ with_fibers=yes ++ ], [ ++ # If getcontext does not exist in libc, try with libucontext ++ ucontext_supports_fibers=yes ++ AC_CHECK_LIB(ucontext, [makecontext], [], [ ++ ucontext_supports_fibers=no ++ ]) ++ AS_IF([test "$ucontext_supports_fibers" = yes], [ ++ ASYNC_LIBS="$ASYNC_LIBS -lucontext" ++ with_fibers=yes ++ ], [ ++ AS_IF([test "$with_fibers" = yes], [ ++ AC_MSG_ERROR([Missing symbols required for fibers (makecontext, setcontext, ...). Disable fibers (--without-fibers) or install libucontext]) ++ ], [ ++ AC_MSG_WARN([could not find required symbols (makecontext, setcontext, ...) -- won't build with fibers]) ++ with_fibers=no ++ ]) ++ ]) ++ ]) ++]) ++AS_IF([test "$with_fibers" = yes], [ ++ CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS" ++], [ ++ CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS=0" ++]) ++ ++# CapnProtoConfig.cmake.in needs these variables, ++# we force them to NO because we don't need the CMake dependency for them, ++# the dependencies are provided by the .pc files. ++AC_SUBST(WITH_OPENSSL, NO) ++AC_SUBST(_WITH_LIBUCONTEXT, NO) + + AM_CONDITIONAL([HAS_FUZZING_ENGINE], [test "x$LIB_FUZZING_ENGINE" != "x"]) + +diff --git a/c++/src/kj/CMakeLists.txt b/c++/src/kj/CMakeLists.txt +index 813fac4d..f7b4dddf 100644 +--- a/c++/src/kj/CMakeLists.txt ++++ b/c++/src/kj/CMakeLists.txt +@@ -136,6 +136,15 @@ if(NOT CAPNP_LITE) + add_library(kj-async ${kj-async_sources}) + add_library(CapnProto::kj-async ALIAS kj-async) + target_link_libraries(kj-async PUBLIC kj) ++ if(WITH_FIBERS) ++ target_compile_definitions(kj-async PUBLIC KJ_USE_FIBERS) ++ if(_WITH_LIBUCONTEXT) ++ target_link_libraries(kj-async PUBLIC PkgConfig::libucontext) ++ endif() ++ else() ++ target_compile_definitions(kj-async PUBLIC KJ_USE_FIBERS=0) ++ endif() ++ + if(UNIX) + # external clients of this library need to link to pthreads + target_compile_options(kj-async INTERFACE "-pthread") +@@ -181,7 +190,7 @@ if(NOT CAPNP_LITE) + add_library(kj-tls ${kj-tls_sources}) + add_library(CapnProto::kj-tls ALIAS kj-tls) + target_link_libraries(kj-tls PUBLIC kj-async) +- if (WITH_OPENSSL) ++ if(WITH_OPENSSL) + target_compile_definitions(kj-tls PRIVATE KJ_HAS_OPENSSL) + target_link_libraries(kj-tls PRIVATE OpenSSL::SSL OpenSSL::Crypto) + endif() +-- +2.35.1 + diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index 5adcc2d1dd9e..71a99ad6b696 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.13.7"; + version = "2.13.8"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="sha256-NhZ8Hh7dka7KggEKKZyEbIZahuuTYeCT7cYYSUvkPzI="; + sha256="sha256-jOA2TxDgaJUJ2Jn7dVGZUbjmphTDuVZahzSaxfJpRqE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index d4fe5e83658b..3b47b1d5e72b 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Ultra-low delay audio codec"; - homepage = "http://www.celt-codec.org/"; + homepage = "https://gitlab.xiph.org/xiph/celt"; # http://www.celt-codec.org/ is gone license = licenses.bsd2; maintainers = with maintainers; [ codyopel raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index dfc9f81edb62..50a9bf62c54b 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-AJK1M6iyYdL61pZQhbUWzf+YOUE5FEvUyKqxbQqc7H0="; + sha256 = "sha256-PJHDZXc0DD/d+K/4uouv5F8gAf1sE5e3jLkGILPMpnI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index c8b8875154a8..5b8cc369ee31 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, boost, ffmpeg, darwin, zlib }: +{ lib, stdenv, fetchurl, cmake, boost, ffmpeg_4, darwin, zlib }: stdenv.mkDerivation rec { pname = "chromaprint"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ffmpeg ] ++ lib.optionals stdenv.isDarwin + buildInputs = [ boost ffmpeg_4 ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo zlib]); cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 47e9ffa925ab..4a482c9da454 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-dC4VuWTz0uyFxLjBQ+2ggndHaCErcoI7tJMfkqbWmeg="; + hash = "sha256-OWpztnyVXCg+uoAb6e/2eUK2ebBalDlz6Qcjf17IeMk="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch b/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch deleted file mode 100644 index 8a14fb3a5fab..000000000000 --- a/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -u a/Makefile b/Makefile ---- a/Makefile 2020-12-27 18:48:53.934098765 +0100 -+++ b/Makefile 2020-12-27 18:50:44.022674117 +0100 -@@ -19,13 +19,13 @@ - # http://www.gnu.org/prep/standards/html_node/Directory-Variables.html - PREFIX ?= /usr/local - EXEC_PREFIX = $(PREFIX) --BINDIR = $(EXEC_PREFIX)/bin -+BINDIR ?= $(EXEC_PREFIX)/bin - DATAROOTDIR = $(PREFIX)/share - DOCDIR = $(DATAROOTDIR)/doc/$(CPROG) - SYSCONFDIR ?= $(PREFIX)/etc - HTMLDIR = $(DOCDIR) --INCLUDEDIR = $(DESTDIR)$(PREFIX)/include --LIBDIR = $(DESTDIR)$(EXEC_PREFIX)/lib -+INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include -+LIBDIR ?= $(DESTDIR)$(EXEC_PREFIX)/lib - PID_FILE ?= /var/run/$(CPROG).pid - - # build tools -@@ -337,10 +337,10 @@ - install -m 755 $(CPROG) "$(BINDIR)/" - - install-headers: -- install -m 644 $(HEADERS) "$(INCLUDEDIR)" -+ install -m 644 $(HEADERS) "$(INCLUDEDIR)/" - - install-lib: lib$(CPROG).a -- install -m 644 $< "$(LIBDIR)" -+ install -m 644 $< "$(LIBDIR)/" - - install-slib: lib$(CPROG).so - $(eval version=$(shell grep -w "define CIVETWEB_VERSION" include/civetweb.h | sed 's|.*VERSION "\(.*\)"|\1|g')) diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/development/libraries/civetweb/default.nix index 93ac618bcacf..bf737972612b 100644 --- a/pkgs/development/libraries/civetweb/default.nix +++ b/pkgs/development/libraries/civetweb/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, cmake }: stdenv.mkDerivation rec { @@ -13,33 +15,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-Qh6BGPk7a01YzCeX42+Og9M+fjXRs7kzNUCyT4mYab4="; }; - makeFlags = [ - "WITH_CPP=1" - "PREFIX=${placeholder "out"}" - "LIBDIR=${placeholder "out"}/lib" - "INCLUDEDIR=${placeholder "dev"}/include" - ]; - - patches = [ - ./0001-allow-setting-paths-in-makefile.patch - ]; + outputs = [ "out" "dev" ]; strictDeps = true; - outputs = [ "out" "dev" ]; - - installTargets = [ - "install-headers" - "install-lib" - "install-slib" - "install" + nativeBuildInputs = [ + cmake ]; - preInstall = '' - mkdir -p $dev/include - mkdir -p $out/lib + # The existence of the "build" script causes `mkdir -p build` to fail: + # mkdir: cannot create directory 'build': File exists + preConfigure = '' + rm build ''; + cmakeFlags = [ + "-DCIVETWEB_ENABLE_CXX=ON" + "-DBUILD_SHARED_LIBS=ON" + + # The civetweb unit tests rely on downloading their fork of libcheck. + "-DCIVETWEB_BUILD_TESTING=OFF" + ]; + meta = { description = "Embedded C/C++ web server"; homepage = "https://github.com/civetweb/civetweb"; diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix deleted file mode 100644 index 1a3e261c60ed..000000000000 --- a/pkgs/development/libraries/clearsilver/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, python2 }: - -stdenv.mkDerivation rec { - pname = "clearsilver"; - version = "0.10.5"; - - src = fetchurl { - url = "http://www.clearsilver.net/downloads/clearsilver-${version}.tar.gz"; - sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y"; - }; - - PYTHON_SITE = "${placeholder "out"}/${python2.sitePackages}"; - - configureFlags = [ - "--with-python=${python2.interpreter}" - "--disable-apache" - "--disable-perl" - "--disable-ruby" - "--disable-java" - "--disable-csharp" - ]; - - preInstall = '' - mkdir -p $out - mkdir -p $out/${python2.sitePackages} - ''; - - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/clang-gcc5.patch"; - sha256 = "0d44v9jx0b6k8nvrhknd958i9rs59kdh73z0lb4f1mzi8if16c38"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/CVE-2011-4357.diff"; - sha256 = "1lfncavxdqckrz03gv97lcliygbpi9lnih944vmdbn9zw6fwcipi"; - }) - ]; - - meta = with lib; { - description = "Fast, powerful, and language-neutral HTML template system"; - homepage = "http://www.clearsilver.net/"; - license = licenses.free; - }; -} diff --git a/pkgs/development/libraries/cmark-gfm/default.nix b/pkgs/development/libraries/cmark-gfm/default.nix index b25688acfa15..599ac2b2e7b0 100644 --- a/pkgs/development/libraries/cmark-gfm/default.nix +++ b/pkgs/development/libraries/cmark-gfm/default.nix @@ -1,19 +1,25 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark-gfm"; - version = "0.29.0.gfm.2"; + version = "0.29.0.gfm.3"; src = fetchFromGitHub { owner = "github"; repo = "cmark-gfm"; rev = version; - sha256 = "sha256-8PjG87hR66ozKx+PSuKi0vHIoKICHSLdl2cKUYf+5m8="; + sha256 = "sha256-V3XegSjqKLCMpfnoYHr9/r5fSC2CC7A2jXkAcHUt7eA="; }; nativeBuildInputs = [ cmake ]; # tests load the library dynamically which for unknown reason failed doCheck = false; + # remove when https://github.com/github/cmark-gfm/pull/248 merged and released + postInstall = '' + substituteInPlace $out/include/cmark-gfm-core-extensions.h \ + --replace '#include "config.h"' '#include ' + ''; + meta = with lib; { description = "GitHub's fork of cmark, a CommonMark parsing and rendering library and program in C"; homepage = "https://github.com/github/cmark-gfm"; diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/development/libraries/coeurl/default.nix index 44e534757ce9..bfa8aef2dd16 100644 --- a/pkgs/development/libraries/coeurl/default.nix +++ b/pkgs/development/libraries/coeurl/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "coeurl"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitLab { domain = "nheko.im"; owner = "nheko-reborn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F4kHE9r2pR8hI+CrZQ9ElPjtp0McgwfSxoD5p56KDGs="; + sha256 = "sha256-IIIl+/5Omv0lYTNAjeA63ofJlBmNe3+yTOxDsvL+ak0="; }; nativeBuildInputs = [ ninja pkg-config meson ]; diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index 629e5465a044..ca303fdeaea3 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -1,68 +1,70 @@ -{ lib, gcc9Stdenv, fetchFromGitHub, runCommand, cosmopolitan }: +{ lib, stdenv, fetchFromGitHub, runCommand, unzip, cosmopolitan,bintools-unwrapped }: -gcc9Stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "cosmopolitan"; - version = "0.3"; + version = "unstable-2022-03-22"; src = fetchFromGitHub { owner = "jart"; repo = "cosmopolitan"; - rev = version; - sha256 = "sha256-OVdOObO82W6JN63OWKHaERS7y0uvgxt+WLp6Y0LsmJk="; + rev = "5022f9e9207ff2b79ddd6de6d792d3280e12fb3a"; + sha256 = "sha256-UjL4wR5HhuXiQXg6Orcx2fKiVGRPMJk15P779BP1fRA="; }; + patches = [ + ./ioctl.patch # required /dev/tty + ]; + postPatch = '' patchShebangs build/ - rm -r third_party/gcc ''; dontConfigure = true; dontFixup = true; enableParallelBuilding = true; - - preBuild = '' - makeFlagsArray=( - SHELL=/bin/sh - AS=${gcc9Stdenv.cc.targetPrefix}as - CC=${gcc9Stdenv.cc.targetPrefix}gcc - GCC=${gcc9Stdenv.cc.targetPrefix}gcc - CXX=${gcc9Stdenv.cc.targetPrefix}g++ - LD=${gcc9Stdenv.cc.targetPrefix}ld - OBJCOPY=${gcc9Stdenv.cc.targetPrefix}objcopy - "MKDIR=mkdir -p" - ) - ''; + nativeBuildInputs = [ bintools-unwrapped unzip ]; installPhase = '' runHook preInstall - mkdir -p $out/{bin,lib/include} - install o/cosmopolitan.h $out/lib/include + mkdir -p $out/{bin,include,lib} + install o/cosmopolitan.h $out/include install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} $out/lib + cat > $out/bin/cosmoc <hello.c - ${gcc9Stdenv.cc}/bin/gcc -g -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone -o hello.com.dbg hello.c \ + printf '#include "libc/stdio/stdio.h"\nmain() { printf("hello world\\n"); }\n' >hello.c + ${stdenv.cc}/bin/gcc -g -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone -o hello.com.dbg hello.c \ -fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds \ - -include ${cosmopolitan}/lib/{include/cosmopolitan.h,crt.o,ape.o,cosmopolitan.a} - ${gcc9Stdenv.cc.bintools.bintools_bin}/bin/objcopy -S -O binary hello.com.dbg hello.com + -include ${cosmopolitan}/include/cosmopolitan.h \ + -I ${cosmopolitan}/include \ + ${cosmopolitan}/lib/{crt.o,ape.o,cosmopolitan.a} + ${stdenv.cc.bintools.bintools_bin}/bin/objcopy -S -O binary hello.com.dbg hello.com ./hello.com printf "test successful" > $out ''; cosmoc = runCommand "cosmoc-hello" { } '' - printf 'main() { printf("hello world\\n"); }\n' >hello.c + printf '#include "libc/stdio/stdio.h"\nmain() { printf("hello world\\n"); }\n' >hello.c ${cosmopolitan}/bin/cosmoc hello.c ./a.out printf "test successful" > $out diff --git a/pkgs/development/libraries/cosmopolitan/ioctl.patch b/pkgs/development/libraries/cosmopolitan/ioctl.patch new file mode 100644 index 000000000000..e6e7eb4fc7b0 --- /dev/null +++ b/pkgs/development/libraries/cosmopolitan/ioctl.patch @@ -0,0 +1,12 @@ +diff --git a/third_party/python/python.mk b/third_party/python/python.mk +index f18c15060..b17455bca 100644 +--- a/third_party/python/python.mk ++++ b/third_party/python/python.mk +@@ -1818,7 +1818,6 @@ THIRD_PARTY_PYTHON_PYTEST_PYMAINS = \ + third_party/python/Lib/test/test_int_literal.py \ + third_party/python/Lib/test/test_bisect.py \ + third_party/python/Lib/test/test_pyexpat.py \ +- third_party/python/Lib/test/test_ioctl.py \ + third_party/python/Lib/test/test_getopt.py \ + third_party/python/Lib/test/test_sort.py \ + third_party/python/Lib/test/test_slice.py \ diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 3eae15c58d0a..a3de08a838bc 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.12.0"; + version = "5.13.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rpbD3x7zIJCDZuu4K0wDkaBKSBh36amtza/wE3rb0HM="; + sha256 = "sha256-R22nWkI778LpCK3a5C6tvuIsEXU49wPya1fFQxdpocg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/crcpp/default.nix b/pkgs/development/libraries/crcpp/default.nix index 3b9f4f942acf..69b1864702c9 100644 --- a/pkgs/development/libraries/crcpp/default.nix +++ b/pkgs/development/libraries/crcpp/default.nix @@ -1,27 +1,27 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, cmake }: stdenv.mkDerivation rec { pname = "crcpp"; - version = "1.1.0.0"; + version = "1.2.0.0"; src = fetchFromGitHub { owner = "d-bahr"; repo = "CRCpp"; rev = "release-${version}"; - sha256 = "sha256-jBvh4dHSFChxNPVgkGVHy3TXSExsfwdVUfsA8XB1cn8="; + sha256 = "sha256-OY8MF8fwr6k+ZSA/p1U+9GnTFoMSnUZxKVez+mda2tA="; }; - dontBuild = true; + nativeBuildInputs = [ cmake ]; - installPhase = '' - mkdir -p $out/include - cp inc/CRC.h $out/include - ''; + doCheck = true; meta = with lib; { homepage = "https://github.com/d-bahr/CRCpp"; + changelog = "https://github.com/d-bahr/CRCpp/releases/tag/release-${version}"; description = "Easy to use and fast C++ CRC library"; platforms = platforms.all; maintainers = [ maintainers.ivar ]; diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index c57525c01d94..a31a4472e1c4 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,6 +1,12 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !enableStatic +# Multi-threading with OpenMP is disabled by default +# more info on https://www.cryptopp.com/wiki/OpenMP +, withOpenMP ? false +, llvmPackages }: stdenv.mkDerivation rec { @@ -19,17 +25,22 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace GNUmakefile \ - --replace "AR = libtool" "AR = ar" \ + --replace "AR = /usr/bin/libtool" "AR = ar" \ --replace "ARFLAGS = -static -o" "ARFLAGS = -cru" ''; + buildInputs = lib.optionals (stdenv.cc.isClang && withOpenMP) [ llvmPackages.openmp ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + buildFlags = lib.optional enableStatic "static" ++ lib.optional enableShared "shared" ++ [ "libcryptopp.pc" ]; + enableParallelBuilding = true; hardeningDisable = [ "fortify" ]; + CXXFLAGS = lib.optionals (withOpenMP) [ "-fopenmp" ]; doCheck = true; @@ -38,17 +49,21 @@ stdenv.mkDerivation rec { installTargets = [ "install-lib" ]; installFlags = [ "LDCONF=true" ]; + # TODO: remove postInstall hook with v8.7 -> https://github.com/weidai11/cryptopp/commit/230c558a postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.majorMinor version} ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.major version} ''; - meta = { - description = "Crypto++, a free C++ class library of cryptographic schemes"; + meta = with lib; { + description = "A free C++ class library of cryptographic schemes"; homepage = "https://cryptopp.com/"; - changelog = "https://raw.githubusercontent.com/weidai11/cryptopp/CRYPTOPP_${underscoredVersion}/History.txt"; - license = with lib.licenses; [ boost publicDomain ]; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ c0bw3b ]; + changelog = [ + "https://raw.githubusercontent.com/weidai11/cryptopp/CRYPTOPP_${underscoredVersion}/History.txt" + "https://github.com/weidai11/cryptopp/releases/tag/CRYPTOPP_${underscoredVersion}" + ]; + license = with licenses; [ boost publicDomain ]; + platforms = platforms.all; + maintainers = with maintainers; [ c0bw3b ]; }; } diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 731c038527ce..005f1ac0302c 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { name = "gcc-4.7.patch"; - url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/" - + "dbus-c%2B%2B/files/dbus-c%2B%2B-0.9.0-gcc-4.7.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/" + + "dbus-c++/files/dbus-c++-0.9.0-gcc-4.7.patch"; sha256 = "0rwcz9pvc13b3yfr0lkifnfz0vb5q6dg240bzgf37ni4s8rpc72g"; }) (fetchurl { diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index aadd61370b1f..ea6d45e5dffc 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "dlib"; - version = "19.22"; + version = "19.23"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "sha256-cEbw01w4KgSG3JTvTE/qruo7i4/L++m02HW+0VNmSSQ="; + sha256 = "sha256-88vusoLEkjh3WRh/PxPtsVIFk85serRq2VxVcEus3IE="; }; postPatch = '' diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 2bdcc3c8a997..9efdcd0c4f07 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "double-conversion"; - version = "3.1.5"; + version = "3.2.0"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "0csy4pjw1p8rp6g5qxi2h0ychhhp1fldv7gb761627fs2mclw9gv"; + sha256 = "sha256-Vvzjg+UOgegkH8x2vtNU1TS01k5O4ilRJjD7F+BmVmU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index eb14a44e4fa5..748e1e756cb3 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://dqlite.io/"; license = licenses.asl20; - maintainers = with maintainers; [ joko wucke13 ]; + maintainers = with maintainers; [ joko ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/draco/default.nix b/pkgs/development/libraries/draco/default.nix index ecbd12521263..d35e9a229a56 100644 --- a/pkgs/development/libraries/draco/default.nix +++ b/pkgs/development/libraries/draco/default.nix @@ -1,35 +1,52 @@ { lib , stdenv , fetchFromGitHub +, nix-update-script , cmake , python3 +, gtest , withAnimation ? true , withTranscoder ? true +, eigen +, ghc_filesystem +, tinygltf }: let cmakeBool = b: if b then "ON" else "OFF"; in stdenv.mkDerivation rec { - version = "1.5.0"; + version = "1.5.2"; pname = "draco"; src = fetchFromGitHub { owner = "google"; repo = "draco"; rev = version; - hash = "sha256-BoJg2lZBPVVm6Nc0XK8QSISpe+B8tpgRg9PFncN4+fY="; + sha256 = "sha256-o6KQJFrnxx2kz6g3vXk1w435OmaJhAJjzsKM/gmVJ2M="; fetchSubmodules = true; }; + buildInputs = [ gtest ] + ++ lib.optionals withTranscoder [ eigen ghc_filesystem tinygltf ]; + nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ "-DDRACO_ANIMATION_ENCODING=${cmakeBool withAnimation}" - "-DDRACO_TRANSCODER_SUPPORTED=${cmakeBool withTranscoder}" + "-DDRACO_GOOGLETEST_PATH=${gtest}" "-DBUILD_SHARED_LIBS=${cmakeBool true}" + "-DDRACO_TRANSCODER_SUPPORTED=${cmakeBool withTranscoder}" + ] ++ lib.optionals withTranscoder [ + "-DDRACO_EIGEN_PATH=${eigen}/include/eigen3" + "-DDRACO_FILESYSTEM_PATH=${ghc_filesystem}" + "-DDRACO_TINYGLTF_PATH=${tinygltf}" ]; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { description = "Library for compressing and decompressing 3D geometric meshes and point clouds"; homepage = "https://google.github.io/draco/"; diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 7258cb767e3f..432e7626156b 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "drogon"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${version}"; - sha256 = "02igryrv8782rwqb4w49frymlw9n7hv8fskqsw43rqly650vzakb"; + sha256 = "sha256-DrpaXUaoO35DgmX8cYb3kbXfd6PlqI6pjEKnroiRxvg="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 7cbeffd5b7ec..69b330f5a48e 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "drumstick"; - version = "2.4.1"; + version = "2.5.1"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-nmqgS08ZBQ2vBEDtoriNbYLaNQA1DWeDhbRo70rBOP0="; + hash = "sha256-V57YnyeOVBXL5qjuCO1j1Ozy9CeaXxadw6ed1suUUIU="; }; patches = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { maintainers = []; description = "MIDI libraries for Qt5/C++"; - homepage = "http://drumstick.sourceforge.net/"; + homepage = "https://drumstick.sourceforge.io/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index f1e4f56a5950..7d12d9fabf2f 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -1,26 +1,58 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake +, ninja +, openssl +, openjdk11 +, unixODBC +, withHttpFs ? true +, withJdbc ? false +, withOdbc ? false }: +let + enableFeature = yes: if yes then "ON" else "OFF"; +in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-apTU7WgKw/YEnT4maibyffqOrCoVwHPOkNINlAmtYYI="; + sha256 = "sha256-F5YOqDeY3rgcnuu5SNqOfUxhsaXgqvdJZTnD1unI0tc="; }; - nativeBuildInputs = [ cmake ]; + patches = [ ./version.patch ]; + postPatch = '' + substituteInPlace CMakeLists.txt --subst-var-by DUCKDB_VERSION "v${version}" + ''; + + cmakeFlags = [ + "-DBUILD_FTS_EXTENSION=ON" + "-DBUILD_HTTPFS_EXTENSION=${enableFeature withHttpFs}" + "-DBUILD_ICU_EXTENSION=ON" + "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}" + "-DBUILD_PARQUET_EXTENSION=ON" + "-DBUILD_REST_EXTENSION=ON" + "-DBUILD_TPCDS_EXTENSION=ON" + "-DBUILD_TPCH_EXTENSION=ON" + "-DBUILD_VISUALIZER_EXTENSION=ON" + "-DJDBC_DRIVER=${enableFeature withJdbc}" + ]; + + nativeBuildInputs = [ cmake ninja ]; + buildInputs = lib.optionals withHttpFs [ openssl ] + ++ lib.optionals withJdbc [ openjdk11 ] + ++ lib.optionals withOdbc [ unixODBC ]; meta = with lib; { homepage = "https://github.com/duckdb/duckdb"; description = "Embeddable SQL OLAP Database Management System"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ costrouc ]; + maintainers = with maintainers; [ costrouc cpcloud ]; }; } diff --git a/pkgs/development/libraries/duckdb/version.patch b/pkgs/development/libraries/duckdb/version.patch new file mode 100644 index 000000000000..1f5491eac23c --- /dev/null +++ b/pkgs/development/libraries/duckdb/version.patch @@ -0,0 +1,51 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 92c097228..5f51929f6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -157,45 +157,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") + set(SUN TRUE) + endif() + +-execute_process( +- COMMAND git log -1 --format=%h +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE GIT_RESULT +- OUTPUT_VARIABLE GIT_COMMIT_HASH +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-execute_process( +- COMMAND git describe --tags --abbrev=0 +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- OUTPUT_VARIABLE GIT_LAST_TAG +- OUTPUT_STRIP_TRAILING_WHITESPACE) +-execute_process( +- COMMAND git describe --tags --long +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- OUTPUT_VARIABLE GIT_ITERATION +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- +-if(GIT_RESULT EQUAL "0") +- string(REGEX REPLACE "v([0-9]+).[0-9]+.[0-9]+" "\\1" DUCKDB_MAJOR_VERSION "${GIT_LAST_TAG}") +- string(REGEX REPLACE "v[0-9]+.([0-9]+).[0-9]+" "\\1" DUCKDB_MINOR_VERSION "${GIT_LAST_TAG}") +- string(REGEX REPLACE "v[0-9]+.[0-9]+.([0-9]+)" "\\1" DUCKDB_PATCH_VERSION "${GIT_LAST_TAG}") +- string(REGEX REPLACE ".*-([0-9]+)-.*" "\\1" DUCKDB_DEV_ITERATION "${GIT_ITERATION}") +- +- if(DUCKDB_DEV_ITERATION EQUAL 0) +- # on a tag; directly use the version +- set(DUCKDB_VERSION "${GIT_LAST_TAG}") +- else() +- # not on a tag, increment the patch version by one and add a -devX suffix +- math(EXPR DUCKDB_PATCH_VERSION "${DUCKDB_PATCH_VERSION}+1") +- set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}") +- endif() +-else() +- # fallback for when building from tarball +- set(DUCKDB_MAJOR_VERSION 0) +- set(DUCKDB_MINOR_VERSION 0) +- set(DUCKDB_PATCH_VERSION 1) +- set(DUCKDB_DEV_ITERATION 0) +- set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}") +-endif() ++set(DUCKDB_VERSION "@DUCKDB_VERSION@") + + option(AMALGAMATION_BUILD + "Build from the amalgamation files, rather than from the normal sources." diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index ad582d933059..03c4ea0ee8f1 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "easyloggingpp"; version = "9.97.0"; src = fetchFromGitHub { - owner = "muflihun"; + owner = "amrayn"; repo = "easyloggingpp"; rev = "v${version}"; sha256 = "sha256-sFWmZMnucMuvpwDzuowni21KiD3bx0lH1Ts+yhusOYs="; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "C++ logging library"; - homepage = "https://muflihun.github.io/easyloggingpp/"; + homepage = "https://github.com/amrayn/easyloggingpp"; license = lib.licenses.mit; maintainers = with lib.maintainers; [acowley]; platforms = lib.platforms.all; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index dc0648366a9f..5182c59567da 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.24.0"; + version = "2.24.2"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "sha256-MHrit59KfTF4mCS8od8UEvYMrWj0m/xJu8HUeA8+W5Y="; + sha256 = "sha256-xgrQ/YnhGRis4NhMAUifISIrEdbK0/90lYVqCt1hBAM="; }; postPatch = '' diff --git a/pkgs/development/libraries/eigen/default.upstream b/pkgs/development/libraries/eigen/default.upstream deleted file mode 100644 index c0c05efc466c..000000000000 --- a/pkgs/development/libraries/eigen/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url http://eigen.tuxfamily.org/ -ensure_choice -version '.*/([-0-9.]+)[.]tar[.].*' '\1' -do_overwrite() { do_overwrite_just_version; } diff --git a/pkgs/development/libraries/elfio/default.nix b/pkgs/development/libraries/elfio/default.nix index 98e9ee3f59ed..5bf4f3a33308 100644 --- a/pkgs/development/libraries/elfio/default.nix +++ b/pkgs/development/libraries/elfio/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "elfio"; - version = "3.9"; + version = "3.10"; src = fetchFromGitHub { owner = "serge1"; repo = "elfio"; rev = "Release_${version}"; - sha256 = "sha256-5O9KnHZXzepp3O1PGenJarrHElWLHgyBvvDig1Hkmo4="; + sha256 = "sha256-DuZhkiHXdCplRiOy1Gsu7voVPdCbFt+4qFqlOeOeWQw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index 3bb59ce9ca6a..2a71b82af3cb 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -13,16 +13,18 @@ , cudatoolkit } : -# The standard Scalapack has no iLP64 interface -assert (!blas.isILP64) && (!lapack.isILP64); +assert blas.isILP64 == lapack.isILP64; +assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; - version = "2021.11.001"; + version = "2021.11.002"; + + passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "0bw0nwzwvjfmijfwznmrghypd3q237a3h5g5fcdncilrqnk1sdpv"; + sha256 = "sha256-V28cru14g7gTlmQP2g9QQYOGbPbL1Lxx0Tg7oiCPH5c="; }; patches = [ @@ -60,7 +62,8 @@ stdenv.mkDerivation rec { "--with-mpi" "--enable-openmp" "--without-threading-support-check-during-build" - ] ++ lib.optional (!avxSupport) "--disable-avx" + ] ++ lib.optional blas.isILP64 "--enable-64bit-integer-math-support" + ++ lib.optional (!avxSupport) "--disable-avx" ++ lib.optional (!avx2Support) "--disable-avx2" ++ lib.optional (!avx512Support) "--disable-avx512" ++ lib.optional (!stdenv.hostPlatform.isx86_64) "--disable-sse" diff --git a/pkgs/development/libraries/embree/default.nix b/pkgs/development/libraries/embree/default.nix index 3495386ce104..6417f4b05a1c 100644 --- a/pkgs/development/libraries/embree/default.nix +++ b/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "3.13.2"; + version = "3.13.3"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-bnd7p8Yu0YGkhUrg3yy32rk7kmHGB4YxMx1qWzIx5vw="; + sha256 = "sha256-g6BsXMNUvx17hgAq0PewtBLgtWqpp03M0k6vWNapDKs="; }; postPatch = '' diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 5ef3bfa2ac40..7a79e597beb5 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -11,13 +11,14 @@ , graphviz , libxslt , libiconv +, removeReferencesTo }: stdenv.mkDerivation rec { pname = "exiv2"; version = "0.27.5"; - outputs = [ "out" "dev" "doc" "man" ]; + outputs = [ "out" "lib" "dev" "doc" "man" "static" ]; src = fetchFromGitHub { owner = "exiv2"; @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { gettext graphviz libxslt + removeReferencesTo ]; buildInputs = lib.optional stdenv.isDarwin libiconv; @@ -50,6 +52,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DEXIV2_ENABLE_NLS=ON" "-DEXIV2_BUILD_DOC=ON" + "-DEXIV2_ENABLE_BMFF=ON" ]; buildFlags = [ @@ -94,8 +97,24 @@ stdenv.mkDerivation rec { rm * mv .exiv2 exiv2 ) + + mkdir -p $static/lib + mv $lib/lib/*.a $static/lib/ + + remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 $static/lib/*.a ''; + postFixup = '' + substituteInPlace "$dev"/lib/cmake/exiv2/exiv2Config.cmake --replace \ + "set(_IMPORT_PREFIX \"$out\")" \ + "set(_IMPORT_PREFIX \"$static\")" + substituteInPlace "$dev"/lib/cmake/exiv2/exiv2Config-*.cmake --replace \ + "$lib/lib/libexiv2-xmp.a" \ + "$static/lib/libexiv2-xmp.a" + ''; + + disallowedReferences = [ stdenv.cc.cc ]; + meta = with lib; { homepage = "https://www.exiv2.org/"; description = "A library and command-line utility to manage image metadata"; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index d44783079f0f..ac54ced75b1b 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,4 +1,13 @@ -{ stdenv, fetchurl, lib }: +{ lib +, stdenv +, fetchurl +# for passthru.tests +, python3 +, perlPackages +, haskellPackages +, luaPackages +, ocamlPackages +}: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -7,11 +16,11 @@ stdenv.mkDerivation rec { pname = "expat"; - version = "2.4.2"; + version = "2.4.6"; src = fetchurl { url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-vC/1j0nCmqx7/3BabBZ6gh8mxRIHn/CKxDL9D9ybsZk="; + sha256 = "sha256-3lV5S3qbwhSFL9wHW+quzYVO/hNhWX5iaO6HlGlRKJs="; }; outputs = [ "out" "dev" ]; # TODO: fix referrers @@ -34,6 +43,14 @@ stdenv.mkDerivation rec { --replace "$"'{_IMPORT_PREFIX}' $out ''; + passthru.tests = { + inherit python3; + inherit (haskellPackages) hexpat; + inherit (perlPackages) XMLSAXExpat XMLParser; + inherit (luaPackages) luaexpat; + inherit (ocamlPackages) ocaml_expat; + }; + meta = with lib; { homepage = "https://libexpat.github.io/"; description = "A stream-oriented XML parser library written in C"; diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 0afef1c9fd82..396acbc1bdf2 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index e26ebef0c518..98c660dc798d 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -11,25 +11,21 @@ , gst-plugins-good , gst-plugins-bad , gst-libav +, python3 }: stdenv.mkDerivation rec { pname = "farstream"; - version = "0.2.8"; + version = "0.2.9"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://www.freedesktop.org/software/farstream/releases/farstream/${pname}-${version}.tar.gz"; - sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb"; + sha256 = "0yzlh9jf47a3ir40447s7hlwp98f9yr8z4gcm0vjwz6g6cj12zfb"; }; patches = [ - # Python has not been used for ages - (fetchpatch { - url = "https://gitlab.freedesktop.org/farstream/farstream/commit/73891c28fa27d5e65a71762e826f13747d743588.patch"; - sha256 = "19pw1m8xhxyf5yhl6k898w240ra2k0m28gfv858x70c4wl786lrn"; - }) # Fix build with newer gnumake. (fetchpatch { url = "https://gitlab.freedesktop.org/farstream/farstream/-/commit/54987d44.diff"; @@ -47,6 +43,7 @@ stdenv.mkDerivation rec { pkg-config autoreconfHook gobject-introspection + python3 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index de20caf22fbc..31e9e2fbbbd7 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -20,14 +20,14 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "2.5.1"; + version = "3.0.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "0dn0ic2ddi5qz6nqscsn7nlih67ad8vpclppbqwas6xavdfq6va2"; + sha256 = "0jxy92ny8b7s7yvz1mr8zpf7l2zsn506fi9f98pvh9k25jprg0cx"; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 1ec666a920c3..434d445ceb48 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A language independent, scalable, open extension to CG"; - homepage = "http://www.fastcgi.com/"; + homepage = "https://fastcgi-archives.github.io/"; # Formerly http://www.fastcgi.com/ license = "FastCGI see LICENSE.TERMS"; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/febio/default.nix b/pkgs/development/libraries/febio/default.nix new file mode 100644 index 000000000000..4d01bf52bf73 --- /dev/null +++ b/pkgs/development/libraries/febio/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, fetchFromGitHub, cmake, boost, eigen, libxml2, mpi, python3 +, mklSupport ? true, mkl +}: + +stdenv.mkDerivation rec { + pname = "FEBio"; + version = "3.6"; + + src = fetchFromGitHub { + owner = "febiosoftware"; + repo = pname; + rev = "v${version}"; + sha256 = "187s4lyzr806xla3smq3lsvj3f6wxlhfkban89w0fnyfmfb8w9am"; + }; + + patches = [ + ./fix-cmake.patch # cannot find mkl libraries without this + ]; + + cmakeFlags = lib.optional mklSupport "-DUSE_MKL=On" + ++ lib.optional mklSupport "-DMKLROOT=${mkl}" + ; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include + cp -R lib bin $out/ + cp -R ../FECore \ + ../FEBioFluid \ + ../FEBioLib \ + ../FEBioMech \ + ../FEBioMix \ + ../FEBioOpt \ + ../FEBioPlot \ + ../FEBioXML \ + ../NumCore \ + $out/include + + runHook postInstall + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost eigen libxml2 mpi python3 python3.pkgs.numpy ] + ++ lib.optional mklSupport mkl + ; + + meta = { + description = "FEBio Suite Solver"; + license = with lib.licenses; [ mit ]; + homepage = "https://febio.org/"; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ Scriptkiddi ]; + }; +} diff --git a/pkgs/development/libraries/febio/fix-cmake.patch b/pkgs/development/libraries/febio/fix-cmake.patch new file mode 100644 index 000000000000..5af10a0b3962 --- /dev/null +++ b/pkgs/development/libraries/febio/fix-cmake.patch @@ -0,0 +1,26 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,7 +47,7 @@ function(findLib libName libDir libOut) + find_library(TEMP NAMES ${libName}.lib ${ARGV3}.lib ${ARGV4}.lib ${ARGV5}.lib ${ARGV6}.lib + PATHS ${${libDir}} NO_DEFAULT_PATH) + else() +- find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a ++ find_library(TEMP NAMES lib${libName}.a lib${ARGV3}.a lib${ARGV4}.a lib${ARGV5}.a lib${ARGV6}.a lib${libName}.so lib${ARGV3}.so lib${ARGV4}.so lib${ARGV5}.so lib${ARGV6}.so + PATHS ${${libDir}} NO_DEFAULT_PATH) + endif() + +diff --git a/FindDependencies.cmake b/FindDependencies.cmake +index 2d644005f..7261ba923 100644 +--- a/FindDependencies.cmake ++++ b/FindDependencies.cmake +@@ -46,8 +46,8 @@ if(MKLROOT) + NO_DEFAULT_PATH) + + find_library(MKL_OMP_LIB +- NAMES iomp5 iomp5md libiomp5md.lib +- PATHS ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib ++ NAMES libiomp5.so libiomp5 iomp5 iomp5md libiomp5md.lib ++ PATHS ${MKLROOT}/lib ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib + PATH_SUFFIXES "intel64" "intel32" + NO_DEFAULT_PATH + DOC "MKL OMP Library") diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index ca2f3b0e381d..134d9031e97e 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -6,13 +6,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "fflas-ffpack"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "linbox-team"; repo = pname; - rev = version; - sha256 = "1ynbjd72qrwp0b4kpn0p5d7gddpvj8dlb5fwdxajr5pvkvi3if74"; + rev = "v${version}"; + sha256 = "sha256-Eztc2jUyKRVUiZkYEh+IFHkDuPIy+Gx3ZW/MsuOVaMc="; }; checkInputs = [ diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index e4a5d908d263..9d9a1a126cb2 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, ffmpeg, addOpenGLRunpath, pkg-config, perl, texinfo, yasm +{ lib, stdenv, buildPackages, ffmpeg, addOpenGLRunpath, pkg-config, perl, texinfo, yasm /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -32,7 +32,6 @@ , avdeviceLibrary ? true # Build avdevice library , avfilterLibrary ? true # Build avfilter library , avformatLibrary ? true # Build avformat library -, avresampleLibrary ? true # Build avresample library , avutilLibrary ? true # Build avutil library , postprocLibrary ? true # Build postproc library , swresampleLibrary ? true # Build swresample library @@ -100,6 +99,7 @@ , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support , libXext ? null # Xlib support +, libxml2 ? null # libxml2 support, for IMF and DASH demuxers , xz ? null # xz-utils , nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support @@ -107,7 +107,7 @@ , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder #, opencv ? null # Video filtering , openglExtlib ? false, libGL ? null, libGLU ? null # OpenGL rendering -#, openh264 ? null # H.264/AVC encoder +, openh264 ? null # H.264/AVC encoder , openjpeg ? null # JPEG 2000 de/encoder , opensslExtlib ? false, openssl ? null , libpulseaudio ? null # Pulseaudio input support @@ -164,7 +164,7 @@ * * Not packaged: * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 - * libnut libquvi nvenc opencl openh264 oss shine twolame + * libnut libquvi nvenc opencl oss shine twolame * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * * Need fixes to support Darwin: @@ -225,7 +225,6 @@ assert avdeviceLibrary -> avformatLibrary && avcodecLibrary && avutilLibrary; # configure flag since 0.6 assert avformatLibrary -> avcodecLibrary && avutilLibrary; # configure flag since 0.6 -assert avresampleLibrary -> avutilLibrary; assert postprocLibrary -> avutilLibrary; assert swresampleLibrary -> soxr != null; assert swscaleLibrary -> avutilLibrary; @@ -260,7 +259,7 @@ stdenv.mkDerivation rec { configurePlatforms = []; configureFlags = [ - "--target_os=${stdenv.hostPlatform.parsed.kernel.name}" + "--target_os=${if stdenv.hostPlatform.isMinGW then "mingw64" else stdenv.hostPlatform.parsed.kernel.name}" #mingw32 and mingw64 doesn't have a difference here, it is internally rewritten as mingw32 "--arch=${stdenv.hostPlatform.parsed.cpu.name}" /* * Licensing flags @@ -282,7 +281,7 @@ stdenv.mkDerivation rec { (enableFeature hardcodedTablesBuild "hardcoded-tables") (enableFeature safeBitstreamReaderBuild "safe-bitstream-reader") (if multithreadBuild then ( - if isCygwin then + if stdenv.hostPlatform.isWindows then "--disable-pthreads --enable-w32threads" else # Use POSIX threads by default "--enable-pthreads --disable-w32threads") @@ -304,7 +303,6 @@ stdenv.mkDerivation rec { (enableFeature avdeviceLibrary "avdevice") (enableFeature avfilterLibrary "avfilter") (enableFeature avformatLibrary "avformat") - (enableFeature avresampleLibrary "avresample") (enableFeature avutilLibrary "avutil") (enableFeature (postprocLibrary && gplLicensing) "postproc") (enableFeature swresampleLibrary "swresample") @@ -375,6 +373,7 @@ stdenv.mkDerivation rec { (enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbxfixesExtlib "libxcb-xfixes") (enableFeature libxcbshapeExtlib "libxcb-shape") + (enableFeature (libxml2 != null) "libxml2") (enableFeature (xz != null) "lzma") (enableFeature nvenc "nvenc") (enableFeature (openal != null) "openal") @@ -382,7 +381,7 @@ stdenv.mkDerivation rec { (enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb") #(enableFeature (opencv != null) "libopencv") (enableFeature openglExtlib "opengl") - #(enableFeature (openh264 != null) "openh264") + (enableFeature (openh264 != null) "libopenh264") (enableFeature (openjpeg != null) "libopenjpeg") (enableFeature (opensslExtlib && gplLicensing) "openssl") (enableFeature (libpulseaudio != null) "libpulse") @@ -420,6 +419,7 @@ stdenv.mkDerivation rec { ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" + "--host-cc=${buildPackages.stdenv.cc}/bin/cc" ] ++ optionals stdenv.cc.isClang [ "--cc=clang" "--cxx=clang++" @@ -431,9 +431,9 @@ stdenv.mkDerivation rec { bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv libXext xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr + libxcb libXv libXext libxml2 xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore - zeromq4 zimg zlib + zeromq4 zimg zlib openh264 ] ++ optionals openglExtlib [ libGL libGLU ] ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva @@ -453,7 +453,7 @@ stdenv.mkDerivation rec { checkPhase = let ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' - ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavresample:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ + ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ make check -j$NIX_BUILD_CORES ''; diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix deleted file mode 100644 index daa03d0293a0..000000000000 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libsixel, yasm -}: - -stdenv.mkDerivation { - - pname = "ffmpeg-sixel"; - version = "nightly-2.3.x"; - - src = fetchFromGitHub { - owner = "saitoha"; - repo = "FFmpeg-SIXEL"; - rev = "8566fdb8b7516b54aed58f329dc216e06fc10052"; - sha256 = "00s2lggfdj2ibpngpyqqg7360p7yb69ys1ppg59yvv0m0mxk5x3k"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libsixel - yasm - ]; - - configurePhase = '' - ./configure --enable-libsixel --prefix=$out - ''; - - postInstall = '' - mv $out/bin/ffmpeg $out/bin/ffmpeg-sixel - ''; - - meta = with lib; { - description = "A complete, cross-platform solution to record, convert and stream audio and video, extended to support console graphics"; - homepage = "http://www.ffmpeg.org/"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ vrthra ]; - }; -} diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix deleted file mode 100644 index 25c0a12f731a..000000000000 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ callPackage -# Darwin frameworks -, Cocoa, CoreMedia -, ... -}@args: - -callPackage ./generic.nix (rec { - version = branch; - branch = "3.4.8"; - sha256 = "1d0r4yja2dkkyhdwx1migq46gsrcbajiv66263a5sq5bfr9dqkch"; - darwinFrameworks = [ Cocoa CoreMedia ]; - knownVulnerabilities = [ - "CVE-2021-30123" - ]; -} // args) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index e3b0534d2af9..4eb614d6e653 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,6 +1,6 @@ { lib, stdenv, buildPackages, fetchurl, pkg-config, addOpenGLRunpath, perl, texinfo, yasm , alsa-lib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg -, libssh, libtheora, libva, libdrm, libvorbis, libvpx, xz, libpulseaudio, soxr +, libssh, libtheora, libva, libdrm, libvorbis, libvpx, xz, soxr , x264, x265, xvidcore, zimg, zlib, libopus, speex, nv-codec-headers, dav1d , srt ? null , openglSupport ? false, libGLU ? null, libGL ? null @@ -19,7 +19,10 @@ , Cocoa, darwinFrameworks ? [ Cocoa ] # Inherit generics , branch, sha256, version, patches ? [], knownVulnerabilities ? [] -, doCheck ? true, ... +, doCheck ? true +, pulseaudioSupport ? stdenv.isLinux +, libpulseaudio +, ... }: /* Maintainer notes: @@ -149,7 +152,7 @@ stdenv.mkDerivation rec { (ifMinVer "2.2" (enableFeature openglSupport "opengl")) (ifMinVer "4.2" (enableFeature libmfxSupport "libmfx")) (ifMinVer "4.2" (enableFeature libaomSupport "libaom")) - (disDarwinOrArmFix (ifMinVer "0.9" "--enable-libpulse") "0.9" "--disable-libpulse") + (disDarwinOrArmFix (ifMinVer "0.9" (lib.optionalString pulseaudioSupport "--enable-libpulse")) "0.9" "--disable-libpulse") (ifMinVer "2.5" (if sdlSupport && reqMin "3.2" then "--enable-sdl2" else if sdlSupport then "--enable-sdl" else null)) # autodetected before 2.5, SDL1 support removed in 3.2 for SDL2 (ifMinVer "1.2" "--enable-libsoxr") "--enable-libx264" @@ -182,7 +185,7 @@ stdenv.mkDerivation rec { ++ optional libmfxSupport intel-media-sdk ++ optional libaomSupport libaom ++ optional vpxSupport libvpx - ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM + ++ optionals (!isDarwin && !isAarch32 && pulseaudioSupport) [ libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva ++ optional ((isLinux || isFreeBSD) && !isAarch32) libdrm ++ optional isLinux alsa-lib diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index dfdbf8eb2f80..9bfee290871f 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ffmpegthumbnailer"; - version = "2.2.2"; + version = "unstable-2021-09-02"; src = fetchFromGitHub { owner = "dirkvdb"; repo = "ffmpegthumbnailer"; - rev = version; - sha256 = "1bakbr714j7yxdal1f5iq0gcl4cxggbbgj227ihdh5kvygqlwich"; + rev = "d92e191dd793b12cee0a0f685f5a8d8252988399"; + sha256 = "1ysfq3g74b8ivivrdpfi4vm23d3cyc3rfla5i6y8q9aycis9xv6q"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 283942df63f9..6e7a58f5597e 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, ffmpeg +, ffmpeg_4 , zlib }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - ffmpeg + ffmpeg_4 zlib ]; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index f4b30129e610..4f3d685c1fa4 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -3,7 +3,7 @@ , lib , gfortran , perl -, llvmPackages ? null +, llvmPackages , precision ? "double" , enableAvx ? stdenv.hostPlatform.avxSupport , enableAvx2 ? stdenv.hostPlatform.avx2Support @@ -11,24 +11,20 @@ , enableFma ? stdenv.hostPlatform.fmaSupport , enableMpi ? false , mpi +, withDoc ? stdenv.cc.isGNU }: with lib; -assert stdenv.cc.isClang -> llvmPackages != null; assert elem precision [ "single" "double" "long-double" "quad-precision" ]; -let +stdenv.mkDerivation rec { + pname = "fftw-${precision}"; version = "3.3.10"; - withDoc = stdenv.cc.isGNU; -in - -stdenv.mkDerivation { - name = "fftw-${precision}-${version}"; src = fetchurl { urls = [ - "http://fftw.org/fftw-${version}.tar.gz" + "https://fftw.org/fftw-${version}.tar.gz" "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz" ]; sha256 = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index 283c815b199b..c294aec893a5 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals enablePython [ python3 ]; meta = { - homepage = "http://people.cs.ubc.ca/~mariusm/flann/"; + homepage = "https://github.com/flann-lib/flann"; license = lib.licenses.bsd3; description = "Fast approximate nearest neighbor searches in high dimensional spaces"; maintainers = with lib.maintainers; [viric]; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 40e07c590742..c992a6b0dfa2 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , autoreconfHook , docbook_xml_dtd_45 , docbook-xsl-nons @@ -54,14 +53,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.12.2"; + version = "1.12.7"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "df1eb464f9142c11627f99f04f6a5c02c868bbb145489b8902cb6c105e774b75"; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "sha256-bbUqUxzieCgqx+v7mfZqC7PsyvROhkhEwslcHuW6kxY="; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ @@ -78,7 +77,7 @@ stdenv.mkDerivation rec { # Hardcode paths used by Flatpak itself. (substituteAll { src = ./fix-paths.patch; - p11kit = "${p11-kit.dev}/bin/p11-kit"; + p11kit = "${p11-kit.bin}/bin/p11-kit"; }) # Adapt paths exposed to sandbox for NixOS. @@ -97,13 +96,6 @@ stdenv.mkDerivation rec { # But we want the GDK_PIXBUF_MODULE_FILE from the wrapper affect the icon validator. ./validate-icon-pixbuf.patch - - # Tests don't respect the FLATPAK_BINARY override that was added, this is a workaround. - # https://github.com/flatpak/flatpak/pull/4496 (Can be removed once included). - (fetchpatch { - url = "https://github.com/flatpak/flatpak/commit/96dbe28cfa96e80b23fa1d8072eb36edad41279c.patch"; - sha256 = "1jczk06ymfs98h3nsg245g0jwxvml7wg2x6pb7mrfpsdmrpz2czd"; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/development/libraries/flatpak/unset-env-vars.patch index 63ce0d12fe07..6b8017684d45 100644 --- a/pkgs/development/libraries/flatpak/unset-env-vars.patch +++ b/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -1,11 +1,11 @@ diff --git a/common/flatpak-run.c b/common/flatpak-run.c -index 8d52d3a5..81700183 100644 +index 146c4f87..bcdad2bc 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1232,6 +1232,7 @@ static const ExportData default_exports[] = { - {"PERLLIB", NULL}, - {"PERL5LIB", NULL}, - {"XCURSOR_PATH", NULL}, +@@ -1710,6 +1710,7 @@ static const ExportData default_exports[] = { + {"GST_PTP_HELPER", NULL}, + {"GST_PTP_HELPER_1_0", NULL}, + {"GST_INSTALL_PLUGINS_HELPER", NULL}, + {"GDK_PIXBUF_MODULE_FILE", NULL}, }; diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 858144b150aa..6873508eb7dc 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -51,6 +51,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; homepage = "https://www.flintlib.org/"; downloadPage = "https://www.flintlib.org/downloads.html"; - updateWalker = true; }; } diff --git a/pkgs/development/libraries/flite/default.nix b/pkgs/development/libraries/flite/default.nix index cd8eb538462b..f4eac39919f2 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -27,7 +27,9 @@ stdenv.mkDerivation rec { "--enable-shared" ] ++ lib.optionals stdenv.isLinux [ "--with-audio=alsa" ]; - enableParallelBuilding = true; + # main/Makefile creates and removes 'flite_voice_list.c' from multiple targets: + # make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop + enableParallelBuilding = false; meta = with lib; { description = "A small, fast run-time speech synthesis engine"; diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 45d3f128c01c..f6161535df5d 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , pkg-config , meson , ninja @@ -36,24 +35,15 @@ stdenv.mkDerivation rec { pname = "folks"; - version = "0.15.3"; + version = "0.15.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Idc3+vCT9L4GVHPucMogiFuaLDaFlB26JMIjn9PFRKU="; + sha256 = "D/+KiWMwzYKu5FmDJPflQciE0DN1NiEnI7S+s4x1kIY="; }; - patches = [ - # Fix build with evolution-data-server ≥ 3.41 - # https://gitlab.gnome.org/GNOME/folks/-/merge_requests/52 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/folks/-/commit/62d588b0c609de17df5b4d1ebfbc67c456267efc.patch"; - sha256 = "TDL/5kvVwHnvDMuKDdPLQmpmE1FTZhY+7HG8NxKqt5w="; - }) - ]; - nativeBuildInputs = [ gettext gobject-introspection diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 85c80532b511..dfc194f1d4cd 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,31 +1,33 @@ { lib, stdenv , fetchFromGitHub -, cmake , boost -, libevent +, cmake , double-conversion -, glog +, fetchpatch +, fmt_8 , gflags +, glog +, libevent , libiberty +, libunwind , lz4 -, xz -, zlib -, jemalloc , openssl , pkg-config -, libunwind -, fmt +, xz +, zlib +, zstd +, follyMobile ? false }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { pname = "folly"; - version = "2021.10.25.00"; + version = "2022.02.28.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-+di8Dzt5NRbqIydBR4sB6bUbQrZZ8URUosdP2JGQMec="; + sha256 = "sha256-9h2NsfQMQ7ps9Rt0HhTD+YKwk/soGchCC9GyEJGcm4g="; }; nativeBuildInputs = [ @@ -45,11 +47,12 @@ stdenv.mkDerivation (rec { lz4 xz zlib - jemalloc libunwind - fmt + fmt_8 + zstd ]; + NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; meta = with lib; { @@ -57,9 +60,7 @@ stdenv.mkDerivation (rec { homepage = "https://github.com/facebook/folly"; license = licenses.asl20; # 32bit is not supported: https://github.com/facebook/folly/issues/103 - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; maintainers = with maintainers; [ abbradar pierreis ]; }; -} // lib.optionalAttrs stdenv.isDarwin { - LDFLAGS = "-ljemalloc"; -}) +} diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix index 3a82b566a50f..7d4ff382d8c1 100644 --- a/pkgs/development/libraries/fplll/default.nix +++ b/pkgs/development/libraries/fplll/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch +, pkg-config , gettext , autoreconfHook , gmp @@ -9,16 +9,17 @@ stdenv.mkDerivation rec { pname = "fplll"; - version = "5.3.2"; + version = "5.4.1"; src = fetchFromGitHub { owner = "fplll"; repo = "fplll"; rev = version; - sha256 = "00iyz218ywspizjiimrjdcqvdqmrsb2367zyy3vkmypnf9i9l680"; + sha256 = "sha256-6Zde8/bPOQQ16DqhqrQuGXDrf5HQEn5lwxauvyBr4XQ="; }; nativeBuildInputs = [ + pkg-config gettext autoreconfHook ]; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index ed455c534b2a..1fd088684cf8 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.3.3"; + version = "1.3.9"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-26AufwZh/0LcKJ/EHXzefgMIn9Mm8I7ijIcqyf9KHIQ="; + sha256 = "sha256-qByKmGp6LwuUWZ69eheF1yAX3qbXlqf0S2rGge53wuc="; }; buildInputs = [ diff --git a/pkgs/development/libraries/ftxui/default.nix b/pkgs/development/libraries/ftxui/default.nix index df664a309a7c..27a21ceca665 100644 --- a/pkgs/development/libraries/ftxui/default.nix +++ b/pkgs/development/libraries/ftxui/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ftxui"; - version = "unstable-2021-08-13"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ArthurSonzogni"; repo = pname; - rev = "69b0c9e53e523ac43a303964fc9c5bc0da7d5d61"; - sha256 = "0cbljksgy1ckw34h0mq70s8sma0p16sznn4z9r4hwv76y530m0ww"; + rev = "v${version}"; + sha256 = "sha256-BfNUk2DbBpKMBEu1tQWl85tgjB/4NAh86VVSS9zAjKo="; }; nativeBuildInputs = [ @@ -23,9 +23,13 @@ stdenv.mkDerivation rec { graphviz ]; + # gtest and gbenchmark don't seem to generate any binaries + doCheck = false; + meta = with lib; { homepage = "https://github.com/ArthurSonzogni/FTXUI"; - description = "Functional Terminal User Interface for C++"; + changelog = "https://github.com/ArthurSonzogni/FTXUI/blob/v${version}/CHANGELOG.md"; + description = "Functional Terminal User Interface library for C++"; license = licenses.mit; maintainers = [ maintainers.ivar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 9c97faaa45cb..b277a52a6583 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , pkg-config , meson , ninja @@ -34,6 +35,16 @@ stdenv.mkDerivation rec { sha256 = "CQn8SeqK1IMtJ1ZP8v0dxmZpbioHxzlBxIgp5gVy2gE="; }; + patches = [ + # Pull upstream fix for meson-0.60: + # https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81 + (fetchpatch { + name = "meson-0.60.patch"; + url = "https://gitlab.gnome.org/GNOME/gcr/-/commit/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch"; + sha256 = "15gwxkcm5q5p87p5lrqwgykpzx5gmk179xd3481yak93yhbvy165"; + }) + ]; + nativeBuildInputs = [ pkg-config meson diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index cd971b291b98..7ea8ce6d29b4 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -5,10 +5,11 @@ , pkg-config , zlib , libpng -, libjpeg ? null -, libwebp ? null -, libtiff ? null -, libXpm ? null +, libjpeg +, libwebp +, libtiff +, libXpm +, libavif , fontconfig , freetype }: @@ -41,8 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkg-config ]; - buildInputs = [ zlib fontconfig freetype ]; - propagatedBuildInputs = [ libpng libjpeg libwebp libtiff libXpm ]; + buildInputs = [ zlib fontconfig freetype libpng libjpeg libwebp libtiff libXpm libavif ]; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 124c0a48cde6..bfa1c75b483f 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${version}"; - sha256 = "11rjdaxmsp9n3r9xhmgd7ksy8bh5fazwsxdj0xvl4hsy6bcn4n97"; + sha256 = "sha256-bE55VV0SrG8nxCLdpODRalnuAkn+olRdMLUjduavj6M="; }; sourceRoot = "source/gdal"; @@ -62,7 +62,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - CXXFLAGS = "-fpermissive"; + CXXFLAGS = lib.concatStringsSep " " [ + "-fpermissive" + # poppler uses std::optional + "-std=c++17" + ]; # - Unset CC and CXX as they confuse libtool. # - teach gdal that libdf is the legacy name for libhdf diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 83df37f236be..e1a3def0ba42 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gdbm"; - version = "1.20"; + version = "1.23"; src = fetchurl { url = "mirror://gnu/gdbm/${pname}-${version}.tar.gz"; - sha256 = "sha256-OurAVkizSCoQotqYa586OAoprWUL6AuYF6Q1+4EUopI="; + sha256 = "sha256-dLEIHSH/8TrkvXwW5dblBKTCb3zeHcoNljpIQXS7ys0="; }; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 708d3c67db35..de7bf815b044 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "gdcm"; - version = "3.0.10"; + version = "3.0.11"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; rev = "v${version}"; - sha256 = "sha256-KFN13kGE0E8gQBgtErvkW7Fa+3YYqQh0RA2bPS90WUI="; + sha256 = "sha256-rGR0yQImLG3kBp6/QoEMLFrFtgAIN6y9lZ3OmtAUVcY="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 3182a4b39988..1e9c881ae8ce 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "gdk-pixbuf"; - version = "2.42.6"; + version = "2.42.8"; outputs = [ "out" "dev" "man" ] ++ lib.optional withGtkDoc "devdoc" @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zz7pmw2z46g7mr1yjxbsdldd5pd03xbjc58inj8rxfqgrdvg9n4"; + sha256 = "hKzqOsskEbKRNLMgFaWxqqYoRLGcSx74uJccawdZ9MY="; }; patches = [ @@ -111,10 +111,6 @@ stdenv.mkDerivation rec { '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ $dev/bin/gdk-pixbuf-query-loaders --update-cache - '' + lib.optionalString withGtkDoc '' - # So that devhelp can find this. - mkdir -p "$devdoc/share/devhelp" - mv "$out/share/doc" "$devdoc/share/devhelp/books" ''; # The fixDarwinDylibNames hook doesn't patch binaries. @@ -124,6 +120,11 @@ stdenv.mkDerivation rec { done ''; + postFixup = lib.optionalString withGtkDoc '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). inherit doCheck; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 6acb93c82bed..df1b86fd1b78 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -36,14 +36,14 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.34"; + version = "0.4.36"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-72PwvKW0McYRmt3YNMp/u1B8kAxIYcV7Nme29Mz8qqo="; + sha256 = "sha256-b9WKDNzHcCJYra7/tXOjiSKK6PDv9HV479ojCbYbLKY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index c4d961f4b76f..90fe46582672 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.9"; + version = "2.3.6"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SN8zMMBX02kIS9q1/7DO+t826DpmbZBO37TDZtvRT1A="; + sha256 = "sha256-aPTwN5DuUFPqLDwq73KvmBR8tEN5bIX6/JOZMfOAoow="; }; passthru = { diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 3f8215d19fc2..22acc73c49c6 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libiconv, xz }: +{ stdenv, lib, fetchurl, fetchpatch, libiconv, xz }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -15,7 +15,11 @@ stdenv.mkDerivation rec { }; patches = [ ./absolute-paths.diff - ]; + ] ++ lib.optional stdenv.hostPlatform.isWindows (fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/gettext_formatstring-ruby.patch?h=mingw-w64-gettext&id=e8b577ee3d399518d005e33613f23363a7df07ee"; + name = "gettext_formatstring-ruby.patch"; + sha256 = "sha256-6SxZObOMkQDxuKJuJY+mQ/VuJJxSeGbf97J8ZZddCV0="; + }); outputs = [ "out" "man" "doc" "info" ]; diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix deleted file mode 100644 index ca4a3c98e0a6..000000000000 --- a/pkgs/development/libraries/giblib/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, xlibsWrapper, imlib2 }: - -stdenv.mkDerivation rec { - pname = "giblib"; - version = "1.2.4"; - - src = fetchurl { - url = "http://linuxbrit.co.uk/downloads/giblib-${version}.tar.gz"; - sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"; - }; - - outputs = [ "out" "dev" ]; - setOutputFlags = false; - - preConfigure = '' - configureFlagsArray+=( - --includedir=$dev/include - ) - ''; - - buildInputs = [ xlibsWrapper ]; - propagatedBuildInputs = [ imlib2 ]; - - postFixup = '' - moveToOutput bin/giblib-config "$dev" - - # Doesn't contain useful stuff - rm -rf $out/share/doc - ''; - - meta = { - homepage = "http://linuxbrit.co.uk/giblib/"; - description = "wrapper library for imlib2, and other stuff"; - platforms = lib.platforms.unix; - license = lib.licenses.mit; - }; -} diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix deleted file mode 100644 index 35ef9fba1051..000000000000 --- a/pkgs/development/libraries/git2/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, python3 -, zlib, libssh2, openssl, pcre, http-parser -, libiconv, Security -}: - -stdenv.mkDerivation rec { - pname = "libgit2"; - version = "1.3.0"; - # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib - - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; - }; - - cmakeFlags = [ - "-DTHREADSAFE=ON" - "-DUSE_HTTP_PARSER=system" - ]; - - nativeBuildInputs = [ cmake python3 pkg-config ]; - - buildInputs = [ zlib libssh2 openssl pcre http-parser ] - ++ lib.optional stdenv.isDarwin Security; - - propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; - - doCheck = false; # hangs. or very expensive? - - meta = { - description = "The Git linkable library"; - homepage = "https://libgit2.github.com/"; - license = lib.licenses.gpl2; - platforms = with lib.platforms; all; - }; -} diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 29674118dfee..83f7854a73b0 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, autoreconfHook, gmpxx }: stdenv.mkDerivation rec { pname = "givaro"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "linbox-team"; repo = pname; rev = "v${version}"; - sha256 = "11wz57q6ijsvfs5r82masxgr319as92syi78lnl9lgdblpc6xigk"; + sha256 = "sha256-KR0WJc0CSvaBnPRott4hQJhWNBb/Wi6MIhcTExtVobQ="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 29eb1b948247..42ba3bd46df8 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -8,7 +8,7 @@ , gtk3 , atk , gobject-introspection -, spidermonkey_78 +, spidermonkey_91 , pango , cairo , readline @@ -30,13 +30,13 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.70.0"; + version = "1.72.0"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-SwYpNBoxigI3ThE6uX+anzMlQjJp/B4LBDpf+wGGHF8="; + sha256 = "sha256-PvDK9xbjkg3WH3dI9tVuR2zA/Bg1GtBUjn3xoKub3K0="; }; patches = [ @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { gobject-introspection cairo readline - spidermonkey_78 + spidermonkey_91 dbus # for dbus-run-session ]; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 1a693e0e0452..fce73f74660e 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.70.1"; + version = "2.72.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Kha/wtJxzNMmbj+0YryKQQPALoG7szmqktb7BgWS17w="; + sha256 = "EAquuzaShQQd5S2kIra3FnidXk11SaOnG6WHuTLggjs="; }; patches = [ diff --git a/pkgs/development/libraries/glib-testing/default.nix b/pkgs/development/libraries/glib-testing/default.nix index bdbced24a10e..d77a5418a13e 100644 --- a/pkgs/development/libraries/glib-testing/default.nix +++ b/pkgs/development/libraries/glib-testing/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "glib-testing"; - version = "0.1.0"; + version = "0.1.1"; outputs = [ "out" "dev" "devdoc" "installedTests" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = "libglib-testing"; rev = version; - sha256 = "0xmycsrlqyji6sc2i4wvp2gxf3897z65a57ygihfnpjpyl7zlwkr"; + sha256 = "U3epLDdLES7MA71z7Q1WXMjzySTFERWBU0u8poObbEo="; }; patches = [ diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 9d21d8e06f01..ecae47b3d2dd 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,16 +45,15 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.70.2"; + version = "2.72.0"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "BVFFnIXNPaPVjdyQFv0ovlr1A/XhYVpxultRKslFgG8="; + sha256 = "177w1MTnpi4I77jl8lKgE1cAe5WIqH/ytGOjhXAR950="; }; patches = optionals stdenv.isDarwin [ ./darwin-compilation.patch - ./link-with-coreservices.patch ] ++ optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch @@ -93,6 +92,7 @@ stdenv.mkDerivation rec { buildInputs = [ libelf setupHook pcre + ] ++ optionals (!stdenv.hostPlatform.isWindows) [ bash gnum4 # install glib-gettextize and m4 macros for other apps to use ] ++ optionals stdenv.isLinux [ libselinux @@ -115,7 +115,10 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ - meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2 + (meson.override { + withDarwinFrameworksGtkDocPatch = stdenv.isDarwin; + }) + ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2 ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ]; @@ -141,8 +144,11 @@ stdenv.mkDerivation rec { chmod +x docs/reference/gio/concat-files-helper.py patchShebangs docs/reference/gio/concat-files-helper.py patchShebangs glib/gen-unicode-tables.pl - patchShebangs tests/gen-casefold-txt.py - patchShebangs tests/gen-casemap-txt.py + patchShebangs glib/tests/gen-casefold-txt.py + patchShebangs glib/tests/gen-casemap-txt.py + '' + lib.optionalString stdenv.hostPlatform.isWindows '' + substituteInPlace gio/win32/meson.build \ + --replace "libintl, " "" ''; DETERMINISTIC_BUILD = 1; @@ -198,7 +204,10 @@ stdenv.mkDerivation rec { getSchemaDataDirPath = pkg: makeSchemaDataDirPath pkg pkg.name; inherit flattenInclude; - updateScript = gnome.updateScript { packageName = "glib"; }; + updateScript = gnome.updateScript { + packageName = "glib"; + versionPolicy = "odd-unstable"; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/glib/link-with-coreservices.patch b/pkgs/development/libraries/glib/link-with-coreservices.patch deleted file mode 100644 index dcc0a8998cc3..000000000000 --- a/pkgs/development/libraries/glib/link-with-coreservices.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build.orig 2020-11-25 13:47:38.499149252 +0900 -+++ b/meson.build 2020-11-25 13:48:47.098444800 +0900 -@@ -742,7 +742,7 @@ - - if glib_have_carbon - glib_conf.set('HAVE_CARBON', true) -- osx_ldflags += '-Wl,-framework,Carbon' -+ osx_ldflags += ['-Wl,-framework,Carbon', '-Wl,-framework,CoreServices'] - glib_have_os_x_9_or_later = objcc.compiles('''#include - #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090 - #error Compiling for minimum OS X version before 10.9 diff --git a/pkgs/development/libraries/glibc/2.33-master.patch.gz b/pkgs/development/libraries/glibc/2.33-master.patch.gz index aecf1550feff..777e94e2b2ea 100644 Binary files a/pkgs/development/libraries/glibc/2.33-master.patch.gz and b/pkgs/development/libraries/glibc/2.33-master.patch.gz differ diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 1bc5bf08ee46..ffec9972d287 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -44,7 +44,7 @@ let version = "2.33"; - patchSuffix = "-62"; + patchSuffix = "-117"; sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; in @@ -63,7 +63,7 @@ stdenv.mkDerivation ({ [ /* 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.33/master && git describe - glibc-2.33-62-gc493f6a0e4 + glibc-2.33-117-g55446dd8a2 $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz To compare the archive contents zdiff can be used. diff --git a/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch rename to pkgs/development/libraries/gnome-desktop/bubblewrap-paths.patch diff --git a/pkgs/desktops/gnome/core/gnome-desktop/default.nix b/pkgs/development/libraries/gnome-desktop/default.nix similarity index 93% rename from pkgs/desktops/gnome/core/gnome-desktop/default.nix rename to pkgs/development/libraries/gnome-desktop/default.nix index 860af8bee13a..5d682e23b277 100644 --- a/pkgs/desktops/gnome/core/gnome-desktop/default.nix +++ b/pkgs/development/libraries/gnome-desktop/default.nix @@ -7,6 +7,7 @@ , ninja , gnome , gtk3 +, gtk4 , glib , gettext , libxml2 @@ -26,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "41.2"; + version = "42.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-NDKe79rK0jMqatuuU4yNpuUiNcd3WpCLfDIECgdT7Go="; + sha256 = "sha256-88qik6Xob2zK0Y+BcnPbHGcGHmgNedg5qop1KOW7JtY="; }; patches = [ @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { isocodes wayland gtk3 + gtk4 glib libseccomp systemd @@ -84,7 +86,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-desktop"; - attrPath = "gnome.gnome-desktop"; }; }; diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 9337a8e93d6d..f58e87b2f7e6 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.40.1"; + version = "3.43.1"; # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 src = fetchFromGitLab { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "sha256-q4bLGOOGoGH/Et3hu7/372tjNMouX9ePTanIo0c4Jbw="; + sha256 = "sha256-Dpq5bQwU0ZAxmEllpbLnS1Jz3F0rxtFMKZcIvAteObU="; }; outputs = [ "out" "man" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix deleted file mode 100644 index 4aa510f36068..000000000000 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, gtk2 -, mono -, gtk-sharp-2_0 -, gnome2 -, autoconf -, automake -, libtool -, which -}: - -stdenv.mkDerivation rec { - pname = "gnome-sharp"; - version = "2.24.4"; - - src = fetchFromGitHub { - owner = "mono"; - repo = "gnome-sharp"; - rev = version; - sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z"; - }; - - nativeBuildInputs = [ pkg-config autoconf automake libtool which ]; - buildInputs = [ gtk2 mono gtk-sharp-2_0 ] - ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]); - - patches = [ ./fix-mono-path.patch ]; - - preConfigure = '' - ./bootstrap-${lib.versions.majorMinor version} - ''; - - dontStrip = true; - - meta = with lib; { - homepage = "https://www.mono-project.com/docs/gui/gtksharp/"; - description = "A .NET language binding for assorted GNOME libraries"; - license = licenses.lgpl21; - platforms = platforms.linux; - maintainers = with maintainers; [ vbgl ]; - }; -} diff --git a/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch b/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch deleted file mode 100644 index 706f119c8baa..000000000000 --- a/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sample/gconf/Makefile.am b/sample/gconf/Makefile.am -index a0ee802..8260694 100644 ---- a/sample/gconf/Makefile.am -+++ b/sample/gconf/Makefile.am -@@ -22,7 +22,7 @@ sample.exe: $(SCHEMA) $(srcdir)/sample.glade $(FILES) $(ASSEMBLIES) - $(CSC) /out:sample.exe $(FILES) $(REFERENCES) $(RESOURCES) - - Settings.cs: $(SCHEMA) -- MONO_PATH=$(top_builddir)/gconf/GConf/gconf-sharp.dll:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs -+ MONO_PATH=$(top_builddir)/gconf/GConf/:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs - - CLEANFILES = sample.exe Settings.cs - diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index a08997ea2cdb..0b7650199923 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -20,6 +20,8 @@ in stdenv.mkDerivation { mkdir -p $out cp ${configGuess} $out/config.guess cp ${configSub} $out/config.sub + + chmod +x $out/config.* ''; meta = with lib; { diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index f56052953033..627e5f46f728 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip -, perl, gmp, autoconf, automake, libidn, libiconv +, perl, gmp, autoconf, automake, libidn2, libiconv , unbound, dns-root-data, gettext, util-linux , cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so , guileBindings ? config.gnutls.guile or false, guile @@ -21,11 +21,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.7.2"; + version = "3.7.3"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - sha256 = "646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752"; + sha256 = "16n4yvw3792gcdxkikjmhddr6cbs4wlk027zfxlhmchsqcxw8ngw"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ lzo lzip libtasn1 libidn zlib gmp libunistring unbound gettext libiconv ] + buildInputs = [ lzo lzip libtasn1 libidn2 zlib gmp libunistring unbound gettext libiconv ] ++ lib.optional (withP11-kit) p11-kit ++ lib.optional (isDarwin && withSecurity) Security ++ lib.optional (tpmSupport && stdenv.isLinux) trousers diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch index c02330adf6d1..b6dc66fc66b1 100644 --- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch +++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch @@ -1,3 +1,5 @@ +diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py +index 64575557..1eb0a2b4 100644 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -95,6 +95,39 @@ def get_windows_option_group(parser): @@ -41,16 +43,18 @@ parser = optparse.OptionParser('%prog [options] sources', version='%prog ' + giscanner.__version__) @@ -214,6 +247,10 @@ match the namespace prefix.""") - parser.add_option("", "--filelist", - action="store", dest="filelist", default=[], - help="file containing headers and sources to be scanned") + parser.add_option("", "--c-include", + action="append", dest="c_includes", default=[], + help="headers which should be included in C programs") + parser.add_option("", "--fallback-library-path", + action="store", dest="fallback_libpath", + default=_get_default_fallback_libpath(), + help="Path to prepend to unknown shared libraries") - - group = get_preprocessor_option_group(parser) - parser.add_option_group(group) + parser.add_option("", "--filelist", + action="store", dest="filelist", default=[], + help="file containing headers and sources to be scanned") +diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py +index 9f8ab5df..af325022 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -57,6 +57,12 @@ def _ldd_library_pattern(library_name): @@ -115,9 +119,11 @@ if m: del patterns[library] shlibs.append(m.group()) +diff --git a/giscanner/utils.py b/giscanner/utils.py +index 31c7ea48..630002a8 100644 --- a/giscanner/utils.py +++ b/giscanner/utils.py -@@ -113,16 +113,11 @@ def extract_libtool_shlib(la_file): +@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file): if dlname is None: return None @@ -139,6 +145,8 @@ # Returns arguments for invoking libtool, if applicable, otherwise None +diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py +index a8337c60..72789d76 100644 --- a/tests/scanner/test_shlibs.py +++ b/tests/scanner/test_shlibs.py @@ -7,6 +7,30 @@ from giscanner.shlibs import resolve_from_ldd_output, sanitize_shlib_path diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 25b7770101d1..b457331983aa 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , glib , flex @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { pname = "gobject-introspection"; - version = "1.70.0"; + version = "1.72.0"; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build # by pygobject3 (and maybe others), but it's only searched in $out @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jpwraip7pwl9bf9s59am3r7074p34fasvfb5ym1fb8hwc34jawh"; + sha256 = "Av6OWQhh2I+DBg3TnNpcyqYLLaHSHQ+VSZMBsYa+qrw="; }; patches = [ diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index 870e919357e0..8758daf9c3ab 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -11,6 +11,7 @@ , gtest , ninja , nlohmann_json +, openssl , pkg-config , protobuf # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173 @@ -18,29 +19,29 @@ , staticOnly ? stdenv.hostPlatform.isStatic }: let - googleapisRev = "ed739492993c4a99629b6430affdd6c0fb59d435"; + googleapisRev = "d4f3468ef85278428005ed555b3a85db91551ee6"; googleapis = fetchFromGitHub { owner = "googleapis"; repo = "googleapis"; rev = googleapisRev; - hash = "sha256:1xrnh77vb8hxmf1ywqsifzd39kylhbdyah0b0b9bm7nw0mnahssl"; + hash = "sha256-sIQVFQhE3Ae6ia45apzdgtwzglMM4hFZ8efNAhMO5ZY="; }; excludedTests = builtins.fromTOML (builtins.readFile ./skipped_tests.toml); in stdenv.mkDerivation rec { pname = "google-cloud-cpp"; - version = "1.32.1"; + version = "1.38.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-cpp"; rev = "v${version}"; - sha256 = "0g720sni70nlncv4spm4rlfykdkpjnv81axfz2jd1arpdajm0mg9"; + sha256 = "sha256-kobOkohWIDTQaaihhoh/25tZUNv+CjKFwj2xQqO52bA="; }; postPatch = '' substituteInPlace external/googleapis/CMakeLists.txt \ - --replace "https://github.com/googleapis/googleapis/archive/${googleapisRev}.tar.gz" "file://${googleapis}" + --replace "https://github.com/googleapis/googleapis/archive/\''${GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" ''; nativeBuildInputs = [ @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { ninja pkg-config ] ++ lib.optionals (!doInstallCheck) [ - # enable these dependencies when doInstallCheck failse because we're + # enable these dependencies when doInstallCheck is false because we're # unconditionally building tests and benchmarks # # when doInstallCheck is true, these deps are added to installCheckInputs @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { curl grpc nlohmann_json + openssl protobuf ]; diff --git a/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml b/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml index c2fb2a24483a..8cbe766862b2 100644 --- a/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml +++ b/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml @@ -1,6 +1,6 @@ whole = [ "bigquery_bigquery_read_integration_test", - "bigtable_admin_backup_integration_test", + "bigtable_admin_admin_iam_policy_integration_test", "bigtable_admin_iam_policy_integration_test", "bigtable_admin_integration_test", "bigtable_apply_read_latency_benchmark", @@ -15,12 +15,15 @@ whole = [ "bigtable_table_sample_rows_integration_test", "iam_iam_credentials_integration_test", "iam_iam_integration_test", + "logging_quickstart", "pubsub_endurance", "pubsub_schema_admin_integration_test", "pubsub_subscriber_integration_test", "pubsub_subscription_admin_integration_test", "pubsub_throughput", "pubsub_topic_admin_integration_test", + "rest_internal_internal_curl_rest_client_integration_test", + "rest_internal_internal_unified_rest_credentials_integration_test", "spanner_admin_backup_extra_integration_test", "spanner_admin_database_admin_integration_test", "spanner_admin_instance_admin_integration_test", diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 263807c2fc1d..75b13b6b7ef1 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,28 +1,37 @@ -{ lib, stdenv, fetchurl, fetchpatch -, autoreconfHook, libgpg-error, gnupg, pkg-config, glib, pth, libassuan -, file, which, ncurses +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, libgpg-error +, gnupg +, pkg-config +, glib +, pth +, libassuan +, file +, which +, ncurses , texinfo , buildPackages , qtbase ? null -, pythonSupport ? false, swig2 ? null, python ? null +, pythonSupport ? false +, swig2 ? null +, python ? null }: - let inherit (stdenv.hostPlatform) system; in - stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; - sha256 = "1l4yw9fqc1blvx1sq1jnfvp1jijla3ca2jw90p4x9m8hvfpc933c"; + sha256 = "1xb9k88rrafdi0n95nzx0d6bz7hcn9b44hciqbigrqkvxc6gblsf"; }; patches = [ - # probably included in > 1.16.0 - ./test_t-edit-sign.diff # https://dev.gnupg.org/rMc4cf527ea227edb468a84bf9b8ce996807bd6992 ./fix_gpg_list_keys.diff # https://lists.gnupg.org/pipermail/gnupg-devel/2020-April/034591.html @@ -31,22 +40,48 @@ stdenv.mkDerivation rec { url = "https://lists.gnupg.org/pipermail/gnupg-devel/attachments/20200415/f7be62d1/attachment.obj"; sha256 = "00d4sxq63601lzdp2ha1i8fvybh7dzih4531jh8bx07fab3sw65g"; }) + # Support Python 3.10 version detection without distutils, https://dev.gnupg.org/D545 + ./python-310-detection-without-distutils.patch + # Find correct version string for Python >= 3.10, https://dev.gnupg.org/D546 + ./python-find-version-string-above-310.patch # Disable python tests on Darwin as they use gpg (see configureFlags below) ] ++ lib.optional stdenv.isDarwin ./disable-python-tests.patch - # Fix _AC_UNDECLARED_WARNING for autoconf≥2.70. See https://lists.gnupg.org/pipermail/gnupg-devel/2020-November/034643.html + # Fix _AC_UNDECLARED_WARNING for autoconf>=2.70 + # See https://lists.gnupg.org/pipermail/gnupg-devel/2020-November/034643.html ++ lib.optional stdenv.cc.isClang ./fix-clang-autoconf-undeclared-warning.patch; outputs = [ "out" "dev" "info" ]; + outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool - propagatedBuildInputs = - [ libgpg-error glib libassuan pth ] - ++ lib.optional (qtbase != null) qtbase; + nativeBuildInputs = [ + autoreconfHook + gnupg + pkg-config + texinfo + ] ++ lib.optionals pythonSupport [ + ncurses + python + swig2 + which + ]; - nativeBuildInputs = [ pkg-config gnupg texinfo autoreconfHook ] - ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; + propagatedBuildInputs = [ + glib + libassuan + libgpg-error + pth + ] ++ lib.optionals (qtbase != null) [ + qtbase + ]; - depsBuildBuild = [ buildPackages.stdenv.cc ]; + checkInputs = [ + which + ]; + + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; dontWrapQtApps = true; @@ -59,16 +94,15 @@ stdenv.mkDerivation rec { # which has a path length limit. Nix on darwin is using a build directory # that already has quite a long path and the resulting socket path doesn't # fit in the limit. https://github.com/NixOS/nix/pull/1085 - ++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ]; + ++ lib.optionals stdenv.isDarwin [ "--disable-gpg-test" ]; NIX_CFLAGS_COMPILE = toString ( # qgpgme uses Q_ASSERT which retains build inputs at runtime unless # debugging is disabled lib.optional (qtbase != null) "-DQT_NO_DEBUG" # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html - ++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"); - - checkInputs = [ which ]; + ++ lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64" + ); doCheck = true; diff --git a/pkgs/development/libraries/gpgme/python-310-detection-without-distutils.patch b/pkgs/development/libraries/gpgme/python-310-detection-without-distutils.patch new file mode 100644 index 000000000000..e0eea9ff0429 --- /dev/null +++ b/pkgs/development/libraries/gpgme/python-310-detection-without-distutils.patch @@ -0,0 +1,273 @@ +diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 +--- a/m4/ax_python_devel.m4 ++++ b/m4/ax_python_devel.m4 +@@ -1,5 +1,5 @@ + # =========================================================================== +-# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html ++# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html + # =========================================================================== + # + # SYNOPSIS +@@ -12,8 +12,8 @@ + # in your configure.ac. + # + # This macro checks for Python and tries to get the include path to +-# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) +-# output variables. It also exports $(PYTHON_EXTRA_LIBS) and ++# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output ++# variables. It also exports $(PYTHON_EXTRA_LIBS) and + # $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. + # + # You can search for some particular version of Python by passing a +@@ -67,7 +67,7 @@ + # modified version of the Autoconf Macro, you may extend this special + # exception to the GPL to apply to your modified version as well. + +-#serial 17 ++#serial 23 + + AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) + AC_DEFUN([AX_PYTHON_DEVEL],[ +@@ -99,7 +99,7 @@ + This version of the AC@&t@_PYTHON_DEVEL macro + doesn't work properly with versions of Python before + 2.1.0. You may need to re-run configure, setting the +-variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, ++variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, + PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. + Moreover, to disable this check, set PYTHON_NOVERSIONCHECK + to something else than an empty string. +@@ -135,16 +135,25 @@ + # + # Check if you have distutils, else fail + # +- AC_MSG_CHECKING([for the distutils Python package]) +- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ AC_MSG_CHECKING([for the sysconfig Python package]) ++ ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1` ++ if test $? -eq 0; then + AC_MSG_RESULT([yes]) ++ IMPORT_SYSCONFIG="import sysconfig" + else + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([cannot import Python module "distutils". ++ ++ AC_MSG_CHECKING([for the distutils Python package]) ++ ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1` ++ if test $? -eq 0; then ++ AC_MSG_RESULT([yes]) ++ IMPORT_SYSCONFIG="from distutils import sysconfig" ++ else ++ AC_MSG_ERROR([cannot import Python module "distutils". + Please check your Python installation. The error was: +-$ac_distutils_result]) +- PYTHON_VERSION="" ++$ac_sysconfig_result]) ++ PYTHON_VERSION="" ++ fi + fi + + # +@@ -152,10 +161,19 @@ + # + AC_MSG_CHECKING([for Python include path]) + if test -z "$PYTHON_CPPFLAGS"; then +- python_path=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_inc ());"` +- plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_inc (plat_specific=1));"` ++ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then ++ # sysconfig module has different functions ++ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_path ('include'));"` ++ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_path ('platinclude'));"` ++ else ++ # old distutils way ++ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_python_inc ());"` ++ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_python_inc (plat_specific=1));"` ++ fi + if test -n "${python_path}"; then + if test "${plat_python_path}" != "${python_path}"; then + python_path="-I$python_path -I$plat_python_path" +@@ -172,14 +190,14 @@ + # Check for Python library path + # + AC_MSG_CHECKING([for Python library path]) +- if test -z "$PYTHON_LDFLAGS"; then ++ if test -z "$PYTHON_LIBS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) + ac_python_version=`cat< -Date: Sat, 26 Jun 2021 18:02:47 +0200 -Subject: [PATCH] core: Fix use-after-free issue in test - -* tests/gpg/t-edit-sign.c (sign_key, verify_key_signature): New. -(main): Factored out signing and verifying the result. --- - -Factoring the two steps of the test into different functions fixes the -use-after-free issue that was caused by accidentaly using a variable -of the first step in the second step. - -GnuPG-bug-id: 5509 ---- - tests/gpg/t-edit-sign.c | 54 ++++++++++++++++++++++++++++------------- - 1 file changed, 37 insertions(+), 17 deletions(-) - -diff --git a/tests/gpg/t-edit-sign.c b/tests/gpg/t-edit-sign.c -index 2f983622..e0494c54 100644 ---- a/tests/gpg/t-edit-sign.c -+++ b/tests/gpg/t-edit-sign.c -@@ -107,31 +107,19 @@ interact_fnc (void *opaque, const char *status, const char *args, int fd) - } - - --int --main (int argc, char **argv) -+void -+sign_key (const char *key_fpr, const char *signer_fpr) - { - gpgme_ctx_t ctx; - gpgme_error_t err; - gpgme_data_t out = NULL; -- const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */ - gpgme_key_t signing_key = NULL; -- const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */ - gpgme_key_t key = NULL; -- gpgme_key_t signed_key = NULL; -- gpgme_user_id_t signed_uid = NULL; -- gpgme_key_sig_t key_sig = NULL; - char *agent_info; -- int mode; -- -- (void)argc; -- (void)argv; -- -- init_gpgme (GPGME_PROTOCOL_OpenPGP); - - err = gpgme_new (&ctx); - fail_if_err (err); - -- /* Sign the key */ - agent_info = getenv("GPG_AGENT_INFO"); - if (!(agent_info && strchr (agent_info, ':'))) - gpgme_set_passphrase_cb (ctx, passphrase_cb, 0); -@@ -159,8 +147,23 @@ main (int argc, char **argv) - gpgme_data_release (out); - gpgme_key_unref (key); - gpgme_key_unref (signing_key); -+ gpgme_release (ctx); -+} -+ -+ -+void -+verify_key_signature (const char *key_fpr, const char *signer_keyid) -+{ -+ gpgme_ctx_t ctx; -+ gpgme_error_t err; -+ gpgme_key_t signed_key = NULL; -+ gpgme_user_id_t signed_uid = NULL; -+ gpgme_key_sig_t key_sig = NULL; -+ int mode; -+ -+ err = gpgme_new (&ctx); -+ fail_if_err (err); - -- /* Verify the key signature */ - mode = gpgme_get_keylist_mode (ctx); - mode |= GPGME_KEYLIST_MODE_SIGS; - err = gpgme_set_keylist_mode (ctx, mode); -@@ -168,7 +171,7 @@ main (int argc, char **argv) - err = gpgme_get_key (ctx, key_fpr, &signed_key, 0); - fail_if_err (err); - -- signed_uid = key->uids; -+ signed_uid = signed_key->uids; - if (!signed_uid) - { - fprintf (stderr, "Signed key has no user IDs\n"); -@@ -180,7 +183,7 @@ main (int argc, char **argv) - exit (1); - } - key_sig = signed_uid->signatures->next; -- if (strcmp ("2D727CC768697734", key_sig->keyid)) -+ if (strcmp (signer_keyid, key_sig->keyid)) - { - fprintf (stderr, "Unexpected key ID in second user ID sig: %s\n", - key_sig->keyid); -@@ -196,6 +199,23 @@ main (int argc, char **argv) - - gpgme_key_unref (signed_key); - gpgme_release (ctx); -+} -+ -+ -+int -+main (int argc, char **argv) -+{ -+ const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */ -+ const char *signer_keyid = signer_fpr + strlen(signer_fpr) - 16; -+ const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */ -+ -+ (void)argc; -+ (void)argv; -+ -+ init_gpgme (GPGME_PROTOCOL_OpenPGP); -+ -+ sign_key (key_fpr, signer_fpr); -+ verify_key_signature (key_fpr, signer_keyid); - - return 0; - } --- -2.32.0 diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index 483ee0b08496..085544a36120 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "dyiZcuWW0ERYPwwFYwbY8dvYrc+RKRClDaCmY+ZTMu0="; + sha256 = "ZoYzWp7WI/euInb++lCkENTnHUIxiAgkcUBwyzFzI9I="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index 21b63875db6c..ed979c02c868 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, pkg-config , qmake, qtbase, qtdeclarative, wrapQtAppsHook , glib, gobject-introspection -, genericUpdater, common-updater-scripts +, gitUpdater }: stdenv.mkDerivation rec { @@ -55,10 +55,9 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; rev-prefix = "v"; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; meta = with lib; { diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 016a7a992ed9..0e17e13e5818 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -8,18 +8,20 @@ , python3 , gst-plugins-base , orc +, gstreamer , gobject-introspection , enableZbar ? false , faacSupport ? false , faac , faad2 +, ldacbt , libass , libkate -, libmms , lrdf , ladspaH , libnice , webrtc-audio-processing +, webrtc-audio-processing_1 , lilv , lv2 , serd @@ -27,7 +29,7 @@ , sratom , libbs2b , libmodplug -, mpeg2dec +, libmpeg2 , libmicrodns , openjpeg , libopus @@ -39,6 +41,7 @@ , fdk_aac , flite , gsm +, json-glib , libaom , libdc1394 , libde265 @@ -46,7 +49,7 @@ , libdvdnav , libdvdread , libgudev -, libofa +, qrencode , libsndfile , libusb1 , neon @@ -88,24 +91,20 @@ , CoreVideo , Foundation , MediaToolbox +, enableGplPlugins ? true }: stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-oWSSO5Tw0IV4pvyuqsbgwF2niKRpA6EIaHDpykWtZ44="; + sha256 = "sha256-AVuNTZo5Xr9ETUCHaGeiA03TMEs61IvDoN0MHucdwR0="; }; - patches = [ - # Use pkgconfig to inject the includedirs - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja @@ -113,6 +112,7 @@ stdenv.mkDerivation rec { orc # for orcc python3 gettext + gstreamer # for gst-tester-1.0 gobject-introspection ] ++ lib.optionals stdenv.isLinux [ wayland # for wayland-scanner @@ -124,14 +124,14 @@ stdenv.mkDerivation rec { # gobject-introspection has to be in both nativeBuildInputs and # buildInputs. The build tries to link against libgirepository-1.0.so gobject-introspection - faad2 + json-glib + ldacbt libass libkate - libmms - webrtc-audio-processing # webrtc + webrtc-audio-processing # required by webrtcdsp + #webrtc-audio-processing_1 # required by isac libbs2b libmodplug - mpeg2dec libmicrodns openjpeg libopenmpt @@ -145,9 +145,9 @@ stdenv.mkDerivation rec { libde265 libdvdnav libdvdread + qrencode libsndfile libusb1 - mjpegtools neon openal opencv4 @@ -166,7 +166,6 @@ stdenv.mkDerivation rec { libGLU libgme openssl - x265 libxml2 libintl srt @@ -175,6 +174,11 @@ stdenv.mkDerivation rec { zbar ] ++ lib.optionals faacSupport [ faac + ] ++ lib.optionals enableGplPlugins [ + libmpeg2 + mjpegtools + faad2 + x265 ] ++ lib.optionals stdenv.isLinux [ bluez libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs @@ -193,7 +197,6 @@ stdenv.mkDerivation rec { libdrm libgudev libnice - libofa sbc spandsp @@ -229,7 +232,7 @@ stdenv.mkDerivation rec { "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" "-Dzbar=${if enableZbar then "enabled" else "disabled"}" "-Dfaac=${if faacSupport then "enabled" else "disabled"}" - "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing + "-Diqa=disabled" # required `dssim` library not packaging in nixpkgs as of writing, also this is AGPL so update license when adding support "-Dmagicleap=disabled" # required `ml_audio` library not packaged in nixpkgs as of writing "-Dmsdk=disabled" # not packaged in nixpkgs as of writing / no Windows support # As of writing, with `libmpcdec` in `buildInputs` we get @@ -255,6 +258,10 @@ stdenv.mkDerivation rec { "-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing "-Dzxing=disabled" # required `zxing-cpp` library not packaged in nixpkgs as of writing + "-Disac=disabled" # depends on `webrtc-audio-coding-1` not compatible with 0.3 + "-Dgs=disabled" # depends on `google-cloud-cpp` + "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing + "-Dopenaptx=disabled" # depends on older version of `libopenaptx` due to licensing conflict https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2235 ] ++ lib.optionals (!stdenv.isLinux) [ "-Dva=disabled" # see comment on `libva` in `buildInputs` @@ -265,7 +272,6 @@ stdenv.mkDerivation rec { "-Ddirectfb=disabled" "-Dflite=disabled" "-Dkms=disabled" # renders to libdrm output - "-Dofa=disabled" "-Dlv2=disabled" "-Dsbc=disabled" "-Dspandsp=disabled" @@ -286,7 +292,17 @@ stdenv.mkDerivation rec { "-Dapplemedia=disabled" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-Dintrospection=disabled" - ]; + ] ++ (if enableGplPlugins then [ + "-Dgpl=enabled" + ] else [ + "-Ddts=disabled" + "-Dfaad=disabled" + "-Diqa=disabled" + "-Dmpeg2enc=disabled" + "-Dmplex=disabled" + "-Dresindvd=disabled" + "-Dx265=disabled" + ]); # Argument list too long strictDeps = true; @@ -311,7 +327,7 @@ stdenv.mkDerivation rec { something - be it a good code review, some documentation, a set of tests, a real live maintainer, or some actual wide use. ''; - license = licenses.lgpl2Plus; + license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ matthewbauer ]; }; diff --git a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch deleted file mode 100644 index c687fffc9c08..000000000000 --- a/pkgs/development/libraries/gstreamer/bad/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index 271f327f3..7e2afa754 100644 ---- a/pkgconfig/meson.build -+++ b/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', join_paths(get_option('prefix'))) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', api_version) - pkgconf.set('VERSION', gst_version) - diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 8b6073cb9588..82d90845677c 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -41,19 +41,15 @@ stdenv.mkDerivation rec { pname = "gst-plugins-base"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lgt69FhXANsP3VuENVThHiVk/tngYfWR+uiKe+ZEb6M="; + sha256 = "sha256-TLZvzPcwsQN+ZTOGLCEomQkSpttOW70U4O+RRFDrTHw="; }; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja @@ -120,7 +116,7 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs \ - common/scangobj-merge.py \ + scripts/meson-pkg-config-file-fixup.py \ scripts/extract-release-date-from-doap-file.py ''; diff --git a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch deleted file mode 100644 index 04486a4647f9..000000000000 --- a/pkgs/development/libraries/gstreamer/base/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index 04abfbee5..88c86b431 100644 ---- a/pkgconfig/meson.build -+++ b/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', get_option('prefix')) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', api_version) - pkgconf.set('VERSION', gst_version) - pkgconf.set('LIBM', libm.found() ? '-lm' : '') diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 268da0171630..fa1188347731 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "gstreamer"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "bin" @@ -34,13 +34,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VYYiMqY0Wbv1ar694whcqa7CEbR46JHazqTW34yv6Ao="; + sha256 = "sha256-7fS///hVkdT/97Ibue1/D+q8EjrEpO/ynnPLzkVPnbc="; }; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch deleted file mode 100644 index db1684269350..000000000000 --- a/pkgs/development/libraries/gstreamer/core/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index edb0586c2..7ed46dfce 100644 ---- a/pkgconfig/meson.build -+++ b/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', join_paths(get_option('prefix'))) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('libexecdir', '${prefix}/@0@'.format(get_option('libexecdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', apiversion) - pkgconf.set('VERSION', gst_version) - pkgconf.set('LIBM', mathlib.found() ? '-lm' : '') diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 0b7be2bd03ec..aa92410e0e48 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, cairo , meson , ninja , pkg-config @@ -12,17 +13,13 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.18.5"; + version = "1.20.0"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-/s/8hkR9r1wqBoQ8dXqZHXRcqiBpRGoNdG6ZsT98sHk="; + sha256 = "sha256-afyHVuydk+XFJYyZCIQ08gPpH9vFryjR8sWD/YGbeh0="; }; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - outputs = [ "out" "dev" @@ -40,6 +37,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + cairo python3 json-glib ]; diff --git a/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch deleted file mode 100644 index ff19c7cbf6f8..000000000000 --- a/pkgs/development/libraries/gstreamer/devtools/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/validate/pkgconfig/meson.build b/validate/pkgconfig/meson.build -index a612b21b..c017eaff 100644 ---- a/validate/pkgconfig/meson.build -+++ b/validate/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', get_option('prefix')) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', apiversion) - pkgconf.set('VERSION', gst_version) - diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 0bfe6f3e0e2f..4630ce6d0ce4 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" @@ -26,13 +26,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ivSoOU0FHz4YKAaG20mm76zMlcDFmhfw9WTjIABZDfU="; + sha256 = "sha256-+Detz0Bz0ZpZCJhOh5zQOfQZLKNo5x056MzYpWuf7t8="; }; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch deleted file mode 100644 index 1e12f3bbfbea..000000000000 --- a/pkgs/development/libraries/gstreamer/ges/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build -index a612b21b..c017eaff 100644 ---- a/pkgconfig/meson.build -+++ b/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', get_option('prefix')) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', apiversion) - pkgconf.set('VERSION', gst_version) - diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index a6ed248b663d..3b686e4c7f59 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -48,13 +48,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Oq7up3Zfv4gBrM5KUDqbBfc/BOijU1Lp0AIyz9VVeWs="; + sha256 = "sha256-LRGcFauMnnn4zTxr9YL/egULKMyuUqtIZeGhRkmRZZw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 7f2828253c88..0d9f22d7d65f 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , python3 +, gstreamer , gst-plugins-base , gettext , libav @@ -15,11 +16,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.18.5"; + version = "1.20.0"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-gi4AipEOndE67b3Y3GP+3vQEDA7i6Se6sxEuneaTpUg="; + sha256 = "sha256-Xu5e2NUIKjG1AESOQVNcci7jDNX4Ik8ymCu6ui7t7xc="; }; outputs = [ "out" "dev" ]; @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gstreamer gst-plugins-base libav ]; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index a75af25224a0..80190200c26c 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , meson , ninja @@ -12,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.18.5"; + version = "1.20.0"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-BNY79IgWxvQcc/beD5EqfO8KqznEQWKnvOzhkj38nR8="; + sha256 = "sha256-wgn17ZBtpxP91EqIROkJqmyK89+2MCWbCSz7d6d1WEM="; }; outputs = [ @@ -25,15 +26,6 @@ stdenv.mkDerivation rec { # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs ]; - patches = [ - # To use split outputs, we need this so double prefix won't be used in the - # pkg-config files. Hopefully, this won't be needed on the next release, - # _if_ - # https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/merge_requests/1 - # will be merged. For the current release, this merge request won't apply. - ./fix_pkgconfig_includedir.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch b/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch deleted file mode 100644 index d31fe19fb0fe..000000000000 --- a/pkgs/development/libraries/gstreamer/rtsp-server/fix_pkgconfig_includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git i/pkgconfig/meson.build w/pkgconfig/meson.build -index 8ed8299..594cbfe 100644 ---- i/pkgconfig/meson.build -+++ w/pkgconfig/meson.build -@@ -2,8 +2,8 @@ pkgconf = configuration_data() - - pkgconf.set('prefix', get_option('prefix')) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir'))) -+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir'))) - pkgconf.set('GST_API_VERSION', api_version) - pkgconf.set('VERSION', gst_version) - diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 7c4b21f7c833..05133271f846 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -19,17 +19,18 @@ , IOKit , CoreFoundation , DiskArbitration +, enableGplPlugins ? true }: stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.18.5"; + version = "1.20.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3zKAPpj4qZeTc/osp+BeYvl3sQl1dtOoBhnZ9cafZtk="; + sha256 = "sha256-To3LXSZVLwpJN/a8Ynm9kHD1XKauDqoy1y0mTEQAHC4="; }; nativeBuildInputs = [ @@ -43,14 +44,15 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc + libintl + opencore-amr + ] ++ lib.optionals enableGplPlugins [ a52dec libcdio libdvdread libmad libmpeg2 x264 - libintl - opencore-amr ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation @@ -60,7 +62,16 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing - ]; + ] ++ (if enableGplPlugins then [ + "-Dgpl=enabled" + ] else [ + "-Da52dec=disabled" + "-Dcdio=disabled" + "-Ddvdread=disabled" + "-Dmpeg2dec=disabled" + "-Dsidplay=disabled" + "-Dx264=disabled" + ]); postPatch = '' patchShebangs \ @@ -76,7 +87,7 @@ stdenv.mkDerivation rec { the plug-ins or the supporting libraries might not be how we'd like. The code might be widely known to present patent problems. ''; - license = licenses.lgpl2Plus; + license = if enableGplPlugins then licenses.gpl2Plus else licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; }; diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 5de9a247a527..c8b6230cd595 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.18.5"; + version = "1.20.0"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-SkYPuVVZ9BRE6ySGStLZ43kitu6pQVEDEDGfw+C6cns="; + sha256 = "sha256-95pHNG39XlheBj53B45fxJiwbe6JW/y/R9iGP8rJ6jI="; }; outputs = [ diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index b7c2d5d3aa9c..ffb4e5bbbf90 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "unstable-2021-10-01"; + version = "unstable-2021-10-28"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "9c15c1202ed66fe20334e33d798cc5ebd39917f0"; - sha256 = "2YOLpyd26qWQKvneH4ww2DS8h/ZNYDmfbYIjQDvDMko="; + rev = "a44d84ec687f41ad37e43697b28a018f65780780"; + sha256 = "7J4jf3gDiorsc4zs6zwC+j/Zg0oZWKAFAz9vvJJ2CYM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index f35f5e0552c4..b083ca02cf2c 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -6,14 +6,6 @@ , glib , pango , gtk2 -, GConf ? null -, libglade ? null -, libgtkhtml ? null -, gtkhtml ? null -, libgnomecanvas ? null -, libgnomeui ? null -, libgnomeprint ? null -, libgnomeprintui ? null , libxml2 , monoDLLFixer , autoconf @@ -54,8 +46,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoconf automake libtool which ]; buildInputs = [ - mono glib pango gtk2 GConf libglade libgnomecanvas - libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 + mono glib pango gtk2 + libxml2 ]; preConfigure = '' diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index 6b996244a9f3..8b594a00a7e5 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -6,14 +6,6 @@ , glib , pango , gtk3 -, GConf ? null -, libglade ? null -, libgtkhtml ? null -, gtkhtml ? null -, libgnomecanvas ? null -, libgnomeui ? null -, libgnomeprint ? null -, libgnomeprintui ? null , libxml2 , monoDLLFixer }: @@ -30,8 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - mono glib pango gtk3 GConf libglade libgnomecanvas - libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 + mono glib pango gtk3 + libxml2 ]; patches = [ diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index bb1451594475..c736c5cc7617 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -2,7 +2,6 @@ , stdenv , substituteAll , fetchurl -, fetchpatch , pkg-config , gettext , docbook-xsl-nons @@ -60,7 +59,7 @@ in stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.31"; + version = "3.24.33"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -72,7 +71,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-Qjw+f9tMRZ7oieNf1Ncf0mI1YlQcEEGxHAflrR/xC/k="; + sha256 = "sha256-WIsGUi4l0VeemJtvnYob2/L+E83gGgTpBP80aiJeeAE="; }; patches = [ @@ -84,12 +83,6 @@ stdenv.mkDerivation rec { # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 # https://gitlab.gnome.org/GNOME/gtk/merge_requests/536 ./patches/3.0-darwin-x11.patch - - # 3.24.31 does not declare QuartzCore dependency properly and fails to link - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/0ac61443694b477c41fc246cb387ef86aba441de.patch"; - sha256 = "sha256-KaMeIdV/gfM4xzN9lIkY99E7bzAfTM6VETk5DEunB2w="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 2b6dfc8fb52c..eaf6d5bf1b26 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.6.0"; + version = "4.6.2"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "eC1ZUfv9WF/J7HbAnQfijmAUxy2wAftWf/8hf7luTYw="; + sha256 = "/yY69gmlDrdgVmU1ktkpRZrvSBmkRMQ29tUsb2PB+uw="; }; nativeBuildInputs = [ @@ -202,13 +202,9 @@ stdenv.mkDerivation rec { for f in $dev/bin/gtk4-encode-symbolic-svg; do wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" done - - '' + lib.optionalString x11Support '' - # So that DevHelp can find this. - # TODO: Remove this with DevHelp 41. - mkdir -p "$devdoc/share/devhelp/books" - mv "$out/share/doc/"* "$devdoc/share/devhelp/books" - rmdir -p --ignore-fail-on-non-empty "$out/share/doc" + '' + lib.optionalString broadwaySupport '' + # Broadway daemon + moveToOutput bin/gtk4-broadwayd "$out" ''; # Wrap demos @@ -219,6 +215,9 @@ stdenv.mkDerivation rec { wrapProgram $dev/bin/$program \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" done + '' + lib.optionalString x11Support '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = { diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index c1bac87a6c08..c91e7b54ff2e 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.4.0"; + version = "4.6.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "LrRkMmCW5qQMgunNB0Fk2BA/teB4ZWecCmSeQXRwDdo="; + sha256 = "DV7+yp7GT91TC7gibGMQrJlUmz3ZYE1uNnY5eRrz0eA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 0095b6ca9e08..74acd6f743d6 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "4.8.2"; + version = "4.8.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1k1pava84ywgq62xl5bz8y3zm7z2kz6kkgp423c0y02jrgjyfbc4"; + sha256 = "wwAZUGMgyiR02DTM7R4iF+pTPgDrKj9Ot4eQB5QOxoI="; }; patches = [ diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index e6ad0f1ae36b..81c0abd61b6d 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -10,6 +10,7 @@ , pango , fribidi , vala +, gi-docgen , libxml2 , perl , gettext @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "5.2.0"; + version = "5.4.0"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ybNPoCZU9WziL6CIJ9idtLqBYxsubX0x6mXRPHKUMOk="; + sha256 = "ADvCF+ZwqOyKo67OmUtw5wt9a4B0k4rdohcYVV2E5jc="; }; patches = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { perl gobject-introspection vala + gi-docgen ]; buildInputs = [ @@ -68,6 +70,10 @@ stdenv.mkDerivation rec { dbus ]; + mesonFlags = [ + "-Dgtk_doc=true" + ]; + doCheck = stdenv.isLinux; checkPhase = '' @@ -81,6 +87,11 @@ stdenv.mkDerivation rec { runHook postCheck ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "gtksourceview"; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index f5aba82956e5..afb6c0d037cb 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "gupnp"; - version = "1.4.1"; + version = "1.4.3"; outputs = [ "out" "dev" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-iZGWteZvA7jiXwRqemWM0qaFG+y4Py1VNFqzKBZV3Aw="; + sha256 = "sha256-FO2nd5NNot90PQckiZM72YETMre1v0Fia4Ay77KLM7o="; }; patches = [ diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 547c35e66eca..e02a0be4d28d 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , meson , ninja @@ -17,6 +18,7 @@ , fuse3 , libcdio , libxml2 +, libsoup_3 , libxslt , docbook_xsl , docbook_xml_dtd_42 @@ -41,11 +43,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.48.1"; + version = "1.50.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hlxl6368h6nyqp1888szxs9hnpcw98k3h23dgqi29xd38klzsmj"; + sha256 = "y8L1ZNLp8Ax2BnP0LWgDvOPggat/+0RW3v//upM5tN0="; }; postPatch = '' @@ -89,9 +91,8 @@ stdenv.mkDerivation rec { libnfs openssh gsettings-desktop-schemas - # TODO: a ligther version of libsoup to have FTP/HTTP support? + libsoup_3 ] ++ lib.optionals gnomeSupport [ - gnome.libsoup gcr glib-networking # TLS support gnome-online-accounts @@ -106,8 +107,9 @@ stdenv.mkDerivation rec { "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" - "-Dhttp=false" "-Dgoogle=false" + ] ++ lib.optionals (avahi == null) [ + "-Ddnssd=false" ] ++ lib.optionals (samba == null) [ # Xfce don't want samba "-Dsmb=false" diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index 63692ca7de0e..a141d36e3300 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "21.4.3"; + version = "21.4.4"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1NVLGyUDUnOy3GYDtVyhGTvWOYoWp95EbkgTlFWuxE8="; + sha256 = "sha256-Ps8J9JuLKcrowl9wgZ3Wm7JTXyiejQPDr4OV/IvDy+I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index cc6287eace70..b7ba05bb79b5 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -21,10 +21,16 @@ , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 +# for passthru.tests +, gimp +, gtk3 +, gtk4 +, mapnik +, qt5 }: let - version = "3.1.2"; + version = "3.3.2"; inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; @@ -39,7 +45,7 @@ stdenv.mkDerivation { owner = "harfbuzz"; repo = "harfbuzz"; rev = version; - sha256 = "sha256-1xndbJhx+1AzJNnpvvdEcBHPZMPaMI03h6sG2h1d3qs="; + sha256 = "sha256-UbYqV7Ch9ugTIwSsCpjnS8H7tcv4P3OVpFDFDZtQCk0="; }; postPatch = '' @@ -99,6 +105,11 @@ stdenv.mkDerivation { ''} ''; + passthru.tests = { + inherit gimp gtk3 gtk4 mapnik; + inherit (qt5) qtbase; + }; + meta = with lib; { description = "An OpenType text shaping engine"; homepage = "https://harfbuzz.github.io/"; diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 70e9a39e03fe..ffe534ede4af 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "hidapi"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "libusb"; repo = "hidapi"; rev = "${pname}-${version}"; - sha256 = "0dzigvmwbg20b33xn0sklnf489m8g84yrcm8kqlrsd7x8iymsg63"; + sha256 = "sha256-zSAhnvnDI3+q8VwZ8fIx/YmvwTpL87PBJ2C1mTmD7Ko="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/highfive/default.nix b/pkgs/development/libraries/highfive/default.nix index 1a8ea5c1ae56..5eb6ceb204e7 100644 --- a/pkgs/development/libraries/highfive/default.nix +++ b/pkgs/development/libraries/highfive/default.nix @@ -11,7 +11,7 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { - pname = "highfive"; + pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; version = "2.3.1"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index 472a23a2b74e..37354f8be489 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -12,9 +12,12 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ]; meta = with lib; { - homepage = "https://www.nic.ad.jp/ja/idn/idnkit"; + homepage = "https://jprs.co.jp/idn/index-e.html"; description = "Provides functionalities about i18n domain name processing"; - license = "idnkit-2 license"; + license = { + fullName = "Open Source Code License version 1.1"; + url = "https://jprs.co.jp/idn/idnkit2-OSCL.txt"; + }; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 06aad781bc73..441646c43955 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "sha256-nMM4ZQLIth9QHlLu+sXE4AXoDlq1UP20+YuBi+Op+go="; + sha256 = "sha256-SL9PcT18vFvykCv4VRXxXtlcDAcybmwEImnnKXMciFQ="; }; # Normally, igraph wants us to call bootstrap.sh, which will call diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/development/libraries/imath/default.nix index 15bd5907af9e..b0a98f7b2638 100644 --- a/pkgs/development/libraries/imath/default.nix +++ b/pkgs/development/libraries/imath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.1.3"; + version = "3.1.4"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "sha256-LoyV1Wtugva6MTpREstP2rYMrHW2xR0qfEAIV1Fo1Ns="; + sha256 = "sha256-FZXIIzAxhd0QlJAV0q7spEa1pNFXutI0WFZbT3izN4M="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 038c5a036200..62f750db62c9 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.86"; + version = "1.87"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-NuyWrtD+/bRkMlsvU0gNkQhDJVlSPPWhBELN/AtYRwk="; + sha256 = "sha256-H5rqXZFw+2PfVMsYvAK+K+pxxI8HnUC0GlPhooWgEYM="; }; dontBuild = true; diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index 474605fe7696..884cebab2e30 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.unix; homepage = "https://cs.uwaterloo.ca/~astorjoh/iml.html"; - updateWalker = true; }; } diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index b61f4e442bf2..1447a327e0df 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.3"; + version = "1.7.5"; src = fetchurl { - url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "sha256-FY0LjCC8ESIa+ed6ZKEW/KcFGwPN6ixPMdMfRpOC+Zc="; + url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.xz"; + hash = "sha256-RY2DAKp6bUzjU1GDi7pdn9+wiES9WxU8WTjs/kP/Ngo="; }; buildInputs = [ @@ -28,11 +28,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = '' - substituteInPlace imlib2-config.in \ - --replace "@my_libs@" "" - ''; - # Do not build amd64 assembly code on Darwin, because it fails to compile # with unknow directive errors configureFlags = optional stdenv.isDarwin "--enable-amd64=no" @@ -40,10 +35,6 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" ]; - postInstall = '' - moveToOutput bin/imlib2-config "$dev" - ''; - meta = with lib; { description = "Image manipulation library"; @@ -56,7 +47,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://docs.enlightenment.org/api/imlib2/html"; - license = licenses.mit; + changelog = "https://git.enlightenment.org/legacy/imlib2.git/plain/ChangeLog?h=v${version}"; + license = licenses.imlib2; platforms = platforms.unix; maintainers = with maintainers; [ spwhitt ]; }; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 644975ca66c1..5875c8070e76 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.0.1"; + version = "22.1.2"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "1s46vwcs26hdlsa8h51gq4fyi9i8k5hrcx5ffbv9g7v3x706nplf"; + sha256 = "sha256-5exS0B2iRbmFkKtoHzL4NnZ7L3DaukthUYkoj2tpZuE="; }; nativeBuildInputs = [ cmake ]; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { OpenCL(TM) and the Intel(R) Media Driver for VAAPI. ''; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ primeos SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 08ce42354985..380f0c1f7e25 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.1.1"; + version = "22.2.2"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "1gv89k48s03hwvlcg484li0dznqg93z82xv9lpv3gkncvwfvh9c8"; + sha256 = "sha256-ksh8xx46x9OgXBrhJr3FnBI9g4PHXUDhLPbgpvccffM="; }; patches = [ @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/intel/media-driver/releases/tag/intel-media-${version}"; license = with licenses; [ bsd3 mit ]; platforms = platforms.linux; - maintainers = with maintainers; [ primeos jfrankenau SuperSandro2000 ]; + maintainers = with maintainers; [ jfrankenau SuperSandro2000 ]; }; } diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index d383a3093f21..71a4437397a5 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "22.1.0"; + version = "22.2.0"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-iISG947MUWVVAxykFwB5UK5Z4uQnEWJ6AFr/ZlHx4Nw="; + sha256 = "sha256-Hcm48KTuBQbnVHd/T5XqQKbVS/XgJ4TYNbSCc8O53XQ="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index 074dc2be01c2..73b5d0d140a2 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -1,17 +1,17 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.4"; pname = "commons-fileupload"; src = fetchurl { url = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "1jy7w2j2ay56mpq4ij3331cf9zgpkm832ydr63svb35j0ymnky72"; + sha256 = "1avfv4gljp7flra767yzas54vfb6az9s1nhxfjv48jj2x0llxxkx"; }; installPhase = '' tar xf ${src} mkdir -p $out/share/java - cp lib/*.jar $out/share/java/ + cp commons-fileupload-*-bin/*.jar $out/share/java/ ''; meta = { diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/pkgs/development/libraries/java/gwt-dragdrop/default.nix deleted file mode 100644 index a7270bbfa2ba..000000000000 --- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "gwt-dnd"; - version = "2.6.5"; - - src = fetchurl { - url = "http://gwt-dnd.googlecode.com/files/gwt-dnd-${version}.jar"; - sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw"; - }; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/java - cp $src $out/share/java/$name.jar - - runHook postInstall - ''; - - meta = with lib; { - platforms = platforms.unix; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/pkgs/development/libraries/java/gwt-widgets/default.nix deleted file mode 100644 index ebba8548016e..000000000000 --- a/pkgs/development/libraries/java/gwt-widgets/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "gwt-widgets"; - version = "0.2.0"; - - src = fetchurl { - url = "mirror://sourceforge/gwt-widget/gwt-widgets-${version}-bin.tar.gz"; - sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb"; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/java - cp gwt-widgets-*.jar $out/share/java - - runHook postInstall - ''; - - meta = with lib; { - platforms = platforms.unix; - license = with licenses; [ afl21 lgpl2 ]; - }; -} diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index 19bc3524c590..4b18cd7cfadc 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -1,13 +1,14 @@ -{ fetchgit, lib, stdenv, ant, jdk }: +{ fetchFromGitHub, lib, stdenv, ant, jdk }: stdenv.mkDerivation { pname = "hydra-ant-logger"; version = "2010.2"; - src = fetchgit { - url = "https://github.com/NixOS/hydra-ant-logger.git"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "hydra-ant-logger"; rev = "dae3224f4ed42418d3492bdf5bee4f825819006f"; - sha256 = "01s7m6007rn9107rw5wcgna7i20x6p6kfzl4f79jrvpkjy6kz176"; + sha256 = "sha256-5oQ/jZfz7izTcYR+N801HYh4lH2MF54PCMnmA4CpRwc="; }; buildInputs = [ ant jdk ]; diff --git a/pkgs/development/libraries/java/jffi/default.nix b/pkgs/development/libraries/java/jffi/default.nix new file mode 100644 index 000000000000..c15a6ddb819c --- /dev/null +++ b/pkgs/development/libraries/java/jffi/default.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, fetchFromGitHub, jdk, jre, ant, libffi, texinfo, pkg-config }: + +stdenv.mkDerivation rec { + pname = "jffi"; + version = "1.3.9"; + + src = fetchFromGitHub { + owner = "jnr"; + repo = "jffi"; + rev = "jffi-${version}"; + sha256 = "sha256-VjZYhMbad+AesANG06umRzqMWj+Ebzu59TYK7Tm/bFo="; + }; + + nativeBuildInputs = [ jdk ant texinfo pkg-config ]; + buildInputs = [ libffi ] ; + + buildPhase = '' + # The pkg-config script in the build.xml doesn't work propery + # set the lib path manually to work around this. + export LIBFFI_LIBS="${libffi}/lib/libffi.so" + + ant -Duse.system.libffi=1 jar + ant -Duse.system.libffi=1 archive-platform-jar + ''; + + installPhase = '' + mkdir -p $out/share/java + cp -r dist/* $out/share/java + ''; + + doCheck = true; + checkPhase = '' + # The pkg-config script in the build.xml doesn't work propery + # set the lib path manually to work around this. + export LIBFFI_LIBS="${libffi}/lib/libffi.so" + + ant -Duse.system.libffi=1 test + ''; + + meta = with lib; { + description = "Java Foreign Function Interface "; + homepage = "https://github.com/jnr/jffi"; + platforms = platforms.unix; + license = licenses.asl20; + maintainers = with maintainers; [ bachp ]; + }; +} diff --git a/pkgs/development/libraries/jcal/default.nix b/pkgs/development/libraries/jcal/default.nix index 2b57bd4064b7..4ce62ec67bc4 100644 --- a/pkgs/development/libraries/jcal/default.nix +++ b/pkgs/development/libraries/jcal/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Jalali calendar is a small and portable free software library to manipulate date and time in Jalali calendar system"; homepage = "http://nongnu.org/jcal/"; license = licenses.gpl3; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index 11f6141872db..c65a3af9c42a 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -1,37 +1,31 @@ { lib, stdenv, fetchFromGitHub }: + stdenv.mkDerivation rec { pname = "jitterentropy"; - version = "2.2.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "jitterentropy-library"; rev = "v${version}"; - sha256 = "0n2l1fxr7bynnarpwdjifb2fvlsq8w5wmfh31yk5nrc756cjlgyw"; + hash = "sha256-go7eGwBoZ58LkgKL7t8oZSc1cFlE6fPOT/ML3Aa8+CM="; }; - patches = [ - # Can be removed when upgrading beyond 2.2.0 - ./reproducible-manpages.patch - ]; + + outputs = [ "out" "dev" ]; enableParallelBuilding = true; - - preInstall = '' - mkdir -p $out/include - substituteInPlace Makefile \ - --replace "install -m 0755 -s" \ - 'install -m 0755 -s --strip-program $(STRIP)' - ''; + hardeningDisable = [ "fortify" ]; # avoid warnings installFlags = [ - "PREFIX=$(out)" + "PREFIX=${placeholder "out"}" ]; - meta = { + meta = with lib; { description = "Provides a noise source using the CPU execution timing jitter"; homepage = "https://github.com/smuellerDD/jitterentropy-library"; - license = with lib.licenses; [ gpl2 bsd3 ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ johnazoidberg ]; + changelog = "https://github.com/smuellerDD/jitterentropy-library/raw/v${version}/CHANGES.md"; + license = with licenses; [ bsd3 /* OR */ gpl2Only ]; + platforms = platforms.linux; + maintainers = with maintainers; [ johnazoidberg c0bw3b ]; }; } diff --git a/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch b/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch deleted file mode 100644 index 68de5a8ae781..000000000000 --- a/pkgs/development/libraries/jitterentropy/reproducible-manpages.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 4ff069b..3b8714a 100644 ---- a/Makefile -+++ b/Makefile -@@ -58,7 +58,7 @@ cppcheck: - install: - install -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man3 - install -m 644 doc/$(NAME).3 $(DESTDIR)$(PREFIX)/share/man/man3/ -- gzip -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 -+ gzip -n -9 $(DESTDIR)$(PREFIX)/share/man/man3/$(NAME).3 - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(LIBDIR) - install -m 0755 -s lib$(NAME).so.$(LIBVERSION) $(DESTDIR)$(PREFIX)/$(LIBDIR)/ - install -d -m 0755 $(DESTDIR)$(PREFIX)/$(INCDIR) diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 7618110e86c4..fb828e5b5714 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,18 +1,42 @@ -{ lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, glib +, json-glib +, pkg-config +, gobject-introspection +, vala +, gi-docgen +, gnome +}: + stdenv.mkDerivation rec { pname = "jsonrpc-glib"; - version = "3.40.0"; + version = "3.42.0"; outputs = [ "out" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib json-glib ]; - src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "wuPRYlfHJmzTkBiE4iN1V1v2Go4fZ1lsiODYeucNDvQ="; + sha256 = "IhmJpXyoKhJGfcQngizXZRsMrQOBQMkxAnvxB0IIJ2s="; }; + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + vala + gi-docgen + ]; + + buildInputs = [ + glib + json-glib + ]; + mesonFlags = [ "-Denable_gtk_doc=true" ]; @@ -21,6 +45,11 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/jsonrpc-glib/issues/2 doCheck = false; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/judy/cross.patch b/pkgs/development/libraries/judy/cross.patch new file mode 100644 index 000000000000..a4e53c08a6d6 --- /dev/null +++ b/pkgs/development/libraries/judy/cross.patch @@ -0,0 +1,22 @@ +--- a/src/Judy1/Makefile.am ++++ b/src/Judy1/Makefile.am +@@ -18,7 +18,7 @@ + libinline_la_CFLAGS = $(AM_CFLAGS) -DJUDYGETINLINE + + Judy1Tables.c: Judy1TablesGen.c +- $(CC) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o Judy1TablesGen Judy1TablesGen.c; ./Judy1TablesGen ++ $(CC_FOR_BUILD) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o Judy1TablesGen Judy1TablesGen.c; ./Judy1TablesGen + + Judy1ByCount.c:../JudyCommon/JudyByCount.c + cp -f ../JudyCommon/JudyByCount.c Judy1ByCount.c +--- a/src/JudyL/Makefile.am ++++ b/src/JudyL/Makefile.am +@@ -18,7 +18,7 @@ + libinline_la_CFLAGS = $(AM_CFLAGS) -DJUDYGETINLINE + + JudyLTables.c: JudyLTablesGen.c +- $(CC) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o JudyLTablesGen JudyLTablesGen.c; ./JudyLTablesGen ++ $(CC_FOR_BUILD) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o JudyLTablesGen JudyLTablesGen.c; ./JudyLTablesGen + + JudyLByCount.c: ../JudyCommon/JudyByCount.c + cp -f ../JudyCommon/JudyByCount.c JudyLByCount.c diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index bec72ac80206..da8e89f93565 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl, pkgsBuildBuild, autoreconfHook }: stdenv.mkDerivation rec { pname = "judy"; @@ -9,11 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j"; }; - # gcc 4.8 optimisations break judy. - # https://sourceforge.net/p/judy/mailman/message/31995144/ - preConfigure = lib.optionalString stdenv.cc.isGNU '' - configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations") - ''; + nativeBuildInputs = [ autoreconfHook ]; + depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ]; + patches = [ ./cross.patch ]; # Disable parallel builds as manpages lack some dependencies: # ../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[ ]*$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index 4135f6bfd7aa..ac077b73d6a6 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh @@ -59,23 +59,24 @@ xdgDataSubdirs=( \ "wallpapers" "applications" "desktop-directories" "mime" "appdata" "dbus-1" \ ) -ecmHostPathSeen=( ) +# ecmHostPathsSeen is an associative array of the paths that have already been +# seen by ecmHostPathHook. +declare -gA ecmHostPathsSeen -ecmUnseenHostPath() { - for pkg in "${ecmHostPathSeen[@]}" - do - if [ "${pkg:?}" == "$1" ] - then - return 1 - fi - done - - ecmHostPathSeen+=("$1") - return 0 +ecmHostPathIsNotSeen() { + if [[ -n "${ecmHostPathsSeen["$1"]:-}" ]]; then + # The path has been seen before. + return 1 + else + # The path has not been seen before. + # Now it is seen, so record it. + ecmHostPathsSeen["$1"]=1 + return 0 + fi } ecmHostPathHook() { - ecmUnseenHostPath "$1" || return 0 + ecmHostPathIsNotSeen "$1" || return 0 local xdgConfigDir="$1/etc/xdg" if [ -d "$xdgConfigDir" ] diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 825e757c7a8e..cb4e4cc26298 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.89/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.91/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 630b51bf46ba..93c81525a148 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,12 +1,13 @@ { - mkDerivation, propagate, - extra-cmake-modules, kcoreaddons, polkit-qt, qttools + lib, mkDerivation, propagate, + extra-cmake-modules, kcoreaddons, qttools, + enablePolkit ? true, polkit-qt }: mkDerivation { name = "kauth"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ polkit-qt qttools ]; + buildInputs = lib.optional enablePolkit polkit-qt ++ [ qttools ]; propagatedBuildInputs = [ kcoreaddons ]; patches = [ ./cmake-install-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch index 07da70092dc6..1379707f02fe 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch +++ b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch @@ -13,18 +13,18 @@ diff --git a/src/client.cpp b/src/client.cpp index 44fbacd..6b5abf5 100644 --- a/src/client.cpp +++ b/src/client.cpp -@@ -378,11 +378,14 @@ int KDEsuClient::stopServer() +@@ -384,11 +384,14 @@ int KDEsuClient::stopServer() static QString findDaemon() { -- QString daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); +- QString daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF "/kdesud"); - if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH - daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); - if (daemon.isEmpty()) { - qCWarning(KSU_LOG) << "kdesud daemon not found."; + QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud"); + if (!QFile::exists(daemon)) { // if not in wrappers -+ daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); ++ daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF "/kdesud"); + if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH + daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); + if (daemon.isEmpty()) { diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 3465fc63da29..2b3983a892c8 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/attica-5.89.0.tar.xz"; - sha256 = "03q2ajvwrl1x6h0jcvc6nh0avj7dqhx4k1lx5qa3xgfxwk01kgp9"; - name = "attica-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/attica-5.91.0.tar.xz"; + sha256 = "0svvy7qflidwxns12y2lra54gg6lhglcddzmrw7ccvbdyqcy2pn0"; + name = "attica-5.91.0.tar.xz"; }; }; baloo = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/baloo-5.89.0.tar.xz"; - sha256 = "091gjzn4armm4xs61csavwgij54mv8v9hx3gvva18g06gjkajyis"; - name = "baloo-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/baloo-5.91.0.tar.xz"; + sha256 = "1cqjbaiwqba707xaz9zsrdz9cms2mdrhv6jpwsq8q7f4g4rxcx3m"; + name = "baloo-5.91.0.tar.xz"; }; }; bluez-qt = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/bluez-qt-5.89.0.tar.xz"; - sha256 = "00wczjvvhxzi12ijf65d66x36gm0x6j5z3b6cwqgdz2s66wr0jw5"; - name = "bluez-qt-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/bluez-qt-5.91.0.tar.xz"; + sha256 = "0p37jrmppwahh4vaq3wkw6xn0ms8dxcxpfd4glzjlnw426zrwnjr"; + name = "bluez-qt-5.91.0.tar.xz"; }; }; breeze-icons = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/breeze-icons-5.89.0.tar.xz"; - sha256 = "12l2wzc3pah5qapznriaffh4wz97s6nqxlj9i119k9qw295d6wfw"; - name = "breeze-icons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/breeze-icons-5.91.0.tar.xz"; + sha256 = "0aj24gn48c17n9jzrj0az04ph4hpx7zf2rj4vgwl19iip69vfzf1"; + name = "breeze-icons-5.91.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/extra-cmake-modules-5.89.0.tar.xz"; - sha256 = "0bzhd6xcphrcnbg8ylx91rq5y3vvl3jfcgik19bvh8sr4ad25mrx"; - name = "extra-cmake-modules-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/extra-cmake-modules-5.91.0.tar.xz"; + sha256 = "0k65rvxh926ya6qahzk2ns7g1fya1429648mlx7iipxa61g8h5wp"; + name = "extra-cmake-modules-5.91.0.tar.xz"; }; }; frameworkintegration = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/frameworkintegration-5.89.0.tar.xz"; - sha256 = "0f7cqxmgnwi4n8fa8vifqaysbk7839x1qbmp9qfa998jxnn1w92f"; - name = "frameworkintegration-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/frameworkintegration-5.91.0.tar.xz"; + sha256 = "1176ql8f96ap4gzjaj8vm4cr6f2rsx9z93gpc4hx4jcqjhxqrg3z"; + name = "frameworkintegration-5.91.0.tar.xz"; }; }; kactivities = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kactivities-5.89.0.tar.xz"; - sha256 = "1dhxl487246kpx4w5zhhdgk94jwns09dvragvh2bb787mszqq5v9"; - name = "kactivities-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kactivities-5.91.0.tar.xz"; + sha256 = "03y4hx7jgrhac12ys8pm22h0f49kms8b71gck4xv577p3ywi3j60"; + name = "kactivities-5.91.0.tar.xz"; }; }; kactivities-stats = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kactivities-stats-5.89.0.tar.xz"; - sha256 = "1pp3vkkadaday0pzd09hdhccw6hbrqp481hcdzzyqj1x2ckb59bj"; - name = "kactivities-stats-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kactivities-stats-5.91.0.tar.xz"; + sha256 = "0864qfljh20723djfzdv8h6nipw01825lhiknyqz17aj2x2ymzcq"; + name = "kactivities-stats-5.91.0.tar.xz"; }; }; kapidox = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kapidox-5.89.0.tar.xz"; - sha256 = "0a3vwh3rzpcaylz77fs4biiadljchs2lfh6svg149yg95yqwng3b"; - name = "kapidox-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kapidox-5.91.0.tar.xz"; + sha256 = "1xxpl8rn49d2cr7ld94j3wsg21019l2kq14p5bvilisnj3salka3"; + name = "kapidox-5.91.0.tar.xz"; }; }; karchive = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/karchive-5.89.0.tar.xz"; - sha256 = "1s45mns9km1fy2d07d2nmslf4dc2pl5i169ncq2dc7vabjvyh59b"; - name = "karchive-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/karchive-5.91.0.tar.xz"; + sha256 = "1kjc47zzdd9jhcmynq6zw6y6zaj2c1i8pxvszx3d9x5asaz2qq53"; + name = "karchive-5.91.0.tar.xz"; }; }; kauth = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kauth-5.89.0.tar.xz"; - sha256 = "1ys9xr7js8rj07ff7ncp9d52rcn10bg49jcyg4ldam07bfpq36nz"; - name = "kauth-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kauth-5.91.0.tar.xz"; + sha256 = "001svdyvs8qc6h8zkb9x072npkz6xabz6j0djjb380gl9h9wnrgq"; + name = "kauth-5.91.0.tar.xz"; }; }; kbookmarks = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kbookmarks-5.89.0.tar.xz"; - sha256 = "16bh5daimpjwy0gz56v32vslnmzmyfsf8z92s5gi13bkjfp03syn"; - name = "kbookmarks-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kbookmarks-5.91.0.tar.xz"; + sha256 = "0iqfngsvpbgxk6h8l68idcp97df28sa2zwj707zs0mf2bl9k68m4"; + name = "kbookmarks-5.91.0.tar.xz"; }; }; kcalendarcore = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcalendarcore-5.89.0.tar.xz"; - sha256 = "1xy045d5jl3qk9ka13ximk7x70q5pswh143kqk7cf6x0f7bvgpap"; - name = "kcalendarcore-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kcalendarcore-5.91.0.tar.xz"; + sha256 = "0gkn0mzk3za86pjrpi8gd9d71bfv0ihzkgn8yy1ik3dw1rf9gxip"; + name = "kcalendarcore-5.91.0.tar.xz"; }; }; kcmutils = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcmutils-5.89.0.tar.xz"; - sha256 = "0za9x8v9lnwyib1gip6wbmda19wfjaf2yh6yiqlszxcbsfq7kzhm"; - name = "kcmutils-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kcmutils-5.91.0.tar.xz"; + sha256 = "009r9r7fz1588g2cnqw585d2fz170x8j8bip1zqr7i4jl21ms68s"; + name = "kcmutils-5.91.0.tar.xz"; }; }; kcodecs = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcodecs-5.89.0.tar.xz"; - sha256 = "1j2pmsyi8lvhnzhrrvsm98x7inf503vr2b58yl070zp293fyhd9q"; - name = "kcodecs-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kcodecs-5.91.0.tar.xz"; + sha256 = "0qkwvbp4vp3w57f3fyjknxd66qac77hl77mf042c7jxjl5vq7h1y"; + name = "kcodecs-5.91.0.tar.xz"; }; }; kcompletion = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcompletion-5.89.0.tar.xz"; - sha256 = "0bv9kxrdprk1jvsf9mqkag0pkq7h1wngdpvdx9wfy4kkbj7y46zf"; - name = "kcompletion-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kcompletion-5.91.0.tar.xz"; + sha256 = "1l6z85a4rh3vrf4x5g3pqvp0q36gwmw0fbp9ny1iaqyy21dlh8i4"; + name = "kcompletion-5.91.0.tar.xz"; }; }; kconfig = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kconfig-5.89.0.tar.xz"; - sha256 = "0ixil0qyd8byn4ix5w9mp5kdvkscnwhamknrnbqzikhmmknprccf"; - name = "kconfig-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kconfig-5.91.0.tar.xz"; + sha256 = "0axdnqipa8xgx864zylxllnzchlp50q59bbfw3c98svvvkm3yg56"; + name = "kconfig-5.91.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kconfigwidgets-5.89.0.tar.xz"; - sha256 = "0rzqx2knc8bc26jyislb1dw5qdhmkga3cqlyiyynbawx3scind60"; - name = "kconfigwidgets-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kconfigwidgets-5.91.0.tar.xz"; + sha256 = "01mvv01hv64wadjh8xk3hhp1vbs04cvbrjpfl1g9cv2sa6hr7102"; + name = "kconfigwidgets-5.91.0.tar.xz"; }; }; kcontacts = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcontacts-5.89.0.tar.xz"; - sha256 = "1yjgrzn3bx8fzmr6mjd2c99gxlh0nqm1fi3sgmcn1bj07jdrp52r"; - name = "kcontacts-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kcontacts-5.91.0.tar.xz"; + sha256 = "1c839c9rvys3jwmi3fzw06r1nhgvrb4z8sdh8gda0w03vqh7h1hv"; + name = "kcontacts-5.91.0.tar.xz"; }; }; kcoreaddons = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcoreaddons-5.89.0.tar.xz"; - sha256 = "0ss27wz8z2lfhn0njads2rwd62aciamr0vcbj4gyfiv2ddw8bl71"; - name = "kcoreaddons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kcoreaddons-5.91.0.tar.xz"; + sha256 = "16vimllvcs6rnb1ccbv9zg8hxbzacisgrlffyvwm608f4q1xmqyz"; + name = "kcoreaddons-5.91.0.tar.xz"; }; }; kcrash = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kcrash-5.89.0.tar.xz"; - sha256 = "07pc449qqvz6rfs1wk6r2jgfncpliig8c1cxzhbkzqrkcf1gj6ba"; - name = "kcrash-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kcrash-5.91.0.tar.xz"; + sha256 = "0gdknmp5a36ipvzms4jhxywyxpjh0vy26861c54jfsk13yircjal"; + name = "kcrash-5.91.0.tar.xz"; }; }; kdav = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdav-5.89.0.tar.xz"; - sha256 = "1wyg6bxfp1r1snk40y6q70ix00aqwx4sl4z7jrg12h38cnc8sa6v"; - name = "kdav-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kdav-5.91.0.tar.xz"; + sha256 = "026w3bk2lmc7lqzra8w9jq8i2l1hvqsxz36r1jzj9p01skhdm32v"; + name = "kdav-5.91.0.tar.xz"; }; }; kdbusaddons = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdbusaddons-5.89.0.tar.xz"; - sha256 = "1yh5xx01wsjcj6axcw1r94p32rrs111078prssgnngbrihbhbjzh"; - name = "kdbusaddons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kdbusaddons-5.91.0.tar.xz"; + sha256 = "18qhpj0s4abypkb8ix2d84wv1kqv6qxyblninn2f9hjkl2dnlwis"; + name = "kdbusaddons-5.91.0.tar.xz"; }; }; kdeclarative = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdeclarative-5.89.0.tar.xz"; - sha256 = "18a4rcx60h5j44d79bhr2l46f3lhgnf2x0sb64dr7dcc0m5rmsay"; - name = "kdeclarative-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kdeclarative-5.91.0.tar.xz"; + sha256 = "183df5c0xyjqsip0izqvvk4wy2bjb973900s1wqsldhhvc7gpf7z"; + name = "kdeclarative-5.91.0.tar.xz"; }; }; kded = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kded-5.89.0.tar.xz"; - sha256 = "1rr3g7b60zlx8j7d7k2hlhhv2wa67lakfpyd1zgpy2y3k281hbfl"; - name = "kded-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kded-5.91.0.tar.xz"; + sha256 = "1zi0sixlzaxvw4lfil2r36i3xrav3vfwxp2r1lp4n65dpl7nv7p5"; + name = "kded-5.91.0.tar.xz"; }; }; kdelibs4support = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kdelibs4support-5.89.0.tar.xz"; - sha256 = "1672f75f0wmdrqhx9vynzgflm3ssmngkpp1r5li53ppb11wg6sbr"; - name = "kdelibs4support-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kdelibs4support-5.91.0.tar.xz"; + sha256 = "1373fi9vi7ki8frr0lsw6yp335i95v8yq2j41s7ip003dpy4hr2g"; + name = "kdelibs4support-5.91.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kdesignerplugin-5.89.0.tar.xz"; - sha256 = "0g8y51i70m8s7y829qyqnki57s8d4l3xdpdbn1p2rr1szglj8hvf"; - name = "kdesignerplugin-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kdesignerplugin-5.91.0.tar.xz"; + sha256 = "07lvvryc3k418hd0j7ddlqhid26c51isa8mvk7g6gd0v2x3gp76q"; + name = "kdesignerplugin-5.91.0.tar.xz"; }; }; kdesu = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdesu-5.89.0.tar.xz"; - sha256 = "0jmww11l6709cpfriwklhij5izsh948mki9grzzq3jijw8zs0mrx"; - name = "kdesu-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kdesu-5.91.0.tar.xz"; + sha256 = "1wj099w810dabqn43pqis4sism3zwq3d1qa9mvcdyjafqbl7xnjm"; + name = "kdesu-5.91.0.tar.xz"; }; }; kdewebkit = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kdewebkit-5.89.0.tar.xz"; - sha256 = "0xwd346z928yk4iwykgashc36m2xqnwn49jix5jbk1w57dbia2da"; - name = "kdewebkit-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kdewebkit-5.91.0.tar.xz"; + sha256 = "1mln0w1dzrbpm373vfpcyss4xxnrfgwh9nhzr8wmzs8965bn3wqq"; + name = "kdewebkit-5.91.0.tar.xz"; }; }; kdnssd = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdnssd-5.89.0.tar.xz"; - sha256 = "0v72g137l8kl2xapfrcrw8w6zmn94h08hvwdggzr9fvgswzdbvsh"; - name = "kdnssd-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kdnssd-5.91.0.tar.xz"; + sha256 = "1smzwh7lvz8g7vydxnd2kkh0ymg7yp6akc7k2vg8q65pa6pxqn3g"; + name = "kdnssd-5.91.0.tar.xz"; }; }; kdoctools = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kdoctools-5.89.0.tar.xz"; - sha256 = "1x8q45y2sgi3d9j79qcx02z2939j52mp1jrs3rjqq42xxvvrlcg1"; - name = "kdoctools-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kdoctools-5.91.0.tar.xz"; + sha256 = "02lr4l4n5gnv7ffzml8lbrdwgfpq6m7ayhz3bdqqijdfvw6h283n"; + name = "kdoctools-5.91.0.tar.xz"; }; }; kemoticons = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kemoticons-5.89.0.tar.xz"; - sha256 = "0mcyq20ca6x73jhwwhhwq8jzqpadnazjy5y9dyfa2wz8ijbnjqzw"; - name = "kemoticons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kemoticons-5.91.0.tar.xz"; + sha256 = "1jznkiq87rkndv10xs6974b5k0v82ly32agy5acxc2xy9wq7la0h"; + name = "kemoticons-5.91.0.tar.xz"; }; }; kfilemetadata = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kfilemetadata-5.89.0.tar.xz"; - sha256 = "04abysdijmpdd05grihawpbw8f9h3fhlv3y7wjz76kl66gyqg035"; - name = "kfilemetadata-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kfilemetadata-5.91.0.tar.xz"; + sha256 = "1z030irzcvmjq329nwfk3h8cd51dwy9mppnwbgcd0lw6y3bka0rq"; + name = "kfilemetadata-5.91.0.tar.xz"; }; }; kglobalaccel = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kglobalaccel-5.89.0.tar.xz"; - sha256 = "0jxxlhmwsgrx1p6w1al9c11bglxn5im181wqih7ds5h2naa7b8kj"; - name = "kglobalaccel-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kglobalaccel-5.91.0.tar.xz"; + sha256 = "09wscg6f19sh314ywpxp47pdr1xf1wzpjchg9rcjg207zrfhqqf0"; + name = "kglobalaccel-5.91.0.tar.xz"; }; }; kguiaddons = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kguiaddons-5.89.0.tar.xz"; - sha256 = "17mxkk4w4q6bkqblkdinw2b0jdfxhk7xkfy5hw730gjm6is6p861"; - name = "kguiaddons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kguiaddons-5.91.0.tar.xz"; + sha256 = "0gn8lvpm4i11s5vavlpm162bizjkmh5cb4dhj3p34dlp4vcc4mky"; + name = "kguiaddons-5.91.0.tar.xz"; }; }; kholidays = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kholidays-5.89.0.tar.xz"; - sha256 = "0ry0n73dkjxv7ani753mh8ymy4yblhj841ca5y5kci8wr9h6358w"; - name = "kholidays-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kholidays-5.91.0.tar.xz"; + sha256 = "165vfmi5y8l00ng494469w5s1gjnf9zkggqrzmq65dfkdis3amdm"; + name = "kholidays-5.91.0.tar.xz"; }; }; khtml = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/khtml-5.89.0.tar.xz"; - sha256 = "072pawwp62mx5shh8x4mcpr8h6a24qr82zyyiricz4jba0r7z3yr"; - name = "khtml-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/khtml-5.91.0.tar.xz"; + sha256 = "1ldkk1f954mmgz30vqa895z1nw2jaknnb53lsd5vqxzxi3cmc054"; + name = "khtml-5.91.0.tar.xz"; }; }; ki18n = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/ki18n-5.89.0.tar.xz"; - sha256 = "1zlq0ywd8hnaniwdv3vd76xmv91cdn6pqs6k9y6dz3fayl15p0g6"; - name = "ki18n-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/ki18n-5.91.0.tar.xz"; + sha256 = "11gdd2gvzsz3r8zvqbxxwbpwjvjwnzzhzyrd4spbpdy0w7j8n6ly"; + name = "ki18n-5.91.0.tar.xz"; }; }; kiconthemes = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kiconthemes-5.89.0.tar.xz"; - sha256 = "1hv8blvvg12agjynl0yvvsl8dfsyk2aa9clmq60igcs5lm4jpvaa"; - name = "kiconthemes-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kiconthemes-5.91.0.tar.xz"; + sha256 = "1khh4ngivwdj9rxxcpx08ka8anskc9i1z9n2zijp4m5ix8mmj3c2"; + name = "kiconthemes-5.91.0.tar.xz"; }; }; kidletime = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kidletime-5.89.0.tar.xz"; - sha256 = "0547yj8yn9nly3bkq3in38ljhwbg0bvj0wp3yxp2dl05wpyvzqfz"; - name = "kidletime-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kidletime-5.91.0.tar.xz"; + sha256 = "12qmiwc8p3izj1y5h0rndj2s496ckm1p85dv4g51zbpg7m8a48qv"; + name = "kidletime-5.91.0.tar.xz"; }; }; kimageformats = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kimageformats-5.89.0.tar.xz"; - sha256 = "1m3fl14lzsfl0fam38nnalapc1xhpryf1ibvcm7bgh4g1cm1bvnw"; - name = "kimageformats-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kimageformats-5.91.0.tar.xz"; + sha256 = "0df8in33xwajqay487w0hjfsplz8y51w9sjb75na7yqsn75p38xb"; + name = "kimageformats-5.91.0.tar.xz"; }; }; kinit = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kinit-5.89.0.tar.xz"; - sha256 = "1llaqz7yv011k4g1fvy1rzlff8bdgvqwqvh3s3nrqahwq2gx2rr9"; - name = "kinit-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kinit-5.91.0.tar.xz"; + sha256 = "1y62k24mwzbg4gchvjb8wn6ygq57wc72clb3jgyipw034czdihvi"; + name = "kinit-5.91.0.tar.xz"; }; }; kio = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kio-5.89.0.tar.xz"; - sha256 = "1ka8s6cj7ms74w4xj6x91hx1ijlh883x3ibjwmbhva6mbzk1z0nx"; - name = "kio-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kio-5.91.0.tar.xz"; + sha256 = "14v28qilb5ayv9shw86hb88k60nr4bbd2pa4vwsqij9xkwlympgj"; + name = "kio-5.91.0.tar.xz"; }; }; kirigami2 = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kirigami2-5.89.0.tar.xz"; - sha256 = "1jn5c0lhh7hcp81278kagw0r96nri80x9vrg51jg7cs42h7pfp98"; - name = "kirigami2-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kirigami2-5.91.0.tar.xz"; + sha256 = "0ifljwa6hli2rndfadpzs30dpwc99nnvcm3yi9j5dim2bdf6glwc"; + name = "kirigami2-5.91.0.tar.xz"; }; }; kitemmodels = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kitemmodels-5.89.0.tar.xz"; - sha256 = "10bag80kjz4x22097z9w1liw73kkirk72266vr0qplyr00jwqi33"; - name = "kitemmodels-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kitemmodels-5.91.0.tar.xz"; + sha256 = "189kgrw2vjr9067mqr4f2sv06xmnjaapry0bf8s41v6r9v7py708"; + name = "kitemmodels-5.91.0.tar.xz"; }; }; kitemviews = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kitemviews-5.89.0.tar.xz"; - sha256 = "180n41gkv6vgmljcqh2sg5922glq59z56zq7y299vwnkgix9aqns"; - name = "kitemviews-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kitemviews-5.91.0.tar.xz"; + sha256 = "16cm4zmv1ngrsmy6k0ybv5wxd0g8cc8zwq6ab7jvs7a04sykv238"; + name = "kitemviews-5.91.0.tar.xz"; }; }; kjobwidgets = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kjobwidgets-5.89.0.tar.xz"; - sha256 = "02ysdzn25a9lms70fawnz3h5vdxy9p528qmbxslsnpz29r5h2wb8"; - name = "kjobwidgets-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kjobwidgets-5.91.0.tar.xz"; + sha256 = "14pkyd6j78kignr62xfkvpyi2fwvzcvcsdnn23h8jxkhwm2ri42v"; + name = "kjobwidgets-5.91.0.tar.xz"; }; }; kjs = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kjs-5.89.0.tar.xz"; - sha256 = "0yxk4qwl4cxv3kklvla5q3xx2vgj4lwp4pb3bplkkbighm01naih"; - name = "kjs-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kjs-5.91.0.tar.xz"; + sha256 = "0jbwlnmf8whzgjkrbnsvdsnn3kv0h44ghf63m2qcgg2l9wb0j8rj"; + name = "kjs-5.91.0.tar.xz"; }; }; kjsembed = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kjsembed-5.89.0.tar.xz"; - sha256 = "08ajxgh1lfbx8nf4vsljzcwkfjih8fyqp9nr2xbv2a9dbv51x1sf"; - name = "kjsembed-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kjsembed-5.91.0.tar.xz"; + sha256 = "124y7518jhjg3y2x7bcyl6b3c0bfxfbgd2sz6dwk45y4byx7rl60"; + name = "kjsembed-5.91.0.tar.xz"; }; }; kmediaplayer = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kmediaplayer-5.89.0.tar.xz"; - sha256 = "0hf44hij1bqcfvxhs7ka00habgh3lc39xajnblpm9br8xybgkaz0"; - name = "kmediaplayer-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kmediaplayer-5.91.0.tar.xz"; + sha256 = "0rn9azrj8k1m67y9ni0f3nwl9ldf1ksiqv6dgnzrx6xh0rxfm2h1"; + name = "kmediaplayer-5.91.0.tar.xz"; }; }; knewstuff = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/knewstuff-5.89.0.tar.xz"; - sha256 = "1qw3lm4vjxal7r314y0zqj59fmzj4b9z2dsd10r3mxpiwjra0s45"; - name = "knewstuff-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/knewstuff-5.91.0.tar.xz"; + sha256 = "0akaxi9klmpwn4pyr6ys5sxcapdspldq1f64im7vd6byzqrgpnax"; + name = "knewstuff-5.91.0.tar.xz"; }; }; knotifications = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/knotifications-5.89.0.tar.xz"; - sha256 = "1jghpawqp0zy1scs2l0dqz2sqv4xd65xiavabpjwhycx5pxpvbhs"; - name = "knotifications-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/knotifications-5.91.0.tar.xz"; + sha256 = "1207rimq8si1zxnn827631a1hskrd3m3ilgaj3wj859qrbkqmxzm"; + name = "knotifications-5.91.0.tar.xz"; }; }; knotifyconfig = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/knotifyconfig-5.89.0.tar.xz"; - sha256 = "041qnnxhsi35xygyzlppvpghfd8fxraas824dz7rfjiym2zid7jh"; - name = "knotifyconfig-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/knotifyconfig-5.91.0.tar.xz"; + sha256 = "07m5mphd8mrak5sdqlldbcd51946v49xpcwi9fhn7w0kx29hknyf"; + name = "knotifyconfig-5.91.0.tar.xz"; }; }; kpackage = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kpackage-5.89.0.tar.xz"; - sha256 = "198n0gr2v9r11ml2vkx9xazxf3rbw3qgc44l7x134rpn1jv9b0s3"; - name = "kpackage-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kpackage-5.91.0.tar.xz"; + sha256 = "12w8lfwifa107wlrld3zz774hczn9mkib6wqxw24yxxmzfw9lc2i"; + name = "kpackage-5.91.0.tar.xz"; }; }; kparts = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kparts-5.89.0.tar.xz"; - sha256 = "0vdz1sxqkx2nynlsywyp8j2ciq226cs40c3m70lqs0j5w283i5ra"; - name = "kparts-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kparts-5.91.0.tar.xz"; + sha256 = "10ni6b114acjnmrahvvqw75iqkc10ii97y3z7lirj2727a3qmzzj"; + name = "kparts-5.91.0.tar.xz"; }; }; kpeople = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kpeople-5.89.0.tar.xz"; - sha256 = "12bry15lr7xpgmfgpw1mdd805n1af6050vaa3pk4mbf0vc6clg5y"; - name = "kpeople-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kpeople-5.91.0.tar.xz"; + sha256 = "09l2q8cg9p8g7zkd1mjx6x08bqkr4ykxjibskc184asff7v47gvp"; + name = "kpeople-5.91.0.tar.xz"; }; }; kplotting = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kplotting-5.89.0.tar.xz"; - sha256 = "1asqzv5jl2nb9ml5vwlpcsi9f2vw7y8rcihlvkf569s7kxsrswns"; - name = "kplotting-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kplotting-5.91.0.tar.xz"; + sha256 = "0rgmmliw9cfi0j2miszqz2kphqm04r5nfs8dqq6pnvclk1k9kss6"; + name = "kplotting-5.91.0.tar.xz"; }; }; kpty = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kpty-5.89.0.tar.xz"; - sha256 = "0053sx30d1w2m03wqv3mhkjrxdf7ps1xj8h74fv0a0clf9ab0i4x"; - name = "kpty-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kpty-5.91.0.tar.xz"; + sha256 = "1yy1k96kikvvnlyd00krc08ifiqbrz0x5vwv3pgdbpnwgl8p580d"; + name = "kpty-5.91.0.tar.xz"; }; }; kquickcharts = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kquickcharts-5.89.0.tar.xz"; - sha256 = "05syj1162j1zhg9wws81kk9z2ri3jvlvnq95l3gv29zf582j7h91"; - name = "kquickcharts-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kquickcharts-5.91.0.tar.xz"; + sha256 = "1ghiymm257b8xgmkibb7s7bwb28x3zhnrgrrsya47q5njb87h0ck"; + name = "kquickcharts-5.91.0.tar.xz"; }; }; kross = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kross-5.89.0.tar.xz"; - sha256 = "0j88ikhxypyy4yickcz3hcdfaj8g7qjinf5va7g5ghzjar7q9x4y"; - name = "kross-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kross-5.91.0.tar.xz"; + sha256 = "06f8220jmvjsfbzjkr2ybwicwjffbi3yw9sr3bcyrilchrrpgqal"; + name = "kross-5.91.0.tar.xz"; }; }; krunner = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/krunner-5.89.0.tar.xz"; - sha256 = "11wzn33k6gwfiwc6idhsr8fj441c82bbzz8bx8i228ymvnqrdcqx"; - name = "krunner-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/krunner-5.91.0.tar.xz"; + sha256 = "17iaw55rkzyfpgkbw2an6pa4wid79b0dnb3310vfaq0xkm0gjxq6"; + name = "krunner-5.91.0.tar.xz"; }; }; kservice = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kservice-5.89.0.tar.xz"; - sha256 = "0srbjazz302w7zsxh5zcq5zhgz8ad09zxld1rpfkyxg5z820lrq5"; - name = "kservice-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kservice-5.91.0.tar.xz"; + sha256 = "0m4j7djiyapi1hm23lz9nd238rrlldxlggzkqq056z486v2137bp"; + name = "kservice-5.91.0.tar.xz"; }; }; ktexteditor = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/ktexteditor-5.89.0.tar.xz"; - sha256 = "02bg84dmqadjlwfmccviz0d0wj0qf9fy2i9igq4mv150hqy93bb7"; - name = "ktexteditor-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/ktexteditor-5.91.0.tar.xz"; + sha256 = "1bkz6v1y5vyxav398a6224ldqa9pqhbad3vmhxrjb2hxcbha2cpm"; + name = "ktexteditor-5.91.0.tar.xz"; }; }; ktextwidgets = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/ktextwidgets-5.89.0.tar.xz"; - sha256 = "0yz2y111hjs1zq1f8887sn334gpf0sv4lrfq3i5dj0x3vcjgmccl"; - name = "ktextwidgets-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/ktextwidgets-5.91.0.tar.xz"; + sha256 = "0xmzrak5mwg1l4v38g14i7j1yr3j6sj13q2iqa433hs5agl6l6n4"; + name = "ktextwidgets-5.91.0.tar.xz"; }; }; kunitconversion = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kunitconversion-5.89.0.tar.xz"; - sha256 = "1bmnlcsi8qbba38ywr3f4vd7kddiwzmrnn9n69c6626jg4aj3g1q"; - name = "kunitconversion-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kunitconversion-5.91.0.tar.xz"; + sha256 = "0n2v0f08s71z2imhn41jkm2knjvk7bkwmcz70gs8h97ykrj6niap"; + name = "kunitconversion-5.91.0.tar.xz"; }; }; kwallet = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kwallet-5.89.0.tar.xz"; - sha256 = "1yy34asal5jni78jxywddh3hjpzsr1myck0f89h78a2zc28xnd1h"; - name = "kwallet-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kwallet-5.91.0.tar.xz"; + sha256 = "1z1qb6a2b5rqj7js88ms8n67fbs885pw6djbf1l86na2zhf0adip"; + name = "kwallet-5.91.0.tar.xz"; }; }; kwayland = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kwayland-5.89.0.tar.xz"; - sha256 = "1sq4zy9bifbqlg8s3af2vwxyyg84kmxfyvdi479cn46vdavylp2j"; - name = "kwayland-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kwayland-5.91.0.tar.xz"; + sha256 = "1a03ckacp39lpsqyykkm6lxajxm71s6ifpzgj8q0a37v75jzmz9y"; + name = "kwayland-5.91.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kwidgetsaddons-5.89.0.tar.xz"; - sha256 = "1rs30ialmrhwvxah6rvzbavjnp4ziaaf0j0jcm63kyqbb5nywgmk"; - name = "kwidgetsaddons-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kwidgetsaddons-5.91.0.tar.xz"; + sha256 = "03pj98sgybkcz487vr774x05w46imnipq2794nkv426nnhyxrd73"; + name = "kwidgetsaddons-5.91.0.tar.xz"; }; }; kwindowsystem = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kwindowsystem-5.89.0.tar.xz"; - sha256 = "1h0v72mb7s36ggw8nv70rpk16q0cflbhgvqwzlfqvh68kbs35a4q"; - name = "kwindowsystem-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kwindowsystem-5.91.0.tar.xz"; + sha256 = "1yy02fvfabrsvdpmrkdnjdsdd3d2crxavsl47si6ry8fdxb90y95"; + name = "kwindowsystem-5.91.0.tar.xz"; }; }; kxmlgui = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/kxmlgui-5.89.0.tar.xz"; - sha256 = "0mjfg0hd9rswz3jpmc8xjw5jqgip58cx3bavijdlnp7pla7r7j56"; - name = "kxmlgui-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/kxmlgui-5.91.0.tar.xz"; + sha256 = "1qww2isx99lx0mn1dv0vzrvmr2xdp8zgikyvgw1wf8hfay3v2s1g"; + name = "kxmlgui-5.91.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/portingAids/kxmlrpcclient-5.89.0.tar.xz"; - sha256 = "0ri3z76r1v1vfp3j0mrpvan6jzmp57a5g4vwshv4zgyvr484qhlp"; - name = "kxmlrpcclient-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/portingAids/kxmlrpcclient-5.91.0.tar.xz"; + sha256 = "1bnymf5wq4apjsgshvbhcggdw7jc0yxv4jag3k19ff9820lskhph"; + name = "kxmlrpcclient-5.91.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/modemmanager-qt-5.89.0.tar.xz"; - sha256 = "1sam8cr638h9gyp60dhgmrpddy6y7waf9xaij46kvc0xdan501fi"; - name = "modemmanager-qt-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/modemmanager-qt-5.91.0.tar.xz"; + sha256 = "15l46lkh8nkal1nai494dabaysy581jzi8nwrv4kjvc6qwc3yrx2"; + name = "modemmanager-qt-5.91.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/networkmanager-qt-5.89.0.tar.xz"; - sha256 = "1x1pxsf4dm8h0bj6my9rg2j95nnn81919fv9apvqglf6i3xd2pq4"; - name = "networkmanager-qt-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/networkmanager-qt-5.91.0.tar.xz"; + sha256 = "0f27qin2ks3q7rin53sk9vjjnadjnax99d9k245sjr6fjpczy81f"; + name = "networkmanager-qt-5.91.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/oxygen-icons5-5.89.0.tar.xz"; - sha256 = "1gmx2k5hqfa0lap2y9sv7csi09s8nl3rvab5nz731wr3s9m2frpr"; - name = "oxygen-icons5-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/oxygen-icons5-5.91.0.tar.xz"; + sha256 = "0j3j2lyxr2iz68vasvpjqkix4bnnj6wc4sr97i6x6z06zq0kawai"; + name = "oxygen-icons5-5.91.0.tar.xz"; }; }; plasma-framework = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/plasma-framework-5.89.0.tar.xz"; - sha256 = "0wx6a3agplfmf2p86ljhgd3pjx7f15g1hp660i62zw84zvpsh2dp"; - name = "plasma-framework-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/plasma-framework-5.91.0.tar.xz"; + sha256 = "0ydhhpnwf7lfl3kdjsw92mgsza5gy292f7v6kyby4ygjnir1hizl"; + name = "plasma-framework-5.91.0.tar.xz"; }; }; prison = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/prison-5.89.0.tar.xz"; - sha256 = "0jd3qfj5k4fxqpbkjpr81mvni9kqppcq0gn5yyc9nys4wk4nr934"; - name = "prison-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/prison-5.91.0.tar.xz"; + sha256 = "0k1zp3jzh8gjsji6wh5g8k41zdl8s1vd58ipm0lxy670a71wcqcg"; + name = "prison-5.91.0.tar.xz"; }; }; purpose = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/purpose-5.89.0.tar.xz"; - sha256 = "1sfhwzw1ghr1yg4fkrz0r2myd5569mscsr98pnc3plr78ppq9lwy"; - name = "purpose-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/purpose-5.91.0.tar.xz"; + sha256 = "1z6wpz7d9byx4n5zx6chmyy9k1jkmghdgahsvkqsc33z6hnh2b4m"; + name = "purpose-5.91.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/qqc2-desktop-style-5.89.0.tar.xz"; - sha256 = "1q2y0hb69f3ldaslbpw8v0xapchqndjp4wzgmghd1zqab8lqjl5c"; - name = "qqc2-desktop-style-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/qqc2-desktop-style-5.91.0.tar.xz"; + sha256 = "0rd9rvffhif8yckwr7axjcv5iqn5b0jdviij7f9y8vjpkzyjvm8i"; + name = "qqc2-desktop-style-5.91.0.tar.xz"; }; }; solid = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/solid-5.89.0.tar.xz"; - sha256 = "1gy8ddg5803fpdifg68gkjrl9l2dwjrmwyzq5jzsfr6yabcfih93"; - name = "solid-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/solid-5.91.0.tar.xz"; + sha256 = "1a4k0amyg8mvfr2ld7v8zyphhxv33yybh55vqcshwv4a0jm1wmjg"; + name = "solid-5.91.0.tar.xz"; }; }; sonnet = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/sonnet-5.89.0.tar.xz"; - sha256 = "0fdkx68hyp5fq0fyfbq0691vcx70qm7md2nd4028gmpcbxxaixa1"; - name = "sonnet-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/sonnet-5.91.0.tar.xz"; + sha256 = "067xj5mllpzl0gnxxljhfi9y4xdgrpqbckm7pykczzqrklrrx8dx"; + name = "sonnet-5.91.0.tar.xz"; }; }; syndication = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/syndication-5.89.0.tar.xz"; - sha256 = "186dw32jhgfwz7dz9payx645gvhgzcf6qy5qiad6ifkvda50g9cw"; - name = "syndication-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/syndication-5.91.0.tar.xz"; + sha256 = "1f2kb6mh1xc1k1bn536lq9gq0j2lb65qw4vpp4ixynlfij4zq1gy"; + name = "syndication-5.91.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/syntax-highlighting-5.89.0.tar.xz"; - sha256 = "0iy9ryjf6bcxwp9kni00p82mx1bg101z8331ykixffn41vfgxb9a"; - name = "syntax-highlighting-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/syntax-highlighting-5.91.0.tar.xz"; + sha256 = "0fprqi2z8issh3jkql6labszkwd3cpvd6qadsg9fi46vfjr4a2ip"; + name = "syntax-highlighting-5.91.0.tar.xz"; }; }; threadweaver = { - version = "5.89.0"; + version = "5.91.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.89/threadweaver-5.89.0.tar.xz"; - sha256 = "03yrlp9ixfb3wsrfmgxfhryzy2jsfnk4wnphmlk5nh98nxa9706x"; - name = "threadweaver-5.89.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.91/threadweaver-5.91.0.tar.xz"; + sha256 = "1900kqglkwzkjc24mvl0j7jf7xcx6cr6b1g78s5b5m18rw050j12"; + name = "threadweaver-5.91.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch b/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch deleted file mode 100644 index 0f33815b6e91..000000000000 --- a/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cbdbc8d00d31344fafe00e0fdf984e04e631f7c4 Mon Sep 17 00:00:00 2001 -From: TBK -Date: Wed, 26 Feb 2020 21:12:45 +0100 -Subject: [PATCH] Fix Linux build error with musl libc - -Commit bf5953c549a6d279977df69ffe89b2ba51460eaf caused a build failure -on non-glibc Linux build environments. Change the conditionalization -so that __GLIBC_PREREQ will only be used if it is defined. - -[ghudson@mit.edu: simplified conditionals; rewrote commit message] - -ticket: 8880 (new) -tags: pullup -target_version: 1.18-next ---- - src/util/support/plugins.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c -index 3329db7dc3..1644d16fd0 100644 ---- a/src/util/support/plugins.c -+++ b/src/util/support/plugins.c -@@ -62,8 +62,7 @@ - * dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects - * anyway. - */ --#ifdef __linux__ --#include -+#ifdef __GLIBC__PREREQ - #if ! __GLIBC_PREREQ(2, 25) - #define dlclose(x) - #endif diff --git a/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch b/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch deleted file mode 100644 index f8718606a7f8..000000000000 --- a/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b009cca2026b615ef5386faa4c0230bc27c4161d Mon Sep 17 00:00:00 2001 -From: Greg Hudson -Date: Thu, 12 Mar 2020 00:44:10 -0400 -Subject: [PATCH] Fix typo in musl build fix - -Commit cbdbc8d00d31344fafe00e0fdf984e04e631f7c4 checked for -__GLIBC__PREREQ instead of __GLIBC_PREREQ, thus accidentally reverting -the workaround introduced in commit -bf5953c549a6d279977df69ffe89b2ba51460eaf. Fix the typo. - -ticket: 8880 ---- - src/util/support/plugins.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c -index 1644d16fd0..1ff10c354d 100644 ---- a/src/util/support/plugins.c -+++ b/src/util/support/plugins.c -@@ -62,7 +62,7 @@ - * dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects - * anyway. - */ --#ifdef __GLIBC__PREREQ -+#ifdef __GLIBC_PREREQ - #if ! __GLIBC_PREREQ(2, 25) - #define dlclose(x) - #endif diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index ebec5936b541..c632c2fdac9e 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -19,23 +19,13 @@ in with lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; - majorVersion = "1.18"; # remove patches below with next upgrade - version = majorVersion; + version = "1.19.2"; src = fetchurl { - url = "https://kerberos.org/dist/krb5/${majorVersion}/krb5-${version}.tar.gz"; - sha256 = "121c5xsy3x0i4wdkrpw62yhvji6virbh6n30ypazkp0isws3k4bk"; + url = "https://kerberos.org/dist/krb5/${versions.majorMinor version}/krb5-${version}.tar.gz"; + sha256 = "0snz1jm2w4dkk65zcz953jmmv9mqa30fanch2bk8r3rs9vp3yi8h"; }; - patches = optionals stdenv.hostPlatform.isMusl [ - # TODO: Remove with next release > 1.18 - # Patches to fix musl build with 1.18. - # Not using `fetchpatch` for these for now to avoid infinite recursion - # errors in downstream projects (unclear if it's a nixpkgs issue so far). - ./krb5-Fix-Linux-build-error-with-musl-libc.patch - ./krb5-Fix-typo-in-musl-build-fix.patch - ]; - outputs = [ "out" "dev" ]; configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"] diff --git a/pkgs/development/libraries/kquickimageedit/default.nix b/pkgs/development/libraries/kquickimageedit/default.nix index ca0afe103b71..1089c3ddf1f1 100644 --- a/pkgs/development/libraries/kquickimageedit/default.nix +++ b/pkgs/development/libraries/kquickimageedit/default.nix @@ -1,19 +1,28 @@ -{ mkDerivation +{ lib +, mkDerivation , fetchFromGitLab , extra-cmake-modules }: mkDerivation rec { pname = "kquickimageeditor"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p2uOssS5MQSkmppNKOjTxp866Qx1rIB6ZPhcmVvfBxs="; + sha256 = "sha256-g7+BAWjpQBJPbrwnIwSudjBFtwaj4JKemV+BLfPzl4I="; }; nativeBuildInputs = [ extra-cmake-modules ]; + + meta = with lib; { + description = "Set of QtQuick components providing basic image editing capabilities"; + homepage = "https://invent.kde.org/libraries/kquickimageeditor"; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + badPlatforms = platforms.darwin; + }; } diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index b600a2ca4c3d..14579bc59156 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lcms2"; - version = "2.12"; + version = "2.13.1"; src = fetchurl { url = "mirror://sourceforge/lcms/${pname}-${version}.tar.gz"; - sha256 = "sha256-GGY5hehkEARVrD5QdiXEOMNxA1TYXly7fNQEPhH+EPU="; + sha256 = "sha256-1HPnlueyfFrwG9bRVS1CtFtDRX5xgs6ZA/OLt0ggO4g="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 24bec8ec350f..874c567ed42e 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.6"; + version = "1.12.7"; src = fetchFromGitHub { - sha256 = "sha256-k5Lt/NCSlBaTGhpR4T3Q4Ih+RR1xKROxz+RNYor7zaQ="; + sha256 = "sha256-a79/seKO6Efn6g4RWdqsP83pL5AIBAp1InjnMdOs3Qk="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index 3d28d6ef5a99..a270051f48ab 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libaacs"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2"; - sha256 = "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d"; + sha256 = "sha256-qIqg6+TJinf3rv/ZKrPvZKxUjGuCLoJIqLkmclvqCjk="; }; buildInputs = [ libgcrypt libgpg-error ]; diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 0e1a0036dd16..447ad06e9b87 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.0.1"; + version = "1.1.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - sha256 = "sha256-2+elMEZwDPWkPDrmvLH5rxulh1tq6fgsMhbTdbrWe54="; + hash = "sha256-+bgCD2jy3M0gEAtbB+nOptQGEXXkvk1idoggJz4UMy0="; }; nativeBuildInputs = [ @@ -91,6 +91,12 @@ stdenv.mkDerivation rec { mv $out/share/{doc,gtk-doc} ''; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + }; + }; + meta = with lib; { description = "Library to help with developing UI for mobile devices using GTK/GNOME"; homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 8e9a34716f2a..2a1ea4f606d7 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.15"; + version = "4.3.16"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-S2/ecWC78Q4ihVLtDQ6DD8/qX1cDslnTjqd5IkKCjc4="; + sha256 = "sha256-aBLNdw9LhHFwnIt70vIYlX1/j2IUTmpm5Ub+ZImF8FI="; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 82e440333136..3a3866911b8d 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libaom"; - version = "3.2.0"; + version = "3.3.0"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - sha256 = "0fmnbzpl481i7kchx4hbvb507r5pfgyrzfrlrs7jk3bicycm75qv"; + sha256 = "sha256-g6QkKLrk+SH1s5fRmseAQMmM6y4QwmKmVDPxdbqGmwg="; stripRoot = false; }; diff --git a/pkgs/development/libraries/libarchive-qt/default.nix b/pkgs/development/libraries/libarchive-qt/default.nix index 62b425bba058..ae74fd3028a9 100644 --- a/pkgs/development/libraries/libarchive-qt/default.nix +++ b/pkgs/development/libraries/libarchive-qt/default.nix @@ -1,19 +1,20 @@ -{ mkDerivation, lib, fetchFromGitLab, libarchive, xz, zlib, bzip2, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, libarchive, xz, zlib, bzip2, meson, pkg-config, ninja }: mkDerivation rec { pname = "libarchive-qt"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitLab { owner = "marcusbritanicus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z+2zjQolV1Ncr6v9r7fGrc/fEMt0iMtGwv9eZ2Tu2cA="; + sha256 = "sha256-KRywB+Op44N00q9tgO2WNCliRgUDRvrCms1O8JYt62o="; }; nativeBuildInputs = [ - cmake + meson ninja + pkg-config ]; buildInputs = [ diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 2a1d53e6ee01..2c8faaf93e8b 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -6,19 +6,22 @@ # builds fine on windows, but libarchive has trouble linking windows # things it depends on for some reason. xarSupport ? stdenv.hostPlatform.isUnix, + + # for passthru.tests + cmake, nix, samba }: assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { pname = "libarchive"; - version = "3.5.2"; + version = "3.6.0"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${version}"; - sha256 = "sha256-H00UJ+ON1kBc19BgWBBKmO8f23oAg2mk7o9hhDhn50Q="; + sha256 = "sha256-u6Zeu9yTjhx5U7KZVUkuuUsQPjWN71mE5egG4T+FGfY="; }; outputs = [ "out" "lib" "dev" ]; @@ -49,6 +52,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit cmake nix samba; + }; + meta = { description = "Multi-format archive and compression library"; longDescription = '' diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 19f6589ec950..704dcd2c73d0 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -40,6 +40,5 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; - repositories.git = "git://github.com/libass/libass.git"; }; } diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index c15de88f6a76..0b378c583ad1 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { --replace "-linkpkg" "-thread -linkpkg" ''; - nativeBuildInputs = [ autoreconfHook which ]; - buildInputs = [ ocaml bap findlib ctypes ]; + nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; + buildInputs = [ bap ctypes ]; preInstall = '' mkdir -p $out/lib diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index e8b550e06c2a..08cba497fc9d 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -10,24 +10,15 @@ let }; in stdenv.mkDerivation rec { pname = "libbladeRF"; - version = "2.2.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "Nuand"; repo = "bladeRF"; rev = "libbladeRF_v${version}"; - sha256 = "0g89al4kwfbx1l3zjddgb9ay4mhr7zk0ndchca3sm1vq2j47nf4l"; + sha256 = "05axh51lrzxpz2qfswnjwxpfk3mlsv2wc88dd12gfr1karn5jwz9"; }; - # This patch is required for version 2.2.1. As the patch is already part of - # upstream master, it will be incorporated into the next release. The patch - # fixes a (well-justified) compiler warning which breaks the build because - # we compile with -Werror. - patches = [ (fetchpatch { - url = "https://github.com/Nuand/bladeRF/commit/163425d48a3b7d8c100d7295220d3648c050d0dd.patch"; - sha256 = "1swsymlyxm3yk2k8l71z1fv0a5k2rmab02f0c7xkrvk683mq6yxw"; - }) ]; - nativeBuildInputs = [ cmake pkg-config git doxygen help2man ]; # ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208 buildInputs = [ tecla libusb1 ] diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 8fd680683dd8..47015f3b981d 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -19,11 +19,11 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { pname = "libbluray"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-4tuvmehOCpcl9Jhby4XUHlLCJhzGUdiISxt5C17wFvk="; + sha256 = "sha256-wksPQcW3N7u2XFRP5jSVY3p3HBClGd/IAudp8RK0O3U="; }; patches = optional withJava ./BDJ-JARFILE-path.patch; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 745b34226e2d..8c8e47b98a4d 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libbsd"; - version = "0.11.3"; + version = "0.11.5"; src = fetchurl { url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "18a2bcl9z0zyxhrm1lfv4yhhz0589s6jz0s78apaq78mhj0wz5gz"; + sha256 = "sha256-GpyVJSVjXBu2dwyyLpabk42Oap15EjYrmO6DcFmbDv0="; }; outputs = [ "out" "dev" "man" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Common functions found on BSD systems"; homepage = "https://libbsd.freedesktop.org/"; - license = licenses.bsd3; + license = with licenses; [ beerware bsd2 bsd3 bsdOriginal isc mit ]; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ matthewbauer ]; }; diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index b0c02eaa6bcf..73277d30de3c 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, autoconf, automake, libtool, m4, fetchFromGitLab, bash, pkg-config, sqlite }: +{ lib, stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkg-config, sqlite }: stdenv.mkDerivation rec { pname = "libcangjie"; version = "1.4_rev_${rev}"; rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d"; - src = fetchFromGitLab { - owner = "Cangjians"; - repo = "libcangjie"; - inherit rev; - sha256 = "sha256-R7WqhxciaTxhTiwPp2EUNTOh477gi/Pj3VpMtat5qXw="; + # fetchFromGitLab isn't working for some reason + src = fetchurl { + url = "https://gitlab.freedesktop.org/cangjie/libcangjie/-/archive/a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d/libcangjie-a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d.tar.gz"; + sha256 = "sha256-j5IQ0hBefoF8p966YrfZgYCw7ht5twJhYi4l0NneukQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index e03416a221c1..039d3af37605 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling"; homepage = "http://libcec.pulse-eight.com"; - repositories.git = "https://github.com/Pulse-Eight/libcec.git"; license = lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.titanous ]; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index cba1d0ba4c59..d9594c90b624 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Platform library for libcec and Kodi addons"; homepage = "https://github.com/Pulse-Eight/platform"; - repositories.git = "https://github.com/Pulse-Eight/platform.git"; license = lib.licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.titanous ]; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 85163daad0a1..7dfafe6bd06d 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -26,6 +26,7 @@ , at-spi2-core , cups , libxshmfence +, obs-studio }: let @@ -59,27 +60,27 @@ let "aarch64-linux" = { platformStr = "linuxarm64"; projectArch = "arm64"; - sha256 = "1j93qawh9h6k2ic70i10npppv5f9dch961lc1wxwsi68daq8r081"; }; "i686-linux" = { platformStr = "linux32"; projectArch = "x86"; - sha256 = "0ki4zr8ih06kirgbpxbinv4baw3qvacx208q6qy1cvpfh6ll4fwb"; }; "x86_64-linux" = { platformStr = "linux64"; projectArch = "x86_64"; - sha256 = "1ja711x9fdlf21qw1k9xn3lvjc5zsfgnjga1w1r8sysam73jk7xj"; }; }; + platforms."aarch64-linux".sha256 = "0m12adzcs6xsmgnqsdc5g0xs6xmjbj560x4d9rnv9fpf1p7jv2fa"; + platforms."i686-linux".sha256 = "00cy5kxx8hpifkwhn9qbfch7ng3crx0zb6ypllzip6qms956mama"; + platforms."x86_64-linux".sha256 = "1f1hxx4xl0wljyrgj0m3zq47yz2cyqd52qigrkpcvavr1d2sx6m3"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "90.6.7"; - gitRevision = "19ba721"; - chromiumVersion = "90.0.4430.212"; + version = "98.1.21"; + gitRevision = "9782362"; + chromiumVersion = "98.0.4758.102"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; @@ -102,6 +103,11 @@ stdenv.mkDerivation rec { cp -r ../include $out/ ''; + passthru.tests = { + inherit obs-studio; # frequently breaks on CEF updates + }; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Simple framework for embedding Chromium-based browsers in other applications"; homepage = "https://cef-builds.spotifycdn.com/index.html"; diff --git a/pkgs/development/libraries/libcef/update.sh b/pkgs/development/libraries/libcef/update.sh new file mode 100755 index 000000000000..545f7c702052 --- /dev/null +++ b/pkgs/development/libraries/libcef/update.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused jq + +set -x -eu -o pipefail + +cd $(dirname "${BASH_SOURCE[0]}") + +VERSION_JSON=$(curl --silent https://cef-builds.spotifycdn.com/index.json | jq '[.linux64.versions[] | select (.channel == "stable")][0]') + +CEF_VERSION=$(echo ${VERSION_JSON} | jq -r '.cef_version' | cut -d'+' -f1) +GIT_REVISION=$(echo ${VERSION_JSON} | jq -r '.cef_version' | cut -d'+' -f2 | cut -c 2-) +CHROMIUM_VERSION=$(echo ${VERSION_JSON} | jq -r '.chromium_version') + +SHA256_LINUX64=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linux64_minimal.tar.bz2) +SHA256_LINUX32=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linux32_minimal.tar.bz2) +SHA256_LINUXARM64=$(nix-prefetch-url --quiet https://cef-builds.spotifycdn.com/cef_binary_${CEF_VERSION}+g${GIT_REVISION}+chromium-${CHROMIUM_VERSION}_linuxarm64_minimal.tar.bz2) + +setKV () { + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix +} + +setKV version ${CEF_VERSION} +setKV gitRevision ${GIT_REVISION} +setKV chromiumVersion ${CHROMIUM_VERSION} +setKV 'platforms."aarch64-linux".sha256' ${SHA256_LINUXARM64} +setKV 'platforms."i686-linux".sha256' ${SHA256_LINUX32} +setKV 'platforms."x86_64-linux".sha256' ${SHA256_LINUX64} diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index fdcc2ae0081b..c634892944ca 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja python3 ]; buildInputs = [ llvm clang-unwrapped ]; strictDeps = true; + cmakeFlags = [ + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; meta = with lib; { homepage = "http://libclc.llvm.org/"; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 3e2c0daf0b46..dd5472849fd9 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libcommuni"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "communi"; repo = "libcommuni"; rev = "v${version}"; - sha256 = "sha256-ABvrMoOVSycbQ8iRDzi7zkFnuSgHMMBgm9cDUWlD4uc="; + sha256 = "sha256-9eYJpmjW1J48RD6wVJOHmsAgTbauNeeCrXe076ufq1I="; }; buildInputs = [ qtbase qtdeclarative ]; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 0c9cd1a75304..574d0b9d94cb 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-7gHqnhNog0CN92YyvypbHWWUnCDuvGP4oiJjtP9GkIY="; + sha256 = "sha256-ffeSrWcvxvMY4mmA/+VoMitoCVUUP91t1lIOcuzNrJY="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; diff --git a/pkgs/development/libraries/libctl/default.nix b/pkgs/development/libraries/libctl/default.nix new file mode 100644 index 000000000000..d7fed2415df0 --- /dev/null +++ b/pkgs/development/libraries/libctl/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, gfortran +, guile +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "libctl"; + version = "4.5.1"; + + src = fetchFromGitHub { + owner = "NanoComp"; + repo = pname; + rev = "v${version}"; + sha256 = "uOydBWYPXSBUi+4MM6FNx6B5l2to7Ny9Uc1MMTV9bGA="; + }; + + nativeBuildInputs = [ autoreconfHook gfortran guile pkg-config ]; + + configureFlags = [ "--enable-shared" ]; + + meta = with lib; { + description = "Guile-based library for supporting flexible control files in scientific simulations"; + homepage = "https://github.com/NanoComp/libctl"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ carpinchomug ]; + }; +} diff --git a/pkgs/development/libraries/libcyaml/default.nix b/pkgs/development/libraries/libcyaml/default.nix index 4b8d85b5b55b..dede81b0a1c3 100644 --- a/pkgs/development/libraries/libcyaml/default.nix +++ b/pkgs/development/libraries/libcyaml/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libcyaml"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "tlsa"; repo = "libcyaml"; rev = "v${version}"; - sha256 = "sha256-8Dd6LQovPx+y2957zY8blA0ls10ekGvTCeKmLyHZnOI="; + sha256 = "sha256-ntgTgIJ3u1IbR/eYOgwmgR9Jvx28P+l44wAMlBEcbj8="; }; buildInputs = [ libyaml ]; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 426ffadf4c6e..7f4c53071d0c 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -1,20 +1,53 @@ -{ lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb-run, glib, gtk3, gnome }: +{ lib +, stdenv +, fetchurl +, ninja +, meson +, pkg-config +, vala +, gobject-introspection +, libxml2 +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_43 +, dbus +, xvfb-run +, glib +, gtk3 +, gnome +}: stdenv.mkDerivation rec { pname = "libdazzle"; - version = "3.42.0"; + version = "3.44.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09b9l56yiwad7xqr7g7ragmm4gmqxjnvc2pcx6741klw7lxpmrpa"; + sha256 = "PNPkXrbiaAywXVLh6A3Y+dWdR2UhLw4o945sF4PRjq4="; }; - nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb-run glib ]; - buildInputs = [ glib gtk3 ]; + nativeBuildInputs = [ + ninja + meson + pkg-config + vala + gobject-introspection + libxml2 + gtk-doc + docbook_xsl + docbook_xml_dtd_43 + dbus + xvfb-run + glib + ]; + + buildInputs = [ + glib + gtk3 + ]; mesonFlags = [ "-Denable_gtk_doc=true" diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 8e9fe4de88ae..0b5531d70c54 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -7,14 +7,11 @@ with lib; stdenv.mkDerivation rec { - name = let postfix = if gtkVersion == null then "glib" else "gtk${gtkVersion}"; - in "libdbusmenu-${postfix}-${version}"; - version = "${versionMajor}.${versionMinor}"; - versionMajor = "16.04"; - versionMinor = "0"; + pname = "libdbusmenu-${if gtkVersion == null then "glib" else "gtk${gtkVersion}"}"; + version = "16.04.0"; src = fetchurl { - url = "${meta.homepage}/${versionMajor}/${version}/+download/libdbusmenu-${version}.tar.gz"; + url = "https://launchpad.net/dbusmenu/${lib.versions.majorMinor version}/${version}/+download/libdbusmenu-${version}.tar.gz"; sha256 = "12l7z8dhl917iy9h02sxmpclnhkdjryn08r8i4sr8l3lrlm4mk5r"; }; diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 48c20c8b7ca5..5b969284995c 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.72.0"; + version = "1.76.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-/StX22pSQtfOYbBTFL7vh0Y0V038Ohyq+qoDECITD80="; + hash = "sha256-aeYOszOFyLaC1xKswYZLzqoWSFFWOOeOkc+WrtqU0jo="; }; patches = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Jwf95oTyGsOikVMKAg+EaDNY78VW+kECD+lhNePSKWE="; + hash = "sha256-sBFXcLXpAkX+HzRKrLKaHhi5ieS8Yc/Uf30WcXyWrok="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 731039e26a08..e08a46732480 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.109"; + version = "2.4.110"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "09kzrdsd14zr0i3izvi5mck4vqccl3c9hr84r9i4is0zikh554v2"; + sha256 = "0dwpry9m5l27dlhq48j4bsiqwm0247cxdqwv3b7ddmkynk2f9kpf"; }; outputs = [ "out" "dev" "bin" ]; diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index 542cff712c82..3193f383d610 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -1,18 +1,29 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, openssl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libESMTP"; - version = "1.0.6"; + version = "1.1.0"; - src = fetchurl { - url = "http://brianstafford.info/libesmtp/libesmtp-1.0.6.tar.bz2"; - sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh"; + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ openssl ]; + + src = fetchFromGitHub { + owner = "libesmtp"; + repo = pname; + rev = "v${version}"; + sha256 = "1bhh8hlsl9597x0bnfl563k2c09b61qnkb9mfyqcmzlq63m1zw5y"; }; meta = with lib; { - homepage = "http://brianstafford.info/libesmtp/index.html"; description = "A Library for Posting Electronic Mail"; - license = licenses.lgpl21; + longDescription = '' + libESMTP is an SMTP client library which manages submission of electronic mail + via a preconfigured Mail Transport Agent (MTA) such as Exim or Postfix. + It implements many SMTP extensions including TLS for security + and PIPELINING for high performance. + ''; + homepage = "https://libesmtp.github.io/"; + license = licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 5a5d8b93057a..a2cb4d2bd246 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # Makefile is missing depepdencies on generated headers: + # main.c:4:10: fatal error: signal1.h: No such file or directory + enableParallelBuilding = false; + meta = { description = "F2c converts Fortran 77 source code to C"; homepage = "http://www.netlib.org/f2c/"; diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 95e00cdd7329..b02b856442bf 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.35.0"; + version = "0.36.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-7uJRDc49BpHqc9wdoQ+sfbEhWwup7vphbfMFNosJKug="; + sha256 = "sha256-wCccGO3n+7yCayHJcsLLD/lnRO5aFckdjXTpvDhTqHI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index daa1d2233426..d2766c4d29ab 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.94.1"; + version = "1.94.3"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xFmby1x2TRZqXrV9Einqu3002qMAN5tQga2mIAHfC9c="; + sha256 = "sha256-uOFWF+CDyK4+fY+NhiDnRKaptAN/vfH32Vzj+LAxWqg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index 38b0c6c8def0..e5a3b79ba77c 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.14"; + version = "1.1.19"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-WYVFbp5aEqdxZQYSJ96Mi7ruLu4TkDbw/NCV8roPN28="; + sha256 = "sha256-HTmNoTGyFtOXRy7Y/ZnEgTa2GW6/+TeZxZo7c7ksNtc="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index b30aa89b1485..918ed20efaaf 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { description = "General-pupose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; - repositories.git = "git://git.gnupg.org/libgcrypt.git"; knownVulnerabilities = [ "CVE-2014-3591" "CVE-2015-0837" diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 08e79a16e1ac..eb4e8e948629 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, gettext, libgpg-error, enableCapabilities ? false, libcap, buildPackages }: +{ lib +, stdenv +, fetchurl +, gettext +, libgpg-error +, enableCapabilities ? false, libcap +, buildPackages +# for passthru.tests +, gnupg +, libotr +, rsyslog +}: assert enableCapabilities -> stdenv.isLinux; @@ -56,6 +67,10 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + inherit gnupg libotr rsyslog; + }; + meta = with lib; { homepage = "https://www.gnu.org/software/libgcrypt/"; changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob;f=NEWS;hb=refs/tags/${pname}-${version}"; @@ -63,6 +78,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ vrthra ]; - repositories.git = "git://git.gnupg.org/libgcrypt.git"; }; } diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index 28235d65d98a..c02c6116e648 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , intltool , meson @@ -37,6 +38,20 @@ stdenv.mkDerivation rec { sha256 = "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr"; }; + patches = [ + # Fix undefined behavior + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/657b2f8497da907559a6769c5b1d2d7b5bd40688.patch"; + sha256 = "Qx4S9KQsTAr4M0QJi0Xr5kKuHSp4NwZJHoRPYyxIyTk="; + }) + + # Fix building vapi + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/57f618a3b2a3758ee3dcbf9bbdc566122dd8566d.patch"; + sha256 = "pyfymUd61m1kHaGyMbUQMma+szB8mlqGWwcFBBQawf8="; + }) + ]; + nativeBuildInputs = [ pkg-config intltool diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index f85dbea54d9d..e0d3a7318a85 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -45,15 +45,15 @@ stdenv.mkDerivation rec { buildInputs = [ gcr - glib - libsoup - libxml2 openssl p11-kit uhttpmock ]; propagatedBuildInputs = [ + glib + libsoup + libxml2 gnome-online-accounts json-glib ]; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index 1a40d1f17b41..b34790d59c73 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgee"; - version = "0.20.4"; + version = "0.20.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "03nyf8n7i7f67fsh220g52slmihdk1lv4iwspm7xmkgrj3rink2j"; + sha256 = "MYY6iVfVpyf5BnSVyr8KCIn6XT1EYm5UCUMxGI1cFRg="; }; doCheck = true; diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix new file mode 100644 index 000000000000..dc12e643cb75 --- /dev/null +++ b/pkgs/development/libraries/libgit2/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, python3 +, zlib +, libssh2 +, openssl +, pcre +, http-parser +, libiconv +, Security +}: + +stdenv.mkDerivation rec { + pname = "libgit2"; + version = "1.4.0"; + # also check the following packages for updates: python3.pkgs.pygit2 and libgit2-glib + + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "sha256-21t7fD/5O+HIHUDEv8MqloDmAIm9sSpJYqreCD3Co2k="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/libgit2/libgit2/commit/8bc9eda779b2e2602fc74944aba5d39198e0642f.patch"; + sha256 = "sha256-r2i4+WsrxIpSwH0g/AikBdAajBncXb1zz0uOQB0h1Jk="; + }) + ]; + + cmakeFlags = [ + "-DTHREADSAFE=ON" + "-DUSE_HTTP_PARSER=system" + "-DUSE_SSH=ON" + ]; + + nativeBuildInputs = [ cmake python3 pkg-config ]; + + buildInputs = [ zlib libssh2 openssl pcre http-parser ] + ++ lib.optional stdenv.isDarwin Security; + + propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; + + doCheck = false; # hangs. or very expensive? + + meta = { + description = "Linkable library implementation of Git that you can use in your application"; + homepage = "https://libgit2.org/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix deleted file mode 100644 index b00e7b324518..000000000000 --- a/pkgs/development/libraries/libgksu/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome, - libstartup_notification, libgtop, perlPackages, - autoreconfHook, intltool, docbook_xsl, xauth -}: - -stdenv.mkDerivation rec { - version = "2.0.12"; - pname = "libgksu"; - - src = fetchurl { - url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz"; - sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92"; - }; - - nativeBuildInputs = [ - pkg-config autoreconfHook intltool docbook_xsl wrapGAppsHook - ]; - - buildInputs = [ - gtk2 gnome2.GConf libstartup_notification - gnome.libgnome-keyring libgtop gnome2.libglade - ] ++ (with perlPackages; [ perl XMLParser ]); - - enableParallelBuilding = true; - - hardeningDisable = [ "format" ]; - - patches = [ - # Patches from the gentoo ebuild - - # Fix compilation on bsdc - ./libgksu-2.0.0-fbsd.patch - - # Fix wrong usage of LDFLAGS, gentoo bug #226837 - ./libgksu-2.0.7-libs.patch - - # Use po/LINGUAS - ./libgksu-2.0.7-polinguas.patch - - # Don't forkpty; gentoo bug #298289 - ./libgksu-2.0.12-revert-forkpty.patch - - # Make this gmake-3.82 compliant, gentoo bug #333961 - ./libgksu-2.0.12-fix-make-3.82.patch - - # Do not build test programs that are never executed; also fixes gentoo bug #367397 (underlinking issues). - ./libgksu-2.0.12-notests.patch - - # Fix automake-1.11.2 compatibility, gentoo bug #397411 - ./libgksu-2.0.12-automake-1.11.2.patch - ]; - - postPatch = '' - # gentoo bug #467026 - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac - - # Fix some binary paths - sed -i -e 's|/usr/bin/xauth|${xauth}/bin/xauth|g' libgksu/gksu-run-helper.c libgksu/libgksu.c - sed -i -e 's|/usr/bin/sudo|/run/wrappers/bin/sudo|g' libgksu/libgksu.c - sed -i -e 's|/bin/su\([^d]\)|/run/wrappers/bin/su\1|g' libgksu/libgksu.c - - touch NEWS README - ''; - - preConfigure = '' - intltoolize --force --copy --automake - ''; - - configureFlags = [ - "--disable-gtk-doc" - ]; - - meta = { - description = "A library for integration of su into applications"; - longDescription = '' - This library comes from the gksu program. It provides a simple API - to use su and sudo in programs that need to execute tasks as other - user. It provides X authentication facilities for running - programs in an X session. - ''; - homepage = "https://www.nongnu.org/gksu/"; - license = lib.licenses.lgpl2; - maintainers = [ lib.maintainers.romildo ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch deleted file mode 100644 index 5c007be5b4b4..000000000000 --- a/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c ---- libgksu-2.0.0.orig/libgksu/libgksu.c 2006-09-14 22:35:51.000000000 -0400 -+++ libgksu-2.0.0/libgksu/libgksu.c 2006-12-12 11:28:01.000000000 -0500 -@@ -23,7 +23,12 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#include -+#else - #include -+#endif - #include - #include - #include -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am ---- libgksu-2.0.0.orig/libgksu/Makefile.am 2006-09-14 22:35:52.000000000 -0400 -+++ libgksu-2.0.0/libgksu/Makefile.am 2006-12-12 11:28:01.000000000 -0500 -@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe - noinst_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - - EXTRA_DIST = libgksu.ver -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in ---- libgksu-2.0.0.orig/libgksu/Makefile.in 2006-09-23 15:37:44.000000000 -0400 -+++ libgksu-2.0.0/libgksu/Makefile.in 2006-12-12 11:30:09.000000000 -0500 -@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config -- - gksu_run_helper_SOURCES = gksu-run-helper.c - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - EXTRA_DIST = libgksu.ver - all: all-am - -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am ---- libgksu-2.0.0.orig/libgksuui/Makefile.am 2006-09-14 22:35:31.000000000 -0400 -+++ libgksu-2.0.0/libgksuui/Makefile.am 2006-12-12 11:28:01.000000000 -0500 -@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE - noinst_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in ---- libgksu-2.0.0.orig/libgksuui/Makefile.in 2006-09-23 15:37:44.000000000 -0400 -+++ libgksu-2.0.0/libgksuui/Makefile.in 2006-12-12 11:30:22.000000000 -0500 -@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - all: all-am - - .SUFFIXES: diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch deleted file mode 100644 index 0f22166fb8b7..000000000000 --- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -Due to the following change, pkglib_PROGRAMS is invalid: - http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf - -https://savannah.nongnu.org/bugs/index.php?35241 -https://bugs.gentoo.org/show_bug.cgi?id=397411 - ---- - libgksu/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am -index 49362f9..3cb1090 100644 ---- a/libgksu/Makefile.am -+++ b/libgksu/Makefile.am -@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE} - pkgconfigdir = ${libdir}/pkgconfig - pkgconfig_DATA = libgksu2.pc - --pkglibdir = ${libdir}/${PACKAGE} --pkglib_PROGRAMS = gksu-run-helper -+gksulibdir = ${libdir}/${PACKAGE} -+gksulib_PROGRAMS = gksu-run-helper - gksu_run_helper_LDADD = ${GLIB_LIBS} - gksu_run_helper_SOURCES = gksu-run-helper.c - diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch deleted file mode 100644 index dd52b8247fa4..000000000000 --- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- libgksu/Makefile.am-orig 2010-08-22 16:11:19.872577459 -0500 -+++ libgksu/Makefile.am 2010-08-22 16:11:55.289599110 -0500 -@@ -17,11 +17,11 @@ - - if GCONF_SCHEMAS_INSTALL - install-data-local: -- if test -z "$(DESTDIR)" ; then \ -- for p in $(schemas_DATA) ; do \ -- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ -- done \ -- fi -+ if test -z "$(DESTDIR)" ; then \ -+ for p in $(schemas_DATA) ; do \ -+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ -+ done \ -+ fi - else - install-data-local: - endif diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch deleted file mode 100644 index 3787ef6bfc13..000000000000 --- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: libgksu-2.0.12/libgksu/Makefile.am -=================================================================== ---- libgksu-2.0.12.orig/libgksu/Makefile.am -+++ libgksu-2.0.12/libgksu/Makefile.am -@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper - gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` - gksu_run_helper_SOURCES = gksu-run-helper.c - --noinst_PROGRAMS = test-gksu -+EXTRA_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la - test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -Index: libgksu-2.0.12/libgksuui/Makefile.am -=================================================================== ---- libgksu-2.0.12.orig/libgksuui/Makefile.am -+++ libgksu-2.0.12/libgksuui/Makefile.am -@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - includedir = ${prefix}/include/$(PACKAGE) - --noinst_PROGRAMS = test-gksuui -+EXTRA_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la - test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch deleted file mode 100644 index 2c3a8cc786bb..000000000000 --- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch +++ /dev/null @@ -1,359 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c ---- libgksu-2.0.12.orig/libgksu/libgksu.c 2009-06-29 13:48:24.000000000 -0400 -+++ libgksu-2.0.12/libgksu/libgksu.c 2010-01-12 07:32:10.450657456 -0500 -@@ -1,7 +1,6 @@ - /* - * Gksu -- a library providing access to su functionality - * Copyright (C) 2004-2009 Gustavo Noronha Silva -- * Portions Copyright (C) 2009 VMware, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -56,9 +55,6 @@ - static void - gksu_context_launch_complete (GksuContext *context); - --static void --read_line (int fd, gchar *buffer, int n); -- - GType - gksu_error_get_type (void) - { -@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context, - for (i = 0 ; cmd[i] != NULL ; i++) - g_free (cmd[i]); - g_free(cmd); -- -- _exit(1); - } - else if (pid == -1) - { -@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context, - /* drop the \n echoed on password entry if su did request - a password */ - if (password_needed) -- read_line (fdpty, buf, 255); -+ read (fdpty, buf, 255); - if (context->debug) - fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); -- read_line (fdpty, buf, 255); -+ read (fdpty, buf, 255); - if (context->debug) - fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); - } -@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context, - { - int retval = 0; - -- /* Red Hat's su shows the full path to su in its error messages. */ -- if (!strncmp (buf, "su:", 3) || -- !strncmp (buf, "/bin/su:", 7)) -+ if (!strncmp (buf, "su", 2)) - { - gchar **strings; - -@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context, - } - - strings = g_strsplit (buf, ":", 2); -- -- /* Red Hat and Fedora use 'incorrect password'. */ -- if (strings[1] && -- (g_str_has_prefix(strings[1], " Authentication failure") || -- g_str_has_prefix(strings[1], " incorrect password"))) -+ if (strings[1] && !strncmp (strings[1], " Authentication failure", 23)) - { - if (used_gnome_keyring) - g_set_error (error, gksu_quark, -@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context, - { - char **cmd; - char buffer[256] = {0}; -- char *child_stderr = NULL; -- /* This command is used to gain a token */ -- char *const verifycmd[] = -- { -- "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL -- }; - int argcount = 8; - int i, j; - -@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context, - - pid_t pid; - int status; -- FILE *fdfile = NULL; -- int fdpty = -1; -+ FILE *infile, *outfile; -+ int parent_pipe[2]; /* For talking to the parent */ -+ int child_pipe[2]; /* For talking to the child */ - - context->sudo_mode = TRUE; - -@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context, - cmd[argcount] = g_strdup("-S"); - argcount++; - -- /* Make sudo noninteractive (we should already have a token) */ -- cmd[argcount] = g_strdup("-n"); -- argcount++; -- - /* Make sudo use next arg as prompt */ - cmd[argcount] = g_strdup("-p"); - argcount++; -@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]); - } - -- pid = forkpty(&fdpty, NULL, NULL, NULL); -- if (pid == 0) -+ if ((pipe(parent_pipe)) == -1) - { -- // Child -- setsid(); // make us session leader -- -- execv(verifycmd[0], verifycmd); -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error creating pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - -- g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, -- _("Failed to exec new process: %s"), -+ if ((pipe(child_pipe)) == -1) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error creating pipe: %s"), - strerror(errno)); - sudo_reset_xauth (context, xauth, xauth_env); - return FALSE; - } -- else if (pid == -1) -+ -+ pid = fork(); -+ if (pid == -1) - { - g_set_error (error, gksu_quark, GKSU_ERROR_FORK, - _("Failed to fork new process: %s"), -@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context, - sudo_reset_xauth (context, xauth, xauth_env); - return FALSE; - } -+ else if (pid == 0) -+ { -+ // Child -+ setsid(); // make us session leader -+ close(child_pipe[1]); -+ dup2(child_pipe[0], STDIN_FILENO); -+ dup2(parent_pipe[1], STDERR_FILENO); - -+ execv(cmd[0], cmd); -+ -+ g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, -+ _("Failed to exec new process: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - else - { - gint counter = 0; - gchar *cmdline = NULL; -- struct termios tio; - - // Parent -- fdfile = fdopen(fdpty, "w+"); -+ close(parent_pipe[1]); - -- /* make sure we notice that ECHO is turned off, if it gets -- turned off */ -- tcgetattr (fdpty, &tio); -- for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++) -- { -- usleep (1000); -- tcgetattr (fdpty, &tio); -- } -+ infile = fdopen(parent_pipe[0], "r"); -+ if (!infile) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error opening pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - -- fcntl (fdpty, F_SETFL, O_NONBLOCK); -+ outfile = fdopen(child_pipe[1], "w"); -+ if (!outfile) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error opening pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } -+ -+ /* -+ we are expecting to receive a GNOME_SUDO_PASS -+ if we don't there are two possibilities: an error -+ or a password is not needed -+ */ -+ fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK); - - { /* no matter if we can read, since we're using - O_NONBLOCK; this is just to avoid the prompt -@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context, - struct timeval tv; - - FD_ZERO(&rfds); -- FD_SET(fdpty, &rfds); -+ FD_SET(parent_pipe[0], &rfds); - tv.tv_sec = 1; - tv.tv_usec = 0; - -- select (fdpty + 1, &rfds, NULL, NULL, &tv); -+ select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv); - } - - /* Try hard to find the prompt; it may happen that we're -@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context, - if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0) - break; - -- read_line (fdpty, buffer, 256); -+ read_line (parent_pipe[0], buffer, 256); - - if (context->debug) - fprintf (stderr, "buffer: -%s-\n", buffer); -@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context, - - usleep (1000); - -- write (fdpty, password, strlen(password) + 1); -- write (fdpty, "\n", 1); -+ fprintf (outfile, "%s\n", password); -+ fclose (outfile); - - nullify_password (password); - -- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); -+ /* turn NONBLOCK off */ -+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); - /* ignore the first newline that comes right after sudo receives - the password */ -- fgets (buffer, 255, fdfile); -- /* this is the status we are interested in */ -- fgets (buffer, 255, fdfile); -+ fgets (buffer, 255, infile); -+ /* this is the status we are interessted in */ -+ fgets (buffer, 255, infile); - } - else - { -@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n"); - - /* turn NONBLOCK off, also if have no prompt */ -- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); -+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); - - should_display = gconf_client_get_bool (context->gconf_client, - BASE_PATH "display-no-pass-info", NULL); -@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "%s", buffer); - } - -- if (g_str_has_prefix (buffer, "Sorry, try again.")) -+ if (!strcmp (buffer, "Sorry, try again.\n")) - g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS, - _("Wrong password.")); -+ else if (!strncmp (buffer, "Sorry, user ", 12)) -+ g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, -+ _("The underlying authorization mechanism (sudo) " -+ "does not allow you to run this program. Contact " -+ "the system administrator.")); - else - { - gchar *haystack = buffer; -@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context, - } - } - -- /* If we have an error, let's just stop sudo right there. */ -- if (error) -- close(fdpty); -- - cmdline = g_strdup("sudo"); - /* wait for the child process to end or become something other - than sudo */ -@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context, - if (context->sn_context) - gksu_context_launch_complete (context); - -+ while (read (parent_pipe[0], buffer, 255) > 0) -+ { -+ fprintf (stderr, "%s", buffer); -+ bzero(buffer, 256); -+ } -+ - /* if the process is still active waitpid() on it */ - if (pid_exited != pid) - waitpid(pid, &status, 0); - sudo_reset_xauth (context, xauth, xauth_env); - -- /* -- * Did token acquisition succeed? If so, spawn sudo in -- * non-interactive mode. It should either succeed or die -- * immediately if you're not allowed to run the command. -- */ -- if (WEXITSTATUS(status) == 0) -- { -- g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL, -- NULL, &child_stderr, &status, -- error); -- } -- - if (exit_status) - { - if (WIFEXITED(status)) { -@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context, - - if (WEXITSTATUS(status)) - { -- if (g_str_has_prefix(child_stderr, "Sorry, user ")) -- { -- g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, -- _("The underlying authorization mechanism (sudo) " -- "does not allow you to run this program. Contact " -- "the system administrator.")); -- } - if(cmdline) - { - /* sudo already exec()ed something else, don't report -@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context, - if (!g_str_has_suffix (cmdline, "sudo")) - { - g_free (cmdline); -- g_free (child_stderr); - return FALSE; - } - g_free (cmdline); -@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context, - } - } - -- fprintf(stderr, child_stderr); -- g_free(child_stderr); -- - /* if error is set we have found an error condition */ -- return (error == NULL); -+ if (error) -+ return FALSE; -+ -+ return TRUE; - } - - /** diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch deleted file mode 100644 index b9fb77f27147..000000000000 --- a/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch +++ /dev/null @@ -1,76 +0,0 @@ -# https://savannah.nongnu.org/bugs/?25362 -# https://bugs.gentoo.org/show_bug.cgi?id=226837 -diff -Nura a/configure.ac b/configure.ac ---- a/configure.ac 2009-01-19 22:15:30.000000000 +0100 -+++ b/configure.ac 2009-01-19 22:18:10.000000000 +0100 -@@ -43,6 +43,9 @@ - PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0]) - PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0]) - -+PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0]) -+PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0]) -+ - # Checks for library functions. - ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN" - -diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am ---- a/gksu-properties/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/gksu-properties/Makefile.am 2009-01-19 22:19:13.000000000 +0100 -@@ -3,7 +3,7 @@ - AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" - - bin_PROGRAMS = gksu-properties --gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS} -+gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS} - gksu_properties_SOURCES = gksu-properties.c - - gladedir = ${prefix}/share/${PACKAGE} -diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am ---- a/libgksu/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/libgksu/Makefile.am 2009-01-19 22:18:25.000000000 +0100 -@@ -8,8 +8,8 @@ - # major -> breaks backward compatibility (changes to existing ABI) - # minor -> keeps compatibility (additions to the API) - # micro -> no change to the API/ABI --libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la --libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS} -+libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS} -+libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 - if USE_VERSION_SCRIPT - libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver - endif -@@ -24,12 +24,11 @@ - - pkglibdir = ${libdir}/${PACKAGE} - pkglib_PROGRAMS = gksu-run-helper --gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` -+gksu_run_helper_LDADD = ${GLIB_LIBS} - gksu_run_helper_SOURCES = gksu-run-helper.c - - noinst_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c --test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -+test_gksu_LDADD = libgksu2.la ${GLIB_LIBS} - - EXTRA_DIST = libgksu.ver -diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am ---- a/libgksuui/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/libgksuui/Makefile.am 2009-01-19 22:18:54.000000000 +0100 -@@ -4,12 +4,13 @@ - - noinst_LTLIBRARIES = libgksuui1.0.la - libgksuui1_0_la_SOURCES = gksuui-dialog.c --libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0` -+libgksuui1_0_la_LDFLAGS = -Wl,-O1 -+libgksuui1_0_la_LIBADD = ${GTK_LIBS} - - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - includedir = ${prefix}/include/$(PACKAGE) - - noinst_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c --test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -+test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS} -+ diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch deleted file mode 100644 index e423af16b44c..000000000000 --- a/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch +++ /dev/null @@ -1,40 +0,0 @@ -# https://savannah.nongnu.org/bugs/?25360 -diff -Nura a/configure.ac b/configure.ac ---- a/configure.ac 2009-01-19 21:50:57.000000000 +0100 -+++ b/configure.ac 2009-01-19 21:53:21.000000000 +0100 -@@ -50,7 +50,7 @@ - GETTEXT_PACKAGE=AC_PACKAGE_NAME - AC_SUBST(GETTEXT_PACKAGE) - --IT_PROG_INTLTOOL -+IT_PROG_INTLTOOL([0.35.5]) - AM_GLIB_GNU_GETTEXT - - ################################################## -diff -Nura a/po/LINGUAS b/po/LINGUAS ---- a/po/LINGUAS 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/LINGUAS 2009-01-19 21:54:24.000000000 +0100 -@@ -0,0 +1,23 @@ -+# please keep this list sorted alphabetically -+# http://live.gnome.org/GnomeGoals/PoLinguas -+# -+ca -+cs -+da -+de -+es -+eu -+fr -+hu -+it -+ko -+lt -+pl -+pt_BR -+ro -+ru -+sk -+sv -+nb -+nl -+zh_CN diff --git a/pkgs/development/libraries/libgnome-games-support/2.0.nix b/pkgs/development/libraries/libgnome-games-support/2.0.nix new file mode 100644 index 000000000000..a5f1c2576b9f --- /dev/null +++ b/pkgs/development/libraries/libgnome-games-support/2.0.nix @@ -0,0 +1,59 @@ +{ stdenv +, lib +, fetchurl +, pkg-config +, glib +, gtk4 +, libgee +, gettext +, vala +, gnome +, libintl +, meson +, ninja +}: + +stdenv.mkDerivation rec { + pname = "libgnome-games-support"; + version = "2.0.0"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "U4Ifb+Mu3cue7zMk9kaqrIPMbT3gk339XyZkcNRT0qQ="; + }; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + libintl + ]; + + propagatedBuildInputs = [ + # Required by libgnome-games-support-2.pc + glib + gtk4 + libgee + ]; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "${pname}_2_0"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Small library intended for internal use by GNOME Games, but it may be used by others"; + homepage = "https://wiki.gnome.org/Apps/Games"; + license = licenses.lgpl3Plus; + maintainers = teams.gnome.members; + platforms = platforms.unix; + }; +} diff --git a/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix b/pkgs/development/libraries/libgnome-games-support/default.nix similarity index 96% rename from pkgs/desktops/gnome/misc/libgnome-games-support/default.nix rename to pkgs/development/libraries/libgnome-games-support/default.nix index 46de584d5b1e..e63d7f8fe656 100644 --- a/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix +++ b/pkgs/development/libraries/libgnome-games-support/default.nix @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome.${pname}"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index ec2b614ee9ca..181829156c99 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -40,6 +40,8 @@ in stdenv.mkDerivation (rec { '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) '' ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h + '' + lib.optionalString (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isMusl) '' + ln -s lock-obj-pub.aarch64-unknown-linux-gnu.h src/syscfg/lock-obj-pub.linux-musl.h ''; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 63015fdf6cb3..5305b4922530 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libgphoto2"; - version = "2.5.27"; + version = "2.5.29"; src = fetchFromGitHub { owner = "gphoto"; repo = "libgphoto2"; rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; - sha256 = "sha256-c7fBl6GBLAU+RL5WFC4PL+n/nEHZUfqIJ9qq1+qNNCg="; + sha256 = "sha256-Js5gbD57lhtqBX6joGMiLKUwkPDaSclnTrwBR87AliQ="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 1850da7e6468..8bc2dc76160f 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,26 +1,59 @@ -{ fetchurl, lib, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2 -, perl, gdk-pixbuf, libiconv, libintl, gnome }: +{ fetchurl +, lib +, stdenv +, pkg-config +, intltool +, gettext +, glib +, libxml2 +, zlib +, bzip2 +, perl +, gdk-pixbuf +, libiconv +, libintl +, gnome +}: stdenv.mkDerivation rec { pname = "libgsf"; - version = "1.14.48"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "/4bX8dRt0Ovvt72DCnSkHbZDYrmHv4hT//arTBEyuDc="; - }; - - nativeBuildInputs = [ pkg-config intltool libintl ]; - - buildInputs = [ gettext bzip2 zlib ]; - checkInputs = [ perl ]; - - propagatedBuildInputs = [ libxml2 glib gdk-pixbuf libiconv ]; + version = "1.14.49"; outputs = [ "out" "dev" ]; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "6evjZojwEMnm5AyJA/NzKUjeuKygMleNB9B1G9gs+Fc="; + }; + + nativeBuildInputs = [ + pkg-config + intltool + libintl + ]; + + buildInputs = [ + gettext + bzip2 + zlib + ]; + + checkInputs = [ + perl + ]; + + propagatedBuildInputs = [ + libxml2 + glib + gdk-pixbuf + libiconv + ]; + doCheck = true; - preCheck = "patchShebangs ./tests/"; + + preCheck = '' + patchShebangs ./tests/ + ''; passthru = { updateScript = gnome.updateScript { @@ -31,10 +64,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GNOME's Structured File Library"; - homepage = "https://www.gnome.org/projects/libgsf"; - license = licenses.lgpl2Plus; + homepage = "https://www.gnome.org/projects/libgsf"; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; - platforms = lib.platforms.unix; + platforms = lib.platforms.unix; longDescription = '' Libgsf aims to provide an efficient extensible I/O abstraction for diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 1ad302e439f8..49e76a94b001 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, makeWrapper -, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper +, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre2, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db , gmp, readline, file, numactl, libapparmor, jansson , getopt, perlPackages, ocamlPackages @@ -12,11 +12,11 @@ assert javaSupport -> jdk != null; stdenv.mkDerivation rec { pname = "libguestfs"; - version = "1.44.1"; + version = "1.46.2"; src = fetchurl { url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - sha256 = "09dhmlbfdwirlmkasa28x69vqs5xndq0lnng6b4if76s6bfxrdvj"; + sha256 = "0sq092irlj2jf64m7hjx23hn5k4iypqxmlyn9g2z0q0xab56ksp6"; }; strictDeps = true; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ++ (with ocamlPackages; [ ocaml findlib ]); buildInputs = [ ncurses jansson - pcre augeas libxml2 acl libcap libcap_ng libconfig + pcre2 augeas libxml2 acl libcap libcap_ng libconfig systemd fuse yajl libvirt gmp readline file hivex db numactl libapparmor perlPackages.ModuleBuild libtirpc @@ -53,13 +53,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!javaSupport) [ "--without-java" ]; patches = [ ./libguestfs-syms.patch - # Set HAVE_RPM, HAVE_DPKG, HAVE_PACMAN - (fetchpatch { - url = "https://github.com/libguestfs/libguestfs/commit/210959cc344d6a4a1e3afa26d276b130651def74.patch"; - sha256 = "121l58mk2mwhhqc3rcisdw3di7y729b30hyffc8a50mq5k7fvsdb"; - }) ]; - NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; installFlags = [ "REALLY_INSTALL=yes" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index fbab67e08652..e4a527ba4857 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -6,12 +6,9 @@ , pkg-config , libxml2 , glib -, gtk3 , gettext , libsoup -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 +, gi-docgen , gobject-introspection , python3 , tzdata @@ -22,24 +19,29 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "40.0"; + version = "4.0.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1rkf4yv43qcahyx7bismdv6z2vh5azdnm1fqfmnzrada9cm8ykna"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "RA1EgBtvcrSMZ25eN/kQnP7hOU/XTMknJeGxuk+ug0w="; }; + patches = [ + # Headers depend on glib but it is only listed in Requires.private, + # which does not influence Cflags on non-static builds in nixpkgs’s + # pkg-config. Let’s add it to Requires to ensure Cflags are set correctly. + ./fix-pkgconfig.patch + ]; + nativeBuildInputs = [ meson ninja pkg-config gettext vala - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 + gi-docgen gobject-introspection python3 python3.pkgs.pygobject3 @@ -47,7 +49,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gtk3 libsoup libxml2 geocode-glib @@ -60,9 +61,13 @@ stdenv.mkDerivation rec { ]; postPatch = '' - chmod +x meson/meson_post_install.py - patchShebangs meson/meson_post_install.py - patchShebangs data/gen_locations_variant.py + patchShebangs build-aux/meson/meson_post_install.py + patchShebangs build-aux/meson/gen_locations_variant.py + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = { diff --git a/pkgs/development/libraries/libgweather/fix-pkgconfig.patch b/pkgs/development/libraries/libgweather/fix-pkgconfig.patch new file mode 100644 index 000000000000..b118a3bc9dd8 --- /dev/null +++ b/pkgs/development/libraries/libgweather/fix-pkgconfig.patch @@ -0,0 +1,14 @@ +diff --git a/libgweather/meson.build b/libgweather/meson.build +index b5d0b4d4..10010d70 100644 +--- a/libgweather/meson.build ++++ b/libgweather/meson.build +@@ -269,6 +269,9 @@ pkgconfig.generate( + description: 'Gather weather information from online services', + version: meson.project_version(), + subdirs: libgweather_full_version, ++ requires: [ ++ 'glib-2.0', ++ ], + variables: [ + 'soupapiversion=' + libsoup_api_version, + ] diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index 7597aee697a8..2c2b09b44923 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, gtk3, gnome +, gtk3, gnome-desktop , dbus, xvfb-run, libxml2 , hicolor-icon-theme }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gnome.gnome-desktop gtk3 libxml2 ]; + buildInputs = [ gnome-desktop gtk3 libxml2 ]; checkInputs = [ dbus xvfb-run hicolor-icon-theme ]; mesonFlags = [ diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 63c494999a93..c1d81f8043c8 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -6,16 +6,13 @@ , pkg-config , gobject-introspection , vala -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 +, gi-docgen , glib , gsettings-desktop-schemas , gtk3 , enableGlade ? false , glade , xvfb-run -, libxml2 , gdk-pixbuf , librsvg , hicolor-icon-theme @@ -28,7 +25,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.5.0"; + version = "1.6.1"; outputs = [ "out" @@ -41,15 +38,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-RmueAmwfnrO2WWb1MNl3A6ghLar5EXSMFF6cuEPb1v4="; + sha256 = "sha256-bqsDhEBNVr0bH6BZ2aCBF3d49q4ID/whIPKGVsp0YqQ="; }; nativeBuildInputs = [ - docbook_xml_dtd_43 - docbook-xsl-nons gobject-introspection - gtk-doc - libxml2 + gi-docgen meson ninja pkg-config @@ -59,7 +53,6 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf gtk3 - libxml2 ] ++ lib.optionals enableGlade [ glade ]; @@ -106,6 +99,11 @@ stdenv.mkDerivation rec { runHook postCheck ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index 187382e1f3e9..0c84cb7e0b18 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libhdhomerun"; - version = "20210624"; + version = "20220303"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - sha256 = "sha256-3q9GO7zD7vpy+XGZ77YhP3sOLI6R8bPSy/UgVqhxXRU="; + sha256 = "sha256-HlT/78LUiTkRUB2jHmYrnQY+bBiv4stcZlMyUnelSpc="; }; patchPhase = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 909ee73e69a6..77c595c9184a 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.10"; + version = "3.0.14"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "sha256-fLmEJlkZLYLcKZqZwitf8rH261QDPTJZf/+/+FMsGIg="; + sha256 = "sha256-gZ6IBjG5pNKJ+hWcTzXMP7yxL4he4LTklZGoC9vXra8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index e47bb070a36e..a84b617e4c0e 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { included. ''; - repositories.git = "git://git.savannah.gnu.org/libidn.git"; license = lib.licenses.lgpl2Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ lsix ]; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 2b5434e723aa..d8294f56adc3 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { detailed information. ''; - repositories.git = "https://gitlab.com/jas/libidn2"; license = with lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ]; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ fpletz ]; diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix index 139672f6d805..d06657b0081d 100644 --- a/pkgs/development/libraries/libindicator/default.nix +++ b/pkgs/development/libraries/libindicator/default.nix @@ -5,13 +5,11 @@ with lib; stdenv.mkDerivation rec { - name = "libindicator-gtk${gtkVersion}-${version}"; - version = "${versionMajor}.${versionMinor}"; - versionMajor = "12.10"; - versionMinor = "1"; + pname = "libindicator-gtk${gtkVersion}"; + version = "12.10.1"; src = fetchurl { - url = "${meta.homepage}/${versionMajor}/${version}/+download/libindicator-${version}.tar.gz"; + url = "https://launchpad.net/libindicator/${lib.versions.majorMinor version}/${version}/+download/libindicator-${version}.tar.gz"; sha256 = "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f"; }; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 54843486e137..89bdc15ff62c 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,47 +1,71 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja -, libevdev, mtdev, udev, libwacom -, documentationSupport ? false, doxygen, graphviz # Documentation -, eventGUISupport ? false, cairo, glib, gtk3 # GUI event viewer support -, testsSupport ? false, check, valgrind, python3 +{ lib +, stdenv +, fetchurl +, pkg-config +, meson +, ninja +, libevdev +, mtdev +, udev +, libwacom +, documentationSupport ? false +, doxygen +, graphviz +, runCommand +, eventGUISupport ? false +, cairo +, glib +, gtk3 +, testsSupport ? false +, check +, valgrind +, python3 , nixosTests }: let mkFlag = optSet: flag: "-D${flag}=${lib.boolToString optSet}"; - sphinx-build = if documentationSupport then - python3.pkgs.sphinx.overrideAttrs (super: { - propagatedBuildInputs = super.propagatedBuildInputs ++ (with python3.pkgs; [ recommonmark sphinx_rtd_theme ]); - - postFixup = super.postFixup or "" + '' - # Do not propagate Python - rm $out/nix-support/propagated-build-inputs - ''; - }) - else null; + sphinx-build = + let + env = python3.withPackages (pp: with pp; [ + sphinx + recommonmark + sphinx_rtd_theme + ]); + in + # Expose only the sphinx-build binary to avoid contaminating + # everything with Sphinx’s Python environment. + runCommand "sphinx-build" { } '' + mkdir -p "$out/bin" + ln -s "${env}/bin/sphinx-build" "$out/bin" + ''; in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.19.1"; - - src = fetchurl { - url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz"; - sha256 = "sha256-C9z1sXg7c3hUt68coi32e8Nqb+fJz6cfAekUn5IgRG0="; - }; + version = "1.19.3"; outputs = [ "bin" "out" "dev" ]; - mesonFlags = [ - (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "debug-gui") - (mkFlag testsSupport "tests") - "--sysconfdir=/etc" - "--libexecdir=${placeholder "bin"}/libexec" + src = fetchurl { + url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz"; + sha256 = "sha256-PK54zN4Z19Dzh+WLxzTU0Xq19kJvVKnotyjJCxe6oGg="; + }; + + patches = [ + ./udev-absolute-path.patch ]; - nativeBuildInputs = [ pkg-config meson ninja ] - ++ lib.optionals documentationSupport [ doxygen graphviz sphinx-build ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + ] ++ lib.optionals documentationSupport [ + doxygen + graphviz + sphinx-build + ]; buildInputs = [ libevdev @@ -53,20 +77,34 @@ stdenv.mkDerivation rec { pyyaml setuptools ])) - ] ++ lib.optionals eventGUISupport [ cairo glib gtk3 ]; + ] ++ lib.optionals eventGUISupport [ + # GUI event viewer + cairo + glib + gtk3 + ]; + + propagatedBuildInputs = [ + udev + ]; checkInputs = [ check valgrind ]; - propagatedBuildInputs = [ udev ]; + mesonFlags = [ + (mkFlag documentationSupport "documentation") + (mkFlag eventGUISupport "debug-gui") + (mkFlag testsSupport "tests") + "--sysconfdir=/etc" + "--libexecdir=${placeholder "bin"}/libexec" + ]; - patches = [ ./udev-absolute-path.patch ]; + doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; postPatch = '' patchShebangs \ - tools/helper-copy-and-exec-from-tmp.sh \ test/symbols-leak-test \ test/check-leftover-udev-rules.sh \ test/helper-copy-and-exec-from-tmp.sh @@ -75,17 +113,15 @@ stdenv.mkDerivation rec { sed -i "/install_subdir('libinput', install_dir : dir_etc)/d" meson.build ''; - doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; - passthru.tests = { libinput-module = nixosTests.libinput; }; meta = with lib; { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; - homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ codyopel ]; + homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ codyopel ] ++ teams.freedesktop.members; }; } diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index f027fbe3cb8b..f40898d11815 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.7"; + version = "0.1.10"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "sha256-WYCYRFjjy9nr1p1SqzBGCBZ5vkhFybddXpHUcwdEDIQ="; + sha256 = "sha256-6fqcP8LWvRoDf5gJz+kW0w5+3PP/luuoPMak1QLKzzM="; }; patches = [ @@ -43,9 +43,7 @@ stdenv.mkDerivation rec { gobject-introspection vala gtk-doc - (python3.withPackages (pkgs: with pkgs; [ - setuptools - ])) + python3 ]; buildInputs = [ @@ -60,10 +58,6 @@ stdenv.mkDerivation rec { "-Dinstalled_test_prefix=${placeholder "installedTests"}" ]; - postPatch = '' - patchShebangs contrib/generate-version-script.py - ''; - doCheck = true; passthru = { diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index 028bf5cac337..6a6009c98e96 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libjpeg"; - version = "9d"; + version = "9e"; src = fetchurl { url = "http://www.ijg.org/files/jpegsrc.v${version}.tar.gz"; - sha256 = "1vkip9rz4hz8f31a2kl7wl7f772wg1z0fg1fbd1653wzwlxllhvc"; + sha256 = "sha256-QHfWpqda6wGIT3CJGdJZNMkzBeSffj8225EpMg5vTz0="; }; configureFlags = lib.optional static "--enable-static --disable-shared"; diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix deleted file mode 100644 index 825fe87fe2fe..000000000000 --- a/pkgs/development/libraries/libktorrent/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, extra-cmake-modules -, karchive, kcrash, ki18n, kio, solid -, boost, gmp, qca-qt5, libgcrypt -}: - -let - mainVersion = "5.1.2"; - -in stdenv.mkDerivation rec { - pname = "libktorrent"; - version = "2.1.1"; - - src = fetchurl { - url = "mirror://kde/stable/ktorrent/${mainVersion}/${pname}-${version}.tar.xz"; - sha256 = "0051zh8bb4p9wmcfn5ql987brhsaiw9880xdck7b5dm1a05mri2w"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ cmake extra-cmake-modules ]; - - buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ]; - - propagatedBuildInputs = [ gmp boost ]; - - passthru = { - inherit mainVersion; - }; - - dontWrapQtApps = true; - - meta = with lib; { - description = "A BitTorrent library used by KTorrent"; - homepage = "https://www.kde.org/applications/internet/ktorrent/"; - maintainers = with maintainers; [ eelco ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index 6b28175a9b62..0f0fec46a277 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/lastfm/liblastfm"; - repositories.git = "git://github.com/lastfm/liblastfm.git"; description = "Official LastFM library"; platforms = platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/libraries/libliftoff/default.nix b/pkgs/development/libraries/libliftoff/default.nix index 759549dbb289..88588a9fee75 100644 --- a/pkgs/development/libraries/libliftoff/default.nix +++ b/pkgs/development/libraries/libliftoff/default.nix @@ -1,17 +1,18 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitLab , meson, pkg-config, ninja , libdrm }: stdenv.mkDerivation rec { pname = "libliftoff"; - version = "0.1.0"; + version = "0.2.0"; - src = fetchFromGitHub { + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "1s53jsll3c7272bhmh4jr6k5m1nvn8i1ld704qmzsm852ilmgrla"; + sha256 = "1ysxm7kg1gwrsn29lw8kngvkxp46g4m2pvbwcvscgvr54ikirn4q"; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index f61fb775fbda..893704ddb18c 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.20.0"; + version = "3.21.0"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "sha256-DuMVs9cC0VnZg3E9GtZB8LYkp3Ybfzlv8vd4d1Muwyc="; + sha256 = "sha256-Hfn0dfXihtUfO3R+qJaetrPwupcIwblvi1DQdHCF1s8="; }; outputs = [ "out" "dev" "man" "info" "doc" ]; diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index 6971fcbf5d3e..d5a5647837dd 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmodbus"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { url = "http://libmodbus.org/releases/libmodbus-${version}.tar.gz"; - sha256 = "05kwz0n5gn9m33cflzv87lz3zp502yp8fpfzbx70knvfl6agmnfp"; + sha256 = "sha256-ff6VhDHQVwsnHhpbMpt2pljonGFM8RnrWq23Jch/j70="; }; configureFlags = [ diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix index 8f59975a5967..4ec392be304d 100644 --- a/pkgs/development/libraries/libmodulemd/default.nix +++ b/pkgs/development/libraries/libmodulemd/default.nix @@ -11,14 +11,13 @@ , file , gtk-doc , docbook-xsl-nons -, help2man , docbook_xml_dtd_412 , glib }: stdenv.mkDerivation rec { pname = "libmodulemd"; - version = "2.13.0"; + version = "2.14.0"; outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ]; @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { owner = "fedora-modularity"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-hg/it3pHUnEYsmKcLzQKcZNthHZZwdXBjzTlOS1Losk="; + sha256 = "sha256-ccLk8O0UJwy7WZYr5Bq2XqaSFNe4i7HQehmVoB5C2Yg="; }; patches = [ @@ -43,7 +42,6 @@ stdenv.mkDerivation rec { ninja gtk-doc docbook-xsl-nons - help2man docbook_xml_dtd_412 gobject-introspection ]; diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index f79f82e9a782..5303dbed6ca8 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.27"; + version = "8.0.28"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - sha256 = "sha256-WIZpj8aCpeh0CCLtm0YbxRtgz5y6304cf+vllYSyv7c="; + sha256 = "sha256-yyb+neBaO18e0ioZlCm2eR7OGEM+sEZeKnP89EWGQgs="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dev.mysql.com/downloads/connector/cpp/"; description = "C++ library for connecting to mysql servers"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index 36c1c0dc098c..54177ad559d6 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "libnatpmp"; @@ -10,13 +10,12 @@ stdenv.mkDerivation rec { sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1"; }; - postPatch = '' - substituteInPlace Makefile \ - --replace "gcc" "${stdenv.cc.targetPrefix}cc" \ - --replace "ar" "${stdenv.cc.targetPrefix}ar" - ''; + makeFlags = [ + "INSTALLPREFIX=$(out)" + "CC:=$(CC)" + ]; - makeFlags = [ "INSTALLPREFIX=$(out)" ]; + nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; postFixup = '' chmod +x $out/lib/* diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 3d1e2b7ac4a3..7913515df66c 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "2.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; - rev = "refs/tags/v${version}"; - sha256 = "16a0f0gvrmyrqvmh6vinqny3qhm6wyzw5ijnn3r82b1gqlpws0fz"; + rev = "v${version}"; + sha256 = "1ngji3sa44y27lnq4x5dzbd117s9psx4w0j50b4c2b72cf2z139q"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix index 3988a79c3251..ba21e2206a8d 100644 --- a/pkgs/development/libraries/libnbd/default.nix +++ b/pkgs/development/libraries/libnbd/default.nix @@ -6,16 +6,17 @@ , perl , libxml2 , fuse +, fuse3 , gnutls }: stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.9.5"; + version = "1.12.2"; src = fetchurl { - url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz"; - hash = "sha256-BnMoxIiuwhqcwVr3AwAIFgZPcFsIg55N66ZwWMTUnCw="; + url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; + hash = "sha256-57veJapt72LkP02wO4c1nDdHmnodqfT+rKPNDeTGQPM="; }; nativeBuildInputs = [ @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse + fuse3 gnutls libxml2 ]; @@ -55,7 +57,6 @@ stdenv.mkDerivation rec { platforms = with platforms; linux; }; } -# TODO: NBD URI support apparently is not enabled # TODO: package the 1.6-stable version too # TODO: git version needs ocaml # TODO: bindings for go, ocaml and python diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index 4e12553b00ba..dd442b2cd4bd 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libnfs"; - version = "4.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "sahlberg"; repo = "libnfs"; rev = "libnfs-${version}"; - sha256 = "0i27wd4zvhjz7620q043p4d4mkx8zv2yz9adm1byin47dynahyda"; + sha256 = "sha256-5jyY7hqEhBPiQ8pNd+mRTEc4brht4ID7PoV7O2RFNQA="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 7ca9ec5acb6d..3f2f02987fbb 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; description = "C library implementing the OAuth secure authentication protocol"; homepage = "http://liboauth.sourceforge.net/"; - repositories.git = "https://github.com/x42/liboauth.git"; license = licenses.mit; }; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index c3852f25741f..a1dd23357dec 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "libosinfo"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-tPNBgVTvP0PZQggnKUkWrqGCcCGvwG4WRPxWlRgwo1k="; + sha256 = "sha256-olLgD8WA3rIdoNqMCqA7jDHoRAuESMi5gUP6tHfTIwU="; }; outputs = [ "out" "dev" "devdoc" ]; @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support"; homepage = "https://libosinfo.org/"; + changelog = "https://gitlab.com/libosinfo/libosinfo/-/blob/v${version}/NEWS"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index 917a64f40e94..01cdc96e39cd 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.17.2"; + version = "2.18.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "sha256-+WeEK7rWoUPAiAsgd5qT2bwDf+5IlP4uuyh7+i2L/HU="; + sha256 = "sha256-IPdaBT6hRNHo8kuOsiKdyiQkRxA/l+44U3qGGG89BTo="; }; nativeBuildInputs = [ cmake ]; @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { description = "Fast and flexible C++ library for working with OpenStreetMap data"; homepage = "https://osmcode.org/libosmium/"; license = licenses.boost; + changelog = [ + "https://github.com/osmcode/libosmium/releases/tag/v${version}" + "https://github.com/osmcode/libosmium/blob/v${version}/CHANGELOG.md" + ]; maintainers = with maintainers; [ das-g ]; }; } diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index 53699ab7eacd..bd8a521544c2 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.cypherpunks.ca/otr/"; - repositories.git = "git://git.code.sf.net/p/otr/libotr"; license = licenses.lgpl21; description = "Library for Off-The-Record Messaging"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 55c884d215fd..712592431abe 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -1,25 +1,61 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome -, glib, gtk3, gobject-introspection, python3, ncurses +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkg-config +, gettext +, gi-docgen +, gnome +, glib +, gtk3 +, gobject-introspection +, python3 +, ncurses }: stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.30.0"; + version = "1.32.0"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18xrk1c1ixlhkmykcfiafrl2am470ws687xqvjlq40zwkcp5dx8b"; + sha256 = "1iVSD6AuiXcCmyRq5Dm8IYloll8egtYSIItxPx3MPQ4="; }; - nativeBuildInputs = [ pkg-config meson ninja gettext gobject-introspection ]; - buildInputs = [ glib gtk3 ncurses python3 python3.pkgs.pygobject3 ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + gi-docgen + gobject-introspection + ]; + + buildInputs = [ + glib + gtk3 + ncurses + python3 + python3.pkgs.pygobject3 + ]; + propagatedBuildInputs = [ # Required by libpeas-1.0.pc gobject-introspection ]; + mesonFlags = [ + "-Dgtk_doc=true" + ]; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/libplacebo/default.nix b/pkgs/development/libraries/libplacebo/default.nix index fb5313ecf0a9..94492132b9bf 100644 --- a/pkgs/development/libraries/libplacebo/default.nix +++ b/pkgs/development/libraries/libplacebo/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "4.192.0"; + version = "4.192.1"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "19i7p9z8mmki5yq26059dp9055cccgxs0vfdlx0w1qak7pmv1vpm"; + sha256 = "13z2f0vwf9fgfzqgkqzvqwa8c8nkymrg5hv7xslfx53dacjfidhy"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index b5b628455d87..2af3b3f3bcf7 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.4.10"; + version = "2.5.0"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-NdkWG7QdsMwx605m4P4LqBJTEqlIQhI3ChOvYwERkis="; + sha256 = "sha256-Xzdljx08aXwD6pE1f/3YBAjvrSzvs2fcXmmLH04GFyg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index aeb3fcba06fa..2293dfc00a0c 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -11,7 +11,7 @@ let whenPatched = lib.optionalString apngSupport; in stdenv.mkDerivation rec { - name = "libpng" + whenPatched "-apng" + "-${version}"; + pname = "libpng" + whenPatched "-apng"; version = "1.6.37"; src = fetchurl { diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix index b261c0395e6d..cb0da5c560d2 100644 --- a/pkgs/development/libraries/libportal/default.nix +++ b/pkgs/development/libraries/libportal/default.nix @@ -18,7 +18,7 @@ assert variant == null || variant == "gtk3" || variant == "gtk4" || variant == " stdenv.mkDerivation rec { pname = "libportal" + lib.optionalString (variant != null) "-${variant}"; - version = "0.5"; + version = "0.6"; outputs = [ "out" "dev" "devdoc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = "libportal"; rev = version; - sha256 = "oPPO2f6NNeok0SGh4jELkkOP6VUxXZiwPM/n6CUHm0Q="; + sha256 = "sha256-wDDE43UC6FBgPYLS+WWExeheURCH/3fCKu5oJg7GM+A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index c5d6bc4612f3..f6bf1e81668d 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -5,8 +5,8 @@ , zlib , dbus , networkmanager -, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform spidermonkey_68 -, spidermonkey_68 +, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform spidermonkey_78 +, spidermonkey_78 , pcre , gsettings-desktop-schemas , glib @@ -17,9 +17,7 @@ , JavaScriptCore }: -let - jsRuntime = if stdenv.hostPlatform.isDarwin then JavaScriptCore else spidermonkey_68; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "libproxy"; version = "0.4.17"; @@ -43,7 +41,7 @@ in stdenv.mkDerivation rec { python3 zlib ] ++ lib.optionals enableJavaScript [ - jsRuntime + (if stdenv.hostPlatform.isDarwin then JavaScriptCore else spidermonkey_78) ] ++ (if stdenv.hostPlatform.isDarwin then [ SystemConfiguration CoreFoundation diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix new file mode 100644 index 000000000000..9abe32241207 --- /dev/null +++ b/pkgs/development/libraries/libpulsar/default.nix @@ -0,0 +1,102 @@ +{ lib +, clang-tools +, llvmPackages +, boost17x +, protobuf +, python3Support ? false +, python3 +, log4cxxSupport ? false +, log4cxx +, snappySupport ? false +, snappy +, zlibSupport ? true +, zlib +, zstdSupport ? true +, zstd +, gtest +, gtestSupport ? false +, cmake +, curl +, fetchurl +, jsoncpp +, openssl +, pkg-config +, stdenv +}: + +let + /* + Check if null or false + Example: + let result = enableFeature null + => "OFF" + let result = enableFeature false + => "OFF" + let result = enableFeature «derivation» + => "ON" + */ + enableCmakeFeature = p: if (p == null || p == false) then "OFF" else "ON"; + + # Not really sure why I need to do this.. If I call clang-tools without the override it defaults to a different version and fails + clangTools = clang-tools.override { inherit stdenv llvmPackages; }; + # If boost has python enabled, then boost-python package will be installed which is used by libpulsars python wrapper + boost = if python3Support then boost17x.override { inherit stdenv; enablePython = python3Support; python = python3; } else boost17x; + defaultOptionals = [ boost protobuf ] + ++ lib.optional python3Support python3 + ++ lib.optional snappySupport snappy.dev + ++ lib.optional zlibSupport zlib + ++ lib.optional zstdSupport zstd + ++ lib.optional log4cxxSupport log4cxx; + +in +stdenv.mkDerivation rec { + pname = "libpulsar"; + version = "2.9.1"; + + src = fetchurl { + hash = "sha512-NKHiL7D/Lmnn6ICpQyUmmQYQETz4nZPJU9/4LMRDUQ3Pck6qDh+t6CRk+b9UQ2Vb0jvPIGTjEsSp2nC7TJk3ug=="; + url = "mirror://apache/pulsar/pulsar-${version}/apache-pulsar-${version}-src.tar.gz"; + }; + + sourceRoot = "apache-pulsar-${version}-src/pulsar-client-cpp"; + + # clang-tools needed for clang-format + nativeBuildInputs = [ cmake pkg-config clangTools ] + ++ defaultOptionals + ++ lib.optional gtestSupport gtest.dev; + + buildInputs = [ jsoncpp openssl curl ] + ++ defaultOptionals; + + # Needed for GCC on Linux + NIX_CFLAGS_COMPILE = [ "-Wno-error=return-type" ]; + + cmakeFlags = [ + "-DBUILD_TESTS=${enableCmakeFeature gtestSupport}" + "-DBUILD_PYTHON_WRAPPER=${enableCmakeFeature python3Support}" + "-DUSE_LOG4CXX=${enableCmakeFeature log4cxxSupport}" + "-DClangTools_PATH=${clangTools}/bin" + ]; + + enableParallelBuilding = true; + doInstallCheck = true; + installCheckPhase = '' + echo ${lib.escapeShellArg '' + #include + int main (int argc, char **argv) { + pulsar::Client client("pulsar://localhost:6650"); + return 0; + } + ''} > test.cc + $CXX test.cc -L $out/lib -I $out/include -lpulsar -o test + ''; + + meta = with lib; { + homepage = "https://pulsar.apache.org/docs/en/client-libraries-cpp"; + description = "Apache Pulsar C++ library"; + + platforms = platforms.all; + license = licenses.asl20; + maintainers = [ maintainers.corbanr ]; + }; +} diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index 5d83b137b8e6..abc65130fc3a 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -1,36 +1,57 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3, fetchpatch }: +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, perl +, cracklib +, enablePAM ? stdenv.hostPlatform.isLinux +, pam +, enablePython ? false +, python +}: + +# python binding generates a shared library which are unavailable with musl build +assert enablePython -> !stdenv.hostPlatform.isStatic; stdenv.mkDerivation rec { pname = "libpwquality"; - version = "1.4.2"; + version = "1.4.4"; + + outputs = [ "out" "dev" "lib" "man" ] ++ lib.optionals enablePython [ "py" ]; src = fetchFromGitHub { owner = "libpwquality"; repo = "libpwquality"; rev = "${pname}-${version}"; - sha256 = "0n4pjhm7wfivk0wizggaxq4y4mcxic876wcarjabkp5z9k14y36h"; + sha256 = "sha256-7gAzrx5VP1fEBwAt6E5zGM8GyuPRR+JxYifYfirY+U8="; }; - nativeBuildInputs = [ autoreconfHook perl python3 ]; - buildInputs = [ cracklib ]; - - patches = lib.optional stdenv.hostPlatform.isStatic [ - (fetchpatch { - name = "static-build.patch"; - url = "https://github.com/libpwquality/libpwquality/pull/40.patch"; - sha256 = "1ypccq437wxwgddd98cvd330jfm7jscdlzlyxgy05g6yzrr68xyk"; - }) + patches = [ + # ensure python site-packages goes in $py output + ./python-binding-prefix.patch ]; - configureFlags = lib.optional stdenv.hostPlatform.isStatic [ - # Python binding generates a shared library which are unavailable with musl build - "--disable-python-bindings" - ]; + nativeBuildInputs = [ autoreconfHook perl ] ++ lib.optionals enablePython [ python ]; + buildInputs = [ cracklib ] ++ lib.optionals enablePAM [ pam ]; + + configureFlags = lib.optionals (!enablePython) [ "--disable-python-bindings" ]; meta = with lib; { - description = "Password quality checking and random password generation library"; homepage = "https://github.com/libpwquality/libpwquality"; - license = licenses.bsd3; + description = "Password quality checking and random password generation library"; + longDescription = '' + The libpwquality library purpose is to provide common functions for + password quality checking and also scoring them based on their apparent + randomness. The library also provides a function for generating random + passwords with good pronounceability. The library supports reading and + parsing of a configuration file. + + In the package there are also very simple utilities that use the library + function and PAM module that can be used instead of pam_cracklib. The + module supports all the options of pam_cracklib. + ''; + license = with licenses; [ bsd3 /* or */ gpl2Plus ]; + maintainers = with maintainers; [ jk ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libpwquality/python-binding-prefix.patch b/pkgs/development/libraries/libpwquality/python-binding-prefix.patch new file mode 100644 index 000000000000..a8f77142e1db --- /dev/null +++ b/pkgs/development/libraries/libpwquality/python-binding-prefix.patch @@ -0,0 +1,13 @@ +diff --git a/python/Makefile.am b/python/Makefile.am +index 1d00c0c..0987690 100644 +--- a/python/Makefile.am ++++ b/python/Makefile.am +@@ -14,7 +14,7 @@ all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) + + install-exec-local: +- CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${prefix} ++ CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-base py$(PYTHONREV) install --prefix=${DESTDIR}${py} + + clean-local: + rm -rf py$(PYTHONREV) diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 0f7757007005..55132d155238 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.22.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-yj6adBP9nZLXZVg62bYenfuiMeyULEql25KbDen9ljA="; + sha256 = "sha256-P3mb5HEj9gHq2mABdIRxF6ZukrPd70sy0DRLT0qKDqk="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index fa448fa09695..5cbc9b8f09b7 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libqb"; - version = "2.0.4"; + version = "2.0.6"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s6b2/bCVNzr3IBqiSAjiJ/DHCqkRwR1aA+J4uBP5mO4="; + sha256 = "sha256-vt9FmIRojX3INOn3CXAjkswVFD8Th4sRIz3RR4GJHFQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index c3c9bf6947eb..0906d7b967c9 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.30.2"; + version = "1.30.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-vgHs4OosIZTL6ldEv1qvBsBLpft+x4h6ExFsdtEU/t0="; + sha256 = "sha256-ANfaMKT40RhfN8uiic+vHfzQSljy921qz99bhTEtbtY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index a0b959d178f1..2a5b75a7b906 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libraspberrypi"; - version = "unstable-2021-06-23"; + version = "unstable-2021-10-25"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "userland"; - rev = "97bc8180ad682b004ea224d1db7b8e108eda4397"; - sha256 = "0cnjc7w8ynayj90vlpl13xzm9izd8m5b4cvrq52si9vc6wlm4in5"; + rev = "0093675e4aa6e152a3ffc318b51a124e96eb287b"; + sha256 = "qpooQy9k2UZ94KaqlFwurV+tt0GrBSRffGdlvMcn1XU="; }; patches = [ diff --git a/pkgs/development/libraries/libredwg/default.nix b/pkgs/development/libraries/libredwg/default.nix index e5123fa61af3..53aab4431088 100644 --- a/pkgs/development/libraries/libredwg/default.nix +++ b/pkgs/development/libraries/libredwg/default.nix @@ -6,13 +6,13 @@ let in stdenv.mkDerivation rec { pname = "libredwg"; - version = "0.12"; + version = "0.12.4"; src = fetchFromGitHub { owner = "LibreDWG"; repo = pname; rev = version; - sha256 = "0ayhp3ym30hzp5f6dz7mmp9hpxf6a48nx3kq5crcmzycm5fllbn7"; + sha256 = "sha256-CZZ5/uCls2tY3PKmD+hBBvp7d7KX8nZuCPf03sa4iXc="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 7a2718c01539..1ad63db733df 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -86,12 +86,8 @@ let }; in { - libressl_3_2 = generic { - version = "3.2.7"; - sha256 = "112bjfrwwqlk0lak7fmfhcls18ydf62cp7gxghf4gklpfl1zyckw"; - }; libressl_3_4 = generic { - version = "3.4.2"; - sha256 = "sha256-y4LKfVRzNpFzUvvSPbL8SDxsRNNRV7MngCFOx0GXs84="; + version = "3.4.3"; + sha256 = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0="; }; } diff --git a/pkgs/development/libraries/librest/1.0.nix b/pkgs/development/libraries/librest/1.0.nix new file mode 100644 index 000000000000..d51f9e31b178 --- /dev/null +++ b/pkgs/development/libraries/librest/1.0.nix @@ -0,0 +1,74 @@ +{ lib +, stdenv +, fetchurl +, meson +, ninja +, pkg-config +, gi-docgen +, glib +, json-glib +, libsoup +, gobject-introspection +, gnome +}: + +stdenv.mkDerivation rec { + pname = "rest"; + version = "0.9.0"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "hbK8k0ESgTlTm1PuU/BTMxC8ljkv1kWGOgQEELgevmY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gi-docgen + gobject-introspection + ]; + + buildInputs = [ + glib + json-glib + libsoup + ]; + + mesonFlags = [ + "-Dexamples=false" + + # Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged. + "-Dca_certificates=true" + "-Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt" + ]; + + postPatch = '' + # https://gitlab.gnome.org/GNOME/librest/-/merge_requests/19 + substituteInPlace meson.build \ + --replace "con." "conf." + ''; + + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + attrPath = "librest_1_0"; + versionPolicy = "odd-unstable"; + }; + }; + + meta = with lib; { + description = "Helper library for RESTful services"; + homepage = "https://wiki.gnome.org/Projects/Librest"; + license = licenses.lgpl21Only; + platforms = platforms.unix; + maintainers = teams.gnome.members; + }; +} diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index 0c885f0764b5..abe53ff3692f 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -4,7 +4,11 @@ , pkg-config , glib , libsoup +, libxml2 , gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_412 , gnome }: @@ -12,6 +16,8 @@ stdenv.mkDerivation rec { pname = "rest"; version = "0.8.1"; + outputs = [ "out" "dev" "devdoc" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9"; @@ -20,14 +26,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_412 ]; - buildInputs = [ + propagatedBuildInputs = [ glib libsoup + libxml2 ]; configureFlags = [ + "--enable-gtk-doc" # Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged. "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; @@ -37,6 +48,7 @@ stdenv.mkDerivation rec { packageName = pname; attrPath = "librest"; versionPolicy = "odd-unstable"; + freeze = true; }; }; diff --git a/pkgs/development/libraries/librsb/default.nix b/pkgs/development/libraries/librsb/default.nix index 0acca9ae24fc..691975b1af4e 100644 --- a/pkgs/development/libraries/librsb/default.nix +++ b/pkgs/development/libraries/librsb/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "librsb"; - version = "1.2.0.9"; + version = "1.2.0.10"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1ynrsgnvv1jfm8dv3jwjrip9x9icxv7w3qrk149025j6fbaza8gl"; + sha256 = "sha256-7Enz94p8Q/yeEJdlk9EAqkmxhjMJ7Y+jzLt6rVLS97g="; }; # The default configure flags are still present when building diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 8b1213e6377e..b09354413841 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -14,7 +14,10 @@ , libobjc , rustPlatform , rustc +, rust , cargo +, gi-docgen +, python3 , gnome , vala , withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform @@ -24,13 +27,15 @@ stdenv.mkDerivation rec { pname = "librsvg"; - version = "2.52.4"; + version = "2.54.0"; - outputs = [ "out" "dev" "installedTests" ]; + outputs = [ "out" "dev" "installedTests" ] ++ lib.optionals withIntrospection [ + "devdoc" + ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Zg7Ig2o6kVh7yThJIBMtTDjR0XGMZ/4WDFIT/k3sKSg="; + sha256 = "uvjrwUfxRrQmG7PQzQ+slEv427Sx8jR9IzQfl03MMIU="; }; cargoVendorDir = "vendor"; @@ -44,10 +49,12 @@ stdenv.mkDerivation rec { pkg-config rustc cargo + python3.pkgs.docutils vala rustPlatform.cargoSetupHook ] ++ lib.optionals withIntrospection [ gobject-introspection + gi-docgen ]; buildInputs = [ @@ -78,7 +85,8 @@ stdenv.mkDerivation rec { "--enable-installed-tests" "--enable-always-build-tests" - ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic" + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${rust.toRustTarget stdenv.hostPlatform}"; makeFlags = [ "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/RSVG" @@ -117,6 +125,11 @@ stdenv.mkDerivation rec { mv $GDK_PIXBUF/loaders.cache.tmp $GDK_PIXBUF/loaders.cache ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/librtlsdr/default.nix b/pkgs/development/libraries/librtlsdr/default.nix index 61f4045b785f..c09575924a0a 100644 --- a/pkgs/development/libraries/librtlsdr/default.nix +++ b/pkgs/development/libraries/librtlsdr/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ libusb1 ]; + propagatedBuildInputs = [ libusb1 ]; meta = with lib; { description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; diff --git a/pkgs/development/libraries/librtprocess/default.nix b/pkgs/development/libraries/librtprocess/default.nix index 3e44bfd3d7dd..c7e9b3895d98 100644 --- a/pkgs/development/libraries/librtprocess/default.nix +++ b/pkgs/development/libraries/librtprocess/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "librtprocess"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "CarVac"; repo = pname; rev = version; - sha256 = "1bivy3rymmmkdx5phbxq4qaq15hw633dgpks57z9ara15mh817xx"; + sha256 = "sha256-/1o6SWUor+ZBQ6RsK2PoDRu03jcVRG58PNYFttriH2w="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libschrift/default.nix b/pkgs/development/libraries/libschrift/default.nix index 96b8c7ac2e57..d8093a58deec 100644 --- a/pkgs/development/libraries/libschrift/default.nix +++ b/pkgs/development/libraries/libschrift/default.nix @@ -2,23 +2,15 @@ stdenv.mkDerivation rec { pname = "libschrift"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "tomolt"; repo = pname; - rev = "c207585486b3e78ec5506f55f5d56178f421a53c"; - sha256 = "13qrplsi2a53s84giwnzqmn0zbslyaagvjn89wsn9fd90m2v2bs1"; + rev = "v" + version; + sha256 = "0fvji0z6z2al68p07w58l4hc29ds68v71h7z84vxiqhxnsgc0hlv"; }; - # fix a compilation failure related to darwin integers, remove at next release - patches = [ - (fetchpatch { - url = "https://github.com/tomolt/libschrift/commit/1b1292f2cf4b582d66b2f6c87105997391f9fa08.patch"; - sha256 = "076l3n28famgi74nr5bz47yn192bm76p8c8558fm5zj5c21pcfsv"; - }) - ]; - postPatch = '' substituteInPlace config.mk \ --replace "PREFIX = /usr/local" "PREFIX = $out" diff --git a/pkgs/development/libraries/libsciter/default.nix b/pkgs/development/libraries/libsciter/default.nix new file mode 100644 index 000000000000..6f3016ce47a4 --- /dev/null +++ b/pkgs/development/libraries/libsciter/default.nix @@ -0,0 +1,45 @@ +{ lib +, glib +, cairo +, libuuid +, pango +, gdk-pixbuf +, gtk3 +, stdenv +, fetchurl +, autoPatchelfHook +}: + +stdenv.mkDerivation rec { + pname = "libsciter"; + version = "4.4.8.23-bis"; # Version specified in GitHub commit title + + src = fetchurl { + url = "https://github.com/c-smile/sciter-sdk/raw/9f1724a45f5a53c4d513b02ed01cdbdab08fa0e5/bin.lnx/x64/libsciter-gtk.so"; + sha256 = "a1682fbf55e004f1862d6ace31b5220121d20906bdbf308d0a9237b451e4db86"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ glib cairo libuuid pango gtk3 ]; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -m755 -D $src $out/lib/libsciter-gtk.so + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://sciter.com"; + description = "Embeddable HTML/CSS/JavaScript engine for modern UI development"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ leixb ]; + license = licenses.unfree; + }; +} diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix index 1bd22b2f7901..68ef1afd2eef 100644 --- a/pkgs/development/libraries/libscrypt/default.nix +++ b/pkgs/development/libraries/libscrypt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libscrypt"; - version = "1.21"; + version = "1.22"; src = fetchFromGitHub { owner = "technion"; repo = "libscrypt"; rev = "v${version}"; - sha256 = "1d76ys6cp7fi4ng1w3mz2l0p9dbr7ljbk33dcywyimzjz8bahdng"; + sha256 = "sha256-QWWqC10bENemG5FYEog87tT7IxDaBJUDqu6j/sO3sYE="; }; buildFlags = lib.optional stdenv.isDarwin "LDFLAGS= CFLAGS_EXTRA="; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 18f00a0933c3..9e8be02aa63a 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,42 +1,76 @@ -{ lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3 -, docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala -, gtk-doc, gnome, gjs, libintl, dbus, xvfb-run }: +{ stdenv +, lib +, fetchurl +, glib +, meson +, ninja +, pkg-config +, gettext +, libxslt +, python3 +, docbook-xsl-nons +, docbook_xml_dtd_42 +, libgcrypt +, gobject-introspection +, vala +, gi-docgen +, gnome +, gjs +, libintl +, dbus +, xvfb-run +}: stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.20.4"; + version = "0.20.5"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0a4xnfmraxchd9cq5ai66j12jv2vrgjmaaxz25kl031jvda4qnij"; + sha256 = "P7PONA/NfbVNh8iT5pv8Kx9uTUsnkGX/5m2snw/RK00="; }; + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + libxslt # for xsltproc for building man pages + docbook-xsl-nons + docbook_xml_dtd_42 + libintl + gobject-introspection + vala + gi-docgen + glib + ]; + + buildInputs = [ + libgcrypt + ]; + + propagatedBuildInputs = [ + glib + ]; + + installCheckInputs = [ + python3 + python3.pkgs.dbus-python + python3.pkgs.pygobject3 + xvfb-run + dbus + gjs + ]; + + # needs to run after install because typelibs point to absolute paths + doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib + postPatch = '' patchShebangs . ''; - outputs = [ "out" "dev" "devdoc" ]; - - propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ - pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl - gobject-introspection vala gtk-doc glib - ]; - buildInputs = [ libgcrypt ]; - # optional: build docs with gtk-doc? (probably needs a flag as well) - - configureFlags = [ - "--with-libgcrypt-prefix=${libgcrypt.dev}" - ]; - - enableParallelBuilding = true; - - installCheckInputs = [ - python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb-run dbus gjs - ]; - - # needs to run after install because typelibs point to absolute paths - doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib installCheckPhase = '' export NO_AT_BRIDGE=1 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ @@ -44,6 +78,11 @@ stdenv.mkDerivation rec { make check ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/libserdes/default.nix b/pkgs/development/libraries/libserdes/default.nix index 7b48f150c9a1..8b61669d1c6d 100644 --- a/pkgs/development/libraries/libserdes/default.nix +++ b/pkgs/development/libraries/libserdes/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , perl , boost , rdkafka @@ -28,6 +29,14 @@ stdenv.mkDerivation rec { makeFlags = [ "GEN_PKG_CONFIG=y" ]; + patches = [ + # Fix compatibility with Avro master branch + (fetchpatch { + url = "https://github.com/confluentinc/libserdes/commit/d7a355e712ab63ec77f6722fb5a9e8056e7416a2.patch"; + sha256 = "14bdx075n4lxah63kp7phld9xqlz3pzs03yf3wbq4nmkgwac10dh"; + }) + ]; + postPatch = '' patchShebangs configure lds-gen.pl ''; diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index e987e5a892c4..7443ec4c502d 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -13,12 +13,12 @@ , libsoup , gtk4 , xvfb-run -, unstableGitUpdater +, gnome }: stdenv.mkDerivation rec { pname = "libshumate"; - version = "unstable-2021-10-06"; + version = "1.0.0.alpha.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libshumate"; - rev = "7a0a03f299881e8faaac7d904cc47b74795ae5dd"; - sha256 = "df8ZHn/wmkzaYH0L3E6ULUtqxqU71EqL0jSgKhWqlT8="; + rev = version; + sha256 = "4kCXFUJRglh1aIBk03MNUV8jfx0mJzIFCUDM4g9tzlg="; }; nativeBuildInputs = [ @@ -68,11 +68,14 @@ stdenv.mkDerivation rec { postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - moveToOutput share/doc/libshumate-0.0 "$devdoc" + moveToOutput share/doc/libshumate-1.0 "$devdoc" ''; - passthru.updateScript = unstableGitUpdater { - url = meta.homepage; + passthru = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "none"; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/libsigcxx/3.0.nix b/pkgs/development/libraries/libsigcxx/3.0.nix index 92229811207f..f6a796f2561d 100644 --- a/pkgs/development/libraries/libsigcxx/3.0.nix +++ b/pkgs/development/libraries/libsigcxx/3.0.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "3.0.7"; + version = "3.2.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "v76RwNCU6mu8bL05CbfZjGVh7qi22cDCWt2Qam6D1zM="; + sha256 = "jNy5huPwp8W0R0qjyDPWduYkaVCfSJkRDd8RjwQIJlE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index d4583c74df0f..c9f6e11d4118 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libsigc++"; - version = "2.10.7"; + version = "2.10.8"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-0IKiznLHUPZrGkFavj6FLfLq4eivUwEPSsLqJhpHiDI="; + sha256 = "sha256-I1pAvsc0bHuCtqjKrgRWNT3AbnHxS8QUvMhYrxg4cZo="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index bc36a12eea82..84c2f19e5e29 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libsigsegv"; - version = "2.13"; + version = "2.14"; src = fetchurl { url = "mirror://gnu/libsigsegv/libsigsegv-${version}.tar.gz"; - sha256 = "sha256-vnjuQXawX3x1/wMpjYSHTbkPS2ydVQPw2hIms6PEgRk="; + sha256 = "sha256-zaw5QYAzZM+BqQhJm+t5wgDq1gtrW0DK0ST9HgbKopU="; }; patches = if enableSigbusFix then [ ./sigbus_fix.patch ] else null; diff --git a/pkgs/development/libraries/libsmartcols/default.nix b/pkgs/development/libraries/libsmartcols/default.nix index bcd1573e2038..077055cbb9a4 100644 --- a/pkgs/development/libraries/libsmartcols/default.nix +++ b/pkgs/development/libraries/libsmartcols/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, gtk-doc}: stdenv.mkDerivation rec { - name = "libsmartcols"; - version = "v2.36.1"; + pname = "libsmartcols"; + version = "2.36.1"; nativeBuildInputs = [ autoreconfHook pkg-config python3 gtk-doc ]; src = fetchFromGitHub { owner = "karelzak"; repo = "util-linux"; - rev = version; + rev = "v${version}"; sha256 = "0z7nv054pqhlihqiw0vk3h40j0cxk1yxf8zzh0ddmvk6834cnyxs"; }; diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index c3e6d0e049e4..37352bf5e3c4 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, openssl, boost, gmp, procps }: -let - rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; -in stdenv.mkDerivation rec { - name = "libsnark-pre${version}"; - version = lib.substring 0 8 rev; +stdenv.mkDerivation rec { + pname = "libsnark"; + version = "unstable-2018-01-15"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; @@ -12,7 +10,7 @@ in stdenv.mkDerivation rec { cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ]; src = fetchFromGitHub { - inherit rev; + rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; owner = "scipr-lab"; repo = "libsnark"; sha256 = "13f02qp2fmfhvxlp4xi69m0l8r5nq913l2f0zwdk7hl46lprfdca"; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 1062cc8e6505..2d50851e5832 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.20"; + version = "0.7.21"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-NVyLa/fPGnO5jAz9rePFXg/z6RZeFCrkJBCG3gGh+YM="; + sha256 = "sha256-ka1HXVo0CFr0eqGTkatYq1jXE+9UgM0YTZNW1WtMLF0="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libsoup/3.x.nix b/pkgs/development/libraries/libsoup/3.x.nix index 454a1cdf40a2..4791e49ae3fa 100644 --- a/pkgs/development/libraries/libsoup/3.x.nix +++ b/pkgs/development/libraries/libsoup/3.x.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "3.0.4"; + version = "3.0.5"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-W9OLXgkfcH/X+j7Xw3qsyj+OFsZXh/HMF9w40dzeVns="; + sha256 = "sha256-9dFD22gws4Je3CocREnWOSc7C/oBeklwhxli2byiIUU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index 6ec8f24b7132..c48c71e14485 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -28,8 +28,9 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Implementation of the Sender Policy Framework for SMTP authorization"; - homepage = "https://www.libspf2.org"; + description = "Implementation of the Sender Policy Framework for SMTP " + + "authorization (Helsinki Systems fork)"; + homepage = "https://github.com/helsinki-systems/libspf2"; license = with licenses; [ lgpl21Plus bsd2 ]; maintainers = with maintainers; [ pacien ajs124 das_j ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libspng/default.nix b/pkgs/development/libraries/libspng/default.nix index 99a243733cf8..9a07cbf1aa1a 100644 --- a/pkgs/development/libraries/libspng/default.nix +++ b/pkgs/development/libraries/libspng/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libspng"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "randy408"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JBNFYmmd1UnoIfV6iWeDIw/kgvl8AArxfHK+TKjZ9rk="; + sha256 = "sha256-GgrTWC/cesDlEh2J6StCyKiLRk62xfy2+E4lnmJMLGs="; }; doCheck = true; diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index 4d7291c9b349..5685cfdbb4d4 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libsurvive"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "cntools"; repo = pname; rev = "v${version}"; - sha256 = "0m21fnq8pfw2pcvqfgjws531zmalda423q9i65v4qzm8sdb54hl4"; + sha256 = "sha256-atX7QsCjKGa6OVSApnx3seBvZv/mlpV3jWRB9+v7Emc="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix index 5a88d4ba2056..8e94275babfd 100644 --- a/pkgs/development/libraries/libthreadar/default.nix +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchurl }: - -with lib; +{ lib, stdenv, fetchurl, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "1.3.5"; + version = "1.4.0"; pname = "libthreadar"; src = fetchurl { url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; - sha256 = "sha256-T5W83Ry3e1hHrnpmSLkfJDYHrVP6YDpXTqmf0WGCjB8="; + sha256 = "sha256-LkcVF4AnuslzpIg/S8sGNJQye6iGcQRGqCqAhg8aN5E="; }; outputs = [ "out" "dev" ]; + buildInputs = [ gcc-unwrapped ]; + + CXXFLAGS = [ "-std=c++14" ]; + configureFlags = [ "--disable-build-html" ]; @@ -22,7 +24,7 @@ stdenv.mkDerivation rec { rm -r "$out"/share ''; - meta = { + meta = with lib; { homepage = "http://libthreadar.sourceforge.net/"; description = "A C++ library that provides several classes to manipulate threads"; longDescription = '' @@ -32,6 +34,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ izorkin ]; license = licenses.lgpl3; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libthreadar.x86_64-darwin }; } diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 5f34a80d253a..190765273409 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchurl +, fetchpatch , autoreconfHook , pkg-config @@ -8,6 +9,16 @@ , libjpeg , xz , zlib + +# for passthru.tests +, libgeotiff +, python3Packages +, imagemagick +, graphicsmagick +, gdal +, openimageio +, freeimage +, imlib }: #FIXME: fix aarch64-darwin build and get rid of ./aarch64-darwin.nix @@ -27,6 +38,21 @@ stdenv.mkDerivation rec { # libc++abi 11 has an `#include `, this picks up files name # `version` in the project's include paths ./rename-version.patch + (fetchpatch { + name = "CVE-2022-22844.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/03047a26952a82daaa0792957ce211e0aa51bc64.patch"; + sha256 = "0cfih55f5qpc84mvlwsffik80bgz6drkflkhrdyqq8m84jw3mbwb"; + }) + (fetchpatch { + name = "CVE-2022-0561.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/eecb0712f4c3a5b449f70c57988260a667ddbdef.patch"; + sha256 = "0m57fdxyvhhr9cc260lvkkn2g4zr4n4v9nricc6lf9h6diagd7mk"; + }) + (fetchpatch { + name = "CVE-2022-0562.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/561599c99f987dc32ae110370cfdd7df7975586b.patch"; + sha256 = "0ycirjjc1vigj03kwjb92n6jszsl9p17ccw5hry7lli9gxyyr0an"; + }) ]; postPatch = '' @@ -53,6 +79,11 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage imlib; + inherit (python3Packages) pillow imread; + }; + meta = with lib; { description = "Library and utilities for working with the TIFF image file format"; homepage = "https://libtiff.gitlab.io/libtiff"; diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix index d1a99fb88ab4..b7e02a62fa99 100644 --- a/pkgs/development/libraries/libtins/default.nix +++ b/pkgs/development/libraries/libtins/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libtins"; - version = "4.3"; + version = "4.4"; src = fetchFromGitHub { owner = "mfontanini"; repo = pname; rev = "v${version}"; - sha256 = "09ah1a7ska7xiki7625mn1d8i96il3hxbkc39ba8fn1a5383kmqa"; + sha256 = "sha256-mXbinXh/CO0SZZ71+K+FozbHCCoi12+AIa2o+P0QmUw="; }; postPatch = '' diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix index 52a88e2194d6..470b9137f6e1 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.1.nix @@ -46,5 +46,6 @@ in stdenv.mkDerivation { license = licenses.bsd3; maintainers = [ ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libtorrent-rasterbar-1_1_x.x86_64-darwin }; } diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 10cc499d09d6..5d97a263b880 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -53,7 +53,7 @@ in { }; libtoxcore_0_2 = generic { - version = "0.2.13"; - sha256 = "0a1cp00bnxl3q4l74yqp4aa6fg9slz4rg4lfzkl3khvmm6nzckds"; + version = "0.2.17"; + sha256 = "sha256-SOI6QKOSt/EK9JDrSaV6CrD5sx8aYb5ZL3StYq8u/Dg="; }; } diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 9c8e418fba4f..25214242b531 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libtsm"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "Aetf"; repo = "libtsm"; rev = "v${version}"; - sha256 = "0mwn91i5h5d518i1s05y7hzv6bc13vzcvxszpfh77473iwg4wprx"; + sha256 = "sha256-BYMRPjGRVSnYzkdbxypkuE0YkeVLPJ32iGZ1b0R6wto="; }; buildInputs = [ libxkbcommon ]; diff --git a/pkgs/development/libraries/libudev-zero/default.nix b/pkgs/development/libraries/libudev-zero/default.nix index 9b154f34205e..1c12504aa38c 100644 --- a/pkgs/development/libraries/libudev-zero/default.nix +++ b/pkgs/development/libraries/libudev-zero/default.nix @@ -1,25 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libudev-zero"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "illiliti"; repo = "libudev-zero"; rev = version; - sha256 = "0mln7iwyz7lxz8dx7bx7b47j6yws1dvfq35qsdcwg3wwmd4ngsz6"; + sha256 = "1dg6zqy8w3gxca8clz6hhv4jyvz8jdwvpmn9y289nrms1zx1jcs5"; }; - patches = [ - # Fix static. - # https://github.com/illiliti/libudev-zero/pull/48 - (fetchpatch { - url = "https://github.com/illiliti/libudev-zero/commit/505c61819b371a1802e054fe2601e64f2dc6d79e.patch"; - sha256 = "0y06rgjv73dd7fi3a0dlabcc8ryk3yhbsyrrhnnn3v36y1wz6m0g"; - }) - ]; - makeFlags = [ "PREFIX=$(out)" ]; # Just let the installPhase build stuff, because there's no @@ -31,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/illiliti/libudev-zero"; description = "Daemonless replacement for libudev"; + changelog = "https://github.com/illiliti/libudev-zero/releases/tag/${version}"; maintainers = with maintainers; [ qyliss shamilton ]; license = licenses.isc; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 7002f75cc45e..14fb004187d8 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, Cocoa }: let - shortName = "libui"; - version = "4.1a"; backend = if stdenv.isDarwin then "darwin" else "unix"; in -stdenv.mkDerivation { - name = "${shortName}-${version}"; +stdenv.mkDerivation rec { + pname = "libui"; + version = "4.1a"; src = fetchFromGitHub { owner = "andlabs"; repo = "libui"; @@ -27,22 +26,22 @@ stdenv.mkDerivation { mkdir -p $out/{include,lib} mkdir -p $out/lib/pkgconfig '' + lib.optionalString stdenv.isLinux '' - mv ./out/${shortName}.so.0 $out/lib/ - ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so + mv ./out/libui.so.0 $out/lib/ + ln -s $out/lib/libui.so.0 $out/lib/libui.so '' + lib.optionalString stdenv.isDarwin '' - mv ./out/${shortName}.A.dylib $out/lib/ - ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib + mv ./out/libui.A.dylib $out/lib/ + ln -s $out/lib/lubui.A.dylib $out/lib/libui.dylib '' + '' cp $src/ui.h $out/include cp $src/ui_${backend}.h $out/include - cp ${./libui.pc} $out/lib/pkgconfig/${shortName}.pc - substituteInPlace $out/lib/pkgconfig/${shortName}.pc \ + cp ${./libui.pc} $out/lib/pkgconfig/libui.pc + substituteInPlace $out/lib/pkgconfig/libui.pc \ --subst-var-by out $out \ --subst-var-by version "${version}" ''; postInstall = lib.optionalString stdenv.isDarwin '' - install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib + install_name_tool -id $out/lib/libui.A.dylib $out/lib/libui.A.dylib ''; meta = with lib; { diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index 9e6cec471d4d..7dee1d6b1eca 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libunibreak"; - version = "4.3"; + version = "5.0"; src = let rev_version = lib.replaceStrings ["."] ["_"] version; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "adah1972"; repo = pname; rev = "libunibreak_${rev_version}"; - sha256 = "19g3ixs1ycisfdnzd8v7j5r49h0x0hshchk9qwlz4i0mjv825plx"; + sha256 = "sha256-ju+DNCzwD+y/ebLVBU96iNpE1Wt7/K0qLcZHzWGzrWQ="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index b00b4cf9ac85..e2dc63609c41 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.13.0"; + version = "0.13.1"; pname = "liburcu"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "sha256-y7INvhqJLCpNiJi6xDFhduWFOSaT1Jh2bMu8aM8guiA="; + sha256 = "sha256-MhPzPSuPcQ65IOsauyeewEv4rmNh9E8lE8KMINM2MIM="; }; checkInputs = [ perl ]; diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/development/libraries/libusb-compat/0.1.nix index b23123f56eaa..f977d72e7242 100644 --- a/pkgs/development/libraries/libusb-compat/0.1.nix +++ b/pkgs/development/libraries/libusb-compat/0.1.nix @@ -35,7 +35,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libusb.info/"; - repositories.git = "https://github.com/libusb/libusb-compat-0.1"; description = "cross-platform user-mode USB device library"; longDescription = '' libusb is a cross-platform user-mode library that provides access to USB devices. diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 69410cf2b986..1514d2702103 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://libusb.info/"; - repositories.git = "https://github.com/libusb/libusb"; description = "cross-platform user-mode USB device library"; longDescription = '' libusb is a cross-platform user-mode library that provides access to USB devices. diff --git a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch index 86dd461ea07d..0945f21211dc 100644 --- a/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch +++ b/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -1,4 +1,4 @@ -From a896b0be849455edb83a9305dfec9b41447ef3e4 Mon Sep 17 00:00:00 2001 +From ad42041cfedcf25716429d2aad16641e0e2a012f Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Thu, 14 Jan 2021 00:32:00 -0800 Subject: [PATCH] meson: patch in an install prefix for building on nix @@ -6,22 +6,28 @@ Subject: [PATCH] meson: patch in an install prefix for building on nix Used in the nixpkgs version of libvirt so that we can install things in the nix store, but read them from the root filesystem. --- - meson.build | 9 +++++++++ + meson.build | 9 ++++++++ meson_options.txt | 2 ++ - src/libxl/meson.build | 6 +++--- - src/locking/meson.build | 8 ++++---- - src/lxc/meson.build | 6 +++--- - src/meson.build | 18 +++++++++--------- - src/network/meson.build | 12 ++++++------ + src/ch/meson.build | 6 ++--- + src/interface/meson.build | 2 +- + src/libxl/meson.build | 18 +++++++-------- + src/locking/meson.build | 8 +++---- + src/lxc/meson.build | 10 ++++---- + src/meson.build | 18 +++++++-------- + src/network/meson.build | 14 ++++++------ + src/node_device/meson.build | 2 +- + src/nwfilter/meson.build | 6 ++--- src/nwfilter/xml/meson.build | 2 +- - src/qemu/meson.build | 14 +++++++------- - src/remote/meson.build | 6 +++--- - src/security/apparmor/meson.build | 8 ++++---- - tools/meson.build | 4 ++-- - 12 files changed, 53 insertions(+), 42 deletions(-) + src/qemu/meson.build | 38 +++++++++++++++---------------- + src/remote/meson.build | 10 ++++---- + src/secret/meson.build | 4 ++-- + src/security/apparmor/meson.build | 8 +++---- + src/storage/meson.build | 6 ++--- + tools/meson.build | 2 +- + 18 files changed, 88 insertions(+), 77 deletions(-) diff --git a/meson.build b/meson.build -index b5164f6..33719f1 100644 +index 9016c0458a..b26e690194 100644 --- a/meson.build +++ b/meson.build @@ -39,6 +39,8 @@ if host_machine.system() == 'windows' @@ -48,7 +54,7 @@ index b5164f6..33719f1 100644 # sysconfdir as this makes a lot of things break in testing situations if prefix == '/usr' diff --git a/meson_options.txt b/meson_options.txt -index e5d79c2..081cd32 100644 +index 5b43cdbd6b..e9dff18441 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ @@ -57,27 +63,67 @@ index e5d79c2..081cd32 100644 option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update') option('packager', type: 'string', value: '', description: 'Extra packager name') option('packager_version', type: 'string', value: '', description: 'Extra packager version') -diff --git a/src/libxl/meson.build b/src/libxl/meson.build -index 3bb6cc5..78d7be0 100644 ---- a/src/libxl/meson.build -+++ b/src/libxl/meson.build -@@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL') +diff --git a/src/ch/meson.build b/src/ch/meson.build +index 66b77907b0..6aa9bbc548 100644 +--- a/src/ch/meson.build ++++ b/src/ch/meson.build +@@ -64,8 +64,8 @@ if conf.has('WITH_CH') } virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'ch', +- localstatedir / 'log' / 'libvirt' / 'ch', +- runstatedir / 'libvirt' / 'ch', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'ch', ++ install_prefix + runstatedir / 'libvirt' / 'ch', + ] + endif +diff --git a/src/interface/meson.build b/src/interface/meson.build +index 828f274422..2a6b1f8c5e 100644 +--- a/src/interface/meson.build ++++ b/src/interface/meson.build +@@ -56,6 +56,6 @@ if conf.has('WITH_INTERFACE') + } + + virt_install_dirs += [ +- runstatedir / 'libvirt' / 'interface', ++ install_prefix + runstatedir / 'libvirt' / 'interface', + ] + endif +diff --git a/src/libxl/meson.build b/src/libxl/meson.build +index 0cc277db82..48d8c5b962 100644 +--- a/src/libxl/meson.build ++++ b/src/libxl/meson.build +@@ -79,14 +79,14 @@ if conf.has('WITH_LIBXL') + } + + virt_install_dirs += [ +- confdir / 'libxl', +- confdir / 'libxl' / 'autostart', - localstatedir / 'lib' / 'libvirt' / 'libxl', -- runstatedir / 'libvirt' / 'libxl', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump', +- localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save', - localstatedir / 'log' / 'libvirt' / 'libxl', +- runstatedir / 'libvirt' / 'libxl', ++ install_prefix + confdir / 'libxl', ++ install_prefix + confdir / 'libxl' / 'autostart', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl', -+ install_prefix + runstatedir / 'libvirt' / 'libxl', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save', + install_prefix + localstatedir / 'log' / 'libvirt' / 'libxl', ++ install_prefix + runstatedir / 'libvirt' / 'libxl', ] endif diff --git a/src/locking/meson.build b/src/locking/meson.build -index 8a28310..9da81cc 100644 +index 72f7780438..abe70d20d5 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build -@@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD') +@@ -238,14 +238,14 @@ if conf.has('WITH_LIBVIRTD') } virt_install_dirs += [ @@ -97,26 +143,39 @@ index 8a28310..9da81cc 100644 endif endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build -index f8e2a88..96d6687 100644 +index 99d4a34213..aae477c1ee 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build -@@ -182,8 +182,8 @@ if conf.has('WITH_LXC') +@@ -176,10 +176,10 @@ if conf.has('WITH_LXC') } virt_install_dirs += [ +- confdir / 'lxc', +- confdir / 'lxc' / 'autostart', - localstatedir / 'lib' / 'libvirt' / 'lxc', -- runstatedir / 'libvirt' / 'lxc', - localstatedir / 'log' / 'libvirt' / 'lxc', +- runstatedir / 'libvirt' / 'lxc', ++ install_prefix + confdir / 'lxc', ++ install_prefix + confdir / 'lxc' / 'autostart', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'lxc', -+ install_prefix + runstatedir / 'libvirt' / 'lxc', + install_prefix + localstatedir / 'log' / 'libvirt' / 'lxc', ++ install_prefix + runstatedir / 'libvirt' / 'lxc', ] endif diff --git a/src/meson.build b/src/meson.build -index 7c47821..d33d16a 100644 +index b2d951d36c..305716010f 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -669,7 +669,7 @@ endforeach +@@ -210,7 +210,7 @@ openrc_init_files = [] + + # virt_install_dirs: + # list of directories to create during installation +-virt_install_dirs = [ confdir ] ++virt_install_dirs = [ install_prefix + confdir ] + + # driver_source_files: + # driver source files to check +@@ -663,7 +663,7 @@ endforeach virt_conf_files += 'libvirt.conf' @@ -125,7 +184,7 @@ index 7c47821..d33d16a 100644 install_data(virt_aug_files, install_dir: virt_aug_dir) # augeas_test_data: -@@ -729,7 +729,7 @@ foreach data : virt_daemon_confs +@@ -723,7 +723,7 @@ foreach data : virt_daemon_confs output: '@0@.conf'.format(data['name']), configuration: daemon_conf, install: true, @@ -134,15 +193,16 @@ index 7c47821..d33d16a 100644 ) if data.get('with_ip', false) -@@ -853,14 +853,14 @@ if conf.has('WITH_LIBVIRTD') +@@ -847,7 +847,7 @@ if conf.has('WITH_LIBVIRTD') install_data( init_file, - install_dir: sysconfdir / 'init.d', + install_dir: install_prefix + sysconfdir / 'init.d', + install_mode: 'rwxr-xr-x', rename: [ init['name'] ], ) - +@@ -855,7 +855,7 @@ if conf.has('WITH_LIBVIRTD') if init.has_key('confd') install_data( init['confd'], @@ -151,16 +211,7 @@ index 7c47821..d33d16a 100644 rename: [ init['name'] ], ) endif -@@ -872,7 +872,7 @@ if init_script != 'none' - foreach sysconf : sysconf_files - install_data( - sysconf['file'], -- install_dir: sysconfdir / 'sysconfig', -+ install_dir: install_prefix + sysconfdir / 'sysconfig', - rename: [ sysconf['name'] ], - ) - endforeach -@@ -897,10 +897,10 @@ endif +@@ -882,10 +882,10 @@ endif # Install empty directories virt_install_dirs += [ @@ -176,23 +227,27 @@ index 7c47821..d33d16a 100644 meson.add_install_script( diff --git a/src/network/meson.build b/src/network/meson.build -index 3ec598c..b02040b 100644 +index b5eff0c3ab..a0f26d624e 100644 --- a/src/network/meson.build +++ b/src/network/meson.build -@@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK') +@@ -73,11 +73,11 @@ if conf.has('WITH_NETWORK') } virt_install_dirs += [ +- confdir / 'qemu' / 'networks', +- confdir / 'qemu' / 'networks' / 'autostart', - localstatedir / 'lib' / 'libvirt' / 'network', - localstatedir / 'lib' / 'libvirt' / 'dnsmasq', - runstatedir / 'libvirt' / 'network', ++ install_prefix + confdir / 'qemu' / 'networks', ++ install_prefix + confdir / 'qemu' / 'networks' / 'autostart', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'network', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'dnsmasq', + install_prefix + runstatedir / 'libvirt' / 'network', ] configure_file( -@@ -89,12 +89,12 @@ if conf.has('WITH_NETWORK') +@@ -85,12 +85,12 @@ if conf.has('WITH_NETWORK') output: '@BASENAME@', copy: true, install: true, @@ -207,8 +262,37 @@ index 3ec598c..b02040b 100644 '../default.xml', 'default.xml', ) +diff --git a/src/node_device/meson.build b/src/node_device/meson.build +index 1c95975c37..a7831242db 100644 +--- a/src/node_device/meson.build ++++ b/src/node_device/meson.build +@@ -64,6 +64,6 @@ if conf.has('WITH_NODE_DEVICES') + } + + virt_install_dirs += [ +- runstatedir / 'libvirt' / 'nodedev', ++ install_prefix + runstatedir / 'libvirt' / 'nodedev', + ] + endif +diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build +index 55cf8fcce4..d331086f2e 100644 +--- a/src/nwfilter/meson.build ++++ b/src/nwfilter/meson.build +@@ -62,9 +62,9 @@ if conf.has('WITH_NWFILTER') + } + + virt_install_dirs += [ +- confdir / 'nwfilter', +- runstatedir / 'libvirt' / 'nwfilter-binding', +- runstatedir / 'libvirt' / 'nwfilter', ++ install_prefix + confdir / 'nwfilter', ++ install_prefix + runstatedir / 'libvirt' / 'nwfilter-binding', ++ install_prefix + runstatedir / 'libvirt' / 'nwfilter', + ] + + subdir('xml') diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build -index 0d96c54..66c92a1 100644 +index 0d96c54ebe..66c92a1016 100644 --- a/src/nwfilter/xml/meson.build +++ b/src/nwfilter/xml/meson.build @@ -25,4 +25,4 @@ nwfilter_xml_files = [ @@ -218,43 +302,71 @@ index 0d96c54..66c92a1 100644 -install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') +install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') diff --git a/src/qemu/meson.build b/src/qemu/meson.build -index 90640b0..8802cec 100644 +index 39f0f615cc..5f6f30f82b 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build -@@ -171,12 +171,12 @@ if conf.has('WITH_QEMU') - } +@@ -175,24 +175,24 @@ if conf.has('WITH_QEMU') + endif virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'qemu', -- runstatedir / 'libvirt' / 'qemu', +- confdir / 'qemu', +- confdir / 'qemu' / 'autostart', - localstatedir / 'cache' / 'libvirt' / 'qemu', -- localstatedir / 'log' / 'libvirt' / 'qemu', +- localstatedir / 'lib' / 'libvirt' / 'qemu', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save', +- localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot', - localstatedir / 'lib' / 'libvirt' / 'swtpm', -- runstatedir / 'libvirt' / 'qemu' / 'swtpm', +- localstatedir / 'log' / 'libvirt' / 'qemu', - localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu', -+ install_prefix + runstatedir / 'libvirt' / 'qemu', +- runstatedir / 'libvirt' / 'qemu', +- runstatedir / 'libvirt' / 'qemu' / 'dbus', +- runstatedir / 'libvirt' / 'qemu' / 'slirp', +- runstatedir / 'libvirt' / 'qemu' / 'swtpm', ++ install_prefix + confdir / 'qemu', ++ install_prefix + confdir / 'qemu' / 'autostart', + install_prefix + localstatedir / 'cache' / 'libvirt' / 'qemu', -+ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot', + install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm', -+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu', + install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', ++ install_prefix + runstatedir / 'libvirt' / 'qemu', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'dbus', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'slirp', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ] endif diff --git a/src/remote/meson.build b/src/remote/meson.build -index 9ad2f6a..429a15b 100644 +index b2aafe6320..6972d254ca 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build -@@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE') +@@ -235,9 +235,9 @@ if conf.has('WITH_REMOTE') } virt_install_dirs += [ - localstatedir / 'log' / 'libvirt', +- runstatedir / 'libvirt', +- runstatedir / 'libvirt' / 'common', + install_prefix + localstatedir / 'log' / 'libvirt', ++ install_prefix + runstatedir / 'libvirt', ++ install_prefix + runstatedir / 'libvirt' / 'common', ] logrotate_conf = configuration_data() -@@ -259,7 +259,7 @@ if conf.has('WITH_REMOTE') +@@ -251,7 +251,7 @@ if conf.has('WITH_REMOTE') ) install_data( log_file, @@ -263,7 +375,7 @@ index 9ad2f6a..429a15b 100644 rename: [ name ], ) endforeach -@@ -309,7 +309,7 @@ endif +@@ -301,7 +301,7 @@ endif if conf.has('WITH_SASL') install_data( 'libvirtd.sasl', @@ -272,11 +384,25 @@ index 9ad2f6a..429a15b 100644 rename: [ 'libvirt.conf' ], ) endif +diff --git a/src/secret/meson.build b/src/secret/meson.build +index 1bda59849b..392bc2cb2e 100644 +--- a/src/secret/meson.build ++++ b/src/secret/meson.build +@@ -45,7 +45,7 @@ if conf.has('WITH_SECRETS') + } + + virt_install_dirs += [ +- confdir / 'secrets', +- runstatedir / 'libvirt' / 'secrets', ++ install_prefix + confdir / 'secrets', ++ install_prefix + runstatedir / 'libvirt' / 'secrets', + ] + endif diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build -index af43780..e2d6c81 100644 +index 990f00b4f3..e5a7a14e1d 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build -@@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles +@@ -19,22 +19,22 @@ foreach name : apparmor_gen_profiles output: name, configuration: apparmor_gen_profiles_conf, install: true, @@ -303,11 +429,28 @@ index af43780..e2d6c81 100644 + install_dir: install_prefix + apparmor_dir / 'local', rename: 'usr.lib.libvirt.virt-aa-helper', ) +diff --git a/src/storage/meson.build b/src/storage/meson.build +index 26e7ff1a1a..ad5c6eddc3 100644 +--- a/src/storage/meson.build ++++ b/src/storage/meson.build +@@ -127,9 +127,9 @@ if conf.has('WITH_STORAGE') + } + + virt_install_dirs += [ +- confdir / 'storage', +- confdir / 'storage' / 'autostart', +- runstatedir / 'libvirt' / 'storage', ++ install_prefix + confdir / 'storage', ++ install_prefix + confdir / 'storage' / 'autostart', ++ install_prefix + runstatedir / 'libvirt' / 'storage', + ] + endif + diff --git a/tools/meson.build b/tools/meson.build -index b8c6802..dacd0ff 100644 +index f4b4a16c29..059c73a955 100644 --- a/tools/meson.build +++ b/tools/meson.build -@@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL') +@@ -120,7 +120,7 @@ if conf.has('WITH_LOGIN_SHELL') install_rpath: libvirt_rpath, ) @@ -316,11 +459,6 @@ index b8c6802..dacd0ff 100644 endif if host_machine.system() == 'windows' -@@ -274,7 +274,7 @@ configure_file( - if init_script == 'systemd' - install_data( - 'libvirt-guests.sysconf', -- install_dir: sysconfdir / 'sysconfig', -+ install_dir: install_prefix + sysconfdir / 'sysconfig', - rename: 'libvirt-guests', - ) +-- +2.35.1 + diff --git a/pkgs/development/libraries/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch b/pkgs/development/libraries/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch new file mode 100644 index 000000000000..375267dcda79 --- /dev/null +++ b/pkgs/development/libraries/libvirt/0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch @@ -0,0 +1,48 @@ +From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001 +From: Boris Fiuczynski +Date: Tue, 1 Mar 2022 18:47:59 +0100 +Subject: [PATCH] qemu: segmentation fault in virtqemud executing + qemuDomainUndefineFlags + +Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault. + +Stack trace of thread 664419: + #0 0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=) at ../src/qemu/qemu_driver.c:6618 + #1 0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=) at ../src/libvirt-domain.c:6519 + #2 0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=, rerr=0x3ff8287b950, client=) + at src/remote/remote_daemon_dispatch_stubs.h:13080 + #3 remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=, ret=0x0) + at src/remote/remote_daemon_dispatch_stubs.h:13059 + #4 0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010) + at ../src/rpc/virnetserverprogram.c:428 + #5 virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302 + #6 0x000003ff8758c260 in virNetServerProcessMsg (msg=, prog=, client=, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140 + #7 virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160 + #8 0x000003ff874c49aa in virThreadPoolWorker (opaque=) at ../src/util/virthreadpool.c:164 + #9 0x000003ff874c3f62 in virThreadHelper (data=) at ../src/util/virthread.c:256 + #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6 + #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6 + +Signed-off-by: Boris Fiuczynski +Reviewed-by: Jim Fehlig +Reviewed-by: Michal Privoznik +--- + src/qemu/qemu_driver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c +index bcd9bdb436..8337eed510 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, + } + } + +- if (vm->def->os.loader->nvram) { ++ if (vm->def->os.loader && vm->def->os.loader->nvram) { + nvram_path = g_strdup(vm->def->os.loader->nvram); + } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) { + qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path); +-- +2.35.1 + diff --git a/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch b/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch deleted file mode 100644 index ae97c6455c6b..000000000000 --- a/pkgs/development/libraries/libvirt/0002-meson-patch-ch-install-prefix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/ch/meson.build b/src/ch/meson.build -index e34974d56c..4767763c2c 100644 ---- a/src/ch/meson.build -+++ b/src/ch/meson.build -@@ -68,7 +68,7 @@ if conf.has('WITH_CH') - } - - virt_install_dirs += [ -- localstatedir / 'lib' / 'libvirt' / 'ch', -- runstatedir / 'libvirt' / 'ch', -+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch', -+ install_prefix + runstatedir / 'libvirt' / 'ch', - ] - endif diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 6e7fc6127ec8..cda7c091908d 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,85 +1,122 @@ { lib -, stdenv -, fetchurl -, fetchFromGitLab -, makeWrapper , autoreconfHook -, fetchpatch +, bash-completion +, bridge-utils +, cmake , coreutils -, libxml2 -, gnutls -, perl -, python3 -, attr -, glib +, curl +, darwin +, dbus +, dnsmasq , docutils -, iproute2 -, readline -, lvm2 -, util-linux -, systemd -, libpciaccess +, fetchFromGitLab +, fetchurl , gettext -, libtasn1 +, glib +, gnutls +, iproute2 , iptables , libgcrypt -, yajl -, pmutils -, libcap_ng -, libapparmor -, dnsmasq -, libnl , libpcap +, libtasn1 +, libxml2 , libxslt -, xhtml1 -, numad -, numactl -, perlPackages -, curl -, libiconv -, gmp -, zfs -, parted -, bridge-utils -, dmidecode -, dbus -, libtirpc -, rpcsvc-proto -, darwin +, makeWrapper , meson , ninja -, audit -, cmake -, bash-completion +, perl +, perlPackages , pkg-config +, pmutils +, python3 +, readline +, rpcsvc-proto +, stdenv +, xhtml1 +, yajl + + # Linux +, acl ? null +, attr ? null +, audit ? null +, dmidecode ? null +, fuse ? null +, kmod ? null +, libapparmor ? null +, libcap_ng ? null +, libnl ? null +, libpciaccess ? null +, libtirpc ? null +, lvm2 ? null +, numactl ? null +, numad ? null +, parted ? null +, systemd ? null +, util-linux ? null + + # Darwin +, gmp ? null +, libiconv ? null +, Carbon ? null +, AppKit ? null + + # Options +, enableCeph ? false +, ceph ? null +, enableGlusterfs ? false +, glusterfs ? null +, enableIscsi ? false +, openiscsi ? null +, libiscsi ? null , enableXen ? false , xen ? null -, enableIscsi ? false -, openiscsi -, enableCeph ? false -, ceph -, enableGlusterfs ? false -, glusterfs -, Carbon -, AppKit +, enableZfs ? stdenv.isLinux +, zfs ? null }: with lib; -# if you update, also bump and SysVirt in let - buildFromTarball = stdenv.isDarwin; + inherit (stdenv) isDarwin isLinux isx86_64; + binPath = makeBinPath ([ + dnsmasq + ] ++ optionals isLinux [ + bridge-utils + dmidecode + dnsmasq + iproute2 + iptables + kmod + lvm2 + numactl + numad + pmutils + systemd + ] ++ optionals enableIscsi [ + libiscsi + openiscsi + ]); in + +assert enableXen -> isLinux && isx86_64; +assert enableCeph -> isLinux; +assert enableGlusterfs -> isLinux; +assert enableZfs -> isLinux; + +# if you update, also bump and SysVirt in stdenv.mkDerivation rec { pname = "libvirt"; - version = "7.10.0"; + # NOTE: You must also bump: + # + # SysVirt in + version = "8.1.0"; src = - if buildFromTarball then + if isDarwin then fetchurl { url = "https://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "sha256-yzGAFK8JcyeSjG49cpIuO+AqPmQBJHsqpS2auOC0gPk="; + sha256 = "sha256-PGxDvs/+s0o/OXxhYgaqaaiT/4v16CCDk8hOjnU1KTQ="; } else fetchFromGitLab @@ -87,76 +124,85 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-bB8LsjZFeJbMmmC0YRPyMag2MBhwagUFC7aB1KhZEkA="; + sha256 = "sha256-nk8pBlss+g4EMy+RnAOyz6YlGGvlBvl5aBpcytsK1wY="; fetchSubmodules = true; }; patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch - ./0002-meson-patch-ch-install-prefix.patch + ./0001-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch ]; + # remove some broken tests + postPatch = '' + sed -i '/commandtest/d' tests/meson.build + sed -i '/virnetsockettest/d' tests/meson.build + # delete only the first occurrence of this + sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build + '' + optionalString isDarwin '' + sed -i '/qemucapabilitiestest/d' tests/meson.build + ''; + + nativeBuildInputs = [ - ninja meson + cmake - makeWrapper - pkg-config docutils - ] ++ optional (!stdenv.isDarwin) [ - rpcsvc-proto - ] ++ optionals stdenv.isDarwin [ - darwin.developer_cmds # needed for rpcgen - ]; + makeWrapper + ninja + pkg-config + ] + ++ optional (!isDarwin) rpcsvc-proto + # NOTE: needed for rpcgen + ++ optional isDarwin darwin.developer_cmds; buildInputs = [ bash-completion - pkg-config - libxml2 + curl + dbus + gettext + glib gnutls + libgcrypt + libpcap + libtasn1 + libxml2 + libxslt perl + perlPackages.XMLXPath + pkg-config python3 readline - gettext - libtasn1 - libgcrypt - yajl - libxslt xhtml1 - perlPackages.XMLXPath - curl - libpcap - glib - dbus - ] ++ optionals stdenv.isLinux [ + yajl + ] ++ optionals isLinux [ + acl + attr audit - libpciaccess - lvm2 - util-linux - systemd - libnl - numad - zfs + fuse libapparmor libcap_ng - numactl - attr - parted + libnl + libpciaccess libtirpc - ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ - xen - ] ++ optionals enableIscsi [ - openiscsi - ] ++ optionals enableCeph [ - ceph - ] ++ optionals enableGlusterfs [ - glusterfs - ] ++ optionals stdenv.isDarwin [ - libiconv - gmp - Carbon + lvm2 + numactl + numad + parted + systemd + util-linux + ] ++ optionals isDarwin [ AppKit - ]; + Carbon + gmp + libiconv + ] + ++ optionals enableCeph [ ceph ] + ++ optionals enableGlusterfs [ glusterfs ] + ++ optionals enableIscsi [ libiscsi openiscsi ] + ++ optionals enableXen [ xen ] + ++ optionals enableZfs [ zfs ]; preConfigure = let @@ -164,87 +210,133 @@ stdenv.mkDerivation rec { QEMU_BRIDGE_HELPER = "/run/wrappers/bin/qemu-bridge-helper"; QEMU_PR_HELPER = "/run/libvirt/nix-helpers/qemu-pr-helper"; }; + patchBuilder = var: value: '' sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|" ''; in '' - PATH=${lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute2 iptables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH + PATH="${binPath}:$PATH" # the path to qemu-kvm will be stored in VM's .xml and .save files # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' + substituteInPlace build-aux/meson.build \ --replace "gsed" "sed" \ --replace "gmake" "make" \ --replace "ggrep" "grep" + patchShebangs . '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); - mesonAutoFeatures = "auto"; + mesonAutoFeatures = "disabled"; mesonFlags = let - opt = option: enable: "-D${option}=${if enable then "enabled" else "disabled"}"; + cfg = option: val: "-D${option}=${val}"; + feat = option: enable: cfg option (if enable then "enabled" else "disabled"); + driver = name: feat "driver_${name}"; + storage = name: feat "storage_${name}"; in [ "--sysconfdir=/var/lib" - "-Dinstall_prefix=${placeholder "out"}" - "-Dlocalstatedir=/var" - "-Drunstatedir=/run" - "-Dlibpcap=enabled" - "-Ddriver_qemu=enabled" - "-Ddriver_vmware=enabled" - "-Ddriver_vbox=enabled" - "-Ddriver_test=enabled" - "-Ddriver_esx=enabled" - "-Ddriver_remote=enabled" - "-Dpolkit=enabled" - (opt "storage_iscsi" enableIscsi) - ] ++ optionals stdenv.isLinux [ - (opt "storage_zfs" (zfs != null)) - "-Dattr=enabled" - "-Dapparmor=enabled" - "-Dsecdriver_apparmor=enabled" - "-Dnumad=enabled" - "-Dstorage_disk=enabled" - (opt "glusterfs" enableGlusterfs) - (opt "storage_rbd" enableCeph) - ] ++ optionals stdenv.isDarwin [ - "-Dinit_script=none" + (cfg "install_prefix" (placeholder "out")) + (cfg "localstatedir" "/var") + (cfg "runstatedir" "/run") + + (cfg "init_script" (if isDarwin then "none" else "systemd")) + + (feat "apparmor" isLinux) + (feat "attr" isLinux) + (feat "audit" isLinux) + (feat "bash_completion" true) + (feat "blkid" isLinux) + (feat "capng" isLinux) + (feat "curl" true) + (feat "docs" true) + (feat "expensive_tests" true) + (feat "firewalld" isLinux) + (feat "firewalld_zone" isLinux) + (feat "fuse" isLinux) + (feat "glusterfs" enableGlusterfs) + (feat "host_validate" true) + (feat "libiscsi" enableIscsi) + (feat "libnl" isLinux) + (feat "libpcap" true) + (feat "libssh2" true) + (feat "login_shell" isLinux) + (feat "nss" isLinux) + (feat "numactl" isLinux) + (feat "numad" isLinux) + (feat "pciaccess" isLinux) + (feat "polkit" true) + (feat "readline" true) + (feat "secdriver_apparmor" isLinux) + (feat "tests" true) + (feat "udev" isLinux) + (feat "yajl" true) + + (driver "ch" isLinux) + (driver "esx" true) + (driver "interface" isLinux) + (driver "libvirtd" true) + (driver "libxl" enableXen) + (driver "lxc" isLinux) + (driver "network" true) + (driver "openvz" isLinux) + (driver "qemu" true) + (driver "remote" true) + (driver "secrets" true) + (driver "test" true) + (driver "vbox" true) + (driver "vmware" true) + + (storage "dir" true) + (storage "disk" isLinux) + (storage "fs" isLinux) + (storage "gluster" enableGlusterfs) + (storage "iscsi" enableIscsi) + (storage "iscsi_direct" enableIscsi) + (storage "lvm" isLinux) + (storage "mpath" isLinux) + (storage "rbd" enableCeph) + (storage "scsi" true) + (storage "vstorage" isLinux) + (storage "zfs" enableZfs) ]; - postInstall = - let - binPath = [ iptables iproute2 pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ]; - in - '' - substituteInPlace $out/libexec/libvirt-guests.sh \ - --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ - --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ - --replace "$out/bin" '${gettext}/bin' \ - --replace 'lock/subsys' 'lock' \ - --replace 'gettext.sh' 'gettext.sh - # Added in nixpkgs: - gettext() { "${gettext}/bin/gettext" "$@"; } - ' - '' + optionalString stdenv.isLinux '' - substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill - rm $out/lib/systemd/system/{virtlockd,virtlogd}.* - wrapProgram $out/sbin/libvirtd \ - --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} - ''; + doCheck = true; + + postInstall = '' + substituteInPlace $out/bin/virt-xml-validate \ + --replace xmllint ${libxml2}/bin/xmllint + + substituteInPlace $out/libexec/libvirt-guests.sh \ + --replace 'ON_BOOT="start"' 'ON_BOOT=''${ON_BOOT:-start}' \ + --replace 'ON_SHUTDOWN="suspend"' 'ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}' \ + --replace "$out/bin" '${gettext}/bin' \ + --replace 'lock/subsys' 'lock' \ + --replace 'gettext.sh' 'gettext.sh + # Added in nixpkgs: + gettext() { "${gettext}/bin/gettext" "$@"; } + ' + '' + optionalString isLinux '' + substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill + rm $out/lib/systemd/system/{virtlockd,virtlogd}.* + wrapProgram $out/sbin/libvirtd \ + --prefix PATH : /run/libvirt/nix-emulators:${binPath} + ''; meta = { homepage = "https://libvirt.org/"; - repositories.git = "git://libvirt.org/libvirt.git"; description = '' A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes) ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin lovesegfault ]; }; } diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 2f9afff56d87..1517cf970782 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.99.1"; + version = "2.0.0"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-WGW/4m+BTe6dEigUcuUIZjoTeamInW6zrtrlaqKM6Js="; + sha256 = "sha256-k8pEgEu+oWNa0rI47osVPKaZGxgwX/ENaz9jPrQXy0E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libwbxml/default.nix b/pkgs/development/libraries/libwbxml/default.nix new file mode 100644 index 000000000000..b5dc8c18208a --- /dev/null +++ b/pkgs/development/libraries/libwbxml/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, lib, cmake, expat }: + +stdenv.mkDerivation rec { + pname = "libwbxml"; + version = "0.11.8"; + + src = fetchFromGitHub { + owner = "libwbxml"; + repo = "libwbxml"; + rev = "${pname}-${version}"; + sha256 = "sha256-WCVKfIk6R2rVaz1SbJL9eLqNC0f4VzL74Sw2IKdDE9I="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ expat ]; + + postPatch = '' + sed -i 's/^SET.*$//' cmake/CMakeLists.txt + ''; + + meta = with lib; { + homepage = "https://github.com/libwbxml/libwbxml"; + description = "The WBXML Library (aka libwbxml) contains a library and its associated tools to Parse, Encode and Handle WBXML documents"; + maintainers = with maintainers; [ mh ]; + platforms = platforms.linux; + license = licenses.lgpl21Plus; + }; +} diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index c78cc192a7cf..9f92ed5fd459 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "libwnck"; - version = "40.0"; + version = "40.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "MMt5qDn5DNZvPiAvP5jLUWb6DNm5LrVxrZxHCkMCHYM="; + sha256 = "AxNPoRTvP740B1qoNnj1iqLevp/O9OojwHeeKGAdZhE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix index e68c60ebbdbf..a711fab63143 100644 --- a/pkgs/development/libraries/libwpe/fdo.nix +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "wpebackend-fdo"; - version = "1.10.0"; + version = "1.12.0"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-uJ39NQCk3scREyzXv/clmeZ9VqQZ0ABzDhS7mVR1Ccw="; + sha256 = "sha256-YjnJwVUjQQeY1mMV3mtJFxKrMACboYDz4N0HbZsAdKw="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index e96914157b89..f28420229ab9 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libxc"; - version = "5.2.0"; + version = "5.2.2"; src = fetchFromGitLab { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "1zfhfiwk8cnfbmkagaia4xhsc133icl1pryzync28kzsjxzlwfzc"; + sha256 = "113sk7hxjpfbz3nrgjsc7bi6zrlwb3qq5s6h0zh37hz9bd1brq54"; }; nativeBuildInputs = [ perl cmake gfortran ]; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 25d2d89add01..7bcc62af6ec8 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "libxkbcommon"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "0d4jzq0zv1xmng0z0q5lb4rz03ikgxdwi68k3r70ac16gb911ixk"; + sha256 = "0ca00awfzvxiznvd4mgwgxyqxiwvi07j5xxmg5z0l47rcd9fqv0h"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index bc11c9cfea1f..3b7cae36a0ee 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,20 +1,37 @@ -{ stdenv, lib, fetchurl, fetchpatch -, zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs +{ stdenv +, lib +, fetchurl +, zlib +, pkg-config +, autoreconfHook +, xz +, libintl +, python +, gettext +, ncurses +, findXMLCatalogs , libiconv , pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform -, icuSupport ? false, icu ? null +, icuSupport ? false +, icu , enableShared ? stdenv.hostPlatform.libc != "msvcrt" && !stdenv.hostPlatform.isStatic , enableStatic ? !enableShared +, gnome }: stdenv.mkDerivation rec { pname = "libxml2"; - version = "2.9.12"; + version = "2.9.13"; + + outputs = [ "bin" "dev" "out" "man" "doc" ] + ++ lib.optional pythonSupport "py" + ++ lib.optional (enableStatic && enableShared) "static"; src = fetchurl { - url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; - sha256 = "14hxwzmf5xqppx77z7i0ni9lpzg1a84dqpf8j8l1fvy570g6imn8"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "J2EwYC0S/khOzANEfuXnWdBGVVj7yda9FE43RTBuvw4="; }; + patches = [ # Upstream bugs: # https://bugzilla.gnome.org/show_bug.cgi?id=789714 @@ -28,63 +45,66 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/63174 # https://github.com/NixOS/nixpkgs/pull/72342 ./utf8-xmlErrorFuncHandler.patch - - # Work around lxml API misuse. - # https://gitlab.gnome.org/GNOME/libxml2/issues/255 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libxml2/commit/85b1792e37b131e7a51af98a37f92472e8de5f3f.patch"; - sha256 = "epqlNs2S0Zczox3KyCB6R2aJKh87lXydlZ0x6tLHweE="; - }) ]; - outputs = [ "bin" "dev" "out" "man" "doc" ] - ++ lib.optional pythonSupport "py" - ++ lib.optional (enableStatic && enableShared) "static"; - strictDeps = true; - buildInputs = lib.optional pythonSupport python - ++ lib.optional (pythonSupport && python?isPy2 && python.isPy2) gettext - ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses - ++ lib.optional (stdenv.isDarwin && - pythonSupport && python?isPy2 && python.isPy2) libintl + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = lib.optionals pythonSupport [ + python + ] ++ lib.optionals (pythonSupport && python?isPy2 && python.isPy2) [ + gettext + ] ++ lib.optionals (pythonSupport && python?isPy3 && python.isPy3) [ + ncurses + ] ++ lib.optionals (stdenv.isDarwin && pythonSupport && python?isPy2 && python.isPy2) [ + libintl + ] ++ lib.optionals stdenv.isFreeBSD [ # Libxml2 has an optional dependency on liblzma. However, on impure # platforms, it may end up using that from /usr/lib, and thus lack a # RUNPATH for that, leading to undefined references for its users. - ++ lib.optional stdenv.isFreeBSD xz; + xz + ]; - propagatedBuildInputs = [ zlib findXMLCatalogs ] - ++ lib.optional stdenv.isDarwin libiconv - ++ lib.optional icuSupport icu; + propagatedBuildInputs = [ + zlib + findXMLCatalogs + ] ++ lib.optionals stdenv.isDarwin [ + libiconv + ] ++ lib.optionals icuSupport [ + icu + ]; configureFlags = [ - "--exec_prefix=$dev" + "--exec-prefix=${placeholder "dev"}" (lib.enableFeature enableStatic "static") (lib.enableFeature enableShared "shared") (lib.withFeature icuSupport "icu") (lib.withFeatureAs pythonSupport "python" python) ]; + installFlags = lib.optionals pythonSupport [ + "pythondir=\"${placeholder "py"}/${python.sitePackages}\"" + ]; + + enableParallelBuilding = true; + + doCheck = + (stdenv.hostPlatform == stdenv.buildPlatform) && + !stdenv.isDarwin && + stdenv.hostPlatform.libc != "musl"; + preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; - enableParallelBuilding = true; - - # disable test that's problematic with newer pythons: see - # https://mail.gnome.org/archives/xml/2017-August/msg00014.html - preCheck = lib.optionalString (pythonSupport && !(python?pythonOlder && python.pythonOlder "3.5")) '' - echo "" > python/tests/tstLastError.py + preInstall = lib.optionalString pythonSupport '' + substituteInPlace python/libxml2mod.la --replace "$dev/${python.sitePackages}" "$py/${python.sitePackages}" ''; - doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin && - stdenv.hostPlatform.libc != "musl"; - - preInstall = lib.optionalString pythonSupport - ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"''; - installFlags = lib.optional pythonSupport - "pythondir=\"${placeholder "py"}/lib/${python.libPrefix}/site-packages\""; - postFixup = '' moveToOutput bin/xml2-config "$dev" moveToOutput lib/xml2Conf.sh "$dev" @@ -93,13 +113,21 @@ stdenv.mkDerivation rec { moveToOutput lib/libxml2.a "$static" ''; - passthru = { inherit version; pythonSupport = pythonSupport; }; + passthru = { + inherit version; + pythonSupport = pythonSupport; - meta = { + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + + meta = with lib; { homepage = "http://xmlsoft.org/"; - description = "An XML parsing library for C"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.eelco ]; + description = "XML parsing library for C"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ eelco jtojnar ]; }; } diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index b476edaf5e60..80d6129f18a8 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitHub +, fetchpatch , docbook_xml_dtd_43 , docbook_xsl , glib @@ -11,11 +13,12 @@ , python3 , shared-mime-info , nixosTests +, xz }: stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.3.1"; + version = "0.3.7"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -23,11 +26,18 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "sha256-4gJBmSbo5uGj12Y2Ov4gmS8nJshQxuBM9BAevY/lwjg="; + sha256 = "sha256-ZzA1YJYxTR91X79NU9dWd11Ze+PX2wuZeumuEuNdC48="; }; patches = [ ./installed-tests-path.patch + # Fix darwin build, can be removed on next release + # `--version-script` isn't supported by the macOS linker + # https://github.com/hughsie/libxmlb/pull/119 + (fetchpatch { + url = "https://github.com/hughsie/libxmlb/commit/d83aac5bd78cfbbfa2ecd428ff54b811071dfe4d.patch"; + sha256 = "sha256-UNRMbyNzdxfTZ8xV6J8a622hPnr3mowooP1q8Dg19yw="; + }) ]; nativeBuildInputs = [ @@ -38,12 +48,13 @@ stdenv.mkDerivation rec { meson ninja pkg-config - (python3.withPackages (pkgs: with pkgs; [ setuptools ])) + python3 shared-mime-info ]; buildInputs = [ glib + xz ]; mesonFlags = [ @@ -69,6 +80,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hughsie/libxmlb"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/pkgs/development/libraries/libxmlb/installed-tests-path.patch index 4207e9a91d74..0e74d131b2e8 100644 --- a/pkgs/development/libraries/libxmlb/installed-tests-path.patch +++ b/pkgs/development/libraries/libxmlb/installed-tests-path.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 38486c9..c567613 100644 +index c98e1a7..025d9c8 100644 --- a/meson.build +++ b/meson.build -@@ -110,8 +110,8 @@ +@@ -110,8 +110,8 @@ else prefix = get_option('prefix') datadir = join_paths(prefix, get_option('datadir')) libexecdir = join_paths(prefix, get_option('libexecdir')) @@ -14,11 +14,11 @@ index 38486c9..c567613 100644 gio = dependency('gio-2.0', version : '>= 2.45.8') diff --git a/meson_options.txt b/meson_options.txt -index 27e8cb6..74548ae 100644 +index 54ab698..8a7122a 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -2,3 +2,4 @@ - option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data') +@@ -3,3 +3,4 @@ option('introspection', type : 'boolean', value : true, description : 'generate option('tests', type : 'boolean', value : true, description : 'enable tests') option('stemmer', type : 'boolean', value : false, description : 'enable stemmer support') + option('cli', type : 'boolean', value : true, description : 'build and install the xb-tool CLI') +option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 3993b3f73e1f..ac4dd7492337 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,38 +1,60 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , pkg-config -, libxml2, findXMLCatalogs, gettext, python, libgcrypt +, autoreconfHook +, libxml2 +, findXMLCatalogs +, gettext +, python +, ncurses +, libgcrypt , cryptoSupport ? false , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform +, gnome }: stdenv.mkDerivation rec { pname = "libxslt"; - version = "1.1.34"; - - src = fetchurl { - url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; - sha256 = "0zrzz6kjdyavspzik6fbkpvfpbd25r2qg6py5nnjaabrsr3bvccq"; - }; + version = "1.1.35"; outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "gkfzPpqHLGrIWapFAYvExNALl+L+rJ7rwQyTzh803Xk="; + }; + nativeBuildInputs = [ pkg-config + autoreconfHook ]; - buildInputs = [ libxml2.dev ] - ++ lib.optional stdenv.isDarwin gettext - ++ lib.optionals pythonSupport [ libxml2.py python ] - ++ lib.optionals cryptoSupport [ libgcrypt ]; + buildInputs = [ + libxml2.dev + ] ++ lib.optional stdenv.isDarwin [ + gettext + ] ++ lib.optionals pythonSupport [ + libxml2.py + python + ncurses + ] ++ lib.optionals cryptoSupport [ + libgcrypt + ]; - propagatedBuildInputs = [ findXMLCatalogs ]; + propagatedBuildInputs = [ + findXMLCatalogs + ]; configureFlags = [ "--without-debug" "--without-mem-debug" "--without-debugger" - ] ++ lib.optional pythonSupport "--with-python=${python}" - ++ lib.optional (!cryptoSupport) "--without-crypto"; + ] ++ lib.optionals pythonSupport [ + "--with-python=${python}" + ] ++ lib.optionals (!cryptoSupport) [ + "--without-crypto" + ]; postFixup = '' moveToOutput bin/xslt-config "$dev" @@ -46,6 +68,11 @@ stdenv.mkDerivation rec { passthru = { inherit pythonSupport; + + updateScript = gnome.updateScript { + packageName = pname; + versionPolicy = "none"; + }; }; meta = with lib; { @@ -53,7 +80,7 @@ stdenv.mkDerivation rec { description = "A C library and tools to do XSL transformations"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.eelco ]; - broken = !(pythonSupport -> libxml2.pythonSupport); # see #73102 for why this is not an assert + maintainers = with maintainers; [ eelco jtojnar ]; + broken = pythonSupport && !libxml2.pythonSupport; # see #73102 for why this is not an assert }; } diff --git a/pkgs/development/libraries/libyang/default.nix b/pkgs/development/libraries/libyang/default.nix index 6a07371261ae..d6efe0543db7 100644 --- a/pkgs/development/libraries/libyang/default.nix +++ b/pkgs/development/libraries/libyang/default.nix @@ -10,8 +10,7 @@ , pcre2 # update script -, genericUpdater -, common-updater-scripts +, gitUpdater }: stdenv.mkDerivation rec { @@ -40,9 +39,8 @@ stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE:String=Release" ]; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; }; diff --git a/pkgs/development/libraries/libyuv/default.nix b/pkgs/development/libraries/libyuv/default.nix new file mode 100644 index 000000000000..ac69ab8dacc0 --- /dev/null +++ b/pkgs/development/libraries/libyuv/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchgit +, cmake +, libjpeg +}: + +stdenv.mkDerivation rec { + pname = "libyuv"; + version = "1787"; # Defined in: include/libyuv/version.h + + src = fetchgit { + url = "https://chromium.googlesource.com/libyuv/libyuv.git"; + rev = "eb6e7bb63738e29efd82ea3cf2a115238a89fa51"; # refs/heads/stable + sha256 = "sha256-DtRYoaAXb9ZD2OLiKbzKzH5vzuu+Lzu4eHaDgPB9hjU="; + }; + + nativeBuildInputs = [ + cmake + ]; + + # NEON does not work on aarch64, we disable it + cmakeFlags = lib.optionals stdenv.isAarch64 ["-DCMAKE_CXX_FLAGS=-DLIBYUV_DISABLE_NEON"]; + + buildInputs = [ libjpeg ]; + + meta = with lib; { + homepage = "https://chromium.googlesource.com/libyuv/libyuv"; + description = "Open source project that includes YUV scaling and conversion functionality"; + platforms = platforms.linux; + maintainers = with maintainers; [ leixb ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index 7965c934df3e..378a7202f371 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libzmf"; downloadPage = "http://dev-www.libreoffice.org/src/libzmf/"; - updateWalker = true; }; } diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 706408061907..3fcf03945bb3 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "lief"; - version = "0.11.5"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lief-project"; repo = "LIEF"; rev = version; - sha256 = "sha256-crYFBeX+YaIvVAv3uvGEeNCg+ZbUryr0NacDG56TUGE="; + sha256 = "sha256-ONU/geAkqVf8SDIi9dUvHxbJkmykHMCe2UVgUyRk0gg="; }; outputs = [ "out" "py" ]; diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix index 6d6e8c519de7..7e7edff6bffb 100644 --- a/pkgs/development/libraries/lime/default.nix +++ b/pkgs/development/libraries/lime/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "lime"; - version = "5.0.0"; + version = "5.0.53"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-11vvvA+pud/eOyYsbRKVvGfiyhwdhNPfRQSfaquUro8="; + sha256 = "sha256-M+KdauIVsN3c+cEPw4CaMzXnQZwAPNXeJCriuk9NCWM="; }; buildInputs = [ bctoolbox soci belle-sip sqlite boost ]; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 821edd333692..0f650e7474ff 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -14,13 +14,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "linbox"; - version = "1.6.3"; # TODO: Check postPatch script on update + version = "1.7.0"; src = fetchFromGitHub { owner = "linbox-team"; repo = pname; rev = "v${version}"; - sha256 = "10j6dspbsq7d2l4q3y0c1l1xwmaqqba2fxg59q5bhgk9h5d7q571"; + sha256 = "sha256-mW84a98KPLqcHMjX3LIYTmVe0ngUdz6RJLpoDaAqKU8="; }; nativeBuildInputs = [ @@ -35,20 +35,6 @@ stdenv.mkDerivation rec { fflas-ffpack ]; - patches = [ - # Remove inappropriate `const &` qualifiers on data members that can be - # modified via member functions. - # See also: https://github.com/linbox-team/linbox/pull/256 - ./patches/linbox-pr256-part2.patch # TODO: Remove on 1.7.0 update - ]; - - postPatch = '' - # Remove @LINBOXSAGE_LIBS@ that is actually undefined. - # See also: https://github.com/linbox-team/linbox/pull/249 - # TODO: Remove on 1.7.0 update - find . -type f -exec sed -e 's/@LINBOXSAGE_LIBS@//' -i {} \; - ''; - configureFlags = [ "--with-blas-libs=-lblas" "--disable-optimization" diff --git a/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch b/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch deleted file mode 100644 index ec8571a7d710..000000000000 --- a/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/linbox/algorithms/det-rational.h -+++ b/linbox/algorithms/det-rational.h -@@ -79,8 +79,8 @@ - struct MyRationalModularDet { - const Blackbox &A; - const MyMethod &M; -- const Integer &mul;//multiplicative prec; -- const Integer ÷ -+ Integer mul;//multiplicative prec; -+ Integer div; - - MyRationalModularDet(const Blackbox& b, const MyMethod& n, - const Integer & p1, const Integer & p2) : diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index 29531a299966..d3e3187bf757 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -1,21 +1,15 @@ { lib, stdenv, requireFile, cmake, libGLU, libGL, libX11, libXi }: -let - sourceInfo = rec { - version="1.1.0"; - name="liquidfun-${version}"; - url="https://github.com/google/liquidfun/releases/download/v${version}/${name}"; - hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86"; - }; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { + pname = "liquidfun"; + version = "1.1.0"; + src = requireFile { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - name = sourceInfo.name + ".tar.gz"; + url = "https://github.com/google/liquidfun/releases/download/v${version}/liquidfun-${version}"; + sha256 = "5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86"; + name = "liquidfun-${version}.tar.gz"; }; - inherit (sourceInfo) name version; nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU libGL libX11 libXi ]; @@ -34,15 +28,12 @@ stdenv.mkDerivation { cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out .. ''; - meta = { + meta = with lib; { description = "2D physics engine based on Box2D"; - maintainers = with lib.maintainers; - [ - qknight - ]; - platforms = lib.platforms.linux; - hydraPlatforms = []; - license = lib.licenses.bsd2; + maintainers = with maintainers; [ qknight ]; + platforms = platforms.linux; + hydraPlatforms = [ ]; + license = licenses.bsd2; homepage = "https://google.github.io/liquidfun/"; }; } diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix index 081fa2f175bb..1c1b57f39cb1 100644 --- a/pkgs/development/libraries/live555/default.nix +++ b/pkgs/development/libraries/live555/default.nix @@ -1,23 +1,38 @@ -{ stdenv, fetchurl, lib, darwin }: +{ lib +, stdenv +, fetchurl +, darwin +, openssl + +# major and only downstream dependency +, vlc +}: -# Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD stdenv.mkDerivation rec { pname = "live555"; - version = "2019.11.22"; + version = "2022.02.07"; - src = fetchurl { # the upstream doesn't provide a stable URL + src = fetchurl { urls = [ - "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" + "http://www.live555.com/liveMedia/public/live.${version}.tar.gz" "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" + "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" ]; - sha256 = "144y2wsfpaclkj7srx85f3y3parzn7vbjmzc2afc62wdsb9gn46d"; + sha256 = "sha256-bwwfinHOtQa8v5abArSww2l7ThXa623LqYcsh0XOksY="; }; + nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; + + buildInputs = [ openssl ]; + postPatch = '' - sed 's,/bin/rm,rm,g' -i genMakefiles - sed \ + substituteInPlace config.macosx-catalina \ + --replace '/usr/lib/libssl.46.dylib' "${openssl.out}/lib/libssl.dylib" \ + --replace '/usr/lib/libcrypto.44.dylib' "${openssl.out}/lib/libcrypto.dylib" + sed -i -e 's|/bin/rm|rm|g' genMakefiles + sed -i \ -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \ - -i config.linux + config.linux '' + lib.optionalString (stdenv ? glibc) '' substituteInPlace liveMedia/include/Locale.hh \ --replace '' '' @@ -27,7 +42,7 @@ stdenv.mkDerivation rec { runHook preConfigure ./genMakefiles ${{ - x86_64-darwin = "macosx"; + x86_64-darwin = "macosx-catalina"; i686-linux = "linux"; x86_64-linux = "linux-64bit"; aarch64-linux = "linux-64bit"; @@ -48,15 +63,18 @@ stdenv.mkDerivation rec { runHook postInstall ''; - nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; - enableParallelBuilding = true; + passthru.tests = { + inherit vlc; + }; + meta = with lib; { - description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; homepage = "http://www.live555.com/liveMedia/"; + description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; changelog = "http://www.live555.com/liveMedia/public/changelog.txt"; license = licenses.lgpl21Plus; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; broken = stdenv.hostPlatform.isAarch64; }; diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index a8d9b23cc84c..fb5409a7e727 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { description = "A lightweight C library for the Jabber protocol"; platforms = platforms.all; downloadPage = "http://mcabber.com/files/loudmouth/"; - downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$"; - updateWalker = true; license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/lpcnetfreedv/default.nix b/pkgs/development/libraries/lpcnetfreedv/default.nix index ac12d3a5fd6b..33b295b9a1ec 100644 --- a/pkgs/development/libraries/lpcnetfreedv/default.nix +++ b/pkgs/development/libraries/lpcnetfreedv/default.nix @@ -30,5 +30,6 @@ in stdenv.mkDerivation rec { description = "Experimental Neural Net speech coding for FreeDV"; license = licenses.bsd3; maintainers = with maintainers; [ mvs ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/lzlib/default.nix b/pkgs/development/libraries/lzlib/default.nix index 9c5311d742a9..d0064947c929 100644 --- a/pkgs/development/libraries/lzlib/default.nix +++ b/pkgs/development/libraries/lzlib/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchurl, texinfo }: +{ lib, stdenv, fetchurl, texinfo, lzip }: stdenv.mkDerivation rec { pname = "lzlib"; - version = "1.12"; + version = "1.13"; outputs = [ "out" "info" ]; - nativeBuildInputs = [ texinfo ]; + nativeBuildInputs = [ texinfo lzip ]; src = fetchurl { - url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-jl2EJC61LPHcyY5YvZuo7xrvpQFDGr3QJzoiv0zjN7E="; + url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz"; + sha256 = "sha256-3ea9WzJTXxeyjJrCS2ZgfgJQUGrBQypBEso8c/XWYsM="; }; - makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" ]; + makeFlags = [ "CC:=$(CC)" ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index 5f46ec313b15..791fae96f0fc 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.10.3"; + version = "0.10.4"; outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "sha256-SA4QyzV/aNUmyr9BYTsemx5x7S6WpxdTBK6zmVMkwh4="; + sha256 = "sha256-s2wQLb3tCfO3p8yYG8Nc6pu+y2TLfrmo7Ug1LgDLEdw="; }; patches = [ diff --git a/pkgs/development/libraries/mapbox-gl-qml/default.nix b/pkgs/development/libraries/mapbox-gl-qml/default.nix index 87e765766227..49a7f26220dd 100644 --- a/pkgs/development/libraries/mapbox-gl-qml/default.nix +++ b/pkgs/development/libraries/mapbox-gl-qml/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "mapbox-gl-qml"; - version = "1.7.6"; + version = "1.7.7.1"; src = fetchFromGitHub { owner = "rinigus"; repo = "mapbox-gl-qml"; rev = version; - sha256 = "sha256-E6Pkr8khzDbhmJxzK943+H6cDREgwAqMnJQ3hQWU7fw="; + hash = "sha256-lmL9nawMY8rNNBV4zNF4N1gn9XZzIZ9Cw2ZRs9bjBaI="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index e3b3f288cb5d..7a227e57560d 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "matio"; - version = "1.5.21"; + version = "1.5.22"; src = fetchurl { url = "mirror://sourceforge/matio/${pname}-${version}.tar.gz"; - sha256 = "sha256-IYCRd+VYOefJTa2nRO5Vwd6n11fdqriWBXdtUBIvsGU="; + sha256 = "sha256-gMPR4iLhFXaLV7feZAo30O58t6O9A52z6pQecfxSBMM="; }; meta = with lib; { diff --git a/pkgs/development/libraries/mauikit-filebrowsing/default.nix b/pkgs/development/libraries/mauikit-filebrowsing/default.nix index 326f4b67ee29..90053b16fc8c 100644 --- a/pkgs/development/libraries/mauikit-filebrowsing/default.nix +++ b/pkgs/development/libraries/mauikit-filebrowsing/default.nix @@ -10,14 +10,14 @@ mkDerivation rec { pname = "mauikit-filebrowsing"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "mauikit-filebrowsing"; rev = "v${version}"; - sha256 = "sha256-j6VoNtMkDB5BSET/RUiQlWdL0D1dAHlW929WNCDC+PE="; + hash = "sha256-2LzGvjh2t4RVZS9Js7ky3hM51L7bx0SHmDlKKPjl3LM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mauikit/default.nix b/pkgs/development/libraries/mauikit/default.nix index 88436dd5e638..22e3748fe48b 100644 --- a/pkgs/development/libraries/mauikit/default.nix +++ b/pkgs/development/libraries/mauikit/default.nix @@ -14,14 +14,14 @@ mkDerivation rec { pname = "mauikit"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "mauikit"; rev = "v${version}"; - sha256 = "sha256-dpJQSCog/AZ4ip8NTQMt4g1ntAnL1cjjMzxJz/uCxZA="; + hash = "sha256-INvh+J484xkAsNGtYdf8NGGpFGp2AG7s9UYESoem3QY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 9210f18ed962..8bba8f0efe0e 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { # versions. See # * https://github.com/NixOS/nixpkgs/pull/119838#issuecomment-822100428 # * https://github.com/NixOS/nixpkgs/commit/0ee02a9d42b5fe1825b0f7cee7a9986bb4ba975d - version = "2.26.0"; # nixpkgs-update: no auto update + version = "2.28.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = "${pname}-${version}"; - sha256 = "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m"; + sha256 = "sha256-VDoIUBaK2e0E5nkwU1u3Wvxc+s6OzBSdIeHsJKJuZ2g="; }; nativeBuildInputs = [ cmake ninja perl python3 ]; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 4ddd3b40d364..8ca137e66119 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mdds"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; - sha256 = "sha256-OrM/zljmrPlUDMGlImS+aGPvgPVawocZTMmM2kjnH+Y="; + sha256 = "sha256-EyEfLy44fvO3TXOh3O5Soa1c4G34+OZkdnnfknijEWo="; }; postInstall = '' diff --git a/pkgs/development/libraries/mdds/default.upstream b/pkgs/development/libraries/mdds/default.upstream deleted file mode 100644 index 96c5bc35d169..000000000000 --- a/pkgs/development/libraries/mdds/default.upstream +++ /dev/null @@ -1,10 +0,0 @@ -url https://gitlab.com/mdds/mdds -version_link 'mdds-.*[.]tar[.][a-z0-9]+$' -version '.*-([0-9.]+)[.]tar[.].*' '\1' - -do_overwrite(){ - ensure_hash - ensure_version - set_var_value version $CURRENT_VERSION - set_var_value sha256 $CURRENT_HASH -} diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 69f43d31da71..23163763ed9b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -33,7 +33,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.3.4"; + version = "21.3.7"; branch = versions.major version; self = stdenv.mkDerivation { @@ -47,18 +47,13 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "0zd6skf9qcwlk1k1ljgwijwlyz5si3pgi0h97gd6kkivm7a4y43p"; + sha256 = "0ggw3s514z6szasbiy4dv5mdi689121yy2xly2g21gv1mavrvyml"; }; # TODO: # revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog patches = [ - # To fix flickering on Intel GPUs (iris), see https://github.com/NixOS/nixpkgs/issues/153377: - (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/07dc3d4238e57901ccf98e0b506d9aad2c86b9d9.diff"; - sha256 = "sha256-3fa1qHJes3x1/iXsxfjgy9HnEGlOyFtJatSkU1a3XDI="; - }) # fixes pkgsMusl.mesa build ./musl.patch (fetchpatch { @@ -252,12 +247,14 @@ self = stdenv.mkDerivation { inherit (libglvnd) driverLink; inherit llvmPackages; - tests.devDoesNotDependOnLLVM = stdenv.mkDerivation { - name = "mesa-dev-does-not-depend-on-llvm"; - buildCommand = '' - echo ${self.dev} >>$out - ''; - disallowedRequisites = [ llvmPackages.llvm self.drivers ]; + tests = lib.optionalAttrs stdenv.isLinux { + devDoesNotDependOnLLVM = stdenv.mkDerivation { + name = "mesa-dev-does-not-depend-on-llvm"; + buildCommand = '' + echo ${self.dev} >>$out + ''; + disallowedRequisites = [ llvmPackages.llvm self.drivers ]; + }; }; }; diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index 1e9e44e09973..22d4567c562d 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja +, fetchpatch , secureBuild ? false }: @@ -7,14 +8,28 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "2.0.2"; + version = "2.0.5"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n4FGld3bq6ZOSLTzXcVlucCGbQ5/eSFbijU0dfBD/T0="; + sha256 = "sha256-q3W/w1Ofqt6EbKF/Jf9wcC+7jAxh59B3cOGxudWQXlA="; }; + patches = [ + (fetchpatch { + name = "older-macos-fixes.patch"; + url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch"; + sha256 = "15qx2a3axhhwbfzxdis98b8j14y9cfgca0i484aj2pjpqnm0pb8c"; + }) + ]; + + doCheck = true; + preCheck = let + ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in '' + export ${ldLibraryPathEnv}="$(pwd)/build:''${${ldLibraryPathEnv}}" + ''; nativeBuildInputs = [ cmake ninja ]; cmakeFlags = [ "-DMI_INSTALL_TOPLEVEL=ON" ] ++ lib.optional secureBuild [ "-DMI_SECURE=ON" ]; @@ -25,10 +40,9 @@ stdenv.mkDerivation rec { in '' # first, move headers and cmake files, that's easy mkdir -p $dev/lib - mv $out/include $dev/include - mv $out/cmake $dev/lib/ + mv $out/lib/cmake $dev/lib/ - find $out/lib + find $dev $out -type f '' + (lib.optionalString secureBuild '' # pretend we're normal mimalloc ln -sfv $out/lib/libmimalloc-secure${suffix} $out/lib/libmimalloc${suffix} @@ -44,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/microsoft/mimalloc"; license = licenses.bsd2; platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ kamadorueda thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 9bf5235db824..075f096486b4 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mxml"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "mxml"; rev = "v${version}"; - sha256 = "0zvib87rgsib0w9xp6bks5slq5ma1qbgyyyvr23cv7zkbgw3xgil"; + sha256 = "sha256-YN8g8KDk7xnDVK1io0zSLO7erxEp4VQ9heA7Lu/cUUg="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index bb62a9b3b2ba..1fb737ed7a75 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, zlib, autoreconfHook }: stdenv.mkDerivation { - name = "minizip-${zlib.version}"; + pname = "minizip"; + version = zlib.version; inherit (zlib) src; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index a4f0289cd58e..d3bcaa2658ba 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, makeWrapper -, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate, libexif +, SDL, ffmpeg_4, frei0r, libjack2, libdv, libsamplerate, libexif , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 -, gtk2, genericUpdater, common-updater-scripts, libebur128 +, gtk2, gitUpdater, libebur128 , jack2, ladspa-sdk, swig, which, ncurses , enablePython ? false, python3 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev + SDL ffmpeg_4 frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 jack2 ladspa-sdk ] ++ lib.optional enablePython ncurses; @@ -51,9 +51,8 @@ stdenv.mkDerivation rec { sed -i ${outPythonPath}/mlt/__init__.py -e "s|return importlib.import_module('_mlt')|return importlib.import_module('mlt._mlt')|g" ''; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; }; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 948de303cefa..5c58aa4f8aec 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -18,8 +18,7 @@ , vid-stab , opencv3 , ladspa-sdk -, genericUpdater -, common-updater-scripts +, gitUpdater , ladspaPlugins , mkDerivation , which @@ -70,9 +69,8 @@ mkDerivation rec { inherit ffmpeg; }; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; }; diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index 44f78daec72d..e1eaa1d924b7 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "mm-common"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6BWWYliZqs8dC/J8zC/Mfzc0BexIc1yhxyc8D7zcHvU="; + sha256 = "6VTAm0MJp++T4TtpJgrNxXOMkHR36zgbeLseQU7m29g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 570a123f8609..bff44d8aaf56 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -11,11 +11,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "4.0"; + version = "4.0.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "0r7zzcj8b9dbf5lp2d81wcvffi38c1zchkgzyxckk51adv4ijx6z"; + sha256 = "11rnljqwz6mr88ybj726mk710h7gvz20hy7labmz4jkkaa0gx8b6"; }; configureFlags = [ diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index b8ee4fb4e765..b7d31066de1a 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -21,6 +21,5 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; downloadPage = "https://mpir.org/downloads.html"; homepage = "https://mpir.org/"; - updateWalker = true; }; } diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 4e5eed1e4391..619ed721dff2 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "sha256-hTB0a5KXcQb0MCEX9YonDJOGlTmRkrOIP9UFlwuJc6g="; + sha256 = "sha256-iGw+qdw7heL5q7G0dwtl4PX2UA0Kka0FUmH610dM/00="; }; postPatch = '' diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 7997fc18d111..32987d649922 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -1,27 +1,38 @@ -{ lib, stdenv, fetchurl, openssl }: +{ lib +, stdenv +, fetchFromGitHub +, openssl +, cmake +}: stdenv.mkDerivation rec { pname = "mysocketw"; - version = "031026"; - src = fetchurl { - url = "https://www.digitalfanatics.org/cal/socketw/files/SocketW${version}.tar.gz"; - sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4"; + version = "3.11.0"; + + src = fetchFromGitHub { + owner = "RigsOfRods"; + repo = "socketw"; + rev = version; + hash = "sha256-mpfhmKE2l59BllkOjmURIfl17lAakXpmGh2x9SFSaAo="; }; - patches = [ ./gcc.patch ]; + nativeBuildInputs = [ + cmake + ]; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + ]; postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/Makefile \ --replace -Wl,-soname, -Wl,-install_name,$out/lib/ ''; - makeFlags = [ "PREFIX=$(out)" "CXX=${stdenv.cc.targetPrefix}c++" ]; - - meta = { + meta = with lib; { description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++"; - license = lib.licenses.lgpl21Plus; - platforms = lib.platforms.all; + homepage = "https://github.com/RigsOfRods/socketw"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/nanodbc/default.nix b/pkgs/development/libraries/nanodbc/default.nix new file mode 100644 index 000000000000..64f362e35202 --- /dev/null +++ b/pkgs/development/libraries/nanodbc/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, cmake, unixODBC }: + +stdenv.mkDerivation rec { + pname = "nanodbc"; + version = "2.13.0"; + + src = fetchFromGitHub { + owner = "nanodbc"; + repo = "nanodbc"; + rev = "v${version}"; + sha256 = "1q80p7yv9mcl4hyvnvcjdr70y8nc940ypf368lp97vpqn5yckkgm"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ unixODBC ]; + + cmakeFlags = if (stdenv.hostPlatform.isStatic) then + [ "-DBUILD_STATIC_LIBS=ON" ] + else + [ "-DBUILD_SHARED_LIBS=ON" ]; + + # fix compilation on macOS + # https://github.com/nanodbc/nanodbc/issues/274 + # remove after the next version update + postUnpack = if stdenv.isDarwin then '' + mv $sourceRoot/VERSION $sourceRoot/VERSION.txt + substituteInPlace $sourceRoot/CMakeLists.txt \ + --replace 'file(STRINGS VERSION' 'file(STRINGS VERSION.txt' + '' else ""; + + meta = with lib; { + homepage = "https://github.com/nanodbc/nanodbc"; + changelog = "https://github.com/nanodbc/nanodbc/raw/v${version}/CHANGELOG.md"; + description = "Small C++ wrapper for the native C ODBC API"; + license = licenses.mit; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index 0dbbd461dc21..477ff27078bf 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -1,14 +1,14 @@ {lib, stdenv, fetchFromGitHub, cmake}: stdenv.mkDerivation rec { - version = "1.3.2"; + version = "1.4.2"; pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${version}"; - sha256 = "0lq1zqwjvk8wv15hd7aw57jsqbvv45cwb8ngdh1d2iyw5rvnbhsn"; + sha256 = "sha256-znIX1S0mfOqLYPIcyVziUM1asBjENPEAdafLud1CfFI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ncnn/default.nix b/pkgs/development/libraries/ncnn/default.nix index d53e0d9b42ea..8c0f213b8298 100644 --- a/pkgs/development/libraries/ncnn/default.nix +++ b/pkgs/development/libraries/ncnn/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20211208"; + version = "20220216"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - sha256 = "1c9axrnafksnks7v5fmi6nzs0qim9n6j5kh5d0vfl3b4r22irhqr"; + sha256 = "sha256-QHLD5NQZA7WR4mRQ0NIaXuAu59IV4SjXHOOlar5aOew="; }; patches = [ diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index f6ca87a5e96a..9d90e399ca77 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nco"; - version = "5.0.4"; + version = "5.0.6"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = version; - sha256 = "sha256-hE3TSfZoKqiUEcLO+Q3xAjhyDPNqoq7+FGlKNpm8hjY="; + sha256 = "sha256-LmxHgSBBqXK5M4KOthd8R+H5EY3O5lueb2gnw5mK8Xw="; }; nativeBuildInputs = [ flex which antlr2 ]; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 6c97b37a25fe..2740b95986c9 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # Note the revision needs to be adjusted. version = "6.3"; - name = "ncurses-${version}" + lib.optionalString (abiVersion == "5") "-abi5-compat"; + pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat"; # We cannot use fetchFromGitHub (which calls fetchzip) # because we need to be able to use fetchurlBoot. @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { "--enable-symlinks" "--with-manpage-format=normal" "--disable-stripping" + "--with-versioned-syms" ] ++ lib.optional unicodeSupport "--enable-widec" ++ lib.optional (!withCxx) "--without-cxx" ++ lib.optional (abiVersion == "5") "--with-abi-version=5" diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix index a45884f72dc6..2e8a997299f1 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ndpi"; - version = "4.0"; + version = "4.2"; src = fetchFromGitHub { owner = "ntop"; repo = "nDPI"; rev = version; - sha256 = "0snzvlracc6s7r2pgdn0jqcc7nxjxzcivsa579h90g5ibhhplv5x"; + sha256 = "sha256-ZWWuyPGl+hbrfXdtPvCBqMReuJ4FiGx+qiI7qCz6wtQ="; }; configureScript = "./autogen.sh"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nDPI is a library for deep-packet inspection based on OpenDPI. ''; homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/"; - license = with licenses; lgpl3; + license = with licenses; [ lgpl3Plus bsd3 ]; maintainers = with maintainers; [ takikawa ]; platforms = with platforms; unix; }; diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix deleted file mode 100644 index e0437fb7cea1..000000000000 --- a/pkgs/development/libraries/neon/0.29.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, libxml2, pkg-config, perl -, compressionSupport ? true, zlib ? null -, sslSupport ? true, openssl ? null -, static ? false -, shared ? true -}: - -assert compressionSupport -> zlib != null; -assert sslSupport -> openssl != null; -assert static || shared; - -let - inherit (lib) optionals; -in - -stdenv.mkDerivation rec { - version = "0.29.6"; - pname = "neon"; - - src = fetchurl { - url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; - sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; - }; - - patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [libxml2 openssl] - ++ lib.optional compressionSupport zlib; - - configureFlags = [ - (lib.enableFeature shared "shared") - (lib.enableFeature static "static") - (lib.withFeature compressionSupport "zlib") - (lib.withFeature sslSupport "ssl") - ]; - - passthru = {inherit compressionSupport sslSupport;}; - - checkInputs = [ perl ]; - doCheck = false; # fails, needs the net - - meta = with lib; { - description = "An HTTP and WebDAV client library"; - homepage = "http://www.webdav.org/neon/"; - platforms = platforms.unix; - license = licenses.lgpl2; - }; -} diff --git a/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch b/pkgs/development/libraries/neon/darwin-fix-configure.patch similarity index 100% rename from pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch rename to pkgs/development/libraries/neon/darwin-fix-configure.patch diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index 739c5e07d206..1521c1a63895 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -14,15 +14,15 @@ let in stdenv.mkDerivation rec { - version = "0.31.2"; + version = "0.32.2"; pname = "neon"; src = fetchurl { url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0y46dbhiblcvg8k41bdydr3fivghwk73z040ki5825d24ynf67ng"; + sha256 = "sha256-mGVmRoxilfxdD7FBpZgeMcn4LuOOk4N0q+2Ece8vsoY="; }; - patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; + patches = optionals stdenv.isDarwin [ ./darwin-fix-configure.patch ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [libxml2 openssl] diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 711097757220..27af3be4f2df 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -10,11 +10,11 @@ let inherit (hdf5) mpiSupport mpi; in stdenv.mkDerivation rec { - pname = "netcdf"; + pname = "netcdf" + lib.optionalString mpiSupport "-mpi"; version = "4.8.0"; # Remove patch mentioned below on upgrade src = fetchurl { - url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${pname}-c-${version}.tar.gz"; + url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-c-${version}.tar.gz"; sha256 = "1mfn8qi4k0b8pyar3wa8v0npj69c7rhgfdlppdwmq5jqk88kb5k7"; }; diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix index 348faf56b56a..44afdf45513f 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -5,9 +5,9 @@ }: stdenv.mkDerivation { - name = "nettle-${version}"; + pname = "nettle"; - inherit src; + inherit version src; outputs = [ "out" "dev" ]; outputBin = "dev"; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 86edacc6166b..bd639ec3041a 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -10,6 +10,10 @@ , enableJemalloc ? false, jemalloc ? null , enableApp ? with stdenv.hostPlatform; !isWindows && !isStatic , enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null + +# downstream dependencies, for testing +, curl +, libsoup }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -73,6 +77,10 @@ stdenv.mkDerivation rec { #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc + passthru.tests = { + inherit curl libsoup; + }; + meta = with lib; { homepage = "https://nghttp2.org/"; description = "A C implementation of HTTP/2"; diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix index 21b9fdf419c8..fc2416c2cfb0 100644 --- a/pkgs/development/libraries/nghttp3/default.nix +++ b/pkgs/development/libraries/nghttp3/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config -, cunit, file +, cunit, file, ncurses }: stdenv.mkDerivation rec { @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-pV1xdQa5RBz17jDINC2uN1Q+jpa2edDwqTqf8D5VU3E="; }; - nativeBuildInputs = [ autoreconfHook pkg-config cunit file ]; + nativeBuildInputs = [ autoreconfHook pkg-config file ]; + checkInputs = [ cunit ncurses ]; preConfigure = '' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file @@ -23,12 +24,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; doCheck = true; + enableParallelBuilding = true; meta = with lib; { homepage = "https://github.com/ngtcp2/nghttp3"; description = "nghttp3 is an implementation of HTTP/3 mapping over QUIC and QPACK in C."; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ izorkin ]; }; } diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix index 385f2d84f8a6..e42ee750cc09 100644 --- a/pkgs/development/libraries/ngt/default.nix +++ b/pkgs/development/libraries/ngt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "NGT"; - version = "v1.12.3-alpha"; + version = "1.12.3-alpha"; src = fetchFromGitHub { owner = "yahoojapan"; diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index dfe07c39e326..650516d360cf 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config -, cunit, file -, jemalloc, libev, nghttp3, quictls +, cunit, file, ncurses +, libev, nghttp3, quictls +, withJemalloc ? false, jemalloc }: stdenv.mkDerivation rec { @@ -15,8 +16,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-uBmD26EYT8zxmHD5FuHCbEuTdWxer/3uhRp8PhUT87M="; }; - nativeBuildInputs = [ autoreconfHook pkg-config cunit file ]; - buildInputs = [ jemalloc libev nghttp3 quictls ]; + nativeBuildInputs = [ autoreconfHook pkg-config file ]; + buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc; + checkInputs = [ cunit ncurses ]; preConfigure = '' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file @@ -25,12 +27,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; doCheck = true; + enableParallelBuilding = true; meta = with lib; { homepage = "https://github.com/ngtcp2/ngtcp2"; description = "ngtcp2 project is an effort to implement QUIC protocol which is now being discussed in IETF QUICWG for its standardization."; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ izorkin ]; }; } diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index ea216335b7af..279c8a0fd054 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct" ]; + postFixup = '' + substituteInPlace $out/lib/cmake/nlopt/NLoptLibraryDepends.cmake --replace \ + 'INTERFACE_INCLUDE_DIRECTORIES "''${_IMPORT_PREFIX}/' 'INTERFACE_INCLUDE_DIRECTORIES "' + ''; + meta = { homepage = "https://nlopt.readthedocs.io/en/latest/"; description = "Free open-source library for nonlinear optimization"; diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix index 444cc5034e67..d23401c0fb49 100644 --- a/pkgs/development/libraries/notcurses/default.nix +++ b/pkgs/development/libraries/notcurses/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "notcurses"; - version = "3.0.3"; + version = "3.0.7"; src = fetchFromGitHub { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "sha256-jIUIr7roX9ciYkNmvS9m14RdNgFTElwrKadYzi0lCP0="; + sha256 = "sha256-tFdxQEYmSFr3GlJMud2ICToR+IB5sGnQkARUd/LtJXg="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index e92b3dec07be..d17f4c4a7835 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -27,7 +27,7 @@ let # It will rebuild itself using the version of this package (NSS) and if # an update is required do the required changes to the expression. # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert - version = "3.74"; + version = "3.75"; in stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings [ "." ] [ "_" ] version}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0mnhdkm4galhpvfz4rv0918jwmjlwkvcvb1f5va8f3zlz48qi4l8"; + sha256 = "10l5qn68gly2l4ifv0v6by1qc8nsmhra08nm9m7n913jh83iamzx"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 033b9d8c6197..a10434d90b41 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python2 }: +{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python3 }: stdenv.mkDerivation rec { pname = "ntrack"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnl qt4 ]; - nativeBuildInputs = [ pkg-config python2 ]; + nativeBuildInputs = [ pkg-config python3 ]; # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index b7f438e9d072..a9e0bb4ea68f 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "039ryhwfbbrrhavzyr999kngj10nk9n81i6qigxj6igfl4fzjy87"; + sha256 = "sha256-ogA7ycqdMUTN/KHV2oZzytnhZ7XVuhx+ArXZqLlmwjk="; }; nativeBuildInputs = [ cmake pkg-config pandoc ]; diff --git a/pkgs/development/libraries/nv-codec-headers/11_x.nix b/pkgs/development/libraries/nv-codec-headers/11_x.nix index a4bdd600282d..284905cd4aa3 100644 --- a/pkgs/development/libraries/nv-codec-headers/11_x.nix +++ b/pkgs/development/libraries/nv-codec-headers/11_x.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "nv-codec-headers"; - version = "11.1.5.0"; + version = "11.1.5.1"; src = fetchgit { url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git"; rev = "n${version}"; - sha256 = "5d6LCKQB31UZ0veanSeKJVrPkJ8o2nvQWRfIG8YuekM="; + sha256 = "sha256-yTOKLjyYLxT/nI1FBOMwHpkDhfuua3+6Z5Mpb7ZrRhU="; }; makeFlags = [ diff --git a/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix new file mode 100644 index 000000000000..1ba000a8103b --- /dev/null +++ b/pkgs/development/libraries/nvidia-vaapi-driver/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, fetchFromGitHub +, lib +, meson +, ninja +, pkg-config +, libGL +, gst_all_1 +, nv-codec-headers-11 +, libva +, addOpenGLRunpath +}: + +stdenv.mkDerivation rec { + pname = "nvidia-vaapi-driver"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "elFarto"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2bycqKolVoaHK64XYcReteuaON9TjzrFhaG5kty28YY="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + addOpenGLRunpath + ]; + + buildInputs = [ + libGL + gst_all_1.gstreamer + gst_all_1.gst-plugins-bad + nv-codec-headers-11 + libva + ]; + + postFixup = '' + addOpenGLRunpath "$out/lib/dri/nvidia_drv_video.so" + ''; + + meta = with lib;{ + homepage = "https://github.com/elFarto/nvidia-vaapi-driver"; + description = "A VA-API implemention using NVIDIA's NVDEC"; + license = licenses.mit; + maintainers = with maintainers;[ nickcao ]; + }; +} diff --git a/pkgs/development/libraries/okapi/default.nix b/pkgs/development/libraries/okapi/default.nix index e9b0b95d1af8..c8981c54c114 100644 --- a/pkgs/development/libraries/okapi/default.nix +++ b/pkgs/development/libraries/okapi/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "okapi"; - version = "1.2.0"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/trinsic-id/okapi/releases/download/v${version}/okapi-vendor-${version}.tar.gz"; - sha256 = "sha256-1aADcwEEWMhoJjwc8wkEcmBYXz+5josOfI/KLaton2k="; + sha256 = "sha256-wNruDPjYHDJtpzQIly4da9rQg1ftdCVxRNNLkFsbKXs="; }; cargoVendorDir = "vendor"; diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index baae8ae81b72..6392383c983f 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.9"; + version = "3.2.10"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "1vcxxnhsskvnkmk5ial31mvbhs1jwriw8ngyhfslbd30fr9ylw08"; + sha256 = "0v0w98m11r2rqvlrxssnzhqkaxmpbi5s3rkk3csfzhhkpgiv46km"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index d28f7b25792e..d2cdebdf3553 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -23,9 +23,12 @@ stdenv.mkDerivation rec { --replace "@OUT@" $out ''; + strictDeps = true; + nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional alsaSupport alsa-lib + buildInputs = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.cc.libc + ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; diff --git a/pkgs/development/libraries/openbabel/2.nix b/pkgs/development/libraries/openbabel/2.nix index 627d5bbe2978..3e989561470c 100644 --- a/pkgs/development/libraries/openbabel/2.nix +++ b/pkgs/development/libraries/openbabel/2.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python2, cairo, pcre, pkg-config }: +{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python3, cairo, pcre, pkg-config }: stdenv.mkDerivation rec { pname = "openbabel"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ zlib libxml2 eigen python2 cairo pcre ]; + buildInputs = [ zlib libxml2 eigen python3 cairo pcre ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 661fd734d886..879a916d3ea6 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -2,7 +2,7 @@ }: stdenv.mkDerivation rec { - name = "opencl-headers-${version}"; + pname = "opencl-headers"; version = "2021.06.30"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index d785146ecb07..2cd76a7ca78b 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.3.1"; + version = "2.3.5"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "sha256-Os5PRYTZMVekQrbwNODWsHANTx6RSC5vzGJ5JoYtvtE="; + sha256 = "sha256-GGaq8ziOCUDMxILq2QYUkSP4usBjbufbHwQF4Pr6hHw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index 3858cb4dc2d5..42ae370cd901 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -1,22 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, nasm }: +{ lib, stdenv, fetchFromGitHub, nasm, windows }: stdenv.mkDerivation rec { pname = "openh264"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "cisco"; repo = pname; rev = "v${version}"; - sha256 = "0ffav46pz3sbj92nipd62z03fibyqgclfq9w8lgr80s6za6zdk5s"; + sha256 = "sha256-l64xP39Uaislqh4D7oSxJiQGhXkklol4LgS9BVPbaGk="; }; nativeBuildInputs = [ nasm ]; + buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.pthreads; + makeFlags = [ "PREFIX=${placeholder "out"}" "ARCH=${stdenv.hostPlatform.linuxArch}" - ]; + ] ++ lib.optional stdenv.hostPlatform.isWindows "OS=mingw_nt"; + + enableParallelBuilding = true; + + hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "stackprotector"; meta = with lib; { description = "A codec library which supports H.264 encoding and decoding"; diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix index f1bbb01653f2..8d02b976c91f 100644 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ b/pkgs/development/libraries/openimagedenoise/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "openimagedenoise"; - version = "1.4.2"; + version = "1.4.3"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; - sha256 = "sha256-+7o7b64ORCLn8z0KbnUKhlgPs9mlyDCUiNKJEbusGxw="; + sha256 = "sha256-i73w/Vkr5TPLB1ulPbPU4OVGwdNlky1brfarueD7akE="; }; nativeBuildInputs = [ cmake python3 ispc ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index bbf5bd9aa16d..33ddbf7018c5 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -9,11 +9,6 @@ , withPerl ? stdenv.hostPlatform == stdenv.buildPlatform }: -assert ( - lib.assertMsg (!withPerl -> stdenv.hostPlatform != stdenv.buildPlatform) - "withPerl should not be disabled unless cross compiling" -); - # 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 @@ -191,8 +186,8 @@ in { }; openssl_1_1 = common rec { - version = "1.1.1m"; - sha256 = "sha256-+JGZvosjykX8fLnx2NPuZzEjGChq0DD1MWrKZGLbbJY="; + version = "1.1.1n"; + sha256 = "sha256-QNzrUaT2pSdb3g5r8g70uRv8Mu1XwFUuLo4VRjNysXo="; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -206,8 +201,8 @@ in { }; openssl_3_0 = common { - version = "3.0.1"; - sha256 = "sha256-wxGthTNTvOeW7a0BqGLFCopYf2Ln4hAO9GWrU+ybBtE="; + version = "3.0.2"; + sha256 = "sha256-mOkczq1NR1auPJzeXgkZGo5YbZ9NUIOOfsCdZBHf22M="; patches = [ ./3.0/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index f55f9e83aec4..514cbcea4a12 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.20"; + version = "1.0.22"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-afyAHTyW9x2KxR1q/K3t5Dpv9OzATcYiSgiDn2S924E="; + sha256 = "sha256-YaK7scnfXkxhRe/PKZukqHD9X70X0/QUDL0znTPbIBE="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index 1058eaa1f631..2c43cfb4cc90 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6Libn+S5c7sCmKGq8KojiUhI18zO37rgiiVwQxP3p4o="; + sha256 = "sha256-lrc4VEqmCp/P/h0+5/ix6tx4pjfkLy9BLBZtKYLlyGI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/osip/default.upstream b/pkgs/development/libraries/osip/default.upstream deleted file mode 100644 index ba0ed2a9b299..000000000000 --- a/pkgs/development/libraries/osip/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url http://ftp.u-tx.net/gnu/osip/ -attribute_name libosip -minimize_overwrite diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 34a3788d7860..df6e364d2e9a 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,34 +1,61 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, which -, gettext, libffi, libiconv, libtasn1 +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, docbook-xsl-nons +, gtk-doc +, installShellFiles +, libxslt # for xsltproc +, pkg-config +, which +, libffi +, libiconv +, libintl +, libtasn1 }: stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - sha256 = "sha256-jvUzOhMvbq05SxQ+kjKQHDDMzNwo4U6nFHu3JjygJHw="; + hash = "sha256-1QIMEGBZsqLYU3v5ZswD5K9VcIGLBovJlC10lBHhH7c="; }; - outputs = [ "out" "dev"]; - outputBin = "dev"; + outputs = [ "out" "bin" "dev"]; - # for cross platform builds of p11-kit, libtasn1 in nativeBuildInputs + # For cross platform builds of p11-kit, libtasn1 in nativeBuildInputs # provides the asn1Parser binary on the hostPlatform needed for building. # at the same time, libtasn1 in buildInputs provides the libasn1 library # to link against for the target platform. - # hence, libtasn1 is required in both native and build inputs. - nativeBuildInputs = [ autoreconfHook pkg-config which libtasn1 ]; - buildInputs = [ gettext libffi libiconv libtasn1 ]; + # Hence, libtasn1 is required in both native and build inputs. + nativeBuildInputs = [ + autoreconfHook + docbook-xsl-nons + gtk-doc + installShellFiles + libtasn1 + libxslt.bin + pkg-config + which + ]; + + buildInputs = [ + libffi + libiconv + libintl + libtasn1 + ]; autoreconfPhase = '' NOCONFIGURE=1 ./autogen.sh ''; configureFlags = [ + "--enable-doc" "--sysconfdir=/etc" "--localstatedir=/var" "--with-trust-paths=${lib.concatStringsSep ":" [ @@ -53,6 +80,10 @@ stdenv.mkDerivation rec { "exampledir=${placeholder "out"}/etc/pkcs11" ]; + postInstall = '' + installShellCompletion --bash bash-completion/{p11-kit,trust} + ''; + meta = with lib; { description = "Library for loading and sharing PKCS#11 modules"; longDescription = '' @@ -61,6 +92,10 @@ stdenv.mkDerivation rec { PKCS#11 modules in such a way that they're discoverable. ''; homepage = "https://p11-glue.github.io/p11-glue/p11-kit.html"; + changelog = [ + "https://github.com/p11-glue/p11-kit/raw/${version}/NEWS" + "https://github.com/p11-glue/p11-kit/releases/tag/${version}" + ]; platforms = platforms.all; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix index abef3d6cd1dd..dfb70ab624e1 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -5,21 +5,22 @@ , nlopt , ipopt , boost +, tbb }: stdenv.mkDerivation rec { pname = "pagmo2"; - version = "2.9"; + version = "2.18.0"; src = fetchFromGitHub { owner = "esa"; repo = "pagmo2"; rev = "v${version}"; - sha256 = "0al2i59m5qr83wz5n5408zvys0b3mc40rszf0l5b9a0gp1axj400"; + sha256 = "0rd8scs4hj6qd8ylmn5hafncml2vr4fvcgm3agz3jrvmnc7hadrj"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen nlopt ipopt boost ]; + buildInputs = [ eigen nlopt ipopt boost tbb ]; cmakeFlags = [ "-DPAGMO_BUILD_TESTS=no" diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 964a3640871f..ee79d5370594 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation rec { pname = "pango"; - version = "1.50.3"; + version = "1.50.6"; outputs = [ "bin" "out" "dev" ] ++ lib.optionals withDocs [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "St0F7fUcH7N1oczedJiRQSDiPLKA3XOVsa60QfGDikw="; + sha256 = "qZi882iBw6wgSV1AvOswT06qkXW9KWfIVlZDTL2v6Go="; }; strictDeps = !withIntrospection; @@ -84,12 +84,9 @@ stdenv.mkDerivation rec { doCheck = false; # test-font: FAIL - postInstall = lib.optionalString withDocs '' - # So that devhelp can find this. - # https://gitlab.gnome.org/GNOME/pango/merge_requests/293/diffs#note_1058448 - mkdir -p "$devdoc/share/devhelp" - mv "$out/share/doc/pango/reference" "$devdoc/share/devhelp/books" - rmdir -p --ignore-fail-on-non-empty "$out/share/doc/pango" + postFixup = lib.optionalString withDocs '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = { diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 9722210b9d10..95acc77922ee 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; maintainers = [ maintainers.linus ]; - repositories.git = "git://github.com/imneme/pcg-c.git"; broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11 }; } diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 724a1b1247a2..8393cb8c5910 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { pname = "pcre2"; - version = "10.37"; + version = "10.39"; src = fetchurl { url = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${version}/pcre2-${version}.tar.bz2"; - hash = "sha256-TZWpbouAUpiTtFYr4SZI15i5V7G6Gq45YGu8KrlW0nA="; + hash = "sha256-DwPK9X+B2f82KsKM04nAVewr8GeNJ3NJoaS+4ArW1EA="; }; # Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51 diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix index 2dfd35466858..c45a8e03fd16 100644 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation { meta = with lib; { description = "PDF to XML converter"; + homepage = "https://sourceforge.net/projects/pdf2xml/"; platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix index 8d3f3e987023..4596c5aaf4f6 100644 --- a/pkgs/development/libraries/phash/default.nix +++ b/pkgs/development/libraries/phash/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { platforms = platforms.all; homepage = "http://www.phash.org"; downloadPage = "https://github.com/clearscene/pHash"; - updateWalker = true; }; } diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 8ff0f3bb4917..42923d4f026b 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "phonon-backend-vlc"; - version = "0.11.2"; + version = "0.11.3"; src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-xsM7/GjRN/DlegKeS3mMu5D1Svb3Ma9JZ3hXeRzNU6U="; + sha256 = "sha256-Xmn97MsGDH5rWSTO8uZb7loIrOQScAW5U0TtMHfcY5c="; }; buildInputs = [ @@ -33,9 +33,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://phonon.kde.org/"; + homepage = "https://community.kde.org/Phonon"; + # Dev repo is at https://invent.kde.org/libraries/phonon-vlc description = "GStreamer backend for Phonon"; platforms = platforms.linux; - license = with licenses; [ bsd3 lgpl2Plus ]; + license = with licenses; [ bsd3 lgpl21Plus ]; }; } diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix index d87c9d68b715..9f1b396e4759 100644 --- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet-contrib"; - version = "1.046"; + version = "1.048"; src = fetchurl { - url = "http://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "sha256-cgavrH/rIHXZn7sDa7NRPTKy2sOvMDQQJjmGNUeT7s8="; + url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; + sha256 = "sha256-+ZidO2rrIoSLz5EJXDBgfwJ9PvJ3pPD3BKjw/C52aYE="; }; buildInputs = [ fastjet ]; @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Third party extensions for FastJet"; homepage = "http://fastjet.fr/"; - license = licenses.gpl2; + changelog = "https://phab.hepforge.org/source/fastjetsvn/browse/contrib/tags/${version}/NEWS?as=source&blame=off"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix index e9b7f54e2a48..18809654c467 100644 --- a/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/pkgs/development/libraries/physics/geant4/datasets.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, geant_version }: let - mkDataset = { name, version, sha256, envvar }: + mkDataset = { pname, version, sha256, envvar }: stdenv.mkDerivation { - inherit name version; + inherit pname version; inherit geant_version; src = fetchurl { - url = "https://cern.ch/geant4-data/datasets/${name}.${version}.tar.gz"; + url = "https://cern.ch/geant4-data/datasets/${pname}.${version}.tar.gz"; inherit sha256; }; @@ -15,7 +15,7 @@ let dontBuild = true; dontConfigure = true; - datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${name}${version}"; + datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${pname}${version}"; installPhase = '' mkdir -p $datadir mv ./* $datadir @@ -32,86 +32,86 @@ let }; }; in - builtins.listToAttrs (map (a: { inherit (a) name; value = mkDataset a; }) [ + builtins.listToAttrs (map (a: { name = a.pname; value = mkDataset a; }) [ { - name = "G4NDL"; + pname = "G4NDL"; version = "4.6"; sha256 = "sha256-nSh88q4PuIeirc6AHudPub4hsNFm2rSby+6UCKUUVAg="; envvar = "NEUTRONHP"; } { - name = "G4EMLOW"; + pname = "G4EMLOW"; version = "8.0"; sha256 = "sha256-2Rmo5YOGiCV7kkimE5EOsqdjMFngMMi1DAosKtn9Kzs="; envvar = "LE"; } { - name = "G4PhotonEvaporation"; + pname = "G4PhotonEvaporation"; version = "5.7"; sha256 = "sha256-dh5C5W/93j2YOfn52BAmB8a0wDKRUe5Rggb07p535+U="; envvar = "LEVELGAMMA"; } { - name = "G4RadioactiveDecay"; + pname = "G4RadioactiveDecay"; version = "5.6"; sha256 = "sha256-OIYHfJyOWph4PmcY4cMlZ4me6y27M+QC1Edrwv5PDfE="; envvar = "RADIOACTIVE"; } { - name = "G4SAIDDATA"; + pname = "G4SAIDDATA"; version = "2.0"; sha256 = "sha256-HSao55uqceRNV1m59Vpn6Lft4xdRMWqekDfYAJDHLpE="; envvar = "SAIDXS"; } { - name = "G4PARTICLEXS"; + pname = "G4PARTICLEXS"; version = "4.0"; sha256 = "sha256-k4EDlwPD8rD9NqtJmTYqLItP+QgMMi+QtOMZKBEzypU="; envvar = "PARTICLEXS"; } { - name = "G4ABLA"; + pname = "G4ABLA"; version = "3.1"; sha256 = "sha256-dpiwUrWL8bmIa+rNvWr2B63B4Jn8cwq2shz38JDAJ+0="; envvar = "ABLA"; } { - name = "G4INCL"; + pname = "G4INCL"; version = "1.0"; sha256 = "sha256-cWFhghrp89BWX788LPNPTgLj5RnrQZqCI27vIsLENn0="; envvar = "INCL"; } { - name = "G4PII"; + pname = "G4PII"; version = "1.3"; sha256 = "sha256-YiWtkCZ19DgcmMa6JfxaBs6HVJqpeWNNPQNJHWYW6SY="; envvar = "PII"; } { - name = "G4ENSDFSTATE"; + pname = "G4ENSDFSTATE"; version = "2.3"; sha256 = "sha256-lETF4IIHkavTzKrOEFsOR3kPrc4obhEUmDTnnEqOkgM="; envvar = "ENSDFSTATE"; } { - name = "G4RealSurface"; + pname = "G4RealSurface"; version = "2.2"; sha256 = "sha256-mVTe4AEvUzEmf3g2kOkS5y21v1Lqm6vs0S6iIoIXaCA="; envvar = "REALSURFACE"; } { - name = "G4TENDL"; + pname = "G4TENDL"; version = "1.4"; sha256 = "sha256-S3J0AgzItO1Wm4ku8YwuCI7c22tm850lWFzO4l2XIeA="; envvar = "PARTICLEHP"; diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index 629066d23a4e..c3171c589ee4 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "hepmc3"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC3-${version}.tar.gz"; - sha256 = "sha256-4Ij8z9GmwvjhCJ9FcQG+4eXHqXd+nVHGQZyKKIpJ4bs="; + sha256 = "sha256-zQ91yA91VJxZzCqCns52Acd96Xyypat1eQysjh1YUDI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 03b298908bb0..d33beb665998 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.306"; + version = "8.307"; src = fetchurl { url = "https://pythia.org/download/pythia83/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "sha256-c0gDtyKxwbU8jPLw08MHR8gPwt3l4LoUG8k5fa03qPY="; + sha256 = "sha256-5bFNRKpZQzMuMt1d2poY/dGgCFxxmOKNhA4EFn+mAT0="; }; nativeBuildInputs = [ rsync ]; diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix index 3db4ff336ffb..eb98c2f9ef6b 100644 --- a/pkgs/development/libraries/pico-sdk/default.nix +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pico-sdk"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "00z160f7ypws5pzp1ql7xrs3gmjcbw6gywnnq2fiwl47940balns"; + sha256 = "sha256-cc1UTc1aswtJzuaUdYNcCzLtQ9+Wggiy/eRE+UoxSgE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/pipewire/0.2.nix b/pkgs/development/libraries/pipewire/0.2.nix index d21ceafbcf9d..16c8d5d25128 100644 --- a/pkgs/development/libraries/pipewire/0.2.nix +++ b/pkgs/development/libraries/pipewire/0.2.nix @@ -28,6 +28,11 @@ in stdenv.mkDerivation rec { alsa-lib ffmpeg_4 libjack2 udev libva xorg.libX11 sbc SDL2 ]; + # Workaround build on gcc-10+ and clang11+: + # spa/plugins/bluez5/libspa-bluez5.so.p/bluez5-monitor.c.o:(.bss+0x0): + # multiple definition of `spa_a2dp_sink_factory' + NIX_CFLAGS_COMPILE = [ "-fcommon" ]; + mesonFlags = [ "-Ddocs=true" "-Dgstreamer=enabled" diff --git a/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch b/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch index 84238bf6e5aa..230f1b30394a 100644 --- a/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch +++ b/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch @@ -1,19 +1,19 @@ diff --git a/meson_options.txt b/meson_options.txt -index 71c2e35e9..a0f380c04 100644 +index 961ae2a76..692b84dfd 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -176,6 +176,9 @@ option('udev', +@@ -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-user-unit-dir', + option('systemd-system-unit-dir', type : 'string', - description : 'Directory for user systemd units (defaults to /usr/lib/systemd/user)') + 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 5bd134537..5a3ca9ed5 100644 +index d17f3794f..34afe4f1a 100644 --- a/src/daemon/systemd/user/meson.build +++ b/src/daemon/systemd/user/meson.build @@ -9,7 +9,7 @@ install_data( diff --git a/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch b/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch index 926de3062546..b2bcb421befb 100644 --- a/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch +++ b/pkgs/development/libraries/pipewire/0070-installed-tests-path.patch @@ -1,23 +1,23 @@ diff --git a/meson.build b/meson.build -index d4a4cda7..a27569bd 100644 +index 2107c19ec..20ccdfd9f 100644 --- a/meson.build +++ b/meson.build -@@ -353,8 +353,8 @@ libinotify_dep = (build_machine.system() == 'freebsd' - - alsa_dep = dependency('alsa', version : '>=1.1.7', required: get_option('pipewire-alsa')) +@@ -380,8 +380,8 @@ lilv_lib = dependency('lilv-0', required: get_option('lv2')) + summary({'lilv (for lv2 plugins)': lilv_lib.found()}, bool_yn: true) + cdata.set('HAVE_LILV', lilv_lib.found()) -installed_tests_metadir = pipewire_datadir / 'installed-tests' / pipewire_name -installed_tests_execdir = pipewire_libexecdir / 'installed-tests' / pipewire_name +installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / pipewire_name +installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / 'installed-tests' / pipewire_name - installed_tests_enabled = not get_option('installed_tests').disabled() + installed_tests_enabled = get_option('installed_tests').allowed() installed_tests_template = files('template.test.in') diff --git a/meson_options.txt b/meson_options.txt -index 1b915ac3..85beb86a 100644 +index 961ae2a76..a36e9e45f 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -29,6 +29,9 @@ option('installed_tests', +@@ -22,6 +22,9 @@ option('installed_tests', description: 'Install manual and automated test executables', type: 'feature', value: 'disabled') diff --git a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch index ea968e28ea89..b4c9f8ed2aab 100644 --- a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch @@ -1,8 +1,8 @@ -diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in -index 648e13069..50f767f0c 100644 ---- a/src/daemon/pipewire.conf.in -+++ b/src/daemon/pipewire.conf.in -@@ -131,7 +131,7 @@ context.modules = [ +diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in +index 6464839a0..05546201f 100644 +--- a/src/daemon/minimal.conf.in ++++ b/src/daemon/minimal.conf.in +@@ -110,7 +110,7 @@ context.modules = [ # access.allowed to list an array of paths of allowed # apps. #access.allowed = [ @@ -11,7 +11,27 @@ index 648e13069..50f767f0c 100644 #] # An array of rejected paths. -@@ -235,12 +235,12 @@ context.exec = [ +@@ -298,5 +298,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 a948a1b9b..4ece43c6f 100644 +--- a/src/daemon/pipewire.conf.in ++++ b/src/daemon/pipewire.conf.in +@@ -132,7 +132,7 @@ context.modules = [ + # access.allowed to list an array of paths of allowed + # apps. + #access.allowed = [ +- # @session_manager_path@ ++ # + #] + + # An array of rejected paths. +@@ -246,12 +246,12 @@ context.exec = [ # but it is better to start it as a systemd service. # Run the session manager with -h for options. # diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index f1159017de63..d37e0a050866 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -20,14 +20,12 @@ , udev , libva , libsndfile -, SDL2 , vulkan-headers , vulkan-loader , webrtc-audio-processing , ncurses , readline81 # meson can't find <7 as those versions don't have a .pc file , lilv -, openssl , makeFontsConf , callPackage , nixosTests @@ -55,8 +53,13 @@ , libpulseaudio , zeroconfSupport ? true , avahi +, raopSupport ? true +, openssl , rocSupport ? true , roc-toolkit +, x11Support ? true +, libcanberra +, xorg }: let @@ -65,7 +68,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.43"; + version = "0.3.48"; outputs = [ "out" @@ -83,7 +86,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-vjMA9dQvZe7dPbF9BNtCYf1V240RUBdtxeyqFjWA4j4="; + sha256 = "sha256-+gk/MJ9YimHBwN2I42DRP+I2OqBFFtZ81Fd/l89HcSk="; }; patches = [ @@ -120,13 +123,11 @@ let libsndfile lilv ncurses - openssl readline81 udev vulkan-headers vulkan-loader webrtc-audio-processing - SDL2 systemd ] ++ lib.optionals gstreamerSupport [ gst_all_1.gst-plugins-base gst_all_1.gstreamer ] ++ lib.optionals libcameraSupport [ libcamera libdrm ] @@ -134,7 +135,9 @@ let ++ lib.optionals bluezSupport [ bluez libfreeaptx ldacbt sbc fdk_aac ] ++ lib.optional pulseTunnelSupport libpulseaudio ++ lib.optional zeroconfSupport avahi - ++ lib.optional rocSupport roc-toolkit; + ++ lib.optional raopSupport openssl + ++ lib.optional rocSupport roc-toolkit + ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ]; # Valgrind binary is required for running one optional test. checkInputs = lib.optional withValgrind valgrind; @@ -160,8 +163,11 @@ let "-Dbluez5-backend-hsphfpd=${mesonEnableFeature hsphfpdSupport}" "-Dsysconfdir=/etc" "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" + "-Draop=${mesonEnableFeature raopSupport}" "-Dsession-managers=" "-Dvulkan=enabled" + "-Dx11=${mesonEnableFeature x11Support}" + "-Dsdl2=disabled" # required only to build examples, causes dependency loop ]; # Fontconfig error: Cannot load default config file @@ -191,6 +197,8 @@ let moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" moveToOutput "bin/pipewire-pulse" "$pulse" + + moveToOutput "bin/pw-jack" "$jack" ''; passthru = { @@ -205,6 +213,7 @@ let "nix-support/client-rt.conf.json" "nix-support/client.conf.json" "nix-support/jack.conf.json" + "nix-support/minimal.conf.json" "nix-support/pipewire.conf.json" "nix-support/pipewire-pulse.conf.json" ]; diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index dc14a4b8017d..7b9759f553bc 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , nix-update-script , # base build deps meson @@ -27,7 +26,7 @@ let in stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.7"; + version = "0.4.9"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -36,18 +35,9 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - sha256 = "sha256-yp4xtp+s+h+43LGVtYonoJ2tQaLRfwyMY4fp8z1l0CM="; + sha256 = "sha256-U92ozuEUFJA416qKnalVowJuBjLRdORHfhmznGf1IFU="; }; - patches = [ - # backport a fix for default device selection - # FIXME remove this after 0.4.8 - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/211f1e6b6cd4898121e4c2b821fae4dea6cc3317.patch"; - sha256 = "sha256-EGcbJ8Rq/5ft6SV0VC+mTkhVE7Ycze4TL6AVc9KH7+M="; - }) - ]; - nativeBuildInputs = [ meson pkg-config @@ -76,6 +66,9 @@ stdenv.mkDerivation rec { "-Delogind=disabled" "-Ddoc=${mesonEnableFeature enableDocs}" "-Dintrospection=${mesonEnableFeature enableGI}" + "-Dsystemd-system-service=true" + "-Dsystemd-system-unit-dir=${placeholder "out"}/lib/systemd/system" + "-Dsysconfdir=/etc" ]; passthru.updateScript = nix-update-script { diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 4148ca4fc47d..4de361a59842 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pkcs11-helper"; - version = "1.27"; + version = "1.28"; src = fetchFromGitHub { owner = "OpenSC"; repo = "pkcs11-helper"; rev = "${pname}-${version}"; - sha256 = "1idrqip59bqzcgddpnk2inin5n5yn4y0dmcyaggfpdishraiqgd5"; + sha256 = "sha256-gy04f62TX42mW4hKD/jTZXTpz9v6gQXNrY/pv8Ie4p0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/OpenSC/pkcs11-helper"; - license = with licenses; [ bsd3 gpl2 ]; + license = with licenses; [ bsd3 gpl2Only ]; description = "Library that simplifies the interaction with PKCS#11 providers"; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index fe148368b499..082702ec46f7 100644 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zMn8INehMO2/sjPDOxMldArAGyZAqjelxUTtv7oYqDM="; + sha256 = "sha256-t0/6yWnvBn5HGA50imejoYFrcVf/TqYg7UQy9Ztw8B8="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 57e8fb1a5a75..0e42ff730c8a 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -3,19 +3,19 @@ stdenv.mkDerivation rec { pname = "poco"; - version = "1.10.1"; + version = "1.11.1"; src = fetchurl { url = "https://pocoproject.org/releases/${pname}-${version}/${pname}-${version}-all.tar.gz"; - sha256 = "1jilzh0h6ik5lr167nax7q6nrpzxl99p11pkl202ig06pgh32nbz"; + sha256 = "sha256-MczOYCAEcnAAO/tbDafirUMohMI9PNUJyG9HzzpeXSo="; }; patches = [ - # Use GNUInstallDirs (https://github.com/pocoproject/poco/pull/3105) + # Use GNUInstallDirs (https://github.com/pocoproject/poco/pull/3503) (fetchpatch { name = "use-gnuinstalldirs.patch"; - url = "https://github.com/pocoproject/poco/commit/9e8f84dff4575f01be02e0b07364efd1561ce66c.patch"; - sha256 = "1bj4i93gxr7pwx33bfyhg20ad4ak1rbxkrlpsgzk7rm6mh0mld26"; + url = "https://github.com/pocoproject/poco/commit/16a2a74f6c28c6e6baca2ba26b4964b51d8a1b74.patch"; + sha256 = "sha256-mkemG8UemJEUQxae1trKakhnJFJW0AufDYFAbmnINbY="; # Files not included in release tarball excludes = [ "Encodings/Compiler/CMakeLists.txt" @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl unixODBC libmysqlclient ]; - propagatedBuildInputs = [ zlib pcre expat sqlite ]; + buildInputs = [ unixODBC libmysqlclient ]; + propagatedBuildInputs = [ zlib pcre expat sqlite openssl ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 3a3199cbd7a9..72907f7aedc8 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -65,6 +65,12 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/a2bf5c9c83b6ae46cbd5c779d3055bff81ded683.patch"; sha256 = "162jkpg2myq0rb0s5k3nfr4pqwv9im13jf6vzj8p5l39nazg5i4s"; }) + # File descriptor leak allows an unprivileged user to cause a crash (CVE-2021-4115) + (fetchpatch { + name = "CVE-2021-4115.patch"; + url = "https://src.fedoraproject.org/rpms/polkit/raw/0a203bd46a1e2ec8cc4b3626840e2ea9d0d13a9a/f/CVE-2021-4115.patch"; + sha256 = "sha256-BivHVVpYB4Ies1YbBDyKwUmNlqq2D1MpMipH9/dZM54="; + }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Make netgroup support optional (musl does not have it) # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10 diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 08ca1456ea8f..5547e492a65b 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -18,6 +18,7 @@ , ninja , openjpeg , pkg-config +, python3 , scribusUnstable , texlive , zlib @@ -34,19 +35,20 @@ let in stdenv.mkDerivation rec { pname = "poppler-${suffix}"; - version = "21.06.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "22.03.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - sha256 = "sha256-hrCeWgLeQAgaORbvhxHFEo6vSx/FnV+H0Oxm8E9ZXbQ="; + sha256 = "sha256-cox4upTXWlX2tjVdT72qb0mTTZYWvljl5nmpz9CYDh4="; }; nativeBuildInputs = [ cmake ninja pkg-config + python3 ]; buildInputs = [ diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index 2b8f006a7558..f661ac0e40bc 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -1,66 +1,27 @@ -{ lib, stdenv, fetchurl, unzip, cmake, /*jdk,*/ alsa-lib, Carbon, CoreAudio, CoreFoundation, CoreMIDI, CoreServices }: +{ lib, stdenv, fetchFromGitHub, unzip, cmake, alsa-lib, Carbon, CoreAudio, CoreFoundation, CoreMIDI, CoreServices }: stdenv.mkDerivation rec { pname = "portmidi"; - version = "234"; + version = "2.0.3"; - src = fetchurl { - url = "mirror://sourceforge/portmedia/portmedia-code-r${version}.zip"; - sha256 = "1g7i8hgarihycadbgy2f7lifiy5cbc0mcrcazmwnmbbh1bqx6dyp"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-bLGqi3b9FHBA43baNDT8jkPBQSXAUDfurQSJHLcy3AE="; }; - prePatch = '' - cd portmidi/trunk - ''; - - cmakeFlags = let - #base = "${jdk}/jre/lib/${jdk.architecture}"; - in [ - "-DPORTMIDI_ENABLE_JAVA=0" - /* TODO: Fix Java support. - "-DJAVA_AWT_LIBRARY=${base}/libawt.so" - "-DJAVA_JVM_LIBRARY=${base}/server/libjvm.so" - */ + cmakeFlags = [ "-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release" "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release" "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release" - ] ++ lib.optionals stdenv.isDarwin [ - "-DCMAKE_OSX_ARCHITECTURES=${if stdenv.isAarch64 then "arm64" else "x86_64"}" - "-DCOREAUDIO_LIB=${CoreAudio}" - "-DCOREFOUNDATION_LIB=${CoreFoundation}" - "-DCOREMIDI_LIB=${CoreMIDI}" - "-DCORESERVICES_LIB=${CoreServices}" - ]; - - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin [ - "-framework CoreAudio" - "-framework CoreFoundation" - "-framework CoreMIDI" - "-framework CoreServices" ]; patches = [ - # XXX: This is to deactivate Java support. - (fetchurl { - url = "https://raw.github.com/Rogentos/argent-gentoo/master/media-libs/portmidi/files/portmidi-217-cmake-libdir-java-opts.patch"; - sha256 = "1jbjwan61iqq9fqfpq2a4fd30k3clg7a6j0gfgsw87r8c76kqf6h"; - }) - ] ++ lib.optionals stdenv.isDarwin [ - # Remove hardcoded variables so we can set them properly - ./remove-darwin-variables.diff + # Add missing header include + ./missing-header.diff ]; - postPatch = '' - sed -i -e 's|/usr/local/|'"$out"'|' -e 's|/usr/share/|'"$out"'/share/|' \ - pm_common/CMakeLists.txt pm_dylib/CMakeLists.txt pm_java/CMakeLists.txt - sed -i \ - -e 's|-classpath .|-classpath '"$(pwd)"'/pm_java|' \ - -e 's|pmdefaults/|'"$(pwd)"'/pm_java/&|g' \ - -e 's|jportmidi/|'"$(pwd)"'/pm_java/&|g' \ - -e 's/WORKING_DIRECTORY pm_java//' \ - pm_java/CMakeLists.txt - ''; - postInstall = let ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' ln -s libportmidi${ext} "$out/lib/libporttime${ext}" ''; @@ -75,10 +36,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with lib; { - homepage = "http://portmedia.sourceforge.net/portmidi/"; + homepage = "https://github.com/PortMidi/portmidi"; description = "Platform independent library for MIDI I/O"; license = licenses.mit; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/portmidi/missing-header.diff b/pkgs/development/libraries/portmidi/missing-header.diff new file mode 100644 index 000000000000..1fa1f147014e --- /dev/null +++ b/pkgs/development/libraries/portmidi/missing-header.diff @@ -0,0 +1,12 @@ +diff --git a/porttime/ptmacosx_mach.c b/porttime/ptmacosx_mach.c +index 10c3554..712a974 100755 +--- a/porttime/ptmacosx_mach.c ++++ b/porttime/ptmacosx_mach.c +@@ -12,6 +12,7 @@ + + #include "porttime.h" + #include "sys/time.h" ++#include "sys/qos.h" + #include "pthread.h" + + #ifndef NSEC_PER_MSEC diff --git a/pkgs/development/libraries/portmidi/remove-darwin-variables.diff b/pkgs/development/libraries/portmidi/remove-darwin-variables.diff deleted file mode 100644 index 15ed874f172f..000000000000 --- a/pkgs/development/libraries/portmidi/remove-darwin-variables.diff +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4919b78..758eccb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -36,8 +36,6 @@ set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused") - set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused") - set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused") - --set(CMAKE_OSX_ARCHITECTURES i386 ppc x86_64 CACHE STRING "change to needed architecture for a smaller library" FORCE) -- - PROJECT(portmidi) - - if(UNIX) -diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt -index cbeeade..f765430 100644 ---- a/pm_common/CMakeLists.txt -+++ b/pm_common/CMakeLists.txt -@@ -22,7 +22,7 @@ else(APPLE OR WIN32) - endif(APPLE OR WIN32) - - if(APPLE) -- set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk CACHE -+ set(CMAKE_OSX_SYSROOT / CACHE - PATH "-isysroot parameter for compiler") - set(CMAKE_C_FLAGS "-mmacosx-version-min=10.6" CACHE - STRING "needed in conjunction with CMAKE_OSX_SYSROOT" FORCE) -@@ -54,10 +54,6 @@ if(UNIX) - - include_directories(${CMAKE_OSX_SYSROOT}/Developer/Headers/FlatCarbon) - set(FRAMEWORK_PATH ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks) -- set(COREAUDIO_LIB "${FRAMEWORK_PATH}/CoreAudio.framework") -- set(COREFOUNDATION_LIB "${FRAMEWORK_PATH}/CoreFoundation.framework") -- set(COREMIDI_LIB "${FRAMEWORK_PATH}/CoreMIDI.framework") -- set(CORESERVICES_LIB "${FRAMEWORK_PATH}/CoreServices.framework") - set(PM_NEEDED_LIBS ${COREAUDIO_LIB} ${COREFOUNDATION_LIB} - ${COREMIDI_LIB} ${CORESERVICES_LIB} - CACHE INTERNAL "") -diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt -index f693dd6..1dc5cd6 100644 ---- a/pm_dylib/CMakeLists.txt -+++ b/pm_dylib/CMakeLists.txt -@@ -49,10 +49,6 @@ if(UNIX) - - include_directories(${CMAKE_OSX_SYSROOT}/Developer/Headers/FlatCarbon) - set(FRAMEWORK_PATH ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks) -- set(COREAUDIO_LIB "${FRAMEWORK_PATH}/CoreAudio.framework") -- set(COREFOUNDATION_LIB "${FRAMEWORK_PATH}/CoreFoundation.framework") -- set(COREMIDI_LIB "${FRAMEWORK_PATH}/CoreMIDI.framework") -- set(CORESERVICES_LIB "${FRAMEWORK_PATH}/CoreServices.framework") - set(PM_NEEDED_LIBS ${COREAUDIO_LIB} ${COREFOUNDATION_LIB} - ${COREMIDI_LIB} ${CORESERVICES_LIB} - CACHE INTERNAL "") diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix index 4275622c24f4..71f8596c646b 100644 --- a/pkgs/development/libraries/prison/default.nix +++ b/pkgs/development/libraries/prison/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, cmake, qrencode, qt4, libdmtx }: -let v = "1.0"; in - stdenv.mkDerivation rec { - name = "prison-${v}"; + pname = "prison"; + version = "1.0"; src = fetchurl { - url = "mirror://kde/stable/prison/${v}/src/${name}.tar.gz"; + url = "mirror://kde/stable/prison/${version}/src/prison-${version}.tar.gz"; sha256 = "08hkzzda36jpdywjqlyzcvli7cx17h4l9yffzsdnhdd788n28krr"; }; diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix index 93e415f62699..8251a17a83c6 100644 --- a/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/pkgs/development/libraries/proj-datumgrid/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "proj-datumgrid"; + pname = "proj-datumgrid"; version = "world-1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix index 173ee6d2e09d..1591f8a332c8 100644 --- a/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/pkgs/development/libraries/prometheus-cpp/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , cmake , gbenchmark @@ -10,32 +11,30 @@ stdenv.mkDerivation rec { pname = "prometheus-cpp"; - version = "0.9.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "jupp0r"; repo = pname; rev = "v${version}"; - sha256 = "1pjz29ywzfg3blhg2v8fn7gjvq46k3bqn7y0xvmn468ixxhv21fi"; + sha256 = "L6CXRup3kU1lY5UnwPbaOwEtCeAySNmFCPmHwsk6cRE="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ gbenchmark civetweb gtest zlib curl ]; - + buildInputs = [ gbenchmark gtest zlib curl ]; + propagatedBuildInputs = [ civetweb ]; strictDeps = true; cmakeFlags = [ "-DUSE_THIRDPARTY_LIBRARIES=OFF" - "-DCIVETWEB_INCLUDE_DIR=${civetweb.dev}/include" - "-DCIVETWEB_CXX_LIBRARY=${civetweb}/lib/libcivetweb${stdenv.targetPlatform.extensions.sharedLibrary}" "-DBUILD_SHARED_LIBS=ON" ]; - NIX_LDFLAGS = "-ldl"; + outputs = [ "out" "dev" ]; postInstall = '' - mkdir -p $out/lib/pkgconfig - substituteAll ${./prometheus-cpp.pc.in} $out/lib/pkgconfig/prometheus-cpp.pc + mkdir -p $dev/lib/pkgconfig + substituteAll ${./prometheus-cpp.pc.in} $dev/lib/pkgconfig/prometheus-cpp.pc ''; meta = { diff --git a/pkgs/development/libraries/protobuf/3.16.nix b/pkgs/development/libraries/protobuf/3.16.nix index df8d53b9f1c3..fdbbed733d85 100644 --- a/pkgs/development/libraries/protobuf/3.16.nix +++ b/pkgs/development/libraries/protobuf/3.16.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.16.0"; - sha256 = "0jc523ys6xh1fk3l52f5mfqxhb4g8aim1js7330v0fdc3fjr8ncf"; + version = "3.16.1"; + sha256 = "sha256-eOwUyZtrmyh3HwLQ1kLnk+briaXQPrlUqtbFol/nGBo="; } diff --git a/pkgs/development/libraries/protobuf/3.18.nix b/pkgs/development/libraries/protobuf/3.18.nix index 63fc9b218d30..0d5d2c652cba 100644 --- a/pkgs/development/libraries/protobuf/3.18.nix +++ b/pkgs/development/libraries/protobuf/3.18.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.18.1"; - sha256 = "sha256-5PK0uuk7Du9hX/hHy0gninHIKu6b8THdfVh87Gn7y2Q="; + version = "3.18.2"; + sha256 = "sha256-IXxVTZOAKVMuGCJtD32rVQRBJRWUJMEK2d+fPEmgzRU="; } diff --git a/pkgs/development/libraries/protobuf/3.19.nix b/pkgs/development/libraries/protobuf/3.19.nix index 727bf511d581..7e2be4bec04c 100644 --- a/pkgs/development/libraries/protobuf/3.19.nix +++ b/pkgs/development/libraries/protobuf/3.19.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.19.0"; - sha256 = "0rx4r4d7hqr0gi3v90jbkm2lnkj9p37dhgwx9d0w7kgh3rvr4i7g"; + version = "3.19.3"; + sha256 = "sha256-nA6L064MuyP5Si4MCLk2yg8PDM7RWggFEGQyibputYQ="; } diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/development/libraries/protolock/default.nix index 7d423ac03470..ef6338207e3f 100644 --- a/pkgs/development/libraries/protolock/default.nix +++ b/pkgs/development/libraries/protolock/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protolock"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "nilslice"; repo = "protolock"; rev = "v${version}"; - sha256 = "sha256-cKrG8f8cabuGDN1gmBYleXcBqeJksdREiEy63UK/6J0="; + sha256 = "sha256-vWwRZVArmlTIGwD4zV3dEHN2kkoeCZuNIvjCBVAviPo="; }; - vendorSha256 = "sha256-3kRGLZgYcbUQb6S+NrleMNNX0dXrE9Yer3vvqxiP4So="; + vendorSha256 = "sha256-kgSJUSjY8kgrGCNDPgw1WA8KwAqI5koJQ0IcE+tC5nk="; doCheck = false; diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix index 6bff5998b56d..1e35ab700a08 100644 --- a/pkgs/development/libraries/protozero/default.nix +++ b/pkgs/development/libraries/protozero/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "protozero"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "mapbox"; repo = "protozero"; rev = "v${version}"; - sha256 = "0fdihfl5j68wayjjxvpvhvnjq1anzcfnfl09f68wpzbkg3zmhblz"; + sha256 = "sha256-R8lGewsEOxPNbKlkIeiM4yIwUcTzi2Dm0+xJ2WrBTBQ="; }; nativeBuildInputs = [ cmake ]; @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { description = "Minimalistic protocol buffer decoder and encoder in C++"; homepage = "https://github.com/mapbox/protozero"; license = with licenses; [ bsd2 asl20 ]; + changelog = [ + "https://github.com/mapbox/protozero/releases/tag/v${version}" + "https://github.com/mapbox/protozero/blob/v${version}/CHANGELOG.md" + ]; maintainers = with maintainers; [ das-g ]; }; } diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index 57335fa3d970..c976db882257 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pugixml"; - version = "1.11.4"; + version = "1.12.1"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; rev = "v${version}"; - sha256 = "sha256-pXadPs2Dlht3BMNYDVxWZqnVv0umDgYVcqH5YVxr+uA="; + sha256 = "sha256-Udjx84mhLPJ1bU5WYDo73PAeeufS+vBLXZP0YbBvqLE="; }; outputs = if shared then [ "out" "dev" ] else [ "out" ]; diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 709a3fb1533d..e838eb07201f 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -1,15 +1,11 @@ {lib, stdenv, fetchurl, cmake, qt4}: -let - pn = "qimageblitz"; - v = "0.0.4"; -in - -stdenv.mkDerivation { - name = "${pn}-${v}"; +stdenv.mkDerivation rec { + pname = "qimageblitz"; + version = "0.0.4"; src = fetchurl { - url = "mirror://sourceforge/${pn}/${pn}-${v}.tar.bz2"; + url = "mirror://sourceforge/qimageblitz/qimageblitz-${version}.tar.bz2"; sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9"; }; @@ -21,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Graphical effect and filter library for KDE4"; license = lib.licenses.bsd2; - homepage = "http://${pn}.sourceforge.net"; + homepage = "http://qimageblitz.sourceforge.net"; platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index 637335b86291..c87252648203 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qpdf"; - version = "10.3.2"; + version = "10.6.2"; src = fetchFromGitHub { owner = "qpdf"; repo = "qpdf"; rev = "release-qpdf-${version}"; - sha256 = "sha256-fhn6hE/MLYiaOxZYfaVcj17V+h8Yvn18QTewS0rPIXE="; + hash = "sha256-+8bH7fKJ5uZRxKX/4nMkoZGFTxm2uJEXkb1wq5FrLWs="; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 88c44ece32cd..4aff530877a0 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "qscintilla-qt5"; - version = "2.13.1"; + version = "2.13.2"; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"; - sha256 = "gA49IHGpa8zNdYE0avDS/ij8MM1oUwy4MCaF0BOv1Uo="; + sha256 = "sha256-tsfl8ntR0l8J/mz4Sumn8Idq8NZdjMtVEQnm57JYhfQ="; }; sourceRoot = "QScintilla_src-${version}/src"; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 96d2abe5a6ea..e581bdf5f88e 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -15,22 +15,17 @@ , libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx }: -let - v_maj = "4.8"; - v_min = "7"; - vers = "${v_maj}.${v_min}"; -in - # TODO: # * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid # false build-time dependencies stdenv.mkDerivation rec { - name = "qt-${vers}"; + pname = "qt" + lib.optionalString ( docs && demos && examples && developerBuild ) "-full"; + version = "4.8.7"; src = fetchurl { url = "http://download.qt-project.org/official_releases/qt/" - + "${v_maj}/${vers}/qt-everywhere-opensource-src-${vers}.tar.gz"; + + "${lib.versions.majorMinor version}/${version}/qt-everywhere-opensource-src-${version}.tar.gz"; sha256 = "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272"; }; @@ -40,8 +35,6 @@ stdenv.mkDerivation rec { setOutputFlags = false; - # The version property must be kept because it will be included into the QtSDK package name - version = vers; prePatch = '' substituteInPlace configure --replace /bin/pwd pwd @@ -131,13 +124,13 @@ stdenv.mkDerivation rec { preConfigure = '' export LD_LIBRARY_PATH="`pwd`/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" configureFlags+=" - -docdir $out/share/doc/${name} + -docdir $out/share/doc/qt-${version} -plugindir $out/lib/qt4/plugins -importdir $out/lib/qt4/imports - -examplesdir $TMPDIR/share/doc/${name}/examples - -demosdir $TMPDIR/share/doc/${name}/demos - -datadir $out/share/${name} - -translationdir $out/share/${name}/translations + -examplesdir $TMPDIR/share/doc/qt-${version}/examples + -demosdir $TMPDIR/share/doc/qt-${version}/demos + -datadir $out/share/qt-${version} + -translationdir $out/share/qt-${version}/translations --jobs=$NIX_BUILD_CORES " unset LD # Makefile uses gcc for linking; setting LD interferes diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index ef053eba9cb7..d89547261880 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -108,6 +108,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; }) + (fetchpatch { + name = "qtwebkit-darwin-handle.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch"; + sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE="; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 1f893fb05191..65ce74dac021 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -108,6 +108,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; }) + (fetchpatch { + name = "qtwebkit-darwin-handle.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch"; + sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE="; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 2a76409ce4bc..5943a80a701e 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -71,6 +71,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; }) + (fetchpatch { + name = "qtwebkit-darwin-handle.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch"; + sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE="; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index 76c4237dcaf7..8bf6386c4c60 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,8 +1,8 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "7edec6e014de27b9dd03f63875c471aac606a918", - "sha256": "0qv4vhciigqd8bnqzrs7y71ls7jx1p9cal2rh78m42qgskk1ci59" + "rev": "dba14d48611b9e9d59576172658779ab4a39b416", + "sha256": "1w2m1rm6mhj9qbanak36rqvc30x495zvj7mh2syy1yd29by0g5i8" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", @@ -16,8 +16,8 @@ }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "c9fde86b0a2440133bc08f4811b6ca793be47f0a", - "sha256": "1fqhdkv3sp3nbzqi2a5wvxn5d4v0xcrq2bl609bdyj4nx367a8wp" + "rev": "d16bf02a11953dcac01dca73e6f3778f293adefe", + "sha256": "0rpyd5r60707lzfmfi3y501c7is1gzhh30bframsy8bwglck2hjj" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", @@ -26,8 +26,8 @@ }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "69a87a9b831e36a578594a0a13130c384ad03121", - "sha256": "0ph07rdf9qfxnw3z2nqbmh6na65z0p2snmlzdw80amd7s0g255kw" + "rev": "5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26", + "sha256": "1lpiq3svlnj8f8apd12if11sng7k0l8y6vhr317srzz4dd77cfry" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", @@ -36,8 +36,8 @@ }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "55324650f9e759a43dce927f823c9858574106c3", - "sha256": "0cxz4pqvb8l0wqpc4hr0xmc72csqf7dpbbzdqgil9nyyg21ihkz0" + "rev": "1d49a5b678957adde7e2db23a485a3f48157bc8f", + "sha256": "1wdpgh23mdn0nny9c837iyg9kszc3m4cdmaanf8glymkzn0rkd8w" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", @@ -101,8 +101,8 @@ }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "be66bf9a5618c745d2a6ee2262967af6307b3b07", - "sha256": "11h3f3rb2kqgsw7njzhjwazw1k03v12i83irjndylafiaqw6c6ks" + "rev": "d8d6b14b9907adbc6ce307d52be34aaa761a58fa", + "sha256": "15c7nrvvn7qc3l7kdbl5wdpazqwv8zvg1aij2jvcrhbymn0zl3mc" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", @@ -146,8 +146,8 @@ }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "24128cdf8bef53eddf31a5709bbbc46293006b1c", - "sha256": "0vinjcbq4saxhlmvb5i93bzgg30qc3j8r2qfwrzaxc4vmfhfgi56" + "rev": "728012f7762ecd5762d493f8796907c6456f31e7", + "sha256": "1ldizgybl4fp95xlzf103hqmsqdmr3jbx048jyxcb5gjd3pbwh7p" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", @@ -161,18 +161,18 @@ }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "353b75b2e34bdae901625bbddf5c5e3f3e6c0de5", - "sha256": "12nv773zc05yrbai1z6i481yinih0kxcjzgm9pa0580qz69gd9a5" + "rev": "98d1fd864cbb6c7c012c4139118808af110fb8f0", + "sha256": "07xjmhca7z5bva03zk73d948qz0a3wnn4kvyy6j4cnp3w5giz5kc" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "992833ca741efe8f533c61abfaf129a1d8bfcfee", - "sha256": "1w8mq38k6s0fncqv113bw1pc7g10ysfmsbyg23hxh9fr5q4ia4q7" + "rev": "214f7ab9d3384a4123f14d9f6cd0205cf0aaa794", + "sha256": "1qd64w5c16gmpgi936dfjc0pn1a1rbs752k8lfqv2xwysx7qkqwi" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38", - "sha256": "167rp43c86xr4grzxs4bl46y6sf1q9xa0641mgp4r94g2ipxyc1d" + "rev": "fa8b07105b5e274daaa8adcc129fa4aa0447f9f7", + "sha256": "0mggqa8kixknbm1p5i5lkrmkj1na3b2xflj011dkjbj8wb78i42n" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", @@ -181,8 +181,8 @@ }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "e7883bc64440b1ff4666272ac6eb710ee4bc221b", - "sha256": "1rj99y1f0wn6g1m2k53xkni5v79zgq25yv8b9wx2bz0n2r9iasca" + "rev": "b13b56904b76e96ea52d0efe56395acc94b17d96", + "sha256": "047asrq7c44v7cn2d7c5zba47qzpsb6nidba77i2xn7gqlfv6z3b" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index 21b4f55a3d5d..7cba1ae63f96 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -38,7 +38,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) qtwebengine = let - branchName = "5.15.7"; + branchName = "5.15.8"; rev = "v${branchName}-lts"; in { @@ -46,7 +46,7 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) src = fetchgit { url = "https://github.com/qt/qtwebengine.git"; - sha256 = "fssBN/CDgXAuiNj14MPeIDI15ZDRBGuF7wxSXns9exU="; + sha256 = "04xhg5qpnxm8hzgkanml45za64c9i5pbxhki2l2wcq4b4y7f3hyr"; inherit rev branchName; fetchSubmodules = true; leaveDotGit = true; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 68945625f5b4..01d0c5932828 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -19,7 +19,7 @@ , ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit , ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication , cups, openbsm, runCommand, xcbuild, writeScriptBin -, ffmpeg ? null +, ffmpeg_4 ? null , lib, stdenv, fetchpatch , version ? null , qtCompatVersion @@ -115,6 +115,7 @@ qtModule { ] ++ lib.optionals stdenv.isDarwin [ "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_12" "-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_12" + "-Wno-elaborated-enum-base" # # Prevent errors like @@ -153,7 +154,7 @@ qtModule { harfbuzz icu libevent - ffmpeg + ffmpeg_4 ] ++ lib.optionals (!stdenv.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index dc9f5ccb9eb2..bebfbdda8d8b 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -2,7 +2,7 @@ , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel , fontconfig, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake -, bison, flex, gdb, gperf, perl, pkg-config, python2, ruby +, bison, flex, gdb, gperf, perl, pkg-config, python38, ruby , ICU, OpenGL }: @@ -30,7 +30,7 @@ qtModule { ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ] ++ lib.optional usingAnnulenWebkitFork hyphen; nativeBuildInputs = [ - bison flex gdb gperf perl pkg-config python2 ruby + bison flex gdb gperf perl pkg-config python38 ruby ] ++ lib.optional usingAnnulenWebkitFork cmake; cmakeFlags = lib.optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ] diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 72413b372f00..f2ea86160fb6 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,36 +2,40 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "0.20.2"; + version = "1.0.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "sha256-aIhLrGKb8iPl8N483+EOaCrTua96Qvl2lc2UXRiqvJA="; + hash = "sha256-Faex1NF5bJa0GdC+Sz4p6kHaGUtAkqZlNGi0TSc5ckw="; }; nativeBuildInputs = [ qmake4Hook ]; buildInputs = [ qt4 libX11 libXext ]; - postUnpack = "sourceRoot=\${sourceRoot}/Kvantum"; + sourceRoot = "source/Kvantum"; buildPhase = '' + runHook preBuild qmake kvantum.pro make + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir $TMP/kvantum make INSTALL_ROOT="$TMP/kvantum" install mv $TMP/kvantum/usr/ $out mv $TMP/kvantum/${qt4}/lib $out + runHook postInstall ''; meta = with lib; { description = "SVG-based Qt4 theme engine"; homepage = "https://github.com/tsujan/Kvantum"; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bugworm ]; }; diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 909903c2c34c..5a747fd91063 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "0yvxj7r9z890nfq5cadw7ys144c2mnvaplvx4v4ndv7238b741l8"; + sha256 = "0k3j74klvd386ijsd4j09ccxlhga54z4pgnh36s9cv3rs7ab39qm"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6_1.nix similarity index 94% rename from pkgs/development/libraries/qwt/6.nix rename to pkgs/development/libraries/qwt/6_1.nix index a9fa29ba4d4f..4e3a179e7520 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6_1.nix @@ -24,9 +24,8 @@ stdenv.mkDerivation rec { description = "Qt widgets for technical applications"; homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) - license = lib.licenses.qwt; + license = licenses.qwt; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; - branch = "6"; }; } diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index a5dcfedb8491..46cfc426efa4 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -1,25 +1,24 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook }: +{ lib, stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: stdenv.mkDerivation rec { pname = "qwt"; - version = "5.2.3"; + version = "6.2.0"; src = fetchurl { - url = "mirror://sourceforge/qwt/${pname}-${version}.tar.bz2"; - sha256 = "1dqa096mm6n3bidfq2b67nmdsvsw4ndzzd1qhl6hn8skcwqazzip"; + url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2"; + sha256 = "sha256-kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA="; }; - propagatedBuildInputs = [ qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; + propagatedBuildInputs = [ qtbase qtsvg qttools ]; + nativeBuildInputs = [ qmake ]; postPatch = '' - sed -e "s@\$\$\[QT_INSTALL_PLUGINS\]@$out/lib/qt4/plugins@" -i designer/designer.pro - sed -e "s|INSTALLBASE.*=.*|INSTALLBASE = $out|g" -i qwtconfig.pri + sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri ''; - preConfigure = '' - qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${pname}-${version}" - ''; + qmakeFlags = [ "-after doc.path=$out/share/doc/qwt-${version}" ]; + + dontWrapQtApps = true; meta = with lib; { description = "Qt widgets for technical applications"; diff --git a/pkgs/development/libraries/rang/default.nix b/pkgs/development/libraries/rang/default.nix index 79ab52fc8351..050beef5ea30 100644 --- a/pkgs/development/libraries/rang/default.nix +++ b/pkgs/development/libraries/rang/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "rang"; - version = "v3.1.0"; + version = "3.1.0"; src = fetchFromGitHub { - "owner" = "agauniyal"; + owner = "agauniyal"; repo = "rang"; - "rev" = "cabe04d6d6b05356fa8f9741704924788f0dd762"; - "sha256" = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; + rev = "cabe04d6d6b05356fa8f9741704924788f0dd762"; + sha256 = "0v2pz0l2smagr3j4abjccshg4agaccfz79m5ayvrvqq5d4rlds0s"; }; nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index 22d803c17be6..2cdad981fbd9 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,25 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, nix-update-script }: +{ lib, stdenv, fetchFromGitHub, nix-update-script }: stdenv.mkDerivation rec { pname = "re2"; - version = "2021-11-01"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - sha256 = "sha256-q8u7xNp6n17F6twPoVkix8iCKPWUN+qg6rhSR4Dv+bI="; + sha256 = "sha256-3RspCfJD2jV7GYuzeBUcxkZsdHyL14kaz8lSoIrH7b8="; }; - patches = [ - # Pull upstreal fix for parallel testing. - (fetchpatch { - name = "parallel-tests.patch"; - url = "https://github.com/google/re2/commit/9262284a7edc1b83e7172f4ec2d7967d695e7420.patch"; - sha256 = "1knhfx9cs4841r09jw4ha6mdx9qwpvlcxvd04i8vr84kd0lilqms"; - }) - ]; - preConfigure = '' substituteInPlace Makefile --replace "/usr/local" "$out" # we're using gnu sed, even on darwin @@ -29,6 +20,11 @@ stdenv.mkDerivation rec { buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ "static" ]; enableParallelBuilding = true; + # Broken when shared/static are tested in parallel: + # cp: cannot create regular file 'obj/testinstall.cc': File exists + # make: *** [Makefile:334: static-testinstall] Error 1 + # Will be fixed by https://code-review.googlesource.com/c/re2/+/59830 + enableParallelChecking = false; preCheck = "patchShebangs runtests"; doCheck = true; diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix deleted file mode 100644 index 98decdca968b..000000000000 --- a/pkgs/development/libraries/readline/5.x.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses }: - -stdenv.mkDerivation rec { - pname = "readline"; - version = "5.2"; - - src = fetchurl { - url = "mirror://gnu/readline/readline-${version}.tar.gz"; - sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j"; - }; - - propagatedBuildInputs = [ncurses]; - - patches = lib.optional stdenv.isDarwin ./shobj-darwin.patch; - - meta = with lib; { - branch = "5"; - platforms = platforms.unix; - license = licenses.gpl2; - }; -} diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix deleted file mode 100644 index 13c53937a7c0..000000000000 --- a/pkgs/development/libraries/readline/6.2.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ fetchurl, lib, stdenv, ncurses -}: - -stdenv.mkDerivation (rec { - pname = "readline"; - version = "6.2"; - - src = fetchurl { - url = "mirror://gnu/readline/readline-${version}.tar.gz"; - sha256 = "10ckm2bd2rkxhvdmj7nmbsylmihw0abwcsnxf8y27305183rd9kr"; - }; - - propagatedBuildInputs = [ncurses]; - - patchFlags = [ "-p0" ]; - patches = - [ ./link-against-ncurses.patch - ./no-arch_only.patch - ./clang.patch - ] - ++ - (let - patch = nr: sha256: - fetchurl { - url = "mirror://gnu/readline/readline-${version}-patches/readline62-${nr}"; - inherit sha256; - }; - in - import ./readline-6.2-patches.nix patch); - - meta = { - description = "Library for interactive line editing"; - - longDescription = '' - The GNU Readline library provides a set of functions for use by - applications that allow users to edit command lines as they are - typed in. Both Emacs and vi editing modes are available. The - Readline library includes additional functions to maintain a - list of previously-entered command lines, to recall and perhaps - reedit those lines, and perform csh-like history expansion on - previous commands. - - The history facilities are also placed into a separate library, - the History library, as part of the build process. The History - library may be used without Readline in applications which - desire its capabilities. - ''; - - homepage = "https://savannah.gnu.org/projects/readline/"; - - license = lib.licenses.gpl3Plus; - - maintainers = [ ]; - branch = "6.2"; - platforms = lib.platforms.unix; - }; -} - -// - -# Don't run the native `strip' when cross-compiling. -(if stdenv.hostPlatform != stdenv.buildPlatform - then { dontStrip = true; } - else { })) diff --git a/pkgs/development/libraries/readline/clang.patch b/pkgs/development/libraries/readline/clang.patch deleted file mode 100644 index 42bb0be09c39..000000000000 --- a/pkgs/development/libraries/readline/clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/support/shobj-conf b/support/shobj-conf -index 5a63e80..4b2a741 100644 ---- support/shobj-conf -+++ support/shobj-conf -@@ -189,7 +189,7 @@ darwin*|macosx*) - darwin[789]*|darwin10*) SHOBJ_LDFLAGS='' - SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' - ;; -- *) SHOBJ_LDFLAGS='-dynamic' -+ *) SHOBJ_LDFLAGS='-dynamiclib' - SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' - ;; - esac diff --git a/pkgs/development/libraries/readline/no-arch_only.patch b/pkgs/development/libraries/readline/no-arch_only.patch deleted file mode 100644 index b23eab5d9d73..000000000000 --- a/pkgs/development/libraries/readline/no-arch_only.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru -x '*~' readline-6.2-orig/support/shobj-conf readline-6.2/support/shobj-conf ---- support/shobj-conf 2009-10-28 14:20:21.000000000 +0100 -+++ support/shobj-conf 2014-07-01 13:03:28.000000000 +0200 -@@ -168,8 +168,8 @@ - SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)' - SHLIB_LIBSUFF='dylib' - -- SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`' -- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' -+ SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup' -+ SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' - - SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1 - ;; diff --git a/pkgs/development/libraries/readline/readline-6.2-patches.nix b/pkgs/development/libraries/readline/readline-6.2-patches.nix deleted file mode 100644 index 9fdcb3743b72..000000000000 --- a/pkgs/development/libraries/readline/readline-6.2-patches.nix +++ /dev/null @@ -1,9 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "1qxl74f4n0hv4a807byrgbk4ixd8m50apj3922q2ss9pfi0nra1q") -(patch "002" "1m670g2xzib6r81315q9r24nh9brmxkpq07acch1fwxmih94jqqy") -(patch "003" "0x13c9wir4r44v2vdg96y0ahn8kl3wcmb5y0xn15yvid6pzk28fb") -(patch "004" "0xjlkxfssfsd6jwbqhfjs4hybcps0b9zgz8v86vbhnzag4j39g89") -(patch "005" "1x61bjl3wgs1gwla9b3y1hh12m1j5qlbis22258mljjl9mg900pg") -] diff --git a/pkgs/development/libraries/readline/readline-8.1-patches.nix b/pkgs/development/libraries/readline/readline-8.1-patches.nix index b8019fb33502..b2aaadf0e9b5 100644 --- a/pkgs/development/libraries/readline/readline-8.1-patches.nix +++ b/pkgs/development/libraries/readline/readline-8.1-patches.nix @@ -1,4 +1,6 @@ # Automatically generated by `update-patch-set.sh'; do not edit. patch: [ +(patch "001" "0i4ikdqgcjnb40y2ss3lm09rq56zih5rzma3bib50dk3d1d4cak8") +(patch "002" "1p15sfx5xg5k4lam12lyd0givk7dfjddqpnb1jdp3c4clray0nz5") ] diff --git a/pkgs/development/libraries/readline/shobj-darwin.patch b/pkgs/development/libraries/readline/shobj-darwin.patch deleted file mode 100644 index a9199ca3e89a..000000000000 --- a/pkgs/development/libraries/readline/shobj-darwin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/support/shobj-conf.orig 2006-04-11 06:15:43.000000000 -0700 -+++ b/support/shobj-conf 2007-11-08 01:15:43.000000000 -0800 -@@ -171,7 +171,7 @@ - SHLIB_LIBSUFF='dylib' - - case "${host_os}" in -- darwin[78]*) SHOBJ_LDFLAGS='' -+ darwin[789]*) SHOBJ_LDFLAGS='' - SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' - ;; - *) SHOBJ_LDFLAGS='-dynamic' diff --git a/pkgs/development/libraries/readline/update-patch-set.sh b/pkgs/development/libraries/readline/update-patch-set.sh new file mode 120000 index 000000000000..d4f5cd2f3126 --- /dev/null +++ b/pkgs/development/libraries/readline/update-patch-set.sh @@ -0,0 +1 @@ +../../../shells/bash/update-patch-set.sh \ No newline at end of file diff --git a/pkgs/development/libraries/retro-gtk/default.nix b/pkgs/development/libraries/retro-gtk/default.nix index 113143311edf..7711dde497f0 100644 --- a/pkgs/development/libraries/retro-gtk/default.nix +++ b/pkgs/development/libraries/retro-gtk/default.nix @@ -72,5 +72,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.DamienCassou ]; platforms = platforms.all; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/retro-gtk.x86_64-darwin }; } diff --git a/pkgs/development/libraries/rinutils/default.nix b/pkgs/development/libraries/rinutils/default.nix index 35e48140fdd3..212019bb0e16 100644 --- a/pkgs/development/libraries/rinutils/default.nix +++ b/pkgs/development/libraries/rinutils/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "rinutils"; - version = "0.8.0"; + version = "0.10.0"; meta = with lib; { homepage = "https://github.com/shlomif/rinutils"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/shlomif/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "1q09aihm5m42xiq2prpa9mf0srwiirzgzblkp5nl74i7zg6pg5hx"; + sha256 = "sha256-cNifCoRk+PSU8zcEt8k5bn/KOS6Kr6pEZXEMGjiemAY="; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix index a0a068dc1422..4ab48c484426 100644 --- a/pkgs/development/libraries/robin-map/default.nix +++ b/pkgs/development/libraries/robin-map/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "robin-map"; - version = "0.6.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Tessil"; repo = pname; rev = "v${version}"; - sha256 = "1li70vwsksva9c4yly90hjafgqfixi1g6d52qq9p6r60vqc4pkjj"; + sha256 = "sha256-h59khOUg7vzw64EAMT/uzTKHzx2M9q+pc2BhfGQiY3Q="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 4d78209f1411..b55c2ef81527 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - hash = "sha256-fsQANBND/oDeC/+wmCH/aLlDTxPIi7Z/oN1HnNHHnm0="; + hash = "sha256-x6XwYxgiCoy6Q7gIevSTEWgUQ0aEjPFhKSqMqQahHig="; }; prePatch = '' diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 9364fdf75d5b..3f50c0665fa8 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.27.3"; + version = "6.29.3"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s3vBW/vN6lUvOp3vlx/Wo2ZrzobZ2s8MHujFouSU2NM="; + sha256 = "sha256-O0nIPRKj0ZOEjynh7h9kM6V965hQKs+4GgIbN+Os0I4="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 3ae872f23158..141c1b01d6f6 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - hash = "sha256-enGzu1EOo87/S5oH1eEqPy0AtsBhCcroG3DYemeNgR0="; + hash = "sha256-EIBH7TXelo6mr+/vJ+iT+VLUVoQqWmNsgeN3Nwwr+tM="; }; sourceRoot = "source/lib/comgr"; @@ -27,15 +27,6 @@ stdenv.mkDerivation rec { "-DLLVM_TARGETS_TO_BUILD=\"AMDGPU;X86\"" ]; - # The comgr build tends to link against the static LLVM libraries - # *and* the dynamic library. Linking against both causes errors - # about command line options being registered twice. This patch - # removes the static library linking. - patchPhase = '' - sed -e '/^llvm_map_components_to_libnames/,/[[:space:]]*Symbolize)/d' \ - -i CMakeLists.txt - ''; - passthru.updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index 13a326581117..773f98ee54a9 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -10,21 +10,19 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - hash = "sha256-UeunsDRLhmsDOzesiEgYIzYotwecehB6VswshzdRwjw="; + hash = "sha256-eZdy9+BfuUVzPO6huvqcwCog96qMVTYoY3l6J0YMUZQ="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ clang lld llvm ]; - cmakeBuildType = "Release"; - cmakeFlags = [ "-DCMAKE_PREFIX_PATH=${llvm}/lib/cmake/llvm;${clang-unwrapped}/lib/cmake/clang" "-DLLVM_TARGETS_TO_BUILD='AMDGPU;X86'" diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index f69165c5811e..9c19638d3f40 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - hash = "sha256-0OGYF4urlscr8tMkQwo2yATXwN0DjB092KQ+CBEhfIA="; + hash = "sha256-ovYwElZGRKySH1mWFIISxuNNxCjaqoe9oCvqYZGdfq0="; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 54ecd4f59b8d..aff0475c4a53 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "4.5.2"; + version = "5.0.1"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - hash = "sha256-DJDlEHnXhegcenO8BIY/8GnZdHldVs0GFLrQy4Z6heY="; + hash = "sha256-KOzVZNHtpwEOn7lZ36c4BGrImrq8dkUWRiHqGm+UTDk="; }; sourceRoot = "source/src"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index e76b7c1993ae..9ceb1360cda0 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - hash = "sha256-s/N1wkAgpxYCK6rIiWH8cGQU5YFGj0q4Dxj9j3yIys8="; + hash = "sha256-hhDLy92jS/akp1Ozun45OEjVbVcjufkRIfC8bqqFjp4="; }; preConfigure = '' diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index 7fc8fe98db29..1e70d6e0dbed 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ]; + makeFlags = [ "AR:=$(AR)" ]; meta = with lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 35a37fbddb86..c22ff6c37309 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.0"; + version = "1.3.6"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gd91thIcJO6Bhn1ENkW0k2iDzu1CvSYwWVv0VEM9umU="; + hash = "sha256-i1RbyHw+Fr1QABra6fskRpIbYxEfhOVToeesyax4NtU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index 2865ab06319f..1f49afbacff2 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -8,20 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1y0gikds2nr8jk8smhrl617njk23ymmpxyjb2j1xbj0k82xspv78"; }; - passthru = { - updateScript = '' - #!${runtimeShell} - cd ${toString ./.} - ${toString path}/pkgs/build-support/upstream-updater/update-walker.sh default.nix - ''; - }; - - meta = { + meta = with lib; { description = "File open routines to safely open a file when in the presence of an attack"; - license = lib.licenses.asl20 ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.all; + license = licenses.asl20; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.all; homepage = "https://research.cs.wisc.edu/mist/safefile/"; - updateWalker = true; }; } diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index 9f9545e52f3b..3be249531bbe 100644 --- a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cfitsio"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz"; - sha256 = "sha256-sqjvugufhtPhvWGfZipHbsGBErTyfMRBzGgKTjd3Ql4="; + sha256 = "sha256-s2fGldKDGVjnFmkhw7NW1d+lGx7O5QW5dBa6OdG2wXo="; }; buildInputs = [ bzip2 zlib ]; diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 2ac1ba9536f6..60f5e51ae957 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "sha256-Ik62kbOetA2vSMpnwrSiNRNJqOgmqlCB2+KNhpBo9TA="; + sha256 = "sha256-U3Q0WUEDRn0zfBIdHXFp5Zcaf+M6HrSFnpeu5aAkjks="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix index a214d28347de..754f408ca266 100644 --- a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix +++ b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "stellarsolver"; - version = "1.9"; + version = "2.2"; src = fetchFromGitHub { owner = "rlancaste"; repo = pname; rev = version; - sha256 = "sha256-PiRXNiemJ+UjVhmd2KPcTKJoDW9K9QBf62nkP1LlOfw="; + sha256 = "sha256-Ay7bszR4D5KKFiVLXfweJcc8jgUSZljnZVblEx7xh8o="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 8a9df7601d28..d93b4fb2a5a7 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "htslib"; - version = "1.14"; + version = "1.15"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-7SIbj1L0gS+BDuvgzFbNg1WlydIcYtFCrAWtDaFHk18="; + sha256 = "sha256-Gp9JkRUDoi9WgXzILqm4f7fnRntf+YnKWqYcEufVMtk="; }; # perl is only used during the check phase. diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/development/libraries/science/math/amd-blis/default.nix index cba9c28164a3..f04087302825 100644 --- a/pkgs/development/libraries/science/math/amd-blis/default.nix +++ b/pkgs/development/libraries/science/math/amd-blis/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { description = "BLAS-compatible library optimized for AMD CPUs"; homepage = "https://developer.amd.com/amd-aocl/blas-library/"; license = licenses.bsd3; - maintainers = [ ]; + maintainers = [ maintainers.markuskowa ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/development/libraries/science/math/amd-libflame/default.nix index b28fa43a2269..a5b657379411 100644 --- a/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -6,8 +6,12 @@ , amd-blis , withOpenMP ? true +, blas64 ? false }: +# right now only LP64 is supported +assert !blas64; + stdenv.mkDerivation rec { pname = "amd-libflame"; version = "3.0"; @@ -26,6 +30,8 @@ stdenv.mkDerivation rec { ./add-lapacke.diff ]; + passthru = { inherit blas64; }; + nativeBuildInputs = [ gfortran python3 ]; buildInputs = [ amd-blis ]; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index cfdc102e0447..acb737836c0d 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl, gfortran }: +{ lib, stdenv, fetchurl, cmake, gfortran +# Wether to build with ILP64 interface +, blas64 ? false +}: stdenv.mkDerivation rec { pname = "blas"; @@ -9,50 +12,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-LjYNmcm9yEB6YYiMQKqFP7QhlCDruCZNtIbLiGBGirM="; }; - nativeBuildInputs = [ gfortran ]; + passthru = { inherit blas64; }; - configurePhase = '' - echo >make.inc "SHELL = ${stdenv.shell}" - echo >>make.inc "PLAT = _LINUX" - echo >>make.inc "FORTRAN = gfortran" - echo >>make.inc "OPTS = -O2 -fPIC" - echo >>make.inc "DRVOPTS = $$(OPTS)" - echo >>make.inc "NOOPT = -O0 -fPIC" - echo >>make.inc "LOADER = gfortran" - echo >>make.inc "LOADOPTS =" - echo >>make.inc "AR = gfortran" - echo >>make.inc "ARFLAGS = -shared -o" - echo >>make.inc "RANLIB = echo" - echo >>make.inc "BLASLIB = libblas.so.${version}" - ''; + nativeBuildInputs = [ cmake gfortran ]; - buildPhase = '' - make - echo >>make.inc "ARFLAGS = " - echo >>make.inc "BLASLIB = libblas.a" - echo >>make.inc "AR = ar rcs" - echo >>make.inc "RANLIB = ranlib" - make - ''; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] + ++ lib.optional blas64 "-DBUILD_INDEX64=ON"; - installPhase = - # FreeBSD's stdenv doesn't use Coreutils. - let dashD = if stdenv.isFreeBSD then "" else "-D"; in - (lib.optionalString stdenv.isFreeBSD "mkdir -p $out/lib ;") - + '' - install ${dashD} -m755 libblas.a "$out/lib/libblas.a" - install ${dashD} -m755 libblas.so.${version} "$out/lib/libblas.so.${version}" - ln -s libblas.so.${version} "$out/lib/libblas.so.3" - ln -s libblas.so.${version} "$out/lib/libblas.so" - # Write pkg-config alias. - # See also openblas/default.nix - mkdir $out/lib/pkgconfig - cat < $out/lib/pkgconfig/blas.pc -Name: blas -Version: ${version} -Description: blas provided by the BLAS package. -Libs: -L$out/lib -lblas -EOF + postInstall = let + canonicalExtension = if stdenv.hostPlatform.isLinux + then "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major version}" + else stdenv.hostPlatform.extensions.sharedLibrary; + in lib.optionalString blas64 '' + ln -s $out/lib/libblas64${canonicalExtension} $out/lib/libblas${canonicalExtension} ''; preFixup = lib.optionalString stdenv.isDarwin '' @@ -62,10 +34,11 @@ EOF done ''; - meta = { + meta = with lib; { description = "Basic Linear Algebra Subprograms"; - license = lib.licenses.publicDomain; + license = licenses.publicDomain; + maintainers = [ maintainers.markuskowa ]; homepage = "http://www.netlib.org/blas/"; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/science/math/bonmin/default.nix b/pkgs/development/libraries/science/math/bonmin/default.nix new file mode 100644 index 000000000000..9526a6250184 --- /dev/null +++ b/pkgs/development/libraries/science/math/bonmin/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, gfortran +, pkg-config +, blas +, bzip2 +, cbc +, clp +, ipopt +, lapack +, libamplsolver +, zlib +}: + +assert (!blas.isILP64) && (!lapack.isILP64); + +stdenv.mkDerivation rec { + pname = "bonmin"; + version = "1.8.8"; + + src = fetchFromGitHub { + owner = "coin-or"; + repo = "Bonmin"; + rev = "releases/${version}"; + sha256 = "sha256-HU25WjvG01oL3U1wG6ivTcYaN51MMxgLdKZ3AkDNe2Y="; + }; + + nativeBuildInputs = [ + gfortran + pkg-config + ]; + buildInputs = [ + blas + bzip2 + cbc + clp + ipopt + lapack + libamplsolver + zlib + ]; + + meta = with lib; { + description = "An open-source code for solving general MINLP (Mixed Integer NonLinear Programming) problems"; + homepage = "https://github.com/coin-or/Bonmin"; + license = licenses.epl10; + platforms = platforms.unix; + maintainers = with maintainers; [ aanderse ]; + }; +} diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/development/libraries/science/math/clmagma/default.nix index 3905e70d3401..fe9fc540902d 100644 --- a/pkgs/development/libraries/science/math/clmagma/default.nix +++ b/pkgs/development/libraries/science/math/clmagma/default.nix @@ -3,7 +3,6 @@ with lib; let - version = "1.3.0"; incfile = builtins.toFile "make.inc.custom" '' CC = g++ FORT = gfortran @@ -32,10 +31,11 @@ let INC = -I$(clBLAS)/include #-I$(AMDAPP)/include ''; -in stdenv.mkDerivation { - name = "clmagma-${version}"; +in stdenv.mkDerivation rec { + pname = "clmagma"; + version = "1.3.0"; src = fetchurl { - url = "http://icl.cs.utk.edu/projectsfiles/magma/cl/clmagma-${version}.tar.gz"; + url = "https://icl.cs.utk.edu/projectsfiles/magma/cl/clmagma-${version}.tar.gz"; sha256 = "1n27ny0xhwirw2ydn46pfcwy53gzia9zbam4irx44fd4d7f9ydv7"; name = "clmagma-${version}.tar.gz"; }; @@ -68,7 +68,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port"; license = licenses.bsd3; - homepage = "http://icl.cs.utk.edu/magma/index.html"; + homepage = "https://icl.cs.utk.edu/magma/index.html"; platforms = platforms.linux; maintainers = with maintainers; [ volhovm ]; }; diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 3d4d4c21e5a1..d05cc3f90ec0 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,60 +1,118 @@ -{ callPackage, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 -, cudatoolkit_11_3, cudatoolkit_11_4 +# The following version combinations are supported: +# * cuDNN 7.4.2, cudatoolkit 10.0 +# * cuDNN 7.6.5, cudatoolkit 10.0-10.1 +# * cuDNN 8.1.1, cudatoolkit 10.2-11.2 +# * cuDNN 8.3.2, cudatoolkit 10.2-11.5 +{ callPackage +, cudatoolkit_10 +, cudatoolkit_10_0 +, cudatoolkit_10_1 +, cudatoolkit_10_2 +, cudatoolkit_11 +, cudatoolkit_11_0 +, cudatoolkit_11_1 +, cudatoolkit_11_2 +, cudatoolkit_11_3 +, cudatoolkit_11_4 +, cudatoolkit_11_5 +, fetchurl +, lib }: let - generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { + generic = args: callPackage (import ./generic.nix (removeAttrs args [ "cudatoolkit" ])) { inherit (args) cudatoolkit; }; - -in rec { - cudnn_cudatoolkit_10_0 = generic rec { + urlPrefix = "https://developer.download.nvidia.com/compute/redist/cudnn"; +in +rec { + # cuDNN 7.x + # Still used by libtensorflow-bin. It should be upgraded at some point. + cudnn_7_4_cudatoolkit_10_0 = generic rec { version = "7.4.2"; cudatoolkit = cudatoolkit_10_0; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.4.2.24.tgz"; - sha256 = "18ys0apiz9afid2s6lvy9qbyi8g66aimb2a7ikl1f3dm09mciprf"; + # See https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn_742/cudnn-support-matrix/index.html#cudnn-cuda-hardware-versions__table-cudnn-cuda-hardware-versions. + minCudaVersion = "9.2.88"; + maxCudaVersion = "10.0.99999"; + mkSrc = _: fetchurl { + url = "${urlPrefix}/v${version}/cudnn-10.0-linux-x64-v7.4.2.24.tgz"; + hash = "sha256-Lt/IagK1DRfojEeJVaMy5qHoF05+U6NFi06lH68C2qM="; + }; }; + # The only overlap between supported and packaged CUDA versions is 10.0. - cudnn_cudatoolkit_10_1 = generic rec { - version = "7.6.3"; - cudatoolkit = cudatoolkit_10_1; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.6.3.30.tgz"; - sha256 = "0qc9f1xpyfibwqrpqxxq2v9h6w90j0dbx564akwy44c1dls5f99m"; - }; - - cudnn_cudatoolkit_10_2 = generic rec { + cudnn_7_6_cudatoolkit_10_0 = generic rec { version = "7.6.5"; - cudatoolkit = cudatoolkit_10_2; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.6.5.32.tgz"; - sha256 = "084c13vzjdkb5s1996yilybg6dgav1lscjr1xdcgvlmfrbr6f0k0"; + cudatoolkit = cudatoolkit_10_0; + # See https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn_765/cudnn-support-matrix/index.html#cudnn-versions-763-765. + minCudaVersion = "9.2.148"; + maxCudaVersion = "10.1.243"; + mkSrc = cudatoolkit: fetchurl { + url = "${urlPrefix}/v${version}/cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.6.5.32.tgz"; + hash = { + "10.0" = "sha256-KDVeOV8LK5OsLIO2E2CzW6bNA3fkTni+GXtrYbS0kro="; + "10.1" = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM="; + }."${cudatoolkit.majorVersion}"; + }; }; + cudnn_7_6_cudatoolkit_10_1 = cudnn_7_6_cudatoolkit_10_0.override { cudatoolkit = cudatoolkit_10_1; }; - cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_2; - - cudnn_cudatoolkit_11_0 = generic rec { + # cuDNN 8.x + # cuDNN 8.1 is still used by tensorflow at the time of writing (2022-02-17). + # See https://github.com/NixOS/nixpkgs/pull/158218 for more info. + cudnn_8_1_cudatoolkit_10_2 = generic rec { version = "8.1.1"; - cudatoolkit = cudatoolkit_11_0; - # 8.1.0 is compatible with CUDA 11.0, 11.1, and 11.2: - # https://docs.nvidia.com/deeplearning/cudnn/support-matrix/index.html#cudnn-cuda-hardware-versions - srcName = "cudnn-11.2-linux-x64-v8.1.1.33.tgz"; - hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; + cudatoolkit = cudatoolkit_10_2; + # See https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-811/support-matrix/index.html#cudnn-versions-810-811. + minCudaVersion = "10.2.00000"; + maxCudaVersion = "11.2.99999"; + mkSrc = cudatoolkit: + let v = if lib.versions.majorMinor cudatoolkit.version == "10.2" then "10.2" else "11.2"; in + fetchurl { + url = "${urlPrefix}/v${version}/cudnn-${v}-linux-x64-v8.1.1.33.tgz"; + hash = { + "10.2" = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0="; + "11.2" = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; + }."${v}"; + }; }; + cudnn_8_1_cudatoolkit_11_0 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_0; }; + cudnn_8_1_cudatoolkit_11_1 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_1; }; + cudnn_8_1_cudatoolkit_11_2 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_2; }; - cudnn_cudatoolkit_11_1 = cudnn_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_1; - }; + cudnn_8_1_cudatoolkit_10 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_10; }; + cudnn_8_1_cudatoolkit_11 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11; }; - cudnn_cudatoolkit_11_2 = cudnn_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_2; - }; + # cuDNN 8.3 is necessary for the latest jaxlib, esp. jaxlib-bin. See + # https://github.com/google/jax/discussions/9455 for more info. + cudnn_8_3_cudatoolkit_10_2 = + generic + rec { + version = "8.3.2"; + cudatoolkit = cudatoolkit_10_2; + # See https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-832/support-matrix/index.html#cudnn-cuda-hardware-versions. + minCudaVersion = "10.2.00000"; + maxCudaVersion = "11.5.99999"; + mkSrc = cudatoolkit: + let v = if lib.versions.majorMinor cudatoolkit.version == "10.2" then "10.2" else "11.5"; in + fetchurl { + # Starting at version 8.3.1 there's a new directory layout including + # a subdirectory `local_installers`. + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v${version}/local_installers/${v}/cudnn-linux-x86_64-8.3.2.44_cuda${v}-archive.tar.xz"; + hash = { + "10.2" = "sha256-1vVu+cqM+PketzIQumw9ykm6REbBZhv6/lXB7EC2aaw="; + "11.5" = "sha256-VQCVPAjF5dHd3P2iNPnvvdzb5DpTsm3AqCxyP6FwxFc="; + }."${v}"; + }; + } + ; + cudnn_8_3_cudatoolkit_11_0 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_0; }; + cudnn_8_3_cudatoolkit_11_1 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_1; }; + cudnn_8_3_cudatoolkit_11_2 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_2; }; + cudnn_8_3_cudatoolkit_11_3 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_3; }; + cudnn_8_3_cudatoolkit_11_4 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_4; }; + cudnn_8_3_cudatoolkit_11_5 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_5; }; - cudnn_cudatoolkit_11_3 = cudnn_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_3; - }; - - cudnn_cudatoolkit_11_4 = cudnn_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_4; - }; - - cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_4; + cudnn_8_3_cudatoolkit_10 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_10; }; + cudnn_8_3_cudatoolkit_11 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11; }; } diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index f5a4fac1a908..a5272e56ab6d 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -1,11 +1,9 @@ -{ version -, srcName -, hash ? null -, sha256 ? null +{ minCudaVersion +, maxCudaVersion +, mkSrc +, version }: -assert (hash != null) || (sha256 != null); - { stdenv , lib , cudatoolkit @@ -25,32 +23,36 @@ stdenv.mkDerivation { name = "cudatoolkit-${cudatoolkit.majorVersion}-cudnn-${version}"; inherit version; - - src = let - hash_ = if hash != null then { inherit hash; } else { inherit sha256; }; - in fetchurl ({ - # URL from NVIDIA docker containers: https://gitlab.com/nvidia/cuda/blob/centos7/7.0/runtime/cudnn4/Dockerfile - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v${version}/${srcName}"; - } // hash_); + # It's often the case that the src depends on the version of cudatoolkit it's + # being linked against, so we pass in `cudatoolkit` as an argument to `mkSrc`. + src = mkSrc cudatoolkit; nativeBuildInputs = [ addOpenGLRunpath ]; + # Some cuDNN libraries depend on things in cudatoolkit, eg. + # libcudnn_ops_infer.so.8 tries to load libcublas.so.11. So we need to patch + # cudatoolkit into RPATH. See also https://github.com/NixOS/nixpkgs/blob/88a2ad974692a5c3638fcdc2c772e5770f3f7b21/pkgs/development/python-modules/jaxlib/bin.nix#L78-L98. + # + # Note also that version <=8.3.0 contained a subdirectory "lib64/" but in + # version 8.3.2 it seems to have been renamed to simply "lib/". installPhase = '' runHook preInstall function fixRunPath { p=$(patchelf --print-rpath $1) - patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc ]}:\$ORIGIN/" $1 + patchelf --set-rpath "''${p:+$p:}${lib.makeLibraryPath [ stdenv.cc.cc cudatoolkit.lib ]}:${cudatoolkit}/lib:\$ORIGIN/" $1 } - for lib in lib64/lib*.so; do - fixRunPath $lib + for sofile in {lib,lib64}/lib*.so; do + fixRunPath $sofile done mkdir -p $out cp -a include $out/include - cp -a lib64 $out/lib64 + [ -d "lib/" ] && cp -a lib $out/lib + [ -d "lib64/" ] && cp -a lib64 $out/lib64 '' + lib.optionalString removeStatic '' + rm -f $out/lib/*.a rm -f $out/lib64/*.a '' + '' runHook postInstall @@ -74,10 +76,21 @@ stdenv.mkDerivation { }; meta = with lib; { + # Check that the cudatoolkit version satisfies our min/max constraints (both + # inclusive). We mark the package as broken if it fails to satisfies the + # official version constraints (as recorded in default.nix). In some cases + # you _may_ be able to smudge version constraints, just know that you're + # embarking into unknown and unsupported territory when doing so. + broken = let cudaVer = lib.getVersion cudatoolkit; in + !( + lib.versionAtLeast cudaVer minCudaVersion + && lib.versionAtLeast maxCudaVersion cudaVer + ); + description = "NVIDIA CUDA Deep Neural Network library (cuDNN)"; homepage = "https://developer.nvidia.com/cudnn"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ mdaiter ]; + maintainers = with maintainers; [ mdaiter samuela ]; }; } diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index e0dfef0b7eec..325a6b82a6f9 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,26 +1,35 @@ -{ lib, stdenv, fetchurl, unzip, blas, lapack, gfortran }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, blas +, lapack +, gfortran +, enableAMPL ? stdenv.isLinux, libamplsolver +}: assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.12.13"; + version = "3.14.5"; - src = fetchurl { - url = "https://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "0kzf05aypx8q5mr3sciclk926ans0yi2d2chjdxxgpi3sza609dx"; + src = fetchFromGitHub { + owner = "coin-or"; + repo = "Ipopt"; + rev = "releases/${version}"; + sha256 = "sha256-eqOacZGuuGAjWMs2H6RntQ+WJmGTi+EqydHUQXEpY54="; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; configureFlags = [ - "--with-blas-lib=-lblas" - "--with-lapack-lib=-llapack" + "--with-asl-cflags=-I${libamplsolver}/include" + "--with-asl-lflags=-lamplsolver" ]; - nativeBuildInputs = [ unzip gfortran ]; - - buildInputs = [ blas lapack ]; + nativeBuildInputs = [ pkg-config gfortran ]; + buildInputs = [ blas lapack ] ++ lib.optionals enableAMPL [ libamplsolver ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 3f0cf45062f1..b1896917658c 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -1,94 +1,38 @@ { lib, stdenv -, fetchurl -, fetchpatch +, autoreconfHook +, gengetopt +, pkg-config +, fetchFromGitLab , pari }: stdenv.mkDerivation rec { - version = "1.23"; + version = "2.0.5"; pname = "lcalc"; - src = fetchurl { - # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available - # "newer" version at google code https://code.google.com/archive/p/l-calc/source/default/source - url = "mirror://sageupstream/lcalc/lcalc-${version}.tar.bz2"; - sha256 = "1c6dsdshgxhqppjxvxhp8yhpxaqvnz3d1mlh26r571gkq8z2bm43"; + src = fetchFromGitLab { + owner = "sagemath"; + repo = pname; + rev = version; + sha256 = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc="; }; - preConfigure = "cd src"; + nativeBuildInputs = [ + autoreconfHook + gengetopt + pkg-config + ]; buildInputs = [ pari ]; - patches = [ - # Port to newer pari - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/pari-2.7.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "1x3aslldm8njjm7p9g9s9w2c91kphnci2vpkxkrcxfihw3ayss6c"; - }) - - # Uncomment the definition of lcalc_to_double(const long double& x). - # (Necessary for GCC >= 4.6.0, cf. https://trac.sagemath.org/ticket/10892) - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/Lcommon.h.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0g4ybvsrcv48rmlh1xjnkms19jp25k58azv6ds1f2cm34hxs8fdx"; - }) - - # Include also in Lcommandline_numbertheory.h (at least required - # on Cygwin, cf. https://trac.sagemath.org/ticket/9845) - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/time.h.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "1brf04n11kkc43ylagf8dm32j5r2g9zv51dp5wag1mpm4p04l7cl"; - }) - - # Fix for gcc >4.6 - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/lcalc-1.23_default_parameters_1.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0i2yvxm5fx4z0v6m4srgh8rj98kijmlvyirlxf1ky0bp2si6bpka"; - }) - - # gcc 5.1 - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/lcalc-1.23_default_parameters_2.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0dqwmxpm9wb53qbypsyfkgsvk2f8nf67sydphd4dkc2vw4yz6vlh"; - }) - - # based on gentoos makefile patch -- fix paths, adhere to flags - ./makefile.patch - - # (fetchpatch { - # name = "default-double.patch"; - # url = "https://github.com/dimpase/lcalc/pull/1/commits/0500c67b6aa1f492715591669f6647c8f7a3ea59.patch"; - # sha256 = "0dqwmxpm9wb53qbypsyfkgsvk2f8nf67sydphd4dkc2vw4yz6vla"; - # }) - - (fetchpatch { - name = "c++11.patch"; - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/3607b97df5a8c231191115b0cb5c62426b339e71/trunk/lcalc-c++11.patch"; - sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3"; - }) - ] ++ lib.optional stdenv.isDarwin - (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/lcalc/patches/clang.patch"; - sha256 = "0bb7656z6cp6i4p2qj745cmq0lhh52v2akl9whi760dynfdxbl18"; - }); - - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace src/Makefile --replace g++ c++ - ''; - - installFlags = [ - "DESTDIR=$(out)" - ]; - - makeFlags = [ - "PARI_DEFINE=-DINCLUDE_PARI" - "PARI_PREFIX=${pari}" + configureFlags = [ + "--with-pari" ]; meta = with lib; { - homepage = "http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html"; + homepage = "https://gitlab.com/sagemath/lcalc"; description = "A program for calculating with L-functions"; license = with licenses; [ gpl2 ]; maintainers = teams.sage.members; diff --git a/pkgs/development/libraries/science/math/lcalc/makefile.patch b/pkgs/development/libraries/science/math/lcalc/makefile.patch deleted file mode 100644 index 5c22cf0b84e8..000000000000 --- a/pkgs/development/libraries/science/math/lcalc/makefile.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 84e4e88..56ca676 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -58,7 +58,7 @@ ifeq ($(G5),TRUE) - #MACHINE_SPECIFIC_FLAGS = -mpowerpc -mpowerpc64 -m64 - endif - --CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA) -+CCFLAGS = $(CXXFLAGS) $(OPENMP_FLAG) $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) - #CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA) - #CCFLAGS = -Wa,-W -O2 -fno-exceptions -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MACHINE_SPECIFIC_FLAGS) $(EXTRA) - -@@ -68,12 +68,12 @@ CCFLAGS = -Wa,-W -O3 $(OPENMP_FLAG) -Wno-deprecated $(PREPROCESSOR_DEFINE) $(MA - - ifeq ($(PARI_DEFINE),-DINCLUDE_PARI) - #location of pari.h. -- LOCATION_PARI_H = /usr/local/include/pari #usual location -+ LOCATION_PARI_H = $(PARI_PREFIX)/include/pari #usual location - - #location of libpari.a or of libpari.so - #depending on whether static or dynamic libraries are being used. - #On mac os x it's the former, on linux I think usually the latter. -- LOCATION_PARI_LIBRARY = /usr/local/lib #usual location -+ LOCATION_PARI_LIBRARY = $(PARI_PREFIX)/lib #usual location - else - #supplied as a dummy so as to avoid more ifeq's below - LOCATION_PARI_H = . -@@ -89,24 +89,24 @@ INCLUDEFILES= -I../include - - ifeq ($(OS_NAME),Darwin) - LDFLAGS2 = -- DYN_OPTION=dynamiclib -+ DYN_OPTION=-dynamiclib - else -- LDFLAGS1 = -Xlinker -export-dynamic #not sure why pari calls these when linking but on the web I found -+ LDFLAGS1 = #not sure why pari calls these when linking but on the web I found - #'Libtool provides the `-export-dynamic' link flag (see section Link mode), which does this declaration. - #You need to use this flag if you are linking a shared library that will be dlopened' - #see notes below - #ifeq ($(PARI_DEFINE),-DINCLUDE_PARI) -- LDFLAGS2 = $(LDFLAGS1) -Xlinker -rpath -Xlinker $(LOCATION_PARI_LIBRARY) -+ LDFLAGS2 = $(LDFLAGS) - #else - # LDFLAGS2 = $(LDFLAGS1) - #endif -- DYN_OPTION=shared -+ DYN_OPTION=$(LDFLAGS) -shared -Wl,-soname,libLfunction.so - endif - - ifeq ($(PARI_DEFINE),-DINCLUDE_PARI) -- LDFLAGS = $(LDFLAGS2) -L$(LOCATION_PARI_LIBRARY) -lpari -+ MYLDFLAGS = $(LDFLAGS2) -L$(LOCATION_PARI_LIBRARY) -lpari - else -- LDFLAGS = $(LDFLAGS2) -+ MYLDFLAGS = $(LDFLAGS2) - endif - - -@@ -129,7 +129,8 @@ endif - #become clear which libraries the computer can find. - - --INSTALL_DIR= /usr/local -+INSTALL_DIR= $(DESTDIR) -+LIB_DIR ?=lib - - #object files for the libLfunction library - OBJ_L = Lglobals.o Lgamma.o Lriemannsiegel.o Lriemannsiegel_blfi.o Ldokchitser.o -@@ -141,9 +142,8 @@ OBJECTS = $(OBJ3) - - all: - # make print_vars -- make libLfunction.so -- make lcalc -- make examples -+ ${MAKE} libLfunction.so -+ ${MAKE} lcalc - # make find_L - # make test - -@@ -151,7 +151,7 @@ print_vars: - @echo OS_NAME = $(OS_NAME) - - lcalc: $(OBJECTS) -- $(CC) $(CCFLAGS) $(INCLUDEFILES) $(OBJECTS) $(LDFLAGS) -o lcalc $(GMP_FLAGS) -+ $(CC) $(CCFLAGS) $(INCLUDEFILES) $(OBJECTS) $(MYLDFLAGS) -o lcalc $(GMP_FLAGS) - - examples: - $(CC) $(CCFLAGS) $(INCLUDEFILES) example_programs/example.cc libLfunction.so -o example_programs/example $(GMP_FLAGS) -@@ -262,15 +262,18 @@ Lcommandline.o: ../include/Lcommandline_values_zeros.h - - - libLfunction.so: $(OBJ_L) -- g++ -$(DYN_OPTION) -o libLfunction.so $(OBJ_L) -+ g++ $(DYN_OPTION) -o libLfunction.so $(OBJ_L) - - clean: - rm -f *.o lcalc libLfunction.so example_programs/example - - install: -- cp -f lcalc $(INSTALL_DIR)/bin/. -- cp -f libLfunction.so $(INSTALL_DIR)/lib/. -- cp -rf ../include $(INSTALL_DIR)/include/Lfunction -+ install -d $(INSTALL_DIR)/bin -+ install -d $(INSTALL_DIR)/$(LIB_DIR) -+ install -d $(INSTALL_DIR)/include/Lfunction -+ install lcalc $(INSTALL_DIR)/bin -+ install libLfunction.so $(INSTALL_DIR)/$(LIB_DIR) -+ install -m 644 -t $(INSTALL_DIR)/include/Lfunction ../include/*.h - - - SRCS = Lcommandline.cc Lcommandline_elliptic.cc Lcommandline_globals.cc Lcommandline_misc.cc Lcommandline_numbertheory.cc Lcommandline_twist.cc Lcommandline_values_zeros.cc Lgamma.cc Lglobals.cc Lmisc.cc Lriemannsiegel.cc Lriemannsiegel_blfi.cc cmdline.c diff --git a/pkgs/development/libraries/science/math/libamplsolver/default.nix b/pkgs/development/libraries/science/math/libamplsolver/default.nix new file mode 100644 index 000000000000..bcbde5f61359 --- /dev/null +++ b/pkgs/development/libraries/science/math/libamplsolver/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchurl, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "libamplsolver"; + version = "20211109"; + + src = fetchurl { + url = "https://ampl.com/netlib/ampl/solvers.tgz"; + sha256 = "sha256-LVmScuIvxmZzywPSBl9T9YcUBJP7UFAa3eWs9r4q3JM="; + }; + + patches = [ + # Debian provides a patch to build a shared library + (fetchpatch { + url = "https://sources.debian.org/data/main/liba/libamplsolver/0~20190702-2/debian/patches/fix-makefile-shared-lib.patch"; + sha256 = "sha256-96qwj3fLugzbsfxguKMce13cUo7XGC4VUE7xKcJs42Y="; + }) + ]; + + installPhase = '' + runHook preInstall + pushd sys.`uname -m`.`uname -s` + install -D -m 0644 *.h -t $out/include + install -D -m 0644 *.so* -t $out/lib + install -D -m 0644 *.a -t $out/lib + popd + runHook postInstall + ''; + + meta = with lib; { + description = "A library of routines that help solvers work with AMPL"; + homepage = "https://ampl.com/netlib/ampl/"; + license = [ licenses.mit ]; + platforms = platforms.linux; + maintainers = with maintainers; [ aanderse ]; + }; +} diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix index b756109aa8fc..d0f09290c3c7 100644 --- a/pkgs/development/libraries/science/math/libhomfly/default.nix +++ b/pkgs/development/libraries/science/math/libhomfly/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "1.02r5"; - pname = "llibhomfly"; + version = "1.02r6"; + pname = "libhomfly"; src = fetchFromGitHub { owner = "miguelmarco"; repo = "libhomfly"; rev = version; - sha256 = "1szv8iwlhvmy3saigi15xz8vgch92p2lbsm6440v5s8vxj455bvd"; + sha256 = "sha256-s1Hgy6S9+uREKsgjOVQdQfnds6oSLo5UWTrt5DJnY2s="; }; buildInputs = [ diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index f2a50cb2d3d4..9f481961e5bf 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -5,6 +5,8 @@ , gfortran , cmake , shared ? true +# Compile with ILP64 interface +, blas64 ? false }: stdenv.mkDerivation rec { @@ -36,7 +38,19 @@ stdenv.mkDerivation rec { "-DLAPACKE=ON" "-DCBLAS=ON" "-DBUILD_TESTING=ON" - ] ++ lib.optional shared "-DBUILD_SHARED_LIBS=ON"; + ] ++ lib.optional shared "-DBUILD_SHARED_LIBS=ON" + ++ lib.optional blas64 "-DBUILD_INDEX64=ON"; + + passthru = { inherit blas64; }; + + postInstall = let + canonicalExtension = if stdenv.hostPlatform.isLinux + then "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major version}" + else stdenv.hostPlatform.extensions.sharedLibrary; + in lib.optionalString blas64 '' + ln -s $out/lib/liblapack64${canonicalExtension} $out/lib/liblapack${canonicalExtension} + ln -s $out/lib/liblapacke64${canonicalExtension} $out/lib/liblapacke${canonicalExtension} + ''; doCheck = true; @@ -63,7 +77,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ markuskowa ]; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix index da79f6d62499..41deec25d454 100644 --- a/pkgs/development/libraries/science/math/metis/default.nix +++ b/pkgs/development/libraries/science/math/metis/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip, cmake }: stdenv.mkDerivation rec { - name = "metis"; + pname = "metis"; version = "5.1.0"; src = fetchurl { diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index d61b6ee3acb0..8e5d71801158 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -129,7 +129,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.19"; + version = "0.3.20"; outputs = [ "out" "dev" ]; @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "sha256-EqA6oFM2theuvvuDOWeOx0Bv6AEFffmpWHJBzp23br0="; + sha256 = "sha256-FLPVcepf7tv/es+4kur9Op7o3iVAAayuYN4hY/P4mmQ="; }; inherit blas64; diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 84c01d80d0a6..21c7d45a9099 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "openlibm"; rev = "v${version}"; - sha256 = "sha256-dEM10picZXiPokzSHCfxhS7fwZ0sMjil4bni+PHBCeI="; + sha256 = "sha256-q7BYUU8oChjuBFbVnpT+vqIAu+BVotT4xY2Dn0hmWfc="; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index ca3e4a243691..20978e31cff1 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -77,7 +77,8 @@ stdenv.mkDerivation rec { (cd temp_python/ortools; PYTHONPATH="$python/${python.sitePackages}:$PYTHONPATH" python setup.py install '--prefix=$python') ''; - enableParallelBuilding = true; + # protobuf generation is not thread safe + enableParallelBuilding = false; nativeBuildInputs = [ cmake diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index e9ca9b849462..a06df2b1950d 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -18,11 +18,11 @@ assert petsc-withp4est -> p4est.mpiSupport; stdenv.mkDerivation rec { pname = "petsc"; - version = "3.16.2"; + version = "3.16.5"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "sha256-erJXrhUNSDesjThyodIGmXliV4eF7CQnY5zqxG0TG7w="; + sha256 = "sha256-fehXDuuUBidS2CqDII/Cuvx3s/UVAjpMFNj/lEDmbKw="; }; mpiSupport = !withp4est || p4est.mpiSupport; @@ -67,6 +67,11 @@ stdenv.mkDerivation rec { configureScript = "python ./configure"; + # disable stackprotector on aarch64-darwin for now + # https://github.com/NixOS/nixpkgs/issues/158730 + # see https://github.com/NixOS/nixpkgs/issues/127608 for a similar issue + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + enableParallelBuilding = true; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; @@ -74,6 +79,6 @@ stdenv.mkDerivation rec { description = "Portable Extensible Toolkit for Scientific computation"; homepage = "https://www.mcs.anl.gov/petsc/index.html"; license = licenses.bsd2; - maintainers = with maintainers; [ wucke13 cburstedde ]; + maintainers = with maintainers; [ cburstedde ]; }; } diff --git a/pkgs/development/libraries/science/math/primecount/default.nix b/pkgs/development/libraries/science/math/primecount/default.nix index 7985b9d6dbd6..e1390ce6416e 100644 --- a/pkgs/development/libraries/science/math/primecount/default.nix +++ b/pkgs/development/libraries/science/math/primecount/default.nix @@ -15,6 +15,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-/Cb/HkD4UQ9gXsRpvRiEuQBoRd0THxNHsBaAAa+CqQo="; }; + cmakeFlags = [ + "-DBUILD_STATIC_LIBS=OFF" + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_TESTS=ON" + "-DBUILD_PRIMECOUNT=ON" + "-DBUILD_LIBPRIMESIEVE=ON" + ]; + meta = with lib; { description = "Fast prime counting function implementations"; homepage = "https://github.com/kimwalisch/primecount"; diff --git a/pkgs/development/libraries/science/math/primesieve/default.nix b/pkgs/development/libraries/science/math/primesieve/default.nix index 2367b373b1c5..0cf263218a3b 100644 --- a/pkgs/development/libraries/science/math/primesieve/default.nix +++ b/pkgs/development/libraries/science/math/primesieve/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "primesieve"; - version = "7.7"; + version = "7.8"; nativeBuildInputs = [ cmake ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "kimwalisch"; repo = "primesieve"; rev = "v${version}"; - sha256 = "sha256-1Gfo00yaf7zHzCLfu/abWqeM0qBuLu+f+lowFFnWFxY="; + sha256 = "sha256-M35CP/xEyC7mEh84kaGsgfsDI9fnanHraNPgTvpqimI="; }; meta = with lib; { diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 3b1fb98a42ea..bafb52be7ffb 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,22 +1,36 @@ { lib, stdenv, fetchFromGitHub, cmake, openssh -, gfortran, mpi, blas, lapack +, mpi, blas, lapack } : -assert (!blas.isILP64) && (!lapack.isILP64); +assert blas.isILP64 == lapack.isILP64; stdenv.mkDerivation rec { pname = "scalapack"; - version = "2.1.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "Reference-ScaLAPACK"; repo = pname; rev = "v${version}"; - sha256 = "1c10d18gj3kvpmyv5q246x35hjxaqn4ygy1cygaydhyxnm4klzdj"; + sha256 = "sha256-GNVGWrIWdfyTfbz7c31Vjt9eDlVzCd/aLHoWq2DMyX4="; }; - nativeBuildInputs = [ cmake openssh gfortran ]; - buildInputs = [ mpi blas lapack ]; + passthru = { inherit (blas) isILP64; }; + + # Required to activate ILP64. + # See https://github.com/Reference-ScaLAPACK/scalapack/pull/19 + postPatch = lib.optionalString passthru.isILP64 '' + sed -i 's/INTSZ = 4/INTSZ = 8/g' TESTING/EIG/* TESTING/LIN/* + sed -i 's/INTGSZ = 4/INTGSZ = 8/g' TESTING/EIG/* TESTING/LIN/* + + # These tests are not adapted to ILP64 + sed -i '/xssep/d;/xsgsep/d;/xssyevr/d' TESTING/CMakeLists.txt + ''; + + nativeBuildInputs = [ cmake ]; + checkInputs = [ openssh ]; + buildInputs = [ blas lapack ]; + propagatedBuildInputs = [ mpi ]; doCheck = true; @@ -25,6 +39,11 @@ stdenv.mkDerivation rec { -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -DLAPACK_LIBRARIES="-llapack" -DBLAS_LIBRARIES="-lblas" + -DCMAKE_Fortran_COMPILER=${mpi}/bin/mpif90 + ${lib.optionalString passthru.isILP64 '' + -DCMAKE_Fortran_FLAGS="-fdefault-integer-8" + -DCMAKE_C_FLAGS="-DInt=long" + ''} ) ''; @@ -52,5 +71,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ costrouc markuskowa ]; }; - } diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index a945e99ec9cb..6ccbfb11f51f 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -4,13 +4,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scs"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "cvxgrp"; repo = "scs"; rev = version; - sha256 = "sha256-yoh25DmvY7fohAvABCiSLkvr7TskGd0ED2K3rIa/IeM="; + sha256 = "sha256-ewn7AGNqTXY3bp5itHTfAQ2Es2ZAIbuRFM5U600Px50="; }; # Actually link and add libgfortran to the rpath diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 151a0eef8916..eea7c146ca33 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "4.0.3"; + version = "6.2.5"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "sha256-Bf3+w/kQtFpeUGp2zWVqja535EbaUw7DbhCw54B6A8k="; + sha256 = "sha256-N4yFlTxV+lVz70PSHPuWEEFLp0dpsImXYDLUYEo2JQI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index 1ebac6ac445d..e734ed8ff35a 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -3,14 +3,12 @@ }: let - version = "4.4.4"; - name = "suitesparse-${version}"; - int_t = if blas.isILP64 then "int64_t" else "int32_t"; SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + version = "4.4.4"; + pname = "suitesparse"; src = fetchurl { url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz"; @@ -71,7 +69,7 @@ stdenv.mkDerivation { done # Install documentation - outdoc=$out/share/doc/${name} + outdoc=$out/share/doc/suitesparse-${version} mkdir -p $outdoc cp -r AMD/Doc $outdoc/amd cp -r BTF/Doc $outdoc/bft diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 5a6de9f64e83..dcf8a1da2586 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "suitesparse"; - version = "5.10.1"; + version = "5.11.0"; outputs = [ "out" "dev" "doc" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; rev = "v${version}"; - sha256 = "sha256-ifuoXgVQp2vHR/reC/Hjbt3vqaKpql3Nfxdb/Cgv/aU="; + sha256 = "sha256-AM16ngJ/CoSV6BOb80Pi9EqWoRILryOO4Rk+S5DffLU="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so" ] ++ lib.optionals stdenv.isDarwin [ # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: - # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.10.1/SuiteSparse_config/SuiteSparse_config.mk#L368 + # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.11.0/SuiteSparse_config/SuiteSparse_config.mk#L368 "BLAS=-lblas" "LAPACK=-llapack" ] diff --git a/pkgs/development/libraries/science/math/trilinos/default.nix b/pkgs/development/libraries/science/math/trilinos/default.nix new file mode 100644 index 000000000000..1939b0a5307b --- /dev/null +++ b/pkgs/development/libraries/science/math/trilinos/default.nix @@ -0,0 +1,102 @@ +{ stdenv +, lib +, fetchFromGitHub +, blas +, boost +, cmake +, gfortran +, lapack +, mpi +, suitesparse +, swig +, withMPI ? false +}: + +# NOTE: Not all packages are enabled. We specifically enable the ones +# required to build Xyce. If the need comes, we can enable more of them. + +let + flagsBase = '' + -G "Unix Makefiles" + -DBUILD_SHARED_LIBS=ON + -DCMAKE_CXX_FLAGS="-O3 -fPIC" + -DCMAKE_C_FLAGS="-O3 -fPIC" + -DCMAKE_Fortran_FLAGS="-O3 -fPIC" + -DTrilinos_ENABLE_NOX=ON + -DNOX_ENABLE_LOCA=ON + -DTrilinos_ENABLE_EpetraExt=ON + -DEpetraExt_BUILD_BTF=ON + -DEpetraExt_BUILD_EXPERIMENTAL=ON + -DEpetraExt_BUILD_GRAPH_REORDERINGS=ON + -DTrilinos_ENABLE_TrilinosCouplings=ON + -DTrilinos_ENABLE_Ifpack=ON + -DTrilinos_ENABLE_AztecOO=ON + -DTrilinos_ENABLE_Belos=ON + -DTrilinos_ENABLE_Teuchos=ON + -DTeuchos_ENABLE_COMPLEX=ON + -DTrilinos_ENABLE_Amesos=ON + -DAmesos_ENABLE_KLU=ON + -DTrilinos_ENABLE_Amesos2=ON + -DAmesos2_ENABLE_KLU2=ON + -DAmesos2_ENABLE_Basker=ON + -DTrilinos_ENABLE_Sacado=ON + -DTrilinos_ENABLE_Stokhos=ON + -DTrilinos_ENABLE_Kokkos=ON + -DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES=OFF + -DTrilinos_ENABLE_CXX11=ON + -DTPL_ENABLE_AMD=ON + -DTPL_ENABLE_BLAS=ON + -DTPL_ENABLE_LAPACK=ON + ''; + flagsParallel = '' + -DCMAKE_C_COMPILER=mpicc + -DCMAKE_CXX_COMPILER=mpic++ + -DCMAKE_Fortran_COMPILER=mpif77 + -DTrilinos_ENABLE_Isorropia=ON + -DTrilinos_ENABLE_Zoltan=ON + -DTPL_ENABLE_MPI=ON + ''; +in +stdenv.mkDerivation rec { + pname = "trilinos"; + # Xyce 7.4 requires version 12.12.1 + # nixpkgs-update: no auto update + version = "12.12.1"; + + src = fetchFromGitHub { + owner = "trilinos"; + repo = "Trilinos"; + rev = "${pname}-release-${lib.replaceStrings [ "." ] [ "-" ] version}"; + sha256 = "sha256-Nqjr7RAlUHm6vs87a1P84Y7BIZEL0Vs/A1Z6dykfv+o="; + }; + + nativeBuildInputs = [ cmake gfortran swig ]; + + buildInputs = [ blas boost lapack suitesparse ] ++ lib.optionals withMPI [ mpi ]; + + preConfigure = + if withMPI then '' + cmakeFlagsArray+=(${flagsBase} ${flagsParallel}) + '' + else '' + cmakeFlagsArray+=(${flagsBase}) + ''; + + passthru = { + inherit withMPI; + }; + + meta = with lib; { + description = "Engineering and scientific problems algorithms"; + longDescription = '' + The Trilinos Project is an effort to develop algorithms and enabling + technologies within an object-oriented software framework for the + solution of large-scale, complex multi-physics engineering and scientific + problems. + ''; + homepage = "https://trilinos.org"; + license = licenses.bsd3; + maintainers = with maintainers; [ fbeffa ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/development/libraries/sdbus-cpp/default.nix new file mode 100644 index 000000000000..d665a6d94a5a --- /dev/null +++ b/pkgs/development/libraries/sdbus-cpp/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, systemd +, expat +}: + +stdenv.mkDerivation rec { + pname = "sdbus-cpp"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "kistler-group"; + repo = "sdbus-cpp"; + rev = "v${version}"; + sha256 = "sha256-AjaZ6YmMlnN0jAcUBkft01XHkrze0nSr3dUMechsLrQ="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + systemd + expat + ]; + + cmakeFlags = [ + "-DBUILD_CODE_GEN=ON" + ]; + + meta = with lib; { + homepage = "https://github.com/Kistler-Group/sdbus-cpp"; + changelog = "https://github.com/Kistler-Group/sdbus-cpp/blob/v${version}/ChangeLog"; + description = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API"; + longDescription = '' + sdbus-c++ is a high-level C++ D-Bus library for Linux designed to provide expressive, easy-to-use API in modern C++. + It adds another layer of abstraction on top of sd-bus, a nice, fresh C D-Bus implementation by systemd. + It's been written primarily as a replacement of dbus-c++, which currently suffers from a number of (unresolved) bugs, + concurrency issues and inherent design complexities and limitations. + ''; + mainProgram = "sdbus-c++-xml2cpp"; + license = licenses.lgpl2Only; + platforms = platforms.linux; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index ba4c8fcd0efd..1c29b85bebe7 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.4.13"; + version = "0.4.15"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - sha256 = "sha256-btgv/GwwQhT/DtWhjM/g081UYLT7E76ZhqXZdMiIWsk="; + sha256 = "sha256-XHJa4erDxSFiy0u8S9ODQlMNDb1wrz+d1PzWeq5BZLY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/shine/default.nix b/pkgs/development/libraries/shine/default.nix new file mode 100644 index 000000000000..8e5d02e632d2 --- /dev/null +++ b/pkgs/development/libraries/shine/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "shine"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "toots"; + repo = "shine"; + rev = version; + sha256 = "06nwylqqji0i1isdprm2m5qsdj4qiywcgnp69c5b55pnw43f07qg"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "Fast fixed-point mp3 encoding library"; + homepage = "https://github.com/toots/shine"; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 3ce41e3193c5..c24c336c7289 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.11"; + version = "2020.3.12"; 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-u438vCo7AUPR/88B0alh5WbvId0z2cx2jW2apYcdTzw="; + sha256 = "sha256-W7KZzFU5qZE6tOv9YSzH3yoNi8YET2yzmThMcl23140="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix index c3c4f8610c70..3bf22261f219 100644 --- a/pkgs/development/libraries/smarty3/default.nix +++ b/pkgs/development/libraries/smarty3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smarty3"; - version = "3.1.39"; + version = "3.1.44"; src = fetchFromGitHub { owner = "smarty-php"; repo = "smarty"; rev = "v${version}"; - sha256 = "0n5hmnw66gxqikp6frgfd9ywsvr2azyg5nl7ix89digqlzcljkbg"; + sha256 = "sha256-9a9OC18jyFpmFXffYOYHZ0j01j4NCF5zwrSYr1fZwqo="; }; installPhase = '' diff --git a/pkgs/development/libraries/smooth/default.nix b/pkgs/development/libraries/smooth/default.nix index 8e55c8f4128a..cc71bca442a0 100644 --- a/pkgs/development/libraries/smooth/default.nix +++ b/pkgs/development/libraries/smooth/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "smooth"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "enzo1982"; repo = "smooth"; rev = "v${version}"; - sha256 = "sha256-4092Od/wCWe4br80Ry6mr8GpUIUeeF6sk3unELdfQJU="; + sha256 = "sha256-30qVXK54SDL2+ZPbTINZix4Ax1iOMg2WLeEDyAr77Og="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 83b4b2193c03..b671f47bf8cc 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: stdenv.mkDerivation rec { - name = "smpeg-svn${version}"; + pname = "smpeg-svn"; version = "390"; src = fetchsvn { diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix index 5b8f93d7bc7b..b17fbe16655b 100644 --- a/pkgs/development/libraries/soci/default.nix +++ b/pkgs/development/libraries/soci/default.nix @@ -1,5 +1,6 @@ { cmake , fetchFromGitHub +, fetchpatch , sqlite , postgresql , boost @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-NE0ApbX8HG2VAQ9cg9+kX3kJQ4PR1XvWL9BlT8NphmE="; }; + patches = [ + (fetchpatch { + name = "fix-backend-search-path.patch"; + url = "https://github.com/SOCI/soci/commit/56c93afc467bdba8ffbe68739eea76059ea62f7a.patch"; + sha256 = "sha256-nC/39pn3Cv5e65GgIfF3l64/AbCsfZHPUPIWETZFZAY="; + }) + ]; + # Do not build static libraries cmakeFlags = [ "-DSOCI_STATIC=OFF" "-DCMAKE_CXX_STANDARD=11" ]; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index bbee609eb267..6bb11139502f 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.6"; + version = "1.13.7"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "0b1gq499ksgsi16f5nf3dzbj6s8knwkiak5j810jzdfm7vkm0vvm"; + sha256 = "sha256-gBejwt5YAkCKQh0vzN00J4y1ifcdc4TglA+SqEevaGQ="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix index dcec1c897b3b..39a64c84ddcd 100644 --- a/pkgs/development/libraries/soil/default.nix +++ b/pkgs/development/libraries/soil/default.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation { - name = "soil"; + pname = "soil"; + version = "unstable-2020-01-04"; src = fetchzip { url = "https://web.archive.org/web/20200104042737id_/http://www.lonesock.net/files/soil.zip"; diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix index bf2145c68c43..39b2d7fd8fd5 100644 --- a/pkgs/development/libraries/sope/default.nix +++ b/pkgs/development/libraries/sope/default.nix @@ -4,13 +4,13 @@ with lib; gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.5.0"; + version = "5.5.1"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - sha256 = "sha256-M5PF15Ok+rJLWlfHsC8F8JXJonAR0wwTUbWxegBZ/qQ="; + sha256 = "sha256-w78YO5EQWtEiySOm9NpPbaMChbJppNBoZNOBs9fibbM="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix deleted file mode 100644 index 46520714c510..000000000000 --- a/pkgs/development/libraries/soprano/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, qt4, clucene_core, librdf_redland, libiodbc -, pkg-config }: - -stdenv.mkDerivation rec { - pname = "soprano"; - version = "2.9.4"; - - src = fetchurl { - url = "mirror://sourceforge/soprano/${pname}-${version}.tar.bz2"; - sha256 = "1rg0x7yg0a1cbnxz7kqk52580wla8jbnj4d4r3j7l7g7ajyny1k4"; - }; - - patches = [ ./find-virtuoso.patch ]; - - # We disable the Java backend, since we do not need them and they make the closure size much bigger - buildInputs = [ qt4 clucene_core librdf_redland libiodbc ]; - - nativeBuildInputs = [ cmake pkg-config ]; - - meta = { - homepage = "http://soprano.sourceforge.net/"; - description = "An object-oriented C++/Qt4 framework for RDF data"; - license = "LGPL"; - maintainers = with lib.maintainers; [ sander ]; - inherit (qt4.meta) platforms; - }; -} diff --git a/pkgs/development/libraries/soprano/find-virtuoso.patch b/pkgs/development/libraries/soprano/find-virtuoso.patch deleted file mode 100644 index 95a2c7e96565..000000000000 --- a/pkgs/development/libraries/soprano/find-virtuoso.patch +++ /dev/null @@ -1,86 +0,0 @@ -From: Yury G. Kudryashov -Subject: [PATCH] Find virtuoso if virtuoso-t is in PATH - ---- - backends/virtuoso/virtuosobackend.cpp | 31 ++++++++++++++++++++++--------- - backends/virtuoso/virtuosobackend.h | 2 +- - 2 files changed, 23 insertions(+), 10 deletions(-) - -diff --git a/backends/virtuoso/virtuosobackend.cpp b/backends/virtuoso/virtuosobackend.cpp -index c245101..249958a 100644 ---- a/backends/virtuoso/virtuosobackend.cpp -+++ b/backends/virtuoso/virtuosobackend.cpp -@@ -28,6 +28,7 @@ - #include "odbcconnectionpool.h" - - #include "sopranodirs.h" -+#include "soprano-config.h" - - #include - #include -@@ -210,19 +211,19 @@ Soprano::BackendFeatures Soprano::Virtuoso::BackendPlugin::supportedFeatures() c - - bool Soprano::Virtuoso::BackendPlugin::isAvailable() const - { --#ifndef Q_OS_WIN -- if ( findVirtuosoDriver().isEmpty() ) { -- qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; -- return false; -- } --#endif -- - QString virtuosoBin = locateVirtuosoBinary(); - if ( virtuosoBin.isEmpty() ) { - qDebug() << Q_FUNC_INFO << "could not find virtuoso-t binary"; - return false; - } - -+#ifndef Q_OS_WIN -+ if ( findVirtuosoDriver( virtuosoBin ).isEmpty() ) { -+ qDebug() << Q_FUNC_INFO << "could not find Virtuoso ODBC driver"; -+ return false; -+ } -+#endif -+ - QString vs = determineVirtuosoVersion( virtuosoBin ); - if ( vs.isEmpty() ) { - qDebug() << Q_FUNC_INFO << "Failed to determine version of the Virtuoso server at" << virtuosoBin; -@@ -267,9 +268,21 @@ QString Soprano::Virtuoso::BackendPlugin::locateVirtuosoBinary() - - #ifndef Q_OS_WIN - // static --QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() -+QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver( const QString &virtuosoBinHint ) - { -- return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << QLatin1String( "virtuoso/plugins/" ) << QLatin1String( "odbc/" ) ); -+ QString virtuosoBin; -+ if (virtuosoBinHint.isEmpty()) -+ virtuosoBin = locateVirtuosoBinary(); -+ else -+ virtuosoBin = virtuosoBinHint; -+ -+ QDir virtuosoBinDir = QFileInfo(virtuosoBin).absoluteDir(); -+ return Soprano::findLibraryPath( "virtodbc_r", -+ QStringList() -+ << virtuosoBinDir.absoluteFilePath("../lib"SOPRANO_LIB_SUFFIX) -+ << virtuosoBinDir.absoluteFilePath("../lib"), -+ QStringList() << QLatin1String( "virtuoso/plugins/" ) << -+ QLatin1String( "odbc/" ) ); - } - #endif - -diff --git a/backends/virtuoso/virtuosobackend.h b/backends/virtuoso/virtuosobackend.h -index 646b9f8..535fbb9 100644 ---- a/backends/virtuoso/virtuosobackend.h -+++ b/backends/virtuoso/virtuosobackend.h -@@ -52,7 +52,7 @@ namespace Soprano { - - #ifndef Q_OS_WIN - private: -- static QString findVirtuosoDriver(); -+ static QString findVirtuosoDriver(const QString &virtuosoBinHint = QString()); - #endif - }; - } --- -tg: (2321148..) t/find-virtuoso (depends on: master) diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index 406603e66225..f2bc63d4f6d6 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -29,6 +29,5 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [raskin]; license = lib.licenses.gpl2; downloadPage = "http://www.soft-switch.org/downloads/spandsp/"; - updateWalker = true; }; } diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 8706b8789227..c69345193c77 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, alsa-lib, ncurses }: stdenv.mkDerivation rec { - name = "speech_tools-${version}.0"; - version = "2.5"; + pname = "speech_tools"; + version = "2.5.0"; src = fetchurl { - url = "http://www.festvox.org/packed/festival/${version}/${name}-release.tar.gz"; + url = "http://www.festvox.org/packed/festival/${lib.versions.majorMinor version}/speech_tools-${version}-release.tar.gz"; sha256 = "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4"; }; diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index a7d4aa970742..5509be7822d7 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw, speexdsp }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, fftw, speexdsp }: stdenv.mkDerivation rec { pname = "speex"; @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sed -i '/AC_CONFIG_MACRO_DIR/i PKG_PROG_PKG_CONFIG' configure.ac ''; + patches = [ + (fetchpatch { + name = "CVE-2020-23903.patch"; + url = "https://github.com/xiph/speex/commit/870ff845b32f314aec0036641ffe18aba4916887.patch"; + sha256 = "sha256-uEMDhDTw/LIWNPPCXW6kF+udBmNO88G/jJTojAA9fs8="; + }) + ]; + outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 13bfae944e02..db5db61c6e99 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -9,8 +9,10 @@ , gst_all_1 , gtk-doc , gtk3 +, hwdata , json-glib , libcacard +, libcap_ng , libdrm , libjpeg_turbo , libopus @@ -28,8 +30,8 @@ , python3 , spice-protocol , usbredir -, usbutils , vala +, wayland-protocols , zlib , withPolkit ? true }: @@ -57,19 +59,23 @@ stdenv.mkDerivation rec { pname = "spice-gtk"; - version = "0.37"; + version = "0.40"; outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { - url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.bz2"; - sha256 = "1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z"; + url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.xz"; + sha256 = "sha256-I/X/f6gLdWR85zzaXq+LMi80Mtu7f286g5Y0YYrbztM="; }; postPatch = '' # get rid of absolute path to helper in store so we can use a setuid wrapper substituteInPlace src/usb-acl-helper.c \ --replace 'ACL_HELPER_PATH"/' '"' + # don't try to setcap/suid in a nix builder + substituteInPlace src/meson.build \ + --replace "meson.add_install_script('../build-aux/setcap-or-suid'," \ + "# meson.add_install_script('../build-aux/setcap-or-suid'," ''; nativeBuildInputs = [ @@ -98,6 +104,7 @@ stdenv.mkDerivation rec { gtk3 json-glib libcacard + libcap_ng libdrm libjpeg_turbo libopus @@ -108,14 +115,17 @@ stdenv.mkDerivation rec { pixman spice-protocol usbredir + wayland-protocols zlib - ] ++ lib.optionals withPolkit [ polkit acl usbutils ] ; + ] ++ lib.optionals withPolkit [ polkit acl ] ; PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; mesonFlags = [ - "-Dcelt051=disabled" - "-Dpulse=disabled" # is deprecated upstream + "-Dusb-acl-helper-dir=${placeholder "out"}/bin" + "-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids" + ] ++ lib.optionals (!withPolkit) [ + "-Dpolkit=disabled" ]; meta = with lib; { diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index 12eb03b6d63f..d7800859d057 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "spice-protocol"; - version = "0.14.3"; + version = "0.14.4"; src = fetchurl { url = "https://www.spice-space.org/download/releases/${pname}-${version}.tar.xz"; - sha256 = "0yj8k7gcirrsf21w0q6146n5g4nzn2pqky4p90n5760m5ayfb1pr"; + sha256 = "sha256-BP+6YQ2f1EHPxH36oTXXAJbmCxBG0hGdjbL46g0X2RI="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index ee0f6be16984..4f639cf29f74 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -46,6 +46,12 @@ stdenv.mkDerivation rec { postPatch = '' install ${doxygen_sh} doxygen.sh patchShebangs build-aux + + # https://gitlab.freedesktop.org/spice/spice-common/-/issues/5 + substituteInPlace subprojects/spice-common/meson.build \ + --replace \ + "cmd = run_command(python, '-m', module)" \ + "cmd = run_command(python, '-c', 'import @0@'.format(module))" ''; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index 353347215663..13714b4825cf 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "sha256-MFuFyKvOOrDrq9cDPQlNK6/YHSkaRX4qbw/44m5CRh4="; + sha256 = "sha256-cvbR3tav6DjIdJB/x2q5Oq7ju9q63z75b6q1uHYY9bE="; }; nativeBuildInputs = [ installShellFiles tcl ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 6704d894f5a2..5fdf6c11d77b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation rec { - pname = "sqlite"; + pname = "sqlite${optionalString interactive "-interactive"}"; version = "3.37.2"; # nixpkgs-update: no auto update diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index 49c761231015..c74780148a1b 100644 --- a/pkgs/development/libraries/srt/default.nix +++ b/pkgs/development/libraries/srt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "srt"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "Haivision"; repo = "srt"; rev = "v${version}"; - sha256 = "1f60vlfxhh9bhafws82c3301whjlz5gy92jz9a9ymwfg5h53bv1j"; + sha256 = "sha256-OfcMHH+MSOGY9pxpXt19EIGdP4FJFssSv/lENX+iIf8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index 92ecf3e494e1..cbe5e13a7007 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "symengine"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - sha256 = "sha256-HTDOSgdWo9MWmKeXOkOHAJjgvihUAkSXoYTeMz9XXLI="; + sha256 = "sha256-5KpxBusJCuwrfFWHbrRKlH6Ic7YivYqz2m+BCbNfZp0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 69940c18aafc..66c9863c38a4 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -21,19 +21,22 @@ stdenv.mkDerivation rec { version = "5.1.2"; src = fetchurl { - url = "mirror://metalab/libs/graphics/t1lib-${version}.tar.gz"; - sha256 = "0nbvjpnmcznib1nlgg8xckrmsw3haa154byds2h90y2g0nsjh4w2"; + url = "mirror://ibiblioPubLinux/libs/graphics/${pname}-${version}.tar.gz"; + hash = "sha256-ghMotQVPeJCg0M0vUoJScHBd82QdvUdtWNF+Vu2Ve1k="; }; inherit patches; buildInputs = [ libX11 libXaw ]; buildFlags = [ "without_doc" ]; - postInstall = lib.optionalString (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? + postInstall = lib.optionalString (!stdenv.isDarwin) '' + # ?? + chmod +x $out/lib/*.so.* + ''; meta = with lib; { - description = "A type 1 font rasterizer library for UNIX/X11"; homepage = "http://www.t1lib.org/"; + description = "A type 1 font rasterizer library for UNIX/X11"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index fa6ca0141815..e2f611ed9d11 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -13,10 +13,10 @@ assert stdenv.isDarwin -> Carbon != null; stdenv.mkDerivation rec { pname = "tachyon"; - version = "0.99b6"; + version = "0.99.3"; src = fetchurl { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "15wv2748ngk2iid798a774sjxhhijq7kjm32yl897x54fsfazp7l"; + sha256 = "sha256-rsxxm1NK2IPRl/5O2Ng2sC1VH84Zj1uJ6mN+HZHyN+E="; }; buildInputs = lib.optionals stdenv.isDarwin [ Carbon diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 5f136a5e6b64..666d013adebc 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://taglib.org/"; - repositories.git = "git://github.com/taglib/taglib.git"; description = "A library for reading and editing audio file metadata"; longDescription = '' TagLib is a library for reading and editing the meta-data of several diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 7aef5ba74768..7913f05354d4 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { postInstall = let pcTemplate = fetchurl { - url = "https://github.com/oneapi-src/oneTBB/raw/master/integration/pkg-config/tbb.pc.in"; + url = "https://github.com/oneapi-src/oneTBB/raw/478de5b1887c928e52f029d706af6ea640a877be/integration/pkg-config/tbb.pc.in"; sha256 = "2pCad9txSpNbzac0vp/VY3x7HNySaYkbH3Rx8LK53pI="; }; in '' diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index a8cf2a44fab6..3c814e17207c 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -1,18 +1,19 @@ { lib, fetchurl, tcl }: tcl.mkTclDerivation rec { - name = "tclx-${version}.${patch}"; - version = "8.4"; - patch = "1"; + pname = "tclx"; + version = "8.4.1"; src = fetchurl { - url = "mirror://sourceforge/tclx/tclx${version}.${patch}.tar.bz2"; + url = "mirror://sourceforge/tclx/tclx${version}.tar.bz2"; sha256 = "1v2qwzzidz0is58fd1p7wfdbscxm3ip2wlbqkj5jdhf6drh1zd59"; }; # required in order for tclx to properly detect tclx.tcl at runtime - postInstall = '' - ln -s $prefix/lib/tclx${version} $prefix/lib/tclx${version}/tclx${version} + postInstall = let + majorMinorVersion = lib.versions.majorMinor version; + in '' + ln -s $prefix/lib/tclx${majorMinorVersion} $prefix/lib/tclx${majorMinorVersion}/tclx${majorMinorVersion} ''; meta = { diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index febf1b97eb68..f040022cc91b 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - sha256 = "sha256-vPztiE9wMQgJmLXEscXc5XVnBV95QX+G26QNzemaDkE="; + sha256 = "sha256-1okr2L7+BKd2QqHdVuSoeTSb8c9bLAv1+4QQYZON7ws="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 79895a63a34c..4dedc13db2a8 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "tdlib"; repo = "td"; # https://github.com/tdlib/td/issues/1790 - rev = "b3ab664a18f8611f4dfcd3054717504271eeaa7a"; - sha256 = "OBgzFBi+lIBbKnHDm5D/F3Xi4s1x4geb+1OoBP3F+qY="; + rev = "92c2a9c4e521df720abeaa9872e1c2b797d5c93f"; + sha256 = "ZoKsgdkS78mptfbxkkV4pgcgJEaWwKZWK2cvmxgJN4E="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index c0ee2c1d3506..375a7c3237a5 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: let - version = "3.34.0"; + version = "3.34.1"; pname = "template-glib"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1"; + sha256 = "nsm3HgTU9csU91XveQYxzQtFwGA+Ecg2/Hz9niaM0Ho="; }; buildInputs = [ meson ninja pkg-config gettext flex bison vala glib gtk-doc docbook_xsl docbook_xml_dtd_43 ]; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index c5795df55c01..f85e56578bbe 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "thrift"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { url = "https://archive.apache.org/dist/thrift/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-1Yg1ZtFh+Pbd1OIfOp4+a4JyeZ0FSCDxwlsR6GcY+Gs="; + sha256 = "sha256-9GC1wcow2JGP+V6j62KRs5Uc9RhVNWYIjz8r6JgfYgk="; }; # Workaround to make the python wrapper not drop this package: diff --git a/pkgs/development/libraries/tinygltf/default.nix b/pkgs/development/libraries/tinygltf/default.nix new file mode 100644 index 000000000000..af9938e3b8a6 --- /dev/null +++ b/pkgs/development/libraries/tinygltf/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, nix-update-script +, cmake +}: + +stdenv.mkDerivation rec { + version = "2.5.0"; + pname = "tinygltf"; + + src = fetchFromGitHub { + owner = "syoyo"; + repo = "tinygltf"; + rev = "v${version}"; + sha256 = "sha256-Pw4iNJs0bKALVPFBYUJe5/WjHxdffungCKfJFJEpDas="; + }; + + nativeBuildInputs = [ cmake ]; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + + meta = with lib; { + description = "Header only C++11 tiny glTF 2.0 library"; + homepage = "https://github.com/syoyo/tinygltf"; + license = licenses.mit; + maintainers = with maintainers; [ jansol ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 6aa67bf274de..fd4f3dea3750 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -3,7 +3,8 @@ , ... }: tcl.mkTclDerivation { - name = "tk-${tcl.version}"; + pname = "tk"; + version = tcl.version; inherit src patches; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index e3c74bd2fe45..7c3e495d54a3 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl -, substituteAll , asciidoc , docbook-xsl-nons , docbook_xml_dtd_45 @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RDafU+Lt70FDdAbb7s1Hepf4qa/dkTSDLqRdG6KqLEc="; + sha256 = "izh967d0BhwGrfsmeg4ODz0heZNxvwHQVklaubjdlBc="; }; nativeBuildInputs = [ @@ -113,13 +113,6 @@ stdenv.mkDerivation rec { "-Dminer_rss=false" ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit asciidoc; - }) - ]; - postInstall = '' glib-compile-schemas "$out/share/glib-2.0/schemas" ''; @@ -127,7 +120,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "none"; }; }; diff --git a/pkgs/development/libraries/tracker-miners/fix-paths.patch b/pkgs/development/libraries/tracker-miners/fix-paths.patch deleted file mode 100644 index 8661648eacdf..000000000000 --- a/pkgs/development/libraries/tracker-miners/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build -index 0b8a64863..a09db59f0 100644 ---- a/docs/manpages/meson.build -+++ b/docs/manpages/meson.build -@@ -43,7 +43,7 @@ foreach m : daemon_manpages + cli_manpages - command: [xsltproc, - '--output', '@OUTPUT@', - '--stringparam', 'man.authors.section.enabled', '0', -- '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], -+ '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], - input: xml, - output: manpage, - install: true, diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 727634a9fd5d..5cb3dc73daa8 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , gettext , meson , ninja @@ -26,34 +25,19 @@ , json-glib , systemd , dbus -, substituteAll }: stdenv.mkDerivation rec { pname = "tracker"; - version = "3.2.1"; + version = "3.3.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "GEfgiznm5h2EhzWqH5f32WwDggFlP6DXy56Bs365wDo="; + sha256 = "Bwb5b+f5XfQqzsgSwd57RZOg1kgyHKg1BqnXHiJBe9o="; }; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit asciidoc; - }) - - # Filter out hidden (wrapped) subcommands - # https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/481 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/tracker/-/commit/8c28c24e447f13da8cf804cd7a00f9b909c5d3f9.patch"; - sha256 = "EYo1nOtEr4semaPC5wk6A7bliRXu8qsBHaltd0DEI6Y="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -69,7 +53,8 @@ stdenv.mkDerivation rec { python3 # for data-generators systemd # used for checks to install systemd user service dbus # used for checks and pkg-config to install dbus service/s - ]; + ] ++ checkInputs; # gi is in the main meson.build and checked regardless of + # whether tests are enabled buildInputs = [ glib @@ -85,7 +70,6 @@ stdenv.mkDerivation rec { checkInputs = with python3.pkgs; [ pygobject3 - tappy ]; mesonFlags = [ @@ -119,7 +103,9 @@ stdenv.mkDerivation rec { dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - meson test --print-errorlogs + meson test \ + --timeout-multiplier 2 \ + --print-errorlogs runHook postCheck ''; @@ -132,7 +118,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "none"; }; }; diff --git a/pkgs/development/libraries/tracker/fix-paths.patch b/pkgs/development/libraries/tracker/fix-paths.patch deleted file mode 100644 index 5e4d8657f7bc..000000000000 --- a/pkgs/development/libraries/tracker/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build -index f90c757cf..40d9c939d 100644 ---- a/docs/manpages/meson.build -+++ b/docs/manpages/meson.build -@@ -32,7 +32,7 @@ foreach m : manpages - command: [xsltproc, - '--output', '@OUTPUT@', - '--stringparam', 'man.authors.section.enabled', '0', -- '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], -+ '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], - input: xml, - output: manpage, - install: true, diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 76118edfcb3b..0dc79d47dda7 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "ucx"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "0jwza9ivfnhkfwg4c58pxalkga5scz803k631xw4hcliy62gk53w"; + sha256 = "08ajhbhzwkfzhkhswk56zx17q18ii67dg1ca1f5grl9qjgj3mmyw"; }; nativeBuildInputs = [ autoreconfHook doxygen ]; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index b00177960d3b..286f5ccc3fcf 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.17.6"; + version = "0.17.7"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-X60zN3orHU8lOfRVCfbHTdrleKxB7ILCIGvXSZLdoSk="; + sha256 = "sha256-BdZCoW3QHM4Oue4bpuSFsuwIU1vsZ5pjqVv9TfGNC7U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index 48a80aacdf59..980d073f1281 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, doxygen }: stdenv.mkDerivation rec { - name = "uri-${version}"; + pname = "uri"; version = "1.1.0"; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index f21a947a533f..2a9f0cf74032 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { backends for each supported hardware vendor. ''; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/volk/default.nix b/pkgs/development/libraries/volk/default.nix index 40ae88bf71bb..c795d783894e 100644 --- a/pkgs/development/libraries/volk/default.nix +++ b/pkgs/development/libraries/volk/default.nix @@ -5,10 +5,13 @@ , python3 , enableModTool ? true , removeReferencesTo +, fetchpatch }: stdenv.mkDerivation rec { pname = "volk"; + # Version 2.5.1 seems to cause a build issue for aarch64-darwin, see: + # https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A version = "2.5.0"; src = fetchFromGitHub { @@ -19,6 +22,14 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff"; + sha256 = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI="; + extraPrefix = ""; + }) + ]; + cmakeFlags = lib.optionals (!enableModTool) [ "-DENABLE_MODTOOL=OFF" ]; postInstall = lib.optionalString (!stdenv.isDarwin) '' ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix index 55ef86c88a0e..dfb76069c3b2 100644 --- a/pkgs/development/libraries/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }: stdenv.mkDerivation rec { - versionMajor = "0.36"; - versionMinor = "3"; - moduleName = "vte"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; + pname = "vte"; + version = "0.36.3"; src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; + url = "mirror://gnome/sources/vte/${lib.versions.majorMinor version}/vte-${version}.tar.xz"; sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; }; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 0411086c78c3..16a800110942 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -21,17 +21,19 @@ , zlib , icu , systemd +, systemdSupport ? stdenv.hostPlatform.isLinux +, nixosTests }: stdenv.mkDerivation rec { pname = "vte"; - version = "0.64.2"; + version = "0.68.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KzyCC2WmZ8HYhZuiBHi+Ym0VGcwxWdrCX3AzMMbQfhg="; + sha256 = "sha256-E+fUeJyiFqM3gAMNJGybE92/0ECUxjFu6n/5IoTdF0k="; }; patches = [ @@ -63,6 +65,7 @@ stdenv.mkDerivation rec { pcre2 zlib icu + ] ++ lib.optionals systemdSupport [ systemd ]; @@ -73,6 +76,10 @@ stdenv.mkDerivation rec { pango ]; + mesonFlags = lib.optionals (!systemdSupport) [ + "-D_systemd=false" + ]; + postPatch = '' patchShebangs perf/* patchShebangs src/box_drawing_generate.sh @@ -85,6 +92,9 @@ stdenv.mkDerivation rec { packageName = pname; versionPolicy = "odd-unstable"; }; + tests = { + inherit (nixosTests.terminal-emulators) gnome-terminal lxterminal mlterm roxterm sakura stupidterm terminator termite xfce4-terminal; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index c180b05e9521..d770bd54d04c 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -90,6 +90,16 @@ in stdenv.mkDerivation rec { sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c ''; + preFixup = '' + for lib in $out/lib/libvtk*.so; do + ln -s $lib $out/lib/"$(basename "$lib" | sed -e 's/-[[:digit:]]*.[[:digit:]]*//g')" + done + + mv $out/include/vtk-${majorVersion}/* $out/include + rmdir $out/include/vtk-${majorVersion} + ln -s $out/include $out/include/vtk-${majorVersion} + ''; + meta = with lib; { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = "https://www.vtk.org/"; diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index a46ed1adee7c..4010ee684590 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Vulkan Header files and API registry"; homepage = "https://www.lunarg.com"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.ralith ]; }; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index e598d2c864be..077f881e722d 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb -, libXrandr, wayland, vulkan-headers, addOpenGLRunpath }: +, libXrandr, wayland, moltenvk, vulkan-headers, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "vulkan-loader"; @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { }); nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libX11 libxcb libXrandr vulkan-headers wayland ]; + buildInputs = [ vulkan-headers ] + ++ lib.optionals (!stdenv.isDarwin) [ libX11 libxcb libXrandr wayland ]; - cmakeFlags = [ - "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share" - "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" - ]; + cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ] + ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share" + ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"; outputs = [ "out" "dev" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "LunarG Vulkan loader"; homepage = "https://www.lunarg.com"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; maintainers = [ maintainers.ralith ]; }; diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index 56ed7367b2b2..e8436f9e9565 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -1,14 +1,27 @@ -{ stdenv, fetchFromGitHub, lib }: +{ stdenv, buildPackages, fetchFromGitHub, lib }: stdenv.mkDerivation { pname = "wasilibc"; - version = "20190712"; - src = fetchFromGitHub { - owner = "CraneStation"; + version = "unstable-2021-09-23"; + + src = buildPackages.fetchFromGitHub { + owner = "WebAssembly"; repo = "wasi-libc"; - rev = "8df0d4cd6a559b58d4a34b738a5a766b567448cf"; - sha256 = "1n4gvgzacpagar2mx8g9950q0brnhwz7jg2q44sa5mnjmlnkiqhh"; + rev = "ad5133410f66b93a2381db5b542aad5e0964db96"; + hash = "sha256-RiIClVXrb18jF9qCt+5iALHPCZKYcnad7JsILHBV0pA="; + fetchSubmodules = true; }; + + # clang-13: error: argument unused during compilation: '-rtlib=compiler-rt' [-Werror,-Wunused-command-line-argument] + postPatch = '' + substituteInPlace Makefile \ + --replace "-Werror" "" + ''; + + preBuild = '' + export NIX_CFLAGS_COMPILE="-I$(pwd)/sysroot/include $NIX_CFLAGS_COMPILE" + ''; + makeFlags = [ "WASM_CC=${stdenv.cc.targetPrefix}cc" "WASM_NM=${stdenv.cc.targetPrefix}nm" @@ -16,6 +29,8 @@ stdenv.mkDerivation { "INSTALL_DIR=${placeholder "out"}" ]; + enableParallelBuilding = true; + postInstall = '' mv $out/lib/*/* $out/lib ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports @@ -23,9 +38,9 @@ stdenv.mkDerivation { meta = with lib; { description = "WASI libc implementation for WebAssembly"; - homepage = "https://wasi.dev"; - platforms = platforms.wasi; - maintainers = [ maintainers.matthewbauer ]; + homepage = "https://wasi.dev"; + platforms = platforms.wasi; + maintainers = with maintainers; [ matthewbauer ]; license = with licenses; [ asl20 mit llvm-exception ]; }; } diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 73fef21eccb7..61696d232f79 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.24"; + version = "1.25"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1hlb6gvyqlmsdkv5179ccj07p04cn6xacjkgklakbszczv7xiw5z"; + sha256 = "0q0laxdvf8p8b7ks2cbpqf6q0rwrjycqrp8pf8rxm86hk5qhzzzi"; }; postPatch = lib.optionalString doCheck '' diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 0aa77b771e48..49e0e01872f5 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -16,13 +16,13 @@ assert docSupport -> doxygen != null; with lib; stdenv.mkDerivation rec { pname = "waylandpp"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "NilsBrause"; repo = pname; rev = version; - sha256 = "1kxiqab48p0n97pwg8c2zx56wqq32m3rcq7qd2pjj33ipcanb3qq"; + sha256 = "sha256-c7sayJjQaqJWso2enESBx6OUW9vxxsfuHFolYDIYlXw="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index e9026d46bc69..afa8c63490a6 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , runCommand , fetchurl , perl @@ -44,7 +45,6 @@ , lcms2 , libmanette , openjpeg -, enableGeoLocation ? true , geoclue2 , sqlite , enableGLES ? true @@ -58,13 +58,14 @@ , substituteAll , glib , addOpenGLRunpath +, enableGeoLocation ? true +, withLibsecret ? true +, systemdSupport ? stdenv.isLinux }: -assert enableGeoLocation -> geoclue2 != null; - stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.34.4"; + version = "2.34.6"; outputs = [ "out" "dev" ]; @@ -72,7 +73,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-l19QGRmbp2mRkYNc914BoYuU47zQEH2nOJ1N3LGrpAY="; + sha256 = "sha256-a8j9A0qtBDKiRZzk/H7iWtZaSSTGGL+Nk7UrDBqEwfY="; }; patches = lib.optionals stdenv.isLinux [ @@ -125,12 +126,8 @@ stdenv.mkDerivation rec { libidn libintl lcms2 - ] ++ lib.optionals stdenv.isLinux [ - libmanette - ] ++ [ libnotify libpthreadstubs - libsecret libtasn1 libwebp libxkbcommon @@ -155,28 +152,37 @@ stdenv.mkDerivation rec { # (We pick just that one because using the other headers from `sdk` is not # compatible with our C++ standard library. This header is already in # the standard library on aarch64) - runCommand "${pname}_headers" {} '' + runCommand "${pname}_headers" { } '' install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h '' ) ++ lib.optionals stdenv.isLinux [ bubblewrap libseccomp - systemd + libmanette wayland xdg-dbus-proxy - ] ++ lib.optional enableGeoLocation geoclue2; + ] ++ lib.optionals systemdSupport [ + systemd + ] ++ lib.optionals enableGeoLocation [ + geoclue2 + ] ++ lib.optionals withLibsecret [ + libsecret + ]; propagatedBuildInputs = [ gtk3 libsoup ]; - cmakeFlags = [ + cmakeFlags = let + cmakeBool = x: if x then "ON" else "OFF"; + in [ "-DENABLE_INTROSPECTION=ON" "-DPORT=GTK" "-DUSE_LIBHYPHEN=OFF" "-DUSE_WPE_RENDERER=OFF" - "-DUSE_SOUP2=${if lib.versions.major libsoup.version == "2" then "ON" else "OFF"}" + "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" + "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" ] ++ lib.optionals stdenv.isDarwin [ "-DENABLE_GAMEPAD=OFF" "-DENABLE_GTKDOC=OFF" @@ -189,9 +195,11 @@ stdenv.mkDerivation rec { "-DUSE_APPLE_ICU=OFF" "-DUSE_OPENGL_OR_ES=OFF" "-DUSE_SYSTEM_MALLOC=ON" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!systemdSupport) [ "-DUSE_SYSTEMD=OFF" - ] ++ lib.optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON"; + ] ++ lib.optionals (stdenv.isLinux && enableGLES) [ + "-DENABLE_GLES2=ON" + ]; postPatch = '' patchShebangs . diff --git a/pkgs/development/libraries/webrtc-audio-processing/0.3.nix b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix new file mode 100644 index 000000000000..1ce3c2d9fa8b --- /dev/null +++ b/pkgs/development/libraries/webrtc-audio-processing/0.3.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, darwin }: + +stdenv.mkDerivation rec { + pname = "webrtc-audio-processing"; + version = "0.3.1"; + + src = fetchurl { + url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-${version}.tar.xz"; + sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0"; + }; + + patches = [ ./enable-riscv.patch ]; + + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + + patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 + ''; + + meta = with lib; { + homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; + description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index 1ce3c2d9fa8b..5a53564603d8 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -1,19 +1,34 @@ -{ lib, stdenv, fetchurl, darwin }: +{ lib, stdenv, fetchurl +, darwin +, abseil-cpp_202111 +, meson +, ninja +}: stdenv.mkDerivation rec { pname = "webrtc-audio-processing"; - version = "0.3.1"; + version = "1.0"; src = fetchurl { - url = "https://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-${version}.tar.xz"; - sha256 = "1gsx7k77blfy171b6g3m0k0s0072v6jcawhmx1kjs9w5zlwdkzd0"; + url = "https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/archive/v1.0/webrtc-audio-processing-v${version}.tar.gz"; + sha256 = "sha256-dqRy1OfOG9TX2cgCD8cowU44zVanns/nPYZrilPfuiU="; }; - patches = [ ./enable-riscv.patch ]; + nativeBuildInputs = [ + meson + ninja + ]; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); + buildInputs = [ + abseil-cpp_202111 + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices ]); - patchPhase = lib.optionalString stdenv.hostPlatform.isMusl '' + patchPhase = '' + # this is just incorrect upstream + # see https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/4 + substituteInPlace meson.build \ + --replace "absl_flags_registry" "absl_flags_reflection" + '' + lib.optionalString stdenv.hostPlatform.isMusl '' substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1 ''; @@ -21,6 +36,8 @@ stdenv.mkDerivation rec { homepage = "http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing"; description = "A more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project"; license = licenses.bsd3; - platforms = platforms.unix; + # attempts to inline 256bit AVX instructions on x86 + # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/5 + platforms = lib.lists.subtractLists platforms.i686 platforms.unix; }; } diff --git a/pkgs/development/libraries/wlroots/0.14.nix b/pkgs/development/libraries/wlroots/0.14.nix index cf188756ffde..398a09ff2aa7 100644 --- a/pkgs/development/libraries/wlroots/0.14.nix +++ b/pkgs/development/libraries/wlroots/0.14.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg, xcbutilrenderutil, seatd +, libpng, ffmpeg_4, xcbutilrenderutil, seatd , enableXWayland ? true, xwayland ? null }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ libGL wayland wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg xcbutilrenderutil seatd + libpng ffmpeg_4 xcbutilrenderutil seatd ] ++ lib.optional enableXWayland xwayland ; diff --git a/pkgs/development/libraries/wlroots/0.15.nix b/pkgs/development/libraries/wlroots/0.15.nix index 7b7ff1816d75..ed3effaa5405 100644 --- a/pkgs/development/libraries/wlroots/0.15.nix +++ b/pkgs/development/libraries/wlroots/0.15.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, wayland-scanner , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg, xcbutilrenderutil, seatd, vulkan-loader, glslang +, libpng, ffmpeg_4, xcbutilrenderutil, seatd, vulkan-loader, glslang , nixosTests , enableXWayland ? true, xwayland ? null @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "wlroots"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; rev = version; - sha256 = "0wdzs0wpv61pxgy3mx3xjsndyfmbj30v47d3w9ymmnd4r479n41n"; + sha256 = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; }; # $out for the library and $examples for the example programs (in examples): @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ]; buildInputs = [ libGL wayland wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg xcbutilrenderutil seatd vulkan-loader glslang + libpng ffmpeg_4 xcbutilrenderutil seatd vulkan-loader ] ++ lib.optional enableXWayland xwayland ; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 4cfd2548b538..2fc57b87ab3b 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.1.1"; + version = "5.2.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "sha256-/noS5cn8lllWoGyZ9QyjRmdiR6LXzfT4lYGEt+0+Bdw="; + sha256 = "1xdhbhn31q7waw7w158hz9n0vj76zlfn5njq7hncf73ks38drj6k"; }; postPatch = '' diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 9f9f330443c6..ed7095144189 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -8,23 +8,25 @@ , setfile , rez , derez +, wxmac }: stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.7.3"; + version = "4.7.6"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - sha256 = "sha256-t8y4oq4p7ZMDELAkRVmoNguYRNG8spcW7MHnpdINN8g="; + hash = "sha256-QoICP66eluD5phYVi1iK8tg1FL04EQjY29/4n6SIz3s="; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ wxGTK sqlite ] - ++ lib.optionals stdenv.isDarwin [ Cocoa setfile rez derez ]; + buildInputs = [ sqlite ] + ++ lib.optionals (!stdenv.isDarwin) [ wxGTK ] + ++ lib.optionals (stdenv.isDarwin) [ Cocoa setfile rez derez wxmac ]; meta = with lib; { homepage = "https://utelle.github.io/wxsqlite3/"; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix deleted file mode 100644 index 8029477708df..000000000000 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto -, libX11, cairo -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, libGLU ? null, libGL ? null -, compat24 ? false, compat26 ? true, unicode ? true, -}: - -assert withMesa -> libGLU != null && libGL != null; - -with lib; - -stdenv.mkDerivation rec { - version = "2.8.12.1"; - pname = "wxGTK"; - - src = fetchurl { - url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; - sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; - }; - - buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ] - ++ optional withMesa libGLU; - - nativeBuildInputs = [ pkg-config ]; - - hardeningDisable = [ "format" ]; - - configureFlags = [ - "--enable-gtk2" - (if compat24 then "--enable-compat24" else "--disable-compat24") - (if compat26 then "--enable-compat26" else "--disable-compat26") - "--disable-precomp-headers" - (if unicode then "--enable-unicode" else "") - "--enable-mediactrl" - "--enable-graphics_ctx" - ] ++ optional withMesa "--with-opengl"; - - # These variables are used by configure to find some dependencies. - SEARCH_INCLUDE = - "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; - SEARCH_LIB = - "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " - + optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib "; - - # Work around a bug in configure. - NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1 -lX11 -lcairo -Wno-narrowing"; - - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' - substituteInPlace configure --replace /usr /no-such-path - "; - - postBuild = "(cd contrib/src && make)"; - - postInstall = " - (cd contrib/src && make install) - (cd $out/include && ln -s wx-*/* .) - "; - - passthru = { - inherit compat24 compat26 unicode; - gtk = gtk2; - }; - - enableParallelBuilding = true; - - meta = { - platforms = platforms.linux; - license = licenses.wxWindows; - homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; - }; -} diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix deleted file mode 100644 index 5674f076beca..000000000000 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, libXinerama, libSM, libXxf86vm, xorgproto -, setfile -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, libGLU ? null, libGL ? null -, compat24 ? false, compat26 ? true, unicode ? true -, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null -}: - -assert withMesa -> libGLU != null && libGL != null; - -with lib; - -stdenv.mkDerivation rec { - pname = "wxwidgets"; - version = "2.9.4"; - - src = fetchurl { - url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; - sha256 = "04jda4bns7cmp7xy68qz112yg0lribpc6xs5k9gilfqcyhshqlvc"; - }; - - patches = [ - (fetchurl { # https://trac.wxwidgets.org/ticket/17942 - url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" - + "fix_assertion_using_hide_in_destroy.diff"; - sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; - }) - ]; - - buildInputs = - [ gtk2 libXinerama libSM libXxf86vm xorgproto ] - ++ optional withMesa libGLU - ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; - - nativeBuildInputs = [ pkg-config ]; - - propagatedBuildInputs = optional stdenv.isDarwin AGL; - - configureFlags = - [ "--enable-gtk2" "--disable-precomp-headers" - (if compat24 then "--enable-compat24" else "--disable-compat24") - (if compat26 then "--enable-compat26" else "--disable-compat26") ] - ++ optional unicode "--enable-unicode" - ++ optional withMesa "--with-opengl" - ++ optionals stdenv.isDarwin - # allow building on 64-bit - [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]; - - SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; - - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' - substituteInPlace configure --replace /usr /no-such-path - " + optionalString stdenv.isDarwin '' - substituteInPlace configure --replace \ - 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ - 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' - substituteInPlace configure --replace \ - "-framework System" \ - -lSystem - ''; - - postInstall = " - (cd $out/include && ln -s wx-*/* .) - "; - - passthru = { - inherit compat24 compat26 unicode; - gtk = gtk2; - }; - - enableParallelBuilding = true; - - meta = { - platforms = with platforms; darwin ++ linux; - license = licenses.wxWindows; - homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; - badPlatforms = [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix deleted file mode 100644 index 30e807cde057..000000000000 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config -, libXinerama, libSM, libXxf86vm -, gtk2, gtk3 -, xorgproto, gst_all_1, setfile -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, withMesa ? libGLSupported -, libGLU, libGL -, compat24 ? false, compat26 ? true, unicode ? true -, withGtk2 ? true -, withWebKit ? false, webkitgtk -, AGL, Carbon, Cocoa, Kernel, QTKit -}: - -with lib; - -assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK30: You cannot enable withWebKit when using withGtk2."; - -stdenv.mkDerivation rec { - pname = "wxwidgets"; - version = "3.0.5"; - - src = fetchFromGitHub { - owner = "wxWidgets"; - repo = "wxWidgets"; - rev = "v${version}"; - sha256 = "1l33629ifx2dl2j71idqbd2qb6zb1d566ijpkvz6irrr50s6gbx7"; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base - ] ++ optional withGtk2 gtk2 - ++ optional (!withGtk2) gtk3 - ++ optional withMesa libGLU - ++ optional withWebKit webkitgtk - ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; - - propagatedBuildInputs = optional stdenv.isDarwin AGL; - - patches = [ - (fetchurl { # https://trac.wxwidgets.org/ticket/17942 - url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" - + "fix_assertion_using_hide_in_destroy.diff"; - sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; - }) - ]; - - configureFlags = - [ "--disable-precomp-headers" "--enable-mediactrl" - (if compat24 then "--enable-compat24" else "--disable-compat24") - (if compat26 then "--enable-compat26" else "--disable-compat26") ] - ++ optional unicode "--enable-unicode" - ++ optional withMesa "--with-opengl" - ++ optionals stdenv.isDarwin - # allow building on 64-bit - [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ] - ++ optionals withWebKit - ["--enable-webview" "--enable-webview-webkit"]; - - SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; - - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' - substituteInPlace configure --replace /usr /no-such-path - " + optionalString stdenv.isDarwin '' - substituteInPlace configure --replace \ - 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ - 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' - substituteInPlace configure --replace \ - "-framework System" \ - -lSystem - ''; - - postInstall = " - (cd $out/include && ln -s wx-*/* .) - "; - - passthru = { - inherit compat24 compat26 unicode; - gtk = if withGtk2 then gtk2 else gtk3; - }; - - enableParallelBuilding = true; - - meta = { - platforms = with platforms; darwin ++ linux; - license = licenses.wxWindows; - homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; - badPlatforms = [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix deleted file mode 100644 index 17c2ee9efaef..000000000000 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, expat, libiconv, libjpeg, libpng, libtiff, zlib -# darwin only attributes -, derez, rez, setfile -, AGL, Cocoa, Kernel, WebKit -}: - -stdenv.mkDerivation rec { - version = "3.0.5.1"; - pname = "wxmac"; - - src = fetchFromGitHub { - owner = "wxWidgets"; - repo = "wxWidgets"; - rev = "v${version}"; - sha256 = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0="; - }; - - buildInputs = [ - expat libiconv libjpeg libpng libtiff zlib - derez rez setfile - AGL Cocoa Kernel WebKit - ]; - - postPatch = '' - substituteInPlace configure --replace "-framework System" -lSystem - ''; - - configureFlags = [ - "wx_cv_std_libfullpath=/var/empty" - "--with-macosx-version-min=10.7" - "--enable-unicode" - "--with-osx_cocoa" - "--enable-std_string" - "--enable-display" - "--with-opengl" - "--with-libjpeg" - "--with-libtiff" - "--without-liblzma" - "--with-libpng" - "--with-zlib" - "--enable-dnd" - "--enable-clipboard" - "--enable-webkit" - "--enable-svg" - "--enable-graphics_ctx" - "--enable-controls" - "--enable-dataviewctrl" - "--with-expat" - "--disable-precomp-headers" - "--disable-mediactrl" - ]; - - checkPhase = '' - ./wx-config --libs - ''; - - NIX_CFLAGS_COMPILE = "-Wno-undef"; - - doCheck = true; - - enableParallelBuilding = true; - - meta = with lib; { - platforms = platforms.darwin; - license = licenses.wxWindows; - maintainers = [ maintainers.lnl7 ]; - homepage = "https://www.wxwidgets.org/"; - description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; - }; -} diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix deleted file mode 100644 index cab0197c9390..000000000000 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchurl -, pkg-config -, libXinerama -, libSM -, libXxf86vm -, libXtst -, gtk2 -, GConf ? null -, gtk3 -, xorgproto -, gst_all_1 -, setfile -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, withMesa ? libGLSupported -, libGLU ? null -, libGL ? null -, compat28 ? false -, compat30 ? true -, unicode ? true -, withGtk2 ? true -, withWebKit ? false -, webkitgtk ? null -, AGL ? null -, Carbon ? null -, Cocoa ? null -, Kernel ? null -, QTKit ? null -}: - -with lib; - -assert withMesa -> libGLU != null && libGL != null; -assert withWebKit -> webkitgtk != null; - -assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK31: You cannot enable withWebKit when using withGtk2."; - -stdenv.mkDerivation rec { - version = "3.1.4"; - pname = "wxwidgets"; - - src = fetchFromGitHub { - owner = "wxWidgets"; - repo = "wxWidgets"; - rev = "v${version}"; - sha256 = "1fwzrk6w5k0vs8kqdq5lpzdbp5c09hx740wg6mi6vgmc1r67dv67"; - fetchSubmodules = true; - }; - - buildInputs = [ - libXinerama - libSM - libXxf86vm - libXtst - xorgproto - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - ] ++ optionals withGtk2 [ gtk2 GConf ] - ++ optional (!withGtk2) gtk3 - ++ optional withMesa libGLU - ++ optional withWebKit webkitgtk - ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; - - nativeBuildInputs = [ pkg-config ]; - - propagatedBuildInputs = optional stdenv.isDarwin AGL; - - patches = [ - (fetchurl { - # https://trac.wxwidgets.org/ticket/17942 - url = "https://trac.wxwidgets.org/raw-attachment/ticket/17942/" - + "fix_assertion_using_hide_in_destroy.diff"; - sha256 = "009y3dav79wiig789vkkc07g1qdqprg1544lih79199kb1h64lvy"; - }) - ]; - - configureFlags = - [ - "--disable-precomp-headers" - "--enable-mediactrl" - (if compat28 then "--enable-compat28" else "--disable-compat28") - (if compat30 then "--enable-compat30" else "--disable-compat30") - ] - ++ optional unicode "--enable-unicode" - ++ optional withMesa "--with-opengl" - ++ optionals stdenv.isDarwin - # allow building on 64-bit - [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ] - ++ optionals withWebKit - [ "--enable-webview" "--enable-webviewwebkit" ]; - - SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; - - preConfigure = " - substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' - substituteInPlace configure --replace 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' - substituteInPlace configure --replace /usr /no-such-path - " + optionalString stdenv.isDarwin '' - substituteInPlace configure --replace \ - 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ - 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' - substituteInPlace configure --replace \ - "-framework System" \ - -lSystem - ''; - - postInstall = " - (cd $out/include && ln -s wx-*/* .) - "; - - passthru = { - inherit compat28 compat30 unicode; - gtk = if withGtk2 then gtk2 else gtk3; - }; - - enableParallelBuilding = true; - - meta = { - platforms = with platforms; darwin ++ linux; - license = licenses.wxWindows; - homepage = "https://www.wxwidgets.org/"; - description = "A C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; - longDescription = '' - WxWidgets gives you a single, easy-to-use API for - writing GUI applications on multiple platforms that still utilize the - native platform's controls and utilities. Link with the appropriate library - for your platform and compiler, and your application will adopt the look - and feel appropriate to that platform. On top of great GUI functionality, - wxWidgets gives you: online help, network programming, streams, clipboard - and drag and drop, multithreading, image loading and saving in a variety of - popular formats, database support, HTML viewing and printing, and much - more. - ''; - badPlatforms = [ "x86_64-darwin" ]; - maintainers = with maintainers; [ tfmoraes ]; - }; -} diff --git a/pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch b/pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch new file mode 100644 index 000000000000..ca9eb8bf612a --- /dev/null +++ b/pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch @@ -0,0 +1,43 @@ +commit 56a60ee50122613d3a356ce74b4bd77b5e7be235 +Author: Tim Kosse +Date: Sat Aug 26 15:37:30 2017 +0200 + + If a wxTopLevelWindow has been instanced, but Create has not been called, calling Destroy on the window results in an assertion in Show(false), at least under wxGTK. Fix this by only hiding a top level window during destruction if it is actually shown. + +diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp +index ef693690c5..8d07812031 100644 +--- a/src/common/toplvcmn.cpp ++++ b/src/common/toplvcmn.cpp +@@ -122,19 +122,21 @@ bool wxTopLevelWindowBase::Destroy() + // any more as no events will be sent to the hidden window and without idle + // events we won't prune wxPendingDelete list and the application won't + // terminate +- for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(), +- end = wxTopLevelWindows.end(); +- i != end; +- ++i ) +- { +- wxTopLevelWindow * const win = static_cast(*i); +- if ( win != this && win->IsShown() ) ++ if ( IsShown() ) { ++ for ( wxWindowList::const_iterator i = wxTopLevelWindows.begin(), ++ end = wxTopLevelWindows.end(); ++ i != end; ++ ++i ) + { +- // there remains at least one other visible TLW, we can hide this +- // one +- Hide(); ++ wxTopLevelWindow * const win = static_cast(*i); ++ if ( win != this && win->IsShown() ) ++ { ++ // there remains at least one other visible TLW, we can hide this ++ // one ++ Hide(); + +- break; ++ break; ++ } + } + } + diff --git a/pkgs/development/libraries/wxwidgets/wxGTK28.nix b/pkgs/development/libraries/wxwidgets/wxGTK28.nix new file mode 100644 index 000000000000..19a57d68e15b --- /dev/null +++ b/pkgs/development/libraries/wxwidgets/wxGTK28.nix @@ -0,0 +1,117 @@ +{ lib +, stdenv +, fetchurl +, cairo +, gtk2 +, libGL +, libGLU +, libSM +, libX11 +, libXinerama +, libXxf86vm +, pkg-config +, xorgproto +, compat24 ? false +, compat26 ? true +, unicode ? true +, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +}: + +assert withMesa -> libGLU != null && libGL != null; + +stdenv.mkDerivation rec { + pname = "wxGTK"; + version = "2.8.12.1"; + + src = fetchurl { + url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; + hash = "sha256-Hz8VPZ8VBMbOLSxLI+lAuPWLgfTLo1zaGluzEUIkPNA="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + cairo + gtk2 + libSM + libX11 + libXinerama + libXxf86vm + xorgproto + ] + ++ lib.optional withMesa libGLU; + + configureFlags = [ + "--enable-gtk2" + "--disable-precomp-headers" + "--enable-mediactrl" + "--enable-graphics_ctx" + (if compat24 then "--enable-compat24" else "--disable-compat24") + (if compat26 then "--enable-compat26" else "--disable-compat26") + ] + ++ lib.optional unicode "--enable-unicode" + ++ lib.optional withMesa "--with-opengl"; + + hardeningDisable = [ "format" ]; + + # These variables are used by configure to find some dependencies. + SEARCH_INCLUDE = + "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; + SEARCH_LIB = + "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " + + lib.optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib "; + + # Work around a bug in configure. + NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1 -lX11 -lcairo -Wno-narrowing"; + + preConfigure = '' + substituteInPlace configure --replace \ + 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' + substituteInPlace configure --replace \ + 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' + substituteInPlace configure --replace \ + /usr /no-such-path + ''; + + postBuild = '' + pushd contrib/src + make + popd + ''; + + postInstall = '' + pushd contrib/src + make install + popd + pushd $out/include + ln -s wx-*/* . + popd + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.wxwidgets.org/"; + description = "A Cross-Platform C++ GUI Library"; + longDescription = '' + wxWidgets gives you a single, easy-to-use API for writing GUI applications + on multiple platforms that still utilize the native platform's controls + and utilities. Link with the appropriate library for your platform and + compiler, and your application will adopt the look and feel appropriate to + that platform. On top of great GUI functionality, wxWidgets gives you: + online help, network programming, streams, clipboard and drag and drop, + multithreading, image loading and saving in a variety of popular formats, + database support, HTML viewing and printing, and much more. + ''; + license = licenses.wxWindows; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; + }; + + passthru = { + inherit compat24 compat26 unicode; + gtk = gtk2; + }; +} diff --git a/pkgs/development/libraries/wxwidgets/wxGTK29.nix b/pkgs/development/libraries/wxwidgets/wxGTK29.nix new file mode 100644 index 000000000000..d5bef77202f1 --- /dev/null +++ b/pkgs/development/libraries/wxwidgets/wxGTK29.nix @@ -0,0 +1,128 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, gtk2 +, libGL +, libGLU +, libSM +, libXinerama +, libXxf86vm +, pkg-config +, xorgproto +, compat24 ? false +, compat26 ? true +, unicode ? true +, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, AGL +, Carbon +, Cocoa +, Kernel +, QuickTime +, setfile +}: + +assert withMesa -> libGLU != null && libGL != null; +stdenv.mkDerivation rec { + pname = "wxGTK"; + version = "2.9.5"; + + src = fetchFromGitHub { + owner = "wxWidgets"; + repo = "wxWidgets"; + rev = "v${version}"; + hash = "sha256-izefAPU4lORZxQja7/InHyElJ1++2lDloR+xPudsRNE="; + }; + + patches = [ + # https://github.com/wxWidgets/wxWidgets/issues/17942 + ./patches/0001-fix-assertion-using-hide-in-destroy.patch + ]; + + nativeBuildInputs = [ + autoconf + pkg-config + ]; + + buildInputs = [ + gtk2 + libSM + libXinerama + libXxf86vm + xorgproto + ] + ++ lib.optional withMesa libGLU + ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa + Kernel + QuickTime + setfile + ]; + + propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; + + configureFlags = [ + "--disable-precomp-headers" + "--enable-gtk2" + (if compat24 then "--enable-compat24" else "--disable-compat24") + (if compat26 then "--enable-compat26" else "--disable-compat26") + ] + ++ lib.optional unicode "--enable-unicode" + ++ lib.optional withMesa "--with-opengl" + ++ lib.optionals stdenv.isDarwin [ # allow building on 64-bit + "--enable-universal-binaries" + "--with-cocoa" + "--with-macosx-version-min=10.7" + ]; + + SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; + + preConfigure = '' + ./autogen.sh + substituteInPlace configure --replace \ + 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' + substituteInPlace configure --replace \ + 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' + substituteInPlace configure --replace \ + /usr /no-such-path + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace \ + 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ + 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' + substituteInPlace configure --replace \ + "-framework System" "-lSystem" + ''; + + postInstall = '' + pushd $out/include + ln -s wx-*/* . + popd + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.wxwidgets.org/"; + description = "A Cross-Platform C++ GUI Library"; + longDescription = '' + wxWidgets gives you a single, easy-to-use API for writing GUI applications + on multiple platforms that still utilize the native platform's controls + and utilities. Link with the appropriate library for your platform and + compiler, and your application will adopt the look and feel appropriate to + that platform. On top of great GUI functionality, wxWidgets gives you: + online help, network programming, streams, clipboard and drag and drop, + multithreading, image loading and saving in a variety of popular formats, + database support, HTML viewing and printing, and much more. + ''; + license = licenses.wxWindows; + maintainers = with maintainers; [ ]; + platforms = platforms.darwin ++ platforms.linux; + badPlatforms = [ "x86_64-darwin" ]; + }; + + passthru = { + inherit compat24 compat26 unicode; + gtk = gtk2; + }; +} diff --git a/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/pkgs/development/libraries/wxwidgets/wxGTK30.nix new file mode 100644 index 000000000000..115453303870 --- /dev/null +++ b/pkgs/development/libraries/wxwidgets/wxGTK30.nix @@ -0,0 +1,141 @@ +{ lib +, stdenv +, fetchFromGitHub +, gst_all_1 +, gtk2 +, gtk3 +, libGL +, libGLU +, libSM +, libXinerama +, libXxf86vm +, pkg-config +, xorgproto +, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, compat26 ? false +, compat28 ? true +, unicode ? true +, withGtk2 ? true +, withWebKit ? false, webkitgtk +, AGL +, Carbon +, Cocoa +, Kernel +, QTKit +, setfile +}: + +assert withGtk2 -> (!withWebKit); + +let + inherit (gst_all_1) gstreamer gst-plugins-base; + gtk = if withGtk2 then gtk2 else gtk3; +in +stdenv.mkDerivation rec { + pname = "wxwidgets"; + version = "3.0.5"; + + src = fetchFromGitHub { + owner = "wxWidgets"; + repo = "wxWidgets"; + rev = "v${version}"; + hash = "sha256-p69nNCg552j+nldGY0oL65uFRVu4xXCkoE10F5MwY9A="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + gstreamer + gst-plugins-base + gtk + libSM + libXinerama + libXxf86vm + xorgproto + ] + ++ lib.optional withMesa libGLU + ++ lib.optional withWebKit webkitgtk + ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa + Kernel + QTKit + setfile + ]; + + propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; + + patches = [ + # https://github.com/wxWidgets/wxWidgets/issues/17942 + ./patches/0001-fix-assertion-using-hide-in-destroy.patch + ]; + + configureFlags = [ + "--disable-precomp-headers" + "--enable-mediactrl" + (if compat26 then "--enable-compat26" else "--disable-compat26") + (if compat28 then "--enable-compat28" else "--disable-compat28") + ] + ++ lib.optional unicode "--enable-unicode" + ++ lib.optional withMesa "--with-opengl" + ++ lib.optionals stdenv.isDarwin [ # allow building on 64-bit + "--enable-universal-binaries" + "--with-cocoa" + "--with-macosx-version-min=10.7" + ] + ++ lib.optionals withWebKit [ + "--enable-webview" + "--enable-webview-webkit" + ]; + + SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; + + preConfigure = '' + substituteInPlace configure --replace \ + 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' + substituteInPlace configure --replace \ + 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' + substituteInPlace configure --replace \ + /usr /no-such-path + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace \ + 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ + 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' + substituteInPlace configure --replace \ + "-framework System" "-lSystem" + ''; + + postInstall = '' + pushd $out/include + ln -s wx-*/* . + popd + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.wxwidgets.org/"; + description = "A Cross-Platform C++ GUI Library"; + longDescription = '' + wxWidgets gives you a single, easy-to-use API for writing GUI applications + on multiple platforms that still utilize the native platform's controls + and utilities. Link with the appropriate library for your platform and + compiler, and your application will adopt the look and feel appropriate to + that platform. On top of great GUI functionality, wxWidgets gives you: + online help, network programming, streams, clipboard and drag and drop, + multithreading, image loading and saving in a variety of popular formats, + database support, HTML viewing and printing, and much more. + ''; + license = licenses.wxWindows; + maintainers = with maintainers; [ ]; + platforms = platforms.linux ++ platforms.darwin; + badPlatforms = [ "x86_64-darwin" ]; + }; + + passthru = { + inherit gtk; + inherit compat26 compat28 unicode; + }; +} diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix new file mode 100644 index 000000000000..31d59e24fd84 --- /dev/null +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -0,0 +1,158 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, gnome2 +, gst_all_1 +, gtk2 +, gtk3 +, libGL +, libGLU +, libSM +, libXinerama +, libXtst +, libXxf86vm +, pkg-config +, xorgproto +, compat28 ? false +, compat30 ? true +, unicode ? true +, withGtk2 ? (!stdenv.isDarwin) +, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms +, withWebKit ? stdenv.isDarwin +, webkitgtk +, setfile +, AGL +, Carbon +, Cocoa +, Kernel +, QTKit +, AVFoundation +, AVKit +, WebKit +}: + +assert withGtk2 -> (!withWebKit); + +let + inherit (gnome2) GConf; + inherit (gst_all_1) gst-plugins-base gstreamer; + gtk = if withGtk2 then gtk2 else gtk3; +in +stdenv.mkDerivation rec { + pname = "wxwidgets"; + version = "3.1.5"; + + src = fetchFromGitHub { + owner = "wxWidgets"; + repo = "wxWidgets"; + rev = "v${version}"; + hash = "sha256-2zMvcva0GUDmSYK0Wk3/2Y6R3F7MgdqGBrOhmWgVA6g="; + fetchSubmodules = true; + }; + + patches = [ + # https://github.com/wxWidgets/wxWidgets/issues/17942 + ./patches/0001-fix-assertion-using-hide-in-destroy.patch + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + gst-plugins-base + gstreamer + ] + ++ lib.optionals (!stdenv.isDarwin) [ + gtk + libSM + libXinerama + libXtst + libXxf86vm + xorgproto + ] + ++ lib.optionals withGtk2 [ + GConf + ] + ++ lib.optional withMesa libGLU + ++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk + ++ lib.optional (withWebKit && stdenv.isDarwin) WebKit + ++ lib.optionals stdenv.isDarwin [ + setfile + Carbon + Cocoa + Kernel + QTKit + AVFoundation + AVKit + WebKit + ]; + + propagatedBuildInputs = lib.optional stdenv.isDarwin AGL; + + configureFlags = [ + "--disable-precomp-headers" + # This is the default option, but be explicit + "--disable-monolithic" + "--enable-mediactrl" + (if compat28 then "--enable-compat28" else "--disable-compat28") + (if compat30 then "--enable-compat30" else "--disable-compat30") + ] + ++ lib.optional unicode "--enable-unicode" + ++ lib.optional withMesa "--with-opengl" + ++ lib.optionals stdenv.isDarwin [ + "--with-osx_cocoa" + "--with-libiconv" + ] + ++ lib.optionals withWebKit [ + "--enable-webview" + "--enable-webviewwebkit" + ]; + + SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; + + preConfigure = '' + substituteInPlace configure --replace \ + 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' + substituteInPlace configure --replace \ + 'SEARCH_LIB=' 'DUMMY_SEARCH_LIB=' + substituteInPlace configure --replace \ + /usr /no-such-path + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace \ + 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ + 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' + substituteInPlace configure --replace \ + "-framework System" "-lSystem" + ''; + + postInstall = " + pushd $out/include + ln -s wx-*/* . + popd + "; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.wxwidgets.org/"; + description = "A Cross-Platform C++ GUI Library"; + longDescription = '' + wxWidgets gives you a single, easy-to-use API for writing GUI applications + on multiple platforms that still utilize the native platform's controls + and utilities. Link with the appropriate library for your platform and + compiler, and your application will adopt the look and feel appropriate to + that platform. On top of great GUI functionality, wxWidgets gives you: + online help, network programming, streams, clipboard and drag and drop, + multithreading, image loading and saving in a variety of popular formats, + database support, HTML viewing and printing, and much more. + ''; + license = licenses.wxWindows; + maintainers = with maintainers; [ tfmoraes ]; + platforms = platforms.unix; + }; + + passthru = { + inherit gtk; + inherit compat28 compat30 unicode; + }; +} diff --git a/pkgs/development/libraries/wxwidgets/wxmac30.nix b/pkgs/development/libraries/wxwidgets/wxmac30.nix new file mode 100644 index 000000000000..e1f732929cec --- /dev/null +++ b/pkgs/development/libraries/wxwidgets/wxmac30.nix @@ -0,0 +1,99 @@ +{ lib +, stdenv +, fetchFromGitHub +, expat +, libiconv +, libjpeg +, libpng +, libtiff +, zlib +, darwin +}: + +let + inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel WebKit; + inherit (darwin.stubs) derez rez setfile; +in +stdenv.mkDerivation rec { + pname = "wxmac"; + version = "3.0.5.1"; + + src = fetchFromGitHub { + owner = "wxWidgets"; + repo = "wxWidgets"; + rev = "v${version}"; + hash = "sha256-I91douzXDAfDgm4Pplf17iepv4vIRhXZDRFl9keJJq0="; + }; + + buildInputs = [ + expat + libiconv + libjpeg + libpng + libtiff + zlib + AGL + Cocoa + Kernel + WebKit + derez + rez + setfile + ]; + + postPatch = '' + substituteInPlace configure --replace "-framework System" "-lSystem" + ''; + + configureFlags = [ + "--disable-mediactrl" + "--disable-precomp-headers" + "--enable-clipboard" + "--enable-controls" + "--enable-dataviewctrl" + "--enable-display" + "--enable-dnd" + "--enable-graphics_ctx" + "--enable-std_string" + "--enable-svg" + "--enable-unicode" + "--enable-webkit" + "--with-expat" + "--with-libjpeg" + "--with-libpng" + "--with-libtiff" + "--with-macosx-version-min=10.7" + "--with-opengl" + "--with-osx_cocoa" + "--with-zlib" + "--without-liblzma" + "wx_cv_std_libfullpath=/var/empty" + ]; + + doCheck = true; + checkPhase = '' + ./wx-config --libs + ''; + + NIX_CFLAGS_COMPILE = "-Wno-undef"; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.wxwidgets.org/"; + description = "A Cross-Platform C++ GUI Library - MacOS-only build"; + longDescription = '' + wxWidgets gives you a single, easy-to-use API for writing GUI applications + on multiple platforms that still utilize the native platform's controls + and utilities. Link with the appropriate library for your platform and + compiler, and your application will adopt the look and feel appropriate to + that platform. On top of great GUI functionality, wxWidgets gives you: + online help, network programming, streams, clipboard and drag and drop, + multithreading, image loading and saving in a variety of popular formats, + database support, HTML viewing and printing, and much more. + ''; + license = licenses.wxWindows; + maintainers = with maintainers; [ lnl7 ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 2c9f476313ec..dc2b1c40c6cb 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for encoding H264/AVC video streams"; homepage = "http://www.videolan.org/developers/x264.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ spwhitt tadeokondrak ]; }; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 4610aa5309fb..20c56f4d9037 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -1,103 +1,138 @@ -{ lib, stdenv, fetchFromBitbucket, cmake, nasm, numactl -, numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) # Enabled by default on NUMA platforms -, debugSupport ? false # Run-time sanity checks (debugging) -, werrorSupport ? false # Warnings as errors -, ppaSupport ? false # PPA profiling instrumentation -, vtuneSupport ? false # Vtune profiling instrumentation -, custatsSupport ? false # Internal profiling of encoder work +{ lib +, stdenv +, fetchurl +, fetchpatch +, cmake +, nasm + +# NUMA support enabled by default on NUMA platforms: +, numaSupport ? (stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64)) +, numactl + +# Multi bit-depth support (8bit+10bit+12bit): +, multibitdepthSupport ? (stdenv.is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) + +# Other options: , cliSupport ? true # Build standalone CLI application -, unittestsSupport ? false # Unit tests +, custatsSupport ? false # Internal profiling of encoder work +, debugSupport ? false # Run-time sanity checks (debugging) +, ppaSupport ? false # PPA profiling instrumentation +, unittestsSupport ? (stdenv.is64bit && !(stdenv.isDarwin && stdenv.isAarch64)) # Unit tests - only testing x64 assembly +, vtuneSupport ? false # Vtune profiling instrumentation +, werrorSupport ? false # Warnings as errors }: let mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; - inherit (stdenv) is64bit; - cmakeFlagsAll = [ - "-DSTATIC_LINK_CRT=OFF" + cmakeCommonFlags = [ + "-Wno-dev" + (mkFlag custatsSupport "DETAILED_CU_STATS") (mkFlag debugSupport "CHECKED_BUILD") (mkFlag ppaSupport "ENABLE_PPA") (mkFlag vtuneSupport "ENABLE_VTUNE") - (mkFlag custatsSupport "DETAILED_CU_STATS") - (mkFlag unittestsSupport "ENABLE_TESTS") (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - ] ++ lib.optionals stdenv.hostPlatform.isPower [ - "-DENABLE_ALTIVEC=OFF" ]; - version = "3.4"; + 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 + ]; - src = fetchFromBitbucket { - owner = "multicoreware"; - repo = "x265_git"; - rev = version; - sha256 = "1jzgv2hxhcwmsdf6sbgyzm88a46dp09ll1fqj92g9vckvh9a7dsn"; - }; - - buildLib = has12Bit: stdenv.mkDerivation rec { - name = "libx265-${if has12Bit then "12" else "10"}-${version}"; - inherit src; - - postPatch = '' - sed -i 's/unknown/${version}/g' source/cmake/version.cmake - sed -i 's/0.0/${version}/g' source/cmake/version.cmake - ''; - - cmakeLibFlags = [ - "-DENABLE_CLI=OFF" - "-DENABLE_SHARED=OFF" - "-DENABLE_HDR10_PLUS=ON" - "-DEXPORT_C_API=OFF" - "-DHIGH_BIT_DEPTH=ON" - ]; - cmakeFlags = [(mkFlag has12Bit "MAIN12")] ++ cmakeLibFlags ++ cmakeFlagsAll; - - preConfigure = '' - cd source - ''; - - nativeBuildInputs = [cmake nasm] ++ lib.optional numaSupport numactl; - }; - - libx265-10 = buildLib false; - libx265-12 = buildLib true; in stdenv.mkDerivation rec { pname = "x265"; - inherit version src; + version = "3.5"; + + outputs = [ "out" "dev" ]; + + # Check that x265Version.txt contains the expected version number + # whether we fetch a source tarball or a tag from the git repo + src = fetchurl { + url = "https://bitbucket.org/multicoreware/x265_git/downloads/x265_${version}.tar.gz"; + hash = "sha256-5wozNcrKy7oLOiDsb+zWeDkyKI68gWOtdLzJYGR3yug="; + }; + + sourceRoot = "x265_${version}/source"; + + patches = [ + # More aliases for ARM platforms + do not force CLFAGS for ARM : + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/arm-r1.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c"; + sha256 = "1hgzq5vxkwh0nyikxjfz8gz3jvx2nq3yy12mz3fn13qvzdlb5ilp"; + }) + # use proper check to avoid undefined symbols when enabling assembly on ARM : + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/neon.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c"; + sha256 = "1mmshpbyldrfqxfmdajqal4l647zvlrwdai8pxw99qg4v8gajfii"; + }) + # More complete PPC64 matches : + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/x265-3.3-ppc64.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c"; + sha256 = "1mvw678xfm0vr59n5jilq56qzcgk1gmcip2afyafkqiv21nbms8c"; + }) + # Namespace functions for multi-bitdepth builds so that libraries are self-contained (and tests succeeds) : + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/x265/files/test-ns.patch?id=1d1de341e1404a46b15ae3e84bc400d474cf1a2c"; + sha256 = "0zg3g53l07yh7ar5c241x50y5zp7g8nh8rh63ad4bdpchpc2f52d"; + }) + ]; postPatch = '' - sed -i 's/unknown/${version}/g' source/cmake/version.cmake - sed -i 's/0.0/${version}/g' source/cmake/version.cmake + substituteInPlace cmake/Version.cmake \ + --replace "unknown" "${version}" \ + --replace "0.0" "${version}" ''; - cmakeFlags = [ + nativeBuildInputs = [ cmake nasm ] ++ lib.optionals (numaSupport) [ numactl ]; + + # 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} + 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=ON" "-DHIGH_BIT_DEPTH=OFF" - "-DENABLE_HDR10_PLUS=OFF" - ] ++ lib.optionals (is64bit && !(stdenv.isAarch64 && stdenv.isLinux)) [ - "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a" - "-DLINKED_10BIT=ON" - "-DLINKED_12BIT=ON" + "-DENABLE_HDR10_PLUS=ON" ] ++ [ (mkFlag cliSupport "ENABLE_CLI") - ] ++ cmakeFlagsAll; + (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" + ]; - preConfigure = '' - cd source + doCheck = unittestsSupport; + checkPhase = '' + runHook preCheck + ./test/TestBench + runHook postCheck ''; postInstall = '' - rm $out/lib/*.a + rm -f ${placeholder "out"}/lib/*.a ''; - nativeBuildInputs = [ cmake nasm ] ++ lib.optional numaSupport numactl; - meta = with lib; { description = "Library for encoding H.265/HEVC video streams"; homepage = "https://www.x265.org/"; - license = licenses.gpl2; + changelog = "https://x265.readthedocs.io/en/master/releasenotes.html#version-${lib.strings.replaceStrings ["."] ["-"] version}"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index e2d049cd7b3c..4d23752b2420 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -38,5 +38,5 @@ let }; }; in { - xapian_1_4 = generic "1.4.18" "sha256-GW3btK0QRQEA8JkaWZ5O2UTLrZLkpv6BO+bc4WAkS3c="; + xapian_1_4 = generic "1.4.19" "sha256-H8pI/KbMNSbMS6k90ZT+nBMmhXt47c+zfmjQhtcUqcM="; } diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index dd5cd21d405f..d87bcac9829f 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -13,15 +13,15 @@ stdenv.mkDerivation rec { patches = [ ./xbase-fixes.patch (fetchurl { - url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-gcc47.patch?revision=1.1"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc47.patch?id=0b9005ad4b5b743707922877e5157ba6ecdf224f"; sha256 = "1kpcrkkcqdwl609yd0qxlvp743icz3vni13993sz6fkgn5lah8yl"; }) (fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc6.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc6.patch?id=0b9005ad4b5b743707922877e5157ba6ecdf224f"; sha256 = "1994pqiip5njkcmm5czb1bg6zdldkx1mpandgmvzqrja0iacf953"; }) (fetchurl { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc7.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-db/xbase/files/xbase-3.1.2-gcc7.patch?id=0b9005ad4b5b743707922877e5157ba6ecdf224f"; sha256 = "1304gn9dbdv8xf61crkg0fc8cal0h4qkyhlbqa8y618w134cxh1q"; }) ]; diff --git a/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/pkgs/development/libraries/xdg-dbus-proxy/default.nix index 21d6b6fa73e8..95373934a47a 100644 --- a/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "xdg-dbus-proxy"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "03sj1h0c2l08xa8phw013fnxr4fgav7l2mkjhzf9xk3dykwxcj8p"; + sha256 = "sha256-A7XSjKh5JT3bvOMQmJCb7MoUleqBGmN3pJLijxbAm5s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index ad68f13fe0f1..6764df634bbc 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -10,6 +10,7 @@ , gsettings-desktop-schemas , gtk4 , libadwaita +, gnome-desktop , xdg-desktop-portal , wayland , gnome @@ -17,11 +18,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "41.1"; + version = "42.0.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "u6FEGZ5+1LlJCyScGvZFqGnWKZMmXerDjyGb8EL//fI="; + sha256 = "3+i1JFDzKDj5+eiY6Vqo36JwXOEtQ4MFVXwSi5zg4uY="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas # settings exposed by settings portal gtk4 libadwaita + gnome-desktop xdg-desktop-portal wayland # required by GTK 4 ]; diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 08d695c15e53..13a16f111ea8 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,13 +1,13 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoreconfHook , pkg-config , libxml2 , xdg-desktop-portal , gtk3 , gnome +, gnome-desktop , glib , wrapGAppsHook , gsettings-desktop-schemas @@ -16,28 +16,15 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "7w+evZLtmTmDHVVsw25bJz99xtlSCE8qTFSxez9tlZk="; + sha256 = "I1ZoDqZQPfPwPr4Ybk+syz+YEkrK2ReflZaJJWD4Nsk="; }; - patches = [ - # Fix broken translation. - # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/353 - (fetchpatch { - url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/e34f49ca8365801a7fcacccb46ab1e62aec17435.patch"; - sha256 = "umMsSP0fuSQgxlHLaZlg25ln1aAL1mssWzPMIWAOUt4="; - }) - (fetchpatch { - url = "https://github.com/flatpak/xdg-desktop-portal-gtk/commit/19c5385b9f5fe0f8dac8ae7cc4493bb08f802de6.patch"; - sha256 = "nbmOb5er20zBOO4K2geYITafqBaNHbDpq1OOvIVD6hY="; - }) - ]; - nativeBuildInputs = [ autoreconfHook libxml2 @@ -50,17 +37,22 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas # settings exposed by settings portal gtk3 - gnome.gnome-desktop + gnome-desktop gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) ]; - configureFlags = lib.optionals buildPortalsInGnome [ + configureFlags = if buildPortalsInGnome then [ "--enable-wallpaper" "--enable-screenshot" "--enable-screencast" "--enable-background" "--enable-settings" "--enable-appchooser" + ] else [ + # These are now enabled by default, even though we do not need them for GNOME. + # https://github.com/flatpak/xdg-desktop-portal-gtk/issues/355 + "--disable-settings" + "--disable-appchooser" ]; meta = with lib; { diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index bb8950ca1ec9..19a671e7e0b0 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,28 +1,29 @@ -{ stdenv -, lib +{ lib +, acl +, autoreconfHook +, dbus , fetchFromGitHub , fetchpatch -, nixosTests -, substituteAll -, autoreconfHook -, pkg-config -, libxml2 -, glib -, pipewire , flatpak -, gsettings-desktop-schemas -, acl -, dbus , fuse -, libportal , geoclue2 +, glib +, gsettings-desktop-schemas , json-glib +, libportal +, libxml2 +, nixosTests +, pipewire +, pkg-config +, stdenv +, substituteAll , wrapGAppsHook +, enableGeoLocation ? true }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.10.1"; + version = "1.12.1"; outputs = [ "out" "installedTests" ]; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "Q1ZP/ljdIxJHg+3JaTL/LIZV+3cK2+dognsTC95udVA="; + sha256 = "1fc3LXN6wp/zQw4HQ0Q99HUvBhynHrQi2p3s/08izuE="; }; patches = [ @@ -39,36 +40,33 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit flatpak; }) - # Fixes the issue in https://github.com/flatpak/xdg-desktop-portal/issues/636 - # Remove it when the next stable release arrives - (fetchpatch { - url = "https://github.com/flatpak/xdg-desktop-portal/commit/d7622e15ff8fef114a6759dde564826d04215a9f.patch"; - sha256 = "sha256-vmfxK4ddG6Xon//rpiz6OiBsDLtT0VG5XyBJG3E4PPs="; - }) ]; nativeBuildInputs = [ autoreconfHook - pkg-config libxml2 + pkg-config wrapGAppsHook ]; buildInputs = [ - glib - pipewire - flatpak acl dbus - geoclue2 + flatpak fuse - libportal + glib gsettings-desktop-schemas json-glib + libportal + pipewire + ] ++ lib.optionals enableGeoLocation [ + geoclue2 ]; configureFlags = [ "--enable-installed-tests" + ] ++ lib.optionals (!enableGeoLocation) [ + "--disable-geoclue" ]; makeFlags = [ @@ -84,7 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Desktop integration portals for sandboxed apps"; - license = licenses.lgpl21; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 70fdf24dd9f4..aab4542ac383 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,8 +1,10 @@ { lib , stdenv , fetchurl +, fetchpatch , aalib , alsa-lib +, autoconf , ffmpeg , flac , libGL @@ -33,7 +35,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-71GyHRDdoQRfp9cRvZFxz9rwpaKHQjO88W/98o7AcAU="; }; + patches = [ + # Fix build with libcaca 0.99.beta20 ; remove for xine-lib 1.2.12 + (fetchpatch { + name = "xine-lib-libcaca-0.99.beta20-fix.patch"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/209ae10d59d29c13633b75aa327cf937f3ff0725/trunk/010-xine-lib-libcaca-0.99.beta20-fix.patch"; + sha256 = "088141x1yp84y09x3s01v21yzas2bwavxz9v30z5hyq6c3syrmgr"; + }) + # Fix build with ffmpeg 5.0 ; remove for xine-lib 1.2.12 + (fetchpatch { + name = "xine-lib-ffmpeg-5.0-fix.patch"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/209ae10d59d29c13633b75aa327cf937f3ff0725/trunk/020-xine-lib-ffmpeg-5.0-fix.patch"; + sha256 = "15ff15bqxq1nqqazfbmfq6swrdjr2raxyq7hx6k0r61izhf0g8ld"; + }) + ]; + nativeBuildInputs = [ + autoconf pkg-config perl ]; @@ -71,7 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { - homepage = "http://www.xinehq.de/"; + homepage = "http://xine.sourceforge.net/"; description = "A high-performance, portable and reusable multimedia playback engine"; license = with licenses; [ gpl2Plus lgpl2Plus ]; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 1f63b2cfc871..5f2557514804 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -73,7 +73,6 @@ stdenv.mkDerivation rec { description = "XML Security Library in C based on libxml2"; license = lib.licenses.mit; platforms = with lib.platforms; linux ++ darwin; - updateWalker = true; }; } ) diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix index 49544a374682..9dd55482300c 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.14"; + version = "1.4.15"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4FSUBFqrxTbqg2EKYuXv4gUeE40ViNZRk5gHv+C2p9o="; + sha256 = "sha256-hPAL1UngodNbQCCdKulaF5faI0JOjmWdz3q8oyPH7C4="; }; patches = [ diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index c2ddda7a6c5f..c639eb7b30e9 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.1.16"; + version = "1.2.0"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-+8FkivLTZXdu0+1wu+7T98y6rQzIHbG9l15Abrbln1o="; + hash = "sha256-7H1WF5VkpA65xCdEa0Sw4r4jj+kGhDVCMr5AeE+3Ii4="; }; nativeBuildInputs = [ @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # does not find argp-standalone }; } diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index de1953622e93..d5e058ef726e 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchFromGitLab -, fetchpatch , pkg-config , glib , sqlite @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "zeitgeist"; - version = "1.0.3"; + version = "1.0.4"; outputs = [ "out" "lib" "dev" "man" ] ++ lib.optional pythonSupport "py"; @@ -29,17 +29,9 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0y6fyzxl5np4yskcxibd0p03h619w9ir907nhf40h02y0pk1kgkp"; + sha256 = "kG1N8DXgjYAJ8fbrGHsp7eTqB20H5smzRnW0PSRUYR0="; }; - patches = [ - # Fix build with Vala 0.52 - (fetchpatch { - url = "https://gitlab.freedesktop.org/zeitgeist/zeitgeist/commit/64ac3a6f94cd299e5e14945dc31b48f009dec152.patch"; - sha256 = "Dw1kNE3JoFdmgcQ0eFoFLYvmxlPjXNj56Jkn2meINz4="; - }) - ]; - nativeBuildInputs = [ autoconf automake diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 8d7cb3a48c88..48603000c903 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -22,13 +22,13 @@ assert shared || static; assert splitStaticOutput -> static; stdenv.mkDerivation (rec { - name = "zlib-${version}"; + pname = "zlib"; version = "1.2.11"; src = fetchurl { urls = - [ "https://www.zlib.net/fossils/${name}.tar.gz" # stable archive path - "mirror://sourceforge/libpng/zlib/${version}/${name}.tar.gz" + [ "https://www.zlib.net/fossils/zlib-${version}.tar.gz" # stable archive path + "mirror://sourceforge/libpng/zlib/${version}/zlib-${version}.tar.gz" ]; sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"; }; diff --git a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh index f8bae8997272..7959d1146f7c 100755 --- a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh +++ b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh @@ -51,7 +51,7 @@ url="${ql_src##* }" [ "$ql_src_type" = github ] && { ql_src_type=git url="https://github.com/$url"; - version="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/releases/" | grep /tag/ | head -n 1 | xargs -l1 basename)" + version="$("$(dirname "$0")/urls-from-page.sh" "$url/releases/" | grep /tag/ | head -n 1 | xargs -l1 basename)" rev="refs/tags/$version"; } @@ -62,7 +62,7 @@ url="${ql_src##* }" ) && { url="${url/git:/https:}" url="${url%.git}" - [ -z "$rev" ] && rev=$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename) + [ -z "$rev" ] && rev=$("$(dirname "$0")/urls-from-page.sh" "$url/commits" | grep /commit/ | head -n 1 | xargs basename) hash=$("$(dirname "$0")/../../../build-support/fetchgit/nix-prefetch-git" "$url" "$rev" | grep . | tail -n 1) [ -z "$version" ] && version="git-$(date +%Y%m%d)"; } @@ -131,7 +131,7 @@ url="${ql_src##* }" [ "$ql_src_type" = froydware-http ] && { dirurl="http://method-combination.net/lisp/files/"; - url="$("$(dirname "$0")/../../../build-support/upstream-updater/urls-from-page.sh" "$dirurl" | + url="$("$(dirname "$0")/urls-from-page.sh" "$dirurl" | grep "/${url}_" | grep -v "[.]asc\$" | tail -n 1)" ql_src_type=http } diff --git a/pkgs/build-support/upstream-updater/urls-from-page.sh b/pkgs/development/lisp-modules/from-quicklisp/urls-from-page.sh similarity index 99% rename from pkgs/build-support/upstream-updater/urls-from-page.sh rename to pkgs/development/lisp-modules/from-quicklisp/urls-from-page.sh index db39286ccb02..26724d122a77 100755 --- a/pkgs/build-support/upstream-updater/urls-from-page.sh +++ b/pkgs/development/lisp-modules/from-quicklisp/urls-from-page.sh @@ -6,7 +6,7 @@ path="${url#$protocol://}" server="${path%%/*}" basepath="${path%/*}" relpath="${path#$server}" - + echo "URL: $url" >&2 curl -A 'text/html; text/xhtml; text/xml; */*' -L -k "$url" | sed -re 's/^/-/;s/[^a-zA-Z][hH][rR][eE][fF]=("([^"]*)"|'\''([^'\'']*)'\''|([^"'\'' <>&]+)[ <>&])/\n+\2\3\4\n-/g' | \ diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 7a7cc165fe51..fe31e2ba348b 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -14,10 +14,11 @@ let lispPackages = rec { description = "The Common Lisp package manager"; deps = []; - src = pkgs.fetchgit { - url = "https://github.com/quicklisp/quicklisp-client/"; - rev = "refs/tags/version-${version}"; - sha256 = "sha256:102f1chpx12h5dcf659a9kzifgfjc482ylf73fg1cs3w34zdawnl"; + src = pkgs.fetchFromGitHub { + owner = "quicklisp"; + repo = "quicklisp-client"; + rev = "version-${version}"; + sha256 = "sha256-1HLVPhl8aBaeG8dRLxBh0j0X/0wqFeNYK1CEfiELToA="; }; overrides = x: rec { inherit clwrapper; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/float-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/float-features.nix new file mode 100644 index 000000000000..62001bc69e33 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/float-features.nix @@ -0,0 +1,30 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "float-features"; + version = "20210228-git"; + + description = "A portability library for IEEE float features not covered by the CL standard."; + + deps = [ args."documentation-utils" args."trivial-indent" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/float-features/2021-02-28/float-features-20210228-git.tgz"; + sha256 = "1giy9qm9bgdfp1mm4d36fcj544kfq68qckmijlrhwbvkpk18hgrd"; + }; + + packageName = "float-features"; + + asdFilesToKeep = ["float-features.asd"]; + overrides = x: x; +} +/* (SYSTEM float-features DESCRIPTION + A portability library for IEEE float features not covered by the CL standard. + SHA256 1giy9qm9bgdfp1mm4d36fcj544kfq68qckmijlrhwbvkpk18hgrd URL + http://beta.quicklisp.org/archive/float-features/2021-02-28/float-features-20210228-git.tgz + MD5 77223b9c85dca49d0f599e51ba95953a NAME float-features FILENAME + float-features DEPS + ((NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES (documentation-utils trivial-indent) VERSION 20210228-git + SIBLINGS (float-features-tests) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flow.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flow.nix new file mode 100644 index 000000000000..1adac0993d28 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flow.nix @@ -0,0 +1,29 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "flow"; + version = "20200610-git"; + + description = "A flowchart and generalised graph library."; + + deps = [ args."closer-mop" args."documentation-utils" args."trivial-indent" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/flow/2020-06-10/flow-20200610-git.tgz"; + sha256 = "1z1krk1iiz7n1mvpnmqnrgfhicpppb45i0jgkqnrds749xjnx194"; + }; + + packageName = "flow"; + + asdFilesToKeep = ["flow.asd"]; + overrides = x: x; +} +/* (SYSTEM flow DESCRIPTION A flowchart and generalised graph library. SHA256 + 1z1krk1iiz7n1mvpnmqnrgfhicpppb45i0jgkqnrds749xjnx194 URL + http://beta.quicklisp.org/archive/flow/2020-06-10/flow-20200610-git.tgz MD5 + f0767467d5e9bfda6fe5777a26719811 NAME flow FILENAME flow DEPS + ((NAME closer-mop FILENAME closer-mop) + (NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES (closer-mop documentation-utils trivial-indent) VERSION + 20200610-git SIBLINGS (flow-visualizer) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lambda-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lambda-fiddle.nix new file mode 100644 index 000000000000..62adaf2bca44 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lambda-fiddle.nix @@ -0,0 +1,27 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "lambda-fiddle"; + version = "20190710-git"; + + description = "A collection of functions to process lambda-lists."; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/lambda-fiddle/2019-07-10/lambda-fiddle-20190710-git.tgz"; + sha256 = "0v4qjpp9fq9rlxhr5f6mjs5f076xrjk19rl6qgp1ap1ykcrx8k4j"; + }; + + packageName = "lambda-fiddle"; + + asdFilesToKeep = ["lambda-fiddle.asd"]; + overrides = x: x; +} +/* (SYSTEM lambda-fiddle DESCRIPTION + A collection of functions to process lambda-lists. SHA256 + 0v4qjpp9fq9rlxhr5f6mjs5f076xrjk19rl6qgp1ap1ykcrx8k4j URL + http://beta.quicklisp.org/archive/lambda-fiddle/2019-07-10/lambda-fiddle-20190710-git.tgz + MD5 78f68f144ace9cb8f634ac14b3414e5e NAME lambda-fiddle FILENAME + lambda-fiddle DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/legit.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/legit.nix new file mode 100644 index 000000000000..c98640931990 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/legit.nix @@ -0,0 +1,35 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "legit"; + version = "20190710-git"; + + description = "CL interface to the GIT binary."; + + deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."documentation-utils" args."lambda-fiddle" args."simple-inferiors" args."trivial-indent" args."uiop" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/legit/2019-07-10/legit-20190710-git.tgz"; + sha256 = "0g7cn50qvivsn0w9yszqw2qh22jsj60067pmg5pvwsjm03xdl9s9"; + }; + + packageName = "legit"; + + asdFilesToKeep = ["legit.asd"]; + overrides = x: x; +} +/* (SYSTEM legit DESCRIPTION CL interface to the GIT binary. SHA256 + 0g7cn50qvivsn0w9yszqw2qh22jsj60067pmg5pvwsjm03xdl9s9 URL + http://beta.quicklisp.org/archive/legit/2019-07-10/legit-20190710-git.tgz + MD5 9b380fc23d4bab086df8a0e4a598457a NAME legit FILENAME legit DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME cl-ppcre FILENAME cl-ppcre) + (NAME documentation-utils FILENAME documentation-utils) + (NAME lambda-fiddle FILENAME lambda-fiddle) + (NAME simple-inferiors FILENAME simple-inferiors) + (NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop)) + DEPENDENCIES + (alexandria bordeaux-threads cl-ppcre documentation-utils lambda-fiddle + simple-inferiors trivial-indent uiop) + VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-binary.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-binary.nix new file mode 100644 index 000000000000..ae18bc99ef2e --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lisp-binary.nix @@ -0,0 +1,37 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "lisp-binary"; + version = "20210411-git"; + + description = "Declare binary formats as structs and then read and write them."; + + deps = [ args."alexandria" args."babel" args."cffi" args."closer-mop" args."flexi-streams" args."iterate" args."moptilities" args."quasiquote-2_dot_0" args."trivial-features" args."trivial-gray-streams" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/lisp-binary/2021-04-11/lisp-binary-20210411-git.tgz"; + sha256 = "1sbapl8qla4xb8wcix9yxpijkbk1bpybhay7ncb3z2im7r2kzsnb"; + }; + + packageName = "lisp-binary"; + + asdFilesToKeep = ["lisp-binary.asd"]; + overrides = x: x; +} +/* (SYSTEM lisp-binary DESCRIPTION + Declare binary formats as structs and then read and write them. SHA256 + 1sbapl8qla4xb8wcix9yxpijkbk1bpybhay7ncb3z2im7r2kzsnb URL + http://beta.quicklisp.org/archive/lisp-binary/2021-04-11/lisp-binary-20210411-git.tgz + MD5 29d85f01a1cb17742164bacae940d29c NAME lisp-binary FILENAME lisp-binary + DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) (NAME closer-mop FILENAME closer-mop) + (NAME flexi-streams FILENAME flexi-streams) + (NAME iterate FILENAME iterate) (NAME moptilities FILENAME moptilities) + (NAME quasiquote-2.0 FILENAME quasiquote-2_dot_0) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-gray-streams FILENAME trivial-gray-streams)) + DEPENDENCIES + (alexandria babel cffi closer-mop flexi-streams iterate moptilities + quasiquote-2.0 trivial-features trivial-gray-streams) + VERSION 20210411-git SIBLINGS (lisp-binary-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix new file mode 100644 index 000000000000..f5425cf549ff --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mmap.nix @@ -0,0 +1,33 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "mmap"; + version = "20201220-git"; + + description = "Portable mmap (file memory mapping) utility library."; + + deps = [ args."alexandria" args."babel" args."cffi" args."documentation-utils" args."trivial-features" args."trivial-indent" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/mmap/2020-12-20/mmap-20201220-git.tgz"; + sha256 = "147xw351xh90k3yvc1fn7k418afmgngd56i8a6d7p41fzs54g6ij"; + }; + + packageName = "mmap"; + + asdFilesToKeep = ["mmap.asd"]; + overrides = x: x; +} +/* (SYSTEM mmap DESCRIPTION + Portable mmap (file memory mapping) utility library. SHA256 + 147xw351xh90k3yvc1fn7k418afmgngd56i8a6d7p41fzs54g6ij URL + http://beta.quicklisp.org/archive/mmap/2020-12-20/mmap-20201220-git.tgz MD5 + e2dbeb48b59735bd2ed54ea7f9cdfe0f NAME mmap FILENAME mmap DEPS + ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel) + (NAME cffi FILENAME cffi) + (NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-features FILENAME trivial-features) + (NAME trivial-indent FILENAME trivial-indent)) + DEPENDENCIES + (alexandria babel cffi documentation-utils trivial-features trivial-indent) + VERSION 20201220-git SIBLINGS (mmap-test) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nbd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nbd.nix new file mode 100644 index 000000000000..6387a8345dc2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nbd.nix @@ -0,0 +1,33 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "nbd"; + version = "20200925-git"; + + parasites = [ "nbd/simple-in-memory" ]; + + description = "Network Block Device server library."; + + deps = [ args."bordeaux-threads" args."flexi-streams" args."lisp-binary" args."wild-package-inferred-system" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/nbd/2020-09-25/nbd-20200925-git.tgz"; + sha256 = "1npq9a8l3mn67n22ywqm8wh6kr9xv9djla2yj2m535gkysrlvnky"; + }; + + packageName = "nbd"; + + asdFilesToKeep = ["nbd.asd"]; + overrides = x: x; +} +/* (SYSTEM nbd DESCRIPTION Network Block Device server library. SHA256 + 1npq9a8l3mn67n22ywqm8wh6kr9xv9djla2yj2m535gkysrlvnky URL + http://beta.quicklisp.org/archive/nbd/2020-09-25/nbd-20200925-git.tgz MD5 + f32b7a508ac87c1e179c259b171dc837 NAME nbd FILENAME nbd DEPS + ((NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME flexi-streams FILENAME flexi-streams) + (NAME lisp-binary FILENAME lisp-binary) + (NAME wild-package-inferred-system FILENAME wild-package-inferred-system)) + DEPENDENCIES + (bordeaux-threads flexi-streams lisp-binary wild-package-inferred-system) + VERSION 20200925-git SIBLINGS NIL PARASITES (nbd/simple-in-memory)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quasiquote-2_dot_0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quasiquote-2_dot_0.nix new file mode 100644 index 000000000000..146d5cf06d1a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quasiquote-2_dot_0.nix @@ -0,0 +1,31 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "quasiquote-2_dot_0"; + version = "20150505-git"; + + parasites = [ "quasiquote-2.0-tests" ]; + + description = "Writing macros that write macros. Effortless."; + + deps = [ args."fiveam" args."iterate" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz"; + sha256 = "0bgcqk7wp7qblw7avsawkg24zjiq9vgsbfa0yhk64avhxwjw6974"; + }; + + packageName = "quasiquote-2.0"; + + asdFilesToKeep = ["quasiquote-2.0.asd"]; + overrides = x: x; +} +/* (SYSTEM quasiquote-2.0 DESCRIPTION + Writing macros that write macros. Effortless. SHA256 + 0bgcqk7wp7qblw7avsawkg24zjiq9vgsbfa0yhk64avhxwjw6974 URL + http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz + MD5 7c557e0c10cf7608afa5a20e4a83c778 NAME quasiquote-2.0 FILENAME + quasiquote-2_dot_0 DEPS + ((NAME fiveam FILENAME fiveam) (NAME iterate FILENAME iterate)) + DEPENDENCIES (fiveam iterate) VERSION 20150505-git SIBLINGS NIL PARASITES + (quasiquote-2.0-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-inferiors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-inferiors.nix new file mode 100644 index 000000000000..a8dcd973eb9c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-inferiors.nix @@ -0,0 +1,33 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "simple-inferiors"; + version = "20200325-git"; + + description = "A very simple library to use inferior processes."; + + deps = [ args."alexandria" args."bordeaux-threads" args."documentation-utils" args."trivial-indent" args."uiop" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/simple-inferiors/2020-03-25/simple-inferiors-20200325-git.tgz"; + sha256 = "15gjizqrazr0ahdda2l6bkv7ii5ax1wckn9mnj5haiv17jba8pn5"; + }; + + packageName = "simple-inferiors"; + + asdFilesToKeep = ["simple-inferiors.asd"]; + overrides = x: x; +} +/* (SYSTEM simple-inferiors DESCRIPTION + A very simple library to use inferior processes. SHA256 + 15gjizqrazr0ahdda2l6bkv7ii5ax1wckn9mnj5haiv17jba8pn5 URL + http://beta.quicklisp.org/archive/simple-inferiors/2020-03-25/simple-inferiors-20200325-git.tgz + MD5 f90ae807c10d5b3c4b9eef1134a537c8 NAME simple-inferiors FILENAME + simple-inferiors DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME documentation-utils FILENAME documentation-utils) + (NAME trivial-indent FILENAME trivial-indent) (NAME uiop FILENAME uiop)) + DEPENDENCIES + (alexandria bordeaux-threads documentation-utils trivial-indent uiop) + VERSION 20200325-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix new file mode 100644 index 000000000000..02b641043eca --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/slynk.nix @@ -0,0 +1,30 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "slynk"; + version = "sly-20210411-git"; + + parasites = [ "slynk/arglists" "slynk/fancy-inspector" "slynk/indentation" "slynk/mrepl" "slynk/package-fu" "slynk/profiler" "slynk/retro" "slynk/stickers" "slynk/trace-dialog" ]; + + description = "System lacks description"; + + deps = [ ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/sly/2021-04-11/sly-20210411-git.tgz"; + sha256 = "1a96aapsz3fhnnnb8njn8v2ddrh6kwisppd90cc7v8knh043xgks"; + }; + + packageName = "slynk"; + + asdFilesToKeep = ["slynk.asd"]; + overrides = x: x; +} +/* (SYSTEM slynk DESCRIPTION System lacks description SHA256 + 1a96aapsz3fhnnnb8njn8v2ddrh6kwisppd90cc7v8knh043xgks URL + http://beta.quicklisp.org/archive/sly/2021-04-11/sly-20210411-git.tgz MD5 + 7f0ff6b8a07d23599c77cd33c6d59ea6 NAME slynk FILENAME slynk DEPS NIL + DEPENDENCIES NIL VERSION sly-20210411-git SIBLINGS NIL PARASITES + (slynk/arglists slynk/fancy-inspector slynk/indentation slynk/mrepl + slynk/package-fu slynk/profiler slynk/retro slynk/stickers + slynk/trace-dialog)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wild-package-inferred-system.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wild-package-inferred-system.nix new file mode 100644 index 000000000000..989c94b26548 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wild-package-inferred-system.nix @@ -0,0 +1,30 @@ +/* Generated file. */ +args @ { fetchurl, ... }: +rec { + baseName = "wild-package-inferred-system"; + version = "20200325-git"; + + parasites = [ "wild-package-inferred-system/test" ]; + + description = "Introduces the wildcards `*' and `**' into package-inferred-system"; + + deps = [ args."fiveam" ]; + + src = fetchurl { + url = "http://beta.quicklisp.org/archive/wild-package-inferred-system/2020-03-25/wild-package-inferred-system-20200325-git.tgz"; + sha256 = "1ypnpzy9z4zkna29sgl4afc386ksa61302bm5kznxb3zz2v1sjas"; + }; + + packageName = "wild-package-inferred-system"; + + asdFilesToKeep = ["wild-package-inferred-system.asd"]; + overrides = x: x; +} +/* (SYSTEM wild-package-inferred-system DESCRIPTION + Introduces the wildcards `*' and `**' into package-inferred-system SHA256 + 1ypnpzy9z4zkna29sgl4afc386ksa61302bm5kznxb3zz2v1sjas URL + http://beta.quicklisp.org/archive/wild-package-inferred-system/2020-03-25/wild-package-inferred-system-20200325-git.tgz + MD5 4dfd9f90d780b1e67640543dd4acbf21 NAME wild-package-inferred-system + FILENAME wild-package-inferred-system DEPS ((NAME fiveam FILENAME fiveam)) + DEPENDENCIES (fiveam) VERSION 20200325-git SIBLINGS (foo-wild) PARASITES + (wild-package-inferred-system/test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 51e4627cb8e6..93c38c989d6c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -137,6 +137,8 @@ fast-io file-attributes fiveam flexi-streams +float-features +flow form-fiddle fset generic-cl @@ -156,12 +158,14 @@ iterate jonathan jsown lack +legit let-plus lev lfarm-client lfarm-server lfarm-ssl lift +lisp-binary lisp-namespace lla local-time @@ -176,10 +180,12 @@ mgl-pax minheap misc-extensions mk-string-metrics +mmap moptilities more-conditions mt19937 named-readtables +nbd net-telent-date nibbles optima @@ -205,6 +211,7 @@ salza2 serapeum simple-date simple-date-time +slynk smart-buffer smug spinneret diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 018cba19c031..08c152ddf725 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -297,6 +297,15 @@ let quicklisp-to-nix-packages = rec { })); + "wild-package-inferred-system" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."wild-package-inferred-system" or (x: {})) + (import ./quicklisp-to-nix-output/wild-package-inferred-system.nix { + inherit fetchurl; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + })); + + "parseq" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."parseq" or (x: {})) @@ -345,6 +354,16 @@ let quicklisp-to-nix-packages = rec { })); + "quasiquote-2_dot_0" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."quasiquote-2_dot_0" or (x: {})) + (import ./quicklisp-to-nix-output/quasiquote-2_dot_0.nix { + inherit fetchurl; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + "iterate" = quicklisp-to-nix-packages."iterate"; + })); + + "lfarm-common" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lfarm-common" or (x: {})) @@ -359,6 +378,43 @@ let quicklisp-to-nix-packages = rec { "usocket" = quicklisp-to-nix-packages."usocket"; })); + "simple-inferiors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."simple-inferiors" or (x: {})) + (import ./quicklisp-to-nix-output/simple-inferiors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + + "lambda-fiddle" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lambda-fiddle" or (x: {})) + (import ./quicklisp-to-nix-output/lambda-fiddle.nix { + inherit fetchurl; + })); + + + "iolib_dot_grovel" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib_dot_grovel" or (x: {})) + (import ./quicklisp-to-nix-output/iolib_dot_grovel.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf"; + "iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base"; + "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp"; + "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); "trivia_dot_quasiquote" = buildLispPackage ((f: x: (x // (f x))) @@ -2328,6 +2384,14 @@ let quicklisp-to-nix-packages = rec { })); + "slynk" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."slynk" or (x: {})) + (import ./quicklisp-to-nix-output/slynk.nix { + inherit fetchurl; + })); + + "simple-date-time" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."simple-date-time" or (x: {})) @@ -2655,6 +2719,18 @@ let quicklisp-to-nix-packages = rec { })); + "nbd" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."nbd" or (x: {})) + (import ./quicklisp-to-nix-output/nbd.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "lisp-binary" = quicklisp-to-nix-packages."lisp-binary"; + "wild-package-inferred-system" = quicklisp-to-nix-packages."wild-package-inferred-system"; + })); + + "named-readtables" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."named-readtables" or (x: {})) @@ -2692,6 +2768,20 @@ let quicklisp-to-nix-packages = rec { })); + "mmap" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."mmap" or (x: {})) + (import ./quicklisp-to-nix-output/mmap.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + "mk-string-metrics" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."mk-string-metrics" or (x: {})) @@ -2836,6 +2926,24 @@ let quicklisp-to-nix-packages = rec { })); + "lisp-binary" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lisp-binary" or (x: {})) + (import ./quicklisp-to-nix-output/lisp-binary.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "moptilities" = quicklisp-to-nix-packages."moptilities"; + "quasiquote-2_dot_0" = quicklisp-to-nix-packages."quasiquote-2_dot_0"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + "lift" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lift" or (x: {})) @@ -2921,6 +3029,22 @@ let quicklisp-to-nix-packages = rec { })); + "legit" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."legit" or (x: {})) + (import ./quicklisp-to-nix-output/legit.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "lambda-fiddle" = quicklisp-to-nix-packages."lambda-fiddle"; + "simple-inferiors" = quicklisp-to-nix-packages."simple-inferiors"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + "lack" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."lack" or (x: {})) @@ -3257,6 +3381,27 @@ let quicklisp-to-nix-packages = rec { })); + "flow" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."flow" or (x: {})) + (import ./quicklisp-to-nix-output/flow.nix { + inherit fetchurl; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + + "float-features" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."float-features" or (x: {})) + (import ./quicklisp-to-nix-output/float-features.nix { + inherit fetchurl; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + "flexi-streams" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."flexi-streams" or (x: {})) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c4442f1fd795..71d85a776bb2 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2033,14 +2033,14 @@ luv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "luv"; - version = "1.42.0-0"; + version = "1.43.0-0"; knownRockspec = (fetchurl { - url = "https://luarocks.org/luv-1.42.0-0.rockspec"; - sha256 = "0pr2gjjnm60w0csb0dacrjalan7ifsfw4lki4ykxx1f4m5snam09"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luv-1.43.0-0.rockspec"; + sha256 = "0z5a7yp20xbb3f9w73skm9fj89gxxqv72nrxjq3kycsc6c2v3m8f"; }).outPath; src = fetchurl { - url = "https://github.com/luvit/luv/releases/download/1.42.0-0/luv-1.42.0-0.tar.gz"; - sha256 = "0dkzjkkm0h516ag6sfz5iji761y9slrcfw325f39zkda1sfql8mm"; + url = "https://github.com/luvit/luv/releases/download/1.43.0-0/luv-1.43.0-0.tar.gz"; + sha256 = "1qlx1r79sfn8r20yx19bhdr0v58ykpwgwzy5vma9p2ngrlynyyjn"; }; disabled = with lua; (luaOlder "5.1"); diff --git a/pkgs/development/misc/google-clasp/README.md b/pkgs/development/misc/google-clasp/README.md deleted file mode 100644 index 9adf2255380e..000000000000 --- a/pkgs/development/misc/google-clasp/README.md +++ /dev/null @@ -1,6 +0,0 @@ -## How to update - -1. bump version of `@google/clasp` in [node-packages.json](./node-packages.json) -2. run [generate.sh](./generate.sh) -3. set the same version in [default.nix](./default.nix) -4. build and test it diff --git a/pkgs/development/misc/google-clasp/default.nix b/pkgs/development/misc/google-clasp/default.nix deleted file mode 100644 index 12598e9fd86c..000000000000 --- a/pkgs/development/misc/google-clasp/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, pkgs }: -let - version = "2.2.1"; -in -(import ./google-clasp.nix { - inherit pkgs; - inherit (stdenv.hostPlatform) system; -})."@google/clasp-${version}".override { - preRebuild = '' - patch -p1 <<<"${builtins.readFile ./dotf.patch}" - ''; - meta = { - description = "Command Line tool for Google Apps Script Projects"; - homepage = "https://developers.google.com/apps-script/guides/clasp"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.michojel ]; - priority = 100; - }; -} diff --git a/pkgs/development/misc/google-clasp/dotf.patch b/pkgs/development/misc/google-clasp/dotf.patch deleted file mode 100644 index 0d59cae6125c..000000000000 --- a/pkgs/development/misc/google-clasp/dotf.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: nodejs/tmp/xcindf87mmqyp0x5blima5q2m9fw3dx3-node__at_google_slash_clasp-2.2.1/lib/node_modules/@google/clasp/src/dotfile.js -=================================================================== ---- clasp.orig/src/dotfile.js -+++ clasp/src/dotfile.js -@@ -94,7 +94,7 @@ exports.DOTFILE = { - return dotf(projectPath ? path_1.default.dirname(projectPath) : exports.DOT.PROJECT.DIR, exports.DOT.PROJECT.NAME); - }, - // Stores {ClaspCredentials} -- RC: dotf(exports.DOT.RC.DIR, exports.DOT.RC.NAME), -+ RC: dotf.default(exports.DOT.RC.DIR, exports.DOT.RC.NAME), - // Stores {ClaspCredentials} - RC_LOCAL: function () { - var localPath = find_up_1.default.sync(exports.DOT.PROJECT.PATH); diff --git a/pkgs/development/misc/google-clasp/generate.sh b/pkgs/development/misc/google-clasp/generate.sh deleted file mode 100755 index 4e04231e2b89..000000000000 --- a/pkgs/development/misc/google-clasp/generate.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix - -set -eu -o pipefail - -exec node2nix --nodejs-10 \ - -i node-packages.json -o node-packages.nix \ - -c google-clasp.nix \ - --no-copy-node-env -e ../../../development/node-packages/node-env.nix diff --git a/pkgs/development/misc/google-clasp/node-packages.json b/pkgs/development/misc/google-clasp/node-packages.json deleted file mode 100644 index b868571d0516..000000000000 --- a/pkgs/development/misc/google-clasp/node-packages.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - {"@google/clasp": "2.2.1"} -] diff --git a/pkgs/development/misc/google-clasp/node-packages.nix b/pkgs/development/misc/google-clasp/node-packages.nix deleted file mode 100644 index c8a611ff160f..000000000000 --- a/pkgs/development/misc/google-clasp/node-packages.nix +++ /dev/null @@ -1,2115 +0,0 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "@nodelib/fs.scandir-2.1.4" = { - name = "_at_nodelib_slash_fs.scandir"; - packageName = "@nodelib/fs.scandir"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; - }; - }; - "@nodelib/fs.stat-2.0.4" = { - name = "_at_nodelib_slash_fs.stat"; - packageName = "@nodelib/fs.stat"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; - }; - }; - "@nodelib/fs.walk-1.2.6" = { - name = "_at_nodelib_slash_fs.walk"; - packageName = "@nodelib/fs.walk"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; - }; - }; - "@sindresorhus/is-0.14.0" = { - name = "_at_sindresorhus_slash_is"; - packageName = "@sindresorhus/is"; - version = "0.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz"; - sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; - }; - }; - "@szmarczak/http-timer-1.1.2" = { - name = "_at_szmarczak_slash_http-timer"; - packageName = "@szmarczak/http-timer"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; - sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; - }; - }; - "@types/glob-7.1.3" = { - name = "_at_types_slash_glob"; - packageName = "@types/glob"; - version = "7.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz"; - sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w=="; - }; - }; - "@types/minimatch-3.0.3" = { - name = "_at_types_slash_minimatch"; - packageName = "@types/minimatch"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; - }; - }; - "@types/node-14.14.22" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "14.14.22"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz"; - sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw=="; - }; - }; - "abort-controller-3.0.0" = { - name = "abort-controller"; - packageName = "abort-controller"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"; - sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; - }; - }; - "agent-base-6.0.2" = { - name = "agent-base"; - packageName = "agent-base"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; - sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; - }; - }; - "aggregate-error-3.1.0" = { - name = "aggregate-error"; - packageName = "aggregate-error"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"; - sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; - }; - }; - "ansi-escapes-3.2.0" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; - }; - }; - "ansi-regex-3.0.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; - }; - }; - "ansi-regex-4.1.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; - }; - }; - "ansi-styles-3.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; - }; - }; - "array-differ-3.0.0" = { - name = "array-differ"; - packageName = "array-differ"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz"; - sha512 = "THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg=="; - }; - }; - "array-union-2.1.0" = { - name = "array-union"; - packageName = "array-union"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; - sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; - }; - }; - "arrify-2.0.1" = { - name = "arrify"; - packageName = "arrify"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"; - sha512 = "3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="; - }; - }; - "balanced-match-1.0.0" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; - }; - }; - "base64-js-1.5.1" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; - sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; - }; - }; - "bignumber.js-9.0.1" = { - name = "bignumber.js"; - packageName = "bignumber.js"; - version = "9.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.1.tgz"; - sha512 = "IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA=="; - }; - }; - "brace-expansion-1.1.11" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - }; - "braces-3.0.2" = { - name = "braces"; - packageName = "braces"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; - }; - }; - "buffer-equal-constant-time-1.0.1" = { - name = "buffer-equal-constant-time"; - packageName = "buffer-equal-constant-time"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; - sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; - }; - }; - "cacheable-request-6.1.0" = { - name = "cacheable-request"; - packageName = "cacheable-request"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz"; - sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; - }; - }; - "call-bind-1.0.2" = { - name = "call-bind"; - packageName = "call-bind"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; - sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; - }; - }; - "chalk-2.4.2" = { - name = "chalk"; - packageName = "chalk"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; - sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; - }; - }; - "chardet-0.7.0" = { - name = "chardet"; - packageName = "chardet"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; - sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; - }; - }; - "clean-stack-2.2.0" = { - name = "clean-stack"; - packageName = "clean-stack"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"; - sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; - }; - }; - "cli-cursor-2.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; - }; - }; - "cli-spinner-0.2.10" = { - name = "cli-spinner"; - packageName = "cli-spinner"; - version = "0.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-spinner/-/cli-spinner-0.2.10.tgz"; - sha512 = "U0sSQ+JJvSLi1pAYuJykwiA8Dsr15uHEy85iCJ6A+0DjVxivr3d+N2Wjvodeg89uP5K6TswFkKBfAD7B3YSn/Q=="; - }; - }; - "cli-width-2.2.1" = { - name = "cli-width"; - packageName = "cli-width"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz"; - sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="; - }; - }; - "clone-response-1.0.2" = { - name = "clone-response"; - packageName = "clone-response"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; - sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; - }; - }; - "color-convert-1.9.3" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; - }; - }; - "color-name-1.1.3" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; - }; - }; - "commander-2.20.3" = { - name = "commander"; - packageName = "commander"; - version = "2.20.3"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "debug-4.3.2" = { - name = "debug"; - packageName = "debug"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; - }; - }; - "decompress-response-3.3.0" = { - name = "decompress-response"; - packageName = "decompress-response"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; - }; - }; - "defer-to-connect-1.1.3" = { - name = "defer-to-connect"; - packageName = "defer-to-connect"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; - sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; - }; - }; - "define-properties-1.1.3" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; - }; - }; - "del-5.1.0" = { - name = "del"; - packageName = "del"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/del/-/del-5.1.0.tgz"; - sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA=="; - }; - }; - "dir-glob-3.0.1" = { - name = "dir-glob"; - packageName = "dir-glob"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; - sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; - }; - }; - "dns-packet-5.2.1" = { - name = "dns-packet"; - packageName = "dns-packet"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-5.2.1.tgz"; - sha512 = "JHj2yJeKOqlxzeuYpN1d56GfhzivAxavNwHj9co3qptECel27B1rLY5PifJAvubsInX5pGLDjAHuCfCUc2Zv/w=="; - }; - }; - "dns-socket-4.2.1" = { - name = "dns-socket"; - packageName = "dns-socket"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-socket/-/dns-socket-4.2.1.tgz"; - sha512 = "fNvDq86lS522+zMbh31X8cQzYQd6xumCNlxsuZF5TKxQThF/e+rJbVM6K8mmlsdcSm6yNjKJQq3Sf38viAJj8g=="; - }; - }; - "dotf-1.5.3" = { - name = "dotf"; - packageName = "dotf"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dotf/-/dotf-1.5.3.tgz"; - sha512 = "hYztBLJ6AoY0GO5qNDy+MH8lNZavrAkVqrfvv9sQSImDo553JRLRjMre11EW4ZPRg8Y4Uha7qwqiMJQDVXxVqg=="; - }; - }; - "duplexer3-0.1.4" = { - name = "duplexer3"; - packageName = "duplexer3"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; - sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; - }; - }; - "ecdsa-sig-formatter-1.0.11" = { - name = "ecdsa-sig-formatter"; - packageName = "ecdsa-sig-formatter"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"; - sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; - }; - }; - "ellipsize-0.1.0" = { - name = "ellipsize"; - packageName = "ellipsize"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ellipsize/-/ellipsize-0.1.0.tgz"; - sha1 = "9d43682d44b91ad16ebd84268ac103170a6553f8"; - }; - }; - "end-of-stream-1.4.4" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; - }; - }; - "es-abstract-1.18.0-next.2" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.18.0-next.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.2.tgz"; - sha512 = "Ih4ZMFHEtZupnUh6497zEL4y2+w8+1ljnCyaTa+adcoafI1GOvMwFlDjBLfWR7y9VLfrjRJe9ocuHY1PSR9jjw=="; - }; - }; - "es-to-primitive-1.2.1" = { - name = "es-to-primitive"; - packageName = "es-to-primitive"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - }; - "event-target-shim-5.0.1" = { - name = "event-target-shim"; - packageName = "event-target-shim"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"; - sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="; - }; - }; - "exec-sh-0.2.2" = { - name = "exec-sh"; - packageName = "exec-sh"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz"; - sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw=="; - }; - }; - "extend-3.0.2" = { - name = "extend"; - packageName = "extend"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; - }; - }; - "external-editor-3.1.0" = { - name = "external-editor"; - packageName = "external-editor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; - sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; - }; - }; - "fast-glob-3.2.5" = { - name = "fast-glob"; - packageName = "fast-glob"; - version = "3.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; - sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; - }; - }; - "fast-text-encoding-1.0.3" = { - name = "fast-text-encoding"; - packageName = "fast-text-encoding"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz"; - sha512 = "dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig=="; - }; - }; - "fastq-1.10.1" = { - name = "fastq"; - packageName = "fastq"; - version = "1.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.10.1.tgz"; - sha512 = "AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA=="; - }; - }; - "figures-2.0.0" = { - name = "figures"; - packageName = "figures"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; - }; - }; - "fill-range-7.0.1" = { - name = "fill-range"; - packageName = "fill-range"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; - }; - }; - "find-up-4.1.0" = { - name = "find-up"; - packageName = "find-up"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; - sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; - }; - }; - "fs-extra-8.1.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"; - sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; - "function-bind-1.1.1" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; - }; - }; - "fuzzy-0.1.3" = { - name = "fuzzy"; - packageName = "fuzzy"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz"; - sha1 = "4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"; - }; - }; - "gaxios-2.3.4" = { - name = "gaxios"; - packageName = "gaxios"; - version = "2.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gaxios/-/gaxios-2.3.4.tgz"; - sha512 = "US8UMj8C5pRnao3Zykc4AAVr+cffoNKRTg9Rsf2GiuZCW69vgJj38VK2PzlPuQU73FZ/nTk9/Av6/JGcE1N9vA=="; - }; - }; - "gcp-metadata-2.0.4" = { - name = "gcp-metadata"; - packageName = "gcp-metadata"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-2.0.4.tgz"; - sha512 = "p1lXhJvcKvJHWfQXhkd4Za1kyXRsGZA0JH7Cjs07W9hrg84d/j5tqQhbGewlSLx9gNyuQUid69uLux48YbggLg=="; - }; - }; - "get-intrinsic-1.1.0" = { - name = "get-intrinsic"; - packageName = "get-intrinsic"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.0.tgz"; - sha512 = "M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg=="; - }; - }; - "get-stream-4.1.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz"; - sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; - }; - }; - "get-stream-5.2.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"; - sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; - }; - }; - "glob-7.1.6" = { - name = "glob"; - packageName = "glob"; - version = "7.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; - }; - }; - "glob-parent-5.1.1" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; - sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; - }; - }; - "globby-10.0.2" = { - name = "globby"; - packageName = "globby"; - version = "10.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz"; - sha512 = "7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg=="; - }; - }; - "google-auth-library-4.2.6" = { - name = "google-auth-library"; - packageName = "google-auth-library"; - version = "4.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-4.2.6.tgz"; - sha512 = "oJ6tCA9rbsYeIVY+mcLPFHa2hatz3XO6idYIrlI/KhhlMxZrO3tKyU8O2Pxu5KnSBBP7Wj4HtbM1LLKngNFaFw=="; - }; - }; - "google-p12-pem-2.0.4" = { - name = "google-p12-pem"; - packageName = "google-p12-pem"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-2.0.4.tgz"; - sha512 = "S4blHBQWZRnEW44OcR7TL9WR+QCqByRvhNDZ/uuQfpxywfupikf/miba8js1jZi6ZOGv5slgSuoshCWh6EMDzg=="; - }; - }; - "googleapis-40.0.1" = { - name = "googleapis"; - packageName = "googleapis"; - version = "40.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/googleapis/-/googleapis-40.0.1.tgz"; - sha512 = "B6qZVCautOOspEhru9GZ814I+ztkGWyA4ZEUfaXwXHBruX/HAWqedbsuUEx1w3nCECywK/FLTNUdcbH9zpaMaw=="; - }; - }; - "googleapis-common-2.0.4" = { - name = "googleapis-common"; - packageName = "googleapis-common"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/googleapis-common/-/googleapis-common-2.0.4.tgz"; - sha512 = "8RRkxr24v1jIKCC1onFWA8RGnwFV55m3Qpil9DLX1yLc9e5qvOJsRoDOhhD2e7jFRONYEhT/BzT8vJZANqSr9w=="; - }; - }; - "got-9.6.0" = { - name = "got"; - packageName = "got"; - version = "9.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-9.6.0.tgz"; - sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; - }; - }; - "graceful-fs-4.2.4" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; - }; - }; - "gtoken-3.0.2" = { - name = "gtoken"; - packageName = "gtoken"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gtoken/-/gtoken-3.0.2.tgz"; - sha512 = "BOBi6Zz31JfxhSHRZBIDdbwIbOPyux10WxJHdx8wz/FMP1zyN1xFrsAWsgcLe5ww5v/OZu/MePUEZAjgJXSauA=="; - }; - }; - "has-1.0.3" = { - name = "has"; - packageName = "has"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; - }; - }; - "has-flag-3.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; - }; - }; - "has-symbols-1.0.1" = { - name = "has-symbols"; - packageName = "has-symbols"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; - sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; - }; - }; - "http-cache-semantics-4.1.0" = { - name = "http-cache-semantics"; - packageName = "http-cache-semantics"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; - }; - }; - "https-proxy-agent-5.0.0" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; - }; - }; - "iconv-lite-0.4.24" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - }; - "ignore-5.1.8" = { - name = "ignore"; - packageName = "ignore"; - version = "5.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; - sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; - }; - }; - "indent-string-4.0.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"; - sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; - "inherits-2.0.4" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - }; - "inquirer-6.5.2" = { - name = "inquirer"; - packageName = "inquirer"; - version = "6.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz"; - sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="; - }; - }; - "inquirer-autocomplete-prompt-1.0.1" = { - name = "inquirer-autocomplete-prompt"; - packageName = "inquirer-autocomplete-prompt"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.0.1.tgz"; - sha512 = "Y4V6ifAu9LNrNjcEtYq8YUKhrgmmufUn5fsDQqeWgHY8rEO6ZAQkNUiZtBm2kw2uUQlC9HdgrRCHDhTPPguH5A=="; - }; - }; - "ip-1.1.5" = { - name = "ip"; - packageName = "ip"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"; - sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; - }; - }; - "ip-regex-4.3.0" = { - name = "ip-regex"; - packageName = "ip-regex"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz"; - sha512 = "B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q=="; - }; - }; - "is-callable-1.2.3" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz"; - sha512 = "J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="; - }; - }; - "is-date-object-1.0.2" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; - }; - }; - "is-extglob-2.1.1" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; - }; - }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; - }; - }; - "is-glob-4.0.1" = { - name = "is-glob"; - packageName = "is-glob"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; - }; - }; - "is-ip-3.1.0" = { - name = "is-ip"; - packageName = "is-ip"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz"; - sha512 = "35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q=="; - }; - }; - "is-negative-zero-2.0.1" = { - name = "is-negative-zero"; - packageName = "is-negative-zero"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; - sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="; - }; - }; - "is-number-7.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; - }; - }; - "is-online-8.5.1" = { - name = "is-online"; - packageName = "is-online"; - version = "8.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-online/-/is-online-8.5.1.tgz"; - sha512 = "RKyTQx/rJqw2QOXHwy7TmXdlkpe0Hhj7GBsr6TQJaj4ebNOfameZCMspU5vYbwBBzJ2brWArdSvNVox6T6oCTQ=="; - }; - }; - "is-path-cwd-2.2.0" = { - name = "is-path-cwd"; - packageName = "is-path-cwd"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; - sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; - }; - }; - "is-path-inside-3.0.2" = { - name = "is-path-inside"; - packageName = "is-path-inside"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz"; - sha512 = "/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg=="; - }; - }; - "is-regex-1.1.2" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz"; - sha512 = "axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg=="; - }; - }; - "is-stream-2.0.0" = { - name = "is-stream"; - packageName = "is-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; - sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; - }; - }; - "is-symbol-1.0.3" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; - }; - }; - "is-wsl-1.1.0" = { - name = "is-wsl"; - packageName = "is-wsl"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"; - sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; - }; - }; - "json-bigint-0.3.1" = { - name = "json-bigint"; - packageName = "json-bigint"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-bigint/-/json-bigint-0.3.1.tgz"; - sha512 = "DGWnSzmusIreWlEupsUelHrhwmPPE+FiQvg+drKfk2p+bdEYa5mp4PJ8JsCWqae0M2jQNb0HPvnwvf1qOTThzQ=="; - }; - }; - "json-buffer-3.0.0" = { - name = "json-buffer"; - packageName = "json-buffer"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz"; - sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; - }; - }; - "jsonfile-4.0.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; - }; - }; - "jsonfile-6.1.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; - }; - }; - "jwa-1.4.1" = { - name = "jwa"; - packageName = "jwa"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz"; - sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA=="; - }; - }; - "jws-3.2.2" = { - name = "jws"; - packageName = "jws"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz"; - sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA=="; - }; - }; - "keyv-3.1.0" = { - name = "keyv"; - packageName = "keyv"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz"; - sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; - }; - }; - "locate-path-5.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; - sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; - }; - }; - "lodash-4.17.20" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.20"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; - sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; - }; - }; - "lowercase-keys-1.0.1" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; - }; - }; - "lowercase-keys-2.0.0" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; - sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; - }; - }; - "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=="; - }; - }; - "merge-1.2.1" = { - name = "merge"; - packageName = "merge"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz"; - sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="; - }; - }; - "merge2-1.4.1" = { - name = "merge2"; - packageName = "merge2"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; - sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; - }; - }; - "micromatch-4.0.2" = { - name = "micromatch"; - packageName = "micromatch"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; - sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; - }; - }; - "mime-2.5.0" = { - name = "mime"; - packageName = "mime"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz"; - sha512 = "ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag=="; - }; - }; - "mimic-fn-1.2.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; - }; - }; - "mimic-response-1.0.1" = { - name = "mimic-response"; - packageName = "mimic-response"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"; - sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; - }; - }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; - }; - }; - "minimist-1.2.5" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; - }; - }; - "mkdirp-0.5.5" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; - }; - }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - }; - "multimatch-4.0.0" = { - name = "multimatch"; - packageName = "multimatch"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz"; - sha512 = "lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ=="; - }; - }; - "mute-stream-0.0.7" = { - name = "mute-stream"; - packageName = "mute-stream"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"; - sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; - }; - }; - "node-fetch-2.6.1" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz"; - sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; - }; - }; - "node-forge-0.9.2" = { - name = "node-forge"; - packageName = "node-forge"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.2.tgz"; - sha512 = "naKSScof4Wn+aoHU6HBsifh92Zeicm1GDQKd1vp3Y/kOi8ub0DozCa9KpvYNCXslFHYRmLNiqRopGdTGwNLpNw=="; - }; - }; - "normalize-url-4.5.0" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; - sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; - }; - }; - "object-inspect-1.9.0" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz"; - sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="; - }; - }; - "object-keys-1.1.1" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - }; - "object.assign-4.1.2" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; - sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; - "onetime-2.0.1" = { - name = "onetime"; - packageName = "onetime"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; - }; - }; - "open-6.4.0" = { - name = "open"; - packageName = "open"; - version = "6.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-6.4.0.tgz"; - sha512 = "IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg=="; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; - }; - }; - "p-any-2.1.0" = { - name = "p-any"; - packageName = "p-any"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-any/-/p-any-2.1.0.tgz"; - sha512 = "JAERcaMBLYKMq+voYw36+x5Dgh47+/o7yuv2oQYuSSUml4YeqJEFznBrY2UeEkoSHqBua6hz518n/PsowTYLLg=="; - }; - }; - "p-cancelable-1.1.0" = { - name = "p-cancelable"; - packageName = "p-cancelable"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz"; - sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; - }; - }; - "p-cancelable-2.0.0" = { - name = "p-cancelable"; - packageName = "p-cancelable"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz"; - sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg=="; - }; - }; - "p-finally-1.0.0" = { - name = "p-finally"; - packageName = "p-finally"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; - }; - }; - "p-limit-2.3.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; - sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; - }; - }; - "p-locate-4.1.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; - sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; - }; - }; - "p-map-3.0.0" = { - name = "p-map"; - packageName = "p-map"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz"; - sha512 = "d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ=="; - }; - }; - "p-some-4.1.0" = { - name = "p-some"; - packageName = "p-some"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-some/-/p-some-4.1.0.tgz"; - sha512 = "MF/HIbq6GeBqTrTIl5OJubzkGU+qfFhAFi0gnTAK6rgEIJIknEiABHOTtQu4e6JiXjIwuMPMUFQzyHh5QjCl1g=="; - }; - }; - "p-timeout-3.2.0" = { - name = "p-timeout"; - packageName = "p-timeout"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"; - sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; - }; - }; - "p-try-2.2.0" = { - name = "p-try"; - packageName = "p-try"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; - sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; - }; - }; - "path-0.12.7" = { - name = "path"; - packageName = "path"; - version = "0.12.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path/-/path-0.12.7.tgz"; - sha1 = "d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"; - }; - }; - "path-exists-4.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; - sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - }; - "path-type-4.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; - sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; - }; - }; - "picomatch-2.2.2" = { - name = "picomatch"; - packageName = "picomatch"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; - }; - }; - "pluralize-8.0.0" = { - name = "pluralize"; - packageName = "pluralize"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz"; - sha512 = "Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA=="; - }; - }; - "prepend-http-2.0.0" = { - name = "prepend-http"; - packageName = "prepend-http"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz"; - sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; - }; - }; - "process-0.11.10" = { - name = "process"; - packageName = "process"; - version = "0.11.10"; - src = fetchurl { - url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; - sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; - }; - }; - "public-ip-4.0.3" = { - name = "public-ip"; - packageName = "public-ip"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/public-ip/-/public-ip-4.0.3.tgz"; - sha512 = "IofiJJWoZ8hZHBk25l4ozLvcET0pjZSxocbUfh4sGkjidMOm4iZNzzWxezGqGsVY7HuxiK7SkyJKHNeT0YQ7uw=="; - }; - }; - "pump-3.0.0" = { - name = "pump"; - packageName = "pump"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; - }; - }; - "qs-6.9.6" = { - name = "qs"; - packageName = "qs"; - version = "6.9.6"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; - sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; - }; - }; - "recursive-readdir-2.2.2" = { - name = "recursive-readdir"; - packageName = "recursive-readdir"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; - sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; - }; - }; - "responselike-1.0.2" = { - name = "responselike"; - packageName = "responselike"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; - sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; - }; - }; - "restore-cursor-2.0.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; - }; - }; - "reusify-1.0.4" = { - name = "reusify"; - packageName = "reusify"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; - sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; - }; - }; - "rimraf-3.0.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; - }; - }; - "run-async-2.4.1" = { - name = "run-async"; - packageName = "run-async"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; - sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; - }; - }; - "run-parallel-1.1.10" = { - name = "run-parallel"; - packageName = "run-parallel"; - version = "1.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz"; - sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="; - }; - }; - "rxjs-6.6.3" = { - name = "rxjs"; - packageName = "rxjs"; - version = "6.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz"; - sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ=="; - }; - }; - "safe-buffer-5.2.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; - }; - }; - "safer-buffer-2.1.2" = { - name = "safer-buffer"; - packageName = "safer-buffer"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - }; - "signal-exit-3.0.3" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; - sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; - }; - }; - "slash-3.0.0" = { - name = "slash"; - packageName = "slash"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; - sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; - }; - }; - "split-lines-2.0.0" = { - name = "split-lines"; - packageName = "split-lines"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split-lines/-/split-lines-2.0.0.tgz"; - sha512 = "gaIdhbqxkB5/VflPXsJwZvEzh/kdwiRPF9iqpkxX4us+lzB8INedFwjCyo6vwuz5x2Ddlnav2zh270CEjCG8mA=="; - }; - }; - "string-width-2.1.1" = { - name = "string-width"; - packageName = "string-width"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; - }; - }; - "string.prototype.padend-3.1.1" = { - name = "string.prototype.padend"; - packageName = "string.prototype.padend"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.1.tgz"; - sha512 = "eCzTASPnoCr5Ht+Vn1YXgm8SB015hHKgEIMu9Nr9bQmLhRBxKRfmzSj/IQsxDFc8JInJDDFA0qXwK+xxI7wDkg=="; - }; - }; - "string.prototype.trimend-1.0.3" = { - name = "string.prototype.trimend"; - packageName = "string.prototype.trimend"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz"; - sha512 = "ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw=="; - }; - }; - "string.prototype.trimstart-1.0.3" = { - name = "string.prototype.trimstart"; - packageName = "string.prototype.trimstart"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz"; - sha512 = "oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg=="; - }; - }; - "strip-ansi-4.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; - }; - }; - "strip-ansi-5.2.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; - }; - }; - "strip-bom-4.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz"; - sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="; - }; - }; - "supports-color-5.5.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; - }; - }; - "through-2.3.8" = { - name = "through"; - packageName = "through"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - }; - "tmp-0.0.33" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.33"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; - sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; - }; - }; - "to-readable-stream-1.0.0" = { - name = "to-readable-stream"; - packageName = "to-readable-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; - sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; - }; - }; - "to-regex-range-5.0.1" = { - name = "to-regex-range"; - packageName = "to-regex-range"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; - }; - }; - "ts2gas-3.6.4" = { - name = "ts2gas"; - packageName = "ts2gas"; - version = "3.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ts2gas/-/ts2gas-3.6.4.tgz"; - sha512 = "TJgFvXnoUSZ40pRH4FzqtTYhbJfaF6LmeXKWd813cRV31v55DZTyVatYUyhqF7GCAHhbkKRH7HuCFcFhxeZFag=="; - }; - }; - "tslib-1.14.1" = { - name = "tslib"; - packageName = "tslib"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; - sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; - }; - }; - "type-fest-0.3.1" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz"; - sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="; - }; - }; - "typescript-3.9.7" = { - name = "typescript"; - packageName = "typescript"; - version = "3.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz"; - sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="; - }; - }; - "typescript-4.1.3" = { - name = "typescript"; - packageName = "typescript"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz"; - sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg=="; - }; - }; - "universalify-0.1.2" = { - name = "universalify"; - packageName = "universalify"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; - sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; - }; - }; - "universalify-2.0.0" = { - name = "universalify"; - packageName = "universalify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; - }; - }; - "url-parse-lax-3.0.0" = { - name = "url-parse-lax"; - packageName = "url-parse-lax"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; - }; - }; - "url-template-2.0.8" = { - name = "url-template"; - packageName = "url-template"; - version = "2.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz"; - sha1 = "fc565a3cccbff7730c775f5641f9555791439f21"; - }; - }; - "util-0.10.4" = { - name = "util"; - packageName = "util"; - version = "0.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/util/-/util-0.10.4.tgz"; - sha512 = "0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A=="; - }; - }; - "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=="; - }; - }; - "watch-1.0.2" = { - name = "watch"; - packageName = "watch"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz"; - sha1 = "340a717bde765726fa0aa07d721e0147a551df0c"; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - }; - "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=="; - }; - }; - }; -in -{ - "@google/clasp-2.2.1" = nodeEnv.buildNodePackage { - name = "_at_google_slash_clasp"; - packageName = "@google/clasp"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@google/clasp/-/clasp-2.2.1.tgz"; - sha512 = "dUdEBfwOuC1d95o1ntZ+4a60M65q2vwvHvgD22bPCx+OU0m+ZUBs5rZSloh/IGDjEVqFbDsHU6SLgM0x3MOhgA=="; - }; - dependencies = [ - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@types/glob-7.1.3" - sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.22" - sources."abort-controller-3.0.0" - sources."agent-base-6.0.2" - sources."aggregate-error-3.1.0" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."array-differ-3.0.0" - sources."array-union-2.1.0" - sources."arrify-2.0.1" - sources."balanced-match-1.0.0" - sources."base64-js-1.5.1" - sources."bignumber.js-9.0.1" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."buffer-equal-constant-time-1.0.1" - (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."chalk-2.4.2" - sources."chardet-0.7.0" - sources."clean-stack-2.2.0" - sources."cli-cursor-2.1.0" - sources."cli-spinner-0.2.10" - sources."cli-width-2.2.1" - sources."clone-response-1.0.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-2.20.3" - sources."concat-map-0.0.1" - sources."debug-4.3.2" - sources."decompress-response-3.3.0" - sources."defer-to-connect-1.1.3" - sources."define-properties-1.1.3" - sources."del-5.1.0" - sources."dir-glob-3.0.1" - sources."dns-packet-5.2.1" - sources."dns-socket-4.2.1" - sources."dotf-1.5.3" - sources."duplexer3-0.1.4" - sources."ecdsa-sig-formatter-1.0.11" - sources."ellipsize-0.1.0" - sources."end-of-stream-1.4.4" - sources."es-abstract-1.18.0-next.2" - sources."es-to-primitive-1.2.1" - sources."escape-string-regexp-1.0.5" - sources."event-target-shim-5.0.1" - sources."exec-sh-0.2.2" - sources."extend-3.0.2" - sources."external-editor-3.1.0" - sources."fast-glob-3.2.5" - sources."fast-text-encoding-1.0.3" - sources."fastq-1.10.1" - sources."figures-2.0.0" - sources."fill-range-7.0.1" - sources."find-up-4.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."function-bind-1.1.1" - sources."fuzzy-0.1.3" - sources."gaxios-2.3.4" - sources."gcp-metadata-2.0.4" - sources."get-intrinsic-1.1.0" - sources."get-stream-4.1.0" - sources."glob-7.1.6" - sources."glob-parent-5.1.1" - sources."globby-10.0.2" - sources."google-auth-library-4.2.6" - sources."google-p12-pem-2.0.4" - sources."googleapis-40.0.1" - sources."googleapis-common-2.0.4" - sources."got-9.6.0" - sources."graceful-fs-4.2.4" - sources."gtoken-3.0.2" - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" - sources."http-cache-semantics-4.1.0" - sources."https-proxy-agent-5.0.0" - sources."iconv-lite-0.4.24" - sources."ignore-5.1.8" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."inquirer-6.5.2" - sources."inquirer-autocomplete-prompt-1.0.1" - sources."ip-1.1.5" - sources."ip-regex-4.3.0" - sources."is-callable-1.2.3" - sources."is-date-object-1.0.2" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.1" - sources."is-ip-3.1.0" - sources."is-negative-zero-2.0.1" - sources."is-number-7.0.0" - sources."is-online-8.5.1" - sources."is-path-cwd-2.2.0" - sources."is-path-inside-3.0.2" - sources."is-regex-1.1.2" - sources."is-stream-2.0.0" - sources."is-symbol-1.0.3" - sources."is-wsl-1.1.0" - sources."json-bigint-0.3.1" - sources."json-buffer-3.0.0" - sources."jsonfile-6.1.0" - sources."jwa-1.4.1" - sources."jws-3.2.2" - sources."keyv-3.1.0" - sources."locate-path-5.0.0" - sources."lodash-4.17.20" - sources."lowercase-keys-1.0.1" - sources."lru-cache-5.1.1" - sources."merge-1.2.1" - sources."merge2-1.4.1" - sources."micromatch-4.0.2" - sources."mime-2.5.0" - sources."mimic-fn-1.2.0" - sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" - sources."ms-2.1.2" - sources."multimatch-4.0.0" - sources."mute-stream-0.0.7" - sources."node-fetch-2.6.1" - sources."node-forge-0.9.2" - sources."normalize-url-4.5.0" - sources."object-inspect-1.9.0" - sources."object-keys-1.1.1" - sources."object.assign-4.1.2" - sources."once-1.4.0" - sources."onetime-2.0.1" - sources."open-6.4.0" - sources."os-tmpdir-1.0.2" - (sources."p-any-2.1.0" // { - dependencies = [ - sources."p-cancelable-2.0.0" - ]; - }) - 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-3.0.0" - (sources."p-some-4.1.0" // { - dependencies = [ - sources."p-cancelable-2.0.0" - ]; - }) - sources."p-timeout-3.2.0" - sources."p-try-2.2.0" - sources."path-0.12.7" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-type-4.0.0" - sources."picomatch-2.2.2" - sources."pluralize-8.0.0" - sources."prepend-http-2.0.0" - sources."process-0.11.10" - sources."public-ip-4.0.3" - sources."pump-3.0.0" - sources."qs-6.9.6" - sources."recursive-readdir-2.2.2" - sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-async-2.4.1" - sources."run-parallel-1.1.10" - sources."rxjs-6.6.3" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."signal-exit-3.0.3" - sources."slash-3.0.0" - sources."split-lines-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - sources."string.prototype.padend-3.1.1" - sources."string.prototype.trimend-1.0.3" - sources."string.prototype.trimstart-1.0.3" - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) - sources."strip-bom-4.0.0" - sources."supports-color-5.5.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."to-readable-stream-1.0.0" - sources."to-regex-range-5.0.1" - (sources."ts2gas-3.6.4" // { - dependencies = [ - sources."typescript-4.1.3" - ]; - }) - sources."tslib-1.14.1" - sources."type-fest-0.3.1" - sources."typescript-3.9.7" - sources."universalify-2.0.0" - sources."url-parse-lax-3.0.0" - sources."url-template-2.0.8" - (sources."util-0.10.4" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."uuid-3.4.0" - sources."watch-1.0.2" - sources."wrappy-1.0.2" - sources."yallist-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Develop Apps Script Projects locally"; - homepage = "https://github.com/google/clasp#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} diff --git a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix index 17bedd5e7d32..5c0b6b0eecb3 100644 --- a/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix +++ b/pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix @@ -1,13 +1,14 @@ -{ mkDerivation, ansi-wl-pprint, base, fetchgit, lib, process, QuickCheck +{ mkDerivation, ansi-wl-pprint, base, fetchFromGitHub, lib, process, QuickCheck , transformers, transformers-compat }: mkDerivation { pname = "hercules-ci-optparse-applicative"; version = "0.16.1.0"; - src = fetchgit { - url = "https://github.com/hercules-ci/optparse-applicative.git"; - sha256 = "05vchaw2rf46hh2128qjpky686iy5hff964mbdhcyiz612jjflyp"; + src = fetchFromGitHub { + owner = "hercules-ci"; + repo = "optparse-applicative"; rev = "9e2968c09a7c5b29d04578dc68d81ce5aec0591e"; + sha256 = "sha256-11MnpQjmR89gW5WY5BwsPhpk/LwSIxEEhIa4LLiCbBc="; }; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index 635aca9aa57a..7f51342fbde9 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -79,8 +79,8 @@ rec { patchSrc = fetchFromGitHub { owner = "abathur"; repo = "nix-py-dev-oil"; - rev = "v0.8.12.1"; - hash = "sha256-7JVnosdcvmVFN3h6SIeeqcJFcyFkai//fFuzi7ThNMY="; + rev = "v0.8.12.2"; + hash = "sha256-+dVxzPKMGNKFE+7Ggzx9iWjjvwW2Ow3UqmjjUud9Mqo="; }; patches = [ "${patchSrc}/0001-add_setup_py.patch" @@ -88,6 +88,7 @@ rec { "${patchSrc}/0004-disable-internal-py-yajl-for-nix-built.patch" "${patchSrc}/0006-disable_failing_libc_tests.patch" "${patchSrc}/0007-namespace_via_init.patch" + "${patchSrc}/0009-avoid_nix_arch64_darwin_toolchain_bug.patch" ]; buildInputs = [ readline cmark py-yajl ]; diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index fbddc4d72dd2..f364b73158e9 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -1,4 +1,5 @@ { lib +, stdenv , callPackage , python27Packages , installShellFiles @@ -17,7 +18,18 @@ python27Packages.buildPythonApplication { nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ oildev python27Packages.configargparse ]; + propagatedBuildInputs = [ + oildev + /* + Disable configargparse's tests on aarch64-darwin. + Several of py27 scandir's tests fail on aarch64-darwin. Chain: + configargparse -> pytest-check-hook -> pytest -> pathlib2 -> scandir + TODO: drop if https://github.com/NixOS/nixpkgs/issues/156807 resolves? + */ + (python27Packages.configargparse.overridePythonAttrs (old: { + doCheck = stdenv.hostPlatform.system != "aarch64-darwin"; + })) + ]; patchPhase = '' for file in resholve; do diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index d6864b80f9ed..a58891bc333b 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -13,13 +13,13 @@ python3.pkgs.buildPythonApplication rec { pname = "yelp-tools"; - version = "41.0"; + version = "42.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/yelp-tools/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "N/GswCvL5ooxuG4HwSmoOb0yduZW3Inrf8CpJ0bv8nI="; + sha256 = "LNQwY/+nJi3xXdjTeao+o5mdQmYfB1Y/SALaoRSfffQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 282324d20508..2b94ed14aa9c 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -61,7 +61,8 @@ stdenv.mkDerivation rec { patchExecutable() { patchInterpreter "$1" wrapProgram "$out/libexec/genymotion/$1" \ - --set "LD_LIBRARY_PATH" "${libPath}" + --set "LD_LIBRARY_PATH" "${libPath}" \ + --unset "QML2_IMPORT_PATH" } patchTool() { diff --git a/pkgs/development/nim-packages/build-nim-package/default.nix b/pkgs/development/nim-packages/build-nim-package/default.nix index f8301ebb4880..d32a9543cf20 100644 --- a/pkgs/development/nim-packages/build-nim-package/default.nix +++ b/pkgs/development/nim-packages/build-nim-package/default.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation (attrs // { installPhase; meta = meta // { + platforms = meta.platforms or nim.meta.platforms; maintainers = (meta.maintainers or [ ]) ++ [ lib.maintainers.ehmry ]; }; }) diff --git a/pkgs/development/nim-packages/jsonschema/default.nix b/pkgs/development/nim-packages/jsonschema/default.nix index 8dc195b8b822..e19af7fbb865 100644 --- a/pkgs/development/nim-packages/jsonschema/default.nix +++ b/pkgs/development/nim-packages/jsonschema/default.nix @@ -1,8 +1,22 @@ -{ fetchFromGitHub }: +{ lib, buildNimPackage, fetchFromGitHub, astpatternmatching }: -fetchFromGitHub { - owner = "PMunch"; - repo = "jsonschema"; - rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf"; - sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz"; +buildNimPackage rec { + pname = "jsonschema"; + version = "unstable-2019-09-12"; + + src = fetchFromGitHub { + owner = "PMunch"; + repo = "jsonschema"; + rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf"; + sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz"; + }; + + propagatedBuildInputs = [ astpatternmatching ]; + + meta = with lib; { + homepage = "https://github.com/PMunch/jsonschema"; + description = "Schema validation of JSON for Nim"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; } diff --git a/pkgs/development/nim-packages/karax/default.nix b/pkgs/development/nim-packages/karax/default.nix index 35a5c78ee56a..8e8f11b228a4 100644 --- a/pkgs/development/nim-packages/karax/default.nix +++ b/pkgs/development/nim-packages/karax/default.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "karaxnim"; repo = "karax"; - rev = "1.1.2"; - sha256 = "07ykrd21hd76vlmkqpvv5xvaxw6aaq87bky47p2420ni85a6d94j"; + rev = "fa4a2dc"; + sha256 = "0xl83jsfb9l8kb0nfan9h5y6v96iz4psng2fx06a0qmig4993408"; } diff --git a/pkgs/development/nim-packages/redpool/default.nix b/pkgs/development/nim-packages/redpool/default.nix index 6c4c8a8e193c..76b222739cae 100644 --- a/pkgs/development/nim-packages/redpool/default.nix +++ b/pkgs/development/nim-packages/redpool/default.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "zedeus"; repo = "redpool"; - rev = "f880f49"; - sha256 = "01n73bpgfdz2a3qvcfxsq4a6gxbhabf2n5np1ilzgdqkzcd4jf9b"; + rev = "8b7c1db"; + sha256 = "10xh5fhwnahnq1nf6j69vvnbi55kixa0ari630gr6cdx80arvbs6"; } diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 697034ef044e..07ed3d19e4eb 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -127,7 +127,15 @@ let # ../../applications/video/epgstation epgstation = super."epgstation-../../applications/video/epgstation".override (drv: { meta = drv.meta // { - broken = true; # not really broken, see the comment above + platforms = pkgs.lib.platforms.none; + }; + }); + + # NOTE: this is a stub package to fetch npm dependencies for + # ../../applications/video/epgstation/client + epgstation-client = super."epgstation-client-../../applications/video/epgstation/client".override (drv: { + meta = drv.meta // { + platforms = pkgs.lib.platforms.none; }; }); @@ -200,7 +208,7 @@ let }; manta = super.manta.override { - nativeBuildInputs = with pkgs; [ nodejs-12_x installShellFiles ]; + nativeBuildInputs = with pkgs; [ nodejs-14_x installShellFiles ]; postInstall = '' # create completions, following upstream procedure https://github.com/joyent/node-manta/blob/v5.2.3/Makefile#L85-L91 completion_cmds=$(find ./bin -type f -printf "%f\n") @@ -226,6 +234,15 @@ let ''; }; + near-cli = super.near-cli.override { + nativeBuildInputs = with pkgs; [ + libusb1 + nodePackages.prebuild-install + nodePackages.node-gyp-build + pkg-config + ]; + }; + node-inspector = super.node-inspector.override { buildInputs = [ self.node-pre-gyp ]; meta.broken = since "10"; @@ -261,6 +278,14 @@ let url = "https://github.com/svanderburg/node2nix/commit/e4c951971df6c9f9584c7252971c13b55c369916.patch"; sha256 = "0w8fcyr12g2340rn06isv40jkmz2khmak81c95zpkjgipzx7hp7w"; }) + # handle package alias in dependencies + # https://github.com/svanderburg/node2nix/pull/240 + # + # TODO: remove after node2nix 1.10.0 + (fetchpatch { + url = "https://github.com/svanderburg/node2nix/commit/644e90c0304038a446ed53efc97e9eb1e2831e71.patch"; + sha256 = "sha256-sQgVf80H1ouUjzHq+2d9RO4a+o++kh+l+FOTNXfPBH0="; + }) ]; }; postInstall = '' @@ -305,6 +330,13 @@ let ''; }; + parcel = super.parcel.override { + buildInputs = [ self.node-gyp-build ]; + preRebuild = '' + sed -i -e "s|#!/usr/bin/env node|#! ${pkgs.nodejs}/bin/node|" node_modules/node-gyp-build/bin.js + ''; + }; + postcss-cli = super.postcss-cli.override { nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' @@ -327,7 +359,7 @@ let src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-xLmVyO/L6C4ZdHzHqiJVq3ZfDWSym29x75JcwJx746ps61UcNEg4ozSwN9ud7UjXLntdXe1xDLNOUO1lc7LN5g=="; + sha512 = "sha512-8SdsLPhKR3mOfoo2o73h9mNn3v5kA/RqGA26Sv6qDS78Eh2uepPqt5e8/nwj5EOblYm5HEGuitaXQrOCLb6uTw=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ @@ -373,18 +405,24 @@ let meta.broken = since "10"; }; - tailwindcss = super.tailwindcss.override { + tailwindcss = super.tailwindcss.overrideAttrs (oldAttrs: { + plugins = [ ]; nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' + nodePath="" + for p in "$out" "${self.postcss}" $plugins; do + nodePath="$nodePath''${nodePath:+:}$p/lib/node_modules" + done wrapProgram "$out/bin/tailwind" \ - --prefix NODE_PATH : ${self.postcss}/lib/node_modules + --prefix NODE_PATH : "$nodePath" wrapProgram "$out/bin/tailwindcss" \ - --prefix NODE_PATH : ${self.postcss}/lib/node_modules + --prefix NODE_PATH : "$nodePath" + unset nodePath ''; passthru.tests = { simple-execution = pkgs.callPackage ./package-tests/tailwindcss.nix { inherit (self) tailwindcss; }; }; - }; + }); tedicross = super."tedicross-git+https://github.com/TediCross/TediCross.git#v0.8.7".override { nativeBuildInputs = [ pkgs.makeWrapper ]; @@ -394,6 +432,18 @@ let ''; }; + thelounge-plugin-closepms = super.thelounge-plugin-closepms.override { + nativeBuildInputs = [ self.node-pre-gyp ]; + }; + + thelounge-theme-flat-blue = super.thelounge-theme-flat-blue.override { + nativeBuildInputs = [ self.node-pre-gyp ]; + }; + + thelounge-theme-flat-dark = super.thelounge-theme-flat-dark.override { + nativeBuildInputs = [ self.node-pre-gyp ]; + }; + tsun = super.tsun.overrideAttrs (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; postInstall = '' @@ -402,6 +452,10 @@ let ''; }); + typescript = super.typescript.overrideAttrs (oldAttrs: { + meta = oldAttrs.meta // { mainProgram = "tsc"; }; + }); + typescript-language-server = super.typescript-language-server.override { nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' @@ -415,6 +469,10 @@ let buildInputs = [ pkgs.libusb1 ]; }; + uppy-companion = super."@uppy/companion".override { + name = "uppy-companion"; + }; + vega-cli = super.vega-cli.override { nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 869303a064b5..7394e62914f2 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -9,7 +9,7 @@ node2nix=$(nix-build ../../.. -A nodePackages.node2nix) rm -f ./node-env.nix # Track the latest active nodejs LTS here: https://nodejs.org/en/about/releases/ -${node2nix}/bin/node2nix \ +"${node2nix}/bin/node2nix" \ -i node-packages.json \ -o node-packages.nix \ -c composition.nix \ diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index acc3db0bdb19..3efdef6cbe6d 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -1,17 +1,24 @@ [ "@angular/cli" +, "@antfu/ni" , "@antora/cli" , "@antora/site-generator-default" , "@astrojs/language-server" , "@bitwarden/cli" , "@commitlint/cli" , "@commitlint/config-conventional" +, "@google/clasp" , "@hyperspace/cli" , "@medable/mdctl-cli" , "@nerdwallet/shepherd" , "@nestjs/cli" , "@squoosh/cli" +, "@tailwindcss/aspect-ratio" +, "@tailwindcss/forms" , "@tailwindcss/language-server" +, "@tailwindcss/line-clamp" +, "@tailwindcss/typography" +, "@uppy/companion" , "@vue/cli" , "@webassemblyjs/cli" , "@webassemblyjs/repl" @@ -107,6 +114,7 @@ , "emoj" , "emojione" , {"epgstation": "../../applications/video/epgstation"} +, {"epgstation-client": "../../applications/video/epgstation/client"} , "escape-string-regexp" , "eslint" , "eslint_d" @@ -157,7 +165,7 @@ , "insect" , "intelephense" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v11.0.1.tar.gz"} +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v14.0.1.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" @@ -191,7 +199,7 @@ , "markdownlint-cli" , "markdownlint-cli2" , "markdown-link-check" -, {"markdown-preview-nvim": "../../misc/vim-plugins/markdown-preview-nvim"} +, {"markdown-preview-nvim": "../../applications/editors/vim/plugins/markdown-preview-nvim"} , "mastodon-bot" , "mathjax" , "meat" @@ -199,6 +207,7 @@ , "mocha" , "multi-file-swagger" , "musescore-downloader" +, "near-cli" , "neovim" , "nijs" , "node-gyp" @@ -216,6 +225,7 @@ , "nrm" , "ocaml-language-server" , "parcel-bundler" +, "parcel" , "parsoid" , "patch-package" , "peerflix" @@ -226,7 +236,9 @@ , "poor-mans-t-sql-formatter-cli" , "postcss" , "postcss-cli" +, "prebuild-install" , "prettier" +, "prettier_d_slim" , "prettier-plugin-toml" , "prisma" , "@prisma/language-server" @@ -248,7 +260,7 @@ , "reveal-md" , "rimraf" , "rollup" -, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" } +, { "rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-analyzer/build-deps" } , "rtlcss" , "s3http" , "sass" @@ -352,7 +364,7 @@ , "vscode-json-languageserver" , "vscode-json-languageserver-bin" , "vscode-langservers-extracted" -, { "vscode-lldb-build-deps": "../../misc/vscode-extensions/vscode-lldb/build-deps" } +, { "vscode-lldb-build-deps": "../../applications/editors/vscode/extensions/vscode-lldb/build-deps" } , "vue-cli" , "vue-language-server" , "wavedrom-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 448945e43be9..0ab3eda77407 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -13,6 +13,15 @@ let sha512 = "HqiDzaLDFCXkcCO/SwoyhRwqYtINFHF7t9BDRq4x90TOKNAJpiqUt9X5lQ08bwxYzc067HUywDjGySpebHcUpw=="; }; }; + "@achrinza/node-ipc-9.2.2" = { + name = "_at_achrinza_slash_node-ipc"; + packageName = "@achrinza/node-ipc"; + version = "9.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.2.tgz"; + sha512 = "b90U39dx0cU6emsOvy5hxU4ApNXnE3+Tuo8XQZfiKTGelDwpMwBVgBP7QX6dGTcJgu/miyJuNJ/2naFBliNWEw=="; + }; + }; "@akryum/winattr-3.0.0" = { name = "_at_akryum_slash_winattr"; packageName = "@akryum/winattr"; @@ -22,13 +31,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@alexbosworth/caporal-1.4.0" = { + "@alexbosworth/caporal-1.4.1" = { name = "_at_alexbosworth_slash_caporal"; packageName = "@alexbosworth/caporal"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@alexbosworth/caporal/-/caporal-1.4.0.tgz"; - sha512 = "n/Oq0C+5XkoruoG0DTs5KwSA5rPF7hd4cwoc9atKHE2MP2yDoMCc1mPSaU8VhrsscymXo0cLCySOXn5v96FWxw=="; + url = "https://registry.npmjs.org/@alexbosworth/caporal/-/caporal-1.4.1.tgz"; + sha512 = "oNEyHFcHc66gzmUXDUqzoqEpjcQnsp4REzXMkQNGxMF7MZDxiec3m9IVvzFmXtl0jU48bX/+ay5aZ8G3EVQV3g=="; }; }; "@alexbosworth/cli-table3-0.6.1" = { @@ -67,13 +76,13 @@ let sha512 = "9ls0Zn0qXTmUdt1p9LA1P9Kor9wF1pXtfUTjipCpoYYQ4fEUsuCgQbiymk4oJccpsZ9dAG3vZ1Zt51WabjJTUw=="; }; }; - "@alexbosworth/prettyjson-1.2.1" = { + "@alexbosworth/prettyjson-1.2.2" = { name = "_at_alexbosworth_slash_prettyjson"; packageName = "@alexbosworth/prettyjson"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@alexbosworth/prettyjson/-/prettyjson-1.2.1.tgz"; - sha512 = "b7AoM21tb21f+ZAZfKswhQ5u+ZjjYt6Mywlp1nbXrKEmER/iIco10S4Ply9dSAon4alpHTcP1ixT/kZb7422/Q=="; + url = "https://registry.npmjs.org/@alexbosworth/prettyjson/-/prettyjson-1.2.2.tgz"; + sha512 = "JsqGgC96z8HFceI94ZLAXLxPXw9oMmQh9XpK5tbRSoU6A4JGz1I7ssplLOTfc50Y73bWVoEJs1ja7BcEToMFmQ=="; }; }; "@alexbosworth/saxophone-0.6.2" = { @@ -85,76 +94,67 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1301.4" = { + "@ampproject/remapping-2.1.2" = { + name = "_at_ampproject_slash_remapping"; + packageName = "@ampproject/remapping"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz"; + sha512 = "hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg=="; + }; + }; + "@angular-devkit/architect-0.1303.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1301.4"; + version = "0.1303.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1301.4.tgz"; - sha512 = "p6G8CEMnE+gYwxRyEttj3QGsuNJ3Kusi7iwBIzWyf2RpJSdGzXdwUEiRGg6iS0YHFr06/ZFfAWfnM2DQvNm4TA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1303.0.tgz"; + sha512 = "kTcKB917ICA8j53SGo4gn+qAlzx8si+iHnOTbp5QlMr7qt/Iz07SVVI8mRlMD6c6lr7eE/fVlCLzEZ1+WCQpTA=="; }; }; - "@angular-devkit/core-13.0.2" = { + "@angular-devkit/core-13.2.5" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "13.0.2"; + version = "13.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.0.2.tgz"; - sha512 = "I4co4GH+iu0tns+UXfMtjJISO+cLpaUuiEH6kf0wF5cqjaIeluA9UjIRnxuNbdTW8iE2xVj/UWhQfHe/Ncp76w=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.5.tgz"; + sha512 = "WuWp/1R0FtCHPBcJLF13lTLHETtDGFUX0ULfGPRaYB5OVCSQcovVp5UbZTTy/Ss3ub3EOEmJlU8kMJfBrWuq+A=="; }; }; - "@angular-devkit/core-13.1.2" = { + "@angular-devkit/core-13.3.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "13.1.2"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.1.2.tgz"; - sha512 = "uXVesIRiCL/Nv+RSV8JM4j8IoZiGCGnqV2FOJ1hvH7DPxIjhjPMdG/B54xMydZpeASW3ofuxeORyAXxFIBm8Zg=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.3.0.tgz"; + sha512 = "8YrreVbWlJVZnk5zs4vfkRItrPEtWhUcxWOBfYT/Kwu4FwJVAnNuhJAxxXOAQ2Ckd7cv30Idh/RFVLbTZ5Gs9w=="; }; }; - "@angular-devkit/core-13.1.4" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "13.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.1.4.tgz"; - sha512 = "225Gjy4iVxh5Jo9njJnaG75M/Dt95UW+dEPCGWKV5E/++7UUlXlo9sNWq8x2vJm2nhtsPkpnXNOt4pW1mIDwqQ=="; - }; - }; - "@angular-devkit/schematics-13.0.2" = { + "@angular-devkit/schematics-13.2.5" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "13.0.2"; + version = "13.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.0.2.tgz"; - sha512 = "qrTe1teQptgP8gmVy6QX0T4dNfnNipEv+cM2cr7JXOmkPpwF+6oBDrTRIJ55t6rziqrXHJ3rxjKm1aHAxFrIEQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.5.tgz"; + sha512 = "kAye6VYiF9JQAoeO+BYhy8eT2QOmhB+WLziRjXoFCBxh5+yXTygTVfs9fD5jmIpHmeu4hd2ErSh69yT5xWcD9g=="; }; }; - "@angular-devkit/schematics-13.1.2" = { + "@angular-devkit/schematics-13.3.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "13.1.2"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.1.2.tgz"; - sha512 = "ayYbHGU8QpMGx8ZyhKOBupz+Zfv/2H1pNQErahYV3qg7hA9hfjTGmNmDQ4iw0fiT04NajjUxuomlKsCsg7oXDw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.3.0.tgz"; + sha512 = "hq7tqnB3uVT/iDgqWWZ4kvnijeAcgd4cfLzZiCPaYn1nuhZf0tWsho6exhJ/odMZHvVp7w8OibqWiUKxNY9zHA=="; }; }; - "@angular-devkit/schematics-13.1.4" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "13.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.1.4.tgz"; - sha512 = "yBa7IeC4cLZ7s137NAQD+sMB5c6SI6UJ6xYxl6J/CvV2RLGOZZA93i4GuRALi5s82eLi1fH+HEL/gvf3JQynzQ=="; - }; - }; - "@angular-devkit/schematics-cli-13.1.2" = { + "@angular-devkit/schematics-cli-13.3.0" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "13.1.2"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-13.1.2.tgz"; - sha512 = "XSkcVuaaajijQOWE8YerY/8DVuYQWvXxVukweEwkaHSftDQZhfCOZ83nGKbuWkdOdnuDbrc9ve5ZzekplkzVQw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-13.3.0.tgz"; + sha512 = "DXT+k4228Ke1zCoU9QxPhXm1xzeYBs5aqgMWhyjXdkfDokJcjQM79CSVLHdKX/OLgR51qhnQ5qVFEHHhVV40EQ=="; }; }; "@antora/asciidoc-loader-3.0.1" = { @@ -364,6 +364,15 @@ let sha512 = "TmB2K5UfpDpSbCNBBntXzKHcAk2EA3/P68jmWvmJvglVUdkO9V6kTAuXVe12+h6C4GK0ndwuCrHHtEVcL5t6pQ=="; }; }; + "@astrojs/svelte-language-integration-0.1.2" = { + name = "_at_astrojs_slash_svelte-language-integration"; + packageName = "@astrojs/svelte-language-integration"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@astrojs/svelte-language-integration/-/svelte-language-integration-0.1.2.tgz"; + sha512 = "O6LYL9igYSzxCxDHYWUqEquuuUlMG0UL1SliZ7rF/vx9GwU71TCpsRe4iHZ0bcemM5ju9ihoTzGCmLXzYrNw0g=="; + }; + }; "@aws-crypto/crc32-2.0.0" = { name = "_at_aws-crypto_slash_crc32"; packageName = "@aws-crypto/crc32"; @@ -373,6 +382,15 @@ let sha512 = "TvE1r2CUueyXOuHdEigYjIZVesInd9KN+K/TFFNfkkxRThiNxO6i4ZqqAVMoEjAamZZ1AA8WXJkjCz7YShHPQA=="; }; }; + "@aws-crypto/crc32c-2.0.0" = { + name = "_at_aws-crypto_slash_crc32c"; + packageName = "@aws-crypto/crc32c"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-2.0.0.tgz"; + sha512 = "vF0eMdMHx3O3MoOXUfBZry8Y4ZDtcuskjjKgJz8YfIDjLStxTZrYXk+kZqtl6A0uCmmiN/Eb/JbC/CndTV1MHg=="; + }; + }; "@aws-crypto/ie11-detection-2.0.0" = { name = "_at_aws-crypto_slash_ie11-detection"; packageName = "@aws-crypto/ie11-detection"; @@ -382,6 +400,15 @@ let sha512 = "pkVXf/dq6PITJ0jzYZ69VhL8VFOFoPZLZqtU/12SGnzYuJOOGNfF41q9GxdI1yqC8R13Rq3jOLKDFpUJFT5eTA=="; }; }; + "@aws-crypto/sha1-browser-2.0.0" = { + name = "_at_aws-crypto_slash_sha1-browser"; + packageName = "@aws-crypto/sha1-browser"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-2.0.0.tgz"; + sha512 = "3fIVRjPFY8EG5HWXR+ZJZMdWNRpwbxGzJ9IH9q93FpbgCH8u8GHRi46mZXp3cYD7gealmyqpm3ThZwLKJjWJhA=="; + }; + }; "@aws-crypto/sha256-browser-2.0.0" = { name = "_at_aws-crypto_slash_sha256-browser"; packageName = "@aws-crypto/sha256-browser"; @@ -418,688 +445,706 @@ let sha512 = "JJmFFwvbm08lULw4Nm5QOLg8+lAQeC8aCXK5xrtxntYzYXCGfHwUJ4Is3770Q7HmICsXthGQ+ZsDL7C2uH3yBQ=="; }; }; - "@aws-sdk/abort-controller-3.47.2" = { + "@aws-sdk/abort-controller-3.55.0" = { name = "_at_aws-sdk_slash_abort-controller"; packageName = "@aws-sdk/abort-controller"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.47.2.tgz"; - sha512 = "OpxsJ3b2KlpqTQKq6Py6JtLhA7KaAtHthH1JLLWStaFhU5/Js8nFnfPWdJIDRLpuAGyeRTbkjOEUsOkWAI5dAw=="; + url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.55.0.tgz"; + sha512 = "rCcTxJDEFnmvo/PgbhCRv24/Uv03lEGfRslKZq7SjaMcOubflS/ZXYaMEgsjYHgAT0zlpSsyCIkJXmhFaM7H7w=="; }; }; - "@aws-sdk/chunked-blob-reader-3.47.1" = { + "@aws-sdk/chunked-blob-reader-3.55.0" = { name = "_at_aws-sdk_slash_chunked-blob-reader"; packageName = "@aws-sdk/chunked-blob-reader"; - version = "3.47.1"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.47.1.tgz"; - sha512 = "D8wcAumX+q/VlX6lbYHWJqsaDBvj1BHVjJlBwLPrUBcsk0bRaJhhbhesej6DkhRX2pFhwXlHgc7CAgYhJCtc/w=="; + url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.55.0.tgz"; + sha512 = "o/xjMCq81opAjSBjt7YdHJwIJcGVG5XIV9+C2KXcY5QwVimkOKPybWTv0mXPvSwSilSx+EhpLNhkcJuXdzhw4w=="; }; }; - "@aws-sdk/chunked-blob-reader-native-3.47.2" = { + "@aws-sdk/chunked-blob-reader-native-3.55.0" = { name = "_at_aws-sdk_slash_chunked-blob-reader-native"; packageName = "@aws-sdk/chunked-blob-reader-native"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.47.2.tgz"; - sha512 = "29+ZWESaFDQ9QXo7RGcUMuP89GTKo8bKlYplzNsO/B1uG17LgTgVHBapU3UBlF/EkOh1rzN5tEW+XwwstHvlXg=="; + url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.55.0.tgz"; + sha512 = "juorCwSR9O1XhpSIBSAiIH7cP1c67J4wnoiXmmbun/qzmBPipGYm0PHX5H+J89s8gD2F3e49/TWFXbZmxRw57w=="; }; }; - "@aws-sdk/client-s3-3.48.0" = { + "@aws-sdk/client-s3-3.56.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.48.0"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.48.0.tgz"; - sha512 = "zOr7WWr9b5V3nTQnMTz+kjDpLJceI5Vmx3+mwi5a3vFDwJBvMJK0C25A9koDXtrjn8/hszAePh6+rC0oW8QJsQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.56.0.tgz"; + sha512 = "g/OiJtD8d0roi3XK5ThIwEvkAkSDoKzxkE0gqKKJNABBnyozNnDNAVt4XnMxuXX1PPjg1KVKH2iJWFGj5I0jPQ=="; }; }; - "@aws-sdk/client-sso-3.48.0" = { + "@aws-sdk/client-sso-3.56.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.48.0"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.48.0.tgz"; - sha512 = "A9f7B5k+X7bx062OQEcLHIMMIq0H1GlUqdw9xReCLd6W6vcRthbeSK5xbkM7TzHeKHE2/9qQYAy0lyKkxFE6bQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.56.0.tgz"; + sha512 = "5gkbkNK1iaQ7C053HG5yvWNE/AB8w39kxk/VGxACrX6bVZR1tnN36vhInjom83mWlDIu0Tl5WqD8tmkjqCYMFQ=="; }; }; - "@aws-sdk/client-sts-3.48.0" = { + "@aws-sdk/client-sts-3.56.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.48.0"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.48.0.tgz"; - sha512 = "vOSIYCHjXB9nztZqwjIjV/jRZCfgej1YHpgqeNlfL8hPNhcrHemaoJaKHRPnhljIuHi+H5yQW7Pm4qJUFtGwKA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.56.0.tgz"; + sha512 = "6LFwAU/K02Q8eNk8O/ZnaPCsnDibKYReiRV222hD64vy8rMvtGO1l+RTf5cFVa1XxHNy9ZERIJBn60EO2Zw7FA=="; }; }; - "@aws-sdk/config-resolver-3.47.2" = { + "@aws-sdk/config-resolver-3.56.0" = { name = "_at_aws-sdk_slash_config-resolver"; packageName = "@aws-sdk/config-resolver"; - version = "3.47.2"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.47.2.tgz"; - sha512 = "uv9U/qDOSqyCPQ71qiwMslqRMxYyt0y0h6X0aQ67GCPq4rbbU/dn8PqnYT0VfX/9Ss+DcbTm7vOTxVKv+8XADA=="; + url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.56.0.tgz"; + sha512 = "Gzx/fkUqixQkNpqoVTyR0+BUpJTfv+9qBNbhBw79V+HnPeY+tyqkVB4vZNJYbYSR6A/rMwYThxPOfvsNDFPk6A=="; }; }; - "@aws-sdk/credential-provider-env-3.47.2" = { + "@aws-sdk/credential-provider-env-3.55.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.47.2.tgz"; - sha512 = "HQKXY8y51kpTrD7P8fZJNf4MdCdu0+NcdOc+HScrQ21oZJv3BXUwXxKiOWY95Z3jYqyFwSKs1/FFuQ1mV0wjPg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.55.0.tgz"; + sha512 = "4AIIXEdvinLlWNFtrUbUgoB7dkuV04RTcTruVWI4Ub4WSsuSCa72ZU1vqyvcEAOgGGLBmcSaGTWByjiD2sGcGA=="; }; }; - "@aws-sdk/credential-provider-imds-3.47.2" = { + "@aws-sdk/credential-provider-imds-3.56.0" = { name = "_at_aws-sdk_slash_credential-provider-imds"; packageName = "@aws-sdk/credential-provider-imds"; - version = "3.47.2"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.47.2.tgz"; - sha512 = "7fCIofgU5pdKGgbCAYQ8H7sIFluN3oebFyFy7C4eXJyNy/8QKjFHEW3NkNCh0Bkd5sLOqkwYU3nyRx0CbNkEoQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.56.0.tgz"; + sha512 = "EibXjFcGtDEm8g9DhGtJpcVLxRhnN1tnrTxwlwTdc510k7F4Aly7PNLT/72tr4IQ8hl9eCCYgsNBpPDlY4pMmQ=="; }; }; - "@aws-sdk/credential-provider-ini-3.48.0" = { + "@aws-sdk/credential-provider-ini-3.56.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.48.0"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.48.0.tgz"; - sha512 = "PSTfzK8V+3WVJOv+wlS4y09KYZx3iYj4Ad8LMGmGE4aqew8eRf6u2WuTmqrWwuOTxDra9PJ1ObcM5vBc+nZcYA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.56.0.tgz"; + sha512 = "XpZf8LPIIbBI0zvsRPW9ZNyom5ymctr+lMIv62w9bUglojdVtBVC2ErGBmQXSWWITk/hzFZ122txU5fyRjyAFg=="; }; }; - "@aws-sdk/credential-provider-node-3.48.0" = { + "@aws-sdk/credential-provider-node-3.56.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.48.0"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.48.0.tgz"; - sha512 = "7CrbUT7yEZvYSQNXxZWN5KUx355wD+xrYIafoEST28T7nwcIiu7l2zpBY3JPhPIPNXqryVKfNQJvKV1dP3wF4g=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.56.0.tgz"; + sha512 = "TSnjA1grdyTP8xNNgNxLmOvZMUT3zT9JLydBOqpQptLjLBbP90F32CCxKZWFOA/DXtZA0QK9Fjo+8t0Q3xZtiw=="; }; }; - "@aws-sdk/credential-provider-process-3.47.2" = { + "@aws-sdk/credential-provider-process-3.56.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.47.2"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.47.2.tgz"; - sha512 = "LBuABkVt/tdSoHy8hdGVnInZx5QADhK90dEHc41+HTTP3bCSNsSBIErkZnmhAD/3AGz7m/4qkPmhJOqzFisY/g=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.56.0.tgz"; + sha512 = "B+Y35sefW1iTKqAPdlgzRy4lYx7nhXQNn+gyyt1ohfJLEvP3twv/n2xdNrF9xewCyF9glBm3YkxSleFZsGoBCw=="; }; }; - "@aws-sdk/credential-provider-sso-3.48.0" = { + "@aws-sdk/credential-provider-sso-3.56.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.48.0"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.48.0.tgz"; - sha512 = "31Ill3ZW35dueXb09PpOJ4C8oKdRGypbnycAgLYvvqYlO4LOs9FyQAsw+t2+ExvE6DznM0vkeWTQI3y7HUVYCA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.56.0.tgz"; + sha512 = "oCUWNl742VgrlES5LVgmtyl6ruin8xXCG8Igv6SO0gxYswkv/ed/3yhQfOOaUmO4hY7p+q0ClwXZ3EQ3UH66wg=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.47.2" = { + "@aws-sdk/credential-provider-web-identity-3.55.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.47.2.tgz"; - sha512 = "biJo8zJwNk8Dwrd/mkTcu8iLuOlGbsG2Uahta4StkOUhZ733xewOZ4WISLXVLocb/PXLM1lZQgkobwugpFOQRA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.55.0.tgz"; + sha512 = "aKnXfZNGohTuF9rCGYLg4JEIOvWIZ/sb66XMq7bOUrx13KRPDwL/eUQL8quS5jGRLpjXVNvrS17AFf65GbdUBg=="; }; }; - "@aws-sdk/eventstream-marshaller-3.47.2" = { + "@aws-sdk/eventstream-marshaller-3.55.0" = { name = "_at_aws-sdk_slash_eventstream-marshaller"; packageName = "@aws-sdk/eventstream-marshaller"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.47.2.tgz"; - sha512 = "KRWpWBuICxIJOp5vPe2NzT387uW8Q5IpyMNf8SNmFe9a9yTrg2oIRKkbEHHRNyCRnjbDmpU3Td58V9bpmaBXGw=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.55.0.tgz"; + sha512 = "ubPmAce0pxVsxrKsQQ/1q0xTY9S14m2/7REnkE0pzAGrl8xjH5OUpGml4yWqyboZPk1chnTaw+hoC5fj8Avexw=="; }; }; - "@aws-sdk/eventstream-serde-browser-3.47.2" = { + "@aws-sdk/eventstream-serde-browser-3.55.0" = { name = "_at_aws-sdk_slash_eventstream-serde-browser"; packageName = "@aws-sdk/eventstream-serde-browser"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.47.2.tgz"; - sha512 = "dXjJ0eoNCu9P6uOzNcIL0OoXhVbdR/LPTRJCIR7NcfGCmJ4ZXeYwgYcHFTosrT/+SXAFGgsoU23dqA63TFWlMQ=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.55.0.tgz"; + sha512 = "V0/54j6sTBIRjhJJWjG1j44PsmZHfYzD0n2vxfhwmEvrK3BSXYU3Z3D9kYcajSvcvO8KRFU9/ZqRFJEN60Cl1g=="; }; }; - "@aws-sdk/eventstream-serde-config-resolver-3.47.2" = { + "@aws-sdk/eventstream-serde-config-resolver-3.55.0" = { name = "_at_aws-sdk_slash_eventstream-serde-config-resolver"; packageName = "@aws-sdk/eventstream-serde-config-resolver"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.47.2.tgz"; - sha512 = "LE481skmmWqoPhGyhFWqf/0eEtAFKSJqyzPZEer6yFUpejaijek4Heo6B+Y3cyDGoASuqY4Wum+9q1Z1xPn2BQ=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.55.0.tgz"; + sha512 = "NTJHLq1sbXyXAaJucKvcdN3Svr/fM2TjHEC3l8P/torFjIsX1+Ykpi8tZt8KsX8RjoUTTfKylh41AjJq0K9X4Q=="; }; }; - "@aws-sdk/eventstream-serde-node-3.47.2" = { + "@aws-sdk/eventstream-serde-node-3.55.0" = { name = "_at_aws-sdk_slash_eventstream-serde-node"; packageName = "@aws-sdk/eventstream-serde-node"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.47.2.tgz"; - sha512 = "hrEsbDFaRr7rNJw+qgua+YhkMgSkgR/YhBe+rdI20maaJARIjLo4C8eRqAqrmlE4i2+PU4CvM/fVdL9M3HQXfQ=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.55.0.tgz"; + sha512 = "0/kzJfupYrNLbJqn+MsTGGV0/dhPbqTN6g/4GqnoVDOiZPQeJjWEzmrWcXUDDbXq79+Zw0fIlniVkAMxhK2hvw=="; }; }; - "@aws-sdk/eventstream-serde-universal-3.47.2" = { + "@aws-sdk/eventstream-serde-universal-3.55.0" = { name = "_at_aws-sdk_slash_eventstream-serde-universal"; packageName = "@aws-sdk/eventstream-serde-universal"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.47.2.tgz"; - sha512 = "Zkfa2kHKNsWSAdO4atr9+JPEtcZzWuJqZHMr8MO5aXAMnKd5BA9XvzyGyhrfpr9HmnoqcbXrcx8iqDxcFEIp5g=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.55.0.tgz"; + sha512 = "fUqmpCO1jtdg5t1KQbKfs17KGsMUj9+d2hiIx7XxnL5SroXpBU6LIuiFgrjPluGWi0SsdOrL6SAkrDyR6aa/Xw=="; }; }; - "@aws-sdk/fetch-http-handler-3.47.2" = { + "@aws-sdk/fetch-http-handler-3.55.0" = { name = "_at_aws-sdk_slash_fetch-http-handler"; packageName = "@aws-sdk/fetch-http-handler"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.47.2.tgz"; - sha512 = "MZwwKtJwkWPm3Tzh+F3gcts13v1OuZih0slOO4GJpMxq46+lcW4DoW04lNHULJsyduXs4CziH8g65DDh0Yhq6w=="; + url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.55.0.tgz"; + sha512 = "/Sta3MLlszpRZ1pg+ClxfNqGvraX93F587eHrfQMaGXgQ2BqJLiAVRorBRGcmmmrHxfLOqspNqufF7ibrqziRQ=="; }; }; - "@aws-sdk/hash-blob-browser-3.47.2" = { + "@aws-sdk/hash-blob-browser-3.55.0" = { name = "_at_aws-sdk_slash_hash-blob-browser"; packageName = "@aws-sdk/hash-blob-browser"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.47.2.tgz"; - sha512 = "DG8kGFUqXH+eQLLQtzTuBxBEuLHJ03w3X2Geq7aNvfwh06OOJW3FYz+FTLH2f2HxqlKOQtf3MsqpH074zKC5/A=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.55.0.tgz"; + sha512 = "/tVsZDPXgxIovFRrKclcq304KEHcHUbBcpqar2QRYZAvaK+vxZM9h7ZmAKemmlkzV7mdh0KZqzPnfr6+KN4IGg=="; }; }; - "@aws-sdk/hash-node-3.47.2" = { + "@aws-sdk/hash-node-3.55.0" = { name = "_at_aws-sdk_slash_hash-node"; packageName = "@aws-sdk/hash-node"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.47.2.tgz"; - sha512 = "OpUCNGvchKI1WoOCtCm36gQtECMz2P5mJoXxAHNZQ5qQ69A5Vk/DZs1V24N94M7tl1u7ZpbLsJbWFdu+P4B27g=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.55.0.tgz"; + sha512 = "2UdYwY/++AlzWEAFaK9wOed2QSxbzV527vmqKjReLHpPKPrSIlooUxlTH3LU6Y6WVDAzDRtLK43KUVXTLgGK1A=="; }; }; - "@aws-sdk/hash-stream-node-3.47.2" = { + "@aws-sdk/hash-stream-node-3.55.0" = { name = "_at_aws-sdk_slash_hash-stream-node"; packageName = "@aws-sdk/hash-stream-node"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.47.2.tgz"; - sha512 = "ModP4kZkkj4j1djuANwETAwYL1uTcXBHVcVLvy/wVDVLIcEW1TgGBgkY0rSGFE4RWDESTjhLCBKNDgvpxReSLQ=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.55.0.tgz"; + sha512 = "0FuQmHZK3XAd+dL+UC36PiPhZ80lOvkbFusFpZLwXTelXB3AUsiVl2IebA4EpE352XU+1ACEAAWwQpj8zsdcOw=="; }; }; - "@aws-sdk/invalid-dependency-3.47.2" = { + "@aws-sdk/invalid-dependency-3.55.0" = { name = "_at_aws-sdk_slash_invalid-dependency"; packageName = "@aws-sdk/invalid-dependency"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.47.2.tgz"; - sha512 = "QLIp0Gv9IbSVXru1kS92M4kF9ZgHmVP7Us8dWSu5UC7LJt6Uxhxjb+e+F0h9qY1Z3Prior12I4r5COgVO3dWxA=="; + url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.55.0.tgz"; + sha512 = "delH0lV+78fdD/8MXIt9kTLS6IwHvdhqq9dw/ow5VjTUw+xBwUlfPfZplaai+3hKTKWh6a2WZCeDasNItBv9aA=="; }; }; - "@aws-sdk/is-array-buffer-3.47.1" = { + "@aws-sdk/is-array-buffer-3.55.0" = { name = "_at_aws-sdk_slash_is-array-buffer"; packageName = "@aws-sdk/is-array-buffer"; - version = "3.47.1"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.47.1.tgz"; - sha512 = "HQMvT3dP6DCjmn87WkzYxUF9RqkvuXgKfddLEKj/tg/OgDQJv9xIPjEEry8Fd36ncbBqaBmC/z2ETZhpzHQvXA=="; + url = "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.55.0.tgz"; + sha512 = "NbiPHVYuPxdqdFd6FxzzN3H1BQn/iWA3ri3Ry7AyLeP/tGs1yzEWMwf8BN8TSMALI0GXT6Sh0GDWy3Ok5xB6DA=="; }; }; - "@aws-sdk/md5-js-3.47.2" = { + "@aws-sdk/md5-js-3.55.0" = { name = "_at_aws-sdk_slash_md5-js"; packageName = "@aws-sdk/md5-js"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.47.2.tgz"; - sha512 = "APIz8mCPscYG6gCxvC2dbrBfpM3jHwAh+VqTmGHHxxO1AAP3y5ohtdl/2MsKtEPKuyT1IX2/YoUwcOyJj65xmw=="; + url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.55.0.tgz"; + sha512 = "+jh2p2B0KsyODQR01bAh7Ywladi9oVL4MSfskwl6AQApKaj8/2xLqW9I89zbRSMfPEgi2eIksQgCWET7tUc29Q=="; }; }; - "@aws-sdk/middleware-apply-body-checksum-3.47.2" = { - name = "_at_aws-sdk_slash_middleware-apply-body-checksum"; - packageName = "@aws-sdk/middleware-apply-body-checksum"; - version = "3.47.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-apply-body-checksum/-/middleware-apply-body-checksum-3.47.2.tgz"; - sha512 = "sjZZZ7hOR9retsblYOs4cgsVg7r1Sfuvr/aIx16XXv3TeAk7fz8JTRf5STxMM6YkGIVMbvBOHpMNvcGGgJQhZQ=="; - }; - }; - "@aws-sdk/middleware-bucket-endpoint-3.47.2" = { + "@aws-sdk/middleware-bucket-endpoint-3.56.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.47.2"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.47.2.tgz"; - sha512 = "VrUrkAUS3CqI7tK3r0c0oT+1SE1L+euyq6j6Jt3XOjRMUXCkArecVkr3jEprbpVDiAkaTXEJE77iL1+98twiYA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.56.0.tgz"; + sha512 = "czf0u1+QeYg43hXYpR/udf3YwIq1CX5kd4bL5U6DryH9E39sHeIoEGt5NC+82OTnbezqrHBalzZX7h7Y2pI8Sg=="; }; }; - "@aws-sdk/middleware-content-length-3.47.2" = { + "@aws-sdk/middleware-content-length-3.55.0" = { name = "_at_aws-sdk_slash_middleware-content-length"; packageName = "@aws-sdk/middleware-content-length"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.47.2.tgz"; - sha512 = "rpLtN6BczAfJnH1fpXyUOMdDFN3xrky3QZ4SULVgTLXNMOvN5zDJnjwUh/QNgEaEQhxd6lroVJSgosG3357kWg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.55.0.tgz"; + sha512 = "IkFBwa1G5ERfKFh4Kdtcn/aNAGi3Hcp9IO1PVt69LZWaevxjXAi5NS2k65E9mZPEumzuLtcEeC+3qhPs4FUkqQ=="; }; }; - "@aws-sdk/middleware-expect-continue-3.47.2" = { + "@aws-sdk/middleware-expect-continue-3.55.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.47.2.tgz"; - sha512 = "sLv5q8+POzpMvp9dx/OInFr6VWJreHOGFoauYN1n7a+8dmhr9tycBLq/j+eBXI2FWwC3dXCBdrC9qs4ieSRe0Q=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.55.0.tgz"; + sha512 = "RT6w9AJvZyMn8Cdw6RHaLK8c/Lkqdi4v19XAJCPaAaD2rQ6GhZ+AawgfkF5zawzN1TgzLmzWB4e1ts4+chr74Q=="; }; }; - "@aws-sdk/middleware-header-default-3.47.2" = { + "@aws-sdk/middleware-flexible-checksums-3.55.0" = { + name = "_at_aws-sdk_slash_middleware-flexible-checksums"; + packageName = "@aws-sdk/middleware-flexible-checksums"; + version = "3.55.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.55.0.tgz"; + sha512 = "Uhx0HAUkpRfRny5bGNPYNlaznMKSa5d88RWhrAEiYMgrhUsOcAahyj74lHrphGQ0nUwJr67uq55GPRRWn9Q4Ig=="; + }; + }; + "@aws-sdk/middleware-header-default-3.55.0" = { name = "_at_aws-sdk_slash_middleware-header-default"; packageName = "@aws-sdk/middleware-header-default"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.47.2.tgz"; - sha512 = "fCcQaQ/ac+h8nS8d8nSrvP/scNTCdkHQ8PpNXo7nSz4a67xbxxln61T4iHOin8z0m62NlFrhtMdlQTtDqDEZVg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-header-default/-/middleware-header-default-3.55.0.tgz"; + sha512 = "IrIsVoiol36Ap3VLtrofx95PkiBd4aNw6k4FRi9TsRxmOhfcAe3MvG521wyVEg+n3DqkYPb1N4SVTUENewo8bQ=="; }; }; - "@aws-sdk/middleware-host-header-3.47.2" = { + "@aws-sdk/middleware-host-header-3.55.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.47.2.tgz"; - sha512 = "sDIGydvdO1LC7VQntTDMK+YYLRVCJAhrsCT8SxyAX0Jhu7Ek1BfRZzSZDwapL+idbMyyKsB80NpNoTWuKRrrew=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.55.0.tgz"; + sha512 = "69mTWJfuPP4aC+h2/cb9B2CUNA9tiRPUBp67dmMrA2dHyy53kNYo8TGgfLKProoBidBz/AVXIfnh+izJj0F20w=="; }; }; - "@aws-sdk/middleware-location-constraint-3.47.2" = { + "@aws-sdk/middleware-location-constraint-3.55.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.47.2.tgz"; - sha512 = "b6ozPYnInQB1Iv+UjLyhunTCUcw54AKtUO7Mj2QLT2GqCPDPry7ZmAC9Qtfv4Itv7HyM4VfR1roAGKZwT4zxQw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.55.0.tgz"; + sha512 = "OvCKwBFbl8Gbfk0HGX00pkdORJN8BPuH/O5l3+mOBWuwILPuckRP5WGnL+1HT/gu4hHS6h1lpxUrPxUOoeKIAg=="; }; }; - "@aws-sdk/middleware-logger-3.47.2" = { + "@aws-sdk/middleware-logger-3.55.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.47.2.tgz"; - sha512 = "Oz14cAaYmtzMYw0/ehlVLvMF4gqQS0qaYWGyyR4a3nONiwEDzxNMEQiEg7i8VgsP4usK7lfYZLXgwSmqo7uCzg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.55.0.tgz"; + sha512 = "PtRbVrxEzDmeV9prBIP4/9or7R5Dj66mjbFSvNRGZ0n+UBfBFfVRfNrhQPNzQpfV9A3KVl9YyWCVXDSW+/rk9Q=="; }; }; - "@aws-sdk/middleware-retry-3.47.2" = { + "@aws-sdk/middleware-retry-3.56.0" = { name = "_at_aws-sdk_slash_middleware-retry"; packageName = "@aws-sdk/middleware-retry"; - version = "3.47.2"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.47.2.tgz"; - sha512 = "qgAE/+hVGXQDkqbVo+uFeb+N7mr7kBi0Oc1Fm490fm3uLQnXuyu3suIix//wxNejoLwIgKQGSLrQNgnXtuvhxw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.56.0.tgz"; + sha512 = "AkunQvVex5JimQ+xLDcPcdsseVdvxE5rUSPh/NKLGO0bOyMxPnJSRlOxrOoibK0i1BPHkTpwdx+BDFrWiRLqug=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.47.2" = { + "@aws-sdk/middleware-sdk-s3-3.56.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.47.2"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.47.2.tgz"; - sha512 = "KjcrHHDIn4QCh8pTRVT2u8uOnpdPYVB2p+xblwyRvJt2VLhgJbgNpRy8pOwNo2lyfbOKrmWeBk4x0NduiXle8g=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.56.0.tgz"; + sha512 = "ERHjQsA4ZTMDiKlSWF6dGt/UT15OQCCR8qRR+d/n3hVs6Nzyrt/ajEIBuea7E5lDuGwgyua5wkj1UjiHFQ4YeA=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.47.2" = { + "@aws-sdk/middleware-sdk-sts-3.56.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.47.2"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.47.2.tgz"; - sha512 = "KlO4cYb4Bxf/Jg/uxlxRrFvxUR/DmjMIS+JRZNGqK4XyYA+apYZkfM0XUtMiKc491n/euluf9A0AyTxpMgixxg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.56.0.tgz"; + sha512 = "LutcntT3DvS0nnHdGPHES+J+NUtKJFAVgz1gSqPq4MLIAB5oUm9QAWhmki5s2dfBbeRR7Kh1tWpzE00XowyBog=="; }; }; - "@aws-sdk/middleware-serde-3.47.2" = { + "@aws-sdk/middleware-serde-3.55.0" = { name = "_at_aws-sdk_slash_middleware-serde"; packageName = "@aws-sdk/middleware-serde"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.47.2.tgz"; - sha512 = "Gjw+fkG4UvvbP5LrGW1FzUq0IJB6QIBFxStE0gbyjkKNYtcb9c0R3dIwH5CSECtelDZScytwmBKaVe8NGi6wJA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.55.0.tgz"; + sha512 = "NkEbTDrSZcC2NhuvfjXHKJEl0xgI2B5tMAwi/rMOq/TEnARwVUL9qAy+5lgeiPCqebiNllWatARrFgAaYf0VeA=="; }; }; - "@aws-sdk/middleware-signing-3.47.2" = { + "@aws-sdk/middleware-signing-3.56.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.47.2"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.47.2.tgz"; - sha512 = "r6/2gf5gwkVdI7EOa1TdYdfzOdCF3jkhjLi98c3nAxZNxZFGwoycIy7Bd6sCfOdcmk8NyVmR0APpsgD9q+a3nw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.56.0.tgz"; + sha512 = "m0Rmlb3eojvZs0DQdfTZ+xJwJ0SuTXdeXn75jnpDAlnzRNKy7aRGYSsHChK8nkXgYKkpO2JmYywiTUriwwVULA=="; }; }; - "@aws-sdk/middleware-ssec-3.47.2" = { + "@aws-sdk/middleware-ssec-3.55.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.47.2.tgz"; - sha512 = "dRNQJjvlg4omfhAfSYtZva4OpS/58aLO7y8l2o5sQHGPwob5OYO5zfPioi4h68UZw1fagG962hUywOkVJDJAuw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.55.0.tgz"; + sha512 = "HTdA23hksOphQe0TmYORsa/kMNnKRGbdh0VJcsDGHQScJXzJ+C//THwfcoklff0XZfC+vGh93PECBWqixMELZw=="; }; }; - "@aws-sdk/middleware-stack-3.47.2" = { + "@aws-sdk/middleware-stack-3.55.0" = { name = "_at_aws-sdk_slash_middleware-stack"; packageName = "@aws-sdk/middleware-stack"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.47.2.tgz"; - sha512 = "9wedI1L92stvg5fs6Y3CbUXYLZIYdI3Mrdqex+ulNRuepgZNORsk+dnb8rTkf9cO3nuWRrnfKBLc/uiTcA1dww=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.55.0.tgz"; + sha512 = "ouD+wFz8W2R0ZQ8HrbhgN8tg1jyINEg9lPEEXY79w1Q5sf94LJ90XKAMVk02rw3dJalUWjLHf0OQe1/qxZfHyA=="; }; }; - "@aws-sdk/middleware-user-agent-3.47.2" = { + "@aws-sdk/middleware-user-agent-3.55.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.47.2.tgz"; - sha512 = "LF5gOi37lJ3tkuDSqZVKHmqYY8oTIUTEdmPVUbBQtPKsx9xfCNbMNVAP+C+7bnbt6StZIZsvtu0M144yNFXPGQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.55.0.tgz"; + sha512 = "UOBimkQrj6onXb3Fyuao85IjipnDSowNHfOOl3ADVX9boA/A4db5QAXBSxThV0WHLArC0iiUsnwu95ElSSMVIg=="; }; }; - "@aws-sdk/node-config-provider-3.47.2" = { + "@aws-sdk/node-config-provider-3.56.0" = { name = "_at_aws-sdk_slash_node-config-provider"; packageName = "@aws-sdk/node-config-provider"; - version = "3.47.2"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.47.2.tgz"; - sha512 = "POdigo6ZXLRVWhmjE21Y1Q1ziPnM/c3rH0wHgzAtdx0Mfn6/9jS77QHMkZzC8MJ7lzgXVFDWM25evVZqdYrh+g=="; + url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.56.0.tgz"; + sha512 = "2uCisndaymG/tXsfVj+ZqybmNTRJwhTm3sPBB8+utSDcUe7PWR0viNEqR2lPO5Uds1zOQm4MPv1v+j4jZufFyw=="; }; }; - "@aws-sdk/node-http-handler-3.47.2" = { + "@aws-sdk/node-http-handler-3.55.0" = { name = "_at_aws-sdk_slash_node-http-handler"; packageName = "@aws-sdk/node-http-handler"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.47.2.tgz"; - sha512 = "X2Y+H2DBoeDnrSe5rsVc63uhext230AuG/+hIFHK2/HkyG9DiiHKNCNj2w8N4FLWEX3l8KDif3C7BqYxj9ZkDg=="; + url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.55.0.tgz"; + sha512 = "yF4YQr72YgVgWO9IDOhDcncqlKUJmMCtserAYhKNvmkVuaMGHE11p+IByWgcIsMJTvtFaFBhTA3W7zhJB1C1xA=="; }; }; - "@aws-sdk/property-provider-3.47.2" = { + "@aws-sdk/property-provider-3.55.0" = { name = "_at_aws-sdk_slash_property-provider"; packageName = "@aws-sdk/property-provider"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.47.2.tgz"; - sha512 = "0NiVJ6+JtRC8XOvNb1ofHtsjINrinC1/fDKvl/bDtJDhehC5EcIeiDQmHFUhGsgTyD+VpmuHj7E4AlV6BchNPQ=="; + url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.55.0.tgz"; + sha512 = "o7cKFJSHq5WOhwPsspYrzNto35oKKZvESZuWDtLxaZKSI6l7zpA366BI4kDG6Tc9i2+teV553MbxyZ9eya5A8g=="; }; }; - "@aws-sdk/protocol-http-3.47.2" = { + "@aws-sdk/protocol-http-3.55.0" = { name = "_at_aws-sdk_slash_protocol-http"; packageName = "@aws-sdk/protocol-http"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.47.2.tgz"; - sha512 = "XAQFbSigJD0fk61nSR6y6TMv3+o1IjymltWuDmGEtoI25pisC2M3A+3/xO9YHag/41CSgt9nQ+lh1iC4UlKKJw=="; + url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.55.0.tgz"; + sha512 = "vNjjsP5bFuKQMhmuBQZDddH441xanPbm8n42qgfigv0RzgWQhvUFrnmZWLBdyY8geY0RwsQ6x9yfQ0gvs48tpw=="; }; }; - "@aws-sdk/querystring-builder-3.47.2" = { + "@aws-sdk/querystring-builder-3.55.0" = { name = "_at_aws-sdk_slash_querystring-builder"; packageName = "@aws-sdk/querystring-builder"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.47.2.tgz"; - sha512 = "rsckQ262jFSDVES6rOuTnSDM9XEbM57zxeBj5BtD6eCnyUD0G4FZa1xZRum4khoxfff6/eJ+i2uncKrEk1v+EQ=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.55.0.tgz"; + sha512 = "/ZAXNipt9nRR8k+eowwukE/YjXnQ49p5w/MkaQxsBk3IuIf7MAcgVg8glHr0igH84GfUQ7ZVP8v+G2S3tKUG+Q=="; }; }; - "@aws-sdk/querystring-parser-3.47.2" = { + "@aws-sdk/querystring-parser-3.55.0" = { name = "_at_aws-sdk_slash_querystring-parser"; packageName = "@aws-sdk/querystring-parser"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.47.2.tgz"; - sha512 = "28BirdFhZ+Y2pUMuI9r1ATgcQyt4q3cSqqpLSy7ADGb7xHde6oA/ZfRdX/s7OVIHoAfhrjAeI+TbYjwso9F/HA=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.55.0.tgz"; + sha512 = "e+2FLgo+eDx7oh7ap5HngN9XSVMxredAVztLHxCcSN0lFHHHzMa8b2SpXbaowUxQHh7ziymSqvOrPYFQ71Filg=="; }; }; - "@aws-sdk/s3-request-presigner-3.48.0" = { + "@aws-sdk/s3-request-presigner-3.56.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.48.0"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.48.0.tgz"; - sha512 = "JEkTJ5FE1MY8NHNLj2AeW2R+mIODHGVSq6eC4+aRBHFZqY+EYM7mkML0brggXjrofUaktZ5Z83ssBwzP2XAj8A=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.56.0.tgz"; + sha512 = "Ct/eGVojY1Mtmd4oC3n+OXnL7QmEDCQ8pXIGvhZIFwd/ZyiZsMdEz9ZO2+b8izdMGu9V9gg8EftV+hDfbMxMOQ=="; }; }; - "@aws-sdk/service-error-classification-3.47.2" = { + "@aws-sdk/service-error-classification-3.55.0" = { name = "_at_aws-sdk_slash_service-error-classification"; packageName = "@aws-sdk/service-error-classification"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.47.2.tgz"; - sha512 = "oJCJbAPYhTNguJUhD8hlD7ibWIDpkvGrhkcq89gxBcXHPl/2/kjsii0gr302IH452IJlumpVe5wOXoZeqZYjaw=="; + url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.55.0.tgz"; + sha512 = "HdjnDyarsa1Avq1MJurkLyEe9c3eRa76dPmK4TmRGgwJ+tInEzGHL0rBW7V8xBK+PDF+fJQ71hvm8jPYmzvBwQ=="; }; }; - "@aws-sdk/shared-ini-file-loader-3.47.1" = { + "@aws-sdk/shared-ini-file-loader-3.56.0" = { name = "_at_aws-sdk_slash_shared-ini-file-loader"; packageName = "@aws-sdk/shared-ini-file-loader"; - version = "3.47.1"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.47.1.tgz"; - sha512 = "f0eVOMYkT4H0gOf1B9lw65/xeTa7rT9hocVB7DbjWk8Ifv46Uvlb4ZyYOLZIBDQyFNFrD/HHvja3BkzfV0MEOA=="; + url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.56.0.tgz"; + sha512 = "dCy3mXqYKK76iep9rn2inFrPOlGURvoO+B0Ygem0jgkDuxIF8t5wa10WHWB2ee8qZRlfwPYtcVdpEm2398St3g=="; }; }; - "@aws-sdk/signature-v4-3.47.2" = { + "@aws-sdk/signature-v4-3.56.0" = { name = "_at_aws-sdk_slash_signature-v4"; packageName = "@aws-sdk/signature-v4"; - version = "3.47.2"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.47.2.tgz"; - sha512 = "zJIhUY8LLiQldfM9wpgVw525dHbILJovyZm3xmm6Tq/t258cawNaeOvOp9w0I3ycA3gs+nKgMXdeMjLH8QLbWg=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.56.0.tgz"; + sha512 = "aCvYQDMSAPe2K1lk0A+B+4xPBF50zf5ufO2k6FmBba020kqe8ODZjLq6vJJJfwrywc1B+2xWKvdpvCB7qbAOUw=="; }; }; - "@aws-sdk/smithy-client-3.47.2" = { + "@aws-sdk/smithy-client-3.55.0" = { name = "_at_aws-sdk_slash_smithy-client"; packageName = "@aws-sdk/smithy-client"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.47.2.tgz"; - sha512 = "vCzZodWyKmLzC+N/B1GzDjKD8I5b/ILTwPHaaH7yJdncISq/3jyTMJVW7mZHbDX61a18rL/bADnIxEd524Y2hQ=="; + url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.55.0.tgz"; + sha512 = "YgBpqg6R3Qg8CH9biOP1N1lYTvh8VLGD6AoDGgy/R1dQSqRQuxgKANLl3DOVcZnIZLsw4TdB0m7U+ZPtirPR1Q=="; }; }; - "@aws-sdk/types-3.47.1" = { + "@aws-sdk/types-3.55.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.47.1"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.47.1.tgz"; - sha512 = "c+lxJJLD5Bq8HkrgaIWQfK8oGH53CYpRRJizyQ5qfRo9aXp/qshUnIVcgnA8t0k7jfzcIfa0Q7jSSBw3EerEbg=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.55.0.tgz"; + sha512 = "wrDZjuy1CVAYxDCbm3bWQIKMGfNs7XXmG0eG4858Ixgqmq2avsIn5TORy8ynBxcXn9aekV/+tGEQ7BBSYzIVNQ=="; }; }; - "@aws-sdk/url-parser-3.47.2" = { + "@aws-sdk/url-parser-3.55.0" = { name = "_at_aws-sdk_slash_url-parser"; packageName = "@aws-sdk/url-parser"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.47.2.tgz"; - sha512 = "xapm+8toLY1FJmdGWl/YWCGSbbzPitiKmcg9+NP1DIyZyHjzeG5vBZ2SYejYtGOf+Qn1VKyNN2+Qs049FOsh6w=="; + url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.55.0.tgz"; + sha512 = "qrTwN5xIgTLreqLnZ+x3cAudjNKfxi6srW1H/px2mk4lb2U9B4fpGjZ6VU+XV8U2kR+YlT8J6Jo5iwuVGfC91A=="; }; }; - "@aws-sdk/util-arn-parser-3.47.1" = { + "@aws-sdk/util-arn-parser-3.55.0" = { name = "_at_aws-sdk_slash_util-arn-parser"; packageName = "@aws-sdk/util-arn-parser"; - version = "3.47.1"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.47.1.tgz"; - sha512 = "Q+tZjYyBeWMyPJ6+l42JXS7gt5crXywJbLDGjoLoS+Ba0JDB5zp8IMRLzGzQpTO+VnbL4ZyEEUVEihyqFbB0iw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.55.0.tgz"; + sha512 = "76KJxp4MRWufHYWys7DFl64znr5yeJ3AIQNAPCKKw1sP0hzO7p6Kx0PaJnw9x+CPSzOrT4NbuApL6/srYhKDGg=="; }; }; - "@aws-sdk/util-base64-browser-3.47.1" = { + "@aws-sdk/util-base64-browser-3.55.0" = { name = "_at_aws-sdk_slash_util-base64-browser"; packageName = "@aws-sdk/util-base64-browser"; - version = "3.47.1"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-base64-browser/-/util-base64-browser-3.47.1.tgz"; - sha512 = "asStae2d1xvgs3czWvvVb4JWHfY2iV8yximL4MwF+Lb8XG/b8LH3tG1E5axAFVMBcljdvRB941N7w3rug7V9ig=="; + url = "https://registry.npmjs.org/@aws-sdk/util-base64-browser/-/util-base64-browser-3.55.0.tgz"; + sha512 = "3hrZ2R/ZyD3IM25KhETOGLC5tB/ft8zoyVmNg1l4+takoUm46ompnglFXCVkWBu9Hpxc+M4XtiY7MHE6es4Wtg=="; }; }; - "@aws-sdk/util-base64-node-3.47.2" = { + "@aws-sdk/util-base64-node-3.55.0" = { name = "_at_aws-sdk_slash_util-base64-node"; packageName = "@aws-sdk/util-base64-node"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-base64-node/-/util-base64-node-3.47.2.tgz"; - sha512 = "0Oml66+9/uERV1dosecA/1tEd0zdiwI3kEobCF5w2f4gJDzUdaEoztcRwtbLcFv6yVT7XoW4evMQbtlcruypcQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-base64-node/-/util-base64-node-3.55.0.tgz"; + sha512 = "UQ/ZuNoAc8CFMpSiRYmevaTsuRKzLwulZTnM8LNlIt9Wx1tpNvqp80cfvVj7yySKROtEi20wq29h31dZf1eYNQ=="; }; }; - "@aws-sdk/util-body-length-browser-3.47.1" = { + "@aws-sdk/util-body-length-browser-3.55.0" = { name = "_at_aws-sdk_slash_util-body-length-browser"; packageName = "@aws-sdk/util-body-length-browser"; - version = "3.47.1"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.47.1.tgz"; - sha512 = "qR307MATPC+4JtN7W9sSkchfdB3O4mulLKRpk7rF6Ns6vVwhaPfJstSGe9Qa68zYZXubF9h5WnoWuJz4N0Vqdw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.55.0.tgz"; + sha512 = "Ei2OCzXQw5N6ZkTMZbamUzc1z+z1R1Ja5tMEagz5BxuX4vWdBObT+uGlSzL8yvTbjoPjnxWA2aXyEqaUP3JS8Q=="; }; }; - "@aws-sdk/util-body-length-node-3.47.1" = { + "@aws-sdk/util-body-length-node-3.55.0" = { name = "_at_aws-sdk_slash_util-body-length-node"; packageName = "@aws-sdk/util-body-length-node"; - version = "3.47.1"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.47.1.tgz"; - sha512 = "U2K7+gi3bAQBb3WB1/trvA+4rPC2SKH9w/sRtqBwtxHNOjXjiCiF3oEYnbir7cdSfhzMH4HBYKbfkHZwTAHMfw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.55.0.tgz"; + sha512 = "lU1d4I+9wJwydduXs0SxSfd+mHKjxeyd39VwOv6i2KSwWkPbji9UQqpflKLKw+r45jL7+xU/zfeTUg5Tt/3Gew=="; }; }; - "@aws-sdk/util-buffer-from-3.47.2" = { + "@aws-sdk/util-buffer-from-3.55.0" = { name = "_at_aws-sdk_slash_util-buffer-from"; packageName = "@aws-sdk/util-buffer-from"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.47.2.tgz"; - sha512 = "oLytLGiIeJEk7FcT7bdeQNv7+vvVVPuL5hyXlCjHZwoWuDxepjoDhTaIC9Isq1UyPKfSZaVpk/1nqREe4aYDHw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.55.0.tgz"; + sha512 = "uVzKG1UgvnV7XX2FPTylBujYMKBPBaq/qFBxfl0LVNfrty7YjpfieQxAe6yRLD+T0Kir/WDQwGvYC+tOYG3IGA=="; }; }; - "@aws-sdk/util-config-provider-3.47.1" = { + "@aws-sdk/util-config-provider-3.55.0" = { name = "_at_aws-sdk_slash_util-config-provider"; packageName = "@aws-sdk/util-config-provider"; - version = "3.47.1"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.47.1.tgz"; - sha512 = "kBs+YghZaOqChxLZDTR8dw5RQxJ/qF064EjRpC+TdCegLCO2UtZ97RXBvc5mdt94OxXGjGUjDiD/eAlpjjFNXw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.55.0.tgz"; + sha512 = "30dzofQQfx6tp1jVZkZ0DGRsT0wwC15nEysKRiAcjncM64A0Cm6sra77d0os3vbKiKoPCI/lMsFr4o3533+qvQ=="; }; }; - "@aws-sdk/util-create-request-3.47.2" = { + "@aws-sdk/util-create-request-3.55.0" = { name = "_at_aws-sdk_slash_util-create-request"; packageName = "@aws-sdk/util-create-request"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.47.2.tgz"; - sha512 = "AfYWBTfChMaYPnaMpjUOOMnJgkWna4MhhxK2NxzbIg+f6+jKXLa6gA9CC421K+SqvLs+RxVRy25brnZAKdMkkg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.55.0.tgz"; + sha512 = "ihCVXBWQopYk9R1H/+IsBKuRx1OqBx4OmTMzL7dRC+wnOV1h0nOUhps19QidppT/uIZUnuV8EZs3KnOWdZzH3w=="; }; }; - "@aws-sdk/util-credentials-3.47.2" = { - name = "_at_aws-sdk_slash_util-credentials"; - packageName = "@aws-sdk/util-credentials"; - version = "3.47.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.47.2.tgz"; - sha512 = "C0L8pfZkJyWfuvLVRcM2Ff11t2mkM4lzjNBnQKdL80wuASZWCnAi50oUKBgwbHZdOsRKGV7C4zqAuTLTRaFpCQ=="; - }; - }; - "@aws-sdk/util-defaults-mode-browser-3.47.2" = { + "@aws-sdk/util-defaults-mode-browser-3.55.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-browser"; packageName = "@aws-sdk/util-defaults-mode-browser"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.47.2.tgz"; - sha512 = "ojAF5k/VFbPvJoj6/G6ekVQhbFvabUBvRhRaoQjkmj8LVEahtzcNcOxhu3FmH17mXR2oxWsGwvq6VAw6V3jLBg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.55.0.tgz"; + sha512 = "OS3gAwR84bHz7ObhjsSJM+grfeaBq3leGrj7xiX4BH3C8J+c10GMo3fqx1pV8Fq5F+9lMmhHpfOocD63SN5Q8A=="; }; }; - "@aws-sdk/util-defaults-mode-node-3.47.2" = { + "@aws-sdk/util-defaults-mode-node-3.56.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-node"; packageName = "@aws-sdk/util-defaults-mode-node"; - version = "3.47.2"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.47.2.tgz"; - sha512 = "O35bXeahlepgPxg72XDN+5cXlbs+jZec5AH+7YYI+ldEVu6WxF0MxeQtMG4Fqpb19bpPIPz0SodHM1D1I53S5w=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.56.0.tgz"; + sha512 = "NKHW5kxH5EIcAa4b0Vua6t75z5D3lanwbAeiHzYrA1MeDIFlfXHs/kiHT2KTpr6stZZEEVPOEwb628AnkHAZTg=="; }; }; - "@aws-sdk/util-format-url-3.47.2" = { + "@aws-sdk/util-format-url-3.55.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.47.2.tgz"; - sha512 = "iH1QLQb7E7YV006QSxroXlM3ZhWdcG7GLGgjGrCT32mIwJwUyXWw5rvWL9Vxc7yCABWD5s0TzUCgf4VXLUA3NA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.55.0.tgz"; + sha512 = "xSVunSEiTPzemeEtyR8lIc027LsMKtwmC3j9QDV6oGMEZjarfrVB7SsxgVklTQvm4lPICEpmajMxR9Z0vSxYQg=="; }; }; - "@aws-sdk/util-hex-encoding-3.47.1" = { + "@aws-sdk/util-hex-encoding-3.55.0" = { name = "_at_aws-sdk_slash_util-hex-encoding"; packageName = "@aws-sdk/util-hex-encoding"; - version = "3.47.1"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.47.1.tgz"; - sha512 = "9vBhp1E74s6nImK5xk7BkopQ10w6Vk8UrIinu71U7V/0PdjCEb4Jmnn++MLyim2jTT0QEGmJ6v0VjPZi9ETWaA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.55.0.tgz"; + sha512 = "zbDWNzIyqN2Po7SIo1ZDL4rQMP3R0TzGcCrm01bpQAb+2fWqUPigolvNZXXtMO6eS7EW3ZJJzkfoWHdH8zDz1A=="; }; }; - "@aws-sdk/util-locate-window-3.47.1" = { + "@aws-sdk/util-locate-window-3.55.0" = { name = "_at_aws-sdk_slash_util-locate-window"; packageName = "@aws-sdk/util-locate-window"; - version = "3.47.1"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.47.1.tgz"; - sha512 = "dMcBhtyJ7ZMNS8RS4UOVbkiR0gGrBWv+p1s9NLfMNXod9zaTAlMIKl9de8Xdshguvc8//J7heQV/7+HMvFEq2g=="; + url = "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.55.0.tgz"; + sha512 = "0sPmK2JaJE2BbTcnvybzob/VrFKCXKfN4CUKcvn0yGg/me7Bz+vtzQRB3Xp+YSx+7OtWxzv63wsvHoAnXvgxgg=="; }; }; - "@aws-sdk/util-uri-escape-3.47.1" = { + "@aws-sdk/util-middleware-3.55.0" = { + name = "_at_aws-sdk_slash_util-middleware"; + packageName = "@aws-sdk/util-middleware"; + version = "3.55.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.55.0.tgz"; + sha512 = "82fW2XV+rUalv8lkd4VlhpPp6xnXO5n9sckMp1N+TrQ+p8eqxqT0+o8n1/6s9Qsnkw64Y3m6+EfCdc8/uFOY2g=="; + }; + }; + "@aws-sdk/util-stream-browser-3.55.0" = { + name = "_at_aws-sdk_slash_util-stream-browser"; + packageName = "@aws-sdk/util-stream-browser"; + version = "3.55.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.55.0.tgz"; + sha512 = "3f/zQsAqexJpKssCL0adTjG8WO+NPQ63E3TingyKpnCnHQPEnqPdya5I5OLGzZ0WR0iUWRtpuW0MtuDabyLDWw=="; + }; + }; + "@aws-sdk/util-stream-node-3.55.0" = { + name = "_at_aws-sdk_slash_util-stream-node"; + packageName = "@aws-sdk/util-stream-node"; + version = "3.55.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.55.0.tgz"; + sha512 = "brCK3iENvXEL7BK5eDAdkZ2VuBSvXj7DH9EQezxl4Ntrj1lvb+McOk9WoU/o7yzE7A/bzEJEoNQAPi+VPNbb/w=="; + }; + }; + "@aws-sdk/util-uri-escape-3.55.0" = { name = "_at_aws-sdk_slash_util-uri-escape"; packageName = "@aws-sdk/util-uri-escape"; - version = "3.47.1"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.47.1.tgz"; - sha512 = "CGqm+bT07OCJSgDo48/4Fegh9tNPR3kcOMfNWZ/J6lrt+nfAnOdXx5zZB63PjKCt5zJ7LM0thOQgAeOf2WdJzQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.55.0.tgz"; + sha512 = "mmdDLUpFCN2nkfwlLdOM54lTD528GiGSPN1qb8XtGLgZsJUmg3uJSFIN2lPeSbEwJB3NFjVas/rnQC48i7mV8w=="; }; }; - "@aws-sdk/util-user-agent-browser-3.47.2" = { + "@aws-sdk/util-user-agent-browser-3.55.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.47.2.tgz"; - sha512 = "dstakqLW8hXRMzR/s3uLpfYbMs/qDowG/Fp123cAuln4rUODG29VNFLkMAYRnG6RQ9hf2OtXsCfFGNSm+bnJMg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.55.0.tgz"; + sha512 = "E+8PluqbdOKfdJc9E4k0vy4PPb9wvAMa2Zdm5ycoaY0IXRI9RjQJnRw5JKAAJWLuOy7Lb83LgoowGW3o+4AuKw=="; }; }; - "@aws-sdk/util-user-agent-node-3.47.2" = { + "@aws-sdk/util-user-agent-node-3.56.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.47.2"; + version = "3.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.47.2.tgz"; - sha512 = "9wYkGvTrOFWb+9QjziQma+l9M0u1tmHiIdL9r4Btsc9WVMsy1Y9HUUeXacM3dLLIzCpQ5dDbjIlAZWA8Rm3ZOQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.56.0.tgz"; + sha512 = "jpWDpEG2M06jqGtk/Jz9Iu94lBI8tdP7r2ctq2ptki9wYNmmWKdIXlS/W0g2UFx3qa9G9W67QI1efSTh2B0nfA=="; }; }; - "@aws-sdk/util-utf8-browser-3.47.1" = { + "@aws-sdk/util-utf8-browser-3.55.0" = { name = "_at_aws-sdk_slash_util-utf8-browser"; packageName = "@aws-sdk/util-utf8-browser"; - version = "3.47.1"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.47.1.tgz"; - sha512 = "PzHEdiBhfnZbHvZ+dIlIPodDbpgrpKDYslHe9A+tH8ZfuAxxmZEqnukp7QEkFr6mBcmq3H2thcPdNT45/5pA7Q=="; + url = "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.55.0.tgz"; + sha512 = "ljzqJcyjfJpEVSIAxwtIS8xMRUly84BdjlBXyp6cu4G8TUufgjNS31LWdhyGhgmW5vYBNr+LTz0Kwf6J+ou7Ug=="; }; }; - "@aws-sdk/util-utf8-node-3.47.2" = { + "@aws-sdk/util-utf8-node-3.55.0" = { name = "_at_aws-sdk_slash_util-utf8-node"; packageName = "@aws-sdk/util-utf8-node"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-utf8-node/-/util-utf8-node-3.47.2.tgz"; - sha512 = "itgWlytqhbD/pRiGxX7XY7RF8k15ScV816FUlZtOKeRpAphliFT07TGWKmiZcFxEbHpi9r8A5H1FOoPmyU635Q=="; + url = "https://registry.npmjs.org/@aws-sdk/util-utf8-node/-/util-utf8-node-3.55.0.tgz"; + sha512 = "FsFm7GFaC7j0tlPEm/ri8bU2QCwFW5WKjxUg8lm1oWaxplCpKGUsmcfPJ4sw58GIoyoGu4QXBK60oCWosZYYdQ=="; }; }; - "@aws-sdk/util-waiter-3.47.2" = { + "@aws-sdk/util-waiter-3.55.0" = { name = "_at_aws-sdk_slash_util-waiter"; packageName = "@aws-sdk/util-waiter"; - version = "3.47.2"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.47.2.tgz"; - sha512 = "3zzOEDPRgHJ3o17Ri0vVmCKvqh9tA2lP9WbpXTjOgEAfdI/hsP2XhqJWVrlyN+wQ6FwPbuX3Jsb7lsp1OZP2bg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.55.0.tgz"; + sha512 = "Do34MKPFSC/+zVN6vY+FZ+0WN61hzga4nPoAC590AOjs8rW6/H6sDN6Gz1KAZbPnuQUZfvsIJjMxN7lblXHJkQ=="; }; }; - "@aws-sdk/xml-builder-3.47.1" = { + "@aws-sdk/xml-builder-3.55.0" = { name = "_at_aws-sdk_slash_xml-builder"; packageName = "@aws-sdk/xml-builder"; - version = "3.47.1"; + version = "3.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.47.1.tgz"; - sha512 = "SPDSKG7zw7MnGFVl3uIVNBBZo4WyNg8Wu82COfD8XaH+E/XiYiHjjoPq8eIscrQb799TXudHxy5h/C7dFACMxA=="; + url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.55.0.tgz"; + sha512 = "BH+i5S2FLprmfSeIuGy3UbNtEoJPVjh8arl5+LV3i2KY/+TmrS4yT8JtztDlDxHF0cMtNLZNO0KEPtsACS6SOg=="; }; }; "@azu/format-text-1.0.1" = { @@ -1120,13 +1165,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.16.8" = { + "@babel/cli-7.17.6" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.16.8"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.16.8.tgz"; - sha512 = "FTKBbxyk5TclXOGmwYyqelqP5IF6hMxaeJskd85jbR5jBfYlwqgwAbJwnixi1ZBbTqKfFuAA95mdmUFeSRwyJA=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.17.6.tgz"; + sha512 = "l4w608nsDNlxZhiJ5tE3DbNmr61fIKMZ6fTBo171VEFuFMIYuJ3mHRhTLEkKKyvx2Mizkkv/0a8OJOnZqkKYNA=="; }; }; "@babel/code-frame-7.10.4" = { @@ -1156,31 +1201,22 @@ let sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; }; - "@babel/compat-data-7.16.8" = { + "@babel/compat-data-7.17.7" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.16.8"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz"; - sha512 = "m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz"; + sha512 = "p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ=="; }; }; - "@babel/core-7.16.10" = { + "@babel/core-7.17.8" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.16.10"; + version = "7.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.16.10.tgz"; - sha512 = "pbiIdZbCiMx/MM6toR+OfXarYix3uz0oVsnNtfdAGTcCTu3w/JGF8JhirevXLBJUu0WguSZI12qpKnx7EeMyLA=="; - }; - }; - "@babel/core-7.16.12" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.16.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz"; - sha512 = "dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.17.8.tgz"; + sha512 = "OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ=="; }; }; "@babel/core-7.9.0" = { @@ -1192,13 +1228,13 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.16.8" = { + "@babel/generator-7.17.7" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.16.8"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz"; - sha512 = "1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz"; + sha512 = "oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w=="; }; }; "@babel/helper-annotate-as-pure-7.16.7" = { @@ -1219,31 +1255,31 @@ let sha512 = "C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA=="; }; }; - "@babel/helper-compilation-targets-7.16.7" = { + "@babel/helper-compilation-targets-7.17.7" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.16.7"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz"; - sha512 = "mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz"; + sha512 = "UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w=="; }; }; - "@babel/helper-create-class-features-plugin-7.16.10" = { + "@babel/helper-create-class-features-plugin-7.17.6" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.16.10"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz"; - sha512 = "wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz"; + sha512 = "SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.16.7" = { + "@babel/helper-create-regexp-features-plugin-7.17.0" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.16.7"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz"; - sha512 = "fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz"; + sha512 = "awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA=="; }; }; "@babel/helper-define-polyfill-provider-0.3.1" = { @@ -1300,13 +1336,13 @@ let sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg=="; }; }; - "@babel/helper-member-expression-to-functions-7.16.7" = { + "@babel/helper-member-expression-to-functions-7.17.7" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.16.7"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz"; - sha512 = "VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz"; + sha512 = "thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw=="; }; }; "@babel/helper-module-imports-7.16.7" = { @@ -1318,13 +1354,13 @@ let sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; }; }; - "@babel/helper-module-transforms-7.16.7" = { + "@babel/helper-module-transforms-7.17.7" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.16.7"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz"; - sha512 = "gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz"; + sha512 = "VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw=="; }; }; "@babel/helper-optimise-call-expression-7.16.7" = { @@ -1363,13 +1399,13 @@ let sha512 = "y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw=="; }; }; - "@babel/helper-simple-access-7.16.7" = { + "@babel/helper-simple-access-7.17.7" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.16.7"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz"; - sha512 = "ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz"; + sha512 = "txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.16.0" = { @@ -1417,13 +1453,13 @@ let sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; }; }; - "@babel/helpers-7.16.7" = { + "@babel/helpers-7.17.8" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.16.7"; + version = "7.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.7.tgz"; - sha512 = "9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.8.tgz"; + sha512 = "QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw=="; }; }; "@babel/highlight-7.16.10" = { @@ -1444,24 +1480,6 @@ let sha512 = "V2dopEtPUL4LD+e8UtMIZB6BbsmMsS/7E1ZAvWNINzBfi7Cf3X9MLCpzHVZT4HeeF1lQl72IRtqqVt2RUImwyA=="; }; }; - "@babel/parser-7.16.10" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.16.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.10.tgz"; - sha512 = "Sm/S9Or6nN8uiFsQU1yodyDW3MWXQhFeqzMPM+t8MJjM+pLsnFVxFZzkpXKvUXh+Gz9cbMoYYs484+Jw/NTEFQ=="; - }; - }; - "@babel/parser-7.16.12" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.16.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz"; - sha512 = "VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A=="; - }; - }; "@babel/parser-7.16.2" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; @@ -1471,6 +1489,15 @@ let sha512 = "RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw=="; }; }; + "@babel/parser-7.17.8" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.17.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz"; + sha512 = "BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ=="; + }; + }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" = { name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; @@ -1516,13 +1543,13 @@ let sha512 = "IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww=="; }; }; - "@babel/plugin-proposal-class-static-block-7.16.7" = { + "@babel/plugin-proposal-class-static-block-7.17.6" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.16.7"; + version = "7.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz"; - sha512 = "dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz"; + sha512 = "X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA=="; }; }; "@babel/plugin-proposal-dynamic-import-7.16.7" = { @@ -1588,13 +1615,13 @@ let sha512 = "vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.16.7" = { + "@babel/plugin-proposal-object-rest-spread-7.17.3" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.16.7"; + version = "7.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz"; - sha512 = "3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz"; + sha512 = "yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.16.7" = { @@ -1876,13 +1903,13 @@ let sha512 = "gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw=="; }; }; - "@babel/plugin-transform-destructuring-7.16.7" = { + "@babel/plugin-transform-destructuring-7.17.7" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.16.7"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz"; - sha512 = "VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz"; + sha512 = "XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ=="; }; }; "@babel/plugin-transform-dotall-regex-7.16.7" = { @@ -1966,22 +1993,22 @@ let sha512 = "KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.16.8" = { + "@babel/plugin-transform-modules-commonjs-7.17.7" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.16.8"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz"; - sha512 = "oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz"; + sha512 = "ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.16.7" = { + "@babel/plugin-transform-modules-systemjs-7.17.8" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.16.7"; + version = "7.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz"; - sha512 = "DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz"; + sha512 = "39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw=="; }; }; "@babel/plugin-transform-modules-umd-7.16.7" = { @@ -2047,13 +2074,13 @@ let sha512 = "qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg=="; }; }; - "@babel/plugin-transform-react-jsx-7.16.7" = { + "@babel/plugin-transform-react-jsx-7.17.3" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.16.7"; + version = "7.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.7.tgz"; - sha512 = "8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.3.tgz"; + sha512 = "9tjBm4O07f7mzKSIlEmPdiE6ub7kfIe6Cd+w+oQebpATfTQMAgW+YOuWxogbKVTulA+MEO7byMeIUtQ1z+z+ZQ=="; }; }; "@babel/plugin-transform-react-jsx-development-7.16.7" = { @@ -2092,13 +2119,13 @@ let sha512 = "KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg=="; }; }; - "@babel/plugin-transform-runtime-7.16.10" = { + "@babel/plugin-transform-runtime-7.17.0" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.16.10"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.10.tgz"; - sha512 = "9nwTiqETv2G7xI4RvXHNfpGdr8pAA+Q/YtN3yLK7OoK7n9OibVm/xymJ838a9A6E/IciOLPj82lZk0fW6O4O7w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.17.0.tgz"; + sha512 = "fr7zPWnKXNc1xoHfrIU9mN/4XKX4VLZ45Q+oMhfsYIaHvg7mHgmhfOy/ckRWqDK7XF3QDigRpkh5DKq6+clE8A=="; }; }; "@babel/plugin-transform-shorthand-properties-7.16.7" = { @@ -2236,13 +2263,13 @@ let sha512 = "WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ=="; }; }; - "@babel/register-7.16.9" = { + "@babel/register-7.17.7" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.16.9"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.16.9.tgz"; - sha512 = "jJ72wcghdRIlENfvALcyODhNoGE5j75cYHdC+aQMh6cU/P86tiiXTp9XYZct1UxUMo/4+BgQRyNZEGx0KWGS+g=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.17.7.tgz"; + sha512 = "fg56SwvXRifootQEDQAu1mKdjh5uthPzdO0N6t358FktfL4XjAVXuH58ULoiW8mesxiOgNIrxiImqEwv0+hRRA=="; }; }; "@babel/runtime-7.13.9" = { @@ -2254,13 +2281,13 @@ let sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA=="; }; }; - "@babel/runtime-7.16.7" = { + "@babel/runtime-7.17.8" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.16.7"; + version = "7.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz"; - sha512 = "9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz"; + sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA=="; }; }; "@babel/runtime-7.9.0" = { @@ -2272,13 +2299,13 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.16.8" = { + "@babel/runtime-corejs3-7.17.8" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.16.8"; + version = "7.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.16.8.tgz"; - sha512 = "3fKhuICS1lMz0plI5ktOE/yEtBRMVxplzRkdn6mJQ197XiY0JnrzYV0+Mxozq3JZ8SBV9Ecurmw1XsGbwOf+Sg=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.17.8.tgz"; + sha512 = "ZbYSUvoSF6dXZmMl/CYTMOvzIFnbGfv4W3SEHYgMvNsFTeLaF2gkGAF4K2ddmtSK4Emej+0aYcnSC6N5dPCXUQ=="; }; }; "@babel/template-7.16.7" = { @@ -2290,13 +2317,13 @@ let sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; }; - "@babel/traverse-7.16.10" = { + "@babel/traverse-7.17.3" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.16.10"; + version = "7.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz"; - sha512 = "yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz"; + sha512 = "5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw=="; }; }; "@babel/types-7.16.0" = { @@ -2308,40 +2335,40 @@ let sha512 = "PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg=="; }; }; - "@babel/types-7.16.8" = { + "@babel/types-7.17.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.16.8"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz"; - sha512 = "smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz"; + sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; }; }; - "@blueprintjs/colors-4.0.0-beta.3" = { + "@blueprintjs/colors-4.0.1" = { name = "_at_blueprintjs_slash_colors"; packageName = "@blueprintjs/colors"; - version = "4.0.0-beta.3"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.0-beta.3.tgz"; - sha512 = "42i7qeyFZT/qJFj8iagVECB91HmqxiCY7rw+EaOHSKCwbasbJF0BmAMViZCrOhvw++ZQ2WXmu+CxH6jkvSeDtg=="; + url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.1.tgz"; + sha512 = "w2kMtUzQjHdrmjXpUnCfTq7/pc41S4UnXzOp6+AZtzCR4cVG1r2yBWR4XxaAAecDb94/yIBXooqtMD0B8T1Y2w=="; }; }; - "@blueprintjs/core-3.52.0" = { + "@blueprintjs/core-3.54.0" = { name = "_at_blueprintjs_slash_core"; packageName = "@blueprintjs/core"; - version = "3.52.0"; + version = "3.54.0"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/core/-/core-3.52.0.tgz"; - sha512 = "92Tsr0uw1ey8ZsdYSfPyeN1hbjI8PC+HWyXUSNG+nM4g5AYTuKXVXKTxxGBtZN9hG2LlmUld8YIMFWtuLBErDQ=="; + url = "https://registry.npmjs.org/@blueprintjs/core/-/core-3.54.0.tgz"; + sha512 = "u2c1s6MNn0ocxhnC6CuiG5g3KV6b4cKUvSobznepA9SC3/AL1s3XOvT7DLWoHRv2B/vBOHFYEDzLw2/vlcGGZg=="; }; }; - "@blueprintjs/icons-3.31.0" = { + "@blueprintjs/icons-3.33.0" = { name = "_at_blueprintjs_slash_icons"; packageName = "@blueprintjs/icons"; - version = "3.31.0"; + version = "3.33.0"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.31.0.tgz"; - sha512 = "6pXhHC8zEvoDKN5KNsIHNuCRKsemmRbXNv1jweB95VaFzR1M+Mik+Qi+13Wd+VtZrzes2ZcWttIeyuK91NoLCw=="; + url = "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.33.0.tgz"; + sha512 = "Q6qoSDIm0kRYQZISm59UUcDCpV3oeHulkLuh3bSlw0HhcSjvEQh2PSYbtaifM60Q4aK4PCd6bwJHg7lvF1x5fQ=="; }; }; "@bmewburn/js-beautify-1.13.0" = { @@ -2398,40 +2425,49 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@cdktf/hcl2cdk-0.8.6" = { + "@cdktf/hcl2cdk-0.9.4" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.8.6"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.8.6.tgz"; - sha512 = "+1tjR2lX+0tDDyKwGaDWe/3ehEE9cY/DczVz4yR5XtWQQFvubhBy0spxXxOe7bqUjpsFFbImCgZ6qXIg7kRceA=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.9.4.tgz"; + sha512 = "sUg9GsmaFpqqfoGcqibMEDHozMQhaDOxBT3Dz3ioNc0SSWhBpDRwrlctK3rNNKvWUetEeUr28L7SJR/I0TSd+Q=="; }; }; - "@cdktf/hcl2json-0.8.6" = { + "@cdktf/hcl2json-0.9.4" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.8.6"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.8.6.tgz"; - sha512 = "TcNGuoMwhwxhlFQ/q8Ww866Ww6qeb1+EPAXizHzC8kJXy/KOnBLtANq9N8+tt8UrgJqUYVrikrQFS2ydgTKc0w=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.9.4.tgz"; + sha512 = "dZZUi94C7TFs0E8IubNYu38mBncVlQVUeGp6nA3tYxs/ue1igKqx7+mWfZP7NYVOSlggMGRNaTts6ZA0UAtOYQ=="; }; }; - "@cdktf/provider-generator-0.8.6" = { + "@cdktf/provider-generator-0.9.4" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.8.6"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.8.6.tgz"; - sha512 = "WHrmBeGjts1t8q2EbQ+hb9A7l2qK9nSeiOH5XxcPeVUFnZzkXPVah7Lb0E+2AhbMXXNjWF5WhoYS/8S6sl+kGQ=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.9.4.tgz"; + sha512 = "06sfpBTn3+PqiU/XP3RQ6FO6M+GxzmHo6yIJk9r5x1QmIlitDE9tdogXqmAVVHB4nGRL/v7SXefcrOHrOkl1YQ=="; }; }; - "@chemzqm/neovim-5.6.4" = { + "@chemzqm/neovim-5.7.7" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.6.4"; + version = "5.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.6.4.tgz"; - sha512 = "PWGv4LizLhbaB3ygOOBfQIcqHPIPzp45DgkKo0fqbBUyQXty6PJ7VN5XoVY5kaqwhxwIqeaLD9iqW1jUoMQWeg=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.7.7.tgz"; + sha512 = "d9Bu5WA3fTEZw40EfEAkpevoE0HiPEwUAIYw4hfsGwwmcagMJzpx47h3EkH/r0I3qfXeDWEZ353fx9bc1qvYcA=="; + }; + }; + "@chinachu/aribts-1.3.5-mirakurun.17" = { + name = "_at_chinachu_slash_aribts"; + packageName = "@chinachu/aribts"; + version = "1.3.5-mirakurun.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@chinachu/aribts/-/aribts-1.3.5-mirakurun.17.tgz"; + sha512 = "1rgl8GNttf8+Ru/lOhWmH36zYQwUBaKIChHXe66KdJXDF+lRUaFhD1cR5NBCOFR983xzrvTJtGp0GWoYbILd1Q=="; }; }; "@cnakazawa/watch-1.0.4" = { @@ -2443,6 +2479,15 @@ let sha512 = "v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ=="; }; }; + "@colors/colors-1.5.0" = { + name = "_at_colors_slash_colors"; + packageName = "@colors/colors"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"; + sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; + }; + }; "@comandeer/babel-plugin-banner-5.0.0" = { name = "_at_comandeer_slash_babel-plugin-banner"; packageName = "@comandeer/babel-plugin-banner"; @@ -2452,148 +2497,148 @@ let sha512 = "sR9Go0U6puXoXyW9UgIiIQhRcJ8jVOvGl4BptUiXAtheMs72WcakZ1udh6J0ZOivr3o8jAM+MTCHLP8FZMbVpQ=="; }; }; - "@commitlint/config-validator-16.1.0" = { + "@commitlint/config-validator-16.2.1" = { name = "_at_commitlint_slash_config-validator"; packageName = "@commitlint/config-validator"; - version = "16.1.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-16.1.0.tgz"; - sha512 = "2cHeZPNTuf1JWbMqyA46MkExor5HMSgv8JrdmzEakUbJHUreh35/wN00FJf57qGs134exQW2thiSQ1IJUsVx2Q=="; + url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-16.2.1.tgz"; + sha512 = "hogSe0WGg7CKmp4IfNbdNES3Rq3UEI4XRPB8JL4EPgo/ORq5nrGTVzxJh78omibNuB8Ho4501Czb1Er1MoDWpw=="; }; }; - "@commitlint/ensure-16.0.0" = { + "@commitlint/ensure-16.2.1" = { name = "_at_commitlint_slash_ensure"; packageName = "@commitlint/ensure"; - version = "16.0.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-16.0.0.tgz"; - sha512 = "WdMySU8DCTaq3JPf0tZFCKIUhqxaL54mjduNhu8v4D2AMUVIIQKYMGyvXn94k8begeW6iJkTf9cXBArayskE7Q=="; + url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-16.2.1.tgz"; + sha512 = "/h+lBTgf1r5fhbDNHOViLuej38i3rZqTQnBTk+xEg+ehOwQDXUuissQ5GsYXXqI5uGy+261ew++sT4EA3uBJ+A=="; }; }; - "@commitlint/execute-rule-16.0.0" = { + "@commitlint/execute-rule-16.2.1" = { name = "_at_commitlint_slash_execute-rule"; packageName = "@commitlint/execute-rule"; - version = "16.0.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-16.0.0.tgz"; - sha512 = "8edcCibmBb386x5JTHSPHINwA5L0xPkHQFY8TAuDEt5QyRZY/o5DF8OPHSa5Hx2xJvGaxxuIz4UtAT6IiRDYkw=="; + url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-16.2.1.tgz"; + sha512 = "oSls82fmUTLM6cl5V3epdVo4gHhbmBFvCvQGHBRdQ50H/690Uq1Dyd7hXMuKITCIdcnr9umyDkr8r5C6HZDF3g=="; }; }; - "@commitlint/format-16.0.0" = { + "@commitlint/format-16.2.1" = { name = "_at_commitlint_slash_format"; packageName = "@commitlint/format"; - version = "16.0.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/format/-/format-16.0.0.tgz"; - sha512 = "9yp5NCquXL1jVMKL0ZkRwJf/UHdebvCcMvICuZV00NQGYSAL89O398nhqrqxlbjBhM5EZVq0VGcV5+7r3D4zAA=="; + url = "https://registry.npmjs.org/@commitlint/format/-/format-16.2.1.tgz"; + sha512 = "Yyio9bdHWmNDRlEJrxHKglamIk3d6hC0NkEUW6Ti6ipEh2g0BAhy8Od6t4vLhdZRa1I2n+gY13foy+tUgk0i1Q=="; }; }; - "@commitlint/is-ignored-16.0.0" = { + "@commitlint/is-ignored-16.2.1" = { name = "_at_commitlint_slash_is-ignored"; packageName = "@commitlint/is-ignored"; - version = "16.0.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-16.0.0.tgz"; - sha512 = "gmAQcwIGC/R/Lp0CEb2b5bfGC7MT5rPe09N8kOGjO/NcdNmfFSZMquwrvNJsq9hnAP0skRdHIsqwlkENkN4Lag=="; + url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-16.2.1.tgz"; + sha512 = "exl8HRzTIfb1YvDJp2b2HU5z1BT+9tmgxR2XF0YEzkMiCIuEKh+XLeocPr1VcvAKXv3Cmv5X/OfNRp+i+/HIhQ=="; }; }; - "@commitlint/lint-16.0.0" = { + "@commitlint/lint-16.2.1" = { name = "_at_commitlint_slash_lint"; packageName = "@commitlint/lint"; - version = "16.0.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/lint/-/lint-16.0.0.tgz"; - sha512 = "HNl15bRC0h+pLzbMzQC3tM0j1aESXsLYhElqKnXcf5mnCBkBkHzu6WwJW8rZbfxX+YwJmNljN62cPhmdBo8x0A=="; + url = "https://registry.npmjs.org/@commitlint/lint/-/lint-16.2.1.tgz"; + sha512 = "fNINQ3X2ZqsCkNB3Z0Z8ElmhewqrS3gy2wgBTx97BkcjOWiyPAGwDJ752hwrsUnWAVBRztgw826n37xPzxsOgg=="; }; }; - "@commitlint/load-16.1.0" = { + "@commitlint/load-16.2.3" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "16.1.0"; + version = "16.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-16.1.0.tgz"; - sha512 = "MtlEhKjP8jAF85jjX4mw8DUUwCxKsCgAc865hhpnwxjrfBcmGP7Up2AFE/M3ZMGDmSl1X1TMybQk/zohj8Cqdg=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-16.2.3.tgz"; + sha512 = "Hb4OUlMnBUK6UxJEZ/VJ5k0LocIS7PtEMbRXEAA7eSpOgORIFexC4K/RaRpVd5UTtu3M0ST3ddPPijF9rdW6nw=="; }; }; - "@commitlint/message-16.0.0" = { + "@commitlint/message-16.2.1" = { name = "_at_commitlint_slash_message"; packageName = "@commitlint/message"; - version = "16.0.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/message/-/message-16.0.0.tgz"; - sha512 = "CmK2074SH1Ws6kFMEKOKH/7hMekGVbOD6vb4alCOo2+33ZSLUIX8iNkDYyrw38Jwg6yWUhLjyQLUxREeV+QIUA=="; + url = "https://registry.npmjs.org/@commitlint/message/-/message-16.2.1.tgz"; + sha512 = "2eWX/47rftViYg7a3axYDdrgwKv32mxbycBJT6OQY/MJM7SUfYNYYvbMFOQFaA4xIVZt7t2Alyqslbl6blVwWw=="; }; }; - "@commitlint/parse-16.0.0" = { + "@commitlint/parse-16.2.1" = { name = "_at_commitlint_slash_parse"; packageName = "@commitlint/parse"; - version = "16.0.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/parse/-/parse-16.0.0.tgz"; - sha512 = "F9EjFlMw4MYgBEqoRrWZZKQBzdiJzPBI0qFDFqwUvfQsMmXEREZ242T4R5bFwLINWaALFLHEIa/FXEPa6QxCag=="; + url = "https://registry.npmjs.org/@commitlint/parse/-/parse-16.2.1.tgz"; + sha512 = "2NP2dDQNL378VZYioLrgGVZhWdnJO4nAxQl5LXwYb08nEcN+cgxHN1dJV8OLJ5uxlGJtDeR8UZZ1mnQ1gSAD/g=="; }; }; - "@commitlint/read-16.0.0" = { + "@commitlint/read-16.2.1" = { name = "_at_commitlint_slash_read"; packageName = "@commitlint/read"; - version = "16.0.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/read/-/read-16.0.0.tgz"; - sha512 = "H4T2zsfmYQK9B+JtoQaCXWBHUhgIJyOzWZjSfuIV9Ce69/OgHoffNpLZPF2lX6yKuDrS1SQFhI/kUCjVc/e4ew=="; + url = "https://registry.npmjs.org/@commitlint/read/-/read-16.2.1.tgz"; + sha512 = "tViXGuaxLTrw2r7PiYMQOFA2fueZxnnt0lkOWqKyxT+n2XdEMGYcI9ID5ndJKXnfPGPppD0w/IItKsIXlZ+alw=="; }; }; - "@commitlint/resolve-extends-16.1.0" = { + "@commitlint/resolve-extends-16.2.1" = { name = "_at_commitlint_slash_resolve-extends"; packageName = "@commitlint/resolve-extends"; - version = "16.1.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-16.1.0.tgz"; - sha512 = "8182s6AFoUFX6+FT1PgQDt15nO2ogdR/EN8SYVAdhNXw1rLz8kT5saB/ICw567GuRAUgFTUMGCXy3ctMOXPEDg=="; + url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-16.2.1.tgz"; + sha512 = "NbbCMPKTFf2J805kwfP9EO+vV+XvnaHRcBy6ud5dF35dxMsvdJqke54W3XazXF1ZAxC4a3LBy4i/GNVBAthsEg=="; }; }; - "@commitlint/rules-16.0.0" = { + "@commitlint/rules-16.2.1" = { name = "_at_commitlint_slash_rules"; packageName = "@commitlint/rules"; - version = "16.0.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/rules/-/rules-16.0.0.tgz"; - sha512 = "AOl0y2SBTdJ1bvIv8nwHvQKRT/jC1xb09C5VZwzHoT8sE8F54KDeEzPCwHQFgUcWdGLyS10kkOTAH2MyA8EIlg=="; + url = "https://registry.npmjs.org/@commitlint/rules/-/rules-16.2.1.tgz"; + sha512 = "ZFezJXQaBBso+BOTre/+1dGCuCzlWVaeLiVRGypI53qVgPMzQqZhkCcrxBFeqB87qeyzr4A4EoG++IvITwwpIw=="; }; }; - "@commitlint/to-lines-16.0.0" = { + "@commitlint/to-lines-16.2.1" = { name = "_at_commitlint_slash_to-lines"; packageName = "@commitlint/to-lines"; - version = "16.0.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-16.0.0.tgz"; - sha512 = "iN/qU38TCKU7uKOg6RXLpD49wNiuI0TqMqybHbjefUeP/Jmzxa8ishryj0uLyVdrAl1ZjGeD1ukXGMTtvqz8iA=="; + url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-16.2.1.tgz"; + sha512 = "9/VjpYj5j1QeY3eiog1zQWY6axsdWAc0AonUUfyZ7B0MVcRI0R56YsHAfzF6uK/g/WwPZaoe4Lb1QCyDVnpVaQ=="; }; }; - "@commitlint/top-level-16.0.0" = { + "@commitlint/top-level-16.2.1" = { name = "_at_commitlint_slash_top-level"; packageName = "@commitlint/top-level"; - version = "16.0.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-16.0.0.tgz"; - sha512 = "/Jt6NLxyFkpjL5O0jxurZPCHURZAm7cQCqikgPCwqPAH0TLgwqdHjnYipl8J+AGnAMGDip4FNLoYrtgIpZGBYw=="; + url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-16.2.1.tgz"; + sha512 = "lS6GSieHW9y6ePL73ied71Z9bOKyK+Ib9hTkRsB8oZFAyQZcyRwq2w6nIa6Fngir1QW51oKzzaXfJL94qwImyw=="; }; }; - "@commitlint/types-16.0.0" = { + "@commitlint/types-16.2.1" = { name = "_at_commitlint_slash_types"; packageName = "@commitlint/types"; - version = "16.0.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/types/-/types-16.0.0.tgz"; - sha512 = "+0FvYOAS39bJ4aKjnYn/7FD4DfWkmQ6G/06I4F0Gvu4KS5twirEg8mIcLhmeRDOOKn4Tp8PwpLwBiSA6npEMQA=="; + url = "https://registry.npmjs.org/@commitlint/types/-/types-16.2.1.tgz"; + sha512 = "7/z7pA7BM0i8XvMSBynO7xsB3mVQPUZbVn6zMIlp/a091XJ3qAXRXc+HwLYhiIdzzS5fuxxNIHZMGHVD4HJxdA=="; }; }; - "@corestore/networker-1.2.0" = { + "@corestore/networker-1.2.1" = { name = "_at_corestore_slash_networker"; packageName = "@corestore/networker"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@corestore/networker/-/networker-1.2.0.tgz"; - sha512 = "ErfgH7yuwh6C7Y4AYM6A+Vv0lYV2c3sx9NNzCkIOB8pgp1cPmht4T4ZbLu0GiVj1XJ67AOPI0nhYfi4DB/h2rA=="; + url = "https://registry.npmjs.org/@corestore/networker/-/networker-1.2.1.tgz"; + sha512 = "5wNXodStZRIRYu5u5kXWtI4XIIEPhRrqSRza+A41mN/K6PA7i9aHdU08qIV+4DW4CDWOlwiQz1YUMeU1QlSBQA=="; }; }; "@cronvel/get-pixels-3.4.0" = { @@ -2605,76 +2650,85 @@ let sha512 = "do5jDoX9oCR/dGHE4POVQ3PYDCmQ2Fow4CA72UL4WoE8zUImA/0lChczjfl+ucNjE4sXFWUnzoO6j4WzrUvLnw=="; }; }; - "@cspell/cspell-bundled-dicts-5.16.0" = { + "@cspell/cspell-bundled-dicts-5.19.3" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "5.16.0"; + version = "5.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.16.0.tgz"; - sha512 = "7O8Y6FMzTn5pnHUDjnQJ3cgIAHT5jfN05NKGu9FFikmsXsMmDRikr/OeuhK5tDOWLRIxZwmFrVMMGgBe6mj26Q=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.19.3.tgz"; + sha512 = "YAz68AgXTFFtrBUhNJlOQ7KOjUE6ncYt578/esa2GStMJHgJoUtPnOZsE41hh+cVWXqO5yRRI+Qkwub99zLMgQ=="; }; }; - "@cspell/cspell-types-5.16.0" = { + "@cspell/cspell-pipe-5.19.3" = { + name = "_at_cspell_slash_cspell-pipe"; + packageName = "@cspell/cspell-pipe"; + version = "5.19.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-5.19.3.tgz"; + sha512 = "3RKntgGRxYYzoxoH3VBPvnNMYkHKPq0U+U7qogcWxDkgAUgKXlBP0oc2mw96grJQ4HIzOL1vBnaVAWAqteY9Kw=="; + }; + }; + "@cspell/cspell-types-5.19.3" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "5.16.0"; + version = "5.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-5.16.0.tgz"; - sha512 = "pKBeOrUyZtp4DVNbikkpeAT/gob7gT2zun4v3jYdQEbDKYMRN7wTKlqfHJ4VxbF/yS45g7jizEc245xMUkxPHQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-5.19.3.tgz"; + sha512 = "tub7PW/I6qB6o+ZtlahAZjm5O5cnzj88HRiC8nAbJFpa7q0mrdpFMYhd7ksWtyFLlNbuDkCsfzXGamAhIQnnIw=="; }; }; - "@cspell/dict-ada-1.1.2" = { + "@cspell/dict-ada-2.0.0" = { name = "_at_cspell_slash_dict-ada"; packageName = "@cspell/dict-ada"; - version = "1.1.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-1.1.2.tgz"; - sha512 = "UDrcYcKIVyXDz5mInJabRNQpJoehjBFvja5W+GQyu9pGcx3BS3cAU8mWENstGR0Qc/iFTxB010qwF8F3cHA/aA=="; + url = "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-2.0.0.tgz"; + sha512 = "4gfJEYXVwz6IN2LBaT6QoUV4pqaR35i0z0u9O684vLuVczvNJIHa4vNaSEFBr9d6xxncUyqstgP9P73ajJjh9A=="; }; }; - "@cspell/dict-aws-1.0.14" = { + "@cspell/dict-aws-2.0.0" = { name = "_at_cspell_slash_dict-aws"; packageName = "@cspell/dict-aws"; - version = "1.0.14"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-1.0.14.tgz"; - sha512 = "K21CfB4ZpKYwwDQiPfic2zJA/uxkbsd4IQGejEvDAhE3z8wBs6g6BwwqdVO767M9NgZqc021yAVpr79N5pWe3w=="; + url = "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-2.0.0.tgz"; + sha512 = "NKz7pDZ7pwj/b33i3f4WLpC1rOOUMmENwYgftxU+giU2YBeKM2wZbMTSEIzsrel56r0UlQYmdIVlP/B4nnVaoQ=="; }; }; - "@cspell/dict-bash-1.0.17" = { + "@cspell/dict-bash-2.0.1" = { name = "_at_cspell_slash_dict-bash"; packageName = "@cspell/dict-bash"; - version = "1.0.17"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-1.0.17.tgz"; - sha512 = "BlX+pnDlLmIf776C9d71QjXl4NOIz+yloeixx1ZZjrwvKPLF+ffE/Ez13eV+D9R2Ps1rW10UvW8u3Hbmwme+Fw=="; + url = "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-2.0.1.tgz"; + sha512 = "pBx3T/5w7fPF8XD5cx3NwtRFvNpQYmYqzM043NKP2hDmlx4uFwbH599Lvt5mwCMZKfIoRXaNUQvq7se2gstQjw=="; }; }; - "@cspell/dict-companies-2.0.2" = { + "@cspell/dict-companies-2.0.3" = { name = "_at_cspell_slash_dict-companies"; packageName = "@cspell/dict-companies"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-2.0.2.tgz"; - sha512 = "LPKwBMAWRz+p1R8q+TV6E1sGOOTvxJOaJeXNN++CZQ7i6JMn5Rf+BSxagwkeK6z3o9vIC5ZE4AcQ5BMkvyjqGw=="; + url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-2.0.3.tgz"; + sha512 = "O622rMAaHm85AmqNyMki5je8HB/1XlTKbGOXh2UUhooI5qdgdfrjTQ6VBuHwHrfEfuODBHYTNYXVB2m23XqHCg=="; }; }; - "@cspell/dict-cpp-1.1.40" = { + "@cspell/dict-cpp-2.0.0" = { name = "_at_cspell_slash_dict-cpp"; packageName = "@cspell/dict-cpp"; - version = "1.1.40"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-1.1.40.tgz"; - sha512 = "sscfB3woNDNj60/yGXAdwNtIRWZ89y35xnIaJVDMk5TPMMpaDvuk0a34iOPIq0g4V+Y8e3RyAg71SH6ADwSjGw=="; + url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-2.0.0.tgz"; + sha512 = "EflHLs2pHEEXZM6jPfTGR/KHZKQtJlvzqgkg1zaA1YKv5HQNw9Wy5KVPGEV2bjPcFsZJO3xXjO1KBZcoOPjPmA=="; }; }; - "@cspell/dict-cryptocurrencies-1.0.10" = { + "@cspell/dict-cryptocurrencies-2.0.0" = { name = "_at_cspell_slash_dict-cryptocurrencies"; packageName = "@cspell/dict-cryptocurrencies"; - version = "1.0.10"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-1.0.10.tgz"; - sha512 = "47ABvDJOkaST/rXipNMfNvneHUzASvmL6K/CbOFpYKfsd0x23Jc9k1yaOC7JAm82XSC/8a7+3Yu+Fk2jVJNnsA=="; + url = "https://registry.npmjs.org/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-2.0.0.tgz"; + sha512 = "nREysmmfOp7L2YCRAUufQahwD5/Punzb5AZ6eyg4zUamdRWHgBFphb5/9h2flt1vgdUfhc6hZcML21Ci7iXjaA=="; }; }; "@cspell/dict-csharp-2.0.1" = { @@ -2686,40 +2740,49 @@ let sha512 = "ZzAr+WRP2FUtXHZtfhe8f3j9vPjH+5i44Hcr5JqbWxmqciGoTbWBPQXwu9y+J4mbdC69HSWRrVGkNJ8rQk8pSw=="; }; }; - "@cspell/dict-css-1.0.12" = { + "@cspell/dict-css-2.0.0" = { name = "_at_cspell_slash_dict-css"; packageName = "@cspell/dict-css"; - version = "1.0.12"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-1.0.12.tgz"; - sha512 = "K6yuxej7n454O7dwKG6lHacHrAOMZ0PhMEbmV6qH2JH0U4TtWXfBASYugHvXZCDDx1UObpiJP+3tQJiBqfGpHA=="; + url = "https://registry.npmjs.org/@cspell/dict-css/-/dict-css-2.0.0.tgz"; + sha512 = "MrFyswFHnPh4H0u6IlV4eHy+ZCUrrHzeL161LyTOqCvaKpbZavMgNYXzZqTF9xafO0iLgwKrl+Gkclu1KVBg0Q=="; }; }; - "@cspell/dict-django-1.0.26" = { + "@cspell/dict-dart-1.1.0" = { + name = "_at_cspell_slash_dict-dart"; + packageName = "@cspell/dict-dart"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-1.1.0.tgz"; + sha512 = "bBqZINm+RVjMgUrAhRzv/xx3jc3dkIqO0higPbsK+63IAtMNY3EiQnEO4eapbU+qAhyvICY9hZQZXy5Ux4p+Pw=="; + }; + }; + "@cspell/dict-django-2.0.0" = { name = "_at_cspell_slash_dict-django"; packageName = "@cspell/dict-django"; - version = "1.0.26"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-1.0.26.tgz"; - sha512 = "mn9bd7Et1L2zuibc08GVHTiD2Go3/hdjyX5KLukXDklBkq06r+tb0OtKtf1zKodtFDTIaYekGADhNhA6AnKLkg=="; + url = "https://registry.npmjs.org/@cspell/dict-django/-/dict-django-2.0.0.tgz"; + sha512 = "GkJdJv6cmzrKcmq2/oxTXjKF5uv71r4eTqnFmgPbNBW1t+G4VYpzOf0QrVQrhx2RC4DdW5XfcTf+iS0FxHOTmw=="; }; }; - "@cspell/dict-dotnet-1.0.32" = { + "@cspell/dict-dotnet-2.0.1" = { name = "_at_cspell_slash_dict-dotnet"; packageName = "@cspell/dict-dotnet"; - version = "1.0.32"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-1.0.32.tgz"; - sha512 = "9H9vXrgJB4KF8xsyTToXO53cXD33iyfrpT4mhCds+YLUw3P3x3E9myszgJzshnrxYBvQZ+QMII57Qr6SjZVk4Q=="; + url = "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-2.0.1.tgz"; + sha512 = "b1n4crJRW0WZVf9Gp/52j/tDtjYiZ3N81fIyfqPlBrjsh/5AivfA697DYwQ2mr8ngNX7RsqRtYNQjealA1rEnQ=="; }; }; - "@cspell/dict-elixir-1.0.26" = { + "@cspell/dict-elixir-2.0.1" = { name = "_at_cspell_slash_dict-elixir"; packageName = "@cspell/dict-elixir"; - version = "1.0.26"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-1.0.26.tgz"; - sha512 = "hz1yETUiRJM7yjN3mITSnxcmZaEyaBbyJhpZPpg+cKUil+xhHeZ2wwfbRc83QHGmlqEuDWbdCFqKSpCDJYpYhg=="; + url = "https://registry.npmjs.org/@cspell/dict-elixir/-/dict-elixir-2.0.1.tgz"; + sha512 = "eTTTxZt1FqGkM780yFDxsGHvTbWqvlK8YISSccK8FyrB6ULW+uflQlNS5AnWg3uWKC48b7pQott+odYCsPJ+Ow=="; }; }; "@cspell/dict-en-gb-1.1.33" = { @@ -2731,13 +2794,13 @@ let sha512 = "tKSSUf9BJEV+GJQAYGw5e+ouhEe2ZXE620S7BLKe3ZmpnjlNG9JqlnaBhkIMxKnNFkLY2BP/EARzw31AZnOv4g=="; }; }; - "@cspell/dict-en_us-2.1.4" = { + "@cspell/dict-en_us-2.2.0" = { name = "_at_cspell_slash_dict-en_us"; packageName = "@cspell/dict-en_us"; - version = "2.1.4"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-2.1.4.tgz"; - sha512 = "W4b+aIvZ637FqtTmrTe/T9i9748cuTQf82eWUgV9O296WzZj7rCxm+rzOrmRTAcCmU+9+6Cdsr0unETFQfuxww=="; + url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-2.2.0.tgz"; + sha512 = "IJWu8MI2NdLyPzekrMi9K+v71b0qjDE+z/BccoMA/APnphqgSNM8BDUAzhio6mPKi1AvPRCNUjk79oiUfp+1Gw=="; }; }; "@cspell/dict-filetypes-2.0.1" = { @@ -2749,13 +2812,13 @@ let sha512 = "bQ7K3U/3hKO2lpQjObf0veNP/n50qk5CVezSwApMBckf/sAVvDTR1RGAvYdr+vdQnkdQrk6wYmhbshXi0sLDVg=="; }; }; - "@cspell/dict-fonts-1.0.14" = { + "@cspell/dict-fonts-2.0.0" = { name = "_at_cspell_slash_dict-fonts"; packageName = "@cspell/dict-fonts"; - version = "1.0.14"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-fonts/-/dict-fonts-1.0.14.tgz"; - sha512 = "VhIX+FVYAnqQrOuoFEtya6+H72J82cIicz9QddgknsTqZQ3dvgp6lmVnsQXPM3EnzA8n1peTGpLDwHzT7ociLA=="; + url = "https://registry.npmjs.org/@cspell/dict-fonts/-/dict-fonts-2.0.0.tgz"; + sha512 = "AgkTalphfDPtKFPYmEExDcj8rRCh86xlOSXco8tehOEkYVYbksOk9XH0YVH34RFpy93YBd2nnVGLgyGVwagcPw=="; }; }; "@cspell/dict-fullstack-2.0.4" = { @@ -2767,112 +2830,112 @@ let sha512 = "+JtYO58QAXnetRN+MGVzI8YbkbFTLpYfl/Cw/tmNqy7U1IDVC4sTXQ2pZvbbeKQWFHBqYvBs0YASV+mTouXYBw=="; }; }; - "@cspell/dict-golang-1.1.24" = { + "@cspell/dict-golang-2.0.0" = { name = "_at_cspell_slash_dict-golang"; packageName = "@cspell/dict-golang"; - version = "1.1.24"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-1.1.24.tgz"; - sha512 = "qq3Cjnx2U1jpeWAGJL1GL0ylEhUMqyaR36Xij6Y6Aq4bViCRp+HRRqk0x5/IHHbOrti45h3yy7ii1itRFo+Xkg=="; + url = "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-2.0.0.tgz"; + sha512 = "rUeZJR/S/ZjAsOURtxsAO6xDQhL0IzF458ScahaeOqe0zVL3tx7tCLikCgT92NWPs3BNqmsZGqYSDbn/1KsSIA=="; }; }; - "@cspell/dict-haskell-1.0.13" = { + "@cspell/dict-haskell-2.0.0" = { name = "_at_cspell_slash_dict-haskell"; packageName = "@cspell/dict-haskell"; - version = "1.0.13"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-haskell/-/dict-haskell-1.0.13.tgz"; - sha512 = "kvl8T84cnYRPpND/P3D86P6WRSqebsbk0FnMfy27zo15L5MLAb3d3MOiT1kW3vEWfQgzUD7uddX/vUiuroQ8TA=="; + url = "https://registry.npmjs.org/@cspell/dict-haskell/-/dict-haskell-2.0.0.tgz"; + sha512 = "cjX1Br+gSWqtcmJD/IMHz1UoP3pUaKIIKy/JfhEs7ANtRt6hhfEKe9dl2kQzDkkKt4pXol+YgdYxL/sVc/nLgQ=="; }; }; - "@cspell/dict-html-2.0.3" = { + "@cspell/dict-html-3.0.1" = { name = "_at_cspell_slash_dict-html"; packageName = "@cspell/dict-html"; - version = "2.0.3"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-2.0.3.tgz"; - sha512 = "6sORumQ9E7YpJ4vzYb0hHBgiXpehPAawuqmueGmx/PSRkqzMNLEwhYZuTHuIZSO291RTirPMfCkUahRoKdXOOQ=="; + url = "https://registry.npmjs.org/@cspell/dict-html/-/dict-html-3.0.1.tgz"; + sha512 = "sbuFd+nSjgbrGf5eYwSddFhm1eLLePKWyH6Zn8Zb0OODrBK5e4vGn1/scI/MOH5a2IvNs8W9wp84uMBFJcQZtw=="; }; }; - "@cspell/dict-html-symbol-entities-1.0.23" = { + "@cspell/dict-html-symbol-entities-2.0.0" = { name = "_at_cspell_slash_dict-html-symbol-entities"; packageName = "@cspell/dict-html-symbol-entities"; - version = "1.0.23"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-1.0.23.tgz"; - sha512 = "PV0UBgcBFbBLf/m1wfkVMM8w96kvfHoiCGLWO6BR3Q9v70IXoE4ae0+T+f0CkxcEkacMqEQk/I7vuE9MzrjaNw=="; + url = "https://registry.npmjs.org/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-2.0.0.tgz"; + sha512 = "71S5wGCe7dq6C+zGDwsEAe5msub/irrLi6SExeG11a/EkpA3RKAEheDGPk0hOY4+vOcIFHaApxOjLTtgQfYWfA=="; }; }; - "@cspell/dict-java-1.0.23" = { + "@cspell/dict-java-2.0.0" = { name = "_at_cspell_slash_dict-java"; packageName = "@cspell/dict-java"; - version = "1.0.23"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-1.0.23.tgz"; - sha512 = "LcOg9srYLDoNGd8n3kbfDBlZD+LOC9IVcnFCdua1b/luCHNVmlgBx7e677qPu7olpMYOD5TQIVW2OmM1+/6MFA=="; + url = "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-2.0.0.tgz"; + sha512 = "9f5LDATlAiXRGqxLxgqbOLlQxuMW2zcN7tBgxwtN+4u90vM03ZUOR/gKIuDV/y0ZuAiWBIjA73cjk8DJ13Q1eA=="; }; }; - "@cspell/dict-latex-1.0.25" = { + "@cspell/dict-latex-2.0.0" = { name = "_at_cspell_slash_dict-latex"; packageName = "@cspell/dict-latex"; - version = "1.0.25"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-1.0.25.tgz"; - sha512 = "cEgg91Migqcp1SdVV7dUeMxbPDhxdNo6Fgq2eygAXQjIOFK520FFvh/qxyBvW90qdZbIRoU2AJpchyHfGuwZFA=="; + url = "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-2.0.0.tgz"; + sha512 = "H6RRwbHhQ9ARoO1R57SDqB+q/J5jUDdVnkdfukJkA+HNlJBhCcDuzGOIJqr+GBkJYDkF3obZ3LEOk2lUfT+Eyg=="; }; }; - "@cspell/dict-lorem-ipsum-1.0.22" = { + "@cspell/dict-lorem-ipsum-2.0.0" = { name = "_at_cspell_slash_dict-lorem-ipsum"; packageName = "@cspell/dict-lorem-ipsum"; - version = "1.0.22"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-lorem-ipsum/-/dict-lorem-ipsum-1.0.22.tgz"; - sha512 = "yqzspR+2ADeAGUxLTfZ4pXvPl7FmkENMRcGDECmddkOiuEwBCWMZdMP5fng9B0Q6j91hQ8w9CLvJKBz10TqNYg=="; + url = "https://registry.npmjs.org/@cspell/dict-lorem-ipsum/-/dict-lorem-ipsum-2.0.0.tgz"; + sha512 = "jKogAKtqvgPMleL6usyj3rZ0m8sVUR6drrD+wMnWSfdx1BmUyTsYiuh/mPEfLAebaYHELWSLQG3rDZRvV9Riqg=="; }; }; - "@cspell/dict-lua-1.0.16" = { + "@cspell/dict-lua-2.0.0" = { name = "_at_cspell_slash_dict-lua"; packageName = "@cspell/dict-lua"; - version = "1.0.16"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-1.0.16.tgz"; - sha512 = "YiHDt8kmHJ8nSBy0tHzaxiuitYp+oJ66ffCYuFWTNB3//Y0SI4OGHU3omLsQVeXIfCeVrO4DrVvRDoCls9B5zQ=="; + url = "https://registry.npmjs.org/@cspell/dict-lua/-/dict-lua-2.0.0.tgz"; + sha512 = "7WUEBEspSKtsq104WdIys1+DLqAxpJPzw74Py1TuE3fI5GvlzeSZkRFP2ya54GB2lCO4C3mq4M8EnitpibVDfw=="; }; }; - "@cspell/dict-node-1.0.12" = { + "@cspell/dict-node-2.0.0" = { name = "_at_cspell_slash_dict-node"; packageName = "@cspell/dict-node"; - version = "1.0.12"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-node/-/dict-node-1.0.12.tgz"; - sha512 = "RPNn/7CSkflAWk0sbSoOkg0ORrgBARUjOW3QjB11KwV1gSu8f5W/ij/S50uIXtlrfoBLqd4OyE04jyON+g/Xfg=="; + url = "https://registry.npmjs.org/@cspell/dict-node/-/dict-node-2.0.0.tgz"; + sha512 = "tPPl3liJORa/l6AoYqh/7rjoM7bdtaIXnIN6ox7CE0flZcBS5rWOB6mzEY3rpu/XJX0pjbBiIoqrolDkVl1RTQ=="; }; }; - "@cspell/dict-npm-1.0.16" = { + "@cspell/dict-npm-2.0.2" = { name = "_at_cspell_slash_dict-npm"; packageName = "@cspell/dict-npm"; - version = "1.0.16"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-1.0.16.tgz"; - sha512 = "RwkuZGcYBxL3Yux3cSG/IOWGlQ1e9HLCpHeyMtTVGYKAIkFAVUnGrz20l16/Q7zUG7IEktBz5O42kAozrEnqMQ=="; + url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-2.0.2.tgz"; + sha512 = "Q5ua0aeKTxW4WxvtU+UMdct46hCStOTeEiiG8iinTh/mH5brmdtMEj4olO8+mmkAKPpIC4TI3TmaaN6RN+Vpgw=="; }; }; - "@cspell/dict-php-1.0.25" = { + "@cspell/dict-php-2.0.0" = { name = "_at_cspell_slash_dict-php"; packageName = "@cspell/dict-php"; - version = "1.0.25"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-1.0.25.tgz"; - sha512 = "RoBIP5MRdByyPaXcznZMfOY1JdCMYPPLua5E9gkq0TJO7bX5mC9hyAKfYBSWVQunZydd82HZixjb5MPkDFU1uw=="; + url = "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-2.0.0.tgz"; + sha512 = "29WgU77eTO985LvMHwPi1pcpfopfCWfTdffDyqya0JIfOSaFUrlYKzGPkE4mRxcz2G3hXsaM0SRvBNdIRwEdUg=="; }; }; - "@cspell/dict-powershell-1.0.19" = { + "@cspell/dict-powershell-2.0.0" = { name = "_at_cspell_slash_dict-powershell"; packageName = "@cspell/dict-powershell"; - version = "1.0.19"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-1.0.19.tgz"; - sha512 = "zF/raM/lkhXeHf4I43OtK0gP9rBeEJFArscTVwLWOCIvNk21MJcNoTYoaGw+c056+Q+hJL0psGLO7QN+mxYH1A=="; + url = "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-2.0.0.tgz"; + sha512 = "6uvEhLiGmG3u9TFkM1TYcky6aL9Yk7Sk3KJwoTYBaQJY2KqrprgyQtW6yxIw9oU52VRHlq3KKvSAA9Q26+SIkQ=="; }; }; "@cspell/dict-public-licenses-1.0.4" = { @@ -2884,76 +2947,85 @@ let sha512 = "h4xULfVEDUeWyvp1OO19pcGDqWcBEQ7WGMp3QBHyYpjsamlzsyYYjCRSY2ZvpM7wruDmywSRFmRHJ/+uNFT7nA=="; }; }; - "@cspell/dict-python-2.0.5" = { + "@cspell/dict-python-2.0.6" = { name = "_at_cspell_slash_dict-python"; packageName = "@cspell/dict-python"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-2.0.5.tgz"; - sha512 = "WkyGYtNmUsOHsWixck7AxNvveDgVPqw0H51hzIY+/5u3c94wZUweIj0vfFOGIfOBq8e1ZxpjumKBxVDGXTmQkw=="; + url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-2.0.6.tgz"; + sha512 = "54ICgMRiGwavorg8UJC38Fwx8tW8WKj8pimJmFUd0F/ImQ8wmeg4VrmyMach5MZVUaw1qUe2aP5uSyqA15Q0mg=="; }; }; - "@cspell/dict-ruby-1.0.15" = { + "@cspell/dict-r-1.0.2" = { + name = "_at_cspell_slash_dict-r"; + packageName = "@cspell/dict-r"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-r/-/dict-r-1.0.2.tgz"; + sha512 = "Rp3d4sgD6izW9TW5yVI3D//3HTl9oOGBuzTvXRdoHksVPRvzIu2liVhj8MnQ3XIRe5Kc6IhLBAm6izuV2BpGwQ=="; + }; + }; + "@cspell/dict-ruby-2.0.1" = { name = "_at_cspell_slash_dict-ruby"; packageName = "@cspell/dict-ruby"; - version = "1.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-1.0.15.tgz"; - sha512 = "I76hJA///lc1pgmDTGUFHN/O8KLIZIU/8TgIYIGI6Ix/YzSEvWNdQYbANn6JbCynS0X+7IbZ2Ft+QqvmGtIWuA=="; - }; - }; - "@cspell/dict-rust-1.0.23" = { - name = "_at_cspell_slash_dict-rust"; - packageName = "@cspell/dict-rust"; - version = "1.0.23"; - src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-1.0.23.tgz"; - sha512 = "lR4boDzs79YD6+30mmiSGAMMdwh7HTBAPUFSB0obR3Kidibfc3GZ+MHWZXay5dxZ4nBKM06vyjtanF9VJ8q1Iw=="; - }; - }; - "@cspell/dict-scala-1.0.21" = { - name = "_at_cspell_slash_dict-scala"; - packageName = "@cspell/dict-scala"; - version = "1.0.21"; - src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-1.0.21.tgz"; - sha512 = "5V/R7PRbbminTpPS3ywgdAalI9BHzcEjEj9ug4kWYvBIGwSnS7T6QCFCiu+e9LvEGUqQC+NHgLY4zs1NaBj2vA=="; - }; - }; - "@cspell/dict-software-terms-2.0.12" = { - name = "_at_cspell_slash_dict-software-terms"; - packageName = "@cspell/dict-software-terms"; - version = "2.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.0.12.tgz"; - sha512 = "zsgraHo5PIDY1mTaWGA2NsxhO8g85inD758pEQL1MeKTFlGiFHT4vW+faryzhvBT5LOMH4LnTs0yGrMyn7JlkQ=="; - }; - }; - "@cspell/dict-swift-1.0.1" = { - name = "_at_cspell_slash_dict-swift"; - packageName = "@cspell/dict-swift"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-swift/-/dict-swift-1.0.1.tgz"; - sha512 = "M4onLt10Ptld8Q1BwBit8BBYVZ0d2ZEiBTW1AXekIVPQkPKkwa/RkGlR0GESWNTC2Zbmt/qge7trksVdaYVWFQ=="; - }; - }; - "@cspell/dict-typescript-1.0.19" = { - name = "_at_cspell_slash_dict-typescript"; - packageName = "@cspell/dict-typescript"; - version = "1.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-1.0.19.tgz"; - sha512 = "qmJApzoVskDeJnLZzZMaafEDGbEg5Elt4c3Mpg49SWzIHm1N4VXCp5CcFfHsOinJ30dGrs3ARAJGJZIw56kK6A=="; - }; - }; - "@cspell/dict-vue-2.0.1" = { - name = "_at_cspell_slash_dict-vue"; - packageName = "@cspell/dict-vue"; version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-vue/-/dict-vue-2.0.1.tgz"; - sha512 = "n9So2C2Zw+uSDRzb2h9wq3PjZBqoHx+vBvu6a34H2qpumNjZ6HaEronrzX5tXJJXzOtocIQYrLxdd128TAU3+g=="; + url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-2.0.1.tgz"; + sha512 = "qGqhYfFeoBOashv/l0Kj5o4ilyvfq0s+t+r32juPOkOnbHz+hzxnJo2tMMg/L/UdjVV7Y8ovg4LDBC/seVrMYQ=="; + }; + }; + "@cspell/dict-rust-2.0.0" = { + name = "_at_cspell_slash_dict-rust"; + packageName = "@cspell/dict-rust"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-2.0.0.tgz"; + sha512 = "EWlQivTKXMU3TTcq/Pi6KPKTQADknasQ700UrxRPzxhwQ4sKVZ88GDu6VZJlsbFUz8Vko289KS6wjiox/7WpmQ=="; + }; + }; + "@cspell/dict-scala-2.0.0" = { + name = "_at_cspell_slash_dict-scala"; + packageName = "@cspell/dict-scala"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-2.0.0.tgz"; + sha512 = "MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g=="; + }; + }; + "@cspell/dict-software-terms-2.1.4" = { + name = "_at_cspell_slash_dict-software-terms"; + packageName = "@cspell/dict-software-terms"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.1.4.tgz"; + sha512 = "MB2eT9qhbnIEJajGv+ndzzi6S8NCJ9cMyeGJYMoRAiJobTKP6xPrT37VjPzhckRtrHJGG//UgtQ4NsiK5aBITw=="; + }; + }; + "@cspell/dict-swift-1.0.2" = { + name = "_at_cspell_slash_dict-swift"; + packageName = "@cspell/dict-swift"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-swift/-/dict-swift-1.0.2.tgz"; + sha512 = "IrMcRO7AYB2qU5cj4ttZyEbd04DRNOG6Iha106qGGmn4P096m+Y7lOnSLJx/rZbD/cAT3Z/7i465Lr1J93j7yg=="; + }; + }; + "@cspell/dict-typescript-2.0.0" = { + name = "_at_cspell_slash_dict-typescript"; + packageName = "@cspell/dict-typescript"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-2.0.0.tgz"; + sha512 = "WFBahxsnD2y4Os14tE5Zxh31Ggn4DzGOAu3UoxYl1lLLxaszx4RH7LmAeFuznySboiaBeRBbpfJOjQA796O6VQ=="; + }; + }; + "@cspell/dict-vue-2.0.2" = { + name = "_at_cspell_slash_dict-vue"; + packageName = "@cspell/dict-vue"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-vue/-/dict-vue-2.0.2.tgz"; + sha512 = "/MB0RS0Gn01s4pgmjy0FvsLfr3RRMrRphEuvTRserNcM8XVtoIVAtrjig/Gg0DPwDrN8Clm0L1j7iQay6S8D0g=="; }; }; "@cspotcode/source-map-consumer-0.8.0" = { @@ -3028,22 +3100,22 @@ let sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7"; }; }; - "@dabh/diagnostics-2.0.2" = { + "@dabh/diagnostics-2.0.3" = { name = "_at_dabh_slash_diagnostics"; packageName = "@dabh/diagnostics"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; - sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; + url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz"; + sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; - "@deltachat/message_parser_wasm-0.1.0" = { + "@deltachat/message_parser_wasm-0.3.0" = { name = "_at_deltachat_slash_message_parser_wasm"; packageName = "@deltachat/message_parser_wasm"; - version = "0.1.0"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@deltachat/message_parser_wasm/-/message_parser_wasm-0.1.0.tgz"; - sha512 = "Tp3kWY9rp73omU8afIm3Vijydg+WFrrbsbmlKNXPg4Ao3PDSHuY76zKzDuX22QxdW0KlXi/RaHQ1++zJm8+DBg=="; + url = "https://registry.npmjs.org/@deltachat/message_parser_wasm/-/message_parser_wasm-0.3.0.tgz"; + sha512 = "qMa6iZ5o8NoN3AE7orF71sL/FC9aqj0weP7X7dU1IwGsaWKSy1Ix1Pup5sw55HHlcfR1v61VXxnfHEmpQioydA=="; }; }; "@devicefarmer/adbkit-2.11.3" = { @@ -3073,13 +3145,13 @@ let sha512 = "HilPrVrCosYWqSyjfpDtaaN1kJwdlBpS+IAflP3z+e7nsEgk3JGJf1Vg0NgHJooTf5HDfXSyZqMVg+5jvXCK0g=="; }; }; - "@discoveryjs/json-ext-0.5.6" = { + "@discoveryjs/json-ext-0.5.7" = { name = "_at_discoveryjs_slash_json-ext"; packageName = "@discoveryjs/json-ext"; - version = "0.5.6"; + version = "0.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz"; - sha512 = "ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA=="; + url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"; + sha512 = "dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="; }; }; "@electron-forge/async-ora-6.0.0-beta.63" = { @@ -3244,22 +3316,22 @@ let sha512 = "CE5zjnyfmHlapwQSJ54kUeTNsvhx/7HAjvfMXpE689LxlFnr0VhiTxuc5kwEetPcxsXhei7IBy/PdJ41v4dswA=="; }; }; - "@electron/get-1.13.1" = { + "@electron/get-1.14.1" = { name = "_at_electron_slash_get"; packageName = "@electron/get"; - version = "1.13.1"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/get/-/get-1.13.1.tgz"; - sha512 = "U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA=="; + url = "https://registry.npmjs.org/@electron/get/-/get-1.14.1.tgz"; + sha512 = "BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw=="; }; }; - "@emmetio/abbreviation-2.2.2" = { + "@emmetio/abbreviation-2.2.3" = { name = "_at_emmetio_slash_abbreviation"; packageName = "@emmetio/abbreviation"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.2.2.tgz"; - sha512 = "TtE/dBnkTCct8+LntkqVrwqQao6EnPAs1YN3cUgxOxTaBlesBCY37ROUAVZrRlG64GNnVShdl/b70RfAI3w5lw=="; + url = "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.2.3.tgz"; + sha512 = "87pltuCPt99aL+y9xS6GPZ+Wmmyhll2WXH73gG/xpGcQ84DRnptBsI2r0BeIQ0EB/SQTOe2ANPqFqj3Rj5FOGA=="; }; }; "@emmetio/css-abbreviation-2.1.4" = { @@ -3289,22 +3361,22 @@ let sha512 = "8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA=="; }; }; - "@emotion/is-prop-valid-0.8.8" = { + "@emotion/is-prop-valid-1.1.2" = { name = "_at_emotion_slash_is-prop-valid"; packageName = "@emotion/is-prop-valid"; - version = "0.8.8"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz"; - sha512 = "u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA=="; + url = "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz"; + sha512 = "3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ=="; }; }; - "@emotion/memoize-0.7.4" = { + "@emotion/memoize-0.7.5" = { name = "_at_emotion_slash_memoize"; packageName = "@emotion/memoize"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz"; - sha512 = "Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="; + url = "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz"; + sha512 = "igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="; }; }; "@emotion/stylis-0.8.5" = { @@ -3343,13 +3415,13 @@ let sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@eslint/eslintrc-1.0.5" = { + "@eslint/eslintrc-1.2.1" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.0.5"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz"; - sha512 = "BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz"; + sha512 = "bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ=="; }; }; "@exodus/schemasafe-1.0.0-rc.6" = { @@ -3379,49 +3451,49 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-6.0.14" = { + "@expo/config-6.0.19" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "6.0.14"; + version = "6.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-6.0.14.tgz"; - sha512 = "CVnAGmXvAEYRYhXa7p1fZW9MzJtxE8cO0AGWdJIym4kyvxi6qkgeowmENEQUYKRk2s8Kq1+iY5krm2VXDqQV9w=="; + url = "https://registry.npmjs.org/@expo/config/-/config-6.0.19.tgz"; + sha512 = "UkLnnKnt4zP382K7s0UDnUNY646Gdw8PoDWnxaIGAL515R9IX8oWef7+7hX/dZMi27d/WLJPmWNRYsEL8Q/3rw=="; }; }; - "@expo/config-plugins-4.0.14" = { + "@expo/config-plugins-4.1.0" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "4.0.14"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.0.14.tgz"; - sha512 = "3UMo9STaIAQRAvtlXXIX83mrxWAh0prQYgVG+n2JRBwI9CWiRdj35W+jyXkTChtPYXGvW1JQF2xatjB8ituSvg=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.1.0.tgz"; + sha512 = "+Uq7kzi1StUZZZivnnqNV6+v8b+SMF6MDgH+cEZxCoM9uwLXOK0rTAURzBGtl+C6EEbKnoZmnKGuzABBGPRP7A=="; }; }; - "@expo/config-types-43.0.1" = { + "@expo/config-types-44.0.0" = { name = "_at_expo_slash_config-types"; packageName = "@expo/config-types"; - version = "43.0.1"; + version = "44.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-types/-/config-types-43.0.1.tgz"; - sha512 = "EtllpCGDdB/UdwAIs5YXJwBLpbFQNdlLLrxIvoILA9cXrpQMWkeDCT9lQPJzFRMFcLUaMuGvkzX2tR4tx5EQFQ=="; + url = "https://registry.npmjs.org/@expo/config-types/-/config-types-44.0.0.tgz"; + sha512 = "d+gpdKOAhqaD5RmcMzGgKzNtvE1w+GCqpFQNSXLliYlXjj+Tv0eL8EPeAdPtvke0vowpPFwd5McXLA90dgY6Jg=="; }; }; - "@expo/dev-server-0.1.101" = { + "@expo/dev-server-0.1.106" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.101"; + version = "0.1.106"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.101.tgz"; - sha512 = "VRL3sDJXGUiJK3dv+yY4QpK8b7FTk5Khxf0U96wrAFmsnTWh3EhH0kbOZa37+A+5rUm6jwAS3gUE58vE7Jaw8g=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.106.tgz"; + sha512 = "MEB5YuOkew2O4K3GTDLHS1PT/Ca7B/tGx4J+eH74QK6051PlmrikPA5/buuZd23ww/cmOAAKBw509agcbrpajg=="; }; }; - "@expo/dev-tools-0.13.138" = { + "@expo/dev-tools-0.13.146" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.138"; + version = "0.13.146"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.138.tgz"; - sha512 = "ud8dVfrA5TGfa9QZTcXD09otT8VeNX0MqECl/1X229xbzmgMXRuBoTVoIV+yxGIp2WtPmZlOe1g6gMzZTq+X8g=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.146.tgz"; + sha512 = "3bZe8He2uLha2SY1vOp2YnwtuXDHXodQwdkYdN/IL6XBveIKaBR9HDhBg/kBvI+/aNcut6ymwSSo9IOEmvUk5g=="; }; }; "@expo/devcert-1.0.0" = { @@ -3451,13 +3523,13 @@ let sha512 = "ZxtBodAZGxdLtgKzmsC+8ViUxt1mhFW642Clu2OuG3f6PAyAFsU/SqEGag9wKFaD3x3Wt8VhL+3y5fMJmUFgPw=="; }; }; - "@expo/metro-config-0.3.7" = { + "@expo/metro-config-0.3.12" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.3.7"; + version = "0.3.12"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.3.7.tgz"; - sha512 = "ps5HXXYjAsEpG9qxzKG59YA1kItDp+XWPwOzPtqnBwffcuL1xFYPzBCLGvYlVg+6qKs7xvSMLWHzh89pv8oa0w=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.3.12.tgz"; + sha512 = "8cvsMMe68BfZqNYIXeYDVtf6ijEHmJ27llhFKFwS8XZwKaqcfSLRANK8I8xxTc00tzXaWyE1BKJIY6DMq/gbJA=="; }; }; "@expo/osascript-2.0.31" = { @@ -3469,31 +3541,31 @@ let sha512 = "5OE8+Fb1mLu9EJNUOx5RcetkJZMXJxthVuIzHPlEZFEAZa3f/zQtJ6vA/hnt1BLZ2X9BR3OzBMALrUzVo95L2w=="; }; }; - "@expo/package-manager-0.0.48" = { + "@expo/package-manager-0.0.50" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.48"; + version = "0.0.50"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.48.tgz"; - sha512 = "mR+UytJc26XE3aGp8ug3MsgDKiOs4Uy5ATbjmoiYQmppJmmT9w14MVP5Iwe7ATwrCkvwqYyQ9uD8UknzCGcBCA=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.50.tgz"; + sha512 = "rDa1MkXFxZb3jj/a1iX12A+6DpWsZgtX8H0d5j+sYeCqjOARTvuvgNS9anpNbdhbGEXSu+1m8YGXK/QmBAo51Q=="; }; }; - "@expo/plist-0.0.16" = { + "@expo/plist-0.0.17" = { name = "_at_expo_slash_plist"; packageName = "@expo/plist"; - version = "0.0.16"; + version = "0.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/plist/-/plist-0.0.16.tgz"; - sha512 = "yQMt2CTm2VNLiHv2/EqHYrHvfflI2mFJd+DZIQQy569hvpZle0CxMPGH1p2KatbrO8htxJNvwrlR/4TIwhQJ5w=="; + url = "https://registry.npmjs.org/@expo/plist/-/plist-0.0.17.tgz"; + sha512 = "5Ul3d/YOYE6mfum0jCE25XUnkKHZ5vGlU/X2275ZmCtGrpRn1Fl8Nq+jQKSaks3NqTfxdyXROi/TgH8Zxeg2wg=="; }; }; - "@expo/prebuild-config-3.0.14" = { + "@expo/prebuild-config-3.1.0" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "3.0.14"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-3.0.14.tgz"; - sha512 = "YpPcjgHsILWlXVl3txPJ6lQNCc8JWbMp3EkXdyi6/glXYAHbOI8snTFeV2GOJH5X2y88C24u0sAParcaNuapiQ=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-3.1.0.tgz"; + sha512 = "Vwz2L3brsrvLVDBXj2gcB2QfeyAPKxa7rCOSFnPhyHf2qpxtmncv9IVrSdkHyWlPW7KmFVfiRsT3/nHXoataqQ=="; }; }; "@expo/rudder-sdk-node-1.1.1" = { @@ -3532,22 +3604,22 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.16.14" = { + "@expo/webpack-config-0.16.19" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.16.14"; + version = "0.16.19"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.14.tgz"; - sha512 = "yJQrnr1GBpVdE9xPMSOO2nsfbFieady0YT/RlB1tDUFGuZ4HJjN+h8vMx5n3eDnHRxZgiQSOHOFYLUQmVJ5IoA=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.19.tgz"; + sha512 = "VB8QNJ4Kvt46cy/y+AbBrJViOH2QY+AEfELNZRDifokZg0wPauxQCz/3Dk7qQnjLYsVOszoH7AtgfOdy/5NSjg=="; }; }; - "@expo/xcpretty-4.1.0" = { + "@expo/xcpretty-4.1.1" = { name = "_at_expo_slash_xcpretty"; packageName = "@expo/xcpretty"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-4.1.0.tgz"; - sha512 = "Q2FCVFpMEeWk2oxEx3nFg2AAwyzPdSAOVWa25f734+qCL9szL7sj20a53q4QH1T52BaGvdLoBaq/cNNCA5SzRg=="; + url = "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-4.1.1.tgz"; + sha512 = "2ssiyKGjgRUn61MSdSQyptV5lq1BtaT1DX80OjnCLvg+tXxIp2MVLZASSNqYqo8gQotghv35EpVrWBmOxMFuoQ=="; }; }; "@fast-csv/format-4.3.5" = { @@ -3568,112 +3640,175 @@ let sha512 = "uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA=="; }; }; - "@fluentui/date-time-utilities-7.9.1" = { + "@fluentui/date-time-utilities-8.5.0" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "7.9.1"; + version = "8.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.9.1.tgz"; - sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.5.0.tgz"; + sha512 = "SddqPNEA5PBxZLvRY9ej2//iTzNWFqBt9kZ9rjieBlRtFPjztnDV10Zq3xlR6ss79dwkiP+S+SP4SmI2xuckHA=="; }; }; - "@fluentui/dom-utilities-1.1.2" = { + "@fluentui/dom-utilities-2.2.0" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; - version = "1.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-1.1.2.tgz"; - sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw=="; + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.2.0.tgz"; + sha512 = "M4SmXu428wwQLu1iw6ST07iACjdKY5HiU+xpcgD3IQMMQazgN616GDzc6KZ1ebuBsF7B4TyQS7KZh9mfxnnldg=="; }; }; - "@fluentui/keyboard-key-0.2.17" = { + "@fluentui/font-icons-mdl2-8.2.5" = { + name = "_at_fluentui_slash_font-icons-mdl2"; + packageName = "@fluentui/font-icons-mdl2"; + version = "8.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.2.5.tgz"; + sha512 = "IgzcoOm+hZMlYJBR1RFb3fner1IxdSLCsnsjkVUtfnwuvGq/zjqEpNgsk5eUG4dHlu3E9dDY86nLqfGJe8R6yw=="; + }; + }; + "@fluentui/foundation-legacy-8.2.5" = { + name = "_at_fluentui_slash_foundation-legacy"; + packageName = "@fluentui/foundation-legacy"; + version = "8.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.5.tgz"; + sha512 = "PP8Wbw1QK9lmzReh+C7XG7A7Q3WTXAaxAMHjcBE3m2OPnhlF77Ok6IAJBkuKTWg0SZYQqJilTDSkVDnXVylGgQ=="; + }; + }; + "@fluentui/keyboard-key-0.4.0" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.2.17"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.17.tgz"; - sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.4.0.tgz"; + sha512 = "2jcD23FzOPaSXqWtfOSCzopkKtxTXUFuHZyVt4aqVRDEjPbkQ/7p37O1WL95xweWTR/9fEPO/gPtv9kOnXrJcA=="; }; }; - "@fluentui/react-7.181.0" = { + "@fluentui/merge-styles-8.5.0" = { + name = "_at_fluentui_slash_merge-styles"; + packageName = "@fluentui/merge-styles"; + version = "8.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.5.0.tgz"; + sha512 = "+WoaAaoYx/wfkrz1Ag40JqHvDUFfQcg+dQ3jaEOoau16y7EZGIe7oN8WYIXNMgWuMxH7r1QlanFbQZ+ziKjHmw=="; + }; + }; + "@fluentui/react-8.62.3" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.181.0"; + version = "8.62.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.181.0.tgz"; - sha512 = "GZHYe0rCcWubW6OslY2JOMlM7Hotn3ZdzWJHO/64MHqi1cbCUJppMaA/8IfFF7P5eFr8ojvpVSy9D7CQPDVq3A=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.62.3.tgz"; + sha512 = "ENfTetlsI74k4vgJ3574mWSoRv7kcwUMow+7GBFBw3EZcwnkUXPG6FubzuLBbn36X8MjeRSi8pnaR6T73GaBOw=="; }; }; - "@fluentui/react-focus-7.18.1" = { + "@fluentui/react-focus-8.5.6" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.18.1"; + version = "8.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.18.1.tgz"; - sha512 = "WXXkMR3t5mr9m5hg5vRWH/JZ+kaZmbuTGpTA7E7uc+Ag/RZfG/uVN+ZwBdDpP6Xg7+6f3wlkGCBtY/UDcW6qmw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.5.6.tgz"; + sha512 = "K4INgXiwlinLz0Msa5TQbhL3YoN1mtqXO3p7XChDKeIf0QepAUDTnmJCrtKXqzY5VuXauLXyqm2darcHFrotVw=="; }; }; - "@fluentui/react-window-provider-1.0.2" = { + "@fluentui/react-hooks-8.5.3" = { + name = "_at_fluentui_slash_react-hooks"; + packageName = "@fluentui/react-hooks"; + version = "8.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.5.3.tgz"; + sha512 = "zWiiEp/vYmKIXhw/bIVH9BnPKLT3zgWt9ryi3Tp1VVgxLEDloomM7RgDn0e2P8HZvynYRRT8GKq3XJ8H3AzAUg=="; + }; + }; + "@fluentui/react-window-provider-2.2.0" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "1.0.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-1.0.2.tgz"; - sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.2.0.tgz"; + sha512 = "1iZzfVQHZQn6IJSJD1pxnXi5H8T3vrZYi9aqKyVIPZ12DCTVE2gw8W3mnOjsfVuXMGdv1sA7dgd6v4xi9erBow=="; }; }; - "@fluentui/theme-1.7.4" = { + "@fluentui/set-version-8.2.0" = { + name = "_at_fluentui_slash_set-version"; + packageName = "@fluentui/set-version"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.2.0.tgz"; + sha512 = "bqjpfhqaIkBy16vdYzdc7tER9Td7BTcmC+kCXuqkHOQVuG9LJfqVGRV0DA857KLhOxiy0GXwKMeDbNV5jJf6qQ=="; + }; + }; + "@fluentui/style-utilities-8.6.5" = { + name = "_at_fluentui_slash_style-utilities"; + packageName = "@fluentui/style-utilities"; + version = "8.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.6.5.tgz"; + sha512 = "X0ZIreRdUlnJnRQmKtngWEbrqFuecBlEv9fkKoHJeu+27AD+AU9RPYgK4fd/QCJRFoTU9WzQJj9tWylTBK+kFA=="; + }; + }; + "@fluentui/theme-2.6.4" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "1.7.4"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.7.4.tgz"; - sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.4.tgz"; + sha512 = "MXCY2Z5zc1nK5PCN6tqhI1nplX/LF+8lF8YsrSGvu6VDnHilxi4Rifv2dRc+jybNI13tZ50uteok2Je7jABcMA=="; }; }; - "@gar/promisify-1.1.2" = { + "@fluentui/utilities-8.8.1" = { + name = "_at_fluentui_slash_utilities"; + packageName = "@fluentui/utilities"; + version = "8.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.8.1.tgz"; + sha512 = "JtICpdTINvifiyjp/LxxuDiU8BMkU73mzAP/3mz5KIhqPn3QjKG9ZeaBLPpoUXNOP/I6i9AYbAQHDvQI/ZK5tg=="; + }; + }; + "@gar/promisify-1.1.3" = { name = "_at_gar_slash_promisify"; packageName = "@gar/promisify"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz"; - sha512 = "82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="; + url = "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz"; + sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; }; - "@gitbeaker/core-35.1.0" = { + "@gitbeaker/core-35.6.0" = { name = "_at_gitbeaker_slash_core"; packageName = "@gitbeaker/core"; - version = "35.1.0"; + version = "35.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/core/-/core-35.1.0.tgz"; - sha512 = "DM9w3wgrS8GoXMLJb0DL2VSxTvP3yoaGDfX2d8n3wMGSjZbCknh3YnbVG/OfnaPbh9PH71kGll3SY5rJgz7XJg=="; + url = "https://registry.npmjs.org/@gitbeaker/core/-/core-35.6.0.tgz"; + sha512 = "ZhaDUs/4BxHODfjRkVmwkWxZVaFIpYduxaj28+J+4FH9X93WZp0IsyT4szcFM7FwAbRW2+ZvGeEfw4NQwgB/RA=="; }; }; - "@gitbeaker/node-35.1.0" = { + "@gitbeaker/node-35.6.0" = { name = "_at_gitbeaker_slash_node"; packageName = "@gitbeaker/node"; - version = "35.1.0"; + version = "35.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/node/-/node-35.1.0.tgz"; - sha512 = "t0lXqSuY93jVffo6WMeo4tvZtkMQXPKuGb1qNh3HOuW4+KyEqmrdQnorGyyRYH7uRTmQeHEe33BL1Ttc5F5YrA=="; + url = "https://registry.npmjs.org/@gitbeaker/node/-/node-35.6.0.tgz"; + sha512 = "cJBxZdh8elrdLA8V4yEdISGinycESNaIO8JEIyAhemsovqv29XCJ40A9TBA4RlKNjkKVyVSN23BvcZimgqZSzA=="; }; }; - "@gitbeaker/requester-utils-35.1.0" = { + "@gitbeaker/requester-utils-35.6.0" = { name = "_at_gitbeaker_slash_requester-utils"; packageName = "@gitbeaker/requester-utils"; - version = "35.1.0"; + version = "35.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-35.1.0.tgz"; - sha512 = "00aQYCxs3wBHrD5HGWh0l1FRsX1NYJ1GEq4Reyo1NpVgjwzO/T1jjMFy3jikjJ+UGeg0sfqV9h91mwtCQ4SmRA=="; + url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-35.6.0.tgz"; + sha512 = "5IVzv1gO626qaC7CEV7LUG68IHgEjWovIHXQsbI9MraxhrI9eSV5/l/81Povv7tJlni7u8OnARPU7bmxlXlx7g=="; }; }; - "@google-cloud/paginator-3.0.6" = { + "@google-cloud/paginator-3.0.7" = { name = "_at_google-cloud_slash_paginator"; packageName = "@google-cloud/paginator"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.6.tgz"; - sha512 = "XCTm/GfQIlc1ZxpNtTSs/mnZxC2cePNhxU3X8EzHXKIJ2JFncmJj2Fcd2IP+gbmZaSZnY0juFxbUCkIeuu/2eQ=="; + url = "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.7.tgz"; + sha512 = "jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ=="; }; }; "@google-cloud/precise-date-2.0.4" = { @@ -3703,22 +3838,22 @@ let sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; }; }; - "@google-cloud/pubsub-2.18.4" = { + "@google-cloud/pubsub-2.19.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.18.4"; + version = "2.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.18.4.tgz"; - sha512 = "mgKZ7XdXN7MEGK+MCmRKuoq3GBiuYIa9ytYuV1DIHbd+eYqqyPYZHvL8g/73eogkNYK5TxSydja7TCRDzfJaxA=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.19.0.tgz"; + sha512 = "aNgaS7zI6MkE4hrhmxrGiyFZHPvb0BW1djk0D5RoKDwPb8GTuYBfu8w/3twTvaf+HiM7NchvPtdFRbiETIaadw=="; }; }; - "@grammyjs/types-2.5.1" = { + "@grammyjs/types-2.6.0" = { name = "_at_grammyjs_slash_types"; packageName = "@grammyjs/types"; - version = "2.5.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@grammyjs/types/-/types-2.5.1.tgz"; - sha512 = "ZJ+X+w5qo6YxCRDWt63+SD2iX+xitP3Z7ieLUWw1b7OanljAMjPRry2PvBRoA1Zg0nFqulxFtiAHxxN1v8BXiQ=="; + url = "https://registry.npmjs.org/@grammyjs/types/-/types-2.6.0.tgz"; + sha512 = "eWckBf25l6xwSS2YO6Ioyf2BDEO7tyNZhgRLl5PzsdvqlHQR+XYTdKwhevsqLG4Y+zmF6hEXnuNTYu+HF8W8Sg=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -3748,13 +3883,13 @@ let sha512 = "IuR2SB2MnC2ztA/XeTMTfWcA0Wy7ZH5u+nDkDNLAdX+AaSyDnsQS35sCmHqG0VOGTl7rzoyBWLCKGwSJplgtwg=="; }; }; - "@graphql-tools/batch-execute-8.3.1" = { + "@graphql-tools/batch-execute-8.4.1" = { name = "_at_graphql-tools_slash_batch-execute"; packageName = "@graphql-tools/batch-execute"; - version = "8.3.1"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.3.1.tgz"; - sha512 = "63kHY8ZdoO5FoeDXYHnAak1R3ysMViMPwWC2XUblFckuVLMUPmB2ONje8rjr2CvzWBHAW8c1Zsex+U3xhKtGIA=="; + url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.4.1.tgz"; + sha512 = "63+lNWrwXmofjZVa7ML+n9CBviClF3K+RP3Xx3hxGQ8BrhvB1pWS1yzaUZqrkiiKdTu1v3mJGVfmooHwzlyPwQ=="; }; }; "@graphql-tools/delegate-7.1.5" = { @@ -3766,13 +3901,13 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/delegate-8.4.3" = { + "@graphql-tools/delegate-8.7.0" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "8.4.3"; + version = "8.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.4.3.tgz"; - sha512 = "hKTJdJXJnKL0+2vpU+Kt7OHQTIXZ9mBmNBwHsYiG5WNArz/vNI7910r6TC2XMf/e7zhyyK+mXxMDBmDQkkJagA=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.7.0.tgz"; + sha512 = "tsmNFV8nVvPY2nApCj69ck32/Jdj44rYbUZx+cpyUWOzfbUT1iu0d1mUwn5UeHuGnB+Bzgn3fuTypg97mDEyEw=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -3784,22 +3919,22 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/graphql-file-loader-7.3.3" = { + "@graphql-tools/graphql-file-loader-7.3.7" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "7.3.3"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.3.tgz"; - sha512 = "6kUJZiNpYKVhum9E5wfl5PyLLupEDYdH7c8l6oMrk6c7EPEVs6iSUyB7yQoWrtJccJLULBW2CRQ5IHp5JYK0mA=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.7.tgz"; + sha512 = "fwXLycYvabPhusGtYuFrOPbjeIvLWr6viGkQc9KmiBm2Z2kZrlNRNUlYkXXRzMoiqRkzqFJYhOgWDE7LsOnbjw=="; }; }; - "@graphql-tools/import-6.6.5" = { + "@graphql-tools/import-6.6.9" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.6.5"; + version = "6.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.5.tgz"; - sha512 = "w0/cYuhrr2apn+iGoTToCqt65x2NN2iHQyqRNk/Zw1NJ+e8/C3eKVw0jmW4pYQvSocuPxL4UCSI56SdKO7m3+Q=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.9.tgz"; + sha512 = "sKaLqvPmNLQlY4te+nnBhRrf5WBISoiyVkbriCLz0kHw805iHdJaU2KxUoHsRTR7WlYq0g9gzB0oVaRh99Q5aA=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -3811,13 +3946,13 @@ let sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA=="; }; }; - "@graphql-tools/json-file-loader-7.3.3" = { + "@graphql-tools/json-file-loader-7.3.7" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "7.3.3"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.3.tgz"; - sha512 = "CN2Qk9rt+Gepa3rb3X/mpxYA5MIYLwZBPj2Njw6lbZ6AaxG+O1ArDCL5ACoiWiBimn1FCOM778uhRM9znd0b3Q=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.7.tgz"; + sha512 = "dm0LcfiWYin7cUR4RWC33C9bNppujvSU7hwTH+sHmSguNnat9Kn8dBntVSgrY3qCbKuGfz/PshQHIODXrRwAKg=="; }; }; "@graphql-tools/load-6.2.4" = { @@ -3829,13 +3964,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/load-7.5.1" = { + "@graphql-tools/load-7.5.5" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "7.5.1"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.1.tgz"; - sha512 = "j9XcLYZPZdl/TzzqA83qveJmwcCxgGizt5L1+C1/Z68brTEmQHLdQCOR3Ma3ewESJt6DU05kSTu2raKaunkjRg=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.5.tgz"; + sha512 = "qPasit140nwTbMQbFCfZcgaS7q/0+xMQGdkMGU11rtHt6/jMgJIKDUU8/fJGKltNY3EeHlEdVtZmggZD7Rr6bA=="; }; }; "@graphql-tools/merge-6.2.17" = { @@ -3847,13 +3982,13 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-8.2.1" = { + "@graphql-tools/merge-8.2.6" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.2.1"; + version = "8.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.1.tgz"; - sha512 = "Q240kcUszhXiAYudjuJgNuLgy9CryDP3wp83NOZQezfA6h3ByYKU7xI6DiKrdjyVaGpYN3ppUmdj0uf5GaXzMA=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.6.tgz"; + sha512 = "dkwTm4czMISi/Io47IVvq2Fl9q4TIGKpJ0VZjuXYdEFkECyH6A5uwxZfPVandZG+gQs8ocFFoa6RisiUJLZrJw=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -3865,13 +4000,13 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/schema-8.3.1" = { + "@graphql-tools/schema-8.3.5" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.3.1"; + version = "8.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.1.tgz"; - sha512 = "3R0AJFe715p4GwF067G5i0KCr/XIdvSfDLvTLEiTDQ8V/hwbOHEKHKWlEBHGRQwkG5lwFQlW1aOn7VnlPERnWQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.5.tgz"; + sha512 = "3mJ/K7TdL+fnEUtCUqF4qkh1fcNMzaxgwKgO9fSYSTS7zyT16hbi5XSulSTshygHgaD2u+MO588iR4ZJcbZcIg=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -3883,13 +4018,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.7.0" = { + "@graphql-tools/url-loader-7.9.7" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.7.0"; + version = "7.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.7.0.tgz"; - sha512 = "mBBb+aJqI4E0MVEzyfi76Pi/G6lGxGTVt/tP1YtKJly7UnonNoWOtDusdL3zIVAGhGgLsNrLbGhLDbwSd6TV6A=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.7.tgz"; + sha512 = "cJoZcv6oJrhArRPmSnw8wcqnz7F8p+HzwvjoJyHbs0ne2jTXazD+LOHaXMAa1L7lKK2YmH2Txy8pOI76JnvUiQ=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -3919,13 +4054,13 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; - "@graphql-tools/utils-8.6.1" = { + "@graphql-tools/utils-8.6.5" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "8.6.1"; + version = "8.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.1.tgz"; - sha512 = "uxcfHCocp4ENoIiovPxUWZEHOnbXqj3ekWc0rm7fUhW93a1xheARNHcNKhwMTR+UKXVJbTFQdGI1Rl5XdyvDBg=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.5.tgz"; + sha512 = "mjOtaWiS2WIqRz/cq5gaeM3sVrllcu2xbtHROw1su1v3xWa3D3dKgn8Lrl7+tvWs5WUVySsBss/VZ3WdoPkCrA=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -3937,13 +4072,13 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; - "@graphql-tools/wrap-8.3.3" = { + "@graphql-tools/wrap-8.4.9" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "8.3.3"; + version = "8.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.3.3.tgz"; - sha512 = "TpXN1S4Cv+oMA1Zsg9Nu4N9yrFxLuJkX+CTtSRrrdfETGHIxqfyDkm5slPDCckxP+RILA00g8ny2jzsYyNvX1w=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.9.tgz"; + sha512 = "YFb34itVWyE3sMifvPRqvYjXYpjJle2hkq9nIELQOumc1yqxT7jf/+YnNZalS1DoOdWn4GbDmqO/uljf6AuuDA=="; }; }; "@grpc/grpc-js-1.4.4" = { @@ -3955,49 +4090,31 @@ let sha512 = "a6222b7Dl6fIlMgzVl7e+NiRoLiZFbpcwvBH2Oli56Bn7W4/3Ld+86hK4ffPn5rx2DlDidmIcvIJiOQXyhv9gA=="; }; }; - "@grpc/grpc-js-1.4.5" = { + "@grpc/grpc-js-1.5.10" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; - version = "1.4.5"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.4.5.tgz"; - sha512 = "A6cOzSu7dqXZ7rzvh/9JZf+Jg/MOpLEMP0IdT8pT8hrWJZ6TB4ydN/MRuqOtAugInJe/VQ9F8BPricUpYZSaZA=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.10.tgz"; + sha512 = "++oAubX/7rJzlqH0ShyzDENNNDHYrlttdc3NM40KlaVQDcgGqQknuPoavmyTC+oNUDyxPCX5dHceKhfcgN3tiw=="; }; }; - "@grpc/grpc-js-1.4.6" = { + "@grpc/grpc-js-1.5.4" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; - version = "1.4.6"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.4.6.tgz"; - sha512 = "Byau4xiXfIixb1PnW30V/P9mkrZ05lknyNqiK+cVY9J5hj3gecxd/anwaUbAM8j834zg1x78NvAbwGnMfWEu7A=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.4.tgz"; + sha512 = "+nJTOsqpFAXnfFrMZ7Too4XXZ/J9O+8jYvSoaunupoC7I7b9H4iex1BRsbTdOmiowfPGJrWit7jUPmbENSUSpw=="; }; }; - "@grpc/grpc-js-1.5.0" = { + "@grpc/grpc-js-1.5.7" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; - version = "1.5.0"; + version = "1.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.0.tgz"; - sha512 = "PDLazk94MFV5hFn/+aSrVj3d5UsOK9HU1xa0ywachvDh1jymBU/Cb+4nGa2NjpfcBoXlHioBC/qIB/XzELednw=="; - }; - }; - "@grpc/grpc-js-1.5.1" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.1.tgz"; - sha512 = "ItOqQ4ff7JrR9W6KDQm+LdsVjuZtV7Qq64Oy3Hjx8ZPBDDwBx7rD8hOL0Vnde0RbnsqLG86WOgF+tQDzf/nSzQ=="; - }; - }; - "@grpc/grpc-js-1.5.3" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.3.tgz"; - sha512 = "q0xgaZ3ymUM+ZOhe1hdocVSdKHCnJ6llLSXcP+MqMXMyYPUZ3mzQOCxZ3Zkg+QZ7sZ950sn7hvueQrIJZumPZg=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.7.tgz"; + sha512 = "RAlSbZ9LXo0wNoHKeUlwP9dtGgVBDUbnBKFpfAv5iSqMG4qWz9um2yLH215+Wow1I48etIa1QMS+WAGmsE/7HQ=="; }; }; "@grpc/proto-loader-0.6.6" = { @@ -4009,15 +4126,6 @@ let sha512 = "cdMaPZ8AiFz6ua6PUbP+LKbhwJbFXnrQ/mlnKGUyzDUZ3wp7vPLksnmLCBX6SHgSmjX7CbNVNLFYD5GmmjO4GQ=="; }; }; - "@grpc/proto-loader-0.6.7" = { - name = "_at_grpc_slash_proto-loader"; - packageName = "@grpc/proto-loader"; - version = "0.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.7.tgz"; - sha512 = "QzTPIyJxU0u+r2qGe8VMl3j/W2ryhEvBv7hc42OjYfthSj370fUrb7na65rG6w3YLZS/fb8p89iTBobfWGDgdw=="; - }; - }; "@grpc/proto-loader-0.6.9" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -4027,13 +4135,13 @@ let sha512 = "UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg=="; }; }; - "@gulp-sourcemaps/identity-map-1.0.2" = { + "@gulp-sourcemaps/identity-map-2.0.1" = { name = "_at_gulp-sourcemaps_slash_identity-map"; packageName = "@gulp-sourcemaps/identity-map"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz"; - sha512 = "ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ=="; + url = "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz"; + sha512 = "Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q=="; }; }; "@gulp-sourcemaps/map-sources-1.0.0" = { @@ -4126,13 +4234,13 @@ let sha512 = "2JYy//YE2YINTe21hpdVMBNc7aYFkgDeY9JUz/BCjFZmYLn0UjGaCc4BpTcMGXNJwuqoUenw2WGOFGHsJqlIDw=="; }; }; - "@hpcc-js/wasm-1.4.1" = { + "@hpcc-js/wasm-1.12.8" = { name = "_at_hpcc-js_slash_wasm"; packageName = "@hpcc-js/wasm"; - version = "1.4.1"; + version = "1.12.8"; src = fetchurl { - url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-1.4.1.tgz"; - sha512 = "WYeIuG/B1B1cTcM9D9bC6qDFSZnEcJ9R3SpTW5jh10sTh0hD1h1t/dZudfLwarJD+ce8q4/BP43BplbP3CeNkQ=="; + url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-1.12.8.tgz"; + sha512 = "n4q9ARKco2hpCLsuVaW6Az3cDVaua7B3DSONHkc49WtEzgY/btvcDG5Zr1P6PZDv0sQ7oPnAi9Y+W2DI++MgcQ=="; }; }; "@humanwhocodes/config-array-0.5.0" = { @@ -4144,22 +4252,13 @@ let sha512 = "FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="; }; }; - "@humanwhocodes/config-array-0.6.0" = { + "@humanwhocodes/config-array-0.9.5" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.6.0"; + version = "0.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.6.0.tgz"; - sha512 = "JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A=="; - }; - }; - "@humanwhocodes/config-array-0.9.2" = { - name = "_at_humanwhocodes_slash_config-array"; - packageName = "@humanwhocodes/config-array"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.2.tgz"; - sha512 = "UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz"; + sha512 = "ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw=="; }; }; "@humanwhocodes/object-schema-1.2.1" = { @@ -4261,6 +4360,15 @@ let sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; }; }; + "@intervolga/optimize-cssnano-plugin-1.0.6" = { + name = "_at_intervolga_slash_optimize-cssnano-plugin"; + packageName = "@intervolga/optimize-cssnano-plugin"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz"; + sha512 = "zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA=="; + }; + }; "@ionic/cli-framework-3.0.6" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; @@ -4396,6 +4504,24 @@ let sha512 = "4z6p4jLGSthc8gQ7wu4nHfGYn/IgCKFr+7hjuf80VdXUs7sm029mZGGDpS8sb29PVZWUBvMMTBCVGFhH2nN4Vw=="; }; }; + "@jest/environment-27.5.1" = { + name = "_at_jest_slash_environment"; + packageName = "@jest/environment"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz"; + sha512 = "/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA=="; + }; + }; + "@jest/fake-timers-27.5.1" = { + name = "_at_jest_slash_fake-timers"; + packageName = "@jest/fake-timers"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz"; + sha512 = "/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ=="; + }; + }; "@jest/transform-25.5.1" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; @@ -4423,6 +4549,15 @@ let sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; }; }; + "@jest/types-27.5.1" = { + name = "_at_jest_slash_types"; + packageName = "@jest/types"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz"; + sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw=="; + }; + }; "@joplin/fork-htmlparser2-4.1.39" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; @@ -4495,6 +4630,33 @@ let sha512 = "CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg=="; }; }; + "@jridgewell/resolve-uri-3.0.5" = { + name = "_at_jridgewell_slash_resolve-uri"; + packageName = "@jridgewell/resolve-uri"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz"; + sha512 = "VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew=="; + }; + }; + "@jridgewell/sourcemap-codec-1.4.11" = { + name = "_at_jridgewell_slash_sourcemap-codec"; + packageName = "@jridgewell/sourcemap-codec"; + version = "1.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz"; + sha512 = "Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="; + }; + }; + "@jridgewell/trace-mapping-0.3.4" = { + name = "_at_jridgewell_slash_trace-mapping"; + packageName = "@jridgewell/trace-mapping"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz"; + sha512 = "vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ=="; + }; + }; "@jsdevtools/ono-7.1.3" = { name = "_at_jsdevtools_slash_ono"; packageName = "@jsdevtools/ono"; @@ -4504,22 +4666,49 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/check-node-1.52.1" = { + "@jsii/check-node-1.55.1" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.52.1"; + version = "1.55.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.52.1.tgz"; - sha512 = "B+vpPwXrKTWA1dBHuStp0sg+YpFZ9APjS6qeDiknMHPMatlT7VA0RVk/LmCLaPZhsfNzByJ+zhRFs0R83zTr1Q=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.55.1.tgz"; + sha512 = "JC9b+y4CXdIICDE6fYjaN0VKPc65lz4dj1T4lnaqMfbXIBGB7sBMLQJ/szVc9U3Z+o/HBzCJndNn86kGRM+lqw=="; }; }; - "@jsii/spec-1.52.1" = { + "@jsii/spec-1.55.1" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.52.1"; + version = "1.55.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.52.1.tgz"; - sha512 = "Mt5yzqR/DYZhxjOBTuQsstYh0gdlwSWvjTAfUGf5Rp76j8gddkADlrMRFeVrXBy/Y+ccJLUYWMSsEf1Ti6ERcQ=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.55.1.tgz"; + sha512 = "KSKKN04eO0rTaqzw6j9RTx8HAzhePdmWRC3iJQ90QeZLv/L8Pj4l+nZ4wn77BGxmeULpXkGXUKbhkceArdr4GA=="; + }; + }; + "@juggle/resize-observer-3.3.1" = { + name = "_at_juggle_slash_resize-observer"; + packageName = "@juggle/resize-observer"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.1.tgz"; + sha512 = "zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw=="; + }; + }; + "@koa/multer-3.0.0" = { + name = "_at_koa_slash_multer"; + packageName = "@koa/multer"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@koa/multer/-/multer-3.0.0.tgz"; + sha512 = "y+OQBmex5D1jIl723gAEUYcAWPEicIXppaAKw/zCMfpllQ08ZNweDPwoCLxEoatqd5pCu2XG6V8dl67JRq3RJw=="; + }; + }; + "@koa/router-10.1.1" = { + name = "_at_koa_slash_router"; + packageName = "@koa/router"; + version = "10.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@koa/router/-/router-10.1.1.tgz"; + sha512 = "ORNjq5z4EmQPriKbR0ER3k4Gh7YGNhWDL7JBW+8wXDrHLbWYKYSJaOJ9aN06npF5tbTxe2JBOsurpJDAvjiXKw=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -4540,6 +4729,123 @@ let sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; }; }; + "@ledgerhq/devices-5.51.1" = { + name = "_at_ledgerhq_slash_devices"; + packageName = "@ledgerhq/devices"; + version = "5.51.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ledgerhq/devices/-/devices-5.51.1.tgz"; + sha512 = "4w+P0VkbjzEXC7kv8T1GJ/9AVaP9I6uasMZ/JcdwZBS3qwvKo5A5z9uGhP5c7TvItzcmPb44b5Mw2kT+WjUuAA=="; + }; + }; + "@ledgerhq/devices-6.24.1" = { + name = "_at_ledgerhq_slash_devices"; + packageName = "@ledgerhq/devices"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ledgerhq/devices/-/devices-6.24.1.tgz"; + sha512 = "6SNXWXxojUF6WKXMVIbRs15Mveg+9k0RKJK/PKlwZh929Lnr/NcbONWdwPjWKZAp1g82eEPT4jIkG6qc4QXlcA=="; + }; + }; + "@ledgerhq/errors-5.50.0" = { + name = "_at_ledgerhq_slash_errors"; + packageName = "@ledgerhq/errors"; + version = "5.50.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ledgerhq/errors/-/errors-5.50.0.tgz"; + sha512 = "gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow=="; + }; + }; + "@ledgerhq/errors-6.10.0" = { + name = "_at_ledgerhq_slash_errors"; + packageName = "@ledgerhq/errors"; + version = "6.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.10.0.tgz"; + sha512 = "fQFnl2VIXh9Yd41lGjReCeK+Q2hwxQJvLZfqHnKqWapTz68NHOv5QcI0OHuZVNEbv0xhgdLhi5b65kgYeQSUVg=="; + }; + }; + "@ledgerhq/hw-transport-5.51.1" = { + name = "_at_ledgerhq_slash_hw-transport"; + packageName = "@ledgerhq/hw-transport"; + version = "5.51.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-5.51.1.tgz"; + sha512 = "6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw=="; + }; + }; + "@ledgerhq/hw-transport-6.24.1" = { + name = "_at_ledgerhq_slash_hw-transport"; + packageName = "@ledgerhq/hw-transport"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.24.1.tgz"; + sha512 = "cOhxkQJrN7DvPFLLXAS2nqAZ7NIDaFqnbgu9ugTccgbJm2/z7ClRZX/uQoI4FscswZ47MuJQdXqz4nK48phteQ=="; + }; + }; + "@ledgerhq/hw-transport-node-hid-6.24.1" = { + name = "_at_ledgerhq_slash_hw-transport-node-hid"; + packageName = "@ledgerhq/hw-transport-node-hid"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.24.1.tgz"; + sha512 = "onbxunq8FsiY2sVRR+jRCjC1nx376ANuAtnQsmoHsgxONOVTb5asXWWOV4Cjm8y7RZTCtDw3d1fbziEGRhwiqA=="; + }; + }; + "@ledgerhq/hw-transport-node-hid-noevents-6.24.1" = { + name = "_at_ledgerhq_slash_hw-transport-node-hid-noevents"; + packageName = "@ledgerhq/hw-transport-node-hid-noevents"; + version = "6.24.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.24.1.tgz"; + sha512 = "z3uXCU13oayRX51MOaTREdrn83ujrBkccdXn3ljdMy4H3pmAvG6QGn4m30gursEUUJkogA6dkcXs3G8IRfOdxA=="; + }; + }; + "@ledgerhq/hw-transport-u2f-5.36.0-deprecated" = { + name = "_at_ledgerhq_slash_hw-transport-u2f"; + packageName = "@ledgerhq/hw-transport-u2f"; + version = "5.36.0-deprecated"; + src = fetchurl { + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-u2f/-/hw-transport-u2f-5.36.0-deprecated.tgz"; + sha512 = "T/+mGHIiUK/ZQATad6DMDmobCMZ1mVST952009jKzhaE1Et2Uy2secU+QhRkx3BfEAkvwa0zSRSYCL9d20Iqjg=="; + }; + }; + "@ledgerhq/hw-transport-webhid-5.51.1" = { + name = "_at_ledgerhq_slash_hw-transport-webhid"; + packageName = "@ledgerhq/hw-transport-webhid"; + version = "5.51.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-webhid/-/hw-transport-webhid-5.51.1.tgz"; + sha512 = "w/2qSU0vwFY+D/4ucuYRViO7iS3Uuxmj9sI/Iiqkoiax9Xppb0/6H5m3ffKv6iPMmRYbgwCgXorqx4SLLSD8Kg=="; + }; + }; + "@ledgerhq/hw-transport-webusb-5.53.1" = { + name = "_at_ledgerhq_slash_hw-transport-webusb"; + packageName = "@ledgerhq/hw-transport-webusb"; + version = "5.53.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-webusb/-/hw-transport-webusb-5.53.1.tgz"; + sha512 = "A/f+xcrkIAZiJrvPpDvsrjxQX4cI2kbdiunQkwsYmOG3Bp4z89ZnsBiC7YBst4n2/g+QgTg0/KPVtODU5djooQ=="; + }; + }; + "@ledgerhq/logs-5.50.0" = { + name = "_at_ledgerhq_slash_logs"; + packageName = "@ledgerhq/logs"; + version = "5.50.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ledgerhq/logs/-/logs-5.50.0.tgz"; + sha512 = "swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA=="; + }; + }; + "@ledgerhq/logs-6.10.0" = { + name = "_at_ledgerhq_slash_logs"; + packageName = "@ledgerhq/logs"; + version = "6.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@ledgerhq/logs/-/logs-6.10.0.tgz"; + sha512 = "lLseUPEhSFUXYTKj6q7s2O3s2vW2ebgA11vMAlKodXGf5AFw4zUoEbTz9CoFOC9jS6xY4Qr8BmRnxP/odT4Uuw=="; + }; + }; "@leichtgewicht/ip-codec-2.0.3" = { name = "_at_leichtgewicht_slash_ip-codec"; packageName = "@leichtgewicht/ip-codec"; @@ -5260,139 +5566,148 @@ let sha512 = "7AQsO0hMmpqDledV7AhBuSYqYPFsKP9PaltMecX9nlnsyFxqtsqUg9/pvB2L/jxvskrDrNkdKYz2KTbQznCtng=="; }; }; - "@mdn/browser-compat-data-4.0.11" = { + "@mdi/font-6.5.95" = { + name = "_at_mdi_slash_font"; + packageName = "@mdi/font"; + version = "6.5.95"; + src = fetchurl { + url = "https://registry.npmjs.org/@mdi/font/-/font-6.5.95.tgz"; + sha512 = "ES5rj6J39FUkHe/b3C9SJs8bqIungYhuU7rBINTBaHOv/Ce4RCb3Gw08CZVl32W33UEkgRkzyWaIedV4at+QHg=="; + }; + }; + "@mdn/browser-compat-data-4.1.12" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; - version = "4.0.11"; + version = "4.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-4.0.11.tgz"; - sha512 = "rmQPBLe3/DuJy0Bcr1KNuSiIcgV67R2AeLxagKMQTI0R8F9lLC894wJRYhA5ytV0CIi7dzxILqdFeuVbqrkoCA=="; + url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-4.1.12.tgz"; + sha512 = "y3Ntio6hb5+m6asxcA3nnIN6URjAFMji2EZZVYGd2Ag5On4mmvPhMnXdiIScCMXgHjFX+5qXuKaojLLhJHZPAg=="; }; }; - "@medable/mdctl-api-1.0.62" = { + "@medable/mdctl-api-1.0.63" = { name = "_at_medable_slash_mdctl-api"; packageName = "@medable/mdctl-api"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-api/-/mdctl-api-1.0.62.tgz"; - sha512 = "kXyaE+UH34LIR0AiO4nve/byQGARc9N/Q9Opf9wsbHgChHBUvv67/2i04eQs5N2CauLBVfI6H8UoXqzLUm7qAA=="; + url = "https://registry.npmjs.org/@medable/mdctl-api/-/mdctl-api-1.0.63.tgz"; + sha512 = "B4AgY+HGy7nJpGCY1+88F74NeXEJbmKGud5sgWaBOXHnOweNHvqWb0c2Fkn5A2LxiYPXpDvmGmiypCHubqJlQg=="; }; }; - "@medable/mdctl-core-1.0.62" = { + "@medable/mdctl-core-1.0.63" = { name = "_at_medable_slash_mdctl-core"; packageName = "@medable/mdctl-core"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-core/-/mdctl-core-1.0.62.tgz"; - sha512 = "1lRrAZw7gfaQF9iAlV5MgnOVzujetX7K5n/11wzCaIEZct9vBTSVNtI/zHNjWgyoud0LMC6w8qtRcjbgSgjcfQ=="; + url = "https://registry.npmjs.org/@medable/mdctl-core/-/mdctl-core-1.0.63.tgz"; + sha512 = "XDZS5TN6d7BuHmIFi83P8MPg1zioiOzPFkq/S27DZ0Oa7Z9tW+w29IG0ltYZ6/uFuo8Z0VPiu9MdwM2vmzIPKQ=="; }; }; - "@medable/mdctl-core-schemas-1.0.62" = { + "@medable/mdctl-core-schemas-1.0.63" = { name = "_at_medable_slash_mdctl-core-schemas"; packageName = "@medable/mdctl-core-schemas"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-core-schemas/-/mdctl-core-schemas-1.0.62.tgz"; - sha512 = "nyq59XISru4gnueEk5mpU77TxuR9hsqtzpSo/I2IhA/ZbIjDoBatm+/HK3ttX9UA+rkueK1bngRLEanZFHjUeg=="; + url = "https://registry.npmjs.org/@medable/mdctl-core-schemas/-/mdctl-core-schemas-1.0.63.tgz"; + sha512 = "eoYyS0m4ZFE+q3QpkoHbl+HDxhDxx/xN0i6VeWhQsSMCeTeLffrXBWYIdZvi39QKLCL171m9uWr83yNKkvEp1w=="; }; }; - "@medable/mdctl-core-utils-1.0.60" = { + "@medable/mdctl-core-utils-1.0.63" = { name = "_at_medable_slash_mdctl-core-utils"; packageName = "@medable/mdctl-core-utils"; - version = "1.0.60"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-core-utils/-/mdctl-core-utils-1.0.60.tgz"; - sha512 = "1l53ieD4cukz/P4Y3COsWov4mVK/+StI0lcdMUJ50jKalpFZP6kOPBMD1HzqQ1zak59ebIACKWneAH19HGET2w=="; + url = "https://registry.npmjs.org/@medable/mdctl-core-utils/-/mdctl-core-utils-1.0.63.tgz"; + sha512 = "9Xx4Fku47H00F9K5cCbHE3ugz3PWyUxXBRp86ee1n3QVTvhoE2PdCHYH2RES24385uH+/BrYfclMtZ4pCfXVwg=="; }; }; - "@medable/mdctl-credentials-provider-keychain-1.0.62" = { + "@medable/mdctl-credentials-provider-keychain-1.0.63" = { name = "_at_medable_slash_mdctl-credentials-provider-keychain"; packageName = "@medable/mdctl-credentials-provider-keychain"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-keychain/-/mdctl-credentials-provider-keychain-1.0.62.tgz"; - sha512 = "pUG/9Ar7H2BGxoZl0SP2Z5y3WXFb600E7/YMY68SLYwR1Tp5a7whf4ttclAZyB73ukJ8cs7HcpAvg52Btd1vmg=="; + url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-keychain/-/mdctl-credentials-provider-keychain-1.0.63.tgz"; + sha512 = "Vr+VpZ9XrPdsg5+qW6YNikED+RUn/v8/RMvbZ78hsEFEjEHRYT0He7f/nbJVkrS7+zYX7cdmzlZnKPV5z5HiQQ=="; }; }; - "@medable/mdctl-credentials-provider-pouchdb-1.0.62" = { + "@medable/mdctl-credentials-provider-pouchdb-1.0.63" = { name = "_at_medable_slash_mdctl-credentials-provider-pouchdb"; packageName = "@medable/mdctl-credentials-provider-pouchdb"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-pouchdb/-/mdctl-credentials-provider-pouchdb-1.0.62.tgz"; - sha512 = "yed0zon0Smo80UmfkhVezcsehgM6w3XMmLtkyxRVUK0xQOVXfJQZloWZtG75Be2VA0RITbdHKstzE2raGdx1tw=="; + url = "https://registry.npmjs.org/@medable/mdctl-credentials-provider-pouchdb/-/mdctl-credentials-provider-pouchdb-1.0.63.tgz"; + sha512 = "FNIq2RxBd9NJPz4oBCs17sd3Zg2g0Y7zjAqu3G3I9LyEjbeJZLGwr7lu6NqmtG/F3e/TH2d6ecMK0zKPlpAJQg=="; }; }; - "@medable/mdctl-docs-1.0.60" = { + "@medable/mdctl-docs-1.0.63" = { name = "_at_medable_slash_mdctl-docs"; packageName = "@medable/mdctl-docs"; - version = "1.0.60"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-docs/-/mdctl-docs-1.0.60.tgz"; - sha512 = "9ytd1YTnsLd/hu9mGKYgsPGrTnR+5GzdbRNKFDnfBPwUsMwB1CCGE3nhb1hdjQAje9ggA4/1otnIrO/4mw8IWg=="; + url = "https://registry.npmjs.org/@medable/mdctl-docs/-/mdctl-docs-1.0.63.tgz"; + sha512 = "1DUsJFnpJNkwTZ65vx5rd+hzkuM3sfSJ3nxYfwcyOWw1bErloObXSEMw2iPIyt3ryYg3i9Jtt+d3AUuDpcT4PQ=="; }; }; - "@medable/mdctl-export-adapter-console-1.0.60" = { + "@medable/mdctl-export-adapter-console-1.0.63" = { name = "_at_medable_slash_mdctl-export-adapter-console"; packageName = "@medable/mdctl-export-adapter-console"; - version = "1.0.60"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-console/-/mdctl-export-adapter-console-1.0.60.tgz"; - sha512 = "k9KZqkV3d/2/8uYnt9/jMdF9jCNb1w/R6q2LPDZ0hNrt7UpvKKSF5RegRysW21p/xT6bvdjJhTphxXzO0qurVw=="; + url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-console/-/mdctl-export-adapter-console-1.0.63.tgz"; + sha512 = "hPGbVYsWH/BVA9Q8cWuTMAeWtGvBg5TDE3pYWdVzaRMUqNt1af7weaieYX56h7jlOhkl4AtkKcW6S5AK0Q8w+w=="; }; }; - "@medable/mdctl-export-adapter-tree-1.0.62" = { + "@medable/mdctl-export-adapter-tree-1.0.63" = { name = "_at_medable_slash_mdctl-export-adapter-tree"; packageName = "@medable/mdctl-export-adapter-tree"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-tree/-/mdctl-export-adapter-tree-1.0.62.tgz"; - sha512 = "2LlmAm3kaqL2DUy1ZUzEV7hwR1vDNKQc0ySlvmRY1WR3aFsEEfJJA6hJEfjhzsE03A1jZZpW6m7KUIbosqLYWQ=="; + url = "https://registry.npmjs.org/@medable/mdctl-export-adapter-tree/-/mdctl-export-adapter-tree-1.0.63.tgz"; + sha512 = "RfmHQUosT3qXnL0jFM2KPkc+JeHv7Ur9Qf16ffOAJCqopbJ+4ZAfUn/3IOUnlYZbeifWy3xU6gptSCqHITJokQ=="; }; }; - "@medable/mdctl-import-adapter-1.0.62" = { + "@medable/mdctl-import-adapter-1.0.63" = { name = "_at_medable_slash_mdctl-import-adapter"; packageName = "@medable/mdctl-import-adapter"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-import-adapter/-/mdctl-import-adapter-1.0.62.tgz"; - sha512 = "mjf0sx9dzZVpKCotYBZyWZopeOdyu2VnwQmIVI8oxwdVRIEN5LR0ohThs9Ca/aQT4rwlL2uvAPde5dXB3kRzuQ=="; + url = "https://registry.npmjs.org/@medable/mdctl-import-adapter/-/mdctl-import-adapter-1.0.63.tgz"; + sha512 = "l3xxVPyMvruvbi5JL75TqcFnh1wa+enFnJT9lk6tESy858w57PQes3cqhWdMZHJlDDBvpKhus/UiIERSEfwRDA=="; }; }; - "@medable/mdctl-manifest-1.0.62" = { + "@medable/mdctl-manifest-1.0.63" = { name = "_at_medable_slash_mdctl-manifest"; packageName = "@medable/mdctl-manifest"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-manifest/-/mdctl-manifest-1.0.62.tgz"; - sha512 = "PDmfThH3tb3XQo2ot5UJR2hHtFODcQb7PAFNWbx7kfu7Vjg6g8XHYOsWGwSzFzKn+78V6+ksC8kBBcBQJus+1g=="; + url = "https://registry.npmjs.org/@medable/mdctl-manifest/-/mdctl-manifest-1.0.63.tgz"; + sha512 = "lNepdPyMUTMNL87QrVoHklUOK8d0Nrv72y19gdO52yAM7IZPXG/UORlfip0JYFkFu/KSedrIVodjp6prm7+sgA=="; }; }; - "@medable/mdctl-node-utils-1.0.62" = { + "@medable/mdctl-node-utils-1.0.63" = { name = "_at_medable_slash_mdctl-node-utils"; packageName = "@medable/mdctl-node-utils"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-node-utils/-/mdctl-node-utils-1.0.62.tgz"; - sha512 = "FtJId1P5hmZED6xv2SjMFb+wMswW2/7gjp4bRe21DmoCkcf4ryYUVUBzXRtfZmeMYh9zo71zRi485PHLpDylGw=="; + url = "https://registry.npmjs.org/@medable/mdctl-node-utils/-/mdctl-node-utils-1.0.63.tgz"; + sha512 = "wbC+fKBmdf0Zk1pB3x0T+4Z1fk3anSE3kcp8VznOZfpGD5UgYUzbhZzH8oPhT/3X1jx17XUS7XTURjqj6vTQew=="; }; }; - "@medable/mdctl-sandbox-1.0.62" = { + "@medable/mdctl-sandbox-1.0.63" = { name = "_at_medable_slash_mdctl-sandbox"; packageName = "@medable/mdctl-sandbox"; - version = "1.0.62"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-sandbox/-/mdctl-sandbox-1.0.62.tgz"; - sha512 = "xuRma0dvrtP0Su8BdWrZtdNVLeDAUIpwJ75mNAqNLK4vjxC6BJgFVHyD8pTgaDn/KYQoOZBLaY7LiMYXh8BSJw=="; + url = "https://registry.npmjs.org/@medable/mdctl-sandbox/-/mdctl-sandbox-1.0.63.tgz"; + sha512 = "GENimL772K2Udv4id+QqL6E66Oko4e2UOeN93tYiUrU92w3S3wvEu/UyXXKjS/rzgs2naBmo6T3K7gdu8HqF4Q=="; }; }; - "@medable/mdctl-secrets-1.0.60" = { + "@medable/mdctl-secrets-1.0.63" = { name = "_at_medable_slash_mdctl-secrets"; packageName = "@medable/mdctl-secrets"; - version = "1.0.60"; + version = "1.0.63"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-secrets/-/mdctl-secrets-1.0.60.tgz"; - sha512 = "WgNIC0g3bGsy5u3a2tqdv+7RbsfmFr76vSlnkbsr/ZR4lzcXJes3qM37pvSqEZD+WN6HOPFRWTHQ0vO8biKqTw=="; + url = "https://registry.npmjs.org/@medable/mdctl-secrets/-/mdctl-secrets-1.0.63.tgz"; + sha512 = "ThRx3aSyKSEBYjsZcGnGPjrUhIesKnT41Os3Oa6OrgnEtym2wORyt1SSKCDhvJ2dte6tdqyfoFbmHOLOAbHylg=="; }; }; "@medv/blessed-2.0.1" = { @@ -5413,13 +5728,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.244" = { + "@microsoft/load-themed-styles-1.10.249" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.244"; + version = "1.10.249"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.244.tgz"; - sha512 = "GjLRFH6tz77FvvgN+cjsJEX3muD/PYXJDu2Vcp+XwTOXqyGmg9HzHyunECuXZnk5zlInjI1ABcuMsQgds/yS1w=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.249.tgz"; + sha512 = "qrLdjIZ9znm2CUILAXuwyAcUvyBzSNaf8wIzaZf/ul2UKhww5xSI7pT7bIqWbuwn5SB+xOmIZrlRr3DyzuVBYQ=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -5440,13 +5755,13 @@ let sha512 = "cAm7w7S04aswBtsXAReyzHrq9EV7yNalYj8OObsnavCucDoxC10y14gE2Eg82UKnR5v2TWSJAVCLFea4gaiddQ=="; }; }; - "@mozilla/readability-0.4.1" = { + "@mozilla/readability-0.4.2" = { name = "_at_mozilla_slash_readability"; packageName = "@mozilla/readability"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mozilla/readability/-/readability-0.4.1.tgz"; - sha512 = "yar/f0w0fRUVM895s6yd5Z2oIxjG/6c3ROB/uQboSOBaDlri/nqI4aKtdqrldWciTLcdpjB2Z6MiVF2Bl9b8LA=="; + url = "https://registry.npmjs.org/@mozilla/readability/-/readability-0.4.2.tgz"; + sha512 = "48MJXzi4Dhy2fJ3lGjmwdEJKoMmn3oiYew9n/1OW6cZy78hAzRIyDJDBCGrg4PBFDyY4xos+H4LCFn5QVRDcfw=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -5458,13 +5773,13 @@ let sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; - "@msgpack/msgpack-2.7.1" = { + "@msgpack/msgpack-2.7.2" = { name = "_at_msgpack_slash_msgpack"; packageName = "@msgpack/msgpack"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.7.1.tgz"; - sha512 = "ApwiSL2c9ObewdOE/sqt788P1C5lomBOHyO8nUBCr4ofErBCnYQ003NtJ8lS9OQZc11ximkbmgAZJjB8y6cCdA=="; + url = "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.7.2.tgz"; + sha512 = "rYEi46+gIzufyYUAoHDnRzkWGxajpD9vVXFQ3g1vbjrBm6P7MBmm+s/fqPa46sxa+8FOUdEuRQKaugo5a4JWpw=="; }; }; "@n1ru4l/graphql-live-query-0.9.0" = { @@ -5476,13 +5791,13 @@ let sha512 = "BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg=="; }; }; - "@nestjs/schematics-8.0.5" = { + "@nestjs/schematics-8.0.8" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "8.0.5"; + version = "8.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.5.tgz"; - sha512 = "nK1hWQeLNbdhsiJDX/XJXLqq7nC6/xxC8CN+seFTQmly+H3gG2xaFnl6JPHURumuQaYJX8JEpC8m0+4tz+wvOg=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.8.tgz"; + sha512 = "xIIb5YnMQN/OJQ68+MCapy2bXvTxSWgINoqQbyZWkLL/yTIuROvZCdtV850NPGyr7f7l93VBP0ZPitbFIexy3Q=="; }; }; "@netflix/nerror-1.1.3" = { @@ -5494,58 +5809,193 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@node-red/editor-api-2.1.6" = { + "@node-ipc/js-queue-2.0.3" = { + name = "_at_node-ipc_slash_js-queue"; + packageName = "@node-ipc/js-queue"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-ipc/js-queue/-/js-queue-2.0.3.tgz"; + sha512 = "fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw=="; + }; + }; + "@node-red/editor-api-2.2.2" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "2.1.6"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.1.6.tgz"; - sha512 = "rUxGWvanZg5c96i4uIJtSCIEH0nHBG5NK5Pl5rKKvo7pXp/O6TtX9k7y9JTNbFyVMihgToKvwI1vt60KEGkBTA=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.2.2.tgz"; + sha512 = "5PUXtMCjsKevCiz8OjHqAckctOv/zzPcssH4yzTxMYEN4JtTng5lFfZzTFWZC/UnCGQMgwe/0e4iGHbMbN1pqg=="; }; }; - "@node-red/editor-client-2.1.6" = { + "@node-red/editor-client-2.2.2" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "2.1.6"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.1.6.tgz"; - sha512 = "3HuULOqnreIYiccKqfR9Mk9Hy8JhTBZReQ9X432sfc0b8Jr4m9Qz40iTdJNY/XVQcWxHBZ0ikEH7J6RM77MG3w=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.2.2.tgz"; + sha512 = "DivbfvVfoh4sRKHmOGucE9kV8MWwGczbxsJfaEVedCtVt9ZDX40N61+FzPVlf2FGDi8q21cIRV7klV1GWhDFxw=="; }; }; - "@node-red/nodes-2.1.6" = { + "@node-red/nodes-2.2.2" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "2.1.6"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.1.6.tgz"; - sha512 = "qMWnfZPDMu7S4zfo5t1zHDrzqWFTDV0aXT1iyXDyF6PQ7OgZ4kP2At3dVA7h9lJUBwtZ3bhwzYbqORW8Onq0bA=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.2.2.tgz"; + sha512 = "RJ8yR90e/tF0KIiS7ZDe8+q0Zk9uJQZDNUcheEeJKWXfIf3WcMo+5KhQ5HJfy8UedmPXzNLRX75FuTXwcd+NKA=="; }; }; - "@node-red/registry-2.1.6" = { + "@node-red/registry-2.2.2" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "2.1.6"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.1.6.tgz"; - sha512 = "QQqhioy0rw7clY2wSwk0mmEMvGG7HOTNa4blnxMrE4JD+ZkcviwbMU4uQLv4J+pLTnFAd1i5xM1JwTH8gTJsyg=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.2.2.tgz"; + sha512 = "zszKLaR2XpBE4wG4o8cwe+dtOvqlG/Cl0iRXg1wpJ9zC96WIPRq+UqAkVkZm6uRuNhW5ZjKk8f77Wh1+v6QBAw=="; }; }; - "@node-red/runtime-2.1.6" = { + "@node-red/runtime-2.2.2" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "2.1.6"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.1.6.tgz"; - sha512 = "U+Hv+GwxxiOPgUdI3GPfzo/4Frm+szhCjlY/5FKU8WlD4tXU68+jNkm+LV/XFTj5VfKZABuz6t82ntRdwtqPpw=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.2.2.tgz"; + sha512 = "PW+HGDmY7Q5nXx+zPVpbFaFpn59EyPLb2QYYL1T5MarCQpUfIaL44NMhSG//n0+vkGZBLi9T6ltapWgEYW4x9g=="; }; }; - "@node-red/util-2.1.6" = { + "@node-red/util-2.2.2" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "2.1.6"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-2.1.6.tgz"; - sha512 = "ahlKYqJU9S0APpbiH6aRI+IpDE69N0I3P+moY1tz4Qcx3ymvwuXLCE40UlTX71Nae6+pqato51m85QL1DihhjA=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-2.2.2.tgz"; + sha512 = "tUGLGj3fTgOjWwhp9uK6M+LUb3rxIrU61DbA0fVpANCEeqk5UNJpje4vOag9dWmJS7hn/ONcDK7dslHLyOQUIQ=="; + }; + }; + "@node-rs/crc32-1.5.0" = { + name = "_at_node-rs_slash_crc32"; + packageName = "@node-rs/crc32"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32/-/crc32-1.5.0.tgz"; + sha512 = "TLVm7FR1QAjXlXkss3HSx3BG/CvVwl4NVEL/qLAgossq4FQsybkvt0RCISrkI3j5fI30gPaGI/qwHn8xkLctow=="; + }; + }; + "@node-rs/crc32-android-arm-eabi-1.5.0" = { + name = "_at_node-rs_slash_crc32-android-arm-eabi"; + packageName = "@node-rs/crc32-android-arm-eabi"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-android-arm-eabi/-/crc32-android-arm-eabi-1.5.0.tgz"; + sha512 = "Si3YKPAkT9IW2ZJfmFQg+9KJWDNgykk1vgybYljR3TJg9WzlrJQvPmJFsZ/Ci+79Htsb8a4auavBbmIkj+JpVQ=="; + }; + }; + "@node-rs/crc32-android-arm64-1.5.0" = { + name = "_at_node-rs_slash_crc32-android-arm64"; + packageName = "@node-rs/crc32-android-arm64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-android-arm64/-/crc32-android-arm64-1.5.0.tgz"; + sha512 = "2uJD7muLg6wXjPhcuuS+HZBgXGX8HsxJzDjVoe51uAoGx+Az0hyH2I6p/ObOIYzcW4xFML0rzlYM9XkMglJhfw=="; + }; + }; + "@node-rs/crc32-darwin-arm64-1.5.0" = { + name = "_at_node-rs_slash_crc32-darwin-arm64"; + packageName = "@node-rs/crc32-darwin-arm64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-darwin-arm64/-/crc32-darwin-arm64-1.5.0.tgz"; + sha512 = "E3dWA/fKu7FeDGBYB20/YEz28Fw/8sj4iuXgE4n1aoh8994AdbXdsJlmNip6/AkcEynC8Q9RdPS4HdfM7kBPiw=="; + }; + }; + "@node-rs/crc32-darwin-x64-1.5.0" = { + name = "_at_node-rs_slash_crc32-darwin-x64"; + packageName = "@node-rs/crc32-darwin-x64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-darwin-x64/-/crc32-darwin-x64-1.5.0.tgz"; + sha512 = "YjQ6y/3L1D2kOrNguB42sPf6HdEkqXcL2jxJ41QOfuIRV18lp7/5sM9OWRdjmLpQUUvmpqSSWxZFQ/2P/35EXw=="; + }; + }; + "@node-rs/crc32-freebsd-x64-1.5.0" = { + name = "_at_node-rs_slash_crc32-freebsd-x64"; + packageName = "@node-rs/crc32-freebsd-x64"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-freebsd-x64/-/crc32-freebsd-x64-1.5.0.tgz"; + sha512 = "K+HfvordJrw0xkht9wElxIHGDm5qodOVzNa95I7ZW8BktHWC2QmPkcYRotrDnZLaOs8NfA0xWGiqp/ncAJ3XOw=="; + }; + }; + "@node-rs/crc32-linux-arm-gnueabihf-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-arm-gnueabihf"; + packageName = "@node-rs/crc32-linux-arm-gnueabihf"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm-gnueabihf/-/crc32-linux-arm-gnueabihf-1.5.0.tgz"; + sha512 = "MFwJlcIAmgtnWAluthAY2gyTbKIu5/+6PUSlOZ4xlSZIddb3ra3M/AQ0BkDSvEoDeQQ5ZdkcnVWzpqoCdUOe4Q=="; + }; + }; + "@node-rs/crc32-linux-arm64-gnu-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-arm64-gnu"; + packageName = "@node-rs/crc32-linux-arm64-gnu"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-gnu/-/crc32-linux-arm64-gnu-1.5.0.tgz"; + sha512 = "7JYsJXRUE6yrK/mt7uLX91ARLS3HOCggTSGD3Kw52lhJRPXTyJVVIhuLj8/neW8ENTgH3zgpQdeId0sKQtKrDg=="; + }; + }; + "@node-rs/crc32-linux-arm64-musl-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-arm64-musl"; + packageName = "@node-rs/crc32-linux-arm64-musl"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-arm64-musl/-/crc32-linux-arm64-musl-1.5.0.tgz"; + sha512 = "irOtNHrizI8toVCX92o/3FIIfz4O+Z5qiSlIwH3PxsOoak0mz6uEInYwPVnDDKfAYzCUA0oxcGV2QIR1uYpCKQ=="; + }; + }; + "@node-rs/crc32-linux-x64-gnu-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-x64-gnu"; + packageName = "@node-rs/crc32-linux-x64-gnu"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-gnu/-/crc32-linux-x64-gnu-1.5.0.tgz"; + sha512 = "KOevSXLbgs2htznP8jlsN6tZ4kmpGloBj00lo4X4H4Lm6eKeWyG9txbCGD0yK4ZX/XhrL6Qs4VIMCaVFpxFIsw=="; + }; + }; + "@node-rs/crc32-linux-x64-musl-1.5.0" = { + name = "_at_node-rs_slash_crc32-linux-x64-musl"; + packageName = "@node-rs/crc32-linux-x64-musl"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-linux-x64-musl/-/crc32-linux-x64-musl-1.5.0.tgz"; + sha512 = "e6ivD6MWVMp/FP6VVq3EBjiBXKN/qBsTn8bOsHtIf+Et6dEkITbEk26m5+w9TFHIHKJGvwytH7+RigK7N7o5VQ=="; + }; + }; + "@node-rs/crc32-win32-arm64-msvc-1.5.0" = { + name = "_at_node-rs_slash_crc32-win32-arm64-msvc"; + packageName = "@node-rs/crc32-win32-arm64-msvc"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-arm64-msvc/-/crc32-win32-arm64-msvc-1.5.0.tgz"; + sha512 = "PTvfUb08MAdQ0hab5OxXBauPocP09SG2rShRjwtmyRnze+Nd5JHJcsj5O0WhX/DCu8acK1sS0Q0Np3b1lIbwkg=="; + }; + }; + "@node-rs/crc32-win32-ia32-msvc-1.5.0" = { + name = "_at_node-rs_slash_crc32-win32-ia32-msvc"; + packageName = "@node-rs/crc32-win32-ia32-msvc"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-ia32-msvc/-/crc32-win32-ia32-msvc-1.5.0.tgz"; + sha512 = "+fUiXIUddPgoxPcBA4lpG7fQQgJGEkinnS1ne3+pySu1Z2Ej4vJFS5aJyKc56+1IV9ztrXo2H+b3r0IdnLvy7w=="; + }; + }; + "@node-rs/crc32-win32-x64-msvc-1.5.0" = { + name = "_at_node-rs_slash_crc32-win32-x64-msvc"; + packageName = "@node-rs/crc32-win32-x64-msvc"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@node-rs/crc32-win32-x64-msvc/-/crc32-win32-x64-msvc-1.5.0.tgz"; + sha512 = "FvgItAuN6eRHZDAPVlBZbzQjiRO0DFFFLgy2KFUjx+vLx20Auf5Hi0/D+dFLmH9jdESaoZqwZC5FpB7nfit1lQ=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -5584,13 +6034,13 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/arborist-4.2.1" = { + "@npmcli/arborist-4.3.1" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "4.2.1"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-4.2.1.tgz"; - sha512 = "vAIfPwW6alsyjfv7wzGPMJv6Dun8xs9VugdqfwkWEyRajzOLjeifxeDqlJYQ8G8FTU38grIWjkoUmd9cAnJnPg=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-4.3.1.tgz"; + sha512 = "yMRgZVDpwWjplorzt9SFSaakWx6QIK248Nw4ZFgkrAy/GvJaFRaSZzE6nD7JBK5r8g/+PTxFq5Wj/sfciE7x+A=="; }; }; "@npmcli/ci-detect-1.4.0" = { @@ -5602,13 +6052,22 @@ let sha512 = "3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q=="; }; }; - "@npmcli/fs-1.1.0" = { + "@npmcli/fs-1.1.1" = { name = "_at_npmcli_slash_fs"; packageName = "@npmcli/fs"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.0.tgz"; - sha512 = "VhP1qZLXcrXRIaPoqb4YA55JQxLNF3jNR4T55IdOJa3+IFJKNYHtPvtXx8slmeMavj37vCzCfrqQM1vWLsYKLA=="; + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz"; + sha512 = "8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ=="; + }; + }; + "@npmcli/fs-2.1.0" = { + name = "_at_npmcli_slash_fs"; + packageName = "@npmcli/fs"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.0.tgz"; + sha512 = "DmfBvNXGaetMxj9LTp8NAN9vEidXURrf5ZTslQzEAi/6GbW+4yjaLFQc6Tue5cpZ9Frlk4OBo/Snf1Bh/S7qTQ=="; }; }; "@npmcli/git-2.1.0" = { @@ -5620,6 +6079,15 @@ let sha512 = "/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw=="; }; }; + "@npmcli/git-3.0.0" = { + name = "_at_npmcli_slash_git"; + packageName = "@npmcli/git"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/git/-/git-3.0.0.tgz"; + sha512 = "xfSBJ+KBMZWWqRHFbEgIaXG/LtELHrQZMJ72Gkb3yWdHysu/7+VGOs8ME0c3td7QNQX57Ggo3kYL6ylcd70/kA=="; + }; + }; "@npmcli/installed-package-contents-1.0.7" = { name = "_at_npmcli_slash_installed-package-contents"; packageName = "@npmcli/installed-package-contents"; @@ -5629,13 +6097,13 @@ let sha512 = "9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="; }; }; - "@npmcli/map-workspaces-2.0.0" = { + "@npmcli/map-workspaces-2.0.2" = { name = "_at_npmcli_slash_map-workspaces"; packageName = "@npmcli/map-workspaces"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-2.0.0.tgz"; - sha512 = "QBJfpCY1NOAkkW3lFfru9VTdqvMB2TN0/vrevl5xBCv5Fi0XDVcA6rqqSau4Ysi4Iw3fBzyXV7hzyTBDfadf7g=="; + url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-2.0.2.tgz"; + sha512 = "ED54EslGsHFWBPN5x8JAOszuWywuoXYSi9E3HQRsgVkWnqsdTBJDSM4IFMRwmmBUbCHAxmP3wGLu1WMm4fhrOw=="; }; }; "@npmcli/metavuln-calculator-2.0.0" = { @@ -5710,6 +6178,15 @@ let sha512 = "fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig=="; }; }; + "@npmcli/run-script-3.0.1" = { + name = "_at_npmcli_slash_run-script"; + packageName = "@npmcli/run-script"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-3.0.1.tgz"; + sha512 = "o2fkld5hYwu9sKYzoXTpqEocMnDLaigobaPzLaGB63k/ExmLBTaB+KpfKlpcIePPnuP8RFR+0GDI4KopJCM6Xg=="; + }; + }; "@oclif/command-1.8.0" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; @@ -5746,6 +6223,15 @@ let sha512 = "cE3qfHWv8hGRCP31j7fIS7BfCflm/BNZ2HNqHexH+fDrdF2f1D5S8VmXWLC77ffv3oDvWyvE9AZeR0RfmHCCaA=="; }; }; + "@oclif/config-1.18.3" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.18.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.3.tgz"; + sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA=="; + }; + }; "@oclif/errors-1.3.4" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -5782,13 +6268,13 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.6" = { + "@oclif/parser-3.8.7" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.6"; + version = "3.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.6.tgz"; - sha512 = "tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.7.tgz"; + sha512 = "b11xBmIUK+LuuwVGJpFs4LwQN2xj2cBWj2c4z1FtiXGrJ85h9xV6q+k136Hw0tGg1jQoRXuvuBnqQ7es7vO9/Q=="; }; }; "@oclif/plugin-autocomplete-0.1.5" = { @@ -5845,13 +6331,13 @@ let sha512 = "r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g=="; }; }; - "@octokit/core-3.5.1" = { + "@octokit/core-3.6.0" = { name = "_at_octokit_slash_core"; packageName = "@octokit/core"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/core/-/core-3.5.1.tgz"; - sha512 = "omncwpLVxMP+GLpLPgeGJBF6IWJFjXDS5flY5VbppePYX9XehevbDykRH9PdCdvqt9TS5AOTiDide7h0qrkHjw=="; + url = "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz"; + sha512 = "7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q=="; }; }; "@octokit/endpoint-6.0.12" = { @@ -5926,22 +6412,22 @@ let sha512 = "r+fArdP5+TG6l1Rv/C9hVoty6tldw6cE2pRHNGmFPdyfrc696R6JjrQ3d7HdVqGwuzfyrcaLAKD7K8TX8aehUQ=="; }; }; - "@octokit/plugin-throttling-3.5.2" = { + "@octokit/plugin-throttling-3.6.2" = { name = "_at_octokit_slash_plugin-throttling"; packageName = "@octokit/plugin-throttling"; - version = "3.5.2"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-3.5.2.tgz"; - sha512 = "Eu7kfJxU8vmHqWGNszWpg+GVp2tnAfax3XQV5CkYPEE69C+KvInJXW9WajgSeW+cxYe0UVdouzCtcreGNuJo7A=="; + url = "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-3.6.2.tgz"; + sha512 = "0az5fxgVlhFfFtiKLKVXTpmCG2tK3BG0fYI8SO4pmGlN1kyJktJVQA+6KKaFxtxMIWsuHmSEAkR6zSgtk86g2A=="; }; }; - "@octokit/request-5.6.2" = { + "@octokit/request-5.6.3" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.6.2"; + version = "5.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.2.tgz"; - sha512 = "je66CvSEVf0jCpRISxkUcCa0UkxmFs6eGDRSbfJtAVwbLH5ceqF+YEyC8lj8ystKyZTy8adWr0qmkY52EfOeLA=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz"; + sha512 = "bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A=="; }; }; "@octokit/request-error-2.1.0" = { @@ -5998,346 +6484,517 @@ let sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A=="; }; }; - "@opentelemetry/api-1.0.4" = { + "@openpgp/hkp-client-0.0.2" = { + name = "_at_openpgp_slash_hkp-client"; + packageName = "@openpgp/hkp-client"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@openpgp/hkp-client/-/hkp-client-0.0.2.tgz"; + sha512 = "hA71RhqfLfNltZsy/USTQehE2QAVB3eK4xx8p76XtFJy5Zg6gK2XbZvOC/x/yG8i2Ipbyul1DMTMxH9v8rfPKw=="; + }; + }; + "@openpgp/wkd-client-0.0.3" = { + name = "_at_openpgp_slash_wkd-client"; + packageName = "@openpgp/wkd-client"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@openpgp/wkd-client/-/wkd-client-0.0.3.tgz"; + sha512 = "qe+uWtCJetuG78KhfiQyEA+ZciC/qeECXRj+LCm4m0s98qR2wPwYHRI1u8aFbtkN6G4ZMyKN+opY++fJS5l3vg=="; + }; + }; + "@opentelemetry/api-1.1.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.4.tgz"; - sha512 = "BuJuXRSJNQ3QoKA6GWWDyuLpOUck+9hAXNMCnrloc1aWVoy6Xq6t9PUV08aBZ4Lutqq2LEHM486bpZqoViScog=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.1.0.tgz"; + sha512 = "hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ=="; }; }; - "@opentelemetry/semantic-conventions-0.24.0" = { + "@opentelemetry/semantic-conventions-1.1.1" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "0.24.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-0.24.0.tgz"; - sha512 = "a/szuMQV0Quy0/M7kKdglcbRSoorleyyOwbTNNJ32O+RBN766wbQlMTvdimImTmwYWGr+NJOni1EcC242WlRcA=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.1.1.tgz"; + sha512 = "GdTwDHSaZ6iP5LUdvS/SLUjn3067xn1HcBsLZCh8YOsf22d/YWTBcnFl3buieBP4KiajwHLho4I8HSMDKACBSg=="; }; }; - "@ot-builder/bin-composite-types-1.3.3" = { + "@ot-builder/bin-composite-types-1.5.0" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.3.3.tgz"; - sha512 = "E0l5ixtUowsGzGDP++wMQz64rm8IVCvcIz5NKHtOhs1RIzWT58O5EybSxGBvVBstP2jprMsiGCxjZJ9rhHmrqg=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.5.0.tgz"; + sha512 = "0X12BGmy7l91ONXGLfmG3BQerqjdipYgrGhREXL80qcKQfcZL4o+7NHjq/FDlFYpMGLxDq9CkprGEDmgSIL9CA=="; }; }; - "@ot-builder/bin-util-1.3.3" = { + "@ot-builder/bin-util-1.5.0" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.3.3.tgz"; - sha512 = "76pe9Wz431PyOek445P+j/CwcRJaIZqItLL+oe/HAsWNLeAudh/GF1NdK6jKrjJsGa1sGbJUWuGfklpvY9IoBA=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.5.0.tgz"; + sha512 = "zLBqM5SjP/EmVaZtwqOjK832yzYQTlWqtldOmgAizckiNpayC6P5c49KJpVTLhVh54euhsk9oJUjsi0L9i8A0g=="; }; }; - "@ot-builder/cli-help-shower-1.3.3" = { + "@ot-builder/cli-help-shower-1.5.0" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.3.3.tgz"; - sha512 = "Judhkaz9m8dsjz/xESy3WJY7xmcnjD40A51Mg8H+EcA+Zyl2PsRguGjeYK5GP0YZpCDq73cPvt9IqXbU74HDKA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.5.0.tgz"; + sha512 = "2jMS5aTr+92mt0HsUoLLV+1GBMsk2GC1tx5YFcdDBH7rfExvYR5NKgpO1d7muVdUi8WBh4fn611rb5sjhBtF5Q=="; }; }; - "@ot-builder/cli-proc-1.3.3" = { + "@ot-builder/cli-proc-1.5.0" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.3.3.tgz"; - sha512 = "Afd6KU7iarOt8OJYJGWMU9tR2Hm4TCcvRHTq2kJns7rn7leJnJFvteRPLZwBFGIc0qlkeJ/w7uF0YBnnlSLWqw=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.5.0.tgz"; + sha512 = "zU0afR6WqkUcogoX1pLJBsYSlViPJCkQ1zrHjnOLcHRJ5zIPwNXbFUTAhWePMvNF8EAjtILGeX8ZxoE3PtXMTQ=="; }; }; - "@ot-builder/cli-shared-1.3.3" = { + "@ot-builder/cli-shared-1.5.0" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.3.3.tgz"; - sha512 = "9isYiHmyRNDBhU+Zg55DcHFn/9uzD8O46r3+6BPO8X8YWXp6cOpEKzhgf3yfzCcJxplGrOKoUTR2PWj3TIaO1A=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.5.0.tgz"; + sha512 = "hOYs07mNlg9Z+Rl2wKsDRzb0gYVsnAv6K8O52Q141QBvu5Uyjb6p19zM8pYvOF7VXZTGEhki9WNoM3qVgp5pSA=="; }; }; - "@ot-builder/common-impl-1.3.3" = { + "@ot-builder/common-impl-1.5.0" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.3.3.tgz"; - sha512 = "+ijxOzqDER1qC1uC9JwIo5xyoHPB4vdY1YMvqZD+6JLO7AkiUjqqJlihnp1Xq7s0+WpySru45P+2S+ZI6J4X8g=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.5.0.tgz"; + sha512 = "6linn1dhjDVIiu2cvY0UACSAJClKvLmwrLigg3dzlEjJRvr6jnE/zZ8D401CuL7EMLJPNjciSlf1lQCj5/MU8Q=="; }; }; - "@ot-builder/errors-1.3.3" = { + "@ot-builder/errors-1.5.0" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.3.3.tgz"; - sha512 = "i+i1/NFGysYbDeFSwikmbq/HLfpgJ7vXTviJMnZn1/JIYXscfrw01lqYpCnAmKrUXSbYqOc6pKWycS0IIzYEsA=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.5.0.tgz"; + sha512 = "vARlbSzv3euBX0/Y4orHhbYZOsj7hYjsPU+VXt2LD+do6On1EJ8z6vvXXZxB4B52Rr2jnxzycqk0fNh95IKTeg=="; }; }; - "@ot-builder/io-bin-cff-1.3.3" = { + "@ot-builder/io-bin-cff-1.5.0" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.3.3.tgz"; - sha512 = "qcqWuo2WtR+MCFsTS1a0ieLH8+0KUaqpkXbhVha5y1eeKRIYsPaLS5Uj5IAApuLX6F6eZgaKiZkR7CqeBMwIGw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.5.0.tgz"; + sha512 = "3KWiwRB/8JUkfxE3WqR/xOWQdBDbIS6evdQPBQ/CAJV1qyTtL3Q9KfCHaMPHJcDLbKPP/4lnhKEyi6QsnJU/Tw=="; }; }; - "@ot-builder/io-bin-encoding-1.3.3" = { + "@ot-builder/io-bin-encoding-1.5.0" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.3.3.tgz"; - sha512 = "fE+RI5fc1FqXr8q96Ne6x12UStz2m/RjS0PbKO9X5/lxg0JaTKHdtJ65M6RX1kxLUO783P1NlibLliiuXWTg4A=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.5.0.tgz"; + sha512 = "h55cS6agqz++YRMPAi6Zvgd6oWllF9+SjF72whPGekOjRZLNemuTpmWBbXbD3gc1pU8SqSUUSeIcUdny3sqtdg=="; }; }; - "@ot-builder/io-bin-ext-private-1.3.3" = { + "@ot-builder/io-bin-ext-private-1.5.0" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.3.3.tgz"; - sha512 = "CyLwG038inIozQtn4bWclc13EWynWALO4LGPcgLMRmD1UsS4LbMRuoGJ02p70+uxsKLaHgA2RjC63g02IbIjmw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.5.0.tgz"; + sha512 = "11K88CL96HiSP0DZYvNd/oULlDbKfD+RYChnl8OJlYDKqxQcFfecIcgKAJmEpmkr11MurRB0AdP2Hg6HBCUFuA=="; }; }; - "@ot-builder/io-bin-font-1.3.3" = { + "@ot-builder/io-bin-font-1.5.0" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.3.3.tgz"; - sha512 = "b3aHYfGAwJShZe9mmZAJXFXpklZspUBjf69FuujkbA5teQl7w6GdwXOiwhavtsNwHuNC2We7Oh9wp1vnLSceXA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.5.0.tgz"; + sha512 = "UuepwTTj9lbFh92vvyyK346OBVKlG7mXUcafrRijGGCyc1Toe+HONaCU1dcNy9IvwlNjEa6svrQfMFx8fwxMKA=="; }; }; - "@ot-builder/io-bin-glyph-store-1.3.3" = { + "@ot-builder/io-bin-glyph-store-1.5.0" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.3.3.tgz"; - sha512 = "yJPth9RyOLvyO/wGm+axfBSOPUqkgiVUeOSMSpLHM+ujhrZXW0OW9Xbxij+9QLsZrxI9mpEWkdWygWWBUceD/Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.5.0.tgz"; + sha512 = "Xtg0k34yj4nfFlyh/lpBM6O66QYiAW9+/qmn5Rtp9N8hDCGD+2HZ7fTZZdcqgXYZblZvlknzBFKSOLoupcvZNg=="; }; }; - "@ot-builder/io-bin-layout-1.3.3" = { + "@ot-builder/io-bin-layout-1.5.0" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.3.3.tgz"; - sha512 = "8fnXYL73O7GsvrQNqDtzbzChGVbyzH6J1a04I+M0H+BUW6u0XY0FJkUtfF68xzju4eyrkOZc/ElDbXouADKWug=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.5.0.tgz"; + sha512 = "bS+e8VkFUX6LyWqD7zGa5FvJbCtIw6Crs2g4DVivn6slhru9JIc5DcNOHp86zwNkwlzg+v+5/3KUoNZoWgxWpw=="; }; }; - "@ot-builder/io-bin-metadata-1.3.3" = { + "@ot-builder/io-bin-metadata-1.5.0" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.3.3.tgz"; - sha512 = "onYKN6OrUBclDaZiyhXZhTcSf+KfvqW9lwsEaKyYTh0ZOZ/ButSvwxNtrMjzekGFzK0izIQft3oWhXkUyapnzg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.5.0.tgz"; + sha512 = "0Q0K1UkSqO0wW03UbUuOw79abzNeK6cHjzCE0UX2hZPtH26gEG32xCPYUNCaSxOFPWXSRXPg/kmYIT6/ZmkWLA=="; }; }; - "@ot-builder/io-bin-metric-1.3.3" = { + "@ot-builder/io-bin-metric-1.5.0" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.3.3.tgz"; - sha512 = "fngm7u0BSyet87WijLs/TOXF4y/NkadxZK8NWvyRiEC6hU/d20Tfen6eqit+UB3RBBicbZdCjeJvUqTzq2BRhA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.5.0.tgz"; + sha512 = "Ezw3MBw4rO6fMrikm1Mc0nOnf3E4FPkHMhUAXN62AFcz6VOKMY34OL+NSoLkJL+HfGTju4KcF3guiNytXrtLeA=="; }; }; - "@ot-builder/io-bin-name-1.3.3" = { + "@ot-builder/io-bin-name-1.5.0" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.3.3.tgz"; - sha512 = "hWuqZyIdUjfxiVTZ9pa4KZe1srH+88lXkoIGupfz1cibMIM98sgwNkcjT0tjFiyH18SBMQBIxhwmfMRWBj4kKw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.5.0.tgz"; + sha512 = "zPhTA5HEwQ0jAovA+ZwPjt3ZNnOaLSQagoLHo6zuETOb+uJSksTExg+G4h6PFHC9U9q55OZ0HidlWOmnmi1xbA=="; }; }; - "@ot-builder/io-bin-sfnt-1.3.3" = { + "@ot-builder/io-bin-sfnt-1.5.0" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.3.3.tgz"; - sha512 = "CkXXxwwvxgxHZwYx0Tv7cxcvT8yXCF8MusSV51n9On2h/YB3m/uCevna7/E6Jf5MpzHkyICiWYwe6tV+fv5xXA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.5.0.tgz"; + sha512 = "/8sANRI3aBKKdOcbnULiS5w5c34d6lb8IufJtYpCuowUuvkDUXF3vlGw7t7CL7mudzdcELpW4ROa1/vNRR+c6Q=="; }; }; - "@ot-builder/io-bin-ttf-1.3.3" = { + "@ot-builder/io-bin-ttf-1.5.0" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.3.3.tgz"; - sha512 = "8stTcg6ulB5N/I3wXsM2Tq71Xnf13JehvXruwNfroYiNLtiWc8NRGlo/PDRB5xbLURv8QeyP0SxUy0ZV9VGXhQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.5.0.tgz"; + sha512 = "tiyuas19970WkKNFRC4ja9rMD0mgt9arbYbNeQvDjFB9MPsV0+BNgk6fpGr2o8tmYpw73/TZcJfEgIiEICJKtg=="; }; }; - "@ot-builder/io-bin-vtt-private-1.3.3" = { + "@ot-builder/io-bin-vtt-private-1.5.0" = { name = "_at_ot-builder_slash_io-bin-vtt-private"; packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.3.3.tgz"; - sha512 = "hPAibMtIX1WynkNDME+pWph/lU166XXJPrEkKLZ5kEl9XPbAzk+JS6TKnX38AEqGx5lWlc5Fx26slYyqksR48g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.5.0.tgz"; + sha512 = "yz7WLqLI8XZ0KgYowu5ct9rbOS97TQRwudndDDXJZynSFZyUK5wYV9hfqXwKPDQI2QViAWhYBUJDR94zeSe7MA=="; }; }; - "@ot-builder/ot-1.3.3" = { + "@ot-builder/ot-1.5.0" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.3.3.tgz"; - sha512 = "e0apRiFxboGKw24eg8uTp0NxkI3KPtNIoztOmJWQTaSXMS78QbzWDAXX8yy94qnL6mu+aN7u1H8f67zNtMH1DA=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.5.0.tgz"; + sha512 = "8nmX1B5D7974LaqH2ieIcZ4TDaAILGvANipOL5e75MMt6jF1O72UUHzO4vJ/llIsZYasqm9+rlv6dkp9CkveZA=="; }; }; - "@ot-builder/ot-encoding-1.3.3" = { + "@ot-builder/ot-encoding-1.5.0" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.3.3.tgz"; - sha512 = "syxPDRoAezIQA/Z/DDPSF2AQ3N9vWaypTvbUPmdLEqriOZFDAx4fR455B8gqZKIeg3FFAjXLMCtaDR1sftp74g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.5.0.tgz"; + sha512 = "cWVGpb/A3jKPqobIdMUdScq1tUd+ew282P/yLFejIeJvaE4U3zZas6wS9pg4se6uiRsdf8bY5xSjAvnfbJAM1w=="; }; }; - "@ot-builder/ot-ext-private-1.3.3" = { + "@ot-builder/ot-ext-private-1.5.0" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.3.3.tgz"; - sha512 = "s5Se3iuiRyznjdO4Qlm1yimNI8NkPl/RRkbc8tC4hoq45KO78CCjU3tKllioTs5DGHtP2kpinseNbyL1zofykA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.5.0.tgz"; + sha512 = "gxbsodaN07XLNtTNLIWhhgHCsXjOs9D7M7c4i40UTv4S80FGzpyJpz2VOW1BJ8SUQjGFP/eeDdSyHWtmrBH21g=="; }; }; - "@ot-builder/ot-glyphs-1.3.3" = { + "@ot-builder/ot-glyphs-1.5.0" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.3.3.tgz"; - sha512 = "vqPrWqlfugwsnutphMz2od5VJRvsdnGjBU48rye4tKxRDkOQ+jv9XnrMiEhms0wfBR3G/z0LjNsQAayWIggpDA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.5.0.tgz"; + sha512 = "SxqNTishqTKf36tt6XRQkXXLD3fw+7azbf/kSu4A0Pq6MdmRMy5CGs6HDA9KhqaPpmq1UpMk876QPA9vCXoLPw=="; }; }; - "@ot-builder/ot-layout-1.3.3" = { + "@ot-builder/ot-layout-1.5.0" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.3.3.tgz"; - sha512 = "h0JqUVYvSh77xoGI+PHaXnXOlYKrQCu7EXXDC8uUr2xrnQR4+LJzvt+NPpFwtlG1upc/muCFpDxp6ooQ8crErw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.5.0.tgz"; + sha512 = "fdmOl/HZi2Jdl0Fh8bx7CCG9s+jXimH+UCez3LPhTXgNNvOaFVqhABPtP+tAepqWi9J0MjBCeWMnFUmGiSa5gw=="; }; }; - "@ot-builder/ot-metadata-1.3.3" = { + "@ot-builder/ot-metadata-1.5.0" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.3.3.tgz"; - sha512 = "t/D9+MHsSd21laRKtC+M48mCKVODVjcMW8VIZLwA5Vsg9xtAkSSYU/ZXZjmUwahnaJRLAJCovD7B7WkIc8NX7A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.5.0.tgz"; + sha512 = "OARTkm/LDERbwo6I0BMdAmA0D6vMP2A0IaQlOWn1PxjNoHOZQY6U+1er1H//xJQZ4aA5BZtRgOoQebjQpYELbg=="; }; }; - "@ot-builder/ot-name-1.3.3" = { + "@ot-builder/ot-name-1.5.0" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.3.3.tgz"; - sha512 = "g+flff2TZNeN6U4cq9T/JtOTi82NoTjVQrtxsdDTgL7UbfbpyBxloutnFVTdslEUAH2NgSJAeKLdUIuH7LwVjw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.5.0.tgz"; + sha512 = "b/NSfonC0QqMVNBloOPHeeQIqVAaHaID0oVD/C9jEGKPtp3zpSgS2oycmtZ8JmSqwS2qfJTU9lfzusT6E/LWsw=="; }; }; - "@ot-builder/ot-sfnt-1.3.3" = { + "@ot-builder/ot-sfnt-1.5.0" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.3.3.tgz"; - sha512 = "reA2LMD5BI/1dsenrgfSmydY18jvu5Lq4p3DmQc/uMaEc5ReW4Vlu0AUoRPoqdhtE00pzwcyc9nuOBXivFl4qg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.5.0.tgz"; + sha512 = "imCGAlN78Yc2HQDVUzNPixj0ERT+PEodi9bp+wINLVYF9G6CgRMTIuSgG0KBK9H8T20sBrorOFfcZFQJuucy4A=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.3.3" = { + "@ot-builder/ot-standard-glyph-namer-1.5.0" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.3.3.tgz"; - sha512 = "6Ku8YiCVQxT2OwNBnWSrEJO76OtV8LtUCNS+1tdrDJpTzWeZqys0ypnXBLka/aBKUZUkJeXWflaxUNo1r4Tx+A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.5.0.tgz"; + sha512 = "aZkJBn2kog2eyAcXygzvYte5uH7GCVgO2jM9QeB4bpWoxXYjIF3dy58hsbZ6zKMXMncphOFcnTgxgvct45bglA=="; }; }; - "@ot-builder/ot-vtt-private-1.3.3" = { + "@ot-builder/ot-vtt-private-1.5.0" = { name = "_at_ot-builder_slash_ot-vtt-private"; packageName = "@ot-builder/ot-vtt-private"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.3.3.tgz"; - sha512 = "T1sdeXE83/IdRz7eRa182bAVYANmnoGiLlO3y/6e0sJSxgMzwr9eSjbf441edvjEMJPbCmBr6gqiJoQMzcIiCg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.5.0.tgz"; + sha512 = "iMQP2zI56mZJqG98VVAswCe2f2NgApW0BtAKfC/e3VKDJPWbsJHcIHnkcRReaC4FzAmzxqarY1IyeNC94xSNVg=="; }; }; - "@ot-builder/prelude-1.3.3" = { + "@ot-builder/prelude-1.5.0" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.3.3.tgz"; - sha512 = "GJSZOF13jqvVV4+LREhSo7ZRmikYVGPZl+Z1D4jHUFF7nDqX53KbGMt/tl3rhNMhub0/NTdV8tzdd2LTb/AJDQ=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.5.0.tgz"; + sha512 = "b3tJ4GTZvK+sFNHlihFaOTxeMOWmSqIDKGOJuV9l6Svn/1moTcO3VWjRuriHmsrA0ZuaSQxTKMf3Na5BYiTnXw=="; }; }; - "@ot-builder/primitive-1.3.3" = { + "@ot-builder/primitive-1.5.0" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.3.3.tgz"; - sha512 = "aEwB2TlorsArhqVQKL9cDyYiszl0wdvhFFgNHp3bmxw7D1w86pFdjAfUO7IyIF7k5JBPswHAzMfmotXcA51lUw=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.5.0.tgz"; + sha512 = "jJN98wURFXGa8KTfjrIlB54AF2QJw+w9eQuJ812mt8Nmw2Mle+IaYCRAiD8IKWjRWMZcd6bztkOoDbCavqcrUQ=="; }; }; - "@ot-builder/rectify-1.3.3" = { + "@ot-builder/rectify-1.5.0" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.3.3.tgz"; - sha512 = "Ij9dpqhw0lOos2Z9mr7Z4Li+zQQ1xN9LSUIgfqtHFGVDnC66udYyHahOLMhjhODJVPtA25otADrM4LT/T4jGXQ=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.5.0.tgz"; + sha512 = "Ivx2VxlMB/Btq4+YLaH4KhPb+eoU4Nsg4UMd5u0BXQ+JjC3HvUbyXDWRMJn3ACDLvvkXSqjEprf7G3BFp58p7g=="; }; }; - "@ot-builder/stat-glyphs-1.3.3" = { + "@ot-builder/stat-glyphs-1.5.0" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.3.3.tgz"; - sha512 = "8vHTL/fhorFp1l2jFSGNT9R9tu0Rr8yQH/vslaOIvY8bBgJDQCqKExmF4lxiGMWMr05mKZhNrwV2vYMHWUP2mA=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.5.0.tgz"; + sha512 = "OMCvsvxsX0dkjWcde3J3sxF1xRbzVm4uyz+G9sgjRXznBLVKtvstTpspFqpTfhUFEcjRU+7AJhWNn4nvXQR/jw=="; }; }; - "@ot-builder/trace-1.3.3" = { + "@ot-builder/trace-1.5.0" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.3.3.tgz"; - sha512 = "d4KsjCUgY4tlpfSY74Q2l/k1Fl82ROlt+IQhzl8weSeb/KVGVALltzEIyEmT3Kb5Yh3Clej9nlzzwKWX74dgZw=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.5.0.tgz"; + sha512 = "qegG5Oc9gYHWMSnV9qLqYQnQAq79SRHo/apQtnnpD4o7d1SsxDPqR+xspzl3dprPRYSqq8zUKVZ5mxnLNcLPWQ=="; }; }; - "@ot-builder/var-store-1.3.3" = { + "@ot-builder/var-store-1.5.0" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.3.3.tgz"; - sha512 = "5LKBIWxB0Oe4QUeRHA3mGaHqlrgA9byeOQNMQxjGDF0fRVDyG40VW1g4xlUQYWzTitM2ML3dP0HlEoVvsTgwwg=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.5.0.tgz"; + sha512 = "NufILxFqLWcXjhJqG0IgVCDr0ey/e4Q+mX8k0o+SV1/yHdVxug5CrBQnmF7/yIB1Au9FgdZp2eal2Un1gjxQ4A=="; }; }; - "@ot-builder/variance-1.3.3" = { + "@ot-builder/variance-1.5.0" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.3.3.tgz"; - sha512 = "kCd+aqpuF/Go+yHRc0WJ3GP9p1069WQBdG9b5GomQJhYfccGmNOl2P1BUtISAu467DVngc9bBx5ZJbDWn1luXg=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.5.0.tgz"; + sha512 = "iA8tovocbymAAhA1zRO29vltUlZGfLjYaukyLu3mH8XBgNuxTwb0aUbQ9muDKyWS+E5Q23+KN/PaA8ZwUtlHlA=="; + }; + }; + "@parcel/bundler-default-2.4.0" = { + name = "_at_parcel_slash_bundler-default"; + packageName = "@parcel/bundler-default"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.4.0.tgz"; + sha512 = "RaXlxo0M51739Ko3bsOJpDBZlJ+cqkDoBTozNeSc65jS2TMBIBWLMapm8095qmty39OrgYNhzjgPiIlKDS/LWA=="; + }; + }; + "@parcel/cache-2.4.0" = { + name = "_at_parcel_slash_cache"; + packageName = "@parcel/cache"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.4.0.tgz"; + sha512 = "oOudoAafrCAHQY0zkU7gVHG1pAGBUz9rht7Tx4WupTmAH0O0F5UnZs6XbjoBJaPHg+CYUXK7v9wQcrNA72E3GA=="; + }; + }; + "@parcel/codeframe-2.4.0" = { + name = "_at_parcel_slash_codeframe"; + packageName = "@parcel/codeframe"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.4.0.tgz"; + sha512 = "PJ3W9Z0sjoS2CANyo50c+LEr9IRZrtu0WsVPSYZ5ZYRuSXrSa/6PcAlnkyDk2+hi7Od8ncT2bmDexl0Oar3Jyg=="; + }; + }; + "@parcel/compressor-raw-2.4.0" = { + name = "_at_parcel_slash_compressor-raw"; + packageName = "@parcel/compressor-raw"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.4.0.tgz"; + sha512 = "ZErX14fTc0gKIgtnuqW7Clfln4dpXWfUaJQQIf5C3x/LkpUeEhdXeKntkvSxOddDk2JpIKDwqzAxEMZUnDo4Nw=="; + }; + }; + "@parcel/config-default-2.4.0" = { + name = "_at_parcel_slash_config-default"; + packageName = "@parcel/config-default"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.4.0.tgz"; + sha512 = "pFOPBXPO6HGqNWTLkcK5i8haMOrRgUouUhcWPGWDpN9IPUYFK2E/O1E/uyMjIA1mSL3FnazI+jJwZ45NhKPpIA=="; + }; + }; + "@parcel/core-2.4.0" = { + name = "_at_parcel_slash_core"; + packageName = "@parcel/core"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/core/-/core-2.4.0.tgz"; + sha512 = "EWZ2UWtIuwDc3fgsKyyTLpNNPoG8Yk2L117ICWF/+cqY8z/wJHm2KwLbeplDeq524shav0GJ9O4CemP3JPx0Nw=="; + }; + }; + "@parcel/css-1.7.3" = { + name = "_at_parcel_slash_css"; + packageName = "@parcel/css"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/css/-/css-1.7.3.tgz"; + sha512 = "rgdRX4Uk31EvzH/mUScL0wdXtkci3U5N1W2pgam+9S10vQy4uONhWBepZ1tUCjONHLacGXr1jp3LbG/HI7LiTw=="; + }; + }; + "@parcel/css-darwin-arm64-1.7.3" = { + name = "_at_parcel_slash_css-darwin-arm64"; + packageName = "@parcel/css-darwin-arm64"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.7.3.tgz"; + sha512 = "m3HDY+Rh8HJxmLELKAvCpF59vLS7FWtgBODHxl8G9Jl2CnGtXpXvdpyeMxNsTE+2QuPC+a5QT7IeZAKb2Gjmxg=="; + }; + }; + "@parcel/css-darwin-x64-1.7.3" = { + name = "_at_parcel_slash_css-darwin-x64"; + packageName = "@parcel/css-darwin-x64"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/css-darwin-x64/-/css-darwin-x64-1.7.3.tgz"; + sha512 = "LuhweXKxVwrz/hjAOm9XNRMSL+p23px20nhSCASkyUP7Higaxza948W3TSQdoL3YyR+wQxQH8Yj+R/T8Tz3E3g=="; + }; + }; + "@parcel/css-linux-arm-gnueabihf-1.7.3" = { + name = "_at_parcel_slash_css-linux-arm-gnueabihf"; + packageName = "@parcel/css-linux-arm-gnueabihf"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.7.3.tgz"; + sha512 = "/pd9Em18zMvt7eDZAMpNBEwF7c4VPVhAtBOZ59ClFrsXCTDNYP7mSy0cwNgtLelCRZCGAQmZNBDNQPH7vO3rew=="; + }; + }; + "@parcel/css-linux-arm64-gnu-1.7.3" = { + name = "_at_parcel_slash_css-linux-arm64-gnu"; + packageName = "@parcel/css-linux-arm64-gnu"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.7.3.tgz"; + sha512 = "5aKiEhQK40riO4iVKzRqISzgYK+7Z7i3e6JTSz+/BHuQyHEUaBe/RuJ8Z0BDQtFz0HmWQlrQCd+7hd0Xgd8vYQ=="; + }; + }; + "@parcel/css-linux-arm64-musl-1.7.3" = { + name = "_at_parcel_slash_css-linux-arm64-musl"; + packageName = "@parcel/css-linux-arm64-musl"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.7.3.tgz"; + sha512 = "Wf7/aIueDED2JqBMfZvzbBAFSaPmd3TR28bD2pmP7CI/jZnm9vHVKMdOLgt9NKSSSjdGrp+VM410CsrUM7xcOw=="; + }; + }; + "@parcel/css-linux-x64-gnu-1.7.3" = { + name = "_at_parcel_slash_css-linux-x64-gnu"; + packageName = "@parcel/css-linux-x64-gnu"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.7.3.tgz"; + sha512 = "0ZADbuFklUrHC1p2uPY4BPcN07jUTMqJzr/SSdnGN2XiXgiVZGcDCMHUj0DvC9Vwy11DDM6Rnw4QBbKHG+QGjQ=="; + }; + }; + "@parcel/css-linux-x64-musl-1.7.3" = { + name = "_at_parcel_slash_css-linux-x64-musl"; + packageName = "@parcel/css-linux-x64-musl"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.7.3.tgz"; + sha512 = "mFWWM8lX2OIID81YQuDDt9zTqof0B7UcEcs0huE7Zbs60uLEEQupdf8iH0yh5EOhxPt3sRcQnGXf2QTrXdjIMA=="; + }; + }; + "@parcel/css-win32-x64-msvc-1.7.3" = { + name = "_at_parcel_slash_css-win32-x64-msvc"; + packageName = "@parcel/css-win32-x64-msvc"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.7.3.tgz"; + sha512 = "KUFEMQcoP7DG3QbsN21OxhjHkfQ1BARn7D9puX75bV5N1F1kv557aaLkQZiMsgiYOL4tmJvsdQXutG7x++3j4Q=="; + }; + }; + "@parcel/diagnostic-2.4.0" = { + name = "_at_parcel_slash_diagnostic"; + packageName = "@parcel/diagnostic"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.4.0.tgz"; + sha512 = "TjWO/b2zMFhub5ouwGjazMm7iAUvdmXBfWmjrg4TBhUbhoQwBnyWfvMDtAYo7PcvXfxVPgPZv86Nv6Ym5H6cHQ=="; + }; + }; + "@parcel/events-2.4.0" = { + name = "_at_parcel_slash_events"; + packageName = "@parcel/events"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/events/-/events-2.4.0.tgz"; + sha512 = "DEaEtFbhOhNAEmiXJ3MyF8Scq+sNDKiTyLax4lAC5/dpE5GvwfNnoD17C2+0gDuuDpdQkdHfXfvr50aYFt7jcw=="; }; }; "@parcel/fs-1.11.0" = { @@ -6349,6 +7006,42 @@ let sha512 = "86RyEqULbbVoeo8OLcv+LQ1Vq2PKBAvWTU9fCgALxuCTbbs5Ppcvll4Vr+Ko1AnmMzja/k++SzNAwJfeQXVlpA=="; }; }; + "@parcel/fs-2.4.0" = { + name = "_at_parcel_slash_fs"; + packageName = "@parcel/fs"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.4.0.tgz"; + sha512 = "CnUlWGUJ52SJVQi8QnaAPPQZOADmHMV9D9aX9GLcDm5XLT3Em7vmesG4bNLdMLwzYuzAtenhcWmuRCACuYztHw=="; + }; + }; + "@parcel/fs-search-2.4.0" = { + name = "_at_parcel_slash_fs-search"; + packageName = "@parcel/fs-search"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.4.0.tgz"; + sha512 = "W/Vu6wbZk4wuB6AVdMkyymwh/S8Peed/PgJgSsApYD6lSTD315I6OuEdxZh3lWY+dqQdog/NJ7dvi/hdpH/Iqw=="; + }; + }; + "@parcel/graph-2.4.0" = { + name = "_at_parcel_slash_graph"; + packageName = "@parcel/graph"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.4.0.tgz"; + sha512 = "5TZIAfDITkJCzgH4j4OQhnIvjV9IFwWqNBJanRl5QQTmKvdcODS3WbnK1SOJ+ZltcLVXMB+HNXmL0bX0tVolcw=="; + }; + }; + "@parcel/hash-2.4.0" = { + name = "_at_parcel_slash_hash"; + packageName = "@parcel/hash"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.4.0.tgz"; + sha512 = "nB+wYNUhe6+G8M7vQhdeFXtpYJYwJgBHOPZ7Hd9O2jdlamWjDbw0t/u1dJbYvGJ8ZDtLDwiItawQVpuVdskQ9g=="; + }; + }; "@parcel/logger-1.11.1" = { name = "_at_parcel_slash_logger"; packageName = "@parcel/logger"; @@ -6358,6 +7051,330 @@ let sha512 = "9NF3M6UVeP2udOBDILuoEHd8VrF4vQqoWHEafymO1pfSoOMfxrSJZw1MfyAAIUN/IFp9qjcpDCUbDZB+ioVevA=="; }; }; + "@parcel/logger-2.4.0" = { + name = "_at_parcel_slash_logger"; + packageName = "@parcel/logger"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.4.0.tgz"; + sha512 = "DqfU0Zcs/0a7VBk+MsjJ80C66w4kM9EbkO3G12NIyEjNeG50ayW2CE9rUuJ91JaM9j0NFM1P82eyLpQPFFaVPw=="; + }; + }; + "@parcel/markdown-ansi-2.4.0" = { + name = "_at_parcel_slash_markdown-ansi"; + packageName = "@parcel/markdown-ansi"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.4.0.tgz"; + sha512 = "gPUP1xikxHiu2kFyPy35pfuVkFgAmcywO8YDQj7iYcB+k7l4QPpIYFYGXn2QADV4faf66ncMeTD4uYV8c0GqjQ=="; + }; + }; + "@parcel/namer-default-2.4.0" = { + name = "_at_parcel_slash_namer-default"; + packageName = "@parcel/namer-default"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.4.0.tgz"; + sha512 = "DfL+Gx0Tyoa0vsgRpNybXjuKbWNw8MTVpy7Dk7r0btfVsn1jy3SSwlxH4USf76gb00/pK6XBsMp9zn7Z8ePREQ=="; + }; + }; + "@parcel/node-resolver-core-2.4.0" = { + name = "_at_parcel_slash_node-resolver-core"; + packageName = "@parcel/node-resolver-core"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.4.0.tgz"; + sha512 = "qiN97XcfW2fYNoYuVEhNKuVPEJKj5ONQl0fqr/NEMmYvWz3bVKjgiXNJwW558elZvCI08gEbdxgyThpuFFQeKQ=="; + }; + }; + "@parcel/optimizer-css-2.4.0" = { + name = "_at_parcel_slash_optimizer-css"; + packageName = "@parcel/optimizer-css"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.4.0.tgz"; + sha512 = "LQmjjOGsHEHKTJqfHR2eJyhWhLXvHP0uOAU+qopBttYYlB2J/vMK9RYAye5cyAb8bQmV8wAdi2mq9rnt7FMSPw=="; + }; + }; + "@parcel/optimizer-htmlnano-2.4.0" = { + name = "_at_parcel_slash_optimizer-htmlnano"; + packageName = "@parcel/optimizer-htmlnano"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.4.0.tgz"; + sha512 = "02EbeElLgNOAYhGU7fFBahpoKrX5G/yzahpaoKB/ypScM4roSsAMBkGcluboR5L10YRsvfvJEpxvfGyDA3tPmw=="; + }; + }; + "@parcel/optimizer-image-2.4.0" = { + name = "_at_parcel_slash_optimizer-image"; + packageName = "@parcel/optimizer-image"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.4.0.tgz"; + sha512 = "Q4onaBMPkDyYxPzrb8ytBUftaQZFepj9dSUgq+ETuHDzkgia0tomDPfCqrw6ld0qvYyANzXTP5+LC4g0i5yh+A=="; + }; + }; + "@parcel/optimizer-svgo-2.4.0" = { + name = "_at_parcel_slash_optimizer-svgo"; + packageName = "@parcel/optimizer-svgo"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.4.0.tgz"; + sha512 = "mwvGuCqVuNCAuMlp2maFE/Uz9ud1T1AuX0f6cCRczjFYiwZuIr/0iDdfFzSziOkVo1MRAGAZNa0dRR/UzCZtVg=="; + }; + }; + "@parcel/optimizer-terser-2.4.0" = { + name = "_at_parcel_slash_optimizer-terser"; + packageName = "@parcel/optimizer-terser"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.4.0.tgz"; + sha512 = "PdCgRgXNSY6R1HTV9VG2MHp1CgUbP5pslCyxvlbUmQAS6bvEpMOpn3qSd+U28o7mGE/qXIhvpDyi808sb+MEcg=="; + }; + }; + "@parcel/package-manager-2.4.0" = { + name = "_at_parcel_slash_package-manager"; + packageName = "@parcel/package-manager"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.4.0.tgz"; + sha512 = "21AEfAQnZbHRVViTn7QsPGe/CiGaFaDUH5f0m8qVC7fDjjhC8LM8blkqU72goaO9FbaLMadtEf2txhzly7h/bg=="; + }; + }; + "@parcel/packager-css-2.4.0" = { + name = "_at_parcel_slash_packager-css"; + packageName = "@parcel/packager-css"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.4.0.tgz"; + sha512 = "LmPDWzkXi60Oy3WrPF0jPKQxeTwW5hmNBgrcXJMHSu+VcXdaQZNzNxVzhnZkJUbDd2z9vAUrUGzdLh8TquC8iQ=="; + }; + }; + "@parcel/packager-html-2.4.0" = { + name = "_at_parcel_slash_packager-html"; + packageName = "@parcel/packager-html"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.4.0.tgz"; + sha512 = "OPMIQ1uHYQFpRPrsmm5BqONbAyzjlhVsPRAzHlcBrglG4BTUeOR2ow4MUKblHmVVqc3QHnfZG4nHHtFkeuNQ3A=="; + }; + }; + "@parcel/packager-js-2.4.0" = { + name = "_at_parcel_slash_packager-js"; + packageName = "@parcel/packager-js"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.4.0.tgz"; + sha512 = "cfslIH43CJFgBS9PmdFaSnbInMCoejsFCnxtJa2GeUpjCXSfelPRp0OPx7m8n+fap4czftPhoxBALeDUElOZGQ=="; + }; + }; + "@parcel/packager-raw-2.4.0" = { + name = "_at_parcel_slash_packager-raw"; + packageName = "@parcel/packager-raw"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.4.0.tgz"; + sha512 = "SFfw7chMFITj3J26ZVDJxbO6xwtPFcFBm1js8cwWMgzwuwS6CEc43k5+Abj+2/EqHU9kNJU9eWV5vT6lQwf3HA=="; + }; + }; + "@parcel/packager-svg-2.4.0" = { + name = "_at_parcel_slash_packager-svg"; + packageName = "@parcel/packager-svg"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.4.0.tgz"; + sha512 = "DwkgrdLEQop+tu9Ocr1ZaadmpsbSgVruJPr80xq1LaB0Jiwrl9HjHStMNH1laNFueK1yydxhnj9C2JQfW28qag=="; + }; + }; + "@parcel/plugin-2.4.0" = { + name = "_at_parcel_slash_plugin"; + packageName = "@parcel/plugin"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.4.0.tgz"; + sha512 = "ehFUAL2+h27Lv+cYbbXA74UGy8C+eglUjcpvASOOjVRFuD6poMAMliKkKAXBhQaFx/Rvhz27A2PIPv9lL2i4UQ=="; + }; + }; + "@parcel/reporter-cli-2.4.0" = { + name = "_at_parcel_slash_reporter-cli"; + packageName = "@parcel/reporter-cli"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.4.0.tgz"; + sha512 = "Q9bIFMaGvQgypCDxdMEKOwrJzIHAXScKkuFsqTHnUL6mmH3Mo2CoEGAq/wpMXuPhXRn1dPJcHgTNDwZ2fSzz0A=="; + }; + }; + "@parcel/reporter-dev-server-2.4.0" = { + name = "_at_parcel_slash_reporter-dev-server"; + packageName = "@parcel/reporter-dev-server"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.4.0.tgz"; + sha512 = "24h++wevs7XYuX4dKa4PUfLSstvn3g7udajFv6CeQoME+dR25RL/wH/2LUbhV5ilgXXab76rWIndSqp78xHxPA=="; + }; + }; + "@parcel/resolver-default-2.4.0" = { + name = "_at_parcel_slash_resolver-default"; + packageName = "@parcel/resolver-default"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.4.0.tgz"; + sha512 = "K7pIIFmGm1hjg/7Mzkg99i8tfCClKfBUTuc2R5j8cdr2n0mCAi4/f2mFf5svLrb5XZrnDgoQ05tHKklLEfUDUw=="; + }; + }; + "@parcel/runtime-browser-hmr-2.4.0" = { + name = "_at_parcel_slash_runtime-browser-hmr"; + packageName = "@parcel/runtime-browser-hmr"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.4.0.tgz"; + sha512 = "swPFtvxGoCA9LEjU/pHPNjxG1l0fte8447zXwRN/AaYrtjNu9Ww117OSKCyvCnE143E79jZOFStodTQGFuH+9A=="; + }; + }; + "@parcel/runtime-js-2.4.0" = { + name = "_at_parcel_slash_runtime-js"; + packageName = "@parcel/runtime-js"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.4.0.tgz"; + sha512 = "67OOvmkDdtmgzZVP/EyAzoXhJ/Ug3LUVUt7idg9arun5rdJptqEb3Um3wmH0zjcNa9jMbJt7Kl5x1wA8dJgPYg=="; + }; + }; + "@parcel/runtime-react-refresh-2.4.0" = { + name = "_at_parcel_slash_runtime-react-refresh"; + packageName = "@parcel/runtime-react-refresh"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.4.0.tgz"; + sha512 = "flnr+bf06lMZPbXZZLLaFNrPHvYpfuXTVovEghyUW46qLVpaHj33dpsU/LqZplIuHgBp2ibgrKhr/hY9ell68w=="; + }; + }; + "@parcel/runtime-service-worker-2.4.0" = { + name = "_at_parcel_slash_runtime-service-worker"; + packageName = "@parcel/runtime-service-worker"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.4.0.tgz"; + sha512 = "RgM5QUqW22WzstW03CtV+Oih8VGVuwsf94Cc4hLouU2EAD0NUJgATWbFocZVTZIBTKELAWh2gjpSQDdnL4Ur+A=="; + }; + }; + "@parcel/source-map-2.0.2" = { + name = "_at_parcel_slash_source-map"; + packageName = "@parcel/source-map"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/source-map/-/source-map-2.0.2.tgz"; + sha512 = "NnUrPYLpYB6qyx2v6bcRPn/gVigmGG6M6xL8wIg/i0dP1GLkuY1nf+Hqdf63FzPTqqT7K3k6eE5yHPQVMO5jcA=="; + }; + }; + "@parcel/transformer-babel-2.4.0" = { + name = "_at_parcel_slash_transformer-babel"; + packageName = "@parcel/transformer-babel"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.4.0.tgz"; + sha512 = "iWDa7KzJTMP3HNmrYxiYq/S6redk2qminx/9MwmKIN9jzm8mgts2Lj9lOg/t66YaDGky6JAvw4DhB2qW4ni6yQ=="; + }; + }; + "@parcel/transformer-css-2.4.0" = { + name = "_at_parcel_slash_transformer-css"; + packageName = "@parcel/transformer-css"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.4.0.tgz"; + sha512 = "D2u48LuiQsQvbknABE0wVKFp9r6yCgWrHKEP1J6EJ31c49nXGXDHrpHJJwqq9BvAs/124eBI5mSsehTJyFEMwg=="; + }; + }; + "@parcel/transformer-html-2.4.0" = { + name = "_at_parcel_slash_transformer-html"; + packageName = "@parcel/transformer-html"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.4.0.tgz"; + sha512 = "2/8X/o5QaCNVPr4wkxLCUub7v/YVvVN2L5yCEcTatNeFhNg/2iz7P2ekfqOaoDCHWZEOBT1VTwPbdBt+TMM71Q=="; + }; + }; + "@parcel/transformer-image-2.4.0" = { + name = "_at_parcel_slash_transformer-image"; + packageName = "@parcel/transformer-image"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.4.0.tgz"; + sha512 = "JZkQvGGoGiD0AVKLIbAYYUWxepMmUaWZ4XXx71MmS/kA7cUDwTZ0CXq63YnSY1m+DX+ClTuTN8mBlwe2dkcGbA=="; + }; + }; + "@parcel/transformer-js-2.4.0" = { + name = "_at_parcel_slash_transformer-js"; + packageName = "@parcel/transformer-js"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.4.0.tgz"; + sha512 = "eeLHFwv3jT3GmIxpLC7B8EXExGK0MFaK91HXljOMh6l8a+GlQYw27MSFQVtoXr0Olx9Uq2uvjXP1+zSsq3LQUQ=="; + }; + }; + "@parcel/transformer-json-2.4.0" = { + name = "_at_parcel_slash_transformer-json"; + packageName = "@parcel/transformer-json"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.4.0.tgz"; + sha512 = "3nR+d39mbURoXIypDfVCaxpwL65qMV+h8SLD78up2uhaRGklHQfN7GuemR7L+mcVAgNrmwVvZHhyNjdgYwWqqg=="; + }; + }; + "@parcel/transformer-postcss-2.4.0" = { + name = "_at_parcel_slash_transformer-postcss"; + packageName = "@parcel/transformer-postcss"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.4.0.tgz"; + sha512 = "ijIa2x+dbKnJhr7zO5WlXkvuj832fDoGksMBk2DX3u2WMrbh2rqVWPpGFsDhESx7EAy38nUoV/5KUdrNqUmCEA=="; + }; + }; + "@parcel/transformer-posthtml-2.4.0" = { + name = "_at_parcel_slash_transformer-posthtml"; + packageName = "@parcel/transformer-posthtml"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.4.0.tgz"; + sha512 = "xoL3AzgtVeRRAo6bh0AHAYm9bt1jZ+HiH86/7oARj/uJs6Wd8kXK/DZf6fH+F87hj4e7bnjmDDc0GPVK0lPz1w=="; + }; + }; + "@parcel/transformer-raw-2.4.0" = { + name = "_at_parcel_slash_transformer-raw"; + packageName = "@parcel/transformer-raw"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.4.0.tgz"; + sha512 = "fciFbNrzj0kLlDgr6OsI0PUv414rVygDWAsgbCCq4BexDkuemMs9f9FjMctx9B2VZlctE8dTT4RGkuQumTIpUg=="; + }; + }; + "@parcel/transformer-react-refresh-wrap-2.4.0" = { + name = "_at_parcel_slash_transformer-react-refresh-wrap"; + packageName = "@parcel/transformer-react-refresh-wrap"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.4.0.tgz"; + sha512 = "9+f6sGOWkf0jyUQ1CuFWk+04Mq3KTOCU9kRiwCHX1YdUCv5uki6r9XUSpqiYodrV+L6w9CCwLvGMLCDHxtCxMg=="; + }; + }; + "@parcel/transformer-svg-2.4.0" = { + name = "_at_parcel_slash_transformer-svg"; + packageName = "@parcel/transformer-svg"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.4.0.tgz"; + sha512 = "D+yzVtSxtQML3d26fd/g4E/xYW68+OMbMUVLXORtoYMU42fnXQkJP6jGOdqy8Td+WORNY7EwVtQnESLwhBmolw=="; + }; + }; + "@parcel/types-2.4.0" = { + name = "_at_parcel_slash_types"; + packageName = "@parcel/types"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/types/-/types-2.4.0.tgz"; + sha512 = "nysGIbBEnp+7R+tKTysdcTFOZDTCodsiXFeAhYQa5bhiOnG1l9gzhxQnE2OsdsgvMm40IOsgKprqvM/DbdLfnQ=="; + }; + }; "@parcel/utils-1.11.0" = { name = "_at_parcel_slash_utils"; packageName = "@parcel/utils"; @@ -6367,6 +7384,15 @@ let sha512 = "cA3p4jTlaMeOtAKR/6AadanOPvKeg8VwgnHhOyfi0yClD0TZS/hi9xu12w4EzA/8NtHu0g6o4RDfcNjqN8l1AQ=="; }; }; + "@parcel/utils-2.4.0" = { + name = "_at_parcel_slash_utils"; + packageName = "@parcel/utils"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.4.0.tgz"; + sha512 = "sdNo+mZqDZT8LJYB6WWRKa4wFVZcK6Zb5Jh6Du76QvXXwHbPIQNZgJBb6gd/Rbk4GLOp2tW7MnBfq6zP9E9E2g=="; + }; + }; "@parcel/watcher-1.12.1" = { name = "_at_parcel_slash_watcher"; packageName = "@parcel/watcher"; @@ -6376,6 +7402,15 @@ let sha512 = "od+uCtCxC/KoNQAIE1vWx1YTyKYY+7CTrxBJPRh3cDWw/C0tCtlBMVlrbplscGoEpt6B27KhJDCv82PBxOERNA=="; }; }; + "@parcel/watcher-2.0.5" = { + name = "_at_parcel_slash_watcher"; + packageName = "@parcel/watcher"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.5.tgz"; + sha512 = "x0hUbjv891omnkcHD7ZOhiyyUqUUR6MNjq89JhEI3BxppeKWAm6NPQsqqRrAkCJBogdT/o/My21sXtTI9rJIsw=="; + }; + }; "@parcel/workers-1.11.0" = { name = "_at_parcel_slash_workers"; packageName = "@parcel/workers"; @@ -6385,6 +7420,42 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; + "@parcel/workers-2.4.0" = { + name = "_at_parcel_slash_workers"; + packageName = "@parcel/workers"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.4.0.tgz"; + sha512 = "eSFyvEoXXPgFzQfKIlpkUjpHfIbezUCRFTPKyJAKCxvU5DSXOpb1kz5vDESWQ4qTZXKnrKvxS1PPWN6bam9z0g=="; + }; + }; + "@peculiar/asn1-schema-2.1.0" = { + name = "_at_peculiar_slash_asn1-schema"; + packageName = "@peculiar/asn1-schema"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.1.0.tgz"; + sha512 = "D6g4C5YRKC/iPujMAOXuZ7YGdaoMx8GsvWzfVSyx2LYeL38ECOKNywlYAuwbqQvON64lgsYdAujWQPX8hhoBLw=="; + }; + }; + "@peculiar/json-schema-1.1.12" = { + name = "_at_peculiar_slash_json-schema"; + packageName = "@peculiar/json-schema"; + version = "1.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@peculiar/json-schema/-/json-schema-1.1.12.tgz"; + sha512 = "coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w=="; + }; + }; + "@peculiar/webcrypto-1.3.3" = { + name = "_at_peculiar_slash_webcrypto"; + packageName = "@peculiar/webcrypto"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@peculiar/webcrypto/-/webcrypto-1.3.3.tgz"; + sha512 = "+jkp16Hp18HkphJlMtqsQKjyDWJBh0AhDuoB+vVakuIRbkBdaFb7v26Ldm25altjiYhCyQnR5NChHxwSTvbXJw=="; + }; + }; "@pm2/agent-2.0.1" = { name = "_at_pm2_slash_agent"; packageName = "@pm2/agent"; @@ -6421,31 +7492,31 @@ let sha512 = "SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA=="; }; }; - "@primer/octicons-14.1.0" = { + "@primer/octicons-17.0.0" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "14.1.0"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-14.1.0.tgz"; - sha512 = "I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-17.0.0.tgz"; + sha512 = "DiIjtous4XPuR2deTctD3/RVZy/vRzVYBgYYvHV313MmTfkbVP60qLH5txrT3/bYNvnb0poNDelLS6U0kqlvHA=="; }; }; - "@prisma/engines-3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f" = { + "@prisma/engines-3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f"; + version = "3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f.tgz"; - sha512 = "bHYubuItSN/DGYo36aDu7xJiJmK52JOSHs4MK+KbceAtwS20BCWadRgtpQ3iZ2EXfN/B1T0iCXlNraaNwnpU2w=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9.tgz"; + sha512 = "MILbsGnvmnhCbFGa2/iSnsyGyazU3afzD7ldjCIeLIGKkNBMSZgA2IvpYsAXl+6qFHKGrS3B2otKfV31dwMSQw=="; }; }; - "@prisma/prisma-fmt-wasm-3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f" = { + "@prisma/prisma-fmt-wasm-3.11.0-48.b371888aaf8f51357c7457d836b86d12da91658b" = { name = "_at_prisma_slash_prisma-fmt-wasm"; packageName = "@prisma/prisma-fmt-wasm"; - version = "3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f"; + version = "3.11.0-48.b371888aaf8f51357c7457d836b86d12da91658b"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f.tgz"; - sha512 = "r3eqcIkyLMLGXMAO5anxDUlDjkJQLJ9WfVyBzaPDQICNw+506MWx3J3jllGSPEqifch17NLNEckfb9ox5gn7tA=="; + url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.11.0-48.b371888aaf8f51357c7457d836b86d12da91658b.tgz"; + sha512 = "bp8ksqxPmTIuAF13ujxtyUnbbeQl5H3EVLUDjswSARK/8dwQ6ORQC/Ho1wv63joyiuZstwl7K3FgqIY1OB1lcA=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -6538,13 +7609,31 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@putdotio/api-client-8.22.0" = { + "@purest/config-1.0.1" = { + name = "_at_purest_slash_config"; + packageName = "@purest/config"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@purest/config/-/config-1.0.1.tgz"; + sha512 = "cEG7U0X26a25SVrHsja5TohAfnkd0jjkjNu0bPX6cQdrSe16j/WeOuX1+TXbkDuZcirIDv7gjHSMe5vfCnW2og=="; + }; + }; + "@purest/providers-1.0.1" = { + name = "_at_purest_slash_providers"; + packageName = "@purest/providers"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@purest/providers/-/providers-1.0.1.tgz"; + sha512 = "1ekKViRit0jo1IzDLSRSziU/OpX9ckoj8uWvSWzHLASyTqhKZL9Pdq628guq7yT3qFcJeeaeaA5T97a4w7fpqA=="; + }; + }; + "@putdotio/api-client-8.31.2" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.22.0"; + version = "8.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.22.0.tgz"; - sha512 = "IL/ubwW6y4Y84JVbdPTxvdD0PHdVPBzXCjijmoCJFaazXYXP9iUGNeph0u5nuG+3El0CSuMQ6fz2Em0ktoXqrw=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.31.2.tgz"; + sha512 = "/pXMWQI2nHn0l9GHcETUZNZ3dYXhYwu91NW6efd/MDxDNtzI1HOt5psGgRx5mcyvLsifp9gzg6MqaeFQm/FtWA=="; }; }; "@reach/router-1.3.4" = { @@ -6601,13 +7690,13 @@ let sha512 = "y9qNj0//tZtWB2jfXNK3BX18BSBp9zNR7KE7lMysVHwbZtY392OJCjm6Rb/h4UHH2r1AqjNEHFD6bRn+DqU9Mw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.79" = { + "@redocly/openapi-core-1.0.0-beta.90" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.79"; + version = "1.0.0-beta.90"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.79.tgz"; - sha512 = "do79vGt3iiHsaVG9LKY8dH+d1E7TLHr+3T+CQ1lqagtWVjYOxqGaoxAT8tRD7R1W0z8BmS4e2poNON6c1sxP5g=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.90.tgz"; + sha512 = "MvkME+AWCBexyJyNp/sVFRUBjxCSk5CQ+CAozkwm0t/HusXp9G+kH26+e9giD6Fms129smr1qp3pCAUbwJZzZA=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -6619,6 +7708,24 @@ let sha512 = "feQEZlyBvQsbT/fvpJ4jJ5OLGaUPpnskHYDsY8DGpPymN+HUeDQrqkBEbbKRwMKidFTI2cxk2kJNNTnvdS9jyw=="; }; }; + "@request/api-0.6.0" = { + name = "_at_request_slash_api"; + packageName = "@request/api"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@request/api/-/api-0.6.0.tgz"; + sha1 = "e46e4c32e21db9ca72639701cba1ebfee06c1666"; + }; + }; + "@request/interface-0.1.0" = { + name = "_at_request_slash_interface"; + packageName = "@request/interface"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@request/interface/-/interface-0.1.0.tgz"; + sha1 = "c913504d3dc2810afad555b599aeaec2cc4c6768"; + }; + }; "@sailshq/lodash-3.10.4" = { name = "_at_sailshq_slash_lodash"; packageName = "@sailshq/lodash"; @@ -6646,13 +7753,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-13.1.4" = { + "@schematics/angular-13.3.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "13.1.4"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.1.4.tgz"; - sha512 = "P1YsHn1LLAmdpB9X2TBuUgrvEW/KaoBbHr8ifYO8/uQEXyeiIF+So8h/dnegkYkdsr3OwQ2X/j3UF6/+HS0odg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-13.3.0.tgz"; + sha512 = "WND6DXWf0ZFefqlC2hUm1FzHDonRfGpDEPWVhVulhYkB7IUUaXuCz8K41HAScyJ3bxUngs2Lx9+4omikc05fxA=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -6664,49 +7771,22 @@ let sha512 = "ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw=="; }; }; - "@serverless/cli-1.6.0" = { - name = "_at_serverless_slash_cli"; - packageName = "@serverless/cli"; - version = "1.6.0"; + "@selderee/plugin-htmlparser2-0.6.0" = { + name = "_at_selderee_slash_plugin-htmlparser2"; + packageName = "@selderee/plugin-htmlparser2"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.6.0.tgz"; - sha512 = "1Muw/KhS4sZ6+ZrXBdmVY9zAwZh03lF7v1DKtaZ0cmxjqQBwPLoO40rOGXlxR97pyufe2NS6rD/p+ri8NGqeXg=="; + url = "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.6.0.tgz"; + sha512 = "J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA=="; }; }; - "@serverless/component-metrics-1.0.8" = { - name = "_at_serverless_slash_component-metrics"; - packageName = "@serverless/component-metrics"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/component-metrics/-/component-metrics-1.0.8.tgz"; - sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; - }; - }; - "@serverless/components-3.18.2" = { - name = "_at_serverless_slash_components"; - packageName = "@serverless/components"; - version = "3.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.18.2.tgz"; - sha512 = "jQSgd3unajU94R6vjzD0l+PS5lVcky0vrE1DOfb28VPgmaS48+I/niavWR7+SOt0mYjIkUlwBI73a2ZuqeYK6Q=="; - }; - }; - "@serverless/core-1.1.2" = { - name = "_at_serverless_slash_core"; - packageName = "@serverless/core"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/core/-/core-1.1.2.tgz"; - sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; - }; - }; - "@serverless/dashboard-plugin-5.5.4" = { + "@serverless/dashboard-plugin-6.2.0" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "5.5.4"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.5.4.tgz"; - sha512 = "qqZnT/RXhBcWXwYnpF+GMeNvSUi6mnyIqsAHj8+f7jJ7N9qa5Qrb14+dUh78sdgRBG5Peub3m3Mlx1n5V9yHDw=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.2.0.tgz"; + sha512 = "3vapxoW1hI8OBxLRJq+J9vt3tdckZObhYWfwRPDlqPs6FOEoHuJieAzz07e7YdWt7fO/LkQx6rlgCXlGamLnjw=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -6718,76 +7798,31 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.3.0" = { + "@serverless/platform-client-4.3.2" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.3.0"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.3.0.tgz"; - sha512 = "q2CMqCkKeBaKA/UwfJAZLkdUsbghSbiYPvAX4rl9rsR5APm4KWtjKQP9CTOtVO5JRMWYoysK6jF0d5VJOABRzQ=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.3.2.tgz"; + sha512 = "DAa5Z0JAZc6UfrTZLYwqoZxgAponZpFwaqd7WzzMA+loMCkYWyJNwxrAmV6cr2UUJpkko4toPZuJ3vM9Ie+NDA=="; }; }; - "@serverless/platform-client-china-2.3.4" = { - name = "_at_serverless_slash_platform-client-china"; - packageName = "@serverless/platform-client-china"; - version = "2.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.3.4.tgz"; - sha512 = "JRrI3gnUZ0e6on8hHtVr4CwnhrU0jXd3iVfJknEE9tLS//syV77h7PhalZ79SemrboykRoSqhdu9qHf/wiFJ3A=="; - }; - }; - "@serverless/template-1.1.4" = { - name = "_at_serverless_slash_template"; - packageName = "@serverless/template"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/template/-/template-1.1.4.tgz"; - sha512 = "LYC+RmSD4ozStdCxSHInpVWP8h+0sSa0lmPGjAb1Fw4Ppk+LCJqJTrohbhHmF2ixgaIBu6ceNtVTB4qM+2NvIA=="; - }; - }; - "@serverless/utils-1.2.0" = { + "@serverless/utils-6.0.3" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "1.2.0"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-1.2.0.tgz"; - sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.0.3.tgz"; + sha512 = "6oKLqAkK6CG2zjAs2rfuHEOLoK11K/oep5bwGTEb5JmFP/92JQtvyb+FxP4DknL4jYpiYj1Dd5sCt5auHhOASg=="; }; }; - "@serverless/utils-4.1.0" = { - name = "_at_serverless_slash_utils"; - packageName = "@serverless/utils"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-4.1.0.tgz"; - sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; - }; - }; - "@serverless/utils-5.20.3" = { - name = "_at_serverless_slash_utils"; - packageName = "@serverless/utils"; - version = "5.20.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.20.3.tgz"; - sha512 = "MG3DQJdto+LaeVY9gh/z0xloAfT0h1Y3Pa4/yYcKe8Dy5HYtSujuav0MvTOH18+s2outjKKJDxTh6tZuyNqFDQ=="; - }; - }; - "@serverless/utils-china-1.1.5" = { - name = "_at_serverless_slash_utils-china"; - packageName = "@serverless/utils-china"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.1.5.tgz"; - sha512 = "pykhxsI+TlEbZzDUq5dkJPVWceNpaLU2ILEMsjUwyqGPsSE/g8Lrf7AhXseKtNK/7le3lduNnPacmY4Jb+GT+g=="; - }; - }; - "@sideway/address-4.1.3" = { + "@sideway/address-4.1.4" = { name = "_at_sideway_slash_address"; packageName = "@sideway/address"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@sideway/address/-/address-4.1.3.tgz"; - sha512 = "8ncEUtmnTsMmL7z1YPB47kPUq7LpKWJNFPsRzHiIajGC5uXlWGn+AmkYPcHNl8S4tcEGx+cnORnNYaw2wvL+LQ=="; + url = "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz"; + sha512 = "7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw=="; }; }; "@sideway/formula-3.0.0" = { @@ -6862,13 +7897,13 @@ let sha512 = "JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ=="; }; }; - "@sindresorhus/is-4.3.0" = { + "@sindresorhus/is-4.6.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "4.3.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.3.0.tgz"; - sha512 = "wwOvh0eO3PiTEivGJWiZ+b946SlMSb4pe+y+Ur/4S87cwo09pYi+FWHHnbrM3W9W7cBYKDqQXcrFYjYUCOJUEQ=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz"; + sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; }; }; "@sindresorhus/jimp-0.3.0" = { @@ -6880,6 +7915,24 @@ let sha512 = "ikwHOfJF0umx1eV/JpQDMsFxODvCSdD9zdIQVDEjcTNpfofz7+PZrjfKUFkG3iQ9mSUG3BwODv0XOEvTRNdovw=="; }; }; + "@sinonjs/commons-1.8.3" = { + name = "_at_sinonjs_slash_commons"; + packageName = "@sinonjs/commons"; + version = "1.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz"; + sha512 = "xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ=="; + }; + }; + "@sinonjs/fake-timers-8.1.0" = { + name = "_at_sinonjs_slash_fake-timers"; + packageName = "@sinonjs/fake-timers"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz"; + sha512 = "OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg=="; + }; + }; "@slack/client-3.16.0" = { name = "_at_slack_slash_client"; packageName = "@slack/client"; @@ -6898,13 +7951,49 @@ let sha512 = "dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ=="; }; }; - "@squoosh/lib-0.4.0" = { + "@socket.io/component-emitter-3.0.0" = { + name = "_at_socket.io_slash_component-emitter"; + packageName = "@socket.io/component-emitter"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.0.0.tgz"; + sha512 = "2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q=="; + }; + }; + "@soda/friendly-errors-webpack-plugin-1.8.1" = { + name = "_at_soda_slash_friendly-errors-webpack-plugin"; + packageName = "@soda/friendly-errors-webpack-plugin"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz"; + sha512 = "h2ooWqP8XuFqTXT+NyAFbrArzfQA7R6HTezADrvD9Re8fxMLTPPniLdqVTdDaO0eIoLaAwKT+d6w+5GeTk7Vbg=="; + }; + }; + "@soda/get-current-script-1.0.2" = { + name = "_at_soda_slash_get-current-script"; + packageName = "@soda/get-current-script"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.2.tgz"; + sha512 = "T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w=="; + }; + }; + "@sqltools/formatter-1.2.3" = { + name = "_at_sqltools_slash_formatter"; + packageName = "@sqltools/formatter"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.3.tgz"; + sha512 = "O3uyB/JbkAEMZaP3YqyHH7TMnex7tWyCbCI4EfJdOCoN6HIhqdJBWTM6aCCiWQ/5f5wxjgU735QAIpJbjDvmzg=="; + }; + }; + "@squoosh/lib-0.4.1" = { name = "_at_squoosh_slash_lib"; packageName = "@squoosh/lib"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@squoosh/lib/-/lib-0.4.0.tgz"; - sha512 = "O1LyugWLZjMI4JZeZMA5vzfhfPjfMZXH5/HmVkRagP8B70wH3uoR7tjxfGNdSavey357MwL8YJDxbGwBBdHp7Q=="; + url = "https://registry.npmjs.org/@squoosh/lib/-/lib-0.4.1.tgz"; + sha512 = "qAO4AXEpSnurikGFZwsG7DGi7QHBIaDpbumcDyUvJNOd652ksZSVXmFHwlEikc7hy0RQ9LczIURqfSDo/5oc5Q=="; }; }; "@starptech/expression-parser-0.10.0" = { @@ -7024,6 +8113,15 @@ let sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; + "@swc/helpers-0.3.8" = { + name = "_at_swc_slash_helpers"; + packageName = "@swc/helpers"; + version = "0.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.3.8.tgz"; + sha512 = "aWItSZvJj4+GI6FWkjZR13xPNPctq2RRakzo+O6vN7bC2yjwdg5EFpgaSAUn95b7BGSgcflvzVDPoKmJv24IOg=="; + }; + }; "@szmarczak/http-timer-1.1.2" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -7042,22 +8140,13 @@ let sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; - "@tencent-sdk/capi-1.1.8" = { - name = "_at_tencent-sdk_slash_capi"; - packageName = "@tencent-sdk/capi"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@tencent-sdk/capi/-/capi-1.1.8.tgz"; - sha512 = "AmyMQndtxMsM59eDeA0gGiw8T2LzNvDhx/xl+ygFXXrsw+yb/mit73ndHkiHKcRA1EpNHTyD1PN9ATxghzplfg=="; - }; - }; - "@textlint/ast-node-types-12.1.0" = { + "@textlint/ast-node-types-12.1.1" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.1.0.tgz"; - sha512 = "UlxqemrV/EnGTCl26OU7JhtFJpH7NZdgXvnsuII604orcIkvywUA1GGlg51grfbfqi+ar4zRsOb6fVbcbMZnKA=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.1.1.tgz"; + sha512 = "5/XK9S1177UYetOY6407o1RDuNVndaYfuzsZwhmo52V367s4ZuUD2064WhbmCd6TPyKD4dVr2zoWjfNDfzUZQg=="; }; }; "@textlint/ast-node-types-4.4.3" = { @@ -7069,67 +8158,67 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-12.1.0" = { + "@textlint/ast-tester-12.1.1" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.1.0.tgz"; - sha512 = "s3VHRDaULFYhxjJ3vP9LUIt2aHLnUB4XFUSRhUVnW4/GDOb1EXCGWFd+wtYy6jTtBg/5TR5ApdC6sNu/SLcb5w=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.1.1.tgz"; + sha512 = "lPbpp9qZ/Me852OzWWOSwqbYa9clziRRRfX6qeRqJOuuc8qNOzvP2vC7quvQPSNcGpnDse2bNwePgxtWhWb5fQ=="; }; }; - "@textlint/ast-traverse-12.1.0" = { + "@textlint/ast-traverse-12.1.1" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.1.0.tgz"; - sha512 = "NJCCMS7lxZ6Ed15zsosbe/5i/SyynqQsxOYxhsMHuyU/adx27WzNWLoFbgTdz6Wmn3Ok1PSFf0442MpoS6SP7g=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.1.1.tgz"; + sha512 = "/hiESq9fwR+4X4U7VfkjhUtuIRuJwnJZpgA+WiSpIwK4Ps60WhB1VBxecyxgNmj3s3EsJn95nCCJntgpa3qQcA=="; }; }; - "@textlint/feature-flag-12.1.0" = { + "@textlint/feature-flag-12.1.1" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.1.0.tgz"; - sha512 = "pQfA2bUXimBQjxT5hVmGGuFf1Cwwx26kbrcwkGHsgxgXlXkg1zboby5UCMOjWda/TbJjynzqDO0JaU24Ms9fZg=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.1.1.tgz"; + sha512 = "NykyIJ7UCs3R1tjThAS6upScmZdia0N/prOT7j1HpMbn1QK61Kqz7M3KZb0T/nhko6jwfN0d3aNP3oMCb4Vyxg=="; }; }; - "@textlint/fixer-formatter-12.1.0" = { + "@textlint/fixer-formatter-12.1.1" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.1.0.tgz"; - sha512 = "ELG9ehkid+J0sRd0mVRbZ+2UOnLqowycrYsaHxDE+xf2s33OcogZa9i3Uact7y2oSCadX00oNLEhsQcwkAqvpw=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.1.1.tgz"; + sha512 = "9+f3WG1raKqY+ynS1JS/ESLNgUaKK1gIgK9ENESvrJA0zfg5I774LjjJ65catrorTdv+HHDG40aiD67Pmxdk9A=="; }; }; - "@textlint/kernel-12.1.0" = { + "@textlint/kernel-12.1.1" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.1.0.tgz"; - sha512 = "6crFn0Ng4Y8PnUvD8HdGMZUlxURx3YgbDv/Grp+7kg8qLlNAkvbyJ1cE8ZYJTF+PfJ1dK1FZmmlZsvrieI4KBQ=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.1.1.tgz"; + sha512 = "5f/miUMLBLUhBy0sJeLVs+34O3GaYyG7hAuTQG9p0ERUnXdJIGtoYU5O0Sfm+xWXPUOeQadK6E7IR+7fsX4Hhw=="; }; }; - "@textlint/linter-formatter-12.1.0" = { + "@textlint/linter-formatter-12.1.1" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.1.0.tgz"; - sha512 = "OoDvn7wD+pAV+W2loCKgxO9V11rYo14GVKkp8UktsqzeOzxxRY5iZUOALMOOde19fOklb2mEvs8AJ4lDaRDJVQ=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.1.1.tgz"; + sha512 = "yE4g+OA+jVqEpF5NayuFoH4l3vvXPT3+gGD9TYhkjBUGmIZ0n4sMzOtmb9R+McujvENwk+7jTZ0pfHtZtpVSHQ=="; }; }; - "@textlint/markdown-to-ast-12.1.0" = { + "@textlint/markdown-to-ast-12.1.1" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.1.0.tgz"; - sha512 = "22FRiXRxTrNVe1gbE18V8TxAtrWb9rKUb1+2mt5vXdgByZ+rHUJuEc4UonAiye/8+0eTrJ4brjPNXgYsJGeMKg=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.1.1.tgz"; + sha512 = "TmqFyNqi68YpkqKabrkMlPzeSJMfY/+Wsv1/r43uDFgSYyM9GiD0eIpP12uKyL8xLW+rgfbqXxeFwSo26Conqw=="; }; }; "@textlint/markdown-to-ast-6.1.7" = { @@ -7141,67 +8230,67 @@ let sha512 = "B0QtokeQR4a9+4q0NQr8T9l7A1fFihTN5Ze57tVgqW+3ymzXEouh8DvPHeNQ4T6jEkAThvdjk95mxAMpGRJ79w=="; }; }; - "@textlint/module-interop-12.1.0" = { + "@textlint/module-interop-12.1.1" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.1.0.tgz"; - sha512 = "J1VhFZ7lK1V3Ue7DCvZlGIFEuaongBCkir1XFL+f1yfhfQlgfM5TCp3OBBB6NhKPff8T6sPA9niBzMYr+NyKyA=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.1.1.tgz"; + sha512 = "SiF2NVMFny7OdZ3I+qclJXkuPLOylJVd+v3mPGF8Ri5yuDgOKrbqNyHFzz/Sn2AS0ZsIf04/pGNBQhB+fJOBRQ=="; }; }; - "@textlint/source-code-fixer-12.1.0" = { + "@textlint/source-code-fixer-12.1.1" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.1.0.tgz"; - sha512 = "3HEWCu8XlRpxK0UmUxGEzc4u0deaO0GtisqaEsCVHzlQFq6tzE+5VTdZ4ffon64UN8UV57EAC2ralEV/VgxkBQ=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.1.1.tgz"; + sha512 = "+p7NE5W2Ie+a5dSXGG0onDrqQM9Quj9t9zQruqxN3Qm7F8JD3qBTx9XNZkzQKlnGtrN4x6FUp5wwH/X4BhHh1A=="; }; }; - "@textlint/text-to-ast-12.1.0" = { + "@textlint/text-to-ast-12.1.1" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.1.0.tgz"; - sha512 = "s45+d0E9+gMKz+LC9+sJamU7SVrPyGYsXVLDRM5oxqjdb0MeIfjIFj7xl52MUpAHnywbPSgakB6HHiryiEAmqQ=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.1.1.tgz"; + sha512 = "L+Wf6omQ9u/A+H8kr8Dv1bKQ7j5TeBJX7ShdZz+z0T3oOPDrpCHID6N/NbzuM+a1Q9s9UAG5gkqiROHNjXqUug=="; }; }; - "@textlint/textlint-plugin-markdown-12.1.0" = { + "@textlint/textlint-plugin-markdown-12.1.1" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.1.0.tgz"; - sha512 = "bS67fq4Ea2JdKO4mJM4sGSATVI1bw9++IfOIsx2rc01NfZlTxwz4kM8lrhvNFHGY4URaN1kCULSgupeI/u/Seg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.1.1.tgz"; + sha512 = "gzQ205ClqECTblIdkpFkWL6M4nxr5oMON/jU6xbRdZ/Shy+OHLY7fP3R2L2RmAmMSE7C6ZWK5Lk7k9XaaUpgVA=="; }; }; - "@textlint/textlint-plugin-text-12.1.0" = { + "@textlint/textlint-plugin-text-12.1.1" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.1.0.tgz"; - sha512 = "ItqpVEYLDYQkEk0ixeD4wElqkgkDErAGGDN/QK4cmIvtBeVd/GSIQFS1pwC1/Abmd4dTK3j/9z/dov1gVFZB1Q=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.1.1.tgz"; + sha512 = "U3WFM2fPy0ifC9lVW0GXjF5h1Dquit3rLO6UisC9UF75Ic6JjelcypjHwpp1trx0/t5FXp+94R5uJEpM360A0g=="; }; }; - "@textlint/types-12.1.0" = { + "@textlint/types-12.1.1" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-12.1.0.tgz"; - sha512 = "O8RQUiGnBvBrwV/fLHp2vU+y3w223G+qKUzvW/k2eFwAdbtmCfordoKESXAIGuqAUZjgiM2+Mt3We1pY+tMR3g=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-12.1.1.tgz"; + sha512 = "s0TjnEwEwp3fa8yEhEH8w/lFpih15wtQy2CYaKx0eMScl1bSh+0e8WhiGZaTiiJXAGwNCw6erxB0reBScdU/hA=="; }; }; - "@textlint/utils-12.1.0" = { + "@textlint/utils-12.1.1" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.1.0.tgz"; - sha512 = "WE0bxQ/q+PgSslqEBuDi4Z8ZskBA0ZEehmKqcsd0hpDWU4VRU/R9o/WVXwia0APbQxgXPYWaHf1Rb7FAKUcVcg=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.1.1.tgz"; + sha512 = "ENAm6ro+OAh6XZZSeZIJQCrY07IHWB7DGM6SwtKEfxcA9joF1uS/sLPqKmcW9fyvLvMnloVUsfVlaoNsLJXDKA=="; }; }; "@tokenizer/token-0.1.1" = { @@ -7267,15 +8356,6 @@ let sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; }; }; - "@ts-morph/common-0.11.1" = { - name = "_at_ts-morph_slash_common"; - packageName = "@ts-morph/common"; - version = "0.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@ts-morph/common/-/common-0.11.1.tgz"; - sha512 = "7hWZS0NRpEsNV8vWJzg7FEz6V8MaLNeJOmwmghqUXTpzk16V1LLZhdo+4QvE/+zv4cVci0OviuJFnqhEfoV3+g=="; - }; - }; "@tsconfig/node10-1.0.8" = { name = "_at_tsconfig_slash_node10"; packageName = "@tsconfig/node10"; @@ -7312,13 +8392,13 @@ let sha512 = "eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA=="; }; }; - "@turist/fetch-7.1.7" = { + "@turist/fetch-7.2.0" = { name = "_at_turist_slash_fetch"; packageName = "@turist/fetch"; - version = "7.1.7"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@turist/fetch/-/fetch-7.1.7.tgz"; - sha512 = "XP20kvfyMNlWdPVQXyuzA40LoCHbbJptikt7W+TlZ5sS+NNjk70xjXCtHBLEudp7li3JldXEFSIUzpW1a0WEhA=="; + url = "https://registry.npmjs.org/@turist/fetch/-/fetch-7.2.0.tgz"; + sha512 = "2x7EGw+6OJ29phunsbGvtxlNmSfcuPcyYudkMbi8gARCP9eJ1CtuMvnVUHL//O9Ixi9SJiug8wNt6lj86pN8XQ=="; }; }; "@turist/time-0.0.2" = { @@ -7348,6 +8428,15 @@ let sha512 = "veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ=="; }; }; + "@types/asn1js-2.0.2" = { + name = "_at_types_slash_asn1js"; + packageName = "@types/asn1js"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/asn1js/-/asn1js-2.0.2.tgz"; + sha512 = "t4YHCgtD+ERvH0FyxvNlYwJ2ezhqw7t+Ygh4urQ7dJER8i185JPv6oIM3ey5YQmGN6Zp9EMbpohkjZi9t3UxwA=="; + }; + }; "@types/atob-2.1.2" = { name = "_at_types_slash_atob"; packageName = "@types/atob"; @@ -7366,13 +8455,13 @@ let sha512 = "pkPtJUUY+Vwv6B1inAz55rQvivClHJxc9aVEPPmaq2cbyeMLCiDpbKpcKyX4LAwpNGi+SHBv0tHv6+0gXv0P2A=="; }; }; - "@types/babel__core-7.1.18" = { + "@types/babel__core-7.1.19" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.18"; + version = "7.1.19"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.18.tgz"; - sha512 = "S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ=="; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz"; + sha512 = "WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw=="; }; }; "@types/babel__generator-7.6.4" = { @@ -7411,15 +8500,6 @@ let sha512 = "G4yqdVlhr6YhzLXFKy5F7HtRBU8Y23+iWy7UKthMq/OSQnL1hbsoeXESQ2LY8zEDlknipDG3nRGhUC9tkwvy/w=="; }; }; - "@types/basic-auth-1.1.3" = { - name = "_at_types_slash_basic-auth"; - packageName = "@types/basic-auth"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/basic-auth/-/basic-auth-1.1.3.tgz"; - sha512 = "W3rv6J0IGlxqgE2eQ2pTb0gBjaGtejQpJ6uaCjz3UQ65+TFTPC5/lAE+POfx1YLdjtxvejJzsIAfd3MxWiVmfg=="; - }; - }; "@types/bn.js-5.1.0" = { name = "_at_types_slash_bn.js"; packageName = "@types/bn.js"; @@ -7438,6 +8518,15 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; + "@types/body-parser-1.19.1" = { + name = "_at_types_slash_body-parser"; + packageName = "@types/body-parser"; + version = "1.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.1.tgz"; + sha512 = "a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg=="; + }; + }; "@types/body-parser-1.19.2" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -7474,15 +8563,6 @@ let sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="; }; }; - "@types/chart.js-2.9.24" = { - name = "_at_types_slash_chart.js"; - packageName = "@types/chart.js"; - version = "2.9.24"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.24.tgz"; - sha512 = "AQI7X+ow3SaONl44JrHoL/5B+lCsJyG31UHZ5RP98Uh15hI/zjEkDsAb4EIm4P9TGfNhZLXw/nMc5w0u10+/fQ=="; - }; - }; "@types/clone-2.1.1" = { name = "_at_types_slash_clone"; packageName = "@types/clone"; @@ -7645,13 +8725,13 @@ let sha512 = "n0zoEj/fMdMOvqbHxmqnza/kXyoGgJmEpsXjpP+gEqE1Ye4yNqc7xWipKnUoMpWhMuzJQSfK2gMrwlElly7OGQ=="; }; }; - "@types/ejs-2.7.0" = { + "@types/ejs-3.1.0" = { name = "_at_types_slash_ejs"; packageName = "@types/ejs"; - version = "2.7.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ejs/-/ejs-2.7.0.tgz"; - sha512 = "kM2g9Fdk/du24fKuuQhA/LBleFR4Z4JP2MVKpLxQQSzofF1uJ06D+c05zfLDAkkDO55aEeNwJih0gHrE/Ci20A=="; + url = "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.0.tgz"; + sha512 = "DCg+Ka+uDQ31lJ/UtEXVlaeV3d6t81gifaVWKJy4MYVVgvJttyX/viREy+If7fz+tK/gVxTGMtyrFPnm4gjrVA=="; }; }; "@types/emoji-mart-3.0.9" = { @@ -7663,15 +8743,6 @@ let sha512 = "qdBo/2Y8MXaJ/2spKjDZocuq79GpnOhkwMHnK2GnVFa8WYFgfA+ei6sil3aeWQPCreOKIx9ogPpR5+7MaOqYAA=="; }; }; - "@types/engine.io-3.1.7" = { - name = "_at_types_slash_engine.io"; - packageName = "@types/engine.io"; - version = "3.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.7.tgz"; - sha512 = "qNjVXcrp+1sS8YpRUa714r0pgzOwESdW5UjHL7D/2ZFdBX0BXUXtg1LUrp+ylvqbvMcMWUy73YpRoxPN2VoKAQ=="; - }; - }; "@types/eslint-7.29.0" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; @@ -7681,13 +8752,13 @@ let sha512 = "VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng=="; }; }; - "@types/eslint-8.4.0" = { + "@types/eslint-8.4.1" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.0.tgz"; - sha512 = "JUYa/5JwoqikCy7O7jKtuNe9Z4ZZt615G+1EKfaDGSNEpzaA2OwbV/G1v08Oa7fd1XzlFoSCvt9ePl9/6FyAug=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.1.tgz"; + sha512 = "GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA=="; }; }; "@types/eslint-scope-3.7.3" = { @@ -7699,15 +8770,6 @@ let sha512 = "PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g=="; }; }; - "@types/eslint-visitor-keys-1.0.0" = { - name = "_at_types_slash_eslint-visitor-keys"; - packageName = "@types/eslint-visitor-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; - sha512 = "OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag=="; - }; - }; "@types/estree-0.0.50" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; @@ -7717,6 +8779,15 @@ let sha512 = "C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="; }; }; + "@types/estree-0.0.51" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "0.0.51"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz"; + sha512 = "CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="; + }; + }; "@types/estree-jsx-0.0.1" = { name = "_at_types_slash_estree-jsx"; packageName = "@types/estree-jsx"; @@ -7744,15 +8815,6 @@ let sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; - "@types/express-4.17.8" = { - name = "_at_types_slash_express"; - packageName = "@types/express"; - version = "4.17.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.8.tgz"; - sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ=="; - }; - }; "@types/express-serve-static-core-4.17.28" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; @@ -7762,13 +8824,13 @@ let sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; }; }; - "@types/fancy-log-1.3.0" = { - name = "_at_types_slash_fancy-log"; - packageName = "@types/fancy-log"; - version = "1.3.0"; + "@types/file-type-10.9.1" = { + name = "_at_types_slash_file-type"; + packageName = "@types/file-type"; + version = "10.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/fancy-log/-/fancy-log-1.3.0.tgz"; - sha512 = "mQjDxyOM1Cpocd+vm1kZBP7smwKZ4TNokFeds9LV7OZibmPJFEzY3+xZMrKfUdNT71lv8GoCPD6upKwHxubClw=="; + url = "https://registry.npmjs.org/@types/file-type/-/file-type-10.9.1.tgz"; + sha512 = "oq0fy8Jqj19HofanFsZ56o5anMDUQtFO9B3wfLqM9o42RyCe1WT+wRbSvRbL2l8ARZXNaJturHk0b442+0yi+g=="; }; }; "@types/fs-capacitor-2.0.0" = { @@ -7834,13 +8896,13 @@ let sha512 = "wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g=="; }; }; - "@types/hls.js-0.13.1" = { + "@types/hls.js-0.13.3" = { name = "_at_types_slash_hls.js"; packageName = "@types/hls.js"; - version = "0.13.1"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/hls.js/-/hls.js-0.13.1.tgz"; - sha512 = "5sr71YcHBVHJY8DhM+L6O9WjAGS3jrie2hpBldVpd8sqvRvNTgIikTE6RxKya1ZvJCvUkZR2ewQarZaC4TRZLg=="; + url = "https://registry.npmjs.org/@types/hls.js/-/hls.js-0.13.3.tgz"; + sha512 = "Po8ZPCsAcPPuf5OODPEkb6cdWJ/w4BdX1veP7IIOc2WG0x1SW4GEQ1+FHKN1AMG2AePJfNUceJbh5PKtP92yRQ=="; }; }; "@types/html-minifier-terser-5.1.2" = { @@ -7897,6 +8959,15 @@ let sha512 = "rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw=="; }; }; + "@types/inquirer-8.2.0" = { + name = "_at_types_slash_inquirer"; + packageName = "@types/inquirer"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.0.tgz"; + sha512 = "BNoMetRf3gmkpAlV5we+kxyZTle7YibdOntIZbU5pyIfMdcwy784KfeZDAcuyMznkh5OLa17RVXZOGA5LTlkgQ=="; + }; + }; "@types/is-empty-1.2.1" = { name = "_at_types_slash_is-empty"; packageName = "@types/is-empty"; @@ -7942,13 +9013,13 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; - "@types/jquery-3.5.13" = { + "@types/jquery-3.5.14" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.13"; + version = "3.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.13.tgz"; - sha512 = "ZxJrup8nz/ZxcU0vantG+TPdboMhB24jad2uSap50zE7Q9rUeYlCF25kFMSmHR33qoeOgqcdHEp3roaookC0Sg=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz"; + sha512 = "X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg=="; }; }; "@types/js-levenshtein-1.1.1" = { @@ -7960,15 +9031,6 @@ let sha512 = "qC4bCqYGy1y/NP7dDVr7KJarn+PbX1nSpwA7JXdu0HxT3QYjO8MJ+cntENtHFVy2dRAyBV23OZ6MxsW1AM1L8g=="; }; }; - "@types/js-yaml-3.12.5" = { - name = "_at_types_slash_js-yaml"; - packageName = "@types/js-yaml"; - version = "3.12.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.5.tgz"; - sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww=="; - }; - }; "@types/js-yaml-3.12.7" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; @@ -7978,6 +9040,15 @@ let sha512 = "S6+8JAYTE1qdsc9HMVsfY7+SgSuUU/Tp6TYTmITW0PZxiyIMvol3Gy//y69Wkhs0ti4py5qgR3uZH6uz/DNzJQ=="; }; }; + "@types/js-yaml-4.0.4" = { + name = "_at_types_slash_js-yaml"; + packageName = "@types/js-yaml"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.4.tgz"; + sha512 = "AuHubXUmg0AzkXH0Mx6sIxeY/1C110mm/EkE/gB1sTRz3h2dao2W/63q42SlVST+lICxz5Oki2hzYA6+KnnieQ=="; + }; + }; "@types/js-yaml-4.0.5" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; @@ -7996,6 +9067,15 @@ let sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw=="; }; }; + "@types/json-schema-7.0.11" = { + name = "_at_types_slash_json-schema"; + packageName = "@types/json-schema"; + version = "7.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"; + sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; + }; + }; "@types/json-schema-7.0.9" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -8005,6 +9085,15 @@ let sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="; }; }; + "@types/json-stable-stringify-1.0.33" = { + name = "_at_types_slash_json-stable-stringify"; + packageName = "@types/json-stable-stringify"; + version = "1.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-stable-stringify/-/json-stable-stringify-1.0.33.tgz"; + sha512 = "qEWiQff6q2tA5gcJGWwzplQcXdJtm+0oy6IHGHzlOf3eFAkGE/FIPXZK9ofWgNSHVp8AFFI33PJJshS0ei3Gvw=="; + }; + }; "@types/json5-0.0.29" = { name = "_at_types_slash_json5"; packageName = "@types/json5"; @@ -8023,13 +9112,13 @@ let sha512 = "GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw=="; }; }; - "@types/keyv-3.1.3" = { + "@types/keyv-3.1.4" = { name = "_at_types_slash_keyv"; packageName = "@types/keyv"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz"; - sha512 = "FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg=="; + url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz"; + sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; "@types/koa-2.13.4" = { @@ -8050,13 +9139,22 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.161" = { + "@types/linkify-it-3.0.2" = { + name = "_at_types_slash_linkify-it"; + packageName = "@types/linkify-it"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz"; + sha512 = "HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA=="; + }; + }; + "@types/lodash-4.14.176" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.161"; + version = "4.14.176"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz"; - sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.176.tgz"; + sha512 = "xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ=="; }; }; "@types/lodash-4.14.178" = { @@ -8068,6 +9166,15 @@ let sha512 = "0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="; }; }; + "@types/lodash-4.14.180" = { + name = "_at_types_slash_lodash"; + packageName = "@types/lodash"; + version = "4.14.180"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.180.tgz"; + sha512 = "XOKXa1KIxtNXgASAnwj7cnttJxS4fksBRywK/9LzRV5YxrF80BXZIGeQSuoESQ/VkUj30Ae0+YcuHc15wJCB2g=="; + }; + }; "@types/long-4.0.1" = { name = "_at_types_slash_long"; packageName = "@types/long"; @@ -8086,13 +9193,13 @@ let sha512 = "h0MqA7rtP88vuMepODf1oomJLeuRAZfOiYdeGS3NYO4TMQs237TkA+bNehy7V5nfyCjPRuKrb0fnWMjncHak0g=="; }; }; - "@types/material-design-lite-1.1.16" = { - name = "_at_types_slash_material-design-lite"; - packageName = "@types/material-design-lite"; - version = "1.1.16"; + "@types/markdown-it-12.2.3" = { + name = "_at_types_slash_markdown-it"; + packageName = "@types/markdown-it"; + version = "12.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/material-design-lite/-/material-design-lite-1.1.16.tgz"; - sha512 = "559S2XW9YMwHznROJ4WFhZJOerJPuxLfqOX+LIKukyLo2NbVgpULwXUsrBlCwhZ4+ACHgVAE23CC3RS52lFxwA=="; + url = "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz"; + sha512 = "GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ=="; }; }; "@types/mdast-3.0.10" = { @@ -8104,6 +9211,15 @@ let sha512 = "W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA=="; }; }; + "@types/mdurl-1.0.2" = { + name = "_at_types_slash_mdurl"; + packageName = "@types/mdurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz"; + sha512 = "eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA=="; + }; + }; "@types/mime-1.3.2" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; @@ -8131,15 +9247,6 @@ let sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/minimist-1.2.0" = { - name = "_at_types_slash_minimist"; - packageName = "@types/minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz"; - sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; - }; - }; "@types/minimist-1.2.2" = { name = "_at_types_slash_minimist"; packageName = "@types/minimist"; @@ -8149,22 +9256,13 @@ let sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; }; }; - "@types/mithril-2.0.3" = { - name = "_at_types_slash_mithril"; - packageName = "@types/mithril"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mithril/-/mithril-2.0.3.tgz"; - sha512 = "cZHOdO2IiXYeyjeDYdbOisSdfaJRzfmRo3zVzgu33IWTMA0KEQObp9fdvqcuYdPz93iJ1yCl19GcEjo/9yv+yA=="; - }; - }; - "@types/mkdirp-1.0.1" = { + "@types/mkdirp-1.0.2" = { name = "_at_types_slash_mkdirp"; packageName = "@types/mkdirp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.1.tgz"; - sha512 = "HkGSK7CGAXncr8Qn/0VqNtExEE+PHMWb+qlR1faHMao7ng6P3tAaoWWBMdva0gL5h4zprjIO89GJOLXsMcDm1Q=="; + url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.2.tgz"; + sha512 = "o0K1tSO0Dx5X6xlU5F1D6625FawhC3dU3iqr25lluNv/+/QIVH8RLNEiVokgIZo+mz+87w/3Mkg/VvQS+J51fQ=="; }; }; "@types/mocha-7.0.2" = { @@ -8176,13 +9274,13 @@ let sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; - "@types/mocha-8.2.3" = { - name = "_at_types_slash_mocha"; - packageName = "@types/mocha"; - version = "8.2.3"; + "@types/mongodb-4.0.6" = { + name = "_at_types_slash_mongodb"; + packageName = "@types/mongodb"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.3.tgz"; - sha512 = "ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw=="; + url = "https://registry.npmjs.org/@types/mongodb/-/mongodb-4.0.6.tgz"; + sha512 = "XTbn1Z1j7fHzC1Vkd9LYO48lO2C581r+oRCi/KNzcTHIri7hEaya8r9vxoHJiKr+oeUWVK69+9xr84Mp+aReaw=="; }; }; "@types/ms-0.7.31" = { @@ -8194,22 +9292,13 @@ let sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; }; }; - "@types/multer-1.4.4" = { + "@types/multer-1.4.7" = { name = "_at_types_slash_multer"; packageName = "@types/multer"; - version = "1.4.4"; + version = "1.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.4.tgz"; - sha512 = "wdfkiKBBEMTODNbuF3J+qDDSqJxt50yB9pgDiTcFew7f97Gcc7/sM4HR66ofGgpJPOALWOqKAch4gPyqEXSkeQ=="; - }; - }; - "@types/mysql-2.15.15" = { - name = "_at_types_slash_mysql"; - packageName = "@types/mysql"; - version = "2.15.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mysql/-/mysql-2.15.15.tgz"; - sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw=="; + url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.7.tgz"; + sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; "@types/nlcst-1.0.0" = { @@ -8239,13 +9328,22 @@ let sha512 = "F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw=="; }; }; - "@types/node-12.20.42" = { + "@types/node-11.11.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.42"; + version = "11.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.42.tgz"; - sha512 = "aI3/oo5DzyiI5R/xAhxxRzfZlWlsbbqdgxfTPkqu/Zt+23GXiJvMCyPJT4+xKSXOnLqoL8jJYMLTwvK2M3a5hw=="; + url = "https://registry.npmjs.org/@types/node/-/node-11.11.6.tgz"; + sha512 = "Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ=="; + }; + }; + "@types/node-12.20.47" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "12.20.47"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-12.20.47.tgz"; + sha512 = "BzcaRsnFuznzOItW1WpQrDHM7plAa7GIDMZ6b5pnMbkqEtM/6WCOhvZar39oeMQP79gwvFUWjjptE7/KGcNqFg=="; }; }; "@types/node-13.13.52" = { @@ -8257,15 +9355,6 @@ let sha512 = "s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ=="; }; }; - "@types/node-14.11.1" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "14.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz"; - sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; - }; - }; "@types/node-14.17.34" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -8275,13 +9364,13 @@ let sha512 = "USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg=="; }; }; - "@types/node-14.18.9" = { + "@types/node-14.18.12" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.18.9"; + version = "14.18.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.18.9.tgz"; - sha512 = "j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz"; + sha512 = "q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A=="; }; }; "@types/node-15.14.9" = { @@ -8293,22 +9382,22 @@ let sha512 = "qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A=="; }; }; - "@types/node-16.11.12" = { + "@types/node-16.11.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.12"; + version = "16.11.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz"; - sha512 = "+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz"; + sha512 = "GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ=="; }; }; - "@types/node-16.11.21" = { + "@types/node-16.11.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.21"; + version = "16.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.21.tgz"; - sha512 = "Pf8M1XD9i1ksZEcCP8vuSNwooJ/bZapNmIzpmsMaL+jMI+8mEYU3PKvs+xDNuQcJWF/x24WzY4qxLtB0zNow9A=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.6.tgz"; + sha512 = "ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="; }; }; "@types/node-16.11.7" = { @@ -8320,22 +9409,31 @@ let sha512 = "QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="; }; }; - "@types/node-17.0.10" = { + "@types/node-17.0.15" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.10"; + version = "17.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.10.tgz"; - sha512 = "S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.15.tgz"; + sha512 = "zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA=="; }; }; - "@types/node-17.0.8" = { + "@types/node-17.0.21" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.8"; + version = "17.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz"; - sha512 = "YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz"; + sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="; + }; + }; + "@types/node-17.0.23" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "17.0.23"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz"; + sha512 = "UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="; }; }; "@types/node-6.14.13" = { @@ -8365,13 +9463,13 @@ let sha512 = "/aKAdg5c8n468cYLy2eQrcR5k6chlbNwZNGUj3TboyPa2hcO2QAJcfymlqPzMiRj8B6nYKXjzQz36minFE0RwQ=="; }; }; - "@types/node-fetch-2.5.12" = { + "@types/node-fetch-2.6.1" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.5.12"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz"; - sha512 = "MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.1.tgz"; + sha512 = "oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA=="; }; }; "@types/normalize-package-data-2.4.1" = { @@ -8419,24 +9517,6 @@ let sha512 = "Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ=="; }; }; - "@types/pg-7.14.5" = { - name = "_at_types_slash_pg"; - packageName = "@types/pg"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/pg/-/pg-7.14.5.tgz"; - sha512 = "wqTKZmqkqXd1YiVRBT2poRrMIojwEi2bKTAAjUX6nEbzr98jc3cfR/7o7ZtubhH5xT7YJ6LRdRr1GZOgs8OUjg=="; - }; - }; - "@types/pg-types-2.2.0" = { - name = "_at_types_slash_pg-types"; - packageName = "@types/pg-types"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/pg-types/-/pg-types-2.2.0.tgz"; - sha512 = "a+fLdul8OczRvPWPf8eTb6wPhxzyWQwRGhNN0ugtOtk6yFOG53i2LwXaA0d2D6bsJlWxi6eCuGZLGoCcdOlWZA=="; - }; - }; "@types/prop-types-15.7.4" = { name = "_at_types_slash_prop-types"; packageName = "@types/prop-types"; @@ -8491,22 +9571,22 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/rc-1.2.0" = { + "@types/rc-1.2.1" = { name = "_at_types_slash_rc"; packageName = "@types/rc"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/rc/-/rc-1.2.0.tgz"; - sha512 = "eEQ6Hq0K0VShe00iDzG1DKxA5liTsk7jgcR5eDZ5d5cnivLjPqqcDgqurS5NlQJNfgTNg51dp7zFGWHomr5NJQ=="; + url = "https://registry.npmjs.org/@types/rc/-/rc-1.2.1.tgz"; + sha512 = "+TRLFmHLnpoV0uw4O/PzqMbPT6bhQM0q2KO0l+R7M3sHYRndPpNL6kv8p7Ee9ZxgQ6noYB18/t+heQi7eijOHA=="; }; }; - "@types/react-16.14.21" = { + "@types/react-16.14.24" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "16.14.21"; + version = "16.14.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-16.14.21.tgz"; - sha512 = "rY4DzPKK/4aohyWiDRHS2fotN5rhBSK6/rz1X37KzNna9HJyqtaGAbq9fVttrEPWF5ywpfIP1ITL8Xi2QZn6Eg=="; + url = "https://registry.npmjs.org/@types/react/-/react-16.14.24.tgz"; + sha512 = "e7U2WC8XQP/xfR7bwhOhNFZKPTfW1ph+MiqtudKb8tSV8RyCsovQx2sNVtKoOryjxFKpHPPC/yNiGfdeVM5Gyw=="; }; }; "@types/react-dom-16.9.14" = { @@ -8527,22 +9607,13 @@ let sha512 = "V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw=="; }; }; - "@types/react-window-infinite-loader-1.0.5" = { + "@types/react-window-infinite-loader-1.0.6" = { name = "_at_types_slash_react-window-infinite-loader"; packageName = "@types/react-window-infinite-loader"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react-window-infinite-loader/-/react-window-infinite-loader-1.0.5.tgz"; - sha512 = "3v45+4oBNJpSroULtb2EgTJyyK4pCjOMCg+RT/HnA3or5zY4jYufv6uH9NWPyLv0nx8dqt1s4nJqHilfthwKSw=="; - }; - }; - "@types/request-2.48.5" = { - name = "_at_types_slash_request"; - packageName = "@types/request"; - version = "2.48.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.48.5.tgz"; - sha512 = "/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ=="; + url = "https://registry.npmjs.org/@types/react-window-infinite-loader/-/react-window-infinite-loader-1.0.6.tgz"; + sha512 = "V8g8sBDLVeJJAfEENJS7VXZK+DRJ+jzPNtk8jpj2G+obhf+iqGNUDGwNWCbBhLiD+KpHhf3kWQlKBRi0tAeU4Q=="; }; }; "@types/request-2.48.7" = { @@ -8563,15 +9634,6 @@ let sha512 = "whjk1EDJPcAR2kYHRbFl/lKeeKYTi05A15K9bnLInCVroNDCtXce57xKdI0/rQaA3K+6q0eFyUBPmqfSndUZdQ=="; }; }; - "@types/request-promise-native-1.0.18" = { - name = "_at_types_slash_request-promise-native"; - packageName = "@types/request-promise-native"; - version = "1.0.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/request-promise-native/-/request-promise-native-1.0.18.tgz"; - sha512 = "tPnODeISFc/c1LjWyLuZUY+Z0uLB3+IMfNoQyDEi395+j6kTFTTRAqjENjoPJUid4vHRGEozoTrcTrfZM+AcbA=="; - }; - }; "@types/resolve-0.0.8" = { name = "_at_types_slash_resolve"; packageName = "@types/resolve"; @@ -8653,22 +9715,31 @@ let sha512 = "JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="; }; }; - "@types/socket.io-2.1.11" = { - name = "_at_types_slash_socket.io"; - packageName = "@types/socket.io"; - version = "2.1.11"; + "@types/smoothscroll-polyfill-0.3.1" = { + name = "_at_types_slash_smoothscroll-polyfill"; + packageName = "@types/smoothscroll-polyfill"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/socket.io/-/socket.io-2.1.11.tgz"; - sha512 = "bVprmqPhJMLb9ZCm8g0Xy8kwBFRbnanOWSxzWkDkkIwxTvud5tKMfAJymXX6LQbizUKCS1yima7JM4BeLqjNqA=="; + url = "https://registry.npmjs.org/@types/smoothscroll-polyfill/-/smoothscroll-polyfill-0.3.1.tgz"; + sha512 = "+KkHw4y+EyeCtVXET7woHUhIbfWFCflc0E0mZnSV+ZdjPQeHt/9KPEuT7gSW/kFQ8O3EG30PLO++YhChDt8+Ag=="; }; }; - "@types/socket.io-client-1.4.33" = { + "@types/socket.io-3.0.1" = { + name = "_at_types_slash_socket.io"; + packageName = "@types/socket.io"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/socket.io/-/socket.io-3.0.1.tgz"; + sha512 = "XSma2FhVD78ymvoxYV4xGXrIH/0EKQ93rR+YR0Y+Kw1xbPzLDCip/UWSejZ08FpxYeYNci/PZPQS9anrvJRqMA=="; + }; + }; + "@types/socket.io-client-1.4.36" = { name = "_at_types_slash_socket.io-client"; packageName = "@types/socket.io-client"; - version = "1.4.33"; + version = "1.4.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.33.tgz"; - sha512 = "m4LnxkljsI9fMsjwpW5QhRpMixo2BeeLpFmg0AE+sS4H1pzAd/cs/ftTiL60FLZgfFa8PFRPx5KsHu8O0bADKQ=="; + url = "https://registry.npmjs.org/@types/socket.io-client/-/socket.io-client-1.4.36.tgz"; + sha512 = "ZJWjtFBeBy1kRSYpVbeGYTElf6BqPQUkXDlHHD4k/42byCN5Rh027f4yARHCink9sKAkbtGZXEAmR0ZCnc2/Ag=="; }; }; "@types/sockjs-0.3.33" = { @@ -8689,13 +9760,31 @@ let sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; }; }; - "@types/sqlite3-3.1.6" = { + "@types/source-map-support-0.5.4" = { + name = "_at_types_slash_source-map-support"; + packageName = "@types/source-map-support"; + version = "0.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/source-map-support/-/source-map-support-0.5.4.tgz"; + sha512 = "9zGujX1sOPg32XLyfgEB/0G9ZnrjthL/Iv1ZfuAjj8LEilHZEpQSQs1scpRXPhHzGYgWiLz9ldF1cI8JhL+yMw=="; + }; + }; + "@types/sqlite3-3.1.7" = { name = "_at_types_slash_sqlite3"; packageName = "@types/sqlite3"; - version = "3.1.6"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sqlite3/-/sqlite3-3.1.6.tgz"; - sha512 = "OBsK0KIGUICExQ/ZvnPY4cKx5Kz4NcrVyGTIvOL5y4ajXu7r++RfBajfpGfGDmDVCKcoCDX1dO84/oeyeITnxA=="; + url = "https://registry.npmjs.org/@types/sqlite3/-/sqlite3-3.1.7.tgz"; + sha512 = "8FHV/8Uzd7IwdHm5mvmF2Aif4aC/gjrt4axWD9SmfaxITnOjtOhCbOSTuqv/VbH1uq0QrwlaTj9aTz3gmR6u4w=="; + }; + }; + "@types/stack-utils-2.0.1" = { + name = "_at_types_slash_stack-utils"; + packageName = "@types/stack-utils"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz"; + sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; }; }; "@types/structured-source-3.0.0" = { @@ -8779,22 +9868,31 @@ let sha512 = "PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="; }; }; - "@types/url-join-4.0.0" = { + "@types/url-join-4.0.1" = { name = "_at_types_slash_url-join"; packageName = "@types/url-join"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/url-join/-/url-join-4.0.0.tgz"; - sha512 = "awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw=="; + url = "https://registry.npmjs.org/@types/url-join/-/url-join-4.0.1.tgz"; + sha512 = "wDXw9LEEUHyV+7UWy7U315nrJGJ7p1BzaCxDpEoLr789Dk1WDVMMlf3iBfbG2F8NdWnYyFbtTxUn2ZNbm1Q4LQ=="; }; }; - "@types/url-parse-1.4.7" = { + "@types/url-parse-1.4.8" = { name = "_at_types_slash_url-parse"; packageName = "@types/url-parse"; - version = "1.4.7"; + version = "1.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.7.tgz"; - sha512 = "EGfNfKmF21obwe37d2YFNcLYG67EifYO2B7Zl+N1uVjutZPQ8gSGOOozOu7KQEP8mqSl3X/wG5THZ/OLMotb1Q=="; + url = "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.8.tgz"; + sha512 = "zqqcGKyNWgTLFBxmaexGUKQyWqeG7HjXj20EuQJSJWwXe54BjX0ihIo5cJB9yAQzH8dNugJ9GvkBYMjPXs/PJw=="; + }; + }; + "@types/uuid-3.4.10" = { + name = "_at_types_slash_uuid"; + packageName = "@types/uuid"; + version = "3.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.10.tgz"; + sha512 = "BgeaZuElf7DEYZhWYDTc/XcLZXdVgFkVSTa13BqKvbnmUrxr3TJFKofUxCtDO9UQOdhnV+HPOESdHiHKZOJV1A=="; }; }; "@types/vfile-3.0.2" = { @@ -8824,13 +9922,31 @@ let sha512 = "ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g=="; }; }; - "@types/vscode-1.63.1" = { + "@types/vscode-1.63.2" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.63.1"; + version = "1.63.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.63.1.tgz"; - sha512 = "Z+ZqjRcnGfHP86dvx/BtSwWyZPKQ/LBdmAVImY82TphyjOw2KgTKcp7Nx92oNwCTsHzlshwexAG/WiY2JuUm3g=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.63.2.tgz"; + sha512 = "awvdx4vX7SkMKyvWIlRjycjb4blYRSQI3Bav0YMn+lJLGN6gJgb20urN/dQCv/2ejDu5S6ADEBt6O15DOpIAkg=="; + }; + }; + "@types/vscode-1.65.0" = { + name = "_at_types_slash_vscode"; + packageName = "@types/vscode"; + version = "1.65.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.65.0.tgz"; + sha512 = "wQhExnh2nEzpjDMSKhUvnNmz3ucpd3E+R7wJkOhBNK3No6fG3VUdmVmMOKD0A8NDZDDDiQcLNxe3oGmX5SjJ5w=="; + }; + }; + "@types/webidl-conversions-6.1.1" = { + name = "_at_types_slash_webidl-conversions"; + packageName = "@types/webidl-conversions"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-6.1.1.tgz"; + sha512 = "XAahCdThVuCFDQLT7R7Pk/vqeObFNL3YqRyFZg+AqAP/W1/w3xHaIxuW7WszQqTbIBOPRcItYJIou3i/mppu3Q=="; }; }; "@types/webpack-4.41.32" = { @@ -8842,6 +9958,24 @@ let sha512 = "cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg=="; }; }; + "@types/webpack-dev-server-3.11.6" = { + name = "_at_types_slash_webpack-dev-server"; + packageName = "@types/webpack-dev-server"; + version = "3.11.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-3.11.6.tgz"; + sha512 = "XCph0RiiqFGetukCTC3KVnY1jwLcZ84illFRMbyFzCcWl90B/76ew0tSqF46oBhnLC4obNDG7dMO0JfTN0MgMQ=="; + }; + }; + "@types/webpack-env-1.16.3" = { + name = "_at_types_slash_webpack-env"; + packageName = "@types/webpack-env"; + version = "1.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.16.3.tgz"; + sha512 = "9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw=="; + }; + }; "@types/webpack-sources-3.2.0" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; @@ -8860,13 +9994,40 @@ let sha512 = "B5m9aq7cbbD/5/jThEr33nUY8WEfVi6A2YKCTOvw5Ldy7mtsOkqRvGjnzy6g7iMMDsgu7xREuCzqATLDLQVKcQ=="; }; }; - "@types/websocket-1.0.4" = { + "@types/websocket-1.0.5" = { name = "_at_types_slash_websocket"; packageName = "@types/websocket"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.4.tgz"; - sha512 = "qn1LkcFEKK8RPp459jkjzsfpbsx36BBt3oC3pITYtkoBw/aVX+EZFa5j3ThCRTNpLFvIMr5dSTD4RaMdilIOpA=="; + url = "https://registry.npmjs.org/@types/websocket/-/websocket-1.0.5.tgz"; + sha512 = "NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ=="; + }; + }; + "@types/whatwg-url-8.2.1" = { + name = "_at_types_slash_whatwg-url"; + packageName = "@types/whatwg-url"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.1.tgz"; + sha512 = "2YubE1sjj5ifxievI5Ge1sckb9k/Er66HyR2c+3+I6VDUUg1TLPdYYTEbQ+DjRkS4nTxMJhgWfSfMRD2sl2EYQ=="; + }; + }; + "@types/which-2.0.1" = { + name = "_at_types_slash_which"; + packageName = "@types/which"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/which/-/which-2.0.1.tgz"; + sha512 = "Jjakcv8Roqtio6w1gr0D7y6twbhx6gGgFGF5BLwajPpnOIOxFkakFhCq+LmyyeAz7BX6ULrjBOxdKaCDy+4+dQ=="; + }; + }; + "@types/ws-6.0.4" = { + name = "_at_types_slash_ws"; + packageName = "@types/ws"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz"; + sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; }; }; "@types/ws-7.4.7" = { @@ -8896,6 +10057,24 @@ let sha512 = "NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg=="; }; }; + "@types/ws-8.5.2" = { + name = "_at_types_slash_ws"; + packageName = "@types/ws"; + version = "8.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.2.tgz"; + sha512 = "VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw=="; + }; + }; + "@types/ws-8.5.3" = { + name = "_at_types_slash_ws"; + packageName = "@types/ws"; + version = "8.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz"; + sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; + }; + }; "@types/yargs-15.0.14" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -8905,13 +10084,22 @@ let sha512 = "yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ=="; }; }; - "@types/yargs-parser-20.2.1" = { + "@types/yargs-16.0.4" = { + name = "_at_types_slash_yargs"; + packageName = "@types/yargs"; + version = "16.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz"; + sha512 = "T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw=="; + }; + }; + "@types/yargs-parser-21.0.0" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "20.2.1"; + version = "21.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; - sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; + sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; }; "@types/yauzl-2.9.2" = { @@ -8941,13 +10129,13 @@ let sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/experimental-utils-3.10.1" = { - name = "_at_typescript-eslint_slash_experimental-utils"; - packageName = "@typescript-eslint/experimental-utils"; - version = "3.10.1"; + "@typescript-eslint/eslint-plugin-5.16.0" = { + name = "_at_typescript-eslint_slash_eslint-plugin"; + packageName = "@typescript-eslint/eslint-plugin"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz"; - sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.16.0.tgz"; + sha512 = "SJoba1edXvQRMmNI505Uo4XmGbxCK9ARQpkvOd00anxzri9RNQk0DDCxD+LIl+jYhkzOJiOMMKYEHnHEODjdCw=="; }; }; "@typescript-eslint/experimental-utils-4.33.0" = { @@ -8959,15 +10147,6 @@ let sha512 = "zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q=="; }; }; - "@typescript-eslint/parser-3.10.1" = { - name = "_at_typescript-eslint_slash_parser"; - packageName = "@typescript-eslint/parser"; - version = "3.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.10.1.tgz"; - sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; - }; - }; "@typescript-eslint/parser-4.33.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; @@ -8977,6 +10156,15 @@ let sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; + "@typescript-eslint/parser-5.16.0" = { + name = "_at_typescript-eslint_slash_parser"; + packageName = "@typescript-eslint/parser"; + version = "5.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.16.0.tgz"; + sha512 = "fkDq86F0zl8FicnJtdXakFs4lnuebH6ZADDw6CYQv0UZeIjHvmEw87m9/29nk2Dv5Lmdp0zQ3zDQhiMWQf/GbA=="; + }; + }; "@typescript-eslint/scope-manager-4.33.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; @@ -8986,13 +10174,22 @@ let sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/types-3.10.1" = { - name = "_at_typescript-eslint_slash_types"; - packageName = "@typescript-eslint/types"; - version = "3.10.1"; + "@typescript-eslint/scope-manager-5.16.0" = { + name = "_at_typescript-eslint_slash_scope-manager"; + packageName = "@typescript-eslint/scope-manager"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz"; - sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.16.0.tgz"; + sha512 = "P+Yab2Hovg8NekLIR/mOElCDPyGgFZKhGoZA901Yax6WR6HVeGLbsqJkZ+Cvk5nts/dAlFKm8PfL43UZnWdpIQ=="; + }; + }; + "@typescript-eslint/type-utils-5.16.0" = { + name = "_at_typescript-eslint_slash_type-utils"; + packageName = "@typescript-eslint/type-utils"; + version = "5.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.16.0.tgz"; + sha512 = "SKygICv54CCRl1Vq5ewwQUJV/8padIWvPgCxlWPGO/OgQLCijY9G7lDu6H+mqfQtbzDNlVjzVWQmeqbLMBLEwQ=="; }; }; "@typescript-eslint/types-4.33.0" = { @@ -9004,13 +10201,13 @@ let sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/typescript-estree-3.10.1" = { - name = "_at_typescript-eslint_slash_typescript-estree"; - packageName = "@typescript-eslint/typescript-estree"; - version = "3.10.1"; + "@typescript-eslint/types-5.16.0" = { + name = "_at_typescript-eslint_slash_types"; + packageName = "@typescript-eslint/types"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz"; - sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.16.0.tgz"; + sha512 = "oUorOwLj/3/3p/HFwrp6m/J2VfbLC8gjW5X3awpQJ/bSG+YRGFS4dpsvtQ8T2VNveV+LflQHjlLvB6v0R87z4g=="; }; }; "@typescript-eslint/typescript-estree-4.33.0" = { @@ -9022,13 +10219,22 @@ let sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/visitor-keys-3.10.1" = { - name = "_at_typescript-eslint_slash_visitor-keys"; - packageName = "@typescript-eslint/visitor-keys"; - version = "3.10.1"; + "@typescript-eslint/typescript-estree-5.16.0" = { + name = "_at_typescript-eslint_slash_typescript-estree"; + packageName = "@typescript-eslint/typescript-estree"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz"; - sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.16.0.tgz"; + sha512 = "SE4VfbLWUZl9MR+ngLSARptUv2E8brY0luCdgmUevU6arZRY/KxYoLI/3V/yxaURR8tLRN7bmZtJdgmzLHI6pQ=="; + }; + }; + "@typescript-eslint/utils-5.16.0" = { + name = "_at_typescript-eslint_slash_utils"; + packageName = "@typescript-eslint/utils"; + version = "5.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.16.0.tgz"; + sha512 = "iYej2ER6AwmejLWMWzJIHy3nPJeGDuCqf8Jnb+jAQVoPpmWzwQOfa9hWVB8GIQE5gsCv/rfN4T+AYb/V06WseQ=="; }; }; "@typescript-eslint/visitor-keys-4.33.0" = { @@ -9040,67 +10246,13 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@uifabric/foundation-7.10.1" = { - name = "_at_uifabric_slash_foundation"; - packageName = "@uifabric/foundation"; - version = "7.10.1"; + "@typescript-eslint/visitor-keys-5.16.0" = { + name = "_at_typescript-eslint_slash_visitor-keys"; + packageName = "@typescript-eslint/visitor-keys"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.10.1.tgz"; - sha512 = "Op05qHLBFEieT4+fG8OgpzqDHTQyei1dgVXDd6M4VS6CFJ5ZIPtC7Lwi+ZlkPkwUwccQ9mijuQumzpNKdv035A=="; - }; - }; - "@uifabric/icons-7.6.2" = { - name = "_at_uifabric_slash_icons"; - packageName = "@uifabric/icons"; - version = "7.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.6.2.tgz"; - sha512 = "q7jEIwB5Tt2Egw9fqdgNPlBqBQ6hNNMQ3qs5y4S4YETRluB+AQTdKbrbYMsXo3Pm0FsJnRfiDojMzxusGX+MWA=="; - }; - }; - "@uifabric/merge-styles-7.19.2" = { - name = "_at_uifabric_slash_merge-styles"; - packageName = "@uifabric/merge-styles"; - version = "7.19.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.19.2.tgz"; - sha512 = "kTlhwglDqwVgIaJq+0yXgzi65plGhmFcPrfme/rXUGMJZoU+qlGT5jXj5d3kuI59p6VB8jWEg9DAxHozhYeu0g=="; - }; - }; - "@uifabric/react-hooks-7.14.0" = { - name = "_at_uifabric_slash_react-hooks"; - packageName = "@uifabric/react-hooks"; - version = "7.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.14.0.tgz"; - sha512 = "Ndu/DEKHF4gFXEZa2AGgSkdWaj+njVrsSyXbkWRh2UZReFWnH1LMko9p/ZCwk1i9kAd5CUmyIfURUzIEya9YCg=="; - }; - }; - "@uifabric/set-version-7.0.24" = { - name = "_at_uifabric_slash_set-version"; - packageName = "@uifabric/set-version"; - version = "7.0.24"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.24.tgz"; - sha512 = "t0Pt21dRqdC707/ConVJC0WvcQ/KF7tKLU8AZY7YdjgJpMHi1c0C427DB4jfUY19I92f60LOQyhJ4efH+KpFEg=="; - }; - }; - "@uifabric/styling-7.20.0" = { - name = "_at_uifabric_slash_styling"; - packageName = "@uifabric/styling"; - version = "7.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.20.0.tgz"; - sha512 = "SoaK5J4cwn8D9DWejRlWo+TmKZaHIiVlkIH+B2zLXE8Uc4ZYcotwYGxaSc1gCA16viLvGQkQU+ieWFq91RxdRw=="; - }; - }; - "@uifabric/utilities-7.33.5" = { - name = "_at_uifabric_slash_utilities"; - packageName = "@uifabric/utilities"; - version = "7.33.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.33.5.tgz"; - sha512 = "I+Oi0deD/xltSluFY8l2EVd/J4mvOaMljxKO2knSD9/KoGDlo/o5GN4gbnVo8nIt76HWHLAk3KtlJKJm6BhbIQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.16.0.tgz"; + sha512 = "jqxO8msp5vZDhikTwq9ubyMHqZ67UIvawohr4qF3KhlpL7gzSjOd+8471H3nh5LyABkaI85laEKKU8SnGUK5/g=="; }; }; "@ungap/promise-all-settled-1.1.2" = { @@ -9112,13 +10264,13 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; - "@unicode/unicode-13.0.0-1.2.1" = { - name = "_at_unicode_slash_unicode-13.0.0"; - packageName = "@unicode/unicode-13.0.0"; + "@unicode/unicode-14.0.0-1.2.1" = { + name = "_at_unicode_slash_unicode-14.0.0"; + packageName = "@unicode/unicode-14.0.0"; version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.2.1.tgz"; - sha512 = "8NDE4zZASktxJe+hV13K795wefyx+wRhu3Wl7TJ8fzsKx95CHsgTFmYRTscqna90zpUz6YBjGyqXHBI2ubiMaw=="; + url = "https://registry.npmjs.org/@unicode/unicode-14.0.0/-/unicode-14.0.0-1.2.1.tgz"; + sha512 = "M7NfPQP0PsCRFIUnmtFMgMiC5CCB26YwURCWIE48RQKbtN61sXrDhuXNq9w/tkBOtVeU84IAB1MMK9c+d2iR7A=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -9130,112 +10282,247 @@ let sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084"; }; }; - "@vercel/build-utils-2.12.2" = { + "@vercel/build-utils-2.15.0" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "2.12.2"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-2.12.2.tgz"; - sha512 = "KbSgG2ZCVXhUsdbnpv6gC7buygd31jaKiKhrd4Lzv1NwjnoeDZAXlm4hzvSPYHVtCY2jirKJWP2rFtMW8iAh9g=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-2.15.0.tgz"; + sha512 = "0SwM19Mn//v5RuLG5gjuZVOnn1iYqJDMA+N0qm8cK7bTBEWMiTKqF+VmdXkvg6Y6X6rKviAJnOBUUUP6va6Xaw=="; }; }; - "@vercel/go-1.2.3" = { + "@vercel/go-1.3.1" = { name = "_at_vercel_slash_go"; packageName = "@vercel/go"; - version = "1.2.3"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/go/-/go-1.2.3.tgz"; - sha512 = "BZCHRz43Qfr0DwZlZQCcofR+3cr+H+HK72/ZPkZy1Uq0NYjJMlmZ3ahuMgvJxT9lfC1RA6eOEUlUsZ+gqKcMCg=="; + url = "https://registry.npmjs.org/@vercel/go/-/go-1.3.1.tgz"; + sha512 = "mNo0DWfc49trswz53Gf0Km7KKdOW1zvlBEP6ZWhEhnEjRcNMHZaLg3dq3jWfttLaQ7ihJ+VOyDImd0NX23C42A=="; }; }; - "@vercel/node-1.12.1" = { + "@vercel/node-1.14.0" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "1.12.1"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-1.12.1.tgz"; - sha512 = "NcawIY05BvVkWlsowaxF2hl/hJg475U8JvT2FnGykFPMx31q1/FtqyTw/awSrKfOSRXR0InrbEIDIelmS9NzPA=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-1.14.0.tgz"; + sha512 = "UAb1qQMeTkSXz95yljJpz0MyTzcj++B/1XR0vKFZOs2CEfSkBO1DjzX6BkaKriaihBdbGM/X9UoMJfWfUBBn8Q=="; }; }; - "@vercel/python-2.0.5" = { + "@vercel/node-bridge-2.2.0" = { + name = "_at_vercel_slash_node-bridge"; + packageName = "@vercel/node-bridge"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/node-bridge/-/node-bridge-2.2.0.tgz"; + sha512 = "ydYlZyIQfsuriF6qTt/F4vaAt+nb4ZKhLEl2o5AQFa5ED7LoPS5w01Xbujy+25pqS1ODu8/bsqOCUSX8y/+tSQ=="; + }; + }; + "@vercel/python-2.2.1" = { name = "_at_vercel_slash_python"; packageName = "@vercel/python"; - version = "2.0.5"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/python/-/python-2.0.5.tgz"; - sha512 = "WCSTTw6He2COaSBiGDk2q5Q1ue+z5usRZcvUHCpsK6KvNkkV/PrY8JT73XQysMWKiXh6yQy19IUFAOqK/xwhig=="; + url = "https://registry.npmjs.org/@vercel/python/-/python-2.2.1.tgz"; + sha512 = "UxftYfkXX+e+5aQK8D3j+N0zb8ob4KFjdbLCnWLCMlxg0lJwD432zArgYgc0BSMrZrHqdiWMvPxIgKkad2takA=="; }; }; - "@vercel/ruby-1.2.7" = { + "@vercel/ruby-1.3.1" = { name = "_at_vercel_slash_ruby"; packageName = "@vercel/ruby"; - version = "1.2.7"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.2.7.tgz"; - sha512 = "ZG2VxMHHSKocL57UWsfNc9UsblwYGm55/ujqGIBnkNUURnRgtUrwtWlEts1eJ4VHD754Lc/0/R1pfJXoN5SbRw=="; + url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.1.tgz"; + sha512 = "stdlKpBUgQT/AxLz+xFpIy2m8xYr7nOA+hjq+MprktWu4RsyIeltSYX49Ju7DNPXdHxyAWxW6tnVENNvh1SOxA=="; }; }; - "@vue/cli-shared-utils-4.5.15" = { + "@vscode/emmet-helper-2.8.4" = { + name = "_at_vscode_slash_emmet-helper"; + packageName = "@vscode/emmet-helper"; + version = "2.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.8.4.tgz"; + sha512 = "lUki5QLS47bz/U8IlG9VQ+1lfxMtxMZENmU5nu4Z71eOD5j9FK0SmYGL5NiVJg9WBWeAU0VxRADMY2Qpq7BfVg=="; + }; + }; + "@vscode/test-electron-2.1.3" = { + name = "_at_vscode_slash_test-electron"; + packageName = "@vscode/test-electron"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.1.3.tgz"; + sha512 = "ps/yJ/9ToUZtR1dHfWi1mDXtep1VoyyrmGKC3UnIbScToRQvbUjyy1VMqnMEW3EpMmC3g7+pyThIPtPyCLHyow=="; + }; + }; + "@vue/cli-overlay-4.5.17" = { + name = "_at_vue_slash_cli-overlay"; + packageName = "@vue/cli-overlay"; + version = "4.5.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.5.17.tgz"; + sha512 = "QKKp66VbMg+X8Qh0wgXSwgxLfxY7EIkZkV6bZ6nFqBx8xtaJQVDbTL+4zcUPPA6nygbIcQ6gvTinNEqIqX6FUQ=="; + }; + }; + "@vue/cli-plugin-eslint-4.5.12" = { + name = "_at_vue_slash_cli-plugin-eslint"; + packageName = "@vue/cli-plugin-eslint"; + version = "4.5.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.12.tgz"; + sha512 = "nbjGJkWxo/xdD32DwvnEAUwkWYsObpqNk9NuU7T62ehdzHPzz58o3j03YZ7a7T7Le8bYyOWMYsdNfz63F+XiZQ=="; + }; + }; + "@vue/cli-plugin-router-4.5.17" = { + name = "_at_vue_slash_cli-plugin-router"; + packageName = "@vue/cli-plugin-router"; + version = "4.5.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.5.17.tgz"; + sha512 = "9r9CSwqv2+39XHQPDZJ0uaTtTP7oe0Gx17m7kBhHG3FA7R7AOSk2aVzhHZmDRhzlOxjx9kQSvrOSMfUG0kV4dQ=="; + }; + }; + "@vue/cli-plugin-typescript-4.5.13" = { + name = "_at_vue_slash_cli-plugin-typescript"; + packageName = "@vue/cli-plugin-typescript"; + version = "4.5.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-typescript/-/cli-plugin-typescript-4.5.13.tgz"; + sha512 = "CpLlIdFNV1gn9uC4Yh6QgWI42uk2x5Z3cb2ScxNSwWsR1vgSdr0/1DdNzoBm68aP8RUtnHHO/HZfPnvXiq42xA=="; + }; + }; + "@vue/cli-plugin-vuex-4.5.13" = { + name = "_at_vue_slash_cli-plugin-vuex"; + packageName = "@vue/cli-plugin-vuex"; + version = "4.5.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.13.tgz"; + sha512 = "I1S9wZC7iI0Wn8kw8Zh+A2Qkf6s1M6vTGBkx8boXjuzfwEEyEHRxadsVCecZc8Mkpydo0nykj+MyYF96TKFuVA=="; + }; + }; + "@vue/cli-service-4.5.13" = { + name = "_at_vue_slash_cli-service"; + packageName = "@vue/cli-service"; + version = "4.5.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.5.13.tgz"; + sha512 = "CKAZN4iokMMsaUyJRU22oUAz3oS/X9sVBSKAF2/shFBV5xh3jqAlKl8OXZYz4cXGFLA6djNuYrniuLAo7Ku97A=="; + }; + }; + "@vue/cli-shared-utils-4.5.17" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.5.15"; + version = "4.5.17"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.15.tgz"; - sha512 = "SKaej9hHzzjKSOw1NlFmc6BSE0vcqUQMQiv1cxQ2DhVyy4QxZXBmzmiLBUBe+hYZZs1neXW7n//udeN9bCAY+Q=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.17.tgz"; + sha512 = "VoFNdxvTW4vZu3ne+j1Mf7mU99J2SAoRVn9XPrsouTUUJablglM8DASk7Ixhsh6ymyL/W9EADQFR6Pgj8Ujjuw=="; }; }; - "@vue/cli-ui-4.5.15" = { + "@vue/cli-shared-utils-5.0.4" = { + name = "_at_vue_slash_cli-shared-utils"; + packageName = "@vue/cli-shared-utils"; + version = "5.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-5.0.4.tgz"; + sha512 = "nfAsj8Nopu5sVHMBIaut/YL7NaJFVmTBSTJD7LM17jc5uytrM9JwiRtzCiv3JWRBG78Xdb/s2Xb/1YR4fkdmkQ=="; + }; + }; + "@vue/cli-ui-5.0.4" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.5.15"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.15.tgz"; - sha512 = "n32NC8RxI5HSeDH6QoK5LxgTDSN9HOj7Ra1eHlxQDqN2ppz3OhUAhsSEUe4puCq97dReYQeW6zpvCZOAyZgsIg=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-5.0.4.tgz"; + sha512 = "6RkvN5XphYHfBUhKS7wG2ChrEhdLx05v6ppq53wy0/3N126j/5UM+fl48vbnMzCeRgpTn75IRI89ysPqiDyX3A=="; }; }; - "@vue/cli-ui-addon-webpack-4.5.15" = { + "@vue/cli-ui-addon-webpack-5.0.4" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.5.15"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.15.tgz"; - sha512 = "WpMlsnu4rkQ2fb7lFnPoVtmT0pmCVJI6VkCa/bDMZjz5enLmGewGamJle/RWNwzTsvi59aroYMClXcTa2dQHBw=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-5.0.4.tgz"; + sha512 = "QVF5rG9qOVizdq4iZ4NhqwLEigOH+Ulhx9IZpaoLh0VlLqbqrwuHs4QOKNFsuvdGM4LHXCp8XH6EKFScPbJ9Mg=="; }; }; - "@vue/cli-ui-addon-widgets-4.5.15" = { + "@vue/cli-ui-addon-widgets-5.0.4" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.5.15"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.15.tgz"; - sha512 = "B4Rc4wGgxTAOivy0tmBEuPAbSYeTzv3dusoQUOW1CVT3N5zYkEuxVj8OXmUQ1YECWaK+IjvQQMFkBuXt//lp7g=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-5.0.4.tgz"; + sha512 = "KmJUazIEZWhy0UaFHV5Uy8AXpTqJgCPizEHhtxs3f8mIkUnwWjcQFG7FGfsAW7RgsN8hwcSZ5ZFjmXhllVwrkw=="; }; }; - "@vue/compiler-core-3.2.28" = { + "@vue/compiler-core-3.2.31" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.28"; + version = "3.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.28.tgz"; - sha512 = "mQpfEjmHVxmWKaup0HL6tLMv2HqjjJu7XT4/q0IoUXYXC4xKG8lIVn5YChJqxBTLPuQjzas7u7i9L4PAWJZRtA=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.31.tgz"; + sha512 = "aKno00qoA4o+V/kR6i/pE+aP+esng5siNAVQ422TkBNM6qA4veXiZbSe8OTXHXquEi/f6Akc+nLfB4JGfe4/WQ=="; }; }; - "@vue/compiler-dom-3.2.28" = { + "@vue/compiler-dom-3.2.31" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.28"; + version = "3.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.28.tgz"; - sha512 = "KA4yXceLteKC7VykvPnViUixemQw3A+oii+deSbZJOQKQKVh1HLosI10qxa8ImPCyun41+wG3uGR+tW7eu1W6Q=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz"; + sha512 = "60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg=="; }; }; - "@vue/shared-3.2.28" = { + "@vue/component-compiler-utils-3.3.0" = { + name = "_at_vue_slash_component-compiler-utils"; + packageName = "@vue/component-compiler-utils"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz"; + sha512 = "97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ=="; + }; + }; + "@vue/eslint-config-prettier-6.0.0" = { + name = "_at_vue_slash_eslint-config-prettier"; + packageName = "@vue/eslint-config-prettier"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-6.0.0.tgz"; + sha512 = "wFQmv45c3ige5EA+ngijq40YpVcIkAy0Lihupnsnd1Dao5CBbPyfCzqtejFLZX1EwH/kCJdpz3t6s+5wd3+KxQ=="; + }; + }; + "@vue/eslint-config-typescript-7.0.0" = { + name = "_at_vue_slash_eslint-config-typescript"; + packageName = "@vue/eslint-config-typescript"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-7.0.0.tgz"; + sha512 = "UxUlvpSrFOoF8aQ+zX1leYiEBEm7CZmXYn/ZEM1zwSadUzpamx56RB4+Htdjisv1mX2tOjBegNUqH3kz2OL+Aw=="; + }; + }; + "@vue/preload-webpack-plugin-1.1.2" = { + name = "_at_vue_slash_preload-webpack-plugin"; + packageName = "@vue/preload-webpack-plugin"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz"; + sha512 = "LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ=="; + }; + }; + "@vue/shared-3.2.31" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.28"; + version = "3.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.28.tgz"; - sha512 = "eMQ8s9j8FpbGHlgUAaj/coaG3Q8YtMsoWL/RIHTsE3Ex7PUTyr7V91vB5HqWB5Sn8m4RXTHGO22/skoTUYvp0A=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.31.tgz"; + sha512 = "ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ=="; + }; + }; + "@vue/web-component-wrapper-1.3.0" = { + name = "_at_vue_slash_web-component-wrapper"; + packageName = "@vue/web-component-wrapper"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz"; + sha512 = "Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -9733,31 +11020,31 @@ let sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; }; - "@webpack-cli/configtest-1.1.0" = { + "@webpack-cli/configtest-1.1.1" = { name = "_at_webpack-cli_slash_configtest"; packageName = "@webpack-cli/configtest"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz"; - sha512 = "ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg=="; + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz"; + sha512 = "1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg=="; }; }; - "@webpack-cli/info-1.4.0" = { + "@webpack-cli/info-1.4.1" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz"; - sha512 = "F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz"; + sha512 = "PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA=="; }; }; - "@webpack-cli/serve-1.6.0" = { + "@webpack-cli/serve-1.6.1" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz"; - sha512 = "ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz"; + sha512 = "gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw=="; }; }; "@webtorrent/http-node-1.3.0" = { @@ -9787,265 +11074,265 @@ let sha512 = "V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A=="; }; }; - "@xmldom/xmldom-0.8.0" = { + "@xmldom/xmldom-0.8.1" = { name = "_at_xmldom_slash_xmldom"; packageName = "@xmldom/xmldom"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.0.tgz"; - sha512 = "7wVnF+rKrVDEo1xjzkkidTG0grclaVnX0vKa0z9JSXcEdtftUJjvU33jLGg6SHyvs3eeqEsI7jZ6NxYfRypEEg=="; + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.1.tgz"; + sha512 = "4wOae+5N2RZ+CZXd9ZKwkaDi55IxrSTOjHpxTvQQ4fomtOJmqVxbmICA9jE1jvnqNhpfgz8cnfFagG86wV/xLQ=="; }; }; - "@xmpp/base64-0.12.1" = { + "@xmpp/base64-0.13.1" = { name = "_at_xmpp_slash_base64"; packageName = "@xmpp/base64"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/base64/-/base64-0.12.1.tgz"; - sha512 = "CpPQdhEAveROH5q7GkCMryCMsqIDu4RJOaYi5GJ7oxyrWpgv6bi5225hAD50kAOC4q+NWyksWiLnUwf2+C3kDA=="; + url = "https://registry.npmjs.org/@xmpp/base64/-/base64-0.13.1.tgz"; + sha512 = "ifzj81zZc8uhL9Nl8us2NUDfLt3qsbHr8lwdKmrDMk/9unY8aIGjzHdNBJoFFyJe8GSo1NFq3mS7X+X0TwkQYw=="; }; }; - "@xmpp/client-0.12.1" = { + "@xmpp/client-0.13.1" = { name = "_at_xmpp_slash_client"; packageName = "@xmpp/client"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/client/-/client-0.12.1.tgz"; - sha512 = "M9VsUd3wnZHrskHCGAPUbabH+6zIVAqlE5gmV1gTgzM+TwXY3Sz6q3k9Yfz0ERWF9qbOT6+hY3G7spNs9NNVyw=="; + url = "https://registry.npmjs.org/@xmpp/client/-/client-0.13.1.tgz"; + sha512 = "DA+pOkWliTKN5C0Bod4rqlZ4hj/CiqQDHRhQgpx7Y/69qsUwK8M/9C02qylpyZSL2TFGzOM6ZMhr/jlMCsL9jQ=="; }; }; - "@xmpp/client-core-0.12.1" = { + "@xmpp/client-core-0.13.1" = { name = "_at_xmpp_slash_client-core"; packageName = "@xmpp/client-core"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/client-core/-/client-core-0.12.1.tgz"; - sha512 = "Gml+Z4qlWgHfFVB2ALfhOkKr9YD5X7NT8JgwXq0xk+P8TbUleGgmrkAaX2fzQbnntuG6puFk3+9C2a7Q71pwXQ=="; + url = "https://registry.npmjs.org/@xmpp/client-core/-/client-core-0.13.1.tgz"; + sha512 = "ANVcqzgDCmmUj/R9pf5rJGH41mL16Bo+DRJ+2trKoRHe9p5s0p6IssjhJtTOSVx6oh2ilPXMB8qoMPjTGzY6cw=="; }; }; - "@xmpp/connection-0.12.1" = { + "@xmpp/connection-0.13.1" = { name = "_at_xmpp_slash_connection"; packageName = "@xmpp/connection"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/connection/-/connection-0.12.1.tgz"; - sha512 = "AdOt/fMjuCT+ru6v6tYKdvP42AH2P+pqyL4M71VI9kprifDV03L/Ud8jzCqSVpJUEXDFEAukDG1KNwUkBEIaXw=="; + url = "https://registry.npmjs.org/@xmpp/connection/-/connection-0.13.1.tgz"; + sha512 = "A8ojaVRrvGtvRTXcWiOJMnBPAytLFvsz18g/jO9PbnhzuqqeJ6LxmCtyaKqchMdX0lhuZpo0JUgCSPnZ68tXrQ=="; }; }; - "@xmpp/connection-tcp-0.12.1" = { + "@xmpp/connection-tcp-0.13.1" = { name = "_at_xmpp_slash_connection-tcp"; packageName = "@xmpp/connection-tcp"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/connection-tcp/-/connection-tcp-0.12.1.tgz"; - sha512 = "axoxsyyDifNEaKK3gVoVMsCtKm1VsXOdzbGwtvMHwRxiArlbSxLpHLFWv6hjH63BJvNSet1txzHt/0+rrVLWVg=="; + url = "https://registry.npmjs.org/@xmpp/connection-tcp/-/connection-tcp-0.13.1.tgz"; + sha512 = "yTVrj5o5rPVbZT5ql5ljzzIZHnLkCuyTNEQpiU9IYvfjWjy4+E2DreUnpRf3IAbpARkMoPq5uQJchH0RE3WBjg=="; }; }; - "@xmpp/debug-0.12.1" = { + "@xmpp/debug-0.13.0" = { name = "_at_xmpp_slash_debug"; packageName = "@xmpp/debug"; - version = "0.12.1"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/debug/-/debug-0.12.1.tgz"; - sha512 = "nQ9w+lkholzAvDKBvPTbKLDAyq5LhTjQ5Qf7vWPqgP56JHvDDAFdQ/YPRJVOFFB5L08/c3+/6AjEz0TD8iSXYA=="; + url = "https://registry.npmjs.org/@xmpp/debug/-/debug-0.13.0.tgz"; + sha512 = "4RCN0UsGLmfzzOdDAfzpm8luKprcdo9oRf0cnKqU/TKmbw5PN5F+TqX4we7uc4xHKzpu0rNyEhusKkVOfe3xzw=="; }; }; - "@xmpp/error-0.12.1" = { + "@xmpp/error-0.13.1" = { name = "_at_xmpp_slash_error"; packageName = "@xmpp/error"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/error/-/error-0.12.1.tgz"; - sha512 = "n5UyU25Pl6x1GMAX5tuJPmY9I+cM03iQF06ENOPxPHHLf3TBnoCtpJRP/oONHXK84vpxU9uJBuMAMHWIaWprrQ=="; + url = "https://registry.npmjs.org/@xmpp/error/-/error-0.13.1.tgz"; + sha512 = "tKecj36xIGLhLctdYhUOxWs+ZdiJpl0Tfp/GhfrUCKLHj/wq14d62SP9kxa0sDNKOY1uqRq2N9gWZBQHuP+r2Q=="; }; }; - "@xmpp/events-0.12.1" = { + "@xmpp/events-0.13.1" = { name = "_at_xmpp_slash_events"; packageName = "@xmpp/events"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/events/-/events-0.12.1.tgz"; - sha512 = "8kSwhY4ZxuXVG9QCAdQZijJvde0+/VBHZJw0Ase1ZcrBjlL46UfRwVNpru7SBZMIZB8CLav4AaArzlTFDRJljg=="; + url = "https://registry.npmjs.org/@xmpp/events/-/events-0.13.1.tgz"; + sha512 = "c538zWUoD7KfMzMWGHyJkXvRYE5exzVjK6NAsMtfNtbVqw9SXJJaGLvDvYSXOQmKQaZz5guUuIUGiHJbr7yjsA=="; }; }; - "@xmpp/id-0.12.1" = { + "@xmpp/id-0.13.1" = { name = "_at_xmpp_slash_id"; packageName = "@xmpp/id"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/id/-/id-0.12.1.tgz"; - sha512 = "tIPSDyYn1Ah2JPmaD9gSHqHYG3nWKzxISGJf0EMeAQ1Hd4pldNv4pKv+mO2ZVrHQie0oc3KC409QASmYfVP7xA=="; + url = "https://registry.npmjs.org/@xmpp/id/-/id-0.13.1.tgz"; + sha512 = "ivc7kxfk5sU6PspdQvglsibcWRCr40nbaPEvGYbXO8ymFN6qps91DPlEt0Cc0XJExq7PXo0Yt7DACfe8f7K03g=="; }; }; - "@xmpp/iq-0.12.1" = { + "@xmpp/iq-0.13.1" = { name = "_at_xmpp_slash_iq"; packageName = "@xmpp/iq"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/iq/-/iq-0.12.1.tgz"; - sha512 = "XlYnbCUWS6CgWrLUb9aWl0IJ7FfHbTxSlBybQb9zsOJEHb9J3FBV6SZwNUgmtnTwYtgIt6RTSvZtpGDX7Q5Xcw=="; + url = "https://registry.npmjs.org/@xmpp/iq/-/iq-0.13.1.tgz"; + sha512 = "YyJj6up2aFTobTUmjdX86vs0+/WIB8i88QQjDDlzSKdMDDXgrB8B8JAMlEBfAsruAv/ZIwUnE4/yqCeMAehTuA=="; }; }; - "@xmpp/jid-0.12.1" = { + "@xmpp/jid-0.13.1" = { name = "_at_xmpp_slash_jid"; packageName = "@xmpp/jid"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/jid/-/jid-0.12.1.tgz"; - sha512 = "PdXJy17Os5ADr03I+JXIWYLExEZjTW7AH23CwvbS8kLQh/CNrfhbFynW9krUZ4Lf4YAFn88oOsFsQRNgsAj/Vw=="; + url = "https://registry.npmjs.org/@xmpp/jid/-/jid-0.13.1.tgz"; + sha512 = "E5ulk4gfPQwPY71TWXapiWzoxxAJz3LP0bDIUXIfgvlf1/2QKP3EcYQ7o+qmI0cLEZwWmwluRGouylqhyuwcAw=="; }; }; - "@xmpp/middleware-0.12.1" = { + "@xmpp/middleware-0.13.1" = { name = "_at_xmpp_slash_middleware"; packageName = "@xmpp/middleware"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/middleware/-/middleware-0.12.1.tgz"; - sha512 = "XZTXKuV3xre9tQe2X2bX20jChagp4hrL83LRgpRHsp3V4SzKsiBWDXb+0rNmyhKrWAeJOxUNPZ7HlV/1ZD5fvA=="; + url = "https://registry.npmjs.org/@xmpp/middleware/-/middleware-0.13.1.tgz"; + sha512 = "t7kws9KMgaQURCDMcPjJOm/sEcC2Gs2YtpE35NaTR87NSwr8yZ37ZJL5Kki3Z4qhL6nhMXJPAprc6uqBn5q3Og=="; }; }; - "@xmpp/reconnect-0.12.1" = { + "@xmpp/reconnect-0.13.1" = { name = "_at_xmpp_slash_reconnect"; packageName = "@xmpp/reconnect"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/reconnect/-/reconnect-0.12.1.tgz"; - sha512 = "uORfO/iY2VC4ZK3/dJSd4meU0j96+qeybj62K7sexxJtcw/qM8GAFfpWDsIu/6MhQZ0dOweQ2iZn3gSk66WjMg=="; + url = "https://registry.npmjs.org/@xmpp/reconnect/-/reconnect-0.13.1.tgz"; + sha512 = "m/j/mTU7b3cOXP78uGzBbihmJMuXCYcTcwsTHlexj6tj6CE/vpuLNgxvf6pPkO7B9lH0HfezqU7ExHpS+4Nfaw=="; }; }; - "@xmpp/resolve-0.12.1" = { + "@xmpp/resolve-0.13.1" = { name = "_at_xmpp_slash_resolve"; packageName = "@xmpp/resolve"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/resolve/-/resolve-0.12.1.tgz"; - sha512 = "1enBxGpt/0frifKjwkHxsVHOCKC3B1BdcFbrQCc+FQEcVLIsFgAKLAFOp18p0Y1pxqT+O/4IZ4CUUqNFpfyXKg=="; + url = "https://registry.npmjs.org/@xmpp/resolve/-/resolve-0.13.1.tgz"; + sha512 = "Lgsl6C/uJCxmYr0jWWOCJMqYvKi5WzN6loZwP7f6ov2nLMOMEZ7TSb66z393/7Pd0hy6DqZeggESMAFOkQH+vw=="; }; }; - "@xmpp/resource-binding-0.12.1" = { + "@xmpp/resource-binding-0.13.1" = { name = "_at_xmpp_slash_resource-binding"; packageName = "@xmpp/resource-binding"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/resource-binding/-/resource-binding-0.12.1.tgz"; - sha512 = "AV3NGIyNBnArvwShNYdsTVHcLPDDXDzDoRk07ZxztN/D5sYQAzhbHK/5BIIkIEOeR91h4qXpSv69QLEYmWj0Ug=="; + url = "https://registry.npmjs.org/@xmpp/resource-binding/-/resource-binding-0.13.1.tgz"; + sha512 = "S6PGlfufDTTDlh21ynyJrGR0sMeEYIRq+BKUl4QhsR19BvP0RUW0t8Ypx1QwDY3++ihqRjvCllCmtmFMY1iJsQ=="; }; }; - "@xmpp/sasl-0.12.1" = { + "@xmpp/sasl-0.13.1" = { name = "_at_xmpp_slash_sasl"; packageName = "@xmpp/sasl"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/sasl/-/sasl-0.12.1.tgz"; - sha512 = "KuxuiEX2bhZCB9aYYJjVpVT1MmQHv8BPZGEyRA6YjVqhWCQUSP+OtKV9zy6hLBDBVfd45ybYVC+sMM0i9Y2R9Q=="; + url = "https://registry.npmjs.org/@xmpp/sasl/-/sasl-0.13.1.tgz"; + sha512 = "ynhKsL43EtezqJ9s476leHzliMudCAFS4xNG5x4ZFHoc7Iz5J6p6jFI89LGgnk9DeIdk9A/CFrPWTdyjhvyiTQ=="; }; }; - "@xmpp/sasl-anonymous-0.12.1" = { + "@xmpp/sasl-anonymous-0.13.1" = { name = "_at_xmpp_slash_sasl-anonymous"; packageName = "@xmpp/sasl-anonymous"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/sasl-anonymous/-/sasl-anonymous-0.12.1.tgz"; - sha512 = "9A5y9FdwhT8cmTEVkJGl6UV+iYmgPqgbitnFI6DdkS4HzTLQVjV7SjXayrLoOjVniKHnxHOBEbjcQG/H5iHW4w=="; + url = "https://registry.npmjs.org/@xmpp/sasl-anonymous/-/sasl-anonymous-0.13.1.tgz"; + sha512 = "l0Bqmva7xw10p8MelD2bHO10LwCPz6CEd/t5xO+Kw98hjI9lX6k5cxW7frvdnxRwPxJbGTciTQKHokYWR4luaA=="; }; }; - "@xmpp/sasl-plain-0.12.1" = { + "@xmpp/sasl-plain-0.13.1" = { name = "_at_xmpp_slash_sasl-plain"; packageName = "@xmpp/sasl-plain"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/sasl-plain/-/sasl-plain-0.12.1.tgz"; - sha512 = "Ym6qCPA86vssLVvt/noiA/YgT6T/IxA5281xinOsZP9wtP/csqbjcBDRD7pk3HAmHhEGwUH61eydbIKHHw7o5w=="; + url = "https://registry.npmjs.org/@xmpp/sasl-plain/-/sasl-plain-0.13.1.tgz"; + sha512 = "Xx4ay67Mg6aQFeelTZuY5QatP3cCJsArAuD0AozHKzjUWzyLqqydsDS+yFN23pxkOZPGgyYVebc4gKti4jZ+GA=="; }; }; - "@xmpp/sasl-scram-sha-1-0.12.1" = { + "@xmpp/sasl-scram-sha-1-0.13.1" = { name = "_at_xmpp_slash_sasl-scram-sha-1"; packageName = "@xmpp/sasl-scram-sha-1"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/sasl-scram-sha-1/-/sasl-scram-sha-1-0.12.1.tgz"; - sha512 = "h9OenKiaJDYZCxv2FyMBpoTdmYu2oxy/FIM8FXMgnPJrCru7kBepksIb8lOfcyTyFxbQJk/Vrf8zyBUdAm6Jyg=="; + url = "https://registry.npmjs.org/@xmpp/sasl-scram-sha-1/-/sasl-scram-sha-1-0.13.1.tgz"; + sha512 = "qWyR5+v10pykTxQnKfNVUnCnZisA/UmC4Po5EQSgA5dNRuzraqwk/bH5PVi9+M0OcbtdNs9wCO2Hv06YA9AjwA=="; }; }; - "@xmpp/session-establishment-0.12.1" = { + "@xmpp/session-establishment-0.13.1" = { name = "_at_xmpp_slash_session-establishment"; packageName = "@xmpp/session-establishment"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/session-establishment/-/session-establishment-0.12.1.tgz"; - sha512 = "6+uffTA/Wy5JmoZIs3uk0oPKuLrb4MEzwo6J6QZYPHC5pwKH9dYaQ+Xjw03qaac8i73HREhK5p2cA5zpxPZoRw=="; + url = "https://registry.npmjs.org/@xmpp/session-establishment/-/session-establishment-0.13.1.tgz"; + sha512 = "uba6BZeeSJtbHtU+pCumSiX/zuc9hUdN5dVRNjvRjr/ZcXLMuC5MroRyrld+fm/rQYQLJjF4BcIaxvysXTCAGA=="; }; }; - "@xmpp/starttls-0.12.1" = { + "@xmpp/starttls-0.13.1" = { name = "_at_xmpp_slash_starttls"; packageName = "@xmpp/starttls"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/starttls/-/starttls-0.12.1.tgz"; - sha512 = "AZPXppxar9n1J1IOG39xkZf/eoPQXhq3y5/tVOEyeG+WRcJGddeYJleXUm4Jwol+PTc0l0F6tlThPlhrIt/8vA=="; + url = "https://registry.npmjs.org/@xmpp/starttls/-/starttls-0.13.1.tgz"; + sha512 = "rQumwpbD5+yclcXgPNDF7Jg1mzDFejHKZehD6JRti+Emsxayst/qFDq3uMO3x6P+nKexL4mMoKUtWHlJM7BUGw=="; }; }; - "@xmpp/stream-features-0.12.1" = { + "@xmpp/stream-features-0.13.1" = { name = "_at_xmpp_slash_stream-features"; packageName = "@xmpp/stream-features"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/stream-features/-/stream-features-0.12.1.tgz"; - sha512 = "OautwK8DMSZSeAU9YFt6wdmHutbi7I/Gy5bzR12UYgtjFcgZ2FUNhj4kYOFcwOhCG8hKyGgMvv0V7/0iDr40QA=="; + url = "https://registry.npmjs.org/@xmpp/stream-features/-/stream-features-0.13.1.tgz"; + sha512 = "yZg+CXBRVXsIQzu4SI5UYlDZHmg3wY6YXy4MbeLiI4O8OQ/oCz6OHJlHKUnFl+cGmjDXvhN4Ga6pRhbEIIqM/g=="; }; }; - "@xmpp/stream-management-0.12.1" = { + "@xmpp/stream-management-0.13.1" = { name = "_at_xmpp_slash_stream-management"; packageName = "@xmpp/stream-management"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/stream-management/-/stream-management-0.12.1.tgz"; - sha512 = "3fsSGFAKZ+SpdvQQ+cgPUdZcekI66rpMeUMDJMiWG5hGTicp2PfoDVjAvlPlgsTmIudm2UdNVW62MMZxnRnjbQ=="; + url = "https://registry.npmjs.org/@xmpp/stream-management/-/stream-management-0.13.1.tgz"; + sha512 = "06dhJAlGn+MU5ESrvIUg5xOS7azVE0swq86cx4SCv7t5dWL1WBj4xg2qigLn1hMnFkDw0bO/SOikXTxqGii/hA=="; }; }; - "@xmpp/tcp-0.12.1" = { + "@xmpp/tcp-0.13.1" = { name = "_at_xmpp_slash_tcp"; packageName = "@xmpp/tcp"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/tcp/-/tcp-0.12.1.tgz"; - sha512 = "sILbQli4EpqfsTmeVj/INlhA0ZYUYdRkp9wtKbDaIv53QAUaD62L37TYXFCUEnyIxOpxdecNAMbgpnarv15bcg=="; + url = "https://registry.npmjs.org/@xmpp/tcp/-/tcp-0.13.1.tgz"; + sha512 = "N/AQBT+6Updb/E8A1SYdMbIJGaRFG8+7+bkm9MLw44UsihA6Yg0fmvC02O+BjNg3tXGkcMYLhu/8NYpjK4NlQg=="; }; }; - "@xmpp/tls-0.12.1" = { + "@xmpp/tls-0.13.1" = { name = "_at_xmpp_slash_tls"; packageName = "@xmpp/tls"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/tls/-/tls-0.12.1.tgz"; - sha512 = "KMMEzRQCdSTN7uCL2CmRcxvlfKcRSGwHrqKuGflvYAzvuQEJaRS2vAzvXmP2derEnJzG1Jb4Fle888MRjifWbg=="; + url = "https://registry.npmjs.org/@xmpp/tls/-/tls-0.13.1.tgz"; + sha512 = "ecOmnrZmRbMMPDdvDNirw7sYQHt//YV7UJgfS4c9M+R5ljP2eUJiAiotEEykjKJ6CJPMMxdTnrLLP3ullsgfog=="; }; }; - "@xmpp/websocket-0.12.1" = { + "@xmpp/websocket-0.13.1" = { name = "_at_xmpp_slash_websocket"; packageName = "@xmpp/websocket"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/websocket/-/websocket-0.12.1.tgz"; - sha512 = "r1R2uzqSc5uFEImWZCI43oduha0jZqTS8iCmryB4aSDsaevQgeZgOOSpv8y4Jui5v5C1asnQzFb7H164SUcGkw=="; + url = "https://registry.npmjs.org/@xmpp/websocket/-/websocket-0.13.1.tgz"; + sha512 = "UyMYyy/0Cm2UtVoAlhfV31u6LzGrBUU0h7I0qGCq1yYPQpscehNl8lXE4vmB8OfpeDvSZmvGk2vJAvGxzunoDQ=="; }; }; - "@xmpp/xml-0.12.1" = { + "@xmpp/xml-0.13.1" = { name = "_at_xmpp_slash_xml"; packageName = "@xmpp/xml"; - version = "0.12.1"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@xmpp/xml/-/xml-0.12.1.tgz"; - sha512 = "3SIr/jmyHDMkCzOtcH03YG9qTAJeE7auPg/V7e9tJrhiW329hNMhg8+VAO72Tp1AOi5bMhma09ACRS2Y9bMOKA=="; + url = "https://registry.npmjs.org/@xmpp/xml/-/xml-0.13.1.tgz"; + sha512 = "GMfYB3PKY9QzsMnl3dPohgPBGd1JQTBanKOaZexJCSYJN2cdYLU2HGhjMtDlGSno6h9U+t0oO7r0igsJwyigwg=="; }; }; - "@xstate/fsm-1.6.3" = { + "@xstate/fsm-1.6.5" = { name = "_at_xstate_slash_fsm"; packageName = "@xstate/fsm"; - version = "1.6.3"; + version = "1.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.3.tgz"; - sha512 = "Sf8o6JPbldmGx16J7WHgkkwo/R1ZvSK64nSA5i8Xh3W+UVH5MQJTWBxxaplNt8Qlw36SNJ+8Qry03GGrksWWKQ=="; + url = "https://registry.npmjs.org/@xstate/fsm/-/fsm-1.6.5.tgz"; + sha512 = "b5o1I6aLNeYlU/3CPlj/Z91ybk1gUsKT+5NAJI+2W4UjvS5KLG28K9v5UvNoFVjHV8PajVZ00RH3vnjyQO7ZAw=="; }; }; "@xtuc/ieee754-1.2.0" = { @@ -10183,13 +11470,13 @@ let sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; }; }; - "absolute-0.0.1" = { - name = "absolute"; - packageName = "absolute"; - version = "0.0.1"; + "abortcontroller-polyfill-1.7.3" = { + name = "abortcontroller-polyfill"; + packageName = "abortcontroller-polyfill"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/absolute/-/absolute-0.0.1.tgz"; - sha1 = "c22822f87e1c939f579887504d9c109c4173829d"; + url = "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz"; + sha512 = "zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q=="; }; }; "abstract-extension-3.1.1" = { @@ -10255,13 +11542,13 @@ let sha1 = "9a8eac8ff79866f3f9b4bb1443ca778f1598aeda"; }; }; - "accepts-1.3.7" = { + "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; + sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; "ace.improved-0.2.1" = { @@ -10498,13 +11785,13 @@ let sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; }; }; - "addons-linter-4.4.0" = { + "addons-linter-4.14.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "4.4.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-4.4.0.tgz"; - sha512 = "2N8oo97y2w2MJX/bcvnSb5BG2s+0BOlOu/0Q06wp5bnyEwWbfKFOVX/CorivGkRteY0fbSUWvU55LXgIiLyH5w=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-4.14.0.tgz"; + sha512 = "TH3/PMS4Dd0Jf3kXW7DLXseHZcD7ZbnfnQAztkrP4YC0HQKQVZJ+lGOuDOGUtVQDMwC/eEdvHvZoRnHDer5qkg=="; }; }; "addons-moz-compare-1.2.0" = { @@ -10516,13 +11803,13 @@ let sha512 = "COG8qk2/dubPqabfcoJW4E7pm2EQDI43iMrHnhlobvq/uRMEzx/PYJ1KaUZ97Vgg44R3QdRG5CvDsTRbMUHcDw=="; }; }; - "addons-scanner-utils-6.1.0" = { + "addons-scanner-utils-6.3.0" = { name = "addons-scanner-utils"; packageName = "addons-scanner-utils"; - version = "6.1.0"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-6.1.0.tgz"; - sha512 = "O9rObtOmnMI1qBmHH2RlV+H3vAJWm594bbxbFYEkYeqSUkXd0Ohzjwnv1af4GFDlrBK6wB8TS0+/2X/zB8+LnA=="; + url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-6.3.0.tgz"; + sha512 = "sD4U7TX/NFDUYVheydrcpHH9xG3E0eVBFDn1RuUkGpqRyay3SsOU75Pl2lWAbCmeE0Mh9inU1Fwl7Mm1VRWkZw=="; }; }; "addr-to-ip-port-1.5.4" = { @@ -10606,13 +11893,13 @@ let sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; - "agentkeepalive-4.2.0" = { + "agentkeepalive-4.2.1" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.0.tgz"; - sha512 = "0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; + sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; }; }; "aggregate-error-3.1.0" = { @@ -10714,22 +12001,22 @@ let sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; }; }; - "ajv-8.6.3" = { + "ajv-8.10.0" = { name = "ajv"; packageName = "ajv"; - version = "8.6.3"; + version = "8.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz"; - sha512 = "SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz"; + sha512 = "bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw=="; }; }; - "ajv-8.8.2" = { + "ajv-8.11.0" = { name = "ajv"; packageName = "ajv"; - version = "8.8.2"; + version = "8.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz"; - sha512 = "x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz"; + sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; }; }; "ajv-8.9.0" = { @@ -11083,22 +12370,22 @@ let sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; - "ansi-regex-3.0.0" = { + "ansi-regex-3.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz"; + sha512 = "+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="; }; }; - "ansi-regex-4.1.0" = { + "ansi-regex-4.1.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz"; + sha512 = "ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="; }; }; "ansi-regex-5.0.1" = { @@ -11173,6 +12460,15 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; + "ansi-styles-5.2.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz"; + sha512 = "Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="; + }; + }; "ansi-styles-6.1.0" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -11452,6 +12748,15 @@ let sha1 = "2af5c2b544a40e15fc1ac55548314397460845d0"; }; }; + "app-root-path-3.0.0" = { + name = "app-root-path"; + packageName = "app-root-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz"; + sha512 = "qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw=="; + }; + }; "appdata-path-1.0.0" = { name = "appdata-path"; packageName = "appdata-path"; @@ -11641,6 +12946,15 @@ let sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="; }; }; + "are-we-there-yet-3.0.0" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz"; + sha512 = "0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw=="; + }; + }; "arg-2.0.0" = { name = "arg"; packageName = "arg"; @@ -11722,13 +13036,31 @@ let sha1 = "6e7207b4ecdb39b0af88303fa5ae22bda8df61cb"; }; }; - "aribts-1.3.5" = { - name = "aribts"; - packageName = "aribts"; - version = "1.3.5"; + "arib-mpeg2ts-parser-3.0.13" = { + name = "arib-mpeg2ts-parser"; + packageName = "arib-mpeg2ts-parser"; + version = "3.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/aribts/-/aribts-1.3.5.tgz"; - sha512 = "fvDR4iYpZkbMqMbTfKynPGfpXDhFTxzZWSS7C3c70xQ8ElmFkjwVrg/NLcEA+R3s4Jz6mVrz/1vOLEAI+ycrSQ=="; + url = "https://registry.npmjs.org/arib-mpeg2ts-parser/-/arib-mpeg2ts-parser-3.0.13.tgz"; + sha512 = "QgNZghj9R4dafXeBJbKZ0Ff5f7YENqQP/CDLAhWEWXdPoOOPUcQCu5zs3KHqeTKxg3/ip6i8a+aIu+J6QYICOg=="; + }; + }; + "arib-subtitle-timedmetadater-4.0.9" = { + name = "arib-subtitle-timedmetadater"; + packageName = "arib-subtitle-timedmetadater"; + version = "4.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/arib-subtitle-timedmetadater/-/arib-subtitle-timedmetadater-4.0.9.tgz"; + sha512 = "bfLMCjJlon8+GdOMP7gMIzTHaoxWBFTypREYsaTMlqgFw4O5WnYtU8xrDbeafp792zylvw2xHMIayXtgbRoj7Q=="; + }; + }; + "aribb24.js-1.8.8" = { + name = "aribb24.js"; + packageName = "aribb24.js"; + version = "1.8.8"; + src = fetchurl { + url = "https://registry.npmjs.org/aribb24.js/-/aribb24.js-1.8.8.tgz"; + sha512 = "7tCEIOzDoDxvr5UuGTVDpszRYNcJFLRqAXf/lIbJi6DmeeDnfbYQdfr0DiRokG/MUSPx5rqyxRSyVSoWDanGNw=="; }; }; "aribts-2.1.12" = { @@ -12244,6 +13576,15 @@ let sha512 = "vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ=="; }; }; + "ascii-table-0.0.9" = { + name = "ascii-table"; + packageName = "ascii-table"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/ascii-table/-/ascii-table-0.0.9.tgz"; + sha1 = "06a6604d6a55d4bf41a9a47d9872d7a78da31e73"; + }; + }; "asciichart-1.5.25" = { name = "asciichart"; packageName = "asciichart"; @@ -12307,6 +13648,15 @@ let sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; }; }; + "asn1js-2.3.2" = { + name = "asn1js"; + packageName = "asn1js"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1js/-/asn1js-2.3.2.tgz"; + sha512 = "IYzujqcOk7fHaePpTyvD3KPAA0AjT3qZlaQAw76zmPPAV/XTjhO+tbHjbFbIQZIhw+fk9wCSfb0Z6K+JHe8Q2g=="; + }; + }; "assert-1.5.0" = { name = "assert"; packageName = "assert"; @@ -12397,15 +13747,6 @@ let sha512 = "H2izJAyT2xwew4TxShpmxe6f9R5hHgJQy1QloLiUC2yrJMtyraBWNJL7903rpeCY9keNUipORR/zIUC2XcYKng=="; }; }; - "ast-types-0.13.3" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.13.3.tgz"; - sha512 = "XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA=="; - }; - }; "ast-types-0.13.4" = { name = "ast-types"; packageName = "ast-types"; @@ -12559,13 +13900,13 @@ let sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; }; }; - "async-append-only-log-3.1.2" = { + "async-append-only-log-3.1.4" = { name = "async-append-only-log"; packageName = "async-append-only-log"; - version = "3.1.2"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.1.2.tgz"; - sha512 = "j0cRyJ7q7mOCoNa3eUJq7NDywTbZirGPdC8F11iEf5mw4YkL7v38wQCsA1wAZ+6oDYKjyjKruLCPVzFw7+3buw=="; + url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.1.4.tgz"; + sha512 = "mPh8K1iI2ysWCEXGFDnhFeRpkT4wl6mshO/KAzRpzU60oi2+RMGCVjTZ0hZAjIK5z+iDMj6NiITlt99qYmUScA=="; }; }; "async-done-1.3.2" = { @@ -12631,13 +13972,13 @@ let sha512 = "gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw=="; }; }; - "async-lock-1.3.0" = { + "async-lock-1.3.1" = { name = "async-lock"; packageName = "async-lock"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/async-lock/-/async-lock-1.3.0.tgz"; - sha512 = "8A7SkiisnEgME2zEedtDYPxUPzdv3x//E7n5IFktPAtMYSEAV7eNJF0rMwrVyUFj6d/8rgajLantbjcNRQYXIg=="; + url = "https://registry.npmjs.org/async-lock/-/async-lock-1.3.1.tgz"; + sha512 = "zK7xap9UnttfbE23JmcrNIyueAn6jWshihJqA33U/hEnKprF/lVGBDsBv/bqLm2YMMl1DnpHhUY044eA0t1TUw=="; }; }; "async-mutex-0.1.4" = { @@ -12847,15 +14188,6 @@ let sha1 = "ece7d92527ca37ea502f99e8f41fe44daf00dbce"; }; }; - "autoprefixer-7.2.6" = { - name = "autoprefixer"; - packageName = "autoprefixer"; - version = "7.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz"; - sha512 = "Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ=="; - }; - }; "autoprefixer-9.8.8" = { name = "autoprefixer"; packageName = "autoprefixer"; @@ -12901,22 +14233,22 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.1062.0" = { + "aws-sdk-2.1097.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1062.0"; + version = "2.1097.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1062.0.tgz"; - sha512 = "QIU8jwi7Uqyvw2HjsXXXUZv3V/6TinUzLewrdl2EdvonqZCXhwMgnZx2F9I2x62IKH1RqnINwFWdoK+OTgcAjA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1097.0.tgz"; + sha512 = "fChMDiSfWcW0EUWmiqlyc+VAIXKH0w7BBruL3cVWSwO+5oA5A9juGF4NCBV2/KAHzaKaG0hXKPE49Wh6Lq74ag=="; }; }; - "aws-sdk-2.920.0" = { + "aws-sdk-2.1101.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.920.0"; + version = "2.1101.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.920.0.tgz"; - sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1101.0.tgz"; + sha512 = "7lyVb7GXGl8yyu954Qxf6vU6MrcgFlmKyTLBVXJyo3Phn1OB+qOExA55WtSC6gQiQ7e5TeWOn1RUHLg30ywTBA=="; }; }; "aws-sign2-0.6.0" = { @@ -12973,15 +14305,6 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; - "axios-0.22.0" = { - name = "axios"; - packageName = "axios"; - version = "0.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.22.0.tgz"; - sha512 = "Z0U3uhqQeg1oNcihswf4ZD57O3NrR1+ZXhxaROaWpDmsDTx7T2HNBV2ulBtie2hwJptu8UvgnJoK+BIqdzh/1w=="; - }; - }; "axios-0.24.0" = { name = "axios"; packageName = "axios"; @@ -12991,6 +14314,24 @@ let sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; }; }; + "axios-0.25.0" = { + name = "axios"; + packageName = "axios"; + version = "0.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz"; + sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g=="; + }; + }; + "axios-0.26.0" = { + name = "axios"; + packageName = "axios"; + version = "0.26.0"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz"; + sha512 = "lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og=="; + }; + }; "axios-cookiejar-support-0.5.1" = { name = "axios-cookiejar-support"; packageName = "axios-cookiejar-support"; @@ -13009,22 +14350,13 @@ let sha512 = "4TVv2X7oNStT0vLaEfExmy3J4/CzfuXolEcQl/BRUmvGySqKStTG2O55/hUQ0kM7UJlZBLgniM0SBq4d/WkKow=="; }; }; - "azure-devops-node-api-11.1.0" = { + "azure-devops-node-api-11.1.1" = { name = "azure-devops-node-api"; packageName = "azure-devops-node-api"; - version = "11.1.0"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.1.0.tgz"; - sha512 = "6/2YZuf+lJzJLrjXNYEA5RXAkMCb8j/4VcHD0qJQRsgG/KsRMYo0HgDh0by1FGHyZkQWY5LmQyJqCwRVUB3Y7Q=="; - }; - }; - "b24.js-1.0.3" = { - name = "b24.js"; - packageName = "b24.js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/b24.js/-/b24.js-1.0.3.tgz"; - sha512 = "j2hHu0asf6HxacVmGJKFSsrfoG8nC0JEjujIpsmRVkr74nC6o5gs6YF6AQD3e7YyJ8PaKuA7k2uSL9A2mAG9Og=="; + url = "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.1.1.tgz"; + sha512 = "XDG91XzLZ15reP12s3jFkKS8oiagSICjnLwxEYieme4+4h3ZveFOFRA4iYIG40RyHXsiI0mefFYYMFIJbMpWcg=="; }; }; "b4a-1.3.1" = { @@ -13144,13 +14476,13 @@ let sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; }; }; - "babel-loader-8.2.3" = { + "babel-loader-8.2.4" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.2.3"; + version = "8.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz"; - sha512 = "n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.4.tgz"; + sha512 = "8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A=="; }; }; "babel-plugin-dynamic-import-node-2.3.3" = { @@ -13306,13 +14638,13 @@ let sha512 = "v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w=="; }; }; - "babel-plugin-polyfill-corejs3-0.5.1" = { + "babel-plugin-polyfill-corejs3-0.5.2" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz"; - sha512 = "TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz"; + sha512 = "G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ=="; }; }; "babel-plugin-polyfill-regenerator-0.3.1" = { @@ -13324,13 +14656,13 @@ let sha512 = "Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A=="; }; }; - "babel-plugin-styled-components-2.0.2" = { + "babel-plugin-styled-components-2.0.6" = { name = "babel-plugin-styled-components"; packageName = "babel-plugin-styled-components"; - version = "2.0.2"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.2.tgz"; - sha512 = "7eG5NE8rChnNTDxa6LQfynwgHTVOYYaHJbUYSlOhk8QBXIQiMBKq4gyfHBBKPrxUcVBXVJL61ihduCpCQbuNbw=="; + url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.6.tgz"; + sha512 = "Sk+7o/oa2HfHv3Eh8sxoz75/fFvEdHsXV4grdeHufX0nauCmymlnN0rGhIvfpMQSJMvGutJ85gvCGea4iqmDpg=="; }; }; "babel-plugin-syntax-flow-6.18.0" = { @@ -13477,15 +14809,6 @@ let sha512 = "VTtHsmvwRBkX3yLK4e+pFwk88BC6iNFqS2J8CCx2ddQc7RjXoRhuXXIgYCng21DYNty9IicCwDdTDjdr+TM7eg=="; }; }; - "babel-polyfill-6.23.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz"; - sha1 = "8364ca62df8eafb830499f699177466c3b03499d"; - }; - }; "babel-preset-current-node-syntax-0.1.4" = { name = "babel-preset-current-node-syntax"; packageName = "babel-preset-current-node-syntax"; @@ -13999,15 +15322,6 @@ let sha512 = "0ilVjnE2diLdbec/3KN14SP0KE85wh8v/FceNRMbAB2ioc3yTj9tgqdoK9tFEH++TZ10JreTS29qTwg7+SpTiQ=="; }; }; - "bent-7.3.12" = { - name = "bent"; - packageName = "bent"; - version = "7.3.12"; - src = fetchurl { - url = "https://registry.npmjs.org/bent/-/bent-7.3.12.tgz"; - sha512 = "T3yrKnVGB63zRuoco/7Ybl7BwwGZR0lceoVG5XmQyMIH9s19SV5m+a8qam4if0zQuAmOQTyPTPmsQBdAorGK3w=="; - }; - }; "bep53-range-1.1.1" = { name = "bep53-range"; packageName = "bep53-range"; @@ -14287,13 +15601,13 @@ let sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; }; }; - "binet-0.3.6" = { + "binet-0.3.7" = { name = "binet"; packageName = "binet"; - version = "0.3.6"; + version = "0.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/binet/-/binet-0.3.6.tgz"; - sha512 = "6pm+Gc3uNiiJZEv0k8JDWqQlo9ki/o9UNAkLmr0EGm7hI5MboOJVIOlO1nw3YuDkLHWN78OPsaC4JhRkn2jMLw=="; + url = "https://registry.npmjs.org/binet/-/binet-0.3.7.tgz"; + sha512 = "GF+QD4ajs3GWabaVzso7Kn9aZEbwI0e54FKU2ID8bM/7rIk7BpSJytB1KS7SMpix+fWAi9MAGkOgSFljl0aaKg=="; }; }; "bintrees-1.0.1" = { @@ -14323,6 +15637,24 @@ let sha512 = "HpV5OMLLGTjSVblmrtYRfFFKuQB+GArM0+XP8HGWfJ5vxYBqo+DesvJwOdC2WJ3bCkZShGf0QIfoIpeomVzVdA=="; }; }; + "bip39-3.0.2" = { + name = "bip39"; + packageName = "bip39"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bip39/-/bip39-3.0.2.tgz"; + sha512 = "J4E1r2N0tUylTKt07ibXvhpT2c5pyAFgvuA5q1H9uDy6dEGpjV8jmymh3MTYJDLCNbIVClSB9FbND49I6N24MQ=="; + }; + }; + "bip39-light-1.0.7" = { + name = "bip39-light"; + packageName = "bip39-light"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bip39-light/-/bip39-light-1.0.7.tgz"; + sha512 = "WDTmLRQUsiioBdTs9BmSEmkJza+8xfJmptsNJjxnoq3EydSa/ZBXT6rm66KoT3PJIRYMnhSKNR7S9YL1l7R40Q=="; + }; + }; "bip65-1.0.3" = { name = "bip65"; packageName = "bip65"; @@ -14467,13 +15799,13 @@ let sha512 = "Xzk1FJFHmsc9H8IKFtDUkfAZIT1HW8r6UqajfZBBxWmpA1v7FsPO8xPFtnFzCqcXlPN3yi8dDmlqZCemyB7P8w=="; }; }; - "bittorrent-protocol-3.5.1" = { + "bittorrent-protocol-3.5.2" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.5.1.tgz"; - sha512 = "euVSavQL0jBqRcbsNs5zUP9Ygm+OW5vCDDaatC6vrONtXp+eVe4sO1wA58Gig3IYOdRSBKl53auniWEAJ9quxg=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.5.2.tgz"; + sha512 = "IoUKeNg5aIoUfL7iYLM3L6CsuV14iEByyqdT3f2uFK4zlJiQr+kb86ERlrobYBBIj6qW6GJ9eyAU8GhL3IhFrA=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -14485,13 +15817,13 @@ let sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c"; }; }; - "bittorrent-tracker-9.18.3" = { + "bittorrent-tracker-9.18.5" = { name = "bittorrent-tracker"; packageName = "bittorrent-tracker"; - version = "9.18.3"; + version = "9.18.5"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.18.3.tgz"; - sha512 = "IhLKp8wUgA7WXTfJggw/HB8qxhwlLNDWRraUFxXRHTgOQXcMiKITGcErzvC7B7mMOcUnk0wiUsZdaaQ8lzz3LQ=="; + url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.18.5.tgz"; + sha512 = "yh/lGHLNuTNZJJlUAmikYOX+njHIr8BFqCxJiXSQ3FaEmhj2xhe1OXF9DcrHpmMYmAQEKWC6+P/uNWGRKdkH9g=="; }; }; "bitwise-xor-0.0.0" = { @@ -14512,15 +15844,6 @@ let sha512 = "pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww=="; }; }; - "bl-2.2.1" = { - name = "bl"; - packageName = "bl"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz"; - sha512 = "6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g=="; - }; - }; "bl-4.1.0" = { name = "bl"; packageName = "bl"; @@ -14575,13 +15898,13 @@ let sha1 = "825a8fc536a5dc43193467f3124f7e9b78b21cef"; }; }; - "blakejs-1.1.1" = { + "blakejs-1.2.1" = { name = "blakejs"; packageName = "blakejs"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/blakejs/-/blakejs-1.1.1.tgz"; - sha512 = "bLG6PHOCZJKNshTjGRBvET0vTciwQE6zFKOKKXPDJfwFBd4Ac0yBfPZqcGvGJap50l7ktvlpFqc2jGVaUgbJgg=="; + url = "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz"; + sha512 = "QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ=="; }; }; "blessed-0.1.81" = { @@ -14593,13 +15916,13 @@ let sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129"; }; }; - "blessed-contrib-4.10.1" = { + "blessed-contrib-4.11.0" = { name = "blessed-contrib"; packageName = "blessed-contrib"; - version = "4.10.1"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.10.1.tgz"; - sha512 = "S3jE7riCbWnAK8OT+ta4Z8RX/X6nfISxzn0SDIMFYuY90qUwqx7w7e9fIsc2m2ODwma7dFcXNwGSjyayfKd1DQ=="; + url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.11.0.tgz"; + sha512 = "P00Xji3xPp53+FdU9f74WpvnOAn/SS0CKLy4vLAf5Ps7FGDOTY711ruJPZb3/7dpFuP+4i7f4a/ZTZdLlKG9WA=="; }; }; "blgr-0.2.0" = { @@ -14719,15 +16042,6 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "blueimp-md5-2.18.0" = { - name = "blueimp-md5"; - packageName = "blueimp-md5"; - version = "2.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.18.0.tgz"; - sha512 = "vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q=="; - }; - }; "blueimp-md5-2.19.0" = { name = "blueimp-md5"; packageName = "blueimp-md5"; @@ -14872,6 +16186,15 @@ let sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA=="; }; }; + "body-parser-1.19.2" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.19.2"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"; + sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; + }; + }; "bolt01-1.2.3" = { name = "bolt01"; packageName = "bolt01"; @@ -14926,6 +16249,15 @@ let sha512 = "ON1CY0awM/VsOxcmCtz7WggxjGRH+G5rSEAdWp1UoU43BHiGw1T6eEt1t4gFvLi8eUSV0hB7vF1QOba65k/7FA=="; }; }; + "bolt09-0.2.2" = { + name = "bolt09"; + packageName = "bolt09"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bolt09/-/bolt09-0.2.2.tgz"; + sha512 = "m533YWZ/R/p1buxEK/19v94Ay1vS1PJNwfP30BCVj6l96NGpOa9t40HYuMpoX+xFYwOx8kZs+GGTb9TbJund0w=="; + }; + }; "bonjour-3.5.0" = { name = "bonjour"; packageName = "bonjour"; @@ -14944,13 +16276,13 @@ let sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; - "boolean-3.1.4" = { + "boolean-3.2.0" = { name = "boolean"; packageName = "boolean"; - version = "3.1.4"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/boolean/-/boolean-3.1.4.tgz"; - sha512 = "3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w=="; + url = "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz"; + sha512 = "d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="; }; }; "boom-2.10.1" = { @@ -14989,6 +16321,15 @@ let sha512 = "SiHJE2jEXjAL3TewN99wDl5Ehpm5DKA75oIyiY+2EMWWMPhIuZlQ/AvDzsLktNkwhylmAVLwiW+nuBPIU7kcoQ=="; }; }; + "borsh-0.6.0" = { + name = "borsh"; + packageName = "borsh"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/borsh/-/borsh-0.6.0.tgz"; + sha512 = "sl5k89ViqsThXQpYa9XDtz1sBl3l1lI313cFUY1HKr+wvMILnb+58xpkqTNrYbelh99dY7K8usxoCusQmqix9Q=="; + }; + }; "bottleneck-2.19.5" = { name = "bottleneck"; packageName = "bottleneck"; @@ -15007,13 +16348,13 @@ let sha1 = "4d67dc2602c0cc16dd9bce7ebf87e948290f5812"; }; }; - "bower-1.8.13" = { + "bower-1.8.14" = { name = "bower"; packageName = "bower"; - version = "1.8.13"; + version = "1.8.14"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.13.tgz"; - sha512 = "8eWko16JlCTdaZZG70kddHPed17pHEbH8/IjfP4IFkQsfEqRsyNM09Dc8cDBFkSvtQ/2lTea7A+bMhRggG2a+Q=="; + url = "https://registry.npmjs.org/bower/-/bower-1.8.14.tgz"; + sha512 = "8Rq058FD91q9Nwthyhw0la9fzpBz0iwZTrt51LWl+w+PnJgZk9J+5wp3nibsJcIUPglMYXr4NRBaR+TUj0OkBQ=="; }; }; "bower-endpoint-parser-0.2.1" = { @@ -15160,6 +16501,15 @@ let sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; + "brace-expansion-2.0.1" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"; + sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; + }; + }; "braces-1.8.5" = { name = "braces"; packageName = "braces"; @@ -15295,22 +16645,22 @@ let sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; - "browser-sync-client-2.27.7" = { + "browser-sync-client-2.27.9" = { name = "browser-sync-client"; packageName = "browser-sync-client"; - version = "2.27.7"; + version = "2.27.9"; src = fetchurl { - url = "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.27.7.tgz"; - sha512 = "wKg9UP9a4sCIkBBAXUdbkdWFJzfSAQizGh+nC19W9y9zOo9s5jqeYRFUUbs7x5WKhjtspT+xetVp9AtBJ6BmWg=="; + url = "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.27.9.tgz"; + sha512 = "FHW8kydp7FXo6jnX3gXJCpHAHtWNLK0nx839nnK+boMfMI1n4KZd0+DmTxHBsHsF3OHud4V4jwoN8U5HExMIdQ=="; }; }; - "browser-sync-ui-2.27.7" = { + "browser-sync-ui-2.27.9" = { name = "browser-sync-ui"; packageName = "browser-sync-ui"; - version = "2.27.7"; + version = "2.27.9"; src = fetchurl { - url = "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.27.7.tgz"; - sha512 = "Bt4OQpx9p18OIzk0KKyu7jqlvmjacasUlk8ARY3uuIyiFWSBiRgr2i6XY8dEMF14DtbooaEBOpHEu9VCYvMcCw=="; + url = "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.27.9.tgz"; + sha512 = "rsduR2bRIwFvM8CX6iY/Nu5aWub0WB9zfSYg9Le/RV5N5DEyxJYey0VxdfWCnzDOoelassTDzYQo+r0iJno3qw=="; }; }; "browserify-16.5.2" = { @@ -15412,15 +16762,6 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-2.11.3" = { - name = "browserslist"; - packageName = "browserslist"; - version = "2.11.3"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz"; - sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; - }; - }; "browserslist-4.14.2" = { name = "browserslist"; packageName = "browserslist"; @@ -15430,13 +16771,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.19.1" = { + "browserslist-4.20.2" = { name = "browserslist"; packageName = "browserslist"; - version = "4.19.1"; + version = "4.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz"; - sha512 = "u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz"; + sha512 = "CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA=="; }; }; "brq-0.1.8" = { @@ -15529,6 +16870,15 @@ let sha512 = "66UkjoB9f7lhT+WKgYq8MQa6nkr96mlX64JYMlIsXe/X4VeqNwvsx7UOE3ZqD6lkwg8GvBhapRTWj0qWO3Pw8w=="; }; }; + "bson-4.6.2" = { + name = "bson"; + packageName = "bson"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bson/-/bson-4.6.2.tgz"; + sha512 = "VeJKHShcu1b/ugl0QiujlVuBepab714X9nNyBdA1kfekuDGecxgpTA2Z6nYbagrWFeiIyzSWIOzju3lhj+RNyQ=="; + }; + }; "btc-rpc-client-git://github.com/btc21/btc-rpc-client" = { name = "bitcoin-core"; packageName = "bitcoin-core"; @@ -15818,15 +17168,6 @@ let sha1 = "3d253fe2f0ab70e851d728712e8cd6f914a8c002"; }; }; - "buffer-writer-2.0.0" = { - name = "buffer-writer"; - packageName = "buffer-writer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz"; - sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; - }; - }; "buffer-xor-1.0.3" = { name = "buffer-xor"; packageName = "buffer-xor"; @@ -15836,15 +17177,6 @@ let sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "buffermaker-1.2.1" = { - name = "buffermaker"; - packageName = "buffermaker"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffermaker/-/buffermaker-1.2.1.tgz"; - sha512 = "IdnyU2jDHU65U63JuVQNTHiWjPRH0CS3aYd/WPaEwyX84rFdukhOduAVb1jwUScmb5X0JWPw8NZOrhoLMiyAHQ=="; - }; - }; "buffers-0.1.1" = { name = "buffers"; packageName = "buffers"; @@ -15944,13 +17276,13 @@ let sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; }; }; - "builtins-4.0.0" = { + "builtins-4.1.0" = { name = "builtins"; packageName = "builtins"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/builtins/-/builtins-4.0.0.tgz"; - sha512 = "qC0E2Dxgou1IHhvJSLwGDSTvokbRovU5zZFuDY6oY8Y2lF3nGt5Ad8YZK7GMtqzY84Wu7pXTPeHQeHcXSXsRhw=="; + url = "https://registry.npmjs.org/builtins/-/builtins-4.1.0.tgz"; + sha512 = "1bPRZQtmKaO6h7qV1YHXNtr6nCK28k0Zo95KM4dXfILcZZwoHJBN1m3lfLv9LPkcOZlrSr+J1bzMaZFO98Yq0w=="; }; }; "bulk-write-stream-1.1.4" = { @@ -16025,13 +17357,13 @@ let sha512 = "y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw=="; }; }; - "busboy-1.4.0" = { + "busboy-1.5.0" = { name = "busboy"; packageName = "busboy"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/busboy/-/busboy-1.4.0.tgz"; - sha512 = "TytIELfX6IPn1OClqcBz0NFE6+JT9e3iW0ZpgnEl7ffsfDxvRZGHfPaSHGbrI443nSV3GutCDWuqLB6yHY92Ew=="; + url = "https://registry.npmjs.org/busboy/-/busboy-1.5.0.tgz"; + sha512 = "bTXFtUV/DkvfwzHD7yjAkRK5/F3RuF2Ab/qWvf5plbHZMSCea8mxOdqMj8tG1PoSNj/Qi0cb3IoRPEj6qXAGgw=="; }; }; "bval-0.1.6" = { @@ -16151,13 +17483,13 @@ let sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; }; }; - "bytesish-0.4.4" = { - name = "bytesish"; - packageName = "bytesish"; - version = "0.4.4"; + "bytes-3.1.2" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bytesish/-/bytesish-0.4.4.tgz"; - sha512 = "i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ=="; + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"; + sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; }; "cacache-12.0.4" = { @@ -16178,6 +17510,15 @@ let sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; }; }; + "cacache-16.0.3" = { + name = "cacache"; + packageName = "cacache"; + version = "16.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-16.0.3.tgz"; + sha512 = "eC7wYodNCVb97kuHGk5P+xZsvUJHkhSEOyNwkenqQPAsOtrTjvWOE5vSPNBpz9d8X3acIf6w2Ub5s4rvOCTs4g=="; + }; + }; "cache-base-1.0.1" = { name = "cache-base"; packageName = "cache-base"; @@ -16214,6 +17555,15 @@ let sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA=="; }; }; + "cache-loader-4.1.0" = { + name = "cache-loader"; + packageName = "cache-loader"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-loader/-/cache-loader-4.1.0.tgz"; + sha512 = "ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw=="; + }; + }; "cacheable-lookup-2.0.1" = { name = "cacheable-lookup"; packageName = "cacheable-lookup"; @@ -16232,6 +17582,15 @@ let sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="; }; }; + "cacheable-lookup-6.0.4" = { + name = "cacheable-lookup"; + packageName = "cacheable-lookup"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-6.0.4.tgz"; + sha512 = "mbcDEZCkv2CZF4G01kr8eBd/5agkt9oCqz75tJMSIsquvRZ2sL6Hi5zGVKi/0OSC9oO1GHfJ2AV0ZIOY9vye0A=="; + }; + }; "cacheable-request-2.1.4" = { name = "cacheable-request"; packageName = "cacheable-request"; @@ -16304,13 +17663,13 @@ let sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; }; }; - "caller-0.0.1" = { + "caller-1.0.1" = { name = "caller"; packageName = "caller"; - version = "0.0.1"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/caller/-/caller-0.0.1.tgz"; - sha1 = "f37a1d6ea10e829d94721ae29a90bb4fb52ab767"; + url = "https://registry.npmjs.org/caller/-/caller-1.0.1.tgz"; + sha1 = "b851860f70e195db3d277395aa1a7e23ea30ecf5"; }; }; "caller-callsite-2.0.0" = { @@ -16529,13 +17888,13 @@ let sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; }; }; - "camelcase-keys-7.0.1" = { + "camelcase-keys-7.0.2" = { name = "camelcase-keys"; packageName = "camelcase-keys"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.1.tgz"; - sha512 = "P331lEls98pW8JLyodNWfzuz91BEDVA4VpW2/SwXnyv2K495tq1N777xzDbFgnEigfA7UIY0xa6PwR/H9jijjA=="; + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz"; + sha512 = "Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg=="; }; }; "camelize-1.0.0" = { @@ -16556,22 +17915,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001301" = { + "caniuse-lite-1.0.30001320" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001301"; + version = "1.0.30001320"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001301.tgz"; - sha512 = "csfD/GpHMqgEL3V3uIgosvh+SVIQvCh43SNu9HRbP1lnxkKm1kjDG4f32PP571JplkLjfS+mg2p1gxR7MYrrIA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001320.tgz"; + sha512 = "MWPzG54AGdo3nWx7zHZTefseM5Y1ccM7hlQKHRqJkPozUaw3hNbBTMmLn16GG2FUzjR13Cr3NPfhIieX5PzXDA=="; }; }; - "canvas-2.9.0" = { + "canvas-2.9.1" = { name = "canvas"; packageName = "canvas"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/canvas/-/canvas-2.9.0.tgz"; - sha512 = "0l93g7uxp7rMyr7H+XRQ28A3ud0dKIUTIEkUe1Dxh4rjUYN7B93+SjC3r1PDKA18xcQN87OFGgUnyw7LSgNLSQ=="; + url = "https://registry.npmjs.org/canvas/-/canvas-2.9.1.tgz"; + sha512 = "vSQti1uG/2gjv3x6QLOZw7TctfufaerTWbVe+NSduHxxLGB+qf3kFgQ6n66DSnuoINtVUjrLLIK2R+lxrBG07A=="; }; }; "canvg-3.0.7" = { @@ -16583,6 +17942,15 @@ let sha512 = "4sq6iL5Q4VOXS3PL1BapiXIZItpxYyANVzsAKpTPS5oq4u3SKbGfUcbZh2gdLCQ3jWpG/y5wRkMlBBAJhXeiZA=="; }; }; + "capability-0.2.5" = { + name = "capability"; + packageName = "capability"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/capability/-/capability-0.2.5.tgz"; + sha1 = "51ad87353f1936ffd77f2f21c74633a4dea88801"; + }; + }; "capture-exit-2.0.0" = { name = "capture-exit"; packageName = "capture-exit"; @@ -16709,31 +18077,31 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.4.9" = { + "cdk8s-1.5.52" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.4.9"; + version = "1.5.52"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.4.9.tgz"; - sha512 = "J1XGPzgdTDYozqAJ4TQUyrXUY9BYpdQkCDNBFVVU1RatlARhh2Uj7217XnRuNI6CDyuhTGaDFFuSf3HPAHbYxg=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.5.52.tgz"; + sha512 = "xqVD2lUGC3JJC1Zl2YWDop5xcJRl0OT91PAkT7qrWO5Xho4cz3B3NA3Cua4Q7bcLQViL7CeRdH4d9zL9mJmuMw=="; }; }; - "cdk8s-plus-22-1.0.0-beta.95" = { + "cdk8s-plus-22-1.0.0-beta.158" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.95"; + version = "1.0.0-beta.158"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.95.tgz"; - sha512 = "cJscI0F6VhDoMjXu9exsnPBVgo+kyODgNYfLFVArNcKImT9/fJum96MXpZJ3ZqBZnadlarCpSjmsDDLbrAHEIw=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.158.tgz"; + sha512 = "//RAiob+IkkJxMtt2GhLUIchljTjdwkfPSqC+R3scZLtDM1yPlyN1u5qKp/3C6anm2nKtw96zAENpqzfXdZasw=="; }; }; - "cdktf-0.8.6" = { + "cdktf-0.9.4" = { name = "cdktf"; packageName = "cdktf"; - version = "0.8.6"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.8.6.tgz"; - sha512 = "+zxInPEyPCb6zqPGMV0bOlVoiQ8rEtGEaRhB3BJF5guIa8X4gxAmFTAAYR//vW1Y4msxKOPYkF5RuN5LwSQLIg=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.9.4.tgz"; + sha512 = "CuTCNVV3Goptnq3daPVfs9boODEoIrjy09XAj9nkApcozgidPkNIkDcaJCo/7q3rxnoblsK9u2nj6CDUB8cTIg=="; }; }; "center-align-0.1.3" = { @@ -16754,13 +18122,13 @@ let sha512 = "/IOxdWWNa7nRabfe7+oF+jVkGjlr2xUL4J8l/OvzZhj+c9RpMqoo3Dq+5nU1j/BflRV4BKnaQ4+4oH1yBpQG1Q=="; }; }; - "chai-4.3.4" = { + "chai-4.3.6" = { name = "chai"; packageName = "chai"; - version = "4.3.4"; + version = "4.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz"; - sha512 = "yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA=="; + url = "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz"; + sha512 = "bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q=="; }; }; "chai-as-promised-7.1.1" = { @@ -16871,13 +18239,13 @@ let sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; - "chalk-5.0.0" = { + "chalk-5.0.1" = { name = "chalk"; packageName = "chalk"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-5.0.0.tgz"; - sha512 = "/duVOqst+luxCQRKEo4bNxinsOQtMP80ZYm7mMqzuh5PociNL0PvmHFvREJ9ueYL2TxlHjBcmLCdmocx9Vg+IQ=="; + url = "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz"; + sha512 = "Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w=="; }; }; "chance-1.0.18" = { @@ -17024,40 +18392,13 @@ let sha512 = "6dVyOOYjpfFcL1Y4qChrAoQLRHvj2ziyhcm0QJlhOcAhykL/k1kTUPbeo+87MNRTRdk2OIIsIXbuF3x2wi5EXg=="; }; }; - "chart.js-2.9.3" = { + "chart.js-3.7.1" = { name = "chart.js"; packageName = "chart.js"; - version = "2.9.3"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/chart.js/-/chart.js-2.9.3.tgz"; - sha512 = "+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw=="; - }; - }; - "chart.js-3.7.0" = { - name = "chart.js"; - packageName = "chart.js"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chart.js/-/chart.js-3.7.0.tgz"; - sha512 = "31gVuqqKp3lDIFmzpKIrBeum4OpZsQjSIAqlOpgjosHDJZlULtvwLEZKtEhIAZc7JMPaHlYMys40Qy9Mf+1AAg=="; - }; - }; - "chartjs-color-2.4.1" = { - name = "chartjs-color"; - packageName = "chartjs-color"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz"; - sha512 = "haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w=="; - }; - }; - "chartjs-color-string-0.6.0" = { - name = "chartjs-color-string"; - packageName = "chartjs-color-string"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz"; - sha512 = "TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A=="; + url = "https://registry.npmjs.org/chart.js/-/chart.js-3.7.1.tgz"; + sha512 = "8knRegQLFnPQAheZV8MjxIXc5gQEfDFD897BJgv/klO/vtIyFFmgMXrNfgrXpbTr/XbTturxRgxIXx/Y+ASJBA=="; }; }; "charwise-3.0.1" = { @@ -17240,15 +18581,6 @@ let sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; }; }; - "chokidar-3.5.2" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"; - sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; - }; - }; "chokidar-3.5.3" = { name = "chokidar"; packageName = "chokidar"; @@ -17285,13 +18617,13 @@ let sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; }; - "chroma-js-2.1.2" = { + "chroma-js-2.4.2" = { name = "chroma-js"; packageName = "chroma-js"; - version = "2.1.2"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.1.2.tgz"; - sha512 = "ri/ouYDWuxfus3UcaMxC1Tfp3IE9K5iQzxc2hSxbBRVNQFut1UuGAsZmiAf2mOUubzGJwgMSv9lHg+XqLaz1QQ=="; + url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.4.2.tgz"; + sha512 = "U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A=="; }; }; "chrome-dgram-3.0.6" = { @@ -17483,6 +18815,15 @@ let sha512 = "4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA=="; }; }; + "clarify-error-1.0.0" = { + name = "clarify-error"; + packageName = "clarify-error"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clarify-error/-/clarify-error-1.0.0.tgz"; + sha512 = "f96oT3/Cdwz1eB+7RaH/XRR42lwGqVPnDl9NAm9ugT+BwAFoUS/pVnkgXUo/5UaUmwMMs6/GNFP8A8gCgmgvog=="; + }; + }; "clarinet-0.11.0" = { name = "clarinet"; packageName = "clarinet"; @@ -17528,15 +18869,6 @@ let sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff"; }; }; - "clean-css-4.2.3" = { - name = "clean-css"; - packageName = "clean-css"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"; - sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; - }; - }; "clean-css-4.2.4" = { name = "clean-css"; packageName = "clean-css"; @@ -17546,13 +18878,13 @@ let sha512 = "EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A=="; }; }; - "clean-css-5.2.2" = { + "clean-css-5.2.4" = { name = "clean-css"; packageName = "clean-css"; - version = "5.2.2"; + version = "5.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.2.2.tgz"; - sha512 = "/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w=="; + url = "https://registry.npmjs.org/clean-css/-/clean-css-5.2.4.tgz"; + sha512 = "nKseG8wCzEuji/4yrgM/5cthL9oTDc5UOQyFMvW/Q53oP6gLH690o1NbuTh6Y18nujr7BxlsFuS7gXLnLzKJGg=="; }; }; "clean-git-ref-2.0.1" = { @@ -17690,6 +19022,15 @@ let sha512 = "VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg=="; }; }; + "cli-highlight-2.1.11" = { + name = "cli-highlight"; + packageName = "cli-highlight"; + version = "2.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz"; + sha512 = "9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg=="; + }; + }; "cli-list-0.2.0" = { name = "cli-list"; packageName = "cli-list"; @@ -18167,15 +19508,6 @@ let sha512 = "A5C0Cyf2H8sKsHqX0tvIWRXw5/PK++3Dc0lDbsugr90nOECLLuSPahVQBG8pgmgiXgm/TzBWMqI2rWdZwHduAw=="; }; }; - "cmd-shim-3.0.3" = { - name = "cmd-shim"; - packageName = "cmd-shim"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-3.0.3.tgz"; - sha512 = "DtGg+0xiFhQIntSBRzL2fRQBnmtAVwXIDo4Qq46HPpObYquxMaZS4sb82U9nH91qJrlosC1wa9gwr0QyL/HypA=="; - }; - }; "cmd-shim-4.1.0" = { name = "cmd-shim"; packageName = "cmd-shim"; @@ -18230,6 +19562,15 @@ let sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; + "co-body-6.1.0" = { + name = "co-body"; + packageName = "co-body"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co-body/-/co-body-6.1.0.tgz"; + sha512 = "m7pOT6CdLN7FuXUcpuz/8lfQ/L77x8SchHCF4G0RBTJO20Wzmhn5Sp4/5WsKy8OSpifBSUrmg83qEqaDHdyFuQ=="; + }; + }; "co-from-stream-0.0.0" = { name = "co-from-stream"; packageName = "co-from-stream"; @@ -18284,15 +19625,6 @@ let sha512 = "tge3BeOtehBouqo8sdrjRuQxsAWuwUxWJN1pTttZ8HpV+fe2fxmBE9lqrzzOlRIysBvgsZr7D0FdNfrwRwpK8A=="; }; }; - "code-block-writer-10.1.1" = { - name = "code-block-writer"; - packageName = "code-block-writer"; - version = "10.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/code-block-writer/-/code-block-writer-10.1.1.tgz"; - sha512 = "67ueh2IRGst/51p0n6FvPrnRjAGHY5F8xdjkgrYE7DDzpJe6qA07RYQ9VcoUeo5ATOjSOiWpSL3SWBRRbempMw=="; - }; - }; "code-excerpt-3.0.0" = { name = "code-excerpt"; packageName = "code-excerpt"; @@ -18338,13 +19670,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.52.1" = { + "codemaker-1.55.1" = { name = "codemaker"; packageName = "codemaker"; - version = "1.52.1"; + version = "1.55.1"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.52.1.tgz"; - sha512 = "yCEUas8OlyuAu3NZ9mKopBlEnwudUrxUokSjQkw3Zk4hYkgtYJEtu1ZXuPlXtTKQYCqTPEPsUiHayTeC1qZjUA=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.55.1.tgz"; + sha512 = "W0MZSFgqfr9mgKbYLHsTNYTMKiXQE9hDHs6qke5dC5S9ZlFgcWG2zdpznknwvPLDDuWP8Z5QL71MjAM21hEPOg=="; }; }; "codepage-1.4.0" = { @@ -18509,15 +19841,6 @@ let sha512 = "hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="; }; }; - "colornames-1.1.1" = { - name = "colornames"; - packageName = "colornames"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz"; - sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; - }; - }; "colors-0.6.2" = { name = "colors"; packageName = "colors"; @@ -18545,15 +19868,6 @@ let sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; }; }; - "colors-1.3.3" = { - name = "colors"; - packageName = "colors"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz"; - sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg=="; - }; - }; "colors-1.4.0" = { name = "colors"; packageName = "colors"; @@ -18590,6 +19904,15 @@ let sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb"; }; }; + "columnify-1.6.0" = { + name = "columnify"; + packageName = "columnify"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/columnify/-/columnify-1.6.0.tgz"; + sha512 = "lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q=="; + }; + }; "combine-errors-3.0.3" = { name = "combine-errors"; packageName = "combine-errors"; @@ -18680,15 +20003,6 @@ let sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; }; }; - "commander-1.0.0" = { - name = "commander"; - packageName = "commander"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.0.0.tgz"; - sha1 = "5e6a88e7070ff5908836ead19169548c30f90bcd"; - }; - }; "commander-1.3.2" = { name = "commander"; packageName = "commander"; @@ -18851,15 +20165,6 @@ let sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; }; }; - "commander-8.0.0" = { - name = "commander"; - packageName = "commander"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-8.0.0.tgz"; - sha512 = "Xvf85aAtu6v22+E5hfVoLHqyul/jyxh91zvqk/ioJTQuJR7Z78n7H558vMPKanPSRgIEeZemT92I2g9Y8LPbSQ=="; - }; - }; "commander-8.3.0" = { name = "commander"; packageName = "commander"; @@ -18869,6 +20174,24 @@ let sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; }; }; + "commander-9.0.0" = { + name = "commander"; + packageName = "commander"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-9.0.0.tgz"; + sha512 = "JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw=="; + }; + }; + "commander-9.1.0" = { + name = "commander"; + packageName = "commander"; + version = "9.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-9.1.0.tgz"; + sha512 = "i0/MaqBtdbnJ4XQs4Pmyb+oFQl+q0lsAmokVUH92SlSw4fkeAcG3bVon+Qt7hmtF+u3Het6o4VgrcY3qAoEB6w=="; + }; + }; "commandpost-1.4.0" = { name = "commandpost"; packageName = "commandpost"; @@ -18878,13 +20201,13 @@ let sha512 = "aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ=="; }; }; - "comment-json-4.1.1" = { + "comment-json-4.2.2" = { name = "comment-json"; packageName = "comment-json"; - version = "4.1.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/comment-json/-/comment-json-4.1.1.tgz"; - sha512 = "v8gmtPvxhBlhdRBLwdHSjGy9BgA23t9H1FctdQKyUrErPjSrJcdDMqBq9B4Irtm7w3TNYLQJNH6ARKnpyag1sA=="; + url = "https://registry.npmjs.org/comment-json/-/comment-json-4.2.2.tgz"; + sha512 = "H8T+kl3nZesZu41zO2oNXIJWojNeK3mHxCLrsBNu6feksBXsgb+PtYz5daP5P86A0F3sz3840KVYehr04enISQ=="; }; }; "commist-1.1.0" = { @@ -19139,15 +20462,6 @@ let sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; }; }; - "concat-with-sourcemaps-1.1.0" = { - name = "concat-with-sourcemaps"; - packageName = "concat-with-sourcemaps"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz"; - sha512 = "4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg=="; - }; - }; "conf-1.4.0" = { name = "conf"; packageName = "conf"; @@ -19328,6 +20642,15 @@ let sha1 = "b269b2bb82ddb1ac3db5099c0fb582aba99fb37a"; }; }; + "connect-redis-4.0.3" = { + name = "connect-redis"; + packageName = "connect-redis"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-redis/-/connect-redis-4.0.3.tgz"; + sha512 = "Php0P0ShNfilW6f2d/2v7Q0VAiFeBYsg0bIgu8ST3x26CcQ1JtzV6vxPLUwK0uiq10hQSMR+HzSNhWbcvx6nLg=="; + }; + }; "console-browserify-1.1.0" = { name = "console-browserify"; packageName = "console-browserify"; @@ -19364,6 +20687,15 @@ let sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; }; }; + "consolidate-0.15.1" = { + name = "consolidate"; + packageName = "consolidate"; + version = "0.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz"; + sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="; + }; + }; "constantinople-3.1.2" = { name = "constantinople"; packageName = "constantinople"; @@ -19391,22 +20723,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-10.0.41" = { + "constructs-10.0.97" = { name = "constructs"; packageName = "constructs"; - version = "10.0.41"; + version = "10.0.97"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.0.41.tgz"; - sha512 = "h8HytpdxtuO9PPndcvZGX90Silp9lCWxf0XlzGhWOGpZchIyDFR+pqy4n0eiyEsPcclPF0CMfCA3UcGugu3+vw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.0.97.tgz"; + sha512 = "2193Y3iDLY9sYCd89eb4TfjeDN+oD5ocl5d1LRnbGwlmvMe2fWqd9i84ET6K8K/PXBPSTyRQghnpw+Smn8b9vA=="; }; }; - "constructs-3.3.196" = { + "constructs-3.3.250" = { name = "constructs"; packageName = "constructs"; - version = "3.3.196"; + version = "3.3.250"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.196.tgz"; - sha512 = "0Sz3L28vykhG57fc2DljNBph2MBkedSZZcYIArv+wDYKm3vvio2PNMbK66FB9Vl+dKicE/RV9LDMD/Cd3MSelg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.250.tgz"; + sha512 = "D1817bciQBs1xFEx1+Yh0ynd4GmrrjNPo93Z3Q8H+bxHBfRN00xSCfgDHttv+dk+6UEA43eYaI4SNYbmfSj2gQ=="; }; }; "consume-http-header-1.0.0" = { @@ -19743,13 +21075,13 @@ let sha1 = "7e3e48bbe6d997b1417ddca2868204b4d3d85715"; }; }; - "convict-6.2.1" = { + "convict-6.2.2" = { name = "convict"; packageName = "convict"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/convict/-/convict-6.2.1.tgz"; - sha512 = "Mn4AJiYkR3TAZH1Xm/RU7gFS/0kM5TBSAQDry8y40Aez0ASY+3boUhv+3QE5XbOXiXM2JjdhkKve3IsBvWCibQ=="; + url = "https://registry.npmjs.org/convict/-/convict-6.2.2.tgz"; + sha512 = "3MsROJiEFN3BAzeFit1t87t7EUFzd44MNd13MLSikV2dsnDl7znwKgtYPPONtnDzxiDW0nBAsxVhSRNrjUrTTg=="; }; }; "cookie-0.0.4" = { @@ -19797,6 +21129,15 @@ let sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; }; + "cookie-0.4.2" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; + sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; + }; + }; "cookie-parser-1.4.6" = { name = "cookie-parser"; packageName = "cookie-parser"; @@ -19860,13 +21201,13 @@ let sha512 = "8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow=="; }; }; - "copy-anything-2.0.3" = { + "copy-anything-2.0.6" = { name = "copy-anything"; packageName = "copy-anything"; - version = "2.0.3"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz"; - sha512 = "GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ=="; + url = "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz"; + sha512 = "1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw=="; }; }; "copy-concurrently-1.0.5" = { @@ -19896,6 +21237,24 @@ let sha512 = "XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw=="; }; }; + "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"; + sha1 = "2680fbb8068a48d08656b6098092bdafc906f4a5"; + }; + }; + "copy-webpack-plugin-5.1.2" = { + name = "copy-webpack-plugin"; + packageName = "copy-webpack-plugin"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz"; + sha512 = "Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ=="; + }; + }; "copy-webpack-plugin-6.0.4" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; @@ -19968,40 +21327,40 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.18.0" = { + "core-js-3.21.0" = { name = "core-js"; packageName = "core-js"; - version = "3.18.0"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.18.0.tgz"; - sha512 = "WJeQqq6jOYgVgg4NrXKL0KLQhi0CT4ZOCvFL+3CQ5o7I6J8HkT5wd53EadMfqTDp1so/MT1J+w2ujhWcCJtN7w=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.21.0.tgz"; + sha512 = "YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ=="; }; }; - "core-js-3.20.3" = { + "core-js-3.21.1" = { name = "core-js"; packageName = "core-js"; - version = "3.20.3"; + version = "3.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz"; - sha512 = "vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz"; + sha512 = "FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="; }; }; - "core-js-compat-3.20.3" = { + "core-js-compat-3.21.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.20.3"; + version = "3.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.3.tgz"; - sha512 = "c8M5h0IkNZ+I92QhIpuSijOxGAcj3lgpsWdkCqmUTZNwidujF4r3pi6x1DCN+Vcs5qTS2XWWMfWSuCqyupX8gw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz"; + sha512 = "gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g=="; }; }; - "core-js-pure-3.20.3" = { + "core-js-pure-3.21.1" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.20.3"; + version = "3.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.20.3.tgz"; - sha512 = "Q2H6tQ5MtPtcC7f3HxJ48i4Q7T9ybPKgvWyuH7JXIoNa2pm0KuBnycsET/qw1SLLZYfbsbrZQNMeIOClb+6WIA=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.21.1.tgz"; + sha512 = "12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ=="; }; }; "core-util-is-1.0.2" = { @@ -20067,15 +21426,6 @@ let sha1 = "11a45bc47ab30c54d00bb869ea1802fbcd9a09d0"; }; }; - "cosmiconfig-3.1.0" = { - name = "cosmiconfig"; - packageName = "cosmiconfig"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-3.1.0.tgz"; - sha512 = "zedsBhLSbPBms+kE7AH4vHg6JsKDz6epSv2/+5XHs8ILHlgDciSJfSWf8sX9aQ52Jb7KI7VswUTsLpR/G0cr2Q=="; - }; - }; "cosmiconfig-5.2.1" = { name = "cosmiconfig"; packageName = "cosmiconfig"; @@ -20121,13 +21471,13 @@ let sha512 = "H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA=="; }; }; - "cosmiconfig-typescript-loader-1.0.3" = { + "cosmiconfig-typescript-loader-1.0.6" = { name = "cosmiconfig-typescript-loader"; packageName = "cosmiconfig-typescript-loader"; - version = "1.0.3"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.3.tgz"; - sha512 = "ARo21VjxdacJUcHxgVMEYNIoVPYiuKOEwWBIYej4M22+pEbe3LzKgmht2UPM+0u7/T/KnZf2r/5IzHv2Nwz+/w=="; + url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.6.tgz"; + sha512 = "2nEotziYJWtNtoTjKbchj9QrdTT6DBxCvqjNKoDKARw+e2yZmTQCa07uRrykLIZuvSgp69YXLH89UHc0WhdMfQ=="; }; }; "couch-login-0.1.20" = { @@ -20148,13 +21498,13 @@ let sha1 = "aba6c5833be410d45b1eca3e6d583844ce682c77"; }; }; - "cp-file-7.0.0" = { + "cp-file-9.1.0" = { name = "cp-file"; packageName = "cp-file"; - version = "7.0.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz"; - sha512 = "0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw=="; + url = "https://registry.npmjs.org/cp-file/-/cp-file-9.1.0.tgz"; + sha512 = "3scnzFj/94eb7y4wyXRWwvzLFaQp87yyfTnChIjlfYrVqp5lVO3E2hIJMeQIltUT0K2ZAB3An1qXcBmwGyvuwA=="; }; }; "cpu-percentage-1.0.3" = { @@ -20175,13 +21525,13 @@ let sha512 = "PXHBvGLuL69u55IkLa5e5838fLhIMHxmkV4ge42a8alGyn7BtawYgI0hQ849EedvtHIOLNNH3i6eQU1BiE9SUA=="; }; }; - "cpy-8.1.2" = { + "cpy-9.0.1" = { name = "cpy"; packageName = "cpy"; - version = "8.1.2"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cpy/-/cpy-8.1.2.tgz"; - sha512 = "dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg=="; + url = "https://registry.npmjs.org/cpy/-/cpy-9.0.1.tgz"; + sha512 = "D9U0DR5FjTCN3oMTcFGktanHnAG5l020yvOCR1zKILmAyPP7I/9pl6NFgRbDcmSENtbK1sQLBz1p9HIOlroiNg=="; }; }; "crc-0.2.0" = { @@ -20211,13 +21561,13 @@ let sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; }; }; - "crc-32-1.2.0" = { + "crc-32-1.2.1" = { name = "crc-32"; packageName = "crc-32"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz"; - sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA=="; + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz"; + sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w=="; }; }; "crc32-stream-3.0.1" = { @@ -20256,13 +21606,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-2.5.1" = { + "create-gatsby-2.10.2" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "2.5.1"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.5.1.tgz"; - sha512 = "pI5zvUAtHPREzKQpYU4HcpnT/Q9F+pgY99xs8HT49ZphG7qy+g02Ec/7jCNHDxlre7u+7a6TXmDF9FYr4T7BYw=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.10.2.tgz"; + sha512 = "OmuFey3Eoaek20m8Br/iIqEr76AUrl/ThCn7TBYJ6RvWVKezKV5UksQlFpdQgPK8kO9LogjkmiyA0k94VC3nXg=="; }; }; "create-graphback-1.0.1" = { @@ -20310,22 +21660,31 @@ let sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; }; }; - "create-torrent-5.0.1" = { + "create-torrent-5.0.2" = { name = "create-torrent"; packageName = "create-torrent"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.1.tgz"; - sha512 = "fVvg1YYSogo3TlU1WFeTt937nhGQlf5KtB6M2HyDa/U02dbeMBE2AY9PcPlMufXNQoM/UCO28y26EmuApM7ZmA=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.2.tgz"; + sha512 = "tNelixVeEkjiyeAuCW7uWFl1ARA+YapyZvdSWw6U3AXe/VXpxR4ihFNfjOzmvc5TBqK5EkGdsoKXAEKfQ8xlmQ=="; }; }; - "cron-1.8.2" = { - name = "cron"; - packageName = "cron"; - version = "1.8.2"; + "cron-parser-2.18.0" = { + name = "cron-parser"; + packageName = "cron-parser"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz"; - sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg=="; + url = "https://registry.npmjs.org/cron-parser/-/cron-parser-2.18.0.tgz"; + sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg=="; + }; + }; + "croner-4.1.97" = { + name = "croner"; + packageName = "croner"; + version = "4.1.97"; + src = fetchurl { + url = "https://registry.npmjs.org/croner/-/croner-4.1.97.tgz"; + sha512 = "/f6gpQuxDaqXu+1kwQYSckUglPaOrHdbIlBAu0YuW8/Cdb45XwXYNUBXg3r/9Mo6n540Kn/smKcZWko5x99KrQ=="; }; }; "cronosjs-1.7.1" = { @@ -20346,15 +21705,6 @@ let sha512 = "1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ=="; }; }; - "cross-env-6.0.3" = { - name = "cross-env"; - packageName = "cross-env"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-env/-/cross-env-6.0.3.tgz"; - sha512 = "+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag=="; - }; - }; "cross-env-7.0.0" = { name = "cross-env"; packageName = "cross-env"; @@ -20445,13 +21795,13 @@ let sha512 = "mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw=="; }; }; - "cross-undici-fetch-0.1.16" = { + "cross-undici-fetch-0.1.27" = { name = "cross-undici-fetch"; packageName = "cross-undici-fetch"; - version = "0.1.16"; + version = "0.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.1.16.tgz"; - sha512 = "VoL+4GLbq2R7cfpM3wc3RClV6boUAjbpZ485YHsIeBnWYUi4osdDZhh1ohk9+BjrLvAvwmvQwZC5rTEIVQ2eVQ=="; + url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.1.27.tgz"; + sha512 = "Oz/zXdh2HCq55xARCwFAYtKlyGp3VFAIfOEexN6nVm06rD6O5g47fKp7fggf/kBtc7iG09asNoGW+CUwIi4Efg=="; }; }; "crossroads-0.12.2" = { @@ -20526,49 +21876,49 @@ let sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; }; }; - "cspell-gitignore-5.16.0" = { + "cspell-gitignore-5.19.3" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "5.16.0"; + version = "5.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-5.16.0.tgz"; - sha512 = "G7yN0R2EqFSNpn3bQ4SGOmydaaYq5BHSiPqsX3vJSJn0wErZz3m/kpKcXrtLPw5/tAM0SfZWhAp1K3MEjrb6xQ=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-5.19.3.tgz"; + sha512 = "Q67uHcf0qNgOoanRLhatapjWpLiftT+MuLIyAaSLe5eNVzQurQIc+UnXhtaslkVyOTqQt4NJFqLgtf5ZSGz1bg=="; }; }; - "cspell-glob-5.16.0" = { + "cspell-glob-5.19.3" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "5.16.0"; + version = "5.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-5.16.0.tgz"; - sha512 = "u1cNhmNi5VC6QZ6W+FQEAFIowLdU+/fuh6811Hb//MfTNpe2HDbVrjredQrtaETpyImjy4VG/aA7iSWGGuUAcw=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-5.19.3.tgz"; + sha512 = "qp2Oe/euzTu3e0zZrQxHuTrqRo418tYfh4CnCa+DKU6lWKKcF4zCEhOGJHPsYak8SFIXZ4ZE360wHFxB/JDutQ=="; }; }; - "cspell-io-5.16.0" = { + "cspell-io-5.19.3" = { name = "cspell-io"; packageName = "cspell-io"; - version = "5.16.0"; + version = "5.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-5.16.0.tgz"; - sha512 = "nrRbNewf8PMEq8W7D1D0jEwxwJ1dH588EPPu9Q+iT+DItvcBL+mQmGlz8kS7KBh579ioW2vecWUekQ3HSmAgGg=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-5.19.3.tgz"; + sha512 = "dE9eBvHgIJ11DelWtyehMU3W3bCpcB+0nS6uOZJ2d8fDu13m5BebpLrXZ2dKfY4cjksJUhRPatt14uwQSeUp2A=="; }; }; - "cspell-lib-5.16.0" = { + "cspell-lib-5.19.3" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "5.16.0"; + version = "5.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-5.16.0.tgz"; - sha512 = "IpTPseI4SounQEqfWupOLgEXPcbucWJdbCYkxKXWfl15xfWRo2seYV0RECkJ8pSZKqsCXo6x08i7CrKjvV5N5Q=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-5.19.3.tgz"; + sha512 = "peMJggwJpxCXKZZ0DuHyDtZmf66POKaHf5Im8LGEyMKFARUIq6O2WvaUGggYjyRe3Ng/f5G+EYTcIHbF9pZYcg=="; }; }; - "cspell-trie-lib-5.16.0" = { + "cspell-trie-lib-5.19.3" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "5.16.0"; + version = "5.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-5.16.0.tgz"; - sha512 = "Dpxr0SManHi4D3sAJI1SA14lwTGdmubv88yrRuFd7TU5ihG39BIMxfoAoSRWkqXUEub5QLhAKhftOBUJIm4cIw=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-5.19.3.tgz"; + sha512 = "Io8EB7E1pmttHzZvgvPEF0b87qlq8G5uA4B+sbqCxrUf5l4JDcK/UYLih0+rekLTbv4Q68zqgCTASvqxgqnoAg=="; }; }; "csrf-3.1.0" = { @@ -20634,6 +21984,15 @@ let sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; }; }; + "css-functions-list-3.0.1" = { + name = "css-functions-list"; + packageName = "css-functions-list"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz"; + sha512 = "PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw=="; + }; + }; "css-loader-2.1.1" = { name = "css-loader"; packageName = "css-loader"; @@ -20670,15 +22029,6 @@ let sha1 = "a468ee667c16d81ccf05c58c38d2a97c780dbfd4"; }; }; - "css-ripple-effect-1.0.5" = { - name = "css-ripple-effect"; - packageName = "css-ripple-effect"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/css-ripple-effect/-/css-ripple-effect-1.0.5.tgz"; - sha1 = "6963b752aaf59babbd3fea3ec0da5d44e9122efb"; - }; - }; "css-select-1.0.0" = { name = "css-select"; packageName = "css-select"; @@ -20958,13 +22308,13 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; - "csstype-3.0.10" = { + "csstype-3.0.11" = { name = "csstype"; packageName = "csstype"; - version = "3.0.10"; + version = "3.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz"; - sha512 = "2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="; + url = "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz"; + sha512 = "sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="; }; }; "csurf-1.11.0" = { @@ -21012,15 +22362,6 @@ let sha512 = "5AIdl8l6n3iYQYxan5djB5eKDa+vBnhfWZtRpJTcrETWfVLYN0WSj3L9RwvgYt+psoO77juUr8TG8qpfGZifVQ=="; }; }; - "csv-parser-1.12.1" = { - name = "csv-parser"; - packageName = "csv-parser"; - version = "1.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/csv-parser/-/csv-parser-1.12.1.tgz"; - sha512 = "r45M92nLnGP246ot0Yo5RvbiiMF5Bw/OTIdWJ3OQ4Vbv4hpOeoXVIPxdSmUw+fPJlQOseY+iigJyLSfPMIrddQ=="; - }; - }; "csv-stream-0.2.0" = { name = "csv-stream"; packageName = "csv-stream"; @@ -21192,15 +22533,6 @@ let sha512 = "KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="; }; }; - "d3-array-2.12.1" = { - name = "d3-array"; - packageName = "d3-array"; - version = "2.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz"; - sha512 = "B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ=="; - }; - }; "d3-array-3.1.1" = { name = "d3-array"; packageName = "d3-array"; @@ -21318,15 +22650,6 @@ let sha512 = "0Oc4D0KyhwhM7ZL0RMnfGycLN7hxHB8CMmwZ3+H26PWAG0ozNuYG5hXSDNgmP1SgJkQMrlG6cP20HoaSbvcJTQ=="; }; }; - "d3-delaunay-5.3.0" = { - name = "d3-delaunay"; - packageName = "d3-delaunay"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-5.3.0.tgz"; - sha512 = "amALSrOllWVLaHTnDLHwMIiz0d1bBu9gZXd1FiLfXf8sHcX9jrcj81TVZOqD4UX7MgBZZ07c8GxzEgBpJqc74w=="; - }; - }; "d3-delaunay-6.0.2" = { name = "d3-delaunay"; packageName = "d3-delaunay"; @@ -21399,15 +22722,6 @@ let sha512 = "9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g=="; }; }; - "d3-dsv-2.0.0" = { - name = "d3-dsv"; - packageName = "d3-dsv"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-dsv/-/d3-dsv-2.0.0.tgz"; - sha512 = "E+Pn8UJYx9mViuIUkoc93gJGGYut6mSDKy2+XaPwccwkRGlR+LO97L2VCCRjQivTwLHkSnAJG7yo00BWY6QM+w=="; - }; - }; "d3-dsv-3.0.1" = { name = "d3-dsv"; packageName = "d3-dsv"; @@ -21471,15 +22785,6 @@ let sha512 = "HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg=="; }; }; - "d3-force-2.1.1" = { - name = "d3-force"; - packageName = "d3-force"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-force/-/d3-force-2.1.1.tgz"; - sha512 = "nAuHEzBqMvpFVMf9OX75d00OxvOXdxY+xECIXjW6Gv8BRrXu6gAWbv/9XKrvfJ5i5DCokDW7RYE50LRoK092ew=="; - }; - }; "d3-force-3.0.0" = { name = "d3-force"; packageName = "d3-force"; @@ -21525,15 +22830,6 @@ let sha512 = "XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg=="; }; }; - "d3-geo-2.0.2" = { - name = "d3-geo"; - packageName = "d3-geo"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.2.tgz"; - sha512 = "8pM1WGMLGFuhq9S+FpPURxic+gKzjluCD/CHTuUF3mXMeiCo0i6R0tO1s4+GArRFde96SLcW/kOFRjoAosPsFA=="; - }; - }; "d3-geo-3.0.1" = { name = "d3-geo"; packageName = "d3-geo"; @@ -21543,22 +22839,22 @@ let sha512 = "Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA=="; }; }; - "d3-geo-projection-3.0.0" = { + "d3-geo-projection-4.0.0" = { name = "d3-geo-projection"; packageName = "d3-geo-projection"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-3.0.0.tgz"; - sha512 = "1JE+filVbkEX2bT25dJdQ05iA4QHvUwev6o0nIQHOSrNlHCAKfVss/U10vEM3pA4j5v7uQoFdQ4KLbx9BlEbWA=="; - }; - }; - "d3-graphviz-4.0.0" = { - name = "d3-graphviz"; - packageName = "d3-graphviz"; version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-4.0.0.tgz"; - sha512 = "j+fRjPiLnMa3C2QLIWld13vJQzkd9uBhYXZJQSgKI7z2uTvCdMcrvvxJYg7vGdzqceMImKq5Is/oX8kDw+1xng=="; + url = "https://registry.npmjs.org/d3-geo-projection/-/d3-geo-projection-4.0.0.tgz"; + sha512 = "p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg=="; + }; + }; + "d3-graphviz-4.1.0" = { + name = "d3-graphviz"; + packageName = "d3-graphviz"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-4.1.0.tgz"; + sha512 = "RtCGnEROcte5npTfjhiNR3kSbwhBl8LA6NNq0oFRXEIFB9N4xHQgGjZWfAHVsN9NQVctEEkRQ4H0GGdqfStlZQ=="; }; }; "d3-hierarchy-1.1.9" = { @@ -21570,15 +22866,6 @@ let sha512 = "j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="; }; }; - "d3-hierarchy-2.0.0" = { - name = "d3-hierarchy"; - packageName = "d3-hierarchy"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-2.0.0.tgz"; - sha512 = "SwIdqM3HxQX2214EG9GTjgmCc/mbSx4mQBn+DuEETubhOw6/U3fmnji4uCVrmzOydMHSO1nZle5gh6HB/wdOzw=="; - }; - }; "d3-hierarchy-3.1.1" = { name = "d3-hierarchy"; packageName = "d3-hierarchy"; @@ -21669,15 +22956,6 @@ let sha512 = "RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="; }; }; - "d3-quadtree-2.0.0" = { - name = "d3-quadtree"; - packageName = "d3-quadtree"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-2.0.0.tgz"; - sha512 = "b0Ed2t1UUalJpc3qXzKi+cPGxeXRr4KU9YSlocN74aTzp6R/Ud43t79yLLqxHRWZfsvWXmbDWPpoENK1K539xw=="; - }; - }; "d3-quadtree-3.0.1" = { name = "d3-quadtree"; packageName = "d3-quadtree"; @@ -21714,15 +22992,6 @@ let sha512 = "LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw=="; }; }; - "d3-scale-3.3.0" = { - name = "d3-scale"; - packageName = "d3-scale"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz"; - sha512 = "1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ=="; - }; - }; "d3-scale-4.0.2" = { name = "d3-scale"; packageName = "d3-scale"; @@ -21786,15 +23055,6 @@ let sha512 = "EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw=="; }; }; - "d3-shape-2.1.0" = { - name = "d3-shape"; - packageName = "d3-shape"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-shape/-/d3-shape-2.1.0.tgz"; - sha512 = "PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA=="; - }; - }; "d3-shape-3.1.0" = { name = "d3-shape"; packageName = "d3-shape"; @@ -21813,15 +23073,6 @@ let sha512 = "Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="; }; }; - "d3-time-2.1.1" = { - name = "d3-time"; - packageName = "d3-time"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz"; - sha512 = "/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ=="; - }; - }; "d3-time-3.0.0" = { name = "d3-time"; packageName = "d3-time"; @@ -21840,15 +23091,6 @@ let sha512 = "guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ=="; }; }; - "d3-time-format-3.0.0" = { - name = "d3-time-format"; - packageName = "d3-time-format"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz"; - sha512 = "UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag=="; - }; - }; "d3-time-format-4.1.0" = { name = "d3-time-format"; packageName = "d3-time-format"; @@ -22119,6 +23361,15 @@ let sha512 = "WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="; }; }; + "data-uri-to-buffer-4.0.0" = { + name = "data-uri-to-buffer"; + packageName = "data-uri-to-buffer"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz"; + sha512 = "Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA=="; + }; + }; "data-urls-1.1.0" = { name = "data-urls"; packageName = "data-urls"; @@ -22209,13 +23460,13 @@ let sha512 = "eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w=="; }; }; - "date-format-4.0.3" = { + "date-format-4.0.6" = { name = "date-format"; packageName = "date-format"; - version = "4.0.3"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz"; - sha512 = "7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ=="; + url = "https://registry.npmjs.org/date-format/-/date-format-4.0.6.tgz"; + sha512 = "B9vvg5rHuQ8cbUXE/RMWMyX2YA5TecT3jKF5fLtGNlzPlU7zblSPmAm2OImDbWL+LDOQ6pUm+4LOFz+ywS41Zw=="; }; }; "date-now-0.1.4" = { @@ -22254,13 +23505,13 @@ let sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="; }; }; - "dayjs-1.10.7" = { + "dayjs-1.11.0" = { name = "dayjs"; packageName = "dayjs"; - version = "1.10.7"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz"; - sha512 = "P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.0.tgz"; + sha512 = "JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug=="; }; }; "dayjs-1.8.36" = { @@ -22272,6 +23523,15 @@ let sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="; }; }; + "de-indent-1.0.2" = { + name = "de-indent"; + packageName = "de-indent"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"; + sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; + }; + }; "deasync-0.1.20" = { name = "deasync"; packageName = "deasync"; @@ -22452,6 +23712,15 @@ let sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; }; }; + "debug-4.3.4" = { + name = "debug"; + packageName = "debug"; + version = "4.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; + }; + }; "debug-fabulous-1.1.0" = { name = "debug-fabulous"; packageName = "debug-fabulous"; @@ -22488,6 +23757,15 @@ let sha1 = "6f6df6b85d7e7c4410a932ffc26489b78e9acd13"; }; }; + "decache-4.6.1" = { + name = "decache"; + packageName = "decache"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/decache/-/decache-4.6.1.tgz"; + sha512 = "ohApBM8u9ygepJCjgBrEZSSxPjc0T/PJkD+uNyxXPkqudyUpdXpwJYp0VISm2WrPVzASU6DZyIi6BWdyw7uJ2Q=="; + }; + }; "decamelize-1.2.0" = { name = "decamelize"; packageName = "decamelize"; @@ -22677,6 +23955,15 @@ let sha1 = "bee5fb7c9e727d85dffa24590d10ec1ab1255305"; }; }; + "deep-copy-1.4.2" = { + name = "deep-copy"; + packageName = "deep-copy"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-copy/-/deep-copy-1.4.2.tgz"; + sha512 = "VxZwQ/1+WGQPl5nE67uLhh7OqdrmqI1OazrraO9Bbw/M8Bt6Mol/RxzDA6N6ZgRXpsG/W9PgUj8E1LHHBEq2GQ=="; + }; + }; "deep-eql-3.0.1" = { name = "deep-eql"; packageName = "deep-eql"; @@ -22686,15 +23973,6 @@ let sha512 = "+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="; }; }; - "deep-equal-0.1.2" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz"; - sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce"; - }; - }; "deep-equal-0.2.2" = { name = "deep-equal"; packageName = "deep-equal"; @@ -22803,6 +24081,15 @@ let sha512 = "8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ=="; }; }; + "deepmerge-1.5.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz"; + sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="; + }; + }; "deepmerge-2.1.0" = { name = "deepmerge"; packageName = "deepmerge"; @@ -22866,6 +24153,15 @@ let sha512 = "h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA=="; }; }; + "default-gateway-5.0.5" = { + name = "default-gateway"; + packageName = "default-gateway"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/default-gateway/-/default-gateway-5.0.5.tgz"; + sha512 = "z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA=="; + }; + }; "default-gateway-6.0.3" = { name = "default-gateway"; packageName = "default-gateway"; @@ -23010,13 +24306,13 @@ let sha512 = "aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg=="; }; }; - "degenerator-3.0.1" = { + "degenerator-3.0.2" = { name = "degenerator"; packageName = "degenerator"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/degenerator/-/degenerator-3.0.1.tgz"; - sha512 = "LFsIFEeLPlKvAKXu7j3ssIG6RT0TbI7/GhsqrI0DnHASEQjXQ0LUSYcjJteGgRGmZbl1TnMSxpNQIAiJ7Du5TQ=="; + url = "https://registry.npmjs.org/degenerator/-/degenerator-3.0.2.tgz"; + sha512 = "c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ=="; }; }; "del-3.0.0" = { @@ -23037,15 +24333,6 @@ let sha512 = "QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ=="; }; }; - "del-5.1.0" = { - name = "del"; - packageName = "del"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/del/-/del-5.1.0.tgz"; - sha512 = "wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA=="; - }; - }; "del-6.0.0" = { name = "del"; packageName = "del"; @@ -23055,15 +24342,6 @@ let sha512 = "1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ=="; }; }; - "delaunator-4.0.1" = { - name = "delaunator"; - packageName = "delaunator"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/delaunator/-/delaunator-4.0.1.tgz"; - sha512 = "WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag=="; - }; - }; "delaunator-5.0.0" = { name = "delaunator"; packageName = "delaunator"; @@ -23073,15 +24351,6 @@ let sha512 = "AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw=="; }; }; - "delay-4.4.1" = { - name = "delay"; - packageName = "delay"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/delay/-/delay-4.4.1.tgz"; - sha512 = "aL3AhqtfhOlT/3ai6sWXeqwnw63ATNpnUiN4HL7x9q+My5QtHlO3OIkasmug9LKzpheLdmUKGRKnYXYAS7FQkQ=="; - }; - }; "delay-5.0.0" = { name = "delay"; packageName = "delay"; @@ -23109,13 +24378,13 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; - "deltachat-node-1.70.0" = { + "deltachat-node-1.76.0" = { name = "deltachat-node"; packageName = "deltachat-node"; - version = "1.70.0"; + version = "1.76.0"; src = fetchurl { - url = "https://registry.npmjs.org/deltachat-node/-/deltachat-node-1.70.0.tgz"; - sha512 = "PjI8X+MPPdVLF2Tq+WG0r9twwxFAWAi1yz+23+Qt07qTNcyeYHJx499Ssc3II5Q5MW00ylTdnFd+APD7FpFqLQ=="; + url = "https://registry.npmjs.org/deltachat-node/-/deltachat-node-1.76.0.tgz"; + sha512 = "KMUDHQW2h0nklkt9s9srv0ADWISMlrjWETFFmb+1XZCNQsHXoeyYhic1oUQpSK5LAT+YAKWw/XcCZrmI7tHu3A=="; }; }; "denodeify-1.2.1" = { @@ -23280,6 +24549,15 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; + "destroy-1.2.0" = { + name = "destroy"; + packageName = "destroy"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"; + sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; + }; + }; "detab-1.0.2" = { name = "detab"; packageName = "detab"; @@ -23325,6 +24603,15 @@ let sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; }; + "detect-libc-2.0.1" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz"; + sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; + }; + }; "detect-newline-2.1.0" = { name = "detect-newline"; packageName = "detect-newline"; @@ -23397,13 +24684,13 @@ let sha512 = "4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ=="; }; }; - "devtools-protocol-0.0.948846" = { + "devtools-protocol-0.0.969999" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.948846"; + version = "0.0.969999"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.948846.tgz"; - sha512 = "5fGyt9xmMqUl2VI7+rnUkKCiAQIpLns8sfQtTENy5L70ktbNw0Z3TFJ1JoFNYdx/jffz4YXU45VF75wKZD7sZQ=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.969999.tgz"; + sha512 = "6GfzuDWU0OFAuOvBokXpXPLxjOJ5DZ157Ue3sGQQM3LgAamb8m0R0ruSfN0DDu+XG5XJgT50i6zZ/0o8RglreQ=="; }; }; "dezalgo-1.0.3" = { @@ -23451,15 +24738,6 @@ let sha512 = "l126t01d2ZS9EreskvEtZPrcgstuvH3rbKy82oUhUrVmBaGx4hO9wECdl3cvZbKDYjMF3QJDB5z5dL9yWAjvZQ=="; }; }; - "diagnostics-1.1.1" = { - name = "diagnostics"; - packageName = "diagnostics"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz"; - sha512 = "8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ=="; - }; - }; "dicer-0.2.5" = { name = "dicer"; packageName = "dicer"; @@ -23541,13 +24819,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.4.14" = { + "diff2html-3.4.16" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.14"; + version = "3.4.16"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.14.tgz"; - sha512 = "cMS7WYOELzSMuAmRMR0+vNwF8PjcFXOyutYEdXkcAXeA7l2AVEi3XdNnC1lk4bh2xSFKkoQ6Lhy+iqtcRonkww=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.16.tgz"; + sha512 = "KfkvEoZTJertjoGPYFLn8n0yRdvzJcHvFJpJwbIxUlHU9x6qqhRZEM+TlgtU09jdLqRZAQyWFoxPiP6HeT2IYA=="; }; }; "diff3-0.0.3" = { @@ -23667,13 +24945,13 @@ let sha512 = "cK6rH1PuGjSjpmEQbnpuTxq1Yv8B89SotyKUFcr4RhnsiZnfBfDOev7DD7v5vhtEyyj51NuMWFoRJzgy/m08Uw=="; }; }; - "diskusage-1.1.3" = { - name = "diskusage"; - packageName = "diskusage"; - version = "1.1.3"; + "diskusage-ng-1.0.2" = { + name = "diskusage-ng"; + packageName = "diskusage-ng"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/diskusage/-/diskusage-1.1.3.tgz"; - sha512 = "EAyaxl8hy4Ph07kzlzGTfpbZMNAAAHXSZtNEMwdlnSd1noHzvA6HsgKt4fEMSvaEXQYLSphe5rPMxN4WOj0hcQ=="; + url = "https://registry.npmjs.org/diskusage-ng/-/diskusage-ng-1.0.2.tgz"; + sha512 = "IO+Dbvxf5kXGuOEAHFCSf/aW9z/E96OwUH1Szstf2Rjzy+AP6sr/Y5yQh70fdX8SEFKdkTMpVG+b5jR7Uw3Q1Q=="; }; }; "diveSync-0.3.0" = { @@ -23766,31 +25044,31 @@ let sha512 = "2FFKzmLGOnD+Y378bRKH+gTjRMuSpH7OKgPy31KjjfCoKZx7tU8Dmqfd/3fhG2d/4bppuN8/KtWMUZBAcUCRnQ=="; }; }; - "dockerfile-ast-0.4.1" = { + "dockerfile-ast-0.4.2" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.4.1.tgz"; - sha512 = "qM5/m+Ez4GOM3ILkG13+cPxwgIcuA/z3LmEPZf4VJ82f7T1DuVbz7ctw4IzWdbiecuXcs+C4fFVbo5priGnIIQ=="; + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.4.2.tgz"; + sha512 = "k770mVWaCm3KbyOSPFizP6WB2ucZjfAv8aun4UsKl+IivowK7ItwBixNbziBjN05yNpvCL1/IxBdZiSz6KQIvA=="; }; }; - "dockerfile-language-service-0.7.4" = { + "dockerfile-language-service-0.8.1" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; - version = "0.7.4"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.7.4.tgz"; - sha512 = "SxKqTMQshN6xr20qTeurUydI432+ZUrkfhMurknjPvhdTc5oheH+WeN1cqKKQrILlcVq7agbFlXH51sdempuGQ=="; + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.8.1.tgz"; + sha512 = "bqrZ2FzG45w2Mzmak3oC5ecIl/edStygSFQ0i/8WGabb5k/w6zWwqDaHVgT8dkfogm+swHMQUu4WGTvVu1qLCA=="; }; }; - "dockerfile-utils-0.9.3" = { + "dockerfile-utils-0.9.4" = { name = "dockerfile-utils"; packageName = "dockerfile-utils"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.9.3.tgz"; - sha512 = "tMPdbywzglQh7JieKL1vn7HyJoYwk8J8AyfyLaqkLJ5tRA/TSrOVK6R40C3bwEceYg875crMo8yHSkz09Fc6VA=="; + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.9.4.tgz"; + sha512 = "lqmCxVhaUyCUIz9dhzYVrHZLJG5hzdcwd29JcA/0o7xIx2VwvIctUE6SpK8ugLTNuwMx/oKU2YVLaRIX/CmQPg=="; }; }; "doctoc-2.1.0" = { @@ -23829,13 +25107,13 @@ let sha1 = "ea80b106a87538774e8a3a4a5afe293de489e0a9"; }; }; - "doipjs-0.14.0" = { + "doipjs-0.15.5" = { name = "doipjs"; packageName = "doipjs"; - version = "0.14.0"; + version = "0.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/doipjs/-/doipjs-0.14.0.tgz"; - sha512 = "FX0rRv4h+/IaCCS2YSrEdx7nbM1iHimJfXhGDi5OU+0ALw5868RLDUQoWNpTfS+PtKX4vOgqmMAGuGlPLJiqkA=="; + url = "https://registry.npmjs.org/doipjs/-/doipjs-0.15.5.tgz"; + sha512 = "PIZIx+2+LqDtJWUXOMAd0PabT6uojkk5x4k1crUX68nMqDuNKne8v4K2Viytu8F9eBgN1cIUL9gLV8p4oqXI4A=="; }; }; "dom-converter-0.2.0" = { @@ -24027,13 +25305,13 @@ let sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; }; }; - "domhandler-4.3.0" = { + "domhandler-4.3.1" = { name = "domhandler"; packageName = "domhandler"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz"; - sha512 = "fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"; + sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="; }; }; "domino-2.1.6" = { @@ -24045,13 +25323,22 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; - "dompurify-2.3.4" = { + "dompurify-2.3.5" = { name = "dompurify"; packageName = "dompurify"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-2.3.4.tgz"; - sha512 = "6BVcgOAVFXjI0JTjEvZy901Rghm+7fDQOrNIcxB4+gdhj6Kwp6T9VBhBY/AbagKHJocRkDYGd6wvI+p4/10xtQ=="; + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.3.5.tgz"; + sha512 = "kD+f8qEaa42+mjdOpKeztu9Mfx5bv9gVLO6K9jRx4uGvh6Wv06Srn4jr1wPNY2OOUGGSKHNFN+A8MA3v0E0QAQ=="; + }; + }; + "dompurify-2.3.6" = { + name = "dompurify"; + packageName = "dompurify"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.3.6.tgz"; + sha512 = "OFP2u/3T1R5CEgWCEONuJ1a5+MFKnOYpkywpUSxv/dj1LeBT1erK+JwM7zK0ROy2BRhqVCf0LRw/kHqKuMkVGg=="; }; }; "domutils-1.4.3" = { @@ -24135,15 +25422,6 @@ let sha512 = "tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA=="; }; }; - "dot-qs-0.2.0" = { - name = "dot-qs"; - packageName = "dot-qs"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-qs/-/dot-qs-0.2.0.tgz"; - sha1 = "d36517fe24b7cda61fce7a5026a0024afaf5a439"; - }; - }; "dotenv-10.0.0" = { name = "dotenv"; packageName = "dotenv"; @@ -24171,6 +25449,15 @@ let sha512 = "HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w=="; }; }; + "dotenv-7.0.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz"; + sha512 = "M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g=="; + }; + }; "dotenv-8.6.0" = { name = "dotenv"; packageName = "dotenv"; @@ -24189,6 +25476,15 @@ let sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; }; }; + "dotf-2.0.2" = { + name = "dotf"; + packageName = "dotf"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dotf/-/dotf-2.0.2.tgz"; + sha512 = "4cN2fwEqHimE11jVc8uMNiEB2A2YOL5Fdyd1p14UbAvRh/5vAxjEaiVPx45zD5IQcwc/uQIxI9Jh18skB/uYFQ=="; + }; + }; "dotignore-0.1.2" = { name = "dotignore"; packageName = "dotignore"; @@ -24576,22 +25872,22 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-13.6.7" = { + "electron-14.2.8" = { name = "electron"; packageName = "electron"; - version = "13.6.7"; + version = "14.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/electron/-/electron-13.6.7.tgz"; - sha512 = "gzCru/TpyCZ3yRjR/TVKph6Q/rmFZnLszxoeESaiijHjobB0xxr2oTHQLGVhpali2ddrM+4Pz6+MyZwS6Us+xA=="; + url = "https://registry.npmjs.org/electron/-/electron-14.2.8.tgz"; + sha512 = "K22hI0NVkC7sU5sMDXwW1lxAjhNsFXL2wuJF7Ij9CyWqW/j6AtIMfDkUoM5mXaTg0FGUlmlNr9Rh7cp8bBn6Sg=="; }; }; - "electron-notarize-1.1.1" = { + "electron-notarize-1.2.1" = { name = "electron-notarize"; packageName = "electron-notarize"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.1.tgz"; - sha512 = "kufsnqh86CTX89AYNG3NCPoboqnku/+32RxeJ2+7A4Rbm4bbOx0Nc7XTy3/gAlBfpj9xPAxHfhZLOHgfi6cJVw=="; + url = "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.2.1.tgz"; + sha512 = "u/ECWhIrhkSQpZM4cJzVZ5TsmkaqrRo5LDC/KMbGF0sPkm53Ng59+M0zp8QVaql0obfJy9vlVT+4iOkAi2UDlA=="; }; }; "electron-osx-sign-0.5.0" = { @@ -24621,13 +25917,13 @@ let sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw=="; }; }; - "electron-to-chromium-1.4.51" = { + "electron-to-chromium-1.4.96" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.51"; + version = "1.4.96"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.51.tgz"; - sha512 = "JNEmcYl3mk1tGQmy0EvL5eik/CKSBuzAyGP0QFdG6LIgxQe3II0BL1m2zKc2MZMf3uGqHWE1TFddJML0RpjSHQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.96.tgz"; + sha512 = "DPNjvNGPabv6FcyjzLAN4C0psN/GgD9rSGvMTuv81SeXG/EX3mCz0wiw9N1tUEnfQXYCJi3H8M0oFPRziZh7rw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -24682,7 +25978,7 @@ let version = "1.0.1"; src = fetchurl { name = "emitter-1.0.1.tar.gz"; - url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1"; + url = "https://codeload.github.com/component/emitter/tar.gz/refs/tags/1.0.1"; sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; }; }; @@ -24695,13 +25991,13 @@ let sha512 = "Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ=="; }; }; - "emmet-2.3.5" = { + "emmet-2.3.6" = { name = "emmet"; packageName = "emmet"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/emmet/-/emmet-2.3.5.tgz"; - sha512 = "LcWfTamJnXIdMfLvJEC5Ld3hY5/KHXgv1L1bp6I7eEvB0ZhacHZ1kX0BYovJ8FroEsreLcq7n7kZhRMsf6jkXQ=="; + url = "https://registry.npmjs.org/emmet/-/emmet-2.3.6.tgz"; + sha512 = "pLS4PBPDdxuUAmw7Me7+TcHbykTsBKN/S9XJbUOMFQrNv9MoshzyMFK/R57JBm94/6HSL4vHnDeEmxlC82NQ4A=="; }; }; "emoji-js-clean-4.0.0" = { @@ -24830,15 +26126,6 @@ let sha1 = "9eba6837d16d0982b59f87d889bf754443d52931"; }; }; - "enabled-1.0.2" = { - name = "enabled"; - packageName = "enabled"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz"; - sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; - }; - }; "enabled-2.0.0" = { name = "enabled"; packageName = "enabled"; @@ -24983,22 +26270,22 @@ let sha512 = "t5z6zjXuVLhXDMiFJPYsPOWEER8B0tIsD3ETgw19S1yg9zryvUfY3Vhtk3Gf4sihw/bQGIqQ//gjvVlu+Ca0bQ=="; }; }; - "engine.io-5.1.1" = { + "engine.io-6.0.1" = { name = "engine.io"; packageName = "engine.io"; - version = "5.1.1"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-5.1.1.tgz"; - sha512 = "aMWot7H5aC8L4/T8qMYbLdvKlZOdJTH54FxfdFunTGvhMx1BHkJOntWArsVfgAZVwAO9LC2sryPWRcEeUzCe5w=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.0.1.tgz"; + sha512 = "Y53UaciUh2Rmx5MiogtMxOQcfh7pnemday+Bb4QDg0Wjmnvo/VTvuEyNGQgYmh8L7VOe8Je1QuiqjLNDelMqLA=="; }; }; - "engine.io-6.1.2" = { + "engine.io-6.1.3" = { name = "engine.io"; packageName = "engine.io"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz"; - sha512 = "v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.3.tgz"; + sha512 = "rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA=="; }; }; "engine.io-client-1.3.1" = { @@ -25037,6 +26324,24 @@ let sha512 = "QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA=="; }; }; + "engine.io-client-6.0.3" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.0.3.tgz"; + sha512 = "IH8ZhDIwiLv0d/wXVzmjfV9Y82hbJIDhCGSVUV8o1kcpDe2I6Y3bZA3ZbJy4Ls7k7IVmcy/qn4k9RKWFhUGf5w=="; + }; + }; + "engine.io-client-6.1.1" = { + name = "engine.io-client"; + packageName = "engine.io-client"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.1.1.tgz"; + sha512 = "V05mmDo4gjimYW+FGujoGmmmxRaDsrVr7AXA3ZIfa04MWM1jOfZfUwou0oNqhNwy/votUDvGDt4JA4QF4e0b4g=="; + }; + }; "engine.io-parser-1.0.6" = { name = "engine.io-parser"; packageName = "engine.io-parser"; @@ -25100,13 +26405,13 @@ let sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; }; - "enhanced-resolve-5.8.3" = { + "enhanced-resolve-5.9.2" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.8.3"; + version = "5.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz"; - sha512 = "EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz"; + sha512 = "GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA=="; }; }; "enquirer-2.3.6" = { @@ -25181,6 +26486,15 @@ let sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; + "entities-3.0.1" = { + name = "entities"; + packageName = "entities"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz"; + sha512 = "WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="; + }; + }; "env-editor-0.4.2" = { name = "env-editor"; packageName = "env-editor"; @@ -25208,15 +26522,6 @@ let sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; }; - "env-variable-0.0.6" = { - name = "env-variable"; - packageName = "env-variable"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz"; - sha512 = "bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg=="; - }; - }; "envinfo-7.8.1" = { name = "envinfo"; packageName = "envinfo"; @@ -25298,13 +26603,22 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "error-stack-parser-2.0.6" = { + "error-polyfill-0.1.3" = { + name = "error-polyfill"; + packageName = "error-polyfill"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/error-polyfill/-/error-polyfill-0.1.3.tgz"; + sha512 = "XHJk60ufE+TG/ydwp4lilOog549iiQF2OAPhkk9DdiYWMrltz5yhDz/xnKuenNwP7gy3dsibssO5QpVhkrSzzg=="; + }; + }; + "error-stack-parser-2.0.7" = { name = "error-stack-parser"; packageName = "error-stack-parser"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.6.tgz"; - sha512 = "d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ=="; + url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.7.tgz"; + sha512 = "chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA=="; }; }; "errorhandler-1.5.1" = { @@ -25361,13 +26675,13 @@ let sha1 = "5dae3e650e5be3684b88066513d528d092629862"; }; }; - "es5-ext-0.10.53" = { + "es5-ext-0.10.59" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.53"; + version = "0.10.59"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"; - sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.59.tgz"; + sha512 = "cOgyhW0tIJyQY1Kfw6Kr0viu9ZlUctVchRMZ7R0HiH3dxTSp5zJDLecwxUqPUrGKMsgBI1wd1FL+d9Jxfi4cLw=="; }; }; "es6-error-4.1.1" = { @@ -25442,15 +26756,6 @@ let sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; }; }; - "es6-promisify-6.1.1" = { - name = "es6-promisify"; - packageName = "es6-promisify"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.1.tgz"; - sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; - }; - }; "es6-promisify-7.0.0" = { name = "es6-promisify"; packageName = "es6-promisify"; @@ -25685,6 +26990,15 @@ let sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="; }; }; + "eslint-6.8.0" = { + name = "eslint"; + packageName = "eslint"; + version = "6.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz"; + sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; + }; + }; "eslint-7.32.0" = { name = "eslint"; packageName = "eslint"; @@ -25694,13 +27008,40 @@ let sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; - "eslint-8.3.0" = { + "eslint-8.11.0" = { name = "eslint"; packageName = "eslint"; + version = "8.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-8.11.0.tgz"; + sha512 = "/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA=="; + }; + }; + "eslint-8.12.0" = { + name = "eslint"; + packageName = "eslint"; + version = "8.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz"; + sha512 = "it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q=="; + }; + }; + "eslint-config-prettier-6.15.0" = { + name = "eslint-config-prettier"; + packageName = "eslint-config-prettier"; + version = "6.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz"; + sha512 = "a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw=="; + }; + }; + "eslint-config-prettier-8.3.0" = { + name = "eslint-config-prettier"; + packageName = "eslint-config-prettier"; version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.3.0.tgz"; - sha512 = "aIay56Ph6RxOTC7xyr59Kt3ewX185SaGnAr8eWukoPLeriCrvGjvAubxuvaXOfsxhtwV5g0uBOsyhAom4qJdww=="; + url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz"; + sha512 = "BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew=="; }; }; "eslint-formatter-pretty-4.1.0" = { @@ -25712,13 +27053,31 @@ let sha512 = "IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ=="; }; }; - "eslint-plugin-no-unsanitized-4.0.0" = { + "eslint-loader-2.2.1" = { + name = "eslint-loader"; + packageName = "eslint-loader"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.2.1.tgz"; + sha512 = "RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg=="; + }; + }; + "eslint-plugin-no-unsanitized-4.0.1" = { name = "eslint-plugin-no-unsanitized"; packageName = "eslint-plugin-no-unsanitized"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-4.0.0.tgz"; - sha512 = "Wguc3EZS+7BJ/Pgu8C1/G86eXHUIRz4ZHEhPlwVkS42MbHEyfh8Wm+pDRVAg73EE0TR//SbjkPlHr93yLJT10g=="; + url = "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-4.0.1.tgz"; + sha512 = "y/lAMWnPPC7RYuUdxlEL/XiCL8FehN9h9s3Kjqbp/Kv0i9NZs+IXSC2kS546Fa4Bumwy31HlVS/OdWX0Kxb5Xg=="; + }; + }; + "eslint-plugin-prettier-3.4.1" = { + name = "eslint-plugin-prettier"; + packageName = "eslint-plugin-prettier"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz"; + sha512 = "htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g=="; }; }; "eslint-plugin-vue-6.2.2" = { @@ -25775,13 +27134,13 @@ let sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; }; - "eslint-scope-7.1.0" = { + "eslint-scope-7.1.1" = { name = "eslint-scope"; packageName = "eslint-scope"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz"; - sha512 = "aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg=="; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz"; + sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw=="; }; }; "eslint-utils-1.4.3" = { @@ -25829,22 +27188,13 @@ let sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; }; - "eslint-visitor-keys-3.1.0" = { + "eslint-visitor-keys-3.3.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; - version = "3.1.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz"; - sha512 = "yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA=="; - }; - }; - "eslint-visitor-keys-3.2.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz"; - sha512 = "IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ=="; + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"; + sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; }; }; "esmangle-1.0.1" = { @@ -25910,22 +27260,13 @@ let sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; }; - "espree-9.1.0" = { + "espree-9.3.1" = { name = "espree"; packageName = "espree"; - version = "9.1.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.1.0.tgz"; - sha512 = "ZgYLvCS1wxOczBYGcQT9DDWgicXwJ4dbocr9uYN+/eresBAUuBu+O4WzB21ufQ/JqQT8gyp7hJ3z8SHii32mTQ=="; - }; - }; - "espree-9.3.0" = { - name = "espree"; - packageName = "espree"; - version = "9.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz"; - sha512 = "d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ=="; + url = "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz"; + sha512 = "bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ=="; }; }; "esprima-1.1.1" = { @@ -26171,13 +27512,13 @@ let sha512 = "w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ=="; }; }; - "ethereumjs-util-7.1.3" = { + "ethereumjs-util-7.1.4" = { name = "ethereumjs-util"; packageName = "ethereumjs-util"; - version = "7.1.3"; + version = "7.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.3.tgz"; - sha512 = "y+82tEbyASO0K0X1/SRhbJJoAlfcvq8JbrG4a5cjrOks7HS/36efU/0j2flxCPOUM++HFahk33kr/ZxyC4vNuw=="; + url = "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.4.tgz"; + sha512 = "p6KmuPCX4mZIqsQzXfmSx9Y0l2hqf+VkAiwSisW3UKUFdk8ZkAt+AYaor83z2nSi6CU2zSsXMlD80hAbNEGM0A=="; }; }; "ethjs-unit-0.1.6" = { @@ -26279,15 +27620,6 @@ let sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="; }; }; - "event-to-promise-0.8.0" = { - name = "event-to-promise"; - packageName = "event-to-promise"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/event-to-promise/-/event-to-promise-0.8.0.tgz"; - sha1 = "4b84f11772b6f25f7752fc74d971531ac6f5b626"; - }; - }; "eventemitter2-0.4.14" = { name = "eventemitter2"; packageName = "eventemitter2"; @@ -26342,15 +27674,6 @@ let sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba"; }; }; - "eventemitter3-3.1.0" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz"; - sha512 = "ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA=="; - }; - }; "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -26450,15 +27773,6 @@ let sha1 = "c7c5ad2eef3478d38390c6dd3acfe8af0efc8301"; }; }; - "exec-sh-0.2.2" = { - name = "exec-sh"; - packageName = "exec-sh"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz"; - sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw=="; - }; - }; "exec-sh-0.3.6" = { name = "exec-sh"; packageName = "exec-sh"; @@ -26504,15 +27818,6 @@ let sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"; }; }; - "execa-0.9.0" = { - name = "execa"; - packageName = "execa"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.9.0.tgz"; - sha512 = "BbUMBiX4hqiHZUA5+JujIjNb6TyAlp2D5KLheMjMluwOuzcnylDL4AxZYLLn1n2AGB49eSWwyKvvEQoRpnAtmA=="; - }; - }; "execa-1.0.0" = { name = "execa"; packageName = "execa"; @@ -26549,6 +27854,15 @@ let sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; }; }; + "execa-5.0.0" = { + name = "execa"; + packageName = "execa"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz"; + sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ=="; + }; + }; "execa-5.1.1" = { name = "execa"; packageName = "execa"; @@ -26693,22 +28007,22 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-modules-autolinking-0.4.0" = { + "expo-modules-autolinking-0.5.5" = { name = "expo-modules-autolinking"; packageName = "expo-modules-autolinking"; - version = "0.4.0"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-0.4.0.tgz"; - sha512 = "GRGHbQ4b/aOtEup/oA6YVS7OOBKqU4sNLhoiTkEJWXmYDRERZiRvp8N2krQtn54y5PqucftqlBrMbdCinTouqg=="; + url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-0.5.5.tgz"; + sha512 = "bILEG0Fg+ZhIhdEaShHzsEN1WC0hUmXJ5Kcd4cd+8rVk1Ead9vRZxA/yLx1cNBDCOwMe0GAMrhF7TKT+A1P+YA=="; }; }; - "expo-pwa-0.0.109" = { + "expo-pwa-0.0.114" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.109"; + version = "0.0.114"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.109.tgz"; - sha512 = "88zMIwMYqVYAwgA45fdlbENrZtoETXwfDruhiP5XdAH/SbR7atNEH45ccj/lcU8o9Rzo/cIxkpJnRxn0YJ9xjg=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.114.tgz"; + sha512 = "vJCpKROPULPrTnLTCytZuxBkm23yS9CBXBald2BDeizgKsJV19vOc2+lmTk4fL5hh+TgHQybwtt6UwEy3ORjgg=="; }; }; "express-2.5.11" = { @@ -26765,6 +28079,15 @@ let sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; }; }; + "express-4.17.3" = { + name = "express"; + packageName = "express"; + version = "4.17.3"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz"; + sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; + }; + }; "express-async-handler-1.2.0" = { name = "express-async-handler"; packageName = "express-async-handler"; @@ -26792,6 +28115,15 @@ let sha1 = "3a2ad27f7bebc90fc533d110d7c6d83097bcd057"; }; }; + "express-interceptor-1.2.0" = { + name = "express-interceptor"; + packageName = "express-interceptor"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-interceptor/-/express-interceptor-1.2.0.tgz"; + sha1 = "33460a8e11dce7e5a022caf555d377e45ddb822a"; + }; + }; "express-normalize-query-params-middleware-0.5.1" = { name = "express-normalize-query-params-middleware"; packageName = "express-normalize-query-params-middleware"; @@ -26801,22 +28133,49 @@ let sha1 = "dbe1e8139aecb234fb6adb5c0059c75db9733d2a"; }; }; - "express-openapi-6.0.0" = { + "express-openapi-8.0.0" = { name = "express-openapi"; packageName = "express-openapi"; - version = "6.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-6.0.0.tgz"; - sha512 = "WQGmghzn+loQsIQUEnLZ0HVKCLhIBVcURvrAhyt6mOqsFsG2tBYhaNKX728EOz2aMXRhEQhkQ+RXQsIFpbS6IA=="; + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-8.0.0.tgz"; + sha512 = "MUntG3qQKdU5eRG51WLglaUfIXrVagQHNmStwl44lzu6XKiMj4TBDm/cIbubO49HAMCqNkX5BaiKCOK6pvP5Wg=="; }; }; - "express-openapi-7.0.1" = { + "express-openapi-9.3.0" = { name = "express-openapi"; packageName = "express-openapi"; - version = "7.0.1"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.0.1.tgz"; - sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ=="; + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-9.3.0.tgz"; + sha512 = "92H8nuvO1vVMutapDqQXESOxFnaC4/tZAXSi7kJMD+xWXZwNwmuinCxbfQc7JyUY6Y3+vjFXqJ7xeTCpsUhSiA=="; + }; + }; + "express-prom-bundle-6.3.0" = { + name = "express-prom-bundle"; + packageName = "express-prom-bundle"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-6.3.0.tgz"; + sha512 = "XeA9pzG+07X5JhR4SV0szQnb2pWBaeNMBb1jBox/d70204jPlcLPoNuCpaQs5kOEedoXJtJEbVJ2esivED1WyA=="; + }; + }; + "express-request-id-1.4.1" = { + name = "express-request-id"; + packageName = "express-request-id"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-request-id/-/express-request-id-1.4.1.tgz"; + sha512 = "qpxK6XhDYtdx9FvxwCHkUeZVWtkGbWR87hBAzGECfwYF/QQCPXEwwB2/9NGkOR1tT7/aLs9mma3CT0vjSzuZVw=="; + }; + }; + "express-session-1.17.1" = { + name = "express-session"; + packageName = "express-session"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.17.1.tgz"; + sha512 = "UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q=="; }; }; "express-session-1.17.2" = { @@ -27215,6 +28574,15 @@ let sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; + "fast-equals-3.0.0" = { + name = "fast-equals"; + packageName = "fast-equals"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-equals/-/fast-equals-3.0.0.tgz"; + sha512 = "Af7nSOpf7617idrFg0MJY6x7yVDPoO80aSwtKTC0afT8B/SsmvTpA+2a+uPLmhVF5IHmY5NPuBAA3dJrp55rJA=="; + }; + }; "fast-fifo-1.1.0" = { name = "fast-fifo"; packageName = "fast-fifo"; @@ -27260,13 +28628,13 @@ let sha512 = "4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig=="; }; }; - "fast-json-patch-3.1.0" = { + "fast-json-patch-3.1.1" = { name = "fast-json-patch"; packageName = "fast-json-patch"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.0.tgz"; - sha512 = "IhpytlsVTRndz0hU5t0/MGzS/etxLlfrpG5V5M9mVbuj9TrJLWaMfsox9REM5rkuGX0T+5qjpe8XA1o0gZ42nA=="; + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz"; + sha512 = "vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -27323,13 +28691,13 @@ let sha1 = "a45aff345196006d406ca6cdcd05f69051ef35b8"; }; }; - "fast-redact-3.1.0" = { + "fast-redact-3.1.1" = { name = "fast-redact"; packageName = "fast-redact"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.1.0.tgz"; - sha512 = "dir8LOnvialLxiXDPESMDHGp82CHi6ZEYTVkcvdn5d7psdv9ZkkButXrOeXST4aqreIRR+N7CYlsrwFuorurVg=="; + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.1.1.tgz"; + sha512 = "odVmjC8x8jNeMZ3C+rPMESzXVSEU8tSWSHv9HFxP2mm89G/1WwqhrerJDQm9Zus8X6aoRgQDThKqptdNA6bt+A=="; }; }; "fast-safe-stringify-1.2.3" = { @@ -27386,15 +28754,6 @@ let sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; }; }; - "fastify-warning-0.2.0" = { - name = "fastify-warning"; - packageName = "fastify-warning"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fastify-warning/-/fastify-warning-0.2.0.tgz"; - sha512 = "s1EQguBw/9qtc1p/WTY4eq9WMRIACkj+HTcOIK1in4MV5aFaQC9ZCIt0dJ7pr5bIf4lPpHvAtP2ywpTNgs7hqw=="; - }; - }; "fastintcompression-0.0.4" = { name = "fastintcompression"; packageName = "fastintcompression"; @@ -27449,13 +28808,13 @@ let sha512 = "WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ=="; }; }; - "faunadb-4.4.1" = { + "faunadb-4.5.2" = { name = "faunadb"; packageName = "faunadb"; - version = "4.4.1"; + version = "4.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/faunadb/-/faunadb-4.4.1.tgz"; - sha512 = "1V2ve22T4Q45C3PBB+LD7Fpk4lVajbtxDXDpENsujC+LMe88LqBQ9brl5v5uB3sCTSVAX0fsGtuZ+N5x15vdoQ=="; + url = "https://registry.npmjs.org/faunadb/-/faunadb-4.5.2.tgz"; + sha512 = "XQ2yDoPZc5/IqC4eS4tP5tjewFbAK8UdQYLDGlUiJy5E9F3rpvYCMdjlkRWcaxOMD2yPYr8NSoql10zy1CNoCA=="; }; }; "faye-websocket-0.10.0" = { @@ -27530,6 +28889,15 @@ let sha512 = "MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="; }; }; + "fetch-blob-3.1.5" = { + name = "fetch-blob"; + packageName = "fetch-blob"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.1.5.tgz"; + sha512 = "N64ZpKqoLejlrwkIAnb9iLSA3Vx/kjgzpcDhygcqJ2KKjky8nCgUQ+dzXtbrLaWZGZNmNfQTsiQ0weZ1svglHg=="; + }; + }; "fetch-cookie-0.10.1" = { name = "fetch-cookie"; packageName = "fetch-cookie"; @@ -27593,6 +28961,15 @@ let sha512 = "ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww=="; }; }; + "figlet-1.5.2" = { + name = "figlet"; + packageName = "figlet"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/figlet/-/figlet-1.5.2.tgz"; + sha512 = "WOn21V8AhyE1QqVfPIVxe3tupJacq1xGkPTB4iagT6o+P2cAgEOOwIxMftr4+ZCTI6d551ij9j61DFr0nsP2uQ=="; + }; + }; "figures-1.7.0" = { name = "figures"; packageName = "figures"; @@ -27674,6 +29051,15 @@ let sha512 = "4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw=="; }; }; + "file-loader-4.3.0" = { + name = "file-loader"; + packageName = "file-loader"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz"; + sha512 = "aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA=="; + }; + }; "file-loader-6.0.0" = { name = "file-loader"; packageName = "file-loader"; @@ -27683,6 +29069,15 @@ let sha512 = "/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ=="; }; }; + "file-loader-6.2.0" = { + name = "file-loader"; + packageName = "file-loader"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz"; + sha512 = "qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw=="; + }; + }; "file-or-stdin-1.0.2" = { name = "file-or-stdin"; packageName = "file-or-stdin"; @@ -27998,6 +29393,24 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; + "finalhandler-1.2.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; + sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; + }; + }; + "find-cache-dir-0.1.1" = { + name = "find-cache-dir"; + packageName = "find-cache-dir"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz"; + sha1 = "c8defae57c8a52a8a784f9e31c57c742e993a0b9"; + }; + }; "find-cache-dir-2.1.0" = { name = "find-cache-dir"; packageName = "find-cache-dir"; @@ -28187,13 +29600,13 @@ let sha512 = "LNRvR4hr/S8cXXkIY5pTgVP7L3tq6LlYWcg9nWBuW7o1NMxKZo6oOVa/6GIekMGI0Iw7uC+HWimMe9u/VAeKqw=="; }; }; - "fkill-6.2.0" = { + "fkill-7.2.1" = { name = "fkill"; packageName = "fkill"; - version = "6.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-6.2.0.tgz"; - sha512 = "VoPpKScAzvZ07jtciOY0bJieJwyd/VVCuo4fn3nBLh4iBagzYED7GLQeFBpMpy7HP5edEKTDo8yxaIrYrwb7hg=="; + url = "https://registry.npmjs.org/fkill/-/fkill-7.2.1.tgz"; + sha512 = "eN9cmsIlRdq06wu3m01OOEgQf5Xh/M7REm0jfZ4eL3V3XisjXzfRq3iyqtKS+FhO6wB36FvWRiRGdeSx5KpLAQ=="; }; }; "fkill-8.0.0" = { @@ -28286,13 +29699,13 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; - "flatted-3.2.4" = { + "flatted-3.2.5" = { name = "flatted"; packageName = "flatted"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz"; - sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; }; "flatten-0.0.1" = { @@ -28322,13 +29735,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.169.0" = { + "flow-parser-0.174.1" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.169.0"; + version = "0.174.1"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.169.0.tgz"; - sha512 = "X1DFb6wxXpZLLqM9NX0Wm+4xoN6xAyJn8OwuiHsV0JJvLfD18Z+wbgJ1lM7ykTVINdu8v7Mu0gIzWMvnhKWBkA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.174.1.tgz"; + sha512 = "nDMOvlFR+4doLpB3OJpseHZ7uEr3ENptlF6qMas/kzQmNcLzMwfQeFX0gGJ/+em7UdldB/nGsk55tDTOvjbCuw=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -28475,13 +29888,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.14.7" = { + "follow-redirects-1.14.9" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.7"; + version = "1.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz"; - sha512 = "+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz"; + sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; }; }; "follow-redirects-1.5.10" = { @@ -28592,6 +30005,15 @@ let sha512 = "7YGDo0UlbMy++6G3lzncWISDaT5CVp+yPVAkZ7FDFF0ec+0HKgBOWOhPGKpMF0hjcm3Ps/HbtrETrQLYREZ7YQ=="; }; }; + "fork-ts-checker-webpack-plugin-3.1.1" = { + name = "fork-ts-checker-webpack-plugin"; + packageName = "fork-ts-checker-webpack-plugin"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz"; + sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ=="; + }; + }; "fork-ts-checker-webpack-plugin-4.1.6" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; @@ -28601,13 +30023,22 @@ let sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw=="; }; }; - "fork-ts-checker-webpack-plugin-6.5.0" = { + "fork-ts-checker-webpack-plugin-7.2.1" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "6.5.0"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz"; - sha512 = "cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-7.2.1.tgz"; + sha512 = "uOfQdg/iQ8iokQ64qcbu8iZb114rOmaKLQFu7hU14/eJaKgsP91cQ7ts7v2iiDld6TzDe84Meksha8/MkWiCyw=="; + }; + }; + "fork-ts-checker-webpack-plugin-v5-5.2.1" = { + name = "fork-ts-checker-webpack-plugin-v5"; + packageName = "fork-ts-checker-webpack-plugin-v5"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz"; + sha512 = "SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw=="; }; }; "form-data-1.0.0-rc3" = { @@ -28664,13 +30095,13 @@ let sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; }; }; - "form-data-encoder-1.7.1" = { + "form-data-encoder-1.7.2" = { name = "form-data-encoder"; packageName = "form-data-encoder"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.1.tgz"; - sha512 = "EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg=="; + url = "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.2.tgz"; + sha512 = "qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A=="; }; }; "form-urlencoded-4.5.1" = { @@ -28700,6 +30131,15 @@ let sha512 = "k7lYJyzDOSL6h917favP8j1L0/wNyylzU+x+1w4p5haGVHNlP58dbpdJhiCUsDbWsa9HwEtLp89obQgXl2e0qg=="; }; }; + "formdata-polyfill-4.0.10" = { + name = "formdata-polyfill"; + packageName = "formdata-polyfill"; + version = "4.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz"; + sha512 = "buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g=="; + }; + }; "formidable-1.0.11" = { name = "formidable"; packageName = "formidable"; @@ -28754,22 +30194,22 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.11.8" = { + "fp-ts-2.11.9" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.11.8"; + version = "2.11.9"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.8.tgz"; - sha512 = "WQT6rP6Jt3TxMdQB3IKzvfZKLuldumntgumLhIUhvPrukTHdWNI4JgEHY04Bd0LIOR9IQRpB+7RuxgUU0Vhmcg=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.9.tgz"; + sha512 = "GhYlNKkCOfdjp71ocdtyaQGoqCswEoWDJLRr+2jClnBBq2dnSOtd6QxmJdALq8UhfqCyZZ0f0lxadU4OhwY9nw=="; }; }; - "fraction.js-4.1.2" = { + "fraction.js-4.2.0" = { name = "fraction.js"; packageName = "fraction.js"; - version = "4.1.2"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.2.tgz"; - sha512 = "o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA=="; + url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz"; + sha512 = "MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="; }; }; "fragment-cache-0.2.1" = { @@ -28898,15 +30338,6 @@ let sha1 = "cf25554ca050dc49ae6656b41de42258989dcbce"; }; }; - "fs-exists-sync-0.1.0" = { - name = "fs-exists-sync"; - packageName = "fs-exists-sync"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz"; - sha1 = "982d6893af918e72d08dec9e8673ff2b5a8d6add"; - }; - }; "fs-extra-0.24.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -28943,6 +30374,15 @@ let sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; }; }; + "fs-extra-10.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz"; + sha512 = "NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag=="; + }; + }; "fs-extra-3.0.1" = { name = "fs-extra"; packageName = "fs-extra"; @@ -29069,22 +30509,22 @@ let sha512 = "GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA=="; }; }; - "fs-routes-2.0.0" = { + "fs-routes-8.0.0" = { name = "fs-routes"; packageName = "fs-routes"; - version = "2.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-routes/-/fs-routes-2.0.0.tgz"; - sha512 = "oITW9GoYFZwYWR2aMDdUvr6W9O5mtzSizIVEUdeCQaFD6+BylwPSEP2+ZFWv1UYpE9kiPS3Hb0knh2PmFJcj6A=="; + url = "https://registry.npmjs.org/fs-routes/-/fs-routes-8.0.0.tgz"; + sha512 = "EezW71GPu+VK2ZOnX0Aljaref63+mvhkkz55DqUp5xryV/mJraA2t/XFmBxNMwgRq6tFUOYuQOlr+RQh4nq5kQ=="; }; }; - "fs-routes-7.0.1" = { + "fs-routes-9.0.3" = { name = "fs-routes"; packageName = "fs-routes"; - version = "7.0.1"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fs-routes/-/fs-routes-7.0.1.tgz"; - sha512 = "kSAfx/P8oLSi5+tblecTETcJJ/Q+qL+xzGx4hns/+gHXMkTOZEzG73/2dBDW1FFy5+ZW080XoMaBAN2kCN55aQ=="; + url = "https://registry.npmjs.org/fs-routes/-/fs-routes-9.0.3.tgz"; + sha512 = "Y5tkylY9fQ1jm11FdJoptzqIG3OyzqrOF16W5odNlIdqFqb2355IbNB3jQkE+C268mSShLmIur8ynYCgL/Yg/g=="; }; }; "fs-write-stream-atomic-1.0.10" = { @@ -29231,13 +30671,22 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "fuse.js-6.5.3" = { + "fuse.js-6.4.1" = { name = "fuse.js"; packageName = "fuse.js"; - version = "6.5.3"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.5.3.tgz"; - sha512 = "sA5etGE7yD/pOqivZRBvUBd/NaL2sjAu6QuSaFoe1H2BrJSkH/T/UXAJ8CdXdw7DvY3Hs8CXKYkDWX7RiP5KOg=="; + url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.1.tgz"; + sha512 = "+hAS7KYgLXontDh/vqffs7wIBw0ceb9Sx8ywZQhOsiQGcSO5zInGhttWOUYQYlvV/yYMJOacQ129Xs3mP3+oZQ=="; + }; + }; + "fuzzy-0.1.3" = { + name = "fuzzy"; + packageName = "fuzzy"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz"; + sha1 = "4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"; }; }; "fuzzy-search-3.2.1" = { @@ -29276,22 +30725,22 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-3.5.2" = { + "gatsby-core-utils-3.10.1" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "3.5.2"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.5.2.tgz"; - sha512 = "sY7BD6VlbWwrV892x9/yJPtXYaGC/GLyhabd9j2xP6zsIOW0XBHXZ4jJ+xEPaRn3CJxYgBd8KdCyoc4h1ZEFzg=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.10.1.tgz"; + sha512 = "WqNMm0u1CAZm6Q+UQ4dDHwIAt3l32NeIaPuSXmDX7QcMGR3FUUk8cl2Ym6gx1hfILm1aCexqfaSCLUXtaWKkbQ=="; }; }; - "gatsby-telemetry-3.5.2" = { + "gatsby-telemetry-3.10.1" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "3.5.2"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.5.2.tgz"; - sha512 = "nL33+AxawRqEjuvHAbyyxoDMZ5GXNMEMzCk5WQu7J/lA6od6cUmXpZMcr4AxwnNFJLfmYKlwalN7cuz5nBL6lw=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.10.1.tgz"; + sha512 = "935quI1YsQfzYREuvPLNKBb7IUE2vX9p7WoS7Dc9TbV2xDZPTAzeOfX+HE56ZltkxMi8Zivp7mqe5+n//WL7EQ=="; }; }; "gauge-1.2.7" = { @@ -29321,13 +30770,13 @@ let sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="; }; }; - "gauge-4.0.0" = { + "gauge-4.0.3" = { name = "gauge"; packageName = "gauge"; - version = "4.0.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-4.0.0.tgz"; - sha512 = "F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw=="; + url = "https://registry.npmjs.org/gauge/-/gauge-4.0.3.tgz"; + sha512 = "ICw1DhAwMtb22rYFwEHgJcx1JCwJGv3x6G0OQUq56Nge+H4Q8JEwr8iveS0XFlsUNSI67F5ffMGK25bK4Pmskw=="; }; }; "gaxios-2.3.4" = { @@ -29393,15 +30842,6 @@ let sha1 = "336a98f81510f9ae0af2a494e17468a116a9dc04"; }; }; - "generate-function-1.1.0" = { - name = "generate-function"; - packageName = "generate-function"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-1.1.0.tgz"; - sha1 = "54c21b080192b16d9877779c5bb81666e772365f"; - }; - }; "generate-function-2.3.1" = { name = "generate-function"; packageName = "generate-function"; @@ -29555,6 +30995,15 @@ let sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; }; }; + "get-port-4.2.0" = { + name = "get-port"; + packageName = "get-port"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-port/-/get-port-4.2.0.tgz"; + sha512 = "/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw=="; + }; + }; "get-port-5.1.1" = { name = "get-port"; packageName = "get-port"; @@ -29717,13 +31166,13 @@ let sha512 = "7yetJWqbS9sbn0vIfliPsFgoXMKn/YMF+Wuiog97x+urnSRRRZ7xB+uVkwGKzRgq9CDFfMQnE9ruL5DHv9c6Xg=="; }; }; - "getmac-5.17.0" = { + "getmac-5.20.0" = { name = "getmac"; packageName = "getmac"; - version = "5.17.0"; + version = "5.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-5.17.0.tgz"; - sha512 = "hupD+ZCHVFRaH1wBDPgIil6KWL5p5Z6kG71nAcafwq72QaMxw9bhR2LPBk3jlw3I2F3oELNkx6Fccwiuy5fv0w=="; + url = "https://registry.npmjs.org/getmac/-/getmac-5.20.0.tgz"; + sha512 = "O9T855fb+Hx9dsTJHNv72ZUuA6Y18+BO/0ypPXf6s/tunzXqhc3kbQkNAl+9HVKVlwkWmglHS4LMoJ9YbymKYQ=="; }; }; "getpass-0.1.6" = { @@ -29753,13 +31202,13 @@ let sha1 = "0d76163778093aef7f1c30238f2a9ef3f07a2eb9"; }; }; - "git-config-path-1.0.1" = { + "git-config-path-2.0.0" = { name = "git-config-path"; packageName = "git-config-path"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-config-path/-/git-config-path-1.0.1.tgz"; - sha1 = "6d33f7ed63db0d0e118131503bab3aca47d54664"; + url = "https://registry.npmjs.org/git-config-path/-/git-config-path-2.0.0.tgz"; + sha512 = "qc8h1KIQbJpp+241id3GuAtkdyJ+IK+LIVtkiFTRKRrmddDzs3SI9CvP1QYmWBFvm1I/PWRwj//of8bgAc0ltA=="; }; }; "git-diff-tree-1.1.0" = { @@ -30209,7 +31658,7 @@ let version = "2.0.1"; src = fetchurl { name = "global-2.0.1.tar.gz"; - url = "https://codeload.github.com/component/global/tar.gz/v2.0.1"; + url = "https://codeload.github.com/component/global/tar.gz/refs/tags/v2.0.1"; sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; }; }; @@ -30294,13 +31743,22 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-13.12.0" = { + "globals-12.4.0" = { name = "globals"; packageName = "globals"; - version = "13.12.0"; + version = "12.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz"; - sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; + url = "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"; + sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; + }; + }; + "globals-13.13.0" = { + name = "globals"; + packageName = "globals"; + version = "13.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz"; + sha512 = "EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A=="; }; }; "globals-9.18.0" = { @@ -30366,6 +31824,15 @@ let sha512 = "wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA=="; }; }; + "globby-13.1.1" = { + name = "globby"; + packageName = "globby"; + version = "13.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-13.1.1.tgz"; + sha512 = "XMzoDZbGZ37tufiv7g0N4F/zp3zkwdFtVbV3EHsVl1KQr4RPLfNoT068/97RPshz2J5xYNEjLKKBKaGHifBd3Q=="; + }; + }; "globby-4.1.0" = { name = "globby"; packageName = "globby"; @@ -30456,13 +31923,13 @@ let sha512 = "VZ0VPPIuiSO5/ZZr/UqFP3X3Yv04/TZxIe+SO+Ceqy43ulthPZcnrWsB8hYW2gqZzOPJeVJaYaX9FmL70kYITw=="; }; }; - "goldengate-11.0.0" = { + "goldengate-11.1.0" = { name = "goldengate"; packageName = "goldengate"; - version = "11.0.0"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-11.0.0.tgz"; - sha512 = "2hGoEY0KosJOgllqjzx1M7jQGC9a9YmDy4qznidhn4pUHPFfIYDp+Wdy58TnHH8mcGuaHd+uJdsZVaWMkA7S/w=="; + url = "https://registry.npmjs.org/goldengate/-/goldengate-11.1.0.tgz"; + sha512 = "nwrFxarqF2kxQXEzgcfvfqh64eokhcfyPl5i/RXGueRwUUSV7XW64A4BehcPcjKMKMxPM9RZarBTwa4vdnSZMA=="; }; }; "gonzales-pe-4.3.0" = { @@ -30474,13 +31941,13 @@ let sha512 = "otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ=="; }; }; - "google-auth-library-7.11.0" = { + "google-auth-library-7.14.1" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.11.0"; + version = "7.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.11.0.tgz"; - sha512 = "3S5jn2quRumvh9F/Ubf7GFrIq71HZ5a6vqosgdIu105kkk0WtSqc2jGCRqtWWOLRS8SX3AHACMOEDxhyWAQIcg=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.14.1.tgz"; + sha512 = "5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -30492,13 +31959,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.28.1" = { + "google-gax-2.29.6" = { name = "google-gax"; packageName = "google-gax"; - version = "2.28.1"; + version = "2.29.6"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.28.1.tgz"; - sha512 = "2Xjd3FrjlVd6Cmw2B2Aicpc/q92SwTpIOvxPUlnRg9w+Do8nu7UR+eQrgoKlo2FIUcUuDTvppvcx8toND0pK9g=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.29.6.tgz"; + sha512 = "NsuGBpxOzvBS4rbaeicIpgZ1caU3vNcG04kJWb51rlcYJvzXwHgPof9w4UplR2WVqlFzLkDtEStQOKhS/QcLmA=="; }; }; "google-p12-pem-3.1.3" = { @@ -30510,6 +31977,24 @@ let sha512 = "MC0jISvzymxePDVembypNefkAQp+DRP7dBE+zNUPaIjEspIlYg0++OrsNr248V9tPbz6iqtZ7rX1hxWA5B8qBQ=="; }; }; + "googleapis-76.0.0" = { + name = "googleapis"; + packageName = "googleapis"; + version = "76.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/googleapis/-/googleapis-76.0.0.tgz"; + sha512 = "l/TFSW7IRFcb7wF641BlmuP8Ox1ncuzJk5Fcs2947otlGBm5ktDxFhPkmrcNDaG+LWPQsuDwP1ojL0xV39cpmw=="; + }; + }; + "googleapis-common-5.1.0" = { + name = "googleapis-common"; + packageName = "googleapis-common"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/googleapis-common/-/googleapis-common-5.1.0.tgz"; + sha512 = "RXrif+Gzhq1QAzfjxulbGvAY3FPj8zq/CYcvgjzDbaBNCD6bUl+86I7mUs4DKWHGruuK26ijjR/eDpWIDgNROA=="; + }; + }; "goosig-0.10.0" = { name = "goosig"; packageName = "goosig"; @@ -30672,13 +32157,22 @@ let sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; }; }; - "grammy-1.6.2" = { + "grammy-1.7.0" = { name = "grammy"; packageName = "grammy"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/grammy/-/grammy-1.6.2.tgz"; - sha512 = "STsZMwpde6dAoJnj6ejaKC7PvfTJz2onv6NbPEFsz+wG3l6ZVOrar2rT59/Qrr+xqrWqvjFhTU5mSCyMMvBowg=="; + url = "https://registry.npmjs.org/grammy/-/grammy-1.7.0.tgz"; + sha512 = "Xs4vRzCkSO+8CrFP8BXXOo4BGfBGWTPoDcbj8V3kz/c01XLNXI738HWv6/qjQ+IuPLnd/Qegjy7MBogbymogUg=="; + }; + }; + "grant-4.7.0" = { + name = "grant"; + packageName = "grant"; + version = "4.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/grant/-/grant-4.7.0.tgz"; + sha512 = "QGPjCYDrBnb/OIiTRxbK3TnNOE6Ycgfc/GcgPzI4vyNIr+b7yisEexYp7VM74zj6bxr+mDTzfGONRLzzsVPJIA=="; }; }; "grapheme-breaker-0.3.2" = { @@ -30708,22 +32202,22 @@ let sha512 = "jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A=="; }; }; - "graphology-0.20.0" = { + "graphology-0.24.1" = { name = "graphology"; packageName = "graphology"; - version = "0.20.0"; + version = "0.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphology/-/graphology-0.20.0.tgz"; - sha512 = "h5mJWgZXpuZQzBAMWhVIOluGNIYUP043eh7BHcecRWhSkD4eiZAh+uM4XX2rGL1vig9XQ3JVYl9gmK+ajy+JPA=="; + url = "https://registry.npmjs.org/graphology/-/graphology-0.24.1.tgz"; + sha512 = "6lNz1PNTAe9Q6ioHKrXu0Lp047sgvOoHa4qmP/8mnJWCGv2iIZPQkuHPUb2/OWDWCqHpw2hKgJLJ55X/66xmHg=="; }; }; - "graphology-types-0.19.5" = { + "graphology-types-0.21.2" = { name = "graphology-types"; packageName = "graphology-types"; - version = "0.19.5"; + version = "0.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphology-types/-/graphology-types-0.19.5.tgz"; - sha512 = "zXJEDILlJ2JI+oUVjHkXZIRRZfWuwBEhOJagOARnt4eWuErBJZUJmiEOJjLDA0s0DQNFxIHD4+NRwsU4B0VxWw=="; + url = "https://registry.npmjs.org/graphology-types/-/graphology-types-0.21.2.tgz"; + sha512 = "KNdgwG0dbVjhJqRUw0OivJ5pkUHunbk4vDatwdfITfNvPugX0xR327ZKsaOcr3snbiBJfyGu7lCrXeYp4KF8YA=="; }; }; "graphql-0.11.7" = { @@ -30771,6 +32265,15 @@ let sha512 = "EB3zgGchcabbsU9cFe1j+yxdzKQKAbGUWRb13DsrsMN1yyfmmIq+2+L5MqVWcDCE4V89R5AyUOi7sMOGxdsYtA=="; }; }; + "graphql-15.8.0" = { + name = "graphql"; + packageName = "graphql"; + version = "15.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql/-/graphql-15.8.0.tgz"; + sha512 = "5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw=="; + }; + }; "graphql-config-3.0.3" = { name = "graphql-config"; packageName = "graphql-config"; @@ -30789,6 +32292,15 @@ let sha512 = "Myqay6pmdcmX3KqoH+bMbeKZ1cTODpHS2CxF1ZzNnfTE+YUpGTcp01bOw6LpzamRb0T/WTYtGFbZeXGo9Hab2Q=="; }; }; + "graphql-executor-0.0.22" = { + name = "graphql-executor"; + packageName = "graphql-executor"; + version = "0.0.22"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql-executor/-/graphql-executor-0.0.22.tgz"; + sha512 = "WbKSnSHFn6REKKH4T6UAwDM3mLUnYMQlQLNG0Fw+Lkb3ilCnL3m5lkJ7411LAI9sF7BvPbthovVZhsEUh9Xfag=="; + }; + }; "graphql-extensions-0.15.0" = { name = "graphql-extensions"; packageName = "graphql-extensions"; @@ -30843,13 +32355,13 @@ let sha512 = "Wci5MbrQj+6d7rfvbORrA9uDlfMysBWYaG49ST5TKylNaXYFf3ixFOa74iM1KtM9eidosUbI3E1JlWi0JaidJA=="; }; }; - "graphql-sse-1.0.6" = { + "graphql-sse-1.1.0" = { name = "graphql-sse"; packageName = "graphql-sse"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-sse/-/graphql-sse-1.0.6.tgz"; - sha512 = "y2mVBN2KwNrzxX2KBncQ6kzc6JWvecxuBernrl0j65hsr6MAS3+Yn8PTFSOgRmtolxugepxveyZVQEuaNEbw3w=="; + url = "https://registry.npmjs.org/graphql-sse/-/graphql-sse-1.1.0.tgz"; + sha512 = "xE8AGPJa5X+g7iFmRQw/8H+7lXIDJvSkW6lou/XSSq17opPQl+dbKOMiqraHMx52VrDgS061ZVx90OSuqS6ykA=="; }; }; "graphql-subscriptions-1.2.1" = { @@ -30906,22 +32418,22 @@ let sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; - "graphql-ws-5.5.5" = { + "graphql-ws-5.6.4" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "5.5.5"; + version = "5.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.5.5.tgz"; - sha512 = "hvyIS71vs4Tu/yUYHPvGXsTgo0t3arU820+lT5VjZS2go0ewp2LqyCgxEN56CzOG7Iys52eRhHBiD1gGRdiQtw=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.6.4.tgz"; + sha512 = "5r8tAzznI1zeh7k12+3z07KkgXPckQbnC9h4kJ2TBDWG2wb26TJTbVHQOiAncDBgPbtXtc1A2BlttiRuPH2t/w=="; }; }; - "gray-matter-2.1.1" = { + "gray-matter-4.0.3" = { name = "gray-matter"; packageName = "gray-matter"; - version = "2.1.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/gray-matter/-/gray-matter-2.1.1.tgz"; - sha1 = "3042d9adec2a1ded6a7707a9ed2380f8a17a430e"; + url = "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz"; + sha512 = "5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q=="; }; }; "grid-index-1.1.0" = { @@ -30987,13 +32499,13 @@ let sha512 = "GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA=="; }; }; - "gtoken-5.3.1" = { + "gtoken-5.3.2" = { name = "gtoken"; packageName = "gtoken"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/gtoken/-/gtoken-5.3.1.tgz"; - sha512 = "yqOREjzLHcbzz1UrQoxhBtpk8KjrVhuqPE7od1K2uhyxG2BHjKZetlbLw/SPZak/QqTIQW+addS+EcjqQsZbwQ=="; + url = "https://registry.npmjs.org/gtoken/-/gtoken-5.3.2.tgz"; + sha512 = "gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ=="; }; }; "guard-timeout-2.0.0" = { @@ -31023,15 +32535,6 @@ let sha512 = "dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA=="; }; }; - "gulp-clean-css-4.3.0" = { - name = "gulp-clean-css"; - packageName = "gulp-clean-css"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz"; - sha512 = "mGyeT3qqFXTy61j0zOIciS4MkYziF2U594t2Vs9rUnpkEHqfu6aDITMp8xOvZcvdX61Uz3y1mVERRYmjzQF5fg=="; - }; - }; "gulp-cli-2.3.0" = { name = "gulp-cli"; packageName = "gulp-cli"; @@ -31041,24 +32544,6 @@ let sha512 = "zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A=="; }; }; - "gulp-concat-2.6.1" = { - name = "gulp-concat"; - packageName = "gulp-concat"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz"; - sha1 = "633d16c95d88504628ad02665663cee5a4793353"; - }; - }; - "gulp-dart-sass-1.0.2" = { - name = "gulp-dart-sass"; - packageName = "gulp-dart-sass"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-dart-sass/-/gulp-dart-sass-1.0.2.tgz"; - sha512 = "8fLttA824mbuc0jRVlGs00zWYZXBckat6INawx5kp66Eqsz5srNWTA51t0mbfB4C8a/a/GZ9muYLwXGklgAHlw=="; - }; - }; "gulp-eslint-3.0.1" = { name = "gulp-eslint"; packageName = "gulp-eslint"; @@ -31068,6 +32553,15 @@ let sha1 = "04e57e3e18c6974267c12cf6855dc717d4a313bd"; }; }; + "gulp-eslint-6.0.0" = { + name = "gulp-eslint"; + packageName = "gulp-eslint"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-6.0.0.tgz"; + sha512 = "dCVPSh1sA+UVhn7JSQt7KEb4An2sQNbOdB3PA8UCfxsoPlAKjJHxYHGXdXC7eb+V1FAnilSFFqslPrq037l1ig=="; + }; + }; "gulp-plumber-1.2.1" = { name = "gulp-plumber"; packageName = "gulp-plumber"; @@ -31077,22 +32571,13 @@ let sha512 = "mctAi9msEAG7XzW5ytDVZ9PxWMzzi1pS2rBH7lA095DhMa6KEXjm+St0GOCc567pJKJ/oCvosVAZEpAey0q2eQ=="; }; }; - "gulp-sourcemaps-2.6.5" = { + "gulp-sourcemaps-3.0.0" = { name = "gulp-sourcemaps"; packageName = "gulp-sourcemaps"; - version = "2.6.5"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz"; - sha512 = "SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg=="; - }; - }; - "gulp-tslint-8.1.4" = { - name = "gulp-tslint"; - packageName = "gulp-tslint"; - version = "8.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-8.1.4.tgz"; - sha512 = "wBoZIEMJRz9urHwolsvQpngA9l931p6g/Liwz1b/KrsVP6jEBFZv/o0NS1TFCQZi/l8mXxz8+v3twhf4HOXxPQ=="; + url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz"; + sha512 = "RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ=="; }; }; "gulp-typescript-5.0.1" = { @@ -31347,24 +32832,6 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-generators-1.0.1" = { - name = "has-generators"; - packageName = "has-generators"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-generators/-/has-generators-1.0.1.tgz"; - sha1 = "a6a2e55486011940482e13e2c93791c449acf449"; - }; - }; - "has-glob-1.0.0" = { - name = "has-glob"; - packageName = "has-glob"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-glob/-/has-glob-1.0.0.tgz"; - sha1 = "9aaa9eedbffb1ba3990a7b0010fb678ee0081207"; - }; - }; "has-gulplog-0.1.0" = { name = "has-gulplog"; packageName = "has-gulplog"; @@ -31401,13 +32868,13 @@ let sha512 = "3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="; }; }; - "has-symbols-1.0.2" = { + "has-symbols-1.0.3" = { name = "has-symbols"; packageName = "has-symbols"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; }; "has-to-string-tag-x-1.4.1" = { @@ -31500,6 +32967,15 @@ let sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; }; }; + "hash-sum-1.0.2" = { + name = "hash-sum"; + packageName = "hash-sum"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"; + sha1 = "33b40777754c6432573c120cc3808bbd10d47f04"; + }; + }; "hash-sum-2.0.0" = { name = "hash-sum"; packageName = "hash-sum"; @@ -31833,6 +33309,15 @@ let sha512 = "n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA=="; }; }; + "helmet-4.6.0" = { + name = "helmet"; + packageName = "helmet"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/helmet/-/helmet-4.6.0.tgz"; + sha512 = "HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg=="; + }; + }; "help-me-3.0.0" = { name = "help-me"; packageName = "help-me"; @@ -31896,13 +33381,22 @@ let sha512 = "oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg=="; }; }; - "highlight.js-11.4.0" = { + "highlight.js-10.7.3" = { name = "highlight.js"; packageName = "highlight.js"; - version = "11.4.0"; + version = "10.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-11.4.0.tgz"; - sha512 = "nawlpCBCSASs7EdvZOYOYVkJpGmAOKMYZgZtUqSRqodZE0GRVcFKwo1RcpeOemqh9hyttTdd5wDBwHkuSyUfnA=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"; + sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; + }; + }; + "highlight.js-11.5.0" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "11.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-11.5.0.tgz"; + sha512 = "SM6WDj5/C+VfIY8pZ6yW6Xa0Fm1tniYVYWYW1Q/DcMnISZFrC3aQAZZZFAAZtybKNrGId3p/DNbFTtcTXXgYBw=="; }; }; "highlight.js-8.2.0" = { @@ -31950,13 +33444,13 @@ let sha1 = "6f36e770769275113a57ae1a6007001af771cff6"; }; }; - "hls-b24.js-0.12.3" = { - name = "hls-b24.js"; - packageName = "hls-b24.js"; - version = "0.12.3"; + "hls.js-1.1.2" = { + name = "hls.js"; + packageName = "hls.js"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/hls-b24.js/-/hls-b24.js-0.12.3.tgz"; - sha512 = "C8nwzS33zKvR7grYIoHvp8wPxBvk9sEJ6dsh3Bx+T/4jNNhDksqLS73NIWqHvInjRiOsrXgEY4+h/NjNbzzh0g=="; + url = "https://registry.npmjs.org/hls.js/-/hls.js-1.1.2.tgz"; + sha512 = "ujditC4vvBmZd00RRNfNPLgFVlqEeUX4sAFv5lGhBHuql8iAZodOdlZTD3em/1zo7vyjQp12up/lCVqQk8dvxA=="; }; }; "hmac-blake2b-2.0.0" = { @@ -32076,6 +33570,15 @@ let sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; }; }; + "hosted-git-info-5.0.0" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-5.0.0.tgz"; + sha512 = "rRnjWu0Bxj+nIfUOkz0695C0H6tRrN5iYIzYejb0tDEefe2AekHu/U5Kn9pEie5vsJqpNQU02az7TGSH3qpz4Q=="; + }; + }; "hot-formula-parser-4.0.0" = { name = "hot-formula-parser"; packageName = "hot-formula-parser"; @@ -32193,13 +33696,13 @@ let sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA=="; }; }; - "html-entities-2.3.2" = { + "html-entities-2.3.3" = { name = "html-entities"; packageName = "html-entities"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz"; - sha512 = "c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ=="; + url = "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz"; + sha512 = "DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA=="; }; }; "html-loader-1.1.0" = { @@ -32238,15 +33741,6 @@ let sha1 = "c78de65b5663aa597989dd2b7ab49200d7e4db98"; }; }; - "html-tags-2.0.0" = { - name = "html-tags"; - packageName = "html-tags"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz"; - sha1 = "10b30a386085f43cede353cc8fa7cb0deeea668b"; - }; - }; "html-tags-3.1.0" = { name = "html-tags"; packageName = "html-tags"; @@ -32256,13 +33750,13 @@ let sha512 = "1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg=="; }; }; - "html-to-text-6.0.0" = { + "html-to-text-8.1.0" = { name = "html-to-text"; packageName = "html-to-text"; - version = "6.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/html-to-text/-/html-to-text-6.0.0.tgz"; - sha512 = "r0KNC5aqCAItsjlgtirW6RW25c92Ee3ybQj8z//4Sl4suE3HIPqM4deGpYCUJULLjtVPEP1+Ma+1ZeX1iMsCiA=="; + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.1.0.tgz"; + sha512 = "Z9iYAqYK2c18GswSbnxJSeMs7lyJgwR2oIkDOyOHGBbYsPsG4HvT379jj3Lcbfko8A5ceyyMHAfkmp/BiXA9/Q=="; }; }; "html-void-elements-1.0.5" = { @@ -32319,6 +33813,15 @@ let sha512 = "jWTtP3dCd7R8x/tt9DK3pvpcQd7HDMcRPUqPxr/i9989q2k5RHIhmlRDFeyQ/LSd8IKrteG8Ce5g0Ig4eGIipg=="; }; }; + "htmlnano-2.0.0" = { + name = "htmlnano"; + packageName = "htmlnano"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlnano/-/htmlnano-2.0.0.tgz"; + sha512 = "thKQfhcp2xgtsWNE27A2bliEeqVL5xjAgGn0wajyttvFFsvFWWah1ntV9aEX61gz0T6MBQ5xK/1lXuEumhJTcg=="; + }; + }; "htmlparser2-3.10.1" = { name = "htmlparser2"; packageName = "htmlparser2"; @@ -32364,6 +33867,15 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; + "htmlparser2-7.2.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz"; + sha512 = "H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog=="; + }; + }; "http-assert-1.5.0" = { name = "http-assert"; packageName = "http-assert"; @@ -32463,6 +33975,15 @@ let sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; }; + "http-errors-2.0.0" = { + name = "http-errors"; + packageName = "http-errors"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; + sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; + }; + }; "http-headers-3.0.2" = { name = "http-headers"; packageName = "http-headers"; @@ -32490,13 +34011,13 @@ let sha1 = "3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"; }; }; - "http-parser-js-0.5.5" = { + "http-parser-js-0.5.6" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz"; - sha512 = "x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA=="; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz"; + sha512 = "vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA=="; }; }; "http-proxy-1.18.1" = { @@ -32544,13 +34065,22 @@ let sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; - "http-proxy-middleware-2.0.1" = { + "http-proxy-middleware-1.3.1" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; - version = "2.0.1"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz"; - sha512 = "cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg=="; + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz"; + sha512 = "13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg=="; + }; + }; + "http-proxy-middleware-2.0.4" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz"; + sha512 = "m/4FxX17SUvz4lJ5WPXOHDUuCwIqXLfLHs1s0uZ3oYjhoXlx9csYxaOa0ElDEJ+h8Q4iJ1s+lTMbiCa4EXIJqg=="; }; }; "http-signature-0.11.0" = { @@ -32949,13 +34479,13 @@ let sha512 = "bESly7s6X7cLMWCn4dsAVE/ttNbbB13o6jku2B7fV2wIV/g7NVC/yF7S3NiknGlftKn/uLU3fhMmbOfdBvQ5IA=="; }; }; - "hypertrie-5.1.2" = { + "hypertrie-5.1.3" = { name = "hypertrie"; packageName = "hypertrie"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/hypertrie/-/hypertrie-5.1.2.tgz"; - sha512 = "kdzigFUWrCX5NTFvi28q5o3P7faP3QliAQpMfKRSrP5jtitqPfhTgXwstcxS+Vj7mP93R+unZlPYiwu6N9whzA=="; + url = "https://registry.npmjs.org/hypertrie/-/hypertrie-5.1.3.tgz"; + sha512 = "UllKwlFn6Vh268Y0LCD5isvDeCeaaNm9mJC4OFCcb5imv6nyBf/aHirJwUTOm9u01v6GZCXmCI9kKZnpNkm6nA=="; }; }; "i-0.3.7" = { @@ -32967,13 +34497,13 @@ let sha512 = "FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q=="; }; }; - "i18next-21.6.6" = { + "i18next-21.6.11" = { name = "i18next"; packageName = "i18next"; - version = "21.6.6"; + version = "21.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/i18next/-/i18next-21.6.6.tgz"; - sha512 = "K1Pw8K+nHVco56PO6UrqNq4K/ZVbb2eqBQwPqmzYDm4tGQYXBjdz8jrnvuNvV5STaE8oGpWKQMxHOvh2zhVE7Q=="; + url = "https://registry.npmjs.org/i18next/-/i18next-21.6.11.tgz"; + sha512 = "tJ2+o0lVO+fhi8bPkCpBAeY1SgkqmQm5NzgPWCQssBrywJw98/o+Kombhty5nxQOpHtvMmsxcOopczUiH6bJxQ=="; }; }; "iconv-lite-0.4.19" = { @@ -33102,15 +34632,6 @@ let sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; }; - "ignore-5.1.9" = { - name = "ignore"; - packageName = "ignore"; - version = "5.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz"; - sha512 = "2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ=="; - }; - }; "ignore-5.2.0" = { name = "ignore"; packageName = "ignore"; @@ -33327,6 +34848,15 @@ let sha512 = "CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ=="; }; }; + "import-from-4.0.0" = { + name = "import-from"; + packageName = "import-from"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-from/-/import-from-4.0.0.tgz"; + sha512 = "P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ=="; + }; + }; "import-global-0.1.0" = { name = "import-global"; packageName = "import-global"; @@ -33363,15 +34893,6 @@ let sha512 = "rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw=="; }; }; - "import-local-0.1.1" = { - name = "import-local"; - packageName = "import-local"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/import-local/-/import-local-0.1.1.tgz"; - sha1 = "b1179572aacdc11c6a91009fb430dbcab5f668a8"; - }; - }; "import-local-2.0.0" = { name = "import-local"; packageName = "import-local"; @@ -33507,13 +35028,22 @@ let sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216"; }; }; - "inflection-1.13.1" = { + "inflation-2.0.0" = { + name = "inflation"; + packageName = "inflation"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz"; + sha1 = "8b417e47c28f925a45133d914ca1fd389107f30f"; + }; + }; + "inflection-1.13.2" = { name = "inflection"; packageName = "inflection"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/inflection/-/inflection-1.13.1.tgz"; - sha512 = "dldYtl2WlN0QDkIDtg8+xFwOS2Tbmp12t1cHa5/YClU6ZQjTFm7B66UcVbh9NQB+HvT5BAd2t5+yKsBkw5pcqA=="; + url = "https://registry.npmjs.org/inflection/-/inflection-1.13.2.tgz"; + sha512 = "cmZlljCRTBFouT8UzMzrGcVEvkv6D/wBdcdKG7J1QH5cXjtU75Dm+P27v9EKu/Y43UYyCJd1WC4zLebRrC8NBw=="; }; }; "inflight-1.0.6" = { @@ -33633,13 +35163,13 @@ let sha512 = "uJ4nbH00MM9fjTJ5xdw0zzvtXMkeGb0WV6dzSWvFv2/+ks6FIhpkt+Ge/eLdh0Ah6Vjw5pLMyNfoHQpRDRVFbQ=="; }; }; - "ink-text-input-4.0.2" = { + "ink-text-input-4.0.3" = { name = "ink-text-input"; packageName = "ink-text-input"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.2.tgz"; - sha512 = "euuugcNExOx5E+qNM1c+pDF7V8yw/xzCRWEfFk1KjQT9CYtaVAYre13YbMFsYPkGD26dvX6XAffUgkwXme/p5Q=="; + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.3.tgz"; + sha512 = "eQD01ik9ltmNoHmkeQ2t8LszYkv2XwuPSUz3ie/85qer6Ll/j0QSlSaLNl6ENHZakBHdCBVZY04iOXcLLXA0PQ=="; }; }; "inline-process-browser-1.0.0" = { @@ -33705,15 +35235,6 @@ let sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; }; - "inquirer-3.0.6" = { - name = "inquirer"; - packageName = "inquirer"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz"; - sha1 = "e04aaa9d05b7a3cb9b0f407d04375f0447190347"; - }; - }; "inquirer-3.3.0" = { name = "inquirer"; packageName = "inquirer"; @@ -33768,6 +35289,24 @@ let sha512 = "0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ=="; }; }; + "inquirer-8.2.1" = { + name = "inquirer"; + packageName = "inquirer"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-8.2.1.tgz"; + sha512 = "pxhBaw9cyTFMjwKtkjePWDhvwzvrNGAw7En4hottzlPvz80GZaMZthdDU35aA6/f5FRZf3uhE057q8w1DE3V2g=="; + }; + }; + "inquirer-8.2.2" = { + name = "inquirer"; + packageName = "inquirer"; + version = "8.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-8.2.2.tgz"; + sha512 = "pG7I/si6K/0X7p1qU+rfWnpTE1UIkTONN1wxtzh0d+dHXtT/JG6qBgLxoyHVsQa8cFABxAPh0pD6uUUHiAoaow=="; + }; + }; "inquirer-autocomplete-prompt-1.4.0" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; @@ -33777,6 +35316,24 @@ let sha512 = "qHgHyJmbULt4hI+kCmwX92MnSxDs/Yhdt4wPA30qnoa01OF6uTXV8yvH4hKXgdaTNmkZ9D01MHjqKYEuJN+ONw=="; }; }; + "inquirer-autocomplete-prompt-2.0.0" = { + name = "inquirer-autocomplete-prompt"; + packageName = "inquirer-autocomplete-prompt"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-2.0.0.tgz"; + sha512 = "c2LljLP3ewVJe4AUZzKdA6oWjqhpy5pfsisHAjh7mP3WUQ/O02x5OLMMqcLOYuRHx6i2hlVSIhUv0xYGyFxFYA=="; + }; + }; + "inquirer-autocomplete-prompt-ipt-2.0.0" = { + name = "inquirer-autocomplete-prompt-ipt"; + packageName = "inquirer-autocomplete-prompt-ipt"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer-autocomplete-prompt-ipt/-/inquirer-autocomplete-prompt-ipt-2.0.0.tgz"; + sha512 = "2qkl1lWeXbFN/O3+xdqJUdMfnNirvWKqgsgmhOjpOiVCcnJf+XYSEjFfdTgk+MDTtVt5AZiWR9Ji+f4YsWBdUw=="; + }; + }; "inquirer-autosubmit-prompt-0.2.0" = { name = "inquirer-autosubmit-prompt"; packageName = "inquirer-autosubmit-prompt"; @@ -33948,15 +35505,6 @@ let sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; }; }; - "internmap-1.0.1" = { - name = "internmap"; - packageName = "internmap"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz"; - sha512 = "lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw=="; - }; - }; "internmap-2.0.3" = { name = "internmap"; packageName = "internmap"; @@ -34011,15 +35559,6 @@ let sha512 = "Id0Fij0HsB/vKWGeBe9PxeY45ttRiBmhFyyt/geBdDHBYNctMRTE3dC1U3ujzz3lap+hVXlEcVaB56kZP/eEUg=="; }; }; - "into-stream-2.0.1" = { - name = "into-stream"; - packageName = "into-stream"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/into-stream/-/into-stream-2.0.1.tgz"; - sha1 = "db9b003694453eae091d8a5c84cc11507b781d31"; - }; - }; "into-stream-3.1.0" = { name = "into-stream"; packageName = "into-stream"; @@ -34056,6 +35595,15 @@ let sha512 = "j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ=="; }; }; + "inversify-6.0.1" = { + name = "inversify"; + packageName = "inversify"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inversify/-/inversify-6.0.1.tgz"; + sha512 = "B3ex30927698TJENHR++8FfEaJGqoWOgI6ZY5Ht/nLUsFCwHn6akbwtnUAPCgUepAnTpe2qHxhDNjoKLyz6rgQ=="; + }; + }; "invert-kv-1.0.0" = { name = "invert-kv"; packageName = "invert-kv"; @@ -34110,6 +35658,15 @@ let sha512 = "yCAFA3CtbRIiLOdybrZhV1UQ4Rjy20dXBL/5PzlqaZjDbz+RFWtuk3BWsUF12WJo1ikSeVhFXjp6hGAGIG690g=="; }; }; + "invoices-2.0.4" = { + name = "invoices"; + packageName = "invoices"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/invoices/-/invoices-2.0.4.tgz"; + sha512 = "+Np4KWjNSlYm7Qp12zkRN5eu9tkA7FAFIP60bmpbMbwQbgz5gV9go3bkY8CpGj+Z1zifw5N8U+pH+wko/XSjpw=="; + }; + }; "iota-array-1.0.0" = { name = "iota-array"; packageName = "iota-array"; @@ -34137,6 +35694,15 @@ let sha512 = "u9YYtb1p2fWSbzpKmZ/b3QXWA+diRYPxc2c4y5lFB/MMk5WZ7wNZv8S3CFcIGVJ5XtlaCAl/FQy/D3eQ2XtdOA=="; }; }; + "ip-num-1.3.4" = { + name = "ip-num"; + packageName = "ip-num"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-num/-/ip-num-1.3.4.tgz"; + sha512 = "ZlO1YqjR87dsMFTxUJGj1iZR+UV+0QHWeOAMZfTBpGocBsKGc7fJdlFoa7F5xpK/guKW7dkfT6UAVDwvWjLK1Q=="; + }; + }; "ip-regex-2.1.0" = { name = "ip-regex"; packageName = "ip-regex"; @@ -34983,6 +36549,15 @@ let sha1 = "307a855b3cf1a938b44ea70d2c61106053714f34"; }; }; + "is-json-2.0.1" = { + name = "is-json"; + packageName = "is-json"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-json/-/is-json-2.0.1.tgz"; + sha1 = "6be166d144828a131d686891b983df62c39491ff"; + }; + }; "is-lambda-1.0.1" = { name = "is-lambda"; packageName = "is-lambda"; @@ -35019,13 +36594,13 @@ let sha1 = "3258fb69f78c14d5b815d664336b4cffb6441591"; }; }; - "is-my-ip-valid-1.0.0" = { + "is-my-ip-valid-1.0.1" = { name = "is-my-ip-valid"; packageName = "is-my-ip-valid"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; - sha512 = "gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ=="; + url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.1.tgz"; + sha512 = "jxc8cBcOWbNK2i2aTkCZP6i7wkHF1bqKFrwEHuN5Jtg5BSaZHUZQ/JTOJwoV41YvHnOaRyWWh72T/KvfNz9DJg=="; }; }; "is-my-json-valid-2.20.6" = { @@ -35037,6 +36612,15 @@ let sha512 = "1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw=="; }; }; + "is-nan-1.3.2" = { + name = "is-nan"; + packageName = "is-nan"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz"; + sha512 = "E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w=="; + }; + }; "is-natural-number-4.0.1" = { name = "is-natural-number"; packageName = "is-natural-number"; @@ -35325,6 +36909,15 @@ let sha512 = "SqU55C5gkitgOhl2ccd2v23MbkbcOFa5e4aPo8h8VGqOifh7iDwG44bQBWGW/lZulTjl9AWIKP0NiUWpa+TtWA=="; }; }; + "is-port-reachable-3.1.0" = { + name = "is-port-reachable"; + packageName = "is-port-reachable"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-port-reachable/-/is-port-reachable-3.1.0.tgz"; + sha512 = "vjc0SSRNZ32s9SbZBzGaiP6YVB+xglLShhgZD/FHMZUXBvQWaV9CtzgeVhjccFJrI6RAMV+LX7NYxueW/A8W5A=="; + }; + }; "is-posix-bracket-0.1.1" = { name = "is-posix-bracket"; packageName = "is-posix-bracket"; @@ -35388,6 +36981,15 @@ let sha512 = "eCTBKm9K6nO3H1S3BrJBAqZJIVXKNdwDuGl6KHf1bnf/bn02BvEe+l+MypjsxbqZ7mt5oMhu+bS/mm7G2FRW3A=="; }; }; + "is-reachable-5.1.1" = { + name = "is-reachable"; + packageName = "is-reachable"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-reachable/-/is-reachable-5.1.1.tgz"; + sha512 = "CIZlnpOha9mgqHjLaodY3OeYEX62ElsuYvtI8HmJz4uJEHfaeQ+vNBCAkUsyfCrYawSbCOSufUHM6lHaP4hG8Q=="; + }; + }; "is-redirect-1.0.0" = { name = "is-redirect"; packageName = "is-redirect"; @@ -35649,13 +37251,13 @@ let sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; }; }; - "is-unicode-supported-1.1.0" = { + "is-unicode-supported-1.2.0" = { name = "is-unicode-supported"; packageName = "is-unicode-supported"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.1.0.tgz"; - sha512 = "lDcxivp8TJpLG75/DpatAqNzOpDPSpED8XNtrpBHTdQ2InQ1PbW78jhwSxyxhhu+xbVSast2X38bwj8atwoUQA=="; + url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz"; + sha512 = "wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ=="; }; }; "is-url-1.2.4" = { @@ -35694,13 +37296,13 @@ let sha512 = "Yd9oD7sgCycVvH8CHy5U4fLXibPwxVw2+diudYbT8ZfAiQDtW1H9WvPRR4+rtN9qOll+r+KAfO4SjO28OPpitA=="; }; }; - "is-valid-domain-0.1.5" = { + "is-valid-domain-0.1.6" = { name = "is-valid-domain"; packageName = "is-valid-domain"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.1.5.tgz"; - sha512 = "ilzfGo1kXzoVpSLplJWOexoiuAc6mRK+vPlNAeEPVJ29RagETpCz0izg6CZfY72DCuA+PCrEAEJeaecRLMNq5Q=="; + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.1.6.tgz"; + sha512 = "ZKtq737eFkZr71At8NxOFcP9O1K89gW3DkdrGMpp1upr/ueWjj+Weh4l9AI4rN0Gt8W2M1w7jrG2b/Yv83Ljpg=="; }; }; "is-valid-glob-1.0.0" = { @@ -35883,13 +37485,13 @@ let sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; }; }; - "isbinaryfile-4.0.8" = { + "isbinaryfile-4.0.10" = { name = "isbinaryfile"; packageName = "isbinaryfile"; - version = "4.0.8"; + version = "4.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz"; - sha512 = "53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w=="; + url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz"; + sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw=="; }; }; "isemail-3.2.0" = { @@ -35964,13 +37566,13 @@ let sha512 = "qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA=="; }; }; - "isomorphic-git-1.10.4" = { + "isomorphic-git-1.10.5" = { name = "isomorphic-git"; packageName = "isomorphic-git"; - version = "1.10.4"; + version = "1.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.10.4.tgz"; - sha512 = "0nvws2N2pWX04AZPpYUyvgPmupKbklP/qSerP/A8yuoe8t4flhpOwYl8INdV6u8j24ALm5X3QBciOTz96ugT2Q=="; + url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-1.10.5.tgz"; + sha512 = "hcD5SkH36iv2ooM9VCY3kPOYtCgxjw52LmqB6sj5oWlDu/IbI3mYtPdok2lmR5dzmCoaUT7pCXz847AWW7Mv3w=="; }; }; "isomorphic-textencoder-1.0.1" = { @@ -36126,22 +37728,22 @@ let sha512 = "M0c7cKHmdyEUtjemnJyx/y9uX16XHocL46yQvyqDlPdvAcwPDbHrIbKjQdBqtiE4apQ/9dmr+ZLJYYPGnurgpw=="; }; }; - "jake-10.8.2" = { + "jake-10.8.4" = { name = "jake"; packageName = "jake"; - version = "10.8.2"; + version = "10.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz"; - sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; + url = "https://registry.npmjs.org/jake/-/jake-10.8.4.tgz"; + sha512 = "MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA=="; }; }; - "javascript-stringify-1.6.0" = { + "javascript-stringify-2.1.0" = { name = "javascript-stringify"; packageName = "javascript-stringify"; - version = "1.6.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-1.6.0.tgz"; - sha1 = "142d111f3a6e3dae8f4a9afd77d45855b5a9cce3"; + url = "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz"; + sha512 = "JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg=="; }; }; "jed-1.1.1" = { @@ -36153,6 +37755,15 @@ let sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; + "jest-environment-node-27.5.1" = { + name = "jest-environment-node"; + packageName = "jest-environment-node"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz"; + sha512 = "Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw=="; + }; + }; "jest-haste-map-25.5.1" = { name = "jest-haste-map"; packageName = "jest-haste-map"; @@ -36162,6 +37773,24 @@ let sha512 = "dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ=="; }; }; + "jest-message-util-27.5.1" = { + name = "jest-message-util"; + packageName = "jest-message-util"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz"; + sha512 = "rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g=="; + }; + }; + "jest-mock-27.5.1" = { + name = "jest-mock"; + packageName = "jest-mock"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz"; + sha512 = "K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og=="; + }; + }; "jest-regex-util-25.2.6" = { name = "jest-regex-util"; packageName = "jest-regex-util"; @@ -36189,6 +37818,15 @@ let sha512 = "KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA=="; }; }; + "jest-util-27.5.1" = { + name = "jest-util"; + packageName = "jest-util"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz"; + sha512 = "Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw=="; + }; + }; "jest-worker-25.5.0" = { name = "jest-worker"; packageName = "jest-worker"; @@ -36207,13 +37845,13 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jest-worker-27.4.6" = { + "jest-worker-27.5.1" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.4.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.6.tgz"; - sha512 = "gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz"; + sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; }; }; "jimp-compact-0.16.1" = { @@ -36225,13 +37863,13 @@ let sha512 = "dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="; }; }; - "jitdb-4.0.1" = { + "jitdb-4.1.0" = { name = "jitdb"; packageName = "jitdb"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-4.0.1.tgz"; - sha512 = "teg0Zk1KhdCkv2t7ULptqej7cfdOfNtodXGBpQmY71x8U/aty3AubYrL6DutwYCiKYB7q6ITI8M/ywAJxT3kOQ=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-4.1.0.tgz"; + sha512 = "j6PZcTup+evIz+cVy8wDB6+GlV20/YvgDKCQtV7FBTBgYhl8FtpurUclcHz+C4OerMRosaKRX1doxTWgWoCmBQ=="; }; }; "jju-1.4.0" = { @@ -36243,15 +37881,6 @@ let sha1 = "a3abe2718af241a2b2904f84a625970f389ae32a"; }; }; - "jmespath-0.15.0" = { - name = "jmespath"; - packageName = "jmespath"; - version = "0.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz"; - sha1 = "a3f222a9aae9f966f5d27c796510e28091764217"; - }; - }; "jmespath-0.16.0" = { name = "jmespath"; packageName = "jmespath"; @@ -36279,13 +37908,13 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joi-17.5.0" = { + "joi-17.6.0" = { name = "joi"; packageName = "joi"; - version = "17.5.0"; + version = "17.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.5.0.tgz"; - sha512 = "R7hR50COp7StzLnDi4ywOXHrBrgNXuUUfJWIR5lPY5Bm/pOD3jZaTwpluUXVLRWcoWZxkrHBBJ5hLxgnlehbdw=="; + url = "https://registry.npmjs.org/joi/-/joi-17.6.0.tgz"; + sha512 = "OX5dG6DTbcr/kbMFj0KGYxuew69HPcAE3K/sZpEV2nP6e/j/C0HV+HNiBPCASxdx5T7DMoa0s8UeHWMnb6n2zw=="; }; }; "join-component-1.1.0" = { @@ -36370,22 +37999,31 @@ let sha512 = "JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="; }; }; - "jquery-ui-1.12.1" = { + "jquery-ui-1.13.1" = { name = "jquery-ui"; packageName = "jquery-ui"; - version = "1.12.1"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz"; - sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; + url = "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.1.tgz"; + sha512 = "2VlU59N5P4HaumDK1Z3XEVjSvegFbEOQRgpHUBaB2Ak98Axl3hFhJ6RFcNQNuk9SfL6WxIbuLst8dW/U56NSiA=="; }; }; - "jquery.terminal-2.31.1" = { + "jquery.terminal-2.32.1" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.31.1"; + version = "2.32.1"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.31.1.tgz"; - sha512 = "JVCL3mOmE+NQ1SvwHyRtJ18ICEylHoLqh0mmi0HResjeE7v/85rREfoLDtYfJxDxCNpTrznGl3HEoUCfjHnycA=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.32.1.tgz"; + sha512 = "AbaZfSuNPQSBpUEP2jqNix5H7wS3fqUQGe+k6D8umBAOA3XxIVJpXTcGitfs1df7AZ52DruOQnV+p5+s+E3QqQ=="; + }; + }; + "js-base64-2.6.3" = { + name = "js-base64"; + packageName = "js-base64"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/js-base64/-/js-base64-2.6.3.tgz"; + sha512 = "fiUvdfCaAXoQTHdKMgTvg6IkecXDcVz6V5rlftUTclF9IKBjMizvSdQaCl/z/6TApDeby5NL+axYou3i0mu1Pg=="; }; }; "js-base64-2.6.4" = { @@ -36442,15 +38080,6 @@ let sha512 = "efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA=="; }; }; - "js-queue-2.0.2" = { - name = "js-queue"; - packageName = "js-queue"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/js-queue/-/js-queue-2.0.2.tgz"; - sha512 = "pbKLsbCfi7kriM3s1J4DDCo7jQkI58zPLHi0heXPzPlj0hjUsm+FesPUbE0DSbIVIK503A36aUBoCN7eMFedkA=="; - }; - }; "js-sdsl-2.1.4" = { name = "js-sdsl"; packageName = "js-sdsl"; @@ -36460,6 +38089,15 @@ let sha512 = "/Ew+CJWHNddr7sjwgxaVeIORIH4AMVC9dy0hPf540ZGMVgS9d3ajwuVdyhDt6/QUvT8ATjR3yuYBKsS79F+H4A=="; }; }; + "js-sha256-0.9.0" = { + name = "js-sha256"; + packageName = "js-sha256"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz"; + sha512 = "sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA=="; + }; + }; "js-sha3-0.8.0" = { name = "js-sha3"; packageName = "js-sha3"; @@ -36604,13 +38242,13 @@ let sha512 = "SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g=="; }; }; - "jsdoc-3.6.7" = { + "jsdoc-3.6.10" = { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.7"; + version = "3.6.10"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.7.tgz"; - sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.10.tgz"; + sha512 = "IdQ8ppSo5LKZ9o3M+LKIIK8i00DIe5msDvG3G81Km+1dhy0XrOWD0Ji8H61ElgyEj/O9KRLokgKbAM9XX9CJAg=="; }; }; "jsdom-11.12.0" = { @@ -36694,49 +38332,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.52.1" = { + "jsii-1.55.1" = { name = "jsii"; packageName = "jsii"; - version = "1.52.1"; + version = "1.55.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.52.1.tgz"; - sha512 = "kILHStPX3xeADtB/2Wda56Mzz/6KUw8xNr/k+dp84qn9YlZA81cW85tKK5biYCy/XAh5IPsWIZVFRqR8CSPMMw=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.55.1.tgz"; + sha512 = "9L6BztDV8PwNY5C+vwuLRJTzijh5Kyh3eijaz8NS11Jc7rTeTN8AvLxyWsIaPO+ITTP4JTsDKOU3tBaoWabRzA=="; }; }; - "jsii-pacmak-1.52.1" = { + "jsii-pacmak-1.55.1" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.52.1"; + version = "1.55.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.52.1.tgz"; - sha512 = "6bIGCtfu8UAr3dmddbyqGGyFyz4TOr5aC1eo4Cqwl23v/elkzxYV8TFCra9HksVxDi6UtTYJuypnExb4gsOcgQ=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.55.1.tgz"; + sha512 = "E208pgMfxbPbXgmcskDG0/hBbkPLGlU7S79VoXESy1Kegf7TnZjLqpBdJ3mNxIroS5gIC8DToArMHUFAQ6z0lA=="; }; }; - "jsii-reflect-1.52.1" = { + "jsii-reflect-1.55.1" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.52.1"; + version = "1.55.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.52.1.tgz"; - sha512 = "OsTquiUJkgUu5jlK2VeshLFP9mBd1NU7vhHvcJZ+0xc/u2byfzPT0Irj2o6XLp30Vx/+uGGK6Nf6KyKtmUe82w=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.55.1.tgz"; + sha512 = "/Ak+sCuIjJaRCflCWT2UKPdT88EQhbPYLhtF7F42uuUr2tchlNkybNE15bigZbtqLw7SP1fp/6Dedujvf90N9Q=="; }; }; - "jsii-rosetta-1.52.1" = { + "jsii-rosetta-1.55.1" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.52.1"; + version = "1.55.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.52.1.tgz"; - sha512 = "iFpupZWQusVYGHaUPooaO6xVAtRp+o1EOMBS2FcJBZcWGbB8fRG3zzpeMSkoqu/Pjqtu7boh45V90CXtSmVfMQ=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.55.1.tgz"; + sha512 = "ZUzuO2JgnxE01tgIdZorsUZj5jiHP8uxeLDU/vsnmnAU2ZbMHFDT1cWacoAKESDnCyFF8VRCuPXHx8e5/SOXig=="; }; }; - "jsii-srcmak-0.1.453" = { + "jsii-srcmak-0.1.512" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.453"; + version = "0.1.512"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.453.tgz"; - sha512 = "cMH4f2r1c2ykXdlvvsbPy0DUGFCiphqJ6pdTMKT+R07nY+epHQ9aF/8BV38hGzxiqMVX+7f/FHJ6VYQYEnEXBw=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.512.tgz"; + sha512 = "AA/WSd6ysD6xPrwLvsXOnbgwgN+TlX9ApXBNTsZohQxlKEnyyQAPt945rW9cu/cdNbpc/U/Dnig3CLqDn+PogQ=="; }; }; "json-bigint-1.0.0" = { @@ -36820,13 +38458,13 @@ let sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc"; }; }; - "json-pointer-0.6.1" = { + "json-pointer-0.6.2" = { name = "json-pointer"; packageName = "json-pointer"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-pointer/-/json-pointer-0.6.1.tgz"; - sha512 = "3OvjqKdCBvH41DLpV4iSt6v2XhZXV1bPB4OROuknvUXI7ZQNofieCPkmE26stEJ9zdQuvIxDHCuYhfgxFAAs+Q=="; + url = "https://registry.npmjs.org/json-pointer/-/json-pointer-0.6.2.tgz"; + sha512 = "vLWcKbOaXlO+jvRy4qNd+TI1QUPZzfJj1tpJ3vAXDych5XJf93ftpUKe5pKCrzyIIwgBJcOcCVRUfqQP25afBw=="; }; }; "json-ptr-1.3.2" = { @@ -36838,13 +38476,13 @@ let sha512 = "tFH40YQ+lG7mgYYM1kGZOhQngO4SbOEHZJlA4W+NtetWZ20EUU3BPU+30uWRKumuAJoSo5eqrsXD2h72ioS8ew=="; }; }; - "json-ptr-3.0.1" = { + "json-ptr-3.1.0" = { name = "json-ptr"; packageName = "json-ptr"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-ptr/-/json-ptr-3.0.1.tgz"; - sha512 = "hrZ4tElT8huJUH3OwOK+d7F8PRqw09QnGM3Mm3GmqKWDyCCPCG8lGHxXOwQAj0VOxzLirOds07Kz10B5F8M8EA=="; + url = "https://registry.npmjs.org/json-ptr/-/json-ptr-3.1.0.tgz"; + sha512 = "KMsG905wFbHHTnvd66MHCNo0E43UPalKt2zQUbBtWrDYKk/3vE/4u8lfWDdIyPEoMXxOFJO1lsBs6xPBXKxeVw=="; }; }; "json-refs-2.1.7" = { @@ -36964,6 +38602,15 @@ let sha1 = "28e4ffd51c8d893295280eb4064d9703594de5a2"; }; }; + "json-source-map-0.6.1" = { + name = "json-source-map"; + packageName = "json-source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-source-map/-/json-source-map-0.6.1.tgz"; + sha512 = "1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg=="; + }; + }; "json-stable-stringify-0.0.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; @@ -37027,13 +38674,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.113" = { + "json2jsii-0.2.172" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.113"; + version = "0.2.172"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.113.tgz"; - sha512 = "H3SjBlxMhJ0k+zjEuxCMZwpwGfl8ECNoy2CPgiX33kSJsyNwJFM6Qo15DhS/mucgBh8p2wtfg93wdlYTfzNxMQ=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.172.tgz"; + sha512 = "SXqltdQ3byo8XEsClMR5xnV6US5MWu0rBJdAC3NcvFCb0jgzu0V8ljfNJWEJJUKInuQWAsJ788ep5oKbLf3W7g=="; }; }; "json3-3.2.6" = { @@ -37072,13 +38719,13 @@ let sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; }; - "json5-2.2.0" = { + "json5-2.2.1" = { name = "json5"; packageName = "json5"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz"; - sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"; + sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; }; }; "json5-relaxed-0.5.4" = { @@ -37090,13 +38737,13 @@ let sha512 = "oDPf7b6nFDKcX2qt5OLI/ZwGwH43qS/g2Z98UWo8ChoNtVMYdGa3Y48WHvjPqvNKnTUa2fOanvHFeE7ZxkiboQ=="; }; }; - "jsonata-1.8.5" = { + "jsonata-1.8.6" = { name = "jsonata"; packageName = "jsonata"; - version = "1.8.5"; + version = "1.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.5.tgz"; - sha512 = "ilDyTBkg6qhNoNVr8PUPzz5GYvRK+REKOM5MdOGzH2y6V4yvPRMegSvbZLpbTtI0QAgz09QM7drDhSHUlwp9pA=="; + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.6.tgz"; + sha512 = "ZH2TPYdNP2JecOl/HvrH47Xc+9imibEMQ4YqKy/F/FrM+2a6vfbGxeCX23dB9Fr6uvGwv+ghf1KxWB3iZk09wA=="; }; }; "jsonc-parser-1.0.3" = { @@ -37252,6 +38899,15 @@ let sha512 = "PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg=="; }; }; + "jsonrpc2-ws-1.0.0-beta9" = { + name = "jsonrpc2-ws"; + packageName = "jsonrpc2-ws"; + version = "1.0.0-beta9"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonrpc2-ws/-/jsonrpc2-ws-1.0.0-beta9.tgz"; + sha512 = "0KA+ufhSy7gN2/jGXagXLz4V5m+vymmNTI5IpNBIUiunday45P6dspdaOO0wwt2JJyrACC/BKMH154OqsuB80w=="; + }; + }; "jsonschema-1.4.0" = { name = "jsonschema"; packageName = "jsonschema"; @@ -37396,6 +39052,15 @@ let sha512 = "pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ=="; }; }; + "junk-4.0.0" = { + name = "junk"; + packageName = "junk"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/junk/-/junk-4.0.0.tgz"; + sha512 = "ojtSU++zLJ3jQG9bAYjg94w+/DOJtRyD7nPaerMFrBhmdVmiV5/exYH5t4uHga4G/95nT6hr1OJoKIFbYbrW5w=="; + }; + }; "just-debounce-1.1.0" = { name = "just-debounce"; packageName = "just-debounce"; @@ -37567,15 +39232,6 @@ let sha1 = "83cb748496ac491c7135104cbe56b88ca7392477"; }; }; - "kafka-node-5.0.0" = { - name = "kafka-node"; - packageName = "kafka-node"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kafka-node/-/kafka-node-5.0.0.tgz"; - sha512 = "dD2ga5gLcQhsq1yNoQdy1MU4x4z7YnXM5bcG9SdQuiNr5KKuAmXixH1Mggwdah5o7EfholFbcNDPSVA6BIfaug=="; - }; - }; "katex-0.13.24" = { name = "katex"; packageName = "katex"; @@ -37666,13 +39322,13 @@ let sha512 = "qdyZ3XDuv11ANDXJ+shsmc+j/h5BHPDSn33MwkUMDg2EA++xEBleNkghr3Jg95cqVx5WgDYD8V/m3Q0y7kwQ2w=="; }; }; - "keytar-7.7.0" = { + "keytar-7.9.0" = { name = "keytar"; packageName = "keytar"; - version = "7.7.0"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz"; - sha512 = "YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A=="; + url = "https://registry.npmjs.org/keytar/-/keytar-7.9.0.tgz"; + sha512 = "VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ=="; }; }; "keyv-3.0.0" = { @@ -37693,13 +39349,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.0.5" = { + "keyv-4.1.1" = { name = "keyv"; packageName = "keyv"; - version = "4.0.5"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.0.5.tgz"; - sha512 = "531pkGLqV3BMg0eDqqJFI0R1mkK1Nm5xIP2mM6keP5P8WfFtCkg2IOwplTUmlGoTgIg9yQYZ/kdihhz89XH3vA=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.1.1.tgz"; + sha512 = "tGv1yP6snQVDSM4X6yxrv2zzq/EvpW+oYiUz6aueW1u9CtS8RzUQYxxmFwgZlO2jSgCxQbchhxaqXXp2hnKGpQ=="; }; }; "khroma-1.4.1" = { @@ -37774,13 +39430,13 @@ let sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; }; }; - "klaw-3.0.0" = { + "klaw-4.0.1" = { name = "klaw"; packageName = "klaw"; - version = "3.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz"; - sha512 = "0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g=="; + url = "https://registry.npmjs.org/klaw/-/klaw-4.0.1.tgz"; + sha512 = "pgsE40/SvC7st04AHiISNewaIMUbY5V/K8b21ekiPiFoYs/EYSdsGa+FJArB1d441uq4Q8zZyIxvAzkGNlBdRw=="; }; }; "klaw-sync-6.0.0" = { @@ -37846,15 +39502,6 @@ let sha512 = "RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA=="; }; }; - "known-css-properties-0.5.0" = { - name = "known-css-properties"; - packageName = "known-css-properties"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.5.0.tgz"; - sha512 = "LOS0CoS8zcZnB1EjLw4LLqDXw8nvt3AGH5dXLQP3D9O1nLLA+9GC5GnPl5mmF+JiQAtSX4VyZC7KvEtcA4kUtA=="; - }; - }; "koa-2.13.4" = { name = "koa"; packageName = "koa"; @@ -37864,6 +39511,15 @@ let sha512 = "43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g=="; }; }; + "koa-bodyparser-4.3.0" = { + name = "koa-bodyparser"; + packageName = "koa-bodyparser"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-bodyparser/-/koa-bodyparser-4.3.0.tgz"; + sha512 = "uyV8G29KAGwZc4q/0WUAjH+Tsmuv9ImfBUF2oZVyZtaeo0husInagyn/JH85xMSxM0hEk/mbCII5ubLDuqW/Rw=="; + }; + }; "koa-compose-3.2.1" = { name = "koa-compose"; packageName = "koa-compose"; @@ -37891,6 +39547,24 @@ let sha512 = "asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA=="; }; }; + "koa-is-json-1.0.0" = { + name = "koa-is-json"; + packageName = "koa-is-json"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz"; + sha1 = "273c07edcdcb8df6a2c1ab7d59ee76491451ec14"; + }; + }; + "koa-json-2.0.2" = { + name = "koa-json"; + packageName = "koa-json"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/koa-json/-/koa-json-2.0.2.tgz"; + sha1 = "36af14e6ea1f5d646d7c44a285701c6f85a4fde4"; + }; + }; "koa-logger-3.2.1" = { name = "koa-logger"; packageName = "koa-logger"; @@ -37936,15 +39610,6 @@ let sha512 = "JGmxTuPWy4bH7bt6gD/OMWkhprawvRmzJSr8TWKmTL4N7+IMv3s0SedeQi5S4ilxM9Bo6ptkCyXj/7wf+VS5tg=="; }; }; - "kuler-1.0.1" = { - name = "kuler"; - packageName = "kuler"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz"; - sha512 = "J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ=="; - }; - }; "kuler-2.0.0" = { name = "kuler"; packageName = "kuler"; @@ -38053,6 +39718,15 @@ let sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; }; + "latest-version-6.0.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-6.0.0.tgz"; + sha512 = "zfTuGx4PwpoSJ1mABs58AkM6qMzu49LZ7LT5JHprKvpGpQ+cYtfSibi3tLLrH4z7UylYU42rfBdwN8YgqbTljA=="; + }; + }; "launch-editor-2.3.0" = { name = "launch-editor"; packageName = "launch-editor"; @@ -38062,6 +39736,15 @@ let sha512 = "3QrsCXejlWYHjBPFXTyGNhPj4rrQdB+5+r5r3wArpLH201aR+nWUgw/zKKkTmilCfY/sv6u8qo98pNvtg8LUTA=="; }; }; + "launch-editor-middleware-2.3.0" = { + name = "launch-editor-middleware"; + packageName = "launch-editor-middleware"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/launch-editor-middleware/-/launch-editor-middleware-2.3.0.tgz"; + sha512 = "GJR64trLdFFwCoL9DMn/d1SZX0OzTDPixu4mcfWTShQ4tIqCHCGvlg9fOEYQXyBlrSMQwylsJfUWncheShfV2w=="; + }; + }; "layered-graph-1.1.3" = { name = "layered-graph"; packageName = "layered-graph"; @@ -38422,13 +40105,13 @@ let sha1 = "22c59bcaefaa9a8ef359cf759784e4bf106aea1b"; }; }; - "libnested-1.5.1" = { + "libnested-1.5.2" = { name = "libnested"; packageName = "libnested"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/libnested/-/libnested-1.5.1.tgz"; - sha512 = "mA68lhvC5NypD/21rBNziTmqWaukivdbbDkWnXrry8iCV0/PuD8GSxa8W+ZtJwAOzvu/AdOx/YEb9NbqPq6s5Q=="; + url = "https://registry.npmjs.org/libnested/-/libnested-1.5.2.tgz"; + sha512 = "DbiwHL8454goYRp5Xn9vUA5XU6x8rNh8BmZ7ywSTUhVBIiDS7ev/FT6+AwU2/ZKW2jEOC7WKhpkJfExaQwosRA=="; }; }; "libnpmaccess-4.0.3" = { @@ -38458,22 +40141,22 @@ let sha512 = "+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw=="; }; }; - "libsodium-0.7.9" = { + "libsodium-0.7.10" = { name = "libsodium"; packageName = "libsodium"; - version = "0.7.9"; + version = "0.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/libsodium/-/libsodium-0.7.9.tgz"; - sha512 = "gfeADtR4D/CM0oRUviKBViMGXZDgnFdMKMzHsvBdqLBHd9ySi6EtYnmuhHVDDYgYpAO8eU8hEY+F8vIUAPh08A=="; + url = "https://registry.npmjs.org/libsodium/-/libsodium-0.7.10.tgz"; + sha512 = "eY+z7hDrDKxkAK+QKZVNv92A5KYkxfvIshtBJkmg5TSiCnYqZP3i9OO9whE79Pwgm4jGaoHgkM4ao/b9Cyu4zQ=="; }; }; - "libsodium-wrappers-0.7.9" = { + "libsodium-wrappers-0.7.10" = { name = "libsodium-wrappers"; packageName = "libsodium-wrappers"; - version = "0.7.9"; + version = "0.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.9.tgz"; - sha512 = "9HaAeBGk1nKTRFRHkt7nzxqCvnkWTjn1pdjKgcUnZxj0FyOP4CnhgFhMdrFfgNsukijBGyBLpP2m2uKT1vuWhQ=="; + url = "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.10.tgz"; + sha512 = "pO3F1Q9NPLB/MWIhehim42b/Fwb30JNScCNh8TcQ/kIc+qGLQch8ag8wb0keK3EP5kbGakk1H8Wwo7v+36rNQg=="; }; }; "lie-3.0.4" = { @@ -38539,49 +40222,31 @@ let sha512 = "5i0XgY+PSaGmMQTuVdtnzDg0LiTp1krfH4seefFLJNFb6Hunxic00D/roybGgd9hlbqeGmGYXZ+YQpATKQtblA=="; }; }; - "lightning-5.2.1" = { + "lightning-5.6.2" = { name = "lightning"; packageName = "lightning"; - version = "5.2.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.2.1.tgz"; - sha512 = "Mt9J8OvPC0A1xeNhT6mqWiBefer6hEVosLPiqBXJ1BsNPhGYAIEEuWCWT3Yy0biPm6FUotAdfb1IO6B4NILBhg=="; + url = "https://registry.npmjs.org/lightning/-/lightning-5.6.2.tgz"; + sha512 = "1Bfrq+FK4/yuBStMzmiFnAG//YewN9Fznm2qn86z87/u6UcWqdpWvBCRS5njtq5bG6eWgxM4DOfaw9LptyXSog=="; }; }; - "lightning-5.3.1" = { + "lightning-5.8.2" = { name = "lightning"; packageName = "lightning"; - version = "5.3.1"; + version = "5.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.3.1.tgz"; - sha512 = "PbJJQJS9HOBfH8D99ejugmOur8K9MOdYXxep3eeq0GGof4dhO8gnQLcyvsBaxb25cVfFAiERJOMHheo9iCDkjg=="; + url = "https://registry.npmjs.org/lightning/-/lightning-5.8.2.tgz"; + sha512 = "ryJlD9qhbUSq4ZS6Q0WXnTgmj3IMqN1iBfUJoGAMzSbSGZAS8E8eejci88naBbbDA0N34hALpSsa5Ok7JayAdQ=="; }; }; - "lightning-5.3.3" = { - name = "lightning"; - packageName = "lightning"; - version = "5.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.3.3.tgz"; - sha512 = "/piN0cPoXe3wfKJxIwlclOEC3es0VhqFFKpPw5Z1AahpDs1UA/0+czaDiwUrwWPYnlM/6gh92Tu4iXDYNWipng=="; - }; - }; - "lightning-5.3.4" = { - name = "lightning"; - packageName = "lightning"; - version = "5.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.3.4.tgz"; - sha512 = "zUHlFFSS+KJhndoZkjkXPWpvlXAgYGWS2SxzXpiiwnXZKCNmT+IkQFQmp2oIpbF7K93oqlpxgafZMZDeReX5pQ=="; - }; - }; - "lilconfig-2.0.4" = { + "lilconfig-2.0.5" = { name = "lilconfig"; packageName = "lilconfig"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz"; - sha512 = "bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA=="; + url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz"; + sha512 = "xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg=="; }; }; "limit-spawn-0.0.3" = { @@ -38647,13 +40312,13 @@ let sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; }; }; - "link-check-5.0.2" = { + "link-check-5.1.0" = { name = "link-check"; packageName = "link-check"; - version = "5.0.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/link-check/-/link-check-5.0.2.tgz"; - sha512 = "F7k7HzOFY3lh11o3nQTCfi3HTrUMbn/0LQ5aBU7vgronoh8HWGZfRC4Jh0ghuQDbtTGNO4u4is6AoqK0hsYDJg=="; + url = "https://registry.npmjs.org/link-check/-/link-check-5.1.0.tgz"; + sha512 = "FHq/9tVnIE/3EVEPb91GcbD+K/Pv5K5DYqb7vXi3TTKIViMYPOWxYFVVENZ0rq63zfaGXGvLgPT9U6jOFc5JBw=="; }; }; "linkify-it-2.2.0" = { @@ -38746,13 +40411,31 @@ let sha512 = "q7Z71n3i4X0R9xthAryBdNGVGAO2R5X+/xXpmKeuPMrteg+W2U8VusTKV3YiJbXZwKsOlFlHe+go6uSNjfxrZw=="; }; }; - "livereload-js-3.3.2" = { + "livereload-js-3.3.3" = { name = "livereload-js"; packageName = "livereload-js"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/livereload-js/-/livereload-js-3.3.2.tgz"; - sha512 = "w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA=="; + url = "https://registry.npmjs.org/livereload-js/-/livereload-js-3.3.3.tgz"; + sha512 = "a7Jipme3XIBIryJluWP5LQrEAvhobDPyScBe+q+MYwxBiMT2Ck7msy4tAdF8TAa33FMdJqX4guP81Yhiu6BkmQ=="; + }; + }; + "lmdb-2.2.4" = { + name = "lmdb"; + packageName = "lmdb"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lmdb/-/lmdb-2.2.4.tgz"; + sha512 = "gto+BB2uEob8qRiTlOq+R3uX0YNHsX9mjxj9Sbdue/LIKqu6IlZjrsjKeGyOMquc/474GEqFyX2pdytpydp0rQ=="; + }; + }; + "lmdb-2.2.6" = { + name = "lmdb"; + packageName = "lmdb"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/lmdb/-/lmdb-2.2.6.tgz"; + sha512 = "UmQV0oZZcV3EN6rjcAjIiuWcc3MYZGWQ0GUYz46Ron5fuTa/dUow7WSQa6leFkvZIKVUdECBWVw96tckfEzUFQ=="; }; }; "ln-accounting-5.0.5" = { @@ -38773,58 +40456,40 @@ let sha512 = "20ZIPPyGI4odh/Jxq6Lawtc+Zx7MkPuxnn34TuhZpM6ppwVbSGJSuJPctLrhZvWdaYYeboz3BITiqI/o4KvChQ=="; }; }; - "ln-service-53.2.0" = { + "ln-service-53.7.3" = { name = "ln-service"; packageName = "ln-service"; - version = "53.2.0"; + version = "53.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.2.0.tgz"; - sha512 = "4qaKYQV6vRlIja7j5lo5G8srABzFmt/fY+8/EVYhU6hdLhAxNPDUZ8zSQky6bWOwtb2zZYejUZYT2GqI2tfq5w=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-53.7.3.tgz"; + sha512 = "iA+G0yn3j74BcGdKxhHRCDphMSgGg4NWzFNy9r484WPBjq6KQgCRcxE0I8A0Rgi73kqMckKZmYEKrJMUuJyNYw=="; }; }; - "ln-service-53.4.0" = { + "ln-service-53.9.3" = { name = "ln-service"; packageName = "ln-service"; - version = "53.4.0"; + version = "53.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.4.0.tgz"; - sha512 = "+KPin7a4zCVtYMoVmTEVQPNg7BZUm/5dRd/bI1hY1z+wiL7GE5CxvKNbEIyPgyxRYuLXf8nx/4vvFiSjfJKfug=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-53.9.3.tgz"; + sha512 = "vB7pnTJveZSMHbyO6qyGbxNqo+rNTYexb3PONon2+Ow4fBUQW5eeBTj+LguuQdN7AgpXX/PHZUQM0TPFeHlVWw=="; }; }; - "ln-service-53.5.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.5.0.tgz"; - sha512 = "W6x/uM0K1hHEMadW4YvXcucUc2hjIm+jMIxs0ujNaeRH6uVFEtlfPmEwnYV9EzU3Ns+NOp/juuN/fvF0DqeXhQ=="; - }; - }; - "ln-service-53.5.1" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.5.1.tgz"; - sha512 = "EXLhYeu1qvhk+yzuH6qBZyGvqBPWT71FnmsbOxKjWofW6SGQBbJuNru6Ub2NIMhJnXqD7qvMvswZ54ho/oPvGQ=="; - }; - }; - "ln-sync-3.7.0" = { + "ln-sync-3.11.0" = { name = "ln-sync"; packageName = "ln-sync"; - version = "3.7.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.7.0.tgz"; - sha512 = "1aTlSSLiIULG4AOhOLdMd/VQYhUBEvTdA+8Bp2xe1YolOralVW/x/50fzIxzkKolCwXQ6elecUuH4nw1z0tqkg=="; + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.11.0.tgz"; + sha512 = "YqtS0v6zsDvv7rA51bSbXnB7Il4HQida+FpPD9KTAXdEiJW1L/NiyV4B+oosaygdUbT2oYgM3xw++L7XVBkPvA=="; }; }; - "ln-telegram-3.8.0" = { + "ln-telegram-3.20.0" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.8.0"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.8.0.tgz"; - sha512 = "4T2YaRNvQtWLqjRENFSRO+B3qJE93X9nSX1TqFwWhdtp7Z3UHpd/YjxeAjPsH1lLTl2hY9FIDK3RiayJky6TVA=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.20.0.tgz"; + sha512 = "gPh5EG0sNQUoqnn0Y1SeXXV0rNZN05LC8uKnvCbjPeHrFdx+3TdRLlMrsSITJL1xwATVtxN4+YWMuCSMEU7S+g=="; }; }; "load-bmfont-1.4.1" = { @@ -38917,6 +40582,15 @@ let sha512 = "OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw=="; }; }; + "loader-fs-cache-1.0.3" = { + name = "loader-fs-cache"; + packageName = "loader-fs-cache"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz"; + sha512 = "ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA=="; + }; + }; "loader-runner-2.4.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -39052,22 +40726,13 @@ let sha1 = "53157499d1653b136ca66451071fca615703fa55"; }; }; - "locks-0.2.2" = { - name = "locks"; - packageName = "locks"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/locks/-/locks-0.2.2.tgz"; - sha1 = "259933d1327cbaf0fd3662f8fffde36809d84ced"; - }; - }; - "locutus-2.0.15" = { + "locutus-2.0.16" = { name = "locutus"; packageName = "locutus"; - version = "2.0.15"; + version = "2.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/locutus/-/locutus-2.0.15.tgz"; - sha512 = "2xWC4RkoAoCVXEb/stzEgG1TNgd+mrkLBj6TuEDNyUoKeQ2XzDTyJUC23sMiqbL6zJmJSP3w59OZo+zc4IBOmA=="; + url = "https://registry.npmjs.org/locutus/-/locutus-2.0.16.tgz"; + sha512 = "pGfl6Hb/1mXLzrX5kl5lH7gz25ey0vwQssZp8Qo2CEF59di6KrAgdFm+0pW8ghLnvNzzJGj5tlWhhv2QbK3jeQ=="; }; }; "lodash-2.4.2" = { @@ -39556,6 +41221,15 @@ let sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; }; }; + "lodash.castarray-4.4.0" = { + name = "lodash.castarray"; + packageName = "lodash.castarray"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz"; + sha1 = "c02513515e309daddd4c24c60cfddcf5976d9115"; + }; + }; "lodash.clone-4.5.0" = { name = "lodash.clone"; packageName = "lodash.clone"; @@ -39610,6 +41284,15 @@ let sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; }; }; + "lodash.defaultsdeep-4.6.1" = { + name = "lodash.defaultsdeep"; + packageName = "lodash.defaultsdeep"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz"; + sha512 = "3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA=="; + }; + }; "lodash.difference-4.5.0" = { name = "lodash.difference"; packageName = "lodash.difference"; @@ -39619,15 +41302,6 @@ let sha1 = "9ccb4e505d486b91651345772885a2df27fd017c"; }; }; - "lodash.differencewith-4.5.0" = { - name = "lodash.differencewith"; - packageName = "lodash.differencewith"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.differencewith/-/lodash.differencewith-4.5.0.tgz"; - sha1 = "bafafbc918b55154e179176a00bb0aefaac854b7"; - }; - }; "lodash.escape-3.2.0" = { name = "lodash.escape"; packageName = "lodash.escape"; @@ -39952,6 +41626,15 @@ let sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; }; }; + "lodash.mapvalues-4.6.0" = { + name = "lodash.mapvalues"; + packageName = "lodash.mapvalues"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"; + sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c"; + }; + }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -40168,6 +41851,15 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; + "lodash.transform-4.6.0" = { + name = "lodash.transform"; + packageName = "lodash.transform"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz"; + sha1 = "12306422f63324aed8483d3f38332b5f670547a0"; + }; + }; "lodash.truncate-4.4.2" = { name = "lodash.truncate"; packageName = "lodash.truncate"; @@ -40357,22 +42049,22 @@ let sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw=="; }; }; - "log4js-6.4.0" = { + "log4js-6.4.4" = { name = "log4js"; packageName = "log4js"; - version = "6.4.0"; + version = "6.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-6.4.0.tgz"; - sha512 = "ysc/XUecZJuN8NoKOssk3V0cQ29xY4fra6fnigZa5VwxFsCsvdqsdnEuAxNN89LlHpbE4KUD3zGcn+kFqonSVQ=="; + url = "https://registry.npmjs.org/log4js/-/log4js-6.4.4.tgz"; + sha512 = "ncaWPsuw9Vl1CKA406hVnJLGQKy1OHx6buk8J4rE2lVW+NW5Y82G5/DIloO7NkqLOUtNPEANaWC1kZYVjXssPw=="; }; }; - "logform-2.3.2" = { + "logform-2.4.0" = { name = "logform"; packageName = "logform"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.3.2.tgz"; - sha512 = "V6JiPThZzTsbVRspNO6TmHkR99oqYTs8fivMBYQkjZj6rxW92KxtDCPE6IkAk1DNBnYKNkjm4jYBm6JDUcyhOA=="; + url = "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz"; + sha512 = "CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw=="; }; }; "logidrom-0.3.1" = { @@ -40429,15 +42121,6 @@ let sha512 = "G2UKFT23/uueUnpUWYwB+uOlqcLvF6r1vNsMgTR6roJPpvpFQkgG75bkpAy/XYvaLpGs8XSgS24CUKC92Ap+jg=="; }; }; - "long-1.1.2" = { - name = "long"; - packageName = "long"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/long/-/long-1.1.2.tgz"; - sha1 = "eaef5951ca7551d96926b82da242db9d6b28fb53"; - }; - }; "long-2.4.0" = { name = "long"; packageName = "long"; @@ -40456,6 +42139,15 @@ let sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; }; }; + "long-timeout-0.1.1" = { + name = "long-timeout"; + packageName = "long-timeout"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/long-timeout/-/long-timeout-0.1.1.tgz"; + sha1 = "9721d788b47e0bcb5a24c2e2bee1a0da55dab514"; + }; + }; "longest-1.0.1" = { name = "longest"; packageName = "longest"; @@ -40564,6 +42256,15 @@ let sha512 = "S0FayMXku80toa5sZ6Ro4C+s+EtFDCsyJNG/AzFMfX3AxD5Si4dZsgzm/kKnbOxHl5Cv8jBlno8+3XYIh2pNjQ=="; }; }; + "loupe-2.3.4" = { + name = "loupe"; + packageName = "loupe"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz"; + sha512 = "OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ=="; + }; + }; "lowdb-0.13.1" = { name = "lowdb"; packageName = "lowdb"; @@ -40708,6 +42409,15 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; + "lru-cache-7.7.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "7.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.7.1.tgz"; + sha512 = "cRffBiTW8s73eH4aTXqBcTLU0xQnwGV3/imttRHGWCrbergmnK4D6JXQd8qin5z43HnDwRI+o7mVW0LEB+tpAw=="; + }; + }; "lru-queue-0.1.0" = { name = "lru-queue"; packageName = "lru-queue"; @@ -40753,13 +42463,13 @@ let sha1 = "f35ca91c493f7b73da0e07495304f17b31f87ee5"; }; }; - "ltx-2.10.0" = { + "ltx-3.0.0" = { name = "ltx"; packageName = "ltx"; - version = "2.10.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ltx/-/ltx-2.10.0.tgz"; - sha512 = "RB4zR6Mrp/0wTNS9WxMvpgfht/7u/8QAC9DpPD19opL/4OASPa28uoliFqeDkLUU8pQ4aeAfATBZmz1aSAHkMw=="; + url = "https://registry.npmjs.org/ltx/-/ltx-3.0.0.tgz"; + sha512 = "bu3/4/ApUmMqVNuIkHaRhqVtEi6didYcBDIF56xhPRCzVpdztCipZ62CUuaxMlMBUzaVL93+4LZRqe02fuAG6A=="; }; }; "luaparse-git://github.com/oxyc/luaparse#ac42a00ebf4020b8c9d3219e4b0f84bf7ce6e802" = { @@ -40781,13 +42491,13 @@ let sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; - "luxon-2.3.0" = { + "luxon-2.3.1" = { name = "luxon"; packageName = "luxon"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.3.0.tgz"; - sha512 = "gv6jZCV+gGIrVKhO90yrsn8qXPKD8HYZJtrUDSfEbow8Tkw84T9OnCyJhWvnJIaIF/tBuiAjZuQHUt1LddX2mg=="; + url = "https://registry.npmjs.org/luxon/-/luxon-2.3.1.tgz"; + sha512 = "I8vnjOmhXsMSlNMZlMkSOvgrxKJl0uOsEzdGgGNZuZPaS9KlefpE9KV95QFftlJSC+1UyCC9/I69R02cz/zcCA=="; }; }; "lzma-native-8.0.6" = { @@ -40871,6 +42581,15 @@ let sha512 = "4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA=="; }; }; + "magic-string-0.25.9" = { + name = "magic-string"; + packageName = "magic-string"; + version = "0.25.9"; + src = fetchurl { + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"; + sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="; + }; + }; "magicli-0.0.5" = { name = "magicli"; packageName = "magicli"; @@ -40961,6 +42680,15 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; + "make-fetch-happen-10.1.0" = { + name = "make-fetch-happen"; + packageName = "make-fetch-happen"; + version = "10.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.0.tgz"; + sha512 = "HeP4QlkadP/Op+hE+Une1070kcyN85FshQObku3/rmzRh4zDcKXA19d2L3AQR6UoaX3uZmhSOpTLH15b1vOFvQ=="; + }; + }; "make-fetch-happen-8.0.14" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -41141,15 +42869,6 @@ let sha512 = "YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg=="; }; }; - "markdown-it-12.2.0" = { - name = "markdown-it"; - packageName = "markdown-it"; - version = "12.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.2.0.tgz"; - sha512 = "Wjws+uCrVQRqOoJvze4HCqkKl1AsSh95iFAeQDwnyfxM09divCBSXlDR1uTvyUP3Grzpn4Ru8GeCxYPM8vkCQg=="; - }; - }; "markdown-it-12.3.2" = { name = "markdown-it"; packageName = "markdown-it"; @@ -41186,6 +42905,15 @@ let sha512 = "/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA=="; }; }; + "markdown-it-anchor-8.4.1" = { + name = "markdown-it-anchor"; + packageName = "markdown-it-anchor"; + version = "8.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.4.1.tgz"; + sha512 = "sLODeRetZ/61KkKLJElaU3NuU2z7MhXf12Ml1WJMSdwpngeofneCRF+JBbat8HiSqhniOMuTemXMrsI7hA6XyA=="; + }; + }; "markdown-it-deflist-2.1.0" = { name = "markdown-it-deflist"; packageName = "markdown-it-deflist"; @@ -41249,13 +42977,13 @@ let sha512 = "HyxjAu6BRsdt6Xcv6TKVQnkz/E70TdGXEFHRYBGLncRE9lBFwDNLVtFojKxjJWgJ+5XxUwLaHXy+2sGBbDn+4A=="; }; }; - "markdown-it-multimd-table-4.1.2" = { + "markdown-it-multimd-table-4.1.3" = { name = "markdown-it-multimd-table"; packageName = "markdown-it-multimd-table"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.1.2.tgz"; - sha512 = "xeEYS8l6E1/EinMCvgvWuEcw3ujQX9jRK+RBc6iqqFzVSI9BiVSpfM31D/L0woDfCxrOiJaoEYTLeyTlB/FBgQ=="; + url = "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.1.3.tgz"; + sha512 = "cXvJ+l8dMRmUZLrn34W/8tfLYjC40R7S0wRwcb95emuvQ3uiWNf9vB/IyeRh6XqEq95eXh70+UDNZ29qcOI+Dg=="; }; }; "markdown-it-sub-1.0.0" = { @@ -41294,13 +43022,13 @@ let sha512 = "UB/IbzjWazwTlNAX0pvWNlJS8NKsOQ4syrXZQ/C72j+jirrsjVRT627lCaylrKJFBQWfRsPmIVQie8x38DEhAQ=="; }; }; - "markdown-link-extractor-1.3.1" = { + "markdown-link-extractor-2.0.1" = { name = "markdown-link-extractor"; packageName = "markdown-link-extractor"; - version = "1.3.1"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.3.1.tgz"; - sha512 = "IosNBtHXplzEq2n9WoSi83LNLCWgLnb+8Xq379Ct5xrLLzmqPUtc+A1oqo6Sd32YfKus9uLedFNSwFK1sCzoNQ=="; + url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-2.0.1.tgz"; + sha512 = "Qy5AcoW7CDfIAB3I6cz2QFGHoLQYSH15lmfEqRgPvC/DEEMhb/EK0yeXmpIk+GSuJveYxLvkpXVFEZhgvubxTw=="; }; }; "markdown-serve-0.3.3" = { @@ -41321,15 +43049,6 @@ let sha1 = "890c2c1b3bfe83fb00e4129b8e4cfe645270f9d1"; }; }; - "markdown-table-1.1.3" = { - name = "markdown-table"; - packageName = "markdown-table"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.3.tgz"; - sha512 = "1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q=="; - }; - }; "markdown-table-2.0.0" = { name = "markdown-table"; packageName = "markdown-table"; @@ -41348,15 +43067,6 @@ let sha512 = "y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA=="; }; }; - "markdownlint-0.24.0" = { - name = "markdownlint"; - packageName = "markdownlint"; - version = "0.24.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdownlint/-/markdownlint-0.24.0.tgz"; - sha512 = "OJIGsGFV/rC9irI5E1FMy6v9hdACSwaa+EN3224Y5KG8zj2EYzdHOw0pOJovIYmjNfEZ9BtxUY4P7uYHTSNnbQ=="; - }; - }; "markdownlint-0.25.1" = { name = "markdownlint"; packageName = "markdownlint"; @@ -41375,15 +43085,6 @@ let sha512 = "QEAJitT5eqX1SNboOD+SO/LNBpu4P4je8JlR02ug2cLQAqmIhh8IJnSK7AcaHBHhNADqdGydnPpQOpsNcEEqCw=="; }; }; - "markdownlint-rule-helpers-0.15.0" = { - name = "markdownlint-rule-helpers"; - packageName = "markdownlint-rule-helpers"; - version = "0.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.15.0.tgz"; - sha512 = "A+9mswc3m/kkqpJCqntmte/1VKhDJ+tjZsERLz5L4h/Qr7ht2/BkGkgY5E7/wsxIhcpl+ctIfz+oS3PQrMOB2w=="; - }; - }; "markdownlint-rule-helpers-0.16.0" = { name = "markdownlint-rule-helpers"; packageName = "markdownlint-rule-helpers"; @@ -41402,15 +43103,6 @@ let sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; }; }; - "marked-0.7.0" = { - name = "marked"; - packageName = "marked"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz"; - sha512 = "c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="; - }; - }; "marked-2.1.3" = { name = "marked"; packageName = "marked"; @@ -41420,13 +43112,13 @@ let sha512 = "/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA=="; }; }; - "marked-4.0.10" = { + "marked-4.0.12" = { name = "marked"; packageName = "marked"; - version = "4.0.10"; + version = "4.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz"; - sha512 = "+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw=="; + url = "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz"; + sha512 = "hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ=="; }; }; "marked-terminal-3.3.0" = { @@ -41438,22 +43130,22 @@ let sha512 = "+IUQJ5VlZoAFsM5MHNT7g3RHSkA3eETqhRCdXv4niUMAKHQ7lb1yvAcuGPmm4soxhmtX13u4Li6ZToXtvSEH+A=="; }; }; - "marked-terminal-4.2.0" = { + "marked-terminal-5.1.1" = { name = "marked-terminal"; packageName = "marked-terminal"; - version = "4.2.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.2.0.tgz"; - sha512 = "DQfNRV9svZf0Dm9Cf5x5xaVJ1+XjxQW6XjFJ5HFkVyK52SDpj5PCBzS5X5r2w9nHr3mlB0T5201UMLue9fmhUw=="; + url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-5.1.1.tgz"; + sha512 = "+cKTOx9P4l7HwINYhzbrBSyzgxO2HaHKGZGuB1orZsMIgXYaJyfidT81VXRdpelW/PcHEWxywscePVgI/oUF6g=="; }; }; - "marky-1.2.2" = { + "marky-1.2.4" = { name = "marky"; packageName = "marky"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/marky/-/marky-1.2.2.tgz"; - sha512 = "k1dB2HNeaNyORco8ulVEhctyEGkKHb2YWAhDsxeFlW2nROIirsctBYzKwwS3Vza+sKTS1zO4Z+n9/+9WbGLIxQ=="; + url = "https://registry.npmjs.org/marky/-/marky-1.2.4.tgz"; + sha512 = "zd2/GiSn6U3/jeFVZ0J9CA1LzQ8RfIVvXkb/U0swFHF/zT+dVohTAWjmo2DcIuofmIIIROlwTbd+shSeXmxr0w=="; }; }; "mastodon-api-1.3.0" = { @@ -41519,22 +43211,13 @@ let sha512 = "YQ/teqaOIIfUHedRam08PB3NK7Mjct6BvzRnJmpGDm8uFXpNr1sbY4yuflI5JcEs6COpYA0FpRQhSDBf1tT95g=="; }; }; - "material-design-icons-3.0.1" = { - name = "material-design-icons"; - packageName = "material-design-icons"; - version = "3.0.1"; + "material-design-icons-iconfont-6.1.1" = { + name = "material-design-icons-iconfont"; + packageName = "material-design-icons-iconfont"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz"; - sha1 = "9a71c48747218ebca51e51a66da682038cdcb7bf"; - }; - }; - "material-design-lite-1.3.0" = { - name = "material-design-lite"; - packageName = "material-design-lite"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/material-design-lite/-/material-design-lite-1.3.0.tgz"; - sha1 = "d004ce3fee99a1eeb74a78b8a325134a5f1171d3"; + url = "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-6.1.1.tgz"; + sha512 = "nkoXybeXoofanNagj4tbM6+/LALWpWxYX5ee861to5VQrKgb0/TskTw28Svwn0OGDKajuqK7ShFOsIBxIygGKA=="; }; }; "math-random-1.0.4" = { @@ -41627,15 +43310,6 @@ let sha512 = "/+Cfm8A83PjkqjQDB9iYqHESGuXlriCWAwRGPJjkYmxXrF4r6saxeUlOKNrf+SogTwg9E8uyHRCFHLG6/BAAdA=="; }; }; - "mdast-util-compact-1.0.4" = { - name = "mdast-util-compact"; - packageName = "mdast-util-compact"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.4.tgz"; - sha512 = "3YDMQHI5vRiS2uygEFYaqckibpJtKq5Sj2c8JioeOQBU6INpKbdWzfyLqFFnDwEcEnRFIdMsguzs5pC1Jp4Isg=="; - }; - }; "mdast-util-compact-2.0.1" = { name = "mdast-util-compact"; packageName = "mdast-util-compact"; @@ -41717,13 +43391,13 @@ let sha512 = "NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ=="; }; }; - "mdast-util-gfm-2.0.0" = { + "mdast-util-gfm-2.0.1" = { name = "mdast-util-gfm"; packageName = "mdast-util-gfm"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-2.0.0.tgz"; - sha512 = "wMwejlTN3EQADPFuvxe8lmGsay3+f6gSJKdAHR6KBJzpcxvsjJSILB9K6u6G7eQLC7iOTyVIHYGui9uBc9r1Tg=="; + url = "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-2.0.1.tgz"; + sha512 = "42yHBbfWIFisaAfV1eixlabbsa6q7vHeSPY+cg+BBjX51M8xhgMacqH9g6TftB/9+YkcI0ooV4ncfrJslzm/RQ=="; }; }; "mdast-util-gfm-autolink-literal-0.1.3" = { @@ -41744,13 +43418,13 @@ let sha512 = "FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg=="; }; }; - "mdast-util-gfm-footnote-1.0.0" = { + "mdast-util-gfm-footnote-1.0.1" = { name = "mdast-util-gfm-footnote"; packageName = "mdast-util-gfm-footnote"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.0.tgz"; - sha512 = "qeg9YoS2YYP6OBmMyUFxKXb6BLwAsbGidIxgwDAXHIMYZQhIwe52L9BSJs+zP29Jp5nSERPkmG3tSwAN23/ZbQ=="; + url = "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.1.tgz"; + sha512 = "p+PrYlkw9DeCRkTVw1duWqPRHX6Ywh2BNKJQcZbCwAuP/59B0Lk9kakuAd7KbQprVO4GzdW8eS5++A9PUSqIyw=="; }; }; "mdast-util-gfm-strikethrough-0.2.3" = { @@ -41762,13 +43436,13 @@ let sha512 = "5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA=="; }; }; - "mdast-util-gfm-strikethrough-1.0.0" = { + "mdast-util-gfm-strikethrough-1.0.1" = { name = "mdast-util-gfm-strikethrough"; packageName = "mdast-util-gfm-strikethrough"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.0.tgz"; - sha512 = "gM9ipBUdRxYa6Yq1Hd8Otg6jEn/dRxFZ1F9ZX4QHosHOexLGqNZO2dh0A+YFbUEd10RcKjnjb4jOfJJzoXXUew=="; + url = "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-1.0.1.tgz"; + sha512 = "zKJbEPe+JP6EUv0mZ0tQUyLQOC+FADt0bARldONot/nefuISkaZFlmVK4tU6JgfyZGrky02m/I6PmehgAgZgqg=="; }; }; "mdast-util-gfm-table-0.1.6" = { @@ -41780,13 +43454,13 @@ let sha512 = "j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ=="; }; }; - "mdast-util-gfm-table-1.0.2" = { + "mdast-util-gfm-table-1.0.4" = { name = "mdast-util-gfm-table"; packageName = "mdast-util-gfm-table"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.2.tgz"; - sha512 = "pPekvCTChFBF8uCq8bVyQwar8NBU/TaXIy44jj/UzmjMgPBHIa1B1ge8a0JVgzhqgXQAMvGT+PgiKlicdLGfDQ=="; + url = "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-1.0.4.tgz"; + sha512 = "aEuoPwZyP4iIMkf2cLWXxx3EQ6Bmh2yKy9MVCg4i6Sd3cX80dcLEfXO/V4ul3pGH9czBK4kp+FAl+ZHmSUt9/w=="; }; }; "mdast-util-gfm-task-list-item-0.1.6" = { @@ -41798,13 +43472,13 @@ let sha512 = "/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A=="; }; }; - "mdast-util-gfm-task-list-item-1.0.0" = { + "mdast-util-gfm-task-list-item-1.0.1" = { name = "mdast-util-gfm-task-list-item"; packageName = "mdast-util-gfm-task-list-item"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.0.tgz"; - sha512 = "dwkzOTjQe8JCCHVE3Cb0pLHTYLudf7t9WCAnb20jI8/dW+VHjgWhjtIUVA3oigNkssgjEwX+i+3XesUdCnXGyA=="; + url = "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.1.tgz"; + sha512 = "KZ4KLmPdABXOsfnM6JHUIjxEvcx2ulk656Z/4Balw071/5qgnhz+H1uGtf2zIGnrnvDC8xR4Fj9uKbjAFGNIeA=="; }; }; "mdast-util-heading-style-1.0.6" = { @@ -41825,13 +43499,13 @@ let sha512 = "leKb9uG7laXdyFlTleYV4ZEaCpsxeU1LlkkR/xp35pgKrfV1Y0fNCuOw9vaRc2a9YDpH22wd145Wt7UY5yzeZw=="; }; }; - "mdast-util-mdx-expression-1.1.1" = { + "mdast-util-mdx-expression-1.2.0" = { name = "mdast-util-mdx-expression"; packageName = "mdast-util-mdx-expression"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.1.1.tgz"; - sha512 = "RDLRkBFmBKCJl6/fQdxxKL2BqNtoPFoNBmQAlj5ZNKOijIWRKjdhPkeufsUOaexLj+78mhJc+L7d1MYka8/LdQ=="; + url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.2.0.tgz"; + sha512 = "wb36oi09XxqO9RVqgfD+xo8a7xaNgS+01+k3v0GKW0X0bYbeBmUZz22Z/IJ8SuphVlG+DNgNo9VoEaUJ3PKfJQ=="; }; }; "mdast-util-mdx-jsx-1.2.0" = { @@ -41843,13 +43517,13 @@ let sha512 = "5+ot/kfxYd3ChgEMwsMUO71oAfYjyRI3pADEK4I7xTmWLGQ8Y7ghm1CG36zUoUvDPxMlIYwQV/9DYHAUWdG4dA=="; }; }; - "mdast-util-mdxjs-esm-1.1.1" = { + "mdast-util-mdxjs-esm-1.2.0" = { name = "mdast-util-mdxjs-esm"; packageName = "mdast-util-mdxjs-esm"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.1.1.tgz"; - sha512 = "IpHNNMubCt6ue2FIQasx1ByvETglnqc7A3XvIc0Yyql1hNI73SEGa044dZG6jeJQE8boBdTn8nxs3DjQLvVN1w=="; + url = "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.2.0.tgz"; + sha512 = "IPpX9GBzAIbIRCjbyeLDpMhACFb0wxTIujuR3YElB8LWbducUdMgRJuqs/Vg8xQ1bIAMm7lw8L+YNtua0xKXRw=="; }; }; "mdast-util-to-markdown-0.6.5" = { @@ -41861,13 +43535,13 @@ let sha512 = "XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ=="; }; }; - "mdast-util-to-markdown-1.2.6" = { + "mdast-util-to-markdown-1.3.0" = { name = "mdast-util-to-markdown"; packageName = "mdast-util-to-markdown"; - version = "1.2.6"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.2.6.tgz"; - sha512 = "doJZmTEGagHypWvJ8ltinmwUsT9ZaNgNIQW6Gl7jNdsI1QZkTHTimYW561Niy2s8AEPAqEgV0dIh2UOVlSXUJA=="; + url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-1.3.0.tgz"; + sha512 = "6tUSs4r+KK4JGTTiQ7FfHmVOaDrLQJPmpjD6wPMlHGUVXoG9Vjc3jIeP+uyBWRf8clwB2blM+W7+KrlMYQnftA=="; }; }; "mdast-util-to-nlcst-4.0.1" = { @@ -42176,13 +43850,13 @@ let sha512 = "qVQ/CjkMyMInPaaRMrwWNDvf6boRZXaT/DbQeMYcCWuXPEBf1v8qChOc9OlEVQp2uOvRXa1Qu30fLmKhY6NipA=="; }; }; - "memorystore-1.6.6" = { + "memorystore-1.6.7" = { name = "memorystore"; packageName = "memorystore"; - version = "1.6.6"; + version = "1.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.6.tgz"; - sha512 = "EbLl1xg9+DlnjXkZK/eMUoWyhZ1IxcWMpSuFyqyA/Z4BNuH7BR+E0yC40WbLZZ6G8LxHiUZ2DPhqV8DR8+9UQQ=="; + url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.7.tgz"; + sha512 = "OZnmNY/NDrKohPQ+hxp0muBcBKrzKNtHr55DbqSx9hLsYVNnomSAMRAtI7R64t3gf3ID7tHQA7mG4oL3Hu9hdw=="; }; }; "memorystream-0.3.1" = { @@ -42212,15 +43886,6 @@ let sha1 = "72cb668b425228290abbfa856892587308a801fb"; }; }; - "meow-4.0.1" = { - name = "meow"; - packageName = "meow"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz"; - sha512 = "xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A=="; - }; - }; "meow-5.0.0" = { name = "meow"; packageName = "meow"; @@ -42230,15 +43895,6 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; - "meow-6.1.1" = { - name = "meow"; - packageName = "meow"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-6.1.1.tgz"; - sha512 = "3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg=="; - }; - }; "meow-7.1.1" = { name = "meow"; packageName = "meow"; @@ -42266,15 +43922,6 @@ let sha512 = "+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ=="; }; }; - "merge-1.2.1" = { - name = "merge"; - packageName = "merge"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz"; - sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="; - }; - }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -42302,6 +43949,15 @@ let sha1 = "a5de46538dae84d4114cc5ea02b4772a6346701f"; }; }; + "merge-source-map-1.1.0" = { + name = "merge-source-map"; + packageName = "merge-source-map"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz"; + sha512 = "Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw=="; + }; + }; "merge-stream-2.0.0" = { name = "merge-stream"; packageName = "merge-stream"; @@ -42347,13 +44003,13 @@ let sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw=="; }; }; - "mermaid-8.13.10" = { + "mermaid-8.14.0" = { name = "mermaid"; packageName = "mermaid"; - version = "8.13.10"; + version = "8.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.13.10.tgz"; - sha512 = "2ANep359uML87+wiYaWSu83eg9Qc0xCLnNJdCh100m4v0orS3fp8SScsZLcDSElRGHi+1zuVJsEEVEWH05+COQ=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.14.0.tgz"; + sha512 = "ITSHjwVaby1Li738sxhF48sLTxcNyUAoWfoqyztL1f7J6JOLpHOuQPNLBb6lxGPUA0u7xP9IRULgvod0dKu35A=="; }; }; "meros-1.1.4" = { @@ -42365,6 +44021,15 @@ let sha512 = "E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ=="; }; }; + "meros-1.2.0" = { + name = "meros"; + packageName = "meros"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meros/-/meros-1.2.0.tgz"; + sha512 = "3QRZIS707pZQnijHdhbttXRWwrHhZJ/gzolneoxKVz9N/xmsvY/7Ls8lpnI9gxbgxjcHsAVEW3mgwiZCo6kkJQ=="; + }; + }; "metals-languageclient-0.4.2" = { name = "metals-languageclient"; packageName = "metals-languageclient"; @@ -42374,13 +44039,13 @@ let sha512 = "AY9lGmUznFNsLr7Vm3hLCT7Ar0bN6Wninp3qA0E0/JBU4uRTRI4fIgM1I3+nbjLf23mwh+vrHut0ML63QB2acA=="; }; }; - "metalsmith-2.3.0" = { + "metalsmith-2.4.2" = { name = "metalsmith"; packageName = "metalsmith"; - version = "2.3.0"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/metalsmith/-/metalsmith-2.3.0.tgz"; - sha1 = "833afbb5a2a6385e2d9ae3d935e39e33eaea5231"; + url = "https://registry.npmjs.org/metalsmith/-/metalsmith-2.4.2.tgz"; + sha512 = "HS/MRADloJS3+O5V/+4f/khBkwtdYUQFWEGqeviLT/7wNgHWknMiIflV99JeYzj0hbw+L0aTb2spPlnWW4/Adg=="; }; }; "method-missing-1.2.4" = { @@ -42545,13 +44210,13 @@ let sha512 = "i3dmvU0htawfWED8aHMMAzAVp/F0Z+0bPh3YrbTPPL1v4YAlCZpy5rBO5p0LPYiZo0zFVkoYh7vDU7yQSiCMjg=="; }; }; - "micromark-extension-gfm-footnote-1.0.3" = { + "micromark-extension-gfm-footnote-1.0.4" = { name = "micromark-extension-gfm-footnote"; packageName = "micromark-extension-gfm-footnote"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-1.0.3.tgz"; - sha512 = "bn62pC5y39rIo2g1RqZk1NhF7T7cJLuJlbevunQz41U0iPVCdVOFASe5/L1kke+DFKSgfCRhv24+o42cZ1+ADw=="; + url = "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-1.0.4.tgz"; + sha512 = "E/fmPmDqLiMUP8mLJ8NbJWJ4bTw6tS+FEQS8CcuDtZpILuOb2kjLqPEeAePF1djXROHXChM/wPJw0iS4kHCcIg=="; }; }; "micromark-extension-gfm-strikethrough-0.6.5" = { @@ -42635,13 +44300,13 @@ let sha512 = "TjYtjEMszWze51NJCZmhv7MEBcgYRgb3tJeMAJ+HQCAaZHHRBaDCccqQzGizR/H4ODefP44wRTgOn2vE5I6nZA=="; }; }; - "micromark-extension-mdx-jsx-1.0.2" = { + "micromark-extension-mdx-jsx-1.0.3" = { name = "micromark-extension-mdx-jsx"; packageName = "micromark-extension-mdx-jsx"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-1.0.2.tgz"; - sha512 = "MBppeDuXEBIL1uo4B/bL5eJ1q3m5pXzdzIWpOnJuzzBZF+S+9zbb5WnS2K/LEVQeoyiLzOuoteU4SFPuGJhhWw=="; + url = "https://registry.npmjs.org/micromark-extension-mdx-jsx/-/micromark-extension-mdx-jsx-1.0.3.tgz"; + sha512 = "VfA369RdqUISF0qGgv2FfV7gGjHDfn9+Qfiv5hEwpyr1xscRj/CiVRkU7rywGFCO7JwJ5L0e7CJz60lY52+qOA=="; }; }; "micromark-extension-mdx-md-1.0.0" = { @@ -42689,13 +44354,13 @@ let sha512 = "CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg=="; }; }; - "micromark-factory-mdx-expression-1.0.5" = { + "micromark-factory-mdx-expression-1.0.6" = { name = "micromark-factory-mdx-expression"; packageName = "micromark-factory-mdx-expression"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.5.tgz"; - sha512 = "1DSMCBeCUj4m01P8uYbNWvOsv+FtpDTcBUcDCdE06sENTBX54lndRs9neWOgsNWfLDm2EzCyNKiUaoJ+mWa/WA=="; + url = "https://registry.npmjs.org/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.6.tgz"; + sha512 = "WRQIc78FV7KrCfjsEf/sETopbYjElh3xAmNpLkd1ODPqxEngP42eVRGbiPEQWpRV27LzqW+XVTvQAMIIRLPnNA=="; }; }; "micromark-factory-space-1.0.0" = { @@ -42887,6 +44552,15 @@ let sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; }; }; + "micromatch-4.0.5" = { + name = "micromatch"; + packageName = "micromatch"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"; + sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; + }; + }; "micromist-1.1.0" = { name = "micromist"; packageName = "micromist"; @@ -42968,15 +44642,6 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-2.5.2" = { - name = "mime"; - packageName = "mime"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz"; - sha512 = "tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="; - }; - }; "mime-2.6.0" = { name = "mime"; packageName = "mime"; @@ -43013,6 +44678,15 @@ let sha512 = "jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="; }; }; + "mime-db-1.42.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.42.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz"; + sha512 = "UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="; + }; + }; "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; @@ -43031,13 +44705,13 @@ let sha512 = "9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A=="; }; }; - "mime-db-1.51.0" = { + "mime-db-1.52.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.51.0"; + version = "1.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; - sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; }; }; "mime-types-2.1.18" = { @@ -43058,6 +44732,15 @@ let sha512 = "WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ=="; }; }; + "mime-types-2.1.25" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.25"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz"; + sha512 = "5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg=="; + }; + }; "mime-types-2.1.27" = { name = "mime-types"; packageName = "mime-types"; @@ -43076,13 +44759,13 @@ let sha512 = "plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g=="; }; }; - "mime-types-2.1.34" = { + "mime-types-2.1.35" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.34"; + version = "2.1.35"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; - sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; + sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; }; }; "mimer-2.0.2" = { @@ -43175,6 +44858,24 @@ let sha512 = "IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw=="; }; }; + "mini-css-extract-plugin-0.9.0" = { + name = "mini-css-extract-plugin"; + packageName = "mini-css-extract-plugin"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz"; + sha512 = "lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A=="; + }; + }; + "mini-svg-data-uri-1.4.4" = { + name = "mini-svg-data-uri"; + packageName = "mini-svg-data-uri"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz"; + sha512 = "r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg=="; + }; + }; "minicap-prebuilt-2.3.0" = { name = "minicap-prebuilt"; packageName = "minicap-prebuilt"; @@ -43229,6 +44930,42 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; + "minimatch-3.0.8" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz"; + sha512 = "6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q=="; + }; + }; + "minimatch-3.1.2" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; + }; + }; + "minimatch-4.2.1" = { + name = "minimatch"; + packageName = "minimatch"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz"; + sha512 = "9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g=="; + }; + }; + "minimatch-5.0.1" = { + name = "minimatch"; + packageName = "minimatch"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz"; + sha512 = "nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g=="; + }; + }; "minimist-0.0.10" = { name = "minimist"; packageName = "minimist"; @@ -43247,15 +44984,6 @@ let sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; }; }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; "minimist-1.2.3" = { name = "minimist"; packageName = "minimist"; @@ -43274,6 +45002,15 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; + "minimist-1.2.6" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"; + sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; + }; + }; "minimist-options-3.0.2" = { name = "minimist-options"; packageName = "minimist-options"; @@ -43346,6 +45083,15 @@ let sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; }; }; + "minipass-fetch-2.1.0" = { + name = "minipass-fetch"; + packageName = "minipass-fetch"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.0.tgz"; + sha512 = "H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg=="; + }; + }; "minipass-flush-1.0.5" = { name = "minipass-flush"; packageName = "minipass-flush"; @@ -43409,13 +45155,13 @@ let sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; }; - "mirakurun-3.3.1" = { + "mirakurun-3.9.0-beta.26" = { name = "mirakurun"; packageName = "mirakurun"; - version = "3.3.1"; + version = "3.9.0-beta.26"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.3.1.tgz"; - sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.9.0-beta.26.tgz"; + sha512 = "w1yetqCebn8G4RRBnPEWLiVeLCOL1r/6t6E/81REOjF27yasxOo8duydpzd2aYWHsMDNr/+yc0xqlRdA64X6Tw=="; }; }; "mired-0.0.0" = { @@ -43454,15 +45200,6 @@ let sha1 = "53d500266cbd09cda9d94c4cf392e60589b5b324"; }; }; - "mithril-2.0.4" = { - name = "mithril"; - packageName = "mithril"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mithril/-/mithril-2.0.4.tgz"; - sha512 = "mgw+DMZlhMS4PpprF6dl7ZoeZq5GGcAuWnrg5e12MvaGauc4jzWsDZtVGRCktsiQczOEUr2K5teKbE5k44RlOg=="; - }; - }; "mitt-1.2.0" = { name = "mitt"; packageName = "mitt"; @@ -43481,6 +45218,15 @@ let sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; }; }; + "mixpanel-0.13.0" = { + name = "mixpanel"; + packageName = "mixpanel"; + version = "0.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mixpanel/-/mixpanel-0.13.0.tgz"; + sha512 = "YOWmpr/o4+zJ8LPjuLUkWLc2ImFeIkX6hF1t62Wlvq6loC6e8EK8qieYO4gYPTPxxtjAryl7xmIvf/7qnPwjrQ=="; + }; + }; "mkdirp-0.3.0" = { name = "mkdirp"; packageName = "mkdirp"; @@ -43508,13 +45254,13 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; - "mkdirp-0.5.5" = { + "mkdirp-0.5.6" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; }; }; "mkdirp-1.0.4" = { @@ -43544,31 +45290,31 @@ let sha512 = "sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw=="; }; }; - "mobx-6.3.13" = { + "mobx-6.5.0" = { name = "mobx"; packageName = "mobx"; - version = "6.3.13"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.3.13.tgz"; - sha512 = "zDDKDhYUk9QCHQUdLG+wb4Jv/nXutSLt/P8kkwHyjdbrJO4OZS6QTEsrOnrKM39puqXSrJZHdB6+yRys2NBFFA=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.5.0.tgz"; + sha512 = "pHZ/cySF00FVENDWIDzJyoObFahK6Eg4d0papqm6d7yMkxWTZ/S/csqJX1A3PsYy4t5k3z2QnlwuCfMW5lSEwA=="; }; }; - "mobx-react-7.2.1" = { + "mobx-react-7.3.0" = { name = "mobx-react"; packageName = "mobx-react"; - version = "7.2.1"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.2.1.tgz"; - sha512 = "LZS99KFLn75VWDXPdRJhILzVQ7qLcRjQbzkK+wVs0Qg4kWw5hOI2USp7tmu+9zP9KYsVBmKyx2k/8cTTBfsymw=="; + url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.3.0.tgz"; + sha512 = "RGEcwZokopqyJE5JPwXKB9FWMSqFM9NJVO2QPI+z6laJTJeBHqvPicjnKgY5mvihxTeXB1+72TnooqUePeGV1g=="; }; }; - "mobx-react-lite-3.2.3" = { + "mobx-react-lite-3.3.0" = { name = "mobx-react-lite"; packageName = "mobx-react-lite"; - version = "3.2.3"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.2.3.tgz"; - sha512 = "7exWp1FV0M9dP08H9PIeHlJqDw4IdkQVRMfLYaZFMmlbzSS6ZU6p/kx392KN+rVf81hH3IQYewvRGQ70oiwmbw=="; + url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-3.3.0.tgz"; + sha512 = "U/kMSFtV/bNVgY01FuiGWpRkaQVHozBq5CEBZltFvPt4FcV111hEWkgwqVg9GPPZSEuEdV438PEz8mk8mKpYlA=="; }; }; "mocha-2.5.3" = { @@ -43589,15 +45335,6 @@ let sha512 = "hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ=="; }; }; - "mocha-9.1.4" = { - name = "mocha"; - packageName = "mocha"; - version = "9.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.1.4.tgz"; - sha512 = "+q2aV5VlJZuLgCWoBvGI5zEwPF9eEI0kr/sAA9Jm4xMND7RfIEyF8JE7C0JIg8WXRG+P1sdIAb5ccoHPlXLzcw=="; - }; - }; "mock-require-3.0.3" = { name = "mock-require"; packageName = "mock-require"; @@ -43697,6 +45434,24 @@ let sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg=="; }; }; + "mongodb-4.4.1" = { + name = "mongodb"; + packageName = "mongodb"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.4.1.tgz"; + sha512 = "IAD3nFtCR4s22vi5qjqkCBnuyDDrOW8WVSSmgHquOvGaP1iTD+XpC5tr8wAUbZ2EeZkaswwBKQFHDvl4qYcKqQ=="; + }; + }; + "mongodb-connection-string-url-2.5.2" = { + name = "mongodb-connection-string-url"; + packageName = "mongodb-connection-string-url"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.2.tgz"; + sha512 = "tWDyIG8cQlI5k3skB6ywaEA5F9f5OntrKKsT/Lteub2zgwSUlhqEN2inGgBTm8bpYJf8QYBdA/5naz65XDpczA=="; + }; + }; "moniker-0.1.2" = { name = "moniker"; packageName = "moniker"; @@ -43814,13 +45569,22 @@ let sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw=="; }; }; - "mqtt-4.3.4" = { + "mpegts.js-1.6.10" = { + name = "mpegts.js"; + packageName = "mpegts.js"; + version = "1.6.10"; + src = fetchurl { + url = "https://registry.npmjs.org/mpegts.js/-/mpegts.js-1.6.10.tgz"; + sha512 = "ZgX4b93cWk+EazOFRV4lekLqmc4rV7P+WMisG8N0F2M4/EiluPMNNWjuaurQfitak++AIc/ZVQ3IgM3cBcH7WA=="; + }; + }; + "mqtt-4.3.5" = { name = "mqtt"; packageName = "mqtt"; - version = "4.3.4"; + version = "4.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.4.tgz"; - sha512 = "yAVDfVHz3Cjn6K68z54mf7fTni/AWsPhiEsRwZSvet2wO47R6NFUn2psWxYIph2JxWtL3ZKa/da8pjJKSaXPdQ=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.5.tgz"; + sha512 = "l29WGHAc0EayK1cjb6moozc+rlgK6YRCPbP3zB1CrJw84Bjk4kG9EJCXojdn4r29lA80SCqxRKq1QJ87+Xevng=="; }; }; "mqtt-packet-6.10.0" = { @@ -43931,13 +45695,22 @@ let sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg=="; }; }; - "multer-1.4.2" = { - name = "multer"; - packageName = "multer"; - version = "1.4.2"; + "msgpackr-1.5.5" = { + name = "msgpackr"; + packageName = "msgpackr"; + version = "1.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/multer/-/multer-1.4.2.tgz"; - sha512 = "xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.5.5.tgz"; + sha512 = "JG0V47xRIQ9pyUnx6Hb4+3TrQoia2nA3UIdmyTldhxaxtKFkekkKpUW/N6fwHwod9o4BGuJGtouxOk+yCP5PEA=="; + }; + }; + "msgpackr-extract-1.0.16" = { + name = "msgpackr-extract"; + packageName = "msgpackr-extract"; + version = "1.0.16"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.0.16.tgz"; + sha512 = "fxdRfQUxPrL/TizyfYfMn09dK58e+d65bRD/fcaVH4052vj30QOzzqxcQIS7B0NsqlypEQ/6Du3QmP2DhWFfCA=="; }; }; "multer-1.4.3" = { @@ -43976,22 +45749,22 @@ let sha1 = "6462f1b204109ccc644601650110a828443d66e2"; }; }; - "multiblob-1.13.7" = { + "multiblob-1.13.8" = { name = "multiblob"; packageName = "multiblob"; - version = "1.13.7"; + version = "1.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.7.tgz"; - sha512 = "+vZLrxhuAJFOl9EFUkFviYpz8nIOdoM3Hzq8Mzx0uJkaRWd61QxIp68wglTM8ZtABXYgE0YowD98XqthCRxSow=="; + url = "https://registry.npmjs.org/multiblob/-/multiblob-1.13.8.tgz"; + sha512 = "YXNUflHc7I7iUiLctHMTvwDQOjMbCv+Pdbf+1lScFOsjP/CSZgwblRknPntcD+KEPGFudXPBtJR10TIrun3zmQ=="; }; }; - "multiblob-http-1.2.0" = { + "multiblob-http-1.2.1" = { name = "multiblob-http"; packageName = "multiblob-http"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/multiblob-http/-/multiblob-http-1.2.0.tgz"; - sha512 = "bTW9D4NcgvWO/vFXakTUV5JN7p2fTG0o4Flg2zZFF44fDBUnq4FkZKbFNnkci+zkdfYAo9HqZPxvnMwS58mtjQ=="; + url = "https://registry.npmjs.org/multiblob-http/-/multiblob-http-1.2.1.tgz"; + sha512 = "ZNgfHZkC1A1xec7aUE7Tq6ArIXE7pygzbf3jNX1wlK15STqenGGURrqM79puk3j2cscC9Keu/ULQM3dET3xLCQ=="; }; }; "multicast-dns-4.0.1" = { @@ -44084,13 +45857,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "multiserver-3.7.2" = { + "multiserver-3.8.2" = { name = "multiserver"; packageName = "multiserver"; - version = "3.7.2"; + version = "3.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver/-/multiserver-3.7.2.tgz"; - sha512 = "RaRSN/g1QOujNkFtmLU52PCjjqUdhad7FO/aZRRTzWkpJuclk0jfWtvew9jKp0mNqC6RhriEm0U1L1qYiymF8Q=="; + url = "https://registry.npmjs.org/multiserver/-/multiserver-3.8.2.tgz"; + sha512 = "gmR/5dY+N81EN0yDaziSJXAJhJjG+3Rv3lJc74OSA1ySRKOMqZwEuGJjqG6ZcZiaqcHvhQZkZavDJsAwtmnvoA=="; }; }; "multiserver-address-1.0.1" = { @@ -44102,13 +45875,13 @@ let sha512 = "IfZMAGs9onCLkYNSnNBri3JxuvhQYllMyh3W9ry86iEDcfW9uPVsHTHDsjDxQtL+dPq3byshmA+Y4LN2wLHwNw=="; }; }; - "multiserver-scopes-1.0.0" = { + "multiserver-scopes-2.0.0" = { name = "multiserver-scopes"; packageName = "multiserver-scopes"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver-scopes/-/multiserver-scopes-1.0.0.tgz"; - sha512 = "D3q4IujGRUIKETfR5s0kRtvXTjAMhyl7rtLEMXtvkg0lJPJyS5KYsAULFFy+dYv/+RC642aR1zo/RKNp6sdtQg=="; + url = "https://registry.npmjs.org/multiserver-scopes/-/multiserver-scopes-2.0.0.tgz"; + sha512 = "XWv9J617i3mWtZIZQNTpYI9iq4goUpsKy3GdUEDls23z1VaMzuRp2rL3S3IKrheVdgmrf0zHbErcXokGxqQfzw=="; }; }; "multistream-4.1.0" = { @@ -44120,15 +45893,6 @@ let sha512 = "J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw=="; }; }; - "munin-plugin-0.0.9" = { - name = "munin-plugin"; - packageName = "munin-plugin"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/munin-plugin/-/munin-plugin-0.0.9.tgz"; - sha1 = "ca17e1eafb3b9155b5e4c21062210e348a9dbe91"; - }; - }; "murmurhash-js-1.0.0" = { name = "murmurhash-js"; packageName = "murmurhash-js"; @@ -44237,13 +46001,13 @@ let sha512 = "pbYSsOrSB/AKN5h/WzzLRMFgZhClWccf2XIB4RSMC8JbquiB0e0/SH5AIfdQMdyHmYtv4seU7yV/TvAwPLJ1Yg=="; }; }; - "muxrpc-6.5.4" = { + "muxrpc-6.7.2" = { name = "muxrpc"; packageName = "muxrpc"; - version = "6.5.4"; + version = "6.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.5.4.tgz"; - sha512 = "puQFQi0qxZIUvvaikpwOuGnxM7smTwjnSu9lf0WVmfsXMFE8F355jBhsZQ29KuSaogZq3HA4IRbk15Uvuypc/g=="; + url = "https://registry.npmjs.org/muxrpc/-/muxrpc-6.7.2.tgz"; + sha512 = "tmaQl2h6OB4ofvOex/DQpKOiMOktnRAe9bvBmYCd9BnE3QmwOSpZey2n7P5gWlKDTRgjunJZiISlGOKIOXbHZg=="; }; }; "muxrpc-usage-2.1.0" = { @@ -44435,22 +46199,13 @@ let sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; }; }; - "nanoid-3.1.25" = { + "nanoid-3.3.1" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.25"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz"; - sha512 = "rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="; - }; - }; - "nanoid-3.2.0" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz"; - sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz"; + sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="; }; }; "nanoiterator-1.2.1" = { @@ -44588,13 +46343,13 @@ let sha512 = "p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q=="; }; }; - "ncjsm-4.2.0" = { + "ncjsm-4.3.0" = { name = "ncjsm"; packageName = "ncjsm"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ncjsm/-/ncjsm-4.2.0.tgz"; - sha512 = "L2Qij4PTy7Bs4TB24zs7FLIAYJTaR5JPvSig5hIcO059LnMCNgy6MfHHNyg8s/aekPKrTqKX90gBGt3NNGvhdw=="; + url = "https://registry.npmjs.org/ncjsm/-/ncjsm-4.3.0.tgz"; + sha512 = "oah6YGwb4Ern2alojiMFcjPhE4wvQBw1Ur/kUr2P0ovKdzaF5pCIsGjs0f2y+iZeej0/5Y6OOhQ8j30cTDMEGw=="; }; }; "nconf-0.10.0" = { @@ -44669,6 +46424,42 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; + "near-api-js-0.44.2" = { + name = "near-api-js"; + packageName = "near-api-js"; + version = "0.44.2"; + src = fetchurl { + url = "https://registry.npmjs.org/near-api-js/-/near-api-js-0.44.2.tgz"; + sha512 = "eMnc4V+geggapEUa3nU2p8HSHn/njtloI4P2mceHQWO8vDE1NGpnAw8FuTBrLmXSgIv9m6oocgFc9t3VNf5zwg=="; + }; + }; + "near-hd-key-1.2.1" = { + name = "near-hd-key"; + packageName = "near-hd-key"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/near-hd-key/-/near-hd-key-1.2.1.tgz"; + sha512 = "SIrthcL5Wc0sps+2e1xGj3zceEa68TgNZDLuCx0daxmfTP7sFTB3/mtE2pYhlFsCxWoMn+JfID5E1NlzvvbRJg=="; + }; + }; + "near-ledger-js-0.2.1" = { + name = "near-ledger-js"; + packageName = "near-ledger-js"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/near-ledger-js/-/near-ledger-js-0.2.1.tgz"; + sha512 = "8anZb6e96gJNBOKUR/HReLN/x8BmBhCpyPq+XxFbx8jxmsRz+M1Hxq085+ROYaMI2EDJqatrjjLAdArk13BOhA=="; + }; + }; + "near-seed-phrase-0.2.0" = { + name = "near-seed-phrase"; + packageName = "near-seed-phrase"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/near-seed-phrase/-/near-seed-phrase-0.2.0.tgz"; + sha512 = "NpmrnejpY1AdlRpDZ0schJQJtfBaoUheRfiYtQpcq9TkwPgqKZCRULV5L3hHmLc0ep7KRtikbPQ9R2ztN/3cyQ=="; + }; + }; "nearley-2.20.1" = { name = "nearley"; packageName = "nearley"; @@ -44678,15 +46469,6 @@ let sha512 = "+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ=="; }; }; - "neat-csv-2.1.0" = { - name = "neat-csv"; - packageName = "neat-csv"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/neat-csv/-/neat-csv-2.1.0.tgz"; - sha1 = "06f58360c4c3b955bd467ddc85ae4511a3907a4c"; - }; - }; "neat-input-1.11.1" = { name = "neat-input"; packageName = "neat-input"; @@ -44777,13 +46559,13 @@ let sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }; }; - "negotiator-0.6.2" = { + "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; }; }; "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = { @@ -44796,13 +46578,13 @@ let sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; - "nel-1.2.0" = { + "nel-1.3.0" = { name = "nel"; packageName = "nel"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/nel/-/nel-1.2.0.tgz"; - sha512 = "yt96hdYomrZC5ZvYHMCsRF5KIaZ8Aue5Gff4sH+6GmPDMJft097x5JG1DicLnfgSYE56CLP6ztZEfb+3St91Yw=="; + url = "https://registry.npmjs.org/nel/-/nel-1.3.0.tgz"; + sha512 = "LvnlJC5lg6MRazqzfRtIMvLmtOhCm9z/dkdVaHuCxQHLmD7NzLsExnqv7VMuRfL4tC0mXcLlnFsh9SF0PdIjSw=="; }; }; "neo-async-2.6.2" = { @@ -44940,15 +46722,6 @@ let sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; }; }; - "next-tick-1.0.0" = { - name = "next-tick"; - packageName = "next-tick"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; - sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; - }; - }; "next-tick-1.1.0" = { name = "next-tick"; packageName = "next-tick"; @@ -45102,13 +46875,13 @@ let sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; }; }; - "node-abi-3.5.0" = { + "node-abi-3.8.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.5.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.5.0.tgz"; - sha512 = "LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.8.0.tgz"; + sha512 = "tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw=="; }; }; "node-abort-controller-3.0.1" = { @@ -45174,13 +46947,13 @@ let sha512 = "KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g=="; }; }; - "node-appc-1.1.3" = { + "node-appc-1.1.4" = { name = "node-appc"; packageName = "node-appc"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-1.1.3.tgz"; - sha512 = "6+c04W1cvCaWG3XVi9oJsXSjR8wWG+UyQCDR/wVGeAx6ES5mC1uQnouCy1kycZ+Lc40Ba3x49ou6cKsrsMFhsA=="; + url = "https://registry.npmjs.org/node-appc/-/node-appc-1.1.4.tgz"; + sha512 = "WX8vG0nja5tusSkFTgcuL2gWWug8QCFRHi8AuGoc3714whDDDCMGFcSW0pI7BltBPSdyTCffcwaee7pibzBPVw=="; }; }; "node-bindgen-loader-1.0.1" = { @@ -45273,15 +47046,6 @@ let sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; }; }; - "node-fetch-1.6.3" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "1.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz"; - sha1 = "dc234edd6489982d58e8f0db4f695029abcd8c04"; - }; - }; "node-fetch-1.7.3" = { name = "node-fetch"; packageName = "node-fetch"; @@ -45309,15 +47073,6 @@ let sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; }; }; - "node-fetch-2.6.5" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz"; - sha512 = "mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ=="; - }; - }; "node-fetch-2.6.7" = { name = "node-fetch"; packageName = "node-fetch"; @@ -45327,6 +47082,15 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; + "node-fetch-3.2.3" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.3.tgz"; + sha512 = "AXP18u4pidSZ1xYXRDPY/8jdv3RAozIt/WLNR/MBGZAz+xjtlr90RvCnsvHQRiXyWliZF/CpytExp32UU67/SA=="; + }; + }; "node-fetch-h2-2.3.0" = { name = "node-fetch-h2"; packageName = "node-fetch-h2"; @@ -45372,13 +47136,13 @@ let sha512 = "G6RlQt5Sb4GMBzXvhfkeFmbqR6MzhtnT7VTHuLadjkii3rdYHNdw0m8zA4BTxVIh68FicCQ2NSUANpsqkr9jvQ=="; }; }; - "node-forge-1.2.1" = { + "node-forge-1.3.0" = { name = "node-forge"; packageName = "node-forge"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz"; - sha512 = "Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w=="; + url = "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz"; + sha512 = "08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA=="; }; }; "node-gyp-3.8.0" = { @@ -45417,6 +47181,15 @@ let sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; }; }; + "node-gyp-9.0.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.0.0.tgz"; + sha512 = "Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw=="; + }; + }; "node-gyp-build-4.1.1" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -45435,6 +47208,15 @@ let sha512 = "iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q=="; }; }; + "node-hid-2.1.1" = { + name = "node-hid"; + packageName = "node-hid"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-hid/-/node-hid-2.1.1.tgz"; + sha512 = "Skzhqow7hyLZU93eIPthM9yjot9lszg9xrKxESleEs05V2NcbUptZc5HFqzjOkSmL0sFlZFr3kmvaYebx06wrw=="; + }; + }; "node-html-parser-1.4.9" = { name = "node-html-parser"; packageName = "node-html-parser"; @@ -45453,15 +47235,6 @@ let sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; }; }; - "node-ipc-9.2.1" = { - name = "node-ipc"; - packageName = "node-ipc"; - version = "9.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-ipc/-/node-ipc-9.2.1.tgz"; - sha512 = "mJzaM6O3xHf9VT8BULvJSbdVbmHUKRNOH7zDDkCrA1/T+CVjq2WVIDfLt0azZRXpgArJtl3rtmEozrbXPZ9GaQ=="; - }; - }; "node-libs-browser-2.2.1" = { name = "node-libs-browser"; packageName = "node-libs-browser"; @@ -45471,13 +47244,13 @@ let sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; }; }; - "node-localstorage-1.3.1" = { - name = "node-localstorage"; - packageName = "node-localstorage"; - version = "1.3.1"; + "node-notifier-10.0.1" = { + name = "node-notifier"; + packageName = "node-notifier"; + version = "10.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-localstorage/-/node-localstorage-1.3.1.tgz"; - sha512 = "NMWCSWWc6JbHT5PyWlNT2i8r7PgGYXVntmKawY83k/M0UJScZ5jirb61TLnqKwd815DfBQu+lR3sRw08SPzIaQ=="; + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-10.0.1.tgz"; + sha512 = "YX7TSyDukOZ0g+gmzjB6abKu+hTGvO8+8+gIFDsRCU2t8fLV/P2unmt+LGFaIa4y64aX98Qksa97rgz4vMNeLQ=="; }; }; "node-notifier-8.0.2" = { @@ -45498,15 +47271,6 @@ let sha512 = "SkwNwGnMMlSPrcoeH4CSo9XyWe72acAHEJGDdPdB+CyBVHsIYaTQ4U/1wk3URsyzC75xZLg2vzU2YaALlqDF1Q=="; }; }; - "node-notifier-9.0.1" = { - name = "node-notifier"; - packageName = "node-notifier"; - version = "9.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-9.0.1.tgz"; - sha512 = "fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg=="; - }; - }; "node-object-hash-2.3.10" = { name = "node-object-hash"; packageName = "node-object-hash"; @@ -45561,13 +47325,22 @@ let sha1 = "dbbd4af12134e2e635c245ef93ffcf6f60673a5d"; }; }; - "node-red-admin-2.2.1" = { + "node-red-admin-2.2.3" = { name = "node-red-admin"; packageName = "node-red-admin"; - version = "2.2.1"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-2.2.1.tgz"; - sha512 = "xYp6mZaRbAWLR8nO4HRVvthYZoPGBotPvetAGho4AXpRJW7fXw38XwK0KPSffvLSis6cxaskJq9nZBLp3PJtng=="; + url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-2.2.3.tgz"; + sha512 = "qKmnjR+TXJLk/aMUIW/x6I9P28b5BhlkvjNi1iZgfuVtI6wxRNpzpSUPtcOHvQTYxKdK6d5XGZdM6FD1Xy4nAg=="; + }; + }; + "node-redis-pubsub-5.0.0" = { + name = "node-redis-pubsub"; + packageName = "node-redis-pubsub"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-redis-pubsub/-/node-redis-pubsub-5.0.0.tgz"; + sha512 = "SBDgfC2QwKLDYbUYNE/jDQxOU1Vg0NDf4fVNQZWnd/tXEhn/N1wY3SxaEXmHWPXhB2nqwZD5fH08SE2g07oMIA=="; }; }; "node-releases-1.1.77" = { @@ -45579,13 +47352,13 @@ let sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; }; }; - "node-releases-2.0.1" = { + "node-releases-2.0.2" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz"; - sha512 = "CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz"; + sha512 = "XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="; }; }; "node-rsa-1.1.1" = { @@ -45597,6 +47370,15 @@ let sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw=="; }; }; + "node-schedule-1.3.2" = { + name = "node-schedule"; + packageName = "node-schedule"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-schedule/-/node-schedule-1.3.2.tgz"; + sha512 = "GIND2pHMHiReSZSvS6dpZcDH7pGPGFfWBIEud6S00Q8zEIzAs9ommdyRK1ZbQt8y1LyZsJYZgPnyi7gpU2lcdw=="; + }; + }; "node-ssdp-2.9.1" = { name = "node-ssdp"; packageName = "node-ssdp"; @@ -45669,6 +47451,15 @@ let sha512 = "ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ=="; }; }; + "node-watch-0.7.3" = { + name = "node-watch"; + packageName = "node-watch"; + version = "0.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-watch/-/node-watch-0.7.3.tgz"; + sha512 = "3l4E8uMPY1HdMMryPRUAl+oIHtXtyiTlIiESNSVSNxcPfzAFzeTbXFQkZfAwBbo0B1qMSG8nUABx+Gd+YrbKrQ=="; + }; + }; "node-wsfederation-0.1.1" = { name = "node-wsfederation"; packageName = "node-wsfederation"; @@ -45759,6 +47550,15 @@ let sha512 = "K9nTVFOGUOYutaG8ywiKpCdVu458RFxSgSJ0rribUxtf5iLM9B2+raFJgkID3p5op0+twmoQqFaPnu9KYz6qzg=="; }; }; + "non-private-ip-2.2.0" = { + name = "non-private-ip"; + packageName = "non-private-ip"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/non-private-ip/-/non-private-ip-2.2.0.tgz"; + sha512 = "NZ3Upr3K2whD6vdZ9k8gHsijsrQl5O6IARLIUDyvQwSuO/owM1kOMu8wDMMsIR8ujlLvhPNjlTZC2SXzWwWByQ=="; + }; + }; "noop-fn-1.0.0" = { name = "noop-fn"; packageName = "noop-fn"; @@ -45840,6 +47640,15 @@ let sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; }; }; + "normalize-newline-4.1.0" = { + name = "normalize-newline"; + packageName = "normalize-newline"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-newline/-/normalize-newline-4.1.0.tgz"; + sha512 = "ff4jKqMI8Xl50/4Mms/9jPobzAV/UK+kXG2XJ/7AqOmxIx8mqfqTIHYxuAnEgJ2AQeBbLnlbmZ5+38Y9A0w/YA=="; + }; + }; "normalize-package-data-2.5.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; @@ -45858,6 +47667,24 @@ let sha512 = "p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="; }; }; + "normalize-package-data-4.0.0" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-4.0.0.tgz"; + sha512 = "m+GL22VXJKkKbw62ZaBBjv8u6IE3UI4Mh5QakIqs3fWiKe0Xyi6L97hakwZK41/LD4R/2ly71Bayx0NLMwLA/g=="; + }; + }; + "normalize-path-1.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz"; + sha1 = "32d0e472f91ff345701c15a8311018d3b0a90379"; + }; + }; "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; @@ -46092,6 +47919,15 @@ let sha512 = "LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q=="; }; }; + "npm-package-arg-9.0.1" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.0.1.tgz"; + sha512 = "Xs9wznfEAmZAR61qsYH3iN24V/qMYYkvAR5CRQNMvC6PjN2fHtO8y9XP/xdp5K+Icx+u1wMBMgWRPCmAEChSog=="; + }; + }; "npm-packlist-1.4.8" = { name = "npm-packlist"; packageName = "npm-packlist"; @@ -46119,6 +47955,15 @@ let sha512 = "L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ=="; }; }; + "npm-packlist-4.0.0" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-4.0.0.tgz"; + sha512 = "gL6XC/iw9YSmqArmZOGSkyy+yIZf2f7uH0p4Vmxef/irn73vd9/rDkCtvm+a9rh/QK2xGYfCAMOghM06ymzC0A=="; + }; + }; "npm-pick-manifest-6.1.1" = { name = "npm-pick-manifest"; packageName = "npm-pick-manifest"; @@ -46128,6 +47973,15 @@ let sha512 = "dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA=="; }; }; + "npm-pick-manifest-7.0.0" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-7.0.0.tgz"; + sha512 = "njM1AcdioFaKd0JSGtLO09YA1WRwctjGQJbnHGmKS+u+uwP8oFvtZtOQWPYdxrnY5eJud3wn8OpH4sEIx6+GEQ=="; + }; + }; "npm-prefix-1.2.0" = { name = "npm-prefix"; packageName = "npm-prefix"; @@ -46164,6 +48018,24 @@ let sha512 = "jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA=="; }; }; + "npm-registry-fetch-12.0.2" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "12.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-12.0.2.tgz"; + sha512 = "Df5QT3RaJnXYuOwtXBXS9BWs+tHH2olvkCLh6jcR/b/u3DvPMlp3J0TvvYwplPKxHMOwfg287PYih9QqaVFoKA=="; + }; + }; + "npm-registry-fetch-13.1.0" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.1.0.tgz"; + sha512 = "TIYL5X8CcwDhbFMXFDShNcpG6OMCYK6VzvSr6MUWP20tCU2DJ4ao2qQg3DT+3Pet8mO6/cgbZpon4LMh3duYLg=="; + }; + }; "npm-registry-fetch-9.0.0" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; @@ -46173,6 +48045,15 @@ let sha512 = "PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA=="; }; }; + "npm-registry-utilities-1.0.0" = { + name = "npm-registry-utilities"; + packageName = "npm-registry-utilities"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-utilities/-/npm-registry-utilities-1.0.0.tgz"; + sha512 = "9xYfSJy2IFQw1i6462EJzjChL9e65EfSo2Cw6kl0EFeDp05VvU+anrQk3Fc0d1MbVCq7rWIxeer89O9SUQ/uOg=="; + }; + }; "npm-run-path-1.0.0" = { name = "npm-run-path"; packageName = "npm-run-path"; @@ -46254,13 +48135,13 @@ let sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="; }; }; - "npmlog-6.0.0" = { + "npmlog-6.0.1" = { name = "npmlog"; packageName = "npmlog"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-6.0.0.tgz"; - sha512 = "03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q=="; + url = "https://registry.npmjs.org/npmlog/-/npmlog-6.0.1.tgz"; + sha512 = "BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg=="; }; }; "nprogress-0.2.0" = { @@ -46299,13 +48180,22 @@ let sha512 = "it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w=="; }; }; - "nugget-2.0.1" = { + "nugget-2.0.2" = { name = "nugget"; packageName = "nugget"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz"; - sha1 = "201095a487e1ad36081b3432fa3cada4f8d071b0"; + url = "https://registry.npmjs.org/nugget/-/nugget-2.0.2.tgz"; + sha512 = "A8A8+PtlH937KWXJnfct6ubGPfgHOe3lwFkkmrT5xW8+aRBnDWqSiW5NRuiVuh/k/auLGsZdu+WrIU2epL/FHg=="; + }; + }; + "null-loader-4.0.1" = { + name = "null-loader"; + packageName = "null-loader"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/null-loader/-/null-loader-4.0.1.tgz"; + sha512 = "pxqVbi4U6N26lq+LmgIbB5XATP0VdZKOG25DhHi8btMmJJefGArFyDg1yc4U3hWCJbMqSrw0qyrz1UQX+qYXqg=="; }; }; "nullthrows-1.1.1" = { @@ -46335,13 +48225,13 @@ let sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; }; }; - "number-allocator-1.0.9" = { + "number-allocator-1.0.10" = { name = "number-allocator"; packageName = "number-allocator"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.9.tgz"; - sha512 = "sIIF0dZKMs3roPUD7rLreH8H3x47QKV9dHZ+PeSnH24gL0CxKxz/823woGZC0hLBSb2Ar/rOOeHiNbnPBum/Mw=="; + url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.10.tgz"; + sha512 = "K4AvNGKo9lP6HqsZyfSr9KDaqnwFzW203inhQEOwFrmFaYevpdX4VNwdOLk197aHujzbT//z6pCBrCOUYSM5iw=="; }; }; "number-is-nan-1.0.1" = { @@ -46407,6 +48297,15 @@ let sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="; }; }; + "o3-1.0.3" = { + name = "o3"; + packageName = "o3"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/o3/-/o3-1.0.3.tgz"; + sha1 = "192ce877a882dfa6751f0412a865fafb2da1dac0"; + }; + }; "oas-kit-common-1.0.8" = { name = "oas-kit-common"; packageName = "oas-kit-common"; @@ -46467,7 +48366,7 @@ let version = "0.9.15"; src = fetchurl { name = "oauth-0.9.15.tar.gz"; - url = "https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master"; + url = "https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/refs/heads/master"; sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; }; }; @@ -46579,15 +48478,6 @@ let sha512 = "gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="; }; }; - "object-inspect-1.11.1" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz"; - sha512 = "If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA=="; - }; - }; "object-inspect-1.12.0" = { name = "object-inspect"; packageName = "object-inspect"; @@ -46642,13 +48532,13 @@ let sha512 = "YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA=="; }; }; - "object-sizeof-1.6.1" = { + "object-sizeof-1.6.3" = { name = "object-sizeof"; packageName = "object-sizeof"; - version = "1.6.1"; + version = "1.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/object-sizeof/-/object-sizeof-1.6.1.tgz"; - sha512 = "gNKGcRnDRXwEpAdwUY3Ef+aVZIrcQVXozSaVzHz6Pv4JxysH8vf5F+nIgsqW5T/YNwZNveh0mIW7PEH1O2MrDw=="; + url = "https://registry.npmjs.org/object-sizeof/-/object-sizeof-1.6.3.tgz"; + sha512 = "LGtilAKuDGKCcvu1Xg3UvAhAeJJlFmblo3faltmOQ80xrGwAHxnauIXucalKdTEksHp/Pq9tZGz1hfyEmjFJPQ=="; }; }; "object-to-arguments-0.0.8" = { @@ -46777,13 +48667,13 @@ let sha512 = "eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg=="; }; }; - "obliterator-1.6.1" = { + "obliterator-2.0.2" = { name = "obliterator"; packageName = "obliterator"; - version = "1.6.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/obliterator/-/obliterator-1.6.1.tgz"; - sha512 = "9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig=="; + url = "https://registry.npmjs.org/obliterator/-/obliterator-2.0.2.tgz"; + sha512 = "g0TrA7SbUggROhDPK8cEu/qpItwH2LSKcNl4tlfBNT54XY+nOsqrs0Q68h1V9b3HOSpIWv15jb1lax2hAggdIg=="; }; }; "observ-0.2.0" = { @@ -46831,15 +48721,6 @@ let sha512 = "rH3U4eLHsV+OgkOS29ULiC9JLspwMCyCIH/+BglLPXDxQs13IK8AGD+nVmkGXqGN5JefZu85YhfIi05CsOKWPw=="; }; }; - "office-ui-fabric-react-7.181.0" = { - name = "office-ui-fabric-react"; - packageName = "office-ui-fabric-react"; - version = "7.181.0"; - src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.181.0.tgz"; - sha512 = "d2M2H3p07VuQl8MtmVXIwulmDbHT1yuM2VR9xWNxqBy+p2gp1qhMLgYKCqTJ2PMpHyCZgGTQ8lc68Zgjg5+RfA=="; - }; - }; "omggif-1.0.10" = { name = "omggif"; packageName = "omggif"; @@ -46885,6 +48766,15 @@ let sha1 = "20f1336481b083cd75337992a16971aa2d906947"; }; }; + "on-finished-2.4.1" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; + sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; + }; + }; "on-headers-1.0.2" = { name = "on-headers"; packageName = "on-headers"; @@ -46957,15 +48847,6 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; - "one-time-0.0.4" = { - name = "one-time"; - packageName = "one-time"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz"; - sha1 = "f8cdf77884826fe4dff93e3a9cc37b1e4480742e"; - }; - }; "one-time-1.0.0" = { name = "one-time"; packageName = "one-time"; @@ -47020,13 +48901,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.52.1" = { + "oo-ascii-tree-1.55.1" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.52.1"; + version = "1.55.1"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.52.1.tgz"; - sha512 = "hcQSkW/WkZFWqK878X+Bo8vD2Axo9FBQBGeTLANgWOay7IVFUvLmqbFUyfovzD+/L4ak1n/BdsWfSL/0a3NT2w=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.55.1.tgz"; + sha512 = "wGtYFm45kmxdss2XrdXC14uDUfyekbaqqZJrfvPtYHSa98Bk+RXHdTHHLQ1kwem6HT5c3ogf7+ZUBhX0B034iA=="; }; }; "open-0.0.2" = { @@ -47083,15 +48964,6 @@ let sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; }; }; - "open-8.1.0" = { - name = "open"; - packageName = "open"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.1.0.tgz"; - sha512 = "jB5hAtsDOhCy/FNQJwQJOrGlxLUat482Yr14rbA5l2Zb1eOeoS+ccQPO036C1+z9VDBTmOZqzh1tBbI4myzIYw=="; - }; - }; "open-8.4.0" = { name = "open"; packageName = "open"; @@ -47101,157 +48973,157 @@ let sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; }; }; - "openapi-default-setter-2.1.0" = { + "openapi-default-setter-8.0.0" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; - version = "2.1.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-2.1.0.tgz"; - sha512 = "2ZNlX1B/J9Q/bsM/vZKh8alC0Pn04KtDGbMN30qLRu3GkaOJH3dDMKxqJzCpYj8BOAa8G3BEsQq6kqWzkEsM7A=="; + url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-8.0.0.tgz"; + sha512 = "Ro0hg8w+lTPe18r5noVUjHgYMXZ3mPe5evW6fA0hdahqLns444wR/Cuvcykb/FHteqaq0WooQrsoKObO4lIHWA=="; }; }; - "openapi-default-setter-7.2.3" = { + "openapi-default-setter-9.3.1" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-7.2.3.tgz"; - sha512 = "wRqgsLfZB3LXx8l3RfKo8icdDPDucnrRD2EkygTMiUv5W1/OdZJmo1ChgD6FjQUZH/7U67IxEjnXPEWfnu+dRw=="; + url = "https://registry.npmjs.org/openapi-default-setter/-/openapi-default-setter-9.3.1.tgz"; + sha512 = "Tc/qpL7H2urJAilmb1wLqHJ8BjjJYudodRFl3RbTkWPSzwalZwPEo4VRP6WnEGvaRgkzLFaT62XgTHRGT8G9lw=="; }; }; - "openapi-framework-0.26.0" = { + "openapi-framework-8.0.0" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "0.26.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-0.26.0.tgz"; - sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-8.0.0.tgz"; + sha512 = "T9rP8onTa5xU+7+FCiiBO/p0DLjbHlcfhu+8yUEWFlmlCyihqjbsH0YiH7cCQYNOLgKZUCQZOaxJDiYBlVIaQQ=="; }; }; - "openapi-framework-7.5.0" = { + "openapi-framework-9.3.1" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "7.5.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.5.0.tgz"; - sha512 = "t+sGVNMs2apX6d/rf5oq/3S6tCyBTgCjgFY0EDEIKKWepO4v3wM+kjy/Ve9iU92Ui5GeWbGR6ceFKY6VP/OKfQ=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-9.3.1.tgz"; + sha512 = "cnDQQSHNhwS4jn5IE1gTO4mMTolbPbMf3EzVCMNmEcN09IKGQYmtiVSxxL+uGFiHHlpPfOTSsWrvTCiwbhRtyA=="; }; }; - "openapi-jsonschema-parameters-1.2.0" = { + "openapi-jsonschema-parameters-8.0.0" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; - version = "1.2.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-1.2.0.tgz"; - sha512 = "i2vBBFiRbOwYSvt5OG9hayJ7WUe/nl9Y151Ki1QtHb8M0zdYs2wkDhywVJnapq4/gPlrD1vmSVsYDrAjcBRJTQ=="; + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-8.0.0.tgz"; + sha512 = "yBBShgxPyo1M33q6RHNAvhTH6AydMDyDl7e89YUA/VkAf1wrU2HO/7Nok65R0vGbZFF43yml4i8sIak3GGnqVA=="; }; }; - "openapi-jsonschema-parameters-7.2.3" = { + "openapi-jsonschema-parameters-9.3.1" = { name = "openapi-jsonschema-parameters"; packageName = "openapi-jsonschema-parameters"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-7.2.3.tgz"; - sha512 = "hnhuSbyB0gwA2KrDmMve0A+XC3rqhiQwlvOpZ+kGDz9nWqgLgFJA582LpA4V1W+nI3WruS0nEkAvfG8EHKD+qQ=="; + url = "https://registry.npmjs.org/openapi-jsonschema-parameters/-/openapi-jsonschema-parameters-9.3.1.tgz"; + sha512 = "WeP/7nh4VAZFhtf5+FbA2HQQPD/a13+xf8uCd3QqpynSzBmcdkstb/kg8Uk4Hmqh5WlNkTGpxnjMxqSw6sHcWw=="; }; }; - "openapi-request-coercer-2.4.0" = { + "openapi-request-coercer-8.0.0" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; - version = "2.4.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-2.4.0.tgz"; - sha512 = "UFRzW7C7Q31FUOFHEMYNeSuEmETH7KGlsMgMJanv0RxXkACyzKpKANPfM3oiMubQENPya3Ie9ZIq5HLvZEy/eQ=="; + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-8.0.0.tgz"; + sha512 = "CTWZJT6rAPiLO7kvBpN9CJ7TXbCTlZzE7Z/Id/gegK/5FlxYIoB+ybx4tYC4IwJEjfm/lxY7Xv2CRp6RLJfKPw=="; }; }; - "openapi-request-coercer-7.5.0" = { + "openapi-request-coercer-9.3.1" = { name = "openapi-request-coercer"; packageName = "openapi-request-coercer"; - version = "7.5.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-7.5.0.tgz"; - sha512 = "wvrh3xSEpmgKaHiAnVhPxL6Yp9IXW+NEI192z6X5RiU6xe+jszn6A3v8vJcceyNsvDBA4tkm4I3mFndDlhc6Zw=="; + url = "https://registry.npmjs.org/openapi-request-coercer/-/openapi-request-coercer-9.3.1.tgz"; + sha512 = "4rIT/3H5k/zVSXSbxnLQvmHw4BXyCv4ocPjweybDxlVN6ryk+eIaMWiJzFoOf7RI86w++742HOECyzaLoBHftQ=="; }; }; - "openapi-request-validator-4.2.0" = { + "openapi-request-validator-8.0.0" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; - version = "4.2.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-4.2.0.tgz"; - sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg=="; + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-8.0.0.tgz"; + sha512 = "7gqNp4MvYu+pbdbq8Pw0qMsKqlhWQeYdKCHiu1OeOgBG8YkjlNGGeTuX028TsBEB/jGw7PgMCggaHuMl/W3bmQ=="; }; }; - "openapi-request-validator-7.4.0" = { + "openapi-request-validator-9.3.1" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; - version = "7.4.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.4.0.tgz"; - sha512 = "0rnslY82Btw5nM6rUEuXkvupav4ujvP+e9WziZvcMrE+VZ6IxRGDP8F7w0XmtPBwMS2nJGgt/J7BnRXAFTx5tw=="; + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-9.3.1.tgz"; + sha512 = "YhX942jTNWH3V/C+ysYcgchyjulT5ZJ1l0c9++isSnF0SKyEiIA+uUiSyAE+pKTc+Oel3ad8mXiy6rFFHoIKaQ=="; }; }; - "openapi-response-validator-4.0.0" = { + "openapi-response-validator-8.0.0" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; - version = "4.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-4.0.0.tgz"; - sha512 = "bIG8bpHT/vE+Dtz4aVyfQnweXtUdvxvJf5/D6Uu98UGf3T42Ez940ctwnlmDCQxTPqdu0yLFbMoiNf/A3jYCIg=="; + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-8.0.0.tgz"; + sha512 = "h41hcEIgT7ldowLafcWlaE2m3+ss9IgRRrBfEzTtdBab2SyefYeXBV5keicL/muC1msmhT2p2rftjQnvfQN2jA=="; }; }; - "openapi-response-validator-7.4.0" = { + "openapi-response-validator-9.3.1" = { name = "openapi-response-validator"; packageName = "openapi-response-validator"; - version = "7.4.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-7.4.0.tgz"; - sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; + url = "https://registry.npmjs.org/openapi-response-validator/-/openapi-response-validator-9.3.1.tgz"; + sha512 = "2AOzHAbrwdj5DNL3u+BadhfmL3mlc3mmCv6cSAsEjoMncpOOVd95JyMf0j0XUyJigJ8/ILxnhETfg35vt1pGSQ=="; }; }; - "openapi-sampler-1.1.1" = { + "openapi-sampler-1.2.1" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.1.1.tgz"; - sha512 = "WAFsl5SPYuhQwaMTDFOcKhnEY1G1rmamrMiPmJdqwfl1lr81g63/befcsN9BNi0w5/R0L+hfcUj13PANEBeLgg=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.2.1.tgz"; + sha512 = "mHrYmyvcLD0qrfqPkPRBAL2z16hGT2rW0d0B7nklfoTcc3pmkJLkSZlKSeFgerUM41E5c7jlxf0Y19xrM7mWQQ=="; }; }; - "openapi-schema-validator-3.0.3" = { + "openapi-schema-validator-8.0.0" = { name = "openapi-schema-validator"; packageName = "openapi-schema-validator"; - version = "3.0.3"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-3.0.3.tgz"; - sha512 = "KKpeNEvAmpy6B2JCfyrM4yWjL6vggDCVbBoR8Yfkj0Jltc6PCW+dBbcg+1yrTCuDv80qBQJ6w0ejA71DlOFegA=="; + url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-8.0.0.tgz"; + sha512 = "cxacCVE/pIhlfzDPjhMREEVgWsFFUxU/+bKU258LKDmgXcdbbajtWtRT63VarXPnQ0sS4Bhl3V4ZKWxdJMiOXA=="; }; }; - "openapi-schema-validator-7.2.3" = { + "openapi-schema-validator-9.3.1" = { name = "openapi-schema-validator"; packageName = "openapi-schema-validator"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-7.2.3.tgz"; - sha512 = "XT8NM5e/zBBa/cydTS1IeYkCPzJp9oixvt9Y1lEx+2gsCTOooNxw9x/KEivtWMSokne7X1aR+VtsYHQtNNOSyA=="; + url = "https://registry.npmjs.org/openapi-schema-validator/-/openapi-schema-validator-9.3.1.tgz"; + sha512 = "5wpFKMoEbUcjiqo16jIen3Cb2+oApSnYZpWn8WQdRO2q/dNQZZl8Pz6ESwCriiyU5AK4i5ZI6+7O3bHQr6+6+g=="; }; }; - "openapi-security-handler-2.0.4" = { + "openapi-security-handler-8.0.0" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; - version = "2.0.4"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-2.0.4.tgz"; - sha512 = "blz/UftEqYQLAByuEVITePUI9hV5Rd91CEK8yrsKDUaf3zk6cmIMafJ2qvagHqjXRRtL7fOqvsSKIeFrai+HfQ=="; + url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-8.0.0.tgz"; + sha512 = "XWD15AQSZA3OQFS1gqupC9KoxOuUacyG8PUEna91sihPvZdO5lVcAfqHkJ1tqOKcn5k8Y8EsSoCwlr0d5njCaw=="; }; }; - "openapi-security-handler-7.2.3" = { + "openapi-security-handler-9.3.1" = { name = "openapi-security-handler"; packageName = "openapi-security-handler"; - version = "7.2.3"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-7.2.3.tgz"; - sha512 = "6wC2MXUv/FOy6uK6kkvPx1Pmh4WI3rpj7fsA1jwKCIPMwVcaJQA7/4Cfw3VWMNF0mVz7Nlxt9/aiziXHSOfiLg=="; + url = "https://registry.npmjs.org/openapi-security-handler/-/openapi-security-handler-9.3.1.tgz"; + sha512 = "q9rzMCwo3hia/56eBVkCUURQXZBlP/2DzplVd9Gvi3fgCXrgjnp+eY0W9EcmTJU5unb8rOuMExKsEI2cdEziVg=="; }; }; "openapi-to-graphql-2.2.5" = { @@ -47263,33 +49135,6 @@ let sha512 = "HlCCs/D7wMtraNZVYR8fgqv2Fr4afWgWKVf38uwwMEdhTuVHadn+1ILYfmZV6AdejFw7ViQpjNGVRcdrN2wzFg=="; }; }; - "openapi-types-1.3.4" = { - name = "openapi-types"; - packageName = "openapi-types"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.4.tgz"; - sha512 = "h8rADpW3k/wepLdERKF0VKMAPdoFYNQCLGPmc/f8sgQ2dxUy+7sY4WAX2XDUDjhKTjbJVbxxofLkzy7f1/tE4g=="; - }; - }; - "openapi-types-1.3.5" = { - name = "openapi-types"; - packageName = "openapi-types"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.5.tgz"; - sha512 = "11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="; - }; - }; - "openapi-types-7.0.1" = { - name = "openapi-types"; - packageName = "openapi-types"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.0.1.tgz"; - sha512 = "6pi4/Fw+JIW1HHda2Ij7LRJ5QJ8f6YzaXnsRA6m44BJz8nLq/j5gVFzPBKJo+uOFhAeHqZC/3uzhTpYPga3Q/A=="; - }; - }; "openapi-types-7.2.3" = { name = "openapi-types"; packageName = "openapi-types"; @@ -47299,22 +49144,40 @@ let sha512 = "olbaNxz12R27+mTyJ/ZAFEfUruauHH27AkeQHDHRq5AF0LdNkK1SSV7EourXQDK+4aX7dv2HtyirAGK06WMAsA=="; }; }; - "openapi3-ts-2.0.1" = { - name = "openapi3-ts"; - packageName = "openapi3-ts"; - version = "2.0.1"; + "openapi-types-8.0.0" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-2.0.1.tgz"; - sha512 = "v6X3iwddhi276siej96jHGIqTx3wzVfMTmpGJEQDt7GPI7pI6sywItURLzpEci21SBRpPN/aOWSF5mVfFVNmcg=="; + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-8.0.0.tgz"; + sha512 = "dcHYyCDOAy4QQTrur5Sn1L3lPVspB7rd04Rw/Q7AsMvfV797IiWgmKziFCbq8VhnBoREU/SPPSBDxtK9Biwa1g=="; }; }; - "opencollective-1.0.3" = { - name = "opencollective"; - packageName = "opencollective"; - version = "1.0.3"; + "openapi-types-9.3.0" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "9.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/opencollective/-/opencollective-1.0.3.tgz"; - sha1 = "aee6372bc28144583690c3ca8daecfc120dd0ef1"; + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-9.3.0.tgz"; + sha512 = "sR23YjmuwDSMsQVZDHbV9mPgi0RyniQlqR0AQxTC2/F3cpSjRFMH3CFPjoWvNqhC4OxPkDYNb2l8Mc1Me6D/KQ=="; + }; + }; + "openapi-types-9.3.1" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "9.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-9.3.1.tgz"; + sha512 = "/Yvsd2D7miYB4HLJ3hOOS0+vnowQpaT75FsHzr/y5M9P4q9bwa7RcbW2YdH6KZBn8ceLbKGnHxMZ1CHliGHUFw=="; + }; + }; + "openapi3-ts-2.0.2" = { + name = "openapi3-ts"; + packageName = "openapi3-ts"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi3-ts/-/openapi3-ts-2.0.2.tgz"; + sha512 = "TxhYBMoqx9frXyOgnRHufjQfPXomTIHYKhSKJ6jHfj13kS8OEIhvmE8CTuQyKtjjWttAjX5DPxM1vmalEpo8Qw=="; }; }; "opencollective-postinstall-2.0.3" = { @@ -47344,13 +49207,13 @@ let sha512 = "EFTQ61/OUVhCeq78Y3rBpdKSuvgb0lwkU8nN4QTdcv0afc5MT7e4IVuZwgkMsgE993dmhbIhkxHFP3iTVJXWmw=="; }; }; - "openpgp-4.10.10" = { + "openpgp-5.2.1" = { name = "openpgp"; packageName = "openpgp"; - version = "4.10.10"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/openpgp/-/openpgp-4.10.10.tgz"; - sha512 = "Ub48OogGPjNsr0G/wnJ/SyAQzt/tfcXZTWVZdjKFpXCQV1Ca+upFdSPPkBlGG3lb9EQGOKZJ2tzYNH6ZyKMkDQ=="; + url = "https://registry.npmjs.org/openpgp/-/openpgp-5.2.1.tgz"; + sha512 = "zvu63kxe70q3D6WlKC/TB2pzI59I8V/l4G+z/VYgNVOyARsoH9q4i/WqwoHPjWG5HnRjhII3WSvp3gXH2DMPVg=="; }; }; "opentracing-0.14.7" = { @@ -47380,15 +49243,6 @@ let sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a"; }; }; - "opn-4.0.2" = { - name = "opn"; - packageName = "opn"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz"; - sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; - }; - }; "opn-5.3.0" = { name = "opn"; packageName = "opn"; @@ -47461,15 +49315,6 @@ let sha512 = "mgFS1JdOtEGzD8l+EuISqL57cKO+We9GcoiQEmdCWRqqck+FGNmYJtx9qfAPzEz+lRrlThWMuGDaRkI/yWNx/Q=="; }; }; - "optional-0.1.4" = { - name = "optional"; - packageName = "optional"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/optional/-/optional-0.1.4.tgz"; - sha512 = "gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw=="; - }; - }; "optionator-0.3.0" = { name = "optionator"; packageName = "optionator"; @@ -47587,13 +49432,22 @@ let sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; }; }; - "ora-6.0.1" = { + "ora-6.1.0" = { name = "ora"; packageName = "ora"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-6.0.1.tgz"; - sha512 = "TDdKkKHdWE6jo/6pIa5U5AWcSVfpNRFJ8sdRJpioGNVPLAzZzHs/N+QhUfF7ZbyoC+rnDuNTKzeDJUbAza9g4g=="; + url = "https://registry.npmjs.org/ora/-/ora-6.1.0.tgz"; + sha512 = "CxEP6845hLK+NHFWZ+LplGO4zfw4QSfxTlqMfvlJ988GoiUeZDMzCvqsZkFHv69sPICmJH1MDxZoQFOKXerAVw=="; + }; + }; + "ordered-binary-1.2.4" = { + name = "ordered-binary"; + packageName = "ordered-binary"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.4.tgz"; + sha512 = "A/csN0d3n+igxBPfUrjbV5GC69LWj2pjZzAAeeHXLukQ4+fytfP4T1Lg0ju7MSPSwq7KtHkGaiwO8URZN5IpLg=="; }; }; "ordered-read-streams-1.0.1" = { @@ -47722,22 +49576,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.3.3" = { + "ot-builder-1.5.0" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.3.3.tgz"; - sha512 = "MRagUwE9VN5++ptJXPd5RqK6YbDUe6i+I7RWRpsgo2aD2ZbvktfoJ1FJGzLbaRucsWw4X3d6xKf8xIQ5SnjMJA=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.5.0.tgz"; + sha512 = "taCpdbAu+OFogPf5AMdGMt2PnAGER7p4B4EWmIoMh00ZyDcyOVwgbV5V7z64wxo24tAaWXGwLqWOcI2K0SdWhQ=="; }; }; - "otb-ttc-bundle-1.3.3" = { + "otb-ttc-bundle-1.5.0" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.3.3.tgz"; - sha512 = "Aezn4zk5RFET7R7KONsKRvspOBpdJvVqTg6t2NZ6/sIpCeiwSIe3nUtOpn+PGvM11zMq7x3ulhWFrWdNRO9A/g=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.5.0.tgz"; + sha512 = "wiavReuHttWgXplMV/T86jiT+dYPOZCq1UtsJR11m8ddI2BnDxhNZcg65OlkGU0Iq4tQmyjVG2PdX2sGH319XQ=="; }; }; "ow-0.21.0" = { @@ -47749,15 +49603,6 @@ let sha512 = "dlsoDe39g7mhdsdrC1R/YwjT7yjVqE3svWwOlMGvN690waBkgEZBmKBdkmKvSt5/wZ6E0Jn/nIesPqMZOpPKqw=="; }; }; - "p-all-2.1.0" = { - name = "p-all"; - packageName = "p-all"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-all/-/p-all-2.1.0.tgz"; - sha512 = "HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA=="; - }; - }; "p-any-2.1.0" = { name = "p-any"; packageName = "p-any"; @@ -47767,6 +49612,15 @@ let sha512 = "JAERcaMBLYKMq+voYw36+x5Dgh47+/o7yuv2oQYuSSUml4YeqJEFznBrY2UeEkoSHqBua6hz518n/PsowTYLLg=="; }; }; + "p-any-3.0.0" = { + name = "p-any"; + packageName = "p-any"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-any/-/p-any-3.0.0.tgz"; + sha512 = "5rqbqfsRWNb0sukt0awwgJMlaep+8jV45S15SKKB34z4UuzjcofIfnriCBhWjZP2jbVtjt9yRl7buB6RlKsu9w=="; + }; + }; "p-cancelable-0.3.0" = { name = "p-cancelable"; packageName = "p-cancelable"; @@ -47848,13 +49702,13 @@ let sha512 = "KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ=="; }; }; - "p-filter-2.1.0" = { + "p-filter-3.0.0" = { name = "p-filter"; packageName = "p-filter"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz"; - sha512 = "ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw=="; + url = "https://registry.npmjs.org/p-filter/-/p-filter-3.0.0.tgz"; + sha512 = "QtoWLjXAW++uTX67HZQz1dbTpqBfiidsB6VtQUC9iR85S120+s0T5sO6s+B5MLzFcZkrEd/DGMmCjR+f2Qpxwg=="; }; }; "p-finally-1.0.0" = { @@ -47938,6 +49792,15 @@ let sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; }; }; + "p-limit-4.0.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz"; + sha512 = "5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ=="; + }; + }; "p-locate-2.0.0" = { name = "p-locate"; packageName = "p-locate"; @@ -48010,6 +49873,15 @@ let sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; }; }; + "p-map-5.3.0" = { + name = "p-map"; + packageName = "p-map"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-5.3.0.tgz"; + sha512 = "SRbIQFoLYNezHkqZslqeg963HYUtqOrfMCxjNrFOpJ19WTYuq26rQoOXeX8QQiMLUlLqdYV/7PuDsdYJ7hLE1w=="; + }; + }; "p-map-series-2.1.0" = { name = "p-map-series"; packageName = "p-map-series"; @@ -48109,6 +49981,15 @@ let sha512 = "MF/HIbq6GeBqTrTIl5OJubzkGU+qfFhAFi0gnTAK6rgEIJIknEiABHOTtQu4e6JiXjIwuMPMUFQzyHh5QjCl1g=="; }; }; + "p-some-5.0.0" = { + name = "p-some"; + packageName = "p-some"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-some/-/p-some-5.0.0.tgz"; + sha512 = "Js5XZxo6vHjB9NOYAzWDYAIyyiPvva0DWESAIWIK7uhSpGsyg5FwUPxipU/SOQx5x9EqhOh545d1jo6cVkitig=="; + }; + }; "p-timeout-1.2.1" = { name = "p-timeout"; packageName = "p-timeout"; @@ -48190,6 +50071,15 @@ let sha512 = "RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw=="; }; }; + "p2tr-1.3.0" = { + name = "p2tr"; + packageName = "p2tr"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p2tr/-/p2tr-1.3.0.tgz"; + sha512 = "LdnkVwu808S7ngeKpUjJZDWXsWXqMLYtTGE2pXtKjpIs5Nn2qL6d84Sh+/gxyeJHtTz0qmOEuYnFfn61/TuU0A=="; + }; + }; "pac-proxy-agent-4.1.0" = { name = "pac-proxy-agent"; packageName = "pac-proxy-agent"; @@ -48280,6 +50170,15 @@ let sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; }; }; + "package-json-7.0.0" = { + name = "package-json"; + packageName = "package-json"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-7.0.0.tgz"; + sha512 = "CHJqc94AA8YfSLHGQT3DbvSIuE12NLFekpM4n7LRrAd3dOJtA911+4xe9q6nC3/jcKraq7nNS9VxgtT0KC+diA=="; + }; + }; "package-json-versionify-1.0.4" = { name = "package-json-versionify"; packageName = "package-json-versionify"; @@ -48289,15 +50188,6 @@ let sha1 = "5860587a944873a6b7e6d26e8e51ffb22315bf17"; }; }; - "packet-reader-1.0.0" = { - name = "packet-reader"; - packageName = "packet-reader"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz"; - sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; - }; - }; "packet-stream-2.0.6" = { name = "packet-stream"; packageName = "packet-stream"; @@ -48307,13 +50197,13 @@ let sha512 = "kSxHpoTqlgNEetMp77snCTVILwLw4dJX6pB/z1g1PRG5xylH8cf9upIPygt+epBC3l14XrcZH4/kQYSrzp2Ijg=="; }; }; - "packet-stream-codec-1.1.3" = { + "packet-stream-codec-1.2.0" = { name = "packet-stream-codec"; packageName = "packet-stream-codec"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/packet-stream-codec/-/packet-stream-codec-1.1.3.tgz"; - sha512 = "LUL4NK7sz01jdSUdCu3z1LyphCiFdQaFouaEDsAWmJpzS0lbeNfvZoX4bi1Tm1ilzheK5VAoD96QskDCZQr+jA=="; + url = "https://registry.npmjs.org/packet-stream-codec/-/packet-stream-codec-1.2.0.tgz"; + sha512 = "3xoTsSVqCPd+0mPsQGlfYm2ecvJK9tS1HOxrjnKEiB1Ynq0fOJHEXcZV/hxW6BkOSGBsGX7dTN8bjdNTU3nKBA=="; }; }; "pacote-11.3.5" = { @@ -48325,13 +50215,22 @@ let sha512 = "fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg=="; }; }; - "pacote-12.0.2" = { + "pacote-12.0.3" = { name = "pacote"; packageName = "pacote"; - version = "12.0.2"; + version = "12.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-12.0.2.tgz"; - sha512 = "Ar3mhjcxhMzk+OVZ8pbnXdb0l8+pimvlsqBGRNkble2NVgyqOGE3yrCGi/lAYq7E7NRDMz89R1Wx5HIMCGgeYg=="; + url = "https://registry.npmjs.org/pacote/-/pacote-12.0.3.tgz"; + sha512 = "CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow=="; + }; + }; + "pacote-13.0.5" = { + name = "pacote"; + packageName = "pacote"; + version = "13.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pacote/-/pacote-13.0.5.tgz"; + sha512 = "6CYfot3/rUAn3qqzF2d/jrrXm5HlBtvaSgfmg0VtOUAdJ8fbSq21BJwftMGArkL71yXHIbUJ7Bt5B04547HELA=="; }; }; "pad-0.0.5" = { @@ -48352,22 +50251,22 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; - "paid-services-3.10.0" = { + "paid-services-3.14.2" = { name = "paid-services"; packageName = "paid-services"; - version = "3.10.0"; + version = "3.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-3.10.0.tgz"; - sha512 = "Uxq9yk+SFG9bVDDgVce5kQ0OXuTZ/jqk4V27rqPX6EnEMIQOHmf/zNRpsGBowUDUBOdstGYdyZQ4avp7w2Q92w=="; + url = "https://registry.npmjs.org/paid-services/-/paid-services-3.14.2.tgz"; + sha512 = "Juz+H52DcDe8m0DlYm3oPN1Lf3VKLG5p7/CiiNBoLbZ7vkgO1BU6v71nv1klrvYIJBL9+uwuzgDxWaqYqw4Yxw=="; }; }; - "paid-services-3.11.0" = { + "paid-services-3.14.4" = { name = "paid-services"; packageName = "paid-services"; - version = "3.11.0"; + version = "3.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-3.11.0.tgz"; - sha512 = "G0Enb7xcOpZlOmoK7h7Anym0nFG+t7JPMoTie5HoeUfwfm/mtNfUXyJvtom930Dg9l/g/rVk5CbivwzSS8ccUw=="; + url = "https://registry.npmjs.org/paid-services/-/paid-services-3.14.4.tgz"; + sha512 = "DLmutrDtOoxgcaiyZcdzD6nIVFwMwnkcriJhZEvVNeyzXlB+aNySn5MpB4YPlDtxKuSd6use+JZxQ5RzifcJ4g=="; }; }; "pako-0.2.9" = { @@ -48388,13 +50287,13 @@ let sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; }; }; - "papaparse-5.3.1" = { + "papaparse-5.3.2" = { name = "papaparse"; packageName = "papaparse"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/papaparse/-/papaparse-5.3.1.tgz"; - sha512 = "Dbt2yjLJrCwH2sRqKFFJaN5XgIASO9YOFeFP8rIBRG2Ain8mqk5r1M6DkfvqEVozVcz3r3HaUGw253hA1nLIcA=="; + url = "https://registry.npmjs.org/papaparse/-/papaparse-5.3.2.tgz"; + sha512 = "6dNZu0Ki+gyV0eBsFKJhYr+MdQYAzFUGlBMNj3GNrmHxmz1lfRa24CjFObPXtjcetlOv5Ad299MhIK0znp3afw=="; }; }; "parallel-transform-1.2.0" = { @@ -48451,6 +50350,15 @@ let sha512 = "uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg=="; }; }; + "parent-require-1.0.0" = { + name = "parent-require"; + packageName = "parent-require"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz"; + sha1 = "746a167638083a860b0eef6732cb27ed46c32977"; + }; + }; "parents-1.0.1" = { name = "parents"; packageName = "parents"; @@ -48568,13 +50476,13 @@ let sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; }; }; - "parse-git-config-2.0.3" = { + "parse-git-config-3.0.0" = { name = "parse-git-config"; packageName = "parse-git-config"; - version = "2.0.3"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-git-config/-/parse-git-config-2.0.3.tgz"; - sha512 = "Js7ueMZOVSZ3tP8C7E3KZiHv6QQl7lnJ+OkbxoaFazzSa2KyEHqApfGbU3XboUgUnq4ZuUmskUpYKTNx01fm5A=="; + url = "https://registry.npmjs.org/parse-git-config/-/parse-git-config-3.0.0.tgz"; + sha512 = "wXoQGL1D+2COYWCD35/xbiKma1Z15xvZL8cI25wvxzled58V51SJM04Urt/uznS900iQor7QO04SgdfT/XlbuA=="; }; }; "parse-github-url-1.0.2" = { @@ -48604,13 +50512,13 @@ let sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c"; }; }; - "parse-headers-2.0.4" = { + "parse-headers-2.0.5" = { name = "parse-headers"; packageName = "parse-headers"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.4.tgz"; - sha512 = "psZ9iZoCNFLrgRjZ1d8mn0h9WRqJwFxM9q3x7iUjN/YT2OksthDJ5TiPCu2F38kS4zutqfW+YdVVkBZZx3/1aw=="; + url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.5.tgz"; + sha512 = "ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA=="; }; }; "parse-help-1.0.0" = { @@ -48631,15 +50539,6 @@ let sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; }; }; - "parse-json-3.0.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-3.0.0.tgz"; - sha1 = "fa6f47b18e23826ead32f263e744d0e1e847fb13"; - }; - }; "parse-json-4.0.0" = { name = "parse-json"; packageName = "parse-json"; @@ -48766,13 +50665,13 @@ let sha512 = "yy7UTSmliOT/7Yl+P4hwwW2W7PbCTAMcD0lasaVG+k4/2laj42YWzLm468bLFGDoFPIb29g3BuwBcA3gLopKww=="; }; }; - "parse-torrent-9.1.4" = { + "parse-torrent-9.1.5" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "9.1.4"; + version = "9.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.4.tgz"; - sha512 = "NSlG8ewolqfcEWevUUsrpvxzVWYGaKWwPHMcXTAV2qYYo6pPugVOacQXt8uDlEYh23Ituz+A9pAZK5YaXTV8Pg=="; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.1.5.tgz"; + sha512 = "K8FXRwTOaZMI0/xuv0dpng1MVHZRtMJ0jRWBJ3qZWVNTrC1MzWUxm9QwaXDz/2qPhV2XC4UIHI92IGHwseAwaA=="; }; }; "parse-torrent-file-2.1.4" = { @@ -48865,6 +50764,15 @@ let sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc"; }; }; + "parseley-0.7.0" = { + name = "parseley"; + packageName = "parseley"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parseley/-/parseley-0.7.0.tgz"; + sha512 = "xyOytsdDu077M3/46Am+2cGXEKM9U9QclBDv7fimY7e+BBlxh2JcBp2mgNsmkyA9uvgyTjVzDi7cP1v4hcFxbw=="; + }; + }; "parseqs-0.0.2" = { name = "parseqs"; packageName = "parseqs"; @@ -48982,15 +50890,6 @@ let sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102"; }; }; - "passport-0.4.1" = { - name = "passport"; - packageName = "passport"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz"; - sha512 = "IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg=="; - }; - }; "passport-0.5.2" = { name = "passport"; packageName = "passport"; @@ -49090,13 +50989,13 @@ let sha512 = "nxl9nrnLQmh64iTzMfyylSlRozL7kAXIaxw1fVcLYdyhNkJCRUzirRZTikXGJsg+hc4fqpneTK6iU2H1Q8THSA=="; }; }; - "patel-0.35.1" = { + "patel-0.37.1" = { name = "patel"; packageName = "patel"; - version = "0.35.1"; + version = "0.37.1"; src = fetchurl { - url = "https://registry.npmjs.org/patel/-/patel-0.35.1.tgz"; - sha512 = "Em5Zh8t+oVnTNELwze1J9iQEeOBC+84B+UstU4hrmv16uvdunBzmMad6kY28nVxBxycqH6EYsDV2s1rO9IeZaw=="; + url = "https://registry.npmjs.org/patel/-/patel-0.37.1.tgz"; + sha512 = "7lIe3whu1gIJePlt8U+xmKCNXZgfBNNYdE4thvJTKfz8xZmmHC3+Oc7pI2qabtVLppXAjg5g3xnhDaLsD7dQ8w=="; }; }; "path-browserify-0.0.1" = { @@ -49288,6 +51187,15 @@ let sha512 = "gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ=="; }; }; + "path-to-regexp-6.2.0" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.0.tgz"; + sha512 = "f66KywYG6+43afgE/8j/GoiNyygk/bnoCbps++3ErRKsIYkGGupyv07R2Ok5m9i67Iqc+T2g1eAUGUPzWhYTyg=="; + }; + }; "path-type-1.1.0" = { name = "path-type"; packageName = "path-type"; @@ -49342,13 +51250,13 @@ let sha512 = "Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="; }; }; - "patrisika-0.23.0" = { + "patrisika-0.24.0" = { name = "patrisika"; packageName = "patrisika"; - version = "0.23.0"; + version = "0.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/patrisika/-/patrisika-0.23.0.tgz"; - sha512 = "bGxKK+XqO7Qfgv7WJSeytwZlbQsKXeuya+FD+6CB0iHat4tSbmN6eT0FEWGf0ulNguD0th/H3fa+VuXDDYQmLw=="; + url = "https://registry.npmjs.org/patrisika/-/patrisika-0.24.0.tgz"; + sha512 = "vIXRwNNZic/jMtMGCmWG0+b3vg2zKqeNgY4NHKHkevUc+eIY7iudIXMGwnDY45mavfHxmEhATxnpkMJvBwCCqA=="; }; }; "patrisika-scopes-0.12.0" = { @@ -49396,13 +51304,13 @@ let sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; }; }; - "peek-readable-4.0.2" = { + "peek-readable-4.1.0" = { name = "peek-readable"; packageName = "peek-readable"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.0.2.tgz"; - sha512 = "9fMaz6zoxw9ypO1KZy5RDJgSupEtu0Q+g/OqqsVHX3rKGR8qehRLYzsFARZ4bVvdvfknKiXvuDbkMnO1g6cRpQ=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz"; + sha512 = "ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg=="; }; }; "peek-stream-1.1.3" = { @@ -49486,69 +51394,6 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-8.3.3" = { - name = "pg"; - packageName = "pg"; - version = "8.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.3.3.tgz"; - sha512 = "wmUyoQM/Xzmo62wgOdQAn5tl7u+IA1ZYK7qbuppi+3E+Gj4hlUxVHjInulieWrd0SfHi/ADriTb5ILJ/lsJrSg=="; - }; - }; - "pg-connection-string-2.5.0" = { - name = "pg-connection-string"; - packageName = "pg-connection-string"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz"; - sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; - }; - }; - "pg-int8-1.0.1" = { - name = "pg-int8"; - packageName = "pg-int8"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz"; - sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; - }; - }; - "pg-pool-3.4.1" = { - name = "pg-pool"; - packageName = "pg-pool"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.4.1.tgz"; - sha512 = "TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ=="; - }; - }; - "pg-protocol-1.5.0" = { - name = "pg-protocol"; - packageName = "pg-protocol"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; - sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; - }; - }; - "pg-types-2.2.0" = { - name = "pg-types"; - packageName = "pg-types"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz"; - sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; - }; - }; - "pgpass-1.0.5" = { - name = "pgpass"; - packageName = "pgpass"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz"; - sha512 = "FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug=="; - }; - }; "phin-2.9.3" = { name = "phin"; packageName = "phin"; @@ -49603,13 +51448,13 @@ let sha512 = "49/xq+wzbwDeI32aPvwQJldM8pr7dKDRuR76IjztrkmiCkAQDaWFJzkmfVqCHmt/iFoPFhHmI9L0oKhthrTOQw=="; }; }; - "pid-from-port-1.1.3" = { - name = "pid-from-port"; - packageName = "pid-from-port"; - version = "1.1.3"; + "pid-port-0.1.1" = { + name = "pid-port"; + packageName = "pid-port"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pid-from-port/-/pid-from-port-1.1.3.tgz"; - sha512 = "OlE82n3yMOE5dY9RMOwxhoWefeMlxwk5IVxoj0sSzSFIlmvhN4obzTvO3s/d/b5JhcgXikjaspsy/HuUDTqbBg=="; + url = "https://registry.npmjs.org/pid-port/-/pid-port-0.1.1.tgz"; + sha512 = "boqPJtSgZC6KOgXKNPC+/XR3xwVtpOtaLa7JLcdf8jfVe0ZM2TwllBXxxLUO8GQbOLJ4/hEtf2+L1QCKbaoHUg=="; }; }; "pid-port-0.2.0" = { @@ -49630,6 +51475,15 @@ let sha512 = "cv3xAQos+pugVX+BfXpHsbyz/dLzX+lr44zNMsYiGxUw+kV5sgQCIcLd1z+0vq+KyC7dJ+/ts2PsfgWfSC3WXA=="; }; }; + "pidusage-3.0.0" = { + name = "pidusage"; + packageName = "pidusage"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pidusage/-/pidusage-3.0.0.tgz"; + sha512 = "8VJLToXhj+RYZGNVw8oxc7dS54iCQXUJ+MDFHezQ/fwF5B8W4OWodAMboc1wb08S/4LiHwAmkT4ohf/d3YPPsw=="; + }; + }; "piece-length-2.0.1" = { name = "piece-length"; packageName = "piece-length"; @@ -49711,22 +51565,22 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-7.4.0" = { + "pino-7.6.5" = { name = "pino"; packageName = "pino"; - version = "7.4.0"; + version = "7.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-7.4.0.tgz"; - sha512 = "qEHLtKcmYcid6s2qjlGTxaLe9Lq1IiGmd74IZb9Obi/FRTaA+ymb8FD/cmOIL4vt6ug/EtmhGwxZbiGhI+7cuQ=="; + url = "https://registry.npmjs.org/pino/-/pino-7.6.5.tgz"; + sha512 = "38tAwlJ7HevMENHD5FZE+yxSlAH5Wg3FoOjbB3MX2j3/kgpOEkmDHhTVKkecR57qxD5doHo2yi9nac94gqqbiQ=="; }; }; - "pino-7.6.4" = { + "pino-7.9.1" = { name = "pino"; packageName = "pino"; - version = "7.6.4"; + version = "7.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-7.6.4.tgz"; - sha512 = "ktibPg3ttWONxYQ2Efk1zYbIvofD5zdd/ReoujK84ggEp0REflb9TsXavSjt8u1CdT2mMJe9QQ3ZpyOQxUKipA=="; + url = "https://registry.npmjs.org/pino/-/pino-7.9.1.tgz"; + sha512 = "28+D7c5orCoScdcWtiPXrCA9tdVosBWrYQgVtPdYTyiuTt6u/+rbEtpJR+dtVG8k1flhv0H2f0XSkgGm+TdjqQ=="; }; }; "pino-abstract-transport-0.5.0" = { @@ -49774,13 +51628,13 @@ let sha1 = "f8436f8565ed1d97bf3a80632a5397bfd353385f"; }; }; - "pirates-4.0.4" = { + "pirates-4.0.5" = { name = "pirates"; packageName = "pirates"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz"; - sha512 = "ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw=="; + url = "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz"; + sha512 = "8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="; }; }; "pixelmatch-4.0.2" = { @@ -49801,6 +51655,15 @@ let sha512 = "IWo0HwnxUEH9OtQ3qEZsKUbpdStRSomS18Gx4UV5JT1fj/E/opYGZMgpcdzC1+3ouBJECV1evzt0778S2RJ+/Q=="; }; }; + "pkg-5.5.2" = { + name = "pkg"; + packageName = "pkg"; + version = "5.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg/-/pkg-5.5.2.tgz"; + sha512 = "pD0UB2ud01C6pVv2wpGsTYJrXI/bnvGRYvMLd44wFzA1p+A2jrlTGFPAYa7YEYzmitXhx23PqalaG1eUEnSwcA=="; + }; + }; "pkg-conf-1.1.3" = { name = "pkg-conf"; packageName = "pkg-conf"; @@ -49810,13 +51673,13 @@ let sha1 = "378e56d6fd13e88bfb6f4a25df7a83faabddba5b"; }; }; - "pkg-dir-2.0.0" = { + "pkg-dir-1.0.0" = { name = "pkg-dir"; packageName = "pkg-dir"; - version = "2.0.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz"; - sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz"; + sha1 = "7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"; }; }; "pkg-dir-3.0.0" = { @@ -49900,6 +51763,15 @@ let sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; }; }; + "platform-1.3.6" = { + name = "platform"; + packageName = "platform"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz"; + sha512 = "fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg=="; + }; + }; "playerui-1.3.0" = { name = "playerui"; packageName = "playerui"; @@ -49936,13 +51808,13 @@ let sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593"; }; }; - "plist-3.0.4" = { + "plist-3.0.5" = { name = "plist"; packageName = "plist"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz"; - sha512 = "ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg=="; + url = "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz"; + sha512 = "83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA=="; }; }; "plist-with-patches-0.5.1" = { @@ -50134,13 +52006,13 @@ let sha512 = "2Rb3vm+EXble/sMXNSu6eoBx8e79gKqhNq9F5ZWW6ERNCTE/Q0wQNne5541tE5vKjfM8hpNCYL+LGc1YTfI0dg=="; }; }; - "polished-4.1.3" = { + "polished-4.1.4" = { name = "polished"; packageName = "polished"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/polished/-/polished-4.1.3.tgz"; - sha512 = "ocPAcVBUOryJEKe0z2KLd1l9EBa1r5mSwlKpExmrLzsnIzJo4axsoU9O2BjOTkDGDT4mZ0WFE5XKTlR3nLnZOA=="; + url = "https://registry.npmjs.org/polished/-/polished-4.1.4.tgz"; + sha512 = "Nq5Mbza+Auo7N3sQb1QMFaQiDO+4UexWuSGR7Cjb4Sw11SZIJcrrFtiZ+L0jT9MBsUsxDboHVASbCLbE1rnECg=="; }; }; "polyraf-1.1.0" = { @@ -50207,15 +52079,6 @@ let sha256 = "0092766ac49279342f7d17677359880b44b245ad9d32237a11a5ea45cb0d03fa"; }; }; - "postcss-5.2.18" = { - name = "postcss"; - packageName = "postcss"; - version = "5.2.18"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz"; - sha512 = "zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg=="; - }; - }; "postcss-6.0.1" = { name = "postcss"; packageName = "postcss"; @@ -50252,22 +52115,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.3.11" = { + "postcss-8.4.12" = { name = "postcss"; packageName = "postcss"; - version = "8.3.11"; + version = "8.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz"; - sha512 = "hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA=="; - }; - }; - "postcss-8.4.5" = { - name = "postcss"; - packageName = "postcss"; - version = "8.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz"; - sha512 = "jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz"; + sha512 = "lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg=="; }; }; "postcss-calc-7.0.5" = { @@ -50342,15 +52196,6 @@ let sha512 = "9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ=="; }; }; - "postcss-html-0.12.0" = { - name = "postcss-html"; - packageName = "postcss-html"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-html/-/postcss-html-0.12.0.tgz"; - sha512 = "KxKUpj7AY7nlCbLcTOYxdfJnGE7QFAfU2n95ADj1Q90RM/pOLdz8k3n4avOyRFs7MDQHcRzJQWM1dehCwJxisQ=="; - }; - }; "postcss-html-0.36.0" = { name = "postcss-html"; packageName = "postcss-html"; @@ -50369,15 +52214,6 @@ let sha512 = "77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ=="; }; }; - "postcss-less-1.1.5" = { - name = "postcss-less"; - packageName = "postcss-less"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-less/-/postcss-less-1.1.5.tgz"; - sha512 = "QQIiIqgEjNnquc0d4b6HDOSFZxbFQoy4MPpli2lSLpKhMyBkKwwca2HFqu4xzxlKID/F2fxSOowwtKpgczhF7A=="; - }; - }; "postcss-less-3.1.4" = { name = "postcss-less"; packageName = "postcss-less"; @@ -50396,13 +52232,13 @@ let sha512 = "/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw=="; }; }; - "postcss-load-config-3.1.1" = { + "postcss-load-config-3.1.3" = { name = "postcss-load-config"; packageName = "postcss-load-config"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.1.tgz"; - sha512 = "c/9XYboIbSEUZpiD1UQD0IKiUe8n9WHYV7YFe7X7J+ZwCsEKkUJSFWjS9hBU1RR9THR7jMXst8sxiqP0jjo2mg=="; + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.3.tgz"; + sha512 = "5EYgaM9auHGtO//ljHH+v/aC/TQ5LHXtL7bQajNAUBKUVKiYE8rYpFms7+V26D9FncaGe2zwCoPQsFKb5zF/Hw=="; }; }; "postcss-loader-3.0.0" = { @@ -50684,15 +52520,6 @@ let sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; }; }; - "postcss-reporter-5.0.0" = { - name = "postcss-reporter"; - packageName = "postcss-reporter"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz"; - sha512 = "rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg=="; - }; - }; "postcss-reporter-7.0.5" = { name = "postcss-reporter"; packageName = "postcss-reporter"; @@ -50711,15 +52538,6 @@ let sha1 = "29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"; }; }; - "postcss-safe-parser-3.0.1" = { - name = "postcss-safe-parser"; - packageName = "postcss-safe-parser"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-3.0.1.tgz"; - sha1 = "b753eff6c7c0aea5e8375fbe4cde8bf9063ff142"; - }; - }; "postcss-safe-parser-4.0.2" = { name = "postcss-safe-parser"; packageName = "postcss-safe-parser"; @@ -50738,15 +52556,6 @@ let sha512 = "FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ=="; }; }; - "postcss-sass-0.2.0" = { - name = "postcss-sass"; - packageName = "postcss-sass"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.2.0.tgz"; - sha512 = "cUmYzkP747fPCQE6d+CH2l1L4VSyIlAzZsok3HPjb5Gzsq3jE+VjpAdGlPsnQ310WKWI42sw+ar0UNN59/f3hg=="; - }; - }; "postcss-sass-0.4.4" = { name = "postcss-sass"; packageName = "postcss-sass"; @@ -50756,15 +52565,6 @@ let sha512 = "BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg=="; }; }; - "postcss-scss-1.0.6" = { - name = "postcss-scss"; - packageName = "postcss-scss"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-scss/-/postcss-scss-1.0.6.tgz"; - sha512 = "4EFYGHcEw+H3E06PT/pQQri06u/1VIIPjeJQaM8skB80vZuXMhp4cSNV5azmdNkontnOID/XYWEvEEELLFB1ww=="; - }; - }; "postcss-scss-2.1.1" = { name = "postcss-scss"; packageName = "postcss-scss"; @@ -50846,42 +52646,6 @@ let sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; }; }; - "postgres-array-2.0.0" = { - name = "postgres-array"; - packageName = "postgres-array"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz"; - sha512 = "VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="; - }; - }; - "postgres-bytea-1.0.0" = { - name = "postgres-bytea"; - packageName = "postgres-bytea"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; - sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; - }; - }; - "postgres-date-1.0.7" = { - name = "postgres-date"; - packageName = "postgres-date"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz"; - sha512 = "suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="; - }; - }; - "postgres-interval-1.2.0" = { - name = "postgres-interval"; - packageName = "postgres-interval"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz"; - sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; - }; - }; "posthtml-0.11.6" = { name = "posthtml"; packageName = "posthtml"; @@ -50900,6 +52664,33 @@ let sha512 = "YugEJ5ze/0DLRIVBjCpDwANWL4pPj1kHJ/2llY8xuInr0nbkon3qTiMPe5LQa+cCwNjxS7nAZZTp+1M+6mT4Zg=="; }; }; + "posthtml-0.16.6" = { + name = "posthtml"; + packageName = "posthtml"; + version = "0.16.6"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.16.6.tgz"; + sha512 = "JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ=="; + }; + }; + "posthtml-parser-0.10.2" = { + name = "posthtml-parser"; + packageName = "posthtml-parser"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.10.2.tgz"; + sha512 = "PId6zZ/2lyJi9LiKfe+i2xv57oEjJgWbsHGGANwos5AvdQp98i6AtamAl8gzSVFGfQ43Glb5D614cvZf012VKg=="; + }; + }; + "posthtml-parser-0.11.0" = { + name = "posthtml-parser"; + packageName = "posthtml-parser"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.11.0.tgz"; + sha512 = "QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw=="; + }; + }; "posthtml-parser-0.4.2" = { name = "posthtml-parser"; packageName = "posthtml-parser"; @@ -50927,6 +52718,15 @@ let sha512 = "W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw=="; }; }; + "posthtml-render-3.0.0" = { + name = "posthtml-render"; + packageName = "posthtml-render"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-3.0.0.tgz"; + sha512 = "z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA=="; + }; + }; "potpack-1.0.2" = { name = "potpack"; packageName = "potpack"; @@ -51206,6 +53006,15 @@ let sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; }; }; + "prebuild-install-7.0.1" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.0.1.tgz"; + sha512 = "QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg=="; + }; + }; "precond-0.2.3" = { name = "precond"; packageName = "precond"; @@ -51305,6 +53114,15 @@ let sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; + "prettier-2.4.1" = { + name = "prettier"; + packageName = "prettier"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz"; + sha512 = "9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA=="; + }; + }; "prettier-2.5.1" = { name = "prettier"; packageName = "prettier"; @@ -51314,6 +53132,15 @@ let sha512 = "vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg=="; }; }; + "prettier-2.6.1" = { + name = "prettier"; + packageName = "prettier"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.6.1.tgz"; + sha512 = "8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A=="; + }; + }; "prettier-bytes-1.0.4" = { name = "prettier-bytes"; packageName = "prettier-bytes"; @@ -51323,15 +53150,6 @@ let sha1 = "994b02aa46f699c50b6257b5faaa7fe2557e62d6"; }; }; - "prettier-eslint-12.0.0" = { - name = "prettier-eslint"; - packageName = "prettier-eslint"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-12.0.0.tgz"; - sha512 = "N8SGGQwAosISXTNl1E57sBbtnqUGlyRWjcfIUxyD3HF4ynehA9GZ8IfJgiep/OfYvCof/JEpy9ZqSl250Wia7A=="; - }; - }; "prettier-eslint-8.8.2" = { name = "prettier-eslint"; packageName = "prettier-eslint"; @@ -51341,6 +53159,15 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; + "prettier-linter-helpers-1.0.0" = { + name = "prettier-linter-helpers"; + packageName = "prettier-linter-helpers"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; + sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; + }; + }; "prettier-plugin-svelte-2.6.0" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; @@ -51350,15 +53177,6 @@ let sha512 = "NPSRf6Y5rufRlBleok/pqg4+1FyGsL0zYhkYP6hnueeL1J/uCm3OfOZPsLX4zqD9VAdcXfyEL2PYqGv8ZoOSfA=="; }; }; - "prettier-stylelint-0.4.2" = { - name = "prettier-stylelint"; - packageName = "prettier-stylelint"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier-stylelint/-/prettier-stylelint-0.4.2.tgz"; - sha512 = "CmatjDsW8xKMtWg/Tc6/W02wC59p50kkItrXmkgbhR4b2EKMU5Pm55x1WuCahkkZeZoNVReWRxA8VL/s69mkBg=="; - }; - }; "prettier-tslint-0.4.2" = { name = "prettier-tslint"; packageName = "prettier-tslint"; @@ -51368,15 +53186,6 @@ let sha512 = "urhX7U/F+fu8sztEs/Z7CxNS8PdEytEwGKhQaH5fxxCdRmHGT45FoClyDlcZrMk9cK/8JpX/asFmTOHtSGJfLg=="; }; }; - "pretty-bytes-1.0.4" = { - name = "pretty-bytes"; - packageName = "pretty-bytes"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz"; - sha1 = "0a22e8210609ad35542f8c8d5d2159aff0751c84"; - }; - }; "pretty-bytes-4.0.2" = { name = "pretty-bytes"; packageName = "pretty-bytes"; @@ -51422,6 +53231,15 @@ let sha512 = "7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg=="; }; }; + "pretty-format-27.5.1" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "27.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz"; + sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="; + }; + }; "pretty-hash-1.0.1" = { name = "pretty-hash"; packageName = "pretty-hash"; @@ -51458,15 +53276,6 @@ let sha512 = "rksPWtoZb2ZpT5OVgtmy0KHVM+Dca3iVwWY9ifwhcexfjebtgjg3wmrUt9PvJ59XIYBcknQeYHD8IAnVlh9lAw=="; }; }; - "prettyoutput-1.2.0" = { - name = "prettyoutput"; - packageName = "prettyoutput"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prettyoutput/-/prettyoutput-1.2.0.tgz"; - sha512 = "G2gJwLzLcYS+2m6bTAe+CcDpwak9YpcvpScI0tE4WYb2O3lEZD/YywkMNpGqsSx5wttGvh2UXaKROTKKCyM2dw=="; - }; - }; "prfun-2.1.5" = { name = "prfun"; packageName = "prfun"; @@ -51485,13 +53294,13 @@ let sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f"; }; }; - "printj-1.1.2" = { + "printj-1.3.1" = { name = "printj"; packageName = "printj"; - version = "1.1.2"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz"; - sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="; + url = "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz"; + sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg=="; }; }; "prism-media-0.0.4" = { @@ -51503,13 +53312,13 @@ let sha512 = "dG2w7WtovUa4SiYTdWn9H8Bd4JNdei2djtkP/Bk9fXq81j5Q15ZPHYSwhUVvBRbp5zMkGtu0Yk62HuMcly0pRw=="; }; }; - "prismjs-1.26.0" = { + "prismjs-1.27.0" = { name = "prismjs"; packageName = "prismjs"; - version = "1.26.0"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.26.0.tgz"; - sha512 = "HUoH9C5Z3jKkl3UunCyiD5jwk0+Hz0fIgQ2nbwU2Oo/ceuTAQAg+pPVnfdt2TJWRVLcxKh9iuoYDUSc8clb5UQ=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.27.0.tgz"; + sha512 = "t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA=="; }; }; "private-0.1.8" = { @@ -51539,13 +53348,13 @@ let sha512 = "99PZ5+RU4gqiTfK5ZDMDkZtn6eL4WlKfFyVJV7lFQvH3iGmQ85DqMTOdxorERO26LHkevR2qsxnHp0x/2UDJPA=="; }; }; - "probing-2.0.2" = { + "probing-2.0.3" = { name = "probing"; packageName = "probing"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/probing/-/probing-2.0.2.tgz"; - sha512 = "M/gKs+NVTX4K7piUEs9geemQtyycv0UgOa4wiE4GkuudfZc/D+wd9W92juh1fK5noGzFhAYhxL0gNq9EFXL2wA=="; + url = "https://registry.npmjs.org/probing/-/probing-2.0.3.tgz"; + sha512 = "6PuKCNitH3pjTjHndVtSkb300EQCiYPKJCxfDHlu9uwEcjDc7Fipee8U9fTm5W8frVCB7Vo4V4dlwGL9WVL2OQ=="; }; }; "proc-log-1.0.0" = { @@ -51557,6 +53366,15 @@ let sha512 = "aCk8AO51s+4JyuYGg3Q/a6gnrlDO09NpVWePtjp7xwphcoQ04x5WAfCyugcsbLooWcMJ87CLkD4+604IckEdhg=="; }; }; + "proc-log-2.0.0" = { + name = "proc-log"; + packageName = "proc-log"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proc-log/-/proc-log-2.0.0.tgz"; + sha512 = "I/35MfCX2H8jBUhKN8JB8nmqvQo/nKdrBodBY7L3RhDSPPyvOHwLYNmPuhwuJq7a7C3vgFKWGQM+ecPStcvOHA=="; + }; + }; "process-0.10.1" = { name = "process"; packageName = "process"; @@ -51575,15 +53393,6 @@ let sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; }; }; - "process-exists-3.1.0" = { - name = "process-exists"; - packageName = "process-exists"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/process-exists/-/process-exists-3.1.0.tgz"; - sha512 = "X11vso1oNLtyDa2j8fsMol2fph1+5PoQ4vpEc1it/rM8eLuRTmrmTg4jfn82WhNur241AYitgjKCgmlgMRZesw=="; - }; - }; "process-exists-4.1.0" = { name = "process-exists"; packageName = "process-exists"; @@ -51701,13 +53510,22 @@ let sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q=="; }; }; - "prom-client-13.1.0" = { + "prom-client-12.0.0" = { name = "prom-client"; packageName = "prom-client"; - version = "13.1.0"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/prom-client/-/prom-client-13.1.0.tgz"; - sha512 = "jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng=="; + url = "https://registry.npmjs.org/prom-client/-/prom-client-12.0.0.tgz"; + sha512 = "JbzzHnw0VDwCvoqf8y1WDtq4wSBAbthMB1pcVI/0lzdqHGJI3KBJDXle70XK+c7Iv93Gihqo0a5LlOn+g8+DrQ=="; + }; + }; + "prom-client-14.0.1" = { + name = "prom-client"; + packageName = "prom-client"; + version = "14.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prom-client/-/prom-client-14.0.1.tgz"; + sha512 = "HxTArb6fkOntQHoRGvv4qd/BkorjliiuO2uSWC2KC17MUTKYttWdDoXX/vxOhQdkoECEM9BBH0pj2l8G8kev6w=="; }; }; "promiscuous-0.6.0" = { @@ -51809,6 +53627,15 @@ let sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; }; }; + "promise-toolbox-0.20.0" = { + name = "promise-toolbox"; + packageName = "promise-toolbox"; + version = "0.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-toolbox/-/promise-toolbox-0.20.0.tgz"; + sha512 = "VXF6waqUheD19yOU7zxsXhw/HCKlXqXwUc4jM8mchtBqZFNA+GHA7dbJsQDLHP4IUpQuTLpCQRd0lCr5z4CqXQ=="; + }; + }; "promise.prototype.finally-3.1.3" = { name = "promise.prototype.finally"; packageName = "promise.prototype.finally"; @@ -51872,13 +53699,13 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; - "prompt-1.2.1" = { + "prompt-1.2.2" = { name = "prompt"; packageName = "prompt"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/prompt/-/prompt-1.2.1.tgz"; - sha512 = "B4+2QeNDn5Cdp4kK2iOwV8qvrWpiPKlZKI9ZKkPl0C9KgeMW6DyWWqhqHiFq9vZf6zTniv+rYalK0ZlgktSwiw=="; + url = "https://registry.npmjs.org/prompt/-/prompt-1.2.2.tgz"; + sha512 = "XNXhNv3PUHJDcDkISpCwSJxtw9Bor4FZnlMUDW64N/KCPdxhfVlpD5+YUXI/Z8a9QWmOhs9KSiVtR8nzPS0BYA=="; }; }; "promptly-2.2.0" = { @@ -52106,15 +53933,6 @@ let sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; }; }; - "ps-list-4.1.0" = { - name = "ps-list"; - packageName = "ps-list"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ps-list/-/ps-list-4.1.0.tgz"; - sha512 = "DSpMj8PI5W7v2G4+rE+BymTKZPjlu6t/M1N6rPAa6Hwn+/e8jDmFJaq8/kpoGCvwd75g2h5DbjF2MduOMNyrsQ=="; - }; - }; "ps-list-6.3.0" = { name = "ps-list"; packageName = "ps-list"; @@ -52151,6 +53969,15 @@ let sha512 = "LLyJcNVKRK8AUXKcpCrZA21+mlrjzlzTLQZp/Yu279hqqQrakAu9IusT7zEddhhkQrzm6UQ9cER3nhrIZqh0hw=="; }; }; + "psbt-2.0.0" = { + name = "psbt"; + packageName = "psbt"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psbt/-/psbt-2.0.0.tgz"; + sha512 = "V3RueLeXhP/WZETCtUxFn9aaEjHKdJIp2jir1rgK3iU0fV4hC0f45wDRDrrtcFHIUyvudgzhg6Bcgr8cGaWXlA=="; + }; + }; "pseudomap-1.0.2" = { name = "pseudomap"; packageName = "pseudomap"; @@ -52403,13 +54230,13 @@ let sha512 = "yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ=="; }; }; - "pull-abortable-4.0.0" = { + "pull-abortable-4.1.1" = { name = "pull-abortable"; packageName = "pull-abortable"; - version = "4.0.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.0.0.tgz"; - sha1 = "7017a984c3b834de77bac38c10b776f22dfc1843"; + url = "https://registry.npmjs.org/pull-abortable/-/pull-abortable-4.1.1.tgz"; + sha1 = "b3ad5aefb4116b25916d26db89393ac98d0dcea1"; }; }; "pull-async-1.0.0" = { @@ -52619,13 +54446,13 @@ let sha1 = "eef915dde644bddbea8dd2e0106d544aacbcd5c2"; }; }; - "pull-goodbye-0.0.2" = { + "pull-goodbye-0.0.3" = { name = "pull-goodbye"; packageName = "pull-goodbye"; - version = "0.0.2"; + version = "0.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pull-goodbye/-/pull-goodbye-0.0.2.tgz"; - sha1 = "8d8357db55e22a710dfff0f16a8c90b45efe4171"; + url = "https://registry.npmjs.org/pull-goodbye/-/pull-goodbye-0.0.3.tgz"; + sha512 = "fl3RcIHKsxFaygdU3dcwSznLr73HYGOEU9IshpiatYSV+PW3TOUEjtfdu1L8uIsUoDajJz3HM/+mG0mFD4+v5A=="; }; }; "pull-handshake-1.1.4" = { @@ -52664,13 +54491,13 @@ let sha1 = "5f99af15e8846d48ecf625edc248ec2cf57f6b0d"; }; }; - "pull-inactivity-2.1.3" = { + "pull-inactivity-2.1.4" = { name = "pull-inactivity"; packageName = "pull-inactivity"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/pull-inactivity/-/pull-inactivity-2.1.3.tgz"; - sha512 = "swJ/jwkIN/O1bQCE3iY7Xy9r3gYuJ50MXaxZilw/HIduAy4tJu+vcz2/If0L+xNK7Ku/FfjtVbTpRTe7sf3hmA=="; + url = "https://registry.npmjs.org/pull-inactivity/-/pull-inactivity-2.1.4.tgz"; + sha512 = "W2Q+6Jk0oRMICYXBXom3/ipz2U5YPUSQUfLvVgUqL/daHop7QQB3Jz5XpnnxsekCPoM61lGvXc7kFDZt0uWzMg=="; }; }; "pull-kvdiff-0.0.0" = { @@ -52853,15 +54680,6 @@ let sha1 = "7ea97413c1619c20bc3bdf9e10e91347b03253e4"; }; }; - "pull-stream-3.5.0" = { - name = "pull-stream"; - packageName = "pull-stream"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.5.0.tgz"; - sha1 = "1ee5b6f76fd3b3a49a5afb6ded5c0320acb3cfc7"; - }; - }; "pull-stream-3.6.14" = { name = "pull-stream"; packageName = "pull-stream"; @@ -53069,13 +54887,22 @@ let sha512 = "2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w=="; }; }; - "puppeteer-13.1.1" = { + "puppeteer-13.5.1" = { name = "puppeteer"; packageName = "puppeteer"; - version = "13.1.1"; + version = "13.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.1.tgz"; - sha512 = "GwdFy1JQ43Hhxj6MraXme+XfCX2CKe18MuwToXTMEAk0txg6vUEgwqBnzErTTqDVZ7sWYrDtDaRCfD2y7ZwgGw=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-13.5.1.tgz"; + sha512 = "wWxO//vMiqxlvuzHMAJ0pRJeDHvDtM7DQpW1GKdStz2nZo2G42kOXBDgkmQ+zqjwMCFofKGesBeeKxIkX9BO+w=="; + }; + }; + "purest-3.1.0" = { + name = "purest"; + packageName = "purest"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/purest/-/purest-3.1.0.tgz"; + sha512 = "9slCC5je2UNERS/YNcrs1/7K5Bh7Uvl6OY1S+XZ6iDNMCwk8Fio6VBdrklo7eMzt5M/Wt2fQlwXRjn4puBccRQ=="; }; }; "purgecss-2.3.0" = { @@ -53123,13 +54950,31 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.212" = { + "pvtsutils-1.2.2" = { + name = "pvtsutils"; + packageName = "pvtsutils"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pvtsutils/-/pvtsutils-1.2.2.tgz"; + sha512 = "OALo5ZEdqiI127i64+CXwkCOyFHUA+tCQgaUO/MvRDFXWPr53f2sx28ECNztUEzuyu5xvuuD1EB/szg9mwJoGA=="; + }; + }; + "pvutils-1.1.3" = { + name = "pvutils"; + packageName = "pvutils"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pvutils/-/pvutils-1.1.3.tgz"; + sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; + }; + }; + "pyright-1.1.233" = { name = "pyright"; packageName = "pyright"; - version = "1.1.212"; + version = "1.1.233"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.212.tgz"; - sha512 = "bMa781bh9iSSK7yMh0f+lrhvgGJc+CSCbptg890qanpRWdADI3KGmWqruhu999GCJzLJaIPDLLDDv/V+zTPpRw=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.233.tgz"; + sha512 = "qjyKJd6mfXLwaBls4Ww0CmML+K2gA4NnTelxGktLC3JQv7ioWU7lmiQ1KSr1BnmwuuTfsaJSDN3f+hUf9YPfWg=="; }; }; "q-0.9.7" = { @@ -53348,6 +55193,15 @@ let sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; }; }; + "qs-6.9.7" = { + name = "qs"; + packageName = "qs"; + version = "6.9.7"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz"; + sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; + }; + }; "query-string-1.0.1" = { name = "query-string"; packageName = "query-string"; @@ -53384,13 +55238,13 @@ let sha512 = "XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw=="; }; }; - "query-string-7.1.0" = { + "query-string-7.1.1" = { name = "query-string"; packageName = "query-string"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-7.1.0.tgz"; - sha512 = "wnJ8covk+S9isYR5JIXPt93kFUmI2fQ4R/8130fuq+qwLiGVTurg7Klodgfw4NSz/oe7xnyi09y3lSrogUeM3g=="; + url = "https://registry.npmjs.org/query-string/-/query-string-7.1.1.tgz"; + sha512 = "MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w=="; }; }; "querystring-0.2.0" = { @@ -53591,15 +55445,6 @@ let sha512 = "GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ=="; }; }; - "ramda-0.26.1" = { - name = "ramda"; - packageName = "ramda"; - version = "0.26.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz"; - sha512 = "hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ=="; - }; - }; "ramda-0.27.2" = { name = "ramda"; packageName = "ramda"; @@ -53636,22 +55481,22 @@ let sha512 = "M1NOdkHEcjRB+acKrdQkwf8aMTnZUIGboiH6i2PMNkjfChBIJiB4j4MuhpOn+u+XU2n7GqpocPN4bzfv0jrBsg=="; }; }; - "random-access-file-2.2.0" = { + "random-access-file-2.2.1" = { name = "random-access-file"; packageName = "random-access-file"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.2.0.tgz"; - sha512 = "B744003Mj7v3EcuPl9hCiB2Ot4aZjgtU2mV6yFY1THiWU/XfGf1uSadR+SlQdJcwHgAWeG7Lbos0aUqjtj8FQg=="; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-2.2.1.tgz"; + sha512 = "RGU0xmDqdOyEiynob1KYSeh8+9c9Td1MJ74GT1viMEYAn8SJ9oBtWCXLsYZukCF46yududHOdM449uRYbzBrZQ=="; }; }; - "random-access-idb-1.2.1" = { + "random-access-idb-1.2.2" = { name = "random-access-idb"; packageName = "random-access-idb"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-idb/-/random-access-idb-1.2.1.tgz"; - sha512 = "5rZRPhjgfR222n+dmZtRYhu0CF9dDEwxaS+UgeWursIWPmNirR6BajzOB4wG5I7WAeYZea9HCqYKk/Tin3s9cA=="; + url = "https://registry.npmjs.org/random-access-idb/-/random-access-idb-1.2.2.tgz"; + sha512 = "NroFuBNVh5wVIHKN/jEYrgkkffppkfxNWFX9OEwC2VP7dYc3sa+Qxv7tMa1Gi9Jp/ObVfLeCZBt/8Sbn1WU1Xg=="; }; }; "random-access-idb-mutable-file-0.3.0" = { @@ -53681,13 +55526,13 @@ let sha512 = "pdS9Mcb9TB7oICypPRALlheaSuszuAKmLVEPKJMuYor7R/zDuHh5ALuQoS+ox31XRwQUL+tDwWH2GPdyspwelA=="; }; }; - "random-access-storage-1.4.2" = { + "random-access-storage-1.4.3" = { name = "random-access-storage"; packageName = "random-access-storage"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.4.2.tgz"; - sha512 = "nW7UQGxcihvSLuK9PahoKL0jlmw2S6yGV8DsC85xHuUBLJrUoetRbQ5LzuXTt+FWp/iXgjp12x7zh55NNghaBg=="; + url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.4.3.tgz"; + sha512 = "D5e2iIC5dNENWyBxsjhEnNOMCwZZ64TARK6dyMN+3g4OTC4MJxyjh9hKLjTGoNhDOPrgjI+YlFEHFnrp/cSnzQ=="; }; }; "random-access-web-2.0.3" = { @@ -53789,15 +55634,6 @@ let sha512 = "PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q=="; }; }; - "raven-2.6.3" = { - name = "raven"; - packageName = "raven"; - version = "2.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-2.6.3.tgz"; - sha512 = "bKre7qlDW+y1+G2bUtCuntdDYc8o5v1T233t0vmJfbj8ttGOgLrGRlYB8saelVMW9KUAJNLrhFkAKOwFWFJonw=="; - }; - }; "raven-js-3.27.2" = { name = "raven-js"; packageName = "raven-js"; @@ -53861,6 +55697,24 @@ let sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; }; }; + "raw-body-2.4.3" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz"; + sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; + }; + }; + "raw-body-2.5.1" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; + sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; + }; + }; "raw-loader-3.1.0" = { name = "raw-loader"; packageName = "raw-loader"; @@ -53942,13 +55796,13 @@ let sha512 = "wuygyq8TXUlSdVXv2kigXxQNOgdb9m7LbIjwfTNGSpaY1riLd5e+VeQjlQMyUtrk0oiyhi1AqIVynworl3qxHA=="; }; }; - "re2-1.17.3" = { + "re2-1.17.4" = { name = "re2"; packageName = "re2"; - version = "1.17.3"; + version = "1.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/re2/-/re2-1.17.3.tgz"; - sha512 = "Dp5iWVR8W3C7Nm9DziMY4BleMPRb/pe6kvfbzLv80dVYaXRc9jRnwwNqU0oE/taRm0qYR1+Qrtzk9rPjS9ecaQ=="; + url = "https://registry.npmjs.org/re2/-/re2-1.17.4.tgz"; + sha512 = "xyZ4h5PqE8I9tAxTh3G0UttcK5ufrcUxReFjGzfX61vtanNbS1XZHjnwRSyPcLgChI4KLxVgOT/ioZXnUAdoTA=="; }; }; "reachdown-1.1.0" = { @@ -53987,22 +55841,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.22.1" = { + "react-devtools-core-4.24.2" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.22.1"; + version = "4.24.2"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.22.1.tgz"; - sha512 = "pvpNDHE7p0FtcCmIWGazoY8LLVfBI9sw0Kf10kdHhPI9Tzt3OG/qEt16GrAbE0keuna5WzX3r1qPKVjqOqsuUg=="; - }; - }; - "react-dom-16.14.0" = { - name = "react-dom"; - packageName = "react-dom"; - version = "16.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz"; - sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.24.2.tgz"; + sha512 = "UC3rvQCG/dnC95NPNWBFrUEtdAEiFZ9xZe1tTHFOELVR5qfNLroZ3w9tC51NQvvK5E10G2ko3lQ5Vrh3p0bHrA=="; }; }; "react-dom-17.0.2" = { @@ -54113,6 +55958,15 @@ let sha512 = "nK6kgY28HwrMNwDnMui3dvm3rCFjZrcGiuwLc5COUipBK5hWHLOxMJhSnSomirqWwjPBJKV1QcbkI0VJr7Gl1Q=="; }; }; + "react-refresh-0.9.0" = { + name = "react-refresh"; + packageName = "react-refresh"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/react-refresh/-/react-refresh-0.9.0.tgz"; + sha512 = "Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ=="; + }; + }; "react-side-effect-2.1.1" = { name = "react-side-effect"; packageName = "react-side-effect"; @@ -54122,13 +55976,13 @@ let sha512 = "2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ=="; }; }; - "react-string-replace-0.4.4" = { + "react-string-replace-1.0.0" = { name = "react-string-replace"; packageName = "react-string-replace"; - version = "0.4.4"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-string-replace/-/react-string-replace-0.4.4.tgz"; - sha512 = "FAMkhxmDpCsGTwTZg7p/2v+/GTmxAp73so3fbSvlAcBBX36ujiGRNEaM/1u+jiYQrArhns+7eE92g2pi5E5FUA=="; + url = "https://registry.npmjs.org/react-string-replace/-/react-string-replace-1.0.0.tgz"; + sha512 = "+iLsyE4AeSmnfctgswXOf1PmKRgns6wJ4LVb+8ADMU6mDK3jvBE11QzfMQf7CYtPUUiBCDjZ9ZppzXOIYrzCRg=="; }; }; "react-tabs-3.2.3" = { @@ -54185,6 +56039,15 @@ let sha512 = "wg3LWkUpG21lhv+cZvNy+p0+vtclZw+9nP2vO6T9PKT50EN1cUq37Dq6FzcM38h/c2domE0gsUhb6jHXtGogAA=="; }; }; + "react-zoom-pan-pinch-2.1.3" = { + name = "react-zoom-pan-pinch"; + packageName = "react-zoom-pan-pinch"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/react-zoom-pan-pinch/-/react-zoom-pan-pinch-2.1.3.tgz"; + sha512 = "a5AChOWhjo0RmxsNZXGQIlNh3e3nLU6m4V6M+6dlbPNk5d+MtMxgKWyA5zpR06Lp3OZkZVF9nR8JeWSvKwck9g=="; + }; + }; "read-1.0.5" = { name = "read"; packageName = "read"; @@ -54293,13 +56156,22 @@ let sha512 = "aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng=="; }; }; - "read-package-json-4.1.1" = { + "read-package-json-4.1.2" = { name = "read-package-json"; packageName = "read-package-json"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.1.tgz"; - sha512 = "P82sbZJ3ldDrWCOSKxJT0r/CXMWR0OR3KRh55SgKo3p91GSIEEC32v3lSHAvO/UcH3/IoL7uqhOFBduAnwdldw=="; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-4.1.2.tgz"; + sha512 = "Dqer4pqzamDE2O4M55xp1qZMuLPqi4ldk2ya648FOMHRjwMzFhuxVrG04wd0c38IsvkVdr3vgHI6z+QTPdAjrQ=="; + }; + }; + "read-package-json-5.0.0" = { + name = "read-package-json"; + packageName = "read-package-json"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-5.0.0.tgz"; + sha512 = "1cjk2MV5ONDMn34uxSID3X8NY7VKsXfJnjbcVdFMvHEnJOBzU6MJ7/3yg6QFVZDq5/1yFNrKBUK9kGnonyGP2Q=="; }; }; "read-package-json-fast-2.0.3" = { @@ -54644,15 +56516,6 @@ let sha512 = "YHFvn4rBXl8eIjALjUiOV/AP3xFpyGNGNHDw9mAncAWuIdgnBKjbZQ9+P3VlsKcNaNapRVFlTEX1dvDRlYwyxg=="; }; }; - "recast-0.18.10" = { - name = "recast"; - packageName = "recast"; - version = "0.18.10"; - src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.18.10.tgz"; - sha512 = "XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ=="; - }; - }; "recast-0.20.5" = { name = "recast"; packageName = "recast"; @@ -54680,13 +56543,13 @@ let sha512 = "/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg=="; }; }; - "record-cache-1.1.1" = { + "record-cache-1.2.0" = { name = "record-cache"; packageName = "record-cache"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/record-cache/-/record-cache-1.1.1.tgz"; - sha512 = "L5hZlgWc7CmGbztnemQoKE1bLu9rtI2skOB0ttE4C5+TVszLE8Rd0YLTROSgvXKLAqPumS/soyN5tJW5wJLmJQ=="; + url = "https://registry.npmjs.org/record-cache/-/record-cache-1.2.0.tgz"; + sha512 = "kyy3HWCez2WrotaL3O4fTn0rsIdfRKOdQQcEJ9KpvmKmbffKVvwsloX063EgRUlpJIXHiDQFhJcTbZequ2uTZw=="; }; }; "recursive-readdir-2.2.2" = { @@ -54761,6 +56624,15 @@ let sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; }; }; + "redis-3.1.1" = { + name = "redis"; + packageName = "redis"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-3.1.1.tgz"; + sha512 = "QhkKhOuzhogR1NDJfBD34TQJz2ZJwDhhIC6ZmvpftlmfYShHHQXjjNspAJ+Z2HH5NwSBVYBVganbiZ8bgFMHjg=="; + }; + }; "redis-3.1.2" = { name = "redis"; packageName = "redis"; @@ -54797,13 +56669,13 @@ let sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "redoc-2.0.0-rc.59" = { + "redoc-2.0.0-rc.65" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.59"; + version = "2.0.0-rc.65"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.59.tgz"; - sha512 = "1Wkj/HSCv5CdtwF7FSZc5L0EeBgI0N7YpAIsatMtfiMHEon0WhuArAkc5rMQ6mQXUPRrqq5Fs6QPc4GpNp6DuA=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.65.tgz"; + sha512 = "VqJbhb3krYXFP8De7ygyaWsA4jr9K5avsMo3GJUDv2xPiHTOzcprkIfOaL4ZdINn03x6JT1GOa47cWhrmb5KVA=="; }; }; "reduce-component-1.0.1" = { @@ -54878,22 +56750,13 @@ let sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; - "regenerate-unicode-properties-9.0.0" = { + "regenerate-unicode-properties-10.0.1" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "9.0.0"; + version = "10.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz"; - sha512 = "3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA=="; - }; - }; - "regenerator-runtime-0.10.5" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; - sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz"; + sha512 = "vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw=="; }; }; "regenerator-runtime-0.11.1" = { @@ -54986,13 +56849,13 @@ let sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; }; - "regexpu-core-4.8.0" = { + "regexpu-core-5.0.1" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "4.8.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz"; - sha512 = "1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz"; + sha512 = "CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw=="; }; }; "register-protocol-win32-1.1.0" = { @@ -55049,22 +56912,22 @@ let sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; }; }; - "regjsgen-0.5.2" = { + "regjsgen-0.6.0" = { name = "regjsgen"; packageName = "regjsgen"; - version = "0.5.2"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz"; - sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; + url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz"; + sha512 = "ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="; }; }; - "regjsparser-0.7.0" = { + "regjsparser-0.8.4" = { name = "regjsparser"; packageName = "regjsparser"; - version = "0.7.0"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz"; - sha512 = "A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ=="; + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz"; + sha512 = "J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA=="; }; }; "rehype-parse-6.0.2" = { @@ -55085,13 +56948,13 @@ let sha512 = "fOiR9a9xH+Le19i4fGzIEowAbwG7idy2Jzs4mOrFWBSJ0sNUgy0ev871dwWnbOo371SjgjG4pwzrbgSVrKxecw=="; }; }; - "rehype-parse-8.0.3" = { + "rehype-parse-8.0.4" = { name = "rehype-parse"; packageName = "rehype-parse"; - version = "8.0.3"; + version = "8.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/rehype-parse/-/rehype-parse-8.0.3.tgz"; - sha512 = "RGw0CVt+0S6KdvpE8bbP2Db9WXclQcIX7A0ufM3QFqAhTo/ddJMQrrI2j3cijlRPZlGK8R3pRgC8U5HyV76IDw=="; + url = "https://registry.npmjs.org/rehype-parse/-/rehype-parse-8.0.4.tgz"; + sha512 = "MJJKONunHjoTh4kc3dsM1v3C9kGrrxvA3U8PxZlP2SjH8RNUSrb+lF7Y0KVaUDnGH2QZ5vAn7ulkiajM9ifuqg=="; }; }; "rehype-retext-2.0.4" = { @@ -55184,15 +57047,6 @@ let sha1 = "802a38c3aa98c9e1e3ea015eeba211d27cb65e1f"; }; }; - "remark-8.0.0" = { - name = "remark"; - packageName = "remark"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark/-/remark-8.0.0.tgz"; - sha512 = "K0PTsaZvJlXTl9DN6qYlvjTkqSZBFELhROZMrblm2rB+085flN84nz4g/BscKRMqDvhzlK1oQ/xnWQumdeNZYw=="; - }; - }; "remark-footnotes-3.0.0" = { name = "remark-footnotes"; packageName = "remark-footnotes"; @@ -55742,15 +57596,6 @@ let sha512 = "1fUyHr2jLsVOkhbvPRBJ5zTKZZyD6yZzYaWCS6BPBdQ8vEMBCH+9zNCDA6tET/zHCi/jLqjCWtlJZUPk+DbnFw=="; }; }; - "remark-parse-4.0.0" = { - name = "remark-parse"; - packageName = "remark-parse"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-parse/-/remark-parse-4.0.0.tgz"; - sha512 = "XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw=="; - }; - }; "remark-parse-5.0.0" = { name = "remark-parse"; packageName = "remark-parse"; @@ -55796,15 +57641,6 @@ let sha512 = "h3kOjKNy7oJfohqXlKp+W4YDigHD3rw01x91qvQP/cUkK5nJrDl6yEYwTujQCAXSLZrsBxywlK3ntzIX6c29aA=="; }; }; - "remark-stringify-4.0.0" = { - name = "remark-stringify"; - packageName = "remark-stringify"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-4.0.0.tgz"; - sha512 = "xLuyKTnuQer3ke9hkU38SUYLiTmS078QOnoFavztmbt/pAJtNSkNtFgR0U//uCcmG0qnyxao+PDuatQav46F1w=="; - }; - }; "remark-stringify-8.1.1" = { name = "remark-stringify"; packageName = "remark-stringify"; @@ -55940,6 +57776,15 @@ let sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; }; }; + "replace-buffer-1.2.1" = { + name = "replace-buffer"; + packageName = "replace-buffer"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-buffer/-/replace-buffer-1.2.1.tgz"; + sha512 = "ly3OKwKu+3T55DjP5PjIMzxgz9lFx6dQnBmAIxryZyRKl8f22juy12ShOyuq8WrQE5UlFOseZgQZDua0iF9DHw=="; + }; + }; "replace-ext-0.0.1" = { name = "replace-ext"; packageName = "replace-ext"; @@ -55976,15 +57821,6 @@ let sha1 = "e87f6d513b928dde808260c12be7fec6ff6e798c"; }; }; - "replaceall-0.1.6" = { - name = "replaceall"; - packageName = "replaceall"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/replaceall/-/replaceall-0.1.6.tgz"; - sha1 = "81d81ac7aeb72d7f5c4942adf2697a3220688d8e"; - }; - }; "request-2.76.0" = { name = "request"; packageName = "request"; @@ -56039,6 +57875,15 @@ let sha1 = "f017ac5b2060e1c4fc9677575c381a08249d5bf7"; }; }; + "request-compose-1.2.3" = { + name = "request-compose"; + packageName = "request-compose"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/request-compose/-/request-compose-1.2.3.tgz"; + sha512 = "i2m8y3kEveoaAVTsTqig2LmWI10bUdakqzIVHkTEAK8kcsr4a/+iL93tsujsLaMiCZmnB1Osdk3WEMsB//H66A=="; + }; + }; "request-light-0.2.5" = { name = "request-light"; packageName = "request-light"; @@ -56066,6 +57911,15 @@ let sha512 = "i/wKzvcx7Er8tZnvqSxWuNO5ZGggu2UgZAqj/RyZ0si7lBTXL7kZiI/dWxzxnQjaY7s5HEy1qK21Do4Ncr6cVw=="; }; }; + "request-oauth-0.0.3" = { + name = "request-oauth"; + packageName = "request-oauth"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/request-oauth/-/request-oauth-0.0.3.tgz"; + sha512 = "q7WdJlpIcPaIDac0FZSy/yH37FO3UkUuPDIsiLALiLjuC6vzvuKIU14YIC3Lm0wtQRXS9GqvSo/fCYj8n75xSw=="; + }; + }; "request-progress-2.0.1" = { name = "request-progress"; packageName = "request-progress"; @@ -56102,13 +57956,13 @@ let sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; - "requestretry-4.1.2" = { + "requestretry-7.0.2" = { name = "requestretry"; packageName = "requestretry"; - version = "4.1.2"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/requestretry/-/requestretry-4.1.2.tgz"; - sha512 = "N1WAp+8eOy8NfsVBChcSxNCKvPY1azOpliQ4Sby4WDe0HFEhdKywlNZeROMBQ+BI3Jpc0eNOT1KVFGREawtahA=="; + url = "https://registry.npmjs.org/requestretry/-/requestretry-7.0.2.tgz"; + sha512 = "Zz8z7G2OuVs4F0wR0shKMEMm7lNvPNHM0UIHNns9qfyuBDKSExoTsZGtSjKst6nPEwlMrbA9G+m/yC0AbGj+8w=="; }; }; "require-directory-2.1.1" = { @@ -56237,22 +58091,13 @@ let sha512 = "LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="; }; }; - "resolve-1.20.0" = { + "resolve-1.22.0" = { name = "resolve"; packageName = "resolve"; - version = "1.20.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; - sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; - }; - }; - "resolve-1.21.1" = { - name = "resolve"; - packageName = "resolve"; - version = "1.21.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.21.1.tgz"; - sha512 = "lfEImVbnolPuaSZuLQ52cAxPBHeI77sPwCOWRdy12UG/CNa8an7oBHH1R+Fp1/mUqSJi4c8TIP6FOIPSZAUrEQ=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; + sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; }; }; "resolve-1.7.1" = { @@ -56876,6 +58721,15 @@ let sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; }; }; + "roboto-fontface-0.10.0" = { + name = "roboto-fontface"; + packageName = "roboto-fontface"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.10.0.tgz"; + sha512 = "OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g=="; + }; + }; "robust-predicates-3.0.1" = { name = "robust-predicates"; packageName = "robust-predicates"; @@ -57218,13 +59072,13 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "rxjs-7.5.2" = { + "rxjs-7.5.5" = { name = "rxjs"; packageName = "rxjs"; - version = "7.5.2"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.2.tgz"; - sha512 = "PwDt186XaL3QN5qXj/H9DGyHhP3/RYYgZZwqBv9Tv8rsAaiwFH1IsJJlcgD37J7UW5a6O67qX0KWKS3/pu0m4w=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz"; + sha512 = "sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw=="; }; }; "s3-stream-upload-2.0.2" = { @@ -57290,6 +59144,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-buffer-5.2.0" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz"; + sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="; + }; + }; "safe-buffer-5.2.1" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -57317,15 +59180,6 @@ let sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; }; }; - "safe-stable-stringify-1.1.1" = { - name = "safe-stable-stringify"; - packageName = "safe-stable-stringify"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz"; - sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="; - }; - }; "safe-stable-stringify-2.3.1" = { name = "safe-stable-stringify"; packageName = "safe-stable-stringify"; @@ -57416,13 +59270,40 @@ let sha1 = "478be1429500fcfaa780be88b3343ced7d2a9182"; }; }; - "sass-1.49.0" = { + "saslprep-1.0.3" = { + name = "saslprep"; + packageName = "saslprep"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz"; + sha512 = "/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag=="; + }; + }; + "sass-1.32.12" = { name = "sass"; packageName = "sass"; - version = "1.49.0"; + version = "1.32.12"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz"; - sha512 = "TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.12.tgz"; + sha512 = "zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA=="; + }; + }; + "sass-1.49.9" = { + name = "sass"; + packageName = "sass"; + version = "1.49.9"; + src = fetchurl { + url = "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz"; + sha512 = "YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A=="; + }; + }; + "sass-loader-10.2.0" = { + name = "sass-loader"; + packageName = "sass-loader"; + version = "10.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-10.2.0.tgz"; + sha512 = "kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw=="; }; }; "sax-0.5.8" = { @@ -57488,15 +59369,6 @@ let sha512 = "agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ=="; }; }; - "scheduler-0.19.1" = { - name = "scheduler"; - packageName = "scheduler"; - version = "0.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz"; - sha512 = "n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA=="; - }; - }; "scheduler-0.20.2" = { name = "scheduler"; packageName = "scheduler"; @@ -57578,15 +59450,6 @@ let sha512 = "jhXqQAQVM+8Xj5EjJGVweuEzgtGWb3tmEEpl3CLP3cStInSbVHSg0QWOGQzNq8pSID4JkpeV2mPqlMDLrm0/Vw=="; }; }; - "sec-1.0.0" = { - name = "sec"; - packageName = "sec"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sec/-/sec-1.0.0.tgz"; - sha1 = "033d60a3ad20ecf2e00940d14f97823465774335"; - }; - }; "secp256k1-4.0.2" = { name = "secp256k1"; packageName = "secp256k1"; @@ -57605,22 +59468,22 @@ let sha512 = "NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA=="; }; }; - "secret-handshake-1.1.20" = { + "secret-handshake-1.1.21" = { name = "secret-handshake"; packageName = "secret-handshake"; - version = "1.1.20"; + version = "1.1.21"; src = fetchurl { - url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.20.tgz"; - sha512 = "sDtmZDpibGH2ixj3FOmsC3Z/b08eaB2/KAvy2oSp4qvcGdhatBSfb1RdVpwjQl5c3J83WbBo1HSZ7DBtMu43lA=="; + url = "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.21.tgz"; + sha512 = "e02+IddZv40tNJmaRZNZ6aYje95h9MvmpmbOg2PVjLKRA5p9QnrQypJlVE2dU516TyYc9jikBjqhXV1IlkwNUw=="; }; }; - "secret-stack-6.4.0" = { + "secret-stack-6.4.1" = { name = "secret-stack"; packageName = "secret-stack"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.4.0.tgz"; - sha512 = "Vnc2bItbjMw5WUtQtxLL4Atl17KaUHdLdxIb3a89CQTAo/1G1YjmiNe2GAAgZHSBi6UYRoB/oRmuJz8HLZmnmA=="; + url = "https://registry.npmjs.org/secret-stack/-/secret-stack-6.4.1.tgz"; + sha512 = "7rRcTEj7t0H3ShMKQvv7QGYAUFjVRmDqNNgrvpdedVlVnEIyfkZu0RaFPpes6yUSiE9Iwi0lHi03+6HsltLCMA=="; }; }; "secretstream-stream-2.0.0" = { @@ -57632,6 +59495,15 @@ let sha512 = "5w3SlraZgFADOa5ScmJIXB/D/Qm2rFksmRNHSs913P9Z6s9ODsknAi85zni1v0KmTd4DovNKxHr3HCObYHes7Q=="; }; }; + "section-matter-1.0.0" = { + name = "section-matter"; + packageName = "section-matter"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz"; + sha512 = "vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA=="; + }; + }; "secure-compare-3.0.1" = { name = "secure-compare"; packageName = "secure-compare"; @@ -57668,6 +59540,15 @@ let sha512 = "e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ=="; }; }; + "selderee-0.6.0" = { + name = "selderee"; + packageName = "selderee"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/selderee/-/selderee-0.6.0.tgz"; + sha512 = "ibqWGV5aChDvfVdqNYuaJP/HnVBhlRGSRrlbttmlMpHcLuTqqbMH36QkSs9GEgj5M88JDYLI8eyP94JaQ8xRlg=="; + }; + }; "select-hose-2.0.0" = { name = "select-hose"; packageName = "select-hose"; @@ -57686,13 +59567,13 @@ let sha512 = "lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA=="; }; }; - "selfsigned-2.0.0" = { + "selfsigned-2.0.1" = { name = "selfsigned"; packageName = "selfsigned"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.0.tgz"; - sha512 = "cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ=="; + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz"; + sha512 = "LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ=="; }; }; "semaphore-async-await-1.5.1" = { @@ -57722,15 +59603,6 @@ let sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; }; }; - "semver-4.3.2" = { - name = "semver"; - packageName = "semver"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-4.3.2.tgz"; - sha1 = "c7a07158a80bedd052355b770d82d6640f803be7"; - }; - }; "semver-4.3.6" = { name = "semver"; packageName = "semver"; @@ -57965,6 +59837,15 @@ let sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; }; }; + "send-0.18.0" = { + name = "send"; + packageName = "send"; + version = "0.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; + sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; + }; + }; "sentence-splitter-2.3.2" = { name = "sentence-splitter"; packageName = "sentence-splitter"; @@ -58001,6 +59882,15 @@ let sha1 = "ae02af3a424793d8ccbf212d69174e0c54dffe38"; }; }; + "serialize-error-2.1.0" = { + name = "serialize-error"; + packageName = "serialize-error"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz"; + sha1 = "50b679d5635cdf84667bdc8e59af4e5b81d5f60a"; + }; + }; "serialize-error-6.0.0" = { name = "serialize-error"; packageName = "serialize-error"; @@ -58118,6 +60008,15 @@ let sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; }; }; + "serve-static-1.15.0" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"; + sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; + }; + }; "server-destroy-1.0.1" = { name = "server-destroy"; packageName = "server-destroy"; @@ -58271,13 +60170,13 @@ let sha512 = "kehYuigMoRkIngCv7rhgruLJNNHDnitGTBdkcYbCbooL8Cidj/bS78MDxByIjcc69M915WxcQTgZetZ1JbeQTQ=="; }; }; - "sha512-wasm-2.3.3" = { + "sha512-wasm-2.3.4" = { name = "sha512-wasm"; packageName = "sha512-wasm"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/sha512-wasm/-/sha512-wasm-2.3.3.tgz"; - sha512 = "x8McxarTu+Wv5hu5TQE4qgSSGQ3JOX/OmkhLGVty+ajcEN6zLPqTS6Ljt/N6Gl2jI+3y0wjj+RxDxy8Ca9Krfw=="; + url = "https://registry.npmjs.org/sha512-wasm/-/sha512-wasm-2.3.4.tgz"; + sha512 = "akWoxJPGCB3aZCrZ+fm6VIFhJ/p8idBv7AWGFng/CZIrQo51oQNsvDbTSRXWAzIiZJvpy16oIDiCCPqTe21sKg=="; }; }; "shallow-clone-3.0.1" = { @@ -58397,15 +60296,6 @@ let sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; }; }; - "shelljs-0.3.0" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; - sha1 = "3596e6307a781544f591f37da618360f31db57b1"; - }; - }; "shelljs-0.7.8" = { name = "shelljs"; packageName = "shelljs"; @@ -58550,13 +60440,13 @@ let sha512 = "xhdh7fHyMsr0m/w2kDfRJuBFRS96b9l8ZPNWGaQ+PMvnUnZ/Eh+gJJ9NsHBd7P9k0399WYlCLzsy18EaMfyadA=="; }; }; - "shush-1.0.0" = { + "shush-1.0.1" = { name = "shush"; packageName = "shush"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/shush/-/shush-1.0.0.tgz"; - sha1 = "c27415a9e458f2fed39b27cf8eb37c003782b431"; + url = "https://registry.npmjs.org/shush/-/shush-1.0.1.tgz"; + sha512 = "baDDBPaPcFwVeQNfj1lYkE/NkqQr1WkXUlOePHnA5I8hw9Fz0Tu72ZC0XENeV4tM9tesaGA/Wi2mW07EOeKRuQ=="; }; }; "side-channel-1.0.4" = { @@ -58586,22 +60476,22 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-3.9.0" = { + "sign-addon-3.11.0" = { name = "sign-addon"; packageName = "sign-addon"; - version = "3.9.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.9.0.tgz"; - sha512 = "a8IzM3jNPSHcf2wSkhLgME4QrIe+rKTb8y/qYwGGzby5ktODAH+WBsKIgGZ9p5d2mpppPwbNEsA+YzcL117bbA=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.11.0.tgz"; + sha512 = "fcK2WzkMb8e8E9kvuccy+mrBTT81iR+1CowHLU594Elr4E9E9zZFr3itGlL0OoXcRouKmvt7rpXzoARu++tXRQ=="; }; }; - "signal-exit-3.0.6" = { + "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz"; - sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; "signals-1.0.0" = { @@ -58631,31 +60521,31 @@ let sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; }; }; - "simple-get-2.8.1" = { + "simple-get-2.8.2" = { name = "simple-get"; packageName = "simple-get"; - version = "2.8.1"; + version = "2.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz"; - sha512 = "lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw=="; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.8.2.tgz"; + sha512 = "Ijd/rV5o+mSBBs4F/x9oDPtTx9Zb6X9brmnXvMW4J7IR15ngi9q5xxqWBKU744jTZiaXtxaPL7uHG6vtN8kUkw=="; }; }; - "simple-get-3.1.0" = { + "simple-get-3.1.1" = { name = "simple-get"; packageName = "simple-get"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz"; - sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA=="; + url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz"; + sha512 = "CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA=="; }; }; - "simple-get-4.0.0" = { + "simple-get-4.0.1" = { name = "simple-get"; packageName = "simple-get"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-4.0.0.tgz"; - sha512 = "ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ=="; + url = "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz"; + sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; }; "simple-git-1.132.0" = { @@ -58685,6 +60575,15 @@ let sha512 = "z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A=="; }; }; + "simple-git-3.4.0" = { + name = "simple-git"; + packageName = "simple-git"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.4.0.tgz"; + sha512 = "sBRdudUc1yvi0xQQPuHXc1L9gTWkRn4hP2bbc7q4BTxR502d3JJAGsDOhrmsBY+wAZAw5JLl82tx55fSWYE65w=="; + }; + }; "simple-handshake-3.0.0" = { name = "simple-handshake"; packageName = "simple-handshake"; @@ -58730,13 +60629,13 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "simple-peer-9.11.0" = { + "simple-peer-9.11.1" = { name = "simple-peer"; packageName = "simple-peer"; - version = "9.11.0"; + version = "9.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.11.0.tgz"; - sha512 = "qvdNu/dGMHBm2uQ7oLhQBMhYlrOZC1ywXNCH/i8I4etxR1vrjCnU6ZSQBptndB1gcakjo2+w4OHo7Sjza1SHxg=="; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.11.1.tgz"; + sha512 = "D1SaWpOW8afq1CZGWB8xTfrT3FekjQmPValrqncJMX7QFl8YwhrPTZvMCANLtgBwwdS+7zURyqxDDEmY558tTw=="; }; }; "simple-plist-1.3.0" = { @@ -58820,13 +60719,13 @@ let sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364"; }; }; - "siphash24-1.3.0" = { + "siphash24-1.3.1" = { name = "siphash24"; packageName = "siphash24"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/siphash24/-/siphash24-1.3.0.tgz"; - sha512 = "2HvNPUYcmoFks2IX2wI5D80NspdlgSJlCmPencbBMWhrZnNW3sgiC7owaB2Jj/9IiV9bdN2A00LaM8IcojB8rw=="; + url = "https://registry.npmjs.org/siphash24/-/siphash24-1.3.1.tgz"; + sha512 = "moemC3ZKiTzH29nbFo3Iw8fbemWWod4vNs/WgKbQ54oEs6mE6XVlguxvinYjB+UmaE0PThgyED9fUkWvirT8hA=="; }; }; "siphash24-universal-1.0.0" = { @@ -59054,6 +60953,15 @@ let sha512 = "hLdVp5vqzrEEJSAQKSmURvBVImQj9oVbp7zBP6JLEmSenUGhc6kl9nrSXUj14JHiQcnKF80eRAWPsdUcV6YXFw=="; }; }; + "smoothscroll-polyfill-0.4.4" = { + name = "smoothscroll-polyfill"; + packageName = "smoothscroll-polyfill"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz"; + sha512 = "TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg=="; + }; + }; "snabbdom-0.7.0" = { name = "snabbdom"; packageName = "snabbdom"; @@ -59108,15 +61016,6 @@ let sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; }; }; - "snappy-6.3.5" = { - name = "snappy"; - packageName = "snappy"; - version = "6.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/snappy/-/snappy-6.3.5.tgz"; - sha512 = "lonrUtdp1b1uDn1dbwgQbBsb5BbaiLeKq+AGwOk2No+en+VvJThwmtztwulEQsLinRF681pBqib0NUZaizKLIA=="; - }; - }; "snapsvg-0.5.1" = { name = "snapsvg"; packageName = "snapsvg"; @@ -59171,15 +61070,6 @@ let sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg=="; }; }; - "socket.io-2.4.0" = { - name = "socket.io"; - packageName = "socket.io"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.4.0.tgz"; - sha512 = "9UPJ1UTvKayuQfVv2IQ3k7tCQC/fboDyIK62i99dAQIyHKaBsNdTpwHLgKJ6guRWxRtC9H+138UwpaGuQO9uWQ=="; - }; - }; "socket.io-2.4.1" = { name = "socket.io"; packageName = "socket.io"; @@ -59198,13 +61088,13 @@ let sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; }; }; - "socket.io-4.1.3" = { + "socket.io-4.3.1" = { name = "socket.io"; packageName = "socket.io"; - version = "4.1.3"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.3.tgz"; - sha512 = "tLkaY13RcO4nIRh1K2hT5iuotfTaIQw7cVIe0FUykN3SuQi0cm7ALxuyT5/CtDswOMWUzMGTibxYNx/gU7In+Q=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.3.1.tgz"; + sha512 = "HC5w5Olv2XZ0XJ4gOLGzzHEuOCfj3G0SmoW3jLHYYh34EVsIr3EkW9h6kgfW+K3TFEcmYy8JcPWe//KUkBp5jA=="; }; }; "socket.io-4.4.1" = { @@ -59288,6 +61178,24 @@ let sha512 = "M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ=="; }; }; + "socket.io-client-4.3.2" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.3.2.tgz"; + sha512 = "2B9LqSunN60yV8F7S84CCEEcgbYNfrn7ejIInZtLZ7ppWtiX8rGZAjvdCvbnC8bqo/9RlCNOUsORLyskxSFP1g=="; + }; + }; + "socket.io-client-4.4.1" = { + name = "socket.io-client"; + packageName = "socket.io-client"; + version = "4.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.4.1.tgz"; + sha512 = "N5C/L5fLNha5Ojd7Yeb/puKcPWWcoB/A09fEjjNsg91EDVr5twk/OEyO6VT9dlLSUNY85NpW6KBhVMvaLKQ3vQ=="; + }; + }; "socket.io-parser-2.1.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; @@ -59342,6 +61250,15 @@ let sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g=="; }; }; + "socket.io-parser-4.1.2" = { + name = "socket.io-parser"; + packageName = "socket.io-parser"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.1.2.tgz"; + sha512 = "j3kk71QLJuyQ/hh5F/L2t1goqzdTL0gvDzuhTuNSwihfuFUrcSji0qFZmJJPtG6Rmug153eOPsUizeirf1IIog=="; + }; + }; "sockjs-0.3.20" = { name = "sockjs"; packageName = "sockjs"; @@ -59369,22 +61286,22 @@ let sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; }; }; - "sockjs-client-1.5.2" = { + "sockjs-client-1.6.0" = { name = "sockjs-client"; packageName = "sockjs-client"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.2.tgz"; - sha512 = "ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ=="; + url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.6.0.tgz"; + sha512 = "qVHJlyfdHFht3eBFZdKEXKTlb7I4IV41xnVNo8yUKA1UHcPJwgW2SvTq9LhnjjCywSkSK7c/e4nghU0GOoMCRQ=="; }; }; - "socks-2.6.1" = { + "socks-2.6.2" = { name = "socks"; packageName = "socks"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz"; - sha512 = "kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA=="; + url = "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz"; + sha512 = "zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA=="; }; }; "socks-proxy-agent-5.0.1" = { @@ -59405,6 +61322,15 @@ let sha512 = "t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew=="; }; }; + "socks-proxy-agent-6.2.0-beta.0" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "6.2.0-beta.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.0-beta.0.tgz"; + sha512 = "vJVDGsyaBh7cP8BfynQV1sSqiZ045FkNTyaWLz1g4Ut3sCIuO52sxK0ix8yvqf5n0teDyY1Pw4NRclRiuGTV+w=="; + }; + }; "socks5-client-1.2.8" = { name = "socks5-client"; packageName = "socks5-client"; @@ -59477,13 +61403,13 @@ let sha512 = "Uk+JpqHEbzsEmiMxwL7TB/ndhMEpc52KdReYXXSIX2oRFPaI7ZDlDImF8KbkFWbYl9BJRtc82AZ/kNf4/0n9KA=="; }; }; - "sodium-javascript-0.7.4" = { + "sodium-javascript-0.8.0" = { name = "sodium-javascript"; packageName = "sodium-javascript"; - version = "0.7.4"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.7.4.tgz"; - sha512 = "YUkucU81C0SUYzxcFFLOupOj89BlKA8MU8iTc7vTtd9hwgM/Awxwzz3tuoLGLHhnMxotUBB7Xl0rBeSoIn2yGQ=="; + url = "https://registry.npmjs.org/sodium-javascript/-/sodium-javascript-0.8.0.tgz"; + sha512 = "rEBzR5mPxPES+UjyMDvKPIXy9ImF17KOJ32nJNi9uIquWpS/nfj+h6m05J5yLJaGXjgM72LmQoUbWZVxh/rmGg=="; }; }; "sodium-native-2.4.9" = { @@ -59513,13 +61439,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sodium-universal-3.0.4" = { + "sodium-universal-3.1.0" = { name = "sodium-universal"; packageName = "sodium-universal"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-3.0.4.tgz"; - sha512 = "WnBQ0GDo/82shKQHZBZT9h4q4miCtxkbzcwVLsCBPWNq4qbq8BXhKICt9nPwQAsJ43ct/rF61FKu4t0druUBug=="; + url = "https://registry.npmjs.org/sodium-universal/-/sodium-universal-3.1.0.tgz"; + sha512 = "N2gxk68Kg2qZLSJ4h0NffEhp4BjgWHCHXVlDi1aG1hA3y+ZeWEmHqnpml8Hy47QzfL1xLy5nwr9LcsWAg2Ep0A=="; }; }; "sonic-boom-2.4.2" = { @@ -59549,13 +61475,13 @@ let sha1 = "8ae90ad7d7cb05fc59f1ab0c637845d5c15a52b7"; }; }; - "sort-json-2.0.0" = { + "sort-json-2.0.1" = { name = "sort-json"; packageName = "sort-json"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/sort-json/-/sort-json-2.0.0.tgz"; - sha512 = "OgXPErPJM/rBK5OhzIJ+etib/BmLQ1JY55Nb/ElhoWUec62pXNF/X6DrecHq3NW5OAGX0KxYD7m0HtgB9dvGeA=="; + url = "https://registry.npmjs.org/sort-json/-/sort-json-2.0.1.tgz"; + sha512 = "s8cs2bcsQCzo/P2T/uoU6Js4dS/jnX8+4xunziNoq9qmSpZNCrRIAIvp4avsz0ST18HycV4z/7myJ7jsHWB2XQ=="; }; }; "sort-keys-1.1.2" = { @@ -59702,15 +61628,6 @@ let sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; }; - "source-map-js-0.6.2" = { - name = "source-map-js"; - packageName = "source-map-js"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz"; - sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="; - }; - }; "source-map-js-1.0.2" = { name = "source-map-js"; packageName = "source-map-js"; @@ -59837,6 +61754,15 @@ let sha512 = "0tF3AGSD1ppQeuffsLDIOWlKUd3lS92tFxcsrh5Pe3ZphhnoK+oXIBTzOAThZCiuINZLvpiLH/1VS1/ANEJVig=="; }; }; + "spark-md5-3.0.2" = { + name = "spark-md5"; + packageName = "spark-md5"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spark-md5/-/spark-md5-3.0.2.tgz"; + sha512 = "wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw=="; + }; + }; "sparkles-1.0.1" = { name = "sparkles"; packageName = "sparkles"; @@ -59972,15 +61898,6 @@ let sha512 = "hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="; }; }; - "specificity-0.3.2" = { - name = "specificity"; - packageName = "specificity"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/specificity/-/specificity-0.3.2.tgz"; - sha512 = "Nc/QN/A425Qog7j9aHmwOrlwX2e7pNI47ciwxwy4jOlvbbMHkNNJchit+FX+UjF3IAdiaaV5BKeWuDUnws6G1A=="; - }; - }; "specificity-0.4.1" = { name = "specificity"; packageName = "specificity"; @@ -60098,6 +62015,15 @@ let sha512 = "8dv+1zKgTpfTkOy8XZLFyWrfxO0NV/bj/3EaQ+hBrBxGv2DwiroljPjU8NlCr+59nLnsVm9WYT7lXKwe4TC6bw=="; }; }; + "split-lines-3.0.0" = { + name = "split-lines"; + packageName = "split-lines"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split-lines/-/split-lines-3.0.0.tgz"; + sha512 = "d0TpRBL/VfKDXsk8JxPF7zgF5pCUDdBMSlEL36xBgVeaX448t+yGXcJaikUyzkoKOJ0l6KpMfygzJU9naIuivw=="; + }; + }; "split-on-first-1.1.0" = { name = "split-on-first"; packageName = "split-on-first"; @@ -60278,31 +62204,31 @@ let sha1 = "06cd70795ee58d1462d100a45c660df3179d3b39"; }; }; - "ssb-bendy-butt-0.12.4" = { + "ssb-bendy-butt-0.12.5" = { name = "ssb-bendy-butt"; packageName = "ssb-bendy-butt"; - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.4.tgz"; - sha512 = "zyVPwizCuW6T3Q2j8XerTPpdhNYY9tLlIVieg/FFQb5wlda3Ce360mYjGngx7586HXgysBi010JpM9emMQhhtA=="; + url = "https://registry.npmjs.org/ssb-bendy-butt/-/ssb-bendy-butt-0.12.5.tgz"; + sha512 = "8K3qi9fIr6PYQCWWPDTijDThZ89tYRkIKO7xpS/kM8dDuDfx4FsBoMsBkgl8VOV3TB24UnAF0IbcxRBNL5Pf4w=="; }; }; - "ssb-bfe-3.1.1" = { + "ssb-bfe-3.1.3" = { name = "ssb-bfe"; packageName = "ssb-bfe"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.1.1.tgz"; - sha512 = "0Z1xxYG618sccFJGNIN9om5sokRFJRv/QlIhlnFwiafNLYFdyLP/KGZ8YDZSUP/pyMWZuL8+o++v3Ro6EkIJNA=="; + url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.1.3.tgz"; + sha512 = "peX4B+Exp5OokaOnxP8atPd0jhig1AaCQyLY+MykxXIzTEim7yWAavzSDHaZ+7PNHS9fbM7E2s+h3h/R3oSfTA=="; }; }; - "ssb-bfe-spec-0.3.0" = { + "ssb-bfe-spec-0.4.0" = { name = "ssb-bfe-spec"; packageName = "ssb-bfe-spec"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bfe-spec/-/ssb-bfe-spec-0.3.0.tgz"; - sha512 = "gmsjEKrcKfR7d/926Oq7ijrd4l0CkjtFampk7rqsE+Gzr1ZpzGmHl1YxXn6GdBYy55M1i0V+w+fYAqsgxl5o4Q=="; + url = "https://registry.npmjs.org/ssb-bfe-spec/-/ssb-bfe-spec-0.4.0.tgz"; + sha512 = "KhUl8MZ14JQ00rmsrddSTDIfy5ez4O9nZOrJ8A+Kg5VdG9ENOpLCqc+CzsZpSdhDeUfFUicSMH1mUhJNlRyIAQ=="; }; }; "ssb-blobs-1.2.2" = { @@ -60359,13 +62285,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.8.6" = { + "ssb-db2-2.8.11" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.8.6"; + version = "2.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.8.6.tgz"; - sha512 = "cL0FSxGvAxBhX3MMhsJG0wkhRaqF+OwiRPu/a/5QTmk3fYmlhSx51Qgmd9F13Iu90jZVhdOjmrw4RZQN00/stQ=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.8.11.tgz"; + sha512 = "XrKVxgWa2kumephDdUMCFY/chdELeUumJyR6S5NVagtVv/aEdHV8cOJXkt5IP3AxNNJB6i/Kk2P4adsdVWGBeg=="; }; }; "ssb-ebt-5.6.7" = { @@ -60602,13 +62528,13 @@ let sha512 = "RcXRBLqQMwew+aKkaTZ2K0qq2kwe7he8ZUz8cX4bZ6Sr4+yszhRpxqnN6XeK1hA6TTvUltR0RNgOO/fqT3djRg=="; }; }; - "ssb-typescript-2.5.0" = { + "ssb-typescript-2.6.0" = { name = "ssb-typescript"; packageName = "ssb-typescript"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-typescript/-/ssb-typescript-2.5.0.tgz"; - sha512 = "j0Q9nAbp5lKwmvIWEaaf+PT5ITHCCb83JeD3ywm/kHDWwcLGLYG8VuwMM5L3X8H1laIORXlQgZlHhK3nfn8LbA=="; + url = "https://registry.npmjs.org/ssb-typescript/-/ssb-typescript-2.6.0.tgz"; + sha512 = "igmpdzV0rpZq5L07maQlvKOidQWBbFC08ZqsqAnTEEyPOPH6ElQ4/n3dNnPj2UlSRRrqs9DdeCYTmKUckvTkVA=="; }; }; "ssb-unix-socket-1.0.0" = { @@ -60620,13 +62546,13 @@ let sha512 = "Z4jBj917W+dKAiDglwxCpWm8vINOMtkpHQIgk50NQTb5jHqHI5Rcyiy7EO0uRcWwRWqXi1ZwOTEFVyLyyuittA=="; }; }; - "ssb-uri2-1.6.0" = { + "ssb-uri2-1.7.2" = { name = "ssb-uri2"; packageName = "ssb-uri2"; - version = "1.6.0"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.6.0.tgz"; - sha512 = "Iihj9z5g67NV5vwewvo1XdYS05Wu3I6MVIhruN+/zqlXUfLmpeKZzyKOgszfDgbpVJvADm4/0Dj/mj7uAEf9OQ=="; + url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-1.7.2.tgz"; + sha512 = "bw6nkLkpOqiVxYXqYm/7XMnIgTIbIs4crRutCkworysMr08gjFNhkIgOeEm1uG4y1Rm0FIigWaBQnOLqPmXAPQ=="; }; }; "ssb-validate-4.1.4" = { @@ -60665,13 +62591,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.179" = { + "sscaff-1.2.239" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.179"; + version = "1.2.239"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.179.tgz"; - sha512 = "mIAzYsIKkePDogi5yLv8fM0S8t5P3U+QEG9eZannpycDB8k0SAr0fxEhXuyskR96m1zqrqcgjEYYEzTTTwBKqQ=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.239.tgz"; + sha512 = "labp/0JhozHLJWGAdobeGgabqIosT6oTjRYPVSGQUy+P1L4qTBWLAOBCRURm+4JHLh7fOHXt7gnFLrEg42SDrA=="; }; }; "ssh-config-1.1.6" = { @@ -60827,13 +62753,13 @@ let sha512 = "EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ=="; }; }; - "stackframe-1.2.0" = { + "stackframe-1.2.1" = { name = "stackframe"; packageName = "stackframe"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/stackframe/-/stackframe-1.2.0.tgz"; - sha512 = "GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA=="; + url = "https://registry.npmjs.org/stackframe/-/stackframe-1.2.1.tgz"; + sha512 = "h88QkzREN/hy8eRdyNhhsO7RSJ5oyTqxxmmn0dzBIMUclZsjpfmrsg81vp8mjjAs2vAZ72nyWxRUwSwmh0e4xg=="; }; }; "stampit-1.2.0" = { @@ -60854,13 +62780,13 @@ let sha1 = "23e5168fa1c0820189e5812701a79058510d0d34"; }; }; - "stat-mode-0.2.2" = { + "stat-mode-1.0.0" = { name = "stat-mode"; packageName = "stat-mode"; - version = "0.2.2"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz"; - sha1 = "e6c80b623123d7d80cf132ce538f346289072502"; + url = "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz"; + sha512 = "jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg=="; }; }; "state-toggle-1.0.3" = { @@ -60944,6 +62870,15 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; + "statuses-2.0.1" = { + name = "statuses"; + packageName = "statuses"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; + sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; + }; + }; "stealthy-require-1.1.1" = { name = "stealthy-require"; packageName = "stealthy-require"; @@ -61016,6 +62951,15 @@ let sha1 = "39413fee9d025c74a7e59ceecb23784cc0f17f02"; }; }; + "stoppable-1.1.0" = { + name = "stoppable"; + packageName = "stoppable"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz"; + sha512 = "KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw=="; + }; + }; "stream-browserify-2.0.2" = { name = "stream-browserify"; packageName = "stream-browserify"; @@ -61043,13 +62987,13 @@ let sha1 = "91d5f5130d1cef96dcfa7f726945188741d09ee4"; }; }; - "stream-chain-2.2.4" = { + "stream-chain-2.2.5" = { name = "stream-chain"; packageName = "stream-chain"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/stream-chain/-/stream-chain-2.2.4.tgz"; - sha512 = "9lsl3YM53V5N/I1C2uJtc3Kavyi3kNYN83VkKb/bMWRk7D9imiFyUPYa0PoZbLohSVOX1mYE9YsmwObZUsth6Q=="; + url = "https://registry.npmjs.org/stream-chain/-/stream-chain-2.2.5.tgz"; + sha512 = "1TJmBx6aSWqZ4tx7aTpBDXK0/e2hhcNSTV8+CbFJtDjbb+I1mZ8lHit0Grw9GRT+6JbIrrDd8esncgBi8aBXGA=="; }; }; "stream-collector-1.0.1" = { @@ -61151,13 +63095,13 @@ let sha512 = "y+ChhCov2A5nDqC2aZ6HKXs3OvDlvAp0Ps3BF1P/Iv8tUZJQQsMVaSzk0WryVTVoGITKv01UYahCXMpAs7I0lQ=="; }; }; - "stream-json-1.7.3" = { + "stream-json-1.7.4" = { name = "stream-json"; packageName = "stream-json"; - version = "1.7.3"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/stream-json/-/stream-json-1.7.3.tgz"; - sha512 = "Y6dXn9KKWSwxOqnvHGcdZy1PK+J+7alBwHCeU3W9oRqm4ilLRA0XSPmd1tWwhg7tv9EIxJTMWh7KF15tYelKJg=="; + url = "https://registry.npmjs.org/stream-json/-/stream-json-1.7.4.tgz"; + sha512 = "ja2dde1v7dOlx5/vmavn8kLrxvNfs7r2oNc5DYmNJzayDDdudyCSuTB1gFjH4XBVTIwxiMxL4i059HX+ZiouXg=="; }; }; "stream-meter-1.0.4" = { @@ -61286,6 +63230,15 @@ let sha512 = "ztP79ug6S+I7td0Nd2GBeIKCm+vA54c+e60FY87metz5n/l6ydPELd2lxsljz8OpIhsRM9HkIiAwz85+S5G5/A=="; }; }; + "streaming-json-stringify-3.1.0" = { + name = "streaming-json-stringify"; + packageName = "streaming-json-stringify"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/streaming-json-stringify/-/streaming-json-stringify-3.1.0.tgz"; + sha1 = "80200437a993cc39c4fe00263b7b3b903ac87af5"; + }; + }; "streamroller-0.7.0" = { name = "streamroller"; packageName = "streamroller"; @@ -61304,13 +63257,13 @@ let sha512 = "OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ=="; }; }; - "streamroller-3.0.2" = { + "streamroller-3.0.6" = { name = "streamroller"; packageName = "streamroller"; - version = "3.0.2"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-3.0.2.tgz"; - sha512 = "ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA=="; + url = "https://registry.npmjs.org/streamroller/-/streamroller-3.0.6.tgz"; + sha512 = "Qz32plKq/MZywYyhEatxyYc8vs994Gz0Hu2MSYXXLD233UyPeIeRBZARIIGwFer4Mdb8r3Y2UqKkgyDghM6QCg=="; }; }; "streamsearch-0.1.2" = { @@ -61331,13 +63284,13 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; - "streamx-2.12.0" = { + "streamx-2.12.4" = { name = "streamx"; packageName = "streamx"; - version = "2.12.0"; + version = "2.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.12.0.tgz"; - sha512 = "PR93KgPkga2p27UhCI9lf096qPyRMDn/zemRQeAgr1azVLDMr8tZZGpgfEw2/cYY/8mTU4dshLMGNYBsNeQGQw=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.12.4.tgz"; + sha512 = "K3xdIp8YSkvbdI0PrCcP0JkniN8cPCyeKlcZgRFSl1o1xKINCYM93FryvTSOY57x73pz5/AjO5B8b9BYf21wWw=="; }; }; "strftime-0.10.1" = { @@ -61520,13 +63473,13 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string-width-5.1.0" = { + "string-width-5.1.2" = { name = "string-width"; packageName = "string-width"; - version = "5.1.0"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-5.1.0.tgz"; - sha512 = "7x54QnN21P+XL/v8SuNKvfgsUre6PXpN7mc77N3HlZv+f1SBRGmjxtOud2Z6FZ8DmdkD/IdjCaf9XXbnqmTZGQ=="; + url = "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz"; + sha512 = "HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="; }; }; "string.prototype.repeat-0.2.0" = { @@ -61781,6 +63734,15 @@ let sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="; }; }; + "strip-bom-5.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-5.0.0.tgz"; + sha512 = "p+byADHF7SzEcVnLvc/r3uognM1hUhObuHXxJcgLCfD194XAkaLbjq3Wzb0N5G2tgIjH0dgT708Z51QxMeu60A=="; + }; + }; "strip-bom-buf-1.0.0" = { name = "strip-bom-buf"; packageName = "strip-bom-buf"; @@ -61988,13 +63950,13 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.2.4" = { + "strtok3-6.3.0" = { name = "strtok3"; packageName = "strtok3"; - version = "6.2.4"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.4.tgz"; - sha512 = "GO8IcFF9GmFDvqduIspUBwCzCbqzegyVKIsSymcMgiZKeCfrN9SowtUoi8+b59WZMAjIzVZic/Ft97+pynR3Iw=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz"; + sha512 = "fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw=="; }; }; "structured-source-3.0.2" = { @@ -62024,6 +63986,15 @@ let sha512 = "ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg=="; }; }; + "style-loader-3.3.1" = { + name = "style-loader"; + packageName = "style-loader"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz"; + sha512 = "GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ=="; + }; + }; "style-search-0.1.0" = { name = "style-search"; packageName = "style-search"; @@ -62033,13 +64004,13 @@ let sha1 = "7958c793e47e32e07d2b5cafe5c0bf8e12e77902"; }; }; - "styled-components-5.3.3" = { + "styled-components-5.3.5" = { name = "styled-components"; packageName = "styled-components"; - version = "5.3.3"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/styled-components/-/styled-components-5.3.3.tgz"; - sha512 = "++4iHwBM7ZN+x6DtPPWkCI4vdtwumQ+inA/DdAsqYd4SVgUKJie5vXyzotA00ttcFdQkCng7zc6grwlfIfw+lw=="; + url = "https://registry.npmjs.org/styled-components/-/styled-components-5.3.5.tgz"; + sha512 = "ndETJ9RKaaL6q41B69WudeqLzOpY1A/ET/glXkNZ2T7dPjPqpPCXXQjDFYZWwNnE5co0wX+gTCqx9mfxTmSIPg=="; }; }; "stylehacks-4.0.3" = { @@ -62060,15 +64031,6 @@ let sha512 = "Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ=="; }; }; - "stylelint-8.4.0" = { - name = "stylelint"; - packageName = "stylelint"; - version = "8.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-8.4.0.tgz"; - sha512 = "56hPH5mTFnk8LzlEuTWq0epa34fHuS54UFYQidBOFt563RJBNi1nz1F2HK2MoT1X1waq47milvRsRahFCCJs/Q=="; - }; - }; "stylint-2.0.0" = { name = "stylint"; packageName = "stylint"; @@ -62096,15 +64058,6 @@ let sha512 = "vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg=="; }; }; - "stylus-0.55.0" = { - name = "stylus"; - packageName = "stylus"; - version = "0.55.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.55.0.tgz"; - sha512 = "MuzIIVRSbc8XxHH7FjkvWqkIcr1BvoMZoR/oFuAJDlh7VSaNJzrB4uJ38GRQa+mWjLXODAMzeDe0xi9GYbGwnw=="; - }; - }; "stylus-supremacy-2.15.0" = { name = "stylus-supremacy"; packageName = "stylus-supremacy"; @@ -62222,15 +64175,6 @@ let sha512 = "Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw=="; }; }; - "sugarss-1.0.1" = { - name = "sugarss"; - packageName = "sugarss"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sugarss/-/sugarss-1.0.1.tgz"; - sha512 = "3qgLZytikQQEVn1/FrhY7B68gPUUGY3R1Q1vTiD5xT+Ti1DP/8iZuwFet9ONs5+bmL8pZoDQ6JrQHVgrNlK6mA=="; - }; - }; "sugarss-2.0.0" = { name = "sugarss"; packageName = "sugarss"; @@ -62438,31 +64382,31 @@ let sha1 = "5a7f8a20a71188cf9e75a2cfe8eb182de90daf3b"; }; }; - "svelte-3.46.2" = { + "svelte-3.46.4" = { name = "svelte"; packageName = "svelte"; - version = "3.46.2"; + version = "3.46.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-3.46.2.tgz"; - sha512 = "RXSAtYNefe01Sb1lXtZ2I+gzn3t/h/59hoaRNeRrm8IkMIu6BSiAkbpi41xb+C44x54YKnbk9+dtfs3pM4hECA=="; + url = "https://registry.npmjs.org/svelte/-/svelte-3.46.4.tgz"; + sha512 = "qKJzw6DpA33CIa+C/rGp4AUdSfii0DOTCzj/2YpSKKayw5WGSS624Et9L1nU1k2OVRS9vaENQXp2CVZNU+xvIg=="; }; }; - "svelte-preprocess-4.10.2" = { + "svelte-preprocess-4.10.4" = { name = "svelte-preprocess"; packageName = "svelte-preprocess"; - version = "4.10.2"; + version = "4.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.2.tgz"; - sha512 = "aPpkCreSo8EL/y8kJSa1trhiX0oyAtTjlNNM7BNjRAsMJ8Yy2LtqHt0zyd4pQPXt+D4PzbO3qTjjio3kwOxDlA=="; + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.10.4.tgz"; + sha512 = "fuwol0N4UoHsNQolLFbMqWivqcJ9N0vfWO9IuPAiX/5okfoGXURyJ6nECbuEIv0nU3M8Xe2I1ONNje2buk7l6A=="; }; }; - "svelte2tsx-0.4.14" = { + "svelte2tsx-0.5.6" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.4.14"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.14.tgz"; - sha512 = "udF0Z/DA98OfjPFBU1GBJRpYHEvsxA8ozwYVN08AOWMnQyxoSyWWlYspiq2m9xAjLo/pWnhec9z1d6jc9umqjA=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.5.6.tgz"; + sha512 = "B4WZUtoTdVD+F73H1RQEH3Hrv7m2/ahThmAUkjT5CTWRigQaJqYQpSjisCH1Pzfi9B37YikDnAi4u4uxwYM+iw=="; }; }; "sver-compat-1.5.0" = { @@ -62519,6 +64463,15 @@ let sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; }; }; + "svgo-2.8.0" = { + name = "svgo"; + packageName = "svgo"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz"; + sha512 = "+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="; + }; + }; "swagger-converter-0.1.7" = { name = "swagger-converter"; packageName = "swagger-converter"; @@ -62600,13 +64553,22 @@ let sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb"; }; }; - "swagger-ui-dist-3.34.0" = { + "swagger-ui-dist-3.52.5" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.34.0"; + version = "3.52.5"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.34.0.tgz"; - sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.52.5.tgz"; + sha512 = "8z18eX8G/jbTXYzyNIaobrnD7PSN7yU/YkSasMmajrXtw0FGS64XjrKn5v37d36qmU3o1xLeuYnktshRr7uIFw=="; + }; + }; + "swagger-ui-dist-4.9.1" = { + name = "swagger-ui-dist"; + packageName = "swagger-ui-dist"; + version = "4.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.9.1.tgz"; + sha512 = "hYo/kt/wXYd/4WOUm2NLyDa3tR3lCfHbjVa1wSvvSL8AKbYoJsBkc4Va7VJ1uv/JO89xM1736pp1tzJkrVsBxA=="; }; }; "swagger2openapi-7.0.8" = { @@ -62744,13 +64706,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.10.7" = { + "systeminformation-5.11.9" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.10.7"; + version = "5.11.9"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.10.7.tgz"; - sha512 = "elAv0h67BDuafy+zuS/yF9QCgQcROXaK9AXMnLz+NHq/LRv7p2/k5qWIwaVxwsSZE8r+dVyIw0BtFO/FoHtZaw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.9.tgz"; + sha512 = "eeMtL9UJFR/LYG+2rpeAgZ0Va4ojlNQTkYiQH/xbbPwDjDMsaetj3Pkc+C1aH5G8mav6HvDY8kI4Vl4noksSkA=="; }; }; "sywac-1.3.0" = { @@ -62780,15 +64742,6 @@ let sha512 = "UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA=="; }; }; - "table-4.0.3" = { - name = "table"; - packageName = "table"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-4.0.3.tgz"; - sha512 = "S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg=="; - }; - }; "table-5.4.6" = { name = "table"; packageName = "table"; @@ -62834,15 +64787,6 @@ let sha1 = "7a047f143b010b4cbd31f857e82961512cbf4e14"; }; }; - "tabtab-3.0.2" = { - name = "tabtab"; - packageName = "tabtab"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tabtab/-/tabtab-3.0.2.tgz"; - sha512 = "jANKmUe0sIQc/zTALTBy186PoM/k6aPrh3A7p6AaAfF6WPSbTx1JYeGIGH162btpH+mmVEXln+UxwViZHO2Jhg=="; - }; - }; "tabtab-git+https://github.com/mixu/node-tabtab.git" = { name = "tabtab"; packageName = "tabtab"; @@ -62916,22 +64860,13 @@ let sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; }; }; - "tape-2.3.3" = { + "tape-4.15.0" = { name = "tape"; packageName = "tape"; - version = "2.3.3"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz"; - sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7"; - }; - }; - "tape-4.14.0" = { - name = "tape"; - packageName = "tape"; - version = "4.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tape/-/tape-4.14.0.tgz"; - sha512 = "z0+WrUUJuG6wIdWrl4W3rTte2CR26G6qcPOj3w1hfRdcmhF3kHBhOBW9VHsPVAkz08ZmGzp7phVpDupbLzrYKQ=="; + url = "https://registry.npmjs.org/tape/-/tape-4.15.0.tgz"; + sha512 = "SfRmG2I8QGGgJE/MCiLH8c11L5XxyUXxwK9xLRD0uiK5fehRkkSZGmR6Y1pxOt8vJ19m3sY+POTQpiaVv45/LQ=="; }; }; "tar-0.1.17" = { @@ -63069,15 +65004,6 @@ let sha512 = "h+BGQ8ExIUZ81h4iHRvatZY5eeBBl2WZk31MmMdFG9LBTc5eCH5u/bzZ7phaPH3bsiB7WhM7YTkOyB2dyFQfXg=="; }; }; - "tasklist-3.1.1" = { - name = "tasklist"; - packageName = "tasklist"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tasklist/-/tasklist-3.1.1.tgz"; - sha512 = "G3I7QWUBSNWaekrJcDabydF6dcvy+vZ2PrX04JYq1p914TOLgpN+ryMtheGavs1LYVevTbTmwjQY8aeX8yLsyA=="; - }; - }; "tcp-port-used-0.1.2" = { name = "tcp-port-used"; packageName = "tcp-port-used"; @@ -63168,15 +65094,6 @@ let sha512 = "aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg=="; }; }; - "temp-write-3.4.0" = { - name = "temp-write"; - packageName = "temp-write"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/temp-write/-/temp-write-3.4.0.tgz"; - sha1 = "8cff630fb7e9da05f047c74ce4ce4d685457d492"; - }; - }; "temp-write-4.0.0" = { name = "temp-write"; packageName = "temp-write"; @@ -63240,15 +65157,6 @@ let sha512 = "biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w=="; }; }; - "tencent-serverless-http-1.3.2" = { - name = "tencent-serverless-http"; - packageName = "tencent-serverless-http"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tencent-serverless-http/-/tencent-serverless-http-1.3.2.tgz"; - sha512 = "HgIu9HuBdY0lx3jLKuicOSOrjmieklPh55x8ZmtuTnrZ5v1buAPUfLKBhTeBSz6e90ggyW+dPr5PWdz179kUkw=="; - }; - }; "term-canvas-0.0.5" = { name = "term-canvas"; packageName = "term-canvas"; @@ -63330,13 +65238,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.10.0" = { + "terser-5.12.1" = { name = "terser"; packageName = "terser"; - version = "5.10.0"; + version = "5.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz"; - sha512 = "AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA=="; + url = "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz"; + sha512 = "NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -63357,22 +65265,13 @@ let sha512 = "cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA=="; }; }; - "terser-webpack-plugin-4.2.2" = { + "terser-webpack-plugin-5.3.1" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "4.2.2"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.2.tgz"; - sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ=="; - }; - }; - "terser-webpack-plugin-5.3.0" = { - name = "terser-webpack-plugin"; - packageName = "terser-webpack-plugin"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.0.tgz"; - sha512 = "LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz"; + sha512 = "GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g=="; }; }; "test-exclude-6.0.0" = { @@ -63393,6 +65292,15 @@ let sha1 = "11da6ff670f3471a73b625ca4f3fdcf7bb748291"; }; }; + "text-encoding-utf-8-1.0.2" = { + name = "text-encoding-utf-8"; + packageName = "text-encoding-utf-8"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz"; + sha512 = "8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg=="; + }; + }; "text-extensions-1.9.0" = { name = "text-extensions"; packageName = "text-extensions"; @@ -63555,13 +65463,22 @@ let sha1 = "4ca2fffc02a51290d2744b9e3f557693ca6b627a"; }; }; - "thread-stream-0.13.1" = { + "thread-loader-2.1.3" = { + name = "thread-loader"; + packageName = "thread-loader"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.3.tgz"; + sha512 = "wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg=="; + }; + }; + "thread-stream-0.13.2" = { name = "thread-stream"; packageName = "thread-stream"; - version = "0.13.1"; + version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/thread-stream/-/thread-stream-0.13.1.tgz"; - sha512 = "+KNCqNxOSwYfXLtCIRDKQq29x9jvqnOFjYCPdB38sf4pT3QanPSNc8vRqMj+Q3z4tYIctb5opNZrMK/GwmgsAQ=="; + url = "https://registry.npmjs.org/thread-stream/-/thread-stream-0.13.2.tgz"; + sha512 = "woZFt0cLFkPdhsa+IGpRo1jiSouaHxMIljzTgt30CMjBWoUYbbcHqnunW5Yv+BXko9H05MVIcxMipI3Jblallw=="; }; }; "thriftrw-3.12.0" = { @@ -63672,15 +65589,6 @@ let sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; - "through2-3.0.1" = { - name = "through2"; - packageName = "through2"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"; - sha512 = "M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww=="; - }; - }; "through2-3.0.2" = { name = "through2"; packageName = "through2"; @@ -63897,13 +65805,22 @@ let sha512 = "FmqJZGduTyvsr2cF3375fqGHUovSwDi/QytexX1Se4BPuPZpTE5Ftp5fg+EFSuEf3lhZqgCRjEG3ydUQ/aNiwA=="; }; }; - "tiny-secp256k1-2.1.2" = { + "tiny-secp256k1-2.2.0" = { name = "tiny-secp256k1"; packageName = "tiny-secp256k1"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-2.1.2.tgz"; - sha512 = "8qPw7zDK6Hco2tVGYGQeOmOPp/hZnREwy2iIkcq0ygAuqc9WHo29vKN94lNymh1QbB3nthtAMF6KTIrdbsIotA=="; + url = "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-2.2.0.tgz"; + sha512 = "2hPuUGCroLrxh6xxwoe+1RgPpOOK1w2uTnhgiHBpvoutBR+krNuT4hOXQyOaaYnZgoXBB6hBYkuAJHxyeBOPzQ=="; + }; + }; + "tiny-secp256k1-2.2.1" = { + name = "tiny-secp256k1"; + packageName = "tiny-secp256k1"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-2.2.1.tgz"; + sha512 = "/U4xfVqnVxJXN4YVsru0E6t5wVncu2uunB8+RVR40fYUxkKYUPS10f+ePQZgFBoE/Jbf9H1NBveupF2VmB58Ng=="; }; }; "tinycolor-0.0.1" = { @@ -64275,22 +66192,13 @@ let sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; - "token-types-4.1.1" = { + "token-types-4.2.0" = { name = "token-types"; packageName = "token-types"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/token-types/-/token-types-4.1.1.tgz"; - sha512 = "hD+QyuUAyI2spzsI0B7gf/jJ2ggR4RjkAo37j3StuePhApJUwcWDjnHDOFdIWYSwNR28H14hpwm4EI+V1Ted1w=="; - }; - }; - "toml-2.3.6" = { - name = "toml"; - packageName = "toml"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/toml/-/toml-2.3.6.tgz"; - sha512 = "gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ=="; + url = "https://registry.npmjs.org/token-types/-/token-types-4.2.0.tgz"; + sha512 = "P0rrp4wUpefLncNamWIef62J0v0kQR/GfDVji9WKY7GDCWy5YbVSrKUTam07iWPZQGy0zWNOfstYTykMmPNR7w=="; }; }; "too-hot-1.0.0" = { @@ -64347,13 +66255,13 @@ let sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29"; }; }; - "torrent-discovery-9.4.7" = { + "torrent-discovery-9.4.10" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.4.7"; + version = "9.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.7.tgz"; - sha512 = "7Zw474LJE5r3Momi4ykBYkjgcFhENbUxcAFs5cBllUkv9ErJPzPEGmpEuqX7V8TkLS+Clmt/l5CjV5IFHg/A/A=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.10.tgz"; + sha512 = "Sx2BdYYRCWXkxenGlbt3ZRSH6rcrt8ii6O6Aub9vqeS+RzzyNn2w68QVGClpctExoLle3T2eXO9gdlPANckMkA=="; }; }; "torrent-piece-1.1.2" = { @@ -64689,13 +66597,13 @@ let sha512 = "rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA=="; }; }; - "trough-2.0.2" = { + "trough-2.1.0" = { name = "trough"; packageName = "trough"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/trough/-/trough-2.0.2.tgz"; - sha512 = "FnHq5sTMxC0sk957wHDzRnemFnNBvt/gSY99HzK8F7UP5WAbvP70yX5bd7CjEQkN+TjdxwI7g7lJ6podqrG2/w=="; + url = "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz"; + sha512 = "AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g=="; }; }; "truncate-2.1.0" = { @@ -64761,13 +66669,13 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-loader-8.0.4" = { + "ts-loader-6.2.2" = { name = "ts-loader"; packageName = "ts-loader"; - version = "8.0.4"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.4.tgz"; - sha512 = "5u8KF1SW8eCUb/Ff7At81e3wznPmT/27fvaGRO9CziVy+6NlPVRvrzSox4OwU0/e6OflOUB32Err4VquysCSAQ=="; + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.2.tgz"; + sha512 = "HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ=="; }; }; "ts-loader-8.3.0" = { @@ -64779,6 +66687,15 @@ let sha512 = "MgGly4I6cStsJy27ViE32UoqxPTN9Xly4anxxVyaIWR+9BGxboV4EyJBGfR3RePV7Ksjj3rHmPZJeIt+7o4Vag=="; }; }; + "ts-loader-9.2.6" = { + name = "ts-loader"; + packageName = "ts-loader"; + version = "9.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-9.2.6.tgz"; + sha512 = "QMTC4UFzHmu9wU2VHZEmWWE9cUajjfcdcws+Gh7FhiO+Dy0RnR1bNz0YCHqhI0yRowCE9arVnNxYHqELOy9Hjw=="; + }; + }; "ts-log-2.2.4" = { name = "ts-log"; packageName = "ts-log"; @@ -64788,15 +66705,6 @@ let sha512 = "DEQrfv6l7IvN2jlzc/VTdZJYsWUnQNCsueYjMkC/iXoEoi5fNan6MjeDqkvhfzbmHgdz9UxDUluX3V5HdjTydQ=="; }; }; - "ts-morph-12.2.0" = { - name = "ts-morph"; - packageName = "ts-morph"; - version = "12.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-morph/-/ts-morph-12.2.0.tgz"; - sha512 = "WHXLtFDcIRwoqaiu0elAoZ/AmI+SwwDafnPKjgJmdwJ2gRVO0jMKBt88rV2liT/c6MTsXyuWbGFiHe9MRddWJw=="; - }; - }; "ts-node-10.4.0" = { name = "ts-node"; packageName = "ts-node"; @@ -64806,6 +66714,15 @@ let sha512 = "g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A=="; }; }; + "ts-node-10.7.0" = { + name = "ts-node"; + packageName = "ts-node"; + version = "10.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz"; + sha512 = "TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A=="; + }; + }; "ts-node-8.9.1" = { name = "ts-node"; packageName = "ts-node"; @@ -64833,13 +66750,31 @@ let sha512 = "csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw=="; }; }; - "tsconfig-paths-3.12.0" = { + "ts2gas-4.2.0" = { + name = "ts2gas"; + packageName = "ts2gas"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts2gas/-/ts2gas-4.2.0.tgz"; + sha512 = "5xZugaeM3wKQPj/vrWnrtYjNh4xnIz6cGSW/smCe9OTmkh1+KvHpm7M7HLq/OnBaljf4+yKctC4AYimBi4T1/Q=="; + }; + }; + "tsconfig-5.0.3" = { + name = "tsconfig"; + packageName = "tsconfig"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tsconfig/-/tsconfig-5.0.3.tgz"; + sha1 = "5f4278e701800967a8fc383fd19648878f2a6e3a"; + }; + }; + "tsconfig-paths-3.14.0" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; - version = "3.12.0"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz"; - sha512 = "e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg=="; + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz"; + sha512 = "cg/1jAZoL57R39+wiw4u/SCC6Ic9Q5NqjBOb+9xISedOYurfog9ZNmKJSxAnb2m/5Bq4lE9lhUcau33Ml8DM0g=="; }; }; "tsconfig-paths-webpack-plugin-3.5.2" = { @@ -64851,13 +66786,13 @@ let sha512 = "EhnfjHbzm5IYI9YPNVIxx1moxMI4bpHD2e0zTXeDNQcwjjRaGepP7IhTHJkyDBG0CAOoxRfe7jCG630Ou+C6Pw=="; }; }; - "tslib-1.13.0" = { - name = "tslib"; - packageName = "tslib"; - version = "1.13.0"; + "tsify-5.0.4" = { + name = "tsify"; + packageName = "tsify"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz"; - sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; + url = "https://registry.npmjs.org/tsify/-/tsify-5.0.4.tgz"; + sha512 = "XAZtQ5OMPsJFclkZ9xMZWkSNyMhMxEPsz3D2zu79yoKorH9j/DT4xCloJeXk5+cDhosEibu4bseMVjyPOAyLJA=="; }; }; "tslib-1.14.1" = { @@ -65058,6 +66993,15 @@ let sha512 = "G1FfxfR0mUNMeGjszLYl3kxtopC4O9DRRiMlMDDVHvU1jaBkGFg4qxIyjIk2aiKLHyDyZvZyu4qBO2guuYBy3Q=="; }; }; + "tus-js-client-2.1.1" = { + name = "tus-js-client"; + packageName = "tus-js-client"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-2.1.1.tgz"; + sha512 = "ILpgHlR0nfKxmlkXfrZ2z61upkHEXhADOGbGyvXSPjp7bn1NhU50p/Mu59q577Xirayr9vlW4tmoFqUrHKcWeQ=="; + }; + }; "tv4-1.3.0" = { name = "tv4"; packageName = "tv4"; @@ -65157,13 +67101,13 @@ let sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; }; }; - "type-2.5.0" = { + "type-2.6.0" = { name = "type"; packageName = "type"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.5.0.tgz"; - sha512 = "180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw=="; + url = "https://registry.npmjs.org/type/-/type-2.6.0.tgz"; + sha512 = "eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ=="; }; }; "type-check-0.3.2" = { @@ -65310,31 +67254,31 @@ let sha512 = "yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA=="; }; }; - "type-fest-2.10.0" = { + "type-fest-2.11.1" = { name = "type-fest"; packageName = "type-fest"; - version = "2.10.0"; + version = "2.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-2.10.0.tgz"; - sha512 = "u2yreDMllFI3VCpWt0rKrGs/E2LO0YHBwiiOIj+ilQh9+ALMaa4lNBSdoDvuHN3cbKcYk9L1BXP49x9RT+o/SA=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-2.11.1.tgz"; + sha512 = "fPcV5KLAqFfmhHobtAUwEpbpfYhVF7wSLVgbG/7mIGe/Pete7ky/bPAPRkzbWdrj0/EkswFAAR2feJCgigkUKg=="; }; }; - "type-fest-2.8.0" = { + "type-fest-2.12.0" = { name = "type-fest"; packageName = "type-fest"; - version = "2.8.0"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-2.8.0.tgz"; - sha512 = "O+V9pAshf9C6loGaH0idwsmugI2LxVNR7DtS40gVo2EXZVYFgz9OuNtOhgHLdHdapOEWNdvz9Ob/eeuaWwwlxA=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-2.12.0.tgz"; + sha512 = "Qe5GRT+n/4GoqCNGGVp5Snapg1Omq3V7irBJB3EaKsp7HWDo5Gv2d/67gfNyV+d5EXD+x/RF5l1h4yJ7qNkcGA=="; }; }; - "type-fest-2.9.0" = { + "type-fest-2.12.1" = { name = "type-fest"; packageName = "type-fest"; - version = "2.9.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-2.9.0.tgz"; - sha512 = "uC0hJKi7eAGXUJ/YKk53RhnKxMwzHWgzf4t92oz8Qez28EBgVTfpDTB59y9hMYLzc/Wl85cD7Tv1hLZZoEJtrg=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-2.12.1.tgz"; + sha512 = "AiknQSEqKVGDDjtZqeKrUoTlcj7FKhupmnVUgz6KoOKtvMwRGE6hUNJ/nVear+h7fnUPO1q/htSkYKb1pyntkQ=="; }; }; "type-is-1.6.18" = { @@ -65400,6 +67344,15 @@ let sha512 = "B2B+wo5gC7VRAqcFEiUCjS6CJ1vmeYZ7uzY3Jsu6UNStHiF+W0vkhZAmQaj5m9sC2KVrpyHGRzGuhz3M6+n/8A=="; }; }; + "typeface-roboto-1.1.13" = { + name = "typeface-roboto"; + packageName = "typeface-roboto"; + version = "1.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/typeface-roboto/-/typeface-roboto-1.1.13.tgz"; + sha512 = "YXvbd3a1QTREoD+FJoEkl0VQNJoEjewR2H11IjVv4bp6ahuIcw0yyw/3udC4vJkHw3T3cUh85FTg8eWef3pSaw=="; + }; + }; "typeforce-1.18.0" = { name = "typeforce"; packageName = "typeforce"; @@ -65409,13 +67362,22 @@ let sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="; }; }; - "typegram-3.7.0" = { + "typegram-3.8.0" = { name = "typegram"; packageName = "typegram"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/typegram/-/typegram-3.7.0.tgz"; - sha512 = "IafMO+GRi5H8CtWSNihuD56Bjpmj/ISbg6G8jdTkNxldrym+FOPlo/fxtaPs/LyWnS0l1Bm18MUDwOikZSKmJw=="; + url = "https://registry.npmjs.org/typegram/-/typegram-3.8.0.tgz"; + sha512 = "MdlbWu0HfmgFJf4+xj6eqGYuanV2LJxBYTzLrD0kTV+woQ5dxDD2k8UVVjYnbBGkAagAyxzQevPiFZRWLFHSBw=="; + }; + }; + "typeorm-0.2.38" = { + name = "typeorm"; + packageName = "typeorm"; + version = "0.2.38"; + src = fetchurl { + url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.38.tgz"; + sha512 = "M6Y3KQcAREQcphOVJciywf4mv6+A0I/SeR+lWNjKsjnQ+a3XcMwGYMGL0Jonsx3H0Cqlf/3yYqVki1jIXSK/xg=="; }; }; "typescript-2.9.2" = { @@ -65454,24 +67416,6 @@ let sha512 = "w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="; }; }; - "typescript-4.0.3" = { - name = "typescript"; - packageName = "typescript"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz"; - sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; - }; - }; - "typescript-4.1.6" = { - name = "typescript"; - packageName = "typescript"; - version = "4.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.1.6.tgz"; - sha512 = "pxnwLxeb/Z5SP80JDRzVjh58KsM6jZHRAOtTpS7sXLS4ogXNKC9ANxHHZqLLeVHZN35jCtI4JdmLLbLiC1kBow=="; - }; - }; "typescript-4.3.4" = { name = "typescript"; packageName = "typescript"; @@ -65481,13 +67425,13 @@ let sha512 = "uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew=="; }; }; - "typescript-4.5.4" = { + "typescript-4.4.4" = { name = "typescript"; packageName = "typescript"; - version = "4.5.4"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz"; - sha512 = "VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz"; + sha512 = "DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA=="; }; }; "typescript-4.5.5" = { @@ -65499,6 +67443,24 @@ let sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; }; }; + "typescript-4.6.2" = { + name = "typescript"; + packageName = "typescript"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz"; + sha512 = "HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg=="; + }; + }; + "typescript-4.6.3" = { + name = "typescript"; + packageName = "typescript"; + version = "4.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz"; + sha512 = "yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw=="; + }; + }; "typescript-eslint-parser-16.0.1" = { name = "typescript-eslint-parser"; packageName = "typescript-eslint-parser"; @@ -65553,6 +67515,24 @@ let sha512 = "W20RYp2OCEGMhEYayR0cAP67AUWiGRUufMs6Clul7MAmu5SpLuOG/RWk7+LkL65wsugcfhPQlFEJ231C2xHNQg=="; }; }; + "u2f-api-0.2.7" = { + name = "u2f-api"; + packageName = "u2f-api"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/u2f-api/-/u2f-api-0.2.7.tgz"; + sha512 = "fqLNg8vpvLOD5J/z4B6wpPg4Lvowz1nJ9xdHcCzdUPKcFE/qNCceV2gNZxSJd5vhAZemHr/K/hbzVA0zxB5mkg=="; + }; + }; + "u3-0.1.1" = { + name = "u3"; + packageName = "u3"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/u3/-/u3-0.1.1.tgz"; + sha512 = "+J5D5ir763y+Am/QY6hXNRlwljIeRMZMGs0cT6qqZVVzzT3X3nFPXVyPOFRMOR4kupB0T8JnCdpWdp6Q/iXn3w=="; + }; + }; "ua-parser-js-0.7.20" = { name = "ua-parser-js"; packageName = "ua-parser-js"; @@ -65616,13 +67596,22 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.14.5" = { + "uglify-js-3.15.1" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.14.5"; + version = "3.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz"; - sha512 = "qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz"; + sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; + }; + }; + "uglify-js-3.15.3" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.3.tgz"; + sha512 = "6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg=="; }; }; "uglify-js-3.4.10" = { @@ -65742,6 +67731,15 @@ let sha512 = "aIvEHNRX1AlOYAr6qSUjQBn4mCduxx6MtC967aRDTb2UUBPj0Ix2ZFQDcmXUUO/UxRPHcw1f5a5nVbCSKDSOqA=="; }; }; + "uint8array-tools-0.0.7" = { + name = "uint8array-tools"; + packageName = "uint8array-tools"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/uint8array-tools/-/uint8array-tools-0.0.7.tgz"; + sha512 = "vrrNZJiusLWoFWBqz5Y5KMCgP9W9hnjZHzZiZRT8oNAkq3d5Z5Oe76jAvVVSRh4U8GGR90N2X1dWtrhvx6L8UQ=="; + }; + }; "ultron-1.0.2" = { name = "ultron"; packageName = "ultron"; @@ -65949,13 +67947,13 @@ let sha1 = "5e4bda308e4a8a2ae584f9b9a4359a499825cc50"; }; }; - "undici-4.12.2" = { + "undici-4.16.0" = { name = "undici"; packageName = "undici"; - version = "4.12.2"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-4.12.2.tgz"; - sha512 = "RZj6SbkQFs5O/pJCboGEo6l5DTCe3Zg4r/8Z/0/2qnIv08+s6zL4akohOPMYWKc3mzwv15WTvsfMWaafZcvYoQ=="; + url = "https://registry.npmjs.org/undici/-/undici-4.16.0.tgz"; + sha512 = "tkZSECUYi+/T1i4u+4+lwZmQgLXd4BLGlrc7KZPcLIW7Jpq99+Xpc30ONv7nS6F5UNOxp/HBZSSL9MafUrvJbw=="; }; }; "unherit-1.1.3" = { @@ -66048,13 +68046,13 @@ let sha1 = "afb10e4ef1eeddc711417bbb652bc885da9d4171"; }; }; - "unified-10.1.1" = { + "unified-10.1.2" = { name = "unified"; packageName = "unified"; - version = "10.1.1"; + version = "10.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-10.1.1.tgz"; - sha512 = "v4ky1+6BN9X3pQrOdkFIPWAaeDsHPE1svRDxq7YpTc2plkIqFMwukfqM+l0ewpP9EfwARlt9pPFAeWYhHm8X9w=="; + url = "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz"; + sha512 = "pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q=="; }; }; "unified-2.1.4" = { @@ -66282,15 +68280,6 @@ let sha512 = "ft06UDYzqi9o9RmGP0sZWI/zvLLQiBW2/MD+rW6mDqbOWDcmknGX9orQPspfuGRYWr8eSJAmfsBcvOpfGRJseA=="; }; }; - "unist-util-find-all-after-1.0.5" = { - name = "unist-util-find-all-after"; - packageName = "unist-util-find-all-after"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-1.0.5.tgz"; - sha512 = "lWgIc3rrTMTlK1Y0hEuL+k+ApzFk78h+lsaa2gHf63Gp5Ww+mt11huDniuaoq1H+XMK2lIIjjPkncxXcDp3QDw=="; - }; - }; "unist-util-find-all-after-3.0.2" = { name = "unist-util-find-all-after"; packageName = "unist-util-find-all-after"; @@ -66426,13 +68415,13 @@ let sha512 = "w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA=="; }; }; - "unist-util-position-4.0.1" = { + "unist-util-position-4.0.2" = { name = "unist-util-position"; packageName = "unist-util-position"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.1.tgz"; - sha512 = "mgy/zI9fQ2HlbOtTdr2w9lhVaiFUHWQnZrFF2EUoVOqtAUdzqMtNiD99qA5a1IcjWVR8O6aVYE9u7Z2z1v0SQA=="; + url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.2.tgz"; + sha512 = "Y6+plxR41dOLbyyqVDLuGWgXDmxdXslCSRYQkSDagBnOT9oFsQH0J8FzhirSklUEe0xZTT0WDnAE1gXPaDFljA=="; }; }; "unist-util-position-from-estree-1.1.1" = { @@ -66489,13 +68478,13 @@ let sha512 = "3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g=="; }; }; - "unist-util-stringify-position-3.0.0" = { + "unist-util-stringify-position-3.0.2" = { name = "unist-util-stringify-position"; packageName = "unist-util-stringify-position"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.0.tgz"; - sha512 = "SdfAl8fsDclywZpfMDTVDxA2V7LjtRDTOFd44wUJamgl6OlVngsqWjxvermMYf60elWHbxhuRCZml7AnuXCaSA=="; + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz"; + sha512 = "7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg=="; }; }; "unist-util-to-list-of-char-0.1.3" = { @@ -66588,13 +68577,13 @@ let sha512 = "y+QVLcY5eR/YVpqDsLf/xh9R3Q2Y4HxkZTp7ViLDU6WtJCEcPmRzW1gpdWDCDIqIlhuPDXOgttqPlykrHYDekg=="; }; }; - "universal-analytics-0.4.23" = { + "universal-analytics-0.5.3" = { name = "universal-analytics"; packageName = "universal-analytics"; - version = "0.4.23"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.23.tgz"; - sha512 = "lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A=="; + url = "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.5.3.tgz"; + sha512 = "HXSMyIcf2XTvwZ6ZZQLfxfViRm/yTGoRgDeTbojtq6rezeyKB0sTBcKH2fhddnteAHRcHiKgr/ACpbgjGOC6RQ=="; }; }; "universal-url-2.0.0" = { @@ -66966,13 +68955,13 @@ let sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; - "urijs-1.19.7" = { + "urijs-1.19.10" = { name = "urijs"; packageName = "urijs"; - version = "1.19.7"; + version = "1.19.10"; src = fetchurl { - url = "https://registry.npmjs.org/urijs/-/urijs-1.19.7.tgz"; - sha512 = "Id+IKjdU0Hx+7Zx717jwLPsPeUqz7rAtuVBRLLs+qn+J2nf9NGITWVCxcijgYxBqe83C7sqsQPs6H1pyz3x9gA=="; + url = "https://registry.npmjs.org/urijs/-/urijs-1.19.10.tgz"; + sha512 = "EzauQlgKuJgsXOqoMrCiePBf4At5jVqRhXykF3Wfb8ZsOBMxPcfiVBcsHXug4Aepb/ICm2PIgqAUGMelgdrWEg=="; }; }; "urix-0.1.0" = { @@ -67065,13 +69054,13 @@ let sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; }; }; - "url-parse-1.5.4" = { + "url-parse-1.5.10" = { name = "url-parse"; packageName = "url-parse"; - version = "1.5.4"; + version = "1.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz"; - sha512 = "ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz"; + sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; "url-parse-as-address-1.0.0" = { @@ -67119,22 +69108,13 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; - "url-toolkit-2.2.3" = { - name = "url-toolkit"; - packageName = "url-toolkit"; - version = "2.2.3"; + "url-value-parser-2.1.0" = { + name = "url-value-parser"; + packageName = "url-value-parser"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.3.tgz"; - sha512 = "Da75SQoxsZ+2wXS56CZBrj2nukQ4nlGUZUP/dqUBG5E1su5GKThgT94Q00x81eVII7AyS1Pn+CtTTZ4Z0pLUtQ=="; - }; - }; - "urlencode-1.1.0" = { - name = "urlencode"; - packageName = "urlencode"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/urlencode/-/urlencode-1.1.0.tgz"; - sha1 = "1f2ba26f013c85f0133f7a3ad6ff2730adf7cbb7"; + url = "https://registry.npmjs.org/url-value-parser/-/url-value-parser-2.1.0.tgz"; + sha512 = "gIYPWXujdUdwd/9TGCHTf5Vvgw6lOxjE5Q/k+7WNByYyS0vW5WX0k+xuVlhvPq6gRNhzXVv/ezC+OfeAet5Kcw=="; }; }; "urlsafe-base64-1.0.0" = { @@ -67237,13 +69217,13 @@ let sha1 = "8bb871a4741e085c70487ca7acdbd7d6d36029eb"; }; }; - "utf-8-validate-5.0.8" = { + "utf-8-validate-5.0.9" = { name = "utf-8-validate"; packageName = "utf-8-validate"; - version = "5.0.8"; + version = "5.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.8.tgz"; - sha512 = "k4dW/Qja1BYDl2qD4tOMB9PFVha/UJtxTc1cXYOe3WwA/2m0Yn4qB7wLMpJyLJ/7DR0XnTut3HsCSzDT4ZvKgA=="; + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.9.tgz"; + sha512 = "Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q=="; }; }; "utf7-1.0.2" = { @@ -67417,6 +69397,15 @@ let sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; }; }; + "utility-types-3.10.0" = { + name = "utility-types"; + packageName = "utility-types"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz"; + sha512 = "O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg=="; + }; + }; "utils-merge-1.0.1" = { name = "utils-merge"; packageName = "utils-merge"; @@ -67453,15 +69442,6 @@ let sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; - "uuid-3.0.0" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"; - sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; - }; - }; "uuid-3.2.1" = { name = "uuid"; packageName = "uuid"; @@ -67543,6 +69523,15 @@ let sha512 = "brFwqA3FXzilmtnIyJ+CxdkInkY/i4ErvP7uV0DnUVxQcQ55reuHphorpF+tZoVHK2MniZ/VJzI7zJQoc9T9Yw=="; }; }; + "uws-9.148.0" = { + name = "uws"; + packageName = "uws"; + version = "9.148.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uws/-/uws-9.148.0.tgz"; + sha512 = "vWt+e8dOdwLM4neb1xIeZuQ7ZUN3l7n0qTKrOUtU1EZrV4BpmrSnsEL30d062/ocqRMGtLpwzVFsLKFgXomA9g=="; + }; + }; "v8-compile-cache-2.3.0" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; @@ -67552,6 +69541,15 @@ let sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; }; }; + "v8-compile-cache-lib-3.0.0" = { + name = "v8-compile-cache-lib"; + packageName = "v8-compile-cache-lib"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz"; + sha512 = "mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA=="; + }; + }; "v8-debug-1.0.1" = { name = "v8-debug"; packageName = "v8-debug"; @@ -67642,6 +69640,15 @@ let sha512 = "X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw=="; }; }; + "validator-12.2.0" = { + name = "validator"; + packageName = "validator"; + version = "12.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-12.2.0.tgz"; + sha512 = "jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ=="; + }; + }; "validator-13.7.0" = { name = "validator"; packageName = "validator"; @@ -67786,13 +69793,13 @@ let sha512 = "Hq72JaTpcTFdWiNA4Y22Amej2GH3BFmBaKPPlDZ4/oC8HNn2ISHLkFrJU4Ds8R3jcUi7oo5Y9jcMHKjES+N9wQ=="; }; }; - "vega-5.21.0" = { + "vega-5.22.1" = { name = "vega"; packageName = "vega"; - version = "5.21.0"; + version = "5.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega/-/vega-5.21.0.tgz"; - sha512 = "yqqRa9nAqYoAxe7sVhRpsh0b001fly7Yx05klPkXmrvzjxXd07gClW1mOuGgSnVQqo7jTp/LYgbO1bD37FbEig=="; + url = "https://registry.npmjs.org/vega/-/vega-5.22.1.tgz"; + sha512 = "KJBI7OWSzpfCPbmWl3GQCqBqbf2TIdpWS0mzO6MmWbvdMhWHf74P9IVnx1B1mhg0ZTqWFualx9ZYhWzMMwudaQ=="; }; }; "vega-canvas-1.2.6" = { @@ -67804,13 +69811,13 @@ let sha512 = "rgeYUpslYn/amIfnuv3Sw6n4BGns94OjjZNtUc9IDji6b+K8LGS/kW+Lvay8JX/oFqtulBp8RLcHN6QjqPLA9Q=="; }; }; - "vega-crossfilter-4.0.5" = { + "vega-crossfilter-4.1.0" = { name = "vega-crossfilter"; packageName = "vega-crossfilter"; - version = "4.0.5"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.0.5.tgz"; - sha512 = "yF+iyGP+ZxU7Tcj5yBsMfoUHTCebTALTXIkBNA99RKdaIHp1E690UaGVLZe6xde2n5WaYpho6I/I6wdAW3NXcg=="; + url = "https://registry.npmjs.org/vega-crossfilter/-/vega-crossfilter-4.1.0.tgz"; + sha512 = "aiOJcvVpiEDIu5uNc4Kf1hakkkPaVOO5fw5T4RSFAw6GEDbdqcB6eZ1xePcsLVic1hxYD5SGiUPdiiIs0SMh2g=="; }; }; "vega-dataflow-5.7.4" = { @@ -67822,13 +69829,13 @@ let sha512 = "JGHTpUo8XGETH3b1V892we6hdjzCWB977ybycIu8DPqRoyrZuj6t1fCVImazfMgQD1LAfJlQybWP+alwKDpKig=="; }; }; - "vega-encode-4.8.3" = { + "vega-encode-4.9.0" = { name = "vega-encode"; packageName = "vega-encode"; - version = "4.8.3"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-encode/-/vega-encode-4.8.3.tgz"; - sha512 = "JoRYtaV2Hs8spWLzTu/IjR7J9jqRmuIOEicAaWj6T9NSZrNWQzu2zF3IVsX85WnrIDIRUDaehXaFZvy9uv9RQg=="; + url = "https://registry.npmjs.org/vega-encode/-/vega-encode-4.9.0.tgz"; + sha512 = "etv2BHuCn9bzEc0cxyA2TnbtcAFQGVFmsaqmB4sgBCaqTSEfXMoX68LK3yxBrsdm5LU+y3otJVoewi3qWYCx2g=="; }; }; "vega-event-selector-3.0.0" = { @@ -67849,67 +69856,67 @@ let sha512 = "y5+c2frq0tGwJ7vYXzZcfVcIRF/QGfhf2e+bV1Z0iQs+M2lI1II1GPDdmOcMKimpoCVp/D61KUJDIGE1DSmk2w=="; }; }; - "vega-force-4.0.7" = { + "vega-force-4.1.0" = { name = "vega-force"; packageName = "vega-force"; - version = "4.0.7"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-force/-/vega-force-4.0.7.tgz"; - sha512 = "pyLKdwXSZ9C1dVIqdJOobvBY29rLvZjvRRTla9BU/nMwAiAGlGi6WKUFdRGdneyGe3zo2nSZDTZlZM/Z5VaQNA=="; + url = "https://registry.npmjs.org/vega-force/-/vega-force-4.1.0.tgz"; + sha512 = "Sssf8iH48vYlz+E7/RpU+SUaJbuLoIL87U4tG2Av4gf/hRiImU49x2TI3EuhFWg1zpaCFxlz0CAaX++Oh/gjdw=="; }; }; - "vega-format-1.0.4" = { + "vega-format-1.1.0" = { name = "vega-format"; packageName = "vega-format"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-format/-/vega-format-1.0.4.tgz"; - sha512 = "oTAeub3KWm6nKhXoYCx1q9G3K43R6/pDMXvqDlTSUtjoY7b/Gixm8iLcir5S9bPjvH40n4AcbZsPmNfL/Up77A=="; - }; - }; - "vega-functions-5.12.1" = { - name = "vega-functions"; - packageName = "vega-functions"; - version = "5.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.12.1.tgz"; - sha512 = "7cHfcjXOj27qEbh2FTzWDl7FJK4xGcMFF7+oiyqa0fp7BU/wNT5YdNV0t5kCX9WjV7mfJWACKV74usLJbyM6GA=="; - }; - }; - "vega-geo-4.3.8" = { - name = "vega-geo"; - packageName = "vega-geo"; - version = "4.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.3.8.tgz"; - sha512 = "fsGxV96Q/QRgPqOPtMBZdI+DneIiROKTG3YDZvGn0EdV16OG5LzFhbNgLT5GPzI+kTwgLpAsucBHklexlB4kfg=="; - }; - }; - "vega-hierarchy-4.0.9" = { - name = "vega-hierarchy"; - packageName = "vega-hierarchy"; - version = "4.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.0.9.tgz"; - sha512 = "4XaWK6V38/QOZ+vllKKTafiwL25m8Kd+ebHmDV+Q236ONHmqc/gv82wwn9nBeXPEfPv4FyJw2SRoqa2Jol6fug=="; - }; - }; - "vega-label-1.1.0" = { - name = "vega-label"; - packageName = "vega-label"; version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-label/-/vega-label-1.1.0.tgz"; - sha512 = "LAThIiDEsZxYvbSkvPLJ93eJF+Ts8RXv1IpBh8gmew8XGmaLJvVkzdsMe7WJJwuaVEsK7ZZFyB/Inkp842GW6w=="; + url = "https://registry.npmjs.org/vega-format/-/vega-format-1.1.0.tgz"; + sha512 = "6mgpeWw8yGdG0Zdi8aVkx5oUrpJGOpNxqazC2858RSDPvChM/jDFlgRMTYw52qk7cxU0L08ARp4BwmXaI75j0w=="; }; }; - "vega-loader-4.4.1" = { + "vega-functions-5.13.0" = { + name = "vega-functions"; + packageName = "vega-functions"; + version = "5.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.13.0.tgz"; + sha512 = "Mf53zNyx+c9fFqagEI0T8zc9nMlx0zozOngr8oOpG1tZDKOgwOnUgN99zQKbLHjyv+UzWrq3LYTnSLyVe0ZmhQ=="; + }; + }; + "vega-geo-4.4.0" = { + name = "vega-geo"; + packageName = "vega-geo"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-geo/-/vega-geo-4.4.0.tgz"; + sha512 = "3YX41y+J5pu0PMjvBCASg0/lgvu9+QXWJZ+vl6FFKa8AlsIopQ67ZL7ObwqjZcoZMolJ4q0rc+ZO8aj1pXCYcw=="; + }; + }; + "vega-hierarchy-4.1.0" = { + name = "vega-hierarchy"; + packageName = "vega-hierarchy"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-hierarchy/-/vega-hierarchy-4.1.0.tgz"; + sha512 = "DWBK39IEt4FiQru12twzKSFUvFFZ7KtlH9+lAaqrJnKuIZFCyQ1XOUfKScfbKIlk4KS+DuCTNLI/pxC/f7Sk9Q=="; + }; + }; + "vega-label-1.2.0" = { + name = "vega-label"; + packageName = "vega-label"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-label/-/vega-label-1.2.0.tgz"; + sha512 = "1prOqkCAfXaUvMqavbGI0nbYGqV8UQR9qvuVwrPJ6Yxm3GIUIOA/JRqNY8eZR8USwMP/kzsqlfVEixj9+Y75VQ=="; + }; + }; + "vega-loader-4.5.0" = { name = "vega-loader"; packageName = "vega-loader"; - version = "4.4.1"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.4.1.tgz"; - sha512 = "dj65i4qlNhK0mOmjuchHgUrF5YUaWrYpx0A8kXA68lBk5Hkx8FNRztkcl07CZJ1+8V81ymEyJii9jzGbhEX0ag=="; + url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.5.0.tgz"; + sha512 = "EkAyzbx0pCYxH3v3wghGVCaKINWxHfgbQ2pYDiYv0yo8e04S8Mv/IlRGTt6BAe7cLhrk1WZ4zh20QOppnGG05w=="; }; }; "vega-parser-6.1.4" = { @@ -67921,22 +69928,22 @@ let sha512 = "tORdpWXiH/kkXcpNdbSVEvtaxBuuDtgYp9rBunVW9oLsjFvFXbSWlM1wvJ9ZFSaTfx6CqyTyGMiJemmr1QnTjQ=="; }; }; - "vega-projection-1.4.5" = { + "vega-projection-1.5.0" = { name = "vega-projection"; packageName = "vega-projection"; - version = "1.4.5"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-projection/-/vega-projection-1.4.5.tgz"; - sha512 = "85kWcPv0zrrNfxescqHtSYpRknilrS0K3CVRZc7IYQxnLtL1oma9WEbrSr1LCmDoCP5hl2Z1kKbomPXkrQX5Ag=="; + url = "https://registry.npmjs.org/vega-projection/-/vega-projection-1.5.0.tgz"; + sha512 = "aob7qojh555x3hQWZ/tr8cIJNSWQbm6EoWTJaheZgFOY2x3cDa4Qrg3RJbGw6KwVj/IQk2p40paRzixKZ2kr+A=="; }; }; - "vega-regression-1.0.9" = { + "vega-regression-1.1.0" = { name = "vega-regression"; packageName = "vega-regression"; - version = "1.0.9"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-regression/-/vega-regression-1.0.9.tgz"; - sha512 = "KSr3QbCF0vJEAWFVY2MA9X786oiJncTTr3gqRMPoaLr/Yo3f7OPKXRoUcw36RiWa0WCOEMgTYtM28iK6ZuSgaA=="; + url = "https://registry.npmjs.org/vega-regression/-/vega-regression-1.1.0.tgz"; + sha512 = "09K0RemY6cdaXBAyakDUNFfEkRcLkGjkDJyWQPAUqGK59hV2J+G3i4uxkZp18Vu0t8oqU7CgzwWim1s5uEpOcA=="; }; }; "vega-runtime-6.1.3" = { @@ -67948,58 +69955,58 @@ let sha512 = "gE+sO2IfxMUpV0RkFeQVnHdmPy3K7LjHakISZgUGsDI/ZFs9y+HhBf8KTGSL5pcZPtQsZh3GBQ0UonqL1mp9PA=="; }; }; - "vega-scale-7.1.1" = { + "vega-scale-7.2.0" = { name = "vega-scale"; packageName = "vega-scale"; - version = "7.1.1"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.1.1.tgz"; - sha512 = "yE0to0prA9E5PBJ/XP77TO0BMkzyUVyt7TH5PAwj+CZT7PMsMO6ozihelRhoIiVcP0Ae/ByCEQBUQkzN5zJ0ZA=="; + url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.2.0.tgz"; + sha512 = "QYltO/otrZHLrCGGf06Y99XtPtqWXITr6rw7rO9oL+l3d9o5RFl9sjHrVxiM7v+vGoZVWbBd5IPbFhPsXZ6+TA=="; }; }; - "vega-scenegraph-4.9.4" = { + "vega-scenegraph-4.10.1" = { name = "vega-scenegraph"; packageName = "vega-scenegraph"; - version = "4.9.4"; + version = "4.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.9.4.tgz"; - sha512 = "QaegQzbFE2yhYLNWAmHwAuguW3yTtQrmwvfxYT8tk0g+KKodrQ5WSmNrphWXhqwtsgVSvtdZkfp2IPeumcOQJg=="; + url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.10.1.tgz"; + sha512 = "takIpkmNxYHhJYALOYzhTin3EDzbys6U4g+l1yJZVlXG9YTdiCMuEVAdtaQOCqF9/7qytD6pCrMxJY2HaoN0qQ=="; }; }; - "vega-selections-5.3.1" = { + "vega-selections-5.4.0" = { name = "vega-selections"; packageName = "vega-selections"; - version = "5.3.1"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.3.1.tgz"; - sha512 = "cm4Srw1WHjcLGXX7GpxiUlfESv8XPu5b6Vh3mqMDPU94P2FO91SR9gei+EtRdt+KCFgIjr//MnRUjg/hAWwjkQ=="; + url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.0.tgz"; + sha512 = "Un3JdLDPjIpF9Dh4sw6m1c/QAcfam6m1YXHJ9vJxE/GdJ+sOrPxc7bcEU8VhOmTUN7IQUn4/1ry4JqqOVMbEhw=="; }; }; - "vega-statistics-1.7.10" = { + "vega-statistics-1.8.0" = { name = "vega-statistics"; packageName = "vega-statistics"; - version = "1.7.10"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.10.tgz"; - sha512 = "QLb12gcfpDZ9K5h3TLGrlz4UXDH9wSPyg9LLfOJZacxvvJEPohacUQNrGEAVtFO9ccUCerRfH9cs25ZtHsOZrw=="; + url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.8.0.tgz"; + sha512 = "dl+LCRS6qS4jWDme/NEdPVt5r649uB4IK6Kyr2/czmGA5JqjuFmtQ9lHQOnRu8945XLkqLf+JIQQo7vnw+nslA=="; }; }; - "vega-time-2.0.4" = { + "vega-time-2.1.0" = { name = "vega-time"; packageName = "vega-time"; - version = "2.0.4"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-time/-/vega-time-2.0.4.tgz"; - sha512 = "U314UDR9+ZlWrD3KBaeH+j/c2WSMdvcZq5yJfFT0yTg1jsBKAQBYFGvl+orackD8Zx3FveHOxx3XAObaQeDX+Q=="; + url = "https://registry.npmjs.org/vega-time/-/vega-time-2.1.0.tgz"; + sha512 = "Q9/l3S6Br1RPX5HZvyLD/cQ4K6K8DtpR09/1y7D66gxNorg2+HGzYZINH9nUvN3mxoXcBWg4cCUh3+JvmkDaEg=="; }; }; - "vega-transforms-4.9.4" = { + "vega-transforms-4.10.0" = { name = "vega-transforms"; packageName = "vega-transforms"; - version = "4.9.4"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.9.4.tgz"; - sha512 = "JGBhm5Bf6fiGTUSB5Qr5ckw/KU9FJcSV5xIe/y4IobM/i/KNwI1i1fP45LzP4F4yZc0DMTwJod2UvFHGk9plKA=="; + url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.10.0.tgz"; + sha512 = "Yk6ByzVq5F2niFfPlSsrU5wi+NZhsF7IBpJCcTfms4U7eoyNepUXagdFEJ3VWBD/Lit6GorLXFgO17NYcyS5gg=="; }; }; "vega-typings-0.22.2" = { @@ -68020,13 +70027,13 @@ let sha512 = "HTaydZd9De3yf+8jH66zL4dXJ1d1p5OIFyoBzFiOli4IJbwkL1jrefCKz6AHDm1kYBzDJ0X4bN+CzZSCTvNk1w=="; }; }; - "vega-view-5.10.1" = { + "vega-view-5.11.0" = { name = "vega-view"; packageName = "vega-view"; - version = "5.10.1"; + version = "5.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-view/-/vega-view-5.10.1.tgz"; - sha512 = "4xvQ5KZcgKdZx1Z7jjenCUumvlyr/j4XcHLRf9gyeFrFvvS596dVpL92V8twhV6O++DmS2+fj+rHagO8Di4nMg=="; + url = "https://registry.npmjs.org/vega-view/-/vega-view-5.11.0.tgz"; + sha512 = "MI9NTRFmtFX6ADk6KOHhi8bhHjC9pPm42Bj2+74c6l1d3NQZf9Jv7lkiGqKohdkQDNH9LPwz/6slhKwPU9JdkQ=="; }; }; "vega-view-transforms-4.5.8" = { @@ -68038,13 +70045,13 @@ let sha512 = "966m7zbzvItBL8rwmF2nKG14rBp7q+3sLCKWeMSUrxoG+M15Smg5gWEGgwTG3A/RwzrZ7rDX5M1sRaAngRH25g=="; }; }; - "vega-voronoi-4.1.5" = { + "vega-voronoi-4.2.0" = { name = "vega-voronoi"; packageName = "vega-voronoi"; - version = "4.1.5"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.1.5.tgz"; - sha512 = "950IkgCFLj0zG33EWLAm1hZcp+FMqWcNQliMYt+MJzOD5S4MSpZpZ7K4wp2M1Jktjw/CLKFL9n38JCI0i3UonA=="; + url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.0.tgz"; + sha512 = "1iuNAVZgUHRlBpdq4gSga3KlQmrgFfwy+KpyDgPLQ8HbLkhcVeT7RDh2L6naluqD7Op0xVLms3clR920WsYryQ=="; }; }; "vega-wordcloud-4.1.3" = { @@ -68164,13 +70171,13 @@ let sha512 = "O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA=="; }; }; - "vfile-5.3.0" = { + "vfile-5.3.2" = { name = "vfile"; packageName = "vfile"; - version = "5.3.0"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-5.3.0.tgz"; - sha512 = "Tj44nY/48OQvarrE4FAjUfrv7GZOYzPbl5OD65HxVKwLJKMPU7zmfV8cCgCnzKWnSfYG2f3pxu+ALqs7j22xQQ=="; + url = "https://registry.npmjs.org/vfile/-/vfile-5.3.2.tgz"; + sha512 = "w0PLIugRY3Crkgw89TeMvHCzqCs/zpreR31hl4D92y6SOE07+bfJe+dK5Q2akwS+i/c801kzjoOr9gMcTe6IAA=="; }; }; "vfile-find-down-1.0.0" = { @@ -68254,13 +70261,13 @@ let sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ=="; }; }; - "vfile-message-3.1.0" = { + "vfile-message-3.1.2" = { name = "vfile-message"; packageName = "vfile-message"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.0.tgz"; - sha512 = "4QJbBk+DkPEhBXq3f260xSaWtjE4gPKOfulzfMFF8ZNwaPZieWsg3iVlcmF04+eebzpcpeXOOFMfrYzJHVYg+g=="; + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.2.tgz"; + sha512 = "QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA=="; }; }; "vfile-reporter-1.5.0" = { @@ -68290,13 +70297,13 @@ let sha512 = "GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA=="; }; }; - "vfile-reporter-7.0.3" = { + "vfile-reporter-7.0.4" = { name = "vfile-reporter"; packageName = "vfile-reporter"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.3.tgz"; - sha512 = "q+ruTWxFHbow359TDqoNJn5THdwRDeV+XUOtzdT/OESgaGw05CjL68ImlbzRzqS5xL62Y1IaIWb8x+RbaNjayA=="; + url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-7.0.4.tgz"; + sha512 = "4cWalUnLrEnbeUQ+hARG5YZtaHieVK3Jp4iG5HslttkVl+MHunSGNAIrODOTLbtjWsNZJRMCkL66AhvZAYuJ9A=="; }; }; "vfile-reporter-pretty-5.0.0" = { @@ -68425,15 +70432,6 @@ let sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16"; }; }; - "vinyl-sourcemaps-apply-0.2.1" = { - name = "vinyl-sourcemaps-apply"; - packageName = "vinyl-sourcemaps-apply"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"; - sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705"; - }; - }; "vizion-2.2.1" = { name = "vizion"; packageName = "vizion"; @@ -68479,13 +70477,13 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; - "vm2-3.9.5" = { + "vm2-3.9.9" = { name = "vm2"; packageName = "vm2"; - version = "3.9.5"; + version = "3.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.5.tgz"; - sha512 = "LuCAHZN75H9tdrAiLFf030oW7nJV5xwNMuk1ymOZwopmuK3d2H4L1Kv4+GFHgarKiLfXXLFU+7LDABHnwOkWng=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz"; + sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw=="; }; }; "voc-1.2.0" = { @@ -68515,15 +70513,6 @@ let sha1 = "614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"; }; }; - "vsce-1.103.1" = { - name = "vsce"; - packageName = "vsce"; - version = "1.103.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.103.1.tgz"; - sha512 = "98oKQKKRp7J/vTIk1cuzom5cezZpYpRHs3WlySdsrTCrAEipB/HvaPTc4VZ3hGZHzHXS9P5p2L0IllntJeXwiQ=="; - }; - }; "vsce-1.88.0" = { name = "vsce"; packageName = "vsce"; @@ -68533,6 +70522,15 @@ let sha512 = "FS5ou3G+WRnPPr/tWVs8b/jVzeDacgZHy/y7/QQW7maSPFEAmRt2bFGUJtJVEUDLBqtDm/3VGMJ7D31cF2U1tw=="; }; }; + "vsce-2.7.0" = { + name = "vsce"; + packageName = "vsce"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vsce/-/vsce-2.7.0.tgz"; + sha512 = "CKU34wrQlbKDeJCRBkd1a8iwF9EvNxcYMg9hAUH6AxFGR6Wo2IKWwt3cJIcusHxx6XdjDHWlfAS/fJN30uvVnA=="; + }; + }; "vscode-css-languageservice-3.0.13" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; @@ -68551,13 +70549,22 @@ let sha512 = "jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw=="; }; }; - "vscode-css-languageservice-5.1.9" = { + "vscode-css-languageservice-5.1.13" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "5.1.9"; + version = "5.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.9.tgz"; - sha512 = "/tFOWeZBL3Oc9Zc+2MAi3rEwiXJTSZsvjB+M7nSjWLbGPUIjukUA7YzLgsBoUfR35sPJYnXWUkL56PdfIYM8GA=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.13.tgz"; + sha512 = "FA0foqMzMmEoO0WJP+MjoD4dRERhKS+Ag+yBrtmWQDmw2OuZ1R/5FkvI/XdTkCpHmTD9VMczugpHRejQyTXCNQ=="; + }; + }; + "vscode-css-languageservice-5.3.0" = { + name = "vscode-css-languageservice"; + packageName = "vscode-css-languageservice"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.3.0.tgz"; + sha512 = "ujWW855AoJlE4ETU17Gff7unlZZTHDA0w26itk9EQFMfJqi9lE6S67zOsMvcPmJf55MrnGQbojDYZRiDVaFjdA=="; }; }; "vscode-debugadapter-testsupport-1.51.0" = { @@ -68587,15 +70594,6 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; - "vscode-emmet-helper-2.1.2" = { - name = "vscode-emmet-helper"; - packageName = "vscode-emmet-helper"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.1.2.tgz"; - sha512 = "Fy6UNawSgxE3Kuqi54vSXohf03iOIrp1A74ReAgzvGP9Yt7fUAvkqF6No2WAc34/w0oWAHAeqoBNqmKKWh6U5w=="; - }; - }; "vscode-emmet-helper-2.6.4" = { name = "vscode-emmet-helper"; packageName = "vscode-emmet-helper"; @@ -68614,15 +70612,6 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-html-languageservice-3.2.0" = { - name = "vscode-html-languageservice"; - packageName = "vscode-html-languageservice"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-3.2.0.tgz"; - sha512 = "aLWIoWkvb5HYTVE0kI9/u3P0ZAJGrYOSAAE6L0wqB9radKRtbJNrF9+BjSUFyCgBdNBE/GFExo35LoknQDJrfw=="; - }; - }; "vscode-html-languageservice-4.1.1" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; @@ -68632,13 +70621,13 @@ let sha512 = "rrDyCiOgMwOPgchpPGAeLzjYVVEW/Ror2/a1BWUEI3S9+NQhA9vj4SQkzmH6g2Bq9S9SV0OQeadD+xphOf1N3w=="; }; }; - "vscode-html-languageservice-4.2.1" = { + "vscode-html-languageservice-4.2.4" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; - version = "4.2.1"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.2.1.tgz"; - sha512 = "PgaToZVXJ44nFWEBuSINdDgVV6EnpC3MnXBsysR3O5TKcAfywbYeRGRy+Y4dVR7YeUgDvtb+JkJoSkaYC0mxXQ=="; + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.2.4.tgz"; + sha512 = "1HqvXKOq9WlZyW4HTD+0XzrjZoZ/YFrgQY2PZqktbRloHXVAUKm6+cAcvZi4YqKPVn05/CK7do+KBHfuSaEdbg=="; }; }; "vscode-json-languageservice-3.11.0" = { @@ -68650,24 +70639,6 @@ let sha512 = "QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA=="; }; }; - "vscode-json-languageservice-4.1.10" = { - name = "vscode-json-languageservice"; - packageName = "vscode-json-languageservice"; - version = "4.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.10.tgz"; - sha512 = "IHliMEEYSY0tJjJt0ECb8ESx/nRXpoy9kN42WVQXgaqGyizFAf3jibSiezDQTrrY7f3kywXggCU+kkJEM+OLZQ=="; - }; - }; - "vscode-json-languageservice-4.1.7" = { - name = "vscode-json-languageservice"; - packageName = "vscode-json-languageservice"; - version = "4.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.7.tgz"; - sha512 = "cwG5TwZyHYthsk2aS3W1dVgVP6Vwn3o+zscwN58uMgZt/nKuyxd9vdEB1F58Ix+S5kSKAnkUCP6hvulcoImQQQ=="; - }; - }; "vscode-json-languageservice-4.1.8" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; @@ -68677,13 +70648,13 @@ let sha512 = "0vSpg6Xd9hfV+eZAaYN63xVVMOTmJ4GgHxXnkLCh+9RsQBkWKIghzLhW2B9ebfG+LQQg8uLtsQ2aUKjTgE+QOg=="; }; }; - "vscode-json-languageservice-4.2.0-next.2" = { + "vscode-json-languageservice-4.2.1" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "4.2.0-next.2"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.2.0-next.2.tgz"; - sha512 = "P0sdiZS7bM8+bxrkpL7XPwwhmZj94pcJIAZUh/QeessvYtXFnRmOEybe20rC+CS7b7DfwFcVt0p4p93hGZQ5gg=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.2.1.tgz"; + sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -68749,15 +70720,6 @@ let sha512 = "nkiNDGI+Ytp7uj1lxHXddXCoEunhcry1D+KmVHBfUUgWT9jMF8ZJyH5KQObdF+OGAh7bXZxD/SV4uGwSCeHHWA=="; }; }; - "vscode-jsonrpc-8.0.0-next.2" = { - name = "vscode-jsonrpc"; - packageName = "vscode-jsonrpc"; - version = "8.0.0-next.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.2.tgz"; - sha512 = "gxUyTBAjmwGkiHW/UaRScre2s4i98P8M7gnc3VB4DrVQUm3vQ0idi2cN9nbkfcjATx+uEt8C22j+MLN/8UzsJA=="; - }; - }; "vscode-jsonrpc-8.0.0-next.5" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -68767,6 +70729,15 @@ let sha512 = "owRllqcFTnz5rXxcbmHPFGmpFmLqj9Z1V3Dzrv+s8ejOHLIT62Pyb5Uqzyl2/in2VP22DmzErPgZwrxjLCIKiQ=="; }; }; + "vscode-jsonrpc-8.0.0-next.7" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "8.0.0-next.7"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.0-next.7.tgz"; + sha512 = "JX/F31LEsims0dAlOTKFE4E+AJMiJvdRSRViifFJSqSN7EzeYyWlfuDchF7g91oRNPZOIWfibTkDf3/UMsQGzQ=="; + }; + }; "vscode-languageclient-4.0.1" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; @@ -68776,13 +70747,13 @@ let sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; - "vscode-languageclient-8.0.0-next.2" = { + "vscode-languageclient-8.0.0-next.8" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "8.0.0-next.2"; + version = "8.0.0-next.8"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.0-next.2.tgz"; - sha512 = "ZmWnfZCwxV/FAci9jVMBnhwtdt9qkItXKqlmAU69pBSBgcr0fRrjEHOnzWG7BcuhxE0kti6/Y9bOEIn1L+OoDQ=="; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.0-next.8.tgz"; + sha512 = "CBdYRIVqqlRmZ2YBeTk0S2QMtsL8ZJfbddlfvERmRPXW4Pimr7Nk+mYq16F/k3HbrO9Xt+RAFP1t6FIIbmuUGw=="; }; }; "vscode-languageserver-3.5.1" = { @@ -68866,13 +70837,13 @@ let sha512 = "/65lxR/CuLJoOdzTjOTYUPWS7k5qzaWese4PObnWc6jwLryUrSa7DslYfaRXigh5/xr1nlaUZCcJwkpgM0wFvw=="; }; }; - "vscode-languageserver-8.0.0-next.6" = { + "vscode-languageserver-8.0.0-next.10" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "8.0.0-next.6"; + version = "8.0.0-next.10"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.6.tgz"; - sha512 = "RgGRAsXUksdtCrhtxFUeMXzqE4C/7AHSR6loIQY3GFDNIqrlEIkkQZg2Kkouf/i+eE/Iummn2ZB85VKNTBQgsQ=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.0-next.10.tgz"; + sha512 = "sdjldl9ipuBSWVw5ENVMRcOVQwF0o+J6+lNA7FrB8MiLmzflnfjRoJMqA5tCEY8S/J/+P56ZR/dqiQnRYg5m8w=="; }; }; "vscode-languageserver-protocol-3.14.1" = { @@ -68920,6 +70891,15 @@ let sha512 = "VLRcWKOpCXcx9UrqrS+NSF6pNxV498VGYGW+eyp9a79/F9ElUq3wdG6acXYlEfpWHuIxpm6MXps8FU88wqIgTg=="; }; }; + "vscode-languageserver-protocol-3.17.0-next.16" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.17.0-next.16"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.16.tgz"; + sha512 = "tx4DnXw9u3N7vw+bx6n2NKp6FoxoNwiP/biH83AS30I2AnTGyLd7afSeH6Oewn2E8jvB7K15bs12sMppkKOVeQ=="; + }; + }; "vscode-languageserver-protocol-3.17.0-next.5" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -68929,15 +70909,6 @@ let sha512 = "LFZ6WMB3iPezQAU9OnGoERzcIVKhcs0OLfD/NHcqSj3g1wgxuLUL5kSlZbbjFySQCmhzm6b0yb3hjTSeBtq1+w=="; }; }; - "vscode-languageserver-protocol-3.17.0-next.8" = { - name = "vscode-languageserver-protocol"; - packageName = "vscode-languageserver-protocol"; - version = "3.17.0-next.8"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.0-next.8.tgz"; - sha512 = "P89vSuJ+FA5JzFmcOoZN13Ig1yd6LsiPOig0O5m5BSGuO/rplQegCd9J0wKpaTy7trf/SYHRoypnbUBdzy14sg=="; - }; - }; "vscode-languageserver-protocol-3.5.1" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -68965,13 +70936,13 @@ let sha512 = "N8bOS8i0xuQMn/y0bijyefDbOsMl6hiH6LDREYWavTLTM5jbj44EiQfStsbmAv/0eaFKkL/jf5hW7nWwBy2HBw=="; }; }; - "vscode-languageserver-textdocument-1.0.3" = { + "vscode-languageserver-textdocument-1.0.4" = { name = "vscode-languageserver-textdocument"; packageName = "vscode-languageserver-textdocument"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.3.tgz"; - sha512 = "ynEGytvgTb6HVSUwPJIAZgiHQmPCx8bZ8w5um5Lz+q5DjP0Zj8wTFhQpyg8xaMvefDytw2+HH5yzqS+FhsR28A=="; + url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz"; + sha512 = "/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ=="; }; }; "vscode-languageserver-types-3.14.0" = { @@ -69046,6 +71017,15 @@ let sha512 = "rHYeCotiabJHgvIYzWjV8g0dHCxyOQtcryTv1Xa1horaQ4jx2V+rjLBstc6zMpCyrnZcjorwEcAvGBDCd6wudw=="; }; }; + "vscode-languageserver-types-3.17.0-next.9" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.17.0-next.9"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.0-next.9.tgz"; + sha512 = "9/PeDNPYduaoXRUzYpqmu4ZV9L01HGo0wH9FUt+sSHR7IXwA7xoXBfNUlv8gB9H0D2WwEmMomSy1NmhjKQyn3A=="; + }; + }; "vscode-languageserver-types-3.5.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -69091,15 +71071,6 @@ let sha512 = "u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA=="; }; }; - "vscode-test-1.6.1" = { - name = "vscode-test"; - packageName = "vscode-test"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-test/-/vscode-test-1.6.1.tgz"; - sha512 = "086q88T2ca1k95mUzffvbzb7esqQNvJgiwY4h29ukPhFo8u+vXOOmelUoU5EQUHs3Of8+JuQ3oGdbVCqaxuTXA=="; - }; - }; "vscode-textbuffer-1.0.0" = { name = "vscode-textbuffer"; packageName = "vscode-textbuffer"; @@ -69172,6 +71143,24 @@ let sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; }; }; + "vue-class-component-7.2.6" = { + name = "vue-class-component"; + packageName = "vue-class-component"; + version = "7.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.6.tgz"; + sha512 = "+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w=="; + }; + }; + "vue-cli-plugin-vuetify-2.4.3" = { + name = "vue-cli-plugin-vuetify"; + packageName = "vue-cli-plugin-vuetify"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.4.3.tgz"; + sha512 = "dT9KpH1rXT6UWzBDFLMB69sgrNCoWFcxWiIyDDZ4vikv85JDweMHh2dT5n6QaAt7qsGlvL4IMOopjcyUTiPW9g=="; + }; + }; "vue-codemod-0.0.5" = { name = "vue-codemod"; packageName = "vue-codemod"; @@ -69199,15 +71188,6 @@ let sha512 = "Bvjlx7rH1Ulvus56KHeLXOjEi3JMOYTa1GAqZr9lBQhd8weK8mV7U7V2l85yokBZEWHJQjLn6X3nosY8TzkOKg=="; }; }; - "vue-eslint-parser-7.1.1" = { - name = "vue-eslint-parser"; - packageName = "vue-eslint-parser"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.1.1.tgz"; - sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA=="; - }; - }; "vue-eslint-parser-7.11.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; @@ -69217,6 +71197,33 @@ let sha512 = "qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg=="; }; }; + "vue-hot-reload-api-2.3.4" = { + name = "vue-hot-reload-api"; + packageName = "vue-hot-reload-api"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz"; + sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="; + }; + }; + "vue-loader-15.9.8" = { + name = "vue-loader"; + packageName = "vue-loader"; + version = "15.9.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.8.tgz"; + sha512 = "GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog=="; + }; + }; + "vue-loader-v16-16.8.3" = { + name = "vue-loader-v16"; + packageName = "vue-loader-v16"; + version = "16.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz"; + sha512 = "7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA=="; + }; + }; "vue-onsenui-helper-json-1.0.2" = { name = "vue-onsenui-helper-json"; packageName = "vue-onsenui-helper-json"; @@ -69226,6 +71233,78 @@ let sha512 = "ikg8ruE17tIXF9mrVvKoOR3oyM9nk0TcmUHyeBWod5ILEH9DRN0+seX4gwsSbjdxMYlIIvmnCFPQeMdlcJqPJQ=="; }; }; + "vue-property-decorator-9.1.2" = { + name = "vue-property-decorator"; + packageName = "vue-property-decorator"; + version = "9.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-9.1.2.tgz"; + sha512 = "xYA8MkZynPBGd/w5QFJ2d/NM0z/YeegMqYTphy7NJQXbZcuU6FC6AOdUAcy4SXP+YnkerC6AfH+ldg7PDk9ESQ=="; + }; + }; + "vue-router-3.5.3" = { + name = "vue-router"; + packageName = "vue-router"; + version = "3.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz"; + sha512 = "FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg=="; + }; + }; + "vue-style-loader-4.1.3" = { + name = "vue-style-loader"; + packageName = "vue-style-loader"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz"; + sha512 = "sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg=="; + }; + }; + "vue-template-compiler-2.6.14" = { + name = "vue-template-compiler"; + packageName = "vue-template-compiler"; + version = "2.6.14"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz"; + sha512 = "ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g=="; + }; + }; + "vue-template-es2015-compiler-1.9.1" = { + name = "vue-template-es2015-compiler"; + packageName = "vue-template-es2015-compiler"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"; + sha512 = "4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw=="; + }; + }; + "vuetify-2.5.10" = { + name = "vuetify"; + packageName = "vuetify"; + version = "2.5.10"; + src = fetchurl { + url = "https://registry.npmjs.org/vuetify/-/vuetify-2.5.10.tgz"; + sha512 = "UODZQrib36l7i1WGg0MUvurczLspYTe0nKAmfbwyMs6dC2lG1Q1VV9caqPbCAB9zgG6QIJaOmRQKSKduw9eZTw=="; + }; + }; + "vuetify-datetime-picker-2.1.1" = { + name = "vuetify-datetime-picker"; + packageName = "vuetify-datetime-picker"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vuetify-datetime-picker/-/vuetify-datetime-picker-2.1.1.tgz"; + sha512 = "xY3YCVNxoe/5Chbm7G2BXrkg12CWLWwnDJZdhNPVKe1p8S72H8NomYOB6SSBzMMEHisRGIRzAQTDwDfDU06x/Q=="; + }; + }; + "vuetify-loader-1.7.3" = { + name = "vuetify-loader"; + packageName = "vuetify-loader"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vuetify-loader/-/vuetify-loader-1.7.3.tgz"; + sha512 = "1Kt6Rfvuw3i9BBlxC9WTMnU3WEU7IBWQmDX+fYGAVGpzWCX7oHythUIwPCZGShHSYcPMKSDbXTPP8UvT5RNw8Q=="; + }; + }; "vuvuzela-1.0.3" = { name = "vuvuzela"; packageName = "vuvuzela"; @@ -69334,15 +71413,6 @@ let sha512 = "HUqwaodrQGaZgz1lZaNioIkog9tkeEJjrM3eq4aUL04whXOVDRc/o2EGb/8kV0QX411iAYWEqq7fMBmJ6dKS6w=="; }; }; - "watch-1.0.2" = { - name = "watch"; - packageName = "watch"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/watch/-/watch-1.0.2.tgz"; - sha1 = "340a717bde765726fa0aa07d721e0147a551df0c"; - }; - }; "watchpack-1.7.5" = { name = "watchpack"; packageName = "watchpack"; @@ -69388,13 +71458,13 @@ let sha1 = "79331f666366b3b1c6ab02ceb04bad8dd2eebb0c"; }; }; - "wavedrom-2.9.0" = { + "wavedrom-2.9.1" = { name = "wavedrom"; packageName = "wavedrom"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/wavedrom/-/wavedrom-2.9.0.tgz"; - sha512 = "PazQFmo/DFJU5AoZt+1LxKTEkgokK8Q1Nsc1s/6Y6LEY9z4WKv8RWn6uvh+p6Jh1sLezknACZTCrTasvpwEaiQ=="; + url = "https://registry.npmjs.org/wavedrom/-/wavedrom-2.9.1.tgz"; + sha512 = "IPv1bKVwh4Zo8dMMQfnNy4KFqU/v0buoPDwLkTrtHE2nr0dV4pHqryhWpqNCSUm7xTWroER+nE5xRkng96xLUA=="; }; }; "wawoff2-2.0.1" = { @@ -69424,6 +71494,15 @@ let sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; }; }; + "weak-lru-cache-1.2.2" = { + name = "weak-lru-cache"; + packageName = "weak-lru-cache"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz"; + sha512 = "DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw=="; + }; + }; "weasel-words-0.1.1" = { name = "weasel-words"; packageName = "weasel-words"; @@ -69514,13 +71593,13 @@ let sha512 = "8G0xBj05hqZybCqBtW7RPZ/hWEtP3DiLTauQzGJZuZYfVRgw7qj7iaZ+8djNqJ4VPrdOO+pS2dR1JsTbsLxdYg=="; }; }; - "web3-utils-1.7.0" = { + "web3-utils-1.7.1" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.7.0.tgz"; - sha512 = "O8Tl4Ky40Sp6pe89Olk2FsaUkgHyb5QAXuaKo38ms3CxZZ4d3rPGfjP9DNKGm5+IUgAZBNpF1VmlSmNCqfDI1w=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.7.1.tgz"; + sha512 = "fef0EsqMGJUgiHPdX+KN9okVWshbIumyJPmR+btnD1HgvoXijKEkuKBv0OmUqjbeqmLKP2/N9EiXKJel5+E1Dw=="; }; }; "webassemblyjs-1.11.1" = { @@ -69532,6 +71611,15 @@ let sha512 = "WkwV9qJLZZm1ygrryt4+6hAKbk4jLSVCpE92RYk/MOtLSpxq/2S1U0JFyKgsASXhYU5hqHQRiXvFBoNQhfCHyg=="; }; }; + "webcrypto-core-1.7.2" = { + name = "webcrypto-core"; + packageName = "webcrypto-core"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.7.2.tgz"; + sha512 = "GUblRwka3JiP/dduk9/Hdkbm7/+ZqVPISJj9Fq1rZ/JBSInmaeVbeH0KuIy4/gtoC7aWpu6DEnYk0VhkZXmFSA=="; + }; + }; "webidl-conversions-2.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -69604,15 +71692,6 @@ let sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; }; - "webpack-4.44.2" = { - name = "webpack"; - packageName = "webpack"; - version = "4.44.2"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz"; - sha512 = "6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q=="; - }; - }; "webpack-4.46.0" = { name = "webpack"; packageName = "webpack"; @@ -69622,22 +71701,13 @@ let sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="; }; }; - "webpack-5.66.0" = { + "webpack-5.70.0" = { name = "webpack"; packageName = "webpack"; - version = "5.66.0"; + version = "5.70.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.66.0.tgz"; - sha512 = "NJNtGT7IKpGzdW7Iwpn/09OXz9inIkeIQ/ibY6B+MdV1x6+uReqz/5z1L89ezWnpPDWpXF0TY5PCYKQdWVn8Vg=="; - }; - }; - "webpack-5.67.0" = { - name = "webpack"; - packageName = "webpack"; - version = "5.67.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz"; - sha512 = "LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz"; + sha512 = "ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -69649,6 +71719,15 @@ let sha512 = "Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA=="; }; }; + "webpack-chain-6.5.1" = { + name = "webpack-chain"; + packageName = "webpack-chain"; + version = "6.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz"; + sha512 = "7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA=="; + }; + }; "webpack-cli-3.3.12" = { name = "webpack-cli"; packageName = "webpack-cli"; @@ -69658,13 +71737,13 @@ let sha512 = "NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag=="; }; }; - "webpack-cli-4.9.1" = { + "webpack-cli-4.9.2" = { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz"; - sha512 = "JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz"; + sha512 = "m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ=="; }; }; "webpack-core-0.6.9" = { @@ -69685,13 +71764,13 @@ let sha512 = "djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ=="; }; }; - "webpack-dev-middleware-5.3.0" = { + "webpack-dev-middleware-5.3.1" = { name = "webpack-dev-middleware"; packageName = "webpack-dev-middleware"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz"; - sha512 = "MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg=="; + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz"; + sha512 = "81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg=="; }; }; "webpack-dev-server-3.11.0" = { @@ -69739,6 +71818,15 @@ let sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; }; }; + "webpack-merge-4.2.2" = { + name = "webpack-merge"; + packageName = "webpack-merge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz"; + sha512 = "TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g=="; + }; + }; "webpack-merge-5.8.0" = { name = "webpack-merge"; packageName = "webpack-merge"; @@ -69784,15 +71872,6 @@ let sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; }; }; - "webpack-stream-6.1.0" = { - name = "webpack-stream"; - packageName = "webpack-stream"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-stream/-/webpack-stream-6.1.0.tgz"; - sha512 = "kFMnDzFTzyvVmn4ajaj0xEJavvYizd3I/KmQ6C5aUstcAkNwZUidxkk/uEaEPSydaAn66v8ZcP1+bhKSshNJUQ=="; - }; - }; "webrtc-adapter-7.7.1" = { name = "webrtc-adapter"; packageName = "webrtc-adapter"; @@ -69838,13 +71917,22 @@ let sha512 = "7iZ+u28Ljw5hCnMiq0BCOeSYf0vCFQe/ORY0HgscTiKjQed8WqugpBUggJ2NTnB9fahn1kEnPRX2jf8Px5PhJw=="; }; }; - "webtorrent-1.7.1" = { + "webtorrent-1.8.10" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.7.1"; + version = "1.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.7.1.tgz"; - sha512 = "x7u7jtDDdPzSkwurZ1/mUZCcIBYrAQiPrnGSLi9jn9rlsnad4G5RXgsgBvVQR650Pqx9Id/4db/2ZTB4iRGh2w=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.10.tgz"; + sha512 = "0ywp9VXPMpqemsamWWUjU74vdNpOKUILK+lAfZnOgolybAcYZRJ5gCz0u01BI2NFKHZFWoyDacl3fkbxVb57pw=="; + }; + }; + "webworkify-webpack-2.1.5" = { + name = "webworkify-webpack"; + packageName = "webworkify-webpack"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/webworkify-webpack/-/webworkify-webpack-2.1.5.tgz"; + sha512 = "2akF8FIyUvbiBBdD+RoHpoTbHMQF2HwjcxfDvgztAX5YwbZNyrtfUMgvfgFVsgDhDPVTlkbb5vyasqDHfIDPQw=="; }; }; "whatwg-encoding-1.0.5" = { @@ -69901,6 +71989,15 @@ let sha512 = "CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w=="; }; }; + "whatwg-url-11.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz"; + sha512 = "RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ=="; + }; + }; "whatwg-url-5.0.0" = { name = "whatwg-url"; packageName = "whatwg-url"; @@ -69955,15 +72052,6 @@ let sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718"; }; }; - "when-3.7.8" = { - name = "when"; - packageName = "when"; - version = "3.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz"; - sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; - }; - }; "whet.extend-0.9.9" = { name = "whet.extend"; packageName = "whet.extend"; @@ -70045,13 +72133,13 @@ let sha512 = "Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w=="; }; }; - "which-pm-runs-1.0.0" = { + "which-pm-runs-1.1.0" = { name = "which-pm-runs"; packageName = "which-pm-runs"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz"; - sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; + url = "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz"; + sha512 = "n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA=="; }; }; "which-promise-1.0.0" = { @@ -70171,15 +72259,6 @@ let sha1 = "f45f10d141086c5d94ae14c03b2098440a7e71b0"; }; }; - "win-fork-1.1.1" = { - name = "win-fork"; - packageName = "win-fork"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/win-fork/-/win-fork-1.1.1.tgz"; - sha1 = "8f58e0656fca00adc8c86a2b89e3cd2d6a2d5e5e"; - }; - }; "window-size-0.1.0" = { name = "window-size"; packageName = "window-size"; @@ -70315,15 +72394,6 @@ let sha512 = "TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A=="; }; }; - "winston-3.2.1" = { - name = "winston"; - packageName = "winston"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz"; - sha512 = "zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw=="; - }; - }; "winston-3.3.3" = { name = "winston"; packageName = "winston"; @@ -70333,31 +72403,31 @@ let sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; }; }; - "winston-3.3.4" = { + "winston-3.5.1" = { name = "winston"; packageName = "winston"; - version = "3.3.4"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.3.4.tgz"; - sha512 = "zWJrfmqE+2IXtVJ125vxpA2m303TjwchLhfRbcnma7c76Qd4pv80JIp37l8uGnWbCoG4X6PMz3vAQeh+vH1CtA=="; + url = "https://registry.npmjs.org/winston/-/winston-3.5.1.tgz"; + sha512 = "tbRtVy+vsSSCLcZq/8nXZaOie/S2tPXPFt4be/Q3vI/WtYwm7rrwidxVw2GRa38FIXcJ1kUM6MOZ9Jmnk3F3UA=="; }; }; - "winston-3.4.0" = { + "winston-3.6.0" = { name = "winston"; packageName = "winston"; - version = "3.4.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.4.0.tgz"; - sha512 = "FqilVj+5HKwCfIHQzMxrrd5tBIH10JTS3koFGbLVWBODjiIYq7zir08rFyBT4rrTYG/eaTqDcfSIbcjSM78YSw=="; + url = "https://registry.npmjs.org/winston/-/winston-3.6.0.tgz"; + sha512 = "9j8T75p+bcN6D00sF/zjFVmPp+t8KMPB1MzbbzYjeN9VWxdsYnTB40TkbNUEXAmILEfChMvAMgidlX64OG3p6w=="; }; }; - "winston-transport-4.4.2" = { + "winston-transport-4.5.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.4.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.2.tgz"; - sha512 = "9jmhltAr5ygt5usgUTQbEiw/7RYXpyUbEAFRCSicIacpUzPkrnQsQZSPGEI12aLK9Jth4zNcYJx3Cvznwrl8pw=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"; + sha512 = "YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q=="; }; }; "with-5.1.1" = { @@ -70459,15 +72529,6 @@ let sha512 = "toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg=="; }; }; - "workerpool-6.1.5" = { - name = "workerpool"; - packageName = "workerpool"; - version = "6.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz"; - sha512 = "XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw=="; - }; - }; "workerpool-6.2.0" = { name = "workerpool"; packageName = "workerpool"; @@ -70612,13 +72673,13 @@ let sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; }; }; - "write-file-atomic-4.0.0" = { + "write-file-atomic-4.0.1" = { name = "write-file-atomic"; packageName = "write-file-atomic"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.0.tgz"; - sha512 = "JhcWoKffJNF7ivO9yflBhc7tn3wKnokMUfWpBriM9yCXj4ePQnRPcWglBkkg1AHC8nsW/EfxwwhqsLtOy59djA=="; + url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz"; + sha512 = "nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ=="; }; }; "write-good-1.0.8" = { @@ -70747,15 +72808,6 @@ let sha512 = "YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="; }; }; - "ws-7.5.1" = { - name = "ws"; - packageName = "ws"; - version = "7.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.1.tgz"; - sha512 = "2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow=="; - }; - }; "ws-7.5.6" = { name = "ws"; packageName = "ws"; @@ -70765,6 +72817,15 @@ let sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="; }; }; + "ws-7.5.7" = { + name = "ws"; + packageName = "ws"; + version = "7.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz"; + sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="; + }; + }; "ws-8.2.3" = { name = "ws"; packageName = "ws"; @@ -70774,24 +72835,6 @@ let sha512 = "wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="; }; }; - "ws-8.3.0" = { - name = "ws"; - packageName = "ws"; - version = "8.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz"; - sha512 = "Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw=="; - }; - }; - "ws-8.4.0" = { - name = "ws"; - packageName = "ws"; - version = "8.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz"; - sha512 = "IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ=="; - }; - }; "ws-8.4.2" = { name = "ws"; packageName = "ws"; @@ -70801,6 +72844,24 @@ let sha512 = "Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA=="; }; }; + "ws-8.5.0" = { + name = "ws"; + packageName = "ws"; + version = "8.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz"; + sha512 = "BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg=="; + }; + }; + "wtfnode-0.8.4" = { + name = "wtfnode"; + packageName = "wtfnode"; + version = "0.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/wtfnode/-/wtfnode-0.8.4.tgz"; + sha512 = "64GEKtMt/MUBuAm+8kHqP74ojjafzu00aT0JKsmkIwYmjRQ/odO0yhbzKLm+Z9v1gMla+8dwITRKzTAlHsB+Og=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -70891,13 +72952,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.2.22" = { + "xdl-59.2.30" = { name = "xdl"; packageName = "xdl"; - version = "59.2.22"; + version = "59.2.30"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.2.22.tgz"; - sha512 = "hKmLoA64vaCRprJUS0DiOF89ykKQ/Sm2haTdvfzli/9wJpoY+2ZAZ08LCaQtbqgmRiOUK7g94Q2WMW9YIIXCpQ=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.2.30.tgz"; + sha512 = "Id4b3prDMPlW9OuycaeQwXeD/3tAgTmJY0N1blRL5Xr3KXhybXkyCsnvOaFyvQ+luqnmsOUdJQkfzL0JuyIauw=="; }; }; "xenvar-0.5.1" = { @@ -71189,6 +73250,15 @@ let sha512 = "3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q=="; }; }; + "xmlhttprequest-ssl-2.0.0" = { + name = "xmlhttprequest-ssl"; + packageName = "xmlhttprequest-ssl"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz"; + sha512 = "QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A=="; + }; + }; "xor-distance-2.0.0" = { name = "xor-distance"; packageName = "xor-distance"; @@ -71279,13 +73349,13 @@ let sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; }; }; - "xss-1.0.10" = { + "xss-1.0.11" = { name = "xss"; packageName = "xss"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz"; - sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz"; + sha512 = "EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ=="; }; }; "xstream-11.14.0" = { @@ -71315,6 +73385,15 @@ 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=="; + }; + }; "y18n-3.2.2" = { name = "y18n"; packageName = "y18n"; @@ -71387,13 +73466,13 @@ let sha512 = "FHV8s5ODFFQXX/enJEU2EkanNl1UDBUz8oa4k5Qo/sR+Iq7VmhCDkRMb0/mjJCNeAWQ31W8WV6PYStDE4d9EIw=="; }; }; - "yaml-2.0.0-8" = { + "yaml-2.0.0-11" = { name = "yaml"; packageName = "yaml"; - version = "2.0.0-8"; + version = "2.0.0-11"; src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-2.0.0-8.tgz"; - sha512 = "QaYgJZMfWD6fKN/EYMk6w1oLWPCr1xj9QaPSZW5qkDb3y8nGCXhy2Ono+AF4F+CSL/vGcqswcAT0BaS//pgD2A=="; + url = "https://registry.npmjs.org/yaml/-/yaml-2.0.0-11.tgz"; + sha512 = "5kGSQrzDyjCk0BLuFfjkoUE9vYcoyrwZIZ+GnpOSM9vhkvPjItYiWJ1jpRSo0aU4QmsoNrFwDT4O7XS2UGcBQg=="; }; }; "yaml-ast-parser-0.0.43" = { @@ -71405,15 +73484,6 @@ let sha512 = "2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A=="; }; }; - "yaml-front-matter-3.4.1" = { - name = "yaml-front-matter"; - packageName = "yaml-front-matter"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml-front-matter/-/yaml-front-matter-3.4.1.tgz"; - sha1 = "e52e84fea6983b93755e9b1564dba989b006b5a5"; - }; - }; "yaml-front-matter-4.1.1" = { name = "yaml-front-matter"; packageName = "yaml-front-matter"; @@ -71441,15 +73511,6 @@ let sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; }; }; - "yaml-language-server-1.2.2" = { - name = "yaml-language-server"; - packageName = "yaml-language-server"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.2.2.tgz"; - sha512 = "wjMlqjhg6hNMT8EgYYkfUaM0aXwjWSQDmPO18doWLxIXG7LGBuzb+Vm/MjLrP9LPblSEhE2WWHQFfGW+Odb7vw=="; - }; - }; "yamljs-0.3.0" = { name = "yamljs"; packageName = "yamljs"; @@ -71459,6 +73520,15 @@ let sha512 = "C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ=="; }; }; + "yargonaut-1.1.4" = { + name = "yargonaut"; + packageName = "yargonaut"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz"; + sha512 = "rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA=="; + }; + }; "yargs-1.3.3" = { name = "yargs"; packageName = "yargs"; @@ -71540,15 +73610,6 @@ let sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; - "yargs-17.0.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.0.1.tgz"; - sha512 = "xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ=="; - }; - }; "yargs-17.1.1" = { name = "yargs"; packageName = "yargs"; @@ -71576,6 +73637,15 @@ let sha512 = "WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA=="; }; }; + "yargs-17.4.0" = { + name = "yargs"; + packageName = "yargs"; + version = "17.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-17.4.0.tgz"; + sha512 = "WJudfrk81yWFSOkZYpAZx4Nt7V4xp7S/uJkX0CnxovMCt1wCE8LNftPpNuF9X/u9gN5nsD7ycYtRcDf2pL3UiA=="; + }; + }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -71702,13 +73772,13 @@ let sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; }; - "yargs-parser-21.0.0" = { + "yargs-parser-21.0.1" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "21.0.0"; + version = "21.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz"; - sha512 = "z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"; + sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; }; }; "yargs-parser-4.2.1" = { @@ -71774,13 +73844,13 @@ let sha512 = "IanQGI9RRPAN87VGTF7zs2uxkSyQSrSPsju0COgbsKQOOXr5LtcVPeyXWgwVa0ywG3d8dg6kSYKGBuYK021qeA=="; }; }; - "yarn-1.22.17" = { + "yarn-1.22.18" = { name = "yarn"; packageName = "yarn"; - version = "1.22.17"; + version = "1.22.18"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.17.tgz"; - sha512 = "H0p241BXaH0UN9IeH//RT82tl5PfNraVpSpEoW+ET7lmopNC61eZ+A+IDvU8FM6Go5vx162SncDL8J1ZjRBriQ=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.18.tgz"; + sha512 = "oFffv6Jp2+BTUBItzx1Z0dpikTX+raRdqupfqzeMKnoh7WD6RuPAxcqDkMUy9vafJkrB0YaV708znpuMhEBKGQ=="; }; }; "yarn-1.22.4" = { @@ -71873,13 +73943,13 @@ let sha512 = "7RbCXegyu6DykWPWU0YEtW8gFJH8KBL2d5l2fqB0XpkH0Y9rk59YSSWpzEv7yNJBGAouPc67h3kkq0CZkpBdFw=="; }; }; - "ylru-1.2.1" = { + "ylru-1.3.2" = { name = "ylru"; packageName = "ylru"; - version = "1.2.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz"; - sha512 = "faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ=="; + url = "https://registry.npmjs.org/ylru/-/ylru-1.3.2.tgz"; + sha512 = "RXRJzMiK6U2ye0BlGGZnmpwJDPgakn6aNQ0A7gHRbD4I0uvK4TW6UqkK1V0pp9jskjJBAXd3dRrbzWkqJ+6cxA=="; }; }; "yn-3.1.1" = { @@ -71900,6 +73970,15 @@ let sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; }; }; + "yocto-queue-1.0.0" = { + name = "yocto-queue"; + packageName = "yocto-queue"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz"; + sha512 = "9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g=="; + }; + }; "yoga-layout-prebuilt-1.10.0" = { name = "yoga-layout-prebuilt"; packageName = "yoga-layout-prebuilt"; @@ -71909,6 +73988,15 @@ let sha512 = "YnOmtSbv4MTf7RGJMK0FvZ+KD8OEe/J5BNnR0GHhD8J/XcG/Qvxgszm0Un6FTHWW4uHlTgP0IztiXQnGyIR45g=="; }; }; + "yorkie-2.0.0" = { + name = "yorkie"; + packageName = "yorkie"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz"; + sha512 = "jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw=="; + }; + }; "yosay-2.0.2" = { name = "yosay"; packageName = "yosay"; @@ -71954,6 +74042,15 @@ let sha512 = "Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg=="; }; }; + "zen-observable-ts-1.2.3" = { + name = "zen-observable-ts"; + packageName = "zen-observable-ts"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.2.3.tgz"; + sha512 = "hc/TGiPkAWpByykMwDcem3SdUgA4We+0Qb36bItSuJC9xD0XVBZoFHYoadAomDSNf64CG8Ydj0Qb8Od8BUWz5g=="; + }; + }; "zeromq-5.2.8" = { name = "zeromq"; packageName = "zeromq"; @@ -72050,38 +74147,38 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "13.1.4"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-13.1.4.tgz"; - sha512 = "PP9xpvDDCHhLTIZjewQQzzf+JbpF2s5mXTW2AgIL/E53ukaVvXwwjFMt9dQvECwut/LDpThoc3OfqcGrmwtqnA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-13.3.0.tgz"; + sha512 = "2qCKP/QsyxrJnpd3g4P/iTQ4TjI04N8r+bG5YLLfudoMDsQ/Ti4ogdI7PBeG2IMbRylZW9XLjHraWG42+Y9tWw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1301.4" - sources."@angular-devkit/core-13.1.4" - sources."@angular-devkit/schematics-13.1.4" - sources."@gar/promisify-1.1.2" - sources."@npmcli/fs-1.1.0" + sources."@angular-devkit/architect-0.1303.0" + sources."@angular-devkit/core-13.3.0" + sources."@angular-devkit/schematics-13.3.0" + sources."@gar/promisify-1.1.3" + sources."@npmcli/fs-1.1.1" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-2.0.0" - sources."@schematics/angular-13.1.4" + sources."@schematics/angular-13.3.0" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" - sources."ajv-8.8.2" + sources."ajv-8.9.0" sources."ajv-formats-2.1.1" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" + sources."are-we-there-yet-3.0.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bl-4.1.0" @@ -72123,7 +74220,7 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gauge-4.0.0" + sources."gauge-4.0.3" sources."glob-7.2.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" @@ -72145,7 +74242,7 @@ in sources."ini-2.0.0" (sources."inquirer-8.2.0" // { dependencies = [ - sources."rxjs-7.5.2" + sources."rxjs-7.5.5" sources."tslib-2.3.1" ]; }) @@ -72168,7 +74265,7 @@ in sources."magic-string-0.25.7" sources."make-fetch-happen-9.1.0" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" @@ -72180,7 +74277,7 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-gyp-8.4.1" sources."nopt-5.0.0" sources."npm-bundled-1.1.2" @@ -72189,15 +74286,28 @@ in sources."npm-package-arg-8.1.5" sources."npm-packlist-3.0.0" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-11.0.0" - sources."npmlog-6.0.0" + (sources."npm-registry-fetch-12.0.2" // { + dependencies = [ + sources."@npmcli/fs-2.1.0" + sources."@tootallnate/once-2.0.0" + sources."cacache-16.0.3" + sources."http-proxy-agent-5.0.0" + sources."lru-cache-7.7.1" + (sources."make-fetch-happen-10.1.0" // { + dependencies = [ + sources."minipass-fetch-2.1.0" + ]; + }) + ]; + }) + sources."npmlog-6.0.1" sources."once-1.4.0" sources."onetime-5.1.2" sources."open-8.4.0" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-12.0.2" + sources."pacote-12.0.3" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."promise-inflight-1.0.1" @@ -72206,7 +74316,7 @@ in sources."read-package-json-fast-2.0.3" sources."readable-stream-3.6.0" sources."require-from-string-2.0.2" - sources."resolve-1.20.0" + sources."resolve-1.22.0" sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."rimraf-3.0.2" @@ -72216,9 +74326,9 @@ in sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-6.1.1" sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" @@ -72227,6 +74337,7 @@ in sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-4.0.0" sources."tar-6.1.11" sources."through-2.3.8" @@ -72255,6 +74366,24 @@ in bypassCache = true; reconstructLock = true; }; + "@antfu/ni" = nodeEnv.buildNodePackage { + name = "_at_antfu_slash_ni"; + packageName = "@antfu/ni"; + version = "0.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.14.0.tgz"; + sha512 = "AfHEQ+6Kjb+PMdOBR2h6CrDKYgncIZKW5NwkR1BLkCWm4DHBCTfnQJeO3ixtWr0KE9BCnwGoM8xEx6y45p0n4g=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Use the right package manager"; + homepage = "https://github.com/antfu/ni#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; @@ -72274,7 +74403,7 @@ in sources."args-5.0.1" sources."atomic-sleep-1.0.0" sources."camelcase-5.0.0" - (sources."camelcase-keys-7.0.1" // { + (sources."camelcase-keys-7.0.2" // { dependencies = [ sources."camelcase-6.3.0" ]; @@ -72284,26 +74413,25 @@ in sources."color-name-1.1.3" sources."colorette-2.0.16" sources."commander-8.3.0" - sources."convict-6.2.1" + sources."convict-6.2.2" sources."dateformat-4.6.3" sources."duplexify-4.1.2" sources."end-of-stream-1.4.4" sources."escape-string-regexp-1.0.5" - sources."fast-redact-3.1.0" + sources."fast-redact-3.1.1" sources."fast-safe-stringify-2.1.1" sources."has-flag-3.0.0" sources."inherits-2.0.4" sources."joycon-3.1.1" sources."js-yaml-4.1.0" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."leven-2.1.0" sources."lodash.clonedeep-4.5.0" sources."map-obj-4.3.0" - sources."minimist-1.2.5" sources."mri-1.1.4" sources."on-exit-leak-free-0.2.0" sources."once-1.4.0" - sources."pino-7.6.4" + sources."pino-7.6.5" sources."pino-abstract-transport-0.5.0" sources."pino-pretty-7.3.0" sources."pino-std-serializers-4.0.0" @@ -72323,7 +74451,7 @@ in sources."string_decoder-1.3.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - sources."thread-stream-0.13.1" + sources."thread-stream-0.13.2" sources."type-fest-1.4.0" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" @@ -72375,7 +74503,7 @@ in ]; }) sources."asciidoctor-opal-runtime-0.3.3" - sources."async-lock-1.3.0" + sources."async-lock-1.3.1" sources."atomic-sleep-1.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" @@ -72385,7 +74513,7 @@ in sources."cache-directory-2.0.0" sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."camelcase-keys-7.0.1" + sources."camelcase-keys-7.0.2" sources."chalk-2.4.2" sources."clean-git-ref-2.0.1" sources."clone-2.1.2" @@ -72401,9 +74529,9 @@ in sources."colorette-2.0.16" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" - sources."convict-6.2.1" + sources."convict-6.2.2" sources."core-util-is-1.0.3" - sources."crc-32-1.2.0" + sources."crc-32-1.2.1" sources."dateformat-4.6.3" sources."decompress-response-4.2.1" sources."define-properties-1.1.3" @@ -72413,7 +74541,7 @@ in sources."escape-string-regexp-1.0.5" sources."exit-on-epipe-1.0.1" sources."extend-3.0.2" - sources."fast-redact-3.1.0" + sources."fast-redact-3.1.1" sources."fast-safe-stringify-2.1.1" sources."fd-slicer-1.1.0" sources."fill-range-7.0.1" @@ -72438,7 +74566,7 @@ in sources."handlebars-4.7.7" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."hpagent-0.1.2" sources."ignore-5.2.0" sources."inflight-1.0.6" @@ -72455,15 +74583,15 @@ in sources."is-valid-glob-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" - (sources."isomorphic-git-1.10.4" // { + (sources."isomorphic-git-1.10.5" // { dependencies = [ - sources."simple-get-3.1.0" + sources."simple-get-3.1.1" ]; }) sources."joycon-3.1.1" sources."js-yaml-4.1.0" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.2.0" + sources."json5-2.2.1" (sources."lazystream-1.0.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -72473,11 +74601,11 @@ in sources."leven-2.1.0" sources."lodash.clonedeep-4.5.0" sources."map-obj-4.3.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-response-2.1.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minimisted-2.0.1" sources."mri-1.1.4" sources."multi-progress-4.0.0" @@ -72499,11 +74627,11 @@ in sources."pend-1.2.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."pino-7.6.4" + sources."pino-7.6.5" sources."pino-abstract-transport-0.5.0" sources."pino-pretty-7.3.0" sources."pino-std-serializers-4.0.0" - sources."printj-1.1.2" + sources."printj-1.3.1" sources."process-nextick-args-2.0.1" sources."process-warning-1.0.0" sources."progress-2.0.3" @@ -72527,7 +74655,7 @@ in sources."sha.js-2.4.11" sources."should-proxy-1.0.4" sources."simple-concat-1.0.1" - (sources."simple-get-4.0.0" // { + (sources."simple-get-4.0.1" // { dependencies = [ sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" @@ -72540,7 +74668,7 @@ in sources."string_decoder-1.1.1" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - sources."thread-stream-0.13.1" + sources."thread-stream-0.13.2" sources."through-2.3.8" (sources."through2-2.0.5" // { dependencies = [ @@ -72552,7 +74680,7 @@ in sources."to-regex-range-5.0.1" sources."to-through-2.0.0" sources."type-fest-1.4.0" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.3" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."unxhr-1.0.1" @@ -72592,69 +74720,46 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "0.8.8"; + version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.8.8.tgz"; - sha512 = "XgBSVpqXEqGTdst+CnM03/nXYw9PYNAfTl27BaJuUhEtqA/iDlyM7wLnQMsJzwWVmoLqp0bCumHkb62NtfeDNA=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.13.2.tgz"; + sha512 = "4YM4hM02ILvvsSQljAlwLY7OWymlhbikY7O/gsZqELVGMXixemA6dI3GTr2K6duU4ktPBJ3JexuU/OFyb5jvtQ=="; }; dependencies = [ - sources."@emmetio/abbreviation-2.2.2" + sources."@astrojs/svelte-language-integration-0.1.2" + sources."@emmetio/abbreviation-2.2.3" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@ts-morph/common-0.11.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."code-block-writer-10.1.1" - sources."concat-map-0.0.1" - sources."emmet-2.3.5" - sources."fast-glob-3.2.11" - sources."fastq-1.13.0" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.2" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" + (sources."@vscode/emmet-helper-2.8.4" // { + dependencies = [ + sources."vscode-uri-2.1.2" + ]; + }) + sources."dedent-js-1.0.1" + sources."emmet-2.3.6" sources."jsonc-parser-2.3.1" sources."lodash-4.17.21" - sources."merge2-1.4.1" - sources."micromatch-4.0.4" - sources."minimatch-3.0.4" - sources."mkdirp-1.0.4" - sources."path-browserify-1.0.1" - sources."picomatch-2.3.1" - sources."queue-microtask-1.2.3" - sources."reusify-1.0.4" - sources."run-parallel-1.2.0" + sources."lower-case-2.0.2" + sources."no-case-3.0.4" + sources."pascal-case-3.1.2" sources."source-map-0.7.3" - sources."to-regex-range-5.0.1" - sources."ts-morph-12.2.0" - sources."typescript-4.5.5" - sources."vscode-css-languageservice-5.1.9" - (sources."vscode-emmet-helper-2.1.2" // { - dependencies = [ - sources."vscode-uri-2.1.2" - ]; - }) - (sources."vscode-html-languageservice-3.2.0" // { - dependencies = [ - sources."vscode-languageserver-types-3.16.0-next.2" - sources."vscode-uri-2.1.2" - ]; - }) + sources."svelte-3.46.4" + sources."svelte2tsx-0.5.6" + sources."tslib-2.3.1" + sources."typescript-4.6.3" + sources."vscode-css-languageservice-5.3.0" + sources."vscode-html-languageservice-4.2.4" sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-6.1.1" + sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.3" ]; buildInputs = globalBuildInputs; meta = { + description = "The Astro language server, implement the [language server protocol](https://microsoft.github.io/language-server-protocol/)"; license = "MIT"; }; production = true; @@ -72664,14 +74769,17 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.20.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.20.0.tgz"; - sha512 = "i6s9f4/aKhzG1Kbf9tk/1wAvF0Ng8PjQW0nSEzYcNlA4zPicHh4VLD8lsT3quNJABpIFIADEJE5pFqHSDUBFew=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.22.0.tgz"; + sha512 = "EZ304ncWMB1wUA+EJ7BO6mANQa/0yMxmXta6HGKIBoVqW0tSeWq8632ifhQm8/GbDpGbeZ7cLs4Zb04lyffSgw=="; }; dependencies = [ + sources."@koa/multer-3.0.0" + sources."@koa/router-10.1.1" sources."@tootallnate/once-1.1.2" sources."abab-2.0.5" + sources."accepts-1.3.8" sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { dependencies = [ @@ -72683,18 +74791,46 @@ in sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" + sources."append-field-1.0.0" sources."asynckit-0.4.0" sources."big-integer-1.6.48" sources."browser-hrtime-1.1.8" sources."browser-process-hrtime-1.0.0" + sources."buffer-from-1.1.2" + (sources."busboy-0.2.14" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."bytes-3.1.2" + sources."cache-content-type-1.0.1" + sources."call-bind-1.0.2" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" + sources."co-4.6.0" + sources."co-body-6.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."commander-7.2.0" + sources."concat-stream-1.6.2" + (sources."content-disposition-0.5.4" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) + sources."content-type-1.0.4" + (sources."cookies-0.8.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) + sources."copy-to-2.0.1" + sources."core-util-is-1.0.3" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { dependencies = [ @@ -72702,17 +74838,31 @@ in ]; }) sources."data-urls-2.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decimal.js-10.3.1" + sources."deep-equal-1.0.1" sources."deep-is-0.1.4" sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.2.0" + (sources."dicer-0.2.5" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) (sources."domexception-2.0.1" // { dependencies = [ sources."webidl-conversions-5.0.0" ]; }) + sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" + sources."encodeurl-1.0.2" + sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."escodegen-2.0.0" sources."esprima-4.0.1" @@ -72722,32 +74872,65 @@ in sources."fast-levenshtein-2.0.6" sources."figures-3.2.0" sources."form-data-4.0.0" + sources."fresh-0.5.2" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" sources."graceful-fs-4.2.9" + sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-symbols-1.0.3" + sources."has-tostringtag-1.0.0" sources."html-encoding-sniffer-2.0.1" + sources."http-assert-1.5.0" + sources."http-errors-1.8.1" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" + sources."immediate-3.0.6" + sources."inflation-2.0.0" + sources."inherits-2.0.4" sources."inquirer-8.0.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" + sources."is-generator-function-1.0.10" sources."is-potential-custom-element-name-1.0.1" sources."is-promise-2.2.2" sources."is-wsl-2.2.0" + sources."isarray-1.0.0" (sources."jsdom-16.7.0" // { dependencies = [ sources."form-data-3.0.1" ]; }) + sources."json-stringify-safe-5.0.1" + sources."jszip-3.7.1" + sources."keygrip-1.1.0" + (sources."koa-2.13.4" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) + sources."koa-bodyparser-4.3.0" + sources."koa-compose-4.2.0" + sources."koa-convert-2.0.0" + sources."koa-is-json-1.0.0" + sources."koa-json-2.0.2" sources."levn-0.3.0" + sources."lie-3.3.0" sources."lodash-4.17.21" sources."lowdb-1.0.0" sources."lunr-2.3.9" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."media-typer-0.3.0" + sources."methods-1.1.2" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.1.2" + sources."multer-1.4.4" sources."mute-stream-0.0.8" + sources."negotiator-0.6.3" (sources."node-fetch-2.6.7" // { dependencies = [ sources."tr46-0.0.3" @@ -72757,25 +74940,52 @@ in }) sources."node-forge-0.10.0" sources."nwsapi-2.2.0" + sources."object-assign-4.1.1" + sources."object-inspect-1.12.0" + sources."on-finished-2.4.1" sources."onetime-5.1.2" + sources."only-0.0.2" sources."open-8.4.0" sources."optionator-0.8.3" sources."os-tmpdir-1.0.2" - sources."papaparse-5.3.1" + sources."pako-1.0.11" + sources."papaparse-5.3.2" sources."parse5-6.0.1" + sources."parseurl-1.3.3" + sources."path-to-regexp-6.2.0" sources."pify-3.0.0" sources."prelude-ls-1.1.2" + sources."process-nextick-args-2.0.1" + sources."proper-lockfile-4.1.2" sources."psl-1.8.0" sources."punycode-2.1.1" + sources."qs-6.10.3" + (sources."raw-body-2.5.1" // { + dependencies = [ + sources."depd-2.0.0" + sources."http-errors-2.0.0" + sources."statuses-2.0.1" + ]; + }) + sources."readable-stream-2.3.7" sources."restore-cursor-3.1.0" + sources."retry-0.12.0" sources."run-async-2.4.1" sources."rxjs-6.6.7" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."saxes-5.0.1" - sources."signal-exit-3.0.6" + sources."set-immediate-shim-1.0.1" + sources."setprototypeof-1.2.0" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" + sources."statuses-1.5.0" sources."steno-0.4.4" + sources."streaming-json-stringify-3.1.0" + sources."streamsearch-0.1.2" sources."string-width-4.2.3" + sources."string_decoder-1.1.1" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."symbol-tree-3.2.4" @@ -72786,12 +74996,19 @@ in ]; }) sources."tmp-0.0.33" + sources."toidentifier-1.0.1" sources."tough-cookie-4.0.0" sources."tr46-2.1.0" sources."tslib-1.14.1" + sources."tsscmp-1.0.6" sources."type-check-0.3.2" sources."type-fest-0.21.3" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" sources."universalify-0.1.2" + sources."unpipe-1.0.0" + sources."util-deprecate-1.0.2" + sources."vary-1.1.2" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" sources."webidl-conversions-6.1.0" @@ -72799,9 +75016,11 @@ in sources."whatwg-mimetype-2.3.0" sources."whatwg-url-8.7.0" sources."word-wrap-1.2.3" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" + sources."xtend-4.0.2" + sources."ylru-1.3.2" sources."zxcvbn-4.4.2" ]; buildInputs = globalBuildInputs; @@ -72817,10 +75036,10 @@ in "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; - version = "16.1.0"; + version = "16.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-16.1.0.tgz"; - sha512 = "x5L1knvA3isRWBRVQx+Q6D45pA9139a2aZQYpxkljMG0dj4UHZkCnsYWpnGalxPxASI7nrI0KedKfS2YeQ55cQ=="; + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-16.2.3.tgz"; + sha512 = "VsJBQLvhhlOgEfxs/Z5liYuK0dXqLE5hz1VJzLBxiOxG31kL/X5Q4OvK292BmO7IGZcm1yJE3XQPWSiFaEHbWA=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -72835,20 +75054,20 @@ in sources."supports-color-5.5.0" ]; }) - sources."@commitlint/config-validator-16.1.0" - sources."@commitlint/ensure-16.0.0" - sources."@commitlint/execute-rule-16.0.0" - sources."@commitlint/format-16.0.0" - sources."@commitlint/is-ignored-16.0.0" - sources."@commitlint/lint-16.0.0" - sources."@commitlint/load-16.1.0" - sources."@commitlint/message-16.0.0" - sources."@commitlint/parse-16.0.0" - sources."@commitlint/read-16.0.0" - sources."@commitlint/resolve-extends-16.1.0" - sources."@commitlint/rules-16.0.0" - sources."@commitlint/to-lines-16.0.0" - (sources."@commitlint/top-level-16.0.0" // { + sources."@commitlint/config-validator-16.2.1" + sources."@commitlint/ensure-16.2.1" + sources."@commitlint/execute-rule-16.2.1" + sources."@commitlint/format-16.2.1" + sources."@commitlint/is-ignored-16.2.1" + sources."@commitlint/lint-16.2.1" + sources."@commitlint/load-16.2.3" + sources."@commitlint/message-16.2.1" + sources."@commitlint/parse-16.2.1" + sources."@commitlint/read-16.2.1" + sources."@commitlint/resolve-extends-16.2.1" + sources."@commitlint/rules-16.2.1" + sources."@commitlint/to-lines-16.2.1" + (sources."@commitlint/top-level-16.2.1" // { dependencies = [ sources."find-up-5.0.0" sources."locate-path-6.0.0" @@ -72856,7 +75075,7 @@ in sources."p-locate-5.0.0" ]; }) - sources."@commitlint/types-16.0.0" + sources."@commitlint/types-16.2.1" sources."@cspotcode/source-map-consumer-0.8.0" sources."@cspotcode/source-map-support-0.7.0" sources."@tsconfig/node10-1.0.8" @@ -72864,6 +75083,7 @@ in sources."@tsconfig/node14-1.0.1" sources."@tsconfig/node16-1.0.2" sources."@types/minimist-1.2.2" + sources."@types/node-17.0.23" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."JSONStream-1.3.5" @@ -72886,7 +75106,7 @@ in sources."conventional-changelog-angular-5.0.13" sources."conventional-commits-parser-3.2.4" sources."cosmiconfig-7.0.1" - sources."cosmiconfig-typescript-loader-1.0.3" + sources."cosmiconfig-typescript-loader-1.0.6" sources."create-require-1.1.1" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" @@ -72906,7 +75126,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."find-up-4.1.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-stream-6.0.1" @@ -72982,14 +75202,14 @@ in sources."readable-stream-3.6.0" sources."redent-3.0.0" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-5.0.0" sources."resolve-global-1.0.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -73006,21 +75226,22 @@ in sources."through-2.3.8" sources."through2-4.0.2" sources."trim-newlines-3.0.1" - sources."ts-node-10.4.0" + sources."ts-node-10.7.0" sources."type-fest-0.18.1" - sources."typescript-4.5.5" + sources."typescript-4.6.3" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" + sources."v8-compile-cache-lib-3.0.0" sources."validate-npm-package-license-3.0.4" sources."which-2.0.2" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yaml-1.10.2" - (sources."yargs-17.3.1" // { + (sources."yargs-17.4.0" // { dependencies = [ - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -73040,10 +75261,10 @@ in "@commitlint/config-conventional" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_config-conventional"; packageName = "@commitlint/config-conventional"; - version = "16.0.0"; + version = "16.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-16.0.0.tgz"; - sha512 = "mN7J8KlKFn0kROd+q9PB01sfDx/8K/R25yITspL1No8PB4oj9M1p77xWjP80hPydqZG9OvQq+anXK3ZWeR7s3g=="; + url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-16.2.1.tgz"; + sha512 = "cP9gArx7gnaj4IqmtCIcHdRjTYdRUi6lmGE+lOzGGjGe45qGOS8nyQQNvkNy2Ey2VqoSWuXXkD8zCUh6EHf1Ww=="; }; dependencies = [ sources."array-ify-1.0.0" @@ -73064,6 +75285,300 @@ in bypassCache = true; reconstructLock = true; }; + "@google/clasp" = nodeEnv.buildNodePackage { + name = "_at_google_slash_clasp"; + packageName = "@google/clasp"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@google/clasp/-/clasp-2.4.1.tgz"; + sha512 = "csjufiygKXa845N04Mp8DWxHx2GiGp2RviuKAvvanC/+NoU4Fmxo9aLKATpC7XL5mNSYqy+VhTikFTZEP2u9Kg=="; + }; + dependencies = [ + sources."@babel/code-frame-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + (sources."@babel/highlight-7.16.10" // { + 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."@sindresorhus/is-4.6.0" + sources."@szmarczak/http-timer-4.0.6" + sources."@types/cacheable-request-6.0.2" + sources."@types/http-cache-semantics-4.0.1" + sources."@types/keyv-3.1.4" + sources."@types/minimatch-3.0.5" + sources."@types/node-17.0.23" + sources."@types/normalize-package-data-2.4.1" + sources."@types/responselike-1.0.0" + sources."abort-controller-3.0.0" + sources."agent-base-6.0.2" + sources."aggregate-error-3.1.0" + sources."ansi-escapes-4.3.2" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."anymatch-3.1.2" + sources."array-differ-3.0.0" + sources."array-find-index-1.0.2" + sources."array-union-2.1.0" + sources."arrify-2.0.1" + sources."astral-regex-2.0.0" + sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + sources."bignumber.js-9.0.2" + sources."binary-extensions-2.2.0" + sources."bl-4.1.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."buffer-5.7.1" + sources."buffer-equal-constant-time-1.0.1" + sources."cacheable-lookup-5.0.4" + sources."cacheable-request-7.0.2" + sources."call-bind-1.0.2" + sources."chalk-4.1.2" + sources."chardet-0.7.0" + sources."chokidar-3.5.3" + sources."clean-stack-2.2.0" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.6.1" + sources."cli-truncate-2.1.0" + sources."cli-width-3.0.0" + sources."clone-1.0.4" + sources."clone-response-1.0.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-7.2.0" + sources."concat-map-0.0.1" + sources."currently-unhandled-0.4.1" + sources."debounce-1.2.1" + sources."debug-4.3.4" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) + sources."defaults-1.0.3" + sources."defer-to-connect-2.0.1" + sources."define-lazy-prop-2.0.0" + sources."dotf-2.0.2" + sources."ecdsa-sig-formatter-1.0.11" + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + sources."event-target-shim-5.0.1" + sources."extend-3.0.2" + sources."external-editor-3.1.0" + sources."fast-text-encoding-1.0.3" + sources."figures-3.2.0" + sources."fill-range-7.0.1" + sources."find-up-5.0.0" + sources."fs-extra-10.0.1" + sources."fsevents-2.3.2" + sources."function-bind-1.1.1" + sources."fuzzy-0.1.3" + sources."gaxios-4.3.2" + sources."gcp-metadata-4.3.1" + sources."get-intrinsic-1.1.1" + sources."get-stream-5.2.0" + sources."glob-parent-5.1.2" + sources."google-auth-library-7.14.1" + sources."google-p12-pem-3.1.3" + sources."googleapis-76.0.0" + sources."googleapis-common-5.1.0" + sources."got-11.8.3" + sources."graceful-fs-4.2.9" + sources."gtoken-5.3.2" + sources."has-1.0.3" + sources."has-flag-4.0.0" + sources."has-symbols-1.0.3" + sources."hosted-git-info-4.1.0" + sources."http-cache-semantics-4.1.0" + sources."http2-wrapper-1.0.3" + sources."https-proxy-agent-5.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" + sources."indent-string-4.0.0" + sources."inherits-2.0.4" + sources."inquirer-8.2.2" + (sources."inquirer-autocomplete-prompt-ipt-2.0.0" // { + 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."rxjs-6.6.7" + sources."supports-color-5.5.0" + sources."tslib-1.14.1" + ]; + }) + sources."is-arrayish-0.2.1" + sources."is-binary-path-2.1.0" + sources."is-core-module-2.8.1" + 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-interactive-1.0.0" + sources."is-number-7.0.0" + sources."is-port-reachable-3.1.0" + sources."is-reachable-5.1.1" + sources."is-stream-2.0.1" + sources."is-unicode-supported-1.2.0" + sources."is-wsl-2.2.0" + sources."js-tokens-4.0.0" + sources."json-bigint-1.0.0" + sources."json-buffer-3.0.1" + sources."json-parse-even-better-errors-2.3.1" + sources."jsonfile-6.1.0" + sources."jwa-2.0.0" + sources."jws-4.0.0" + sources."keyv-4.1.1" + sources."lines-and-columns-1.2.4" + sources."locate-path-6.0.0" + sources."lodash-4.17.21" + (sources."log-symbols-5.1.0" // { + dependencies = [ + sources."chalk-5.0.1" + ]; + }) + sources."loud-rejection-2.2.0" + sources."lowercase-keys-2.0.0" + sources."lru-cache-6.0.0" + sources."make-dir-3.1.0" + sources."mimic-fn-2.1.0" + sources."mimic-response-1.0.1" + sources."minimatch-3.1.2" + sources."ms-2.1.2" + sources."multimatch-5.0.0" + sources."mute-stream-0.0.8" + sources."node-fetch-2.6.7" + sources."node-forge-1.3.0" + sources."normalize-newline-4.1.0" + (sources."normalize-package-data-3.0.3" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) + sources."normalize-path-3.0.0" + sources."normalize-url-6.1.0" + sources."object-inspect-1.12.0" + sources."once-1.4.0" + sources."onetime-5.1.2" + sources."open-8.4.0" + (sources."ora-5.4.1" // { + dependencies = [ + sources."is-unicode-supported-0.1.0" + sources."log-symbols-4.1.0" + ]; + }) + sources."os-tmpdir-1.0.2" + sources."p-any-3.0.0" + sources."p-cancelable-2.1.1" + sources."p-finally-1.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + (sources."p-map-5.3.0" // { + dependencies = [ + sources."aggregate-error-4.0.0" + sources."clean-stack-4.1.0" + sources."escape-string-regexp-5.0.0" + sources."indent-string-5.0.0" + ]; + }) + sources."p-some-5.0.0" + sources."p-timeout-3.2.0" + sources."parse-json-5.2.0" + sources."path-exists-4.0.0" + sources."picomatch-2.3.1" + sources."prepend-http-3.0.1" + sources."pump-3.0.0" + sources."qs-6.10.3" + sources."querystringify-2.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."readable-stream-3.6.0" + sources."readdirp-3.6.0" + (sources."recursive-readdir-2.2.2" // { + dependencies = [ + sources."minimatch-3.0.4" + ]; + }) + sources."replace-buffer-1.2.1" + sources."requires-port-1.0.0" + sources."resolve-alpn-1.2.1" + sources."responselike-2.0.0" + sources."restore-cursor-3.1.0" + sources."router-ips-1.0.0" + sources."run-async-2.4.1" + sources."rxjs-7.5.5" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."semver-6.3.0" + sources."server-destroy-1.0.1" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.7" + sources."slice-ansi-3.0.0" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.11" + sources."split-lines-3.0.0" + sources."string-width-4.2.3" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.1" + sources."strip-bom-5.0.0" + sources."supports-color-7.2.0" + sources."through-2.3.8" + sources."tmp-0.0.33" + sources."to-regex-range-5.0.1" + sources."tr46-0.0.3" + (sources."ts2gas-4.2.0" // { + dependencies = [ + sources."type-fest-2.12.1" + ]; + }) + sources."tslib-2.3.1" + sources."type-fest-0.21.3" + sources."typescript-4.6.3" + sources."universalify-2.0.0" + sources."url-parse-1.5.10" + sources."url-template-2.0.8" + sources."util-deprecate-1.0.2" + sources."uuid-8.3.2" + sources."validate-npm-package-license-3.0.4" + sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + sources."wrappy-1.0.2" + sources."wtfnode-0.8.4" + sources."yallist-4.0.0" + sources."yocto-queue-0.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Develop Apps Script Projects locally"; + homepage = "https://github.com/google/clasp#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@hyperspace/cli" = nodeEnv.buildNodePackage { name = "_at_hyperspace_slash_cli"; packageName = "@hyperspace/cli"; @@ -73073,7 +75588,7 @@ in sha512 = "YWis7dhbGR5LkGYj7rV3BA/gUusfuugze3LIQUeoggPdF2rdeOZXewSPUydM3UBfsptt0qyw0bPQS+fKT0KDVw=="; }; dependencies = [ - sources."@corestore/networker-1.2.0" + sources."@corestore/networker-1.2.1" sources."@hyperspace/client-1.18.0" sources."@hyperspace/migration-tool-1.2.1" sources."@hyperspace/rpc-1.15.1" @@ -73082,9 +75597,11 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" + sources."acorn-8.7.0" + sources."acorn-walk-8.2.0" (sources."ansi-diff-stream-1.2.1" // { dependencies = [ sources."through2-2.0.5" @@ -73125,7 +75642,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."call-me-maybe-1.0.1" sources."chacha20-universal-1.0.4" sources."chalk-1.1.3" @@ -73167,6 +75684,7 @@ in sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" + sources."events-3.3.0" sources."execa-0.4.0" sources."fast-bitfield-1.2.2" sources."fast-fifo-1.1.0" @@ -73210,7 +75728,7 @@ in sources."hypercore-promisifier-1.1.0" (sources."hypercore-protocol-8.0.7" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -73224,7 +75742,7 @@ in ]; }) sources."hyperswarm-2.15.3" - sources."hypertrie-5.1.2" + sources."hypertrie-5.1.3" sources."identify-filetype-1.0.0" sources."ieee754-1.2.1" sources."immediate-3.3.0" @@ -73269,7 +75787,7 @@ in sources."memory-pager-1.5.0" sources."merkle-tree-stream-4.0.0" sources."mime-1.6.0" - sources."minimist-1.2.5" + sources."minimist-1.2.6" sources."mkdirp-1.0.4" sources."mkdirp-classic-0.5.3" sources."moment-2.29.1" @@ -73316,41 +75834,41 @@ in ]; }) sources."queue-tick-1.0.0" - sources."random-access-file-2.2.0" + sources."random-access-file-2.2.1" sources."random-access-memory-3.1.4" - sources."random-access-storage-1.4.2" + sources."random-access-storage-1.4.3" sources."random-words-1.1.2" sources."randombytes-2.1.0" sources."range-parser-1.2.1" sources."reachdown-1.1.0" sources."readable-stream-2.3.7" sources."readdirp-3.6.0" - sources."record-cache-1.1.1" + sources."record-cache-1.2.0" sources."refpool-1.2.2" sources."remove-trailing-separator-1.1.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."safe-buffer-5.1.2" sources."secretstream-stream-2.0.0" sources."sha256-universal-1.2.1" sources."sha256-wasm-2.2.2" sources."sha512-universal-1.2.1" - sources."sha512-wasm-2.3.3" + sources."sha512-wasm-2.3.4" sources."shuffled-priority-queue-2.1.0" sources."signed-varint-2.0.1" sources."simple-handshake-3.0.0" sources."simple-hypercore-protocol-2.1.2" sources."simple-message-channels-1.2.1" - sources."siphash24-1.3.0" + sources."siphash24-1.3.1" sources."siphash24-universal-1.0.0" - sources."sodium-javascript-0.7.4" + sources."sodium-javascript-0.8.0" sources."sodium-native-3.3.0" - sources."sodium-universal-3.0.4" + sources."sodium-universal-3.1.0" sources."sparse-bitfield-3.0.3" sources."speedometer-1.1.0" sources."stream-collector-1.0.1" sources."stream-equal-1.1.1" sources."stream-shift-1.0.1" - sources."streamx-2.12.0" + sources."streamx-2.12.4" (sources."string-width-4.2.3" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -73362,7 +75880,7 @@ in sources."strip-eof-1.0.0" (sources."subcommand-2.1.1" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -73404,7 +75922,7 @@ in ]; }) sources."varint-5.0.0" - sources."vm2-3.9.5" + sources."vm2-3.9.9" sources."which-1.3.1" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -73440,37 +75958,40 @@ in sha512 = "7EpRhhrJqICbMGjLkdthQYLLGMXNCsrsq8/xxYX1cdRiNwoGb84yjL1WFBrnQtaM8rXShOvhf4lrM2W0K9m4lQ=="; }; dependencies = [ - sources."@babel/parser-7.16.10" - sources."@medable/mdctl-api-1.0.62" - sources."@medable/mdctl-core-1.0.62" - sources."@medable/mdctl-core-schemas-1.0.62" - sources."@medable/mdctl-core-utils-1.0.60" - sources."@medable/mdctl-credentials-provider-keychain-1.0.62" - sources."@medable/mdctl-credentials-provider-pouchdb-1.0.62" - sources."@medable/mdctl-docs-1.0.60" - sources."@medable/mdctl-export-adapter-console-1.0.60" - (sources."@medable/mdctl-export-adapter-tree-1.0.62" // { + sources."@babel/parser-7.17.8" + sources."@medable/mdctl-api-1.0.63" + sources."@medable/mdctl-core-1.0.63" + sources."@medable/mdctl-core-schemas-1.0.63" + sources."@medable/mdctl-core-utils-1.0.63" + sources."@medable/mdctl-credentials-provider-keychain-1.0.63" + sources."@medable/mdctl-credentials-provider-pouchdb-1.0.63" + sources."@medable/mdctl-docs-1.0.63" + sources."@medable/mdctl-export-adapter-console-1.0.63" + (sources."@medable/mdctl-export-adapter-tree-1.0.63" // { dependencies = [ sources."glob-7.2.0" sources."globby-10.0.2" ]; }) - sources."@medable/mdctl-import-adapter-1.0.62" - (sources."@medable/mdctl-manifest-1.0.62" // { + sources."@medable/mdctl-import-adapter-1.0.63" + (sources."@medable/mdctl-manifest-1.0.63" // { dependencies = [ sources."pluralize-8.0.0" ]; }) - sources."@medable/mdctl-node-utils-1.0.62" - sources."@medable/mdctl-sandbox-1.0.62" - sources."@medable/mdctl-secrets-1.0.60" + sources."@medable/mdctl-node-utils-1.0.63" + sources."@medable/mdctl-sandbox-1.0.63" + sources."@medable/mdctl-secrets-1.0.63" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@types/glob-7.2.0" + sources."@types/linkify-it-3.0.2" + sources."@types/markdown-it-12.2.3" + sources."@types/mdurl-1.0.2" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -73489,7 +76010,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."argparse-1.0.10" + sources."argparse-2.0.1" sources."argsarray-0.0.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -73575,7 +76096,7 @@ in sources."cli-width-2.2.1" (sources."cliui-4.1.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -73600,7 +76121,7 @@ in sources."create-hmac-1.1.7" sources."cross-spawn-6.0.5" sources."dashdash-1.14.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" @@ -73616,7 +76137,7 @@ in sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."end-of-stream-1.4.4" - sources."entities-2.0.3" + sources."entities-2.1.0" sources."es3ify-0.2.2" sources."escape-string-regexp-2.0.0" (sources."escodegen-1.14.3" // { @@ -73691,7 +76212,7 @@ in }) sources."fill-range-7.0.1" sources."find-up-3.0.0" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."for-in-1.0.2" sources."foreach-2.0.5" sources."forever-agent-0.6.1" @@ -73776,14 +76297,14 @@ in sources."ignore-5.2.0" sources."ignore-walk-3.0.4" sources."immediate-3.0.6" - sources."inflection-1.13.1" + sources."inflection-1.13.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."inline-process-browser-1.0.0" (sources."inquirer-6.5.2" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."is-fullwidth-code-point-2.0.0" (sources."string-width-2.1.1" // { dependencies = [ @@ -73792,7 +76313,7 @@ in }) (sources."strip-ansi-5.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" ]; }) ]; @@ -73821,12 +76342,13 @@ in sources."isstream-0.1.2" (sources."js-yaml-3.14.1" // { dependencies = [ + sources."argparse-1.0.10" sources."esprima-4.0.1" ]; }) sources."js2xmlparser-4.0.2" sources."jsbn-0.1.1" - (sources."jsdoc-3.6.7" // { + (sources."jsdoc-3.6.10" // { dependencies = [ sources."mkdirp-1.0.4" sources."strip-json-comments-3.1.1" @@ -73852,11 +76374,11 @@ in sources."jws-3.2.2" sources."keytar-4.13.0" sources."kind-of-6.0.3" - sources."klaw-3.0.0" + sources."klaw-4.0.1" sources."lcid-2.0.0" sources."levn-0.3.0" sources."lie-3.0.4" - sources."linkify-it-2.2.0" + sources."linkify-it-3.0.3" sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."lodash.includes-4.3.0" @@ -73870,9 +76392,9 @@ in sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" - sources."markdown-it-10.0.0" - sources."markdown-it-anchor-5.3.0" - sources."marked-2.1.3" + sources."markdown-it-12.3.2" + sources."markdown-it-anchor-8.4.1" + sources."marked-4.0.12" sources."md5.js-1.3.5" sources."mdurl-1.0.1" (sources."mem-4.3.0" // { @@ -73881,14 +76403,14 @@ in ]; }) sources."merge2-1.4.1" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."mime-2.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minipass-2.9.0" sources."minizlib-1.3.3" (sources."mixin-deep-1.3.2" // { @@ -73896,7 +76418,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."mute-stream-0.0.7" sources."nan-2.14.0" @@ -74115,7 +76637,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requizzle-0.2.3" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" @@ -74148,9 +76670,9 @@ in sources."glob-7.2.0" ]; }) - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-2.8.1" + sources."simple-get-2.8.2" sources."slash-3.0.0" sources."slugify-1.6.5" (sources."snapdragon-0.8.2" // { @@ -74270,7 +76792,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uc.micro-1.0.6" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.3" sources."underscore-1.13.2" sources."union-value-1.0.1" (sources."universal-url-2.0.0" // { @@ -74314,7 +76836,7 @@ in sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-module-2.0.0" - sources."which-pm-runs-1.0.0" + sources."which-pm-runs-1.1.0" sources."wide-align-1.1.5" sources."word-wrap-1.2.3" sources."wordwrap-1.0.0" @@ -74326,7 +76848,7 @@ in sources."yallist-3.1.1" (sources."yargs-12.0.5" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -74358,7 +76880,7 @@ in sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@octokit/auth-token-2.5.0" - sources."@octokit/core-3.5.1" + sources."@octokit/core-3.6.0" sources."@octokit/endpoint-6.0.12" sources."@octokit/graphql-4.8.0" sources."@octokit/openapi-types-11.2.0" @@ -74366,12 +76888,12 @@ in sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.13.0" sources."@octokit/plugin-retry-3.0.9" - sources."@octokit/plugin-throttling-3.5.2" - sources."@octokit/request-5.6.2" + sources."@octokit/plugin-throttling-3.6.2" + sources."@octokit/request-5.6.3" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" sources."@octokit/types-6.34.0" - sources."@sideway/address-4.1.3" + sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" sources."@types/js-yaml-3.12.7" @@ -74393,7 +76915,7 @@ in sources."color-name-1.1.4" sources."commander-6.2.1" sources."cross-spawn-4.0.2" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."defaults-1.0.3" sources."deprecation-2.3.1" sources."esprima-4.0.1" @@ -74406,7 +76928,7 @@ in sources."is-plain-object-5.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - sources."joi-17.5.0" + sources."joi-17.6.0" sources."js-yaml-3.14.1" sources."jsonfile-6.1.0" sources."lodash-4.17.21" @@ -74426,7 +76948,7 @@ in sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" sources."safe-buffer-5.2.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-git-2.48.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.3.0" @@ -74457,19 +76979,19 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "8.2.0"; + version = "8.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.2.0.tgz"; - sha512 = "f5grQOgrRcfHfOUP94OWsMdVYy6bit0zRSxPZ5+tfsFWkiPWdcx5Ba2M2socTykkiNHruXBu07lYvcKh94do7Q=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.2.4.tgz"; + sha512 = "9zNV9oMtaz1vwLO3WXviD0wzRpyiaLWJZ7KCIZLk62U22RDNRsbtLLDS52Wkig5L8UU7Z1xRfrEv+s3f9keysQ=="; }; dependencies = [ - sources."@angular-devkit/core-13.1.2" - sources."@angular-devkit/schematics-13.1.2" - (sources."@angular-devkit/schematics-cli-13.1.2" // { + sources."@angular-devkit/core-13.3.0" + sources."@angular-devkit/schematics-13.3.0" + (sources."@angular-devkit/schematics-cli-13.3.0" // { dependencies = [ sources."chalk-4.1.2" sources."inquirer-8.2.0" - sources."rxjs-7.5.2" + sources."rxjs-7.5.5" sources."tslib-2.3.1" ]; }) @@ -74485,19 +77007,18 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-8.0.5" // { + (sources."@nestjs/schematics-8.0.8" // { dependencies = [ - sources."@angular-devkit/core-13.0.2" - sources."@angular-devkit/schematics-13.0.2" - sources."ajv-8.6.3" + sources."@angular-devkit/core-13.2.5" + sources."@angular-devkit/schematics-13.2.5" ]; }) - sources."@types/eslint-8.4.0" + sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" - sources."@types/estree-0.0.50" - sources."@types/json-schema-7.0.9" + sources."@types/estree-0.0.51" + sources."@types/json-schema-7.0.11" sources."@types/json5-0.0.29" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -74518,29 +77039,28 @@ in sources."@xtuc/long-4.2.2" sources."acorn-8.7.0" sources."acorn-import-assertions-1.8.0" - sources."ajv-8.8.2" + sources."ajv-8.9.0" sources."ajv-formats-2.1.1" - sources."ajv-keywords-3.5.2" + sources."ajv-keywords-5.1.0" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" - sources."at-least-node-1.0.0" 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."braces-3.0.2" - sources."browserslist-4.19.1" + sources."browserslist-4.20.2" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001320" sources."chalk-3.0.0" sources."chardet-0.7.0" - sources."chokidar-3.5.2" + sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."cli-cursor-3.1.0" sources."cli-spinners-2.6.1" @@ -74552,18 +77072,14 @@ in sources."colors-1.4.0" sources."commander-4.1.1" sources."concat-map-0.0.1" - sources."cosmiconfig-6.0.0" + sources."cosmiconfig-7.0.1" sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-5.8.3" // { - dependencies = [ - sources."tapable-2.2.1" - ]; - }) + sources."enhanced-resolve-5.9.2" sources."error-ex-1.3.2" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -74582,13 +77098,12 @@ in sources."fast-json-stable-stringify-2.1.0" sources."figures-3.2.0" sources."fill-range-7.0.1" - (sources."fork-ts-checker-webpack-plugin-6.5.0" // { + (sources."fork-ts-checker-webpack-plugin-7.2.1" // { dependencies = [ sources."chalk-4.1.2" - sources."fs-extra-9.1.0" ]; }) - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-monkey-1.0.3" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -74623,7 +77138,7 @@ in sources."is-stream-2.0.1" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - (sources."jest-worker-27.4.6" // { + (sources."jest-worker-27.5.1" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -74648,15 +77163,15 @@ in sources."magic-string-0.25.7" sources."memfs-3.4.1" sources."merge-stream-2.0.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minimist-1.2.5" sources."mute-stream-0.0.8" sources."neo-async-2.6.2" sources."node-emoji-1.11.0" - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."once-1.4.0" @@ -74684,7 +77199,7 @@ in sources."readdirp-3.6.0" sources."rechoir-0.6.2" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" @@ -74692,18 +77207,13 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - (sources."schema-utils-2.7.0" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - ]; - }) + sources."schema-utils-4.0.0" sources."semver-7.3.5" sources."serialize-javascript-6.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shelljs-0.8.5" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.7.3" (sources."source-map-support-0.5.21" // { dependencies = [ @@ -74719,15 +77229,16 @@ in sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-4.0.0" - sources."tapable-1.1.3" - (sources."terser-5.10.0" // { + sources."tapable-2.2.1" + (sources."terser-5.12.1" // { dependencies = [ sources."commander-2.20.3" ]; }) - (sources."terser-webpack-plugin-5.3.0" // { + (sources."terser-webpack-plugin-5.3.1" // { dependencies = [ sources."ajv-6.12.6" + sources."ajv-keywords-3.5.2" sources."json-schema-traverse-0.4.1" sources."schema-utils-3.1.1" sources."source-map-0.6.1" @@ -74737,7 +77248,7 @@ in sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tree-kill-1.2.2" - sources."tsconfig-paths-3.12.0" + sources."tsconfig-paths-3.14.0" (sources."tsconfig-paths-webpack-plugin-3.5.2" // { dependencies = [ sources."chalk-4.1.2" @@ -74745,18 +77256,18 @@ in }) sources."tslib-1.14.1" sources."type-fest-0.21.3" - sources."typescript-4.5.4" + sources."typescript-4.6.2" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."watchpack-2.3.1" sources."wcwidth-1.0.1" - (sources."webpack-5.66.0" // { + (sources."webpack-5.70.0" // { dependencies = [ sources."ajv-6.12.6" + sources."ajv-keywords-3.5.2" sources."json-schema-traverse-0.4.1" sources."schema-utils-3.1.1" - sources."tapable-2.2.1" ]; }) sources."webpack-node-externals-3.0.0" @@ -74786,7 +77297,7 @@ in sha512 = "uMnUWMx4S8UApO/EfPyRyvUmw+0jI9wwAfdHfGjvVg4DAIvEgsA+VWK2KOBnJiChvVd768K27g09ESzptyX93w=="; }; dependencies = [ - sources."@squoosh/lib-0.4.0" + sources."@squoosh/lib-0.4.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."base64-js-1.5.1" @@ -74805,17 +77316,16 @@ in sources."inherits-2.0.4" sources."is-interactive-1.0.0" sources."is-unicode-supported-0.1.0" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."kleur-4.1.4" sources."log-symbols-4.1.0" sources."mimic-fn-2.1.0" - sources."minimist-1.2.5" sources."onetime-5.1.2" sources."ora-5.4.1" sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" sources."safe-buffer-5.2.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" @@ -74834,6 +77344,45 @@ in bypassCache = true; reconstructLock = true; }; + "@tailwindcss/aspect-ratio" = nodeEnv.buildNodePackage { + name = "_at_tailwindcss_slash_aspect-ratio"; + packageName = "@tailwindcss/aspect-ratio"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tailwindcss/aspect-ratio/-/aspect-ratio-0.4.0.tgz"; + sha512 = "WJu0I4PpqNPuutpaA9zDUq2JXR+lorZ7PbLcKNLmb6GL9/HLfC7w3CRsMhJF4BbYd/lkY6CfXOvkYpuGnZfkpQ=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "A plugin that provides a composable API for giving elements a fixed aspect ratio."; + homepage = "https://github.com/tailwindlabs/tailwindcss-aspect-ratio#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + "@tailwindcss/forms" = nodeEnv.buildNodePackage { + name = "_at_tailwindcss_slash_forms"; + packageName = "@tailwindcss/forms"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.0.tgz"; + sha512 = "KzWugryEBFkmoaYcBE18rs6gthWCFHHO7cAZm2/hv3hwD67AzwP7udSCa22E7R1+CEJL/FfhYsJWrc0b1aeSzw=="; + }; + dependencies = [ + sources."mini-svg-data-uri-1.4.4" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A plugin that provides a basic reset for form styles that makes form elements easy to override with utilities."; + homepage = "https://github.com/tailwindlabs/tailwindcss-forms#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@tailwindcss/language-server" = nodeEnv.buildNodePackage { name = "_at_tailwindcss_slash_language-server"; packageName = "@tailwindcss/language-server"; @@ -74851,16 +77400,353 @@ in bypassCache = true; reconstructLock = true; }; + "@tailwindcss/line-clamp" = nodeEnv.buildNodePackage { + name = "_at_tailwindcss_slash_line-clamp"; + packageName = "@tailwindcss/line-clamp"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.3.1.tgz"; + sha512 = "pNr0T8LAc3TUx/gxCfQZRe9NB2dPEo/cedPHzUGIPxqDMhgjwNm6jYxww4W5l0zAsAddxr+XfZcqttGiFDgrGg=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "A plugin that provides utilities for visually truncating text after a fixed number of lines."; + homepage = "https://github.com/tailwindlabs/tailwindcss-line-clamp#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + "@tailwindcss/typography" = nodeEnv.buildNodePackage { + name = "_at_tailwindcss_slash_typography"; + packageName = "@tailwindcss/typography"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.2.tgz"; + sha512 = "coq8DBABRPFcVhVIk6IbKyyHUt7YTEC/C992tatFB+yEx5WGBQrCgsSFjxHUr8AWXphWckadVJbominEduYBqw=="; + }; + dependencies = [ + sources."lodash.castarray-4.4.0" + sources."lodash.isplainobject-4.0.6" + sources."lodash.merge-4.6.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A Tailwind CSS plugin for automatically styling plain HTML content with beautiful typographic defaults."; + homepage = "https://github.com/tailwindcss/typography#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + "@uppy/companion" = nodeEnv.buildNodePackage { + name = "_at_uppy_slash_companion"; + packageName = "@uppy/companion"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@uppy/companion/-/companion-3.5.0.tgz"; + sha512 = "hFsp3x/B2H++bjuDiaC0s0ktENe35OQKAoj78WUn1W50my6lpDMywd5WWmlFurK7Dda7I0OwVyaZ0c9L2hqCCg=="; + }; + dependencies = [ + sources."@purest/config-1.0.1" + sources."@purest/providers-1.0.1" + sources."@request/api-0.6.0" + sources."@request/interface-0.1.0" + (sources."accepts-1.3.8" // { + dependencies = [ + sources."mime-types-2.1.35" + ]; + }) + sources."ajv-6.12.6" + sources."ansi-styles-3.2.1" + sources."array-flatten-1.1.1" + sources."asn1-0.2.6" + sources."assert-plus-1.0.0" + sources."async-limiter-1.0.1" + sources."asynckit-0.4.0" + sources."atob-2.1.2" + (sources."aws-sdk-2.1101.0" // { + dependencies = [ + sources."uuid-3.3.2" + ]; + }) + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."base64-js-1.5.1" + sources."basic-auth-2.0.1" + sources."bcrypt-pbkdf-1.0.2" + sources."bintrees-1.0.1" + sources."body-parser-1.19.0" + sources."buffer-4.9.2" + sources."buffer-equal-constant-time-1.0.1" + sources."buffer-from-0.1.2" + sources."bytes-3.1.0" + sources."call-bind-1.0.2" + sources."caseless-0.12.0" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combine-errors-3.0.3" + sources."combined-stream-1.0.8" + sources."common-tags-1.8.0" + sources."connect-redis-4.0.3" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."cookie-0.4.1" + sources."cookie-parser-1.4.6" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.2" + sources."cors-2.8.5" + sources."cron-parser-2.18.0" + sources."custom-error-instance-2.1.1" + sources."dashdash-1.14.1" + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."deep-copy-1.4.2" + sources."define-properties-1.1.3" + sources."delayed-stream-1.0.0" + sources."denque-1.5.1" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."ecc-jsbn-0.1.2" + sources."ecdsa-sig-formatter-1.0.11" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."escape-goat-3.0.0" + sources."escape-html-1.0.3" + sources."escape-string-regexp-2.0.0" + sources."etag-1.8.1" + sources."events-1.1.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."cookie-0.4.0" + ]; + }) + sources."express-interceptor-1.2.0" + sources."express-prom-bundle-6.3.0" + (sources."express-request-id-1.4.1" // { + dependencies = [ + sources."uuid-3.4.0" + ]; + }) + (sources."express-session-1.17.1" // { + dependencies = [ + sources."cookie-0.4.0" + sources."depd-2.0.0" + sources."safe-buffer-5.2.0" + ]; + }) + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."finalhandler-1.1.2" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."forwarded-0.2.0" + sources."fresh-0.5.2" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" + sources."getpass-0.1.7" + sources."graceful-fs-4.2.9" + (sources."grant-4.7.0" // { + dependencies = [ + sources."qs-6.10.3" + ]; + }) + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.3" + sources."helmet-4.6.0" + sources."http-errors-1.7.2" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" + sources."inherits-2.0.3" + sources."ipaddr.js-2.0.1" + sources."is-nan-1.3.2" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."jmespath-0.16.0" + sources."js-base64-2.6.4" + 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."jsonwebtoken-8.5.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."jsprim-1.4.2" + sources."jwa-1.4.1" + sources."jws-3.2.2" + sources."lodash._baseiteratee-4.7.0" + sources."lodash._basetostring-4.12.0" + sources."lodash._baseuniq-4.6.0" + 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.merge-4.6.2" + sources."lodash.once-4.1.1" + sources."lodash.throttle-4.1.1" + sources."lodash.uniqby-4.5.0" + sources."long-timeout-0.1.1" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.52.0" + (sources."mime-types-2.1.25" // { + dependencies = [ + sources."mime-db-1.42.0" + ]; + }) + sources."moment-2.29.1" + sources."moment-timezone-0.5.34" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."depd-2.0.0" + ]; + }) + sources."ms-2.1.2" + sources."negotiator-0.6.3" + sources."node-redis-pubsub-5.0.0" + sources."node-schedule-1.3.2" + sources."oauth-sign-0.8.2" + sources."object-assign-4.1.1" + sources."object-inspect-1.12.0" + sources."object-keys-1.1.1" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."parseurl-1.3.3" + sources."path-to-regexp-0.1.7" + sources."performance-now-2.1.0" + sources."prom-client-12.0.0" + sources."proper-lockfile-2.0.1" + (sources."proxy-addr-2.0.7" // { + dependencies = [ + sources."ipaddr.js-1.9.1" + ]; + }) + sources."psl-1.8.0" + sources."punycode-1.3.2" + sources."purest-3.1.0" + sources."qs-6.7.0" + sources."querystring-0.2.0" + sources."querystringify-2.2.0" + sources."random-bytes-1.0.0" + sources."randombytes-2.1.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."redis-3.1.1" + sources."redis-commands-1.7.0" + sources."redis-errors-1.2.0" + sources."redis-parser-3.0.0" + (sources."request-2.88.2" // { + dependencies = [ + sources."oauth-sign-0.9.0" + sources."qs-6.5.3" + sources."uuid-3.4.0" + ]; + }) + sources."request-compose-1.2.3" + (sources."request-oauth-0.0.3" // { + dependencies = [ + sources."uuid-3.4.0" + ]; + }) + sources."requires-port-1.0.0" + sources."retry-0.10.1" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.1" + sources."semver-6.3.0" + (sources."send-0.17.1" // { + dependencies = [ + sources."ms-2.1.1" + ]; + }) + sources."serialize-error-2.1.0" + sources."serialize-javascript-6.0.0" + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" + sources."side-channel-1.0.4" + sources."sorted-array-functions-1.3.0" + sources."sshpk-1.17.0" + sources."statuses-1.5.0" + sources."supports-color-5.5.0" + sources."tdigest-0.1.1" + sources."toidentifier-1.0.0" + (sources."tough-cookie-2.5.0" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."tus-js-client-2.1.1" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.18" + sources."uid-safe-2.1.5" + sources."unpipe-1.0.0" + (sources."uri-js-4.4.1" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) + sources."url-0.10.3" + sources."url-parse-1.5.10" + sources."url-value-parser-2.1.0" + sources."utils-merge-1.0.1" + sources."uuid-8.1.0" + sources."validator-12.2.0" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."ws-6.2.2" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "OAuth helper and remote fetcher for Uppy's (https://uppy.io) extensible file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Dropbox and Google Drive, S3 and more :dog:"; + homepage = "https://github.com/transloadit/uppy#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.5.15"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.15.tgz"; - sha512 = "7YkT/xf1RjowIad8JSyerT+XIyja7SXfsHfPNdktUeTx5XAmiJiGsXb7ydq3rVHekaPsIkE2wIAgaGBrnRdTIA=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-5.0.4.tgz"; + sha512 = "v9fHBQ3MCTAo92+uA/J8C/PYxGrZJCSM/myPEGzX4zrlbT4bBLfuP0pFRJZO9wQGE3NHp95coIdOghXdMm/atw=="; }; dependencies = [ + sources."@achrinza/node-ipc-9.2.2" sources."@akryum/winattr-3.0.0" + sources."@ampproject/remapping-2.1.2" (sources."@apollo/protobufjs-1.2.2" // { dependencies = [ sources."@types/node-10.17.60" @@ -74870,48 +77756,73 @@ in sources."@apollographql/graphql-playground-html-1.6.27" sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - sources."@babel/core-7.16.10" - sources."@babel/generator-7.16.8" + sources."@babel/compat-data-7.17.7" + (sources."@babel/core-7.17.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."@babel/generator-7.17.7" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - sources."@babel/helper-compilation-targets-7.16.7" - sources."@babel/helper-create-class-features-plugin-7.16.10" - sources."@babel/helper-create-regexp-features-plugin-7.16.7" - sources."@babel/helper-define-polyfill-provider-0.3.1" + (sources."@babel/helper-compilation-targets-7.17.7" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.17.6" + sources."@babel/helper-create-regexp-features-plugin-7.17.0" + (sources."@babel/helper-define-polyfill-provider-0.3.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-explode-assignable-expression-7.16.7" sources."@babel/helper-function-name-7.16.7" sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-member-expression-to-functions-7.16.7" + sources."@babel/helper-member-expression-to-functions-7.17.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.7" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" sources."@babel/helper-replace-supers-7.16.7" - sources."@babel/helper-simple-access-7.16.7" + sources."@babel/helper-simple-access-7.17.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.16.7" - sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" + sources."@babel/helpers-7.17.8" + (sources."@babel/highlight-7.16.10" // { + 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/parser-7.17.8" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/plugin-proposal-object-rest-spread-7.17.3" sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" sources."@babel/plugin-proposal-optional-chaining-7.16.7" sources."@babel/plugin-proposal-private-methods-7.16.11" @@ -74939,7 +77850,7 @@ in sources."@babel/plugin-transform-block-scoping-7.16.7" sources."@babel/plugin-transform-classes-7.16.7" sources."@babel/plugin-transform-computed-properties-7.16.7" - sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-destructuring-7.17.7" sources."@babel/plugin-transform-dotall-regex-7.16.7" sources."@babel/plugin-transform-duplicate-keys-7.16.7" sources."@babel/plugin-transform-exponentiation-operator-7.16.7" @@ -74949,8 +77860,8 @@ in sources."@babel/plugin-transform-literals-7.16.7" sources."@babel/plugin-transform-member-expression-literals-7.16.7" sources."@babel/plugin-transform-modules-amd-7.16.7" - sources."@babel/plugin-transform-modules-commonjs-7.16.8" - sources."@babel/plugin-transform-modules-systemjs-7.16.7" + sources."@babel/plugin-transform-modules-commonjs-7.17.7" + sources."@babel/plugin-transform-modules-systemjs-7.17.8" sources."@babel/plugin-transform-modules-umd-7.16.7" sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" sources."@babel/plugin-transform-new-target-7.16.7" @@ -74967,34 +77878,34 @@ in sources."@babel/plugin-transform-typescript-7.16.8" sources."@babel/plugin-transform-unicode-escapes-7.16.7" sources."@babel/plugin-transform-unicode-regex-7.16.7" - sources."@babel/preset-env-7.16.11" + (sources."@babel/preset-env-7.16.11" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."@babel/preset-flow-7.16.7" sources."@babel/preset-modules-0.1.5" sources."@babel/preset-typescript-7.16.7" - (sources."@babel/register-7.16.9" // { + (sources."@babel/register-7.17.7" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.8" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" - sources."@hapi/address-2.1.4" - sources."@hapi/bourne-1.3.2" - sources."@hapi/hoek-8.5.1" - sources."@hapi/joi-15.1.1" - sources."@hapi/topo-3.1.6" + sources."@babel/traverse-7.17.3" + sources."@babel/types-7.17.0" + sources."@hapi/hoek-9.2.1" + sources."@hapi/topo-5.1.0" sources."@josephg/resolvable-1.0.1" - sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@nodelib/fs.scandir-2.1.5" // { - dependencies = [ - sources."@nodelib/fs.stat-2.0.5" - ]; - }) - sources."@nodelib/fs.stat-1.1.3" + sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/sourcemap-codec-1.4.11" + sources."@jridgewell/trace-mapping-0.3.4" + sources."@node-ipc/js-queue-2.0.3" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" @@ -75006,6 +77917,9 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" + sources."@sideway/address-4.1.4" + sources."@sideway/formula-3.0.0" + sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-0.7.0" sources."@types/accepts-1.3.5" sources."@types/body-parser-1.19.0" @@ -75013,19 +77927,17 @@ in sources."@types/content-disposition-0.5.4" sources."@types/cookies-0.7.7" sources."@types/cors-2.8.10" - sources."@types/ejs-2.7.0" + sources."@types/ejs-3.1.0" sources."@types/express-4.17.13" sources."@types/express-serve-static-core-4.17.28" sources."@types/fs-capacitor-2.0.0" - sources."@types/glob-7.2.0" sources."@types/http-assert-1.5.3" sources."@types/http-errors-1.8.2" - sources."@types/inquirer-6.5.0" + sources."@types/inquirer-8.2.0" (sources."@types/jscodeshift-0.7.2" // { dependencies = [ sources."ast-types-0.12.1" sources."recast-0.17.2" - sources."source-map-0.6.1" ]; }) sources."@types/keygrip-1.0.2" @@ -75033,92 +77945,88 @@ in sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/serve-static-1.13.10" sources."@types/through-0.0.30" sources."@types/ws-7.4.7" - sources."@vue/cli-shared-utils-4.5.15" - (sources."@vue/cli-ui-4.5.15" // { + sources."@vue/cli-shared-utils-5.0.4" + (sources."@vue/cli-ui-5.0.4" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-4.5.15" - sources."@vue/cli-ui-addon-widgets-4.5.15" - (sources."@vue/compiler-core-3.2.28" // { + sources."@vue/cli-ui-addon-webpack-5.0.4" + sources."@vue/cli-ui-addon-widgets-5.0.4" + sources."@vue/compiler-core-3.2.31" + sources."@vue/compiler-dom-3.2.31" + sources."@vue/shared-3.2.31" + (sources."@wry/equality-0.1.11" // { dependencies = [ - sources."source-map-0.6.1" + sources."tslib-1.14.1" ]; }) - sources."@vue/compiler-dom-3.2.28" - sources."@vue/shared-3.2.28" - sources."@wry/equality-0.1.11" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."aggregate-error-3.1.0" - sources."ajv-6.12.6" sources."ansi-align-3.0.1" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."apollo-cache-control-0.14.0" sources."apollo-datasource-0.9.0" sources."apollo-graphql-0.9.5" - sources."apollo-link-1.2.14" + (sources."apollo-link-1.2.14" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."apollo-reporting-protobuf-0.8.0" - (sources."apollo-server-caching-0.7.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - (sources."apollo-server-core-2.25.3" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."uuid-8.3.2" - ]; - }) + sources."apollo-server-caching-0.7.0" + sources."apollo-server-core-2.25.3" sources."apollo-server-env-3.1.0" sources."apollo-server-errors-2.5.0" sources."apollo-server-express-2.25.3" sources."apollo-server-plugin-base-0.13.0" sources."apollo-server-types-0.9.0" sources."apollo-tracing-0.15.0" - sources."apollo-utilities-1.3.4" + (sources."apollo-utilities-1.3.4" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" ]; }) - sources."argparse-1.0.10" + sources."argparse-2.0.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" sources."array-flatten-1.1.1" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" + sources."array-union-2.1.0" sources."array-unique-0.3.2" sources."arrify-2.0.1" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.13.3" + sources."ast-types-0.14.2" sources."async-2.6.3" sources."async-retry-1.3.3" - sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" sources."atob-2.1.2" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" sources."babel-core-7.0.0-bridge.0" sources."babel-plugin-dynamic-import-node-2.3.3" - sources."babel-plugin-polyfill-corejs2-0.3.1" - sources."babel-plugin-polyfill-corejs3-0.5.1" + (sources."babel-plugin-polyfill-corejs2-0.3.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."babel-plugin-polyfill-corejs3-0.5.2" sources."babel-plugin-polyfill-regenerator-0.3.1" sources."backo2-1.0.2" sources."balanced-match-1.0.2" @@ -75128,28 +78036,20 @@ in ]; }) sources."base64-js-1.5.1" - sources."bcrypt-pbkdf-1.0.2" - sources."bl-1.2.3" - (sources."body-parser-1.19.1" // { + sources."bl-4.1.0" + (sources."body-parser-1.19.2" // { dependencies = [ sources."debug-2.6.9" - sources."qs-6.9.6" ]; }) - (sources."boxen-4.2.0" // { + (sources."boxen-5.1.2" // { 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."type-fest-0.20.2" ]; }) sources."brace-expansion-1.1.11" - sources."braces-2.3.2" - sources."browserslist-4.19.1" + sources."braces-3.0.2" + sources."browserslist-4.20.2" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -75158,7 +78058,7 @@ in sources."buffer-from-1.1.2" sources."builtins-1.0.3" sources."busboy-0.3.1" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { dependencies = [ @@ -75167,12 +78067,10 @@ in ]; }) sources."call-bind-1.0.2" - sources."call-me-maybe-1.0.1" - sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001301" - sources."caseless-0.12.0" + sources."camelcase-6.3.0" + sources."caniuse-lite-1.0.30001320" sources."caw-2.0.1" - sources."chalk-2.4.2" + sources."chalk-4.1.2" sources."chardet-0.7.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -75193,24 +78091,26 @@ in }) sources."clean-stack-2.2.0" sources."cli-boxes-2.2.1" - sources."cli-cursor-2.1.0" + sources."cli-cursor-3.1.0" sources."cli-spinners-2.6.1" sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-deep-4.0.1" sources."clone-response-1.0.2" - sources."cmd-shim-3.0.3" sources."collection-visit-1.0.0" - 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."colors-1.4.0" - sources."combined-stream-1.0.8" - sources."commander-2.20.3" + sources."commander-7.2.0" sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" - sources."config-chain-1.1.13" + (sources."config-chain-1.1.13" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) sources."content-disposition-0.5.4" sources."content-type-1.0.4" (sources."convert-source-map-1.8.0" // { @@ -75218,16 +78118,16 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.20.3" // { + (sources."core-js-compat-3.21.1" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.20.3" - sources."core-util-is-1.0.2" + sources."core-js-pure-3.21.1" + sources."core-util-is-1.0.3" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -75235,9 +78135,7 @@ in ]; }) sources."cssfilter-0.0.10" - sources."csv-parser-1.12.1" - sources."dashdash-1.14.1" - (sources."debug-4.3.3" // { + (sources."debug-4.3.4" // { dependencies = [ sources."ms-2.1.2" ]; @@ -75273,14 +78171,14 @@ in }) sources."deepmerge-4.2.2" sources."defaults-1.0.3" + sources."define-lazy-prop-2.0.0" sources."define-properties-1.1.3" sources."define-property-2.0.2" - sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."deprecated-decorator-0.1.6" sources."destroy-1.0.4" sources."dicer-0.3.0" - sources."dir-glob-2.2.2" + sources."dir-glob-3.0.1" (sources."download-7.1.0" // { dependencies = [ sources."get-stream-3.0.0" @@ -75289,10 +78187,9 @@ in sources."download-git-repo-3.0.2" sources."duplexer3-0.1.4" sources."easy-stack-1.0.1" - sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.51" + sources."ejs-3.1.6" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -75310,12 +78207,12 @@ in sources."etag-1.8.1" sources."event-pubsub-4.3.0" sources."eventemitter3-3.1.2" - sources."exec-sh-0.2.2" sources."execa-1.0.0" (sources."expand-brackets-2.1.4" // { dependencies = [ 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" @@ -75330,35 +78227,36 @@ in sources."kind-of-5.1.0" ]; }) - sources."expand-tilde-2.0.2" - (sources."express-4.17.2" // { + (sources."express-4.17.3" // { dependencies = [ sources."debug-2.6.9" - sources."qs-6.9.6" ]; }) sources."express-history-api-fallback-2.2.1" sources."ext-list-2.2.2" sources."ext-name-5.0.0" - sources."extend-3.0.2" - sources."extend-shallow-2.0.1" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" ]; }) - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-glob-2.2.7" + sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.13.0" sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."file-type-8.1.0" + sources."filelist-1.0.2" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" - sources."fill-range-4.0.0" + sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ sources."debug-2.6.9" @@ -75366,31 +78264,50 @@ in }) (sources."find-cache-dir-2.1.0" // { dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" sources."make-dir-2.1.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" sources."pify-4.0.1" + sources."pkg-dir-3.0.0" sources."semver-5.7.1" ]; }) - sources."find-up-3.0.0" - sources."fkill-6.2.0" - sources."flow-parser-0.169.0" + sources."find-up-5.0.0" + (sources."fkill-7.2.1" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."execa-5.1.1" + sources."get-stream-6.0.1" + sources."is-stream-2.0.1" + sources."npm-run-path-4.0.1" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) + sources."flow-parser-0.174.1" sources."for-each-0.3.3" sources."for-in-1.0.2" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."from2-2.3.0" + (sources."from2-2.3.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) sources."fs-capacitor-2.0.4" sources."fs-constants-1.0.0" - sources."fs-exists-sync-0.1.0" - sources."fs-extra-7.0.1" + sources."fs-extra-9.1.0" sources."fs.realpath-1.0.0" sources."fswin-2.17.1227" sources."function-bind-1.1.1" - sources."generate-function-1.1.0" - sources."generate-object-property-1.2.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -75398,88 +78315,68 @@ in sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" - sources."getpass-0.1.7" sources."git-clone-0.1.0" - sources."git-config-path-1.0.1" + sources."git-config-path-2.0.0" sources."glob-7.2.0" - (sources."glob-parent-3.1.0" // { + sources."glob-parent-5.1.2" + (sources."global-dirs-0.1.1" // { dependencies = [ - sources."is-glob-3.1.0" + sources."ini-1.3.8" ]; }) - sources."glob-to-regexp-0.3.0" - sources."global-dirs-0.1.1" sources."globals-11.12.0" - (sources."globby-9.2.0" // { - dependencies = [ - sources."pify-4.0.1" - sources."slash-2.0.0" - ]; - }) + sources."globby-11.1.0" (sources."got-8.3.2" // { dependencies = [ sources."get-stream-3.0.0" - sources."into-stream-3.1.0" ]; }) sources."graceful-fs-4.2.9" - sources."graphql-14.7.0" + sources."graphql-15.8.0" sources."graphql-extensions-0.15.0" sources."graphql-subscriptions-1.2.1" - (sources."graphql-tag-2.12.6" // { + sources."graphql-tag-2.12.6" + (sources."graphql-tools-4.0.8" // { dependencies = [ - sources."tslib-2.3.1" + sources."uuid-3.4.0" ]; }) - sources."graphql-tools-4.0.8" sources."graphql-type-json-0.3.2" sources."growly-1.3.0" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-to-string-tag-x-1.4.1" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."kind-of-4.0.0" ]; }) - sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-3.8.1" sources."http-errors-1.8.1" - sources."http-signature-1.2.0" - sources."human-signals-1.1.1" + sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-4.0.6" + sources."ignore-5.2.0" sources."import-global-0.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.8" - (sources."inquirer-7.3.3" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."cli-cursor-3.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."mimic-fn-2.1.0" - sources."onetime-5.1.2" - sources."restore-cursor-3.1.0" - sources."supports-color-7.2.0" - ]; - }) + sources."ini-2.0.0" + sources."inquirer-8.2.2" sources."internal-slot-1.0.3" - sources."into-stream-2.0.1" + sources."into-stream-3.1.0" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" @@ -75496,139 +78393,118 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" + sources."is-interactive-1.0.0" sources."is-natural-number-4.0.1" sources."is-negative-zero-2.0.2" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-7.0.0" sources."is-number-object-1.0.6" sources."is-object-1.0.2" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" - sources."is-property-1.0.2" sources."is-regex-1.1.4" sources."is-retry-allowed-1.2.0" sources."is-shared-array-buffer-1.0.1" sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-weakref-1.0.2" sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" - sources."isbinaryfile-4.0.8" + sources."isbinaryfile-4.0.10" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."isstream-0.1.2" sources."isurl-1.0.0" sources."iterall-1.3.0" - sources."javascript-stringify-1.6.0" + (sources."jake-10.8.4" // { + dependencies = [ + sources."async-0.9.2" + ]; + }) + sources."javascript-stringify-2.1.0" + sources."joi-17.6.0" sources."js-message-1.0.7" - sources."js-queue-2.0.2" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."jsbn-0.1.1" + sources."js-yaml-4.1.0" (sources."jscodeshift-0.11.0" // { dependencies = [ - sources."ast-types-0.14.2" - sources."recast-0.20.5" - sources."source-map-0.6.1" - sources."tslib-2.3.1" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" ]; }) sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."json5-2.2.0" - sources."jsonfile-4.0.0" - sources."jsprim-1.4.2" + sources."json5-2.2.1" + sources."jsonfile-6.1.0" sources."keyv-3.0.0" sources."kind-of-6.0.3" sources."launch-editor-2.3.0" sources."leven-3.1.0" sources."lines-and-columns-1.2.4" - sources."locate-path-3.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" sources."lodash.debounce-4.0.8" sources."lodash.merge-4.6.2" sources."lodash.sortby-4.7.0" - sources."log-symbols-2.2.0" + sources."log-symbols-4.1.0" sources."loglevel-1.8.0" sources."long-4.0.0" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" - (sources."lru-cache-5.1.1" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) + sources."lru-cache-6.0.0" sources."make-dir-1.3.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."media-typer-0.3.0" - sources."merge-1.2.1" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" - (sources."micromatch-3.1.10" // { - dependencies = [ - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - ]; - }) + sources."micromatch-4.0.5" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."mimic-fn-1.2.0" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."nanoid-2.1.11" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - ]; - }) - sources."ndjson-1.5.0" - (sources."neat-csv-2.1.0" // { - dependencies = [ - sources."get-stream-2.3.1" - ]; - }) - sources."negotiator-0.6.2" + sources."nanomatch-1.2.13" + sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."nice-try-1.0.5" sources."node-dir-0.1.17" sources."node-fetch-2.6.7" - sources."node-ipc-9.2.1" - (sources."node-notifier-9.0.1" // { + (sources."node-notifier-10.0.1" // { dependencies = [ - sources."is-wsl-2.2.0" - sources."lru-cache-6.0.0" - sources."semver-7.3.5" - sources."uuid-8.3.2" sources."which-2.0.2" ]; }) - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -75641,7 +78517,6 @@ in }) sources."npm-conf-1.1.3" sources."npm-run-path-2.0.2" - sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -75665,52 +78540,53 @@ in sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."onetime-2.0.1" - sources."open-6.4.0" - (sources."ora-3.4.0" // { - dependencies = [ - sources."strip-ansi-5.2.0" - ]; - }) + sources."onetime-5.1.2" + sources."open-8.4.0" + sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-cancelable-0.4.1" sources."p-event-2.3.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" sources."p-timeout-2.0.1" sources."p-try-2.2.0" - sources."parse-git-config-2.0.3" + (sources."parse-git-config-3.0.0" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) sources."parse-json-5.2.0" - sources."parse-passwd-1.0.0" sources."parseurl-1.3.3" sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" - sources."path-type-3.0.0" + sources."path-type-4.0.0" sources."pend-1.2.0" - sources."performance-now-2.1.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - (sources."pid-from-port-1.1.3" // { + (sources."pid-port-0.1.1" // { dependencies = [ - sources."cross-spawn-5.1.0" - sources."execa-0.9.0" - sources."get-stream-3.0.0" - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" + sources."cross-spawn-7.0.3" + sources."execa-5.1.1" + sources."get-stream-6.0.1" + sources."is-stream-2.0.1" + sources."npm-run-path-4.0.1" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" ]; }) sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pirates-4.0.4" - sources."pkg-dir-3.0.0" + sources."pirates-4.0.5" + sources."pkg-dir-5.0.0" (sources."portfinder-1.0.28" // { dependencies = [ sources."debug-3.2.7" @@ -75719,58 +78595,45 @@ in }) sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" - sources."prismjs-1.26.0" + sources."prismjs-1.27.0" sources."private-0.1.8" - sources."process-exists-3.1.0" + (sources."process-exists-4.1.0" // { + dependencies = [ + sources."ps-list-6.3.0" + ]; + }) sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."proxy-addr-2.0.7" - sources."ps-list-4.1.0" - sources."pseudomap-1.0.2" - sources."psl-1.8.0" + sources."ps-list-7.2.0" sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."qs-6.5.3" + sources."qs-6.9.7" sources."query-string-5.1.1" sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" sources."read-pkg-5.2.0" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."recast-0.18.10" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."readable-stream-3.6.0" + sources."recast-0.20.5" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-9.0.0" + sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" - (sources."regex-not-1.0.2" // { - dependencies = [ - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - ]; - }) - sources."regexpu-core-4.8.0" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.7.0" // { + sources."regex-not-1.0.2" + sources."regexpu-core-5.0.1" + sources."regjsgen-0.6.0" + (sources."regjsparser-0.8.4" // { dependencies = [ sources."jsesc-0.5.0" ]; }) sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" - sources."request-2.88.2" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."ret-0.1.15" sources."retry-0.13.1" sources."reusify-1.0.4" @@ -75778,14 +78641,17 @@ in sources."rss-parser-3.12.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-6.6.7" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."sec-1.0.0" - sources."seek-bzip-1.0.6" - sources."semver-6.3.0" + (sources."seek-bzip-1.0.6" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) + sources."semver-7.3.5" (sources."send-0.17.2" // { dependencies = [ (sources."debug-2.6.9" // { @@ -75797,7 +78663,11 @@ in ]; }) sources."serve-static-1.14.2" - sources."set-value-2.0.1" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shallow-clone-3.0.1" @@ -75807,12 +78677,13 @@ in sources."shellwords-0.1.1" sources."shortid-2.2.16" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ 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" @@ -75825,6 +78696,7 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" + sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -75839,27 +78711,16 @@ in }) sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.21" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."source-map-support-0.5.21" sources."source-map-url-0.4.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" - (sources."split-string-3.1.0" // { - dependencies = [ - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - ]; - }) - sources."split2-2.2.0" + sources."split-string-3.1.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -75884,34 +78745,32 @@ in sources."string-width-4.2.3" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."strip-ansi-6.0.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - ]; - }) + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.1" sources."strip-dirs-2.1.0" sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-outer-1.0.1" sources."subscriptions-transport-ws-0.9.19" - sources."supports-color-5.5.0" + sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-1.2.0" - sources."tar-stream-1.6.2" + (sources."tar-stream-1.6.2" // { + dependencies = [ + sources."bl-1.2.3" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) (sources."taskkill-3.1.0" // { dependencies = [ sources."cross-spawn-7.0.3" sources."execa-3.4.0" sources."get-stream-5.2.0" + sources."human-signals-1.1.1" sources."is-stream-2.0.1" - sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" - sources."onetime-5.1.2" sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" @@ -75919,19 +78778,12 @@ in sources."which-2.0.2" ]; }) - (sources."tasklist-3.1.1" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) (sources."temp-0.8.4" // { dependencies = [ sources."rimraf-2.6.3" ]; }) - sources."term-size-2.2.1" sources."through-2.3.8" - sources."through2-2.0.5" sources."timed-out-4.0.1" sources."tmp-0.0.33" sources."to-buffer-1.1.1" @@ -75941,24 +78793,21 @@ in sources."kind-of-3.2.2" ]; }) - (sources."to-regex-3.0.2" // { - dependencies = [ - sources."extend-shallow-3.0.2" - sources."is-extendable-1.0.1" - ]; - }) - sources."to-regex-range-2.1.1" + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."ts-invariant-0.4.4" - sources."tslib-1.14.1" + (sources."ts-invariant-0.4.4" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."tslib-2.3.1" sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" sources."type-fest-0.6.0" sources."type-is-1.6.18" - sources."typescript-4.1.6" + sources."typescript-4.5.5" sources."unbox-primitive-1.0.1" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-2.0.0" @@ -75966,7 +78815,7 @@ in sources."unicode-match-property-value-ecmascript-2.0.0" sources."unicode-property-aliases-ecmascript-2.0.0" sources."union-value-1.0.1" - sources."universalify-0.1.2" + sources."universalify-2.0.0" sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ @@ -75978,7 +78827,6 @@ in sources."has-values-0.1.4" ]; }) - sources."uri-js-4.4.1" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" @@ -75986,64 +78834,55 @@ in sources."util-deprecate-1.0.2" sources."util.promisify-1.1.1" sources."utils-merge-1.0.1" - sources."uuid-3.4.0" + sources."uuid-8.3.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" - sources."verror-1.10.0" sources."vue-2.6.14" (sources."vue-codemod-0.0.5" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.5" - sources."array-union-2.1.0" - sources."braces-3.0.2" - sources."dir-glob-3.0.1" - sources."fast-glob-3.2.11" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.2" - sources."globby-11.1.0" - sources."ignore-5.2.0" - sources."is-number-7.0.0" - sources."lru-cache-6.0.0" - sources."micromatch-4.0.4" - sources."path-type-4.0.0" - sources."source-map-0.6.1" - sources."to-regex-range-5.0.1" + sources."inquirer-7.3.3" + sources."rxjs-6.6.7" + sources."tslib-1.14.1" ]; }) - sources."watch-1.0.2" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."widest-line-3.1.0" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - sources."xss-1.0.10" + (sources."xss-1.0.11" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yaml-front-matter-3.4.1" // { + (sources."yaml-front-matter-4.1.1" // { dependencies = [ - sources."commander-1.0.0" + sources."argparse-1.0.10" + sources."commander-6.2.1" + sources."js-yaml-3.14.1" ]; }) sources."yargs-16.2.0" sources."yargs-parser-20.2.9" sources."yauzl-2.10.0" + sources."yocto-queue-0.1.0" sources."zen-observable-0.8.15" - sources."zen-observable-ts-0.8.21" + (sources."zen-observable-ts-0.8.21" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -76180,12 +79019,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.16.7" - sources."@babel/generator-7.16.8" + sources."@babel/generator-7.17.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.17.8" sources."@babel/template-7.16.7" - sources."@babel/types-7.16.8" + sources."@babel/types-7.17.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -76267,7 +79106,7 @@ in sources."@types/acorn-4.0.6" sources."@types/concat-stream-1.6.1" sources."@types/debug-4.1.7" - sources."@types/estree-0.0.50" + sources."@types/estree-0.0.51" sources."@types/estree-jsx-0.0.1" sources."@types/hast-2.3.4" sources."@types/is-empty-1.2.1" @@ -76276,7 +79115,7 @@ in sources."@types/minimist-1.2.2" sources."@types/ms-0.7.31" sources."@types/nlcst-1.0.0" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/normalize-package-data-2.4.1" sources."@types/parse5-6.0.3" sources."@types/supports-color-8.1.1" @@ -76305,7 +79144,7 @@ in sources."brace-expansion-1.1.11" sources."bubble-stream-error-1.0.0" sources."buffer-from-1.1.2" - sources."builtins-4.0.0" + sources."builtins-4.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -76314,7 +79153,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."camelcase-keys-7.0.1" + sources."camelcase-keys-7.0.2" sources."ccount-2.0.1" sources."chalk-2.4.2" sources."character-entities-2.0.1" @@ -76338,7 +79177,7 @@ in sources."core-util-is-1.0.3" sources."crypto-random-string-2.0.0" sources."cuss-2.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decamelize-5.0.1" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -76475,17 +79314,17 @@ in }) sources."mdast-util-from-markdown-1.2.0" sources."mdast-util-frontmatter-1.0.0" - sources."mdast-util-gfm-2.0.0" + sources."mdast-util-gfm-2.0.1" sources."mdast-util-gfm-autolink-literal-1.0.2" - sources."mdast-util-gfm-footnote-1.0.0" - sources."mdast-util-gfm-strikethrough-1.0.0" - sources."mdast-util-gfm-table-1.0.2" - sources."mdast-util-gfm-task-list-item-1.0.0" + sources."mdast-util-gfm-footnote-1.0.1" + sources."mdast-util-gfm-strikethrough-1.0.1" + sources."mdast-util-gfm-table-1.0.4" + sources."mdast-util-gfm-task-list-item-1.0.1" sources."mdast-util-mdx-1.1.0" - sources."mdast-util-mdx-expression-1.1.1" + sources."mdast-util-mdx-expression-1.2.0" sources."mdast-util-mdx-jsx-1.2.0" - sources."mdast-util-mdxjs-esm-1.1.1" - sources."mdast-util-to-markdown-1.2.6" + sources."mdast-util-mdxjs-esm-1.2.0" + sources."mdast-util-to-markdown-1.3.0" sources."mdast-util-to-nlcst-5.2.1" sources."mdast-util-to-string-3.1.0" sources."meow-10.1.2" @@ -76494,19 +79333,19 @@ in sources."micromark-extension-frontmatter-1.0.0" sources."micromark-extension-gfm-2.0.1" sources."micromark-extension-gfm-autolink-literal-1.0.3" - sources."micromark-extension-gfm-footnote-1.0.3" + sources."micromark-extension-gfm-footnote-1.0.4" sources."micromark-extension-gfm-strikethrough-1.0.4" sources."micromark-extension-gfm-table-1.0.5" sources."micromark-extension-gfm-tagfilter-1.0.1" sources."micromark-extension-gfm-task-list-item-1.0.3" sources."micromark-extension-mdx-expression-1.0.3" - sources."micromark-extension-mdx-jsx-1.0.2" + sources."micromark-extension-mdx-jsx-1.0.3" sources."micromark-extension-mdx-md-1.0.0" sources."micromark-extension-mdxjs-1.0.0" sources."micromark-extension-mdxjs-esm-1.0.2" sources."micromark-factory-destination-1.0.0" sources."micromark-factory-label-1.0.2" - sources."micromark-factory-mdx-expression-1.0.5" + sources."micromark-factory-mdx-expression-1.0.6" sources."micromark-factory-space-1.0.0" sources."micromark-factory-title-1.0.2" sources."micromark-factory-whitespace-1.0.0" @@ -76517,7 +79356,11 @@ in sources."micromark-util-decode-numeric-character-reference-1.0.0" sources."micromark-util-decode-string-1.0.2" sources."micromark-util-encode-1.0.1" - sources."micromark-util-events-to-acorn-1.0.4" + (sources."micromark-util-events-to-acorn-1.0.4" // { + dependencies = [ + sources."@types/estree-0.0.50" + ]; + }) sources."micromark-util-html-tag-name-1.0.0" sources."micromark-util-normalize-identifier-1.0.0" sources."micromark-util-resolve-all-1.0.0" @@ -76527,8 +79370,8 @@ in sources."micromark-util-types-1.0.2" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minimist-options-4.1.0" sources."mri-1.2.0" sources."ms-2.1.2" @@ -76581,7 +79424,7 @@ in sources."redent-4.0.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."rehype-parse-8.0.3" + sources."rehype-parse-8.0.4" sources."rehype-retext-3.0.2" sources."remark-frontmatter-4.0.1" sources."remark-gfm-3.0.1" @@ -76601,7 +79444,7 @@ in sources."semver-6.3.0" ]; }) - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sliced-1.0.1" sources."space-separated-tokens-2.0.1" (sources."spawn-to-readstream-0.1.3" // { @@ -76639,12 +79482,12 @@ in sources."to-readable-stream-1.0.0" sources."to-vfile-7.2.3" sources."trim-newlines-4.0.2" - sources."trough-2.0.2" + sources."trough-2.1.0" sources."type-fest-1.4.0" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unherit-3.0.0" - (sources."unified-10.1.1" // { + (sources."unified-10.1.2" // { dependencies = [ sources."is-plain-obj-4.0.0" ]; @@ -76666,10 +79509,10 @@ in sources."unist-util-inspect-7.0.0" sources."unist-util-is-5.1.1" sources."unist-util-modify-children-2.0.0" - sources."unist-util-position-4.0.1" + sources."unist-util-position-4.0.2" sources."unist-util-position-from-estree-1.1.1" sources."unist-util-remove-position-4.0.1" - sources."unist-util-stringify-position-3.0.0" + sources."unist-util-stringify-position-3.0.2" (sources."unist-util-visit-4.1.0" // { dependencies = [ sources."unist-util-visit-parents-5.1.0" @@ -76691,15 +79534,15 @@ in sources."util-deprecate-1.0.2" sources."uvu-0.5.3" sources."validate-npm-package-license-3.0.4" - sources."vfile-5.3.0" + sources."vfile-5.3.2" sources."vfile-find-up-6.0.0" sources."vfile-location-4.0.1" - sources."vfile-message-3.1.0" - (sources."vfile-reporter-7.0.3" // { + sources."vfile-message-3.1.2" + (sources."vfile-reporter-7.0.4" // { dependencies = [ sources."ansi-regex-6.0.1" sources."emoji-regex-9.2.2" - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."strip-ansi-7.0.1" sources."supports-color-9.2.1" ]; @@ -76743,44 +79586,44 @@ in sha512 = "6Avt9pRA194Z/yN4hb7/6ZRhMtWLydsje2uP82b1VVFSBWwDlkswLTDFD0ngSEHlBSNR+bFnyOAGh+mpHQNYOQ=="; }; dependencies = [ + sources."@ampproject/remapping-2.1.2" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.10" // { + sources."@babel/compat-data-7.17.7" + sources."@babel/core-7.17.8" + (sources."@babel/generator-7.17.7" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.16.8" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."@babel/helper-compilation-targets-7.16.7" + sources."@babel/helper-compilation-targets-7.17.7" sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-function-name-7.16.7" sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" - sources."@babel/helper-simple-access-7.16.7" + sources."@babel/helper-module-transforms-7.17.7" + sources."@babel/helper-simple-access-7.17.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.8" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.17.8" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" - sources."@xmldom/xmldom-0.8.0" + sources."@babel/traverse-7.17.3" + sources."@babel/types-7.17.0" + sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/sourcemap-codec-1.4.11" + sources."@jridgewell/trace-mapping-0.3.4" + sources."@xmldom/xmldom-0.8.1" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" sources."async-3.2.3" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.19.1" - sources."caniuse-lite-1.0.30001301" + sources."browserslist-4.20.2" + sources."caniuse-lite-1.0.30001320" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -76788,9 +79631,9 @@ in sources."commander-8.3.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.96" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -76820,23 +79663,28 @@ in sources."is-core-module-2.8.1" sources."is-windows-1.0.2" sources."isexe-2.0.0" - (sources."jake-10.8.2" // { + (sources."jake-10.8.4" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."async-0.9.2" + 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."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."jsonfile-4.0.0" sources."jsonlint-1.6.3" sources."lodash-4.17.21" sources."matcher-collection-1.1.2" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -76848,7 +79696,7 @@ in sources."path-parse-1.0.7" sources."picocolors-1.0.0" sources."pkginfo-0.4.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."safe-buffer-5.1.2" sources."sax-0.5.8" sources."semver-6.3.0" @@ -76883,7 +79731,7 @@ in sha512 = "lqPoPSftBQyiIPFL2GNxvbHZrHTIL+iw9xhqwemUxB3ftcQRfpuWPE95MC1NSSFJ+dEAqtAkwh8tdNidK95yyQ=="; }; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -76897,7 +79745,7 @@ in sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."bluebird-3.7.2" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."cache-content-type-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -76911,12 +79759,12 @@ in sources."cookies-0.8.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."deep-equal-1.0.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-2.0.0" - sources."destroy-1.0.4" + sources."destroy-1.2.0" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" @@ -76937,7 +79785,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-assert-1.5.0" (sources."http-errors-1.8.1" // { @@ -76986,11 +79834,11 @@ in sources."lodash-4.17.21" sources."media-typer-0.3.0" sources."methods-1.1.2" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."ms-2.1.2" sources."mz-2.7.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" (sources."node-ssdp-3.3.0" // { dependencies = [ sources."debug-3.2.7" @@ -76998,7 +79846,7 @@ in }) sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."only-0.0.2" sources."parseurl-1.3.3" sources."passthrough-counter-1.0.0" @@ -77039,7 +79887,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."uri-js-4.4.1" - sources."urijs-1.19.7" + sources."urijs-1.19.10" sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" @@ -77051,9 +79899,9 @@ in ]; }) sources."y18n-5.0.8" - sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" - sources."ylru-1.2.1" + sources."yargs-17.4.0" + sources."yargs-parser-21.0.1" + sources."ylru-1.3.2" ]; buildInputs = globalBuildInputs; meta = { @@ -77076,7 +79924,7 @@ in dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -77086,7 +79934,7 @@ in sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" @@ -77121,9 +79969,9 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isstream-0.1.2" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."once-1.4.0" (sources."optimist-0.6.1" // { dependencies = [ @@ -77154,18 +80002,18 @@ in autoprefixer = nodeEnv.buildNodePackage { name = "autoprefixer"; packageName = "autoprefixer"; - version = "10.4.2"; + version = "10.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.2.tgz"; - sha512 = "9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.4.tgz"; + sha512 = "Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA=="; }; dependencies = [ - sources."browserslist-4.19.1" - sources."caniuse-lite-1.0.30001301" - sources."electron-to-chromium-1.4.51" + sources."browserslist-4.20.2" + sources."caniuse-lite-1.0.30001320" + sources."electron-to-chromium-1.4.96" sources."escalade-3.1.1" - sources."fraction.js-4.1.2" - sources."node-releases-2.0.1" + sources."fraction.js-4.2.0" + sources."node-releases-2.0.2" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" sources."postcss-value-parser-4.2.0" @@ -77190,14 +80038,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1062.0" // { + (sources."aws-sdk-2.1101.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -77214,7 +80062,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-4.9.2" sources."buffer-crc32-0.2.13" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.10" @@ -77232,15 +80080,15 @@ in sources."css-select-4.2.1" sources."css-what-5.1.0" sources."data-uri-to-buffer-3.0.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."deep-is-0.1.4" sources."defaults-1.0.3" sources."degenerator-2.2.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."devtools-protocol-0.0.901419" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" @@ -77274,7 +80122,7 @@ in sources."graceful-fs-4.2.9" sources."has-flag-4.0.0" sources."htmlparser2-6.1.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -77282,7 +80130,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.2.0" + sources."inquirer-8.2.2" sources."ip-1.1.5" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -77296,8 +80144,8 @@ in sources."log-symbols-4.1.0" sources."lru-cache-5.1.1" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" @@ -77332,29 +80180,29 @@ in ]; }) sources."querystring-0.2.0" - sources."raw-body-2.4.2" + sources."raw-body-2.5.1" sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."rxjs-7.5.2" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."setprototypeof-1.2.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" (sources."tar-fs-2.0.0" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" ]; }) sources."tar-stream-2.2.0" @@ -77421,8 +80269,8 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/eslint-7.29.0" - sources."@types/estree-0.0.50" - sources."@types/json-schema-7.0.9" + sources."@types/estree-0.0.51" + sources."@types/json-schema-7.0.11" sources."@types/mdast-3.0.10" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" @@ -77472,7 +80320,7 @@ in sources."concat-map-0.0.1" sources."cross-spawn-6.0.5" sources."crypto-random-string-2.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -77576,11 +80424,11 @@ in sources."meow-9.0.0" sources."merge2-1.4.1" sources."micromark-2.11.4" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" (sources."minimist-options-4.1.0" // { dependencies = [ sources."arrify-1.0.1" @@ -77696,7 +80544,7 @@ in sources."remark-parse-9.0.0" sources."remark-stringify-9.0.1" sources."repeat-string-1.6.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" @@ -77707,7 +80555,7 @@ in sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."sliced-1.0.1" sources."spdx-correct-3.1.1" @@ -77815,13 +80663,13 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "11.32.0"; + version = "11.61.3"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.32.0.tgz"; - sha512 = "W6s76ux/BsMQ619z5z/CnR/bGMb9Jx6rYH/tFURH4Eth9oBcwJW8xIarJB8R+Z8U4zTWN00wUVjs/JAuFGVLNw=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-11.61.3.tgz"; + sha512 = "+ORg7HujAcHBRnOycZsbkVaNESplxHqYUxbtfZ1jSqNRoIf/mjQhpzTa4L5huBk7C+nFnx/rbfJn+xFIeL7ebA=="; }; dependencies = [ - (sources."@alexbosworth/caporal-1.4.0" // { + (sources."@alexbosworth/caporal-1.4.1" // { dependencies = [ sources."colorette-1.4.0" ]; @@ -77830,7 +80678,7 @@ in sources."@alexbosworth/fiat-1.0.1" sources."@alexbosworth/html2unicode-1.1.5" sources."@alexbosworth/node-fetch-2.6.2" - (sources."@alexbosworth/prettyjson-1.2.1" // { + (sources."@alexbosworth/prettyjson-1.2.2" // { dependencies = [ sources."colors-1.1.2" ]; @@ -77842,9 +80690,9 @@ in sources."string_decoder-1.3.0" ]; }) - sources."@grammyjs/types-2.5.1" - sources."@grpc/grpc-js-1.4.5" - sources."@grpc/proto-loader-0.6.7" + sources."@grammyjs/types-2.6.0" + sources."@grpc/grpc-js-1.5.7" + sources."@grpc/proto-loader-0.6.9" sources."@handsontable/formulajs-2.0.2" sources."@mitmaro/errors-1.0.0" sources."@mitmaro/http-authorization-header-1.0.0" @@ -77867,16 +80715,22 @@ in sources."@types/express-serve-static-core-4.17.28" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/request-2.48.7" sources."@types/serve-static-1.13.10" sources."@types/tough-cookie-4.0.1" - sources."@types/ws-8.2.2" + sources."@types/ws-8.2.0" sources."abort-controller-3.0.0" - sources."accepts-1.3.7" - sources."ajv-8.9.0" + sources."accepts-1.3.8" + (sources."agent-base-6.0.2" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + ]; + }) + sources."ajv-8.11.0" sources."ansi-0.3.1" sources."ansi-align-3.0.1" sources."ansi-escapes-1.4.0" @@ -77915,11 +80769,11 @@ in }) sources."bluebird-3.7.2" sources."bn.js-5.2.0" - sources."body-parser-1.19.1" + sources."body-parser-1.19.2" sources."bolt01-1.2.3" sources."bolt03-1.2.13" sources."bolt07-1.8.0" - sources."bolt09-0.2.0" + sources."bolt09-0.2.1" (sources."boxen-5.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -77933,7 +80787,8 @@ in sources."bs58check-2.1.2" sources."buffer-5.7.1" sources."buffer-from-1.1.2" - sources."bytes-3.1.1" + sources."bytes-3.1.2" + sources."cacheable-lookup-6.0.4" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -78035,24 +80890,12 @@ in sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" sources."global-dirs-3.0.0" - (sources."goldengate-11.0.0" // { - dependencies = [ - sources."async-3.2.2" - sources."asyncjs-util-1.2.7" - sources."bolt07-1.7.4" - (sources."invoices-2.0.2" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.0" - ]; - }) - sources."ln-service-53.2.0" - ]; - }) + sources."goldengate-11.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.9" - (sources."grammy-1.6.2" // { + (sources."grammy-1.7.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -78081,7 +80924,7 @@ in sources."imurmurhash-0.1.4" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-8.2.0" // { + (sources."inquirer-8.2.2" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" @@ -78095,15 +80938,15 @@ in sources."restore-cursor-3.1.0" sources."supports-color-7.2.0" sources."tmp-0.0.33" - sources."type-fest-0.21.3" ]; }) - (sources."invoices-2.0.3" // { + (sources."invoices-2.0.4" // { dependencies = [ - sources."bolt09-0.2.1" - sources."secp256k1-4.0.3" + sources."tiny-secp256k1-2.2.0" + sources."uint8array-tools-0.0.6" ]; }) + sources."ip-1.1.5" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" @@ -78134,25 +80977,43 @@ in sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" - (sources."lightning-5.2.1" // { + (sources."lightning-4.14.3" // { dependencies = [ sources."@grpc/grpc-js-1.4.4" - sources."@types/node-16.11.12" + sources."@grpc/proto-loader-0.6.6" + sources."@types/node-16.11.7" sources."async-3.2.2" sources."asyncjs-util-1.2.7" + sources."bech32-1.1.4" + sources."bitcoinjs-lib-6.0.0" sources."body-parser-1.19.0" sources."bolt07-1.7.4" + sources."bolt09-0.2.0" sources."bytes-3.1.0" sources."http-errors-1.7.2" sources."inherits-2.0.3" - (sources."invoices-2.0.2" // { + (sources."invoices-2.0.1" // { dependencies = [ - sources."bitcoinjs-lib-6.0.0" + (sources."bitcoinjs-lib-5.2.0" // { + dependencies = [ + sources."bech32-1.1.4" + ]; + }) + ]; + }) + (sources."psbt-1.1.10" // { + dependencies = [ + sources."bitcoinjs-lib-5.2.0" ]; }) sources."qs-6.7.0" sources."raw-body-2.4.0" sources."setprototypeof-1.1.1" + (sources."tiny-secp256k1-1.1.6" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) sources."toidentifier-1.0.0" ]; }) @@ -78160,10 +81021,9 @@ in dependencies = [ sources."@grpc/grpc-js-1.4.4" sources."@grpc/proto-loader-0.6.6" - sources."@types/node-16.11.7" - sources."@types/ws-8.2.0" sources."async-3.2.2" sources."asyncjs-util-1.2.7" + sources."bech32-1.1.4" sources."bitcoinjs-lib-6.0.0" sources."bn.js-4.12.0" sources."body-parser-1.19.0" @@ -78172,6 +81032,7 @@ in sources."bn.js-5.2.0" ]; }) + sources."bolt09-0.2.0" sources."bytes-3.1.0" sources."ecpair-1.0.1" sources."goldengate-10.4.2" @@ -78179,89 +81040,46 @@ in sources."inherits-2.0.3" (sources."invoices-2.0.2" // { dependencies = [ + sources."bech32-2.0.0" sources."bn.js-5.2.0" ]; }) - (sources."lightning-4.14.3" // { - dependencies = [ - sources."bn.js-5.2.0" - (sources."invoices-2.0.1" // { - dependencies = [ - (sources."bitcoinjs-lib-5.2.0" // { - dependencies = [ - sources."bech32-1.1.4" - ]; - }) - ]; - }) - ]; - }) sources."ln-service-52.16.0" + (sources."psbt-1.1.10" // { + dependencies = [ + sources."bitcoinjs-lib-5.2.0" + sources."bn.js-5.2.0" + ]; + }) sources."qs-6.7.0" sources."raw-body-2.4.0" sources."setprototypeof-1.1.1" sources."tiny-secp256k1-1.1.6" sources."toidentifier-1.0.0" - sources."ws-8.2.3" ]; }) - (sources."ln-service-53.5.1" // { + (sources."ln-service-53.9.3" // { dependencies = [ - sources."@grpc/grpc-js-1.5.3" - sources."@grpc/proto-loader-0.6.9" + sources."@types/node-17.0.21" sources."@types/request-2.48.8" - sources."bolt09-0.2.1" + sources."@types/ws-8.5.2" + sources."bolt09-0.2.2" sources."content-disposition-0.5.4" - sources."cookie-0.4.1" - sources."express-4.17.2" - sources."lightning-5.3.4" + sources."cookie-0.4.2" + sources."express-4.17.3" + sources."lightning-5.8.2" sources."ms-2.1.3" sources."safe-buffer-5.2.1" sources."send-0.17.2" sources."serve-static-1.14.2" - sources."type-fest-2.10.0" - sources."ws-8.4.2" + sources."type-fest-2.12.0" + sources."ws-8.5.0" ]; }) - (sources."ln-sync-3.7.0" // { + sources."ln-sync-3.11.0" + (sources."ln-telegram-3.20.0" // { dependencies = [ - sources."@grpc/grpc-js-1.5.1" - sources."@grpc/proto-loader-0.6.9" - sources."@types/node-17.0.8" - sources."@types/request-2.48.8" - sources."bolt09-0.2.1" - sources."content-disposition-0.5.4" - sources."cookie-0.4.1" - sources."express-4.17.2" - sources."lightning-5.3.3" - sources."ln-service-53.5.0" - sources."ms-2.1.3" - sources."safe-buffer-5.2.1" - sources."send-0.17.2" - sources."serve-static-1.14.2" - sources."type-fest-2.9.0" - sources."ws-8.4.2" - ]; - }) - (sources."ln-telegram-3.8.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.5.1" - sources."@grpc/proto-loader-0.6.9" - sources."@types/node-17.0.8" - sources."@types/request-2.48.8" - sources."bolt09-0.2.1" - sources."content-disposition-0.5.4" - sources."cookie-0.4.1" - sources."express-4.17.2" - sources."lightning-5.3.3" - sources."ln-service-53.5.0" - sources."ms-2.1.3" - sources."paid-services-3.10.0" - sources."safe-buffer-5.2.1" - sources."send-0.17.2" - sources."serve-static-1.14.2" - sources."type-fest-2.9.0" - sources."ws-8.4.2" + sources."paid-services-3.14.2" ]; }) sources."lodash-4.17.21" @@ -78283,7 +81101,7 @@ in sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."luxon-2.3.0" + sources."luxon-2.3.1" sources."macaroon-3.0.4" (sources."make-dir-3.1.0" // { dependencies = [ @@ -78297,14 +81115,14 @@ in sources."methods-1.1.2" sources."micromist-1.1.0" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."moment-2.29.1" (sources."morgan-1.10.0" // { dependencies = [ @@ -78314,7 +81132,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.6" sources."nan-2.15.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-addon-api-2.0.2" sources."node-fetch-2.6.7" sources."node-gyp-build-4.3.0" @@ -78340,74 +81158,58 @@ in sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" + sources."p2tr-1.3.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."paid-services-3.11.0" + sources."paid-services-3.14.4" sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prepend-http-2.0.0" - (sources."probing-2.0.2" // { + (sources."probing-2.0.3" // { dependencies = [ - sources."@grpc/grpc-js-1.5.0" - sources."@grpc/proto-loader-0.6.9" - sources."@types/node-17.0.8" + sources."@grpc/grpc-js-1.5.4" + sources."@types/node-17.0.15" sources."@types/request-2.48.8" - sources."bitcoinjs-lib-6.0.0" + sources."@types/ws-8.2.2" + sources."body-parser-1.19.1" + sources."bytes-3.1.1" sources."content-disposition-0.5.4" sources."cookie-0.4.1" sources."express-4.17.2" - (sources."invoices-2.0.2" // { - dependencies = [ - sources."bolt07-1.7.4" - ]; - }) - (sources."lightning-5.3.1" // { - dependencies = [ - (sources."asyncjs-util-1.2.7" // { - dependencies = [ - sources."async-3.2.2" - ]; - }) - sources."bitcoinjs-lib-6.0.1" - ]; - }) - sources."ln-service-53.4.0" + sources."invoices-2.0.3" + sources."lightning-5.6.2" + sources."ln-service-53.7.3" sources."ms-2.1.3" + sources."qs-6.9.6" + sources."raw-body-2.4.2" sources."safe-buffer-5.2.1" + sources."secp256k1-4.0.3" sources."send-0.17.2" sources."serve-static-1.14.2" - sources."type-fest-2.9.0" - sources."ws-8.4.0" + sources."tiny-secp256k1-2.2.0" + sources."type-fest-2.11.1" + sources."uint8array-tools-0.0.6" + sources."ws-8.4.2" ]; }) sources."process-nextick-args-2.0.1" sources."protobufjs-6.11.2" sources."proxy-addr-2.0.7" - (sources."psbt-1.1.10" // { - dependencies = [ - sources."bech32-1.1.4" - sources."bitcoinjs-lib-5.2.0" - (sources."tiny-secp256k1-1.1.6" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - ]; - }) + sources."psbt-2.0.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" sources."pushdata-bitcoin-1.0.1" sources."qrcode-terminal-0.12.0" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" @@ -78423,7 +81225,7 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-7.5.2" + sources."rxjs-7.5.5" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sanitize-filename-1.6.3" @@ -78445,13 +81247,21 @@ in sources."serve-static-1.14.1" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sjcl-1.0.8" (sources."slice-ansi-4.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" ]; }) + sources."smart-buffer-4.2.0" + sources."socks-2.6.2" + (sources."socks-proxy-agent-6.2.0-beta.0" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + ]; + }) sources."spawn-sync-1.0.15" sources."stack-trace-0.0.10" sources."statuses-1.5.0" @@ -78472,7 +81282,7 @@ in }) sources."through-2.3.8" sources."tiny-emitter-2.1.0" - sources."tiny-secp256k1-2.1.2" + sources."tiny-secp256k1-2.2.1" sources."tmp-0.0.29" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.1" @@ -78481,12 +81291,12 @@ in sources."tslib-2.3.1" sources."tweetnacl-1.0.3" sources."tweetnacl-util-0.15.1" - sources."type-fest-2.8.0" + sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."typeforce-1.18.0" - sources."uint8array-tools-0.0.6" + sources."uint8array-tools-0.0.7" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-5.1.0" // { @@ -78523,7 +81333,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-8.3.0" + sources."ws-8.2.3" sources."xdg-basedir-4.0.0" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -78619,9 +81429,9 @@ in sources."levn-0.3.0" sources."lodash-4.17.21" sources."lodash.sortby-4.7.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -78651,13 +81461,13 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uri-js-4.4.1" - sources."urijs-1.19.7" + sources."urijs-1.19.10" sources."uuid-3.4.0" sources."verror-1.10.0" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."w3c-hr-time-1.0.2" sources."web-tree-sitter-0.19.4" @@ -78713,7 +81523,7 @@ in sources."commander-6.2.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.3" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."delegates-1.0.0" @@ -78721,14 +81531,14 @@ in sources."doctoc-2.1.0" (sources."dom-serializer-1.3.2" // { dependencies = [ - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" ]; }) sources."domelementtype-2.2.0" sources."domhandler-3.3.0" (sources."domutils-2.8.0" // { dependencies = [ - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" ]; }) sources."emoji-regex-6.1.3" @@ -78758,7 +81568,7 @@ in sources."isarray-1.0.0" sources."markdown-escapes-1.0.4" sources."mimic-response-2.1.0" - sources."minimist-1.2.5" + sources."minimist-1.2.6" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."nan-2.15.0" @@ -78783,9 +81593,9 @@ in sources."safe-buffer-5.1.2" sources."semver-5.7.1" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" + sources."simple-get-3.1.1" sources."state-toggle-1.0.3" sources."string-width-1.0.2" sources."string_decoder-1.1.1" @@ -78823,11 +81633,11 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."web-tree-sitter-0.17.1" - sources."which-pm-runs-1.0.0" + sources."which-pm-runs-1.1.0" sources."wide-align-1.1.5" sources."wrappy-1.0.2" sources."x-is-string-0.1.0" @@ -78846,10 +81656,10 @@ in bower = nodeEnv.buildNodePackage { name = "bower"; packageName = "bower"; - version = "1.8.13"; + version = "1.8.14"; src = fetchurl { - url = "https://registry.npmjs.org/bower/-/bower-1.8.13.tgz"; - sha512 = "8eWko16JlCTdaZZG70kddHPed17pHEbH8/IjfP4IFkQsfEqRsyNM09Dc8cDBFkSvtQ/2lTea7A+bMhRggG2a+Q=="; + url = "https://registry.npmjs.org/bower/-/bower-1.8.14.tgz"; + sha512 = "8Rq058FD91q9Nwthyhw0la9fzpBz0iwZTrt51LWl+w+PnJgZk9J+5wp3nibsJcIUPglMYXr4NRBaR+TUj0OkBQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -78873,7 +81683,7 @@ in sources."argparse-1.0.4" sources."array-find-index-1.0.2" sources."balanced-match-1.0.2" - sources."bower-1.8.13" + sources."bower-1.8.14" sources."bower-endpoint-parser-0.2.1" sources."bower-json-0.6.0" sources."bower-logger-0.2.1" @@ -78930,10 +81740,10 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.51.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."mime-db-1.52.0" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."natives-1.1.6" sources."normalize-package-data-2.5.0" @@ -78958,14 +81768,14 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.2.0" ]; }) sources."semver-5.7.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."spdx-correct-3.1.1" @@ -79091,7 +81901,7 @@ in sources."glob-7.2.0" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ @@ -79136,8 +81946,8 @@ in }) sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" sources."object-assign-4.1.1" @@ -79173,7 +81983,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -79235,36 +82045,37 @@ in browser-sync = nodeEnv.buildNodePackage { name = "browser-sync"; packageName = "browser-sync"; - version = "2.27.7"; + version = "2.27.9"; src = fetchurl { - url = "https://registry.npmjs.org/browser-sync/-/browser-sync-2.27.7.tgz"; - sha512 = "9ElnnA/u+s2Jd+IgY+2SImB+sAEIteHsMG0NR96m7Ph/wztpvJCUpyC2on1KqmG9iAp941j+5jfmd34tEguGbg=="; + url = "https://registry.npmjs.org/browser-sync/-/browser-sync-2.27.9.tgz"; + sha512 = "3zBtggcaZIeU9so4ja9yxk7/CZu9B3DOL6zkxFpzHCHsQmkGBPVXg61jItbeoa+WXgNLnr1sYES/2yQwyEZ2+w=="; }; dependencies = [ - sources."accepts-1.3.7" - sources."after-0.8.2" + sources."@socket.io/base64-arraybuffer-1.0.2" + sources."@socket.io/component-emitter-3.0.0" + sources."@types/component-emitter-1.2.11" + sources."@types/cookie-0.4.1" + sources."@types/cors-2.8.12" + sources."@types/node-17.0.23" + sources."accepts-1.3.8" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."anymatch-3.1.2" - sources."arraybuffer.slice-0.0.7" sources."async-1.5.2" sources."async-each-series-0.1.1" sources."axios-0.21.4" sources."backo2-1.0.2" sources."balanced-match-1.0.2" - sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" sources."batch-0.6.1" sources."binary-extensions-2.2.0" - sources."blob-0.0.5" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browser-sync-client-2.27.7" - sources."browser-sync-ui-2.27.7" + sources."browser-sync-client-2.27.9" + sources."browser-sync-ui-2.27.9" sources."bs-recipes-1.3.4" sources."bs-snippet-injector-2.0.1" - sources."bytes-3.1.1" - sources."camelcase-5.3.1" + sources."bytes-3.1.2" sources."chalk-1.1.3" sources."chokidar-3.5.3" (sources."cliui-7.0.4" // { @@ -79276,20 +82087,19 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-2.20.3" - sources."component-bind-1.0.0" sources."component-emitter-1.3.0" - sources."component-inherit-0.0.3" sources."concat-map-0.0.1" (sources."connect-3.6.6" // { dependencies = [ sources."debug-2.6.9" + sources."ms-2.0.0" ]; }) sources."connect-history-api-fallback-1.6.0" - sources."cookie-0.4.1" - sources."debug-3.1.0" - sources."decamelize-1.2.0" - sources."depd-1.1.2" + sources."cookie-0.4.2" + sources."cors-2.8.5" + sources."debug-4.3.4" + sources."depd-2.0.0" sources."destroy-1.0.4" sources."dev-ip-1.0.1" sources."dlv-1.1.3" @@ -79298,14 +82108,9 @@ in sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - (sources."engine.io-3.5.0" // { - dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.3" - ]; - }) - sources."engine.io-client-3.5.2" - sources."engine.io-parser-2.2.1" + sources."engine.io-6.1.3" + sources."engine.io-client-6.1.1" + sources."engine.io-parser-5.0.3" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -79315,10 +82120,10 @@ in (sources."finalhandler-1.1.0" // { dependencies = [ sources."debug-2.6.9" + sources."ms-2.0.0" ]; }) - sources."find-up-4.1.0" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."fresh-0.5.2" sources."fs-extra-3.0.1" sources."fsevents-2.3.2" @@ -79326,17 +82131,15 @@ in sources."glob-parent-5.1.2" sources."graceful-fs-4.2.9" sources."has-ansi-2.0.0" - sources."has-binary2-1.0.3" sources."has-cors-1.1.0" - (sources."http-errors-1.8.1" // { + (sources."http-errors-2.0.0" // { dependencies = [ - sources."statuses-1.5.0" + sources."statuses-2.0.1" ]; }) sources."http-proxy-1.18.1" sources."iconv-lite-0.4.24" sources."immutable-3.8.2" - sources."indexof-0.0.1" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" @@ -79345,50 +82148,44 @@ in sources."is-number-7.0.0" sources."is-number-like-1.0.8" sources."is-wsl-1.1.0" - sources."isarray-2.0.1" sources."jsonfile-3.0.1" sources."limiter-1.1.5" (sources."localtunnel-2.0.2" // { dependencies = [ sources."debug-4.3.2" - sources."ms-2.1.2" sources."yargs-17.1.1" ]; }) - sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.isfinite-3.3.2" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."mime-1.4.1" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" sources."mitt-1.2.0" - sources."ms-2.0.0" - sources."negotiator-0.6.2" + sources."ms-2.1.2" + sources."negotiator-0.6.3" sources."normalize-path-3.0.0" + sources."object-assign-4.1.1" sources."on-finished-2.3.0" sources."openurl-1.1.1" sources."opn-5.3.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" sources."parseqs-0.0.6" sources."parseuri-0.0.6" sources."parseurl-1.3.3" - sources."path-exists-4.0.0" sources."picomatch-2.3.1" sources."portscanner-2.1.1" sources."qs-6.2.3" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.5.1" sources."readdirp-3.6.0" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" (sources."resp-modifier-6.0.2" // { dependencies = [ sources."debug-2.6.9" + sources."ms-2.0.0" ]; }) sources."rx-4.1.0" @@ -79397,8 +82194,10 @@ in (sources."send-0.16.2" // { dependencies = [ sources."debug-2.6.9" + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" + sources."ms-2.0.0" sources."setprototypeof-1.1.0" sources."statuses-1.4.0" ]; @@ -79406,27 +82205,25 @@ in (sources."serve-index-1.9.1" // { dependencies = [ sources."debug-2.6.9" + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" + sources."ms-2.0.0" sources."setprototypeof-1.1.0" sources."statuses-1.5.0" ]; }) sources."serve-static-1.13.2" sources."server-destroy-1.0.1" - sources."set-blocking-2.0.0" sources."setprototypeof-1.2.0" - (sources."socket.io-2.4.0" // { + (sources."socket.io-4.4.1" // { dependencies = [ - sources."component-emitter-1.2.1" - sources."debug-4.1.1" - sources."ms-2.1.3" - sources."socket.io-parser-3.4.1" + sources."socket.io-parser-4.0.4" ]; }) - sources."socket.io-adapter-1.1.2" - sources."socket.io-client-2.4.0" - sources."socket.io-parser-3.3.2" + sources."socket.io-adapter-2.3.3" + sources."socket.io-client-4.4.1" + sources."socket.io-parser-4.1.2" sources."statuses-1.3.1" sources."stream-throttle-0.1.3" (sources."string-width-4.2.3" // { @@ -79439,14 +82236,13 @@ in sources."supports-color-2.0.0" sources."symbol-observable-1.0.1" sources."tfunk-4.0.0" - sources."to-array-0.1.4" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."ua-parser-js-1.0.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."utils-merge-1.0.1" - sources."which-module-2.0.0" + sources."vary-1.1.2" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -79454,18 +82250,12 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."ws-7.4.6" - sources."xmlhttprequest-ssl-1.6.3" + sources."ws-8.2.3" + sources."xmlhttprequest-ssl-2.0.0" sources."y18n-5.0.8" - (sources."yargs-15.4.1" // { + (sources."yargs-17.4.0" // { dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."cliui-6.0.0" - sources."strip-ansi-6.0.1" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-parser-18.1.3" + sources."yargs-parser-21.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -79493,15 +82283,15 @@ in sources."@babel/code-frame-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/parser-7.17.8" + sources."@babel/types-7.17.0" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.2" sources."@types/node-10.12.18" sources."@types/normalize-package-data-2.4.1" sources."@uphold/request-logger-2.0.0" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."acorn-7.4.1" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -79537,7 +82327,7 @@ in }) sources."bluebird-3.7.2" sources."bn.js-4.12.0" - (sources."body-parser-1.19.1" // { + (sources."body-parser-1.19.2" // { dependencies = [ sources."debug-2.6.9" ]; @@ -79549,7 +82339,7 @@ in sources."bs58check-2.1.2" sources."btc-rpc-client-git://github.com/btc21/btc-rpc-client" sources."bunyan-1.8.15" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" @@ -79557,7 +82347,7 @@ in sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."charenc-0.0.2" - sources."chart.js-3.7.0" + sources."chart.js-3.7.1" sources."cipher-base-1.0.4" sources."cliui-6.0.0" sources."color-convert-1.9.3" @@ -79596,7 +82386,7 @@ in ]; }) sources."dashdash-1.14.1" - (sources."debug-4.3.3" // { + (sources."debug-4.3.4" // { dependencies = [ sources."ms-2.1.2" ]; @@ -79634,8 +82424,9 @@ in sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."event-loop-stats-1.4.1" - (sources."express-4.17.2" // { + (sources."express-4.17.3" // { dependencies = [ + sources."cookie-0.4.2" sources."debug-2.6.9" sources."safe-buffer-5.2.1" ]; @@ -79659,7 +82450,7 @@ in ]; }) sources."find-up-4.1.0" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.2.0" @@ -79674,7 +82465,7 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hash-base-3.1.0" // { dependencies = [ @@ -79739,15 +82530,15 @@ in sources."merkle-lib-2.0.10" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."min-indent-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minimist-options-4.1.0" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."moment-2.29.1" sources."moment-duration-format-2.3.2" (sources."morgan-1.10.0" // { @@ -79760,7 +82551,7 @@ in sources."mv-2.1.1" sources."nan-2.15.0" sources."ncp-2.0.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-package-data-3.0.3" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" @@ -79801,12 +82592,12 @@ in sources."punycode-2.1.1" sources."pushdata-bitcoin-1.0.1" sources."qrcode-1.5.0" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."quick-lru-4.0.1" sources."random-bytes-1.0.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" (sources."read-pkg-5.2.0" // { dependencies = [ sources."hosted-git-info-2.8.9" @@ -79833,7 +82624,7 @@ in }) sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."rimraf-2.4.5" sources."ripemd160-2.0.2" sources."rndm-1.2.0" @@ -79954,7 +82745,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -80001,7 +82792,7 @@ in sources."caseless-0.12.0" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" ]; }) sources."castv2-client-1.2.0" @@ -80016,7 +82807,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-8.3.0" + sources."commander-9.1.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -80049,6 +82840,7 @@ in }) sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" + sources."events-3.3.0" sources."exit-on-epipe-1.0.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -80066,7 +82858,7 @@ in sources."form-data-2.3.3" (sources."fs-chunk-store-1.7.0" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."thunky-1.1.0" ]; }) @@ -80135,11 +82927,11 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mkdirp-0.3.5" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" @@ -80196,7 +82988,7 @@ in sources."supports-color-0.2.0" ]; }) - sources."plist-3.0.4" + sources."plist-3.0.5" sources."process-nextick-args-2.0.1" sources."promiscuous-0.6.0" sources."protobufjs-6.11.2" @@ -80212,8 +83004,8 @@ in sources."query-string-1.0.1" sources."queue-microtask-1.2.3" sources."queue-tick-1.0.0" - sources."random-access-file-2.2.0" - sources."random-access-storage-1.4.2" + sources."random-access-file-2.2.1" + sources."random-access-storage-1.4.3" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" sources."range-parser-1.2.1" @@ -80241,7 +83033,7 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.88.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."rimraf-2.7.1" sources."router-0.6.2" sources."run-parallel-1.2.0" @@ -80252,9 +83044,9 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-5.7.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-2.8.1" + sources."simple-get-2.8.2" (sources."simple-peer-6.4.4" // { dependencies = [ sources."isarray-1.0.0" @@ -80380,7 +83172,7 @@ in sources."agent-base-4.3.0" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."any-observable-0.3.0" (sources."app-path-2.2.0" // { @@ -80421,7 +83213,7 @@ in sources."buffer-crc32-0.2.13" sources."buffer-equal-0.0.1" sources."buffer-from-1.1.2" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" @@ -80494,7 +83286,7 @@ in }) ]; }) - sources."depd-1.1.2" + sources."depd-2.0.0" sources."dir-glob-2.0.0" sources."dom-walk-0.1.2" sources."dot-prop-4.2.1" @@ -80583,7 +83375,7 @@ in ]; }) sources."hosted-git-info-2.8.9" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" (sources."https-proxy-agent-2.2.4" // { dependencies = [ sources."debug-3.2.7" @@ -80689,15 +83481,15 @@ in sources."mime-2.6.0" sources."mimic-fn-1.2.0" sources."min-document-2.19.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minimist-options-3.0.2" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."mute-stream-0.0.7" sources."nanoid-2.1.11" @@ -80735,7 +83527,7 @@ in sources."parse-bmfont-ascii-1.0.6" sources."parse-bmfont-binary-1.0.6" sources."parse-bmfont-xml-1.1.4" - sources."parse-headers-2.0.4" + sources."parse-headers-2.0.5" sources."parse-json-4.0.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -80751,7 +83543,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pixelmatch-4.0.2" - (sources."plist-3.0.4" // { + (sources."plist-3.0.5" // { dependencies = [ sources."xmlbuilder-9.0.7" ]; @@ -80766,13 +83558,13 @@ in sources."pseudomap-1.0.2" (sources."puppeteer-1.20.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."query-string-6.14.1" sources."quick-lru-1.1.0" - sources."raw-body-2.4.2" + sources."raw-body-2.5.1" sources."rc-1.2.8" sources."read-pkg-3.0.0" sources."read-pkg-up-3.0.0" @@ -80783,7 +83575,7 @@ in sources."registry-url-3.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" @@ -80804,7 +83596,7 @@ in sources."setprototypeof-1.2.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-1.0.0" sources."slice-ansi-0.0.4" (sources."snapdragon-0.8.2" // { @@ -80861,7 +83653,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."strict-uri-encode-2.0.0" (sources."string-width-2.1.1" // { dependencies = [ @@ -80871,7 +83663,7 @@ in sources."string_decoder-1.1.1" (sources."strip-ansi-5.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" ]; }) sources."strip-bom-3.0.0" @@ -80960,30 +83752,34 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.81"; + version = "1.0.134"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.81.tgz"; - sha512 = "w72Dih5ouCqHXDidmE4Ulu+rd+pJ2wlxJfSUiBajYkpIqLMIBxLj6/Fn8UVjnydDx8uhti2VjzaVURHsPqlDVw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.134.tgz"; + sha512 = "piVuRH84D5xsGeC7uOOGQNBR7JrhrDT+6g5GEM4EOZf1XjxeuH15YfRsI6+ukexwq85kseEoCWltcOvGZefYQQ=="; }; dependencies = [ - sources."@jsii/check-node-1.52.1" - sources."@jsii/spec-1.52.1" - sources."@types/node-12.20.42" - sources."@xmldom/xmldom-0.8.0" - sources."ajv-8.9.0" + sources."@jsii/check-node-1.55.1" + sources."@jsii/spec-1.55.1" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@types/node-12.20.47" + sources."@xmldom/xmldom-0.8.1" + sources."ajv-8.11.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" + sources."braces-3.0.2" sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-1.4.9" - sources."cdk8s-plus-22-1.0.0-beta.95" + sources."cdk8s-1.5.52" + sources."cdk8s-plus-22-1.0.0-beta.158" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.52.1" // { + (sources."codemaker-1.55.1" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -80992,9 +83788,9 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.196" - sources."date-format-4.0.3" - sources."debug-4.3.3" + sources."constructs-3.3.250" + sources."date-format-4.0.6" + sources."debug-4.3.4" sources."decamelize-5.0.1" sources."deep-equal-2.0.5" sources."define-properties-1.1.3" @@ -81009,8 +83805,11 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.11" + sources."fastq-1.13.0" + sources."fill-range-7.0.1" sources."find-up-4.1.0" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."foreach-2.0.5" (sources."fs-extra-8.1.0" // { dependencies = [ @@ -81022,11 +83821,12 @@ in sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" + sources."glob-parent-5.1.2" sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" sources."is-arguments-1.1.1" @@ -81034,9 +83834,12 @@ in sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-date-object-1.0.5" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.3" sources."is-map-2.0.2" sources."is-negative-zero-2.0.2" + sources."is-number-7.0.0" sources."is-number-object-1.0.6" sources."is-regex-1.1.4" sources."is-set-2.0.2" @@ -81048,46 +83851,48 @@ in sources."is-weakref-1.0.2" sources."is-weakset-2.0.2" sources."isarray-2.0.5" - (sources."jsii-1.52.1" // { + (sources."jsii-1.55.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.52.1" // { + (sources."jsii-pacmak-1.55.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.52.1" // { + (sources."jsii-reflect-1.55.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.52.1" // { + (sources."jsii-rosetta-1.55.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.453" // { + (sources."jsii-srcmak-0.1.512" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.113" + sources."json2jsii-0.2.172" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" - sources."log4js-6.4.0" + sources."log4js-6.4.4" sources."lower-case-2.0.2" sources."lru-cache-6.0.0" sources."mdurl-1.0.1" - sources."minimist-1.2.5" + sources."merge2-1.4.1" + sources."micromatch-4.0.5" + sources."minimist-1.2.6" sources."ms-2.1.2" sources."ncp-2.0.0" sources."no-case-3.0.4" @@ -81095,17 +83900,21 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.52.1" + sources."oo-ascii-tree-1.55.1" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" + sources."picomatch-2.3.1" sources."punycode-2.1.1" + sources."queue-microtask-1.2.3" sources."regexp.prototype.flags-1.4.1" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" + sources."reusify-1.0.4" sources."rfdc-1.3.0" + sources."run-parallel-1.2.0" sources."semver-7.3.5" (sources."semver-intersect-1.4.0" // { dependencies = [ @@ -81115,12 +83924,12 @@ in sources."set-blocking-2.0.0" sources."side-channel-1.0.4" sources."snake-case-3.0.4" - sources."sort-json-2.0.0" + sources."sort-json-2.0.1" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.179" - (sources."streamroller-3.0.2" // { + sources."sscaff-1.2.239" + (sources."streamroller-3.0.6" // { dependencies = [ - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" ]; }) sources."string-width-4.2.3" @@ -81129,6 +83938,7 @@ in sources."string.prototype.trimstart-1.0.4" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" + sources."to-regex-range-5.0.1" sources."tslib-2.3.1" sources."typescript-3.9.10" sources."unbox-primitive-1.0.1" @@ -81143,7 +83953,7 @@ in sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yaml-2.0.0-10" + sources."yaml-2.0.0-11" (sources."yargs-15.4.1" // { dependencies = [ sources."camelcase-5.3.1" @@ -81168,23 +83978,23 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.8.6"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.8.6.tgz"; - sha512 = "rUYylxYOSnZOVDON6ma/n12DGKz4jArtWkMeUseseRCh5Y8Q45Pi6gRETLMZzFYMxgDuJpt6az5NqAisue3Ryg=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.9.4.tgz"; + sha512 = "C7nL+AVA2ltmRhFdAb6yinXzjumRIAyaNi1p5QyZpythrg6+GThxZS/We+s8GIA000uIrPMvesuHCE+dGxkssw=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" - sources."@babel/generator-7.16.8" + sources."@babel/generator-7.17.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.17.8" sources."@babel/template-7.16.7" - sources."@babel/types-7.16.8" - sources."@cdktf/hcl2cdk-0.8.6" - sources."@cdktf/hcl2json-0.8.6" - sources."@cdktf/provider-generator-0.8.6" - (sources."@jsii/check-node-1.52.1" // { + sources."@babel/types-7.17.0" + sources."@cdktf/hcl2cdk-0.9.4" + sources."@cdktf/hcl2json-0.9.4" + sources."@cdktf/provider-generator-0.9.4" + (sources."@jsii/check-node-1.55.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -81194,10 +84004,13 @@ in sources."supports-color-7.2.0" ]; }) - sources."@jsii/spec-1.52.1" - sources."@types/node-17.0.10" - sources."@types/node-fetch-2.5.12" - sources."@xmldom/xmldom-0.8.0" + sources."@jsii/spec-1.55.1" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@types/node-17.0.23" + sources."@types/node-fetch-2.6.1" + sources."@xmldom/xmldom-0.8.1" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."asynckit-0.4.0" @@ -81205,10 +84018,11 @@ in sources."available-typed-arrays-1.0.5" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdktf-0.8.6" + sources."cdktf-0.9.4" sources."chalk-2.4.2" sources."cliui-6.0.0" sources."clone-2.1.2" @@ -81219,13 +84033,12 @@ in }) sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.0.41" - sources."date-format-4.0.3" - sources."debug-4.3.3" + sources."constructs-10.0.97" + sources."date-format-4.0.6" + sources."debug-4.3.4" sources."decamelize-1.2.0" sources."deep-equal-2.0.5" sources."define-properties-1.1.3" @@ -81240,8 +84053,11 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."events-3.3.0" + sources."fast-glob-3.2.11" + sources."fastq-1.13.0" + sources."fill-range-7.0.1" sources."find-up-4.1.0" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."foreach-2.0.5" sources."form-data-3.0.1" sources."fs-extra-8.1.0" @@ -81250,14 +84066,15 @@ in sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" + sources."glob-parent-5.1.2" sources."graceful-fs-4.2.9" - sources."graphology-0.20.0" - sources."graphology-types-0.19.5" + sources."graphology-0.24.1" + sources."graphology-types-0.21.2" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -81267,9 +84084,12 @@ in sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" sources."is-date-object-1.0.5" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.3" sources."is-map-2.0.2" sources."is-negative-zero-2.0.2" + sources."is-number-7.0.0" sources."is-number-object-1.0.6" sources."is-regex-1.1.4" sources."is-set-2.0.2" @@ -81277,21 +84097,24 @@ in sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typed-array-1.1.8" - sources."is-valid-domain-0.1.5" + sources."is-valid-domain-0.1.6" sources."is-weakmap-2.0.1" sources."is-weakref-1.0.2" sources."is-weakset-2.0.2" sources."isarray-2.0.5" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-1.52.1" // { + (sources."jsii-1.55.1" // { dependencies = [ sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."fs-extra-9.1.0" + sources."has-flag-4.0.0" sources."jsonfile-6.1.0" + sources."supports-color-7.2.0" sources."universalify-2.0.0" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" @@ -81299,11 +84122,11 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-pacmak-1.52.1" // { + (sources."jsii-pacmak-1.55.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" - sources."codemaker-1.52.1" + sources."codemaker-1.55.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."decamelize-5.0.1" @@ -81317,7 +84140,25 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.52.1" // { + (sources."jsii-reflect-1.55.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."cliui-7.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."fs-extra-9.1.0" + sources."has-flag-4.0.0" + sources."jsonfile-6.1.0" + sources."supports-color-7.2.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-1.55.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -81332,22 +84173,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-1.52.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."fs-extra-9.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-srcmak-0.1.453" // { + (sources."jsii-srcmak-0.1.512" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -81358,13 +84184,15 @@ in sources."jsonfile-4.0.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" - sources."log4js-6.4.0" + sources."log4js-6.4.4" sources."lru-cache-6.0.0" sources."mdurl-1.0.1" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."merge2-1.4.1" + sources."micromatch-4.0.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."ms-2.1.2" sources."ncp-2.0.0" sources."node-fetch-2.6.7" @@ -81372,21 +84200,25 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."obliterator-1.6.1" + sources."obliterator-2.0.2" sources."once-1.4.0" - sources."oo-ascii-tree-1.52.1" + sources."oo-ascii-tree-1.55.1" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."prettier-2.5.1" + sources."picomatch-2.3.1" + sources."prettier-2.6.1" sources."punycode-2.1.1" + sources."queue-microtask-1.2.3" sources."regexp.prototype.flags-1.4.1" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."reserved-words-0.1.2" + sources."reusify-1.0.4" sources."rfdc-1.3.0" + sources."run-parallel-1.2.0" sources."semver-7.3.5" (sources."semver-intersect-1.4.0" // { dependencies = [ @@ -81395,12 +84227,12 @@ in }) sources."set-blocking-2.0.0" sources."side-channel-1.0.4" - sources."sort-json-2.0.0" + sources."sort-json-2.0.1" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - (sources."streamroller-3.0.2" // { + (sources."streamroller-3.0.6" // { dependencies = [ - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."jsonfile-6.1.0" sources."universalify-2.0.0" ]; @@ -81412,6 +84244,7 @@ in sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" + sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."typescript-3.9.10" sources."unbox-primitive-1.0.1" @@ -81434,7 +84267,7 @@ in sources."xmlbuilder-15.1.1" sources."y18n-4.0.3" sources."yallist-4.0.0" - (sources."yargs-17.3.1" // { + (sources."yargs-17.4.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -81442,7 +84275,7 @@ in sources."color-name-1.1.4" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) (sources."yargs-parser-18.1.3" // { @@ -81465,10 +84298,10 @@ in clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; - version = "5.5.0"; + version = "5.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.5.0.tgz"; - sha512 = "Vr9t8o59YaPcRw/4hyJjEh4zU/BlOtlJJ8465El6QMYWbkf5nN1mhAljX6FIb0bfpkGlYNFKPCyTz7oFCHOblQ=="; + url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.5.2.tgz"; + sha512 = "4y5FD+ayRz7IWqZRCCMvFxNUhluc1Yv8mNPmrHbrm2NjKsv9uaQZedZKN4L+QMkTqANL1RfOwhpe22neDEgEMA=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -81477,7 +84310,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."chokidar-3.5.3" - sources."clean-css-5.2.2" + sources."clean-css-5.2.4" sources."commander-7.2.0" sources."concat-map-0.0.1" sources."fill-range-7.0.1" @@ -81491,7 +84324,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -81529,7 +84362,7 @@ in sources."arch-2.2.0" sources."arrify-1.0.1" sources."camelcase-6.3.0" - sources."camelcase-keys-7.0.1" + sources."camelcase-keys-7.0.2" sources."chalk-2.4.2" sources."clipboardy-3.0.0" sources."color-convert-1.9.3" @@ -81589,7 +84422,7 @@ in sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -81624,6 +84457,7 @@ in sha512 = "Vu0ZPruo16+CbH/kCEALHV3lQ4WnRoaqTb+HPy2fY9ywtdOxPCiT//3WSxv8YN5qFwMbI2Fu931mmU9sR/O0ZA=="; }; dependencies = [ + sources."@colors/colors-1.5.0" sources."ansi-styles-3.2.1" sources."async-0.9.2" sources."chalk-2.4.2" @@ -81631,10 +84465,10 @@ in sources."clubhouse-lib-0.10.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colors-1.4.0" + sources."colors-1.0.3" sources."commander-2.20.3" sources."cycle-1.0.3" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decode-uri-component-0.2.0" sources."encoding-0.1.13" sources."escape-string-regexp-1.0.5" @@ -81650,7 +84484,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."node-fetch-1.7.3" - sources."prompt-1.2.1" + sources."prompt-1.2.2" sources."punycode-2.1.1" sources."query-string-6.14.1" sources."read-1.0.7" @@ -81668,7 +84502,6 @@ in (sources."winston-2.4.5" // { dependencies = [ sources."async-1.0.0" - sources."colors-1.0.3" ]; }) ]; @@ -81685,10 +84518,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.19.0"; + version = "0.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.19.0.tgz"; - sha512 = "9y3FFXjLZeA93c/U8lEkbeidj6lo7AgkELsXlMlmDV/NiJPu8b/L+An2vwVXHxKODRCSGJYGjpJt283K1f6VJg=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.21.1.tgz"; + sha512 = "222VMJBKE4ReyznvWjgJv4lZFtCrkEnKfJk4cL20SH+74x95JP2N0ujNtUiggBhaWcxvOiQxRt467NuVI48Fxg=="; }; buildInputs = globalBuildInputs; meta = { @@ -81703,10 +84536,10 @@ in coc-cmake = nodeEnv.buildNodePackage { name = "coc-cmake"; packageName = "coc-cmake"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-cmake/-/coc-cmake-0.2.0.tgz"; - sha512 = "hRCKiKikjEIUNrfBeb0IdbL3vvlU4inXtSOntfJF2Uhwv2V/KorK0KxdGeg6CTl6b0hhA53nieJaxQZSNVLfUA=="; + url = "https://registry.npmjs.org/coc-cmake/-/coc-cmake-0.2.1.tgz"; + sha512 = "ejY7j6/kj4hrAC5DnrItsO8PohxLNvEJr13hSHL8ZLL8c0SVPYnH+NyDaRHw4IVFeZvP70PZs5I5BBinCISHMg=="; }; buildInputs = globalBuildInputs; meta = { @@ -81738,10 +84571,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.23.1"; + version = "0.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.1.tgz"; - sha512 = "LttYS+gGH42SI5XFuIf9TdAGRRKABQvQDbMeUDrUqdpscX90WvHYdeR8M1q94RwoZH33g/4oxWu0RLPKxgDJKw=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.2.tgz"; + sha512 = "E25+KhDPSUloQifiFPgoWZDIGpDH+MPF6Yi5WCjnNaztExFph5GYLjwsYdO0vV0IYxNgkpzr0YZNPOZt+2AB1g=="; }; buildInputs = globalBuildInputs; meta = { @@ -81779,10 +84612,10 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.5.2"; + version = "1.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.5.2.tgz"; - sha512 = "Cg4Ys7D2EhxweGBdSJn75Q8nNxU41A6T1pWSc0gxmn+jodL98+jCkA2XGtdN41/c7/R+OJXr0scifwpugmWM3g=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.5.8.tgz"; + sha512 = "EOdkh804CCouSGvbG9cRZopi+ZX3glAwwfTZPBSMkiM61qbmDtVNNoVO20gj22zUEc/tfu4df7Uh267W2hk1aA=="; }; buildInputs = globalBuildInputs; meta = { @@ -81797,10 +84630,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.21.0"; + version = "0.22.9"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.21.0.tgz"; - sha512 = "EPAJw1fedBDBjaGXBOxqidUgsNE1Yget6Z96SmFHZswpujcM5WQa95hg2nHJhZqfYAtmEp9TTT0ewmeS8Z83BA=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.22.9.tgz"; + sha512 = "HzIKBNcTpmvqc38grrktkdCTxCZvee2UwZ7qD67Y5xxN2aipDCW9IOeqTATiX56zWCcYeq/iNZjBvvMe3OlNjQ=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -81830,7 +84663,7 @@ in sources."make-dir-3.1.0" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" (sources."mount-point-3.0.0" // { dependencies = [ sources."@sindresorhus/df-1.0.1" @@ -81855,7 +84688,7 @@ in sources."semver-6.3.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-1.0.0" sources."strip-final-newline-2.0.0" sources."trash-7.2.0" @@ -81879,10 +84712,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.4.6"; + version = "2.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.6.tgz"; - sha512 = "8FKQN7v+FcjRQkwspoVw/mWByhELFy9nLWu0/c24Y1AKj7yEkVlFTsoqwtOIaCD3r5D5S/dYT1DygIA1JIMwlQ=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.9.tgz"; + sha512 = "erTk5v3v8MRPCvgkBJ8K4YtUOiVU31oZz8HN+ioNG9PdcIwJzGMRyMgj8qYPsiNk2nhg63kyyl5x762q2FgjyQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -81897,20 +84730,16 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-1.1.0.tgz"; - sha512 = "TWVSA2l2vTFSb+F1FJAPSLOntDALjqpvyNL9vWIwKeRKRCWdUI9klQcYTMlCRCPKbthzuD4xUq6bW3wvuoZUBg=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-1.2.1.tgz"; + sha512 = "wC3hU4P7w9QtGUNng4lb3PFjfZvOwaSCz9V/M7xcnscuyyoA1j0nNB1/GsBNmW7xnhRS4kEfRPeeHwvj/3YYmA=="; }; dependencies = [ sources."isexe-2.0.0" - sources."node-fetch-2.6.7" - sources."tr46-0.0.3" sources."tslib-2.3.1" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-uri-3.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; @@ -81925,10 +84754,10 @@ in coc-highlight = nodeEnv.buildNodePackage { name = "coc-highlight"; packageName = "coc-highlight"; - version = "1.2.8"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-1.2.8.tgz"; - sha512 = "buElMyk/0st73HVkgcic9UJECACHsoTbyCwHiOo20P1sCk8tgQ6+iEY9KW7L4xZorRt1RthfxLqZwayog1SALQ=="; + url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-1.3.0.tgz"; + sha512 = "TBBQiFtYPXN7qWBmDi+FEWcLddON8s4rcEmQXUGE7uOfNysNKZ6yVUBCnJbS+n8S+7m5d3yqUyhoG5RUeHJxCg=="; }; buildInputs = globalBuildInputs; meta = { @@ -81948,7 +84777,7 @@ in sha512 = "HtFYiBx2ZIFairTsfDwLsMUTGwlH498VzAipWZeCOIGf7ZXetEbv0t+wr7IAy2KMIwhlmzoMsi5aHSlUupxGHA=="; }; dependencies = [ - sources."typescript-4.5.5" + sources."typescript-4.6.3" ]; buildInputs = globalBuildInputs; meta = { @@ -82051,10 +84880,10 @@ in coc-markdownlint = nodeEnv.buildNodePackage { name = "coc-markdownlint"; packageName = "coc-markdownlint"; - version = "1.12.3"; + version = "1.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.12.3.tgz"; - sha512 = "b/p24GkRScjkgejrxi/K8bqhK2nHjZgm2aCDi23mk7oWYb/o1M7W9IfC1zn2xR8PbbY3Zg2YT/y38AOD65tU6A=="; + url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.12.4.tgz"; + sha512 = "b7gBEE0pHp6GnkQYMEsI1Xdn8tqP7QbRpVMuSQ3AJzj0PIflBbk8v1HnriBfDPJBqU+9OQZyU2cm2rmKBw/8yA=="; }; buildInputs = globalBuildInputs; meta = { @@ -82069,13 +84898,13 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "1.0.12"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.12.tgz"; - sha512 = "mRjStj+wjmqp9Lb3cDYegz+cavykWNYQf1ecdwrF2HEtbKVIcc+k62NS5wM6QVB5Y6FD2OxjPNWcoQmIFM1cfQ=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.14.tgz"; + sha512 = "zFExh1wGAZl4LXSp76NAjWORO9Tyhfw8WtALnhDv741p4tjWjVSEl6GmXTQN0U0tXz8UZ8ln2rL2OaxOdgMCTA=="; }; dependencies = [ - sources."@chemzqm/neovim-5.6.4" + sources."@chemzqm/neovim-5.7.7" sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" @@ -82089,7 +84918,7 @@ in sources."bser-2.1.1" sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."call-bind-1.0.2" sources."chainsaw-0.1.0" sources."chownr-2.0.0" @@ -82104,9 +84933,9 @@ in sources."which-1.3.1" ]; }) - sources."date-format-4.0.3" + sources."date-format-4.0.6" sources."debounce-1.2.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."deep-extend-0.6.0" sources."define-properties-1.1.3" sources."duplexer2-0.1.4" @@ -82117,15 +84946,15 @@ in sources."execa-1.0.0" sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" - sources."flatted-3.2.4" - sources."follow-redirects-1.14.7" - sources."fp-ts-2.11.8" - sources."fs-extra-10.0.0" + sources."flatted-3.2.5" + sources."follow-redirects-1.14.9" + sources."fp-ts-2.11.9" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" (sources."fstream-1.0.12" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."rimraf-2.7.1" ]; }) @@ -82137,7 +84966,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" @@ -82173,11 +85002,11 @@ in ]; }) sources."lodash-4.17.21" - sources."log4js-6.4.0" + sources."log4js-6.4.4" sources."lru-cache-6.0.0" sources."metals-languageclient-0.4.2" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minipass-3.1.6" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" @@ -82186,7 +85015,7 @@ in (sources."mv-2.1.1" // { dependencies = [ sources."glob-6.0.4" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."rimraf-2.4.5" ]; }) @@ -82222,8 +85051,8 @@ in sources."shebang-regex-1.0.0" sources."shell-quote-1.7.3" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" - sources."streamroller-3.0.2" + sources."signal-exit-3.0.7" + sources."streamroller-3.0.6" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" (sources."string_decoder-1.1.1" // { @@ -82248,7 +85077,7 @@ in sources."vscode-languageserver-types-3.15.1" ]; }) - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."webidl-conversions-3.0.1" @@ -82270,10 +85099,10 @@ in coc-pairs = nodeEnv.buildNodePackage { name = "coc-pairs"; packageName = "coc-pairs"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.3.1.tgz"; - sha512 = "V9MlHr2TAdlCQKHuVLtz8rixh36HwRvKKtlhNuedhI/ljF5uzoNd2wFl345aRRzi6ceUcsDZ5QCwG9UzGkLFjw=="; + url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.3.2.tgz"; + sha512 = "dinOWxcKvSghIEyRHy0vfjIUturfX1HiRHZ+vyInHXP3lXFq1SQF3B9RzwHj1eXjfmqKMDVsgwjAftAx8j8Rbw=="; }; buildInputs = globalBuildInputs; meta = { @@ -82288,980 +85117,18 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "1.1.25"; + version = "9.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.25.tgz"; - sha512 = "vF8FCWhSQ8RHSelzDsf34DrPPKeoYuWFbtoC+3qArm6rf5E02KY/vZDFt9MCLnzjLr8yVXz2eQ4BczNJvnQohw=="; + url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-9.2.3.tgz"; + sha512 = "LkwQTBlD/chH0BTl7zFMw+M1CKbVIy8W49nVLuB+wmgS3dqnKZo58PRTYkcX2X25/FIWOh/oMSjWoZ8cTck8zQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.16.10" // { - dependencies = [ - sources."chalk-2.4.2" - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."@eslint/eslintrc-0.4.3" - sources."@humanwhocodes/config-array-0.5.0" - sources."@humanwhocodes/object-schema-1.2.1" - sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.3" - sources."@types/eslint-visitor-keys-1.0.0" - sources."@types/json-schema-7.0.9" - sources."@typescript-eslint/experimental-utils-3.10.1" - sources."@typescript-eslint/parser-3.10.1" - sources."@typescript-eslint/types-3.10.1" - sources."@typescript-eslint/typescript-estree-3.10.1" - sources."@typescript-eslint/visitor-keys-3.10.1" - sources."acorn-7.4.1" - sources."acorn-jsx-5.3.2" - sources."ajv-6.12.6" - sources."ajv-keywords-3.5.2" - (sources."ansi-align-2.0.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."ansi-colors-4.1.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."argparse-1.0.10" - sources."arr-diff-2.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-find-index-1.0.2" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."array-unique-0.2.1" - sources."arrify-1.0.1" - sources."assign-symbols-1.0.0" - sources."astral-regex-2.0.0" - sources."atob-2.1.2" - sources."autoprefixer-7.2.6" - sources."bail-1.0.5" - sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - sources."isobject-3.0.1" - ]; - }) - (sources."boxen-1.3.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."camelcase-4.1.0" - sources."chalk-2.4.2" - sources."escape-string-regexp-1.0.5" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."brace-expansion-1.1.11" - sources."braces-1.8.5" - sources."browserslist-2.11.3" - sources."builtin-modules-1.1.1" - (sources."cache-base-1.0.1" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."call-me-maybe-1.0.1" - sources."callsites-3.1.0" - sources."camelcase-2.1.1" - sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001301" - sources."capture-stack-trace-1.0.1" - sources."ccount-1.1.0" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."ansi-styles-4.3.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."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-1.6.0" - sources."circular-json-0.3.3" - (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."isobject-3.0.1" - sources."kind-of-5.1.0" - ]; - }) - sources."cli-boxes-1.0.0" - (sources."cliui-4.1.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."clone-regexp-1.0.1" - sources."code-point-at-1.1.0" - sources."collapse-white-space-1.0.6" - sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."commander-2.20.3" - sources."common-tags-1.8.2" - sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" - (sources."configstore-3.1.5" // { - dependencies = [ - sources."dot-prop-4.2.1" - sources."is-obj-1.0.1" - ]; - }) - sources."copy-descriptor-0.1.1" - sources."core-js-3.20.3" - sources."cosmiconfig-3.1.0" - sources."create-error-class-3.0.2" - sources."cross-spawn-7.0.3" - sources."crypto-random-string-1.0.0" - sources."currently-unhandled-0.4.1" - sources."debug-4.3.3" - sources."decamelize-1.2.0" - sources."decamelize-keys-1.1.0" - sources."decode-uri-component-0.2.0" - sources."deep-extend-0.6.0" - sources."deep-is-0.1.4" - (sources."define-property-2.0.2" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."diff-4.0.2" - (sources."dir-glob-2.2.2" // { - dependencies = [ - sources."path-type-3.0.0" - ]; - }) - sources."dlv-1.1.3" - sources."doctrine-3.0.0" - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.2.0" - sources."entities-2.2.0" - ]; - }) - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.7.0" - sources."dot-prop-5.3.0" - sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.51" - sources."emoji-regex-8.0.0" - sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" - sources."entities-1.1.2" - sources."error-ex-1.3.2" - sources."escape-string-regexp-4.0.0" - (sources."eslint-7.32.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) - sources."eslint-scope-5.1.1" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."espree-7.3.1" - sources."esprima-4.0.1" - (sources."esquery-1.4.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - (sources."execa-0.7.0" // { - dependencies = [ - sources."cross-spawn-5.1.0" - sources."lru-cache-4.1.5" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" - sources."yallist-2.1.2" - ]; - }) - sources."execall-1.0.0" - sources."expand-brackets-0.1.5" - sources."expand-range-1.8.2" - sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-0.3.2" // { - dependencies = [ - sources."is-extglob-1.0.0" - ]; - }) - sources."fast-deep-equal-3.1.3" - (sources."fast-glob-2.2.7" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."debug-2.6.9" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - (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-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isobject-3.0.1" - sources."kind-of-6.0.3" - sources."micromatch-3.1.10" - sources."ms-2.0.0" - ]; - }) - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."file-entry-cache-6.0.1" - sources."filename-regex-2.0.1" - sources."fill-range-2.2.4" - sources."find-up-2.1.0" - sources."flat-cache-3.0.4" - sources."flatted-3.2.4" - sources."for-in-1.0.2" - sources."for-own-0.1.5" - sources."fragment-cache-0.2.1" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."functional-red-black-tree-1.0.1" - sources."get-caller-file-1.0.3" - sources."get-stdin-5.0.1" - sources."get-stream-3.0.0" - sources."get-value-2.0.6" - sources."glob-7.2.0" - (sources."glob-base-0.3.0" // { - dependencies = [ - sources."glob-parent-2.0.0" - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - ]; - }) - sources."glob-parent-5.1.2" - sources."glob-to-regexp-0.3.0" - sources."global-dirs-0.1.1" - sources."globals-13.12.0" - (sources."globby-6.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) - sources."globjoin-0.1.4" - sources."gonzales-pe-4.3.0" - sources."got-6.7.1" - sources."graceful-fs-4.2.9" - 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-value-1.0.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - (sources."has-values-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) - sources."hosted-git-info-2.8.9" - sources."html-tags-2.0.0" - sources."htmlparser2-3.10.1" - sources."ignore-4.0.6" - sources."import-fresh-3.3.0" - sources."import-lazy-2.1.0" - sources."import-local-0.1.1" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."indexes-of-1.0.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."invert-kv-2.0.0" - (sources."is-accessor-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - sources."is-alphabetical-1.0.4" - sources."is-alphanumeric-1.0.0" - sources."is-alphanumerical-1.0.4" - sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" - sources."is-ci-1.2.1" - sources."is-core-module-2.8.1" - (sources."is-data-descriptor-1.0.0" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - sources."is-decimal-1.0.4" - (sources."is-descriptor-1.0.2" // { - dependencies = [ - sources."kind-of-6.0.3" - ]; - }) - sources."is-directory-0.3.1" - sources."is-dotfile-1.0.3" - sources."is-equal-shallow-0.1.3" - sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" - sources."is-finite-1.1.0" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-hexadecimal-1.0.4" - sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" - sources."is-number-2.1.0" - sources."is-obj-2.0.0" - sources."is-path-inside-1.0.1" - sources."is-plain-obj-1.1.0" - (sources."is-plain-object-2.0.4" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."is-posix-bracket-0.1.1" - sources."is-primitive-2.0.0" - sources."is-redirect-1.0.0" - sources."is-regexp-1.0.0" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" - sources."is-supported-regexp-flag-1.0.1" - sources."is-utf8-0.2.1" - sources."is-whitespace-character-1.0.4" - sources."is-windows-1.0.2" - sources."is-word-character-1.0.4" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isobject-2.1.0" - sources."js-base64-2.6.4" - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."json-parse-better-errors-1.0.2" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."kind-of-3.2.2" - sources."known-css-properties-0.5.0" - sources."latest-version-3.1.0" - sources."lcid-2.0.0" - sources."levn-0.4.1" - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."parse-json-2.2.0" - sources."pify-2.3.0" - ]; - }) - sources."locate-path-2.0.0" - sources."lodash-4.17.21" - sources."lodash.merge-4.6.2" - sources."lodash.truncate-4.4.2" - (sources."log-symbols-2.2.0" // { - dependencies = [ - sources."chalk-2.4.2" - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."loglevel-1.8.0" - (sources."loglevel-colored-level-prefix-1.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) - sources."longest-streak-2.0.4" - sources."loud-rejection-1.6.0" - sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" - sources."make-dir-1.3.0" - sources."map-age-cleaner-0.1.3" - sources."map-cache-0.2.2" - sources."map-obj-1.0.1" - sources."map-visit-1.0.0" - sources."markdown-escapes-1.0.4" - sources."markdown-table-1.1.3" - sources."math-random-1.0.4" - sources."mathml-tag-names-2.1.3" - sources."mdast-util-compact-1.0.4" - sources."mem-4.3.0" - sources."meow-3.7.0" - sources."merge2-1.4.1" - (sources."micromatch-2.3.11" // { - dependencies = [ - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - ]; - }) - sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."minimist-options-3.0.2" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.5" - sources."ms-2.1.2" - (sources."nanomatch-1.2.13" // { - dependencies = [ - sources."arr-diff-4.0.0" - sources."array-unique-0.3.2" - sources."kind-of-6.0.3" - ]; - }) - sources."natural-compare-1.4.0" - sources."nice-try-1.0.5" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."normalize-path-2.1.1" - sources."normalize-range-0.1.2" - sources."normalize-selector-0.2.0" - (sources."npm-run-path-2.0.2" // { - dependencies = [ - sources."path-key-2.0.1" - ]; - }) - sources."num2fraction-1.2.2" - sources."number-is-nan-1.0.1" - sources."object-assign-4.1.1" - (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."object-visit-1.0.1" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."object.omit-2.0.1" - (sources."object.pick-1.3.0" // { - dependencies = [ - sources."isobject-3.0.1" - ]; - }) - sources."once-1.4.0" - sources."optionator-0.9.1" - (sources."os-locale-3.1.0" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."execa-1.0.0" - sources."get-stream-4.1.0" - sources."path-key-2.0.1" - sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."which-1.3.1" - ]; - }) - sources."p-defer-1.0.0" - sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - (sources."package-json-4.0.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."parent-module-1.0.1" - sources."parse-entities-1.2.2" - (sources."parse-glob-3.0.4" // { - dependencies = [ - sources."is-extglob-1.0.0" - sources."is-glob-2.0.1" - ]; - }) - sources."parse-json-3.0.0" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - (sources."path-type-1.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) - sources."pify-3.0.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."pkg-dir-2.0.0" - sources."posix-character-classes-0.1.1" - (sources."postcss-6.0.23" // { - dependencies = [ - sources."chalk-2.4.2" - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."postcss-html-0.12.0" - (sources."postcss-less-1.1.5" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) - sources."escape-string-regexp-1.0.5" - sources."has-flag-1.0.0" - sources."postcss-5.2.18" - sources."source-map-0.5.7" - sources."strip-ansi-3.0.1" - sources."supports-color-3.2.3" - ]; - }) - sources."postcss-media-query-parser-0.2.3" - (sources."postcss-reporter-5.0.0" // { - dependencies = [ - sources."chalk-2.4.2" - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."postcss-resolve-nested-selector-0.1.1" - sources."postcss-safe-parser-3.0.1" - sources."postcss-sass-0.2.0" - sources."postcss-scss-1.0.6" - sources."postcss-selector-parser-3.1.2" - sources."postcss-value-parser-3.3.1" - sources."prelude-ls-1.2.1" - sources."prepend-http-1.0.4" - sources."preserve-0.2.0" - sources."prettier-2.5.1" - sources."prettier-eslint-12.0.0" - (sources."prettier-stylelint-0.4.2" // { - dependencies = [ - sources."debug-3.2.7" - sources."ignore-3.3.10" - sources."prettier-1.19.1" - ]; - }) - (sources."prettier-tslint-0.4.2" // { - dependencies = [ - sources."chalk-2.4.2" - sources."dir-glob-2.0.0" - sources."escape-string-regexp-1.0.5" - sources."globby-8.0.2" - sources."ignore-3.3.10" - sources."path-type-3.0.0" - ]; - }) - (sources."pretty-format-23.6.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - ]; - }) - sources."progress-2.0.3" - sources."pseudomap-1.0.2" - sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."quick-lru-1.1.0" - (sources."randomatic-3.1.1" // { - dependencies = [ - sources."is-number-4.0.0" - sources."kind-of-6.0.3" - ]; - }) - (sources."rc-1.2.8" // { - dependencies = [ - sources."strip-json-comments-2.0.1" - ]; - }) - sources."read-pkg-1.1.0" - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - sources."find-up-1.1.2" - sources."path-exists-2.1.0" - ]; - }) - sources."readable-stream-3.6.0" - (sources."redent-1.0.0" // { - dependencies = [ - sources."indent-string-2.1.0" - ]; - }) - sources."regex-cache-0.4.4" - sources."regex-not-1.0.2" - sources."regexpp-3.2.0" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" - sources."remark-8.0.0" - sources."remark-parse-4.0.0" - sources."remark-stringify-4.0.0" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."repeating-2.0.1" - sources."replace-ext-1.0.0" - sources."require-directory-2.1.1" - sources."require-from-string-2.0.2" - sources."require-main-filename-1.0.1" - sources."require-relative-0.8.7" - sources."resolve-1.21.1" - (sources."resolve-cwd-2.0.0" // { - dependencies = [ - sources."resolve-from-3.0.0" - ]; - }) - sources."resolve-from-4.0.0" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."rimraf-3.0.2" - sources."safe-buffer-5.2.1" - sources."safe-regex-1.1.0" - sources."semver-7.3.5" - (sources."semver-diff-2.1.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."set-blocking-2.0.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" - sources."slash-1.0.0" - (sources."slice-ansi-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - (sources."snapdragon-0.8.2" // { - dependencies = [ - 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."ms-2.0.0" - sources."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - sources."isobject-3.0.1" - ]; - }) - sources."snapdragon-util-3.0.1" - sources."source-map-0.6.1" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.1" - sources."spdx-correct-3.1.1" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.11" - sources."specificity-0.3.2" - sources."split-string-3.1.0" - sources."sprintf-js-1.0.3" - sources."state-toggle-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."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."stringify-entities-1.3.2" - sources."strip-ansi-6.0.1" - sources."strip-bom-2.0.0" - sources."strip-eof-1.0.0" - (sources."strip-indent-1.0.1" // { - dependencies = [ - sources."get-stdin-4.0.1" - ]; - }) - sources."strip-json-comments-3.1.1" - sources."style-search-0.1.0" - (sources."stylelint-8.4.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" - sources."chalk-2.4.2" - sources."debug-3.2.7" - sources."escape-string-regexp-1.0.5" - sources."file-entry-cache-2.0.0" - sources."flat-cache-1.3.4" - sources."globby-7.1.1" - sources."ignore-3.3.10" - sources."indent-string-3.2.0" - sources."is-fullwidth-code-point-2.0.0" - sources."load-json-file-4.0.0" - sources."map-obj-2.0.0" - sources."meow-4.0.1" - sources."parse-json-4.0.0" - sources."path-type-3.0.0" - sources."read-pkg-3.0.0" - sources."read-pkg-up-3.0.0" - sources."redent-2.0.0" - sources."rimraf-2.6.3" - sources."slice-ansi-1.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."strip-bom-3.0.0" - sources."strip-indent-2.0.0" - sources."table-4.0.3" - sources."trim-newlines-2.0.0" - ]; - }) - sources."sugarss-1.0.1" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."svg-tags-1.0.0" - (sources."table-6.8.0" // { - dependencies = [ - sources."ajv-8.9.0" - sources."json-schema-traverse-1.0.0" - ]; - }) - sources."temp-dir-1.0.0" - sources."temp-write-3.4.0" - sources."tempy-0.2.1" - sources."term-size-1.2.0" - sources."text-table-0.2.0" - sources."timed-out-4.0.1" - sources."to-object-path-0.3.0" - sources."to-regex-3.0.2" - (sources."to-regex-range-2.1.1" // { - dependencies = [ - sources."is-number-3.0.0" - ]; - }) - sources."trim-0.0.1" - sources."trim-newlines-1.0.0" - sources."trim-trailing-lines-1.1.4" - sources."trough-1.0.5" - sources."tslib-1.14.1" - (sources."tslint-5.20.1" // { - dependencies = [ - sources."chalk-2.4.2" - sources."escape-string-regexp-1.0.5" - sources."semver-5.7.1" - sources."tsutils-2.29.0" - ]; - }) - sources."tsutils-3.21.0" - sources."type-check-0.4.0" - sources."type-fest-0.20.2" - sources."typescript-3.9.10" - sources."unherit-1.1.3" - sources."unified-6.2.0" - sources."union-value-1.0.1" - sources."uniq-1.0.1" - sources."unique-string-1.0.0" - sources."unist-util-find-all-after-1.0.5" - sources."unist-util-is-3.0.0" - sources."unist-util-remove-position-1.1.4" - sources."unist-util-stringify-position-1.1.2" - sources."unist-util-visit-1.4.1" - sources."unist-util-visit-parents-2.1.2" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - sources."isobject-3.0.1" - ]; - }) - sources."unzip-response-2.0.1" - (sources."update-notifier-2.5.0" // { - dependencies = [ - sources."chalk-2.4.2" - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."uri-js-4.4.1" - sources."urix-0.1.0" - sources."url-parse-lax-1.0.0" - sources."use-3.1.1" - sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."v8-compile-cache-2.3.0" - sources."validate-npm-package-license-3.0.4" - sources."vfile-2.3.0" - sources."vfile-location-2.0.6" - sources."vfile-message-1.1.1" - (sources."vue-eslint-parser-7.1.1" // { - dependencies = [ - sources."espree-6.2.1" - ]; - }) - sources."which-2.0.2" - sources."which-module-2.0.0" - (sources."widest-line-2.0.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."word-wrap-1.2.3" - (sources."wrap-ansi-2.1.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) - sources."wrappy-1.0.2" - sources."write-0.2.1" - sources."write-file-atomic-2.4.3" - sources."x-is-string-0.1.0" - sources."xdg-basedir-3.0.0" - sources."xtend-4.0.2" - sources."y18n-3.2.2" - sources."yallist-4.0.0" - (sources."yargs-11.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - (sources."yargs-parser-9.0.2" // { - dependencies = [ - sources."camelcase-4.1.0" - ]; - }) + sources."prettier-2.6.1" ]; buildInputs = globalBuildInputs; meta = { description = "prettier extension for coc.nvim"; + homepage = "https://github.com/neoclide/coc-prettier#readme"; license = "MIT"; }; production = true; @@ -83271,13 +85138,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.210"; + version = "1.1.232"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.210.tgz"; - sha512 = "d+x38jGi3b0gD4axhYdHcS6TX9T/Q6qndVbn3TQMbLdQxiGmBBoy/hB/AouXwEByg/XyBtmyDiaWxm7r0UfgQw=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.232.tgz"; + sha512 = "1ytGBG4gmz/M/6guRKUvTSltXDpoWlcbqq7RsMi3fFEBhYvSQVpy3MkKgxjkJNVbp+YKuJpcuNAhCIjq0+BHAg=="; }; dependencies = [ - sources."pyright-1.1.212" + sources."pyright-1.1.233" ]; buildInputs = globalBuildInputs; meta = { @@ -83318,7 +85185,7 @@ in dependencies = [ sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" ]; buildInputs = globalBuildInputs; @@ -83351,10 +85218,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.59.1"; + version = "0.61.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.59.1.tgz"; - sha512 = "nd/vzaskA29qevdlU8SwoOaUSl5Qgcoh51HuD+8xxTWZ3Tt4LFuprVjvJ6DD3sgnguUN02wN090gh1ZihMrDJA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.61.1.tgz"; + sha512 = "xQtIB93k8SIlK6tOS1XEpdFAypU8mLVWhqsPkfV8Hf7AP3m4prErooMS8Du/9AMRqwL2nQxsBjAwpWYI/gJCgA=="; }; buildInputs = globalBuildInputs; meta = { @@ -83387,10 +85254,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.4.7"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.7.tgz"; - sha512 = "i7P14KzQVE9TILKAXW9+HW9ILZkFuBfCrwEvQmwF2ZFrKl1YgNSj9I5TJNqLfRynIeNmCuEELfEWMhl4kjvp0g=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.0.5.tgz"; + sha512 = "fyJwbwX6FJVNb8NMmkyN2JDj5pr/imvfOCePPvkHiQCybnU82YM05+CKpBIAUBfxzwkBLQq64V4D7LD+lrUVLQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -83427,31 +85294,35 @@ in sha512 = "+GYR6KTvHQnqu0j1kXT30hRZMuCwG/G52wG/19LSPE+p9Q0i8XFH6582T0btTu39xz2TPsDOGjT1VgyRw2urug=="; }; dependencies = [ + sources."@ampproject/remapping-2.1.2" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - sources."@babel/core-7.16.10" - sources."@babel/generator-7.16.8" - sources."@babel/helper-compilation-targets-7.16.7" + sources."@babel/compat-data-7.17.7" + sources."@babel/core-7.17.8" + sources."@babel/generator-7.17.7" + sources."@babel/helper-compilation-targets-7.17.7" sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-function-name-7.16.7" sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" - sources."@babel/helper-simple-access-7.16.7" + sources."@babel/helper-module-transforms-7.17.7" + sources."@babel/helper-simple-access-7.17.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.8" (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.17.8" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.3" + sources."@babel/types-7.17.0" + sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/sourcemap-codec-1.4.11" + sources."@jridgewell/trace-mapping-0.3.4" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -83462,7 +85333,7 @@ in sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.6" - sources."ajv-8.9.0" + sources."ajv-8.11.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -83481,11 +85352,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.19.1" + sources."browserslist-4.20.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001320" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -83505,7 +85376,7 @@ in sources."convert-source-map-1.8.0" sources."cosmiconfig-7.0.1" sources."cssesc-3.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -83522,7 +85393,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -83539,7 +85410,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -83590,7 +85461,7 @@ in sources."jsesc-2.5.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."kind-of-6.0.3" sources."known-css-properties-0.21.0" sources."lines-and-columns-1.2.4" @@ -83608,17 +85479,17 @@ in sources."meow-9.0.0" sources."merge2-1.4.1" sources."micromark-2.11.4" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" (sources."minimist-options-4.1.0" // { dependencies = [ sources."is-plain-obj-1.1.0" ]; }) sources."ms-2.1.2" - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."semver-7.3.5" @@ -83680,14 +85551,14 @@ in sources."remark-stringify-9.0.1" sources."repeat-string-1.6.1" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-5.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."semver-6.3.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { dependencies = [ @@ -83740,7 +85611,7 @@ in sources."vscode-languageserver-types-3.16.0-next.1" ]; }) - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."which-1.3.1" @@ -83763,10 +85634,10 @@ in coc-tabnine = nodeEnv.buildNodePackage { name = "coc-tabnine"; packageName = "coc-tabnine"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.6.tgz"; - sha512 = "6yKBny54MoGpm2bWwx2SX8O8cYjFgcQtfxg8klZoh1Nhxjamo2eNALjyvtOc/N9o7Mh+w/hn4nApXiwoJZqy0g=="; + url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.7.tgz"; + sha512 = "aLh9A6/r1/1QZT/1lJnaLdShGHRrCCb3HA57UYeFR0cD1xjRY3YupfmsOwVSbpqv6AufEXeOdbA2enoVhRFY8g=="; }; buildInputs = globalBuildInputs; meta = { @@ -83830,13 +85701,13 @@ in sources."is-core-module-2.8.1" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."semver-5.7.1" sources."sprintf-js-1.0.3" sources."supports-color-5.5.0" @@ -83870,7 +85741,7 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."get-caller-file-1.0.3" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."mock-require-3.0.3" sources."normalize-path-2.1.1" sources."remove-trailing-separator-1.1.0" @@ -83893,13 +85764,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.9.8"; + version = "1.9.15"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.8.tgz"; - sha512 = "fbVD0V2ZWlX8471cqeILz0k1OfHd20WI9tmrLfZy1vsUZtAFVXtvwO9cuA6FZ1vm/vpoUHelQ70Yd6ENFIddRQ=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.9.15.tgz"; + sha512 = "7mvLHnOqiXl0sk6mq78SmdIYL0nouIzejpTDgRlRjUrAXTCqXfpFVqfJg+2xASpcGTR5nH1lYMk/LXRrnFltIw=="; }; dependencies = [ - sources."typescript-4.5.5" + sources."typescript-4.6.3" ]; buildInputs = globalBuildInputs; meta = { @@ -83977,7 +85848,7 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."deep-is-0.1.4" sources."diff-4.0.2" sources."doctrine-3.0.0" @@ -84020,17 +85891,17 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-intrinsic-1.1.1" sources."glob-7.2.0" sources."glob-parent-5.1.2" - sources."globals-13.12.0" + sources."globals-13.13.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -84053,9 +85924,9 @@ in sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" sources."lru-cache-6.0.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."natural-compare-1.4.0" sources."object-assign-4.1.1" @@ -84066,14 +85937,14 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.5.1" + sources."prettier-2.6.1" sources."progress-2.0.3" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" sources."punycode-2.1.1" sources."regexpp-3.2.0" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."semver-7.3.5" @@ -84094,7 +85965,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."table-6.8.0" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.11.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -84110,7 +85981,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.5.5" + sources."typescript-4.6.3" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.6" @@ -84156,10 +86027,10 @@ in coc-vimtex = nodeEnv.buildNodePackage { name = "coc-vimtex"; packageName = "coc-vimtex"; - version = "1.1.0"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.0.tgz"; - sha512 = "1CFLycCS+gbvUzVnrdN9SU7clGaPckD8uj+1XFqfuRqh+m58rUd0+xchNSJZcVHMGXlH5fJMvaJyAgZNjU2m/g=="; + url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.5.tgz"; + sha512 = "3SY6vFcmBO8u6/6zrBzqgwCbus8k7877UCNVEua8lgC+T4tKgB4w9VthikMEcoUDPK17/QbLITSB+yPDNebbHw=="; }; buildInputs = globalBuildInputs; meta = { @@ -84191,25 +86062,13 @@ in coc-yaml = nodeEnv.buildNodePackage { name = "coc-yaml"; packageName = "coc-yaml"; - version = "1.6.1"; + version = "1.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.6.1.tgz"; - sha512 = "YhsgTIFfCCExjxGK3/vEnR8oUmjEitMa2rvqCZZqjLD785XsLRZAbM14vJ5ZIxbdnjqu3uZ3y2d0tFmgrtuYew=="; + url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.7.5.tgz"; + sha512 = "1wNDsQB4YwJJLJxzDOyqu2edjwf+KHGM0co63t3N6L6k+XBB4rOenfkN+HgnX0wfRglAmKbMnOKA677XycGReA=="; }; dependencies = [ - sources."jsonc-parser-3.0.0" sources."prettier-2.0.5" - sources."request-light-0.5.7" - sources."vscode-json-languageservice-4.1.7" - sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-7.0.0" - sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" - sources."vscode-languageserver-types-3.16.0" - sources."vscode-nls-5.0.0" - sources."vscode-uri-3.0.3" - sources."yaml-2.0.0-8" - sources."yaml-language-server-1.2.2" ]; buildInputs = globalBuildInputs; meta = { @@ -84223,10 +86082,10 @@ in coc-yank = nodeEnv.buildNodePackage { name = "coc-yank"; packageName = "coc-yank"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.2.0.tgz"; - sha512 = "6Ene7ds4ZVfFLzihd3YaPussxNf0npGlPrlPpnGnCPeZ5bGDcEc3j++0Pl4yjo0sIb1QKR/WjrfA0/1Q8mi9yw=="; + url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.2.1.tgz"; + sha512 = "Eg5LmZtXqcACrGV6CiYzyUV3cL6JLmk43OLlXQu6wTFe8oC7aFi/sWAnL9oHSejki2iiNJqc50aLYfupxXRwOg=="; }; buildInputs = globalBuildInputs; meta = { @@ -84247,7 +86106,7 @@ in sha512 = "uPhR9IKtN1z6gt9mpRH5OAdYjJQgQq7CCQpm5VmCpLe2QdGDzi4xfB3ybXGaBRX+UN4whtz3pZvgZssJvBwcqQ=="; }; dependencies = [ - sources."@xstate/fsm-1.6.3" + sources."@xstate/fsm-1.6.5" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -84323,7 +86182,7 @@ in sources."isexe-2.0.0" sources."isurl-1.0.0" sources."js2xmlparser-4.0.2" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."jsonfile-4.0.0" sources."lowercase-keys-1.0.1" (sources."make-dir-1.3.0" // { @@ -84331,9 +86190,9 @@ in sources."pify-3.0.0" ]; }) - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."nice-try-1.0.5" (sources."npm-conf-1.1.3" // { dependencies = [ @@ -84350,7 +86209,7 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."plist-3.0.4" + sources."plist-3.0.5" sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" @@ -84371,7 +86230,7 @@ in sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-2.0.0" (sources."string_decoder-1.1.1" // { dependencies = [ @@ -84438,7 +86297,7 @@ in sha512 = "jARqwj0uyTfbcsTr3IDoaGI6ZXUV8e8qVjw+LaRBujvjgsiWypJweze5IZy0/sjNEKlptwB7GDjmuphtBzngFA=="; }; dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."axios-0.21.4" sources."chalk-2.4.2" @@ -84450,7 +86309,7 @@ in sources."colors-1.4.0" sources."commander-2.20.3" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."has-flag-3.0.0" sources."is-fullwidth-code-point-2.0.0" sources."log-symbols-2.2.0" @@ -84459,7 +86318,7 @@ in sources."onetime-2.0.1" sources."ora-1.4.0" sources."restore-cursor-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" @@ -84526,40 +86385,40 @@ in configurable-http-proxy = nodeEnv.buildNodePackage { name = "configurable-http-proxy"; packageName = "configurable-http-proxy"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.5.0.tgz"; - sha512 = "iuaG85EDWIp02Dm1LZsi7vRE4CH5cRwo2+GaEEAi6fgX3dRLpt/jhQc7ylwXibi4kUjMvpV/xbMwjRRmGcg4NQ=="; + url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.5.1.tgz"; + sha512 = "SALL4kqMSKdpClQnFe2h8qSQyWrShXWepiQwci6PNc/7Le+L9RRiQc/X+YEY6hDhIkaAneUlApQfWfnW/JSdqg=="; }; dependencies = [ - sources."@dabh/diagnostics-2.0.2" + sources."@colors/colors-1.5.0" + sources."@dabh/diagnostics-2.0.3" sources."async-3.2.3" sources."bintrees-1.0.1" sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.9.0" - sources."colors-1.4.0" sources."colorspace-1.1.4" - sources."commander-8.0.0" + sources."commander-7.2.0" sources."enabled-2.0.0" sources."eventemitter3-4.0.7" sources."fecha-4.2.1" sources."fn.name-1.1.0" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" sources."is-stream-2.0.1" sources."kuler-2.0.0" - sources."logform-2.3.2" + sources."logform-2.4.0" sources."ms-2.1.3" sources."one-time-1.0.0" - sources."prom-client-13.1.0" + sources."prom-client-14.0.1" sources."readable-stream-3.6.0" sources."requires-port-1.0.0" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-1.1.1" + sources."safe-stable-stringify-2.3.1" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."strftime-0.10.1" @@ -84568,8 +86427,8 @@ in sources."text-hex-1.0.0" sources."triple-beam-1.3.0" sources."util-deprecate-1.0.2" - sources."winston-3.3.4" - sources."winston-transport-4.4.2" + sources."winston-3.5.1" + sources."winston-transport-4.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -84717,7 +86576,7 @@ in ]; }) sources."min-indent-1.0.1" - sources."minimist-1.2.5" + sources."minimist-1.2.6" sources."minimist-options-4.1.0" sources."modify-values-1.0.1" sources."neo-async-2.6.2" @@ -84752,7 +86611,7 @@ in sources."readable-stream-3.6.0" sources."redent-3.0.0" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."source-map-0.6.1" @@ -84776,7 +86635,7 @@ in sources."through2-4.0.2" sources."trim-newlines-3.0.1" sources."type-fest-0.18.1" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.3" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -84807,12 +86666,12 @@ in sha512 = "Hu2YeT0naeP/1sEm/xfJYUsXN48XV6zagxbi1+4q0Ei9c5TKsIq8v4EWukvSHF4UO2pnh+9ViaDlGMcS1Wrnfg=="; }; dependencies = [ - sources."@gar/promisify-1.1.2" + sources."@gar/promisify-1.1.3" sources."@netflix/nerror-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."@npmcli/fs-1.1.0" + sources."@npmcli/fs-1.1.1" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" @@ -84823,14 +86682,14 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" sources."abbrev-1.1.1" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.11.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -84863,13 +86722,13 @@ in sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.51" - (sources."body-parser-1.19.1" // { + (sources."body-parser-1.19.2" // { dependencies = [ - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."debug-2.6.9" sources."iconv-lite-0.4.24" sources."ms-2.0.0" - sources."qs-6.9.6" + sources."qs-6.9.7" ]; }) (sources."boxen-5.1.2" // { @@ -84919,7 +86778,7 @@ in sources."concat-map-0.0.1" (sources."conf-10.1.1" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.11.0" sources."dot-prop-6.0.1" sources."json-schema-traverse-1.0.0" ]; @@ -84932,7 +86791,7 @@ in ]; }) sources."content-type-1.0.4" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."cordova-app-hello-world-6.0.0" (sources."cordova-common-4.0.2" // { @@ -84963,7 +86822,7 @@ in sources."mimic-fn-3.1.0" ]; }) - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decompress-response-3.3.0" sources."dedent-0.7.0" sources."deep-extend-0.6.0" @@ -84998,11 +86857,11 @@ in sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" sources."execa-5.1.1" - (sources."express-4.17.2" // { + (sources."express-4.17.3" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."safe-buffer-5.2.1" ]; }) @@ -85032,7 +86891,7 @@ in sources."form-data-2.3.3" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -85077,7 +86936,7 @@ in sources."init-package-json-2.0.5" (sources."inquirer-6.5.2" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" @@ -85092,7 +86951,7 @@ in }) (sources."strip-ansi-5.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" ]; }) sources."supports-color-5.5.0" @@ -85163,14 +87022,14 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" @@ -85182,7 +87041,7 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-gyp-7.1.2" sources."nopt-5.0.0" sources."normalize-package-data-3.0.3" @@ -85232,7 +87091,7 @@ in sources."picomatch-2.3.1" sources."pify-4.0.1" sources."pkg-up-3.1.0" - sources."plist-3.0.4" + sources."plist-3.0.5" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."promise-inflight-1.0.1" @@ -85247,9 +87106,9 @@ in sources."qs-6.5.3" sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" - (sources."raw-body-2.4.2" // { + (sources."raw-body-2.4.3" // { dependencies = [ - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."iconv-lite-0.4.24" ]; }) @@ -85260,14 +87119,14 @@ in }) sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."read-package-json-4.1.1" + sources."read-package-json-4.1.2" sources."read-package-json-fast-2.0.3" sources."readable-stream-2.3.7" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."request-2.88.2" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-4.0.0" sources."responselike-1.0.2" (sources."restore-cursor-2.0.0" // { @@ -85306,10 +87165,10 @@ in sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-6.1.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -85327,7 +87186,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.10.7" + sources."systeminformation-5.11.9" sources."tar-6.1.11" sources."through-2.3.8" sources."tmp-0.2.1" @@ -85410,362 +87269,123 @@ in cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; - version = "3.1.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.1.tgz"; - sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; + url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-4.1.0.tgz"; + sha512 = "JA6bth6/mxPCa19SrWkIuPEBrea8vO9g1v0qhmCLnAKOfTcsNk5/X3W1o9aZuOHgugRcxdyR67rO4Gw/DA+4Qg=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.3" - sources."@types/glob-7.2.0" - sources."@types/minimatch-3.0.5" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.10" sources."@types/normalize-package-data-2.4.1" - sources."aggregate-error-3.1.0" + sources."aggregate-error-4.0.0" sources."ansi-styles-3.2.1" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."arrify-2.0.1" - sources."assign-symbols-1.0.0" - sources."atob-2.1.2" - sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { + sources."arrify-3.0.0" + sources."braces-3.0.2" + sources."camelcase-6.3.0" + sources."camelcase-keys-7.0.2" + (sources."chalk-2.4.2" // { dependencies = [ - sources."define-property-1.0.0" + sources."escape-string-regexp-1.0.5" ]; }) - sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."cache-base-1.0.1" - sources."call-me-maybe-1.0.1" - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" - sources."chalk-2.4.2" - (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."clean-stack-2.2.0" - sources."collection-visit-1.0.0" + sources."clean-stack-4.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" - sources."copy-descriptor-0.1.1" - sources."cp-file-7.0.0" - sources."cpy-8.1.2" - sources."debug-2.6.9" - sources."decamelize-1.2.0" + sources."cp-file-9.1.0" + sources."cpy-9.0.1" + sources."decamelize-5.0.1" (sources."decamelize-keys-1.1.0" // { dependencies = [ + sources."decamelize-1.2.0" sources."map-obj-1.0.1" ]; }) - sources."decode-uri-component-0.2.0" - sources."define-property-2.0.2" - sources."dir-glob-2.2.2" + sources."dir-glob-3.0.1" sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" - (sources."expand-brackets-2.1.4" // { - 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."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - sources."fast-glob-2.2.7" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."find-up-4.1.0" - sources."for-in-1.0.2" - sources."fragment-cache-0.2.1" - sources."fs.realpath-1.0.0" + sources."escape-string-regexp-5.0.0" + sources."fast-glob-3.2.11" + sources."fastq-1.13.0" + sources."fill-range-7.0.1" + sources."find-up-5.0.0" sources."function-bind-1.1.1" - sources."get-value-2.0.6" - sources."glob-7.2.0" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."glob-to-regexp-0.3.0" - sources."globby-9.2.0" + sources."glob-parent-5.1.2" + sources."globby-13.1.1" sources."graceful-fs-4.2.9" sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - (sources."has-glob-1.0.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."hosted-git-info-2.8.9" - sources."ignore-4.0.6" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-accessor-descriptor-1.0.0" + sources."hosted-git-info-4.1.0" + sources."ignore-5.2.0" + sources."indent-string-5.0.0" sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" sources."is-core-module-2.8.1" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-7.0.0" sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" - sources."isobject-3.0.1" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" - sources."junk-3.1.0" + sources."junk-4.0.0" 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."lru-cache-6.0.0" sources."make-dir-3.1.0" - sources."map-cache-0.2.2" sources."map-obj-4.3.0" - sources."map-visit-1.0.0" - sources."meow-6.1.1" + sources."meow-10.1.2" sources."merge2-1.4.1" - sources."micromatch-3.1.10" + sources."micromatch-4.0.5" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" (sources."minimist-options-4.1.0" // { dependencies = [ sources."arrify-1.0.1" ]; }) - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."ms-2.0.0" - sources."nanomatch-1.2.13" sources."nested-error-stacks-2.1.0" - (sources."normalize-package-data-2.5.0" // { + (sources."normalize-package-data-3.0.3" // { dependencies = [ - sources."semver-5.7.1" - ]; - }) - (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."kind-of-3.2.2" - ]; - }) - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" - sources."once-1.4.0" - (sources."p-all-2.1.0" // { - dependencies = [ - sources."p-map-2.1.0" + sources."semver-7.3.5" ]; }) sources."p-event-4.2.0" - (sources."p-filter-2.1.0" // { - dependencies = [ - sources."p-map-2.1.0" - ]; - }) + sources."p-filter-3.0.0" sources."p-finally-1.0.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-3.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."p-map-5.3.0" sources."p-timeout-3.2.0" - sources."p-try-2.2.0" sources."parse-json-5.2.0" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" - (sources."path-type-3.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."pify-4.0.1" - sources."posix-character-classes-0.1.1" - sources."quick-lru-4.0.1" - (sources."read-pkg-5.2.0" // { - dependencies = [ - sources."type-fest-0.6.0" - ]; - }) - (sources."read-pkg-up-7.0.1" // { - dependencies = [ - sources."type-fest-0.8.1" - ]; - }) - sources."redent-3.0.0" - sources."regex-not-1.0.2" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."resolve-1.21.1" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."safe-regex-1.1.0" + sources."path-type-4.0.0" + sources."picomatch-2.3.1" + sources."queue-microtask-1.2.3" + 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."reusify-1.0.4" + sources."run-parallel-1.2.0" sources."semver-6.3.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."slash-2.0.0" - (sources."snapdragon-0.8.2" // { - 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."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.1" + sources."slash-4.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" - sources."split-string-3.1.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."strip-indent-3.0.0" + sources."strip-indent-4.0.0" sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - sources."trim-newlines-3.0.1" - sources."type-fest-0.13.1" - sources."union-value-1.0.1" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."urix-0.1.0" - sources."use-3.1.1" + sources."to-regex-range-5.0.1" + sources."trim-newlines-4.0.2" + sources."type-fest-1.4.0" sources."validate-npm-package-license-3.0.4" - sources."wrappy-1.0.2" - sources."yargs-parser-18.1.3" + sources."yallist-4.0.0" + sources."yargs-parser-20.2.9" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -85796,7 +87416,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -85827,7 +87447,7 @@ in sources."debug-3.2.7" sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.59" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" (sources."es6-set-0.1.5" // { @@ -85840,7 +87460,7 @@ in sources."event-emitter-0.3.5" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.5.0" + sources."type-2.6.0" ]; }) sources."extend-3.0.2" @@ -85854,12 +87474,12 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."iconv-lite-0.4.24" sources."inherits-2.0.4" (sources."inquirer-3.3.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."strip-ansi-4.0.0" ]; }) @@ -85877,13 +87497,13 @@ in sources."lru-cache-4.1.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" - sources."minimist-1.2.5" + sources."minimist-1.2.6" sources."ms-2.1.3" sources."mute-stream-0.0.7" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."object-assign-4.1.1" sources."object-inspect-1.12.0" sources."object-keys-1.1.1" @@ -85906,13 +87526,13 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."snabbdom-0.7.0" sources."snabbdom-selector-1.2.1" sources."sorted-immutable-list-1.1.0" (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."strip-ansi-4.0.0" ]; }) @@ -85969,7 +87589,7 @@ in sources."debug-2.6.9" sources."duplexer2-0.0.2" sources."envinfo-7.8.1" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" @@ -85984,9 +87604,9 @@ in sources."jsonfile-6.1.0" sources."kleur-3.0.3" sources."lru-cache-6.0.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -86060,10 +87680,10 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "5.16.0"; + version = "5.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-5.16.0.tgz"; - sha512 = "giK0IZz1cK51mTSTox51GUxgcbKy5Y5yXvyqVpfQ6m4nATSuiSRiMPvlxX3Er2uAiNkolyLTIgUxBAV/c8U3PQ=="; + url = "https://registry.npmjs.org/cspell/-/cspell-5.19.3.tgz"; + sha512 = "JJBH8iqtHYmxqLQZ+7GAMTVvc6SAoHVgn1tdYknOI2/uxAbZVH29eaxINY7JfjwPuxPPVAvttRetBAIRiu6ZYw=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -86078,45 +87698,48 @@ in sources."supports-color-5.5.0" ]; }) - sources."@cspell/cspell-bundled-dicts-5.16.0" - sources."@cspell/cspell-types-5.16.0" - sources."@cspell/dict-ada-1.1.2" - sources."@cspell/dict-aws-1.0.14" - sources."@cspell/dict-bash-1.0.17" - sources."@cspell/dict-companies-2.0.2" - sources."@cspell/dict-cpp-1.1.40" - sources."@cspell/dict-cryptocurrencies-1.0.10" + sources."@cspell/cspell-bundled-dicts-5.19.3" + sources."@cspell/cspell-pipe-5.19.3" + sources."@cspell/cspell-types-5.19.3" + sources."@cspell/dict-ada-2.0.0" + sources."@cspell/dict-aws-2.0.0" + sources."@cspell/dict-bash-2.0.1" + sources."@cspell/dict-companies-2.0.3" + sources."@cspell/dict-cpp-2.0.0" + sources."@cspell/dict-cryptocurrencies-2.0.0" sources."@cspell/dict-csharp-2.0.1" - sources."@cspell/dict-css-1.0.12" - sources."@cspell/dict-django-1.0.26" - sources."@cspell/dict-dotnet-1.0.32" - sources."@cspell/dict-elixir-1.0.26" + sources."@cspell/dict-css-2.0.0" + sources."@cspell/dict-dart-1.1.0" + sources."@cspell/dict-django-2.0.0" + sources."@cspell/dict-dotnet-2.0.1" + sources."@cspell/dict-elixir-2.0.1" sources."@cspell/dict-en-gb-1.1.33" - sources."@cspell/dict-en_us-2.1.4" + sources."@cspell/dict-en_us-2.2.0" sources."@cspell/dict-filetypes-2.0.1" - sources."@cspell/dict-fonts-1.0.14" + sources."@cspell/dict-fonts-2.0.0" sources."@cspell/dict-fullstack-2.0.4" - sources."@cspell/dict-golang-1.1.24" - sources."@cspell/dict-haskell-1.0.13" - sources."@cspell/dict-html-2.0.3" - sources."@cspell/dict-html-symbol-entities-1.0.23" - sources."@cspell/dict-java-1.0.23" - sources."@cspell/dict-latex-1.0.25" - sources."@cspell/dict-lorem-ipsum-1.0.22" - sources."@cspell/dict-lua-1.0.16" - sources."@cspell/dict-node-1.0.12" - sources."@cspell/dict-npm-1.0.16" - sources."@cspell/dict-php-1.0.25" - sources."@cspell/dict-powershell-1.0.19" + sources."@cspell/dict-golang-2.0.0" + sources."@cspell/dict-haskell-2.0.0" + sources."@cspell/dict-html-3.0.1" + sources."@cspell/dict-html-symbol-entities-2.0.0" + sources."@cspell/dict-java-2.0.0" + sources."@cspell/dict-latex-2.0.0" + sources."@cspell/dict-lorem-ipsum-2.0.0" + sources."@cspell/dict-lua-2.0.0" + sources."@cspell/dict-node-2.0.0" + sources."@cspell/dict-npm-2.0.2" + sources."@cspell/dict-php-2.0.0" + sources."@cspell/dict-powershell-2.0.0" sources."@cspell/dict-public-licenses-1.0.4" - sources."@cspell/dict-python-2.0.5" - sources."@cspell/dict-ruby-1.0.15" - sources."@cspell/dict-rust-1.0.23" - sources."@cspell/dict-scala-1.0.21" - sources."@cspell/dict-software-terms-2.0.12" - sources."@cspell/dict-swift-1.0.1" - sources."@cspell/dict-typescript-1.0.19" - sources."@cspell/dict-vue-2.0.1" + sources."@cspell/dict-python-2.0.6" + sources."@cspell/dict-r-1.0.2" + sources."@cspell/dict-ruby-2.0.1" + sources."@cspell/dict-rust-2.0.0" + sources."@cspell/dict-scala-2.0.0" + sources."@cspell/dict-software-terms-2.1.4" + sources."@cspell/dict-swift-1.0.2" + sources."@cspell/dict-typescript-2.0.0" + sources."@cspell/dict-vue-2.0.2" sources."@types/parse-json-4.0.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -86129,29 +87752,30 @@ in sources."clear-module-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-8.3.0" - sources."comment-json-4.1.1" + sources."commander-9.1.0" + sources."comment-json-4.2.2" sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."core-util-is-1.0.3" sources."cosmiconfig-7.0.1" sources."crypto-random-string-2.0.0" - sources."cspell-gitignore-5.16.0" - sources."cspell-glob-5.16.0" - sources."cspell-io-5.16.0" - sources."cspell-lib-5.16.0" - sources."cspell-trie-lib-5.16.0" + sources."cspell-gitignore-5.19.3" + sources."cspell-glob-5.19.3" + sources."cspell-io-5.19.3" + sources."cspell-lib-5.19.3" + sources."cspell-trie-lib-5.19.3" sources."dot-prop-5.3.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" + sources."fast-equals-3.0.0" sources."fast-json-stable-stringify-2.1.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" - sources."fs-extra-10.0.0" + sources."flatted-3.2.5" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."gensequence-3.1.1" sources."get-stdin-8.0.0" @@ -86185,8 +87809,8 @@ in sources."semver-6.3.0" ]; }) - sources."micromatch-4.0.4" - sources."minimatch-3.0.4" + sources."micromatch-4.0.5" + sources."minimatch-3.1.2" sources."once-1.4.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -86201,13 +87825,14 @@ in sources."resolve-global-1.0.0" sources."rimraf-3.0.2" sources."semver-7.3.5" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."universalify-2.0.0" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-uri-3.0.3" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" @@ -86257,6 +87882,7 @@ in sha512 = "3aU21K/7C0oviDjDNelk7Xl3UwPV3zJs6fzZa63BMpTrQPxxTN7OA7pp+oRy7thRlrBe+ZF5FHXkwYE4P2PFsA=="; }; dependencies = [ + sources."@colors/colors-1.5.0" (sources."@hyperswarm/dht-4.0.1" // { dependencies = [ sources."sodium-native-3.3.0" @@ -86274,7 +87900,7 @@ in sources."ajv-6.12.6" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-split-1.0.1" sources."ansi-styles-3.2.1" sources."anymatch-2.0.0" @@ -86339,7 +87965,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" sources."bulk-write-stream-1.1.4" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" @@ -86371,7 +87997,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colors-1.4.0" + sources."colors-1.0.3" sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" @@ -86401,7 +88027,7 @@ in sources."dat-registry-4.0.2" sources."dat-secret-storage-4.0.2" sources."dat-storage-1.1.2" - (sources."debug-4.3.3" // { + (sources."debug-4.3.4" // { dependencies = [ sources."ms-2.1.2" ]; @@ -86427,6 +88053,7 @@ in sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.4" sources."escape-string-regexp-1.0.5" + sources."events-3.3.0" sources."execa-0.7.0" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -86490,7 +88117,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -86574,12 +88201,12 @@ in sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" sources."mime-2.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-response-2.1.0" sources."min-document-2.19.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mirror-folder-3.1.0" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -86627,7 +88254,7 @@ in sources."os-homedir-1.0.2" sources."p-finally-1.0.0" sources."package-json-4.0.1" - sources."parse-headers-2.0.4" + sources."parse-headers-2.0.5" sources."pascalcase-0.1.1" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -86641,7 +88268,7 @@ in sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."progress-string-1.2.2" - sources."prompt-1.2.1" + sources."prompt-1.2.2" (sources."protocol-buffers-encodings-1.1.1" // { dependencies = [ sources."varint-5.0.0" @@ -86653,9 +88280,9 @@ in sources."punycode-2.1.1" sources."qs-6.5.3" sources."queue-tick-1.0.0" - sources."random-access-file-2.2.0" + sources."random-access-file-2.2.1" sources."random-access-memory-3.1.4" - sources."random-access-storage-1.4.2" + sources."random-access-storage-1.4.3" sources."randombytes-2.1.0" sources."range-parser-1.2.1" sources."rc-1.2.8" @@ -86665,7 +88292,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."record-cache-1.1.1" + sources."record-cache-1.2.0" sources."recursive-watch-1.1.4" sources."regex-not-1.0.2" sources."registry-auth-token-3.4.0" @@ -86692,11 +88319,11 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shuffled-priority-queue-2.1.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."signed-varint-2.0.1" sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" - (sources."siphash24-1.3.0" // { + sources."simple-get-3.1.1" + (sources."siphash24-1.3.1" // { dependencies = [ sources."nanoassert-2.0.0" ]; @@ -86850,7 +88477,6 @@ in (sources."winston-2.4.5" // { dependencies = [ sources."async-1.0.0" - sources."colors-1.0.3" ]; }) sources."wrappy-1.0.2" @@ -86893,60 +88519,57 @@ in "deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop" = nodeEnv.buildNodePackage { name = "deltachat-desktop"; packageName = "deltachat-desktop"; - version = "1.26.0"; + version = "1.28.0"; src = ../../applications/networking/instant-messengers/deltachat-desktop; dependencies = [ + sources."@ampproject/remapping-2.1.2" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.10" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - (sources."@babel/generator-7.16.8" // { + sources."@babel/compat-data-7.17.7" + sources."@babel/core-7.17.8" + (sources."@babel/generator-7.17.7" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - sources."@babel/helper-compilation-targets-7.16.7" - sources."@babel/helper-create-class-features-plugin-7.16.10" - sources."@babel/helper-create-regexp-features-plugin-7.16.7" + sources."@babel/helper-compilation-targets-7.17.7" + sources."@babel/helper-create-class-features-plugin-7.17.6" + sources."@babel/helper-create-regexp-features-plugin-7.17.0" sources."@babel/helper-define-polyfill-provider-0.3.1" sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-explode-assignable-expression-7.16.7" sources."@babel/helper-function-name-7.16.7" sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-member-expression-to-functions-7.16.7" + sources."@babel/helper-member-expression-to-functions-7.17.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.7" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" sources."@babel/helper-replace-supers-7.16.7" - sources."@babel/helper-simple-access-7.16.7" + sources."@babel/helper-simple-access-7.17.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.8" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.17.8" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/plugin-proposal-object-rest-spread-7.17.3" sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" sources."@babel/plugin-proposal-optional-chaining-7.16.7" sources."@babel/plugin-proposal-private-methods-7.16.11" @@ -86973,7 +88596,7 @@ in sources."@babel/plugin-transform-block-scoping-7.16.7" sources."@babel/plugin-transform-classes-7.16.7" sources."@babel/plugin-transform-computed-properties-7.16.7" - sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-destructuring-7.17.7" sources."@babel/plugin-transform-dotall-regex-7.16.7" sources."@babel/plugin-transform-duplicate-keys-7.16.7" sources."@babel/plugin-transform-exponentiation-operator-7.16.7" @@ -86982,8 +88605,8 @@ in sources."@babel/plugin-transform-literals-7.16.7" sources."@babel/plugin-transform-member-expression-literals-7.16.7" sources."@babel/plugin-transform-modules-amd-7.16.7" - sources."@babel/plugin-transform-modules-commonjs-7.16.8" - sources."@babel/plugin-transform-modules-systemjs-7.16.7" + sources."@babel/plugin-transform-modules-commonjs-7.17.7" + sources."@babel/plugin-transform-modules-systemjs-7.17.8" sources."@babel/plugin-transform-modules-umd-7.16.7" sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" sources."@babel/plugin-transform-new-target-7.16.7" @@ -86991,7 +88614,7 @@ in sources."@babel/plugin-transform-parameters-7.16.7" sources."@babel/plugin-transform-property-literals-7.16.7" sources."@babel/plugin-transform-react-display-name-7.16.7" - sources."@babel/plugin-transform-react-jsx-7.16.7" + sources."@babel/plugin-transform-react-jsx-7.17.3" sources."@babel/plugin-transform-react-jsx-development-7.16.7" sources."@babel/plugin-transform-react-pure-annotations-7.16.7" sources."@babel/plugin-transform-regenerator-7.16.7" @@ -87006,16 +88629,20 @@ in sources."@babel/preset-env-7.16.11" sources."@babel/preset-modules-0.1.5" sources."@babel/preset-react-7.16.7" - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.8" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" - sources."@blueprintjs/colors-4.0.0-beta.3" - sources."@blueprintjs/core-3.52.0" - sources."@blueprintjs/icons-3.31.0" - sources."@deltachat/message_parser_wasm-0.1.0" - sources."@electron/get-1.13.1" + sources."@babel/traverse-7.17.3" + sources."@babel/types-7.17.0" + sources."@blueprintjs/colors-4.0.1" + sources."@blueprintjs/core-3.54.0" + sources."@blueprintjs/icons-3.33.0" + sources."@deltachat/message_parser_wasm-0.3.0" + sources."@electron/get-1.14.1" sources."@hypnosphi/create-react-context-0.3.1" + sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/sourcemap-codec-1.4.11" + sources."@jridgewell/trace-mapping-0.3.4" + sources."@juggle/resize-observer-3.3.1" sources."@mapbox/extent-0.4.0" sources."@mapbox/geojson-coords-0.0.2" sources."@mapbox/geojson-extent-1.0.1" @@ -87037,16 +88664,17 @@ in sources."@types/geojson-7946.0.8" sources."@types/mapbox-gl-0.54.5" sources."@types/mime-types-2.1.1" - sources."@types/node-14.18.9" - sources."@types/node-fetch-2.5.12" + sources."@types/minimist-1.2.2" + sources."@types/node-14.18.12" + sources."@types/node-fetch-2.6.1" sources."@types/prop-types-15.7.4" - sources."@types/rc-1.2.0" - sources."@types/react-16.14.21" + sources."@types/rc-1.2.1" + sources."@types/react-16.14.24" sources."@types/react-dom-16.9.14" sources."@types/react-window-1.8.5" - sources."@types/react-window-infinite-loader-1.0.5" + sources."@types/react-window-infinite-loader-1.0.6" sources."@types/scheduler-0.16.2" - sources."@types/url-parse-1.4.7" + sources."@types/url-parse-1.4.8" sources."ansi-styles-3.2.1" (sources."anymatch-2.0.0" // { dependencies = [ @@ -87068,7 +88696,7 @@ in sources."atob-2.1.2" sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-polyfill-corejs2-0.3.1" - sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-corejs3-0.5.2" sources."babel-plugin-polyfill-regenerator-0.3.1" (sources."base-0.11.2" // { dependencies = [ @@ -87077,13 +88705,13 @@ in }) sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."boolean-3.1.4" + sources."boolean-3.2.0" (sources."braces-2.3.2" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.19.1" + sources."browserslist-4.20.2" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" @@ -87094,7 +88722,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001320" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -87135,7 +88763,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.20.3" // { + (sources."core-js-compat-3.21.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -87143,9 +88771,9 @@ in sources."core-util-is-1.0.3" sources."crypto-random-string-1.0.0" sources."csscolorparser-1.0.3" - sources."csstype-3.0.10" + sources."csstype-3.0.11" sources."debounce-1.2.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-equal-1.1.1" @@ -87154,21 +88782,21 @@ in sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - sources."deltachat-node-1.70.0" + sources."deltachat-node-1.76.0" sources."detect-node-2.1.0" sources."dom-helpers-3.4.0" sources."dom4-2.1.6" sources."duplexer3-0.1.4" sources."earcut-2.2.3" - sources."electron-13.6.7" - sources."electron-to-chromium-1.4.51" + sources."electron-14.2.8" + sources."electron-to-chromium-1.4.96" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."env-paths-2.2.1" - sources."error-stack-parser-2.0.6" + sources."error-stack-parser-2.0.7" sources."es6-error-4.1.1" sources."esbuild-0.12.29" sources."escalade-3.1.1" @@ -87258,7 +88886,7 @@ in sources."gud-1.0.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -87297,7 +88925,7 @@ in sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-stringify-safe-5.0.1" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."jsonfile-4.0.0" sources."jsqr-1.4.0" sources."just-debounce-1.1.0" @@ -87306,7 +88934,6 @@ in sources."kind-of-6.0.3" sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" - sources."lodash.pick-4.4.0" sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -87324,16 +88951,16 @@ in }) sources."memoize-one-5.2.1" sources."micromatch-3.1.10" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-response-1.0.1" - sources."minimist-1.2.5" + sources."minimist-1.2.6" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."moment-2.29.1" sources."ms-2.1.2" sources."murmurhash-js-1.0.0" @@ -87342,7 +88969,7 @@ in sources."napi-macros-2.0.0" sources."node-fetch-2.6.7" sources."node-gyp-build-4.3.0" - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."normalize.css-8.0.1" @@ -87400,11 +89027,12 @@ in sources."react-popper-1.3.11" sources."react-qr-reader-2.2.1" sources."react-qr-svg-2.4.0" - sources."react-string-replace-0.4.4" + sources."react-string-replace-1.0.0" sources."react-transition-group-2.9.0" sources."react-virtualized-auto-sizer-1.0.6" sources."react-window-1.8.6" sources."react-window-infinite-loader-1.0.7" + sources."react-zoom-pan-pinch-2.1.3" sources."readable-stream-3.6.0" (sources."readdirp-2.2.1" // { dependencies = [ @@ -87414,14 +89042,14 @@ in ]; }) sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-9.0.0" + sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.1" - sources."regexpu-core-4.8.0" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.7.0" // { + sources."regexpu-core-5.0.1" + sources."regjsgen-0.6.0" + (sources."regjsparser-0.8.4" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -87430,8 +89058,7 @@ in sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" sources."requires-port-1.0.0" - sources."resize-observer-polyfill-1.5.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-protobuf-schema-2.1.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -87441,7 +89068,7 @@ in sources."rw-0.1.4" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" - (sources."sass-1.49.0" // { + (sources."sass-1.49.9" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -87510,7 +89137,7 @@ in sources."split-string-3.1.0" sources."split2-3.2.2" sources."sprintf-js-1.1.2" - sources."stackframe-1.2.0" + sources."stackframe-1.2.1" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -87549,12 +89176,12 @@ in sources."to-regex-range-2.1.1" sources."tr46-0.0.3" sources."traverse-0.6.6" - sources."tslib-1.13.0" + sources."tslib-2.3.1" sources."tunnel-0.0.6" sources."type-fest-0.3.1" sources."typed-styles-0.0.7" sources."typedarray-0.0.6" - sources."typescript-4.5.5" + sources."typescript-4.6.3" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.0.0" @@ -87574,7 +89201,7 @@ in }) sources."upath-1.2.0" sources."urix-0.1.0" - sources."url-parse-1.5.4" + sources."url-parse-1.5.10" sources."url-parse-lax-3.0.0" sources."use-3.1.1" sources."use-debounce-3.4.3" @@ -87605,7 +89232,7 @@ in sha512 = "SfKVTg5qqe5aXSrSAXABM1yJl3OjekhSg6ryJyLjK1015waNj9fmMq8SrHI6qWuICtiprfYbh/f55giBJcC9Ag=="; }; dependencies = [ - sources."minimist-1.2.5" + sources."minimist-1.2.6" ]; buildInputs = globalBuildInputs; meta = { @@ -87662,8 +89289,8 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."merge2-1.4.1" - sources."micromatch-4.0.4" - sources."minimatch-3.0.4" + sources."micromatch-4.0.5" + sources."minimatch-3.1.2" sources."once-1.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -87688,7 +89315,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-6.1.1" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."wrappy-1.0.2" @@ -87706,23 +89333,23 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.7.3"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.7.3.tgz"; - sha512 = "+fY8JCuoL3T698EZKd78SF1RrGBGYZVRzRDLrWHaum3qx5gW8uMDX41rtaehX7/ZNH/WSuwyFtWh3/JWmjEAKw=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.8.0.tgz"; + sha512 = "7oxOu3PWDzsTkLbUIm1O61rgdNiM9j9tAt+T0R5m0TFG0NYypYBM77pfzAYmQFpHGHAstCtOaEYzEnp0IkRCnQ=="; }; dependencies = [ - sources."dockerfile-ast-0.4.1" - sources."dockerfile-language-service-0.7.4" - sources."dockerfile-utils-0.9.3" - sources."vscode-jsonrpc-8.0.0-next.5" - sources."vscode-languageserver-8.0.0-next.6" - (sources."vscode-languageserver-protocol-3.17.0-next.12" // { + sources."dockerfile-ast-0.4.2" + sources."dockerfile-language-service-0.8.1" + sources."dockerfile-utils-0.9.4" + sources."vscode-jsonrpc-8.0.0-next.7" + sources."vscode-languageserver-8.0.0-next.10" + (sources."vscode-languageserver-protocol-3.17.0-next.16" // { dependencies = [ - sources."vscode-languageserver-types-3.17.0-next.6" + sources."vscode-languageserver-types-3.17.0-next.9" ]; }) - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.17.0-next.3" ]; buildInputs = globalBuildInputs; @@ -87738,22 +89365,22 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.79.3"; + version = "6.82.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.79.3.tgz"; - sha512 = "u4NUMlGJjJXOnRfp6LXSVQdQzaVmjsXJwaUxvRBEUxjVhC2WEptTkyuCcsyLLOof3oEaEonC7gJC/+eXd1I+6g=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.82.1.tgz"; + sha512 = "21LnOw92tD3UXOP0/yaWYBig5p28N5q8TTgL64mkIkNWUIKA2gOa+UO+Enejs1Mubo36jNX830w2ea1uJfHcLg=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.9" + sources."@types/node-14.18.12" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.920.0" + sources."aws-sdk-2.1097.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -87761,12 +89388,12 @@ in sources."big.js-5.2.2" sources."buffer-4.9.2" sources."buffer-queue-1.0.0" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."caseless-0.12.0" sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."delay-4.4.1" + sources."delay-5.0.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."eventemitter3-4.0.7" @@ -87795,7 +89422,7 @@ in sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" - sources."jmespath-0.15.0" + sources."jmespath-0.16.0" sources."jsbn-0.1.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" @@ -87813,9 +89440,9 @@ in sources."lodash.uniq-4.5.0" sources."lossless-json-1.0.5" sources."method-missing-1.2.4" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimist-1.2.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimist-1.2.6" sources."oauth-sign-0.9.0" sources."p-finally-1.0.0" sources."p-queue-6.6.2" @@ -87832,7 +89459,7 @@ in ]; }) sources."request-2.88.2" - sources."requestretry-4.1.2" + sources."requestretry-7.0.2" sources."s3-stream-upload-2.0.2" sources."s3signed-0.1.0" sources."s3urls-1.5.2" @@ -87867,7 +89494,6 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" - sources."when-3.7.8" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" ]; @@ -87908,7 +89534,7 @@ in sources."@electron-forge/template-typescript-6.0.0-beta.63" sources."@electron-forge/template-typescript-webpack-6.0.0-beta.63" sources."@electron-forge/template-webpack-6.0.0-beta.63" - (sources."@electron/get-1.13.1" // { + (sources."@electron/get-1.14.1" // { dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -87934,27 +89560,27 @@ in sources."universalify-0.1.2" ]; }) - sources."@gar/promisify-1.1.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-1.1.0" + sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" - sources."@sindresorhus/is-4.3.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" sources."@types/glob-7.2.0" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.3" + sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ansi-escapes-4.3.2" // { @@ -87965,8 +89591,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" - sources."array-find-index-1.0.2" + sources."are-we-there-yet-3.0.0" (sources."asar-3.1.0" // { dependencies = [ sources."commander-5.1.0" @@ -87984,7 +89609,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."bl-4.1.0" sources."bluebird-3.7.2" - sources."boolean-3.1.4" + sources."boolean-3.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-5.7.1" @@ -87996,8 +89621,6 @@ in sources."cacache-15.3.0" sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.2" - sources."camelcase-2.1.1" - sources."camelcase-keys-2.1.0" sources."caseless-0.12.0" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -88027,14 +89650,12 @@ in sources."@malept/cross-spawn-promise-1.1.1" ]; }) - sources."currently-unhandled-0.4.1" sources."dashdash-1.14.1" - (sources."debug-4.3.3" // { + (sources."debug-4.3.4" // { dependencies = [ sources."ms-2.1.2" ]; }) - sources."decamelize-1.2.0" (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" @@ -88055,7 +89676,7 @@ in sources."detect-node-2.1.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - (sources."electron-notarize-1.1.1" // { + (sources."electron-notarize-1.2.1" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -88127,7 +89748,7 @@ in }) sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -88140,7 +89761,7 @@ in sources."universalify-0.1.2" ]; }) - sources."gauge-4.0.0" + sources."gauge-4.0.3" sources."get-caller-file-2.0.5" sources."get-installed-path-2.1.1" (sources."get-package-info-1.0.0" // { @@ -88148,7 +89769,6 @@ in sources."debug-2.6.9" ]; }) - sources."get-stdin-4.0.1" sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.2.0" @@ -88185,13 +89805,12 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."inquirer-8.2.0" + sources."inquirer-8.2.2" sources."ip-1.1.5" sources."is-arrayish-0.2.1" sources."is-core-module-2.8.1" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" - sources."is-finite-1.1.0" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-interactive-1.0.0" @@ -88200,7 +89819,6 @@ in sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" - sources."is-utf8-0.2.1" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-0.0.1" @@ -88215,44 +89833,31 @@ in sources."jsonfile-6.1.0" sources."jsprim-1.4.2" sources."junk-3.1.0" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."load-json-file-2.0.0" sources."locate-path-2.0.0" sources."lodash-4.17.21" sources."lodash.get-4.4.2" sources."log-symbols-4.1.0" - sources."loud-rejection-1.6.0" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."lzma-native-8.0.6" sources."make-fetch-happen-9.1.0" sources."map-age-cleaner-0.1.3" - sources."map-obj-1.0.1" (sources."matcher-3.0.0" // { dependencies = [ sources."escape-string-regexp-4.0.0" ]; }) sources."mem-4.3.0" - (sources."meow-3.7.0" // { - dependencies = [ - sources."find-up-1.1.2" - sources."load-json-file-1.1.0" - sources."path-exists-2.1.0" - sources."path-type-1.1.0" - sources."read-pkg-1.1.0" - sources."read-pkg-up-1.0.1" - sources."strip-bom-2.0.0" - ]; - }) sources."merge2-1.4.1" - sources."micromatch-4.0.4" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."micromatch-4.0.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" @@ -88263,9 +89868,9 @@ in sources."mkdirp-1.0.4" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."nice-try-1.0.5" - sources."node-abi-3.5.0" + sources."node-abi-3.8.0" sources."node-addon-api-3.2.1" sources."node-api-version-0.1.4" sources."node-fetch-2.6.7" @@ -88288,15 +89893,14 @@ in sources."path-key-2.0.1" ]; }) - sources."npmlog-6.0.0" - (sources."nugget-2.0.1" // { + sources."npmlog-6.0.1" + (sources."nugget-2.0.2" // { dependencies = [ sources."debug-2.6.9" ]; }) sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" sources."object-keys-0.4.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -88324,8 +89928,6 @@ in sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" (sources."pkg-dir-4.2.0" // { dependencies = [ sources."find-up-4.1.0" @@ -88336,9 +89938,9 @@ in sources."path-exists-4.0.0" ]; }) - sources."plist-3.0.4" + sources."plist-3.0.5" sources."prepend-http-2.0.0" - sources."pretty-bytes-1.0.4" + sources."pretty-bytes-4.0.2" sources."pretty-ms-7.0.1" sources."progress-2.0.3" sources."progress-stream-1.2.0" @@ -88359,15 +89961,9 @@ in ]; }) sources."readable-stream-3.6.0" - (sources."redent-1.0.0" // { - dependencies = [ - sources."indent-string-2.1.0" - ]; - }) - sources."repeating-2.0.1" sources."request-2.88.2" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-alpn-1.2.1" sources."resolve-dir-1.0.1" sources."resolve-package-1.0.1" @@ -88379,7 +89975,7 @@ in sources."roarr-2.15.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.2" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -88388,7 +89984,7 @@ in sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."single-line-log-1.1.2" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -88398,7 +89994,7 @@ in ]; }) sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-6.1.1" sources."source-map-0.6.1" sources."source-map-support-0.5.21" @@ -88415,7 +90011,6 @@ in sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" - sources."strip-indent-1.0.1" sources."strip-outer-1.0.1" sources."sudo-prompt-9.2.1" sources."sumchecker-3.0.1" @@ -88435,7 +90030,6 @@ in sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."tr46-0.0.3" - sources."trim-newlines-1.0.0" sources."trim-repeated-1.0.0" sources."tslib-2.3.1" sources."tunnel-0.0.6" @@ -88467,9 +90061,9 @@ in sources."xtend-2.1.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-17.3.1" // { + (sources."yargs-17.4.0" // { dependencies = [ - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -88523,16 +90117,17 @@ in sha512 = "ceJSyC2s1VCIqyzGkHeJkWBq/85QXaHM+0rZ1lRRtmcK9CsfRDyLSIZ7KJDZhPdIRUXBgBkdcOAW3AIu/yO/ew=="; }; dependencies = [ + sources."@ampproject/remapping-2.1.2" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.10" // { + sources."@babel/compat-data-7.17.7" + (sources."@babel/core-7.17.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.16.8" + sources."@babel/generator-7.17.7" sources."@babel/helper-annotate-as-pure-7.16.7" - (sources."@babel/helper-compilation-targets-7.16.7" // { + (sources."@babel/helper-compilation-targets-7.17.7" // { dependencies = [ sources."semver-6.3.0" ]; @@ -88542,24 +90137,27 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.7" sources."@babel/helper-plugin-utils-7.16.7" - sources."@babel/helper-simple-access-7.16.7" + sources."@babel/helper-simple-access-7.17.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.8" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" - sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/parser-7.17.8" + sources."@babel/plugin-proposal-object-rest-spread-7.17.3" sources."@babel/plugin-syntax-jsx-7.16.7" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-destructuring-7.17.7" sources."@babel/plugin-transform-parameters-7.16.7" - sources."@babel/plugin-transform-react-jsx-7.16.7" + sources."@babel/plugin-transform-react-jsx-7.17.3" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.3" + sources."@babel/types-7.17.0" + sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/sourcemap-codec-1.4.11" + sources."@jridgewell/trace-mapping-0.3.4" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/yoga-layout-1.9.2" @@ -88578,13 +90176,13 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.19.1" + sources."browserslist-4.20.2" 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.30001301" + sources."caniuse-lite-1.0.30001320" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -88605,7 +90203,7 @@ in sources."convert-to-spaces-1.0.2" sources."cross-spawn-6.0.5" sources."debounce-fn-4.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -88613,7 +90211,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -88650,7 +90248,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."ink-text-input-4.0.2" // { + (sources."ink-text-input-4.0.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -88676,7 +90274,7 @@ in 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.0" + sources."json5-2.2.1" sources."kind-of-6.0.3" sources."lines-and-columns-1.2.4" sources."locate-path-3.0.0" @@ -88698,12 +90296,11 @@ in }) sources."mimic-fn-3.1.0" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nice-try-1.0.5" - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" @@ -88739,7 +90336,7 @@ in sources."punycode-2.1.1" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.22.1" + sources."react-devtools-core-4.24.2" sources."react-is-16.13.1" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { @@ -88757,7 +90354,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-3.0.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" @@ -88767,7 +90364,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.3" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."skin-tone-1.0.0" (sources."slice-ansi-3.0.0" // { dependencies = [ @@ -88808,7 +90405,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" @@ -88841,31 +90438,60 @@ in reconstructLock = true; }; "epgstation-../../applications/video/epgstation" = nodeEnv.buildNodePackage { - name = "EPGStation"; - packageName = "EPGStation"; - version = "1.7.5"; + name = "epgstation"; + packageName = "epgstation"; + version = "2.6.20"; src = ../../applications/video/epgstation; dependencies = [ - sources."@babel/code-frame-7.16.7" + sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.16.7" (sources."@babel/highlight-7.16.10" // { 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."@fluentui/date-time-utilities-7.9.1" - sources."@fluentui/dom-utilities-1.1.2" - sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.181.0" - sources."@fluentui/react-focus-7.18.1" - sources."@fluentui/react-window-provider-1.0.2" - sources."@fluentui/theme-1.7.4" - sources."@gar/promisify-1.1.2" - (sources."@gulp-sourcemaps/identity-map-1.0.2" // { + (sources."@chinachu/aribts-1.3.5-mirakurun.17" // { dependencies = [ - sources."normalize-path-2.1.1" + sources."iconv-lite-0.6.3" + ]; + }) + sources."@cspotcode/source-map-consumer-0.8.0" + sources."@cspotcode/source-map-support-0.7.0" + (sources."@eslint/eslintrc-0.4.3" // { + dependencies = [ + sources."ajv-6.12.6" + sources."debug-4.3.4" + sources."ignore-4.0.6" + sources."js-yaml-3.14.1" + sources."json-schema-traverse-0.4.1" + sources."ms-2.1.2" + sources."strip-json-comments-3.1.1" + ]; + }) + sources."@fluentui/date-time-utilities-8.5.0" + sources."@fluentui/dom-utilities-2.2.0" + sources."@fluentui/font-icons-mdl2-8.2.5" + sources."@fluentui/foundation-legacy-8.2.5" + sources."@fluentui/keyboard-key-0.4.0" + sources."@fluentui/merge-styles-8.5.0" + sources."@fluentui/react-8.62.3" + sources."@fluentui/react-focus-8.5.6" + sources."@fluentui/react-hooks-8.5.3" + sources."@fluentui/react-window-provider-2.2.0" + sources."@fluentui/set-version-8.2.0" + sources."@fluentui/style-utilities-8.6.5" + sources."@fluentui/theme-2.6.4" + sources."@fluentui/utilities-8.8.1" + (sources."@gulp-sourcemaps/identity-map-2.0.1" // { + dependencies = [ + sources."acorn-6.4.2" + sources."inherits-2.0.4" + sources."through2-3.0.2" ]; }) (sources."@gulp-sourcemaps/map-sources-1.0.0" // { @@ -88873,99 +90499,111 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.244" + (sources."@humanwhocodes/config-array-0.5.0" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + ]; + }) + sources."@humanwhocodes/object-schema-1.2.1" + sources."@microsoft/load-themed-styles-1.10.249" + sources."@node-rs/crc32-1.5.0" + sources."@node-rs/crc32-android-arm-eabi-1.5.0" + sources."@node-rs/crc32-android-arm64-1.5.0" + sources."@node-rs/crc32-darwin-arm64-1.5.0" + sources."@node-rs/crc32-darwin-x64-1.5.0" + sources."@node-rs/crc32-freebsd-x64-1.5.0" + sources."@node-rs/crc32-linux-arm-gnueabihf-1.5.0" + sources."@node-rs/crc32-linux-arm64-gnu-1.5.0" + sources."@node-rs/crc32-linux-arm64-musl-1.5.0" + sources."@node-rs/crc32-linux-x64-gnu-1.5.0" + sources."@node-rs/crc32-linux-x64-musl-1.5.0" + sources."@node-rs/crc32-win32-arm64-msvc-1.5.0" + sources."@node-rs/crc32-win32-ia32-msvc-1.5.0" + sources."@node-rs/crc32-win32-x64-msvc-1.5.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-1.1.0" - (sources."@npmcli/move-file-1.1.2" // { - dependencies = [ - sources."rimraf-3.0.2" - ]; - }) sources."@sindresorhus/is-0.14.0" + sources."@socket.io/base64-arraybuffer-1.0.2" + sources."@sqltools/formatter-1.2.3" sources."@szmarczak/http-timer-1.1.2" - sources."@types/basic-auth-1.1.3" - sources."@types/body-parser-1.19.0" - sources."@types/caseless-0.12.2" - sources."@types/chart.js-2.9.24" + sources."@tokenizer/token-0.3.0" + sources."@tsconfig/node10-1.0.8" + sources."@tsconfig/node12-1.0.9" + sources."@tsconfig/node14-1.0.1" + sources."@tsconfig/node16-1.0.2" + sources."@types/body-parser-1.19.1" + sources."@types/component-emitter-1.2.11" sources."@types/connect-3.4.35" - sources."@types/engine.io-3.1.7" - sources."@types/express-4.17.8" + sources."@types/cookie-0.4.1" + sources."@types/cors-2.8.12" + sources."@types/express-4.17.13" sources."@types/express-serve-static-core-4.17.28" - sources."@types/fancy-log-1.3.0" - sources."@types/glob-7.2.0" - sources."@types/hls.js-0.13.1" - sources."@types/js-yaml-3.12.5" - sources."@types/json-schema-7.0.9" - sources."@types/lodash-4.14.161" - sources."@types/material-design-lite-1.1.16" + sources."@types/file-type-10.9.1" + sources."@types/js-yaml-4.0.4" + sources."@types/json-schema-7.0.11" + sources."@types/lodash-4.14.176" sources."@types/mime-1.3.2" - sources."@types/minimatch-3.0.5" - sources."@types/minimist-1.2.0" - sources."@types/mithril-2.0.3" - sources."@types/mkdirp-1.0.1" - sources."@types/multer-1.4.4" - sources."@types/mysql-2.15.15" - sources."@types/node-14.11.1" - sources."@types/pg-7.14.5" - sources."@types/pg-types-2.2.0" + sources."@types/minimist-1.2.2" + sources."@types/mkdirp-1.0.2" + sources."@types/mongodb-4.0.6" + sources."@types/multer-1.4.7" + sources."@types/node-16.11.6" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - (sources."@types/request-2.48.5" // { + sources."@types/serve-static-1.13.10" + sources."@types/socket.io-3.0.1" + sources."@types/source-map-support-0.5.4" + sources."@types/sqlite3-3.1.7" + sources."@types/url-join-4.0.1" + sources."@types/uuid-3.4.10" + sources."@types/webidl-conversions-6.1.1" + sources."@types/whatwg-url-8.2.1" + sources."@types/ws-6.0.4" + (sources."@typescript-eslint/eslint-plugin-4.33.0" // { dependencies = [ - sources."form-data-2.5.1" + sources."debug-4.3.4" + sources."ms-2.1.2" ]; }) - sources."@types/serve-static-1.13.10" - sources."@types/socket.io-2.1.11" - sources."@types/socket.io-client-1.4.33" - sources."@types/sqlite3-3.1.6" - sources."@types/tough-cookie-4.0.1" - sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.10.1" - sources."@uifabric/icons-7.6.2" - sources."@uifabric/merge-styles-7.19.2" - sources."@uifabric/react-hooks-7.14.0" - sources."@uifabric/set-version-7.0.24" - sources."@uifabric/styling-7.20.0" - sources."@uifabric/utilities-7.33.5" - sources."@webassemblyjs/ast-1.9.0" - sources."@webassemblyjs/floating-point-hex-parser-1.9.0" - sources."@webassemblyjs/helper-api-error-1.9.0" - sources."@webassemblyjs/helper-buffer-1.9.0" - sources."@webassemblyjs/helper-code-frame-1.9.0" - sources."@webassemblyjs/helper-fsm-1.9.0" - sources."@webassemblyjs/helper-module-context-1.9.0" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" - sources."@webassemblyjs/helper-wasm-section-1.9.0" - sources."@webassemblyjs/ieee754-1.9.0" - sources."@webassemblyjs/leb128-1.9.0" - sources."@webassemblyjs/utf8-1.9.0" - sources."@webassemblyjs/wasm-edit-1.9.0" - sources."@webassemblyjs/wasm-gen-1.9.0" - sources."@webassemblyjs/wasm-opt-1.9.0" - sources."@webassemblyjs/wasm-parser-1.9.0" - sources."@webassemblyjs/wast-parser-1.9.0" - sources."@webassemblyjs/wast-printer-1.9.0" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" + sources."@typescript-eslint/experimental-utils-4.33.0" + (sources."@typescript-eslint/parser-4.33.0" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + ]; + }) + sources."@typescript-eslint/scope-manager-4.33.0" + sources."@typescript-eslint/types-4.33.0" + (sources."@typescript-eslint/typescript-estree-4.33.0" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + ]; + }) + sources."@typescript-eslint/visitor-keys-4.33.0" sources."abbrev-1.1.1" - sources."accepts-1.3.7" - sources."acorn-5.7.4" - sources."after-0.8.2" + sources."accepts-1.3.8" + sources."acorn-7.4.1" + sources."acorn-jsx-5.3.2" + sources."acorn-walk-8.2.0" sources."aggregate-error-3.1.0" - sources."ajv-6.12.6" - sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.2" - sources."ansi-colors-1.1.0" + sources."ajv-8.11.0" + sources."ajv-formats-2.1.1" + sources."ansi-colors-4.1.1" sources."ansi-cyan-0.1.1" - sources."ansi-escapes-1.4.0" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) sources."ansi-gray-0.1.1" sources."ansi-red-0.1.1" sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ansi-styles-4.3.0" sources."ansi-wrap-0.1.0" + sources."any-promise-1.3.0" (sources."anymatch-2.0.0" // { dependencies = [ (sources."braces-2.3.2" // { @@ -88988,6 +90626,7 @@ in sources."to-regex-range-2.1.1" ]; }) + sources."app-root-path-3.0.0" sources."append-buffer-1.0.2" sources."append-field-1.0.0" sources."aproba-1.2.0" @@ -88999,7 +90638,10 @@ in sources."string_decoder-1.1.1" ]; }) + sources."arg-4.1.3" sources."argparse-1.0.10" + sources."arib-mpeg2ts-parser-3.0.13" + sources."arib-subtitle-timedmetadater-4.0.9" sources."aribts-2.1.12" sources."arr-diff-4.0.0" sources."arr-filter-1.1.2" @@ -89026,37 +90668,19 @@ in }) sources."array-union-2.1.0" sources."array-unique-0.3.2" - sources."arraybuffer.slice-0.0.7" sources."asn1-0.2.6" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - (sources."assert-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" - ]; - }) sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" + sources."astral-regex-2.0.0" sources."async-done-1.3.2" sources."async-each-1.0.3" sources."async-limiter-1.0.1" sources."async-settle-1.0.0" sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."b24.js-1.0.3" - sources."babel-polyfill-6.23.0" - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."regenerator-runtime-0.11.1" - ]; - }) + sources."axios-0.24.0" sources."bach-1.2.0" sources."backo2-1.0.2" sources."balanced-match-1.0.2" @@ -89065,42 +90689,23 @@ in sources."define-property-1.0.0" ]; }) - sources."base64-arraybuffer-0.1.4" sources."base64-js-1.5.1" sources."base64id-2.0.0" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" - sources."better-assert-1.0.2" - sources."big.js-5.2.2" + sources."big-integer-1.6.51" sources."bignumber.js-9.0.0" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."blob-0.0.5" sources."block-stream-0.0.9" - sources."bluebird-3.7.2" - sources."bn.js-5.2.0" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."brorand-1.1.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { - dependencies = [ - sources."inherits-2.0.4" - sources."safe-buffer-5.2.1" - ]; - }) - sources."browserify-zlib-0.2.0" + sources."bson-4.6.2" sources."buffer-5.7.1" sources."buffer-equal-1.0.0" sources."buffer-from-1.1.2" - sources."buffer-writer-2.0.0" - sources."buffer-xor-1.0.3" - sources."builtin-modules-1.1.1" - sources."builtin-status-codes-3.0.0" + sources."bufferutil-4.0.6" (sources."busboy-0.2.14" // { dependencies = [ sources."readable-stream-1.1.14" @@ -89108,17 +90713,6 @@ in ]; }) sources."bytes-3.1.0" - (sources."cacache-15.3.0" // { - dependencies = [ - sources."chownr-2.0.0" - sources."fs-minipass-2.1.0" - sources."minipass-3.1.6" - sources."minizlib-2.1.2" - sources."p-map-4.0.0" - sources."rimraf-3.0.2" - sources."tar-6.1.11" - ]; - }) sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -89127,14 +90721,11 @@ in ]; }) sources."call-bind-1.0.2" - sources."callsite-1.0.0" + sources."callsites-3.1.0" sources."camelcase-3.0.0" sources."caseless-0.12.0" - sources."chalk-1.1.3" - sources."chardet-0.4.2" - sources."chart.js-2.9.3" - sources."chartjs-color-2.4.1" - sources."chartjs-color-string-0.6.0" + sources."chalk-4.1.2" + sources."chardet-0.7.0" (sources."chokidar-2.1.8" // { dependencies = [ sources."braces-2.3.2" @@ -89151,8 +90742,6 @@ in ]; }) sources."chownr-1.1.4" - sources."chrome-trace-event-1.0.3" - sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -89170,14 +90759,24 @@ in sources."kind-of-5.1.0" ]; }) - sources."clean-css-4.2.3" sources."clean-stack-2.2.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" - (sources."cliui-3.2.0" // { + sources."cli-cursor-3.1.0" + (sources."cli-highlight-2.1.11" // { dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."yargs-16.2.0" + ]; + }) + sources."cli-width-3.0.0" + (sources."cliui-7.0.4" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."clone-2.1.2" @@ -89194,16 +90793,12 @@ in sources."code-point-at-1.1.0" sources."collection-map-1.0.0" sources."collection-visit-1.0.0" - 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-support-1.1.3" - sources."colors-1.4.0" sources."combined-stream-1.0.8" - sources."commander-2.20.3" - sources."commondir-1.0.1" - sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" - sources."component-inherit-0.0.3" + sources."commander-7.2.0" + sources."component-emitter-1.3.0" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { dependencies = [ @@ -89212,40 +90807,33 @@ in sources."string_decoder-1.1.1" ]; }) - sources."concat-with-sourcemaps-1.1.0" - sources."console-browserify-1.2.0" sources."console-control-strings-1.1.0" - sources."constants-browserify-1.0.0" sources."content-disposition-0.5.3" sources."content-type-1.0.4" sources."convert-source-map-1.8.0" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - (sources."copy-concurrently-1.0.5" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) sources."copy-descriptor-0.1.1" (sources."copy-props-2.0.5" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."core-js-2.6.12" sources."core-util-is-1.0.3" + sources."cors-2.8.5" sources."crc-3.8.0" - (sources."create-ecdh-4.0.4" // { + sources."create-require-1.1.1" + (sources."cross-spawn-7.0.3" // { dependencies = [ - sources."bn.js-4.12.0" + sources."which-2.0.2" + ]; + }) + (sources."css-3.0.0" // { + dependencies = [ + sources."inherits-2.0.4" + sources."source-map-resolve-0.6.0" ]; }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - sources."crypto-browserify-3.12.0" - sources."css-2.2.4" - sources."css-ripple-effect-1.0.5" - sources."cyclist-1.0.1" sources."d-1.0.1" sources."dashdash-1.14.1" sources."date-format-3.0.0" @@ -89260,6 +90848,7 @@ in sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" + sources."deep-is-0.1.4" (sources."default-compare-1.0.0" // { dependencies = [ sources."kind-of-5.1.0" @@ -89269,15 +90858,15 @@ in sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" - (sources."del-5.1.0" // { + (sources."del-6.0.0" // { dependencies = [ sources."rimraf-3.0.2" ]; }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" + sources."denque-2.0.1" sources."depd-1.1.2" - sources."des.js-1.0.1" sources."destroy-1.0.4" sources."detect-file-1.0.0" sources."detect-libc-1.0.3" @@ -89289,15 +90878,10 @@ in ]; }) sources."diff-4.0.2" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."difunc-0.0.4" sources."dir-glob-3.0.1" - sources."diskusage-1.1.3" - sources."domain-browser-1.2.0" + sources."diskusage-ng-1.0.2" + sources."doctrine-3.0.0" sources."dotenv-8.6.0" sources."duplexer3-0.1.4" (sources."duplexify-3.7.1" // { @@ -89310,60 +90894,73 @@ in sources."each-props-1.3.2" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - (sources."elliptic-6.5.4" // { - dependencies = [ - sources."bn.js-4.12.0" - sources."inherits-2.0.4" - ]; - }) - sources."emojis-list-3.0.0" + sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.2" // { + (sources."engine.io-6.0.1" // { dependencies = [ - sources."cookie-0.3.1" - sources."debug-4.1.1" - sources."ms-2.1.3" + sources."cookie-0.4.2" + sources."debug-4.3.4" + sources."ms-2.1.2" + sources."ws-8.2.3" ]; }) - (sources."engine.io-client-3.4.4" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."ws-6.1.4" - ]; - }) - sources."engine.io-parser-2.2.1" - sources."enhanced-resolve-4.5.0" - sources."errno-0.1.8" + sources."engine.io-parser-5.0.3" + sources."enhanced-resolve-5.9.2" + sources."enquirer-2.3.6" sources."error-ex-1.3.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.59" sources."es6-iterator-2.0.3" - sources."es6-promise-4.2.8" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" + sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."eslint-scope-4.0.3" + (sources."eslint-7.32.0" // { + dependencies = [ + sources."ajv-6.12.6" + sources."ansi-regex-5.0.1" + sources."debug-4.3.4" + sources."escape-string-regexp-4.0.0" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."ignore-4.0.6" + sources."js-yaml-3.14.1" + sources."json-schema-traverse-0.4.1" + sources."ms-2.1.2" + sources."strip-ansi-6.0.1" + sources."strip-json-comments-3.1.1" + ]; + }) + sources."eslint-config-prettier-8.3.0" + sources."eslint-plugin-prettier-3.4.1" + sources."eslint-scope-5.1.1" + sources."eslint-utils-3.0.0" + sources."eslint-visitor-keys-2.1.0" + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" + (sources."esquery-1.4.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) (sources."esrecurse-4.3.0" // { dependencies = [ sources."estraverse-5.3.0" ]; }) sources."estraverse-4.3.0" + sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-emitter-0.3.5" sources."eventemitter3-2.0.3" - sources."events-3.3.0" - sources."evp_bytestokey-1.0.3" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -89385,10 +90982,10 @@ in sources."expand-tilde-2.0.2" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" - sources."express-openapi-7.0.1" + sources."express-openapi-9.3.0" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.5.0" + sources."type-2.6.0" ]; }) sources."extend-3.0.2" @@ -89397,7 +90994,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-2.2.0" + sources."external-editor-3.1.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -89407,16 +91004,18 @@ in sources."extsprintf-1.3.0" sources."fancy-log-1.3.3" sources."fast-deep-equal-3.1.3" + sources."fast-diff-1.2.0" sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-1.1.4" + sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" - sources."figgy-pudding-3.5.2" - sources."figures-2.0.0" + sources."figlet-1.5.2" + sources."figures-3.2.0" + sources."file-entry-cache-6.0.1" + sources."file-type-16.5.3" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."find-cache-dir-3.3.2" sources."find-up-1.1.2" (sources."findup-sync-3.0.0" // { dependencies = [ @@ -89431,6 +91030,12 @@ in }) sources."fined-1.2.0" sources."flagged-respawn-1.0.1" + (sources."flat-cache-3.0.4" // { + dependencies = [ + sources."flatted-3.2.5" + sources."rimraf-3.0.2" + ]; + }) sources."flatted-2.0.2" (sources."flush-write-stream-1.1.1" // { dependencies = [ @@ -89439,6 +91044,7 @@ in sources."string_decoder-1.1.1" ]; }) + sources."follow-redirects-1.14.9" sources."for-in-1.0.2" sources."for-own-1.0.0" sources."forever-agent-0.6.1" @@ -89446,39 +91052,22 @@ in sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - (sources."from2-2.3.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."fs-extra-9.0.1" + sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs-mkdirp-stream-1.0.0" - sources."fs-routes-7.0.1" - (sources."fs-write-stream-atomic-1.0.10" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) + sources."fs-routes-9.0.3" sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" (sources."fstream-1.0.12" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" ]; }) sources."function-bind-1.1.1" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - ]; - }) - sources."get-caller-file-1.0.3" + sources."functional-red-black-tree-1.0.1" + sources."gauge-2.7.4" + sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -89497,39 +91086,91 @@ in sources."glob-watcher-5.0.5" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" - sources."globby-10.0.2" + sources."globals-13.13.0" + sources."globby-11.1.0" sources."glogg-1.0.2" sources."got-9.6.0" sources."graceful-fs-4.2.9" sources."gulp-4.0.2" - (sources."gulp-clean-css-4.3.0" // { + (sources."gulp-cli-2.3.0" // { dependencies = [ - sources."through2-3.0.1" + sources."ansi-colors-1.1.0" + sources."cliui-3.2.0" + sources."get-caller-file-1.0.3" + sources."wrap-ansi-2.1.0" + sources."y18n-3.2.2" + sources."yargs-7.1.2" + sources."yargs-parser-5.0.1" ]; }) - sources."gulp-cli-2.3.0" - sources."gulp-concat-2.6.1" - (sources."gulp-dart-sass-1.0.2" // { + (sources."gulp-eslint-6.0.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ajv-6.12.6" + sources."ansi-regex-4.1.1" sources."ansi-styles-3.2.1" + sources."astral-regex-1.0.0" sources."chalk-2.4.2" - sources."strip-ansi-4.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."debug-4.3.4" + sources."emoji-regex-7.0.3" + sources."eslint-6.8.0" + sources."eslint-utils-1.4.3" + sources."eslint-visitor-keys-1.3.0" + sources."espree-6.2.1" + sources."file-entry-cache-5.0.1" + sources."flat-cache-2.0.1" + sources."globals-12.4.0" + sources."has-flag-3.0.0" + sources."ignore-4.0.6" + sources."is-fullwidth-code-point-2.0.0" + sources."js-yaml-3.14.1" + sources."json-schema-traverse-0.4.1" + sources."levn-0.3.0" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" + sources."ms-2.1.2" + sources."optionator-0.8.3" + sources."path-key-2.0.1" + sources."prelude-ls-1.1.2" + sources."regexpp-2.0.1" + sources."rimraf-2.6.3" + sources."semver-6.3.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."slice-ansi-2.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" + sources."table-5.4.6" + sources."type-check-0.3.2" + sources."type-fest-0.8.1" ]; }) (sources."gulp-plumber-1.2.1" // { dependencies = [ + sources."ansi-styles-2.2.1" sources."arr-diff-1.1.0" sources."arr-union-2.1.0" sources."array-slice-0.2.3" + sources."chalk-1.1.3" sources."extend-shallow-1.1.4" sources."kind-of-1.1.0" sources."plugin-error-0.1.2" + sources."supports-color-2.0.0" + ]; + }) + (sources."gulp-sourcemaps-3.0.0" // { + dependencies = [ + sources."acorn-6.4.2" ]; }) - sources."gulp-sourcemaps-2.6.5" - sources."gulp-tslint-8.1.4" (sources."gulp-typescript-5.0.1" // { dependencies = [ sources."ansi-colors-3.2.4" @@ -89540,17 +91181,16 @@ in }) sources."gulplog-1.0.0" 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-binary2-1.0.3" // { + (sources."har-validator-5.1.5" // { dependencies = [ - sources."isarray-2.0.1" + sources."ajv-6.12.6" + sources."json-schema-traverse-0.4.1" ]; }) - sources."has-cors-1.1.0" - sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-1.0.3" + sources."has-ansi-2.0.0" + sources."has-flag-4.0.0" + sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -89563,42 +91203,35 @@ in sources."kind-of-4.0.0" ]; }) - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."inherits-2.0.4" - sources."safe-buffer-5.2.1" - ]; - }) - sources."hash.js-1.1.7" - (sources."hls-b24.js-0.12.3" // { - dependencies = [ - sources."eventemitter3-3.1.0" - ]; - }) - sources."hmac-drbg-1.0.1" + sources."highlight.js-10.7.3" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-4.1.0" sources."http-errors-1.7.2" sources."http-signature-1.2.0" - sources."https-browserify-1.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."iferr-0.1.5" sources."ignore-5.2.0" sources."ignore-walk-3.0.4" - sources."immutable-4.0.0" + sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."indexof-0.0.1" - sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.8" - sources."inquirer-3.0.6" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."interpret-1.4.0" + sources."inversify-5.1.1" sources."invert-kv-1.0.0" sources."ip-1.1.5" + sources."ip-num-1.3.4" sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" sources."is-accessor-descriptor-1.0.0" @@ -89611,7 +91244,7 @@ in sources."is-dir-1.0.0" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.3" sources."is-negated-glob-1.0.0" sources."is-number-7.0.0" @@ -89620,36 +91253,32 @@ in sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" sources."is-relative-1.0.0" - sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" + sources."isomorphic-ws-4.0.1" sources."isstream-0.1.2" - (sources."jest-worker-26.6.2" // { + sources."js-tokens-4.0.0" + (sources."js-yaml-4.1.0" // { dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" + sources."argparse-2.0.1" ]; }) - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."json5-1.0.1" - (sources."jsonfile-6.1.0" // { + sources."jsonfile-4.0.0" + (sources."jsonrpc2-ws-1.0.0-beta9" // { dependencies = [ - sources."universalify-2.0.0" + sources."eventemitter3-3.1.2" ]; }) sources."jsprim-1.4.2" @@ -89667,19 +91296,15 @@ in }) sources."lcid-1.0.0" sources."lead-1.0.0" + sources."levn-0.4.1" sources."liftoff-3.1.0" sources."load-json-file-1.1.0" - sources."loader-runner-2.4.0" - sources."loader-utils-1.4.0" - sources."locate-path-5.0.0" - sources."lodash-4.17.20" - sources."lodash.clone-4.5.0" - sources."lodash.clonedeep-4.5.0" + sources."lodash-4.17.21" sources."lodash.merge-4.6.2" - sources."lodash.some-4.6.0" + sources."lodash.truncate-4.4.2" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -89687,14 +91312,9 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" sources."lru-queue-0.1.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."make-error-1.3.6" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" - sources."map-stream-0.0.7" sources."map-visit-1.0.0" (sources."matchdep-2.0.0" // { dependencies = [ @@ -89709,115 +91329,104 @@ in sources."to-regex-range-2.1.1" ]; }) - sources."material-design-icons-3.0.1" - sources."material-design-lite-1.3.0" - sources."md5.js-1.3.5" sources."media-typer-0.3.0" - (sources."memoizee-0.4.15" // { - dependencies = [ - sources."next-tick-1.1.0" - ]; - }) - (sources."memory-fs-0.5.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) + sources."memoizee-0.4.15" + sources."memory-pager-1.5.0" sources."merge-descriptors-1.0.1" - sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.4" - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) + sources."micromatch-4.0.5" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."mimic-fn-1.2.0" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { dependencies = [ sources."yallist-3.1.1" ]; }) - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) sources."minizlib-1.3.3" - (sources."mirakurun-3.3.1" // { + (sources."mirakurun-3.9.0-beta.26" // { dependencies = [ - sources."aribts-1.3.5" + sources."ajv-6.12.6" sources."eventemitter3-4.0.7" - sources."express-openapi-6.0.0" - sources."fs-routes-2.0.0" - sources."openapi-default-setter-2.1.0" - sources."openapi-framework-0.26.0" - sources."openapi-jsonschema-parameters-1.2.0" - sources."openapi-request-coercer-2.4.0" - sources."openapi-request-validator-4.2.0" - sources."openapi-response-validator-4.0.0" - (sources."openapi-schema-validator-3.0.3" // { + (sources."express-openapi-8.0.0" // { dependencies = [ - sources."openapi-types-1.3.4" + sources."openapi-types-8.0.0" ]; }) - (sources."openapi-security-handler-2.0.4" // { + sources."fs-routes-8.0.0" + sources."json-schema-traverse-0.4.1" + (sources."openapi-default-setter-8.0.0" // { dependencies = [ - sources."openapi-types-1.3.4" + sources."openapi-types-8.0.0" ]; }) - sources."openapi-types-1.3.5" + (sources."openapi-framework-8.0.0" // { + dependencies = [ + sources."js-yaml-3.14.1" + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-jsonschema-parameters-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-request-coercer-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-request-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-response-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-schema-validator-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + (sources."openapi-security-handler-8.0.0" // { + dependencies = [ + sources."openapi-types-8.0.0" + ]; + }) + sources."openapi-types-7.2.3" + sources."swagger-ui-dist-4.9.1" ]; }) - sources."mississippi-3.0.0" - sources."mithril-2.0.4" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) sources."mkdirp-1.0.4" - sources."moment-2.29.1" + sources."mongodb-4.4.1" + sources."mongodb-connection-string-url-2.5.2" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" ]; }) - (sources."move-concurrently-1.0.1" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) sources."ms-2.0.0" - (sources."multer-1.4.2" // { + (sources."multer-1.4.3" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" ]; }) - sources."munin-plugin-0.0.9" sources."mute-stdout-1.0.1" - sources."mute-stream-0.0.7" + sources."mute-stream-0.0.8" (sources."mysql-2.18.1" // { dependencies = [ sources."isarray-1.0.0" @@ -89825,43 +91434,34 @@ in sources."string_decoder-1.1.1" ]; }) + sources."mz-2.7.0" sources."nan-2.15.0" sources."nanomatch-1.2.13" + sources."natural-compare-1.4.0" (sources."needle-2.9.1" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" ]; }) - sources."negotiator-0.6.2" - sources."neo-async-2.6.2" - sources."next-tick-1.0.0" - sources."node-addon-api-2.0.0" - sources."node-fetch-1.6.3" + sources."negotiator-0.6.3" + sources."next-tick-1.1.0" + sources."nice-try-1.0.5" + sources."node-addon-api-3.2.1" (sources."node-gyp-3.8.0" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."nopt-3.0.6" sources."semver-5.3.0" sources."tar-2.2.2" ]; }) - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."buffer-4.9.2" - sources."isarray-1.0.0" - sources."punycode-1.4.1" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."string_decoder-1.1.1" - ]; - }) - sources."stream-http-2.8.3" - ]; - }) + sources."node-gyp-build-4.3.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."semver-5.7.1" ]; }) @@ -89881,7 +91481,6 @@ in sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-component-0.0.3" (sources."object-copy-0.1.0" // { dependencies = [ sources."define-property-0.2.5" @@ -89902,59 +91501,53 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.181.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."onetime-2.0.1" - (sources."openapi-default-setter-7.2.3" // { + sources."onetime-5.1.2" + (sources."openapi-default-setter-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-framework-7.5.0" // { + (sources."openapi-framework-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."js-yaml-3.14.1" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-jsonschema-parameters-7.2.3" // { + (sources."openapi-jsonschema-parameters-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-request-coercer-7.5.0" // { + (sources."openapi-request-coercer-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-request-validator-7.4.0" // { + (sources."openapi-request-validator-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-response-validator-7.4.0" // { + (sources."openapi-response-validator-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-schema-validator-7.2.3" // { + (sources."openapi-schema-validator-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - (sources."openapi-security-handler-7.2.3" // { + (sources."openapi-security-handler-9.3.1" // { dependencies = [ - sources."openapi-types-7.2.3" + sources."openapi-types-9.3.1" ]; }) - sources."openapi-types-7.0.1" - (sources."opencollective-1.0.3" // { - dependencies = [ - sources."minimist-1.2.0" - ]; - }) - sources."opencollective-postinstall-2.0.3" - sources."opn-4.0.2" + sources."openapi-types-9.3.0" + sources."optionator-0.9.1" (sources."ordered-read-streams-1.0.1" // { dependencies = [ sources."isarray-1.0.0" @@ -89962,96 +91555,64 @@ in sources."string_decoder-1.1.1" ]; }) - sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" sources."os-locale-1.4.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-cancelable-1.1.0" - sources."p-limit-3.1.0" - (sources."p-locate-4.1.0" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) - sources."p-map-3.0.0" - sources."p-try-2.2.0" + sources."p-map-4.0.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."packet-reader-1.0.0" - sources."pako-1.0.11" - (sources."parallel-transform-1.2.0" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."parse-asn1-5.1.6" + sources."parent-module-1.0.1" + sources."parent-require-1.0.0" sources."parse-filepath-1.0.2" sources."parse-json-2.2.0" sources."parse-node-version-1.0.1" sources."parse-passwd-1.0.0" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" + sources."parse5-5.1.1" + (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { + dependencies = [ + sources."parse5-6.0.1" + ]; + }) sources."parseurl-1.3.3" sources."pascalcase-0.1.1" - sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-root-0.1.1" sources."path-root-regex-0.1.2" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" - sources."pbkdf2-3.1.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" - (sources."pg-8.3.3" // { - dependencies = [ - sources."semver-4.3.2" - ]; - }) - sources."pg-connection-string-2.5.0" - sources."pg-int8-1.0.1" - sources."pg-pool-3.4.1" - sources."pg-protocol-1.5.0" - sources."pg-types-2.2.0" - sources."pgpass-1.0.5" + sources."picocolors-0.2.1" sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."pkg-dir-4.2.0" // { + (sources."plugin-error-1.0.1" // { dependencies = [ - sources."find-up-4.1.0" - sources."path-exists-4.0.0" + sources."ansi-colors-1.1.0" ]; }) - sources."plugin-error-1.0.1" sources."posix-character-classes-0.1.1" - sources."postgres-array-2.0.0" - sources."postgres-bytea-1.0.0" - sources."postgres-date-1.0.7" - sources."postgres-interval-1.2.0" + sources."postcss-7.0.39" + sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" + sources."prettier-2.4.1" + sources."prettier-linter-helpers-1.0.0" sources."pretty-hrtime-1.0.3" - sources."process-0.11.10" sources."process-nextick-args-2.0.1" - sources."promise-inflight-1.0.1" + sources."progress-2.0.3" sources."promise-queue-2.2.5" - sources."prop-types-15.8.1" sources."proxy-addr-2.0.7" - sources."prr-1.0.1" sources."psl-1.8.0" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -90060,17 +91621,12 @@ in }) sources."punycode-2.1.1" sources."qs-6.7.0" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."queue-microtask-1.2.3" - sources."randombytes-2.1.0" - sources."randomfill-1.0.4" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."react-16.14.0" - sources."react-dom-16.14.0" - sources."react-is-16.13.1" + sources."react-17.0.2" + sources."react-dom-17.0.2" (sources."read-pkg-1.1.0" // { dependencies = [ sources."path-type-1.1.0" @@ -90078,6 +91634,7 @@ in }) sources."read-pkg-up-1.0.1" sources."readable-stream-3.6.0" + sources."readable-web-to-node-stream-3.0.2" (sources."readdirp-2.2.1" // { dependencies = [ sources."braces-2.3.2" @@ -90093,8 +91650,9 @@ in ]; }) sources."rechoir-0.6.2" - sources."regenerator-runtime-0.10.5" + sources."reflect-metadata-0.1.13" sources."regex-not-1.0.2" + sources."regexpp-3.2.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."remove-bom-buffer-3.0.0" @@ -90110,38 +91668,32 @@ in ]; }) sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-dir-1.0.1" + sources."resolve-from-4.0.0" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" + sources."restore-cursor-3.1.0" sources."ret-0.1.15" sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-2.7.1" - sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."run-queue-1.0.3" - sources."rx-4.1.0" + (sources."rxjs-6.6.7" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.49.0" // { - dependencies = [ - sources."anymatch-3.1.2" - sources."binary-extensions-2.2.0" - sources."chokidar-3.5.3" - sources."fsevents-2.3.2" - sources."is-binary-path-2.1.0" - sources."readdirp-3.6.0" - ]; - }) + sources."saslprep-1.0.3" sources."sax-1.2.4" - sources."scheduler-0.19.1" - sources."schema-utils-2.7.1" + sources."scheduler-0.20.2" sources."semver-7.3.5" sources."semver-greatest-satisfied-range-1.1.0" (sources."send-0.17.1" // { @@ -90149,7 +91701,6 @@ in sources."ms-2.1.1" ]; }) - sources."serialize-javascript-5.0.1" sources."serve-static-1.14.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { @@ -90157,12 +91708,19 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."setimmediate-1.0.5" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."sift-7.0.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."is-fullwidth-code-point-3.0.0" + ]; + }) + sources."smart-buffer-4.2.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -90192,57 +91750,35 @@ in sources."kind-of-3.2.2" ]; }) - (sources."socket.io-2.3.0" // { + (sources."socket.io-4.3.1" // { dependencies = [ - sources."debug-4.1.1" - sources."ms-2.1.3" + sources."debug-4.3.4" + sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.3.0" // { + sources."socket.io-adapter-2.3.3" + (sources."socket.io-parser-4.0.4" // { dependencies = [ - sources."base64-arraybuffer-0.1.5" - sources."debug-4.1.1" - sources."isarray-2.0.1" - sources."ms-2.1.3" - (sources."socket.io-parser-3.3.2" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."debug-4.3.4" + sources."ms-2.1.2" ]; }) - (sources."socket.io-parser-3.4.1" // { - dependencies = [ - sources."debug-4.1.1" - sources."isarray-2.0.1" - sources."ms-2.1.3" - ]; - }) - sources."source-list-map-2.0.1" + sources."socks-2.6.2" sources."source-map-0.6.1" - sources."source-map-js-1.0.2" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.21" + sources."source-map-support-0.5.20" sources."source-map-url-0.4.1" sources."sparkles-1.0.1" + sources."sparse-bitfield-3.0.3" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" sources."split-string-3.1.0" - sources."split2-4.1.0" sources."sprintf-js-1.0.3" - sources."sqlite3-5.0.0" + sources."sqlite3-5.0.2" sources."sqlstring-2.3.1" sources."sshpk-1.17.0" - (sources."ssri-8.0.1" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { dependencies = [ @@ -90262,38 +91798,17 @@ in ]; }) sources."statuses-1.5.0" - (sources."stream-browserify-2.0.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."stream-each-1.2.3" sources."stream-exhaust-1.0.2" - (sources."stream-http-3.2.0" // { - dependencies = [ - sources."inherits-2.0.4" - ]; - }) sources."stream-shift-1.0.1" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.3.3" - sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" + sources."debug-4.3.4" sources."ms-2.1.2" - sources."universalify-0.1.2" ]; }) sources."streamsearch-0.1.2" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" - ]; - }) + sources."string-width-1.0.2" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -90303,26 +91818,33 @@ in sources."strip-bom-2.0.0" sources."strip-bom-string-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-2.0.0" + sources."strtok3-6.3.0" + sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."sver-compat-1.5.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.34.0" + sources."swagger-ui-dist-3.52.5" + (sources."table-6.8.0" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."tail-2.2.4" - sources."tapable-1.1.3" + sources."tapable-2.2.1" (sources."tar-4.4.19" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."safe-buffer-5.2.1" sources."yallist-3.1.1" ]; }) - (sources."terser-5.10.0" // { - dependencies = [ - sources."source-map-0.7.3" - ]; - }) - sources."terser-webpack-plugin-4.2.2" + sources."text-table-0.2.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" sources."through-2.3.8" (sources."through2-2.0.5" // { dependencies = [ @@ -90333,12 +91855,9 @@ in }) sources."through2-filter-3.0.0" sources."time-stamp-1.1.0" - sources."timers-browserify-2.0.12" sources."timers-ext-0.1.7" sources."tmp-0.0.33" sources."to-absolute-glob-2.0.2" - sources."to-array-0.1.4" - sources."to-arraybuffer-1.0.1" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -90349,42 +91868,47 @@ in sources."to-regex-range-5.0.1" sources."to-through-2.0.0" sources."toidentifier-1.0.0" + sources."token-types-4.2.0" sources."tough-cookie-2.5.0" - (sources."ts-loader-8.0.4" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."semver-6.3.0" - sources."supports-color-5.5.0" - ]; - }) + sources."tr46-3.0.0" + sources."ts-loader-9.2.6" sources."ts-log-2.2.4" - sources."tslib-1.14.1" - (sources."tslint-6.1.3" // { + (sources."ts-node-10.4.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."mkdirp-0.5.5" - sources."semver-5.7.1" - sources."supports-color-5.5.0" + sources."acorn-8.7.0" + ]; + }) + sources."tslib-2.3.1" + (sources."tsutils-3.21.0" // { + dependencies = [ + sources."tslib-1.14.1" ]; }) - sources."tsutils-2.29.0" - sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-1.2.0" + sources."type-check-0.4.0" + sources."type-fest-0.20.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."typescript-4.0.3" + (sources."typeorm-0.2.38" // { + dependencies = [ + sources."buffer-6.0.3" + sources."debug-4.3.4" + sources."ms-2.1.2" + ]; + }) + sources."typescript-4.4.4" sources."unc-path-regex-0.1.2" - sources."undertaker-1.3.0" + (sources."undertaker-1.3.0" // { + dependencies = [ + sources."fast-levenshtein-1.1.4" + ]; + }) sources."undertaker-registry-1.0.1" sources."union-value-1.0.1" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" sources."unique-stream-2.3.1" - sources."universalify-1.0.0" + sources."universalify-0.1.2" sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ @@ -90400,19 +91924,15 @@ in sources."upath-1.2.0" sources."uri-js-4.4.1" sources."urix-0.1.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) sources."url-join-4.0.1" sources."url-parse-lax-3.0.0" - sources."url-toolkit-2.2.3" sources."use-3.1.1" - sources."util-0.11.1" + sources."utf-8-validate-5.0.9" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" + sources."uws-9.148.0" + sources."v8-compile-cache-2.3.0" sources."v8flags-3.2.0" sources."validate-npm-package-license-3.0.4" sources."value-or-function-3.0.0" @@ -90435,102 +91955,2021 @@ in sources."normalize-path-2.1.1" ]; }) - (sources."vinyl-sourcemaps-apply-0.2.1" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."vm-browserify-1.1.2" - (sources."watchpack-1.7.5" // { - dependencies = [ - sources."anymatch-3.1.2" - sources."binary-extensions-2.2.0" - sources."chokidar-3.5.3" - sources."fsevents-2.3.2" - sources."is-binary-path-2.1.0" - sources."readdirp-3.6.0" - ]; - }) - sources."watchpack-chokidar2-2.0.1" - (sources."webpack-4.44.2" // { - dependencies = [ - sources."acorn-6.4.2" - sources."braces-2.3.2" - sources."cacache-12.0.4" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" - sources."is-number-3.0.0" - sources."isarray-1.0.0" - sources."kind-of-3.2.2" - sources."locate-path-3.0.0" - sources."lru-cache-5.1.1" - sources."make-dir-2.1.0" - sources."memory-fs-0.4.1" - sources."micromatch-3.1.10" - sources."mkdirp-0.5.5" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."pify-4.0.1" - sources."pkg-dir-3.0.0" - sources."readable-stream-2.3.7" - sources."schema-utils-1.0.0" - sources."semver-5.7.1" - sources."serialize-javascript-4.0.0" - sources."ssri-6.0.2" - sources."string_decoder-1.1.1" - sources."terser-4.8.0" - sources."terser-webpack-plugin-1.4.5" - sources."to-regex-range-2.1.1" - sources."y18n-4.0.3" - sources."yallist-3.1.1" - ]; - }) - sources."webpack-sources-1.4.3" - (sources."webpack-stream-6.1.0" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."webidl-conversions-7.0.0" + sources."whatwg-url-11.0.0" sources."which-1.3.1" sources."which-module-1.0.0" sources."wide-align-1.1.5" - sources."worker-farm-1.7.0" - (sources."wrap-ansi-2.1.0" // { + sources."word-wrap-1.2.3" + (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.6" - sources."xmlhttprequest-ssl-1.5.5" - sources."xtend-4.0.2" - sources."y18n-3.2.2" - sources."yallist-4.0.0" - (sources."yargs-7.1.2" // { + (sources."write-1.0.3" // { dependencies = [ - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" ]; }) - sources."yargs-parser-5.0.1" - sources."yeast-0.1.2" - sources."yocto-queue-0.1.0" + sources."ws-6.2.2" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" + sources."xtend-4.0.2" + sources."y18n-5.0.8" + sources."yallist-4.0.0" + (sources."yargonaut-1.1.4" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."supports-color-2.0.0" + ]; + }) + (sources."yargs-17.4.0" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."yargs-parser-21.0.1" + ]; + }) + sources."yargs-parser-20.2.9" + sources."yn-3.1.1" + sources."zen-observable-0.8.15" + sources."zen-observable-ts-1.2.3" ]; buildInputs = globalBuildInputs; meta = { description = "DTV Software in Japan."; - homepage = "https://github.com/l3tnun/EPGStation#readme"; + homepage = "https://github.com/l3tnun/EPGStation-V2#readme"; license = "MIT"; }; production = true; bypassCache = true; reconstructLock = true; }; + "epgstation-client-../../applications/video/epgstation/client" = nodeEnv.buildNodePackage { + name = "epgstation-client"; + packageName = "epgstation-client"; + version = "2.6.20"; + src = ../../applications/video/epgstation/client; + dependencies = [ + sources."@achrinza/node-ipc-9.2.2" + sources."@babel/code-frame-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + sources."@babel/highlight-7.16.10" + (sources."@eslint/eslintrc-0.4.3" // { + dependencies = [ + sources."acorn-7.4.1" + sources."eslint-visitor-keys-1.3.0" + sources."espree-7.3.1" + sources."ignore-4.0.6" + ]; + }) + sources."@hapi/address-2.1.4" + sources."@hapi/bourne-1.3.2" + sources."@hapi/hoek-8.5.1" + sources."@hapi/joi-15.1.1" + sources."@hapi/topo-3.1.6" + sources."@humanwhocodes/config-array-0.5.0" + sources."@humanwhocodes/object-schema-1.2.1" + sources."@intervolga/optimize-cssnano-plugin-1.0.6" + sources."@mdi/font-6.5.95" + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@node-ipc/js-queue-2.0.3" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@socket.io/base64-arraybuffer-1.0.2" + sources."@socket.io/component-emitter-3.0.0" + (sources."@soda/friendly-errors-webpack-plugin-1.8.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."@soda/get-current-script-1.0.2" + sources."@types/body-parser-1.19.2" + sources."@types/connect-3.4.35" + sources."@types/connect-history-api-fallback-1.3.5" + sources."@types/express-4.17.13" + sources."@types/express-serve-static-core-4.17.28" + sources."@types/glob-7.2.0" + sources."@types/hls.js-0.13.3" + sources."@types/http-proxy-1.17.8" + sources."@types/json-schema-7.0.11" + sources."@types/json-stable-stringify-1.0.33" + sources."@types/lodash-4.14.178" + sources."@types/mime-1.3.2" + sources."@types/minimatch-3.0.5" + sources."@types/minimist-1.2.2" + sources."@types/node-17.0.23" + sources."@types/normalize-package-data-2.4.1" + sources."@types/parse-json-4.0.0" + sources."@types/q-1.5.5" + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" + sources."@types/serve-static-1.13.10" + sources."@types/smoothscroll-polyfill-0.3.1" + sources."@types/socket.io-client-1.4.36" + sources."@types/source-list-map-0.1.2" + sources."@types/tapable-1.0.8" + (sources."@types/uglify-js-3.13.1" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."@types/webpack-4.41.32" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."@types/webpack-dev-server-3.11.6" + sources."@types/webpack-env-1.16.3" + (sources."@types/webpack-sources-3.2.0" // { + dependencies = [ + sources."source-map-0.7.3" + ]; + }) + sources."@typescript-eslint/eslint-plugin-4.33.0" + sources."@typescript-eslint/experimental-utils-4.33.0" + sources."@typescript-eslint/parser-4.33.0" + sources."@typescript-eslint/scope-manager-4.33.0" + sources."@typescript-eslint/types-4.33.0" + sources."@typescript-eslint/typescript-estree-4.33.0" + sources."@typescript-eslint/visitor-keys-4.33.0" + sources."@vue/cli-overlay-4.5.17" + (sources."@vue/cli-plugin-eslint-4.5.12" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."array-union-1.0.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."dir-glob-2.2.2" + sources."fast-glob-2.2.7" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."glob-parent-3.1.0" + sources."globby-9.2.0" + sources."ignore-4.0.6" + sources."is-glob-3.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."micromatch-3.1.10" + (sources."path-type-3.0.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."slash-2.0.0" + sources."to-regex-range-2.1.1" + ]; + }) + sources."@vue/cli-plugin-router-4.5.17" + (sources."@vue/cli-plugin-typescript-4.5.13" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."array-union-1.0.2" + sources."braces-2.3.2" + sources."dir-glob-2.2.2" + sources."extend-shallow-2.0.1" + sources."fast-glob-2.2.7" + sources."fill-range-4.0.0" + sources."glob-parent-3.1.0" + sources."globby-9.2.0" + sources."ignore-4.0.6" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."slash-2.0.0" + sources."to-regex-range-2.1.1" + ]; + }) + sources."@vue/cli-plugin-vuex-4.5.13" + (sources."@vue/cli-service-4.5.13" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."acorn-7.4.1" + sources."array-union-1.0.2" + sources."braces-2.3.2" + sources."dir-glob-2.2.2" + sources."extend-shallow-2.0.1" + sources."fast-glob-2.2.7" + sources."fill-range-4.0.0" + sources."fs-extra-7.0.1" + sources."glob-parent-3.1.0" + sources."globby-9.2.0" + sources."ignore-4.0.6" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."jsonfile-4.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."slash-2.0.0" + sources."ssri-8.0.1" + sources."to-regex-range-2.1.1" + sources."universalify-0.1.2" + ]; + }) + (sources."@vue/cli-shared-utils-4.5.17" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."semver-6.3.0" + sources."yallist-3.1.1" + ]; + }) + (sources."@vue/component-compiler-utils-3.3.0" // { + dependencies = [ + sources."hash-sum-1.0.2" + sources."lru-cache-4.1.5" + sources."source-map-0.6.1" + sources."yallist-2.1.2" + ]; + }) + sources."@vue/eslint-config-prettier-6.0.0" + sources."@vue/eslint-config-typescript-7.0.0" + sources."@vue/preload-webpack-plugin-1.1.2" + sources."@vue/web-component-wrapper-1.3.0" + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."accepts-1.3.8" + sources."acorn-6.4.2" + sources."acorn-jsx-5.3.2" + sources."acorn-walk-7.2.0" + sources."address-1.1.2" + sources."ajv-6.12.6" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.5.2" + sources."alphanum-sort-1.0.2" + sources."ansi-colors-3.2.4" + (sources."ansi-escapes-4.3.2" // { + dependencies = [ + sources."type-fest-0.21.3" + ]; + }) + sources."ansi-html-community-0.0.8" + sources."ansi-regex-4.1.1" + sources."ansi-styles-3.2.1" + sources."any-promise-1.3.0" + sources."anymatch-3.1.2" + sources."aproba-1.2.0" + sources."arch-2.2.0" + sources."argparse-1.0.10" + sources."aribb24.js-1.8.8" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-flatten-1.1.1" + sources."array-union-2.1.0" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."asn1-0.2.6" + (sources."asn1.js-5.4.1" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + (sources."assert-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) + sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."astral-regex-2.0.0" + sources."async-2.6.3" + sources."async-each-1.0.3" + sources."async-limiter-1.0.1" + sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" + sources."atob-2.1.2" + (sources."autoprefixer-9.8.8" // { + dependencies = [ + sources."picocolors-0.2.1" + ]; + }) + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."axios-0.24.0" + (sources."babel-code-frame-6.26.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."js-tokens-3.0.2" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."backo2-1.0.2" + sources."balanced-match-1.0.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."base64-js-1.5.1" + sources."batch-0.6.1" + sources."bcrypt-pbkdf-1.0.2" + sources."bfj-6.1.2" + sources."big.js-5.2.2" + sources."binary-extensions-2.2.0" + sources."bindings-1.5.0" + sources."bluebird-3.7.2" + sources."bn.js-5.2.0" + (sources."body-parser-1.19.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."qs-6.9.7" + ]; + }) + (sources."bonjour-3.5.0" // { + dependencies = [ + sources."array-flatten-2.1.2" + ]; + }) + sources."boolbase-1.0.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."brorand-1.1.0" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.2" + sources."browserify-rsa-4.1.0" + (sources."browserify-sign-4.2.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."browserify-zlib-0.2.0" + sources."browserslist-4.20.2" + sources."buffer-4.9.2" + sources."buffer-from-1.1.2" + sources."buffer-indexof-1.1.1" + sources."buffer-json-2.0.0" + sources."buffer-xor-1.0.3" + sources."builtin-modules-1.1.1" + sources."builtin-status-codes-3.0.0" + sources."bytes-3.1.2" + (sources."cacache-12.0.4" // { + dependencies = [ + sources."lru-cache-5.1.1" + sources."yallist-3.1.1" + ]; + }) + sources."cache-base-1.0.1" + (sources."cache-loader-4.1.0" // { + dependencies = [ + sources."find-cache-dir-3.3.2" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."make-dir-3.1.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + sources."pkg-dir-4.2.0" + sources."schema-utils-2.7.1" + sources."semver-6.3.0" + ]; + }) + sources."call-bind-1.0.2" + sources."call-me-maybe-1.0.1" + (sources."caller-callsite-2.0.0" // { + dependencies = [ + sources."callsites-2.0.0" + ]; + }) + sources."caller-path-2.0.0" + sources."callsite-1.0.0" + sources."callsites-3.1.0" + sources."camel-case-3.0.0" + sources."camelcase-5.3.1" + sources."caniuse-api-3.0.0" + sources."caniuse-lite-1.0.30001320" + sources."case-sensitive-paths-webpack-plugin-2.4.0" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."chardet-0.7.0" + sources."check-types-8.0.3" + sources."chokidar-3.5.3" + sources."chownr-1.1.4" + sources."chrome-trace-event-1.0.3" + sources."ci-info-1.6.0" + sources."cipher-base-1.0.4" + (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."clean-css-4.2.4" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."cli-cursor-2.1.0" + (sources."cli-highlight-2.1.11" // { + 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."cli-spinners-2.6.1" + sources."cli-width-3.0.0" + (sources."clipboardy-2.3.0" // { + dependencies = [ + sources."is-wsl-2.2.0" + ]; + }) + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-6.2.0" + ]; + }) + sources."clone-1.0.4" + sources."coa-2.0.2" + sources."collection-visit-1.0.0" + sources."color-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-string-1.9.0" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" + sources."compressible-2.0.18" + (sources."compression-1.7.4" // { + dependencies = [ + sources."bytes-3.0.0" + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."safe-buffer-5.1.2" + ]; + }) + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."connect-history-api-fallback-1.6.0" + sources."console-browserify-1.2.0" + sources."consolidate-0.15.1" + sources."constants-browserify-1.0.0" + sources."content-disposition-0.5.4" + sources."content-type-1.0.4" + sources."cookie-0.4.2" + sources."cookie-signature-1.0.6" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" + (sources."copy-webpack-plugin-5.1.2" // { + dependencies = [ + sources."array-union-1.0.2" + sources."dir-glob-2.2.2" + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."globby-7.1.1" + sources."ignore-3.3.10" + sources."path-type-3.0.0" + sources."pify-3.0.0" + sources."pkg-dir-3.0.0" + sources."slash-1.0.0" + ]; + }) + sources."core-util-is-1.0.2" + sources."cosmiconfig-6.0.0" + (sources."create-ecdh-4.0.4" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."crypto-browserify-3.12.0" + sources."css-color-names-0.0.4" + sources."css-declaration-sorter-4.0.1" + (sources."css-loader-3.6.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + sources."semver-6.3.0" + ]; + }) + sources."css-select-2.1.0" + sources."css-select-base-adapter-0.1.1" + (sources."css-tree-1.0.0-alpha.37" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."css-what-3.4.2" + sources."cssesc-3.0.0" + (sources."cssnano-4.1.11" // { + dependencies = [ + sources."cosmiconfig-5.2.1" + sources."import-fresh-2.0.0" + sources."parse-json-4.0.0" + sources."resolve-from-3.0.0" + ]; + }) + sources."cssnano-preset-default-4.0.8" + sources."cssnano-util-get-arguments-4.0.0" + sources."cssnano-util-get-match-4.0.0" + sources."cssnano-util-raw-cache-4.0.1" + sources."cssnano-util-same-parent-4.0.1" + (sources."csso-4.2.0" // { + dependencies = [ + sources."css-tree-1.1.3" + sources."mdn-data-2.0.14" + sources."source-map-0.6.1" + ]; + }) + sources."cyclist-1.0.1" + sources."dashdash-1.14.1" + sources."date-fns-2.28.0" + sources."de-indent-1.0.2" + sources."debug-4.3.4" + sources."decache-4.6.1" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."deep-equal-1.1.1" + sources."deep-is-0.1.4" + sources."deepmerge-4.2.2" + (sources."default-gateway-5.0.5" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."execa-3.4.0" + sources."get-stream-5.2.0" + sources."is-stream-2.0.1" + sources."mimic-fn-2.1.0" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.2" + sources."p-finally-2.0.1" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) + sources."defaults-1.0.3" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + (sources."del-4.1.1" // { + dependencies = [ + sources."array-union-1.0.2" + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + ]; + }) + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."des.js-1.0.1" + sources."destroy-1.0.4" + sources."detect-node-2.1.0" + sources."diff-4.0.2" + (sources."diffie-hellman-5.0.3" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."dir-glob-3.0.1" + sources."dns-equal-1.0.0" + sources."dns-packet-1.3.4" + sources."dns-txt-2.0.2" + sources."doctrine-3.0.0" + sources."dom-converter-0.2.0" + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) + sources."domain-browser-1.2.0" + sources."domelementtype-1.3.1" + (sources."domhandler-4.3.1" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) + sources."domutils-1.7.0" + sources."dot-prop-5.3.0" + sources."dotenv-8.6.0" + sources."dotenv-expand-5.1.0" + sources."duplexer-0.1.2" + sources."duplexify-3.7.1" + sources."easy-stack-1.0.1" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + sources."ejs-2.7.4" + sources."electron-to-chromium-1.4.96" + (sources."elliptic-6.5.4" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."emoji-regex-8.0.0" + sources."emojis-list-3.0.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + sources."engine.io-client-6.0.3" + sources."engine.io-parser-5.0.3" + (sources."enhanced-resolve-4.5.0" // { + dependencies = [ + sources."memory-fs-0.5.0" + ]; + }) + (sources."enquirer-2.3.6" // { + dependencies = [ + sources."ansi-colors-4.1.1" + ]; + }) + sources."entities-2.2.0" + sources."errno-0.1.8" + sources."error-ex-1.3.2" + sources."error-stack-parser-2.0.7" + sources."es-abstract-1.19.1" + sources."es-to-primitive-1.2.1" + sources."es6-promise-4.2.8" + sources."escalade-3.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + (sources."eslint-7.32.0" // { + dependencies = [ + sources."@babel/code-frame-7.12.11" + sources."acorn-7.4.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."cross-spawn-7.0.3" + sources."escape-string-regexp-4.0.0" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."has-flag-4.0.0" + sources."ignore-4.0.6" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."supports-color-7.2.0" + sources."which-2.0.2" + ]; + }) + sources."eslint-config-prettier-6.15.0" + sources."eslint-loader-2.2.1" + sources."eslint-plugin-prettier-3.4.1" + (sources."eslint-plugin-vue-7.20.0" // { + dependencies = [ + sources."eslint-utils-2.1.0" + sources."eslint-visitor-keys-1.3.0" + sources."semver-6.3.0" + ]; + }) + sources."eslint-scope-5.1.1" + sources."eslint-utils-3.0.0" + sources."eslint-visitor-keys-2.1.0" + (sources."espree-6.2.1" // { + dependencies = [ + sources."acorn-7.4.1" + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."esprima-4.0.1" + (sources."esquery-1.4.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.3.0" + ]; + }) + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."etag-1.8.1" + sources."event-pubsub-4.3.0" + sources."eventemitter2-6.4.5" + sources."eventemitter3-4.0.7" + sources."events-3.3.0" + sources."eventsource-1.1.0" + sources."evp_bytestokey-1.0.3" + sources."execa-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + 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."ms-2.0.0" + ]; + }) + (sources."express-4.17.3" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."qs-6.9.7" + ]; + }) + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.1.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-diff-1.2.0" + sources."fast-glob-3.2.11" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."fastq-1.13.0" + sources."faye-websocket-0.11.4" + sources."figgy-pudding-3.5.2" + sources."figures-3.2.0" + sources."file-entry-cache-6.0.1" + (sources."file-loader-4.3.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + ]; + }) + sources."file-uri-to-path-1.0.0" + sources."filesize-3.6.1" + sources."fill-range-7.0.1" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."find-cache-dir-0.1.1" + sources."find-up-1.1.2" + (sources."flat-cache-3.0.4" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) + sources."flatted-3.2.5" + sources."flush-write-stream-1.1.1" + sources."follow-redirects-1.14.9" + sources."for-in-1.0.2" + sources."forever-agent-0.6.1" + (sources."fork-ts-checker-webpack-plugin-3.1.1" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."semver-5.7.1" + sources."to-regex-range-2.1.1" + ]; + }) + (sources."fork-ts-checker-webpack-plugin-v5-5.2.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."schema-utils-2.7.0" + sources."supports-color-7.2.0" + ]; + }) + sources."form-data-2.3.3" + sources."forwarded-0.2.0" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + sources."from2-2.3.0" + sources."fs-extra-9.1.0" + sources."fs-monkey-1.0.3" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" + sources."function-bind-1.1.1" + sources."functional-red-black-tree-1.0.1" + sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.1.1" + sources."get-stdin-6.0.0" + sources."get-stream-4.1.0" + sources."get-symbol-description-1.0.0" + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."glob-7.2.0" + sources."glob-parent-5.1.2" + sources."glob-to-regexp-0.3.0" + (sources."globals-13.13.0" // { + dependencies = [ + sources."type-fest-0.20.2" + ]; + }) + sources."globby-11.1.0" + sources."graceful-fs-4.2.9" + sources."gzip-size-5.1.1" + sources."handle-thing-2.0.1" + 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-bigints-1.0.1" + sources."has-cors-1.1.0" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.3" + sources."has-tostringtag-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."hash-sum-2.0.0" + sources."hash.js-1.1.7" + sources."he-1.2.0" + sources."hex-color-regex-1.1.0" + sources."highlight.js-10.7.3" + sources."hls.js-1.1.2" + sources."hmac-drbg-1.0.1" + sources."hoopy-0.1.4" + sources."hosted-git-info-2.8.9" + sources."hpack.js-2.1.6" + sources."hsl-regex-1.0.0" + sources."hsla-regex-1.0.0" + sources."html-entities-1.4.0" + (sources."html-minifier-3.5.21" // { + dependencies = [ + sources."commander-2.17.1" + ]; + }) + (sources."html-webpack-plugin-3.2.0" // { + dependencies = [ + sources."big.js-3.2.0" + sources."emojis-list-2.1.0" + sources."json5-0.5.1" + sources."loader-utils-0.2.17" + sources."util.promisify-1.0.0" + ]; + }) + (sources."htmlparser2-6.1.0" // { + dependencies = [ + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domutils-2.8.0" + ]; + }) + sources."http-deceiver-1.2.7" + sources."http-errors-1.8.1" + sources."http-parser-js-0.5.6" + sources."http-proxy-1.18.1" + sources."http-proxy-middleware-1.3.1" + sources."http-signature-1.2.0" + sources."https-browserify-1.0.0" + sources."human-signals-1.1.1" + sources."iconv-lite-0.4.24" + sources."icss-utils-4.1.1" + sources."ieee754-1.2.1" + sources."iferr-0.1.5" + sources."ignore-5.2.0" + sources."import-cwd-2.1.0" + sources."import-fresh-3.3.0" + (sources."import-from-2.1.0" // { + dependencies = [ + sources."resolve-from-3.0.0" + ]; + }) + (sources."import-local-2.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."pkg-dir-3.0.0" + ]; + }) + sources."imurmurhash-0.1.4" + sources."indexes-of-1.0.1" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."cli-cursor-3.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."mimic-fn-2.1.0" + sources."onetime-5.1.2" + sources."restore-cursor-3.1.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."internal-ip-4.3.0" // { + dependencies = [ + sources."default-gateway-4.2.0" + ]; + }) + sources."internal-slot-1.0.3" + sources."interpret-1.4.0" + sources."inversify-6.0.1" + sources."ip-1.1.5" + 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-arguments-1.1.1" + sources."is-arrayish-0.2.1" + sources."is-bigint-1.0.4" + sources."is-binary-path-2.1.0" + sources."is-boolean-object-1.1.2" + sources."is-buffer-1.1.6" + sources."is-callable-1.2.4" + sources."is-ci-1.2.1" + sources."is-color-stop-1.1.0" + sources."is-core-module-2.8.1" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.5" + sources."is-descriptor-1.0.2" + sources."is-directory-0.3.1" + 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-glob-4.0.3" + sources."is-negative-zero-2.0.2" + sources."is-number-7.0.0" + sources."is-number-object-1.0.6" + sources."is-obj-2.0.0" + sources."is-path-cwd-2.2.0" + sources."is-path-in-cwd-2.1.0" + sources."is-path-inside-2.1.0" + sources."is-plain-obj-3.0.0" + sources."is-plain-object-2.0.4" + sources."is-regex-1.1.4" + sources."is-resolvable-1.1.0" + sources."is-shared-array-buffer-1.0.1" + sources."is-stream-1.1.0" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" + sources."is-typedarray-1.0.0" + sources."is-weakref-1.0.2" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."javascript-stringify-2.1.0" + sources."js-message-1.0.7" + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.1" + sources."jsbn-0.1.1" + sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-0.4.0" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-1.0.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."json5-1.0.1" + sources."jsonfile-6.1.0" + sources."jsonify-0.0.0" + sources."jsprim-1.4.2" + sources."killable-1.0.1" + sources."kind-of-6.0.3" + sources."klona-2.0.5" + sources."launch-editor-2.3.0" + sources."launch-editor-middleware-2.3.0" + sources."levn-0.4.1" + sources."lines-and-columns-1.2.4" + sources."loader-fs-cache-1.0.3" + sources."loader-runner-2.4.0" + sources."loader-utils-1.4.0" + (sources."locate-path-3.0.0" // { + dependencies = [ + sources."path-exists-3.0.0" + ]; + }) + sources."lodash-4.17.21" + sources."lodash.defaultsdeep-4.6.1" + sources."lodash.mapvalues-4.6.0" + sources."lodash.memoize-4.1.2" + sources."lodash.merge-4.6.2" + sources."lodash.transform-4.6.0" + sources."lodash.truncate-4.4.2" + sources."lodash.uniq-4.5.0" + sources."log-symbols-2.2.0" + sources."loglevel-1.8.0" + sources."lower-case-1.1.4" + sources."lru-cache-6.0.0" + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."material-design-icons-iconfont-6.1.1" + sources."md5.js-1.3.5" + sources."mdn-data-2.0.4" + sources."media-typer-0.3.0" + sources."memfs-3.4.1" + sources."memory-fs-0.4.1" + sources."merge-descriptors-1.0.1" + (sources."merge-source-map-1.1.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" + sources."methods-1.1.2" + sources."microevent.ts-0.1.1" + sources."micromatch-4.0.5" + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."mime-2.6.0" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."mimic-fn-1.2.0" + (sources."mini-css-extract-plugin-0.9.0" // { + dependencies = [ + sources."normalize-url-1.9.1" + ]; + }) + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."minipass-3.1.6" + sources."mississippi-3.0.0" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.6" + sources."move-concurrently-1.0.1" + sources."mpegts.js-1.6.10" + sources."ms-2.1.2" + sources."multicast-dns-6.2.3" + sources."multicast-dns-service-types-1.1.0" + sources."mute-stream-0.0.8" + sources."mz-2.7.0" + sources."nan-2.15.0" + sources."nanomatch-1.2.13" + sources."natural-compare-1.4.0" + sources."negotiator-0.6.3" + sources."neo-async-2.6.2" + sources."nice-try-1.0.5" + sources."no-case-2.3.2" + sources."node-forge-0.10.0" + (sources."node-libs-browser-2.2.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + sources."node-releases-2.0.2" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."normalize-path-3.0.0" + sources."normalize-range-0.1.2" + sources."normalize-url-3.3.0" + sources."npm-run-path-2.0.2" + sources."nth-check-1.0.2" + (sources."null-loader-4.0.1" // { + dependencies = [ + sources."json5-2.2.1" + sources."loader-utils-2.0.2" + sources."schema-utils-3.1.1" + ]; + }) + sources."num2fraction-1.2.2" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + (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."kind-of-3.2.2" + ]; + }) + sources."object-hash-1.3.1" + sources."object-inspect-1.12.0" + sources."object-is-1.1.5" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.2" + sources."object.getownpropertydescriptors-2.1.3" + sources."object.pick-1.3.0" + sources."object.values-1.1.5" + sources."obuf-1.1.2" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."open-6.4.0" + sources."opener-1.5.2" + sources."opn-5.5.0" + sources."optionator-0.9.1" + (sources."ora-3.4.0" // { + dependencies = [ + sources."strip-ansi-5.2.0" + ]; + }) + sources."original-1.0.2" + sources."os-browserify-0.3.0" + sources."os-tmpdir-1.0.2" + sources."p-finally-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-map-2.1.0" + sources."p-retry-3.0.1" + sources."p-try-2.2.0" + sources."pako-1.0.11" + sources."parallel-transform-1.2.0" + sources."param-case-2.1.1" + sources."parent-module-1.0.1" + sources."parse-asn1-5.1.6" + sources."parse-json-5.2.0" + sources."parse5-5.1.1" + (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { + dependencies = [ + sources."parse5-6.0.1" + ]; + }) + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.1" + sources."path-dirname-1.0.2" + sources."path-exists-2.1.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-parse-1.0.7" + sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" + sources."pbkdf2-3.1.2" + sources."performance-now-2.1.0" + sources."picocolors-1.0.0" + sources."picomatch-2.3.1" + sources."pify-4.0.1" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pkg-dir-1.0.0" + sources."pnp-webpack-plugin-1.7.0" + (sources."portfinder-1.0.28" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."posix-character-classes-0.1.1" + (sources."postcss-7.0.39" // { + dependencies = [ + sources."picocolors-0.2.1" + sources."source-map-0.6.1" + ]; + }) + sources."postcss-calc-7.0.5" + (sources."postcss-colormin-4.0.3" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-convert-values-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-discard-comments-4.0.2" + sources."postcss-discard-duplicates-4.0.2" + sources."postcss-discard-empty-4.0.1" + sources."postcss-discard-overridden-4.0.1" + (sources."postcss-load-config-2.1.2" // { + dependencies = [ + sources."cosmiconfig-5.2.1" + sources."import-fresh-2.0.0" + sources."parse-json-4.0.0" + sources."resolve-from-3.0.0" + ]; + }) + sources."postcss-loader-3.0.0" + (sources."postcss-merge-longhand-4.0.11" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-merge-rules-4.0.3" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + (sources."postcss-minify-font-values-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-gradients-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-params-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-minify-selectors-4.0.2" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + sources."postcss-modules-extract-imports-2.0.0" + sources."postcss-modules-local-by-default-3.0.3" + sources."postcss-modules-scope-2.2.0" + sources."postcss-modules-values-3.0.0" + sources."postcss-normalize-charset-4.0.1" + (sources."postcss-normalize-display-values-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-positions-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-repeat-style-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-string-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-timing-functions-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-unicode-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-url-4.0.1" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-normalize-whitespace-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + (sources."postcss-ordered-values-4.1.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-reduce-initial-4.0.3" + (sources."postcss-reduce-transforms-4.0.2" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-selector-parser-6.0.9" + (sources."postcss-svgo-4.0.3" // { + dependencies = [ + sources."postcss-value-parser-3.3.1" + ]; + }) + sources."postcss-unique-selectors-4.0.1" + sources."postcss-value-parser-4.2.0" + sources."prelude-ls-1.2.1" + sources."prepend-http-1.0.4" + sources."prettier-2.4.1" + sources."prettier-linter-helpers-1.0.0" + sources."pretty-error-2.1.2" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."promise-inflight-1.0.1" + sources."proxy-addr-2.0.7" + sources."prr-1.0.1" + sources."pseudomap-1.0.2" + sources."psl-1.8.0" + (sources."public-encrypt-4.0.3" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."q-1.5.1" + sources."qs-6.5.3" + sources."query-string-4.3.4" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."querystringify-2.2.0" + sources."queue-microtask-1.2.3" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."range-parser-1.2.1" + sources."raw-body-2.4.3" + sources."read-pkg-5.2.0" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."readdirp-3.6.0" + sources."rechoir-0.6.2" + sources."reflect-metadata-0.1.13" + sources."regex-not-1.0.2" + sources."regexp.prototype.flags-1.4.1" + sources."regexpp-3.2.0" + sources."relateurl-0.2.7" + sources."remove-trailing-separator-1.1.0" + (sources."renderkid-2.0.7" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."css-select-4.2.1" + sources."css-what-5.1.0" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domutils-2.8.0" + sources."nth-check-2.0.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" + sources."request-2.88.2" + sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" + sources."require-main-filename-2.0.0" + sources."requires-port-1.0.0" + sources."resize-observer-polyfill-1.5.1" + sources."resolve-1.22.0" + (sources."resolve-cwd-2.0.0" // { + dependencies = [ + sources."resolve-from-3.0.0" + ]; + }) + sources."resolve-from-4.0.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."retry-0.12.0" + sources."reusify-1.0.4" + sources."rgb-regex-1.0.1" + sources."rgba-regex-1.0.0" + sources."rimraf-2.7.1" + sources."ripemd160-2.0.2" + sources."roboto-fontface-0.10.0" + sources."run-async-2.4.1" + sources."run-parallel-1.2.0" + sources."run-queue-1.0.3" + sources."rxjs-6.6.7" + sources."safe-buffer-5.2.1" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sass-1.32.12" + (sources."sass-loader-10.2.0" // { + dependencies = [ + sources."json5-2.2.1" + sources."loader-utils-2.0.2" + sources."schema-utils-3.1.1" + ]; + }) + sources."sax-1.2.4" + sources."schema-utils-1.0.0" + sources."select-hose-2.0.0" + sources."selfsigned-1.10.14" + sources."semver-7.3.5" + (sources."send-0.17.2" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."mime-1.6.0" + sources."ms-2.1.3" + ]; + }) + sources."serialize-javascript-4.0.0" + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."ms-2.0.0" + sources."setprototypeof-1.1.0" + ]; + }) + sources."serve-static-1.14.2" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setimmediate-1.0.5" + sources."setprototypeof-1.2.0" + sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."shell-quote-1.7.3" + sources."shelljs-0.8.5" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.7" + (sources."simple-swizzle-0.2.2" // { + dependencies = [ + sources."is-arrayish-0.3.2" + ]; + }) + sources."slash-3.0.0" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."smoothscroll-polyfill-0.4.4" + (sources."snapdragon-0.8.2" // { + dependencies = [ + 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."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."socket.io-client-4.3.2" + sources."socket.io-parser-4.1.2" + (sources."sockjs-0.3.24" // { + dependencies = [ + sources."uuid-8.3.2" + ]; + }) + (sources."sockjs-client-1.6.0" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + (sources."sort-keys-1.1.2" // { + dependencies = [ + sources."is-plain-obj-1.1.0" + ]; + }) + sources."source-list-map-2.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + (sources."source-map-support-0.5.21" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."source-map-url-0.4.1" + sources."spark-md5-3.0.2" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.11" + sources."spdy-4.0.2" + (sources."spdy-transport-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."sshpk-1.17.0" + sources."ssri-6.0.2" + sources."stable-0.1.8" + sources."stackframe-1.2.1" + (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."statuses-1.5.0" + sources."stream-browserify-2.0.2" + sources."stream-each-1.2.3" + sources."stream-http-2.8.3" + sources."stream-shift-1.0.1" + sources."strict-uri-encode-1.1.0" + sources."string-width-4.2.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."strip-ansi-6.0.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + ]; + }) + sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" + sources."strip-indent-2.0.0" + sources."strip-json-comments-3.1.1" + (sources."stylehacks-4.0.3" // { + dependencies = [ + sources."postcss-selector-parser-3.1.2" + ]; + }) + sources."supports-color-5.5.0" + sources."supports-preserve-symlinks-flag-1.0.0" + sources."svgo-1.3.2" + (sources."table-6.8.0" // { + dependencies = [ + sources."ajv-8.11.0" + sources."json-schema-traverse-1.0.0" + ]; + }) + sources."tapable-1.1.3" + (sources."terser-4.8.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."terser-webpack-plugin-1.4.5" // { + dependencies = [ + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."pkg-dir-3.0.0" + sources."source-map-0.6.1" + ]; + }) + sources."text-table-0.2.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" + sources."thread-loader-2.1.3" + sources."through-2.3.8" + sources."through2-2.0.5" + sources."thunky-1.1.0" + sources."timers-browserify-2.0.12" + sources."timsort-0.3.0" + sources."tmp-0.0.33" + sources."to-arraybuffer-1.0.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.1" + sources."toposort-1.0.7" + sources."tough-cookie-2.5.0" + sources."tryer-1.0.1" + (sources."ts-loader-6.2.2" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."ts-pnp-1.2.0" + sources."tslib-1.14.1" + (sources."tslint-5.20.1" // { + dependencies = [ + sources."semver-5.7.1" + sources."tsutils-2.29.0" + ]; + }) + sources."tsutils-3.21.0" + sources."tty-browserify-0.0.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.4.0" + sources."type-fest-0.6.0" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."typeface-roboto-1.1.13" + sources."typescript-4.4.4" + (sources."uglify-js-3.4.10" // { + dependencies = [ + sources."commander-2.19.0" + sources."source-map-0.6.1" + ]; + }) + sources."unbox-primitive-1.0.1" + sources."union-value-1.0.1" + sources."uniq-1.0.1" + sources."uniqs-2.0.0" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."universalify-2.0.0" + sources."unpipe-1.0.0" + sources."unquote-1.1.1" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."upath-1.2.0" + sources."upper-case-1.1.3" + sources."uri-js-4.4.1" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + (sources."url-loader-2.3.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + ]; + }) + sources."url-parse-1.5.10" + sources."use-3.1.1" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.1" + sources."utila-0.4.0" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."v8-compile-cache-2.3.0" + sources."validate-npm-package-license-3.0.4" + sources."vary-1.1.2" + sources."vendors-1.0.4" + sources."verror-1.10.0" + sources."vm-browserify-1.1.2" + sources."vue-2.6.14" + sources."vue-class-component-7.2.6" + sources."vue-cli-plugin-vuetify-2.4.3" + (sources."vue-eslint-parser-7.11.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + sources."semver-6.3.0" + ]; + }) + sources."vue-hot-reload-api-2.3.4" + (sources."vue-loader-15.9.8" // { + dependencies = [ + sources."hash-sum-1.0.2" + ]; + }) + (sources."vue-loader-v16-16.8.3" // { + 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."json5-2.2.1" + sources."loader-utils-2.0.2" + sources."supports-color-7.2.0" + ]; + }) + sources."vue-property-decorator-9.1.2" + sources."vue-router-3.5.3" + (sources."vue-style-loader-4.1.3" // { + dependencies = [ + sources."hash-sum-1.0.2" + ]; + }) + sources."vue-template-compiler-2.6.14" + sources."vue-template-es2015-compiler-1.9.1" + sources."vuetify-2.5.10" + sources."vuetify-datetime-picker-2.1.1" + (sources."vuetify-loader-1.7.3" // { + dependencies = [ + sources."file-loader-6.2.0" + sources."json5-2.2.1" + sources."loader-utils-2.0.2" + sources."schema-utils-3.1.1" + ]; + }) + sources."watchpack-1.7.5" + (sources."watchpack-chokidar2-2.0.1" // { + dependencies = [ + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."fsevents-1.2.13" + sources."glob-parent-3.1.0" + sources."is-binary-path-1.0.1" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."readdirp-2.2.1" + sources."to-regex-range-2.1.1" + ]; + }) + sources."wbuf-1.7.3" + sources."wcwidth-1.0.1" + (sources."webpack-4.46.0" // { + dependencies = [ + sources."braces-2.3.2" + sources."eslint-scope-4.0.3" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + (sources."webpack-bundle-analyzer-3.9.0" // { + dependencies = [ + sources."acorn-7.4.1" + sources."ws-6.2.2" + ]; + }) + (sources."webpack-chain-6.5.1" // { + dependencies = [ + sources."deepmerge-1.5.2" + ]; + }) + sources."webpack-dev-middleware-3.7.3" + (sources."webpack-dev-server-3.11.3" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + (sources."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.1" + sources."strip-ansi-5.2.0" + ]; + }) + sources."emoji-regex-7.0.3" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."find-up-3.0.0" + sources."fsevents-1.2.13" + sources."glob-parent-3.1.0" + (sources."http-proxy-middleware-0.19.1" // { + dependencies = [ + sources."is-glob-4.0.3" + ]; + }) + sources."is-absolute-url-3.0.3" + sources."is-binary-path-1.0.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."readdirp-2.2.1" + sources."semver-6.3.0" + (sources."string-width-3.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.1" + sources."strip-ansi-5.2.0" + ]; + }) + sources."strip-ansi-3.0.1" + sources."supports-color-6.1.0" + sources."to-regex-range-2.1.1" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.1" + sources."strip-ansi-5.2.0" + ]; + }) + sources."ws-6.2.2" + sources."yargs-13.3.2" + sources."yargs-parser-13.1.2" + ]; + }) + sources."webpack-log-2.0.0" + sources."webpack-merge-4.2.2" + (sources."webpack-sources-1.4.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."websocket-driver-0.7.4" + sources."websocket-extensions-0.1.4" + sources."webworkify-webpack-2.1.5" + sources."which-1.3.1" + sources."which-boxed-primitive-1.0.2" + sources."which-module-2.0.0" + sources."word-wrap-1.2.3" + sources."worker-farm-1.7.0" + sources."worker-rpc-0.1.1" + (sources."wrap-ansi-7.0.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-8.2.3" + sources."xmlhttprequest-ssl-2.0.0" + sources."xtend-4.0.2" + sources."y18n-4.0.3" + sources."yallist-4.0.0" + sources."yaml-1.10.2" + (sources."yargs-16.2.0" // { + dependencies = [ + sources."cliui-7.0.4" + sources."y18n-5.0.8" + ]; + }) + sources."yargs-parser-20.2.9" + sources."yeast-0.1.2" + (sources."yorkie-2.0.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + sources."execa-0.8.0" + sources."get-stream-3.0.0" + sources."lru-cache-4.1.5" + sources."normalize-path-1.0.0" + sources."yallist-2.1.2" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; escape-string-regexp = nodeEnv.buildNodePackage { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -90552,18 +93991,14 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.7.0"; + version = "8.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.7.0.tgz"; - sha512 = "ifHYzkBGrzS2iDU7KjhCAVMGCvF6M3Xfs8X8b37cgrUlDt6bWRTpRh6T/gtSXv1HJ/BUGgmjvNvOEGu85Iif7w=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz"; + sha512 = "it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q=="; }; dependencies = [ - (sources."@eslint/eslintrc-1.0.5" // { - dependencies = [ - sources."ignore-4.0.6" - ]; - }) - sources."@humanwhocodes/config-array-0.9.2" + sources."@eslint/eslintrc-1.2.1" + sources."@humanwhocodes/config-array-0.9.5" sources."@humanwhocodes/object-schema-1.2.1" sources."acorn-8.7.0" sources."acorn-jsx-5.3.2" @@ -90579,18 +94014,18 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-scope-7.1.0" + sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" ]; }) - sources."eslint-visitor-keys-3.2.0" - sources."espree-9.3.0" + sources."eslint-visitor-keys-3.3.0" + sources."espree-9.3.1" sources."esquery-1.4.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" @@ -90600,12 +94035,12 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.2.0" sources."glob-parent-6.0.2" - sources."globals-13.12.0" + sources."globals-13.13.0" sources."has-flag-4.0.0" sources."ignore-5.2.0" sources."import-fresh-3.3.0" @@ -90620,7 +94055,7 @@ in sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" sources."lodash.merge-4.6.2" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."ms-2.1.2" sources."natural-compare-1.4.0" sources."once-1.4.0" @@ -90703,7 +94138,7 @@ in sources."concat-map-0.0.1" sources."core_d-3.2.0" sources."cross-spawn-7.0.3" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" @@ -90740,12 +94175,12 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.2.0" sources."glob-parent-5.1.2" - sources."globals-13.12.0" + sources."globals-13.13.0" sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -90764,7 +94199,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" sources."lru-cache-6.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."ms-2.1.2" sources."nanolru-1.0.0" sources."natural-compare-1.4.0" @@ -90797,7 +94232,7 @@ in sources."supports-color-8.1.1" (sources."table-6.8.0" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.11.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -90841,59 +94276,59 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "5.0.3"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-5.0.3.tgz"; - sha512 = "Wou4IPj/V2VggX6k818WnU9Gz/JMgPln02282tQAvmouvkYInXwLG8IFkRqHJdt25nJvz9xrN7RATzn4IFcMWg=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-5.3.0.tgz"; + sha512 = "Oi5E+C3AtAHOwqBbL3GL1eQErfDnZGmIqbMjlDGp8WtELN0f+fdfWA4ZldCOSjnqsYg7hYQFgrZXjIXbjYsC9Q=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" (sources."@babel/core-7.9.0" // { dependencies = [ - sources."json5-2.2.0" + sources."json5-2.2.1" sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.16.8" + sources."@babel/generator-7.17.7" sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-function-name-7.16.7" sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" - sources."@babel/helper-simple-access-7.16.7" + sources."@babel/helper-module-transforms-7.17.7" + sources."@babel/helper-simple-access-7.17.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.8" (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.10" + sources."@babel/parser-7.17.8" sources."@babel/runtime-7.9.0" (sources."@babel/template-7.16.7" // { dependencies = [ sources."@babel/code-frame-7.16.7" ]; }) - (sources."@babel/traverse-7.16.10" // { + (sources."@babel/traverse-7.17.3" // { dependencies = [ sources."@babel/code-frame-7.16.7" ]; }) - sources."@babel/types-7.16.8" + sources."@babel/types-7.17.0" sources."@expo/apple-utils-0.0.0-alpha.26" sources."@expo/bunyan-4.0.0" - sources."@expo/config-6.0.14" - (sources."@expo/config-plugins-4.0.14" // { + sources."@expo/config-6.0.19" + (sources."@expo/config-plugins-4.1.0" // { dependencies = [ sources."semver-7.3.5" ]; }) - sources."@expo/config-types-43.0.1" - sources."@expo/dev-server-0.1.101" - sources."@expo/dev-tools-0.13.138" + sources."@expo/config-types-44.0.0" + sources."@expo/dev-server-0.1.106" + sources."@expo/dev-tools-0.13.146" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -90909,70 +94344,53 @@ in ]; }) sources."@expo/json-file-8.2.34" - sources."@expo/metro-config-0.3.7" + sources."@expo/metro-config-0.3.12" sources."@expo/osascript-2.0.31" - (sources."@expo/package-manager-0.0.48" // { + (sources."@expo/package-manager-0.0.50" // { dependencies = [ sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" sources."semver-5.7.1" ]; }) - (sources."@expo/plist-0.0.16" // { + (sources."@expo/plist-0.0.17" // { dependencies = [ sources."xmlbuilder-14.0.0" ]; }) - sources."@expo/prebuild-config-3.0.14" + sources."@expo/prebuild-config-3.1.0" sources."@expo/rudder-sdk-node-1.1.1" - (sources."@expo/schemer-1.3.33" // { - dependencies = [ - sources."ajv-5.5.2" - sources."fast-deep-equal-1.1.0" - sources."json-schema-traverse-0.3.1" - ]; - }) + sources."@expo/schemer-1.3.33" sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.16.14" // { + (sources."@expo/webpack-config-0.16.19" // { dependencies = [ sources."is-wsl-2.2.0" ]; }) - (sources."@expo/xcpretty-4.1.0" // { + (sources."@expo/xcpretty-4.1.1" // { dependencies = [ sources."js-yaml-4.1.0" ]; }) - sources."@gar/promisify-1.1.2" + sources."@gar/promisify-1.1.3" sources."@hapi/hoek-9.2.1" sources."@hapi/topo-5.1.0" sources."@jest/types-26.6.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-1.1.0" // { + (sources."@npmcli/fs-1.1.1" // { dependencies = [ sources."semver-7.3.5" ]; }) - (sources."@npmcli/git-2.1.0" // { - dependencies = [ - sources."mkdirp-1.0.4" - sources."semver-7.3.5" - sources."which-2.0.2" - ]; - }) - sources."@npmcli/installed-package-contents-1.0.7" (sources."@npmcli/move-file-1.1.2" // { dependencies = [ sources."mkdirp-1.0.4" sources."rimraf-3.0.2" ]; }) - sources."@npmcli/node-gyp-1.0.3" - sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.6" sources."@react-native-community/cli-debugger-ui-5.0.1" sources."@react-native-community/cli-server-api-5.0.1" (sources."@react-native-community/cli-tools-5.0.1" // { @@ -90988,12 +94406,11 @@ in }) sources."@react-native/normalize-color-2.0.0" sources."@segment/loosely-validate-event-2.0.0" - sources."@sideway/address-4.1.3" + sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" - sources."@sindresorhus/is-4.3.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" - sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-5.1.2" @@ -91001,10 +94418,10 @@ in sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/json-schema-7.0.9" - sources."@types/keyv-3.1.3" + sources."@types/json-schema-7.0.11" + sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/q-1.5.5" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.1" @@ -91026,7 +94443,7 @@ in ]; }) sources."@types/yargs-15.0.14" - sources."@types/yargs-parser-20.2.1" + sources."@types/yargs-parser-21.0.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -91049,14 +94466,11 @@ in sources."@xmldom/xmldom-0.7.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."abbrev-1.1.1" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."acorn-6.4.2" sources."address-1.1.2" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" sources."aggregate-error-3.1.0" - sources."ajv-6.12.6" + sources."ajv-5.5.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."alphanum-sort-1.0.2" @@ -91080,7 +94494,6 @@ in sources."apollo-utilities-1.3.4" sources."application-config-path-0.1.0" sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.7" sources."argparse-2.0.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -91093,7 +94506,6 @@ in sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."arrify-2.0.1" - sources."asn1-0.2.6" (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.12.0" @@ -91105,7 +94517,6 @@ in sources."util-0.10.3" ]; }) - sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" sources."async-1.5.2" sources."async-each-1.0.3" @@ -91113,11 +94524,12 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" sources."axios-0.21.1" (sources."babel-loader-8.1.0" // { dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" sources."loader-utils-1.4.0" sources."schema-utils-2.7.1" ]; @@ -91132,7 +94544,6 @@ in sources."base64-js-1.5.1" sources."base64url-3.0.1" sources."batch-0.6.1" - sources."bcrypt-pbkdf-1.0.2" sources."better-opn-3.0.2" sources."big-integer-1.6.51" sources."big.js-5.2.2" @@ -91144,10 +94555,13 @@ in dependencies = [ sources."bytes-3.1.0" sources."debug-2.6.9" + sources."depd-1.1.2" sources."http-errors-1.7.2" sources."inherits-2.0.3" sources."ms-2.0.0" + sources."on-finished-2.3.0" sources."setprototypeof-1.1.1" + sources."statuses-1.5.0" sources."toidentifier-1.0.0" ]; }) @@ -91178,7 +94592,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - (sources."browserslist-4.19.1" // { + (sources."browserslist-4.20.2" // { dependencies = [ sources."picocolors-1.0.0" ]; @@ -91212,8 +94626,7 @@ in }) sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001301" - sources."caseless-0.12.0" + sources."caniuse-lite-1.0.30001320" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -91267,7 +94680,7 @@ in sources."cli-table3-0.6.1" (sources."cliui-5.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."emoji-regex-7.0.3" sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" @@ -91283,7 +94696,6 @@ in sources."chalk-2.4.2" ]; }) - sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" sources."color-3.2.1" sources."color-convert-1.9.3" @@ -91313,7 +94725,6 @@ in }) sources."connect-history-api-fallback-1.6.0" sources."console-browserify-1.2.0" - sources."console-control-strings-1.1.0" sources."constants-browserify-1.0.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" @@ -91328,8 +94739,11 @@ in sources."copy-descriptor-0.1.1" (sources."copy-webpack-plugin-6.0.4" // { dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" sources."find-cache-dir-3.3.2" sources."find-up-4.1.0" + sources."json-schema-traverse-0.4.1" sources."locate-path-5.0.0" sources."make-dir-3.1.0" (sources."p-locate-4.1.0" // { @@ -91363,7 +94777,10 @@ in sources."css-declaration-sorter-4.0.1" (sources."css-loader-3.6.0" // { dependencies = [ + sources."ajv-6.12.6" sources."camelcase-5.3.1" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" sources."loader-utils-1.4.0" sources."schema-utils-2.7.1" sources."semver-6.3.0" @@ -91371,7 +94788,7 @@ in }) (sources."css-select-4.2.1" // { dependencies = [ - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" ]; }) sources."css-select-base-adapter-0.1.1" @@ -91397,9 +94814,8 @@ in }) sources."cyclist-1.0.1" sources."dag-map-1.0.2" - sources."dashdash-1.14.1" sources."dateformat-3.0.3" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decache-4.4.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -91423,11 +94839,10 @@ in ]; }) sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."deprecated-decorator-0.1.6" sources."des.js-1.0.1" - sources."destroy-1.0.4" + sources."destroy-1.2.0" sources."detect-node-2.1.0" (sources."detect-port-alt-1.1.6" // { dependencies = [ @@ -91447,7 +94862,7 @@ in sources."dom-converter-0.2.0" (sources."dom-serializer-1.3.2" // { dependencies = [ - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" ]; }) sources."domain-browser-1.2.0" @@ -91456,7 +94871,7 @@ in sources."domino-2.1.6" (sources."domutils-2.8.0" // { dependencies = [ - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" ]; }) (sources."dot-case-3.0.4" // { @@ -91468,9 +94883,8 @@ in sources."duplexer-0.1.2" sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.96" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -91479,11 +94893,6 @@ in sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) sources."end-of-stream-1.4.4" (sources."enhanced-resolve-4.5.0" // { dependencies = [ @@ -91492,10 +94901,7 @@ in }) sources."entities-2.2.0" sources."env-editor-0.4.2" - sources."env-paths-2.2.1" - sources."envinfo-7.8.1" sources."eol-0.9.1" - sources."err-code-2.0.3" sources."errno-0.1.8" sources."error-ex-1.3.2" sources."errorhandler-1.5.1" @@ -91544,13 +94950,13 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-modules-autolinking-0.4.0" // { + (sources."expo-modules-autolinking-0.5.5" // { dependencies = [ sources."commander-7.2.0" sources."fs-extra-9.1.0" ]; }) - (sources."expo-pwa-0.0.109" // { + (sources."expo-pwa-0.0.114" // { dependencies = [ sources."commander-2.20.0" ]; @@ -91559,12 +94965,15 @@ in dependencies = [ sources."body-parser-1.18.3" sources."debug-2.6.9" + sources."depd-1.1.2" + sources."destroy-1.0.4" sources."finalhandler-1.1.1" sources."http-errors-1.6.3" sources."iconv-lite-0.4.23" sources."inherits-2.0.3" sources."mime-1.4.1" sources."ms-2.0.0" + sources."on-finished-2.3.0" sources."qs-6.5.2" sources."raw-body-2.3.3" sources."send-0.16.2" @@ -91573,7 +94982,6 @@ in sources."statuses-1.4.0" ]; }) - sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -91585,8 +94993,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" + sources."fast-deep-equal-1.1.0" sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.13.0" @@ -91595,6 +95002,9 @@ in sources."figgy-pudding-3.5.2" (sources."file-loader-6.0.0" // { dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" sources."schema-utils-2.7.1" ]; }) @@ -91605,15 +95015,16 @@ in dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" + sources."on-finished-2.3.0" + sources."statuses-1.5.0" ]; }) sources."find-cache-dir-2.1.0" sources."find-up-5.0.0" sources."find-yarn-workspace-root-2.0.0" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."for-in-1.0.2" - sources."forever-agent-0.6.1" (sources."fork-ts-checker-webpack-plugin-4.1.6" // { dependencies = [ (sources."braces-2.3.2" // { @@ -91637,7 +95048,7 @@ in sources."to-regex-range-2.1.1" ]; }) - sources."form-data-2.3.3" + sources."form-data-2.5.1" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" sources."freeport-async-2.0.0" @@ -91657,14 +95068,6 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -91673,7 +95076,6 @@ in sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."getenv-1.0.0" - sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.2" sources."global-modules-2.0.0" @@ -91690,14 +95092,11 @@ in }) sources."gzip-size-5.1.1" sources."handle-thing-2.0.1" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - sources."has-unicode-2.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -91728,6 +95127,9 @@ in sources."html-entities-1.4.0" (sources."html-loader-1.1.0" // { dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" sources."schema-utils-2.7.1" ]; }) @@ -91744,13 +95146,12 @@ in sources."htmlparser2-4.1.0" sources."http-cache-semantics-4.1.0" sources."http-deceiver-1.2.7" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" (sources."http-proxy-1.18.1" // { dependencies = [ sources."eventemitter3-4.0.7" ]; }) - sources."http-proxy-agent-4.0.1" (sources."http-proxy-middleware-0.19.1" // { dependencies = [ sources."braces-2.3.2" @@ -91762,17 +95163,13 @@ in sources."to-regex-range-2.1.1" ]; }) - sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" sources."https-browserify-1.0.0" - sources."https-proxy-agent-5.0.0" - sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" sources."icss-utils-4.1.1" sources."ieee754-1.2.1" sources."iferr-0.1.5" sources."ignore-5.2.0" - sources."ignore-walk-3.0.4" sources."image-size-1.0.1" sources."immer-8.0.1" (sources."import-fresh-2.0.0" // { @@ -91819,7 +95216,6 @@ in sources."is-glob-2.0.1" ]; }) - sources."is-lambda-1.0.1" sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" sources."is-number-object-1.0.6" @@ -91863,7 +95259,6 @@ in sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typedarray-1.0.0" sources."is-valid-path-0.1.1" sources."is-weakref-1.0.2" sources."is-windows-1.0.2" @@ -91871,7 +95266,6 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."isstream-0.1.2" sources."iterall-1.2.2" (sources."jest-worker-26.6.2" // { dependencies = [ @@ -91880,7 +95274,7 @@ in ]; }) sources."jimp-compact-0.16.1" - sources."joi-17.5.0" + sources."joi-17.6.0" sources."join-component-1.1.0" sources."js-tokens-4.0.0" (sources."js-yaml-3.14.1" // { @@ -91888,28 +95282,22 @@ in sources."argparse-1.0.10" ]; }) - sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-buffer-3.0.1" sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.4.0" (sources."json-schema-deref-sync-0.13.0" // { dependencies = [ sources."clone-2.1.2" sources."md5-2.2.1" ]; }) - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" + sources."json-schema-traverse-0.3.1" sources."json3-3.3.3" sources."json5-1.0.1" sources."jsonfile-6.1.0" sources."jsonify-0.0.0" - sources."jsonparse-1.3.1" - sources."jsprim-1.4.2" sources."keychain-1.3.0" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."killable-1.0.1" sources."kind-of-6.0.3" sources."kleur-3.0.3" @@ -91920,7 +95308,7 @@ in sources."loader-runner-2.4.0" (sources."loader-utils-2.0.2" // { dependencies = [ - sources."json5-2.2.0" + sources."json5-2.2.1" ]; }) sources."locate-path-6.0.0" @@ -91948,11 +95336,6 @@ in sources."semver-5.7.1" ]; }) - (sources."make-fetch-happen-9.1.0" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5-2.3.0" @@ -91967,27 +95350,30 @@ in sources."merge2-1.4.1" sources."methods-1.1.2" sources."microevent.ts-0.1.1" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.12.0" ]; }) sources."mime-2.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" (sources."mini-css-extract-plugin-0.5.0" // { dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" sources."loader-utils-1.4.0" sources."schema-utils-1.0.0" ]; }) sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" (sources."minipass-2.3.5" // { dependencies = [ sources."yallist-3.1.1" @@ -91998,31 +95384,16 @@ in sources."minipass-3.1.6" ]; }) - (sources."minipass-fetch-1.4.1" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) (sources."minipass-flush-1.0.5" // { dependencies = [ sources."minipass-3.1.6" ]; }) - (sources."minipass-json-stream-1.0.1" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) (sources."minipass-pipeline-1.2.4" // { dependencies = [ sources."minipass-3.1.6" ]; }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.1.6" - ]; - }) (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.1.6" @@ -92034,7 +95405,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" (sources."move-concurrently-1.0.1" // { dependencies = [ sources."rimraf-2.7.1" @@ -92053,7 +95424,7 @@ in sources."debug-3.2.7" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."nested-error-stacks-2.0.1" sources."nice-try-1.0.5" @@ -92065,53 +95436,24 @@ in sources."nocache-2.1.0" sources."node-fetch-2.6.7" sources."node-forge-0.10.0" - (sources."node-gyp-7.1.2" // { - dependencies = [ - sources."rimraf-3.0.2" - sources."which-2.0.2" - ]; - }) sources."node-html-parser-1.4.9" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.1" - sources."nopt-5.0.0" + sources."node-releases-2.0.2" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" - sources."npm-bundled-1.1.2" - sources."npm-install-checks-4.0.0" - sources."npm-normalize-package-bin-1.0.1" (sources."npm-package-arg-6.1.0" // { dependencies = [ sources."hosted-git-info-2.8.9" sources."semver-5.7.1" ]; }) - sources."npm-packlist-2.2.2" - (sources."npm-pick-manifest-6.1.1" // { - dependencies = [ - sources."hosted-git-info-4.1.0" - sources."npm-package-arg-8.1.5" - sources."semver-7.3.5" - ]; - }) - (sources."npm-registry-fetch-11.0.0" // { - dependencies = [ - sources."hosted-git-info-4.1.0" - sources."minipass-3.1.6" - sources."npm-package-arg-8.1.5" - sources."semver-7.3.5" - ]; - }) sources."npm-run-path-2.0.2" - sources."npmlog-4.1.2" sources."nth-check-2.0.1" sources."nullthrows-1.1.1" - sources."number-is-nan-1.0.1" - sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { dependencies = [ @@ -92136,7 +95478,7 @@ in sources."object.pick-1.3.0" sources."object.values-1.1.5" sources."obuf-1.1.2" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" @@ -92150,7 +95492,7 @@ in sources."options-0.0.6" (sources."ora-3.4.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."chalk-2.4.2" sources."strip-ansi-5.2.0" ]; @@ -92199,16 +95541,6 @@ in sources."semver-6.3.0" ]; }) - (sources."pacote-11.3.5" // { - dependencies = [ - sources."hosted-git-info-4.1.0" - sources."minipass-3.1.6" - sources."mkdirp-1.0.4" - sources."npm-package-arg-8.1.5" - sources."rimraf-3.0.2" - sources."semver-7.3.5" - ]; - }) sources."pako-1.0.11" sources."parallel-transform-1.2.0" (sources."param-case-3.0.4" // { @@ -92242,13 +95574,12 @@ in sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."pbkdf2-3.1.2" - sources."performance-now-2.1.0" sources."picocolors-0.2.1" sources."picomatch-2.3.1" sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pirates-4.0.4" + sources."pirates-4.0.5" (sources."pkg-dir-3.0.0" // { dependencies = [ sources."find-up-3.0.0" @@ -92267,7 +95598,7 @@ in sources."path-exists-3.0.0" ]; }) - sources."plist-3.0.4" + sources."plist-3.0.5" sources."pngjs-3.4.0" sources."pnp-webpack-plugin-1.7.0" (sources."portfinder-1.0.28" // { @@ -92408,11 +95739,9 @@ in sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" sources."prompts-2.4.2" sources."proxy-addr-2.0.7" sources."prr-1.0.1" - sources."psl-1.8.0" (sources."public-encrypt-4.0.3" // { dependencies = [ sources."bn.js-4.12.0" @@ -92437,17 +95766,14 @@ in sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" - (sources."raven-2.6.3" // { - dependencies = [ - sources."uuid-3.0.0" - ]; - }) (sources."raw-body-2.4.0" // { dependencies = [ sources."bytes-3.1.0" + sources."depd-1.1.2" sources."http-errors-1.7.2" sources."inherits-2.0.3" sources."setprototypeof-1.1.1" + sources."statuses-1.5.0" sources."toidentifier-1.0.0" ]; }) @@ -92465,7 +95791,7 @@ in sources."find-up-4.1.0" sources."globby-11.0.1" sources."is-wsl-2.2.0" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."loader-utils-2.0.0" sources."locate-path-5.0.0" sources."node-releases-1.1.77" @@ -92485,10 +95811,13 @@ in sources."react-is-17.0.2" sources."read-chunk-3.2.0" sources."read-last-lines-1.6.0" - sources."read-package-json-fast-2.0.3" sources."readable-stream-2.3.7" sources."readdirp-3.6.0" - sources."recursive-readdir-2.2.2" + (sources."recursive-readdir-2.2.2" // { + dependencies = [ + sources."minimatch-3.0.4" + ]; + }) sources."regenerator-runtime-0.13.9" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.1" @@ -92500,19 +95829,13 @@ in (sources."renderkid-2.0.7" // { dependencies = [ sources."ansi-regex-2.1.1" - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" sources."htmlparser2-6.1.0" sources."strip-ansi-3.0.1" ]; }) sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" - (sources."request-2.88.2" // { - dependencies = [ - sources."qs-6.5.3" - sources."uuid-3.4.0" - ]; - }) sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" @@ -92522,7 +95845,7 @@ in ]; }) sources."requires-port-1.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-alpn-1.2.1" (sources."resolve-cwd-2.0.0" // { dependencies = [ @@ -92552,11 +95875,17 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."schema-utils-3.1.1" + (sources."schema-utils-3.1.1" // { + dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" + ]; + }) sources."select-hose-2.0.0" sources."selfsigned-1.10.14" sources."semver-7.3.2" - (sources."send-0.17.2" // { + (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ @@ -92572,13 +95901,15 @@ in (sources."serve-index-1.9.1" // { dependencies = [ sources."debug-2.6.9" + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."ms-2.0.0" sources."setprototypeof-1.1.0" + sources."statuses-1.5.0" ]; }) - sources."serve-static-1.14.2" + sources."serve-static-1.15.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -92592,7 +95923,7 @@ in sources."shebang-regex-1.0.0" sources."shell-quote-1.6.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."simple-plist-1.3.0" // { dependencies = [ sources."bplist-parser-0.3.0" @@ -92606,7 +95937,6 @@ in sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."slugify-1.6.5" - sources."smart-buffer-4.2.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -92648,8 +95978,6 @@ in sources."faye-websocket-0.11.4" ]; }) - sources."socks-2.6.1" - sources."socks-proxy-agent-6.1.1" sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" @@ -92664,14 +95992,12 @@ in sources."split-1.0.1" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.17.0" (sources."ssri-8.0.1" // { dependencies = [ sources."minipass-3.1.6" ]; }) sources."stable-0.1.8" - sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -92689,7 +96015,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."stream-browserify-2.0.2" sources."stream-buffers-2.2.0" sources."stream-each-1.2.3" @@ -92710,6 +96036,9 @@ in sources."strip-json-comments-2.0.1" (sources."style-loader-1.2.1" // { dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-0.4.1" sources."schema-utils-2.7.1" ]; }) @@ -92779,8 +96108,11 @@ in }) (sources."terser-webpack-plugin-3.1.0" // { dependencies = [ + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" sources."find-cache-dir-3.3.2" sources."find-up-4.1.0" + sources."json-schema-traverse-0.4.1" sources."locate-path-5.0.0" sources."make-dir-3.1.0" (sources."p-locate-4.1.0" // { @@ -92800,7 +96132,6 @@ in sources."through-2.3.8" sources."through2-2.0.5" sources."thunky-1.1.0" - sources."timed-out-4.0.1" sources."timers-browserify-2.0.12" sources."timsort-0.3.0" sources."tmp-0.0.33" @@ -92815,7 +96146,6 @@ in sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."traverse-0.6.6" sources."tree-kill-1.2.2" @@ -92824,9 +96154,7 @@ in sources."ts-pnp-1.2.0" sources."tslib-1.14.1" sources."tty-browserify-0.0.0" - sources."tunnel-agent-0.6.0" sources."turndown-7.0.0" - sources."tweetnacl-0.14.5" sources."type-fest-0.12.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" @@ -92863,7 +96191,7 @@ in }) sources."url-join-4.0.0" sources."url-loader-4.1.1" - sources."url-parse-1.5.4" + sources."url-parse-1.5.10" (sources."url-parse-lax-3.0.0" // { dependencies = [ sources."prepend-http-2.0.0" @@ -92884,11 +96212,6 @@ in sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" sources."vendors-1.0.4" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) sources."vm-browserify-1.1.2" sources."watchpack-1.7.5" (sources."watchpack-chokidar2-2.0.1" // { @@ -92916,12 +96239,15 @@ in sources."webidl-conversions-3.0.1" (sources."webpack-4.43.0" // { dependencies = [ + sources."ajv-6.12.6" sources."braces-2.3.2" sources."cacache-12.0.4" sources."chownr-1.1.4" sources."extend-shallow-2.0.1" + sources."fast-deep-equal-3.1.3" sources."fill-range-4.0.0" sources."is-number-3.0.0" + sources."json-schema-traverse-0.4.1" sources."kind-of-3.2.2" sources."loader-utils-1.4.0" sources."lru-cache-5.1.1" @@ -92938,49 +96264,69 @@ in sources."webpack-dev-middleware-3.7.3" (sources."webpack-dev-server-3.11.0" // { dependencies = [ + sources."ajv-6.12.6" sources."ansi-regex-2.1.1" sources."anymatch-2.0.0" sources."array-union-1.0.2" sources."binary-extensions-1.13.1" - (sources."body-parser-1.19.1" // { + (sources."body-parser-1.19.2" // { dependencies = [ sources."debug-2.6.9" ]; }) sources."braces-2.3.2" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."chokidar-2.1.8" sources."content-disposition-0.5.4" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."del-4.1.1" - (sources."express-4.17.2" // { + sources."depd-1.1.2" + sources."destroy-1.0.4" + (sources."express-4.17.3" // { dependencies = [ sources."debug-2.6.9" ]; }) sources."extend-shallow-2.0.1" + sources."fast-deep-equal-3.1.3" sources."fill-range-4.0.0" sources."fsevents-1.2.13" sources."glob-parent-3.1.0" sources."globby-6.1.0" + sources."http-errors-1.8.1" sources."is-absolute-url-3.0.3" sources."is-binary-path-1.0.1" sources."is-glob-3.1.0" sources."is-number-3.0.0" + sources."json-schema-traverse-0.4.1" sources."kind-of-3.2.2" sources."micromatch-3.1.10" + sources."mime-1.6.0" sources."ms-2.0.0" sources."normalize-path-2.1.1" + sources."on-finished-2.3.0" sources."p-map-2.1.0" sources."p-retry-3.0.1" sources."pify-2.3.0" - sources."qs-6.9.6" - sources."raw-body-2.4.2" + sources."qs-6.9.7" + sources."raw-body-2.4.3" sources."readdirp-2.2.1" sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" sources."schema-utils-1.0.0" sources."semver-6.3.0" + (sources."send-0.17.2" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.3" + ]; + }) + sources."serve-static-1.14.2" + sources."statuses-1.5.0" sources."strip-ansi-3.0.1" sources."supports-color-6.1.0" sources."to-regex-range-2.1.1" @@ -93010,7 +96356,6 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" - sources."wide-align-1.1.5" sources."widest-line-3.1.0" sources."with-open-file-0.1.7" sources."worker-farm-1.7.0" @@ -93030,11 +96375,12 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.2.22" // { + (sources."xdl-59.2.30" // { dependencies = [ sources."bplist-parser-0.3.1" sources."chownr-1.1.4" sources."fs-minipass-1.2.7" + sources."minimatch-3.0.4" sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."p-map-3.0.0" @@ -93053,7 +96399,7 @@ in sources."yallist-4.0.0" (sources."yargs-13.3.2" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."emoji-regex-7.0.3" sources."find-up-3.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -93087,43 +96433,47 @@ in fast-cli = nodeEnv.buildNodePackage { name = "fast-cli"; packageName = "fast-cli"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fast-cli/-/fast-cli-3.1.0.tgz"; - sha512 = "vpRrhwFHZGzf/cGKbl1m/JUx+H27zmeUMaOsCknEmKHPvDlL+HQL6YTxK4XYRCUEQmxOGYOUSGG4udBpprG7gg=="; + url = "https://registry.npmjs.org/fast-cli/-/fast-cli-3.2.0.tgz"; + sha512 = "sA4bbCHFe8DqtRjlIVD5Hga+tDpYOgoOOG+NKyLFYJfLrxlmU28RmSjr+pC15q0xU67g7Ut3jDskasmjeLgRsg=="; }; dependencies = [ + sources."@ampproject/remapping-2.1.2" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - sources."@babel/core-7.16.10" - sources."@babel/generator-7.16.8" + sources."@babel/compat-data-7.17.7" + sources."@babel/core-7.17.8" + sources."@babel/generator-7.17.7" sources."@babel/helper-annotate-as-pure-7.16.7" - sources."@babel/helper-compilation-targets-7.16.7" + sources."@babel/helper-compilation-targets-7.17.7" sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-function-name-7.16.7" sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.7" sources."@babel/helper-plugin-utils-7.16.7" - sources."@babel/helper-simple-access-7.16.7" + sources."@babel/helper-simple-access-7.17.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.8" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.10" - sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/parser-7.17.8" + sources."@babel/plugin-proposal-object-rest-spread-7.17.3" sources."@babel/plugin-syntax-jsx-7.16.7" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-destructuring-7.17.7" sources."@babel/plugin-transform-parameters-7.16.7" - sources."@babel/plugin-transform-react-jsx-7.16.7" + sources."@babel/plugin-transform-react-jsx-7.17.3" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.3" + sources."@babel/types-7.17.0" + sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/sourcemap-codec-1.4.11" + sources."@jridgewell/trace-mapping-0.3.4" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -93142,7 +96492,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.19.1" + sources."browserslist-4.20.2" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-4.1.0" @@ -93150,7 +96500,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001320" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -93165,7 +96515,8 @@ in sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."convert-to-spaces-1.0.2" - sources."debug-4.3.3" + sources."cross-fetch-3.1.5" + sources."debug-4.3.4" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -93173,8 +96524,8 @@ in ]; }) sources."delay-5.0.0" - sources."devtools-protocol-0.0.948846" - sources."electron-to-chromium-1.4.51" + sources."devtools-protocol-0.0.969999" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -93220,7 +96571,7 @@ in sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."json-parse-even-better-errors-2.3.1" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."kind-of-6.0.3" sources."lines-and-columns-1.2.4" sources."locate-path-5.0.0" @@ -93236,13 +96587,12 @@ in }) sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" sources."minimist-options-4.1.0" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" - sources."node-fetch-2.6.5" - sources."node-releases-2.0.1" + sources."node-fetch-2.6.7" + sources."node-releases-2.0.2" (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."semver-7.3.5" @@ -93265,15 +96615,15 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - (sources."puppeteer-13.1.1" // { + (sources."puppeteer-13.5.1" // { dependencies = [ - sources."debug-4.3.2" - sources."ws-8.2.3" + sources."debug-4.3.3" + sources."ws-8.5.0" ]; }) sources."quick-lru-4.0.1" sources."react-17.0.2" - sources."react-devtools-core-4.22.1" + sources."react-devtools-core-4.24.2" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -93290,7 +96640,7 @@ in }) sources."readable-stream-3.6.0" sources."redent-3.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-3.0.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" @@ -93298,7 +96648,7 @@ in sources."scheduler-0.20.2" sources."semver-6.3.0" sources."shell-quote-1.7.3" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."slice-ansi-3.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -93347,7 +96697,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."yallist-4.0.0" sources."yargs-parser-20.2.9" sources."yauzl-2.10.0" @@ -93367,15 +96717,15 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.13.0.tgz"; - sha512 = "v+BnCDJ3lla19bPcPfrMhPLjDlite6sdejhz9lhUck0dO1cFeSDtSw3+4Nbo18BzHFOEm3GN3GCwHeUyQtwipQ=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.14.0.tgz"; + sha512 = "BkerCVGNYE81YUaXK1N4Zv9Sppa1KqfdaqDF03o+B1fnDrQLeCftN+8j8P/z9iFH8ZDrDR9E1qgWNA5NvjHbAw=="; }; dependencies = [ (sources."@heroku-cli/color-1.1.14" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" @@ -93389,15 +96739,16 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@oclif/command-1.8.16" - sources."@oclif/config-1.18.2" + sources."@oclif/config-1.18.3" sources."@oclif/errors-1.3.5" (sources."@oclif/help-1.0.1" // { dependencies = [ + sources."@oclif/config-1.18.2" sources."wrap-ansi-6.2.0" ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.6" + sources."@oclif/parser-3.8.7" (sources."@oclif/plugin-autocomplete-0.1.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -93411,7 +96762,7 @@ in }) (sources."@oclif/plugin-help-1.2.11" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" @@ -93427,7 +96778,6 @@ in }) sources."@oclif/screen-1.0.4" sources."@sindresorhus/is-0.7.0" - sources."abort-controller-3.0.0" sources."ajv-6.12.6" sources."ansi-align-3.0.1" sources."ansi-escapes-3.2.0" @@ -93474,7 +96824,7 @@ in sources."cli-table-0.3.11" (sources."cli-ux-4.9.3" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."clean-stack-2.2.0" @@ -93506,7 +96856,7 @@ in }) sources."csv-stream-0.2.0" sources."dashdash-1.14.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-is-0.1.4" @@ -93522,7 +96872,6 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."event-target-shim-5.0.1" sources."execa-0.10.0" sources."extend-3.0.2" sources."external-editor-3.1.0" @@ -93533,7 +96882,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" - sources."faunadb-4.4.1" + sources."faunadb-4.5.2" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -93558,7 +96907,7 @@ in sources."has-to-string-tag-x-1.4.1" (sources."heroku-cli-util-8.0.12" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" @@ -93578,7 +96927,7 @@ in sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."inquirer-8.2.0" // { + (sources."inquirer-8.2.2" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."type-fest-0.21.3" @@ -93619,9 +96968,9 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.4" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."micromatch-4.0.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."moment-2.29.1" @@ -93633,12 +96982,13 @@ in ]; }) sources."nice-try-1.0.5" + sources."node-abort-controller-3.0.1" sources."node-fetch-2.6.7" sources."normalize-url-2.0.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-sizeof-1.6.1" + sources."object-sizeof-1.6.3" sources."onetime-5.1.2" sources."opn-3.0.3" sources."optionator-0.8.3" @@ -93656,7 +97006,7 @@ in sources."pify-3.0.0" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."prettier-2.5.1" + sources."prettier-2.6.1" sources."process-nextick-args-2.0.1" sources."psl-1.8.0" sources."punycode-2.1.1" @@ -93677,20 +97027,20 @@ in sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.2" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."sort-keys-2.0.0" sources."source-map-0.6.1" sources."sshpk-1.17.0" sources."stealthy-require-1.1.1" - sources."stream-chain-2.2.4" - sources."stream-json-1.7.3" + sources."stream-chain-2.2.5" + sources."stream-json-1.7.4" sources."strict-uri-encode-1.1.0" sources."string-width-4.2.3" (sources."string_decoder-1.1.1" // { @@ -93751,10 +97101,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "10.1.2"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-10.1.2.tgz"; - sha512 = "Z8TA9wGeN5vbl/NJBhiwrm2RLmZgHPvv9G4mQhqyWkfcrlglWwqxgA4KsmZABwtyE7A4teDC4yBdw4K7d6JTcw=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-10.5.0.tgz"; + sha512 = "sl4ycYfKsliII500HuqgEOWeB3OXi0twDDC/xPv1Eiw8FFYoTJwHm2w4YWUhTtDq4tSrHNCmdBza9LP+wvelnA=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { @@ -93762,17 +97112,18 @@ in sources."js-yaml-4.1.0" ]; }) - sources."@dabh/diagnostics-2.0.2" - sources."@gar/promisify-1.1.2" - sources."@google-cloud/paginator-3.0.6" + sources."@colors/colors-1.5.0" + sources."@dabh/diagnostics-2.0.3" + sources."@gar/promisify-1.1.3" + sources."@google-cloud/paginator-3.0.7" sources."@google-cloud/precise-date-2.0.4" sources."@google-cloud/projectify-2.1.1" sources."@google-cloud/promisify-2.0.4" - sources."@google-cloud/pubsub-2.18.4" - sources."@grpc/grpc-js-1.4.6" + sources."@google-cloud/pubsub-2.19.0" + sources."@grpc/grpc-js-1.5.10" sources."@grpc/proto-loader-0.6.9" sources."@jsdevtools/ono-7.1.3" - (sources."@npmcli/fs-1.1.0" // { + (sources."@npmcli/fs-1.1.1" // { dependencies = [ sources."semver-7.3.5" ]; @@ -93782,8 +97133,8 @@ in sources."mkdirp-1.0.4" ]; }) - sources."@opentelemetry/api-1.0.4" - sources."@opentelemetry/semantic-conventions-0.24.0" + sources."@opentelemetry/api-1.1.0" + sources."@opentelemetry/semantic-conventions-1.1.1" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -93798,19 +97149,21 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" sources."@types/duplexify-3.6.1" - sources."@types/json-schema-7.0.9" + sources."@types/json-schema-7.0.11" sources."@types/long-4.0.1" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" - sources."accepts-1.3.7" + sources."accepts-1.3.8" + sources."acorn-8.7.0" + sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ajv-formats-2.1.1" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.11.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -93829,7 +97182,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."are-we-there-yet-2.0.0" + sources."are-we-there-yet-3.0.0" sources."argparse-2.0.1" sources."array-flatten-1.1.1" sources."arrify-2.0.1" @@ -93855,9 +97208,9 @@ in sources."binary-0.3.0" sources."binary-extensions-2.2.0" sources."bl-4.1.0" - sources."blakejs-1.1.1" + sources."blakejs-1.2.1" sources."bluebird-3.4.7" - (sources."body-parser-1.19.1" // { + (sources."body-parser-1.19.2" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -93876,7 +97229,7 @@ in sources."buffer-equal-constant-time-1.0.1" sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" - sources."bytes-3.1.1" + sources."bytes-3.1.2" (sources."cacache-15.3.0" // { dependencies = [ sources."mkdirp-1.0.4" @@ -93949,11 +97302,11 @@ in sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."cors-2.8.5" - sources."crc-32-1.2.0" + sources."crc-32-1.2.1" sources."crc32-stream-4.0.2" (sources."cross-env-5.2.1" // { dependencies = [ @@ -93973,14 +97326,14 @@ in sources."d-1.0.1" sources."dashdash-1.14.1" sources."data-uri-to-buffer-3.0.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."deep-freeze-0.0.1" sources."deep-is-0.1.4" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" - sources."degenerator-3.0.1" + sources."degenerator-3.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -94010,7 +97363,7 @@ in sources."end-of-stream-1.4.4" sources."env-paths-2.2.1" sources."err-code-2.0.3" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.59" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -94028,7 +97381,7 @@ in sources."events-listener-1.1.0" (sources."exegesis-4.1.0" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.11.0" sources."json-schema-traverse-1.0.0" sources."semver-7.3.5" ]; @@ -94036,7 +97389,7 @@ in sources."exegesis-express-4.0.0" sources."exit-code-1.0.2" sources."exit-on-epipe-1.0.1" - (sources."express-4.17.2" // { + (sources."express-4.17.3" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -94044,7 +97397,7 @@ in }) (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.5.0" + sources."type-2.6.0" ]; }) sources."extend-3.0.2" @@ -94103,7 +97456,7 @@ in sources."string_decoder-0.10.31" ]; }) - sources."gauge-4.0.0" + sources."gauge-4.0.3" sources."gaxios-4.3.2" sources."gcp-metadata-4.3.1" sources."get-caller-file-2.0.5" @@ -94119,12 +97472,12 @@ in sources."glob-slash-1.0.0" sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" - sources."google-auth-library-7.11.0" - sources."google-gax-2.28.1" + sources."google-auth-library-7.14.1" + sources."google-gax-2.29.6" sources."google-p12-pem-3.1.3" sources."got-9.6.0" sources."graceful-fs-4.2.9" - sources."gtoken-5.3.1" + sources."gtoken-5.3.2" sources."har-schema-2.0.0" sources."har-validator-5.1.5" (sources."has-ansi-2.0.0" // { @@ -94151,7 +97504,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.7" - sources."inquirer-8.2.0" + sources."inquirer-8.2.2" sources."install-artifact-from-github-1.3.0" sources."ip-1.1.5" sources."ip-regex-4.3.0" @@ -94192,7 +97545,7 @@ in sources."json-bigint-1.0.0" sources."json-buffer-3.0.0" sources."json-parse-helpfulerror-1.0.3" - sources."json-ptr-3.0.1" + sources."json-ptr-3.1.0" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -94241,11 +97594,7 @@ in sources."lodash.union-4.6.0" sources."lodash.values-2.4.1" sources."log-symbols-4.1.0" - (sources."logform-2.3.2" // { - dependencies = [ - sources."colors-1.4.0" - ]; - }) + sources."logform-2.4.0" sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -94260,7 +97609,7 @@ in sources."socks-proxy-agent-6.1.1" ]; }) - sources."marked-4.0.10" + sources."marked-4.0.12" (sources."marked-terminal-3.3.0" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -94273,20 +97622,16 @@ in ]; }) sources."media-typer-0.3.0" - (sources."memoizee-0.4.15" // { - dependencies = [ - sources."next-tick-1.1.0" - ]; - }) + sources."memoizee-0.4.15" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" @@ -94294,7 +97639,7 @@ in sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" sources."minizlib-2.1.2" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" (sources."morgan-1.10.0" // { dependencies = [ sources."debug-2.6.9" @@ -94310,13 +97655,13 @@ in sources."async-1.5.2" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."netmask-2.0.2" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-emoji-1.11.0" sources."node-fetch-2.6.7" - sources."node-forge-1.2.1" + sources."node-forge-1.3.0" (sources."node-gyp-8.4.1" // { dependencies = [ sources."semver-7.3.5" @@ -94326,7 +97671,7 @@ in sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."npmlog-6.0.0" + sources."npmlog-6.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-hash-2.2.0" @@ -94336,7 +97681,7 @@ in sources."one-time-1.0.0" sources."onetime-5.1.2" sources."open-6.4.0" - sources."openapi3-ts-2.0.1" + sources."openapi3-ts-2.0.2" sources."optionator-0.8.3" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" @@ -94364,12 +97709,16 @@ in }) sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."printj-1.1.2" + sources."printj-1.3.1" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-breaker-5.0.0" sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" + (sources."promise-retry-2.0.1" // { + dependencies = [ + sources."retry-0.12.0" + ]; + }) sources."proto3-json-serializer-0.1.8" sources."protobufjs-6.11.2" sources."proxy-addr-2.0.7" @@ -94384,11 +97733,11 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" sources."rc-1.2.8" - sources."re2-1.17.3" + sources."re2-1.17.4" sources."readable-stream-3.6.0" sources."readdir-glob-1.1.1" sources."readdirp-3.6.0" @@ -94405,7 +97754,7 @@ in sources."require-from-string-2.0.2" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" - sources."retry-0.12.0" + sources."retry-0.13.1" sources."retry-request-4.2.2" sources."rimraf-3.0.2" (sources."router-1.3.6" // { @@ -94417,9 +97766,9 @@ in }) sources."rsvp-4.8.5" sources."run-async-2.4.1" - sources."rxjs-7.5.2" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-1.1.1" + sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" sources."semver-5.7.1" (sources."semver-diff-3.1.1" // { @@ -94444,10 +97793,10 @@ in sources."setprototypeof-1.2.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-swizzle-0.2.2" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" @@ -94455,8 +97804,8 @@ in sources."ssri-8.0.1" sources."stack-trace-0.0.10" sources."statuses-1.5.0" - sources."stream-chain-2.2.4" - sources."stream-json-1.7.3" + sources."stream-chain-2.2.5" + sources."stream-json-1.7.4" sources."stream-shift-1.0.1" (sources."string-length-1.0.1" // { dependencies = [ @@ -94538,11 +97887,7 @@ in sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-2.0.0" - (sources."universal-analytics-0.4.23" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) + sources."universal-analytics-0.5.3" sources."universalify-0.1.2" sources."unpipe-1.0.0" (sources."unzipper-0.10.11" // { @@ -94577,20 +97922,20 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.5" + sources."vm2-3.9.9" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."wide-align-1.1.5" sources."widest-line-3.1.0" - sources."winston-3.4.0" - sources."winston-transport-4.4.2" + sources."winston-3.6.0" + sources."winston-transport-4.5.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xdg-basedir-4.0.0" sources."xregexp-2.0.0" sources."y18n-5.0.8" @@ -94637,7 +97982,7 @@ in sources."inherits-2.0.4" sources."is-fullwidth-code-point-3.0.0" sources."json5-relaxed-0.5.4" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."require-directory-2.1.1" @@ -94662,10 +98007,10 @@ in fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; packageName = "fkill-cli"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-7.0.0.tgz"; - sha512 = "iLv/+0qHQjqnj9Pa9gA0TQ6vhV9eRn4fKxbiOPKL7uGs2Zth7iIGvNnpHmJfQ7OV7TTgR53yolY2DS1vWE/FjQ=="; + url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-7.1.0.tgz"; + sha512 = "EkJbYwI1Wt3oujxNlFF0Mq3hqdkDtQz7cPhZnXzUxmNhaxVopDqiwnB3zZmVvt2t6uKvplh21kLTTJ11hWH+0w=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -94692,7 +98037,7 @@ in sources."bl-4.1.0" sources."buffer-5.7.1" sources."camelcase-6.3.0" - (sources."camelcase-keys-7.0.1" // { + (sources."camelcase-keys-7.0.2" // { dependencies = [ sources."type-fest-1.4.0" ]; @@ -94731,6 +98076,7 @@ in sources."find-up-5.0.0" sources."fkill-8.0.0" sources."function-bind-1.1.1" + sources."fuzzy-search-3.2.1" sources."get-stream-6.0.1" sources."hard-rejection-2.1.0" sources."has-1.0.3" @@ -94741,7 +98087,7 @@ in sources."ieee754-1.2.1" sources."indent-string-5.0.0" sources."inherits-2.0.4" - (sources."inquirer-8.2.0" // { + (sources."inquirer-8.2.2" // { dependencies = [ sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" @@ -94825,13 +98171,13 @@ in sources."redent-4.0.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-7.5.2" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."slice-ansi-5.0.0" // { dependencies = [ sources."ansi-styles-6.1.0" @@ -94841,7 +98187,7 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" sources."strip-final-newline-2.0.0" @@ -94883,7 +98229,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.0" sources."@types/inquirer-6.5.0" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -94903,7 +98249,7 @@ in sources."base-x-3.0.9" sources."bcrypt-pbkdf-1.0.2" sources."binary-search-tree-0.2.5" - sources."blakejs-1.1.1" + sources."blakejs-1.2.1" sources."bluebird-3.7.2" sources."bn.js-4.12.0" sources."brorand-1.1.0" @@ -94938,7 +98284,7 @@ in sources."esprima-4.0.1" sources."ethereum-bloom-filters-1.0.10" sources."ethereum-cryptography-0.1.3" - (sources."ethereumjs-util-7.1.3" // { + (sources."ethereumjs-util-7.1.4" // { dependencies = [ sources."bn.js-5.2.0" ]; @@ -94995,13 +98341,13 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."md5.js-1.3.5" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."mute-stream-0.0.8" sources."nedb-1.8.0" sources."node-addon-api-2.0.2" @@ -95050,7 +98396,7 @@ in sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sprintf-js-1.0.3" sources."sshpk-1.17.0" sources."stealthy-require-1.1.1" @@ -95075,7 +98421,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.7.0" + sources."web3-utils-1.7.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-module-2.0.0" @@ -95115,12 +98461,14 @@ in forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/forever/-/forever-4.0.2.tgz"; - sha512 = "4m31xy8+Rszy1Dq6grPF1dDoEXW5su94JLT3cH0RJcgt+htu9NKVdeNMUeNtUbJ9iSYfuAL3ZpKW8/WTFXu2Sg=="; + url = "https://registry.npmjs.org/forever/-/forever-4.0.3.tgz"; + sha512 = "N8aVtvB3bdh3lXPE9Rb+ErISSnJsAkv0GgZ0h6qtN8UXFgcSqJNMyBst9r3SBNk6+n4iBVaZso16mr1SUVvG3Q=="; }; dependencies = [ + sources."@colors/colors-1.5.0" + sources."@dabh/diagnostics-2.0.3" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -95160,7 +98508,7 @@ in }) sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."caller-0.0.1" + sources."caller-1.0.1" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { dependencies = [ @@ -95181,12 +98529,23 @@ in }) (sources."cliff-0.1.10" // { dependencies = [ + sources."async-0.2.10" sources."colors-1.0.3" + (sources."winston-0.8.3" // { + dependencies = [ + sources."colors-0.6.2" + ]; + }) ]; }) sources."clone-2.1.2" sources."collection-visit-1.0.0" + sources."color-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-string-1.9.0" sources."colors-0.6.2" + sources."colorspace-1.1.4" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."configstore-4.0.0" @@ -95199,10 +98558,10 @@ in sources."deep-equal-2.0.5" sources."define-properties-1.1.3" sources."define-property-2.0.2" - sources."defined-0.0.0" sources."director-1.2.7" sources."dot-prop-4.2.1" sources."duplexer-0.1.2" + sources."enabled-2.0.0" sources."es-abstract-1.19.1" sources."es-get-iterator-1.1.2" sources."es-to-primitive-1.2.1" @@ -95236,6 +98595,7 @@ in ]; }) sources."eyes-0.1.8" + sources."fecha-4.2.1" sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -95244,6 +98604,7 @@ in ]; }) sources."flatiron-0.4.3" + sources."fn.name-1.1.0" sources."for-in-1.0.2" sources."foreach-2.0.5" sources."forever-monitor-3.0.3" @@ -95264,7 +98625,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -95280,6 +98641,7 @@ in sources."internal-slot-1.0.3" sources."is-accessor-descriptor-1.0.0" sources."is-arguments-1.1.1" + sources."is-arrayish-0.3.2" sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" sources."is-boolean-object-1.1.2" @@ -95304,6 +98666,7 @@ in sources."is-regex-1.1.4" sources."is-set-2.0.2" sources."is-shared-array-buffer-1.0.1" + sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-typed-array-1.1.8" @@ -95314,20 +98677,25 @@ in sources."isarray-2.0.5" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."jsonify-0.0.0" sources."kind-of-6.0.3" + sources."kuler-2.0.0" sources."lazy-1.0.11" + (sources."logform-2.4.0" // { + dependencies = [ + sources."ms-2.1.3" + ]; + }) sources."make-dir-1.3.0" sources."map-cache-0.2.2" sources."map-stream-0.1.0" sources."map-visit-1.0.0" sources."micromatch-3.1.10" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minimist-0.0.10" sources."mixin-deep-1.3.2" - (sources."mkdirp-0.5.5" // { + (sources."mkdirp-0.5.6" // { dependencies = [ - sources."minimist-1.2.5" + sources."minimist-1.2.6" ]; }) sources."ms-2.0.0" @@ -95367,6 +98735,7 @@ in sources."object.assign-4.1.2" sources."object.pick-1.3.0" sources."once-1.4.0" + sources."one-time-1.0.0" sources."optimist-0.6.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -95378,11 +98747,16 @@ in (sources."prettyjson-1.2.5" // { dependencies = [ sources."colors-1.4.0" - sources."minimist-1.2.5" + sources."minimist-1.2.6" ]; }) sources."process-nextick-args-2.0.1" - sources."prompt-0.2.14" + (sources."prompt-0.2.14" // { + dependencies = [ + sources."async-0.2.10" + sources."winston-0.8.3" + ]; + }) sources."ps-tree-1.2.0" sources."read-1.0.7" (sources."readable-stream-2.3.7" // { @@ -95397,21 +98771,22 @@ in sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" sources."resolve-url-0.2.1" - sources."resumer-0.0.0" sources."ret-0.1.15" sources."revalidator-0.1.8" sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" + sources."safe-stable-stringify-2.3.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" sources."is-extendable-0.1.1" ]; }) - sources."shush-1.0.0" + sources."shush-1.0.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" + sources."simple-swizzle-0.2.2" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -95468,12 +98843,8 @@ in sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" - sources."strip-json-comments-0.1.3" - (sources."tape-2.3.3" // { - dependencies = [ - sources."deep-equal-0.1.2" - ]; - }) + sources."strip-json-comments-2.0.1" + sources."text-hex-1.0.0" sources."through-2.3.8" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -95482,6 +98853,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" + sources."triple-beam-1.3.0" sources."unbox-primitive-1.0.1" (sources."union-value-1.0.1" // { dependencies = [ @@ -95512,9 +98884,15 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-typed-array-1.1.7" - (sources."winston-0.8.3" // { + (sources."winston-3.6.0" // { dependencies = [ - sources."async-0.2.10" + sources."async-3.2.3" + sources."readable-stream-3.6.0" + ]; + }) + (sources."winston-transport-4.5.0" // { + dependencies = [ + sources."readable-stream-3.6.0" ]; }) sources."wordwrap-0.0.3" @@ -95587,68 +98965,79 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "4.5.2"; + version = "4.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.5.2.tgz"; - sha512 = "AAltHfDTqOq4RL0oBgsmZb+IIDiV1zMdEzCgYIeEqWtc7nesKwHs4myYqhQV8wmXwyWKKWuXuTAqSoxuQT+X5w=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.10.2.tgz"; + sha512 = "lA1zFuWZwE+VtKYgntls0EC5PG4QoqqeJFWP+83Lmh+9hoLLkmL1plALBQeI3JY/9KXgRiC4OoR94CQkI329TA=="; }; dependencies = [ + sources."@ampproject/remapping-2.1.2" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.10" // { - dependencies = [ - sources."semver-6.3.0" - sources."source-map-0.5.7" - ]; - }) - (sources."@babel/generator-7.16.8" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - (sources."@babel/helper-compilation-targets-7.16.7" // { + sources."@babel/compat-data-7.17.7" + (sources."@babel/core-7.17.8" // { dependencies = [ sources."semver-6.3.0" ]; }) + (sources."@babel/generator-7.17.7" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."@babel/helper-annotate-as-pure-7.16.7" + (sources."@babel/helper-compilation-targets-7.17.7" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.17.6" sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-function-name-7.16.7" sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" + sources."@babel/helper-member-expression-to-functions-7.17.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.7" + sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" - sources."@babel/helper-simple-access-7.16.7" + sources."@babel/helper-replace-supers-7.16.7" + sources."@babel/helper-simple-access-7.17.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.8" (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.10" - sources."@babel/runtime-7.16.7" + sources."@babel/parser-7.17.8" + sources."@babel/plugin-syntax-typescript-7.16.7" + sources."@babel/plugin-transform-typescript-7.16.8" + sources."@babel/preset-typescript-7.16.7" + sources."@babel/runtime-7.17.8" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.3" + sources."@babel/types-7.17.0" sources."@hapi/hoek-9.2.1" sources."@hapi/topo-5.1.0" - sources."@sideway/address-4.1.3" + sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/sourcemap-codec-1.4.11" + sources."@jridgewell/trace-mapping-0.3.4" + sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" - sources."@sindresorhus/is-4.3.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" - sources."@turist/fetch-7.1.7" + sources."@turist/fetch-7.2.0" sources."@turist/time-0.0.2" sources."@types/cacheable-request-6.0.2" sources."@types/common-tags-1.8.1" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.3" - sources."@types/node-17.0.10" - sources."@types/node-fetch-2.5.12" + sources."@types/keyv-3.1.4" + sources."@types/node-17.0.23" + sources."@types/node-fetch-2.6.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" sources."ansi-align-3.0.1" @@ -95657,7 +99046,7 @@ in sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-5.0.1" + sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."arch-2.2.0" sources."async-retry-ng-2.0.1" @@ -95667,7 +99056,7 @@ in sources."boolbase-1.0.0" sources."boxen-5.1.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.19.1" + sources."browserslist-4.20.2" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { dependencies = [ @@ -95676,7 +99065,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001320" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -95701,7 +99090,6 @@ in sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."strip-ansi-6.0.1" sources."wrap-ansi-6.2.0" ]; }) @@ -95714,7 +99102,7 @@ in sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" sources."convert-source-map-1.8.0" - sources."create-gatsby-2.5.1" + sources."create-gatsby-2.10.2" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -95723,7 +99111,7 @@ in sources."crypto-random-string-2.0.0" sources."css-select-4.2.1" sources."css-what-5.1.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" (sources."decompress-response-6.0.0" // { @@ -95737,11 +99125,11 @@ in sources."dom-converter-0.2.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -95766,17 +99154,18 @@ in sources."tmp-0.0.33" ]; }) + sources."fastq-1.13.0" sources."figures-3.2.0" sources."file-type-16.5.3" sources."filter-obj-1.1.0" sources."find-up-4.1.0" sources."form-data-3.0.1" sources."fs-exists-cached-1.0.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gatsby-core-utils-3.5.2" - (sources."gatsby-telemetry-3.5.2" // { + sources."gatsby-core-utils-3.10.1" + (sources."gatsby-telemetry-3.10.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -95801,7 +99190,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.8" sources."htmlparser2-6.1.0" @@ -95810,16 +99199,13 @@ in sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" + sources."import-from-4.0.0" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-7.3.3" // { - dependencies = [ - sources."strip-ansi-6.0.1" - ]; - }) + sources."inquirer-7.3.3" sources."is-ci-2.0.0" sources."is-docker-2.2.1" sources."is-extglob-1.0.0" @@ -95837,15 +99223,16 @@ in sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" sources."isexe-2.0.0" - sources."joi-17.5.0" + sources."joi-17.6.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" sources."json-buffer-3.0.1" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."jsonfile-6.1.0" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."kleur-3.0.3" sources."latest-version-5.1.0" + sources."lmdb-2.2.6" sources."locate-path-5.0.0" sources."lock-1.1.0" sources."lodash-4.17.21" @@ -95858,18 +99245,22 @@ in }) sources."meant-1.0.3" sources."merge-stream-2.0.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."ms-2.1.2" + sources."msgpackr-1.5.5" + sources."msgpackr-extract-1.0.16" sources."mute-stream-0.0.8" + sources."nan-2.15.0" sources."nice-try-1.0.5" sources."node-fetch-2.6.7" + sources."node-gyp-build-4.3.0" sources."node-object-hash-2.3.10" - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" sources."nth-check-2.0.1" @@ -95878,6 +99269,7 @@ in sources."onetime-5.1.2" sources."open-7.4.2" sources."opentracing-0.14.7" + sources."ordered-binary-1.2.4" sources."os-tmpdir-1.0.2" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" @@ -95911,7 +99303,7 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."picocolors-1.0.0" sources."prepend-http-2.0.0" sources."pretty-error-2.1.2" @@ -95938,7 +99330,6 @@ in sources."registry-url-5.1.0" (sources."renderkid-2.0.7" // { dependencies = [ - sources."ansi-regex-2.1.1" sources."strip-ansi-3.0.1" ]; }) @@ -95950,6 +99341,7 @@ in sources."responselike-2.0.0" sources."restore-cursor-3.1.0" sources."retry-0.12.0" + sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."rxjs-6.6.7" @@ -95965,38 +99357,34 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sisteransi-1.0.5" sources."source-map-0.7.3" sources."split-on-first-1.1.0" sources."stack-trace-0.0.10" sources."strict-uri-encode-2.0.0" - (sources."string-width-4.2.3" // { - dependencies = [ - sources."strip-ansi-6.0.1" - ]; - }) + sources."string-width-4.2.3" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" ]; }) - (sources."strip-ansi-5.2.0" // { + (sources."strip-ansi-6.0.1" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.1" ]; }) sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" sources."supports-color-5.5.0" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" sources."to-fast-properties-2.0.0" sources."to-readable-stream-1.0.0" - sources."token-types-4.1.1" + sources."token-types-4.2.0" sources."tr46-0.0.3" sources."tslib-1.14.1" sources."type-fest-0.20.2" @@ -96008,6 +99396,7 @@ in sources."util-deprecate-1.0.2" sources."utila-0.4.0" sources."uuid-3.4.0" + sources."weak-lru-cache-1.2.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" @@ -96018,7 +99407,6 @@ in sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -96035,7 +99423,9 @@ in sources."yoga-layout-prebuilt-1.10.0" (sources."yurnalist-2.1.0" // { dependencies = [ + sources."ansi-regex-4.1.1" sources."chalk-2.4.2" + sources."strip-ansi-5.2.0" ]; }) ]; @@ -96052,10 +99442,10 @@ in generator-code = nodeEnv.buildNodePackage { name = "generator-code"; packageName = "generator-code"; - version = "1.6.6"; + version = "1.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.6.tgz"; - sha512 = "cSSf/fBruT8zs12vg5X2rSpmwjnq/u9vpRrUPjxudm8T6a268NEe6JlphRAES3SpO65SZs7XI11UIY8NMJSqZg=="; + url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.9.tgz"; + sha512 = "e+mFv1JS6MyY1Rlez4pUhnRPxxylyDztSbTAJJ57hg4jkuASOZw8LP9b7PQCjrtCsXSSjqFSoqXSkomg3duWIQ=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -96071,14 +99461,14 @@ in ]; }) sources."@octokit/auth-token-2.5.0" - sources."@octokit/core-3.5.1" + sources."@octokit/core-3.6.0" sources."@octokit/endpoint-6.0.12" sources."@octokit/graphql-4.8.0" sources."@octokit/openapi-types-11.2.0" sources."@octokit/plugin-paginate-rest-2.17.0" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.13.0" - sources."@octokit/request-5.6.2" + sources."@octokit/request-5.6.3" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" sources."@octokit/types-6.34.0" @@ -96096,7 +99486,7 @@ in sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."deprecation-2.3.1" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -96133,8 +99523,8 @@ in sources."lru-cache-6.0.0" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."ms-2.1.2" sources."node-fetch-2.6.7" (sources."normalize-package-data-2.5.0" // { @@ -96164,14 +99554,14 @@ in sources."read-pkg-up-7.0.1" sources."rechoir-0.6.2" sources."request-light-0.5.7" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."run-async-2.4.1" sources."sanitize-filename-1.6.3" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shelljs-0.8.5" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sort-keys-4.2.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -96179,7 +99569,7 @@ in sources."spdx-license-ids-3.0.11" (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."strip-ansi-4.0.0" ]; }) @@ -96248,7 +99638,7 @@ in sources."graphql-14.7.0" sources."has-flag-3.0.0" sources."iterall-1.3.0" - sources."minimist-1.2.5" + sources."minimist-1.2.6" sources."node-fetch-2.6.7" sources."supports-color-5.5.0" sources."tr46-0.0.3" @@ -96275,7 +99665,7 @@ in }; dependencies = [ sources."async-2.6.3" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."lodash-4.17.21" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" @@ -96306,8 +99696,9 @@ in sources."asyncmemo-1.0.0" sources."chloride-2.4.1" sources."chloride-test-1.2.4" + sources."clarify-error-1.0.0" sources."commander-2.20.3" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."deep-extend-0.6.0" sources."diff-3.5.0" sources."discontinuous-range-1.0.0" @@ -96326,7 +99717,7 @@ in sources."ini-1.3.8" sources."ip-1.1.5" sources."is-canonical-base64-1.1.1" - sources."is-my-ip-valid-1.0.0" + sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" sources."is-property-1.0.2" sources."is-valid-domain-0.0.20" @@ -96334,30 +99725,30 @@ in sources."jsonpointer-5.0.0" sources."kvgraph-0.1.0" sources."kvset-1.0.0" - sources."libsodium-0.7.9" - sources."libsodium-wrappers-0.7.9" + sources."libsodium-0.7.10" + sources."libsodium-wrappers-0.7.10" sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."moment-2.29.1" sources."moo-0.5.1" sources."ms-2.1.2" sources."multicb-1.2.2" - sources."multiserver-3.7.2" + sources."multiserver-3.8.2" sources."multiserver-address-1.0.1" - sources."multiserver-scopes-1.0.0" - sources."muxrpc-6.5.4" + sources."multiserver-scopes-2.0.0" + sources."muxrpc-6.7.2" sources."nearley-2.20.1" sources."node-gyp-build-4.3.0" sources."node-polyglot-1.0.0" - sources."non-private-ip-1.4.4" + sources."non-private-ip-2.2.0" sources."os-homedir-1.0.2" sources."packet-stream-2.0.6" - sources."packet-stream-codec-1.1.3" + sources."packet-stream-codec-1.2.0" sources."pako-1.0.11" sources."private-box-0.3.1" sources."progress-1.1.8" @@ -96376,11 +99767,7 @@ in sources."pull-git-packidx-parser-1.0.0" sources."pull-git-remote-helper-2.0.0" sources."pull-git-repo-1.2.1" - (sources."pull-goodbye-0.0.2" // { - dependencies = [ - sources."pull-stream-3.5.0" - ]; - }) + sources."pull-goodbye-0.0.3" sources."pull-handshake-1.1.4" sources."pull-hash-1.0.0" sources."pull-hyperscript-0.2.2" @@ -96413,12 +99800,12 @@ in sources."remove-markdown-0.1.0" sources."ret-0.1.15" sources."safe-buffer-5.2.1" - sources."secret-handshake-1.1.20" + sources."secret-handshake-1.1.21" sources."semver-5.7.1" sources."separator-escape-0.0.1" sources."sha.js-2.4.5" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -96440,7 +99827,11 @@ in }) ]; }) - sources."ssb-config-2.3.9" + (sources."ssb-config-2.3.9" // { + dependencies = [ + sources."non-private-ip-1.4.4" + ]; + }) sources."ssb-git-0.5.0" sources."ssb-git-repo-2.8.3" sources."ssb-issues-1.0.0" @@ -96469,7 +99860,7 @@ in sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" sources."typedarray-to-buffer-4.0.0" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; @@ -96503,21 +99894,21 @@ in "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; - version = "35.1.0"; + version = "35.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-35.1.0.tgz"; - sha512 = "hQ+sXT//GPp5ZwqujZ6p5O7MmvO4sgF8D5mhnRCBmp5oPGyJ3+1r9pfFnWI+BIFOpO9pi0+L1ZljNJS3175SfA=="; + url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-35.6.0.tgz"; + sha512 = "MWt3cRIRbKGZj+ebwPp3W/hdIcyfKYfzt6bz/YSOcR4Z5swpMmZmGWoWiM9AERdZJYRxrImb9Id/lyyu8gtIiw=="; }; dependencies = [ - sources."@gitbeaker/core-35.1.0" - sources."@gitbeaker/node-35.1.0" - sources."@gitbeaker/requester-utils-35.1.0" - sources."@sindresorhus/is-4.3.0" + sources."@gitbeaker/core-35.6.0" + sources."@gitbeaker/node-35.6.0" + sources."@gitbeaker/requester-utils-35.6.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.3" - sources."@types/node-17.0.10" + sources."@types/keyv-3.1.4" + sources."@types/node-17.0.23" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -96555,36 +99946,40 @@ in sources."got-11.8.3" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" sources."ieee754-1.2.1" sources."inherits-2.0.4" sources."is-interactive-2.0.0" - sources."is-unicode-supported-1.1.0" + sources."is-unicode-supported-1.2.0" sources."json-buffer-3.0.1" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."li-1.3.0" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."lowercase-keys-2.0.0" sources."mime-3.0.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."normalize-url-6.1.0" sources."object-inspect-1.12.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."ora-6.0.1" + (sources."ora-6.1.0" // { + dependencies = [ + sources."chalk-5.0.1" + ]; + }) sources."p-cancelable-2.1.1" sources."pump-3.0.0" sources."qs-6.10.3" - sources."query-string-7.1.0" + sources."query-string-7.1.1" sources."quick-lru-5.1.1" sources."readable-stream-3.6.0" sources."resolve-alpn-1.2.1" @@ -96592,7 +99987,7 @@ in sources."restore-cursor-4.0.0" sources."safe-buffer-5.2.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."split-on-first-1.1.0" sources."strict-uri-encode-2.0.0" sources."string_decoder-1.3.0" @@ -96617,10 +100012,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "4.7.0"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.7.0.tgz"; - sha512 = "8PVebGkXGXlNE2T7You4gzX4SFiULZja38LInfmnJQFfMgmeOT8br/WpirCkqhBVA28tTMYflQj5QGoeGLfTUQ=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.11.0.tgz"; + sha512 = "tRX7PJ+qYGsfQcfaXT5rGgXE0KOXz7sR6rS8oScFPguXTSUtBl3cW74jNh92nGVHhbCCVBFq9vqVBgt5aRo9RQ=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -96640,8 +100035,10 @@ in sources."@tootallnate/once-1.1.2" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" + sources."acorn-8.7.0" + sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" - sources."ajv-8.9.0" + sources."ajv-8.11.0" sources."ajv-formats-2.1.1" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" @@ -96659,7 +100056,7 @@ in ]; }) sources."buffer-5.7.1" - sources."bytes-3.1.1" + sources."bytes-3.1.2" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -96668,7 +100065,7 @@ in }) sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."chalk-4.1.2" + sources."chalk-4.1.0" sources."chardet-0.7.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -96690,7 +100087,7 @@ in sources."crypto-random-string-2.0.0" sources."data-uri-to-buffer-3.0.1" sources."debounce-fn-4.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -96702,8 +100099,8 @@ in sources."deep-is-0.1.4" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" - sources."degenerator-3.0.1" - sources."depd-1.1.2" + sources."degenerator-3.0.2" + sources."depd-2.0.0" sources."dot-prop-6.0.1" sources."duplexer3-0.1.4" sources."emoji-regex-8.0.0" @@ -96716,7 +100113,7 @@ in sources."esprima-4.0.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" - sources."execa-5.1.1" + sources."execa-5.0.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" @@ -96731,7 +100128,7 @@ in ]; }) sources."function-bind-1.1.1" - sources."fuse.js-6.5.3" + sources."fuse.js-6.4.1" sources."get-stream-6.0.1" sources."get-uri-3.0.2" sources."global-dirs-3.0.0" @@ -96747,7 +100144,7 @@ in sources."has-yarn-2.1.0" sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."human-signals-2.1.0" @@ -96758,13 +100155,12 @@ in sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.2.0" - (sources."inquirer-autocomplete-prompt-1.4.0" // { + (sources."inquirer-8.2.1" // { dependencies = [ - sources."rxjs-6.6.7" - sources."tslib-1.14.1" + sources."chalk-4.1.2" ]; }) + sources."inquirer-autocomplete-prompt-2.0.0" sources."ip-1.1.5" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" @@ -96817,12 +100213,12 @@ in sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" - sources."minimist-1.2.5" + sources."minimist-1.2.6" sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."netmask-2.0.2" - sources."node-fetch-2.6.7" + sources."node-fetch-2.6.0" sources."normalize-package-data-3.0.3" sources."normalize-url-4.5.1" sources."npm-run-path-4.0.1" @@ -96850,6 +100246,7 @@ in sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.7" + sources."picocolors-1.0.0" sources."pkg-up-3.1.0" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" @@ -96864,7 +100261,7 @@ in sources."punycode-2.1.1" sources."pupa-2.1.1" sources."quick-lru-4.0.1" - sources."raw-body-2.4.2" + sources."raw-body-2.5.1" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" @@ -96891,11 +100288,11 @@ in sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-7.5.2" + sources."rxjs-7.5.5" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" @@ -96907,16 +100304,16 @@ in sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -96929,7 +100326,6 @@ in sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.1" - sources."tr46-0.0.3" sources."trim-newlines-3.0.1" sources."tslib-2.3.1" sources."type-check-0.3.2" @@ -96943,10 +100339,8 @@ in sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."vm2-3.9.5" + sources."vm2-3.9.9" sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."widest-line-3.1.0" sources."word-wrap-1.2.3" @@ -96983,7 +100377,7 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" @@ -97081,9 +100475,9 @@ in sources."pify-3.0.0" ]; }) - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.1.3" sources."node-fetch-2.6.7" sources."object-assign-4.1.1" @@ -97101,7 +100495,7 @@ in sources."kleur-3.0.3" ]; }) - sources."query-string-7.1.0" + sources."query-string-7.1.1" (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -97143,8 +100537,8 @@ in sources."wrappy-1.0.2" sources."xtend-4.0.2" sources."y18n-5.0.8" - sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-17.4.0" + sources."yargs-parser-21.0.1" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -97210,9 +100604,9 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.6.5" // { + (sources."@graphql-tools/import-6.6.9" // { dependencies = [ - sources."@graphql-tools/utils-8.6.1" + sources."@graphql-tools/utils-8.6.5" sources."tslib-2.3.1" ]; }) @@ -97237,10 +100631,10 @@ in sources."tslib-2.3.1" ]; }) - (sources."@graphql-tools/schema-8.3.1" // { + (sources."@graphql-tools/schema-8.3.5" // { dependencies = [ - sources."@graphql-tools/merge-8.2.1" - sources."@graphql-tools/utils-8.6.1" + sources."@graphql-tools/merge-8.2.6" + sources."@graphql-tools/utils-8.6.5" sources."tslib-2.3.1" ]; }) @@ -97271,7 +100665,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -97282,7 +100676,7 @@ in sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."ansi-styles-4.3.0" sources."argparse-1.0.10" sources."array-union-2.1.0" @@ -97351,7 +100745,7 @@ in sources."cross-spawn-6.0.5" sources."dashdash-1.14.1" sources."dataloader-2.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decompress-response-3.3.0" sources."deep-equal-2.0.5" sources."deep-extend-0.6.0" @@ -97419,6 +100813,7 @@ in (sources."graphql-config-3.0.3" // { dependencies = [ sources."cosmiconfig-6.0.0" + sources."minimatch-3.0.4" ]; }) sources."graphql-subscriptions-1.2.1" @@ -97429,7 +100824,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" @@ -97537,13 +100932,13 @@ in }) sources."merge2-1.4.1" sources."meros-1.1.4" - sources."micromatch-4.0.4" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."micromatch-4.0.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minipass-3.1.6" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" @@ -97566,7 +100961,7 @@ in sources."oas-linter-3.2.2" (sources."oas-resolver-2.5.6" // { dependencies = [ - sources."yargs-17.3.1" + sources."yargs-17.4.0" ]; }) sources."oas-schema-walker-1.1.5" @@ -97658,7 +101053,7 @@ in sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-git-2.21.0" sources."slash-3.0.0" sources."sprintf-js-1.0.3" @@ -97679,7 +101074,7 @@ in sources."supports-color-7.2.0" (sources."swagger2openapi-7.0.8" // { dependencies = [ - sources."yargs-17.3.1" + sources."yargs-17.4.0" ]; }) sources."symbol-observable-1.2.0" @@ -97724,7 +101119,7 @@ in sources."yargs-parser-20.2.9" ]; }) - sources."yargs-parser-21.0.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -97760,26 +101155,26 @@ in }) sources."@cronvel/get-pixels-3.4.0" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" - sources."@graphql-tools/batch-execute-8.3.1" - sources."@graphql-tools/delegate-8.4.3" - sources."@graphql-tools/graphql-file-loader-7.3.3" - sources."@graphql-tools/import-6.6.5" - sources."@graphql-tools/json-file-loader-7.3.3" - sources."@graphql-tools/load-7.5.1" - sources."@graphql-tools/merge-8.2.1" - sources."@graphql-tools/schema-8.3.1" - (sources."@graphql-tools/url-loader-7.7.0" // { + sources."@graphql-tools/batch-execute-8.4.1" + sources."@graphql-tools/delegate-8.7.0" + sources."@graphql-tools/graphql-file-loader-7.3.7" + sources."@graphql-tools/import-6.6.9" + sources."@graphql-tools/json-file-loader-7.3.7" + sources."@graphql-tools/load-7.5.5" + sources."@graphql-tools/merge-8.2.6" + sources."@graphql-tools/schema-8.3.5" + (sources."@graphql-tools/url-loader-7.9.7" // { dependencies = [ (sources."subscriptions-transport-ws-0.11.0" // { dependencies = [ - sources."ws-7.5.6" + sources."ws-7.5.7" ]; }) - sources."ws-8.4.2" + sources."ws-8.5.0" ]; }) - sources."@graphql-tools/utils-8.6.1" - sources."@graphql-tools/wrap-8.3.3" + sources."@graphql-tools/utils-8.6.5" + sources."@graphql-tools/wrap-8.4.9" sources."@iarna/toml-2.2.5" sources."@n1ru4l/graphql-live-query-0.9.0" sources."@nodelib/fs.scandir-2.1.5" @@ -97789,10 +101184,14 @@ in sources."@oclif/config-1.17.0" sources."@oclif/errors-1.3.4" sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.6" + (sources."@oclif/parser-3.8.7" // { + dependencies = [ + sources."@oclif/errors-1.3.5" + ]; + }) (sources."@oclif/plugin-help-3.2.1" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" @@ -97811,12 +101210,12 @@ in }) sources."@oclif/screen-1.0.4" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/parse-json-4.0.0" - sources."@types/websocket-1.0.4" - sources."@types/ws-8.2.2" + sources."@types/websocket-1.0.5" + sources."@types/ws-8.5.3" sources."abort-controller-3.0.0" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."ansi-escapes-3.2.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -97842,11 +101241,11 @@ in sources."callsites-3.1.0" sources."cardinal-2.1.1" sources."chalk-4.1.2" - sources."chroma-js-2.1.2" + sources."chroma-js-2.4.2" sources."clean-stack-3.0.1" (sources."cli-ux-4.9.3" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."clean-stack-2.2.0" @@ -97873,24 +101272,15 @@ in sources."cosmiconfig-7.0.1" sources."cosmiconfig-toml-loader-1.0.0" sources."create-require-1.1.1" - (sources."cross-env-6.0.3" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."cross-undici-fetch-0.1.16" + sources."cross-undici-fetch-0.1.27" sources."cwise-compiler-1.1.3" sources."dataloader-2.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-4.0.2" @@ -97923,7 +101313,7 @@ in sources."ms-2.0.0" ]; }) - sources."form-data-encoder-1.7.1" + sources."form-data-encoder-1.7.2" (sources."formdata-node-4.3.2" // { dependencies = [ sources."web-streams-polyfill-4.0.0-beta.1" @@ -97937,6 +101327,7 @@ in sources."graceful-fs-4.2.9" sources."graphql-15.4.0" sources."graphql-config-4.1.0" + sources."graphql-executor-0.0.22" (sources."graphql-language-service-interface-2.10.2" // { dependencies = [ sources."graphql-language-service-utils-2.7.1" @@ -97945,8 +101336,8 @@ in sources."graphql-language-service-parser-1.10.4" sources."graphql-language-service-types-1.8.7" sources."graphql-language-service-utils-2.5.1" - sources."graphql-sse-1.0.6" - sources."graphql-ws-5.5.5" + sources."graphql-sse-1.1.0" + sources."graphql-ws-5.6.4" sources."has-flag-4.0.0" sources."http-errors-1.6.3" sources."hyperlinker-1.0.0" @@ -97990,17 +101381,17 @@ in sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" - sources."meros-1.1.4" + sources."meros-1.2.0" sources."methods-1.1.2" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."mime-1.4.1" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."minimatch-3.0.4" sources."ms-2.1.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."nextgen-events-1.5.2" sources."nice-try-1.0.5" sources."node-bitmap-0.0.1" @@ -98085,13 +101476,12 @@ in sources."ts-node-9.1.1" sources."tslib-2.3.1" sources."type-is-1.6.18" - sources."undici-4.12.2" + sources."undici-4.16.0" sources."uniq-1.0.1" sources."universalify-0.1.2" sources."unixify-1.0.0" sources."unpipe-1.0.0" sources."utils-merge-1.0.1" - sources."valid-url-1.0.9" sources."value-or-promise-1.0.11" sources."vary-1.1.2" sources."vscode-languageserver-types-3.16.0" @@ -98163,7 +101553,7 @@ in sources."liftup-3.0.1" sources."make-iterator-1.0.1" sources."map-cache-0.2.2" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."nopt-4.0.3" sources."object.defaults-1.1.0" sources."object.map-1.0.1" @@ -98178,7 +101568,7 @@ in sources."path-root-regex-0.1.2" sources."picomatch-2.3.1" sources."rechoir-0.7.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-dir-1.0.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."to-regex-range-5.0.1" @@ -98217,19 +101607,19 @@ in meshcommander = nodeEnv.buildNodePackage { name = "meshcommander"; packageName = "meshcommander"; - version = "0.9.2-b"; + version = "0.9.5-a"; src = fetchurl { - url = "https://registry.npmjs.org/meshcommander/-/meshcommander-0.9.2-b.tgz"; - sha512 = "aTPHEnqnIDzsCcL7O7FPnMmKN0Z9Sy5rl58atknikYbLISiu3LHESWUFvFGHHodSs0NVCGM/m5OR5BIVWYxnMg=="; + url = "https://registry.npmjs.org/meshcommander/-/meshcommander-0.9.5-a.tgz"; + sha512 = "RneCQXwu1Nuqu69+EPHIpDkrOcMcWaacM4T8Jibk0MkcquxF2iILX5bB6joCuNHHVr1I+9fPlYQoCjN1K22deg=="; }; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."array-flatten-1.1.1" - sources."body-parser-1.19.1" - sources."bytes-3.1.1" + sources."body-parser-1.19.2" + sources."bytes-3.1.2" sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."debug-2.6.9" sources."depd-1.1.2" @@ -98238,7 +101628,7 @@ in sources."encodeurl-1.0.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."express-4.17.2" + sources."express-4.17.3" sources."express-ws-2.0.0" sources."finalhandler-1.1.2" sources."forwarded-0.2.0" @@ -98251,19 +101641,19 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimist-1.2.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimist-1.2.6" sources."ms-2.0.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."on-finished-2.3.0" sources."options-0.0.6" sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."proxy-addr-2.0.7" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" (sources."send-0.17.2" // { @@ -98346,21 +101736,19 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ansi-escapes-4.3.2" + sources."ansi-escapes-5.0.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."ansi-term-0.0.2" sources."ansicolors-0.3.2" sources."blessed-0.1.81" - sources."blessed-contrib-4.10.1" + sources."blessed-contrib-4.11.0" sources."bresenham-0.0.3" sources."buffers-0.1.1" sources."cardinal-2.1.1" sources."chalk-1.1.3" sources."charm-0.1.2" sources."cli-table3-0.6.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."colors-1.4.0" sources."core-util-is-1.0.3" sources."drawille-blessed-contrib-1.0.0" @@ -98382,12 +101770,10 @@ in sources."isarray-0.0.1" sources."lodash-4.17.21" sources."map-canvas-0.1.5" - sources."marked-2.1.3" - (sources."marked-terminal-4.2.0" // { + sources."marked-4.0.12" + (sources."marked-terminal-5.1.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."supports-color-7.2.0" + sources."chalk-5.0.1" ]; }) sources."memory-streams-0.1.3" @@ -98415,9 +101801,9 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.10.7" + sources."systeminformation-5.11.9" sources."term-canvas-0.0.5" - sources."type-fest-0.21.3" + sources."type-fest-1.4.0" sources."wordwrap-0.0.3" sources."x256-0.0.2" sources."xml2js-0.4.23" @@ -98556,7 +101942,7 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.59" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" @@ -98581,7 +101967,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.5.0" + sources."type-2.6.0" ]; }) sources."extend-3.0.2" @@ -98634,7 +102020,7 @@ in sources."gulp-cli-2.3.0" sources."gulplog-1.0.0" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -98694,7 +102080,7 @@ in ]; }) sources."micromatch-3.1.10" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -98704,7 +102090,7 @@ in sources."mute-stdout-1.0.1" sources."nan-2.15.0" sources."nanomatch-1.2.13" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."now-and-later-2.0.1" @@ -98767,7 +102153,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -98976,7 +102362,7 @@ in ]; }) sources."error-ex-1.3.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.59" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" (sources."expand-brackets-2.1.4" // { @@ -98992,7 +102378,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.5.0" + sources."type-2.6.0" ]; }) sources."extend-3.0.2" @@ -99035,7 +102421,7 @@ in sources."graceful-fs-4.2.9" sources."gulplog-1.0.0" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -99123,7 +102509,7 @@ in sources."kind-of-6.0.3" ]; }) - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" (sources."object-copy-0.1.0" // { @@ -99173,7 +102559,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -99313,7 +102699,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.3" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -99329,14 +102715,14 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.0.tgz"; - sha512 = "+bsDBss95q0SdgVzPJ6Kqu8kSHu91/9rEFs8mIrobGrdV30EtNLyvqTL4xwl3q8GkzRn7lJxNNjwSGwiAoZkiw=="; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.2.tgz"; + sha512 = "3rUS4ROXjyRidMiThTXhwtAotmGvOOof3uUk1X0YWjJF63qOP0sorogfgvo+XFcp5Q6IWhiFcZqd3giCrKHg+g=="; }; dependencies = [ sources."ansi-styles-4.3.0" - sources."async-3.2.2" + sources."async-3.2.3" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chalk-4.1.2" @@ -99354,7 +102740,7 @@ in sources."is-dotfile-1.0.3" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."node-fetch-2.6.7" sources."once-1.4.0" sources."parse-glob-3.0.4" @@ -99396,20 +102782,20 @@ in sources."corser-2.0.1" sources."debug-3.2.7" sources."eventemitter3-4.0.7" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."he-1.2.0" sources."html-encoding-sniffer-3.0.0" sources."http-proxy-1.18.1" sources."iconv-lite-0.6.3" sources."lodash-4.17.21" sources."mime-1.6.0" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.1.3" sources."object-inspect-1.12.0" sources."opener-1.5.2" @@ -99453,7 +102839,7 @@ in sources."bfile-0.2.2" sources."bfilter-1.0.5" sources."bheep-0.1.5" - sources."binet-0.3.6" + sources."binet-0.3.7" sources."blgr-0.2.0" sources."blru-0.1.6" sources."blst-0.1.5" @@ -99572,7 +102958,7 @@ in sources."inherits-2.0.4" sources."latest-0.2.0" sources."lstream-0.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."mired-0.0.0" sources."npm-2.15.12" sources."once-1.4.0" @@ -99606,9 +102992,10 @@ in sha512 = "VavhoS9dr44WPPdtuBgHAge1uM/elPo8fAI6fMJ4Bs1NsOCgMOFg4g7FBo7ODgzmAaa2CjAFQGu1hIaY5UIqPg=="; }; dependencies = [ + sources."@colors/colors-1.5.0" sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.9" + sources."@types/node-14.18.12" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -99617,7 +103004,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1062.0" + sources."aws-sdk-2.1101.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -99638,7 +103025,7 @@ in sources."css-what-2.1.3" sources."cycle-1.0.3" sources."dashdash-1.14.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."deep-is-0.1.4" sources."delayed-stream-1.0.0" sources."dom-serializer-0.1.1" @@ -99720,10 +103107,10 @@ in sources."lodash.some-4.6.0" sources."lodash.uniq-4.5.0" sources."marked-2.1.3" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."moment-2.29.1" sources."moment-timezone-0.5.34" sources."ms-2.1.2" @@ -99734,7 +103121,7 @@ in sources."optionator-0.8.3" sources."performance-now-2.1.0" sources."prelude-ls-1.1.2" - (sources."prompt-1.2.1" // { + (sources."prompt-1.2.2" // { dependencies = [ sources."async-0.9.2" ]; @@ -99821,7 +103208,7 @@ in sources."jmp-2.0.0" sources."jp-kernel-2.0.0" sources."nan-2.14.2" - sources."nel-1.2.0" + sources."nel-1.3.0" sources."node-gyp-build-4.3.0" sources."uuid-3.4.0" sources."zeromq-5.2.8" @@ -99967,10 +103354,10 @@ in sources."longest-1.0.1" sources."lowercase-keys-1.0.1" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."nested-error-stacks-1.0.2" sources."nth-check-1.0.2" @@ -100081,11 +103468,11 @@ in sources."inherits-2.0.4" sources."isarray-0.0.1" sources."isstream-0.1.2" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minimist-0.0.10" - (sources."mkdirp-0.5.5" // { + (sources."mkdirp-0.5.6" // { dependencies = [ - sources."minimist-1.2.5" + sources."minimist-1.2.6" ]; }) sources."moment-2.29.1" @@ -100152,14 +103539,14 @@ in insect = nodeEnv.buildNodePackage { name = "insect"; packageName = "insect"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/insect/-/insect-5.6.0.tgz"; - sha512 = "56gjTrj9SMfPkbGANfqtGYeY3G5KmCkpgEYlKkmiDNG+SpQtLT9/53gt/9CbYd5iT9GgP+IvGXwDWplgCz3NnA=="; + url = "https://registry.npmjs.org/insect/-/insect-5.7.0.tgz"; + sha512 = "rm3APOoPrf7J66Bo7bHOn0c/k/STonQ+KSdyLid9NQvSM+LTpeL9X8RnOZ3NRlz01/MgXqQ0CGAGh60kSB9Xlw=="; }; dependencies = [ sources."@jcubic/lily-0.3.0" - sources."@types/jquery-3.5.13" + sources."@types/jquery-3.5.14" sources."@types/sizzle-2.3.3" sources."ansidec-0.3.4" sources."arch-2.2.0" @@ -100188,31 +103575,30 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.0" - sources."jquery.terminal-2.31.1" + sources."jquery.terminal-2.32.1" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."nice-try-1.0.5" sources."npm-run-path-2.0.2" sources."once-1.4.0" - sources."os-homedir-1.0.2" sources."p-finally-1.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."prismjs-1.26.0" + sources."prismjs-1.27.0" sources."pump-3.0.0" sources."rimraf-2.7.1" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."strip-eof-1.0.0" sources."wcwidth-1.0.1" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."xdg-basedir-2.0.0" + sources."xdg-basedir-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -100227,10 +103613,10 @@ in intelephense = nodeEnv.buildNodePackage { name = "intelephense"; packageName = "intelephense"; - version = "1.8.0"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/intelephense/-/intelephense-1.8.0.tgz"; - sha512 = "DigAEcRfvGX1f/FExvvHTuImCu9EC7XtvAFDISsXvMTFTnMlAnNKcQvcVcZDWREa9NRKXSH5HD8a7lV+a25eBg=="; + url = "https://registry.npmjs.org/intelephense/-/intelephense-1.8.2.tgz"; + sha512 = "u7n8UdvFlZcE8LpGDPpc2miBD0zOd9fBMKajeF04KkVCOX7s6Ua+qK9r+zvQBjQT53O7p9XGSEVAUvB4q98b5w=="; }; dependencies = [ sources."@bmewburn/js-beautify-1.13.0" @@ -100257,6 +103643,7 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" + sources."@selderee/plugin-htmlparser2-0.6.0" sources."@types/long-4.0.1" sources."@types/node-13.13.52" sources."abbrev-1.1.1" @@ -100299,18 +103686,11 @@ in ]; }) sources."diagnostic-channel-publishers-0.4.4" - (sources."dom-serializer-1.3.2" // { - dependencies = [ - sources."domhandler-4.3.0" - ]; - }) + sources."discontinuous-range-1.0.0" + sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-3.3.0" - (sources."domutils-2.8.0" // { - dependencies = [ - sources."domhandler-4.3.0" - ]; - }) + sources."domhandler-4.3.1" + sources."domutils-2.8.0" sources."ecc-jsbn-0.1.2" (sources."editorconfig-0.15.3" // { dependencies = [ @@ -100338,8 +103718,8 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."he-1.2.0" - sources."html-to-text-6.0.0" - sources."htmlparser2-4.1.0" + sources."html-to-text-8.1.0" + sources."htmlparser2-6.1.0" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -100355,7 +103735,6 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" sources."jsprim-1.4.2" - sources."lodash-4.17.21" sources."long-4.0.0" (sources."lru-cache-6.0.0" // { dependencies = [ @@ -100363,16 +103742,19 @@ in ]; }) sources."merge2-1.4.1" - sources."micromatch-4.0.4" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."micromatch-4.0.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mkdirp-1.0.4" + sources."moo-0.5.1" + sources."nearley-2.20.1" sources."nopt-5.0.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."parse5-5.1.1" + sources."parseley-0.7.0" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."picomatch-2.3.1" @@ -100383,11 +103765,15 @@ in sources."punycode-2.1.1" sources."qs-6.5.3" sources."queue-microtask-1.2.3" + sources."railroad-diagrams-1.0.0" + sources."randexp-0.4.6" sources."request-2.88.2" + sources."ret-0.1.15" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" + sources."selderee-0.6.0" sources."semver-7.3.5" sources."shimmer-1.2.1" sources."sigmund-1.0.1" @@ -100397,17 +103783,17 @@ in sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."typescript-4.5.5" + sources."typescript-4.6.3" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" - (sources."vscode-css-languageservice-5.1.9" // { + (sources."vscode-css-languageservice-5.3.0" // { dependencies = [ sources."vscode-languageserver-types-3.16.0" ]; }) - (sources."vscode-html-languageservice-4.2.1" // { + (sources."vscode-html-languageservice-4.2.4" // { dependencies = [ sources."vscode-languageserver-types-3.16.0" ]; @@ -100424,7 +103810,7 @@ in sources."vscode-languageserver-types-3.16.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.17.0-next.1" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.3" @@ -100464,7 +103850,7 @@ in sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."ansi-styles-3.2.1" (sources."ast-types-0.13.4" // { dependencies = [ @@ -100475,7 +103861,7 @@ in sources."asynckit-0.4.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."call-bind-1.0.2" (sources."chalk-3.0.0" // { dependencies = [ @@ -100497,11 +103883,11 @@ in sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."data-uri-to-buffer-3.0.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."deep-is-0.1.4" sources."degenerator-2.2.0" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."diff-4.0.2" (sources."duplexer2-0.1.4" // { dependencies = [ @@ -100552,8 +103938,8 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" - sources."http-errors-1.8.1" + sources."has-symbols-1.0.3" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -100612,14 +103998,14 @@ in sources."macos-release-2.5.0" sources."methods-1.1.2" sources."mime-2.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."netmask-1.0.6" @@ -100651,7 +104037,7 @@ in sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."qs-6.10.3" - sources."raw-body-2.4.2" + sources."raw-body-2.5.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" sources."rimraf-3.0.2" @@ -100666,7 +104052,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."slice-ansi-3.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -100676,12 +104062,12 @@ in ]; }) sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."split2-3.2.2" sources."ssh-config-1.1.6" - sources."statuses-1.5.0" + sources."statuses-2.0.1" (sources."stream-combiner2-1.1.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -100736,7 +104122,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -100750,91 +104136,72 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v11.0.1.tar.gz" = nodeEnv.buildNodePackage { + "iosevka-https://github.com/be5invis/Iosevka/archive/v14.0.1.tar.gz" = nodeEnv.buildNodePackage { name = "iosevka"; packageName = "iosevka"; - version = "11.0.1"; + version = "14.0.1"; src = fetchurl { - name = "iosevka-11.0.1.tar.gz"; - url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/v11.0.1"; - sha256 = "5f19c33cf90a4d4b0e6b14aa5866a81fa724042e934811b618d5f4e74e310043"; + name = "iosevka-14.0.1.tar.gz"; + url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v14.0.1"; + sha256 = "f17c312d63df74a34f3a72b52f4ceff39e708a6ba674e5605bcadbf7e1e2c2f7"; }; dependencies = [ sources."@iarna/toml-2.2.5" - sources."@msgpack/msgpack-2.7.1" - sources."@ot-builder/bin-composite-types-1.3.3" - sources."@ot-builder/bin-util-1.3.3" - (sources."@ot-builder/cli-help-shower-1.3.3" // { - 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."@ot-builder/cli-proc-1.3.3" - sources."@ot-builder/cli-shared-1.3.3" - sources."@ot-builder/common-impl-1.3.3" - sources."@ot-builder/errors-1.3.3" - sources."@ot-builder/io-bin-cff-1.3.3" - sources."@ot-builder/io-bin-encoding-1.3.3" - sources."@ot-builder/io-bin-ext-private-1.3.3" - sources."@ot-builder/io-bin-font-1.3.3" - sources."@ot-builder/io-bin-glyph-store-1.3.3" - sources."@ot-builder/io-bin-layout-1.3.3" - sources."@ot-builder/io-bin-metadata-1.3.3" - sources."@ot-builder/io-bin-metric-1.3.3" - sources."@ot-builder/io-bin-name-1.3.3" - sources."@ot-builder/io-bin-sfnt-1.3.3" - sources."@ot-builder/io-bin-ttf-1.3.3" - sources."@ot-builder/io-bin-vtt-private-1.3.3" - sources."@ot-builder/ot-1.3.3" - sources."@ot-builder/ot-encoding-1.3.3" - sources."@ot-builder/ot-ext-private-1.3.3" - sources."@ot-builder/ot-glyphs-1.3.3" - sources."@ot-builder/ot-layout-1.3.3" - sources."@ot-builder/ot-metadata-1.3.3" - sources."@ot-builder/ot-name-1.3.3" - sources."@ot-builder/ot-sfnt-1.3.3" - sources."@ot-builder/ot-standard-glyph-namer-1.3.3" - sources."@ot-builder/ot-vtt-private-1.3.3" - sources."@ot-builder/prelude-1.3.3" - sources."@ot-builder/primitive-1.3.3" - sources."@ot-builder/rectify-1.3.3" - sources."@ot-builder/stat-glyphs-1.3.3" - sources."@ot-builder/trace-1.3.3" - sources."@ot-builder/var-store-1.3.3" - sources."@ot-builder/variance-1.3.3" - sources."@unicode/unicode-13.0.0-1.2.1" + sources."@msgpack/msgpack-2.7.2" + sources."@ot-builder/bin-composite-types-1.5.0" + sources."@ot-builder/bin-util-1.5.0" + sources."@ot-builder/cli-help-shower-1.5.0" + sources."@ot-builder/cli-proc-1.5.0" + sources."@ot-builder/cli-shared-1.5.0" + sources."@ot-builder/common-impl-1.5.0" + sources."@ot-builder/errors-1.5.0" + sources."@ot-builder/io-bin-cff-1.5.0" + sources."@ot-builder/io-bin-encoding-1.5.0" + sources."@ot-builder/io-bin-ext-private-1.5.0" + sources."@ot-builder/io-bin-font-1.5.0" + sources."@ot-builder/io-bin-glyph-store-1.5.0" + sources."@ot-builder/io-bin-layout-1.5.0" + sources."@ot-builder/io-bin-metadata-1.5.0" + sources."@ot-builder/io-bin-metric-1.5.0" + sources."@ot-builder/io-bin-name-1.5.0" + sources."@ot-builder/io-bin-sfnt-1.5.0" + sources."@ot-builder/io-bin-ttf-1.5.0" + sources."@ot-builder/io-bin-vtt-private-1.5.0" + sources."@ot-builder/ot-1.5.0" + sources."@ot-builder/ot-encoding-1.5.0" + sources."@ot-builder/ot-ext-private-1.5.0" + sources."@ot-builder/ot-glyphs-1.5.0" + sources."@ot-builder/ot-layout-1.5.0" + sources."@ot-builder/ot-metadata-1.5.0" + sources."@ot-builder/ot-name-1.5.0" + sources."@ot-builder/ot-sfnt-1.5.0" + sources."@ot-builder/ot-standard-glyph-namer-1.5.0" + sources."@ot-builder/ot-vtt-private-1.5.0" + sources."@ot-builder/prelude-1.5.0" + sources."@ot-builder/primitive-1.5.0" + sources."@ot-builder/rectify-1.5.0" + sources."@ot-builder/stat-glyphs-1.5.0" + sources."@ot-builder/trace-1.5.0" + sources."@ot-builder/var-store-1.5.0" + sources."@ot-builder/variance-1.5.0" + sources."@unicode/unicode-14.0.0-1.2.1" sources."@xmldom/xmldom-0.7.5" sources."aglfn-1.0.2" sources."amdefine-1.0.1" sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."argparse-2.0.1" - sources."async-0.9.2" - sources."atob-2.1.2" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" sources."chainsaw-0.0.9" - sources."chalk-2.4.2" + sources."chalk-4.1.2" sources."cldr-7.1.1" sources."cli-cursor-3.1.0" sources."clipper-lib-6.4.2" sources."cliui-7.0.4" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."concat-map-0.0.1" - sources."css-3.0.0" - sources."debug-3.1.0" - sources."decode-uri-component-0.2.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."deep-is-0.1.4" - sources."ejs-3.1.6" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" sources."escodegen-2.0.0" (sources."escope-1.0.3" // { dependencies = [ @@ -100863,37 +104230,26 @@ in sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" - sources."filelist-1.0.2" - sources."fs-extra-10.0.0" - sources."fs.realpath-1.0.0" + sources."fs-extra-10.0.1" sources."get-caller-file-2.0.5" - sources."glob-7.2.0" sources."graceful-fs-4.2.9" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."hashish-0.0.4" sources."iconv-lite-0.6.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" - sources."jake-10.8.2" sources."jsonfile-6.1.0" sources."levn-0.3.0" sources."lru-cache-2.5.0" sources."memoizeasync-1.1.0" sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" - sources."mkdirp-1.0.4" - sources."ms-2.0.0" - sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.3.3" - sources."otb-ttc-bundle-1.3.3" + sources."ot-builder-1.5.0" + sources."otb-ttc-bundle-1.5.0" sources."passerror-1.1.1" - sources."patel-0.35.1" - sources."path-is-absolute-1.0.1" - sources."patrisika-0.23.0" + sources."patel-0.37.1" + sources."patrisika-0.24.0" sources."patrisika-scopes-0.12.0" sources."pegjs-0.10.0" sources."prelude-ls-1.1.2" @@ -100901,7 +104257,6 @@ in sources."restore-cursor-3.1.0" sources."resumer-0.0.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" sources."semaphore-async-await-1.5.1" (sources."semver-7.3.5" // { dependencies = [ @@ -100909,19 +104264,12 @@ in ]; }) sources."seq-0.3.5" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" - sources."source-map-resolve-0.6.0" sources."spiro-3.0.0" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" - (sources."stylus-0.55.0" // { - dependencies = [ - sources."semver-6.3.0" - sources."source-map-0.7.3" - ]; - }) - sources."supports-color-5.5.0" + sources."supports-color-7.2.0" sources."through-2.3.8" sources."toposort-2.0.2" sources."traverse-0.3.9" @@ -100932,28 +104280,15 @@ in sources."universalify-2.0.0" (sources."verda-1.5.0" // { 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."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-17.4.0" + sources."yargs-parser-21.0.1" ]; }) sources."wawoff2-2.0.1" sources."which-2.0.2" sources."word-wrap-1.2.3" sources."wordwrap-0.0.3" - (sources."wrap-ansi-7.0.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."wrap-ansi-7.0.0" sources."xpath-0.0.32" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -100970,25 +104305,24 @@ in jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; - version = "10.8.2"; + version = "10.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz"; - sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; + url = "https://registry.npmjs.org/jake/-/jake-10.8.4.tgz"; + sha512 = "MtWeTkl1qGsWUtbl/Jsca/8xSoK3x0UmS82sNbjqxxG/de/M/3b1DntdjHgPMC50enlTNwXOCRqPXLLt5cCfZA=="; }; dependencies = [ - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" sources."async-0.9.2" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."concat-map-0.0.1" - sources."escape-string-regexp-1.0.5" sources."filelist-1.0.2" - sources."has-flag-3.0.0" - sources."minimatch-3.0.4" - sources."supports-color-5.5.0" + sources."has-flag-4.0.0" + sources."minimatch-3.1.2" + sources."supports-color-7.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -101016,7 +104350,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."bufrw-1.3.0" - sources."chai-4.3.4" + sources."chai-4.3.6" sources."chai-as-promised-7.1.1" sources."chalk-2.4.2" sources."check-error-1.0.2" @@ -101040,8 +104374,9 @@ in sources."jaeger-client-3.19.0" sources."lodash-4.17.21" sources."long-2.4.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."loupe-2.3.4" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mz-2.7.0" sources."node-int64-0.4.0" sources."object-assign-4.1.1" @@ -101100,11 +104435,21 @@ in sources."tslib-1.14.1" ]; }) + (sources."@aws-crypto/crc32c-2.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) (sources."@aws-crypto/ie11-detection-2.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) + (sources."@aws-crypto/sha1-browser-2.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) (sources."@aws-crypto/sha256-browser-2.0.0" // { dependencies = [ sources."tslib-1.14.1" @@ -101125,93 +104470,95 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/abort-controller-3.47.2" - sources."@aws-sdk/chunked-blob-reader-3.47.1" - sources."@aws-sdk/chunked-blob-reader-native-3.47.2" - sources."@aws-sdk/client-s3-3.48.0" - sources."@aws-sdk/client-sso-3.48.0" - sources."@aws-sdk/client-sts-3.48.0" - sources."@aws-sdk/config-resolver-3.47.2" - sources."@aws-sdk/credential-provider-env-3.47.2" - sources."@aws-sdk/credential-provider-imds-3.47.2" - sources."@aws-sdk/credential-provider-ini-3.48.0" - sources."@aws-sdk/credential-provider-node-3.48.0" - sources."@aws-sdk/credential-provider-process-3.47.2" - sources."@aws-sdk/credential-provider-sso-3.48.0" - sources."@aws-sdk/credential-provider-web-identity-3.47.2" - sources."@aws-sdk/eventstream-marshaller-3.47.2" - sources."@aws-sdk/eventstream-serde-browser-3.47.2" - sources."@aws-sdk/eventstream-serde-config-resolver-3.47.2" - sources."@aws-sdk/eventstream-serde-node-3.47.2" - sources."@aws-sdk/eventstream-serde-universal-3.47.2" - sources."@aws-sdk/fetch-http-handler-3.47.2" - sources."@aws-sdk/hash-blob-browser-3.47.2" - sources."@aws-sdk/hash-node-3.47.2" - sources."@aws-sdk/hash-stream-node-3.47.2" - sources."@aws-sdk/invalid-dependency-3.47.2" - sources."@aws-sdk/is-array-buffer-3.47.1" - sources."@aws-sdk/md5-js-3.47.2" - sources."@aws-sdk/middleware-apply-body-checksum-3.47.2" - sources."@aws-sdk/middleware-bucket-endpoint-3.47.2" - sources."@aws-sdk/middleware-content-length-3.47.2" - sources."@aws-sdk/middleware-expect-continue-3.47.2" - sources."@aws-sdk/middleware-header-default-3.47.2" - sources."@aws-sdk/middleware-host-header-3.47.2" - sources."@aws-sdk/middleware-location-constraint-3.47.2" - sources."@aws-sdk/middleware-logger-3.47.2" - (sources."@aws-sdk/middleware-retry-3.47.2" // { + sources."@aws-sdk/abort-controller-3.55.0" + sources."@aws-sdk/chunked-blob-reader-3.55.0" + sources."@aws-sdk/chunked-blob-reader-native-3.55.0" + sources."@aws-sdk/client-s3-3.56.0" + sources."@aws-sdk/client-sso-3.56.0" + sources."@aws-sdk/client-sts-3.56.0" + sources."@aws-sdk/config-resolver-3.56.0" + sources."@aws-sdk/credential-provider-env-3.55.0" + sources."@aws-sdk/credential-provider-imds-3.56.0" + sources."@aws-sdk/credential-provider-ini-3.56.0" + sources."@aws-sdk/credential-provider-node-3.56.0" + sources."@aws-sdk/credential-provider-process-3.56.0" + sources."@aws-sdk/credential-provider-sso-3.56.0" + sources."@aws-sdk/credential-provider-web-identity-3.55.0" + sources."@aws-sdk/eventstream-marshaller-3.55.0" + sources."@aws-sdk/eventstream-serde-browser-3.55.0" + sources."@aws-sdk/eventstream-serde-config-resolver-3.55.0" + sources."@aws-sdk/eventstream-serde-node-3.55.0" + sources."@aws-sdk/eventstream-serde-universal-3.55.0" + sources."@aws-sdk/fetch-http-handler-3.55.0" + sources."@aws-sdk/hash-blob-browser-3.55.0" + sources."@aws-sdk/hash-node-3.55.0" + sources."@aws-sdk/hash-stream-node-3.55.0" + sources."@aws-sdk/invalid-dependency-3.55.0" + sources."@aws-sdk/is-array-buffer-3.55.0" + sources."@aws-sdk/md5-js-3.55.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.56.0" + sources."@aws-sdk/middleware-content-length-3.55.0" + sources."@aws-sdk/middleware-expect-continue-3.55.0" + sources."@aws-sdk/middleware-flexible-checksums-3.55.0" + sources."@aws-sdk/middleware-header-default-3.55.0" + sources."@aws-sdk/middleware-host-header-3.55.0" + sources."@aws-sdk/middleware-location-constraint-3.55.0" + sources."@aws-sdk/middleware-logger-3.55.0" + (sources."@aws-sdk/middleware-retry-3.56.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/middleware-sdk-s3-3.47.2" - sources."@aws-sdk/middleware-sdk-sts-3.47.2" - sources."@aws-sdk/middleware-serde-3.47.2" - sources."@aws-sdk/middleware-signing-3.47.2" - sources."@aws-sdk/middleware-ssec-3.47.2" - sources."@aws-sdk/middleware-stack-3.47.2" - sources."@aws-sdk/middleware-user-agent-3.47.2" - sources."@aws-sdk/node-config-provider-3.47.2" - sources."@aws-sdk/node-http-handler-3.47.2" - sources."@aws-sdk/property-provider-3.47.2" - sources."@aws-sdk/protocol-http-3.47.2" - sources."@aws-sdk/querystring-builder-3.47.2" - sources."@aws-sdk/querystring-parser-3.47.2" - sources."@aws-sdk/s3-request-presigner-3.48.0" - sources."@aws-sdk/service-error-classification-3.47.2" - sources."@aws-sdk/shared-ini-file-loader-3.47.1" - sources."@aws-sdk/signature-v4-3.47.2" - sources."@aws-sdk/smithy-client-3.47.2" - sources."@aws-sdk/types-3.47.1" - sources."@aws-sdk/url-parser-3.47.2" - sources."@aws-sdk/util-arn-parser-3.47.1" - sources."@aws-sdk/util-base64-browser-3.47.1" - sources."@aws-sdk/util-base64-node-3.47.2" - sources."@aws-sdk/util-body-length-browser-3.47.1" - sources."@aws-sdk/util-body-length-node-3.47.1" - sources."@aws-sdk/util-buffer-from-3.47.2" - sources."@aws-sdk/util-config-provider-3.47.1" - sources."@aws-sdk/util-create-request-3.47.2" - sources."@aws-sdk/util-credentials-3.47.2" - sources."@aws-sdk/util-defaults-mode-browser-3.47.2" - sources."@aws-sdk/util-defaults-mode-node-3.47.2" - sources."@aws-sdk/util-format-url-3.47.2" - sources."@aws-sdk/util-hex-encoding-3.47.1" - sources."@aws-sdk/util-locate-window-3.47.1" - sources."@aws-sdk/util-uri-escape-3.47.1" - sources."@aws-sdk/util-user-agent-browser-3.47.2" - sources."@aws-sdk/util-user-agent-node-3.47.2" - sources."@aws-sdk/util-utf8-browser-3.47.1" - sources."@aws-sdk/util-utf8-node-3.47.2" - sources."@aws-sdk/util-waiter-3.47.2" - sources."@aws-sdk/xml-builder-3.47.1" + sources."@aws-sdk/middleware-sdk-s3-3.56.0" + sources."@aws-sdk/middleware-sdk-sts-3.56.0" + sources."@aws-sdk/middleware-serde-3.55.0" + sources."@aws-sdk/middleware-signing-3.56.0" + sources."@aws-sdk/middleware-ssec-3.55.0" + sources."@aws-sdk/middleware-stack-3.55.0" + sources."@aws-sdk/middleware-user-agent-3.55.0" + sources."@aws-sdk/node-config-provider-3.56.0" + sources."@aws-sdk/node-http-handler-3.55.0" + sources."@aws-sdk/property-provider-3.55.0" + sources."@aws-sdk/protocol-http-3.55.0" + sources."@aws-sdk/querystring-builder-3.55.0" + sources."@aws-sdk/querystring-parser-3.55.0" + sources."@aws-sdk/s3-request-presigner-3.56.0" + sources."@aws-sdk/service-error-classification-3.55.0" + sources."@aws-sdk/shared-ini-file-loader-3.56.0" + sources."@aws-sdk/signature-v4-3.56.0" + sources."@aws-sdk/smithy-client-3.55.0" + sources."@aws-sdk/types-3.55.0" + sources."@aws-sdk/url-parser-3.55.0" + sources."@aws-sdk/util-arn-parser-3.55.0" + sources."@aws-sdk/util-base64-browser-3.55.0" + sources."@aws-sdk/util-base64-node-3.55.0" + sources."@aws-sdk/util-body-length-browser-3.55.0" + sources."@aws-sdk/util-body-length-node-3.55.0" + sources."@aws-sdk/util-buffer-from-3.55.0" + sources."@aws-sdk/util-config-provider-3.55.0" + sources."@aws-sdk/util-create-request-3.55.0" + sources."@aws-sdk/util-defaults-mode-browser-3.55.0" + sources."@aws-sdk/util-defaults-mode-node-3.56.0" + sources."@aws-sdk/util-format-url-3.55.0" + sources."@aws-sdk/util-hex-encoding-3.55.0" + sources."@aws-sdk/util-locate-window-3.55.0" + sources."@aws-sdk/util-middleware-3.55.0" + sources."@aws-sdk/util-stream-browser-3.55.0" + sources."@aws-sdk/util-stream-node-3.55.0" + sources."@aws-sdk/util-uri-escape-3.55.0" + sources."@aws-sdk/util-user-agent-browser-3.55.0" + sources."@aws-sdk/util-user-agent-node-3.56.0" + sources."@aws-sdk/util-utf8-browser-3.55.0" + sources."@aws-sdk/util-utf8-node-3.55.0" + sources."@aws-sdk/util-waiter-3.55.0" + sources."@aws-sdk/xml-builder-3.55.0" sources."@braintree/sanitize-url-3.1.0" sources."@cronvel/get-pixels-3.4.0" sources."@joplin/fork-htmlparser2-4.1.39" sources."@joplin/fork-sax-1.2.43" (sources."@joplin/htmlpack-2.6.1" // { dependencies = [ - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" ]; }) sources."@joplin/lib-2.6.3" @@ -101264,7 +104611,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1062.0" // { + (sources."aws-sdk-2.1101.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -101300,7 +104647,7 @@ in sources."charenc-0.0.2" sources."chokidar-3.5.3" sources."chownr-1.1.4" - sources."chroma-js-2.1.2" + sources."chroma-js-2.4.2" sources."clean-css-4.2.4" sources."cliss-0.0.2" sources."code-point-at-1.1.0" @@ -101316,8 +104663,6 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - sources."cross-env-6.0.3" - sources."cross-spawn-7.0.3" sources."crypt-0.0.2" (sources."css-3.0.0" // { dependencies = [ @@ -101409,7 +104754,7 @@ in sources."datauri-4.1.0" sources."debug-0.7.4" sources."decode-uri-component-0.2.0" - sources."decompress-response-4.2.1" + sources."decompress-response-6.0.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-2.2.1" @@ -101417,20 +104762,20 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" - sources."detect-libc-1.0.3" + sources."detect-libc-2.0.1" sources."diff-match-patch-1.0.5" (sources."dom-serializer-1.3.2" // { dependencies = [ - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" ]; }) sources."domelementtype-2.2.0" sources."domexception-1.0.1" sources."domhandler-3.3.0" - sources."dompurify-2.3.4" + sources."dompurify-2.3.5" (sources."domutils-2.8.0" // { dependencies = [ - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" ]; }) sources."ecc-jsbn-0.1.2" @@ -101468,7 +104813,7 @@ in sources."file-type-10.11.0" sources."fill-range-7.0.1" sources."find-up-2.1.0" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" @@ -101506,7 +104851,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" - sources."highlight.js-11.4.0" + sources."highlight.js-11.5.0" sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.4.0" sources."html-minifier-3.5.21" @@ -101596,7 +104941,7 @@ in sources."commander-8.3.0" ]; }) - sources."keytar-7.7.0" + sources."keytar-7.9.0" sources."khroma-1.4.1" sources."klaw-1.3.1" sources."lazyness-1.2.0" @@ -101633,40 +104978,34 @@ in sources."markdown-it-footnote-3.0.3" sources."markdown-it-ins-3.0.1" sources."markdown-it-mark-3.0.1" - (sources."markdown-it-multimd-table-4.1.2" // { - dependencies = [ - sources."entities-2.1.0" - sources."linkify-it-3.0.3" - sources."markdown-it-12.3.2" - ]; - }) + sources."markdown-it-multimd-table-4.1.3" sources."markdown-it-sub-1.0.0" sources."markdown-it-sup-1.0.0" sources."markdown-it-toc-done-right-4.2.0" sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."mermaid-8.13.10" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mermaid-8.14.0" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimer-2.0.2" - sources."mimic-response-2.1.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."mimic-response-3.1.0" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" (sources."minipass-2.9.0" // { dependencies = [ sources."yallist-3.1.1" ]; }) sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" sources."moment-2.29.1" sources."moment-mini-2.24.0" sources."ms-2.1.3" sources."multiparty-4.2.3" sources."mustache-4.2.0" - sources."nanoid-3.2.0" + sources."nanoid-3.3.1" sources."napi-build-utils-1.0.2" sources."ndarray-1.0.19" sources."ndarray-pack-1.2.1" @@ -101677,12 +105016,8 @@ in }) sources."nextgen-events-1.5.2" sources."no-case-2.3.2" - (sources."node-abi-2.30.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."node-addon-api-3.2.1" + sources."node-abi-3.8.0" + sources."node-addon-api-4.3.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.11.0" sources."node-fetch-1.7.3" @@ -101702,6 +105037,7 @@ in sources."node-persist-2.1.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ + sources."detect-libc-1.0.3" sources."semver-5.7.1" ]; }) @@ -101736,14 +105072,13 @@ in sources."parse5-5.1.0" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."pify-3.0.0" sources."pipe-functions-1.3.0" sources."pn-1.1.0" sources."pngjs-5.0.0" - sources."prebuild-install-6.1.4" + sources."prebuild-install-7.0.1" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."promise-7.3.1" @@ -101803,17 +105138,26 @@ in (sources."sharp-0.26.3" // { dependencies = [ sources."color-3.2.1" - sources."decompress-response-6.0.0" - sources."mimic-response-3.1.0" - sources."simple-get-4.0.0" + sources."decompress-response-4.2.1" + sources."detect-libc-1.0.3" + sources."mimic-response-2.1.0" + (sources."node-abi-2.30.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."node-addon-api-3.2.1" + (sources."prebuild-install-6.1.4" // { + dependencies = [ + sources."simple-get-3.1.1" + ]; + }) ]; }) - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" sources."shellwords-0.1.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" + sources."simple-get-4.0.1" sources."simple-swizzle-0.2.2" (sources."slice-ansi-1.0.0" // { dependencies = [ @@ -101825,7 +105169,11 @@ in sources."source-map-url-0.4.1" sources."split-skip-0.0.2" sources."sprintf-js-1.1.2" - sources."sqlite3-5.0.2" + (sources."sqlite3-5.0.2" // { + dependencies = [ + sources."node-addon-api-3.2.1" + ]; + }) sources."sshpk-1.17.0" sources."statuses-1.5.0" sources."stealthy-require-1.1.1" @@ -101850,7 +105198,7 @@ in }) (sources."strip-ansi-4.0.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" ]; }) sources."strip-json-comments-2.0.1" @@ -101917,7 +105265,7 @@ in sources."punycode-1.3.2" ]; }) - sources."url-parse-1.5.4" + sources."url-parse-1.5.10" sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -101940,7 +105288,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -101980,7 +105328,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."lru-cache-4.1.5" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."nopt-5.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -102025,30 +105373,31 @@ in jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.7"; + version = "3.6.10"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.7.tgz"; - sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.10.tgz"; + sha512 = "IdQ8ppSo5LKZ9o3M+LKIIK8i00DIe5msDvG3G81Km+1dhy0XrOWD0Ji8H61ElgyEj/O9KRLokgKbAM9XX9CJAg=="; }; dependencies = [ - sources."@babel/parser-7.16.12" - sources."argparse-1.0.10" + sources."@babel/parser-7.17.8" + sources."@types/linkify-it-3.0.2" + sources."@types/markdown-it-12.2.3" + sources."@types/mdurl-1.0.2" + sources."argparse-2.0.1" sources."bluebird-3.7.2" sources."catharsis-0.9.0" - sources."entities-2.0.3" + sources."entities-2.1.0" sources."escape-string-regexp-2.0.0" - sources."graceful-fs-4.2.9" sources."js2xmlparser-4.0.2" - sources."klaw-3.0.0" - sources."linkify-it-2.2.0" + sources."klaw-4.0.1" + sources."linkify-it-3.0.3" sources."lodash-4.17.21" - sources."markdown-it-10.0.0" - sources."markdown-it-anchor-5.3.0" - sources."marked-2.1.3" + sources."markdown-it-12.3.2" + sources."markdown-it-anchor-8.4.1" + sources."marked-4.0.12" sources."mdurl-1.0.1" sources."mkdirp-1.0.4" sources."requizzle-0.2.3" - sources."sprintf-js-1.0.3" sources."strip-json-comments-3.1.1" sources."taffydb-2.6.2" sources."uc.micro-1.0.6" @@ -102068,10 +105417,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.13.3"; + version = "2.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.13.3.tgz"; - sha512 = "zlVQz8XAl1ODXEOVMPkDNuntPebPIE39Xn7ex/JAI9+TmBIf/fcUuj58FaLCC88rOHy8leq0N5ChBB+V5fmpzA=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.13.4.tgz"; + sha512 = "HO3bosL84b2qWqI0q+kpT/OpRJwo0R4ivgmxaO848+bo10rc50SkPnrtwSFXttW0ym4np8jbJvLwk5NziB7jIw=="; }; dependencies = [ sources."balanced-match-1.0.2" @@ -102099,11 +105448,10 @@ in sources."inherits-2.0.4" sources."isarray-0.0.1" sources."lodash-4.17.21" - sources."minimatch-3.0.4" + sources."minimatch-3.0.8" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."readable-stream-1.1.14" - sources."shelljs-0.3.0" sources."string_decoder-0.10.31" sources."strip-json-comments-1.0.4" sources."wrappy-1.0.2" @@ -102138,35 +105486,31 @@ in json-diff = nodeEnv.buildNodePackage { name = "json-diff"; packageName = "json-diff"; - version = "0.7.1"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-0.7.1.tgz"; - sha512 = "/LxjcgeDIZwFB1HHTShKAYs2NaxAgwUQjXKvrFLDvw3KqvbffFmy5ZeeamxoSLgQG89tRs9+CFKiR3lJAPPhDw=="; + url = "https://registry.npmjs.org/json-diff/-/json-diff-0.7.3.tgz"; + sha512 = "VBvNBt3cIrCBHa3gYbVsCFUEReqWZPf+Biq1ZtFdIiQ6rytRLDp3qvtrGv7z/iZDd1D4vXWpW7Nx1nP8muLzkg=="; }; dependencies = [ sources."cli-color-2.0.1" sources."d-1.0.1" sources."difflib-0.2.4" sources."dreamopt-0.8.0" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.59" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" sources."event-emitter-0.3.5" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.5.0" + sources."type-2.6.0" ]; }) sources."heap-0.2.7" sources."is-promise-2.2.2" sources."lru-queue-0.1.0" - (sources."memoizee-0.4.15" // { - dependencies = [ - sources."next-tick-1.1.0" - ]; - }) - sources."next-tick-1.0.0" + sources."memoizee-0.4.15" + sources."next-tick-1.1.0" sources."timers-ext-0.1.7" sources."type-1.2.0" sources."wordwrap-1.0.0" @@ -102208,15 +105552,15 @@ in sources."get-intrinsic-1.1.1" sources."graphlib-2.1.8" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.14.1" sources."lodash-4.17.21" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."object-inspect-1.12.0" @@ -102255,15 +105599,15 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."array-flatten-1.1.1" sources."basic-auth-2.0.1" - sources."body-parser-1.19.1" + sources."body-parser-1.19.2" sources."boxen-5.1.2" - sources."bytes-3.1.1" + sources."bytes-3.1.2" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -102292,7 +105636,7 @@ in ]; }) sources."content-type-1.0.4" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."cors-2.8.5" sources."crypto-random-string-2.0.0" @@ -102313,7 +105657,7 @@ in sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - (sources."express-4.17.2" // { + (sources."express-4.17.3" // { dependencies = [ sources."safe-buffer-5.2.1" ]; @@ -102375,18 +105719,18 @@ in }) sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-response-1.0.1" - sources."minimist-1.2.5" + sources."minimist-1.2.6" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" ]; }) sources."ms-2.0.0" - sources."nanoid-3.2.0" - sources."negotiator-0.6.2" + sources."nanoid-3.3.1" + sources."negotiator-0.6.3" sources."normalize-url-4.5.1" sources."object-assign-4.1.1" sources."on-finished-2.3.0" @@ -102407,9 +105751,9 @@ in sources."proxy-addr-2.0.7" sources."pump-3.0.0" sources."pupa-2.1.1" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" @@ -102436,7 +105780,7 @@ in sources."serve-static-1.14.2" sources."server-destroy-1.0.1" sources."setprototypeof-1.2.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."statuses-1.5.0" sources."steno-0.4.4" sources."string-width-4.2.3" @@ -102461,8 +105805,8 @@ in sources."xdg-basedir-4.0.0" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-17.4.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -102509,7 +105853,7 @@ in sha1 = "f2de92d8c2f9211e7b4e859ef73d44d32b1b5bfd"; }; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."ajv-6.12.6" sources."ansi-align-1.1.0" sources."ansi-regex-2.1.1" @@ -102538,10 +105882,10 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."body-parser-1.19.1" + sources."body-parser-1.19.2" sources."boxen-0.6.0" sources."braces-1.8.5" - sources."bytes-3.1.1" + sources."bytes-3.1.2" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -102595,7 +105939,7 @@ in ]; }) sources."content-type-1.0.4" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.3" @@ -102626,7 +105970,7 @@ in sources."etag-1.8.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - (sources."express-4.17.2" // { + (sources."express-4.17.3" // { dependencies = [ sources."safe-buffer-5.2.1" ]; @@ -102763,15 +106107,15 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimist-1.2.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimist-1.2.6" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" @@ -102786,7 +106130,7 @@ in sources."kind-of-6.0.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-status-codes-1.0.0" sources."node-uuid-1.4.8" sources."normalize-package-data-2.5.0" @@ -102845,7 +106189,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.8.0" sources."punycode-2.1.1" - sources."qs-6.9.6" + sources."qs-6.9.7" (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" @@ -102853,7 +106197,7 @@ in ]; }) sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" sources."rc-1.2.8" sources."read-all-stream-3.1.0" sources."read-pkg-1.1.0" @@ -102925,7 +106269,7 @@ in }) sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-buffer-5.1.2" @@ -103088,22 +106432,24 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@oclif/command-1.8.16" - sources."@oclif/config-1.18.2" + sources."@oclif/config-1.18.3" sources."@oclif/errors-1.3.5" (sources."@oclif/help-1.0.1" // { dependencies = [ + sources."@oclif/config-1.18.2" sources."wrap-ansi-6.2.0" ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.6" + sources."@oclif/parser-3.8.7" (sources."@oclif/plugin-help-3.3.1" // { dependencies = [ + sources."@oclif/config-1.18.2" sources."wrap-ansi-6.2.0" ]; }) sources."@oclif/screen-1.0.4" - (sources."@putdotio/api-client-8.22.0" // { + (sources."@putdotio/api-client-8.31.2" // { dependencies = [ sources."axios-0.21.4" ]; @@ -103156,14 +106502,14 @@ in ]; }) sources."debounce-fn-3.0.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" sources."dot-prop-5.3.0" sources."dotenv-8.6.0" sources."emoji-regex-8.0.0" sources."env-paths-2.2.1" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.59" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."escape-string-regexp-4.0.0" @@ -103183,7 +106529,7 @@ in }) sources."fill-range-7.0.1" sources."find-up-3.0.0" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."form-data-3.0.1" sources."fs-extra-8.1.0" sources."function-bind-1.1.1" @@ -103193,7 +106539,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ignore-5.2.0" @@ -103209,7 +106555,7 @@ in sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."js-base64-2.6.4" + sources."js-base64-2.6.3" sources."js-yaml-3.14.1" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" @@ -103223,15 +106569,15 @@ in ]; }) sources."merge2-1.4.1" - sources."micromatch-4.0.4" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."micromatch-4.0.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."moment-2.29.1" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."natural-orderby-2.0.3" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-downloader-helper-1.0.19" sources."object-inspect-1.12.0" @@ -103269,7 +106615,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."sprintf-js-1.0.3" sources."string-width-4.2.3" @@ -103280,12 +106626,12 @@ in sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tslib-2.3.1" - sources."type-2.5.0" + sources."type-2.6.0" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" sources."universalify-0.1.2" sources."uri-js-4.4.1" - sources."urijs-1.19.7" + sources."urijs-1.19.10" sources."uuid-8.3.2" sources."which-1.3.1" sources."widest-line-3.1.0" @@ -103306,10 +106652,10 @@ in katex = nodeEnv.buildNodePackage { name = "katex"; packageName = "katex"; - version = "0.15.2"; + version = "0.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.15.2.tgz"; - sha512 = "FfZ/f6f8bQdLmJ3McXDNTkKenQkoXkItpW0I9bsG2wgb+8JAY5bwpXFtI8ZVrg5hc1wo1X/UIhdkVMpok46tEQ=="; + url = "https://registry.npmjs.org/katex/-/katex-0.15.3.tgz"; + sha512 = "Al6V7RJsmjklT9QItyHWGaQCt+NYTle1bZwB1e9MR/tLoIT1MXaHy9UpfGSB7eaqDgjjqqRxQOaQGrALCrEyBQ=="; }; dependencies = [ sources."commander-8.3.0" @@ -103327,41 +106673,41 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "6.3.11"; + version = "6.3.17"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-6.3.11.tgz"; - sha512 = "QGUh4yXgizzDNPLB5nWTvP+wysKexngbyLVWFOyikB661hpa2RZLf5anZQzqliWtAQuYVep0ot0D1U7UQKpsxQ=="; + url = "https://registry.npmjs.org/karma/-/karma-6.3.17.tgz"; + sha512 = "2TfjHwrRExC8yHoWlPBULyaLwAFmXmxQrcuFImt/JsAsSZu1uOWTZ1ZsWjqQtWpHLiatJOHL5jFjXSJIgCd01g=="; }; dependencies = [ + sources."@colors/colors-1.5.0" sources."@socket.io/base64-arraybuffer-1.0.2" sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.10" - sources."accepts-1.3.7" + sources."@types/node-17.0.23" + sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."balanced-match-1.0.2" sources."base64id-2.0.0" sources."binary-extensions-2.2.0" - sources."body-parser-1.19.1" + sources."body-parser-1.19.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."chokidar-3.5.3" sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colors-1.4.0" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."connect-3.7.0" sources."content-type-1.0.4" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cors-2.8.5" sources."custom-event-1.0.1" - sources."date-format-4.0.3" + sources."date-format-4.0.6" sources."debug-2.6.9" sources."depd-1.1.2" sources."di-0.0.1" @@ -103369,9 +106715,9 @@ in sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" - (sources."engine.io-6.1.2" // { + (sources."engine.io-6.1.3" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -103383,9 +106729,9 @@ in sources."extend-3.0.2" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."flatted-3.2.4" - sources."follow-redirects-1.14.7" - sources."fs-extra-10.0.0" + sources."flatted-3.2.5" + sources."follow-redirects-1.14.9" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" @@ -103402,22 +106748,24 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."isbinaryfile-4.0.8" + sources."isbinaryfile-4.0.10" sources."jsonfile-6.1.0" sources."lodash-4.17.21" - (sources."log4js-6.4.0" // { + (sources."log4js-6.4.4" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."media-typer-0.3.0" sources."mime-2.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.0.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" @@ -103426,9 +106774,9 @@ in sources."path-is-absolute-1.0.1" sources."picomatch-2.3.1" sources."qjobs-1.2.0" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" sources."readdirp-3.6.0" sources."require-directory-2.1.1" sources."requires-port-1.0.0" @@ -103438,22 +106786,22 @@ in sources."setprototypeof-1.2.0" (sources."socket.io-4.4.1" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."socket.io-adapter-2.3.3" (sources."socket.io-parser-4.0.4" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."source-map-0.6.1" sources."statuses-1.5.0" - (sources."streamroller-3.0.2" // { + (sources."streamroller-3.0.6" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -103489,23 +106837,24 @@ in keyoxide = nodeEnv.buildNodePackage { name = "keyoxide"; packageName = "keyoxide"; - version = "0.4.3"; + version = "0.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/keyoxide/-/keyoxide-0.4.3.tgz"; - sha512 = "ffn0F9o3Yy6E9UFAS/vzOpsYxbVwk/pbSWrS3YPIZs+PtUv6zmwrkZ+71xSSb6tHBkJw5k93vOdkbo4cViFdFA=="; + url = "https://registry.npmjs.org/keyoxide/-/keyoxide-0.4.4.tgz"; + sha512 = "RUV9keqP/XK49OiVC4l5N5NxjYDPoDJFkr5OLa7rlFd/6JYah7YkqMfzm7Q9iw2ig9GKiQI9KgtR2IixzwEJnw=="; }; dependencies = [ - sources."@babel/cli-7.16.8" + sources."@ampproject/remapping-2.1.2" + sources."@babel/cli-7.17.6" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.12" // { + sources."@babel/compat-data-7.17.7" + (sources."@babel/core-7.17.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.16.8" + sources."@babel/generator-7.17.7" sources."@babel/helper-annotate-as-pure-7.16.7" - (sources."@babel/helper-compilation-targets-7.16.7" // { + (sources."@babel/helper-compilation-targets-7.17.7" // { dependencies = [ sources."semver-6.3.0" ]; @@ -103515,52 +106864,64 @@ in sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.7" sources."@babel/helper-plugin-utils-7.16.7" - sources."@babel/helper-simple-access-7.16.7" + sources."@babel/helper-simple-access-7.17.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.8" sources."@babel/highlight-7.16.10" sources."@babel/node-7.16.8" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.8" sources."@babel/plugin-syntax-jsx-7.16.7" - sources."@babel/plugin-transform-react-jsx-7.16.7" - sources."@babel/register-7.16.9" + sources."@babel/plugin-transform-react-jsx-7.17.3" + sources."@babel/register-7.17.7" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.3" + sources."@babel/types-7.17.0" + sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/sourcemap-codec-1.4.11" + sources."@jridgewell/trace-mapping-0.3.4" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + 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.1.0" + sources."@peculiar/json-schema-1.1.12" + sources."@peculiar/webcrypto-1.3.3" sources."@tootallnate/once-1.1.2" - sources."@xmpp/base64-0.12.1" - sources."@xmpp/client-0.12.1" - sources."@xmpp/client-core-0.12.1" - sources."@xmpp/connection-0.12.1" - sources."@xmpp/connection-tcp-0.12.1" - sources."@xmpp/debug-0.12.1" - sources."@xmpp/error-0.12.1" - sources."@xmpp/events-0.12.1" - sources."@xmpp/id-0.12.1" - sources."@xmpp/iq-0.12.1" - sources."@xmpp/jid-0.12.1" - sources."@xmpp/middleware-0.12.1" - sources."@xmpp/reconnect-0.12.1" - sources."@xmpp/resolve-0.12.1" - sources."@xmpp/resource-binding-0.12.1" - sources."@xmpp/sasl-0.12.1" - sources."@xmpp/sasl-anonymous-0.12.1" - sources."@xmpp/sasl-plain-0.12.1" - sources."@xmpp/sasl-scram-sha-1-0.12.1" - sources."@xmpp/session-establishment-0.12.1" - sources."@xmpp/starttls-0.12.1" - sources."@xmpp/stream-features-0.12.1" - sources."@xmpp/stream-management-0.12.1" - sources."@xmpp/tcp-0.12.1" - sources."@xmpp/tls-0.12.1" - sources."@xmpp/websocket-0.12.1" - sources."@xmpp/xml-0.12.1" + sources."@types/asn1js-2.0.2" + sources."@xmpp/base64-0.13.1" + sources."@xmpp/client-0.13.1" + sources."@xmpp/client-core-0.13.1" + sources."@xmpp/connection-0.13.1" + sources."@xmpp/connection-tcp-0.13.1" + sources."@xmpp/debug-0.13.0" + sources."@xmpp/error-0.13.1" + sources."@xmpp/events-0.13.1" + sources."@xmpp/id-0.13.1" + sources."@xmpp/iq-0.13.1" + sources."@xmpp/jid-0.13.1" + sources."@xmpp/middleware-0.13.1" + sources."@xmpp/reconnect-0.13.1" + sources."@xmpp/resolve-0.13.1" + sources."@xmpp/resource-binding-0.13.1" + sources."@xmpp/sasl-0.13.1" + sources."@xmpp/sasl-anonymous-0.13.1" + sources."@xmpp/sasl-plain-0.13.1" + sources."@xmpp/sasl-scram-sha-1-0.13.1" + sources."@xmpp/session-establishment-0.13.1" + sources."@xmpp/starttls-0.13.1" + sources."@xmpp/stream-features-0.13.1" + sources."@xmpp/stream-management-0.13.1" + sources."@xmpp/tcp-0.13.1" + sources."@xmpp/tls-0.13.1" + sources."@xmpp/websocket-0.13.1" + sources."@xmpp/xml-0.13.1" sources."abab-2.0.5" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { dependencies = [ @@ -103570,45 +106931,65 @@ in sources."acorn-walk-7.2.0" sources."agent-base-6.0.2" sources."ansi-colors-4.1.1" - sources."ansi-regex-5.0.1" + sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" + sources."aproba-1.2.0" + (sources."are-we-there-yet-1.1.7" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."array-flatten-1.1.1" + sources."array-union-2.1.0" sources."asn1.js-5.4.1" + sources."asn1js-2.3.2" sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" + sources."axios-0.25.0" sources."babel-plugin-jsx-pragmatic-1.0.2" sources."babel-plugin-syntax-jsx-6.18.0" sources."balanced-match-1.0.2" sources."base-64-1.0.0" - sources."bent-7.3.12" + sources."base64-js-1.5.1" sources."bitwise-xor-0.0.0" + sources."bl-4.1.0" sources."bn.js-4.12.0" - (sources."body-parser-1.19.1" // { + (sources."body-parser-1.19.2" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.19.1" + sources."browserslist-4.20.2" + sources."buffer-5.7.1" sources."buffer-from-1.1.2" - sources."bytes-3.1.1" - sources."bytesish-0.4.4" + sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001301" - sources."caseless-0.12.0" + sources."caniuse-lite-1.0.30001320" sources."chalk-2.4.2" sources."chardet-1.4.0" + sources."chownr-1.1.4" sources."cipher-base-1.0.4" - sources."cliui-7.0.4" + (sources."cliui-7.0.4" // { + dependencies = [ + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + ]; + }) sources."clone-deep-4.0.1" + sources."code-point-at-1.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" sources."commander-4.1.1" sources."commondir-1.0.1" sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" (sources."content-disposition-0.5.4" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -103616,9 +106997,10 @@ in }) sources."content-type-1.0.4" sources."convert-source-map-1.8.0" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.1" + sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" @@ -103635,15 +107017,20 @@ in sources."whatwg-url-8.7.0" ]; }) - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decimal.js-10.3.1" sources."decode-uri-component-0.2.0" + sources."decompress-response-4.2.1" + sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" - sources."doipjs-0.14.0" + sources."detect-libc-1.0.3" + sources."dir-glob-3.0.1" + sources."doipjs-0.15.5" (sources."domexception-2.0.1" // { dependencies = [ sources."webidl-conversions-5.0.0" @@ -103651,9 +107038,10 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."es-abstract-1.19.1" sources."es-to-primitive-1.2.1" @@ -103670,7 +107058,8 @@ in sources."esutils-2.0.3" sources."etag-1.8.1" sources."events-3.3.0" - (sources."express-4.17.2" // { + sources."expand-template-2.0.3" + (sources."express-4.17.3" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -103678,7 +107067,10 @@ in ]; }) sources."express-validator-6.14.0" + sources."fast-glob-3.2.11" sources."fast-levenshtein-2.0.6" + sources."fastq-1.13.0" + sources."fill-range-7.0.1" sources."filter-obj-1.1.0" (sources."finalhandler-1.1.2" // { dependencies = [ @@ -103688,24 +107080,50 @@ in }) sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" + sources."follow-redirects-1.14.9" sources."form-data-3.0.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" + (sources."from2-2.3.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."fs-constants-1.0.0" + (sources."fs-extra-9.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."fs-readdir-recursive-1.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."strip-ansi-3.0.1" + ]; + }) sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" + sources."github-from-package-0.0.0" sources."glob-7.2.0" + sources."glob-parent-5.1.2" sources."globals-11.12.0" + (sources."globby-11.1.0" // { + dependencies = [ + sources."slash-3.0.0" + ]; + }) sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" + sources."has-unicode-2.0.1" (sources."hash-base-3.1.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -103717,10 +107135,13 @@ in sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" - sources."imurmurhash-0.1.4" + sources."ieee754-1.2.1" + sources."ignore-5.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."ini-1.3.8" sources."internal-slot-1.0.3" + sources."into-stream-6.0.0" sources."ipaddr.js-1.9.1" sources."irc-colors-1.5.0" (sources."irc-upd-0.11.0" // { @@ -103731,19 +107152,23 @@ in sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" + sources."is-core-module-2.8.1" sources."is-date-object-1.0.5" - sources."is-fullwidth-code-point-3.0.0" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."is-glob-4.0.3" sources."is-negative-zero-2.0.2" + sources."is-number-7.0.0" sources."is-number-object-1.0.6" sources."is-plain-obj-2.1.0" sources."is-plain-object-2.0.4" sources."is-potential-custom-element-name-1.0.1" sources."is-regex-1.1.4" sources."is-shared-array-buffer-1.0.1" - sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" sources."is-weakref-1.0.2" + sources."isarray-1.0.0" sources."isobject-3.0.1" sources."js-tokens-4.0.0" (sources."jsdom-16.7.0" // { @@ -103751,35 +107176,49 @@ in sources."tr46-2.1.0" sources."webidl-conversions-6.1.0" sources."whatwg-url-8.7.0" - sources."ws-7.5.6" + sources."ws-7.5.7" ]; }) sources."jsesc-2.5.2" - sources."json5-2.2.0" + sources."json5-2.2.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."kind-of-6.0.3" sources."koa-compose-4.2.0" sources."levn-0.3.0" sources."locate-path-3.0.0" sources."lodash-4.17.21" - sources."ltx-2.10.0" + sources."lru-cache-6.0.0" + sources."ltx-3.0.0" sources."make-dir-2.1.0" sources."md5.js-1.3.5" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge-options-3.0.4" + sources."merge2-1.4.1" sources."methods-1.1.2" + sources."micromatch-4.0.5" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."mimic-response-2.1.0" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" - sources."negotiator-0.6.2" + sources."multistream-4.1.0" + sources."napi-build-utils-1.0.2" + sources."negotiator-0.6.3" + sources."node-abi-2.30.1" sources."node-environment-flags-1.0.6" sources."node-fetch-2.6.7" - sources."node-localstorage-1.3.1" - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" sources."nwsapi-2.2.0" sources."object-assign-4.1.1" sources."object-inspect-1.12.0" @@ -103788,8 +107227,9 @@ in sources."object.getownpropertydescriptors-2.1.3" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."openpgp-4.10.10" + sources."openpgp-5.2.1" sources."optionator-0.8.3" + sources."p-is-promise-3.0.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" @@ -103798,24 +107238,61 @@ in sources."parseurl-1.3.3" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" sources."picocolors-1.0.0" + sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."pirates-4.0.4" + sources."pirates-4.0.5" + (sources."pkg-5.5.2" // { + dependencies = [ + sources."@babel/parser-7.16.2" + sources."@babel/types-7.16.0" + 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."pkg-dir-3.0.0" + (sources."pkg-fetch-3.2.6" // { + 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."semver-7.3.5" + sources."supports-color-7.2.0" + ]; + }) + sources."prebuild-install-6.1.4" sources."prelude-ls-1.1.2" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" sources."proxy-addr-2.0.7" sources."psl-1.8.0" + sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.9.6" + sources."pvtsutils-1.2.2" + sources."pvutils-1.1.3" + sources."qs-6.9.7" sources."query-string-6.14.1" + sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" + sources."rc-1.2.8" sources."readable-stream-3.6.0" sources."regenerator-runtime-0.13.9" sources."require-directory-2.1.1" + sources."resolve-1.22.0" + sources."reusify-1.0.4" sources."ripemd160-2.0.2" + sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sasl-anonymous-0.1.0" @@ -103835,12 +107312,15 @@ in ]; }) sources."serve-static-1.14.2" + sources."set-blocking-2.0.0" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shallow-clone-3.0.1" sources."side-channel-1.0.4" + sources."signal-exit-3.0.7" + sources."simple-concat-1.0.1" + sources."simple-get-3.1.1" sources."slash-2.0.0" - sources."slide-1.1.6" sources."source-map-0.5.7" (sources."source-map-support-0.5.21" // { dependencies = [ @@ -103849,8 +107329,18 @@ in }) sources."split-on-first-1.1.0" sources."statuses-1.5.0" + (sources."stream-meter-1.0.4" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."strict-uri-encode-2.0.0" - sources."string-width-4.2.3" + (sources."string-width-1.0.2" // { + dependencies = [ + sources."strip-ansi-3.0.1" + ]; + }) sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" (sources."string_decoder-1.3.0" // { @@ -103858,13 +107348,24 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."strip-ansi-6.0.1" + (sources."strip-ansi-6.0.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + ]; + }) + sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-tree-3.2.4" + sources."tar-fs-2.1.1" + sources."tar-stream-2.2.0" sources."to-fast-properties-2.0.0" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tough-cookie-4.0.0" sources."tr46-0.0.3" + sources."tslib-2.3.1" + sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."type-is-1.6.18" sources."unbox-primitive-1.0.1" @@ -103878,26 +107379,35 @@ in sources."vary-1.1.2" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" + sources."webcrypto-core-1.7.2" sources."webidl-conversions-3.0.1" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" sources."whatwg-url-5.0.0" sources."which-boxed-primitive-1.0.2" + sources."wide-align-1.1.5" sources."word-wrap-1.2.3" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-1.3.4" - sources."ws-8.4.2" + sources."ws-8.5.0" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" - sources."yargs-16.2.0" + sources."yallist-4.0.0" + (sources."yargs-16.2.0" // { + dependencies = [ + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + ]; + }) sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -103945,7 +107455,7 @@ in sources."glob-stream-6.1.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-absolute-1.0.0" @@ -103962,7 +107472,7 @@ in sources."json-stable-stringify-without-jsonify-1.0.1" sources."lazystream-1.0.1" sources."lead-1.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."normalize-path-2.1.1" sources."now-and-later-2.0.1" sources."object-keys-1.1.1" @@ -104124,10 +107634,10 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.29.1" @@ -104149,7 +107659,7 @@ in sources."optionator-0.8.3" (sources."ora-3.0.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."strip-ansi-4.0.0" ]; }) @@ -104193,7 +107703,7 @@ in sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" sources."sshpk-1.17.0" sources."stack-trace-0.0.10" @@ -104242,7 +107752,7 @@ in sources."y18n-3.2.2" (sources."yargs-12.0.4" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."cliui-4.1.0" sources."invert-kv-2.0.0" sources."is-fullwidth-code-point-2.0.0" @@ -104374,11 +107884,11 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."log-symbols-2.2.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mkdirp-1.0.4" sources."moment-2.29.1" sources."mute-stream-0.0.8" @@ -104397,7 +107907,7 @@ in sources."optionator-0.8.3" (sources."ora-3.0.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."strip-ansi-4.0.0" ]; }) @@ -104433,7 +107943,7 @@ in sources."sax-1.2.4" sources."secure-keys-1.0.0" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" sources."sshpk-1.17.0" sources."stack-trace-0.0.10" @@ -104452,7 +107962,7 @@ in (sources."utile-0.3.0" // { dependencies = [ sources."async-0.9.2" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" ]; }) sources."uuid-3.4.0" @@ -104530,7 +108040,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@gar/promisify-1.1.2" + sources."@gar/promisify-1.1.3" sources."@hutson/parse-repository-url-3.0.2" sources."@lerna/add-4.0.0" sources."@lerna/bootstrap-4.0.0" @@ -104630,7 +108140,7 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/ci-detect-1.4.0" - sources."@npmcli/fs-1.1.0" + sources."@npmcli/fs-1.1.1" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" @@ -104638,7 +108148,7 @@ in sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.6" sources."@octokit/auth-token-2.5.0" - sources."@octokit/core-3.5.1" + sources."@octokit/core-3.6.0" (sources."@octokit/endpoint-6.0.12" // { dependencies = [ sources."is-plain-object-5.0.0" @@ -104650,7 +108160,7 @@ in sources."@octokit/plugin-paginate-rest-2.17.0" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.13.0" - (sources."@octokit/request-5.6.2" // { + (sources."@octokit/request-5.6.3" // { dependencies = [ sources."is-plain-object-5.0.0" ]; @@ -104667,7 +108177,7 @@ in sources."abbrev-1.1.1" sources."add-stream-1.0.0" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" (sources."ansi-escapes-4.3.2" // { @@ -104675,7 +108185,7 @@ in sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-2.1.1" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" (sources."are-we-there-yet-1.1.7" // { @@ -104718,19 +108228,14 @@ in sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" - (sources."cliui-7.0.4" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) + sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-deep-4.0.1" sources."cmd-shim-4.1.0" sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."columnify-1.5.4" + sources."columnify-1.6.0" sources."combined-stream-1.0.8" (sources."compare-func-2.0.0" // { dependencies = [ @@ -104762,7 +108267,7 @@ in sources."dargs-7.0.0" sources."dashdash-1.14.1" sources."dateformat-3.0.3" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."debuglog-1.0.1" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { @@ -104819,9 +108324,11 @@ in sources."function-bind-1.1.1" (sources."gauge-2.7.4" // { dependencies = [ + sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" ]; }) sources."get-caller-file-2.0.5" @@ -104863,7 +108370,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-4.1.0" @@ -104891,15 +108398,10 @@ in (sources."init-package-json-2.0.5" // { dependencies = [ sources."normalize-package-data-3.0.3" - sources."read-package-json-4.1.1" - ]; - }) - (sources."inquirer-7.3.3" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" + sources."read-package-json-4.1.2" ]; }) + sources."inquirer-7.3.3" sources."internal-slot-1.0.3" sources."ip-1.1.5" sources."is-arrayish-0.2.1" @@ -104990,13 +108492,13 @@ in }) sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.4" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."micromatch-4.0.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" (sources."minimist-options-4.1.0" // { dependencies = [ sources."arrify-1.0.1" @@ -105016,7 +108518,7 @@ in sources."ms-2.1.2" sources."multimatch-5.0.0" sources."mute-stream-0.0.8" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."neo-async-2.6.2" (sources."node-fetch-2.6.7" // { dependencies = [ @@ -105042,7 +108544,7 @@ in sources."fs-minipass-1.2.7" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."node-gyp-5.1.1" sources."nopt-4.0.3" sources."resolve-from-4.0.0" @@ -105143,7 +108645,7 @@ in sources."redent-3.0.0" sources."request-2.88.2" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."restore-cursor-3.1.0" @@ -105161,11 +108663,11 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."slide-1.1.6" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-6.1.1" sources."sort-keys-2.0.0" sources."source-map-0.6.1" @@ -105179,16 +108681,11 @@ in sources."sshpk-1.17.0" sources."ssri-8.0.1" sources."strict-uri-encode-2.0.0" - (sources."string-width-4.2.3" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) + sources."string-width-4.2.3" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.3.0" - sources."strip-ansi-3.0.1" + sources."strip-ansi-6.0.1" sources."strip-bom-4.0.0" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" @@ -105217,7 +108714,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.3" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unbox-primitive-1.0.1" @@ -105240,12 +108737,7 @@ in sources."which-boxed-primitive-1.0.2" sources."wide-align-1.1.5" sources."wordwrap-1.0.0" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" (sources."write-json-file-4.3.0" // { @@ -105289,7 +108781,7 @@ in sha512 = "EoQp/Et7OSOVu0aJknJOtlXZsnr8XE8KwuzTHOLeVSEx8pVWUICc8Q0VYRHgzyjX78nMEyC/oztWFbgyhtNfDA=="; }; dependencies = [ - sources."copy-anything-2.0.3" + sources."copy-anything-2.0.6" sources."debug-3.2.7" sources."errno-0.1.8" sources."graceful-fs-4.2.9" @@ -105352,7 +108844,7 @@ in sha512 = "Yn2XCVjErTkqnM3FfTmM7/kWy3zP7+cEtC7x6u+wUzlQ+1UW3zEYbbyJrc0jNDwiMDZI0m4a0i3dxlGHVyXczw=="; }; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -105413,7 +108905,7 @@ in sources."decode-uri-component-0.2.0" sources."define-property-2.0.2" sources."depd-2.0.0" - sources."destroy-1.0.4" + sources."destroy-1.2.0" sources."duplexer-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" @@ -105475,12 +108967,12 @@ in ]; }) sources."http-auth-3.1.3" - (sources."http-errors-1.8.1" // { + (sources."http-errors-2.0.0" // { dependencies = [ - sources."depd-1.1.2" + sources."statuses-2.0.1" ]; }) - sources."http-parser-js-0.5.5" + sources."http-parser-js-0.5.6" sources."inherits-2.0.4" sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" @@ -105506,14 +108998,14 @@ in sources."map-visit-1.0.0" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" sources."nan-2.15.0" sources."nanomatch-1.2.13" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" (sources."object-copy-0.1.0" // { @@ -105553,10 +109045,11 @@ in sources."ret-0.1.15" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - (sources."send-0.17.2" // { + (sources."send-0.18.0" // { dependencies = [ - sources."depd-1.1.2" sources."ms-2.1.3" + sources."on-finished-2.4.1" + sources."statuses-2.0.1" ]; }) (sources."serve-index-1.9.1" // { @@ -105683,7 +109176,7 @@ in sha512 = "C5x12+bwk7m2Sx3U27VZ7h5KP7vIlKfZGCabMi73nBGp0zPHtCaxQTPXDRoX5479EZUvycYJI0aD4h1d4+ds7w=="; }; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."after-0.8.2" sources."ajv-6.12.6" sources."anymatch-1.3.2" @@ -105715,9 +109208,9 @@ in sources."binary-extensions-1.13.1" sources."bindings-1.5.0" sources."blob-0.0.5" - sources."body-parser-1.19.1" + sources."body-parser-1.19.2" sources."braces-1.8.5" - sources."bytes-3.1.1" + sources."bytes-3.1.2" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -105754,7 +109247,7 @@ in ]; }) sources."content-type-1.0.4" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.3" @@ -105789,7 +109282,7 @@ in sources."etag-1.8.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" - (sources."express-4.17.2" // { + (sources."express-4.17.3" // { dependencies = [ sources."safe-buffer-5.2.1" ]; @@ -105909,9 +109402,9 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimist-1.2.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimist-1.2.6" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -105926,7 +109419,7 @@ in sources."kind-of-6.0.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-path-2.1.1" sources."oauth-sign-0.9.0" (sources."object-copy-0.1.0" // { @@ -105968,7 +109461,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.8.0" sources."punycode-2.1.1" - sources."qs-6.9.6" + sources."qs-6.9.7" (sources."randomatic-3.1.1" // { dependencies = [ sources."is-number-4.0.0" @@ -105976,7 +109469,7 @@ in ]; }) sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" sources."readable-stream-2.3.7" (sources."readdirp-2.2.1" // { dependencies = [ @@ -106205,54 +109698,55 @@ in version = "1.10.1"; src = ../interpreters/clojurescript/lumo; dependencies = [ + sources."@ampproject/remapping-2.1.2" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - sources."@babel/core-7.16.12" - sources."@babel/generator-7.16.8" + sources."@babel/compat-data-7.17.7" + sources."@babel/core-7.17.8" + sources."@babel/generator-7.17.7" sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - sources."@babel/helper-compilation-targets-7.16.7" - sources."@babel/helper-create-class-features-plugin-7.16.10" - sources."@babel/helper-create-regexp-features-plugin-7.16.7" + sources."@babel/helper-compilation-targets-7.17.7" + sources."@babel/helper-create-class-features-plugin-7.17.6" + sources."@babel/helper-create-regexp-features-plugin-7.17.0" sources."@babel/helper-define-polyfill-provider-0.3.1" sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-explode-assignable-expression-7.16.7" sources."@babel/helper-function-name-7.16.7" sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-member-expression-to-functions-7.16.7" + sources."@babel/helper-member-expression-to-functions-7.17.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.7" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" sources."@babel/helper-replace-supers-7.16.7" - sources."@babel/helper-simple-access-7.16.7" + sources."@babel/helper-simple-access-7.17.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.8" (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.8" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/plugin-proposal-object-rest-spread-7.17.3" sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" sources."@babel/plugin-proposal-optional-chaining-7.16.7" sources."@babel/plugin-proposal-private-methods-7.16.11" @@ -106280,7 +109774,7 @@ in sources."@babel/plugin-transform-block-scoping-7.16.7" sources."@babel/plugin-transform-classes-7.16.7" sources."@babel/plugin-transform-computed-properties-7.16.7" - sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-destructuring-7.17.7" sources."@babel/plugin-transform-dotall-regex-7.16.7" sources."@babel/plugin-transform-duplicate-keys-7.16.7" sources."@babel/plugin-transform-exponentiation-operator-7.16.7" @@ -106289,8 +109783,8 @@ in sources."@babel/plugin-transform-literals-7.16.7" sources."@babel/plugin-transform-member-expression-literals-7.16.7" sources."@babel/plugin-transform-modules-amd-7.16.7" - sources."@babel/plugin-transform-modules-commonjs-7.16.8" - sources."@babel/plugin-transform-modules-systemjs-7.16.7" + sources."@babel/plugin-transform-modules-commonjs-7.17.7" + sources."@babel/plugin-transform-modules-systemjs-7.17.8" sources."@babel/plugin-transform-modules-umd-7.16.7" sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" sources."@babel/plugin-transform-new-target-7.16.7" @@ -106299,7 +109793,7 @@ in sources."@babel/plugin-transform-property-literals-7.16.7" sources."@babel/plugin-transform-regenerator-7.16.7" sources."@babel/plugin-transform-reserved-words-7.16.7" - sources."@babel/plugin-transform-runtime-7.16.10" + sources."@babel/plugin-transform-runtime-7.17.0" sources."@babel/plugin-transform-shorthand-properties-7.16.7" sources."@babel/plugin-transform-spread-7.16.7" sources."@babel/plugin-transform-sticky-regex-7.16.7" @@ -106310,10 +109804,10 @@ in sources."@babel/preset-env-7.16.11" sources."@babel/preset-modules-0.1.5" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.8" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.3" + sources."@babel/types-7.17.0" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -106324,21 +109818,24 @@ in ]; }) sources."@jest/types-25.5.0" - sources."@types/babel__core-7.1.18" + sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/sourcemap-codec-1.4.11" + sources."@jridgewell/trace-mapping-0.3.4" + sources."@types/babel__core-7.1.19" sources."@types/babel__generator-7.6.4" sources."@types/babel__template-7.4.1" sources."@types/babel__traverse-7.14.2" - sources."@types/estree-0.0.50" + sources."@types/estree-0.0.51" sources."@types/graceful-fs-4.1.5" sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" - sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.10" + sources."@types/json-schema-7.0.11" + sources."@types/node-17.0.23" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" - sources."@types/yargs-parser-20.2.1" + sources."@types/yargs-parser-21.0.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -106368,7 +109865,7 @@ in sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."amdefine-1.0.1" - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" sources."aproba-1.2.0" @@ -106408,7 +109905,7 @@ in sources."babel-helper-remove-or-void-0.4.3" sources."babel-helper-to-multiple-sequence-expressions-0.5.0" sources."babel-jest-25.5.1" - sources."babel-loader-8.2.3" + sources."babel-loader-8.2.4" sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.1.1" sources."babel-plugin-jest-hoist-25.5.0" @@ -106424,7 +109921,7 @@ in sources."babel-plugin-minify-simplify-0.5.1" sources."babel-plugin-minify-type-constructors-0.4.3" sources."babel-plugin-polyfill-corejs2-0.3.1" - sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-corejs3-0.5.2" sources."babel-plugin-polyfill-regenerator-0.3.1" sources."babel-plugin-syntax-flow-6.18.0" sources."babel-plugin-transform-flow-strip-types-6.22.0" @@ -106491,7 +109988,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.19.1" + sources."browserslist-4.20.2" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.2" @@ -106500,14 +109997,14 @@ in sources."builtin-status-codes-3.0.0" (sources."cacache-12.0.4" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" ]; }) sources."cache-base-1.0.1" sources."cached-path-relative-1.1.0" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001320" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -106573,12 +110070,12 @@ in sources."convert-source-map-1.8.0" (sources."copy-concurrently-1.0.5" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" ]; }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.20.3" // { + (sources."core-js-compat-3.21.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -106610,7 +110107,7 @@ in sources."dash-ast-1.0.0" sources."dashdash-1.14.1" sources."death-1.1.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."define-properties-1.1.3" @@ -106630,7 +110127,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.96" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106761,7 +110258,7 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -106852,7 +110349,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-0.0.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.2" @@ -106861,17 +110358,13 @@ in sources."labeled-stream-splicer-2.0.2" sources."lines-and-columns-1.2.4" sources."loader-runner-2.4.0" - (sources."loader-utils-1.4.0" // { - dependencies = [ - sources."json5-1.0.1" - ]; - }) + sources."loader-utils-2.0.2" sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" sources."lodash.memoize-3.0.4" sources."lru-cache-5.1.1" - sources."magic-string-0.25.7" + sources."magic-string-0.25.9" sources."make-dir-3.1.0" sources."makeerror-1.0.12" sources."map-cache-0.2.2" @@ -106879,7 +110372,7 @@ in sources."md5.js-1.3.5" sources."memory-fs-0.4.1" sources."merge-stream-2.0.0" - (sources."micromatch-4.0.4" // { + (sources."micromatch-4.0.5" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -106892,12 +110385,12 @@ in sources."bn.js-4.12.0" ]; }) - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mississippi-3.0.0" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -106909,7 +110402,7 @@ in sources."module-deps-6.2.3" (sources."move-concurrently-1.0.1" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" ]; }) sources."ms-2.1.2" @@ -106932,7 +110425,7 @@ in sources."util-0.11.1" ]; }) - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -106988,7 +110481,7 @@ in sources."pify-4.0.1" sources."pinkie-1.0.0" sources."pinkie-promise-1.0.0" - sources."pirates-4.0.4" + sources."pirates-4.0.5" sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master" @@ -107026,13 +110519,13 @@ in sources."readdirp-3.6.0" sources."realpath-native-2.0.0" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-9.0.0" + sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" - sources."regexpu-core-4.8.0" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.7.0" // { + sources."regexpu-core-5.0.1" + sources."regjsgen-0.6.0" + (sources."regjsparser-0.8.4" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -107044,7 +110537,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -107096,7 +110589,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.3" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { @@ -107297,8 +110790,10 @@ in (sources."webpack-4.46.0" // { dependencies = [ sources."acorn-6.4.2" + sources."json5-1.0.1" + sources."loader-utils-1.4.0" sources."micromatch-3.1.10" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."schema-utils-1.0.0" ]; }) @@ -107309,6 +110804,8 @@ in sources."supports-color-5.5.0" ]; }) + sources."json5-1.0.1" + sources."loader-utils-1.4.0" sources."supports-color-6.1.0" ]; }) @@ -107368,7 +110865,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.5" sources."@types/get-stdin-5.0.1" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -107401,7 +110898,7 @@ in sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."mkdirp-0.3.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -107487,9 +110984,9 @@ in sources."lru-cache-4.1.5" sources."lstream-0.0.4" sources."mime-1.2.11" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."moment-2.29.1" (sources."mooremachine-2.3.0" // { dependencies = [ @@ -107610,37 +111107,35 @@ in markdownlint-cli = nodeEnv.buildNodePackage { name = "markdownlint-cli"; packageName = "markdownlint-cli"; - version = "0.30.0"; + version = "0.31.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.30.0.tgz"; - sha512 = "NiG8iERjwsRZtJAIyLMDdYL2O3bJVn3fUxzDl+6Iv61/YYz9H9Nzgke/v0/cW9HfGvgZHhbfI19LFMp6gbKdyw=="; + url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.31.1.tgz"; + sha512 = "keIOMwQn+Ch7MoBwA+TdkyVMuxAeZFEGmIIlvwgV0Z1TGS5MxPnRr29XCLhkNzCHU+uNKGjU+VEjLX+Z9kli6g=="; }; dependencies = [ sources."argparse-2.0.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."commander-8.3.0" + sources."commander-9.0.0" sources."concat-map-0.0.1" sources."deep-extend-0.6.0" sources."entities-2.1.0" sources."fs.realpath-1.0.0" - sources."get-stdin-8.0.0" + sources."get-stdin-9.0.0" sources."glob-7.2.0" - sources."ignore-5.1.9" + sources."ignore-5.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" sources."js-yaml-4.1.0" sources."jsonc-parser-3.0.0" sources."linkify-it-3.0.3" - sources."lodash.differencewith-4.5.0" - sources."lodash.flatten-4.4.0" - sources."markdown-it-12.2.0" - sources."markdownlint-0.24.0" - sources."markdownlint-rule-helpers-0.15.0" + sources."markdown-it-12.3.2" + sources."markdownlint-0.25.1" + sources."markdownlint-rule-helpers-0.16.0" sources."mdurl-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.0.8" + sources."minimist-1.2.6" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."run-con-1.2.10" @@ -107716,10 +111211,10 @@ in markdown-link-check = nodeEnv.buildNodePackage { name = "markdown-link-check"; packageName = "markdown-link-check"; - version = "3.9.2"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.9.2.tgz"; - sha512 = "f6ZZaFIFe6lviqzWglHgzPg7xeIJ+7QnaJZosPRaJyeZigRiG03WDjcChuV6k21kdyDhCwBO9HoISh2oxP4Hjw=="; + url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.10.0.tgz"; + sha512 = "P2WeISLd669q4yxmX3rU6zoGcmAXdvvRK8paXxLvOlTjtxY6cObpMv0blVtampmJGMeE7QcF4Q/9YT/wfXUNaw=="; }; dependencies = [ sources."ansi-styles-4.3.0" @@ -107734,10 +111229,10 @@ in sources."is-absolute-url-3.0.3" sources."is-relative-url-3.0.0" sources."isemail-3.2.0" - sources."link-check-5.0.2" + sources."link-check-5.1.0" sources."lodash-4.17.21" - sources."markdown-link-extractor-1.3.1" - sources."marked-4.0.10" + sources."markdown-link-extractor-2.0.1" + sources."marked-4.0.12" sources."ms-2.1.3" sources."needle-3.0.0" sources."progress-2.0.3" @@ -107756,13 +111251,13 @@ in bypassCache = true; reconstructLock = true; }; - "markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage { + "markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage { name = "markdown-preview-vim"; packageName = "markdown-preview-vim"; version = "0.0.1"; - src = ../../misc/vim-plugins/markdown-preview-nvim; + src = ../../applications/editors/vim/plugins/markdown-preview-nvim; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."after-0.8.2" sources."arraybuffer.slice-0.0.7" sources."async-1.0.0" @@ -107812,13 +111307,13 @@ in sources."isstream-0.1.2" sources."lodash-4.17.21" sources."log4js-3.0.6" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.1.3" sources."msgpack-lite-0.1.26" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."neovim-4.2.1" sources."object-component-0.0.3" sources."parseqs-0.0.5" @@ -107874,10 +111369,10 @@ in mastodon-bot = nodeEnv.buildNodePackage { name = "mastodon-bot"; packageName = "mastodon-bot"; - version = "1.13.7-20211027152950"; + version = "1.13.8-20220129172727"; src = fetchurl { - url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.13.7-20211027152950.tgz"; - sha512 = "M+/MOAADju8toJAvN03Gj5KkR42Ud2SKkm183uWuO0DcWBJxjT60GYwbgdLeDAc8V0YC8F0ee6oR9yxJ4H9LZg=="; + url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.13.8-20220129172727.tgz"; + sha512 = "uBYlTnpHrVQ6+K9qQHaoLfvUKL8W5RLjdPmIzSC48+F0TSwDv+zAq19Sv5kx4Rxv4K+3c9j15xMI+mEs3bD7Lg=="; }; dependencies = [ sources."acorn-5.7.4" @@ -107943,7 +111438,7 @@ in }) sources."ecc-jsbn-0.1.2" sources."entities-1.1.2" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.59" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" (sources."es6-set-0.1.5" // { @@ -107974,7 +111469,7 @@ in sources."exit-hook-1.1.1" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.5.0" + sources."type-2.6.0" ]; }) sources."extend-3.0.2" @@ -108023,7 +111518,7 @@ in sources."interpret-1.4.0" sources."is-core-module-2.8.1" sources."is-fullwidth-code-point-1.0.0" - sources."is-my-ip-valid-1.0.0" + sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" sources."is-property-1.0.2" sources."is-resolvable-1.1.0" @@ -108060,16 +111555,16 @@ in sources."lodash.templatesettings-3.1.1" sources."mastodon-api-1.3.0" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."multipipe-0.1.2" sources."mute-stream-0.0.5" sources."natural-compare-1.4.0" - sources."next-tick-1.0.0" + sources."next-tick-1.1.0" sources."node-addon-api-1.7.2" sources."node-fetch-2.6.1" sources."number-is-nan-1.0.1" @@ -108099,7 +111594,7 @@ in sources."replace-ext-0.0.1" sources."request-2.88.0" sources."require-uncached-1.0.3" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-1.0.1" sources."restore-cursor-1.0.1" sources."rimraf-2.6.3" @@ -108123,7 +111618,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."table-3.8.3" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -108230,14 +111725,14 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.13.8"; + version = "8.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.13.8.tgz"; - sha512 = "T2IGxPOVrzFaO4jl1ADUa1X6AmR3RwTI8nC3c3EBEg3mJVM4/DP0TDO7wfdGFTJEle3WtPvO6oNILffTckHjwQ=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.14.0.tgz"; + sha512 = "NHuFVPINakXJlAX0DHl3Bvcrz664ZblHfvB7M2X9fwTZNMZzoFTO2k0Q79Rh9QTmZTmmMjj0JmKMg7LiP+pFCA=="; }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -108251,8 +111746,9 @@ in sources."chownr-1.1.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-8.3.0" + sources."commander-9.1.0" sources."concat-map-0.0.1" + sources."cross-fetch-3.1.5" sources."d3-7.3.0" sources."d3-array-3.1.1" sources."d3-axis-3.0.0" @@ -108327,10 +111823,10 @@ in sources."iconv-lite-0.4.24" ]; }) - sources."debug-4.3.2" + sources."debug-4.3.3" sources."delaunator-5.0.0" - sources."devtools-protocol-0.0.948846" - sources."dompurify-2.3.4" + sources."devtools-protocol-0.0.969999" + sources."dompurify-2.3.5" sources."end-of-stream-1.4.4" sources."extract-zip-2.0.1" sources."fd-slicer-1.1.0" @@ -108350,12 +111846,12 @@ in sources."khroma-1.4.1" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."mermaid-8.13.10" - sources."minimatch-3.0.4" + sources."mermaid-8.14.0" + sources."minimatch-3.1.2" sources."mkdirp-classic-0.5.3" sources."moment-mini-2.24.0" sources."ms-2.1.2" - sources."node-fetch-2.6.5" + sources."node-fetch-2.6.7" sources."once-1.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -108367,7 +111863,7 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-13.1.1" + sources."puppeteer-13.5.1" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" sources."robust-predicates-3.0.1" @@ -108386,7 +111882,7 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wrappy-1.0.2" - sources."ws-8.2.3" + sources."ws-8.5.0" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -108402,10 +111898,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "9.1.4"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.1.4.tgz"; - sha512 = "+q2aV5VlJZuLgCWoBvGI5zEwPF9eEI0kr/sAA9Jm4xMND7RfIEyF8JE7C0JIg8WXRG+P1sdIAb5ccoHPlXLzcw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz"; + sha512 = "L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -108425,12 +111921,12 @@ in sources."supports-color-7.2.0" ]; }) - sources."chokidar-3.5.2" + sources."chokidar-3.5.3" sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" - (sources."debug-4.3.2" // { + (sources."debug-4.3.3" // { dependencies = [ sources."ms-2.1.2" ]; @@ -108446,7 +111942,11 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" - sources."glob-7.1.7" + (sources."glob-7.2.0" // { + dependencies = [ + sources."minimatch-3.1.2" + ]; + }) sources."glob-parent-5.1.2" sources."growl-1.10.5" sources."has-flag-4.0.0" @@ -108464,9 +111964,9 @@ in sources."js-yaml-4.1.0" sources."locate-path-6.0.0" sources."log-symbols-4.1.0" - sources."minimatch-3.0.4" + sources."minimatch-4.2.1" sources."ms-2.1.3" - sources."nanoid-3.1.25" + sources."nanoid-3.3.1" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."p-limit-3.1.0" @@ -108485,7 +111985,7 @@ in sources."supports-color-8.1.1" sources."to-regex-range-5.0.1" sources."which-2.0.2" - sources."workerpool-6.1.5" + sources."workerpool-6.2.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."y18n-5.0.8" @@ -108531,7 +112031,7 @@ in sources."get-intrinsic-1.1.1" sources."graphlib-2.1.8" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.14.1" @@ -108543,8 +112043,8 @@ in sources."lodash-4.17.21" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."ms-2.1.3" sources."native-promise-only-0.8.1" sources."object-inspect-1.12.0" @@ -108624,7 +112124,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -108650,6 +112150,372 @@ in bypassCache = true; reconstructLock = true; }; + near-cli = nodeEnv.buildNodePackage { + name = "near-cli"; + packageName = "near-cli"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/near-cli/-/near-cli-3.2.0.tgz"; + sha512 = "5bnSY2xzH3v0bEBX0+rNadLdjrScLZfcUnqmaJqhXofaJH67pL/qo+x7MS8MG8yPaJ8y702E5PPvrp/maAhsDw=="; + }; + dependencies = [ + sources."@babel/code-frame-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + (sources."@babel/highlight-7.16.10" // { + 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."@jest/environment-27.5.1" + sources."@jest/fake-timers-27.5.1" + sources."@jest/types-27.5.1" + sources."@ledgerhq/devices-6.24.1" + sources."@ledgerhq/errors-6.10.0" + sources."@ledgerhq/hw-transport-6.24.1" + sources."@ledgerhq/hw-transport-node-hid-6.24.1" + sources."@ledgerhq/hw-transport-node-hid-noevents-6.24.1" + (sources."@ledgerhq/hw-transport-u2f-5.36.0-deprecated" // { + dependencies = [ + sources."@ledgerhq/devices-5.51.1" + sources."@ledgerhq/errors-5.50.0" + sources."@ledgerhq/hw-transport-5.51.1" + sources."@ledgerhq/logs-5.50.0" + ]; + }) + (sources."@ledgerhq/hw-transport-webhid-5.51.1" // { + dependencies = [ + sources."@ledgerhq/devices-5.51.1" + sources."@ledgerhq/errors-5.50.0" + sources."@ledgerhq/hw-transport-5.51.1" + sources."@ledgerhq/logs-5.50.0" + ]; + }) + (sources."@ledgerhq/hw-transport-webusb-5.53.1" // { + dependencies = [ + sources."@ledgerhq/devices-5.51.1" + sources."@ledgerhq/errors-5.50.0" + sources."@ledgerhq/hw-transport-5.51.1" + sources."@ledgerhq/logs-5.50.0" + ]; + }) + sources."@ledgerhq/logs-6.10.0" + sources."@sindresorhus/is-0.14.0" + sources."@sinonjs/commons-1.8.3" + sources."@sinonjs/fake-timers-8.1.0" + sources."@szmarczak/http-timer-1.1.2" + sources."@types/istanbul-lib-coverage-2.0.4" + sources."@types/istanbul-lib-report-3.0.0" + sources."@types/istanbul-reports-3.0.1" + sources."@types/node-17.0.23" + sources."@types/stack-utils-2.0.1" + sources."@types/yargs-16.0.4" + sources."@types/yargs-parser-21.0.0" + sources."agent-base-6.0.2" + sources."ansi-align-3.0.1" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."aproba-1.2.0" + (sources."are-we-there-yet-1.1.7" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."string_decoder-1.1.1" + ]; + }) + sources."ascii-table-0.0.9" + sources."balanced-match-1.0.2" + sources."base-x-3.0.9" + sources."base64-js-1.5.1" + sources."bindings-1.5.0" + (sources."bip39-3.0.2" // { + dependencies = [ + sources."@types/node-11.11.6" + ]; + }) + sources."bip39-light-1.0.7" + sources."bl-4.1.0" + sources."bn.js-5.2.0" + sources."borsh-0.6.0" + sources."boxen-5.1.2" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."bs58-4.0.1" + sources."buffer-5.7.1" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."camelcase-6.3.0" + sources."capability-0.2.5" + sources."chalk-4.1.2" + sources."chownr-1.1.4" + sources."ci-info-2.0.0" + sources."cipher-base-1.0.4" + sources."cli-boxes-2.2.1" + sources."cliui-7.0.4" + sources."clone-response-1.0.2" + sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."concat-map-0.0.1" + sources."configstore-5.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.3" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."crypto-random-string-2.0.0" + sources."debug-4.3.4" + sources."decompress-response-3.3.0" + sources."deep-extend-0.6.0" + sources."deep-is-0.1.4" + sources."defer-to-connect-1.1.3" + sources."define-lazy-prop-2.0.0" + sources."delegates-1.0.0" + sources."depd-2.0.0" + sources."detect-libc-1.0.3" + sources."dot-prop-5.3.0" + sources."duplexer3-0.1.4" + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" + sources."error-polyfill-0.1.3" + sources."escalade-3.1.1" + sources."escape-goat-2.1.1" + sources."escape-string-regexp-1.0.5" + sources."events-3.3.0" + sources."expand-template-2.0.3" + sources."file-uri-to-path-1.0.0" + sources."fill-range-7.0.1" + sources."flagged-respawn-1.0.1" + sources."fs-constants-1.0.0" + sources."fs.realpath-1.0.0" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."get-caller-file-2.0.5" + sources."get-stream-4.1.0" + sources."github-from-package-0.0.0" + sources."glob-7.2.0" + sources."global-dirs-3.0.0" + sources."got-9.6.0" + sources."graceful-fs-4.2.9" + sources."has-flag-4.0.0" + sources."has-unicode-2.0.1" + sources."has-yarn-2.1.0" + sources."hash-base-3.1.0" + sources."homedir-polyfill-1.0.3" + sources."http-cache-semantics-4.1.0" + (sources."http-errors-1.8.1" // { + dependencies = [ + sources."depd-1.1.2" + ]; + }) + sources."https-proxy-agent-5.0.0" + sources."ieee754-1.2.1" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-2.0.0" + sources."ip-regex-4.3.0" + sources."is-ci-2.0.0" + sources."is-docker-2.2.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-installed-globally-0.4.0" + sources."is-npm-5.0.0" + sources."is-number-7.0.0" + sources."is-obj-2.0.0" + sources."is-path-inside-3.0.3" + sources."is-typedarray-1.0.0" + sources."is-url-1.2.4" + sources."is-wsl-2.2.0" + sources."is-yarn-global-0.3.0" + sources."is2-2.0.7" + sources."isarray-1.0.0" + sources."jest-environment-node-27.5.1" + sources."jest-message-util-27.5.1" + sources."jest-mock-27.5.1" + (sources."jest-util-27.5.1" // { + dependencies = [ + sources."ci-info-3.3.0" + ]; + }) + sources."js-sha256-0.9.0" + sources."js-tokens-4.0.0" + sources."json-buffer-3.0.0" + sources."keyv-3.1.0" + sources."latest-version-5.1.0" + sources."lodash-4.17.21" + sources."lowercase-keys-1.0.1" + sources."lru-cache-6.0.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."md5.js-1.3.5" + sources."micromatch-4.0.5" + sources."mimic-response-1.0.1" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mixpanel-0.13.0" + sources."mkdirp-classic-0.5.3" + sources."ms-2.1.2" + sources."mustache-4.2.0" + sources."napi-build-utils-1.0.2" + sources."ncp-2.0.0" + sources."near-api-js-0.44.2" + sources."near-hd-key-1.2.1" + sources."near-ledger-js-0.2.1" + sources."near-seed-phrase-0.2.0" + (sources."node-abi-2.30.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."node-addon-api-3.2.1" + sources."node-fetch-2.6.7" + sources."node-gyp-build-4.3.0" + sources."node-hid-2.1.1" + sources."normalize-url-4.5.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."o3-1.0.3" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."open-8.4.0" + sources."p-cancelable-1.1.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."parse-passwd-1.0.0" + sources."path-is-absolute-1.0.1" + sources."pbkdf2-3.1.2" + sources."picomatch-2.3.1" + sources."platform-1.3.6" + sources."prebuild-install-6.1.4" + sources."prepend-http-2.0.0" + (sources."pretty-format-27.5.1" // { + dependencies = [ + sources."ansi-styles-5.2.0" + ]; + }) + sources."process-nextick-args-2.0.1" + sources."pump-3.0.0" + sources."pupa-2.1.1" + sources."randombytes-2.1.0" + (sources."rc-1.2.8" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) + sources."react-is-17.0.2" + sources."readable-stream-3.6.0" + sources."registry-auth-token-4.2.1" + sources."registry-url-5.1.0" + sources."require-directory-2.1.1" + sources."responselike-1.0.2" + sources."rimraf-3.0.2" + sources."ripemd160-2.0.2" + sources."rxjs-6.6.7" + sources."safe-buffer-5.2.1" + sources."semver-7.3.5" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."set-blocking-2.0.0" + sources."setprototypeof-1.2.0" + sources."sha.js-2.4.11" + sources."signal-exit-3.0.7" + sources."simple-concat-1.0.1" + (sources."simple-get-3.1.1" // { + dependencies = [ + sources."decompress-response-4.2.1" + sources."mimic-response-2.1.0" + ]; + }) + sources."slash-3.0.0" + (sources."stack-utils-2.0.5" // { + dependencies = [ + sources."escape-string-regexp-2.0.0" + ]; + }) + sources."statuses-1.5.0" + sources."stoppable-1.1.0" + sources."string-width-4.2.3" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.1" + sources."strip-json-comments-2.0.1" + sources."supports-color-7.2.0" + sources."tar-fs-2.1.1" + sources."tar-stream-2.2.0" + (sources."tcp-port-used-1.0.2" // { + dependencies = [ + sources."debug-4.3.1" + ]; + }) + sources."text-encoding-utf-8-1.0.2" + sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.1" + sources."tr46-0.0.3" + sources."tslib-1.14.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-1.0.3" + sources."type-detect-4.0.8" + sources."type-fest-0.20.2" + sources."typedarray-to-buffer-3.1.5" + sources."u2f-api-0.2.7" + sources."u3-0.1.1" + sources."unique-string-2.0.0" + sources."update-notifier-5.1.0" + sources."url-parse-lax-3.0.0" + (sources."usb-1.9.2" // { + dependencies = [ + sources."node-addon-api-4.3.0" + ]; + }) + sources."util-deprecate-1.0.2" + sources."uuid-8.3.2" + sources."v8flags-3.2.0" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + sources."wide-align-1.1.5" + sources."widest-line-3.1.0" + sources."wrap-ansi-7.0.0" + sources."wrappy-1.0.2" + sources."write-file-atomic-3.0.3" + sources."xdg-basedir-4.0.0" + 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 = "General purpose command line tools for interacting with NEAR Protocol"; + homepage = "https://github.com/near/near-cli#readme"; + license = "(MIT AND Apache-2.0)"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; neovim = nodeEnv.buildNodePackage { name = "neovim"; packageName = "neovim"; @@ -108659,14 +112525,14 @@ in sha512 = "H46Jl2bh/LAFJsitv2MiIK3oCxvQnEK9t3efNMUUkKzsTYlLIikVxGWVk/vJnHzvxoHYBIRB/KHwPAOm+9UStg=="; }; dependencies = [ - sources."@dabh/diagnostics-2.0.2" - sources."@msgpack/msgpack-2.7.1" + sources."@colors/colors-1.5.0" + sources."@dabh/diagnostics-2.0.3" + sources."@msgpack/msgpack-2.7.2" sources."async-3.2.3" sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.9.0" - sources."colors-1.4.0" sources."colorspace-1.1.4" sources."enabled-2.0.0" sources."fecha-4.2.1" @@ -108675,13 +112541,13 @@ in sources."is-arrayish-0.3.2" sources."is-stream-2.0.1" sources."kuler-2.0.0" - sources."logform-2.3.2" + sources."logform-2.4.0" sources."lru-cache-6.0.0" sources."ms-2.1.3" sources."one-time-1.0.0" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-1.1.1" + sources."safe-stable-stringify-2.3.1" sources."semver-7.3.5" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" @@ -108690,7 +112556,7 @@ in sources."triple-beam-1.3.0" sources."util-deprecate-1.0.2" sources."winston-3.3.3" - sources."winston-transport-4.4.2" + sources."winston-transport-4.5.0" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -108728,32 +112594,32 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "8.4.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz"; - sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.0.0.tgz"; + sha512 = "Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw=="; }; dependencies = [ - sources."@gar/promisify-1.1.2" - sources."@npmcli/fs-1.1.0" + sources."@gar/promisify-1.1.3" + sources."@npmcli/fs-2.1.0" sources."@npmcli/move-file-1.1.2" - sources."@tootallnate/once-1.1.2" + sources."@tootallnate/once-2.0.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ansi-regex-5.0.1" sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" + sources."are-we-there-yet-3.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."cacache-15.3.0" + sources."cacache-16.0.3" sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."color-support-1.1.3" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."delegates-1.0.0" sources."depd-1.1.2" sources."emoji-regex-8.0.0" @@ -108762,12 +112628,12 @@ in sources."err-code-2.0.3" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."gauge-4.0.0" + sources."gauge-4.0.3" sources."glob-7.2.0" sources."graceful-fs-4.2.9" sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.0" - sources."http-proxy-agent-4.0.1" + sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" @@ -108780,21 +112646,21 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" - sources."lru-cache-6.0.0" - sources."make-fetch-happen-9.1.0" - sources."minimatch-3.0.4" + sources."lru-cache-7.7.1" + sources."make-fetch-happen-10.1.0" + sources."minimatch-3.1.2" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" + sources."minipass-fetch-2.1.0" 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.2" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."nopt-5.0.0" - sources."npmlog-6.0.0" + sources."npmlog-6.0.1" sources."once-1.4.0" sources."p-map-4.0.0" sources."path-is-absolute-1.0.1" @@ -108805,11 +112671,15 @@ in sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.5" + (sources."semver-7.3.5" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-6.1.1" sources."ssri-8.0.1" sources."string-width-4.2.3" @@ -108862,7 +112732,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."after-0.8.2" sources."ajv-4.11.8" sources."ansi-regex-2.1.1" @@ -108882,12 +112752,12 @@ in sources."biased-opener-0.2.8" sources."big-integer-1.6.51" sources."block-stream-0.0.9" - sources."body-parser-1.19.1" + sources."body-parser-1.19.2" sources."boom-2.10.1" sources."bplist-parser-0.1.1" sources."brace-expansion-1.1.11" sources."browser-launcher2-0.4.6" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."caseless-0.12.0" @@ -108899,7 +112769,7 @@ in sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."cryptiles-2.0.5" @@ -108924,7 +112794,7 @@ in sources."error-ex-1.3.2" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."express-4.17.2" + sources."express-4.17.3" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."finalhandler-1.1.2" @@ -108992,14 +112862,14 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."nan-2.15.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" (sources."node-pre-gyp-0.6.39" // { dependencies = [ sources."glob-7.2.0" @@ -109035,9 +112905,9 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."punycode-1.4.1" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" sources."rc-1.2.8" sources."read-pkg-1.1.0" sources."read-pkg-up-1.0.1" @@ -109053,7 +112923,7 @@ in sources."qs-6.4.1" ]; }) - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."rimraf-2.2.8" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -109072,7 +112942,7 @@ in sources."serve-static-1.14.2" sources."set-blocking-2.0.0" sources."setprototypeof-1.2.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sntp-1.0.9" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -109196,11 +113066,11 @@ in sources."ini-1.3.8" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."ms-2.1.3" sources."needle-2.9.1" sources."nopt-4.0.3" @@ -109224,7 +113094,7 @@ in sources."sax-1.2.4" sources."semver-5.7.1" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -109252,43 +113122,50 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "2.1.6"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-2.1.6.tgz"; - sha512 = "R65ZWxAnZtcPfvDtc/+pk5ilb8CoT4TYc0Ze5TRvewsC56TcwHfka8t1pFvXsc855GbcD4Ky49hfocwZTuJXMA=="; + url = "https://registry.npmjs.org/node-red/-/node-red-2.2.2.tgz"; + sha512 = "DAx4v9/W2MEBb/tHNO94bmjeELdAg7CVZlPJX+UBH1RsmXB0q/3ZYW1Zi55NVMVN/0sBBO1g+dI/L0NWCG8s9A=="; }; dependencies = [ - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.8" sources."@mapbox/node-pre-gyp-1.0.8" - sources."@node-red/editor-api-2.1.6" - sources."@node-red/editor-client-2.1.6" - (sources."@node-red/nodes-2.1.6" // { + sources."@node-red/editor-api-2.2.2" + sources."@node-red/editor-client-2.2.2" + (sources."@node-red/nodes-2.2.2" // { dependencies = [ + sources."bytes-3.1.2" + sources."cookie-0.4.2" sources."iconv-lite-0.6.3" sources."media-typer-1.1.0" + (sources."raw-body-2.4.3" // { + dependencies = [ + sources."iconv-lite-0.4.24" + ]; + }) ]; }) - sources."@node-red/registry-2.1.6" - sources."@node-red/runtime-2.1.6" - sources."@node-red/util-2.1.6" - sources."@sindresorhus/is-4.3.0" + sources."@node-red/registry-2.2.2" + sources."@node-red/runtime-2.2.2" + sources."@node-red/util-2.2.2" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.3" - sources."@types/node-17.0.10" + sources."@types/keyv-3.1.4" + sources."@types/node-17.0.23" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."acorn-8.7.0" sources."acorn-walk-8.2.0" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."ajv-8.8.2" + sources."ajv-8.10.0" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.1" sources."append-field-1.0.0" @@ -109304,7 +113181,7 @@ in sources."async-0.1.22" sources."async-mutex-0.3.2" sources."asynckit-0.4.0" - sources."axios-0.22.0" + sources."axios-0.26.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { @@ -109375,7 +113252,7 @@ in sources."dicer-0.2.5" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" sources."domutils-2.8.0" (sources."duplexify-4.1.2" // { dependencies = [ @@ -109400,7 +113277,7 @@ in }) sources."fast-deep-equal-3.1.3" sources."finalhandler-1.1.2" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" @@ -109432,11 +113309,11 @@ in sources."http2-wrapper-1.0.3" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."i18next-21.6.6" + sources."i18next-21.6.11" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."inflight-1.0.6" @@ -109450,13 +113327,13 @@ in sources."json-buffer-3.0.1" sources."json-schema-traverse-1.0.0" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.8.5" + sources."jsonata-1.8.6" (sources."jsonfile-6.1.0" // { dependencies = [ sources."universalify-2.0.0" ]; }) - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."leven-2.1.0" sources."lodash.clonedeep-4.5.0" sources."lowercase-keys-2.0.0" @@ -109467,20 +113344,20 @@ in ]; }) sources."media-typer-0.3.0" - (sources."memorystore-1.6.6" // { + (sources."memorystore-1.6.7" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."mime-2.5.2" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-3.0.0" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" (sources."minipass-3.1.6" // { dependencies = [ sources."yallist-4.0.0" @@ -109491,42 +113368,41 @@ in sources."yallist-4.0.0" ]; }) - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."moment-2.29.1" sources."moment-timezone-0.5.34" - (sources."mqtt-4.3.4" // { + (sources."mqtt-4.3.5" // { dependencies = [ sources."concat-stream-2.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."lru-cache-6.0.0" sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.5.6" sources."yallist-4.0.0" ]; }) (sources."mqtt-packet-6.10.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."ms-2.0.0" - sources."multer-1.4.3" + sources."multer-1.4.4" sources."mustache-4.2.0" sources."mute-stream-0.0.8" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-addon-api-3.2.1" sources."node-fetch-2.6.7" - sources."node-red-admin-2.2.1" + sources."node-red-admin-2.2.3" sources."nopt-5.0.0" sources."normalize-url-6.1.0" sources."npmlog-5.0.1" sources."nth-check-2.0.1" - (sources."number-allocator-1.0.9" // { + (sources."number-allocator-1.0.10" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -109585,7 +113461,7 @@ in sources."serve-static-1.14.2" sources."set-blocking-2.0.0" sources."setprototypeof-1.2.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."split2-3.2.2" // { dependencies = [ sources."readable-stream-3.6.0" @@ -109611,7 +113487,7 @@ in sources."tslib-2.3.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.1" sources."uid-safe-2.1.5" sources."uid2-0.0.4" sources."universalify-0.1.2" @@ -109625,7 +113501,7 @@ in sources."whatwg-url-5.0.0" sources."wide-align-1.1.5" sources."wrappy-1.0.2" - sources."ws-7.5.1" + sources."ws-7.5.6" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xtend-4.0.2" @@ -109717,10 +113593,10 @@ in sources."jsonfile-1.0.1" sources."jsprim-1.4.2" sources."lru-cache-6.0.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minipass-3.1.6" sources."minizlib-2.1.2" sources."mkdirp-0.3.5" @@ -109744,7 +113620,7 @@ in }) (sources."npmconf-2.1.3" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."once-1.3.3" sources."semver-4.3.6" ]; @@ -109772,14 +113648,14 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."retry-0.10.1" sources."rimraf-2.2.8" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slasp-0.0.4" sources."slide-1.1.6" sources."spdx-correct-3.1.1" @@ -109803,7 +113679,7 @@ in }) (sources."temp-0.9.4" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."rimraf-2.6.3" ]; }) @@ -109926,8 +113802,8 @@ in ]; }) sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."ms-2.1.3" sources."nopt-1.0.10" sources."normalize-path-3.0.0" @@ -109959,7 +113835,7 @@ in sources."semver-6.3.0" ]; }) - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" @@ -109997,10 +113873,10 @@ in np = nodeEnv.buildNodePackage { name = "np"; packageName = "np"; - version = "7.6.0"; + version = "7.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/np/-/np-7.6.0.tgz"; - sha512 = "WWGZtfNkE6MEkI7LE8NtG7poTqzTHj/tssBzcPnBAdMVPXkXDtX2wk0ptrj8YZ3u4TFmGSqioSohdud86aJxSg=="; + url = "https://registry.npmjs.org/np/-/np-7.6.1.tgz"; + sha512 = "EHr5PtMPzNmkM/trnWQWTKAogJnVP1RzTFfIyvPK2COvLN6Vqut4gFXuWNng15xuqnTgmUPzKYbpQAZsYR+Dkw=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -110028,9 +113904,9 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.3" + sources."@types/keyv-3.1.4" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -110172,7 +114048,7 @@ in (sources."inquirer-autosubmit-prompt-0.2.0" // { dependencies = [ sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."cli-cursor-2.1.0" @@ -110194,7 +114070,7 @@ in }) (sources."strip-ansi-5.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" ]; }) sources."supports-color-5.5.0" @@ -110233,7 +114109,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.0.5" + sources."keyv-4.1.1" sources."kind-of-6.0.3" sources."latest-version-5.1.0" sources."lines-and-columns-1.2.4" @@ -110302,12 +114178,12 @@ in }) sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."mimic-fn-1.2.0" sources."mimic-response-2.1.0" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minimist-options-4.1.0" sources."mute-stream-0.0.8" (sources."new-github-release-url-1.0.0" // { @@ -110340,7 +114216,7 @@ in sources."os-tmpdir-1.0.2" (sources."ow-0.21.0" // { dependencies = [ - sources."@sindresorhus/is-4.3.0" + sources."@sindresorhus/is-4.6.0" sources."type-fest-0.20.2" ]; }) @@ -110431,7 +114307,7 @@ in sources."redent-3.0.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" (sources."resolve-cwd-3.0.0" // { dependencies = [ sources."resolve-from-5.0.0" @@ -110455,7 +114331,7 @@ in }) sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."slice-ansi-0.0.4" sources."spdx-correct-3.1.1" @@ -110497,7 +114373,7 @@ in sources."widest-line-3.1.0" (sources."wrap-ansi-3.0.1" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" @@ -110524,10 +114400,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "8.3.2"; + version = "8.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-8.3.2.tgz"; - sha512 = "xZAC9GpWNOyiS1TtBqBy0HJpjIVI8zsVXEOEwcmgqYFtqOy7sXUL0ByOrkhfcGmf+akSXz3uOxLYB8aLlYivQQ=="; + url = "https://registry.npmjs.org/npm/-/npm-8.5.5.tgz"; + sha512 = "a1vl26nokCNlD+my/iNYmOUPx/hpYR4ZyZk8gb7/A2XXtrPZf2gTSJOnVjS77jQS+BSfIVQpipZwXWCL0+5wzg=="; }; buildInputs = globalBuildInputs; meta = { @@ -110542,44 +114418,52 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "12.2.1"; + version = "12.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.2.1.tgz"; - sha512 = "fqfH2USwTLgho8HaC79i5Bl+RH3zV15AbdtJQTCaOAp9L3D2W8k+jsfuwee2vSTUrt6IUTXPbzwUIYo4/TQdYA=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-12.5.4.tgz"; + sha512 = "4+27zaTdieWgvPLaCZ/A6Q2WC1cYVcrc2SqVmLFYgkWBrKw1QkwpeV16FSvkFGZr3OdFyr7Dpjw8JRn4H2QxFw=="; }; dependencies = [ - sources."@gar/promisify-1.1.2" + sources."@gar/promisify-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."@npmcli/fs-1.1.0" - sources."@npmcli/git-2.1.0" + sources."@npmcli/fs-2.1.0" + (sources."@npmcli/git-3.0.0" // { + dependencies = [ + sources."lru-cache-7.7.1" + ]; + }) sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.3" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-2.0.0" + sources."@npmcli/run-script-3.0.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tootallnate/once-1.1.2" + sources."@tootallnate/once-2.0.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."agentkeepalive-4.2.0" + sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" + sources."are-we-there-yet-3.0.0" sources."argparse-2.0.1" sources."array-union-2.1.0" sources."balanced-match-1.0.2" sources."boxen-5.1.2" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."buffer-from-1.1.2" sources."builtins-1.0.3" - sources."cacache-15.3.0" + (sources."cacache-16.0.3" // { + dependencies = [ + sources."lru-cache-7.7.1" + ]; + }) (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -110599,12 +114483,12 @@ in sources."color-name-1.1.4" sources."color-support-1.1.3" sources."colors-1.0.3" - sources."commander-8.3.0" + sources."commander-9.1.0" sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" sources."crypto-random-string-2.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" @@ -110628,10 +114512,16 @@ in sources."fp-and-or-0.1.3" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."gauge-4.0.0" + sources."function-bind-1.1.1" + sources."gauge-4.0.3" sources."get-stdin-8.0.0" sources."get-stream-4.1.0" - sources."glob-7.2.0" + (sources."glob-7.2.0" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" + ]; + }) sources."glob-parent-5.1.2" (sources."global-dirs-3.0.0" // { dependencies = [ @@ -110641,17 +114531,23 @@ in sources."globby-11.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.9" + sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" sources."hosted-git-info-4.1.0" sources."http-cache-semantics-4.1.0" - sources."http-proxy-agent-4.0.1" + sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" sources."ignore-5.2.0" - sources."ignore-walk-4.0.1" + (sources."ignore-walk-4.0.1" // { + dependencies = [ + sources."brace-expansion-1.1.11" + sources."minimatch-3.1.2" + ]; + }) sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" @@ -110661,6 +114557,7 @@ in sources."ini-1.3.8" sources."ip-1.1.5" sources."is-ci-2.0.0" + sources."is-core-module-2.8.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -110678,7 +114575,7 @@ in sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" sources."json-parse-helpfulerror-1.0.3" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."jsonlines-0.1.1" sources."jsonparse-1.3.1" sources."keyv-3.1.0" @@ -110702,15 +114599,19 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-9.1.0" + (sources."make-fetch-happen-10.1.0" // { + dependencies = [ + sources."lru-cache-7.7.1" + ]; + }) sources."merge2-1.4.1" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-5.0.1" + sources."minimist-1.2.6" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" + sources."minipass-fetch-2.1.0" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -110718,18 +114619,29 @@ in sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."negotiator-0.6.2" - sources."node-gyp-8.4.1" + sources."negotiator-0.6.3" + sources."node-gyp-9.0.0" sources."nopt-5.0.0" + (sources."normalize-package-data-4.0.0" // { + dependencies = [ + sources."hosted-git-info-5.0.0" + sources."lru-cache-7.7.1" + ]; + }) sources."normalize-url-4.5.1" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-8.1.5" - sources."npm-packlist-3.0.0" - sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-11.0.0" - sources."npmlog-6.0.0" + (sources."npm-package-arg-9.0.1" // { + dependencies = [ + sources."hosted-git-info-5.0.0" + sources."lru-cache-7.7.1" + ]; + }) + sources."npm-packlist-4.0.0" + sources."npm-pick-manifest-7.0.0" + sources."npm-registry-fetch-13.1.0" + sources."npmlog-6.0.1" sources."once-1.4.0" sources."p-cancelable-1.1.0" sources."p-limit-3.1.0" @@ -110741,13 +114653,14 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-12.0.2" + sources."pacote-13.0.5" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."prepend-http-2.0.0" + sources."proc-log-2.0.0" sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" @@ -110757,6 +114670,7 @@ in sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."rc-config-loader-4.0.0" + sources."read-package-json-5.0.0" sources."read-package-json-fast-2.0.3" sources."readable-stream-3.6.0" sources."registry-auth-token-4.2.1" @@ -110778,15 +114692,19 @@ in }) sources."semver-utils-1.1.4" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-6.1.1" sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."spawn-please-1.0.0" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.11" sources."ssri-8.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -110804,6 +114722,7 @@ in sources."update-notifier-5.1.0" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" + sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."which-2.0.2" sources."wide-align-1.1.5" @@ -110813,6 +114732,7 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."yallist-4.0.0" + sources."yaml-1.10.2" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -110857,7 +114777,7 @@ in sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" + sources."are-we-there-yet-3.0.0" sources."argparse-0.1.15" sources."asn1-0.2.6" sources."assert-plus-1.0.0" @@ -110905,10 +114825,10 @@ in (sources."fstream-0.1.31" // { dependencies = [ sources."graceful-fs-3.0.12" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" ]; }) - sources."gauge-4.0.0" + sources."gauge-4.0.3" sources."getpass-0.1.7" sources."glob-7.2.0" sources."graceful-fs-2.0.3" @@ -110928,10 +114848,10 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.2" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mkdirp-0.3.5" sources."natives-1.1.6" sources."ncp-0.4.2" @@ -110948,7 +114868,7 @@ in sources."semver-2.3.2" ]; }) - sources."npmlog-6.0.0" + sources."npmlog-6.0.1" sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."osenv-0.0.3" @@ -110966,7 +114886,7 @@ in sources."safer-buffer-2.1.2" sources."semver-4.3.6" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slide-1.1.6" sources."sshpk-1.17.0" sources."string-width-4.2.3" @@ -111051,8 +114971,8 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.2" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."npm-7.24.2" sources."oauth-sign-0.9.0" sources."only-0.0.2" @@ -111102,7 +115022,7 @@ in sources."inherits-2.0.4" sources."lodash-4.17.5" sources."lokijs-1.5.3" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."pegjs-0.10.0" @@ -111133,29 +115053,29 @@ in sha512 = "hpku8mW67U6PXQIenW6NBbphBOMb8XzW6B9r093DUhYj5GN2FUB/CXCiz5hKoPYUsusZ35BpProH8AUF9bh5IQ=="; }; dependencies = [ + sources."@ampproject/remapping-2.1.2" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.12" // { + sources."@babel/compat-data-7.17.7" + (sources."@babel/core-7.17.8" // { dependencies = [ - sources."json5-2.2.0" + sources."json5-2.2.1" sources."semver-6.3.0" - sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.16.8" // { + (sources."@babel/generator-7.17.7" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - (sources."@babel/helper-compilation-targets-7.16.7" // { + (sources."@babel/helper-compilation-targets-7.17.7" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.10" - sources."@babel/helper-create-regexp-features-plugin-7.16.7" + sources."@babel/helper-create-class-features-plugin-7.17.6" + sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ sources."semver-6.3.0" @@ -111166,34 +115086,34 @@ in sources."@babel/helper-function-name-7.16.7" sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-member-expression-to-functions-7.16.7" + sources."@babel/helper-member-expression-to-functions-7.17.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.7" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" sources."@babel/helper-replace-supers-7.16.7" - sources."@babel/helper-simple-access-7.16.7" + sources."@babel/helper-simple-access-7.17.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.8" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.8" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" sources."@babel/plugin-proposal-json-strings-7.16.7" sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/plugin-proposal-object-rest-spread-7.17.3" sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" sources."@babel/plugin-proposal-optional-chaining-7.16.7" sources."@babel/plugin-proposal-private-methods-7.16.11" @@ -111221,7 +115141,7 @@ in sources."@babel/plugin-transform-block-scoping-7.16.7" sources."@babel/plugin-transform-classes-7.16.7" sources."@babel/plugin-transform-computed-properties-7.16.7" - sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-destructuring-7.17.7" sources."@babel/plugin-transform-dotall-regex-7.16.7" sources."@babel/plugin-transform-duplicate-keys-7.16.7" sources."@babel/plugin-transform-exponentiation-operator-7.16.7" @@ -111231,15 +115151,15 @@ in sources."@babel/plugin-transform-literals-7.16.7" sources."@babel/plugin-transform-member-expression-literals-7.16.7" sources."@babel/plugin-transform-modules-amd-7.16.7" - sources."@babel/plugin-transform-modules-commonjs-7.16.8" - sources."@babel/plugin-transform-modules-systemjs-7.16.7" + sources."@babel/plugin-transform-modules-commonjs-7.17.7" + sources."@babel/plugin-transform-modules-systemjs-7.17.8" sources."@babel/plugin-transform-modules-umd-7.16.7" sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" sources."@babel/plugin-transform-new-target-7.16.7" sources."@babel/plugin-transform-object-super-7.16.7" sources."@babel/plugin-transform-parameters-7.16.7" sources."@babel/plugin-transform-property-literals-7.16.7" - sources."@babel/plugin-transform-react-jsx-7.16.7" + sources."@babel/plugin-transform-react-jsx-7.17.3" sources."@babel/plugin-transform-regenerator-7.16.7" sources."@babel/plugin-transform-reserved-words-7.16.7" sources."@babel/plugin-transform-shorthand-properties-7.16.7" @@ -111255,11 +115175,14 @@ in ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/runtime-7.16.7" + sources."@babel/runtime-7.17.8" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.3" + sources."@babel/types-7.17.0" sources."@iarna/toml-2.2.5" + sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/sourcemap-codec-1.4.11" + sources."@jridgewell/trace-mapping-0.3.4" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@parcel/fs-1.11.0" @@ -111278,7 +115201,7 @@ in sources."acorn-walk-6.2.0" sources."ajv-6.12.6" sources."alphanum-sort-1.0.2" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."ansi-to-html-0.6.15" (sources."anymatch-2.0.0" // { @@ -111318,7 +115241,7 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-corejs3-0.5.2" sources."babel-plugin-polyfill-regenerator-0.3.1" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -111363,7 +115286,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.19.1" + sources."browserslist-4.20.2" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -111380,7 +115303,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001320" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -111406,7 +115329,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.20.3" // { + (sources."core-js-compat-3.21.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -111463,7 +115386,7 @@ in sources."dashdash-1.14.1" sources."data-urls-1.1.0" sources."deasync-0.1.24" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.4" (sources."defaults-1.0.3" // { @@ -111489,9 +115412,9 @@ in ]; }) sources."delayed-stream-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."des.js-1.0.1" - sources."destroy-1.0.4" + sources."destroy-1.2.0" (sources."diffie-hellman-5.0.3" // { dependencies = [ sources."bn.js-4.12.0" @@ -111505,7 +115428,7 @@ in sources."domain-browser-1.2.0" sources."domelementtype-1.3.1" sources."domexception-1.0.1" - (sources."domhandler-4.3.0" // { + (sources."domhandler-4.3.1" // { dependencies = [ sources."domelementtype-2.2.0" ]; @@ -111517,7 +115440,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.96" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -111601,7 +115524,7 @@ in }) sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -111624,10 +115547,11 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.9" // { dependencies = [ + sources."acorn-8.7.0" sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" sources."source-map-0.7.3" - sources."terser-5.10.0" + sources."terser-5.12.1" ]; }) (sources."htmlparser2-6.1.0" // { @@ -111637,7 +115561,7 @@ in sources."domutils-2.8.0" ]; }) - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-signature-1.2.0" sources."https-browserify-1.0.0" sources."iconv-lite-0.4.24" @@ -111753,19 +115677,19 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."nan-2.15.0" (sources."nanomatch-1.2.13" // { @@ -111784,7 +115708,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -111799,7 +115723,7 @@ in sources."object.getownpropertydescriptors-2.1.3" sources."object.pick-1.3.0" sources."object.values-1.1.5" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."once-1.4.0" sources."onetime-2.0.1" sources."opn-5.5.0" @@ -111931,7 +115855,7 @@ in }) sources."readdirp-2.2.1" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-9.0.0" + sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { @@ -111940,9 +115864,9 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexpu-core-4.8.0" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.7.0" // { + sources."regexpu-core-5.0.1" + sources."regjsgen-0.6.0" + (sources."regjsparser-0.8.4" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -111954,7 +115878,7 @@ in sources."request-2.88.2" sources."request-promise-core-1.1.4" sources."request-promise-native-1.0.9" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -111969,7 +115893,7 @@ in sources."sax-1.2.4" sources."saxes-3.1.11" sources."semver-5.7.1" - (sources."send-0.17.2" // { + (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ @@ -111980,7 +115904,7 @@ in ]; }) sources."serialize-to-js-3.1.1" - sources."serve-static-1.14.2" + sources."serve-static-1.15.0" sources."set-value-2.0.1" sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" @@ -111993,7 +115917,7 @@ in sources."object-inspect-1.12.0" ]; }) - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."simple-swizzle-0.2.2" // { dependencies = [ sources."is-arrayish-0.3.2" @@ -112034,7 +115958,7 @@ in }) sources."static-extend-0.1.2" sources."static-module-2.2.5" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."stealthy-require-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" @@ -112154,6 +116078,208 @@ in bypassCache = true; reconstructLock = true; }; + parcel = nodeEnv.buildNodePackage { + name = "parcel"; + packageName = "parcel"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parcel/-/parcel-2.4.0.tgz"; + sha512 = "dPWpu4RnxG9HqiLvaF8COEWEnT/KrigrC6PyPaQ0zEgpBfp7/jzXZFBVaZk2N+lpvrbNEYMjN9bv5UQGJJszIw=="; + }; + dependencies = [ + sources."@babel/code-frame-7.16.7" + sources."@babel/helper-validator-identifier-7.16.7" + (sources."@babel/highlight-7.16.10" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@parcel/bundler-default-2.4.0" + sources."@parcel/cache-2.4.0" + sources."@parcel/codeframe-2.4.0" + sources."@parcel/compressor-raw-2.4.0" + sources."@parcel/config-default-2.4.0" + sources."@parcel/core-2.4.0" + sources."@parcel/css-1.7.3" + sources."@parcel/css-darwin-arm64-1.7.3" + sources."@parcel/css-darwin-x64-1.7.3" + sources."@parcel/css-linux-arm-gnueabihf-1.7.3" + sources."@parcel/css-linux-arm64-gnu-1.7.3" + sources."@parcel/css-linux-arm64-musl-1.7.3" + sources."@parcel/css-linux-x64-gnu-1.7.3" + sources."@parcel/css-linux-x64-musl-1.7.3" + sources."@parcel/css-win32-x64-msvc-1.7.3" + sources."@parcel/diagnostic-2.4.0" + sources."@parcel/events-2.4.0" + sources."@parcel/fs-2.4.0" + sources."@parcel/fs-search-2.4.0" + sources."@parcel/graph-2.4.0" + sources."@parcel/hash-2.4.0" + sources."@parcel/logger-2.4.0" + sources."@parcel/markdown-ansi-2.4.0" + sources."@parcel/namer-default-2.4.0" + sources."@parcel/node-resolver-core-2.4.0" + sources."@parcel/optimizer-css-2.4.0" + sources."@parcel/optimizer-htmlnano-2.4.0" + sources."@parcel/optimizer-image-2.4.0" + sources."@parcel/optimizer-svgo-2.4.0" + sources."@parcel/optimizer-terser-2.4.0" + sources."@parcel/package-manager-2.4.0" + sources."@parcel/packager-css-2.4.0" + sources."@parcel/packager-html-2.4.0" + sources."@parcel/packager-js-2.4.0" + sources."@parcel/packager-raw-2.4.0" + sources."@parcel/packager-svg-2.4.0" + sources."@parcel/plugin-2.4.0" + sources."@parcel/reporter-cli-2.4.0" + sources."@parcel/reporter-dev-server-2.4.0" + sources."@parcel/resolver-default-2.4.0" + sources."@parcel/runtime-browser-hmr-2.4.0" + sources."@parcel/runtime-js-2.4.0" + sources."@parcel/runtime-react-refresh-2.4.0" + sources."@parcel/runtime-service-worker-2.4.0" + sources."@parcel/source-map-2.0.2" + sources."@parcel/transformer-babel-2.4.0" + sources."@parcel/transformer-css-2.4.0" + (sources."@parcel/transformer-html-2.4.0" // { + dependencies = [ + sources."posthtml-parser-0.10.2" + ]; + }) + sources."@parcel/transformer-image-2.4.0" + sources."@parcel/transformer-js-2.4.0" + sources."@parcel/transformer-json-2.4.0" + sources."@parcel/transformer-postcss-2.4.0" + (sources."@parcel/transformer-posthtml-2.4.0" // { + dependencies = [ + sources."posthtml-parser-0.10.2" + ]; + }) + sources."@parcel/transformer-raw-2.4.0" + sources."@parcel/transformer-react-refresh-wrap-2.4.0" + (sources."@parcel/transformer-svg-2.4.0" // { + dependencies = [ + sources."posthtml-parser-0.10.2" + ]; + }) + sources."@parcel/types-2.4.0" + sources."@parcel/utils-2.4.0" + sources."@parcel/watcher-2.0.5" + sources."@parcel/workers-2.4.0" + sources."@swc/helpers-0.3.8" + sources."@trysound/sax-0.2.0" + sources."@types/parse-json-4.0.0" + sources."abortcontroller-polyfill-1.7.3" + sources."acorn-8.7.0" + sources."ansi-styles-3.2.1" + sources."base-x-3.0.9" + sources."boolbase-1.0.0" + sources."browserslist-4.20.2" + sources."buffer-from-1.1.2" + sources."callsites-3.1.0" + sources."caniuse-lite-1.0.30001320" + (sources."chalk-4.1.2" // { + dependencies = [ + sources."ansi-styles-4.3.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."chrome-trace-event-1.0.3" + sources."clone-2.1.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."commander-7.2.0" + sources."cosmiconfig-7.0.1" + sources."css-select-4.2.1" + sources."css-tree-1.1.3" + sources."css-what-5.1.0" + sources."csso-4.2.0" + sources."detect-libc-1.0.3" + (sources."dom-serializer-1.3.2" // { + dependencies = [ + sources."entities-2.2.0" + ]; + }) + sources."domelementtype-2.2.0" + sources."domhandler-4.3.1" + sources."domutils-2.8.0" + sources."dotenv-7.0.0" + sources."dotenv-expand-5.1.0" + sources."electron-to-chromium-1.4.96" + sources."entities-3.0.1" + sources."error-ex-1.3.2" + sources."escalade-3.1.1" + sources."escape-string-regexp-1.0.5" + sources."get-port-4.2.0" + sources."globals-13.13.0" + sources."has-flag-3.0.0" + sources."htmlnano-2.0.0" + sources."htmlparser2-7.2.0" + sources."import-fresh-3.3.0" + sources."is-arrayish-0.2.1" + sources."is-json-2.0.1" + sources."js-tokens-4.0.0" + sources."json-parse-even-better-errors-2.3.1" + sources."json-source-map-0.6.1" + sources."json5-2.2.1" + sources."lines-and-columns-1.2.4" + sources."lmdb-2.2.4" + sources."mdn-data-2.0.14" + sources."msgpackr-1.5.5" + sources."msgpackr-extract-1.0.16" + sources."nan-2.15.0" + sources."node-addon-api-3.2.1" + sources."node-gyp-build-4.3.0" + sources."node-releases-2.0.2" + sources."nth-check-2.0.1" + sources."nullthrows-1.1.1" + sources."ordered-binary-1.2.4" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" + sources."path-type-4.0.0" + sources."picocolors-1.0.0" + sources."postcss-value-parser-4.2.0" + sources."posthtml-0.16.6" + sources."posthtml-parser-0.11.0" + sources."posthtml-render-3.0.0" + sources."react-refresh-0.9.0" + sources."regenerator-runtime-0.13.9" + sources."resolve-from-4.0.0" + sources."safe-buffer-5.2.1" + sources."semver-5.7.1" + sources."source-map-0.6.1" + sources."source-map-support-0.5.21" + sources."stable-0.1.8" + sources."supports-color-5.5.0" + sources."svgo-2.8.0" + sources."term-size-2.2.1" + (sources."terser-5.12.1" // { + dependencies = [ + sources."commander-2.20.3" + sources."source-map-0.7.3" + ]; + }) + sources."timsort-0.3.0" + sources."type-fest-0.20.2" + sources."utility-types-3.10.0" + sources."v8-compile-cache-2.3.0" + sources."weak-lru-cache-1.2.2" + sources."xxhash-wasm-0.4.2" + sources."yaml-1.10.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Blazing fast, zero configuration web application bundler"; + homepage = "https://github.com/parcel-bundler/parcel#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; parsoid = nodeEnv.buildNodePackage { name = "parsoid"; packageName = "parsoid"; @@ -112163,13 +116289,13 @@ in sha512 = "t29ujC7jgKzuA25yXritkuF/rFGduN08c2CLOeSAjlKAzc/BUamZgvPWFqU/UVSRubnMYawJIQDX3m/RqKz7Xw=="; }; dependencies = [ - (sources."accepts-1.3.7" // { + (sources."accepts-1.3.8" // { dependencies = [ - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" ]; }) sources."ajv-6.12.6" - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."array-flatten-1.1.1" @@ -112187,16 +116313,16 @@ in sources."bintrees-1.0.1" sources."bl-1.2.3" sources."bluebird-3.7.2" - (sources."body-parser-1.19.1" // { + (sources."body-parser-1.19.2" // { dependencies = [ - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."content-type-1.0.4" ]; }) sources."brace-expansion-1.1.11" sources."bunyan-1.8.15" sources."bunyan-syslog-udp-0.2.0" - sources."busboy-1.4.0" + sources."busboy-1.5.0" sources."bytes-3.0.0" sources."call-bind-1.0.2" sources."camelcase-5.3.1" @@ -112217,7 +116343,7 @@ in ]; }) sources."content-type-git+https://github.com/wikimedia/content-type.git#master" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."core-js-2.6.12" sources."core-util-is-1.0.2" @@ -112241,9 +116367,10 @@ in sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" - (sources."express-4.17.2" // { + (sources."express-4.17.3" // { dependencies = [ sources."content-type-1.0.4" + sources."finalhandler-1.1.2" sources."safe-buffer-5.2.1" ]; }) @@ -112253,7 +116380,12 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."file-uri-to-path-1.0.0" - sources."finalhandler-1.1.2" + (sources."finalhandler-1.2.0" // { + dependencies = [ + sources."on-finished-2.4.1" + sources."statuses-2.0.1" + ]; + }) sources."find-up-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -112273,7 +116405,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hat-0.0.3" sources."heapdump-0.3.15" @@ -112309,11 +116441,11 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."moment-2.29.1" sources."ms-2.0.0" sources."msgpack5-3.6.1" @@ -112345,11 +116477,11 @@ in sources."prr-1.0.1" sources."psl-1.8.0" sources."punycode-2.1.1" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."range-parser-1.2.1" - (sources."raw-body-2.4.2" // { + (sources."raw-body-2.4.3" // { dependencies = [ - sources."bytes-3.1.1" + sources."bytes-3.1.2" ]; }) sources."readable-stream-2.3.7" @@ -112404,7 +116536,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.3" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -112481,9 +116613,9 @@ in sources."isexe-2.0.0" sources."jsonfile-4.0.0" sources."klaw-sync-6.0.0" - sources."micromatch-4.0.4" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."micromatch-4.0.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."nice-try-1.0.5" sources."once-1.4.0" sources."open-7.4.2" @@ -112598,6 +116730,7 @@ in sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" + sources."events-3.3.0" sources."external-editor-2.2.0" sources."fifo-0.1.4" sources."figures-2.0.0" @@ -112605,7 +116738,7 @@ in sources."flatten-0.0.1" (sources."fs-chunk-store-1.7.0" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" ]; }) sources."fs.realpath-1.0.0" @@ -112618,7 +116751,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hat-0.0.3" sources."hosted-git-info-2.8.9" @@ -112631,7 +116764,7 @@ in sources."ini-1.3.8" (sources."inquirer-5.2.0" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."is-fullwidth-code-point-2.0.0" @@ -112672,8 +116805,8 @@ in sources."mime-2.6.0" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mkdirp-0.3.5" sources."mkdirp-classic-0.5.3" sources."ms-2.0.0" @@ -112730,8 +116863,8 @@ in sources."pump-2.0.1" sources."queue-microtask-1.2.3" sources."queue-tick-1.0.0" - sources."random-access-file-2.2.0" - sources."random-access-storage-1.4.2" + sources."random-access-file-2.2.1" + sources."random-access-storage-1.4.3" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" sources."range-parser-1.2.1" @@ -112743,7 +116876,7 @@ in sources."redent-1.0.0" sources."regexp.prototype.flags-1.4.1" sources."repeating-2.0.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.7.1" @@ -112756,9 +116889,9 @@ in sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."server-destroy-1.0.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-2.8.1" + sources."simple-get-2.8.2" sources."simple-peer-6.4.4" sources."simple-sha1-2.1.2" (sources."simple-websocket-4.3.1" // { @@ -112837,7 +116970,7 @@ in sha512 = "NGLR8G6SP7WriloFrS5JDU8Rx1Ia1OlbJOpqGeAzMKxhrajnAdPza8VeXozMUk0oBCS8hr+cuLQ7stprgzISXg=="; }; dependencies = [ - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."addr-to-ip-port-1.5.4" sources."after-0.8.2" sources."ajv-6.12.6" @@ -112876,7 +117009,7 @@ in sources."blob-0.0.5" sources."bn.js-4.12.0" sources."bncode-0.5.3" - sources."body-parser-1.19.1" + sources."body-parser-1.19.2" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" @@ -112886,7 +117019,7 @@ in sources."buffer-equals-1.0.4" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."caseless-0.12.0" sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" @@ -112916,7 +117049,7 @@ in ]; }) sources."content-type-1.0.4" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."crc-3.8.0" @@ -112946,9 +117079,11 @@ in sources."engine.io-parser-2.2.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - (sources."express-4.17.2" // { + sources."events-3.3.0" + (sources."express-4.17.3" // { dependencies = [ sources."safe-buffer-5.2.1" + sources."serve-static-1.14.2" ]; }) sources."extend-3.0.2" @@ -113027,12 +117162,12 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" (sources."morgan-1.10.0" // { dependencies = [ @@ -113045,7 +117180,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."on-finished-2.3.0" @@ -113078,16 +117213,16 @@ in sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."queue-microtask-1.2.3" sources."queue-tick-1.0.0" - sources."random-access-file-2.2.0" - sources."random-access-storage-1.4.2" + sources."random-access-file-2.2.1" + sources."random-access-storage-1.4.3" sources."random-bytes-1.0.0" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" sources."re-emitter-1.1.4" sources."read-torrent-1.3.1" sources."readable-stream-3.6.0" @@ -113107,10 +117242,20 @@ in sources."ms-2.1.3" ]; }) - sources."serve-static-1.14.2" + (sources."serve-static-1.15.0" // { + dependencies = [ + sources."depd-2.0.0" + sources."destroy-1.2.0" + sources."http-errors-2.0.0" + sources."ms-2.1.3" + sources."on-finished-2.4.1" + sources."send-0.18.0" + sources."statuses-2.0.1" + ]; + }) sources."setprototypeof-1.2.0" sources."simple-concat-1.0.1" - sources."simple-get-2.8.1" + sources."simple-get-2.8.2" (sources."simple-peer-6.4.4" // { dependencies = [ sources."readable-stream-2.3.7" @@ -113244,7 +117389,7 @@ in sources."color-name-1.1.4" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.3" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" @@ -113299,9 +117444,9 @@ in sources."levn-0.3.0" sources."lru-cache-6.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."mimic-response-2.1.0" - sources."minimist-1.2.5" + sources."minimist-1.2.6" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" (sources."multistream-4.1.0" // { @@ -113335,15 +117480,15 @@ in sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" + sources."simple-get-3.1.1" sources."slash-3.0.0" sources."source-map-0.6.1" sources."stream-meter-1.0.4" @@ -113391,10 +117536,10 @@ in pm2 = nodeEnv.buildNodePackage { name = "pm2"; packageName = "pm2"; - version = "5.1.2"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/pm2/-/pm2-5.1.2.tgz"; - sha512 = "2nJQeCWjkN0WnTkWctaoZpqrJTiUN/Icw76IMVHHzPhr/p7yQYlEQgHzlL5IFWxO2N1HdBNXNdZft2p4HUmUcA=="; + url = "https://registry.npmjs.org/pm2/-/pm2-5.2.0.tgz"; + sha512 = "PO5hMVhQ85cTszFM++6v07Me9hPJMkFbHjkFigtMMk+La8ty2wCi2dlBTeZYJDhPUSjK8Ccltpq2buNRcyMOTw=="; }; dependencies = [ (sources."@opencensus/core-0.0.9" // { @@ -113429,6 +117574,8 @@ in }) sources."@pm2/pm2-version-check-1.0.4" sources."@tootallnate/once-1.1.2" + sources."acorn-8.7.0" + sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."amp-0.3.1" sources."amp-message-0.1.2" @@ -113455,7 +117602,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.2" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."chalk-3.0.0" sources."charm-0.1.2" sources."chokidar-3.5.3" @@ -113466,14 +117613,14 @@ in sources."concat-map-0.0.1" sources."continuation-local-storage-3.2.1" sources."core-util-is-1.0.3" - sources."cron-1.8.2" + sources."croner-4.1.97" sources."culvert-0.1.2" sources."data-uri-to-buffer-3.0.1" sources."dayjs-1.8.36" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."deep-is-0.1.4" - sources."degenerator-3.0.1" - sources."depd-1.1.2" + sources."degenerator-3.0.2" + sources."depd-2.0.0" sources."emitter-listener-1.1.2" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" @@ -113482,12 +117629,12 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."eventemitter2-5.0.1" - sources."fast-json-patch-3.1.0" + sources."fast-json-patch-3.1.1" sources."fast-levenshtein-2.0.6" sources."fclone-1.0.11" sources."file-uri-to-path-2.0.0" sources."fill-range-7.0.1" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -113501,7 +117648,7 @@ in sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -113523,11 +117670,9 @@ in sources."lodash-4.17.21" sources."log-driver-1.2.7" sources."lru-cache-5.1.1" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."mkdirp-1.0.4" sources."module-details-from-path-1.0.3" - sources."moment-2.29.1" - sources."moment-timezone-0.5.34" sources."ms-2.1.2" sources."mute-stream-0.0.8" (sources."needle-2.4.0" // { @@ -113550,22 +117695,26 @@ in sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."picomatch-2.3.1" - sources."pidusage-2.0.21" + sources."pidusage-3.0.0" sources."pm2-axon-4.0.1" sources."pm2-axon-rpc-0.7.1" sources."pm2-deploy-1.0.2" sources."pm2-multimeter-0.1.2" - sources."pm2-sysmonit-1.2.8" + (sources."pm2-sysmonit-1.2.8" // { + dependencies = [ + sources."pidusage-2.0.21" + ]; + }) sources."prelude-ls-1.1.2" sources."promptly-2.2.0" sources."proxy-agent-5.0.0" sources."proxy-from-env-1.1.0" - sources."raw-body-2.4.2" + sources."raw-body-2.5.1" sources."read-1.0.7" sources."readable-stream-1.1.14" sources."readdirp-3.6.0" sources."require-in-the-middle-5.1.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."run-series-1.1.9" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -113578,18 +117727,18 @@ in }) sources."setprototypeof-1.2.0" sources."shimmer-1.2.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."source-map-support-0.5.19" sources."sprintf-js-1.1.2" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.10.7" + sources."systeminformation-5.11.9" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tslib-2.3.1" @@ -113604,7 +117753,7 @@ in sources."async-2.6.3" ]; }) - sources."vm2-3.9.5" + sources."vm2-3.9.9" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-7.4.6" @@ -113625,10 +117774,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.27.1"; + version = "6.32.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.27.1.tgz"; - sha512 = "aW+oDXiMk9mzInmIaRv9v9+FSNkXBs60rVUO6QBpalPja0eO3J5ePSyBxAbLsuhGGbEOpwRq0aNywFq8yIi9HQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.32.3.tgz"; + sha512 = "lMQgROSwiUA+kt+suAPinjNwqevS1Iz0rppWNZ3jHhzeP07RFRQ+Ksai2OlAnM+YjlbHT9niQ4ICBVSqcdQ04w=="; }; buildInputs = globalBuildInputs; meta = { @@ -113671,13 +117820,13 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.4.5"; + version = "8.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz"; - sha512 = "jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz"; + sha512 = "lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg=="; }; dependencies = [ - sources."nanoid-3.2.0" + sources."nanoid-3.3.1" sources."picocolors-1.0.0" sources."source-map-js-1.0.2" ]; @@ -113720,7 +117869,7 @@ in sources."fast-glob-3.2.11" sources."fastq-1.13.0" sources."fill-range-7.0.1" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" sources."get-stdin-9.0.0" @@ -113734,15 +117883,15 @@ in sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."jsonfile-6.1.0" - sources."lilconfig-2.0.4" + sources."lilconfig-2.0.5" sources."merge2-1.4.1" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."normalize-path-3.0.0" sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-2.3.0" - sources."postcss-load-config-3.1.1" + sources."postcss-load-config-3.1.3" sources."postcss-reporter-7.0.5" sources."pretty-hrtime-1.0.3" sources."queue-microtask-1.2.3" @@ -113760,8 +117909,8 @@ in sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yaml-1.10.2" - sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-17.4.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -113773,13 +117922,97 @@ in bypassCache = true; reconstructLock = true; }; + prebuild-install = nodeEnv.buildNodePackage { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.0.1.tgz"; + sha512 = "QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg=="; + }; + dependencies = [ + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.7" + sources."base64-js-1.5.1" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."buffer-5.7.1" + sources."chownr-1.1.4" + sources."code-point-at-1.1.0" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.3" + sources."decompress-response-6.0.0" + sources."deep-extend-0.6.0" + sources."delegates-1.0.0" + sources."detect-libc-2.0.1" + sources."end-of-stream-1.4.4" + sources."expand-template-2.0.3" + sources."fs-constants-1.0.0" + sources."gauge-2.7.4" + sources."github-from-package-0.0.0" + sources."has-unicode-2.0.1" + sources."ieee754-1.2.1" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."is-fullwidth-code-point-1.0.0" + sources."isarray-1.0.0" + sources."lru-cache-6.0.0" + sources."mimic-response-3.1.0" + sources."minimist-1.2.6" + sources."mkdirp-classic-0.5.3" + sources."napi-build-utils-1.0.2" + sources."node-abi-3.8.0" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."process-nextick-args-2.0.1" + sources."pump-3.0.0" + sources."rc-1.2.8" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."semver-7.3.5" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.7" + sources."simple-concat-1.0.1" + sources."simple-get-4.0.1" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-fs-2.1.1" + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."util-deprecate-1.0.2" + sources."wide-align-1.1.5" + sources."wrappy-1.0.2" + sources."yallist-4.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A command line tool to easily install prebuilt binaries for multiple version of node/iojs on a specific platform"; + homepage = "https://github.com/prebuild/prebuild-install"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.5.1"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz"; - sha512 = "vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.6.1.tgz"; + sha512 = "8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A=="; }; buildInputs = globalBuildInputs; meta = { @@ -113791,6 +118024,39 @@ in bypassCache = true; reconstructLock = true; }; + prettier_d_slim = nodeEnv.buildNodePackage { + name = "prettier_d_slim"; + packageName = "prettier_d_slim"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier_d_slim/-/prettier_d_slim-1.2.0.tgz"; + sha512 = "Wq/Qida9MweJX7dKjlNeJ9Ppfeu4YPWY2947x1xev2RXjimvv2QOBRQJhGAir/QZ+WJnrU82e9O67Uqu8JgbZw=="; + }; + dependencies = [ + sources."camelize-1.0.0" + sources."core_d-3.2.0" + sources."function-bind-1.1.1" + sources."has-1.0.3" + sources."has-flag-4.0.0" + sources."is-core-module-2.8.1" + sources."minimist-1.2.6" + sources."nanolru-1.0.0" + sources."path-parse-1.0.7" + sources."prettier-2.6.1" + sources."resolve-1.22.0" + sources."supports-color-8.1.1" + sources."supports-preserve-symlinks-flag-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Makes prettier fast"; + homepage = "https://github.com/mikew/prettier_d_slim"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; prettier-plugin-toml = nodeEnv.buildNodePackage { name = "prettier-plugin-toml"; packageName = "prettier-plugin-toml"; @@ -113818,13 +118084,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "3.8.1"; + version = "3.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.8.1.tgz"; - sha512 = "Q8zHwS9m70TaD7qI8u+8hTAmiTpK+IpvRYF3Rgb/OeWGQJOMgZCFFvNCiSfoLEQ95wilK7ctW3KOpc9AuYnRUA=="; + url = "https://registry.npmjs.org/prisma/-/prisma-3.11.1.tgz"; + sha512 = "aYn8bQwt1xwR2oSsVNHT4PXU7EhsThIwmpNB/MNUaaMx5OPLTro6VdNJe/sJssXFLxhamfWeMjwmpXjljo6xkg=="; }; dependencies = [ - sources."@prisma/engines-3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f" + sources."@prisma/engines-3.11.1-1.1a2506facaf1a4727b7c26850735e88ec779dee9" ]; buildInputs = globalBuildInputs; meta = { @@ -113839,20 +118105,35 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "3.8.1"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.8.1.tgz"; - sha512 = "u2gbnek4HU4p/LzCX1FRsrHHGBWh+5T/PyNUwC9if2wQmdTnurqBziPNY7jtJenWw6nEWG/38VlyNfnzGjXt0Q=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.11.0.tgz"; + sha512 = "gH48Ytf2EOtKAM2uDGbGwh/Y3gHIsHigV4nBbnsodbCZpirbbWXxO/L5+sY1nSeU49wnd6GUcQ7dqZCMW+bcaQ=="; }; dependencies = [ - sources."@prisma/prisma-fmt-wasm-3.8.0-43.34df67547cf5598f5a6cd3eb45f14ee70c3fb86f" + sources."@prisma/prisma-fmt-wasm-3.11.0-48.b371888aaf8f51357c7457d836b86d12da91658b" sources."@types/js-levenshtein-1.1.1" + sources."anymatch-3.1.2" + sources."binary-extensions-2.2.0" + sources."braces-3.0.2" + sources."chokidar-3.5.3" + sources."fill-range-7.0.1" + sources."fsevents-2.3.2" + sources."glob-parent-5.1.2" + 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."js-levenshtein-1.1.6" sources."klona-2.0.5" + sources."normalize-path-3.0.0" + sources."picomatch-2.3.1" + sources."readdirp-3.6.0" + sources."to-regex-range-5.0.1" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" ]; buildInputs = globalBuildInputs; @@ -113890,7 +118171,7 @@ in sources."isexe-2.0.0" sources."keypress-0.2.1" sources."lodash-4.17.21" - sources."minimatch-3.0.4" + sources."minimatch-3.0.8" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."which-2.0.2" @@ -113909,10 +118190,10 @@ in pulp = nodeEnv.buildNodePackage { name = "pulp"; packageName = "pulp"; - version = "15.0.0"; + version = "16.0.0-0"; src = fetchurl { - url = "https://registry.npmjs.org/pulp/-/pulp-15.0.0.tgz"; - sha512 = "JPzDiSjxwySAFOFnpevZO7YzzDgGdJP/SQap1UJbK0rsrfUVQC+zOHDkm7A8T3gR/0el4ft6KwB6fcDl2bTzVw=="; + url = "https://registry.npmjs.org/pulp/-/pulp-16.0.0-0.tgz"; + sha512 = "6nG6qg/p5IGa0k4w9EkBVBX3+7Ra1mjbOCYwbn85kjUC6x1jkyP+hAP7xAwBxTPgxSD8x5IZtoX9sbrNeKecnQ=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -114057,9 +118338,9 @@ in sources."mime-1.6.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.0.8" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" (sources."module-deps-6.2.3" // { dependencies = [ @@ -114110,7 +118391,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" @@ -114179,20 +118460,20 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.16.3"; + version = "0.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.16.3.tgz"; - sha512 = "wD3xxZUwPqZTG1OZNEq6kr/yKpKjCTY4JDYLlj5wyippho3cvABhf6INxlzA8h2+ZM3G4+pDmdjQOmp5UWw6rA=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.16.6.tgz"; + sha512 = "oFxJ0Q59ZmEAwfwgf0nHn5twogTYNqrLDi8mNDnxQcu6Q9XhhagNgLNvPyZNvhO8ELL5UvURG7xZk+GKCKkxOg=="; }; dependencies = [ sources."isexe-2.0.0" sources."shell-quote-1.7.3" sources."uuid-3.4.0" - sources."vscode-jsonrpc-8.0.0-next.5" - sources."vscode-languageserver-8.0.0-next.6" - sources."vscode-languageserver-protocol-3.17.0-next.12" - sources."vscode-languageserver-textdocument-1.0.3" - sources."vscode-languageserver-types-3.17.0-next.6" + sources."vscode-jsonrpc-8.0.0-next.7" + sources."vscode-languageserver-8.0.0-next.10" + sources."vscode-languageserver-protocol-3.17.0-next.16" + sources."vscode-languageserver-textdocument-1.0.4" + sources."vscode-languageserver-types-3.17.0-next.9" sources."vscode-uri-2.1.2" sources."which-2.0.2" ]; @@ -114268,22 +118549,22 @@ in sources."colors-1.4.0" sources."commander-5.1.0" sources."compare-versions-4.1.3" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" sources."define-lazy-prop-2.0.0" sources."duplexer3-0.1.4" sources."end-of-stream-1.4.4" - sources."follow-redirects-1.14.7" - sources."fs-extra-10.0.0" + sources."follow-redirects-1.14.9" + sources."fs-extra-10.0.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" sources."https-proxy-agent-5.0.0" sources."ini-1.3.8" @@ -114299,7 +118580,7 @@ in sources."lodash.flatmap-4.5.0" sources."lowercase-keys-1.0.1" sources."mimic-response-1.0.1" - sources."minimist-1.2.5" + sources."minimist-1.2.6" sources."moment-2.29.1" sources."ms-2.1.2" sources."node-abort-controller-3.0.1" @@ -114328,7 +118609,7 @@ in sources."side-channel-1.0.4" sources."sisteransi-1.0.5" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."socks-proxy-agent-5.0.1" sources."strip-json-comments-2.0.1" sources."to-readable-stream-1.0.0" @@ -114350,10 +118631,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.212"; + version = "1.1.233"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.212.tgz"; - sha512 = "bMa781bh9iSSK7yMh0f+lrhvgGJc+CSCbptg890qanpRWdADI3KGmWqruhu999GCJzLJaIPDLLDDv/V+zTPpRw=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.233.tgz"; + sha512 = "qjyKJd6mfXLwaBls4Ww0CmML+K2gA4NnTelxGktLC3JQv7ioWU7lmiQ1KSr1BnmwuuTfsaJSDN3f+hUf9YPfWg=="; }; buildInputs = globalBuildInputs; meta = { @@ -114377,7 +118658,7 @@ in sources."@mark.probst/typescript-json-schema-0.32.0" sources."@mark.probst/unicode-properties-1.1.0" sources."acorn-7.4.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."array-back-2.0.0" sources."balanced-match-1.0.2" @@ -114462,8 +118743,8 @@ in ]; }) sources."mimic-fn-2.1.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."moment-2.29.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.7" @@ -114500,7 +118781,7 @@ in sources."reduce-flatten-1.0.1" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.7.1" @@ -114508,7 +118789,7 @@ in sources."shallow-copy-0.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" (sources."static-eval-2.1.0" // { dependencies = [ @@ -114522,7 +118803,7 @@ in sources."readable-stream-2.3.7" ]; }) - sources."stream-chain-2.2.4" + sources."stream-chain-2.2.5" sources."stream-json-1.1.3" sources."string-to-stream-1.1.1" (sources."string-width-2.1.1" // { @@ -114558,7 +118839,7 @@ in sources."pako-0.2.9" ]; }) - sources."urijs-1.19.7" + sources."urijs-1.19.10" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."vlq-0.2.3" @@ -114630,7 +118911,7 @@ in sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."i-0.3.7" sources."inflight-1.0.6" @@ -114655,9 +118936,9 @@ in sources."is-weakset-2.0.2" sources."isarray-2.0.5" sources."isstream-0.1.2" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."mute-stream-0.0.8" sources."ncp-0.4.2" sources."object-inspect-1.12.0" @@ -114710,24 +118991,25 @@ in sha512 = "JQACM+3GgF1vkUH6E6w1k0Qut6IbcfXjU37shGUWM9tIs3F9e/33saXK4G/uSl1kc8qjI+RekAQs/qyjMlUKlg=="; }; dependencies = [ - sources."@babel/cli-7.16.8" + sources."@ampproject/remapping-2.1.2" + sources."@babel/cli-7.17.6" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.8" - (sources."@babel/core-7.16.12" // { + sources."@babel/compat-data-7.17.7" + (sources."@babel/core-7.17.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.16.8" + sources."@babel/generator-7.17.7" sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - (sources."@babel/helper-compilation-targets-7.16.7" // { + (sources."@babel/helper-compilation-targets-7.17.7" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.10" - sources."@babel/helper-create-regexp-features-plugin-7.16.7" + sources."@babel/helper-create-class-features-plugin-7.17.6" + sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ sources."semver-6.3.0" @@ -114738,27 +119020,27 @@ in sources."@babel/helper-function-name-7.16.7" sources."@babel/helper-get-function-arity-7.16.7" sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-member-expression-to-functions-7.16.7" + sources."@babel/helper-member-expression-to-functions-7.17.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-module-transforms-7.17.7" sources."@babel/helper-optimise-call-expression-7.16.7" sources."@babel/helper-plugin-utils-7.16.7" sources."@babel/helper-remap-async-to-generator-7.16.8" sources."@babel/helper-replace-supers-7.16.7" - sources."@babel/helper-simple-access-7.16.7" + sources."@babel/helper-simple-access-7.17.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.16.7" + sources."@babel/helpers-7.17.8" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" + sources."@babel/parser-7.17.8" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.17.6" sources."@babel/plugin-proposal-dynamic-import-7.16.7" sources."@babel/plugin-proposal-export-default-from-7.16.7" sources."@babel/plugin-proposal-export-namespace-from-7.16.7" @@ -114766,7 +119048,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/plugin-proposal-object-rest-spread-7.17.3" sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" sources."@babel/plugin-proposal-optional-chaining-7.16.7" sources."@babel/plugin-proposal-private-methods-7.16.11" @@ -114794,7 +119076,7 @@ in sources."@babel/plugin-transform-block-scoping-7.16.7" sources."@babel/plugin-transform-classes-7.16.7" sources."@babel/plugin-transform-computed-properties-7.16.7" - sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-destructuring-7.17.7" sources."@babel/plugin-transform-dotall-regex-7.16.7" sources."@babel/plugin-transform-duplicate-keys-7.16.7" sources."@babel/plugin-transform-exponentiation-operator-7.16.7" @@ -114803,8 +119085,8 @@ in sources."@babel/plugin-transform-literals-7.16.7" sources."@babel/plugin-transform-member-expression-literals-7.16.7" sources."@babel/plugin-transform-modules-amd-7.16.7" - sources."@babel/plugin-transform-modules-commonjs-7.16.8" - sources."@babel/plugin-transform-modules-systemjs-7.16.7" + sources."@babel/plugin-transform-modules-commonjs-7.17.7" + sources."@babel/plugin-transform-modules-systemjs-7.17.8" sources."@babel/plugin-transform-modules-umd-7.16.7" sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" sources."@babel/plugin-transform-new-target-7.16.7" @@ -114812,12 +119094,12 @@ in sources."@babel/plugin-transform-parameters-7.16.7" sources."@babel/plugin-transform-property-literals-7.16.7" sources."@babel/plugin-transform-react-display-name-7.16.7" - sources."@babel/plugin-transform-react-jsx-7.16.7" + sources."@babel/plugin-transform-react-jsx-7.17.3" sources."@babel/plugin-transform-react-jsx-development-7.16.7" sources."@babel/plugin-transform-react-pure-annotations-7.16.7" sources."@babel/plugin-transform-regenerator-7.16.7" sources."@babel/plugin-transform-reserved-words-7.16.7" - (sources."@babel/plugin-transform-runtime-7.16.10" // { + (sources."@babel/plugin-transform-runtime-7.17.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -114837,17 +119119,20 @@ in sources."@babel/preset-modules-0.1.5" sources."@babel/preset-react-7.16.7" sources."@babel/preset-stage-0-7.8.3" - sources."@babel/register-7.16.9" - sources."@babel/runtime-7.16.7" + sources."@babel/register-7.17.7" + sources."@babel/runtime-7.17.8" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" + sources."@babel/traverse-7.17.3" + sources."@babel/types-7.17.0" + sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/sourcemap-codec-1.4.11" + sources."@jridgewell/trace-mapping-0.3.4" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.2.0" - sources."@types/json-schema-7.0.9" + sources."@types/json-schema-7.0.11" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -114871,7 +119156,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."@zeit/schemas-2.6.0" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."acorn-6.4.2" sources."acorn-walk-7.2.0" sources."after-0.8.2" @@ -114883,7 +119168,7 @@ in sources."ansi-colors-3.2.4" sources."ansi-escapes-3.2.0" sources."ansi-html-community-0.0.8" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" sources."aproba-1.2.0" @@ -114926,7 +119211,7 @@ in }) sources."axios-0.21.4" sources."babel-core-7.0.0-bridge.0" - (sources."babel-loader-8.2.3" // { + (sources."babel-loader-8.2.4" // { dependencies = [ sources."find-cache-dir-3.3.2" sources."find-up-4.1.0" @@ -114945,7 +119230,7 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-corejs3-0.5.2" sources."babel-plugin-polyfill-regenerator-0.3.1" sources."babel-plugin-transform-react-remove-prop-types-0.4.24" sources."babel-plugin-universal-import-4.0.2" @@ -114973,9 +119258,9 @@ in sources."blob-0.0.5" sources."bluebird-3.7.2" sources."bn.js-5.2.0" - (sources."body-parser-1.19.1" // { + (sources."body-parser-1.19.2" // { dependencies = [ - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."debug-2.6.9" sources."ms-2.0.0" ]; @@ -115005,7 +119290,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.19.1" + sources."browserslist-4.20.2" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -115039,7 +119324,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001320" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -115118,12 +119403,12 @@ in }) sources."content-type-1.0.4" sources."convert-source-map-1.8.0" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.20.3" // { + (sources."core-js-compat-3.21.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -115145,6 +119430,8 @@ in sources."css-declaration-sorter-4.0.1" (sources."css-loader-2.1.1" // { dependencies = [ + sources."json5-1.0.1" + sources."loader-utils-1.4.0" sources."postcss-value-parser-3.3.1" sources."schema-utils-1.0.0" ]; @@ -115179,7 +119466,7 @@ in ]; }) sources."cyclist-1.0.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" (sources."decompress-4.2.1" // { @@ -115248,7 +119535,7 @@ in }) sources."domain-browser-1.2.0" sources."domelementtype-1.3.1" - (sources."domhandler-4.3.0" // { + (sources."domhandler-4.3.1" // { dependencies = [ sources."domelementtype-2.2.0" ]; @@ -115267,7 +119554,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.96" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -115338,7 +119625,7 @@ in sources."ms-2.0.0" ]; }) - (sources."express-4.17.2" // { + (sources."express-4.17.3" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -115363,7 +119650,6 @@ in }) (sources."extract-css-chunks-webpack-plugin-4.9.0" // { dependencies = [ - sources."loader-utils-2.0.2" sources."normalize-url-1.9.1" sources."prepend-http-1.0.4" sources."query-string-4.3.4" @@ -115383,6 +119669,8 @@ in sources."figures-2.0.0" (sources."file-loader-3.0.1" // { dependencies = [ + sources."json5-1.0.1" + sources."loader-utils-1.4.0" sources."schema-utils-1.0.0" ]; }) @@ -115401,7 +119689,7 @@ in sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -115451,7 +119739,7 @@ in sources."has-cors-1.1.0" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-to-string-tag-x-1.4.1" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -115504,7 +119792,7 @@ in sources."http-cache-semantics-3.8.1" sources."http-deceiver-1.2.7" sources."http-errors-1.8.1" - sources."http-parser-js-0.5.5" + sources."http-parser-js-0.5.6" sources."http-proxy-1.18.1" sources."http-proxy-middleware-0.19.1" sources."https-browserify-1.0.0" @@ -115606,8 +119894,7 @@ in sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" - sources."json3-3.3.3" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."jsonfile-4.0.0" sources."keyv-3.0.0" sources."killable-1.0.1" @@ -115615,11 +119902,7 @@ in sources."last-call-webpack-plugin-3.0.0" sources."lines-and-columns-1.2.4" sources."loader-runner-2.4.0" - (sources."loader-utils-1.4.0" // { - dependencies = [ - sources."json5-1.0.1" - ]; - }) + sources."loader-utils-2.0.2" sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" @@ -115666,14 +119949,14 @@ in ]; }) sources."mime-2.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" (sources."mississippi-3.0.0" // { dependencies = [ sources."pump-3.0.0" @@ -115684,7 +119967,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" sources."move-concurrently-1.0.1" sources."ms-2.1.2" @@ -115694,7 +119977,7 @@ in sources."mute-stream-0.0.7" sources."nan-2.15.0" sources."nanomatch-1.2.13" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."nice-try-1.0.5" sources."no-case-2.3.2" @@ -115707,7 +119990,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" (sources."normalize-url-2.0.1" // { @@ -115794,7 +120077,7 @@ in sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."pirates-4.0.4" + sources."pirates-4.0.5" sources."pkg-dir-3.0.0" (sources."portfinder-1.0.28" // { dependencies = [ @@ -115834,6 +120117,8 @@ in }) (sources."postcss-loader-3.0.0" // { dependencies = [ + sources."json5-1.0.1" + sources."loader-utils-1.4.0" sources."schema-utils-1.0.0" ]; }) @@ -115956,7 +120241,7 @@ in sources."pumpify-1.5.1" sources."punycode-2.1.1" sources."q-1.5.1" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."query-string-5.1.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -115965,12 +120250,17 @@ in sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.0" - (sources."raw-body-2.4.2" // { + (sources."raw-body-2.4.3" // { dependencies = [ - sources."bytes-3.1.1" + sources."bytes-3.1.2" + ]; + }) + (sources."raw-loader-3.1.0" // { + dependencies = [ + sources."json5-1.0.1" + sources."loader-utils-1.4.0" ]; }) - sources."raw-loader-3.1.0" sources."rc-1.2.8" sources."react-fast-compare-3.2.0" sources."react-helmet-6.1.0" @@ -115981,16 +120271,16 @@ in sources."readable-stream-2.3.7" sources."readdirp-3.6.0" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-9.0.0" + sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.1" - sources."regexpu-core-4.8.0" + sources."regexpu-core-5.0.1" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.7.0" // { + sources."regjsgen-0.6.0" + (sources."regjsparser-0.8.4" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -116014,7 +120304,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -116071,6 +120361,7 @@ in sources."content-disposition-0.5.2" sources."mime-db-1.33.0" sources."mime-types-2.1.18" + sources."minimatch-3.0.4" ]; }) (sources."serve-index-1.9.1" // { @@ -116097,7 +120388,7 @@ in sources."shebang-regex-1.0.0" sources."shorthash-0.0.2" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."simple-swizzle-0.2.2" // { dependencies = [ sources."is-arrayish-0.3.2" @@ -116156,7 +120447,7 @@ in ]; }) sources."sockjs-0.3.24" - (sources."sockjs-client-1.5.2" // { + (sources."sockjs-client-1.6.0" // { dependencies = [ sources."debug-3.2.7" ]; @@ -116215,7 +120506,7 @@ in sources."string_decoder-1.1.1" (sources."strip-ansi-5.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" ]; }) sources."strip-dirs-2.1.0" @@ -116224,6 +120515,8 @@ in sources."strip-outer-1.0.1" (sources."style-loader-0.23.1" // { dependencies = [ + sources."json5-1.0.1" + sources."loader-utils-1.4.0" sources."schema-utils-1.0.0" ]; }) @@ -116327,8 +120620,13 @@ in sources."punycode-1.3.2" ]; }) - sources."url-loader-2.3.0" - sources."url-parse-1.5.4" + (sources."url-loader-2.3.0" // { + dependencies = [ + sources."json5-1.0.1" + sources."loader-utils-1.4.0" + ]; + }) + sources."url-parse-1.5.10" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -116369,6 +120667,8 @@ in sources."wbuf-1.7.3" (sources."webpack-4.46.0" // { dependencies = [ + sources."json5-1.0.1" + sources."loader-utils-1.4.0" sources."schema-utils-1.0.0" ]; }) @@ -116498,9 +120798,9 @@ in sources."source-map-0.1.31" ]; }) - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."private-0.1.8" @@ -116523,13 +120823,13 @@ in readability-cli = nodeEnv.buildNodePackage { name = "readability-cli"; packageName = "readability-cli"; - version = "2.3.5"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.3.5.tgz"; - sha512 = "xSnTf4ik+hAY57CKk7lWvtumDbvfDKEHrzveXbIeoaLhEDE2+7qfjgrCK0DcCLFRfOKS6rsrYEZewfOYU+YfpQ=="; + url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.4.0.tgz"; + sha512 = "9yIWmelcUihFl8wdEGTxvl7zWV7VxvNBmLiyDmqryF2xeaj1+7MmqeZ2KCpkklqZncCtIlwqBKRQtWLJbcztjQ=="; }; dependencies = [ - sources."@mozilla/readability-0.4.1" + sources."@mozilla/readability-0.4.2" sources."@tootallnate/once-2.0.0" sources."abab-2.0.5" sources."acorn-8.7.0" @@ -116555,12 +120855,12 @@ in ]; }) sources."data-urls-3.0.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decimal.js-10.3.1" sources."deep-is-0.1.4" sources."delayed-stream-1.0.0" sources."domexception-4.0.0" - sources."dompurify-2.3.4" + sources."dompurify-2.3.6" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."escodegen-2.0.0" @@ -116578,8 +120878,8 @@ in sources."is-potential-custom-element-name-1.0.1" sources."jsdom-19.0.0" sources."levn-0.3.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."ms-2.1.2" sources."nwsapi-2.2.0" sources."optionator-0.8.3" @@ -116606,12 +120906,12 @@ in sources."whatwg-url-10.0.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" - sources."ws-8.4.2" + sources."ws-8.5.0" sources."xml-name-validator-4.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" - sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-17.4.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -116626,14 +120926,14 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.13.2"; + version = "0.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.2.tgz"; - sha512 = "eRGRmAKPvm8ozCb8TxaBlHF0BjeFOXYUKDTx7RD3ABkPKsDamle776GwMrrf1ojgl5i+RSSJfP62k1gTP7Owaw=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.9.tgz"; + sha512 = "RoUonPhAQeEpg6lCJyi7Oha5iYPNFhAN2lFWzc3biLigJCTh6JDwPHlomfLMrwkri6bz8W3vVEtEqQ1RLaxMJQ=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" - (sources."@babel/generator-7.16.8" // { + (sources."@babel/generator-7.17.7" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -116647,21 +120947,21 @@ in sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.16.12" - sources."@babel/runtime-7.16.7" + sources."@babel/parser-7.17.8" + sources."@babel/runtime-7.17.8" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.16.10" - sources."@babel/types-7.16.8" - sources."@emotion/is-prop-valid-0.8.8" - sources."@emotion/memoize-0.7.4" + sources."@babel/traverse-7.17.3" + sources."@babel/types-7.17.0" + sources."@emotion/is-prop-valid-1.1.2" + sources."@emotion/memoize-0.7.5" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.6" sources."@redocly/ajv-8.6.4" - sources."@redocly/openapi-core-1.0.0-beta.79" + sources."@redocly/openapi-core-1.0.0-beta.90" sources."@redocly/react-dropdown-aria-2.0.12" - sources."@types/json-schema-7.0.9" - sources."@types/node-14.18.9" + sources."@types/json-schema-7.0.11" + sources."@types/node-14.18.12" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -116676,7 +120976,7 @@ in sources."util-0.10.3" ]; }) - sources."babel-plugin-styled-components-2.0.2" + sources."babel-plugin-styled-components-2.0.6" sources."babel-plugin-syntax-jsx-6.18.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -116728,7 +121028,7 @@ in sources."crypto-browserify-3.12.0" sources."css-color-keywords-1.0.0" sources."css-to-react-native-3.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decko-1.2.0" sources."des.js-1.0.1" (sources."diffie-hellman-5.0.3" // { @@ -116737,7 +121037,7 @@ in ]; }) sources."domain-browser-1.2.0" - sources."dompurify-2.3.4" + sources."dompurify-2.3.6" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -116788,14 +121088,14 @@ in sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsesc-2.5.2" - sources."json-pointer-0.6.1" + sources."json-pointer-0.6.2" sources."json-schema-traverse-1.0.0" sources."lodash-4.17.21" sources."lodash.isequal-4.5.0" sources."loose-envify-1.4.0" sources."lunr-2.3.9" sources."mark.js-8.11.1" - sources."marked-0.7.0" + sources."marked-4.0.12" sources."md5.js-1.3.5" (sources."miller-rabin-4.0.1" // { dependencies = [ @@ -116804,12 +121104,12 @@ in }) sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mkdirp-1.0.4" - sources."mobx-6.3.13" - sources."mobx-react-7.2.1" - sources."mobx-react-lite-3.2.3" + sources."mobx-6.5.0" + sources."mobx-react-7.3.0" + sources."mobx-react-lite-3.3.0" sources."ms-2.1.2" sources."neo-async-2.6.2" sources."node-fetch-2.6.7" @@ -116823,7 +121123,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.8" sources."object-assign-4.1.1" - sources."openapi-sampler-1.1.1" + sources."openapi-sampler-1.2.1" sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parse-asn1-5.1.6" @@ -116832,9 +121132,9 @@ in sources."perfect-scrollbar-1.5.5" sources."picomatch-2.3.1" sources."pluralize-8.0.0" - sources."polished-4.1.3" + sources."polished-4.1.4" sources."postcss-value-parser-4.2.0" - sources."prismjs-1.26.0" + sources."prismjs-1.27.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."prop-types-15.8.1" @@ -116861,7 +121161,7 @@ in ]; }) sources."readdirp-3.6.0" - (sources."redoc-2.0.0-rc.59" // { + (sources."redoc-2.0.0-rc.65" // { dependencies = [ sources."path-browserify-1.0.1" ]; @@ -116891,7 +121191,8 @@ in sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" - sources."styled-components-5.3.3" + sources."style-loader-3.3.1" + sources."styled-components-5.3.5" sources."supports-color-5.5.0" sources."swagger2openapi-7.0.8" sources."timers-browserify-2.0.12" @@ -116900,7 +121201,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.3" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -116933,8 +121234,8 @@ in sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" - sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-17.4.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -117003,7 +121304,7 @@ in (sources."log-update-3.4.0" // { dependencies = [ sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."ansi-styles-3.2.1" sources."cli-cursor-2.1.0" sources."color-convert-1.9.3" @@ -117047,11 +121348,11 @@ in sources."read-pkg-3.0.0" sources."read-pkg-up-3.0.0" sources."redent-2.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."restore-cursor-3.1.0" sources."scheduler-0.18.0" sources."semver-5.7.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slice-ansi-3.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -117059,7 +121360,7 @@ in sources."spdx-license-ids-3.0.11" (sources."string-length-3.1.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."astral-regex-1.0.0" sources."strip-ansi-5.2.0" ]; @@ -117090,10 +121391,10 @@ in "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; - version = "4.2.1"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.2.1.tgz"; - sha512 = "OXH4qT5Gs9di6lZPDmRuanIvdiVzltCe8W9ELz6Q3EhoWS+RjRp5HBwFHr+k1fbbP82/Z83sQiK+/ZYFBwrrsQ=="; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-4.3.1.tgz"; + sha512 = "1kyEnWeUkaCdBdX//XXq9dtBK95ppvIlSwlHelrP8/wrX6LcsYp4HT9WTFoFEOUBfVqkm8C2aHQ367o+UKfcxw=="; }; buildInputs = globalBuildInputs; meta = { @@ -117116,7 +121417,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."agent-base-4.3.0" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" @@ -117251,7 +121552,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."livereload-0.9.3" - sources."livereload-js-3.3.2" + sources."livereload-js-3.3.3" sources."lodash-4.17.21" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -117264,15 +121565,15 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."mustache-4.2.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."on-finished-2.3.0" @@ -117348,7 +121649,7 @@ in }) sources."serve-static-1.14.2" sources."setprototypeof-1.2.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sprintf-js-1.0.3" sources."statuses-1.5.0" sources."string-width-4.2.3" @@ -117380,7 +121681,7 @@ in sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xdg-basedir-4.0.0" sources."yallist-4.0.0" sources."yaml-front-matter-4.1.1" @@ -117413,7 +121714,7 @@ in sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" @@ -117431,10 +121732,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.66.0"; + version = "2.70.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.66.0.tgz"; - sha512 = "L6mKOkdyP8HK5kKJXaiWG7KZDumPJjuo1P+cfyHOJPNNTK3Moe7zCH5+fy7v8pVmHXtlxorzaBjvkBMB23s98g=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.70.1.tgz"; + sha512 = "CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -117449,67 +121750,47 @@ in bypassCache = true; reconstructLock = true; }; - "rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { + "rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; - version = "0.2.834"; - src = ../../misc/vscode-extensions/rust-analyzer/build-deps; + version = "0.2.975"; + src = ../../applications/editors/vscode/extensions/rust-analyzer/build-deps; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.16.10" // { - dependencies = [ - sources."chalk-2.4.2" - sources."escape-string-regexp-1.0.5" - ]; - }) - (sources."@eslint/eslintrc-0.4.3" // { - dependencies = [ - sources."ignore-4.0.6" - ]; - }) - sources."@hpcc-js/wasm-1.4.1" - sources."@humanwhocodes/config-array-0.5.0" + sources."@eslint/eslintrc-1.2.1" + sources."@hpcc-js/wasm-1.12.8" + sources."@humanwhocodes/config-array-0.9.5" sources."@humanwhocodes/object-schema-1.2.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/glob-7.2.0" - sources."@types/json-schema-7.0.9" - sources."@types/minimatch-3.0.5" - sources."@types/mocha-8.2.3" + sources."@types/json-schema-7.0.11" sources."@types/node-14.17.34" - sources."@types/node-fetch-2.5.12" - sources."@types/vscode-1.63.1" - sources."@typescript-eslint/eslint-plugin-4.33.0" - sources."@typescript-eslint/experimental-utils-4.33.0" - sources."@typescript-eslint/parser-4.33.0" - sources."@typescript-eslint/scope-manager-4.33.0" - sources."@typescript-eslint/types-4.33.0" - sources."@typescript-eslint/typescript-estree-4.33.0" - sources."@typescript-eslint/visitor-keys-4.33.0" - sources."@ungap/promise-all-settled-1.1.2" - sources."acorn-7.4.1" + sources."@types/vscode-1.63.2" + sources."@typescript-eslint/eslint-plugin-5.16.0" + sources."@typescript-eslint/parser-5.16.0" + sources."@typescript-eslint/scope-manager-5.16.0" + sources."@typescript-eslint/type-utils-5.16.0" + sources."@typescript-eslint/types-5.16.0" + sources."@typescript-eslint/typescript-estree-5.16.0" + sources."@typescript-eslint/utils-5.16.0" + sources."@typescript-eslint/visitor-keys-5.16.0" + sources."@vscode/test-electron-2.1.3" + sources."acorn-8.7.0" sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" sources."ajv-6.12.6" - sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.1" - sources."ansi-styles-3.2.1" - sources."anymatch-3.1.2" + sources."ansi-styles-4.3.0" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.7" - sources."argparse-1.0.10" + sources."argparse-2.0.1" sources."array-union-2.1.0" - sources."astral-regex-2.0.0" - sources."asynckit-0.4.0" - sources."azure-devops-node-api-11.1.0" + sources."azure-devops-node-api-11.1.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."big-integer-1.6.51" sources."binary-0.3.0" - sources."binary-extensions-2.2.0" (sources."bl-4.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -117519,33 +121800,21 @@ in sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browser-stdout-1.3.1" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."camelcase-6.3.0" sources."chainsaw-0.1.0" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."ansi-styles-4.3.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."chalk-4.1.2" sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.5.0" - sources."chokidar-3.5.2" sources."chownr-1.1.4" sources."cliui-7.0.4" sources."code-point-at-1.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."combined-stream-1.0.8" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."commander-7.2.0" sources."commandpost-1.4.0" sources."concat-map-0.0.1" @@ -117570,7 +121839,7 @@ in sources."d3-force-3.0.0" sources."d3-format-3.1.0" sources."d3-geo-3.0.1" - (sources."d3-graphviz-4.0.0" // { + (sources."d3-graphviz-4.1.0" // { dependencies = [ sources."d3-color-2.0.0" sources."d3-dispatch-2.0.0" @@ -117600,22 +121869,18 @@ in sources."d3-timer-3.0.1" sources."d3-transition-3.0.1" sources."d3-zoom-3.0.0" - sources."debug-4.3.3" - sources."decamelize-4.0.0" - sources."decompress-response-4.2.1" + sources."debug-4.3.4" + sources."decompress-response-6.0.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."delaunator-5.0.0" - sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."denodeify-1.2.1" - sources."detect-libc-1.0.3" - sources."diff-5.0.0" + sources."detect-libc-2.0.1" sources."dir-glob-3.0.1" sources."doctrine-3.0.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."duplexer2-0.1.4" (sources."editorconfig-0.15.3" // { @@ -117628,29 +121893,24 @@ in }) sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" sources."entities-2.2.0" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.32.0" // { + (sources."eslint-8.12.0" // { dependencies = [ - (sources."eslint-utils-2.1.0" // { - dependencies = [ - sources."eslint-visitor-keys-1.3.0" - ]; - }) - sources."ignore-4.0.6" + sources."eslint-scope-7.1.1" + sources."estraverse-5.3.0" + sources."glob-parent-6.0.2" ]; }) sources."eslint-scope-5.1.1" - sources."eslint-utils-3.0.0" - sources."eslint-visitor-keys-2.1.0" - (sources."espree-7.3.1" // { + (sources."eslint-utils-3.0.0" // { dependencies = [ - sources."eslint-visitor-keys-1.3.0" + sources."eslint-visitor-keys-2.1.0" ]; }) - sources."esprima-4.0.1" + sources."eslint-visitor-keys-3.3.0" + sources."espree-9.3.1" (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.3.0" @@ -117672,14 +121932,10 @@ in sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" - sources."find-up-5.0.0" - sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" - sources."form-data-3.0.1" + sources."flatted-3.2.5" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" (sources."fstream-1.0.12" // { dependencies = [ sources."rimraf-2.7.1" @@ -117700,15 +121956,13 @@ in sources."github-from-package-0.0.0" sources."glob-7.2.0" sources."glob-parent-5.1.2" - sources."globals-13.12.0" + sources."globals-13.13.0" sources."globby-11.1.0" sources."graceful-fs-4.2.9" - sources."growl-1.10.5" sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-flag-4.0.0" + sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" - sources."he-1.2.0" sources."hosted-git-info-4.1.0" sources."htmlparser2-6.1.0" sources."http-proxy-agent-4.0.1" @@ -117722,74 +121976,42 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."internmap-2.0.3" - sources."is-binary-path-2.1.0" 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-plain-obj-2.1.0" - sources."is-unicode-supported-0.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" + sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."keytar-7.7.0" + sources."keytar-7.9.0" sources."leven-3.1.0" sources."levn-0.4.1" - sources."linkify-it-2.2.0" + sources."linkify-it-3.0.3" sources."listenercount-1.0.1" - sources."locate-path-6.0.0" - sources."lodash-4.17.21" sources."lodash.merge-4.6.2" - sources."lodash.truncate-4.4.2" - sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" - (sources."markdown-it-10.0.0" // { + (sources."markdown-it-12.3.2" // { dependencies = [ - sources."entities-2.0.3" + sources."entities-2.1.0" ]; }) sources."mdurl-1.0.1" sources."merge2-1.4.1" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."mimic-response-2.1.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."mimic-response-3.1.0" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" - (sources."mocha-9.1.4" // { - dependencies = [ - sources."argparse-2.0.1" - (sources."debug-4.3.2" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."glob-7.1.7" - sources."has-flag-4.0.0" - sources."js-yaml-4.1.0" - sources."ms-2.1.3" - sources."supports-color-8.1.1" - ]; - }) sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nanoid-3.1.25" sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" - (sources."node-abi-2.30.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."node-addon-api-3.2.1" - sources."node-fetch-2.6.7" - sources."normalize-path-3.0.0" + sources."node-abi-3.8.0" + sources."node-addon-api-4.3.0" sources."npmlog-4.1.2" sources."nth-check-2.0.1" sources."number-is-nan-1.0.1" @@ -117797,11 +122019,6 @@ in sources."object-inspect-1.12.0" sources."once-1.4.0" sources."optionator-0.9.1" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" sources."parent-module-1.0.1" (sources."parse-semver-1.1.1" // { dependencies = [ @@ -117810,81 +122027,53 @@ in }) sources."parse5-6.0.1" sources."parse5-htmlparser2-tree-adapter-6.0.1" - sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-type-4.0.0" sources."pend-1.2.0" sources."picomatch-2.3.1" - sources."prebuild-install-6.1.4" + sources."prebuild-install-7.0.1" sources."prelude-ls-1.2.1" sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.10.3" sources."queue-microtask-1.2.3" - sources."randombytes-2.1.0" (sources."rc-1.2.8" // { dependencies = [ sources."strip-json-comments-2.0.1" ]; }) sources."read-1.0.7" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."readdirp-3.6.0" + sources."readable-stream-2.3.7" sources."regexpp-3.2.0" sources."require-directory-2.1.1" - sources."require-from-string-2.0.2" sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."robust-predicates-3.0.1" sources."run-parallel-1.2.0" sources."rw-1.3.3" - sources."safe-buffer-5.2.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-7.3.5" - sources."serialize-javascript-6.0.0" sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" sources."sigmund-1.0.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" + sources."simple-get-4.0.1" sources."slash-3.0.0" - (sources."slice-ansi-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."sprintf-js-1.0.3" sources."string-width-4.2.3" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."string_decoder-1.1.1" sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" - sources."supports-color-5.5.0" - (sources."table-6.8.0" // { - dependencies = [ - sources."ajv-8.9.0" - sources."json-schema-traverse-1.0.0" - ]; - }) + sources."supports-color-7.2.0" sources."tar-fs-2.1.1" (sources."tar-stream-2.2.0" // { dependencies = [ @@ -117894,7 +122083,6 @@ in sources."text-table-0.2.0" sources."tmp-0.2.1" sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" sources."traverse-0.3.9" sources."tslib-2.3.1" (sources."tsutils-3.21.0" // { @@ -117907,52 +122095,45 @@ in sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.6" - sources."typescript-4.5.5" + sources."typescript-4.6.3" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.2" sources."unzipper-0.10.11" sources."uri-js-4.4.1" - sources."url-join-1.1.0" + sources."url-join-4.0.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."vsce-1.103.1" // { + (sources."vsce-2.7.0" // { 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."commander-6.2.1" sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" sources."semver-5.7.1" + sources."supports-color-5.5.0" ]; }) - sources."vscode-jsonrpc-8.0.0-next.2" - sources."vscode-languageclient-8.0.0-next.2" - sources."vscode-languageserver-protocol-3.17.0-next.8" - sources."vscode-languageserver-types-3.17.0-next.3" - sources."vscode-test-1.6.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" + sources."vscode-jsonrpc-8.0.0-next.5" + sources."vscode-languageclient-8.0.0-next.8" + sources."vscode-languageserver-protocol-3.17.0-next.12" + sources."vscode-languageserver-types-3.17.0-next.6" sources."which-2.0.2" sources."wide-align-1.1.5" sources."word-wrap-1.2.3" - sources."workerpool-6.1.5" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.4" - sources."yargs-unparser-2.0.0" + sources."yargs-17.4.0" + sources."yargs-parser-21.0.1" sources."yauzl-2.10.0" sources."yazl-2.5.1" - sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -117972,12 +122153,12 @@ in dependencies = [ sources."find-up-5.0.0" sources."locate-path-6.0.0" - sources."nanoid-3.2.0" + sources."nanoid-3.3.1" sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."path-exists-4.0.0" sources."picocolors-1.0.0" - sources."postcss-8.4.5" + sources."postcss-8.4.12" sources."source-map-js-1.0.2" sources."strip-json-comments-3.1.1" sources."yocto-queue-0.1.0" @@ -118018,7 +122199,7 @@ in sources."core-util-is-1.0.3" sources."crc-0.2.0" sources."crypto-0.0.3" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."events.node-0.4.9" (sources."everyauth-0.4.5" // { dependencies = [ @@ -118037,13 +122218,13 @@ in sources."commander-1.3.2" ]; }) - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."formidable-1.0.11" sources."fresh-0.2.0" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."http-auth-2.0.7" sources."inherits-2.0.4" sources."isarray-0.0.1" @@ -118091,10 +122272,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.49.0"; + version = "1.49.9"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz"; - sha512 = "TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw=="; + url = "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz"; + sha512 = "YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -118157,7 +122338,7 @@ in }; dependencies = [ sources."@zeit/schemas-2.6.0" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."ajv-6.12.6" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" @@ -118213,12 +122394,12 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimist-1.2.6" sources."ms-2.0.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."nice-try-1.0.5" sources."npm-run-path-2.0.2" sources."on-headers-1.0.2" @@ -118243,7 +122424,7 @@ in }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."strip-eof-1.0.0" @@ -118271,127 +122452,47 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.72.1"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.72.1.tgz"; - sha512 = "SxmxyBgWQvcKvEXdP0fR3Y+nljOQ+nWCPDZXnhic//w+k0kNQ/bHcd3S1VZQqU3m7nZZwMsdC5lxB26EpUFELA=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.10.0.tgz"; + sha512 = "2bRpqJFrejlN0hIrTnFQKV/MejUF8lZSRfULBqdUG4emwrUiTzZSerYdUVifHvhvIEcno6GeTbMs1xwQrCb2fw=="; }; dependencies = [ sources."2-thenable-1.0.0" - (sources."@kwsites/file-exists-1.1.1" // { - dependencies = [ - sources."debug-4.3.3" - sources."ms-2.1.2" - ]; - }) + sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@protobufjs/aspromise-1.1.2" - sources."@protobufjs/base64-1.1.2" - sources."@protobufjs/codegen-2.0.4" - sources."@protobufjs/eventemitter-1.1.0" - sources."@protobufjs/fetch-1.1.0" - sources."@protobufjs/float-1.0.2" - sources."@protobufjs/inquire-1.1.0" - sources."@protobufjs/path-1.1.2" - sources."@protobufjs/pool-1.1.0" - sources."@protobufjs/utf8-1.1.0" - (sources."@serverless/cli-1.6.0" // { - dependencies = [ - sources."@serverless/utils-1.2.0" - sources."chalk-2.4.2" - sources."dotenv-8.6.0" - sources."uuid-3.4.0" - ]; - }) - sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.18.2" // { - dependencies = [ - (sources."@serverless/utils-4.1.0" // { - dependencies = [ - sources."js-yaml-4.1.0" - ]; - }) - sources."argparse-2.0.1" - sources."dotenv-8.6.0" - (sources."js-yaml-3.14.1" // { - dependencies = [ - sources."argparse-1.0.10" - ]; - }) - sources."ramda-0.27.2" - sources."write-file-atomic-3.0.3" - ]; - }) - (sources."@serverless/core-1.1.2" // { - dependencies = [ - sources."fs-extra-7.0.1" - sources."js-yaml-3.14.1" - sources."semver-6.3.0" - ]; - }) - sources."@serverless/dashboard-plugin-5.5.4" + sources."@serverless/dashboard-plugin-6.2.0" sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.3.0" // { + (sources."@serverless/platform-client-4.3.2" // { dependencies = [ sources."js-yaml-3.14.1" - sources."jwt-decode-2.2.0" ]; }) - (sources."@serverless/platform-client-china-2.3.4" // { + (sources."@serverless/utils-6.0.3" // { dependencies = [ - sources."dotenv-8.6.0" - sources."js-yaml-3.14.1" + sources."jwt-decode-3.1.2" ]; }) - sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.20.3" // { - dependencies = [ - sources."get-stream-6.0.1" - sources."has-flag-4.0.0" - sources."supports-color-8.1.1" - sources."write-file-atomic-3.0.3" - ]; - }) - sources."@serverless/utils-china-1.1.5" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@tencent-sdk/capi-1.1.8" + sources."@sindresorhus/is-4.6.0" + sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" - sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.3" - sources."@types/lodash-4.14.178" - sources."@types/long-4.0.1" - sources."@types/node-17.0.10" - sources."@types/request-2.48.8" - sources."@types/request-promise-native-1.0.18" + sources."@types/keyv-3.1.4" + sources."@types/lodash-4.14.180" + sources."@types/node-17.0.23" sources."@types/responselike-1.0.0" - sources."@types/tough-cookie-4.0.1" sources."adm-zip-0.5.9" - sources."after-0.8.2" - (sources."agent-base-6.0.2" // { - dependencies = [ - sources."debug-4.3.3" - sources."ms-2.1.2" - ]; - }) - sources."ajv-6.12.6" - sources."ajv-keywords-3.5.2" - (sources."ansi-align-3.0.1" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - ]; - }) + sources."agent-base-6.0.2" + sources."ajv-8.11.0" + sources."ajv-formats-2.1.1" sources."ansi-escapes-4.3.2" - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" - sources."aproba-1.2.0" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" @@ -118399,34 +122500,16 @@ in }) (sources."archiver-5.3.0" // { dependencies = [ - sources."async-3.2.3" - sources."bl-4.1.0" - sources."tar-stream-2.2.0" - ]; - }) - (sources."archiver-utils-2.1.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - (sources."are-we-there-yet-1.1.7" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" + sources."readable-stream-3.6.0" ]; }) + sources."archiver-utils-2.1.0" sources."argparse-1.0.10" sources."array-union-2.1.0" - sources."arraybuffer.slice-0.0.7" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-2.6.3" + sources."async-3.2.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1062.0" // { + (sources."aws-sdk-2.1101.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -118434,40 +122517,16 @@ in sources."uuid-3.3.2" ]; }) - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" sources."axios-0.21.4" - sources."backo2-1.0.2" sources."balanced-match-1.0.2" - sources."base64-arraybuffer-0.1.4" sources."base64-js-1.5.1" - sources."bcrypt-pbkdf-1.0.2" - sources."binary-0.3.0" sources."binary-extensions-2.2.0" - sources."bindings-1.5.0" - (sources."bl-2.2.1" // { + (sources."bl-4.1.0" // { dependencies = [ - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."readable-stream-3.6.0" ]; }) - sources."blob-0.0.5" sources."bluebird-3.7.2" - (sources."boxen-5.1.2" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."type-fest-0.20.2" - ]; - }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-5.7.1" @@ -118475,29 +122534,18 @@ in sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" sources."buffer-fill-1.0.0" - sources."buffermaker-1.2.1" - sources."buffers-0.1.1" sources."builtin-modules-3.2.0" + sources."builtins-1.0.3" sources."cacheable-lookup-5.0.4" - (sources."cacheable-request-6.1.0" // { + (sources."cacheable-request-7.0.2" // { dependencies = [ sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" ]; }) sources."cachedir-2.3.0" - sources."camelcase-6.3.0" - sources."caseless-0.12.0" - (sources."chainsaw-0.1.0" // { - dependencies = [ - sources."traverse-0.3.9" - ]; - }) + sources."call-bind-1.0.2" (sources."chalk-4.1.2" // { dependencies = [ - sources."ansi-styles-4.3.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" ]; @@ -118505,40 +122553,44 @@ in sources."chardet-0.7.0" sources."child-process-ext-2.1.1" sources."chokidar-3.5.3" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."ci-info-3.3.0" - sources."cli-boxes-2.2.1" sources."cli-color-2.0.1" sources."cli-cursor-3.1.0" sources."cli-progress-footer-2.3.0" + sources."cli-spinners-2.6.1" (sources."cli-sprintf-format-1.1.1" // { dependencies = [ sources."supports-color-6.1.0" ]; }) sources."cli-width-3.0.0" + sources."clone-1.0.4" sources."clone-response-1.0.2" - sources."code-point-at-1.1.0" - sources."color-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."color-string-1.9.0" - sources."colornames-1.1.1" - sources."colors-1.3.3" - sources."colorspace-1.1.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."commander-2.19.0" - sources."component-bind-1.0.0" + sources."commander-2.20.3" sources."component-emitter-1.3.0" - sources."component-inherit-0.0.3" - sources."compress-commons-4.1.1" + (sources."compress-commons-4.1.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."content-disposition-0.5.4" + (sources."content-disposition-0.5.4" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) sources."cookiejar-2.1.3" - sources."core-util-is-1.0.2" - sources."crc-32-1.2.0" - sources."crc32-stream-4.0.2" + sources."core-util-is-1.0.3" + sources."crc-32-1.2.1" + (sources."crc32-stream-4.0.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -118549,9 +122601,8 @@ in sources."type-1.2.0" ]; }) - sources."dashdash-1.14.1" - sources."dayjs-1.10.7" - sources."debug-2.6.9" + sources."dayjs-1.11.0" + sources."debug-4.3.4" (sources."decompress-4.2.1" // { dependencies = [ (sources."make-dir-1.3.0" // { @@ -118561,10 +122612,16 @@ in }) ]; }) - sources."decompress-response-3.3.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) (sources."decompress-tar-4.1.1" // { dependencies = [ + sources."bl-1.2.3" sources."file-type-5.2.0" + sources."tar-stream-1.6.2" ]; }) (sources."decompress-tarbz2-4.1.1" // { @@ -118583,37 +122640,18 @@ in sources."get-stream-2.3.1" ]; }) - sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" + sources."defaults-1.0.3" + sources."defer-to-connect-2.0.1" sources."deferred-0.7.11" sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."denque-1.5.1" - sources."detect-libc-1.0.3" - sources."diagnostics-1.1.1" - sources."dijkstrajs-1.0.2" sources."dir-glob-3.0.1" - sources."dot-qs-0.2.0" sources."dotenv-10.0.0" sources."dotenv-expand-5.1.0" - sources."duplexer3-0.1.4" - sources."duplexify-4.1.2" sources."duration-0.2.2" - sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" - sources."enabled-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-client-3.5.2" // { - dependencies = [ - sources."debug-3.1.0" - sources."ws-7.4.6" - ]; - }) - sources."engine.io-parser-2.2.1" - sources."env-variable-0.0.6" - sources."es5-ext-0.10.53" + sources."es5-ext-0.10.59" sources."es6-iterator-2.0.3" - sources."es6-promisify-6.1.1" (sources."es6-set-0.1.5" // { dependencies = [ sources."es6-symbol-3.1.1" @@ -118628,135 +122666,80 @@ in sources."event-emitter-0.3.5" sources."events-1.1.1" sources."exit-on-epipe-1.0.1" - sources."expand-template-2.0.3" sources."ext-1.6.0" sources."ext-list-2.2.2" sources."ext-name-5.0.0" sources."extend-3.0.2" sources."external-editor-3.1.0" - sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.11" - sources."fast-json-stable-stringify-2.1.0" sources."fastest-levenshtein-1.0.12" sources."fastq-1.13.0" sources."fd-slicer-1.1.0" - sources."fecha-4.2.1" sources."figures-3.2.0" sources."file-type-16.5.3" - sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" sources."filesize-8.0.7" sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" - sources."follow-redirects-1.14.7" - sources."forever-agent-0.6.1" + sources."follow-redirects-1.14.9" sources."form-data-2.5.1" sources."formidable-1.2.6" sources."fs-constants-1.0.0" - (sources."fs-extra-9.1.0" // { - dependencies = [ - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" - ]; - }) + sources."fs-extra-9.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fs2-0.3.9" sources."fsevents-2.3.2" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" sources."get-stdin-8.0.0" - sources."get-stream-4.1.0" - sources."getpass-0.1.7" - sources."github-from-package-0.0.0" + sources."get-stream-6.0.1" sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globby-11.1.0" - (sources."got-11.8.3" // { - dependencies = [ - sources."@sindresorhus/is-4.3.0" - sources."@szmarczak/http-timer-4.0.6" - sources."cacheable-request-7.0.2" - sources."decompress-response-6.0.0" - sources."defer-to-connect-2.0.1" - sources."get-stream-5.2.0" - sources."json-buffer-3.0.1" - sources."keyv-4.0.5" - sources."lowercase-keys-2.0.0" - sources."mimic-response-3.1.0" - sources."normalize-url-6.1.0" - sources."p-cancelable-2.1.1" - sources."responselike-2.0.0" - ]; - }) + sources."got-11.8.3" sources."graceful-fs-4.2.9" sources."graphlib-2.1.8" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - (sources."has-binary2-1.0.3" // { - dependencies = [ - sources."isarray-2.0.1" - ]; - }) - sources."has-cors-1.1.0" + sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-unicode-2.0.1" + sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" - sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" - (sources."https-proxy-agent-5.0.0" // { - dependencies = [ - sources."debug-4.3.3" - sources."ms-2.1.2" - ]; - }) + sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.2.0" sources."immediate-3.0.6" sources."imurmurhash-0.1.4" - sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.8" - (sources."inquirer-7.3.3" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - ]; - }) - sources."inquirer-autocomplete-prompt-1.4.0" - sources."is-arrayish-0.3.2" + sources."inquirer-8.2.2" sources."is-binary-path-2.1.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" + sources."is-interactive-1.0.0" sources."is-natural-number-4.0.1" sources."is-number-7.0.0" sources."is-plain-obj-1.1.0" sources."is-promise-2.2.2" sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isomorphic-ws-4.0.1" - sources."isstream-0.1.2" sources."jmespath-0.16.0" (sources."js-yaml-4.1.0" // { dependencies = [ sources."argparse-2.0.1" ]; }) - sources."jsbn-0.1.1" - sources."json-buffer-3.0.0" + sources."json-buffer-3.0.1" sources."json-cycle-1.3.0" (sources."json-refs-3.0.15" // { dependencies = [ @@ -118764,33 +122747,12 @@ in sources."js-yaml-3.14.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."jszip-3.7.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."jwt-decode-3.1.2" - (sources."kafka-node-5.0.0" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - sources."keyv-3.1.0" - sources."kuler-1.0.1" - (sources."lazystream-1.0.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."json-schema-traverse-1.0.0" + sources."jsonfile-6.1.0" + sources."jszip-3.7.1" + sources."jwt-decode-2.2.0" + sources."keyv-4.1.1" + sources."lazystream-1.0.1" sources."lie-3.3.0" sources."lodash-4.17.21" sources."lodash.defaults-4.2.0" @@ -118799,21 +122761,9 @@ in sources."lodash.isplainobject-4.0.6" sources."lodash.union-4.6.0" sources."log-6.3.1" - (sources."log-node-8.0.3" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."has-flag-4.0.0" - sources."supports-color-8.1.1" - ]; - }) - (sources."logform-2.3.2" // { - dependencies = [ - sources."colors-1.4.0" - sources."ms-2.1.3" - ]; - }) - sources."long-1.1.2" - sources."lowercase-keys-1.0.1" + sources."log-node-8.0.3" + sources."log-symbols-4.1.0" + sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."lru-queue-0.1.0" (sources."make-dir-3.1.0" // { @@ -118821,274 +122771,141 @@ in sources."semver-6.3.0" ]; }) - sources."media-typer-0.3.0" - (sources."memoizee-0.4.15" // { - dependencies = [ - sources."next-tick-1.1.0" - ]; - }) + sources."memoizee-0.4.15" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" sources."minipass-3.1.6" sources."minizlib-2.1.2" - sources."mkdirp-0.5.5" - sources."ms-2.0.0" + sources."mkdirp-1.0.4" + sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nan-2.15.0" - sources."nanoid-2.1.11" - sources."napi-build-utils-1.0.2" sources."native-promise-only-0.8.1" - sources."ncjsm-4.2.0" - sources."nested-error-stacks-2.1.0" - sources."next-tick-1.0.0" + sources."ncjsm-4.3.0" + sources."next-tick-1.1.0" sources."nice-try-1.0.5" - (sources."node-abi-2.30.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) sources."node-dir-0.1.17" sources."node-fetch-2.6.7" - sources."noop-logger-0.1.1" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."oauth-sign-0.9.0" + sources."normalize-url-6.1.0" + sources."npm-registry-utilities-1.0.0" sources."object-assign-4.1.1" + sources."object-hash-2.2.0" + sources."object-inspect-1.12.0" sources."once-1.4.0" - sources."one-time-0.0.4" sources."onetime-5.1.2" sources."open-7.4.2" - sources."optional-0.1.4" - sources."os-homedir-1.0.2" + sources."ora-5.4.1" sources."os-tmpdir-1.0.2" - sources."p-cancelable-1.1.0" + sources."p-cancelable-2.1.1" sources."p-event-4.2.0" sources."p-finally-1.0.0" sources."p-timeout-3.2.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."got-9.6.0" - sources."semver-6.3.0" - ]; - }) sources."pako-1.0.11" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-loader-1.0.10" sources."path-type-4.0.0" sources."path2-0.1.0" - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."pend-1.2.0" - sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."prebuild-install-5.3.0" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) - sources."prepend-http-2.0.0" - sources."prettyoutput-1.2.0" - sources."printj-1.1.2" + sources."printj-1.3.1" sources."process-nextick-args-2.0.1" sources."process-utils-4.0.0" sources."promise-queue-2.2.5" - (sources."protobufjs-6.11.2" // { - dependencies = [ - sources."long-4.0.0" - ]; - }) - sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qrcode-terminal-0.12.0" - sources."qs-6.5.3" + sources."qs-6.10.3" sources."querystring-0.2.1" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" - sources."ramda-0.26.1" - sources."rc-1.2.8" - sources."readable-stream-3.6.0" - sources."readable-web-to-node-stream-3.0.2" - sources."readdir-glob-1.1.1" - sources."readdirp-3.6.0" - sources."registry-auth-token-4.2.1" - sources."registry-url-5.1.0" - sources."replaceall-0.1.6" - (sources."request-2.88.2" // { + sources."readable-stream-2.3.7" + (sources."readable-web-to-node-stream-3.0.2" // { dependencies = [ - sources."form-data-2.3.3" - sources."uuid-3.4.0" + sources."readable-stream-3.6.0" ]; }) - sources."request-promise-core-1.1.4" - sources."request-promise-native-1.0.9" + sources."readdir-glob-1.1.1" + sources."readdirp-3.6.0" + sources."require-from-string-2.0.2" sources."resolve-alpn-1.2.1" - sources."responselike-1.0.2" + sources."responselike-2.0.0" sources."restore-cursor-3.1.0" - sources."retry-0.10.1" sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."run-parallel-limit-1.1.0" - sources."rxjs-6.6.7" - sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-1.1.1" + sources."rxjs-7.5.5" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."seek-bzip-1.0.6" sources."semver-7.3.5" - sources."set-blocking-2.0.0" sources."set-immediate-shim-1.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shortid-2.2.16" - sources."signal-exit-3.0.6" - sources."simple-concat-1.0.1" - sources."simple-get-2.8.1" - (sources."simple-git-2.48.0" // { - dependencies = [ - sources."debug-4.3.3" - sources."ms-2.1.2" - ]; - }) - sources."simple-swizzle-0.2.2" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.7" + sources."simple-git-3.4.0" sources."slash-3.0.0" - sources."snappy-6.3.5" - (sources."socket.io-client-2.4.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."socket.io-parser-3.3.2" // { - dependencies = [ - sources."debug-3.1.0" - sources."isarray-2.0.1" - ]; - }) sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" - sources."split2-3.2.2" + (sources."split2-3.2.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."sprintf-js-1.0.3" sources."sprintf-kit-2.0.1" - sources."sshpk-1.17.0" - sources."stack-trace-0.0.10" - sources."stealthy-require-1.1.1" sources."stream-promise-3.2.0" - sources."stream-shift-1.0.1" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) - sources."string_decoder-1.3.0" - (sources."strip-ansi-6.0.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - ]; - }) + sources."string-width-4.2.3" + sources."string_decoder-1.1.1" + sources."strip-ansi-6.0.1" sources."strip-dirs-2.1.0" - sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.7" - sources."ms-2.1.3" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" ]; }) - sources."supports-color-5.5.0" - (sources."tabtab-3.0.2" // { + (sources."supports-color-8.1.1" // { dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" - sources."chalk-2.4.2" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" - sources."debug-4.3.3" - sources."figures-2.0.0" - sources."inquirer-6.5.2" - sources."is-fullwidth-code-point-2.0.0" - sources."mimic-fn-1.2.0" - sources."ms-2.1.2" - sources."mute-stream-0.0.7" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) - sources."untildify-3.0.3" + sources."has-flag-4.0.0" ]; }) - (sources."tar-6.1.11" // { + sources."tar-6.1.11" + (sources."tar-stream-2.2.0" // { dependencies = [ - sources."chownr-2.0.0" - sources."mkdirp-1.0.4" + sources."readable-stream-3.6.0" ]; }) - (sources."tar-fs-1.16.3" // { - dependencies = [ - sources."pump-1.0.3" - ]; - }) - (sources."tar-stream-1.6.2" // { - dependencies = [ - sources."bl-1.2.3" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."tencent-serverless-http-1.3.2" - sources."text-hex-1.0.0" sources."throat-5.0.0" sources."through-2.3.8" sources."timers-ext-0.1.7" sources."tmp-0.0.33" - sources."to-array-0.1.4" sources."to-buffer-1.1.1" - sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."token-types-4.1.1" - sources."tough-cookie-2.5.0" + sources."token-types-4.2.0" sources."tr46-0.0.3" sources."traverse-0.6.6" sources."trim-repeated-1.0.0" - sources."triple-beam-1.3.0" - sources."tslib-1.14.1" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-2.5.0" + sources."tslib-2.3.1" + sources."type-2.6.0" sources."type-fest-0.21.3" - sources."type-is-1.6.18" - sources."typedarray-to-buffer-3.1.5" sources."unbzip2-stream-1.4.3" sources."uni-global-1.0.0" - sources."universalify-0.1.2" + sources."universalify-2.0.0" sources."untildify-4.0.0" sources."uri-js-4.4.1" (sources."url-0.10.3" // { @@ -119097,46 +122914,28 @@ in sources."querystring-0.2.0" ]; }) - sources."url-parse-lax-3.0.0" - sources."urlencode-1.1.0" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" - sources."verror-1.10.0" + sources."validate-npm-package-name-3.0.0" + sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" - sources."which-pm-runs-1.0.0" - sources."wide-align-1.1.5" - (sources."widest-line-3.1.0" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - ]; - }) - sources."winston-3.2.1" - sources."winston-transport-4.4.2" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - ]; - }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.3" - sources."ws-7.5.6" + sources."write-file-atomic-4.0.1" + sources."ws-7.5.7" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" - sources."xmlhttprequest-ssl-1.6.3" sources."xtend-4.0.2" sources."yallist-4.0.0" sources."yaml-ast-parser-0.0.43" sources."yamljs-0.3.0" sources."yauzl-2.10.0" - sources."yeast-0.1.2" - sources."zip-stream-4.1.0" + (sources."zip-stream-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -119159,7 +122958,7 @@ in dependencies = [ sources."CSSselect-0.4.1" sources."CSSwhat-0.4.7" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."after-0.8.1" sources."ajv-6.12.6" sources."array-flatten-1.1.1" @@ -119175,8 +122974,8 @@ in sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."blob-0.0.2" - sources."body-parser-1.19.1" - sources."bytes-3.1.1" + sources."body-parser-1.19.2" + sources."bytes-3.1.2" sources."callsite-1.0.0" sources."caseless-0.12.0" sources."cheerio-0.17.0" @@ -119187,7 +122986,7 @@ in sources."component-inherit-0.0.3" sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."dashdash-1.14.1" @@ -119223,7 +123022,7 @@ in sources."escape-html-1.0.3" sources."etag-1.8.1" sources."event-stream-3.3.5" - sources."express-4.17.2" + sources."express-4.17.3" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" @@ -119269,15 +123068,15 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."moment-2.7.0" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."nan-0.3.2" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."oauth-sign-0.9.0" sources."object-component-0.0.3" sources."on-finished-2.3.0" @@ -119292,9 +123091,9 @@ in sources."proxy-addr-2.0.7" sources."psl-1.8.0" sources."punycode-2.1.1" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" sources."read-1.0.7" sources."readable-stream-1.1.14" (sources."request-2.88.2" // { @@ -119675,9 +123474,9 @@ in sources."keep-alive-agent-0.0.1" sources."lru-cache-2.2.0" sources."mime-1.6.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."mv-2.1.1" sources."nan-2.15.0" sources."ncp-2.0.0" @@ -119776,15 +123575,14 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.834.0"; + version = "1.884.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.834.0.tgz"; - sha512 = "0XKshpV1azNRxOKwFV+NuR/ukT0OAhsUZI/jSN6O2XIQ5lYWXC8wNgvtpJ4pmhekMjBCj4rH6mxYDo2USWEZ1g=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.884.0.tgz"; + sha512 = "lQtXRoi0mgTsrjzTcKNbpec+q4ai8rhls1FOcr2ZBTe7V7mKTGXZ9yk6DY2VXRKyboL8zvV3rIrzm+l85n5yIg=="; }; buildInputs = globalBuildInputs; meta = { description = "snyk library and cli utility"; - homepage = "https://github.com/snyk/snyk#readme"; license = "Apache-2.0"; }; production = true; @@ -119804,19 +123602,19 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-17.0.10" - sources."accepts-1.3.7" + sources."@types/node-17.0.23" + sources."accepts-1.3.8" sources."base64id-2.0.0" sources."component-emitter-1.3.0" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cors-2.8.5" - sources."debug-4.3.3" - sources."engine.io-6.1.2" + sources."debug-4.3.4" + sources."engine.io-6.1.3" sources."engine.io-parser-5.0.3" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."ms-2.1.2" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."object-assign-4.1.1" sources."socket.io-adapter-2.3.3" sources."socket.io-parser-4.0.4" @@ -119865,7 +123663,7 @@ in sources."bl-5.0.0" sources."buffer-6.0.3" sources."camelcase-6.3.0" - sources."camelcase-keys-7.0.1" + sources."camelcase-keys-7.0.2" sources."chalk-4.1.2" sources."cli-cursor-4.0.0" sources."cli-spinners-2.6.1" @@ -119904,7 +123702,7 @@ in sources."is-fullwidth-code-point-4.0.0" sources."is-interactive-2.0.0" sources."is-plain-obj-1.1.0" - sources."is-unicode-supported-1.1.0" + sources."is-unicode-supported-1.2.0" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" sources."kind-of-6.0.3" @@ -119912,7 +123710,7 @@ in sources."locate-path-6.0.0" (sources."log-symbols-5.1.0" // { dependencies = [ - sources."chalk-5.0.0" + sources."chalk-5.0.1" ]; }) sources."log-update-5.0.0" @@ -119925,7 +123723,11 @@ in sources."ms-2.0.0" sources."normalize-package-data-3.0.3" sources."onetime-5.1.2" - sources."ora-6.0.1" + (sources."ora-6.1.0" // { + dependencies = [ + sources."chalk-5.0.1" + ]; + }) sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."parse-json-5.2.0" @@ -119940,7 +123742,7 @@ in sources."safe-buffer-5.2.1" sources."sax-1.2.4" sources."semver-7.3.5" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."slice-ansi-5.0.0" // { dependencies = [ sources."ansi-styles-6.1.0" @@ -119960,7 +123762,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" sources."strip-indent-4.0.0" @@ -120042,7 +123844,7 @@ in sources."array-unique-0.2.1" sources."arrify-1.0.1" sources."assign-symbols-1.0.0" - (sources."async-append-only-log-3.1.2" // { + (sources."async-append-only-log-3.1.4" // { dependencies = [ sources."push-stream-11.0.1" ]; @@ -120099,6 +123901,7 @@ in sources."chloride-2.4.1" sources."chloride-test-1.2.4" sources."chokidar-1.7.0" + sources."clarify-error-1.0.0" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -120146,7 +123949,7 @@ in sources."cpu-percentage-1.0.3" sources."crc-3.6.0" sources."cross-spawn-6.0.5" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decode-uri-component-0.2.0" sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" @@ -120185,6 +123988,7 @@ in }) sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" + sources."events-3.3.0" sources."exit-hook-1.1.1" sources."expand-brackets-0.1.5" sources."expand-range-1.8.2" @@ -120259,7 +124063,7 @@ in sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" sources."has-network-0.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."has-value-1.0.0" // { dependencies = [ @@ -120352,7 +124156,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-4.0.1" // { + (sources."jitdb-4.1.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.1" @@ -120386,9 +124190,9 @@ in ]; }) sources."levelup-4.4.0" - sources."libnested-1.5.1" - sources."libsodium-0.7.9" - sources."libsodium-wrappers-0.7.9" + sources."libnested-1.5.2" + sources."libsodium-0.7.10" + sources."libsodium-wrappers-0.7.10" sources."lodash.debounce-4.0.8" sources."lodash.get-4.4.2" sources."log-symbols-1.0.2" @@ -120405,26 +124209,32 @@ in sources."math-random-1.0.4" sources."mdmanifest-1.0.8" sources."micromatch-2.3.11" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" sources."monotonic-timestamp-0.0.9" sources."moo-0.5.1" sources."ms-2.1.2" - sources."multiblob-1.13.7" - sources."multiblob-http-1.2.0" + (sources."multiblob-1.13.8" // { + dependencies = [ + sources."glob-7.2.0" + sources."mkdirp-1.0.4" + sources."rimraf-3.0.2" + ]; + }) + sources."multiblob-http-1.2.1" sources."multicb-1.2.2" - sources."multiserver-3.7.2" + sources."multiserver-3.8.2" sources."multiserver-address-1.0.1" - sources."multiserver-scopes-1.0.0" + sources."multiserver-scopes-2.0.0" sources."mutexify-1.4.0" - sources."muxrpc-6.5.4" + sources."muxrpc-6.7.2" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" sources."muxrpcli-3.1.2" @@ -120448,7 +124258,7 @@ in sources."nice-try-1.0.5" sources."node-bindgen-loader-1.0.1" sources."node-gyp-build-4.3.0" - sources."non-private-ip-1.4.4" + sources."non-private-ip-2.2.0" sources."normalize-path-2.1.1" sources."normalize-uri-1.1.3" sources."npm-prefix-1.2.0" @@ -120466,7 +124276,7 @@ in }) ]; }) - sources."object-inspect-1.11.1" + sources."object-inspect-1.12.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { @@ -120495,7 +124305,7 @@ in sources."osenv-0.1.5" sources."p-defer-3.0.0" sources."packet-stream-2.0.6" - sources."packet-stream-codec-1.1.3" + sources."packet-stream-codec-1.2.0" sources."parse-entities-1.2.2" sources."parse-glob-3.0.4" sources."pascalcase-0.1.1" @@ -120514,7 +124324,7 @@ in sources."promisify-4loc-1.0.0" sources."promisize-1.1.2" sources."prr-1.0.1" - sources."pull-abortable-4.0.0" + sources."pull-abortable-4.1.1" sources."pull-async-1.0.0" sources."pull-awaitable-1.0.0" sources."pull-box-stream-1.0.13" @@ -120532,14 +124342,10 @@ in ]; }) sources."pull-glob-1.0.7" - (sources."pull-goodbye-0.0.2" // { - dependencies = [ - sources."pull-stream-3.5.0" - ]; - }) + sources."pull-goodbye-0.0.3" sources."pull-handshake-1.1.4" sources."pull-hash-1.0.0" - sources."pull-inactivity-2.1.3" + sources."pull-inactivity-2.1.4" sources."pull-level-2.0.4" sources."pull-live-1.0.1" sources."pull-looper-1.0.0" @@ -120579,14 +124385,13 @@ in sources."push-stream-11.0.1" ]; }) - sources."querystringify-2.2.0" sources."queue-tick-1.0.0" sources."quicktask-1.0.1" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" sources."random-access-chrome-file-1.2.0" - sources."random-access-file-2.2.0" - (sources."random-access-idb-1.2.1" // { + sources."random-access-file-2.2.1" + (sources."random-access-idb-1.2.2" // { dependencies = [ sources."buffer-from-0.1.2" ]; @@ -120598,7 +124403,7 @@ in ]; }) sources."random-access-memory-3.1.4" - sources."random-access-storage-1.4.2" + sources."random-access-storage-1.4.3" sources."random-access-web-2.0.3" (sources."randomatic-3.1.1" // { dependencies = [ @@ -120676,8 +124481,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" - sources."requires-port-1.0.0" - sources."resolve-1.20.0" + sources."resolve-1.22.0" sources."resolve-url-0.2.1" sources."restore-cursor-1.0.1" sources."resumer-0.0.0" @@ -120693,8 +124497,8 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."sanitize-filename-1.6.3" - sources."secret-handshake-1.1.20" - sources."secret-stack-6.4.0" + sources."secret-handshake-1.1.21" + sources."secret-stack-6.4.1" sources."semver-5.7.1" sources."separator-escape-0.0.1" (sources."set-value-2.0.1" // { @@ -120735,7 +124539,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -120750,13 +124554,13 @@ in sources."source-map-url-0.4.1" sources."split-buffer-1.0.0" sources."split-string-3.1.0" - (sources."ssb-bendy-butt-0.12.4" // { + (sources."ssb-bendy-butt-0.12.5" // { dependencies = [ sources."ssb-keys-8.2.0" ]; }) - sources."ssb-bfe-3.1.1" - sources."ssb-bfe-spec-0.3.0" + sources."ssb-bfe-3.1.3" + sources."ssb-bfe-spec-0.4.0" sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" @@ -120766,7 +124570,7 @@ in ]; }) sources."ssb-db-19.2.0" - (sources."ssb-db2-2.8.6" // { + (sources."ssb-db2-2.8.11" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -120782,7 +124586,7 @@ in sources."rimraf-3.0.2" (sources."ssb-keys-8.2.0" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" ]; }) ]; @@ -120820,9 +124624,9 @@ in sources."ssb-query-2.4.5" sources."ssb-ref-2.16.0" sources."ssb-replicate-1.3.3" - sources."ssb-typescript-2.5.0" + sources."ssb-typescript-2.6.0" sources."ssb-unix-socket-1.0.0" - sources."ssb-uri2-1.6.0" + sources."ssb-uri2-1.7.2" (sources."ssb-validate-4.1.4" // { dependencies = [ sources."ssb-keys-8.2.0" @@ -120864,9 +124668,10 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - (sources."tape-4.14.0" // { + sources."supports-preserve-symlinks-flag-1.0.0" + (sources."tape-4.15.0" // { dependencies = [ - sources."glob-7.1.7" + sources."glob-7.2.0" ]; }) sources."text-table-0.2.0" @@ -120915,7 +124720,6 @@ in }) sources."untildify-2.1.0" sources."urix-0.1.0" - sources."url-parse-1.5.4" sources."use-3.1.1" sources."user-home-2.0.0" sources."utf8-byte-length-1.0.4" @@ -120934,7 +124738,7 @@ in sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xtend-4.0.2" sources."zerr-1.0.4" ]; @@ -120986,7 +124790,7 @@ in }) sources."@types/babel-types-7.0.11" sources."@types/babylon-6.16.6" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."acorn-3.3.0" (sources."acorn-globals-3.1.0" // { dependencies = [ @@ -121034,7 +124838,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1062.0" // { + (sources."aws-sdk-2.1101.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -121062,9 +124866,9 @@ in sources."bindings-1.2.1" sources."blob-0.0.5" sources."bluebird-2.11.0" - (sources."body-parser-1.19.1" // { + (sources."body-parser-1.19.2" // { dependencies = [ - sources."qs-6.9.6" + sources."qs-6.9.7" ]; }) sources."boom-2.10.1" @@ -121078,7 +124882,7 @@ in sources."bunyan-1.8.15" sources."busboy-0.2.14" sources."bytebuffer-3.5.5" - sources."bytes-3.1.1" + sources."bytes-3.1.2" sources."call-bind-1.0.2" sources."camelcase-1.2.1" sources."caseless-0.11.0" @@ -121178,7 +124982,7 @@ in sources."end-of-stream-1.4.4" (sources."engine.io-3.5.0" // { dependencies = [ - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."debug-4.1.1" sources."ws-7.4.6" ]; @@ -121204,12 +125008,13 @@ in sources."cross-spawn-6.0.5" ]; }) - (sources."express-4.17.2" // { + (sources."express-4.17.3" // { dependencies = [ - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."proxy-addr-2.0.7" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."safe-buffer-5.2.1" + sources."serve-static-1.14.2" ]; }) (sources."express-validator-2.21.0" // { @@ -121227,7 +125032,7 @@ in sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."formidable-1.2.6" @@ -121263,7 +125068,7 @@ in ]; }) sources."has-cors-1.1.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hawk-3.1.3" sources."highlight.js-8.2.0" @@ -121299,7 +125104,7 @@ in ]; }) sources."is-fullwidth-code-point-1.0.0" - sources."is-my-ip-valid-1.0.0" + sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" sources."is-promise-2.2.2" sources."is-property-1.0.2" @@ -121396,14 +125201,14 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minitouch-prebuilt-1.2.0" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."moment-2.29.1" sources."ms-2.1.3" sources."multer-1.4.4" @@ -121414,7 +125219,7 @@ in sources."native-promise-only-0.8.1" sources."ncp-2.0.0" sources."needle-1.6.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."nice-try-1.0.5" sources."node-forge-0.7.6" sources."node-uuid-1.4.8" @@ -121504,7 +125309,7 @@ in sources."randexp-0.4.9" sources."random-bytes-1.0.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" sources."read-pkg-1.1.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ @@ -121538,7 +125343,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."ret-0.2.2" sources."rethinkdb-2.4.2" sources."retry-0.9.0" @@ -121562,13 +125367,22 @@ in sources."safe-buffer-5.1.1" ]; }) - sources."serve-static-1.14.2" + (sources."serve-static-1.15.0" // { + dependencies = [ + sources."depd-2.0.0" + sources."destroy-1.2.0" + sources."http-errors-2.0.0" + sources."on-finished-2.4.1" + sources."send-0.18.0" + sources."statuses-2.0.1" + ]; + }) sources."set-blocking-2.0.0" sources."setprototypeof-1.2.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-1.0.0" sources."sntp-1.0.9" (sources."socket.io-2.4.1" // { @@ -121619,7 +125433,7 @@ in sources."streamsearch-0.1.2" (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-4.0.0" ]; @@ -121675,7 +125489,7 @@ in sources."tough-cookie-2.3.4" (sources."transliteration-1.6.6" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."cliui-4.1.0" sources."strip-ansi-4.0.0" sources."yargs-12.0.5" @@ -121812,10 +125626,10 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "14.2.0"; + version = "14.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-14.2.0.tgz"; - sha512 = "i0DrmDXFNpDsWiwx6SPRs4/pyw4kvZgqpDGvsTslQMY7hpUl6r33aQvNSn6cnTg2wtZ9rreFElI7XAKpOWi1vQ=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-14.6.1.tgz"; + sha512 = "FfNdvZUZdzh9KDQxDnO7Opp+prKh8OQVuSW8S13cBtxrooCbm6J6royhUeb++53WPMt04VB+ZbOz/QmzAijs6Q=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -121827,7 +125641,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" - sources."ajv-8.9.0" + sources."ajv-8.11.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -121850,8 +125664,9 @@ in sources."colord-2.9.2" sources."concat-map-0.0.1" sources."cosmiconfig-7.0.1" + sources."css-functions-list-3.0.1" sources."cssesc-3.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -121871,7 +125686,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-stdin-8.0.0" @@ -121907,7 +125722,6 @@ in sources."is-plain-obj-1.1.0" sources."is-plain-object-5.0.0" sources."is-regexp-2.1.0" - sources."is-typedarray-1.0.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" @@ -121922,12 +125736,12 @@ in sources."mathml-tag-names-2.1.3" sources."meow-9.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minimist-options-4.1.0" sources."ms-2.1.2" - sources."nanoid-3.2.0" + sources."nanoid-3.3.1" sources."normalize-package-data-3.0.3" sources."normalize-path-3.0.0" sources."normalize-selector-0.2.0" @@ -121943,7 +125757,7 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."postcss-8.4.5" + sources."postcss-8.4.12" sources."postcss-media-query-parser-0.2.3" sources."postcss-resolve-nested-selector-0.1.1" sources."postcss-safe-parser-6.0.0" @@ -121967,13 +125781,13 @@ in }) sources."redent-3.0.0" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-5.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."semver-7.3.5" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { dependencies = [ @@ -121993,20 +125807,25 @@ in sources."strip-indent-3.0.0" sources."style-search-0.1.0" sources."supports-color-5.5.0" + (sources."supports-hyperlinks-2.2.0" // { + dependencies = [ + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."supports-preserve-symlinks-flag-1.0.0" sources."svg-tags-1.0.0" sources."table-6.8.0" sources."to-regex-range-5.0.1" sources."trim-newlines-3.0.1" sources."type-fest-0.18.1" - sources."typedarray-to-buffer-3.1.5" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" sources."validate-npm-package-license-3.0.4" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" + sources."write-file-atomic-4.0.1" sources."yallist-4.0.0" sources."yaml-1.10.2" sources."yargs-parser-20.2.9" @@ -122032,7 +125851,7 @@ in dependencies = [ sources."ajv-6.12.6" sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.6" sources."assert-plus-1.0.0" @@ -122081,7 +125900,7 @@ in sources."inherits-2.0.4" (sources."inquirer-6.5.2" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."strip-ansi-5.2.0" ]; }) @@ -122095,14 +125914,14 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.2" sources."lodash-4.17.21" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minimist-1.2.3" - (sources."mkdirp-0.5.5" // { + (sources."mkdirp-0.5.6" // { dependencies = [ - sources."minimist-1.2.5" + sources."minimist-1.2.6" ]; }) sources."moniker-0.1.2" @@ -122127,7 +125946,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."split-0.3.1" sources."sshpk-1.17.0" sources."string-width-2.1.1" @@ -122161,16 +125980,16 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "2.3.0"; + version = "2.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.3.0.tgz"; - sha512 = "SBKdJyUmxzPmJf/ZPqDSQOoa9JzOcgEpV7u3UaYcgVn7fA0veZ3FA5JgLU8KYtf84Gp6guBVcrC7XKLjJa5SXQ=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.4.6.tgz"; + sha512 = "luzdly7RJhyXucQe8ID/7CqDgXdMrPYXmyZBjCbp+cixzTopZotuWevrB5hWDOnOU19m2cyetigIIa7WDHnCmQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -122199,13 +126018,13 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."magic-string-0.25.7" + sources."magic-string-0.25.9" sources."merge2-1.4.1" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."mri-1.2.0" sources."normalize-path-3.0.0" sources."once-1.4.0" @@ -122225,9 +126044,9 @@ in sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" - sources."svelte-preprocess-4.10.2" + sources."svelte-preprocess-4.10.4" sources."to-regex-range-5.0.1" - sources."typescript-4.5.5" + sources."typescript-4.6.3" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -122243,19 +126062,19 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.18"; + version = "0.14.23"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.18.tgz"; - sha512 = "/qHEz7D2MUZVpUk8biYx6Xfk2W8SHeWOsQdrKLcJ5SH7MrwgxcIg5RRAEgMrrT4WyTNzD9IOQWVSokd+yS84Ww=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.23.tgz"; + sha512 = "/k/Py3fr5Dq7OncbktZUpE/fgMy503hArv41nOa6NLoMbnB3/Lqz7onOKo/K+fyfvWUkHF+Wklz6PZcaNPE8/A=="; }; dependencies = [ - sources."@emmetio/abbreviation-2.2.2" + sources."@emmetio/abbreviation-2.2.3" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -122268,7 +126087,7 @@ in sources."concat-map-0.0.1" sources."dedent-js-1.0.1" sources."detect-indent-6.1.0" - sources."emmet-2.3.5" + sources."emmet-2.3.6" sources."es6-promise-3.3.1" sources."estree-walker-2.0.2" sources."fast-glob-3.2.11" @@ -122288,13 +126107,13 @@ in sources."jsonc-parser-2.3.1" sources."lodash-4.17.21" sources."lower-case-2.0.2" - sources."magic-string-0.25.7" + sources."magic-string-0.25.9" sources."merge2-1.4.1" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."no-case-3.0.4" sources."normalize-path-3.0.0" sources."once-1.4.0" @@ -122313,13 +126132,13 @@ in sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" - sources."svelte-3.46.2" - sources."svelte-preprocess-4.10.2" - sources."svelte2tsx-0.4.14" + sources."svelte-3.46.4" + sources."svelte-preprocess-4.10.4" + sources."svelte2tsx-0.5.6" sources."to-regex-range-5.0.1" sources."tslib-2.3.1" - sources."typescript-4.5.5" - sources."vscode-css-languageservice-5.1.9" + sources."typescript-4.6.3" + sources."vscode-css-languageservice-5.1.13" (sources."vscode-emmet-helper-2.6.4" // { dependencies = [ sources."vscode-uri-2.1.2" @@ -122338,7 +126157,7 @@ in sources."vscode-jsonrpc-6.0.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.3" @@ -122372,7 +126191,7 @@ in sources."csso-4.2.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."entities-2.2.0" sources."mdn-data-2.0.14" @@ -122522,8 +126341,8 @@ in sources."deep-extend-0.6.0" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - sources."destroy-1.0.4" + sources."depd-2.0.0" + sources."destroy-1.2.0" (sources."dicer-0.2.5" // { dependencies = [ sources."isarray-0.0.1" @@ -122608,21 +126427,25 @@ in sources."growl-1.9.2" (sources."handlebars-4.7.7" // { dependencies = [ - sources."minimist-1.2.5" + sources."minimist-1.2.6" sources."source-map-0.6.1" ]; }) sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."http-errors-1.8.1" + (sources."http-errors-2.0.0" // { + dependencies = [ + sources."statuses-2.0.1" + ]; + }) sources."iconv-lite-0.4.8" sources."ignore-by-default-1.0.1" sources."import-lazy-2.1.0" @@ -122724,9 +126547,9 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimatch-3.0.4" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" sources."minimist-0.0.8" sources."mixin-deep-1.3.2" sources."mkdirp-0.5.1" @@ -122745,8 +126568,8 @@ in sources."ms-2.0.0" (sources."multer-1.4.4" // { dependencies = [ - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" ]; }) sources."mute-stream-0.0.5" @@ -122822,7 +126645,7 @@ in }) (sources."rc-1.2.8" // { dependencies = [ - sources."minimist-1.2.5" + sources."minimist-1.2.6" ]; }) sources."readable-stream-2.3.7" @@ -122846,12 +126669,14 @@ in sources."sanitize-filename-1.6.3" sources."semver-5.7.1" sources."semver-diff-2.1.0" - (sources."send-0.17.2" // { + (sources."send-0.18.0" // { dependencies = [ sources."ms-2.1.3" + sources."on-finished-2.4.1" + sources."statuses-2.0.1" ]; }) - sources."serve-static-1.14.2" + sources."serve-static-1.15.0" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -122863,7 +126688,7 @@ in sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" sources."sigmund-1.0.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-1.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -122922,7 +126747,7 @@ in sources."string-3.3.3" (sources."string-width-2.1.1" // { dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-4.0.0" ]; @@ -122975,7 +126800,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.3" sources."undefsafe-2.0.5" (sources."union-value-1.0.1" // { dependencies = [ @@ -123035,10 +126860,10 @@ in tailwindcss = nodeEnv.buildNodePackage { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.0.15"; + version = "3.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.15.tgz"; - sha512 = "bT2iy7FtjwgsXik4ZoJnHXR+SRCiGR1W95fVqpLZebr64m4ahwUwRbIAc5w5+2fzr1YF4Ct2eI7dojMRRl8sVQ=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.0.23.tgz"; + sha512 = "+OZOV9ubyQ6oI2BXEhzw4HrqvgcARY38xv3zKcjnWtMIZstEsXdI9xftd1iB7+RbOnj2HOEzkA0OyB5BaSxPQA=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -123104,30 +126929,34 @@ in sources."is-number-7.0.0" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" - sources."lilconfig-2.0.4" + sources."lilconfig-2.0.5" sources."lines-and-columns-1.2.4" sources."merge2-1.4.1" - sources."micromatch-4.0.4" - sources."minimist-1.2.5" + sources."micromatch-4.0.5" + sources."minimist-1.2.6" + sources."nanoid-3.3.1" sources."normalize-path-3.0.0" sources."object-hash-2.2.0" sources."parent-module-1.0.1" sources."parse-json-5.2.0" sources."path-parse-1.0.7" sources."path-type-4.0.0" + sources."picocolors-1.0.0" sources."picomatch-2.3.1" + sources."postcss-8.4.12" sources."postcss-js-4.0.0" - sources."postcss-load-config-3.1.1" + sources."postcss-load-config-3.1.3" sources."postcss-nested-5.0.6" sources."postcss-selector-parser-6.0.9" sources."postcss-value-parser-4.2.0" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."readdirp-3.6.0" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."run-parallel-1.2.0" + sources."source-map-js-1.0.2" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."to-regex-range-5.0.1" @@ -123156,7 +126985,7 @@ in }; dependencies = [ sources."ajv-6.12.6" - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."asn1-0.2.6" @@ -123178,7 +127007,7 @@ in sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" sources."discord.js-11.6.4" @@ -123209,9 +127038,9 @@ in sources."locate-path-3.0.0" sources."long-4.0.0" sources."mime-2.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimist-1.2.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimist-1.2.6" sources."module-alias-2.2.2" sources."moment-2.29.1" sources."ms-2.1.2" @@ -123249,7 +127078,7 @@ in sources."tr46-0.0.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-1.0.3" - sources."typegram-3.7.0" + sources."typegram-3.8.0" sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" @@ -123320,7 +127149,7 @@ in sources."inherits-2.0.4" sources."isarray-1.0.0" sources."memory-fs-0.3.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."object-assign-4.1.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -123347,12 +127176,13 @@ in terser = nodeEnv.buildNodePackage { name = "terser"; packageName = "terser"; - version = "5.10.0"; + version = "5.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz"; - sha512 = "AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA=="; + url = "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz"; + sha512 = "NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ=="; }; dependencies = [ + sources."acorn-8.7.0" sources."buffer-from-1.1.2" sources."commander-2.20.3" sources."source-map-0.7.3" @@ -123375,34 +127205,34 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.1.0.tgz"; - sha512 = "VZ0iVepE0jUchMfIW0uKGdEdv3l0ajOFvUBcpB1xGOLAz3gVwpdWvlagVlFXuwjc2N+9mcjTM0PCIXNwIs2vQA=="; + url = "https://registry.npmjs.org/textlint/-/textlint-12.1.1.tgz"; + sha512 = "AoE/pPL+6e/7hHOxwxL5oBTYIsG6gjrMP77VQZVYxXYfTDduwRlqhQUUrVd32DaLQTm7z3/lCnY46uFkmK06fA=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-12.1.0" - sources."@textlint/ast-tester-12.1.0" - sources."@textlint/ast-traverse-12.1.0" - sources."@textlint/feature-flag-12.1.0" - sources."@textlint/fixer-formatter-12.1.0" - sources."@textlint/kernel-12.1.0" - sources."@textlint/linter-formatter-12.1.0" - sources."@textlint/markdown-to-ast-12.1.0" - sources."@textlint/module-interop-12.1.0" - sources."@textlint/source-code-fixer-12.1.0" - sources."@textlint/text-to-ast-12.1.0" - sources."@textlint/textlint-plugin-markdown-12.1.0" - sources."@textlint/textlint-plugin-text-12.1.0" - sources."@textlint/types-12.1.0" - sources."@textlint/utils-12.1.0" + sources."@textlint/ast-node-types-12.1.1" + sources."@textlint/ast-tester-12.1.1" + sources."@textlint/ast-traverse-12.1.1" + sources."@textlint/feature-flag-12.1.1" + sources."@textlint/fixer-formatter-12.1.1" + sources."@textlint/kernel-12.1.1" + sources."@textlint/linter-formatter-12.1.1" + sources."@textlint/markdown-to-ast-12.1.1" + sources."@textlint/module-interop-12.1.1" + sources."@textlint/source-code-fixer-12.1.1" + sources."@textlint/text-to-ast-12.1.1" + sources."@textlint/textlint-plugin-markdown-12.1.1" + sources."@textlint/textlint-plugin-text-12.1.1" + sources."@textlint/types-12.1.1" + sources."@textlint/utils-12.1.1" sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" - sources."ajv-8.9.0" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" + sources."ajv-8.11.0" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."argparse-1.0.10" sources."astral-regex-2.0.0" sources."bail-1.0.5" @@ -123411,28 +127241,23 @@ in sources."brace-expansion-1.1.11" sources."call-bind-1.0.2" sources."ccount-1.1.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) + 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."charenc-0.0.2" - sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."crypt-0.0.2" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."deep-equal-1.1.1" sources."deep-is-0.1.4" sources."define-properties-1.1.3" sources."diff-4.0.2" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" @@ -123450,8 +127275,8 @@ in sources."glob-7.2.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" - sources."has-ansi-2.0.0" - sources."has-symbols-1.0.2" + sources."has-flag-4.0.0" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hosted-git-info-2.8.9" sources."inflight-1.0.6" @@ -123465,7 +127290,7 @@ in sources."is-date-object-1.0.5" sources."is-decimal-1.0.4" sources."is-file-1.0.0" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-hexadecimal-1.0.4" sources."is-plain-obj-2.1.0" sources."is-regex-1.1.4" @@ -123473,12 +127298,11 @@ in sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-1.0.0" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."levn-0.4.1" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" sources."lodash.truncate-4.4.2" - sources."log-symbols-1.0.2" sources."longest-streak-2.0.4" sources."markdown-table-2.0.0" (sources."md5-2.3.0" // { @@ -123486,11 +127310,7 @@ in sources."is-buffer-1.1.6" ]; }) - (sources."mdast-util-find-and-replace-1.1.1" // { - dependencies = [ - sources."escape-string-regexp-4.0.0" - ]; - }) + sources."mdast-util-find-and-replace-1.1.1" sources."mdast-util-footnote-0.1.7" sources."mdast-util-from-markdown-0.8.5" sources."mdast-util-frontmatter-0.2.0" @@ -123510,12 +127330,11 @@ in sources."micromark-extension-gfm-table-0.4.3" sources."micromark-extension-gfm-tagfilter-0.3.0" sources."micromark-extension-gfm-task-list-item-0.3.3" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."normalize-package-data-2.5.0" - sources."number-is-nan-1.0.1" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."once-1.4.0" @@ -123555,40 +127374,22 @@ in sources."remark-parse-9.0.0" sources."repeat-string-1.6.1" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."rimraf-2.6.3" sources."semver-5.7.1" - (sources."slice-ansi-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."is-fullwidth-code-point-3.0.0" - ]; - }) + sources."slice-ansi-4.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" sources."sprintf-js-1.0.3" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."strip-ansi-3.0.1" - ]; - }) - (sources."strip-ansi-6.0.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - ]; - }) + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-bom-2.0.0" sources."structured-source-3.0.2" - sources."supports-color-2.0.0" + sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."table-6.8.0" // { - dependencies = [ - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - ]; - }) + sources."table-6.8.0" sources."text-table-0.2.0" sources."traverse-0.6.6" sources."trough-1.0.5" @@ -123655,7 +127456,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."match-index-1.0.3" sources."object-keys-1.1.1" sources."regexp.prototype.flags-1.4.1" @@ -123746,7 +127547,7 @@ in sources."core-util-is-1.0.3" sources."crypto-random-string-2.0.0" sources."cuss-1.21.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -123873,8 +127674,8 @@ in sources."meow-7.1.1" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nlcst-is-literal-1.2.2" @@ -123936,7 +127737,7 @@ in sources."remark-retext-4.0.0" sources."remark-stringify-8.1.1" sources."repeat-string-1.6.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-5.0.0" sources."responselike-1.0.2" sources."retext-english-3.0.4" @@ -123949,7 +127750,7 @@ in sources."semver-6.3.0" ]; }) - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sliced-1.0.1" sources."space-separated-tokens-1.1.5" (sources."spawn-to-readstream-0.1.3" // { @@ -124270,7 +128071,7 @@ in sources."get-symbol-description-1.0.0" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" sources."is-bigint-1.0.4" @@ -124380,7 +128181,7 @@ in sources."get-symbol-description-1.0.0" sources."has-1.0.3" sources."has-bigints-1.0.1" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."internal-slot-1.0.3" sources."is-bigint-1.0.4" @@ -124458,7 +128259,7 @@ in sha512 = "dkVdH21q9vipV7UU10qQQprPuP8rG+IDJSHUtmOC0WDYvwYTiUC9IYLIpkyWdgfwFYegDTnnR4duHNZynqOXTA=="; }; dependencies = [ - sources."@sindresorhus/is-4.3.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" @@ -124466,15 +128267,19 @@ in sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.3" - sources."@types/node-17.0.10" + sources."@types/keyv-3.1.4" + sources."@types/node-17.0.23" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" - sources."accepts-1.3.7" + (sources."accepts-1.3.8" // { + dependencies = [ + sources."mime-types-2.1.35" + ]; + }) (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -124533,7 +128338,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.2.1" @@ -124556,7 +128361,7 @@ in sources."dicer-0.3.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" @@ -124566,8 +128371,8 @@ in sources."end-of-stream-1.4.4" (sources."engine.io-4.1.2" // { dependencies = [ - sources."cookie-0.4.1" - sources."debug-4.3.3" + sources."cookie-0.4.2" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -124612,7 +128417,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" @@ -124623,7 +128428,7 @@ in sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -124675,7 +128480,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."ldap-filter-0.3.3" sources."ldapjs-2.3.1" sources."linkify-it-3.0.3" @@ -124687,19 +128492,23 @@ in sources."methods-1.1.2" sources."middleware-handler-0.2.0" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.52.0" + (sources."mime-types-2.1.33" // { + dependencies = [ + sources."mime-db-1.50.0" + ]; + }) sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" (sources."minipass-2.9.0" // { dependencies = [ sources."yallist-3.1.1" ]; }) sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."mute-stream-0.0.8" (sources."needle-2.9.1" // { @@ -124708,7 +128517,7 @@ in sources."ms-2.1.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-addon-api-3.2.1" sources."node-forge-0.10.0" (sources."node-gyp-3.8.0" // { @@ -124772,7 +128581,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -124816,22 +128625,22 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" (sources."socket.io-3.1.2" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."socket.io-adapter-2.1.0" (sources."socket.io-parser-4.0.4" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."socks-2.6.1" + sources."socks-2.6.2" sources."sqlite3-5.0.2" sources."sshpk-1.17.0" sources."statuses-1.5.0" @@ -124852,7 +128661,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" sources."supports-color-7.2.0" (sources."tar-4.4.19" // { dependencies = [ @@ -124923,7 +128732,7 @@ in sha512 = "o24rZwvzeMbbvuara2bGaX6eHw925aQw1BZhl7VHtY6xlWrJ9Sy7P29/Q2GQNIP4Otzcf09TX29zTBbRjKbrSA=="; }; dependencies = [ - sources."@sindresorhus/is-4.3.0" + sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" @@ -124931,15 +128740,19 @@ in sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.3" - sources."@types/node-17.0.10" + sources."@types/keyv-3.1.4" + sources."@types/node-17.0.23" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" - sources."accepts-1.3.7" + (sources."accepts-1.3.8" // { + dependencies = [ + sources."mime-types-2.1.35" + ]; + }) (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -124998,7 +128811,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.2.1" @@ -125021,7 +128834,7 @@ in sources."dicer-0.3.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" @@ -125031,8 +128844,8 @@ in sources."end-of-stream-1.4.4" (sources."engine.io-4.1.2" // { dependencies = [ - sources."cookie-0.4.1" - sources."debug-4.3.3" + sources."cookie-0.4.2" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -125077,7 +128890,7 @@ in sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" @@ -125088,7 +128901,7 @@ in sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -125140,7 +128953,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."ldap-filter-0.3.3" sources."ldapjs-2.3.1" sources."linkify-it-3.0.3" @@ -125152,19 +128965,23 @@ in sources."methods-1.1.2" sources."middleware-handler-0.2.0" sources."mime-1.6.0" - sources."mime-db-1.50.0" - sources."mime-types-2.1.33" + sources."mime-db-1.52.0" + (sources."mime-types-2.1.33" // { + dependencies = [ + sources."mime-db-1.50.0" + ]; + }) sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" (sources."minipass-2.9.0" // { dependencies = [ sources."yallist-3.1.1" ]; }) sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."mute-stream-0.0.8" (sources."needle-2.9.1" // { @@ -125173,7 +128990,7 @@ in sources."ms-2.1.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-addon-api-3.2.1" sources."node-forge-0.10.0" (sources."node-gyp-3.8.0" // { @@ -125237,7 +129054,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -125281,22 +129098,22 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" (sources."socket.io-3.1.2" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."socket.io-adapter-2.1.0" (sources."socket.io-parser-4.0.4" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."socks-2.6.1" + sources."socks-2.6.2" sources."sqlite3-5.0.2" sources."sshpk-1.17.0" sources."statuses-1.5.0" @@ -125317,7 +129134,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" sources."supports-color-7.2.0" (sources."tar-4.4.19" // { dependencies = [ @@ -125393,7 +129210,11 @@ in sources."@szmarczak/http-timer-1.1.2" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" - sources."accepts-1.3.7" + (sources."accepts-1.3.8" // { + dependencies = [ + sources."mime-types-2.1.35" + ]; + }) sources."after-0.8.2" sources."agent-base-4.3.0" sources."ajv-6.12.6" @@ -125470,7 +129291,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -125561,7 +129382,7 @@ in sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" sources."http-cache-semantics-4.1.0" @@ -125624,15 +129445,19 @@ in sources."methods-1.1.2" sources."middleware-handler-0.2.0" sources."mime-1.6.0" - sources."mime-db-1.40.0" - sources."mime-types-2.1.24" + sources."mime-db-1.52.0" + (sources."mime-types-2.1.24" // { + dependencies = [ + sources."mime-db-1.40.0" + ]; + }) sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."nan-2.15.0" @@ -125642,7 +129467,7 @@ in sources."ms-2.1.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.1" @@ -125718,7 +129543,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."socket.io-2.3.0" // { dependencies = [ sources."debug-4.1.1" @@ -125793,7 +129618,7 @@ in sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.19.1" @@ -125830,15 +129655,15 @@ in thelounge-theme-abyss = nodeEnv.buildNodePackage { name = "thelounge-theme-abyss"; packageName = "thelounge-theme-abyss"; - version = "1.1.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/thelounge-theme-abyss/-/thelounge-theme-abyss-1.1.0.tgz"; - sha512 = "wNrWWjWKE7C4Ws3CK/s7B2OKf1kG3ZASFwwQErQ0pJT0ggY1VKVWCU8ywz2Ps+rY9V/X1ygaWhMJeYC84U8feg=="; + url = "https://registry.npmjs.org/thelounge-theme-abyss/-/thelounge-theme-abyss-2.0.2.tgz"; + sha512 = "1TrJGKqrk+zltLhythNDfEScgt1FL8b1j+3+tPno1yN06vm3yn8dRQlNesMP52op5jX+xJqA5jBFQGMQYSS19g=="; }; buildInputs = globalBuildInputs; meta = { description = "A theme for The Lounge"; - homepage = "https://github.com/sometoby/thelounge-theme-abyss"; + homepage = "https://github.com/rj45man/thelounge-theme-abyss"; license = "GPL-3"; }; production = true; @@ -126057,16 +129882,20 @@ in sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.3" - sources."@types/node-17.0.10" + sources."@types/keyv-3.1.4" + sources."@types/node-17.0.23" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" - sources."accepts-1.3.7" + (sources."accepts-1.3.8" // { + dependencies = [ + sources."mime-types-2.1.35" + ]; + }) sources."after-0.8.2" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -126134,7 +129963,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -126231,7 +130060,7 @@ in sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -126268,7 +130097,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."ldap-filter-0.3.3" sources."ldapjs-2.1.1" sources."linkify-it-3.0.2" @@ -126279,15 +130108,19 @@ in sources."methods-1.1.2" sources."middleware-handler-0.2.0" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.52.0" + (sources."mime-types-2.1.27" // { + dependencies = [ + sources."mime-db-1.44.0" + ]; + }) sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."mute-stream-0.0.8" (sources."needle-2.9.1" // { @@ -126296,7 +130129,7 @@ in sources."ms-2.1.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-addon-api-2.0.0" sources."node-forge-0.9.1" (sources."node-gyp-3.8.0" // { @@ -126359,7 +130192,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -126402,7 +130235,7 @@ in sources."serve-static-1.14.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."socket.io-2.3.0" // { dependencies = [ sources."debug-4.1.1" @@ -126444,7 +130277,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" sources."supports-color-7.2.0" sources."tar-4.4.19" sources."thelounge-4.2.0" @@ -126484,7 +130317,7 @@ in sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -126514,16 +130347,20 @@ in sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.3" - sources."@types/node-17.0.10" + sources."@types/keyv-3.1.4" + sources."@types/node-17.0.23" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" - sources."accepts-1.3.7" + (sources."accepts-1.3.8" // { + dependencies = [ + sources."mime-types-2.1.35" + ]; + }) sources."after-0.8.2" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -126591,7 +130428,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.20.3" + sources."core-js-3.21.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -126688,7 +130525,7 @@ in sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -126725,7 +130562,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.0.5" + sources."keyv-4.1.1" sources."ldap-filter-0.3.3" sources."ldapjs-2.1.1" sources."linkify-it-3.0.2" @@ -126736,15 +130573,19 @@ in sources."methods-1.1.2" sources."middleware-handler-0.2.0" sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" + sources."mime-db-1.52.0" + (sources."mime-types-2.1.27" // { + dependencies = [ + sources."mime-db-1.44.0" + ]; + }) sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minipass-2.9.0" sources."minizlib-1.3.3" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."mute-stream-0.0.8" (sources."needle-2.9.1" // { @@ -126753,7 +130594,7 @@ in sources."ms-2.1.3" ]; }) - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-addon-api-2.0.0" sources."node-forge-0.9.1" (sources."node-gyp-3.8.0" // { @@ -126816,7 +130657,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-4.0.2" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -126859,7 +130700,7 @@ in sources."serve-static-1.14.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" (sources."socket.io-2.3.0" // { dependencies = [ sources."debug-4.1.1" @@ -126901,7 +130742,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.4" + sources."strtok3-6.3.0" sources."supports-color-7.2.0" sources."tar-4.4.19" sources."thelounge-4.2.0" @@ -126941,7 +130782,7 @@ in sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -127356,10 +131197,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.136.0"; + version = "0.139.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.136.0.tgz"; - sha512 = "+fEMX7nYLz2ZesVP/dyifli5Jf8gR3XPAnFJveQ80aMhibFduzrADnjMbARXh8+W9qLK7rshJCjAIL/6cDxC+A=="; + url = "https://registry.npmjs.org/three/-/three-0.139.0.tgz"; + sha512 = "hZ4LkCjgoEM82WLaOVptDKGpB3SkEyuJP2OHe36AFO8hS2I6CrEiNanXj7wwR3wIPT7V5wi5Y5pFnncS5SVHgQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -127374,10 +131215,10 @@ in tiddlywiki = nodeEnv.buildNodePackage { name = "tiddlywiki"; packageName = "tiddlywiki"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.2.1.tgz"; - sha512 = "cfZX8G4/ymQzBmPcI8UWJ317eDrLf4INto99m7M8Nkbx5BMA3+Uapht7OPNaXZRR4RqvVJ7N1Ie1xYMWtvjnpw=="; + url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.2.2.tgz"; + sha512 = "xAY30p06CI6oFvebL/BnPtM9rbYRG14AVbpEfTvCHjpGutYsn6XBOogbhqnAxncmifFK3CaBGfiaqPNGi6rxGQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -127399,18 +131240,18 @@ in }; dependencies = [ sources."@octokit/auth-token-2.5.0" - sources."@octokit/core-3.5.1" + sources."@octokit/core-3.6.0" sources."@octokit/endpoint-6.0.12" sources."@octokit/graphql-4.8.0" sources."@octokit/openapi-types-11.2.0" sources."@octokit/plugin-paginate-rest-2.17.0" sources."@octokit/plugin-request-log-1.0.4" sources."@octokit/plugin-rest-endpoint-methods-5.13.0" - sources."@octokit/request-5.6.2" + sources."@octokit/request-5.6.3" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" sources."@octokit/types-6.34.0" - sources."@xmldom/xmldom-0.8.0" + sources."@xmldom/xmldom-0.8.1" sources."ajv-6.12.6" sources."asn1-0.2.6" sources."assert-plus-1.0.0" @@ -127469,12 +131310,12 @@ in sources."jsprim-1.4.2" sources."keypress-0.2.1" sources."lru-cache-6.0.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" - sources."node-appc-1.1.3" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" + sources."node-appc-1.1.4" sources."node-fetch-2.6.7" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -127603,7 +131444,7 @@ in sources."lru-cache-4.1.5" sources."lstream-0.0.4" sources."mime-1.6.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."moment-2.29.1" @@ -127755,7 +131596,7 @@ in sources."has-ansi-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minimist-0.0.10" sources."node-color-readline-1.0.1" sources."once-1.4.0" @@ -127782,10 +131623,10 @@ in ttf2eot = nodeEnv.buildNodePackage { name = "ttf2eot"; packageName = "ttf2eot"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ttf2eot/-/ttf2eot-3.0.0.tgz"; - sha512 = "Y/ymhhYr/lLkf66BnLQBs3LjttPDE+1BJcFHq/oJN5SnZTacMWVdPfGLB5eIVnC2iT9gZ2ls/Bre2zbKq6hNsA=="; + url = "https://registry.npmjs.org/ttf2eot/-/ttf2eot-3.1.0.tgz"; + sha512 = "aHTbcYosNHVqb2Qtt9Xfta77ae/5y0VfdwNLUS6sGBeGr22cX2JDMo/i5h3uuOf+FAD3akYOr17+fYd5NK8aXw=="; }; dependencies = [ sources."argparse-2.0.1" @@ -127803,10 +131644,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.5.5"; + version = "4.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz"; - sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz"; + sha512 = "yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw=="; }; buildInputs = globalBuildInputs; meta = { @@ -127821,10 +131662,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.9.4"; + version = "0.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.9.4.tgz"; - sha512 = "Ku40l2JQyj4rB/qHLRMm/k2nqAppR6equ4LCqiLSOH/tDypsSPjgQfeYJ+gterQbdYOpCqLimiL2AP1BeHpTQw=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.9.7.tgz"; + sha512 = "xjw6C9PctpLSwKEqaavSKfeH1CRmx1sD/DWXjig4xA/e9Y9/Mr70ViOinq5grFzexzDcdqdb7VDdkf7Ke+eZFg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -127836,7 +131677,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."clean-stack-2.2.0" - sources."commander-8.3.0" + sources."commander-9.1.0" sources."concat-map-0.0.1" sources."crypto-random-string-2.0.0" sources."del-6.0.0" @@ -127845,7 +131686,7 @@ in sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."find-up-3.0.0" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs.realpath-1.0.0" sources."glob-7.2.0" sources."glob-parent-5.1.2" @@ -127866,8 +131707,8 @@ in sources."locate-path-3.0.0" sources."lru-cache-6.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.4" - sources."minimatch-3.0.4" + sources."micromatch-4.0.5" + sources."minimatch-3.1.2" sources."once-1.4.0" sources."p-debounce-2.1.0" sources."p-limit-2.3.0" @@ -127894,7 +131735,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-3.0.3" sources."which-2.0.2" @@ -127913,10 +131754,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.14.5"; + version = "3.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz"; - sha512 = "qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.3.tgz"; + sha512 = "6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg=="; }; buildInputs = globalBuildInputs; meta = { @@ -127949,22 +131790,28 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.18"; + version = "1.5.20"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.18.tgz"; - sha512 = "E8fuVzs7KhfqWyk+MQ+LqP2A0IXFW643Xu2BJCw4iLpmFBoKHl+7AUZ5q4o2qefe1DFoAMijmbFsxbIcmDuvWg=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.20.tgz"; + sha512 = "GB1sY6RhmBLh9pJY7kEJnX3y995xSaLeWcZwxYT6YJmmdlBmjC7TA5ilbrxxoZk8IpdO+lDuWEz3ANVwhc8zFQ=="; }; dependencies = [ - sources."@dabh/diagnostics-2.0.2" - sources."@primer/octicons-14.1.0" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" + sources."@colors/colors-1.5.0" + sources."@dabh/diagnostics-2.0.3" + sources."@primer/octicons-17.0.0" + sources."@sindresorhus/is-4.6.0" + sources."@socket.io/base64-arraybuffer-1.0.2" + sources."@szmarczak/http-timer-4.0.6" + sources."@types/cacheable-request-6.0.2" sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-14.18.9" + sources."@types/http-cache-semantics-4.0.1" + sources."@types/keyv-3.1.4" + sources."@types/node-16.11.26" + sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" - sources."accepts-1.3.7" + sources."accepts-1.3.8" sources."ansi-regex-5.0.1" (sources."ansi-styles-4.3.0" // { dependencies = [ @@ -127972,22 +131819,18 @@ in sources."color-name-1.1.4" ]; }) + sources."any-promise-1.3.0" sources."array-flatten-1.1.1" sources."async-3.2.3" sources."balanced-match-1.0.2" - sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" - sources."blueimp-md5-2.18.0" - sources."body-parser-1.19.1" + sources."blueimp-md5-2.19.0" + sources."body-parser-1.19.2" sources."bootstrap-3.4.1" sources."brace-expansion-1.1.11" - sources."bytes-3.1.1" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) + sources."bytes-3.1.2" + sources."cacheable-lookup-5.0.4" + sources."cacheable-request-7.0.2" sources."cliui-7.0.4" sources."clone-2.1.2" sources."clone-response-1.0.2" @@ -127995,45 +131838,58 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.9.0" - sources."colors-1.4.0" sources."colorspace-1.1.4" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."content-disposition-0.5.4" sources."content-type-1.0.4" + (sources."convert-source-map-1.8.0" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."crossroads-0.12.2" sources."debug-2.6.9" - sources."decompress-response-3.3.0" + (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."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff2html-3.4.14" + sources."diff2html-3.4.16" sources."dnd-page-scroll-0.0.4" - sources."duplexer3-0.1.4" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-5.1.1" // { + (sources."engine.io-6.1.3" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."engine.io-parser-4.0.3" + sources."engine.io-parser-5.0.3" + sources."error-ex-1.3.2" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eve-0.5.4" - sources."express-4.17.2" + (sources."express-4.17.3" // { + dependencies = [ + sources."cookie-0.4.2" + ]; + }) (sources."express-session-1.17.2" // { dependencies = [ sources."depd-2.0.0" @@ -128046,10 +131902,10 @@ in sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" - sources."get-stream-4.1.0" - sources."getmac-5.17.0" + sources."get-stream-5.2.0" + sources."getmac-5.20.0" sources."glob-7.2.0" - sources."got-9.6.0" + sources."got-11.8.3" sources."hasher-1.2.0" (sources."hogan.js-3.0.2" // { dependencies = [ @@ -128058,94 +131914,101 @@ in }) sources."http-cache-semantics-4.1.0" sources."http-errors-1.8.1" + sources."http2-wrapper-1.0.3" sources."iconv-lite-0.4.24" - sources."ignore-5.1.9" + sources."ignore-5.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."ipaddr.js-1.9.1" - sources."is-arrayish-0.3.2" + sources."is-arrayish-0.2.1" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-2.0.1" + sources."is-utf8-0.2.1" sources."is-wsl-2.2.0" + sources."isarray-1.0.0" sources."jquery-3.6.0" - sources."jquery-ui-1.12.1" - sources."json-buffer-3.0.0" + sources."jquery-ui-1.13.1" + sources."json-buffer-3.0.1" sources."just-detect-adblock-1.1.0" - sources."keyv-3.1.0" + sources."keyv-4.1.1" sources."knockout-3.5.1" sources."kuler-2.0.0" - sources."latest-version-5.1.0" - sources."locks-0.2.2" + sources."latest-version-6.0.0" sources."lodash-4.17.21" - (sources."logform-2.3.2" // { + (sources."logform-2.4.0" // { dependencies = [ sources."ms-2.1.3" ]; }) - sources."lowercase-keys-1.0.1" + sources."lowercase-keys-2.0.0" sources."lru-cache-4.1.5" sources."media-typer-0.3.0" - (sources."memorystore-1.6.6" // { + (sources."memorystore-1.6.7" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mkdirp-1.0.4" sources."moment-2.29.1" sources."ms-2.0.0" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."node-cache-5.1.2" + sources."node-watch-0.7.3" sources."nopt-1.0.10" - sources."normalize-url-4.5.1" + sources."normalize-url-6.1.0" sources."nprogress-0.2.0" sources."object-assign-4.1.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - sources."open-8.1.0" - sources."p-cancelable-1.1.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."open-8.4.0" + sources."p-cancelable-2.1.1" + sources."p-limit-4.0.0" + sources."package-json-7.0.0" + sources."parse-json-2.2.0" sources."parseurl-1.3.3" - sources."passport-0.4.1" + sources."passport-0.5.2" sources."passport-local-1.0.0" sources."passport-strategy-1.0.0" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."pause-0.0.1" - sources."prepend-http-2.0.0" + sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."qs-6.9.6" + sources."qs-6.9.7" + sources."quick-lru-5.1.1" sources."random-bytes-1.0.0" sources."range-parser-1.2.1" sources."raven-js-3.27.2" - sources."raw-body-2.4.2" + sources."raw-body-2.4.3" sources."rc-1.2.8" - sources."readable-stream-3.6.0" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."require-directory-2.1.1" - sources."responselike-1.0.2" + sources."resolve-alpn-1.2.1" + sources."responselike-2.0.0" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-1.1.1" + sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" (sources."semver-7.3.5" // { dependencies = [ @@ -128161,53 +132024,78 @@ in sources."serve-static-1.14.2" sources."setprototypeof-1.2.0" sources."signals-1.0.0" - sources."simple-swizzle-0.2.2" - sources."snapsvg-0.5.1" - (sources."socket.io-4.1.3" // { + (sources."simple-swizzle-0.2.2" // { dependencies = [ - sources."debug-4.3.3" + sources."is-arrayish-0.3.2" + ]; + }) + sources."snapsvg-0.5.1" + (sources."socket.io-4.4.1" // { + dependencies = [ + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."socket.io-adapter-2.3.3" (sources."socket.io-parser-4.0.4" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."stack-trace-0.0.10" sources."statuses-1.5.0" sources."string-width-4.2.3" - sources."string_decoder-1.3.0" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-6.0.1" + sources."strip-bom-2.0.0" sources."strip-json-comments-2.0.1" (sources."temp-0.9.4" // { dependencies = [ - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."rimraf-2.6.3" ]; }) sources."text-hex-1.0.0" - sources."to-readable-stream-1.0.0" + sources."through2-2.0.5" sources."toidentifier-1.0.1" sources."triple-beam-1.3.0" + sources."tsconfig-5.0.3" + (sources."tsify-5.0.4" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."type-is-1.6.18" + sources."typescript-4.6.3" sources."uid-safe-2.1.5" sources."unpipe-1.0.0" - sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."vary-1.1.2" - sources."winston-3.3.4" - sources."winston-transport-4.4.2" + (sources."winston-3.6.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + (sources."winston-transport-4.5.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.6" + sources."ws-8.2.3" + sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-2.1.2" - sources."yargs-17.0.1" - sources."yargs-parser-20.2.9" + sources."yargs-17.3.1" + sources."yargs-parser-21.0.1" + sources."yocto-queue-1.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -128222,10 +132110,10 @@ in unified-language-server = nodeEnv.buildNodePackage { name = "unified-language-server"; packageName = "unified-language-server"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified-language-server/-/unified-language-server-2.0.0.tgz"; - sha512 = "TYqgb2zdbbbEI4vI78HEdPx7UQx2EmN59sZAdL/Cf5dF5yzLMGA2v0LpozY3wLYEqPY/z0ChKK8jjZXeFMWYrw=="; + url = "https://registry.npmjs.org/unified-language-server/-/unified-language-server-2.1.0.tgz"; + sha512 = "OJA4rcB3hVvJ4tOYN9YW9EcmRyjTJTzZfbDfSTLy/86CFE8P/LoNEv5GeNR+cdy1+wrJj74jc9yuesB735ml8g=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -128236,7 +132124,7 @@ in sources."@types/is-empty-1.2.1" sources."@types/js-yaml-4.0.5" sources."@types/ms-0.7.31" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."ansi-regex-6.0.1" @@ -128245,13 +132133,13 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.2" - sources."builtins-4.0.0" + sources."builtins-4.1.0" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."concat-stream-2.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."eastasianwidth-0.2.0" sources."emoji-regex-9.2.2" sources."error-ex-1.3.2" @@ -128280,7 +132168,7 @@ in sources."load-plugin-4.0.1" sources."locate-path-3.0.0" sources."lru-cache-6.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."ms-2.1.2" sources."once-1.4.0" sources."p-limit-2.3.0" @@ -128292,20 +132180,20 @@ in sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" - sources."string-width-5.1.0" + sources."string-width-5.1.2" sources."string_decoder-1.3.0" sources."strip-ansi-7.0.1" sources."supports-color-5.5.0" sources."to-vfile-7.2.3" - sources."trough-2.0.2" + sources."trough-2.1.0" sources."typedarray-0.0.6" sources."unified-engine-9.0.5" sources."unist-util-inspect-7.0.0" - sources."unist-util-stringify-position-3.0.0" + sources."unist-util-stringify-position-3.0.2" sources."util-deprecate-1.0.2" - sources."vfile-5.3.0" - sources."vfile-message-3.1.0" - (sources."vfile-reporter-7.0.3" // { + sources."vfile-5.3.2" + sources."vfile-message-3.1.2" + (sources."vfile-reporter-7.0.4" // { dependencies = [ sources."supports-color-9.2.1" ]; @@ -128315,7 +132203,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."wrappy-1.0.2" sources."yallist-4.0.0" @@ -128333,10 +132221,10 @@ in vega-cli = nodeEnv.buildNodePackage { name = "vega-cli"; packageName = "vega-cli"; - version = "5.21.0"; + version = "5.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.21.0.tgz"; - sha512 = "UuxW79x2n0bYBexa3vblI2o4CPhIJTBGvA0remuNm74RjkjMkDHMXDriCs5sYQ7jYyekvROmvmC9t/Pn0g0+6Q=="; + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.22.1.tgz"; + sha512 = "gX4TrHLo1nsBiLC/bZkWnZANp1ib4b4+3drekhCkJv0ne+Ti9Xuf5b2G8yqYv4pmT/sB5/ClvxFKmm1Ol0tFIQ=="; }; dependencies = [ sources."@mapbox/node-pre-gyp-1.0.8" @@ -128349,54 +132237,51 @@ in sources."are-we-there-yet-2.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."canvas-2.9.0" + sources."canvas-2.9.1" sources."chownr-2.0.0" sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-support-1.1.3" - sources."commander-2.20.3" + sources."commander-7.2.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."d3-array-2.12.1" - sources."d3-color-2.0.0" - sources."d3-delaunay-5.3.0" - sources."d3-dispatch-2.0.0" - sources."d3-dsv-2.0.0" - sources."d3-force-2.1.1" - sources."d3-format-2.0.0" - sources."d3-geo-2.0.2" - sources."d3-geo-projection-3.0.0" - sources."d3-hierarchy-2.0.0" - sources."d3-interpolate-2.0.1" - sources."d3-path-2.0.0" - sources."d3-quadtree-2.0.0" - sources."d3-scale-3.3.0" - sources."d3-shape-2.1.0" - sources."d3-time-2.1.1" - sources."d3-time-format-3.0.0" - sources."d3-timer-2.0.0" - sources."debug-4.3.3" + sources."d3-array-3.1.1" + sources."d3-color-3.0.1" + sources."d3-delaunay-6.0.2" + sources."d3-dispatch-3.0.1" + sources."d3-dsv-3.0.1" + sources."d3-force-3.0.0" + sources."d3-format-3.1.0" + sources."d3-geo-3.0.1" + sources."d3-geo-projection-4.0.0" + sources."d3-hierarchy-3.1.1" + sources."d3-interpolate-3.0.1" + sources."d3-path-3.0.1" + sources."d3-quadtree-3.0.1" + sources."d3-scale-4.0.2" + sources."d3-shape-3.1.0" + sources."d3-time-3.0.0" + sources."d3-time-format-4.1.0" + sources."d3-timer-3.0.1" + sources."debug-4.3.4" sources."decompress-response-4.2.1" - sources."delaunator-4.0.1" + sources."delaunator-5.0.0" sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" sources."gauge-3.0.2" sources."get-caller-file-2.0.5" sources."glob-7.2.0" - sources."has-1.0.3" sources."has-unicode-2.0.1" sources."https-proxy-agent-5.0.0" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.6.3" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internmap-1.0.1" - sources."is-core-module-2.8.1" + sources."internmap-2.0.3" sources."is-fullwidth-code-point-3.0.0" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { @@ -128405,7 +132290,7 @@ in ]; }) sources."mimic-response-2.1.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."minipass-3.1.6" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" @@ -128417,56 +132302,58 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" sources."readable-stream-3.6.0" sources."require-directory-2.1.1" - sources."resolve-1.21.1" sources."rimraf-3.0.2" + sources."robust-predicates-3.0.1" sources."rw-1.3.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" + sources."simple-get-3.1.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" - sources."supports-preserve-symlinks-flag-1.0.0" sources."tar-6.1.11" - sources."topojson-client-3.1.0" + (sources."topojson-client-3.1.0" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) sources."tr46-0.0.3" sources."util-deprecate-1.0.2" - sources."vega-5.21.0" + sources."vega-5.22.1" sources."vega-canvas-1.2.6" - sources."vega-crossfilter-4.0.5" + sources."vega-crossfilter-4.1.0" sources."vega-dataflow-5.7.4" - sources."vega-encode-4.8.3" + sources."vega-encode-4.9.0" sources."vega-event-selector-3.0.0" sources."vega-expression-5.0.0" - sources."vega-force-4.0.7" - sources."vega-format-1.0.4" - sources."vega-functions-5.12.1" - sources."vega-geo-4.3.8" - sources."vega-hierarchy-4.0.9" - sources."vega-label-1.1.0" - sources."vega-loader-4.4.1" + sources."vega-force-4.1.0" + sources."vega-format-1.1.0" + sources."vega-functions-5.13.0" + sources."vega-geo-4.4.0" + sources."vega-hierarchy-4.1.0" + sources."vega-label-1.2.0" + sources."vega-loader-4.5.0" sources."vega-parser-6.1.4" - sources."vega-projection-1.4.5" - sources."vega-regression-1.0.9" + sources."vega-projection-1.5.0" + sources."vega-regression-1.1.0" sources."vega-runtime-6.1.3" - sources."vega-scale-7.1.1" - sources."vega-scenegraph-4.9.4" - sources."vega-selections-5.3.1" - sources."vega-statistics-1.7.10" - sources."vega-time-2.0.4" - sources."vega-transforms-4.9.4" + sources."vega-scale-7.2.0" + sources."vega-scenegraph-4.10.1" + sources."vega-selections-5.4.0" + sources."vega-statistics-1.8.0" + sources."vega-time-2.1.0" + sources."vega-transforms-4.10.0" sources."vega-typings-0.22.2" sources."vega-util-1.17.0" - sources."vega-view-5.10.1" + sources."vega-view-5.11.0" sources."vega-view-transforms-4.5.8" - sources."vega-voronoi-4.1.5" + sources."vega-voronoi-4.2.0" sources."vega-wordcloud-4.1.3" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -128475,8 +132362,8 @@ in sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-17.4.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -128538,20 +132425,21 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "23.1.2"; + version = "24.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-23.1.2.tgz"; - sha512 = "uS1k7wuXI6hbxiW+kn9vdAWL0bBi4jjVxc7Jwp8NhJjcRuzlydtt3gUEnhnC9AOIKQ4LxoAgmg50lSyYkrC8Hg=="; + url = "https://registry.npmjs.org/vercel/-/vercel-24.0.1.tgz"; + sha512 = "LmWW65KyWJV/GTxlcVwcifGp1yywUSNP3fcMNZQLdd6fVC3CHJUyHz5t4GD8O1VM56NqvnnYgqNbGYBQXLN5gQ=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.10" - sources."@vercel/build-utils-2.12.2" - sources."@vercel/go-1.2.3" - sources."@vercel/node-1.12.1" - sources."@vercel/python-2.0.5" - sources."@vercel/ruby-1.2.7" + sources."@types/node-17.0.23" + sources."@vercel/build-utils-2.15.0" + sources."@vercel/go-1.3.1" + sources."@vercel/node-1.14.0" + sources."@vercel/node-bridge-2.2.0" + sources."@vercel/python-2.2.1" + sources."@vercel/ruby-1.3.1" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -128607,7 +132495,7 @@ in sources."make-dir-3.1.0" sources."make-error-1.3.6" sources."mimic-response-1.0.1" - sources."minimist-1.2.5" + sources."minimist-1.2.6" sources."normalize-url-4.5.1" sources."once-1.4.0" sources."p-cancelable-1.1.0" @@ -128621,7 +132509,7 @@ in sources."responselike-1.0.2" sources."semver-6.3.0" sources."semver-diff-3.1.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."string-width-4.2.3" @@ -128656,10 +132544,10 @@ in vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.5.tgz"; - sha512 = "893GcGS5oFjBK2Dakdl4I0x8rtkgI+TOi44M9PmFU6YV+kwoLIRAxIcoF55rGiHFESCq98C+yjWn1OXznWgm7A=="; + url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.2.6.tgz"; + sha512 = "mgX18AzHsg2sDqh4aVVjk23iXf2s93lN7SZnZq2JE74/uGeXfrBckix3YdKtxgZe1vb1tiwDz9JRqoRV9SyGng=="; }; buildInputs = globalBuildInputs; meta = { @@ -128719,7 +132607,7 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."deep-is-0.1.4" sources."diff-4.0.2" sources."doctrine-3.0.0" @@ -128762,17 +132650,17 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-intrinsic-1.1.1" sources."glob-7.2.0" sources."glob-parent-5.1.2" - sources."globals-13.12.0" + sources."globals-13.13.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."ignore-4.0.6" sources."import-fresh-3.3.0" @@ -128795,9 +132683,9 @@ in sources."lodash.merge-4.6.2" sources."lodash.truncate-4.4.2" sources."lru-cache-6.0.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."natural-compare-1.4.0" sources."object-assign-4.1.1" @@ -128808,14 +132696,14 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.5.1" + sources."prettier-2.6.1" sources."progress-2.0.3" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" sources."punycode-2.1.1" sources."regexpp-3.2.0" sources."require-from-string-2.0.2" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" sources."semver-7.3.5" @@ -128836,7 +132724,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" (sources."table-6.8.0" // { dependencies = [ - sources."ajv-8.9.0" + sources."ajv-8.11.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -128852,7 +132740,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.5.5" + sources."typescript-4.6.3" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" (sources."vue-eslint-parser-7.11.0" // { @@ -128961,7 +132849,7 @@ in sources."jsonc-parser-3.0.0" sources."ms-2.0.0" sources."request-light-0.4.0" - (sources."vscode-json-languageservice-4.1.10" // { + (sources."vscode-json-languageservice-4.2.1" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -128969,7 +132857,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-4.1.2" sources."vscode-uri-3.0.3" @@ -129019,7 +132907,7 @@ in sources."vscode-languageserver-types-3.5.0" ]; }) - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-2.0.2" sources."vscode-uri-1.0.8" @@ -129037,32 +132925,32 @@ in vscode-langservers-extracted = nodeEnv.buildNodePackage { name = "vscode-langservers-extracted"; packageName = "vscode-langservers-extracted"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.0.0.tgz"; - sha512 = "DTFhpzUhP3M5WA62WT/SVSxtq47R5rbIEznA7svxWD19/+D1iGBrrzAa8LrDCkLUMxyG3gbya99LczV4F9m6Yg=="; + url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.1.0.tgz"; + sha512 = "HZfrlqpVu8N0UkSyjldPsGFpVFByYaDRDMmBvmKwKai2rAsd2vtde2CFnX9rOpmg3pN2vET8j3qtqZvZLzmkjQ=="; }; dependencies = [ - sources."core-js-3.20.3" + sources."core-js-3.21.1" sources."jsonc-parser-3.0.0" sources."regenerator-runtime-0.13.9" sources."request-light-0.5.7" - sources."typescript-4.5.5" - sources."vscode-css-languageservice-5.1.9" - sources."vscode-html-languageservice-4.2.1" - sources."vscode-json-languageservice-4.2.0-next.2" - sources."vscode-jsonrpc-8.0.0-next.5" - sources."vscode-languageserver-8.0.0-next.6" - (sources."vscode-languageserver-protocol-3.17.0-next.12" // { + sources."typescript-4.6.3" + sources."vscode-css-languageservice-5.3.0" + sources."vscode-html-languageservice-4.2.4" + sources."vscode-json-languageservice-4.2.1" + sources."vscode-jsonrpc-8.0.0-next.7" + sources."vscode-languageserver-8.0.0-next.10" + (sources."vscode-languageserver-protocol-3.17.0-next.16" // { dependencies = [ - sources."vscode-languageserver-types-3.17.0-next.6" + sources."vscode-languageserver-types-3.17.0-next.9" ]; }) - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.3" - sources."yarn-1.22.17" + sources."yarn-1.22.18" ]; buildInputs = globalBuildInputs; meta = { @@ -129074,20 +132962,20 @@ in bypassCache = true; reconstructLock = true; }; - "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { + "vscode-lldb-build-deps-../../applications/editors/vscode/extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { name = "vscode-lldb"; packageName = "vscode-lldb"; version = "1.6.8"; - src = ../../misc/vscode-extensions/vscode-lldb/build-deps; + src = ../../applications/editors/vscode/extensions/vscode-lldb/build-deps; dependencies = [ - sources."@discoveryjs/json-ext-0.5.6" - sources."@types/eslint-8.4.0" + sources."@discoveryjs/json-ext-0.5.7" + sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" - sources."@types/estree-0.0.50" - sources."@types/json-schema-7.0.9" + sources."@types/estree-0.0.51" + sources."@types/json-schema-7.0.11" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.63.1" + sources."@types/vscode-1.65.0" sources."@types/yauzl-2.9.2" sources."@ungap/promise-all-settled-1.1.2" sources."@webassemblyjs/ast-1.11.1" @@ -129105,9 +132993,9 @@ in sources."@webassemblyjs/wasm-opt-1.11.1" sources."@webassemblyjs/wasm-parser-1.11.1" sources."@webassemblyjs/wast-printer-1.11.1" - sources."@webpack-cli/configtest-1.1.0" - sources."@webpack-cli/info-1.4.0" - sources."@webpack-cli/serve-1.6.0" + sources."@webpack-cli/configtest-1.1.1" + sources."@webpack-cli/info-1.4.1" + sources."@webpack-cli/serve-1.6.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-8.7.0" @@ -129115,7 +133003,7 @@ in sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."argparse-2.0.1" @@ -129127,12 +133015,12 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.19.1" + sources."browserslist-4.20.2" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001320" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -129170,12 +133058,12 @@ in sources."diff-5.0.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" sources."domutils-2.8.0" - sources."electron-to-chromium-1.4.51" + sources."electron-to-chromium-1.4.96" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" - sources."enhanced-resolve-5.8.3" + sources."enhanced-resolve-5.9.2" sources."entities-2.2.0" sources."envinfo-7.8.1" sources."errno-0.1.8" @@ -129211,7 +133099,7 @@ in sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."he-1.2.0" sources."htmlparser2-6.1.0" sources."human-signals-2.1.0" @@ -129231,11 +133119,11 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jest-worker-27.4.6" + sources."jest-worker-27.5.1" sources."js-yaml-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."kind-of-6.0.3" sources."leven-3.1.0" sources."linkify-it-2.2.0" @@ -129262,19 +133150,18 @@ in }) sources."memory-streams-0.1.3" sources."merge-stream-2.0.0" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minimist-1.2.5" sources."mocha-8.4.0" sources."ms-2.1.3" sources."mute-stream-0.0.8" sources."nanoid-3.1.20" sources."neo-async-2.6.2" - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."nth-check-2.0.1" @@ -129315,7 +133202,7 @@ in sources."readdirp-3.5.0" sources."rechoir-0.7.1" sources."require-directory-2.1.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."safe-buffer-5.2.1" @@ -129326,7 +133213,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."sprintf-js-1.0.3" @@ -129339,13 +133226,13 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.10.0" // { + (sources."terser-5.12.1" // { dependencies = [ sources."commander-2.20.3" sources."source-map-0.7.3" ]; }) - (sources."terser-webpack-plugin-5.3.0" // { + (sources."terser-webpack-plugin-5.3.1" // { dependencies = [ sources."serialize-javascript-6.0.0" ]; @@ -129362,7 +133249,7 @@ in sources."tslib-2.3.1" sources."tunnel-0.0.6" sources."typed-rest-client-1.8.6" - sources."typescript-4.5.5" + sources."typescript-4.6.3" sources."uc.micro-1.0.6" sources."underscore-1.13.2" sources."uri-js-4.4.1" @@ -129382,8 +133269,8 @@ in sources."vscode-debugadapter-testsupport-1.51.0" sources."vscode-debugprotocol-1.51.0" sources."watchpack-2.3.1" - sources."webpack-5.67.0" - (sources."webpack-cli-4.9.1" // { + sources."webpack-5.70.0" + (sources."webpack-cli-4.9.2" // { dependencies = [ sources."commander-7.2.0" ]; @@ -129436,13 +133323,10 @@ in sha512 = "swQ0bfyJSWfFr42IXr8A774yA1n+YudhzsaHBKhWSkczSqjvgZvSvM8NEnx6QKnfOHBXbdNR5vhahjNUMlftQQ=="; }; dependencies = [ - sources."absolute-0.0.1" sources."ajv-6.12.6" sources."ansi-escapes-3.2.0" - sources."ansi-red-0.1.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" - sources."ansi-wrap-0.1.0" sources."argparse-1.0.10" sources."array-differ-1.0.0" sources."array-union-1.0.2" @@ -129460,6 +133344,7 @@ in sources."bl-1.2.3" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -129474,7 +133359,7 @@ in sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" sources."cli-width-2.2.1" - sources."clone-1.0.4" + sources."clone-2.1.2" sources."co-3.1.0" sources."co-from-stream-0.0.0" sources."co-fs-extra-1.2.1" @@ -129489,6 +133374,7 @@ in sources."consolidate-0.14.5" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" + sources."cross-spawn-7.0.3" sources."dashdash-1.14.1" sources."decompress-4.2.1" sources."decompress-tar-4.1.1" @@ -129524,6 +133410,7 @@ in sources."file-type-5.2.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-2.1.0" + sources."fill-range-7.0.1" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs-constants-1.0.0" @@ -129536,17 +133423,11 @@ in sources."glob-7.2.0" sources."got-6.7.1" sources."graceful-fs-4.2.9" - sources."gray-matter-2.1.1" + sources."gray-matter-4.0.3" sources."handlebars-4.7.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) sources."has-flag-3.0.0" - sources."has-generators-1.0.1" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."http-signature-1.2.0" @@ -129556,10 +133437,10 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."inquirer-6.5.2" - sources."is-3.3.0" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-natural-number-4.0.1" + sources."is-number-7.0.0" sources."is-object-1.0.2" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" @@ -129567,6 +133448,7 @@ in sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" + sources."isexe-2.0.0" sources."isstream-0.1.2" sources."isurl-1.0.0" sources."js-yaml-3.14.1" @@ -129576,6 +133458,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" sources."jsprim-1.4.2" + sources."kind-of-6.0.3" sources."klaw-1.3.1" sources."lodash-4.17.21" sources."log-symbols-2.2.0" @@ -129585,21 +133468,25 @@ in sources."pify-3.0.0" ]; }) - (sources."metalsmith-2.3.0" // { + (sources."metalsmith-2.4.2" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-6.2.1" + sources."has-flag-4.0.0" + sources."rimraf-3.0.2" + sources."supports-color-7.2.0" ]; }) - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."micromatch-4.0.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."multimatch-2.1.0" sources."mute-stream-0.0.7" sources."neo-async-2.6.2" @@ -129616,8 +133503,10 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" sources."pend-1.2.0" sources."performance-now-2.1.0" + sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -129633,7 +133522,6 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."recursive-readdir-2.2.2" sources."request-2.88.2" sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" @@ -129641,13 +133529,16 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" + sources."section-matter-1.0.0" sources."seek-bzip-1.0.6" sources."semver-5.7.1" - sources."signal-exit-3.0.6" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-3.0.7" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."sshpk-1.17.0" - sources."stat-mode-0.2.2" + sources."stat-mode-1.0.0" (sources."string-width-2.1.1" // { dependencies = [ sources."strip-ansi-4.0.0" @@ -129660,9 +133551,10 @@ in }) (sources."strip-ansi-5.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" ]; }) + sources."strip-bom-string-1.0.0" sources."strip-dirs-2.1.0" sources."strip-outer-1.0.1" sources."supports-color-5.5.0" @@ -129674,13 +133566,13 @@ in sources."timed-out-4.0.1" sources."tmp-0.0.33" sources."to-buffer-1.1.1" - sources."toml-2.3.6" + sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."trim-repeated-1.0.0" sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.14.5" + sources."uglify-js-3.15.3" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -129698,7 +133590,7 @@ in ]; }) sources."ware-1.3.0" - sources."win-fork-1.1.1" + sources."which-2.0.2" sources."wordwrap-1.0.0" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" @@ -129743,7 +133635,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -129761,7 +133653,7 @@ in ]; }) sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" sources."argparse-1.0.10" @@ -129800,7 +133692,7 @@ in sources."bootstrap-vue-helper-json-1.1.1" (sources."boxen-3.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."camelcase-5.3.1" sources."emoji-regex-7.0.3" sources."string-width-3.1.0" @@ -129933,7 +133825,7 @@ in (sources."eslint-5.16.0" // { dependencies = [ sources."cross-spawn-6.0.5" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ignore-4.0.6" sources."ms-2.1.2" ]; @@ -129941,7 +133833,7 @@ in (sources."eslint-plugin-vue-6.2.2" // { dependencies = [ sources."acorn-7.4.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."ms-2.1.2" @@ -130088,7 +133980,7 @@ in sources."ini-1.3.8" (sources."inquirer-6.5.2" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."strip-ansi-5.2.0" ]; }) @@ -130139,7 +134031,7 @@ in sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."jsonc-parser-1.0.3" sources."keyv-3.1.0" sources."kind-of-6.0.3" @@ -130187,15 +134079,15 @@ in sources."micromatch-3.1.10" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minimist-options-3.0.2" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."mout-0.5.0" sources."ms-2.1.3" sources."mute-stream-0.0.7" @@ -130350,7 +134242,7 @@ in sources."resolve-from-1.0.1" ]; }) - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -130377,7 +134269,7 @@ in sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" sources."sigmund-1.0.1" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-1.0.0" sources."slice-ansi-2.1.0" (sources."snapdragon-0.8.2" // { @@ -130493,7 +134385,7 @@ in sources."symbol-0.2.3" (sources."table-5.4.6" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" sources."emoji-regex-7.0.3" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" @@ -130553,7 +134445,7 @@ in sources."unist-util-inspect-4.1.4" sources."unist-util-is-2.1.3" sources."unist-util-modify-children-1.1.6" - sources."unist-util-stringify-position-3.0.0" + sources."unist-util-stringify-position-3.0.2" sources."unist-util-visit-1.4.1" (sources."unist-util-visit-parents-2.1.2" // { dependencies = [ @@ -130585,7 +134477,7 @@ in sources."vfile-message-2.0.4" ]; }) - sources."vfile-message-3.1.0" + sources."vfile-message-3.1.2" (sources."vfile-reporter-6.0.2" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -130608,14 +134500,14 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-5.3.0-next.10" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" (sources."vue-eslint-parser-6.0.5" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -130669,7 +134561,7 @@ in sha512 = "slGcIXCA/j5d2uzQ7flA4/veF0P0eE+Om/Bw7uEO2LC9a3mVNdB+2bSR1CILMjvgyFy9Q9D6eseomQgp7UW5Dg=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.16.8" + sources."@babel/runtime-corejs3-7.17.8" sources."@mapbox/node-pre-gyp-1.0.8" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -130694,7 +134586,7 @@ in sources."brace-expansion-1.1.11" sources."browser-process-hrtime-1.0.0" sources."btoa-1.2.1" - sources."canvas-2.9.0" + sources."canvas-2.9.1" sources."canvg-3.0.7" sources."chownr-2.0.0" sources."cliui-7.0.4" @@ -130704,7 +134596,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.20.3" + sources."core-js-pure-3.21.1" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { dependencies = [ @@ -130718,7 +134610,7 @@ in sources."whatwg-url-8.7.0" ]; }) - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decimal.js-10.3.1" sources."decompress-response-4.2.1" sources."deep-is-0.1.4" @@ -130738,7 +134630,7 @@ in sources."esutils-2.0.3" sources."fast-levenshtein-2.0.6" sources."form-data-3.0.1" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."gauge-3.0.2" @@ -130761,7 +134653,7 @@ in sources."whatwg-url-8.7.0" ]; }) - sources."json5-2.2.0" + sources."json5-2.2.1" sources."jsonfile-6.1.0" sources."levn-0.3.0" sources."lodash-4.17.21" @@ -130772,11 +134664,10 @@ in sources."semver-6.3.0" ]; }) - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-response-2.1.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" sources."minipass-3.1.6" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" @@ -130808,9 +134699,9 @@ in sources."saxes-5.0.1" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" - sources."simple-get-3.1.0" + sources."simple-get-3.1.1" sources."source-map-0.6.1" sources."stackblur-canvas-2.5.0" sources."string-width-4.2.3" @@ -130832,7 +134723,7 @@ in sources."util-deprecate-1.0.2" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" - sources."wavedrom-2.9.0" + sources."wavedrom-2.9.1" sources."webidl-conversions-3.0.1" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" @@ -130841,13 +134732,13 @@ in sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-17.4.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -130862,10 +134753,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "6.6.0"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-6.6.0.tgz"; - sha512 = "ja9kuCleKQLesUEx+tEl6ByxwVF1CVCjSc3V0ag78S40NWDRTBJhXwc4c+qlyZ0h/XefXc3waxnsq1izUBe/Nw=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-6.8.0.tgz"; + sha512 = "qZ3a4YVs0Vdqet44QRZEcNUQznkrfhsAkSOnZp57O4T4A9Bo3pamePSBeRqdPdJv9GF8ntKG84o3eV0MrEvLbw=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -130885,46 +134776,40 @@ in sources."@devicefarmer/adbkit-2.11.3" sources."@devicefarmer/adbkit-logcat-1.1.0" sources."@devicefarmer/adbkit-monkey-1.0.1" - (sources."@eslint/eslintrc-1.0.5" // { + (sources."@eslint/eslintrc-1.2.1" // { dependencies = [ - sources."debug-4.3.3" - sources."espree-9.3.0" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - (sources."@humanwhocodes/config-array-0.6.0" // { + (sources."@humanwhocodes/config-array-0.9.5" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."@humanwhocodes/object-schema-1.2.1" - sources."@mdn/browser-compat-data-4.0.11" + sources."@mdn/browser-compat-data-4.1.12" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/yauzl-2.9.2" sources."acorn-8.7.0" sources."acorn-jsx-5.3.2" - (sources."addons-linter-4.4.0" // { + (sources."addons-linter-4.14.0" // { dependencies = [ sources."source-map-support-0.5.21" - sources."yargs-17.2.1" + sources."yargs-17.4.0" ]; }) sources."addons-moz-compare-1.2.0" - (sources."addons-scanner-utils-6.1.0" // { - dependencies = [ - sources."common-tags-1.8.0" - ]; - }) + sources."addons-scanner-utils-6.3.0" sources."adm-zip-0.5.9" sources."ajv-6.12.6" sources."ajv-merge-patch-4.1.0" sources."ansi-align-3.0.1" - sources."ansi-colors-4.1.1" - sources."ansi-regex-2.1.1" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."any-promise-1.3.0" sources."argparse-2.0.1" @@ -130964,17 +134849,12 @@ in sources."chrome-launcher-0.15.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" - (sources."cliui-7.0.4" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) + sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."columnify-1.5.4" + sources."columnify-1.6.0" sources."combined-stream-1.0.8" sources."commander-2.20.3" sources."common-tags-1.8.2" @@ -130987,7 +134867,7 @@ in ]; }) sources."configstore-5.0.1" - sources."core-js-3.18.0" + sources."core-js-3.21.0" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" @@ -131010,7 +134890,7 @@ in sources."doctrine-3.0.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.3.0" + sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."dtrace-provider-0.8.8" @@ -131020,7 +134900,6 @@ in sources."ecdsa-sig-formatter-1.0.11" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" sources."entities-2.2.0" sources."error-ex-1.3.2" sources."es6-error-4.1.1" @@ -131028,29 +134907,26 @@ in sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.3.0" // { + (sources."eslint-8.11.0" // { dependencies = [ - sources."ansi-regex-5.0.1" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" - sources."strip-ansi-6.0.1" ]; }) - sources."eslint-plugin-no-unsanitized-4.0.0" - sources."eslint-scope-7.1.0" + sources."eslint-plugin-no-unsanitized-4.0.1" + sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" ]; }) - sources."eslint-visitor-keys-3.1.0" - sources."espree-9.1.0" + sources."eslint-visitor-keys-3.3.0" + sources."espree-9.3.1" sources."esprima-4.0.1" sources."esquery-1.4.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" - sources."event-to-promise-0.8.0" sources."execa-4.1.0" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -131062,8 +134938,7 @@ in }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-redact-3.1.0" - sources."fastify-warning-0.2.0" + sources."fast-redact-3.1.1" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" (sources."firefox-profile-4.2.2" // { @@ -131073,7 +134948,7 @@ in }) sources."first-chunk-stream-3.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fluent-syntax-0.13.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -131100,7 +134975,7 @@ in sources."glob-parent-6.0.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-3.0.0" - sources."globals-13.12.0" + sources."globals-13.13.0" (sources."got-9.6.0" // { dependencies = [ sources."get-stream-4.1.0" @@ -131113,15 +134988,15 @@ in sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-yarn-2.1.0" sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" sources."human-signals-1.1.1" - sources."ignore-4.0.6" - sources."image-size-1.0.0" + sources."ignore-5.2.0" + sources."image-size-1.0.1" sources."immediate-3.0.6" sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" @@ -131208,16 +135083,17 @@ in sources."semver-6.3.0" ]; }) + sources."make-error-1.3.6" sources."map-age-cleaner-0.1.3" - sources."marky-1.2.2" + sources."marky-1.2.4" sources."mem-5.1.1" sources."merge-stream-2.0.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mkdirp-1.0.4" sources."moment-2.29.1" sources."ms-2.0.0" @@ -131225,13 +135101,13 @@ in (sources."mv-2.1.1" // { dependencies = [ sources."glob-6.0.4" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."rimraf-2.4.5" ]; }) sources."mz-2.7.0" sources."nan-2.15.0" - sources."nanoid-3.2.0" + sources."nanoid-3.3.1" sources."natural-compare-1.4.0" sources."ncp-2.0.0" sources."node-forge-0.10.0" @@ -131268,14 +135144,15 @@ in sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picocolors-1.0.0" - sources."pino-7.4.0" + sources."pino-7.9.1" sources."pino-abstract-transport-0.5.0" sources."pino-std-serializers-4.0.0" - sources."postcss-8.3.11" + sources."postcss-8.4.12" sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" + sources."process-warning-1.0.0" + sources."promise-toolbox-0.20.0" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -131333,15 +135210,15 @@ in sources."shebang-regex-3.0.0" sources."shell-quote-1.7.3" sources."shellwords-0.1.1" - (sources."sign-addon-3.9.0" // { + (sources."sign-addon-3.11.0" // { dependencies = [ - sources."common-tags-1.8.0" + sources."source-map-support-0.5.21" ]; }) - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."sonic-boom-2.6.0" sources."source-map-0.6.1" - sources."source-map-js-0.6.2" + sources."source-map-js-1.0.2" sources."source-map-support-0.5.20" sources."spawn-sync-1.0.15" sources."split-0.3.3" @@ -131350,14 +135227,9 @@ in sources."stream-shift-1.0.1" sources."stream-to-array-2.3.0" sources."stream-to-promise-3.0.0" - (sources."string-width-4.2.3" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-3.0.1" + sources."strip-ansi-6.0.1" sources."strip-bom-4.0.0" sources."strip-bom-buf-2.0.0" sources."strip-bom-stream-4.0.0" @@ -131367,7 +135239,7 @@ in sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" - sources."thread-stream-0.13.1" + sources."thread-stream-0.13.2" sources."through-2.3.8" sources."tmp-0.2.1" sources."to-readable-stream-1.0.0" @@ -131402,12 +135274,7 @@ in sources."widest-line-3.1.0" sources."winreg-0.0.12" sources."word-wrap-1.2.3" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."ws-7.4.6" @@ -131416,8 +135283,12 @@ in sources."xmlbuilder-11.0.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" + (sources."yargs-16.2.0" // { + dependencies = [ + sources."yargs-parser-20.2.9" + ]; + }) + sources."yargs-parser-21.0.1" sources."yauzl-2.10.0" (sources."zip-dir-2.0.0" // { dependencies = [ @@ -131438,17 +135309,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.67.0"; + version = "5.70.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz"; - sha512 = "LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.70.0.tgz"; + sha512 = "ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw=="; }; dependencies = [ - sources."@types/eslint-8.4.0" + sources."@types/eslint-8.4.1" sources."@types/eslint-scope-3.7.3" - sources."@types/estree-0.0.50" - sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.10" + sources."@types/estree-0.0.51" + sources."@types/json-schema-7.0.11" + sources."@types/node-17.0.23" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -131470,13 +135341,13 @@ in sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.19.1" + sources."browserslist-4.20.2" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001301" + sources."caniuse-lite-1.0.30001320" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.51" - sources."enhanced-resolve-5.8.3" + sources."electron-to-chromium-1.4.96" + sources."enhanced-resolve-5.9.2" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -131492,15 +135363,15 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.9" sources."has-flag-4.0.0" - sources."jest-worker-27.4.6" + sources."jest-worker-27.5.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" sources."merge-stream-2.0.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."neo-async-2.6.2" - sources."node-releases-2.0.1" + sources."node-releases-2.0.2" sources."picocolors-1.0.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" @@ -131511,12 +135382,12 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - (sources."terser-5.10.0" // { + (sources."terser-5.12.1" // { dependencies = [ sources."source-map-0.7.3" ]; }) - sources."terser-webpack-plugin-5.3.0" + sources."terser-webpack-plugin-5.3.1" sources."uri-js-4.4.1" sources."watchpack-2.3.1" sources."webpack-sources-3.2.3" @@ -131534,16 +135405,16 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz"; - sha512 = "JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz"; + sha512 = "m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ=="; }; dependencies = [ - sources."@discoveryjs/json-ext-0.5.6" - sources."@webpack-cli/configtest-1.1.0" - sources."@webpack-cli/info-1.4.0" - sources."@webpack-cli/serve-1.6.0" + sources."@discoveryjs/json-ext-0.5.7" + sources."@webpack-cli/configtest-1.1.1" + sources."@webpack-cli/info-1.4.1" + sources."@webpack-cli/serve-1.6.1" sources."clone-deep-4.0.1" sources."colorette-2.0.16" sources."commander-7.2.0" @@ -131577,13 +135448,13 @@ in sources."path-parse-1.0.7" sources."pkg-dir-4.2.0" sources."rechoir-0.7.1" - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."strip-final-newline-2.0.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."webpack-merge-5.8.0" @@ -131603,10 +135474,10 @@ in webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.7.3"; + version = "4.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz"; - sha512 = "mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz"; + sha512 = "nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -131619,19 +135490,19 @@ in sources."@types/express-4.17.13" sources."@types/express-serve-static-core-4.17.28" sources."@types/http-proxy-1.17.8" - sources."@types/json-schema-7.0.9" + sources."@types/json-schema-7.0.11" sources."@types/mime-1.3.2" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/retry-0.12.1" sources."@types/serve-index-1.9.1" sources."@types/serve-static-1.13.10" sources."@types/sockjs-0.3.33" - sources."@types/ws-8.2.2" - sources."accepts-1.3.7" + sources."@types/ws-8.5.3" + sources."accepts-1.3.8" sources."aggregate-error-3.1.0" - sources."ajv-8.9.0" + sources."ajv-8.11.0" sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."ansi-html-community-0.0.8" @@ -131643,9 +135514,9 @@ in sources."balanced-match-1.0.2" sources."batch-0.6.1" sources."binary-extensions-2.2.0" - (sources."body-parser-1.19.1" // { + (sources."body-parser-1.19.2" // { dependencies = [ - sources."bytes-3.1.1" + sources."bytes-3.1.2" ]; }) sources."bonjour-3.5.0" @@ -131667,7 +135538,7 @@ in sources."connect-history-api-fallback-1.6.0" sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.1" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" @@ -131690,7 +135561,7 @@ in sources."etag-1.8.1" sources."eventemitter3-4.0.7" sources."execa-5.1.1" - (sources."express-4.17.2" // { + (sources."express-4.17.3" // { dependencies = [ sources."array-flatten-1.1.1" ]; @@ -131701,7 +135572,7 @@ in sources."faye-websocket-0.11.4" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."follow-redirects-1.14.7" + sources."follow-redirects-1.14.9" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-monkey-1.0.3" @@ -131716,7 +135587,7 @@ in sources."graceful-fs-4.2.9" sources."handle-thing-2.0.1" sources."has-1.0.3" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" (sources."hpack.js-2.1.6" // { dependencies = [ @@ -131724,12 +135595,12 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."html-entities-2.3.2" + sources."html-entities-2.3.3" sources."http-deceiver-1.2.7" sources."http-errors-1.8.1" - sources."http-parser-js-0.5.5" + sources."http-parser-js-0.5.6" sources."http-proxy-1.18.1" - sources."http-proxy-middleware-2.0.1" + sources."http-proxy-middleware-2.0.4" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ignore-5.2.0" @@ -131761,20 +135632,20 @@ in sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + sources."mkdirp-0.5.6" sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" - sources."negotiator-0.6.2" - sources."node-forge-1.2.1" + sources."negotiator-0.6.3" + sources."node-forge-1.3.0" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-is-1.1.5" @@ -131806,12 +135677,12 @@ in ]; }) sources."punycode-2.1.1" - sources."qs-6.9.6" + sources."qs-6.9.7" sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" - (sources."raw-body-2.4.2" // { + (sources."raw-body-2.4.3" // { dependencies = [ - sources."bytes-3.1.1" + sources."bytes-3.1.2" ]; }) sources."readable-stream-3.6.0" @@ -131827,7 +135698,7 @@ in sources."safer-buffer-2.1.2" sources."schema-utils-4.0.0" sources."select-hose-2.0.0" - sources."selfsigned-2.0.0" + sources."selfsigned-2.0.1" (sources."send-0.17.2" // { dependencies = [ sources."ms-2.1.3" @@ -131844,18 +135715,18 @@ in sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."sockjs-0.3.24" (sources."spdy-4.0.2" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) (sources."spdy-transport-3.0.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -131878,12 +135749,12 @@ in sources."uuid-8.3.2" sources."vary-1.1.2" sources."wbuf-1.7.3" - sources."webpack-dev-middleware-5.3.0" + sources."webpack-dev-middleware-5.3.1" sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-8.4.2" + sources."ws-8.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -131898,17 +135769,17 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "10.2.1"; + version = "10.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.1.tgz"; - sha512 = "nr81NhCAIpAWXGCK5thrKmfCQ6GDY0L5RN0U+BnIn/7Us55+UCex5ANNsNKmIVtDRnk0Ecf+/kzp9SUVrrBMLg=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz"; + sha512 = "xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/json-schema-7.0.9" - sources."ajv-8.9.0" + sources."@types/json-schema-7.0.11" + sources."ajv-8.11.0" sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."array-union-3.0.1" @@ -131930,7 +135801,7 @@ in sources."is-number-7.0.0" sources."json-schema-traverse-1.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."normalize-path-3.0.0" sources."path-type-4.0.0" sources."picomatch-2.3.1" @@ -131960,10 +135831,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "4.0.2"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-4.0.2.tgz"; - sha512 = "GQ+iobyUrnRqBdQRqZHghj6qOz3WHDDoq028N7NcUKgU7eaDBgu2m3hBfpCmIvn9mNlRRGk6utNh++tNVdTmnQ=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-4.0.4.tgz"; + sha512 = "uamNZvqmpk1NpK+Vk/L8hppxq/7n8qtD+pQKia9pkXIAGqOGDA65ql9hx6g8rA2tM7cKDNkJhtxxF9ibJsyveQ=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.3" @@ -131978,12 +135849,13 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-17.0.10" + sources."@types/node-17.0.23" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" + sources."b4a-1.3.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bencode-2.0.2" @@ -131992,30 +135864,30 @@ in sources."bitfield-4.0.0" (sources."bittorrent-dht-10.0.2" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) (sources."bittorrent-lsd-1.1.1" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."bittorrent-peerid-1.3.4" - (sources."bittorrent-protocol-3.5.1" // { + (sources."bittorrent-protocol-3.5.2" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - (sources."bittorrent-tracker-9.18.3" // { + (sources."bittorrent-tracker-9.18.5" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" - sources."simple-get-4.0.0" + sources."simple-get-4.0.1" ]; }) sources."blob-to-buffer-1.2.9" @@ -132033,7 +135905,7 @@ in sources."cache-chunk-store-3.2.2" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -132065,7 +135937,7 @@ in }) sources."core-util-is-1.0.3" sources."cpus-1.0.3" - sources."create-torrent-5.0.1" + sources."create-torrent-5.0.2" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."define-lazy-prop-2.0.0" @@ -132076,7 +135948,11 @@ in }) sources."dns-packet-5.3.1" sources."dns-txt-2.0.2" - sources."ecstatic-4.1.4" + (sources."ecstatic-4.1.4" // { + dependencies = [ + sources."mime-2.6.0" + ]; + }) sources."ee-first-1.1.1" sources."elementtree-0.1.7" sources."emoji-regex-8.0.0" @@ -132084,6 +135960,7 @@ in sources."err-code-3.0.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" + sources."events-3.3.0" sources."fast-fifo-1.1.0" sources."filestream-5.0.0" sources."freelist-1.0.3" @@ -132124,14 +136001,14 @@ in dependencies = [ sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" - sources."simple-get-4.0.0" + sources."simple-get-4.0.1" ]; }) sources."long-4.0.0" sources."lru-3.1.0" (sources."lt_donthave-1.0.1" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -132140,10 +136017,10 @@ in sources."mdns-js-packet-0.2.0" sources."mediasource-2.4.0" sources."memory-chunk-store-1.3.5" - sources."mime-2.6.0" + sources."mime-3.0.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mkdirp-classic-0.5.3" sources."moment-2.29.1" sources."mp4-box-encoding-1.4.1" @@ -132162,15 +136039,15 @@ in sources."node-gyp-build-4.3.0" sources."node-ssdp-2.9.1" sources."nodebmc-0.0.7" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."once-1.4.0" sources."open-8.4.0" sources."package-json-versionify-1.0.4" - (sources."parse-torrent-9.1.4" // { + (sources."parse-torrent-9.1.5" // { dependencies = [ sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" - sources."simple-get-4.0.0" + sources."simple-get-4.0.1" ]; }) sources."path-is-absolute-1.0.1" @@ -132187,18 +136064,18 @@ in sources."qap-3.3.1" sources."queue-microtask-1.2.3" sources."queue-tick-1.0.0" - sources."random-access-file-2.2.0" - sources."random-access-storage-1.4.2" + sources."random-access-file-2.2.1" + sources."random-access-storage-1.4.3" sources."random-iterate-1.0.1" sources."randombytes-2.1.0" sources."range-parser-1.2.1" sources."range-slice-stream-2.0.0" sources."rc4-0.1.5" sources."readable-stream-3.6.0" - sources."record-cache-1.1.1" + sources."record-cache-1.2.0" (sources."render-media-4.1.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -132212,29 +136089,29 @@ in sources."sax-1.1.4" sources."semver-5.1.1" sources."simple-concat-1.0.1" - sources."simple-get-2.8.1" - (sources."simple-peer-9.11.0" // { + sources."simple-get-2.8.2" + (sources."simple-peer-9.11.1" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."simple-sha1-3.1.0" (sources."simple-websocket-9.1.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" sources."speed-limiter-1.0.2" sources."speedometer-1.1.0" sources."split-1.0.1" 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.12.0" + sources."streamx-2.12.4" sources."string-width-4.2.3" sources."string2compact-1.3.2" sources."string_decoder-1.3.0" @@ -132245,9 +136122,9 @@ in sources."thunky-0.1.0" sources."timeout-refresh-1.0.3" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.4.7" // { + (sources."torrent-discovery-9.4.10" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -132262,36 +136139,35 @@ in sources."url-join-4.0.1" (sources."ut_metadata-3.5.2" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."ut_pex-3.0.2" - sources."utf-8-validate-5.0.8" + sources."utf-8-validate-5.0.9" sources."util-deprecate-1.0.2" sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.7.1" // { + (sources."webtorrent-1.8.10" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decompress-response-6.0.0" - sources."mime-3.0.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" - sources."simple-get-4.0.0" + sources."simple-get-4.0.1" ]; }) sources."winreg-1.2.4" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.5.6" + sources."ws-7.5.7" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" sources."y18n-5.0.8" - sources."yargs-17.3.1" - sources."yargs-parser-21.0.0" + sources."yargs-17.4.0" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -132351,10 +136227,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "1.3.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.3.0.tgz"; - sha512 = "4F6NSkS6np7oUU3uM5ZIfNmKD33RuOaqQ+3kf/2oCotfJ3MYUH8NFofpBBsOvyXdrzA4KkOJ+ZU/FeC96HjncA=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.6.0.tgz"; + sha512 = "4L8vgCuqRZgfjVnAPW8nKKj5dq4QBSc8LoceCaqtufVxHK+G6MVjI5aT9wHLO1/W07RXSyr0vYqSap7B1GFZ6w=="; }; dependencies = [ sources."jsonc-parser-3.0.0" @@ -132363,11 +136239,11 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-textdocument-1.0.4" sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.3" - sources."yaml-2.0.0-8" + sources."yaml-2.0.0-10" ]; buildInputs = globalBuildInputs; meta = { @@ -132412,7 +136288,7 @@ in sources."ini-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."jsonfile-4.0.0" - sources."minimatch-3.0.4" + sources."minimatch-3.1.2" sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-2.2.2" @@ -132442,10 +136318,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "1.22.17"; + version = "1.22.18"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.17.tgz"; - sha512 = "H0p241BXaH0UN9IeH//RT82tl5PfNraVpSpEoW+ET7lmopNC61eZ+A+IDvU8FM6Go5vx162SncDL8J1ZjRBriQ=="; + url = "https://registry.npmjs.org/yarn/-/yarn-1.22.18.tgz"; + sha512 = "oFffv6Jp2+BTUBItzx1Z0dpikTX+raRdqupfqzeMKnoh7WD6RuPAxcqDkMUy9vafJkrB0YaV708znpuMhEBKGQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -132466,19 +136342,19 @@ in sha512 = "0V5CpR62BY1EOevIxXq5BL84YJeIunEzRsFlqb00tc7D77I51/0bvgdGRZhEwhNI2rFxKZ1i77eoisT56gfMTQ=="; }; dependencies = [ - sources."@babel/runtime-7.16.7" - sources."@gar/promisify-1.1.2" + sources."@babel/runtime-7.17.8" + sources."@gar/promisify-1.1.3" sources."@isaacs/string-locale-compare-1.1.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@npmcli/arborist-4.2.1" // { + (sources."@npmcli/arborist-4.3.1" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.5" ]; }) - (sources."@npmcli/fs-1.1.0" // { + (sources."@npmcli/fs-1.1.1" // { dependencies = [ sources."semver-7.3.5" ]; @@ -132491,7 +136367,12 @@ in ]; }) sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/map-workspaces-2.0.0" + (sources."@npmcli/map-workspaces-2.0.2" // { + dependencies = [ + sources."brace-expansion-2.0.1" + sources."minimatch-5.0.1" + ]; + }) (sources."@npmcli/metavuln-calculator-2.0.0" // { dependencies = [ sources."semver-7.3.5" @@ -132516,13 +136397,13 @@ in sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - (sources."agentkeepalive-4.2.0" // { + (sources."agentkeepalive-4.2.1" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -132531,7 +136412,7 @@ in sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."aproba-2.0.0" sources."are-we-there-yet-1.1.7" @@ -132557,7 +136438,7 @@ in sources."bcrypt-pbkdf-1.0.2" (sources."bin-links-3.0.0" // { dependencies = [ - sources."write-file-atomic-4.0.0" + sources."write-file-atomic-4.0.1" ]; }) sources."bin-version-3.1.0" @@ -132568,7 +136449,7 @@ in sources."readable-stream-3.6.0" ]; }) - sources."boolean-3.1.4" + sources."boolean-3.2.0" (sources."boxen-1.3.0" // { dependencies = [ sources."camelcase-4.1.0" @@ -132627,7 +136508,7 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.20.3" + sources."core-js-3.21.1" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -132737,14 +136618,14 @@ in sources."http-cache-semantics-3.8.1" (sources."http-proxy-agent-4.0.1" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."http-signature-1.2.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -132800,13 +136681,19 @@ in sources."is-utf8-0.2.1" sources."is-wsl-1.1.0" sources."isarray-1.0.0" - sources."isbinaryfile-4.0.8" + sources."isbinaryfile-4.0.10" sources."isexe-2.0.0" sources."isstream-0.1.2" sources."isurl-1.0.0" - (sources."jake-10.8.2" // { + (sources."jake-10.8.4" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."async-0.9.2" + 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."js-yaml-3.14.1" @@ -132844,7 +136731,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."locutus-2.0.15" + sources."locutus-2.0.16" sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" sources."lodash.pad-4.5.1" @@ -132880,13 +136767,13 @@ in }) sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.4" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."micromatch-4.0.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."minipass-3.1.6" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" @@ -132895,7 +136782,7 @@ in sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" sources."minizlib-2.1.2" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" (sources."mkdirp-infer-owner-2.0.0" // { dependencies = [ sources."mkdirp-1.0.4" @@ -132904,16 +136791,16 @@ in sources."ms-2.0.0" sources."multimatch-5.0.0" sources."mute-stream-0.0.7" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."nice-try-1.0.5" (sources."node-gyp-8.4.1" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."are-we-there-yet-2.0.0" + sources."are-we-there-yet-3.0.0" sources."env-paths-2.2.1" - sources."gauge-4.0.0" + sources."gauge-4.0.3" sources."is-fullwidth-code-point-3.0.0" - sources."npmlog-6.0.0" + sources."npmlog-6.0.1" sources."readable-stream-3.6.0" sources."semver-7.3.5" sources."string-width-4.2.3" @@ -132955,7 +136842,29 @@ in sources."semver-7.3.5" ]; }) - sources."npm-registry-fetch-11.0.0" + (sources."npm-registry-fetch-12.0.2" // { + dependencies = [ + sources."@npmcli/fs-2.1.0" + sources."@tootallnate/once-2.0.0" + sources."cacache-16.0.3" + sources."debug-4.3.4" + sources."http-cache-semantics-4.1.0" + sources."http-proxy-agent-5.0.0" + sources."lru-cache-7.7.1" + (sources."make-fetch-happen-10.1.0" // { + dependencies = [ + sources."minipass-fetch-2.1.0" + ]; + }) + sources."mkdirp-1.0.4" + sources."ms-2.1.2" + (sources."semver-7.3.5" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) + ]; + }) sources."npm-run-path-2.0.2" sources."npmlog-2.0.4" sources."number-is-nan-1.0.1" @@ -133006,13 +136915,13 @@ in sources."p-timeout-2.0.1" (sources."p-transform-1.3.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."p-try-1.0.0" sources."package-json-5.0.0" - (sources."pacote-12.0.2" // { + (sources."pacote-12.0.3" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -133114,7 +137023,7 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."resolve-1.21.1" + sources."resolve-1.22.0" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."retry-0.12.0" @@ -133142,13 +137051,13 @@ in sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.6" + sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."smart-buffer-4.2.0" - sources."socks-2.6.1" + sources."socks-2.6.2" (sources."socks-proxy-agent-6.1.1" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -133184,7 +137093,7 @@ in }) (sources."strip-ansi-5.2.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-4.1.1" ]; }) sources."strip-bom-2.0.0" @@ -133254,10 +137163,13 @@ in sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."twig-1.15.4" + (sources."twig-1.15.4" // { + dependencies = [ + sources."minimatch-3.0.8" + ]; + }) sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."typedarray-to-buffer-4.0.0" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-1.0.0" @@ -133330,7 +137242,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."escape-string-regexp-4.0.0" sources."execa-5.1.1" (sources."figures-3.2.0" // { @@ -133342,7 +137254,7 @@ in sources."gauge-3.0.2" sources."get-stream-6.0.1" sources."has-flag-4.0.0" - sources."inquirer-8.2.0" + sources."inquirer-8.2.2" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-2.0.1" sources."locate-path-6.0.0" @@ -133358,7 +137270,7 @@ in sources."path-key-3.1.1" sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" - sources."rxjs-7.5.2" + sources."rxjs-7.5.5" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -133397,10 +137309,10 @@ in zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "4.3.0"; + version = "6.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-4.3.0.tgz"; - sha512 = "KuEjpu5QFIMx0wWfzknDRhY98s7a3tWNRmYt19XNmB7AfOmz5zISA4+3Q8vlJc2qguxMn89uSxhPDCldPa3YLA=="; + url = "https://registry.npmjs.org/zx/-/zx-6.0.7.tgz"; + sha512 = "aJTTKN4m9m8wM02yQ4jMOXMp53Ni+r+VDAs0D+bo9l9x9nCMhOocNWeTjoaancHkb7LpNb4oLILp58HzTy0GpQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -133408,30 +137320,24 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-16.11.21" - sources."@types/node-fetch-2.5.12" - sources."ansi-styles-4.3.0" - sources."array-union-3.0.1" - sources."asynckit-0.4.0" + sources."@types/node-17.0.23" + sources."@types/which-2.0.1" sources."braces-3.0.2" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."combined-stream-1.0.8" - sources."delayed-stream-1.0.0" + sources."chalk-5.0.1" + sources."data-uri-to-buffer-4.0.0" sources."dir-glob-3.0.1" sources."duplexer-0.1.2" sources."event-stream-3.3.4" sources."fast-glob-3.2.11" sources."fastq-1.13.0" + sources."fetch-blob-3.1.5" sources."fill-range-7.0.1" - sources."form-data-3.0.1" + sources."formdata-polyfill-4.0.10" sources."from-0.1.7" - sources."fs-extra-10.0.0" + sources."fs-extra-10.0.1" sources."glob-parent-5.1.2" - sources."globby-12.2.0" + sources."globby-13.1.1" sources."graceful-fs-4.2.9" - sources."has-flag-4.0.0" sources."ignore-5.2.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -133440,11 +137346,10 @@ in sources."jsonfile-6.1.0" sources."map-stream-0.1.0" sources."merge2-1.4.1" - sources."micromatch-4.0.4" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."minimist-1.2.5" - sources."node-fetch-2.6.7" + sources."micromatch-4.0.5" + sources."minimist-1.2.6" + sources."node-domexception-1.0.0" + sources."node-fetch-3.2.3" sources."path-type-4.0.0" sources."pause-stream-0.0.11" sources."picomatch-2.3.1" @@ -133455,18 +137360,16 @@ in sources."slash-4.0.0" sources."split-0.3.3" sources."stream-combiner-0.0.4" - sources."supports-color-7.2.0" sources."through-2.3.8" sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" sources."universalify-2.0.0" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" + sources."web-streams-polyfill-3.2.0" sources."which-2.0.2" + sources."yaml-1.10.2" ]; buildInputs = globalBuildInputs; meta = { - description = "A tool for writing better scripts"; + description = "A tool for writing better scripts."; homepage = "https://github.com/google/zx#readme"; license = "Apache-2.0"; }; diff --git a/pkgs/development/node-packages/package-tests/tailwindcss.nix b/pkgs/development/node-packages/package-tests/tailwindcss.nix index d5c9fdeff36a..1f986d8bb096 100644 --- a/pkgs/development/node-packages/package-tests/tailwindcss.nix +++ b/pkgs/development/node-packages/package-tests/tailwindcss.nix @@ -1,15 +1,47 @@ -{ runCommand, tailwindcss }: +{ runCommand, tailwindcss, nodePackages }: let + inherit (tailwindcss) packageName version; + + tailwindcssInput = builtins.toFile "input.css" '' + @tailwind base; + @tailwind components; + @tailwind utilities; + ''; + + tailwindcssWithPlugins = tailwindcss.overrideAttrs (oldAttrs: { + plugins = [ + nodePackages."@tailwindcss/typography" + ]; + }); + + tailwindcssWithPluginsConfig = builtins.toFile "tailwind.config.js" '' + module.exports = { + content: ["./with-typography.input"], + plugins: [ + require('@tailwindcss/typography'), + ], + } + ''; + in runCommand "${packageName}-tests" { meta.timeout = 60; } '' + mkdir $out + # Ensure CLI runs ${tailwindcss}/bin/tailwind --help > /dev/null ${tailwindcss}/bin/tailwindcss --help > /dev/null - # Needed for Nix to register the command as successful - touch $out + # Ensure CLI with plugins runs + echo '"ml-4 prose"' > ./with-typography.input + ${tailwindcssWithPlugins}/bin/tailwind \ + --config ${tailwindcssWithPluginsConfig} \ + --input ${tailwindcssInput} \ + --output $out/with-typography.css + + grep -q ml-4 $out/with-typography.css + grep -q prose $out/with-typography.css '' diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index 959a7203dfa9..bfef3d5b6c66 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-apron-${version}"; + pname = "ocaml${ocaml.version}-apron"; version = "0.9.13"; src = fetchFromGitHub { owner = "antoinemine"; @@ -10,9 +10,12 @@ stdenv.mkDerivation rec { sha256 = "14ymjahqdxj26da8wik9d5dzlxn81b3z1iggdl7rn2nn06jy7lvy"; }; - buildInputs = [ perl gmp mpfr ppl ocaml findlib camlidl ]; + nativeBuildInputs = [ ocaml findlib perl ]; + buildInputs = [ gmp mpfr ppl camlidl ]; propagatedBuildInputs = [ mlgmpidl ]; + strictDeps = false; + outputs = [ "out" "bin" "dev" ]; configurePhase = '' diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 289f6a6cba4b..3c8be666b66a 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { minimumOCamlVersion = "4.05"; pname = "asn1-combinators"; - version = "0.2.5"; + version = "0.2.6"; useDune2 = true; src = fetchurl { url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz"; - sha256 = "1pbcdwm12hnfpd1jv2b7cjfkj5r7h61xp2gr8dysb8waa455kwln"; + sha256 = "sha256-ASreDYhp72IQY3UsHPjqAm9rxwL+0Q35r1ZojikbGpE="; }; propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ]; diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index ba8cd98327fa..f7478f93b91c 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation { - name = "ocaml${ocaml.version}-astring-${param.version}"; + pname = "ocaml${ocaml.version}-astring"; inherit (param) version; src = fetchurl { @@ -22,7 +22,10 @@ stdenv.mkDerivation { inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index de6ade61518a..7468900e07e6 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -13,9 +13,11 @@ buildDunePackage rec { sha256 = "17jm79np69ixp53a4njxnlb1pg8sd1g47nm3nyki9clkc8d4qsyv"; }; - buildInputs = [ which menhir ]; + nativeBuildInputs = [ which menhir ]; propagatedBuildInputs = [ easy-format re ]; + strictDeps = true; + doCheck = true; passthru.tests = { diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index c1cb7de2d188..ea009083e8d1 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -15,7 +15,7 @@ then throw "BAP is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-bap-${version}"; + pname = "ocaml${ocaml.version}-bap"; version = "2.2.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; @@ -32,14 +32,13 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; setupHook = writeText "setupHook.sh" '' - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}-llvm-plugins/" ''; - nativeBuildInputs = [ which makeWrapper ]; + nativeBuildInputs = [ which makeWrapper ocaml findlib ocamlbuild ocaml_oasis ]; - buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis - linenoise + buildInputs = [ linenoise ounit ppx_bitstring z3 @@ -49,6 +48,7 @@ stdenv.mkDerivation rec { piqi-ocaml uuidm frontc yojson ]; installPhase = '' + runHook preInstall export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR; export PATH=$PATH:$out/bin export CAML_LD_LIBRARY_PATH=''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/ @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { makeWrapper ${utop}/bin/utop $out/bin/baptop --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH --add-flags "-ppx ppx-bap -short-paths -require \"bap.top\"" wrapProgram $out/bin/bapbuild --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH ln -s $sigs $out/share/bap/sigs.zip + runHook postInstall ''; disableIda = "--disable-ida"; diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index d2edb69e1b94..865518ec29c7 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, num +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, qcheck, num, ounit , doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64 }: @@ -6,10 +6,9 @@ if !lib.versionAtLeast ocaml.version "4.02" then throw "batteries is not available for OCaml ${ocaml.version}" else -let version = "3.4.0"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-batteries-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-batteries"; + version = "3.4.0"; src = fetchFromGitHub { owner = "ocaml-batteries-team"; @@ -18,10 +17,12 @@ stdenv.mkDerivation { sha256 = "sha256:1cd7475n1mxhq482aidmhh27mq5p2vmb8d9fkb1mlza9pz5z66yq"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - checkInputs = [ qtest ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + checkInputs = [ qtest ounit qcheck ]; propagatedBuildInputs = [ num ]; + strictDeps = !doCheck; + inherit doCheck; checkTarget = "test"; diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix index 07432dd7c6e7..c80162307241 100644 --- a/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/pkgs/development/ocaml-modules/benchmark/default.nix @@ -1,16 +1,18 @@ { stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }: -let version = "1.4"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-benchmark-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-benchmark"; + version = "1.4"; src = fetchzip { url = "https://github.com/Chris00/ocaml-benchmark/releases/download/${version}/benchmark-${version}.tar.gz"; sha256 = "16wi8ld7c3mq77ylpgbnj8qqqqimyzwxs47v06vyrwpma5pab5xa"; }; - buildInputs = [ ocaml findlib ocamlbuild ocaml_pcre ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml_pcre ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/pkgs/development/ocaml-modules/bigarray-compat/default.nix index 83c35edcc41d..be343c444171 100644 --- a/pkgs/development/ocaml-modules/bigarray-compat/default.nix +++ b/pkgs/development/ocaml-modules/bigarray-compat/default.nix @@ -2,17 +2,17 @@ buildDunePackage rec { pname = "bigarray-compat"; - version = "1.0.0"; + version = "1.1.0"; useDune2 = true; - minimalOCamlVersion = "4.03"; + minimalOCamlVersion = "4.02"; src = fetchFromGitHub { owner = "mirage"; repo = pname; rev = "v${version}"; - sha256 = "06j1dwlpisxshdd0nab4n4x266gg1s1n8na16lpgw3fvcznwnimz"; + sha256 = "sha256-2JVopggK2JuXWEPu8qn12F1jQIJ9OV89XY1rHtUqLkI="; }; meta = { diff --git a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix index e02b1159a9c7..a5f5ae33ede7 100644 --- a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix +++ b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix @@ -14,9 +14,12 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; useDune2 = true; + strictDeps = !doCheck; + propagatedBuildInputs = [ bigarray-compat ]; - checkInputs = [ alcotest astring fpath bos findlib pkg-config ]; + nativeBuildInputs = [ findlib pkg-config ]; + checkInputs = [ alcotest astring fpath bos ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix index 852459c2bac1..e8d36526d228 100644 --- a/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigarray-compat }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigarray-compat, pkg-config }: buildDunePackage rec { pname = "bigstringaf"; @@ -15,6 +15,10 @@ buildDunePackage rec { sha256 = "1q1sqxzdnlrpl95ccrhl7lwy3zswgd9rbn19ildclh0lyi2vazbj"; }; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ pkg-config ]; checkInputs = [ alcotest ]; propagatedBuildInputs = [ bigarray-compat ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; diff --git a/pkgs/development/ocaml-modules/biniou/1.0.nix b/pkgs/development/ocaml-modules/biniou/1.0.nix index 795e63401290..ec81e5b8db91 100644 --- a/pkgs/development/ocaml-modules/biniou/1.0.nix +++ b/pkgs/development/ocaml-modules/biniou/1.0.nix @@ -16,14 +16,17 @@ stdenv.mkDerivation rec { sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb"; }; - buildInputs = [ ocaml findlib easy-format ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ easy-format ]; + + strictDeps = true; createFindlibDestdir = true; makeFlags = [ "PREFIX=$(out)" ]; preBuild = '' - mkdir $out/bin + mkdir -p $out/bin ''; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 535b34b03dcd..75725f135518 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -15,6 +15,8 @@ buildDunePackage rec { propagatedBuildInputs = [ easy-format ]; + strictDeps = true; + postPatch = '' patchShebangs . ''; diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index ddeda86e9bf7..48b9684902ce 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "bisect_ppx"; - version = "2.6.1"; + version = "2.8.1"; src = fetchFromGitHub { owner = "aantron"; repo = "bisect_ppx"; rev = version; - sha256 = "sha256-YeLDlH3mUbVEY4OmzlrvSwVUav3uMtSsTFlOsQKnz84="; + sha256 = "sha256-pOeeSxzUF1jXQjA71atSZALdgQ2NB9qpKo5iaDnPwhQ="; }; minimumOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/bitv/default.nix b/pkgs/development/ocaml-modules/bitv/default.nix index 2ac3a0ba3e76..07649f3655b8 100644 --- a/pkgs/development/ocaml-modules/bitv/default.nix +++ b/pkgs/development/ocaml-modules/bitv/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-sZwq6c10hBBS9tGvKlWD9GE3JBrZPByfDrXE6xIPcG4="; }; - buildInputs = [ autoreconfHook which ocaml findlib ]; + nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix deleted file mode 100644 index a6b63676e775..000000000000 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, which, camlp4 }: - -let inherit (lib) getVersion versionAtLeast; in - -assert versionAtLeast (getVersion ocaml) "4.00.0"; -assert versionAtLeast (getVersion findlib) "1.3.3"; - -if versionAtLeast ocaml.version "4.06" -then throw "bolt is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - pname = "bolt"; - version = "1.4"; - - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1043/bolt-${version}.tar.gz"; - sha256 = "1c807wrpxra9sbb34lajhimwra28ldxv04m570567lh2b04n38zy"; - }; - - buildInputs = [ ocaml findlib ocamlbuild which camlp4 ]; - - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/bolt/bolt.1.4/files/opam.patch"; - sha256 = "08cl39r98w312sw23cskd5wian6zg20isn9ki41hnbcgkazhi7pb"; - }) - ]; - - postPatch = '' - patch myocamlbuild.ml < "camlp4of" in ---- -> let camlp4of = "camlp4of" in -EOF - ''; - - # The custom `configure` script does not expect the --prefix - # option. Installation is handled by ocamlfind. - dontAddPrefix = true; - dontAddStaticConfigureFlags = true; - configurePlatforms = [ ]; - - createFindlibDestdir = true; - - buildFlags = [ "all" ]; - - doCheck = true; - checkTarget = "tests"; - - meta = with lib; { - homepage = "http://bolt.x9c.fr"; - description = "A logging tool for the OCaml language"; - longDescription = '' - Bolt is a logging tool for the OCaml language. It is inspired by and - modeled after the famous log4j logging framework for Java. - ''; - license = licenses.lgpl3; - platforms = ocaml.meta.platforms or [ ]; - maintainers = [ maintainers.jirkamarsik ]; - }; -} diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix index 62438526d703..9f7ce539e18a 100644 --- a/pkgs/development/ocaml-modules/bos/default.nix +++ b/pkgs/development/ocaml-modules/bos/default.nix @@ -3,17 +3,20 @@ }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-bos-${version}"; - version = "0.2.0"; + pname = "ocaml${ocaml.version}-bos"; + version = "0.2.1"; + src = fetchurl { url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz"; - sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc"; + sha256 = "sha256-2NYueGsQ1pfgRXIFqO7eqifrzJDxhV8Y3xkMrC49jzc="; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ astring fmt fpath logs rresult ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/pkgs/development/ocaml-modules/bz2/default.nix b/pkgs/development/ocaml-modules/bz2/default.nix index 617715fc6edc..4ac0262e1ee3 100644 --- a/pkgs/development/ocaml-modules/bz2/default.nix +++ b/pkgs/development/ocaml-modules/bz2/default.nix @@ -19,9 +19,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - ]; - - buildInputs = [ ocaml findlib ]; @@ -30,6 +27,8 @@ stdenv.mkDerivation rec { bzip2 ]; + strictDeps = true; + preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs"; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix index ce8993b465eb..0805edbafe84 100644 --- a/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -1,28 +1,29 @@ { lib, buildDunePackage, fetchurl -, bos, fpath, rresult, ptime, mirage-crypto, x509, astring, logs -, cacert, alcotest +, bos, fpath, ptime, mirage-crypto, x509, astring, logs +, cacert, alcotest, fmt }: buildDunePackage rec { pname = "ca-certs"; - version = "0.2.1"; + version = "0.2.2"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz"; - sha256 = "d43109496a5129feff967d557c556af96f8b10456896a405c43b7cf0c35d0af3"; + sha256 = "sha256-Tx53zBJemZh3ODh/8izahxDoJvXvNFLyAA8LMM1mhlI="; }; useDune2 = true; - propagatedBuildInputs = [ bos fpath rresult ptime mirage-crypto x509 astring logs ]; + propagatedBuildInputs = [ bos fpath ptime mirage-crypto x509 astring logs ]; # Assumes nss-cacert < 3.74 https://github.com/mirage/ca-certs/issues/21 doCheck = false; checkInputs = [ cacert # for /etc/ssl/certs/ca-bundle.crt alcotest + fmt ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index 0a9922f67885..1801a0679b56 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config, cairo }: +{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config, cairo +, ApplicationServices }: buildDunePackage rec { pname = "cairo2"; @@ -13,7 +14,7 @@ buildDunePackage rec { useDune2 = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ cairo dune-configurator ]; + buildInputs = [ cairo dune-configurator ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; doCheck = !(stdenv.isDarwin # https://github.com/Chris00/ocaml-cairo/issues/19 diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index 29927aae04a7..4c089b76f3ed 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/camlimages/4.2.4.nix b/pkgs/development/ocaml-modules/camlimages/4.2.4.nix index 8ed562a27e69..b44fd7db6b31 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.2.4.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.2.4.nix @@ -15,7 +15,8 @@ , ghostscript }: -assert lib.versionOlder ocaml.version "4.06"; +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02" && lib.versionOlder ocaml.version "4.10") + "camlimages 4.2.4 is not available for OCaml ${ocaml.version}" stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; @@ -54,9 +55,9 @@ stdenv.mkDerivation rec { ''; installPhase = '' - runHook preBuild + runHook preInstall omake install - runHook postBuild + runHook postInstall ''; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index ba36cfa05b99..a83c7c474ac5 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -17,7 +17,10 @@ buildDunePackage rec { sha256 = "1m2c76ghisg73dikz2ifdkrbkgiwa0hcmp21f2fm2rkbf02rq3f4"; }; - buildInputs = [ dune-configurator cppo graphics lablgtk stdio ]; + strictDeps = true; + + nativeBuildInputs = [ cppo ]; + buildInputs = [ dune-configurator graphics lablgtk stdio ]; meta = with lib; { branch = "5.0"; diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 3d79fa377a53..06456b9c930e 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -6,7 +6,8 @@ else stdenv.mkDerivation rec { version = "2.5"; - name = "ocaml${ocaml.version}-camlpdf-${version}"; + pname = "ocaml${ocaml.version}-camlpdf"; + src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; @@ -14,7 +15,9 @@ stdenv.mkDerivation rec { sha256 = "sha256:1qmsa0xgi960y7r20mvf8hxiiml7l1908s4dm7nq262f19w51gsl"; }; - buildInputs = [ which ocaml findlib ]; + nativeBuildInputs = [ which ocaml findlib ]; + + strictDeps = true; preInstall = '' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index c2c2e98b2e06..8124b8d8e437 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -33,10 +33,12 @@ stdenv.mkDerivation { inherit (param) sha256; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; propagatedBuildInputs = [zlib]; + strictDeps = true; + inherit (param) patches; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index 79c7a46e6e99..43bbfe7b6a6d 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0x43pjxx70kgip86mmdn08s97k4qzdqc8i79xfyyx28smy1bsa00"; }; - buildInputs = [ocaml findlib camlp4]; + nativeBuildInputs = [ ocaml findlib camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix index 67bd8b8c755d..e63953836982 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation { sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb"; })]; - buildInputs = [ocaml findlib camlp4]; + nativeBuildInputs = [ocaml findlib camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index 090b96ece0cc..e5fe67021312 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, cppo }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo }: buildDunePackage rec { pname = "camomile"; @@ -13,7 +13,9 @@ buildDunePackage rec { sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad"; }; - buildInputs = [ cppo ]; + nativeBuildInputs = [ cppo ]; + + strictDeps = true; configurePhase = '' runHook preConfigure @@ -21,6 +23,10 @@ buildDunePackage rec { runHook postConfigure ''; + postInstall = '' + echo "version = \"${version}\"" >> $out/lib/ocaml/${ocaml.version}/site-lib/camomile/META + ''; + meta = { inherit (src.meta) homepage; maintainers = [ lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix index 105a6a9dfe18..d9606cda1fa3 100644 --- a/pkgs/development/ocaml-modules/caqti/default.nix +++ b/pkgs/development/ocaml-modules/caqti/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { sha256 = "1vl61kdyj89whc3mh4k9bis6rbj9x2scf6hnv9afyalp4j65sqx1"; }; - buildInputs = [ cppo ]; + nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ logs ptime uri ]; meta = { diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index 97e00dc71b62..6868ddc7851c 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -48,13 +48,15 @@ buildDunePackage rec { ]; doCheck = true; + nativeBuildInputs = [ + findlib + ]; checkInputs = [ base64 alcotest alcotest-lwt crowbar lwt - findlib mirage-flow ]; diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index 303fdc01011d..62a29a5d4141 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -17,7 +17,10 @@ buildDunePackage rec { patches = [ ./git_commit.patch ]; - buildInputs = [ m4 ]; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ m4 ]; checkInputs = [ ounit ]; propagatedBuildInputs = [ core_kernel ]; diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix index 3483af1dd416..3a07707a4cd1 100644 --- a/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/pkgs/development/ocaml-modules/checkseum/default.nix @@ -18,10 +18,8 @@ buildDunePackage rec { sha256 = "9cdd282ea1cfc424095d7284e39e4d0ad091de3c3f2580539d03f6966d45ccd5"; }; - nativeBuildInputs = [ - dune-configurator - pkg-config - ]; + buildInputs = [ dune-configurator ]; + nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ bigarray-compat optint diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index c5a3dcde2263..7a8a3f2e70a4 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9"; }; - buildInputs = [ perl ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ perl ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 7e49679406ab..9536cc25290e 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { inherit (param) sha256; }; - nativeBuildInputs = [ ocaml ocamlbuild findlib ]; + nativeBuildInputs = [ ocaml ocamlbuild findlib topkg ]; buildInputs = [ topkg ]; propagatedBuildInputs = [ result ]; diff --git a/pkgs/development/ocaml-modules/coin/default.nix b/pkgs/development/ocaml-modules/coin/default.nix index f0697a9d880b..f2e0919bdee4 100644 --- a/pkgs/development/ocaml-modules/coin/default.nix +++ b/pkgs/development/ocaml-modules/coin/default.nix @@ -24,9 +24,11 @@ buildDunePackage rec { useDune2 = true; - nativeBuildInputs = [ menhir ]; + nativeBuildInputs = [ menhir findlib ]; + buildInputs = [ re ]; + + strictDeps = true; - checkInputs = [ re ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix deleted file mode 100644 index 1d7c314f005c..000000000000 --- a/pkgs/development/ocaml-modules/comparelib/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildOcaml, fetchFromGitHub, type_conv }: - -buildOcaml rec { - pname = "comparelib"; - version = "113.00.00"; - - minimumSupportedOcamlVersion = "4.00"; - - src = fetchFromGitHub { - owner = "janestreet"; - repo = "comparelib"; - rev = version; - sha256 = "sha256-gtJvXAUxiIt/L9bCzS+8wHcCQ+QpBubwcjDcyN0K2MA="; - }; - - propagatedBuildInputs = [ type_conv ]; - - meta = with lib; { - homepage = "https://github.com/janestreet/comparelib"; - description = "Syntax extension for deriving \"compare\" functions automatically"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 1dc28b2b5f79..6261ba2801b0 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -15,8 +15,7 @@ buildDunePackage rec { sha256 = "2a37ffaa352a1e145ef3d80ac28661213c69a741b238623e59f29e3d5a12c537"; }; - buildInputs = [ ppx_sexp_conv ]; - propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ]; + propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ppx_sexp_conv ]; meta = { description = "A network connection establishment library"; diff --git a/pkgs/development/ocaml-modules/config-file/default.nix b/pkgs/development/ocaml-modules/config-file/default.nix index c408d1a392f1..b9dde0e6425f 100644 --- a/pkgs/development/ocaml-modules/config-file/default.nix +++ b/pkgs/development/ocaml-modules/config-file/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1b02yxcnsjhr05ssh2br2ka4hxsjpdw34ldl3nk33wfnkwk7g67q"; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index d86c0d093247..3f60263736e8 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -4,21 +4,23 @@ if !lib.versionAtLeast ocaml.version "4.10" then throw "cpdf is not available for OCaml ${ocaml.version}" else -let version = "2.5"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-cpdf-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-cpdf"; + version = "2.5"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "cpdf-source"; rev = "v${version}"; - sha256 = "sha256:0ps6d78i5mp1gcigxfp9rxmjr1k00nkr37vllhr0rdyph97w41s1"; + sha256 = "sha256:1qmx229nij7g6qmiacmyy4mcgx3k9509p4slahivshqm79d6wiwl"; }; - buildInputs = [ ocaml findlib ncurses ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ camlpdf ]; + strictDeps = true; + preInstall = '' mkdir -p $OCAMLFIND_DESTDIR mkdir -p $out/bin diff --git a/pkgs/development/ocaml-modules/crowbar/default.nix b/pkgs/development/ocaml-modules/crowbar/default.nix index e114e7d8433a..3557c22bc144 100644 --- a/pkgs/development/ocaml-modules/crowbar/default.nix +++ b/pkgs/development/ocaml-modules/crowbar/default.nix @@ -14,7 +14,10 @@ buildDunePackage rec { sha256 = "0wjfc9irvirfkic32ivvj6qb7r838w08b0d3vmngigbjpjyc9b14"; }; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; + + # Fix tests with pprint ≥ 20220103 + patches = [ ./pprint.patch ]; # disable xmldiff tests, so we don't need to package unmaintained and legacy pkgs postPatch = "rm -rf examples/xmldiff"; diff --git a/pkgs/development/ocaml-modules/crowbar/pprint.patch b/pkgs/development/ocaml-modules/crowbar/pprint.patch new file mode 100644 index 000000000000..77fc073b77fa --- /dev/null +++ b/pkgs/development/ocaml-modules/crowbar/pprint.patch @@ -0,0 +1,22 @@ +commit 77b5e54d33a66445f45ddc48577d835207be8cef +Author: Stephen Dolan +Date: Fri Jun 12 19:34:51 2020 +0100 + + Unbreak small example logic + +diff --git a/examples/pprint/test_pprint.ml b/examples/pprint/test_pprint.ml +index 77789ef..44124e7 100644 +--- a/examples/pprint/test_pprint.ml ++++ b/examples/pprint/test_pprint.ml +@@ -1,9 +1,9 @@ +-open Crowbar + open PPrint ++open Crowbar + type t = (string * PPrint.document) + let doc = fix (fun doc -> choose [ + const ("", empty); +- const ("a", char 'a'); ++ const ("a", PPrint.char 'a'); + const ("123", string "123"); + const ("Hello", string "Hello"); + const ("awordwhichisalittlebittoolong", diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 6011c6953baa..aeaa87aaf75f 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation { sha256 = "1mp7i42cm9w9grmcsa69m3h1ycpn6a48p43y4xj8rsc12x9nav3s"; }; - buildInputs = [ocaml findlib]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; dontConfigure = true; # Skip configure phase diff --git a/pkgs/development/ocaml-modules/csv/1.5.nix b/pkgs/development/ocaml-modules/csv/1.5.nix index ee68782313c5..ef4ae4484d83 100644 --- a/pkgs/development/ocaml-modules/csv/1.5.nix +++ b/pkgs/development/ocaml-modules/csv/1.5.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1ca7jgg58j24pccs5fshis726s06fdcjshnwza5kwxpjgdbvc63g"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; @@ -20,13 +22,17 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = "ocaml setup.ml -test"; - installPhase = "ocaml setup.ml -install"; + installPhase = '' + runHook preInstall + ocaml setup.ml -install + runHook postInstall + ''; meta = with lib; { description = "A pure OCaml library to read and write CSV files"; homepage = "https://github.com/Chris00/ocaml-csv"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or [ ]; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 8c20a68c2746..833ea45a8692 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -15,10 +15,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-eu5RAuPYC97IM4XUsUw3HQ1BJlEHQ+eBpsdUE6hd+Q8="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib ncurses ]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ integers libffi bigarray-compat ]; + strictDeps = true; + buildPhase = '' make XEN=false libffi.config ctypes-base ctypes-stubs make XEN=false ctypes-foreign diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index 2ddaec5c7c1d..dba0bcb9269e 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -1,4 +1,5 @@ { lib, ocaml, fetchurl, buildDunePackage +, pkg-config, which , bigarray-compat, eqaf, stdlib-shims , alcotest, astring, bos, findlib, fpath }: @@ -14,8 +15,13 @@ buildDunePackage rec { sha256 = "01gwkbrznci4xdcbww4ysgsciz2qs0r8jsmhp0siwbcgcrf1jjv5"; }; + nativeBuildInputs = [ findlib which ]; + buildInputs = [ ocaml ]; + propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ]; + strictDeps = !doCheck; + checkInputs = [ alcotest astring bos fpath ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; diff --git a/pkgs/development/ocaml-modules/directories/default.nix b/pkgs/development/ocaml-modules/directories/default.nix index eae11953113b..509d5b2a1e4a 100644 --- a/pkgs/development/ocaml-modules/directories/default.nix +++ b/pkgs/development/ocaml-modules/directories/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "directories"; - version = "0.2"; + version = "0.5"; useDune2 = true; minimumOCamlVersion = "4.07"; @@ -11,7 +11,7 @@ buildDunePackage rec { owner = "ocamlpro"; repo = pname; rev = version; - sha256 = "0s7ginh0g0fhw8xf9v58cx99a8q9jqsf4i0p134m5qzf84qpjwff"; + sha256 = "sha256-31CGhmmfOORJ1ewgp+IU+p1+f2kfX/W+lxK7EGU62vc="; }; meta = { diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index 9a21da986814..7a7a14192f9e 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -16,7 +16,9 @@ buildDunePackage rec { sha256 = "133l23mwxa9xy340izvk4zp5jqjz2cwsm2innsgs2kg85pd39c41"; }; - buildInputs = [ menhir ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib fmt ]; # Testr are not compatible with menhir 20211128 diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index 64fb2b2c5a59..599cc356031b 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-6wfqT5sqo4YA8XoHH3QhG6/TyzzXCzqjmnPuBArRoj8="; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix index 733427cdb914..daf5b3779d73 100644 --- a/pkgs/development/ocaml-modules/dose3/default.nix +++ b/pkgs/development/ocaml-modules/dose3/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "dose3"; - version = "6.1"; + version = "7.0.0"; src = fetchFromGitLab { owner = "irill"; repo = "dose3"; rev = version; - sha256 = "sha256-RFChY7VH2pVD4u5U1qng46h9aAv8I/3yXVaNmFDmKFI="; + sha256 = "sha256-K0fYSAWV48Rers/foDrEIqieyJ0PvpXkuYrFrZGBkkE="; }; minimalOCamlVersion = "4.03"; diff --git a/pkgs/development/ocaml-modules/dum/default.nix b/pkgs/development/ocaml-modules/dum/default.nix index d8aa1f371f3b..3faef36e8ec4 100644 --- a/pkgs/development/ocaml-modules/dum/default.nix +++ b/pkgs/development/ocaml-modules/dum/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-dum-${version}"; + pname = "ocaml${ocaml.version}-dum"; version = "1.0.1"; src = fetchFromGitHub { @@ -13,9 +13,11 @@ stdenv.mkDerivation rec { sha256 = "0yrxl97szjc0s2ghngs346x3y0xszx2chidgzxk93frjjpsr1mlr"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ easy-format ]; + strictDeps = true; + createFindlibDestdir = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix index 65c55da6e3b3..c39239525d18 100644 --- a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix +++ b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix @@ -1,17 +1,17 @@ -{ lib, buildDunePackage, dune_2, dune-glob, dune-private-libs }: +{ lib, buildDunePackage, dune_3, dune-glob, dune-private-libs }: buildDunePackage rec { pname = "dune-action-plugin"; - inherit (dune_2) src version patches; + inherit (dune_3) src version; - useDune2 = true; + duneVersion = "3"; dontAddPrefix = true; propagatedBuildInputs = [ dune-glob dune-private-libs ]; meta = with lib; { - inherit (dune_2.meta) homepage; + inherit (dune_3.meta) homepage; description = "API for writing dynamic Dune actions"; maintainers = [ maintainers.marsam ]; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/dune-glob/default.nix b/pkgs/development/ocaml-modules/dune-glob/default.nix index c7c6f9be4ee0..04b5e7623793 100644 --- a/pkgs/development/ocaml-modules/dune-glob/default.nix +++ b/pkgs/development/ocaml-modules/dune-glob/default.nix @@ -1,17 +1,17 @@ -{ lib, buildDunePackage, dune_2, dune-private-libs }: +{ lib, buildDunePackage, dune_3, dune-private-libs }: buildDunePackage rec { pname = "dune-glob"; - inherit (dune_2) src version patches; + inherit (dune_3) src version; - useDune2 = true; + duneVersion = "3"; dontAddPrefix = true; propagatedBuildInputs = [ dune-private-libs ]; meta = with lib; { - inherit (dune_2.meta) homepage; + inherit (dune_3.meta) homepage; description = "Glob string matching language supported by dune"; maintainers = [ maintainers.marsam ]; license = licenses.mit; diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 8a635efa3a59..9b45064d1984 100644 --- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -1,16 +1,18 @@ -{ lib, buildDunePackage, dune_2 }: +{ lib, buildDunePackage, dune_3, stdune }: buildDunePackage rec { pname = "dune-private-libs"; - useDune2 = true; + duneVersion = "3"; - inherit (dune_2) src version patches; + inherit (dune_3) src version; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; dontAddPrefix = true; + propagatedBuildInputs = [ stdune ]; + meta = with lib; { description = "Private libraries of Dune"; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/ocaml-modules/dune-site/default.nix b/pkgs/development/ocaml-modules/dune-site/default.nix index 9462393d2697..8f51e182970f 100644 --- a/pkgs/development/ocaml-modules/dune-site/default.nix +++ b/pkgs/development/ocaml-modules/dune-site/default.nix @@ -1,10 +1,10 @@ -{ lib, buildDunePackage, dune_2, dune-private-libs }: +{ lib, buildDunePackage, dune_3, dune-private-libs }: buildDunePackage rec { pname = "dune-site"; - inherit (dune_2) src version patches; + inherit (dune_3) src version; - useDune2 = true; + duneVersion = "3"; dontAddPrefix = true; @@ -12,7 +12,7 @@ buildDunePackage rec { meta = with lib; { description = "A library for embedding location information inside executable and libraries"; - inherit (dune_2.meta) homepage; + inherit (dune_3.meta) homepage; maintainers = with lib.maintainers; [ ]; license = licenses.mit; }; diff --git a/pkgs/development/ocaml-modules/duration/default.nix b/pkgs/development/ocaml-modules/duration/default.nix index a547a919c31d..ccddecf28988 100644 --- a/pkgs/development/ocaml-modules/duration/default.nix +++ b/pkgs/development/ocaml-modules/duration/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "duration"; - version = "0.1.3"; + version = "0.2.0"; useDune2 = true; src = fetchurl { url = "https://github.com/hannesm/duration/releases/download/${version}/duration-${version}.tbz"; - sha256 = "0m9r0ayhpl98g9vdxrbjdcllns274jilic5v8xj1x7dphw21p95h"; + sha256 = "sha256-rRT7daWm9z//fvFyEXiSXuVVzw8jsj46sykYS8DBzmk="; }; doCheck = lib.versionAtLeast ocaml.version "4.05"; diff --git a/pkgs/development/ocaml-modules/dyn/default.nix b/pkgs/development/ocaml-modules/dyn/default.nix new file mode 100644 index 000000000000..81b9e0d745fb --- /dev/null +++ b/pkgs/development/ocaml-modules/dyn/default.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, dune_3, ordering }: + +buildDunePackage { + pname = "dyn"; + inherit (dune_3) version src; + duneVersion = "3"; + + dontAddPrefix = true; + + propagatedBuildInputs = [ ordering ]; + + meta = dune_3.meta // { + description = "Dynamic type"; + }; +} + diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index 5b5b107b694b..64017bd65fe2 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "ecb53d6e469e9ec4d57ee6323ff498d45b78883ae13618492488e7c5151fdd97"; }; - buildInputs = [ocaml findlib]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix index 4eff6c2957de..ec4199cc06eb 100644 --- a/pkgs/development/ocaml-modules/elina/default.nix +++ b/pkgs/development/ocaml-modules/elina/default.nix @@ -2,15 +2,17 @@ stdenv.mkDerivation rec { version = "1.1"; - name = "ocaml${ocaml.version}-elina-${version}"; + pname = "ocaml${ocaml.version}-elina"; src = fetchurl { url = "http://files.sri.inf.ethz.ch/elina-${version}.tar.gz"; sha256 = "1nymykskq1yx87y4xl6hl9i4q6kv0qaq25rniqgl1bfn883p1ysc"; }; - buildInputs = [ perl ocaml findlib ]; + nativeBuildInputs = [ perl ocaml findlib camlidl ]; - propagatedBuildInputs = [ apron camlidl gmp mpfr ]; + propagatedBuildInputs = [ apron gmp mpfr ]; + + strictDeps = true; prefixKey = "--prefix "; configureFlags = [ diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 69ac628d2014..e3af173edc91 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -6,6 +6,7 @@ , ocaml , lwt_react , opaline +, ocamlbuild , ppx_deriving , findlib , js_of_ocaml-ocamlbuild @@ -28,13 +29,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-VNxzpVpXEGlixyjadbW0GjL83jcKV5TWd46UReNYO6w="; }; - buildInputs = [ + nativeBuildInputs = [ ocaml which findlib + opaline + ocamlbuild + ]; + buildInputs = [ js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json - opaline ocamlnet ]; @@ -48,6 +52,8 @@ stdenv.mkDerivation rec { ppx_deriving ]; + strictDeps = true; + installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; setupHook = [ ./setup-hook.sh ]; diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 4412f568508c..0770f3a48d48 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -2,11 +2,12 @@ , re, perl, ncurses , ppxlib, ppx_deriving , ppxlib_0_15, ppx_deriving_0_15 -, version ? "1.13.7" +, version ? "1.14.1" }: with lib; let fetched = import ../../../build-support/coq/meta-fetch/default.nix {inherit lib stdenv fetchzip; } ({ + release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis="; release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r"; release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka"; release."1.13.1".sha256 = "12a9nbdvg9gybpw63lx3nw5wnxfznpraprb0wj3l68v1w43xq044"; diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix deleted file mode 100644 index d7f467e8eb98..000000000000 --- a/pkgs/development/ocaml-modules/enumerate/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: - -assert lib.versionAtLeast (lib.getVersion ocaml) "4.00"; - -if lib.versionAtLeast ocaml.version "4.06" -then throw "enumerate-111.08.00 is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - pname = "ocaml-enumerate"; - version = "111.08.00"; - - src = fetchurl { - url = "https://ocaml.janestreet.com/ocaml-core/${lib.versions.majorMinor version}.00/individual/enumerate-${version}.tar.gz"; - sha256 = "0b6mx5p01lcpimvak4wx6aj2119707wsfzd83rwgb91bhpgzh156"; - }; - - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ type_conv camlp4 ]; - - createFindlibDestdir = true; - - meta = { - homepage = "https://ocaml.janestreet.com/"; - description = "Quotation expanders for enumerating finite types"; - license = lib.licenses.asl20; - platforms = ocaml.meta.platforms or [ ]; - }; -} diff --git a/pkgs/development/ocaml-modules/eqaf/default.nix b/pkgs/development/ocaml-modules/eqaf/default.nix index a3f64cb7bd95..ba2274e9c326 100644 --- a/pkgs/development/ocaml-modules/eqaf/default.nix +++ b/pkgs/development/ocaml-modules/eqaf/default.nix @@ -3,12 +3,12 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; pname = "eqaf"; - version = "0.7"; + version = "0.8"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-v${version}.tbz"; - sha256 = "1q09pwhs121vpficl2af1yzs4y7dd9bc1lcxbqyfc4x4m6p6drhh"; + sha256 = "sha256-EUWhYBB0N9eUPgLkht9r0jPTk37BpZfX+jntuUcc+HU="; }; propagatedBuildInputs = [ cstruct bigarray-compat ]; diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index fa072f8bd1c1..ebf9cdaad69a 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-OQdLTq9tJZc6XlcuPv2gxzYiQAUGd6AiBzfSi169XL0="; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index 9eaad7575ec3..1507154d2f64 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.3+20200317"; - name = "ocaml${ocaml.version}-erm_xmpp-${version}"; + pname = "ocaml${ocaml.version}-erm_xmpp"; src = fetchFromGitHub { owner = "hannesm"; @@ -13,9 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0spzyd9kbyizzwl8y3mq8z19zlkzxnkh2fppry4lyc7vaw7bqrwq"; }; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + buildInputs = [ camlp4 ]; propagatedBuildInputs = [ erm_xml mirage-crypto mirage-crypto-rng base64 ]; + strictDeps = true; + configurePhase = '' runHook preConfigure ocaml setup.ml -configure --prefix $out diff --git a/pkgs/development/ocaml-modules/expat/0.9.nix b/pkgs/development/ocaml-modules/expat/0.9.nix index 219b8164e7c9..326ffc60b1ad 100644 --- a/pkgs/development/ocaml-modules/expat/0.9.nix +++ b/pkgs/development/ocaml-modules/expat/0.9.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { sha256 = "16n2j3y0jc9xgqyshw9plrwqnjiz30vnpbhahmgxlidbycw8rgjz"; }; - buildInputs = [ocaml findlib ounit expat]; + nativeBuildInputs = [ocaml findlib ]; + buildInputs = [ ounit expat]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index 1812473e78bf..6fb7927073d4 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-expat-${version}"; + pname = "ocaml${ocaml.version}-expat"; version = "1.1.0"; src = fetchFromGitHub { @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "gcc" "\$(CC)" ''; - buildInputs = [ ocaml findlib expat ounit ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ expat ounit ]; + + strictDeps = true; doCheck = !lib.versionAtLeast ocaml.version "4.06"; checkTarget = "testall"; diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index d1860788838a..7f50548f4b87 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation rec { sha256 = "0npq4hq3zym8nmlyji7l5cqk6drx2rkcx73d60rxqh5g8dla8p4k"; }; - buildInputs = [ ocaml findlib cppo ]; + nativeBuildInputs = [ ocaml findlib cppo ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/facile/default.nix b/pkgs/development/ocaml-modules/facile/default.nix index 8834de53a8fa..3eab7d3417fc 100644 --- a/pkgs/development/ocaml-modules/facile/default.nix +++ b/pkgs/development/ocaml-modules/facile/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage, ocaml }: buildDunePackage rec { pname = "facile"; @@ -11,6 +11,9 @@ buildDunePackage rec { doCheck = true; + useDune2 = lib.versionAtLeast ocaml.version "4.12"; + postPatch = lib.optionalString useDune2 "dune upgrade"; + meta = { homepage = "http://opti.recherche.enac.fr/facile/"; license = lib.licenses.lgpl21Plus; diff --git a/pkgs/development/ocaml-modules/farfadet/default.nix b/pkgs/development/ocaml-modules/farfadet/default.nix index 77eef7f29a98..1ac5595a015b 100644 --- a/pkgs/development/ocaml-modules/farfadet/default.nix +++ b/pkgs/development/ocaml-modules/farfadet/default.nix @@ -7,7 +7,7 @@ then throw "farfadet is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-farfadet-${version}"; + pname = "ocaml${ocaml.version}-farfadet"; version = "0.3"; src = fetchurl { @@ -15,10 +15,13 @@ stdenv.mkDerivation rec { sha256 = "0nlafnp0pwx0n4aszpsk6nvcvqi9im306p4jhx70si7k3xprlr2j"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ faraday ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/pkgs/development/ocaml-modules/fdkaac/default.nix b/pkgs/development/ocaml-modules/fdkaac/default.nix index d3915b65935e..d794e4acce79 100644 --- a/pkgs/development/ocaml-modules/fdkaac/default.nix +++ b/pkgs/development/ocaml-modules/fdkaac/default.nix @@ -21,7 +21,7 @@ buildDunePackage rec { description = "OCaml binding for the fdk-aac library"; inherit (src.meta) homepage; license = lib.licenses.gpl2Only; - maintainers = [ lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl lib.maintainers.dandellion ]; }; } diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix new file mode 100644 index 000000000000..77a6ef01ac9f --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -0,0 +1,21 @@ +{ lib, fetchFromGitHub }: + +rec { + version = "1.1.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-ffmpeg"; + rev = "v${version}"; + sha256 = "13rc3d0n963a28my5ahv78r82rh450hvbsc74mb6ld0r9v210r0p"; + }; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-ffmpeg"; + description = "Bindings for the ffmpeg libraries"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/default.nix b/pkgs/development/ocaml-modules/ffmpeg/default.nix new file mode 100644 index 000000000000..7f0a5da34ddb --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/default.nix @@ -0,0 +1,36 @@ +{ lib, buildDunePackage, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil +, ffmpeg-avcodec +, ffmpeg-avfilter +, ffmpeg-swscale +, ffmpeg-swresample +, ffmpeg-av +, ffmpeg-avdevice +}: + +buildDunePackage { + pname = "ffmpeg"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + propagatedBuildInputs = [ + ffmpeg-avutil + ffmpeg-avcodec + ffmpeg-avfilter + ffmpeg-swscale + ffmpeg-swresample + ffmpeg-av + ffmpeg-avdevice + ]; + + # The tests fail + doCheck = false; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg libraries"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix new file mode 100644 index 000000000000..e8d71aa321e0 --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg }: + +buildDunePackage { + pname = "ffmpeg-av"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg libraries -- top-level helpers"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix new file mode 100644 index 000000000000..8ee5428c473e --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-avcodec"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg avcodec library"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix new file mode 100644 index 000000000000..e6641a6ca030 --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-av, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-avdevice"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-av ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg avdevice library"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix new file mode 100644 index 000000000000..6479bbe55bf6 --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-avfilter"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg avfilter library"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix new file mode 100644 index 000000000000..121fb115146e --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-avutil"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg avutil libraries"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix new file mode 100644 index 000000000000..92011e48eab6 --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg-avcodec, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-swresample"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg-avcodec ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg swresample library"; + }; + +} diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix new file mode 100644 index 000000000000..9d97b722551b --- /dev/null +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, dune-configurator, pkg-config, fetchFromGitHub, callPackage +, ffmpeg-base ? callPackage ./base.nix { } +, ffmpeg-avutil, ffmpeg +}: + +buildDunePackage { + pname = "ffmpeg-swscale"; + + minimalOCamlVersion = "4.08"; + + inherit (ffmpeg-base) version src useDune2; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ffmpeg-avutil ffmpeg.dev ]; + + doCheck = true; + + meta = ffmpeg-base.meta // { + description = "Bindings for the ffmpeg swscale library"; + }; +} diff --git a/pkgs/development/ocaml-modules/fiat-p256/default.nix b/pkgs/development/ocaml-modules/fiat-p256/default.nix deleted file mode 100644 index c979fe682d3e..000000000000 --- a/pkgs/development/ocaml-modules/fiat-p256/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildDunePackage, fetchurl, alcotest, asn1-combinators, benchmark -, bigarray-compat, cstruct, eqaf, hex, ppx_deriving_yojson, rresult -, stdlib-shims, yojson, dune-configurator }: - -buildDunePackage rec { - pname = "fiat-p256"; - version = "0.2.1"; - useDune2 = true; - - src = fetchurl { - url = "https://github.com/mirage/fiat/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "0086h9qkvnqfm8acrxqbki54z619nj73x7f0d01v5vg2naznx7w9"; - }; - - # Make tests compatible with alcotest 1.4.0 - postPatch = '' - substituteInPlace test/wycheproof/test.ml --replace \ - 'Printf.ksprintf Alcotest.fail' 'Printf.ksprintf (fun s -> Alcotest.fail s)' - ''; - - buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ bigarray-compat cstruct eqaf hex ]; - checkInputs = [ alcotest asn1-combinators benchmark - ppx_deriving_yojson rresult stdlib-shims yojson ]; - doCheck = true; - - meta = with lib; { - description = "Primitives for Elliptic Curve Cryptography taken from Fiat"; - homepage = "https://github.com/mirage/fiat"; - license = licenses.mit; - maintainers = with maintainers; [ sternenseemann ]; - }; -} diff --git a/pkgs/development/ocaml-modules/flac/default.nix b/pkgs/development/ocaml-modules/flac/default.nix new file mode 100644 index 000000000000..e08841ac32fe --- /dev/null +++ b/pkgs/development/ocaml-modules/flac/default.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, ogg, flac }: + +buildDunePackage rec { + pname = "flac"; + version = "0.3.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-flac"; + rev = "v${version}"; + sha256 = "06gfbrp30sdxigzkix83y1b610ljzik6rrxmbl3ppmpx4dqlwnxa"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg flac.dev ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-flac"; + description = "Bindings for flac"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index a66976b4a2b5..edf8d08eaaba 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -13,9 +13,11 @@ stdenv.mkDerivation rec { sha256 = "0gkkkj4x678vxdda4xaw2dd44qjacavsvn5nx8gydfwah6pjbkxk"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg cmdliner ]; - propagatedBuildInputs = [ seq stdlib-shims ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + propagatedBuildInputs = [ cmdliner seq stdlib-shims ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index f4afe80d532d..2eca9a4644b5 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -11,8 +11,11 @@ stdenv.mkDerivation { sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml fontconfig ]; + nativeBuildInputs = [ pkg-config ocaml ]; + buildInputs = [ fontconfig ]; + + strictDeps = true; + makeFlags = [ "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${lib.getVersion ocaml}/site-lib/" "OCAML_HAVE_OCAMLOPT=yes" diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix index 532210888bf3..53489f69cc3e 100644 --- a/pkgs/development/ocaml-modules/fpath/default.nix +++ b/pkgs/development/ocaml-modules/fpath/default.nix @@ -13,10 +13,13 @@ stdenv.mkDerivation rec { sha256 = "03z7mj0sqdz465rc4drj1gr88l9q3nfs374yssvdjdyhjbqqzc0j"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ astring ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix index e68f6a28cb47..c05422497ee7 100644 --- a/pkgs/development/ocaml-modules/frontc/default.nix +++ b/pkgs/development/ocaml-modules/frontc/default.nix @@ -8,17 +8,19 @@ let in stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-FrontC-${version}"; + pname = "ocaml${ocaml.version}-FrontC"; version = "3.4.1"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "FrontC"; - rev = "V_3_4_1"; + rev = "V_${lib.replaceStrings ["."] ["_"] version}"; sha256 = "1dq5nks0c9gsbr1m8k39m1bniawr5hqcy1r8x5px7naa95ch06ak"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index 2f11001874f1..a05472366a21 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -13,15 +13,17 @@ let param = in stdenv.mkDerivation { - - name = "ocaml${ocaml.version}-functory-${param.version}"; + pname = "ocaml${ocaml.version}-functory"; + inherit (param) version; src = fetchurl { url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz"; inherit (param) sha256; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; installTargets = [ "ocamlfind-install" ]; diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 348a70a0da9f..c417d94e2947 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "gapi-ocaml"; - version = "0.4.1"; + version = "0.4.2"; useDune2 = true; @@ -15,7 +15,7 @@ buildDunePackage rec { owner = "astrada"; repo = pname; rev = "v${version}"; - sha256 = "0riax23grjnq9pczmp1yv02ji0svvs2kbiqskj6f6yjviamnpa31"; + sha256 = "sha256-imicHOlNjPHHW/lcWRJmURafYZFe/6J3efKPJcel8J8="; }; propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ]; diff --git a/pkgs/development/ocaml-modules/genspio/default.nix b/pkgs/development/ocaml-modules/genspio/default.nix index db3c42bca36c..963cd1dab138 100644 --- a/pkgs/development/ocaml-modules/genspio/default.nix +++ b/pkgs/development/ocaml-modules/genspio/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "genspio"; version = "0.0.2"; + useDune2 = false; + src = fetchFromGitHub { owner = "hammerlab"; repo = pname; @@ -13,7 +15,7 @@ buildDunePackage rec { sha256 = "0cp6p1f713sfv4p2r03bzvjvakzn4ili7hf3a952b3w1k39hv37x"; }; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; propagatedBuildInputs = [ nonstd sosa ]; diff --git a/pkgs/development/ocaml-modules/getopt/default.nix b/pkgs/development/ocaml-modules/getopt/default.nix index 3400774d4c07..e3bf2fb5d641 100644 --- a/pkgs/development/ocaml-modules/getopt/default.nix +++ b/pkgs/development/ocaml-modules/getopt/default.nix @@ -9,12 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0bng2mmdixpmj23xn8krlnaq66k22iclwz46r8zjrsrq3wcn1xgn"; }; - buildInputs = [ + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; + doCheck = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index 58e2b67eacc6..ec8bbb31617d 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -1,31 +1,27 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }: +{ lib, stdenv, fetchurl, ocaml, findlib, topkg, ocamlbuild }: let - inherit (lib) getVersion versionAtLeast; - - pname = "gg"; - version = "0.9.1"; - webpage = "https://erratique.ch/software/${pname}"; + homepage = "https://erratique.ch/software/gg"; + version = "1.0.0"; in -assert versionAtLeast (getVersion ocaml) "4.01.0"; +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "gg is not available for OCaml ${ocaml.version}" stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; + pname = "ocaml${ocaml.version}-gg"; + inherit version; src = fetchurl { - url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "0czj41sr8jsivl3z8wyblf9k971j3kx2wc3s0c1nhzcc8allg9i2"; + url = "${homepage}/releases/gg-${version}.tbz"; + sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci"; }; - buildInputs = [ ocaml findlib ocamlbuild opaline ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; - createFindlibDestdir = true; - - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - - installPhase = "opaline -libdir $OCAMLFIND_DESTDIR"; + inherit (topkg) buildPhase installPhase; meta = with lib; { description = "Basic types for computer graphics in OCaml"; @@ -35,8 +31,8 @@ stdenv.mkDerivation { matrices, quaternions, axis aligned boxes, colors, color spaces, and raster data. ''; - homepage = webpage; - platforms = ocaml.meta.platforms or []; + inherit homepage; + inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; }; diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index 29df5ce8f4e4..fe4f85a0024f 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -21,10 +21,11 @@ stdenv.mkDerivation rec { configureFlags="--with-ocaml-lib-prefix=$out/lib/ocaml/${ocaml.version}/site-lib" ''; + nativeBuildInputs = [ pkg-config ocaml findlib ]; + buildInputs = [ libxslt ]; + propagatedBuildInputs = [ gdome2 ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ocaml findlib gdome2 libxslt]; - propagatedBuildInputs = [gdome2]; + strictDeps = true; meta = { homepage = "http://gmetadom.sourceforge.net/"; diff --git a/pkgs/development/ocaml-modules/hack_parallel/default.nix b/pkgs/development/ocaml-modules/hack_parallel/default.nix index f9bc67772125..122ee2149f3a 100644 --- a/pkgs/development/ocaml-modules/hack_parallel/default.nix +++ b/pkgs/development/ocaml-modules/hack_parallel/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ core core_kernel sqlite ]; + propagatedBuildInputs = [ core core_kernel sqlite ]; meta = { description = diff --git a/pkgs/development/ocaml-modules/hacl-star/default.nix b/pkgs/development/ocaml-modules/hacl-star/default.nix index 8a29439c7a59..004aa5c9a449 100644 --- a/pkgs/development/ocaml-modules/hacl-star/default.nix +++ b/pkgs/development/ocaml-modules/hacl-star/default.nix @@ -12,7 +12,9 @@ buildDunePackage { zarith ]; - buildInputs = [ + nativeBuildInputs = [ cppo ]; + + strictDeps = true; } diff --git a/pkgs/development/ocaml-modules/hacl-star/raw.nix b/pkgs/development/ocaml-modules/hacl-star/raw.nix index c7852338253c..58fa1eb00212 100644 --- a/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { dontAddStaticConfigureFlags = true; configurePlatforms = []; - buildInputs = [ + nativeBuildInputs = [ which ocaml findlib @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { cppo ]; + strictDeps = true; + doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix index 14c775d25fcd..f9267ede60ae 100644 --- a/pkgs/development/ocaml-modules/herelib/default.nix +++ b/pkgs/development/ocaml-modules/herelib/default.nix @@ -1,4 +1,4 @@ -{ lib, buildOcaml, fetchFromGitHub }: +{ lib, buildOcaml, fetchFromGitHub, camlp4 }: buildOcaml rec { version = "112.35.00"; @@ -13,6 +13,10 @@ buildOcaml rec { sha256 = "sha256-EuMhHu2na3lcpsJ1wMVOgBr6VKndlonq8jgAW01eelI="; }; + strictDeps = true; + + buildInputs = [ camlp4 ]; + meta = with lib; { homepage = "https://github.com/janestreet/herelib"; description = "Syntax extension for inserting the current location"; diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix index 2caa25654e39..44b1d5f150a8 100644 --- a/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/pkgs/development/ocaml-modules/hidapi/default.nix @@ -13,9 +13,12 @@ buildDunePackage rec { sha256 = "1j7rd7ajrzla76r3sxljx6fb18f4f4s3jd7vhv59l2ilxyxycai2"; }; + strictDeps = true; + minimumOCamlVersion = "4.03"; - buildInputs = [ pkgs.hidapi pkg-config dune-configurator ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pkgs.hidapi dune-configurator ]; propagatedBuildInputs = [ bigstring ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/hmap/default.nix b/pkgs/development/ocaml-modules/hmap/default.nix index 67622a8ef6a0..d0ae47031b23 100644 --- a/pkgs/development/ocaml-modules/hmap/default.nix +++ b/pkgs/development/ocaml-modules/hmap/default.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { sha256 = "10xyjy4ab87z7jnghy0wnla9wrmazgyhdwhr4hdmxxdn28dxn03a"; }; - buildInputs = [ ocaml ocamlbuild findlib topkg ]; + nativeBuildInputs = [ ocaml ocamlbuild findlib topkg ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix index 0775e21b1f8d..0b05a83dd7ef 100644 --- a/pkgs/development/ocaml-modules/hxd/default.nix +++ b/pkgs/development/ocaml-modules/hxd/default.nix @@ -21,14 +21,11 @@ buildDunePackage rec { sed -i 's|yes ".\+"|& 2> /dev/null|' test/*.t ''; - nativeBuildInputs = [ - dune-configurator - ]; - propagatedBuildInputs = lib.optional withLwt lwt; buildInputs = [ cmdliner + dune-configurator ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index 34b2ee668ea8..3dc4a9856f93 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -6,11 +6,11 @@ buildDunePackage rec { pname = "index"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "1q1lv960dk1br8nz8gkibdywl2wv64ywib7b9jn33f6mpb81qc9f"; + sha256 = "sha256:150mcsh8vj2hapfnxbjmacanjy4avrv8yk1lyaxmqj3fpmn1y32y"; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/inifiles/default.nix b/pkgs/development/ocaml-modules/inifiles/default.nix index 90308ee7d6d9..cbeae7bca839 100644 --- a/pkgs/development/ocaml-modules/inifiles/default.nix +++ b/pkgs/development/ocaml-modules/inifiles/default.nix @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ ocaml_pcre ]; + strictDeps = true; + buildFlags = [ "all" "opt" ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index 8910b720a847..d1c6dc376164 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.3"; - name = "ocaml${ocaml.version}-inotify-${version}"; + pname = "ocaml${ocaml.version}-inotify"; src = fetchFromGitHub { owner = "whitequark"; @@ -19,9 +19,13 @@ stdenv.mkDerivation rec { sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k"; }) ]; - buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml_lwt ]; checkInputs = [ ounit fileutils ]; + # Otherwise checkInputs can't be found + strictDeps = false; + configureFlags = [ "--enable-lwt" (lib.optionalString doCheck "--enable-tests") ]; diff --git a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix index d1386230452c..c2621584f34f 100644 --- a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix +++ b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "ipaddr-cstruct"; - inherit (ipaddr) version src useDune2 minimumOCamlVersion; + inherit (ipaddr) version src; propagatedBuildInputs = [ ipaddr cstruct ]; diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index 3090066c2f4e..c4eefb637fb5 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "ipaddr"; - inherit (macaddr) version src useDune2 minimumOCamlVersion; + inherit (macaddr) version src; propagatedBuildInputs = [ macaddr domain-name stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/pkgs/development/ocaml-modules/ipaddr/sexp.nix index 1ede3c064ada..373b5a87e495 100644 --- a/pkgs/development/ocaml-modules/ipaddr/sexp.nix +++ b/pkgs/development/ocaml-modules/ipaddr/sexp.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "ipaddr-sexp"; - inherit (ipaddr) version src useDune2 minimumOCamlVersion; + inherit (ipaddr) version src; propagatedBuildInputs = [ ipaddr ]; diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index add18281008c..ff9ce94bbbd4 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-sXnYAJcU88797orzzfbA2XG91Lk8mDV677J1Am5o7Xo="; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; + createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index 4fa7e42c5d51..0154029b5504 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "iter"; - version = "1.3"; + version = "1.4"; useDune2 = true; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "c-cube"; repo = pname; rev = "v${version}"; - sha256 = "sha256:0xgkplpbi41sw0yv1wfd12cfbybls6cal8qxddmd9x8khgk5s3vx"; + sha256 = "sha256-Kk92GM7IVXOSVBkeN6wj67Q3UGCyuOOVi2umpn1AZTo="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/pkgs/development/ocaml-modules/janestreet/0.12.nix index 10d8886d9947..c3b4b0c6d705 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.12.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.12.nix @@ -24,6 +24,7 @@ with self; hash = "0gl89zpgsf3n30nb6v5cns27g2bfg4rf3s2427gqvwbkr5gcf7ri"; meta.description = "Full standard library replacement for OCaml"; propagatedBuildInputs = [ sexplib0 ]; + buildInputs = [ dune_1 ]; }; stdio = janePackage { @@ -207,7 +208,7 @@ with self; pname = "jst-config"; hash = "0yxcz13vda1mdh9ah7qqxwfxpcqang5sgdssd8721rszbwqqaw93"; meta.description = "Compile-time configuration for Jane Street libraries"; - buildInputs = [ ppx_assert ]; + buildInputs = [ dune_1 ppx_assert ]; }; ppx_optcomp = janePackage { diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index d22a87a92f3f..800b1c1e531a 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -203,6 +203,8 @@ with self; meta.description = "Trivial metaprogramming tool"; propagatedBuildInputs = [ re ]; checkInputs = [ ppx_jane ]; + # This currently fails with dune + strictDeps = false; }; core = janePackage { @@ -239,6 +241,13 @@ with self; doCheck = false; # we don't have quickcheck_deprecated }; + core_unix = janePackage { + pname = "core_unix"; + hash = "0irfmpx6iksxk2r8mdizjn75h71qh4p2f1s9x2ggckzqj9y904ck"; + meta.description = "Unix-specific portions of Core"; + propagatedBuildInputs = [ core ]; + }; + csvfields = janePackage { pname = "csvfields"; hash = "09jmz6y6nwd96dcx6g8ydicxssi72v1ks276phbc9n19wwg9hkaz"; @@ -664,6 +673,7 @@ with self; pname = "pythonlib"; hash = "0qr0mh9jiv1ham5zlz9i4im23a1vh6x1yp6dp2db2s4icmfph639"; meta.description = "A library to help writing wrappers around ocaml code for python"; + meta.broken = lib.versionAtLeast ocaml.version "4.13"; propagatedBuildInputs = [ ppx_expect ppx_let ppx_python stdio typerep ]; }; @@ -761,6 +771,8 @@ with self; buildInputs = [ jst-config ]; propagatedBuildInputs = [ textutils ]; checkInputs = [ ounit ]; + # This currently fails with dune + strictDeps = false; }; shexp = janePackage { diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 679ef4a58e48..ee906a722501 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -299,9 +299,9 @@ with self; }; core = janePackage { - version = "0.11.2"; + version = "0.11.3"; pname = "core"; - hash = "0vpsvd75lxb09il2rnzyib9mlr51v1hzqdc9fdxgx353pb5agh8a"; + hash = "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq"; propagatedBuildInputs = [ core_kernel spawn ]; meta.description = "Jane Street's standard library overlay"; }; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix index 9a67db4966ce..da2687576015 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -1,11 +1,13 @@ { lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.11.0" }: -{ pname, version ? defaultVersion, hash, ...}@args: +{ pname, version ? defaultVersion, hash, buildInputs ? [], ...}@args: buildDunePackage (args // { - inherit version; + inherit version buildInputs; - minimumOCamlVersion = "4.04"; + useDune2 = false; + + minimalOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "janestreet"; @@ -14,6 +16,8 @@ buildDunePackage (args // { sha256 = hash; }; + strictDeps = true; + meta = { license = lib.licenses.asl20; homepage = "https://github.com/janestreet/${pname}"; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix index 6c7d746e9481..5b9186835701 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix @@ -5,7 +5,9 @@ buildDunePackage (args // { inherit version; - minimumOCamlVersion = "4.07"; + useDune2 = false; + + minimalOCamlVersion = "4.07"; src = fetchFromGitHub { owner = "janestreet"; @@ -14,6 +16,8 @@ buildDunePackage (args // { sha256 = hash; }; + strictDeps = true; + meta = { license = lib.licenses.mit; homepage = "https://github.com/janestreet/${pname}"; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix index 1ed2e6bc4f20..d124baea8972 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix @@ -5,11 +5,13 @@ , hash , minimumOCamlVersion ? "4.08" , doCheck ? true +, buildInputs ? [] +, strictDeps ? true , ...}@args: buildDunePackage (args // { useDune2 = true; - inherit version; + inherit version buildInputs strictDeps; inherit minimumOCamlVersion; diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 78b61de8d9c1..ccd3fa19a92c 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-du1h+S+A7CetMXofsYxdGeSsobCgspDB9oUE9WNUbbo="; }; - buildInputs = [ which ocaml findlib ]; + nativeBuildInputs = [ which ocaml findlib ]; + + strictDeps = true; patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix index cc2c65009ff3..36aa09455cec 100644 --- a/pkgs/development/ocaml-modules/jingoo/default.nix +++ b/pkgs/development/ocaml-modules/jingoo/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "jingoo"; - version = "1.4.2"; + version = "1.4.4"; useDune2 = true; @@ -13,7 +13,7 @@ buildDunePackage rec { owner = "tategakibunko"; repo = "jingoo"; rev = "v${version}"; - sha256 = "0q947aik4i4z5wjllhwlkxh60qczwgra21yyrrzwhi9y5bnf8346"; + sha256 = "sha256-qIw69OE7wYyZYKnIc9QrmF8MzY5Fg5pBFyIpexmaYxA="; }; buildInputs = [ menhir ]; diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index 78a081619b27..2b9c9918382b 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -1,19 +1,20 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }: -let version = "1.0.1"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-jsonm-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-jsonm"; + version = "1.0.1"; src = fetchurl { url = "https://erratique.ch/software/jsonm/releases/jsonm-${version}.tbz"; sha256 = "1176dcmxb11fnw49b7yysvkjh0kpzx4s48lmdn5psq9vshp5c29w"; }; - buildInputs = [ findlib topkg ]; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ uutf ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index da4318aef4c1..85c27f93a091 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { sha256 = "sha256:141kc816iv59z96738i3vn9m9iw9g2zhi45hk4cchpwd99ar5l6k"; }; - buildInputs = [ ocaml findlib freeglut ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ freeglut ]; propagatedBuildInputs = [ libGLU libGL ]; patches = [ ./Makefile.config.patch ./META.patch ]; diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix index f2fbc71b5a93..bcf82e1c3842 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "09fqxwdib7r9yxynknc9gv3jw2hnhj5cak7q5jngk6m8rzvmhfcc"; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib camlp4 ]; propagatedBuildInputs = [ config-file lablgtk xmlm ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index 373e5ded952a..736e345dfb35 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -7,7 +7,7 @@ else stdenv.mkDerivation rec { version = "1.6"; - name = "ocaml${ocaml.version}-lablgtk-extras-${version}"; + pname = "ocaml${ocaml.version}-lablgtk-extras"; src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1bbdp5j18s582mmyd7qiaq1p08g2ag4gl7x65pmzahbhg719hjda"; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib camlp4 ]; propagatedBuildInputs = [ config-file lablgtk xmlm ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index f64b6571970b..f37c3b5c6f9a 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation (rec { sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib gtk2 libgnomecanvas gtksourceview camlp4 ]; + nativeBuildInputs = [ pkg-config ocaml findlib camlp4 ]; + buildInputs = [ gtk2 libgnomecanvas gtksourceview ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; buildFlags = [ "world" ]; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index a442ae35aa52..36ade6979c3e 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { pname = "lablgtk"; inherit (param) version src; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib gtk2 libgnomecanvas gtksourceview ]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; + buildInputs = [ gtk2 libgnomecanvas gtksourceview ]; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; buildFlags = [ "world" ]; diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index bef06975ac55..56e79ffc5904 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -49,9 +49,10 @@ in stdenv.mkDerivation rec { inherit (param) version src; - name = "ocaml${ocaml.version}-labltk-${version}"; + pname = "ocaml${ocaml.version}-labltk"; - buildInputs = [ ocaml findlib tcl tk makeWrapper ]; + nativeBuildInputs = [ ocaml findlib makeWrapper ]; + buildInputs = [ tcl tk ]; configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ]; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 0d5babad0428..b7ed4f24b1d9 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -1,8 +1,18 @@ -{ lib, fetchFromGitHub, buildDunePackage, zed, lwt_log, lwt_react, mew_vi }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, zed, lwt_log, lwt_react, mew_vi }: + +let params = + if lib.versionAtLeast ocaml.version "4.08" then { + version = "3.2.0"; + sha256 = "sha256:048k26644wq5wlwk0j179dxrxyz9nxqqq4vvhyh6pqpgxdajd44i"; + } else { + version = "3.1.0"; + sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; + } +; in buildDunePackage rec { pname = "lambda-term"; - version = "3.1.0"; + inherit (params) version; useDune2 = true; @@ -10,7 +20,7 @@ buildDunePackage rec { owner = "ocaml-community"; repo = pname; rev = version; - sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; + inherit (params) sha256; }; propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ]; diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index 264d95f39f67..9ab3d906ab1e 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -8,10 +8,12 @@ stdenv.mkDerivation { inherit (libllvm) src; - nativeBuildInputs = [ cmake ]; - buildInputs = [ python2 ocaml findlib ctypes ]; + nativeBuildInputs = [ cmake python2 ocaml findlib ]; + buildInputs = [ ctypes ]; propagatedBuildInputs = [ libllvm ]; + strictDeps = true; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=YES" # fixes bytecode builds "-DLLVM_OCAML_OUT_OF_TREE=TRUE" diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index 157e7c52fee1..4359f09ebd32 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -21,11 +21,13 @@ stdenv.mkDerivation rec { sha256 = "1jnmd675wmsmdwyb5mx5b0ac66g4c6gpv5s4mrx2j6pb0wla1x46"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg fmt cmdliner lwt ] + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ fmt cmdliner lwt topkg ] ++ lib.optional jsooSupport js_of_ocaml; propagatedBuildInputs = [ result ]; + strictDeps = true; + buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}"; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix index 8a4f58ccbbd7..586fc395064f 100644 --- a/pkgs/development/ocaml-modules/lua-ml/default.nix +++ b/pkgs/development/ocaml-modules/lua-ml/default.nix @@ -16,8 +16,9 @@ stdenv.mkDerivation rec { sha256 = "04lv98nxmzanvyn4c0k6k0ax29f5xfdl8qzpf5hwadslq213a044"; }; - nativeBuildInputs = [ opaline ]; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ opaline ocaml findlib ocamlbuild ]; + + strictDeps = true; buildFlags = [ "lib" ]; diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix index fec487aeac20..4b11e8df9856 100644 --- a/pkgs/development/ocaml-modules/luv/default.nix +++ b/pkgs/development/ocaml-modules/luv/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { pname = "luv"; - version = "0.5.10"; + version = "0.5.11"; useDune2 = true; src = fetchurl { url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz"; - sha256 = "0zygir01d6vglfs4b3klnbg90glvyl9agq5xnzn8hmsb6d8z0jqp"; + sha256 = "sha256-zOz0cxGzhLi3Q36qyStNCz8JGXHtECQfZysMKiyKOkM="; }; postConfigure = '' diff --git a/pkgs/development/ocaml-modules/lwt-exit/default.nix b/pkgs/development/ocaml-modules/lwt-exit/default.nix index 34aadc8761fb..a2a6f14524f9 100644 --- a/pkgs/development/ocaml-modules/lwt-exit/default.nix +++ b/pkgs/development/ocaml-modules/lwt-exit/default.nix @@ -24,7 +24,8 @@ buildDunePackage rec { ptime ]; - doCheck = true; + # for some reason this never exits + doCheck = false; meta = { description = "An opinionated clean-exit and signal-handling library for Lwt programs"; diff --git a/pkgs/development/ocaml-modules/lwt-watcher/default.nix b/pkgs/development/ocaml-modules/lwt-watcher/default.nix index 23caa894736a..db94ce3d62d1 100644 --- a/pkgs/development/ocaml-modules/lwt-watcher/default.nix +++ b/pkgs/development/ocaml-modules/lwt-watcher/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { pname = "lwt-watcher"; - version = "0.1"; + version = "0.2"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = pname; rev = "v${version}"; - sha256 = "0kaf7py02i0dn9rvrbzxh4ljfg059wc8xvm093m9wy7lsa68rax9"; + sha256 = "sha256-35Z73bSzEEgTabNH2cD9lRdDczsyIMZR2ktyKx4aN9k="; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/lwt/camlp4.nix b/pkgs/development/ocaml-modules/lwt/camlp4.nix index 88bb3d6759a0..e48d7cfa185a 100644 --- a/pkgs/development/ocaml-modules/lwt/camlp4.nix +++ b/pkgs/development/ocaml-modules/lwt/camlp4.nix @@ -11,7 +11,9 @@ buildDunePackage rec { sha256 = "1lv8z6ljfy47yvxmwf5jrvc5d3dc90r1n291x53j161sf22ddrk9"; }; - minimumOCamlVersion = "4.02"; + useDune2 = false; + + minimalOCamlVersion = "4.02"; propagatedBuildInputs = [ camlp4 ]; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 76e973a813e4..96e3abc26746 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -19,9 +19,12 @@ buildDunePackage rec { sha256 = "sha256-XpoRKcdNo2j05Gxm5wmKSdwqimFDSWvmLyooPYTHAjM="; }; - nativeBuildInputs = [ pkg-config cppo dune-configurator ]; - buildInputs = optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims - ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; + strictDeps = true; + + nativeBuildInputs = [ pkg-config cppo ] + ++ optional (!versionAtLeast ocaml.version "4.08") ocaml-syntax-shims; + buildInputs = [ dune-configurator ] + ++ optional (!versionAtLeast ocaml.version "4.07") ncurses; propagatedBuildInputs = [ libev mmap ocplib-endian seq result ]; meta = { diff --git a/pkgs/development/ocaml-modules/lwt_react/default.nix b/pkgs/development/ocaml-modules/lwt_react/default.nix index 5513935133e8..f6f2bc0f4ef3 100644 --- a/pkgs/development/ocaml-modules/lwt_react/default.nix +++ b/pkgs/development/ocaml-modules/lwt_react/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, react }: +{ lib, buildDunePackage, fetchFromGitHub, cppo, lwt, react }: -stdenv.mkDerivation rec { - version = "1.0.1"; - name = "ocaml${ocaml.version}-lwt_react-${version}"; - src = fetchzip { - url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz"; - sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31"; +buildDunePackage { + pname = "lwt_react"; + version = "1.1.5"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "lwt"; + rev = "5.5.0"; + sha256 = "sha256:1jbjz2rsz3j56k8vh5qlmm87hhkr250bs2m3dvpy9vsri8rkzj9z"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ lwt react ]; - createFindlibDestdir = true; - meta = { description = "Helpers for using React with Lwt"; inherit (lwt.meta) homepage license maintainers; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/macaddr/cstruct.nix b/pkgs/development/ocaml-modules/macaddr/cstruct.nix index 143230408920..db543c0574e1 100644 --- a/pkgs/development/ocaml-modules/macaddr/cstruct.nix +++ b/pkgs/development/ocaml-modules/macaddr/cstruct.nix @@ -5,9 +5,7 @@ buildDunePackage { pname = "macaddr-cstruct"; - inherit (macaddr) version src minimumOCamlVersion; - - useDune2 = true; + inherit (macaddr) version src; propagatedBuildInputs = [ macaddr cstruct ]; diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index f81529ed3a2b..7eb74ff064d0 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -4,15 +4,13 @@ buildDunePackage rec { pname = "macaddr"; - version = "5.2.0"; + version = "5.3.0"; - useDune2 = true; - - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.04"; src = fetchurl { - url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-v${version}.tbz"; - sha256 = "f98d237cc1f783a0ba7dff0c6c69b5f519fec056950e3e3e7c15e5511ee5b7ec"; + url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz"; + sha256 = "0mdp38mkvk2f5h2q7nb9fc70a8hyssblnl7kam0d8r5lckgrx5rn"; }; checkInputs = [ ppx_sexp_conv ounit ]; diff --git a/pkgs/development/ocaml-modules/macaddr/sexp.nix b/pkgs/development/ocaml-modules/macaddr/sexp.nix index 35cc7c6b4401..1f03c1326a53 100644 --- a/pkgs/development/ocaml-modules/macaddr/sexp.nix +++ b/pkgs/development/ocaml-modules/macaddr/sexp.nix @@ -5,9 +5,7 @@ buildDunePackage { pname = "macaddr-sexp"; - inherit (macaddr) version src minimumOCamlVersion; - - useDune2 = true; + inherit (macaddr) version src; propagatedBuildInputs = [ ppx_sexp_conv ]; diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix index a91e898227d6..d47c0c4f11c5 100644 --- a/pkgs/development/ocaml-modules/macaque/default.nix +++ b/pkgs/development/ocaml-modules/macaque/default.nix @@ -11,8 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-W9ZFaINYYtIikKy/ZqdlKeFQSA7DQT9plc3+ZhlSIJI="; }; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; - propagatedBuildInputs = [ pgocaml ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ]; + propagatedBuildInputs = [ pgocaml camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index 15628bcf26c1..a48260ed38d6 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "magic-mime"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${version}/magic-mime-v${version}.tbz"; - sha256 = "1xqjs8bba567yzrzgnr88j5ck97d36zw68zr9v29liya37k6rcvz"; + sha256 = "sha256-8SG2dQD43Zfi/J/V0BxzJeTIS8XAI3RCd5+9b6IGlPU="; }; minimalOCamlVersion = "4.03"; diff --git a/pkgs/development/ocaml-modules/magick/default.nix b/pkgs/development/ocaml-modules/magick/default.nix deleted file mode 100644 index f9fec120a625..000000000000 --- a/pkgs/development/ocaml-modules/magick/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, lib, fetchurl, which, pkg-config, ocaml, findlib, imagemagick }: - -if lib.versionAtLeast ocaml.version "4.06" -then throw "magick is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - pname = "ocaml-magick"; - version = "0.34"; - - src = fetchurl { - url = "http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/OCaml-ImageMagick-${version}.tgz"; - sha256 = "0gn9l2qdr8gby2x8c2mb59x1kipb2plr45rbq6ymcxyi0wmzfh3q"; - }; - - nativeBuildInputs = [ which pkg-config ]; - buildInputs = [ ocaml findlib imagemagick ]; - - createFindlibDestdir = true; - - preConfigure = "substituteInPlace Makefile --replace gcc $CC"; - - installTargets = [ "find_install" ]; - - meta = { - homepage = "http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"; - description = "ImageMagick Binding for OCaml"; - license = lib.licenses.mit; - platforms = imagemagick.meta.platforms; - maintainers = with lib.maintainers; [ vbgl ]; - }; -} diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix index 8d35ae641a6a..65e1459d9e3a 100644 --- a/pkgs/development/ocaml-modules/markup/default.nix +++ b/pkgs/development/ocaml-modules/markup/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "markup"; - version = "1.0.0"; + version = "1.0.2"; useDune2 = true; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "aantron"; repo = "markup.ml"; rev = version; - sha256 = "sha256-yapjqAcn0XSC6Guoj69sXNpLZ2urXANkWhcafpPLEyY="; + sha256 = "sha256-FcN9EBap93gFeOwSrRxs2sQrjZGs8/YnaEX7zHLmeM8="; }; propagatedBuildInputs = [ uchar uutf ]; diff --git a/pkgs/development/ocaml-modules/mccs/default.nix b/pkgs/development/ocaml-modules/mccs/default.nix index beadceff02b0..50abdf631db8 100644 --- a/pkgs/development/ocaml-modules/mccs/default.nix +++ b/pkgs/development/ocaml-modules/mccs/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { useDune2 = true; - buildInputs = [ + propagatedBuildInputs = [ cudf ]; diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index e5132d64d4d5..09f505c0e254 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -5,12 +5,14 @@ buildDunePackage rec { pname = "mdx"; - version = "1.11.1"; + version = "2.1.0"; useDune2 = true; + minimalOCamlVersion = "4.08"; + src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - sha256 = "sha256:1q6169gmynnbrvlnzlmx7lpd6hwv6vwxg5j8ibc88wgs5s0r0fb0"; + sha256 = "sha256-ol1zy8LODDYdcnv/jByE0pnqJ5ujQuMALq3v9y7td/o="; }; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/merlin-extend/default.nix b/pkgs/development/ocaml-modules/merlin-extend/default.nix index 6d4fcad09775..9cb35f34c1c2 100644 --- a/pkgs/development/ocaml-modules/merlin-extend/default.nix +++ b/pkgs/development/ocaml-modules/merlin-extend/default.nix @@ -11,7 +11,9 @@ buildDunePackage rec { sha256 = "0hvc4mz92x3rl2dxwrhvhzwl4gilnyvvwcqgr45vmdpyjyp3dwn2"; }; - buildInputs = [ cppo ]; + strictDeps = true; + + nativeBuildInputs = [ cppo ]; meta = with lib; { homepage = "https://github.com/let-def/merlin-extend"; diff --git a/pkgs/development/ocaml-modules/mimic/default.nix b/pkgs/development/ocaml-modules/mimic/default.nix index ea1636427038..348a1b39cdd4 100644 --- a/pkgs/development/ocaml-modules/mimic/default.nix +++ b/pkgs/development/ocaml-modules/mimic/default.nix @@ -1,26 +1,23 @@ { lib, buildDunePackage, fetchurl -, fmt, mirage-flow, result, rresult, cstruct, logs, ke, lwt -, alcotest, alcotest-lwt, bigstringaf, bigarray-compat +, fmt, mirage-flow, cstruct, logs, ke, lwt +, alcotest, alcotest-lwt, bigstringaf }: buildDunePackage rec { pname = "mimic"; - version = "0.0.3"; + version = "0.0.4"; - minimumOCamlVersion = "4.08"; - useDune2 = true; + minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz"; - sha256 = "e4743cd2e4f8242eb1ce9d8086fd2affba0eb6a62131309ffa279108bd3dbbcb"; + sha256 = "sha256-1Wb2xufgGKp3FJ+FYjK45i9B5+HohdPX+w9Sw0ph5JY="; }; propagatedBuildInputs = [ fmt lwt mirage-flow - result - rresult logs ]; @@ -29,7 +26,6 @@ buildDunePackage rec { alcotest alcotest-lwt bigstringaf - bigarray-compat cstruct ke ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 102d3d2de07e..c942972597ad 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -19,13 +19,16 @@ buildDunePackage rec { doCheck = true; checkInputs = [ ounit ]; - nativeBuildInputs = [ dune-configurator pkg-config ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ cstruct eqaf ] ++ lib.optionals withFreestanding [ ocaml-freestanding ]; + strictDeps = !doCheck; + meta = with lib; { homepage = "https://github.com/mirage/mirage-crypto"; description = "Simple symmetric cryptography for the modern age"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix index bcd7a1f04f25..5506243ec3a4 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -1,4 +1,5 @@ { lib +, ocaml , buildDunePackage , mirage-crypto , dune-configurator @@ -16,18 +17,18 @@ , ocaml-freestanding }: -buildDunePackage { +buildDunePackage rec { pname = "mirage-crypto-ec"; inherit (mirage-crypto) minimumOCamlVersion src version - useDune2 - ; + useDune2; - nativeBuildInputs = [ - pkg-config + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + ocaml dune-configurator ]; propagatedBuildInputs = [ @@ -38,6 +39,8 @@ buildDunePackage { ocaml-freestanding ]; + strictDeps = !doCheck; + doCheck = true; checkInputs = [ hex diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index 82400b5da7c2..9a2b9c98e458 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -1,7 +1,7 @@ { buildDunePackage, ounit, randomconv, mirage-crypto, mirage-crypto-rng , cstruct, sexplib0, zarith, eqaf, gmp }: -buildDunePackage { +buildDunePackage rec { pname = "mirage-crypto-pk"; inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; @@ -10,6 +10,8 @@ buildDunePackage { propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng zarith eqaf sexplib0 ]; + strictDeps = !doCheck; + doCheck = true; checkInputs = [ ounit randomconv ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix index e8c8dd06eab5..91da7aa56816 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix @@ -8,7 +8,7 @@ buildDunePackage { inherit (mirage-crypto) useDune2 version minimumOCamlVersion src; - nativeBuildInputs = [ + buildInputs = [ dune-configurator ]; @@ -19,6 +19,8 @@ buildDunePackage { mirage-crypto-rng ]; + strictDeps = true; + meta = mirage-crypto.meta // { description = "Feed the entropy source in an Async-friendly way"; }; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index 5152d3c8ecde..8d67ade9b465 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -3,7 +3,7 @@ , logs, lwt }: -buildDunePackage { +buildDunePackage rec { pname = "mirage-crypto-rng-mirage"; inherit (mirage-crypto-rng) version src useDune2 minimumOCamlVersion; @@ -14,6 +14,8 @@ buildDunePackage { propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime mirage-time mirage-clock logs lwt ]; + strictDeps = !doCheck; + meta = mirage-crypto-rng.meta // { description = "Entropy collection for a cryptographically secure PRNG"; }; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index b4da06816351..2281f10580cd 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -1,7 +1,7 @@ { buildDunePackage, mirage-crypto, ounit, randomconv, dune-configurator , cstruct, duration, logs, mtime, ocaml_lwt }: -buildDunePackage { +buildDunePackage rec { pname = "mirage-crypto-rng"; inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; @@ -9,9 +9,11 @@ buildDunePackage { doCheck = true; checkInputs = [ ounit randomconv ]; - nativeBuildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ]; + strictDeps = !doCheck; + meta = mirage-crypto.meta // { description = "A cryptographically secure PRNG"; }; diff --git a/pkgs/development/ocaml-modules/mirage-flow/default.nix b/pkgs/development/ocaml-modules/mirage-flow/default.nix index d6ba6603596a..bc987eff9884 100644 --- a/pkgs/development/ocaml-modules/mirage-flow/default.nix +++ b/pkgs/development/ocaml-modules/mirage-flow/default.nix @@ -2,14 +2,14 @@ buildDunePackage rec { pname = "mirage-flow"; - version = "2.0.1"; + version = "3.0.0"; useDune2 = true; minimumOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/mirage/mirage-flow/releases/download/v${version}/mirage-flow-v${version}.tbz"; - sha256 = "13v05x34six0z6bc2is8qhvbxk4knxh80ardi5x4rl738vlq3mn9"; + sha256 = "sha256-1wvabIXsJ0e+2IvE2V8mnSgQUDuSkT8IB75SkWlhOPw="; }; propagatedBuildInputs = [ cstruct fmt ocaml_lwt ]; diff --git a/pkgs/development/ocaml-modules/mirage-fs/default.nix b/pkgs/development/ocaml-modules/mirage-fs/default.nix index d8cfddff313c..23c79c4a77d6 100644 --- a/pkgs/development/ocaml-modules/mirage-fs/default.nix +++ b/pkgs/development/ocaml-modules/mirage-fs/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "mirage-fs"; - version = "3.0.1"; + version = "4.0.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/mirage-fs/releases/download/v${version}/mirage-fs-v${version}.tbz"; - sha256 = "0px18bgk528vr7iw78r0j3z4sdcz684sfcj47ibbly2adbvd64yk"; + sha256 = "sha256-PYZ2HCPuxOv4FU7EHymsa1oIZU7q8TSzzRvlngYdZ3s="; }; propagatedBuildInputs = [ cstruct fmt lwt mirage-device mirage-kv ]; diff --git a/pkgs/development/ocaml-modules/mirage-logs/default.nix b/pkgs/development/ocaml-modules/mirage-logs/default.nix index 2a7670ce3722..7aabd51b819a 100644 --- a/pkgs/development/ocaml-modules/mirage-logs/default.nix +++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, buildDunePackage , logs, lwt, mirage-clock, mirage-profile, ptime -, alcotest +, alcotest, stdlib-shims }: buildDunePackage rec { @@ -14,7 +14,7 @@ buildDunePackage rec { sha256 = "0h0amzjxy067jljscib7fvw5q8k0adqa8m86affha9hq5jsh07a1"; }; - propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime ]; + propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime stdlib-shims ]; doCheck = true; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/mirage-profile/default.nix b/pkgs/development/ocaml-modules/mirage-profile/default.nix index c6ca730bf3c5..ef856e021273 100644 --- a/pkgs/development/ocaml-modules/mirage-profile/default.nix +++ b/pkgs/development/ocaml-modules/mirage-profile/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildDunePackage -, ppx_cstruct +, ppx_cstruct, stdlib-shims , cstruct, lwt }: @@ -15,7 +15,7 @@ buildDunePackage rec { }; buildInputs = [ ppx_cstruct ]; - propagatedBuildInputs = [ cstruct lwt ]; + propagatedBuildInputs = [ cstruct lwt stdlib-shims ]; meta = with lib; { description = "Collect runtime profiling information in CTF format"; diff --git a/pkgs/development/ocaml-modules/mirage-time/default.nix b/pkgs/development/ocaml-modules/mirage-time/default.nix index 2e91bda61d6b..1780ba05ac47 100644 --- a/pkgs/development/ocaml-modules/mirage-time/default.nix +++ b/pkgs/development/ocaml-modules/mirage-time/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { minimumOCamlVersion = "4.06"; pname = "mirage-time"; - version = "2.0.1"; + version = "3.0.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/mirage-time/releases/download/v${version}/mirage-time-v${version}.tbz"; - sha256 = "1w6mm4g7fc19cs0ncs0s9fsnb1k1s04qqzs9bsqvq8ngsb90cbh0"; + sha256 = "sha256-DUCUm1jix+i3YszIzgZjRQRiM8jJXQ49F6JC/yicvXw="; }; propagatedBuildInputs = [ ocaml_lwt ]; diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/pkgs/development/ocaml-modules/mlgmp/default.nix index ffd78150689a..a396549d76f4 100644 --- a/pkgs/development/ocaml-modules/mlgmp/default.nix +++ b/pkgs/development/ocaml-modules/mlgmp/default.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { ]; preConfigure = "make clean"; - buildInputs = [ocaml findlib gmp mpfr ncurses]; + nativeBuildInputs = [ocaml findlib ]; + buildInputs = [ gmp mpfr ncurses]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix index a0026e3a8ca8..33f9f2d8e6b0 100644 --- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-mlgmpidl-${version}"; + pname = "ocaml${ocaml.version}-mlgmpidl"; version = "1.2.12"; src = fetchFromGitHub { owner = "nberth"; @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "17xqiclaqs4hmnb92p9z6z9a1xfr31vcn8nlnj8ykk57by31vfza"; }; - buildInputs = [ perl gmp mpfr ocaml findlib camlidl ]; + nativeBuildInputs = [ perl ocaml findlib camlidl ]; + buildInputs = [ gmp mpfr ]; + + strictDeps = true; prefixKey = "-prefix "; configureFlags = [ @@ -19,8 +22,7 @@ stdenv.mkDerivation rec { ]; postConfigure = '' - sed -i Makefile \ - -e 's|^ /bin/rm | rm |' + substituteInPlace Makefile --replace "/bin/rm" "rm" mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs ''; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 9fa302947e92..ace29633964b 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -16,16 +16,18 @@ let param = in stdenv.mkDerivation { - name = "ocaml${ocaml.version}-mtime-${param.version}"; + pname = "ocaml${ocaml.version}-mtime"; + inherit (param) version; src = fetchurl { url = "https://erratique.ch/software/mtime/releases/mtime-${param.version}.tbz"; inherit (param) sha256; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg ] - ++ optional jsooSupport js_of_ocaml; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ] ++ optional jsooSupport js_of_ocaml; + + strictDeps = true; buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}"; diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 6ccdfa9cf81c..c980984a26c8 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -22,12 +22,14 @@ stdenv.mkDerivation rec { "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql" ]; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; createFindlibDestdir = true; propagatedBuildInputs = [ libmysqlclient ]; + strictDeps = true; + patches = [ (fetchpatch { url = "https://github.com/ygrek/ocaml-mysql/compare/v1.2.1...d6d1b3b262ae2cf493ef56f1dd7afcf663a70a26.patch"; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index 055e6db3a645..d179c8c1c901 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -20,7 +20,7 @@ then throw "nocrypto is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-nocrypto-${version}"; + pname = "ocaml${ocaml.version}-nocrypto"; version = "0.5.4"; src = fetchurl { @@ -56,9 +56,11 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ ocaml findlib ocamlbuild cc-wrapper ]; - buildInputs = [ ocamlbuild findlib topkg cpuid ocb-stubblr ]; + buildInputs = [ topkg cpuid ocb-stubblr ocamlbuild ]; propagatedBuildInputs = [ cstruct ppx_deriving ppx_sexp_conv sexplib zarith ] ++ optional withLwt cstruct-lwt; + strictDeps = true; + buildPhase = "${topkg.buildPhase} --accelerate false --with-lwt ${boolToString withLwt}"; inherit (topkg) installPhase; diff --git a/pkgs/development/ocaml-modules/nonstd/default.nix b/pkgs/development/ocaml-modules/nonstd/default.nix index 9de535154eeb..696cdff52196 100644 --- a/pkgs/development/ocaml-modules/nonstd/default.nix +++ b/pkgs/development/ocaml-modules/nonstd/default.nix @@ -1,16 +1,18 @@ -{ lib, fetchzip, buildDunePackage }: +{ lib, fetchzip, buildDunePackage, ocaml }: buildDunePackage rec { pname = "nonstd"; version = "0.0.3"; - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.02"; src = fetchzip { url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz"; sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46"; }; + useDune2 = lib.versionAtLeast ocaml.version "4.12"; + postPatch = lib.optionalString useDune2 "dune upgrade"; doCheck = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index 8e1c5f38cb5d..1598b2ee5cd3 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -12,17 +12,20 @@ let withLwt = lwt != null; in stdenv.mkDerivation rec { version = "0.2.2"; - name = "ocaml${ocaml.version}-notty-${version}"; + pname = "ocaml${ocaml.version}-notty"; src = fetchurl { url = "https://github.com/pqwy/notty/releases/download/v${version}/notty-${version}.tbz"; sha256 = "1y3hx8zjri3x50nyiqal5gak1sw54gw3xssrqbj7srinvkdmrz1q"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ocb-stubblr ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocb-stubblr topkg ocamlbuild ]; propagatedBuildInputs = [ result uucp uuseg uutf ] ++ optional withLwt lwt; + strictDeps = true; + buildPhase = topkg.buildPhase + " --with-lwt ${boolToString withLwt}"; diff --git a/pkgs/development/ocaml-modules/num/default.nix b/pkgs/development/ocaml-modules/num/default.nix index e2c7b439c69e..1f978a90df45 100644 --- a/pkgs/development/ocaml-modules/num/default.nix +++ b/pkgs/development/ocaml-modules/num/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1"; - name = "ocaml${ocaml.version}-num-${version}"; + pname = "ocaml${ocaml.version}-num"; src = fetchFromGitHub { owner = "ocaml"; repo = "num"; @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { ] ++ lib.optional withStatic ./enable-static.patch; nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; - meta = { description = "Legacy Num library for arbitrary-precision integer and rational arithmetic"; license = lib.licenses.lgpl21; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index 7d2960fc5a66..6748619d4928 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -19,9 +19,8 @@ stdenv.mkDerivation rec { patches = [ ./META.patch ]; - nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ ocaml automake gnum4 autoconf - findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ]; + nativeBuildInputs = [ pkg-config unzip ocaml automake gnum4 autoconf findlib ]; + buildInputs = [ freetype lablgtk cairo gdk-pixbuf gtk2 pango ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 63056481199f..f2336cf88bbb 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }: +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02") + "libvirt is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { pname = "ocaml-libvirt"; version = "0.6.1.5"; @@ -13,15 +16,16 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libvirt ]; - nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ]; + nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ocaml ]; - buildInputs = [ ocaml ]; + strictDeps = true; - createFindlibDestdir = true; - - buildPhase = "make all opt CPPFLAGS=-Wno-error"; - - installPhase = "make install-opt"; + buildFlags = [ "all" "opt" "CPPFLAGS=-Wno-error" ]; + installTargets = "install-opt"; + preInstall = '' + # Fix 'dllmllibvirt.so' install failure into non-existent directory. + mkdir -p $OCAMLFIND_DESTDIR/stublibs + ''; meta = with lib; { description = "OCaml bindings for libvirt"; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index 26deb2f05970..4f192fe20ecb 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -12,8 +12,8 @@ let params = if lib.versionAtLeast ocaml.version "4.13" then { - version = "1.9.1"; - sha256 = "sha256:1vnwdpjppihprc8q2i5zcqq7vp67255jclg90ldfvwafgljxn76g"; + version = "1.10.3"; + sha256 = "sha256-o6wQc7Byi5T0vbARF3LAq69/9wMkOZRQ6rcVa/rBUfE="; } else if lib.versionAtLeast ocaml.version "4.12" then { version = "1.9.0"; diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix index 5d8d967bf4fd..009d95992fb7 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix @@ -1,5 +1,9 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml, result, ppx_derivers }: +if lib.versionOlder "4.13" ocaml.version +then throw "ocaml-migrate-parsetree-1.8 is not available for OCaml ${ocaml.version}" +else + buildDunePackage rec { pname = "ocaml-migrate-parsetree"; version = "1.8.0"; diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix index d76a98fc05c9..fcee63de3b5d 100644 --- a/pkgs/development/ocaml-modules/ocaml-r/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -27,7 +27,11 @@ buildDunePackage rec { ' libRmath"' '"' ''; - buildInputs = [ pkg-config R dune-configurator stdio ]; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ pkg-config R ]; + buildInputs = [ dune-configurator stdio R ]; doCheck = true; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index c2ca6a2cc8aa..13ac62f64514 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,16 +1,21 @@ -{ lib, buildDunePackage, fetchFromGitHub, camlidl, fuse }: +{ lib, buildDunePackage, fetchFromGitHub, camlidl, fuse, dune-configurator }: -buildDunePackage { +buildDunePackage rec { pname = "ocamlfuse"; - version = "2.7.1_cvs6_e35e76b"; + version = "2.7.1_cvs7"; src = fetchFromGitHub { owner = "astrada"; repo = "ocamlfuse"; - rev = "e35e76bee3b06806256b5bfca108b7697267cd5c"; - sha256 = "1v9g0wh7rnjkrjrnw50145g6ry38plyjs8fq8w0nlzwizhf3qhff"; + rev = "v${version}"; + sha256 = "6nmPXZx38hBGlg+gV9nnlRpPfeSAqDj4zBPcjUNvTRo="; }; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ camlidl ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ camlidl fuse ]; meta = { diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index f8d20b7124bc..66bd00707add 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { sha256 = "0dyvy0j6f47laxhnadvm71z1py9hz9zd49hamf6bij99cggb2ij1"; }; - buildInputs = [ocaml findlib ounit]; + nativeBuildInputs = [ocaml findlib ]; + buildInputs = [ ounit]; + + strictDeps = true; prefixKey = "--prefix "; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 5c3ca95bb0d8..d435d7a04842 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -7,7 +7,7 @@ then throw "ocamlnet is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ocamlnet-${version}"; + pname = "ocaml${ocaml.version}-ocamlnet"; version = "4.1.9"; src = fetchurl { @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { sha256 = "1vlwxjxr946gdl61a1d7yk859cijq45f60dhn54ik3w4g6cx33pr"; }; - nativeBuildInputs = [ pkg-config which ]; - buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ]; + nativeBuildInputs = [ pkg-config which ocaml findlib ]; + buildInputs = [ ncurses ocaml_pcre camlzip gnutls nettle ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 7c782b5268fd..3482aa37e750 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ocaml findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl]; + 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; diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix index 2f26eb32ffb6..fcd63ced7a80 100644 --- a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix +++ b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix @@ -12,10 +12,13 @@ stdenv.mkDerivation rec { patches = [ ./pkg-config.patch ]; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ocamlbuild ]; propagatedBuildInputs = [ astring ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index be217812834f..763617be1328 100644 --- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -5,7 +5,7 @@ then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ocp-ocamlres-${version}"; + pname = "ocaml${ocaml.version}-ocp-ocamlres"; version = "0.4"; src = fetchFromGitHub { owner = "OCamlPro"; @@ -14,7 +14,11 @@ stdenv.mkDerivation rec { sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn"; }; - buildInputs = [ ocaml findlib astring pprint ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ astring pprint ]; + + strictDeps = true; + createFindlibDestdir = true; installFlags = [ "BINDIR=$(out)/bin" ]; diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index c0bccbd65a65..1e657fce8dd1 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -1,17 +1,17 @@ { lib, buildDunePackage, fetchFromGitHub, cppo }: buildDunePackage rec { - version = "1.1"; + version = "1.2"; pname = "ocplib-endian"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocplib-endian"; rev = version; - sha256 = "sha256-zKsSkhlZBXSqPtw+/WN3pwo9plM9rDZfMbGVfosqb10="; + sha256 = "sha256-THTlhOfXAPaqTt1qBkht+D67bw6M175QLvXoUMgjks4="; }; - useDune2 = true; + minimalOCamlVersion = "4.03"; nativeBuildInputs = [ cppo ]; diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 8435d1c5e516..474f69546d1a 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation { sha256 = "09niyidrjzrj8g1qwx4wgsdf5m6cwrnzg7zsgala36jliic4di60"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ autoreconfHook ocaml findlib ]; + + strictDeps = true; installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index d2e20838ecaf..480ea6daf203 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - buildInputs = [ ocaml findlib ocamlbuild oasis camlp4 num ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild oasis camlp4 ]; + buildInputs = [ oasis camlp4 ocamlbuild num ]; + + strictDeps = true; meta = { homepage = "https://github.com/ocsigen/deriving"; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 96a66874c759..67ec458a122d 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -37,7 +37,7 @@ buildDunePackage rec { ocaml_pcre xml-light ]; - configureFlags = [ "--root $(out)" "--prefix /" ]; + configureFlags = [ "--root $(out)" "--prefix /" "--temproot ''" ]; dontAddPrefix = true; dontAddStaticConfigureFlags = true; @@ -47,6 +47,10 @@ buildDunePackage rec { make -C src confs ''; + postInstall = '' + make install.files + ''; + postFixup = '' rm -rf $out/var/run diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 1fccbbb9b30c..118138dc8fd0 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson -, cohttp-lwt-unix +, cohttp-lwt-unix, eliom , resource-pooling , ocamlnet }: @@ -8,9 +8,11 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ocsigen-start"; version = "4.3.0"; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib eliom ]; propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ocamlnet ]; + strictDeps = true; + patches = [ ./templates-dir.patch ]; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 78420d09779b..1b2dd72a2ec3 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { version = "3.0.1"; propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ]; - buildInputs = [ ocaml findlib opaline ]; + nativeBuildInputs = [ ocaml findlib opaline eliom ]; + + strictDeps = true; installPhase = '' runHook preInstall diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index ea2af8dd4c82..5e815d4dca6b 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -13,8 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6"; }; - buildInputs = [ pkg-config ocaml findlib ncurses ]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; + buildInputs = [ ncurses ]; propagatedBuildInputs = [ curl lwt ]; + + strictDeps = true; + createFindlibDestdir = true; meta = { description = "OCaml bindings to libcurl"; diff --git a/pkgs/development/ocaml-modules/odate/default.nix b/pkgs/development/ocaml-modules/odate/default.nix index aed5e92765f8..8967a3815471 100644 --- a/pkgs/development/ocaml-modules/odate/default.nix +++ b/pkgs/development/ocaml-modules/odate/default.nix @@ -17,7 +17,9 @@ buildDunePackage rec { sha256 = "1dk33lr0g2jnia2gqsm6nnc7nf256qgkm3v30w477gm6y2ppfm3h"; }; - buildInputs = [ menhir ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; meta = { description = "Date and duration in OCaml"; diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix deleted file mode 100644 index 9179ce3f1d16..000000000000 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, ounit, camlp4 }: - -if lib.versionAtLeast ocaml.version "4.06" -then throw "ocaml-data-notation is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - pname = "ocaml-data-notation"; - version = "0.0.11"; - - src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1310/ocaml-data-notation-${version}.tar.gz"; - sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; - }; - - buildInputs = [ ocaml findlib ocamlbuild type_conv ounit camlp4 ]; - - createFindlibDestdir = true; - - configurePhase = "ocaml setup.ml -configure"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; - - meta = with lib; { - description = "Store data using OCaml notation"; - homepage = "https://forge.ocamlcore.org/projects/odn/"; - license = licenses.lgpl21; - platforms = ocaml.meta.platforms or [ ]; - maintainers = with maintainers; [ - vbgl - maggesi - ]; - }; -} diff --git a/pkgs/development/ocaml-modules/odoc-parser/default.nix b/pkgs/development/ocaml-modules/odoc-parser/default.nix index 7a2b5abd974b..9e4e4bc8d1de 100644 --- a/pkgs/development/ocaml-modules/odoc-parser/default.nix +++ b/pkgs/development/ocaml-modules/odoc-parser/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { useDune2 = true; - buildInputs = [ astring result ]; + propagatedBuildInputs = [ astring result ]; meta = { description = "Parser for Ocaml documentation comments"; diff --git a/pkgs/development/ocaml-modules/ogg/default.nix b/pkgs/development/ocaml-modules/ogg/default.nix new file mode 100644 index 000000000000..e1e1df6c2a00 --- /dev/null +++ b/pkgs/development/ocaml-modules/ogg/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libogg }: + +buildDunePackage rec { + pname = "ogg"; + version = "0.7.1"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-ogg"; + rev = "v${version}"; + sha256 = "0z3z0816rxq8wdjw51plzn8lmilic621ilk4x9wpnr0axmnl3wqb"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ libogg ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-ogg"; + description = "Bindings to libogg"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix index d6cea183d85c..b9797e257abc 100644 --- a/pkgs/development/ocaml-modules/omd/default.nix +++ b/pkgs/development/ocaml-modules/omd/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1sgdgzpx96br7npj8mh91cli5mqmzsjpngwm7x4212n3k1d0ivwa"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/opam-repository/default.nix b/pkgs/development/ocaml-modules/opam-repository/default.nix index 1480a7d5915a..ff9ad75fad86 100644 --- a/pkgs/development/ocaml-modules/opam-repository/default.nix +++ b/pkgs/development/ocaml-modules/opam-repository/default.nix @@ -15,8 +15,9 @@ buildDunePackage rec { --replace "SUBSTITUTE_NIXOS_CURL_PATH" "\"${curl}/bin/curl\"" ''; - nativeBuildInputs = [ unzip ]; - buildInputs = [ curl ]; + strictDeps = true; + + nativeBuildInputs = [ unzip curl ]; propagatedBuildInputs = [ opam-format ]; meta = opam-format.meta // { diff --git a/pkgs/development/ocaml-modules/opium_kernel/default.nix b/pkgs/development/ocaml-modules/opium_kernel/default.nix index c7bfe1e7306a..6b51443df232 100644 --- a/pkgs/development/ocaml-modules/opium_kernel/default.nix +++ b/pkgs/development/ocaml-modules/opium_kernel/default.nix @@ -9,6 +9,7 @@ , ezjsonm , hmap , sexplib +, fieldslib }: buildDunePackage rec { @@ -31,7 +32,7 @@ buildDunePackage rec { ]; propagatedBuildInputs = [ - hmap cohttp-lwt ezjsonm sexplib + hmap cohttp-lwt ezjsonm sexplib fieldslib ]; meta = { diff --git a/pkgs/development/ocaml-modules/opus/default.nix b/pkgs/development/ocaml-modules/opus/default.nix new file mode 100644 index 000000000000..30e461b9f9a0 --- /dev/null +++ b/pkgs/development/ocaml-modules/opus/default.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, ogg, libopus }: + +buildDunePackage rec { + pname = "opus"; + version = "0.2.1"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-opus"; + rev = "v${version}"; + sha256 = "09mgnprhhs1adqm25c0qjhknswbh6va3jknq06fnp1jszszcjf4s"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg libopus.dev ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-opus"; + description = "Bindings to libopus"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ordering/default.nix b/pkgs/development/ocaml-modules/ordering/default.nix new file mode 100644 index 000000000000..c3bffc013f95 --- /dev/null +++ b/pkgs/development/ocaml-modules/ordering/default.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, dune_3 }: + +buildDunePackage { + pname = "ordering"; + inherit (dune_3) version src; + duneVersion = "3"; + + dontAddPrefix = true; + + meta = dune_3.meta // { + description = "Element ordering"; + }; +} diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 0642b30699c2..91d91bdc46fe 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -17,10 +17,13 @@ stdenv.mkDerivation { sha256 = "054s82539k3kc9na6s47g3scsl04icjahpas7pv5351jmsgqcq3k"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ uutf result ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/otoml/default.nix b/pkgs/development/ocaml-modules/otoml/default.nix index 17e8fc855ea0..c3f53fc611e5 100644 --- a/pkgs/development/ocaml-modules/otoml/default.nix +++ b/pkgs/development/ocaml-modules/otoml/default.nix @@ -19,7 +19,9 @@ buildDunePackage rec { sha256 = "0l0c60rzgk11y8xq05kr8q9hkzb3c8vi995mq84x98ys73wb42j3"; }; - buildInputs = [ menhir ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib uutf ]; diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index fbb75e613309..a40111cd3b37 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -4,9 +4,11 @@ stdenv.mkDerivation { pname = "ocaml${ocaml.version}-ounit"; inherit (ounit2) version src meta; - buildInputs = [ findlib ]; + nativeBuildInputs = [ findlib ]; propagatedBuildInputs = [ ounit2 ]; + strictDeps = true; + dontBuild = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/owee/default.nix b/pkgs/development/ocaml-modules/owee/default.nix index 9eb81003d47a..7b15437a7ed2 100644 --- a/pkgs/development/ocaml-modules/owee/default.nix +++ b/pkgs/development/ocaml-modules/owee/default.nix @@ -1,20 +1,19 @@ -{ lib, buildDunePackage, fetchFromGitHub }: +{ lib, buildDunePackage, fetchurl }: buildDunePackage rec { - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.06"; + useDune2 = true; pname = "owee"; - version = "0.3"; + version = "0.4"; - src = fetchFromGitHub { - owner = "let-def"; - repo = "owee"; - rev = "v${version}"; - sha256 = "0jp8ca57488d7sj2nqy4yxcdpda6sxx51yyi8k6888hbinhyqp0j"; + src = fetchurl { + url = "https://github.com/let-def/owee/releases/download/v${version}/owee-${version}.tbz"; + sha256 = "sha256:055bi0yfdki1pqagbhrwmfvigyawjgsmqw04zhpp6hds8513qzvb"; }; meta = { description = "An experimental OCaml library to work with DWARF format"; - inherit (src.meta) homepage; + homepage = "https://github.com/let-def/owee/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix index b767b1db24c8..189359cd1c86 100644 --- a/pkgs/development/ocaml-modules/owl-base/default.nix +++ b/pkgs/development/ocaml-modules/owl-base/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "owl-base"; - version = "1.0.1"; + version = "1.0.2"; useDune2 = true; src = fetchurl { url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz"; - sha256 = "72ca9f6edd302fdfa16c7559cedac7ac2c885466a367e17ea1ea8807b2dd13ef"; + sha256 = "sha256-ONIQzmwcLwljH9WZUUMOTzZLWuA2xx7RsyzlWbKikmM="; }; minimumOCamlVersion = "4.10"; diff --git a/pkgs/development/ocaml-modules/parmap/default.nix b/pkgs/development/ocaml-modules/parmap/default.nix index d79999087dd8..521c1c406714 100644 --- a/pkgs/development/ocaml-modules/parmap/default.nix +++ b/pkgs/development/ocaml-modules/parmap/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "parmap"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { url = "https://github.com/rdicosmo/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "1wg81slp453jci0gi0rzvdjx74110mlf1n5qpsmxic6fqsyz9d2v"; + sha256 = "sha256-BTkSEjIK3CVNloJACFo6eQ6Ob9o/cdrA9xuv87NKas4="; }; minimalOCamlVersion = "4.03"; diff --git a/pkgs/development/ocaml-modules/pcap-format/default.nix b/pkgs/development/ocaml-modules/pcap-format/default.nix index f8bb6f4f6b2d..ae093cc7817e 100644 --- a/pkgs/development/ocaml-modules/pcap-format/default.nix +++ b/pkgs/development/ocaml-modules/pcap-format/default.nix @@ -1,6 +1,6 @@ { lib, buildDunePackage, fetchurl , ppx_cstruct, ppx_tools -, cstruct, ounit, mmap +, cstruct, ounit, mmap, stdlib-shims }: buildDunePackage rec { @@ -24,6 +24,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct + stdlib-shims ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 1a23a4d3e131..1cb348a41656 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -11,7 +11,7 @@ , lacaml , menhir , menhirLib -, printbox +, printbox-text }: buildDunePackage rec { @@ -25,6 +25,11 @@ buildDunePackage rec { sha256 = "sha256:0knfh2s0jfnsc0vsq5yw5xla7m7i98xd0qv512dyh3jhkh7m00l9"; }; + # Ensure compatibility with printbox ≥ 0.6 + preConfigure = '' + substituteInPlace lib/dune --replace printbox printbox-text + ''; + minimalOCamlVersion = "4.08"; checkInputs = [ alcotest bppsuite ]; @@ -37,7 +42,7 @@ buildDunePackage rec { lacaml menhirLib ppx_deriving - printbox + printbox-text ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/pipebang/default.nix b/pkgs/development/ocaml-modules/pipebang/default.nix index 489ca3d2c708..e2bd4d3ec5c8 100644 --- a/pkgs/development/ocaml-modules/pipebang/default.nix +++ b/pkgs/development/ocaml-modules/pipebang/default.nix @@ -1,4 +1,4 @@ -{ lib, buildOcaml, fetchFromGitHub }: +{ lib, buildOcaml, fetchFromGitHub, camlp4 }: buildOcaml rec { pname = "pipebang"; @@ -13,6 +13,10 @@ buildOcaml rec { sha256 = "sha256-9A3X/ciL5HtuKQ5awS+hDDBLL5ytOr12wHsmJLNRn+Q="; }; + strictDeps = true; + + propagatedBuildInputs = [ camlp4 ]; + meta = with lib; { homepage = "https://github.com/janestreet/pipebang"; description = "Syntax extension to transform x |! f into f x"; diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 9899bfc4bdf9..8c0276bc9a7a 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, piqi, stdlib-shims, num }: stdenv.mkDerivation rec { version = "0.7.7"; @@ -12,11 +12,20 @@ stdenv.mkDerivation rec { sha256 = "1913jpsb8mvqi8609j4g4sm5jhg50dq0xqxgy8nmvknfryyc89nm"; }; - buildInputs = [ ocaml findlib piqi stdlib-shims ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ piqi stdlib-shims ]; + + checkInputs = [ num ]; + + strictDeps = true; createFindlibDestdir = true; - installPhase = "DESTDIR=$out make install"; + installPhase = '' + runHook preInstall + DESTDIR=$out make install + runHook postInstall + ''; meta = with lib; { homepage = "https://piqi.org"; diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index 84ccc469f6e5..45d65a5be04f 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -12,22 +12,18 @@ stdenv.mkDerivation rec { sha256 = "0v04hs85xv6d4ysqxyv1dik34dx49yab9shpi4x7iv19qlzl7csb"; }; - buildInputs = [ ocaml findlib which ]; + nativeBuildInputs = [ ocaml findlib which ]; propagatedBuildInputs = [ sedlex_2 xmlm easy-format base64 ]; + strictDeps = true; + patches = [ ./no-ocamlpath-override.patch ]; createFindlibDestdir = true; - buildPhase = '' - make - make -C piqilib piqilib.cma - ''; + postBuild = "make -C piqilib piqilib.cma"; - installPhase = '' - make install; - make ocaml-install; - ''; + installTargets = [ "install" "ocaml-install" ]; meta = with lib; { homepage = "https://piqi.org"; diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index 0cdde114709c..e0c5c269767b 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -1,38 +1,22 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ lib, fetchFromGitHub, buildDunePackage }: -assert lib.versionAtLeast (lib.getVersion ocaml) "3.12"; +buildDunePackage rec { + pname = "pprint"; + version = "20220103"; -let param = - if lib.versionAtLeast ocaml.version "4.02" - then { - version = "20171003"; - sha256 = "06zwsskri8kaqjdszj9360nf36zvwh886xwf033aija8c9k4w6cx"; - } else { - version = "20140424"; - sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk"; -}; in + useDune2 = true; -stdenv.mkDerivation { - - name = "ocaml${ocaml.version}-pprint-${param.version}"; - - src = fetchurl { - url = "http://gallium.inria.fr/~fpottier/pprint/pprint-${param.version}.tar.gz"; - inherit (param) sha256; + src = fetchFromGitHub { + owner = "fpottier"; + repo = pname; + rev = version; + sha256 = "sha256:09y6nwnjldifm47406q1r9987njlk77g4ifqg6qs54dckhr64vax"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - - createFindlibDestdir = true; - - dontBuild = true; - installFlags = [ "-C" "src" ]; - meta = with lib; { - homepage = "http://gallium.inria.fr/~fpottier/pprint/"; - description = "An OCaml adaptation of Wadler’s and Leijen’s prettier printer"; - license = licenses.cecill-c; + inherit (src.meta) homepage; + description = "An OCaml library for pretty-printing textual documents"; + license = licenses.lgpl2Only; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index 935d67f70845..f2c844ea0482 100644 --- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -9,6 +9,7 @@ , num , ppxlib , re +, findlib }: buildDunePackage rec { @@ -26,17 +27,23 @@ buildDunePackage rec { sha256 = "15cjb9ygnvp2kv85rrb7ncz7yalifyl7wd2hp2cl8r1qrpgi1d0w"; }; + nativeBuildInputs = [ cppo findlib ]; + buildInputs = [ bigarray-compat containers - cppo - ctypes integers num ppxlib re ]; + propagatedBuildInputs = [ + ctypes + ]; + + strictDeps = true; + meta = with lib; { homepage = "https://github.com/fdopen/ppx_cstubs"; changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md"; diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 5563e6113462..fbe484dea044 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -6,6 +6,7 @@ , ppx_derivers , result , ounit +, ounit2 , ocaml-migrate-parsetree , ocaml-migrate-parsetree-2 }: @@ -37,7 +38,11 @@ buildDunePackage rec { inherit (params) sha256; }; - buildInputs = [ ppxlib cppo ]; + # This currently fails with dune + strictDeps = false; + + nativeBuildInputs = [ cppo ]; + buildInputs = [ ppxlib ]; propagatedBuildInputs = [ (if params.useOMP2 then ocaml-migrate-parsetree-2 @@ -47,7 +52,9 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ + (if lib.versionAtLeast version "5.2" then ounit2 else ounit) + ]; meta = with lib; { description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; diff --git a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix index 6f23af44b949..43cc2992c2a0 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildDunePackage, cppo, ppx_deriving -, ppxlib +, ppxlib, dune-configurator }: buildDunePackage rec { @@ -13,7 +13,9 @@ buildDunePackage rec { sha256 = "1dc1vxnkd0cnrgac5v3zbaj2lq1d2w8118mp1cmsdxylp06yz1sj"; }; - buildInputs = [ cppo ppxlib ppx_deriving ]; + nativeBuildInputs = [ cppo ]; + buildInputs = [ ppxlib dune-configurator ]; + propagatedBuildInputs = [ ppx_deriving ]; meta = with lib; { homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf"; diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index 6588d6db7f45..192e7258c4c5 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -1,27 +1,42 @@ -{ lib, fetchurl, buildDunePackage -, ppx_tools_versioned -, ocaml-migrate-parsetree +{ lib +, fetchurl +, buildDunePackage +, ounit +, ppx_deriving +, ppx_sexp_conv +, ppxlib }: +lib.throwIfNot (lib.versionAtLeast ppxlib.version "0.24.0") + "ppx_import is not available with ppxlib-${ppxlib.version}" + buildDunePackage rec { pname = "ppx_import"; - version = "1.8.0"; + version = "1.9.1"; useDune2 = true; - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.05"; src = fetchurl { - url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-${version}.tbz"; - sha256 = "0zqcj70yyp4ik4jc6jz3qs2xhb94vxc6yq9ij0d5cyak28klc3gv"; + url = "https://github.com/ocaml-ppx/ppx_import/releases/download/${version}/ppx_import-${version}.tbz"; + sha256 = "1li1f9b1i0yhjy655k74hgzhd05palz726zjbhwcy3iqxvi9id6i"; }; propagatedBuildInputs = [ - ppx_tools_versioned ocaml-migrate-parsetree + ppxlib ]; + checkInputs = [ + ounit + ppx_deriving + ppx_sexp_conv + ]; + + doCheck = true; + meta = { - description = "A syntax extension that allows to pull in types or signatures from other compiled interface files"; + description = "A syntax extension for importing declarations from interface files"; license = lib.licenses.mit; homepage = "https://github.com/ocaml-ppx/ppx_import"; }; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 64948c29ae50..9ec1c24dbe3e 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }: let param = - let v6_4 = { - version = "6.4"; - sha256 = "15v7yfv6gyp8lzlgwi9garz10wpg34dk4072jdv19n6v20zfg7n1"; + let v6_5 = { + version = "6.5"; + sha256 = "sha256:0fwibah2hgllrnbdrmfqil5gr5raf6pb5h2zx6zs1h3d4ykvy8k8"; useDune2 = true; + nativeBuildInputs = [cppo]; buildInputs = [cppo]; }; in { @@ -27,12 +28,13 @@ let param = "4.07" = { version = "5.1+4.06.0"; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; - "4.08" = v6_4; - "4.09" = v6_4; - "4.10" = v6_4; - "4.11" = v6_4; - "4.12" = v6_4; - "4.13" = v6_4; + "4.08" = v6_5; + "4.09" = v6_5; + "4.10" = v6_5; + "4.11" = v6_5; + "4.12" = v6_5; + "4.13" = v6_5; + "4.14" = v6_5; }.${ocaml.meta.branch}; in @@ -54,7 +56,9 @@ if lib.versionAtLeast param.version "6.0" then buildDunePackage { inherit pname src meta; - inherit (param) version useDune2 buildInputs; + inherit (param) version useDune2 buildInputs nativeBuildInputs; + + strictDeps = true; } else stdenv.mkDerivation { @@ -63,7 +67,8 @@ else inherit src; nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ppxfind/default.nix b/pkgs/development/ocaml-modules/ppxfind/default.nix deleted file mode 100644 index 4e135c1b115e..000000000000 --- a/pkgs/development/ocaml-modules/ppxfind/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }: - -buildDunePackage (rec { - pname = "ppxfind"; - version = "1.4"; - src = fetchurl { - url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz"; - sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq"; - }; - - minimumOCamlVersion = "4.03"; - useDune2 = true; - - buildInputs = [ ocaml-migrate-parsetree ]; - - # Don't run the native `strip' when cross-compiling. - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - - meta = { - homepage = "https://github.com/diml/ppxfind"; - description = "ocamlfind ppx tool"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.vbgl ]; - }; -} // ( -if lib.versions.majorMinor ocaml.version == "4.04" then { - dontStrip = true; -} else {} -)) diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index 04361de72221..28a53210f69f 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -1,24 +1,24 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, uucp, uutf, mdx }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx }: buildDunePackage rec { pname = "printbox"; - version = "0.5"; + version = "0.6.1"; useDune2 = true; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; src = fetchFromGitHub { owner = "c-cube"; repo = pname; - rev = version; - sha256 = "099yxpp7d9bms6dwzp9im7dv1qb801hg5rx6awpx3rpfl4cvqfn2"; + rev = "v${version}"; + sha256 = "sha256-7u2ThRhM3vW4ItcFsK4ycgcaW0JcQOFoZZRq2kqbl+k="; }; - checkInputs = [ uucp uutf mdx.bin ]; + checkInputs = [ mdx.bin ]; - # mdx is not available for OCaml < 4.07 - doCheck = lib.versionAtLeast ocaml.version "4.07"; + # mdx is not available for OCaml < 4.08 + doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = { homepage = "https://github.com/c-cube/printbox/"; diff --git a/pkgs/development/ocaml-modules/printbox/text.nix b/pkgs/development/ocaml-modules/printbox/text.nix new file mode 100644 index 000000000000..cc0aa5691de7 --- /dev/null +++ b/pkgs/development/ocaml-modules/printbox/text.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, printbox, uucp, uutf, mdx }: + +buildDunePackage { + pname = "printbox-text"; + inherit (printbox) src version useDune2 doCheck; + + propagatedBuildInputs = [ printbox uucp uutf ]; + + checkInputs = [ mdx.bin ]; + + meta = printbox.meta // { + description = "Text renderer for printbox, using unicode edges"; + }; +} diff --git a/pkgs/development/ocaml-modules/process/default.nix b/pkgs/development/ocaml-modules/process/default.nix index aecf03987ab1..89faf40c3be5 100644 --- a/pkgs/development/ocaml-modules/process/default.nix +++ b/pkgs/development/ocaml-modules/process/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-process-${version}"; + pname = "ocaml${ocaml.version}-process"; version = "0.2.1"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/prof_spacetime/default.nix b/pkgs/development/ocaml-modules/prof_spacetime/default.nix index 91e30e155db4..bfbd466bad67 100644 --- a/pkgs/development/ocaml-modules/prof_spacetime/default.nix +++ b/pkgs/development/ocaml-modules/prof_spacetime/default.nix @@ -7,7 +7,7 @@ , cohttp , ocaml_lwt , cohttp-lwt-unix -, lambdaTerm +, lambda-term , stdlib-shims }: @@ -30,7 +30,7 @@ buildDunePackage rec { cohttp ocaml_lwt cohttp-lwt-unix - lambdaTerm + lambda-term stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index dbdf3970f636..41e13f21a412 100644 --- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -1,21 +1,23 @@ { lib, fetchFromGitHub, buildDunePackage, menhir }: buildDunePackage rec { - version = "0.3.1"; + version = "0.4.0"; pname = "psmt2-frontend"; src = fetchFromGitHub { owner = "ACoquereau"; repo = pname; rev = version; - sha256 = "038jrfsq09nhnzpjiishg4adk09w3aw1bpczgbj66lqqilkd6gci"; + sha256 = "sha256-cYY9x7QZjH7pdJyHMqfMXgHZ3/zJLp/6ntY6OSIo6Vs="; }; useDune2 = true; minimumOCamlVersion = "4.03"; - buildInputs = [ menhir ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; meta = { description = "A simple parser and type-checker for polomorphic extension of the SMT-LIB 2 language"; diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index d99ec7ed3208..ac30876520a6 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -4,16 +4,17 @@ stdenv.mkDerivation rec { version = "0.8.5"; - name = "ocaml${ocaml.version}-ptime-${version}"; + pname = "ocaml${ocaml.version}-ptime"; src = fetchurl { url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz"; sha256 = "1fxq57xy1ajzfdnvv5zfm7ap2nf49znw5f9gbi4kb9vds942ij27"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = [ findlib topkg ] - ++ lib.optional jsooSupport js_of_ocaml; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ] ++ lib.optional jsooSupport js_of_ocaml; + + strictDeps = true; propagatedBuildInputs = [ result ]; diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix index 018f1e3edf06..fd59368f82df 100644 --- a/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/pkgs/development/ocaml-modules/ptmap/default.nix @@ -14,12 +14,13 @@ buildDunePackage rec { sha256 = "1apk61fc1y1g7x3m3c91fnskvxp6i0vk5nxwvipj56k7x2pzilgb"; }; + strictDeps = true; + + buildInputs = [ stdlib-shims ]; propagatedBuildInputs = [ seq ]; doCheck = true; - checkInputs = [ stdlib-shims ]; - meta = { homepage = "https://www.lri.fr/~filliatr/software.en.html"; description = "Maps over integers implemented as Patricia trees"; diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix deleted file mode 100644 index c19b40eb9afe..000000000000 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ncurses, python2, ocaml_make }: - -# This is the original pycaml version with patches from debian. - -stdenv.mkDerivation rec { - pname = "pycaml"; - version = "0.82-14"; - - srcs = [ - (fetchurl { - url = "mirror://debian/pool/main/p/pycaml/pycaml_${lib.versions.majorMinor version}.orig.tar.gz"; - sha256 = "d57be559c8d586c575717d47817986bbdbcebe2ffd16ad6b291525c62868babe"; - }) - - (fetchurl { - url = "mirror://debian/pool/main/p/pycaml/pycaml_${version}.debian.tar.gz"; - sha256 = "a763088ec1fa76c769bf586ed6692e7ac035b0a2bfd48a90a8e7a9539ec0c2f1"; - }) - ]; - - postPatch = '' - rm -f Makefile* configure* - cp ../debian/META ../debian/Makefile . - sed -i "Makefile" -e's|/usr/share/ocamlmakefile/OCamlMakefile|${ocaml_make}/include/OCamlMakefile|g' - ''; - - sourceRoot = "pycaml"; - patches = [ "../debian/patches/*.patch" ]; - - buildInputs = [ ncurses ocaml findlib python2 ocaml_make ]; - createFindlibDestdir = true; - - # the Makefile is not shipped with an install target, hence we do it ourselves. - installPhase = '' - ocamlfind install pycaml \ - dllpycaml_stubs.so libpycaml_stubs.a pycaml.a pycaml.cma \ - pycaml.cmi pycaml.cmo pycaml.cmx pycaml.cmxa \ - META - ''; - - meta = { - homepage = "https://github.com/chemoelectric/pycaml"; - description = "Bindings for python and ocaml"; - license = "LGPL"; - platforms = ocaml.meta.platforms or [ ]; - }; -} diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix index 7bc794fa2487..afcc47e38dc4 100644 --- a/pkgs/development/ocaml-modules/pyml/default.nix +++ b/pkgs/development/ocaml-modules/pyml/default.nix @@ -2,18 +2,20 @@ stdenv.mkDerivation rec { pname = "pyml"; - version = "20210226"; + version = "20211015"; src = fetchFromGitHub { owner = "thierry-martinez"; repo = pname; rev = version; - sha256 = "15xk6bgdzsf04d6wdjpr3s1ci2g7d7qnbq3102avkz179d5n62h7"; + sha256 = "sha256-GCO6KlRhJmADFjQ5QF4naMQBskF63yqnJnLnuQsagEk="; }; - buildInputs = [ + nativeBuildInputs = [ ocaml findlib + ]; + buildInputs = [ utop ncurses ]; @@ -23,6 +25,8 @@ stdenv.mkDerivation rec { stdcompat ]; + strictDeps = true; + buildPhase = '' make all pymltop pymlutop PREFIX=$out ''; diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index 0edae9830698..4e07a2021e32 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v"; }; - buildInputs = [ ocaml findlib topkg ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index bc0c8f9e9b8c..23ebb3144d11 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -15,9 +15,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-YLkacIbjxZQ/ThgSxjTqviBYih6eW2GX5H7iybQDv1A="; }; - buildInputs = [ ocaml findlib ocamlbuild opaline ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild opaline ]; propagatedBuildInputs = [ react ]; + strictDeps = true; + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; diff --git a/pkgs/development/ocaml-modules/reason-native/cli.nix b/pkgs/development/ocaml-modules/reason-native/cli.nix index 1a4c020dc352..ee5e7d2774d2 100644 --- a/pkgs/development/ocaml-modules/reason-native/cli.nix +++ b/pkgs/development/ocaml-modules/reason-native/cli.nix @@ -3,9 +3,12 @@ { pname = "cli"; + nativeBuildInputs = [ + reason + ]; + buildInputs = [ re - reason pastel ]; } diff --git a/pkgs/development/ocaml-modules/reason-native/console.nix b/pkgs/development/ocaml-modules/reason-native/console.nix index c11c12b46730..b4b30cab4a0c 100644 --- a/pkgs/development/ocaml-modules/reason-native/console.nix +++ b/pkgs/development/ocaml-modules/reason-native/console.nix @@ -3,7 +3,7 @@ { pname = "console"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/pkgs/development/ocaml-modules/reason-native/dir.nix b/pkgs/development/ocaml-modules/reason-native/dir.nix index e6eb9c0c403f..6b2aa0c3cd8f 100644 --- a/pkgs/development/ocaml-modules/reason-native/dir.nix +++ b/pkgs/development/ocaml-modules/reason-native/dir.nix @@ -3,7 +3,7 @@ { pname = "dir"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix index 749e727feeca..a7c663493ef5 100644 --- a/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix +++ b/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix @@ -3,7 +3,7 @@ { pname = "file-context-printer"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/pkgs/development/ocaml-modules/reason-native/fp.nix b/pkgs/development/ocaml-modules/reason-native/fp.nix index ae6ae50705d5..8ff2ed65c4c0 100644 --- a/pkgs/development/ocaml-modules/reason-native/fp.nix +++ b/pkgs/development/ocaml-modules/reason-native/fp.nix @@ -3,7 +3,7 @@ { pname = "fp"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/pkgs/development/ocaml-modules/reason-native/pastel-console.nix b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix index f1d2c7cc7264..968b9f88af91 100644 --- a/pkgs/development/ocaml-modules/reason-native/pastel-console.nix +++ b/pkgs/development/ocaml-modules/reason-native/pastel-console.nix @@ -3,7 +3,7 @@ { pname = "pastel-console"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/pkgs/development/ocaml-modules/reason-native/pastel.nix b/pkgs/development/ocaml-modules/reason-native/pastel.nix index a5abc4e219c5..f2c975d938e0 100644 --- a/pkgs/development/ocaml-modules/reason-native/pastel.nix +++ b/pkgs/development/ocaml-modules/reason-native/pastel.nix @@ -5,7 +5,7 @@ minimalOCamlVersion = "4.05"; - buildInputs = [ + nativeBuildInputs = [ reason ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix index 993bcbefafdc..1250dc2d3a71 100644 --- a/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix +++ b/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix @@ -3,7 +3,7 @@ { pname = "qcheck-rely"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/pkgs/development/ocaml-modules/reason-native/refmterr.nix index 9b14d4a8ba31..b4d6708467f0 100644 --- a/pkgs/development/ocaml-modules/reason-native/refmterr.nix +++ b/pkgs/development/ocaml-modules/reason-native/refmterr.nix @@ -3,7 +3,7 @@ { pname = "refmterr"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix index 6e8b41bbd1c4..8a7080f624df 100644 --- a/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix +++ b/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix @@ -3,9 +3,12 @@ { pname = "rely-junit-reporter"; + nativeBuildInputs = [ + reason + ]; + buildInputs = [ atdgen - reason ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/reason-native/rely.nix b/pkgs/development/ocaml-modules/reason-native/rely.nix index a2230426bec1..f29565f9c463 100644 --- a/pkgs/development/ocaml-modules/reason-native/rely.nix +++ b/pkgs/development/ocaml-modules/reason-native/rely.nix @@ -3,7 +3,7 @@ { pname = "rely"; - buildInputs = [ + nativeBuildInputs = [ reason ]; diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix index f29219e30c24..9ac090a780e9 100644 --- a/pkgs/development/ocaml-modules/rope/default.nix +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -6,7 +6,7 @@ let param = version = "0.6.2"; url = "https://github.com/Chris00/ocaml-rope/releases/download/${version}/rope-${version}.tbz"; sha256 = "15cvfa0s1vjx7gjd07d3fkznilishqf4z4h2q5f20wm9ysjh2h2i"; - buildInputs = [ dune_2 ]; + nativeBuildInputs = [ dune_2 ]; extra = { buildPhase = "dune build -p rope"; installPhase = '' @@ -17,19 +17,23 @@ let param = version = "0.5"; url = "https://forge.ocamlcore.org/frs/download.php/1156/rope-0.5.tar.gz"; sha256 = "05fr2f5ch2rqhyaj06rv5218sbg99p1m9pq5sklk04hpslxig21f"; - buildInputs = [ ocamlbuild ]; + nativeBuildInputs = [ ocamlbuild ]; extra = { createFindlibDestdir = true; }; }; in stdenv.mkDerivation ({ - name = "ocaml${ocaml.version}-rope-${param.version}"; + pname = "ocaml${ocaml.version}-rope"; + inherit (param) version; src = fetchurl { inherit (param) url sha256; }; - buildInputs = [ ocaml findlib benchmark ] ++ param.buildInputs; + nativeBuildInputs = [ ocaml findlib ] ++ param.nativeBuildInputs; + buildInputs = [ benchmark ] ; + + strictDeps = true; meta = { homepage = "http://rope.forge.ocamlcore.org/"; diff --git a/pkgs/development/ocaml-modules/routes/default.nix b/pkgs/development/ocaml-modules/routes/default.nix index a83d0db5d84d..36476e587ffa 100644 --- a/pkgs/development/ocaml-modules/routes/default.nix +++ b/pkgs/development/ocaml-modules/routes/default.nix @@ -2,14 +2,14 @@ buildDunePackage rec { pname = "routes"; - version = "0.9.1"; + version = "1.0.0"; useDune2 = true; minimalOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/anuragsoni/routes/releases/download/${version}/routes-${version}.tbz"; - sha256 = "0h2c1p5w6237c1lmsl5c8q2dj5dq20gf2cmb12nbmlfn12sfmcrl"; + sha256 = "sha256-WSlASDTA1UX+NhW38/XuLkOkdwjIxz0OUkX6Nd2iROg="; }; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index 04631cc3b4bc..cdc3a1dba68a 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -1,17 +1,20 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-rresult-${version}"; + pname = "ocaml${ocaml.version}-rresult"; version = "0.6.0"; src = fetchurl { url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz"; sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ result ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index 284ba97b9c70..ec1b59c04077 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -2,8 +2,7 @@ let pname = "sawja"; - version = "1.5.10"; - webpage = "http://sawja.inria.fr/"; + version = "1.5.11"; in if !lib.versionAtLeast ocaml.version "4.07" @@ -20,12 +19,12 @@ stdenv.mkDerivation { owner = "javalib-team"; repo = pname; rev = version; - sha256 = "sha256:0k51rscs9mdgpg3qn4cahql5ncdvlb207m015hr8v6r1vfgn0ddq"; + sha256 = "sha256-1aKkRZDuLJLmDhUC1FXnn4QrgXaTyAbnXfTOAdnKgs8="; }; - nativeBuildInputs = [ which ]; + nativeBuildInputs = [ which ocaml findlib ]; - buildInputs = [ ocaml findlib ]; + strictDeps = true; patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; @@ -42,7 +41,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs"; - homepage = webpage; + homepage = "http://sawja.inria.fr/"; license = licenses.gpl3Plus; maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index c1ea56b5c506..b808145bcbbc 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -15,10 +15,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-VhzlDTYBFXgKWT69PqZYLuHkiaDwzhmyX2XfaqzHFl4="; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; propagatedBuildInputs = [ gen ocaml-migrate-parsetree ppx_tools_versioned ]; + strictDeps = true; + buildFlags = [ "all" "opt" ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sha/default.nix b/pkgs/development/ocaml-modules/sha/default.nix index c1a76e4149e6..4cbb658b6549 100644 --- a/pkgs/development/ocaml-modules/sha/default.nix +++ b/pkgs/development/ocaml-modules/sha/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage, stdlib-shims, ounit }: +{ lib, fetchurl, buildDunePackage, stdlib-shims, dune-configurator, ounit }: buildDunePackage rec { pname = "sha"; @@ -11,6 +11,8 @@ buildDunePackage rec { useDune2 = true; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix index 3a96d4adee4c..17dd6183c0da 100644 --- a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix +++ b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix @@ -5,6 +5,7 @@ , mirage-profile , cstruct , ounit +, stdlib-shims }: buildDunePackage rec { @@ -25,6 +26,7 @@ buildDunePackage rec { propagatedBuildInputs = [ mirage-profile cstruct + stdlib-shims ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/shine/default.nix b/pkgs/development/ocaml-modules/shine/default.nix new file mode 100644 index 000000000000..3aa8cce7980c --- /dev/null +++ b/pkgs/development/ocaml-modules/shine/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, shine }: + +buildDunePackage rec { + pname = "shine"; + version = "0.2.2"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-shine"; + rev = "2e1de686ea031f1056df389161ea2b721bfdb39e"; + sha256 = "0v6i4ym5zijki6ffkp2qkp00lk4fysjhmg690xscj23gwz4zx8ir"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ shine ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-shine"; + description = "Bindings to the fixed-point mp3 encoding library shine"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix index cff3d6186d1a..040a34ef6f1d 100644 --- a/pkgs/development/ocaml-modules/sodium/default.nix +++ b/pkgs/development/ocaml-modules/sodium/default.nix @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { ./lib-gen-link-bigarray.patch ]; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ ctypes libsodium ]; + strictDeps = true; + createFindlibDestdir = true; hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; diff --git a/pkgs/development/ocaml-modules/sosa/default.nix b/pkgs/development/ocaml-modules/sosa/default.nix index f244ad550bf1..141e2a50193d 100644 --- a/pkgs/development/ocaml-modules/sosa/default.nix +++ b/pkgs/development/ocaml-modules/sosa/default.nix @@ -7,7 +7,7 @@ then throw "sosa is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-sosa-${version}"; + pname = "ocaml${ocaml.version}-sosa"; version = "0.3.0"; src = fetchFromGitHub { @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk"; }; - buildInputs = [ ocaml ocamlbuild findlib ]; + nativeBuildInputs = [ ocaml ocamlbuild findlib ]; + + strictDeps = true; buildPhase = "make build"; diff --git a/pkgs/development/ocaml-modules/spacetime_lib/default.nix b/pkgs/development/ocaml-modules/spacetime_lib/default.nix index 009b2ce32619..442d06e4f698 100644 --- a/pkgs/development/ocaml-modules/spacetime_lib/default.nix +++ b/pkgs/development/ocaml-modules/spacetime_lib/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchFromGitHub, buildDunePackage, owee }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, owee }: + +lib.throwIfNot (lib.versionAtLeast "4.12" ocaml.version) + "spacetime_lib is not available for OCaml ${ocaml.version}" buildDunePackage rec { pname = "spacetime_lib"; diff --git a/pkgs/development/ocaml-modules/speex/default.nix b/pkgs/development/ocaml-modules/speex/default.nix new file mode 100644 index 000000000000..1bf5f308ecf2 --- /dev/null +++ b/pkgs/development/ocaml-modules/speex/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ogg, speex }: + +buildDunePackage rec { + pname = "speex"; + version = "0.4.1"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-speex"; + rev = "v${version}"; + sha256 = "0p4ip37kihlz9qy604llak2kzd00g45ix1yiihnrri2nm01scfab"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg speex.dev ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-speex"; + description = "Bindings to libspeex"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix index 02a281740b9f..6009eaecce1d 100644 --- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix @@ -17,10 +17,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-pKysvth0efxJeyJQY2Dnqarg7OtsKyyLnFV/1ZhsfDY="; }; - buildInputs = [ ocaml findlib ocamlbuild twt ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ twt ]; propagatedBuildInputs = [ ocaml_sqlite3 ]; + strictDeps = true; + createFindlibDestdir = true; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 1f4fd7b85805..04f181d7598d 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -24,6 +24,7 @@ buildDunePackage rec { maintainers = [ lib.maintainers.maggesi lib.maintainers.anmonteiro + lib.maintainers.dandellion ]; }; } diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix index df5c1a58b17b..eae9b264ba1f 100644 --- a/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -4,14 +4,19 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-stdcompat"; - version = "15"; + version = "18"; src = fetchurl { url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"; - sha256 = "1xcwb529m4lg9cbnxa9m3x2nnl9nxzz1x5lxpvdfflg4zxl6yx2y"; + sha256 = "sha256:01y67rndjlzfp5zq0gbqpg9skqq2hfbvhbq9lfhhk5xidr98sfj8"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; + + # build fails otherwise + enableParallelBuilding = false; configureFlags = "--libdir=$(OCAMLFIND_DESTDIR)"; diff --git a/pkgs/development/ocaml-modules/stdune/default.nix b/pkgs/development/ocaml-modules/stdune/default.nix new file mode 100644 index 000000000000..fd1e4f987b40 --- /dev/null +++ b/pkgs/development/ocaml-modules/stdune/default.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, dune_3, dyn, ordering }: + +buildDunePackage { + pname = "stdune"; + inherit (dune_3) version src; + duneVersion = "3"; + + dontAddPrefix = true; + + propagatedBuildInputs = [ dyn ordering ]; + + meta = dune_3.meta // { + description = "Dune's unstable standard library"; + }; +} + diff --git a/pkgs/development/ocaml-modules/tcpip/default.nix b/pkgs/development/ocaml-modules/tcpip/default.nix index ad12cb42d5e9..bcabb6a3626f 100644 --- a/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/pkgs/development/ocaml-modules/tcpip/default.nix @@ -13,13 +13,13 @@ buildDunePackage rec { pname = "tcpip"; - version = "7.0.1"; + version = "7.1.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "0gqj2s9sk3a7f4yavx423a569fvxsrgm0wg58biiv16v37xjaymp"; + sha256 = "sha256-4nd2OVZa4w22I4bgglnS8lrNfjTk40PL5n6Oh6n+osw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/tezos/legacy-store.nix b/pkgs/development/ocaml-modules/tezos/legacy-store.nix index 6029401e3618..b6d9f20df3c7 100644 --- a/pkgs/development/ocaml-modules/tezos/legacy-store.nix +++ b/pkgs/development/ocaml-modules/tezos/legacy-store.nix @@ -23,10 +23,12 @@ buildDunePackage { lwt-watcher ]; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + strictDeps = true; + checkInputs = [ alcotest-lwt ]; diff --git a/pkgs/development/ocaml-modules/tezos/lmdb.nix b/pkgs/development/ocaml-modules/tezos/lmdb.nix index 6eaed942317f..5b5690707ab3 100644 --- a/pkgs/development/ocaml-modules/tezos/lmdb.nix +++ b/pkgs/development/ocaml-modules/tezos/lmdb.nix @@ -25,7 +25,7 @@ buildDunePackage { useDune2 = true; - buildInputs = [ + nativeBuildInputs = [ pkg-config ]; @@ -34,6 +34,8 @@ buildDunePackage { lmdb ]; + strictDeps = true; + checkInputs = [ cstruct alcotest diff --git a/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix b/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix index 2321245220f6..85dc33dc98f1 100644 --- a/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix +++ b/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix @@ -2,6 +2,7 @@ , buildDunePackage , tezos-stdlib , tezos-protocol-compiler +, tezos-protocol-environment }: buildDunePackage { @@ -9,10 +10,16 @@ buildDunePackage { inherit (tezos-stdlib) version useDune2; src = "${tezos-stdlib.base_src}/src"; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + buildInputs = [ + tezos-protocol-environment + ]; + + strictDeps = true; + doCheck = true; meta = tezos-stdlib.meta // { diff --git a/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix b/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix index 2dec60851770..3cfb8cced04d 100644 --- a/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix +++ b/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix @@ -2,6 +2,7 @@ , buildDunePackage , tezos-stdlib , tezos-protocol-compiler +, tezos-protocol-environment }: buildDunePackage { @@ -9,10 +10,16 @@ buildDunePackage { inherit (tezos-stdlib) version useDune2; src = "${tezos-stdlib.base_src}/src"; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + buildInputs = [ + tezos-protocol-environment + ]; + + strictDeps = true; + doCheck = true; meta = tezos-stdlib.meta // { diff --git a/pkgs/development/ocaml-modules/tezos/store.nix b/pkgs/development/ocaml-modules/tezos/store.nix index 69dad7512707..3fbe945d07b7 100644 --- a/pkgs/development/ocaml-modules/tezos/store.nix +++ b/pkgs/development/ocaml-modules/tezos/store.nix @@ -31,10 +31,12 @@ buildDunePackage { tezos-legacy-store ]; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + strictDeps = true; + checkInputs = [ alcotest-lwt ]; diff --git a/pkgs/development/ocaml-modules/tezos/validation.nix b/pkgs/development/ocaml-modules/tezos/validation.nix index b26b81f4a779..44a7576cc065 100644 --- a/pkgs/development/ocaml-modules/tezos/validation.nix +++ b/pkgs/development/ocaml-modules/tezos/validation.nix @@ -14,10 +14,12 @@ buildDunePackage { tezos-protocol-updater ]; - buildInputs = [ + nativeBuildInputs = [ tezos-protocol-compiler ]; + strictDeps = true; + doCheck = true; meta = tezos-stdlib.meta // { diff --git a/pkgs/development/ocaml-modules/theora/default.nix b/pkgs/development/ocaml-modules/theora/default.nix new file mode 100644 index 000000000000..0f7b4aca1c79 --- /dev/null +++ b/pkgs/development/ocaml-modules/theora/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ogg, libtheora }: + +buildDunePackage rec { + pname = "theora"; + version = "0.4.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-theora"; + rev = "v${version}"; + sha256 = "1sggjmlrx4idkih1ddfk98cgpasq60haj4ykyqbfs22cmii5gpal"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg libtheora ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-theora"; + description = "Bindings to libtheora"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/toml/default.nix b/pkgs/development/ocaml-modules/toml/default.nix index 6980a148e105..dd765e388235 100644 --- a/pkgs/development/ocaml-modules/toml/default.nix +++ b/pkgs/development/ocaml-modules/toml/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { sha256 = "08ywzqckllvwawl1wpgg7qzvx6jhq7d6vysa0d5hj7qdwq213ggm"; }; - buildInputs = [ menhir ]; + nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ iso8601 ]; meta = { diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index 97052115da6b..10104228c839 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -27,7 +27,7 @@ let in stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-topkg-${version}"; + pname = "ocaml${ocaml.version}-topkg"; inherit (param) version; src = fetchurl { @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = param.propagatedBuildInputs or []; + strictDeps = true; + buildPhase = "${run} build"; createFindlibDestdir = true; installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index 1cf84dd4938e..7a0c6bdadeff 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { pname = "torch"; - version = "0.13"; + version = "0.14"; useDune2 = true; @@ -27,7 +27,7 @@ buildDunePackage rec { owner = "LaurentMazare"; repo = "ocaml-${pname}"; rev = version; - sha256 = "0528h1mkrqbmbf7hy91dsnxcg0k55m3jgharr71c652xyd847yz7"; + sha256 = "sha256:039anfvzsalbqi5cdp95bbixcwr2ngharihgd149hcr0wa47y700"; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 7c09e8cd9d7a..a56cccbe0717 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation { sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ SDL2 ctypes ]; preConfigure = '' diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix index 407601c7a46c..4e76f0c16d38 100644 --- a/pkgs/development/ocaml-modules/twt/default.nix +++ b/pkgs/development/ocaml-modules/twt/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-xbjLPd7P1KyuC3i6WHLBcdLwd14atcBsd5ER+l97KAk="; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; preInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index 337874e11a94..fb3977223f7e 100644 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl"; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index 4ec160a92230..1f6500c6ed17 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-8Oz/fPL3+RghyxQp5u6seSEdf0BgfP6XNcsMYty0rNs="; }; - buildInputs = [ ocaml findlib camlp4 ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ camlp4 ]; + + strictDeps = true; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix index e90ca2d16a64..468b872ec3d0 100644 --- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildOcaml}: +{ lib, fetchFromGitHub, buildOcaml, camlp4}: buildOcaml rec { minimumSupportedOcamlVersion = "4.02"; @@ -13,6 +13,10 @@ buildOcaml rec { sha256 = "sha256-HzH0hnceCQ2kDRATjl+tfKk3XSBDsGnPzVUGYpDQUmU="; }; + strictDeps = true; + + buildInputs = [ camlp4 ]; + meta = { homepage = "https://github.com/janestreet/type_conv/"; description = "Support library for preprocessor type conversions"; diff --git a/pkgs/development/ocaml-modules/uchar/default.nix b/pkgs/development/ocaml-modules/uchar/default.nix index 7d7d87af8532..09004e8a9438 100644 --- a/pkgs/development/ocaml-modules/uchar/default.nix +++ b/pkgs/development/ocaml-modules/uchar/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml ocamlbuild findlib ]; - buildInputs = [ findlib ocaml ocamlbuild ]; + + strictDeps = true; + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=${lib.boolToString withShared}"; installPhase = "${opaline}/bin/opaline -libdir $OCAMLFIND_DESTDIR"; configurePlatforms = [ ]; diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index f1ada5d09981..d08f2c4c0ae3 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -25,9 +25,11 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [ camlp4 ]; + strictDeps = true; + buildFlags = [ "all" "all.opt" ]; meta = { diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 244f3f36dc39..0c71ddf0d700 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sha256 = "sha256:0fc737v5gj3339jx4x9xr096lxrpwvp6vaiylhavcvsglcwbgm30"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 2e8a360d4550..9031087f5053 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -21,10 +21,13 @@ stdenv.mkDerivation { sha256 = "sha256:1yx9nih3d9prb9zizq8fzmmqylf24a6yifhf81h33znrj5xn1mpj"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg uutf uunf ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg uutf uunf uucd ]; propagatedBuildInputs = [ uchar ]; + strictDeps = true; + buildPhase = '' runHook preBuild ${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString doCheck} diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index b260a05505bc..336d66cb0a64 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8"; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; configurePlatforms = []; buildInputs = [ topkg cmdliner ]; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index 073e6865fcdd..12031c53927c 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -18,10 +18,13 @@ stdenv.mkDerivation { sha256 = "sha256:17wv0nm3vvwcbzb1b09akw8jblmigyhbfmh1sy9lkb5756ni94a2"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg uutf cmdliner ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg uutf cmdliner ]; propagatedBuildInputs = [ uchar ]; + strictDeps = true; + prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384"; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 1fbcb57f3a6a..42642d2dc24e 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -15,9 +15,12 @@ stdenv.mkDerivation rec { sha256 = "sha256:1g9zyzjkhqxgbb9mh3cgaawscwdazv6y8kdqvmy6yhnimmfqv25p"; }; - buildInputs = [ ocaml findlib ocamlbuild cmdliner topkg uutf ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg cmdliner uutf ]; propagatedBuildInputs = [ uucp ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index e8179e369afa..c76eac45b35d 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,28 +1,32 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, cmdliner , topkg, uchar }: let pname = "uutf"; - webpage = "https://erratique.ch/software/${pname}"; in +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.03") + "${pname} is not available with OCaml ${ocaml.version}" + stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1nx1rly3qj23jzn9yk3x6fwqimcxjd84kv5859vvhdg56psq26p6"; + url = "https://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; + sha256 = "sha256-h3KlYT0ecCmM4U3zMkGjaF8h5O9r20zwP+mF+x7KBWg="; }; - nativeBuildInputs = [ ocaml ocamlbuild findlib ]; - buildInputs = [ findlib topkg cmdliner ]; + nativeBuildInputs = [ ocaml ocamlbuild findlib topkg ]; + buildInputs = [ topkg cmdliner ]; propagatedBuildInputs = [ uchar ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = with lib; { description = "Non-blocking streaming Unicode codec for OCaml"; - homepage = webpage; - platforms = ocaml.meta.platforms or []; + homepage = "https://erratique.ch/software/uutf"; + inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/uuuu/default.nix b/pkgs/development/ocaml-modules/uuuu/default.nix index 7d2eaac181df..4f400d1ec75b 100644 --- a/pkgs/development/ocaml-modules/uuuu/default.nix +++ b/pkgs/development/ocaml-modules/uuuu/default.nix @@ -24,10 +24,12 @@ buildDunePackage rec { useDune2 = true; - nativeBuildInputs = [ menhir ]; + nativeBuildInputs = [ menhir findlib ]; buildInputs = [ angstrom ]; + strictDeps = !doCheck; + checkInputs = [ re ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index a9a4c0d3d6b4..9dc7a4eeeeff 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -28,12 +28,15 @@ stdenv.mkDerivation { sha256 = "181sz6l5xrj5jvwg4m2yqsjzwp2s5h8v0mwhjcwbam90kdfx2nak"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ topkg ]; propagatedBuildInputs = [ uchar result gg ] ++ optionals pdfBackend [ uutf otfm ] ++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ppx ]; + strictDeps = true; + buildPhase = topkg.buildPhase + " --with-uutf ${boolToString pdfBackend}" + " --with-otfm ${boolToString pdfBackend}" diff --git a/pkgs/development/ocaml-modules/vorbis/default.nix b/pkgs/development/ocaml-modules/vorbis/default.nix new file mode 100644 index 000000000000..f33182e5fc19 --- /dev/null +++ b/pkgs/development/ocaml-modules/vorbis/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ogg, libvorbis }: + +buildDunePackage rec { + pname = "vorbis"; + version = "0.8.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-vorbis"; + rev = "v${version}"; + sha256 = "1acy7yvf2y5dggzxw4vmrpdipakr98si3pw5kxw0mh7livn08al8"; + }; + + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ ogg libvorbis ]; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-vorbis"; + description = "Bindings to libvorbis"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index 4befff2721b9..ffe8479b67e9 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -1,11 +1,12 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: -if !lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.03" +|| lib.versionOlder "4.13" ocaml.version then throw "wasm is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-wasm-${version}"; + pname = "ocaml${ocaml.version}-wasm"; version = "1.1.1"; src = fetchFromGitHub { diff --git a/pkgs/development/ocaml-modules/webbrowser/default.nix b/pkgs/development/ocaml-modules/webbrowser/default.nix index ebc5472ce53b..a8adced93882 100644 --- a/pkgs/development/ocaml-modules/webbrowser/default.nix +++ b/pkgs/development/ocaml-modules/webbrowser/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-webbrowser-${version}"; + pname = "ocaml${ocaml.version}-webbrowser"; version = "0.6.1"; src = fetchurl { url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz"; @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = []; + buildInputs = [ topkg ]; propagatedBuildInputs = [ astring bos cmdliner rresult ]; + strictDeps = true; + inherit (topkg) buildPhase installPhase; meta = { diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix index 248b3f124074..8eb700a4d14a 100644 --- a/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -1,10 +1,8 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib }: -let - pname = "xml-light"; + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-xml-light"; version = "2.4"; -in -stdenv.mkDerivation { - name = "ocaml-${pname}-${version}"; src = fetchFromGitHub { owner = "ncannasse"; @@ -13,19 +11,18 @@ stdenv.mkDerivation { sha256 = "sha256-2txmkl/ZN5RGaLQJmr+orqwB4CbFk2RpLJd4gr7kPiE="; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + + strictDeps = true; createFindlibDestdir = true; - buildPhase = '' - make all - make opt - ''; - installPhase = '' + runHook preInstall make install_ocamlfind mkdir -p $out/share cp -vai doc $out/share/ + runHook postInstall ''; meta = { @@ -40,6 +37,6 @@ stdenv.mkDerivation { homepage = "http://tech.motion-twin.com/xmllight.html"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.romildo ]; - platforms = ocaml.meta.platforms or [ ]; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index 43b0bf5faa7e..f7aa1fdf113e 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -17,7 +17,10 @@ stdenv.mkDerivation rec { sha256 = "1rrdxg5kh9zaqmgapy9bhdqyxbbvxxib3bdfg1vhw4rrkp1z0x8n"; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = [ topkg ]; + + strictDeps = true; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/z3/default.nix b/pkgs/development/ocaml-modules/z3/default.nix index 43fc5b245c8d..b17f29b43531 100644 --- a/pkgs/development/ocaml-modules/z3/default.nix +++ b/pkgs/development/ocaml-modules/z3/default.nix @@ -29,9 +29,11 @@ stdenv.mkDerivation { runHook postInstall ''; - buildInputs = [ findlib ]; + nativeBuildInputs = [ findlib ]; propagatedBuildInputs = [ zarith ]; + strictDeps = true; + meta = z3.meta // { description = "Z3 Theorem Prover (OCaml API)"; }; diff --git a/pkgs/development/octave-modules/symbolic/default.nix b/pkgs/development/octave-modules/symbolic/default.nix index e40d27e7c385..513826539929 100644 --- a/pkgs/development/octave-modules/symbolic/default.nix +++ b/pkgs/development/octave-modules/symbolic/default.nix @@ -1,38 +1,27 @@ { buildOctavePackage , lib -, fetchurl +, fetchFromGitHub # Octave's Python (Python 3) , python -# Needed only to get the correct version of sympy needed -, python2Packages }: let - # Need to use sympy 1.5.1 for https://github.com/cbm755/octsympy/issues/1023 - # It has been addressed, but not merged yet. - # In the meantime, we create a Python environment with Python 3, its mpmath - # version and sympy 1.5 from python2Packages. - pythonEnv = (let - overridenPython = let - packageOverrides = self: super: { - sympy = super.sympy.overridePythonAttrs (old: rec { - version = python2Packages.sympy.version; - src = python2Packages.sympy.src; - }); - }; - in python.override {inherit packageOverrides; self = overridenPython; }; - in overridenPython.withPackages (ps: [ + pythonEnv = python.withPackages (ps: [ ps.sympy ps.mpmath - ])); + ]); in buildOctavePackage rec { pname = "symbolic"; - version = "2.9.0"; + version = "unstable-2021-10-16"; - src = fetchurl { - url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "1jr3kg9q6r4r4h3hiwq9fli6wsns73rqfzkrg25plha9195c97h8"; + # https://github.com/cbm755/octsympy/issues/1023 has been resolved, however + # a new release has not been made + src = fetchFromGitHub { + owner = "cbm755"; + repo = "octsympy"; + rev = "5b58530f4ada78c759829ae703a0e5d9832c32d4"; + sha256 = "sha256-n6P1Swjl4RfgxfLY0ZuN3pcL8PcoknA6yxbnw96OZ2k="; }; propagatedBuildInputs = [ pythonEnv ]; diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 9beacd65a646..6de9685715d7 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -1,46 +1,60 @@ { lib, stdenv, perl, buildPerl, toPerlModule }: -{ buildInputs ? [], nativeBuildInputs ? [], ... } @ attrs: +{ buildInputs ? [] +, nativeBuildInputs ? [] +, outputs ? [ "out" "devdoc" ] +, src ? null + +, doCheck ? true +, checkTarget ? "test" + +# Prevent CPAN downloads. +, PERL_AUTOINSTALL ? "--skipdeps" + +# From http://wiki.cpantesters.org/wiki/CPANAuthorNotes: "allows +# authors to skip certain tests (or include certain tests) when +# the results are not being monitored by a human being." +, AUTOMATED_TESTING ? true + +# current directory (".") is removed from @INC in Perl 5.26 but many old libs rely on it +# https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC +, PERL_USE_UNSAFE_INC ? "1" + +, ... +}@attrs: assert attrs?pname -> attrs?version; assert attrs?pname -> !(attrs?name); lib.warnIf (attrs ? name) "builtPerlPackage: `name' (\"${attrs.name}\") is deprecated, use `pname' and `version' instead" -toPerlModule(stdenv.mkDerivation ( - ( - lib.recursiveUpdate - { - outputs = [ "out" "devdoc" ]; +(let + defaultMeta = { + homepage = "https://metacpan.org/release/${lib.getName attrs}"; # TODO: phase-out `attrs.name` + platforms = perl.meta.platforms; + }; - doCheck = true; + cleanedAttrs = builtins.removeAttrs attrs [ + "meta" "builder" "version" "pname" "fullperl" + "buildInputs" "nativeBuildInputs" "buildInputs" + "PERL_AUTOINSTALL" "AUTOMATED_TESTING" "PERL_USE_UNSAFE_INC" + ]; - checkTarget = "test"; - - # Prevent CPAN downloads. - PERL_AUTOINSTALL = "--skipdeps"; - - # From http://wiki.cpantesters.org/wiki/CPANAuthorNotes: "allows - # authors to skip certain tests (or include certain tests) when - # the results are not being monitored by a human being." - AUTOMATED_TESTING = true; - - # current directory (".") is removed from @INC in Perl 5.26 but many old libs rely on it - # https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC - PERL_USE_UNSAFE_INC = "1"; - - meta.homepage = "https://metacpan.org/release/${lib.getName attrs}"; # TODO: phase-out `attrs.name` - meta.platforms = perl.meta.platforms; - } - attrs - ) - // - { + package = stdenv.mkDerivation ({ pname = "perl${perl.version}-${lib.getName attrs}"; # TODO: phase-out `attrs.name` version = lib.getVersion attrs; # TODO: phase-out `attrs.name` + builder = ./builder.sh; + buildInputs = buildInputs ++ [ perl ]; nativeBuildInputs = nativeBuildInputs ++ [ (perl.mini or perl) ]; + fullperl = buildPerl; - } -)) + + inherit outputs src doCheck checkTarget; + inherit PERL_AUTOINSTALL AUTOMATED_TESTING PERL_USE_UNSAFE_INC; + + meta = defaultMeta // (attrs.meta or { }); + } // cleanedAttrs); + +in toPerlModule package) diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 23afd44b67d9..d8d3bcb2cdd9 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { comment = "Launcher for Pharo distributions"; desktopName = "Pharo"; genericName = "Pharo"; - categories = "Development;"; + categories = [ "Development" ]; }; # because upstream tarball has no top-level directory. diff --git a/pkgs/development/pharo/wrapper/default.nix b/pkgs/development/pharo/wrapper/default.nix index 1f0892950723..1202b2dce6d4 100644 --- a/pkgs/development/pharo/wrapper/default.nix +++ b/pkgs/development/pharo/wrapper/default.nix @@ -11,11 +11,9 @@ stdenv.mkDerivation rec { genericName = "Pharo Virtual Machine"; exec = "pharo %F"; icon = "pharo"; - terminal = "false"; - type="Application"; - startupNotify = "false"; - categories = "Development;"; - mimeType = "application/x-pharo-image"; + startupNotify = false; + categories = [ "Development" ]; + mimeTypes = [ "application/x-pharo-image" ]; }; unpackPhase = '' cp $src ./pharo-vm.sh diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index b19b275019df..bc0f4ac636c6 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/box/box.phar makeWrapper ${php}/bin/php $out/bin/box \ --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 9247f984d433..96cc0b9706b7 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.2.3"; + version = "2.2.9"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "sha256-chzCf4HGSF//cOb1a58qra53Ch+JdKOEw041mHojDYw="; + sha256 = "sha256-SPn9ya2TkE/ullULRa4DpR9pcYUC7oVdqJS0rXHS3+A="; }; dontUnpack = true; diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 1b90e71fd209..84f307204319 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -1,7 +1,7 @@ { lib, buildPecl, fetchFromGitHub, writeText, libcouchbase, zlib, php, substituteAll }: let pname = "couchbase"; - version = "3.2.1"; + version = "3.2.2"; in buildPecl { inherit pname version; @@ -10,7 +10,7 @@ buildPecl { owner = "couchbase"; repo = "php-couchbase"; rev = "v${version}"; - sha256 = "sha256-Ti1jo1do0xiY/FAfyG/YI/TTcgFTMWy8cuhorDodUko="; + sha256 = "sha256-JpzLR4NcyShl2VTivj+15iAsTTsZmdMIdZYc3dLCbIA="; }; configureFlags = [ "--with-couchbase" ]; diff --git a/pkgs/development/php-packages/deployer/default.nix b/pkgs/development/php-packages/deployer/default.nix index 7679fb5ea51b..661a6310958c 100644 --- a/pkgs/development/php-packages/deployer/default.nix +++ b/pkgs/development/php-packages/deployer/default.nix @@ -14,6 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/deployer/deployer.phar makeWrapper ${php}/bin/php $out/bin/dep --add-flags "$out/libexec/deployer/deployer.phar" @@ -22,6 +23,7 @@ mkDerivation rec { installShellCompletion --cmd dep \ --bash <($out/bin/dep autocomplete --install) \ --zsh <($out/bin/dep autocomplete --install) + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/ds/default.nix b/pkgs/development/php-packages/ds/default.nix new file mode 100644 index 000000000000..c6417fd5513a --- /dev/null +++ b/pkgs/development/php-packages/ds/default.nix @@ -0,0 +1,19 @@ +{ buildPecl, lib, pcre2, php }: + +buildPecl { + pname = "ds"; + + version = "1.4.0"; + sha256 = "1vwk5d27zd746767l8cvbcdr8r70v74vw0im38mlw1g85mc31fd9"; + + buildInputs = [ pcre2 ]; + + internalDeps = lib.optionals (lib.versionOlder php.version "8.0") [ php.extensions.json ]; + + meta = with lib; { + description = "An extension providing efficient data structures for PHP"; + license = licenses.mit; + homepage = "https://github.com/php-ds/ext-ds"; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix new file mode 100644 index 000000000000..e9b88d8155e2 --- /dev/null +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, fetchurl, makeWrapper, lib, php }: +mkDerivation rec { + pname = "grumphp"; + version = "1.8.1"; + + src = fetchurl { + url = "https://github.com/phpro/${pname}/releases/download/v${version}/${pname}.phar"; + sha256 = "sha256-3XPMyH2F3ZfRr8DmvlBY3Z6uolhaRraQxwKIskIwPq8="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/${pname}/grumphp.phar + makeWrapper ${php}/bin/php $out/bin/grumphp \ + --add-flags "$out/libexec/${pname}/grumphp.phar" + runHook postInstall + ''; + + meta = with lib; { + broken = versionOlder php.version "8.0"; + description = "A PHP code-quality tool"; + homepage = "https://github.com/phpro/grumphp"; + license = licenses.mit; + maintainers = teams.php.members; + }; +} diff --git a/pkgs/development/php-packages/igbinary/default.nix b/pkgs/development/php-packages/igbinary/default.nix index 886f75ecc9f3..15d3d1b70862 100644 --- a/pkgs/development/php-packages/igbinary/default.nix +++ b/pkgs/development/php-packages/igbinary/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "igbinary"; - version = "3.2.6"; - sha256 = "sha256-yjLjlezbREemnV6lGzX+sZw7xXWbRolv729+LKQajkM="; + version = "3.2.7"; + sha256 = "sha256-0NwNC1aphfT1LOogcXEz09oFNoh2vA+UMXweYOAxnn0="; configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index 280ad28f8f60..5150833945b0 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "imagick"; - version = "3.6.0"; - sha256 = "sha256-Till8tcN1ZpA55V9VuWQ5zHK0maen4ng/KFZ10jSlH4="; + version = "3.7.0"; + sha256 = "sha256-WjZDVBCQKdIkvLsuguFbJIvptkEif0XmNCXAZTF5LT4="; configureFlags = [ "--with-imagick=${imagemagick.dev}" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/php-packages/mailparse/default.nix b/pkgs/development/php-packages/mailparse/default.nix index f3796eb3b6c6..de3ec2d11d4b 100644 --- a/pkgs/development/php-packages/mailparse/default.nix +++ b/pkgs/development/php-packages/mailparse/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "mailparse"; - version = "3.1.2"; - sha256 = "sha256-sGR6sH6kgPzBNTM2jjj9tPS7RdMNzmX8kGUqZwpPQBA="; + version = "3.1.3"; + sha256 = "sha256-hlnKYtyaTX0V8H+XoOIULLWCUcjncs02Zp7HQNIpJHE="; internalDeps = [ php.extensions.mbstring ]; postConfigure = '' diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix index 852a86a7b178..141d3126836b 100644 --- a/pkgs/development/php-packages/maxminddb/default.nix +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -13,8 +13,11 @@ buildPecl { sha256 = "sha256-Dw1+pYJmZ3U2+rgSOEkx4a6HB8FebSr7YZodOjSipjI="; }; + prePatch = '' + cd ext + ''; + buildInputs = [ libmaxminddb ]; - sourceRoot = "source/ext"; meta = with lib; { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index 0aea58572cba..5e56882c9d24 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -1,15 +1,14 @@ -{ buildPecl, lib, fetchgit, php, cyrus_sasl, zlib, pkg-config, libmemcached }: -let - pname = "memcached"; - version = "3.1.5"; -in -buildPecl { - inherit pname version; +{ buildPecl, lib, fetchFromGitHub, php, cyrus_sasl, zlib, pkg-config, libmemcached }: - src = fetchgit { - url = "https://github.com/php-memcached-dev/php-memcached"; +buildPecl rec { + pname = "memcached"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "php-memcached-dev"; + repo = "php-memcached"; rev = "v${version}"; - sha256 = "01mbh2m3kfbdvih3c8g3g9h4vdd80r0i9g2z8b3lx3mi8mmcj380"; + sha256 = "sha256-g9IzGSZUxLlOE32o9ZJOa3erb5Qs1ntR8nzS3kRd/EU="; }; internalDeps = [ diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index 2ff72b608c2c..bb6087631eb1 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -14,8 +14,8 @@ buildPecl { pname = "mongodb"; - version = "1.12.0"; - sha256 = "sha256-DZ9nCwISiLtsmwYJefGR8dp3PXKRAGcxZvOLYX4kMX4="; + version = "1.13.0"; + sha256 = "sha256-IoZbYdJkyQyeqoXZTy9fV+VkFAyth8jCYB+jP4Dv4Ls="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix index ab7e6e71fea5..8f47a211e78d 100644 --- a/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "pdo_sqlsrv"; - version = "5.9.0"; - sha256 = "0n4cnkldvyp1lrpj18ky2ii2dcaa51dsmh8cspixm7w76dxl3khg"; + version = "5.10.0"; + sha256 = "sha256-BEa7i/8egvz9mT69dl0dxWcVo+dURT9Dzo6f6EdlESo="; internalDeps = [ php.extensions.pdo ]; diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix new file mode 100644 index 000000000000..6c5af7d5d275 --- /dev/null +++ b/pkgs/development/php-packages/phing/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, fetchurl, makeWrapper, lib, php }: +let + pname = "phing"; + version = "2.17.2"; +in +mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://www.phing.info/get/phing-${version}.phar"; + sha256 = "sha256-KDqJdHIqgtar6ofNG4ENRlpRg9XYFeL5YS7Rclh1+PQ="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/phing/phing.phar + makeWrapper ${php}/bin/php $out/bin/phing \ + --add-flags "$out/libexec/phing/phing.phar" + runHook postInstall + ''; + + meta = with lib; { + description = "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant"; + license = licenses.lgpl3; + homepage = "https://github.com/phingofficial/phing"; + maintainers = with maintainers; teams.php.members; + }; +} diff --git a/pkgs/development/php-packages/phive/default.nix b/pkgs/development/php-packages/phive/default.nix new file mode 100644 index 000000000000..f564cb536922 --- /dev/null +++ b/pkgs/development/php-packages/phive/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, fetchurl, makeWrapper, lib, php }: + +mkDerivation rec { + pname = "phive"; + version = "0.15.0"; + + src = fetchurl { + url = "https://github.com/phar-io/phive/releases/download/${version}/phive-${version}.phar"; + sha256 = "sha256-crMr8d5nsVt7+zQ5xPeph/JXmTEn6jJFVtp3mOgylB4="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/phive/phive.phar + makeWrapper ${php}/bin/php $out/bin/phive \ + --add-flags "$out/libexec/phive/phive.phar" + runHook postInstall + ''; + + meta = with lib; { + description = "The Phar Installation and Verification Environment (PHIVE)"; + homepage = "https://github.com/phar-io/phive"; + license = licenses.bsd3; + maintainers = with maintainers; teams.php.members; + }; +} diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 8e3329ae0b11..9104c0a0c8dd 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "php-cs-fixer"; - version = "3.4.0"; + version = "3.8.0"; 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-UlZ3L5JaFN988WaHeZZRdl9yif29zFO0LMiFDGkMFuQ="; + sha256 = "sha256-kOdJ2xuS095xVdPxoz4q/XM0BpyJEy6V/CtkuTN/Chk="; }; dontUnpack = true; @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/php-cs-fixer/php-cs-fixer.phar makeWrapper ${php}/bin/php $out/bin/php-cs-fixer \ --add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/php-parallel-lint/default.nix b/pkgs/development/php-packages/php-parallel-lint/default.nix index 50fd23540ee5..d0335142490e 100644 --- a/pkgs/development/php-packages/php-parallel-lint/default.nix +++ b/pkgs/development/php-packages/php-parallel-lint/default.nix @@ -20,15 +20,19 @@ mkDerivation { ]; buildPhase = '' + runHook preBuild composer dump-autoload box build + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D parallel-lint.phar $out/libexec/php-parallel-lint/php-parallel-lint.phar makeWrapper ${php}/bin/php $out/bin/php-parallel-lint \ --add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/phpcbf/default.nix b/pkgs/development/php-packages/phpcbf/default.nix index cef7c2986e8f..1cc6f46bd09d 100644 --- a/pkgs/development/php-packages/phpcbf/default.nix +++ b/pkgs/development/php-packages/phpcbf/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpcbf/phpcbf.phar makeWrapper ${php}/bin/php $out/bin/phpcbf \ --add-flags "$out/libexec/phpcbf/phpcbf.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/phpcs/default.nix b/pkgs/development/php-packages/phpcs/default.nix index baad111cec55..877f587717da 100644 --- a/pkgs/development/php-packages/phpcs/default.nix +++ b/pkgs/development/php-packages/phpcs/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpcs/phpcs.phar makeWrapper ${php}/bin/php $out/bin/phpcs \ --add-flags "$out/libexec/phpcs/phpcs.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index 763fd857c357..228fd25ea553 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpmd/phpmd.phar makeWrapper ${php}/bin/php $out/bin/phpmd \ --add-flags "$out/libexec/phpmd/phpmd.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 55d3570dfb73..fccb3886af15 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "1.3.0"; + version = "1.5.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-3B7mYuK4k8l6YPMMHRd2yRdCr69VsYXnAZZYIDDDIMM="; + sha256 = "sha256-dgsBpFnolIMrSwNHZ9+mSW1zMJ/RbvYIWBUksDiYeqE="; }; dontUnpack = true; @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/phpstan/phpstan.phar makeWrapper ${php}/bin/php $out/bin/phpstan \ --add-flags "$out/libexec/phpstan/phpstan.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix index 2d4a1af9af6c..b24a8f025e50 100644 --- a/pkgs/development/php-packages/protobuf/default.nix +++ b/pkgs/development/php-packages/protobuf/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "protobuf"; - version = "3.19.1"; - sha256 = "sha256-kAPNPnvbCrmGITM3Hjpsn62TASV8eNCizFN8+1+I6bY="; + version = "3.19.4"; + sha256 = "sha256-ijo+UZz+Hh3F8FUJmcUIbKBLkv4t4CWIrbRUfUp7Zbo="; buildInputs = [ pcre2 ]; diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index a772ae441a5f..01f79c36397d 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -16,10 +16,12 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/psalm/psalm.phar makeWrapper ${php}/bin/php $out/bin/psalm \ --add-flags "$out/libexec/psalm/psalm.phar" + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix index b3ca5edebf9c..f1105dea9113 100644 --- a/pkgs/development/php-packages/psysh/default.nix +++ b/pkgs/development/php-packages/psysh/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "psysh"; - version = "0.11.0"; + version = "0.11.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "sha256-UIAeOVbKWcfNV3bXaBhkK06wezhtig8aBZfB27umwFU="; + sha256 = "sha256-u7VTlZw9k7VDWKGK/8fzFw0bjNu6DMGsoQnDedHgCWg="; }; dontUnpack = true; @@ -16,16 +16,18 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin tar -xzf $src -C $out/bin chmod +x $out/bin/psysh wrapProgram $out/bin/psysh --prefix PATH : "${lib.makeBinPath [ php ]}" + runHook postInstall ''; meta = with lib; { description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; license = licenses.mit; homepage = "https://psysh.org/"; - maintainers = with maintainers; [ caugner ] ++ teams.php.members; + maintainers = teams.php.members; }; } diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix index 6ac94b8eb025..04e6df329a1b 100644 --- a/pkgs/development/php-packages/rdkafka/default.nix +++ b/pkgs/development/php-packages/rdkafka/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "rdkafka"; - version = "5.0.2"; - sha256 = "sha256-slCwtt8ySE5Zk2tnaYO6E0N20VZS8CVSsr8EgqssvOk="; + version = "6.0.1"; + sha256 = "sha256-ikq+cB5ZPRBCwhB0YQT0sEsVrJjbYzGEju2RrK388ZI="; buildInputs = [ rdkafka pcre2 ]; diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index 025c2a38ab0f..070112ba6552 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "redis"; - version = "5.3.5"; - sha256 = "sha256-1V+lzGmRmJF7or3IJ9pjKtd/AJuiZC0nUEVql22+WYk="; + version = "5.3.7"; + sha256 = "sha256-uVgWbM2k9AvRfGmY+eIjkCGuZERnzYrVwV3vQgqtZbA="; internalDeps = with php.extensions; [ session diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix index 37ff1cb187ee..b70b6c3f3d9e 100644 --- a/pkgs/development/php-packages/sqlsrv/default.nix +++ b/pkgs/development/php-packages/sqlsrv/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "sqlsrv"; - version = "5.9.0"; - sha256 = "1css440b4qrbblmcswd5wdr2v1rjxlj2iicbmvjq9fg81028w40a"; + version = "5.10.0"; + sha256 = "sha256-drPwg6Go8QNYHCG6OkbWyiV76uZyjNFYpkpGq1miJrQ="; buildInputs = [ unixODBC diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index d017bc86f1ab..201b78e49663 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "swoole"; - version = "4.8.5"; - sha256 = "sha256-FCda91vO79Y1O1Pojv710VLzwwVUPHwn0O1kliOyKPg="; + version = "4.8.8"; + sha256 = "sha256-SnhDRC7/a7BTHn87c6YCz/R8jI6aES1ibSD6YAl6R+I="; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ]; diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index a7a710b3193e..ba582dbb757b 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "xdebug"; - version = "3.1.2"; - sha256 = "sha256-CD9r4RAN95zL3wSdr8OTC6s18OuA+bGawa2E+md5zPM="; + version = "3.1.3"; + sha256 = "sha256-N9CmcBlV9bNAbGwye3cCvXwhRi5lbztMziSgUlgBPU4="; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix index 34d405d6a396..5a19ef0a72d5 100644 --- a/pkgs/development/pure-modules/audio/default.nix +++ b/pkgs/development/pure-modules/audio/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }: stdenv.mkDerivation rec { - baseName = "audio"; + pname = "pure-audio"; version = "0.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-audio-${version}.tar.gz"; sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0"; }; diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix index 7b8cc1b00ac3..d2f35ffca766 100644 --- a/pkgs/development/pure-modules/avahi/default.nix +++ b/pkgs/development/pure-modules/avahi/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, avahi }: stdenv.mkDerivation rec { - baseName = "avahi"; + pname = "pure-avahi"; version = "0.3"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-avahi-${version}.tar.gz"; sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160"; }; diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix index f51739f03395..767ac0432ee0 100644 --- a/pkgs/development/pure-modules/csv/default.nix +++ b/pkgs/development/pure-modules/csv/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "csv"; + pname = "pure-csv"; version = "1.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-csv-${version}.tar.gz"; sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c"; }; diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix index aa678cb21a4f..2940c58b21b6 100644 --- a/pkgs/development/pure-modules/doc/default.nix +++ b/pkgs/development/pure-modules/doc/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "doc"; + pname = "pure-doc"; version = "0.7"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-doc-${version}.tar.gz"; sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9"; }; diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix index 04ea1dde589b..63b91f9a4f2c 100644 --- a/pkgs/development/pure-modules/fastcgi/default.nix +++ b/pkgs/development/pure-modules/fastcgi/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, fcgi }: stdenv.mkDerivation rec { - baseName = "fastcgi"; + pname = "pure-fastcgi"; version = "0.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-fastcgi-${version}.tar.gz"; sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7"; }; diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix index 4a3b12ea7fae..eef81e59cbf6 100644 --- a/pkgs/development/pure-modules/faust/default.nix +++ b/pkgs/development/pure-modules/faust/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, faust, libtool }: stdenv.mkDerivation rec { - baseName = "faust"; + pname = "pure-faust"; version = "0.11"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-faust-${version}.tar.gz"; sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0"; }; diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix index 3b076a4f38c2..fd119b309ba0 100644 --- a/pkgs/development/pure-modules/ffi/default.nix +++ b/pkgs/development/pure-modules/ffi/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, libffi }: stdenv.mkDerivation rec { - baseName = "ffi"; + pname = "pure-ffi"; version = "0.14"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-ffi-${version}.tar.gz"; sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a"; }; diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index 278c782da327..9698f0659a2b 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -2,12 +2,11 @@ pkg-config, pure, haskellPackages }: stdenv.mkDerivation rec { - baseName = "gen"; + pname = "pure-gen"; version = "0.20"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gen-${version}.tar.gz"; sha256 = "cfadd99a378b296325937d2492347611cc1e1d9f24594f91f3c2293eca01a4a8"; }; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index 952d583bfd88..479835d95794 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }: stdenv.mkDerivation rec { - baseName = "gl"; + pname = "pure-gl"; version = "0.9"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gl-${version}.tar.gz"; sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba"; }; diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index 7b8c46ef47f4..112d1ef23594 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -2,12 +2,11 @@ pkg-config, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }: stdenv.mkDerivation rec { - baseName = "glpk"; + pname = "pure-glpk"; version = "0.5"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-glpk-${version}.tar.gz"; sha256 = "5d6dc11706985dda02d96d481ea5f164c9e95ee446432fc4fc3d0db61a076346"; }; diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix index ddae95c43f06..54fca97a9cd2 100644 --- a/pkgs/development/pure-modules/gplot/default.nix +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, gnuplot }: stdenv.mkDerivation rec { - baseName = "gplot"; + pname = "pure-gplot"; version = "0.1"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gplot-${version}.tar.gz"; sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c"; }; diff --git a/pkgs/development/pure-modules/gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix index 204aeb6bb741..7ba60a9ea6c4 100644 --- a/pkgs/development/pure-modules/gsl/default.nix +++ b/pkgs/development/pure-modules/gsl/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pure, pkg-config, gsl }: stdenv.mkDerivation rec { - baseName = "gsl"; + pname = "pure-gsl"; version = "0.12"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gsl-${version}.tar.gz"; sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75"; }; diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix index 8cc3781e825e..adbd824abb69 100644 --- a/pkgs/development/pure-modules/gtk/default.nix +++ b/pkgs/development/pure-modules/gtk/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }: stdenv.mkDerivation rec { - baseName = "gtk"; + pname = "pure-gtk"; version = "0.13"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gtk-${version}.tar.gz"; sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203"; }; diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix index 40502bbc140a..d19c7b511cf1 100644 --- a/pkgs/development/pure-modules/liblo/default.nix +++ b/pkgs/development/pure-modules/liblo/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, liblo }: stdenv.mkDerivation rec { - baseName = "liblo"; + pname = "pure-liblo"; version = "0.9"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-liblo-${version}.tar.gz"; sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee"; }; diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix index 577170118bb1..bcadeba5acff 100644 --- a/pkgs/development/pure-modules/lilv/default.nix +++ b/pkgs/development/pure-modules/lilv/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }: stdenv.mkDerivation rec { - baseName = "lilv"; + pname = "pure-lilv"; version = "0.4"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-lilv-${version}.tar.gz"; sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f"; }; diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix index 800c39684318..742db4eac413 100644 --- a/pkgs/development/pure-modules/lv2/default.nix +++ b/pkgs/development/pure-modules/lv2/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, lv2 }: stdenv.mkDerivation rec { - baseName = "lv2"; + pname = "pure-lv2"; version = "0.2"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-lv2-${version}.tar.gz"; sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1"; }; diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix index bbca0b080892..f1a463414af1 100644 --- a/pkgs/development/pure-modules/midi/default.nix +++ b/pkgs/development/pure-modules/midi/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, portmidi }: stdenv.mkDerivation rec { - baseName = "midi"; + pname = "pure-midi"; version = "0.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-midi-${version}.tar.gz"; sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb"; }; diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix index 8afb74027d73..3a2ef117b5b7 100644 --- a/pkgs/development/pure-modules/mpfr/default.nix +++ b/pkgs/development/pure-modules/mpfr/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "mpfr"; + pname = "pure-mpfr"; version = "0.5"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-mpfr-${version}.tar.gz"; sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7"; }; diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix index 591555f39c8e..ffb622567e5a 100644 --- a/pkgs/development/pure-modules/octave/default.nix +++ b/pkgs/development/pure-modules/octave/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, octave }: stdenv.mkDerivation rec { - baseName = "octave"; + pname = "pure-octave"; version = "0.9"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-octave-${version}.tar.gz"; sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0"; }; diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix index 272c88a697cd..e826eae2eb55 100644 --- a/pkgs/development/pure-modules/odbc/default.nix +++ b/pkgs/development/pure-modules/odbc/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, libiodbc }: stdenv.mkDerivation rec { - baseName = "odbc"; + pname = "pure-odbc"; version = "0.10"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-odbc-${version}.tar.gz"; sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d"; }; diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix index bbf22e9c6fbe..bf9bd988ddbc 100644 --- a/pkgs/development/pure-modules/pandoc/default.nix +++ b/pkgs/development/pure-modules/pandoc/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }: stdenv.mkDerivation rec { - baseName = "pandoc"; + pname = "pure-pandoc"; version = "0.1"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-pandoc-${version}.tar.gz"; sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda"; }; diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix index 99cefc9682a9..2dfed3422507 100644 --- a/pkgs/development/pure-modules/rational/default.nix +++ b/pkgs/development/pure-modules/rational/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "rational"; + pname = "pure-rational"; version = "0.1"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-rational-${version}.tar.gz"; sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa"; }; diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix index f3015e275355..283d75323bef 100644 --- a/pkgs/development/pure-modules/readline/default.nix +++ b/pkgs/development/pure-modules/readline/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, readline }: stdenv.mkDerivation rec { - baseName = "readline"; + pname = "pure-readline"; version = "0.3"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-readline-${version}.tar.gz"; sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886"; }; diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix index 5e1a01bc624e..f50d3f3efbf7 100644 --- a/pkgs/development/pure-modules/sockets/default.nix +++ b/pkgs/development/pure-modules/sockets/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "sockets"; + pname = "pure-sockets"; version = "0.7"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-sockets-${version}.tar.gz"; sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420"; }; diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix index 009b367c6915..8db3fa58085d 100644 --- a/pkgs/development/pure-modules/sql3/default.nix +++ b/pkgs/development/pure-modules/sql3/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, sqlite }: stdenv.mkDerivation rec { - baseName = "sql3"; + pname = "pure-sql3"; version = "0.5"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-sql3-${version}.tar.gz"; sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37"; }; diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix index 46b711d9fa63..145617bc83ec 100644 --- a/pkgs/development/pure-modules/stldict/default.nix +++ b/pkgs/development/pure-modules/stldict/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "stldict"; + pname = "pure-stldict"; version = "0.8"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-stldict-${version}.tar.gz"; sha256 = "5b894ae6dc574c7022258e2732bea649c82c959ec4d0be13fb5a3e8ba8488f28"; }; diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix index 009543ee71cb..dabdb73fd7ce 100644 --- a/pkgs/development/pure-modules/stllib/default.nix +++ b/pkgs/development/pure-modules/stllib/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "stllib"; + pname = "pure-stllib"; version = "0.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-stllib-${version}.tar.gz"; diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index 4a2c86783c1a..35da57f47cda 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, tcl, tk, xlibsWrapper }: stdenv.mkDerivation rec { - baseName = "tk"; + pname = "pure-tk"; version = "0.5"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-tk-${version}.tar.gz"; sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516"; }; diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix index e9d35c4d1fb5..92f4b62966e0 100644 --- a/pkgs/development/pure-modules/xml/default.nix +++ b/pkgs/development/pure-modules/xml/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, libxml2, libxslt }: stdenv.mkDerivation rec { - baseName = "xml"; + pname = "pure-xml"; version = "0.7"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-xml-${version}.tar.gz"; sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7"; }; diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 52d4ecdc3b71..b6f79b6c5fc6 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "apscheduler"; - version = "3.8.1"; + version = "3.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "APScheduler"; inherit version; - hash = "sha256-XPNE68+9qkiuF4wCnAVc7HvHpKR8IeMV5NHwi9NfI1U="; + hash = "sha256-ZeZXS2OVSY03HQRfKop+T31Qxq0h73MT0VscfPIN8eM="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix index de53512d0b47..f39b2e141871 100644 --- a/pkgs/development/python-modules/Fabric/default.nix +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "fabric"; - version = "2.6.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "47f184b070272796fd2f9f0436799e18f2ccba4ee8ee587796fca192acd46cd2"; + sha256 = "sha256-C/eXpoxLOJcg3E3WGBSXpYxB7XYuKD2ePBsBSLMqmv8="; }; # only relevant to python < 3.4 diff --git a/pkgs/development/python-modules/Markups/default.nix b/pkgs/development/python-modules/Markups/default.nix deleted file mode 100644 index 1fa304f57a8a..000000000000 --- a/pkgs/development/python-modules/Markups/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python-markdown-math -, markdown -, docutils -, pygments -, pyyaml -}: - -buildPythonPackage rec { - pname = "Markups"; - version = "3.1.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "ab9747a72c1c6457418eb4276c79871977c13a654618e4f12e2a1f0990fbf2fc"; - }; - - checkInputs = [ markdown docutils pygments pyyaml ]; - propagatedBuildInputs = [ python-markdown-math ]; - - meta = { - description = "A wrapper around various text markup languages."; - homepage = "https://github.com/retext-project/pymarkups"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ klntsky ]; - }; -} diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index bb17af144cbe..af125e1f40ef 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.10.0"; + version = "2.11.2"; src = fetchPypi { inherit pname version; - sha256 = "f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"; + sha256 = "4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a"; }; propagatedBuildInputs = [ docutils ]; diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index 30a0e68dea0c..bda6c950d598 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.15.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "72d782fbeafba66ba3e525d46bccac949b9a174dbf66233e50ece09ee688dc81"; + sha256 = "ac511215c01ee9ae47b19716599e8ccfa746f2e18de72bdf641b79b22afa27ea"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/adafruit-io/default.nix b/pkgs/development/python-modules/adafruit-io/default.nix new file mode 100644 index 000000000000..88bdff440c4a --- /dev/null +++ b/pkgs/development/python-modules/adafruit-io/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, paho-mqtt +, pytestCheckHook +, pythonOlder +, requests +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "adafruit-io"; + version = "2.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "adafruit"; + repo = "Adafruit_IO_Python"; + rev = version; + hash = "sha256-tjm+HvUuLK3IxXwuxPidJaBetj+n0BzKOuLj75bM7a8="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + paho-mqtt + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "Adafruit_IO" + ]; + + disabledTestPaths = [ + # Tests requires valid credentials + "tests/test_client.py" + "tests/test_errors.py" + "tests/test_mqtt_client.py" + ]; + + meta = with lib; { + description = "Module for interacting with Adafruit IO"; + homepage = "https://github.com/adafruit/Adafruit_IO_Python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 9d6e49cfdf0f..2671c25e59f7 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.19.3"; + version = "3.22.0"; format = "setuptools"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-kjXHEXC+xTaQ7bEDROpqM/fNwacXlbVbhxRs2o62W20="; + sha256 = "sha256-XnB6aSTKRV72WjcXx9jPZ+FGmCNh6dvwiau7WDlyE5M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/adax-local/default.nix b/pkgs/development/python-modules/adax-local/default.nix new file mode 100644 index 000000000000..315395522b8b --- /dev/null +++ b/pkgs/development/python-modules/adax-local/default.nix @@ -0,0 +1,43 @@ +{ lib +, aiohttp +, bleak +, buildPythonPackage +, fetchFromGitHub +, async-timeout +, pythonOlder +}: + +buildPythonPackage rec { + pname = "adax-local"; + version = "0.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pyAdaxLocal"; + rev = version; + hash = "sha256-pzhaBRCn02asT0ZLt1EmnaX2g5wr/CoiItWJ/ZYe0Ok="; + }; + + propagatedBuildInputs = [ + aiohttp + bleak + async-timeout + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "adax_local" + ]; + + meta = with lib; { + description = "Module for local access to Adax"; + homepage = "https://github.com/Danielhiversen/pyAdaxLocal"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix index c38851160c22..bf3f124b02e2 100644 --- a/pkgs/development/python-modules/adb-enhanced/default.nix +++ b/pkgs/development/python-modules/adb-enhanced/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "adb-enhanced"; - version = "2.5.12"; + version = "2.5.14"; disabled = pythonOlder "3.4"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ashishb"; repo = pname; rev = version; - sha256 = "sha256-OZSLk5qXX6rEclo6JC8o/7Mz0Y2sJqUsLhnrVK4gkVI="; + sha256 = "sha256-GaPOYBQEGI40MutjjY8exABqGge2p/buk9v+NcZ5oJs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix new file mode 100644 index 000000000000..c38a4f061435 --- /dev/null +++ b/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, tokenize-rt +}: + +buildPythonPackage rec { + pname = "add-trailing-comma"; + version = "2.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "asottile"; + repo = pname; + rev = "v${version}"; + sha256 = "RBOL4mM9VciHHNmCTlRBIoXqeln19MKYxgv9p6GCNvU="; + }; + + propagatedBuildInputs = [ + tokenize-rt + ]; + + pythonImportsCheck = [ + "add_trailing_comma" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "A tool (and pre-commit hook) to automatically add trailing commas to calls and literals"; + homepage = "https://github.com/asottile/add-trailing-comma"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/adguardhome/default.nix b/pkgs/development/python-modules/adguardhome/default.nix index dfa576e657c9..134132f9931e 100644 --- a/pkgs/development/python-modules/adguardhome/default.nix +++ b/pkgs/development/python-modules/adguardhome/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adguardhome"; - version = "0.5.0"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,9 +20,18 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "sha256-f8uZF4DXbfiL1nL82shjGNpo6lXSUomRgO1YnNT/GDw="; + sha256 = "sha256-HAgt52Bo2NOUkpr5xvWTcRyrLKpfcBDlVAZxgDNI7hY="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov" "" \ + --replace '"0.0.0"' '"${version}"' + + substituteInPlace tests/test_adguardhome.py \ + --replace 0.0.0 ${version} + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ @@ -36,10 +45,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml --replace "--cov" "" - ''; - pythonImportsCheck = [ "adguardhome" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/advantage-air/default.nix b/pkgs/development/python-modules/advantage-air/default.nix index 5ce9d196c4c1..d8a8cf579733 100644 --- a/pkgs/development/python-modules/advantage-air/default.nix +++ b/pkgs/development/python-modules/advantage-air/default.nix @@ -1,21 +1,33 @@ -{ aiohttp, buildPythonPackage, fetchPypi, lib, pythonOlder }: +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { - pname = "advantage_air"; - version = "0.2.5"; + pname = "advantage-air"; + version = "0.3.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit version pname; - sha256 = "sha256-38csg1Cvpz4dkRCwlNc8+af7aJ5xDrZO1D8cCaBlePA="; + pname = "advantage_air"; + inherit version; + hash = "sha256-C+cB6oHmbr9mHZKnbls42yenQy3+L8huLk9wKazIWfU="; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; # No tests doCheck = false; - pythonImportsCheck = [ "advantage_air" ]; + + pythonImportsCheck = [ + "advantage_air" + ]; meta = with lib; { description = "API helper for Advantage Air's MyAir and e-zone API"; diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix new file mode 100644 index 000000000000..3e2e9cb2cf37 --- /dev/null +++ b/pkgs/development/python-modules/aesara/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, filelock +, etuples +, logical-unification +, minikanren +, cons +, numba +, numba-scipy +, libgpuarray +, sympy +, cython +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aesara"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "aesara-devs"; + repo = "aesara"; + rev = "38d7a813646c1e350170c46bafade0e7d0e2427c"; + sha256 = "sha256-933bM15BZi4sTjnIOGAg5dc5tXVWQ9lFzktOtzj5DNQ="; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + numpy + scipy + filelock + etuples + logical-unification + minikanren + cons + numba + numba-scipy + libgpuarray + sympy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "aesara" ]; + + meta = with lib; { + description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays"; + homepage = "https://github.com/aesara-devs/aesara"; + changelog = "https://github.com/aesara-devs/aesara/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index abe6bad71d9a..66f12ffd54b0 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder , fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens , brotli, fontmath, mutatormath, booleanoperations , ufoprocessor, ufonormalizer, psautohint, tqdm @@ -37,8 +37,15 @@ buildPythonPackage rec { patches = [ # Don't try to install cmake and ninja using pip ./no-pypi-build-tools.patch + # Use antlr4 runtime from nixpkgs and link it dynamically ./use-dynamic-system-antlr4-runtime.patch + + # Fix compatibility with latest fonttools. + (fetchpatch { + url = "https://github.com/adobe-type-tools/afdko/commit/120752c50a562e4f6c12ff4be1e3bd96ed664e82.patch"; + sha256 = "RDGIpNAuCmK+zqZOeOK7ddCjr9BuqPpcnbnxdtoE48M="; + }) ]; # setup.py will always (re-)execute cmake in buildPhase diff --git a/pkgs/development/python-modules/affine/default.nix b/pkgs/development/python-modules/affine/default.nix index 89062cde4d97..4b7696223a73 100644 --- a/pkgs/development/python-modules/affine/default.nix +++ b/pkgs/development/python-modules/affine/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "affine"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "00jil4q3b17qml6azim7s7zar6qb1vhsf0g888y637m23bpms11f"; + sha256 = "sha256-1nbeZhV61q+Z/9lOD1Tonfw1sPtyUurS7QrS3KQxvdA="; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix index b37c04a91779..4bc3532f5b57 100644 --- a/pkgs/development/python-modules/afsapi/default.nix +++ b/pkgs/development/python-modules/afsapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "afsapi"; - version = "0.2.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "wlcrs"; repo = "python-afsapi"; rev = version; - hash = "sha256-LBK32CwiYEa+R5VhcpVzMYklPAgombxl05rM/KWRyIU="; + hash = "sha256-C4rxlkylWGsDsnMPuecrC2ELj1PvP6EelZ/kzTn4Brk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index b51f5f165624..ef606a027d06 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.1.11508"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-ZT3rMzWwMG1tpPcpOqGvlFt0nuiPD0d3nECVDC7XDv8="; + hash = "sha256-qWKvNhiOAonUi0qpOWtwbNZa2lgBQ+gaGrAHMgDdr4Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aio-geojson-client/default.nix b/pkgs/development/python-modules/aio-geojson-client/default.nix index f347ed5cd1bf..b0629483d014 100644 --- a/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -8,17 +8,21 @@ , haversine , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.15"; + version = "0.17"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-client"; rev = "v${version}"; - sha256 = "0sbzrzmny7x4bkbg6z0cjn4d10r50nxdyaq7g6lagwd8ijpkg8l3"; + hash = "sha256-5GiQgtbvYeleovFbXO2vlr2XPsDIWZiElM64O+urMcY="; }; propagatedBuildInputs = [ @@ -34,7 +38,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_geojson_client" ]; + pythonImportsCheck = [ + "aio_geojson_client" + ]; meta = with lib; { description = "Python module for accessing GeoJSON feeds"; diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix index b42ba55bfa74..f3076160f9c6 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -7,17 +7,21 @@ , pytest-asyncio , pytestCheckHook , pytz +, pythonOlder }: buildPythonPackage rec { pname = "aio-geojson-geonetnz-quakes"; - version = "0.13"; + version = "0.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-quakes"; rev = "v${version}"; - sha256 = "sha256-M1QleYVPqLFjxBmOlNJdydxDTk0JJf+GYVtOTC3YUTA="; + hash = "sha256-T3vQodb0/3YEjsyHLSI8DBKK75J8hvsaBqyQI7GkT3U="; }; propagatedBuildInputs = [ @@ -32,7 +36,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_geojson_geonetnz_quakes" ]; + pythonImportsCheck = [ + "aio_geojson_geonetnz_quakes" + ]; meta = with lib; { description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix index 3cc46ae3afb9..3ba2b430801e 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -8,17 +8,21 @@ , pytest-asyncio , pytestCheckHook , pytz +, pythonOlder }: buildPythonPackage rec { pname = "aio-geojson-geonetnz-volcano"; - version = "0.6"; + version = "0.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-volcano"; rev = "v${version}"; - sha256 = "0n97kij2fprzajh57sy1z57kaqiil7pd5y67lq2hqm2cnvkar5ci"; + sha256 = "sha256-2iVUHMk4ydmGmmGS6lJV5pvxJHyP9bRSeh/dOXbquE0="; }; propagatedBuildInputs = [ @@ -34,7 +38,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_geojson_geonetnz_volcano" ]; + pythonImportsCheck = [ + "aio_geojson_geonetnz_volcano" + ]; meta = with lib; { description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds"; diff --git a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix index 792f91bc7f11..c790188ea269 100644 --- a/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix +++ b/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -8,17 +8,21 @@ , pytest-asyncio , pytestCheckHook , pytz +, pythonOlder }: buildPythonPackage rec { pname = "aio-geojson-nsw-rfs-incidents"; - version = "0.4"; + version = "0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-nsw-rfs-incidents"; rev = "v${version}"; - sha256 = "sha256-o9tuoJ7VZ6bg0rYeRWClKxdbxxj6wPgkSF7ZdOfmJew="; + sha256 = "sha256-rWlt4MYnuY+CzszFVDniWBnqpQW3WldSEl00ns3ko3U="; }; propagatedBuildInputs = [ @@ -34,7 +38,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_geojson_nsw_rfs_incidents" ]; + pythonImportsCheck = [ + "aio_geojson_nsw_rfs_incidents" + ]; meta = with lib; { description = "Python module for accessing the NSW Rural Fire Service incidents feeds"; diff --git a/pkgs/development/python-modules/aio-georss-client/default.nix b/pkgs/development/python-modules/aio-georss-client/default.nix index 2b40028721a7..586cc6b74a82 100644 --- a/pkgs/development/python-modules/aio-georss-client/default.nix +++ b/pkgs/development/python-modules/aio-georss-client/default.nix @@ -15,14 +15,16 @@ buildPythonPackage rec { pname = "aio-georss-client"; - version = "0.8"; + version = "0.9"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-client"; rev = "v${version}"; - sha256 = "0447scp5n906p8kfzy0lwdq06f6hkq71r2zala6g3vr6b3kla6h8"; + sha256 = "sha256-cnOW9Ey6WdL2bAqPop5noETn12OeeKsMkWHKGmYCjJU="; }; propagatedBuildInputs = [ @@ -40,7 +42,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_georss_client" ]; + pythonImportsCheck = [ + "aio_georss_client" + ]; meta = with lib; { description = "Python library for accessing GeoRSS feeds"; diff --git a/pkgs/development/python-modules/aio-georss-gdacs/default.nix b/pkgs/development/python-modules/aio-georss-gdacs/default.nix index 6b6d295f8b86..b33e2e35ee1c 100644 --- a/pkgs/development/python-modules/aio-georss-gdacs/default.nix +++ b/pkgs/development/python-modules/aio-georss-gdacs/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "aio-georss-gdacs"; - version = "0.5"; + version = "0.6"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-gdacs"; rev = "v${version}"; - sha256 = "sha256-CIQoQRk5KIPEa/Y/7C1NPctuHvoiZ/o2bDa5YSWY+9M="; + sha256 = "sha256-sUHVmueu70ZnXP8KoJ2mDzzEedzXYHM2yeGC4oVsZZU="; }; propagatedBuildInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "aio_georss_gdacs" ]; + pythonImportsCheck = [ + "aio_georss_gdacs" + ]; meta = with lib; { description = "Python library for accessing GeoRSS feeds"; diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix new file mode 100644 index 000000000000..cda625d49533 --- /dev/null +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -0,0 +1,40 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioairzone"; + version = "0.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Noltari"; + repo = pname; + rev = version; + hash = "sha256-R5OK/B7fq15lpt8nKECiHMmfK9xmiLPtoKC65C7H/7c="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "aioairzone" + ]; + + meta = with lib; { + description = "Module to control AirZone devices"; + homepage = "https://github.com/Noltari/aioairzone"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix new file mode 100644 index 000000000000..1c31dac5f596 --- /dev/null +++ b/pkgs/development/python-modules/aioaseko/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioaseko"; + version = "0.0.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "milanmeu"; + repo = pname; + rev = "v${version}"; + hash = "sha256-nJRVNBYfBcLYnBsTpQZYMHYWh0+hQObVKJ7sOXFwDjc="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "aioaseko" + ]; + + meta = with lib; { + description = "Module to interact with the Aseko Pool Live API"; + homepage = "https://github.com/milanmeu/aioaseko"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioazuredevops/default.nix b/pkgs/development/python-modules/aioazuredevops/default.nix index 3568e98a59ec..4c8cd7a45dc8 100644 --- a/pkgs/development/python-modules/aioazuredevops/default.nix +++ b/pkgs/development/python-modules/aioazuredevops/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "aioazuredevops"; - version = "1.3.5"; + version = "1.4.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "4c98a995d0516f502ba191fa3ac973ee72b93425e7eab3cdf770516c6e93c780"; + sha256 = "sha256-vNTvSQYjjptdPsHz0zM9paq3iodZrhcEralPm6YRZJE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 9fbbbac43ef8..01066c127be5 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,18 +10,18 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "1.4.2"; + version = "2.1.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c2f4ef325aaa839e9e2a53346b4c1c203656783a4985ab36fd4c2a9ef2dc1d2b"; + sha256 = "sha256-AP1/Q8wEhNjtJ0/QvkkqoWp/6medvqlqYCu3IspMLSI="; }; # relax version constraints: aiobotocore works with newer botocore versions # the pinning used to match some `extras_require` we're not using. postPatch = '' - substituteInPlace setup.py --replace 'botocore>=1.20.106,<1.20.107' 'botocore' + sed -i "s/'botocore>=.*'/'botocore'/" setup.py ''; propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ]; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 14ff06324bbf..c88f84859391 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -16,7 +16,7 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.3.3"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = pname; rev = "v${version}"; - sha256 = "1hjdhj1y9xhq1i36r7g2lccsicbvgm7lzkyrxygs16dw11ah46mx"; + sha256 = "sha256-OCsao4oerHGpzsoqPP3EXJVs6NZeLNsoaC83k7oX688="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 268654ea9baa..dbc684281fb4 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -3,6 +3,7 @@ , dnspython , fetchFromGitHub , ifaddr +, netifaces , pyroute2 , pytest-asyncio , pytestCheckHook @@ -11,18 +12,21 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.5"; + version = "1.4.8"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QfeAEFB5WikuriBTcfFIgnJw5H4vEcGIVX47fyDb1Dk="; + sha256 = "sha256-ts3PnL1ePWJHHaLuC0eQKqBOt+HeEeAayeVBAIhnUWs="; }; propagatedBuildInputs = [ dnspython + netifaces pyroute2 ifaddr ]; @@ -43,7 +47,9 @@ buildPythonPackage rec { "test_async_discover_hosts" ]; - pythonImportsCheck = ["aiodiscover"]; + pythonImportsCheck = [ + "aiodiscover" + ]; meta = with lib; { description = "Python module to discover hosts via ARP and PTR lookup"; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index e0f1b1df3c77..06389d50677b 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "10.8.0"; + version = "10.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "1349b2as6r3m9sxlfss8plzafn31kf3rihwa58b4f7cmc4dhb2s8"; + sha256 = "sha256-zvilMBx9H2VDmu13IiAiCqXEGkbpAJpGnt4Ea7FlGVI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 92e87e1ab1a3..03dacdef89ba 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -5,6 +5,7 @@ , backoff , buildPythonPackage , fetchFromGitHub +, poetry-core , pytest-asyncio , pytestCheckHook , pythonOlder @@ -12,8 +13,8 @@ buildPythonPackage rec { pname = "aiogithubapi"; - version = "22.1.0"; - format = "setuptools"; + version = "22.3.1"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,9 +22,13 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-rzZtf3xrbNg9VaOAOM6ux1A9S1WqUKBMKxWfHDo7/VM="; + hash = "sha256-5gKANZtDhIoyfyLdS15JDWTxHBFkaHDUlbVVhRs7MSE="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp async-timeout @@ -39,7 +44,7 @@ buildPythonPackage rec { postPatch = '' # Upstream is releasing with the help of a CI to PyPI, GitHub releases # are not in their focus - substituteInPlace setup.py \ + substituteInPlace pyproject.toml \ --replace 'version="main",' 'version="${version}",' ''; diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index a2c3d182be1c..b1938c88aa90 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.6.11"; + version = "0.7.16"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = version; - sha256 = "1rrdzzb2gcl3lc8l5vb99hy2lmdj5723fds2q78n4sf83y93czw7"; + sha256 = "sha256-dakxPhnI1m6KiOj6oQkfQ0UVA7NEBTHFGYnF6L6c8Ck="; }; nativeBuildInputs = [ @@ -34,6 +34,8 @@ buildPythonPackage rec { zeroconf ]; + doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; + checkInputs = [ pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python-modules/aiohttp-apispec/default.nix b/pkgs/development/python-modules/aiohttp-apispec/default.nix new file mode 100644 index 000000000000..ffd8e698c58e --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-apispec/default.nix @@ -0,0 +1,58 @@ +{ lib +, aiohttp +, apispec +, buildPythonPackage +, callPackage +, fetchFromGitHub +, fetchPypi +, jinja2 +, packaging +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, webargs +}: + +buildPythonPackage rec { + pname = "aiohttp-apispec"; + version = "3.0.0b1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "maximdanilchenko"; + repo = pname; + rev = "v${version}"; + hash = "sha256-LGdi5ZhJ1G0GxUJVBZnwW3Q+x3Yo9FRV9b6REPlq7As="; + }; + + propagatedBuildInputs = [ + aiohttp + apispec + jinja2 + packaging + webargs + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "jinja2<3.0" "jinja2" + ''; + + pythonImportsCheck = [ + "aiohttp_apispec" + ]; + + meta = with lib; { + description = "Build and document REST APIs with aiohttp and apispec"; + homepage = "https://github.com/maximdanilchenko/aiohttp-apispec/"; + license = licenses.mit; + maintainers = with maintainers; [ viric ]; + }; +} diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index 1867567178e4..be33becb26c2 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "aiohttp-remotes"; - version = "1.1.0"; - format = "setuptools"; + version = "1.2.0"; + format = "flit"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "aiohttp_remotes"; inherit version; - sha256 = "e44f2c5fd5fc3305477c89bb25f14570589100cc58c48b36745d4239839d3174"; + sha256 = "f95c3a6be5e2de746a85ce9af49ec548da6db8378d7e81bb171ec77b13562a6c"; }; propagatedBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A set of useful tools for aiohttp.web server"; + description = "Set of useful tools for aiohttp.web server"; homepage = "https://github.com/wikibusiness/aiohttp-remotes"; license = licenses.mit; maintainers = with maintainers; [ qyliss ]; diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix index 1e4763453209..1f01a7b57e5a 100644 --- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix +++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiohttp-wsgi"; - version = "0.9.1"; + version = "0.10.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "etianen"; repo = pname; - rev = version; - sha256 = "sha256-lQ0mAUqsOmozUIMd6nwRATaq8C5SUFGoyQu1v0RBnas="; + rev = "v${version}"; + sha256 = "sha256-3Q00FidZWV1KueuHyHKQf1PsDJGOaRW6v/kBy7lzD4Q="; }; propagatedBuildInputs = [ @@ -26,12 +26,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # makes http request to another server - # https://github.com/etianen/aiohttp-wsgi/issues/32 - "testEnviron" - ]; - pythonImportsCheck = [ "aiohttp_wsgi" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index f96fa8820384..f6d9b5d97ec7 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -92,7 +92,10 @@ buildPythonPackage rec { # Probably because we run `python -m pytest` instead of `pytest` in the hook. preCheck = '' cd tests - ''; + '' + lib.optionalString stdenv.isDarwin '' + # Work around "OSError: AF_UNIX path too long" + export TMPDIR="/tmp" + ''; meta = with lib; { description = "Asynchronous HTTP Client/Server for Python and asyncio"; diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 1f479311af05..40620cb13f4e 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -1,31 +1,46 @@ { lib -, buildPythonPackage -, fetchPypi , aiohttp , asyncio-throttle +, awesomeversion +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "aiohue"; - version = "3.0.11"; + version = "4.4.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-McC5DX3Cti9eGpPniywNY2DvbAqHSFwhek85TJN/zn0="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = version; + hash = "sha256-zXjfPd40yYyAuuW4CmaGRvJuORyQJa+6CFQaO6RQPZo="; }; propagatedBuildInputs = [ + awesomeversion aiohttp asyncio-throttle ]; + checkInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "aiohue" "aiohue.discovery" ]; - # Project has no tests - doCheck = false; + disabledTestPaths = [ + # File are prefixed with test_ + "examples/" + ]; meta = with lib; { description = "Python package to talk to Philips Hue"; diff --git a/pkgs/development/python-modules/aiohwenergy/default.nix b/pkgs/development/python-modules/aiohwenergy/default.nix index a3ec8edd6d9f..3e7c4c7b85a5 100644 --- a/pkgs/development/python-modules/aiohwenergy/default.nix +++ b/pkgs/development/python-modules/aiohwenergy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiohwenergy"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = pname; rev = version; - sha256 = "0pgk9ky4kfb1kp0mpyxdinwql1q85a3bl5w34pr88wqdqdw467ms"; + sha256 = "sha256-WfkwIxyDzLNzhWNWST/V3iN9Bhu2oXDwGiA5UXCq5ho="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioitertools/default.nix b/pkgs/development/python-modules/aioitertools/default.nix index 4349bf4fccd3..451fb9e7fa10 100644 --- a/pkgs/development/python-modules/aioitertools/default.nix +++ b/pkgs/development/python-modules/aioitertools/default.nix @@ -1,44 +1,50 @@ { lib - , buildPythonPackage , fetchpatch , fetchPypi , pythonAtLeast , pythonOlder + +# native +, flit-core + +# propagates , typing-extensions -, coverage + +# tests , python -, toml }: buildPythonPackage rec { pname = "aioitertools"; - version = "0.8.0"; - disabled = pythonOlder "3.7"; + version = "0.10.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8b02facfbc9b0f1867739949a223f3d3267ed8663691cc95abd94e2c1d8c2b46"; + hash = "sha256-fR0dSgPUYsWghAeH098JjxJYR+DTi4M7MPj4y8RaFCA="; }; - patches = lib.optionals (pythonAtLeast "3.10") [ - (fetchpatch { - # Fix TypeError: wait() got an unexpected keyword argument 'loop' - # See https://github.com/omnilib/aioitertools/issues/84 - url = "https://raw.githubusercontent.com/archlinux/svntogit-community/packages/python-aioitertools/trunk/python310.patch"; - sha256 = "sha256-F10sduGaLBcxEoP83N/lGpZIlzkM2JTnQnhHKFwc7P0="; - }) + nativeBuildInputs = [ + flit-core ]; - propagatedBuildInputs = [ typing-extensions ]; - checkInputs = [ coverage toml ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ + typing-extensions + ]; + + pythonImportsCheck = [ + "aioitertools" + ]; checkPhase = '' - ${python.interpreter} -m coverage run -m aioitertools.tests + ${python.interpreter} -m unittest discover ''; meta = with lib; { - description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables."; + description = "Implementation of itertools, builtins, and more for AsyncIO and mixed-type iterables"; license = licenses.mit; homepage = "https://pypi.org/project/aioitertools/"; maintainers = with maintainers; [ teh ]; diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 100405c1abed..2cc04130c671 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9FwTYcaXwGMMnhp+MXe1Iu8Og5aHL6qo9SVKWHFtc7o="; + sha256 = "sha256-ktXnAgrxfDELfMQATcWHn/u6C4bKQii+mbT4mA54coo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix index 0af203d8fb7b..2de513e6fbcb 100644 --- a/pkgs/development/python-modules/aiolookin/default.nix +++ b/pkgs/development/python-modules/aiolookin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiolookin"; - version = "0.0.4"; + version = "0.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ANMalko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kqys76c/9Mw3ETgF0N4rA9mz5DELwTMjAK38PPN8Ahs="; + sha256 = "sha256-l3A1fOydAUQ4arR7Zl/PDYksp53C/56fVVcz35q1hjY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiolyric/default.nix b/pkgs/development/python-modules/aiolyric/default.nix index 44e532a6149d..855748f665cf 100644 --- a/pkgs/development/python-modules/aiolyric/default.nix +++ b/pkgs/development/python-modules/aiolyric/default.nix @@ -8,25 +8,34 @@ buildPythonPackage rec { pname = "aiolyric"; - version = "1.0.8"; + version = "1.0.10"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "timmo001"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A4EkqSIQ5p4E4DPLYu9a/lmb1sFhwDqFLhjhZS6Zf5c="; + hash = "sha256-yKeG0UCQ8haT1hvywoIwKQ519GK2wFg0wXaRTFeKYIk="; }; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; disabledTests = [ # AssertionError, https://github.com/timmo001/aiolyric/issues/5 "test_location" ]; - pythonImportsCheck = [ "aiolyric" ]; + + pythonImportsCheck = [ + "aiolyric" + ]; meta = with lib; { description = "Python module for the Honeywell Lyric Platform"; diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 6d1116bfefa8..02d7f565c3c1 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -11,7 +11,6 @@ buildPythonPackage rec { version = "0.14.3"; format = "pyproject"; - disabled = pythonOlder "3.8"; src = fetchFromGitHub { @@ -21,6 +20,11 @@ buildPythonPackage rec { hash = "sha256-ELdNxeU9dajWr4VeOyuvNrSi7B+ImVJM/BlZsw3tcKE="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"0.0.0"' '"${version}"' + ''; + nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/aionanoleaf/default.nix b/pkgs/development/python-modules/aionanoleaf/default.nix index 61b958d84486..40686bf7d113 100644 --- a/pkgs/development/python-modules/aionanoleaf/default.nix +++ b/pkgs/development/python-modules/aionanoleaf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aionanoleaf"; - version = "0.1.1"; + version = "0.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "milanmeu"; repo = pname; rev = "v${version}"; - sha256 = "10gi8fpv3xkdjaqig84723m3j0kxgxvqwqvjxmysq2sw4cjmsvz6"; + sha256 = "sha256-bz568DlodWtSu2WTTd/QMhdiX9IkllW7UYVXuNlKFaY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiooncue/default.nix b/pkgs/development/python-modules/aiooncue/default.nix new file mode 100644 index 000000000000..3e9cc46b16b0 --- /dev/null +++ b/pkgs/development/python-modules/aiooncue/default.nix @@ -0,0 +1,44 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiooncue"; + version = "0.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = version; + hash = "sha256-rzgSvgVfpz2AVwqnat+TO+QhA3KcXV/a1HDNAP1fNPM="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module doesn't have tests + doCheck = false; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner",' "" + ''; + + pythonImportsCheck = [ + "aiooncue" + ]; + + meta = with lib; { + description = "Module to interact with the Kohler Oncue API"; + homepage = "https://github.com/bdraco/aiooncue"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiopvpc/default.nix b/pkgs/development/python-modules/aiopvpc/default.nix index 54e237898447..032bf995a7d4 100644 --- a/pkgs/development/python-modules/aiopvpc/default.nix +++ b/pkgs/development/python-modules/aiopvpc/default.nix @@ -46,6 +46,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Failures seem related to changes in holidays-0.13, https://github.com/azogue/aiopvpc/issues/44 + "test_number_of_national_holidays" + ]; + postPatch = '' substituteInPlace pyproject.toml --replace \ " --cov --cov-report term --cov-report html" "" diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix new file mode 100644 index 000000000000..b1618081b878 --- /dev/null +++ b/pkgs/development/python-modules/aiopyarr/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiopyarr"; + version = "22.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "tkdrob"; + repo = pname; + rev = version; + hash = "sha256-gkiUPznAJ5nkrdbDKAvODsf6UStsxFugCfkZ0fCJkng="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiopyarr" + ]; + + meta = with lib; { + description = "Python API client for Lidarr/Radarr/Readarr/Sonarr"; + homepage = "https://github.com/tkdrob/aiopyarr"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix index 807b112772cf..5ea482278944 100644 --- a/pkgs/development/python-modules/aioredis/default.nix +++ b/pkgs/development/python-modules/aioredis/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "aioredis"; - version = "2.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db"; + sha256 = "eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index 7c3def1ec554..2b4cb28bbb59 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2021.12.2"; + version = "2022.03.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-QFUXWleHRMBgaRsMNt2xFb3XcbCNI2kKQHKCBrUuG6Q="; + hash = "sha256-UiHT1YbBb9UTughVw2oJxRtvhUDVqQWqEcXMEXwy2cI="; }; nativeBuildInputs = [ @@ -49,12 +49,6 @@ buildPythonPackage rec { types-pytz ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'titlecase = "^2.3"' 'titlecase = "*"' \ - --replace 'pytz = "^2021.3"' 'pytz = "*"' - ''; - disabledTests = [ # AssertionError: assert datetime.date(... "test_get_next_pickup_event" diff --git a/pkgs/development/python-modules/aiosenseme/default.nix b/pkgs/development/python-modules/aiosenseme/default.nix new file mode 100644 index 000000000000..ff90bed8e5a5 --- /dev/null +++ b/pkgs/development/python-modules/aiosenseme/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, ifaddr +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiosenseme"; + version = "0.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ShK4DP1lAtAFI6z2kf5T1ecbNTKUn2kqUjps2ABRegg="; + }; + + propagatedBuildInputs = [ + ifaddr + ]; + + pythonImportsCheck = [ + "aiosenseme" + ]; + + # Module has no tests + doCheck = false; + + meta = with lib; { + description = "Module to interact with SenseME fans and lights by Big Ass Fans"; + homepage = "https://github.com/bdraco/aiosenseme"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index d227f34192f0..d6f2c1289081 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "1.0.8"; + version = "1.0.11"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "0l6qhgpzg082zk9134w2psnzkzf5zr0jyvrkxnhhz5lx9q5k94pc"; + hash = "sha256-N+8vmB41AUu4aTUTBYX6SPVsW1PARaq5mCOdhg9h0/g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiosignal/default.nix b/pkgs/development/python-modules/aiosignal/default.nix index acf106ab3c6d..9d815dfac059 100644 --- a/pkgs/development/python-modules/aiosignal/default.nix +++ b/pkgs/development/python-modules/aiosignal/default.nix @@ -30,6 +30,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pytest.ini \ + --replace "filterwarnings = error" "" \ --replace "--cov=aiosignal" "" ''; diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index c19e39bcd48f..254f1bfa4fe3 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -35,6 +35,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # Fixes for Python 3.10 can't be applied easily, https://github.com/aio-libs/aiosmtpd/pull/294 + doCheck = pythonOlder "3.10"; + disabledTests = [ # Requires git "test_ge_master" diff --git a/pkgs/development/python-modules/aiosteamist/default.nix b/pkgs/development/python-modules/aiosteamist/default.nix new file mode 100644 index 000000000000..aa7edc001de3 --- /dev/null +++ b/pkgs/development/python-modules/aiosteamist/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +, xmltodict +}: + +buildPythonPackage rec { + pname = "aiosteamist"; + version = "0.3.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = version; + hash = "sha256-VoIJh3EDBPKmvEmM3gP2pyt/0oz4i6Y0zIkkprTcFLg="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + xmltodict + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov=aiosteamist" "" + ''; + + pythonImportsCheck = [ + "aiosteamist" + ]; + + # Modules doesn't have test suite + doCheck = false; + + meta = with lib; { + description = "Module to control Steamist steam systems"; + homepage = "https://github.com/bdraco/aiosteamist"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index be6a0cca00f9..d42f242438b3 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "2.0.7"; + version = "2.0.8"; format = "pyproject"; src = fetchFromGitHub { owner = "TomerFi"; repo = pname; rev = version; - sha256 = "05m5jgn8g3kwrp92x3mdfpnpga1jc4whlxx9vlymg0r9s5y84lz5"; + sha256 = "sha256-4+XGSaHZNYjId0bTOwCkYpb1K/pM8WtN5/NI+GVaI7M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 1a8bdee922e2..1294f8dade69 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "30"; + version = "31"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "v${version}"; - sha256 = "036yx1g80rc32g9mqx4khn8iqhmwl4kfch35pjslnna9kw3kb9i8"; + sha256 = "sha256-8Hm7sUkIW4rVLCL5+vHfhAvmc8+IKDXaSLtYJTf14XY="; }; propagatedBuildInputs = [ @@ -33,6 +33,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=auto" + ]; + pythonImportsCheck = [ "aiounifi" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix new file mode 100644 index 000000000000..17d6d85c3ce2 --- /dev/null +++ b/pkgs/development/python-modules/aiowebostv/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, websockets +}: + +buildPythonPackage rec { + pname = "aiowebostv"; + version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-A7GiAQIuEXmCfo2pDJESCdAEaLumi1ACXnBMdGKwSvE="; + }; + + propagatedBuildInputs = [ + websockets + ]; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "aiowebostv" + ]; + + meta = with lib; { + description = "Module to interact with LG webOS based TV devices"; + homepage = "https://github.com/home-assistant-libs/aiowebostv"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aladdin-connect/default.nix b/pkgs/development/python-modules/aladdin-connect/default.nix index d25cdadc89a6..ca6c6cca9632 100644 --- a/pkgs/development/python-modules/aladdin-connect/default.nix +++ b/pkgs/development/python-modules/aladdin-connect/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "aladdin-connect"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "shoejosh"; repo = pname; rev = version; - sha256 = "0nimd1nw1haxn8s2207fcrmpjyfp6nx97n560l6hzqyqqmf2d1d1"; + sha256 = "sha256-kLvMpSGa5WyDOH3ejAJyFGsB9IiMXp+nvVxM/ZkxyFw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/allure-behave/default.nix b/pkgs/development/python-modules/allure-behave/default.nix new file mode 100644 index 000000000000..e7cd81d5b5d5 --- /dev/null +++ b/pkgs/development/python-modules/allure-behave/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, behave +, allure-python-commons +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "allure-behave"; + version = "2.9.45"; + + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-aK0SgQIXpuUoSTz8jg5IPKQM2Xvk2EfkSGigsy/GFNo="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + pythonImportsCheck = [ "allure_behave" ]; + + propagatedBuildInputs = [ + allure-python-commons + behave + ]; + + meta = with lib; { + description = "Allure behave integration."; + homepage = "https://github.com/allure-framework/allure-python"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 6e686d9fc907..e4bec8fafa4b 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -6,7 +6,7 @@ , jsonschema , numpy , pandas -, pytest +, pytestCheckHook , pythonOlder , recommonmark , six @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "altair"; - version = "4.1.0"; + version = "4.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0c99q5dy6f275yg1f137ird08wmwc1z8wmvjickkf2mvyka31p9y"; + sha256 = "d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026"; }; propagatedBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { checkInputs = [ glibcLocales ipython - pytest + pytestCheckHook recommonmark sphinx vega_datasets @@ -47,11 +47,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "altair" ]; - checkPhase = '' - export LANG=en_US.UTF-8 - # histogram_responsive.py attempt network access, and cannot be disabled through pytest flags - rm altair/examples/histogram_responsive.py - pytest --doctest-modules altair + # avoid examples directory, which fetches web resources + preCheck = '' + cd altair/tests ''; meta = with lib; { diff --git a/pkgs/development/python-modules/amcrest/default.nix b/pkgs/development/python-modules/amcrest/default.nix index d050a7563a74..dcdf918344a3 100644 --- a/pkgs/development/python-modules/amcrest/default.nix +++ b/pkgs/development/python-modules/amcrest/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "amcrest"; - version = "1.9.3"; + version = "1.9.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tchellomello"; repo = "python-amcrest"; rev = version; - sha256 = "0f9l8xbn40xwx2zzssx5qmkpmv82j6syj8ncnmm6z9dc5wpr6sw7"; + sha256 = "sha256-An7MnGtZsmEZU/y6E0sivdexFD6HJRTB1juXqHfbDzE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index e49f4ba53fe5..2ea8dc5bad5b 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -3,37 +3,48 @@ , aiofiles , buildPythonPackage , fetchFromGitHub -, isPy3k , mock , pure-python-adb , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "androidtv"; - version = "0.0.60"; + version = "0.0.66"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "JeffLIrion"; repo = "python-androidtv"; rev = "v${version}"; - sha256 = "sha256-GWCiRxZ6pHrcVkOKNGxSK8lUD0RohtED8czXIWUoVaM="; + hash = "sha256-gSbckVjM49nVfzpk9sfynJDx15+zQ/KgaI7oxEkXQpo="; }; - propagatedBuildInputs = [ adb-shell pure-python-adb ] - ++ lib.optionals (isPy3k) [ aiofiles ]; + propagatedBuildInputs = [ + adb-shell + aiofiles + pure-python-adb + ]; checkInputs = [ mock pytestCheckHook ]; - pythonImportsCheck = [ "androidtv" ]; + disabledTests = [ + # Requires git but fails anyway + "test_no_underscores" + ]; + + pythonImportsCheck = [ + "androidtv" + ]; meta = with lib; { - description = - "Communicate with an Android TV or Fire TV device via ADB over a network"; + description = "Communicate with an Android TV or Fire TV device via ADB over a network"; homepage = "https://github.com/JeffLIrion/python-androidtv/"; license = licenses.mit; maintainers = with maintainers; [ jamiemagee ]; diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 55153f5cf44d..1881da62f506 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.1.11508"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-8Cuh+QxKU3wYRRDYrMXPrzp4yg1pyH4QbJeEsTHDZqA="; + hash = "sha256-GaW1XyFOnjU28HqptFC6+Fe41zYZMR716Nsq0dPy660="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 20272b35ca8b..8164190cd49c 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.1.11508"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-lAPruvMLCQD1TwQBlKZnLrCEkrKf676dK++e7fBmPQA="; + hash = "sha256-lhwlZ7eHaEMaTW7c+WCRSeGSIQ5IeEx6XALyYJH+Ey0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/anonip/default.nix b/pkgs/development/python-modules/anonip/default.nix index 0663fddd6fb0..96115aaee439 100644 --- a/pkgs/development/python-modules/anonip/default.nix +++ b/pkgs/development/python-modules/anonip/default.nix @@ -1,24 +1,45 @@ -{ lib, buildPythonPackage, fetchFromGitHub, ipaddress, isPy27 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "anonip"; - version = "1.0.0"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "DigitaleGesellschaft"; repo = "Anonip"; rev = "v${version}"; - sha256 = "0y5xqivcinp6pwx4whc8ca1n2wxrvff7a2lpbz2dhivilfanmljs"; + sha256 = "0cssdcridadjzichz1vv1ng7jwphqkn8ihh83hpz9mcjmxyb94qc"; }; - propagatedBuildInputs = lib.optionals isPy27 [ ipaddress ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = "python tests.py"; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=anonip --cov-report=term-missing --no-cov-on-fail" "" + ''; + + pytestFlagsArray = [ + "tests.py" + ]; + + pythonImportsCheck = [ + "anonip" + ]; meta = with lib; { + description = "Tool to anonymize IP addresses in log files"; homepage = "https://github.com/DigitaleGesellschaft/Anonip"; - description = "A tool to anonymize IP-addresses in log-files"; license = licenses.bsd3; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; }; } diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix new file mode 100644 index 000000000000..97766cdd3aa0 --- /dev/null +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -0,0 +1,66 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ansible +, flaky +, pytest-mock +, pytestCheckHook +, pyyaml +, setuptools-scm +, subprocess-tee +}: + +buildPythonPackage rec { + pname = "ansible-compat"; + version = "2.0.2"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-xlGZXcMj7xRbq4V/7mVA/ryIH7cbf+r+gWPUnicxY6U="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + pyyaml + subprocess-tee + ]; + + preCheck = '' + export HOME=$(mktemp -d) + export PATH=$PATH:$out/bin + ''; + + checkInputs = [ + ansible + flaky + pytest-mock + pytestCheckHook + ]; + + disabledTests = [ + # require network + "test_prepare_environment_with_collections" + "test_prerun_reqs_v1" + "test_prerun_reqs_v2" + "test_require_collection_wrong_version" + "test_require_collection" + "test_install_collection" + "test_install_collection_dest" + "test_upgrade_collection" + "test_require_collection_no_cache_dir" + "test_runtime" + ]; + + pythonImportsCheck = [ "ansible_compat" ]; + + meta = with lib; { + description = "A python package containing functions that help interacting with various versions of Ansible"; + homepage = "https://github.com/ansible/ansible-compat"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/ansible-doctor/default.nix b/pkgs/development/python-modules/ansible-doctor/default.nix new file mode 100644 index 000000000000..4792712f41e9 --- /dev/null +++ b/pkgs/development/python-modules/ansible-doctor/default.nix @@ -0,0 +1,69 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib + +# pythonPackages +, anyconfig +, appdirs +, colorama +, environs +, jinja2 +, jsonschema +, nested-lookup +, pathspec +, poetry-core +, python-json-logger +, ruamel-yaml +}: + +buildPythonPackage rec { + pname = "ansible-doctor"; + version = "1.2.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "thegeeklab"; + repo = "ansible-doctor"; + rev = "v${version}"; + sha256 = "sha256-2Jaf7asU4c7kw9v9dUYDL4/M2Y/2qhMM3m0jqYiobUI="; + }; + + postInstall = '' + rm $out/lib/python*/site-packages/LICENSE + ''; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'environs = "9.5.0"' 'environs = "*"' \ + --replace 'jsonschema = "4.4.0"' 'jsonschema = "*"' \ + --replace '"ruamel.yaml" = "0.17.21"' '"ruamel.yaml" = "*"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + jinja2 + colorama + python-json-logger + pathspec + environs + jsonschema + appdirs + ruamel-yaml + anyconfig + nested-lookup + ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "ansibledoctor" ]; + + meta = with lib; { + description = "Annotation based documentation for your Ansible roles"; + homepage = "https://github.com/thegeeklab/ansible-doctor"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ tboerger ]; + }; +} diff --git a/pkgs/development/python-modules/ansible-kernel/default.nix b/pkgs/development/python-modules/ansible-kernel/default.nix index 670b6330eaa5..5901e8f56abb 100644 --- a/pkgs/development/python-modules/ansible-kernel/default.nix +++ b/pkgs/development/python-modules/ansible-kernel/default.nix @@ -24,11 +24,11 @@ let in buildPythonPackage rec { pname = "ansible-kernel"; - version = "0.9.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "a59039a1724c0f4f4435316e2ad3383f2328ae61f190e74414a66cc8c4637636"; + sha256 = "sha256-UJjm9FpmXSznXtaIR2rVv5YJS/H83FvRkNz09vwoe0c="; }; propagatedBuildInputs = [ ipywidgets six docopt tqdm jupyter psutil pyyaml ansible-runner ansible ]; diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix new file mode 100644 index 000000000000..9ed54dee25e8 --- /dev/null +++ b/pkgs/development/python-modules/ansible-later/default.nix @@ -0,0 +1,83 @@ +{ lib +, anyconfig +, appdirs +, buildPythonPackage +, colorama +, fetchFromGitHub +, flake8 +, jsonschema +, nested-lookup +, pathspec +, poetry-core +, pytest-mock +, python-json-logger +, pytestCheckHook +, pythonOlder +, pyyaml +, toolz +, unidiff +, yamllint +}: + +buildPythonPackage rec { + pname = "ansible-later"; + version = "2.0.8"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "thegeeklab"; + repo = pname; + rev = "v${version}"; + hash = "sha256-oPlm9uxyN3hyf4gFv37YWEn/HOkg0QQ1Ya3tjLd53rQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + anyconfig + appdirs + colorama + flake8 + jsonschema + nested-lookup + pathspec + python-json-logger + pyyaml + toolz + unidiff + yamllint + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail" "" \ + --replace 'PyYAML = "6.0"' 'PyYAML = "*"' \ + --replace 'unidiff = "0.7.3"' 'unidiff = "*"' \ + --replace 'jsonschema = "4.4.0"' 'jsonschema = "*"' + ''; + + postInstall = '' + rm $out/lib/python*/site-packages/LICENSE + ''; + + pythonImportsCheck = [ + "ansiblelater" + ]; + + meta = with lib; { + description = "Best practice scanner for Ansible roles and playbooks"; + homepage = "https://github.com/thegeeklab/ansible-later"; + license = licenses.mit; + maintainers = with maintainers; [ tboerger ]; + }; +} diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 0523b775dab3..503247580fb4 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -1,49 +1,58 @@ { lib , buildPythonPackage -, isPy27 , fetchPypi , setuptools-scm -, ansible-base +, ansible-compat +, ansible-core , enrich , flaky , pyyaml , rich , ruamel-yaml -, tenacity , wcmatch , yamllint +, pythonOlder , pytest-xdist , pytestCheckHook }: buildPythonPackage rec { pname = "ansible-lint"; - version = "5.3.2"; - disabled = isPy27; + version = "6.0.2"; format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-m6iG20xE5ZNgvI1mjwvq5hk8Ch/LuedhJwAMo6ztfCg="; + sha256 = "sha256-tTm8ItE+beDMLiV1jh0osrwBVhpBSuN87aNwi1oqee0="; }; + postPatch = '' + # it is fine if lint tools are missing + substituteInPlace conftest.py \ + --replace "sys.exit(1)" "" + ''; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ - ansible-base + ansible-compat + ansible-core enrich - flaky pyyaml rich ruamel-yaml - tenacity wcmatch yamllint ]; + # tests can't be easily run without installing things from ansible-galaxy + doCheck = false; + checkInputs = [ + flaky pytest-xdist pytestCheckHook ]; @@ -55,7 +64,7 @@ buildPythonPackage rec { preCheck = '' # ansible wants to write to $HOME and crashes if it can't export HOME=$(mktemp -d) - export PATH=$PATH:${lib.makeBinPath [ ansible-base ]} + export PATH=$PATH:${lib.makeBinPath [ ansible-core ]} # create a working ansible-lint executable export PATH=$PATH:$PWD/src/ansiblelint @@ -82,7 +91,7 @@ buildPythonPackage rec { "test_discover_lintables_umlaut" ]; - makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-base ]}" ]; + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-core ]}" ]; meta = with lib; { homepage = "https://github.com/ansible-community/ansible-lint"; diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 92d377d0886c..0083362c753b 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.1.1"; + version = "2.1.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-doRhL3VDxfB/PoE1Zn7rIqnb2Y9iXMaZAbqZJDKe8k8="; + hash = "sha256-2m5dD+gGDL5LnY7QbDYiGdu4GYu0C49WU29GZY2bnBo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible/base.nix b/pkgs/development/python-modules/ansible/base.nix index a7ab23a36661..173e620703a4 100644 --- a/pkgs/development/python-modules/ansible/base.nix +++ b/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.16"; + version = "2.10.17"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2XQhTtA6wSnCmZZ6pMmCBZQ7o28gBA5/63JI4MPi6hU="; + sha256 = "sha256-75JYgsqNTDwszQkc3hmeDIaQJMytDQejN9zyB7/zLzQ="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index a580719fcfe2..fc242ccd10ac 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,17 +23,17 @@ let ansible-collections = callPackage ./collections.nix { - version = "5.0.1"; - sha256 = "sha256:0xn3lpinmflkxwak7zb36wjs9w2y1k5s295apn3v77xnpc2cfz5l"; + version = "5.5.0"; + sha256 = "sha256-uKdtc3iJyb/Q5rDyJ23PjYNtpmcGejVXdvNQTXpm1Rg="; }; in buildPythonPackage rec { pname = "ansible-core"; - version = "2.12.1"; + version = "2.12.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pFCHByYr4Ru03ZigBvGxSBeHmgVea2xGrZ/KiJT7MHM="; + sha256 = "sha256-ihNan3TJfKtndZKTdErTQ1D3GVI+i9m7kAjfTPlTryA="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/anyconfig/default.nix b/pkgs/development/python-modules/anyconfig/default.nix new file mode 100644 index 000000000000..3e0e347bbfa3 --- /dev/null +++ b/pkgs/development/python-modules/anyconfig/default.nix @@ -0,0 +1,48 @@ +{ buildPythonPackage +, fetchPypi +, lib +, pytestCheckHook +, setuptools +}: + +buildPythonPackage rec { + pname = "anyconfig"; + version = "0.12.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-MJHXZ1dAaG+t6FdVU38qfGzO+oZZxbtWF04C3tdLltU="; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=src -vv" "" + ''; + + propagatedBuildInputs = [ + setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # OSError: /build/anyconfig-0.12.0/tests/res/cli/no_template/10/e/10.* should exists but not + "test_runs_for_datasets" + ]; + + disabledTestPaths = [ + # NameError: name 'TT' is not defined + "tests/schema/test_jsonschema.py" + ]; + + pythonImportsCheck = [ "anyconfig" ]; + + meta = with lib; { + description = "Python library provides common APIs to load and dump configuration files in various formats"; + homepage = "https://github.com/ssato/python-anyconfig"; + license = licenses.mit; + maintainers = with maintainers; [ tboerger ]; + }; +} diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix deleted file mode 100644 index 1d0d02988f83..000000000000 --- a/pkgs/development/python-modules/anyjson/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, nose }: - -buildPythonPackage rec { - pname = "anyjson"; - version = "0.3.3"; - - # The tests are written in a python2 syntax but anyjson is python3 valid - doCheck = !isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba"; - }; - - buildInputs = [ nose ]; - - meta = with lib; { - homepage = "https://bitbucket.org/runeh/anyjson/"; - description = "Wrapper that selects the best available JSON implementation"; - license = licenses.bsd2; - }; -} diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 2fe6fe08ef18..4ac03a8820fb 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -65,13 +65,13 @@ , mkYarnPackage }: let - version = "2.1.4"; + version = "2.2.3"; airflow-src = fetchFromGitHub rec { owner = "apache"; repo = "airflow"; rev = version; - sha256 = "12nxjaz4afkq30s42x3rbsci8jiw2k5zjngsc8i190fasbacbnbs"; + sha256 = "02y3az7yj4g4qaamq5s1bcvy3knd6xmvnhbfqs3kbm51irkba1zq"; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index 44748f2fdb05..2eeebaaea7f8 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -29,6 +29,7 @@ , pytest-xdist , pytestCheckHook , python +, pythonAtLeast , python-dateutil , pytz , pyyaml @@ -43,6 +44,7 @@ buildPythonPackage rec { pname = "apache-beam"; version = "2.35.0"; + disabled = pythonAtLeast "3.10"; src = fetchFromGitHub { owner = "apache"; @@ -57,6 +59,13 @@ buildPythonPackage rec { ./fix-cython.patch ]; + # See https://github.com/NixOS/nixpkgs/issues/156957. + postPatch = '' + substituteInPlace setup.py \ + --replace "typing-extensions>=3.7.0,<4" "typing-extensions" \ + --replace "pyarrow>=0.15.1,<7.0.0" "pyarrow" + ''; + sourceRoot = "source/sdks/python"; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 5e7ae3860a93..241ddfaa11ab 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "apipkg"; - version = "1.5"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6"; + sha256 = "a4be31cf8081e660d2cdea6edfb8a0f39f385866abdcfcfa45e5a0887345cb70"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 18b829249198..11990e7d3996 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -1,39 +1,75 @@ -{ lib, buildPythonPackage, fetchPypi, installShellFiles -, Babel, requests, requests_oauthlib, six, click, markdown, pyyaml, cryptography -, pytest-runner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp +{ lib +, Babel +, buildPythonPackage +, click +, cryptography +, fetchPypi +, gntp +, installShellFiles +, markdown +, mock +, paho-mqtt +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, requests_oauthlib +, six +, slixmpp }: buildPythonPackage rec { pname = "apprise"; - version = "0.9.6"; + version = "0.9.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Fe0GIIGXydKP2DzWnnJ7SCgIeaTGEa/Wta6l0N7zl/g="; + hash = "sha256-BOMeSvwmGiZvA95+e2bceCGXRwowU5+zJAl7Sn4wKqM="; }; - nativeBuildInputs = [ Babel installShellFiles ]; + nativeBuildInputs = [ + Babel + installShellFiles + ]; propagatedBuildInputs = [ - cryptography requests requests_oauthlib six click markdown pyyaml + click + cryptography + markdown + pyyaml + requests + requests_oauthlib + six ]; checkInputs = [ - pytest-runner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp + gntp + mock + paho-mqtt + pytestCheckHook + slixmpp ]; - disabledTests = [ "test_apprise_cli_nux_env" ]; + disabledTests = [ + "test_apprise_cli_nux_env" + "test_plugin_mqtt_general" + ]; postInstall = '' installManPage packaging/man/apprise.1 ''; - pythonImportsCheck = [ "apprise" ]; + pythonImportsCheck = [ + "apprise" + ]; meta = with lib; { + description = "Push Notifications that work with just about every platform"; homepage = "https://github.com/caronc/apprise"; - description = "Push Notifications that work with just about every platform!"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 35e6c90f216d..b74533e0d44b 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -1,21 +1,34 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pyperclip }: +{ lib, buildPythonPackage, fetchFromGitHub +, beautifulsoup4 +, empty-files +, numpy +, pyperclip +, pytest +}: buildPythonPackage rec { - version = "0.2.6"; + version = "3.6.0"; pname = "approvaltests"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "approvals"; repo = "ApprovalTests.Python"; - rev = version; - sha256 = "1k1bj8q1qm89a8xm4az6qk4qswwmgxw5jpdjcxmf93zh5hrcy9h9"; + rev = "v${version}"; + sha256 = "sha256-pgGuIoYV6JRM9h7hR8IeNduqsGm+UrKq+P/T1LM30NE="; }; - propagatedBuildInputs = [ pyperclip ]; + propagatedBuildInputs = [ + beautifulsoup4 + empty-files + numpy + pyperclip + pytest + ]; postPatch = '' substituteInPlace setup.py \ + --replace bs4 beautifulsoup4 \ --replace "pyperclip==1.5.27" "pyperclip>=1.5.27" ''; diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix new file mode 100644 index 000000000000..9fc959126b37 --- /dev/null +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, appdirs +, tabulate +, msgpack +, orjson +, semver +, packageurl-python +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "appthreat-vulnerability-db"; + version = "2.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "AppThreat"; + repo = "vulnerability-db"; + rev = "v${version}"; + sha256 = "sha256-fqpBnxcRBBXsjJepxDuoDbT3hk5rXAvky11sIvQS9XI="; + }; + + propagatedBuildInputs = [ + requests + appdirs + tabulate + msgpack + orjson + semver + packageurl-python + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov-append --cov-report term --cov vdb" "" + ''; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + disabledTests = [ + # Tests require network access + "test_bulk_search" + "test_download_recent" + ]; + + pythonImportsCheck = [ + "vdb" + ]; + + meta = with lib; { + description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm"; + homepage = "https://github.com/appthreat/vulnerability-db"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 034e3e0df256..46ae3fc34e56 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.36.0-r1"; + version = "3.37.0-r1"; format = "setuptools"; disabled = isPyPy; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = version; - sha256 = "sha256-kQqJqDikvEC0+PNhQxSNTcjQc+RwvaOSGz9VL3FCetg="; + sha256 = "0p6rlbk7p6hj5mbmk1a8phazw3ym6hf5103zkxzg4p1jgjgi0xpl"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/apycula/default.nix b/pkgs/development/python-modules/apycula/default.nix index d8a369d6da04..e84e3eb301b5 100644 --- a/pkgs/development/python-modules/apycula/default.nix +++ b/pkgs/development/python-modules/apycula/default.nix @@ -12,17 +12,20 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.2a2"; + version = "0.2"; + format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-pcVoYGBhp9jyuWBJ/Rpi8cjwDgPjhJ1PrPblj5DQTpk="; + hash = "sha256-xvr/NDAjCjhpImzNlCOcI4x5dIAefJ1TnUgoBhgdhPA="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ numpy @@ -35,7 +38,9 @@ buildPythonPackage rec { # tests require a physical FPGA doCheck = false; - pythonImportsCheck = [ "apycula" ]; + pythonImportsCheck = [ + "apycula" + ]; meta = with lib; { description = "Open Source tools for Gowin FPGAs"; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index beae6671be4a..f9affcddd122 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , nose , pythonOlder @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.1.11508"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-r21n0rbHxb/e34PGpbA5KpnILFtmkXThBWbASChvVs0="; + hash = "sha256-nv/hwQZgKv/cM8fF6GqI8zY9GAe8aCZ/AGFOmhz+bMM="; }; checkInputs = [ @@ -25,6 +26,15 @@ buildPythonPackage rec { pytestCheckHook ]; + patches = [ + # Make archinfo import without installing pyvex, https://github.com/angr/archinfo/pull/113 + (fetchpatch { + name = "fix-import-issue.patch"; + url = "https://github.com/angr/archinfo/commit/d29c108f55ffd458ff1d3d65db2d651c76b19267.patch"; + sha256 = "sha256-9vi0QyqQLIPQxFuB8qrpcnPXWOJ6d27/IXJE/Ui6HhM="; + }) + ]; + pythonImportsCheck = [ "archinfo" ]; diff --git a/pkgs/development/python-modules/aresponses/default.nix b/pkgs/development/python-modules/aresponses/default.nix index f2a7f0f8f26b..697b8ebbf080 100644 --- a/pkgs/development/python-modules/aresponses/default.nix +++ b/pkgs/development/python-modules/aresponses/default.nix @@ -2,24 +2,24 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, isPy3k +, pythonOlder , pytest , pytest-asyncio -, pytest-cov , pytestCheckHook }: buildPythonPackage rec { pname = "aresponses"; - version = "2.1.4"; + version = "2.1.5"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CircleUp"; repo = pname; rev = version; - sha256 = "sha256-crMiMZ2IDuYDFt8Bixg3NRhlUa2tqmfzd7ZeHM+2Iu4="; + sha256 = "sha256-9ZzIrj87TwxQi0YMlTHFPAp0V1oxfuL0+RMGXxUxFoE="; }; propagatedBuildInputs = [ @@ -34,19 +34,20 @@ buildPythonPackage rec { checkInputs = [ aiohttp pytest-asyncio - pytest-cov pytestCheckHook ]; - # Disable tests which requires network access disabledTests = [ + # Disable tests which requires network access "test_foo" "test_passthrough" ]; __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "aresponses" ]; + pythonImportsCheck = [ + "aresponses" + ]; meta = with lib; { description = "Asyncio testing server"; @@ -55,3 +56,4 @@ buildPythonPackage rec { maintainers = with maintainers; [ makefu ]; }; } + diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index cf2f92557206..0aa3e8c1b948 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -7,11 +7,11 @@ }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.12.3"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445"; + sha256 = "6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20"; }; doCheck = false; # meant to be ran with interactive interpreter diff --git a/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix new file mode 100644 index 000000000000..3f1f3f86666c --- /dev/null +++ b/pkgs/development/python-modules/argon2-cffi-bindings/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cffi +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "argon2-cffi-bindings"; + version = "21.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + cffi + ]; + + # tarball doesn't include tests, but the upstream tests are minimal + doCheck = false; + pythonImportsCheck = [ "_argon2_cffi_bindings" ]; + + meta = with lib; { + description = "Low-level CFFI bindings for Argon2"; + homepage = "https://github.com/hynek/argon2-cffi-bindings"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index a40fb806845e..4ecf5fbc5f0d 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -9,21 +9,27 @@ , isPy3k , lib , stdenv +, argon2-cffi-bindings }: buildPythonPackage rec { pname = "argon2_cffi"; - version = "21.1.0"; + version = "21.3.0"; + format = "flit"; src = fetchPypi { pname = "argon2-cffi"; inherit version; - sha256 = "sha256-9xC2EQPRofaSyj7L0Tc+KKpeVFrGJboGf/L+yhsruHA="; + sha256 = "d384164d944190a7dd7ef22c6aa3ff197da12962bd04b17f64d4e93d934dba5b"; }; - propagatedBuildInputs = [ cffi six ] ++ lib.optional (!isPy3k) enum34; + propagatedBuildInputs = [ cffi six argon2-cffi-bindings ] + ++ lib.optional (!isPy3k) enum34; - propagatedNativeBuildInputs = [ cffi ]; + propagatedNativeBuildInputs = [ + argon2-cffi-bindings + cffi + ]; ARGON2_CFFI_USE_SSE2 = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) "0"; diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix index 5ad433413ce7..d3d320785293 100644 --- a/pkgs/development/python-modules/arpeggio/default.nix +++ b/pkgs/development/python-modules/arpeggio/default.nix @@ -1,34 +1,32 @@ { lib , buildPythonPackage , fetchPypi -, glibcLocales -, pytest-runner , pytestCheckHook }: buildPythonPackage rec { - pname = "Arpeggio"; - version = "1.10.2"; + pname = "arpeggio"; + version = "2.0.0"; src = fetchPypi { - inherit pname version; - sha256 = "bfe349f252f82f82d84cb886f1d5081d1a31451e6045275e9f90b65d0daa06f1"; + pname = "Arpeggio"; + inherit version; + sha256 = "sha256-1rA4OQGbuKaHhfkpLuajaxlU64S5JbhKa4peHibT7T0="; }; - # Shall not be needed for next release - LC_ALL = "en_US.UTF-8"; - buildInputs = [ glibcLocales ]; - - nativeBuildInputs = [ pytest-runner ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" + ''; checkInputs = [ pytestCheckHook ]; - disabledTests = [ "test_examples" "test_issue_22" ]; + pythonImportsCheck = [ "arpeggio" ]; - dontUseSetuptoolsCheck = true; - - meta = { - description = "Packrat parser interpreter"; - license = lib.licenses.mit; + meta = with lib; { + description = "Recursive descent parser with memoization based on PEG grammars (aka Packrat parser)"; + homepage = "https://github.com/textX/Arpeggio"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 5aa10201917d..82fa11897b04 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -9,11 +9,14 @@ , numpy , pandas , pytest +, cloudpickle , scipy , setuptools -, tensorflow-probability +, typing-extensions +# , tensorflow-probability (incompatible version) , xarray -#, h5py (used by disabled tests) +, zarr +, h5py #, pymc3 (broken) #, pyro-ppl (broken) #, pystan (not packaged) @@ -22,13 +25,13 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "arviz-devs"; repo = "arviz"; rev = "v${version}"; - sha256 = "0vindadyxhxhrhbalys6kzrda2d4qpqbqbsbwfprp8pxkldgk548"; + sha256 = "sha256-ClARxgfji/CavEy8g5oeYK7pwSZS1yUIZnBiyTbZ/zU="; }; propagatedBuildInputs = [ @@ -45,28 +48,36 @@ buildPythonPackage rec { scipy ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "typing_extensions>=3.7.4.3,<4" "typing_extensions>=3.7.4.3" + ''; + checkInputs = [ bokeh emcee numba pytest - tensorflow-probability - #h5py (used by disabled tests) - #pymc3 (broken) - #pyro-ppl (broken) + cloudpickle + zarr + #tensorflow-probability (used by disabled tests) + h5py + #pymc3 (broken, used by disabled tests) + #pyro-ppl (broken, used by disabled tests) #pystan (not packaged) - #numpyro (not packaged) + #numpyro (not packaged, used by disabled tests) ]; # check requires pymc3 and pyro-ppl, which are currently broken, and pystan - # and numpyro, which are not yet packaged, some checks also need to make + # and numpyro, which are not yet packaged, and an incompatible (old) version + # of tensorflow-probability. some checks also need to make # directories and do not have permission to do so. So we can only check part # of the package # Additionally, there are some failures with the plots test, which revolve # around attempting to output .mp4 files through an interface that only wants # to output .html files. # The following test have been disabled as a result: data_cmdstanpy, - # data_numpyro, data_pyro, data_pystan, and plots. + # data_numpyro, data_pyro, data_pystan, data_tfp, data_pymc3 and plots. checkPhase = '' cd arviz/tests/ export HOME=$TMPDIR @@ -76,11 +87,13 @@ buildPythonPackage rec { base_tests/test_plot_utils.py \ base_tests/test_rcparams.py \ base_tests/test_stats.py \ + base_tests/test_stats_numba.py \ base_tests/test_stats_utils.py \ base_tests/test_utils.py \ + base_tests/test_utils_numba.py \ + base_tests/test_data_zarr.py \ external_tests/test_data_cmdstan.py \ - external_tests/test_data_emcee.py \ - external_tests/test_data_tfp.py + external_tests/test_data_emcee.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 363d8900163a..1a9ba2dd0963 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.8.1"; + version = "2.8.3"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bp3fME3FTa5vcj7qUoUEGqvuI2uwSpI13zDcFgWvbJw="; + sha256 = "de0f70ffb2e0d539461940d6f7529c3548541fa098d8edc37af256af61c09b44"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix index c8b1b78b78f7..b46152f3a094 100644 --- a/pkgs/development/python-modules/asn1/default.nix +++ b/pkgs/development/python-modules/asn1/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asn1"; - version = "2.4.2"; + version = "2.5.0"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "andrivet"; repo = "python-asn1"; rev = "v${version}"; - sha256 = "sha256-fx/kWOnh5Gk1DjeX0xiCJYnd5teD18RvKyOnawcfWWA="; + sha256 = "sha256-5Fnk94aUkV9lHnd64wuHzGcPqW7AC0O0dEwXMBL+tuo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aspy-refactor-imports/default.nix b/pkgs/development/python-modules/aspy-refactor-imports/default.nix new file mode 100644 index 000000000000..9ec0cf55d42d --- /dev/null +++ b/pkgs/development/python-modules/aspy-refactor-imports/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aspy-refactor-imports"; + version = "3.0.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "asottile"; + repo = "aspy.refactor_imports"; + rev = "v${version}"; + sha256 = "MlCM3zNTQZJ1RWrTQG0AN28RUepWINKCeLENykbu2nw="; + }; + + pythonImportsCheck = [ + "aspy.refactor_imports" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Utilities for refactoring imports in python-like syntax."; + homepage = "https://github.com/asottile/reorder_python_imports"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/asterisk-mbox/default.nix b/pkgs/development/python-modules/asterisk-mbox/default.nix new file mode 100644 index 000000000000..0da70911a17c --- /dev/null +++ b/pkgs/development/python-modules/asterisk-mbox/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "asterisk-mbox"; + version = "0.5.0"; + + src = fetchPypi { + pname = "asterisk_mbox"; + inherit version; + sha256 = "0624f9ab85ce9c4d43655f8653e8539fa10c81b60fd7b94b1a15dce306c20888"; + }; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ "asterisk_mbox" ]; + + meta = with lib; { + description = "The client side of a client/server to interact with Asterisk voicemail mailboxes"; + homepage = "https://github.com/PhracturedBlue/asterisk_mbox"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 101f84b4fcea..ab62a565ce67 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.9.0"; # Check whether the version is compatible with pylint + version = "2.9.3"; # Check whether the version is compatible with pylint disabled = pythonOlder "3.6.2"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sImWiWULZ1HS3JyQHfEhc4ZRZ6anOUTqZZGNIYj2MaY="; + sha256 = "1x77faggk1dgxy48ng31xj9h6p51w312kvk5zqgvd5f19nvznxyi"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix index a3ea5cd4cf2f..8e5a2fda3301 100644 --- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -3,6 +3,7 @@ , fetchPypi , findutils , pytestCheckHook +, setuptools-scm }: buildPythonPackage rec { @@ -15,6 +16,10 @@ buildPythonPackage rec { sha256 = "10iqjzmya2h4sk765dlm1pbqypwlqyh8rw59a5m9i63d3klnz2mc"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + patches = [ ./permissions.patch ]; checkInputs = [ findutils pytestCheckHook ]; diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 889c69d5313b..78f02e2870ce 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -1,49 +1,55 @@ { lib , fetchPypi -, setuptools-scm , buildPythonPackage -, isPy3k +, pythonOlder + +# build time +, astropy-extension-helpers +, astropy-helpers , cython , jinja2 +, setuptools-scm + +# runtime , numpy -, pytest -, pytest-astropy -, astropy-helpers -, astropy-extension-helpers +, packaging , pyerfa +, pyyaml }: -buildPythonPackage rec { +let pname = "astropy"; - version = "4.3.1"; + version = "5.0"; +in +buildPythonPackage { + inherit pname version; format = "pyproject"; - disabled = !isPy3k; # according to setup.py + disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - sha256 = "sha256-LTlRIjtOt/No/K2Mg0DSc3TF2OO2NaY2J1rNs481zVE="; + sha256 = "70203e151e13292586a817b4069ce1aad4643567aff38b1d191c173bc54f3927"; }; - nativeBuildInputs = [ setuptools-scm astropy-helpers astropy-extension-helpers cython jinja2 ]; - propagatedBuildInputs = [ numpy pyerfa ]; - checkInputs = [ pytest pytest-astropy ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" - ''; + nativeBuildInputs = [ + astropy-extension-helpers + astropy-helpers + cython + jinja2 + setuptools-scm + ]; - # Tests must be run from the build directory. astropy/samp tests - # require a network connection, so we ignore them. For some reason - # pytest --ignore does not work, so we delete the tests instead. - checkPhase = '' - cd build/lib.* - rm -f astropy/samp/tests/* - pytest - ''; + propagatedBuildInputs = [ + numpy + packaging + pyerfa + pyyaml + ]; - # 368 failed, 10889 passed, 978 skipped, 69 xfailed in 196.24s - # doCheck = false; + # infinite recursion with pytest-astropy (pytest-astropy-header depends on astropy itself) doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix index f7764149a663..8853b1e9e08d 100644 --- a/pkgs/development/python-modules/astroquery/default.nix +++ b/pkgs/development/python-modules/astroquery/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "astroquery"; - version = "0.4.1"; + version = "0.4.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0xpqrl9h7sg55mql38xsfpbz9rxsm3mxfha1biqyly1gmxpmd47a"; + sha256 = "20002f84b61fb11ceeae408a4cd23b379490e174054ec777f946df8a3f06be1b"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix index 8a5694ffde77..9dc412ccde86 100644 --- a/pkgs/development/python-modules/async-lru/default.nix +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -8,19 +8,19 @@ buildPythonPackage rec { pname = "async-lru"; - version = "unstable-2020-10-24"; + version = "unstable-2022-02-03"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = "async-lru"; - rev = "ae252508f9c5aecf9c02ddeb879d06c28dbffc42"; - sha256 = "1gk5qzdvhl2j1mw7xzchbw7bcgk9mzhvqa62nwwmvlbnx88pkwnc"; + rev = "3574af7691371015c47faf77e0abf8c7b06a3cdc"; + hash = "sha256-EsadpQlRNnebp0UUybzQwzyK4zwFlortutv3VTUsprU="; }; postPatch = '' - sed -i '/^addopts/d' setup.cfg + sed -i -e '/^addopts/d' -e '/^filterwarnings/,+2d' setup.cfg ''; checkInputs = [ diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 3f09521e34f2..1c818d2724ea 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,14 +14,16 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.23.1"; - disabled = pythonOlder "3.6"; + version = "0.23.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-m8oTqGbsJ99ImtnSlL4LX1qR0bUhGtVPPWmjsZfV6sE="; + sha256 = "sha256-fMlP8LX+OFiw6o1rpz8J0sEsACk5x9dQko1oGEaZFuc="; }; propagatedBuildInputs = [ @@ -59,7 +61,9 @@ buildPythonPackage rec { "test_deferred_callback_url" ]; - pythonImportsCheck = [ "async_upnp_client" ]; + pythonImportsCheck = [ + "async_upnp_client" + ]; meta = with lib; { description = "Asyncio UPnP Client library for Python"; diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix index dfbd0dbb9968..6f6da10a87f9 100644 --- a/pkgs/development/python-modules/async_generator/default.nix +++ b/pkgs/development/python-modules/async_generator/default.nix @@ -1,28 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy35, pytest, pytest-asyncio }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytest-asyncio +, pytestCheckHook +}: buildPythonPackage rec { - pname = "async_generator"; + pname = "async-generator"; version = "1.10"; disabled = pythonOlder "3.5"; src = fetchPypi { - inherit pname version; + pname = "async_generator"; + inherit version; sha256 = "6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"; }; - checkInputs = [ pytest pytest-asyncio ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; - checkPhase = '' - pytest -W error -ra -v --pyargs async_generator - ''; - - # disable tests on python3.5 to avoid circular dependency with pytest-asyncio - doCheck = !isPy35; + pythonImportsCheck = [ "async_generator" ]; meta = with lib; { description = "Async generators and context managers for Python 3.5+"; homepage = "https://github.com/python-trio/async_generator"; license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index ae8bacc94415..2a67ed1d6710 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "async-timeout"; - version = "4.0.1"; + version = "4.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uTDLFho5BC+SIvbvtzATmch+6rOUcn7FQ3kko21u71E="; + sha256 = "2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix index 324e4ec823a3..a01e9389f431 100644 --- a/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncio-dgram"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "jsbronder"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3K9VpX6JWCgz+Lx+5ZKqXG53B/uJCtI0x4pHy2pJdZg="; + sha256 = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index fd8a52f5a6ae..c0ae1cea95f7 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "asyncio-mqtt"; - version = "0.11.0"; + version = "0.12.1"; format = "setuptools"; src = fetchPypi { pname = "asyncio_mqtt"; inherit version; - sha256 = "sha256-uJown3bNA+pLJlorJcCjpMMFosX94gt/2tLAjIkuXLA="; + sha256 = "sha256-bb+FpF+U0m50ZUEWgK2jlHtQVG6YII1dUuegp+16fDg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncmy/default.nix b/pkgs/development/python-modules/asyncmy/default.nix index 4d4eaaacaad7..6b680b75dcef 100644 --- a/pkgs/development/python-modules/asyncmy/default.nix +++ b/pkgs/development/python-modules/asyncmy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asyncmy"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "long2ice"; repo = pname; rev = "v${version}"; - sha256 = "ys9RYaosc4noJsWYsVo9+6W7JaG4r6lsz6UH4o08q4A="; + sha256 = "sha256-nuk8Zh82qN60FrH6Jjv7RDDDQsfZ5EmbaQe5EAcB2Tk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 7ae4cb1b7898..7d28810380f0 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -1,14 +1,21 @@ -{ lib, isPy3k, fetchPypi, buildPythonPackage -, uvloop, postgresql }: +{ lib +, fetchPypi +, buildPythonPackage +, uvloop +, postgresql +, pythonOlder +}: buildPythonPackage rec { pname = "asyncpg"; version = "0.25.0"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "63f8e6a69733b285497c2855464a34de657f2cccd25aeaeeb5071872e9382540"; + hash = "sha256-Y/jmppczsoVJfChVRko03mV/LMzSWurutQcYcuk4JUA="; }; checkInputs = [ @@ -16,15 +23,17 @@ buildPythonPackage rec { postgresql ]; - pythonImportsCheck = [ "asyncpg" ]; + pythonImportsCheck = [ + "asyncpg" + ]; meta = with lib; { + description = "Asyncio PosgtreSQL driver"; homepage = "https://github.com/MagicStack/asyncpg"; - description = "An asyncio PosgtreSQL driver"; longDescription = '' Asyncpg is a database interface library designed specifically for PostgreSQL and Python/asyncio. asyncpg is an efficient, clean - implementation of PostgreSQL server binary protocol for use with Python’s + implementation of PostgreSQL server binary protocol for use with Python's asyncio framework. ''; license = licenses.asl20; diff --git a/pkgs/development/python-modules/asyncsleepiq/default.nix b/pkgs/development/python-modules/asyncsleepiq/default.nix new file mode 100644 index 000000000000..7eaac6490644 --- /dev/null +++ b/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -0,0 +1,37 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "asyncsleepiq"; + version = "1.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-pIfEdNmtnwA+PE3lXVd7Qd8Igj+/aqZmuDqFs60PxgY="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "asyncsleepiq" + ]; + + meta = with lib; { + description = "Async interface to SleepIQ API"; + homepage = "https://github.com/kbickar/asyncsleepiq"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 7cdfbb66b26b..3d00805537fe 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -1,31 +1,32 @@ { lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, cryptography , bcrypt -, gssapi +, buildPythonPackage +, cryptography +, fetchPypi , fido2 +, gssapi , libnacl , libsodium , nettle -, python-pkcs11 -, pyopenssl -, openssl , openssh +, openssl +, pyopenssl , pytestCheckHook +, python-pkcs11 +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "asyncssh"; - version = "2.8.1"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0648eba58d72653755f28e26c9bd83147d9652c1f2f5e87fbf5a87d7f8fbf83a"; + sha256 = "sha256-WF5JmDzHlXFB4D7p9IvRU2pepXFdCqHOnM4Ecobmaws="; }; propagatedBuildInputs = [ @@ -36,8 +37,9 @@ buildPythonPackage rec { libnacl libsodium nettle - python-pkcs11 pyopenssl + python-pkcs11 + typing-extensions ]; checkInputs = [ @@ -66,6 +68,8 @@ buildPythonPackage rec { "TestSKAuthCTAP2" # Requires network access "test_connect_timeout_exceeded" + # Fails in the sandbox + "test_forward_remote" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index 031c696f020f..47cd54405f86 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -8,15 +8,16 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.10.2"; - disabled = pythonOlder "3.7"; + version = "3.10.4"; format = "flit"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "maxfischer2781"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vjOhfEsAldTjROFUer1SgEX1KxnNM/WwtLsCB9ZV1WM="; + hash = "sha256-zPWXI5iHMCkSVjyNRcXplTadobYCeMv3Unjt+QVF8D8="; }; propagatedBuildInputs = [ @@ -27,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "asyncstdlib" ]; + pythonImportsCheck = [ + "asyncstdlib" + ]; meta = with lib; { description = "Python library that extends the Python asyncio standard library"; diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index 4bb201b251e9..a607fe965827 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -1,9 +1,9 @@ { lib -, aiodns , asynctest , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, python-socks , pythonOlder , tldextract , whodap @@ -11,7 +11,8 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "0.4.1"; + version = "1.0.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,11 +20,11 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mKKN2IuveOE+3mZGS5LFa15lJPA9y7KgLd0FoRuEMH0="; + hash = "sha256-9tSGfF/Ezuya4pEyr1XolWXvSO/F/UrobRVlyHITNTU="; }; propagatedBuildInputs = [ - aiodns + python-socks tldextract whodap ]; @@ -33,8 +34,13 @@ buildPythonPackage rec { pytestCheckHook ]; - # Disable tests that require network access + postPatch = '' + substituteInPlace setup.py \ + --replace "python-socks[asyncio]" "python-socks" + ''; + disabledTests = [ + # Tests require network access "test_pywhois_aio_get_hostname_from_ip" "test_pywhois_get_hostname_from_ip" "test_pywhois_aio_lookup_ipv4" @@ -44,9 +50,13 @@ buildPythonPackage rec { "test_from_whois_cmd" "test_get_hostname_from_ip" "test_whois_query_run" + "test_whois_query_create_connection" + "test_whois_query_send_and_recv" ]; - pythonImportsCheck = [ "asyncwhois" ]; + pythonImportsCheck = [ + "asyncwhois" + ]; meta = with lib; { description = "Python module for retrieving WHOIS information"; diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index 16e71a62ff4b..4ad71306789e 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -1,20 +1,32 @@ { lib +, asn1crypto , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "asysocks"; - version = "0.1.2"; + version = "0.1.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1hi9hzih265qlh7x32r5pbaqm9wkhm52yrdiksnd4gl5nrdgwcwv"; + sha256 = "sha256-I9X8+ucadYJsPteHvZsbw7GJ7DdliWG86DyemUVeNUw="; }; + propagatedBuildInputs = [ + asn1crypto + ]; + # Upstream hasn't release the tests yet doCheck = false; - pythonImportsCheck = [ "asysocks" ]; + + pythonImportsCheck = [ + "asysocks" + ]; meta = with lib; { description = "Python Socks4/5 client and server library"; diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index f148f34e00e9..468dac556614 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -7,29 +7,43 @@ , requests_oauthlib , six , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.18.0"; + version = "3.20.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "atlassian-api"; repo = pname; rev = version; - sha256 = "0akrwvq1f87lyckzwgpd16aljsbqjwwliv7j9czal7f216nbkvv6"; + sha256 = "sha256-yTRJz5zLt5eV+IHrVVLmVZnkbf0FBLM7CiCQ28X1cgc="; }; + propagatedBuildInputs = [ + deprecated + oauthlib + requests + requests_oauthlib + six + ]; + checkInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ deprecated oauthlib requests requests_oauthlib six ]; + pythonImportsCheck = [ + "atlassian" + ]; meta = with lib; { description = "Python Atlassian REST API Wrapper"; homepage = "https://github.com/atlassian-api/atlassian-python-api"; license = licenses.asl20; - maintainers = [ maintainers.arnoldfarkas ]; + maintainers = with maintainers; [ arnoldfarkas ]; }; } diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 8bf81556770a..16f0f0ddffd9 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -3,22 +3,27 @@ , fetchPypi , pytestCheckHook , pythonOlder +, pdm-pep517 , sybil , typing-extensions }: buildPythonPackage rec { pname = "atpublic"; - version = "2.3"; - format = "setuptools"; + version = "3.0.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d6b9167fc3e09a2de2d2adcfc9a1b48d84eab70753c97de3800362e1703e3367"; + sha256 = "bb072b50e6484490404e5cb4034e782aaa339fdd6ac36434e53c10791aef18bf"; }; + nativeBuildInputs = [ + pdm-pep517 + ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions ]; @@ -29,8 +34,7 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=public" "" + sed -i '/cov=public/d' pyproject.toml ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/augmax/default.nix b/pkgs/development/python-modules/augmax/default.nix new file mode 100644 index 000000000000..cda3ff5fbcd2 --- /dev/null +++ b/pkgs/development/python-modules/augmax/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, einops +, fetchFromGitHub +, jax +, jaxlib +, lib +}: + +buildPythonPackage rec { + pname = "augmax"; + version = "unstable-2022-02-19"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "khdlr"; + repo = pname; + # augmax does not have releases tagged. See https://github.com/khdlr/augmax/issues/5. + rev = "3e5d85d6921a1e519987d33f226bc13f61e04d04"; + sha256 = "046n43v7161w7najzlbi0443q60436xv24nh1mv23yw6psqqhx5i"; + }; + + propagatedBuildInputs = [ einops jax ]; + + # augmax does not have any tests at the time of writing (2022-02-19), but + # jaxlib is necessary for the pythonImportsCheckPhase. + checkInputs = [ jaxlib ]; + + pythonImportsCheck = [ "augmax" ]; + + meta = with lib; { + description = "Efficiently Composable Data Augmentation on the GPU with Jax"; + homepage = "https://github.com/khdlr/augmax"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/aurorapy/default.nix b/pkgs/development/python-modules/aurorapy/default.nix new file mode 100644 index 000000000000..17abcf0e9c47 --- /dev/null +++ b/pkgs/development/python-modules/aurorapy/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, future +, pyserial +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aurorapy"; + version = "0.2.6"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitLab { + owner = "energievalsabbia"; + repo = pname; + rev = version; + hash = "sha256-DMlzzLe94dbeHjESmLc045v7vQ//IEsngAv7TeVznHE="; + }; + + propagatedBuildInputs = [ + future + pyserial + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aurorapy" + ]; + + meta = with lib; { + description = "Implementation of the communication protocol for Power-One Aurora inverters"; + homepage = "https://gitlab.com/energievalsabbia/aurorapy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/autarco/default.nix b/pkgs/development/python-modules/autarco/default.nix new file mode 100644 index 000000000000..7ff630376c06 --- /dev/null +++ b/pkgs/development/python-modules/autarco/default.nix @@ -0,0 +1,59 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "autarco"; + version = "0.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "klaasnicolaas"; + repo = "python-autarco"; + rev = "v${version}"; + hash = "sha256-ID1lCGfF6XHVv8Azd34a30hcsX17uMXo22stAhYH1Uo="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + pythonImportsCheck = [ + "autarco" + ]; + + meta = with lib; { + description = "Module for the Autarco Inverter"; + homepage = "https://github.com/klaasnicolaas/python-autarco"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 224b8bec4015..c6886dc8bed7 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -4,16 +4,20 @@ , mock , pyjwt , pytestCheckHook +, pythonOlder , requests }: buildPythonPackage rec { pname = "auth0-python"; - version = "3.19.0"; + version = "3.22.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "ed33557f252cf8b022b788ebd2b851c681979f200171498acde2b92d760db026"; + sha256 = "sha256-05yJbF6eXz+vJx+plY5gqzRRYL2SjDnF7gSfX6WIS4E="; }; propagatedBuildInputs = [ @@ -33,7 +37,9 @@ buildPythonPackage rec { "test_options_are_used_and_override" ]; - pythonImportsCheck = [ "auth0" ]; + pythonImportsCheck = [ + "auth0" + ]; meta = with lib; { description = "Auth0 Python SDK"; diff --git a/pkgs/development/python-modules/autopage/default.nix b/pkgs/development/python-modules/autopage/default.nix index 9a2ca722a62b..0bb5c09f4104 100644 --- a/pkgs/development/python-modules/autopage/default.nix +++ b/pkgs/development/python-modules/autopage/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "autopage"; - version = "0.4.0"; + version = "0.5.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "18f511d8ef2e4d3cc22a986d345eab0e03f95b9fa80b74ca63b7fb001551dc42"; + sha256 = "sha256-UwW0PMB5gXDXEk5aL+7Plp5F9KC691yzUROBFOr3a4M="; }; pythonImportsCheck = [ "autopage" ]; diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index f99407030cdd..f74a6af84757 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -1,14 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub +, poetry-core , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "awesomeversion"; - version = "21.11.0"; - format = "setuptools"; + version = "22.2.0"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,19 +17,23 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-qxN5AdLlzadG0/raeAyJ/37PLgYLndl1JQSVkgdLv/4="; + sha256 = "sha256-FlJrk/PH3nBLakQfS+ruDwAPH/oo16JcfrtVRFgbUXY="; }; - postPatch = '' - # Upstream doesn't set a version - substituteInPlace setup.py \ - --replace "main" ${version} - ''; + nativeBuildInputs = [ + poetry-core + ]; checkInputs = [ pytestCheckHook ]; + postPatch = '' + # Upstream doesn't set a version + substituteInPlace pyproject.toml \ + --replace 'version = "0"' 'version = "${version}"' + ''; + pythonImportsCheck = [ "awesomeversion" ]; diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index f1152da2d1d4..2b3b1e4ce8c1 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "e4e642dfe496d2acb245c90e37dc18028e25d5e936421e7371ea6ba0fde6435a"; + sha256 = "sha256-ZlX6ItGx0dy5zO4NUCNQq5DFNGehC1QLdiRCK1lNLnI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index b127ad2410e5..0aac1e71e7c4 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -2,32 +2,29 @@ , buildPythonPackage , fetchFromGitHub , six -, pathlib , pytest , mock , parameterized -, isPy27 -, isPy35 +, pythonOlder }: buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.10.0"; + version = "1.14.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "0nrqxgl24c6lknxhmmf7vkhvdy54dhnr9qcm1r1gwxzdsymq2l54"; + sha256 = "sha256-ypzo0cYvP8LV74cQMzHIFDk3LH0bbEB4UxPxRuqe2fc="; }; - # Package is not compatible with Python 3.5 - disabled = isPy35; - propagatedBuildInputs = [ six - ] ++ lib.optionals isPy27 [ pathlib ]; + ]; checkInputs = [ pytest diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 4ca5df17109f..ca01e35a3c55 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -1,7 +1,6 @@ { lib , boto3 , buildPythonPackage -, enum34 , fetchFromGitHub , jsonschema , mock @@ -15,6 +14,9 @@ buildPythonPackage rec { pname = "aws-sam-translator"; version = "1.42.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aws"; @@ -27,11 +29,11 @@ buildPythonPackage rec { boto3 jsonschema six - ] ++ lib.optionals (pythonOlder "3.4") [ - enum34 ]; postPatch = '' + substituteInPlace requirements/base.txt \ + --replace "jsonschema~=3.2" "jsonschema>=3.2" substituteInPlace pytest.ini \ --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" ''; @@ -43,7 +45,14 @@ buildPythonPackage rec { pyyaml ]; - pythonImportsCheck = [ "samtranslator" ]; + disabledTests = [ + # AssertionError: Expected 7 errors, found 9: + "test_errors_13_error_definitionuri" + ]; + + pythonImportsCheck = [ + "samtranslator" + ]; meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index a8cc3a34f94a..77c67e5a2aed 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -1,30 +1,56 @@ -{ lib, buildPythonPackage, fetchPypi, cmake, perl, stdenv, gcc10, CoreFoundation, Security }: +{ lib +, buildPythonPackage +, fetchPypi +, cmake +, perl +, stdenv +, gcc10 +, CoreFoundation +, Security +, pythonOlder +}: buildPythonPackage rec { pname = "awscrt"; - version = "0.13.0"; + version = "0.13.6"; + format = "setuptools"; - buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-aZ1Mquc4IfrdWjOaHMipjNb6gLGGbdKS8ah5b33eqGo="; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ + CoreFoundation + Security + ]; # Required to suppress -Werror # https://github.com/NixOS/nixpkgs/issues/39687 - hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; + hardeningDisable = lib.optionals stdenv.cc.isClang [ + "strictoverflow" + ]; - nativeBuildInputs = [ cmake ] ++ - # gcc <10 is not supported, LLVM on darwin is just fine - lib.optionals (!stdenv.isDarwin && stdenv.isAarch64) [ gcc10 perl ]; + # gcc <10 is not supported, LLVM on darwin is just fine + nativeBuildInputs = [ + cmake + ] ++ lib.optionals (!stdenv.isDarwin && stdenv.isAarch64) [ + gcc10 + perl + ]; dontUseCmakeConfigure = true; + pythonImportsCheck = [ + "awscrt" + ]; + # Unable to import test module # https://github.com/awslabs/aws-crt-python/issues/281 doCheck = false; - src = fetchPypi { - inherit pname version; - sha256 = "f8c46335bdf94a5e48d3df2018edbd07c4c903635501c62c1bea4153f407531a"; - }; - meta = with lib; { homepage = "https://github.com/awslabs/aws-crt-python"; description = "Python bindings for the AWS Common Runtime"; diff --git a/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/pkgs/development/python-modules/awsiotpythonsdk/default.nix index 70161d3fd6a0..fc188ae683c6 100644 --- a/pkgs/development/python-modules/awsiotpythonsdk/default.nix +++ b/pkgs/development/python-modules/awsiotpythonsdk/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "AWSIoTPythonSDK"; - version = "1.5.0"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-iot-device-sdk-python"; rev = "v${version}"; - sha256 = "0bmvwv471mvlwj2rfz08j9qvzsp4vyjz67cbzkvsy6kmihx3wfqh"; + sha256 = "sha256-UpfgoCVbweOpWbgaqNebAAkWmhjkZu3txVoTZ/qhl3g="; }; # Module has no tests diff --git a/pkgs/development/python-modules/azure-applicationinsights/default.nix b/pkgs/development/python-modules/azure-applicationinsights/default.nix index e43e37720217..f3f395b6f78e 100644 --- a/pkgs/development/python-modules/azure-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-applicationinsights/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-applicationinsights"; - version = "0.1.0"; + version = "0.1.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6e1839169bb6ffd2d2c21ee3f4afbdd068ea428ad47cf884ea3167ecf7fd0859"; + sha256 = "sha256-qIRbgDZbfyALrR9xqA0NMfO+wB7f1GfftsE+or1xupY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix index 9202919ae6dd..9a39aa70c64f 100644 --- a/pkgs/development/python-modules/azure-batch/default.nix +++ b/pkgs/development/python-modules/azure-batch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-batch"; - version = "11.0.0"; + version = "12.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ce5fdb0ec962eddfe85cd82205e9177cb0bbdb445265746e38b3bbbf1f16dc73"; + sha256 = "sha256-GpseF4mEp79JWvZ7zOUfDbHkqKlXr7KeM1VKFKlnTes="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-containerregistry/default.nix b/pkgs/development/python-modules/azure-containerregistry/default.nix new file mode 100644 index 000000000000..bc1aaf5f8bd1 --- /dev/null +++ b/pkgs/development/python-modules/azure-containerregistry/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, azure-core +, msrest +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-containerregistry"; + version = "1.0.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-DIZCHZM5aeKtmJrgwAk5J26ltaxNxKUn3rR+FbmuyZc="; + extension = "zip"; + }; + + propagatedBuildInputs = [ azure-core msrest msrestazure ]; + + # tests require azure-devtools which are not published (since 2020) + # https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/containerregistry/azure-containerregistry/dev_requirements.txt + doCheck = false; + + pythonImportsCheck = [ "azure.core" "azure.containerregistry" ]; + + meta = with lib; { + description = "Microsoft Azure Container Registry client library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/containerregistry/azure-containerregistry"; + license = licenses.mit; + maintainers = with maintainers; [ peterromfeldhk ]; + }; +} diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 9a128d813489..b7d330e6eff9 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 , aiodns , aiohttp , flask @@ -51,7 +51,18 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/" ]; # disable tests which touch network - disabledTests = [ "aiohttp" "multipart_send" "response" "request" "timeout" ]; + disabledTests = [ + "aiohttp" + "multipart_send" + "response" + "request" + "timeout" + # disable 8 tests failing on some darwin machines with errors: + # azure.core.polling.base_polling.BadStatus: Invalid return status 403 for 'GET' operation + # azure.core.exceptions.HttpResponseError: Operation returned an invalid status 'Forbidden' + ] ++ lib.optional stdenv.isDarwin [ + "location_polling_fail" + ]; disabledTestPaths = [ # requires testing modules which aren't published, and likely to create cyclic dependencies "tests/test_connection_string_parsing.py" diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index 2013bc645450..ea0696e294a0 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7f22cd0c7a9b92ed297dd67ae79d9bb9a866e404061c02cec709ad10c4c88e19"; + sha256 = "sha256-Ag/w5HFXhS5KrIo62waEGCcUfyepTL50qQRCXY5i2Tw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/pkgs/development/python-modules/azure-keyvault-administration/default.nix index 788eaf70457d..838572d064ee 100644 --- a/pkgs/development/python-modules/azure-keyvault-administration/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-administration/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "azure-keyvault-administration"; - version = "4.0.0"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b05a0372f35921cedb7a231426077745eee9a65881088de6d4d8b73d9709a6cb"; + sha256 = "sha256-V8tppRExyvSt41nN+j2QoxGSund6RKvE4g5p6AWZ3qI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index f1a6c5359d6b..4dba9f408b8d 100644 --- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -5,16 +5,20 @@ , azure-core , msrest , msrestazure +, pythonOlder }: buildPythonPackage rec { pname = "azure-keyvault-certificates"; - version = "4.3.0"; + version = "4.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "4e0a9bae9fd4c222617fbce6b31f97e2e0622774479de3c387239cbfbb828d87"; + hash = "sha256-DAFU84AbI4Tdf6TtYDZvSwrpERxf/MqHjQU2igBLh88="; }; propagatedBuildInputs = [ @@ -24,11 +28,16 @@ buildPythonPackage rec { msrestazure ]; - pythonNamespaces = [ "azure.keyvault" ]; + pythonNamespaces = [ + "azure.keyvault" + ]; # has no tests doCheck = false; - pythonImportsCheck = [ "azure.keyvault.certificates" ]; + + pythonImportsCheck = [ + "azure.keyvault.certificates" + ]; meta = with lib; { description = "Microsoft Azure Key Vault Certificates Client Library for Python"; diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 59fcef4d4bf1..8ce81bc3d616 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, isPy27, fetchPypi +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi , aiohttp , azure-common , azure-core @@ -9,13 +12,15 @@ buildPythonPackage rec { pname = "azure-keyvault-keys"; - version = "4.4.0"; - disabled = isPy27; + version = "4.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7792ad0d5e63ad9eafa68bdce5de91b3ffcc7ca7a6afdc576785e6a2793caed0"; + hash = "sha256-x1AhiARXZXcky3A+DJXoCrvkqsonlkgdrdr6es/VY3s="; }; propagatedBuildInputs = [ @@ -25,11 +30,17 @@ buildPythonPackage rec { cryptography ]; - pythonNamespaces = [ "azure.keyvault" ]; + checkInputs = [ + aiohttp + pytestCheckHook + ]; + + pythonNamespaces = [ + "azure.keyvault" + ]; # requires relative paths to utilities in the mono-repo doCheck = false; - checkInputs = [ aiohttp pytestCheckHook ]; pythonImportsCheck = [ "azure" diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index 78f7f20e469e..1323fdb94db4 100644 --- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , azure-common , azure-core , msrest @@ -6,13 +9,15 @@ buildPythonPackage rec { pname = "azure-keyvault-secrets"; - version = "4.3.0"; - disabled = isPy27; + version = "4.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "26279ba3a6c727deba1fb61f549496867baddffbf062bd579d6fd2bc04e95276"; + hash = "sha256-wLcy253oVdnDl2YGfPQ+L2bNuyi4WfA8eH4zkkzKgtc="; }; propagatedBuildInputs = [ @@ -21,7 +26,9 @@ buildPythonPackage rec { msrest ]; - pythonNamespaces = [ "azure.keyvault" ]; + pythonNamespaces = [ + "azure.keyvault" + ]; # requires checkout from mono-repo doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 545eef7f6d89..78605fd429c2 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-applicationinsights"; - version = "2.0.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c5f831ff09573247579c0dabe7854324620d176143b28cc4ef2e71ca49791dcc"; + sha256 = "sha256-K46J0WqQt4vwr1CE4yjxKUT/Atds5BLs0k8EjOA4yzA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-batch/default.nix b/pkgs/development/python-modules/azure-mgmt-batch/default.nix index c153534cc642..421f068aa13e 100644 --- a/pkgs/development/python-modules/azure-mgmt-batch/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batch/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-batch"; - version = "16.0.0"; + version = "16.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1b3cecd6f16813879c6ac1a1bb01f9a6f2752cd1f9157eb04d5e41e4a89f3c34"; + sha256 = "sha256-9J0VQ3uAsi4kuEe9UG4xpcEV1Sc+nkjECgVfzG7j5jk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index ca662f6b1455..af3a30a117fd 100644 --- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "11.0.0"; + version = "12.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907"; + sha256 = "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index 08b810f752d1..ea12d27e56bc 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -3,28 +3,30 @@ , fetchPypi , azure-common , azure-mgmt-core -, azure-mgmt-nspkg , msrestazure +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "13.0.0"; + version = "13.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "dc6116e8394d45312c7ad5a9098ce0dd2370bd92d43afd33d8b3bfab724fa498"; + hash = "sha256-FXS834v5uDGiEGcQMIv9iaHxhfcW9uY3VmX7l91Tfj4="; }; propagatedBuildInputs = [ msrestazure azure-common azure-mgmt-core - azure-mgmt-nspkg ]; - # has no tests + # Module has no tests doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index c9de9f9f47b9..3dbb8f5a87ab 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "24.0.1"; + version = "26.1.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "283195339ef6ba1181dbc866ebede8b06ffdfe09eb86c25a04e1c8059d654f6e"; + sha256 = "sha256-K63nT8sx2PCIFhc+1eCAs/ItESbv9xA+8GDn2hZCJHU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index 8afcde620194..fae7318cd486 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "9.0.0"; + version = "9.1.0"; pname = "azure-mgmt-containerregistry"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9f6c5894d32ba696527ecf0ff155bb43c325dff6a11a6de60cd22ea3f5fb180d"; + sha256 = "sha256-jkzGLDqrJgwCnz27lGzFk4d2q+j0P+PU8uUVGQg7MkA="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index b9e75eca44c3..00e24a2d9f18 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -6,17 +6,20 @@ , azure-common , azure-mgmt-core , azure-mgmt-nspkg -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "16.4.0"; + version = "18.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "23a8047668ebd1fa7c3c2445eba4e69c07675306e2a94ae6a3e455df162bd008"; + sha256 = "sha256-b4AwcnSp6JOtG8VaBbUN7d/NIhHN2TPnyjzCUVhMOzg="; }; propagatedBuildInputs = [ @@ -24,14 +27,14 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; # has no tests doCheck = false; - pythonImportsCheck = [ "azure.mgmt.containerservice" ]; + pythonImportsCheck = [ + "azure.mgmt.containerservice" + ]; meta = with lib; { description = "This is the Microsoft Azure Container Service Management Client Library"; diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index bfd0b6196954..eed367c2206d 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bc2560b4de1528292883b53a337b89f04a5ceab7c3500b6bc388e3a77ff093cc"; + sha256 = "sha256-pjBjFPkKhKd8XI6wmzX/rAssHINMzDAZa+XRqG/pLYo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index 029a10251823..ea5fbd1c1020 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f"; + sha256 = "sha256-nsAeVhs5N8bpwYenmRwJmqF/IAqz/ulSoYIeOU5l0eM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index 39f09b28241c..dfd8581af1aa 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothubprovisioningservices"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9"; + sha256 = "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index eeec10b5eade..26bc4064fb26 100644 --- a/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.1.0"; + version = "2.2.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "171ea8719f543bd0dd4f3d6fa2277162d763182fe8e61b4db03f02668c1685b5"; + sha256 = "sha256-A369Y5cqKthMz43QUvWQHq5ggz93plGObl7K4xnUdnc="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index fae47547cc74..66818ce5b056 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -1,22 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k +, pythonOlder , msrest , msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "3.0.0"; + version = "3.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "91ddb7333bf2b9541a53864cc8d2501e3694a03a9c0e41cbfae3348558675ce6"; + hash = "sha256-ROcUAm0KgIjO2A2XBpS00IeEPgd8x4cjoMfn6X9C+Gw="; }; propagatedBuildInputs = [ @@ -24,13 +26,13 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; - pythonNamespaces = [ "azure.mgmt" ]; + pythonNamespaces = [ + "azure.mgmt" + ]; - # has no tests + # Module has no tests doCheck = false; meta = with lib; { diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index edf8057e503c..8c2ec661f8c1 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , azure-common , azure-mgmt-core , msrest @@ -6,13 +9,14 @@ }: buildPythonPackage rec { - version = "6.0.1"; pname = "azure-mgmt-netapp"; - disabled = isPy27; + version = "7.0.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6ce683587be1638d8d77620b7af118060b8b7dfc4fd23d46a623a66edcb388e1"; + hash = "sha256-ziaddG+6MoPG18OYZyQ9HRx8nfGsz2UbWPC1pWacKto="; extension = "zip"; }; @@ -26,7 +30,10 @@ buildPythonPackage rec { # no tests included doCheck = false; - pythonImportsCheck = [ "azure.common" "azure.mgmt.netapp" ]; + pythonImportsCheck = [ + "azure.common" + "azure.mgmt.netapp" + ]; meta = with lib; { description = "Microsoft Azure NetApp Files Management Client Library for Python"; diff --git a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix index 626a60d7c998..68cf99fa0d4a 100644 --- a/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-rdbms/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-rdbms"; - version = "10.0.0"; + version = "10.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bdc479b3bbcac423943d63e746a81dd5fc80b46a4dbb4393e760016e3fa4f74a"; + sha256 = "sha256-qH1AHIdshHNM3UiIr1UeShRhtLMo2YFq9gy4rFl58DU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 0d3a4bfb2b33..5baf84c1c394 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "4.0.0"; + version = "4.1.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a848ac1d99c935e61dfb91ca3e1577904a3eff5820fce179eb6937df8e1019ec"; + sha256 = "sha256-9xF2TIAzydmviOwfveA0ZGP7Qj0HWLL6rXp4V4IDS6A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 5166c8ead8e4..761472b631ff 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { - version = "20.0.0"; + version = "21.0.0"; pname = "azure-mgmt-resource"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "622dca4484be64f9f5ce335d327dffabf3e71e14e8a3f4a1051dc85a5c3ebbca"; + sha256 = "sha256-y9J/UhxwtA/YO/Y88XsStbwD5ecNwrbnpxtevYuQDQM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix index 7abb6250ac61..baa318bba461 100644 --- a/pkgs/development/python-modules/azure-mgmt-signalr/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-signalr/default.nix @@ -5,17 +5,20 @@ , msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-signalr"; - version = "1.0.0"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "43fe90b5c5eb5aa00afcaf2895f1d4417f89ddb7f76bd61204e1253a6767ef7c"; + hash = "sha256-lUNIDyP5W+8aIX7manfMqaO2IJJm/+2O+Buv+Bh4EZE="; }; propagatedBuildInputs = [ @@ -23,7 +26,6 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - azure-mgmt-nspkg ]; # has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index ed5b19bd80d6..cd7e96049d1f 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { - version = "19.0.0"; + version = "19.1.0"; pname = "azure-mgmt-storage"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f05963e5a8696d0fd4dcadda4feecb9b382a380d2e461b3647704ac787d79876"; + sha256 = "sha256-Seoi8A4JZaNVCvNKQcGh06SBaQ9lAMeOhUCIAvVtdBY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index ad7930016ab0..cd19e88e9bd0 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "6.0.0"; + version = "6.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a58750df23d5d4cb8eff283a93312e933ee3ef4272324576005c3dc8c22ce944"; + sha256 = "c26635089276515b0488fcf014aab50a0446f54800c6e0e5583cc493ac8d738f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index ea6f47183abb..9bafac41ef33 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.8.0"; pname = "azure-multiapi-storage"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "cd4f184be8c9ca8aca969f93ed50dc7fe556d28ca11520440fc182cf876abdf9"; + sha256 = "sha256-ZRiqnxPRdSOqyRMwuvxqKiZcxMbhVEYJ09CIlepc/B4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 8d3bb5aca3e8..a64ba934887c 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.9.0"; + version = "12.11.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "cff66a115c73c90e496c8c8b3026898a3ce64100840276e9245434e28a864225"; + sha256 = "sha256-SVNbMZC7adDZ/3o4MkaxTaTSsb3/YMrl+Rc5IMZ8p+4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 421b46a9948f..c7c59fd2b9f4 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.6.0"; + version = "12.7.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7eb0cde00fbbb6b780da8bdd81312ab79de706c4a2601e4eded1bc430da680a8"; + sha256 = "sha256-kYNugiWNlXEgryKLwrzytca/W+2481RqqUCbdJWrqDI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index b24417b325ab..5a83385b7541 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "79eb973280ea89c0e6e2872d8f3f175b172b7438c2e2b9b4e655ae206be705fa"; + sha256 = "sha256-IfQWsITuThzh+TRgv99JTtcDFY3gMq5PjALkN4mJEZo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 5f9eb41bf821..2adc8b784f10 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , fetchPypi , importlib-metadata -, isPy27 , logfury , pytestCheckHook , pytest-lazy-fixture @@ -16,12 +15,14 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.14.0"; - disabled = isPy27; + version = "1.14.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "900da60f9e569e02405b85db35541a79e1cac776ace5d054498b107982ea443c"; + hash = "sha256-fYOeyhKm9mRT61NcQVaXFKeRC8AS9lfIZMO/s6iFaeg="; }; nativeBuildInputs = [ @@ -65,5 +66,6 @@ buildPythonPackage rec { description = "Client library and utilities for access to B2 Cloud Storage (backblaze)"; homepage = "https://github.com/Backblaze/b2-sdk-python"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 21920c32b4d2..680d23782f56 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -3,10 +3,7 @@ , fetchPypi , setuptools-scm , isPy3k -, pytest -, pytest-black -, pytest-flake8 -, pytest-cov +, pytestCheckHook }: buildPythonPackage rec { @@ -20,12 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytest pytest-flake8 pytest-black pytest-cov ]; - # ironically, they fail a linting test, and pytest.ini forces that test suite - checkPhase = '' - rm backports/functools_lru_cache.py - pytest -k 'not format' - ''; + checkInputs = [ pytestCheckHook ]; # Test fail on Python 2 doCheck = isPy3k; diff --git a/pkgs/development/python-modules/bandit/default.nix b/pkgs/development/python-modules/bandit/default.nix index 03a4c80856d8..cf1bbd9c54aa 100644 --- a/pkgs/development/python-modules/bandit/default.nix +++ b/pkgs/development/python-modules/bandit/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "bandit"; - version = "1.7.1"; + version = "1.7.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a81b00b5436e6880fa8ad6799bc830e02032047713cbb143a12939ac67eb756c"; + sha256 = "sha256-LWOoxXNBe64ziWLUubBvvGCA907NlVoJKEnh5lxxe9I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index c3d29d932442..30ca58fed319 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "basemap"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "matplotlib"; repo = "basemap"; - rev = "v${version}rel"; - sha256 = "13lw1iwa8hadpvqdgb06nh881l8c17awzvvwbfwblvb9q9s0lnzp"; + rev = "v${version}"; + sha256 = "0nwpd6zx2q2fc556ppz71ra6ad9z0d5bz8hcld64i91dcy0f0zs3"; }; propagatedBuildInputs = [ numpy matplotlib pillow pyproj pyshp six ]; diff --git a/pkgs/development/python-modules/bc-python-hcl2/default.nix b/pkgs/development/python-modules/bc-python-hcl2/default.nix index e889fff9688a..78529e288ca2 100644 --- a/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -1,29 +1,21 @@ { lib , buildPythonPackage , fetchPypi +, lark , nose +, pythonOlder }: -let - lark-parser = buildPythonPackage rec { - pname = "lark-parser"; - version = "0.10.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "15jr4c1falvgkq664xdgamykk6waklh1psy8v3wlrg0v59hngws2"; - }; - - doCheck = true; - }; -in buildPythonPackage rec { pname = "bc-python-hcl2"; - version = "0.3.24"; + version = "0.3.33"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YsiMkTPRSKR4511csJOv9/Jf1b3TVUM7N2lInejdNrQ="; + hash = "sha256-tdsw9gf64VGH9tRWgYZZq3FNa5B5JNhN3k6wUHrU5zY="; }; # Nose is required during build process, so can not use `checkInputs`. @@ -32,7 +24,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - lark-parser + lark ]; # This fork of python-hcl2 doesn't ship tests diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 665fd6806bfa..d4ced793f830 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { - version = "2.3.4"; + version = "2.3.5"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-K/CM5qldmAAPTXM5WYXNHeuBwNUu1aduYQusd9gvhsA="; + sha256 = "sha256-FONWJaLpy9Q8rmF42gjLPxIk9iYeVBymcm3zXZjpw2o="; }; # Tests require files not included in the PyPI archive. diff --git a/pkgs/development/python-modules/beancount_docverif/default.nix b/pkgs/development/python-modules/beancount_docverif/default.nix index 44ebb5d94f01..b39b52970f01 100644 --- a/pkgs/development/python-modules/beancount_docverif/default.nix +++ b/pkgs/development/python-modules/beancount_docverif/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.0.1"; pname = "beancount_docverif"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1kjc0axrxpvm828lqq5m2ikq0ls8xksbmm7312zw867gdx56x5aj"; + sha256 = "sha256-CFBv1FZP5JO+1MPnD86ttrO42zZlvE157zqig7s4HOg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix new file mode 100644 index 000000000000..8aeda35741cf --- /dev/null +++ b/pkgs/development/python-modules/beartype/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "beartype"; + version = "0.10.4"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JOxp9qf05ul69APQjeJw3vMkhRgGAycJXSOxxN9kvyo="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "beartype" + ]; + + meta = with lib; { + description = "Fast runtime type checking for Python"; + homepage = "https://github.com/beartype/beartype"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index 4b5ebc912b24..f59e6418fe91 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "bidict"; - version = "0.21.4"; + version = "0.22.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QshP++b43omK9gc7S+nqfM7c1400dKqETFTknVoHn28="; + sha256 = "sha256-XIJrPhXpfMbmFd4pV1aEfCgqebecVDDTv8kJsayfW9g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 49952b4f5f17..05dd93ffa032 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.8.9"; + version = "1.9.3"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "01fcb5a8fe6de1280cdfd5b37715103ffa0bafb3c739ca7f5ffc41e46549612e"; + sha256 = "sha256-ATJi4eCWV0i3Z8AsgV/DtiCn8Qzi2cMDtId5jXCoDL0="; }; # needs packages which are not available in nixpkgs diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 0f6334d27926..8f754b213e81 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.8.10"; + version = "0.8.11"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = version; - hash = "sha256-xt21mcXcucUhJlqwDLrAHvQLg9++uc/cX5Sy+Sppsbo="; + hash = "sha256-Ufx9Tl0PmV3AEig3UvejJBVxhewzPN6IRsji5MzVxG8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 112f12e5f25b..a63df0d7d399 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -21,7 +21,7 @@ , visualizationSupport ? false }: buildPythonPackage rec { - pname = "binwalk"; + pname = "binwalk${lib.optionalString visualizationSupport "-full"}"; version = "2.3.3"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index 3d3c85eea3b4..a4430b655ce1 100644 --- a/pkgs/development/python-modules/bip_utils/default.nix +++ b/pkgs/development/python-modules/bip_utils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bip_utils"; - version = "1.11.1"; + version = "2.1.0"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = pname; rev = "v${version}"; - sha256 = "0r8h979rklq7cvl0b449mfrx62dv367s31zgwfqn81kj72i3ndg4"; + sha256 = "1n677z6rvcny1vyfzwnvcmzbqp9m4kfpdjfvkf1q6310zr2ybp7m"; }; propagatedBuildInputs = [ ecdsa pysha3 ]; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 9372248fede1..be7f69fbd8dc 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.3.5"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "60285184cb02fdba5e1cc8605ac84e150a50f940e9383ab43564e5258d1f47bb"; + sha256 = "sha256-8SA+kC1R3zGRfXfuupw/540DKHOirXjHN+JkIPAIDlg="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bitlist/default.nix b/pkgs/development/python-modules/bitlist/default.nix index dcb83d1ca2a7..c96c2e8707b7 100644 --- a/pkgs/development/python-modules/bitlist/default.nix +++ b/pkgs/development/python-modules/bitlist/default.nix @@ -4,16 +4,19 @@ , nose , parts , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "bitlist"; - version = "0.6.2"; + version = "0.7.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "69cf632ca61b5fb5d2fd7587ddf023bcab8f327302f15070ec9079b68df9082a"; + sha256 = "sha256-p3Gws48u1/AzltbtPyWvSX4O0u4MgSXiVq4GstpPCCg="; }; propagatedBuildInputs = [ @@ -29,6 +32,11 @@ buildPythonPackage rec { "bitlist" ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=bitlist --cov-report term-missing" "" + ''; + meta = with lib; { description = "Python library for working with little-endian list representation of bit strings"; homepage = "https://github.com/lapets/bitlist"; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 13f05fa61365..064fe8187edc 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -1,8 +1,12 @@ -{ stdenv, lib -, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, pytestCheckHook +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +, pytestCheckHook , aiohttp , aiohttp-cors -, attrs , click , colorama , dataclasses @@ -19,13 +23,13 @@ buildPythonPackage rec { pname = "black"; - version = "21.12b0"; + version = "22.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-d7gPaTpWni5SeVhFljTxjfmwuiYluk4MLV2lvkLm8rM="; + hash = "sha256-p8AZLTVjX2/BF0vldct5FekuXdYp7nn9rw3PpBqAr7U="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -61,17 +65,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp aiohttp-cors - attrs click colorama mypy-extensions pathspec platformdirs tomli - typed-ast # required for tests and python2 extra uvloop - ] ++ lib.optional (pythonOlder "3.7") dataclasses - ++ lib.optional (pythonOlder "3.8") typing-extensions; + ] ++ lib.optional (pythonOlder "3.8") typed-ast + ++ lib.optional (pythonOlder "3.10") typing-extensions; meta = with lib; { description = "The uncompromising Python code formatter"; diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 431edac75dfa..7db587ed58be 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.14.0"; + version = "0.14.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b449cc63f769c2d219c67e23ffb9f3a5b5f23eb2d68d05878743dbed83a14360"; + sha256 = "1fkq8q54s9apqiamdd8vgrhk5p02w5w281q93dfnrd37xv7ysk6h"; }; postPatch = '' diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 572dbad932b3..ae509418b7b1 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -5,17 +5,22 @@ , python-slugify , requests , pytestCheckHook +, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "blinkpy"; - version = "0.18.0"; + version = "0.19.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fronzbot"; repo = "blinkpy"; rev = "v${version}"; - hash = "sha256-96HoGXVQE5PbUbu0oDOC0es0HXYig4ScTeexiUhGse4="; + hash = "sha256-niUGfktP1zVdrRCDy81ou4yAoscnYveHje9423IKcso="; }; propagatedBuildInputs = [ @@ -38,6 +43,12 @@ 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"; diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 6f0370f044c6..be41b2acb87c 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "blis"; - version = "0.7.5"; + version = "0.7.7"; src = fetchPypi { inherit pname version; - sha256 = "833e01e9eaff4c01aa6e049bbc1e6acb9eca6ee513d7b35b5bf135d49705ad33"; + sha256 = "sha256-XUqB+UONt6GayOZK1BMx9lplnqjzuxiJqcIIjP2f4QQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/blspy/default.nix b/pkgs/development/python-modules/blspy/default.nix index 1c491cb5de0f..aac2c2b97391 100644 --- a/pkgs/development/python-modules/blspy/default.nix +++ b/pkgs/development/python-modules/blspy/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "blspy"; - version = "1.0.8"; + version = "1.0.9"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yKLirwWWeUTs5BFXZfqfuNJUXtQW40EiNPxuP+FeHso="; + hash = "sha256-6keimQqwh37G9xc1Xyxlr+0n9Qgv87Np2D7Gzj6ik5Y="; }; patches = [ diff --git a/pkgs/development/python-modules/bme280spi/default.nix b/pkgs/development/python-modules/bme280spi/default.nix new file mode 100644 index 000000000000..a7a1e0fb920e --- /dev/null +++ b/pkgs/development/python-modules/bme280spi/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, spidev +}: + +buildPythonPackage rec { + pname = "bme280spi"; + version = "0.2.0"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "51682acefda6f29eaaf9f37815edbfdd48ef0e9f1509419eceafe7b440eddc6e"; + }; + + propagatedBuildInputs = [ + spidev + ]; + + # no tests implemented + doCheck = false; + + meta = with lib; { + description = "Library for BME280 sensor through spidev"; + homepage = "https://github.com/Kuzj/bme280spi"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index f80a8deb9ab4..e697d97fea78 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "20.7.1"; + version = "22.3.2"; pname = "BoltzTraP2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "41caa32e5778323471d87033f23537f6178a7aea64fba894c7f2b2579b51f7ed"; + sha256 = "sha256-Yo37xdXxCQKkA+lrFEZp1DxjJy216Q6aYYT68PEx9JU="; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index f428dc788bf9..109487b88b94 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -1,17 +1,20 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark }: +{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark, setuptools-scm }: buildPythonPackage rec { pname = "boost-histogram"; - version = "1.2.1"; + version = "1.3.1"; disabled = !isPy3k; src = fetchPypi { pname = "boost_histogram"; inherit version; - sha256 = "a27842b2f1cfecc509382da2b25b03056354696482b38ec3c0220af0fc9b7579"; + sha256 = "sha256-Mc05Zlbzo3g04H0wTNuE2ZBrwhcmJqPZL+V30IvPQQ8="; }; + nativeBuildInputs = [ setuptools-scm ]; + buildInputs = [ boost ]; + propagatedBuildInputs = [ numpy ]; checkInputs = [ pytestCheckHook pytest-benchmark ]; @@ -20,7 +23,6 @@ buildPythonPackage rec { description = "Python bindings for the C++14 Boost::Histogram library"; homepage = "https://github.com/scikit-hep/boost-histogram"; license = licenses.bsd3; - platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 27610d7cd9b5..518a2d8b69e0 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.28"; + version = "0.2.30"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-CnfJiYUM8A4QZ6VMtekO8nD5tQ2VL9vMeK6OWYcgwmU="; + sha256 = "sha256-qq01hnNiJ6BUGhi5owYvxM+Kj7/KYp0vBpILmwPuZaw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boto/bug-953970_python3.8-compat.patch b/pkgs/development/python-modules/boto/bug-953970_python3.8-compat.patch new file mode 100644 index 000000000000..ac5621042375 --- /dev/null +++ b/pkgs/development/python-modules/boto/bug-953970_python3.8-compat.patch @@ -0,0 +1,53 @@ +Index: python-boto/tests/unit/utils/test_utils.py +=================================================================== +--- python-boto.orig/tests/unit/utils/test_utils.py ++++ python-boto/tests/unit/utils/test_utils.py +@@ -85,7 +85,7 @@ class TestPassword(unittest.TestCase): + def hmac_hashfunc(cls, msg): + if not isinstance(msg, bytes): + msg = msg.encode('utf-8') +- return hmac.new(b'mysecretkey', msg) ++ return hmac.new(b'mysecretkey', msg, digestmod='sha256') + + class HMACPassword(Password): + hashfunc = hmac_hashfunc +@@ -95,15 +95,15 @@ class TestPassword(unittest.TestCase): + password.set('foo') + + self.assertEquals(str(password), +- hmac.new(b'mysecretkey', b'foo').hexdigest()) ++ hmac.new(b'mysecretkey', b'foo', digestmod='sha256').hexdigest()) + + def test_constructor(self): +- hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg) ++ hmac_hashfunc = lambda msg: hmac.new(b'mysecretkey', msg, digestmod='sha256') + + password = Password(hashfunc=hmac_hashfunc) + password.set('foo') + self.assertEquals(password.str, +- hmac.new(b'mysecretkey', b'foo').hexdigest()) ++ hmac.new(b'mysecretkey', b'foo', digestmod='sha256').hexdigest()) + + + class TestPythonizeName(unittest.TestCase): +Index: python-boto/boto/ecs/item.py +=================================================================== +--- python-boto.orig/boto/ecs/item.py ++++ python-boto/boto/ecs/item.py +@@ -22,6 +22,7 @@ + + import xml.sax + import cgi ++from html import escape + from boto.compat import six, StringIO + + class ResponseGroup(xml.sax.ContentHandler): +@@ -67,7 +68,7 @@ class ResponseGroup(xml.sax.ContentHandl + return None + + def endElement(self, name, value, connection): +- self._xml.write("%s" % (cgi.escape(value).replace("&amp;", "&"), name)) ++ self._xml.write("%s" % (escape(value).replace("&amp;", "&"), name)) + if len(self._nodepath) == 0: + return + obj = None diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix index 5199ca645091..586f023f8009 100644 --- a/pkgs/development/python-modules/boto/default.nix +++ b/pkgs/development/python-modules/boto/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pythonAtLeast -, isPy38 , python , nose , mock @@ -13,18 +12,23 @@ buildPythonPackage rec { pname = "boto"; version = "2.49.0"; - disabled = pythonAtLeast "3.9"; # no longer compatible with hmac std lib package + disabled = pythonAtLeast "3.10"; # cannot import name 'Mapping' from 'collections' src = fetchPypi { inherit pname version; sha256 = "ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"; }; + patches = [ + # fixes hmac tests + # https://sources.debian.org/src/python-boto/2.49.0-4/debian/patches/bug-953970_python3.8-compat.patch/ + ./bug-953970_python3.8-compat.patch + ]; + checkPhase = '' ${python.interpreter} tests/test.py default ''; - doCheck = !isPy38; # hmac functionality has changed checkInputs = [ nose mock ]; propagatedBuildInputs = [ requests httpretty ]; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index af358a61f181..c6fdc8c9981c 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.20.21"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.20.35"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "2fb05cbe81b9ce11d9394fc6c4ffa5fd1cceb114dc1d2887dc61081707e44522"; + sha256 = "42dd9fcb9e033ab19c9dfaeaba745ef9d2db6efe4e9f1e1f547b3e3e0b1f4a82"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 43fad7124553..6d5c11665c2c 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.23.21"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.23.35"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "d7f8e82cba38aa1e66015cab0a5ca3204503e90afc4695e97228e28329a14c04"; + sha256 = "5be6ba6c5ea71c256da8a5023bf9c278847c4b90fdb40f2c4c3bdb21ca11ff28"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 8cf820edbfec..c88f6712f796 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -1,22 +1,43 @@ -{ lib, - fetchPypi, - requests, - buildPythonPackage +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, pytestCheckHook +, pythonOlder +, requests }: buildPythonPackage rec { pname = "braintree"; - version = "4.13.1"; + version = "4.14.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "4f6addf89f5cd6123243ddc89db325e50fceec825845901dad553fde115bd938"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = pname; + repo = "braintree_python"; + rev = version; + hash = "sha256-qeqQX+qyy78sLe+46CA4D6VAxNHUVahS4LMYdGDzc2k="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; - # pypi release does not include tests - doCheck = false; + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ + "braintree" + ]; + + disabledTestPaths = [ + # Don't test integrations + "tests/integration" + ]; meta = with lib; { description = "Python library for integration with Braintree"; diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 7770996f423d..976a8b60dfb3 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,24 +1,44 @@ -{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: +{ lib +, buildPythonPackage +, docutils +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, sphinx +}: buildPythonPackage rec { - version = "4.31.0"; pname = "breathe"; - disabled = isPy27; + version = "4.33.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "925eeff96c6640cd857e4ddeae6f75464a1d5e2e08ee56dccce4043583ae2050"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "michaeljones"; + repo = pname; + rev = "v${version}"; + hash = "sha256-S4wxlxluRjwlRGCa5Os/J3EpdekI/CEPMWw6j/wlZbw="; }; - propagatedBuildInputs = [ docutils six sphinx ]; + propagatedBuildInputs = [ + docutils + sphinx + ]; - doCheck = !isPy3k; + checkInputs = [ + pytestCheckHook + ]; - meta = { - homepage = "https://github.com/michaeljones/breathe"; - license = lib.licenses.bsd3; + pythonImportsCheck = [ + "breathe" + ]; + + meta = with lib; { description = "Sphinx Doxygen renderer"; + homepage = "https://github.com/michaeljones/breathe"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; inherit (sphinx.meta) platforms; }; } - diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index dc1e4f37f3c4..ba635a39257d 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -2,22 +2,26 @@ , buildPythonPackage , fetchPypi , cryptography +, pythonOlder }: buildPythonPackage rec { pname = "broadlink"; - version = "0.18.0"; + version = "0.18.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c66b3e4a097d6549f0fcc9ccdf289bd88f73f647ad9449e1c4e2958301ad1b04"; + hash = "sha256-KMfL1mY4th87gjPrdhvzQjdXucgwSChsykOCO3cPAD8="; }; propagatedBuildInputs = [ cryptography ]; - # no tests available + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -28,5 +32,6 @@ buildPythonPackage rec { description = "Python API for controlling Broadlink IR controllers"; homepage = "https://github.com/mjg59/python-broadlink"; license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index 0556c5b4e2a2..ad247be16185 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -1,22 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook }: +, pytestCheckHook +}: buildPythonPackage rec { pname = "brotli"; version = "1.0.9"; - # PyPI doesn't contain tests so let's use GitHub src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1rdp9rx197q467ixp53g4cgc3jbsdaxr62pz0a8ayv2lvm944azh"; - # for some reason, the test data isn't captured in releases, force a git checkout - deepClone = true; + sha256 = "sha256-tFnXSXv8t3l3HX6GwWLhEtgpqz0c7Yom5U3k47pWM7o="; + # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data + forceFetchGit = true; }; + # only returns information how to really build dontConfigure = true; checkInputs = [ @@ -31,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/google/brotli"; description = "Generic-purpose lossless compression algorithm"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/brotlicffi/default.nix b/pkgs/development/python-modules/brotlicffi/default.nix index f78598b751a6..5e0600d343a8 100644 --- a/pkgs/development/python-modules/brotlicffi/default.nix +++ b/pkgs/development/python-modules/brotlicffi/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { export USE_SHARED_BROTLI=1 ''; - # Test data is not available, only when using libbortli git checkout + # Test data is not available, only when using libbrotli git checkout doCheck = false; pythonImportsCheck = [ "brotlicffi" ]; diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix index cbc75ef2843f..5ee2ff0522af 100644 --- a/pkgs/development/python-modules/bsdiff4/default.nix +++ b/pkgs/development/python-modules/bsdiff4/default.nix @@ -1,24 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "bsdiff4"; - version = "1.2.1"; + version = "1.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "87cffc7522effdda03fd1564b212ad2279c0af50d16c3e65776f80acb6705d4b"; + hash = "sha256-GICsP1KmxGrmvMbbEX5Ps1+bDM1a91/U/uaQfQDWmDw="; }; + pythonImportsCheck = [ + "bsdiff4" + ]; + checkPhase = '' mv bsdiff4 _bsdiff4 python -c 'import bsdiff4; bsdiff4.test()' ''; meta = with lib; { - description = "binary diff and patch using the BSDIFF4-format"; + description = "Binary diff and patch using the BSDIFF4-format"; homepage = "https://github.com/ilanschnell/bsdiff4"; license = licenses.bsdProtection; maintainers = with maintainers; [ ris ]; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 49acee691cfa..d900beca38a4 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -6,15 +6,20 @@ , transaction , zope_testrunner , python +, pythonOlder }: buildPythonPackage rec { - pname = "BTrees"; - version = "4.9.2"; + pname = "btrees"; + version = "4.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "d33323655924192c4ac998d9ee3002e787915d19c1e17a6baf47c9a63d9556e3"; + pname = "BTrees"; + inherit version; + hash = "sha256-1qsONBDQdNcVQkXW3GSTrobxtQvWCA0TEOuz7N6l3rY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index f157f291f7fb..ace2e2166d7e 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -2,29 +2,36 @@ , buildPythonPackage , fetchPypi , pythonOlder -, six , webob }: buildPythonPackage rec { pname = "bugsnag"; - version = "4.1.1"; + version = "4.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "cdbdb3e02ef0c0655bb55be8b05ec1cb830b5ec629923ccb24bfd71dede3d1c3"; + hash = "sha256-NnTn4m9we40Ww2abP7mbz1CtdypZyN2GYBvj8zxhOpI="; }; - propagatedBuildInputs = [ six webob ]; + propagatedBuildInputs = [ + webob + ]; + + pythonImportsCheck = [ + "bugsnag" + ]; # no tests doCheck = false; meta = with lib; { - description = "Automatic error monitoring for django, flask, etc."; - homepage = "https://www.bugsnag.com"; + description = "Automatic error monitoring for Python applications"; + homepage = "https://github.com/bugsnag/bugsnag-python"; license = licenses.mit; - platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index a6ae6e87036b..2836ee24c34a 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -31,11 +31,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.4.0"; + version = "3.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-14w1sF1aOpfUW76uhAIUpdrjAEhQkEWcRGg9Osc+qFk="; + sha256 = "sha256-GmKMqejHjtEiEtlZffze7PGNjVwUKB/ZcvUgJ4DoeDQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index a1d2fa59cb5d..a35506c89b8d 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-NAc85JomnxS052SjCu8+UQ/hik2gbq1u7/gc21Nj67Q="; + sha256 = "sha256-A2a5rEL5MN9jlu5vVnUIKx9ma2H6wuJAWjkqLpQgcfc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 797395205a04..5b64f4c51ab9 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-65ZbCiNtxH3YjAcdhv5cwSUNrLT65jlQh/2oL8342Tw="; + sha256 = "sha256-Hly1dwUbWblHoP+ufjxyz4boXby8kxeFSHLMHcCpc1o="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-2wu6rE5tgjPXxlcIND8s+DAmX9CF29M3ElonV0L8WOs="; + sha256 = "sha256-QuV808Wg9epCgjehuUaMKCLLTLfFJVWBdKPy8sZfBYg="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-Vu4CouTuVyxpmx5C4fthQJPdFBAtN1jliQjy4pLYAzc="; + sha256 = "sha256-p8PRQaWrPb63RrF4FtTX65qM3HdzI4Gl4tR0zTOBFEI="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-BDzI4VBbNGCKRxv6294IIVkDXZV0KHauvUYDjIVovvE="; + sha256 = "sha256-cNYptEp98padbyoY1DmZbpaED7O5pfck9oMjst4RHnI="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-hkcxwZWFJOLHMIRJfzzMTEoH6oc2UblJEKFjYthFfDc="; + sha256 = "sha256-o747SIyqJom4ucZ7hmODcP0VC7i+ydgvi+oMxn/vupc="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 0c7e2f33716f..97a3eec770bd 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SFZ0Q51hrBb7eBMGzvVOhc/ogFCIO/Mo7U9652WJ2GU="; + sha256 = "sha256-9wdUvp00vuP7peJ+Oo4guHLfIz0YWHwp6q/zlKOOoXg="; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 6e0637d2a6bc..d1926c9631aa 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -1,24 +1,37 @@ -{ lib, buildPythonPackage, fetchPypi, six}: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, six +}: buildPythonPackage rec { pname = "bumps"; - version = "0.8.1"; + version = "0.9.0"; + format = "setuptools"; - propagatedBuildInputs = [six]; - - # Bumps does not provide its own tests.py, so the test - # always fails - doCheck = false; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f4f2ee712a1e468a2ce5c0a32f67739a83331f0cb7b9c50b9e7510daefc12169"; + hash = "sha256-BY9kg0ksKfrpQgsl1aDDJJ+zKJmURqwTtKxlITxse+o="; }; + propagatedBuildInputs = [ + six + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "bumps" + ]; + meta = with lib; { - homepage = "https://www.reflectometry.org/danse/software.html"; description = "Data fitting with bayesian uncertainty analysis"; - maintainers = with maintainers; [ rprospero ]; + homepage = "https://bumps.readthedocs.io/"; license = licenses.publicDomain; + maintainers = with maintainers; [ rprospero ]; }; } diff --git a/pkgs/development/python-modules/cachelib/default.nix b/pkgs/development/python-modules/cachelib/default.nix index 0838558e116a..9c0620c8740d 100644 --- a/pkgs/development/python-modules/cachelib/default.nix +++ b/pkgs/development/python-modules/cachelib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cachelib"; - version = "0.3.0"; + version = "0.6.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pallets"; repo = pname; rev = version; - sha256 = "sha256-ssyHNlrSrG8YHRS131jJtmgl6eMTNdet1Hf0nTxL8sM="; + sha256 = "sha256-1msDiNYxaETJfVBTaMuNJbSxhOpyRdHkb5CQ+1+ZbbQ="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 1bff572b6032..f38eb328e3d9 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "cachetools"; - version = "4.2.4"; + version = "5.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tkem"; repo = pname; rev = "v${version}"; - sha256 = "sha256-doPLl7Ooc2cKlTiS/dqLTKSkTlSgPFztIumAzciM0bc="; + hash = "sha256-urTkls1S83m7Eo7chPaQc5gxz0omZBToNYa8upQEiOo="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index b5679978c2cc..8743c01ba2ad 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -9,13 +9,14 @@ buildPythonPackage rec { pname = "canonicaljson"; - version = "1.5.0"; + version = "1.6.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Xr3c10xbBm7mjsylZGUzjpsTgEZ+CpBvR5dpfJ+zgeI="; + hash = "sha256-hznV/ZGspygdQlZgrmWvdmOAjIF3d4ll9n6QsWorJCc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index 51a6d0d11c0f..ccb3626e2f48 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -5,15 +5,19 @@ , can , canmatrix , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "canopen"; - version = "1.2.1"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "18d01d56ff0023795cb336cafd4810a76cf402b98b42139b201fa8c5d4ba8c06"; + hash = "sha256-vMiqnqg/etpdoNregQOJd75SqTgCwmV2SXKesfggZdk="; }; nativeBuildInputs = [ @@ -29,7 +33,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "canopen" ]; + pythonImportsCheck = [ + "canopen" + ]; meta = with lib; { homepage = "https://github.com/christiansandberg/canopen/"; diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index c99c392841eb..f1a37fb70a0f 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -18,6 +18,10 @@ buildPythonPackage rec { substituteInPlace setup.py --replace manylinux1 manylinux2014 ''; + # aarch64 only available from MacOS SDK 11 onwards, so fix the version tag. + # otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense. + setupPyBuildFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "--plat-name" "macosx_11_0" ]; + propagatedBuildInputs = [ setuptools ]; checkPhase = '' diff --git a/pkgs/development/python-modules/carrot/default.nix b/pkgs/development/python-modules/carrot/default.nix deleted file mode 100644 index a772535ad82b..000000000000 --- a/pkgs/development/python-modules/carrot/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, nose, amqplib, anyjson }: - -buildPythonPackage rec { - pname = "carrot"; - version = "0.10.7"; - - src = fetchPypi { - inherit pname version; - sha256 = "0s14rs2fgp1s2qa0avn8gj33lwc3k1hd4y9a2h6mhg487i7kfinb"; - }; - - buildInputs = [ nose ]; - propagatedBuildInputs = [ amqplib anyjson ]; - - doCheck = false; # depends on the network - - meta = with lib; { - homepage = "https://pypi.python.org/pypi/carrot"; - description = "AMQP Messaging Framework for Python"; - }; -} diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index d55c1e9b0c53..d233cf031647 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, lib, fetchPypi , pytestCheckHook, filelock, mock, pep8 -, cython +, cython, setuptools-scm , six, pyshp, shapely, geos, numpy , gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona , proj, flufl_lock @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "cartopy"; - version = "0.20.1"; + version = "0.20.2"; src = fetchPypi { inherit version; pname = "Cartopy"; - sha256 = "91f87b130e2574547a20cd634498df97d797abd12dcfd0235bc0cdbcec8b05e3"; + sha256 = "4d08c198ecaa50a6a6b109d0f14c070e813defc046a83ac5d7ab494f85599e35"; }; postPatch = '' @@ -23,6 +23,13 @@ buildPythonPackage rec { --replace "test_epsg(" "dont_test_epsg(" ''; + nativeBuildInputs = [ + cython + geos # for geos-config + proj + setuptools-scm + ]; + buildInputs = [ geos proj ]; @@ -48,12 +55,6 @@ buildPythonPackage rec { "test_gridliner_labels_bbox_style" ]; - nativeBuildInputs = [ - cython - geos # for geos-config - proj - ]; - meta = with lib; { description = "Process geospatial data to create maps and perform analyses"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/casa-formats-io/default.nix b/pkgs/development/python-modules/casa-formats-io/default.nix index 53ee89c5f941..beb6dc351420 100644 --- a/pkgs/development/python-modules/casa-formats-io/default.nix +++ b/pkgs/development/python-modules/casa-formats-io/default.nix @@ -4,6 +4,7 @@ , astropy , dask , numpy +, setuptools-scm }: buildPythonPackage rec { @@ -16,6 +17,8 @@ buildPythonPackage rec { sha256 = "16rypj65wdfxxrilxfhbk563lxv86if4vvs9zfq3f8bkzdr8xl9s"; }; + nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ astropy dask numpy ]; # Tests require a large (800 Mb) dataset @@ -25,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Dask-based reader for CASA data"; - homepage = "http://radio-astro-tools.github.io"; + homepage = "https://casa-formats-io.readthedocs.io/"; license = lib.licenses.lgpl2Only; maintainers = with lib.maintainers; [ smaret ]; }; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 815bc8ae36cb..12ea06a5c4f7 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.15.2"; + version = "1.15.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0mrk6b16f4ds666qa4884kjjbmb55kpfvvqsznfmyg9iii6dir50"; + sha256 = "0vczml14dvvrj401r08d6b0rfn5p5kfm1wr0vrfi8rqk2z5x1w0g"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index 7105e360561e..e47e77b9eb49 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "catalogue"; - version = "2.0.6"; + version = "2.0.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0idjhx2s8cy6ppd18k1zy246d97gdd6i217m5q26fwa47xh3asik"; + sha256 = "sha256-U10zrnnr0hyimFUdhdoYaui44d82sPsCRtp3QWPsLWs="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index 45379910a610..e3d694d28e3b 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -11,23 +11,22 @@ , pythonOlder , pyyaml , tomlkit +, typing-extensions , ujson }: buildPythonPackage rec { pname = "cattrs"; - version = "1.8.0"; + version = "1.10.0"; format = "pyproject"; - # https://cattrs.readthedocs.io/en/latest/history.html#id33: - # "Python 2, 3.5 and 3.6 support removal. If you need it, use a version below 1.1.0." disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "Tinche"; + owner = "python-attrs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CKAsvRKS8kmLcyPA753mh6d3S04ObzO7xLPpmlmxrxI="; + hash = "sha256-VbfQMMDO03eeUHAACxoX6a3DKmzoF9EfLuTpvaY6bWs="; }; nativeBuildInputs = [ @@ -36,6 +35,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs + ] ++ lib.optionals (pythonOlder "3.7") [ + typing-extensions ]; checkInputs = [ @@ -50,10 +51,10 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.cfg \ - --replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" "" substituteInPlace pyproject.toml \ - --replace 'orjson = "^3.5.2"' "" + --replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" "" \ + --replace 'orjson = "^3.5.2"' "" \ + --replace "[tool.poetry.group.dev.dependencies]" "[tool.poetry.dev-dependencies]" substituteInPlace tests/test_preconf.py \ --replace "from orjson import dumps as orjson_dumps" "" \ --replace "from orjson import loads as orjson_loads" "" @@ -76,11 +77,13 @@ buildPythonPackage rec { "test_orjson" ]; - pythonImportsCheck = [ "cattr" ]; + pythonImportsCheck = [ + "cattr" + ]; meta = with lib; { description = "Python custom class converters for attrs"; - homepage = "https://github.com/Tinche/cattrs"; + homepage = "https://github.com/python-attrs/cattrs"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/cchardet/default.nix b/pkgs/development/python-modules/cchardet/default.nix index b93ea9c3bd78..587d0d1f6c12 100644 --- a/pkgs/development/python-modules/cchardet/default.nix +++ b/pkgs/development/python-modules/cchardet/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , python @@ -14,9 +15,32 @@ buildPythonPackage rec { sha256 = "c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf"; }; + pythonImportsCheck = [ + "cchardet" + ]; + checkInputs = [ nose ]; + + # on non x86-64 some charsets are identified as their superset, so we skip these tests (last checked with version 2.1.7) + preCheck = '' + cp -R src/tests $TMPDIR + pushd $TMPDIR + '' + lib.optionalString (stdenv.hostPlatform.system != "x86_64-linux") '' + rm $TMPDIR/tests/testdata/th/tis-620.txt # identified as iso-8859-11, which is fine for all practical purposes + rm $TMPDIR/tests/testdata/ga/iso-8859-1.txt # identified as windows-1252, which is fine for all practical purposes + rm $TMPDIR/tests/testdata/fi/iso-8859-1.txt # identified as windows-1252, which is fine for all practical purposes + ''; + checkPhase = '' - ${python.interpreter} setup.py nosetests + runHook preCheck + + nosetests + + runHook postCheck + ''; + + postCheck = '' + popd ''; meta = { diff --git a/pkgs/development/python-modules/cdcs/default.nix b/pkgs/development/python-modules/cdcs/default.nix index 9dd8a272395b..ec11019cc9a7 100644 --- a/pkgs/development/python-modules/cdcs/default.nix +++ b/pkgs/development/python-modules/cdcs/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "0.1.5"; + version = "0.1.6"; pname = "cdcs"; format = "setuptools"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "usnistgov"; repo = "pycdcs"; rev = "v${version}"; - sha256 = "0sd0s0mka2bvpxxiz98cjc2h5ncsb7d03af1q3w9w8pmvfsgj7pc"; + sha256 = "sha256-w9CBNOK9oXTIUa+SsnepRN0wAz7WPZGfUNDSbtVn1L8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index eabb3521416e..247d25bf420a 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -19,6 +19,7 @@ , pythonOlder , pytz , vine +, nixosTests }: buildPythonPackage rec { @@ -78,6 +79,10 @@ buildPythonPackage rec { "celery" ]; + passthru.tests = { + inherit (nixosTests) sourcehut; + }; + meta = with lib; { description = "Distributed task queue"; homepage = "https://github.com/celery/celery/"; diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 8bf70f95c0f8..754d7ca0f2aa 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.1.1"; + version = "2.1.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "sha256-S3sxYCGMg/O5ICr9z4NqjmpPCF7e5F8G2q2EX4bRN+8="; + sha256 = "sha256-Zv3ViOrdQby+7UQrHy6174W2qh1vx21R0yOA7ecr0lU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index 7686b919272f..be597277b6b7 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook }: @@ -15,6 +16,10 @@ buildPythonPackage rec { sha256 = "03kj15cf1pbd11mxsik96m5w1m6p0fbdc4ia5ihzmq8rz28razpq"; }; + propagatedBuildInputs = [ + setuptools + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 68a0ca42986e..bc361806d87a 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, isPy27 +, pythonOlder , fetchFromGitHub , pytestCheckHook }: @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "certifi"; version = "2021.10.08"; - disabled = isPy27; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = pname; @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/certifi/python-certifi"; description = "Python package for providing Mozilla's CA Bundle"; license = licenses.isc; - maintainers = with maintainers; [ koral ]; + maintainers = with maintainers; [ koral SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/cffsubr/default.nix b/pkgs/development/python-modules/cffsubr/default.nix new file mode 100644 index 000000000000..0c7e6849b3f1 --- /dev/null +++ b/pkgs/development/python-modules/cffsubr/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fonttools +, pytestCheckHook +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "cffsubr"; + version = "0.2.9.post1"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "azFBLc9JyPqEZkvahn4u3cVbb+b6aW/yU8TxOp/y/Fw="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + fonttools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "cffsubr" ]; + + meta = with lib; { + description = "Standalone CFF subroutinizer based on AFDKO tx"; + homepage = "https://github.com/adobe-type-tools/cffsubr"; + license = licenses.asl20; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index bf3eab19d4fa..105775a4547e 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -1,25 +1,25 @@ -{ buildPythonPackage -, fetchFromGitHub -, lib - -# pythonPackages +{ lib +, buildPythonPackage , click -, pytest -, pytest-cov -, pytest-runner +, fetchFromGitHub +, pytestCheckHook +, pythonOlder , pyyaml , six }: buildPythonPackage rec { pname = "cfn-flip"; - version = "1.2.2"; + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-cfn-template-flip"; rev = version; - sha256 = "05fk725a1i3zl3idik2hxl3w6k1ln0j33j3jdq1gvy1sfyc79ifm"; + hash = "sha256-1cV0mHc6+P0CbnLIMSSwNEzDB+1QzNjioH/EoIo40xU="; }; propagatedBuildInputs = [ @@ -29,27 +29,27 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest - pytest-cov - pytest-runner + pytestCheckHook ]; - checkPhase = '' - py.test \ - --cov=cfn_clean \ - --cov=cfn_flip \ - --cov=cfn_tools \ - --cov-report term-missing \ - --cov-report html + postPatch = '' + sed -i "/--cov/d" tox.ini ''; + disabledTests = [ + # TypeError: load() missing 1 required positional argument: 'Loader' + "test_flip_to_yaml_with_longhand_functions" + "test_yaml_no_ordered_dict" + ]; + + pythonImportsCheck = [ + "cfn_flip" + ]; + meta = with lib; { description = "Tool for converting AWS CloudFormation templates between JSON and YAML formats"; homepage = "https://github.com/awslabs/aws-cfn-template-flip"; license = licenses.asl20; - maintainers = with maintainers; [ - kamadorueda - psyanticy - ]; + maintainers = with maintainers; [ kamadorueda psyanticy ]; }; } diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 94a4ea5e10f2..1c5b96ea48cd 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -3,16 +3,12 @@ , fetchFromGitHub , pythonOlder , aws-sam-translator -, importlib-metadata -, importlib-resources , jschema-to-python , jsonpatch , jsonschema , junit-xml , networkx -, pathlib2 , pyyaml -, requests , sarif-om , setuptools , six @@ -23,18 +19,18 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.56.3"; + version = "0.58.2"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "12r0zxwidf4vdbbpzlhlmgc2as5bn45yf663f00iv6px0glq02zs"; + sha256 = "sha256-ArpvP4tbRf1fK8BPokRXqS3YyaFiOLBrR8uQHko5iKo="; }; postPatch = '' substituteInPlace setup.py \ - --replace 'importlib_resources~=1.4;python_version<"3.7" and python_version!="3.4"' 'importlib_resources;python_version<"3.7"' + --replace "jsonschema~=3.0" "jsonschema>=3.0" ''; propagatedBuildInputs = [ @@ -44,13 +40,10 @@ buildPythonPackage rec { jsonschema junit-xml networkx - pathlib2 pyyaml - requests sarif-om - setuptools six - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ]; + ]; checkInputs = [ mock diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index aeebc762701f..6479933293fa 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -1,27 +1,24 @@ -{ buildPythonPackage -, fetchPypi -, pytestCheckHook -, coveralls -, pytest-cov +{ lib +, buildPythonPackage , cython +, fetchPypi , numpy +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "cftime"; - version = "1.5.1.1"; + version = "1.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "6dc4d76ec7fe5a2d3c00dbe6604c757f1319613b75ef157554ef3648bf102a50"; + sha256 = "sha256-ExA+ZlC+6mVSMWvVgl1qo7fpj1uBFQJt9IJnmN/590E="; }; - checkInputs = [ - pytestCheckHook - coveralls - pytest-cov - ]; - nativeBuildInputs = [ cython numpy @@ -31,11 +28,22 @@ buildPythonPackage rec { numpy ]; - # ERROR test/test_cftime.py - ModuleNotFoundError: No module named 'cftime._cft... - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; - meta = { + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + pythonImportsCheck = [ + "cftime" + ]; + + meta = with lib; { description = "Time-handling functionality from netcdf4-python"; + homepage = "https://github.com/Unidata/cftime"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 43767cb1a319..762846ab34c2 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.26.2"; + version = "1.26.4"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = version; - sha256 = "sha256-zF7wmrJTMX0Cr3wpJECUqhH58G2SLiVoC4Z2XbblQdQ="; + sha256 = "sha256-Xn8OqeEihLxZS9QZtrhzau2zLg9SzQrrigK70PoImhU="; }; propagatedBuildInputs = [ @@ -61,7 +61,8 @@ buildPythonPackage rec { postPatch = '' sed -i setup.py -e "/pip>=/c\'pip'," substituteInPlace setup.py \ - --replace 'typing==3.6.4' 'typing' + --replace "typing==3.6.4" "typing" \ + --replace "attrs>=19.3.0,<21.3.0" "attrs" ''; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index c7383e98219d..803104d85471 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "channels-redis"; - version = "3.3.1"; + version = "3.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "channels_redis"; - sha256 = "899dc6433f5416cf8ad74505baaf2acb5461efac3cad40751a41119e3f68421b"; + sha256 = "sha256-Xf/UzBYXQSW9QEP8j+dGLKdAPPgB1Zqfp0EO0QH6alc="; }; buildInputs = [ redis hiredis ]; diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index ba7dd1db3b9a..d406ea15fbd3 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "charset-normalizer"; - version = "2.0.10"; + version = "2.0.12"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Ousret"; repo = "charset_normalizer"; rev = version; - hash = "sha256-QsUqrC2oycvyCbOzGmHahgNi40YZ0sujb3Cj8EnsGS8="; + hash = "sha256-d5vWnZtFR669l1Meg4ZSsYIyBlJZya7SpXJMx2AP8NU="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 28e777e8fdd2..30a620b5ad6f 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.5.0"; + version = "5.6.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "04hsh1z2ngfslmvi8fdzfccssg6i0ziksil84j129f049m96wd51"; + sha256 = "sha256-mf4QASdvO7doV5pKAAEzaKJP66w29osBlbLrJuopUvA="; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 608f3a0cac68..6c91633e8af0 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -8,22 +8,21 @@ , pep517 , pytestCheckHook , toml +, pythonOlder }: buildPythonPackage rec { pname = "check-manifest"; - version = "0.47"; + version = "0.48"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "56dadd260a9c7d550b159796d2894b6d0bcc176a94cbc426d9bb93e5e48d12ce"; + hash = "sha256-O1dfHa3nvrMHjvS/M6lFGYNEV8coHbxyaxXFRmtVxlc="; }; - # Test requires filesystem access - postPatch = '' - substituteInPlace tests.py --replace "test_build_sdist" "no_test_build_sdist" - ''; - propagatedBuildInputs = [ build pep517 @@ -37,11 +36,18 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "check_manifest" ]; + disabledTests = [ + # Test wants to setup a venv + "test_build_sdist_pep517_isolated" + ]; + + pythonImportsCheck = [ + "check_manifest" + ]; meta = with lib; { - homepage = "https://github.com/mgedmin/check-manifest"; description = "Check MANIFEST.in in a Python source package for completeness"; + homepage = "https://github.com/mgedmin/check-manifest"; license = licenses.mit; maintainers = with maintainers; [ lewo ]; }; diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 6e9256ffacfe..436669d92092 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -1,16 +1,16 @@ { lib , stdenv -, fetchPypi , buildPythonPackage -, isPy3k +, fetchPypi , jaraco_functools , jaraco_text , more-itertools , portend , pyopenssl -, pytestCheckHook -, pytest-cov +, pypytools , pytest-mock +, pytestCheckHook +, pythonOlder , requests , requests-toolbelt , requests-unixsocket @@ -22,21 +22,22 @@ buildPythonPackage rec { pname = "cheroot"; - version = "8.5.2"; + version = "8.6.0"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f137d03fd5155b1364bea557a7c98168665c239f6c8cedd8f80e81cdfac01567"; + hash = "sha256-NmrfbnyslVVIbC0b5il5kwIu/2+MRlXBRDJozKPwjiU="; }; - nativeBuildInputs = [ setuptools-scm setuptools-scm-git-archive ]; + nativeBuildInputs = [ + setuptools-scm + setuptools-scm-git-archive + ]; propagatedBuildInputs = [ - # install_requires jaraco_functools - more-itertools six ]; @@ -45,9 +46,9 @@ buildPythonPackage rec { jaraco_text portend pyopenssl - pytestCheckHook - pytest-cov + pypytools pytest-mock + pytestCheckHook requests requests-toolbelt requests-unixsocket @@ -79,6 +80,10 @@ buildPythonPackage rec { "cheroot/test/test_wsgi.py" ]; + pythonImportsCheck = [ + "cheroot" + ]; + # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; @@ -86,5 +91,6 @@ buildPythonPackage rec { description = "High-performance, pure-Python HTTP"; homepage = "https://github.com/cherrypy/cheroot"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/chess/default.nix b/pkgs/development/python-modules/chess/default.nix index 9330a4b49e84..77b30071c070 100644 --- a/pkgs/development/python-modules/chess/default.nix +++ b/pkgs/development/python-modules/chess/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "chess"; - version = "1.8.0"; + version = "1.9.0"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "niklasf"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "sha256-ghBX0yRnggXliVREtrGxB/Xf0JWICeIi8XriSxS26Go="; + sha256 = "sha256-2/6pHU4gJnnVdO2KyXBe/RAbnEIuc2AY+h4TO70qiRk="; }; pythonImportsCheck = [ "chess" ]; diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix index f4047c26f5cf..6024c8a5ef6c 100644 --- a/pkgs/development/python-modules/chiapos/default.nix +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "chiapos"; - version = "1.0.8"; + version = "1.0.9"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "64529b7f03e9ec0c1b9be7c7c1f30d4498e5d931ff2dbb10a9cc4597029d69f0"; + sha256 = "sha256-emEHIR74RiIDK04etO/6G7tjzTufOVl4rLRWbEsQit0="; }; patches = [ diff --git a/pkgs/development/python-modules/chiavdf/default.nix b/pkgs/development/python-modules/chiavdf/default.nix index 9b4bc575cab2..1525c5ac9058 100644 --- a/pkgs/development/python-modules/chiavdf/default.nix +++ b/pkgs/development/python-modules/chiavdf/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "chiavdf"; - version = "1.0.4"; + version = "1.0.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-i6ylxtw1dMtylS4m0mz6rATU1trbMpcmsB2WhD++CeM="; + hash = "sha256-2pC6sFRwgAwIEanZXe99848XMxK/lyLGxiA+UA+q3H0="; }; patches = [ diff --git a/pkgs/development/python-modules/chirpstack-api/default.nix b/pkgs/development/python-modules/chirpstack-api/default.nix index a019dd651999..c939022a29bb 100644 --- a/pkgs/development/python-modules/chirpstack-api/default.nix +++ b/pkgs/development/python-modules/chirpstack-api/default.nix @@ -1,27 +1,38 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , google-api-core , grpcio +, pythonOlder }: buildPythonPackage rec { pname = "chirpstack-api"; - version = "3.9.4"; + version = "3.12.4"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "08djidy3fyhghyzvndcjas3hb1s9d7719gvmgbl8bzxjm4h2c433"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "brocaar"; + repo = pname; + rev = "v${version}"; + hash = "sha256-69encHMk0eXE2Av87ysKvxoiXog5o68qCUlOx/lgHFU="; }; + sourceRoot = "source/python/src"; + propagatedBuildInputs = [ google-api-core grpcio ]; - # Project has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "chirpstack_api" ]; + + pythonImportsCheck = [ + "chirpstack_api" + ]; meta = with lib; { description = "ChirpStack gRPC API message and service wrappers for Python"; diff --git a/pkgs/development/python-modules/chispa/default.nix b/pkgs/development/python-modules/chispa/default.nix new file mode 100644 index 000000000000..3410789c21cc --- /dev/null +++ b/pkgs/development/python-modules/chispa/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, fetchFromGitHub, lib, poetry-core, pyspark }: + +buildPythonPackage rec { + pname = "chispa"; + version = "0.8.3"; + format = "pyproject"; + + src = fetchFromGitHub { + repo = "chispa"; + owner = "MrPowers"; + rev = "v${version}"; + sha256 = "sha256-1ePx8VbU8pMd5EsZhFp6qyMptlUxpoCvJfuDm9xXOdc="; + }; + + checkInputs = [ pyspark ]; + + nativeBuildInputs = [ poetry-core ]; + + pythonImportsCheck = [ "chispa" ]; + + meta = with lib; { + homepage = "https://github.com/MrPowers/chispa"; + description = "PySpark test helper methods with beautiful error messages"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; + }; +} diff --git a/pkgs/development/python-modules/chromaprint/default.nix b/pkgs/development/python-modules/chromaprint/default.nix new file mode 100644 index 000000000000..2a07a4eb6dce --- /dev/null +++ b/pkgs/development/python-modules/chromaprint/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, m2r +}: + +buildPythonPackage rec { + pname = "chromaprint"; + version = "0.5"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-d4M+ieNQpIXcnEH1WyIWnTYZe3P+Y58W0uz1uYPwLQE="; + }; + + buildInputs = [ m2r ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "chromaprint" ]; + + meta = with lib; { + description = "Facilitate effortless color terminal output"; + homepage = "https://pypi.org/project/${pname}/"; + license = licenses.mit; + maintainers = with maintainers; [ dschrempf peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/circuit-webhook/default.nix b/pkgs/development/python-modules/circuit-webhook/default.nix new file mode 100644 index 000000000000..895c6803142e --- /dev/null +++ b/pkgs/development/python-modules/circuit-webhook/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "circuit-webhook"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-NhePKBfzdkw7iVHmVrOxf8ZcQrb1Sq2xMIfu4P9+Ppw="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "circuit_webhook" + ]; + + meta = with lib; { + description = "Module for Unify Circuit API webhooks"; + homepage = "https://github.com/braam/unify/tree/master/circuit-webhook-python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix index 70333fb47a9a..f33ce69fc550 100644 --- a/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -42,6 +42,8 @@ buildPythonPackage rec { --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/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix new file mode 100644 index 000000000000..e6db689a45c5 --- /dev/null +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, passlib +, dnspython +, loguru +, toml +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ciscoconfparse"; + version = "1.6.36"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "mpenning"; + repo = pname; + rev = version; + sha256 = "sha256-nIuuqAxz8eHEQRuH8nfYVQ+vGMmcDcARJLizoI5Mty8="; + }; + + postPatch = '' + patchShebangs tests + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + passlib + dnspython + loguru + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + "tests/parse_test.py" + ]; + + disabledTests = [ + "test_dns_lookup" + "test_reverse_dns_lookup" + ]; + + pythonImportsCheck = [ "ciscoconfparse" ]; + + meta = with lib; { + description = + "Parse, Audit, Query, Build, and Modify Cisco IOS-style configurations"; + homepage = "https://github.com/mpenning/ciscoconfparse"; + license = licenses.gpl3Only; + maintainers = [ maintainers.astro ]; + }; +} diff --git a/pkgs/development/python-modules/ckcc-protocol/default.nix b/pkgs/development/python-modules/ckcc-protocol/default.nix index 409164cf830e..670e4a3c9237 100644 --- a/pkgs/development/python-modules/ckcc-protocol/default.nix +++ b/pkgs/development/python-modules/ckcc-protocol/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ckcc-protocol"; - version = "1.2.1"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "65f0313f9915b36068f6dfcab08e04671621e6227650443bc12e81997081ae7f"; + sha256 = "sha256-UVLKJHDPxi9ivY3JyIySmce0NUhxIIlIxVTdPoXMaKM="; }; propagatedBuildInputs = [ click ecdsa hidapi pyaes ]; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index f026f39ccf0f..9816ff3782b3 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.1.11508"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xCtITYRiIBtJQ8FIr0NJC30YWoU8iZ4gMGv2blnFNIk="; + sha256 = "sha256-YrR8OkDoop6kHAuk4cM4STYYOjjaMLZCQuE07/5IXqs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index abe85946260f..6c8126172c05 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.1.11508"; + version = "9.1.12332"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-/5GKuf+nmt1/M6yAhZy9+itMnIVUGHP7BqEIxjNjep8="; + hash = "sha256-xcj6Skzzmw5g+0KsBMLNOhRyXQA7nbgnc9YyfJLteCM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index 19fdac37615a..dcfcab597b90 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -1,18 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, - click, jinja2, shellingham, six +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 + +# propagates +, click +, jinja2 +, shellingham +, six }: buildPythonPackage rec { pname = "click-completion"; version = "0.5.2"; - disabled = (!isPy3k); + disabled = isPy27; src = fetchPypi { inherit pname version; sha256 = "5bf816b81367e638a190b6e91b50779007d14301b3f9f3145d68e3cade7bce86"; }; - propagatedBuildInputs = [ click jinja2 shellingham six ]; + propagatedBuildInputs = [ + click + jinja2 + shellingham + six + ]; + + pythonImportsCheck = [ + "click_completion" + ]; + + # has no tests + doCheck = false; meta = with lib; { description = "Add or enhance bash, fish, zsh and powershell completion in Click"; diff --git a/pkgs/development/python-modules/click-configfile/default.nix b/pkgs/development/python-modules/click-configfile/default.nix index 0d87aa890d2a..62e0ed2d3b60 100644 --- a/pkgs/development/python-modules/click-configfile/default.nix +++ b/pkgs/development/python-modules/click-configfile/default.nix @@ -4,15 +4,19 @@ , click , six , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "click-configfile"; version = "0.2.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "lb7sE77pUOmPQ8gdzavvT2RAkVWepmKY+drfWTUdkNE="; + hash = "sha256-lb7sE77pUOmPQ8gdzavvT2RAkVWepmKY+drfWTUdkNE="; }; propagatedBuildInputs = [ @@ -24,6 +28,15 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "install_requires=install_requires," 'install_requires=["click >= 6.6", "six >= 1.10"],' + ''; + + pythonImportsCheck = [ + "click_configfile" + ]; + disabledTests = [ "test_configfile__with_unbound_section" "test_matches_section__with_bad_arg" diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 3e2e8b6e24f1..6d865307f9be 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -5,6 +5,14 @@ , importlib-metadata , locale , pytestCheckHook + +# large-rebuild downstream dependencies +, flask +, black + +# applications +, magic-wormhole +, mitmproxy }: buildPythonPackage rec { @@ -29,6 +37,10 @@ buildPythonPackage rec { pytestCheckHook ]; + passthru.tests = { + inherit black flask magic-wormhole mitmproxy; + }; + meta = with lib; { homepage = "https://click.palletsprojects.com/"; description = "Create beautiful command line interfaces in Python"; @@ -37,5 +49,6 @@ buildPythonPackage rec { composable way, with as little code as necessary. ''; license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/clickhouse-cli/default.nix b/pkgs/development/python-modules/clickhouse-cli/default.nix index 68d69023e25d..4806f965f092 100644 --- a/pkgs/development/python-modules/clickhouse-cli/default.nix +++ b/pkgs/development/python-modules/clickhouse-cli/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "clickhouse-cli"; - version = "0.3.7"; + version = "0.3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fDvUdL6LzgCv6LDmB0R0M7v6BbnbL68p9pHMebP58h8="; + sha256 = "sha256-pa3vkIyNblS1LOwBReTqg8JAR2Ii32a2QIHWjau0uZE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index ce229665c659..39c5a497c8d8 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -3,21 +3,24 @@ , fetchPypi , autopage , cmd2 +, installShellFiles +, openstackdocstheme , pbr , prettytable , pyparsing , pyyaml , stevedore +, sphinx , callPackage }: buildPythonPackage rec { pname = "cliff"; - version = "3.10.0"; + version = "3.10.1"; src = fetchPypi { inherit pname version; - sha256 = "c68aac08d0d25853234a38fdbf1f33503849af3d5d677a4d0aacd42b0be6a4a1"; + sha256 = "sha256-BFruPzxkRxll161QfOhHSk4vIIFfu1QFp3D4WWoqAKA="; }; postPatch = '' @@ -26,6 +29,12 @@ buildPythonPackage rec { rm test-requirements.txt ''; + nativeBuildInputs = [ + installShellFiles + openstackdocstheme + sphinx + ]; + propagatedBuildInputs = [ autopage cmd2 @@ -36,6 +45,11 @@ buildPythonPackage rec { stevedore ]; + postInstall = '' + sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man + installManPage doc/build/man/cliff.1 + ''; + # check in passthru.tests.pytest to escape infinite recursion with stestr doCheck = false; diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix index 66e2d5f52f38..45733c4ae7f1 100644 --- a/pkgs/development/python-modules/clint/default.nix +++ b/pkgs/development/python-modules/clint/default.nix @@ -22,12 +22,18 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; + propagatedBuildInputs = [ pillow blessings args ]; + + # nose-progressive and clint are not actively maintained + # no longer compatible as behavior demand 2to3, which was removed + # in setuptools>=58 + doCheck = false; + checkInputs = [ mock nose nose_progressive pkgs.glibcLocales ]; checkPhase = '' ${python.interpreter} test_clint.py ''; - buildInputs = [ mock nose nose_progressive pkgs.glibcLocales ]; - propagatedBuildInputs = [ pillow blessings args ]; + pythonImportsCheck = [ "clint" ]; meta = with lib; { homepage = "https://github.com/kennethreitz/clint"; diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index a21faa492dfe..39e3fe9d84cb 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, attrs , beautifulsoup4 , requests , future @@ -18,6 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + attrs beautifulsoup4 requests future diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index f525b6e7f1df..0e0debe93291 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "1.6.0"; + version = "2.0.0"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "9bc994f9e9447593bd0a45371f0e7ac7333710fcf64a4eb9834bf149f4ef2f32"; + sha256 = "5cd02f3b417a783ba84a4ec3e290ff7929009fe51f6405423cfccfadd43ba4a4"; }; buildInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/cloudscraper/default.nix b/pkgs/development/python-modules/cloudscraper/default.nix index cd11aa03f863..6f693f369cda 100644 --- a/pkgs/development/python-modules/cloudscraper/default.nix +++ b/pkgs/development/python-modules/cloudscraper/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, isPy3k +, pythonOlder , fetchPypi , requests , requests-toolbelt @@ -9,12 +9,14 @@ buildPythonPackage rec { pname = "cloudscraper"; - version = "1.2.58"; - disabled = !isPy3k; + version = "1.2.60"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1wnzv2k8cm8q1x18r4zg8pcnpm4gsdp82hywwjimp2v2qll918nx"; + hash = "sha256-DTQTsv/59895UTsMmqxYtSfFosUWPRx8wMT4zKHQ9Oc="; }; propagatedBuildInputs = [ @@ -27,10 +29,12 @@ buildPythonPackage rec { # nixpkgs yet, and also aren't included in the PyPI bundle. TODO. doCheck = false; - pythonImportsCheck = [ "cloudscraper" ]; + pythonImportsCheck = [ + "cloudscraper" + ]; meta = with lib; { - description = "A Python module to bypass Cloudflare's anti-bot page"; + description = "Python module to bypass Cloudflare's anti-bot page"; homepage = "https://github.com/venomous/cloudscraper"; license = licenses.mit; maintainers = with maintainers; [ kini ]; diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 0e1aca73522e..032035506005 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "1.8.2"; + version = "1.42.3"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "f00410210f0efa1af7a2d344deafc12b946e3efc7d5c8374b27dc67ed8580183"; + sha256 = "sha256-P0QuKkyFk3jvYJwtul0/eUTrDyj2QKAjU/Ac+4VCYYk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudsplaining/default.nix b/pkgs/development/python-modules/cloudsplaining/default.nix index 13720f9d88bc..20d822d8ee77 100644 --- a/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/pkgs/development/python-modules/cloudsplaining/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cloudsplaining"; - version = "0.4.10"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = pname; rev = version; - hash = "sha256-zTsqrHu8eQsQ4ZFocvHdVsgCjWE6JVrlyaztFNir2fk="; + hash = "sha256-HdZHRK/Q544z9ySbjNIjqiXzel0UTsnb9tuXawbkwZg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch b/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch deleted file mode 100644 index 9939e6fb43a0..000000000000 --- a/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -80,7 +80,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "clvm_rs" --version = "0.1.14" -+version = "0.1.15" - dependencies = [ - "bls12_381", - "hex", diff --git a/pkgs/development/python-modules/clvm-rs/default.nix b/pkgs/development/python-modules/clvm-rs/default.nix index ec078970bc1a..7b5a5a96a8c9 100644 --- a/pkgs/development/python-modules/clvm-rs/default.nix +++ b/pkgs/development/python-modules/clvm-rs/default.nix @@ -5,35 +5,59 @@ , pythonOlder , openssl , perl +, pkgs }: +let + # clvm-rs does not work with maturin 0.12 + # https://github.com/Chia-Network/clvm_rs/commit/32fba40178a5440a1306623f47d8b0684ae2339a#diff-50c86b7ed8ac2cf95bd48334961bf0530cdc77b5a56f852c5c61b89d735fd711 + maturin_0_11 = with pkgs; rustPlatform.buildRustPackage rec { + pname = "maturin"; + version = "0.11.5"; + src = fetchFromGitHub { + owner = "PyO3"; + repo = "maturin"; + rev = "v${version}"; + hash = "sha256-hwc6WObcJa6EXf+9PRByUtiupMMYuXThA8i/K4rl0MA="; + }; + cargoHash = "sha256-qGCEfKpQwAC57LKonFnUEgLW4Cc7HFJgSyUOzHkKN9c="; + + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = lib.optionals stdenv.isLinux [ dbus ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ]; + + # Requires network access, fails in sandbox. + doCheck = false; + }; +in + buildPythonPackage rec { pname = "clvm_rs"; - version = "0.1.15"; + version = "0.1.19"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm_rs"; rev = version; - sha256 = "sha256-4QFreQlRjKqGhPvuXU/pZpxMfF8LkIf6X7C3K2q77MI="; + sha256 = "sha256-mCKY/PqNOUTaRsFDxQBvbTD6wC4qzP0uv5FldYkwl6c="; }; - patches = [ - # upstream forgot to refresh the lock file - ./bump-cargo-lock.patch - ]; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src patches; + inherit src; name = "${pname}-${version}"; - sha256 = "sha256-jPNU+P6JgxTPL1GYUBE4VPU3p6cgL8u/+AIELr7r5Mk="; + sha256 = "sha256-TmrR8EeySsGWXohMdo3dCX4oT3l9uLVv5TUeRxCBQeE="; }; format = "pyproject"; + buildAndTestSubdir = "wheel"; + nativeBuildInputs = [ perl # used by openssl-sys to configure + maturin_0_11 ] ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index c0863a5b3945..d609508822e4 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "cmarkgfm"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-plwVL52ov4JxTxnCh/4JaO6Of4mejZRQPXPQ/lcinBk="; + sha256 = "sha256-/oWbDpjSIrS0WAIgB9qsJ1fpcPBnHUXlXQGTHBtLs8s="; }; propagatedNativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 7cf357cc4c65..d24d3bc79822 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.6.1"; + version = "1.6.2"; # - we need to use the tarball from PyPi # or the full git checkout (with .git) @@ -20,7 +20,7 @@ buildPythonPackage rec { # because it does not include required metadata src = fetchPypi { inherit pname version; - sha256 = "b644a15ea1e62c55041176468976541cba30a8a5e99a5e9a2c07ee595c2b4e95"; + sha256 = "sha256-SY+1727DbWMg6CnmHw8k/VP0dwBRYszn+YyyvZXgvUs="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/commentjson/default.nix b/pkgs/development/python-modules/commentjson/default.nix index 2aefb51d481e..c1d3b8916d91 100644 --- a/pkgs/development/python-modules/commentjson/default.nix +++ b/pkgs/development/python-modules/commentjson/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, six, lark-parser, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, six, lark, pytestCheckHook }: buildPythonPackage rec { pname = "commentjson"; @@ -13,13 +13,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "lark-parser>=0.7.1,<0.8.0" "lark-parser" + --replace "lark-parser>=0.7.1,<0.8.0" "lark" # NixOS is missing test.test_json module rm -r commentjson/tests/test_json ''; - propagatedBuildInputs = [ lark-parser six ]; + propagatedBuildInputs = [ lark six ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/compreffor/default.nix b/pkgs/development/python-modules/compreffor/default.nix new file mode 100644 index 000000000000..942773902583 --- /dev/null +++ b/pkgs/development/python-modules/compreffor/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, fonttools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "compreffor"; + version = "0.5.1.post1"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "Zqia+yP4Dp5VNGeMwv+j04aNm9oVmZ2juehbfEzDfOQ="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + fonttools + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # Tests cannot seem to open the cpython module. + doCheck = false; + + pythonImportsCheck = [ + "compreffor" + ]; + + meta = with lib; { + description = "CFF table subroutinizer for FontTools"; + homepage = "https://github.com/googlefonts/compreffor"; + license = licenses.asl20; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/concurrent-log-handler/default.nix b/pkgs/development/python-modules/concurrent-log-handler/default.nix index 5880cdf961e7..d75df29421d3 100644 --- a/pkgs/development/python-modules/concurrent-log-handler/default.nix +++ b/pkgs/development/python-modules/concurrent-log-handler/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "concurrent-log-handler"; - version = "0.9.19"; + version = "0.9.20"; src = fetchPypi { inherit pname version; - hash = "sha256-sS95q+0/lBIcJc6cJM21fYiSguxv9h9VNasgaNw31Ak="; + hash = "sha256-n6KtYUdKE3tWQnAr0z8hgVWYqsuh51E5s3zrLO3aj58="; }; propagatedBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python logging handler that allows multiple processes to safely write to the same log file concurrently"; - homepage = "https://www.chia.net/"; + homepage = "https://pypi.org/project/concurrent-log-handler"; license = licenses.asl20; maintainers = teams.chia.members; }; diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 1bb036b97df5..7c1594e9e805 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "configargparse"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "bw2"; repo = "ConfigArgParse"; - rev = version; - sha256 = "1hgd0gfxycfnlddwsr8sl6ybxzp8rqhin16vphbl8q32wp5hhjd2"; + rev = "v${version}"; + sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix index 9f67aacf2d4e..2cd66636b016 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell/default.nix @@ -1,4 +1,10 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pyparsing, six, urwid }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, pyparsing +, six +, urwid +}: buildPythonPackage rec { pname = "configshell"; @@ -11,11 +17,28 @@ buildPythonPackage rec { sha256 = "0mjj3c9335sph8rhwww7j4zvhyk896fbmx887vibm89w3jpvjjr9"; }; - propagatedBuildInputs = [ pyparsing six urwid ]; + propagatedBuildInputs = [ + pyparsing + six + urwid + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pyparsing >=2.0.2,<3.0" "pyparsing >=2.0.2" + ''; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "configshell" + ]; meta = with lib; { - description = "A Python library for building configuration shells"; + description = "Python library for building configuration shells"; homepage = "https://github.com/open-iscsi/configshell-fb"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index 2b350be00460..e28621f26a99 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -1,24 +1,24 @@ -{ buildPythonPackage -, enum34 +{ lib +, buildPythonPackage , fetchFromGitHub , flit-core -, isPy27 -, lib -, pathlib , pyyaml , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "confuse"; - version = "1.5.0"; + version = "1.7.0"; format = "flit"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "beetbox"; repo = pname; rev = "v${version}"; - sha256 = "1kvilxhjifvz6ra64jadf9jiwphrah5rcb9ryq0v7w1dywgn4qp7"; + sha256 = "sha256-zdH5DNXnuAfYTuaG9EIKiXL2EbLSfzYjPSkC3G06bU8="; }; nativeBuildInputs = [ @@ -27,16 +27,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml - ] ++ lib.optionals isPy27 [ - enum34 - pathlib - ] ; + ]; checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "confuse" ]; + pythonImportsCheck = [ + "confuse" + ]; meta = with lib; { description = "Python configuration library for Python that uses YAML"; diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index bfe4fc221445..6ccd3c98c213 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.10.0"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "zalando"; repo = pname; rev = version; - sha256 = "sha256-a1wj72XpjXvhWCxRLrGeDatS8a4ij9YAm9FGhTBq/i8="; + sha256 = "sha256-JMuI3h0Pg7nCXrJtF0fhSFJTOWelEqcvmqv3ooIfkqM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cons/default.nix b/pkgs/development/python-modules/cons/default.nix new file mode 100644 index 000000000000..2977051d87b2 --- /dev/null +++ b/pkgs/development/python-modules/cons/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, logical-unification +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "cons"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "python-cons"; + rev = "fbeedfc8a3d1bff4ba179d492155cdd55538365e"; + sha256 = "sha256-ivHFep9iYPvyiBIZKMAzqrLGnQkeuxd0meYMZwZFFH0="; + }; + + propagatedBuildInputs = [ + logical-unification + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "cons" ]; + + meta = with lib; { + description = "An implementation of Lisp/Scheme-like cons in Python"; + homepage = "https://github.com/pythological/python-cons"; + changelog = "https://github.com/pythological/python-cons/releases"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix index c36e353e3bf2..e19255c4479d 100644 --- a/pkgs/development/python-modules/coqpit/default.nix +++ b/pkgs/development/python-modules/coqpit/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "coqpit"; - version = "0.0.14"; + version = "0.0.15"; format = "setuptools"; src = fetchFromGitHub { owner = "coqui-ai"; repo = pname; rev = "v${version}"; - sha256 = "041sx7ph8vfx8ivvm6hjj6s83p9lni2agwyrrncqwhcbjy9pbdf1"; + sha256 = "sha256-i2Lf7YQ9Ht4AlmfIBvJTWNPgEk8Kv92rs5VxuPgvR5U="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/coqui-trainer/default.nix b/pkgs/development/python-modules/coqui-trainer/default.nix new file mode 100644 index 000000000000..3c447db0a0e1 --- /dev/null +++ b/pkgs/development/python-modules/coqui-trainer/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchpatch +, fetchFromGitHub +, pythonAtLeast + +, coqpit +, fsspec +, pytorch-bin + +, pytestCheckHook +, soundfile +, torchvision-bin +}: + +let + pname = "coqui-trainer"; + version = "0.0.5"; +in +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + disabled = pythonAtLeast "3.10"; # https://github.com/coqui-ai/Trainer/issues/22 + + src = fetchFromGitHub { + owner = "coqui-ai"; + repo = "Trainer"; + rev = "v${version}"; + hash = "sha256-NsgCh+N2qWmRkTOjXqisVCP5aInH2zcNz6lsnIfVLiY="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/coqui-ai/Trainer/commit/07b447abf3290c8f2e5e723687b8a480b7382265.patch"; + sha256 = "0v1hl784d9rghkblcfwgzp0gg9d6r5r0yv2kapzdz2qymiajy7y2"; + }) + ]; + + propagatedBuildInputs = [ + coqpit + fsspec + pytorch-bin + soundfile + ]; + + # only one test and that requires training data from the internet + doCheck = false; + + checkInputs = [ + pytestCheckHook + torchvision-bin + ]; + + pythonImportsCheck = [ + "trainer" + ]; + + meta = with lib; { + description = "A general purpose model trainer, as flexible as it gets"; + homepage = "https://github.com/coqui-ai/Trainer"; + license = licenses.asl20; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index f93d32d392f7..f1930b88fb8c 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -2,15 +2,18 @@ , buildPythonPackage , fetchPypi , mock +, pythonOlder }: buildPythonPackage rec { pname = "coverage"; - version = "5.5"; + version = "6.2"; + # uses f strings + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"; + sha256 = "e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8"; }; # No tests in archive diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index d73ee597adc5..1b122f9b5e41 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -4,22 +4,21 @@ , python-dateutil , pytestCheckHook , pytz -, natsort , tzlocal }: buildPythonPackage rec { pname = "croniter"; - version = "1.1.0"; + version = "1.3.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "4023e4d18ced979332369964351e8f4f608c1f7c763e146b1d740002c4245247"; + hash = "sha256-MWk2WRaDS+ZUwsrFfqFNcQ50L464pfzoBPbOVI2oC/I="; }; propagatedBuildInputs = [ python-dateutil - natsort ]; checkInputs = [ @@ -28,12 +27,14 @@ buildPythonPackage rec { tzlocal ]; - pythonImportsCheck = [ "croniter" ]; + pythonImportsCheck = [ + "croniter" + ]; meta = with lib; { - description = "croniter provides iteration for datetime object with cron like format"; + description = "Library to iterate over datetime object with cron like format"; homepage = "https://github.com/kiorky/croniter"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/crownstone-uart/default.nix b/pkgs/development/python-modules/crownstone-uart/default.nix index b8ed7721f064..12aa1590742a 100644 --- a/pkgs/development/python-modules/crownstone-uart/default.nix +++ b/pkgs/development/python-modules/crownstone-uart/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "crownstone-uart"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "crownstone"; repo = "crownstone-lib-python-uart"; rev = version; - sha256 = "sha256-5K7NzJ7fKOW4Uh1XIlicVkRZuM84qTM5RQc/DfP9OEc="; + sha256 = "sha256-temf+uvGWMMtnhBpbYtTj6OzKqo3Xaa11Q2VX2+HTZc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix index 6c1c5de2c56a..265504938df9 100644 --- a/pkgs/development/python-modules/cssutils/default.nix +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -4,6 +4,7 @@ , pythonOlder , fetchpatch , fetchPypi +, setuptools , setuptools-scm , toml , importlib-metadata @@ -11,28 +12,24 @@ , lxml , mock , pytestCheckHook +, importlib-resources }: buildPythonPackage rec { pname = "cssutils"; - version = "2.3.0"; + version = "2.4.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-stOxYEfKroLlxZADaTW6+htiHPRcLziIWvS+SDjw/QA="; + hash = "sha256-LZchCoOwo/4eRGn1/5pkILB4VyA1GIsbq3EDw6NtyJs="; }; - patches = lib.optionals (pythonAtLeast "3.10") [ - # fix tests for python3.10 - (fetchpatch { - url = "https://github.com/jaraco/cssutils/pull/17/commits/355b1795dde77bd4b49d8df35377230fdb503802.patch"; - sha256 = "sha256-hwe8oeZO2rq00cs079lje3wjQDEczAu3Tfy/X/M9+GQ="; - }) - ]; - nativeBuildInputs = [ + setuptools setuptools-scm toml ]; @@ -46,6 +43,8 @@ buildPythonPackage rec { lxml mock pytestCheckHook + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; disabledTests = [ @@ -53,11 +52,6 @@ buildPythonPackage rec { "test_parseUrl" "encutils" "website.logging" - ] ++ lib.optionals (pythonOlder "3.9") [ - # AttributeError: module 'importlib.resources' has no attribute 'files' - "test_parseFile" - "test_parseString" - "test_combine" ]; pythonImportsCheck = [ "cssutils" ]; diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index 67342d9eccc8..7ae79f4ec59f 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -1,13 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder , attrs , isodate , python-dateutil , rfc3986 , uritemplate -, mock , pytestCheckHook , pytest-mock }: @@ -15,6 +15,8 @@ buildPythonPackage rec { pname = "csvw"; version = "1.11.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -24,10 +26,6 @@ buildPythonPackage rec { sha256 = "1393xwqawaxsflbq62vks92vv4zch8p6dd1mdvdi7j4vvf0zljkg"; }; - patchPhase = '' - substituteInPlace setup.cfg --replace "--cov" "" - ''; - propagatedBuildInputs = [ attrs isodate @@ -37,15 +35,28 @@ buildPythonPackage rec { ]; checkInputs = [ - mock pytestCheckHook pytest-mock ]; + patchPhase = '' + substituteInPlace setup.cfg \ + --replace "--cov" "" + ''; + disabledTests = [ # this test is flaky on darwin because it depends on the resolution of filesystem mtimes # https://github.com/cldf/csvw/blob/45584ad63ff3002a9b3a8073607c1847c5cbac58/tests/test_db.py#L257 "test_write_file_exists" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + # https://github.com/cldf/csvw/issues/58 + "test_roundtrip_escapechar" + "test_escapequote_escapecharquotechar_final" + "test_doubleQuote" + ]; + + pythonImportsCheck = [ + "csvw" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 250d337a07f6..2ae38e50513a 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "10.1.0"; + version = "10.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ad28e7311b2023391f2278b7649828decdd9d9599848e18845eb4ab1b2d01936"; + sha256 = "sha256-5ovvA76QGOsOnVztMfDgLerks5nJrKR08rLc+ArmWA8="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 70c29e1f30be..dfae672f95e0 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -17,13 +17,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); buildPythonPackage rec { pname = "cvxopt"; - version = "1.2.7"; + version = "1.3.0"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - sha256 = "3f9db1f4d4e820aaea81d6fc21054c89dc6327c84f935dd5a1eda1af11e1d504"; + sha256 = "sha256-ALGyMvnR+QLVeKnXWBS2f6AgdY1a5CLijKjO9iafpcY="; }; buildInputs = [ blas lapack ]; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 79ed1ebac5f2..73609966ba84 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.18"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-W67+Hy7Wk3dJspNYbGzk9C7TDniQIj92Ycyyu333C+8="; + sha256 = "sha256-QURm/ehJovqr/ZRE7ILKLnvxQsAdcjdSTPlzCt60IBw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix index ede96fc3b41d..c3778415e570 100644 --- a/pkgs/development/python-modules/cwcwidth/default.nix +++ b/pkgs/development/python-modules/cwcwidth/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cwcwidth"; - version = "0.1.4"; + version = "0.1.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "1azrphpkcyggg38xvkfb9dpc4xmmm90p02kf8dkqd4d6j5w96aj8"; + sha256 = "1b31da599c9f0cf41f39ed10c1ceaa01d6024e31c6cd9aea2885b1f2a6d15fba"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/dasbus/default.nix b/pkgs/development/python-modules/dasbus/default.nix new file mode 100644 index 000000000000..96a4eccbc582 --- /dev/null +++ b/pkgs/development/python-modules/dasbus/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, pygobject3, dbus }: + +buildPythonPackage rec { + pname = "dasbus"; + version = "1.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FJrY/Iw9KYMhq1AVm1R6soNImaieR+IcbULyyS5W6U0="; + }; + + propagatedBuildInputs = [ pygobject3 ]; + checkInputs = [ dbus ]; + + meta = with lib; { + homepage = "https://github.com/rhinstaller/dasbus"; + description = "DBus library in Python3"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 3fd9d2a41d58..dc0813acefa6 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -10,17 +10,21 @@ , pytest-mock , mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "dash"; - version = "2.0.0"; + version = "2.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0RvA5qkwQJGyy81D5kW+IR6LbaD/KBwMy6kYxTETubg="; + sha256 = "sha256-iH56c2PO1G/NlLmYC+6sdAMZ+kXvUkpkqxfnl9EmDsQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 60df07076827..31be98f45912 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -17,13 +17,13 @@ }: buildPythonPackage rec { - version = "2021.11.30"; + version = "2022.1.22"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "4f73306b5ee56e9b41b133697062d0028d30b1ece883ac6b56532fea5bd3e94a"; + sha256 = "21a128e9f4f10e3b39cf82b36266eae28b17d16f2f6aa351bd73eb361e49326a"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 39d01559d460..7af0eca747e8 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -18,12 +18,11 @@ , pythonOlder , pyyaml , toolz -, withExtraComplete ? false }: buildPythonPackage rec { pname = "dask"; - version = "2021.10.0"; + version = "2022.02.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,19 +31,9 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "07ysrs46x5w8rc2df0j06rsw58ahcysd6lwjk5riqpjlpwdfmg7p"; + hash = "sha256-tDqpIS8j6a16YbJak+P1GkCEZvJyheWV5vkUrkhScRY="; }; - patches = [ - # remove with next bump - (fetchpatch { - name = "fix-tests-against-distributed-2021.10.0.patch"; - url = "https://github.com/dask/dask/commit/cd65507841448ad49001cf27564102e2fb964d0a.patch"; - includes = [ "dask/tests/test_distributed.py" ]; - sha256 = "1i4i4k1lzxcydq9l80jyifq21ny0j3i47rviq07ai488pvx1r2al"; - }) - ]; - propagatedBuildInputs = [ cloudpickle fsspec @@ -56,9 +45,6 @@ buildPythonPackage rec { jinja2 bokeh numpy - ] ++ lib.optionals (withExtraComplete) [ - # infinite recursion between distributed and dask - distributed ]; doCheck = true; @@ -82,7 +68,7 @@ buildPythonPackage rec { pytestFlagsArray = [ # parallelize - "--numprocesses auto" + "--numprocesses $NIX_BUILD_CORES" # rerun failed tests up to three times "--reruns 3" # don't run tests that require network access @@ -114,6 +100,10 @@ buildPythonPackage rec { "dask.diagnostics" ]; + passthru.extras-require = { + complete = [ distributed ]; + }; + meta = with lib; { description = "Minimal task scheduling abstraction"; homepage = "https://dask.org/"; diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index 2facff6c840b..518d2066853a 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -14,7 +14,8 @@ buildPythonPackage rec { pname = "databases"; - version = "0.5.3"; + version = "0.5.5"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-67ykx7HKGgRvJ+GRVEI/e2+x51kfHHFjh/iI4tY+6aE="; + hash = "sha256-NOXK1UCQzqvJRfzsgIfpihuD9oF52sMD+BxqUHWF8Rk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index bb8bda922872..25fd92871012 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "databricks-cli"; - version = "0.16.2"; + version = "0.16.4"; src = fetchPypi { inherit pname version; - sha256 = "3e9a65a19a589b795ebbd9b3b16a8e470d612d57d6216ae44a9c7a735e4080e6"; + sha256 = "sha256-GBiQaBg7YY31bJft0W8Iq7WXhX98wPgPFHdNwuZ7WQY="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 7df195b3aacb..d242c59acdbd 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -1,12 +1,22 @@ -{ lib, jdk8, buildPythonPackage, fetchPypi, six, py4j }: +{ lib +, jdk8 +, buildPythonPackage +, fetchPypi +, six +, py4j +, pythonOlder +}: buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.5"; + version = "9.1.10"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "26b88b1d8fdacf5226cf9c1924fae974c955ccbfe2fdcd08574327007bdcbdd9"; + sha256 = "sha256-OR3TXO6IzqwqbBbfFf+FGIUbwTa0DoKry84e1hL0I3Q="; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index 196d3b913776..2a4fd2cef42b 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "lidatong"; repo = pname; rev = "v${version}"; - sha256 = "09253p0zjqfaqap7jgfgjl1jswwnz7mb6x7dqix09id92mnb89mf"; + sha256 = "1xv9br6mm5pcwfy10ykbc1c0n83fqyj1pa81z272kqww7wpkkp6j"; }; propagatedBuildInputs = [ @@ -30,11 +30,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # AssertionError: Type annotations check failed - "test_type_hints" - ]; - pythonImportsCheck = [ "dataclasses_json" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix index b87ce1803c0d..145342a60a36 100644 --- a/pkgs/development/python-modules/datamodeldict/default.nix +++ b/pkgs/development/python-modules/datamodeldict/default.nix @@ -1,27 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , xmltodict }: buildPythonPackage rec { - version = "0.9.8"; - pname = "DataModelDict"; + pname = "datamodeldict"; + version = "0.9.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "65c36954efa17449c69a4d8cb11c9273593ef01428cd77a609ee134eba771550"; + pname = "DataModelDict"; + inherit version; + hash = "sha256-DadBRsc8qEu9PWgMNllGS2ESKL7kgBLDhg4yDr87WRk="; }; - propagatedBuildInputs = [ xmltodict ]; + propagatedBuildInputs = [ + xmltodict + ]; # no tests doCheck = false; + pythonImportsCheck = [ + "DataModelDict" + ]; + meta = with lib; { - homepage = "https://github.com/usnistgov/DataModelDict/"; description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML"; + homepage = "https://github.com/usnistgov/DataModelDict/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index b4b60da17f9f..ab5e929818c6 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "datasets"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = version; - sha256 = "sha256-5J2hhy52eZqVSaeJNIOM9RzZatq3aewAulS3OX76+Io="; + sha256 = "0bsk3jldvcxak64dhlxkqax7mf83z6qpwfgfk32rni1gpnz5pqbd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 7908b3c6b496..f2a0d531a0a7 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -18,7 +18,6 @@ , httpx # Check Inputs , pytestCheckHook -, pytest-runner , pytest-asyncio , pytest-timeout , aiohttp @@ -31,7 +30,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.59.4"; + version = "0.61.1"; disabled = pythonOlder "3.6"; @@ -39,11 +38,9 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-bH/VREo2f84wloA2jgXnQkGNSRRRYmSvUXmI0wMfmYM="; + sha256 = "sha256-HVzMyF4ujYK12UQ25il/XROPo+iBldsMxOTx+duoc5o="; }; - nativeBuildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ aiofiles asgi-csrf @@ -74,6 +71,8 @@ buildPythonPackage rec { ]; postConfigure = '' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" substituteInPlace setup.py \ --replace "click-default-group~=1.2.2" "click-default-group" \ --replace "hupper~=1.9" "hupper" \ diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index d4515b064833..152582f6716f 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { param pyct scipy - ]; + ] ++ dask.extras-require.complete; checkInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix index bbfa60f03b69..8994e1d28cd2 100644 --- a/pkgs/development/python-modules/dbutils/default.nix +++ b/pkgs/development/python-modules/dbutils/default.nix @@ -2,21 +2,29 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - version = "3.0.1"; pname = "dbutils"; + version = "3.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "DBUtils"; - sha256 = "6ec83f4d75d7a7b42a92e86b775f251e2671639b3b2123fe13a5d8d8fe7c5643"; + hash = "sha256-+t65eeFAbcEj4tuZVfMU4NU2DzBOC9bPBHqqX8P99bM="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "dbutils" ]; + pythonImportsCheck = [ + "dbutils" + ]; meta = with lib; { description = "Database connections for multi-threaded environments"; diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index f260727b87a6..5efad065011d 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -9,11 +9,19 @@ buildPythonPackage rec { sha256 = "0bvshly83c4h5jhxaa97z192viczymz5fxp6vl8awjmmrs9l9x8i"; }; + postPatch = '' + sed -i '/use_2to3=True/d' setup.py + ''; + propagatedBuildInputs = [ numpy matplotlib ]; + preBuild = '' + 2to3 -wn deap + ''; + checkInputs = [ nose ]; checkPhase = '' - ${python.interpreter} setup.py nosetests --verbosity=3 + nosetests --verbosity=3 ''; meta = with lib; { diff --git a/pkgs/development/python-modules/debtcollector/default.nix b/pkgs/development/python-modules/debtcollector/default.nix index df3d78394605..1915b64aca80 100644 --- a/pkgs/development/python-modules/debtcollector/default.nix +++ b/pkgs/development/python-modules/debtcollector/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "debtcollector"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "c7a9fac814ab5904e23905516b18356cc907e7d27c05da58d37103f001967846"; + sha256 = "sha256-G8A+LZAX3kgMQc8+Wg2MyV8bDI8TOSgbTsqKIqz3aiM="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index dc58d8f7b039..9f6026ce7360 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.5.1"; + version = "1.6.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Microsoft"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dPP4stLt5nl9B9afPmH6/hpGKXBsaTpvYZQSHxU6KaY="; + sha256 = "sha256-WfZz2SimOTpG8CWNUic8NSp4Qd2JTXk+7JSUEPhuQ6Q="; }; patches = [ diff --git a/pkgs/development/python-modules/decopatch/default.nix b/pkgs/development/python-modules/decopatch/default.nix index 7fa3c6465db4..71e302a8b538 100644 --- a/pkgs/development/python-modules/decopatch/default.nix +++ b/pkgs/development/python-modules/decopatch/default.nix @@ -3,31 +3,42 @@ , fetchPypi , makefun , setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "decopatch"; - version = "1.4.8"; + version = "1.4.10"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0i6i811s2j1z0cl6y177dwsbfxib8dvb5c2jpgklvc2xy4ahhsy6"; + hash = "sha256-lX9JyT9BUBgsI/j7UdE7syE+DxenngnIzKcFdZi1VyA="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ makefun ]; + propagatedBuildInputs = [ + makefun + ]; postPatch = '' - substituteInPlace setup.py --replace "'pytest-runner', " "" + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" ''; + pythonImportsCheck = [ + "decopatch" + ]; + # Tests would introduce multiple cirucular dependencies # Affected: makefun, pytest-cases doCheck = false; - pythonImportsCheck = [ "decopatch" ]; - meta = with lib; { description = "Python helper for decorators"; homepage = "https://github.com/smarie/python-decopatch"; diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index 0c1889963157..e26c1a108188 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "decorator"; - version = "5.1.0"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7"; + sha256 = "637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/deep-translator/default.nix b/pkgs/development/python-modules/deep-translator/default.nix index cdc18f159fb9..a4f71774c4db 100644 --- a/pkgs/development/python-modules/deep-translator/default.nix +++ b/pkgs/development/python-modules/deep-translator/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deep-translator"; - version = "1.6.1"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "2611c54209b234730f3e5e6481cb875e120e49d9ec1a27a1fa89850150485975"; + sha256 = "sha256-Oi5dzrC19PnlExCOgu+bT5n3/XwgJkDirzl8ra8w7Nw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/deezer-py/default.nix b/pkgs/development/python-modules/deezer-py/default.nix index a05c7335214e..f36a73fc27d1 100644 --- a/pkgs/development/python-modules/deezer-py/default.nix +++ b/pkgs/development/python-modules/deezer-py/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "deezer-py"; - version = "1.3.6"; + version = "1.3.7"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a3ef151f7971d69769e7393f71373eaf896bccd22167213872ae46e04e14a2d7"; + sha256 = "sha256-saMy+IeAy6H9SgS8XHnZ9klFerGyr+vQqhuCtimgbEo="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 9c6663d2787f..0f01ebab4a55 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "5.0.0"; + version = "5.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "1vygyjmmin34iqmhq2l4qb9x2zgc41y6x50xavqzrkfkdd7vhwg6"; + sha256 = "sha256-jaF5vQx8/qP9pGLfilx86v1GxHbjxaRghjjI5Me0pU0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/demjson/default.nix b/pkgs/development/python-modules/demjson/default.nix deleted file mode 100644 index a25ecd74b5d0..000000000000 --- a/pkgs/development/python-modules/demjson/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, python -, buildPythonPackage -, fetchPypi -, isPy3k -}: - -buildPythonPackage rec { - pname = "demjson"; - version = "2.2.4"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii"; - }; - - doCheck = !(isPy3k); - - checkPhase = '' - ${python.interpreter} test/test_demjson.py - ''; - - pythonImportsCheck = [ - "demjson" - ]; - - meta = with lib; { - description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)"; - homepage = "https://github.com/dmeranda/demjson"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ bjornfor ]; - }; -} diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix index be1b705dc02b..08c794682713 100644 --- a/pkgs/development/python-modules/dendropy/default.nix +++ b/pkgs/development/python-modules/dendropy/default.nix @@ -2,17 +2,21 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "dendropy"; version = "4.5.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jeetsukumaran"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FP0+fJkkFtSysPxoHXjyMgF8pPin7aRyzmHe9bH8LlM="; + hash = "sha256-FP0+fJkkFtSysPxoHXjyMgF8pPin7aRyzmHe9bH8LlM="; }; checkInputs = [ @@ -27,9 +31,13 @@ buildPythonPackage rec { "test_group1" # AssertionError: 6 != 5 "test_by_num_lineages" + # AttributeError: module 'collections' has no attribute 'Iterable' + "test_findall_multiple" ]; - pythonImportsCheck = [ "dendropy" ]; + pythonImportsCheck = [ + "dendropy" + ]; meta = with lib; { description = "Python library for phylogenetic computing"; diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index 51d041e3a808..e0463a6c30c8 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -10,14 +10,15 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.3.2"; + version = "3.3.5"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h7an/Fm9pNnThCHXg9PAKG822dqXE/CUuW8lDJlwMfw="; + sha256 = "sha256-tXvA1EddTrOcTupQqZrX58jXiAqB5gMJP+OE3fZxGJI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index b71ce7c6c271..badbd3afbdb6 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -5,6 +5,7 @@ , pytestCheckHook , pythonOlder , requests +, setuptools-scm , websocket-client , zeroconf }: @@ -21,6 +22,12 @@ buildPythonPackage rec { sha256 = "sha256-N/48Q2IEL194vCzrPPuy+mRNejXfkoXy2t2oe0Y6ug4="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ requests zeroconf @@ -32,13 +39,6 @@ buildPythonPackage rec { pytest-mock ]; - postPatch = '' - # setup.py is not able to detect the version with setuptools_scm - substituteInPlace setup.py \ - --replace "setuptools_scm" "" \ - --replace 'use_scm_version=True' 'use_scm_version="${version}"' - ''; - # Disable test that requires network access disabledTests = [ "test__on_pong" diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix index d6173494e8dc..84d98d091356 100644 --- a/pkgs/development/python-modules/diagrams/default.nix +++ b/pkgs/development/python-modules/diagrams/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "diagrams"; - version = "0.21.0"; + version = "0.21.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mingrammer"; repo = pname; rev = "v${version}"; - sha256 = "1vj14kqffpafykyr9x5dcfhmqqvxq08lrp94lhqpdzikh6a0a0jx"; + sha256 = "sha256-YoXV5ikkBCSVyGmzEqp+7JLy82d7z9sbwS+U/EN3BFk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix index d519aa76c8b1..5655e18bae10 100644 --- a/pkgs/development/python-modules/diceware/default.nix +++ b/pkgs/development/python-modules/diceware/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "diceware"; - version = "0.9.6"; + version = "0.10"; src = fetchPypi { inherit pname version; - sha256 = "0klb0ysybzlh2wihvir82hgq62v0jjmlcqklwajyms7c0p529yby"; + sha256 = "sha256-srTMm1n1aNLvUb/fn34a+UHSX7j1wl8XAZHburzpZWk="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index 457e9d3e530b..a51ec5303cd2 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -1,18 +1,27 @@ -{ lib, fetchPypi, buildPythonPackage, six }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +}: buildPythonPackage rec { pname = "dict2xml"; - version = "1.7.0"; + version = "1.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0bfn8n8sb3slwx7ra8m8fbfy65k20h2qxcqfq99hwqrrkgcffihl"; + hash = "sha256-ZgCqMx8X7uODNhH3GJmkOnZhLKdVoVdpzyBJLEsaoBY="; }; - propagatedBuildInputs = [ six ]; + pythonImportsCheck = [ + "dict2xml" + ]; meta = with lib; { - description = "Super simple library to convert a Python dictionary into an xml string"; + description = "Library to convert a Python dictionary into an XML string"; homepage = "https://github.com/delfick/python-dict2xml"; license = licenses.mit; maintainers = with maintainers; [ johnazoidberg ]; diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index 1751271a2221..cbb44fb7ca4f 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -2,51 +2,61 @@ , buildPythonPackage , chardet , fetchPypi -, inflect , jinja2 , jinja2_pluralize +, pluggy , pycodestyle , pyflakes , pygments , pylint +, pytest-datadir , pytest-mock , pytestCheckHook , pythonOlder +, tomli }: buildPythonPackage rec { pname = "diff-cover"; - version = "5.5.0"; + version = "6.4.5"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "diff_cover"; inherit version; - sha256 = "e2d36131c13f571d9f5c4109b9e08b71ed00757eabec0156de74e33f6ef5627f"; + sha256 = "sha256-qUuMHBfcJEmJF/con+ODtFfYrU7yo//KgKiSpByLWKY="; }; propagatedBuildInputs = [ chardet - inflect jinja2 jinja2_pluralize + pluggy pygments + tomli ]; checkInputs = [ pycodestyle pyflakes pylint + pytest-datadir pytest-mock pytestCheckHook ]; disabledTests = [ - "added_file_pylint_console" + # Tests check for flake8 "file_does_not_exist" + # AssertionError: assert '.c { color:... + "test_style_defs" ]; - pythonImportsCheck = [ "diff_cover" ]; + pythonImportsCheck = [ + "diff_cover" + ]; meta = with lib; { description = "Automatically find diff lines that need test coverage"; diff --git a/pkgs/development/python-modules/discogs-client/default.nix b/pkgs/development/python-modules/discogs-client/default.nix index e47922f9577a..0295735abd75 100644 --- a/pkgs/development/python-modules/discogs-client/default.nix +++ b/pkgs/development/python-modules/discogs-client/default.nix @@ -5,18 +5,21 @@ , oauthlib , python-dateutil , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "discogs-client"; - version = "2.3.12"; + version = "2.3.14"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "joalla"; repo = "discogs_client"; rev = "v${version}"; - sha256 = "0y553x8rkgmqqg980n62pwdxbp75xalkhlb6k5g0cms42ggy5fsc"; + sha256 = "sha256-HJxqTwZ9byjZxdftQPTkVo0Ufio9gNGH69q5Q2gYR00="; }; propagatedBuildInputs = [ @@ -29,7 +32,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "discogs_client" ]; + pythonImportsCheck = [ + "discogs_client" + ]; meta = with lib; { description = "Unofficial Python API client for Discogs"; diff --git a/pkgs/development/python-modules/discovery30303/default.nix b/pkgs/development/python-modules/discovery30303/default.nix new file mode 100644 index 000000000000..49de32439d12 --- /dev/null +++ b/pkgs/development/python-modules/discovery30303/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "discovery30303"; + version = "0.2.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + # Commit points to 0.2.1, https://github.com/bdraco/discovery30303/issues/1 + rev = "0d0b0fdca1a98662dd2e6174d25853703bd6bf07"; + hash = "sha256-WSVMhiJxASxAkxs6RGuAVvEFS8TPxDKE9M99Rp8HKGM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=discovery30303" "" + ''; + + pythonImportsCheck = [ + "discovery30303" + ]; + + meta = with lib; { + description = "Module to discover devices that respond on port 30303"; + homepage = "https://github.com/bdraco/discovery30303"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index 1c565b3f158b..ec4e8ecdc6f5 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.3.3"; + version = "0.3.4"; src = fetchPypi { inherit pname version; - sha256 = "d982d0751ff6eaaab5e2ec8e691d949ee80eddf01a62eaa96ddb11531fe16b05"; + sha256 = "e4b58818180336dc9c529bfb9a0b58728ffc09ad92027a3f30b7cd91e3458579"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 6dfb531a78b6..ee86418a6651 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -19,20 +19,17 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.11.2"; - disabled = pythonOlder "3.6"; + version = "2022.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "f86a01a2e1e678865d2e42300c47552b5012cd81a2d354e47827a1fd074cc302"; + hash = "sha256-Gi9u7JczpnAEg53E7N5tXBfAeWZaLBVzRU3SpbU3bZU="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "dask == 2021.11.2" "dask" - ''; - propagatedBuildInputs = [ bokeh click @@ -49,10 +46,17 @@ buildPythonPackage rec { zict ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "dask == 2022.02.0" "dask" + ''; + # when tested random tests would fail and not repeatably doCheck = false; - pythonImportsCheck = [ "distributed" ]; + pythonImportsCheck = [ + "distributed" + ]; meta = with lib; { description = "Distributed computation in Python"; diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix index c8d427900c68..b10b8ec93136 100644 --- a/pkgs/development/python-modules/dj-email-url/default.nix +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.0.4"; + version = "1.0.5"; pname = "dj-email-url"; src = fetchPypi { inherit pname version; - sha256 = "7ee35df51065d17ac7b55e98ad8eda3a1f6c5d65fc89cdc5de7a96e534942553"; + sha256 = "sha256-7zb4oyTsV8875cen70TtaQDKAghiSpGKszrcHPZCezk="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index ab329cd37aba..ffd4796f2a57 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -1,25 +1,51 @@ { lib , buildPythonPackage -, fetchPypi, isPy27 -, ldap , django -, mock +, fetchPypi +, isPy27 + +# buildtime +, setuptools-scm + +# runtime +, ldap +, django + +# tests +, python +, pkgs }: buildPythonPackage rec { pname = "django-auth-ldap"; - version = "3.0.0"; + version = "4.0.0"; + format = "pyproject"; + disabled = isPy27; + src = fetchPypi { inherit pname version; - sha256 = "1f2d5c562d9ba9a5e9a64099ae9798e1a63840a11afe4d1c4a9c74121f066eaa"; + sha256 = "276f79e624ce083ce13f161387f65ff1c0efe83ef8a42f2b9830d43317b15239"; }; - propagatedBuildInputs = [ ldap django ]; - checkInputs = [ mock ]; + nativeBuildInputs = [ + setuptools-scm + ]; - # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings + propagatedBuildInputs = [ + django + ldap + ]; + + # ValueError: SCHEMADIR is None, ldap schemas are missing. doCheck = false; + checkPhase = '' + runHook preCheck + export PATH=${pkgs.openldap}/bin:${pkgs.openldap}/libexec:$PATH + ${python.interpreter} -m django test --settings tests.settings + runHook postCheck + ''; + pythonImportsCheck = [ "django_auth_ldap" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index 4cb23d989fae..4bddb62bdd1a 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "django-configurations"; - version = "2.3.1"; + version = "2.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e2ca25530e184f0ee3b7f5ae69563461a93a8914493306ee0bf6d71e7d8ad1d0"; + sha256 = "bd1a77a60735839b7d105912cc3977735fa005ea06544c632fbd322d1e021677"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 9f04f25f4648..c9a0f10947ea 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-dynamic-preferences"; - version = "1.11.0"; + version = "1.12.0"; src = fetchPypi { inherit pname version; - sha256 = "f214c938b5872a17647e2b2ccfd9ad00a90a3c6c4aa83fa65d3c5c446e7a66c7"; + sha256 = "sha256-zYmHz45N024BmtPoolxYm8S0EMpKZs38vlwlpRenwK0="; }; propagatedBuildInputs = [ six django persisting-theory ]; diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 4710de2c7ecb..b1dab2e73c91 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -1,8 +1,9 @@ -{ lib, buildPythonPackage, fetchFromGitHub, django, pytest, pytest-django }: +{ lib, buildPythonPackage, fetchFromGitHub, django, pytest, pytest-django, python }: buildPythonPackage rec { pname = "django-picklefield"; version = "3.0.1"; + format = "setuptools"; # The PyPi source doesn't contain tests src = fetchFromGitHub { @@ -14,17 +15,20 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - checkInputs = [ pytest pytest-django ]; + # Tests are failing with Django 3.2 + # https://github.com/gintas/django-picklefield/issues/58 + doCheck = false; checkPhase = '' - PYTHONPATH="$(pwd):$PYTHONPATH" \ - DJANGO_SETTINGS_MODULE=tests.settings \ - pytest tests/tests.py + runHook preCheck + ${python.interpreter} -m django test --settings=tests.settings + runHook postCheck ''; - meta = { + meta = with lib; { description = "A pickled object field for Django"; homepage = "https://github.com/gintas/django-picklefield"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/django-timezone-field/default.nix b/pkgs/development/python-modules/django-timezone-field/default.nix index 0bbdac356cd0..5d43afc77949 100644 --- a/pkgs/development/python-modules/django-timezone-field/default.nix +++ b/pkgs/development/python-modules/django-timezone-field/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "django-timezone-field"; - version = "4.2.1"; + version = "4.2.3"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mfogel"; repo = pname; rev = version; - sha256 = "0swld4168pfhppr9q3i9r062l832cmmx792kkvlcvxfbdhk6qz9h"; + sha256 = "sha256-purzXzPvnYNVsASsK6s9m4XieUL80FOjeSbUP4bpRj8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-widget-tweaks/default.nix b/pkgs/development/python-modules/django-widget-tweaks/default.nix index 853e12327d32..63e575b63454 100644 --- a/pkgs/development/python-modules/django-widget-tweaks/default.nix +++ b/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "django-widget-tweaks"; - version = "1.4.8"; + version = "1.4.12"; src = fetchFromGitHub { # package from Pypi missing runtests.py owner = "jazzband"; repo = pname; rev = version; - sha256 = "00w1ja56dc7cyw7a3mph69ax6mkch1lsh4p98ijdhzfpjdy36rbg"; + sha256 = "1rhn2skx287k6nnkxlwvl9snbia6w6z4c2rqg22hwzbz5w05b24h"; }; checkPhase = "${python.interpreter} runtests.py"; diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix index f20eb49c0233..727bf304fdb2 100644 --- a/pkgs/development/python-modules/django/2.nix +++ b/pkgs/development/python-modules/django/2.nix @@ -5,14 +5,15 @@ }: buildPythonPackage rec { - pname = "Django"; - version = "2.2.26"; + pname = "django"; + version = "2.2.27"; disabled = !isPy3k; src = fetchPypi { - inherit pname version; - sha256 = "sha256-36U3Jn1SxiQ6YrMoVadEyoPDfHBgCqz/v9mLxdbYUY8="; + pname = "Django"; + inherit version; + sha256 = "sha256-HuNwRrC/K2HoOzoB0GcyNRbsO28rF81JsTJt1LqdyRM="; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index a7bafcfb2707..1538b8a82b47 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -12,14 +12,15 @@ }: buildPythonPackage rec { - pname = "Django"; - version = "3.2.11"; + pname = "django"; + version = "3.2.12"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-aclKvl1rGwiL9HXgm3t0QD+UPjTaEH55hGXSBF2ifnU="; + pname = "Django"; + inherit version; + sha256 = "sha256-l3Lmk1cD5Z6ZOWCDLWamFM8CM6HFEjvGIk7MataeQeI="; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix new file mode 100644 index 000000000000..57c752725d58 --- /dev/null +++ b/pkgs/development/python-modules/django/4.nix @@ -0,0 +1,107 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder +, substituteAll + +# patched in +, geos +, gdal +, withGdal ? false + +# propagated +, asgiref +, backports-zoneinfo +, sqlparse + +# tests +, aiosmtpd +, argon2_cffi +, bcrypt +, docutils +, geoip2 +, jinja2 +, memcached +, numpy +, pillow +, pylibmc +, pymemcache +, python +, pytz +, pywatchman +, pyyaml +, redis +, selenium +, tblib +, tzdata +}: + +buildPythonPackage rec { + pname = "Django"; + version = "4.0.3"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-d/8ucFDjMkybZ+KbZwd1RWb1hRQRKprHMxD2DNUmGTA="; + }; + + patches = lib.optional withGdal + (substituteAll { + src = ./django_4_set_geos_gdal_lib.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }); + + propagatedBuildInputs = [ + asgiref + sqlparse + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ]; + + # Fails to import asgiref in ~200 tests + # ModuleNotFoundError: No module named 'asgiref' + doCheck = false; + + checkInputs = [ + aiosmtpd + argon2_cffi + asgiref + bcrypt + docutils + geoip2 + jinja2 + memcached + numpy + pillow + pylibmc + pymemcache + pytz + pywatchman + pyyaml + redis + selenium + tblib + tzdata + ]; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} tests/runtests.py + + runHook postCheck + ''; + + meta = with lib; { + 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/pkgs/development/python-modules/django/django_4_set_geos_gdal_lib.patch b/pkgs/development/python-modules/django/django_4_set_geos_gdal_lib.patch new file mode 100644 index 000000000000..da73a93e8f22 --- /dev/null +++ b/pkgs/development/python-modules/django/django_4_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 05b5732..91fafee 100644 +--- a/django/contrib/gis/gdal/libgdal.py ++++ b/django/contrib/gis/gdal/libgdal.py +@@ -14,7 +14,7 @@ try: + from django.conf import settings + 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 2cdb5d3..fac2d04 100644 +--- a/django/contrib/gis/geos/libgeos.py ++++ b/django/contrib/gis/geos/libgeos.py +@@ -24,7 +24,7 @@ def load_geos(): + from django.conf import settings + 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/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix index d4d67ba58255..d7d2e8789ae7 100644 --- a/pkgs/development/python-modules/django_classytags/default.nix +++ b/pkgs/development/python-modules/django_classytags/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-classy-tags"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "2ef8b82b4f7d77d4fd152b25c45128d926e7a5840d862f2ecd3e5faf6acbe343"; + sha256 = "sha256-0iK0VQKsmeVQpWZmeDnvrvlUucc2amST8UOGKqvqyHg="; }; propagatedBuildInputs = [ django six ]; diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 97836b247a33..1bf4d6b4dab5 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "4.0.1"; + version = "4.0.2"; src = fetchPypi { inherit pname version; - sha256 = "6991f16e5d3a972912db3d56e3a714d10b07becd566ab87f85f2e9b671981339"; + sha256 = "sha256-XTO6lE2/GccDDJ5w43MSSK40Nozyr+3hDg0I+/ieb4w="; }; # tests assume the availability of a mysql/postgresql database diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index facfc2fafcdb..f0550a296aa9 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "djangoql"; - version = "0.16.0"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "23cea52eca76e605fa2f34b13ae8d2bf60240737ee9ed3f60c667a4f64d28adf"; + sha256 = "sha256-TwU9ASjij0EpJuLakCc19L3Lq1wI1Dvk3+/XR/yi6W4="; }; propagatedBuildInputs = [ ply ]; diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index 4c616bdeb274..d84a542d0bba 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "djangorestframework-simplejwt"; - version = "5.0.0"; + version = "5.1.0"; src = fetchPypi { pname = "djangorestframework_simplejwt"; inherit version; - sha256 = "30b10e7732395c44d21980f773214d2b9bdeadf2a6c6809cd1a7c9abe272873c"; + sha256 = "sha256-dTI1KKe5EIQ7h5GUdG8OvDSBxK2fNU3i3RYhYGYvuVo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index 5468776c72d1..14ceebf0a19b 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -4,6 +4,7 @@ , dill , dm-tree , fetchFromGitHub +, jaxlib , jmp , lib , pytestCheckHook @@ -31,6 +32,7 @@ buildPythonPackage rec { chex cloudpickle dm-tree + jaxlib pytestCheckHook tensorflow ]; diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index f465ac200d42..3820fdd1e36c 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -86,5 +86,6 @@ in buildPythonPackage { license = licenses.asl20; maintainers = with maintainers; [ timokau ]; platforms = platforms.linux; + broken = true; # depends on older TensorFlow version than is currently packaged }; } diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index e4a319b31a89..59730bff71ec 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -1,27 +1,47 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pythonOlder +, setuptools-scm +, pytestCheckHook }: buildPythonPackage rec { pname = "dnspython"; - version = "2.1.0"; + version = "2.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4"; + extension = "tar.gz"; + sha256 = "1mi6l2n766y1gic3x1swp2jk2nr7wbkb191qinwhddnh6bh534z7"; }; - # needs networking for some tests - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # dns.exception.SyntaxError: protocol not found + "test_misc_good_WKS_text" + ] ++ lib.optionals stdenv.isDarwin [ + # unable to get local issuer certificate + "test_async" + "test_query" + "test_resolver_override" + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; + pythonImportsCheck = [ "dns" ]; meta = with lib; { description = "A DNS toolkit for Python"; homepage = "https://www.dnspython.org"; license = with licenses; [ isc ]; + maintainers = with maintainers; [ gador ]; }; } diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index dbfb857614e1..61c4ca6890a1 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -8,6 +8,7 @@ , pytestCheckHook , pythonOlder , restructuredtext_lint +, setuptools-scm , stevedore }: @@ -23,6 +24,10 @@ buildPythonPackage rec { sha256 = "376e50f4e70a1ae935416ddfcf93db35dd5d4cc0e557f2ec72f0667d0ace4548"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + buildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index b7b0231a806e..5f64ee3a6fe7 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.22.213"; + version = "2.23.222"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "8a86bba42b5b65f2e0f88ed350115efeb783b444661e2cfcf3a67d5c59bcb0bd"; + sha256 = "sha256-c5XpfEGTkojgzk+ATHCSzzh04zeEVJEEKBp+lPfS+x4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docx2txt/default.nix b/pkgs/development/python-modules/docx2txt/default.nix new file mode 100644 index 000000000000..6b3c2777d78c --- /dev/null +++ b/pkgs/development/python-modules/docx2txt/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "docx2txt"; + version = "0.8"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LAbZjXz+LTlH5XYKV9kk4/8HdFs3nIc3cjki5wCSNuU="; + }; + + pythonImportsCheck = [ + "docx2txt" + ]; + + meta = with lib; { + description = "A pure python-based utility to extract text and images from docx files"; + homepage = "https://github.com/ankushshah89/python-docx2txt"; + license = licenses.mit; + maintainers = with maintainers; [ ilkecan ]; + }; +} diff --git a/pkgs/development/python-modules/doit/default.nix b/pkgs/development/python-modules/doit/default.nix index c1d26bac0f45..c7c66fceaa7c 100644 --- a/pkgs/development/python-modules/doit/default.nix +++ b/pkgs/development/python-modules/doit/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "doit"; - version = "0.34.1"; + version = "0.34.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "49467c1bf8850a292e5fd0254ee1b219f6fd8202a0d3d4bf33af3c2dfb58d688"; + sha256 = "sha256-OIER+Kals7RGIM7rKH0FhZJ8hdDW0/h5DTT7tFwM9sM="; }; propagatedBuildInputs = [ cloudpickle ] diff --git a/pkgs/development/python-modules/downloader-cli/default.nix b/pkgs/development/python-modules/downloader-cli/default.nix index 9d99709c9166..40cfd888a5d4 100644 --- a/pkgs/development/python-modules/downloader-cli/default.nix +++ b/pkgs/development/python-modules/downloader-cli/default.nix @@ -1,25 +1,37 @@ -{ lib, buildPythonPackage, fetchFromGitHub, urllib3 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, urllib3 +, pythonOlder +}: buildPythonPackage rec { pname = "downloader-cli"; - version = "0.3.2"; + version = "0.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "deepjyoti30"; repo = pname; rev = version; - sha256 = "0hjwy3qa6al6p35pv01sdl3szh7asf6vlmhwjbkpppn4zi239k0y"; + hash = "sha256-Dl5XIvdZInz+edL9uQv7V6Kc6FB+7hFAGe/nybnqvQU="; }; - propagatedBuildInputs = [ urllib3 ]; + propagatedBuildInputs = [ + urllib3 + ]; # Disable checks due to networking (Errno 101) doCheck = false; - pythonImportsCheck = [ "downloader_cli" ]; + pythonImportsCheck = [ + "downloader_cli" + ]; meta = with lib; { - description = "A simple downloader written in Python with an awesome customizable progressbar. "; + description = "Downloader with an awesome customizable progressbar"; homepage = "https://github.com/deepjyoti30/downloader-cli"; license = licenses.mit; maintainers = with maintainers; [ j0hax ]; diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index c9f3d5be6d49..b6f0176dd737 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dpath"; - version = "2.0.5"; + version = "2.0.6"; disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; - sha256 = "0kk7wl15r305496q13ka4r6n2r13j99rrrpy2b4575j704dk4x7g"; + sha256 = "sha256-Wh3a5SIz+8jvgbFfuFBzqBEmu0NpjT86G2qvVhpGzcA="; }; # use pytest as nosetests hangs diff --git a/pkgs/development/python-modules/dragonfly/default.nix b/pkgs/development/python-modules/dragonfly/default.nix index fb3feaae63ee..82e1a645c853 100644 --- a/pkgs/development/python-modules/dragonfly/default.nix +++ b/pkgs/development/python-modules/dragonfly/default.nix @@ -5,7 +5,7 @@ , packaging , pynput , regex -, lark-parser +, lark , enum34 , pyperclip , six @@ -34,7 +34,7 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark-parser' + substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark' substituteInPlace dragonfly/actions/keyboard/_x11_xdotool.py \ --replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' substituteInPlace dragonfly/windows/x11_window.py \ @@ -48,7 +48,7 @@ buildPythonPackage rec { packaging pynput regex - lark-parser + lark enum34 pyperclip six diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index 1bc5d380b08e..a081a7445c4a 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -8,6 +8,7 @@ , pytestCheckHook , pytest-doctestplus , pythonOlder +, setuptools-scm }: buildPythonPackage rec { @@ -21,6 +22,10 @@ buildPythonPackage rec { sha256 = "sha256-Id8rPK8qq71gHn5DKnEi7Lp081GFbcFtGU+v89Vlt9o="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ numpy pandas diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index e43f7d7f2d1d..2e2490568e9d 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -1,32 +1,51 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, requests, urllib3, mock, setuptools, stone }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, urllib3 +, mock +, setuptools +, stone +, pythonOlder +}: buildPythonPackage rec { pname = "dropbox"; - version = "11.25.0"; + version = "11.28.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "v${version}"; - sha256 = "1ln6m6wiym5608i26abs8a5nm4mnn7s3czhnpg9nyjyndnr7k0xj"; + sha256 = "sha256-xNenBmeCRIYxQqAkV8IDpPpIHyVAYJs1jAFr8w1tz2Y="; }; + propagatedBuildInputs = [ + requests + urllib3 + mock + setuptools + stone + ]; + postPatch = '' substituteInPlace setup.py \ --replace "'pytest-runner == 5.2.0'," "" ''; - propagatedBuildInputs = [ requests urllib3 mock setuptools stone ]; - # Set DROPBOX_TOKEN environment variable to a valid token. doCheck = false; - pythonImportsCheck = [ "dropbox" ]; + pythonImportsCheck = [ + "dropbox" + ]; meta = with lib; { - description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; - homepage = "https://www.dropbox.com/developers/core/docs"; + description = "Python library for Dropbox's HTTP-based Core and Datastore APIs"; + homepage = "https://github.com/dropbox/dropbox-sdk-python"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/dsinternals/default.nix b/pkgs/development/python-modules/dsinternals/default.nix new file mode 100644 index 000000000000..53d5e5acc9ff --- /dev/null +++ b/pkgs/development/python-modules/dsinternals/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pycryptodomex +, pyopenssl +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "dsinternals"; + version = "1.2.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "p0dalirius"; + repo = "pydsinternals"; + rev = version; + hash = "sha256-C1ar9c4F4WI5ICX7PJe8FzVwK8bxZds+kMBpttEp9Ko="; + }; + + propagatedBuildInputs = [ + pyopenssl + pycryptodomex + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dsinternals" + ]; + + pytestFlagsArray = [ + "tests/*.py" + ]; + + meta = with lib; { + description = "Module to interact with Windows Active Directory"; + homepage = "https://github.com/p0dalirius/pydsinternals"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index b666e4c210f5..e8a94fb5e859 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "0.31"; + version = "0.32"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; rev = "v${version}"; - sha256 = "sha256-A+fyAAV62Dg28RDiivKEjrC1bCXzkuIvpATR+oUytRU="; + sha256 = "0hi69gdcmsp5yaspsfbpc3x76iybg20cylxyaxm131fpd5wwan9l"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dufte/default.nix b/pkgs/development/python-modules/dufte/default.nix index 006280376814..92081e08067c 100644 --- a/pkgs/development/python-modules/dufte/default.nix +++ b/pkgs/development/python-modules/dufte/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nschloe"; repo = pname; - rev = version; - sha256 = "0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48"; + rev = "v${version}"; + hash = "sha256:0ccsmpj160xj6w503a948aw8icj55mw9414xnmijmmjvlwhm0p48"; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index ad0a853af226..a255d3c4f9b9 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -16,7 +16,7 @@ }: buildPythonPackage rec { - version = "0.20.32"; + version = "0.20.35"; pname = "dulwich"; format = "setuptools"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-3FSYsHK9wSwe/+9LYgLNKkVCuxxtu03c/IxtU+CLSIw="; + hash = "sha256-lT9jAanfigkfqI1V7tOUqIv5mIzei+NBd1NUkQkYwZY="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix new file mode 100644 index 000000000000..f4a24a7a7f8a --- /dev/null +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -0,0 +1,52 @@ +{ lib +, poetry-core +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, importlib-metadata +, packaging +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dunamai"; + version = "1.10.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mtkennerly"; + repo = "dunamai"; + rev = "v${version}"; + sha256 = "sha256-Sp0yfNkFwNc2qR9aSPteBqZcqRokM9whOVmduXVK3CI="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + # needs to be able to run dunami from PATH + preCheck = '' + export PATH=$PATH:$out/bin + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "dunamai" ]; + + meta = with lib; { + description = "Dynamic version generation"; + homepage = "https://github.com/mtkennerly/dunamai"; + license = licenses.mit; + maintainers = with maintainers; [ jmgilman ]; + }; +} diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix new file mode 100644 index 000000000000..dafbcfc2f5cd --- /dev/null +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, asynctest +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dynalite-devices"; + version = "0.1.46"; + + src = fetchFromGitHub { + owner = "ziv1234"; + repo = "python-dynalite-devices"; + rev = "v0.46"; # https://github.com/ziv1234/python-dynalite-devices/issues/2 + hash = "sha256-Fju2JpFkQBCbOln7r3L+crv82TI2SkdPJ1oaK7PEifo="; + }; + + postPatch = '' + sed -i '/^addopts/d' setup.cfg + ''; + + checkInputs = [ + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "dynalite_devices_lib" ]; + + meta = with lib; { + description = "An unofficial Dynalite DyNET interface creating devices"; + homepage = "https://github.com/ziv1234/python-dynalite-devices"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 6449a3da767c..32e446d71a3b 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -1,20 +1,35 @@ { lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , cmake }: +let + tests = fetchFromGitHub { + owner = "editorconfig"; + repo = "editorconfig-core-test"; + rev = "e407c1592df0f8e91664835324dea85146f20189"; + sha256 = "sha256-9WSEkMJOewPqJjB6f7J6Ir0L+U712hkaN+GszjnGw7c="; + }; +in buildPythonPackage rec { pname = "editorconfig"; version = "0.12.3"; - # fetchgit used to ensure test submodule is available - src = fetchgit { - url = "https://github.com/editorconfig/editorconfig-core-py"; - rev = "1a8fb62b9941fded9e4fb83a3d0599427f5484cb"; # Not tagged - sha256 = "0vx8rl7kii72965jsi01mdsz9rfi1q9bwy13x47iaqm6rmcwc1rb"; + src = fetchFromGitHub { + owner = "editorconfig"; + repo = "editorconfig-core-py"; + rev = "v${version}"; + sha256 = "sha256-ZwoTMgk18+BpPNtXKQUMXGcl2Lp+1RQVyPHgk6gHWh8="; + # workaround until https://github.com/editorconfig/editorconfig-core-py/pull/40 is merged + # fetchSubmodules = true; }; + postUnpack = '' + cp -r ${tests}/* source/tests + chmod +w -R source/tests + ''; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/eebrightbox/default.nix b/pkgs/development/python-modules/eebrightbox/default.nix deleted file mode 100644 index d8050b9bf5e3..000000000000 --- a/pkgs/development/python-modules/eebrightbox/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pbr -, calmjs-parse -, certifi -, chardet -, idna -, ply -, requests -, urllib3 -, httpretty -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "eebrightbox"; - version = "0.0.6"; - - src = fetchFromGitHub { - owner = "krygal"; - repo = "eebrightbox"; - rev = version; - sha256 = "1kms240g01871qbvyc5rzf86yxsrlnfvp323jh4k35fpf45z44rr"; - }; - - postPatch = '' - substituteInPlace requirements.txt --replace "==" ">=" - ''; - - nativeBuildInputs = [ - pbr - ]; - - PBR_VERSION = version; - - propagatedBuildInputs = [ - calmjs-parse - certifi - chardet - idna - ply - requests - urllib3 - ]; - - checkInputs = [ - httpretty - pytestCheckHook - ]; - - meta = with lib; { - description = "Connector for EE BrightBox routers"; - homepage = "https://github.com/krygal/eebrightbox"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix new file mode 100644 index 000000000000..87ff2a4287ac --- /dev/null +++ b/pkgs/development/python-modules/eiswarnung/default.nix @@ -0,0 +1,58 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "eiswarnung"; + version = "1.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "klaasnicolaas"; + repo = "python-eiswarnung"; + rev = "v${version}"; + hash = "sha256-Cw/xRypErasdrOZJ/0dWLl4eYH01vBI9mYm98teIdRc="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"0.0.0"' '"${version}"' \ + --replace 'addopts = "--cov"' "" + ''; + + pythonImportsCheck = [ + "eiswarnung" + ]; + + meta = with lib; { + description = "Module for getting Eiswarning API forecasts"; + homepage = "https://github.com/klaasnicolaas/python-eiswarnung"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index bf78fec5e5d3..ea14989dbb13 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.7.2"; + version = "6.8.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "v${version}"; - sha256 = "sha256-NyoFJ3HVxE3AdCCZCZrEk4dDiTIv9cGZYPHVre/PMO4="; + sha256 = "sha256-bH7XCk1jPsGalFQ68rQhSyZv9nCZE+xUJyWX828PQQI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 601c5b68864d..73a3882927c2 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -12,11 +12,11 @@ buildPythonPackage (rec { # there's a clear path forward. See # https://github.com/elastic/elasticsearch-py/issues/1639 for more # info. - version = "7.16.2"; + version = "7.16.3"; src = fetchPypi { inherit pname version; - sha256 = "23ac0afb4398c48990e359ac73ab6963741bd05321345299c62d9d23e209eee2"; + sha256 = "8adf8bc351ed55df7296be1009d38a1c999c0abc7d8700fa88533f1ad6087c5e"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix index ec968dce8ec3..5b0cb293c0a3 100644 --- a/pkgs/development/python-modules/elegy/default.nix +++ b/pkgs/development/python-modules/elegy/default.nix @@ -4,6 +4,7 @@ , deepmerge , dm-haiku , fetchFromGitHub +, jaxlib , lib , poetry , pytestCheckHook @@ -35,6 +36,8 @@ buildPythonPackage rec { poetry ]; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ cloudpickle deepdish diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 4dc34f92365e..e756701ab4e4 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "2.4.0"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "1f3w5zyvrkl4gab81i5z9b41ybs54b37znj5r7hrcf25x8hrqgvv"; + sha256 = "sha256-I2Vg0rpCFH1Z+N+JgtDv2se6lXsggzOsJn3Fj252aTQ="; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 05625f928396..6b877a58dd0b 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "1.0.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = version; - sha256 = "04xidix6l5d9rqfwp6cmj6wvais04nlvz5ynp0zwgyjp9sh2nhp6"; + hash = "sha256-Jr9f+essHB1FkzD6zM0G6jgE9C9lfDJuFIPrKRhVt+g="; }; nativeBuildInputs = [ @@ -36,17 +36,10 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/gwww/elkm1/pull/45 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/gwww/elkm1/commit/807a17268498298908bf82af4933b158b37c8f32.patch"; - sha256 = "1539g8wsxppqj6dm6w81ps05frb8vrfaxahxn2cqs76zdhvly3p9"; - }) + pythonImportsCheck = [ + "elkm1_lib" ]; - pythonImportsCheck = [ "elkm1_lib" ]; - meta = with lib; { description = "Python module for interacting with ElkM1 alarm/automation panel"; homepage = "https://github.com/gwww/elkm1"; diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 1497b412d741..84a709ac5392 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; rev = "v${version}"; - sha256 = "1g927w9l3j5mycg6pqa4vjk2lyy35sppfp8pbzb6mvca500001rk"; + sha256 = "sha256-vKQ51RP7uy57vP3dOnHZRSp/Wz+YDzeLUR8JnIELE/I="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/empty-files/default.nix b/pkgs/development/python-modules/empty-files/default.nix new file mode 100644 index 000000000000..b6c31519efcd --- /dev/null +++ b/pkgs/development/python-modules/empty-files/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +}: + +buildPythonPackage rec { + pname = "empty-files"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "approvals"; + repo = "EmptyFiles.Python"; + rev = "v${version}"; + sha256 = "sha256-K4rlVO1X1AWxYI3EqLsyQ5/Ist/jlwFrmOM4aMojtKU="; + }; + + propagatedBuildInputs = [ + requests + ]; + + # cyclic dependency with approvaltests + doCheck = false; + + pythonImportsCheck = [ "empty_files" ]; + + meta = with lib; { + description = "Null Object pattern for files"; + homepage = "https://github.com/approvals/EmptyFiles.Python"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/emv/default.nix b/pkgs/development/python-modules/emv/default.nix index 62dcc44ca593..a4834a84656b 100644 --- a/pkgs/development/python-modules/emv/default.nix +++ b/pkgs/development/python-modules/emv/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { --replace '"argparse==1.4.0",' "" \ --replace "click==7.1.2" "click" \ --replace "pyscard==2.0.0" "pyscard" \ + --replace "pycountry==20.7.3" "pycountry" \ --replace "terminaltables==3.1.0" "terminaltables" ''; diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index cc1623177346..9e6a910b2ba9 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "enaml"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "nucleic"; repo = pname; rev = version; - sha256 = "sha256-u+T3jD/rulfWunWkCa02XKXYvDaB9oAnohgqrJXgtJw="; + sha256 = "sha256-QfI7cwl2c5HOlFNNdG+oOv48X9jJZnZNU/kWgutWe6k="; }; # qt bindings cannot be found during tests diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix index 8f58720bd264..b6d31ddaf947 100644 --- a/pkgs/development/python-modules/enlighten/default.nix +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -5,28 +5,41 @@ , blessed , prefixed , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "enlighten"; - version = "1.10.1"; + version = "1.10.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "3391916586364aedced5d6926482b48745e4948f822de096d32258ba238ea984"; + hash = "sha256-eluDzQ9NCV5Z2Axkjrtff/ygzYvPeuZjmCjuGtAAYyo="; }; propagatedBuildInputs = [ blessed prefixed ]; - checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "enlighten" ]; - disabledTests = + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "enlighten" + ]; + + disabledTests = [ + # AssertionError: <_io.TextIOWrapper name='' mode='w' encoding='utf-8'> is not... + "test_init" + ] ++ lib.optional stdenv.isDarwin [ # https://github.com/Rockhopper-Technologies/enlighten/issues/44 - lib.optional stdenv.isDarwin "test_autorefresh" - ; + "test_autorefresh" + ]; meta = with lib; { description = "Enlighten Progress Bar for Python Console Apps"; diff --git a/pkgs/development/python-modules/entrypoint2/default.nix b/pkgs/development/python-modules/entrypoint2/default.nix index d1325f6f0e10..73ede85fb886 100644 --- a/pkgs/development/python-modules/entrypoint2/default.nix +++ b/pkgs/development/python-modules/entrypoint2/default.nix @@ -1,31 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, EasyProcess, pathpy, pytest }: +{ lib, buildPythonPackage, fetchPypi, EasyProcess, pathpy, pytestCheckHook }: buildPythonPackage rec { pname = "entrypoint2"; - version = "0.2.4"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "4770c3afcf3865c606a6e5f7cfcc5c59212f555fcee9b2540270399149c1dde3"; + sha256 = "sha256-Z+kG9q2VjYP0i07ewo192CZw6SYZiPa0prY6vJ+zvlY="; }; - propagatedBuildInputs = [ ]; - pythonImportsCheck = [ "entrypoint2" ]; - # argparse is part of the standardlib - prePatch = '' - substituteInPlace setup.py --replace "argparse" "" - ''; - - checkInputs = [ EasyProcess pathpy pytest ]; - - # 0.2.1 has incompatible pycache files included - # https://github.com/ponty/entrypoint2/issues/8 - checkPhase = '' - rm -rf tests/__pycache__ - pytest tests - ''; + checkInputs = [ EasyProcess pathpy pytestCheckHook ]; meta = with lib; { description = "Easy to use command-line interface for python modules"; diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 32b3098ffc73..18047eb719aa 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.20"; + version = "0.5.21"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "sha256-gYl5+rtOzci3nhgP74VM37tNk9pPWgcNBfcSSG1fSJs="; + sha256 = "sha256-jildWpYWll5j7siYhNECMBjz9bF41xFA6NyydWNdgQE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index a0a4fb88e0cd..4a8987b16346 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "environs"; - version = "9.4.0"; + version = "9.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sloria"; repo = pname; rev = version; - sha256 = "sha256-LPD46kxzQ/oTC7XjJn/SXaLQgX613ZoCrJuaRng57Gw="; + sha256 = "sha256-hucApIn7ul7+MC2W811VTxZNO8Pqb6HDXz9VRcEdmIc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 66ff1ddc10ed..c98a0fc51529 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "2.2.2"; + version = "3.0.0"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-typing/issues/8 @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0rkvkacxla4y2blkkfdsq1ywnyqsvg8pwhvadznbag1bfzja4xhv"; + sha256 = "sha256-9rrnDFPWAmrUkr2mVTVi/8DTJdg4hzGaU0UbpwG5mtY="; }; # setuptools-markdown uses pypandoc which is broken at the moment diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 172647f0da70..9b26fb7024c0 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "eth-utils"; - version = "1.10.0"; + version = "2.0.0"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-utils/issues/130 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sq3H4HmUFUipqVYleZxWLG1gBsQEoNwcZAXiKckacek="; + sha256 = "sha256-E2vUROc2FcAv00k50YpdxaaYIRDk1yGSPB8cHHw+7Yw="; }; checkInputs = [ pytestCheckHook hypothesis ]; diff --git a/pkgs/development/python-modules/etuples/default.nix b/pkgs/development/python-modules/etuples/default.nix new file mode 100644 index 000000000000..5ad7696ae1cf --- /dev/null +++ b/pkgs/development/python-modules/etuples/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cons +, multipledispatch +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "etuples"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "etuples"; + rev = "v${version}"; + sha256 = "sha256-gJNxrO2d/eF4t3bBlz/BwF+9eT1nKrVrTP3F6/dEN00="; + }; + + propagatedBuildInputs = [ + cons + multipledispatch + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "etuples" ]; + + meta = with lib; { + description = "Python S-expression emulation using tuple-like objects"; + homepage = "https://github.com/pythological/etuples"; + changelog = "https://github.com/pythological/etuples/releases"; + license = licenses.asl20; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/development/python-modules/ev3dev2/default.nix b/pkgs/development/python-modules/ev3dev2/default.nix index f6233db68dbc..5afbb7da655f 100644 --- a/pkgs/development/python-modules/ev3dev2/default.nix +++ b/pkgs/development/python-modules/ev3dev2/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Python language bindings for ev3dev"; homepage = "https://github.com/ev3dev/ev3dev-lang-python"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 1a3f2a0e642e..86149cbd865a 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "8782740eb1a86b187334c07feb5127d3faa0b236e113206dfe3ae8f77fb1aaf1"; + sha256 = "sha256-WzOxdPfIRXbn3WBx5Di/WtIn2pXv1DVqOf5Mg1VBL+Y="; }; buildInputs = [ linuxHeaders ]; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 7c8f520647ee..096279b3453a 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -57,6 +57,8 @@ buildPythonPackage rec { "test_hosts_no_network" "test_leakage_from_tracebacks" "test_patcher_existing_locks_locked" + # broken with pyopenssl 22.0.0 + "test_sendall_timeout" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 154742638b05..3550f1e17361 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "4.7.1"; + version = "4.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "1kwb5ixlmxg0xxm4wms5r4kym220vbncr9afi9qc25g8npkbs860"; + sha256 = "sha256-fdYc+fJEePgCzAkUWz7pmL/CI/O9zm5G9xh1f4bhrH4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 28caec986dcc..048edf64d38f 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "faker"; - version = "9.9.0"; + version = "11.3.0"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-cidwOj2zbtgkEQhUdUREX0WqRdsvP2PohcubVpk4Pw4="; + hash = "sha256-rb5WfmTaahCX/qyraZAA4a0W4Xplkqjwrh7gt/vxmIc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index eff55de1d90e..5860a959afcd 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.7.0"; - format = "setuptools"; + version = "1.7.1"; + format = "pyproject"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yb0S5DAzbL0+GJ+uDpHrmZl7k+dtv91u1n+jUtxoTHE="; + hash = "sha256-fCxLobQuCnUzfFS3d78GcQVrRWllDj/5J+S5s4WvyOw="; }; propagatedBuildInputs = [ @@ -42,11 +42,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTestPaths = [ - # AttributeError: 'AsyncGenerator' object has no attribute XXXX - "test/test_aioredis2.py" - ]; - pythonImportsCheck = [ "fakeredis" ]; diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index ca0969b95178..42f8a4860509 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.5.10"; + version = "1.6.1"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_plugins"; rev = "v${version}"; - sha256 = "sha256-Xj1Ibl+xDN3uCww54StUBCc+w/iPMdbWucRqdb+GHVI="; + sha256 = "sha256-NpPVA+fruI/xX0KMjRuRuMK8HYc/0ErbDhJOCNXKhyY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index ec14e956c3fd..6f0a39a7b2d2 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.73.0"; + version = "0.75.0"; format = "flit"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = version; - sha256 = "0v3w9b8107b3g2rgy5y58f0p64inhwl1j9cybp627myypwpqx4b7"; + sha256 = "sha256-LCdScvQUdwOM8Don/5n/49bKrivT+bkhqWcBNku4fso="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 935eefa5182f..fcd65f1f317a 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.4.9"; + version = "1.4.10"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0af6d67s6mi9ylqla8nga6cj4y0y4gp3l2q68br2mrdyivkml0g0"; + sha256 = "sha256-JTNRm/nCQckAZrVTgcJVP3bLE53QPtccdoDcGLbP6BE="; }; preBuild = '' diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 4783b8d33c78..2e43ab9a15d2 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.3.27"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = version; - sha256 = "sha256-ogCNDh18FHP9KY0q0BIbsjPH5vGGioGh4FFUUb3c3Jc="; + sha256 = "sha256-U7tZkqfBbl5IVZlC2/JBIx7Bm5iIiXTMSm0QHmzNiys="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastnumbers/default.nix b/pkgs/development/python-modules/fastnumbers/default.nix index 12c3175424d3..779949b38fd7 100644 --- a/pkgs/development/python-modules/fastnumbers/default.nix +++ b/pkgs/development/python-modules/fastnumbers/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fastnumbers , fetchFromGitHub @@ -26,6 +27,10 @@ buildPythonPackage rec { typing-extensions ]; + # Tests fail due to numeric precision differences on ARM + # See https://github.com/SethMMorton/fastnumbers/issues/28 + doCheck = !(stdenv.isAarch64 || stdenv.isAarch32); + checkInputs = [ hypothesis pytestCheckHook diff --git a/pkgs/development/python-modules/fastprogress/default.nix b/pkgs/development/python-modules/fastprogress/default.nix index 2164bc93f622..cd1b4e3bbacf 100644 --- a/pkgs/development/python-modules/fastprogress/default.nix +++ b/pkgs/development/python-modules/fastprogress/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fastprogress"; - version = "1.0.0"; + version = "1.0.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1zhv37q6jkqd1pfhlkd4yzrc3dg83vyksgzf32mjlhd5sb0qmql9"; + sha256 = "sha256-lga6RCUFo6RFgdY97dzlv/HfF6y9w3JS98PxvlLB0kM="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix index 05afcff5627c..216a84b9ec6a 100644 --- a/pkgs/development/python-modules/fe25519/default.nix +++ b/pkgs/development/python-modules/fe25519/default.nix @@ -6,16 +6,19 @@ , parts , nose , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "fe25519"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-3WFpbt4bA7zPlK+mp5DJXdgk44MBimCbpIMhRjZ5p0o="; + hash = "sha256-Hzdt8932WonJAaQPtL346JFPqxFXkNW4XQvbQlSoJJE="; }; propagatedBuildInputs = [ @@ -29,6 +32,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=fe25519 --cov-report term-missing" "" + ''; + pythonImportsCheck = [ "fe25519" ]; diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index c1e988ca769a..53f2c15401ec 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -10,14 +10,18 @@ buildPythonPackage rec { pname = "feedgenerator"; - version = "1.9.2"; + version = "2.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sG1pQej9aiyecXkQeehsvno3iMciRKzAbwWTtJzaN5s="; + sha256 = "6836d456b8b0edbc5b6d3a42d1be852cebd43d2f28af4ff51789eb295f1860e2"; }; + postPatch = '' + sed -i '/cov/d' setup.cfg + ''; + buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix new file mode 100644 index 000000000000..2aee132e294f --- /dev/null +++ b/pkgs/development/python-modules/ffcv/default.nix @@ -0,0 +1,53 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, libjpeg +, numba +, opencv4 +, pandas +, pkgconfig +, pytorch-pfn-extras +, terminaltables +, tqdm +}: + +buildPythonPackage rec { + pname = "ffcv"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "libffcv"; + repo = pname; + # See https://github.com/libffcv/ffcv/issues/158. + rev = "131d56235eca3f1497bb84eeaec82c3434ef25d8"; + sha256 = "0f7q2x48lknnf98mqaa35my05qwvdgv0h8l9lpagdw6yhx0a6p2x"; + }; + + # See https://github.com/libffcv/ffcv/issues/159. + postPatch = '' + substituteInPlace setup.py \ + --replace "'assertpy'," "" \ + --replace "'fastargs'," "" \ + --replace "'imgcat'," "" \ + --replace "'matplotlib'," "" \ + --replace "'psutil'," "" \ + --replace "'sklearn'," "" \ + --replace "'webdataset'," "" + ''; + + buildInputs = [ libjpeg pkgconfig ]; + propagatedBuildInputs = [ opencv4 numba pandas pytorch-pfn-extras terminaltables tqdm ]; + + # `ffcv._libffcv*.so` cannot be loaded in the nix build environment for some + # reason. See https://github.com/NixOS/nixpkgs/pull/160441#issuecomment-1045204722. + doCheck = false; + + pythonImportsCheck = [ "ffcv" ]; + + meta = with lib; { + description = "FFCV: Fast Forward Computer Vision"; + homepage = "https://ffcv.io"; + license = licenses.asl20; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index 1f8c6983cbd8..f514cf325371 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -1,25 +1,38 @@ { lib , buildPythonPackage , fetchFromGitHub -, substituteAll -, pytestCheckHook , ffmpeg , future -, pytest-runner , pytest-mock +, pytestCheckHook +, pythonAtLeast +, pythonOlder +, substituteAll }: buildPythonPackage rec { pname = "ffmpeg-python"; version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kkroening"; repo = "ffmpeg-python"; rev = version; - sha256 = "0mmydmfz3yiclbgi4lqrv9fh2nalafg4bkm92y2qi50mwqgffk8f"; + hash = "sha256-Dk3nHuYVlIiFF6nORZ5TVFkBXdoZUxLfoiz68V1tvlY="; }; + propagatedBuildInputs = [ + future + ]; + + checkInputs = [ + pytestCheckHook + pytest-mock + ]; + patches = [ (substituteAll { src = ./ffmpeg-location.patch; @@ -27,14 +40,23 @@ buildPythonPackage rec { }) ]; - buildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ future ]; - checkInputs = [ pytestCheckHook pytest-mock ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + ''; + + pythonImportsCheck = [ + "ffmpeg" + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + "test__output__video_size" + ]; meta = with lib; { description = "Python bindings for FFmpeg - with complex filtering support"; homepage = "https://github.com/kkroening/ffmpeg-python"; license = licenses.asl20; - maintainers = [ maintainers.AluisioASG ]; + maintainers = with maintainers; [ AluisioASG ]; }; } diff --git a/pkgs/development/python-modules/fiblary3-fork/default.nix b/pkgs/development/python-modules/fiblary3-fork/default.nix new file mode 100644 index 000000000000..e2c53c3e417b --- /dev/null +++ b/pkgs/development/python-modules/fiblary3-fork/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi +, fixtures +, jsonpatch +, netaddr +, prettytable +, python-dateutil +, pytestCheckHook +, requests +, requests-mock +, six +, sphinx +, testtools +}: + +buildPythonPackage rec { + pname = "fiblary3-fork"; + version = "0.1.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "001wqh7gx2dv3sf7a5xsbppz9r88f5qwrp05jzjsjcm6cbcvmsz0"; + }; + + propagatedBuildInputs = [ + jsonpatch + netaddr + prettytable + python-dateutil + requests + six + ]; + + checkInputs = [ + fixtures + pytestCheckHook + requests-mock + testtools + ]; + + pythonImportsCheck = [ "fiblary3" ]; + + meta = with lib; { + homepage = "https://github.com/graham33/fiblary"; + description = "Fibaro Home Center API Python Library"; + license = licenses.asl20; + maintainers = with maintainers; [ graham33 ]; + }; +} diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index d5ccc117beff..8eaed65ca73c 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.3.0"; + version = "3.4.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8c7eab13dc442dc249e95158bcc12dec724465919bdc9831fdbf0660f03d1785"; + sha256 = "38b4f4c989f9d06d44524df1b24bd19e167d851f19b50bf3e3559952dddc5b80"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix index f89b4e690914..3c777d828b48 100644 --- a/pkgs/development/python-modules/filetype/default.nix +++ b/pkgs/development/python-modules/filetype/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "filetype"; - version = "1.0.9"; + version = "1.0.10"; src = fetchPypi { inherit pname version; - sha256 = "7124e1bc6a97ffc7c6bead5b8fb2e129baf312a9e60db5772bc27c741799d475"; + sha256 = "sha256-MjoTUAcxtsZaJTvDkwu86aVt+6cekLYP/ZaKtp2a6Tc="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/findimports/default.nix b/pkgs/development/python-modules/findimports/default.nix new file mode 100644 index 000000000000..44f1a29a8f2f --- /dev/null +++ b/pkgs/development/python-modules/findimports/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +, pythonOlder +}: + +buildPythonPackage rec { + pname = "findimports"; + version = "2.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "mgedmin"; + repo = pname; + rev = version; + hash = "sha256-p13GVDXDOzOiTnRgtF7UxN1vwZRMa7wVEXJQrFQV7RU="; + }; + + pythonImportsCheck = [ + "findimports" + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} testsuite.py + runHook postCheck + ''; + + meta = with lib; { + description = "Module for the analysis of Python import statements"; + homepage = "https://github.com/mgedmin/findimports"; + license = with licenses; [ gpl2Only /* or */ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix index 0c1a3bd2c651..3cd8eef93277 100644 --- a/pkgs/development/python-modules/fiona/default.nix +++ b/pkgs/development/python-modules/fiona/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "fiona"; - version = "1.8.20"; + version = "1.8.21"; src = fetchPypi { pname = "Fiona"; inherit version; - sha256 = "a70502d2857b82f749c09cb0dea3726787747933a2a1599b5ab787d74e3c143b"; + sha256 = "sha256-Og7coqegcNtAXXEYchSkPSMzpXtAl1RKP8woIGali/w="; }; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; @@ -49,14 +49,6 @@ buildPythonPackage rec { disabledTests = [ # Some tests access network, others test packaging "http" "https" "wheel" - # Assert not true - "test_no_append_driver_cannot_append" - ] ++ lib.optionals stdenv.isAarch64 [ - # https://github.com/Toblerity/Fiona/issues/1012 the existence of this - # as a bug hasn't been challenged and other distributors seem to also - # be skipping these tests on aarch64, so this is not unique to nixpkgs. - "test_write_or_driver_error" - "test_append_or_driver_error" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix index c3974d0e007b..ee3f46d078ca 100644 --- a/pkgs/development/python-modules/flake8-blind-except/default.nix +++ b/pkgs/development/python-modules/flake8-blind-except/default.nix @@ -1,16 +1,32 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +}: buildPythonPackage rec { pname = "flake8-blind-except"; - version = "0.2.0"; + version = "0.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "02a860a1a19cb602c006a3fe0778035b0d14d3f57929b4b798bc7d6684f204e5"; + hash = "sha256-8lpXWp3LPus8dgv5wi22C4taIxICJO0fqppD913X3RY="; }; - meta = { - homepage = "https://github.com/elijahandrews/flake8-blind-except"; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "flake8_blind_except" + ]; + + meta = with lib; { description = "A flake8 extension that checks for blind except: statements"; - maintainers = with lib.maintainers; [ johbo ]; - license = lib.licenses.mit; + homepage = "https://github.com/elijahandrews/flake8-blind-except"; + license = licenses.mit; + maintainers = with maintainers; [ johbo ]; }; } diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix new file mode 100644 index 000000000000..ef014011bdff --- /dev/null +++ b/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, attrs +, flake8 +, pytestCheckHook +, hypothesis +, hypothesmith +}: + +buildPythonPackage rec { + pname = "flake8-bugbear"; + version = "22.3.23"; + + src = fetchFromGitHub { + owner = "PyCQA"; + repo = pname; + rev = version; + sha256 = "sha256-s1EnPM2He+R+vafu14XI1Xuft8Rg6W3vPH2Atc6N7I0="; + }; + + propagatedBuildInputs = [ + attrs + flake8 + ]; + + checkInputs = [ + flake8 + pytestCheckHook + hypothesis + hypothesmith + ]; + + meta = with lib; { + homepage = "https://github.com/PyCQA/flake8-bugbear"; + changelog = "https://github.com/PyCQA/flake8-bugbear/blob/${version}/README.rst#change-log"; + description = '' + A plugin for flake8 finding likely bugs and design problems in your + program. + ''; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index bfdf0e46ea58..7187e8790529 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { pname = "flask-admin"; - version = "1.5.8"; + version = "1.6.0"; format = "setuptools"; src = fetchPypi { pname = "Flask-Admin"; inherit version; - sha256 = "sha256-6wah8xuYiB3uU6VcZPrr0ZkNaqw4gmNksoDfCyZ5/3Q="; + sha256 = "1209qhm51d4z66mbw55cmkzqvr465shnws2m2l2zzpxhnxwzqks2"; }; propagatedBuildInputs = [ @@ -69,6 +69,7 @@ buildPythonPackage rec { "flask_admin/tests/pymongo/test_basic.py" "flask_admin/tests/sqla/test_basic.py" "flask_admin/tests/sqla/test_form_rules.py" + "flask_admin/tests/sqla/test_inlineform.py" "flask_admin/tests/sqla/test_postgres.py" "flask_admin/tests/sqla/test_translation.py" ]; diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index afb81cc103bc..0129c9877230 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , apispec , colorama , click @@ -17,6 +18,7 @@ , marshmallow-enum , marshmallow-sqlalchemy , python-dateutil +, pythonOlder , prison , pyjwt , pyyaml @@ -25,18 +27,34 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "3.4.1"; + version = "3.4.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - sha256 = "c0830935077c4d06d57237ca4791fcabfc682fe3e315c1c9444a2bd6f94e7514"; + sha256 = "sha256-uZzuvNusqMzAS/vmg3CuZ+D442J4LbFwsBboVIx/srE="; }; # See here: https://github.com/dpgaspar/Flask-AppBuilder/commit/7097a7b133f27c78d2b54d2a46e4a4c24478a066.patch # https://github.com/dpgaspar/Flask-AppBuilder/pull/1610 # The patch from the PR doesn't apply cleanly so I edited it manually. - patches = [ ./upgrade-to-flask_jwt_extended-4.patch ]; + patches = [ + ./upgrade-to-flask_jwt_extended-4.patch + (fetchpatch { + # https://github.com/dpgaspar/Flask-AppBuilder/pull/1734 + name = "flask-appbuilder-wtf3.patch"; + url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/bccb3d719cd3ceb872fe74a9ab304d74664fbf43.patch"; + sha256 = "1rsci0ynb7y6k53j164faggjr2g6l5v78w7953qbxcy8f55sb2fv"; + excludes = [ + "requirements.txt" + "setup.py" + "examples/employees/app/views.py" + ]; + }) + ]; propagatedBuildInputs = [ apispec @@ -68,7 +86,8 @@ buildPythonPackage rec { --replace "Flask-Login>=0.3, <0.5" "Flask-Login >=0.3, <0.6" \ --replace "Flask-Babel>=1, <2" "Flask-Babel >=1, <3" \ --replace "Flask-WTF>=0.14.2, <0.15.0" "Flask-WTF" \ - --replace "marshmallow-sqlalchemy>=0.22.0, <0.24.0" "marshmallow-sqlalchemy" \ + --replace "WTForms<3.0.0" "WTForms" \ + --replace "marshmallow-sqlalchemy>=0.22.0, <0.27.0" "marshmallow-sqlalchemy" \ --replace "Flask-JWT-Extended>=3.18, <4" "Flask-JWT-Extended>=4.1.0" \ --replace "PyJWT>=1.7.1, <2.0.0" "PyJWT>=2.0.1" \ --replace "prison>=0.2.1, <1.0.0" "prison" \ @@ -78,10 +97,12 @@ buildPythonPackage rec { # Majority of tests require network access or mongo doCheck = false; - pythonImportsCheck = [ "flask_appbuilder" ]; + pythonImportsCheck = [ + "flask_appbuilder" + ]; meta = with lib; { - description = "Simple and rapid application development framework, built on top of Flask"; + description = "Application development framework, built on top of Flask"; homepage = "https://github.com/dpgaspar/flask-appbuilder/"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index d23306be62bd..d73ad8d35c0d 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "2021.12.28"; + version = "2022.1.8"; src = fetchPypi { inherit pname version; - sha256 = "c722a25067d722483e24cde16ed987a822292ca758a213299e445694d2b5b587"; + sha256 = "a32996ec07ca004c45b768b0d50829728ab8f3986c0650ef538e42852c7aeba2"; }; propagatedBuildInputs = [ flask ]; diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index 2fe71c2d6db9..6c05367b3d47 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -7,6 +7,7 @@ , jinja2 , python-dotenv , werkzeug +, setuptools , pytestCheckHook }: @@ -26,6 +27,10 @@ buildPythonPackage rec { itsdangerous jinja2 werkzeug + + # required for CLI subcommand autodiscovery + # see: https://github.com/pallets/flask/blob/fdac8a5404e3e3a316568107a293f134707c75bb/src/flask/cli.py#L498 + setuptools ]; checkInputs = [ @@ -33,7 +38,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "http://flask.pocoo.org/"; + homepage = "https://flask.palletsprojects.com/"; description = "The Python micro framework for building web applications"; longDescription = '' Flask is a lightweight WSGI web application framework. It is diff --git a/pkgs/development/python-modules/flatdict/default.nix b/pkgs/development/python-modules/flatdict/default.nix new file mode 100644 index 000000000000..186118d30100 --- /dev/null +++ b/pkgs/development/python-modules/flatdict/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "flatdict"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "gmr"; + repo = pname; + rev = version; + hash = "sha256-qH4MMDSXf92BPavnRdCka6lRoWZg+2KnHpHA8kt5JaM="; + }; + + pythonImportsCheck = [ + "flatdict" + ]; + + meta = with lib; { + description = "Python module for interacting with nested dicts as a single level dict with delimited keys"; + homepage = "https://github.com/gmr/flatdict"; + license = licenses.bsd3; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index b8479c0f73ca..3ac8166bbbdd 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , fetchFromGitHub +, jaxlib , keras , lib , matplotlib @@ -12,15 +13,17 @@ buildPythonPackage rec { pname = "flax"; - version = "0.3.6"; + version = "0.4.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "0zvq0vl88hiwmss49bnm7gdmndr1dfza2bcs1fj88a9r7w9dmlsr"; + sha256 = "0rvdaxyf68qmm5d77gbizpcibyz2ic2pb2x7rgf7p8qwijyc39ws"; }; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ matplotlib msgpack diff --git a/pkgs/development/python-modules/fleep/0001-Fixing-paths-on-tests.patch b/pkgs/development/python-modules/fleep/0001-Fixing-paths-on-tests.patch new file mode 100644 index 000000000000..234bf0cb379b --- /dev/null +++ b/pkgs/development/python-modules/fleep/0001-Fixing-paths-on-tests.patch @@ -0,0 +1,48 @@ +From 716fcfa3203bc881b543916bdb9a17460951cd26 Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" +Date: Fri, 26 Nov 2021 07:13:32 -0600 +Subject: [PATCH] Fixing paths on tests + +--- + tests/maintest.py | 7 ++++++- + tests/speedtest.py | 7 ++++++- + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/tests/maintest.py b/tests/maintest.py +index 0e24ca4..3484437 100644 +--- a/tests/maintest.py ++++ b/tests/maintest.py +@@ -1,6 +1,11 @@ + import fleep ++import os + +-with open("testfile", "rb") as file: ++current_dir = os.path.realpath(os.path.join(os.getcwd(), ++ os.path.dirname(__file__))) ++ ++with open(os.path.join(current_dir, "./testfile"), ++ "rb") as file: + info = fleep.get(file.read(128)) + + assert info.type == ["raster-image"] +diff --git a/tests/speedtest.py b/tests/speedtest.py +index 89338ab..829d563 100644 +--- a/tests/speedtest.py ++++ b/tests/speedtest.py +@@ -1,7 +1,12 @@ + import time + import fleep ++import os + +-with open("testfile", "rb") as file: ++current_dir = os.path.realpath(os.path.join(os.getcwd(), ++ os.path.dirname(__file__))) ++ ++with open(os.path.join(current_dir, "./testfile"), ++ "rb") as file: + stream = file.read(128) + + times = [] +-- +2.33.1 + diff --git a/pkgs/development/python-modules/fleep/default.nix b/pkgs/development/python-modules/fleep/default.nix new file mode 100644 index 000000000000..04b607325136 --- /dev/null +++ b/pkgs/development/python-modules/fleep/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "fleep"; + version = "1.0.1"; + + # Pypi version does not have tests + src = fetchFromGitHub { + owner = "floyernick"; + repo = "fleep-py"; + rev = "994bc2c274482d80ab13d89d8f7343eb316d3e44"; + sha256 = "sha256-TaU7njx98nxkhZawGMFqWj4g+yCtIX9aPWQHoamzfMY="; + }; + + patches = [ + ./0001-Fixing-paths-on-tests.patch + ]; + + checkPhase = '' + ${python.interpreter} tests/maintest.py + ${python.interpreter} tests/speedtest.py + ''; + + pythonImportsCheck = [ "fleep" ]; + + meta = with lib; { + description = "File format determination library"; + homepage = "https://github.com/floyernick/fleep-py"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index ae52c31b5775..434f9409dbb3 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -1,26 +1,42 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook +, pythonOlder +, teamcity-messages +, testtools }: buildPythonPackage rec { pname = "flexmock"; - version = "0.11.1"; + version = "0.11.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1c51371767f968e1d2f505138de72b07704ecebc9b34e0b52ffdeeb510685c3f"; + hash = "sha256-sf419qXzJUe1zTGhXAYNmrhj3Aiv8BjNc9x40bZR7dQ="; }; - checkInputs = [ pytest ]; - checkPhase = '' - py.test - ''; + checkInputs = [ + pytestCheckHook + teamcity-messages + testtools + ]; + + disabledTests = [ + "test_failed_test_case" + ]; + + pythonImportsCheck = [ + "flexmock" + ]; meta = with lib; { - description = "flexmock is a testing library for Python that makes it easy to create mocks,stubs and fakes."; + description = "Testing library that makes it easy to create mocks,stubs and fakes"; homepage = "https://flexmock.readthedocs.org"; license = licenses.bsdOriginal; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/flipr-api/default.nix b/pkgs/development/python-modules/flipr-api/default.nix index 418c7cf42fef..1a53b46c4463 100644 --- a/pkgs/development/python-modules/flipr-api/default.nix +++ b/pkgs/development/python-modules/flipr-api/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , requests-mock , pythonOlder @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "flipr-api"; - version = "1.4.1"; + version = "1.4.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "cnico"; repo = pname; rev = version; - sha256 = "00qkzr2g38fpa7ndnbfx9m4d50lmz0j74nkxif3amnkbl4m6l5vn"; + sha256 = "sha256-/G92WkWUr3T5T7VVzMERFVmLDfLz6m9rlZLQZCBQbCI="; }; nativeBuildInputs = [ @@ -40,17 +39,10 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/cnico/flipr-api/pull/4 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/cnico/flipr-api/commit/f14be1dfd4f46d4d43d9ea47e51cafca3cc18e86.patch"; - sha256 = "1fdi19cq21zcjx4g132k480yhi5y0x5qj2l0h8k5zky5cdxs58r6"; - }) + pythonImportsCheck = [ + "flipr_api" ]; - pythonImportsCheck = [ "flipr_api" ]; - meta = with lib; { description = "Python client for Flipr API"; homepage = "https://github.com/cnico/flipr-api"; diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix index 885c688225ca..7045841245d3 100644 --- a/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -1,32 +1,48 @@ { lib -, buildPythonPackage -, fetchPypi -, isPy27 -, botocore , boto3 -, docutils -, unittest2 -, mock +, botocore +, buildPythonPackage +, fetchFromGitHub +, parquet +, pytestCheckHook +, python-dateutil +, pythonOlder }: buildPythonPackage rec { - pname = "flowlogs_reader"; - version = "3.1.0"; - disabled = isPy27; + pname = "flowlogs-reader"; + version = "3.2.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "d99636423abc83bb4042d63edd56852ede9e2949cadcc3339eda8f3367826dd4"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "obsrvbl"; + repo = pname; + # https://github.com/obsrvbl/flowlogs-reader/issues/57 + rev = "fac4c6c63348ff67fd0a8f51d391ba7c9f59e5ed"; + hash = "sha256-bGb2CLp33aIr0R/lBPWAF3CbtVTWpqmcvYgZ6bcARTc="; }; - propagatedBuildInputs = [ botocore boto3 docutils ]; - buildInputs = [ unittest2 mock ]; + propagatedBuildInputs = [ + botocore + boto3 + parquet + python-dateutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "flowlogs_reader" + ]; meta = with lib; { description = "Python library to make retrieving Amazon VPC Flow Logs from CloudWatch Logs a bit easier"; homepage = "https://github.com/obsrvbl/flowlogs-reader"; - maintainers = with maintainers; [ cransom ]; license = licenses.asl20; + maintainers = with maintainers; [ cransom ]; }; - } diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix index 70b97a083d8f..a670b4a9ba16 100644 --- a/pkgs/development/python-modules/flufl/i18n.nix +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -1,9 +1,14 @@ -{ buildPythonPackage, fetchPypi, atpublic }: +{ buildPythonPackage, fetchPypi +, atpublic +, pdm-pep517 +}: buildPythonPackage rec { pname = "flufl.i18n"; - version = "3.2"; + version = "4.0"; + format = "pyproject"; + nativeBuildInputs = [ pdm-pep517 ]; propagatedBuildInputs = [ atpublic ]; doCheck = false; @@ -12,6 +17,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-w1yPjqtmrbf9ZKFCCGAQUGbSs2y2VbM/+xSv6OIj7WI="; + sha256 = "sha256-MTq0djhFp/cEx0Ezt5EaMz3MzrAWjxZ0HQSkfFuasWY="; }; } diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index c0f3ec60cf35..c2cc5723e4df 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -1,16 +1,19 @@ { lib, buildPythonPackage, fetchPypi, pytestCheckHook , atpublic, psutil, pytest-cov, sybil +, pdm-pep517 }: buildPythonPackage rec { pname = "flufl.lock"; - version = "6.0"; + version = "7.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/HSO5gnshktIOO9knb0RcPp53rDCE8L9URUb7mp/wkI="; + sha256 = "sha256-FBX30Z2N2WpYJC4O+5DOPLGHf7VFB0rYwcrky3GR/gE="; }; + nativeBuildInputs = [ pdm-pep517 ]; propagatedBuildInputs = [ atpublic psutil ]; checkInputs = [ pytestCheckHook pytest-cov sybil ]; diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 0834b5fa22ed..f07efbee7f30 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.11"; + version = "0.28.27"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-6EBHFqfCCDKMY9T8suPDIOoiA2LugMJh0OJiHoICioU="; + sha256 = "sha256-Z1NgQo4BrfdPAwoELzyjZphmuvPK/c09j/BvDOWaD9I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index ff8c097d6ff3..48b98a8e1018 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -1,37 +1,60 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder -, pytest -, numpy -, nbconvert -, pandas -, mock -, jinja2 +, pytestCheckHook , branca +, jinja2 +, nbconvert +, numpy +, pandas +, pillow , requests +, selenium +, setuptools-scm }: buildPythonPackage rec { pname = "folium"; version = "0.12.1.post1"; - src = fetchPypi { - inherit pname version; - sha256 = "e91e57d8298f3ccf4cce3c5e065bea6eb17033e3c5432b8a22214009c266b2ab"; - }; - disabled = pythonOlder "3.5"; - checkInputs = [ pytest nbconvert pandas mock ]; - propagatedBuildInputs = [ jinja2 branca requests numpy ]; + src = fetchFromGitHub { + owner = "python-visualization"; + repo = "folium"; + rev = "v${version}"; + sha256 = "sha256-4UseN/3ojZdDUopwZLpHZEBon1qDDvCWfdzxodi/BeA="; + }; - # No tests in archive - doCheck = false; + SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; - checkPhase = '' - py.test - ''; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + branca + jinja2 + numpy + requests + ]; + + checkInputs = [ + nbconvert + pytestCheckHook + pandas + pillow + selenium + ]; + + disabledTests = [ + # requires internet connection + "test_geojson" + "test_heat_map_with_weights" + "test_json_request" + "test_notebook" + ]; meta = { description = "Make beautiful maps with Leaflet.js & Python"; diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix index 7c04c54d424c..7830cb117128 100644 --- a/pkgs/development/python-modules/fontparts/default.nix +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.10.2"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "a3a3926e977f82ae19e6823760b59f2338085973da1eaad5badaf969f261a737"; + sha256 = "sha256-aHtjLHdc2/s3ppF8fz8qFAqxwEKMZJJAFNlBaZ7FAb4="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index ec3acfc775d0..50f5e87a29f4 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.26.2"; + version = "4.29.0"; # Bump to 3.7 when https://github.com/fonttools/fonttools/pull/2417 is merged disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "1zp9idjkn4bn1a4pn8x64vi8j1ijdsd4qvgf1f70dfwqvw6ak1i6"; + sha256 = "LnkpTEpZbbRAyqGPJXdfpHjh4t7n6LkjZGLhirVNl7E="; }; # all dependencies are optional, but diff --git a/pkgs/development/python-modules/forecast-solar/default.nix b/pkgs/development/python-modules/forecast-solar/default.nix index 3f776c970659..a1d3741584ca 100644 --- a/pkgs/development/python-modules/forecast-solar/default.nix +++ b/pkgs/development/python-modules/forecast-solar/default.nix @@ -9,15 +9,17 @@ buildPythonPackage rec { pname = "forecast-solar"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "forecast_solar"; rev = version; - sha256 = "sha256-UrLy+j8YDWuS9pciEDKb/+UoCcw54XWiIUAEYC72/W0="; + sha256 = "sha256-2gex50QEN55uUa8SfAQA7iDZ3SVnpOTXfD3Sxq7KvNw="; }; + PACKAGE_VERSION = version; + propagatedBuildInputs = [ aiodns aiohttp diff --git a/pkgs/development/python-modules/fountains/default.nix b/pkgs/development/python-modules/fountains/default.nix index b869d583fc8d..e62eedf0468c 100644 --- a/pkgs/development/python-modules/fountains/default.nix +++ b/pkgs/development/python-modules/fountains/default.nix @@ -2,16 +2,19 @@ , buildPythonPackage , fetchPypi , bitlist +, pythonOlder }: buildPythonPackage rec { pname = "fountains"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "6de6bc117c376f40a26e111111d638159a2e8a25cfe32f946db0d779decbb70a"; + sha256 = "sha256-c6nw22UtAREYZp0XCEZE6p7GpRvSLukq5y0c9KvVf9w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index da246966c932..1bff69e460e5 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , buildPythonPackage , pkgconfig , gmp @@ -15,29 +14,15 @@ buildPythonPackage rec { pname = "fpylll"; - version = "0.5.1dev"; + version = "0.5.6"; src = fetchFromGitHub { owner = "fplll"; repo = "fpylll"; rev = version; - sha256 = "15vdfgx448mr1nf054h7lr2j3dd35fsfhikqzrh9zsng8n12hxa5"; + sha256 = "sha256-Bxcc0941+pl2Uzam48qe+PFlcBWsJ0rDYZxrxIYQpEA="; }; - patches = [ - # two patches to fix the testsuite on aarch64 (https://github.com/fplll/fpylll/issues/162) - (fetchpatch { - url = "https://github.com/fplll/fpylll/commit/d5809a8fdb86b2693b1fa94e655bbbe4ad80e286.patch"; - name = "less-precision-in-tests.patch"; - sha256 = "0vkvi25nwwvk5r4a4xmkbf060di4hjq32bys75l2hsaysxmk93nz"; - }) - (fetchpatch { - url = "https://github.com/fplll/fpylll/commit/b5b146a010d50da219a313adc4b6f7deddcc146b.patch"; - name = "dont-hardcode-precision.patch"; - sha256 = "1rsbwh90i1j5p2rp6jd5n25v1jzw1n8728fzz1lhb91zmk0hlxc9"; - }) - ]; - buildInputs = [ gmp pari diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 0797d39c3125..092b00f6b02e 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.7.2"; + version = "1.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kbr"; repo = pname; rev = version; - sha256 = "sha256-TT0mc3ID+R5Dhm0xSMpyg68wZR70xJfRfgPkHkvLstA="; + sha256 = "sha256-wapZ4lCG0tfE+LbFVeIxVlbMJN/sSwIeYK5GLCqoWLs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 139a4c562bbe..d7e12cc061d5 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -8,21 +8,16 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.1.1"; + version = "2.3.0"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "655b879217dd445a2023e16154cc231febef802b5c812d5c2e822280ad69e1dc"; + sha256 = "1dd0bqhai4k3fj9ydcwmc9hvbmrsklk349ys21w8x4n5xynk2hns"; }; - postPatch = '' - # fixes build on non-x86_64 architectures - rm frozendict/src/3_9/cpython_src/Include/pyconfig.h - ''; - pythonImportsCheck = [ "frozendict" ]; @@ -32,24 +27,12 @@ buildPythonPackage rec { ]; preCheck = '' - rm -r frozendict - export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + pushd test ''; - disabledTests = [ - # TypeError: unsupported operand type(s) for |=: 'frozendict.frozendict' and 'dict' - "test_union" - # non-standard assertions - "test_repr" - "test_format" - "test_str" - ]; - - disabledTestPaths = [ - # unpackaged test dependency: coold - "test/test_coold.py" - "test/test_coold_subclass.py" - ]; + postCheck = '' + popd + ''; meta = with lib; { homepage = "https://github.com/slezica/python-frozendict"; diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix index 34660645b596..1bc295fbe332 100644 --- a/pkgs/development/python-modules/frozenlist/default.nix +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "frozenlist"; - version = "1.2.0"; - disabled = pythonOlder "3.6"; + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rTbekdceC5QK0aiySi/4QUwaEoDfTlLrx2t6Kb9bH7U="; + hash = "sha256-cHKqkvsBUN7If+8swbd6aafFrSgnop3YlweBLPOHzyU="; }; nativeBuildInputs = [ @@ -35,7 +37,9 @@ buildPythonPackage rec { cython frozenlist/_frozenlist.pyx ''; - pythonImportsCheck = [ "frozenlist" ]; + pythonImportsCheck = [ + "frozenlist" + ]; meta = with lib; { description = "Python module for list-like structure"; diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 9d538214c4b4..fb84371e2035 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2021.10.1"; + version = "2022.01.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "intake"; repo = "filesystem_spec"; rev = version; - sha256 = "sha256-LgrOHBXKs2bEgtgrdHb1OEhOeQ5Rbgr6X5YtgiqiCH0="; + sha256 = "sha256-iPe2q9hY3ZRIKQGpxrHda3t9G0AtbtohVcWdnAzlzCo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix index 501b95f81f14..e9e445f11c3d 100644 --- a/pkgs/development/python-modules/ftputil/default.nix +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -1,32 +1,45 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder, pytest, freezegun }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, freezegun +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - version = "5.0.2"; pname = "ftputil"; + version = "5.0.3"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "afa2ba402235e8c6583c1d2630269628344134c9246b961ff14f182047f3e633"; + hash = "sha256-m4buZ8GYDOHYmxN1K8SLlJP+4GNJy0doKFlOduCPhIg="; }; - checkInputs = [ pytest freezegun ]; + checkInputs = [ + freezegun + pytestCheckHook + ]; - checkPhase = '' - touch Makefile - # Disable tests that require network access or access /home or assume execution before year 2020 - py.test test \ - -k "not test_public_servers and not test_real_ftp \ - and not test_set_parser and not test_repr \ - and not test_conditional_upload and not test_conditional_download_with_older_target \ - '' - # need until https://ftputil.sschwarzer.net/trac/ticket/140#ticket is fixed - + lib.optionalString stdenv.isDarwin "and not test_error_message_reuse" - + ''"''; + disabledTests = [ + # Tests require network access + "test_public_servers" + "test_real_ftp" + "test_set_parser" + "test_upload" + ]; + + pythonImportsCheck = [ + "ftputil" + ]; meta = with lib; { description = "High-level FTP client library (virtual file system and more)"; homepage = "http://ftputil.sschwarzer.net/"; - license = licenses.bsd2; # "Modified BSD license, says pypi" + license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix index 8a7335accda4..115d358cb786 100644 --- a/pkgs/development/python-modules/funcsigs/default.nix +++ b/pkgs/development/python-modules/funcsigs/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, isPyPy, isPy3k, unittest2 +, isPyPy, isPy3k }: buildPythonPackage rec { @@ -11,11 +11,14 @@ buildPythonPackage rec { sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7"; }; - buildInputs = [ unittest2 ]; - # https://github.com/testing-cabal/funcsigs/issues/10 patches = lib.optional (isPyPy && isPy3k) [ ./fix-pypy3-tests.patch ]; + # requires, unittest2 and package hasn't been maintained since 2013 + doCheck = false; + + pythonImportsCheck = [ "funcsigs" ]; + meta = with lib; { description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"; homepage = "https://github.com/aliles/funcsigs"; diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 956c7da93580..615bf3ebe9c0 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -8,13 +8,15 @@ buildPythonPackage rec { pname = "furo"; - version = "2021.10.9"; - format = "flit"; + version = "2022.3.4"; + format = "wheel"; disable = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-K6pCoi7ePm6Vxhgqs2S6wuwVt5vH+cp/sJ/ZrsSzVAw="; + inherit pname version format; + dist = "py3"; + python = "py3"; + sha256 = "sha256-bHGCk+v4d1XwufFIseaXyeOqvXr5VWRNS8ruXOddt4E="; }; propagatedBuildInputs = [ @@ -22,6 +24,17 @@ buildPythonPackage rec { beautifulsoup4 ]; + installCheckPhase = '' + # furo was built incorrectly if this directory is empty + # Ignore the hidden file .gitignore + cd "$out/lib/python"* + if [ "$(ls 'site-packages/furo/theme/furo/static/' | wc -l)" -le 0 ]; then + echo 'static directory must not be empty' + exit 1 + fi + cd - + ''; + pythonImportsCheck = [ "furo" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/gaphas/default.nix b/pkgs/development/python-modules/gaphas/default.nix index a6351aeeadd7..3c8933686b22 100644 --- a/pkgs/development/python-modules/gaphas/default.nix +++ b/pkgs/development/python-modules/gaphas/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "gaphas"; - version = "3.1.9"; + version = "3.6.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-S6cRsfqXYM4mSVSs2M8fET5ShFClKkGkod2w2y6F2gc="; + sha256 = "sha256-yleYbAJdDVzZrMQ3izi9UX3Ji1vIuQDc+RK5+wzrMi4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/garages-amsterdam/default.nix index 08a687d70601..cc89020e4430 100644 --- a/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -1,22 +1,34 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub +, poetry-core , pythonOlder -, aiohttp }: buildPythonPackage rec { pname = "garages-amsterdam"; - version = "2.1.1"; - disabled = pythonOlder "3.7"; + version = "4.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "garages_amsterdam"; - rev = version; - sha256 = "1m0bc3bzb83apprk412s7k5r2g6p5br2hrak2a976lh9ifk1d8hj"; + rev = "v${version}"; + sha256 = "sha256-3YSCf5sUnq2+Bt7LA30XeIMg4zsaPF3K5SVzGZ68SbY="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"0.0.0"' '"${version}"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp ]; @@ -24,11 +36,13 @@ buildPythonPackage rec { # The only test requires network access doCheck = false; - pythonImportsCheck = [ "garages_amsterdam" ]; + pythonImportsCheck = [ + "garages_amsterdam" + ]; meta = with lib; { description = "Python client for getting garage occupancy in Amsterdam"; - homepage = "https://github.com/klaasnicolaas/garages_amsterdam"; + homepage = "https://github.com/klaasnicolaas/python-garages-amsterdam"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/garminconnect-aio/default.nix b/pkgs/development/python-modules/garminconnect-aio/default.nix index bb754118e077..abdd1f9f2f26 100644 --- a/pkgs/development/python-modules/garminconnect-aio/default.nix +++ b/pkgs/development/python-modules/garminconnect-aio/default.nix @@ -3,18 +3,22 @@ , brotlipy , buildPythonPackage , fetchFromGitHub +, pythonOlder , yarl }: buildPythonPackage rec { pname = "garminconnect-aio"; version = "0.1.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cyberjunky"; repo = "python-garminconnect-aio"; rev = version; - sha256 = "0s2gpy5hciv9akqqhxy0d2ywp6jp9mmdngx34q7fq3xn668kcrhr"; + hash = "sha256-GWY2kTG2D+wOJqM/22pNV5rLvWjAd4jxVGlHBou/T2g="; }; propagatedBuildInputs = [ @@ -26,7 +30,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "garminconnect_aio" ]; + pythonImportsCheck = [ + "garminconnect_aio" + ]; meta = with lib; { description = "Python module to interact with Garmin Connect"; diff --git a/pkgs/development/python-modules/garminconnect-ha/default.nix b/pkgs/development/python-modules/garminconnect/default.nix similarity index 54% rename from pkgs/development/python-modules/garminconnect-ha/default.nix rename to pkgs/development/python-modules/garminconnect/default.nix index c88af9b230e1..62a85ea8bc36 100644 --- a/pkgs/development/python-modules/garminconnect-ha/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -2,18 +2,22 @@ , buildPythonPackage , cloudscraper , fetchFromGitHub +, pythonOlder , requests }: buildPythonPackage rec { - pname = "garminconnect-ha"; - version = "0.1.13"; + pname = "garminconnect"; + version = "0.1.44"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cyberjunky"; - repo = "python-garminconnect-ha"; + repo = "python-garminconnect"; rev = version; - sha256 = "sha256-1O1EcG5FvpwUvI8rwcdlQLzEEStyFAwvmkaL97u6hZ4="; + hash = "sha256-CUjMbh3eGPwoHW+oOjaVyr0g/txWmzGuP1usq2WCwZg="; }; propagatedBuildInputs = [ @@ -21,14 +25,16 @@ buildPythonPackage rec { requests ]; - # Project has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "garminconnect_ha" ]; + pythonImportsCheck = [ + "garminconnect" + ]; meta = with lib; { - description = "Minimal Garmin Connect Python 3 API wrapper for Home Assistant"; - homepage = "https://github.com/cyberjunky/python-garminconnect-ha"; + description = "Garmin Connect Python API wrapper"; + homepage = "https://github.com/cyberjunky/python-garminconnect"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index f374378d9865..110363b38322 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -1,24 +1,36 @@ { lib -, fetchFromGitHub -, buildPythonPackage , astunparse +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "gast"; - version = "0.5.1"; + version = "0.5.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "serge-sans-paille"; - repo = "gast"; + repo = pname; rev = version; - sha256 = "1gph45frnj47lfr6idiyxrb3gk7vzc9rni9cijmcyz10dyx5kgwa"; + sha256 = "sha256-0y2bHT7YEfTvDxTm6yLl3GmnPUYEieoGEnwkzfA6mOg="; }; - checkInputs = [ astunparse ]; + checkInputs = [ + astunparse + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gast" + ]; meta = with lib; { - description = "GAST provides a compatibility layer between the AST of various Python versions, as produced by ast.parse from the standard ast module."; + description = "Compatibility layer between the AST of various Python versions"; homepage = "https://github.com/serge-sans-paille/gast/"; license = licenses.bsd3; maintainers = with maintainers; [ jyp cpcloud ]; diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 5e9b32048f1f..88fc47ad2a59 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -4,15 +4,19 @@ , jinja2 , lxml , pygments +, pythonOlder }: buildPythonPackage rec { pname = "gcovr"; - version = "5.0"; + version = "5.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1d80264cbaadff356b3dda71b8c62b3aa803e5b3eb6d526a24932cd6660a2576"; + hash = "sha256-d4CEQ1m/8LlsBBR9r/8l5uWF4FWFvVQjabvDd9ad4SE="; }; propagatedBuildInputs = [ @@ -33,8 +37,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A Python script for summarizing gcov data"; - license = licenses.bsd0; + description = "Python script for summarizing gcov data"; homepage = "https://www.gcovr.com/"; + license = licenses.bsd0; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 66d05f2a355b..518226f34dd2 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -18,15 +18,16 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2021.10.1"; + version = "2022.01.0"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fsspec"; repo = pname; rev = version; - sha256 = "sha256-cpV+HKE39Yct1yu5xW9HZftx2Wy9ydFL2YLvPD3YM2M="; + hash = "sha256-wNeK1GdjK9GKaaECcFeBLjFf/h3MbLI5e4MX0UNoTqE="; }; propagatedBuildInputs = [ @@ -47,11 +48,15 @@ buildPythonPackage rec { vcrpy ]; - disabledTests = [ - # Tests wants to communicate with the Link-local address - "test_GoogleCredentials_None" + disabledTestPaths = [ + # Tests require a running Docker instance + "gcsfs/tests/test_core.py" + "gcsfs/tests/test_mapping.py" + "gcsfs/tests/test_retry.py" ]; + pytestFlagsArray = [ "-x" ]; + pythonImportsCheck = [ "gcsfs" ]; diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 195a7e822d76..305fd93c9635 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "gdown"; - version = "4.2.0"; + version = "4.4.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "bd871c125242a9d3691aa74f360b6b5268a58c13991bb2405fdb3ec3028307dc"; + sha256 = "sha256-GPw6TaSiJz3reqKcdIa+TfORnZBBWK1qaj4lyBFUcNc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gdtoolkit/default.nix b/pkgs/development/python-modules/gdtoolkit/default.nix new file mode 100644 index 000000000000..5323e12e4c55 --- /dev/null +++ b/pkgs/development/python-modules/gdtoolkit/default.nix @@ -0,0 +1,46 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, lark, docopt, pyyaml, setuptools }: + +let lark080 = lark.overrideAttrs (old: rec { + # gdtoolkit needs exactly this lark version + version = "0.8.0"; + src = fetchFromGitHub { + owner = "lark-parser"; + repo = "lark"; + rev = version; + sha256 = "su7kToZ05OESwRCMPG6Z+XlFUvbEb3d8DgsTEcPJMg4="; + }; +}); + +in +buildPythonPackage rec { + pname = "gdtoolkit"; + version = "3.3.1"; + + propagatedBuildInputs = [ + lark080 + docopt + pyyaml + setuptools + ]; + + # If we try to get using fetchPypi it requires GeoIP (but the package dont has that dep!?) + src = fetchFromGitHub { + owner = "Scony"; + repo = "godot-gdscript-toolkit"; + rev = version; + sha256 = "13nnpwy550jf5qnm9ixpxl1bwfnhhbiys8vqfd25g3aim4bm3gnn"; + }; + + disabled = pythonOlder "3.7"; + + # Tests cannot be run because they need network to install additional dependencies using pip and tox + doCheck = false; + pythonImportsCheck = [ "gdtoolkit" "gdtoolkit.formatter" "gdtoolkit.linter" "gdtoolkit.parser" ]; + + meta = with lib; { + description = "Independent set of tools for working with Godot's GDScript - parser, linter and formatter"; + homepage = "https://github.com/Scony/godot-gdscript-toolkit"; + license = licenses.mit; + maintainers = with maintainers; [ shiryel ]; + }; +} diff --git a/pkgs/development/python-modules/ge25519/default.nix b/pkgs/development/python-modules/ge25519/default.nix index 5c9369e005b9..22c96920be6c 100644 --- a/pkgs/development/python-modules/ge25519/default.nix +++ b/pkgs/development/python-modules/ge25519/default.nix @@ -7,16 +7,19 @@ , nose , parts , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "ge25519"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-0M9RF8tlEoLyduvY3RvltGAnsus3HF6FEy22b6w6aUs="; + hash = "sha256-8GsNY62SusUmQcaqlhKOPHbd0jvZulCaxMxeob37JJM="; }; propagatedBuildInputs = [ @@ -31,6 +34,12 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=ge25519 --cov-report term-missing" "" + ''; + + pythonImportsCheck = [ "ge25519" ]; diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index 855b671d2b64..a4c9d2d7460d 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.4.22"; + version = "0.4.24"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3HErbW9/YD8Jd6zr5O2hjoLZ9x5P/vzZLjqPmSm09EM="; + sha256 = "sha256-20l3zNOvZVGucm1SFzmSjkj3iOXPQhp4T5sInTGO/aQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/geniushub-client/default.nix b/pkgs/development/python-modules/geniushub-client/default.nix new file mode 100644 index 000000000000..019c1e1a21bc --- /dev/null +++ b/pkgs/development/python-modules/geniushub-client/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +}: + +buildPythonPackage rec { + pname = "geniushub-client"; + version = "0.6.30"; + + src = fetchPypi { + inherit pname version; + sha256 = "390932b6e5051e221d104b2683d9deb6e352172c4ec4eeede0954bf2f9680211"; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # tests only implemented after 0.6.30 + doCheck = false; + + pythonImportsCheck = [ "geniushubclient" ]; + + meta = with lib; { + description = "Aiohttp-based client for Genius Hub systems"; + homepage = "https://github.com/zxdavb/geniushub-client"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/geojson-client/default.nix b/pkgs/development/python-modules/geojson-client/default.nix index 8c4eb2cdf1bf..64fbf0661159 100644 --- a/pkgs/development/python-modules/geojson-client/default.nix +++ b/pkgs/development/python-modules/geojson-client/default.nix @@ -6,17 +6,21 @@ , pytz , requests , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "geojson-client"; - version = "0.6"; + version = "0.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-geojson-client"; rev = "v${version}"; - sha256 = "sha256-8eSLimCgFRn3cHTz5TE9fAUAbwFO72b23C0lg6fVOLQ="; + sha256 = "sha256-7EhdIfVM6d5fp6k+RdX6z33O5sZGeF/ThNkSXL8EjE8="; }; propagatedBuildInputs = [ @@ -26,9 +30,13 @@ buildPythonPackage rec { requests ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "geojson_client" ]; + pythonImportsCheck = [ + "geojson_client" + ]; meta = with lib; { description = "Python module for convenient access to GeoJSON feeds"; diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix new file mode 100644 index 000000000000..89f1e73ed9af --- /dev/null +++ b/pkgs/development/python-modules/geometric/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage, lib, fetchFromGitHub +, networkx, numpy, scipy, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "geometric"; + version = "0.9.7.2"; + + src = fetchFromGitHub { + owner = "leeping"; + repo = "geomeTRIC"; + rev = version; + hash = "sha256-QFpfY6tWqcda6AJT17YBEuwu/4DYPbIMJU1c9/gHjaA="; + }; + + propagatedBuildInputs = [ + networkx + numpy + scipy + six + ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Geometry optimization code for molecular structures"; + homepage = "https://github.com/leeping/geomeTRIC"; + license = [ licenses.bsd3 ]; + maintainers = [ maintainers.markuskowa ]; + }; +} + diff --git a/pkgs/development/python-modules/georss-client/default.nix b/pkgs/development/python-modules/georss-client/default.nix index 2e5fc5da9e83..09365ff58586 100644 --- a/pkgs/development/python-modules/georss-client/default.nix +++ b/pkgs/development/python-modules/georss-client/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "georss-client"; - version = "0.14"; + version = "0.15"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-client"; rev = "v${version}"; - sha256 = "sha256-rviXXNmDLEVNYOCkqvLT9EXSuVpI5wMlCXnlpUUl1P0="; + sha256 = "sha256-D1ggfEDU+vlFmi1USwdHj1due0PrCQCpKF4zaarHCFs="; }; propagatedBuildInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_client" ]; + pythonImportsCheck = [ + "georss_client" + ]; meta = with lib; { description = "Python library for accessing GeoRSS feeds"; diff --git a/pkgs/development/python-modules/georss-generic-client/default.nix b/pkgs/development/python-modules/georss-generic-client/default.nix index 4f2e317c52ef..4345505f310c 100644 --- a/pkgs/development/python-modules/georss-generic-client/default.nix +++ b/pkgs/development/python-modules/georss-generic-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "georss-generic-client"; - version = "0.6"; + version = "0.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-generic-client"; rev = "v${version}"; - sha256 = "sha256-XVejBbVilq8zrmuyBUd0mNPZ4qysSg9lAe/lhbKT+qs="; + sha256 = "sha256-58NpACrJK29NUnx3RrsLFPPo+6A/JlIlkrv8N9juMu0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix index e87c766c0caf..ae923138d295 100644 --- a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix +++ b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-ign-sismologia-client"; - version = "0.4"; + version = "0.5"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ign-sismologia-client"; rev = "v${version}"; - sha256 = "sha256-g7lZC5ZiJV8dNZJceLROqyBRZSuqaivGFhaQrKe4B7g="; + hash = "sha256-i3VdxntFwieCmB4ihHRSCV5YKDyYytl3XnU/G1LwLhg="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_ign_sismologia_client" ]; + pythonImportsCheck = [ + "georss_ign_sismologia_client" + ]; meta = with lib; { description = "Python library for accessing the IGN Sismologia GeoRSS feed"; diff --git a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix index dc253dafe1e2..512db4d8deee 100644 --- a/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix +++ b/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-ingv-centro-nazionale-terremoti-client"; - version = "0.5"; + version = "0.6"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ingv-centro-nazionale-terremoti-client"; rev = "v${version}"; - sha256 = "1pd0qsr0n8f1169p2nz8s0zrbrxh0rdzaxdb3jmdymzp4xz28wb0"; + sha256 = "sha256-zqjo70NzpUt5zNEar0P1sl/gMb+ZcS+7GX7QGuFjMYY="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_ingv_centro_nazionale_terremoti_client" ]; + pythonImportsCheck = [ + "georss_ingv_centro_nazionale_terremoti_client" + ]; meta = with lib; { description = "Python library for accessing the INGV Centro Nazionale Terremoti GeoRSS feed"; diff --git a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix index 089a72ef8112..344c74b057f4 100644 --- a/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix +++ b/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-nrcan-earthquakes-client"; - version = "0.3"; + version = "0.4"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-nrcan-earthquakes-client"; rev = "v${version}"; - sha256 = "1brn6ycsw3d3znbqi2w2cxjw8hyfb44p2lra18rx2gyvgnkxg19l"; + hash = "sha256-FFm37+dCkdoZXgvAjYhcHOYFf0oQ37bxJb7vzbWDTro="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_nrcan_earthquakes_client" ]; + pythonImportsCheck = [ + "georss_nrcan_earthquakes_client" + ]; meta = with lib; { description = "Python library for accessing Natural Resources Canada Earthquakes feed"; diff --git a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix index 954e4a6237fb..fb4b0e753ab4 100644 --- a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix +++ b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-qld-bushfire-alert-client"; - version = "0.5"; + version = "0.6"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-qld-bushfire-alert-client"; rev = "v${version}"; - sha256 = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk="; + hash = "sha256-7KVR0hdLwyCj7MYJoRvQ6wTeJQAmCUarYxJXEFaN8Pc="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_qld_bushfire_alert_client" ]; + pythonImportsCheck = [ + "georss_qld_bushfire_alert_client" + ]; meta = with lib; { description = "Python library for accessing Queensland Bushfire Alert feed"; diff --git a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix index 5428dfcbc53a..fc19ea105c69 100644 --- a/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix +++ b/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-tfs-incidents-client"; - version = "0.3"; + version = "0.4"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-tfs-incidents-client"; rev = "v${version}"; - sha256 = "11nvwrjzax4yy6aj971yym05yyizwfafy4ccsyy1qpwbs6dwbw7m"; + hash = "sha256-Cz0PRcGReAE0mg04ktCUaoLqPTjvyU1TiB/Pdz7o7zo="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_tfs_incidents_client" ]; + pythonImportsCheck = [ + "georss_tfs_incidents_client" + ]; meta = with lib; { description = "Python library for accessing Tasmania Fire Service Incidents feed"; diff --git a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix index ec6a5cd5f2e3..74c1a9994987 100644 --- a/pkgs/development/python-modules/georss-wa-dfes-client/default.nix +++ b/pkgs/development/python-modules/georss-wa-dfes-client/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "georss-wa-dfes-client"; - version = "0.3"; + version = "0.4"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-wa-dfes-client"; rev = "v${version}"; - sha256 = "01fk67kc6ww88yzsans8g81i6j7s0276gma5fk76la1c8vj2ifs7"; + hash = "sha256-s7qGTlWFdOtw0eMK7idld7HPOxO8CjODCmUi0WmRLdI="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "georss_wa_dfes_client" ]; + pythonImportsCheck = [ + "georss_wa_dfes_client" + ]; meta = with lib; { description = "Python library for accessing WA Department of Fire and Emergency Services (DFES) feed"; diff --git a/pkgs/development/python-modules/gevent-socketio/default.nix b/pkgs/development/python-modules/gevent-socketio/default.nix index 4a25e0d7e148..338398714494 100644 --- a/pkgs/development/python-modules/gevent-socketio/default.nix +++ b/pkgs/development/python-modules/gevent-socketio/default.nix @@ -1,29 +1,48 @@ { lib , buildPythonPackage , fetchPypi -, versiontools +, gevent , gevent-websocket , mock -, pytest -, gevent +, versiontools +, pythonOlder }: buildPythonPackage rec { pname = "gevent-socketio"; version = "0.3.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1zra86hg2l1jcpl9nsnqagy3nl3akws8bvrbpgdxk15x7ywllfak"; + hash = "sha256-UzlKuT+9hNnbuyvvhTSfalA7/FPYapvoZTJQ8aBBKv8="; }; - buildInputs = [ versiontools gevent-websocket mock pytest ]; - propagatedBuildInputs = [ gevent ]; + nativeBuildInputs = [ + versiontools + ]; + + buildInputs = [ + gevent-websocket + ]; + + propagatedBuildInputs = [ + gevent + ]; + + # Tests are not ported to Python 3 + doCheck = false; + + pythonImportsCheck = [ + "socketio" + ]; meta = with lib; { + description = "SocketIO server based on the Gevent pywsgi server"; homepage = "https://github.com/abourget/gevent-socketio"; - description = "SocketIO server based on the Gevent pywsgi server, a Python network library"; license = licenses.bsd0; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index 5e93fb32b9e7..66709d8fafa5 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -3,29 +3,37 @@ , fetchPypi , gevent , gunicorn +, pythonOlder }: buildPythonPackage rec { pname = "gevent-websocket"; version = "0.10.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1c2zv2rahp1gil3cj66hfsqgy0n35hz9fny3ywhr2319d0lz7bky"; + hash = "sha256-fq7zKWgpDJEh98Nblz4swwL/sHbQGMkGjS9cqLLYX7A="; }; - propagatedBuildInputs = [ gevent gunicorn ]; + propagatedBuildInputs = [ + gevent + gunicorn + ]; - # zero tests run + # Module has no test doCheck = false; - pythonImportsCheck = [ "geventwebsocket" ]; + pythonImportsCheck = [ + "geventwebsocket" + ]; meta = with lib; { + description = "Websocket handler for the gevent pywsgi server"; homepage = "https://www.gitlab.com/noppo/gevent-websocket"; - description = "Websocket handler for the gevent pywsgi server, a Python network library"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index 3fe9e648ce32..e2b1e11278b7 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -1,35 +1,50 @@ -{ lib, fetchPypi, buildPythonPackage, isPyPy, python, libev, greenlet +{ lib +, fetchPypi +, buildPythonPackage +, isPyPy +, python +, libev +, greenlet +, zope_event , zope_interface +, pythonOlder }: buildPythonPackage rec { pname = "gevent"; - version = "20.9.0"; + version = "21.12.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "13aw9x6imsy3b369kfjblqiwfni69pp32m4r13n62r9k3l2lhvaz"; + hash = "sha256-9ItkV4w2e5H6eTv46qr0mVy5PIvEWGDkc7+GgHCtCU4="; }; - buildInputs = [ libev ]; - propagatedBuildInputs = [ - zope_interface - ] ++ lib.optionals (!isPyPy) [ greenlet ]; + buildInputs = [ + libev + ]; - checkPhase = '' - cd greentest - ${python.interpreter} testrunner.py - ''; + propagatedBuildInputs = [ + zope_event + zope_interface + ] ++ lib.optionals (!isPyPy) [ + greenlet + ]; # Bunch of failures. doCheck = false; + pythonImportsCheck = [ + "gevent" + ]; + meta = with lib; { description = "Coroutine-based networking library"; homepage = "http://www.gevent.org/"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 7e30b8e83f49..4a349106ac3f 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -1,23 +1,25 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchPypi -, backports_ssl_match_hostname , brotli +, buildPythonPackage , certifi -, gevent -, six , dpkt +, fetchPypi +, gevent , pytestCheckHook +, pythonOlder +, six }: buildPythonPackage rec { pname = "geventhttpclient"; version = "1.5.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "d80ec9ff42b7219f33558185499d0b4365597fc55ff886207b45f5632e099780"; + hash = "sha256-2A7J/0K3IZ8zVYGFSZ0LQ2VZf8Vf+IYge0X1Yy4Jl4A="; }; propagatedBuildInputs = [ @@ -25,8 +27,6 @@ buildPythonPackage rec { certifi gevent six - ] ++ lib.optionals (pythonOlder "3.7") [ - backports_ssl_match_hostname ]; checkInputs = [ @@ -45,11 +45,14 @@ buildPythonPackage rec { "test_multi_queries_greenlet_safe" ]; + pythonImportsCheck = [ + "geventhttpclient" + ]; + meta = with lib; { homepage = "https://github.com/gwik/geventhttpclient"; description = "HTTP client library for gevent"; license = licenses.mit; maintainers = with maintainers; [ koral ]; }; - } diff --git a/pkgs/development/python-modules/gigalixir/default.nix b/pkgs/development/python-modules/gigalixir/default.nix index aa5512d99131..e1ca84e21861 100644 --- a/pkgs/development/python-modules/gigalixir/default.nix +++ b/pkgs/development/python-modules/gigalixir/default.nix @@ -1,9 +1,9 @@ -{ buildPythonApplication +{ lib +, buildPythonApplication , click , fetchPypi , git , httpretty -, lib , qrcode , pygments , pyopenssl @@ -11,43 +11,54 @@ , requests , rollbar , stripe +, pythonOlder , sure }: buildPythonApplication rec { pname = "gigalixir"; - version = "1.2.4"; + version = "1.2.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "894b7e5bef30abc2c003e6df47f7758de5649b6f593e33926fcd398cc88d9ce2"; + hash = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw="; }; + propagatedBuildInputs = [ + click + pygments + pyopenssl + qrcode + requests + rollbar + stripe + ]; + + checkInputs = [ + git + httpretty + pytestCheckHook + sure + ]; + postPatch = '' substituteInPlace setup.py \ --replace "'pytest-runner'," "" \ --replace "cryptography==" "cryptography>=" ''; - propagatedBuildInputs = [ - click - requests - stripe - rollbar - pygments - qrcode - pyopenssl + disabledTests = [ + # Test requires network access + "test_rollback_without_version" ]; - checkInputs = [ - httpretty - sure - pytestCheckHook - git + pythonImportsCheck = [ + "gigalixir" ]; - pythonImportsCheck = [ "gigalixir" ]; - meta = with lib; { description = "Gigalixir Command-Line Interface"; homepage = "https://github.com/gigalixir/gigalixir-cli"; diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index a059495d00fe..2bab62fbcb10 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "gipc"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "a25ccfd2f8c94b24d2113fa50a0de5c7a44499ca9f2ab7c91c3bec0ed96ddeb1"; + sha256 = "sha256-P8d2GIxFAAHeXjXgIxKGwahiH1TW/9fE+V0f9Ra54wo="; }; propagatedBuildInputs = [ gevent ]; diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index bdd2e63e07aa..2c52db8ab5ff 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = version; - sha256 = "sha256-F3jmYBZNzI4hRmH1J+S5RwxjouZNcUJOnD3QpX1J39s="; + sha256 = "sha256-mV67mppzx3lka04bxQ5CdufknZTTqWqGJzqPaHb4C2o="; }; nativeBuildInputs = [ @@ -37,11 +37,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'httpx = ">=0.20,<1"' 'httpx = ">=0.19,<1"' - ''; - pythonImportsCheck = [ "glances_api" ]; diff --git a/pkgs/development/python-modules/glcontext/default.nix b/pkgs/development/python-modules/glcontext/default.nix index b091d2583b6b..fe25277e8cda 100644 --- a/pkgs/development/python-modules/glcontext/default.nix +++ b/pkgs/development/python-modules/glcontext/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "glcontext"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "moderngl"; repo = pname; rev = version; - sha256 = "1m2zkl696vqmgrd5k1c5kl0krk6qgjgsz88qhahwva0l40bswvhp"; + sha256 = "sha256-wvoIfwd0UBooqbJGshADjf96Xqx2k9G1nN3Dy6v3GIY="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/glean-parser/default.nix b/pkgs/development/python-modules/glean-parser/default.nix index 469c0d613b90..953e3faa67bb 100644 --- a/pkgs/development/python-modules/glean-parser/default.nix +++ b/pkgs/development/python-modules/glean-parser/default.nix @@ -1,33 +1,34 @@ { lib -, buildPythonPackage -, fetchPypi -, pytestCheckHook -, pythonOlder -, setuptools-scm -# build inputs , appdirs +, buildPythonPackage , click , diskcache +, fetchPypi , jinja2 , jsonschema +, pytestCheckHook +, pythonOlder , pyyaml +, setuptools-scm , yamllint }: buildPythonPackage rec { - pname = "glean_parser"; - version = "4.4.0"; + pname = "glean-parser"; + version = "5.1.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "3ae1435b183936a49368806421df27ab944f1802e86a02b38b8e08e53ff0aac5"; + pname = "glean_parser"; + inherit version; + hash = "sha256-8oMbaGsW5Lkw9OluNsXXe2IBNbjeoIb9vDjVOt+uHR0="; }; - postPatch = '' - substituteInPlace setup.py --replace "pytest-runner" "" - ''; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ appdirs @@ -38,24 +39,29 @@ buildPythonPackage rec { pyyaml yamllint ]; - nativeBuildInputs = [ - setuptools-scm - ]; checkInputs = [ pytestCheckHook ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + ''; + disabledTests = [ # https://bugzilla.mozilla.org/show_bug.cgi?id=1741668 "test_validate_ping" ]; - pythonImportsCheck = [ "glean_parser" ]; + pythonImportsCheck = [ + "glean_parser" + ]; meta = with lib; { description = "Tools for parsing the metadata for Mozilla's glean telemetry SDK"; homepage = "https://github.com/mozilla/glean_parser"; license = licenses.mpl20; - maintainers = [ maintainers.kvark ]; + maintainers = with maintainers; [ kvark ]; }; } diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index e729d927cdae..8bfc7dcafeda 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -1,53 +1,66 @@ { lib , buildPythonPackage -, fetchPypi -, rustPlatform -, rustc , cargo -, setuptools-rust -# build inputs , cffi +, fetchPypi , glean-parser +, iso8601 +, pytest-localserver +, pytestCheckHook +, pythonOlder +, rustc +, rustPlatform +, setuptools-rust }: buildPythonPackage rec { pname = "glean-sdk"; - version = "42.2.0"; + version = "44.0.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-X2p6KQnEB6ZHdCHGFVEoEMiI+0R2vfGqel+jFKTcx74="; + hash = "sha256-gzLsBwq3wrFde5cEb5+oFLW4KrwoiZpr22JbJhNr1yk="; }; - patches = [ - # Fix the environment for spawned process - # https://github.com/mozilla/glean/pull/1542 - ./fix-spawned-process-environment.patch - ]; - cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-/+rKGPYTLovgjTGL2F/pWzlUy1tY207yuJz3Xdhm1hg="; + sha256 = "sha256-lWFv8eiA3QHp5bhcg4qon/dvKUbFbtH1Q2oXGkk0Me0="; }; nativeBuildInputs = [ - rustc cargo - setuptools-rust + rustc rustPlatform.cargoSetupHook + setuptools-rust ]; + propagatedBuildInputs = [ cffi glean-parser + iso8601 ]; - pythonImportsCheck = [ "glean" ]; + checkInputs = [ + pytest-localserver + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace glean-core/python/setup.py \ + --replace "glean_parser==5.0.1" "glean_parser>=5.0.1" + ''; + + pythonImportsCheck = [ + "glean" + ]; meta = with lib; { - description = "Modern cross-platform telemetry client libraries and are a part of the Glean project"; + description = "Telemetry client libraries and are a part of the Glean project"; homepage = "https://mozilla.github.io/glean/book/index.html"; license = licenses.mpl20; - maintainers = [ maintainers.kvark ]; + maintainers = with maintainers; [ kvark ]; }; } diff --git a/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch b/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch deleted file mode 100644 index f9a7b2723eba..000000000000 --- a/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/glean-core/python/glean/_process_dispatcher.py b/glean-core/python/glean/_process_dispatcher.py -index 33a8b12796..a39b54a917 100644 ---- a/glean-core/python/glean/_process_dispatcher.py -+++ b/glean-core/python/glean/_process_dispatcher.py -@@ -120,8 +120,14 @@ def dispatch(cls, func, args) -> Union[_SyncWorkWrapper, subprocess.Popen]: - Path(".coveragerc").absolute() - ) - -+ # Explicitly pass the contents of `sys.path` as `PYTHONPATH` to the -+ # subprocess so that there aren't any module search path -+ # differences. -+ python_path = ":".join(sys.path)[1:] -+ - p = subprocess.Popen( -- [sys.executable, _process_dispatcher_helper.__file__, payload] -+ [sys.executable, _process_dispatcher_helper.__file__, payload], -+ env={"PYTHONPATH": python_path}, - ) - - cls._last_process = p diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index ab42e8fffbfb..e9587d0b765c 100644 --- a/pkgs/development/python-modules/glfw/default.nix +++ b/pkgs/development/python-modules/glfw/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "v${version}"; - sha256 = "15kk0zhhja0yqah09wzpg6912zd5bjmk84ab1n5nwryicpg44hqk"; + sha256 = "sha256-XR6TqIrbCR93Qe9cRMgJ0aT/6ZZFj+6Mz+9GhiMD8lM="; }; # Patch path to GLFW shared object diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index d251ec75ff59..6895db19abc1 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -1,42 +1,60 @@ { lib , buildPythonPackage +, cryptography , fetchFromGitHub -, requests +, mypy , pyjwt , pytestCheckHook +, pythonOlder +, requests , responses +, typing-extensions }: buildPythonPackage rec { pname = "globus-sdk"; - version = "2.0.1"; + version = "3.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "globus"; repo = "globus-sdk-python"; rev = version; - sha256 = "1kqnr50iwcq9nx40lblbqzf327cdcbkrir6vh70067hk33rq0gm9"; + hash = "sha256-SBLQ+uSZE8YkT+fQWIKGlfhocJXX5k9kSejAbjazjM8="; }; propagatedBuildInputs = [ + cryptography requests pyjwt + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ]; checkInputs = [ + mypy pytestCheckHook responses ]; postPatch = '' substituteInPlace setup.py \ - --replace "pyjwt[crypto]>=1.5.3,<2.0.0" "pyjwt[crypto] >=1.5.3, <3.0.0" + --replace "pyjwt[crypto]>=2.0.0,<3.0.0" "pyjwt[crypto]>=2.0.0,<3.0.0" ''; - pythonImportsCheck = [ "globus_sdk" ]; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + + pythonImportsCheck = [ + "globus_sdk" + ]; meta = with lib; { - description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API"; + description = "Interface to Globus REST APIs, including the Transfer API and the Globus Auth API"; homepage = "https://github.com/globus/globus-sdk-python"; license = licenses.asl20; maintainers = with maintainers; [ ixxie ]; diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 0fb91f75ddaa..27c70c78a66e 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.15"; + version = "0.2.16"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "v${version}"; - sha256 = "0di4w3sgl86hjj8yvhx430w6b2fkdzxyjb1147k7py4lqpw7snjj"; + sha256 = "sha256-qW1wD6QVLqGhEnpGqNjZ50jb/3HHooohfHz+p4/ZH74="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index d6dedff38e7b..468b2476de9b 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.4.0"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uoeHt8YWMs0DQPCV4cA2vvlCayWU8Qr7KQujEa6Msss="; + sha256 = "sha256-8zhjpnCWUXA7ixi2cJNRSDjHnysE0CqlASAwefJLgBg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index e5bbbc8cbcde..772f45411d39 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.32.0"; + version = "2.35.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "619fe50155e73342c17aba4bbb2a08be8ce6ae00b795af383de7d6616b485c94"; + sha256 = "038b12979ea86ef0e33962bd33f955c337bc28f0471522bd27a801d52bfb4ae2"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 1d23af5a3d46..6ee0cb065401 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.4.6"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qQoHL2mT8sMnBnv2UnAEY4TNpajssguU6ppofx8jOno="; + sha256 = "sha256-MFlrgk/GgI/ayi8EjkmYzED7SzWZ6upm0o3HCFs2xbg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index b51a5569a595..9eddb0eca981 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -18,13 +18,18 @@ buildPythonPackage rec { pname = "google-auth"; - version = "2.3.3"; + version = "2.6.2"; src = fetchPypi { inherit pname version; - sha256 = "d83570a664c10b97a1dc6f8df87e5fdfff012f48f62be131e449c20dfc32630e"; + sha256 = "sha256-YNRJ+BQsdC23YPTAvjkSG8jZvoVVVdeEwlLerKHO0/U="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "cachetools>=2.0.0,<5.0" "cachetools" + ''; + propagatedBuildInputs = [ cachetools pyasn1-modules @@ -54,6 +59,15 @@ buildPythonPackage rec { "test_request_headers" "test_request_error" "test_request_basic" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # E MemoryError: Cannot allocate write+execute memory for ffi.callback(). + # You might be running on a system that prevents this. + # For more information, see https://cffi.readthedocs.io/en/latest/using.html#callbacks + "test_configure_mtls_channel_with_callback" + "test_configure_mtls_channel_with_metadata" + "TestDecryptPrivateKey" + "TestMakeMutualTlsHttp" + "TestMutualTlsAdapter" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 05963856edce..5861c66ca58d 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.9"; + version = "0.1.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "249a1c1a858bb182b73749784457baacfcab8e7c13da5f3421109d5b8dace5b8"; + sha256 = "sha256-/qQxNUVAHKZ5Go4GYpJ9ATi/EeseJPMyK5HsQCjtL0o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 67296f667ab2..c6f17c8d8b00 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -7,15 +7,19 @@ , proto-plus , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.1.0"; + version = "1.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "91fe9b0833f6e1a46293dcc0e483716372c9ff4a95ebe51276c5f0092cb9defd"; + hash = "sha256-NhRQ7X17/Y79DvJT4haArrb23zzwV+XoJT9YUfjLvKc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 4e25662b5796..d28cdbf08443 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.7.1"; + version = "3.8.1"; src = fetchPypi { inherit pname version; - sha256 = "848b3028d87358666c50b36253404c15d0a83686700c4586475997b1478d71d5"; + sha256 = "sha256-DvbHQV71hTsWtjN/D1+bHGLSss+UidCZRi3J0zTa07U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 6cb405d3c146..be13251d2f4b 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -10,15 +10,19 @@ , proto-plus , pytest-asyncio , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.6.0"; + version = "2.7.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "bcd3b2913c2eb83e356a457ad6e89a2a9505b2e9cb7be37055d6ce1f0fef20cf"; + hash = "sha256-CUsLMX0zRONChgzejZnBztth5ORMZyb6rj6mok2pMMU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index a06bf326e0c6..2717af605ef3 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -8,19 +8,33 @@ , pytest-asyncio , pytz , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.5.0"; + version = "3.6.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; - sha256 = "6e93c134669bbb7b79be4bd73329842c5e5f071f1fde624fc82233da42677021"; + hash = "sha256-hR5qHucBpq1LS9pIZeovcPMiVbw3dhSeeJxkYH8xuMk="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + pytz + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.bigquery_datatransfer" diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 32988e35deac..c26d7582c23d 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "3cdbf4f82199d2ee0d07fa2c75527661fe034130e27e5c05fd070ed615cd7e23"; + sha256 = "sha256-i8Bh39MnQRQtE4WwDNhHdxFX2bGL6txT+sV8RcvXiZw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 96a10e1a2221..86ac3048e0ab 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.32.0"; + version = "2.34.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-84Y6xCk/CkWF5ERh2CuR+SOXIe8z/JV11AG02n3BJ70="; + sha256 = "sha256-DriC3zCgD1oe89M5ojpnAjCACyqySUWVkafmharWcU8="; }; propagatedBuildInputs = [ @@ -70,6 +70,9 @@ buildPythonPackage rec { "test_parameterized_types_round_trip" "test_structs" "test_table_snapshots" + "test__initiate_resumable_upload" + "test__initiate_resumable_upload_mtls" + "test__initiate_resumable_upload_with_retry" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 747fdd07b041..9763cd4e0ba3 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -8,15 +8,19 @@ , mock , proto-plus , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.4.0"; + version = "2.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "b8472c91b05159f20121fcca6ebdc2a3b5648d68158ec747860914279b6b983b"; + hash = "sha256-TUMgrv1JNt8h6DzCNtk0Fm4LQFC73/FNfpgTs9jhkYs="; }; propagatedBuildInputs = [ @@ -51,6 +55,6 @@ buildPythonPackage rec { description = "Google Cloud Bigtable API client library"; homepage = "https://github.com/googleapis/python-bigtable"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 7eb9808c7a2d..ae3c6a8be74a 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -8,20 +8,33 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.10.1"; + version = "2.10.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "939970cd09384dde6d6f6758b03648fd8f52fe5c2f83f73300575f7e4e3b2ee0"; + hash = "sha256-I3oYldj915GBCX5VLEZRqGS7jMHWasQGVIvj50EUTK4="; }; - propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + grpc-google-iam-v1 + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 84937102ac32..e59e6a5cb5f7 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "2.2.2"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fRm/iGi0ENC99aA0aKPz8tsjPA7oagI/TswreksV9zY="; + sha256 = "sha256-idL3GJvG3HTeEo1CPqUsyHGfCl28zZyoBDP2UEogJVw="; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index bf9e8552aec1..c3e748810ee3 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -1,19 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, libcst, google-api-core, grpc-google-iam-v1, proto-plus, pytest-asyncio, pytestCheckHook, mock }: +{ lib +, buildPythonPackage +, fetchPypi +, libcst +, google-api-core +, grpc-google-iam-v1 +, proto-plus +, pytest-asyncio +, pytestCheckHook +, mock +, pythonOlder +}: buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.6.2"; + version = "3.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9oixM+4HxHn0G3j8Hpg1iB5gM+7xyD5GBbWpEzzjdrE="; + hash = "sha256-99hJvY195iUjXOZEOwFQftDkfgtD5V8hSg5ZLWKyWZU="; }; - propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ]; + propagatedBuildInputs = [ + libcst + google-api-core + grpc-google-iam-v1 + proto-plus + ]; - checkInputs = [ pytest-asyncio pytestCheckHook mock ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + mock + ]; - pythonImportsCheck = [ "google.cloud.datacatalog" ]; + pythonImportsCheck = [ + "google.cloud.datacatalog" + ]; meta = with lib; { description = "Google Cloud Data Catalog API API client library"; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 3badd796121e..d8451ec097cc 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "3.2.0"; + version = "4.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c3b60ea9059070e6d0d5c3bd3a705b5c7216a54e6a586149f9caa9158d099c3f"; + sha256 = "sha256-IAnsz7UxMf3GqaPYPltis0WWPM+IIWwpK1iTSV7Kl5c="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 0ea9c3e5e33f..d2afea058d0c 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.4.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "4a6f04112f2685a0a5cd8c7cb7946572bb7e0f6ca7cbe0088514006fca8594ca"; + sha256 = "sha256-1fpWovsg60uyAGps9QKXTdqV4WqZOOyeDFxX8YfgAMc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index a3418e3a9029..1961789e3b58 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -9,20 +9,34 @@ , pytest-asyncio , pytz , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.5.0"; + version = "3.6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3a757a3fafab46f28ffd2465ae06c5f87071aee1b41aee13f44255074483d480"; + hash = "sha256-MMTeoyC30MW9NdrXLAqelIeeIdsdNi7u5zwVhLeeTyk="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + pytz + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index c8edb677c64b..9c5af01714c5 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.4.1"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "4a72a65586178daaacf6bbc4b718db0765b99a719fce88a95c2be4f82689b7c1"; + sha256 = "sha256-7gFpvFxtYneABxW2mOwW1V2E7kobmj0yzV0pxaRhs8c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 50a08e66f360..bc22afe4614b 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.3.4"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cU4bwfxRAp14qmSTO+8u/APa7clWXqeeyRuEOwUgFuw="; + sha256 = "sha256-9+esejwSitfYEkD03KsPiTIKxmYhRxTrgfy3QKqIIO4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 47ca59ab2a21..017634fd5273 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -7,15 +7,19 @@ , proto-plus , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.0.0"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4ac688593279c48d7863f0a90457202ff9b235e3ee8862498e8a5b8f867cc137"; + hash = "sha256-ZmoBaY0OM2pQcqasGCJQIeN6Rmbo4xlYK7LtH7SecgY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 3a4402beed69..26c89af2addb 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.5.1"; + version = "2.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b26294d02b14b40586eceb099a0e3a74265ae10a3f46fd49890cac55ad5f861f"; + sha256 = "sha256-c1XPE5PBDXRgpiKGBfAhHB6yTPyvby3aZ5nF40+qFiQ="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 507ba6aef18c..24afcea7a73d 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.3.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "cb31a864be75c47880748b6c81f0c57cbce190a87e402ce32b2b772be2dba5fa"; + sha256 = "sha256-AjGoEAAI8aTACtcZp7zT5n9y6WCMc4GOfgUusUVXAVk="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 8f64e9950e0e..6317d621a0b9 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.10.1"; + version = "2.11.1"; src = fetchPypi { inherit pname version; - sha256 = "6a1cedc549ee0886d8603f519cc8631de3112be6f84c0bbbaedab4ee3f9b58fc"; + sha256 = "sha256-n0alfJIsaqhQ4Wr4/d2JRXTCE24JTrRJBsYOnRhpV00="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index b817c50ad5a5..c4caa9474e40 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.3.2"; + version = "2.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "90af7858911f52350191575bb729305114c3c80d1f585d0f6cea39ab1ab3e409"; + sha256 = "sha256-BhQQ4QZ7GbacjpLLg5LXm1g5IhIMk3tJdDrHZLquuTk="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.language" diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 467fe9542474..dc60abddb6df 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "2.7.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "5a4ad2832be3b86c8f0fb57b2d382a1f67218137c6f6051372647ac5147d6421"; + sha256 = "sha256-RS42Hh3Lwo8iCMCAXBp8usAwdkVWcD2XZW0FIYuTNwg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 4872f7ac448a..32572b0115e6 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -9,20 +9,34 @@ , pytestCheckHook , pytest-asyncio , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.8.0"; + version = "2.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "2a25f7535f21cdeabfccb07fe4a75eae5a47bb36b82025537755b37d3376da46"; + hash = "sha256-FoB6SGDrVDHG60WeWmGwfVbSwt6xdq9da2QwSikpIlU="; }; - propagatedBuildInputs = [ libcst google-api-core proto-plus ]; + propagatedBuildInputs = [ + libcst + google-api-core + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pandas pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pandas + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 5bada28d01dc..2e698db4aef2 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.2.1"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "cdb2d6878c426ed34af8950b052845a76b0f5fab3f96a2ec5dc80be994ca5cf8"; + sha256 = "sha256-r9qz2/HjDYHXu9jY03rt0QC1BofzQ/HrKVjGCtvXzsU="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 3ce5f92fe7b8..6f6223f1be98 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.9.0"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "872774c4791b15d59d866fd965c780beac2772f335ded4a0047e2d844d988f30"; + sha256 = "sha256-i4STXwnFyfXauRx4zvYMO1uWMechvNUOxolOcY3Z5us="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 67a8daf6f997..5f9fdb2833d2 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.9.0"; + version = "2.11.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "2b3d9336afab0e5df67201234976519a28da3ccb7c9a0e463be28e2827a9fdaa"; + sha256 = "sha256-btPJ2X+I0f8C3YDB9bZwPv7HWnqsq9koWsT+CyK1AgM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index aa49340f24a3..ab432454bbaf 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.5.1"; + version = "2.8.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ad81fed19af6af68426e76891e4acc8a021a8bc475e2ce4be51bf28a610a9713"; + hash = "sha256-7L3SjViQmzTp//5LWWG9VG+TQuPay70KZdUuzhy7HS0="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.redis" diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 98c9f3163202..da5d110225e8 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -7,20 +7,32 @@ , grpc-google-iam-v1 , proto-plus , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.3.3"; + version = "1.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b13e0a614b4865287a4b5fc43f4810d3d48fef7e24d9bcf54cb4bd93bfbb2bf2"; + hash = "sha256-NUqFkvIwfaqz3MZEUoLqO7hFCVwV5124+lA8LGzccl0="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + grpc-google-iam-v1 + proto-plus + ]; - checkInputs = [ mock pytestCheckHook ]; + checkInputs = [ + mock + pytestCheckHook + ]; # prevent google directory from shadowing google imports preCheck = '' diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index b66091c15b29..f7c79521b632 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.8.0"; + version = "2.9.2"; src = fetchPypi { inherit pname version; - sha256 = "e8a3fb7c2a1595f59923661c568667d1ba40fcaaa4dd55fe8b1f5e54871e9460"; + sha256 = "sha256-W93SDJR8bUPQX9KzoZ6YvV9kU+Twd9huH09Smap481g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index e982aefae5a9..056c57ecd541 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -8,20 +8,33 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.8.0"; + version = "1.10.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c77a765415d5e5465a3d74fefee9ce8f9a914ff228f1b10dda70841400ce1320"; + hash = "sha256-VaU6DRkq1pOESSOSynRRjaljp68C1X2H8anjHeHorbI="; }; - propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + grpc-google-iam-v1 + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.securitycenter" diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 62bba685417d..d78766907191 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.12.1"; + version = "3.13.0"; src = fetchPypi { inherit pname version; - sha256 = "98e53298a7c79f0af351c80e6fc0b57bc735afdec764424e459179ef04f5a40f"; + sha256 = "sha256-Y+MA7Nlx3+8eaBptI6eZgSPGc4MvxSrA9YA+K+VSblw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 5f2737912e2c..72e9f672047a 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -7,25 +7,39 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.12.0"; + version = "2.13.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "acbf9948ce3870c72b45089356985de9df3cd881830d1127a10cb80ada9786c7"; + hash = "sha256-JxhIC4OMsXjdJYNDomEhmHPUCzveFS0oeDWsX/wd5zA="; }; - propagatedBuildInputs = [ libcst google-api-core proto-plus ]; + propagatedBuildInputs = [ + libcst + google-api-core + proto-plus + setuptools + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; - pytestFlagsArray = [ - # requrire credentials - "--ignore=tests/system/gapic/v1/test_system_speech_v1.py" - "--ignore=tests/system/gapic/v1p1beta1/test_system_speech_v1p1beta1.py" + disabledTestPaths = [ + # Requrire credentials + "tests/system/gapic/v1/test_system_speech_v1.py" + "tests/system/gapic/v1p1beta1/test_system_speech_v1p1beta1.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index a90f9c73cc13..629c323506b1 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -9,15 +9,19 @@ , google-cloud-testutils , google-resumable-media , mock +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.1.0"; + version = "2.2.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0a5e7ab1a38d2c24be8e566e50b8b0daa8af8fd49d4ab312b1fda5c147429893"; + hash = "sha256-AkT0YScQy17ERfxndDh1ZOI/mCM2P7QIsock4hAkAbc="; }; propagatedBuildInputs = [ @@ -40,6 +44,7 @@ buildPythonPackage rec { "download" "get" "post" + "upload" "test_build_api_url" "test_ctor_mtls" "test_hmac_key_crud" diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index c1b58c0e1c26..881f00ead548 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.7.2"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-h/lmrrT8fu1YLDYF6s856EAB8+k7CMFfIMGZPDxC7Ys="; + sha256 = "sha256-VfRDZRgwq1pOwjzmq6mdbVqcT6wQdD6qOMivQn4Ua10="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 05ac66c0875f..a7c49f0cabe9 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.9.1"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "0a76bed3cf48cf72d4aa50329d5da2bbc008c5c7dd57326854fc038536e107f1"; + sha256 = "sha256-UJSP3a9G6k1arMpoh4/rWrnR4gYtPW6d6LGwWuk5WGg="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 4032de9d7c45..bb9eb5f477ac 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.5.1"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "fd4cb8a9efa20598c35a4e6f7ac013a04868e37d7d4ff4ec3080f528b06f8a0e"; + sha256 = "sha256-JkKW9vJAAkw3sHYDapRvu5jjunV8oWSg/ykDmd1wpyA="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 956f27e2e525..c36bd09ba7ca 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -9,15 +9,19 @@ , mock , proto-plus , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.6.1"; + version = "3.7.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "38772cc60ef4315d25a7dbeef5ddab9e75674722cb4500bc69b295e5d0af6a97"; + hash = "sha256-icZG33G/noii9V0rsHTG/Qe8cKDVDfASRKy2XRYM5Yg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index db6027f3a1ff..58368693523c 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.5.1"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "7b735f623d6c3c80d1d40fa491bfe1776a5369d7b240dddab522fd0076d97b1d"; + sha256 = "sha256-p1HXFxURs0axONrqHahl/SPvWN2mhAhvJePFOwzRR4c="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index c67f910321a4..b73baab08108 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.6.3"; + version = "2.7.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "54b7f63c746ab95a504bd6b9b1d806192483976a3452a1a59a7faa0eaaa03491"; + hash = "sha256-4NTWyf3rndw1zHINlBMtoEmdfSXGnU/jEhxab807Vg4="; }; - propagatedBuildInputs = [ libcst google-api-core proto-plus]; + propagatedBuildInputs = [ + libcst + google-api-core + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "google.cloud.vision" diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 521d6c49f15c..2ea8de6f139f 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.6.1"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "392a21dd238958eb7f480d056ed24110be22808cf4474939db40df0ade2910f3"; + sha256 = "sha256-yK4xEu9rfFkA6RDNDjul0V+Xjc8TehJ6f8lv1k2WULc="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 02a0f6f08d93..acf2e734f8c3 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -8,6 +8,7 @@ , google-auth-oauthlib , google-cloud-pubsub , pytest-aiohttp +, pytest-asyncio , pytestCheckHook , pythonOlder , requests_oauthlib @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "1.5.1"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = version; - sha256 = "sha256-8Y3ixkDl/AmXQMOY+29og5njMh9M2qjwWBGCsiqX5PU="; + sha256 = "sha256-oaUR/2G8dcQ5A4YZeLTSzyMNLI8a29pSoEtTdWvTVKE="; }; propagatedBuildInputs = [ @@ -39,20 +40,21 @@ buildPythonPackage rec { asynctest coreutils pytest-aiohttp + pytest-asyncio pytestCheckHook ]; - postPatch = '' - substituteInPlace tests/event_media_test.py \ - --replace "/bin/echo" "${coreutils}/bin/echo" - ''; - pythonImportsCheck = [ "google_nest_sdm" ]; + disabledTests = [ + "test_clip_preview_transcode" + "test_event_manager_event_expiration_with_transcode" + ]; + meta = with lib; { - description = "Python module for Google Nest Device Access using the Smart Device Management API"; + description = "Module for Google Nest Device Access using the Smart Device Management API"; homepage = "https://github.com/allenporter/python-google-nest-sdm"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/google-re2/default.nix b/pkgs/development/python-modules/google-re2/default.nix index f61599d827cd..b04459bfa141 100644 --- a/pkgs/development/python-modules/google-re2/default.nix +++ b/pkgs/development/python-modules/google-re2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "google-re2"; - version = "0.2.20211101"; + version = "0.2.20220201"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "305dc0f749c1abad51f8dc59b49b98a58dc06b976727f6b711c87c01944046d9"; + sha256 = "sha256-H8eMC1dM+9ukuRIN4uWWs7oRuQ0tpGaCwaCl0tp+lE8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 0b10fbab29b5..6aca35ae9e0b 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.1.0"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "725b989e0dd387ef2703d1cc8e86217474217f4549593c477fd94f4024a0f911"; + sha256 = "sha256-BpJOix558VjwIC590VGtdbDqnVm5l8hQ9WvdSlo2FRM="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 55380e3081a7..66a3fe507858 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.54.0"; + version = "1.56.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pAMdbsbCsbbcPgvn4Qob1y+wsYsH75vntR8sEATOJDc="; + sha256 = "sha256-QAdQB5W8/CadJ58PfSU64Y1twf9dWnNhP/5FIDix7F8="; }; propagatedBuildInputs = [ grpc protobuf ]; diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix index 58b50f5f84f8..f00a694dfcf4 100644 --- a/pkgs/development/python-modules/googlemaps/default.nix +++ b/pkgs/development/python-modules/googlemaps/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "googlemaps"; - version = "4.5.3"; + version = "4.6.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "googlemaps"; repo = "google-maps-services-python"; rev = "v${version}"; - sha256 = "1yfsfspvjngrb1lwaq04ahm94j9y2dwzdf4dsg3yl1c8w0vgf9yw"; + sha256 = "sha256-pzCM1uZupqJgoogwacuuy1P8I9LF65w7ZS6vY10VgeU="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix index f6fc6db7f387..6b9125db64e6 100644 --- a/pkgs/development/python-modules/gphoto2/default.nix +++ b/pkgs/development/python-modules/gphoto2/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "gphoto2"; - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "3b1b52ec3004ad6a6927a015b0572878a0a56314caaf1e62b07550e7a2e09465"; + sha256 = "sha256-bhHGvUGzXrk7snMzv+R0fd/gnZTFJ3xfse5i2Krpl3I="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/gql/default.nix b/pkgs/development/python-modules/gql/default.nix index 65e4bbde319b..679d0fbdb7cb 100644 --- a/pkgs/development/python-modules/gql/default.nix +++ b/pkgs/development/python-modules/gql/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "gql"; - version = "3.0.0rc0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "v${version}"; - hash = "sha256-yr1DyMj/0C9XPTyGdbQbn7nMRKr4JwItFDsqvl/goqU="; + hash = "sha256-ZtrT+zeoP9KXdaCDKOUrjEwe7dN0+IwA20FDe5ja7l8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grapheme/default.nix b/pkgs/development/python-modules/grapheme/default.nix new file mode 100644 index 000000000000..965b1a1d2197 --- /dev/null +++ b/pkgs/development/python-modules/grapheme/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "grapheme"; + version = "0.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jiwc3w05c8kh22s3zk7a8km8na3plqc5zimb2qcyxxy3grbkhj4"; + }; + + # Tests are no available on PyPI + # https://github.com/alvinlindstam/grapheme/issues/18 + doCheck = false; + + pythonImportsCheck = [ + "grapheme" + ]; + + meta = with lib; { + description = "Python package for grapheme aware string handling"; + homepage = "https://github.com/alvinlindstam/grapheme"; + license = licenses.mit; + maintainers = with maintainers; [ creator54 ]; + }; +} diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index 7a28bc08cda4..e975bff8fee4 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -1,14 +1,16 @@ { lib +, aniso8601 , buildPythonPackage , fetchFromGitHub -, aniso8601 , graphql-core , graphql-relay , promise -, pytestCheckHook , pytest-asyncio , pytest-benchmark , pytest-mock +, pytestCheckHook +, pythonAtLeast +, pythonOlder , pytz , snapshottest }: @@ -16,6 +18,9 @@ buildPythonPackage rec { pname = "graphene"; version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "graphql-python"; @@ -40,15 +45,22 @@ buildPythonPackage rec { snapshottest ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlagsArray = [ + "--benchmark-disable" + ]; disabledTests = [ # Expects different Exeception classes, but receives none of them # https://github.com/graphql-python/graphene/issues/1346 "test_unexpected_error" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + "test_objecttype_as_container_extra_args" + "test_objecttype_as_container_invalid_kwargs" ]; - pythonImportsCheck = [ "graphene" ]; + pythonImportsCheck = [ + "graphene" + ]; meta = with lib; { description = "GraphQL Framework for Python"; diff --git a/pkgs/development/python-modules/graphql-core/default.nix b/pkgs/development/python-modules/graphql-core/default.nix index 6a33cfd7b352..75583cdbfe39 100644 --- a/pkgs/development/python-modules/graphql-core/default.nix +++ b/pkgs/development/python-modules/graphql-core/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.1.7"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "1mwwh55qd5bcpvgy6pyliwn8jkmj4yk4d2pqb6mdkgqhdic2081l"; + sha256 = "sha256-71Z+5nVvg+aozJAKmBGJg5Gqq1OIVH7Xv33Q82IHhXg="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/graphql-subscription-manager/default.nix b/pkgs/development/python-modules/graphql-subscription-manager/default.nix index 6ae0dce79cee..2ca6a134ee27 100644 --- a/pkgs/development/python-modules/graphql-subscription-manager/default.nix +++ b/pkgs/development/python-modules/graphql-subscription-manager/default.nix @@ -8,7 +8,8 @@ buildPythonPackage rec { pname = "graphql-subscription-manager"; - version = "0.4.3"; + version = "0.5.5"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "PyGraphqlWebsocketManager"; rev = version; - sha256 = "sha256-+LP+MDeHo0svoN/o0in6xtIqrfxs+UCBQRtBe4lZt+4="; + hash = "sha256-7MqFsttMNnWmmWKj1zaOORBTDGt6Wm8GU7w56DfPl2c="; }; propagatedBuildInputs = [ @@ -27,7 +28,9 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - pythonImportsCheck = [ "graphql_subscription_manager" ]; + pythonImportsCheck = [ + "graphql_subscription_manager" + ]; meta = with lib; { description = "Python3 library for graphql subscription manager"; diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 5a17b4679e10..531ead0f1945 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.0.2"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = "v${version}"; - hash = "sha256-Y8IgqrU8zzV020qwyyb57Tp2j7laQ3JsCOCYBuf8vsQ="; + hash = "sha256-KVrm99aP2Nq15pDa8zaYIvTTcl6JEYU+7IkcMayHRQw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gridnet/default.nix b/pkgs/development/python-modules/gridnet/default.nix new file mode 100644 index 000000000000..1288471c6b29 --- /dev/null +++ b/pkgs/development/python-modules/gridnet/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiohttp +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gridnet"; + version = "4.0.0"; + + disabled = pythonOlder "3.9"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "klaasnicolaas"; + repo = "python-gridnet"; + rev = "v${version}"; + hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "gridnet" ]; + + meta = with lib; { + description = "Asynchronous Python client for NET2GRID devices"; + homepage = "https://github.com/klaasnicolaas/python-gridnet"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index 18d6cd4dabb1..6347d9f55b8e 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "growattserver"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "indykoning"; repo = "PyPi_GrowattServer"; rev = version; - sha256 = "sha256-Vooy+czqhrsWVw35zJb5paC5G0WwOlI5hF8PXxJG0cY="; + sha256 = "0v9clmz4qg6krmbsbfsrhsan824y2mqvwxsxb0fzfgaszxwkpm30"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gruut-ipa/default.nix b/pkgs/development/python-modules/gruut-ipa/default.nix index ad1da8b2917a..f0824670731d 100644 --- a/pkgs/development/python-modules/gruut-ipa/default.nix +++ b/pkgs/development/python-modules/gruut-ipa/default.nix @@ -1,32 +1,33 @@ { lib , buildPythonPackage , fetchFromGitHub -, pkgs +, espeak +, numpy , python }: buildPythonPackage rec { pname = "gruut-ipa"; - version = "0.12.0"; + version = "0.13.0"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6pMdBKbp++/5321rc8A2euOSXZCHzHg+wmaEaMZ0egw="; + sha256 = "sha256-Q2UKELoG8OaAPxIrZNCpXgeWZ2fCzb3g3SOVzCm/gg0="; }; postPatch = '' - patchShebangs bin/speak-ipa + patchShebangs bin/* substituteInPlace bin/speak-ipa \ --replace '${"\${src_dir}:"}' "$out/lib/${python.libPrefix}/site-packages:" \ - --replace "do espeak" "do ${pkgs.espeak}/bin/espeak" + --replace "do espeak" "do ${espeak}/bin/espeak" ''; - postInstall = '' - install -m0755 bin/speak-ipa $out/bin/speak-ipa - ''; + propagatedBuildInputs = [ + numpy + ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/gruut/default.nix b/pkgs/development/python-modules/gruut/default.nix index 4718d8244d0c..5078c6fdb390 100644 --- a/pkgs/development/python-modules/gruut/default.nix +++ b/pkgs/development/python-modules/gruut/default.nix @@ -18,12 +18,15 @@ let langPkgs = [ + "ar" "cs" "de" - "es" "en" + "es" + "fa" "fr" "it" + "lb" "nl" "pt" "ru" @@ -33,21 +36,21 @@ let in buildPythonPackage rec { pname = "gruut"; - version = "2.2.0"; + version = "2.2.3"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9vj3x2IjTso8ksN1cqe5frwg0Y3GhOB6bPWvaBSBOf8="; + sha256 = "sha256-B5fPUW4YaMzDDXxncfrWwxGdUizuaxnPImNMf1ZZJ/I="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace "Babel~=2.8.0" "Babel" \ --replace "dateparser~=1.0.0" "dateparser" \ - --replace "gruut_lang_en~=2.0.0" "gruut_lang_en" + --replace "gruut_lang_en~=2.0.0" "gruut_lang_en" \ + --replace "jsonlines~=1.2.0" "jsonlines" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 741882bdbd3d..ec3b134f16b8 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "5.1.1"; + version = "5.3.0"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "d9db8c43d552f541ea072d4727d1e955bc2368b095dd86c5429a845c9d8aed8f"; + sha256 = "sha256-viIg4ZcjVw7ZjouOtqW24Er6DwjsHwi4niF8NUSIoEc="; }; propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ]; diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 330172f56cee..d500c6453213 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { echo $'\ndel TestBaseUtilities.test_add_cred_impersonate_name' >> gssapi/tests/test_raw.py export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python.interpreter} setup.py nosetests -e 'ext_test_\d.*' + nosetests -e 'ext_test_\d.*' ''; pythonImportsCheck = [ "gssapi" ]; diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index a391d993cf0c..c02e3b593b82 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.18.4"; + version = "1.20.0"; format = "other"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; - sha256 = "13h9qzfz8s1gyj2ar9q2gf5346sgdv6jv8hj7aw0hpl2gs5f0s6b"; + sha256 = "j2e9xWBrozYGxryJbonefc2M9PykWfcTibG2/gdbXlQ="; }; # Python 2.x is not supported. diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 5bcfb64a184d..1616343f8b43 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "gym"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "openai"; repo = pname; - rev = version; - sha256 = "sha256-0O/s9OVNGQmeX9j8B1x63RxdI6dhqfTEJcgDH2jtCv4="; + rev = "v${version}"; + sha256 = "12b545xz0r2g4z5r7f8amxl7nm0lqymkzwcwhg1bni9h0sxwpv6c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/h2/default.nix b/pkgs/development/python-modules/h2/default.nix index fcd283621493..97ccb7b91206 100644 --- a/pkgs/development/python-modules/h2/default.nix +++ b/pkgs/development/python-modules/h2/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch , hpack , hyperframe , pytestCheckHook @@ -11,24 +10,16 @@ buildPythonPackage rec { pname = "h2"; - version = "4.0.0"; + version = "4.1.0"; format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d"; + sha256 = "sha256-qDrKCPvnqst5/seIycC6yTY0NWDtnsGLgqE6EsKNKrs="; }; - patches = [ - # Workaround issues with hypothesis 6.6 - # https://github.com/python-hyper/h2/pull/1248 - (fetchpatch { - url = "https://github.com/python-hyper/h2/commit/0646279dab694a89562846c810202ce2c0b49be3.patch"; - sha256 = "1k0fsxwq9wbv15sc9ixls4qmxxghlzpflf3awm66ar9m2ikahiak"; - }) - ]; - propagatedBuildInputs = [ hpack hyperframe @@ -46,7 +37,8 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP/2 State-Machine based protocol implementation"; - homepage = "http://hyper.rtfd.org/"; + homepage = "https://github.com/python-hyper/h2"; license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 701b8f78f83b..36b1322a88b3 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -20,7 +20,8 @@ in buildPythonPackage rec { # avoid strict pinning of numpy postPatch = '' substituteInPlace setup.py \ - --replace "numpy ==" "numpy >=" + --replace "numpy ==" "numpy >=" \ + --replace "mpi4py ==" "mpi4py >=" ''; HDF5_DIR = "${hdf5}"; diff --git a/pkgs/development/python-modules/ha-av/default.nix b/pkgs/development/python-modules/ha-av/default.nix index af5f5f31ab61..78735b67d44d 100644 --- a/pkgs/development/python-modules/ha-av/default.nix +++ b/pkgs/development/python-modules/ha-av/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchPypi , pkg-config -, ffmpeg +, ffmpeg_4 }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; buildInputs = [ - ffmpeg + ffmpeg_4 ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index e24f2fc09691..0352ec41139d 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -1,29 +1,51 @@ -{ buildPythonPackage, lib, fetchFromGitHub -, requests, tqdm -, nose, vcrpy +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, tqdm +, nose +, vcrpy +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "habanero"; - version = "0.7.4"; + version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # Install from Pypi is failing because of a missing file (Changelog.rst) src = fetchFromGitHub { owner = "sckott"; repo = pname; rev = "v${version}"; - sha256 = "1d8yj9xz5qabcj57rpjzvg0jcscvzrpb0739mll29nijbsaimfr1"; + hash = "sha256-jxaO8nCR5jhXCPjhjVLKaGeQp9JF3ECQ1+j3TOJKawg="; }; - propagatedBuildInputs = [ requests tqdm ]; + propagatedBuildInputs = [ + requests + tqdm + ]; - checkInputs = [ nose vcrpy ]; - checkPhase = "make test"; + checkInputs = [ + pytestCheckHook + vcrpy + ]; - meta = { + pythonImportsCheck = [ + "habanero" + ]; + + # almost the entirety of the test suite makes network calls + pytestFlagsArray = [ + "test/test-filters.py" + ]; + + meta = with lib; { description = "Python interface to Library Genesis"; - homepage = "https://habanero.readthedocs.io/en/latest/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.nico202 ]; + homepage = "https://habanero.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ nico202 ]; }; } diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix index 44a7a2deb75b..ad7d4a9def73 100644 --- a/pkgs/development/python-modules/hacking/default.nix +++ b/pkgs/development/python-modules/hacking/default.nix @@ -20,6 +20,10 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ --replace "flake8<3.9.0,>=3.8.0" "flake8" + substituteInPlace hacking/checks/python23.py \ + --replace 'H236: class Foo(object):\n __metaclass__ = \' 'Okay: class Foo(object):\n __metaclass__ = \' + substituteInPlace hacking/checks/except_checks.py \ + --replace 'H201: except:' 'Okay: except:' ''; nativeBuildInputs = [ pbr ]; @@ -35,9 +39,7 @@ buildPythonPackage rec { ]; checkPhase = '' - stestr run -e <(echo " - hacking.tests.test_doctest.HackingTestCase.test_flake8 - ") + stestr run ''; pythonImportsCheck = [ "hacking" ]; diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 58f3224e70a2..7d1a3d8425fe 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "0.27.0"; + version = "1.0.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-RPUj0We1nsKgAl1DTpa3pCD7gMm590N00+xwOVFIOaw="; + sha256 = "sha256-WteSLhO/Ei+467tXT7Y1S6bYNNFUILbP5Pm4ZhBYaeg="; }; propagatedBuildInputs = [ @@ -38,6 +38,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # Starting with 0.30 the tests are broken, check with the next major release + doCheck = false; + pythonImportsCheck = [ "hahomematic" ]; diff --git a/pkgs/development/python-modules/halohome/default.nix b/pkgs/development/python-modules/halohome/default.nix index b87b59a46ec0..7d8dbe2efbb8 100644 --- a/pkgs/development/python-modules/halohome/default.nix +++ b/pkgs/development/python-modules/halohome/default.nix @@ -9,7 +9,8 @@ buildPythonPackage rec { pname = "halohome"; - version = "0.4.0"; + version = "0.5.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "nayaverdier"; repo = pname; rev = version; - sha256 = "W7cqBJmoBUT0VvXeNKxUK0FfAuprjfvFv6rgyL2gqYQ="; + sha256 = "sha256-xnUOObqVg1E7mTDKHZMoC95KI9ZIn0YpkQjoASa5Dds="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index d1228fc0c5f5..e7732e1f6a42 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.51.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-qN7AXs4hJpuP+GaxjOPR2CqKMYyDJxTrCuE5HreZnhU="; + sha256 = "sha256-UL7HPmii65p+WO22y0qv8zq3yICKarRORqE+FK1u7OE="; }; postPatch = '' @@ -41,6 +41,8 @@ buildPythonPackage rec { warrant ]; + doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; + checkInputs = [ asynctest pytest-aiohttp diff --git a/pkgs/development/python-modules/hdlparse/default.nix b/pkgs/development/python-modules/hdlparse/default.nix deleted file mode 100644 index 4257f9b2e9a2..000000000000 --- a/pkgs/development/python-modules/hdlparse/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "hdlparse"; - version = "1.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "fb6230ed1e7a04a8f82f8d3fb59791d0751ae35e5b8e58dbbf2cbcf100d0d0f2"; - }; - - #This module does not contain any tests. - doCheck = false; - - meta = with lib; { - homepage = "https://kevinpt.github.io/hdlparse/"; - description = "Rudimentary parser for VHDL and Verilog"; - license = licenses.mit; - maintainers = with maintainers; [ elliottvillars ]; - }; -} - diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index 39d970272b14..578a359778a6 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "heatzypy"; - version = "2.0.1"; + version = "2.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Cyr-ius"; repo = pname; rev = version; - sha256 = "sha256-PnDsgTfr2F/fgbONP2qvuPhbw3X50AqriEmsFFjll2Y="; + sha256 = "sha256-i5tGV9nJrLRqZwJZ3y5c65MHykz34bnr3yz+OdaQEoM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix index ef7e5b8755c0..71aad2650f36 100644 --- a/pkgs/development/python-modules/herepy/default.nix +++ b/pkgs/development/python-modules/herepy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "herepy"; - version = "3.5.6"; + version = "3.5.7"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "abdullahselek"; repo = "HerePy"; rev = version; - sha256 = "sha256-I5u5PKB29jQNFdsx+y5ZJOE837D7Hpcsf3pwlCvmEqU="; + hash = "sha256-iPFFEFGH3csqzDtBtLkVkUezObwiMHNbiD/mTgIrdpo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 27c2167ff1dd..9b1264e738b4 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.4.1"; + version = "10.5.0"; src = fetchPypi { inherit pname version; - sha256 = "b47d9a1e0af3d7b54edd646581ac3e3ab046a572368eeb22dfd89dff7f9964d2"; + sha256 = "sha256-p2zPUCc+KrsNxPChdW3ZgkOo+HJB7IcYtqh5Uh0Qnaw="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/hijri-converter/default.nix b/pkgs/development/python-modules/hijri-converter/default.nix index ba9511a078d5..450eee102372 100644 --- a/pkgs/development/python-modules/hijri-converter/default.nix +++ b/pkgs/development/python-modules/hijri-converter/default.nix @@ -2,20 +2,28 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "hijri-converter"; - version = "2.2.2"; + version = "2.2.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1KENsAnBQXWSu/s96+yt+gTY2NXVG2Spcelp12Gp8+E="; + sha256 = "sha256-5xSc7OzKZHv0Bonsib9ZPHJSsx1pnqWHrQvOkbpC04I="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "hijri_converter" ]; + pythonImportsCheck = [ + "hijri_converter" + ]; meta = with lib; { description = "Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar"; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index ecefce19aede..dd97b4700756 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.12"; + version = "0.13"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d99f2b6ddc5bfab7b7f8bbed457a82104f8980122a04b982bfc0e4f8820a1d46"; + sha256 = "sha256-xvfDq4ralIBnAtqTHZTTfNYbz6kstNOdNRtqnFIQZ1w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 89d86ee4eb43..18a5f0cd82aa 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.14.7"; + version = "1.14.8"; src = fetchPypi { inherit pname version; - sha256 = "8d8d171227e9c9eaadd4b037b3ddaa01055a33bacbdbeb57a5efbd273986665f"; + sha256 = "sha256-bDZVmaLLFnk7tifJtcVDCYK7WRyd6IhQAv+RtTm2ETM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/homeconnect/default.nix b/pkgs/development/python-modules/homeconnect/default.nix index 98aab26ffac8..b6fca4201ad7 100644 --- a/pkgs/development/python-modules/homeconnect/default.nix +++ b/pkgs/development/python-modules/homeconnect/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "homeconnect"; - version = "0.6.3"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0n4h4mi23zw3v6fbkz17fa6kkl5v9bfmj0p57jvfzcfww511y9mn"; + sha256 = "sha256-/h0dEVmP0R9tVt56mvu72Ksrvnuox1FA7BgrZMOhV6Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index 2a1cb8790386..71752fede539 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -5,7 +5,6 @@ , async-timeout , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytestCheckHook , pythonAtLeast , pythonOlder @@ -18,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,18 +26,9 @@ buildPythonPackage rec { owner = "coreGreenberet"; repo = "homematicip-rest-api"; rev = version; - sha256 = "008snxx9ijpi1zr1pi1v4a6g74j821hyw0khs9lmi08v2mcabm36"; + sha256 = "sha256-j2ansly05auevlcDY5TFz6PZR/pNIGIbtkJuU8L5b0o="; }; - patches = [ - (fetchpatch { - # Drop loop kwarg from async_timeout.timeout - # https://github.com/coreGreenberet/homematicip-rest-api/pull/424 - url = "https://github.com/coreGreenberet/homematicip-rest-api/commit/90efb335667e3d462b7f9ef113d2e0b8bb4e96b4.patch"; - sha256 = "0f2bbs0666mf6sc7p4n8fwh29yjilkq36qf5pn0waf6iqdzxqwih"; - }) - ]; - propagatedBuildInputs = [ aenum aiohttp diff --git a/pkgs/development/python-modules/html-sanitizer/default.nix b/pkgs/development/python-modules/html-sanitizer/default.nix index ef029586bebf..111d7e00d1b2 100644 --- a/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/pkgs/development/python-modules/html-sanitizer/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "html-sanitizer"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "matthiask"; repo = pname; rev = version; - sha256 = "sha256-ZPyGF7N+EZHfgqZfRQx4x1r83BMur+Zg2kdtVISn3I8="; + sha256 = "sha256-1JSdi1PFM+N+UuEPfgWkOZw8S2PZ4ntadU0wnVJNnjw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/httpagentparser/default.nix b/pkgs/development/python-modules/httpagentparser/default.nix index e0c9dd09bcba..44c521ff3304 100644 --- a/pkgs/development/python-modules/httpagentparser/default.nix +++ b/pkgs/development/python-modules/httpagentparser/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "httpagentparser"; - version = "1.9.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "73Y9MZk912GCWs7myLNL4yuVzxZ10cc8PNNfnlKDGyY="; + sha256 = "a190dfdc5e63b2f1c87729424b19cbc49263d6a1fb585a16ac1c9d9ce127a4bf"; }; # PyPi version does not include test directory diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index ace9a7041e3f..8359fcf0a096 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -1,33 +1,65 @@ { lib +, brotlipy , buildPythonPackage +, decorator , fetchPypi , flask , flask-limiter -, markupsafe -, decorator , itsdangerous +, markupsafe , raven , six -, brotlipy +, pytestCheckHook }: buildPythonPackage rec { pname = "httpbin"; version = "0.7.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1yldvf3585zcwj4vxvfm4yr9wwlz3pa2mx2pazqz8x8mr687gcyb"; + hash = "sha256-y7N3kMkVdfTxV1f0KtQdn3KesifV7b6J5OwXVIbbjfo="; }; - propagatedBuildInputs = [ brotlipy flask flask-limiter markupsafe decorator itsdangerous raven six ]; + propagatedBuildInputs = [ + brotlipy + flask + flask-limiter + markupsafe + decorator + itsdangerous + raven + six + ]; - # No tests - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "test_httpbin.py" + ]; + + disabledTests = [ + # Tests seems to be outdated + "test_anything" + "test_get" + "test_redirect_n_equals_to_1" + "test_redirect_n_higher_than_1" + "test_redirect_to_post" + "test_relative_redirect_n_equals_to_1" + "test_relative_redirect_n_higher_than_1" + ]; + + pythonImportsCheck = [ + "httpbin" + ]; meta = with lib; { + description = "HTTP Request and Response Service"; homepage = "https://github.com/kennethreitz/httpbin"; - description = "HTTP Request & Response Service"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 99eb08a35a9d..79d979b10a97 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.14.3"; + version = "0.14.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-jPsbMhY1lWKBXlh6hsX6DGKXi/g7VQSU00tF6H7qkOo="; + sha256 = "19zsg8ijw0s1722ka67mjxx5z07lx9jq36z97l1fa6z1129wq240"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 9a8a8853780a..cd2134418a75 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -55,6 +55,7 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.isDarwin) [ # fails with HTTP 408 Request Timeout, instead of expected 200 OK "test_timeout_subsequent" + "test_connection_close" ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/httpx-ntlm/default.nix b/pkgs/development/python-modules/httpx-ntlm/default.nix index b3ac17cf7f07..40ef250401bf 100644 --- a/pkgs/development/python-modules/httpx-ntlm/default.nix +++ b/pkgs/development/python-modules/httpx-ntlm/default.nix @@ -3,29 +3,35 @@ , cryptography , fetchPypi , httpx -, ntlm-auth +, pyspnego +, pythonOlder }: buildPythonPackage rec { pname = "httpx-ntlm"; - version = "0.0.10"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "httpx_ntlm"; inherit version; - sha256 = "1rar6smz56y8k5qbgrpabpr639nwvf6whdi093hyakf0m3h9cpfz"; + sha256 = "sha256-pv/OxgcO0JWk2nCZp+bKlOdX7NqV6V5xZRDy5dd13qQ="; }; propagatedBuildInputs = [ cryptography httpx - ntlm-auth + pyspnego ]; # https://github.com/ulodciv/httpx-ntlm/issues/5 doCheck = false; - pythonImportsCheck = [ "httpx_ntlm" ]; + pythonImportsCheck = [ + "httpx_ntlm" + ]; meta = with lib; { description = "NTLM authentication support for HTTPX"; diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index fac9ecba6ce9..e45e6a85487a 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.7.2"; + version = "0.7.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = pname; rev = "v${version}"; - sha256 = "1wigmkhn4ymfr12z9vhdaimjcma9llicwrr29q0cc8xmy23f3445"; + sha256 = "11wnhx9nfsg5lsnlgh33zngyhc2klichpfrkwajbbyq95fdqj8ri"; }; propagatedBuildInputs = [ @@ -56,6 +56,12 @@ buildPythonPackage rec { "httpx_socks" ]; + disabledTests = [ + # Tests don't work in the sandbox + "test_proxy" + "test_secure_proxy" + ]; + meta = with lib; { description = "Proxy (HTTP, SOCKS) transports for httpx"; homepage = "https://github.com/romis2012/httpx-socks"; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 543308a3fdc1..d479cc1f13ce 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -1,11 +1,11 @@ { lib +, async_generator , buildPythonPackage , pythonOlder , fetchFromGitHub , brotlicffi , certifi , charset-normalizer -, h2 , httpcore , rfc3986 , sniffio @@ -20,24 +20,27 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.21.1"; + version = "0.21.3"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-ayhLP+1hPWAx2ds227CKp5cebVkD5B2Z59L+3dzdINc="; + sha256 = "01069b0kj6vnb26xazlz06rj4yncy5nkq76pajvzx0pmpjkniiz9"; }; propagatedBuildInputs = [ brotlicffi certifi charset-normalizer - h2 httpcore rfc3986 sniffio + ] ++ lib.optionals (pythonOlder "3.7") [ + async_generator ]; checkInputs = [ @@ -49,13 +52,21 @@ buildPythonPackage rec { uvicorn ]; - pythonImportsCheck = [ "httpx" ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "rfc3986[idna2008]>=1.3,<2" "rfc3986>=1.3" + ''; # testsuite wants to find installed packages for testing entrypoint preCheck = '' export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ''; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + disabledTests = [ # httpcore.ConnectError: [Errno 101] Network is unreachable "test_connect_timeout" @@ -71,6 +82,10 @@ buildPythonPackage rec { "tests/test_main.py" ]; + pythonImportsCheck = [ + "httpx" + ]; + __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index 28a801de71a6..38c25fa1b0c8 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "huey"; - version = "2.2.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "coleifer"; repo = pname; rev = version; - sha256 = "1hgic7qrmb1kxvfgf2qqiw39nqyknf17pjvli8jfzvd9mv7cb7hh"; + sha256 = "00fi04991skq61gjrmig8ry6936pc8zs7p8py8spfipbxf1irkjg"; }; propagatedBuildInputs = [ redis ]; diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index 1bd1e6650c8d..332521d07040 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -39,7 +39,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7' \ - --replace "'python_requires': '>=3.6,<3.10'," "'python_requires': '>=3.6,<4'," + --replace "'python_requires': '>=3.6,<3.10'," "'python_requires': '>=3.6,<4'," \ + --replace 'typing-extensions>=3.7,<4.0' 'typing-extensions>=3.7' ''; # tests require to clone quite a few firmwares diff --git a/pkgs/development/python-modules/hypercorn/default.nix b/pkgs/development/python-modules/hypercorn/default.nix index 5f3842835364..dc165f2b2cc4 100644 --- a/pkgs/development/python-modules/hypercorn/default.nix +++ b/pkgs/development/python-modules/hypercorn/default.nix @@ -8,6 +8,7 @@ , h2 , priority , mock +, poetry-core , pytest-asyncio , pytest-cov , pytest-sugar @@ -17,16 +18,21 @@ buildPythonPackage rec { pname = "Hypercorn"; - version = "0.11.2"; + version = "0.13.2"; disabled = pythonOlder "3.7"; + format = "pyproject"; src = fetchFromGitLab { owner = "pgjones"; repo = pname; rev = version; - sha256 = "0v80v6l2xqac5mgrmh2im7y23wpvz4yc2v4h9ryhvl88c2jk9mvh"; + sha256 = "sha256-fIjw5A6SvFUv8cU7xunVlPYphv+glypY4pzvHNifYLQ="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ wsproto toml h2 priority ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/hyperion-py/default.nix b/pkgs/development/python-modules/hyperion-py/default.nix index c282be29c655..719efb92d1da 100644 --- a/pkgs/development/python-modules/hyperion-py/default.nix +++ b/pkgs/development/python-modules/hyperion-py/default.nix @@ -36,6 +36,11 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # pytest-asyncio 0.17.0 compat + "--asyncio-mode=auto" + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace " --timeout=9 --cov=hyperion" "" diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 9d9c6b6c91fa..89aac153172d 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -9,6 +9,7 @@ , pytest-xdist , sortedcontainers , tzdata +, pythonOlder }: buildPythonPackage rec { # https://hypothesis.readthedocs.org/en/latest/packaging.html @@ -18,14 +19,16 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "6.30.1"; + version = "6.35.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "0nk57v03q7ss7dbsfd9gi3lzl6ngplk7axbiksm26dgkhh4swk8y"; + sha256 = "08wph7q3c08480ma2p7m7mamy0g7g7r5jqpwdyhdga4cfg734527"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; @@ -35,8 +38,13 @@ buildPythonPackage rec { sortedcontainers ]; - checkInputs = [ pytestCheckHook pytest-xdist pexpect ] - ++ lib.optional (pythonAtLeast "3.9") tzdata; + checkInputs = [ + pexpect + pytest-xdist + pytestCheckHook + ] ++ lib.optional (pythonAtLeast "3.9") [ + tzdata + ]; inherit doCheck; @@ -45,10 +53,16 @@ buildPythonPackage rec { rm tox.ini ''; - pytestFlagsArray = [ "tests/cover" ]; + pytestFlagsArray = [ + "tests/cover" + ]; + + pythonImportsCheck = [ + "hypothesis" + ]; meta = with lib; { - description = "A Python library for property based testing"; + description = "Library for property based testing"; homepage = "https://github.com/HypothesisWorks/hypothesis"; license = licenses.mpl20; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index 776ff77fce2f..ee8b897154bd 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, hypothesis, lark-parser, libcst, black, parso, pytestCheckHook, pytest-cov, pytest-xdist }: +{ lib, buildPythonPackage, fetchPypi, hypothesis, lark, libcst, black, parso, pytestCheckHook, pytest-cov, pytest-xdist }: buildPythonPackage rec { pname = "hypothesmith"; @@ -9,10 +9,15 @@ buildPythonPackage rec { sha256 = "0fb7b3fd03d76eddd4474b0561e1c2662457593a74cc300fd27e5409cd4d7922"; }; - propagatedBuildInputs = [ hypothesis lark-parser libcst ]; + postPatch = '' + substituteInPlace setup.py --replace "lark-parser" "lark" + ''; + + propagatedBuildInputs = [ hypothesis lark libcst ]; checkInputs = [ black parso pytestCheckHook pytest-cov pytest-xdist ]; + pytestFlagsArray = [ "-v" ]; # tests are fairly slow, prevents timeout due to no stdout printing pythonImportsCheck = [ "hypothesmith" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index 5f031197978a..340e3618be1a 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -3,7 +3,7 @@ } : buildPythonPackage rec { - name = "i-pi"; + pname = "i-pi"; version = "2.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/i2csense/default.nix b/pkgs/development/python-modules/i2csense/default.nix new file mode 100644 index 000000000000..475e77c21841 --- /dev/null +++ b/pkgs/development/python-modules/i2csense/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, smbus-cffi +}: + +buildPythonPackage rec { + pname = "i2csense"; + version = "0.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "6f9c0a37d971e5b8a60c54982bd580cff84bf94fedc08c097e603a8e5609c33f"; + }; + + propagatedBuildInputs = [ + smbus-cffi + ]; + + # no tests implemented + doCheck = false; + + pythonImportsCheck = [ + "i2csense.bme280" + "i2csense.bh1750" + "i2csense.htu21d" + ]; + + meta = with lib; { + description = "A library to handle i2c sensors with the Raspberry Pi"; + homepage = "https://github.com/azogue/i2csense"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 17f4553297ff..61b944b48836 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -14,6 +14,7 @@ , numpy , pandas , parsy +, poetry-core , pyarrow , pytest , pytest-mock @@ -49,6 +50,8 @@ in buildPythonPackage rec { pname = "ibis-framework"; version = "2.1.1"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -58,6 +61,8 @@ buildPythonPackage rec { sha256 = "sha256-n3fR6wvcSfIo7760seB+5SxtoYSqQmqkzZ9VlNQF200="; }; + nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ atpublic cached-property @@ -75,7 +80,9 @@ buildPythonPackage rec { sqlalchemy tables toolz - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ] ++ lib.optionals (pythonOlder "3.8" && lib.versionOlder version "3.0.0") [ + importlib-metadata + ]; checkInputs = [ pytestCheckHook @@ -85,8 +92,18 @@ buildPythonPackage rec { pytest-xdist ]; - # these tests are broken upstream: https://github.com/ibis-project/ibis/issues/3291 + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'atpublic = ">=2.3,<3"' 'atpublic = ">=2.3"' + ''; + + preBuild = '' + # setup.py exists only for developer convenience and is automatically generated + rm setup.py + ''; + disabledTests = [ + # These tests are broken upstream: https://github.com/ibis-project/ibis/issues/3291 "test_summary_numeric" "test_summary_non_numeric" "test_batting_most_hits" @@ -126,11 +143,13 @@ buildPythonPackage rec { done wait - + '' + lib.optionalString (lib.versionOlder version "3.0.0") '' export PYTEST_BACKENDS="${backendsString}" ''; - pythonImportsCheck = [ "ibis" ] ++ (map (backend: "ibis.backends.${backend}") backends); + pythonImportsCheck = [ + "ibis" + ] ++ (map (backend: "ibis.backends.${backend}") backends); meta = with lib; { description = "Productivity-centric Python Big Data Framework"; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 64ecd3c496bb..b505182b4fb5 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.14.0"; + version = "3.15.1"; src = fetchPypi { inherit pname version; - sha256 = "695c4125436f4f8354a67bc85af9ac306b66911c75d19ade25072dd436b55c4e"; + sha256 = "sha256-bGTr8Qf7ywlbsl6/FEJEjFB/bqyyMwfmjVVAsrgmkTg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index a0c12758069b..d169190ef8c8 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -10,19 +10,30 @@ , python-dateutil , websocket-client , ibm-cloud-sdk-core +, pythonOlder }: buildPythonPackage rec { pname = "ibm-watson"; - version = "5.3.0"; + version = "6.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "v${version}"; - sha256 = "0g63h7rf0710bxcsr115857bvz69sl2g5d13k5a7qi7hjh33bxrk"; + sha256 = "sha256-AvWcw1VV47v2yvaqukPSql7rA7wVwrvtCDsvYtPZXKs="; }; + propagatedBuildInputs = [ + requests + python-dateutil + websocket-client + ibm-cloud-sdk-core + ]; + checkInputs = [ responses pytestCheckHook @@ -31,18 +42,15 @@ buildPythonPackage rec { tox ]; - propagatedBuildInputs = [ - requests - python-dateutil - websocket-client - ibm-cloud-sdk-core - ]; - postPatch = '' substituteInPlace setup.py \ --replace websocket-client==1.1.0 websocket-client>=1.1.0 ''; + pythonImportsCheck = [ + "ibm_watson" + ]; + meta = with lib; { description = "Client library to use the IBM Watson Services"; homepage = "https://github.com/watson-developer-cloud/python-sdk"; diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix index 28fed3bcb788..81fd7c8a693a 100644 --- a/pkgs/development/python-modules/icecream/default.nix +++ b/pkgs/development/python-modules/icecream/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "icecream"; - version = "2.1.1"; + version = "2.1.2"; src = fetchPypi { inherit pname version; - sha256 = "47e00e3f4e8477996e7dc420b6fa8ba53f8ced17de65320fedb5b15997b76589"; + sha256 = "sha256-CTALLRxnhxJBDL1HyVGY6xtYD2bzEaVUzNa551js4O4="; }; propagatedBuildInputs = [ asttokens colorama executing pygments ]; diff --git a/pkgs/development/python-modules/icmplib/default.nix b/pkgs/development/python-modules/icmplib/default.nix index 82033321f882..aae5785fccfb 100644 --- a/pkgs/development/python-modules/icmplib/default.nix +++ b/pkgs/development/python-modules/icmplib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "icmplib"; - version = "3.0.2"; + version = "3.0.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ValentinBELYN"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4aq89Nw55OL7JQx3Ra6Ppp5yKLdS6Lc0YA8UJxVhz84="; + sha256 = "sha256-EQyu7lV8F/U8cZklYYIMk9ut1FTcoBvGc8Ggx6JerDk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/icnsutil/default.nix b/pkgs/development/python-modules/icnsutil/default.nix new file mode 100644 index 000000000000..05c24ec7c37e --- /dev/null +++ b/pkgs/development/python-modules/icnsutil/default.nix @@ -0,0 +1,31 @@ +{ lib +, python +, fetchFromGitHub +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "icnsutil"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "relikd"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-TfQvAbP7iCpRQg2G+ejl245NCYo9DpYwMgiwY2BuJnY="; + }; + + doCheck = true; + + checkPhase = '' + ${python.interpreter} tests/test_icnsutil.py + ${python.interpreter} tests/test_cli.py + ''; + + meta = { + homepage = "https://github.com/relikd/icnsutil"; + description = "Create and extract .icns files."; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.reckenrode ]; + }; +} diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index da18e5a9236b..18a12fe9e198 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.4.5"; + version = "2.4.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VXQ9lyouwAuw2iGr1m/2KFklUFgmQOP2/gwInATKB4k="; + sha256 = "sha256-kXhUlt+lcqK3ohOA8eziFcrm4U/FAYWpie4rH5xRejI="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index c027eba98742..897b5975c90c 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "v${version}"; - sha256 = "11gvw0yqb3y5ddifs5f38bgslvfmw1bmd9rga1ynlrmmgmhxym6h"; + sha256 = "sha256-S4wL1RyQ6aDW16wbSl+86VhSJ2S9oanYhNtPQdBtdrA="; }; checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index 4fe56c616146..d351f1ca7d44 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -96,6 +96,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ + --replace "cachetools>=4.1,<5" "cachetools>=4.1" \ --replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2" \ --replace "SQLAlchemy>=1.3.0,<1.4" "SQLAlchemy>=1.3.0,<1.5" \ --replace "WTForms>=2.3.1,<2.4" "WTForms" @@ -106,7 +107,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportChecks = [ "ihatemoney" ]; + pythonImportsCheck = [ "ihatemoney" ]; disabledTests = [ "test_notifications" # requires running service. diff --git a/pkgs/development/python-modules/ilua/default.nix b/pkgs/development/python-modules/ilua/default.nix new file mode 100644 index 000000000000..5b5c129c2749 --- /dev/null +++ b/pkgs/development/python-modules/ilua/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jupyter_console +, jupyter_core +, pygments +, termcolor +, txzmq +}: + +buildPythonPackage rec { + pname = "ilua"; + version = "0.2.1"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-YxV6xC7GS5NXyMPRZN9YIJxamgP2etwrZUAZjk5PjtU="; + }; + + propagatedBuildInputs = [ + jupyter_console + jupyter_core + pygments + termcolor + txzmq + ]; + + # No tests found + doCheck = false; + + pythonImportsCheck = [ "ilua" ]; + + meta = with lib; { + description = "Portable Lua kernel for Jupyter"; + homepage = "https://github.com/guysv/ilua"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index a249b2dbfe19..6998ff330afc 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -3,7 +3,7 @@ , isPy3k , fetchPypi , substituteAll -, ffmpeg +, ffmpeg_4 , python }: @@ -21,7 +21,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./ffmpeg-path.patch; - ffmpeg = "${ffmpeg}/bin/ffmpeg"; + ffmpeg = "${ffmpeg_4}/bin/ffmpeg"; }) ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { ${python.interpreter} << EOF from imageio_ffmpeg import get_ffmpeg_version - assert get_ffmpeg_version() == '${ffmpeg.version}' + assert get_ffmpeg_version() == '${ffmpeg_4.version}' EOF runHook postCheck diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 0a97a27d17f8..98495932fdaf 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy27 , fetchPypi +, fetchpatch , imageio-ffmpeg , numpy , pillow @@ -12,11 +13,11 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.13.2"; + version = "2.14.1"; disabled = isPy27; src = fetchPypi { - sha256 = "5b7a55d07de88a2fd70f18a1608ca05ba2b55596a942fb2c390240201009a6c3"; + sha256 = "sha256-cJwY+ACYHkKGq+S9hrbJtbtuKFtrkztboJYu+OeZQFg="; inherit pname version; }; diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 3437dd902bcd..9d017b242235 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,15 +7,17 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.50.2"; + version = "0.52.0"; disabled = isPy27; + format = "setuptools"; + src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - hash = "sha256-ki38Kr+eDEIQPRuoQePR7dCRDSgq2ZLXws1pq2gtQrI="; + hash = "sha256-la2+cpTnHZQn/FXtySp+3zDCBTONiLC16Tm+hDiIERc="; }; checkInputs = [ @@ -25,9 +27,10 @@ buildPythonPackage rec { disabledTests = [ # tests require a network connection "test_action" - "test_folders" - "test_connection" "test_attributes" + "test_connection" + "test_folders" + "test_idle" "test_live" ]; diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 9a6a59f6b8d4..58e3db524a82 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy27 , fetchPypi +, fetchpatch , pikepdf , pillow , stdenv @@ -26,6 +27,15 @@ buildPythonPackage rec { sha256 = "sha256-jlHFBD76lddRSBtRYHGgBvh8KkBZlhqaxD7COJFd4J8="; }; + patches = [ + # Disable tests broken by Pillow 9.0.0 + # https://gitlab.mister-muffin.de/josch/img2pdf/issues/130#issuecomment-586 + (fetchpatch { + url = "https://salsa.debian.org/debian/img2pdf/-/raw/f77fefc81e7c4b235c47ae6777d222d391c59536/debian/patches/pillow9"; + sha256 = "sha256-8giZCuv5PzSbrBQqslNqiLOhgxbg3LsdBVwt+DWnvh4="; + }) + ]; + propagatedBuildInputs = [ pikepdf pillow diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix index 1b99cd05f03b..37703a3150f4 100644 --- a/pkgs/development/python-modules/iminuit/default.nix +++ b/pkgs/development/python-modules/iminuit/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.9.0"; + version = "2.11.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "656410ceffead79a52d3d727fdcd2bac78d7774239bef0efc3b7a86bae000ff3"; + sha256 = "sha256-jK55F8otIsaR4AeSv7u4ErhKxcdRIOsq6Hn7StpB7mw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/importlab/default.nix b/pkgs/development/python-modules/importlab/default.nix new file mode 100644 index 000000000000..2ea3f01d2ccb --- /dev/null +++ b/pkgs/development/python-modules/importlab/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, networkx +, pytestCheckHook +}: + +buildPythonPackage { + pname = "importlab"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "google"; + repo = "importlab"; + rev = "676d17cd41ac68de6ebb48fb71780ad6110c4ae3"; + sha256 = "sha256-O8y1c65NQ+19BnGnUnWrA0jYUqF+726CFAcWzHFOiHE="; + }; + + propagatedBuildInputs = [ networkx ]; + + checkInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ "tests/test_parsepy.py" ]; + + pythonImportsCheck = [ "importlab" ]; + + meta = with lib; { + description = "A library that automatically infers dependencies for Python files"; + homepage = "https://github.com/google/importlab"; + license = licenses.mit; + maintainers = with maintainers; [ sei40kr ]; + }; +} diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index a607de5eb114..3917742a55a9 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.10.0"; - format = "setuptools"; + version = "4.11.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-kqi1jOc0sqRJSHjg7PfXnM16EotfxgFMQB4LYfAG8PY="; + hash = "sha256-nl5VO7uhhDy0oAgjAUuQdha+Ru5QPSuboAHSFKjaIY8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index ca454d432317..a6c549b61f1b 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "inflect"; - version = "5.3.0"; + version = "5.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "41a23f6788962e9775e40e2ecfb1d6455d02de315022afeedd3c5dc070019d73"; + sha256 = "sha256-tY1YxOc//KmyXgdcHE/Jyt7LtcmdfNnzze3ac+zoPBw="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 9eb9bd48d47e..226d43b2bc4c 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,14 +14,16 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.25.0"; + version = "1.27.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "0anziqlczzc9qmz1mrk8yapn0pc18wz2pknyghyj5qpym3w2azas"; + hash = "sha256-M0Ob3HjIhlYSIWXGM54NXiEMSCmZzNLLNsCRyxAcjMc="; }; propagatedBuildInputs = [ @@ -38,12 +40,14 @@ buildPythonPackage rec { # requires influxdb server doCheck = false; - pythonImportsCheck = [ "influxdb_client" ]; + pythonImportsCheck = [ + "influxdb_client" + ]; meta = with lib; { description = "InfluxDB 2.0 Python client library"; homepage = "https://github.com/influxdata/influxdb-client-python"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 8ecd46e3b96b..ec81f631ac30 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , python-dateutil -, fetchFromGitHub +, fetchPypi , fetchpatch , mock , msgpack @@ -16,13 +16,11 @@ buildPythonPackage rec { pname = "influxdb"; - version = "5.3.0"; + version = "5.3.1"; - src = fetchFromGitHub { - owner = "influxdata"; - repo = "influxdb-python"; - rev = "v${version}"; - sha256 = "1jfkf53jcf8lcq98qc0bw5d1d0yp3558mh8l2dqc9jlsm0smigjs"; + src = fetchPypi { + inherit pname version; + sha256 = "0ymjv322mv6y424fmpd70f87152w55mbwwj6i7p3sjzf0ixmxy26"; }; propagatedBuildInputs = [ @@ -41,14 +39,6 @@ buildPythonPackage rec { pandas ]; - patches = [ - (fetchpatch { - # Relaxes msgpack pinning - url = "https://github.com/influxdata/influxdb-python/commit/cc41e290f690c4eb67f75c98fa9f027bdb6eb16b.patch"; - sha256 = "1fb9qrq1kp24pixjwvzhdy67z3h0wnj92aj0jw0a25fd0rdxdvg4"; - }) - ]; - disabledTests = [ # Tests cause FutureWarning due to use of 'record' instead of 'records' in pandas. # https://github.com/influxdata/influxdb-python/pull/845 diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix index 90761f76f9d5..a8a4a611fee6 100644 --- a/pkgs/development/python-modules/iniconfig/default.nix +++ b/pkgs/development/python-modules/iniconfig/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm }: buildPythonPackage rec { pname = "iniconfig"; @@ -9,12 +9,14 @@ buildPythonPackage rec { sha256 = "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"; }; + nativeBuildInputs = [ setuptools-scm ]; + doCheck = false; # avoid circular import with pytest pythonImportsCheck = [ "iniconfig" ]; meta = with lib; { description = "brain-dead simple parsing of ini files"; - homepage = "https://github.com/RonnyPfannschmidt/iniconfig"; + homepage = "https://github.com/pytest-dev/iniconfig"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index 84e381f0b8c8..dd2db106acea 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -1,30 +1,48 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytest-cov, pexpect, pytest-mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub + +# native +, poetry-core + +# propagated +, blessed +, python-editor +, readchar + +# tests +, pytest-mock +, pytestCheckHook +, pexpect +}: buildPythonPackage rec { pname = "inquirer"; - version = "2.7.0"; + version = "2.9.1"; + format = "pyproject"; - # PyPi archive currently broken: https://github.com/magmax/python-inquirer/issues/106 src = fetchFromGitHub rec { owner = "magmax"; repo = "python-inquirer"; - rev = version; - sha256 = "152l5qjgkag8zkr69ax2i5s8xcac1qvyngisrplbnbzwbpf77d0d"; + rev = "v${version}"; + sha256 = "sha256:0vdly2k4i7bfcqc8zh2miv9dbpmqvayxk72qn9d4hr7z15wph233"; }; - propagatedBuildInputs = [ blessed python-editor readchar ]; + nativeBuildInputs = [ + poetry-core + ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "blessed==1.17.6" "blessed~=1.17" \ - --replace "readchar==2.0.1" "readchar>=2.0.0" - ''; + propagatedBuildInputs = [ + blessed + python-editor + readchar + ]; - checkInputs = [ pytest pytest-cov pexpect pytest-mock ]; - - checkPhase = '' - pytest --cov-report=term-missing --cov inquirer --no-cov-on-fail tests/unit tests/integration - ''; + checkInputs = [ + pexpect + pytest-mock + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/magmax/python-inquirer"; diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix new file mode 100644 index 000000000000..b93b9b9c957b --- /dev/null +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -0,0 +1,52 @@ +{ lib +, aenum +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pydantic +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "intellifire4py"; + version = "1.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jeeftor"; + repo = pname; + rev = version; + hash = "sha256-t3wJQ7dXX65yqxMYsFggViqqGvLCdASw1QLc5DJBn+4="; + }; + + propagatedBuildInputs = [ + aenum + aiohttp + pydantic + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Test file is missing + "test_json_files" + ]; + + pythonImportsCheck = [ + "intellifire4py" + ]; + + meta = with lib; { + description = "Module to read Intellifire fireplace status data"; + homepage = "https://github.com/jeeftor/intellifire4py"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index d197ba9691bf..c50563f55007 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -1,7 +1,6 @@ { buildPythonPackage , fetchPypi , pytest -, six , tqdm , pyyaml , docopt @@ -10,25 +9,25 @@ , args , schema , responses -, backports_csv -, isPy3k , lib , glibcLocales , setuptools , urllib3 +, pythonOlder }: buildPythonPackage rec { pname = "internetarchive"; - version = "2.3.0"; + version = "3.0.0"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "fa89dc4be3e0a0aee24810a4a754e24adfd07edf710c645b4f642422c6078b8d"; + sha256 = "sha256-fRcqsT8p/tqXUpU2/9lAEF1IT8Cy5KK0+jKaeVwZshI="; }; propagatedBuildInputs = [ - six tqdm pyyaml docopt @@ -38,7 +37,7 @@ buildPythonPackage rec { schema setuptools urllib3 - ] ++ lib.optionals (!isPy3k) [ backports_csv ]; + ]; checkInputs = [ pytest responses glibcLocales ]; diff --git a/pkgs/development/python-modules/invocations/default.nix b/pkgs/development/python-modules/invocations/default.nix new file mode 100644 index 000000000000..78ace76b762e --- /dev/null +++ b/pkgs/development/python-modules/invocations/default.nix @@ -0,0 +1,43 @@ +{ buildPythonPackage +, blessings +, fetchFromGitHub +, invoke +, lib +, releases +, semantic-version +, tabulate +, twine +}: + +buildPythonPackage rec { + pname = "invocations"; + version = "2.6.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "pyinvoke"; + repo = pname; + rev = version; + hash = "sha256-eyOJKVRfn7elyEkERl7hvRTNFmq7O9Pr03lBS6xp0wE="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "semantic_version>=2.4,<2.7" "semantic_version" \ + --replace "tabulate==0.7.5" "tabulate" + ''; + + propagatedBuildInputs = [ blessings invoke releases semantic-version tabulate twine ]; + + # There's an error loading the test suite. See https://github.com/pyinvoke/invocations/issues/29. + doCheck = false; + + pythonImportsCheck = [ "invocations" ]; + + meta = with lib; { + description = "Common/best-practice Invoke tasks and collections"; + homepage = "https://invocations.readthedocs.io/"; + license = licenses.bsd2; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 45c341c209cf..45711a3dc20e 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -2,15 +2,19 @@ , bash , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "invoke"; - version = "1.6.0"; + version = "1.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "374d1e2ecf78981da94bfaf95366216aaec27c2d6a7b7d5818d92da55aa258d3"; + hash = "sha256-4zLkneQEY/IBYxX1HfQjE4VXcr6GQ1aGFWvBj0W1zGw="; }; patchPhase = '' @@ -20,8 +24,14 @@ buildPythonPackage rec { # errors with vendored libs doCheck = false; - meta = { + pythonImportsCheck = [ + "invoke" + ]; + + meta = with lib; { description = "Pythonic task execution"; - license = lib.licenses.bsd2; + homepage = "https://www.pyinvoke.org/"; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/iodata/default.nix b/pkgs/development/python-modules/iodata/default.nix new file mode 100644 index 000000000000..b81d7981a280 --- /dev/null +++ b/pkgs/development/python-modules/iodata/default.nix @@ -0,0 +1,28 @@ +{ buildPythonPackage, lib, fetchFromGitHub, numpy, scipy, attrs, cython, nose }: + +buildPythonPackage rec { + pname = "iodata"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "theochem"; + repo = pname; + rev = version; + hash = "sha256-Qn2xWFxdS12K92DhdHVzYrBjPRV+vYo7Cs27vkeCaxM="; + }; + + leaveDotGit = true; + + nativeBuildInputs = [ cython nose ]; + propagatedBuildInputs = [ numpy scipy attrs ]; + + pythonImportsCheck = [ "iodata" "iodata.overlap_accel" ]; + doCheck = false; # Requires roberto or nose and a lenghtly setup to find the cython modules + + meta = with lib; { + description = "Python library for reading, writing, and converting computational chemistry file formats and generating input files"; + homepage = "https://github.com/theochem/iodata"; + license = licenses.lgpl3Only; + maintainers = [ maintainers.sheepforce ]; + }; +} diff --git a/pkgs/development/python-modules/ipaddr/default.nix b/pkgs/development/python-modules/ipaddr/default.nix new file mode 100644 index 000000000000..41ef6faa7c37 --- /dev/null +++ b/pkgs/development/python-modules/ipaddr/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ipaddr"; + version = "2.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ml8r8z3f0mnn381qs1snbffa920i9ycp6mm2am1d3aqczkdz4j0"; + }; + + checkPhase = '' + python ipaddr_test.py + ''; + + meta = with lib; { + description = "IP address manipulation library"; + homepage = "https://github.com/google/ipaddr-py"; + license = licenses.asl20; + maintainers = [ maintainers.astro ]; + }; +} diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 1a34dfaf65b2..e888fdcd3209 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -4,7 +4,6 @@ , fetchPypi , pythonOlder , argcomplete -, debugpy , ipython , jupyter-client , tornado @@ -13,15 +12,20 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.6.0"; + version = "6.7.0"; src = fetchPypi { inherit pname version; - sha256 = "3a227788216b43982d9ac28195949467627b0d16e6b8af9741d95dcaa8c41a89"; + sha256 = "d82b904fdc2fd8c7b1fbe0fa481c68a11b4cd4c8ef07e6517da1f10cc3114d24"; }; + # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 + postPatch = '' + substituteInPlace setup.py \ + --replace "'debugpy>=1.0.0,<2.0'," "" + ''; + propagatedBuildInputs = [ - debugpy ipython jupyter-client tornado diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 4c64fca34b76..aa7cc22b7a84 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -9,23 +9,26 @@ , ipython , jupyter-client , ipykernel +, packaging +, psutil , tornado +, tqdm , isPy3k , futures ? null }: buildPythonPackage rec { pname = "ipyparallel"; - version = "6.3.0"; + version = "8.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0a97b276c62db633e9e97a816282bdd166f9df74e28204f0c8fa54b71944cfdc"; + sha256 = "sha256-D9n2SlEgmAqJtkKZgGwSu434zuoVXlIAtwUwHrJAHhk="; }; buildInputs = [ nose ]; - propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel tornado + propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter-client ipykernel packaging psutil tornado tqdm ] ++ lib.optionals (!isPy3k) [ futures ]; # Requires access to cluster diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 73ead288ee49..c1c0b049dc8c 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -3,65 +3,84 @@ , buildPythonPackage , fetchPypi , pythonOlder + # Build dependencies , glibcLocales -# Test dependencies -, nose -, pygments + # Runtime dependencies -, jedi -, decorator -, matplotlib-inline -, pickleshare -, traitlets -, prompt-toolkit -, pexpect , appnope , backcall +, black +, decorator +, jedi +, matplotlib-inline +, pexpect +, pickleshare +, prompt-toolkit +, pygments +, stack-data +, traitlets + +# Test dependencies +, pytestCheckHook +, testpath }: buildPythonPackage rec { pname = "ipython"; - version = "7.30.1"; - disabled = pythonOlder "3.7"; + version = "8.0.1"; + format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "cb6aef731bf708a7727ab6cde8df87f0281b1427d41e65d62d4b68934fa54e97"; + sha256 = "0x19sj4dlq7r4p1mqnpx9245r8dwvpjwd8n34snfm37a452lsmmb"; }; - prePatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace setup.py --replace "'gnureadline'" " " - ''; - - buildInputs = [ glibcLocales ]; - - checkInputs = [ nose pygments ]; + buildInputs = [ + glibcLocales + ]; propagatedBuildInputs = [ - jedi + backcall + black decorator + jedi matplotlib-inline + pexpect pickleshare - traitlets prompt-toolkit pygments - pexpect - backcall - ] ++ lib.optionals stdenv.isDarwin [appnope]; + stack-data + traitlets + ] ++ lib.optionals stdenv.isDarwin [ + appnope + ]; LC_ALL="en_US.UTF-8"; - doCheck = false; # Circular dependency with ipykernel - - checkPhase = '' - nosetests - ''; - pythonImportsCheck = [ "IPython" ]; + preCheck = '' + 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" + ''; + + checkInputs = [ + pytestCheckHook + testpath + ]; + + disabledTests = lib.optionals (stdenv.isDarwin) [ + # FileNotFoundError: [Errno 2] No such file or directory: 'pbpaste' + "test_clipboard_get" + ]; + meta = with lib; { description = "IPython: Productive Interactive Computing"; homepage = "http://ipython.org/"; diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index 61fd8d269bab..567c033e243f 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.8.1"; + version = "1.8.2"; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - sha256 = "2d17367ce7da45a2622107d55c8b4c5475aace99ed5d95e5d7d3f93aa4c0c566"; + sha256 = "sha256-uFjS7lv8kDRultRqqu2++1eieLs67dLolVurTXWls8A="; }; propagatedBuildInputs = [ ipyvue ]; diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix index 037a5f0520fd..3cd86abb0b2e 100644 --- a/pkgs/development/python-modules/irctokens/default.nix +++ b/pkgs/development/python-modules/irctokens/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "irctokens"; - version = "2.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.6"; # f-strings src = fetchFromGitHub { owner = "jesopo"; repo = pname; rev = "v${version}"; - sha256 = "0kpxn5paailm4xpdlnzxrhjrfgvvg5pp327wd8kl41a0wbqkj4zb"; + sha256 = "sha256-FgcLngS11U9eBNV/8jllwdrm89tCmthA1sUaFDovk6U="; }; checkInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index e43db60fb11d..50e171feb6a2 100644 --- a/pkgs/development/python-modules/isbnlib/default.nix +++ b/pkgs/development/python-modules/isbnlib/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "isbnlib"; - version = "3.10.9"; + version = "3.10.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-P4GH6462+gJ9Jv8HdfKr1CDinOMyeUv1Uqhqa9ukcLg="; + sha256 = "c9e6c1dcaa9dff195429373cf2beb3117f30b3fca43d7db5aec5a2d1f6f59784"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index d6e4332fdeaa..67b547b724ea 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2021.1"; + version = "2022.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b3f49de925149dbf2482e648016507cd66d0dce6668a1bc4de5e7a937e9c576d"; + sha256 = "sha256-eWNc1xxOqEmPdSC1Ha6tfM8ofgkudfOGjvp3ZyM4pxE="; }; postConfigure = '' diff --git a/pkgs/development/python-modules/iso4217/default.nix b/pkgs/development/python-modules/iso4217/default.nix index b1438f29a017..12cf40a6764e 100644 --- a/pkgs/development/python-modules/iso4217/default.nix +++ b/pkgs/development/python-modules/iso4217/default.nix @@ -16,14 +16,16 @@ let in buildPythonPackage rec { pname = "iso4217"; - version = "1.7"; + version = "1.8"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "dahlia"; repo = pname; rev = version; - hash = "sha256-Ih2l6bGM7i5TUkzJPkgx8EOOL4a3/qE28SUZS6M4sQc="; + hash = "sha256-L0vx6Aan6D1lusgBh/pcT373ZTxbtWpQnFKB2V0dxlA="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index f708391cba21..d21f79b6ba9b 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "isort"; - version = "5.9.3"; + version = "5.10.1"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; rev = version; - sha256 = "sha256-JbRZ/3Xz35tGoCNnQesR08Sjoz3yimxZyxhhOXGvmXw="; + sha256 = "09spgl2k9xrprr5gbpfc91a8p7mx7a0c64ydgc91b3jhrmnd9jg1"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/itemadapter/default.nix b/pkgs/development/python-modules/itemadapter/default.nix index 5d85ad719527..b082387e23cf 100644 --- a/pkgs/development/python-modules/itemadapter/default.nix +++ b/pkgs/development/python-modules/itemadapter/default.nix @@ -1,25 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "itemadapter"; - version = "0.4.0"; + version = "0.5.0"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "f05df8da52619da4b8c7f155d8a15af19083c0c7ad941d8c1de799560ad994ca"; + hash = "sha256-BbanndMaepk9+y6Dhqkcl+O4xs8otyVT6AjmJeC4fCA="; }; - doCheck = false; # infinite recursion with Scrapy + # Infinite recursion with Scrapy + doCheck = false; - pythonImportsCheck = [ "itemadapter" ]; + pythonImportsCheck = [ + "itemadapter" + ]; meta = with lib; { description = "Common interface for data container classes"; homepage = "https://github.com/scrapy/itemadapter"; changelog = "https://github.com/scrapy/itemadapter/raw/v${version}/Changelog.md"; license = licenses.bsd3; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/development/python-modules/janus/default.nix b/pkgs/development/python-modules/janus/default.nix index c8a9efdb54f8..f4c52db722cd 100644 --- a/pkgs/development/python-modules/janus/default.nix +++ b/pkgs/development/python-modules/janus/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "janus"; - version = "0.7.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "f10dcf5776e8d49cc30ec86d5eb7268eeec39abaa24fe0332ee8fb8fa3611845"; + sha256 = "df976f2cdcfb034b147a2d51edfc34ff6bfb12d4e2643d3ad0e10de058cb1612"; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 46f2bfdff3fc..d45d354b38e7 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.4.0"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "344d14769d716e7496af879ac71b3c6ebdd46abc64bd9ec21d15248365aa3ac9"; + sha256 = "b04f00bd4b3c4fc4ba5fe1baf8042c0efd192b13e386830ea23fff77bb69dc88"; }; pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index 1316c2b4e729..73aa7708cf25 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "659a64743047d00c6ae2a2aa60573c62cfc0b4b70eaa14fa50c80360ada32aa8"; + sha256 = "31e0e93d1027592b7b0bec6ad468db850338981ebee76ba5e212e235f4c7dda0"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 334907bb2ed9..332cac3133cc 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -1,19 +1,25 @@ { lib , absl-py +, blas , buildPythonPackage , fetchFromGitHub , jaxlib +, lapack , numpy , opt-einsum , pytestCheckHook +, pytest-xdist , pythonOlder , scipy , typing-extensions }: +let + usingMKL = blas.implementation == "mkl" || lapack.implementation == "mkl"; +in buildPythonPackage rec { pname = "jax"; - version = "0.2.27"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "${pname}-v${version}"; - sha256 = "0r1rs1zn0nzf8wpy6g5wrn2yrgi12gg2i7l285ka5d8wczjnbq47"; + rev = "jax-v${version}"; + sha256 = "sha256-RZqSJP2vtt8U6nmftV2VzfkMGkkk3100QqsjI7PpQbc="; }; patches = [ @@ -45,6 +51,7 @@ buildPythonPackage rec { checkInputs = [ jaxlib pytestCheckHook + pytest-xdist ]; # NOTE: Don't run the tests in the expiremental directory as they require flax @@ -52,10 +59,21 @@ buildPythonPackage rec { # Not a big deal, this is how the JAX docs suggest running the test suite # anyhow. pytestFlagsArray = [ + "-n auto" "-W ignore::DeprecationWarning" "tests/" ]; + # See + # * https://github.com/google/jax/issues/9705 + # * https://discourse.nixos.org/t/getting-different-results-for-the-same-build-on-two-equally-configured-machines/17921 + # * https://github.com/NixOS/nixpkgs/issues/161960 + disabledTests = lib.optionals usingMKL [ + "test_custom_linear_solve_cholesky" + "test_custom_root_with_aux" + "testEigvalsGrad_shape" + ]; + pythonImportsCheck = [ "jax" ]; diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index f597eeacfced..0929831e32a4 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -13,39 +13,84 @@ # * https://github.com/google/jax/issues/971#issuecomment-508216439 # * https://github.com/google/jax/issues/5723#issuecomment-913038780 -{ addOpenGLRunpath, autoPatchelfHook, buildPythonPackage, config -, fetchurl, isPy39, lib, stdenv -# propagatedBuildInputs -, absl-py, flatbuffers, scipy, cudatoolkit_11 -# Options: +{ absl-py +, addOpenGLRunpath +, autoPatchelfHook +, buildPythonPackage +, config +, cudatoolkit_11 +, cudnn +, fetchurl +, flatbuffers +, isPy39 +, lib +, python +, scipy +, stdenv + # Options: , cudaSupport ? config.cudaSupport or false }: +# There are no jaxlib wheels targeting cudnn <8.0.5, and although there are +# wheels for cudatoolkit <11.1, we don't support them. assert cudaSupport -> lib.versionAtLeast cudatoolkit_11.version "11.1"; +assert cudaSupport -> lib.versionAtLeast cudnn.version "8.0.5"; let - device = if cudaSupport then "gpu" else "cpu"; + version = "0.3.0"; + + pythonVersion = python.pythonVersion; + + # Find new releases at https://storage.googleapis.com/jax-releases. When + # upgrading, you can get these hashes from prefetch.sh. + cpuSrcs = { + "3.9" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl"; + hash = "sha256-AfBVqoqChEXlEC5PgbtQ5rQzcbwo558fjqCjSPEmN5Q="; + }; + "3.10" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-none-manylinux2010_x86_64.whl"; + hash = "sha256-9uBkFOO8LlRpO6AP+S8XK9/d2yRdyHxQGlbAjShqHRQ="; + }; + }; + + gpuSrcs = { + "3.9-805" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl"; + hash = "sha256-CArIhzM5FrQi3TkdqpUqCeDQYyDMVXlzKFgjNXjLJXw="; + }; + "3.9-82" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl"; + hash = "sha256-Q0plVnA9pUNQ+gCHSXiLNs4i24xCg8gBGfgfYe3bot4="; + }; + "3.10-805" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp310-none-manylinux2010_x86_64.whl"; + hash = "sha256-JopevCEAs0hgDngIId6NqbLam5YfcS8Lr9cEffBKp1U="; + }; + "3.10-82" = fetchurl { + url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-none-manylinux2010_x86_64.whl"; + hash = "sha256-2f5TwbdP7EfQNRM3ZcJXCAkS2VXBwNYH6gwT9pdu3Go="; + }; + }; in buildPythonPackage rec { pname = "jaxlib"; - version = "0.1.71"; + inherit version; format = "wheel"; - # At the time of writing (8/19/21), there are releases for 3.7-3.9. Supporting - # all of them is a pain, so we focus on 3.9, the current nixpkgs python3 - # version. - disabled = !isPy39; + # At the time of writing (2022-03-03), there are releases for <=3.10. + # Supporting all of them is a pain, so we focus on 3.9, the current nixpkgs + # python3 version, and 3.10. + disabled = !(pythonVersion == "3.9" || pythonVersion == "3.10"); - src = { - cpu = fetchurl { - url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl"; - sha256 = "sha256:0rqhs6qabydizlv5d3rb20dbv6612rr7dqfniy9r6h4kazdinsn6"; - }; - gpu = fetchurl { - url = "https://storage.googleapis.com/jax-releases/cuda111/jaxlib-${version}+cuda111-cp39-none-manylinux2010_x86_64.whl"; - sha256 = "sha256:065kyzjsk9m84d138p99iymdiiicm1qz8a3iwxz8rspl43rwrw89"; - }; - }.${device}; + src = + if !cudaSupport then cpuSrcs."${pythonVersion}" else + let + # jaxlib wheels are currently provided for cudnn versions at least 8.0.5 and + # 8.2. Try to use 8.2 whenever possible. + cudnnVersion = if (lib.versionAtLeast cudnn.version "8.2") then "82" else "805"; + in + gpuSrcs."${pythonVersion}-${cudnnVersion}"; # Prebuilt wheels are dynamically linked against things that nix can't find. # Run `autoPatchelfHook` to automagically fix them. @@ -71,19 +116,26 @@ buildPythonPackage rec { rpath=$(patchelf --print-rpath $file) # For some reason `makeLibraryPath` on `cudatoolkit_11` maps to # /lib which is different from /lib. - patchelf --set-rpath "$rpath:${cudatoolkit_11}/lib:${lib.makeLibraryPath [ cudatoolkit_11.lib ]}" $file + patchelf --set-rpath "$rpath:${cudatoolkit_11}/lib:${lib.makeLibraryPath [ cudatoolkit_11.lib cudnn ]}" $file done ''; - # pip dependencies and optionally cudatoolkit. - propagatedBuildInputs = [ absl-py flatbuffers scipy ] ++ lib.optional cudaSupport cudatoolkit_11; + propagatedBuildInputs = [ absl-py flatbuffers scipy ]; + + # Note that cudatoolkit is snecessary since jaxlib looks for "ptxas" in $PATH. + # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 for + # more info. + postInstall = lib.optional cudaSupport '' + mkdir -p $out/bin + ln -s ${cudatoolkit_11}/bin/ptxas $out/bin/ptxas + ''; pythonImportsCheck = [ "jaxlib" ]; meta = with lib; { description = "XLA library for JAX"; - homepage = "https://github.com/google/jax"; - license = licenses.asl20; + homepage = "https://github.com/google/jax"; + license = licenses.asl20; maintainers = with maintainers; [ samuela ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index bfb7f494ce1a..363bfe561346 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -4,7 +4,7 @@ # Build-time dependencies: , addOpenGLRunpath -, bazel_4 +, bazel_5 , binutils , buildBazelPackage , buildPythonPackage @@ -50,7 +50,7 @@ let pname = "jaxlib"; - version = "0.1.75"; + version = "0.3.0"; meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; @@ -82,13 +82,13 @@ let bazel-build = buildBazelPackage { name = "bazel-build-${pname}-${version}"; - bazel = bazel_4; + bazel = bazel_5; src = fetchFromGitHub { owner = "google"; repo = "jax"; rev = "${pname}-v${version}"; - sha256 = "01ks4djbpjsxjy2zwdwv3h00sgwi4ps3jz75swddrw2f56zjdmw4"; + sha256 = "0ndpngx5k6lf6jqjck82bbp0gs943z0wh7vs9gwbyk2bw0da7w72"; }; nativeBuildInputs = [ @@ -216,9 +216,9 @@ let fetchAttrs = { sha256 = if cudaSupport then - "1lyipbflqd1y5cdj4hdml5h1inbr0wwfgp6xw5p5623qv3im16lh" + "1k0rjxqjm703gd9navwzx5x3874b4dxamr62m1fxhm79d271zxis" else - "09kapzpfwnlr6ghmgwac232bqf2a57mm1brz4cvfx8mlg8bbaw63"; + "0ivah1w41jcj13jm740qzwx5h0ia8vbj71pjgd0zrfk3c92kll41"; }; buildAttrs = { @@ -229,12 +229,17 @@ let # 2) Force static protobuf linkage to prevent crashes on loading multiple extensions # in the same python program due to duplicate protobuf DBs. # 3) Patch python path in the compiler driver. + # 4) Patch tensorflow sources to work with later versions of protobuf. See + # https://github.com/google/jax/issues/9534. Note that this should be + # removed on the next release after 0.3.0. preBuild = '' for src in ./jaxlib/*.{cc,h}; do sed -i 's@include/pybind11@pybind11@g' $src done sed -i 's@-lprotobuf@-l:libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD sed -i 's@-lprotoc@-l:libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD + substituteInPlace ../output/external/org_tensorflow/tensorflow/compiler/xla/python/pprof_profile_builder.cc \ + --replace "status.message()" "std::string{status.message()}" '' + lib.optionalString cudaSupport '' patchShebangs ../output/external/org_tensorflow/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl ''; @@ -254,7 +259,13 @@ buildPythonPackage { src = "${bazel-build}/jaxlib-${version}-cp${builtins.replaceStrings ["."] [""] python.pythonVersion}-none-manylinux2010_${stdenv.targetPlatform.linuxArch}.whl"; + # Note that cudatoolkit is necessary since jaxlib looks for "ptxas" in $PATH. + # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 for + # more info. postInstall = lib.optionalString cudaSupport '' + mkdir -p $out/bin + ln -s ${cudatoolkit}/bin/ptxas $out/bin/ptxas + find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do addOpenGLRunpath "$lib" patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:${cudnn}/lib:${nccl}/lib:$(patchelf --print-rpath "$lib")" "$lib" diff --git a/pkgs/development/python-modules/jaxlib/prefetch.sh b/pkgs/development/python-modules/jaxlib/prefetch.sh new file mode 100755 index 000000000000..31db6530639f --- /dev/null +++ b/pkgs/development/python-modules/jaxlib/prefetch.sh @@ -0,0 +1,7 @@ +version="$1" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp310-none-manylinux2010_x86_64.whl)" +nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-none-manylinux2010_x86_64.whl)" diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index c44bfda13313..11534126a18a 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.18.1"; + version = "1.18.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "0xzx32fnm39w916z8wm387ry480rbf7n9qppc18bjdv4jjwgf2rw"; + sha256 = "sha256-yk6Rg9DwilG8OWmT7SF80eYRsRwDwJp+mx2Yv2Gg+ak="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 6989c4257c79..463d3ce5e033 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "3.8.1"; + version = "4.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "db57ee517356b1bfc1603ef412f5da61eae92241ba0bcaf0851028cae424780c"; + sha256 = "sha256-SmeoLuV+NbX2+ff75qDtpj9Wzh3Yr0CbTComozQEV9s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index d9884ab3d9f5..f271920706fa 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -3,9 +3,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, colorama , django -, docopt , pytestCheckHook , parso }: @@ -26,9 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ parso ]; checkInputs = [ - colorama django - docopt pytestCheckHook ]; @@ -50,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/davidhalter/jedi"; description = "An autocompletion tool for Python that can be used for text editors"; - license = licenses.lgpl3Plus; + license = licenses.mit; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 546e56f702f6..a275b97310d9 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jellyfish"; - version = "0.8.9"; + version = "0.9.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "90d25e8f5971ebbcf56f216ff5bb65d6466572b78908c88c47ab588d4ea436c2"; + sha256 = "40c9a2ffd8bd3016f7611d424120442f627f56d518a106847dc93f0ead6ad79a"; }; checkInputs = [ pytest unicodecsv ]; diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index 89b9ba1f6df0..bc5432cb6e3f 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.11.0"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "42ea423f44beafee0e985009124968e300447f6e3be4180e83568cf21520d1b1"; + sha256 = "sha256-gpsot4LW1IBfYt8eb72WJqMzWEAMt4gqWOD1KhTQjds="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 5d7ca68b19b7..7c9971b0c454 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "http://jinja.pocoo.org/"; + homepage = "https://jinja.palletsprojects.com/"; description = "Stand-alone template engine"; license = licenses.bsd3; longDescription = '' diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index c7d8207aa3d9..b22f5ccd73a4 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "jira"; - version = "3.0.1"; + version = "3.1.1"; src = fetchFromGitHub { owner = "pycontribs"; repo = pname; rev = version; - sha256 = "sha256-hAUAzkHPXFDlKEom+dkzr8GQ+sqK2Ci1/k+QuSNvifE="; + sha256 = "04s2zgwxip54g894hps2cm081cp07mbi7qipmsv4dvailhsg43nn"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jmp/default.nix b/pkgs/development/python-modules/jmp/default.nix index dc096b93ae46..09c41a7ededd 100644 --- a/pkgs/development/python-modules/jmp/default.nix +++ b/pkgs/development/python-modules/jmp/default.nix @@ -19,10 +19,9 @@ buildPythonPackage rec { sha256 = "0hh4cmp93wjyidj48gh07vhx2kjvpwd23xvy79bsjn5qaaf6q4cm"; }; - # Wheel requires only `numpy`, but the import needs both `jax` and `jaxlib`. + # Wheel requires only `numpy`, but the import needs `jax`. propagatedBuildInputs = [ jax - jaxlib ]; pythonImportsCheck = [ @@ -30,6 +29,7 @@ buildPythonPackage rec { ]; checkInputs = [ + jaxlib pytestCheckHook ]; diff --git a/pkgs/development/python-modules/johnnycanencrypt/default.nix b/pkgs/development/python-modules/johnnycanencrypt/default.nix index 2f7921374e75..9f247c2d7569 100644 --- a/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -18,20 +18,20 @@ buildPythonPackage rec { pname = "johnnycanencrypt"; - version = "0.5.0"; + version = "0.6.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kushaldas"; repo = "johnnycanencrypt"; rev = "v${version}"; - sha256 = "192wfrlyylrpzq70yki421mi1smk8q2cyki2a1d03q7h6apib3j4"; + sha256 = "0b1yfddf38dicmjgnw9mk5g0iisa5yq6l9cj6kfskhyrznasvz3g"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit patches src; name = "${pname}-${version}"; - hash = "sha256-2XhXCKyXVlFgbcOoMy/A5ajiIVxBii56YeI29mO720U="; + hash = "sha256-1dRFC59GY7M99LvQWy2eXPesmLX5k46rN8l4suLYkQY="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index c091480f63c6..036b60e9eca2 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -1,28 +1,25 @@ { lib -, fetchPypi , buildPythonPackage , cryptography +, fetchPypi , pyopenssl -, setuptools -, mock , pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "josepy"; - version = "1.11.0"; + version = "1.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "40ef59f2f537ec01bafe698dad66281f6ccf4642f747411647db403ab8fa9a2d"; + sha256 = "267004a64f08c016cd54b7aaf7c323fa3ef3679fb62f4b086cd56448d0fecb25"; }; - postPatch = '' - # remove coverage flags - sed -i '/addopts/d' pytest.ini - sed -i '/flake8-ignore/d' pytest.ini - ''; - propagatedBuildInputs = [ pyopenssl cryptography @@ -30,15 +27,23 @@ buildPythonPackage rec { ]; checkInputs = [ - mock pytestCheckHook ]; + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --flake8 --cov-report xml --cov-report=term-missing --cov=josepy --cov-config .coveragerc" "" + sed -i '/flake8-ignore/d' pytest.ini + ''; + + pythonImportsCheck = [ + "josepy" + ]; + meta = with lib; { description = "JOSE protocol implementation in Python"; homepage = "https://github.com/jezdez/josepy"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ]; }; } - diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix index 442267b52ea0..92c78895eb62 100644 --- a/pkgs/development/python-modules/jpylyzer/default.nix +++ b/pkgs/development/python-modules/jpylyzer/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "jpylyzer"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "openpreserve"; repo = pname; rev = version; - sha256 = "01wfbb1bgby9b7m6q7483kvpyc1qhj80dg8d5a6smcxvmy8y6x5n"; + sha256 = "1cd9klq83g9p4nkg7x78axqid5vcsqzggp431hcfdiixa50yjxjg"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix index 3833bf9850f8..ed80bc9f81f7 100644 --- a/pkgs/development/python-modules/jq/default.nix +++ b/pkgs/development/python-modules/jq/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jq"; - version = "1.2.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "73ce588025495e6ebcda20bb9e64b6d9f3f1657c22895143ae243899ac710cbc"; + sha256 = "sha256-hqzixD8XtaZKOIh+3nLHuM4qsLz6ge4o/2Q06TUBCr4="; }; patches = [ diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index a0818e1e571f..746619a61445 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -1,21 +1,45 @@ -{ lib, fetchPypi, buildPythonApplication, editorconfig, pytest, six }: +{ lib +, fetchPypi +, buildPythonApplication +, editorconfig +, pytestCheckHook +, pythonOlder +, six +}: buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.14.0"; + version = "1.14.1"; + format = "setuptools"; - propagatedBuildInputs = [ six editorconfig ]; - checkInputs = [ pytest ]; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "84fdb008d8af89619269a6aca702288b48f837a99427a0f529aa57ecfb36ee3c"; + hash = "sha256-ZfT3dLDkywIutJmbRc1ndi92Qnxe80CCq6VLwdjvI+s="; }; + propagatedBuildInputs = [ + editorconfig + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "jsbeautifier" + ]; + + pytestFlagsArray = [ + "jsbeautifier/tests/testindentation.py" + ]; + meta = with lib; { - homepage = "http://jsbeautifier.org"; - description = "JavaScript unobfuscator and beautifier."; - license = licenses.mit; + description = "JavaScript unobfuscator and beautifier"; + homepage = "http://jsbeautifier.org"; + license = licenses.mit; maintainers = with maintainers; [ apeyroux ]; }; } diff --git a/pkgs/development/python-modules/jschema-to-python/default.nix b/pkgs/development/python-modules/jschema-to-python/default.nix index a9100e061d7b..5b25b5c18a4b 100644 --- a/pkgs/development/python-modules/jschema-to-python/default.nix +++ b/pkgs/development/python-modules/jschema-to-python/default.nix @@ -15,13 +15,10 @@ buildPythonPackage rec { sha256 = "76ff14fe5d304708ccad1284e4b11f96a658949a31ee7faed9e0995279549b91"; }; - nativeBuildInputs = [ - pbr - ]; - propagatedBuildInputs = [ attrs jsonpickle + pbr ]; checkInputs =[ diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index aa70a35bd079..a9faf437f80f 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.39.5"; + version = "0.40"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = pname; rev = "v${version}"; - hash = "sha256-gaholnLO5oIQaXgliuvlU2MfpjiCMgAPplOPgvMYim8="; + hash = "sha256-H0jvOnrWE4/xxRYNehshHBRNc/qLX1+sCV7O1ACCdew="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index d16fa89a97c4..4892d72aae91 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "jsonlines"; - version = "1.2.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "wbolster"; repo = pname; rev = version; - sha256 = "1f8zsqy8p9a41gqg2a5x7sppc5qhhq7gw58id2aigb270yxzs7jw"; + sha256 = "1242bvk208vjaw8zl1d7ydb0i05v8fwdgi92d3bi1vaji9s2hv65"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index 0ad388db3292..f049e2a09d3d 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonrpclib-pelix"; - version = "0.4.3.1"; + version = "0.4.3.2"; src = fetchPypi { inherit pname version; - sha256 = "f6f376c72ec1c0dfd69fcc2721d711f6ca1fe22bf71f99e6884c5e43e9b58c95"; + sha256 = "sha256-6eCzPvqPog2BfdeN/Z5M2zlnyKXTy1p4O+HugcSonHw="; }; doCheck = false; # test_suite="tests" in setup.py but no tests in pypi. diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index b78165fc4f32..dd2a47f1bcb6 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -1,38 +1,59 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 +{ lib , attrs -, functools32 +, buildPythonPackage +, fetchPypi , importlib-metadata -, mock -, nose +, importlib-resources , pyperf , pyrsistent +, pytestCheckHook +, pythonOlder , setuptools-scm , twisted -, vcversioner +, typing-extensions }: buildPythonPackage rec { pname = "jsonschema"; - version = "3.2.0"; + version = "4.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"; + sha256 = "636694eb41b3535ed608fe04129f26542b59ed99808b4f688aa32dcf55317a83"; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ]; - checkInputs = [ nose mock pyperf twisted vcversioner ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - # zope namespace collides on py27 - doCheck = !isPy27; - checkPhase = '' - nosetests - ''; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + pyrsistent + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + typing-extensions + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; + + checkInputs = [ + pyperf + pytestCheckHook + twisted + ]; + + pythonImportsCheck = [ + "jsonschema" + ]; meta = with lib; { - homepage = "https://github.com/Julian/jsonschema"; description = "An implementation of JSON Schema validation for Python"; + homepage = "https://github.com/Julian/jsonschema"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix new file mode 100644 index 000000000000..ffcde4a5b216 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, jupyter_server +}: + +buildPythonPackage rec { + pname = "jupyter-lsp"; + version = "1.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-dRq9NUE76ZpDMfNZewk0Gtx1VYntMgkawvaG2z1hJn4="; + }; + + propagatedBuildInputs = [ + jupyter_server + ]; + # tests require network + doCheck = false; + pythonImportsCheck = [ "jupyter_lsp" ]; + + meta = with lib; { + description = "Multi-Language Server WebSocket proxy for your Jupyter notebook or lab server"; + homepage = "https://pypi.org/project/jupyter-lsp"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ doronbehar ]; + }; +} + diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index c3971c687505..b1389889b59a 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -16,7 +16,7 @@ }: buildPythonPackage rec { - version = "2021.08.0"; + version = "2022.02.0"; pname = "jupyter-repo2docker"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "jupyterhub"; repo = "repo2docker"; rev = version; - sha256 = "10hcdag7ivyqyiqrmr9c48zynp8d81ic3px1ffgnaysih7lvkwb6"; + sha256 = "sha256-L7jUaGRea5HJnb/SX2K2qfvtFwkq9jfhrpvsu+LHH3M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index 47f5f8e58407..cd5e1e0f7620 100644 --- a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "jupyter-server-mathjax"; - version = "0.2.3"; + version = "0.2.5"; src = fetchPypi { inherit version; pname = "jupyter_server_mathjax"; - sha256 = "564e8d1272019c6771208f577b5f9f2b3afb02b9e2bff3b34c042cef8ed84451"; + sha256 = "sha256-ZNlsjm3+btunN5ArLcOi3AWPF1FndsJfTTDKJGF+57M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index a90fa0eb9a13..66344e408a8f 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -149,6 +149,8 @@ buildPythonPackage rec { "test_upgrade" # Testcase fails to find requests import "test_external_service" + # attempts to do ssl connection + "test_connection_notebook_wrong_certs" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix index 46c76ebfe20e..9d2907072e62 100644 --- a/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.34.0"; + version = "0.34.1"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - sha256 = "3b9ee3a577834c0f021d41069be7b03068297ce0c2a73c76b17e8018eb3eb62f"; + sha256 = "c7a03f526eb19175df73fedd5dee3cdae2d39e0474eef8f55c1c55b219ab26d9"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix new file mode 100644 index 000000000000..276632a327c5 --- /dev/null +++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, jupyterlab +, jupyter-lsp +}: + +buildPythonPackage rec { + pname = "jupyterlab-lsp"; + version = "3.10.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-mtbvIsSXK4VIB5cDT8eRRyjrePGFa02rM2Fobk8gyd0="; + }; + + propagatedBuildInputs = [ + jupyterlab + jupyter-lsp + ]; + # No tests + doCheck = false; + pythonImportsCheck = [ "jupyterlab_lsp" ]; + + meta = with lib; { + description = "Language Server Protocol integration for Jupyter(Lab)"; + homepage = "https://github.com/jupyter-lsp/jupyterlab-lsp"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix index 92b341a591c7..26794fbc77b5 100644 --- a/pkgs/development/python-modules/jupyterlab-widgets/default.nix +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "jupyterlab-widgets"; - version = "1.0.2"; + version = "2.0.0b1"; src = fetchPypi { pname = "jupyterlab_widgets"; inherit version; - sha256 = "7885092b2b96bf189c3a705cc3c412a4472ec5e8382d0b47219a66cccae73cfa"; + sha256 = "1xinfk3bhqmfp9ygfpi8b87h4ky8dv3sdr96035psx1jjgyyw8bi"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 88c3d39ccf0e..fbea0935ff30 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.2.6"; + version = "3.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "04e763974010f0f424ee889238fa488ee11708d0546e6df6e2cad9e0fc724bdb"; + sha256 = "sha256-PHFr9VkssoxcVcYVxuW9PvxxiY9pV9E3GbVkeLu7WHo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index 777f82a3e5ad..6e0668de1470 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , GitPython +, isort , jupyter-client , jupyter-packaging , jupyterlab @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.13.5"; + version = "1.13.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "mwouts"; repo = pname; rev = "v${version}"; - sha256 = "0rapp2baqml1z3n8k7ijf5461b3p8wgr45y3njz54q75v0jk7v45"; + sha256 = "sha256-DWK5ZoPL6Ek3dXHOlZfecQKLNwBqDjMZ77XZ7YLCXKI="; }; buildInputs = [ @@ -44,6 +45,7 @@ buildPythonPackage rec { checkInputs = [ GitPython + isort jupyter-client notebook pytestCheckHook @@ -65,6 +67,10 @@ buildPythonPackage rec { "--ignore-glob='tests/test_pre_commit_*.py'" ]; + disabledTests = [ + "test_apply_black_through_jupytext" # we can't do anything about ill-formatted notebooks + ]; + pythonImportsCheck = [ "jupytext" "jupytext.cli" diff --git a/pkgs/development/python-modules/jxmlease/default.nix b/pkgs/development/python-modules/jxmlease/default.nix index 727548f21d50..5036ede5e5e9 100644 --- a/pkgs/development/python-modules/jxmlease/default.nix +++ b/pkgs/development/python-modules/jxmlease/default.nix @@ -18,6 +18,10 @@ buildPythonPackage rec { lxml ]; + # tests broken in expat bump + # https://github.com/Juniper/jxmlease/issues/26 + doCheck = false; + checkPhase = '' runHook preCheck ${python.interpreter} -m unittest discover -v diff --git a/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch b/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch index 4ebe5472b44a..597907c14be6 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch +++ b/pkgs/development/python-modules/kaldi-active-grammar/0001-stub.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 66e6d49..78f7b42 100644 +index 17c7032..12ed398 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,23 +1,6 @@ +@@ -1,87 +1,12 @@ cmake_minimum_required(VERSION 3.13.0) project(kaldi_binaries) @@ -24,9 +24,8 @@ index 66e6d49..78f7b42 100644 -endif() - set(BINARIES - tools/openfst/bin/fstarcsort${CMAKE_EXECUTABLE_SUFFIX} - tools/openfst/bin/fstcompile${CMAKE_EXECUTABLE_SUFFIX} -@@ -29,63 +12,6 @@ set(LIBRARIES + ) + set(LIBRARIES src/lib/libkaldi-dragonfly${CMAKE_SHARED_LIBRARY_SUFFIX} ) @@ -87,30 +86,33 @@ index 66e6d49..78f7b42 100644 - message(FATAL_ERROR "KALDI_BRANCH not set! Use 'origin/master'?") - # set(KALDI_BRANCH "origin/master") -endif() - +- message("MAKE_EXE = ${MAKE_EXE}") message("PYTHON_EXECUTABLE = ${PYTHON_EXECUTABLE}") -@@ -99,63 +25,4 @@ message("CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}") + message("PYTHON_INCLUDE_DIR = ${PYTHON_INCLUDE_DIR}") +@@ -94,65 +19,4 @@ message("CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}") # CXXFLAGS are set and exported in kaldi-configure-wrapper.sh -if(NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") - set(STRIP_LIBS_COMMAND find src/lib tools/openfst/lib -name *${CMAKE_SHARED_LIBRARY_SUFFIX} | xargs strip) -- set(STRIP_DST_COMMAND find ${DST} | xargs strip) +- # set(STRIP_DST_COMMAND find ${DST} [[[other specifiers]]] | xargs strip) - if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin") - list(APPEND STRIP_LIBS_COMMAND -x) -- list(APPEND STRIP_DST_COMMAND -x) +- # list(APPEND STRIP_DST_COMMAND -x) - endif() +- # set(STRIP_LIBS_COMMAND true) +- set(STRIP_DST_COMMAND true) - ExternalProject_Add(kaldi - GIT_CONFIG advice.detachedHead=false - GIT_REPOSITORY https://github.com/daanzu/kaldi-fork-active-grammar.git - GIT_TAG ${KALDI_BRANCH} - GIT_SHALLOW TRUE -- CONFIGURE_COMMAND sed -i.bak -e "s/status=0/exit 0/g" tools/extras/check_dependencies.sh && cp ${PROJECT_SOURCE_DIR}/building/kaldi-configure-wrapper.sh src/ +- CONFIGURE_COMMAND sed -i.bak -e "s/status=0/exit 0/g" tools/extras/check_dependencies.sh && sed -i.bak -e "s/openfst_add_CXXFLAGS = -g -O2/openfst_add_CXXFLAGS = -g0 -O3/g" tools/Makefile && cp ${PROJECT_SOURCE_DIR}/building/kaldi-configure-wrapper.sh src/ - BUILD_IN_SOURCE TRUE -- BUILD_COMMAND ${MATHLIB_BUILD_COMMAND} && cd tools && ${MAKE_EXE} ${MAKE_FLAGS} && cd openfst && autoreconf && cd ../../src && bash ./kaldi-configure-wrapper.sh ./configure ${KALDI_CONFIG_FLAGS} && ${MAKE_EXE} ${MAKE_FLAGS} depend && ${MAKE_EXE} ${MAKE_FLAGS} dragonfly dragonflybin bin fstbin lmbin +- BUILD_COMMAND ${MATHLIB_BUILD_COMMAND} && cd tools && ${MAKE_EXE} ${MAKE_FLAGS} && cd openfst && autoreconf && cd ../../src && bash ./kaldi-configure-wrapper.sh ./configure ${KALDI_CONFIG_FLAGS} && ${MAKE_EXE} ${MAKE_FLAGS} depend && ${MAKE_EXE} ${MAKE_FLAGS} dragonfly - LIST_SEPARATOR " " -- INSTALL_COMMAND ${STRIP_LIBS_COMMAND} && mkdir -p ${DST} && cp ${BINARIES} ${LIBRARIES} ${DST} +- INSTALL_COMMAND ${STRIP_LIBS_COMMAND} && mkdir -p ${DST} && cp ${BINARIES} ${LIBRARIES} ${DST} && ${STRIP_DST_COMMAND} - ) -endif() - diff --git a/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch b/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch index 60f50d707db0..3a45ea7e104d 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch +++ b/pkgs/development/python-modules/kaldi-active-grammar/0002-exec-path.patch @@ -1,5 +1,5 @@ diff --git a/kaldi_active_grammar/utils.py b/kaldi_active_grammar/utils.py -index 0b70c7f..21e1d62 100644 +index 823f997..3850336 100644 --- a/kaldi_active_grammar/utils.py +++ b/kaldi_active_grammar/utils.py @@ -79,7 +79,7 @@ elif sys.platform.startswith('linux'): platform = 'linux' @@ -8,10 +8,10 @@ index 0b70c7f..21e1d62 100644 -exec_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'exec', platform) +exec_dir = '/' - library_extension = dict(windows='.dll', linux='.so', macos='.dylib')[platform] - subprocess_seperator = '^&' if platform == 'windows' else ';' -@@ -89,13 +89,13 @@ class ExternalProcess(object): + import ush + +@@ -87,13 +87,13 @@ class ExternalProcess(object): shell = ush.Shell(raise_on_error=True) diff --git a/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/pkgs/development/python-modules/kaldi-active-grammar/default.nix index f7d4738ebcab..46fc619b4cb3 100644 --- a/pkgs/development/python-modules/kaldi-active-grammar/default.nix +++ b/pkgs/development/python-modules/kaldi-active-grammar/default.nix @@ -17,13 +17,13 @@ let in buildPythonPackage rec { pname = "kaldi-active-grammar"; - version = "2.1.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "daanzu"; repo = pname; rev = "v${version}"; - sha256 = "ArbwduoH7mMmIjlFfYAFvcpR39rrkVUJhYEyQzZqsbY="; + sha256 = "0lilk6yjzcy31avy2z36bl9lr60gzwhmyqwqn8akq11qc3mbffsk"; }; KALDI_BRANCH = "foo"; @@ -50,6 +50,8 @@ buildPythonPackage rec { nativeBuildInputs = [ scikit-build cmake ]; propagatedBuildInputs = [ ush requests numpy cffi ]; + doCheck = false; # no tests exist + meta = with lib; { description = "Python Kaldi speech recognition"; homepage = "https://github.com/daanzu/kaldi-active-grammar"; diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix index 71170ac5342e..ab092fc25605 100644 --- a/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , karton-core , malduck +, pythonOlder }: buildPythonPackage rec { pname = "karton-config-extractor"; - version = "2.0.1"; + version = "2.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "1kq0gbfz9y0n0bcblyrmwv4la3lcf86lf80794sdvyvn49g0brny"; + sha256 = "sha256-r0WMtfau5zeVDSjxy2h96INQl8bm4EP0IAcgnGPhTtk="; }; propagatedBuildInputs = [ @@ -28,7 +32,10 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "karton.config_extractor" ]; + + pythonImportsCheck = [ + "karton.config_extractor" + ]; meta = with lib; { description = "Static configuration extractor for the Karton framework"; diff --git a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix index 65bb683be2b8..f976e3fedba3 100644 --- a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix +++ b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , karton-core , mwdblib +, pythonOlder }: buildPythonPackage rec { pname = "karton-mwdb-reporter"; - version = "1.0.1"; + version = "unstable-2022-02-22"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "0jrn5c83nhcjny4bc879wrsgcr7mbazm51jzdkxmxyqf543cc841"; + rev = "1afa32251b4826eac4386596b4a20f295699faec"; + hash = "sha256-dbtIjWSNIRMccrGJspZMOBUD2EzuvW7xESlEwiOhKfQ="; }; propagatedBuildInputs = [ @@ -21,14 +25,12 @@ buildPythonPackage rec { mwdblib ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "mwdblib==3.4.0" "mwdblib" - ''; - # Project has no tests doCheck = false; - pythonImportsCheck = [ "karton.mwdb_reporter" ]; + + pythonImportsCheck = [ + "karton.mwdb_reporter" + ]; meta = with lib; { description = "Karton service that uploads analyzed artifacts and metadata to MWDB Core"; diff --git a/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix b/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix new file mode 100644 index 000000000000..d77dc444f80d --- /dev/null +++ b/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-auth +, keyring +, pluggy +, requests +, setuptools-scm +, toml +}: + +buildPythonPackage rec { + pname = "keyrings.google-artifactregistry-auth"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-gvoX5SP0A39Ke0VRlplETJF8gIP+QzK6xNReRxM8UnA="; + }; + + buildInputs = [ + setuptools-scm + toml + ]; + + propagatedBuildInputs = [ + google-auth + keyring + pluggy + requests + ]; + + pythonImportsCheck = [ + "keyrings.gauth" + ]; + + + meta = with lib; { + description = "Python package which allows you to configure keyring to interact with Python repositories stored in Artifact Registry"; + homepage = "https://pypi.org/project/keyrings.google-artifactregistry-auth"; + license = licenses.asl20; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index cecbc6fd1d26..e4886e08c2d6 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "4.4.0"; + version = "4.5.0"; src = fetchPypi { inherit pname version; - sha256 = "34662a6be67ab29424aabe6f99a8d7eb6b88d293109a07e60fea123ebffb314f"; + sha256 = "sha256-SbNIiWakPusCAOpRG5l+ZAPCXVY6mExjMOgqDr/EVAw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/kiss-headers/default.nix b/pkgs/development/python-modules/kiss-headers/default.nix new file mode 100644 index 000000000000..0ceced85cacf --- /dev/null +++ b/pkgs/development/python-modules/kiss-headers/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests, pytestCheckHook }: + +buildPythonPackage rec { + pname = "kiss-headers"; + version = "2.3.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Ousret"; + repo = pname; + rev = version; + sha256 = "sha256-/eTRyxFyAKQMzE/JjdoEN3w0lRiaIJcsJHTWV8M0CYQ="; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytestCheckHook ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=kiss_headers --doctest-modules --cov-report=term-missing -rxXs" "--doctest-modules -rxXs" + ''; + + disabledTestPaths = [ + # Tests require internet access + "kiss_headers/__init__.py" + "tests/test_serializer.py" + "tests/test_with_http_request.py" + ]; + + pythonImportsCheck = [ "kiss_headers" ]; + + meta = with lib; { + description = "Python package for HTTP/1.1 style headers"; + homepage = "https://github.com/Ousret/kiss-headers"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index bb39b29c0d51..be4f4aad5665 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.2.3"; + version = "5.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gakMHel+CNPbN9vxY+qvZnRF4QaMmL/YnwUaQOn2270="; + hash = "sha256-N87j7nJflOqLsXPqq3wXYCA+pTu+uuImMoYA+dJ5lhA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 3df049c1cec6..2342ec5bde4a 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -54,6 +55,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # AssertionError: != + "test_rest_proxycare" + ]; + meta = with lib; { description = "Kubernetes python client"; homepage = "https://github.com/kubernetes-client/python"; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index ba7579d10670..c89782d4027e 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.10.0"; + version = "3.11.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "v${version}"; - sha256 = "0afrzxy8hmsvqp84mf89k7sqlzzyh6xwp2pz5abj0981mqlzf2x9"; + sha256 = "114h9phvbdknyvqdnjba3pd7i4iznffhgx9d569lq0hfla3hl61a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark/default.nix similarity index 65% rename from pkgs/development/python-modules/lark-parser/default.nix rename to pkgs/development/python-modules/lark/default.nix index c1c67fd4c1ea..8fc32539d69d 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -3,31 +3,35 @@ , fetchFromGitHub , python , regex +, pytestCheckHook }: buildPythonPackage rec { - pname = "lark-parser"; - version = "0.12.0"; + pname = "lark"; + version = "1.1.2"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "sha256-zcMGCn3ixD3dJg3GlC/ijs+U1JN1BodHLTXZc/5UR7Y="; + sha256 = "sha256-Y1bDSiFnqAKTlIcd8aAgtc+I3TLnWF8hhQK2ez96TQs="; }; # Optional import, but fixes some re known bugs & allows advanced regex features propagatedBuildInputs = [ regex ]; - checkPhase = '' - runHook preCheck + pythonImportsCheck = [ + "lark" + "lark.parsers" + "lark.tools" + "lark.grammars" + ]; - # Official way to run the tests. Runs unittest internally. - # pytest produces issues with some test resource paths (relies on __main__) - ${python.interpreter} -m tests + checkInputs = [ pytestCheckHook ]; - runHook postCheck - ''; + disabledTestPaths = [ + "tests/test_nearley/test_nearley.py" # requires unpackaged Js2Py library + ]; meta = with lib; { description = "A modern parsing library for Python, implementing Earley & LALR(1) and an easy interface"; diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 09232cbc6242..0619a62fa32d 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.6.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726"; + sha256 = "d609c75b986def706743cdebe5e47553f4a5a1da9c5ff66d76013ef396b5a8a4"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index a094bf6b37e6..f88e14d0a3e7 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -24,13 +24,13 @@ buildPythonPackage rec { pname = "lektor"; - version = "3.1.3"; + version = "3.3.1"; src = fetchFromGitHub { owner = "lektor"; repo = "lektor"; rev = version; - sha256 = "16qw68rz5q77w84lwyhjpfd3bm4mfrhcjrnxwwnz3vmi610h68hx"; + sha256 = "04gn3jybqf9wc6l9mi0djpki60adnk7gppmv987ik676k5x8f1kk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 77aa9e2927a5..d46e86ca106b 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.4.1"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iPGNoM8/rAr3I+dD+3QdnRviUYge2reloNFimVW1ARs="; + sha256 = "sha256-Bz8QSSl2+qODoisTuCwkmCfP6QoIPHFiDoMW6BWm2zs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index 774cb572e95b..0c4a8985e401 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -1,11 +1,9 @@ { lib -, black , buildPythonPackage , dataclasses , fetchFromGitHub , hypothesis -, isort -, pytest +, pytestCheckHook , python , pythonOlder , pyyaml @@ -50,9 +48,7 @@ buildPythonPackage rec { ]; checkInputs = [ - black - isort - pytest + pytestCheckHook ]; preCheck = '' diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index cb8f4c023bc2..21a58e7e9817 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.8.1"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "c53d05e768ae4a3e553ae21c2e5015293e5efbfd5c12d497f1104cb519cca6b3"; + sha256 = "sha256-ftXW4/RUbl48KEBpH53cVoePkUo1pQBg31/KKybUthQ="; }; propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ]; diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 5b251f842bff..7a7e116aa221 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -1,21 +1,32 @@ -{ lib, fetchPypi, buildPythonPackage, pytest }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, poetry-core +, pytestCheckHook +, pkgs +}: buildPythonPackage rec { pname = "libtmux"; - version = "0.10.2"; + version = "0.10.3"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "a0e958b85ec14cdaabecfa738a0dd51846f05e5c5e9d6749a2bf5160b9f7e1d2"; + src = fetchFromGitHub { + owner = "tmux-python"; + repo = pname; + rev = "v${version}"; + hash = "sha256:0syj8m4x2mcq96b76b7h75dsmcai22m15pfgkk90rpg7rp6sn772"; }; - checkInputs = [ pytest ]; - postPatch = '' - sed -i 's/==.*$//' requirements/test.txt - ''; + nativeBuildInputs = [ + poetry-core + ]; - # No tests in archive - doCheck = false; + checkInputs = [ + pkgs.procps + pkgs.tmux + pytestCheckHook + ]; meta = with lib; { description = "Scripting library for tmux"; diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index f1b474b960f6..da84d890eced 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "2.0.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d3ba82ecf7ab6a48d21dac6697e26504670cc3522b8e5941bd28fb56cf3f6c46"; + sha256 = "5792a9defee40f15d330a40d9b1800545c32e47ba7fc66b6f28f133c9fcc8538"; }; postPatch = '' diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index a8e21a698f7f..d69885fcb0f3 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "libvirt"; - version = "7.10.0"; + version = "8.1.0"; src = assert version == libvirt.version; fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-I1FNjNwWRyDAUSq2Co9EnjAbzKQtS0Rx8vHgPsFzSYw="; + sha256 = "sha256-/uGxjptiqm5B823z4mcjredj9ZLZC2WTTqhQrQPVfDU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/lightwave/default.nix b/pkgs/development/python-modules/lightwave/default.nix new file mode 100644 index 000000000000..ba937f7700d9 --- /dev/null +++ b/pkgs/development/python-modules/lightwave/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "lightwave"; + version = "0.20"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-jhffMDhgQ257ZQxvidiRgBSnZvzLJFKNU2NZ8AyGTGc="; + }; + + pythonImportsCheck = [ + "lightwave" + ]; + + # Requires phyiscal hardware + doCheck = false; + + meta = with lib; { + description = "Module for interacting with LightwaveRF hubs"; + homepage = "https://github.com/GeoffAtHome/lightwave"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/lightwave2/default.nix b/pkgs/development/python-modules/lightwave2/default.nix index 61bb86b8f769..f840a2186cfb 100644 --- a/pkgs/development/python-modules/lightwave2/default.nix +++ b/pkgs/development/python-modules/lightwave2/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "lightwave2"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "2f18ee4aba0431236a4c48a032de6714cfb56ff1e97c86d48cfe619eb961b21a"; + sha256 = "sha256-UULOQawsY2N0xxYlgIZKs8Xyl0XDqC6fSSKvo8ZBEcY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/limiter/default.nix b/pkgs/development/python-modules/limiter/default.nix index 1d496c2cf08d..f550651c104d 100644 --- a/pkgs/development/python-modules/limiter/default.nix +++ b/pkgs/development/python-modules/limiter/default.nix @@ -2,12 +2,13 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, strenum , token-bucket }: buildPythonPackage rec { pname = "limiter"; - version = "0.2.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -16,19 +17,15 @@ buildPythonPackage rec { owner = "alexdelorenzo"; repo = pname; rev = "v${version}"; - hash = "sha256-h3XiCR/8rcCBwdhO6ExrrUE9piba5mssad3+t41scSk="; + hash = "sha256-2Et4ozVf9t+tp2XtLbDk/LgLIU+jQAEAlU8hA5lpxdk="; }; propagatedBuildInputs = [ + strenum token-bucket ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "token-bucket==0.2.0" "token-bucket>=0.2.0" - ''; - - # Project has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 4c4f7a32133b..9a19dda15789 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "limits"; - version = "1.6"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "6c0a57b42647f1141f5a7a0a8479b49e4367c24937a01bd9d4063a595c2dd48a"; + sha256 = "da6346f0dcf85f17f0f1cc709c3408a3058cf6fee68313c288127c287237b411"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 7a4e93f9ddd3..27550c30dbfe 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.1.1.post1"; + version = "2022.3.17"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-9p06yD95emBOFKtTZMVR/3ySAB24pB3QRmzVEnqeb9U="; + hash = "sha256-sSZFbEDlkc+F0PIwvseVEBoQQZVTFypW2nvLmPDD4u0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index e3b9e3bb7c8a..637a4deb3abb 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.37.0"; + version = "0.38.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6392b870cd018ec0c645d6bbb918d6aa0eeca8c62674baaee30862d6b6865b15"; + sha256 = "a99d166ccf3b116f3b9ed23b9b70ba2415640a9c978f3aaa13fad49c58f4965c"; }; nativeBuildInputs = [ llvm ]; diff --git a/pkgs/development/python-modules/localimport/default.nix b/pkgs/development/python-modules/localimport/default.nix index 3c41618d5b83..c5bc45aae4f2 100644 --- a/pkgs/development/python-modules/localimport/default.nix +++ b/pkgs/development/python-modules/localimport/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "localimport"; - version = "1.7.3"; + version = "1.7.6"; src = fetchPypi { inherit pname version; - hash = "sha256-p7ACOzJRwH9hICMcxtVt/r+twEoFsDxPKGuarFnFIbo="; + hash = "sha256-8UhaZyGdN/N6UwR7pPYQR2hZCz3TrBxr1KOBJRx28ok="; }; pythonImportsCheck = [ "localimport" ]; diff --git a/pkgs/development/python-modules/locationsharinglib/default.nix b/pkgs/development/python-modules/locationsharinglib/default.nix index 42cf477ca160..2004f962098b 100644 --- a/pkgs/development/python-modules/locationsharinglib/default.nix +++ b/pkgs/development/python-modules/locationsharinglib/default.nix @@ -6,7 +6,6 @@ , emoji , fetchPypi , nose -, python , pythonOlder , pytz , requests @@ -46,7 +45,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck # Only coverage no real unit tests - ${python.interpreter} setup.py nosetests + nosetests runHook postCheck ''; diff --git a/pkgs/development/python-modules/logical-unification/default.nix b/pkgs/development/python-modules/logical-unification/default.nix new file mode 100644 index 000000000000..b89fcb25339e --- /dev/null +++ b/pkgs/development/python-modules/logical-unification/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, toolz +, multipledispatch +, pytestCheckHook +, pytest-html +, pytest-benchmark +}: + +buildPythonPackage rec { + pname = "logical-unification"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "unification"; + rev = "707cf4a39e27a4a8bf06b7e7dce7223085574e65"; + sha256 = "sha256-3wqO0pWWFRQeoGNvbSDdLNYFyjNnv+O++F7+vTBUJoI="; + }; + + propagatedBuildInputs = [ + toolz + multipledispatch + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + pytest-benchmark # Needed for the `--benchmark-skip` flag + ]; + + pytestFlagsArray = [ + "--benchmark-skip" + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "unification" ]; + + meta = with lib; { + description = "Straightforward unification in Python that's extensible via generic functions"; + homepage = "https://github.com/pythological/unification"; + changelog = "https://github.com/pythological/unification/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index 3c5bff1382b9..1a7982026bcd 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "loguru"; - version = "0.5.3"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b28e72ac7a98be3d28ad28570299a393dfcd32e5e3f6a353dec94675767b6319"; + sha256 = "sha256-BmvQZ1jQpRPpg2/ZxrWnW/s/02hB9LmWvGC1R6MJ1Bw="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ @@ -30,19 +30,6 @@ buildPythonPackage rec { colorama ]; - patches = [ - # Fixes tests with pytest>=6.2.2. Will be part of the next release after 0.5.3 - (fetchpatch { - url = "https://github.com/Delgan/loguru/commit/31cf758ee9d22dbfa125f38153782fe20ac9dce5.patch"; - sha256 = "1lzbs8akg1s7s6xjl3samf4c4bpssqvwg5fn3mwlm4ysr7jd5y67"; - }) - # Fix tests with Python 3.9 - (fetchpatch { - url = "https://github.com/Delgan/loguru/commit/19f518c5f1f355703ffc4ee62f0e1e397605863e.patch"; - sha256 = "0yn6smik58wdffr4svqsy2n212fwdlcfcwpgqhl9hq2zlivmsdc6"; - }) - ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_multiprocessing.py" ]; diff --git a/pkgs/development/python-modules/loo-py/default.nix b/pkgs/development/python-modules/loo-py/default.nix index 16060c1c030e..d16b06a284ab 100644 --- a/pkgs/development/python-modules/loo-py/default.nix +++ b/pkgs/development/python-modules/loo-py/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "loo-py"; - version = "2017.2"; + version = "2020.2"; src = fetchPypi { pname = "loo.py"; inherit version; - sha256 = "c656992de48b328cdaccd7d1f14eb522b9dd5a1d0d15f54623f4ab18fd219abc"; + sha256 = "c0aba31f8b61f6487e84120a154fab862d19c3b374ad4285b987c4f2d746d51f"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 36b6efa724e2..6dac34a9f7a8 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.15.1"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - sha256 = "sha256-j8Vzr83pvl/AnXfA+nl5uRXf+y6ndKmQHM3bl306wFM="; + sha256 = "sha256-1beURMpQ2klwupcd4wJZud6MnAKzwXPvVlobk/eSvXo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/luddite/default.nix b/pkgs/development/python-modules/luddite/default.nix index 7e8a1c5dfedd..46a5f2952902 100644 --- a/pkgs/development/python-modules/luddite/default.nix +++ b/pkgs/development/python-modules/luddite/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Checks for out-of-date package versions"; homepage = "https://github.com/jumptrading/luddite"; license = licenses.asl20; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix index 681ef649d8fb..b2099e162d20 100644 --- a/pkgs/development/python-modules/lupa/default.nix +++ b/pkgs/development/python-modules/lupa/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "lupa"; - version = "1.10"; + version = "1.13"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4lEbJ/OB9v22bvQNzFGCFQOBl0MbJBk1Z438PVEXgjE="; + sha256 = "sha256-4dlKwqYw0nECfawsIdFCh3HZ6p1NiPFfIKd4E0DwKk4="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/lupupy/default.nix b/pkgs/development/python-modules/lupupy/default.nix index 23ec7c33c205..8daee818d9dd 100644 --- a/pkgs/development/python-modules/lupupy/default.nix +++ b/pkgs/development/python-modules/lupupy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lupupy"; - version = "0.1.1"; + version = "0.1.9"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bWBiM+u5wl9fWqL8k+R2IaYXSNnc4IxgWgUzyJVxkKk="; + sha256 = "sha256-UclKPuWcIa1nNFKqPIEnqlnJh0aXP50k2nMbHhT1aFs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/luxtronik/default.nix b/pkgs/development/python-modules/luxtronik/default.nix index 7df8532a4e2a..7466397ebb71 100644 --- a/pkgs/development/python-modules/luxtronik/default.nix +++ b/pkgs/development/python-modules/luxtronik/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "luxtronik"; - version = "0.3.10"; + version = "0.3.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bouni"; repo = "python-luxtronik"; rev = version; - sha256 = "sha256-JPY1HbNZanEsUpQ5W2kAwEFvwNGQI2hoogTZUGIg3YY="; + sha256 = "sha256-pngtkEuWmOD1MG7/Bh+8iqCxU0l/fGHA8uZxYoxOE5Y="; }; # Project has no tests diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 90494de82233..ccbd70ff48e3 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -10,16 +10,18 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.5.2"; + version = "1.5.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-nFXgvFLw6ru/Sw3+LoZ7V09dyn0L21We/Dlwib2gZB8="; + sha256 = "sha256-Uo3vcYez2qSq162SSKjoCkwygwR5awzDceIq8/h3dao="; }; + format = "pyproject"; + propagatedBuildInputs = [ click desktop-notifier diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix index 83485f4252b8..ab609b597a4e 100644 --- a/pkgs/development/python-modules/mailchecker/default.nix +++ b/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.9"; + version = "4.1.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vr70AB8EiOmb8lgwrq78iTnHdrp14Ppyh57Trh8SQ8Q="; + hash = "sha256-4ez18K9ksVGjzspHHcw/Ja6hxoKTkYLBFn65m7VBWYk="; }; # Module has no tests diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 73ddb17cac17..f77aa81bbb60 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -1,37 +1,65 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pkg-config, pango, cython, AppKit, pytestCheckHook }: +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, python +, pkg-config +, pango +, cython +, AppKit +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "manimpango"; - version = "0.4.0.post1"; + version = "0.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; rev = "v${version}"; - sha256 = "1in9ibis91rlqmd7apbdp9c8y1mgnpm5bg6ldad8whx62nkkvwa3"; + hash = "sha256-ourSUYBAFONdupdsjo/PtwRQpXS7HqLxrHj0Ejr/Wdw="; }; - postPatch = '' - substituteInPlace setup.cfg --replace "--cov --no-cov-on-fail" "" - ''; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + pango + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pango ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; propagatedBuildInputs = [ cython ]; + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov --no-cov-on-fail" "" + ''; + preBuild = '' ${python.interpreter} setup.py build_ext --inplace ''; - checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "manimpango" ]; + pythonImportsCheck = [ + "manimpango" + ]; meta = with lib; { + description = "Binding for Pango"; homepage = "https://github.com/ManimCommunity/ManimPango"; license = licenses.mit; - description = "Binding for Pango"; - maintainers = [ maintainers.angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/mariadb/default.nix b/pkgs/development/python-modules/mariadb/default.nix index 251b69e8e67c..987fe203edb7 100644 --- a/pkgs/development/python-modules/mariadb/default.nix +++ b/pkgs/development/python-modules/mariadb/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mariadb"; - version = "1.0.9"; + version = "1.0.10"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Aqmz0KB26aDQ6hxItF7Qm2R14rak6Mge2fHoLK87/Ck="; + hash = "sha256-eQKLpgURc9rRrQvnUYOJyrcCOfkrT/i4gT2uVcPyxT0="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/markups/default.nix b/pkgs/development/python-modules/markups/default.nix new file mode 100644 index 000000000000..2a0db14d96e7 --- /dev/null +++ b/pkgs/development/python-modules/markups/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, docutils +, fetchPypi +, importlib-metadata +, markdown +, pygments +, pytestCheckHook +, python-markdown-math +, pythonOlder +, pyyaml +, textile +}: + +buildPythonPackage rec { + pname = "markups"; + version = "3.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "Markups"; + inherit version; + hash = "sha256-q5dHpywcZFdBjrQnbHmHGXfBOmVGGOTxLiofCZD78vw="; + }; + + propagatedBuildInputs = [ + docutils + markdown + pygments + python-markdown-math + pyyaml + textile + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # AssertionError: '.selector .ch { color: #408080' not found in 'pre... + "test_get_pygments_stylesheet" + ]; + + pythonImportsCheck = [ + "markups" + ]; + + meta = with lib; { + description = "Wrapper around various text markup languages"; + homepage = "https://github.com/retext-project/pymarkups"; + license = licenses.bsd3; + maintainers = with maintainers; [ klntsky ]; + }; +} diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 1aeaa04e1721..9887f42bd8f3 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.26.1"; + version = "0.27.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d8525f74de51554b5c8491effe036f60629a426229befa33ff614c8569a16a73"; + sha256 = "1521b129564444648c523a38f6446c137f1aae5c9c7de1ec151d5ebf03fd407d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mat2/bubblewrap-path.patch b/pkgs/development/python-modules/mat2/bubblewrap-path.patch new file mode 100644 index 000000000000..2c71930b6df8 --- /dev/null +++ b/pkgs/development/python-modules/mat2/bubblewrap-path.patch @@ -0,0 +1,35 @@ +diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py +index 970d5dd..5d3c0b7 100644 +--- a/libmat2/bubblewrap.py ++++ b/libmat2/bubblewrap.py +@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError + + + def _get_bwrap_path() -> str: +- which_path = shutil.which('bwrap') +- if which_path: +- return which_path +- +- raise RuntimeError("Unable to find bwrap") # pragma: no cover ++ return '@bwrap@' + + + def _get_bwrap_args(tempdir: str, +@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str, + + # XXX: use --ro-bind-try once all supported platforms + # have a bubblewrap recent enough to support it. +- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd] ++ ro_bind_dirs = ['/nix/store', cwd] + for bind_dir in ro_bind_dirs: + if os.path.isdir(bind_dir): # pragma: no cover + ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir]) + +- ro_bind_files = ['/etc/ld.so.cache'] +- for bind_file in ro_bind_files: +- if os.path.isfile(bind_file): # pragma: no cover +- ro_bind_args.extend(['--ro-bind', bind_file, bind_file]) +- + args = ro_bind_args + \ + ['--dev', '/dev', + '--proc', '/proc', diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 31bf90f7f0ae..1d5a76b7b804 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , python , pythonOlder @@ -7,7 +8,7 @@ , bubblewrap , exiftool , ffmpeg -, mime-types +, mailcap , wrapGAppsHook , gdk-pixbuf , gobject-introspection @@ -37,7 +38,6 @@ buildPythonPackage rec { # hardcode paths to some binaries (substituteAll ({ src = ./paths.patch; - bwrap = "${bubblewrap}/bin/bwrap"; exiftool = "${exiftool}/bin/exiftool"; ffmpeg = "${ffmpeg}/bin/ffmpeg"; } // lib.optionalAttrs dolphinIntegration { @@ -47,6 +47,16 @@ buildPythonPackage rec { ./executable-name.patch # hardcode path to mat2 executable ./tests.patch + # fix gobject-introspection typelib path for Nautilus extension + (substituteAll { + src = ./fix_poppler.patch; + poppler_path = "${poppler_gi}/lib/girepository-1.0"; + }) + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ + (substituteAll { + src = ./bubblewrap-path.patch; + bwrap = "${bubblewrap}/bin/bwrap"; + }) ]; postPatch = '' @@ -76,7 +86,7 @@ buildPythonPackage rec { install -Dm 444 data/mat2.svg -t "$out/share/icons/hicolor/scalable/apps" install -Dm 444 doc/mat2.1 -t "$out/share/man/man1" install -Dm 444 nautilus/mat2.py -t "$out/share/nautilus-python/extensions" - buildPythonPath "$out $pythonPath" + buildPythonPath "$out $pythonPath $propagatedBuildInputs" patchPythonScript "$out/share/nautilus-python/extensions/mat2.py" '' + lib.optionalString dolphinIntegration '' install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus" diff --git a/pkgs/development/python-modules/mat2/fix_poppler.patch b/pkgs/development/python-modules/mat2/fix_poppler.patch new file mode 100644 index 000000000000..02bdbb6345dc --- /dev/null +++ b/pkgs/development/python-modules/mat2/fix_poppler.patch @@ -0,0 +1,14 @@ +diff --git a/nautilus/mat2.py b/nautilus/mat2.py +index 11e6986..5a0e68f 100644 +--- a/nautilus/mat2.py ++++ b/nautilus/mat2.py +@@ -22,6 +22,9 @@ import gi + gi.require_version('Nautilus', '3.0') + gi.require_version('Gtk', '3.0') + gi.require_version('GdkPixbuf', '2.0') ++gi.require_version('GIRepository', '2.0') ++from gi.repository import GIRepository ++GIRepository.Repository.prepend_search_path('@poppler_path@') + from gi.repository import Nautilus, GObject, Gtk, Gio, GLib, GdkPixbuf + + from libmat2 import parser_factory diff --git a/pkgs/development/python-modules/mat2/paths.patch b/pkgs/development/python-modules/mat2/paths.patch index 50b0c9aaa789..784e04cda383 100644 --- a/pkgs/development/python-modules/mat2/paths.patch +++ b/pkgs/development/python-modules/mat2/paths.patch @@ -12,41 +12,6 @@ index 41c8de4..11df258 100644 +Icon=@mat2svg@ +Exec=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U +Exec[de]=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U -diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py -index 970d5dd..5d3c0b7 100644 ---- a/libmat2/bubblewrap.py -+++ b/libmat2/bubblewrap.py -@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError - - - def _get_bwrap_path() -> str: -- which_path = shutil.which('bwrap') -- if which_path: -- return which_path -- -- raise RuntimeError("Unable to find bwrap") # pragma: no cover -+ return '@bwrap@' - - - def _get_bwrap_args(tempdir: str, -@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str, - - # XXX: use --ro-bind-try once all supported platforms - # have a bubblewrap recent enough to support it. -- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd] -+ ro_bind_dirs = ['/nix/store', cwd] - for bind_dir in ro_bind_dirs: - if os.path.isdir(bind_dir): # pragma: no cover - ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir]) - -- ro_bind_files = ['/etc/ld.so.cache'] -- for bind_file in ro_bind_files: -- if os.path.isfile(bind_file): # pragma: no cover -- ro_bind_args.extend(['--ro-bind', bind_file, bind_file]) -- - args = ro_bind_args + \ - ['--dev', '/dev', - '--proc', '/proc', diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py index eb65b2a..51a0fa1 100644 --- a/libmat2/exiftool.py diff --git a/pkgs/development/python-modules/mathlibtools/default.nix b/pkgs/development/python-modules/mathlibtools/default.nix index 517d74563aea..be1df56206d8 100644 --- a/pkgs/development/python-modules/mathlibtools/default.nix +++ b/pkgs/development/python-modules/mathlibtools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "mathlibtools"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "789f070f35424e89e4f2e2c007382250133cc48877627e37c5c463bcf4a1b58a"; + sha256 = "sha256-0iW7SWIxb+Ek4T26hru5EgBgXfqRh6zOR73GAgLFNyE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/matrix-common/default.nix b/pkgs/development/python-modules/matrix-common/default.nix index 44d37b988a7d..b1dd247987cf 100644 --- a/pkgs/development/python-modules/matrix-common/default.nix +++ b/pkgs/development/python-modules/matrix-common/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "matrix_common"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZmiKRoJ8hv1USuJBDzV2U1uIFt2lRxmT+iAOqOShJK4="; + sha256 = "sha256-qCOHSK/Cs3B5gYNn/tUVbzVXcbB8j/ChdZNPR+D/MnY="; }; propagatedBuildInputs = [ attrs ]; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 69721aeb8280..665167e290ea 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -28,22 +28,21 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.18.7"; + version = "0.19.0"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - hash = "sha256-eti9kvfv3y7m+mJzcxftyn8OyVSd2Ehqd3eU2ezMV5Q="; + hash = "sha256-+WZk2m05y/bYj8zSuWTzm+rnCC0L9H9WNQ2RLXv7hDk="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' - # Remove after https://github.com/poljar/matrix-nio/pull/288 - substituteInPlace pyproject.toml \ - --replace 'aiohttp-socks = "^0.6.0"' 'aiohttp-socks = "^0.7.0"' + --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' \ + --replace 'jsonschema = "^3.2.0"' 'jsonschema = "*"' \ + --replace 'cachetools = { version = "^4.2.1", optional = true }' 'cachetools = { version = "*", optional = true }' ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index dcdc946e21d6..683b3c099e05 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.14.5"; + version = "0.14.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dh3uQUBEMqtlrOpnO5Aa7GC5gajwQ12rWyVPwX6xIsQ="; + sha256 = "sha256-mO0bKUepIjb50UKEOvFIaepHAskehkBajevsTRST8e4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 7aeb0ee2c699..fcacc7cbf763 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -9,21 +9,20 @@ , pytest-asyncio , pytestCheckHook , pythonOlder -, six }: buildPythonPackage rec { pname = "mcstatus"; - version = "8.0.0"; + version = "9.0.3"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "Dinnerbone"; + owner = "py-mine"; repo = pname; rev = "v${version}"; - sha256 = "sha256-19VO5L5abVGm5zEMt88o67ArLjBCnGO2DxfAD+u1hF4="; + hash = "sha256-ckT3eSjOgIG2/Ci9Ig6QLCrO9iMF9VyZNJy9KfHUg4A="; }; nativeBuildInputs = [ @@ -34,7 +33,6 @@ buildPythonPackage rec { asyncio-dgram click dnspython - six ]; checkInputs = [ @@ -45,18 +43,25 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'asyncio-dgram = "1.2.0"' 'asyncio-dgram = ">=1.2.0"' \ - --replace 'six = "1.14.0"' 'six = ">=1.14.0"' \ - --replace 'click = "7.1.2"' 'click = ">=7.1.2"' + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace " --cov=mcstatus --cov-append --cov-branch --cov-report=term-missing -vvv --no-cov-on-fail" "" \ + --replace 'asyncio-dgram = "2.1.2"' 'asyncio-dgram = ">=2.1.2"' \ + --replace 'dnspython = "2.2.1"' 'dnspython = ">=2.2.0"' ''; pythonImportsCheck = [ "mcstatus" ]; + disabledTests = [ + # DNS features are limited in the sandbox + "test_query" + "test_query_retry" + ]; + meta = with lib; { description = "Python library for checking the status of Minecraft servers"; - homepage = "https://github.com/Dinnerbone/mcstatus"; + homepage = "https://github.com/py-mine/mcstatus"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 58670c49a90b..a37e82a62d34 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.1.0"; + version = "8.1.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - sha256 = "sha256-FTvHPV/QIpKRF7wcZ6yuik4GzPrwyg4Oxc5/cdCs6Qo="; + sha256 = "sha256-Dlqia+B7WJZlFGlIhgUWdND1qhSS/FOPoFH+uim6i8I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/md2gemini/default.nix b/pkgs/development/python-modules/md2gemini/default.nix index 7b4686dcac40..5d7b53f77a44 100644 --- a/pkgs/development/python-modules/md2gemini/default.nix +++ b/pkgs/development/python-modules/md2gemini/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "md2gemini"; - version = "1.8.1"; + version = "1.9.0"; propagatedBuildInputs = [ mistune_2_0 cjkwrap wcwidth ]; checkInputs = [ pytestCheckHook ]; @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0mfa0f0m762168fbsxjr1cx9yhj82dr8z1d28jl6hj9bkqnvvwiy"; + sha256 = "sha256-d1zuK+NqoPS36ihh8qx9gOET94tApY+SGStsc/bITnU="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 1ab425ade551..23bef4bda405 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.13"; + version = "0.7.14"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = version; - sha256 = "sha256-9ssDe7Wjuwuq2j7xwRyLqKouqeIt6NCUbEXjPdu2VZ8="; + sha256 = "sha256-bImBW6r8g/4MQ9yNrBBhk7AGqKRXFyAew6HHEmqelxw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index ad717e9d0c8f..1b452850161b 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "b150ad5fe4260539b4ef184657e552ef81307fbbe60ae1f258bc814549ea90f8"; + sha256 = "sha256-5wPXjIimcau4FwNRZEhQAV2bv6sxUwo7QNEkgaZ3mhE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix new file mode 100644 index 000000000000..9671c43df081 --- /dev/null +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "meilisearch"; + version = "0.18.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "meilisearch"; + repo = "meilisearch-python"; + rev = "v${version}"; + hash = "sha256-Rd2GmomNzW0+oI2QEGcPY4g8H+4FN7eLKY1ljcibsLw="; + }; + + propagatedBuildInputs = [ + requests + ]; + + pythonImportsCheck = [ + "meilisearch" + ]; + + # Tests spin up a local server and are not mocking the requests + doCheck = false; + + meta = with lib; { + description = "Client for the Meilisearch API"; + homepage = "https://github.com/meilisearch/meilisearch-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 6bc9635a66aa..064d8a8d203b 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.4.3"; + version = "0.4.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = version; - sha256 = "sha256-qff8dB8q4NS7ZYQDIzD1dXOZL/UBGACSBuPDla1okA8="; + sha256 = "sha256-bazAhCsxr8UNV51UnaGbP7kTC6mcDNM7N78f0jy26ew="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index e9b74d02b070..54f8431ba279 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "meshio"; - version = "4.4.6"; + version = "5.2.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0kv832s2vyff30zz8yqypw5jifwdanvh5x56d2bzkvy94h4jlddy"; + sha256 = "209885ac31b00155e43c27859d1aff0ba7f97f319ee7bed453a8b9e1677a4e52"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 9ddabb97ec83..4c92063de660 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.75"; + version = "1.2.93"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-VIeW7RloEIBU7YNG7f2e8PdFR+FauIwKLkd7v4qRCOA="; + sha256 = "sha256-4jh5AYjr1qnr3nOeJSLwtAzdPlmpW1BBrEXfB86NrL0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/metar/default.nix b/pkgs/development/python-modules/metar/default.nix index 4a7bf9edc5ae..9c4b30925783 100644 --- a/pkgs/development/python-modules/metar/default.nix +++ b/pkgs/development/python-modules/metar/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook }: @@ -15,6 +16,19 @@ buildPythonPackage rec { sha256 = "sha256-pl2NWRfFCYyM2qvBt4Ic3wgbGkYZvAO6pX2Set8zYW8="; }; + patches = [ + (fetchpatch { + # Fix flapping test; https://github.com/python-metar/python-metar/issues/161 + url = "https://github.com/python-metar/python-metar/commit/716fa76682e6c2936643d1cf62e3d302ef29aedd.patch"; + hash = "sha256-y82NN+KDryOiH+eG+2ycXCO9lqQLsah4+YpGn6lM2As="; + }) + (fetchpatch { + # Fix failing test: https://github.com/python-metar/python-metar/issues/165 + url = "https://github.com/python-metar/python-metar/commit/a4f9a4764b99bb0313876366d30728169db2770b.patch"; + hash = "sha256-sURHUb4gCKVMqEWFklTsxF0kr0SxC02Yr0287rZIvC0="; + }) + ]; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "metar" ]; diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index c157cd2a6be8..2c78575d3704 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -20,12 +20,12 @@ }: buildPythonPackage rec { - version = "4.3.1"; + version = "5.1.0"; pname = "Mezzanine"; src = fetchPypi { inherit pname version; - sha256 = "42c7909953cc5aea91921b47d804b61e14893bf48a2a476ce49a96559a0fa1d3"; + sha256 = "ce1117c81416d2e0a77981419312e200aec1cf3cb3ea9630083bd29e74bbb265"; }; disabled = isPyPy || lib.versionOlder django.version "1.11" diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 909c224685ce..25d8d492dd71 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -4,9 +4,7 @@ , fetchPypi , substituteAll , portmidi -, pygame , python-rtmidi -, rtmidi-python , pytestCheckHook }: @@ -27,9 +25,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - pygame python-rtmidi - rtmidi-python ]; checkInputs = [ diff --git a/pkgs/development/python-modules/mill-local/default.nix b/pkgs/development/python-modules/mill-local/default.nix index 9d00bb71c8bc..003fbc974f1d 100644 --- a/pkgs/development/python-modules/mill-local/default.nix +++ b/pkgs/development/python-modules/mill-local/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mill-local"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyMillLocal"; rev = version; - sha256 = "0q0frwj9yxdmqi5axl7gxirfflgn8xh1932c6lhp9my2v1d0gdrk"; + sha256 = "sha256-OKaR0hpNVBlaZrEmEmHxqRG1i03XP2Z4c7c35YIqe+I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix index 599b1d70d42e..5723138ecc3e 100644 --- a/pkgs/development/python-modules/minidb/default.nix +++ b/pkgs/development/python-modules/minidb/default.nix @@ -1,32 +1,37 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k -, nose -, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "minidb"; - version = "2.0.5"; - disabled = !isPy3k; + version = "2.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "thp"; repo = "minidb"; rev = version; - sha256 = "sha256-aUXsp0E89OxCgTaz7MpKmqTHZfnjDcyHa8Ckzof9rfg="; + hash = "sha256-H7W+GBapT9uJgbPlARp4ZLKTN7hZlF/FbNo7rObqDM4="; }; - # module imports are incompatible with python2 - doCheck = isPy3k; - checkInputs = [ nose pytest ]; - checkPhase = '' - pytest - ''; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "minidb" + ]; meta = with lib; { - description = "A simple SQLite3-based store for Python objects"; + description = "SQLite3-based store for Python objects"; homepage = "https://thp.io/2010/minidb/"; license = licenses.isc; - maintainers = [ maintainers.tv ]; + maintainers = with maintainers; [ tv ]; }; - } + diff --git a/pkgs/development/python-modules/minikanren/default.nix b/pkgs/development/python-modules/minikanren/default.nix new file mode 100644 index 000000000000..7452148e8e47 --- /dev/null +++ b/pkgs/development/python-modules/minikanren/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, toolz +, cons +, multipledispatch +, etuples +, logical-unification +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "minikanren"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "kanren"; + rev = "5aa9b1734cbb3fe072a7c72b46e1b72a174d28ac"; + sha256 = "sha256-daAtREgm91634Q0mc0/WZivDiyZHC7TIRoGRo8hMnGE="; + }; + + propagatedBuildInputs = [ + toolz + cons + multipledispatch + etuples + logical-unification + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "kanren" ]; + + meta = with lib; { + description = "Relational programming in Python"; + homepage = "https://github.com/pythological/kanren"; + changelog = "https://github.com/pythological/kanren/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix index d1e0616cfb68..a6e9fd68c2bd 100644 --- a/pkgs/development/python-modules/minikerberos/default.nix +++ b/pkgs/development/python-modules/minikerberos/default.nix @@ -4,27 +4,35 @@ , buildPythonPackage , fetchPypi , oscrypto +, pythonOlder +, unicrypto }: buildPythonPackage rec { pname = "minikerberos"; - version = "0.2.14"; + version = "0.2.20"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MND7r4Gkx9RnEMgEl62QXFYr1NEloihQ2HeU9hyhsx8="; + hash = "sha256-eJ+AImP6GIL3AbEj9u7ASLRc1zG/G1KIcABdrwdAIEc="; }; propagatedBuildInputs = [ asn1crypto asysocks oscrypto + unicrypto ]; # no tests are published: https://github.com/skelsec/minikerberos/pull/5 doCheck = false; - pythonImportsCheck = [ "minikerberos" ]; + pythonImportsCheck = [ + "minikerberos" + ]; meta = with lib; { description = "Kerberos manipulation library in Python"; diff --git a/pkgs/development/python-modules/mistletoe/default.nix b/pkgs/development/python-modules/mistletoe/default.nix index 0de5077ebee8..814a93e9c544 100644 --- a/pkgs/development/python-modules/mistletoe/default.nix +++ b/pkgs/development/python-modules/mistletoe/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "mistletoe"; - version = "0.8.1"; + version = "0.8.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "468c6a42fd98b85e05b318033f63d76e02712e1ea1328a7ebcba7e47fb6f1e41"; + sha256 = "sha256-ouNU5lPym8r1WZ2JSFEhGaxgN+nC+O53851VRQ59Gmw="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/mistune/common.nix b/pkgs/development/python-modules/mistune/common.nix index 7aba4ade4141..9610b735c79b 100644 --- a/pkgs/development/python-modules/mistune/common.nix +++ b/pkgs/development/python-modules/mistune/common.nix @@ -1,7 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi, nose, version, sha256 }: +{ lib, buildPythonPackage, fetchPypi, nose, version, sha256, format ? "setuptools" }: buildPythonPackage rec { - inherit version; + inherit version format; pname = "mistune"; src = fetchPypi { diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index c7e7d6d54c73..bb9d25d558e2 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -4,8 +4,9 @@ self: rec { sha256 = "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e"; }; mistune_2_0 = self.callPackage ./common.nix { - version = "2.0.0rc1"; - sha256 = "1nd7iav1ixh9hlj4hxn6lmpava88d86ys8rqm30wgvr7gjlxnas5"; + version = "2.0.2"; + sha256 = "sha256-b8iMPLSduosWaHtBcl5mHPhXhMEuiXSim50zbdWWw6E="; + format = "pyproject"; }; mistune = mistune_0_8; } diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index bc5835fac539..f3b24ffabff2 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,14 +45,14 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "7.0.4"; + version = "8.0.0"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-424WNG9Yj+Zfo1UTh7emknZ7xTtpFPz7Ph+FpE149FM="; + sha256 = "sha256-Efazsi8BjBrk7lBKSn2APKHxCc7mzxNrC92BL0VsnCM="; }; propagatedBuildInputs = [ @@ -74,7 +74,6 @@ buildPythonPackage rec { passlib protobuf publicsuffix2 - pyasn1 pyopenssl pyparsing pyperclip @@ -87,8 +86,6 @@ buildPythonPackage rec { ]; checkInputs = [ - beautifulsoup4 - glibcLocales hypothesis parver pytest-asyncio @@ -98,8 +95,6 @@ buildPythonPackage rec { requests ]; - doCheck = !stdenv.isDarwin; - postPatch = '' # remove dependency constraints sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?\( \?, \?!=\([0-9]\.\?\)\+\)\?//' -i setup.py diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix new file mode 100644 index 000000000000..dc67a5158240 --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -0,0 +1,41 @@ +{ lib, callPackage, buildPythonApplication, fetchFromGitHub +, jinja2 +, markdown +, mkdocs +, mkdocs-material-extensions +, pygments +, pymdown-extensions +}: + +buildPythonApplication rec { + pname = "mkdocs-material"; + version = "8.2.7"; + + src = fetchFromGitHub { + owner = "squidfunk"; + repo = pname; + rev = version; + sha256 = "sha256-Jh0FmtBCYCEk6mYFLOKb1HQXQ4Wc9Z6JCHFVu420IBk="; + }; + + propagatedBuildInputs = [ + jinja2 + markdown + mkdocs + mkdocs-material-extensions + pygments + pymdown-extensions + ]; + + # No tests for python + doCheck = false; + + pythonImportsCheck = [ "mkdocs" ]; + + meta = with lib; { + description = "Material for mkdocs"; + homepage = "https://squidfunk.github.io/mkdocs-material/"; + license = licenses.mit; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix new file mode 100644 index 000000000000..2d03c8fa8c5d --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildPythonPackage }: + +buildPythonPackage rec { + pname = "mkdocs-material-extensions"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "facelessuser"; + repo = pname; + rev = version; + sha256 = "1mvc13lz16apnli2qcqf0dvlm8mshy47jmz2vp72lja6x8jfq2p3"; + }; + + doCheck = false; # Circular dependency + + pythonImportsCheck = [ "materialx" ]; + + meta = with lib; { + description = "Markdown extension resources for MkDocs Material"; + homepage = "https://github.com/facelessuser/mkdocs-material-extensions"; + license = licenses.mit; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 658470ec72b8..49d6bd7a3248 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -6,6 +6,7 @@ , six , flask , numpy +, scipy , pandas , python-dateutil , protobuf @@ -26,12 +27,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.22.0"; + version = "1.24.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f680390715e436ae38cf7056ec91030fc9eb67cc631226f28ff9504fbe395add"; + sha256 = "sha256-6hZwiOuHtB8RFwgyfPeV8plLBPlnAdVP1f1bNah4en4="; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config @@ -46,6 +47,7 @@ buildPythonPackage rec { six flask numpy + scipy pandas python-dateutil protobuf @@ -64,14 +66,7 @@ buildPythonPackage rec { importlib-metadata ]; - patches = [ - # Relex alembic version, https://github.com/mlflow/mlflow/pull/5245 - (fetchpatch { - name = "relax-alembic-version.patch"; - url = "https://github.com/mlflow/mlflow/commit/945eb4b67f315c0b2c4018b1df006fde910f115f.patch"; - sha256 = "sha256-jETVEPzlNe0PvFZVOi1SwgJELfx/KCeq6REL3vl+YT0="; - }) - ]; + pythonImportsCheck = [ "mlflow" ]; meta = with lib; { homepage = "https://github.com/mlflow/mlflow"; diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 4692dc61c229..05fc6b4bb59a 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mlxtend"; - version = "0.17.3"; + version = "0.19.0"; disabled = isPy27; src = fetchFromGitHub { owner = "rasbt"; repo = pname; rev = version; - sha256 = "1515wgmj5rhwpmky7apmmvys1630sfg534fai6559s13hp11pdcl"; + sha256 = "0qawzlzv4zf612n9n03fxnz6gxmzschq0ykh9dgv70l33ihmjbaw"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index afef1cb5724d..1a0b7ee907bc 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.10.3"; + version = "3.10.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "82634f7d1a39f6a340ff9c7486e37bf3698e6510fdcfa7b378b5fbb256a42cda"; + sha256 = "831c23bf891c525828b7da49a358c6e0698481e4c8b3a61a69e87f36d06ef969"; }; propagatedBuildInputs = [ @@ -45,6 +45,8 @@ buildPythonPackage rec { pook ]; + # skip http tests + SKIP_TRUE_HTTP = true; pytestFlagsArray = [ # Requires a live Redis instance "--ignore=tests/main/test_redis.py" diff --git a/pkgs/development/python-modules/mongomock/default.nix b/pkgs/development/python-modules/mongomock/default.nix index 0f2f305c97c3..85e574f0b6d5 100644 --- a/pkgs/development/python-modules/mongomock/default.nix +++ b/pkgs/development/python-modules/mongomock/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "mongomock"; - version = "3.23.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1pdh4pj5n6dsaqy98q40wig5y6imfs1p043cgkaaw8f2hxy5x56r"; + sha256 = "sha256-sYMsN0jUdETBiGc3PlzqdUwub2RKDPv9Zn8Xj2i97Pw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 36d798e5504d..ea95e2b2d85d 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "monty"; - version = "2021.12.1"; + version = "2022.1.19"; disabled = pythonOlder "3.5"; # uses type annotations src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "0zcbdh7pqv4dq3fan0zh912w9bvmf2p0zj1fhp0ayhdsc50cwldh"; + sha256 = "sha256-CGYYPpXRBvqf6GJYYZUARpzt4XFc5uAw91n21UInYpU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix index 2888ff1e06d1..9f6ca7e91a78 100644 --- a/pkgs/development/python-modules/moonraker-api/default.nix +++ b/pkgs/development/python-modules/moonraker-api/default.nix @@ -21,6 +21,12 @@ buildPythonPackage rec { sha256 = "1hhm3jnl9qm44y4k927fzw1n32c3551kgsk7i57qw25nca9x3k61"; }; + postPatch = '' + # see comment on https://github.com/cmroche/moonraker-api/commit/e5ca8ab60d2839e150a81182fbe65255d84b4e4e + substituteInPlace setup.py \ + --replace 'name="moonraker-api",' 'name="moonraker-api",version="${version}",' + ''; + propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index 6e9946cce16b..5d67133b2559 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.5.10"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = version; - sha256 = "0zz5ardnik370pdfpl77m0hln8rj7ikkvrkyc6fm0vd0w12sihmm"; + sha256 = "sha256-Y5yF/dJUm0ICUY8UU8ILypSAnCVanvW4hzyz7ZOdBrc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 4d9156349e4a..1d9d07743798 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -6,6 +6,7 @@ , cfn-lint , docker , flask +, flask-cors , freezegun , jinja2 , jsondiff @@ -24,15 +25,16 @@ , idna , nose , pytestCheckHook +, pytest-xdist }: buildPythonPackage rec { pname = "moto"; - version = "1.3.16"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0zy0prsyip264i6h03lxsn1qg1n3dc8c4iyfawckjqvm24gnns3c"; + sha256 = "sha256-vZ1oofOYUkFETDFKwSmifvvn+bCi/6NQAxu950NYk5k="; }; postPatch = '' @@ -42,22 +44,6 @@ buildPythonPackage rec { --replace "MarkupSafe<2.0" "MarkupSafe" \ ''; - patches = [ - # Remove dependence on boto. The boto library (long ago superseded by boto3) - # has not had an official release in over two years or even a commit in the - # last 18 months. These patches should be included in the next moto release - # after 1.3.16 - (fetchpatch { - url = "https://github.com/spulec/moto/pull/3503/commits/ae85c539fd57034c4d5cfd0f95af41ff19862dd1.patch"; - sha256 = "16hr2py6q701d8ih6zcvs3lbanshpbk15ixckgdqngjf160k5m9p"; - excludes = ["tests/test_ec2/test_ec2_cloudformation.py"]; - }) - (fetchpatch { - url = "https://github.com/spulec/moto/pull/3468/commits/6ee39bd7fda4d3623569e10dcd9561bf2cd1d0bd.patch"; - sha256 = "10m3xdqxgys7spav9mkbhcn4z0124rlprwxnw6ysb10610xlna0i"; - }) - ]; - propagatedBuildInputs = [ aws-xray-sdk boto3 @@ -80,8 +66,15 @@ buildPythonPackage rec { idna ] ++ lib.optionals isPy27 [ backports_tempfile ]; - # Next release after 1.3.16 will not require `nose` - checkInputs = [ boto3 nose freezegun pytestCheckHook sure parameterized ]; + checkInputs = [ + boto3 + flask-cors + freezegun + parameterized + pytestCheckHook + pytest-xdist + sure + ]; # Multiple test files still import boto, rather than boto3 like # boto is long-deprecated and broken on python3.9 @@ -89,6 +82,7 @@ buildPythonPackage rec { # NOTE: This should change to use disabledTestFiles / disabledTestPaths once that # feature stabalizes: see #113153 (mostly the discussion therein), #113167, #110700 pytestFlagsArray = [ + "-n $NIX_BUILD_CORES" "--ignore=tests/test_awslambda/test_policy.py" "--ignore=tests/test_autoscaling/test_autoscaling.py" "--ignore=tests/test_autoscaling/test_cloudformation.py" @@ -226,6 +220,12 @@ buildPythonPackage rec { "--ignore=tests/test_swf/responses/test_timeouts.py" "--ignore=tests/test_swf/responses/test_workflow_executions.py" "--ignore=tests/test_swf/responses/test_workflow_types.py" + # attempts web connections + "--ignore=tests/test_appsync/test_appsync_schema.py" + "--ignore=tests/test_awslambda/test_lambda_eventsourcemapping.py" + "--ignore=tests/test_awslambda/test_lambda_invoke.py" + "--ignore=tests/test_batch/test_batch_jobs.py" + "--ignore=tests/**/*_integration.py" ]; disabledTests = [ @@ -256,6 +256,16 @@ buildPythonPackage rec { "test_get_records_seq" "test_stream_with_range_key" "test_create_notebook_instance_bad_volume_size" + "http_destination" + "test_invoke_function_from_sqs_exception" + "test_state_machine_list_executions_with_pagination" + "test_put_subscription_filter_with_lambda" + "test_create_custom_lambda_resource__verify_cfnresponse_failed" + "test_state_machine_creation_fails_with_invalid_names" + # needs graphql + "test_get_schema_creation_status" + # only appears in aarch64 currently, but best to be safe + "test_state_machine_list_executions_with_filter" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index 8d17d8b3b0cf..282d4a71c962 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-mpd2"; - version = "3.0.4"; + version = "3.0.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1r8saq1460yfa0sxfrvxqs2r453wz2xchlc9gzbpqznr49786rvs"; + sha256 = "sha256-bxv/2TuaMvwBipu/NIdQW1Lg11fsNAZpBcYKkS1JI4Q="; }; buildInputs = [ mock ]; diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 6e8fd896d913..aa5a74c2cfe8 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -2,19 +2,13 @@ buildPythonPackage rec { pname = "mpi4py"; - version = "3.0.3"; + version = "3.1.3"; src = fetchPypi { inherit pname version; - sha256 = "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f"; + sha256 = "sha256-8en64QefQ+r92fgXzbP9MNcJ7cCTtdXa2lekYbLbMAg="; }; - patches = [ (fetchpatch { - name = "disable-broken-test"; # upstream patch - url = "https://github.com/mpi4py/mpi4py/commit/e13cc3ee59ec6ec2c6ee20e384e1e649d5027e8a.patch"; - sha256 = "0iwknrhxnfmsqjj8ahpn50c8pcdyv9p3wmcqi1jhr4i5y7lnmvvx"; - })]; - passthru = { inherit mpi; }; diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index aca7def34a17..95b5bbf7ce96 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.16.0"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "240fb04dba46a27fd6a3178db8334412d0d02e0be85166f9e05bb45d03399084"; + sha256 = "sha256-BOPLe7dcUfVtKQOB8jBWIH3x8+tZTtA9OFUfOxbSo24="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 3feeca74ccd6..805d347389c0 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -1,7 +1,8 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, pytest -, lib +, pytestCheckHook +, setuptools }: buildPythonPackage rec { @@ -13,17 +14,17 @@ buildPythonPackage rec { sha256 = "51fdc7fb93615286428ee7758cecc2f374d5ff363bdd884c7ea622a7a327a81e"; }; - checkPhase = '' - py.test - ''; + nativeBuildInputs = [ + setuptools + ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; - meta = { + meta = with lib; { homepage = "https://github.com/msgpack/msgpack-python"; description = "MessagePack serializer implementation for Python"; changelog = "https://github.com/msgpack/msgpack-python/blob/master/ChangeLog.rst"; - license = lib.licenses.asl20; - # maintainers = ?? ; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/multiset/default.nix b/pkgs/development/python-modules/multiset/default.nix index fa2fa87d0e89..e511ab100459 100644 --- a/pkgs/development/python-modules/multiset/default.nix +++ b/pkgs/development/python-modules/multiset/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "multiset"; - version = "2.1.1"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "4801569c08bfcecfe7b0927b17f079c90f8607aca8fecaf42ded92b737162bc7"; + sha256 = "e45671cae8385a8e6248a9b07a3a83280c2d0cc4312713058cfbacdc5ec9973e"; }; buildInputs = [ setuptools-scm pytest-runner ]; diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index ee190008f592..b9701073e0bd 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , isPy3k , pyparsing }: @@ -10,10 +10,11 @@ buildPythonPackage { version = "0.0.2-2ffa0258ca"; disabled = ! isPy3k; - src = fetchgit { - url = "https://github.com/aroig/mutag.git"; - sha256 = "0axdnwdypfd74a9dnw0g25m16xx1yygyl828xy0kpj8gyqdc6gb1"; + src = fetchFromGitHub { + owner = "aroig"; + repo = "mutag"; rev = "2ffa0258cadaf79313241f43bf2c1caaf197d9c2"; + sha256 = "sha256-YT3DGvYPyTuB70gg6p/3oXcTahEPcNuSIqe56xu3rSs="; }; propagatedBuildInputs = [ pyparsing ]; diff --git a/pkgs/development/python-modules/mwdblib/default.nix b/pkgs/development/python-modules/mwdblib/default.nix index 53ca11459efe..96c3f193396e 100644 --- a/pkgs/development/python-modules/mwdblib/default.nix +++ b/pkgs/development/python-modules/mwdblib/default.nix @@ -8,18 +8,22 @@ , keyring , python , python-dateutil +, pythonOlder , requests }: buildPythonPackage rec { pname = "mwdblib"; - version = "3.4.1"; + version = "4.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jCtK3Fk725EaA26GG6j6xqEMFH4Qq92QWrJ7sxcWRaY="; + sha256 = "sha256-afqE6zL1uwsLNAuy5XY7OduP1e3W2ueteOOVaFJg3b0="; }; propagatedBuildInputs = [ @@ -38,7 +42,9 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ "mwdblib" ]; + pythonImportsCheck = [ + "mwdblib" + ]; meta = with lib; { description = "Python client library for the mwdb service"; diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix index 2ea41e61541b..b8399bebef46 100644 --- a/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "mwparserfromhell"; - version = "0.6.3"; + version = "0.6.4"; src = fetchPypi { inherit pname version; - sha256 = "1ad779f1bc0808d280ec1026c9de74f424de535568e21debd12830b5b0fa097e"; + sha256 = "sha256-kr7JUorjTScok8yvK1J9+FwxT/KM+7MFY0BGewldg0w="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index 567eeaf69698..f6df7b88f852 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -8,24 +8,23 @@ , measurement , python-dateutil , requests -, six , rich , pytestCheckHook , mock , nose +, pythonOlder }: -# TODO: Define this package in "all-packages.nix" using "toPythonApplication". -# This currently errors out, complaining about not being able to find "etree" from "lxml" even though "lxml" is defined in "propagatedBuildInputs". - buildPythonPackage rec { pname = "myfitnesspal"; - version = "1.16.6"; + version = "1.17.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "ac07369ede3ca4c6d673e02f2b9e0893b17d079f3085e36fdfdbdd1cba9f37db"; + sha256 = "sha256-UXFvKQtC44EvscYWXK7KI/do3U0wTWI3zKwvsRdzKrs="; }; propagatedBuildInputs = [ @@ -36,7 +35,6 @@ buildPythonPackage rec { measurement python-dateutil requests - six rich ]; diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 0a8252234569..a9e4a3eed5cd 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -7,6 +7,7 @@ , jinja2 , md-toc , mdformat +, newversion , poetry-core , pyparsing , pytestCheckHook @@ -15,16 +16,16 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "5.5.0"; + version = "7.5.4"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - sha256 = "sha256-cFe8d6w28VFTNyj/ABWHkFQDfnM4aTrNZ+WUw5g8H5I="; + hash = "sha256-NS8lFetL/8hcvCnIHw+GDtdEKFsN81MPybEA4PGaP/Q="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { jinja2 md-toc mdformat + newversion pyparsing ]; @@ -45,12 +47,14 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # Should be fixed with 5.x - "test_get_types" + pythonImportsCheck = [ + "mypy_boto3_builder" ]; - pythonImportsCheck = [ "mypy_boto3_builder" ]; + disabledTests = [ + # Tests require network access + "TestBotocoreChangelogChangelog" + ]; meta = with lib; { description = "Type annotations builder for boto3"; diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index e7aa7de0c9d8..4f33912d3dfe 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,13 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.20.28"; + version = "1.21.7"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "85ac23d06f9d0d794f60041b4c4f271d2bb8f5a83375c963e4a9e73e51ba9ca5"; + hash = "sha256-SWzL6AMXoZzYw3LwrBdvbe9JzLMudZioKZWo7HtHM8U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index fdcfed839c78..f1c7d83a6bae 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "2.10"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1fed214e16351b09946770794a321a818abb744078b1d863a479da070028684c"; + sha256 = "sha256-cwqhUzfDjwRG++CPbGwjcO4B05USU2nUtw4IseLuMO4="; }; propagatedBuildInputs = [ protobuf types-protobuf grpcio-tools ]; diff --git a/pkgs/development/python-modules/nagiosplugin/default.nix b/pkgs/development/python-modules/nagiosplugin/default.nix index 6b6e889b5d5d..fab05cd4acde 100644 --- a/pkgs/development/python-modules/nagiosplugin/default.nix +++ b/pkgs/development/python-modules/nagiosplugin/default.nix @@ -1,31 +1,45 @@ { lib , buildPythonPackage -, twine -, numpy -, pytest , fetchPypi +, numpy +, pytestCheckHook +, pythonOlder +, twine }: buildPythonPackage rec { pname = "nagiosplugin"; - version = "1.3.2"; + version = "1.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1vr3zy0zfvbrqc4nf81zxv4gs2q82sv5sjamdm4573ld529mk2nv"; + hash = "sha256-vOr67DWfAyOT3dVgrizI0WNhODPsY8k85xifhZBOU9Y="; }; - nativeBuildInputs = [ twine ]; - checkInputs = [ pytest numpy ]; + nativeBuildInputs = [ + twine + ]; - checkPhase = '' - # this test relies on who, which does not work in the sandbox - pytest -k "not test_check_users" tests/ - ''; + checkInputs = [ + numpy + pytestCheckHook + ]; + + disabledTests = [ + # Test relies on who, which does not work in the sandbox + "test_check_users" + ]; + + pythonImportsCheck = [ + "nagiosplugin" + ]; meta = with lib; { - description = "A Python class library which helps with writing Nagios (Icinga) compatible plugins"; - homepage = "https://github.com/mpounsett/nagiosplugin"; + description = "Python class library which helps with writing Nagios (Icinga) compatible plugins"; + homepage = "https://github.com/mpounsett/nagiosplugin"; license = licenses.zpl21; maintainers = with maintainers; [ symphorien ]; }; diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index 9d36c73bc3cf..63e795f98c85 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "nameparser"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "bbd4831c72426757ec59674a1aad29c40bf411358a6d6e1cdd68002cbcb90d08"; + sha256 = "sha256-zoM27XRk+nubh0X0i5xi3qa+2TG5lxXKlHk2BUSZIUM="; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix new file mode 100644 index 000000000000..2266283cc53b --- /dev/null +++ b/pkgs/development/python-modules/napalm/default.nix @@ -0,0 +1,44 @@ +{ lib, buildPythonPackage, fetchFromGitHub, callPackage, setuptools, cffi +, paramiko, requests, future, textfsm, jinja2, netaddr, pyyaml, pyeapi, netmiko +, junos-eznc, ciscoconfparse, scp, lxml, ncclient, pytestCheckHook, ddt, mock }: + +buildPythonPackage rec { + pname = "napalm"; + version = "3.3.1"; + + src = fetchFromGitHub { + owner = "napalm-automation"; + repo = "napalm"; + rev = version; + sha256 = "15h1h1a3avv48i14x96b8v7zkhmwg7dnzxycxr18f9530j237rq6"; + }; + + buildInputs = [ setuptools ]; + propagatedBuildInputs = [ + cffi + paramiko + requests + future + textfsm + jinja2 + netaddr + pyyaml + pyeapi + netmiko + junos-eznc + ciscoconfparse + scp + lxml + ncclient + ]; + + checkInputs = [ pytestCheckHook mock ddt ]; + + meta = with lib; { + description = + "Network Automation and Programmability Abstraction Layer with Multivendor support"; + homepage = "https://github.com/napalm-automation/napalm"; + license = licenses.asl20; + maintainers = [ maintainers.astro ]; + }; +} diff --git a/pkgs/development/python-modules/napalm/hp-procurve.nix b/pkgs/development/python-modules/napalm/hp-procurve.nix new file mode 100644 index 000000000000..774fdd2299cc --- /dev/null +++ b/pkgs/development/python-modules/napalm/hp-procurve.nix @@ -0,0 +1,41 @@ +{ lib, buildPythonPackage, fetchFromGitHub, setuptools, napalm, netmiko +, pytestCheckHook }: + +buildPythonPackage rec { + pname = "napalm-hp-procurve"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "napalm-automation-community"; + repo = pname; + rev = version; + sha256 = "1lspciddkd1w5lfyz35i0qwgpbn5jq9cbqkwjbsvi4kliz229vkh"; + }; + + # dependency installation in setup.py doesn't work + patchPhase = '' + echo -n > requirements.txt + ''; + + buildInputs = [ setuptools napalm ]; + propagatedBuildInputs = [ netmiko ]; + + # setup.cfg seems to contain invalid pytest parameters + preCheck = '' + rm setup.cfg + ''; + checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # AssertionError: Some methods vary. + "test_method_signatures" + # AttributeError: 'PatchedProcurveDriver' object has no attribute 'platform' + "test_get_config_filtered" + ]; + + meta = with lib; { + description = "HP ProCurve Driver for NAPALM automation frontend"; + homepage = + "https://github.com/napalm-automation-community/napalm-hp-procurve"; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix index b9e19439251a..3e159dfe7cee 100644 --- a/pkgs/development/python-modules/nassl/default.nix +++ b/pkgs/development/python-modules/nassl/default.nix @@ -9,6 +9,7 @@ , tls-parser , cacert , pytestCheckHook +, pythonAtLeast , pythonOlder }: @@ -50,9 +51,11 @@ let "enable-tls1_3" "no-async" ]; - patches = builtins.filter ( - p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch" - ) oldAttrs.patches; + patches = builtins.filter + ( + p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch" + ) + oldAttrs.patches; buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ]; meta = oldAttrs.meta // { knownVulnerabilities = [ @@ -76,9 +79,11 @@ let sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72"; }; configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon; - patches = builtins.filter ( - p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch" - ) oldAttrs.patches; + patches = builtins.filter + ( + p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch" + ) + oldAttrs.patches; buildInputs = oldAttrs.buildInputs ++ [ zlibStatic ]; # openssl_1_0_2 needs `withDocs = false` outputs = lib.remove "doc" oldAttrs.outputs; @@ -87,42 +92,54 @@ let in buildPythonPackage rec { pname = "nassl"; - version = "4.0.1"; + version = "4.0.2"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - hash = "sha256-QzO7ABh2weBO6NVFIj7kZpS8ashbDGompuvdKteJeUc="; + hash = "sha256-lLyHXLmBVvT+LgsKBU8DcUXd0qaLSrwvXxFnIB9CHcU="; }; - postPatch = let - legacyOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslLegacyStatic.version; - modernOpenSSLVersion = lib.replaceStrings ["."] ["_"] opensslStatic.version; - zlibVersion = zlibStatic.version; - in '' - mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ - cp ${opensslLegacyStatic.out}/lib/libssl.a \ - ${opensslLegacyStatic.out}/lib/libcrypto.a \ - deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ - ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include - ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps + postPatch = + let + legacyOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslLegacyStatic.version; + modernOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslStatic.version; + zlibVersion = zlibStatic.version; + in + '' + mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ + cp ${opensslLegacyStatic.out}/lib/libssl.a \ + ${opensslLegacyStatic.out}/lib/libcrypto.a \ + deps/openssl-OpenSSL_${legacyOpenSSLVersion}/ + ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include + ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps - mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/ - cp ${opensslStatic.out}/lib/libssl.a \ - ${opensslStatic.out}/lib/libcrypto.a \ - deps/openssl-OpenSSL_${modernOpenSSLVersion}/ - ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include - ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps + mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/ + cp ${opensslStatic.out}/lib/libssl.a \ + ${opensslStatic.out}/lib/libcrypto.a \ + deps/openssl-OpenSSL_${modernOpenSSLVersion}/ + ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include + ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps - mkdir -p deps/zlib-${zlibVersion}/ - cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/ - ''; + mkdir -p deps/zlib-${zlibVersion}/ + cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/ + ''; - propagatedBuildInputs = [ tls-parser ]; + nativeBuildInputs = [ + invoke + ]; - nativeBuildInputs = [ invoke ]; + propagatedBuildInputs = [ + tls-parser + ]; + + checkInputs = [ + pytestCheckHook + ]; buildPhase = '' invoke build.nassl @@ -131,19 +148,23 @@ buildPythonPackage rec { doCheck = true; - pythonImportsCheck = [ "nassl" ]; - - checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "nassl" + ]; disabledTests = [ "Online" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + "test_write_bad" + "test_client_authentication_no_certificate_supplied" + "test_client_authentication_succeeds" ]; meta = with lib; { + description = "Low-level OpenSSL wrapper for Python"; homepage = "https://github.com/nabla-c0d3/nassl"; - description = "Low-level OpenSSL wrapper for Python 3.7+"; - platforms = with platforms; linux ++ darwin; license = licenses.agpl3Only; maintainers = with maintainers; [ veehaitch ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/python-modules/asyncio-nats-client/default.nix b/pkgs/development/python-modules/nats-py/default.nix similarity index 56% rename from pkgs/development/python-modules/asyncio-nats-client/default.nix rename to pkgs/development/python-modules/nats-py/default.nix index 46dbcdbacd5e..f87eb269da7a 100644 --- a/pkgs/development/python-modules/asyncio-nats-client/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -9,15 +9,17 @@ }: buildPythonPackage rec { - pname = "asyncio-nats-client"; - version = "0.11.5"; - disabled = pythonOlder "3.6"; + pname = "nats-py"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.py"; rev = "v${version}"; - sha256 = "0zwiijaswmfdk71diqmdpb6nx54fmgi8hy0vwx2m3ihhsyjxj82h"; + hash = "sha256-BraT30J7OIcW2NXAwjcg9PYu+kgf8f1iDjKiN9J6l7Y="; }; propagatedBuildInputs = [ @@ -38,12 +40,24 @@ buildPythonPackage rec { disabledTests = [ # RuntimeError: Event loop is closed "test_subscribe_no_echo" - "test_reconnect_to_new_server_with_auth" - "test_drain_connection" - "test_discover_servers_on_first_connect" + "test_publish" + "test_publish_verbose" + "test_fetch_max_waiting_fetch_one" + "test_fetch_n" + "test_consumer_management" + "test_ephemeral_subscribe" + "test_queue_subscribe_deliver_group" + "test_subscribe_push_bound" + "test_double_acking_subscribe" + "test_flow_control" + "test_ordered_consumer" + "test_ordered_consumer_single_loss" + "test_kv_simple" ]; - pythonImportsCheck = [ "nats.aio" ]; + pythonImportsCheck = [ + "nats" + ]; meta = with lib; { description = "Python client for NATS.io"; diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 33ff7f4371c9..3b3682b335e9 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "natsort"; - version = "8.0.2"; + version = "8.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/rh+DOHcH48/IeGKhSFseQ50bXal/2iJVjOUYF9QSis="; + hash = "sha256-x8Hz8nw3Vxmk38qzU5Cf458mwgMqBiqMgMyETqrKBEU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index 0e6630281c0d..2c062d3ff99e 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, python , notebook , pythonOlder , jupyter_server @@ -10,19 +11,26 @@ buildPythonPackage rec { pname = "nbclassic"; - version = "0.3.1"; + version = "0.3.5"; disabled = pythonOlder "3.6"; # tests only on github src = fetchFromGitHub { owner = "jupyterlab"; repo = pname; - rev = version; - sha256 = "sha256-gx086w/qYB02UFEDly+0mUsV5BvAVAuhqih4wev2p/w="; + rev = "v${version}"; + sha256 = "1d0x7nwsaw5qjw4iaylc2sxlpiq3hlg9sy3i2nh7sn3wckwl76lc"; }; propagatedBuildInputs = [ jupyter_server notebook ]; + preCheck = '' + cd nbclassic + mv conftest.py tests + cd tests + + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ''; checkInputs = [ pytestCheckHook pytest-tornasync diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index c10b442bac92..c5e3facc0622 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.9"; - disabled = pythonOlder "3.6"; + version = "0.5.10"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-meRt2vrNC4YSk78kb+2FQKGErfo6p9ZB+JAx7AcHAeA="; + sha256 = "b5fdea88d6fa52ca38de6c2361401cfe7aaa7cd24c74effc5e489cec04d79088"; }; inherit doCheck; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 400d59272ee1..ab91f22acc44 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "6.3.0"; + version = "6.4.0"; src = fetchPypi { inherit pname version; - sha256 = "5e77d6203854944520105e38f2563a813a4a3708e8563aa598928a3b5ee1081a"; + sha256 = "5412ec774c6db4fccecb8c4ba07ec5d37d6dcf5762593cb3d6ecbbeb562ebbe5"; }; # Add $out/share/jupyter to the list of paths that are used to search for diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix index a7c5425963aa..7d1d827cc20f 100644 --- a/pkgs/development/python-modules/nbsmoke/default.nix +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "nbsmoke"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "2400d7878e97714e822ab200a71fc71ede487e671f42b4b411745dba95f9cb32"; + sha256 = "8b55333e2face27bc7ff80c266c468ca5633947cb0697727348020dd445b0874"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index f230e0c80c65..749d3e6e30cc 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "2.0.4"; + version = "2.0.6"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = "nbxmpp-${version}"; - sha256 = "1c2ncx1k93gxndaw183x0vlqgjnippl3v6sknklj3z2yjcj0l1ks"; + sha256 = "sha256:03iydz0r9m8559srawwnhaqzqm9liwrnc8v6abj4w3m1lil32bid"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/ndspy/default.nix b/pkgs/development/python-modules/ndspy/default.nix index 9c4d91df9d65..7408949649fa 100644 --- a/pkgs/development/python-modules/ndspy/default.nix +++ b/pkgs/development/python-modules/ndspy/default.nix @@ -1,22 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, crcmod }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, crcmod +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "ndspy"; - version = "3.0.0"; + version = "4.0.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "1s0i81gspas22bjwk9vhy3x5sw1svyybk7c2j1ixc77drr9ym20a"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "RoadrunnerWMC"; + repo = pname; + rev = "v${version}"; + sha256 = "0x3sp10had1mq192m7kgjivvs8kpjagxjgj9d4z95dfjhzzbjh70"; }; - propagatedBuildInputs = [ crcmod ]; + propagatedBuildInputs = [ + crcmod + ]; - doCheck = false; # there are no tests - pythonImportsCheck = [ "ndspy" ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ndspy" + ]; + + preCheck = '' + cd tests + ''; meta = with lib; { + description = "Python library for many Nintendo DS file formats"; homepage = "https://github.com/RoadrunnerWMC/ndspy"; - description = "A Python library for many Nintendo DS file formats"; license = licenses.gpl3Plus; maintainers = with maintainers; [ xfix ]; }; diff --git a/pkgs/development/python-modules/nengo/default.nix b/pkgs/development/python-modules/nengo/default.nix index 566540a4c972..c422278c830c 100644 --- a/pkgs/development/python-modules/nengo/default.nix +++ b/pkgs/development/python-modules/nengo/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "nengo"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "nengo"; repo = "nengo"; rev = "v${version}"; - sha256 = "1wkayimf2jqkbr6piikh5zd6yw8gf2qv4v4bfrprs4laa6wzh2qh"; + sha256 = "12lz8lzirxvwnpa74k9k48c64gs6gi092928rh97siya3i6gjs6i"; }; propagatedBuildInputs = [ numpy ] diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index 27da5b71b68b..d6be449eb1b1 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -9,25 +9,36 @@ buildPythonPackage rec { pname = "neo"; - version = "0.10.0"; - disabled = pythonOlder "3.6"; + version = "0.10.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0lw3r9p1ky1cswhrs9radc0vq1qfzbrk7qd00f34g96g30zab4g5"; + sha256 = "sha256-LUIYsIJtruqIDhVSJwYAKew4oAI4zrXwlxONlGfGOZs="; }; - propagatedBuildInputs = [ numpy quantities ]; + propagatedBuildInputs = [ + numpy + quantities + ]; - checkInputs = [ nose ]; + checkInputs = [ + nose + ]; checkPhase = '' nosetests --exclude=iotest ''; + pythonImportsCheck = [ + "neo" + ]; + meta = with lib; { + description = "Package for representing electrophysiology data"; homepage = "https://neuralensemble.org/neo/"; - description = "Package for representing electrophysiology data in Python"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/neo4j-driver/default.nix b/pkgs/development/python-modules/neo4j-driver/default.nix index 6b81af0c2940..63a2efafbd6e 100644 --- a/pkgs/development/python-modules/neo4j-driver/default.nix +++ b/pkgs/development/python-modules/neo4j-driver/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "neo4j-driver"; - version = "4.4.1"; + version = "4.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = version; - sha256 = "sha256-aGOqD6mmd3dulQ/SdaDPDZhkCwXdYCucHw+CrkJf1M0="; + sha256 = "sha256-rYedmxQvT+RjVdbDckLv00J4YuEQtMuIc8Q5FGWr3Rw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nested-lookup/default.nix b/pkgs/development/python-modules/nested-lookup/default.nix new file mode 100644 index 000000000000..7e56158ff145 --- /dev/null +++ b/pkgs/development/python-modules/nested-lookup/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pytestCheckHook +, six +}: + +buildPythonPackage rec { + pname = "nested-lookup"; + version = "0.2.23"; + + src = fetchFromGitHub { + owner = "russellballestrini"; + repo = "nested-lookup"; + # https://github.com/russellballestrini/nested-lookup/issues/47 + rev = "c1b0421479efa378545bc71efa3b72882e8fec17"; + sha256 = "sha256-jgfYLSsFLQSsOH4NzbDPKFIG+tWWZ1zTWcZEaX2lthg="; + }; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "nested_lookup" ]; + + meta = with lib; { + description = "Python functions for working with deeply nested documents (lists and dicts)"; + homepage = "https://github.com/russellballestrini/nested-lookup"; + license = licenses.publicDomain; + maintainers = with maintainers; [ tboerger ]; + }; +} diff --git a/pkgs/development/python-modules/net2grid/default.nix b/pkgs/development/python-modules/net2grid/default.nix new file mode 100644 index 000000000000..05b5321a69cf --- /dev/null +++ b/pkgs/development/python-modules/net2grid/default.nix @@ -0,0 +1,58 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "net2grid"; + version = "3.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "klaasnicolaas"; + repo = "python-net2grid"; + rev = "v${version}"; + hash = "sha256-nT9qMv4Zr7SjNwHRN3HRR11yl+Oue8VVCfJr2n1D02Q="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"0.0.0"' '"${version}"' \ + --replace 'addopts = "--cov"' "" + ''; + + pythonImportsCheck = [ + "net2grid" + ]; + + meta = with lib; { + description = "Module for interacting with NET2GRID devices"; + homepage = "https://github.com/klaasnicolaas/python-net2grid"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/netio/default.nix b/pkgs/development/python-modules/netio/default.nix new file mode 100644 index 000000000000..dbc988191846 --- /dev/null +++ b/pkgs/development/python-modules/netio/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +, pyopenssl +}: + +buildPythonPackage rec { + pname = "netio"; + version = "1.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "Netio"; + inherit version; + hash = "sha256-G1NSCchoRjgX2K9URNXsxpp9jxrQo0RgZ00tzWdexGU="; + }; + + propagatedBuildInputs = [ + requests + pyopenssl + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "import py2exe" "" + ''; + + pythonImportsCheck = [ + "Netio" + ]; + + # Module has no tests + doCheck = false; + + meta = with lib; { + description = "Module for interacting with NETIO devices"; + homepage = "https://github.com/netioproducts/PyNetio"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix new file mode 100644 index 000000000000..0934439f7473 --- /dev/null +++ b/pkgs/development/python-modules/netmiko/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, setuptools, paramiko, scp, tenacity +, textfsm, ntc-templates, pyserial, pytestCheckHook, pyyaml }: + +buildPythonPackage rec { + pname = "netmiko"; + version = "3.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "14s9c6ws32swizcmfdqmlkkk2yqw6071ybq3w94fhkl6jzfvkbdc"; + }; + + buildInputs = [ setuptools ]; + propagatedBuildInputs = + [ paramiko scp tenacity textfsm ntc-templates pyserial ]; + + # tests require closed-source pyats and genie packages + doCheck = false; + + meta = with lib; { + description = + "Multi-vendor library to simplify Paramiko SSH connections to network devices"; + homepage = "https://github.com/ktbyers/netmiko/"; + license = licenses.mit; + maintainers = [ maintainers.astro ]; + }; +} diff --git a/pkgs/development/python-modules/newversion/default.nix b/pkgs/development/python-modules/newversion/default.nix new file mode 100644 index 000000000000..f340dc3a1b32 --- /dev/null +++ b/pkgs/development/python-modules/newversion/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, packaging +, poetry-core +, pytestCheckHook +, pythonOlder +, typing-extensions +}: + +buildPythonPackage rec { + pname = "newversion"; + version = "1.8.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "vemel"; + repo = pname; + rev = version; + hash = "sha256-27HWMzSzyAbiOW7OUhlupRWIVJG6DrpXObXmxlCsmxU="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "newversion" + ]; + + meta = with lib; { + description = "PEP 440 version manager"; + homepage = "https://github.com/vemel/newversion"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix new file mode 100644 index 000000000000..ab814061b58d --- /dev/null +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, substituteAll +, ffmpeg +, libopus +, aiohttp +, aiodns +, brotli +, cchardet +, orjson +, pynacl +}: + +buildPythonPackage rec { + pname = "nextcord"; + version = "2.0.0a9"; + + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "nextcord"; + repo = "nextcord"; + rev = version; + hash = "sha256-9UJLfSYud/pIkIkJ75jE3pxsYm5bKNNRCwjDerDHp9c="; + }; + + patches = [ + (substituteAll { + src = ./paths.patch; + ffmpeg = "${ffmpeg}/bin/ffmpeg"; + libopus = "${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + propagatedBuildInputs = [ + aiodns + aiohttp + brotli + cchardet + orjson + pynacl + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "nextcord" + "nextcord.ext.commands" + "nextcord.ext.tasks" + ]; + + meta = with lib; { + description = "Python wrapper for the Discord API forked from discord.py"; + homepage = "https://github.com/nextcord/nextcord"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/nextcord/paths.patch b/pkgs/development/python-modules/nextcord/paths.patch new file mode 100644 index 000000000000..389637a18878 --- /dev/null +++ b/pkgs/development/python-modules/nextcord/paths.patch @@ -0,0 +1,26 @@ +diff --git a/nextcord/opus.py b/nextcord/opus.py +index 97d437a3..755e1a5c 100644 +--- a/nextcord/opus.py ++++ b/nextcord/opus.py +@@ -213,7 +213,7 @@ def _load_default() -> bool: + _filename = os.path.join(_basedir, 'bin', f'libopus-0.{_target}.dll') + _lib = libopus_loader(_filename) + else: +- _lib = libopus_loader(ctypes.util.find_library('opus')) ++ _lib = libopus_loader('@libopus@') + except Exception: + _lib = None + +diff --git a/nextcord/player.py b/nextcord/player.py +index bedefc5a..34de0459 100644 +--- a/nextcord/player.py ++++ b/nextcord/player.py +@@ -140,7 +140,7 @@ class FFmpegAudio(AudioSource): + .. versionadded:: 1.3 + """ + +- def __init__(self, source: Union[str, io.BufferedIOBase], *, executable: str = 'ffmpeg', args: Any, **subprocess_kwargs: Any): ++ def __init__(self, source: Union[str, io.BufferedIOBase], *, executable: str = '@ffmpeg@', args: Any, **subprocess_kwargs: Any): + piping = subprocess_kwargs.get('stdin') == subprocess.PIPE + if piping and isinstance(source, str): + raise TypeError("parameter conflict: 'source' parameter cannot be a string when piping to stdin") diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 91195abce1cd..60f5fcde63fe 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "nibabel"; - version = "3.2.1"; + version = "3.2.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "4d2ff9426b740011a1c916b54fc25da9348282e727eaa2ea163f42e00f1fc29e"; + sha256 = "sha256-sNzBdLMEBc6ej+weqzy7sg9cXkkgl2wIsi4FC3wST5Q="; }; propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ]; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index c79ea52f558c..60e11ef1d12d 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -12,7 +12,8 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; disabledTests = [ "test_clean_confounds" ]; # https://github.com/nilearn/nilearn/issues/2608 - pytestFlagsArray = [ "nilearn" ]; + # do subset of tests which don't fetch resources + pytestFlagsArray = [ "nilearn/connectome/tests" ]; propagatedBuildInputs = [ joblib diff --git a/pkgs/development/python-modules/nitransforms/default.nix b/pkgs/development/python-modules/nitransforms/default.nix index 79fd93d32123..695c674e0dce 100644 --- a/pkgs/development/python-modules/nitransforms/default.nix +++ b/pkgs/development/python-modules/nitransforms/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "nitransforms"; - version = "21.0.0"; + version = "22.0.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "njJqHqXVxldyGfmdM8GmgKdgIT4kMYLzcM5+ayR2EDo="; + sha256 = "sha256-iV9TEIGogIfbj+fmOGftoQqEdtZiewbHEw3hYlMEP4c="; }; buildInputs = [ setuptools-scm toml ]; diff --git a/pkgs/development/python-modules/nkdfu/default.nix b/pkgs/development/python-modules/nkdfu/default.nix new file mode 100644 index 000000000000..fa094404b8b1 --- /dev/null +++ b/pkgs/development/python-modules/nkdfu/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, fire, tqdm, intelhex, libusb1 }: + +buildPythonPackage rec { + pname = "nkdfu"; + version = "0.1"; + format = "flit"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Y8GonfCBi3BNMhZ99SN6/SDSa0+dbfPIMPoVzALwH5A="; + }; + + propagatedBuildInputs = [ + fire + tqdm + intelhex + libusb1 + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "nkdfu" ]; + + meta = with lib; { + description = "Python tool for Nitrokeys' firmware update"; + homepage = "https://github.com/Nitrokey/nkdfu"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ frogamic ]; + }; +} diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 27e17daa372a..9beeb4cb0a69 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,4 +1,7 @@ -{ fetchPypi, buildPythonPackage, lib, isPy3k +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder , click , joblib , regex @@ -6,13 +9,16 @@ }: buildPythonPackage rec { - version = "3.6.7"; pname = "nltk"; + version = "3.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "51bf1aef5304740a708be7c8e683f7798f03dc5c7a7e7feb758be9e95f4585e3"; + hash = "sha256-1lB9ZGDOx21wr+pCQqImp1QvhcZpF3ucf1YrfPGwVQI="; }; propagatedBuildInputs = [ @@ -30,10 +36,14 @@ buildPythonPackage rec { # best. doCheck = false; - meta = { + pythonImportsCheck = [ + "nltk" + ]; + + meta = with lib; { description = "Natural Language Processing ToolKit"; homepage = "http://nltk.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ lheckemann ]; + license = licenses.asl20; + maintainers = with maintainers; [ lheckemann ]; }; } diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix index a9cb021a8413..982f2abe880d 100644 --- a/pkgs/development/python-modules/nocasedict/default.nix +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "nocasedict"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "86e2dae49e34de7c31b65b486c8f9aa58b66dc2e8ee9b34c390c6c58885c85a0"; + sha256 = "sha256-giC5e6BrCOst7e13TEBsd+DKDVNSrnEkn2+dHyoXvXs="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix index e7947eba92ae..5fc6bd6f8e66 100644 --- a/pkgs/development/python-modules/nocaselist/default.nix +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "nocaselist"; - version = "1.0.4"; + version = "1.0.5"; src = fetchPypi { inherit pname version; - sha256 = "73a9c0659e7135c66e46a6ab06e2cb637ce9248d73c690ebd31afb72a4e03ac0"; + sha256 = "sha256-4cEsoq6dNFs0lI8sj2DjiUYZ4r4u0otOzF5/HeoRfR0="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index 456bbfd9aedd..451c71897da9 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -14,6 +14,19 @@ buildPythonPackage rec { sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"; }; + # 2to3 was removed in setuptools 58 + postPatch = '' + substituteInPlace setup.py \ + --replace "'use_2to3': True," "" + + substituteInPlace setup3lib.py \ + --replace "from setuptools.command.build_py import Mixin2to3" "from distutils.util import Mixin2to3" + ''; + + preBuild = '' + 2to3 -wn nose functional_tests unit_tests + ''; + propagatedBuildInputs = [ coverage ]; doCheck = false; # lot's of transient errors, too much hassle diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index 004991e1ce9d..15850119c840 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -9,26 +9,33 @@ buildPythonPackage rec { pname = "nose2"; - version = "0.10.0"; + version = "0.11.0"; + format = "setuptools"; - # Requires mock 2.0.0 if python < 3.6, but NixPkgs has mock 3.0.5. disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "886ba617a96de0130c54b24479bd5c2d74d5c940d40f3809c3a275511a0c4a60"; + hash = "sha256-bSCNfW7J+dVcdNrIHJOUvDkG2++BqMpUILK5t/jmnek="; }; - propagatedBuildInputs = [ six coverage ]; + propagatedBuildInputs = [ + coverage + six + ]; checkPhase = '' ${python.interpreter} -m unittest ''; + pythonImportsCheck = [ + "nose2" + ]; + meta = with lib; { - description = "nose2 is the next generation of nicer testing for Python"; + description = "Test runner for Python"; homepage = "https://github.com/nose-devs/nose2"; license = licenses.bsd0; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 1cb5f1b75708..7a1902cb2114 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.4.6"; + version = "6.4.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "7bcdf79bd1cda534735bd9830d2cbedab4ee34d8fe1df6e7b946b3aab0902ba3"; + sha256 = "b01da66f11a203b3839d6afa4013674bcfff41c36552f9ad0fbcb2d93c92764a"; }; LC_ALL = "en_US.utf8"; diff --git a/pkgs/development/python-modules/notifymuch/default.nix b/pkgs/development/python-modules/notifymuch/default.nix new file mode 100644 index 000000000000..bc1610e2ca94 --- /dev/null +++ b/pkgs/development/python-modules/notifymuch/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonApplication +, isPy3k +, fetchFromGitHub +, notmuch +, pygobject3 +, gobject-introspection +, libnotify +, wrapGAppsHook +, gtk3 +}: + +buildPythonApplication rec { + pname = "notifymuch"; + version = "0.1"; + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "kspi"; + repo = "notifymuch"; + # https://github.com/kspi/notifymuch/issues/11 + rev = "9d4aaf54599282ce80643b38195ff501120807f0"; + sha256 = "1lssr7iv43mp5v6nzrfbqlfzx8jcc7m636wlfyhhnd8ydd39n6k4"; + }; + + propagatedBuildInputs = [ + notmuch + pygobject3 + libnotify + gtk3 + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + strictDeps = false; + + meta = with lib; { + description = "Display desktop notifications for unread mail in a notmuch database"; + homepage = "https://github.com/kspi/notifymuch"; + maintainers = with maintainers; [ arjan-s ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/networking/mailreaders/alot/notmuch.nix b/pkgs/development/python-modules/notmuch2/default.nix similarity index 73% rename from pkgs/applications/networking/mailreaders/alot/notmuch.nix rename to pkgs/development/python-modules/notmuch2/default.nix index bd195b52d44e..5d74270a58c2 100644 --- a/pkgs/applications/networking/mailreaders/alot/notmuch.nix +++ b/pkgs/development/python-modules/notmuch2/default.nix @@ -14,6 +14,12 @@ buildPythonPackage { buildInputs = [ python notmuch cffi ]; + # since notmuch 0.35, this package expects _notmuch_config.py that is + # generated by notmuch's configure script + postPatch = '' + cp ${notmuch.bindingconfig}/_notmuch_config.py . + ''; + # no tests doCheck = false; pythonImportsCheck = [ "notmuch2" ]; diff --git a/pkgs/development/python-modules/numba-scipy/default.nix b/pkgs/development/python-modules/numba-scipy/default.nix new file mode 100644 index 000000000000..c8f84cbf43f5 --- /dev/null +++ b/pkgs/development/python-modules/numba-scipy/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, scipy +, numba +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "numba-scipy"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-qJeoWiG1LdtFB9cME1d8xVaC0BXGDJEYjCOEdHvSkmQ="; + }; + + propagatedBuildInputs = [ + scipy + numba + ]; + + postPatch = '' + substituteInPlace setup.py --replace "scipy>=0.16,<=1.6.2" "scipy>=0.16,<=1.7.3" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "numba" ]; + + meta = with lib; { + description = "Extends Numba to make it aware of SciPy"; + homepage = "https://github.com/numba/numba-scipy"; + changelog = "https://github.com/numba/numba-scipy/blob/master/CHANGE_LOG"; + license = licenses.bsd2; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index c45419c5c88c..8bead014e34a 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "0.54.1"; + version = "0.55.0"; pname = "numba"; disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { inherit pname version; - sha256 = "f9dfc803c864edcc2381219b800abf366793400aea55e26d4d5b7d953e14f43f"; + sha256 = "sha256-siHr2ZdmKh3Ld+TwkUDgIvv+dXetB4H8LgIUE126bL0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 31b529c83dab..ffc422e9b421 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -1,32 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, python , numpy +, packaging +, python +, pythonOlder }: buildPythonPackage rec { pname = "numexpr"; - version = "2.8.0"; + version = "2.8.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9fec076b76c90a5f3929373f548834bb203c6d23a81a895e60d0fe9cca075e99"; + hash = "sha256-zXeapE3ZhsTvEBY1GSOWArAnvgalJ5RmViB6zx9YETs="; }; - # Remove existing site.cfg, use the one we built for numpy. - preBuild = '' - ln -s ${numpy.cfg} site.cfg - ''; - nativeBuildInputs = [ numpy ]; propagatedBuildInputs = [ numpy + packaging ]; + preBuild = '' + # Remove existing site.cfg, use the one we built for numpy + ln -s ${numpy.cfg} site.cfg + ''; + checkPhase = '' runtest="$(pwd)/numexpr/tests/test_numexpr.py" pushd "$out" @@ -34,9 +40,14 @@ buildPythonPackage rec { popd ''; - meta = { + pythonImportsCheck = [ + "numexpr" + ]; + + meta = with lib; { description = "Fast numerical array expression evaluator for NumPy"; homepage = "https://github.com/pydata/numexpr"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 945828fbc19f..2fbe1a7a694c 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,19 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.21.4"; + + # Attention! v1.22.0 breaks scipy and by extension scikit-learn, so + # build both to verify they don't break. + # https://github.com/scipy/scipy/issues/15414 + version = "1.21.5"; + format = "pyproject.toml"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e6c76a87633aa3fa16614b61ccedfae45b91df2767cf097aa9c933932a7ed1e0"; + sha256 = "sha256-alkovGJBJk3OXtUJ5m8zZ2/Jf0ZOepGe3GcvtVMiIe4="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 8c4c8e1fbc5f..f4cc9d3140e4 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.5.2"; + version = "1.6.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "12703306872404be556648ab2282dc1566f4e77bfb9f14747fb13294c9235081"; + sha256 = "c6f99eaa65935b2c8a3f004025fb3c0309e11655c391d0fcd318d2a8665ca5c4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index f8b434a7a129..d4d9cf1811e0 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -1,40 +1,59 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pytestCheckHook -, setuptools -, packaging -, toml -, structlog -, appdirs -, pytest-asyncio -, flaky -, tornado -, pycurl , aiohttp -, pytest-httpbin +, appdirs +, buildPythonPackage , docutils +, fetchFromGitHub +, flaky , installShellFiles +, packaging +, pycurl +, pytest-asyncio +, pytest-httpbin +, pytestCheckHook +, pythonOlder +, setuptools +, structlog +, tomli +, tornado }: buildPythonPackage rec { pname = "nvchecker"; - version = "2.5"; + version = "2.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "lilydjwg"; repo = pname; rev = "v${version}"; - sha256 = "0jzmpra87dlj88d20ihnva9fj81wqbbd9qbzsjwwvzdx062136mg"; + hash = "sha256-OPUqkHLG8PUlD5NP7q/BpKUvmAA8Jk1NvsPPVbImv0A="; }; - nativeBuildInputs = [ installShellFiles docutils ]; - propagatedBuildInputs = [ setuptools packaging toml structlog appdirs tornado pycurl aiohttp ]; - checkInputs = [ pytestCheckHook pytest-asyncio flaky pytest-httpbin ]; + nativeBuildInputs = [ + docutils + installShellFiles + ]; - disabled = pythonOlder "3.7"; + propagatedBuildInputs = [ + aiohttp + appdirs + packaging + pycurl + setuptools + structlog + tomli + tornado + ]; + + checkInputs = [ + flaky + pytest-asyncio + pytest-httpbin + pytestCheckHook + ]; postBuild = '' patchShebangs docs/myrst2man.py @@ -45,7 +64,13 @@ buildPythonPackage rec { installManPage docs/_build/man/nvchecker.1 ''; - pytestFlagsArray = [ "-m 'not needs_net'" ]; + pythonImportsCheck = [ + "nvchecker" + ]; + + pytestFlagsArray = [ + "-m 'not needs_net'" + ]; meta = with lib; { homepage = "https://github.com/lilydjwg/nvchecker"; diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index 0c0781bc577b..5f652cb97f3c 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "0.2.13"; src = fetchgit { - url = meta.repositories.git; + url = "https://git.torproject.org/pluggable-transports/obfsproxy.git"; rev = "refs/tags/${pname}-${version}"; sha256 = "04ja1cl8xzqnwrd2gi6nlnxbmjri141bzwa5gybvr44d8h3k2nfa"; }; @@ -30,7 +30,6 @@ buildPythonPackage rec { meta = with lib; { description = "A pluggable transport proxy"; homepage = "https://www.torproject.org/projects/obfsproxy"; - repositories.git = "https://git.torproject.org/pluggable-transports/obfsproxy.git"; maintainers = with maintainers; [ thoughtpolice ]; }; diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix index fb48f9141e2a..da0a70aafb4c 100644 --- a/pkgs/development/python-modules/objax/default.nix +++ b/pkgs/development/python-modules/objax/default.nix @@ -7,28 +7,33 @@ , parameterized , pillow , scipy -, tensorflow-tensorboard_2 ? null +, tensorflow-tensorboard }: buildPythonPackage rec { pname = "objax"; - version = "1.4.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "google"; repo = "objax"; rev = "v${version}"; - sha256 = "09gm61ghn5mi92q5mhx22mcv6aa6z78jsrnfar1hd3nwwyn9dq42"; + sha256 = "sha256-/6tZxVDe/3C53Re14odU9VA3mKvSj9X3/xt6bHFLHwQ="; }; + # Avoid propagating the dependency on `jaxlib`, see + # https://github.com/NixOS/nixpkgs/issues/156767 + buildInputs = [ + jaxlib + ]; + propagatedBuildInputs = [ jax - jaxlib numpy parameterized pillow scipy - tensorflow-tensorboard_2 + tensorflow-tensorboard ]; pythonImportsCheck = [ @@ -40,7 +45,5 @@ buildPythonPackage rec { homepage = "https://github.com/google/objax"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; - # Darwin doesn't have `tensorflow-tensorboard_2` which is required by wheel deps. - platforms = [ "aarch64-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 2278133582c6..8fd06ae3b403 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.53.1"; + version = "2.60.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "v${version}"; - hash = "sha256-TnLKT/F36jHEfT9K6DFM2GmPRccXz1GJWIF+EEQYRls="; + hash = "sha256-fXeea4MftVSJWzanHeAuERRiQLBp8l1l1Cw2lG3uz24="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index a6c9b150ead7..fe5211802807 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.2.0"; + version = "13.4.1"; src = fetchFromGitHub { owner = "jbarlow83"; @@ -39,7 +39,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - sha256 = "sha256-mVPKcxTKoRgttwJdsY7r0kF7W1+G45iCc+mFctDipSM="; + sha256 = "sha256-gxgeEwm3cYNllcmRTZhdyIWWGKXTewyVW314k732swE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -80,6 +80,12 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + # https://github.com/ocrmypdf/OCRmyPDF/issues/933 + substituteInPlace setup.cfg \ + --replace "pdfminer.six!=20200720,>=20191110,<=20211012" "pdfminer.six!=20200720,>=20191110,<=20220319" + ''; + pythonImportsCheck = [ "ocrmypdf" ]; diff --git a/pkgs/development/python-modules/od/default.nix b/pkgs/development/python-modules/od/default.nix index e2dd2f4bf990..de64e2f8fdc8 100644 --- a/pkgs/development/python-modules/od/default.nix +++ b/pkgs/development/python-modules/od/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "od"; - version = "2.0.1"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "180fb0d13c3af1384047b8296c95683816b5d0c68a60c22d07c703be8bd755cb"; + sha256 = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk="; }; # repeated_test no longer exists in nixpkgs diff --git a/pkgs/development/python-modules/oletools/default.nix b/pkgs/development/python-modules/oletools/default.nix index 54c5c6c165b2..76019730eb70 100644 --- a/pkgs/development/python-modules/oletools/default.nix +++ b/pkgs/development/python-modules/oletools/default.nix @@ -39,6 +39,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pyparsing>=2.1.0,<3" "pyparsing>=2.1.0" + ''; + disabledTests = [ # Test fails with AssertionError: Tuples differ: ('MS Word 2007+... "test_all" diff --git a/pkgs/development/python-modules/omnikinverter/default.nix b/pkgs/development/python-modules/omnikinverter/default.nix index 6f347d9672a0..a992f14616a3 100644 --- a/pkgs/development/python-modules/omnikinverter/default.nix +++ b/pkgs/development/python-modules/omnikinverter/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "omnikinverter"; - version = "0.6.2"; + version = "0.7.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-omnikinverter"; rev = "v${version}"; - sha256 = "sha256-NnwjiaFUi2vzORu8sndtfdVpZEAIMCvT+9VEr2ZOx3k="; + sha256 = "sha256-IiU7nhwH0Mc6s+g9WtJugpORuL0qGNJFKDY5hvxIZAU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix new file mode 100644 index 000000000000..5e9a86acc6bd --- /dev/null +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, httpx +, pythonOlder +, zeep +}: + +buildPythonPackage rec { + pname = "onvif-zeep-async"; + version = "1.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-O4H6oL9cFvgX6whoESA7eRI6+VoT1ncRk/tehQT1WcM="; + }; + + propagatedBuildInputs = [ + httpx + zeep + ]; + + pythonImportsCheck = [ + "onvif" + ]; + + # Tests are not shipped + doCheck = false; + + meta = with lib; { + description = "ONVIF Client Implementation in Python"; + homepage = "https://github.com/hunterjm/python-onvif-zeep-async"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 223cf80604c4..4fb744826b79 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.12.0"; + version = "0.16.0"; disabled = pythonOlder "3.7.1"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - sha256 = "12qkbaw1gyqhs6qwyj65g6l8v5xxnilwgk0gxlwnlzrr82q458ia"; + sha256 = "sha256-9BxFOiGIf3Cy7OU0as6onV5ltECInM9wwCr+qCMuPbU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 0d48ab04a1db..199ea38ae4ab 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -1,34 +1,40 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, isodate -, dictpath -, openapi-spec-validator -, openapi-schema-validator -, six -, lazy-object-proxy , attrs -, werkzeug -, parse -, more-itertools -, pytestCheckHook -, falcon -, flask +, buildPythonPackage +, dictpath , django , djangorestframework -, responses +, falcon +, fetchFromGitHub +, flask +, isodate +, lazy-object-proxy , mock +, more-itertools +, openapi-schema-validator +, openapi-spec-validator +, parse +, pytestCheckHook +, pythonOlder +, responses +, six +, webob +, werkzeug +, python }: buildPythonPackage rec { pname = "openapi-core"; version = "0.14.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "p1c2u"; repo = "openapi-core"; rev = version; - sha256 = "1npsibyf8zx6z230yl19kyap8g25kqvgm7z1w6rm6jxv58yqsp7r"; + hash = "sha256-+VyNPSq7S1Oz4eGf+jaeRTx0lZ8pUA+G+KZ/5PyK+to="; }; postPatch = '' @@ -36,31 +42,34 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - isodate - dictpath - openapi-spec-validator - openapi-schema-validator - six - lazy-object-proxy attrs - werkzeug - parse + dictpath + isodate + lazy-object-proxy more-itertools + openapi-schema-validator + openapi-spec-validator + parse + six + werkzeug ]; checkInputs = [ - pytestCheckHook - falcon - flask django djangorestframework - responses + falcon + flask mock + pytestCheckHook + responses + webob ]; disabledTestPaths = [ # AttributeError: 'str' object has no attribute '__name__' "tests/integration/validation" + # Unable to detect SECRET_KEY and ROOT_URLCONF + "tests/integration/contrib/test_django.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 18e357c1f2d2..8251c2cd0175 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, poetry-core , pytestCheckHook , isodate , jsonschema @@ -13,13 +14,20 @@ buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.1.5"; + version = "0.2.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "a4b2712020284cee880b4c55faa513fbc2f8f07f365deda6098f8ab943c9f0df"; + src = fetchFromGitHub { + owner = "p1c2u"; + repo = pname; + rev = version; + sha256 = "sha256-HoXtDlXOoYqzsM4FxVfLQdIlpJXaNUcQo8//B4JqJoA="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; checkInputs = [ pytestCheckHook pytest-cov pytest-flake8 ]; diff --git a/pkgs/development/python-modules/openevsewifi/default.nix b/pkgs/development/python-modules/openevsewifi/default.nix new file mode 100644 index 000000000000..b42e9c86bbe1 --- /dev/null +++ b/pkgs/development/python-modules/openevsewifi/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, deprecated +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +}: + +buildPythonPackage rec { + pname = "openevsewifi"; + version = "1.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "miniconfig"; + repo = "python-openevse-wifi"; + rev = "v${version}"; + sha256 = "sha256-pNm+zupBGijCXIkdanMk7nE/+SFvSEFp9/Ht5OoxQrU="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + deprecated + requests + ]; + + checkInputs = [ + requests-mock + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/miniconfig/python-openevse-wifi/pull/31 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/miniconfig/python-openevse-wifi/commit/1083868dd9f39a8ad7bb17f02cea1b8458e5b82d.patch"; + sha256 = "sha256-XGeyi/PchBju1ICgL/ZCDGCbWwIJmLAcHuKaj+kDsI0="; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pytest-cov = "^2.8.1"' "" + ''; + + pythonImportsCheck = [ + "openevsewifi" + ]; + + meta = with lib; { + description = "Module for communicating with the wifi module from OpenEVSE"; + homepage = "https://github.com/miniconfig/python-openevse-wifi"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/openrazer/daemon.nix b/pkgs/development/python-modules/openrazer/daemon.nix index 2e44c3756e32..616d69d389b8 100644 --- a/pkgs/development/python-modules/openrazer/daemon.nix +++ b/pkgs/development/python-modules/openrazer/daemon.nix @@ -21,8 +21,6 @@ buildPythonApplication (common // rec { disabled = !isPy3k; - sourceRoot = "source/daemon"; - outputs = [ "out" "man" ]; nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; @@ -37,6 +35,10 @@ buildPythonApplication (common // rec { setproctitle ]; + prePatch = '' + cd daemon + ''; + postPatch = '' substituteInPlace openrazer_daemon/daemon.py --replace "plugdev" "openrazer" ''; diff --git a/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch b/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch new file mode 100644 index 000000000000..27b87c0b2d09 --- /dev/null +++ b/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch @@ -0,0 +1,57 @@ +From 79577371be21df40f1f6d4a4fe3453be6df9e93c Mon Sep 17 00:00:00 2001 +From: Someone Serge +Date: Fri, 31 Dec 2021 10:03:25 +0200 +Subject: [PATCH 2/4] cmake: find system-distributed gtest + +--- + opensfm/src/CMakeLists.txt | 19 +++++++------------ + 1 file changed, 7 insertions(+), 12 deletions(-) + +diff --git a/opensfm/src/CMakeLists.txt b/opensfm/src/CMakeLists.txt +index c85aa6fb..640d47a6 100644 +--- a/opensfm/src/CMakeLists.txt ++++ b/opensfm/src/CMakeLists.txt +@@ -52,12 +52,14 @@ if (OPENMP_FOUND) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + endif() + ++find_package(gflags REQUIRED) ++ + find_package(LAPACK) + find_package(SuiteSparse) + find_package(Eigen3 REQUIRED) + find_package(Ceres) +-find_package(Gflags REQUIRED) +-find_package(Glog REQUIRED) ++find_package(glog REQUIRED) ++find_package(GTest REQUIRED) + + # Ceres2 exposes Ceres::ceres target. + # Ceres1 exposes just ceres. +@@ -100,20 +102,13 @@ option(OPENSFM_BUILD_TESTS "Build OpenSfM unit tests." on) + + if (OPENSFM_BUILD_TESTS) + enable_testing() +- include_directories(third_party/gtest) +- add_definitions(-DCERES_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) +- +- add_library(gtest +- third_party/gtest/gmock_gtest_all.cc +- third_party/gtest/gmock_main.cc) +- target_include_directories(gtest PRIVATE ${GFLAGS_INCLUDE_DIR}) + + set(TEST_MAIN test_main) + add_library(${TEST_MAIN} testing_main.cc) + target_link_libraries(${TEST_MAIN} +- ${GFLAGS_LIBRARY} +- ${GLOG_LIBRARY} +- gtest) ++ gflags ++ glog::glog ++ GTest::gtest) + endif() + + ####### OpenSfM libraries ####### +-- +2.33.1 + diff --git a/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch b/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch new file mode 100644 index 000000000000..2815886e7e18 --- /dev/null +++ b/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch @@ -0,0 +1,161 @@ +From 36820fbab1abeeebd99f14e368093e0e3f934ca7 Mon Sep 17 00:00:00 2001 +From: Someone Serge +Date: Sat, 19 Feb 2022 02:37:54 +0200 +Subject: [PATCH 3/4] cmake: use system pybind11 + +--- + opensfm/src/CMakeLists.txt | 3 ++- + opensfm/src/bundle/CMakeLists.txt | 2 +- + opensfm/src/dense/CMakeLists.txt | 2 +- + opensfm/src/features/CMakeLists.txt | 1 - + opensfm/src/foundation/CMakeLists.txt | 1 - + opensfm/src/geo/CMakeLists.txt | 1 - + opensfm/src/geometry/CMakeLists.txt | 1 - + opensfm/src/map/CMakeLists.txt | 3 +-- + opensfm/src/robust/CMakeLists.txt | 1 - + opensfm/src/sfm/CMakeLists.txt | 1 - + 10 files changed, 5 insertions(+), 11 deletions(-) + +diff --git a/opensfm/src/CMakeLists.txt b/opensfm/src/CMakeLists.txt +index 640d47a6..6e391ffa 100644 +--- a/opensfm/src/CMakeLists.txt ++++ b/opensfm/src/CMakeLists.txt +@@ -54,6 +54,8 @@ endif() + + find_package(gflags REQUIRED) + ++find_package(pybind11 REQUIRED) ++ + find_package(LAPACK) + find_package(SuiteSparse) + find_package(Eigen3 REQUIRED) +@@ -82,7 +84,6 @@ else() + endif() + + ####### Third party libraries ####### +-add_subdirectory(third_party/pybind11) + add_subdirectory(third_party/akaze) + add_subdirectory(third_party/vlfeat) + +diff --git a/opensfm/src/bundle/CMakeLists.txt b/opensfm/src/bundle/CMakeLists.txt +index 7cd9cf74..307e963a 100644 +--- a/opensfm/src/bundle/CMakeLists.txt ++++ b/opensfm/src/bundle/CMakeLists.txt +@@ -52,7 +52,7 @@ target_link_libraries(pybundle PRIVATE + bundle + geometry + foundation +- pybind11) ++) + set_target_properties(pybundle PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." + ) +diff --git a/opensfm/src/dense/CMakeLists.txt b/opensfm/src/dense/CMakeLists.txt +index cbebb5ea..2728749d 100644 +--- a/opensfm/src/dense/CMakeLists.txt ++++ b/opensfm/src/dense/CMakeLists.txt +@@ -23,7 +23,7 @@ endif() + + pybind11_add_module(pydense python/pybind.cc) + target_include_directories(pydense PRIVATE ${GLOG_INCLUDE_DIR}) +-target_link_libraries(pydense PRIVATE dense foundation pybind11) ++target_link_libraries(pydense PRIVATE dense foundation) + set_target_properties(pydense PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." + ) +diff --git a/opensfm/src/features/CMakeLists.txt b/opensfm/src/features/CMakeLists.txt +index b131d30a..6db5b3f1 100644 +--- a/opensfm/src/features/CMakeLists.txt ++++ b/opensfm/src/features/CMakeLists.txt +@@ -22,7 +22,6 @@ target_link_libraries(pyfeatures + PRIVATE + features + foundation +- pybind11 + akaze + ) + set_target_properties(pyfeatures PROPERTIES +diff --git a/opensfm/src/foundation/CMakeLists.txt b/opensfm/src/foundation/CMakeLists.txt +index 40185227..9e0e45e7 100644 +--- a/opensfm/src/foundation/CMakeLists.txt ++++ b/opensfm/src/foundation/CMakeLists.txt +@@ -12,7 +12,6 @@ set(FOUNDATION_FILES + add_library(foundation ${FOUNDATION_FILES}) + target_link_libraries(foundation + PUBLIC +- pybind11 + ${OpenCV_LIBS} + ${OpenMP_libomp_LIBRARY} + Eigen3::Eigen +diff --git a/opensfm/src/geo/CMakeLists.txt b/opensfm/src/geo/CMakeLists.txt +index a9cbae02..75620d06 100644 +--- a/opensfm/src/geo/CMakeLists.txt ++++ b/opensfm/src/geo/CMakeLists.txt +@@ -29,7 +29,6 @@ target_link_libraries(pygeo + PRIVATE + geo + foundation +- pybind11 + ) + set_target_properties(pygeo PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." +diff --git a/opensfm/src/geometry/CMakeLists.txt b/opensfm/src/geometry/CMakeLists.txt +index e6dda2c2..51bfd6c5 100644 +--- a/opensfm/src/geometry/CMakeLists.txt ++++ b/opensfm/src/geometry/CMakeLists.txt +@@ -48,7 +48,6 @@ target_link_libraries(pygeometry + PRIVATE + geometry + foundation +- pybind11 + ) + set_target_properties(pygeometry PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." +diff --git a/opensfm/src/map/CMakeLists.txt b/opensfm/src/map/CMakeLists.txt +index b6f67bcd..f869aa4c 100644 +--- a/opensfm/src/map/CMakeLists.txt ++++ b/opensfm/src/map/CMakeLists.txt +@@ -20,7 +20,7 @@ set(MAP_FILES + add_library(map ${MAP_FILES}) + target_link_libraries(map + PUBLIC +- pybind11 ++ pybind11::module + Eigen3::Eigen + PRIVATE + geo +@@ -39,7 +39,6 @@ target_link_libraries(pymap + map + geometry + bundle +- pybind11 + ) + + if (OPENSFM_BUILD_TESTS) +diff --git a/opensfm/src/robust/CMakeLists.txt b/opensfm/src/robust/CMakeLists.txt +index ce70749f..40bdf7a4 100644 +--- a/opensfm/src/robust/CMakeLists.txt ++++ b/opensfm/src/robust/CMakeLists.txt +@@ -29,7 +29,6 @@ target_link_libraries(pyrobust + PRIVATE + robust + foundation +- pybind11 + ) + set_target_properties(pyrobust PROPERTIES + LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." +diff --git a/opensfm/src/sfm/CMakeLists.txt b/opensfm/src/sfm/CMakeLists.txt +index 98c28f41..7f56b791 100644 +--- a/opensfm/src/sfm/CMakeLists.txt ++++ b/opensfm/src/sfm/CMakeLists.txt +@@ -35,7 +35,6 @@ target_include_directories(pysfm PRIVATE ${GLOG_INCLUDE_DIR}) + target_link_libraries(pysfm + PRIVATE + foundation +- pybind11 + sfm + ) + set_target_properties(pysfm PROPERTIES +-- +2.33.1 + diff --git a/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch b/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch new file mode 100644 index 000000000000..f3cb2db00ecb --- /dev/null +++ b/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch @@ -0,0 +1,86 @@ +From c35b110a83286e7413d7309eb218eb43b52f7d48 Mon Sep 17 00:00:00 2001 +From: Someone Serge +Date: Sat, 19 Feb 2022 14:36:12 +0200 +Subject: [PATCH 4/4] pybind_utils.h: conflicts with nixpkgs' pybind + +--- + opensfm/src/map/pybind_utils.h | 45 +++------------------------------- + 1 file changed, 3 insertions(+), 42 deletions(-) + +diff --git a/opensfm/src/map/pybind_utils.h b/opensfm/src/map/pybind_utils.h +index 817d1a16..3f98a2ab 100644 +--- a/opensfm/src/map/pybind_utils.h ++++ b/opensfm/src/map/pybind_utils.h +@@ -52,38 +52,6 @@ struct sfm_iterator_state { + }; + PYBIND11_NAMESPACE_END_(detail) + +-/// Makes an python iterator over the keys (`.first`) of a iterator over pairs +-/// from a first and past-the-end InputIterator. +-template ()).second), +- typename... Extra> +-iterator make_value_iterator(Iterator first, Sentinel last, Extra &&... extra) { +- typedef detail::sfm_iterator_state +- state; +- +- if (!detail::get_type_info(typeid(state), false)) { +- class_(handle(), "iterator", pybind11::module_local()) +- .def("__iter__", [](state &s) -> state & { return s; }) +- .def("__next__", +- [](state &s) -> KeyType { +- if (!s.first_or_done) +- ++s.it; +- else +- s.first_or_done = false; +- if (s.it == s.end) { +- s.first_or_done = true; +- throw stop_iteration(); +- } +- return (*s.it).second; +- }, +- std::forward(extra)..., Policy); +- } +- +- return cast(state{first, last, true}); +-} +- + template ()).second)), +@@ -148,12 +116,13 @@ iterator make_ref_iterator(Iterator first, Sentinel last, Extra &&... extra) { + } + + /// Makes a python iterator from a first and past-the-end C++ InputIterator. +-template ()), + typename... Extra> + iterator make_ptr_iterator(Iterator first, Sentinel last, Extra &&... extra) { +- typedef detail::iterator_state state; ++ typedef detail::iterator_state state; + + if (!detail::get_type_info(typeid(state), false)) { + class_(handle(), "iterator", pybind11::module_local()) +@@ -176,14 +145,6 @@ iterator make_ptr_iterator(Iterator first, Sentinel last, Extra &&... extra) { + return cast(state{first, last, true}); + } + +-/// Makes an iterator over the keys (`.first`) of a stl map-like container +-/// supporting `std::begin()`/`std::end()` +-template +-iterator make_value_iterator(Type &value, Extra &&... extra) { +- return make_value_iterator(std::begin(value), std::end(value), +- extra...); +-} + template + iterator make_unique_ptr_value_iterator(Type &value, Extra &&... extra) { +-- +2.33.1 + diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix new file mode 100644 index 000000000000..ae1ef7b59555 --- /dev/null +++ b/pkgs/development/python-modules/opensfm/default.nix @@ -0,0 +1,124 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, cmake +, opencv4 +, ceres-solver +, suitesparse +, metis +, eigen +, pkg-config +, pybind11 +, numpy +, pyyaml +, lapack +, gtest +, gflags +, glog +, pytestCheckHook +, networkx +, pillow +, exifread +, gpxpy +, pyproj +, python-dateutil +, joblib +, repoze_lru +, xmltodict +, cloudpickle +, scipy +, sphinx +, matplotlib +, fpdf +, +}: + +let + ceresSplit = (builtins.length ceres-solver.outputs) > 1; + ceres' = + if ceresSplit + then ceres-solver.dev + else ceres-solver; +in +buildPythonPackage rec { + pname = "OpenSfM"; + version = "unstable-2022-03-10"; + + src = fetchFromGitHub { + owner = "mapillary"; + repo = pname; + rev = "536b6e1414c8a93f0815dbae85d03749daaa5432"; + sha256 = "Nfl20dFF2PKOkIvHbRxu1naU+qhz4whLXJvX5c5Wnwo="; + }; + patches = [ + ./0002-cmake-find-system-distributed-gtest.patch + ./0003-cmake-use-system-pybind11.patch + ./0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch + ./fix-scripts.patch + ]; + postPatch = '' + rm opensfm/src/cmake/FindGlog.cmake + rm opensfm/src/cmake/FindGflags.cmake + + # HAHOG is the default descriptor. + # We'll test both HAHOG and SIFT because this is + # where segfaults might be introduced in future + echo 'feature_type: SIFT' >> data/berlin/config.yaml + echo 'feature_type: HAHOG' >> data/lund/config.yaml + ''; + + nativeBuildInputs = [ cmake pkg-config sphinx ]; + buildInputs = [ + ceres' + suitesparse + metis + eigen + lapack + gflags + gtest + glog + pybind11 + ]; + propagatedBuildInputs = [ + numpy + scipy + pyyaml + opencv4 + networkx + pillow + matplotlib + fpdf + exifread + gpxpy + pyproj + python-dateutil + joblib + repoze_lru + xmltodict + cloudpickle + ]; + checkInputs = [ pytestCheckHook ]; + + dontUseCmakeBuildDir = true; + cmakeFlags = [ + "-Bcmake_build" + "-Sopensfm/src" + ]; + + disabledTests = lib.optionals stdenv.isDarwin [ + "test_reconstruction_incremental" + "test_reconstruction_triangulation" + ]; + + pythonImportsCheck = [ "opensfm" ]; + + meta = { + maintainers = [ lib.maintainers.SomeoneSerge ]; + license = lib.licenses.bsd2; + changelog = "https://github.com/mapillary/OpenSfM/blob/${src.rev}/CHANGELOG.md"; + description = "Open source Structure-from-Motion pipeline from Mapillary"; + homepage = "https://opensfm.org/"; + }; +} diff --git a/pkgs/development/python-modules/opensfm/fix-scripts.patch b/pkgs/development/python-modules/opensfm/fix-scripts.patch new file mode 100644 index 000000000000..634820a32755 --- /dev/null +++ b/pkgs/development/python-modules/opensfm/fix-scripts.patch @@ -0,0 +1,41 @@ +diff --git a/bin/opensfm b/bin/opensfm +index b5ee4b15..f05c0d1c 100755 +--- a/bin/opensfm ++++ b/bin/opensfm +@@ -1,12 +1,6 @@ +-#!/bin/bash ++#!/usr/bin/env bash + set -e + + DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) + +-if [ -x "$(command -v python3)" ]; then +- PYTHON=python3 +-else +- PYTHON=python +-fi +- +-"$PYTHON" "$DIR"/opensfm_main.py "$@" ++exec "$DIR"/opensfm_main.py "$@" +diff --git a/bin/opensfm_main.py b/bin/opensfm_main.py +index 31249e12..cc71560c 100755 +--- a/bin/opensfm_main.py ++++ b/bin/opensfm_main.py +@@ -1,3 +1,5 @@ ++#!/usr/bin/env python ++ + import sys + from os.path import abspath, join, dirname + +diff --git a/setup.py b/setup.py +index 1120717f..438a16db 100644 +--- a/setup.py ++++ b/setup.py +@@ -71,6 +71,7 @@ setuptools.setup( + scripts=[ + "bin/opensfm_run_all", + "bin/opensfm", ++ "bin/opensfm_main.py", + ], + package_data={ + "opensfm": [ diff --git a/pkgs/development/python-modules/opensimplex/default.nix b/pkgs/development/python-modules/opensimplex/default.nix index 6832266b87ad..a813c1bf95eb 100644 --- a/pkgs/development/python-modules/opensimplex/default.nix +++ b/pkgs/development/python-modules/opensimplex/default.nix @@ -1,24 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub -, nose +, numpy +, pytestCheckHook }: buildPythonPackage rec { pname = "opensimplex"; - version = "0.3"; + version = "0.4.2"; src = fetchFromGitHub { owner = "lmas"; repo = pname; rev = "v${version}"; - sha256 = "idF5JQGnAye6z3c3YU9rsHaebB3rlHJfA8vSpjDnFeM="; + sha256 = "zljS0yu3cHF2Vz3rFkwLXiHnKjo970MDIrC/56FoHa4="; }; - checkInputs = [ nose ]; - checkPhase = '' - nosetests tests/ - ''; + propagatedBuildInputs = [ numpy ]; + + checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests/test_opensimplex.py" ]; pythonImportsCheck = [ "opensimplex" ]; meta = with lib; { @@ -31,6 +32,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/lmas/opensimplex"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix new file mode 100644 index 000000000000..0a04006704c1 --- /dev/null +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, dulwich +, pbr +, sphinx +}: + +buildPythonPackage rec { + pname = "openstackdocstheme"; + version = "2.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-dFrZTObRDKB8aw1/i6febpttymbY3cPzA3ckNuhVt4c="; + }; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + propagatedBuildInputs = [ dulwich pbr sphinx ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "openstackdocstheme" ]; + + meta = with lib; { + description = "Sphinx theme for RST-sourced documentation published to docs.openstack.org"; + homepage = "https://github.com/openstack/openstackdocstheme"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/optax/default.nix b/pkgs/development/python-modules/optax/default.nix index bf0383fa1530..6a3b6a9d3e67 100644 --- a/pkgs/development/python-modules/optax/default.nix +++ b/pkgs/development/python-modules/optax/default.nix @@ -22,10 +22,11 @@ buildPythonPackage rec { sha256 = "1q8cxc42a5xais2ll1l238cnn3l7w28savhgiz0lg01ilz2ysbli"; }; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ absl-py chex - jaxlib numpy ]; diff --git a/pkgs/development/python-modules/orderedset/default.nix b/pkgs/development/python-modules/orderedset/default.nix index db9c265ef3ef..9910aefe1cbe 100644 --- a/pkgs/development/python-modules/orderedset/default.nix +++ b/pkgs/development/python-modules/orderedset/default.nix @@ -14,5 +14,8 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/orderedset"; license = licenses.bsd3; maintainers = [ maintainers.jtojnar ]; + # No support for Python 3.9/3.10 + # https://github.com/simonpercivall/orderedset/issues/36 + broken = true; }; } diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 98fc412869de..d639f6567293 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -15,20 +15,20 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.6.6"; + version = "3.6.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; repo = pname; rev = version; - sha256 = "00s8pwvq830h2y77pwx1i2vfvnzisvp41qhzqcp1piyc3pwxfc13"; + sha256 = "1a55f1ipii7hg42bvsii053xczbgwwv8w6wgdb14qyirm5c9szd3"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "0l1zvkr06kwclgxy1qz9fxa1gjrpf5nnx6hb12j4ymyyxpcmn8rz"; + sha256 = "1piy0b1gh56n8srzhyd1n971a6pqpgmwhr4v9a81wg0xkbva8gdk"; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index fee9af147154..5546f58b2624 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -1,37 +1,39 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, poetry-core -, databases -, pydantic -, sqlalchemy -, asyncpg -, psycopg2 , aiomysql -, aiosqlite -, cryptography -, orjson -, typing-extensions -, importlib-metadata , aiopg -, mysqlclient -, pymysql -, pytestCheckHook -, pytest-asyncio +, aiosqlite +, asyncpg +, buildPythonPackage +, cryptography +, databases , fastapi +, fetchFromGitHub +, importlib-metadata +, mysqlclient +, orjson +, poetry-core +, psycopg2 +, pydantic +, pymysql +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, sqlalchemy +, typing-extensions }: buildPythonPackage rec { pname = "ormar"; - version = "0.10.23"; + version = "0.11.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "collerek"; repo = pname; rev = version; - sha256 = "sha256-ILJvJyd56lqlKq7+mUz26LvusYb5AOOfoA7OgNq2fT0="; + hash = "sha256-I41asBWwOwmi6Yhw/JZ/EcpDWMAoPyxPIGIPiZQV+Yk="; }; nativeBuildInputs = [ @@ -39,16 +41,15 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - databases - pydantic - sqlalchemy - asyncpg - psycopg2 aiomysql aiosqlite + asyncpg cryptography - + databases orjson + psycopg2 + pydantic + sqlalchemy ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions importlib-metadata @@ -56,24 +57,35 @@ buildPythonPackage rec { checkInputs = [ aiomysql - aiosqlite aiopg + aiosqlite asyncpg - - psycopg2 - mysqlclient - pymysql - - pytestCheckHook - pytest-asyncio fastapi + mysqlclient + psycopg2 + pymysql + pytest-asyncio + pytestCheckHook ]; - pythonImportsCheck = [ "ormar" ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'SQLAlchemy = ">=1.3.18,<=1.4.29"' 'SQLAlchemy = ">=1.3.18"' \ + --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<0.5.5"' 'databases = ">=0.5.5"' + ''; + + disabledTests = [ + # TypeError: Object of type bytes is not JSON serializable + "test_bulk_operations_with_json" + ]; + + pythonImportsCheck = [ + "ormar" + ]; meta = with lib; { homepage = "https://github.com/collerek/ormar"; - description = "A simple async ORM with fastapi in mind and pydantic validation."; + description = "Async ORM with fastapi in mind and pydantic validation"; license = licenses.mit; maintainers = with maintainers; [ andreasfelix ]; }; diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 560c8869b00f..e9a662412b77 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , cliff , oslo-i18n , oslo-utils @@ -13,13 +13,18 @@ buildPythonPackage rec { pname = "osc-lib"; - version = "2.4.2"; + version = "unstable-2022-03-09"; - src = fetchPypi { - inherit pname version; - sha256 = "d6b530e3e50646840a6a5ef134e00f285cc4a04232c163f28585226ed40cc968"; + src = fetchFromGitHub { + owner = "openstack"; + repo = "osc-lib"; + rev = "65c73fd5030276e34f3d52c03ddb9d27cd8ec6f5"; + sha256 = "sha256-CLE9lrMMlvVrihe+N4wvIKe8t9IZ1TpHHVdn2dnvAOI="; }; + # fake version to make pbr.packaging happy and not reject it... + PBR_VERSION = "2.5.0"; + nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix index cc89f3124806..b4d1c8fb88af 100644 --- a/pkgs/development/python-modules/oscrypto/default.nix +++ b/pkgs/development/python-modules/oscrypto/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , asn1crypto , fetchPypi @@ -35,6 +36,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "oscrypto" ]; + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Encryption library for Python"; homepage = "https://github.com/wbond/oscrypto"; diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index 125481d1e026..f7e09692945a 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "oslo-config"; - version = "8.7.1"; + version = "8.8.0"; src = fetchPypi { pname = "oslo.config"; inherit version; - sha256 = "a0c346d778cdc8870ab945e438bea251b5f45fae05d6d99dfe4953cca2277b60"; + sha256 = "sha256-lpM9MBHa4VYIoRYWv7ANlH4i2jywm2/zfd11dqvUdkw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 5070b43515e8..3fd7c4e28c5c 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "11.1.0"; + version = "11.2.0"; src = fetchPypi { pname = "oslo.db"; inherit version; - sha256 = "8469c54544f1c0d7ac0a998477033eab13733b186d159554311c6132b43862e9"; + sha256 = "sha256-ezppPrC1BEkUmiJWGMdQtvDhZWyEJoGEe0e4UK1FYL4="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index dd2d69a0c23d..a2e6eac8e389 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -10,7 +10,7 @@ , pbr , pyinotify , python-dateutil -, stestr +, pytestCheckHook }: buildPythonPackage rec { @@ -36,12 +36,13 @@ buildPythonPackage rec { checkInputs = [ oslotest - stestr + pytestCheckHook ]; - checkPhase = '' - stestr run - ''; + disabledTests = [ + # not compatible with sandbox + "test_logging_handle_error" + ]; pythonImportsCheck = [ "oslo_log" ]; diff --git a/pkgs/development/python-modules/oslo-serialization/default.nix b/pkgs/development/python-modules/oslo-serialization/default.nix index e6b8d0d0c422..e59258dda782 100644 --- a/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/pkgs/development/python-modules/oslo-serialization/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "oslo-serialization"; - version = "4.2.0"; + version = "4.3.0"; src = fetchPypi { pname = "oslo.serialization"; inherit version; - sha256 = "3007e1b017ad3754cce54def894054cbcd05887e85928556657434b0fc7e4d83"; + sha256 = "sha256-OqRy9DSu6LvMByUxK39AmqH6VLvBNJBBJM9JsOhrkRU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index 35a3447243f5..aeea9b742a93 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "4.12.1"; + version = "4.12.2"; src = fetchPypi { pname = "oslo.utils"; inherit version; - sha256 = "sha256-zzEhx2/jwpY+1WOo68PJ/TvDy6XUT76K7LVAfUMMMJI="; + sha256 = "sha256-Qf0sT/bS6No4qttaW/JCWKhlDg4KaYprI51IuOQXfDs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index 4cc0ce80d4d1..75a2ce44630b 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "osmnx"; - version = "1.1.1"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "gboeing"; repo = pname; rev = "v${version}"; - sha256 = "0dkv3fnlq23d7d30lhdf4a313lxy3a5qfldidvszs1z9n16ycnwb"; + sha256 = "sha256-qrTAXZFm88elMrVjvGwfdNwTA/PRdCOHFqpcgoKVGNk="; }; propagatedBuildInputs = [ geopandas matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy gdal rasterio ]; diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 1db266e116d4..865bd45c61b3 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -5,6 +5,7 @@ , future , numpy , qdldl +, setuptools-scm , scipy # check inputs , pytestCheckHook @@ -13,14 +14,16 @@ buildPythonPackage rec { pname = "osqp"; - version = "0.6.2.post0"; + version = "0.6.2.post5"; src = fetchPypi { inherit pname version; - sha256 = "5f0695f26a3bef0fae91254bc283fab790dcca0064bfe0f425167f9c9e8b4cbc"; + sha256 = "b2fa17aae42a7ed498ec261b33f262bb4b3605e7e8464062159d9fae817f0d61"; }; - nativeBuildInputs = [ cmake ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ cmake setuptools-scm ]; dontUseCmakeConfigure = true; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ovoenergy/default.nix b/pkgs/development/python-modules/ovoenergy/default.nix index 42615fa664dd..1e60872b2c1b 100644 --- a/pkgs/development/python-modules/ovoenergy/default.nix +++ b/pkgs/development/python-modules/ovoenergy/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "ovoenergy"; - version = "1.1.12"; + version = "1.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "timmo001"; repo = pname; rev = "v${version}"; - sha256 = "1430k699gblxwspsbgxnha8afk6npqharhz2jyjw5gir9pi6g9cz"; + hash = "sha256-OSK74uvpHuEtWgbLVFrz1NO7lvtHbt690smGQ+GlsOI="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "ovoenergy" ]; + pythonImportsCheck = [ + "ovoenergy" + ]; meta = with lib; { description = "Python client for getting data from OVO's API"; diff --git a/pkgs/development/python-modules/p1monitor/default.nix b/pkgs/development/python-modules/p1monitor/default.nix index d1530c797198..7a8bc9fd050b 100644 --- a/pkgs/development/python-modules/p1monitor/default.nix +++ b/pkgs/development/python-modules/p1monitor/default.nix @@ -1,8 +1,11 @@ { lib , aiohttp +, aresponses , buildPythonPackage , fetchFromGitHub , poetry-core +, pytest-asyncio +, pytestCheckHook , pythonOlder , yarl }: @@ -12,13 +15,13 @@ buildPythonPackage rec { version = "1.1.0"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-p1monitor"; rev = "v${version}"; - sha256 = "1ciaclgq4aknldjqlqa08jcab28sbqrjxy5nqqwlnb2wlprg5ijz"; + hash = "sha256-X8by8qVcLEs5xrb4LjNeGomlmERAYYplo3Yqgh9lKrI="; }; nativeBuildInputs = [ @@ -30,13 +33,24 @@ buildPythonPackage rec { yarl ]; - # Project has no tests - doCheck = false; + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; - pythonImportsCheck = [ "p1monitor" ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"0.0.0"' '"${version}"' \ + --replace 'addopts = "--cov"' "" + ''; + + pythonImportsCheck = [ + "p1monitor" + ]; meta = with lib; { - description = "Python client for the P1 Monitor"; + description = "Module for interacting with the P1 Monitor"; homepage = "https://github.com/klaasnicolaas/python-p1monitor"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index 564a08b4eb79..5236cc7bbf8e 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.9.6"; + version = "0.9.8.1"; src = fetchPypi { inherit pname version; - sha256 = "c01fbaf62ad2eb791e97158d1f30349e830bee2dd3e9503a87f6c3ffae8d1cf0"; + sha256 = "sha256-Z14OyAWPoIN6BAUEcXi96mp9C0aWaYP6eeHAoa+rHJ4="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 880a5afdce63..536f883f29a2 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.3.4"; + version = "1.3.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "a2aa18d3f0b7d538e21932f637fbfe8518d085238b429e4790a35e1e44a96ffc"; + sha256 = "1e4285f5de1012de20ca46b188ccf33521bff61ba5c5ebd78b4fb28e5416a9f1"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 8673c637eda6..48247112d958 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -9,40 +9,23 @@ , pyct , testpath , tqdm -, callPackage +, nodejs }: -let - node = callPackage ./node { }; -in buildPythonPackage rec { pname = "panel"; - version = "0.12.6"; + version = "0.12.7"; - # Don't forget to also update the node packages - # 1. retrieve the package.json file - # 2. nix shell nixpkgs#nodePackages.node2nix - # 3. node2nix + format = "wheel"; + + # We fetch a wheel because while we can fetch the node + # artifacts using npm, the bundling invoked in setup.py + # tries to fetch even more artifacts src = fetchPypi { - inherit pname version; - sha256 = "97e158e8eb941f88d71929407f9455c903b5e18d89969db8ce8af66036f46b53"; + inherit pname version format; + hash = "sha256-VcoMGYT48WduyuyTB/4KJybT/pBKV0hB1pSpZGagAeA="; }; - # Since 0.10.0 panel attempts to fetch from the web. - # We avoid this: - # - we use node2nix to fetch assets - # - we disable bundling (which also tries to fetch assets) - # Downside of disabling bundling is that in an airgapped environment - # one may miss assets. - # https://github.com/holoviz/panel/issues/1819 - preBuild = '' - substituteInPlace setup.py --replace "bundle_resources()" "" - pushd panel - ln -s ${node.nodeDependencies}/lib/node_modules - export PATH="${node.nodeDependencies}/bin:$PATH" - popd - ''; - propagatedBuildInputs = [ bleach bokeh @@ -58,7 +41,7 @@ buildPythonPackage rec { doCheck = false; passthru = { - inherit node; # For convenience + inherit nodejs; # For convenience }; meta = with lib; { diff --git a/pkgs/development/python-modules/panel/node/default.nix b/pkgs/development/python-modules/panel/node/default.nix deleted file mode 100644 index 64326c6b2160..000000000000 --- a/pkgs/development/python-modules/panel/node/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/development/python-modules/panel/node/node-env.nix b/pkgs/development/python-modules/panel/node/node-env.nix deleted file mode 100644 index 21089c4d5459..000000000000 --- a/pkgs/development/python-modules/panel/node/node-env.nix +++ /dev/null @@ -1,573 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules - - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi - - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) - cd $TMPDIR - - unpackFile ${src} - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" - - if [ -f "${src}" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash ${src})" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" - fi - - # Unset the stripped name to not confuse the next unpack step - unset strippedName - - # Include the dependencies of the package - cd "$DIR/${packageName}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - replaceDependencies(packageObj.optionalDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 1, - requires: true, - dependencies: {} - }; - - function augmentPackageJSON(filePath, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install - fi - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}-${version}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell <=3.9.1,<3.10" "isbnlib~=3.9" \ - --replace "python-slugify>=1.2.6,<4" "python-slugify" + --replace "isbnlib>=3.9.1,<3.10" "isbnlib>=3.9" + substituteInPlace setup.cfg \ + --replace "--cov=papis" "" ''; - doCheck = !stdenv.isDarwin; + # Tests are failing on Python > 3.9 + doCheck = !stdenv.isDarwin && !(pythonAtLeast "3.10"); checkInputs = ([ - pytest pytest-cov + pytestCheckHook ]) ++ [ xdg-utils ]; - # most of the downloader tests and 4 other tests require a network connection - # test_export_yaml and test_citations check for the exact output produced by pyyaml 3.x and - # fail with 5.x - checkPhase = '' - HOME=$(mktemp -d) pytest papis tests --ignore tests/downloaders \ - -k "not test_get_data and not test_doi_to_data and not test_general and not get_document_url \ - and not test_validate_arxivid and not test_downloader_getter and not match" + preCheck = '' + export HOME=$(mktemp -d); ''; - meta = { + pytestFlagsArray = [ + "papis tests" + ]; + + disabledTestPaths = [ + "tests/downloaders" + ]; + + disabledTests = [ + "get_document_url" + "match" + "test_doi_to_data" + "test_downloader_getter" + "test_general" + "test_get_data" + "test_validate_arxivid" + "test_yaml" + ]; + + pythonImportsCheck = [ + "papis" + ]; + + meta = with lib; { description = "Powerful command-line document and bibliography manager"; - homepage = "https://papis.readthedocs.io/en/latest/"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ nico202 teto ]; + homepage = "https://papis.readthedocs.io/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nico202 teto ]; }; } diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index d271111d58f2..c5680c5c8a36 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -9,16 +9,17 @@ , pynacl , pytest-relaxed , pytestCheckHook +, fetchpatch }: buildPythonPackage rec { pname = "paramiko"; - version = "2.9.1"; + version = "2.10.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-of3e07VfYdIzieT+UtmuQolgrJWNLt9QNz+qXYkm7dA="; + sha256 = "sha256-3bGXeFOu+CgEs11yoOWXskT6MmxATDUL0AxbAdv+5xo="; }; propagatedBuildInputs = [ @@ -37,6 +38,8 @@ buildPythonPackage rec { # with python 3.9.6+, the deprecation warnings will fail the test suite # see: https://github.com/pyinvoke/invoke/issues/829 + # pytest-relaxed does not work with pytest 6 + # see: https://github.com/bitprophet/pytest-relaxed/issues/12 doCheck = false; disabledTestPaths = [ @@ -48,6 +51,15 @@ buildPythonPackage rec { "paramiko" ]; + patches = [ + # Fix usage of dsa keys + # https://github.com/paramiko/paramiko/pull/1606/ + (fetchpatch { + url = "https://github.com/paramiko/paramiko/commit/18e38b99f515056071fb27b9c1a4f472005c324a.patch"; + sha256 = "sha256-bPDghPeLo3NiOg+JwD5CJRRLv2VEqmSx1rOF2Tf8ZDA="; + }) + ]; + __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/pkgs/development/python-modules/parts/default.nix b/pkgs/development/python-modules/parts/default.nix index 4c798f43c25c..65ebd1bf3a15 100644 --- a/pkgs/development/python-modules/parts/default.nix +++ b/pkgs/development/python-modules/parts/default.nix @@ -1,16 +1,19 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "parts"; - version = "1.2.2"; + version = "1.3.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "6463d5c49142d14029196a6a781b57bc98ba5b3d93244f4ed637f534d08129c1"; + sha256 = "sha256-NrhNpWyzqwn1bNnuqmcyKcUED0A4v7VJE4ZlTHFafJY="; }; # Project has no tests diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix index 268e90020100..878b2746758c 100644 --- a/pkgs/development/python-modules/parver/default.nix +++ b/pkgs/development/python-modules/parver/default.nix @@ -3,7 +3,7 @@ , fetchPypi , six , attrs -, pytest +, pytestCheckHook , hypothesis , pretend , arpeggio @@ -18,11 +18,27 @@ buildPythonPackage rec { sha256 = "c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3"; }; - propagatedBuildInputs = [ six attrs arpeggio ]; - checkInputs = [ pytest hypothesis pretend ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "arpeggio ~= 1.7" "arpeggio" + ''; - meta = { - description = "parver allows parsing and manipulation of PEP 440 version numbers."; - license = lib.licenses.mit; + propagatedBuildInputs = [ + six + attrs + arpeggio + ]; + + checkInputs = [ + pytestCheckHook + hypothesis + pretend + ]; + + meta = with lib; { + description = "Allows parsing and manipulation of PEP 440 version numbers"; + homepage = "https://github.com/RazerM/parver"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index c4bcfaf85932..ab29ab74d684 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -1,4 +1,5 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi , nose , bcrypt @@ -18,8 +19,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ bcrypt argon2_cffi ]; propagatedNativeBuildInputs = [ argon2_cffi ]; - meta = { + meta = with lib; { description = "A password hashing library for Python"; - homepage = "https://code.google.com/p/passlib/"; + homepage = "https://foss.heptapod.net/python-libs/passlib"; + license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/python-modules/pathable/default.nix b/pkgs/development/python-modules/pathable/default.nix new file mode 100644 index 000000000000..39679fb1f575 --- /dev/null +++ b/pkgs/development/python-modules/pathable/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, poetry-core +}: + +buildPythonPackage rec { + pname = "pathable"; + version = "0.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "p1c2u"; + repo = pname; + rev = version; + hash = "sha256-3qekweG+o7f6nm1cnCEHrWYn/fQ42GZrZkPwGbZcU38="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + sed -i "/--cov/d" pyproject.toml + ''; + + pythonImportsCheck = [ + "pathable" + ]; + + meta = with lib; { + description = "Library for object-oriented paths"; + homepage = "https://github.com/p1c2u/pathable"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/patrowl4py/default.nix b/pkgs/development/python-modules/patrowl4py/default.nix index 3dc1fc038bc7..22de8feb0e74 100644 --- a/pkgs/development/python-modules/patrowl4py/default.nix +++ b/pkgs/development/python-modules/patrowl4py/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "patrowl4py"; - version = "1.1.7"; + version = "1.1.9"; src = fetchFromGitHub { owner = "Patrowl"; repo = "Patrowl4py"; rev = version; - sha256 = "19r9ym31bcaxcrv35gnfx5k8mn5lyascqzdr312rzc7ikbhcj73s"; + sha256 = "sha256-ZGvntLbXIWmL0WoT+kQoNT6gDPgsSKwHQQjYlarvnKo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 8775faa53c24..7a03226b4dde 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.8.0"; + version = "5.8.1"; src = fetchPypi { inherit pname version; - sha256 = "672d8ebee84921862110f23fcec2acea191ef58543d34dfe9ef3d9f13c31cddf"; + sha256 = "sha256-ZrxaNJEvQIuzklvyEjHLb1kgYme39j81A++GXBopLiU="; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pbr/tests.nix b/pkgs/development/python-modules/pbr/tests.nix index b31334589f5d..aacb726d6a1d 100644 --- a/pkgs/development/python-modules/pbr/tests.nix +++ b/pkgs/development/python-modules/pbr/tests.nix @@ -1,8 +1,8 @@ { buildPythonPackage +, build , git , gnupg , pbr -, mock , sphinx , stestr , testresources @@ -27,9 +27,9 @@ buildPythonPackage rec { checkInputs = [ pbr + build git gnupg - mock sphinx stestr testresources diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index 093e3e67ab23..6dec8d2308f1 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pc-ble-driver-py"; - version = "0.16.2"; + version = "0.16.3"; disabled = pythonOlder "3.7" || pythonAtLeast "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "NordicSemiconductor"; repo = "pc-ble-driver-py"; rev = "v${version}"; - sha256 = "013kpj2df5grkrzxak22k01mskpmwf7g3aa1fmxdwi90bb1sabs5"; + sha256 = "sha256-X21GQsyRZu1xdoTlD9DjceIWKpcuTLdIDf8UahntS3s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 725fb9ab9f93..449ea4f7fd77 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,8 +1,8 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, nose, sortedcontainers }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, pytestCheckHook }: buildPythonPackage rec { pname = "pdfminer_six"; - version = "20201018"; + version = "20220319"; disabled = !isPy3k; @@ -10,10 +10,10 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "1a2fxxnnjqbx344znpvx7cnv1881dk6585ibw01inhfq3w6yj2lr"; + sha256 = "sha256-sjO7jmHSe4EDmJ1rfiXx+lsHxc+DfKeMet37Nbg03WQ="; }; - propagatedBuildInputs = [ chardet cryptography sortedcontainers ]; + propagatedBuildInputs = [ chardet cryptography ]; postInstall = '' for file in $out/bin/*.py; do @@ -21,11 +21,14 @@ buildPythonPackage rec { done ''; - checkInputs = [ nose ]; - checkPhase = '' - nosetests + postPatch = '' + # Verion is not stored in repo, gets added by a GitHub action after tag is created + # https://github.com/pdfminer/pdfminer.six/pull/727 + substituteInPlace pdfminer/__init__.py --replace "__VERSION__" ${version} ''; + checkInputs = [ pytestCheckHook ]; + meta = with lib; { description = "PDF parser and analyzer"; homepage = "https://github.com/pdfminer/pdfminer.six"; diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix index 3b63e67fddec..25efc4418bf9 100644 --- a/pkgs/development/python-modules/pdfx/default.nix +++ b/pkgs/development/python-modules/pdfx/default.nix @@ -13,7 +13,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "chardet==4.0.0" "chardet" + --replace "chardet==4.0.0" "chardet" \ + --replace "pdfminer.six==20201018" "pdfminer.six" ''; propagatedBuildInputs = [ pdfminer chardet ]; diff --git a/pkgs/development/python-modules/pdm-pep517/default.nix b/pkgs/development/python-modules/pdm-pep517/default.nix index 11d677e11004..aa99d5f23f7b 100644 --- a/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/pkgs/development/python-modules/pdm-pep517/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "0.9.4"; + version = "0.10.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2o2FuuvS5PW7uhxl3EGBP75CZ3dcyjPoug1k0irl51c="; + sha256 = "83bb71a7588df69ea0d77dc6524741c3a1af54ad5f421341428de648bfc03a29"; }; preCheck = '' diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index e39993194a8c..436192e18b8d 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.6.0"; + version = "4.7.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "getpelican"; repo = pname; rev = version; - sha256 = "0xrz0cmjyaylr81rmy5i3qbp4ms1iwh0gpb07q1dwljffb8xzbhr"; + sha256 = "0w3r4ifbrl6mhfphabqs048qys7x6k164ds63jr10l3namljm8ad"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' diff --git a/pkgs/development/python-modules/pep257/default.nix b/pkgs/development/python-modules/pep257/default.nix index c168e087fc5c..d6205fc6e72e 100644 --- a/pkgs/development/python-modules/pep257/default.nix +++ b/pkgs/development/python-modules/pep257/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pep257"; - version = "0.7.0"; + version = "6.1.1"; src = fetchFromGitHub { owner = "GreenSteam"; repo = "pep257"; rev = version; - sha256 = "sha256-RkE9kkNkRTmZ8zJVwQzMsxU1hcjlxX6UA+ehnareynQ="; + sha256 = "0hcf3nyvzl8kd6gmc9qsiigz7vpwrjxcd1bd50dd63cad87qqicg"; }; checkInputs = [ pytestCheckHook mock ]; diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index 90dc50461990..ad58cdb72d4d 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -2,11 +2,12 @@ , buildPythonPackage , fetchPypi , flit-core -, toml +, tomli , pythonOlder , importlib-metadata , zipp , pytestCheckHook +, setuptools , testpath , mock , pip @@ -14,12 +15,12 @@ buildPythonPackage rec { pname = "pep517"; - version = "0.9.1"; + version = "0.12.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "0zqidxah03qpnp6zkg3zd1kmd5f79hhdsfmlc0cldaniy80qddxf"; + sha256 = "931378d93d11b298cf511dd634cf5ea4cb249a28ef84160b3247ee9afb4e8ab0"; }; nativeBuildInputs = [ @@ -27,18 +28,24 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - toml + tomli ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata zipp ]; checkInputs = [ pytestCheckHook + setuptools testpath mock pip ]; + disabledTests = [ + "test_setup_py" + "test_issue_104" + ]; + preCheck = '' rm pytest.ini # wants flake8 rm tests/test_meta.py # wants to run pip diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index af653ed0c8da..ca8f867e6e30 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core , dufte , matplotlib , numpy @@ -13,16 +14,20 @@ buildPythonPackage rec { pname = "perfplot"; - version = "0.9.8"; + version = "0.9.13"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nschloe"; repo = pname; - rev = version; - sha256 = "17dpgd27ik7ka7xpk3mj3anbjj62lwygy1vxlmrmk8xbhrqkim8d"; + rev = "v${version}"; + sha256 = "0ry5x38sv8gh505z6ip90jymm7kfgyf80y3vjb2i6z567bnblam6"; }; - format = "pyproject"; + + nativeBuildInputs = [ + flit-core + ]; propagatedBuildInputs = [ dufte @@ -44,5 +49,6 @@ buildPythonPackage rec { homepage = "https://github.com/nschloe/perfplot"; license = licenses.mit; maintainers = with maintainers; [ costrouc ]; + broken = true; # missing matplotx dependency }; } diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index f8ba8d3cf240..5b5462cf4757 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -1,25 +1,43 @@ { lib , buildPythonPackage +, cffi , fetchPypi -, zope_interface, cffi -, sphinx, manuel +, zope_interface +, sphinx +, manuel +, pythonOlder }: buildPythonPackage rec { pname = "persistent"; - version = "4.7.0"; + version = "4.9.0"; + format = "setuptools"; - nativeBuildInputs = [ sphinx manuel ]; - propagatedBuildInputs = [ zope_interface cffi ]; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0ef7c05a6dca0104dc224fe7ff31feb30a63d970421c9462104a4752148ac333"; + hash = "sha256-RwGzHYHBBCJlclrzkEUOnZFq10ucF4twEAU4U1keDGo="; }; - meta = { + nativeBuildInputs = [ + sphinx + manuel + ]; + + propagatedBuildInputs = [ + zope_interface + cffi + ]; + + pythonImportsCheck = [ + "persistent" + ]; + + meta = with lib; { description = "Automatic persistence for Python objects"; - homepage = "http://www.zodb.org/"; - license = lib.licenses.zpl21; + homepage = "https://github.com/zopefoundation/persistent/"; + license = licenses.zpl21; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 438360260822..353b69cb0a8b 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -2,16 +2,19 @@ , buildPythonPackage , fetchPypi , flit-core +, pythonOlder }: buildPythonPackage rec { pname = "pex"; - version = "2.1.56"; + version = "2.1.74"; format = "flit"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "8dfb7ef551cc9d3d03a6e2dc1b1ba6183cd94f3cde7431836f017d60cc992d53"; + hash = "sha256-SyKOwESn+0pFtm2GBFcS+kzIuv5cNXcayTtI7OyFpQg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index f61a0c593275..8653c28c878d 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.23.0"; + version = "1.24.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pBPgAUE0KBOiykfot7BUn/M4zKAryBkHa21w8S11XHk="; + sha256 = "sha256-KRIixd39ZqP8DTIXAM9ZHIsPkw0vyEh3fWz8/1VEPOY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 673b3c8ffe8d..a3836570f04b 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pglast"; - version = "3.8"; + version = "3.9"; src = fetchPypi { inherit pname version; - sha256 = "31ad29b6a27048b1a26c072992fc5213d2eaf366854679e6c97111e300e0ef01"; + sha256 = "sha256-fwXOfQW+ybhROdgayOAsgaFjf8HHh5jr5xczkBnA40w="; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 54a816643818..29f7266b6910 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -12,11 +12,11 @@ buildPythonApplication rec { pname = "phonemizer"; - version = "2.2.2"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "ae252f0bc7633e172b08622f318e7e112cde847e9281d4675ea7210157325146"; + sha256 = "1b4ea53b8da9a156361dff1d0c04ac1a8e65e6966d1cb9a8147c200960b32296"; }; postPatch = '' diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 44f4dda6b1bc..9faad1e96de2 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.41"; + version = "8.12.43"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "f477da623a51cba084567d6a67b1882a8aaaf3e7beadad655f8613a8f887ac62"; + sha256 = "sha256-HIJwouJX1sZUWKQig/gtPsp/e52SVFSmlm4vBN914c8="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index dec86d166112..3c45c602ae53 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.12.0"; + version = "2.13.1"; src = fetchPypi { inherit pname version; - sha256 = "ff65065f418ccbff9fbc1186b9a65581e83b42789aa4a656f45badfff9bd3f61"; + sha256 = "sha256-D7pBtcMbxMpt4XJVYDkslRDU4Uyk83AtbIIztUbji6A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pi1wire/default.nix b/pkgs/development/python-modules/pi1wire/default.nix new file mode 100644 index 000000000000..993c715999b2 --- /dev/null +++ b/pkgs/development/python-modules/pi1wire/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pi1wire"; + version = "0.2.0"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "ushiboy"; + repo = "pi1wire"; + rev = "v${version}"; + hash = "sha256-70w71heHWR5yArl+HuNAlzL2Yq/CL0iMNMiQw5qovls="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + "test_find_all_sensors" # flaky + ]; + + pythonImportsCheck = [ "pi1wire" ]; + + meta = with lib; { + description = "1Wire Sensor Library for Raspberry PI"; + homepage = "https://github.com/ushiboy/pi1wire"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pijuice/default.nix b/pkgs/development/python-modules/pijuice/default.nix index f46ddfca1be2..59f898f7906f 100644 --- a/pkgs/development/python-modules/pijuice/default.nix +++ b/pkgs/development/python-modules/pijuice/default.nix @@ -14,10 +14,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PiSupply"; repo = "PiJuice"; - # rev hash retrieved from the latest modification on file Software/Source/VERSION, as this project - # does not use Github tags facility - rev = "3ba6719ab614a3dc7495d5d9c900dd4ea977c7e3"; - sha256 = "GoNN07YgVaktpeY5iYDbfpy5fxkU1x0V3Sb1hgGAQt4="; + # Latest commit that fixes using the library against python 3.9 by renaming + # isAlive() to is_alive(). The former function was removed in python 3.9. + rev = "e2dca1f8dcfa12e009952a882c0674a545d193d6"; + sha256 = "07Jr7RSjqI8j0tT0MNAjrN1sjF1+mI+V0vtKInvtxj8="; }; patches = [ @@ -28,6 +28,7 @@ buildPythonPackage rec { ]; PIJUICE_BUILD_BASE = 1; + PIJUICE_VERSION = version; preBuild = '' cd Software/Source @@ -50,7 +51,10 @@ buildPythonPackage rec { rm $out/bin/pijuice_sys.py rm $out/bin/pijuiceboot mv $out/bin/pijuice_cli.py $out/bin/pijuice_cli - ''; + ''; + + # no tests + doCheck = false; meta = with lib; { description = "Library and resources for PiJuice HAT for Raspberry Pi"; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index f52467f3e59e..bef67237a89c 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "4.3.1"; + version = "5.0.1"; disabled = ! isPy3k; src = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-u/NDDJGCcctWL3ivxtU+8CSlQH+5qkmXUcF4RkQOiPI="; + hash = "sha256-PlfVvCEutWaNQyhP4j44viAmjvBzUlZUvUbYQPcNL24="; }; patches = [ diff --git a/pkgs/development/python-modules/pikepdf/paths.patch b/pkgs/development/python-modules/pikepdf/paths.patch index 17349f7ac209..7db73bb1a6dd 100644 --- a/pkgs/development/python-modules/pikepdf/paths.patch +++ b/pkgs/development/python-modules/pikepdf/paths.patch @@ -1,5 +1,5 @@ diff --git a/src/pikepdf/_methods.py b/src/pikepdf/_methods.py -index 9db6b49..4020bcf 100644 +index 87e99fe..253a701 100644 --- a/src/pikepdf/_methods.py +++ b/src/pikepdf/_methods.py @@ -204,7 +204,7 @@ def _mudraw(buffer, fmt) -> bytes: @@ -12,15 +12,33 @@ index 9db6b49..4020bcf 100644 check=True, ) diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py -index 80cc910..64f6d31 100644 +index 04c762d..924727c 100644 --- a/src/pikepdf/jbig2.py +++ b/src/pikepdf/jbig2.py -@@ -25,7 +25,7 @@ def extract_jbig2( - global_path = Path(tmpdir) / "global" +@@ -26,7 +26,7 @@ def extract_jbig2( output_path = Path(tmpdir) / "outfile" -- args = ["jbig2dec", "-e", "-o", os.fspath(output_path)] -+ args = ["@jbig2dec@", "-e", "-o", os.fspath(output_path)] + args = [ +- "jbig2dec", ++ "@jbig2dec@", + "--embedded", + "--format", + "png", +@@ -59,7 +59,7 @@ def extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes: + output_path = Path(tmpdir) / "outfile" - # Get the raw stream, because we can't decode im_obj - that is why we are here - # (Strictly speaking we should remove any non-JBIG2 filters if double encoded) + args = [ +- "jbig2dec", ++ "@jbig2dec@", + "--embedded", + "--format", + "png", +@@ -84,7 +84,7 @@ def extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes: + + def jbig2dec_available() -> bool: + try: +- proc = run(['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii') ++ proc = run(['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii') + except (CalledProcessError, FileNotFoundError): + return False + else: diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index e0f29d366e10..8aa1ad1f4c4d 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -1,17 +1,23 @@ { lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 , libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +# for passthru.tests +, imageio, matplotlib, pilkit, pydicom, reportlab }@args: import ./generic.nix (rec { pname = "Pillow"; - version = "8.4.0"; + version = "9.0.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed"; + sha256 = "bIvII4p9/a96dfXsWmY/QXP4w2flo5+H5yBJXh7tdfo="; + }; + + passthru.tests = { + inherit imageio matplotlib pilkit pydicom reportlab; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix index 3e33f1a8aa0f..97c67fd5fa49 100644 --- a/pkgs/development/python-modules/pillow/generic.nix +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -3,13 +3,14 @@ , disabled , src , meta +, passthru ? {} , ... }@args: with args; buildPythonPackage rec { - inherit pname version src meta; + inherit pname version src meta passthru; # Disable imagefont tests, because they don't work well with infinality: # https://github.com/python-pillow/Pillow/issues/1259 diff --git a/pkgs/development/python-modules/pint-pandas/default.nix b/pkgs/development/python-modules/pint-pandas/default.nix new file mode 100644 index 000000000000..385c4c13bd6d --- /dev/null +++ b/pkgs/development/python-modules/pint-pandas/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, setuptools-scm +, pint +, pandas +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pint-pandas"; + version = "0.2"; + + src = fetchPypi { + pname = "Pint-Pandas"; + inherit version; + sha256 = "sha256-b2DS6ArBAuD5St25IG4PbMpe5C8Lf4kw2MeYAC5B+oc="; + }; + + patches = [ + # Fixes a failing test, see: https://github.com/hgrecco/pint-pandas/issues/107 + (fetchpatch{ + url = "https://github.com/hgrecco/pint-pandas/commit/4c31e25609af968665ee60d019b9b5366f328680.patch"; + sha256 = "vIT0LI4S73D4MBfGI8vtCZAM+Zb4PZ4E3xfpGKNyA4I="; + }) + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + pint + pandas + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Pandas support for pint"; + license = licenses.bsd3; + homepage = "https://github.com/hgrecco/pint-pandas"; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 9d54eef4d706..307e99c04d80 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.4.0"; + version = "6.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "65553a15b1ba34be5e43889345062e38fb9b219ffa23b084ca0d4c4039b6f53b"; + sha256 = "sha256-gPViqmmfx2pCRTlpfgvvQeSQoFDlemohRoUxmBqdQZ4="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix new file mode 100644 index 000000000000..6f359d3bc9a7 --- /dev/null +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, poetry +, rich +, setuptools +}: + +buildPythonPackage rec { + version = "0.2.0"; + pname = "pipenv-poetry-migrate"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "yhino"; + repo = "pipenv-poetry-migrate"; + rev = "v${version}"; + hash = "sha256-2/e6uGwpUvzxXlz+51gUriE054bgNeJNyLDCIyiGflM="; + }; + + propagatedBuildInputs = [ + poetry + rich + setuptools + ]; + + postPatch = '' + substituteInPlace pyproject.toml --replace 'rich = "^9.6.1"' 'rich = ">9"' + ''; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "This is simple migration script, migrate pipenv to poetry"; + homepage = "https://github.com/yhino/pipenv-poetry-migrate"; + license = licenses.asl20; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index 2f80806c431a..3f461b15a3f2 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "0.17.0"; + version = "1.0.0"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = version; - sha256 = "sha256-vR/tKV+ZB0nZaxEcB83dwoSI7kBC1rA+6fo30rizroM="; + sha256 = "1sgfrlhci2m83k436dfwfmqjpb8hij6yypm03pm3n8drmr2aaa4s"; }; propagatedBuildInputs = [ @@ -68,6 +68,6 @@ buildPythonPackage rec { "Install and Run Python Applications in Isolated Environments"; homepage = "https://github.com/pipxproject/pipx"; license = licenses.mit; - maintainers = with maintainers; [ yevhenshymotiuk ]; + maintainers = with maintainers; [ yshym ]; }; } diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 7645fdaec8aa..092bcbfcfd9d 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pivy"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "coin3d"; repo = "pivy"; rev = version; - sha256 = "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx"; + sha256 = "1xlynrbq22pb252r37r80b3myzap8hzhvknz4zfznfrsg9ykh8k2"; }; dontUseCmakeConfigure = true; @@ -35,7 +35,7 @@ buildPythonPackage rec { doCheck = false; postPatch = '' - substituteInPlace CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \ + substituteInPlace distutils_cmake/CMakeLists.txt --replace \$'{SoQt_INCLUDE_DIRS}' \ \$'{Coin_INCLUDE_DIR}'\;\$'{SoQt_INCLUDE_DIRS}' ''; diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 387853ad28c5..d36ba25ba474 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -4,15 +4,19 @@ , nulltype , python-dateutil , urllib3 +, pythonOlder }: buildPythonPackage rec { pname = "plaid-python"; - version = "8.10.0"; + version = "9.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8930949bd43e3126289f50e927d1acacf53c57ec3227c764e0c1feb72bbb61a3"; + hash = "sha256-vHJ35MvMw3G1k/A2gifaE97GayoVEOQ9lR6yG6ZkzS4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index f2e865991487..2be8928f630f 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "2.4.1"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Ce1dwE2g/7o91NPkmlM0uv0eMB7WzFCExV/8ZCAn22Y="; + sha256 = "sha256-fppwtY8VX8IQ96H930xItO7mS8LlxxHgBcKlwIL5P2E="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 4a21cebcabd2..29532a23b0c4 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.9.1"; + version = "4.10.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "0c0zhbq6ggn5ck4cgbr92440xhfk3iz5a8fm25909idlx8vw0s3q"; + sha256 = "sha256-0j3uf3wSDFSyDGo3oRi99KNKfhuGP2puSi0KgVjsXnQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index c4811044ae2b..fbe869b07032 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.4.0"; + version = "5.5.0"; src = fetchPypi { inherit pname version; - sha256 = "735d50738c760ecbf3a38e2336b8c1b119bff2d857096e4f68af31089b798161"; + sha256 = "20b8a1a0f0434f9b8d10eb7caa66e947a9a1d698e5a53d40d447bbc0d2ae41f0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 91902a857448..cc2601e4a227 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.15.4"; + version = "0.16.6"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "v${version}"; - sha256 = "0lp87vn9kh0xqng5mv5j914pgrbnhp54bisq76njijn32mgaw4qq"; + sha256 = "sha256-hAYbYsLpiiJYdg9Rx5BjqNA9JTtKGu3DE0SpwOxlTWw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index e571f276f28f..ae3c4941f684 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -1,19 +1,61 @@ -{ buildPythonPackage -, fetchPypi -, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub +, openssh +, ps +, psutil +, pytest-mock +, pytest-timeout +, pytestCheckHook +, setuptools-scm }: buildPythonPackage rec { pname = "plumbum"; version = "1.7.2"; - checkInputs = [ pytest ]; + src = fetchFromGitHub { + owner = "tomerfiliba"; + repo = "plumbum"; + rev = "v${version}"; + sha256 = "sha256-bCCcNFz+ZsbKSF7aCfy47lBHb873tDYN0qFuSCxJp1w="; + }; - # No tests in archive - doCheck = false; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-config=setup.cfg" "" + ''; - src = fetchPypi { - inherit pname version; - sha256 = "0d1bf908076bbd0484d16412479cb97d6843069ee19f99e267e11dd980040523"; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + openssh + ps + psutil + pytest-mock + pytest-timeout + pytestCheckHook + ]; + + preCheck = '' + export HOME=$TMP + ''; + + disabledTests = [ + # broken in nix env + "test_change_env" + "test_dictlike" + "test_local" + ]; + + meta = with lib; { + description = " Plumbum: Shell Combinators "; + homepage = " https://github.com/tomerfiliba/plumbum "; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix index 86bbd847aa28..969f1207a5b5 100644 --- a/pkgs/development/python-modules/policy-sentry/default.nix +++ b/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.11.19"; + version = "0.12.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "salesforce"; repo = "policy_sentry"; rev = version; - sha256 = "sha256-zYX2MMFIgts5brFb/hsgLHZbY5mncqnCmk7nGdxj/BM="; + sha256 = "sha256-6yG60vUsvLpIiZ3i1D3NZOL9bINaF5ydrDvewqpEmpA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index dda98f7a8b78..d36c5d7e7ae3 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -7,12 +7,13 @@ , colorful , tomlkit , git +, packaging , requests }: buildPythonPackage rec { pname = "pontos"; - version = "22.1.1"; + version = "22.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p7E86McHeijsXpaByD5qLHYQLnSImLwHn15INyxWiZc="; + hash = "sha256-RmMlwnAJlCTDnTyim0MdAeW3NA8r2IiqrE0YeWgxUk4="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ colorful tomlkit + packaging requests ]; @@ -39,6 +41,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'packaging = "^20.3"' 'packaging = "*"' + ''; + disabledTests = [ # Signing fails "test_find_no_signing_key" @@ -48,7 +55,9 @@ buildPythonPackage rec { "test_missing_cmd" ]; - pythonImportsCheck = [ "pontos" ]; + pythonImportsCheck = [ + "pontos" + ]; meta = with lib; { description = "Collection of Python utilities, tools, classes and functions"; diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 27c35abe5739..4cea071d2772 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pony"; - version = "0.7.15rc1"; + version = "0.7.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ponyorm"; repo = pname; rev = "v${version}"; - hash = "sha256-EoMpVvPCwxJbNPoeF73djcaQ4lY9jRx5nJYR2A2LXoQ="; + hash = "sha256-yATIsX2nKsW5DBwg9/LznQqf+XPY3q46WZut18Sr0v0="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/poolsense/default.nix b/pkgs/development/python-modules/poolsense/default.nix index 10e50804ef58..53d142299707 100644 --- a/pkgs/development/python-modules/poolsense/default.nix +++ b/pkgs/development/python-modules/poolsense/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WCyuhk77QNJAiuzccrb2u0mfc81LYrYSSq9atgO0LdE="; + hash = "sha256-WCyuhk77QNJAiuzccrb2u0mfc81LYrYSSq9atgO0LdE="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index abe7ce698208..357ca815407f 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "2.3.2"; + version = "2.4.0"; pname = "portalocker"; src = fetchPypi { inherit pname version; - sha256 = "75cfe02f702737f1726d83e04eedfa0bda2cc5b974b1ceafb8d6b42377efbd5f"; + sha256 = "sha256-pkitdhuOonNwy1kVNQEizYB7gg0hk+1cnMKPFj32N/Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/portend/black-19.10b0.patch b/pkgs/development/python-modules/portend/black-19.10b0.patch deleted file mode 100644 index e781139e3192..000000000000 --- a/pkgs/development/python-modules/portend/black-19.10b0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test_portend.py b/test_portend.py -index b2de8c2..3f90276 100644 ---- a/test_portend.py -+++ b/test_portend.py -@@ -21,7 +21,7 @@ def socket_infos(): - - - def id_for_info(info): -- af, = info[:1] -+ (af,) = info[:1] - return str(af) - - \ No newline at end of file diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 52e46cec75a0..bf84e41610cb 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,28 +1,20 @@ { lib, buildPythonPackage, fetchPypi -, pytest, setuptools-scm, tempora, pytest-black, pytest-cov }: +, pytestCheckHook, setuptools-scm, tempora }: buildPythonPackage rec { pname = "portend"; - version = "2.7.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "3fbc0df9e4970b661e4d7386a91fc7bcf34ebeaf0333ce15d819d515a71ba8b2"; + sha256 = "239e3116045ea823f6df87d6168107ad75ccc0590e37242af0cc1e98c5d224e4"; }; - postPatch = '' - substituteInPlace pytest.ini --replace "--flake8" "" - ''; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytest pytest-black pytest-cov ]; - - checkPhase = '' - py.test --deselect=test_portend.py::TestChecker::test_check_port_listening - ''; + checkInputs = [ pytestCheckHook ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/portpicker/default.nix b/pkgs/development/python-modules/portpicker/default.nix index 90ed4b34b707..faf3b9581628 100644 --- a/pkgs/development/python-modules/portpicker/default.nix +++ b/pkgs/development/python-modules/portpicker/default.nix @@ -1,22 +1,34 @@ -{ buildPythonPackage -, lib +{ lib +, buildPythonPackage , fetchPypi +, psutil +, pythonOlder }: buildPythonPackage rec { pname = "portpicker"; - version = "1.4.0"; + version = "1.5.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "c2831ff4328a21e928ffc9e52124bcafacaf5816d38a1a72dc329680dc1bb7ba"; + hash = "sha256-4TsUgAit6yeTz4tVvNIP3OxPdj8tO/PEX15eXR330ig="; }; - meta = { - description = "A library to choose unique available network ports."; + propagatedBuildInputs = [ + psutil + ]; + + pythonImportsCheck = [ + "portpicker" + ]; + + meta = with lib; { + description = "Library to choose unique available network ports"; homepage = "https://github.com/google/python_portpicker"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ danharaj ]; + license = licenses.asl20; + maintainers = with maintainers; [ danharaj ]; }; } diff --git a/pkgs/development/python-modules/pot/default.nix b/pkgs/development/python-modules/pot/default.nix index 86c7b61ae27f..8bc7ecb7f355 100644 --- a/pkgs/development/python-modules/pot/default.nix +++ b/pkgs/development/python-modules/pot/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pot"; - version = "0.8.0"; + version = "0.8.1.0"; src = fetchPypi { pname = "POT"; inherit version; - sha256 = "a70e092ddc5a29a4b526192750604a634dfc2faa1641664b4c2c1c00b3cd63cf"; + sha256 = "ff2974418fbf35b18072555c2a9e7e4f6876eddfb6791179ddb8f0f6d6032505"; }; postPatch = '' diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index cbc931d5c59e..26cfada4296e 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -4,6 +4,7 @@ , chardet , requests , ruamel-yaml +, setuptools-scm , six , semver , pytestCheckHook @@ -22,6 +23,12 @@ buildPythonPackage rec { sha256 = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ chardet requests @@ -51,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser"; - homepage = "https://github.com/jfinkhaeuser/prance"; + homepage = "https://github.com/RonnyPfannschmidt/prance"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/preprocess-cancellation/default.nix b/pkgs/development/python-modules/preprocess-cancellation/default.nix new file mode 100644 index 000000000000..d671cb4d66eb --- /dev/null +++ b/pkgs/development/python-modules/preprocess-cancellation/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, poetry-core +, pytestCheckHook, pytest-cov +, shapely }: + +buildPythonPackage rec { + pname = "preprocess-cancellation"; + version = "0.2.0"; + disabled = pythonOlder "3.6"; # >= 3.6 + format = "pyproject"; + + # No tests in PyPI + src = fetchFromGitHub { + owner = "kageurufu"; + repo = "cancelobject-preprocessor"; + rev = version; + hash = "sha256-mn3/etXA5dkL+IsyxwD4/XjU/t4/roYFVyqQxlLOoOI="; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ shapely ]; + + checkInputs = [ pytestCheckHook pytest-cov ]; + + meta = with lib; { + description = "Klipper GCode Preprocessor for Object Cancellation"; + homepage = "https://github.com/kageurufu/cancelobject-preprocessor"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ zhaofengli ]; + }; +} diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 85aaa1e656d8..f914a0f3df44 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "2.4.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "18e56447f636b447096977d468849c1e2d3cfa0af8e7b5acfcf83a64790c0aca"; + sha256 = "69fe75d78ac8651e16dd61265b9e19626df5d630ae294fc31687aa6037b97a58"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/primecountpy/default.nix b/pkgs/development/python-modules/primecountpy/default.nix new file mode 100644 index 000000000000..c2ad9ca512b0 --- /dev/null +++ b/pkgs/development/python-modules/primecountpy/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchPypi +, buildPythonPackage +, primecount +, cython +, cysignals +}: + +buildPythonPackage rec { + pname = "primecountpy"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "78fe7cc32115f0669a45d7c90faaf39f7ce3939e39e2e7e5f14c17fe4bff0676"; + }; + + buildInputs = [ primecount ]; + + propagatedBuildInputs = [ cython cysignals ]; + + # depends on pytest-cython for "pytest --doctest-cython" + doCheck = false; + + pythonImportsCheck = [ "primecountpy" ]; + + meta = with lib; { + description = "Cython interface for C++ primecount library"; + homepage = "https://github.com/dimpase/primecountpy/"; + maintainers = teams.sage.members; + license = licenses.gpl3Only; + }; +} diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index 766b7090f90f..3f4f49d4299e 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.55.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "86835d1f1a9317ab41aeb1da5e4184975e2306586839d66daf63067c102f8f04"; + sha256 = "14d3165a1781d053ffaa117daf27cc706128d2ec1d2977fdb05b6bb079888013"; }; propagatedBuildInputs = [ python-utils ]; diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index 418e63ec9330..e38560be2eb6 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.23"; + version = "3.0.24"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - sha256 = "7053aba00895473cb357819358ef33f11aa97e4ac83d38efb123e5649ceeecaf"; + sha256 = "1bb05628c7d87b645974a1bad3f17612be0c29fa39af9f7688030163f680bad6"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/protego/default.nix b/pkgs/development/python-modules/protego/default.nix index ad7e4aa4af6e..a881292ada2d 100644 --- a/pkgs/development/python-modules/protego/default.nix +++ b/pkgs/development/python-modules/protego/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "Protego"; - version = "0.1.16"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "a682771bc7b51b2ff41466460896c1a5a653f9a1e71639ef365a72e66d8734b4"; + sha256 = "sha256-32ZtQwTat3Ti3J/rIIuxrI1x6lzuwS9MmeujD71kL/I="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index 6680b19908e9..9f12f220cfe9 100644 --- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "protonvpn-nm-lib"; - version = "3.7.0"; + version = "3.8.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ProtonVPN"; repo = pname; rev = version; - sha256 = "sha256-RZ10p/Lg9GQj0CohW2v+THch5EaD236rEHETGjNStdY="; + sha256 = "sha256-fAaP9c66LcbZgezadGPUt400YRnrnFoBvpzlc1zxuc4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index 125984554a0c..33b233bd6096 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "proxmoxer"; - version = "1.2.0"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-ElHocXrazwK+b5vdjYSJAYB4ajs2n+V8koj4QKkdDMQ="; + sha256 = "sha256-3EpId20WVVjXA/wxwy1peyHPcXdiT3fprABkcNBpZtE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index ba17c5eca737..581e83ddf1a2 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.8.0"; + version = "5.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1immnj532bnnrh1qmk5q3lsw3san8qfk9kxy1cpmy0knmfcwp70c"; + sha256 = "869842dbd66bb80c3217158e629d6fceaecc3a3166d3d1faee515b05dd26ca25"; }; # We have many test failures on various parts of the package: diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 34660a84cd60..bdf2b65cb507 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "psycopg2"; - version = "2.9.2"; + version = "2.9.3"; # Extension modules don't work well with PyPy. Use psycopg2cffi instead. # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892 @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a84da9fa891848e0270e8e04dcca073bc9046441eeb47069f5c0e36783debbea"; + sha256 = "8e841d1bf3434da985cc5ef13e6f75c8981ced601fd70cc6bf33351b91562981"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index 6ac20798e0c0..4e05dd51b057 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { pname = "psygnal"; - version = "0.2.0"; + version = "0.3.3"; src = fetchFromGitHub { owner = "tlambert03"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SiG2ywNEw3aNrRXyEMFTnvHKtKowO8yqoCaNI8PT4/Y="; + sha256 = "sha256-BQmcA1gD2i4sxROH+a7gStcNK1mXYVerIZ2y6gn8vI8="; }; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions ]; diff --git a/pkgs/development/python-modules/publicsuffix2/default.nix b/pkgs/development/python-modules/publicsuffix2/default.nix index 30a02ec2f0dd..67699b107ab5 100644 --- a/pkgs/development/python-modules/publicsuffix2/default.nix +++ b/pkgs/development/python-modules/publicsuffix2/default.nix @@ -1,26 +1,28 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "publicsuffix2"; - version = "2.20191221"; + version = "2.2019-12-21"; - # Tests are missing in the sdist - # See: https://github.com/nexB/python-publicsuffix2/issues/12 src = fetchFromGitHub { owner = "nexB"; repo = "python-publicsuffix2"; - rev = "release-2.2019-12-21"; + rev = "release-${version}"; sha256 = "1dkvfvl0izq9hqzilnw8ipkbgjs9xyad9p21i3864hzinbh0wp9r"; }; - nativeBuildInputs = [ requests ]; + postPatch = '' + # only used to update the interal publicsuffix list + substituteInPlace setup.py \ + --replace "'requests >= 2.7.0'," "" + ''; + + pythonImportsCheck = [ "publicsuffix2" ]; meta = with lib; { - description = '' - Get a public suffix for a domain name using the Public Suffix - List. Forked from and using the same API as the publicsuffix package. - ''; - homepage = "https://pypi.python.org/pypi/publicsuffix2/"; + description = "Get a public suffix for a domain name using the Public Suffix List"; + homepage = "https://github.com/nexB/python-publicsuffix2"; license = licenses.mpl20; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 40a4bf497f46..c5fbe3d28590 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -8,18 +8,21 @@ , pytest-vcr , pytest-asyncio , requests -, six +, pythonOlder }: buildPythonPackage rec { pname = "pubnub"; - version = "5.5.0"; + version = "6.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = "python"; rev = "v${version}"; - sha256 = "133sis24jd40yq4sgp8lmg2kac5wiiccisjpkhm50rb9wdbpn6kh"; + hash = "sha256-QOOPcWhhEqg7c0INQv88+eOP0povN8W4lLoaly9TGu0="; }; propagatedBuildInputs = [ @@ -27,22 +30,24 @@ buildPythonPackage rec { cbor2 pycryptodomex requests - six ]; checkInputs = [ pytest-asyncio - pytestCheckHook pytest-vcr + pytestCheckHook ]; - # Some tests don't pass with recent releases of twisted disabledTestPaths = [ + # Tests require network access "tests/integrational" - "tests/manual/asyncio" + "tests/manual" + "tests/functional/push" ]; - pythonImportsCheck = [ "pubnub" ]; + pythonImportsCheck = [ + "pubnub" + ]; meta = with lib; { description = "Python-based APIs for PubNub"; diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index 0ae60b381c64..406d81e15bb0 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , dataclasses -, isPy3k , fetchPypi , jedi , pygments @@ -14,14 +13,14 @@ buildPythonPackage rec { pname = "pudb"; - version = "2022.1"; + version = "2022.1.1"; format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e827a4b489dcad561189535db6677becbf32164b2b44df00786eb2d5e00c587e"; + hash = "sha256-2zvdZkI8nSkHTBwsSfyyJL0Nbwgxn+0bTn6taDkUCD8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 6e35cb573586..1990915eef44 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "21.10.5"; + version = "22.3.2"; src = fetchPypi { inherit pname version; - sha256 = "b347983fb78baab168f4dc4804ab2c59ca5b813bf62f8146dfb5fcb6ab6c8ba2"; + sha256 = "sha256-zBdOHO69TmIixbePT0FfEugHU8mrdas1QVm0y1lQsIQ="; }; patches = [ diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 25c79a83c437..e5d91f38fa2f 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -1,26 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "puremagic"; - version = "1.11"; + version = "1.12"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "09d762b9d83c65a83617ee57a3532eb10663f394c1caf81390516c5b1cc0fc6b"; + sha256 = "sha256-jAuuwImSExc2KjD6yi6WeMkdXpfOAE3Gp8HGaeBUeDg="; }; # test data not included on pypi doCheck = false; - pythonImportsCheck = [ "puremagic" ]; + pythonImportsCheck = [ + "puremagic" + ]; meta = with lib; { - description = "Pure python implementation of magic file detection"; - license = licenses.mit; + description = "Implementation of magic file detection"; homepage = "https://github.com/cdgriffith/puremagic"; + license = licenses.mit; maintainers = with maintainers; [ globin ]; }; } diff --git a/pkgs/development/python-modules/pvo/default.nix b/pkgs/development/python-modules/pvo/default.nix index 55802290c15a..0b107f155060 100644 --- a/pkgs/development/python-modules/pvo/default.nix +++ b/pkgs/development/python-modules/pvo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pvo"; - version = "0.2.0"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-pvoutput"; rev = "v${version}"; - sha256 = "sha256-liV5Ae3Bz6MZT3KQ/1aNt6P4Wsg4SOfAMQKI0Qpxvao="; + sha256 = "sha256-2/O81MnFYbdOrzLiTSoX7IW+3ZGyyE/tIqgKr/sEaHI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix index e363cd412d66..0ebd218aa9cc 100644 --- a/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "1.0.5"; + version = "1.0.8"; format = "pyproject"; src = fetchFromGitHub { owner = "mib1185"; repo = "synologydsm-api"; rev = "v${version}"; - sha256 = "sha256-mm5N2RKn2KP2dV7+dw0sNWlCDT5X/fRmH8POQqJIoZY="; + sha256 = "sha256-9bh7uLt9+uda6yFCWV6xUh//jFC4DgiS+KtRXQrU3A8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 160c5763995e..c56fc990f2c5 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.40"; + version = "3.42"; src = fetchPypi { inherit pname version; - sha256 = "9eb6f721f94f28a17a8599ca2743a2bedd58c16cfe74e9817ffa948c13dbb79c"; + sha256 = "sha256-2/YT36X4UvmmhiaxyJBtCKA3QuibYtReTS6MQ3YGV+c="; }; doCheck = false; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index f55c869a7a2c..391afabf931f 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "4.3.0"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "a0405d1c6c60e6603594e9319c28d31b97abe49afe9af21d230f5072a1d38976"; + sha256 = "sha256-5vIjVqvr/+Cok9z3L+CaDIve2tb0mMVaMMPdMs5Ijmo="; }; propagatedBuildInputs = [ aiohttp requests ]; diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix index 01fae999cf4d..acfab6791a2e 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "scrypt"; - version = "0.8.19"; + version = "0.8.20"; src = fetchPypi { inherit pname version; - sha256 = "ad143035ae0cf5e97c4b399f4e4686adf442c5f0f06f9f198a0cc6c091335fb7"; + sha256 = "sha256-DSJsHGdE+y4wizkUEGabHfXP6CY3/8te1Im/grLS63g="; }; buildInputs = [ openssl ]; diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index 6ca3166fb19e..b2a230685cc8 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -5,17 +5,22 @@ , scipy , pytest , pybind11 +, setuptools-scm }: buildPythonPackage rec { pname = "pyamg"; - version = "4.1.0"; + version = "4.2.2"; src = fetchPypi { inherit pname version; - sha256 = "b4cacfcfd13379762a4551ac059a2e52a093b476ca1ad44b9202e736490a8863"; + sha256 = "sha256-mtrFqUwEustYlCcCiV1FQZm7dJKohu650xHdiNg6D6E="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ numpy scipy @@ -23,9 +28,17 @@ buildPythonPackage rec { pybind11 ]; - preBuild = '' - export HOME=$(mktemp -d) - ''; + # failed with "ModuleNotFoundError: No module named 'pyamg.amg_core.evolution_strength'" + doCheck = false; + # taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=python-pyamg#n27 + # checkPhase = '' + # PYTHONPATH="$PWD/build/lib.linux-*:$PYTHONPATH" ${python3.interpreter} -c "import pyamg; pyamg.test()" + # ''; + + pythonImportsCheck = [ + "pyamg" + "pyamg.amg_core.evolution_strength" + ]; meta = with lib; { description = "Algebraic Multigrid Solvers in Python"; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index c47cdaa02b70..cfe63a34d85a 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -1,4 +1,24 @@ -{ lib, stdenv, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkg-config, setuptools-scm, six }: +{ lib +, stdenv +, buildPythonPackage +, python +, isPy3k +, arrow-cpp +, cffi +, cloudpickle +, cmake +, cython +, fsspec +, hypothesis +, numpy +, pandas +, pytestCheckHook +, pytest-lazy-fixture +, pkg-config +, scipy +, setuptools-scm +, six +}: let zero_or_one = cond: if cond then 1 else 0; @@ -15,21 +35,23 @@ buildPythonPackage rec { sourceRoot = "apache-arrow-${version}/python"; nativeBuildInputs = [ cmake cython pkg-config setuptools-scm ]; - propagatedBuildInputs = [ numpy six ]; - checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; + propagatedBuildInputs = [ numpy six cloudpickle scipy fsspec cffi ]; + checkInputs = [ + hypothesis + pandas + pytestCheckHook + pytest-lazy-fixture + ]; PYARROW_BUILD_TYPE = "release"; PYARROW_WITH_DATASET = zero_or_one true; PYARROW_WITH_FLIGHT = zero_or_one _arrow-cpp.enableFlight; PYARROW_WITH_PARQUET = zero_or_one true; + PYARROW_WITH_HDFS = zero_or_one true; 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" ]; ARROW_HOME = _arrow-cpp; @@ -51,9 +73,6 @@ buildPythonPackage rec { # enabled in nixpkgs. # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11393 "--deselect=pyarrow/tests/test_memory.py::test_env_var" - # Deselect a parquet dataset test because it erroneously fails to find the - # pyarrow._dataset module. - "--deselect=pyarrow/tests/parquet/test_dataset.py::test_parquet_dataset_deprecated_properties" ] ++ lib.optionals stdenv.isDarwin [ # Requires loopback networking "--deselect=pyarrow/tests/test_ipc.py::test_socket_" @@ -61,12 +80,21 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; preCheck = '' - mv pyarrow/tests tests - rm -rf pyarrow - mkdir pyarrow - mv tests pyarrow/tests + shopt -s extglob + rm -r pyarrow/!(tests) ''; + pythonImportsCheck = map (module: "pyarrow.${module}") [ + "compute" + "csv" + "dataset" + "flight" + "fs" + "hdfs" + "json" + "parquet" + ]; + meta = with lib; { description = "A cross-language development platform for in-memory data"; homepage = "https://arrow.apache.org/"; diff --git a/pkgs/development/python-modules/pyasn/default.nix b/pkgs/development/python-modules/pyasn/default.nix new file mode 100644 index 000000000000..b180226ec46c --- /dev/null +++ b/pkgs/development/python-modules/pyasn/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, }: + +buildPythonPackage rec { + pname = "pyasn"; + version = "1.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-6UK1SRY2Pse4tw6urs0OtOQe8bz0ojl7KabXFfzN+SU="; + }; + + doCheck = false; # Tests require internet connection which wont work + + pythonImportsCheck = [ "pyasn" ]; + + meta = with lib; { + description = "Offline IP address to Autonomous System Number lookup module"; + homepage = "https://github.com/hadiasghari/pyasn"; + license = with licenses; [ bsdOriginal mit ]; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/pyatag/default.nix b/pkgs/development/python-modules/pyatag/default.nix index d2ed7d6ff34a..a06d2a05fb40 100644 --- a/pkgs/development/python-modules/pyatag/default.nix +++ b/pkgs/development/python-modules/pyatag/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyatag"; - version = "0.3.5.3"; + version = "3.5.1"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "MatsNl"; repo = "pyatag"; rev = version; - sha256 = "00ly4injmgrj34p0lyx7cz2crgnfcijmzc0540gf7hpwha0marf6"; + sha256 = "17x2m7icbby1y2zfc79jpbir2kvyqlrkix9pvvxanm658arsh8c7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index c24bcefec167..fe9d3276e1be 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.4.1"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyAthena"; inherit version; - sha256 = "9d42b4e2cdbd8c48f8157692b50681b08569aa3cac3a9694e671ec9aa40f969b"; + sha256 = "sha256-GTcDiDtZGgTpdl6YBgPuztv7heEPZ/ymhup/4JwfELA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index d35a574029a4..5cd314b6cb99 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "6.2.2"; + version = "6.2.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "v${version}"; - sha256 = "1cd6g5vix8k45ndx4aq4pvyyisqdp38gd2466jrlg8z9byandj0i"; + sha256 = "sha256-VXkQByaNA02fwBO2yuf7w1ZF/oJwd/h21de1EQlCu2U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 9f1bd0081084..85c526334caa 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -14,13 +14,14 @@ , pytest-timeout , pytestCheckHook , pythonOlder +, requests , srptools , zeroconf }: buildPythonPackage rec { pname = "pyatv"; - version = "0.9.8"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,9 +30,18 @@ buildPythonPackage rec { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "1ns1ys3mwi1s1b8zxcr7xgr1rfnlxwdn2fp680yi09x4d9nmnvqp"; + sha256 = "sha256-aYNBFtsnSg3PORq72U0PXPFCTVj2+8D2TS3nMau55t4="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + # Remove all version pinning + + substituteInPlace base_versions.txt \ + --replace "protobuf==3.19.1,<4" "protobuf>=3.19.0,<4" + ''; + propagatedBuildInputs = [ aiohttp bitarray @@ -40,6 +50,7 @@ buildPythonPackage rec { miniaudio netifaces protobuf + requests srptools zeroconf ]; @@ -52,13 +63,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner" "" - # Remove all version pinning - sed -i -e "s/==[0-9.]*//" requirements/requirements.txt - ''; - disabledTestPaths = [ # Test doesn't work in the sandbox "tests/protocols/companion/test_companion_auth.py" diff --git a/pkgs/development/python-modules/pyaussiebb/default.nix b/pkgs/development/python-modules/pyaussiebb/default.nix new file mode 100644 index 000000000000..86d2f59e9424 --- /dev/null +++ b/pkgs/development/python-modules/pyaussiebb/default.nix @@ -0,0 +1,55 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, loguru +, pydantic +, poetry-core +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pyaussiebb"; + version = "0.0.15"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "yaleman"; + repo = "aussiebb"; + rev = "v${version}"; + hash = "sha256-V9yN05Bkv5vkHgXZ77ps3d6JS39M5iMuiijOGRBFi0U="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + requests + loguru + pydantic + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'requests = "^2.27.1"' 'requests = "*"' + ''; + + # Tests require credentials and requests-testing + doCheck = false; + + pythonImportsCheck = [ + "aussiebb" + ]; + + meta = with lib; { + description = "Module for interacting with the Aussie Broadband APIs"; + homepage = "https://github.com/yaleman/aussiebb"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index d93bfe149cb8..46c1307826ef 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -8,18 +8,18 @@ , python , catch , numpy -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "pybind11"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - hash = "sha256-zYDgXXpn8Z1Zti8Eje8qxDvbQV70/LmezG3AtxzDG+o="; + hash = "sha256-wBvEWQlZhHoSCMbGgYtB3alWBLA8mA8Mz6JPLhXa3Pc="; }; nativeBuildInputs = [ cmake ]; @@ -49,16 +49,18 @@ buildPythonPackage rec { checkInputs = [ catch numpy - pytest + pytestCheckHook ]; - checkPhase = '' - runHook preCheck - - make check - - runHook postCheck - ''; + disabledTestPaths = [ + # require dependencies not available in nixpkgs + "tests/test_embed/test_trampoline.py" + "tests/test_embed/test_interpreter.py" + # numpy changed __repr__ output of numpy dtypes + "tests/test_numpy_dtypes.py" + # no need to test internal packaging + "tests/extra_python_package/test_files.py" + ]; meta = with lib; { homepage = "https://github.com/pybind/pybind11"; diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 961ca5badbee..df9c1a0d21ea 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "3.2.0"; + version = "3.2.2"; src = fetchPypi { inherit pname version; - sha256 = "df02fb0ab74a6e7c4e1d7a3e2ffd7e4760a30cdeccb9fa6dd19f334122ec00f2"; + sha256 = "sha256-Rtq2RZ2CjgS2YbuA4BS8+xPJ8bpAwCLl6xEy78/guOA="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pycallgraph/default.nix b/pkgs/development/python-modules/pycallgraph/default.nix deleted file mode 100644 index af9f18aad2c6..000000000000 --- a/pkgs/development/python-modules/pycallgraph/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -}: - -buildPythonPackage rec { - pname = "pycallgraph"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "0w8yr43scnckqcv5nbyd2dq4kpv74ai856lsdsf8iniik07jn9mi"; - }; - - buildInputs = [ pytest ]; - - # Tests do not work due to this bug: https://github.com/gak/pycallgraph/issues/118 - doCheck = false; - - meta = with lib; { - homepage = "http://pycallgraph.slowchop.com"; - description = "Call graph visualizations for Python applications"; - maintainers = with maintainers; [ auntie ]; - license = licenses.gpl2; - }; - -} diff --git a/pkgs/development/python-modules/pycep-parser/default.nix b/pkgs/development/python-modules/pycep-parser/default.nix new file mode 100644 index 000000000000..d76f72630a6b --- /dev/null +++ b/pkgs/development/python-modules/pycep-parser/default.nix @@ -0,0 +1,58 @@ +{ lib +, assertpy +, buildPythonPackage +, fetchFromGitHub +, lark +, poetry-core +, pytestCheckHook +, pythonOlder +, regex +, typing-extensions +}: + +buildPythonPackage rec { + pname = "pycep-parser"; + version = "0.3.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "gruebel"; + repo = "pycep"; + rev = version; + hash = "sha256-ud26xJQWdu7wtv75/K16HSSw0MvaSr3H1hDZBPjSzYE="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + lark + regex + typing-extensions + ]; + + checkInputs = [ + assertpy + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.3.2-alpha.4"' 'version = "${version}"' \ + --replace 'regex = "^2022.3.2"' 'regex = "*"' + ''; + + pythonImportsCheck = [ + "pycep" + ]; + + meta = with lib; { + description = "Python based Bicep parser"; + homepage = "https://github.com/gruebel/pycep"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix new file mode 100644 index 000000000000..a6a2446da07b --- /dev/null +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, pydantic +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pycfmodel"; + version = "0.17.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Skyscanner"; + repo = pname; + rev = version; + hash = "sha256-Rw0sZ2k+tXo04mvlL83hUgdHIND5NIsVH/CzrfmbKlE="; + }; + + propagatedBuildInputs = [ + pydantic + ]; + + checkInputs = [ + httpx + pytestCheckHook + ]; + + disabledTests = [ + # Test require network access + "test_cloudformation_actions" + "test_auxiliar_cast" + "test_valid_es_domain_from_aws_documentation_examples_resource_can_be_built" + "test_valid_opensearch_domain_from_aws_documentation_examples_resource_can_be_built" + "test_resolve_booleans_different_properties_for_generic_resource" + ]; + + pythonImportsCheck = [ + "pycfmodel" + ]; + + meta = with lib; { + description = "Model for Cloud Formation scripts"; + homepage = "https://github.com/Skyscanner/pycfmodel"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index f9a4b24ffcd6..37ef4da7daf6 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "10.2.2"; + version = "10.3.0"; format = "setuptools"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - sha256 = "bd1dbb9383ed549d42d12f337a6c664a9088b4910ebb3f11de6fe15f397e7efd"; + sha256 = "sha256-TrEHRG/b7YdvSMgyArYhKyIShhaKVcFrPrjt9CAPEKE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyclip/default.nix b/pkgs/development/python-modules/pyclip/default.nix index ac79eb8293f4..7d317120ed8d 100644 --- a/pkgs/development/python-modules/pyclip/default.nix +++ b/pkgs/development/python-modules/pyclip/default.nix @@ -3,19 +3,23 @@ , fetchFromGitHub , buildPythonPackage , pytest +, pythonOlder , xclip , xvfb-run }: buildPythonPackage rec { pname = "pyclip"; - version = "0.5.4"; + version = "0.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "spyoungtech"; repo = pname; rev = "v${version}"; - sha256 = "19ff9cgnfx03mbmy5zpbdi986ppx38a5jf97vkqnic4g5sd1qyrn"; + hash = "sha256-NCWmCp4VGwwvubqN8FUUJ0kcZbXjOEyB6+BfGky1Kj4="; }; postPatch = '' @@ -23,7 +27,12 @@ buildPythonPackage rec { --replace docs/README.md README.md ''; - checkInputs = [ pytest ] ++ lib.optionals stdenv.isLinux [ xclip xvfb-run ]; + checkInputs = [ + pytest + ] ++ lib.optionals stdenv.isLinux [ + xclip + xvfb-run + ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index 878e36e5c07a..90bd83f85d29 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pycm"; - version = "3.3"; + version = "3.4"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sepandhaghighi"; repo = pname; rev = "v${version}"; - sha256 = "0i3qpb20mnc22qny1ar3yvxb1dac7njwi8bvi5sy5kywz10c5dkw"; + sha256 = "0agis9jh6kjf7k1vf1fiyf5h3lb9p0w9k710wwpsby292ydazr4f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix index eb57096b9813..fc930d0e1197 100644 --- a/pkgs/development/python-modules/pycoin/default.nix +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pycoin"; - version = "0.91.20210515"; + version = "0.92.20220213"; src = fetchPypi { inherit pname version; - sha256 = "d2231a8d11b2524c26472d08cf1b76569849ab44507495d0510165ae0af4858e"; + sha256 = "sha256-qb2jtb/bHJSmtnQbYTFgCgBY0OCsrxsWJ7SJFeEDytc="; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index 868504e39949..560c5a708122 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pycountry"; - version = "20.7.3"; + version = "22.1.10"; src = fetchPypi { inherit pname version; - sha256 = "0hnbabsmqimx5hqh0jbd2f64i8fhzhhbrvid57048hs5sd9ll241"; + sha256 = "b9a6d9cdbf53f81ccdf73f6f5de01b0d8493cab2213a230af3e34458de85ea32"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pycritty/default.nix b/pkgs/development/python-modules/pycritty/default.nix index 3e5f24290257..e02a69933f69 100644 --- a/pkgs/development/python-modules/pycritty/default.nix +++ b/pkgs/development/python-modules/pycritty/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pycritty"; - version = "0.3.5"; + version = "0.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1lrmd4a1ps3h9z0pndfjfrd2qa7v3abd6np75fd2q2ffsqv7ar6x"; + sha256 = "sha256-Lh2zAEJTyzI8dJTNuyaf7gzhySMpui+CF9qRiubwFhE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index a9a302cf51bd..364a218aaa1b 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -4,8 +4,8 @@ # https://github.com/NixOS/nixpkgs/issues/21671 buildPythonPackage rec { - version = pycryptodome.version; pname = "pycrypto"; + version = pycryptodome.version; # Cannot build wheel otherwise (zip 1980 issue) SOURCE_DATE_EPOCH=315532800; @@ -21,8 +21,8 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = "http://www.pycrypto.org/"; - description = "Python Cryptography Toolkit"; + homepage = "https://www.pycrypto.org/"; + description = "Drop-in replacement for pycrypto using pycryptodome"; platforms = pycryptodome.meta.platforms; }; } diff --git a/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix b/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix index 4fbc259c188e..6e7f71cee306 100644 --- a/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix +++ b/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pycryptodome-test-vectors"; - version = "1.0.4"; + version = "1.0.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-2+ZL8snmaB0tNxGZRbUM6SdfXZf4CM0nh3/wTOu9R50="; + hash = "sha256-GfzFM3S4yk0V2zTaQ+rkljyHdvC0ETUNSccZImqoLIU="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 44e7ed0ad4aa..e3e4e6c3a03a 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -6,13 +6,12 @@ buildPythonPackage rec { pname = "pycryptodome"; - version = "3.12.0"; + version = "3.14.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Esc0OuxaOz31xHJlKBsSthHybsk2e2EpGZ1n2lS3aME="; - extension = "zip"; + hash = "sha256-4E5Ap/jBZpGVU2o3l53YfaLDLb3HPW/jXwB3sMF8gDs="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index c9f622d6c699..934c021ed909 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -6,13 +6,12 @@ buildPythonPackage rec { pname = "pycryptodomex"; - version = "3.12.0"; + version = "3.14.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ki6drAFm5GF+XHmA0s/2kSputctcE+fs4iJDhlC9f2Y="; - extension = "zip"; + hash = "sha256-LOdu0Agf1qyMdO3HW50U7KIGQXOveYQ8JPpiVzJjwfI="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyctr/default.nix b/pkgs/development/python-modules/pyctr/default.nix new file mode 100644 index 000000000000..3817342be3ed --- /dev/null +++ b/pkgs/development/python-modules/pyctr/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, pycryptodomex }: + +buildPythonPackage rec { + pname = "pyctr"; + version = "0.6.0"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-05lMcsIeJIHI3LwHQTjr4M+bn1FG+GQscuGq34XxjK8="; + }; + + propagatedBuildInputs = [ pycryptodomex ]; + + pythonImportsCheck = [ "pyctr" ]; + + meta = with lib; { + description = "Python library to interact with Nintendo 3DS files"; + license = licenses.mit; + maintainers = with maintainers; [ rileyinman ]; + homepage = "https://github.com/ihaveamac/pyctr"; + }; +} diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 5494360e51fc..3585148b31c0 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -7,18 +7,17 @@ , openssl , bottle , pytestCheckHook -, nose , flaky }: buildPythonPackage rec { pname = "pycurl"; - version = "7.44.1"; + version = "7.45.1"; disabled = isPyPy || (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208 src = fetchPypi { inherit pname version; - sha256 = "5bcef4d988b74b99653602101e17d8401338d596b9234d263c728a0c3df003e8"; + sha256 = "sha256-qGOtGP9Hj1VFkkBXiHza5CLhsnRuQWdGFfaHSY6luIo="; }; preConfigure = '' @@ -38,7 +37,6 @@ buildPythonPackage rec { checkInputs = [ bottle pytestCheckHook - nose flaky ]; @@ -76,9 +74,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "http://pycurl.sourceforge.net/"; - description = "Python wrapper for libcurl"; - license = licenses.lgpl2Only; + homepage = "http://pycurl.io/"; + description = "Python Interface To The cURL library"; + license = with licenses; [ lgpl2Only mit ]; maintainers = with maintainers; []; }; } diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index 67f8da66be78..adbb0d21a8c3 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.6.0"; + version = "2.7.0"; disabled = pythonOlder "3.6"; src = fetchFromBitbucket { owner = "mustang51"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Fk6zMWgvhKp+7BMDGw89Akb4fgK6+xi+AyvEY3pdTQQ="; + sha256 = "sha256-k6NAQvt79Qo7sAXQwOjq4Coz2iTZAUImasc/oMSpmmg="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { urllib3 ]; - # while they have tests, they do not run them in their CI and they fail as of 2.6.0 + # while they have tests, they do not run them in their CI and they fail as of 2.7.0 # AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption' doCheck = false; diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index 5457e44dc3b1..f1aacb1c312f 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pydal"; - version = "20220114.1"; + version = "20220213.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "8c872f1fd6759eef497d72cf33fe57537be86ccf23515bd47e1f8a04d862236e"; + sha256 = "sha256-7DBLcHSEkoT8wV6824TGWRLi9vK2t+r1RwwWmRBYD9I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 1072a4e24422..8ac9eeca2a83 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,5 +1,7 @@ { lib , buildPythonPackage +, cython +, devtools , email_validator , fetchFromGitHub , pytest-mock @@ -7,7 +9,6 @@ , python-dotenv , pythonOlder , typing-extensions -, ujson }: buildPythonPackage rec { @@ -22,11 +23,15 @@ buildPythonPackage rec { sha256 = "sha256-C4WP8tiMRFmkDkQRrvP3yOSM2zN8pHJmX9cdANIckpM="; }; + nativeBuildInputs = [ + cython + ]; + propagatedBuildInputs = [ + devtools email_validator python-dotenv typing-extensions - ujson ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pydash/default.nix b/pkgs/development/python-modules/pydash/default.nix index 7d75896397f3..5b0ffade5885 100644 --- a/pkgs/development/python-modules/pydash/default.nix +++ b/pkgs/development/python-modules/pydash/default.nix @@ -1,23 +1,46 @@ -{ lib, buildPythonPackage, fetchFromGitHub, mock, pytestCheckHook, invoke }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, invoke +, mock +, pytestCheckHook +, pythonOlder +, sphinx_rtd_theme +}: buildPythonPackage rec { pname = "pydash"; - version = "4.9.3"; + version = "5.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dgilland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BAyiSnILvujUOFOAkiXSgyozs2Q809pYihHwa+6BHcQ="; + hash = "sha256-BAyiSnILvujUOFOAkiXSgyozs2Q809pYihHwa+6BHcQ="; }; - patches = [ ./0001-Only-build-unit-tests.patch ]; + checkInputs = [ + invoke + mock + sphinx_rtd_theme + pytestCheckHook + ]; - checkInputs = [ mock pytestCheckHook invoke ]; + postPatch = '' + sed -i "/--cov/d" setup.cfg + sed -i "/--no-cov/d" setup.cfg + ''; + + pythonImportsCheck = [ + "pydash" + ]; meta = with lib; { - homepage = "https://github.com/dgilland/pydash"; - description = "The kitchen sink of Python utility libraries for doing \"stuff\" in a functional way. Based on the Lo-Dash Javascript library."; + description = "Python utility libraries for doing stuff in a functional way"; + homepage = "https://pydash.readthedocs.io"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; }; diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 44c33a2d2e2e..8d37521f3266 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -10,14 +10,16 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "85"; + version = "87"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Kane610"; repo = "deconz"; rev = "v${version}"; - sha256 = "sha256-6GTMG3BfHcfLMoyabFbhsJFVDHmEICuzf32603+jyZ4="; + sha256 = "sha256-scNTHbUL8TOhkUJyib4cgL8A4gZ73asmFLi8aGw3sX8="; }; propagatedBuildInputs = [ @@ -30,7 +32,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pydeconz" ]; + pythonImportsCheck = [ + "pydeconz" + ]; meta = with lib; { description = "Python library wrapping the Deconz REST API"; diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix index f6d1fbeeaa26..212a245b328c 100644 --- a/pkgs/development/python-modules/pydevccu/default.nix +++ b/pkgs/development/python-modules/pydevccu/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pydevccu"; - version = "0.1.1"; + version = "0.1.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-awTy1yQdiKvqcUb8ecgOMhgpzpF7HvFZw/W8urA92LU="; + sha256 = "sha256-rbxYTpB6ieZBYbbE1AKVEc/lapWlOUMOrSHCkuwkzLg="; }; # Module has no tests diff --git a/pkgs/development/python-modules/pydexcom/default.nix b/pkgs/development/python-modules/pydexcom/default.nix index c2f8953bbced..f79cfc9493dd 100644 --- a/pkgs/development/python-modules/pydexcom/default.nix +++ b/pkgs/development/python-modules/pydexcom/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pydexcom"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "gagebenne"; repo = pname; rev = version; - sha256 = "sha256-8PE+MFQkuwYey82jNSRjMaK8kAhYSBbjqnsbGJHGW9I="; + sha256 = "sha256-ItDGnUUUTwCz4ZJtFVlMYjjoBPn2h8QZgLzgnV2T/Qk="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index 00e36ec37312..8dccfbc2610d 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -4,19 +4,33 @@ , substituteAll , graphviz , python +, pytestCheckHook , chardet +, pythonOlder , pyparsing }: buildPythonPackage rec { pname = "pydot"; version = "1.4.2"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "248081a39bcb56784deb018977e428605c1c758f10897a339fce1dd728ff007d"; }; + propagatedBuildInputs = [ + pyparsing + ]; + + checkInputs = [ + chardet + pytestCheckHook + ]; + patches = [ (substituteAll { src = ./hardcode-graphviz-path.patch; @@ -27,21 +41,31 @@ buildPythonPackage rec { postPatch = '' # test_graphviz_regression_tests also fails upstream: https://github.com/pydot/pydot/pull/198 substituteInPlace test/pydot_unittest.py \ - --replace "test_graphviz_regression_tests" "no_test_graphviz_regression_tests" + --replace "test_graphviz_regression_tests" "no_test_graphviz_regression_tests" \ + # Patch path for pytestCheckHook + substituteInPlace test/pydot_unittest.py \ + --replace "shapefile_dir = os.path.join(test_dir, 'from-past-to-future')" "shapefile_dir = 'test/from-past-to-future'" \ + --replace "path = os.path.join(test_dir, TESTS_DIR_1)" "path = os.path.join('test/', TESTS_DIR_1)" ''; - propagatedBuildInputs = [ pyparsing ]; + pytestFlagsArray = [ + "test/pydot_unittest.py" + ]; - checkInputs = [ chardet ]; + disabledTests = [ + "test_exception_msg" + # Hash mismatch + "test_my_regression_tests" + ]; - checkPhase = '' - cd test - ${python.interpreter} pydot_unittest.py - ''; + pythonImportsCheck = [ + "pydot" + ]; - meta = { + meta = with lib; { + description = "Allows to create both directed and non directed graphs from Python"; homepage = "https://github.com/erocarrera/pydot"; - description = "Allows to easily create both directed and non directed graphs from Python"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pydroid-ipcam/default.nix b/pkgs/development/python-modules/pydroid-ipcam/default.nix index 3d9b4188172b..50e04ef2018d 100644 --- a/pkgs/development/python-modules/pydroid-ipcam/default.nix +++ b/pkgs/development/python-modules/pydroid-ipcam/default.nix @@ -8,14 +8,16 @@ buildPythonPackage rec { pname = "pydroid-ipcam"; - version = "unstable-2021-06-01"; + version = "1.3.1"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = "3ca14ff178f3506a6a91d8736deea8f06e9ad1c1"; - sha256 = "0w81pl5fya17hg5xgba2vgxnylfd8jc70il575wdz2pw6z6ihj3s"; + hash = "sha256-ekgYzTf8it94OYVGcJhEzVFv+9tCrdfLgyco7wq9AXE="; }; propagatedBuildInputs = [ @@ -25,7 +27,10 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pydroid_ipcam" ]; + + pythonImportsCheck = [ + "pydroid_ipcam" + ]; meta = with lib; { description = "Python library for Android IP Webcam"; diff --git a/pkgs/development/python-modules/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix index 82556ac1a710..9bfa5aa3d7c3 100644 --- a/pkgs/development/python-modules/pydy/default.nix +++ b/pkgs/development/python-modules/pydy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pydy"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1b487a62b55a8c8664009b09bf789254b2c942cd704a380bedb1057418c94fa2"; + sha256 = "sha256-e/Ssfd5llioA7ccLULlRdHR113IbR4AJ4/HmzQuU7vI="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix new file mode 100644 index 000000000000..a31123492d42 --- /dev/null +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, pythonAtLeast +, fetchFromGitHub +, netaddr +, pytestCheckHook +, mock +}: + +buildPythonPackage rec { + pname = "pyeapi"; + version = "0.8.4"; + format = "pyproject"; + + # https://github.com/arista-eosplus/pyeapi/issues/189 + disabled = pythonAtLeast "3.10"; + + src = fetchFromGitHub { + owner = "arista-eosplus"; + repo = pname; + rev = "v${version}"; + sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b"; + }; + + propagatedBuildInputs = [ netaddr ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pytestFlagsArray = [ "test/unit" ]; + + pythonImportsCheck = [ "pyeapi" ]; + + meta = with lib; { + description = "Client for Arista eAPI"; + homepage = "https://github.com/arista-eosplus/pyeapi"; + license = licenses.bsd3; + maintainers = [ maintainers.astro ]; + }; +} diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix index d55fb416a79e..7dd36c8fd6a1 100644 --- a/pkgs/development/python-modules/pyeclib/default.nix +++ b/pkgs/development/python-modules/pyeclib/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, liberasurecode, six }: +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, liberasurecode, six }: buildPythonPackage rec { pname = "pyeclib"; - version = "1.6.0"; + version = "unstable-2022-03-11"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-gBHjHuia5/uZymkWZgyH4BCEZqmWK9SXowAQIJdOO7E="; + src = fetchFromGitHub { + owner = "openstack"; + repo = "pyeclib"; + rev = "b50040969a03f7566ffcb468336e875d21486113"; + sha256 = "sha256-nYYjocStC0q/MC6pum3J4hlXiu/R5xODwIE97Ho3iEY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyeconet/default.nix b/pkgs/development/python-modules/pyeconet/default.nix index bf878fd5acbc..581238c90ac6 100644 --- a/pkgs/development/python-modules/pyeconet/default.nix +++ b/pkgs/development/python-modules/pyeconet/default.nix @@ -3,15 +3,19 @@ , buildPythonPackage , fetchPypi , aiohttp +, pythonOlder }: buildPythonPackage rec { pname = "pyeconet"; - version = "0.1.14"; + version = "0.1.15"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-x0mkC2k65VrDhv7UavgDUuRWIQoAJMDtA7jNXNUJuVg="; + sha256 = "sha256-zxD2sjKWB/bmxwpVFgkKTngMhr4bVuW+qkSt+pbxqPY="; }; propagatedBuildInputs = [ @@ -21,7 +25,10 @@ buildPythonPackage rec { # Tests require credentials doCheck = false; - pythonImportsCheck = [ "pyeconet" ]; + + pythonImportsCheck = [ + "pyeconet" + ]; meta = with lib; { description = "Python interface to the EcoNet API"; diff --git a/pkgs/development/python-modules/pyefergy/default.nix b/pkgs/development/python-modules/pyefergy/default.nix index 20f3fb9f417b..28fb058c52a2 100644 --- a/pkgs/development/python-modules/pyefergy/default.nix +++ b/pkgs/development/python-modules/pyefergy/default.nix @@ -1,15 +1,18 @@ { lib , aiohttp +, aresponses , buildPythonPackage , fetchFromGitHub , iso4217 +, pytest-asyncio +, pytestCheckHook , pythonOlder , pytz }: buildPythonPackage rec { pname = "pyefergy"; - version = "0.1.5"; + version = "22.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +21,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - sha256 = "sha256-8xcKgsZ6buaQdrKD8Qn7jB5IlQ0NkR0nZGuFk+Dd8Q8="; + sha256 = "sha256-AdoM+PcVoajxhnEfkyN9UuNufChu8XGmZDLNC3mjrps="; }; propagatedBuildInputs = [ @@ -27,10 +30,15 @@ buildPythonPackage rec { pytz ]; - # Project has no tests - doCheck = false; + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; - pythonImportsCheck = [ "pyefergy" ]; + pythonImportsCheck = [ + "pyefergy" + ]; meta = with lib; { description = "Python API library for Efergy energy meters"; diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix index dc390120f600..f84612716975 100644 --- a/pkgs/development/python-modules/pyeight/default.nix +++ b/pkgs/development/python-modules/pyeight/default.nix @@ -3,19 +3,21 @@ , async-timeout , buildPythonPackage , fetchFromGitHub -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "pyeight"; - version = "0.1.9"; - disabled = !isPy3k; + version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mezz64"; repo = "pyEight"; rev = version; - sha256 = "1ybhs09wyzzaryghd6ijxhajp3677x63c4qzqsgln1mmxhj8wm5k"; + sha256 = "sha256-ERilZWroFaBCYjTfU7W0vegJaGibmJYVcgt0z84TPEI="; }; propagatedBuildInputs = [ @@ -23,9 +25,12 @@ buildPythonPackage rec { async-timeout ]; - # Project has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "pyeight" ]; + + pythonImportsCheck = [ + "pyeight" + ]; meta = with lib; { description = "Python library to interface with the Eight Sleep API"; diff --git a/pkgs/development/python-modules/pyenvisalink/default.nix b/pkgs/development/python-modules/pyenvisalink/default.nix index d107d8e13001..2bcbc753a9ae 100644 --- a/pkgs/development/python-modules/pyenvisalink/default.nix +++ b/pkgs/development/python-modules/pyenvisalink/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyenvisalink"; - version = "4.3"; + version = "4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "151a9bdefa2772cc9d2f913a32792625a4dc80c6c08086783ebc57de355e68a1"; + sha256 = "sha256-YUYiCid+XAlfytkyz4Td5CG1zBOrsLx4/nuRubRE14w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyerfa/default.nix b/pkgs/development/python-modules/pyerfa/default.nix index b59aa56c48e9..7f51f435ada9 100644 --- a/pkgs/development/python-modules/pyerfa/default.nix +++ b/pkgs/development/python-modules/pyerfa/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyerfa"; format = "pyproject"; - version = "2.0.0"; + version = "2.0.0.1"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "sha256-+QQjHhpXD5REDgYUB5lZCJUQf5QoR7UqdTzoHJYJFi0="; + sha256 = "2fd4637ffe2c1e6ede7482c13f583ba7c73119d78bef90175448ce506a0ede30"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix index 4223ce02caea..840a74f252ef 100644 --- a/pkgs/development/python-modules/pyexcel-io/default.nix +++ b/pkgs/development/python-modules/pyexcel-io/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyexcel-io"; - version = "0.6.5"; + version = "0.6.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "608d8e80da38070d3bb970d132bc47a55dcfd63b4dc03997d93646c5b2ad185b"; + sha256 = "sha256-9ghL8a+l+/TGHPffRDcPpROCGvGIsC4+GbXvtm2Klp8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix index c6bc3cf0777f..83b5254d3984 100644 --- a/pkgs/development/python-modules/pyexcel/default.nix +++ b/pkgs/development/python-modules/pyexcel/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyexcel"; - version = "0.6.7"; + version = "0.7.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "cbbd9875729767564b3b64b6ed6a9870b14631184943d13646833d94157dd10f"; + sha256 = "sha256-+/Du5dk7ls728ZqfAHA/IsCmTxlyjZG5VCgAmlISlwk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index f7d564e7e54d..e6a2d5c02260 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.0.5"; + version = "0.2.0.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = version; - sha256 = "sha256-a+u8zS69qLHABPSvWEzhM/gdzlLh2RJLTDJjaX4DtpI="; + sha256 = "sha256-3GRyM6OK0EpQ7wepTzqg+XANx9D0OVBTnw98i3b1V/8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index 3a29fd79f779..d10e20eb0b2e 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -1,21 +1,35 @@ -{ lib, fetchPypi, buildPythonPackage -, importlib-metadata, importlib-resources, six, traits +{ lib +, fetchPypi +, buildPythonPackage +, importlib-metadata +, importlib-resources +, traits +, pythonOlder }: buildPythonPackage rec { pname = "pyface"; - version = "7.3.0"; + version = "7.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a7031ec4cfff034affc822e47ff5e6c1a0272e576d79465cdbbe25f721740322"; + sha256 = "sha256-UtzzZ5yj5hCjynxLmQSpbGkWiASNtdflKvjlAZ5HrbY="; }; - propagatedBuildInputs = [ importlib-metadata importlib-resources six traits ]; + propagatedBuildInputs = [ + importlib-metadata + importlib-resources + traits + ]; doCheck = false; # Needs X server - pythonImportsCheck = [ "pyface" ]; + pythonImportsCheck = [ + "pyface" + ]; meta = with lib; { description = "Traits-capable windowing framework"; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index eb5eb993ef48..29803793fd6f 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.5.3"; + version = "4.5.4"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "f49db689c1d5db6172131479ca77bd474ba2cb886c869b9867fb89cdab2df397"; + sha256 = "5b5951e873f73bf12e3a19d8e4470c4b7962c51df753cf8c4caaf64e24a0a323"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyfakewebcam/default.nix b/pkgs/development/python-modules/pyfakewebcam/default.nix index 1ef1d2df474d..c130accd40c0 100644 --- a/pkgs/development/python-modules/pyfakewebcam/default.nix +++ b/pkgs/development/python-modules/pyfakewebcam/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { description = "A library for writing RGB frames to a fake webcam device on Linux"; homepage = "https://github.com/jremmons/pyfakewebcam"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/pyfcm/default.nix b/pkgs/development/python-modules/pyfcm/default.nix index 8fdb051a4846..77ddabe2057e 100644 --- a/pkgs/development/python-modules/pyfcm/default.nix +++ b/pkgs/development/python-modules/pyfcm/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyfcm"; - version = "1.4.7"; + version = "1.4.8"; src = fetchFromGitHub { owner = "olucurious"; repo = "pyfcm"; rev = version; - sha256 = "0aj10yvjsc04j15zbn403i83j7ra5yg35pi3ywkyakk8n1s0s3qg"; + sha256 = "15q6p21wsjm75ccmzcsgad1w9fgk6189hbrp7pawpxl7l3qxn2p7"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pyflunearyou/default.nix b/pkgs/development/python-modules/pyflunearyou/default.nix index 99506de1026a..a481e9a97a89 100644 --- a/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/pkgs/development/python-modules/pyflunearyou/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { sha256 = "sha256-Q65OSE4qckpvaIvZULBR434i7hwuVM97eSq1Blb1oIU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'ujson = ">=1.35,<5.0"' 'ujson = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyfritzhome/default.nix b/pkgs/development/python-modules/pyfritzhome/default.nix index 0bfda48269e1..714159ff9944 100644 --- a/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/pkgs/development/python-modules/pyfritzhome/default.nix @@ -9,17 +9,21 @@ buildPythonPackage rec { pname = "pyfritzhome"; - version = "0.6.2"; + version = "0.6.4"; + format = "setuptools"; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "hthiery"; repo = "python-fritzhome"; rev = version; - sha256 = "1hwxq9w5qmiky8gpp623nabmydr3yv6hvgzk24fdbmkglfp6ja1v"; + sha256 = "sha256-JCaB3E8KCfncwnTKIb0shB2qYpsKwBkrPZdC5lAJ1KQ="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; checkInputs = [ mock @@ -30,7 +34,9 @@ buildPythonPackage rec { nosetests ''; - pythonImportsCheck = [ "pyfritzhome" ]; + pythonImportsCheck = [ + "pyfritzhome" + ]; meta = with lib; { description = "Python Library to access AVM FRITZ!Box homeautomation"; diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index a1fd4215faf9..baf57da4160e 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -8,22 +8,29 @@ buildPythonPackage rec { pname = "pyftdi"; - version = "0.53.3"; - disabled = pythonOlder "3.5"; + version = "0.54.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "eblot"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t4rFsuhcpYdgmQeog+DRFxHk0wpMc+aukQi981vH/44="; + hash = "sha256-vL8jSgTtDvaHuCvaCYmFixILQFasTl82yINL5yRtOwU="; }; - propagatedBuildInputs = [ pyusb pyserial ]; + propagatedBuildInputs = [ + pyserial + pyusb + ]; - # tests requires access to the serial port + # Tests require access to the serial port doCheck = false; - pythonImportsCheck = [ "pyftdi" ]; + pythonImportsCheck = [ + "pyftdi" + ]; meta = with lib; { description = "User-space driver for modern FTDI devices"; diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index 58f65b6d0f41..f56591efdadf 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -3,21 +3,23 @@ , buildPythonPackage , fetchFromGitHub , pygame +, python-i18n , pytestCheckHook }: buildPythonPackage rec { pname = "pygame-gui"; - version = "0.5.7"; + version = "0.6.4"; + # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "MyreMylar"; repo = "pygame_gui"; rev = "v_${lib.replaceStrings ["."] [""] version}"; - sha256 = "4P2PT8/7oA5Q7H4+pm7BOET7w05pQYQltXVV3+YVrVE="; + sha256 = "13+fK1hYxiMh0T+xbbmHViZjyBoQfRyIDc05fIJ/46U="; }; - propagatedBuildInputs = [ pygame ]; + propagatedBuildInputs = [ pygame python-i18n ]; postPatch = '' substituteInPlace pygame_gui/core/utility.py \ @@ -44,10 +46,14 @@ buildPythonPackage rec { "test_process_event_text_ctrl_x" ]; + disabledTestPaths = [ + "tests/test_performance/test_text_performance.py" + ]; + meta = with lib; { description = "A GUI system for pygame"; homepage = "https://github.com/MyreMylar/pygame_gui"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 60a1fece63ac..909ce1caa38b 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "pygame"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = pname; @@ -14,7 +14,7 @@ buildPythonPackage rec { # 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. - sha256 = "sha256-Pe7BJ+8rXw+hhRv64fI+79gJcU1npQFFAXxECx2+Trw="; + sha256 = "sha256-v1z6caEMJNXqbcbTmFXoy3KQewHiz6qK4vhNU6Qbukk="; extraPostFetch = "rm -rf $out/docs/reST"; }; @@ -25,6 +25,7 @@ buildPythonPackage rec { buildinputs_include = builtins.toJSON (builtins.concatMap (dep: [ "${lib.getDev dep}/" "${lib.getDev dep}/include" + "${lib.getDev dep}/include/SDL2" ]) buildInputs); buildinputs_lib = builtins.toJSON (builtins.concatMap (dep: [ "${lib.getLib dep}/" @@ -72,7 +73,7 @@ buildPythonPackage rec { description = "Python library for games"; homepage = "https://www.pygame.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 4f3a9de3a36f..b8b405a8ecf0 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.7.2"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "70a4536a35452c31f823b59b6fdb665aa3778a43b73ccda3a4f79fa9962ad2bb"; + sha256 = "sha256-bixc/1qh5D9DEDSAdhFS9cXWvvQPXB9QyHWKbonmbLY="; }; preConfigure = lib.optionalString stdenv.isDarwin '' @@ -25,12 +25,12 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - preCheck = '' + disabledTestPaths = [ # disable tests that require networking - rm test/test_repository.py - rm test/test_credentials.py - rm test/test_submodule.py - ''; + "test/test_repository.py" + "test/test_credentials.py" + "test/test_submodule.py" + ]; # Tests require certificates # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582674047 @@ -44,11 +44,10 @@ buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582681068 doCheck = false; - disabled = !isPy3k; - meta = with lib; { description = "A set of Python bindings to the libgit2 shared library"; homepage = "https://pypi.python.org/pypi/pygit2"; license = licenses.gpl2; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 7addcf531426..db436983f3af 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "1.5.21"; + version = "1.5.23"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5aaaddb06dc4b6f9ba08254d8d806a2bd2406925a9caf3a51fdffbd5d09728e2"; + sha256 = "sha256-3ukgIDzzBhWcUDurti84eHJocIl39clF0oM3WUt5fEY="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index d846cc4f18c7..b06cb5430064 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -1,52 +1,63 @@ { lib -, buildPythonPackage -, eigen -, nlopt -, ipopt +, stdenv +, toPythonModule +, fetchFromGitHub +, cmake , boost +, eigen +, ipopt +, nlopt , pagmo2 -, numpy +, python , cloudpickle , ipyparallel , numba -, python +, numpy +, pybind11 }: -let - propagatedBuildInputs = [ numpy cloudpickle ipyparallel numba ]; - - pagmo2WithPython = pagmo2.overrideAttrs (oldAttrs: { - cmakeFlags = oldAttrs.cmakeFlags ++ [ - "-DPAGMO_BUILD_PYGMO=yes" - "-DPAGMO_BUILD_PAGMO=no" - "-DPagmo_DIR=${pagmo2}" - ]; - buildInputs = [ eigen nlopt ipopt boost pagmo2 ] ++ propagatedBuildInputs; - postInstall = '' - mv wheel $out - ''; - }); - -in buildPythonPackage { +toPythonModule (stdenv.mkDerivation rec { pname = "pygmo"; - version = pagmo2WithPython.version; + version = "2.18.0"; - inherit propagatedBuildInputs; + src = fetchFromGitHub { + owner = "esa"; + repo = "pygmo2"; + rev = "v${version}"; + sha256 = "sha256-he7gxRRJd6bBrD0Z0i+CQTr5JH4P3Im/beNGO+HfmNM="; + }; - src = pagmo2WithPython; + cmakeFlags = [ + "-DPYGMO_INSTALL_PATH=${placeholder "out"}/lib/${python.libPrefix}/site-packages" + ]; - preBuild = '' - mv ${python.sitePackages}/pygmo wheel - cd wheel - ''; + nativeBuildInputs = [ + cmake + ]; - # dont do tests - doCheck = false; + propagatedBuildInputs = [ + cloudpickle + ipyparallel + numba + numpy + python + ]; + + buildInputs = [ + boost + eigen + ipopt + nlopt + pagmo2 + pybind11 + ]; + + doCheck = true; meta = with lib; { description = "Parallel optimisation for Python"; - homepage = "https://esa.github.io/pagmo2/"; + homepage = "https://github.com/esa/pygmo2"; license = licenses.gpl3Plus; maintainers = [ maintainers.costrouc ]; }; -} +}) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 6f06065457ed..f7728cfa28db 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.5.0"; + version = "0.6.0"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; rev = "v${version}"; - sha256 = "1mazljxwh162df971cvv7cwnqr300r17qfs7k09s6yd6hajyhz49"; + sha256 = "sha256-QzqQKnANReSHIsDbiKSZ1ZgMgbj3NAfq4bmRQktnRjQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 3c0552ef4d3c..3780122f19f7 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pygraphviz"; - version = "1.8"; + version = "1.9"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - hash = "sha256-6y4losZHBE57ZrWhWb5k2q7yS1Sfz1NcJBNp1ubgnEU="; + hash = "sha256-+hj3xs6ig0Gk5GbtDPBWgrCmgoiv6N18lCZ4L3wa4Bw="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index fd6ba2f2df98..a4c04ce79ee6 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "PyHamcrest"; - version = "2.0.2"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "412e00137858f04bde0729913874a48485665f2d36fe9ee449f26be864af9316"; + sha256 = "dfb19cf6d71743e086fbb761ed7faea5aacbc8ec10c17a08b93ecde39192a3db"; }; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 6fe9df519652..6028f19bdab2 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyhaversion"; - version = "21.11.1"; + version = "22.02.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-wh6NJRDgOrEHYEN3QlC4lOZHPnPeiPCJFF1xLoixQ14="; + sha256 = "sha256-7cBUsTEZ9yVlWsUdKs4YWm647baN09AQJI+7CTORhLc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyhiveapi/default.nix b/pkgs/development/python-modules/pyhiveapi/default.nix index fb0b22cd4440..0218b77e116d 100644 --- a/pkgs/development/python-modules/pyhiveapi/default.nix +++ b/pkgs/development/python-modules/pyhiveapi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pyhiveapi"; - version = "0.4.6"; + version = "0.5.1"; format = "pyproject"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Pyhass"; repo = "Pyhiveapi"; rev = "v${version}"; - hash = "sha256-muUVZYBUloKRnAx7H8ry72eg85GzmnpTG8M/MfKcnGM="; + hash = "sha256-/M1OjApc0l0EzNI4hs4KO6woCOmTPveTFCyj5MjM5EE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix index f69a21115f27..aa967b76954a 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyhocon"; - version = "0.3.58"; + version = "0.3.59"; src = fetchFromGitHub { owner = "chimpler"; repo = "pyhocon"; rev = version; - sha256 = "sha256-ddspVDKy9++cISWH6R95r+gJrzNGqMTybI04OgVtIUU="; + sha256 = "1yr24plg3d4girg27ajjkf9mndig706fs8b2kmnmhi4l2xi866yh"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyhumps/default.nix b/pkgs/development/python-modules/pyhumps/default.nix new file mode 100644 index 000000000000..51d5b8bce5ec --- /dev/null +++ b/pkgs/development/python-modules/pyhumps/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyhumps"; + version = "3.5.3"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "nficano"; + repo = "humps"; + rev = "v${version}"; + hash = "sha256-6F61y0niPPuZBci15j68MFXzzBBimvbZ24+i9AZ7XJs="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + ]; + + patches = [ + # Fix naming, https://github.com/nficano/humps/pull/246 + (fetchpatch { + name = "fix-naming.patch"; + url = "https://github.com/nficano/humps/commit/118f6bce785d170b10dd3afee467d26dcc8b425d.patch"; + sha256 = "sha256-oQxkLsihnHZlHiZEupwG9Dr1Ss1w+KjDsBtbEVDced4="; + }) + ]; + + pythonImportsCheck = [ + "humps" + ]; + + meta = with lib; { + description = "Module to convert strings (and dictionary keys) between snake case, camel case and pascal case"; + homepage = "https://github.com/nficano/humps"; + license = with licenses; [ unlicense ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 039d6259f36d..56f4e4236215 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "pyicloud"; - version = "0.10.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "picklepete"; repo = pname; rev = version; - sha256 = "0bxbhvimwbj2jm8dg7sil8yvln17xgjhvpwr4m783vwfcf76kdmy"; + sha256 = "sha256-2E1pdHHt8o7CGpdG+u4xy5OyNCueUGVw5CY8oicYd5w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix new file mode 100644 index 000000000000..fed8628ea2da --- /dev/null +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, gevent +, click +, colorama +, configparser +, distro +, jinja2 +, paramiko +, python-dateutil +, pywinrm +, setuptools +, six +}: + +buildPythonPackage rec { + pname = "pyinfra"; + version = "1.7.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-qA65l0+E5jVdPghjcX2YiVtdhHRxt4ey28xOedgwHaM="; + }; + + propagatedBuildInputs = [ + click + colorama + configparser + distro + gevent + jinja2 + paramiko + python-dateutil + pywinrm + setuptools + six + ]; + + doCheck = false; + + pythonImportsCheck = [ + "pyinfra" + ]; + + meta = with lib; { + description = "Python-based infrastructure automation"; + longDescription = '' + pyinfra automates/provisions/manages/deploys infrastructure. It can be used for + ad-hoc command execution, service deployment, configuration management and more. + ''; + homepage = "https://github.com/Fizzadar/pyinfra"; + maintainers = with maintainers; [ totoroot ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 04dbd8142ff6..0dc1c5be49c2 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -1,36 +1,36 @@ { lib -, buildPythonPackage -, fetchFromGitHub , aiofiles , aiohttp , async_generator +, buildPythonPackage +, fetchFromGitHub , pypubsub , pyserial , pyserial-asyncio -, pyyaml -, pytestCheckHook -, pythonOlder -, pytest-cov , pytest-asyncio , pytest-timeout +, pytestCheckHook +, pythonOlder +, pyyaml }: buildPythonPackage rec { pname = "pyinsteon"; - version = "1.0.13"; + version = "1.0.16"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-KVwAF+yoU26ktNRKWQ+nrhS1i90xQxAhRAr4VJ+xtl0="; + hash = "sha256-V0niLQAplN/uZ0YeN6g8uax3U/d0LUT4aXxe3ENXIHc="; }; propagatedBuildInputs = [ aiofiles aiohttp - async_generator pypubsub pyserial pyserial-asyncio @@ -38,13 +38,15 @@ buildPythonPackage rec { ]; checkInputs = [ + async_generator pytest-asyncio - pytest-cov pytest-timeout pytestCheckHook ]; - pythonImportsCheck = [ "pyinsteon" ]; + pythonImportsCheck = [ + "pyinsteon" + ]; meta = with lib; { description = "Python library to support Insteon home automation projects"; diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index 48274e6b4e82..5daadce41f44 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyisy"; - version = "3.0.1"; + version = "3.0.5"; src = fetchFromGitHub { owner = "automicus"; repo = "PyISY"; rev = "v${version}"; - sha256 = "1mj9na64nq0ls8d9x3304ai7lixaglpr646p3m2a4s5qlmm4il3m"; + hash = "sha256-lVutG/xJvVP0qS0UnEyS/9KwwqdRX6ownTKek8/VXbU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix index 145ea83abeb8..f4ea169b01e4 100644 --- a/pkgs/development/python-modules/pykeyatome/default.nix +++ b/pkgs/development/python-modules/pykeyatome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pykeyatome"; - version = "1.3.1"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jugla"; repo = "pyKeyAtome"; rev = "V${version}"; - sha256 = "1lvwxcr2ay8h5sr4lmjgs7xgszl1q8ciaqdn6cmrlra27jssl5ax"; + sha256 = "sha256-Gv418i2JLoovwagkZpv8PIJPW3I/0pRmXR/PJOJ2NBc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pykrakenapi/default.nix b/pkgs/development/python-modules/pykrakenapi/default.nix index 6c91b0c95dc0..a064390b1cef 100644 --- a/pkgs/development/python-modules/pykrakenapi/default.nix +++ b/pkgs/development/python-modules/pykrakenapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pykrakenapi"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "dominiktraxl"; repo = "pykrakenapi"; rev = "v${version}"; - sha256 = "0yvhgk5wyklwqd67hfajnd7ims79h4h89pp65xb3x5mcmdcfz4ss"; + hash = "sha256-ZhP4TEWFEGIqI/nk2It1IVFKrX4HKP+dWxu+gLJNIeg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 098cdd33bfca..257cb72b3ec1 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylast"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2m6+pQYBmvVxlBw1yLSAKr3kZ5WS1S0TZ1ZQ3ER+bCk="; + sha256 = "sha256-YoALculx2trEDD1vU4xhiCGdb1OFPdxI1p2fwlZZAY8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pylaunches/default.nix b/pkgs/development/python-modules/pylaunches/default.nix index 56e93af84a06..8f2ed7083580 100644 --- a/pkgs/development/python-modules/pylaunches/default.nix +++ b/pkgs/development/python-modules/pylaunches/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pylaunches"; - version = "1.2.2"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "16fh901qlcxwycq6gqgqn076dybjnj432hb596i28avaplml4qzx"; + sha256 = "1b41j384lqg3gc7dsmdzp7anrsymqgc1895lc5j8g43x2mfgbjnh"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index c93c8d4207fe..291ef8fba62e 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.4.4"; + version = "2.5.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bFcb5GhC7jc7jEpNlyjWa2CuCSMvQLJdnag+7mHwSb8="; + sha256 = "1r48dss9qnzlifwy5ylkffdw35aaajmil0486mav056jm1vmi2pr"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index be6d71aed5d3..eec564c126b0 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.11.0"; + version = "2021.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "sha256-HdIxi6RfdXBYEYFEcv/f9wAqKZg/MsEZd6mDYwE45to="; + sha256 = "sha256-hz+MQTxobf7IkOJTpwbDDd3i13FFtxFn2kmCwPV3pu4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylru/default.nix b/pkgs/development/python-modules/pylru/default.nix index 8ca565834d4a..a83f2fd3ad14 100644 --- a/pkgs/development/python-modules/pylru/default.nix +++ b/pkgs/development/python-modules/pylru/default.nix @@ -1,18 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "pylru"; - version = "1.2.0"; + version = "1.2.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "492f934bb98dc6c8b2370c02c95c65516ddc08c8f64d27f70087eb038621d297"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jlhutch"; + repo = pname; + rev = "v${version}"; + hash = "sha256-dTYiD+/zt0ZSP+sefYyeD87To1nRXyoFodlBg8pm1YE="; }; + # Check with the next release if tests are ready + doCheck = false; + + pythonImportsCheck = [ + "pylru" + ]; + meta = with lib; { - homepage = "https://github.com/jlhutch/pylru"; description = "A least recently used (LRU) cache implementation"; - license = licenses.gpl2; + homepage = "https://github.com/jlhutch/pylru"; + license = licenses.gpl2Only; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index e1d7ddff298d..a4725c4781c6 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.5.1"; + version = "0.5.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Richardk2n"; repo = "pylsp-mypy"; rev = version; - sha256 = "1d119csj1k5m9j0f7wdvpvnd02h548css6ybxqah92nk2v0rjscr"; + sha256 = "0am16z9kmj57r5pi32jhzlbdngzmvzzaiqjm7cba1izh7w5m6dvc"; }; disabledTests = [ diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index c9cc9246746f..e7fd9630626c 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.13.0"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pVBFlGguVN6b3YY2lFF8KG83tBuotLmWLq/dKjRKAUQ="; + sha256 = "sha256-NLVxEor+Z+AVF+0/ugPM4bpeKba6yd43uTLYhtTNhqM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylxd/default.nix b/pkgs/development/python-modules/pylxd/default.nix index 64232f760faf..5e8016ddaee4 100644 --- a/pkgs/development/python-modules/pylxd/default.nix +++ b/pkgs/development/python-modules/pylxd/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "pylxd"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "lxc"; repo = "pylxd"; rev = version; - sha256 = "144frnlsb21mglgyisms790hyrdfx1l91lcd7incch4m4a1cbpp6"; + sha256 = "sha256-eDRCJYjmBndMnSNuS6HD/2p/KhzqJq2qPAzMk7kC5UM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymarshal/default.nix b/pkgs/development/python-modules/pymarshal/default.nix index 0da93a6d8a43..7da938526422 100644 --- a/pkgs/development/python-modules/pymarshal/default.nix +++ b/pkgs/development/python-modules/pymarshal/default.nix @@ -3,9 +3,6 @@ , fetchFromGitHub , pythonOlder , bson -, pytest -, pytest-cov -, pytest-runner , pytestCheckHook , pyyaml , setuptools @@ -23,9 +20,15 @@ buildPythonPackage rec { sha256 = "sha256-Ds8JV2mtLRcKXBvPs84Hdj3MxxqpeV5muKCSlAFCj1A="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'" "" + substituteInPlace setup.cfg \ + --replace "--cov=pymarshal --cov-report=html --cov-report=term" "" + ''; + nativeBuildInputs = [ setuptools - pytest-runner ]; propagatedBuildInputs = [ @@ -35,8 +38,6 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook bson - pytest - pytest-cov pyyaml ]; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 5354efacb4dc..be13f77490ad 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -1,4 +1,5 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchFromGitHub +, cython , enum34 , glibcLocales , matplotlib @@ -8,6 +9,7 @@ , palettable , pandas , plotly +, pybtex , pydispatcher , requests , ruamel-yaml @@ -21,14 +23,20 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2022.0.17"; + version = "2022.2.7"; - src = fetchPypi { - inherit pname version; - sha256 = "7103b89b889bb940709eea53226d3c9298584ad9ab42ab8c8f9de3872d7d969b"; + # sdist doesn't include c files + src = fetchFromGitHub { + owner = "materialsproject"; + repo = "pymatgen"; + rev= "v${version}"; + sha256 = "sha256-92Dxmo1Z9LR2caSOftIf1I6jeZmqDe3SqhhoCofWraw="; }; - nativeBuildInputs = [ glibcLocales ]; + nativeBuildInputs = [ + cython + glibcLocales + ]; propagatedBuildInputs = [ enum34 @@ -39,6 +47,7 @@ buildPythonPackage rec { palettable pandas plotly + pybtex pydispatcher requests ruamel-yaml diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 4bb3cabac384..361f8bff615d 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.19"; + version = "2.4.29"; src = fetchPypi { inherit pname version; - sha256 = "8518f71c221c263770322355d0745da2fffc48238d04eb48bcf3ef6c35e5f722"; + sha256 = "sha256-0k6DKkb/Izk15JKrSOC0u5wL3vT4x2CelZt112vc/p0="; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix index b153b14c5f3b..fdc7e1f67873 100644 --- a/pkgs/development/python-modules/pymazda/default.nix +++ b/pkgs/development/python-modules/pymazda/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pymazda"; - version = "0.3.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "eb4b275bcdfbf947e00b27c20dfc8ebcedfc1fb1252449141eccb5c39d782440"; + sha256 = "d51619cfbd90f4bb4e8fbfe1bccd58d4f5ece9bdb78d8f33fed1776d749d5fa9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 095f3baf97ae..7c1e46647e39 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -2,10 +2,11 @@ , fetchPypi , buildPythonPackage , pythonOlder -, Theano +, theano-pymc , pandas , patsy , joblib +, cachetools , tqdm , six , h5py @@ -16,6 +17,8 @@ , parameterized , fastprogress , typing-extensions +, dill +, semver }: buildPythonPackage rec { @@ -34,7 +37,6 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - Theano pandas patsy joblib @@ -45,12 +47,10 @@ buildPythonPackage rec { packaging fastprogress typing-extensions - ]; - - checkInputs = [ - pytest - nose - parameterized + dill + theano-pymc + cachetools + semver ]; # The test suite is computationally intensive and test failures are not @@ -67,6 +67,6 @@ buildPythonPackage rec { description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)"; homepage = "https://github.com/pymc-devs/pymc3"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ilya-kolpakov ]; + maintainers = with lib.maintainers; [ nidabdella ]; }; } diff --git a/pkgs/development/python-modules/pymediaroom/default.nix b/pkgs/development/python-modules/pymediaroom/default.nix index e977cb23d752..364063f78628 100644 --- a/pkgs/development/python-modules/pymediaroom/default.nix +++ b/pkgs/development/python-modules/pymediaroom/default.nix @@ -1,21 +1,19 @@ { lib , async-timeout , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder , xmltodict }: buildPythonPackage rec { pname = "pymediaroom"; - version = "0.6.4.1"; + version = "0.6.5.4"; disabled = pythonOlder "3.5"; - src = fetchFromGitHub { - owner = "dgomes"; - repo = pname; - rev = version; - sha256 = "1klf2dxd8rlq3n4b9m03lzwcsasn9vi6m3hzrjqhqnprhrnp0xmy"; + src = fetchPypi { + inherit pname version; + hash = "sha256-CZh2knpLT7xt5s6+kTQ4Mq9LcpKgWvgdFCkPtMucJTM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index c98fb6dddcf8..f1cc51ec0aab 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { description = "2d physics library"; homepage = "https://www.pymunk.org"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index f7555d48ebb6..24c214fcba34 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.19.2"; + version = "1.19.6"; src = fetchPypi { pname = "PyMuPDF"; inherit version; - sha256 = "964bbacddab9cba6cd2c8f388429fe4a97c0775b3096a13ac15724f5a1a2c58d"; + sha256 = "sha256-7z0T4n8Vhdd29qJZfxE6q9KNNrZIuYOnKFCyHFOZqwg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index 9506e1504836..d071743d748d 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pymysensors"; - version = "0.22.1"; + version = "0.23.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "theolind"; repo = pname; rev = version; - sha256 = "sha256-n4khOQspJBeq0w+epdXYZh6I1lI1drB1JewZ6GfzVHs="; + sha256 = "0a09w1bzz2pn0w11f7kx8052914kdpgfb7w6hc9s50x8wl9q604h"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 91a197e7cf66..f34956d7280f 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , pytestCheckHook @@ -6,19 +7,19 @@ , libsodium , cffi , hypothesis -, stdenv -, six }: buildPythonPackage rec { pname = "pynacl"; - version = "1.4.0"; + version = "1.5.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "PyNaCl"; - sha256 = "01b56hxrbif3hx8l6rwz5kljrgvlbj7shmmd2rjh0hn7974a5sal"; + sha256 = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba"; }; buildInputs = [ @@ -31,7 +32,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi - six ]; checkInputs = [ @@ -41,11 +41,14 @@ buildPythonPackage rec { SODIUM_INSTALL = "system"; - pythonImportsCheck = [ "nacl" ]; + pythonImportsCheck = [ + "nacl" + ]; meta = with lib; { description = "Python binding to the Networking and Cryptography (NaCl) library"; homepage = "https://github.com/pyca/pynacl/"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 46bc5d49cae1..d3b39457438c 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "5.2.0"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "6c9bec5946949d07c76230187cdb9126e8247c94499bbc8e79ded11d17060a60"; + sha256 = "sha256-x6nFV7UjZLwJJX7dADeO68dSWLvaoP4FD8ziNWFJ+Qo="; }; propagatedBuildInputs = [ python-dateutil botocore ]; diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index 54fb270a1765..14c74cc8669c 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "6.5.0"; + version = "6.6.1"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "v${version}"; - sha256 = "1fk64bi7aswsmfqsciamml2wydgfg464h6i7479xfim4mwmkkik4"; + sha256 = "sha256-8oqbnCAMq29QIp9ETbMa3Ve8tTuJzQ0D8KlOYnLdUgQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix new file mode 100644 index 000000000000..e1d87cdcae33 --- /dev/null +++ b/pkgs/development/python-modules/pynetgear/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pynetgear"; + version = "0.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "MatMaul"; + repo = pname; + rev = version; + sha256 = "sha256-sLGr8I0LcLPrmQZ6dI+hwRAiNCrnLtr2WU04rPoG4x4="; + }; + + propagatedBuildInputs = [ + requests + ]; + + pythonImportsCheck = [ + "pynetgear" + ]; + + # Tests don't pass + # https://github.com/MatMaul/pynetgear/issues/109 + doCheck = false; + + meta = with lib; { + description = "Module for interacting with Netgear wireless routers"; + homepage = "https://github.com/MatMaul/pynetgear"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pynina/default.nix b/pkgs/development/python-modules/pynina/default.nix index b9e026886c86..8227e01edc24 100644 --- a/pkgs/development/python-modules/pynina/default.nix +++ b/pkgs/development/python-modules/pynina/default.nix @@ -1,22 +1,21 @@ { lib , aiohttp , buildPythonPackage -, fetchFromGitLab +, fetchPypi , pythonOlder }: buildPythonPackage rec { pname = "pynina"; - version = "unstable-2021-11-11"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchFromGitLab { - owner = "DeerMaximum"; - repo = pname; - rev = "0ac42b28d48af7bcd9c83f5d425b5b23c4c19f02"; - sha256 = "FSrFCs/4tfYcSPz9cgR+LFsRbWIHE1X+ZUl8BWSEaWQ="; + src = fetchPypi { + pname = "PyNINA"; + inherit version; + sha256 = "sha256-7sceYmzOmXJMKaIdGmXMuCAum0aJeVTxx1w/jZy5Eig="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index 4173987a7f6a..f15cfef63c6e 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -7,16 +7,19 @@ , scikit-learn , scipy , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.5"; + version = "0.5.6"; format = "setuptools"; + disabled = pythonOlder "3.6"; + src = fetchPypi { inherit pname version; - sha256 = "7a7df8412b19cfb3596060faf5a8c5d0bf5b3bd504f8efd900fc4e3918c6f882"; + hash = "sha256-YfsxiFuqxGnWeTPix8k1tu3rsG7kmOLw+d/JfFnTclw="; }; propagatedBuildInputs = [ @@ -31,6 +34,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "pynndescent" + ]; + meta = with lib; { description = "Nearest Neighbor Descent"; homepage = "https://github.com/lmcinnes/pynndescent"; diff --git a/pkgs/development/python-modules/pynuki/default.nix b/pkgs/development/python-modules/pynuki/default.nix index 9c3dc394cc04..58c7f1df15b7 100644 --- a/pkgs/development/python-modules/pynuki/default.nix +++ b/pkgs/development/python-modules/pynuki/default.nix @@ -3,27 +3,40 @@ , fetchFromGitHub , poetry-core , requests +, pythonOlder }: buildPythonPackage rec { pname = "pynuki"; - version = "1.4.1"; + version = "1.5.2"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "pschmitt"; repo = pname; rev = version; - sha256 = "1nymlrf0j430851plp355697p55asfxjmavdh2zr96b16d41dnn4"; + sha256 = "sha256-Uqw1Xa0pBQmQsFEBv/l1gtsPy+owYcTZITOYUmMvT5Y="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'requests = ">=2.27,<3"' 'requests = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "pynuki" ]; + + pythonImportsCheck = [ + "pynuki" + ]; meta = with lib; { description = "Python bindings for nuki.io bridges"; diff --git a/pkgs/development/python-modules/pyobihai/default.nix b/pkgs/development/python-modules/pyobihai/default.nix index 79d8363372be..0cc62311f329 100644 --- a/pkgs/development/python-modules/pyobihai/default.nix +++ b/pkgs/development/python-modules/pyobihai/default.nix @@ -7,13 +7,15 @@ buildPythonPackage rec { pname = "pyobihai"; - version = "1.3.1"; - disabled = pythonOlder "3.6"; + version = "1.3.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; # GitHub release, https://github.com/dshokouhi/pyobihai/issues/10 src = fetchPypi { inherit pname version; - sha256 = "1vvf5if57dfd091a7fb5rvx63hvf0isrx28j72nj2aav1as460qp"; + hash = "sha256-zhsnJyhXlugK0nJ7FJZZcrq2VDQt1a9uCgsJAIABZ28="; }; propagatedBuildInputs = [ @@ -23,7 +25,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pyobihai" ]; + pythonImportsCheck = [ + "pyobihai" + ]; meta = with lib; { description = "Python package to interact with Obihai devices"; diff --git a/pkgs/development/python-modules/pyoctoprintapi/default.nix b/pkgs/development/python-modules/pyoctoprintapi/default.nix index 323d2c092f8d..a61f38ebc8c2 100644 --- a/pkgs/development/python-modules/pyoctoprintapi/default.nix +++ b/pkgs/development/python-modules/pyoctoprintapi/default.nix @@ -12,7 +12,7 @@ let pname = "pyoctoprintapi"; - version = "0.1.7"; + version = "0.1.8"; in buildPythonPackage { inherit pname version; @@ -22,7 +22,7 @@ buildPythonPackage { owner = "rfleming71"; repo = pname; rev = "v${version}"; - hash = "sha256-XAMHQ7n03e10hFcPIUqyCDlRk2uO8dX8Iq0mdY7wRGE="; + hash = "sha256-TeMgEwKVZd0gq8J0kYsg0/v6A2BVTOE0/VmyiyrjV5c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index d657efd707f8..934d5fb81143 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -2,18 +2,19 @@ , stdenv , fetchPypi , buildPythonPackage -, Mako -, pytest -, numpy -, cffi -, pytools -, decorator , appdirs -, six -, opencl-headers -, ocl-icd -, pybind11 +, cffi +, decorator +, Mako , mesa_drivers +, numpy +, ocl-icd +, opencl-headers +, platformdirs +, pybind11 +, pytest +, pytools +, six }: let @@ -21,16 +22,25 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2021.2.10"; + version = "2022.1"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; - propagatedBuildInputs = [ numpy cffi pytools decorator appdirs six Mako ]; + propagatedBuildInputs = [ + appdirs + cffi + decorator + Mako + numpy + platformdirs + pytools + six + ]; src = fetchPypi { inherit pname version; - sha256 = "75a1f202741bace9606a8680bbbfac69bf8a73d4e7511fb1a6ce3e48185996ae"; + sha256 = "sha256-JMbZoKH/dgnz1zZevYd4YWpUM8QmVmwsjjX/qwDvIsQ="; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 688731033a98..e4655082af92 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -6,17 +6,50 @@ , cryptography , pyasn1 , idna -, pytest +, pytestCheckHook , pretend , flaky , glibcLocales , six }: -let - # https://github.com/pyca/pyopenssl/issues/791 - # These tests, we disable in the case that libressl is passed in as openssl. - failingLibresslTests = [ +buildPythonPackage rec { + pname = "pyopenssl"; + version = "22.0.0"; + + src = fetchPypi { + pname = "pyOpenSSL"; + inherit version; + sha256 = "sha256-ZgsbFCWqxKG+odlBaKhdmfCzFEyGndQ5DSdinQCH8b8="; + }; + + outputs = [ "out" "dev" ]; + + # Seems to fail unpredictably on Darwin. See https://hydra.nixos.org/build/49877419/nixlog/1 + # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. + doCheck = !stdenv.isDarwin; + + nativeBuildInputs = [ openssl ]; + propagatedBuildInputs = [ cryptography pyasn1 idna six ]; + + checkInputs = [ pytestCheckHook pretend flaky glibcLocales ]; + + preCheck = '' + export LANG="en_US.UTF-8" + ''; + + disabledTests = [ + # https://github.com/pyca/pyopenssl/issues/692 + # These tests, we disable always. + "test_set_default_verify_paths" + "test_fallback_default_verify_paths" + # https://github.com/pyca/pyopenssl/issues/768 + "test_wantWriteError" + # https://github.com/pyca/pyopenssl/issues/1043 + "test_alpn_call_failure" + ] ++ lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) [ + # https://github.com/pyca/pyopenssl/issues/791 + # These tests, we disable in the case that libressl is passed in as openssl. "test_op_no_compression" "test_npn_advertise_error" "test_npn_select_error" @@ -29,64 +62,21 @@ let "test_verify_with_revoked" "test_set_notAfter" "test_set_notBefore" - ]; - - # these tests are extremely tightly wed to the exact output of the openssl cli tool, - # including exact punctuation. - failingOpenSSL_1_1Tests = [ + ] ++ lib.optionals (lib.versionAtLeast (lib.getVersion openssl.name) "1.1") [ + # these tests are extremely tightly wed to the exact output of the openssl cli tool, including exact punctuation. "test_dump_certificate" "test_dump_privatekey_text" "test_dump_certificate_request" "test_export_text" + ] ++ lib.optionals stdenv.is32bit [ + # https://github.com/pyca/pyopenssl/issues/974 + "test_verify_with_time" ]; - disabledTests = [ - # https://github.com/pyca/pyopenssl/issues/692 - # These tests, we disable always. - "test_set_default_verify_paths" - "test_fallback_default_verify_paths" - # https://github.com/pyca/pyopenssl/issues/768 - "test_wantWriteError" - ] ++ ( - lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) failingLibresslTests - ) ++ ( - lib.optionals (lib.versionAtLeast (lib.getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests - ) ++ ( - # https://github.com/pyca/pyopenssl/issues/974 - lib.optionals stdenv.is32bit [ "test_verify_with_time" ] - ); - - # Compose the final string expression, including the "-k" and the single quotes. - testExpression = lib.optionalString (disabledTests != []) - "-k 'not ${lib.concatStringsSep " and not " disabledTests}'"; - -in - -buildPythonPackage rec { - pname = "pyopenssl"; - version = "20.0.1"; - - src = fetchPypi { - pname = "pyOpenSSL"; - inherit version; - sha256 = "4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51"; + meta = with lib; { + description = "Python wrapper around the OpenSSL library"; + homepage = "https://github.com/pyca/pyopenssl"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; }; - - outputs = [ "out" "dev" ]; - - checkPhase = '' - runHook preCheck - export LANG="en_US.UTF-8" - py.test tests ${testExpression} - runHook postCheck - ''; - - # Seems to fail unpredictably on Darwin. See https://hydra.nixos.org/build/49877419/nixlog/1 - # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. - doCheck = !stdenv.isDarwin; - - nativeBuildInputs = [ openssl ]; - propagatedBuildInputs = [ cryptography pyasn1 idna six ]; - - checkInputs = [ pytest pretend flaky glibcLocales ]; } diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix new file mode 100644 index 000000000000..0c3aeada8e80 --- /dev/null +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -0,0 +1,58 @@ +{ lib +, aiohttp +, attrs +, backoff +, boto3 +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pyhumps +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, warrant-lite +}: + +buildPythonPackage rec { + pname = "pyoverkiz"; + version = "1.3.12"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "iMicknl"; + repo = "python-overkiz-api"; + rev = "v${version}"; + hash = "sha256-guL//OHiwlKN55kyoRPIUXuoHOVrho+vSgeV3SAdfNM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + attrs + aiohttp + backoff + pyhumps + boto3 + warrant-lite + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyoverkiz" + ]; + + meta = with lib; { + description = "Module to interact with the Somfy TaHoma API or other OverKiz APIs"; + homepage = "https://github.com/iMicknl/python-overkiz-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 3cfb70e7b875..b5b8a100ba2f 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -10,14 +10,16 @@ buildPythonPackage rec { pname = "pyowm"; - version = "3.2.0"; + version = "3.3.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "csparpa"; repo = pname; rev = version; - sha256 = "0sq8rxcgdiayl5gy4qhkvvsdq1d93sbzn0nfg8f1vr8qxh8qkfq4"; + sha256 = "sha256-cSOhm3aDksLBChZzgw1gjUjLQkElR2/xGFMOb9K9RME="; }; propagatedBuildInputs = [ @@ -26,12 +28,18 @@ buildPythonPackage rec { requests ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; # Run only tests which don't require network access - pytestFlagsArray = [ "tests/unit" ]; + pytestFlagsArray = [ + "tests/unit" + ]; - pythonImportsCheck = [ "pyowm" ]; + pythonImportsCheck = [ + "pyowm" + ]; meta = with lib; { description = "Python wrapper around the OpenWeatherMap web API"; diff --git a/pkgs/development/python-modules/pyownet/default.nix b/pkgs/development/python-modules/pyownet/default.nix new file mode 100644 index 000000000000..2bdc18e1e244 --- /dev/null +++ b/pkgs/development/python-modules/pyownet/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pyownet"; + version = "0.10.0.post1"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "4f2fa4471c2f806b35090bdc6c092305c6eded3ff3736f8b586d35bdb157de62"; + }; + + # tests access network + doCheck = false; + + pythonImportsCheck = [ "pyownet.protocol" ]; + + meta = with lib; { + description = "Python OWFS client library (owserver protocol)"; + homepage = "https://github.com/miccoli/pyownet"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index cd7a322a2aef..32bada43c154 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pypandoc"; - version = "1.7.2"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "1wk8jxnysb7sa55zhxx5brylv00ivamqbk1b4lbzi58ziij08p03"; + sha256 = "sha256-KN4j9kbZ6ARAPGth180yptdso1arx563IXvb/2dI+G4="; }; patches = [ diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 5ecfdfb88839..27047cf6eabc 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -2,34 +2,47 @@ , fetchFromGitHub , lib -# pythonPackages -, coverage +# since this is a dependency of pytest, we need to avoid +# circular dependencies +, jinja2 +, railroad-diagrams }: -buildPythonPackage rec { - pname = "pyparsing"; - version = "2.4.7"; +let + pyparsing = buildPythonPackage rec { + pname = "pyparsing"; + version = "3.0.6"; - src = fetchFromGitHub { - owner = "pyparsing"; - repo = pname; - rev = "pyparsing_${version}"; - sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h"; - }; + src = fetchFromGitHub { + owner = "pyparsing"; + repo = pname; + rev = "pyparsing_${version}"; + sha256 = "0n89ky7rx5yg09ssji8liahnyxip08hz7syc2k4pmlgs4978181a"; + }; - # https://github.com/pyparsing/pyparsing/blob/847af590154743bae61a32c3dc1a6c2a19009f42/tox.ini#L6 - checkInputs = [ coverage ]; - checkPhase = '' - coverage run --branch simple_unit_tests.py - coverage run --branch unitTests.py - ''; - - meta = with lib; { - homepage = "https://github.com/pyparsing/pyparsing"; - description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; - license = licenses.mit; - maintainers = with maintainers; [ - kamadorueda + # circular dependencies if enabled by default + doCheck = false; + checkInputs = [ + jinja2 + railroad-diagrams ]; + + checkPhase = '' + python -m unittest + ''; + + passthru.tests = { + check = pyparsing.overridePythonAttrs (_: { doCheck = true; }); + }; + + meta = with lib; { + homepage = "https://github.com/pyparsing/pyparsing"; + description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; + license = licenses.mit; + maintainers = with maintainers; [ + kamadorueda + ]; + }; }; -} +in + pyparsing diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index ee34f91b57e2..1c054defbef3 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyparted"; - version = "3.11.7"; + version = "3.12.0"; disabled = isPyPy; src = fetchFromGitHub { repo = pname; owner = "dcantrell"; rev = "v${version}"; - sha256 = "01193fmkss9icjvqpw85szpk8ld1pnha7p9kqm7mpwk6rc6gi2m3"; + sha256 = "sha256-LfBLR0A/wnfBtXISAAY6Nl4vnk1rtY03F+PT8UIMrEs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 797657a28c5c..724be70163ab 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -1,23 +1,25 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pytest-asyncio , pytest-timeout , pytestCheckHook , pythonOlder -, stdenv }: buildPythonPackage rec { pname = "pypck"; - version = "0.7.11"; + version = "0.7.14"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "alengwenus"; repo = pname; rev = version; - sha256 = "1jj0y487qcxrprx4x2rs6r7rqsf5m9khk0xhigbvnbyvh8rsd2jr"; + sha256 = "sha256-v8eCCbSnAmJUmHSNS+lz8JRhDFrqyxgAkgcZ2bzfOTg="; }; checkInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "pypck" ]; + pythonImportsCheck = [ + "pypck" + ]; meta = with lib; { description = "LCN-PCK library written in Python"; diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index 74581ba7e33c..7bb46b115e00 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -1,18 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, flit , pytestCheckHook }: buildPythonPackage rec { pname = "pyphen"; - version = "0.11.0"; + version = "0.12.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "e2c3ed82c3a04317df5102addafe89652b0876bc6c6265f5dd4c3efaf02315e8"; + sha256 = "b7d3dfc24b6f2178cdb2b1757ace0bd5d222de3e62c28d22ac578c5f22a13e9b"; }; + nativeBuildInputs = [ + flit + ]; + preCheck = '' sed -i '/addopts/d' pyproject.toml ''; diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index 4cac927341de..210e6129199b 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.44.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "mozillazg"; repo = "python-pinyin"; rev = "v${version}"; - sha256 = "sha256-LYiiZvpM/V3QRyTUXGWGnSnR0AnqWfTW0xJB4Vnw7lI="; + sha256 = "sha256-KPyFvO6TR0mg09xcraHFaWklJgzF5oqk3d8H+G4gh3I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix new file mode 100644 index 000000000000..7c278d6e1be9 --- /dev/null +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, precice, numpy, mpi4py, cython }: + +buildPythonPackage rec { + pname = "pyprecice"; + version = "2.3.0.1"; + + src = fetchFromGitHub { + owner = "precice"; + repo = "python-bindings"; + rev = "v${version}"; + sha256 = "1yz96pif63ms797bzxbfrjba4mgz7cz5dqrqghn5sg0g1b9qxnn5"; + }; + + nativeBuildInputs = [ cython ]; + propagatedBuildInputs = [ numpy mpi4py precice ]; + + doCheck = false; # Disable Test because everything depends on open mpi which requires network. + # Do not use pythonImportsCheck because this will also initialize mpi which requires a network interface + + meta = with lib; { + description = "Python language bindings for preCICE"; + homepage = "https://github.com/precice/python-bindings"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ Scriptkiddi ]; + }; +} diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index 77ca912db6c9..9b19c4c8a261 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pypugjs"; - version = "5.9.9"; + version = "5.9.10"; src = fetchPypi { inherit pname version; - sha256 = "0s0a239940z6rsssa13yz6pfkjk4300j35hs7qysyz45f3ixq19j"; + sha256 = "082dae87d44e184030b66da9ea9bd1a0209f86c089d8f2bd61064b97a7511a28"; }; propagatedBuildInputs = [ six chardet ]; diff --git a/pkgs/development/python-modules/pypytools/default.nix b/pkgs/development/python-modules/pypytools/default.nix new file mode 100644 index 000000000000..e88891172deb --- /dev/null +++ b/pkgs/development/python-modules/pypytools/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, freezegun +, numpy +, py +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pypytools"; + version = "0.6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-oUDAU+TRwLroNfQGYusAQKdRkHcazysqiDLfp77v5Sk="; + }; + + propagatedBuildInputs = [ + py + ]; + + checkInputs = [ + freezegun + numpy + pytestCheckHook + ]; + + patches = [ + # Support for later Python releases, https://github.com/antocuni/pypytools/pull/2 + (fetchpatch { + name = "support-later-python.patch"; + url = "https://github.com/antocuni/pypytools/commit/c6aed496ec35a6ef7ce9e95084849eebc16bafef.patch"; + sha256 = "sha256-YoYRZmgueQmxRtGaeP4zEVxuA0U7TB0PmoYHHVI7ICQ="; + }) + ]; + + pythonImportsCheck = [ + "pypytools" + ]; + + meta = with lib; { + description = "Collection of tools to use PyPy-specific features"; + homepage = "https://github.com/antocuni/pypytools"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 3b98b5738825..c604e61a2c37 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -7,29 +7,17 @@ , lndir , dbus-python , sip +, pyqt5_sip , pyqt-builder , libsForQt5 , withConnectivity ? false , withMultimedia ? false , withWebKit ? false , withWebSockets ? false +, withLocation ? false }: -let - pyqt5_sip = buildPythonPackage rec { - pname = "PyQt5_sip"; - version = "12.9.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0cmfxb7igahxy74qkq199l6zdxrr75bnxris42fww3ibgjflir6k"; - }; - - # There is no test code and the check phase fails with: - # > error: could not create 'PyQt5/sip.cpython-38-x86_64-linux-gnu.so': No such file or directory - doCheck = false; - }; -in buildPythonPackage rec { +buildPythonPackage rec { pname = "PyQt5"; version = "5.15.4"; format = "pyproject"; @@ -59,6 +47,7 @@ in buildPythonPackage rec { ++ lib.optional withMultimedia qtmultimedia ++ lib.optional withWebKit qtwebkit ++ lib.optional withWebSockets qtwebsockets + ++ lib.optional withLocation qtlocation ; buildInputs = with libsForQt5; [ @@ -71,6 +60,7 @@ in buildPythonPackage rec { ++ lib.optional withConnectivity qtconnectivity ++ lib.optional withWebKit qtwebkit ++ lib.optional withWebSockets qtwebsockets + ++ lib.optional withLocation qtlocation ; propagatedBuildInputs = [ @@ -85,7 +75,7 @@ in buildPythonPackage rec { ]; passthru = { - inherit sip; + inherit sip pyqt5_sip; multimediaEnabled = withMultimedia; webKitEnabled = withWebKit; WebSocketsEnabled = withWebSockets; @@ -107,6 +97,7 @@ in buildPythonPackage rec { ++ lib.optional withWebKit "PyQt5.QtWebKit" ++ lib.optional withMultimedia "PyQt5.QtMultimedia" ++ lib.optional withConnectivity "PyQt5.QtConnectivity" + ++ lib.optional withLocation "PyQt5.QtPositioning" ; meta = with lib; { diff --git a/pkgs/development/python-modules/pyqt/sip.nix b/pkgs/development/python-modules/pyqt/sip.nix new file mode 100644 index 000000000000..aa29d9ad9d34 --- /dev/null +++ b/pkgs/development/python-modules/pyqt/sip.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pyqt5-sip"; + version = "12.9.1"; + + src = fetchPypi { + pname = "PyQt5_sip"; + inherit version; + sha256 = "LyTymbRMURwjeWqvu7WBv96/eNCQVle3zuIUG0mCAw4="; + }; + + # There is no test code and the check phase fails with: + # > error: could not create 'PyQt5/sip.cpython-38-x86_64-linux-gnu.so': No such file or directory + doCheck = false; + pythonImportsCheck = ["PyQt5.sip"]; + + meta = with lib; { + description = "Python bindings for Qt5"; + homepage = "https://www.riverbankcomputing.com/software/sip/"; + license = licenses.gpl3Only; + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ sander ]; + }; +} diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index f984bcc2dea6..c1aa5d56040b 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -1,10 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , importlib-metadata , ipython -, lark-parser +, lark , networkx , numpy , poetry-core @@ -23,7 +22,7 @@ buildPythonPackage rec { pname = "pyquil"; - version = "3.0.1"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,23 +31,15 @@ buildPythonPackage rec { owner = "rigetti"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OU7/LjcpCxvqlcfdlm5ll4f0DYXf0yxNprM8Muu2wyg="; + sha256 = "sha256-ejfzxCf2NucK/hfzswHu3h4DPPZQY8vkMAQ51XDRWKU="; }; - patches = [ - (fetchpatch { - name = "pyquil-pr-1404-unpin-qcs-api-client-version-pyproject.patch"; - url = "https://github.com/rigetti/pyquil/commit/2e35a4fdf65262fdf39c5091aeddfa3f3564925a.patch"; - sha256 = "sha256-KGDNU2wpzsuifQSbbkoMwaFXspHW6zyIJ5GRZbw+lUY="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ - lark-parser + lark networkx numpy qcs-api-client @@ -71,7 +62,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'lark = "^0.11.1"' 'lark-parser = ">=0.11.1"' + --replace 'lark = "^0.11.1"' 'lark = "*"' ''; disabledTestPaths = [ @@ -92,9 +83,14 @@ buildPythonPackage rec { disabledTests = [ "test_compile_with_quilt_calibrations" "test_sets_timeout_on_requests" + # sensitive to lark parser output + "test_memory_commands" + "test_classical" ]; - pythonImportsCheck = [ "pyquil" ]; + pythonImportsCheck = [ + "pyquil" + ]; meta = with lib; { description = "Python library for creating Quantum Instruction Language (Quil) programs"; diff --git a/pkgs/development/python-modules/pyqvrpro/default.nix b/pkgs/development/python-modules/pyqvrpro/default.nix new file mode 100644 index 000000000000..0e12b339c07c --- /dev/null +++ b/pkgs/development/python-modules/pyqvrpro/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-vcr +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, untangle +}: + +buildPythonPackage rec { + pname = "pyqvrpro"; + version = "0.52"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "oblogic7"; + repo = pname; + rev = "v${version}"; + hash = "sha256-lOd2AqnrkexNqT/usmJts5NW7vJtV8CRsliYgkhgRaU="; + }; + + propagatedBuildInputs = [ + pyyaml + requests + untangle + ]; + + checkInputs = [ + pytest-vcr + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyqvrpro" + ]; + + meta = with lib; { + description = "Module for interfacing with QVR Pro API"; + homepage = "https://github.com/oblogic7/pyqvrpro"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/pkgs/development/python-modules/pyramid_exclog/default.nix index 96570fce884f..2d23256ff844 100644 --- a/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/pkgs/development/python-modules/pyramid_exclog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyramid_exclog"; - version = "1.0"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "d05ced5c12407507154de6750036bc83861b85c11be70b3ec3098c929652c14b"; + sha256 = "sha256-Tl2rYH/GifNfB9w4nG9UIqAQz0O6kujCED/4iZnPKDw="; }; propagatedBuildInputs = [ pyramid ]; diff --git a/pkgs/development/python-modules/pyrect/default.nix b/pkgs/development/python-modules/pyrect/default.nix index e8041786b07b..54566658443c 100644 --- a/pkgs/development/python-modules/pyrect/default.nix +++ b/pkgs/development/python-modules/pyrect/default.nix @@ -7,11 +7,11 @@ }: buildPythonPackage rec { pname = "PyRect"; - version = "0.1.4"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Oy+nNTzjKhGqawoVSVlo0qdjQjyJR64ki5LAN9704gI="; + sha256 = "sha256-9lFV9t+bkptnyv+9V8CUfFrlRJ07WA0XgHS/+0egm3g="; }; checkInputs = [ tox pytestCheckHook pygame ]; diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix index 6b63ac8f9fe2..30dd52e3eeaf 100644 --- a/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyrfxtrx"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyRFXtrx"; rev = version; - sha256 = "0nzgy56b2v3bnn9idlb67qkzj4cj5j9v1436ri1y305fqwjy48nm"; + hash = "sha256-Ty+yIA8amKyV3z++7n1m/YRH0gEoVIVTdX8xiZYp/eM="; }; propagatedBuildInputs = [ @@ -24,6 +24,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTestPaths = [ + # https://github.com/Danielhiversen/pyRFXtrx/issues/130 + "tests/test_rollertrol.py" + ]; + meta = with lib; { description = "Library to communicate with the RFXtrx family of devices"; homepage = "https://github.com/Danielhiversen/pyRFXtrx"; diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index c345c988d257..971b8015a417 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "1.3.6"; + version = "1.4.12"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "Pyrogram"; inherit version; - hash = "sha256-Q3JGTNSfqEMUqEru0crcbE8Ut/n+9MjFIDRKRSZ7tlE="; + hash = "sha256-rNGdWnZuhCU0Kg/CkeNjazKb76h8/VanZdF4yi0KWGU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix index fe92d88beaec..7a13dc79aa99 100644 --- a/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.5"; + version = "0.6.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.core"; inherit version; - sha256 = "sha256-Jm10Dq5A+mTdBFQfAH0022ls7PMVTLpb4w+nWmfUOFI="; + hash = "sha256-lH0Mi2nR4jqawvpvVfn79U0AflxE8lU1VLKvqAEXDOo="; }; # pyroute2 sub-modules have no tests diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix index 6f2695507863..dae025618b7a 100644 --- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.5"; + version = "0.6.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - sha256 = "sha256-yvgBS2dlIRNcR2DXLPWu72q7x/onUhD36VMzBzzHcVo="; + hash = "sha256-6o75plLeSle6ZFgoIZGKLCjx1hg4Z2okOq2RqAT2g8E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix index 7411f49cb52a..22991fe20268 100644 --- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.5"; + version = "0.6.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - sha256 = "sha256-8gKP0QE9iviIFQ0DPuz3U3ZXpL434MzOqYAICZYetXc="; + hash = "sha256-sJ9Zzlrh9FWVWL7StyHpPPuXo6TtNLz2/lQBCl53Wrk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix index 5ab21f8f22c7..7bf625c08864 100644 --- a/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.5"; + version = "0.6.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - sha256 = "sha256-rlJ8D5mXSCMKH2iNmit8JXst9tdDafROylMNAHeTt50="; + hash = "sha256-icEMJno03WKUdIYTZ6BIAo9lm43RwMjxNXcoSkYF81M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix index 7caa902dfa7d..47c309cbc321 100644 --- a/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.5"; + version = "0.6.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - sha256 = "sha256-pNMJWE6e9seEKvT4MrSPxTRKsiXnDjhLrtG3/iuU2fg="; + hash = "sha256-ASk6ycw3dQNMV4xmaxPAHDL1KtrY1JGQ5yJYcJ+OgUE="; }; propagatedBuildInputs = [ @@ -21,7 +25,9 @@ buildPythonPackage rec { # pyroute2 sub-modules have no tests doCheck = false; - pythonImportsCheck = [ "pr2modules.ndb" ]; + pythonImportsCheck = [ + "pr2modules.ndb" + ]; meta = with lib; { description = "NDB module for pyroute2"; diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix index ec5ada77dd2e..3c76692016d9 100644 --- a/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.5"; + version = "0.6.9"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "sha256-sUVaY6PvwFDRCNVQ0cr9AR7d7W6JTZnnvfoC1ZK/bxY="; + sha256 = "sha256-8BLz8IIobmrGb64PhXz1XWfl3KJTOhOL+j1C4/jlXuI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix index 722ea0a12f9c..387a9b403df5 100644 --- a/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.5"; + version = "0.6.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - sha256 = "sha256-KS5sKDKnNUTBxtW6cn9xF6qEflX4jXjpS31GB7KZmZ4="; + hash = "sha256-WZjRexKn1FWXj+5KZxqZXB0aZmnd0ECKWt3hvVDdz4w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix index ec3226f0cd98..99c146d41e4d 100644 --- a/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , pyroute2-core +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.5"; + version = "0.6.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - sha256 = "sha256-lj9Q8ew+44m+Y72miQyuZhzjHmdLqYB+c2FK+ph1d84="; + hash = "sha256-7vP4rbid2cVGKlYUM5qsmYXQhUfvIWoaDXYnxSUnSJY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 9afea342e6d7..9b15711ef0f2 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, importlib-metadata , mitogen , pyroute2-core , pyroute2-ethtool @@ -9,15 +10,19 @@ , pyroute2-ndb , pyroute2-nftables , pyroute2-nslink +, pythonOlder }: buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.5"; + version = "0.6.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0JlciuuWwOTu1NYul8nXlQAKGjO3R9bcVDJmZYV88Rw="; + hash = "sha256-PRxNGnH7VpyrV49V9xNO8C1I6LMYK05+ZrKndWKO2vs="; }; propagatedBuildInputs = [ @@ -29,18 +34,22 @@ buildPythonPackage rec { pyroute2-ndb pyroute2-nftables pyroute2-nslink + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; # Requires root privileges, https://github.com/svinota/pyroute2/issues/778 doCheck = false; - pythonImportsCheck = [ "pyroute2" ]; + pythonImportsCheck = [ + "pyroute2" + ]; meta = with lib; { description = "Python Netlink library"; homepage = "https://github.com/svinota/pyroute2"; license = licenses.asl20; - maintainers = with maintainers; [ mic92 ]; + maintainers = with maintainers; [ fab mic92 ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index bc21b0a309d1..1c6d9b45c568 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pysaml2"; - version = "7.1.0"; + version = "7.1.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "IdentityPython"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3Yl6j6KAlw7QQYnwU7+naY6D97IqX766zguekKAuic8="; + sha256 = "sha256-nyQcQ1OO9PuuQROg+km2vIRF1sZ22MZhiHpmVXWl+is="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysatochip/default.nix b/pkgs/development/python-modules/pysatochip/default.nix index 81c0d8bda204..8c1401c2a7cc 100644 --- a/pkgs/development/python-modules/pysatochip/default.nix +++ b/pkgs/development/python-modules/pysatochip/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "pysatochip"; - version = "0.14.1"; + version = "0.14.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "eba800c82ea45e2524c0773a71c36e525d7c18148e6066e336950cef484555f5"; + sha256 = "sha256-+Z3D6ITZouhLbEotvJ9MDfg6QOhjGVKrLi1QL1kOdkE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 10515ed7a6e9..1f1d97f19fa5 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "PySDL2"; - version = "0.9.9"; + version = "0.9.11"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff # like "screensaver disabling", which would have to be cleverly @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "45879ae588038d7cf7cb0289ae47af60722b394d0efa527bf4327103dc4dc918"; + sha256 = "93e51057d39fd583b80001d42b21d5a3f71e30d489d85924d944b2c7350e2da6"; }; # Deliberately not in propagated build inputs; users can decide diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 3cb56247b553..fab58a72251f 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -2,12 +2,12 @@ , setuptools }: buildPythonPackage rec { - version = "2.1.3"; + version = "2.2.0"; pname = "pyshp"; src = fetchPypi { inherit pname version; - sha256 = "e32b4a6832a3b97986df442df63b4c4a7dcc846b326c903189530a5cc6df0260"; + sha256 = "sha256-Dtogm9YvM0VwHE9nmbY4wRTOtn/uKClc3bThyvBT6UQ="; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pysiaalarm/default.nix b/pkgs/development/python-modules/pysiaalarm/default.nix index 2345529b1185..c06e1ed32ac8 100644 --- a/pkgs/development/python-modules/pysiaalarm/default.nix +++ b/pkgs/development/python-modules/pysiaalarm/default.nix @@ -4,7 +4,7 @@ , fetchPypi , dataclasses-json , pycryptodome -, setuptools +, setuptools-scm , pytest-asyncio , pytest-cases , pytestCheckHook @@ -28,10 +28,13 @@ buildPythonPackage rec { --replace "--cov pysiaalarm --cov-report term-missing" "" ''; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ dataclasses-json pycryptodome - setuptools ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix new file mode 100644 index 000000000000..2fc5c6a6ccda --- /dev/null +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pysigma-pipeline-sysmon +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-backend-splunk"; + version = "0.2.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-backend-splunk"; + rev = "v${version}"; + hash = "sha256-NAhAWK1eSSGQAlMGgMHrW/RTpT9LJMqwkhE9/8xWGT8="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pysigma-pipeline-sysmon + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.backends.splunk" + ]; + + meta = with lib; { + description = "Library to support Splunk for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-backend-splunk"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix new file mode 100644 index 000000000000..2d2aadb9eaec --- /dev/null +++ b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-pipeline-crowdstrike"; + version = "0.1.4"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-pipeline-crowdstrike"; + rev = "v${version}"; + hash = "sha256-Riu2u1IouS1BMtXauXrNMIl06TU11pHdC0jjlOiR71s="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.pipelines.crowdstrike" + ]; + + meta = with lib; { + description = "Library to support CrowdStrike pipeline for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-pipeline-crowdstrike"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix new file mode 100644 index 000000000000..7c1e959d7406 --- /dev/null +++ b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pysigma +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysigma-pipeline-sysmon"; + version = "0.1.3"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma-pipeline-sysmon"; + rev = "v${version}"; + hash = "sha256-uJgV7emBqQN792EvfOz85BKoZY8DCCr8aUN7Ai8R9js="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pysigma + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigma.pipelines.sysmon" + ]; + + meta = with lib; { + description = "Library to support Sysmon pipeline for pySigma"; + homepage = "https://github.com/SigmaHQ/pySigma-pipeline-sysmon"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix new file mode 100644 index 000000000000..cd3e9ed88595 --- /dev/null +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, pyparsing +, pytestCheckHook +, pythonOlder +, pyyaml +}: + +buildPythonPackage rec { + pname = "pysigma"; + version = "0.4.3"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "SigmaHQ"; + repo = "pySigma"; + rev = "v${version}"; + hash = "sha256-NE6XmylUc3MeDRMOJo51jtb6J0Vi9tDT6tbYBepDsvw="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pyparsing + pyyaml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pyparsing = "^3.0.7"' 'pyparsing = "*"' \ + ''; + + pythonImportsCheck = [ + "sigma" + ]; + + meta = with lib; { + description = "Library to parse and convert Sigma rules into queries"; + homepage = "https://github.com/SigmaHQ/pySigma"; + license = with licenses; [ lgpl21Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pysignalclirestapi/default.nix b/pkgs/development/python-modules/pysignalclirestapi/default.nix new file mode 100644 index 000000000000..023b6dde3eb8 --- /dev/null +++ b/pkgs/development/python-modules/pysignalclirestapi/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, future +}: + +buildPythonPackage rec { + pname = "pysignalclirestapi"; + version = "0.3.18"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bbernhard"; + repo = "pysignalclirestapi"; + rev = version; + hash = "sha256-BF4BmnQVfrj7f0N+TN/d7GNuDTbDQfwsCkUn2pVmMWo="; + }; + + propagatedBuildInputs = [ + requests + future + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "pysignalclirestapi" ]; + + meta = with lib; { + description = "Small python library for the Signal Cli REST API"; + homepage = "https://github.com/bbernhard/pysignalclirestapi"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix index ecc396d1b0fe..d645a068d291 100644 --- a/pkgs/development/python-modules/pysimplegui/default.nix +++ b/pkgs/development/python-modules/pysimplegui/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysimplegui"; - version = "4.56.0"; + version = "4.57.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PySimpleGUI"; inherit version; - sha256 = "1a13a19282f92626cc6a823cbe9f4aa08aa558870f03441a1c4e8b6cef27c9d5"; + sha256 = "sha256-+Dcrv+esnthI74AFLK47sS2qI4sPvihuQlL54Zo32RM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyskyqhub/default.nix b/pkgs/development/python-modules/pyskyqhub/default.nix index 1f3ad1874621..b0d1f8010fbb 100644 --- a/pkgs/development/python-modules/pyskyqhub/default.nix +++ b/pkgs/development/python-modules/pyskyqhub/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyskyqhub"; - version = "0.1.4"; + version = "0.1.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_hub"; rev = version; - sha256 = "EVkTvynMPmCr7DPuDqfpMvVPCvpPpJHfqsNjD3tn8zg="; + sha256 = "sha256-1KNgF3d5w+aNKNkOZVkdD3VVLz/F8NyQ5MxO1UaWrFk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix index 85fc18463690..e72e38b30cba 100644 --- a/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/pkgs/development/python-modules/pyskyqremote/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, pycountry , pythonOlder , requests , websocket-client @@ -10,7 +9,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.2.54"; + version = "0.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,11 +18,10 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_remote"; rev = version; - sha256 = "sha256-Z3fcihyK8QHtdREXWt2ESqjwAwxFZFEI9OXf3Y9onmw="; + sha256 = "sha256-/BhNoU1dnZj07ZvG126srSb6eW00n8htFuDttq006QE="; }; propagatedBuildInputs = [ - pycountry requests websocket-client xmltodict diff --git a/pkgs/development/python-modules/pysml/default.nix b/pkgs/development/python-modules/pysml/default.nix index 1f08eb14180c..f7c1e4857c42 100644 --- a/pkgs/development/python-modules/pysml/default.nix +++ b/pkgs/development/python-modules/pysml/default.nix @@ -3,20 +3,26 @@ , bitstring , buildPythonPackage , fetchFromGitHub +, poetry-core , pyserial-asyncio }: buildPythonPackage rec { pname = "pysml"; - version = "0.0.5"; + version = "0.0.7"; + format = "pyproject"; src = fetchFromGitHub { owner = "mtdcr"; repo = pname; rev = version; - sha256 = "05zgrk49b2y5jflxnjww2kqg1flynl3j4ifm0jr28nk0li5wg2bs"; + sha256 = "sha256-h8rQOKZozioZ7HmPETC5wBJyz7rMH1Q2wL6lF8G3zQU="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ async-timeout bitstring diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index 96037d512838..38e7e2733ead 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -2,18 +2,21 @@ , bluepy , buildPythonPackage , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.13.2"; + version = "0.13.3"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = version; - sha256 = "0pdmssd5dr364p3lrkxqryjc0rbaw6xp724zwqf3i87qs6ljs928"; + hash = "sha256-Zgpnw4It3yyy9RQqt5SxeJXl1Z3J3Rp9baLfiw5Bgow="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index e4417139bfa3..843f140ce754 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.4.3"; + version = "1.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "tenable"; repo = "pyTenable"; rev = version; - hash = "sha256-p9d3wZkOMhNQWJN6tCNUlW15A3irU8QN/nm7PLGTE/M="; + hash = "sha256-qp+e40z24RIOV5RfSw/nI/y1Z3972nCLN8DgQyLbDOc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 6fcb9f97d32c..4aac6902ce3b 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -1,12 +1,12 @@ -{ buildPythonPackage, fetchPypi, lib, pillow, tesseract, substituteAll }: +{ buildPythonPackage, fetchPypi, lib, pillow, tesseract, substituteAll, packaging }: buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.8"; + version = "0.3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YUigHkN1dghi6PVupxjiK10TsoFFTfRuqNrJgHeT/Fo="; + sha256 = "sha256-fiuvx/SNG7cUQ85GM6VvXiGSWpjyIKNsM2KX7c0ZVtA="; }; patches = [ @@ -17,7 +17,7 @@ buildPythonPackage rec { ]; buildInputs = [ tesseract ]; - propagatedBuildInputs = [ pillow ]; + propagatedBuildInputs = [ pillow packaging ]; # the package doesn't have any tests. doCheck = false; diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 4e45477c8caa..794bbce74e0c 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -1,20 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, aiohttp }: +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, setuptools-scm +, aiohttp +, pytest +, pytest-asyncio +, pytestCheckHook +}: buildPythonPackage rec { pname = "pytest-aiohttp"; - version = "0.3.0"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "0kx4mbs9bflycd8x9af0idcjhdgnzri3nw1qb0vpfyb3751qaaf9"; + hash = "sha256-DI/rSNyOuAhw4rFTrK9iu7zCB5d+vLdDZf/P4WrcnxU="; }; - buildInputs = [ pytest ]; + patches = [ + # https://github.com/aio-libs/pytest-aiohttp/pull/26 + (fetchpatch { + name = "fix-tests-with-pytest-asyncio-0.18.0.patch"; + url = "https://github.com/aio-libs/pytest-aiohttp/commit/97152c2dfdd368f799ec6bcb5fc315736a726f53.patch"; + hash = "sha256-g7MTyCKUHnufOfrbhVV58WtfbGt1uXx8F7U9U+EaXfg="; + }) + ]; - propagatedBuildInputs = [ aiohttp ]; + nativeBuildInputs = [ + setuptools-scm + ]; - # There are no tests - doCheck = false; + propagatedBuildInputs = [ + aiohttp + pytest + pytest-asyncio + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/aio-libs/pytest-aiohttp/"; diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix index bfbec757b1d7..95e22510d8a0 100644 --- a/pkgs/development/python-modules/pytest-arraydiff/default.nix +++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -2,35 +2,48 @@ , buildPythonPackage , fetchPypi , numpy -, six , pytest +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "pytest-arraydiff"; - version = "0.3"; + version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "de2d62f53ecc107ed754d70d562adfa7573677a263216a7f19aa332f20dc6c15"; + sha256 = "714149beffd0dfa085477c65791c1139b619602b049536353ce1a91397fb3bd2"; }; - buildInputs = [ pytest ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ numpy - six ]; - # The tests requires astropy, which itself requires - # pytest-arraydiff. This causes an infinite recursion if the tests - # are enabled. + # The tests requires astropy, which itself requires pytest-arraydiff doCheck = false; + pythonImportsCheck = [ + "pytest_arraydiff" + ]; + meta = with lib; { description = "Pytest plugin to help with comparing array output from tests"; homepage = "https://github.com/astrofrog/pytest-arraydiff"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 4059a3c12fbe..b8d3dffa3b0b 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,32 +1,42 @@ { lib , buildPythonPackage , fetchFromGitHub +, flaky , hypothesis , pytest , pytestCheckHook , pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.16.0"; + version = "0.18.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4zMbzdDtiLRKo5C12wZRoBNguXLn3f26NuDwQ+pHA0I="; + hash = "sha256-PE66ogjfzj6cW3+UD5nZHSt6zg7b+j6Q4ACznE4j0j8="; }; - buildInputs = [ + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ pytest ]; checkInputs = [ + flaky hypothesis + flaky pytestCheckHook ]; @@ -35,9 +45,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "library for testing asyncio code with pytest"; + description = "Library for testing asyncio code with pytest"; homepage = "https://github.com/pytest-dev/pytest-asyncio"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index b087cd6f4598..6ca95bca4c0b 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch +{ lib +, buildPythonPackage +, fetchFromGitHub , execnet , glob2 , Mako @@ -8,41 +10,51 @@ , py , pytest , pytestCheckHook -, six +, pythonOlder }: buildPythonPackage rec { pname = "pytest-bdd"; - version = "4.0.2"; + version = "5.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; - # tests are not included in pypi tarball src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; rev = version; - sha256 = "0pxx4c8lm68rw0jshbr09fnadg8zz8j73q0qi49yw9s7yw86bg5l"; + sha256 = "sha256-3P9ongMAsLITOCRPmME492xnkdVc8IdOVrINK57gfOY="; }; - patches = [ - # Fixed compatibility with pytest > 6.1 - (fetchpatch { - url = "https://github.com/pytest-dev/pytest-bdd/commit/e1dc0cad9a1c1ba563ccfbc24f9993d83ac59293.patch"; - sha256 = "1p3gavh6nir2a8crd5wdf0prfrg0hmgar9slvn8a21ils3k5pm5y"; - }) + buildInputs = [ + pytest ]; + propagatedBuildInputs = [ + glob2 + Mako + parse + parse-type + py + ]; - buildInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + execnet + mock + ]; - propagatedBuildInputs = [ glob2 Mako parse parse-type py six ]; - - checkInputs = [ pytestCheckHook execnet mock ]; preCheck = '' export PATH=$PATH:$out/bin ''; + pythonImportsCheck = [ + "pytest_bdd" + ]; + meta = with lib; { - description = "BDD library for the py.test runner"; + description = "BDD library for the pytest"; homepage = "https://github.com/pytest-dev/pytest-bdd"; license = licenses.mit; maintainers = with maintainers; [ jm2dev ]; diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix index c3374032d333..80e31e8effae 100644 --- a/pkgs/development/python-modules/pytest-cases/default.nix +++ b/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.8"; + version = "3.6.11"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d423e87b30e1080cc162d86c72bfa35861cccfe3539125e81c68ba142ab974bc"; + sha256 = "sha256-9rcXPoGxR3sxX3tFbv1O/T7kfrKnIB2XV1mJvSH5WQ4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix index 77de2d9698ba..9efd9f49f2b4 100644 --- a/pkgs/development/python-modules/pytest-celery/default.nix +++ b/pkgs/development/python-modules/pytest-celery/default.nix @@ -1,21 +1,30 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "pytest-celery"; - version = "0.0.0"; + version = "0.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "cfd060fc32676afa1e4f51b2938f903f7f75d952186b8c6cf631628c4088f406"; + format = "flit"; + + src = fetchFromGitHub { + owner = "celery"; + repo = "pytest-celery"; + rev = "v${version}"; + sha256 = "sha256-vzWwkOS3BLOInaFDk+PegvEmC88ZZ1sG1CmHwhn7r9w="; }; - patches = [ ./no-celery.patch ]; + postPatch = '' + # avoid infinite recursion with celery + substituteInPlace pyproject.toml \ + --replace '"celery >= 4.4.0"' "" + ''; - doCheck = false; # This package has nothing to test or import. + # This package has nothing to test or import. + doCheck = false; meta = with lib; { - description = "pytest plugin for unittest subTest() support and subtests fixture"; - homepage = "https://github.com/pytest-dev/pytest-subtests"; + description = "Pytest plugin to enable celery.contrib.pytest"; + homepage = "https://github.com/celery/pytest-celery"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/pytest-celery/no-celery.patch b/pkgs/development/python-modules/pytest-celery/no-celery.patch deleted file mode 100644 index 65337489883c..000000000000 --- a/pkgs/development/python-modules/pytest-celery/no-celery.patch +++ /dev/null @@ -1,9 +0,0 @@ -This plugin is needed to test celery itself, so it can't depend on celery. - ---- a/setup.py -+++ b/setup.py -@@ -6,3 +6,3 @@ from distutils.core import setup - install_requires = \ --['celery >= 4.4.0'] -+[] - diff --git a/pkgs/development/python-modules/pytest-click/default.nix b/pkgs/development/python-modules/pytest-click/default.nix index 887fe7fe7b59..82e6409c9b7f 100644 --- a/pkgs/development/python-modules/pytest-click/default.nix +++ b/pkgs/development/python-modules/pytest-click/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytest-click"; - version = "1.0.2"; + version = "1.1.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "Stranger6667"; repo = "pytest-click"; rev = "v${version}"; - sha256 = "197nvlqlyfrqpy5lrkmfh1ywpr6j9zipxl9d7syg2a2n7jz3a8rj"; + sha256 = "sha256-A/RF+SgPu2yYF3eHEFiZwKJW2VwQ185Ln6S3wn2cS0k="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix index 609ed9cc343e..32ccd22c9692 100644 --- a/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -5,28 +5,41 @@ , python , mock , setuptools-scm +, pythonOlder }: buildPythonPackage rec { pname = "pytest-console-scripts"; - version = "1.2.2"; + version = "1.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "caeaaaf57f3a99e4482127e8a18467a1cfd49c92f4b37e5578d0bc40bf1b3394"; + hash = "sha256-XGw9qunPn77Q5lUHISiThgAZPcACpc8bGHJIZEugKFc="; }; - postPatch = '' - # setuptools-scm is pinned to <6 because it dropped Python 3.5 - # support. That's not something that affects us. - substituteInPlace setup.py --replace "'setuptools_scm<6'" "'setuptools_scm'" - # Patch the shebang of a script generated during test. - substituteInPlace tests/test_run_scripts.py --replace "#!/usr/bin/env python" "#!${python.interpreter}" - ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ mock pytestCheckHook ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + postPatch = '' + # Patch the shebang of a script generated during test. + substituteInPlace tests/test_run_scripts.py \ + --replace "#!/usr/bin/env python" "#!${python.interpreter}" + ''; + + pythonImportsCheck = [ + "pytest_console_scripts" + ]; meta = with lib; { description = "Pytest plugin for testing console scripts"; diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 87f5972a747d..971b12dc01c7 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -4,20 +4,21 @@ , pytest , coverage , toml +, tomli }: buildPythonPackage rec { pname = "pytest-cov"; - version = "2.12.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1mzl06m8qcgsac1r2krixrkqdwq0nqk8asrpkcj2ddr7qawfw716"; + sha256 = "e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"; }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ coverage toml ]; + propagatedBuildInputs = [ coverage toml tomli ]; # xdist related tests fail with the following error # OSError: [Errno 13] Permission denied: 'py/_code' diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index d3b2bc66aae4..c4668def279e 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -10,11 +10,11 @@ }: buildPythonPackage rec { pname = "pytest-django"; - version = "4.5.1"; + version = "4.5.2"; src = fetchPypi { inherit pname version; - sha256 = "01fe1242e706375d7c942d206a30826bd9c0dffde99bfac627050cdc91f0d792"; + sha256 = "d9076f759bb7c36939dbdd5ae6633c18edfc2902d1a69fdbefd2426b970ce6c2"; }; nativeBuildInputs = [ pytest setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index 836da1e157ff..0069eb6f179e 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -1,35 +1,46 @@ -{ buildPythonPackage -, lib -, fetchPypi -, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub , httpbin +, pytest +, pytestCheckHook +, requests , six }: buildPythonPackage rec { pname = "pytest-httpbin"; - version = "1.0.0"; + version = "1.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "0wlvw5qgkax7f0i5ks1562s37h2hdmn5yxnp1rajcc2289zm9knq"; + src = fetchFromGitHub { + owner = "kevin1024"; + repo = "pytest-httpbin"; + rev = "v${version}"; + hash = "sha256-Vngd8Vum96+rdG8Nz1+aHrO6WZjiAz+0CeIovaH8N+s="; }; - checkInputs = [ pytest ]; + buildInputs = [ + pytest + ]; - propagatedBuildInputs = [ httpbin six ]; + propagatedBuildInputs = [ + httpbin + six + ]; - checkPhase = '' - py.test - ''; + checkInputs = [ + pytestCheckHook + requests + ]; - # https://github.com/kevin1024/pytest-httpbin/pull/51 - doCheck = false; + pythonImportsCheck = [ + "pytest_httpbin" + ]; - meta = { - description = "Easily test your HTTP library against a local copy of httpbin.org"; + meta = with lib; { + description = "Test your HTTP library against a local copy of httpbin.org"; homepage = "https://github.com/kevin1024/pytest-httpbin"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } - diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index cd07a104038c..eb04881455d7 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { pname = "pytest_httpserver"; inherit version; - sha256 = "87561c4fa6a7bc306d76d1979a3eb9d54eb26bfb2f3f51f1643bf3c090ce629d"; + sha256 = "6de464ba5f74628d6182ebbdcb56783edf2c9b0caf598dc35c11f014f24a3f0d"; }; propagatedBuildInputs = [ werkzeug ]; diff --git a/pkgs/development/python-modules/pytest-json-report/default.nix b/pkgs/development/python-modules/pytest-json-report/default.nix index 2b89fe715921..95a0bcb325f1 100644 --- a/pkgs/development/python-modules/pytest-json-report/default.nix +++ b/pkgs/development/python-modules/pytest-json-report/default.nix @@ -5,17 +5,21 @@ , pytest-metadata , pytest-xdist , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pytest-json-report"; - version = "1.4.1"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "numirias"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OS9ASUp9iJ12Ovr931RQU/DHEAXqbgcRMCBP4h+GAhk="; + hash = "sha256-hMB/atDuo7CjwhHFUOxVfgJ7Qp4AA9J428iv7hyQFcs="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index e5008af9ef2f..e3823c18d895 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.5.1"; + version = "0.5.1.post0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "ef6f04193dc0f7e8df5b27b3a8834318fa12eaf025436d2a99afff1b73cde761"; + sha256 = "5ec7f8e6534cf03887af2cb59e577f169ac0e8b2fd2c3e3409280035f386d407"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index a8127e276f45..94db409be918 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pytest , pytest-asyncio , pytestCheckHook , setuptools-scm @@ -8,26 +9,36 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.6.1"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "40217a058c52a63f1042f0784f62009e976ba824c418cced42e88d5f40ab0e62"; + hash = "sha256-URK9ksyfGG7pbhqS78hJaepJSTnDrq05xQ9CHEzGlTQ="; }; nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ + pytest + ]; + checkInputs = [ pytest-asyncio pytestCheckHook ]; + disabledTests = [ + # output of pytest has changed + "test_used_with_" + "test_plain_stopall" + ]; + pythonImportsCheck = [ "pytest_mock" ]; meta = with lib; { description = "Thin-wrapper around the mock package for easier use with pytest"; homepage = "https://github.com/pytest-dev/pytest-mock"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix index 38b2168e13fd..806c12c0e4ff 100644 --- a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix +++ b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix @@ -1,27 +1,57 @@ { lib , buildPythonPackage -, fetchFromGitHub , chevron -, pyyaml +, decorator +, fetchFromGitHub , mypy , pytest -, decorator +, pytestCheckHook +, pythonOlder +, pyyaml , regex }: buildPythonPackage rec { pname = "pytest-mypy-plugins"; - version = "1.9.2"; + version = "1.9.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "typeddjango"; repo = pname; rev = version; - sha256 = "sha256-Me5P4Q2M+gGEWlUVgQ0L048rVUOlUzVMgZZcqZPeE4Q="; + sha256 = "sha256-4hG3atahb+dH2dRGAxguJW3vvEf0TUGUJ3G5ymrf3Vg="; }; - propagatedBuildInputs = [ chevron pyyaml mypy pytest decorator regex ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + chevron + pyyaml + mypy + decorator + regex + ]; + + checkInputs = [ + mypy + pytestCheckHook + ]; + + preCheck = '' + export PATH="$PATH:$out/bin"; + ''; + + pythonImportsCheck = [ + "pytest_mypy_plugins" + ]; meta = with lib; { - description = "pytest plugin for testing mypy types, stubs, and plugins"; + description = "Pytest plugin for testing mypy types, stubs, and plugins"; homepage = "https://github.com/TypedDjango/pytest-mypy-plugins"; license = licenses.mit; maintainers = with maintainers; [ SomeoneSerge ]; diff --git a/pkgs/development/python-modules/pytest-pythonpath/default.nix b/pkgs/development/python-modules/pytest-pythonpath/default.nix index 117471aa8df1..8c3fb48b430e 100644 --- a/pkgs/development/python-modules/pytest-pythonpath/default.nix +++ b/pkgs/development/python-modules/pytest-pythonpath/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-pythonpath"; - version = "0.7.3"; + version = "0.7.4"; src = fetchPypi { inherit pname version; - sha256 = "0qhxh0z2b3p52v3i0za9mrmjnb1nlvvyi2g23rf88b3xrrm59z33"; + sha256 = "sha256-ZOGVsjqPjAxjH7Fogtmtb6QTftHylh3dFdUgZc1DXbY="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-raisin/default.nix b/pkgs/development/python-modules/pytest-raisin/default.nix index 7412928062d7..1dc250da2ac7 100644 --- a/pkgs/development/python-modules/pytest-raisin/default.nix +++ b/pkgs/development/python-modules/pytest-raisin/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pytest-raisin"; - version = "0.3"; + version = "0.4"; format = "flit"; src = fetchFromGitHub { owner = "wimglenn"; repo = "pytest-raisin"; rev = "v${version}"; - sha256 = "73cOrsqlE04m6X3a6VwtRzfi24oqkdO3HjKQH61bU88="; + sha256 = "sha256-BI0SWy671DYDTPH4iO811ku6SzpH4ho7eQFUA8PmxW8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index a2fe0c6f25c4..5aae59bc605f 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "pytest-randomly"; - version = "3.10.3"; + version = "3.11.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { repo = pname; owner = "pytest-dev"; rev = version; - sha256 = "sha256-NoYpMpFWz52Z0+KIUumUFp3xMPA1jGw8COojU+bsgHc="; + hash = "sha256-NoYpMpFWz52Z0+KIUumUFp3xMPA1jGw8COojU+bsgHc="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to randomly order tests and control random.seed"; homepage = "https://github.com/pytest-dev/pytest-randomly"; - license = licenses.bsd3; + license = licenses.mit; maintainers = with maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 90b72c886eac..6866df7b7125 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , pythonOlder , matplotlib @@ -16,33 +15,44 @@ buildPythonPackage rec { pname = "pytest-regressions"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "15a71f77cb266dd4ca94331abe4c339ad056b2b2175e47442711c98cf6d65716"; + sha256 = "sha256-STWtZzbvhQ0NsSvl7jh0CjmYjmtRA/LTUQAAaze5Tg4="; }; - patches = [ - # Make pytest-regressions compatible with NumPy 1.20. - # Should be part of the next release. - (fetchpatch { - url = "https://github.com/ESSS/pytest-regressions/commit/ffad2c7fd1d110f420f4e3ca3d39d90cae18a972.patch"; - sha256 = "sha256-bUna7MnMV6u9oEaZMsFnr4gE28rz/c0O2+Hyk291+l0="; - }) - ]; - - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ numpy pandas pillow pytest-datadir pyyaml ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - checkInputs = [ pytestCheckHook matplotlib ]; - pythonImportsCheck = [ "pytest_regressions" "pytest_regressions.plugin" ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + numpy + pandas + pillow + pytest-datadir + pyyaml + ]; + + + checkInputs = [ + pytestCheckHook + matplotlib + ]; + + pythonImportsCheck = [ + "pytest_regressions" + "pytest_regressions.plugin" + ]; meta = with lib; { description = "Pytest fixtures to write regression tests"; diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 1030f76050ca..13838eb326c9 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -38,5 +38,7 @@ buildPythonPackage rec { description = "Relaxed test discovery/organization for pytest"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; + # see https://github.com/bitprophet/pytest-relaxed/issues/12 + broken = true; }; } diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix index fb91f461329e..fc9b5e6f9c1b 100644 --- a/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -1,38 +1,54 @@ { lib , buildPythonPackage , fetchPypi -, six , pytest +, pytestCheckHook +, pythonOlder +, setuptools-scm +, six }: buildPythonPackage rec { pname = "pytest-remotedata"; - version = "0.3.2"; + version = "0.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e20c58d4b7c359c4975dc3c3d3d67be0905180d2368be0be3ae09b15a136cfc0"; + sha256 = "66920bf1c62928b079d0e611379111a0d49f10a9509ced54c8269514ccce6ee3"; }; - buildInputs = [ pytest ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; propagatedBuildInputs = [ six ]; checkInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' - # these tests require a network connection - pytest --ignore tests/test_strict_check.py - ''; + disabledTestPaths = [ + # These tests require a network connection + "tests/test_strict_check.py" + ]; + + pythonImportsCheck = [ + "pytest_remotedata" + ]; meta = with lib; { description = "Pytest plugin for controlling remote data access"; - homepage = "https://astropy.org"; + homepage = "https://github.com/astropy/pytest-remotedata"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix index cb58e101be7b..34833bcc30a8 100644 --- a/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytest-snapshot"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; src = fetchFromGitHub { owner = "joseph-roitman"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xnfsB4wmsvqq5FfhLasSpxZh7+vhQsND6+Lxu0OuCvs="; + sha256 = "sha256-ymB9h3Mc6GSMRsxIh6uuf111qLvIkNAnFsxR6O2SF7s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index f095cbb99734..cc890096f796 100644 --- a/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-subprocess"; - version = "1.4.0"; + version = "1.4.1"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "aklajnert"; repo = "pytest-subprocess"; rev = version; - hash = "sha256-+bsxoOsY0yf77EivImrfqxgVW0T/VnFIJXvy8X5pmEY="; + hash = "sha256-xNkOXBCQ4AH/JVmxFzI3VSouA6jkCbUom7AdckfjGiE="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix index 6b556abeaa4f..d5e379b524d5 100644 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -8,22 +8,30 @@ buildPythonPackage rec { pname = "pytest-subtests"; - version = "0.5.0"; - disabled = pythonOlder "3.5"; + version = "0.6.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5bd1e4bf0eda4c89a6cd42b0ee28e1d2ca0848de3fd67ad8cdd6d559ed00f120"; + sha256 = "sha256-Pr0wao3PdRM/F0LyiMgvNkJuvPihMtTuiXgtIOhPwTo="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "pytest_subtests" ]; + pythonImportsCheck = [ + "pytest_subtests" + ]; meta = with lib; { - description = "pytest plugin for unittest subTest() support and subtests fixture"; + description = "Pytest plugin for unittest subTest() support and subtests fixture"; homepage = "https://github.com/pytest-dev/pytest-subtests"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index f504bd80868b..f99340e48b3b 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-timeout"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pexOzt246nJpEYSFk9ZoWUEH55diHpf5Oh0dvG+7kIA="; + sha256 = "e6f98b54dafde8d70e4088467ff621260b641eb64895c4195b6e5c8f45638112"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 9cf5ffc63abf..bf386d6d62dc 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -2,16 +2,15 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, pytestCheckHook -, pythonOlder - +, ftfy , mailchecker , phonenumbers +, pytestCheckHook , python-dateutil , python-fsutil +, pythonOlder , python-slugify , pyyaml -, ftfy , requests , six , toml @@ -20,7 +19,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.24.3"; + version = "0.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +28,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = version; - hash = "sha256-06n8MNoGQRSrBK2XeEBBoQ2NIXWf0qXPVBeP9ERMEj0="; + hash = "sha256-G7pTbxNcESMUiKpQxjiF0gwN5mBhmuwIDlzauN5JCB4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 0edf2b695807..30666ef47064 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "python-box"; - version = "5.4.1"; + version = "6.0.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "cdgriffith"; repo = "Box"; rev = version; - sha256 = "sha256-SkteajcWG7rBFMm6Xp6QCfkZfwthRituGL/RtICbtYk="; + hash = "sha256-kH8qHAFuYDXO5Dsl6BpTYCIqh0Xi8Rbwmia+y3sTn6Y="; }; propagatedBuildInputs = [ @@ -32,7 +34,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "box" ]; + pythonImportsCheck = [ + "box" + ]; meta = with lib; { description = "Python dictionaries with advanced dot notation access"; diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index fe421fa55d38..2f08341a2c4f 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "python-cinderclient"; - version = "8.2.0"; + version = "8.3.0"; src = fetchPypi { inherit pname version; - sha256 = "7b2f08a2d1cc05d2c1f84f02fadb2208678b1acb501acfe2de33720078ec7b9f"; + sha256 = "sha256-4AEDh1Ap3IXLtZEx0AzMhTT2kpVqzeMrWjzFr0wkWAs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-crfsuite/default.nix b/pkgs/development/python-modules/python-crfsuite/default.nix index cd2adc48c6fa..7cb9281a7ba1 100644 --- a/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/pkgs/development/python-modules/python-crfsuite/default.nix @@ -2,16 +2,17 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonAtLeast }: buildPythonPackage rec { pname = "python-crfsuite"; - version = "0.9.7"; + version = "0.9.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1ryfcdfpqbrf8rcd2rlay2gfiba3px3q508543jf81shrv93hi9v"; + sha256 = "sha256-DgPPbro2KHF8zwbfoPSiuoYohgrbF0y/0lCnpGkoZaE="; }; preCheck = '' @@ -32,5 +33,6 @@ buildPythonPackage rec { homepage = "https://github.com/scrapinghub/python-crfsuite"; license = licenses.mit; maintainers = teams.tts.members; + broken = pythonAtLeast "3.10"; # https://github.com/scrapinghub/python-crfsuite/issues/130 }; } diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index d643603a0679..60e6f2e74552 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.19"; + version = "0.25.0"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = version; - sha256 = "09j338lmrjabbd3fpajr4piz4r20sl33030szfsqfzlwrrmvkyi0"; + sha256 = "0zg2aib0k6hc1vvlbdcmp003m85dvkv7pndzgkc4vv2y9qpi0jp9"; }; prePatch = '' @@ -38,6 +38,10 @@ buildPythonPackage rec { "test_cli" "test_timedated" "test_upower" + # needs glib + "test_accounts_service" + # needs dbus-daemon active + "test_systemd" # Very slow, consider disabling? # "test_networkmanager" ]; diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 293d97712808..c5557b3fa6dc 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -4,6 +4,7 @@ , pkg-config , python , dbus-python +, packaging , enlightenment }: @@ -11,18 +12,18 @@ buildPythonPackage rec { pname = "python-efl"; - version = "1.25.0"; + version = "1.26.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; - sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r"; + sha256 = "0dj6f24n33hkpy0bkdclnzpxhvs8vpaxqaf7hkw0di19pjwrq25h"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ enlightenment.efl ]; - propagatedBuildInputs = [ dbus-python ]; + propagatedBuildInputs = [ dbus-python packaging ]; preConfigure = '' NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE" @@ -39,8 +40,8 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "Python bindings for EFL and Elementary"; - homepage = "https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"; + description = "Python bindings for Enlightenment Foundation Libraries"; + homepage = "https://github.com/DaveMDS/python-efl"; platforms = platforms.linux; license = with licenses; [ gpl3 lgpl3 ]; maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index 17dbd579e841..760e86f6ecf2 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.5.0"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = version; - hash = "sha256-zWthL7iwdVzdihX2YA4G//B18iwe1gRT0GM2KNP01kQ="; + hash = "sha256-DY0QGHD7HdLnKnbPV17UZl9u3Ac9YZdYvQXLOzmRGos="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 6853bddf54c1..8ccf35ff8e84 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "3.1.0"; + version = "3.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "7216c9100b2a17cae5cf53b4b40ee36a7262d4ead7526c5a6278d911eba74847"; + sha256 = "sha256-/vJdQaYvkdqC7iD3KnKLnGnu80zwowBc27mgtHHVtJg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index 934f15a7a464..4eca7cca13fc 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-hosts"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "8f827da4a1bf69d4f4f881f7d7ebc8b378967b60924aa4baea2c9d1debedf5fc"; + sha256 = "sha256-4SAXjx5pRDhv4YVUgrUttyUa5izpYqpDKiiGJc2y8V0="; }; # win_inet_pton is required for windows support diff --git a/pkgs/development/python-modules/python-http-client/default.nix b/pkgs/development/python-modules/python-http-client/default.nix index 3a8ad2188fc1..78a3b018c7ea 100644 --- a/pkgs/development/python-modules/python-http-client/default.nix +++ b/pkgs/development/python-modules/python-http-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python_http_client"; - version = "3.3.5"; + version = "3.3.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sendgrid"; repo = "python-http-client"; rev = version; - sha256 = "sha256-VSrh6t9p7Xb8HqAwcuDSUD2Pj3NcXeg7ygKLG2MHFxk="; + sha256 = "sha256-8Qs5Jw0LMV2UucLnlFKJQ2PUhYaQx6uJdIV/4gaPH3w="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/python-i18n/default.nix b/pkgs/development/python-modules/python-i18n/default.nix new file mode 100644 index 000000000000..8e7f8f880e2a --- /dev/null +++ b/pkgs/development/python-modules/python-i18n/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, pyyaml }: + +buildPythonPackage rec { + pname = "python-i18n"; + version = "0.3.9"; + + src = fetchFromGitHub { + owner = "danhper"; + repo = pname; + rev = "v${version}"; + sha256 = "6FahoHZqaOWYGaT9RqLARCm2kLfUIlYuauB6+0eX7jA="; + }; + + checkInputs = [ pytestCheckHook pyyaml ]; + + pytestFlagsArray = [ "i18n/tests/run_tests.py" ]; + + meta = with lib; { + description = "Easy to use i18n library"; + homepage = "https://github.com/danhper/python-i18n"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ emilytrau ]; + }; +} diff --git a/pkgs/development/python-modules/python-ipmi/default.nix b/pkgs/development/python-modules/python-ipmi/default.nix index 7f8b8fe58a77..cbd68f387656 100644 --- a/pkgs/development/python-modules/python-ipmi/default.nix +++ b/pkgs/development/python-modules/python-ipmi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "python-ipmi"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kontron"; repo = pname; rev = version; - sha256 = "0rcix3q845zsmfj5857kq1r5b8m7m3sad34i23k65m0p58clwdqm"; + sha256 = "sha256-VXWSoVRfgJWf9rOT4SE1mTJdeNmzR3TRc2pc6Pp1M5U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-izone/default.nix b/pkgs/development/python-modules/python-izone/default.nix index f1f8be9d3d27..e3ce43109725 100644 --- a/pkgs/development/python-modules/python-izone/default.nix +++ b/pkgs/development/python-modules/python-izone/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-izone"; - version = "1.2.4"; + version = "1.2.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Swamp-Ig"; repo = "pizone"; rev = "v${version}"; - hash = "sha256-HV8aQlwJ7VbGlJU0HpS9fK/QnRfYrk4ijKTGPWj0Jww="; + hash = "sha256-CvFOhs56dfNerK3junWElQfTJi1YXA86zMbv0tseQC8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-juicenet/default.nix b/pkgs/development/python-modules/python-juicenet/default.nix index 1547c8914617..ad27a913257e 100644 --- a/pkgs/development/python-modules/python-juicenet/default.nix +++ b/pkgs/development/python-modules/python-juicenet/default.nix @@ -1,18 +1,22 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub -, aiohttp +, pythonOlder }: buildPythonPackage rec { pname = "python-juicenet"; - version = "1.0.2"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jesserockz"; repo = "python-juicenet"; rev = "v${version}"; - sha256 = "04547pj51ds31yhyc7ng47v9giz16h2s3wgb6szc8ivhb5rclqz2"; + hash = "sha256-5RKnVwOfEHzFZCiC8OUpS8exKrENK+I3Ok45HlKEvtU="; }; propagatedBuildInputs = [ @@ -22,7 +26,9 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - pythonImportsCheck = [ "pyjuicenet" ]; + pythonImportsCheck = [ + "pyjuicenet" + ]; meta = with lib; { description = "Read and control Juicenet/Juicepoint/Juicebox based EVSE devices"; diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 17c3cb07be36..6adfbf5745d2 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.4.1"; + version = "0.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-4e9jpUDorZlKCYwWtqrba61zbkJl57oWUhEpFcaS9ak="; + sha256 = "sha256-5Ohks3yfqAAe+CiLEucibezmibl6TtktDXMHAhecXzA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-keycloak/default.nix b/pkgs/development/python-modules/python-keycloak/default.nix index 8e436b4eb7e5..6425869243ef 100644 --- a/pkgs/development/python-modules/python-keycloak/default.nix +++ b/pkgs/development/python-modules/python-keycloak/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-keycloak"; - version = "0.26.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "marcospereirampj"; repo = "python-keycloak"; rev = version; - sha256 = "sha256-YWDj/dLN72XMxDXpSPQvkxHF5xJ15xWJjw3vtfmxlwo="; + sha256 = "sha256-XCOfzzUs0K5/peprgpEXY2pX6wYOF7hg9ec1XPEYHCI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-louvain/default.nix b/pkgs/development/python-modules/python-louvain/default.nix index 6d22c1fd845a..262370f6109d 100644 --- a/pkgs/development/python-modules/python-louvain/default.nix +++ b/pkgs/development/python-modules/python-louvain/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-louvain"; - version = "0.15"; + version = "0.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KoVu374plSpgpVOKhLt4zKGPaISoi5Ml6FoRyN1JF+s="; + sha256 = "sha256-t7ot9QAv0o0+54mklTK6rRH+ZI5PIRfPB5jnUgodpWs="; }; propagatedBuildInputs = [ networkx numpy ]; diff --git a/pkgs/development/python-modules/python-lsp-black/default.nix b/pkgs/development/python-modules/python-lsp-black/default.nix index bd557c402ffb..dbd51166a22c 100644 --- a/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/pkgs/development/python-modules/python-lsp-black/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "python-lsp-black"; - version = "1.0.1"; + version = "1.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "python-lsp"; repo = "python-lsp-black"; rev = "v${version}"; - sha256 = "03k32m4jfqfzrawj69yxhk9kwzsdcwginip77kxdbra2xwgqfc3w"; + sha256 = "sha256-WIQf1oz3b1PLIcXfQsu4hQ58nfp7l3J7zkcWNT6RbUY="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index b000379dd1bb..313524351658 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -20,6 +20,7 @@ , pythonOlder , rope , setuptools +, stdenv , ujson , yapf , withAutopep8 ? true @@ -73,14 +74,17 @@ buildPythonPackage rec { matplotlib numpy pandas - pyqt5 pytestCheckHook - ]; + ] + # pyqt5 is broken on aarch64-darwin + ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ pyqt5 ]; disabledTests = [ # pytlint output changed "test_lint_free_pylint" - ] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"; + ] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config" + # pyqt5 is broken on aarch64-darwin + ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "test_pyqt_completion"; disabledTestPaths = lib.optional (!withAutopep8) "test/plugins/test_autopep8_format.py" ++ lib.optional (!withRope) "test/plugins/test_completion.py" diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index d8a0f638d968..381ea6713848 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -3,7 +3,6 @@ , python , buildPythonPackage , fetchFromGitHub -, fetchpatch , substituteAll , file , glibcLocales @@ -11,23 +10,16 @@ buildPythonPackage rec { pname = "python-magic"; - version = "0.4.24"; + version = "0.4.25"; src = fetchFromGitHub { owner = "ahupp"; repo = "python-magic"; rev = version; - sha256 = "17jalhjbfd600lzfz296m0nvgp6c7vx1mgz82jbzn8hgdzknf4w0"; + sha256 = "sha256-h7YQVH5Z7zunT6AdLPBh3TWpxLpZ5unSHDhkVDFOWDI="; }; patches = [ - # pull upstream patch to support file-5.41 - (fetchpatch { - name = "file-5.41-compat.patch"; - url = "https://github.com/ahupp/python-magic/commit/0ae7e7ceac0e80e03adc75c858bb378c0427331a.patch"; - sha256 = "0vclaamb56nza1mcy88wjbkh81hnish2gzvl8visa2cknhgdmk50"; - }) - (substituteAll { src = ./libmagic-path.patch; libmagic = "${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}"; diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index aea8b6dab303..a2da2e4f4a76 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonApplication , fetchPypi +, installShellFiles , pbr +, openstackdocstheme , oslo-config , oslo-log , oslo-serialization @@ -9,6 +11,8 @@ , prettytable , requests , simplejson +, sphinx +, sphinxcontrib-programoutput , Babel , osc-lib , python-keystoneclient @@ -18,13 +22,20 @@ buildPythonApplication rec { pname = "python-manilaclient"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "d53f69238cdc454c0297f513e0b481a039d0bac723990ebd5ab9d3d29633956e"; + sha256 = "sha256-6iAed0mtEYHguYq4Rlh4YWT8E5hNqBYPcnG9/8RMspo="; }; + nativeBuildInputs = [ + installShellFiles + openstackdocstheme + sphinx + sphinxcontrib-programoutput + ]; + propagatedBuildInputs = [ pbr oslo-config @@ -40,6 +51,12 @@ buildPythonApplication rec { debtcollector ]; + postInstall = '' + export PATH=$out/bin:$PATH + sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man + installManPage doc/build/man/python-manilaclient.1 + ''; + # Checks moved to 'passthru.tests' to workaround infinite recursion doCheck = false; diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 24c51af4fb2e..c1391995ddaa 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi -, poetry +, poetry-core , click , cryptography , construct @@ -24,22 +24,18 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.5.9.2"; - disabled = pythonOlder "3.6.5"; + version = "0.5.11"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-AFwarRhFknfwTSvSDGoWE+/mv1KUD2XnWK/xCBqrN4o="; + sha256 = "sha256-1hC7yE/hGLx9g3NXqU45yC/6dcW6/0oZwgYW5bj/37c="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'defusedxml = "^0"' 'defusedxml = "*"' \ - ''; - nativeBuildInputs = [ - poetry + poetry-core ]; propagatedBuildInputs = [ @@ -56,14 +52,23 @@ buildPythonPackage rec { pyyaml tqdm zeroconf - ] ++ lib.optional (pythonOlder "3.8") importlib-metadata; + ] ++ lib.optional (pythonOlder "3.8") [ + importlib-metadata + ]; checkInputs = [ pytestCheckHook pytest-mock ]; - pythonImportsCheck = [ "miio" ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'defusedxml = "^0"' 'defusedxml = "*"' \ + ''; + + pythonImportsCheck = [ + "miio" + ]; meta = with lib; { description = "Python library for interfacing with Xiaomi smart appliances"; diff --git a/pkgs/development/python-modules/python-nest/default.nix b/pkgs/development/python-modules/python-nest/default.nix index 8caa61517c6f..1cbdd2837a72 100644 --- a/pkgs/development/python-modules/python-nest/default.nix +++ b/pkgs/development/python-modules/python-nest/default.nix @@ -1,23 +1,41 @@ -{ buildPythonPackage, fetchPypi, lib, python-dateutil, requests -, six, sseclient-py }: +{ lib +, buildPythonPackage +, fetchPypi +, python-dateutil +, requests +, six +, sseclient-py +, pythonOlder +}: buildPythonPackage rec { pname = "python-nest"; - version = "4.1.0"; + version = "4.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "12iyypbl92ybh8w1bf4z0c2g0sb9id2c07c89vzvnlxgjylw3wbi"; + hash = "sha256-01hoZbDssbJ10NA72gOtlzjZMGjsUBUoVDVM35uAOLU="; }; - propagatedBuildInputs = [ python-dateutil requests six sseclient-py ]; - # has no tests + propagatedBuildInputs = [ + python-dateutil + requests + six + sseclient-py + ]; + + # Module has no tests doCheck = false; - pythonImportsCheck = [ "nest" ]; + + pythonImportsCheck = [ + "nest" + ]; meta = with lib; { - description = - "Python API and command line tool for talking to the Nest™ Thermostat"; + description = "Python API and command line tool for talking to the Nest™ Thermostat"; homepage = "https://github.com/jkoelker/python-nest"; license = licenses.cc-by-nc-sa-40; maintainers = with maintainers; [ jamiemagee ]; diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index afc8a51988ed..e654c75bfe88 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "python-novaclient"; - version = "17.6.0"; + version = "17.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yRDCCFMQ2mNfs0NYXxBwcS/w+cs8j3nUTKPWMsTyMPU="; + sha256 = "sha256-Trwn9M4GwVW46ZGkRGO5NYWW5oVs8XHJr43HVo2Gi+0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index 8e446d6b9909..8c76861bcb86 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -2,24 +2,33 @@ , buildPythonPackage , fetchPypi , ddt +, installShellFiles +, openstackdocstheme , osc-lib , pbr , python-cinderclient , python-keystoneclient , python-novaclient , requests-mock +, sphinx , stestr }: buildPythonPackage rec { pname = "python-openstackclient"; - version = "5.7.0"; + version = "5.8.0"; src = fetchPypi { inherit pname version; - sha256 = "c65e3d51018f193cce2daf3d0fd69daa36003bdb2b85df6b07b973e4c39e2f92"; + sha256 = "sha256-M0hS34iXuV8FgewS7ih96MepKJogihjwqLOHdwGf2YY="; }; + nativeBuildInputs = [ + installShellFiles + openstackdocstheme + sphinx + ]; + propagatedBuildInputs = [ osc-lib pbr @@ -28,6 +37,11 @@ buildPythonPackage rec { python-novaclient ]; + postInstall = '' + sphinx-build -a -E -d doc/build/doctrees -b man doc/source doc/build/man + installManPage doc/build/man/openstack.1 + ''; + checkInputs = [ ddt stestr diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 0655d29f6af7..35d11e981e4d 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "1.5"; + version = "1.6"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "04323e63cf57f7ed927fd9bcb1861ef5ecb0d4d7213f2755969d4a1ac3c2de6f"; + sha256 = "sha256-GJzxqWv5/NhtADYPFa12qDzgiJuK6NHLD9srKZXlocg="; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index 335a085277a0..58d6a1e72f55 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -1,5 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, pkg-config, alsa-lib, libjack2, tox, flake8, alabaster +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, isPy27 +, pkg-config +, alsa-lib +, libjack2 +, tox +, flake8 +, alabaster +, CoreAudio +, CoreMIDI +, CoreServices }: buildPythonPackage rec { @@ -13,7 +25,15 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib libjack2 ]; + buildInputs = [ + libjack2 + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + CoreAudio + CoreMIDI + CoreServices + ]; checkInputs = [ tox flake8 diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 5b7af8ad7360..16c4dc0f2308 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -9,12 +9,14 @@ buildPythonPackage rec { pname = "python-slugify"; - version = "5.0.2"; + version = "6.1.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8TODoLn8vmSaGJK5yOtPjqsdbYS4S7emJDF6+pgVnKs="; + hash = "sha256-7/GQ5N+sl9L4wYkO5oJwns0jZQdCNhaH24LZXh5eJfU="; }; propagatedBuildInputs = [ @@ -26,9 +28,13 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test.py" ]; + pytestFlagsArray = [ + "test.py" + ]; - pythonImportsCheck = [ "slugify" ]; + pythonImportsCheck = [ + "slugify" + ]; meta = with lib; { description = "Python Slugify application that handles Unicode"; diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index 4f484a845402..b41ddf01a8e9 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.29"; + version = "0.0.30"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mdz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-utUpNuemyS8XEVhfhLgOwTRkPFqCBXyK1s1LWemywmU="; + sha256 = "sha256-PzmE0j/sas1Dc/U022dS3krROm292xJlL37+EWPEs+g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix index b494d2e442e6..0d34262ea3bb 100644 --- a/pkgs/development/python-modules/python-snap7/default.nix +++ b/pkgs/development/python-modules/python-snap7/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "python-snap7"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "gijzelaerr"; repo = "python-snap7"; rev = version; - sha256 = "103drdwf4v3yqvd7sscxx154mmmshb6x19v9yqmkj2lj76m0619s"; + sha256 = "18z13wb2q5q3msp9w3wddg1byp7picczw4ng8w1ccj4npidxsqv8"; }; propagatedBuildInputs = [ setuptools six ]; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 0484a75eaeae..e41942317f99 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.5.1"; + version = "5.5.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-mtXGSd7Y+frT22EL3QmiBNatwc6IrJqGBRfsQlD8LLk="; + sha256 = "sha256-ZTjh9gtnJwFG2qWH6FBrvLHKsEuTjkcKL6j6Mdos6zo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index e6c2d016bb09..5254a6cbab25 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socks"; - version = "2.0.0"; + version = "2.0.3"; format = "setuptools"; disabled = pythonOlder "3.6.1"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iTwlUyfTD2ZhOvBX3IDqjkeW4Z2tfKxvQjIV7GGBVJA="; + sha256 = "sha256-tVoBon9HF9MTOK+dN9g58fQO706ElNlCeULx//7hPWA="; }; propagatedBuildInputs = [ @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Core proxy client (SOCKS4, SOCKS5, HTTP) functionality for Python"; homepage = "https://github.com/romis2012/python-socks"; license = licenses.asl20; - maintainers = with maintainers; [ mjlbach ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/python-songpal/default.nix b/pkgs/development/python-modules/python-songpal/default.nix index ba17dd81166d..7215bd73281a 100644 --- a/pkgs/development/python-modules/python-songpal/default.nix +++ b/pkgs/development/python-modules/python-songpal/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, fetchpatch , poetry-core , aiohttp , async-upnp-client @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "python-songpal"; - version = "0.13"; + version = "0.14.1"; format = "pyproject"; @@ -23,24 +22,9 @@ buildPythonPackage rec { owner = "rytilahti"; repo = "python-songpal"; rev = version; - sha256 = "124w6vfn992845k09bjv352havk8pg590b135m37h1x1m7fmbpwa"; + hash = "sha256-lLRAXoz95hSt1JcWbQ1g5xmvDOeUmeXPa9pCuJktaeY="; }; - patches = [ - # https://github.com/rytilahti/python-songpal/pull/90 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/rytilahti/python-songpal/commit/56b634790d94b2f9788d5af3d5cedff47f1e42c2.patch"; - sha256 = "0yc0mrb91ywk77nd4mxvyc0p2kjz2w1p395755a32ls30zw2bs27"; - }) - ]; - - postPatch = '' - # https://github.com/rytilahti/python-songpal/issues/91 - substituteInPlace pyproject.toml \ - --replace 'click = "^7"' 'click = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 939c4404d836..8d6ab3aeecd3 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.10"; + version = "13.11"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d2c555431821f4ace0c1b7ce12af41999f01b793b275dee131f1034d08c01e3e"; + sha256 = "sha256-uu/3BLqirD3BepRMAtqIgiitJY6Jvi5by9E6ilEC1XM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-trovo/default.nix b/pkgs/development/python-modules/python-trovo/default.nix new file mode 100644 index 000000000000..d7fa18cfba3e --- /dev/null +++ b/pkgs/development/python-modules/python-trovo/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "python-trovo"; + version = "0.1.5"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-JUJax9nk4NqpMMrbDmQhcy22GIqPha+K4tudQ98PvlE="; + }; + + propagatedBuildInputs = [ requests ]; + + # No tests found + doCheck = false; + + pythonImportsCheck = [ "trovoApi" ]; + + meta = with lib; { + description = "A Python wrapper for the Trovo API"; + homepage = "https://codeberg.org/wolfangaukang/python-trovo"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index d79f357e50e1..3a47e107df6e 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -3,17 +3,19 @@ , fetchFromGitHub , pytestCheckHook , six +, pytest-mypy }: buildPythonPackage rec { pname = "python-utils"; - version = "2.7.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "WoLpH"; repo = pname; rev = "v${version}"; - sha256 = "0gns9v5144cj03p7qbb3822scb6pwrlgr6niixpkynwqkcwjfg4c"; + sha256 = "sha256-+NgcVIDM9f2OKBpJNWlSyFxEONltPWJSWIu400/5RkQ= +"; }; # disable coverage and linting @@ -27,6 +29,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pytest-mypy pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-vlc/default.nix b/pkgs/development/python-modules/python-vlc/default.nix index 2690f8ea7ebe..de14a4010b65 100644 --- a/pkgs/development/python-modules/python-vlc/default.nix +++ b/pkgs/development/python-modules/python-vlc/default.nix @@ -4,15 +4,19 @@ , setuptools , libvlc , substituteAll +, pythonOlder }: buildPythonPackage rec { pname = "python-vlc"; - version = "3.0.12118"; + version = "3.0.16120"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Vm8vfDA/aACFHKzAFt8cbu7AlK1j4KSdh9udaYCU8fs="; + hash = "sha256-kvmP7giPcr1tBjs7MxLQvSmzfnrWXd6zpzAzIDAMKAc="; }; patches = [ @@ -27,9 +31,12 @@ buildPythonPackage rec { setuptools ]; - doCheck = false; # no tests + # Module has no tests + doCheck = false; - pythonImportsCheck = [ "vlc" ]; + pythonImportsCheck = [ + "vlc" + ]; meta = with lib; { description = "Python bindings for VLC, the cross-platform multimedia player and framework"; diff --git a/pkgs/development/python-modules/python-zbar/default.nix b/pkgs/development/python-modules/python-zbar/default.nix new file mode 100644 index 000000000000..04e89b664c49 --- /dev/null +++ b/pkgs/development/python-modules/python-zbar/default.nix @@ -0,0 +1,42 @@ +{ lib , buildPythonPackage , fetchFromGitHub , pillow , zbar , pytestCheckHook }: + +buildPythonPackage rec { + pname = "python-zbar"; + version = "0.23.90"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mchehab"; + repo = "zbar"; + rev = version; + sha256 = "sha256-FvV7TMc4JbOiRjWLka0IhtpGGqGm5fis7h870OmJw2U="; + }; + + propagatedBuildInputs = [ pillow ]; + + buildInputs = [ zbar ]; + + checkInputs = [ pytestCheckHook ]; + + preBuild = '' + cd python + ''; + + disabledTests = [ + #AssertionError: b'Y800' != 'Y800' + "test_format" + "test_new" + #Requires loading a recording device + #zbar.SystemError: + "test_processing" + ]; + + pythonImportsCheck = [ "zbar" ]; + + meta = with lib; { + description = "Python bindings for zbar"; + homepage = "https://github.com/mchehab/zbar"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index bf9cb69721c4..9500a42a916f 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pythonfinder"; - version = "1.2.9"; + version = "1.2.10"; format = "pyproject"; src = fetchFromGitHub { owner = "sarugaku"; repo = pname; rev = version; - sha256 = "sha256-tPMqVKbYwBRvb8/GyYNxO8lwJLcUUQyRoCoF5tg6rxs="; + sha256 = "sha256-4a648wOh+ASeocevFVh/4Fkq0CEhkFbt+2mWVmb9Bhw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pythonocc-core/default.nix b/pkgs/development/python-modules/pythonocc-core/default.nix index 9039c52a8a42..8a9433ec898f 100644 --- a/pkgs/development/python-modules/pythonocc-core/default.nix +++ b/pkgs/development/python-modules/pythonocc-core/default.nix @@ -1,15 +1,29 @@ -{ lib, stdenv, python, fetchFromGitHub, cmake, swig, opencascade, smesh, freetype, libGL, libGLU, libX11 -, Cocoa }: +{ lib, stdenv, python, fetchFromGitHub +, cmake +, Cocoa +, fontconfig +, freetype +, libGL +, libGLU +, libX11 +, libXext +, libXi +, libXmu +, opencascade-occt +, rapidjson +, smesh +, swig +}: stdenv.mkDerivation rec { pname = "pythonocc-core"; - version = "0.18.1"; + version = "7.5.1"; src = fetchFromGitHub { owner = "tpaviot"; repo = "pythonocc-core"; rev = version; - sha256 = "1jk4y7f75z9lyawffpfkr50qw5452xzi1imcdlw9pdvf4i0y86k3"; + sha256 = "1md6x60pnfq0qv4lsnmjv6i96mzdrcpxcgpb316i7wmv9b5ci01s"; }; postPatch = '' @@ -20,8 +34,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake swig ]; buildInputs = [ - python opencascade smesh - freetype libGL libGLU libX11 + python opencascade-occt smesh + freetype libGL libGLU libX11 libXext libXmu libXi + fontconfig rapidjson ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; cmakeFlags = [ diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 784f73f71811..e2c788f1b3eb 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -7,21 +7,22 @@ , graphql-subscription-manager , python-dateutil , pytz +, pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "pytibber"; - version = "0.22.0"; + version = "0.22.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - hash = "sha256-4eARNxVXtJtUC0oxym1kv5z+WkxgCHJZtN3MrIMA8+s="; + hash = "sha256-kzKY9ixsAkfee5En0IzYl5izeXq3xY/8bc5Kz/qkE7U="; }; propagatedBuildInputs = [ @@ -33,6 +34,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index f68200e99648..a94201b037d4 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytile"; - version = "2022.01.0"; + version = "2022.02.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-7iR2R/ESaBd29Xf6ZKMGY41/uU55tB62QOvT3dFSZaE="; + sha256 = "sha256-IGjM9yU/3EjO9sV1ZZUX7RUL/a6CcMPzANhVMTcbZGU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index 63991752a8ac..de75aa0ae8fb 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "0.8.5"; + version = "1.5.8"; disabled = isPy27; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "PyTorchLightning"; repo = pname; rev = version; - sha256 = "12zhq4pnfcwbgcx7cs99c751gp3w0ysaf5ykv2lv8f4i360w3r5a"; + sha256 = "161mz66l11z4350q93fmmq3x0jzbp5761lf4fx3yvz17qzp7ygkn"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 0c1ca751eb13..e9728b3d676c 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "0.9.99"; + version = "1.1.0"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "v${version}"; - sha256 = "1ahs2b7q3hxi6yv4g2fjy7mvl899h56dvlpc2r9301440qsgkdzr"; + sha256 = "0qvlxgdml22fzrs47yzqpfzak8lfdrzayvapawfz93cq8903h7qp"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix new file mode 100644 index 000000000000..46bd35b9cfb8 --- /dev/null +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -0,0 +1,55 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, numpy +, onnx +, pytestCheckHook +, pytorch +, typing-extensions +}: + +buildPythonPackage rec { + pname = "pytorch-pfn-extras"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "pfnet"; + repo = pname; + rev = "v${version}"; + sha256 = "1ch4vhz3zjanj5advqsj51yy7idrp8yvydvcg4ymwa3wsfjrx58g"; + }; + + propagatedBuildInputs = [ numpy pytorch typing-extensions ]; + + checkInputs = [ onnx pytestCheckHook ]; + + pythonImportsCheck = [ "pytorch_pfn_extras" ]; + + disabledTestPaths = [ + # Requires optuna which is currently (2022-02-16) marked as broken. + "tests/pytorch_pfn_extras_tests/test_config_types.py" + + # Requires CUDA access which is not possible in the nix environment. + "tests/pytorch_pfn_extras_tests/cuda_tests/test_allocator.py" + "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_batchnorm.py" + "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_conv.py" + "tests/pytorch_pfn_extras_tests/nn_tests/modules_tests/test_lazy_linear.py" + "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/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" + ]; + + meta = with lib; { + description = "Supplementary components to accelerate research and development in PyTorch"; + homepage = "https://github.com/pfnet/pytorch-pfn-extras"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix index df3e5da4c5ab..24533a08e475 100644 --- a/pkgs/development/python-modules/pytorch/bin.nix +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -4,6 +4,7 @@ , isPy37 , isPy38 , isPy39 +, isPy310 , python , addOpenGLRunpath , future @@ -19,7 +20,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "1.10.0"; + version = "1.11.0"; in buildPythonPackage { inherit version; @@ -28,7 +29,7 @@ in buildPythonPackage { format = "wheel"; - disabled = !(isPy37 || isPy38 || isPy39); + disabled = !(isPy37 || isPy38 || isPy39 || isPy310); src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix index 61f1e59d09e8..945af484a4af 100644 --- a/pkgs/development/python-modules/pytorch/binary-hashes.nix +++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -6,46 +6,61 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "1.10.0" = { + "1.11.0" = { x86_64-linux-37 = { - name = "torch-1.10.0-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-KpDbklee2HXSqgrWr1U1nj8EJqUjBWp7SbACw8xtKtg="; + name = "torch-1.11.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-9WMzRw2uo8lweLN2B+ADXMz3L8XDb9hFRuGkuNmUTys="; }; x86_64-linux-38 = { - name = "torch-1.10.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-zM3cMriUG9A+3in/ChzOLytRETpe4ju4uXkxasIRQYM="; + name = "torch-1.11.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-tqeZvbbuPZFOXmK920J21KECSMGvTy0hdzjl+e4nSFs="; }; x86_64-linux-39 = { - name = "torch-1.10.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-w8UJDh4b5cgDu7ZSvDoKzNH4hiXEyRfvpycNOg+wJOg="; + name = "torch-1.11.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-6RJrCl2VcEvuQKnQ7xy9gtjceGPkY4o3a+9wLf1lk3A="; + }; + x86_64-linux-310 = { + name = "torch-1.11.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torch-1.11.0%2Bcu113-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-powzZXpUYTHrm8ROKpjS+nBKr66GFGCwUbgoE4Usy0Q="; }; x86_64-darwin-37 = { - name = "torch-1.10.0-cp37-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp37-none-macosx_10_9_x86_64.whl"; - hash = "sha256-RJkFVUcIfX736KdU8JwsTxRwKXrj5UkDY9umbHVQGyE="; + name = "torch-1.11.0-cp37-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp37-none-macosx_10_9_x86_64.whl"; + hash = "sha256-aGCx0b8LsLZ6a9R/haDkyCW1GO6hO11hAZmdu8vVvAw="; }; x86_64-darwin-38 = { - name = "torch-1.10.0-cp38-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp38-none-macosx_10_9_x86_64.whl"; - hash = "sha256-rvevti6bF0tODl4eSkLjurO4SQpmjWZvYvfUUXVZ+/I="; + name = "torch-1.11.0-cp38-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp38-none-macosx_10_9_x86_64.whl"; + hash = "sha256-DMyFzQYiej7fgJ4seV/Vdiw9Too4tcn3RMbnz4QTYbs="; }; x86_64-darwin-39 = { - name = "torch-1.10.0-cp39-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp39-none-macosx_10_9_x86_64.whl"; - hash = "sha256-1u+HRwtE35lw6EVCVH1bp3ILuJYWYCRB31VaObEk4rw="; + name = "torch-1.11.0-cp39-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_10_9_x86_64.whl"; + hash = "sha256-UP2b+FxXjIccKPHLCs6d/GAkQBx/OZsXT7DzcImfRFQ="; + }; + x86_64-darwin-310 = { + name = "torch-1.11.0-cp310-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_10_9_x86_64.whl"; + hash = "sha256-UP2b+FxXjIccKPHLCs6d/GAkQBx/OZsXT7DzcImfRFQ="; }; aarch64-darwin-38 = { - name = "torch-1.10.0-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-1hhYJ7KFeAZTzdgdd6Cf3KdqWxkNWYbVUr4qXEQs+qQ="; + name = "torch-1.11.0-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-wVVOSddPGyw+cgLXcFa6LddGVDdYW6xkBitYD3FKROk="; }; aarch64-darwin-39 = { - name = "torch-1.10.0-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-7qZ17AHsS0oGVf0phPFmpco7kz2uatTrTlLrpwJtwXY="; + name = "torch-1.11.0-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-DkivZq11Xw+cXyZkAopBT1fEnWrcN+d+Bv4ABNpO22E="; + }; + aarch64-darwin-310 = { + name = "torch-1.11.0-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-1.11.0-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-DkivZq11Xw+cXyZkAopBT1fEnWrcN+d+Bv4ABNpO22E="; }; }; } diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 564087769acd..c370eaf6a942 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -117,7 +117,7 @@ let in buildPythonPackage rec { pname = "pytorch"; # Don't forget to update pytorch-bin to the same version. - version = "1.9.0"; + version = "1.10.2"; disabled = !isPy3k; @@ -132,7 +132,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-gZmEhV1zzfr/5T2uNfS+8knzyJIxnv2COWVyiAzU9jM="; + sha256 = "sha256-QcvoJqpZJXPSc9HLCJHetrp/hMESuC5kYl90d7Id0ZU="; }; patches = lib.optionals stdenv.isDarwin [ @@ -304,7 +304,7 @@ in buildPythonPackage rec { passthru = { inherit cudaSupport; cudaArchList = final_cudaArchList; - # At least for 1.9.0 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. + # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. blasProvider = blas.provider; }; diff --git a/pkgs/development/python-modules/pytorch/prefetch.sh b/pkgs/development/python-modules/pytorch/prefetch.sh index debf26bfa20a..31aae438dc56 100755 --- a/pkgs/development/python-modules/pytorch/prefetch.sh +++ b/pkgs/development/python-modules/pytorch/prefetch.sh @@ -5,12 +5,21 @@ set -eou pipefail version=$1 -bucket="https://download.pytorch.org/whl/cu113" +linux_bucket="https://download.pytorch.org/whl/cu113" +darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-37 $bucket/torch-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" - "x86_64-linux-38 $bucket/torch-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $bucket/torch-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-37 $linux_bucket/torch-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $linux_bucket/torch-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_bucket/torch-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_bucket/torch-${version}%2Bcu113-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-darwin-37 $darwin_bucket/torch-${version}-cp37-none-macosx_10_9_x86_64.whl torch-${version}-cp37-none-macosx_10_9_x86_64.whl" + "x86_64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_10_9_x86_64.whl torch-${version}-cp38-none-macosx_10_9_x86_64.whl" + "x86_64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_10_9_x86_64.whl torch-${version}-cp39-none-macosx_10_9_x86_64.whl" + "x86_64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_10_9_x86_64.whl torch-${version}-cp310-none-macosx_10_9_x86_64.whl" + "aarch64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_11_0_arm64.whl torch-${version}-cp38-none-macosx_11_0_arm64.whl" + "aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl" + "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl" ) hashfile="binary-hashes-$version.nix" diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index 1a2e6cc43ecb..e1c74b084613 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -9,15 +9,16 @@ buildPythonPackage rec { pname = "pytradfri"; - version = "8.0.1"; + version = "9.0.0"; + format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "pytradfri"; rev = version; - hash = "sha256-Wxz2P55lc7yJ1OXNXYWb25a+xtMs1sANNc7hE7nawHI="; + hash = "sha256-12ol+2CnoPfkxmDGJJAkoafHGpQuWC4lh0N7lSvx2DE="; }; propagatedBuildInputs = [ @@ -29,7 +30,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pytradfri" ]; + pythonImportsCheck = [ + "pytradfri" + ]; meta = with lib; { description = "Python package to communicate with the IKEA Trådfri ZigBee Gateway"; diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix index 20dbe0ba31c9..9156db165f41 100644 --- a/pkgs/development/python-modules/pytrends/default.nix +++ b/pkgs/development/python-modules/pytrends/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytrends"; - version = "4.7.3"; + version = "4.8.0"; disabled = isPy27; # python2 pandas is too old src = fetchPypi { inherit pname version; - sha256 = "8ccb06c57c31fa157b978a0d810de7718ee46583d28cf818250d45f36abd2faa"; + sha256 = "sha256-BLezPrbfwSCqictGQGiKi2MzNydrbdzqRP8Mf2tiQ9I="; }; propagatedBuildInputs = [ requests lxml pandas ]; diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index d2c8be795f1d..d00d26f1bae2 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,21 +7,30 @@ buildPythonPackage rec { pname = "pytube"; - version = "11.0.2"; + version = "12.0.0"; disabled = pythonOlder "3.6"; + format = "setuptools"; + src = fetchFromGitHub { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - hash = "sha256-3HrkhlwV8OLqbzC6QgddLB1fQxWbwCQ6STCgUXlr5So="; + hash = "sha256-1zoLd4J7aCR5omMpCZhlttWDu7mYyKCypH3JEB4VGXg="; }; checkInputs = [ pytestCheckHook ]; + disabledTestPaths = [ + "tests/test_extract.py" + "tests/test_query.py" + "tests/test_streams.py" + "tests/test_main.py" + ]; + pythonImportsCheck = [ "pytube" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix index 6fb7d5d47283..64b3d11e95a5 100644 --- a/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.6.5"; + version = "1.6.6"; format = "setuptools"; src = fetchPypi { pname = "PyTurboJPEG"; inherit version; - hash = "sha256-l3eeD/WGiqVQ2E92WBV8eTRPVdtUnP7wP4brE8PPTkw="; + hash = "sha256-gN0VNISogw2rTr58DuHLQ8VyOg6VE3X9T/j6fw0EdXw="; }; patches = [ diff --git a/pkgs/development/python-modules/pytwitchapi/default.nix b/pkgs/development/python-modules/pytwitchapi/default.nix deleted file mode 100644 index 27289a13d5d6..000000000000 --- a/pkgs/development/python-modules/pytwitchapi/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, aiohttp -, python-dateutil -, requests -, websockets -}: - -buildPythonPackage rec { - pname = "pytwitchapi"; - version = "2.5.1"; - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "Teekeks"; - repo = "pyTwitchAPI"; - rev = "v${version}"; - sha256 = "091p9yx0cc7aclj76s1n1jdzkypicy9b2mxgmk2fym5viqlgpbkk"; - }; - - propagatedBuildInputs = [ - aiohttp - python-dateutil - requests - websockets - ]; - - # Project has no tests. - doCheck = false; - - pythonImportsCheck = [ "twitchAPI" ]; - - meta = with lib; { - description = "Python implementation of the Twitch Helix API, its Webhook and PubSub"; - homepage = "https://github.com/Teekeks/pyTwitchAPI"; - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; - }; -} diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index aabf9cd5de52..89cd50f085f6 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, six, systemd, pytest, mock, hypothesis, docutils +, six, udev, pytest, mock, hypothesis, docutils }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace src/pyudev/_ctypeslib/utils.py \ - --replace "find_library(name)" "'${lib.getLib systemd}/lib/libudev.so'" + --replace "find_library(name)" "'${lib.getLib udev}/lib/libudev.so'" ''; checkInputs = [ pytest mock hypothesis docutils ]; diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 8d815ee1ce9f..09c2c1ca7a69 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.31.0"; + version = "2.31.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nuYWJ4nilbXa/1KOuGhc6rB7uXDE4+lcESNud4Ug+3Y="; + sha256 = "sha256-l4wF/I3wsA9nowIdLjNPUxCaTPBu5v5oPQ3oNbLh+/o="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/pyuptimerobot/default.nix b/pkgs/development/python-modules/pyuptimerobot/default.nix index 6334c3f64c08..601faccb37f7 100644 --- a/pkgs/development/python-modules/pyuptimerobot/default.nix +++ b/pkgs/development/python-modules/pyuptimerobot/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyuptimerobot"; - version = "21.11.0"; + version = "22.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "1nmmwp9m38b75lz51ypcj0qxnxm9wq4id5cggl0pn2rx6gwnbw9n"; + sha256 = "sha256-QZm8FlUm17Vv80hB3iai54QcVlhSrq2AvbdBaRWDyok="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyuseragents/default.nix b/pkgs/development/python-modules/pyuseragents/default.nix index ffa3a5302ae5..9ab48ebf59d4 100644 --- a/pkgs/development/python-modules/pyuseragents/default.nix +++ b/pkgs/development/python-modules/pyuseragents/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Giving you a random User-Agent Header"; homepage = "https://github.com/Animenosekai/useragents"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/pyvera/default.nix b/pkgs/development/python-modules/pyvera/default.nix index 70392eda7b1d..9a8ef3043abe 100644 --- a/pkgs/development/python-modules/pyvera/default.nix +++ b/pkgs/development/python-modules/pyvera/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvera"; - version = "0.3.14"; + version = "0.3.15"; format = "pyproject"; src = fetchFromGitHub { owner = "pavoni"; repo = pname; rev = version; - sha256 = "sha256-CuXsyHlRw5zqDrQfMT4BzHsmox8MLRKxFKwR5M0XoEM="; + sha256 = "sha256-1+xIqOogRUt+blX7AZSKIiU8lpR4AzKIIW/smCSft94="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix index 50a412768c06..96669c52634b 100644 --- a/pkgs/development/python-modules/pyvesync/default.nix +++ b/pkgs/development/python-modules/pyvesync/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "1.4.2"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-O5zt1FiCQAlCaGaiEyrannqZjm4oGq36d4Fa77ys+HE="; + sha256 = "sha256-+054tFirjMF3sGLRpTVCZ3V2KN627b57+fFl6GBMMcU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 7b8aef7ec30d..e3a810be9160 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.1.11508"; + version = "9.1.12332"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-FNCAvag0ErVjzgXqiwDnX80WnjUdnWHtcLYuanlj0ME="; + hash = "sha256-e1lruHgppQ8mJbTx6xsUDSkLCYQISqM9c1vsjdQU4eI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index a47a46c338a3..bd3daf7bfb0e 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.14.0"; + version = "2.16.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-+Rjs5PwsjcE8vsCS9gHmEj2Hy2OSH/YxNjYgjrBXHPk="; + sha256 = "sha256-fBqFvMb6/dg8PU2JYrXbOonXnS64d4ij81dRb30bVRc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index 71b9b064aaab..29b4d88fe73b 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyviz_comms"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "f4a7126f318fb6b964fef3f92fa55bc46b9218f62a8464a8b18e968b3087dbc0"; + sha256 = "sha256-uMncveAfOEeEP7TQTDs/TeeEkgxx5Eztnfu1YPbJIhg="; }; propagatedBuildInputs = [ param ]; diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index 1a78aefa6daf..10e07f4e22ab 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -2,25 +2,35 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder , pyyaml }: buildPythonPackage rec { pname = "pyvlx"; - version = "0.2.19"; + version = "0.2.20"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Julius2342"; repo = pname; rev = version; - sha256 = "031gp3sjagvmgdhfpdqlawva425ja1n3bmxk6jyn4zx54szj9zwf"; + sha256 = "1irjix9kr6qih84gii7k1a9c67n8133gpnmwfd09550jsqdmg006"; }; - propagatedBuildInputs = [ pyyaml ]; + propagatedBuildInputs = [ + pyyaml + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "pyvlx" ]; + pythonImportsCheck = [ + "pyvlx" + ]; meta = with lib; { description = "Python client to work with Velux units"; diff --git a/pkgs/development/python-modules/pywayland/default.nix b/pkgs/development/python-modules/pywayland/default.nix index f1dbd72cef0f..5be704233909 100644 --- a/pkgs/development/python-modules/pywayland/default.nix +++ b/pkgs/development/python-modules/pywayland/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pywayland"; - version = "0.4.9"; + version = "0.4.11"; src = fetchPypi { inherit pname version; - sha256 = "EJ/Ul1ZpIQa5Mw6UmkRi7GC+b+mCMqhto6EsfNjpCdg="; + sha256 = "coUNrPcHLBDamgKiZ08ysg2maQ2wLRSijfNRblKMIZk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix index 32a5c5d8abc3..a36f3a2ccfc2 100644 --- a/pkgs/development/python-modules/pyweatherflowrest/default.nix +++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyweatherflowrest"; - version = "1.0.7"; + version = "1.0.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "v${version}"; - sha256 = "17zas565jqvp0qrs8l589rm4f9xpyynhqk8lrqcx089w3rv0hh2p"; + sha256 = "1swyqdnvhwaigqhjn5a22gi8if4bl8alfrigln4qa0jl9z03kg09"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix index 1e2f8db96cd8..15545acf2f63 100644 --- a/pkgs/development/python-modules/pywemo/default.nix +++ b/pkgs/development/python-modules/pywemo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "0.7.0"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-NwhKrk5cQT7kk4VCr0BMQz0yTP/vuBA6MjTRuk2LM5Y="; + hash = "sha256-bGoqhrjoRKUGPBNfmr2XP+1HL5mdRi6XoCi0BdvY9x8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix index 16a72550ffd0..707a82054cba 100644 --- a/pkgs/development/python-modules/pywizlight/default.nix +++ b/pkgs/development/python-modules/pywizlight/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pywizlight"; - version = "0.4.16"; + version = "0.5.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sbidy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Da5hkmzGJtfqiDPV9X02opv54Ry6sGiSbDnej9a2QDA="; + sha256 = "sha256-UePrG49Q2tJq3f2QaW4BjbWHHif6cTFGdiO/DZfpMFA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index a1f466cfe67a..b4f23f71d748 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -18,18 +18,13 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.3"; + version = "0.15.11"; src = fetchPypi { inherit pname version; - sha256 = "sCHeiD6KugHZLtxcVcLggdHC1gqCxStuHy1065TbGiY="; + sha256 = "sha256-L+59uf3/wqWnmWpqm8RAyIEarbj2Sdwf1Pbweh/z9C8="; }; - # The XWayland detection uses some hard-coded FHS paths. Since we - # know wlroots was built with xwayland support, replace its - # detection with `return True`. - patches = [ ./xwayland.patch ]; - nativeBuildInputs = [ pkg-config ]; propagatedNativeBuildInputs = [ cffi ]; buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots ]; diff --git a/pkgs/development/python-modules/pywlroots/xwayland.patch b/pkgs/development/python-modules/pywlroots/xwayland.patch deleted file mode 100644 index f3aaecca2642..000000000000 --- a/pkgs/development/python-modules/pywlroots/xwayland.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/wlroots/ffi_build.py b/wlroots/ffi_build.py -index bb07ff8..f19efe3 100644 ---- a/wlroots/ffi_build.py -+++ b/wlroots/ffi_build.py -@@ -55,19 +55,7 @@ def has_xwayland() -> bool: - Check for XWayland headers. If present, wlroots was built with XWayland support, so - pywlroots can be too. - """ -- try: -- FFI().verify( -- "#include ", -- define_macros=[("WLR_USE_UNSTABLE", 1)], -- include_dirs=["/usr/include/pixman-1", include_dir.as_posix()], -- ) -- return True -- except VerificationError: -- print("If XWayland support is not required, ignore the above error message.") -- print( -- "If support is required, ensure wlroots was built with -Dxwayland=enabled." -- ) -- return False -+ return True - - - # backend.h diff --git a/pkgs/development/python-modules/pyxbe/default.nix b/pkgs/development/python-modules/pyxbe/default.nix index 4c101ccdc3fb..43cc501d80e5 100644 --- a/pkgs/development/python-modules/pyxbe/default.nix +++ b/pkgs/development/python-modules/pyxbe/default.nix @@ -2,17 +2,21 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyxbe"; - version = "unstable-2021-01-10"; + version = "0.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mborgerson"; repo = pname; - rev = "a7ae1bb21b02a57783831eb080c1edbafaad1d5d"; - sha256 = "1cp9a5f41z8j7bzip6nhka8qnxs12v75cdf80sk2nzgf1k15wi2p"; + rev = "v${version}"; + hash = "sha256-mHUmSSy/ygteJhRX6AbgZJ+c5MZMZcgNRoTOfxhV+XQ="; }; checkInputs = [ @@ -25,7 +29,9 @@ buildPythonPackage rec { --replace "'xbefiles'" "'tests/xbefiles'" ''; - pythonImportsCheck = [ "xbe" ]; + pythonImportsCheck = [ + "xbe" + ]; meta = with lib; { description = "Library to work with XBE files"; diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 2c0e893b9c50..10f78ab5e14b 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - pname = "PyYAML"; + pname = "pyyaml"; version = "6.0"; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/pyzbar/default.nix b/pkgs/development/python-modules/pyzbar/default.nix new file mode 100644 index 000000000000..4ba523f6b21a --- /dev/null +++ b/pkgs/development/python-modules/pyzbar/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchFromGitHub, numpy, pillow, zbar, pytestCheckHook }: + +buildPythonPackage rec { + pname = "pyzbar"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "NaturalHistoryMuseum"; + repo = "pyzbar"; + rev = "v${version}"; + sha256 = "8IZQY6qB4r1SUPItDlTDnVQuPs0I38K3yJ6LiPJuwbU="; + }; + + propagatedBuildInputs = [ zbar pillow numpy ]; + + checkInputs = [ pytestCheckHook ]; + + # find_library doesn't return an absolute path + # https://github.com/NixOS/nixpkgs/issues/7307 + postPatch = '' + substituteInPlace pyzbar/zbar_library.py \ + --replace "find_library('zbar')" "'${lib.getLib zbar}/lib/libzbar.so.0'" + ''; + + disabledTests = [ + # find_library has been replaced by a hardcoded path + # the test fails due to find_library not called + "test_found_non_windows" + "test_not_found_non_windows" + ]; + + pythonImportsCheck = [ "pyzbar" ]; + + meta = with lib; { + description = "Read one-dimensional barcodes and QR codes from Python using the zbar library."; + homepage = "https://github.com/NaturalHistoryMuseum/pyzbar"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 29fffb1473be..795b8460b5db 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "qcengine"; - version = "0.21.0"; + version = "0.23.0"; checkInputs = [ pytestCheckHook ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ZsPKvbaZ7BBZuOmzq12ism/HyWYcLlQHgZaTzmIsMq4="; + sha256 = "sha256-gDn0Nu6ALTr3KyZnYDSA6RE3S5JQj562FP2RI9U3Gxs="; }; doCheck = true; diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/pkgs/development/python-modules/qdarkstyle/default.nix index 6b9b94b603f4..6e3b6064fcb7 100644 --- a/pkgs/development/python-modules/qdarkstyle/default.nix +++ b/pkgs/development/python-modules/qdarkstyle/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "qdarkstyle"; - version = "2.8.1"; + version = "3.0.3"; src = fetchPypi { inherit version; pname = "QDarkStyle"; - sha256 = "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym"; + sha256 = "936d2d35b552f429803a985dbc17fc879a2f966faa9fbf8983896ccfa33e68f6"; }; # No tests available diff --git a/pkgs/development/python-modules/qiling/default.nix b/pkgs/development/python-modules/qiling/default.nix index 3576f5b73660..729954328140 100644 --- a/pkgs/development/python-modules/qiling/default.nix +++ b/pkgs/development/python-modules/qiling/default.nix @@ -8,18 +8,22 @@ , multiprocess , pefile , pyelftools +, pythonOlder , python-registry +, pyyaml , unicorn }: buildPythonPackage rec { pname = "qiling"; - version = "1.4.0"; + version = "1.4.2"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-xUoNHMyGN0G2itVcKLsk+7QKxZdguzyh6OZCqCHNB4Y="; + hash = "sha256-myUGzNP4bf90d2gY5ZlYbVlTG640dj/Qha8/aMydvuw="; }; propagatedBuildInputs = [ @@ -30,14 +34,10 @@ buildPythonPackage rec { pefile pyelftools python-registry + pyyaml unicorn ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pefile==2021.5.24" "pefile>=2021.5.24" - ''; - # Tests are broken (attempt to import a file that tells you not to import it, # amongst other things) doCheck = false; diff --git a/pkgs/development/python-modules/qimage2ndarray/default.nix b/pkgs/development/python-modules/qimage2ndarray/default.nix index 0bb9ed2199a2..431b5c9bfa10 100644 --- a/pkgs/development/python-modules/qimage2ndarray/default.nix +++ b/pkgs/development/python-modules/qimage2ndarray/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "qimage2ndarray"; - version = "1.8.3"; + version = "1.9.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b02bd2dc7de774f954544312ec1020cf2d7e03fdd23ec9eb79901da55ccb3365"; + sha256 = "sha256-p5B1xtDYRDxEIu6WmlQJ5E/QJUVxYEzOqHXGyV4/Veo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index b2e708d586f7..d7b195f1debf 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.9.1"; + version = "0.10.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - sha256 = "sha256-SAJjU2zYz6UabOPV1KI2JB7CbJfUJcjbPKbo6iiCk/g="; + sha256 = "sha256-COvJCj18qRNQJUXKrtlYJQGLjna44IgtNZeNVJJaIHg="; }; postPatch = '' @@ -88,9 +88,11 @@ buildPythonPackage rec { ]; # Slow tests disabledTests = [ - "test_clifford" # fails on cvxpy >= 1.1.15. https://github.com/Qiskit/qiskit-aer/pull/1318. Remove in future. "test_snapshot" # TODO: these ~30 tests fail on setup due to pytest fixture issues? "test_initialize_2" # TODO: simulations appear incorrect, off by >10%. + # These tests fail on cvxpy >= 1.1.15 + "test_clifford" + "test_approx_random" # these fail for some builds. Haven't been able to reproduce error locally. "test_kraus_gate_noise" diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix deleted file mode 100644 index 88365e0f8b70..000000000000 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ /dev/null @@ -1,185 +0,0 @@ -{ lib -, pythonOlder -, buildPythonPackage -, fetchFromGitHub -, cvxpy -, dlx -, docplex -, fastdtw -, h5py -, networkx -, numpy -, psutil -, qiskit-ignis -, qiskit-terra -, quandl -, scikit-learn -, yfinance - # Optional inputs -, withTorch ? false -, pytorch -, withPyscf ? false -, pyscf -, withScikitQuant ? false -, scikit-quant ? null -, withCplex ? false -, cplex ? null - # Check Inputs -, ddt -, pytestCheckHook -, pytest-timeout -, qiskit-aer -}: - -buildPythonPackage rec { - pname = "qiskit-aqua"; - version = "0.9.5"; - - disabled = pythonOlder "3.6"; - - # Pypi's tarball doesn't contain tests - src = fetchFromGitHub { - owner = "Qiskit"; - repo = "qiskit-aqua"; - rev = version; - sha256 = "sha256-7QmRwlbAVAR5KfM7tuObkb6+UgiuIm82iGWBuqfve08="; - }; - - # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. - propagatedBuildInputs = [ - cvxpy - docplex - dlx # Python Dancing Links package - fastdtw - h5py - networkx - numpy - psutil - qiskit-terra - qiskit-ignis - quandl - scikit-learn - yfinance - ] ++ lib.optionals (withTorch) [ pytorch ] - ++ lib.optionals (withPyscf) [ pyscf ] - ++ lib.optionals (withScikitQuant) [ scikit-quant ] - ++ lib.optionals (withCplex) [ cplex ]; - - # *** NOTE *** - # We make pyscf optional in this package, due to difficulties packaging it in Nix (test failures, complicated flags, etc). - # See nixpkgs#78772, nixpkgs#83447. You are welcome to try to package it yourself, - # or use the Nix User Repository version (https://github.com/drewrisinger/nur-packages). - # It can also be installed at runtime from the pip wheel. - # We disable appropriate tests below to allow building without pyscf installed - - postPatch = '' - # Because this is a legacy/final release, the maintainers restricted the maximum - # versions of all dependencies to the latest current version. That will not - # work with nixpkgs' rolling release/update system. - # Unlock all versions for compatibility - substituteInPlace setup.py --replace "<=" ">=" - sed -i 's/\(\w\+-*\w*\).*/\1/' requirements.txt - substituteInPlace requirements.txt --replace "dataclasses" "" - - # Add ImportWarning when running qiskit.chemistry (pyscf is a chemistry package) that pyscf is not included - echo -e "\nimport warnings\ntry: import pyscf;\nexcept ImportError:\n " \ - "warnings.warn('pyscf is not supported on Nixpkgs so some qiskit features will fail." \ - "You must install it yourself via pip or add it to your environment from the Nix User Repository." \ - "See https://github.com/NixOS/nixpkgs/pull/83447 for details', ImportWarning)\n" \ - >> qiskit/chemistry/__init__.py - - # Add ImportWarning when running qiskit.optimization that cplex (optimization package) is not included - echo -e "\nimport warnings\ntry: import cplex;\nexcept ImportError:\n " \ - "warnings.warn('cplex is not supported on Nixpkgs so some qiskit features will fail." \ - "You must install it yourself via pip or add it to your environment from the Nix User Repository." \ - "', ImportWarning)\n" \ - >> qiskit/optimization/__init__.py - ''; - - checkInputs = [ - pytestCheckHook - ddt - pytest-timeout - qiskit-aer - ]; - pythonImportsCheck = [ - "qiskit.aqua" - "qiskit.aqua.algorithms" - "qiskit.chemistry" - "qiskit.finance" - "qiskit.ml" - "qiskit.optimization" - ]; - pytestFlagsArray = [ - "--timeout=30" # limit test duration to 30 seconds. Some tests previously would run indefinitely - "--durations=10" - ]; - disabledTestPaths = lib.optionals (!withPyscf) [ - "test/chemistry/test_qeom_ee.py" - "test/chemistry/test_qeom_vqe.py" - "test/chemistry/test_vqe_uccsd_adapt.py" - "test/chemistry/test_bopes_sampler.py" - ]; - disabledTests = [ - # TODO: figure out why failing, only fail with upgrade to qiskit-terra > 0.16.1 & qiskit-aer > 0.7.2 - # In test.aqua.test_amplitude_estimation.TestSineIntegral - "test_confidence_intervals_1" - "test_statevector_1" - - # fails due to approximation error with latest qiskit-aer? - "test_application" - - # Fail on CI for some reason, not locally - "test_binary" - - # Online tests - "test_exchangedata" - "test_yahoo" - - # Disabling slow tests > 10 seconds - "TestVQE" - "TestOOVQE" - "TestVQC" - "TestQSVM" - "TestOptimizerAQGD" - "test_graph_partition_vqe" - "TestLookupRotation" - "_vqe" - "TestHHL" - "TestQGAN" - "test_evaluate_qasm_mode" - "test_measurement_error_mitigation_auto_refresh" - "test_wikipedia" - "test_shor_factoring_1__15___qasm_simulator____3__5__" - "test_readme_sample" - "test_ecev" - "test_expected_value" - "test_qubo_gas_int_paper_example" - "test_shor_no_factors_1_5" - "test_shor_no_factors_2_7" - "test_evolve_2___suzuki___1__3_" - "test_delta" - "test_swaprz" - "test_deprecated_algo_result" - "test_unsorted_grouping" - "test_ad_hoc_data" - "test_nft" - "test_oh" - "test_confidence_intervals_00001" - "test_eoh" - "test_qasm_5" - "test_uccsd_hf" - "test_lih" - "test_lih_freeze_core" - ] ++ lib.optionals (!withPyscf) [ - "test_validate" # test/chemistry/test_inputparser.py - ]; - - meta = with lib; { - description = "An extensible library of quantum computing algorithms"; - homepage = "https://github.com/QISKit/qiskit-aqua"; - changelog = "https://qiskit.org/documentation/release_notes.html"; - license = licenses.asl20; - maintainers = with maintainers; [ drewrisinger ]; - }; -} diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix index d4eaa58e7af9..1fc98361ad09 100644 --- a/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "qiskit-finance"; - version = "0.2.1"; + version = "0.3.1"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-fEhc/01j6iYYwS6mLle+TpX9j0DVn12oPUFamEecoAY="; + sha256 = "sha256-wnto3IqrJFAqIv6QAXe3BB9fvXQXe2fw/iUZe3+198M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 5b304bf38984..0c8f74cf66dd 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.18.1"; + version = "0.18.3"; disabled = pythonOlder "3.6"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "sha256-rySSCyI+62G7kL1ZRtjX1WeWj3LPXECvrlXAcIDINF4="; + sha256 = "1n1w1lnq2xw94hhhn6kdvw8dqlxk5fxwpm8ng31gxbp1s3qgni17"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index f7ebbee39f80..a8f45b73e490 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.6.0"; + version = "0.7.0"; disabled = pythonOlder "3.6"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-ignis"; rev = version; - hash = "sha256-L5fwCMsN03ojiDvKIyqsGfUnwej1P7bpyHlL6mu7nh0="; + hash = "sha256-5dsRKsz/nruWKuox/WJBghp2CWSDuYvax+G5ZxjZG4s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index a2006079c195..511bc0b2a0be 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.2.1"; + version = "0.3.0"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-2dfrkNZYSaXwiOCaRrPckq4BllANgc6BogyBcP0vosY="; + sha256 = "0jycs18apnwrksarpwpmp7scndyx91vnv6fchil4jyx4kym8mnf9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index 09941fcdd448..2693daa6ead0 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -16,11 +16,12 @@ , pytestCheckHook , ddt , pylatexenc +, qiskit-aer }: buildPythonPackage rec { pname = "qiskit-nature"; - version = "0.2.2"; + version = "0.3.1"; disabled = pythonOlder "3.6"; @@ -28,13 +29,9 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-nQbvH911Gt4KddG23qwmiXfRJTWwVEsrzPvuTQfy4FY="; + sha256 = "sha256-EkYppEOQGmRIxKC4ArXZb0b+p1gPGnP6AU8LbEbOpPo="; }; - postPatch = '' - substituteInPlace requirements.txt --replace "h5py<3.3" "h5py" - ''; - propagatedBuildInputs = [ h5py numpy @@ -49,30 +46,23 @@ buildPythonPackage rec { pytestCheckHook ddt pylatexenc + qiskit-aer ]; pythonImportsCheck = [ "qiskit_nature" ]; pytestFlagsArray = [ "--durations=10" - ] ++ lib.optionals (!withPyscf) [ - "--ignore=test/algorithms/excited_state_solvers/test_excited_states_eigensolver.py" ]; disabledTests = [ - # small math error < 0.05 (< 9e-6 %) - "test_vqe_uvccsd_factory" - # unsure of failure reason. Might be related to recent cvxpy update? - "test_two_qubit_reduction" - ] ++ lib.optionals (!withPyscf) [ - "test_h2_bopes_sampler" - "test_potential_interface" + "test_two_qubit_reduction" # unsure of failure reason. Might be related to recent cvxpy update? ]; meta = with lib; { description = "Software for developing quantum computing programs"; homepage = "https://qiskit.org"; - downloadPage = "https://github.com/QISKit/qiskit-optimization/releases"; + downloadPage = "https://github.com/QISKit/qiskit-nature/releases"; changelog = "https://qiskit.org/documentation/release_notes.html"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix index 5d9ae3d4375f..d2b87d9cfeaf 100644 --- a/pkgs/development/python-modules/qiskit-optimization/default.nix +++ b/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qiskit-optimization"; - version = "0.2.3"; + version = "0.3.1"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-y/j/cerzMAKVjehh1LUqYe1Juoa4lIxH2qS165S9img="; + sha256 = "sha256-6oqhM5sEu0id0qYrhdVyx0xXUvwxBgZSPvrlAnmtY5A="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index da31f86500fb..1a5aa516c52d 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -1,13 +1,10 @@ { lib -, stdenv , pythonOlder , buildPythonPackage , fetchFromGitHub # Python requirements , cython , dill -, fastjsonschema -, jsonschema , numpy , networkx , ply @@ -17,6 +14,7 @@ , retworkx , scipy , scikit-quant ? null +, stevedore , symengine , sympy , tweedledum @@ -56,23 +54,21 @@ in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.18.3"; + version = "0.19.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "Qiskit"; + owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-w/EnkdlC1hvmLqm4I8ajEYADxqMYGdHKrySLcb/yWGs="; + sha256 = "sha256-P2QTdt1H9I5T/ONNoo7XEVnoHweOdq3p2NH3l3/yAn4="; }; nativeBuildInputs = [ cython ]; propagatedBuildInputs = [ dill - fastjsonschema - jsonschema numpy networkx ply @@ -82,6 +78,7 @@ buildPythonPackage rec { retworkx scipy scikit-quant + stevedore symengine sympy tweedledum @@ -112,6 +109,9 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ "--durations=10" ]; disabledTests = [ + "TestUnitarySynthesisPlugin" # uses unittest mocks for transpiler.run(), seems incompatible somehow w/ pytest infrastructure + "test_copy" # assertNotIn doesn't seem to work as expected w/ pytest vs unittest + # Flaky tests "test_pulse_limits" # Fails on GitHub Actions, probably due to minor floating point arithmetic error. "test_cx_equivalence" # Fails due to flaky test @@ -154,6 +154,17 @@ buildPythonPackage rec { "test_sample_counts_memory_superposition" "test_piecewise_polynomial_function" "test_vqe_qasm" + "test_piecewise_chebyshev_mutability" + "test_bit_conditional_no_cregbundle" + "test_gradient_wrapper2" + "test_two_qubit_weyl_decomposition_abmb" + "test_two_qubit_weyl_decomposition_abb" + "test_two_qubit_weyl_decomposition_aac" + "test_aqc" + "test_gradient" + "test_piecewise_polynomial_rotations_mutability" + "test_confidence_intervals_1" + "test_trotter_from_bound" ]; # Moves tests to $PACKAGEDIR/test. They can't be run from /build because of finding @@ -163,7 +174,6 @@ buildPythonPackage rec { echo "Moving Qiskit test files to package directory" cp -r $TMP/$sourceRoot/test $PACKAGEDIR cp -r $TMP/$sourceRoot/examples $PACKAGEDIR - cp -r $TMP/$sourceRoot/qiskit/schemas/examples $PACKAGEDIR/qiskit/schemas/ # run pytest from Nix's $out path pushd $PACKAGEDIR diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 9d050606006c..aa81ba00a8ca 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub # Python Inputs , qiskit-aer -, qiskit-aqua , qiskit-ibmq-provider , qiskit-ignis , qiskit-terra @@ -29,7 +28,7 @@ in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.32.1"; + version = "0.34.2"; disabled = pythonOlder "3.6"; @@ -37,12 +36,11 @@ buildPythonPackage rec { owner = "qiskit"; repo = "qiskit"; rev = version; - sha256 = "sha256-0L4TlolvL1akHhWSJ0GRQ/Cu/rZ+Es00jjNM5Ho2uEA="; + sha256 = "sha256-weL65IQs6vbjJiPJdaizU0ST6u9qDYb0LhTwC6yAdhY="; }; propagatedBuildInputs = [ qiskit-aer - qiskit-aqua qiskit-ibmq-provider qiskit-ignis qiskit-terra @@ -52,7 +50,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "qiskit" - "qiskit.aqua" "qiskit.circuit" "qiskit.ignis" "qiskit.providers.aer" diff --git a/pkgs/development/python-modules/qt5reactor/default.nix b/pkgs/development/python-modules/qt5reactor/default.nix new file mode 100644 index 000000000000..a85f2ad6892a --- /dev/null +++ b/pkgs/development/python-modules/qt5reactor/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyqt5 +, twisted +, pytest-twisted +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "qt5reactor"; + version = "0.6.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "c3470a8a25d9a339f9ca6243502a9b2277f181d772b7acbff551d5bc363b7572"; + }; + + propagatedBuildInputs = [ + pyqt5 + twisted + ]; + + checkInputs = [ + pytest-twisted + pytestCheckHook + ]; + + pythonImportsCheck = [ "qt5reactor" ]; + + meta = with lib; { + description = "Twisted Qt Integration"; + homepage = "https://github.com/twisted/qt5reactor"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 4bcb536ad826..6c574c47e755 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -1,24 +1,52 @@ -{ lib, buildPythonPackage, fetchPypi, pyside, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# propagates +, packaging + +# tests +, pyqt5 +, pyside +, pytestCheckHook +}: buildPythonPackage rec { pname = "QtPy"; - version = "1.11.3"; + version = "2.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d427addd37386a8d786db81864a5536700861d95bf085cb31d1bea855d699557"; + sha256 = "13zbhnl2rm30xafwrzfwdb4mjp7gk4s9h2xagbf83pnjzczhgzdd"; }; - # no concrete propagatedBuildInputs as multiple backends are supposed - checkInputs = [ pyside pytest ]; + propagatedBuildInputs = [ + packaging + ]; - doCheck = false; # require X - checkPhase = '' - py.test qtpy/tests - ''; + doCheck = false; # ModuleNotFoundError: No module named 'PyQt5.QtConnectivity' + checkInputs = [ + pyside + (pyqt5.override { + withConnectivity = true; + withMultimedia = true; + withWebKit = true; + withWebSockets = true; + }) + pytestCheckHook + ]; + + disabledTestPaths = [ + # Fatal error in python on x86_64 + "qtpy/tests/test_uic.py" + ]; meta = with lib; { - description = "Abstraction layer for PyQt5/PyQt4/PySide2/PySide"; + description = "Abstraction layer for PyQt5/PyQt6/PySide2/PySide6"; homepage = "https://github.com/spyder-ide/qtpy"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 28e08eade43d..48cc70d5f2af 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "quantities"; - version = "0.12.5"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "67546963cb2a519b1a4aa43d132ef754360268e5d551b43dd1716903d99812f0"; + sha256 = "0fde20115410de21cefa786f3aeae69c1b51bb19ee492190324c1da705e61a81"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 38cf79e19049..8d19e360ca4d 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "qutip"; - version = "4.6.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "04g7ixq1yrrid4lliqbcamnzyw5r0fjbl8ipklps234hvsjfwmxb"; + sha256 = "sha256-11K7Tl7PE98nM2vGsa+OKIJYu0Wmv8dT700PDt9RRVk="; }; # QuTiP says it needs specific (old) Numpy versions. We overwrite them here diff --git a/pkgs/development/python-modules/radios/default.nix b/pkgs/development/python-modules/radios/default.nix new file mode 100644 index 000000000000..c5b4413540c4 --- /dev/null +++ b/pkgs/development/python-modules/radios/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, aiodns +, aiohttp +, awesomeversion +, backoff +, cachetools +, pycountry +, pydantic +, yarl +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "radios"; + version = "0.1.1"; + + disabled = pythonOlder "3.9"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-radios"; + rev = "v${version}"; + hash = "sha256-NCBch9MCWVD6ez0sIUph8rwOOzEMZtwC4atXJe53xZM="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiodns + aiohttp + awesomeversion + backoff + cachetools + pycountry + pydantic + yarl + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "radios" ]; + + meta = with lib; { + description = "Asynchronous Python client for the Radio Browser API"; + homepage = "https://github.com/frenck/python-radios"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix index ac01b853c873..f75e5cc19ee5 100644 --- a/pkgs/development/python-modules/radish-bdd/default.nix +++ b/pkgs/development/python-modules/radish-bdd/default.nix @@ -6,7 +6,7 @@ , fetchFromGitHub , freezegun , humanize -, lark-parser +, lark , parse-type , pysingleton , pytestCheckHook @@ -29,7 +29,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - lark-parser + lark click colorful tag-expressions diff --git a/pkgs/development/python-modules/railroad-diagrams/default.nix b/pkgs/development/python-modules/railroad-diagrams/default.nix new file mode 100644 index 000000000000..57c07e0dc48b --- /dev/null +++ b/pkgs/development/python-modules/railroad-diagrams/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "railroad-diagrams"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "8a1ec227666be2000e76794aa740f77987f1586077aae4d090d2633b3064c976"; + }; + + # this is a dependency of pyparsing, which is a dependency of pytest + doCheck = false; + + pythonImportsCheck = [ "railroad" ]; + + meta = with lib; { + description = "Generate SVG railroad syntax diagrams, like on JSON.org"; + homepage = "https://github.com/tabatkins/railroad-diagrams"; + license = licenses.cc0; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 1ec6448d74c1..27d6d498c347 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,23 +1,24 @@ { buildPythonPackage, lib, fetchFromGitHub, isPy3k , cython, setuptools , numpy, affine, attrs, cligj, click-plugins, snuggs, gdal -, pytest, pytest-cov, packaging, hypothesis, boto3, mock +, pytest, pythonOlder, packaging, hypothesis, boto3 , certifi, shapely }: buildPythonPackage rec { pname = "rasterio"; - version = "1.2.6"; + version = "1.2.10"; + disabled = pythonOlder "3.6"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "sha256-rf2qdUhbS4Z2+mvlN1RzZvlgTgjqiBoQzry4z5QLSUc="; + sha256 = "sha256-xVGwQfQvxsqYihUYXENJAz9Qp9xBkhsGc/RheRTJxgo="; }; - checkInputs = [ boto3 pytest pytest-cov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock; + checkInputs = [ boto3 pytest packaging hypothesis shapely ]; nativeBuildInputs = [ cython gdal ]; propagatedBuildInputs = [ certifi gdal numpy attrs affine cligj click-plugins snuggs setuptools ]; diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 2ffe190a4720..73f170b90b1b 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , html5lib , isodate , networkx @@ -16,14 +16,16 @@ buildPythonPackage rec { pname = "rdflib"; - version = "6.0.2"; + version = "6.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-YTauBWABR07ir/X8W5VuYqEcOpxmuw89nAqqX7tWhU4="; + src = fetchFromGitHub { + owner = "RDFLib"; + repo = pname; + rev = version; + hash = "sha256:1ih7vx4i16np1p8ig5faw74apmbm7kgyj9alya521yvzid6d7pzd"; }; propagatedBuildInputs = [ @@ -41,6 +43,12 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # requires network access + "--deselect rdflib/__init__.py::rdflib" + "--deselect test/jsonld/test_onedotone.py::test_suite" + ]; + disabledTests = [ # Requires network access "api_key" diff --git a/pkgs/development/python-modules/readability-lxml/default.nix b/pkgs/development/python-modules/readability-lxml/default.nix new file mode 100644 index 000000000000..e012bf75fe58 --- /dev/null +++ b/pkgs/development/python-modules/readability-lxml/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, chardet +, cssselect +, lxml +}: + +buildPythonPackage rec { + pname = "readability-lxml"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-5R/qVrWQmq+IbTB9SOeeCWKTJVr6Vnt9CLypTSWxpOE="; + }; + + propagatedBuildInputs = [ chardet cssselect lxml ]; + + postPatch = '' + substituteInPlace setup.py --replace 'sys.platform == "darwin"' "False" + ''; + + doCheck = false; + + meta = with lib; { + description = "Fast python port of arc90's readability tool"; + homepage = "https://github.com/buriy/python-readability"; + license = licenses.apsl20; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index c83a2bba1cd6..81c489bd8c09 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -1,19 +1,41 @@ -{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytest-cov, pexpect }: +{ lib +, buildPythonPackage +, fetchFromGitHub + +# native +, flake8 + +# tests +, pytestCheckHook +, pexpect +}: buildPythonPackage rec { pname = "readchar"; - version = "2.0.0"; + version = "3.0.5"; + format = "setuptools"; # Don't use wheels on PyPI src = fetchFromGitHub { owner = "magmax"; repo = "python-${pname}"; - rev = version; - sha256 = "0j1vj4f2j8x5f40rs6h8qplklcxcdbvkkvjpkpmr1xagw05i12bm"; + rev = "v${version}"; + sha256 = "sha256:01bjw3ipdzxq1ijn9354nlya625i26ri7jac1dnlj1d1gdd8m5lx"; }; - nativeBuildInputs = [ flake8 ]; - checkInputs = [ pytest pytest-cov pexpect ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov readchar" "" + ''; + + nativeBuildInputs = [ + flake8 + ]; + + checkInputs = [ + pytestCheckHook + pexpect + ]; meta = with lib; { homepage = "https://github.com/magmax/python-readchar"; diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index f64faaf82ca7..122c4fdf6653 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "readme-renderer"; - version = "32.0"; + version = "34.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "readme_renderer"; inherit version; - sha256 = "sha256-tRK+r6Z5gmDH1a8+Gx8Jfli/zZpXXafE3dXgN0kKW4U="; + sha256 = "sha256-37TRfyFwbRRfdHPgthyiRbpY6BDPmyIJpII5Z3+C5bA="; }; propagatedBuildInputs = [ @@ -40,6 +40,11 @@ buildPythonPackage rec { --replace "cmarkgfm>=0.5.0,<0.7.0" "cmarkgfm>=0.5.0,<1" ''; + disabledTests = [ + # https://github.com/pypa/readme_renderer/issues/221 + "test_GFM_" + ]; + pythonImportsCheck = [ "readme_renderer" ]; diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 18e9e9e6c1a5..50d29c1923d2 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,15 +14,16 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2021.10.0"; + version = "2022.01.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-vMXDnnIQiRuyLvem1JKop6FJ0fhwR8xP0276PdZi/QI="; + sha256 = "sha256-TPiz3d1GbcIWCKRz3Hq4JU9+df/Fw4dUXQkIM6QO1Fs="; }; nativeBuildInputs = [ @@ -42,7 +43,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "regenmaschine" ]; + disabledTestPaths = [ + # Examples are prefix with test_ + "examples/" + ]; + + pythonImportsCheck = [ + "regenmaschine" + ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index b96c7ca89956..86e591eaf14f 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -2,25 +2,28 @@ , buildPythonPackage , fetchPypi , python -, isPy27 +, pythonOlder }: buildPythonPackage rec { pname = "regex"; - version = "2021.11.10"; + version = "2022.1.18"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-80HuLfCZm/33qV5EgHXv/g2yEqWTh94acGkOSssD1MY="; + hash = "sha256-l/MtwDqAVKTEpatddh7Uhh6CiywgD+vU5GhXBppIORY="; }; - # Sources for different Python releases are located in same folder checkPhase = '' - rm -r ${if !isPy27 then "regex_2" else "regex_3"} ${python.interpreter} -m unittest ''; - pythonImportsCheck = [ "regex" ]; + pythonImportsCheck = [ + "regex" + ]; meta = with lib; { description = "Alternative regular expression module, to replace re"; diff --git a/pkgs/development/python-modules/releases/default.nix b/pkgs/development/python-modules/releases/default.nix new file mode 100644 index 000000000000..9c1fc34cae46 --- /dev/null +++ b/pkgs/development/python-modules/releases/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, semantic-version +, sphinx +}: + +buildPythonPackage rec { + pname = "releases"; + version = "1.6.3"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bitprophet"; + repo = pname; + rev = version; + hash = "sha256-XX2e6bjBNMun31h0sNJ9ieZE01U+PhA5JYYNOuMgD20="; + }; + + postPatch = '' + substituteInPlace setup.py --replace "semantic_version<2.7" "semantic_version" + ''; + + propagatedBuildInputs = [ semantic-version sphinx ]; + + # Test suite doesn't run. See https://github.com/bitprophet/releases/issues/95. + doCheck = false; + + pythonImportsCheck = [ "releases" ]; + + meta = with lib; { + description = "A Sphinx extension for changelog manipulation"; + homepage = "https://github.com/bitprophet/releases"; + license = licenses.bsd2; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/remarshal/default.nix b/pkgs/development/python-modules/remarshal/default.nix index fc888c2379ee..99c868eb0b80 100644 --- a/pkgs/development/python-modules/remarshal/default.nix +++ b/pkgs/development/python-modules/remarshal/default.nix @@ -31,7 +31,8 @@ buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ --replace "poetry.masonry.api" "poetry.core.masonry.api" \ - --replace 'PyYAML = "^5.3"' 'PyYAML = "*"' + --replace 'PyYAML = "^5.3"' 'PyYAML = "*"' \ + --replace 'tomlkit = "^0.7"' 'tomlkit = "*"' ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index eef2459c259d..2312078c5fc6 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.1.6"; + version = "0.1.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "v${version}"; - sha256 = "0v9a8p0ynikqzg7vvinvik5gjvsc5nrfqkq528mhcw7y4hmj8ndm"; + sha256 = "sha256-PXycRRUrKIkU/MgQbW4BjvBhpEi6InY5jZHPw4Nyv2s="; }; nativeBuildInputs = [ @@ -47,7 +47,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "renault_api" ]; + pythonImportsCheck = [ + "renault_api" + ]; meta = with lib; { description = "Python library to interact with the Renault API"; diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index a742c422ee90..464bbd78515c 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -1,17 +1,18 @@ { lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , cython }: -buildPythonPackage { +buildPythonPackage rec { pname = "rencode"; - version = "git20150810"; + version = "1.0.6"; - src = fetchgit { - url = "https://github.com/aresch/rencode"; - rev = "b45e04abdca0dea36e383a8199783269f186c99e"; - sha256 = "b4bd82852d4220e8a9493d3cfaecbc57b1325708a2d48c0f8acf262edb10dc40"; + src = fetchFromGitHub { + owner = "aresch"; + repo = "rencode"; + rev = "v${version}"; + sha256 = "sha256-PGjjrZuoGYSPMNqXG1KXoZnOoWIe4g6s056jFhqrJ60="; }; buildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/reolink/default.nix b/pkgs/development/python-modules/reolink/default.nix index 71f94d489aa1..0b5d78358199 100644 --- a/pkgs/development/python-modules/reolink/default.nix +++ b/pkgs/development/python-modules/reolink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink"; - version = "0.56"; + version = "0.60"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fwestenberg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ld1KDWweaG7y7EPN6Y19PzQRGCIFAPEb6AmlXXbjgCU="; + sha256 = "sha256-4yk05obra0icWHPXaJ+Wj+xxDRkVYg/VsrXTQUdHJIc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/reorder-python-imports/default.nix b/pkgs/development/python-modules/reorder-python-imports/default.nix new file mode 100644 index 000000000000..860188eba606 --- /dev/null +++ b/pkgs/development/python-modules/reorder-python-imports/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, aspy-refactor-imports +}: + +buildPythonPackage rec { + pname = "reorder-python-imports"; + version = "3.0.1"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "asottile"; + repo = "reorder_python_imports"; + rev = "v${version}"; + sha256 = "1bdKM1sUhpZHy03DdoTzpt1iGm1t1nWnuPyTgl3KhCY="; + }; + + propagatedBuildInputs = [ aspy-refactor-imports ]; + + pythonImportsCheck = [ + "reorder_python_imports" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # prints an explanation about PYTHONPATH first + # and therefore fails the assertion + disabledTests = [ + "test_success_messages_are_printed_on_stderr" + ]; + + meta = with lib; { + description = "Tool for automatically reordering python imports"; + homepage = "https://github.com/asottile/reorder_python_imports"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 9fac4f0c2410..82d84dc26a97 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.6.3"; + version = "3.6.5"; src = fetchPypi { inherit pname version; - sha256 = "be4f05230eb17b9c9c61a180ab0c89c30112da2823c77807a2a5ddba19365865"; + sha256 = "d8fe27ad312671c9347cf5997f7c1017833fac17233f33296281ba9fa0de189a"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/repoze_who/default.nix b/pkgs/development/python-modules/repoze_who/default.nix index 1b33bb6954bf..47bb842cc875 100644 --- a/pkgs/development/python-modules/repoze_who/default.nix +++ b/pkgs/development/python-modules/repoze_who/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "repoze.who"; - version = "2.4"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "cf97450de3c8eb5c03b4037be75b018db91befab1094204e452a0b1c0f7a94a6"; + sha256 = "sha256-ikybkmi0/w7dkG6Xwu7XzoPrn2LkJQv+A7zbum0xojc="; }; propagatedBuildInputs = [ zope_interface webob ]; diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index fa97942e226f..d2de7dff212f 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -1,30 +1,46 @@ -{ lib, buildPythonPackage, fetchPypi, python, requests, six }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, pytestCheckHook +, python +, pythonOlder +, requests +, six +}: -with lib; buildPythonPackage rec { pname = "requests-aws4auth"; - version = "1.1.1"; + version = "1.1.2"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "c0883346ce30b5018903a67da88df72f73ff06e1a320845bba9cd85e811ba0ba"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tedder"; + repo = pname; + rev = "v${version}"; + hash = "sha256-/SqU/ojP9I4JXzR0c5tLzxx9UyNaVsON7LG/dbdeiH0="; }; - propagatedBuildInputs = [ requests six ]; + propagatedBuildInputs = [ + httpx + requests + six + ]; - # pypi package no longer contains tests - doCheck = false; - checkPhase = '' - cd requests_aws4auth - ${python.interpreter} test/requests_aws4auth_test.py - ''; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "requests_aws4auth" ]; + pythonImportsCheck = [ + "requests_aws4auth" + ]; - meta = { - description = "Amazon Web Services version 4 authentication for the Python Requests library."; + meta = with lib; { + description = "Amazon Web Services version 4 authentication for the Python Requests library"; homepage = "https://github.com/sam-washington/requests-aws4auth"; license = licenses.mit; - maintainers = [ maintainers.basvandijk ]; + maintainers = with maintainers; [ basvandijk ]; }; } diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index f095cf00a28c..6f11559aad4c 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.9.0"; + version = "0.9.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - sha256 = "0gz6fyc6lgbab9k92cihrp3711r1wcp4xhs25qp176zbzgccbj43"; + hash = "sha256-9eA2fx+j6WLbEkLaemwEuoWLUWlS0iF5AkR2YienN5g="; }; nativeBuildInputs = [ @@ -55,6 +55,10 @@ buildPythonPackage rec { timeout-decorator ]; + preCheck = '' + export HOME=$(mktemp -d); + ''; + pytestFlagsArray = [ # Integration tests require local DBs "tests/unit" diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix index 374627a1bb9a..d8cd9d81c94d 100644 --- a/pkgs/development/python-modules/requests-file/default.nix +++ b/pkgs/development/python-modules/requests-file/default.nix @@ -1,22 +1,38 @@ -{ lib, fetchPypi, buildPythonPackage, pytestCheckHook, requests, six }: +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +, requests +, six +}: buildPythonPackage rec { - pname = "requests-file"; + pname = "requests-file"; version = "1.5.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "07d74208d3389d01c38ab89ef403af0cfec63957d53a0081d8eca738d0247d8e"; + hash = "sha256-B9dCCNM4nQHDirie9AOvDP7GOVfVOgCB2OynONAkfY4="; }; - propagatedBuildInputs = [ requests six ]; + propagatedBuildInputs = [ + requests + six + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - meta = { - homepage = "https://github.com/dashea/requests-file"; + pythonImportsCheck = [ + "requests_file" + ]; + + meta = with lib; { description = "Transport adapter for fetching file:// URLs with the requests python library"; - license = lib.licenses.asl20; + homepage = "https://github.com/dashea/requests-file"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index 7a27055aba2a..c51e24e0ac9d 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "requests-http-signature"; version = "0.2.0"; + format = "setuptools"; - # .pem files for tests aren't present on PyPI src = fetchFromGitHub { owner = "pyauth"; repo = pname; rev = "v${version}"; - sha256 = "1jsplqrxadjsc86f0kb6dgpblgwplxrpi0ql1a714w8pbbz4z3h7"; + hash = "sha256-B45P/loXcRKOChSDeHOnlz+67mtmTeAMYlo21TOmV8s="; }; propagatedBuildInputs = [ @@ -27,17 +27,21 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test/test.py" ]; + pytestFlagsArray = [ + "test/test.py" + ]; disabledTests = [ # Test require network access "test_readme_example" ]; - pythonImportsCheck = [ "requests_http_signature" ]; + pythonImportsCheck = [ + "requests_http_signature" + ]; meta = with lib; { - description = "A Requests auth module for HTTP Signature"; + description = "Requests authentication module for HTTP Signature"; homepage = "https://github.com/kislyuk/requests-http-signature"; license = licenses.asl20; maintainers = with maintainers; [ mmai ]; diff --git a/pkgs/development/python-modules/requests-kerberos/default.nix b/pkgs/development/python-modules/requests-kerberos/default.nix index 40bbb1aa6cb1..3a1382061bd7 100644 --- a/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/pkgs/development/python-modules/requests-kerberos/default.nix @@ -1,33 +1,29 @@ { lib -, fetchFromGitHub , buildPythonPackage , cryptography -, requests +, fetchFromGitHub , pykerberos , pyspnego -, pytestCheckHook , pytest-mock -, mock +, pytestCheckHook +, pythonOlder +, requests }: buildPythonPackage rec { pname = "requests-kerberos"; version = "0.14.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; - # tests are not present in the PyPI version src = fetchFromGitHub { owner = "requests"; repo = pname; rev = "v${version}"; - sha256 = "0s30pcnlir3j2jmf7yh065f294cf3x0x5i3ldskn8mm0a3657mv3"; + hash = "sha256-Y9dTzFCgVmSnbnTE0kEfjpEkXDEA+uOqFHLkSC27YGg="; }; - # avoid needing to package krb5 - postPatch = '' - substituteInPlace setup.py \ - --replace "pyspnego[kerberos]" "pyspnego" - ''; - propagatedBuildInputs = [ cryptography requests @@ -36,12 +32,19 @@ buildPythonPackage rec { ]; checkInputs = [ - mock pytestCheckHook pytest-mock ]; - pythonImportsCheck = [ "requests_kerberos" ]; + # avoid needing to package krb5 + postPatch = '' + substituteInPlace setup.py \ + --replace "pyspnego[kerberos]" "pyspnego" + ''; + + pythonImportsCheck = [ + "requests_kerberos" + ]; meta = with lib; { description = "An authentication handler for using Kerberos with Python Requests"; diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix index 946e406c8bf6..57f4d5787c67 100644 --- a/pkgs/development/python-modules/requests-unixsocket/default.nix +++ b/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -9,26 +9,35 @@ buildPythonPackage rec { pname = "requests-unixsocket"; - version = "0.2.0"; + version = "0.3.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "9e5c1a20afc3cf786197ae59c79bcdb0e7565f218f27df5f891307ee8817c1ea"; + hash = "sha256-KDBCg+qTV9Rf/1itWxHkdwjPv1gGgXqlmyo2Mijulx4="; }; - nativeBuildInputs = [ pbr ]; - propagatedBuildInputs = [ requests ]; + nativeBuildInputs = [ + pbr + ]; - checkInputs = [ pytestCheckHook waitress ]; + propagatedBuildInputs = [ + requests + ]; - preCheck = '' - rm pytest.ini - ''; + checkInputs = [ + pytestCheckHook + waitress + ]; + + pythonImportsCheck = [ + "requests_unixsocket" + ]; meta = with lib; { description = "Use requests to talk HTTP via a UNIX domain socket"; homepage = "https://github.com/msabramo/requests-unixsocket"; license = licenses.asl20; - maintainers = [ maintainers.catern ]; + maintainers = with maintainers; [ catern ]; }; } diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 8ba7aef46074..f5b021801f41 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -7,22 +7,23 @@ , charset-normalizer , fetchPypi , idna +, isPy27 +, isPy3k +, pysocks , pytest-mock , pytest-xdist , pytestCheckHook -, urllib3 -, isPy27 -, isPy3k , trustme +, urllib3 }: buildPythonPackage rec { pname = "requests"; - version = "2.26.0"; + version = "2.27.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c="; + hash = "sha256-aNfFb9WomZiHco7zBKbRLtx7508c+kdxT8i0FFJcmmE="; }; patches = [ @@ -32,7 +33,8 @@ buildPythonPackage rec { postPatch = '' # Use latest idna - substituteInPlace setup.py --replace ",<3" "" + substituteInPlace setup.py \ + --replace ",<3" "" ''; propagatedBuildInputs = [ @@ -48,6 +50,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pysocks pytest-mock pytest-xdist pytestCheckHook @@ -73,11 +76,13 @@ buildPythonPackage rec { "TestTimeout" ]; - pythonImportsCheck = [ "requests" ]; + pythonImportsCheck = [ + "requests" + ]; meta = with lib; { - description = "Simple HTTP library for Python"; - homepage = "http://docs.python-requests.org/en/latest/"; + description = "HTTP library for Python"; + homepage = "http://docs.python-requests.org/"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/requirements-parser/default.nix b/pkgs/development/python-modules/requirements-parser/default.nix index 71cb33560e05..3d51f4741af6 100644 --- a/pkgs/development/python-modules/requirements-parser/default.nix +++ b/pkgs/development/python-modules/requirements-parser/default.nix @@ -1,31 +1,44 @@ { lib , buildPythonPackage -, fetchPypi -, nose +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, types-setuptools }: + buildPythonPackage rec { pname = "requirements-parser"; - version = "0.2.0"; + version = "0.5.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "5963ee895c2d05ae9f58d3fc641082fb38021618979d6a152b6b1398bd7d4ed4"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "madpah"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-e2dfVBMh1uGRMDw7OdPefO4/eRxc3BGwvy/D7u5ipkk="; }; - checkInputs = [ - nose + nativeBuildInputs = [ + poetry-core ]; - checkPhase = '' - nosetests - ''; + propagatedBuildInputs = [ + types-setuptools + ]; + + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "requirements" ]; meta = with lib; { - description = "A Pip requirements file parser"; + description = "Pip requirements file parser"; homepage = "https://github.com/davidfischer/requirements-parser"; license = licenses.bsd2; maintainers = teams.determinatesystems.members; diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix index f5c1f4357268..30345ae654e4 100644 --- a/pkgs/development/python-modules/resolvelib/default.nix +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -26,6 +26,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ + "resolvelib" + ]; + meta = with lib; { description = "Resolve abstract dependencies into concrete ones"; homepage = "https://github.com/sarugaku/resolvelib"; diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index cff31f782c5a..95861bda181c 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -1,33 +1,28 @@ { lib , buildPythonPackage -, cookies , fetchPypi -, mock , pytest-localserver , pytestCheckHook , pythonOlder , requests -, six , urllib3 }: buildPythonPackage rec { pname = "responses"; - version = "0.16.0"; + version = "0.18.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ouOsoqgnfmElfNOxwVSx3Q14Kxrj04t/o3y+P+tTF5E="; + hash = "sha256-OAytTBwdyULl6KjqrgtNTt9wj08BDbi3vPr60fzSVP8="; }; propagatedBuildInputs = [ requests urllib3 - six - ] ++ lib.optionals (pythonOlder "3.4") [ - cookies - ] ++ lib.optionals (pythonOlder "3.3") [ - mock ]; checkInputs = [ @@ -35,7 +30,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "responses" ]; + pythonImportsCheck = [ + "responses" + ]; meta = with lib; { description = "Python module for mocking out the requests Python library"; diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix index d085d43008bb..51d88446c0b5 100644 --- a/pkgs/development/python-modules/respx/default.nix +++ b/pkgs/development/python-modules/respx/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "respx"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "lundberg"; repo = pname; rev = version; - sha256 = "sha256-xiAt42kc1+rro99KMwzYKi3XC+wxYVqOY11tM+M/uV8="; + sha256 = "134h9526md242p7ql0cpknqvkpd3fhxk2vridkvswg91f532w180"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix index f4490c72876d..62b419def880 100644 --- a/pkgs/development/python-modules/retworkx/default.nix +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "retworkx"; - version = "0.9.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "retworkx"; rev = version; - hash = "sha256-1W7DexS+ECAPsxyZAF36xcEguFkjUMX9lDBylNVPqyk="; + hash = "sha256-o3XPMTaiFH5cBtyqtW650wiDBElLvCmERr2XwwdPO1c="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-y5l7jqrlk3ONHefZPS31IvcaO9ttXWLM7fIUmNVwbco="; + hash = "sha256-Zhk4m+HNtimhPWfiBLi9dqJ0fp2D8d0u9k6ROG0/jBo="; }; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index 71a7d0730bdf..f8fcc9aef7ab 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -1,17 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, idna, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, idna +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "rfc3986"; - version = "1.5.0"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"; + sha256 = "sha256-l6rPnb1L/YKbqtbmMJ+mVzqvG+P2+nNcirBeRs7LJhw="; }; - propagatedBuildInputs = [ idna ]; + propagatedBuildInputs = [ + idna + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rfc3986" + ]; meta = with lib; { description = "Validating URI References per RFC 3986"; diff --git a/pkgs/development/python-modules/rflink/default.nix b/pkgs/development/python-modules/rflink/default.nix index 82374a8a0423..c33d44f628fb 100644 --- a/pkgs/development/python-modules/rflink/default.nix +++ b/pkgs/development/python-modules/rflink/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "rflink"; - version = "0.0.58"; + version = "0.0.62"; format = "setuptools"; src = fetchFromGitHub { owner = "aequitas"; repo = "python-rflink"; rev = version; - sha256 = "1zab55lsw419gg0jfrl69ap6128vbi3wdmg5z7qin65ijpjdhasc"; + sha256 = "sha256-dEzkYE8xtUzvdsnPaSiQR8960WLOEcr/QhwDiQlobcs="; }; propagatedBuildInputs = [ @@ -34,15 +34,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Remove loop, https://github.com/aequitas/python-rflink/pull/61 - (fetchpatch { - name = "remove-loop.patch"; - url = "https://github.com/aequitas/python-rflink/commit/777e19b5bde3398df5b8f142896c34a01ae18d52.patch"; - sha256 = "sJmihxY3fNSfZVFhkvQ/+9gysQup/1jklKDMyDDLOs8="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace "version=version_from_git()" "version='${version}'" diff --git a/pkgs/development/python-modules/rich-rst/default.nix b/pkgs/development/python-modules/rich-rst/default.nix new file mode 100644 index 000000000000..4c543febb813 --- /dev/null +++ b/pkgs/development/python-modules/rich-rst/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, docutils +, rich +}: + +buildPythonPackage rec { + pname = "rich-rst"; + version = "1.1.7"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "wasi-master"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-s48hdJo1LIRXTf+PeSBa6y/AH1NLmnyAafFydJ+exDk="; + }; + + propagatedBuildInputs = [ docutils rich ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "rich_rst" ]; + + meta = with lib; { + description = "A beautiful reStructuredText renderer for rich"; + homepage = "https://github.com/wasi-master/rich-rst"; + license = licenses.mit; + maintainers = with maintainers; [ jyooru ]; + }; +} diff --git a/pkgs/development/python-modules/rki-covid-parser/default.nix b/pkgs/development/python-modules/rki-covid-parser/default.nix index ec201fcd9f57..928723897b5d 100644 --- a/pkgs/development/python-modules/rki-covid-parser/default.nix +++ b/pkgs/development/python-modules/rki-covid-parser/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rki-covid-parser"; - version = "1.3.1"; + version = "1.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebino"; repo = pname; rev = "v${version}"; - sha256 = "UTLWBbNjvRuBwc5JD8l+izJu5vODLwS16ExdxUPT14A="; + sha256 = "sha256-e0MJjE4zgBPL+vt9EkgsdGrgqUyKK/1S9ZFxy56PUjc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix index eca38c08f014..ec735c057abf 100644 --- a/pkgs/development/python-modules/rlp/default.nix +++ b/pkgs/development/python-modules/rlp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rlp"; - version = "2.0.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "665e8312750b3fc5f7002e656d05b9dcb6e93b6063df40d95c49ad90c19d1f0e"; + sha256 = "63b0465d2948cd9f01de449d7adfb92d207c1aef3982f20310f8009be4a507e8"; }; checkInputs = [ pytest hypothesis ]; diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index ed2ba7155c7e..012d899ef2a5 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }: buildPythonPackage rec { - version = "5.1.3"; + version = "6.0.0"; pname = "robotframework-seleniumlibrary"; # no tests included in PyPI tarball @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "v${version}"; - sha256 = "1djlrbrgd7v15xk5w90xk7iy98cr1p2g57k614gvbd298dmnf2wd"; + sha256 = "1rjzz6mrx4zavcck2ry8269rf3dkvvs1qfa9ra7dkppbarrjin3f"; }; propagatedBuildInputs = [ robotframework selenium ]; diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index b0b363d8ca2c..a0c805c66a46 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "robotframework"; - version = "4.1.3"; + version = "5.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0j71awmfkwk7prz82kr1zbcl3nrih3396sshrygnqlrdjmgivd3p"; + sha256 = "sha256-AblBSkTCUrYlX4M35IHUIw7j2PGzALbGXpApiJgZlWE="; }; checkInputs = [ jsonschema ]; diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index 81226a23452e..63e87609ac25 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, python, robotframework }: buildPythonPackage rec { - version = "1.3"; + version = "2.1.0"; pname = "robotstatuschecker"; # no tests included in PyPI tarball @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "statuschecker"; rev = version; - sha256 = "0rppwwpp4djn5c43x7icwslnxbzcfnnn3c6awpg1k97j69d2nmln"; + sha256 = "0hy1390j3l4kkfna9x9xax4y5mqaa3hdndv3fiyg9wr5f7sx3wnz"; }; propagatedBuildInputs = [ robotframework ]; diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index e1ee42b08157..fefec51c2bcd 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -1,8 +1,12 @@ { lib , aiohttp , aresponses +, awesomeversion +, backoff , buildPythonPackage +, cachetools , fetchFromGitHub +, poetry-core , pytest-asyncio , pytestCheckHook , pythonOlder @@ -12,21 +16,28 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.8.4"; - format = "setuptools"; + version = "0.16.0"; + format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "ctalkington"; repo = "python-rokuecp"; rev = version; - sha256 = "sha256-vwXBYwiDQZBxEZDwLX9if6dt7tKQQOLyKL5m0q/3eUw="; + hash = "sha256-MeugjIZorwO8d0Yb7bthI6f4NNo6GX9JrRbxrVSdWv0="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp + backoff + cachetools xmltodict + awesomeversion yarl ]; @@ -36,9 +47,18 @@ buildPythonPackage rec { pytest-asyncio ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace " --cov" "" + ''; + disabledTests = [ - # https://github.com/ctalkington/python-rokuecp/issues/249 + # Network related tests are having troube in the sandbox "test_resolve_hostname" + "test_get_dns_state" + # Assertion issue + "test_guess_stream_format" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix index ccc5749387b1..84909ca05659 100644 --- a/pkgs/development/python-modules/roonapi/default.nix +++ b/pkgs/development/python-modules/roonapi/default.nix @@ -11,15 +11,16 @@ buildPythonPackage rec { pname = "roonapi"; - version = "0.0.38"; + version = "0.1.1"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pavoni"; repo = "pyroon"; rev = version; - sha256 = "sha256-vXx7MgoGjBPdx7uKUtAVqlXphPJYt5SyuTo2JlKia60="; + sha256 = "sha256-GEgm250uALTXIEMBWmluqGw/dw2TfGmUIcItfzonGkU="; }; nativeBuildInputs = [ @@ -36,7 +37,9 @@ buildPythonPackage rec { # Tests require access to the Roon API doCheck = false; - pythonImportsCheck = [ "roonapi" ]; + pythonImportsCheck = [ + "roonapi" + ]; meta = with lib; { description = "Python library to interface with the Roon API"; diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix index aaf31f06a1cc..4d0a4aa94f11 100644 --- a/pkgs/development/python-modules/ropgadget/default.nix +++ b/pkgs/development/python-modules/ropgadget/default.nix @@ -2,17 +2,21 @@ , buildPythonPackage , fetchFromGitHub , capstone +, pythonOlder }: buildPythonPackage rec { pname = "ropgadget"; - version = "6.6"; + version = "6.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "JonathanSalwan"; repo = "ROPgadget"; rev = "v${version}"; - sha256 = "1i0gx0cwhxk6d8byvck17hh83szz3k6ndd118ha3q0r0msap0lz1"; + hash = "sha256-zOTbncsOvmLQMZGpcRLviSZP/d1cQTQHXCLUKyEgVBk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 1237fd09ea41..391e8d36139b 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -1,12 +1,12 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchPypi , capstone , filebytes , pytest }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "ropper"; version = "1.13.6"; diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 61a2f1e75605..a8849fd17cd3 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "rpyc"; - version = "5.0.1"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "tomerfiliba"; repo = pname; rev = version; - sha256 = "1g75k4valfjgab00xri4pf8c8bb2zxkhgkpyy44fjk7s5j66daa1"; + sha256 = "sha256-Xeot4QEgTZjvdO0ydmKjccp6zwC93Yp/HkRlSgyDf8k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index d109a6cce747..606b2879908e 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "rstcheck"; - version = "v3.3.1"; + version = "3.3.1"; src = fetchFromGitHub { owner = "myint"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "sha256-4AhENuT+LtUMCi+aaI/rKa2gHti8sKGLdVGjdRithXI="; }; diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix index e1565fa6c30c..02bb45fd6bc0 100644 --- a/pkgs/development/python-modules/rtmidi-python/default.nix +++ b/pkgs/development/python-modules/rtmidi-python/default.nix @@ -1,4 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, cython, alsa-lib }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, cython +, alsa-lib +, CoreAudio +, CoreMIDI +, CoreServices +}: buildPythonPackage rec { pname = "rtmidi-python"; @@ -14,7 +23,13 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ cython ]; - buildInputs = [ alsa-lib ]; + buildInputs = lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + CoreAudio + CoreMIDI + CoreServices + ]; setupPyBuildFlags = [ "--from-cython" ]; diff --git a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix new file mode 100644 index 000000000000..9cc4a85bee6a --- /dev/null +++ b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix @@ -0,0 +1,43 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "rtsp-to-webrtc"; + version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "allenporter"; + repo = "rtsp-to-webrtc-client"; + rev = version; + hash = "sha256-ry6xNymWgkkvYXliVLUFOUiPz8gbCsQDrSuGmCaH4ZE="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rtsp_to_webrtc" + ]; + + meta = with lib; { + description = "Module for RTSPtoWeb and RTSPtoWebRTC"; + homepage = "https://github.com/allenporter/rtsp-to-webrtc-client"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix index b12920fc7640..143452274abb 100644 --- a/pkgs/development/python-modules/ruamel-yaml-clib/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml-clib/default.nix @@ -5,12 +5,13 @@ buildPythonPackage rec { pname = "ruamel-yaml-clib"; - version = "0.2.4"; + version = "0.2.6"; + format = "setuptools"; src = fetchhg { url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code"; rev = version; - sha256 = "sha256-HQZY1opUvVQdXUHmsZmcYX2vfgjKsl6xATmVIXjnBlc="; + sha256 = "sha256-mpkh9JhYKRX47jfKprjt1Vpm9DMz8LcWzkotJ+/xoxY="; }; # no tests diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index 4b6774a4f9fa..31d76d78ac7e 100644 --- a/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ruamel-yaml"; - version = "0.17.17"; + version = "0.17.21"; src = fetchPypi { pname = "ruamel.yaml"; inherit version; - sha256 = "9751de4cbb57d4bfbf8fc394e125ed4a2f170fbff3dc3d78abf50be85924f8be"; + sha256 = "sha256-i3zml6LyEnUqNcGsQURx3BbEJMlXO+SSa1b/P10jt68="; }; # Tests use relative paths diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix index 728d56527bbe..9d59efd9bd35 100644 --- a/pkgs/development/python-modules/rxv/default.nix +++ b/pkgs/development/python-modules/rxv/default.nix @@ -10,6 +10,7 @@ , pythonOlder , requests , requests-mock +, setuptools-scm }: buildPythonPackage rec { @@ -26,6 +27,12 @@ buildPythonPackage rec { sha256 = "0jldnlzbfg5jm1nbgv91mlvcqkswd9f2n3qj9aqlbmj1cxq19yz8"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ defusedxml requests diff --git a/pkgs/development/python-modules/s3-credentials/default.nix b/pkgs/development/python-modules/s3-credentials/default.nix new file mode 100644 index 000000000000..dd142cd09c79 --- /dev/null +++ b/pkgs/development/python-modules/s3-credentials/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, click +, click-default-group +, boto3 +, pytestCheckHook +, hypothesis +, pytest-mock +}: + +buildPythonPackage rec { + pname = "s3-credentials"; + version = "0.10"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "simonw"; + repo = pname; + rev = version; + hash = "sha256-JgqKmZG3K4JwQ1Bzw2oll/LQ1njA9wFhX0/uYr9XjAU="; + }; + + propagatedBuildInputs = [ + click + click-default-group + boto3 + ]; + + checkInputs = [ + pytestCheckHook + hypothesis + pytest-mock + ]; + + pythonImportsCheck = [ + "s3_credentials" + ]; + + meta = with lib; { + description = "Python CLI utility for creating credentials for accessing S3 buckets"; + homepage = "https://github.com/simonw/s3-credentials"; + license = licenses.asl20; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 22d7eb1a09f6..d90d1052282d 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2021.11.1"; + version = "2022.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1a9ea7596663cda3a5dc6802f11eb468b397de35a8793750e9a98c65abd1a114"; + sha256 = "6bafc1f6b4e935ea59512c0f38d5cb9c299dbbfe738e40c3d1de8f67b4ee1fd4"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/sabyenc3/default.nix b/pkgs/development/python-modules/sabyenc3/default.nix index aab3201047d6..2dec98d5ca1a 100644 --- a/pkgs/development/python-modules/sabyenc3/default.nix +++ b/pkgs/development/python-modules/sabyenc3/default.nix @@ -1,22 +1,32 @@ -{ lib, fetchPypi, python3Packages }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +}: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "sabyenc3"; - version = "4.0.2"; + version = "5.1.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "dfaa0bdd01752a9cfde0d349a8f4e178b04b1cf9c1bc018b287961192cd2bb90"; + hash = "sha256-JwCzy3QRCzxT8B0VM5SXIIWlYi08tT8eLj/QKtMYLRE="; }; - # tests are not included in pypi distribution + # Tests are not included in pypi distribution doCheck = false; - meta = { + pythonImportsCheck = [ + "sabyenc3" + ]; + + meta = with lib; { description = "yEnc Decoding for Python 3"; homepage = "https://github.com/sabnzbd/sabyenc/"; - license = lib.licenses.lgpl3; - maintainers = [ lib.maintainers.lovek323 ]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ lovek323 ]; }; - } diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 1caa20b38511..80c4bd92a385 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.73.0"; + version = "2.75.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "6735874a29aefc1e989a132a2e24945e5b0d057d8b297a2da695cf8421a78810"; + sha256 = "sha256-MN/F7TWaKsQpKMR7Pxx0Vam1+O+PFEJ/H5jLJh3zpe4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index 9c26c9e2e2b3..99424bbc67c2 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -2,16 +2,18 @@ , buildPythonPackage , numpy , pkgs +, fetchFromGitHub }: buildPythonPackage { pname = "scikits.samplerate"; version = "0.3.3"; - src = pkgs.fetchgit { - url = "https://github.com/cournape/samplerate"; + src = fetchFromGitHub { + owner = "cournape"; + repo = "samplerate"; rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210"; - sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg"; + sha256 = "sha256-7x03Q6VXfP9p8HCk15IDZ9HeqTyi5F1AlGX/otdh8VU="; }; buildInputs = [ pkgs.libsamplerate ]; diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index bf2e4ef620f6..cd137b1547ea 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "samsungtvws"; - version = "1.7.0"; + version = "2.5.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "431af8348164cbb56b62492c3fde7ab81911b7905c8009580ccc54bd3f50f7ee"; + sha256 = "sha256-AFCN1b80GZ24g3oWe1qqc72yWQy4+/sorL8zwOYM7vo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index c99a78e0cc18..4bc446c2e142 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sanic-testing"; - version = "0.7.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-testing"; rev = "v${version}"; - sha256 = "0ib6rf1ly1059lfprc3hpmy377c3wfgfhnar6n4jgbxiyin7vzm7"; + sha256 = "17fbb78gvic5s9nlcgwj817fq1f9j9d1d7z6n2ahhinmvyzl9gc8"; }; postPatch = '' diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 2fab2a3df889..63c24e9936fc 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -13,6 +13,7 @@ , pytest-sugar , pytestCheckHook , pythonOlder +, pythonAtLeast , sanic-routing , sanic-testing , ujson @@ -23,16 +24,17 @@ buildPythonPackage rec { pname = "sanic"; - version = "21.9.3"; + version = "21.12.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.7" || + pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88 src = fetchFromGitHub { owner = "sanic-org"; repo = pname; rev = "v${version}"; - sha256 = "0m18jdw1mvf7jhpnrxhm96p24pxvv0h9m71a8c7sqqkwnnpa3p5i"; + sha256 = "0jyl23q7b7fyqzan97qflkqcvmfpzbxbzv0qgygxasrzh80zx67g"; }; postPatch = '' @@ -73,9 +75,24 @@ buildPythonPackage rec { preCheck = '' # Some tests depends on sanic on PATH PATH="$out/bin:$PATH" + PYTHONPATH=$PWD:$PYTHONPATH + + # needed for relative paths for some packages + cd tests ''; + # uvloop usage is buggy + #SANIC_NO_UVLOOP = true; + + pytestFlagsArray = [ + "--asyncio-mode=auto" + ]; + disabledTests = [ + # Lack of uvloop setup through fixtures + "test_create_asyncio_server" + "test_listeners_triggered_async" + "test_tls_options" # Tests are flaky "test_keep_alive_client_timeout" "test_check_timeouts_request_timeout" @@ -103,6 +120,14 @@ buildPythonPackage rec { "test_version" ]; + disabledTestPaths = [ + # unable to create async loop + "test_app.py" + "test_asgi.py" + # occasionally hangs + "test_multiprocessing.py" + ]; + # avoid usage of nixpkgs-review in darwin since tests will compete usage # for the same local port __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/sapi-python-client/default.nix b/pkgs/development/python-modules/sapi-python-client/default.nix index 58cdfe646c65..8375c62e979f 100644 --- a/pkgs/development/python-modules/sapi-python-client/default.nix +++ b/pkgs/development/python-modules/sapi-python-client/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "sapi-python-client"; - version = "0.1.3"; + version = "0.4.1"; src = fetchFromGitHub { owner = "keboola"; repo = pname; rev = version; - sha256 = "1xja4v5d30hy26lfys21vcz1lcs88v8mvjxwl2dc3wxx2pzdvcf6"; + sha256 = "189dzj06vzp7366h2qsfvbjmw9qgl7jbp8syhynn9yvrjqp4k8h3"; }; postPatch = '' diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index f7d0e62ff15b..700fb05bc67f 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -8,33 +8,53 @@ , docutils , pyopencl , opencl-headers +, pythonOlder }: buildPythonPackage rec { pname = "sasmodels"; - version = "1.0.5"; + version = "1.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SasView"; repo = "sasmodels"; rev = "v${version}"; - sha256 = "19h30kcgpvg1qirzjm0vhgvp1yn60ivlglc8a8n2b4d9fp0acfyd"; + hash = "sha256-RVEPu07gp1ScciJQmjizyELcOD2WSjIlxunj5LnmXdw="; }; - buildInputs = [ opencl-headers ]; + buildInputs = [ + opencl-headers + ]; + + propagatedBuildInputs = [ + docutils + matplotlib + numpy + scipy + pyopencl + ]; + # Note: the 1.0.5 release should be compatible with pytest6, so this can # be set back to 'pytest' at that point - checkInputs = [ pytest ]; - propagatedBuildInputs = [ docutils matplotlib numpy scipy pyopencl ]; + checkInputs = [ + pytest + ]; checkPhase = '' HOME=$(mktemp -d) py.test -c ./pytest.ini ''; - meta = { + pythonImportsCheck = [ + "sasmodels" + ]; + + meta = with lib; { description = "Library of small angle scattering models"; - homepage = "http://sasview.org"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ rprospero ]; + homepage = "https://github.com/SasView/sasmodels"; + license = licenses.bsd3; + maintainers = with maintainers; [ rprospero ]; }; } diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index afde27967dbb..a5fdf3d547ed 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -131,6 +131,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ + --replace "pdfminer.six >= 20200101" "pdfminer.six" \ --replace "pluggy >= 0.12.0, < 1.0" "pluggy" \ --replace "pygmars >= 0.7.0" "pygmars" \ --replace "license_expression >= 21.6.14" "license_expression" diff --git a/pkgs/development/python-modules/schiene/default.nix b/pkgs/development/python-modules/schiene/default.nix index 8f479500a138..952a00440d92 100644 --- a/pkgs/development/python-modules/schiene/default.nix +++ b/pkgs/development/python-modules/schiene/default.nix @@ -1,17 +1,21 @@ { lib +, beautifulsoup4 , buildPythonPackage , fetchPypi +, pythonOlder , requests -, beautifulsoup4 }: buildPythonPackage rec { pname = "schiene"; - version = "0.23"; + version = "0.24"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "014aaxmk7yxyml1xgfk3zqallyb5zi04m0v7jgqjkbjqq4n4j3ck"; + sha256 = "sha256-y1gbeavZNFniRiOBbJ4Mgmb0F01HedSmpAWaeZEv0Go="; }; propagatedBuildInputs = [ @@ -19,10 +23,12 @@ buildPythonPackage rec { beautifulsoup4 ]; - # tests are not present + # Module has no tests doCheck = false; - pythonImportsCheck = [ "schiene" ]; + pythonImportsCheck = [ + "schiene" + ]; meta = with lib; { description = "Python library for interacting with Bahn.de"; diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index c18f2934c23d..34cf4ddaae02 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scikit-fmm"; - version = "2021.10.29"; + version = "2022.3.26"; src = fetchPypi { inherit pname version; - sha256 = "799f36e918a2b64ed8434d6c4fef3a1a47757055955c240fba0d4aadccca26b2"; + sha256 = "sha256-wxVfltcz3qh5FRS3CXYsYdL3z94x7Y0rjCbKFnNW3o4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index d8240fd83333..803daeb2ab3a 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.11"; + version = "0.4.12"; format = "pyproject"; # fetch from github as we want the data files @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "v${version}"; - sha256 = "18r5nk8d5y79ihzjkjm5l0hiw2sjgj87px7vwb0bxbs73f5v353b"; + sha256 = "sha256-ZnsOmsajW4dDv53I/Cuu97mPJywGiwFhNGpT1WRfxSw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index e490d5029434..fcf165034622 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -8,6 +8,7 @@ , numpy , osqp , pandas +, setuptools-scm , scikit-learn , scipy , pytestCheckHook @@ -15,15 +16,16 @@ buildPythonPackage rec { pname = "scikit-survival"; - version = "0.17.0"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "ba49325f6a31e8bdccfb88337aa85218d209e88a6a704e9c41ef13bf749e0f46"; + sha256 = "sha256-Sx+reZKBbahjkVgo8hC8EP5vMsRhnprwGjKumQqH83k="; }; nativeBuildInputs = [ cython + setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix index bf3e1d1ef469..cf2e524337de 100644 --- a/pkgs/development/python-modules/scikit-tda/default.nix +++ b/pkgs/development/python-modules/scikit-tda/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "scikit-tda"; - version = "0.0.4"; + version = "1.0.0"; disabled = isPy27; src = fetchFromGitHub { owner = "scikit-tda"; repo = "scikit-tda"; - rev = version; - sha256 = "0a90k6i9fkmc9gf250b4fidx2fzd2qrn025l74mjk51fvf23q13a"; + rev = "v${version}"; + sha256 = "0yhmf5jmxywyj6l9q0rfv9r8wpdk063fvvfnb4azwwccblgz37rj"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index f4a024a46e99..23ce846ecc54 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.0.7"; + version = "0.0.14"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = version; - hash = "sha256-tZsogqcfAqpSo9yOz4z0mgY9SVU1epPmcBuyLJsHLfY="; + hash = "sha256-/J8cCcGAWGrJmUvznOKXtNiHasdOJ3CzsGMeakgL0sY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index e62581057d04..a8a152b0a34c 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.14.2"; + version = "0.14.4"; src = fetchPypi { inherit pname version; - sha256 = "713f117413bbd616a1a7da8f07db9adcd835ce73d8585fb469ea5b5785f92e4d"; + sha256 = "sha256-VGmbkstorjS1koxIqIjquXIqISUCy6iap5W9Vll1Bb0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index c26ec74ac310..073059aec626 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -22,6 +22,7 @@ , service-identity , sybil , testfixtures +, tldextract , twisted , w3lib , zope_interface @@ -29,13 +30,13 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.5.1"; + version = "2.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "Scrapy"; - sha256 = "13af6032476ab4256158220e530411290b3b934dd602bb6dacacbf6d16141f49"; + sha256 = "56fd55a59d0f329ce752892358abee5a6b50b4fc55a40420ea317dc617553827"; }; nativeBuildInputs = [ @@ -54,6 +55,7 @@ buildPythonPackage rec { pyopenssl queuelib service-identity + tldextract twisted w3lib zope_interface @@ -68,22 +70,6 @@ buildPythonPackage rec { testfixtures ]; - patches = [ - # Require setuptools, https://github.com/scrapy/scrapy/pull/5122 - (fetchpatch { - name = "add-setuptools.patch"; - url = "https://github.com/scrapy/scrapy/commit/4f500342c8ad4674b191e1fab0d1b2ac944d7d3e.patch"; - sha256 = "14030sfv1cf7dy4yww02b49mg39cfcg4bv7ys1iwycfqag3xcjda"; - }) - # Make Twisted[http2] installation optional, https://github.com/scrapy/scrapy/pull/5113 - (fetchpatch { - name = "remove-h2.patch"; - url = "https://github.com/scrapy/scrapy/commit/c5b1ee810167266fcd259f263dbfc0fe0204761a.patch"; - sha256 = "0sa39yx9my4nqww8a12bk9zagx7b56vwy7xpxm4xgjapjl6mcc0k"; - excludes = [ "tox.ini" ]; - }) - ]; - LC_ALL = "en_US.UTF-8"; preCheck = '' diff --git a/pkgs/development/python-modules/seatconnect/default.nix b/pkgs/development/python-modules/seatconnect/default.nix index 7adef77210ab..25b1773472ff 100644 --- a/pkgs/development/python-modules/seatconnect/default.nix +++ b/pkgs/development/python-modules/seatconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "seatconnect"; - version = "1.1.3"; + version = "1.1.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "farfar"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-EOaFZch/C9N4lacZ4IqIJUVSaEn8wOFN/WN6WOL/1mo="; + rev = version; + hash = "sha256-8ZqqNDLygHgtUzTgdb34+4BHuStXJXnl9fBfo0WSNZw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index 1637814cadd2..cfcc235f1500 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -36,7 +36,8 @@ buildPythonPackage rec { ''; postPatch = '' - sed -i '38,45d' setup.py + # don't do hacky tarball download + setuptools check + sed -i '38,54d' setup.py substituteInPlace setup.py --replace ", 'pytest-runner==2.6.2'" "" ''; diff --git a/pkgs/development/python-modules/semantic-version/default.nix b/pkgs/development/python-modules/semantic-version/default.nix index e939142fd82f..d3ca44596193 100644 --- a/pkgs/development/python-modules/semantic-version/default.nix +++ b/pkgs/development/python-modules/semantic-version/default.nix @@ -1,20 +1,35 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { - pname = "semantic_version"; - version = "2.8.5"; + pname = "semantic-version"; + version = "2.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"; + pname = "semantic_version"; + inherit version; + sha256 = "sha256-q/VIc1U+Xgem/U1fZTt4H1rkEpekk2ZrWdzyFABqErI="; }; - # ModuleNotFoundError: No module named 'tests' - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "semantic_version" + ]; meta = with lib; { description = "A library implementing the 'SemVer' scheme"; - license = licenses.bsdOriginal; + homepage = "https://github.com/rbarrois/python-semanticversion/"; + license = licenses.bsd2; maintainers = with maintainers; [ layus makefu ]; }; } diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index 2ba415adda0d..aab6ab049da5 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.9.4"; + version = "6.9.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-xNd0IPhaVw4X6URsg6hrDJhxmBRWam4bqgLN0uvMUxI="; + sha256 = "sha256-Lx84jmgJz/J5MJtJyqDTVIbN6H63gD2rkJrdNeojd08="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index 31ae4879e264..b3f2d6955709 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , aiohttp +, pythonOlder , requests , websocket-client , websockets @@ -9,14 +10,16 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.9.6"; + version = "0.10.4"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "scottbonline"; repo = "sense"; rev = version; - hash = "sha256-A4FSL+T2tWGEYmjOFsf99Sn17IT7HP7/ILQjUiPUl0A="; + hash = "sha256-yflI17lLZMXXB0ye+jz3VWWMdZtcBTwbg8deA4ENmWw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index a59ec10be037..51e6c76de5db 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.5.2"; + version = "1.5.8"; format = "setuptools"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; rev = version; - sha256 = "086kzvrpy1c7kiwjrdyr4i4a8dp4vncsc8dk6hp8c7bwswfffa3d"; + sha256 = "sha256-28MkwQog+Abk1PSDPWbah650YATiGCBWaTbFO52KgzY="; }; propagatedBuildInputs = [ @@ -107,8 +107,11 @@ buildPythonPackage rec { "test_start_sentry_listener" # Failing threading test "test_circular_references" - # Failing wsgi test + # Failing wsgi tests "test_session_mode_defaults_to_request_mode_in_wsgi_handler" + "test_auto_session_tracking_with_aggregates" + # Network requests to public web + "test_crumb_capture" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/setupmeta/default.nix b/pkgs/development/python-modules/setupmeta/default.nix index 07b521ee9495..c42565082cfd 100644 --- a/pkgs/development/python-modules/setupmeta/default.nix +++ b/pkgs/development/python-modules/setupmeta/default.nix @@ -23,14 +23,25 @@ buildPythonPackage rec { sha256 = "21hABRiY8CTKkpFjePgBAtjs4/G5eFS3aPNMCBC41CY="; }; + preBuild = '' + export PYGRADLE_PROJECT_VERSION=${version}; + ''; + + nativeBuildInputs = [ + setuptools-scm + ]; + checkInputs = [ git mock pep440 pytestCheckHook - setuptools-scm ]; + preCheck = '' + unset PYGRADLE_PROJECT_VERSION + ''; + disabledTests = [ # Tests want to scan site-packages "test_check_dependencies" diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index 81276f4e338d..2ab609c7d0c1 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -6,22 +6,23 @@ , semantic-version , setuptools , setuptools-scm +, typing-extensions , toml }: buildPythonPackage rec { pname = "setuptools-rust"; - version = "0.12.1"; + version = "1.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "647009e924f0ae439c7f3e0141a184a69ad247ecb9044c511dabde232d3d570e"; + sha256 = "a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1"; }; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ semantic-version setuptools toml ]; + propagatedBuildInputs = [ semantic-version setuptools toml typing-extensions ]; doCheck = false; pythonImportsCheck = [ "setuptools_rust" ]; diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index 62568869b7bf..c175cfb4c609 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "setuptools-scm"; - version = "6.3.2"; + version = "6.4.2"; src = fetchPypi { pname = "setuptools_scm"; inherit version; - sha256 = "1wm0i27siyy1yqr9rv7lqvb65agay9051yi8jzmi8dgb3q4ai6m4"; + sha256 = "sha256-aDOsZcbtlxGk1dImb4Akz6B8UzoOVfTBL27/KApanjA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 772b38be30f2..800bb0f2f4cf 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.26.1"; + version = "1.27.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8oJ7QNaRiYjvn18W3LihM4OqrhooRYmPcBLqyJBru4c="; + sha256 = "sha256-XkrnBuALYxZ6n/f34PM0QvxqxvC08mKci9Mswwf41VA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index efac8148a72a..78e160058b23 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -5,6 +5,7 @@ , pytestCheckHook , pythonOlder , setuptools-scm +, bashInteractive }: buildPythonPackage rec { @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; checkInputs = [ + bashInteractive pytest-timeout pytestCheckHook ]; @@ -37,11 +39,6 @@ buildPythonPackage rec { --replace " --cov=shtab --cov-report=term-missing --cov-report=xml" "" ''; - disabledTests = [ - # bash tests are failing - "bash" - ]; - pythonImportsCheck = [ "shtab" ]; diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix index 331f84252cee..68e9638c350a 100644 --- a/pkgs/development/python-modules/simber/default.nix +++ b/pkgs/development/python-modules/simber/default.nix @@ -1,20 +1,36 @@ -{ lib, buildPythonPackage, fetchFromGitHub, colorama, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, colorama +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "simber"; - version = "0.2.3"; + version = "0.2.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "deepjyoti30"; repo = pname; rev = version; - sha256 = "04dp9b4s7zb166vlacsaypc6iw1p75azqas1wf0flp570qqf3rkx"; + hash = "sha256-P4bhxu9Di4E2Zkd0vIkyDi1S6Y0V/EQSMF4ftWoiXKE="; }; - propagatedBuildInputs = [ colorama ]; + propagatedBuildInputs = [ + colorama + ]; - checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "simber" ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "simber" + ]; meta = with lib; { description = "Simple, minimal and powerful logger for Python"; diff --git a/pkgs/development/python-modules/simple-di/default.nix b/pkgs/development/python-modules/simple-di/default.nix index 612d913b7b6f..c79b58f8a629 100644 --- a/pkgs/development/python-modules/simple-di/default.nix +++ b/pkgs/development/python-modules/simple-di/default.nix @@ -8,13 +8,16 @@ }: buildPythonPackage rec { - pname = "simple_di"; - version = "0.1.4"; + pname = "simple-di"; + version = "0.1.5"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "2667f2b9095e86c7726b3853c30b37f527f7d247282c7dd0b3428a7fb5d1a8a9"; + pname = "simple_di"; + inherit version; + hash = "sha256-GSuZne5M1PsRpdhhFlyq0C2PBhfA+Ab8Wwn5BfGgPKA="; }; propagatedBuildInputs = [ @@ -31,10 +34,10 @@ buildPythonPackage rec { # pypi distribution contains no tests doCheck = false; - meta = { + meta = with lib; { description = "Simple dependency injection library"; homepage = "https://github.com/bentoml/simple_di"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ sauyon ]; + license = licenses.asl20; + maintainers = with maintainers; [ sauyon ]; }; } diff --git a/pkgs/development/python-modules/simplefix/default.nix b/pkgs/development/python-modules/simplefix/default.nix index 6e498ebeaea8..fc241ce278ac 100644 --- a/pkgs/development/python-modules/simplefix/default.nix +++ b/pkgs/development/python-modules/simplefix/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "simplefix"; - version = "1.0.14"; + version = "1.0.15"; src = fetchFromGitHub { repo = "simplefix"; owner = "da4089"; rev = "v${version}"; - sha256 = "1qccb63w6swq7brp0zinkkngpazmb25r21adry5cq6nniqs5g5zx"; + sha256 = "sha256-GQHMotxNRuRv6zXhrD02T+aFgfYe3RnvUGADsBeSPbA="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index bbfd95cd9212..1c2c206f87f0 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2021.12.2"; + version = "2022.03.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-XVSoPPBdjSQBYrUs0AFGsGFRrQOWbPzlB2mmEBSbFI4="; + sha256 = "sha256-B4Tg122S2lJaBXBKUSN2ndt5EOiC5HyORTQXofZKUpw="; }; nativeBuildInputs = [ @@ -40,7 +40,6 @@ buildPythonPackage rec { backoff docutils pytz - types-pytz voluptuous websockets ]; @@ -51,6 +50,7 @@ buildPythonPackage rec { pytest-aiohttp pytest-asyncio pytestCheckHook + types-pytz ]; postPatch = '' diff --git a/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch b/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch new file mode 100644 index 000000000000..4c6f869c0c27 --- /dev/null +++ b/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch @@ -0,0 +1,21 @@ +From d949b37151cd538d4c6a15e1ba6c1343f8bff76d Mon Sep 17 00:00:00 2001 +From: "P. R. d. O" +Date: Mon, 6 Dec 2021 15:26:19 -0600 +Subject: [PATCH] set poetry-core + +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index d3fdc52..bd7ddc2 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -27,4 +27,4 @@ black = "^19.10b0" + + [build-system] + requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++build-backend = "poetry.core.masonry.api" +-- +2.33.1 diff --git a/pkgs/development/python-modules/single-version/default.nix b/pkgs/development/python-modules/single-version/default.nix new file mode 100644 index 000000000000..39cd92f5f67e --- /dev/null +++ b/pkgs/development/python-modules/single-version/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchFromGitHub, poetry-core, pytestCheckHook }: + +buildPythonPackage rec { + pname = "single-version"; + version = "1.5.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "hongquan"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-I8ATQzPRH9FVjqPoqrNjYMBU5azpmkLjRmHcz943C10="; + }; + + patches = [ + ./0001-set-poetry-core.patch + ]; + + nativeBuildInputs = [ poetry-core ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "single_version" ]; + + meta = with lib; { + description = "Utility to let you have a single source of version in your code base"; + homepage = "https://github.com/hongquan/single-version"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 5cd8136f84ef..6904714a60c7 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -10,6 +10,13 @@ buildPythonPackage rec { sha256 = "a1cf8431a8eb9392b3ff6dc61d832d0447bfdcae5b3e4256a5fa74dbc25b0734"; }; + patches = [ + # on non-x86 Linux platforms, sip incorrectly detects the manylinux version + # and PIP will refuse to install the resulting wheel. + # remove once upstream fixes this, hopefully in 6.5.2 + ./fix-manylinux-version.patch + ]; + propagatedBuildInputs = [ packaging toml ]; # There aren't tests diff --git a/pkgs/development/python-modules/sip/fix-manylinux-version.patch b/pkgs/development/python-modules/sip/fix-manylinux-version.patch new file mode 100644 index 000000000000..4b8e99ae8e47 --- /dev/null +++ b/pkgs/development/python-modules/sip/fix-manylinux-version.patch @@ -0,0 +1,19 @@ +diff --git a/sipbuild/project.py b/sipbuild/project.py +--- a/sipbuild/project.py ++++ b/sipbuild/project.py +@@ -336,13 +336,13 @@ class Project(AbstractProject, Configurable): + # We expect a two part tag so leave anything else unchanged. + parts = platform_tag.split('-') + if len(parts) == 2: +- if self.minimum_glibc_version > (2, 17): ++ if self.minimum_glibc_version > (2, 17) or parts[1] not in {"x86_64", "i686", "aarch64", "armv7l", "ppc64", "ppc64le", "s390x"}: + # PEP 600. + parts[0] = 'manylinux' + parts.insert(1, + '{}.{}'.format(self.minimum_glibc_version[0], + self.minimum_glibc_version[1])) +- elif self.minimum_glibc_version > (2, 12): ++ elif self.minimum_glibc_version > (2, 12) or parts[1] not in {"x86_64", "i686"}: + # PEP 599. + parts[0] = 'manylinux2014' + elif self.minimum_glibc_version > (2, 5): diff --git a/pkgs/development/python-modules/skein/skeinjar.nix b/pkgs/development/python-modules/skein/skeinjar.nix index c1a0d8a57515..d29e0e2f99c7 100644 --- a/pkgs/development/python-modules/skein/skeinjar.nix +++ b/pkgs/development/python-modules/skein/skeinjar.nix @@ -4,9 +4,9 @@ let skeinRepo = callPackage ./skeinrepo.nix { inherit src version; }; in stdenv.mkDerivation rec { - name = "skein-${version}.jar"; + pname = "skein.jar"; - inherit src; + inherit version src; nativeBuildInputs = [ maven ]; diff --git a/pkgs/development/python-modules/skein/skeinrepo.nix b/pkgs/development/python-modules/skein/skeinrepo.nix index d7bdef56ebe3..86cbf82b7f0f 100644 --- a/pkgs/development/python-modules/skein/skeinrepo.nix +++ b/pkgs/development/python-modules/skein/skeinrepo.nix @@ -1,9 +1,9 @@ { autoPatchelfHook, lib, maven, stdenv, src, version }: stdenv.mkDerivation rec { - name = "skein-${version}-maven-repo"; + pname = "skein-maven-repo"; - inherit src; + inherit version src; nativeBuildInputs = [ maven ] ++ lib.optional stdenv.isLinux autoPatchelfHook; diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index 5196651959c7..7fe887d3ea10 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.1.12"; + version = "1.1.19"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lendy007"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-OKNw+t8S6rRQDKNRBN/CU36OwWojuOH6mMQ5QItkkb8="; + rev = version; + hash = "sha256-IbCGveRcn6Kn0kGw+/kWTBTqCdWqsPTv6aPq71vc1mw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 8a8957459ee5..09682a2a3d0e 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.13.0"; + version = "3.15.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-L12faNLwjlEkJZ9s9aIyUHSk7x3n908EHCYU9jECiYQ="; + sha256 = "sha256-lhdh4Eo7yIsukXoKI6Ss793fYmAu91O1UElmxV9xAc4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index f28708bdf03b..4743639c43d1 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -4,31 +4,25 @@ , aiohttp , fetchPypi , gnupg -, isPy3k , pyasn1 , pyasn1-modules , pytestCheckHook , substituteAll +, pythonOlder }: buildPythonPackage rec { pname = "slixmpp"; - version = "1.7.1"; + version = "1.8.1"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mvg23FdHJZeIZRcm8GLWmm9DDTBt29jmsUHB/smVSec="; + hash = "sha256-QgTIC+4JtAD9nnS+fJKZwF0aJEIrFmPHkYg8cPgXmcA="; }; - patches = [ - (substituteAll { - src = ./hardcode-gnupg-path.patch; - inherit gnupg; - }) - ]; - propagatedBuildInputs = [ aiodns aiohttp @@ -36,15 +30,28 @@ buildPythonPackage rec { pyasn1-modules ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - # Exclude live tests - disabledTestPaths = [ "tests/live_test.py" ]; + patches = [ + (substituteAll { + src = ./hardcode-gnupg-path.patch; + inherit gnupg; + }) + ]; - pythonImportsCheck = [ "slixmpp" ]; + disabledTestPaths = [ + # Exclude live tests + "tests/live_test.py" + ]; + + pythonImportsCheck = [ + "slixmpp" + ]; meta = with lib; { - description = "Elegant Python library for XMPP"; + description = "Python library for XMPP"; homepage = "https://slixmpp.readthedocs.io/"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/slowapi/default.nix b/pkgs/development/python-modules/slowapi/default.nix index 9ae293e455c7..430c17dfb61e 100644 --- a/pkgs/development/python-modules/slowapi/default.nix +++ b/pkgs/development/python-modules/slowapi/default.nix @@ -7,6 +7,7 @@ , hiro , poetry-core , pytestCheckHook +, pythonAtLeast , pythonOlder , redis , starlette @@ -16,6 +17,7 @@ buildPythonPackage rec { pname = "slowapi"; version = "0.1.5"; format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -42,13 +44,23 @@ buildPythonPackage rec { starlette ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'limits = "^1.5"' 'limits = "*"' \ + --replace 'redis = "^3.4.1"' 'redis = "*"' + ''; + disabledTests = [ - # E AssertionError: Regex pattern 'parameter `request` must be an instance of starlette.requests.Request' does not match 'This portal is not running'. + # AssertionError: Regex pattern 'parameter `request` must be an instance of starlette.requests.Request' does not match 'This portal is not running'. "test_endpoint_request_param_invalid" "test_endpoint_response_param_invalid" + ] ++ lib.optionals (pythonAtLeast "3.10") [ + "test_multiple_decorators" ]; - pythonImportsCheck = [ "slowapi" ]; + pythonImportsCheck = [ + "slowapi" + ]; meta = with lib; { description = "Python library for API rate limiting"; diff --git a/pkgs/development/python-modules/smmap/default.nix b/pkgs/development/python-modules/smmap/default.nix index 800cf0842582..5e8344e3d637 100644 --- a/pkgs/development/python-modules/smmap/default.nix +++ b/pkgs/development/python-modules/smmap/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "smmap"; - version = "4.0.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182"; + sha256 = "c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936"; }; checkInputs = [ nosexcover ]; diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 293b8069b58f..1b7bd7341ebf 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "NabuCasa"; repo = pname; rev = version; - sha256 = "sha256-IjdgxX6ed9IWMFaMXIXQWZWoODrZBzXtMAcMOIhPFVQ="; + hash = "sha256-Ehafb35H462Ffn6omGh/MDJKQX5qJJZeiIBO3n0IGlA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index d13fbfb78893..744883302a0e 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.7.3"; + version = "2.7.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "026562392d8733bdfaddcd5ec1537a139940df46a3a225849a36c71c1bf3e61c"; + sha256 = "sha256-Es8Xe7yHetAl9bAO83ecTuv9r0cueRL4fCvNyfOGQAg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 1a7747e2c2ec..50a134df2d2a 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , graphviz +, appdirs , ifaddr , pythonOlder , mock @@ -14,17 +15,20 @@ buildPythonPackage rec { pname = "soco"; - version = "0.25.3"; + version = "0.27.1"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "sha256-CoAmpcXy4oHMk0X4iJ/XMbUnI2m3ZWl8QzobH677FrI="; + hash = "sha256-8U7wfxqen+hgK8j9ooPHCAKvd9kSZicToTyP7XzQFrg="; }; propagatedBuildInputs = [ + appdirs ifaddr requests xmltodict @@ -37,15 +41,17 @@ buildPythonPackage rec { requests-mock ]; - pythonImportsCheck = [ "soco" ]; + pythonImportsCheck = [ + "soco" + ]; passthru.updateScript = nix-update-script { attrPath = "python3Packages.${pname}"; }; meta = with lib; { + description = "CLI and library to control Sonos speakers"; homepage = "http://python-soco.com/"; - description = "A CLI and library to control Sonos speakers"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; }; diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index b0705346abdb..e5a55cc9bb1b 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "softlayer"; - version = "5.9.8"; + version = "5.9.9"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = pname; repo = "softlayer-python"; rev = "v${version}"; - sha256 = "087kyl2yacvh12i4x3357659mgq4xycv8a4y9rl3rj57kp5jc6ah"; + sha256 = "sha256-LskPz5KXOi7olb3+DUP9uEFESQeo6ec/ZLx9B/w6Ni0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index e332d0defd73..a03052c7e429 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "somajo"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "v${version}"; - sha256 = "0ywdh1pfk0pgm64p97i9cwz0h9wggbp4shxp5l7kkqs2n2v5c6qg"; + sha256 = "sha256-M0WtONhsqmmK0PBB+Df4YrFpT+vfVidDkt80eBHOo04="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index bc39bb998e8e..bbc3f8edbf2d 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.1.7"; + version = "7.1.8"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "4eb12e9753162e4c19a1bfdd42aea9eb7f5f15e316a6609b925350792fb454fd"; + sha256 = "sha256-zxb95GVcDrd3FG/k+0PLg+dVlMgQpf1ntG8jF/zpHH4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix index 4a6f1c1ae9d7..61150ac45bbf 100644 --- a/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "sorl-thumbnail"; - version = "12.7.0"; + version = "12.8.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fbe6dfd66a1aceb7e0203895ff5622775e50266f8d8cfd841fe1500bd3e19018"; + sha256 = "sha256-7io8nwuInlmRk4PTeB8TF9ycSSf7RLIvsUN/b+cFS5Y="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index 9a1d614062b7..c1b68e61088e 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -1,7 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, fetchpatch +, pytestCheckHook , numpy , libsndfile , cffi @@ -12,6 +13,8 @@ buildPythonPackage rec { pname = "soundfile"; version = "0.10.3.post1"; + # https://github.com/bastibe/python-soundfile/issues/157 + disabled = isPyPy || stdenv.isi686; src = fetchPypi { pname = "SoundFile"; @@ -19,22 +22,30 @@ buildPythonPackage rec { sha256 = "0yqhrfz7xkvqrwdxdx2ydy4h467sk7z3gf984y1x2cq7cm1gy329"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy libsndfile cffi ]; - propagatedNativeBuildInputs = [ cffi ]; + patches = [ + # Fix build on macOS arm64, https://github.com/bastibe/python-soundfile/pull/332 + (fetchpatch { + url = "https://github.com/bastibe/python-soundfile/commit/e554e9ce8bed96207d587e6aa661e4b08f1c6a79.patch"; + sha256 = "sha256-vu/7s5q4I3yBnoNHmmFmcXvOLFcPwY9ri9ri6cKLDwU="; + }) + ]; - meta = { - description = "An audio library based on libsndfile, CFFI and NumPy"; - license = lib.licenses.bsd3; - homepage = "https://github.com/bastibe/PySoundFile"; - maintainers = with lib.maintainers; [ fridh ]; - }; + postPatch = '' + substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; - postPatch = '' - substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; + checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ numpy libsndfile cffi ]; + propagatedNativeBuildInputs = [ cffi ]; - # https://github.com/bastibe/PySoundFile/issues/157 - disabled = isPyPy || stdenv.isi686; + # Test fails on aarch64-darwin with `MemoryError`, 53 failed, 31 errors, see + # https://github.com/bastibe/python-soundfile/issues/331 + doCheck = stdenv.system != "aarch64-darwin"; + meta = { + description = "An audio library based on libsndfile, CFFI and NumPy"; + license = lib.licenses.bsd3; + homepage = "https://github.com/bastibe/python-soundfile"; + maintainers = with lib.maintainers; [ fridh ]; + }; } diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index 757c945f3f05..2f70732caa31 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }; postPatch = '' - sed -i 's/transformers>=3.4.0,<4.12.0/transformers/' setup.cfg + sed -i 's/transformers>=3.4.0,<4.13.0/transformers/' setup.cfg ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 05561e995a5c..5e3bc6aac8b7 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -31,13 +31,13 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.2.1"; + version = "3.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9uusURYndAqMorEXuR71UVyPCy+xF6aevgHQEN1PxTw="; + sha256 = "sha256-JdAz/Ae4+/yb3Te3cLilhtxBTb1gMShEmvMldqOJFnM="; }; propagatedBuildInputs = [ @@ -64,6 +64,11 @@ buildPythonPackage rec { langcodes ] ++ lib.optional (pythonOlder "3.8") typing-extensions; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pydantic>=1.7.4,!=1.8,!=1.8.1,<1.9.0" "pydantic~=1.2" + ''; + checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/spacy/legacy.nix b/pkgs/development/python-modules/spacy/legacy.nix index b09983aeae3d..3ee2feeaa96a 100644 --- a/pkgs/development/python-modules/spacy/legacy.nix +++ b/pkgs/development/python-modules/spacy/legacy.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "spacy-legacy"; - version = "3.0.8"; + version = "3.0.9"; src = fetchPypi { inherit pname version; - sha256 = "b4725c5c161f0685ab4fce3fc912bc68aefdb7e102ba9848e852bb5842256c2f"; + sha256 = "sha256-T33LxObI6MtOrbsAn5wKGipnRC4AMsjWd2yUcMN1mQM="; }; # checkInputs = [ pytestCheckHook spacy ]; diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index b11ca178fc75..fae812319ec8 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -12,6 +12,7 @@ , pytestCheckHook , pytest-astropy , astropy-helpers +, setuptools-scm }: buildPythonPackage rec { @@ -24,6 +25,12 @@ buildPythonPackage rec { sha256 = "1c0pp82wgl680w2vcwlrrz46sy83z1qs74w5bd691wg0512hv2jx"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ astropy casa-formats-io radio_beam joblib six dask ]; checkInputs = [ pytestCheckHook aplpy pytest-astropy ]; diff --git a/pkgs/development/python-modules/sphinx-copybutton/default.nix b/pkgs/development/python-modules/sphinx-copybutton/default.nix index 8d408d300c71..259a7dde28b3 100644 --- a/pkgs/development/python-modules/sphinx-copybutton/default.nix +++ b/pkgs/development/python-modules/sphinx-copybutton/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "sphinx-copybutton"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "executablebooks"; repo = "sphinx-copybutton"; rev = "v${version}"; - sha256 = "sha256-vrEIvQeP7AMXSme1PBp0ox5k8Q1rz+1cbHIO+o17Jqc="; + sha256 = "sha256-W27kCU/8NHoBtiAyA+CgNa00j6ck3CAaq1hLLGo60Ro="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix index 6f721ad1a8f6..7f5ea8c4241a 100644 --- a/pkgs/development/python-modules/sphinx-jinja/default.nix +++ b/pkgs/development/python-modules/sphinx-jinja/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sphinx-jinja"; - version = "1.1.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0hz13vc65zi4zmay40nz8wzxickv1q9zzl6x03qc7rvvapz0c91p"; + sha256 = "e6614d986c0289cb85b016c25eb8cb9781ceb841e70bee639c5123f39ad90b38"; }; buildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 75693f3657e4..19961cc2ec18 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -8,12 +8,13 @@ , alabaster , docutils , imagesize +, importlib-metadata , jinja2 , packaging , pygments , requests -, setuptools , snowballstemmer +, sphinxcontrib-apidoc , sphinxcontrib-applehelp , sphinxcontrib-devhelp , sphinxcontrib-htmlhelp @@ -29,14 +30,14 @@ buildPythonPackage rec { pname = "sphinx"; - version = "4.3.1"; + version = "4.4.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "sphinx-doc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8Yj6cPZFG8ycbbZtMR+fsIAOX0brxroi6nYjP+WhnxA="; + sha256 = "sha256-Q4CqPO08AfR+CDB02al65A+FHRFUDUfFTba0u8YQx+8="; extraPostFetch = '' cd $out mv tests/roots/test-images/testimäge.png \ @@ -54,7 +55,6 @@ buildPythonPackage rec { packaging pygments requests - setuptools snowballstemmer sphinxcontrib-applehelp sphinxcontrib-devhelp @@ -64,6 +64,11 @@ buildPythonPackage rec { sphinxcontrib-serializinghtml # extra[docs] sphinxcontrib-websupport + + # extra plugins which are otherwise not found by sphinx-build + sphinxcontrib-apidoc + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; checkInputs = [ @@ -114,6 +119,6 @@ buildPythonPackage rec { ''; homepage = "https://www.sphinx-doc.org"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix new file mode 100644 index 000000000000..c7bdb26b0008 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pbr +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-apidoc"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-cpv1ks97fdV8TAV5T3MtwCYScnXXhcKlSUUh/d53P7k="; + }; + + postPatch = '' + # break infite recursion, remove pytest 4 requirement + rm test-requirements.txt requirements.txt + ''; + + propagatedBuildInputs = [ + pbr + ]; + + # Check is disabled due to circular dependency of sphinx + doCheck = false; + + meta = with lib; { + description = "Sphinx extension for running sphinx-apidoc on each build"; + homepage = "https://github.com/sphinx-contrib/apidoc"; + license = licenses.bsd2; + maintainers = teams.openstack.members; + }; +} diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index 9c3c16657f29..ef7a50382c6e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-applehelp"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index 1f33c06b984e..293f4c856ef5 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -12,14 +12,13 @@ buildPythonPackage rec { sha256 = "ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document."; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-devhelp"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 51084adf6ed6..901132176ed9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "Sphinx extension which renders HTML help files"; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-htmlhelp"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index cd67732605bb..da630c6ee96d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML via JavaScript."; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-jsmath"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index b82d1afe4764..df05cd27364b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.22"; + version = "0.23"; src = fetchPypi { inherit pname version; - sha256 = "a42c7a13ab1ae9ed18e8e8b0f76b8d35dc476fdebe6e634354fe6fd0f261f686"; + sha256 = "sha256-HVVRjwqG7NbJa6j/jIhK3KBbrD5Y52ppKjzRmqf0Ks8="; }; # No tests included. diff --git a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix new file mode 100644 index 000000000000..676f72c3f14b --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, sphinx +, sphinxcontrib-serializinghtml +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-programoutput"; + version = "0.17"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-MA7puMrug1XSXMdLTRx+/RLmCNKtFl4xQdMeb7wVK38="; + }; + + buildInputs = [ + sphinx + ]; + + # fails to import sphinxcontrib.serializinghtml + doCheck = false; + + pythonImportsCheck = [ "sphinxcontrib.programoutput" ]; + + meta = with lib; { + description = "Sphinx extension to include program output"; + homepage = "https://github.com/NextThought/sphinxcontrib-programoutput"; + license = licenses.bsd2; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 9d16ede62a20..4364fcb99dc6 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document."; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-qthelp"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index a238c0191a7b..85ed3cdc596d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -14,14 +14,13 @@ buildPythonPackage rec { sha256 = "aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"; }; - # Check is disabled due to circular dependency of sphinx doCheck = false; meta = with lib; { description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)."; - homepage = "http://sphinx-doc.org/"; + homepage = "https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"; license = licenses.bsd0; + maintainers = teams.sphinx.members; }; - } diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index dcb96f317d4e..95926b569a0a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-tikz"; - version = "0.4.15"; + version = "0.4.16"; src = fetchPypi { inherit pname version; - sha256 = "27f9a7a6a64f1bf3ea4dd0e963b7da7c7778948856c8d557a71d64ace086519f"; + sha256 = "sha256-8f9FNx6WMopcqihUzNlQoPBGYoW2YkFi6W1iaFLD4qU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 8b8cb4cdbb53..8b68eea25668 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.5.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "v${version}"; - sha256 = "sha256-US0UXxcTlN7x5v2ilpL+umTr7tadqthqhvfaQnm7tCc="; + sha256 = "sha256-3bZFFtGW6j/3m/3F4+tapZujzpMZnrIcYTngDCNGylI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 4c43ce2f1617..4ddacc911903 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.2.0"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "6b19ea224f183dbff8ff0031bee35ae6b5b3a6eef4aa84cfab04e3bc3e304b91"; + sha256 = "574ee1bd03f7236b9f9dacae34936a0625cd67ccfe3df11fec69f26889a0b866"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 38558f004984..cfeaf08fb33f 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.2.0"; + version = "5.2.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "cd04acc88426acee9c4ce6bb91f50c13fc161a437e68bca701243b3415ce9d08"; + sha256 = "b318a70a75acd200018a547d2ff2d2f55e7507054469d0c77ec6f967ac3c2d28"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { comment = "Scientific Python Development Environment"; desktopName = "Spyder"; genericName = "Python IDE"; - categories = "Development;IDE;"; + categories = [ "Development" "IDE" ]; }; postPatch = '' diff --git a/pkgs/development/python-modules/spyse-python/default.nix b/pkgs/development/python-modules/spyse-python/default.nix index 71dbf63bda0f..bd73edc61e70 100644 --- a/pkgs/development/python-modules/spyse-python/default.nix +++ b/pkgs/development/python-modules/spyse-python/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , dataclasses-json , fetchFromGitHub +, fetchpatch , limiter , pythonOlder , requests @@ -32,11 +33,21 @@ buildPythonPackage rec { # Tests requires an API token doCheck = false; + patches = [ + # Update limiter import and rate limit, https://github.com/spyse-com/spyse-python/pull/11 + (fetchpatch { + name = "support-later-limiter.patch"; + url = "https://github.com/spyse-com/spyse-python/commit/ff68164c514dfb28ab77d8690b3a5153962dbe8c.patch"; + sha256 = "sha256-PoWPJCK/Scsh4P7lr97u4JpVHXNlY0C9rJgY4TDYmv0="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "'dataclasses~=0.6'," "" \ --replace "responses~=0.13.3" "responses>=0.13.3" \ - --replace "limiter~=0.1.2" "limiter>=0.1.2" + --replace "limiter~=0.1.2" "limiter>=0.1.2" \ + --replace "requests~=2.26.0" "requests>=2.26.0" ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 685bb829dd3b..05ef00dae0ef 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.37.9"; + version = "0.38.2"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "4667edbdcb1ece011076b69772ef524bfbb17cc97e03f11ee6b85d98e7741d61"; + sha256 = "9e01d6d3fb52d3926fcd4ea4a13f3540701b751aced0316bff78264402c2ceb4"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 085195f5a752..1d6406c5db13 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.29"; + version = "1.4.31"; src = fetchPypi { inherit pname version; - sha256 = "sha256:+iutFOFHS6ZJz8lpwdLskV3T55Z380a7/gjpPvkCCzk="; + sha256 = "sha256-WCtZ0eV4CkR6raIrRh5QtASp3AV2jaHYc2itgZBGhBg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 5247850173ed..5d96f8e1505c 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.22"; + version = "3.25.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "24803ea4d63e2123d2040db2da43fea95fabada80e1af1fe1da69643ae376689"; + sha256 = "sha256-32lfUJoTbkflztLU/BDhbHbuOkW66OGpHLuiyAKFy8k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix index 1c28d6a0976d..178617e18dea 100644 --- a/pkgs/development/python-modules/sqlitedict/default.nix +++ b/pkgs/development/python-modules/sqlitedict/default.nix @@ -1,22 +1,28 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "sqlitedict"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "sqlitedict"; rev = version; - sha256 = "1yq94lgpny9qcfbsl39npjvrsjfggi3lj2kpzcsxcfdfgxag6m2m"; + sha256 = "08fr81rz1fz35d35kravg7vl234aqagr9wqb09x6wi9lx9zkkh28"; }; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest tests + preCheck = '' + mkdir tests/db ''; + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Persistent, thread-safe dict"; homepage = "https://github.com/RaRe-Technologies/sqlitedict"; diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 2abfaef9ab39..a435b363a0f7 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.6"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gYr/+sgkFT24JXNDHgmT4ee5b977Iax9TLZ9/nh7PP0="; + sha256 = "sha256-W/UdJPLcFOEHHz7VYeQ3CcXysNju5DuxqvYA+xMkb20="; }; postPatch = '' @@ -31,6 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatic SQL injection and database takeover tool"; homepage = "https://sqlmap.org"; + changelog = "https://github.com/sqlmapproject/sqlmap/releases/tag/${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ bennofs ]; }; diff --git a/pkgs/development/python-modules/srpenergy/default.nix b/pkgs/development/python-modules/srpenergy/default.nix index c5d20436a09c..d0ac3602445d 100644 --- a/pkgs/development/python-modules/srpenergy/default.nix +++ b/pkgs/development/python-modules/srpenergy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "srpenergy"; - version = "1.3.5"; + version = "1.3.6"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "lamoreauxlab"; repo = "srpenergy-api-client-python"; rev = version; - sha256 = "sha256-s90+gzjcG27pUcMGpzf2rf+mR8/fmpvwBXGfvv3rNGI="; + hash = "sha256-aZnqGtfklWgigac2gdkQv29Qy5HC34zGGY2iWr2cOMo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sshtunnel/default.nix b/pkgs/development/python-modules/sshtunnel/default.nix index 90e4962d3e8f..3c53864ec332 100644 --- a/pkgs/development/python-modules/sshtunnel/default.nix +++ b/pkgs/development/python-modules/sshtunnel/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , paramiko -, pytest +, pytestCheckHook , mock }: @@ -15,12 +15,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ paramiko ]; - checkInputs = [ pytest mock ]; + checkInputs = [ pytestCheckHook mock ]; # disable impure tests - checkPhase = '' - pytest -k 'not connect_via_proxy and not read_ssh_config' - ''; + disabledTests = [ + "test_get_keys" + "connect_via_proxy" + "read_ssh_config" + ]; meta = with lib; { description = "Pure python SSH tunnels"; diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index 587572646abc..bc3e2c238c9f 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "sslyze"; - version = "5.0.0"; + version = "5.0.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = pname; rev = version; - hash = "sha256-7kUriEMHcGCXKs42KVWxXvM+JEEWf/8tnuoGujHbqHY="; + hash = "sha256-d465WJIDsgNAPe8KW5v2KDSgzMH7OPLSiFfFH9n+jiA="; }; patchPhase = '' diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix index cbbd3a878d7e..eb9879a4bf02 100644 --- a/pkgs/development/python-modules/stack-data/default.nix +++ b/pkgs/development/python-modules/stack-data/default.nix @@ -1,5 +1,6 @@ { asttokens , buildPythonPackage +, cython , executing , fetchFromGitHub , git @@ -15,13 +16,13 @@ buildPythonPackage rec { pname = "stack-data"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "alexmojaki"; repo = "stack_data"; rev = "v${version}"; - sha256 = "sha256-dRIRDMq0tc1QuBHvppPwJA5PVGHyVRhoBlX5BsdDzec="; + sha256 = "sha256-brXFrk1UU5hxCVeRvGK7wzRA0Hoj9fgqoxTIwInPrEc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -39,6 +40,7 @@ buildPythonPackage rec { ]; checkInputs = [ + cython littleutils pygments pytestCheckHook diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 9612ac999cc8..1084a50be770 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -12,7 +12,6 @@ , requests , aiosqlite , databases -, pytest-asyncio , pytestCheckHook , pythonOlder , trio @@ -58,7 +57,6 @@ buildPythonPackage rec { checkInputs = [ aiosqlite databases - pytest-asyncio pytestCheckHook trio typing-extensions diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 44cd64821d9d..ac3c173c09a5 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "sha256-YHhGohA24D4O/Bj7JZTj8qaEGEZAupvxWcZYjWFTHmM="; + sha256 = "0qqyadhqsn66b7qrpfj08qc899pjwfa2byqqzh73xq1n22i4cy30"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix new file mode 100644 index 000000000000..7de42d5bc945 --- /dev/null +++ b/pkgs/development/python-modules/statmake/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, attrs +, cattrs +, fonttools +, fs +, pytestCheckHook +, ufo2ft +, ufoLib2 +}: + +buildPythonPackage rec { + pname = "statmake"; + version = "0.4.1"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "daltonmaag"; + repo = "statmake"; + rev = "v${version}"; + sha256 = "OXhoQAD4LEh80iRUZE2z8sCtWJDv/bSo0bwHbOOPVE0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + attrs + cattrs + fonttools + # required by fonttools[ufo] + fs + ]; + + checkInputs = [ + pytestCheckHook + ufo2ft + ufoLib2 + ]; + + postPatch = '' + # https://github.com/daltonmaag/statmake/pull/41 + substituteInPlace pyproject.toml \ + --replace 'requires = ["poetry>=1.0.0"]' 'requires = ["poetry-core"]' \ + --replace 'build-backend = "poetry.masonry.api"' 'build-backend = "poetry.core.masonry.api"' + ''; + + meta = with lib; { + description = "Applies STAT information from a Stylespace to a variable font"; + homepage = "https://github.com/daltonmaag/statmake"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 173458a634b6..0f01870c41b4 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.13.1"; + version = "0.13.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "006ec8d896d238873af8178d5475203844f2c391194ed8d42ddac37f5ff77a69"; + sha256 = "sha256-d9wpLJk5wDakdvF3D50Il2sFQ32qIpko2nMjEUfN59Q="; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/strenum/default.nix b/pkgs/development/python-modules/strenum/default.nix new file mode 100644 index 000000000000..f287b2623a6b --- /dev/null +++ b/pkgs/development/python-modules/strenum/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "strenum"; + version = "0.4.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "irgeek"; + repo = "StrEnum"; + rev = "v${version}"; + hash = "sha256-ktsPROIv/BbPinZfrBknI4c/WwRYGhWgmw209Hfg8EQ="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" + substituteInPlace pytest.ini \ + --replace " --cov=strenum --cov-report term-missing --black --pylint" "" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "strenum" + ]; + + meta = with lib; { + description = "MOdule for enum that inherits from str"; + homepage = "https://github.com/irgeek/StrEnum"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index c808fe6acd2d..cfefdbda6a48 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,20 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, requests }: +{ lib +, buildPythonPackage +, fetchPypi +, requests +, pythonOlder +}: buildPythonPackage rec { pname = "stripe"; - version = "2.65.0"; + version = "2.69.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2e55d4d7262085de9cef2228f14581925c35350ba58a332352b1ec9e19a7b7a6"; + hash = "sha256-iDB4/FvTc34dBYDDAIMjxYbaNreuhHmle40WE0DTy58="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; # Tests require network connectivity and there's no easy way to disable them doCheck = false; - pythonImportsCheck = [ "stripe" ]; + pythonImportsCheck = [ + "stripe" + ]; meta = with lib; { description = "Stripe Python bindings"; diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix index 0e884a09b440..52fe3769e224 100644 --- a/pkgs/development/python-modules/striprtf/default.nix +++ b/pkgs/development/python-modules/striprtf/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "striprtf"; - version = "0.0.19"; + version = "0.0.20"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "b7f15e11306e466dbe91665409233a06d9fdb4ee156489a3d879579891b04c25"; + sha256 = "sha256-8eMeMrazl1o9XcIyWICDg6ycRMtFMfgTUNz51w9hAmc="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 2e90d3350dbe..b6eb0c2672ad 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "structlog"; - version = "21.4.0"; + version = "21.5.0"; format = "flit"; # sdist is missing conftest.py @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "hynek"; repo = "structlog"; rev = version; - sha256 = "sha256-uXFSrC1TvQV46uu0sadC3eMq7yk5TnrpQE8m6NSv1Bg="; + sha256 = "0bc5lj0732j0hjq89llgrncyzs6k3aaffvg07kr3la44w0hlrb4l"; }; checkInputs = [ pytestCheckHook pytest-asyncio pretend freezegun simplejson twisted ]; diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index 92cd344edb6d..3df2a3e2895b 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -7,19 +7,21 @@ , pytest , pytest-cov , hypothesis -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "stups-pierone"; - version = "1.1.45"; - disabled = !isPy3k; + version = "1.1.51"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zalando-stups"; repo = "pierone-cli"; rev = version; - sha256 = "1ggfizw27wpcagbbk15xpfrhq6b250cx4278b5d7y8s438g128cs"; + hash = "sha256-OypGYHfiFUfcUndylM2N2WfPnfXXJ4gvWypUbltYAYE="; }; propagatedBuildInputs = [ @@ -28,9 +30,9 @@ buildPythonPackage rec { stups-zign ]; - preCheck = " + preCheck = '' export HOME=$TEMPDIR - "; + ''; checkInputs = [ pytest @@ -38,10 +40,14 @@ buildPythonPackage rec { hypothesis ]; + pythonImportsCheck = [ + "pierone" + ]; + meta = with lib; { description = "Convenient command line client for STUPS' Pier One Docker registry"; homepage = "https://github.com/zalando-stups/pierone-cli"; license = licenses.asl20; - maintainers = [ maintainers.mschuwalow ]; + maintainers = with maintainers; [ mschuwalow ]; }; } diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 1b6d1033c456..72101eaf29d8 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.3.16"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7waY5AOONi+u056JRH9KcoBWSB4AlMw4QcMW0uoCARc="; + hash = "sha256-q+a+OFFMAGl8KQi+KZ8h21+Pj0XEqP9ZIJii2PCgD6E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index 299d8446cfb7..68f298de1080 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, cython , h5py , matplotlib , numpy @@ -28,6 +29,10 @@ buildPythonPackage rec { sha256 = "1vwqyv215yf51j1278cn7l8mpqmy1grm9j7z3hxjlz4w65cff324"; }; + nativeBuildInputs = [ + cython + ]; + propagatedBuildInputs = [ spglib numpy @@ -44,6 +49,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # slight disagreement between caastepxbin versions + "test_castep_phonon_read_bands" + ]; + postPatch = '' substituteInPlace setup.py \ --replace "castepxbin==0.1.0" "castepxbin>=0.1.0" diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index 38516ab73c3e..c15e88ebeb24 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchgit +, fetchFromGitHub , lxml , isPy27 }: @@ -12,10 +12,12 @@ buildPythonPackage { propagatedBuildInputs = [ lxml ]; - src = fetchgit { - url = "https://github.com/kjellmf/svg2tikz"; - sha256 = "429428ec435e53672b85cdfbb89bb8af0ff9f8238f5d05970729e5177d252d5f"; + src = fetchFromGitHub { + owner = "kjellmf"; + repo = "svg2tikz"; rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4"; + sha256 = "sha256-QpQo7ENeU2crhc37uJu4rw/5+COPXQWXBynlF30lLV8="; + fetchSubmodules = true; }; meta = with lib; { diff --git a/pkgs/development/python-modules/svglib/default.nix b/pkgs/development/python-modules/svglib/default.nix index 9a0cf1a30f8d..145b24e55787 100644 --- a/pkgs/development/python-modules/svglib/default.nix +++ b/pkgs/development/python-modules/svglib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "svglib"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "33f075dc853807e56e92d6dc404104c6ccc7fb5388d96ab943d7b349b1c924c7"; + sha256 = "c77a0702fafd367c0fdca08ca1b7e1ee10058bde3bae252f49a3836e51e54519"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/swagger-spec-validator/default.nix b/pkgs/development/python-modules/swagger-spec-validator/default.nix index 71c9cf16780e..ce67e6689ace 100644 --- a/pkgs/development/python-modules/swagger-spec-validator/default.nix +++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "swagger-spec-validator"; - version = "2.5.0"; + version = "2.7.4"; src = fetchFromGitHub { owner = "Yelp"; repo = "swagger_spec_validator"; rev = "v" + version; - sha256 = "0qlkiyncdh7cdyjvnwjpv9i7y75ghwnpyqkkpfaa8hg698na13pw"; + sha256 = "sha256-7+kFmtzeze0QlGf6z/M4J4F7z771a5NWewB1S3+bxn4="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix index 592e083567a2..e06e7917be18 100644 --- a/pkgs/development/python-modules/swift/default.nix +++ b/pkgs/development/python-modules/swift/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "swift"; - version = "2.28.0"; + version = "2.29.1"; src = fetchPypi { inherit pname version; - sha256 = "79a216498a842226f71e9dfbbce4dba4a5718cda9b2be92b6e0aa21df977f70d"; + sha256 = "sha256-PoTob/Qz/XxEv/A271RQWT11rIIJBejVGjpAT14iKUg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix index df2c00ad7c0f..b1fc4d128cfb 100644 --- a/pkgs/development/python-modules/swspotify/default.nix +++ b/pkgs/development/python-modules/swspotify/default.nix @@ -1,26 +1,24 @@ { lib, stdenv, buildPythonPackage, fetchFromGitHub, requests -, pytestCheckHook, flask, flask-cors, dbus-python, mock, isPy27 }: +, pytestCheckHook, flask, flask-cors, dbus-python, mock, isPy27 +, poetry-core }: buildPythonPackage rec { pname = "SwSpotify"; - version = "1.2.2"; + version = "1.2.3"; disabled = isPy27; + format = "pyproject"; src = fetchFromGitHub { owner = "SwagLyrics"; repo = "SwSpotify"; rev = "v${version}"; - sha256 = "sha256-571knnY8LegIbqyPeKUfl+d0suTWAMQHYLN7edKFNdI="; + sha256 = "sha256-xGLvc154xnje45Akf7H1qqQRUc03gGVt8AhGlkcP3kY="; }; - propagatedBuildInputs = [ - requests flask flask-cors dbus-python - ]; + nativeBuildInputs = [ poetry-core ]; - postPatch = '' - substituteInPlace setup.py \ - --replace 'flask==2.0.1' 'flask' - ''; + propagatedBuildInputs = [ requests flask flask-cors ] + ++ lib.optionals stdenv.isLinux [ dbus-python ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 7114f0aeba48..41baf697fff3 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -7,14 +7,14 @@ buildPythonApplication rec { pname = "sybil"; - version = "2.0.1"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "597d71e246690b9223c132f0ed7dcac470dcbe9ad022004a801e108a00dc3524"; + hash = "sha256-bwLcIgSvflohIDeSTZdPcngfbcGP08RMx85GOhIPUw0="; }; checkInputs = [ @@ -22,9 +22,9 @@ buildPythonApplication rec { ]; disabledTests = [ - # Will be fixed with 3.0.0, https://github.com/simplistix/sybil/pull/27 - "test_future_imports" - "test_pytest" + # Sensitive to output of other commands + "test_namespace" + "test_unittest" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index 673e2682660b..db0f01ae51f0 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.8.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; rev = "v${version}"; - sha256 = "0yyi3w03fk19i32jmns1baq3rpmf7xfykzkivc7dmnxmjmxvq2gr"; + sha256 = "sha256-ZHplYEG97foy/unOdSokFFkDl4LK5TI4kypHSLpcCM4="; }; postConfigure = '' diff --git a/pkgs/development/python-modules/systembridge/default.nix b/pkgs/development/python-modules/systembridge/default.nix index 34403930602c..beca0ef8147a 100644 --- a/pkgs/development/python-modules/systembridge/default.nix +++ b/pkgs/development/python-modules/systembridge/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "systembridge"; - version = "2.2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "timmo001"; repo = "system-bridge-connector-py"; rev = "v${version}"; - sha256 = "sha256-AVMZBhf15eZM9oMUFyiHYs866P1v5z1pbTvX2Qpjzfc="; + sha256 = "sha256-Ts8zPRK6S5iLnl19Y/Uz0YAh6hDeVRNBY6HsvLwdUFw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index 4558b3afb26a..b854e09c0506 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "tablib"; - version = "3.1.0"; + version = "3.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d64c9f6712918a3d90ec5d71b44b8bab1083e3609e4844ad2be80eb633e097ed"; + sha256 = "12d8686454c721de88d8ca5adf07e1f419ef6dbcecedf65e8950d4a329daf3a0"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/tailscale/default.nix b/pkgs/development/python-modules/tailscale/default.nix index 96016b3f0d4d..67a384f4b22b 100644 --- a/pkgs/development/python-modules/tailscale/default.nix +++ b/pkgs/development/python-modules/tailscale/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tailscale"; - version = "0.1.6"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-tailscale"; rev = "v${version}"; - sha256 = "1dkmjc78mhgbikfz6mi6g63a36w6v29pdbb3pvgpicg0l649rsc9"; + sha256 = "sha256-/tS9ZMUWsj42n3MYPZJYJELzX3h02AIHeRZmD2SuwWE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tappy/default.nix b/pkgs/development/python-modules/tappy/default.nix index 9e0b83bc925d..4652ea99f6d8 100644 --- a/pkgs/development/python-modules/tappy/default.nix +++ b/pkgs/development/python-modules/tappy/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "tap.py"; - version = "3.0"; + version = "3.1"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9e7u6/1k5T0yZhdSu0wohYmjuru5bbPzkaTsKfE1nHA="; + sha256 = "3c0cd45212ad5a25b35445964e2517efa000a118a1bfc3437dae828892eaf1e1"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 18ab606afdd7..b2a719a020b8 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.7.3"; + version = "5.8.0"; # upstream only supports 3.10+ disabled = pythonOlder "3.10"; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "v${version}"; - sha256 = "1d6rnlybj971b5j5glvq288hd4r204nkmssqb0k8rm6cqcwhz292"; + sha256 = "sha256-spTIHiyspjrIV8DKR7YNpNTNO9SlcLOROuABhmu3ckA="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/pkgs/development/python-modules/teamcity-messages/default.nix b/pkgs/development/python-modules/teamcity-messages/default.nix new file mode 100644 index 000000000000..4f2b7f76de89 --- /dev/null +++ b/pkgs/development/python-modules/teamcity-messages/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "teamcity-messages"; + version = "1.31"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "JetBrains"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-oYXP9HWdgmEq48rYyuX6zHf+cp835C0BtHUAME+5S+k="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests/unit-tests/" + ]; + + pythonImportsCheck = [ + "teamcity" + ]; + + meta = with lib; { + description = "Python unit test reporting to TeamCity"; + homepage = "https://github.com/JetBrains/teamcity-messages"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/temescal/default.nix b/pkgs/development/python-modules/temescal/default.nix new file mode 100644 index 000000000000..429b0a23d187 --- /dev/null +++ b/pkgs/development/python-modules/temescal/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pycryptodome +}: + +buildPythonPackage rec { + pname = "temescal"; + version = "0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-V1wsncIm4f6NPa6lwlO9pkDIFBG1K3VhmOQCwyrPGm4="; + }; + + propagatedBuildInputs = [ + pycryptodome + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "temescal" + ]; + + meta = with lib; { + description = "Module for interacting with LG speaker systems"; + homepage = "https://github.com/google/python-temescal"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index e9cd3e84fee5..79b04b7ebbb2 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,16 +1,15 @@ { lib, buildPythonPackage, fetchPypi -, setuptools-scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock +, setuptools-scm, pytestCheckHook, pytest-freezegun, freezegun, backports_unittest-mock , six, pytz, jaraco_functools, pythonOlder -, pytest-flake8, pytest-cov, pytest-black, pytest-mypy }: buildPythonPackage rec { pname = "tempora"; - version = "4.1.2"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "fd6cafd66b01390d53a760349cf0b3123844ec6ae3d1043d7190473ea9459138"; + sha256 = "aa21dd1956e29559ecb2f2f2e14fcdb950085222fbbf86e6c946b5e1a8c36b26"; }; disabled = pythonOlder "3.2"; @@ -20,14 +19,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ six pytz jaraco_functools ]; checkInputs = [ - pytest-freezegun pytest freezegun backports_unittest-mock - pytest-flake8 pytest-cov pytest-black pytest-mypy + pytest-freezegun pytestCheckHook freezegun backports_unittest-mock ]; - checkPhase = '' - pytest - ''; - meta = with lib; { description = "Objects and routines pertaining to date and time"; homepage = "https://github.com/jaraco/tempora"; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 1daaac6ae7eb..760e9a0e9d1c 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,7 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch -, bazel_0_26 , buildBazelPackage , buildPythonPackage , python @@ -11,47 +9,33 @@ , tensorflow , six , numpy +, dm-tree +, keras , decorator , cloudpickle , gast , hypothesis , scipy +, pandas +, mpmath , matplotlib , mock , pytest }: let - version = "0.8.0"; + version = "0.15.0"; pname = "tensorflow_probability"; # first build all binaries and generate setup.py using bazel bazel-wheel = buildBazelPackage { - bazel = bazel_0_26; - name = "${pname}-${version}-py2.py3-none-any.whl"; - src = fetchFromGitHub { owner = "tensorflow"; repo = "probability"; - rev = version; - sha256 = "07cm8zba8n0ihzdm3k4a4rsg5v62xxsfvcw4h0niz91c0parqjqy"; + rev = "v" + version; + sha256 = "155fgmra90s08vjnp61qxdrpzq74xa3kdzhgdkavwgc25pvxn3mi"; }; - - patches = [ - (fetchpatch { - name = "gast-0.3.patch"; - url = "https://github.com/tensorflow/probability/commit/ae7a9d9771771ec1e7755a3588b9325f050a84cc.patch"; - sha256 = "0kfhx30gshm8f3945na9yjjik71r20qmjzifbigaj4l8dwd9dz1a"; - excludes = ["testing/*"]; - }) - (fetchpatch { - name = "cloudpickle-1.2.patch"; - url = "https://github.com/tensorflow/probability/commit/78ef12b5afe3f567d16c70b74015ed1ddff1b0c8.patch"; - sha256 = "12ms2xcljvvrnig0j78s3wfv4yf3bm5ps4rgfgv5lg2a8mzpc1ga"; - }) - ]; - nativeBuildInputs = [ # needed to create the output wheel in installPhase python @@ -64,7 +48,7 @@ let bazelTarget = ":pip_pkg"; fetchAttrs = { - sha256 = "1qw7vkwnxy45z4vm94isq5m96xiz35sigag7vjg1xb2sklbymxh8"; + sha256 = "0sgxdlw5x3dydy53l10vbrj8smh78b7r1wff8jxcgp4w69mk8zfm"; }; buildAttrs = { @@ -98,34 +82,31 @@ in buildPythonPackage { decorator cloudpickle gast + dm-tree + keras ]; # Listed here: - # https://github.com/tensorflow/probability/blob/f01d27a6f256430f03b14beb14d37def726cb257/testing/run_tests.sh#L58 + # https://github.com/tensorflow/probability/blob/f3777158691787d3658b5e80883fe1a933d48989/testing/dependency_install_lib.sh#L83 checkInputs = [ hypothesis pytest scipy + pandas + mpmath matplotlib mock ]; - # actual checks currently fail because for some reason - # tf.enable_eager_execution is called too late. Probably because upstream - # intents these tests to be run by bazel, not plain pytest. - # checkPhase = '' - # # tests need to import from other test files - # export PYTHONPATH="$PWD/tensorflow-probability:$PYTHONPATH" - # py.test - # ''; + # Ideally, we run unit tests with pytest, but in checkPhase, only the Bazel-build wheel is available. + # But it seems not guaranteed that running the tests with pytest will even work, see + # https://github.com/tensorflow/probability/blob/c2a10877feb2c4c06a4dc58281e69c37a11315b9/CONTRIBUTING.md?plain=1#L69 + # Ideally, tests would be run using Bazel. For now, lets's do a... # sanity check - checkPhase = '' - python -c 'import tensorflow_probability' - ''; + pythonImportsCheck = [ "tensorflow_probability" ]; meta = with lib; { - broken = true; # tf-probability 0.8.0 is not compatible with tensorflow 2.3.2 description = "Library for probabilistic reasoning and statistical analysis"; homepage = "https://www.tensorflow.org/probability/"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index 123c339fea48..a4a04d898566 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -2,6 +2,7 @@ , fetchPypi , buildPythonPackage , pythonOlder +, pythonAtLeast , numpy , wheel , werkzeug @@ -24,7 +25,7 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; version = "2.6.0"; format = "wheel"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { pname = "tensorboard"; @@ -41,7 +42,8 @@ buildPythonPackage rec { pushd unpacked/tensorboard-${version} substituteInPlace tensorboard-${version}.dist-info/METADATA \ - --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" + --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" \ + --replace "google-auth-oauthlib (<0.5,>=0.4.1)" "google-auth-oauthlib (<0.6,>=0.4.1)" popd wheel pack ./unpacked/tensorboard-${version} diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 776fbaa18019..517faef3f8fc 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -72,7 +72,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.7.0"; + version = "2.7.1"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -185,7 +185,7 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "sha256-n7jRDPeXsyq4pEWSWmOCas4c8VsArIKlCuwvSU/Ro/c="; + sha256 = "1qwzbqq899swrwrwmm6z7mq9sc55gyh0r4ca0mcnchbvn7w0qbkh"; }; patches = [ @@ -413,8 +413,10 @@ let license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; platforms = with platforms; linux ++ darwin; - timeout = 86400; # 24 hours, needed for darwin broken = !(xlaSupport -> cudaSupport); + } // lib.optionalAttrs stdenv.isDarwin { + timeout = 86400; # 24 hours + maxSilent = 14400; # 4h, double the default of 7200s }; }; diff --git a/pkgs/development/python-modules/terminaltables/default.nix b/pkgs/development/python-modules/terminaltables/default.nix index cb528b5b4e9a..7b548b763fdf 100644 --- a/pkgs/development/python-modules/terminaltables/default.nix +++ b/pkgs/development/python-modules/terminaltables/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "terminaltables"; - version = "3.1.7"; + version = "3.1.10"; src = fetchPypi { inherit pname version; - sha256 = "5dab2f33927c0a020b8011c81b92830ff9fd4ba701657da5d7bfdc41048360a6"; + sha256 = "ba6eca5cb5ba02bba4c9f4f985af80c54ec3dccf94cfcd190154386255e47543"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 132e0810d3dc..5cdc1dafc034 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "1.6.0"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "1jxdfk2ka131spnfkl35lnzvkgwgsbs5xl3hsjj03q1nfjcqvx9l"; + sha256 = "sha256-Q/ltNdr2Huvfj1RmKFopJbaR4FSM7ziWadmDKPS26vc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix index f0c26292c84b..1cc20cc2cca7 100644 --- a/pkgs/development/python-modules/test-tube/default.nix +++ b/pkgs/development/python-modules/test-tube/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "test-tube"; - version = "0.7.5"; + version = "0.628"; disabled = isPy27; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "williamFalcon"; repo = pname; rev = version; - sha256 = "0zpvlp1ybp2dhgap8jsalpfdyg8ycjhlfi3xrdf5dqffqvh2yhp2"; + sha256 = "0w60xarmcw06gc4002sy7bjfykdz34gbgniswxkl0lw8a1v0xn2m"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index b582bf4bc7f7..91f91a3d7b17 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -12,14 +12,20 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.18.3"; + version = "6.18.5"; format = "setuptools"; + # DO NOT CONTACT upstream. + # https://github.com/simplistix/ is only concerned with internal CI process. + # Any attempt by non-standard pip workflows to comment on issues will + # be met with hostility. + # https://github.com/simplistix/testfixtures/issues/169 + # https://github.com/simplistix/testfixtures/issues/168 disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JgAQCulv/QgjNLN441VVD++LSlKab6TDT0cTCQXHQm0="; + hash = "sha256-Atrog/Vn9bcP0608nu+5WRLniskL5sdES14vRr9XLIQ="; }; checkInputs = [ @@ -35,19 +41,6 @@ buildPythonPackage rec { "testfixtures/tests/test_django" ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/simplistix/testfixtures/issues/168 - "test_invalid_communicate_call" - "test_invalid_kill" - "test_invalid_parameters" - "test_invalid_poll" - "test_invalid_send_signal" - "test_invalid_terminate" - "test_invalid_wait_call" - "test_replace_delattr_cant_remove" - "test_replace_delattr_cant_remove_not_strict" - ]; - pytestFlagsArray = [ "testfixtures/tests" ]; diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index ee2e2bb2c993..2eae44aeeb27 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { pname = "textacy"; version = "0.12.0"; disabled = pythonOlder "3.7"; + format = "pyproject"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix index ae9bda2b8b84..e1bfdb5909df 100644 --- a/pkgs/development/python-modules/textfsm/default.nix +++ b/pkgs/development/python-modules/textfsm/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "textfsm"; - version = "1.1.2"; + version = "1.1.3"; format = "setuptools"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1cbczg3h2841v1xk2s2xg540c69vsrkwxljm758fyr65kshrzlhm"; + sha256 = "sha256-IHgKG8v0X+LSK6purWBdwDnI/BCs5XA12ZJixuqqXWg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/textile/default.nix b/pkgs/development/python-modules/textile/default.nix new file mode 100644 index 000000000000..a8acf346cd60 --- /dev/null +++ b/pkgs/development/python-modules/textile/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, html5lib +, pytestCheckHook +, pythonOlder +, regex +}: + +buildPythonPackage rec { + pname = "textile"; + version = "4.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = pname; + repo = "python-textile"; + rev = version; + hash = "sha256-WwX7h07Bq8sNsViHwmfhrrqleXacmrIY4ZBBaP2kKnI="; + }; + + propagatedBuildInputs = [ + html5lib + regex + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov=textile --cov-report=html --cov-append --cov-report=term-missing" "" + ''; + + pythonImportsCheck = [ + "textile" + ]; + + meta = with lib; { + description = "MOdule for generating web text"; + homepage = "https://github.com/textile/python-textile"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix new file mode 100644 index 000000000000..e14c64730a23 --- /dev/null +++ b/pkgs/development/python-modules/textual/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, rich +, typing-extensions +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "textual"; + version = "0.1.15"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Textualize"; + repo = pname; + rev = "v${version}"; + sha256 = "1jmjais0yq8dwi9yikgrxdw4rwp8aq1981nhfxn0v97jb07i4cj6"; + }; + + patches = [ + (fetchpatch { + # v0.1.15 git tag has 0.1.14 in pyproject.toml + name = "version.patch"; + url = "https://github.com/Textualize/textual/commit/1b8d7d184e10889002425641222702afba508aea.patch"; + sha256 = "1nfqp5f8ba3fg0ar3lghrlqypbjbsaywxaz3iiff8fy8j2wgsppp"; + }) + ]; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + rich + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "textual" ]; + + meta = with lib; { + description = "TUI framework for Python inspired by modern web development"; + homepage = "https://github.com/Textualize/textual"; + license = licenses.mit; + maintainers = with maintainers; [ jyooru ]; + }; +} diff --git a/pkgs/development/python-modules/theano-pymc/default.nix b/pkgs/development/python-modules/theano-pymc/default.nix new file mode 100644 index 000000000000..ad0b93fe0940 --- /dev/null +++ b/pkgs/development/python-modules/theano-pymc/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, pandas +, numpy +, scipy +, filelock +, pytest +, nose +, parameterized +}: + +buildPythonPackage rec { + pname = "theano-pymc"; + version = "1.1.2"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "Theano-PyMC"; + inherit version; + sha256 = "5da6c2242ea72a991c8446d7fe7d35189ea346ef7d024c890397011114bf10fc"; + }; + + # No need for coverage stats in Nix builds + postPatch = '' + substituteInPlace setup.py --replace ", 'pytest-cov'" "" + ''; + + propagatedBuildInputs = [ + pandas + numpy + scipy + filelock + ]; + + # The test suite is computationally intensive and test failures are not + # indicative for package usability hence tests are disabled by default. + doCheck = false; + pythonImportsCheck = [ "theano" ]; + + meta = { + description = "PyMC theano fork"; + homepage = "https://github.com/majidaldo/Theano-PyMC"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nidabdella ]; + }; +} diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 9524f7e44970..a25c8d235674 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, python , fetchPypi , pytestCheckHook , blis @@ -29,16 +30,21 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.0.13"; + version = "8.0.15"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-R2YqOuM9RFp3tup7dyREgFx7uomR8SLjUNr3Le3IFxo="; + sha256 = "sha256-LjFQINqFw3keGR+/N8SiQz9XzzIuJzgNoM1N6Z2WBTs="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pydantic>=1.7.4,!=1.8,!=1.8.1,<1.9.0" "pydantic" + ''; + buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin [ @@ -73,12 +79,14 @@ buildPythonPackage rec { pytestCheckHook ]; - # Cannot find cython modules. - doCheck = false; + # Add native extensions. + preCheck = '' + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH - pytestFlagsArray = [ - "thinc/tests" - ]; + # avoid local paths, relative imports wont resolve correctly + mv thinc/tests tests + rm -r thinc + ''; pythonImportsCheck = [ "thinc" diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index fdd4c2bf0b2f..01294ff5007f 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2021.11.2"; + version = "2022.2.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FT4x+h2JL0gvq7KunyVh+kKe5C0BpvZ+WM7hNjfZKFs="; + hash = "sha256-ftp0EXZDaBuyyqaVtI854iQ7SIf3z5kdWt/9gT5cg3M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tifffile/python2-regex-compat.patch b/pkgs/development/python-modules/tifffile/python2-regex-compat.patch deleted file mode 100644 index 7f4ec5764bb2..000000000000 --- a/pkgs/development/python-modules/tifffile/python2-regex-compat.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/setup.py 2019-02-20 18:52:12.000000000 +0100 -+++ b/setup.py 2019-03-02 13:55:39.014019260 +0100 -@@ -20,12 +20,6 @@ - - description = re.search(r'"""(.*)\.(?:\r\n|\r|\n)', code).groups()[0] - --readme = re.search(r'(?:\r\n|\r|\n){2}"""(.*)"""(?:\r\n|\r|\n){2}from', code, -- re.MULTILINE | re.DOTALL).groups()[0] -- --readme = '\n'.join([description, '=' * len(description)] -- + readme.splitlines()[1:]) -- - license = re.search(r'(# Copyright.*?(?:\r\n|\r|\n))(?:\r\n|\r|\n)+""', code, - re.MULTILINE | re.DOTALL).groups()[0] - -@@ -41,7 +35,6 @@ - name='tifffile', - version=version, - description=description, -- long_description=readme, - author='Christoph Gohlke', - author_email='cgohlke@uci.edu', - url='https://www.lfd.uci.edu/~gohlke/', diff --git a/pkgs/development/python-modules/tikzplotlib/default.nix b/pkgs/development/python-modules/tikzplotlib/default.nix new file mode 100644 index 000000000000..ebf58dd12e9c --- /dev/null +++ b/pkgs/development/python-modules/tikzplotlib/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, matplotlib +, numpy +, pillow +, webcolors +, flit-core +, pytestCheckHook +, pandas +}: + +buildPythonPackage rec { + pname = "tikzplotlib"; + version = "0.10.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "nschloe"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-PLExHhEnxkEiXsE0rqvpNWwVZ+YoaDa2BTx8LktdHl0="; + }; + + propagatedBuildInputs = [ + matplotlib + numpy + pillow + webcolors + flit-core + ]; + + checkInputs = [ + pytestCheckHook + pandas + ]; + + meta = with lib; { + description = "Save matplotlib figures as TikZ/PGFplots for smooth integration into LaTeX"; + homepage = "https://github.com/nschloe/tikzplotlib"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index bdd6ad241158..b310defa45d1 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.6.6"; + version = "0.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = version; - sha256 = "0b2kn1xyf7d994kz29dpqiaf8yzvx0axw4yqi854c54pl22ddgzl"; + sha256 = "0iz16sgr5dpwc1jvb6brcmgvvg0npjdd98q4wgkqmvg7qif92zls"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 58bf190495f4..65b22f905ef9 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -3,37 +3,21 @@ , fetchFromGitHub , pytestCheckHook , requests +, pytest +, pythonOlder }: python3Packages.buildPythonPackage rec { pname = "timetagger"; - version = "22.1.2"; + version = "22.3.1"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "v${version}"; - sha256 = "0xrajx0iij7r70ch17m4y6ydyh368dn6nbjsv74pn1x8frd686rw"; + sha256 = "sha256-pHogDjqXuoQp5afSnPvMPaKoBtPE6u3kMi87SzY5yoU="; }; - meta = with lib; { - homepage = "https://timetagger.app"; - license = licenses.gpl3; - description = "Tag your time, get the insight"; - maintainers = with maintainers; [ matthiasbeyer ]; - }; - - checkInputs = [ - pytestCheckHook - requests - ]; - - preCheck = '' - # https://github.com/NixOS/nixpkgs/issues/12591 - mkdir -p check-phase - export HOME=$(pwd)/check-phase - ''; - propagatedBuildInputs = with python3Packages; [ asgineer itemdb @@ -44,4 +28,23 @@ python3Packages.buildPythonPackage rec { uvicorn ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + + checkInputs = [ + pytestCheckHook + requests + pytest + ]; + + # fails with `No module named pytest` on python version 3.10 + doCheck = pythonOlder "3.10"; + + meta = with lib; { + homepage = "https://timetagger.app"; + license = licenses.gpl3Only; + description = "Tag your time, get the insight"; + maintainers = with maintainers; [ matthiasbeyer ]; + }; } diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix index 0e7bcb303f30..ae08cceab1ee 100644 --- a/pkgs/development/python-modules/tinydb/default.nix +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tinydb"; - version = "4.6.1"; + version = "4.7.0"; disabled = pythonOlder "3.5"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "msiemens"; repo = pname; rev = "v${version}"; - sha256 = "17m8g6xzwa0k8qb4k4p9hjcyv58gmxz1lkvr2ckc5csa0ydvv91a"; + sha256 = "sha256-cAIo/qdIOIpPt9vPan5oJfKtH2Gmrm03aLuAHpfUfLY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index 0b9e6547dee6..33fe952ad2a3 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -4,6 +4,7 @@ , pytestCheckHook , pythonOlder , regex +, setuptools-scm }: buildPythonPackage rec { @@ -20,6 +21,12 @@ buildPythonPackage rec { sha256 = "169ywzn5wfzwyknqavspkdpwbx31nycxsxkl7iywwk71gs1lskkw"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ regex ]; diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index d39b4fa82c81..f2f15c8bb7fa 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -14,15 +14,19 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.1.2"; + version = "3.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0gNMNVhlH32P2t6oP7aBBQstZi3GegDZUDJtyQIClEQ="; + sha256 = "sha256-PUtqIQVgC30CkOoje/MLaw3HY+UPy+QOhJoBm9bby/8="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; propagatedBuildInputs = [ filelock @@ -38,10 +42,13 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace pytest.ini --replace " --pylint" "" + substituteInPlace pytest.ini \ + --replace " --pylint" "" ''; - pythonImportsCheck = [ "tldextract" ]; + pythonImportsCheck = [ + "tldextract" + ]; meta = with lib; { description = "Python module to accurately separate the TLD from the domain of an URL"; diff --git a/pkgs/development/python-modules/tls-parser/default.nix b/pkgs/development/python-modules/tls-parser/default.nix index ad35fe501282..a886e116e458 100644 --- a/pkgs/development/python-modules/tls-parser/default.nix +++ b/pkgs/development/python-modules/tls-parser/default.nix @@ -7,23 +7,29 @@ buildPythonPackage rec { pname = "tls-parser"; - version = "1.2.2"; + version = "2.0.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nabla-c0d3"; repo = "tls_parser"; rev = version; - sha256 = "12qj3vg02r5a51w6gbgb1gcxicqc10lbbsdi57jkkfvbqiindbd0"; + hash = "sha256-A1lYRe1sHDoOFdF20DP+xRMcPBWzokIXFphIpaBmwBc="; }; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "tls_parser" ]; + pythonImportsCheck = [ + "tls_parser" + ]; meta = with lib; { - homepage = "https://github.com/nabla-c0d3/tls_parser"; description = "Small library to parse TLS records"; + homepage = "https://github.com/nabla-c0d3/tls_parser"; platforms = with platforms; linux ++ darwin; license = licenses.mit; maintainers = with maintainers; [ veehaitch ]; diff --git a/pkgs/development/python-modules/tmb/default.nix b/pkgs/development/python-modules/tmb/default.nix index 713cf6139285..10a6e3b00d50 100644 --- a/pkgs/development/python-modules/tmb/default.nix +++ b/pkgs/development/python-modules/tmb/default.nix @@ -2,28 +2,39 @@ , buildPythonPackage , fetchFromGitHub , requests +, pythonOlder }: buildPythonPackage rec { pname = "tmb"; - version = "0.1.1"; + version = "0.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "alemuro"; repo = pname; rev = version; - sha256 = "sha256-xwzaJuiQxExUA5W4kW7t1713S6NOvDNagcD3/dwA+DE="; + hash = "sha256-/syHSu9LKLDe3awrgSIHh0hV+raWqKd53f43WagHn9c="; }; - propagatedBuildInputs = [ requests ]; + VERSION = version; + + propagatedBuildInputs = [ + requests + ]; + + pythonImportsCheck = [ + "tmb" + ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "tmb" ]; meta = with lib; { - homepage = "https://github.com/alemuro/tmb"; description = "Python library that interacts with TMB API"; + homepage = "https://github.com/alemuro/tmb"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 1bbac9ce9da1..30c3f08f52e7 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "toggl-cli"; - version = "2.4.2"; + version = "2.4.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "togglCli"; inherit version; - sha256 = "1wgh231r16jyvaj1ch1pajvl9szflb4srs505pfdwdlqvz7rzww8"; + sha256 = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tomli/default.nix b/pkgs/development/python-modules/tomli/default.nix index c593e1e4cb19..551655eebf0d 100644 --- a/pkgs/development/python-modules/tomli/default.nix +++ b/pkgs/development/python-modules/tomli/default.nix @@ -3,6 +3,12 @@ , callPackage , fetchFromGitHub , flit-core + +# important downstream dependencies +, flit +, black +, mypy +, setuptools-scm }: buildPythonPackage rec { @@ -41,6 +47,7 @@ buildPythonPackage rec { passthru.tests = { pytest = callPackage ./tests.nix { }; + inherit flit black mypy setuptools-scm; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index fd6cec70f060..6c8455f060ec 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.7.2"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"; + sha256 = "29e84a855712dfe0e88a48f6d05c21118dbafb283bb2eed614d46f80deb8e9a1"; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/torch-tb-profiler/default.nix b/pkgs/development/python-modules/torch-tb-profiler/default.nix new file mode 100644 index 000000000000..fc53c5ba8232 --- /dev/null +++ b/pkgs/development/python-modules/torch-tb-profiler/default.nix @@ -0,0 +1,48 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pandas +, pytestCheckHook +, pytorch +, tensorflow-tensorboard +, torchvision +}: + +let + version = "0.3.1"; + repo = fetchFromGitHub { + owner = "pytorch"; + repo = "kineto"; + rev = "v${version}"; + hash = "sha256-Yg001XzOPDmz9wEP2b7Ggz/uU6x5PFzaaBeUBwWKFS0="; + }; +in +buildPythonPackage rec { + pname = "torch_tb_profiler"; + inherit version; + format = "setuptools"; + + # See https://discourse.nixos.org/t/extracting-sub-directory-from-fetchgit-or-fetchurl-or-any-derivation/8830. + src = "${repo}/tb_plugin"; + + propagatedBuildInputs = [ pandas tensorflow-tensorboard ]; + + checkInputs = [ pytestCheckHook pytorch torchvision ]; + + disabledTests = [ + # Tests that attempt to access the filesystem in naughty ways. + "test_profiler_api_without_gpu" + "test_tensorboard_end2end" + "test_tensorboard_with_path_prefix" + "test_tensorboard_with_symlinks" + ]; + + pythonImportsCheck = [ "torch_tb_profiler" ]; + + meta = with lib; { + description = "PyTorch Profiler TensorBoard Plugin"; + homepage = "https://github.com/pytorch/kineto"; + license = licenses.bsd3; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index 1f6ae80b0329..ba504102329d 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -2,6 +2,10 @@ , stdenv , buildPythonPackage , fetchurl +, isPy37 +, isPy38 +, isPy39 +, isPy310 , python , pytorch-bin , pythonOlder @@ -10,7 +14,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "0.10.0"; + version = "0.11.0"; format = "wheel"; src = @@ -19,7 +23,7 @@ buildPythonPackage rec { srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported; in fetchurl srcs; - disabled = ! (pythonAtLeast "3.7" && pythonOlder "3.10"); + disabled = !(isPy37 || isPy38 || isPy39 || isPy310); propagatedBuildInputs = [ pytorch-bin diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index 764b9db426b9..70ae3357221f 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -6,21 +6,61 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.10.0" = { + "0.11.0" = { x86_64-linux-37 = { - name = "torchaudio-0.10.0-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-FspXTTODdkO0nPUJcJm8+vLIvckUa8gRfBPBT9LcKPw="; + name = "torchaudio-0.11.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-AdqgntXh2rTD7rBePshFAQ2tVl7b+734wG4r471/Y2U="; }; x86_64-linux-38 = { - name = "torchaudio-0.10.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-Mf7QdXBSIIWRfT7ACthEwFA1V2ieid8legbMnRQnzqI="; + name = "torchaudio-0.11.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-zuCHDpz3bkOUjYWprqX9VXoUbXfR8Vhdf1VFfOUg8z4="; }; x86_64-linux-39 = { - name = "torchaudio-0.10.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchaudio-0.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-LMSGNdmku1iHRy1jCRTTOYcQlRL+Oc9jjZC1nx++skA="; + name = "torchaudio-0.11.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-btI9TpsOjeLnIz6J56avNv4poJTpXjjhDbMy6+ZFQvI="; + }; + x86_64-linux-310 = { + name = "torchaudio-0.11.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchaudio-0.11.0%2Bcu113-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-Zk+AWytEXfJ+HM69BAPhVsvN6pgQwC6uaW7Xux2row4="; + }; + x86_64-darwin-37 = { + name = "torchaudio-0.11.0-cp37-cp37m-macosx_10_15_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp37-cp37m-macosx_10_15_x86_64.whl"; + hash = "sha256-uaTT4athEWHAZe0hBoBIM/9LhfZNhAIexZBGg2MWn50="; + }; + x86_64-darwin-38 = { + name = "torchaudio-0.11.0-cp38-cp38-macosx_10_15_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp38-cp38-macosx_10_15_x86_64.whl"; + hash = "sha256-9OndqejTzgu9XnkZJiGfUFS4uFNlx5vi7pAzOs+a2/w="; + }; + x86_64-darwin-39 = { + name = "torchaudio-0.11.0-cp39-cp39-macosx_10_15_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp39-cp39-macosx_10_15_x86_64.whl"; + hash = "sha256-cNi8B/J3YI0jqaoI2z+68DVmAlS8EtmzYWQMRVZ3dVk="; + }; + x86_64-darwin-310 = { + name = "torchaudio-0.11.0-cp310-cp310-macosx_10_15_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp310-cp310-macosx_10_15_x86_64.whl"; + hash = "sha256-g2Pj2wqK9YIP19O/g5agryPcgiHJqdS2Di44mAVJKUQ="; + }; + aarch64-darwin-38 = { + name = "torchaudio-0.11.0-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-MX/Y7Dn92zrx2tkGWTuezcPt9o5/V4DEL43pVlha5IA="; + }; + aarch64-darwin-39 = { + name = "torchaudio-0.11.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-5eVRP83VeHAGGWW++/B2V4eyX0mcPgC1j02ETkQYMXc="; + }; + aarch64-darwin-310 = { + name = "torchaudio-0.11.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/torchaudio-0.11.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-06OyzOuV8E7ZNtozvFO9Zm2rBxWnnbM65HGYUiQdwtI="; }; }; } diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index 4e62ab4ed359..294c917e0d17 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -5,12 +5,21 @@ set -eou pipefail version=$1 -bucket="https://download.pytorch.org/whl/cu113" +linux_bucket="https://download.pytorch.org/whl/cu113" +darwin_bucket="https://download.pytorch.org/whl" url_and_key_list=( - "x86_64-linux-37 $bucket/torchaudio-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl" - "x86_64-linux-38 $bucket/torchaudio-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $bucket/torchaudio-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-37 $linux_bucket/torchaudio-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchaudio-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $linux_bucket/torchaudio-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_bucket/torchaudio-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_bucket/torchaudio-${version}%2Bcu113-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-darwin-37 $darwin_bucket/torchaudio-${version}-cp37-cp37m-macosx_10_15_x86_64.whl torchaudio-${version}-cp37-cp37m-macosx_10_15_x86_64.whl" + "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_15_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_15_x86_64.whl" + "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_15_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_15_x86_64.whl" + "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_15_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_15_x86_64.whl" + "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" + "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" + "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" ) hashfile=binary-hashes-"$version".nix diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index f7041dbb519d..8b1d0e2ec8de 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -5,6 +5,7 @@ , isPy37 , isPy38 , isPy39 +, isPy310 , patchelf , pillow , python @@ -15,7 +16,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.11.1"; + version = "0.12.0"; in buildPythonPackage { inherit version; @@ -25,7 +26,7 @@ in buildPythonPackage { src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; - disabled = !(isPy37 || isPy38 || isPy39); + disabled = !(isPy37 || isPy38 || isPy39 || isPy310); nativeBuildInputs = [ patchelf diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index b608bab24409..271968391ef0 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,21 +6,61 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.11.1" = { + "0.12.0" = { x86_64-linux-37 = { - name = "torchvision-0.11.1-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-2xKWqWNKqmOMyVJnPfbtF+B9PQ7z4S66J1T3P8EvM0I="; + name = "torchvision-0.12.0-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-i/qktZT+5HQYQjtTHtxOV751DcsP9AHMsSV9/svsGzA="; }; x86_64-linux-38 = { - name = "torchvision-0.11.1-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-bFxvJaNEomytXXANHng+oU8YSLGkuO/TSzkoDskkaIE="; + name = "torchvision-0.12.0-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-NxM+jFsOwvAZmeWRFvbQ422a+xx/j1i9DD3ImW+DVBk="; }; x86_64-linux-39 = { - name = "torchvision-0.11.1-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu113/torchvision-0.11.1%2Bcu113-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-ysN3LmSKR+FVKYGnCGQJqa8lVApVT5rPMO+NHmmazAc="; + name = "torchvision-0.12.0-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-bGO5q+KEnv7SexmbbUWaIbsBcIxyDbL8pevZQbLwDbg="; + }; + x86_64-linux-310 = { + name = "torchvision-0.12.0-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu113/torchvision-0.12.0%2Bcu113-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-ocsGOHa967HcZGV+1omD/xMHufmoi166Yg2Hr+SEhfE="; + }; + x86_64-darwin-37 = { + name = "torchvision-0.12.0-cp37-cp37m-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp37-cp37m-macosx_10_9_x86_64.whl"; + hash = "sha256-GJM7xZf0VjmTJJcZqWqV28fTN0yQ+7MNPafVGPOv60I="; + }; + x86_64-darwin-38 = { + name = "torchvision-0.12.0-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp38-cp38-macosx_10_9_x86_64.whl"; + hash = "sha256-DWAuCb1Fc2/y55aOjduw7s6Vb/ltcVSLGxtIeP33S9g="; + }; + x86_64-darwin-39 = { + name = "torchvision-0.12.0-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp39-cp39-macosx_10_9_x86_64.whl"; + hash = "sha256-RMye+ZLS4qtjsIg/fezrwiRNupO3JUe6EfV6yEUvbq0="; + }; + x86_64-darwin-310 = { + name = "torchvision-0.12.0-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp310-cp310-macosx_10_9_x86_64.whl"; + hash = "sha256-aTZW5nkLarIeSm6H6BwpgrrZ5FW16yThS7ZyOC7GEw8="; + }; + aarch64-darwin-38 = { + name = "torchvision-0.12.0-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-n0JCD38LKc09YXdt8xV4JyV6DPFrLAJ3bcFslquxJW0="; + }; + aarch64-darwin-39 = { + name = "torchvision-0.12.0-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-adgvR7Z7rW3cu4eDO6WVCmwnG6l7quTAlVYQBxvwNPU="; + }; + aarch64-darwin-310 = { + name = "torchvision-0.12.0-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/torchvision-0.12.0-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-oL5FAcoLobGVZEySQ/SaHEmiblKn83kkxCOdC/XsvY0="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 4774e09f0b6e..7b6384966ab1 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -24,13 +24,13 @@ let cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList; in buildPythonPackage rec { pname = "torchvision"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "pytorch"; repo = "vision"; rev = "v${version}"; - sha256 = "136w9pqyfdsxxc7337q3x42gsr17gs0i0af2swfhzqhz6hd5139i"; + sha256 = "sha256-nJV0Jr6Uc+ALodAiekM6YpM6IbmIb4w+Jlc3bJRqayI="; }; nativeBuildInputs = [ libpng ninja which ] diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh index 686d1b3e6200..5f38bce8d8b3 100755 --- a/pkgs/development/python-modules/torchvision/prefetch.sh +++ b/pkgs/development/python-modules/torchvision/prefetch.sh @@ -5,12 +5,21 @@ set -eou pipefail version=$1 -bucket="https://download.pytorch.org/whl/cu113" +linux_bucket="https://download.pytorch.org/whl/cu113" +darwin_bucket="https://download.pytorch.org/whl" url_and_key_list=( - "x86_64-linux-37 $bucket/torchvision-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl" - "x86_64-linux-38 $bucket/torchvision-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $bucket/torchvision-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-37 $linux_bucket/torchvision-${version}%2Bcu113-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl" + "x86_64-linux-38 $linux_bucket/torchvision-${version}%2Bcu113-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_bucket/torchvision-${version}%2Bcu113-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_bucket/torchvision-${version}%2Bcu113-cp310-cp310-linux_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-darwin-37 $darwin_bucket/torchvision-${version}-cp37-cp37m-macosx_10_9_x86_64.whl torchvision-${version}-cp37-cp37m-macosx_10_9_x86_64.whl" + "x86_64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl" + "x86_64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl" + "x86_64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl" + "aarch64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl" + "aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl" + "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl" ) hashfile="binary-hashes-$version.nix" diff --git a/pkgs/development/python-modules/tornado/4.nix b/pkgs/development/python-modules/tornado/4.nix index b4343b5d5ff6..3be82e40a298 100644 --- a/pkgs/development/python-modules/tornado/4.nix +++ b/pkgs/development/python-modules/tornado/4.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "tornado"; version = "4.5.3"; - disabled = isPy27; + disabled = isPy27 || python.pythonAtLeast "3.10"; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index e602041cf4ae..7846525f65fd 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2022.1"; + version = "2022.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - hash = "sha256-sFVjAIFhTZf1z9XUTukHvNl8/ITL6FMOnZMMDKP7X30="; + hash = "sha256-1/uqOxaJqrT+E+0ikNZX9AfIRRbpBSjh2nINrqGWxbY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index 83215f5e0af3..b039277f2019 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -7,6 +7,7 @@ , pytestCheckHook , toml , twisted +, setuptools , git # shells out to git }: @@ -25,6 +26,7 @@ buildPythonPackage rec { incremental jinja2 toml + setuptools ]; # zope.interface collision diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 8940a57196ac..2307073c3225 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.24.4"; + version = "3.24.5"; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c30b57fa2477f1fb7c36aa1d83292d5c2336cd0018119e1b1c17340e2c2708ca"; + sha256 = "67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 606308f88967..3973d68b6c38 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -37,6 +37,11 @@ buildPythonPackage rec { # pandas is not supported on i686 or risc-v 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" + ]; + # Remove performance testing. # Too sensitive for on Hydra. disabledTests = [ diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index 774a42fc13a3..dc42ba0972fc 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -1,24 +1,39 @@ -{ lib, fetchPypi, buildPythonPackage -, traits, pyface, six +{ lib +, fetchPypi +, buildPythonPackage +, traits +, pyface +, pythonOlder }: buildPythonPackage rec { pname = "traitsui"; - version = "7.2.1"; + version = "7.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "dfc39015faf0591f9927e3d4d22bd95a16d49c85db30e60acd4ba7b85c7c5d5b"; + hash = "sha256-lHStZ/NF2Wsya0AemgFAXICCyS+kO/R8CwOYGOWHrGk="; }; - propagatedBuildInputs = [ traits pyface six ]; + propagatedBuildInputs = [ + traits + pyface + ]; - doCheck = false; # Needs X server + # Needs X server + doCheck = false; + + pythonImportsCheck = [ + "traitsui" + ]; meta = with lib; { description = "Traits-capable windowing framework"; homepage = "https://github.com/enthought/traitsui"; - maintainers = with maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; + maintainers = with maintainers; [ knedlsepp ]; }; } diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 917aef54b6bf..814eb1640292 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.15.0"; + version = "4.16.2"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "05qwrs040sqxk5fi44rjx0s5ba4897iw8l7yk8f1xzv314df05fg"; + sha256 = "sha256-XF29JKIaOqZ/PdU+zu+wX7TAl1TKz+HcOutHDABc/PY="; }; nativeBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index 76a82e7c6213..e50dec28ef50 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "transitions"; - version = "0.8.10"; + version = "0.8.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "b0385975a842e885c1a55c719d2f90164471665794d39d51f9eb3f11e1d9c8ac"; + sha256 = "sha256-eyDTKQbqTWDub2wfXcnJ8XiAJCXFsVUhPrDyXCd/BOQ="; }; propagatedBuildInputs = [ @@ -38,12 +38,6 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/pytransitions/transitions/issues/563 - "test_multiple_models" - "test_timeout" - ]; - pythonImportsCheck = [ "transitions" ]; diff --git a/pkgs/development/python-modules/translatepy/default.nix b/pkgs/development/python-modules/translatepy/default.nix index 986a16db702b..44191bcab808 100644 --- a/pkgs/development/python-modules/translatepy/default.nix +++ b/pkgs/development/python-modules/translatepy/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { description = "A module grouping multiple translation APIs"; homepage = "https://github.com/Animenosekai/translate"; license = with licenses; [ agpl3Only ]; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix index 3420773372f4..1e510db97221 100644 --- a/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -6,6 +6,8 @@ , requests , yarl , pythonOlder +, fetchFromGitHub +, poetry-core }: buildPythonPackage rec { @@ -13,11 +15,25 @@ buildPythonPackage rec { version = "3.3.0"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "ef3a931fc1f1db74edf8660e475b9295e0904ee922030ef0e45b0c73f4be65ae"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Trim21"; + repo = "transmission-rpc"; + rev = "v${version}"; + sha256 = "sha256-Ys9trQMCHqxBSaTobWt8WZwi1F8HKTUKaIxvyo6ZPP0="; }; + # remove once upstream has tagged version with dumped typing-extensions + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'typing_extensions = ">=3.7.4.2,<4.0.0.0"' 'typing_extensions = "*"' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ six typing-extensions diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix index 3629b47e8a29..f3271b9a3bb2 100644 --- a/pkgs/development/python-modules/treeo/default.nix +++ b/pkgs/development/python-modules/treeo/default.nix @@ -8,26 +8,31 @@ buildPythonPackage rec { pname = "treeo"; - version = "0.0.9"; + version = "0.4.0"; format = "pyproject"; src = fetchFromGitHub { owner = "cgarciae"; repo = pname; rev = version; - sha256 = "0jfqj5150braj4ybnifc6b8mp0w2j93li6bm20lcd7a19qs0lkk2"; + sha256 = "176r1kgsdlylvdrxmhnzni81p8m9cfnsn4wwn6fnmsgam2qbp76j"; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'typing-extensions = "^3.10.0"' 'typing-extensions = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; - # These deps are not needed for the wheel, but required during the import. + # jax is not declared in the dependencies, but is necessary. propagatedBuildInputs = [ jax - jaxlib ]; + checkInputs = [ jaxlib ]; pythonImportsCheck = [ "treeo" ]; diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix index 1f4a55416d56..7ed83adc64d1 100644 --- a/pkgs/development/python-modules/treex/default.nix +++ b/pkgs/development/python-modules/treex/default.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , flax , hypothesis +, jaxlib , keras , lib , poetry-core @@ -17,14 +18,14 @@ buildPythonPackage rec { pname = "treex"; - version = "0.6.8"; + version = "0.6.9"; format = "pyproject"; src = fetchFromGitHub { owner = "cgarciae"; repo = pname; rev = version; - sha256 = "0pi4c78vqhy7mh9ranssdxdjbqnvyagsfkx95k93bnvzgmnr2kxb"; + sha256 = "1yvlldmhji12h249j14ba44hnb9x1fhrj7rh1cx2vn0vxj5wpg7x"; }; postPatch = '' @@ -38,6 +39,8 @@ buildPythonPackage rec { poetry-core ]; + buildInputs = [ jaxlib ]; + propagatedBuildInputs = [ einops flax diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 85c5e10e8cb2..f566fda6f8ab 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "treq"; - version = "21.5.0"; + version = "22.2.0"; src = fetchPypi { inherit pname version; - sha256 = "02ea86383fc4b57539c45a965eaa1e9fd28302cdf382d21da8430050c97be9b8"; + sha256 = "sha256-33V+PxQfx4Lt4HamBFIRlP/LQPomRc9I5aNwYDB/Uuw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 9032b7637cbe..54e2da8e4ed1 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.9.42"; + version = "3.10.7"; src = fetchPypi { inherit pname version; - sha256 = "d9a6e977989f1f8344b1f86dbce0511dc431733deb0ad21ff8375f6f47282b39"; + sha256 = "sha256-OYor+DQJkkQx8C5E0pmeGaymiYEyKkuKBLp12jkrhS8="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix index f6feb789690d..25caa3e965fb 100644 --- a/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/pkgs/development/python-modules/trio-asyncio/default.nix @@ -6,11 +6,15 @@ , sniffio , pytest-trio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "trio-asyncio"; version = "0.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "trio_asyncio"; @@ -34,10 +38,20 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + # https://github.com/python-trio/trio-asyncio/issues/112 + "-W" + "ignore::DeprecationWarning" + ]; + disabledTestPaths = [ "tests/python" # tries to import internal API test.test_asyncio ]; + pythonImportsCheck = [ + "trio_asyncio" + ]; + meta = with lib; { description = "Re-implementation of the asyncio mainloop on top of Trio"; homepage = "https://github.com/python-trio/trio-asyncio"; diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 59585ddc3fe0..c332a067a76b 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -24,14 +24,14 @@ buildPythonApplication rec { pname = "trytond"; - version = "6.2.2"; + version = "6.2.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9494016dd8b4da5a06dccdd1afbd918248d42da9f2c19b1eb8958052c747e193"; + sha256 = "9be5d27aff9ae9b0ab73a8805145b2cc89900b9b513e6d5bfce89e9b7167f8f4"; }; # Tells the tests which database to use diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix new file mode 100644 index 000000000000..9f5917749e67 --- /dev/null +++ b/pkgs/development/python-modules/ttls/default.nix @@ -0,0 +1,46 @@ +{ lib +, aiohttp +, buildPythonPackage +, colour +, fetchFromGitHub +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ttls"; + version = "1.4.3"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "jschlyter"; + repo = pname; + rev = "v${version}"; + hash = "sha256-lBmkfB7HXB+1xLbfOl4wVtsOVfKhztoDBqzV8i6bFAg="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + colour + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "ttls" + ]; + + meta = with lib; { + description = "Module to interact with Twinkly LEDs"; + homepage = "https://github.com/jschlyter/ttls"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ttp/default.nix b/pkgs/development/python-modules/ttp/default.nix index 38faa10a9282..2157af318110 100644 --- a/pkgs/development/python-modules/ttp/default.nix +++ b/pkgs/development/python-modules/ttp/default.nix @@ -19,14 +19,14 @@ let in buildPythonPackage rec { pname = "ttp"; - version = "0.7.2"; + version = "0.8.4"; format = "setuptools"; src = fetchFromGitHub { owner = "dmulyalin"; repo = pname; rev = version; - sha256 = "sha256-dYjE+EMfCVHLRAqT1KM7o8VEopJ/TwAEMphYXuj38Wk="; + sha256 = "sha256-vuKlddqm8KirqAJyvBPfRb5Nw9zo4Fl1bwbfVMhmH9g="; }; propagatedBuildInputs = [ @@ -57,6 +57,8 @@ buildPythonPackage rec { disabledTestPaths = [ # missing package n2g "test/pytest/test_N2G_formatter.py" + # missing test file + "test/pytest/test_extend_tag.py" ]; disabledTests = [ @@ -81,6 +83,10 @@ buildPythonPackage rec { "test_excel_formatter_update_using_result_kwargs" # missing package n2g "test_n2g_formatter" + # missing test files + "test_TTP_CACHE_FOLDER_env_variable_usage" + # requires additional network setup + "test_child_group_do_not_start_if_no_parent_started" ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/tumpa/default.nix b/pkgs/development/python-modules/tumpa/default.nix index 236cfbb7ba0c..6309e8937a36 100644 --- a/pkgs/development/python-modules/tumpa/default.nix +++ b/pkgs/development/python-modules/tumpa/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "tumpa"; - version = "0.1.1"; + version = "0.1.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kushaldas"; repo = "tumpa"; rev = "v${version}"; - sha256 = "1wvs64s0jxn4p8zr643d2hcczw3a175r6ib3481gdhjx38kgxjbq"; + sha256 = "17nhdildapgic5l05f3q1wf5jvz3qqdjv543c8gij1x9rdm8hgxi"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index a98911da58d5..a3526eb707be 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tweepy"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-GUo8uvShyIOWWcO5T1JvV7DMC1W70YILx/hvHIGQg0o="; + sha256 = "sha256-mRpYPuj2B/kEaaeZlNYYnViGxWiK1xtWfDObHNduIK8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twentemilieu/default.nix b/pkgs/development/python-modules/twentemilieu/default.nix index a8a0fd0c99a6..382e90e14c82 100644 --- a/pkgs/development/python-modules/twentemilieu/default.nix +++ b/pkgs/development/python-modules/twentemilieu/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "twentemilieu"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,12 +21,13 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-twentemilieu"; rev = "v${version}"; - sha256 = "sha256-7HQ0+h8oiyY+TacQdX84K0r994rH0AMZAvZz8PUvQl0="; + sha256 = "sha256-UE7fhbSThXmMns1XfUUQqw0wn5/w/x+UncansIBiank="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov" "" + --replace "--cov" "" \ + --replace '"0.0.0"' '"${version}"' ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 12859fae86cc..ddc94541422c 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.4.0"; + version = "7.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "sha256-gN9cVBhiO34uj2ZGqXrnlvOlSaGxry0tMxaTK4SYhjM="; + sha256 = "0h6r9nz7dcvagrjhzvnirpnjazcy9r64cwlr2bnmlrbjhwdni9rq"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index f5809b0a9b90..82c157722d28 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "twine"; - version = "3.4.2"; + version = "3.7.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4caec0f1ed78dc4c9b83ad537e453d03ce485725f2aea57f1bb3fdde78dae936"; + sha256 = "28460a3db6b4532bde6a5db6755cf2dce6c5020bada8a641bb2c5c7a9b1f35b8"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index b09ccebde198..4641e4af4046 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -17,12 +17,12 @@ }: buildPythonPackage rec { pname = "Twisted"; - version = "21.7.0"; + version = "22.2.0"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - sha256 = "01lh225d7lfnmfx4f4kxwl3963gjc9yg8jfkn1w769v34ia55mic"; + sha256 = "1wml02jxni8k15984pskks7d6yin81w4d2ac026cpyiqd0gjpwsp"; }; propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools typing-extensions ]; diff --git a/pkgs/development/python-modules/twitchapi/default.nix b/pkgs/development/python-modules/twitchapi/default.nix new file mode 100644 index 000000000000..ce4ae1a8874d --- /dev/null +++ b/pkgs/development/python-modules/twitchapi/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, python-dateutil +, requests +, typing-extensions +, websockets +}: + +buildPythonPackage rec { + pname = "twitchapi"; + version = "2.5.3"; + + format = "setuptools"; + + src = fetchPypi { + pname = "twitchAPI"; + inherit version; + sha256 = "e7987dd8c3d1a3d25fe85ff0c0b0bad492f916c920f618dca8efd6baad3ac704"; + }; + + propagatedBuildInputs = [ + aiohttp + python-dateutil + requests + typing-extensions + websockets + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ + "twitchAPI.eventsub" + "twitchAPI.oauth" + "twitchAPI.pubsub" + "twitchAPI.twitch" + "twitchAPI.types" + ]; + + meta = with lib; { + description = "Python implementation of the Twitch Helix API, its Webhook, PubSub and EventSub"; + homepage = "https://github.com/Teekeks/pyTwitchAPI"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index 01a905d55bf2..acaf3bf640e5 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.11"; + version = "2.7.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "sha256-Rxc0ld0U8fhE3yJV+rgGsOfOdN6xGk0NQuHscpvergs="; + sha256 = "sha256-WqeoIZt2OGDXKPAbjm3cHI1kgiCEJC6+ROXXx4TR4b4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 93c9c95a62ef..c5fc7e1c6a44 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "21.1.0"; + version = "22.0.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6"; + sha256 = "sha256-iaG2XjKks2nWfmwWY4f7xGjMXQUidEjSOaXn6XGKoFM="; }; # Based on what txtorcon tox.ini will automatically test, allow back as far diff --git a/pkgs/development/python-modules/txzmq/default.nix b/pkgs/development/python-modules/txzmq/default.nix new file mode 100644 index 000000000000..6ae66dba90ca --- /dev/null +++ b/pkgs/development/python-modules/txzmq/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pyzmq +, twisted +}: + +buildPythonPackage rec { + pname = "txzmq"; + version = "1.0.0"; + + src = fetchPypi { + inherit version; + pname = "txZMQ"; + sha256 = "sha256-jWB9C/CcqUYAuOQvByHb5D7lOgRwGCNErHrOfljcYXc="; + }; + + propagatedBuildInputs = [ + pyzmq + twisted + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "txzmq" ]; + + meta = with lib; { + description = "Twisted bindings for ZeroMQ"; + homepage = "https://github.com/smira/txZMQ"; + license = licenses.mpl20; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index c4977ab08292..87116017063d 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "typed-ast"; - version = "1.5.1"; + version = "1.5.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "python"; repo = "typed_ast"; rev = version; - hash = "sha256-qfXMT+rSf/WcWHpkg4VZXZMYj/5IKQWAKRsxQ0TRzPU="; + hash = "sha256-Ul1FIS1a1f8l3tX+m8Bj/LsLQW1sXJv6XzEZ9zh8rfI="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index ea5092cb2ae8..6e903b684077 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "0.11.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gcyOeUyRAwU5s+XoQO/yM0tx7QHjDsBeyoe5HRZHtIs="; + sha256 = "sha256-c+iOb1F8+9IoRbwpMTdyDfOPW2ZEo4xDAlbzLAxgSfk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 63e1502226d9..8b2ff2de5129 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.13.2"; + version = "2.13.3"; src = fetchPypi { inherit pname version; - sha256 = "7e50071590ab997509aa0977609eb5cf9d73d84c1f416cb4fab78b77a9d15326"; + sha256 = "00edaa8da3a133674796cf5ea87d9f4b4c367d77476e185e80251cc13dfbb8c4"; }; buildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/types-cryptography/default.nix b/pkgs/development/python-modules/types-cryptography/default.nix new file mode 100644 index 000000000000..dd68bfddef7b --- /dev/null +++ b/pkgs/development/python-modules/types-cryptography/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, types-enum34 +, types-ipaddress +}: + +buildPythonPackage rec { + pname = "types-cryptography"; + version = "3.3.18"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-RI/q+a4xImFJvGvOHPj/9U2mYe8Eg398DDFoKYhcNig="; + }; + + pythonImportsCheck = [ + "cryptography-stubs" + ]; + + propagatedBuildInputs = [ types-enum34 types-ipaddress ]; + + meta = with lib; { + description = "Typing stubs for cryptography"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix new file mode 100644 index 000000000000..4cefc57ed594 --- /dev/null +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-python-dateutil"; + version = "2.8.10"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-a886rnJC5Xk7r9eyvPtOJV63srMUSs0N8OGC3OWMytM="; + }; + + pythonImportsCheck = [ "dateutil-stubs" ]; + + meta = with lib; { + description = "Typing stubs for python-dateutil"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ milibopp ]; + }; +} diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix index e668f324fabb..f8dc74c00f98 100644 --- a/pkgs/development/python-modules/types-decorator/default.nix +++ b/pkgs/development/python-modules/types-decorator/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.3"; + version = "5.1.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "15d859bec0adca9edd948e94a5773c32710ee5dd4ad14ec983f08f979a821610"; + sha256 = "463c04b192108e2b3f409df8a3eaaf8d44e3e98965c11e473ed2a97da591798b"; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-enum34/default.nix b/pkgs/development/python-modules/types-enum34/default.nix new file mode 100644 index 000000000000..6c186f2d8756 --- /dev/null +++ b/pkgs/development/python-modules/types-enum34/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-enum34"; + version = "1.1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0421lr89vv3fpg77kkj5nmzd7z3nmhw4vh8ibsjp6vfh86b7d73g"; + }; + + pythonImportsCheck = [ + "enum-python2-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for enum34"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/types-freezegun/default.nix b/pkgs/development/python-modules/types-freezegun/default.nix index 687ddd1b17cc..a288a25fe5c9 100644 --- a/pkgs/development/python-modules/types-freezegun/default.nix +++ b/pkgs/development/python-modules/types-freezegun/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-freezegun"; - version = "1.1.6"; + version = "1.1.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-XHCkt0RLjH3SgA4AY9b+chqxEgk5kmT6D3evJT3YsU8="; + hash = "sha256-6dEyfpjGyqj2XeABje0nQ0fo40GY1ZqppcJK2SZdXl4="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-futures/default.nix b/pkgs/development/python-modules/types-futures/default.nix index e56cbb62b33e..afff438efef1 100644 --- a/pkgs/development/python-modules/types-futures/default.nix +++ b/pkgs/development/python-modules/types-futures/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "types-futures"; - version = "3.3.7"; + version = "3.3.8"; src = fetchPypi { inherit pname version; - sha256 = "d286db818fb67e3ce5c28acd9058c067329b91865acc443ac3cf91497fa36f05"; + sha256 = "6fe8ccc2c2af7ef2fdd9bf73eab6d617074f09f30ad7d373510b4043d39c42de"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/types-ipaddress/default.nix b/pkgs/development/python-modules/types-ipaddress/default.nix new file mode 100644 index 000000000000..19e048d1a9f4 --- /dev/null +++ b/pkgs/development/python-modules/types-ipaddress/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-ipaddress"; + version = "1.0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "0h9q9pjvw1ap5k70ygp750d096jkzymxlhx87yh0pr9mb6zg6gd0"; + }; + + pythonImportsCheck = [ + "ipaddress-python2-stubs" + ]; + + meta = with lib; { + description = "Typing stubs for ipaddress"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/types-paramiko/default.nix b/pkgs/development/python-modules/types-paramiko/default.nix new file mode 100644 index 000000000000..5b87e8079a5e --- /dev/null +++ b/pkgs/development/python-modules/types-paramiko/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, types-cryptography +}: + +buildPythonPackage rec { + pname = "types-paramiko"; + version = "2.8.17"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-1toFPkau9cYpvE6lvatWZwhlNerg/P2N6EBpQ7g00uY="; + }; + + pythonImportsCheck = [ + "paramiko-stubs" + ]; + + propagatedBuildInputs = [ types-cryptography ]; + + meta = with lib; { + description = "Typing stubs for paramiko"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/development/python-modules/types-protobuf/default.nix b/pkgs/development/python-modules/types-protobuf/default.nix index d4708e58706f..5393a1604c9c 100644 --- a/pkgs/development/python-modules/types-protobuf/default.nix +++ b/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.19.5"; + version = "3.19.15"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "9e3d954de5f5693817514b8da3476daa22f035d2b8060217c78c3831a1a49c23"; + sha256 = "sha256-03HQpbMueMLWhDKaXUSR04Xm6tyrSXs3xBFy3tMoxdk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index faf5ee8bdcb6..eecf45c82fa5 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.3.4"; + version = "2021.3.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "101da53091013bb07403468c20d36930d749d3918054ac46f9c1bfc607dadf7d"; + sha256 = "sha256-dFR/2Q2NirTx7t86NEp9GG2XSGlziV+BIhpxLh4s2ZM="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 21498135916d..95e263135ecb 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.6"; + version = "2.27.15"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Xg3Ggem/rbXB0X9j0p9tE9Ke8ol9MMuceShbNKFlX9c="; + sha256 = "sha256-LTcRg8U1II0syP50c9m0nDRMcHfrcDAutwhjj7hghqg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 3812a1c64f2c..c59baea3c6e3 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.7"; + version = "57.4.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lnfZabAOwcFFUvW+KytHpvvqTQ7U3g/c7hir2qDMkmc="; + sha256 = "sha256-Ji90BuDH1wWta7RSa1t2H6UAv5nqt03oWsNZIYfWKTU="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix index 9e5c9b628b2d..6d7ceade85c9 100644 --- a/pkgs/development/python-modules/types-tabulate/default.nix +++ b/pkgs/development/python-modules/types-tabulate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-tabulate"; - version = "0.8.5"; + version = "0.8.6"; src = fetchPypi { inherit pname version; - hash = "sha256-A/KDvzhOoSG3tqWK+zj03vl/MHBPyhOg2mhpNrDzkqw="; + hash = "sha256-P037eVRJwheO1cIU7FEUwESx7t1xrQoQA7xnDwnYcQo="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix index c8f520524184..affdbbb2b447 100644 --- a/pkgs/development/python-modules/types-toml/default.nix +++ b/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.3"; + version = "0.10.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "215a7a79198651ec5bdfd66193c1e71eb681a42f3ef7226c9af3123ced62564a"; + sha256 = "sha256-k0DnwVh3FVgbsTkFs68wt5/mivrM/KN3Zl1eY7aUEpo="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-typed-ast/default.nix b/pkgs/development/python-modules/types-typed-ast/default.nix index 4962f2d02e3a..e08450c6a3e7 100644 --- a/pkgs/development/python-modules/types-typed-ast/default.nix +++ b/pkgs/development/python-modules/types-typed-ast/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-typed-ast"; - version = "1.5.1"; + version = "1.5.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-UQ876qlUkrNUTWfoFYGvopA8dktwiJ/82yhubGJn0pc="; + hash = "sha256-bY/S6pCDbLQxEayKrnzYZOCYWTyT7M66kP5G1rewxz4="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 5224b57d6cff..235535ce9716 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.7"; + version = "1.26.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-z9H7vkuppgXtFIKUAIqsinuLdHJlHRzDV9UHrlli49I="; + hash = "sha256-JNZORBFohR6wXx0CLeGK4xVY9WScjxEX44TC6F4xMVs="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix new file mode 100644 index 000000000000..a3458b2f332f --- /dev/null +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, fonttools +, defcon +, compreffor +, booleanoperations +, cffsubr +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ufo2ft"; + version = "2.25.2"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "ooWIHvyMtrht4WcGPiacY8dfjPSb5uitHnTRTKvf2AA="; + }; + + patches = [ + # Use cu2qu from fonttools. + # https://github.com/googlefonts/ufo2ft/pull/461 + ./fonttools-cu2qu.patch + ]; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + fonttools + defcon + compreffor + booleanoperations + cffsubr + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + # Do not depend on skia. + "--deselect=tests/integration_test.py::IntegrationTest::test_removeOverlaps_CFF_pathops" + "--deselect=tests/integration_test.py::IntegrationTest::test_removeOverlaps_pathops" + "--deselect=tests/preProcessor_test.py::TTFPreProcessorTest::test_custom_filters_as_argument" + "--deselect=tests/preProcessor_test.py::TTFInterpolatablePreProcessorTest::test_custom_filters_as_argument" + ]; + + pythonImportsCheck = [ "ufo2ft" ]; + + meta = with lib; { + description = "Bridge from UFOs to FontTools objects"; + homepage = "https://github.com/googlefonts/ufo2ft"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch b/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch new file mode 100644 index 000000000000..892cd4abeb30 --- /dev/null +++ b/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch @@ -0,0 +1,126 @@ +From 0b3631e91c93d56460929f40850f7d8a39a71bde Mon Sep 17 00:00:00 2001 +From: Simon Cozens +Date: Thu, 11 Feb 2021 09:43:41 +0000 +Subject: [PATCH 1/2] Rename cu2qu to fontTools.cu2qu + +--- + Lib/ufo2ft/filters/cubicToQuadratic.py | 4 ++-- + Lib/ufo2ft/preProcessor.py | 4 ++-- + requirements.txt | 1 - + setup.py | 1 - + tests/outlineCompiler_test.py | 2 +- + tests/preProcessor_test.py | 2 +- + 6 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py +index 87d81b1f..4b77144f 100644 +--- a/Lib/ufo2ft/filters/cubicToQuadratic.py ++++ b/Lib/ufo2ft/filters/cubicToQuadratic.py +@@ -1,7 +1,7 @@ + import logging + +-from cu2qu.pens import Cu2QuPointPen +-from cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR ++from fontTools.pens.cu2quPen import Cu2QuPointPen ++from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR + + from ufo2ft.filters import BaseFilter + from ufo2ft.fontInfoData import getAttrWithFallback +diff --git a/Lib/ufo2ft/preProcessor.py b/Lib/ufo2ft/preProcessor.py +index 05ac47dc..c796df2e 100644 +--- a/Lib/ufo2ft/preProcessor.py ++++ b/Lib/ufo2ft/preProcessor.py +@@ -217,7 +217,7 @@ def __init__( + layerNames=None, + skipExportGlyphs=None, + ): +- from cu2qu.ufo import DEFAULT_MAX_ERR ++ from fontTools.cu2qu.ufo import DEFAULT_MAX_ERR + + self.ufos = ufos + self.inplace = inplace +@@ -249,7 +249,7 @@ def __init__( + self.postFilters.append(post) + + def process(self): +- from cu2qu.ufo import fonts_to_quadratic ++ from fontTools.cu2qu.ufo import fonts_to_quadratic + + # first apply all custom pre-filters + for funcs, ufo, glyphSet in zip(self.preFilters, self.ufos, self.glyphSets): +diff --git a/setup.py b/setup.py +index 175429af..eef39ee1 100644 +--- a/setup.py ++++ b/setup.py +@@ -30,7 +30,6 @@ + tests_require=["pytest>=2.8"], + install_requires=[ + "fonttools[ufo]>=4.28.5", +- "cu2qu>=1.6.7", + "cffsubr>=0.2.8", + "booleanOperations>=0.9.0", + ], +diff --git a/tests/outlineCompiler_test.py b/tests/outlineCompiler_test.py +index 74319184..e7b15a23 100644 +--- a/tests/outlineCompiler_test.py ++++ b/tests/outlineCompiler_test.py +@@ -2,7 +2,7 @@ + import os + + import pytest +-from cu2qu.ufo import font_to_quadratic ++from fontTools.cu2qu.ufo import font_to_quadratic + from fontTools.ttLib import TTFont + from fontTools.ttLib.tables._g_l_y_f import USE_MY_METRICS + +diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py +index 64196f92..87b23946 100644 +--- a/tests/preProcessor_test.py ++++ b/tests/preProcessor_test.py +@@ -2,7 +2,7 @@ + import os + + import pytest +-from cu2qu.ufo import CURVE_TYPE_LIB_KEY ++from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY + from fontTools import designspaceLib + + import ufo2ft + +From 27c5af88ec2c3314618ecbf65104050a53508bb0 Mon Sep 17 00:00:00 2001 +From: Simon Cozens +Date: Thu, 11 Feb 2021 09:49:28 +0000 +Subject: [PATCH 2/2] Sort the imports + +--- + Lib/ufo2ft/filters/cubicToQuadratic.py | 2 +- + tests/preProcessor_test.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py +index 4b77144f..5f28ea42 100644 +--- a/Lib/ufo2ft/filters/cubicToQuadratic.py ++++ b/Lib/ufo2ft/filters/cubicToQuadratic.py +@@ -1,7 +1,7 @@ + import logging + +-from fontTools.pens.cu2quPen import Cu2QuPointPen + from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY, DEFAULT_MAX_ERR ++from fontTools.pens.cu2quPen import Cu2QuPointPen + + from ufo2ft.filters import BaseFilter + from ufo2ft.fontInfoData import getAttrWithFallback +diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py +index 87b23946..76ee495a 100644 +--- a/tests/preProcessor_test.py ++++ b/tests/preProcessor_test.py +@@ -2,8 +2,8 @@ + import os + + import pytest +-from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY + from fontTools import designspaceLib ++from fontTools.cu2qu.ufo import CURVE_TYPE_LIB_KEY + + import ufo2ft + from ufo2ft.constants import ( diff --git a/pkgs/development/python-modules/ufoLib2/default.nix b/pkgs/development/python-modules/ufoLib2/default.nix new file mode 100644 index 000000000000..21894203d1ad --- /dev/null +++ b/pkgs/development/python-modules/ufoLib2/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, attrs +, fonttools +, pytestCheckHook +, fs +}: + +buildPythonPackage rec { + pname = "ufoLib2"; + version = "0.13.1"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-MnWi2mI+bUt+4pyYTNs6W4a7wj8KHOlEhti7XDCKpHs="; + }; + + propagatedBuildInputs = [ + attrs + fonttools + # required by fonttools[ufo] + fs + ]; + + checkInputs = [ + pytestCheckHook + ]; + +pythonImportsCheck = [ "ufoLib2" ]; + + meta = with lib; { + description = "Library to deal with UFO font sources"; + homepage = "https://github.com/fonttools/ufoLib2"; + license = licenses.mit; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 4d12af0689d8..0d7faf93f934 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "4.3.0"; + version = "5.1.0"; disabled = isPyPy || pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "baee56eca35cb5fbe02c28bd9c0936be41a96fa5c0812d9d4b7edeb5c3d568a0"; + sha256 = "a88944d2f99db71a3ca0c63d81f37e55b660edde0b07216fb65a3e46403ef004"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index c132f50dbea0..180baf0d4dde 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -14,7 +14,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ future ]; checkInputs = [ nose numpy ]; - checkPhase = "python setup.py nosetests -sv"; + checkPhase = '' + nosetests -sv + ''; meta = with lib; { homepage = "https://pythonhosted.org/uncertainties/"; diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix index 1f2876bdc693..8a568a47c0e4 100644 --- a/pkgs/development/python-modules/unicorn/default.nix +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -20,7 +20,10 @@ buildPythonPackage rec { ''; # needed on non-x86 linux - setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ]; + setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ] + # aarch64 only available from MacOS SDK 11 onwards, so fix the version tag. + # otherwise, bdist_wheel may detect "macosx_10_6_arm64" which doesn't make sense. + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "--plat-name" "macosx_11_0" ]; propagatedBuildInputs = [ setuptools diff --git a/pkgs/development/python-modules/unicrypto/default.nix b/pkgs/development/python-modules/unicrypto/default.nix new file mode 100644 index 000000000000..56a57ccaf0ef --- /dev/null +++ b/pkgs/development/python-modules/unicrypto/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pycryptodomex +, pythonOlder +}: + +buildPythonPackage rec { + pname = "unicrypto"; + version = "0.0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-aSQPJgSTNGhh5jlpfi/aJF8UZWx98grm2eaxuzassp4="; + }; + + propagatedBuildInputs = [ + pycryptodomex + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "unicrypto" + ]; + + meta = with lib; { + description = "Unified interface for cryptographic libraries"; + homepage = "https://github.com/skelsec/unicrypto"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index 7dfd5c9d276a..4c776070ae6e 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "unidiff"; - version = "0.7.0"; + version = "0.7.3"; src = fetchPypi { inherit pname version; - sha256 = "91bb13b4969514a400679d9ae5e29a6ffad85346087677f8b5e2e036af817447"; + sha256 = "sha256-1fLlOpoA2zIkqMNjSbU4Dg4i0a7GxpSxT7lIPuk8YgU="; }; pythonImportsCheck = [ "unidiff" ]; diff --git a/pkgs/development/python-modules/unittest2/default.nix b/pkgs/development/python-modules/unittest2/default.nix index ae8cab53b0c5..e044176242d5 100644 --- a/pkgs/development/python-modules/unittest2/default.nix +++ b/pkgs/development/python-modules/unittest2/default.nix @@ -3,6 +3,7 @@ , fetchPypi , six , traceback2 +, pythonAtLeast }: buildPythonPackage rec { @@ -16,14 +17,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ six traceback2 ]; - # # 1.0.0 and up create a circle dependency with traceback2/pbr + # 1.0.0 and up create a circle dependency with traceback2/pbr doCheck = false; postPatch = '' # argparse is needed for python < 2.7, which we do not support anymore. substituteInPlace setup.py --replace "argparse" "" - # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 + # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 sed -i '510i\ return None, False' unittest2/loader.py # https://github.com/pypa/packaging/pull/36 sed -i 's/version=VERSION/version=str(VERSION)/' setup.py @@ -31,8 +32,9 @@ buildPythonPackage rec { meta = with lib; { description = "A backport of the new features added to the unittest testing framework"; - homepage = "https://pypi.python.org/pypi/unittest2"; + homepage = "https://pypi.org/project/unittest2/"; license = licenses.bsd0; + # AttributeError: module 'collections' has no attribute 'MutableMapping' + broken = pythonAtLeast "3.10"; }; - } diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix index 356a290241ed..52b422c0e1d3 100644 --- a/pkgs/development/python-modules/upb-lib/default.nix +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.4.12"; + version = "0.5.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "e668055d9c389aefd09203afb96a950a320095f225ef0a1aa611e592db92a71b"; + hash = "sha256-iXwJPe6YYG2TWiQ/dXbeIiadzGMgFzZa6Now692r+t0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index ef262e057e24..bf523046c616 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "4.1.5"; + version = "4.1.9"; # fetch from github for tests src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot4"; rev = version; - sha256 = "sha256-zsmAdqoWvFhRRRw4fdbRhhKkDV5oP/eYsfpA0AVqAnI="; + sha256 = "035gljxm18hvpfvc7nsd7lhawwq3np5sg1y86pzcxc680c6rj6lx"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 91bc6e68eb36..4c1a61b09fc6 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -18,11 +18,12 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.7"; + version = "1.26.8"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SYfGVVT3otvzDBj9SHeO8SSvb6t3GjdxA9oFheIzbs4="; + hash = "sha256-Dnwz2aY+fd/LhngKrIe+/C+930bFjbtIfghV987sKDw="; }; propagatedBuildInputs = [ @@ -61,7 +62,9 @@ buildPythonPackage rec { export CI # Increases LONG_TIMEOUT ''; - pythonImportsCheck = [ "urllib3" ]; + pythonImportsCheck = [ + "urllib3" + ]; meta = with lib; { description = "Powerful, sanity-friendly HTTP client for Python"; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 7dcc56d9f6e8..3df7f6703a79 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,8 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, isPy27 +, glibcLocales +}: buildPythonPackage rec { pname = "urwid"; version = "2.1.2"; + format = "setuptools"; + disabled = isPy27; src = fetchPypi { @@ -17,13 +25,14 @@ buildPythonPackage rec { # tests which assert on strings don't decode results correctly doCheck = isPy3k; - pythonImportsCheck = [ "urwid" ]; + pythonImportsCheck = [ + "urwid" + ]; meta = with lib; { description = "A full-featured console (xterm et al.) user interface library"; - homepage = "https://excess.org/urwid"; - repositories.git = "git://github.com/wardi/urwid.git"; - license = licenses.lgpl21; + homepage = "https://urwid.org/"; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/userpath/default.nix b/pkgs/development/python-modules/userpath/default.nix index 6ce92e9f3b47..636409f1d967 100644 --- a/pkgs/development/python-modules/userpath/default.nix +++ b/pkgs/development/python-modules/userpath/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Cross-platform tool for adding locations to the user PATH"; homepage = "https://github.com/ofek/userpath"; license = [ licenses.asl20 licenses.mit ]; - maintainers = with maintainers; [ yevhenshymotiuk ]; + maintainers = with maintainers; [ yshym ]; }; } diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 57c6bf925357..4ce9228efee8 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.14.0"; + version = "0.16.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "164x92k3rs47ihkmwq5av396576dxp4rzv6557pwgc1ign2ikqy1"; + sha256 = "14jih6j4q2qp5c9rgl798i5p51b4y6zkkj434q2l1naw0csphk4s"; }; outputs = [ diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 41a0972a3155..72ede5dc1716 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -53,6 +53,8 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Flaky test: https://github.com/MagicStack/uvloop/issues/412 "--deselect" "tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set" + # Broken: https://github.com/NixOS/nixpkgs/issues/160904 + "--deselect" "tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 50fc4275c9be..9bc875963163 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "vega"; - version = "3.5.0"; + version = "3.6.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1c22877758cef97e81dbb665c83d31f7427bbc804a01503fa2845a35403c54ad"; + sha256 = "sha256-cO+7Ynbv/+uoNUOPQvDNZji04llHUBlm95Cyfy+Ny80="; }; propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ]; diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index e871912adf7a..efa5a0fc29f8 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2021.11.7"; + version = "2022.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "0i1vfyhyvn908vz55agmfds3zwp6qpbpip055d995nx79ysxz0j9"; + sha256 = "sha256-oWHyEw1DjMynLPAARcVaqsFccpnTk1/7gpq+8TU95d0="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 868ad5fed966..cbc03ea0d048 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -6,19 +6,23 @@ buildPythonPackage rec { pname = "versioneer"; - version = "0.21"; - disabled = pythonOlder "3.6"; + version = "0.22"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "64f2dbcbbed15f9a6da2b85f643997db729cf496cafdb97670fb2fa73a7d8e20"; + hash = "sha256-nw6aLLXvUhy/0QTUOiCN2RJN+0rM+nLWlODQQwoBQrw="; }; # Couldn't get tests to work because, for instance, they used virtualenv and # pip. doCheck = false; - pythonImportsCheck = [ "versioneer" ]; + pythonImportsCheck = [ + "versioneer" + ]; meta = with lib; { description = "Version-string management for VCS-controlled trees"; diff --git a/pkgs/development/python-modules/versiontag/default.nix b/pkgs/development/python-modules/versiontag/default.nix index aebf40a40f51..8c4bb49ebaff 100644 --- a/pkgs/development/python-modules/versiontag/default.nix +++ b/pkgs/development/python-modules/versiontag/default.nix @@ -11,6 +11,11 @@ buildPythonPackage rec { sha256 = "1axv2214ykgv5adajv10v2zy5fr9v77db54rkik6ja29p66zl90n"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "get_version(pypi=True)" '"${version}"' + ''; + checkInputs = [ git ]; pythonImportsCheck = [ "versiontag" ]; diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index a456c5232d80..cd6186e574f3 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -1,27 +1,52 @@ -{ lib, buildPythonPackage, fetchPypi, future, python-dateutil, six, pytest, mock, parameterized }: +{ lib +, buildPythonPackage +, fetchPypi +, future +, mock +, parameterized +, pytestCheckHook +, python-dateutil +, pythonOlder +, six +}: buildPythonPackage rec { pname = "vertica-python"; - version = "1.0.3"; + version = "1.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "cfe1794c5ba9fdfbd470a55d82f60c2e08e129828367753bf64199a58a539bc2"; + hash = "sha256-IpdrR9mDG+8cNnXgSXkmXahSEP4EGnEBJqZk5SNu9pA="; }; - propagatedBuildInputs = [ future python-dateutil six ]; + propagatedBuildInputs = [ + future + python-dateutil + six + ]; - checkInputs = [ pytest mock parameterized ]; + checkInputs = [ + mock + parameterized + pytestCheckHook + ]; - # Integration tests require an accessible Vertica db - checkPhase = '' - pytest --ignore vertica_python/tests/integration_tests - ''; + disabledTestPaths = [ + # Integration tests require an accessible Vertica db + "vertica_python/tests/integration_tests" + ]; + + pythonImportsCheck = [ + "vertica_python" + ]; meta = with lib; { description = "Native Python client for Vertica database"; homepage = "https://github.com/vertica/vertica-python"; license = licenses.asl20; - maintainers = [ maintainers.arnoldfarkas ]; + maintainers = with maintainers; [ arnoldfarkas ]; }; } diff --git a/pkgs/development/python-modules/videocr/default.nix b/pkgs/development/python-modules/videocr/default.nix new file mode 100644 index 000000000000..a6ac156b7063 --- /dev/null +++ b/pkgs/development/python-modules/videocr/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-Levenshtein +, pytesseract +, opencv4 +, fuzzywuzzy +}: + +buildPythonPackage rec { + pname = "videocr"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1clifwczvhvbaw2spgxkkyqsbqh21vyfw3rh094pxfmq89ylyj63"; + }; + + propagatedBuildInputs = [ + python-Levenshtein + pytesseract + opencv4 + fuzzywuzzy + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "opencv-python" "opencv" + substituteInPlace videocr/constants.py \ + --replace "master" "main" + substituteInPlace videocr/video.py \ + --replace '--tessdata-dir "{}"' '--tessdata-dir="{}"' + ''; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "videocr" ]; + + meta = with lib; { + description = "Extract hardcoded subtitles from videos using machine learning"; + homepage = "https://github.com/apm1467/videocr"; + license = licenses.mit; + maintainers = with maintainers; [ ozkutuk ]; + }; +} diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix index f2f6dd31a504..bc7469e1d61a 100644 --- a/pkgs/development/python-modules/virtual-display/default.nix +++ b/pkgs/development/python-modules/virtual-display/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "PyVirtualDisplay"; - version = "2.2"; + version = "3.0"; propagatedBuildInputs = [ EasyProcess ]; src = fetchPypi { inherit pname version; - sha256 = "3ecda6b183b03ba65dcfdf0019809722480d7b7e10eea6e3a40bf1ba3146bab7"; + sha256 = "sha256-CXVbw86263JfsH7KVCX0PyNY078I4A0qm3kqGu3RYVk="; }; # requires X server diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index d51b3d783796..c463c37747ea 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.10.0"; + version = "20.13.0"; src = fetchPypi { inherit pname version; - sha256 = "576d05b46eace16a9c348085f7d0dc8ef28713a2cabaa1cf0aea41e8f12c9218"; + sha256 = "d8458cf8d59d0ea495ad9b34c2599487f8a7772d796f9910858376d1600dd2dd"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index 5967b9b9abb7..47a966332548 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "vispy"; - version = "0.9.4"; + version = "0.9.6"; src = fetchPypi { inherit pname version; - sha256 = "8561e41bbcca5fadce4a8d974ca2f96cbe7710d835bfed6a55ed6d10900ef5d5"; + sha256 = "sha256-ISzVtQgkSZu84+LXQaray3nAt3GsVm+THGE1WXYCi8s="; }; patches = [ diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index d664cf1d27fe..ddf6ce54b25e 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { pname = "vivisect"; - version = "1.0.5"; + version = "1.0.7"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f629dc0143656b06b64e2da1772deda67d37a3e048e74bd728de4a4f24bf877b"; + sha256 = "727a27ac1eb95d5a41f4430f6912e79940525551314fe68a2811fc9d51eaf2e9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix new file mode 100644 index 000000000000..247a192588de --- /dev/null +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, geopy +, docopt +, certifi +, amqtt +, websockets +, aiohttp +, pytestCheckHook +, asynctest +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "volvooncall"; + version = "0.10.0"; + + disabled = pythonOlder "3.8"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "molobrakos"; + repo = "volvooncall"; + rev = "v${version}"; + hash = "sha256-HLSanXJs1yPSgYo4oX0zJtrV5sKkxV2yLPhc2dVRHY8="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + passthru.extras-require = { + console = [ + certifi + docopt + geopy + ]; + mqtt = [ + amqtt + certifi + ]; + }; + + checkInputs = [ + asynctest + pytest-asyncio + pytestCheckHook + ] ++ passthru.extras-require.mqtt; + + pythonImportsCheck = [ "volvooncall" ]; + + meta = with lib; { + description = "Retrieve information from the Volvo On Call web service"; + homepage = "https://github.com/molobrakos/volvooncall"; + license = licenses.unlicense; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 2f950ecd6c44..87c3d7fe30c3 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "8.11.0"; + version = "9.0.1"; src = fetchPypi{ inherit pname version; - sha256 = "cfde0515a3fa4d224aad5461135372f3441ae1a64717ae6bff5e23509d70b0bd"; + sha256 = "sha256-rDUgOjroY8S73+s+MWyBl86u+8XCH4O8KMCo9zUlqAs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index 2d0988473ddb..8228047d9ce9 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.13.1"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = version; - sha256 = "sha256-85ohhynXHWjuwKB18DciB48tNGZcHzafobMDaGoTkoc="; + sha256 = "sha256-901VW56vr6ysMlzspgVbPMLnDIpJRgSEOEQ8ohHp+mc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/waitress-django/default.nix b/pkgs/development/python-modules/waitress-django/default.nix index e76d1f110296..4e40980d917a 100644 --- a/pkgs/development/python-modules/waitress-django/default.nix +++ b/pkgs/development/python-modules/waitress-django/default.nix @@ -1,11 +1,16 @@ -{ buildPythonPackage, django, waitress }: +{ lib, buildPythonPackage, django, waitress }: buildPythonPackage { pname = "waitress-django"; - version = "0.0.0"; + version = "1.0.0"; src = ./.; pythonPath = [ django waitress ]; doCheck = false; - meta.description = "A waitress WSGI server serving django"; + + meta = with lib; { + description = "A waitress WSGI server serving django"; + license = licenses.mit; + maintainers = with maintainers; [ basvandijk ]; + }; } diff --git a/pkgs/development/python-modules/waitress-django/setup.py b/pkgs/development/python-modules/waitress-django/setup.py index 07f7b326fdaf..16fde78f42a9 100644 --- a/pkgs/development/python-modules/waitress-django/setup.py +++ b/pkgs/development/python-modules/waitress-django/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup( name = "waitress-django" - , version = "0.0.0" + , version = "1.0.0" , description = "A waitress WSGI server serving django" , author = "Bas van Dijk" , author_email = "v.dijk.bas@gmail.com" diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index f4d14ed2e897..ef8e6cfd247e 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -1,4 +1,5 @@ -{ bokeh +{ azure-core +, bokeh , buildPythonPackage , click , configparser @@ -11,6 +12,7 @@ , jsonschema , lib , matplotlib +, nbformat , pandas , pathtools , promise @@ -26,6 +28,7 @@ , requests , scikit-learn , sentry-sdk +, setproctitle , setuptools , shortuuid , stdenv @@ -35,13 +38,13 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.12.9"; + version = "0.12.11"; src = fetchFromGitHub { owner = pname; repo = "client"; rev = "v${version}"; - sha256 = "0704iv5dlsjs0gj6l4nx9hk9kzq46wlgd67ifw7i3qk6v4ljfs6y"; + sha256 = "0av4vv4llan40678bw0vlah0gn6hjg5pdqwq0c5cv15lqrdb8g32"; }; # The wandb requirements.txt does not distinguish python2/3 dependencies. We @@ -68,16 +71,13 @@ buildPythonPackage rec { pyyaml requests sentry-sdk + setproctitle setuptools shortuuid yaspin ]; disabledTestPaths = [ - # Tests that require docker access, not possible in the nix build environment. - "tests/launch/test_launch.py" - "tests/launch/test_launch_cli.py" - # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment. "tests/test_cli.py" "tests/test_data_types.py" @@ -92,7 +92,6 @@ buildPythonPackage rec { "tests/test_metric_internal.py" "tests/test_mode_disabled.py" "tests/test_mp_full.py" - "tests/test_notebooks.py" "tests/test_public_api.py" "tests/test_redir.py" "tests/test_runtime.py" @@ -102,22 +101,27 @@ buildPythonPackage rec { "tests/test_telemetry_full.py" "tests/wandb_agent_test.py" "tests/wandb_artifacts_test.py" - "tests/wandb_history_test.py" "tests/wandb_integration_test.py" "tests/wandb_run_test.py" "tests/wandb_settings_test.py" "tests/wandb_sweep_test.py" + "tests/wandb_verify_test.py" # Fails and borks the pytest runner as well. "tests/wandb_test.py" + + # Tries to access /homeless-shelter + "tests/test_tables.py" ]; checkInputs = [ + azure-core bokeh flask jsonref jsonschema matplotlib + nbformat pandas pydantic pytest-mock diff --git a/pkgs/development/python-modules/warcio/default.nix b/pkgs/development/python-modules/warcio/default.nix new file mode 100644 index 000000000000..ae870a37fe57 --- /dev/null +++ b/pkgs/development/python-modules/warcio/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, six +, setuptools +, pytestCheckHook +, httpbin +, requests +, wsgiprox +, multidict +}: + +buildPythonPackage rec { + pname = "warcio"; + version = "1.7.4"; + + src = fetchFromGitHub { + owner = "webrecorder"; + repo = "warcio"; + rev = "aa702cb321621b233c6e5d2a4780151282a778be"; # Repo has no git tags, see https://github.com/webrecorder/warcio/issues/126 + sha256 = "sha256-wn2rd73wRfOqHu9H0GIn76tmEsERBBCQatnk4b/JToU="; + }; + + patches = [ + (fetchpatch { + name = "add-offline-option.patch"; + url = "https://github.com/webrecorder/warcio/pull/135/commits/2546fe457c57ab0b391764a4ce419656458d9d07.patch"; + sha256 = "sha256-3izm9LvAeOFixiIUUqmd5flZIxH92+NxL7jeu35aObQ="; + }) + ]; + + propagatedBuildInputs = [ + six + setuptools + ]; + + checkInputs = [ + pytestCheckHook + httpbin + requests + wsgiprox + multidict # Optional. Without this, one test in test/test_utils.py is skipped. + ]; + + pytestFlagsArray = [ "--offline" ]; + + pythonImportsCheck = [ "warcio" ]; + + meta = with lib; { + description = "Streaming WARC/ARC library for fast web archive IO"; + homepage = "https://github.com/webrecorder/warcio"; + license = licenses.asl20; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix index 1b62c918f339..c20723e8d6e2 100644 --- a/pkgs/development/python-modules/warlock/default.nix +++ b/pkgs/development/python-modules/warlock/default.nix @@ -1,27 +1,56 @@ { lib , buildPythonPackage -, fetchPypi -, six +, fetchFromGitHub +, pythonOlder , jsonpatch , jsonschema -, jsonpointer +, six +, pytestCheckHook }: buildPythonPackage rec { pname = "warlock"; version = "1.3.3"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "a093c4d04b42b7907f69086e476a766b7639dca50d95edc83aef6aeab9db2090"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bcwaldon"; + repo = pname; + rev = version; + hash = "sha256-59V4KOwjs/vhA3F3E0j3p5L4JnKPgcExN+mgSWs0Cn0="; }; - propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "jsonschema>=0.7,<4" "jsonschema" + sed -i "/--cov/d" pytest.ini + ''; + + propagatedBuildInputs = [ + jsonpatch + jsonschema + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/bcwaldon/warlock/issues/64 + "test_recursive_models" + ]; + + pythonImportsCheck = [ + "warlock" + ]; meta = with lib; { - homepage = "https://github.com/bcwaldon/warlock"; description = "Python object model built on JSON schema and JSON patch"; + homepage = "https://github.com/bcwaldon/warlock"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/warrant-lite/default.nix b/pkgs/development/python-modules/warrant-lite/default.nix new file mode 100644 index 000000000000..4d5d77c2e84d --- /dev/null +++ b/pkgs/development/python-modules/warrant-lite/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, boto3 +, envs +, python-jose +, requests +}: + +buildPythonPackage rec { + pname = "warrant-lite"; + version = "1.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-FunWoslZn3o0WHet2+LtggO3bbbe2ULMXW93q07GxJ4="; + }; + + propagatedBuildInputs = [ + boto3 + envs + python-jose + requests + ]; + + postPatch = '' + # requirements.txt is not part of the source + substituteInPlace setup.py \ + --replace "parse_requirements('requirements.txt')," "[]," + ''; + + # Tests require credentials + doCheck = false; + + pythonImportsCheck = [ + "warrant_lite" + ]; + + meta = with lib; { + description = "Module for process SRP requests for AWS Cognito"; + homepage = "https://github.com/capless/warrant-lite"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/wasmer/default.nix b/pkgs/development/python-modules/wasmer/default.nix index dff14d15b901..4a99f048d1a6 100644 --- a/pkgs/development/python-modules/wasmer/default.nix +++ b/pkgs/development/python-modules/wasmer/default.nix @@ -5,7 +5,6 @@ , fetchFromGitHub , buildPythonPackage , libiconv -, llvm_11 , libffi , libxml2 , ncurses @@ -21,7 +20,7 @@ let , extraBuildInputs ? [ ] }: buildPythonPackage rec { inherit pname; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; outputs = [ "out" ] ++ lib.optional (pname == "wasmer") "testsout"; @@ -30,7 +29,7 @@ let owner = "wasmerio"; repo = "wasmer-python"; rev = version; - hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; + hash = "sha256-nOeOhQ1XY+9qmLGURrI5xbgBUgWe5XRpV38f73kKX2s="; }; cargoDeps = rustPlatform.fetchCargoTarball { @@ -74,26 +73,26 @@ rec { wasmer = common { pname = "wasmer"; buildAndTestSubdir = "packages/api"; - cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; + cargoHash = "sha256-twoog8LjQtoli+TlDipSuB7yLFkXQJha9BqobqgZW3Y="; }; wasmer-compiler-cranelift = common { pname = "wasmer-compiler-cranelift"; buildAndTestSubdir = "packages/compiler-cranelift"; - cargoHash = "sha256-cHgAUwqnbQV3E5nUYGYQ48ntbIFfq4JXfU5IrSFZ3zI="; + cargoHash = "sha256-IqeMOY6emhIC7ekH8kIOZCr3JVkjxUg/lQli+ZZpdq4="; }; wasmer-compiler-llvm = common { pname = "wasmer-compiler-llvm"; buildAndTestSubdir = "packages/compiler-llvm"; - cargoHash = "sha256-Jm22CC5S3pN/vdVvsGZdvtoAgPzWVLto8wavSJdxY3A="; - extraNativeBuildInputs = [ llvm_11 ]; + cargoHash = "sha256-xawbf5gXXV+7I2F2fDSaMvjtFvGDBtqX7wL3c28TSbA="; + extraNativeBuildInputs = [ rustPlatform.rust.rustc.llvm ]; extraBuildInputs = [ libffi libxml2.out ncurses zlib ]; }; wasmer-compiler-singlepass = common { pname = "wasmer-compiler-singlepass"; buildAndTestSubdir = "packages/compiler-singlepass"; - cargoHash = "sha256-lmqEo3+jYoN+4EEYphcoE4b84jdFcvYVycjrJ956Bh8="; + cargoHash = "sha256-4nZHMCNumNhdGPOmHXlJ5POYP7K+VPjwhEUMgzGb/Rk="; }; } diff --git a/pkgs/development/python-modules/wazeroutecalculator/default.nix b/pkgs/development/python-modules/wazeroutecalculator/default.nix index dd8409624648..dd561d1c0568 100644 --- a/pkgs/development/python-modules/wazeroutecalculator/default.nix +++ b/pkgs/development/python-modules/wazeroutecalculator/default.nix @@ -2,16 +2,20 @@ , buildPythonPackage , fetchPypi , requests +, pythonOlder }: buildPythonPackage rec { pname = "wazeroutecalculator"; - version = "0.13"; + version = "0.15"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "WazeRouteCalculator"; inherit version; - sha256 = "sha256-Ex9yglaJkk0+Uo3Y+xpimb5boXz+4QdbJS2O75U6dUg="; + sha256 = "sha256-DB5oWthWNwamFG3kNxA/kmUBOVogoSg5LI2KrI39s4M="; }; propagatedBuildInputs = [ @@ -21,7 +25,9 @@ buildPythonPackage rec { # there are no tests doCheck = false; - pythonImportsCheck = [ "WazeRouteCalculator" ]; + pythonImportsCheck = [ + "WazeRouteCalculator" + ]; meta = with lib; { description = "Calculate actual route time and distance with Waze API"; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 9ddb0631f5d2..3d752596dec3 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "54.0"; + version = "54.2"; disabled = !isPy3k; format = "pyproject"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "weasyprint"; - sha256 = "0aeda9a045c7881289420cac917cc57115b1243e476187338e66d593dd000853"; + sha256 = "sha256-1eiqguPiokd6RUPwZG2fsUCAybo0oIWXUesjdXzABGY="; }; patches = [ diff --git a/pkgs/development/python-modules/webargs/default.nix b/pkgs/development/python-modules/webargs/default.nix index e92b47d20933..31cedc7b4032 100644 --- a/pkgs/development/python-modules/webargs/default.nix +++ b/pkgs/development/python-modules/webargs/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "webargs"; - version = "8.0.1"; + version = "8.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "bcce022250ee97cfbb0ad07b02388ac90a226ef4b479ec84317152345a565614"; + sha256 = "f1f0b7f054a22263cf750529fc0926709ca47da9a2c417d423ad88d9fa6a5d33"; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index 9622f10168f1..116f45f16dd3 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.2.2"; + version = "1.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "21861f8645eb5725d1becfe86d7e7ae1a31d98b72556f9d44fcc5100976353cf"; + sha256 = "1315816c0acc508997eb3ae03b9d3ff619c9d12d544c9a9b553704b1cc4f6af5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 2e13d95c3825..7d6f78902d0a 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -23,11 +23,25 @@ buildPythonPackage rec { # Tests fail on Darwin with `OSError: AF_UNIX path too long` doCheck = !stdenv.isDarwin; - # Disable all tests that need to terminate within a predetermined amount of - # time. This is nondeterministic. patchPhase = '' + # Disable all tests that need to terminate within a predetermined amount of + # time. This is nondeterministic. sed -i 's/with self.assertCompletesWithin.*:/if True:/' \ tests/legacy/test_protocol.py + + # Disables tests relying on tight timeouts to avoid failures like: + # File "/build/source/tests/legacy/test_protocol.py", line 1270, in test_keepalive_ping_with_no_ping_timeout + # ping_1_again, ping_2 = tuple(self.protocol.pings) + # ValueError: too many values to unpack (expected 2) + for t in \ + test_keepalive_ping_stops_when_connection_closing \ + test_keepalive_ping_does_not_crash_when_connection_lost \ + test_keepalive_ping \ + test_keepalive_ping_not_acknowledged_closes_connection \ + test_keepalive_ping_with_no_ping_timeout \ + ; do + sed -i "s/def $t(/def skip_$t(/" tests/legacy/test_protocol.py + done ''; checkPhase = '' diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index 999d2560591d..8ec42598ee61 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -2,26 +2,25 @@ , buildPythonPackage , fetchPypi , isPy27 -, nose , webob , six , beautifulsoup4 , waitress -, mock , pyquery , wsgiproxy2 , pastedeploy +, pytestCheckHook }: buildPythonPackage rec { - version = "2.0.35"; + version = "3.0.0"; pname = "webtest"; disabled = isPy27; # paste.deploy is not longer a valid import src = fetchPypi { pname = "WebTest"; inherit version; - sha256 = "sha256-qsFotbK08gCvTjWGfPMWcSIQ49XbgcHL3/OHImR7sIc="; + sha256 = "54bd969725838d9861a9fa27f8d971f79d275d94ae255f5c501f53bb6d9929eb"; }; postPatch = '' @@ -36,8 +35,7 @@ buildPythonPackage rec { ]; checkInputs = [ - nose - mock + pytestCheckHook pastedeploy wsgiproxy2 pyquery diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 0e00a08145e6..42a3877cffc1 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -4,12 +4,13 @@ , pytestCheckHook , pythonOlder , paho-mqtt +, python-dateutil , weconnect }: buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.21.0"; + version = "0.30.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,11 +19,12 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "v${version}"; - sha256 = "sha256-wagFjVXTjYFryaUiVeqU+T9ya+NzUFMX3uPlRZGe1v0="; + sha256 = "sha256-/mlN9gEEy8DJSFef0Pp2PLjHhwStKwANKSzw4nT19eM="; }; propagatedBuildInputs = [ paho-mqtt + python-dateutil weconnect ]; @@ -32,6 +34,8 @@ buildPythonPackage rec { substituteInPlace pytest.ini \ --replace "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \ --replace "pytest-cov" "" + substituteInPlace requirements.txt \ + --replace "weconnect[Images]~=0.35.1" "weconnect" ''; checkInputs = [ diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 70da78edb603..f5af3e5aa504 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -7,11 +7,12 @@ , pytestCheckHook , pythonOlder , requests +, oauthlib }: buildPythonPackage rec { pname = "weconnect"; - version = "0.28.0"; + version = "0.37.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,11 +21,12 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - sha256 = "sha256-J7T62L6wT9rkl/Ukf2y5kBbJEdzh2XnGgCgedkxVEmA="; + sha256 = "sha256-h6jKtQt9vCh5bnhIqWLniUIJ41GxCs0uSi4vBVNs8tE="; }; propagatedBuildInputs = [ ascii-magic + oauthlib pillow requests ]; @@ -40,6 +42,8 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ --replace "tests_require=TEST_REQUIRED," "tests_require=[]," + substituteInPlace requirements.txt \ + --replace "pillow~=9.0.0" "pillow" substituteInPlace pytest.ini \ --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ --replace "pytest-cov" "" diff --git a/pkgs/development/python-modules/werkzeug/1.nix b/pkgs/development/python-modules/werkzeug/1.nix new file mode 100644 index 000000000000..ae7ce1f2b90a --- /dev/null +++ b/pkgs/development/python-modules/werkzeug/1.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, buildPythonPackage, fetchPypi +, itsdangerous, hypothesis +, pytestCheckHook, requests +, pytest-timeout +, isPy3k + }: + +buildPythonPackage rec { + pname = "Werkzeug"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; + }; + + propagatedBuildInputs = [ itsdangerous ]; + checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ]; + + postPatch = '' + # ResourceWarning causes tests to fail + rm tests/test_routing.py + ''; + + disabledTests = [ + "test_save_to_pathlib_dst" + "test_cookie_maxsize" + "test_cookie_samesite_attribute" + "test_cookie_samesite_invalid" + "test_range_parsing" + "test_content_range_parsing" + "test_http_date_lt_1000" + "test_best_match_works" + "test_date_to_unix" + "test_easteregg" + + # Seems to be a problematic test-case: + # + # > warnings.warn(pytest.PytestUnraisableExceptionWarning(msg)) + # E pytest.PytestUnraisableExceptionWarning: Exception ignored in: <_io.FileIO [closed]> + # E + # E Traceback (most recent call last): + # E File "/nix/store/cwv8aj4vsqvimzljw5dxsxy663vjgibj-python3.9-Werkzeug-1.0.1/lib/python3.9/site-packages/werkzeug/formparser.py", line 318, in parse_multipart_headers + # E return Headers(result) + # E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True> + "test_basic_routing" + "test_merge_slashes_match" + "test_merge_slashes_build" + "TestMultiPart" + "TestHTTPUtility" + ] ++ lib.optionals stdenv.isDarwin [ + "test_get_machine_id" + ]; + + meta = with lib; { + homepage = "https://palletsprojects.com/p/werkzeug/"; + description = "A WSGI utility library for Python"; + license = licenses.bsd3; + maintainers = [ ]; + }; +} + diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 1b899b59897f..62298b0d6ac4 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.36.2"; + version = "0.37.1"; format = "other"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = version; - sha256 = "13bj49psan1s1fxfrq613dm2l7jvrg2dpgb36lz81z3b1h7zig6j"; + sha256 = "sha256-JlTmUPY3yo/uROyd3nW1dJa23zbLhgQTwcmqZkPOrHs="; name = "${pname}-${version}-source"; extraPostFetch = '' cd $out @@ -37,7 +37,7 @@ buildPythonPackage rec { pipInstallFlags = [ "--ignore-installed" ]; meta = with lib; { - homepage = "https://bitbucket.org/pypa/wheel/"; + homepage = "https://github.com/pypa/wheel"; description = "A built-package format for Python"; longDescription = '' This library is the reference implementation of the Python wheel packaging standard, diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index 5598b189afac..d4d956119409 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -1,6 +1,7 @@ { lib , brotli , buildPythonPackage +, django , fetchFromGitHub , pytestCheckHook , pythonOlder @@ -9,14 +10,16 @@ buildPythonPackage rec { pname = "whitenoise"; - version = "5.3.0"; - disabled = pythonOlder "3.5"; + version = "6.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "evansd"; repo = pname; - rev = "v${version}"; - sha256 = "17j1rml1hb43c7fs7kf4ygkpmnjppzgsbnyw3plq9w3yh9w5hkhg"; + rev = version; + hash = "sha256-mUjyX4eQOiMweje6UPyfyJsiHwzF5OQ93KuxFedWxbQ="; }; propagatedBuildInputs = [ @@ -24,6 +27,7 @@ buildPythonPackage rec { ]; checkInputs = [ + django pytestCheckHook requests ]; @@ -40,7 +44,9 @@ buildPythonPackage rec { "test_modified" ]; - pythonImportsCheck = [ "whitenoise" ]; + pythonImportsCheck = [ + "whitenoise" + ]; meta = with lib; { description = "Radically simplified static file serving for WSGI applications"; diff --git a/pkgs/development/python-modules/whodap/default.nix b/pkgs/development/python-modules/whodap/default.nix index 6bd22c56b955..d4f6913105f2 100644 --- a/pkgs/development/python-modules/whodap/default.nix +++ b/pkgs/development/python-modules/whodap/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.3"; + version = "0.1.4"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "v${version}"; - sha256 = "1pcn2jwqfvp67wz19lcpwnw0dkbc61bnbkzxlmac1yf2pz9ndn6l"; + sha256 = "sha256-L8fSf9AhmWbRvLKvf0aowKoal+5dG1SJXcA7Ssrhj6o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index ef69283e6dbf..b2875819646c 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -2,25 +2,34 @@ , buildPythonPackage , fetchFromGitHub , inetutils +, pythonOlder }: buildPythonPackage rec { pname = "whois"; - version = "0.9.13"; + version = "0.9.14"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "DannyCork"; repo = "python-whois"; rev = version; - sha256 = "0y2sfs6nkr2j2crrn81wkfdzn9aphb3iaddya5zd2midlgdqq7bw"; + sha256 = "1df4r2pr356y1c2ys6pzdl93fmx9ci4y75xphc95xn27zvqbpvix"; }; - # whois is needed - propagatedBuildInputs = [ inetutils ]; + propagatedBuildInputs = [ + # whois is needed + inetutils + ]; # tests require network access doCheck = false; - pythonImportsCheck = [ "whois" ]; + + pythonImportsCheck = [ + "whois" + ]; meta = with lib; { description = "Python module/library for retrieving WHOIS information"; diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index 3dafd4df44b3..4f6955c2dbdb 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "willow"; - version = "1.4"; + version = "1.4.1"; disabled = pythonOlder "2.7"; src = fetchPypi { pname = "Willow"; inherit version; - sha256 = "0b3lh7z98nlh4yn0cmvk7bimhfk5w4qvbmjr6jn880ji9h2ixq6d"; + sha256 = "sha256-Dfj/UoUx4AtI1Av3Ltgb6sHcgvLULlu+1K/wIYvvjA0="; }; propagatedBuildInputs = [ six pillow ]; diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index ea69a22c27b0..3bd0d5b55b90 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.11.0"; + version = "0.13.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "02mc9dbz7lvk7d8aaimggm3vg99bc42njsv8sfchvc9amvdi94qy"; + sha256 = "sha256-QQPrAfk+BX8mjqn9ISim9hLEZR2nbgxbkwCv+91yeRY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index 94234b2626e2..14e81df65fcd 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -1,14 +1,27 @@ -{lib, fetchFromGitHub, pythonOlder, buildPythonPackage, gfortran, mock, xarray, wrapt, numpy, netcdf4, setuptools}: +{lib +, fetchFromGitHub +, pythonOlder +, buildPythonPackage +, gfortran +, xarray +, wrapt +, numpy +, netcdf4 +, setuptools +}: buildPythonPackage rec { pname = "wrf-python"; - version = "1.3.2.6"; + version = "1.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "NCAR"; repo = "wrf-python"; rev = version; - sha256 = "046kflai71r7xrmdw6jn0ifn5656wj9gpnwlgxkx430dgk7zbc2y"; + hash = "sha256-+v4FEK0FVE0oAIb18XDTOInHKfxXyykb1ngk9Uxwf0c="; }; propagatedBuildInputs = [ @@ -24,9 +37,8 @@ buildPythonPackage rec { checkInputs = [ netcdf4 - ] ++ lib.optional (pythonOlder "3.3") mock; + ]; - doCheck = true; checkPhase = '' runHook preCheck cd ./test/ci_tests @@ -34,10 +46,14 @@ buildPythonPackage rec { runHook postCheck ''; - meta = { + pythonImportsCheck = [ + "wrf" + ]; + + meta = with lib; { description = "WRF postprocessing library for Python"; homepage = "http://wrf-python.rtfd.org"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ mhaselsteiner ]; + license = licenses.asl20; + maintainers = with maintainers; [ mhaselsteiner ]; }; } diff --git a/pkgs/development/python-modules/wsdiscovery/default.nix b/pkgs/development/python-modules/wsdiscovery/default.nix new file mode 100644 index 000000000000..8ba797449494 --- /dev/null +++ b/pkgs/development/python-modules/wsdiscovery/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, mock +, netifaces +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "wsdiscovery"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "andreikop"; + repo = "python-ws-discovery"; + rev = version; + hash = "sha256-6LGZogNRCnmCrRXvHq9jmHwqW13KQPpaGaao/52JPtk="; + }; + + propagatedBuildInputs = [ + click + netifaces + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "wsdiscovery" + ]; + + meta = with lib; { + description = "WS-Discovery implementation for Python"; + homepage = "https://github.com/andreikop/python-ws-discovery"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/wtf-peewee/default.nix b/pkgs/development/python-modules/wtf-peewee/default.nix index 6fd356e69ed6..35be8ba260c4 100644 --- a/pkgs/development/python-modules/wtf-peewee/default.nix +++ b/pkgs/development/python-modules/wtf-peewee/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , peewee , wtforms , python @@ -15,6 +16,14 @@ buildPythonPackage rec { sha256 = "faa953fe3f705d4f2b48f3c1a81c5c5a6a38f9ed1378c9a830e6efc1b0fccb15"; }; + patches = [ + (fetchpatch { + name = "fix-wtforms3.patch"; + url = "https://github.com/coleifer/wtf-peewee/commit/b1764f4474c73a9a2b34ae6b7db61274f5252a7f.patch"; + sha256 = "0maz3fm9bi8p80nk9sdb34xq55xq8ihm51y7k0m8ck9aaypvwbig"; + }) + ]; + propagatedBuildInputs = [ peewee wtforms diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index 89796500e04e..71f8b2847e3b 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -13,29 +13,59 @@ , wxGTK , pillow , numpy +, libXinerama +, libSM +, libXxf86vm +, libXtst +, libGLU +, libGL +, xorgproto +, gst_all_1 +, libglvnd +, mesa +, webkitgtk +, autoPatchelfHook }: let dynamic-linker = stdenv.cc.bintools.dynamicLinker; in buildPythonPackage rec { pname = "wxPython"; - version = "4.1.0"; + version = "4.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "12x4ci5q7qni4rkfiq6lnpn1fk8b0sfc6dck5wyxkj2sfp5pa91f"; + sha256 = "0a1mdhdkda64lnwm1dg0dlrf9rs4gkal3lra6hpqbwn718cf7r80"; }; # https://github.com/NixOS/nixpkgs/issues/75759 # https://github.com/wxWidgets/Phoenix/issues/1316 doCheck = false; - nativeBuildInputs = [ which doxygen wxGTK pkg-config ]; + nativeBuildInputs = [ + which + doxygen + wxGTK.gtk + pkg-config + autoPatchelfHook + ]; buildInputs = [ wxGTK.gtk ncurses + libXinerama + libSM + libXxf86vm + libXtst + xorgproto + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libGLU + libGL + libglvnd + mesa + webkitgtk ]; propagatedBuildInputs = [ pillow numpy ]; @@ -43,23 +73,17 @@ buildPythonPackage rec { DOXYGEN = "${doxygen}/bin/doxygen"; preConfigure = lib.optionalString (!stdenv.isDarwin) '' - substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ - --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' substituteInPlace wx/lib/wxcairo/wx_pycairo.py \ --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-3.0.so"), ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), + ("cairoLib = None", "cairoLib = ctypes.CDLL('${cairo}/lib/libcairo.so')"), ("appsvc", None) ]}' - - # https://github.com/wxWidgets/Phoenix/pull/1584 - # It'll be not needed in next version because https://github.com/wxWidgets/Phoenix/pull/1699 - substituteInPlace build.py --replace "os.environ['PYTHONPATH'] = phoenixDir()" \ - "os.environ['PYTHONPATH'] = os.environ['PYTHONPATH'] + os.pathsep + phoenixDir()" ''; buildPhase = '' - ${python.interpreter} build.py -v --use_syswx dox etg --nodoc build_py + ${python.interpreter} build.py -v build_wx dox etg --nodoc sip build_py ''; installPhase = '' @@ -67,8 +91,6 @@ buildPythonPackage rec { wrapPythonPrograms ''; - passthru = { inherit wxGTK; }; - meta = with lib; { description = "Cross platform GUI toolkit for Python, Phoenix version"; homepage = "http://wxpython.org/"; diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index c916f8d7ec2a..ca339b7a4438 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "6.0.2"; + version = "6.0.3"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "sha256-P8mUkAO3usFCE+E9cna2x1iA2uyHVPX9FHDpX+kTFWQ="; + sha256 = "1qvg3bwqzqxlzlixz2di3si7siy0ismq93wd57r8cqmxl54gva6h"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index efdb40cd6f87..5a47fc90f67f 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -1,34 +1,53 @@ { lib -, buildPythonPackage -, fetchPypi -, pillow -, html5lib -, pypdf2 -, reportlab -, six -, python-bidi , arabic-reshaper -, setuptools +, buildPythonPackage +, fetchFromGitHub +, html5lib +, pillow +, pypdf3 +, pytestCheckHook +, python-bidi +, pythonOlder +, reportlab +, svglib }: buildPythonPackage rec { pname = "xhtml2pdf"; - version = "0.2.5"; + version = "0.2.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + hash = "sha256-EyIERvAC98LqPTMCdwWqTkm1RiMhikscL0tnMZUHIT8="; + }; propagatedBuildInputs = [ - pillow html5lib pypdf2 reportlab six - setuptools python-bidi arabic-reshaper + arabic-reshaper + html5lib + pillow + pypdf3 + python-bidi + reportlab + svglib ]; - src = fetchPypi { - inherit pname version; - sha256 = "6797e974fac66f0efbe927c1539a2756ca4fe8777eaa5882bac132fc76b39421"; - }; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "xhtml2pdf" + ]; meta = with lib; { description = "A PDF generator using HTML and CSS"; homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index f74332e53649..5aac18d21077 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -1,24 +1,40 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , installShellFiles +, pytestCheckHook +, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "xkcdpass"; version = "1.19.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c5a2e948746da6fe504e8404284f457d8e98da6df5047c6bb3f71b18882e9d2a"; + hash = "sha256-xaLpSHRtpv5QToQEKE9FfY6Y2m31BHxrs/cbGIgunSo="; }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "xkcdpass" ]; + pythonImportsCheck = [ + "xkcdpass" + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.10") [ + # https://github.com/redacted/XKCD-password-generator/issues/138 + "test_entropy_printout_valid_input" + ]; postInstall = '' installManPage *.? @@ -27,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate secure multiword passwords/passphrases, inspired by XKCD"; - homepage = "https://pypi.python.org/pypi/xkcdpass/"; + homepage = "https://github.com/redacted/XKCD-password-generator"; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 781f59fa3cf7..b2bfeea8f7a9 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.15"; + version = "0.19.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-k/fLUuBjXScTvlvoBLZIVPEqNGIPI04FBeTBadp5uiY="; + sha256 = "sha256-LJ7MmKCWx+n7caud0pN4+7f9H4XzwuAAn9u86X/FACo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index cfb72680fa8b..edb4761af3a8 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -7,30 +7,39 @@ , python , mock , nose +, pytestCheckHook , util-linux }: buildPythonPackage rec { pname = "xlib"; - version = "0.29"; + version = "0.31"; src = fetchFromGitHub { owner = "python-xlib"; repo = "python-xlib"; rev = version; - sha256 = "sha256-zOG1QzRa5uN36Ngv8i5s3mq+VIoRzxFj5ltUbKdonJ0="; + sha256 = "155p9xhsk01z9vdml74h07svlqy6gljnx9c6qbydcr14lwghwn06"; }; - checkPhase = '' - ${python.interpreter} runtests.py - ''; - - checkInputs = [ mock nose util-linux /* mcookie */ xorg.xauth xorg.xorgserver /* xvfb */ ]; nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ xorg.libX11 ]; propagatedBuildInputs = [ six ]; doCheck = !stdenv.isDarwin; + checkInputs = [ + pytestCheckHook + mock + nose + util-linux + xorg.xauth + xorg.xorgserver + ]; + + disabledTestPaths = [ + # requires x session + "test/test_xlib_display.py" + ]; meta = with lib; { description = "Fully functional X client library for Python programs"; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 26b51d1a4ac3..c9cf286b6cce 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.12.0"; + version = "3.12.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "25deadb9ee95f0dc71376a60e9c1e34636b5016c1952ad5597a6246495e34464"; + sha256 = "sha256-YUrcD3Q1fkDW+nwf6k2T/aBL8+W9iWkPYW/TqdTiuA0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 1687b113b42f..8616463915e6 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - version = "1.9.2"; + version = "1.10.0"; pname = "xmlschema"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "1d18x150g0jz3nw5al5dygizwkjgzdnmd5kf46v8ribfz48iirr6"; + sha256 = "sha256-er6+/2fZTw+CDIwCGqTNoXi7KJ3XOsbcWYaH8A2SSgo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index 790aaec3ce3d..13cc5b89c2a2 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , coverage -, nose +, pytestCheckHook }: buildPythonPackage rec { @@ -14,11 +14,13 @@ buildPythonPackage rec { sha256 = "50d8c638ed7ecb88d90561beedbf720c9b4e851a9fa6c47ebd64e99d166d8a21"; }; - checkInputs = [ coverage nose ]; + checkInputs = [ coverage pytestCheckHook ]; - checkPhase = '' - nosetests - ''; + disabledTests = [ + # incompatibilities with security fixes: https://github.com/martinblech/xmltodict/issues/289 + "test_namespace_collapse" + "test_namespace_support" + ]; meta = { description = "Makes working with XML feel like you are working with JSON"; diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix index 201a1636f173..1a8d561d5de2 100644 --- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix +++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix @@ -3,17 +3,21 @@ , buildPythonPackage , fetchFromGitHub , requests +, pythonOlder }: buildPythonPackage rec { pname = "yalesmartalarmclient"; - version = "0.3.5"; + version = "0.3.8"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "domwillcode"; repo = "yale-smart-alarm-client"; rev = "v${version}"; - sha256 = "11i7vh61a5xfv32zm7rkigl010wzd6snag6sf7w38256j95nnb05"; + sha256 = "sha256-CWL1uvmUGLaa2Ho0Ka4wTWstebhe1nQr9R821mweE60="; }; propagatedBuildInputs = [ @@ -24,7 +28,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "yalesmartalarmclient" ]; + pythonImportsCheck = [ + "yalesmartalarmclient" + ]; meta = with lib; { description = "Python module to interface with Yale Smart Alarm Systems"; diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index d83b031fe4c4..2eb38dd0784e 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -7,6 +7,7 @@ , buildPythonPackage , fetchFromGitHub , pubnub +, pyjwt , pytestCheckHook , python-dateutil , pythonOlder @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.19"; + version = "1.1.23"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,13 +26,14 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i6UFsSY2DQ4jB316fy5cZ+2C93TTmvyB4Caxj3syPdo="; + sha256 = "sha256-CnAVkwCOADBNY0cUvq9Dt6JR+fIr4LiZVMzJIIFqzG0="; }; propagatedBuildInputs = [ aiofiles aiohttp pubnub + pyjwt python-dateutil requests ]; diff --git a/pkgs/development/python-modules/yamale/default.nix b/pkgs/development/python-modules/yamale/default.nix index 670e46f98055..5cd60f02b589 100644 --- a/pkgs/development/python-modules/yamale/default.nix +++ b/pkgs/development/python-modules/yamale/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yamale"; - version = "4.0.2"; + version = "4.0.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "23andMe"; repo = pname; rev = version; - sha256 = "sha256-hFBU3o3HpL0Schgzcx3oYq0IAUVGKThIfEteYcFbLnk="; + sha256 = "sha256-1GFvgfy3MDsJGKSEm0yaQoLM7VqIS2wphw16trNTUOc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index f0203d58dffb..7243b3891f40 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "yamlfix"; - version = "0.8.0"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "lyz-code"; repo = pname; rev = version; - sha256 = "sha256-Gkq80YMeiPy7xxLauA/nloW4znMV2tfE+e24HyZgUaQ="; + sha256 = "sha256-YCC4xK1fB5Gyv32JhbSuejtzLNMRnH7iyUpzccVijS0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yangson/default.nix b/pkgs/development/python-modules/yangson/default.nix index fec15464bd9d..a82bf972546d 100644 --- a/pkgs/development/python-modules/yangson/default.nix +++ b/pkgs/development/python-modules/yangson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "yangson"; - version = "1.4.10"; + version = "1.4.13"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-R7ZcG4FStESPDWnFD6WIDD8sugvil9ybVK0J2qQC+zU="; + sha256 = "sha256-SuKpSwIjZioyqmxlcKJ+UXP+ADfJwUwCCttmMAiEkZ4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yara-python/default.nix b/pkgs/development/python-modules/yara-python/default.nix index e29ff3b12de7..8d5892979e1f 100644 --- a/pkgs/development/python-modules/yara-python/default.nix +++ b/pkgs/development/python-modules/yara-python/default.nix @@ -2,18 +2,22 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonOlder , yara }: buildPythonPackage rec { pname = "yara-python"; - version = "4.1.3"; + version = "4.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-python"; rev = "v${version}"; - sha256 = "sha256-lOP+OVnMgpP8S+Q3jGRNEAFXAohXgX5Nvl+l4EK5ebs="; + hash = "sha256-jNxYuIddMzANZoQ0p7BbRrX6ISpaCA7T6j+iS+FOocg="; }; buildInputs = [ @@ -28,9 +32,13 @@ buildPythonPackage rec { "--dynamic-linking" ]; - pytestFlagsArray = [ "tests.py" ]; + pytestFlagsArray = [ + "tests.py" + ]; - pythonImportsCheck = [ "yara" ]; + pythonImportsCheck = [ + "yara" + ]; meta = with lib; { description = "Python interface for YARA"; diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index 6c40f266f346..b64bd929f13f 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -9,14 +9,16 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.7.8"; - disabled = pythonOlder "3.4"; + version = "0.7.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitLab { owner = "stavros"; repo = "python-yeelight"; rev = "v${version}"; - sha256 = "sha256-fKtG0D256bK1hIcQiLdzCM+IdD/mmcFpcoE3DEFt7r0="; + sha256 = "sha256-8N+HOhUX3BXecS/kaAfLoge+NYzKLKPyoTthu+useJA="; }; propagatedBuildInputs = [ @@ -28,9 +30,13 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "yeelight/tests.py" ]; + pytestFlagsArray = [ + "yeelight/tests.py" + ]; - pythonImportsCheck = [ "yeelight" ]; + pythonImportsCheck = [ + "yeelight" + ]; meta = with lib; { description = "Python library for controlling YeeLight RGB bulbs"; diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index db27afcfe6c4..26ddf9354df9 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.68"; + version = "0.1.70"; src = fetchFromGitHub { owner = "ranaroussi"; repo = pname; rev = version; - sha256 = "sha256-ubOC56DUViClARzMSRtDFrtxhilmVkhKMx9SxLbYFiA="; + sha256 = "sha256-Anvt+ag0PysGynQv4q+2IrQmCPZViGqWI4dgfLQWGds="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index 35f470e319f0..6795ba581273 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -1,27 +1,37 @@ -{ lib, buildPythonPackage, pythonOlder, fetchPypi, httpx }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, httpx +}: buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.6.1"; + version = "1.6.3"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "c7afe70e1ac8e871341d7fb15f5246aac35fd80fec10d7a96d46df2aad608bd0"; + hash = "sha256-zAza1XMKLIMZFFS0v/4ATqh6j7aEB2Y+eliE/hNPORw="; }; - propagatedBuildInputs = [ httpx ]; + propagatedBuildInputs = [ + httpx + ]; - pythonImportsCheck = [ "youtubesearchpython" ]; + pythonImportsCheck = [ + "youtubesearchpython" + ]; - # project has no tests + # Project has no tests doCheck = false; meta = with lib; { - description = "Search for YouTube videos, channels & playlists & get video information using link WITHOUT YouTube Data API v3"; + description = "Search for YouTube videos, channels & playlists & get video information using link without YouTube Data API"; homepage = "https://github.com/alexmercerind/youtube-search-python"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix index 0ff3212f48ca..30c056db9340 100644 --- a/pkgs/development/python-modules/yowsup/default.nix +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -1,10 +1,18 @@ -{ buildPythonPackage, lib, fetchFromGitHub, six, python-axolotl, pytest -, isPy3k, consonance, appdirs +{ lib +, buildPythonPackage +, isPy3k +, fetchFromGitHub +, appdirs +, consonance +, protobuf +, python-axolotl +, six +, pytestCheckHook }: buildPythonPackage rec { pname = "yowsup"; - version = "3.2.3"; + version = "3.3.0"; # The Python 2.x support of this package is incompatible with `six==1.11`: # https://github.com/tgalal/yowsup/issues/2416#issuecomment-365113486 @@ -14,22 +22,31 @@ buildPythonPackage rec { owner = "tgalal"; repo = "yowsup"; rev = "v${version}"; - sha256 = "0wb8yl685nr1i3vx89hwan5m6a482x8g48f5ksvdlph538p720pm"; + sha256 = "1pz0r1gif15lhzdsam8gg3jm6zsskiv2yiwlhaif5rl7lv3p0v7q"; }; - checkInputs = [ pytest ]; - checkPhase = '' - HOME=$(mktemp -d) py.test yowsup + postPatch = '' + substituteInPlace setup.py \ + --replace "argparse" "" \ + --replace "==" ">=" \ ''; - patches = [ ./dependency-fixes.patch ]; + checkInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = [ six python-axolotl consonance appdirs ]; + propagatedBuildInputs = [ + appdirs + consonance + protobuf + python-axolotl + six + ]; meta = with lib; { homepage = "https://github.com/tgalal/yowsup"; description = "The python WhatsApp library"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/development/python-modules/yowsup/dependency-fixes.patch b/pkgs/development/python-modules/yowsup/dependency-fixes.patch deleted file mode 100644 index eab56332d492..000000000000 --- a/pkgs/development/python-modules/yowsup/dependency-fixes.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index e3871a7..930bd6a 100755 ---- a/setup.py -+++ b/setup.py -@@ -5,7 +5,7 @@ import yowsup - import platform - import sys - --deps = ['consonance==0.1.2', 'argparse', 'python-axolotl==0.2.2', 'six==1.10', 'appdirs', 'protobuf>=3.6.0'] -+deps = ['consonance>=0.1', 'python-axolotl>=0.2', 'six>=1.10', 'appdirs', 'protobuf>=3.6.0'] - - if sys.version_info < (2, 7): - deps.append('importlib') diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 218c2edd0ac5..fdee7ace495a 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.20.0"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DvLrytLp28TVFVdkmWg19cC2VRetFcSx7dmsO4HQqVo="; + hash = "sha256-JstIHc61TFQEgRHr54N4Doq6ML0EcIcDGTEJ/tbrC2A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zcs/default.nix b/pkgs/development/python-modules/zcs/default.nix index 9f22cd1dfc86..8ad26668bc5e 100644 --- a/pkgs/development/python-modules/zcs/default.nix +++ b/pkgs/development/python-modules/zcs/default.nix @@ -15,6 +15,10 @@ buildPythonPackage rec { sha256 = "sha256-ZoQgAaJy3kKHLljyKA0Oo/D1kefE8X9FlsGDSNt1nPw="; }; + patches = [ + ./fix-test-yaml.patch + ]; + propagatedBuildInputs = [ yacs ]; pythonImportsCheck = [ "zcs" ]; diff --git a/pkgs/development/python-modules/zcs/fix-test-yaml.patch b/pkgs/development/python-modules/zcs/fix-test-yaml.patch new file mode 100644 index 000000000000..a046f1808296 --- /dev/null +++ b/pkgs/development/python-modules/zcs/fix-test-yaml.patch @@ -0,0 +1,13 @@ +diff --git a/test/test_zcs.py b/test/test_zcs.py +index e4981d3..893999f 100644 +--- a/test/test_zcs.py ++++ b/test/test_zcs.py +@@ -65,7 +65,7 @@ class TestCfgNode(unittest.TestCase): + cfg = self.cfg.clone() + yamlp = pathjoin(tmpboxx(), "test.yaml") + cfg.dump(yamlp) +- cfg_dict = yaml.load(open(yamlp)) ++ cfg_dict = yaml.load(open(yamlp), yaml.Loader) + cfgd = CfgNode(cfg_dict) + self.assertTrue(str(cfg.dump()) == str(cfgd.dump())) + diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 92d9a4a84873..54ebc888f1f4 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.6"; + version = "3.7.7"; src = fetchPypi { inherit version pname; - sha256 = "e8d8a7828e4994545bf57059bd0a0d431d387d31cc4af2eb5eeb93ef28c2d827"; + sha256 = "415f4a673009fe9a5ef67b61c4469ddf14b73857b6d40f02d6b74f02ad935147"; }; buildInputs = [ openssl bzip2 ]; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 12e0279eb3de..b81ac4f1fc5f 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.38.1"; + version = "0.38.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-8bJEH+m+83rkKdN5GjD4THs1CUy/wstoBFiXR7kHKtw="; + sha256 = "sha256-CLV1/maraSJ3GWnyN/0rLyEyWoQIL18rhm35llgvthw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index 3862a8e757d1..c2e707347b33 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -5,12 +5,16 @@ , pathpy , pytestCheckHook , setuptools-scm +, pythonAtLeast }: buildPythonPackage rec { pname = "zetup"; version = "0.2.64"; + # https://github.com/zimmermanncode/zetup/issues/4 + disabled = pythonAtLeast "3.10"; + src = fetchPypi { inherit pname version; sha256 = "b8a9bdcfa4b705d72b55b218658bc9403c157db7b57a14158253c98d03ab713d"; diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index 1cb2780cc948..f91706b97d18 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "zfec"; - version = "1.5.5"; + version = "1.5.7.2"; src = fetchPypi { inherit pname version; - sha256 = "6033b2f3cc3edacf3f7eeed5f258c1ebf8a1d7e5e35b623db352512ce564e5ca"; + sha256 = "sha256-TuUZvg3MfaLohIK8/Av5d6Ql4dfoJ4z1u7uNAPiir7Y="; }; propagatedBuildInputs = [ pyutil ]; diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index c1d4328106ae..56d2704fcc19 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.65"; + version = "0.0.67"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "sha256-3Lcmc95KotFMlL44zDugIQkHtplMMlyWjSb+SLehaqs="; + sha256 = "sha256-qkXXrwqMEtfafHsXtlyy6HFwuo/8sOZuQ9SvGRJkGtA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index 611660fc3eb5..822a041e5d18 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zict"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "8e2969797627c8a663575c2fc6fcb53a05e37cdb83ee65f341fc6e0c3d0ced16"; + sha256 = "sha256-FbLMFflaR2++BiP9j3ceHncTEL96AflUEqC2BbbkdRA="; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 5ebb17dd498b..b44a385fd933 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.7.4"; + version = "0.8.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 @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = version; - sha256 = "0xl8qgljvmypi602f52m89iv9pcrzsdal3jw619vrcavp40rc04d"; + sha256 = "sha256-rFmcgfn87XS1fvbSdJG6pItXRMkeogp4faKMe7pCxkM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index 338dd93150b3..d350e2040891 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "zimports"; - version = "0.2.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "sqlalchemyorg"; repo = "zimports"; - rev = version; - sha256 = "0a5axflkk0wv0rdnrh8l2rgj8gh2pfkg5lrvr8x4yxxiifawrafc"; + rev = "v${version}"; + sha256 = "11mg7j7xiypv9hki4qbnp9jsgwgfdrgdzfqyrzk5x0s4hycgi4q0"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index dc30128c9ead..0f64df2a56ac 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -1,26 +1,38 @@ { lib , buildPythonPackage , fetchPypi -, setuptools-scm , more-itertools +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "zipp"; - version = "3.6.0"; + version = "3.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832"; + sha256 = "9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d"; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools-scm + ]; - propagatedBuildInputs = [ more-itertools ]; + propagatedBuildInputs = [ + more-itertools + ]; # Prevent infinite recursion with pytest doCheck = false; + pythonImportsCheck = [ + "zipp" + ]; + meta = with lib; { description = "Pathlib-compatible object wrapper for zip files"; homepage = "https://github.com/jaraco/zipp"; diff --git a/pkgs/development/python-modules/zipstream-ng/default.nix b/pkgs/development/python-modules/zipstream-ng/default.nix new file mode 100644 index 000000000000..b1f620557bfa --- /dev/null +++ b/pkgs/development/python-modules/zipstream-ng/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "zipstream-ng"; + version = "1.3.4"; + + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { + owner = "pR0Ps"; + repo = "zipstream-ng"; + rev = "v${version}"; + sha256 = "NTsnGCddGDUxdHbEoM2ew756psboex3sb6MkYKtaSjQ="; + }; + + pythonImportsCheck = [ + "zipstream" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Library to generate streamable zip files"; + longDescription = '' + A modern and easy to use streamable zip file generator. It can package and stream many files + and folders on the fly without needing temporary files or excessive memory + ''; + homepage = "https://github.com/pR0Ps/zipstream-ng"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index 0b5d3103b64d..e1cba0ebc02b 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "zope-deferredimport"; - version = "4.3.1"; + version = "4.4"; src = fetchPypi { pname = "zope.deferredimport"; inherit version; - sha256 = "57b2345e7b5eef47efcd4f634ff16c93e4265de3dcf325afc7315ade48d909e1"; + sha256 = "2ae3257256802787e52ad840032f39c1496d3ce0b7e11117f663420e4a4c9add"; }; propagatedBuildInputs = [ zope_proxy ]; diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index 856ca0ee0249..5c0536166aab 100755 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -3,27 +3,41 @@ , fetchPypi , cffi , hypothesis +, pythonOlder }: buildPythonPackage rec { pname = "zstandard"; version = "0.17.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "fa9194cb91441df7242aa3ddc4cb184be38876cb10dd973674887f334bafbfb6"; }; - propagatedNativeBuildInputs = [ cffi ]; + propagatedNativeBuildInputs = [ + cffi + ]; - propagatedBuildInputs = [ cffi ]; + propagatedBuildInputs = [ + cffi + ]; - checkInputs = [ hypothesis ]; + checkInputs = [ + hypothesis + ]; + + pythonImportsCheck = [ + "zstandard" + ]; meta = with lib; { description = "zstandard bindings for Python"; homepage = "https://github.com/indygreg/python-zstandard"; license = licenses.bsdOriginal; - maintainers = [ maintainers.arnoldfarkas ]; + maintainers = with maintainers; [ arnoldfarkas ]; }; } diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 5b18c09f15a8..5f4203634acb 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, pydantic , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.33.0"; + version = "0.35.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,13 +19,16 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-0hAksizQSIOg+hbSq/OZqFqlBBdpa0bSf+puWfD9TSg="; + sha256 = "sha256-Bte4pAi+atdkMvxYlzdN/UOrHB2WKfl44U9m/vKFMoA="; }; propagatedBuildInputs = [ aiohttp + pydantic ]; + doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; + checkInputs = [ pytest-aiohttp pytestCheckHook diff --git a/pkgs/development/python2-modules/coverage/default.nix b/pkgs/development/python2-modules/coverage/default.nix new file mode 100644 index 000000000000..f93d32d392f7 --- /dev/null +++ b/pkgs/development/python2-modules/coverage/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +, mock +}: + +buildPythonPackage rec { + pname = "coverage"; + version = "5.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"; + }; + + # No tests in archive + doCheck = false; + checkInputs = [ mock ]; + + meta = { + description = "Code coverage measurement for python"; + homepage = "https://coverage.readthedocs.io/"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/python2-modules/gtkme/default.nix b/pkgs/development/python2-modules/gtkme/default.nix new file mode 100644 index 000000000000..bc23854d95c8 --- /dev/null +++ b/pkgs/development/python2-modules/gtkme/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pkg-config +, gobject-introspection +, pygobject3 +, gtk3 +, glib +}: + +buildPythonPackage rec { + pname = "gtkme"; + version = "1.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-NIUgnbfcHjbPfsH3CF2Bywo8owrdsi1wqDoMxOa+2U4="; + }; + + nativeBuildInputs = [ pkg-config gobject-introspection gtk3 ]; + buildInputs = [ pygobject3 glib ]; + propagatedBuildInputs = [ gtk3 ]; + + pythonImportsCheck = [ + "gtkme" + ]; + + meta = with lib; { + description = "Manages an Application with Gtk windows, forms, lists and other complex items easily"; + homepage = "https://gitlab.com/doctormo/gtkme"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ + revol-xut + ]; + }; +} diff --git a/pkgs/development/python2-modules/pygtk/default.nix b/pkgs/development/python2-modules/pygtk/default.nix index 938b55630c06..465d711ec6ff 100644 --- a/pkgs/development/python2-modules/pygtk/default.nix +++ b/pkgs/development/python2-modules/pygtk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, python, pkg-config, gtk2, pygobject2, pycairo, pango -, buildPythonPackage, libglade ? null, isPy3k }: +, buildPythonPackage, isPy3k }: buildPythonPackage rec { pname = "pygtk"; @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango - ] ++ lib.optional (libglade != null) libglade; + ]; propagatedBuildInputs = [ gtk2 pygobject2 pycairo ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { installPhase = "installPhase"; - checkPhase = lib.optionalString (libglade == null) + checkPhase = '' sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \ tests/common.py diff --git a/pkgs/development/python2-modules/pyparsing/default.nix b/pkgs/development/python2-modules/pyparsing/default.nix new file mode 100644 index 000000000000..d51032a154af --- /dev/null +++ b/pkgs/development/python2-modules/pyparsing/default.nix @@ -0,0 +1,45 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib + +# since this is a dependency of pytest, we need to avoid +# circular dependencies +, jinja2 +, railroad-diagrams +}: + +let + pyparsing = buildPythonPackage rec { + pname = "pyparsing"; + version = "2.4.7"; + + src = fetchFromGitHub { + owner = "pyparsing"; + repo = pname; + rev = "pyparsing_${version}"; + sha256 = "14pfy80q2flgzjcx8jkracvnxxnr59kjzp3kdm5nh232gk1v6g6h"; + }; + + # circular dependencies if enabled by default + doCheck = false; + checkInputs = [ + jinja2 + railroad-diagrams + ]; + + checkPhase = '' + python -m unittest + ''; + + passthru.tests = { + check = pyparsing.overridePythonAttrs (_: { doCheck = true; }); + }; + + meta = with lib; { + homepage = "https://github.com/pyparsing/pyparsing"; + description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions"; + license = licenses.mit; + }; + }; +in + pyparsing diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index aa9906c77ecd..7aa5b1602c38 100644 --- a/pkgs/development/quickemu/default.nix +++ b/pkgs/development/quickemu/default.nix @@ -43,17 +43,16 @@ in stdenv.mkDerivation rec { pname = "quickemu"; - version = "3.11"; + version = "3.14"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = version; - sha256 = "1xwf9vwbr57wmyxfcqzl1jnmfx3ffh7sfqf0zcdq41wqkm8s106n"; + sha256="sha256-7zaXazGzb36Nwk/meJ3lGD+l+fylWZYnhttDL1CXN9s="; }; patches = [ - ./efi_vars_ensure_writable.patch ./input_overrides.patch ]; diff --git a/pkgs/development/quickemu/efi_vars_ensure_writable.patch b/pkgs/development/quickemu/efi_vars_ensure_writable.patch deleted file mode 100644 index e146d0ba7682..000000000000 --- a/pkgs/development/quickemu/efi_vars_ensure_writable.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/quickemu b/quickemu -index a9a60a5..1a932ac 100755 ---- a/quickemu -+++ b/quickemu -@@ -197,7 +197,7 @@ function efi_vars() { - - if [ ! -e "${VARS_OUT}" ]; then - if [ -e "${VARS_IN}" ]; then -- cp "${VARS_IN}" "${VARS_OUT}" -+ cp "${VARS_IN}" "${VARS_OUT}" && chmod +w "${VARS_OUT}" - else - echo "ERROR! ${VARS_IN} was not found. Please install edk2." - exit 1 diff --git a/pkgs/development/quickemu/input_overrides.patch b/pkgs/development/quickemu/input_overrides.patch index 228624edcf1b..42e4d2e18294 100644 --- a/pkgs/development/quickemu/input_overrides.patch +++ b/pkgs/development/quickemu/input_overrides.patch @@ -1,20 +1,29 @@ diff --git a/quickemu b/quickemu -index 1a932ac..ab2f752 100755 +index 24e1007..39cd5e4 100755 --- a/quickemu +++ b/quickemu +@@ -196,7 +196,7 @@ function efi_vars() { + + if [ ! -e "${VARS_OUT}" ]; then + if [ -e "${VARS_IN}" ]; then +- cp "${VARS_IN}" "${VARS_OUT}" ++ cp "${VARS_IN}" "${VARS_OUT}" && chmod +w "${VARS_OUT}" + else + echo "ERROR! ${VARS_IN} was not found. Please install edk2." + exit 1 @@ -383,7 +383,10 @@ function vm_boot() { # https://bugzilla.redhat.com/show_bug.cgi?id=1929357#c5 case ${secureboot} in on) -- if [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then +- if [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then + if [[ ${ENV_EFI_CODE_SECURE} && ${ENV_EFI_CODE_SECURE-x} ]] && [[ ${ENV_EFI_VARS_SECURE} && ${ENV_EFI_VARS_SECURE-x} ]]; then -+ EFI_CODE="${ENV_EFI_CODE_SECURE}" -+ efi_vars "${ENV_EFI_VARS_SECURE}" "${EFI_VARS}" ++ EFI_CODE="${ENV_EFI_CODE_SECURE}" ++ efi_vars "${ENV_EFI_VARS_SECURE}" "${EFI_VARS}" + elif [ -e "/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" ]; then EFI_CODE="/usr/share/OVMF/OVMF_CODE_4M.secboot.fd" efi_vars "/usr/share/OVMF/OVMF_VARS_4M.fd" "${EFI_VARS}" elif [ -e "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd" ]; then -@@ -402,7 +405,10 @@ function vm_boot() { +@@ -408,7 +411,10 @@ function vm_boot() { fi ;; *) diff --git a/pkgs/development/r-modules/bioc-annotation-packages.nix b/pkgs/development/r-modules/bioc-annotation-packages.nix index d3aef448dc9c..e8da5771d4ea 100644 --- a/pkgs/development/r-modules/bioc-annotation-packages.nix +++ b/pkgs/development/r-modules/bioc-annotation-packages.nix @@ -330,7 +330,7 @@ in with self; { excluderanges = derive2 { name="excluderanges"; version="0.99.6"; sha256="1ryp2ghbx1b1268fpgza5rn6brhalff9hsr6fxpr5x5mc35hkd68"; depends=[]; }; 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.14.0"; sha256="0jk5k5zpr4r9yn2l7vpb01xdmhi0pm3jg333jr7rv0c6fzjq5279"; depends=[AnnotationDbi]; }; - geneplast_data = derive2 { name="geneplast.data"; version="0.99.4"; sha256="070g5a1xh1m3yar6dk3p1m86hpw8ll4xjir2n6sh2rfjw5kijmld"; depends=[]; }; + geneplast_data = derive2 { name="geneplast.data"; version="0.99.5"; sha256="0bwhc20jkjs3n1n4xv7xmkgjzf6ghssvbsmx3dm347smk54wgjsw"; depends=[]; }; 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/pkgs/development/r-modules/bioc-experiment-packages.nix b/pkgs/development/r-modules/bioc-experiment-packages.nix index 57f5f22ba2a1..5974766e04bd 100644 --- a/pkgs/development/r-modules/bioc-experiment-packages.nix +++ b/pkgs/development/r-modules/bioc-experiment-packages.nix @@ -107,7 +107,7 @@ in with self; { KOdata = derive2 { name="KOdata"; version="1.20.0"; sha256="11ar6bp6j615hcqa8w0dha1d57r8kxwjr0aikmxl3j058yrv2p6m"; depends=[]; }; LRcellTypeMarkers = derive2 { name="LRcellTypeMarkers"; version="1.2.0"; sha256="0c7nwyskm5kx2z56vr8wb1c8ll8z3z7ywi52s4d1nmhmj9dyzmb3"; depends=[ExperimentHub]; }; LiebermanAidenHiC2009 = derive2 { name="LiebermanAidenHiC2009"; version="0.32.0"; sha256="1kgydp7x3kdhh5kzwrh9fjc9zfw1jx4bbkgxc46vh1dwz8kbkbch"; depends=[IRanges KernSmooth]; }; - ListerEtAlBSseq = derive2 { name="ListerEtAlBSseq"; version="1.26.0"; sha256="0ag820shlpknc2zbqiwafisbg4hr7paqv3g26ghrvyvbkmqmj1w8"; depends=[methylPipe]; }; + ListerEtAlBSseq = derive2 { name="ListerEtAlBSseq"; version="1.26.0"; sha256="0ag820shlpknc2zbqiwafisbg4hr7paqv3g26ghrvyvbkmqmj1w8"; depends=[]; }; LungCancerACvsSCCGEO = derive2 { name="LungCancerACvsSCCGEO"; version="1.30.0"; sha256="0sfadyna4njvz1dn0z3vhvyykl864534qr200swj4cmsny52bsdh"; depends=[]; }; LungCancerLines = derive2 { name="LungCancerLines"; version="0.32.0"; sha256="1clsdv7ryk46i7640sj77xnwqqw32aa9gy9g8hvhg4sliiqmgvjw"; depends=[Rsamtools]; }; M3DExampleData = derive2 { name="M3DExampleData"; version="1.20.0"; sha256="0qnbd53lhfq78k2v9qpkwpcf75mg9asf6765pqq2f0ivi2a4jrjs"; depends=[]; }; @@ -314,7 +314,7 @@ in with self; { humanStemCell = derive2 { name="humanStemCell"; version="0.34.0"; sha256="0lvy1n389wsc85yi7kmwq2qda0nl3hpl5bqak01fr3d6040v7g27"; depends=[Biobase hgu133plus2_db]; }; imcdatasets = derive2 { name="imcdatasets"; version="1.2.0"; sha256="1qgg2cnalx9kiv73g0n9axc6y5b25kwxbmn7cg9syvlrfn0iynlz"; depends=[cytomapper DelayedArray ExperimentHub HDF5Array S4Vectors SingleCellExperiment]; }; kidpack = derive2 { name="kidpack"; version="1.36.0"; sha256="094b1jhyal4h3k4ilmayz77mbjqkmn7b5bsw799jmsqyg93f4r7g"; depends=[Biobase]; }; - leeBamViews = derive2 { name="leeBamViews"; version="1.30.0"; sha256="1f0lc8k14canmp124qqys6pwp9v88z7cwr7kgxi5mrzk92r2jiz6"; depends=[Biobase BSgenome GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; }; + leeBamViews = derive2 { name="leeBamViews"; version="1.30.1"; sha256="1pa1i7mb7ixs7zrj9h93s4kgbc1dq3nx40knsm5i7a43jxsl6ggw"; depends=[Biobase BSgenome GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; }; leukemiasEset = derive2 { name="leukemiasEset"; version="1.30.0"; sha256="0hnqi0qm7caipjkp3asabby5jrjl57vvshnwiwqnjsf87xx19cjx"; depends=[Biobase]; }; lumiBarnes = derive2 { name="lumiBarnes"; version="1.34.0"; sha256="103iz7vjhh1w8zyb4n3kf1w9qfa7li9p2jql48cjsadvil4bfl09"; depends=[Biobase lumi]; }; lungExpression = derive2 { name="lungExpression"; version="0.32.1"; sha256="00dm271n1lnj5myscmkm9g4a361lfsfg8cl7ii5z8br9v4wyw2y8"; depends=[Biobase]; }; @@ -374,7 +374,7 @@ in with self; { restfulSEData = derive2 { name="restfulSEData"; version="1.16.0"; sha256="1bx41xwxnvx6712wsy5qljji2w3wiybvddkxic8xc9l2hrcmfhrz"; depends=[ExperimentHub SummarizedExperiment]; }; rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.32.0"; sha256="0k2klx4rpyzcq346c3ak2lf6w47zkhnhiqn4rs70xnxnsbjn2ca5"; depends=[]; }; sampleClassifierData = derive2 { name="sampleClassifierData"; version="1.18.0"; sha256="12k7xhd2axmcpmv970xbhx5r9b0jdmkxxqm01a0v2jfx3imzz9jb"; depends=[SummarizedExperiment]; }; - scATAC_Explorer = derive2 { name="scATAC.Explorer"; version="1.0.0"; sha256="16qscpjbbphrd1qfp85r9bw8v98866kzsf20fk270m2aq378y4i8"; depends=[BiocFileCache data_table Matrix S4Vectors SingleCellExperiment]; }; + scATAC_Explorer = derive2 { name="scATAC.Explorer"; version="1.0.1"; sha256="0iz0i58afr58y4mc6iyajzdblpd1s2mng693nhb49rka4bf1fx0j"; depends=[BiocFileCache data_table Matrix S4Vectors SingleCellExperiment]; }; scRNAseq = derive2 { name="scRNAseq"; version="2.8.0"; sha256="19caas79yarf3vww60bnn92v9ns82pawqbbw78kmy0x94hvsfdbk"; depends=[AnnotationDbi AnnotationHub BiocGenerics ensembldb ExperimentHub GenomicFeatures GenomicRanges S4Vectors SingleCellExperiment SummarizedExperiment]; }; scTHI_data = derive2 { name="scTHI.data"; version="1.6.0"; sha256="0n794kicpylibqgi4z9mwdgmk5ni3yhqzaqcdr2mij844s079fx4"; depends=[]; }; scanMiRData = derive2 { name="scanMiRData"; version="1.0.0"; sha256="0z6nl4w4r8m1mara0zyzlg7xx6y9fa8psvln0695wvpxzmps4y9h"; depends=[scanMiR]; }; @@ -389,7 +389,7 @@ in with self; { signatureSearchData = derive2 { name="signatureSearchData"; version="1.8.4"; sha256="0k5j35jsdfk3qza3kzp2ih9irz4d4xbwr64wd4ibmzydkjrjdrcz"; depends=[affy Biobase dplyr ExperimentHub limma magrittr R_utils rhdf5]; }; simpIntLists = derive2 { name="simpIntLists"; version="1.30.0"; sha256="0q2lqfhsjncdj42hblrh389j2m47x26nn58s31s1448pddhrp7z1"; depends=[]; }; spatialDmelxsim = derive2 { name="spatialDmelxsim"; version="1.0.0"; sha256="1h5crcjrzapj5j31285ana48g3b2iscxwlzxxdx9i03jsl39dlp8"; depends=[ExperimentHub SummarizedExperiment]; }; - spatialLIBD = derive2 { name="spatialLIBD"; version="1.6.4"; sha256="0lpp5w04szgqs0nvlhc6a7hsybsvpy9vdx4dqs9ncrb4qg6fxchp"; depends=[AnnotationHub benchmarkme BiocFileCache BiocGenerics cowplot DT ExperimentHub fields GenomicRanges ggplot2 golem IRanges jsonlite magick Matrix plotly png Polychrome RColorBrewer rtracklayer S4Vectors scater sessioninfo shiny shinyWidgets SingleCellExperiment SpatialExperiment SummarizedExperiment tibble viridisLite]; }; + spatialLIBD = derive2 { name="spatialLIBD"; version="1.6.5"; sha256="1m25wk2np5yj0wygw3gg3kq8ykzx14jqj73aqs0yhsr04pp7qm8x"; depends=[AnnotationHub benchmarkme BiocFileCache BiocGenerics cowplot DT ExperimentHub fields GenomicRanges ggplot2 golem IRanges jsonlite magick Matrix plotly png Polychrome RColorBrewer rtracklayer S4Vectors scater sessioninfo shiny shinyWidgets SingleCellExperiment SpatialExperiment SummarizedExperiment tibble viridisLite]; }; spqnData = derive2 { name="spqnData"; version="1.6.0"; sha256="0dwmgwz88g8fzpa2nl2zs4y32wrlf4ca142d8siak14wl089nm4y"; depends=[SummarizedExperiment]; }; stemHypoxia = derive2 { name="stemHypoxia"; version="1.30.0"; sha256="05jly60gg5xr9511jlymzbpjysapfz2qq81rxhdz7cjbjkkgvykr"; depends=[]; }; stjudem = derive2 { name="stjudem"; version="1.34.0"; sha256="005wy7b8naaph9krsdw234sk8fprccclnj7y4rfrs2f3lbrw4b2g"; depends=[]; }; diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix index ca1f5fe4d984..965b3d504710 100644 --- a/pkgs/development/r-modules/bioc-packages.nix +++ b/pkgs/development/r-modules/bioc-packages.nix @@ -42,7 +42,7 @@ in with self; { AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.32.0"; sha256="1s6arjd0nxgxyqy7vhqcb78k0ss7vwrhv41pm346hs1nyr5dkzaq"; 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.8.0"; sha256="0ya3dqvdf8iyd5bscc9lc476vkc7kamiqgjvxhxl4ay5j4vn02nr"; depends=[BiocParallel data_table dplyr expm ggplot2 gtools igraph optimx plotly stringr]; }; AlpsNMR = derive2 { name="AlpsNMR"; version="3.4.0"; sha256="0h8y9hi97zbv3qzjskxh81qjarmwx2w790kpspljgxa214f58fzv"; depends=[assertthat baseline BiocParallel dplyr fs furrr future GGally ggplot2 ggrepel glue htmltools magrittr matrixStats mixOmics pcaPP plyr purrr readxl reshape2 rlang rmarkdown S4Vectors signal speaq stringr SummarizedExperiment tibble tidyr tidyselect vctrs writexl zip]; }; - AnVIL = derive2 { name="AnVIL"; version="1.6.2"; sha256="0qiadpn9pwhm7dqmsycpiaqvwf5il4gy2058hl5mnm954bj9hna4"; depends=[BiocManager dplyr futile_logger httr jsonlite rapiclient rlang tibble tidyr tidyselect]; }; + AnVIL = derive2 { name="AnVIL"; version="1.6.5"; sha256="0ipf3916xwmg22kmc0qk7x8sw3bb6579cffmdwsizr1mw84cdjwd"; depends=[BiocManager dplyr futile_logger httr jsonlite rapiclient rlang tibble tidyr tidyselect]; }; AnVILBilling = derive2 { name="AnVILBilling"; version="1.4.0"; sha256="0pg5r6qn18i91z2ixapdkranaacv9z8ljmdb33vdn2dqwv2w85b1"; depends=[bigrquery DBI dplyr DT ggplot2 lubridate magrittr plotly shiny shinytoastr]; }; AnVILPublish = derive2 { name="AnVILPublish"; version="1.4.1"; sha256="0jvh22kz9mg4r49mbzvbvzbn58lzj5mvk7qb4pizn4sd8xsbvmyq"; depends=[AnVIL httr jsonlite readr rmarkdown whisker yaml]; }; Anaquin = derive2 { name="Anaquin"; version="2.18.0"; sha256="0b9clpqy2jfhign30nab1369xswrkmqm6dx14mf6wjrvcl9xpm2s"; depends=[DESeq2 ggplot2 knitr locfit plyr qvalue ROCR]; }; @@ -50,12 +50,11 @@ in with self; { AnnotationDbi = derive2 { name="AnnotationDbi"; version="1.56.2"; sha256="01zwq14msbbwzxv8rgpmyr74ymvhq0vnmxkxxwd886iac5vjlgi8"; depends=[Biobase BiocGenerics DBI IRanges KEGGREST RSQLite S4Vectors]; }; AnnotationFilter = derive2 { name="AnnotationFilter"; version="1.18.0"; sha256="15fp1228yb06jm5cblvhw3qv9mlpbjfggaz2nvi3p46mby1vs64w"; depends=[GenomicRanges lazyeval]; }; AnnotationForge = derive2 { name="AnnotationForge"; version="1.36.0"; sha256="02wvni5q560idi6677g5f4md73z4qzjl5yycxv5dbvgbl2picisz"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl RSQLite S4Vectors XML]; }; - AnnotationHub = derive2 { name="AnnotationHub"; version="3.2.0"; sha256="0ks8yzvvs2r66pb9687mkskf0n3wgvp7h92k83b0a1q32sca5wng"; depends=[AnnotationDbi BiocFileCache BiocGenerics BiocManager BiocVersion curl dplyr httr interactiveDisplayBase rappdirs RSQLite S4Vectors yaml]; }; - AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.24.1"; sha256="008jkpqzk1dxrkmbpzyjnqyrdw7rb4ci88fmnn27arx6psbl096g"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocCheck BiocGenerics BiocManager biocViews Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges jsonlite OrganismDbi RCurl Rsamtools RSQLite rtracklayer S4Vectors XML]; }; + AnnotationHub = derive2 { name="AnnotationHub"; version="3.2.2"; sha256="08dk4h07gpi3rk9s80wrbx2ww2chj688qzbwlx8n4dz788lqbfz8"; depends=[AnnotationDbi BiocFileCache BiocGenerics BiocManager BiocVersion curl dplyr httr interactiveDisplayBase rappdirs RSQLite S4Vectors yaml]; }; + AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.24.2"; sha256="00n195xbja01r64mjsjvk3xpwx9mwj5x8n4l810jspf4cdjv5cbl"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocCheck BiocGenerics BiocManager biocViews Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges jsonlite OrganismDbi RCurl Rsamtools RSQLite rtracklayer S4Vectors XML]; }; ArrayExpress = derive2 { name="ArrayExpress"; version="1.54.0"; sha256="1rfvycrjlw0x1sqjrmiyf8i7yjiwjqf8x83i7pfg78yg9k5sh9vi"; depends=[Biobase limma oligo XML]; }; ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.44.0"; sha256="1mjnddy05y06bn25xcjdx8kz538z3k4gvyqrb1lg4z8593xaw40i"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer Rhtslib rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; }; AssessORF = derive2 { name="AssessORF"; version="1.12.0"; sha256="0rn2ijnpa8a6w2zv3cvm1s5bhcvzmb4xk18d96wjc60gxk51i5wy"; depends=[Biostrings DECIPHER GenomicRanges IRanges]; }; - Autotuner = derive2 { name="Autotuner"; version="1.7.0"; sha256="0k07gs6bnxs0894iqi1lhk96mifjcdf68bv4q9fjv50nzqpzqd8l"; depends=[assertthat Biobase cluster entropy MSnbase mzR RColorBrewer scales]; }; BAC = derive2 { name="BAC"; version="1.54.0"; sha256="1xplpx3r34l3h43a4zgv9s5z4sw61vlq828gqwc7f0i73a2jbck3"; depends=[]; }; BADER = derive2 { name="BADER"; version="1.32.0"; sha256="1ngi4nrw0gfz7k4x1c5harl6a9bxfv8m7f1smxs5awnwr0jnv9pa"; depends=[]; }; BAGS = derive2 { name="BAGS"; version="2.34.0"; sha256="0lkg4c4ay20bhas9lr6aifxhw0yhh999v6d1kbbplw4hhd1b93ha"; depends=[Biobase breastCancerVDX]; }; @@ -92,7 +91,7 @@ in with self; { BgeeDB = derive2 { name="BgeeDB"; version="2.20.0"; sha256="0pjymal01sjl5dc37g66wykgxnksarlbvwnbvhg7w0i7y92zavqk"; depends=[Biobase curl data_table digest dplyr graph R_utils RCurl RSQLite tidyr topGO]; }; BiFET = derive2 { name="BiFET"; version="1.14.0"; sha256="0vidypvphnj76g4ra5ijrgqx2dnzw0fmvdvz35gsqswrr3k20jkk"; depends=[GenomicRanges poibin]; }; BiGGR = derive2 { name="BiGGR"; version="1.30.0"; sha256="1g01666wwznk148776s4vr1hfi3dfl448dhgk4d1qy2wv6sxh9kr"; depends=[hyperdraw hypergraph LIM limSolve rsbml stringr]; }; - BiRewire = derive2 { name="BiRewire"; version="3.26.0"; sha256="0ki4rcwjgbixzy5q9s30ajx5zhpl18q50znrb60fchvl4hj9h93w"; depends=[igraph Matrix slam tsne]; }; + BiRewire = derive2 { name="BiRewire"; version="3.26.2"; sha256="114qljg6yqx55yi0w5nmhdz9260dzkj73bjgqh8w9kpfvcb0439l"; depends=[igraph Matrix slam tsne]; }; BiSeq = derive2 { name="BiSeq"; version="1.34.0"; sha256="05namdzj196rzjg3wqvamj3xpn039dbfhfpmc6p8ifxn9c9dnd3c"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; }; BicARE = derive2 { name="BicARE"; version="1.52.0"; sha256="1g8vrsc05cysb36gsw8sfmr6dgbh4aji37vcq9qwkmkv3jgvnlf6"; depends=[Biobase GSEABase multtest]; }; BindingSiteFinder = derive2 { name="BindingSiteFinder"; version="1.0.0"; sha256="0mvl2mh2px315ilfmf9ax5qjz3282l56qm1a0v142bb7cxld13v7"; depends=[GenomicRanges ggforce ggplot2 matrixStats rtracklayer S4Vectors tidyr]; }; @@ -102,13 +101,13 @@ in with self; { BioNERO = derive2 { name="BioNERO"; version="1.2.0"; sha256="0ddrzv1g46hvm52dzrcj5nbyyw9a16cqk8zg20wnkrh3qw1h4d9p"; depends=[BiocParallel ComplexHeatmap DESeq2 dynamicTreeCut GENIE3 ggnetwork ggnewscale ggplot2 ggpubr igraph intergraph matrixStats minet NetRep networkD3 RColorBrewer reshape2 SummarizedExperiment sva WGCNA]; }; BioNet = derive2 { name="BioNet"; version="1.54.0"; sha256="05rj14jn4gn0hfn57amf19b8fqwkd3y2ji3mg7m1yg1w7n4qxqsg"; depends=[AnnotationDbi Biobase graph igraph RBGL]; }; BioNetStat = derive2 { name="BioNetStat"; version="1.14.0"; sha256="13br8x4809hrr4ibz6iy5qjza9j6cazmkpvfikvw6bs588csxwf8"; depends=[BiocParallel DT ggplot2 Hmisc igraph knitr markdown pathview pheatmap plyr psych RColorBrewer RJSONIO rmarkdown shiny shinyBS whisker yaml]; }; - BioPlex = derive2 { name="BioPlex"; version="1.0.1"; sha256="0fzvr72rjhrq9aldzb2hs61x6f1hbmv1a6gcblmzj9f11hny8va1"; depends=[BiocFileCache GEOquery graph SummarizedExperiment]; }; + BioPlex = derive2 { name="BioPlex"; version="1.0.2"; sha256="0n9hz10nak8vws90g0xl21xcrj2gy769ra6xwjx6nj19giyk4749"; depends=[BiocFileCache GEOquery graph SummarizedExperiment]; }; BioQC = derive2 { name="BioQC"; version="1.22.0"; sha256="190336qk0plg79gzvfn6wfplsi8nq0nj8508g7m0w3z6bdgwy407"; depends=[Biobase edgeR Rcpp]; }; BioTIP = derive2 { name="BioTIP"; version="1.8.0"; sha256="0xmy5c4i9gf6d04gara6lbnnldqmzjaascb2pd2ih60jw2mvl4ys"; depends=[cluster GenomicRanges Hmisc igraph MASS psych stringr]; }; Biobase = derive2 { name="Biobase"; version="2.54.0"; sha256="0kar2kgaayp5l7xv9zcxj61l01m8jlwnppql6qf01wsz36dacgww"; depends=[BiocGenerics]; }; BiocCheck = derive2 { name="BiocCheck"; version="1.30.0"; sha256="0w9ddicyp9i8rxf92n9pghd9s6bb8jdjikaylrmkydhb7jbhan0y"; depends=[BiocManager biocViews codetools graph httr knitr optparse stringdist]; }; BiocDockerManager = derive2 { name="BiocDockerManager"; version="1.6.0"; sha256="1kpdmpcngnl667bfffp9bkf8c31ipmhsncq0h9bf3a4k8b83pi0w"; depends=[dplyr httr memoise readr whisker]; }; - BiocFileCache = derive2 { name="BiocFileCache"; version="2.2.0"; sha256="11qayqmgv274hc4h1v222sma07wkxjm8002fl6w3yvi225zq1qc1"; depends=[curl DBI dbplyr dplyr filelock httr rappdirs RSQLite]; }; + BiocFileCache = derive2 { name="BiocFileCache"; version="2.2.1"; sha256="0gaj0z6dk2p2vhvqz685xwd5q2mkvpimh2493p3w04s2rlsvi3jb"; depends=[curl DBI dbplyr dplyr filelock httr rappdirs RSQLite]; }; BiocGenerics = derive2 { name="BiocGenerics"; version="0.40.0"; sha256="0nr5x4r8f2krnfrxm7wrzgzr7nbljypi985cbwx5hxhn95zmfifh"; depends=[]; }; BiocIO = derive2 { name="BiocIO"; version="1.4.0"; sha256="1qg6v961sbj7qwyjx4z720f6h0kq693p7gc8q99my7gqkbbcxrfr"; depends=[BiocGenerics S4Vectors]; }; BiocNeighbors = derive2 { name="BiocNeighbors"; version="1.12.0"; sha256="04in8l6j7frgm0a5dzphazfhn9cm8w775z5yir712jxa37mh1agr"; depends=[BiocParallel Matrix Rcpp RcppHNSW S4Vectors]; }; @@ -137,7 +136,7 @@ in with self; { CAGEr = derive2 { name="CAGEr"; version="2.0.2"; sha256="0s959bqgmafc2hwh42fwildq8h8wxvdiciimgpr71ka2p1vg9sk7"; depends=[BiocGenerics BiocParallel BSgenome data_table DelayedArray DelayedMatrixStats formula_tools GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gtools IRanges KernSmooth memoise MultiAssayExperiment plyr reshape2 Rsamtools rtracklayer S4Vectors som stringdist stringi SummarizedExperiment vegan VGAM]; }; CAMERA = derive2 { name="CAMERA"; version="1.50.0"; sha256="1mgdmzlbj8yhk6jmnqaw4xmss77v7csdajd240kiswvm1f317z3h"; depends=[Biobase graph Hmisc igraph RBGL xcms]; }; CARNIVAL = derive2 { name="CARNIVAL"; version="2.4.0"; sha256="10wbdjripgndfaqx2aysmqhc9v8i94db8bf0bb89csmvmnia68c6"; depends=[dplyr igraph lpSolve readr rjson rmarkdown stringr]; }; - CATALYST = derive2 { name="CATALYST"; version="1.18.0"; sha256="15lah45lf16zh1ankbpjvz8zp38lldvq074nmvb99rhhqys2gbgi"; depends=[circlize ComplexHeatmap ConsensusClusterPlus cowplot data_table dplyr drc flowCore FlowSOM ggplot2 ggrepel ggridges gridExtra magrittr Matrix matrixStats nnls purrr RColorBrewer reshape2 Rtsne S4Vectors scales scater SingleCellExperiment SummarizedExperiment]; }; + CATALYST = derive2 { name="CATALYST"; version="1.18.1"; sha256="0dvcs7nz1yawcrsf9lqiwdcrvjmbs8ajrmvj0ji4qq2a86n3dkg0"; depends=[circlize ComplexHeatmap ConsensusClusterPlus cowplot data_table dplyr drc flowCore FlowSOM ggplot2 ggrepel ggridges gridExtra magrittr Matrix matrixStats nnls purrr RColorBrewer reshape2 Rtsne S4Vectors scales scater SingleCellExperiment SummarizedExperiment]; }; CAnD = derive2 { name="CAnD"; version="1.26.0"; sha256="19c47m0i8sfp2frw6mnzr1bz3n196kgd53bisil6nix1pqsgjqba"; depends=[ggplot2 reshape]; }; CCPROMISE = derive2 { name="CCPROMISE"; version="1.20.0"; sha256="0wkwgm85kkf7p3vwjvsaq6p7cb2qfzjfqcaba2wgkh8lzjjrglw9"; depends=[Biobase CCP GSEABase PROMISE]; }; CEMiTool = derive2 { name="CEMiTool"; version="1.18.1"; sha256="0w2y7wkz9r75jblh5mvx096lxlsbx8hn0jp85sfqhnq6ngvil99a"; depends=[clusterProfiler data_table dplyr DT fastcluster fgsea ggdendro ggplot2 ggpmisc ggrepel ggthemes gridExtra gtable htmltools igraph intergraph knitr matrixStats network pracma rmarkdown scales sna stringr WGCNA]; }; @@ -147,7 +146,6 @@ in with self; { CGHcall = derive2 { name="CGHcall"; version="2.56.0"; sha256="1r4y8zakgmdbnpwgp14kwh4iwqgqcmjq2yg4nc7j37p09bw1c8zr"; depends=[Biobase CGHbase DNAcopy impute snowfall]; }; CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.48.0"; sha256="1zz4iaxyf5b03xalq58idnkrwcpsvh8zlz6hlxz487caw7c8xx6p"; depends=[Biobase CGHbase CGHcall]; }; CGHregions = derive2 { name="CGHregions"; version="1.52.0"; sha256="1g337b6fjmbbkpn9pw20z6bvacrlfh582n6lss3qw0s6x6w5cygs"; depends=[Biobase CGHbase]; }; - CHETAH = derive2 { name="CHETAH"; version="1.9.0"; sha256="1nfz8zpkrghfh942cr8xwvrj0d47h1nbf3nv534mp7rii38v07j3"; depends=[bioDist corrplot cowplot dendextend ggplot2 gplots pheatmap plotly reshape2 S4Vectors shiny SingleCellExperiment SummarizedExperiment]; }; CHRONOS = derive2 { name="CHRONOS"; version="1.22.0"; sha256="18fdvbdbl0rms1fs27yi6lvf3xnn3pjfm1qngaaz4c06v207mg9w"; depends=[biomaRt circlize doParallel foreach graph igraph openxlsx RBGL RCurl rJava XML]; }; CIMICE = derive2 { name="CIMICE"; version="1.2.0"; sha256="0d2sglrp8ansh8nibbqyg3pvhaaw33q5mzci382pwky05mpy9sjk"; depends=[assertthat dplyr ggcorrplot ggplot2 ggraph glue igraph maftools Matrix networkD3 purrr relations tidyr visNetwork]; }; CINdex = derive2 { name="CINdex"; version="1.22.0"; sha256="0a73rdhmsprbbq69yvnnhgp86wic255yxrj82k1i1k62f3bsi74c"; depends=[bitops dplyr GenomeInfoDb GenomicRanges gplots gridExtra IRanges png S4Vectors som stringr]; }; @@ -160,7 +158,7 @@ in with self; { CNORode = derive2 { name="CNORode"; version="1.36.0"; sha256="11l8lw4i8n71ki2fl218wpf7imsxpamxx9abj2axwi467cziq55x"; depends=[CellNOptR genalg]; }; CNTools = derive2 { name="CNTools"; version="1.50.0"; sha256="198mvxz8zm32mvnq825iivzc8z1ff187g40kb867ck4svn1mysf6"; depends=[genefilter]; }; CNVPanelizer = derive2 { name="CNVPanelizer"; version="1.26.0"; sha256="0v4abknw96zrvir2g676kh81l5jhbxwb10xymzcn1bk3l9vknnpm"; depends=[BiocGenerics exomeCopy foreach GenomeInfoDb GenomicRanges ggplot2 gplots IRanges NOISeq openxlsx plyr reshape2 Rsamtools S4Vectors shiny shinyFiles shinyjs stringr testthat]; }; - CNVRanger = derive2 { name="CNVRanger"; version="1.10.0"; sha256="0pqzs7268c17nh2i6hmg630wfpks2ixyp122iakyl0hxvxd0v2w7"; depends=[BiocGenerics BiocParallel data_table edgeR GDSArray gdsfmt GenomeInfoDb GenomicRanges IRanges lattice limma plyr qqman RaggedExperiment rappdirs reshape2 S4Vectors SNPRelate SummarizedExperiment]; }; + CNVRanger = derive2 { name="CNVRanger"; version="1.10.3"; sha256="0z7gps8nv7diphgk3nbc2gcdhjd7mbqcmjhassa9vg3nh9848m0a"; depends=[BiocGenerics BiocParallel data_table edgeR GDSArray gdsfmt GenomeInfoDb GenomicRanges IRanges lattice limma plyr qqman RaggedExperiment rappdirs reshape2 S4Vectors SNPRelate SummarizedExperiment]; }; CNVfilteR = derive2 { name="CNVfilteR"; version="1.8.0"; sha256="0ap1k0aikfynwbynwd19l2nkj48d9h86smm7vrrfr1chrmglv84k"; depends=[assertthat Biostrings CopyNumberPlots GenomeInfoDb GenomicRanges IRanges karyoploteR pracma regioneR Rsamtools SummarizedExperiment VariantAnnotation]; }; CNVgears = derive2 { name="CNVgears"; version="1.2.0"; sha256="1vswa2vyxknykims3cgwhbx9v0cw5978639bpgf7d7mwk63h6k6c"; depends=[data_table ggplot2]; }; CNViz = derive2 { name="CNViz"; version="1.2.0"; sha256="08273c1jwrxcg4xyh6z7aqsy0sgk4ds8jzg8d8dxwscpfjjdbdcp"; depends=[CopyNumberPlots dplyr DT GenomicRanges karyoploteR magrittr plotly scales shiny]; }; @@ -193,7 +191,7 @@ in with self; { CellScore = derive2 { name="CellScore"; version="1.14.0"; sha256="17zs6y08z1l4s51ishb5cp2k70yc1cinh211r76mrdlpdp9rxx5c"; depends=[Biobase gplots lsa RColorBrewer squash]; }; CellTrails = derive2 { name="CellTrails"; version="1.12.0"; sha256="0rwirbvrfn03xrc0jjiw24dg9c49wznckhjm9kibd10n135x6l4g"; depends=[Biobase BiocGenerics cba dendextend dtw EnvStats ggplot2 ggrepel igraph maptree mgcv reshape2 Rtsne SingleCellExperiment SummarizedExperiment]; }; CellaRepertorium = derive2 { name="CellaRepertorium"; version="1.4.0"; sha256="1gqr12dbm1g2gz4ixx3r8f9as7m5nd0vcj0k3hsk9njs938lfzk4"; depends=[BiocGenerics Biostrings dplyr forcats Matrix progress purrr Rcpp reshape2 rlang S4Vectors stringr tibble tidyr]; }; - CelliD = derive2 { name="CelliD"; version="1.2.0"; sha256="06jdqxa38pjvx0z1yqmhghn6x3dkq0zinc84kvxs9ls81hi6h20l"; depends=[BiocParallel data_table fastmatch fgsea ggplot2 glue irlba Matrix matrixStats pbapply Rcpp RcppArmadillo reticulate Rtsne scater Seurat SingleCellExperiment stringr SummarizedExperiment tictoc umap]; }; + CelliD = derive2 { name="CelliD"; version="1.2.1"; sha256="1q03kv0m8v7w2ycgln86xshr0c7v14hiw56szxljgby9p3bxz85g"; depends=[BiocParallel data_table fastmatch fgsea ggplot2 glue irlba Matrix matrixStats pbapply Rcpp RcppArmadillo reticulate Rtsne scater Seurat SingleCellExperiment stringr SummarizedExperiment tictoc umap]; }; Cepo = derive2 { name="Cepo"; version="1.0.0"; sha256="091hbppf6jmsw7bh3m1xasf9vwh4xf6m6sgqrqi8hvvp37vb7k67"; depends=[BiocParallel DelayedArray DelayedMatrixStats ggplot2 GSEABase HDF5Array patchwork reshape2 rlang S4Vectors SingleCellExperiment SummarizedExperiment]; }; CexoR = derive2 { name="CexoR"; version="1.32.0"; sha256="18x5qj2z4nxbgj0i7si0rk57hlqwxmmz97dvsfvbkw1akcw8psb9"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; }; ChAMP = derive2 { name="ChAMP"; version="2.24.0"; sha256="10wyfcc36qfcwpzgsj2vnmjy694igk81zd35aij51fs4s1mhmf2k"; 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]; }; @@ -203,7 +201,7 @@ in with self; { ChIPXpress = derive2 { name="ChIPXpress"; version="1.38.0"; sha256="1wypkh9pq3v9lwmhwdrnf6a2jm2i2nc7kv9nppcyknf9qhpkn97z"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; }; ChIPanalyser = derive2 { name="ChIPanalyser"; version="1.16.0"; sha256="1ibbfsl2gz5634rljy4bin9h9g5bxzig3z65bvayp4ldmfiz91dm"; depends=[BiocManager Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges RcppRoll ROCR rtracklayer S4Vectors]; }; ChIPexoQual = derive2 { name="ChIPexoQual"; version="1.18.0"; sha256="1hh3mhfcngyx7cpzns8mjqviy8vfzrvxpv6nyizflpfmsr39mxfk"; depends=[BiocParallel biovizBase broom data_table dplyr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 hexbin IRanges RColorBrewer rmarkdown Rsamtools S4Vectors scales viridis]; }; - ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.28.0"; sha256="05fbq8zvww1nlyykrri0hf4248i1i7w5cr453giagmjq7lgg4v3b"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings DBI dplyr ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 graph InteractionSet IRanges KEGGREST matrixStats multtest RBGL regioneR Rsamtools rtracklayer S4Vectors SummarizedExperiment VennDiagram]; }; + ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.28.1"; sha256="0v2qz3rp5lmj3s1ziahjqym6cjlh4wdvf050k1x6dx8404jhi8kw"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings DBI dplyr ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 graph InteractionSet IRanges KEGGREST matrixStats multtest RBGL regioneR Rsamtools rtracklayer S4Vectors SummarizedExperiment VennDiagram]; }; ChIPseeker = derive2 { name="ChIPseeker"; version="1.30.3"; sha256="1f9m1p1viiigkmv15r2mknjrfw047jw1fylpqz5ipigc3jrphj1g"; depends=[AnnotationDbi BiocGenerics boot dplyr enrichplot GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gtools IRanges magrittr plotrix RColorBrewer rtracklayer S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene]; }; ChIPseqR = derive2 { name="ChIPseqR"; version="1.48.0"; sha256="05hxxqmjxpry0j80kyz2400azni0dc64ps7cxfi11h243japhbsf"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; }; ChIPsim = derive2 { name="ChIPsim"; version="1.48.0"; sha256="1pdsfsk8c92pz22qz2x5rsmk7j9v3dw9c1p96il533ycjafq1xqd"; depends=[Biostrings IRanges ShortRead XVector]; }; @@ -230,7 +228,6 @@ in with self; { CopywriteR = derive2 { name="CopywriteR"; version="2.26.0"; sha256="0xm5gjzi4r1xzyn7r669blqxhyhmbk9rh9k2gn696j14hbhc1hcy"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; }; CoreGx = derive2 { name="CoreGx"; version="1.6.0"; sha256="12825lplihp10wvvg90gkk96vabvycfi32kpbs2garbzcjshqygh"; depends=[Biobase BiocGenerics BiocParallel BumpyMatrix checkmate crayon data_table glue lsa MatrixGenerics MultiAssayExperiment piano rlang S4Vectors SummarizedExperiment]; }; Cormotif = derive2 { name="Cormotif"; version="1.40.0"; sha256="1dzsnfgrgjgjk9a1jbsjfarcjvxnvswph495lcaiw8fh5mibf9qb"; depends=[affy limma]; }; - CountClust = derive2 { name="CountClust"; version="1.21.0"; sha256="17px9jkpjwz0j2f5h8xv52wh24ilqvlb6dvczjc36lb7mq4cw3sq"; depends=[cowplot flexmix ggplot2 gtools limma maptpx picante plyr reshape2 slam SQUAREM]; }; CoverageView = derive2 { name="CoverageView"; version="1.32.0"; sha256="0sb1h5qsk41c9xisq73agqh502wv6p2j1k45s32a4bkdynf696as"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; }; CrispRVariants = derive2 { name="CrispRVariants"; version="1.22.0"; sha256="0jvrsc0fz8li8v6xigvkq514x0pirnbrp7lgvjqxxj8i3l7y536i"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; }; CyTOFpower = derive2 { name="CyTOFpower"; version="1.0.0"; sha256="1h2dmnkjv62ws7ljixq1nj50hnqk3r70xhzkh159cjkirf9r4xwn"; depends=[CytoGLMM diffcyt dplyr DT ggplot2 magrittr rlang shiny shinyFeedback shinyjs shinyMatrix SummarizedExperiment tibble tidyr]; }; @@ -252,7 +249,7 @@ in with self; { DESeq2 = derive2 { name="DESeq2"; version="1.34.0"; sha256="0whk29zrmv9mrlc4w5ghy0fd29v8hfr8jccwgrn59mf3mkmfb2b9"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; }; DEWSeq = derive2 { name="DEWSeq"; version="1.8.0"; sha256="1ggj4in0sj9wb367s19v56f0jnfdcsylndjwpp4j02kwmc2wfl0j"; depends=[BiocGenerics BiocParallel data_table DESeq2 GenomeInfoDb GenomicRanges R_utils S4Vectors SummarizedExperiment]; }; DEXSeq = derive2 { name="DEXSeq"; version="1.40.0"; sha256="1wd4bjd0a53s689yvb2lxzdiy0synh6ncfcly3cfw37kpdj8lds1"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; }; - DEqMS = derive2 { name="DEqMS"; version="1.11.1"; sha256="0nm49sxxi0j4czly8rjyxp41wlcihbn802qmljs8x6y6wvp3464l"; depends=[ggplot2 limma matrixStats]; }; + DEqMS = derive2 { name="DEqMS"; version="1.12.1"; sha256="07klzl8qb121c3jk7g16fx4g5a89m8iv8mjhqcc7f4501bpbkyb2"; depends=[ggplot2 limma matrixStats]; }; DEsingle = derive2 { name="DEsingle"; version="1.14.0"; sha256="0x0xnylf036k320r59pqa273i59jcwxiwsw4fyfqqrliyw7fxa4c"; depends=[bbmle BiocParallel gamlss MASS Matrix maxLik pscl VGAM]; }; DEsubs = derive2 { name="DEsubs"; version="1.20.0"; sha256="1b11hhs7r1r24z7w9mimj1bpj7y5j7i9vq9sw6ll2dlghyazc7di"; depends=[circlize DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL]; }; DExMA = derive2 { name="DExMA"; version="1.2.1"; sha256="1afxv356bkswnbyh3mkf98xqq1arcgak980hkryn4i69531kkc0w"; depends=[Biobase bnstruct DExMAdata GEOquery impute limma pheatmap plyr scales snpStats sva swamp]; }; @@ -262,7 +259,7 @@ in with self; { DMCHMM = derive2 { name="DMCHMM"; version="1.16.0"; sha256="0r12m3ldbi1h0fdg4hgxfq1f0lrz49a08i7kr6imdspzm8hl2j65"; depends=[BiocParallel calibrate fdrtool GenomicRanges IRanges multcomp rtracklayer S4Vectors SummarizedExperiment]; }; DMRScan = derive2 { name="DMRScan"; version="1.16.0"; sha256="0iza3yyjmggkxgn24raiwzppf4lvdj1lgq34lpk08mf6p5v0v601"; depends=[GenomeInfoDb GenomicRanges IRanges MASS Matrix mvtnorm RcppRoll]; }; DMRcaller = derive2 { name="DMRcaller"; version="1.26.0"; sha256="0qn3y2nj0pyy9kqpbv8nwsiypwl6kixxs2yj3bvhkhb5dgqj6p6w"; depends=[betareg GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; }; - DMRcate = derive2 { name="DMRcate"; version="2.8.1"; sha256="12i5h9m4xgxlxs3n48rbqlk622qi8jx7vfnn6qhib0f3m73rws1i"; depends=[bsseq DSS edgeR ExperimentHub GenomeInfoDb GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors SummarizedExperiment]; }; + DMRcate = derive2 { name="DMRcate"; version="2.8.5"; sha256="1346s2z1lj57asil8zmapv5fsgmywsn7q0qdskpfzm05rd4h91ny"; depends=[bsseq DSS edgeR ExperimentHub GenomeInfoDb GenomicRanges Gviz IRanges limma minfi missMethyl plyr S4Vectors SummarizedExperiment]; }; DMRforPairs = derive2 { name="DMRforPairs"; version="1.30.0"; sha256="1f8b63chg3jrqbf669l2nk3a8wy5rya545zbypgzr2r51s284k7b"; depends=[GenomicRanges Gviz R2HTML]; }; DNABarcodeCompatibility = derive2 { name="DNABarcodeCompatibility"; version="1.10.0"; sha256="1dj4c8h648ckzrz0k6qrzvfgqz00wj0pdahhp35nlrldcavp90p6"; depends=[DNABarcodes dplyr numbers purrr stringr tidyr]; }; DNABarcodes = derive2 { name="DNABarcodes"; version="1.24.0"; sha256="07yaz98r18mjny1ilmfnjxcra7xpklnd183pw0kasvsri01ccwxg"; depends=[BH Matrix Rcpp]; }; @@ -285,16 +282,16 @@ in with self; { DelayedRandomArray = derive2 { name="DelayedRandomArray"; version="1.2.0"; sha256="1hi9pvxny8nm4akhshicksd04p7vflqa3m38k6kcs50slhgdp5ys"; depends=[BH DelayedArray dqrng Rcpp]; }; DelayedTensor = derive2 { name="DelayedTensor"; version="1.0.0"; sha256="0yg7r6j7r1sikc4wi6khh3dsbflzpj51sdh41q337lkmlxagwpbb"; depends=[BiocSingular DelayedArray DelayedRandomArray einsum HDF5Array irlba Matrix rTensor]; }; DepecheR = derive2 { name="DepecheR"; version="1.10.0"; sha256="1500jivij7zdycdd0i0b7mgp44w4z0hqnpzqbq8nhvzzdigic8x9"; depends=[beanplot doSNOW dplyr FNN foreach ggplot2 gmodels gplots MASS matrixStats mixOmics moments Rcpp RcppEigen reshape2 robustbase viridis]; }; - DiffBind = derive2 { name="DiffBind"; version="3.4.3"; sha256="1bz03ls7pkb09p6nkz7gfnhjlh06mgbp3j98ppnzibiar3cjrnfj"; 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.4.11"; sha256="1xprj3x3s3yh6fwsdcl4zgfbhn640422x1lhhrmvdr836jr8sxcj"; 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.18.0"; sha256="1axpyjr86a176rgv9wnrk04dv9llgkw9vr7h00scr6jw77wqya4n"; depends=[cba]; }; Dino = derive2 { name="Dino"; version="1.0.0"; sha256="1k83rhva7bxk1w6qvvdhx0r95p9nbzfdm3m7g6wpyq3qp0ifx5xp"; depends=[BiocParallel BiocSingular Matrix matrixStats S4Vectors scran Seurat SingleCellExperiment SummarizedExperiment]; }; Director = derive2 { name="Director"; version="1.20.0"; sha256="1f0a8rkpz698c5a41j7ii7ahxxaqn92rhx8sh3q66gpv0br8h44g"; depends=[htmltools]; }; DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.36.0"; sha256="06nallp9jj2vmaa7d18g6hiymjc109szdv8sp51r87n7s38bvyq6"; depends=[BiocGenerics IRanges S4Vectors]; }; - DiscoRhythm = derive2 { name="DiscoRhythm"; version="1.10.0"; sha256="1cb51c6bmvc1vgxih3sqcalbzhxn1b9ilf1q8j0ijwk7sxsdhy5l"; depends=[BiocGenerics BiocStyle broom data_table dplyr DT ggExtra ggplot2 gridExtra heatmaply kableExtra knitr magick matrixStats matrixTests MetaCycle plotly reshape2 rmarkdown S4Vectors shiny shinyBS shinycssloaders shinydashboard shinyjs SummarizedExperiment UpSetR VennDiagram viridis zip]; }; + DiscoRhythm = derive2 { name="DiscoRhythm"; version="1.10.1"; sha256="0bb8fmswicjnffa0w5j2iyy484zjcvh1isxk7gkjxm9snxbglmz6"; depends=[BiocGenerics BiocStyle broom data_table dplyr DT ggExtra ggplot2 gridExtra heatmaply kableExtra knitr magick matrixStats matrixTests MetaCycle plotly reshape2 rmarkdown S4Vectors shiny shinyBS shinycssloaders shinydashboard shinyjs SummarizedExperiment UpSetR VennDiagram viridis zip]; }; DominoEffect = derive2 { name="DominoEffect"; version="1.14.0"; sha256="13lksli177d11rw5692bc5qmp0x5bfkasriccaa28hklnqmbyjsc"; depends=[AnnotationDbi biomaRt Biostrings data_table GenomeInfoDb GenomicRanges IRanges SummarizedExperiment VariantAnnotation]; }; Doscheda = derive2 { name="Doscheda"; version="1.16.0"; sha256="0lpmxnid43fvi41mc5r89mvvxn19baja8f4zr38j3dkb126dr476"; depends=[affy calibrate corrgram drc DT ggplot2 gridExtra httr jsonlite limma matrixStats prodlim readxl reshape2 shiny shinydashboard stringr vsn]; }; DriverNet = derive2 { name="DriverNet"; version="1.34.0"; sha256="1qfjg5x3m2z5yjm0lgnw7rqhclic2fgzcdnq0nnwlqyp4i5na10q"; depends=[]; }; - DropletUtils = derive2 { name="DropletUtils"; version="1.14.1"; sha256="1nfv5d04jzbd5nv1fazj5qchv59s4cds698r44zfw36z6v83w2d6"; depends=[beachmat BH BiocGenerics BiocParallel DelayedArray DelayedMatrixStats dqrng edgeR GenomicRanges HDF5Array IRanges Matrix R_utils Rcpp rhdf5 Rhdf5lib S4Vectors scuttle SingleCellExperiment SummarizedExperiment]; }; + DropletUtils = derive2 { name="DropletUtils"; version="1.14.2"; sha256="0vljd0zlafqr0g5d14jf8qwahjc56i7i1xan00ql351y8hmi4qmi"; depends=[beachmat BH BiocGenerics BiocParallel DelayedArray DelayedMatrixStats dqrng edgeR GenomicRanges HDF5Array IRanges Matrix R_utils Rcpp rhdf5 Rhdf5lib S4Vectors scuttle SingleCellExperiment SummarizedExperiment]; }; DrugVsDisease = derive2 { name="DrugVsDisease"; version="2.36.0"; sha256="19plcigawh4c4z1dxn1c0kxbdnrsz2fgfyvmcnj0025xscdk4zay"; depends=[affy annotate ArrayExpress BiocGenerics biomaRt cMap2data DrugVsDiseasedata GEOquery hgu133a_db hgu133a2_db hgu133plus2_db limma qvalue RUnit xtable]; }; Dune = derive2 { name="Dune"; version="1.6.0"; sha256="0n267fw1yna1fpg5gcilmf0ijavy2c1ry0wcccp2cdzhs77cx7fi"; depends=[aricode BiocParallel dplyr gganimate ggplot2 magrittr purrr RColorBrewer SummarizedExperiment tidyr]; }; DynDoc = derive2 { name="DynDoc"; version="1.72.0"; sha256="1ix1kcjrmbv7hqsmihgazh7igrh13bxhgw36ibihh07sflrgf1hm"; depends=[]; }; @@ -316,13 +313,13 @@ in with self; { EnMCB = derive2 { name="EnMCB"; version="1.6.0"; sha256="050mzns1zh643pxzqzc935hwczpk7xwa16qq7z88cagab2r8yx7j"; depends=[boot doParallel foreach ggplot2 glmnet IlluminaHumanMethylation450kanno_ilmn12_hg19 mboost minfi rms survival survivalROC survivalsvm]; }; EnhancedVolcano = derive2 { name="EnhancedVolcano"; version="1.12.0"; sha256="19l1yz522hzmwwsgqqhwqrazqf6w015fi3j85n9pxqkyisz2r2x2"; depends=[ggalt ggplot2 ggrastr ggrepel]; }; EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.24.0"; sha256="1wbbasz3467jg6anzm57y4kijsysfkah1l5f82qw6ckrhv3rxylc"; depends=[circlize ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats Rcpp]; }; - EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.24.1"; sha256="1g08xvd6zav59cjj8sv12m03x35655npagxpnzg6awkmnx5x811s"; depends=[AnnotationDbi BiocFileCache BiocManager edgeR GO_db graph graphite GSEABase hwriter KEGGgraph KEGGREST limma pathview Rgraphviz S4Vectors safe SPIA SummarizedExperiment]; }; + EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.24.2"; sha256="0b1pgmfvbb7qba447szjakxdp1v9f63gmkvfqdw4g89f0k2ra40q"; depends=[AnnotationDbi BiocFileCache BiocManager edgeR GO_db graph graphite GSEABase hwriter KEGGgraph KEGGREST limma pathview Rgraphviz S4Vectors safe SPIA SummarizedExperiment]; }; EpiDISH = derive2 { name="EpiDISH"; version="2.10.0"; sha256="1fqyg3hfc40d1pvw02d95wr1lm2wi82yx3vrrsf7gs53i9gdm2q0"; depends=[e1071 locfdr MASS Matrix matrixStats quadprog stringr]; }; EpiTxDb = derive2 { name="EpiTxDb"; version="1.6.0"; sha256="0vmn4wqxwczq0ckx0pq20jbjp3a01nxj3knax1d3jx77cqqkwsaz"; depends=[AnnotationDbi BiocFileCache BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges httr IRanges Modstrings RSQLite S4Vectors tRNAdbImport xml2]; }; EventPointer = derive2 { name="EventPointer"; version="3.2.0"; sha256="0kg5psygc410gx6prb8as00csh6v3s1psbcn2ym4i4k5wnyzmbn3"; depends=[abind affxparser Biostrings BSgenome cobs doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges glmnet graph igraph IRanges iterators limma lpSolve MASS Matrix matrixStats nnls poibin prodlim qvalue RBGL rhdf5 S4Vectors SGSeq speedglm stringr SummarizedExperiment tximport]; }; ExCluster = derive2 { name="ExCluster"; version="1.12.0"; sha256="1fmijpvkn2qjwl8cqzwclybnfqyrdckxwfc6f1zird770bqyagjv"; depends=[GenomicRanges IRanges matrixStats Rsubread rtracklayer]; }; ExiMiR = derive2 { name="ExiMiR"; version="2.36.0"; sha256="1vf1241n6f0w7p8m8vwb30dlhybw5ddhp2bgwmn7ml6rfbkidmnk"; depends=[affy affyio Biobase limma preprocessCore]; }; - ExperimentHub = derive2 { name="ExperimentHub"; version="2.2.0"; sha256="15las4qmqvrn81hczxa3ylikqh54kp1lg9r8rcyfvrx5l0kgwlfq"; depends=[AnnotationHub BiocFileCache BiocGenerics BiocManager curl rappdirs S4Vectors]; }; + ExperimentHub = derive2 { name="ExperimentHub"; version="2.2.1"; sha256="0lvd6hyqdfsn5ji714v46qdrb8vr1y38lv0pgw8priab0hpqrbm5"; depends=[AnnotationHub BiocFileCache BiocGenerics BiocManager curl rappdirs S4Vectors]; }; ExperimentHubData = derive2 { name="ExperimentHubData"; version="1.20.1"; sha256="12gnp7zh0ligpmgnd59gp6c3cdq9sz0nzzpskjkdf7kzn08mk41m"; depends=[AnnotationHubData BiocGenerics BiocManager curl DBI ExperimentHub httr S4Vectors]; }; ExperimentSubset = derive2 { name="ExperimentSubset"; version="1.4.0"; sha256="1ccz555f5mfvii99w66f076cb22f0ksjxmq9f6bsfxjzsbc7ssnh"; depends=[Matrix S4Vectors SingleCellExperiment SpatialExperiment SummarizedExperiment TreeSummarizedExperiment]; }; ExploreModelMatrix = derive2 { name="ExploreModelMatrix"; version="1.6.0"; sha256="162g6zfdhr6gibyqkfwk4y2fd4wmbzwx1frf8rkw6m7ny3mc7s3g"; depends=[cowplot dplyr DT ggplot2 limma magrittr MASS rintrojs S4Vectors scales shiny shinydashboard shinyjs tibble tidyr]; }; @@ -340,7 +337,6 @@ in with self; { FastqCleaner = derive2 { name="FastqCleaner"; version="1.12.0"; sha256="1cw0916qdn1an3wcnx5659q2f22rs78p9m5v2xp9nyp5phjb97pp"; depends=[Biostrings DT htmltools IRanges Rcpp S4Vectors shiny shinyBS ShortRead]; }; FilterFFPE = derive2 { name="FilterFFPE"; version="1.4.0"; sha256="1c9mfhc4hms2f861f71i7hbhnn3s1xlzabcmdjzybwiv16dl139w"; depends=[doParallel foreach GenomicRanges IRanges Rsamtools S4Vectors]; }; FindIT2 = derive2 { name="FindIT2"; version="1.0.3"; sha256="0xgnsgpai7l7birivnpca0df74zh02q6l35dncz8i50x1yrf83hm"; depends=[BiocGenerics BiocParallel dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel glmnet IRanges MultiAssayExperiment patchwork progress purrr qvalue rlang rtracklayer S4Vectors stringr SummarizedExperiment tibble tidyr withr]; }; - FindMyFriends = derive2 { name="FindMyFriends"; version="1.23.0"; sha256="0xbhl6ljxb522r5062vv6xdziaaqkkwylmvlymvc5f1grjz0a4z9"; depends=[Biobase BiocGenerics BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; }; FitHiC = derive2 { name="FitHiC"; version="1.20.0"; sha256="0a3d2bxp98lmbf3i864zgfwxwvxyqfcrh75z9yz7ra7y44pkjr4y"; depends=[data_table fdrtool Rcpp]; }; FlowSOM = derive2 { name="FlowSOM"; version="2.2.0"; sha256="062xrv8li2z849qa8mv5dhafqli6ziz099ikjfvi7v2fr7174p8f"; depends=[BiocGenerics colorRamps ConsensusClusterPlus CytoML dplyr flowCore flowWorkspace ggforce ggnewscale ggplot2 ggpointdensity ggpubr ggrepel igraph magrittr pheatmap RColorBrewer rlang Rtsne scattermore tidyr XML]; }; FoldGO = derive2 { name="FoldGO"; version="1.12.0"; sha256="07wk3i9q8m8jaamwfwnnxlm3xc0r7frlk6s2mndkkjs1sfrdb5z3"; depends=[ggplot2 tidyr topGO]; }; @@ -354,14 +350,14 @@ in with self; { GCSFilesystem = derive2 { name="GCSFilesystem"; version="1.4.0"; sha256="0k2dmiyxfpdr1jzrkkkpj0rqd1s13rwmqfrbc5xkanc5z6wqd8hc"; depends=[]; }; GCSscore = derive2 { name="GCSscore"; version="1.8.0"; sha256="0zb2fcwqbxl59bvhj73yrb9sq2zld451abb1nmxj92yipbmwjgn6"; depends=[affxparser Biobase BiocManager data_table devtools dplR RSQLite stringr]; }; GDCRNATools = derive2 { name="GDCRNATools"; version="1.14.0"; sha256="1h0gfi6mhr5kzwhqxkzgxz12abkn7svnbbzga70pp7az8m8vxmnn"; 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.14.0"; sha256="07b3025fcjrq1kvpb7g6kxqwmk6pwibnv8krmn11ddgl2606k8c3"; depends=[BiocGenerics DelayedArray gdsfmt S4Vectors SeqArray SNPRelate]; }; + GDSArray = derive2 { name="GDSArray"; version="1.14.1"; sha256="0v8kxy7xfhgghz4qg2djc4nxh2w3bk48b0cx1jx7lc45hm2qsdfx"; depends=[BiocGenerics DelayedArray gdsfmt S4Vectors SeqArray SNPRelate]; }; GEM = derive2 { name="GEM"; version="1.20.0"; sha256="19jars2vajfgy2v9xrgp45gc2yn2hq31d9ikdpnkd9gvpqm99nkv"; depends=[ggplot2]; }; - GENESIS = derive2 { name="GENESIS"; version="2.24.0"; sha256="1n1h9aiyn8f8cznm8dkvndm3708nls2xr4v21sspz4vj8ahwvgaz"; depends=[Biobase BiocGenerics BiocParallel data_table gdsfmt GenomicRanges GWASTools igraph IRanges Matrix reshape2 S4Vectors SeqArray SeqVarTools SNPRelate]; }; + GENESIS = derive2 { name="GENESIS"; version="2.24.1"; sha256="10b72yy6bx9alw8zr9rz22wgkqm1m6b2lr1flrf80mvxjihfy7as"; depends=[Biobase BiocGenerics BiocParallel data_table gdsfmt GenomicRanges GWASTools igraph IRanges Matrix reshape2 S4Vectors SeqArray SeqVarTools SNPRelate]; }; GENIE3 = derive2 { name="GENIE3"; version="1.16.0"; sha256="0ms769267pimrx3xwwkgjy03qilkxxs7xwhzfca01f65i4n3l6fw"; depends=[dplyr reshape2]; }; GEOexplorer = derive2 { name="GEOexplorer"; version="1.0.0"; sha256="01hgjdp14b9r2044h0sd136f0px983n0il08wiii41vq1jgisvhb"; depends=[Biobase DT factoextra GEOquery ggplot2 heatmaply htmltools impute limma maptools pheatmap plotly scales shiny shinyBS shinybusy shinyHeatmaply stringr umap]; }; GEOfastq = derive2 { name="GEOfastq"; version="1.2.0"; sha256="03ya7x7dph6g97aa3gf3d7dinjcy8qipd0dyxqpdhdm1w1gx83by"; depends=[doParallel foreach plyr RCurl rvest stringr xml2]; }; GEOmetadb = derive2 { name="GEOmetadb"; version="1.56.0"; sha256="18v3h7518cc4fzdi7ivng81316012mry4ihyrldm85zgm4c5dign"; depends=[GEOquery RSQLite]; }; - GEOquery = derive2 { name="GEOquery"; version="2.62.1"; sha256="0plmh4x37r848g6ilvl1x8cim90rp85gikfc5m8lgi2i4xkq7hbq"; depends=[Biobase data_table dplyr httr limma magrittr R_utils readr tidyr xml2]; }; + GEOquery = derive2 { name="GEOquery"; version="2.62.2"; sha256="1hncr0p54qdg82a771yjjm4w1k2myrc26jzvci3g37mq7bgv3mxw"; depends=[Biobase data_table dplyr httr limma magrittr R_utils readr tidyr xml2]; }; GEOsubmission = derive2 { name="GEOsubmission"; version="1.46.0"; sha256="0p0w55j7ij1242sa76bhgqwnj5zi0bh7s7qa14iga4ldigpxr63b"; depends=[affy Biobase]; }; GEWIST = derive2 { name="GEWIST"; version="1.38.0"; sha256="0xcywidrs6jvps93iv3qvr9ai1bdzn95icvswy8ganx09v5hfpy9"; depends=[car]; }; GGPA = derive2 { name="GGPA"; version="1.6.0"; sha256="0spiix8vlncrc2h1chmkfz8k79lpvq3qya33yyg7avf8dqdqaw31"; depends=[GGally matrixStats network Rcpp RcppArmadillo scales sna]; }; @@ -413,12 +409,11 @@ in with self; { GeneStructureTools = derive2 { name="GeneStructureTools"; version="1.14.0"; sha256="1w7nckmjc4zg5a20f4hjqjavmkdwngkjp70akrf3bh1qmbvpdr2a"; depends=[Biostrings BSgenome_Mmusculus_UCSC_mm10 data_table GenomicRanges Gviz IRanges plyr rtracklayer S4Vectors stringdist stringr]; }; GeneTonic = derive2 { name="GeneTonic"; version="1.6.1"; sha256="1kcl87bjjy933z8xkqc3nx5yy6b89f62iaf7p6hc69z4vw5xrydf"; depends=[AnnotationDbi backbone bs4Dash circlize colorspace colourpicker ComplexHeatmap dendextend DESeq2 dplyr DT dynamicTreeCut expm ggforce ggplot2 ggrepel 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.56.0"; sha256="1gvk3wg5mqyc8j95l4djfc55ymv4i08az67znnly3r8376m07mqw"; depends=[gdata genetics MASS]; }; - 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]; }; - GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.30.0"; sha256="1r0wblz9w4hqxm15wdssz0invx7hxhg3bnblkia6w3aazh30s6ns"; depends=[BiocGenerics GenomeInfoDbData IRanges RCurl S4Vectors]; }; + GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.30.1"; sha256="1ly851w6xy144qvmpdv7p64yc45bqxmvny2rzgz691h3qbin3x55"; depends=[BiocGenerics GenomeInfoDbData IRanges RCurl S4Vectors]; }; GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.30.0"; sha256="1jwksis94mk8bmdggk0w3kvxqwp4di6x78xgsjk6ij54710adyq9"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; }; GenomicDataCommons = derive2 { name="GenomicDataCommons"; version="1.18.0"; sha256="1nr504dchiifbagrjq0cck5rzd23dcfnvx6bsw9wikw5mg4gib9l"; depends=[dplyr GenomicRanges httr IRanges jsonlite magrittr rappdirs readr rlang S4Vectors SummarizedExperiment tibble xml2]; }; GenomicDistributions = derive2 { name="GenomicDistributions"; version="1.2.0"; sha256="07c3rxvgm2abs01kzczbpy7kmn3yzcdf5z35dlk1bc2ry3s5dsd1"; depends=[Biostrings data_table dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges plyr reshape2]; }; - GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.46.3"; sha256="0a3shdzc1r0f12q9w679hgj8ywrwbg36z7k0yp47dgfjl14lachk"; depends=[AnnotationDbi Biobase BiocGenerics BiocIO biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; }; + GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.46.5"; sha256="1fhahqh87cikfrwqkm2z4nq3jyi530qvsbmf09j2hyhsm87hhrgg"; depends=[AnnotationDbi Biobase BiocGenerics BiocIO biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; }; GenomicFiles = derive2 { name="GenomicFiles"; version="1.30.0"; sha256="0i5y6dk6z18yqj5k4zy756c6l57z9jq2w5a5dksh2di4qgdgjx3x"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges MatrixGenerics Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.28.0"; sha256="090kxq5jn1jfr9fgbkvbjr5g4bcxzgsaal3gc9yx1n7pgmhccfmb"; depends=[Biobase BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph InteractionSet IRanges Rsamtools rtracklayer S4Vectors stringr]; }; GenomicOZone = derive2 { name="GenomicOZone"; version="1.8.0"; sha256="1dx72y7kmj7ng3r6qn9bzlmgq9pf7g738myhgrnmk4ivjl6f615w"; depends=[biomaRt Ckmeans_1d_dp GenomeInfoDb GenomicRanges ggbio ggplot2 gridExtra IRanges lsr plyr Rdpack S4Vectors]; }; @@ -437,13 +432,13 @@ in with self; { GraphPAC = derive2 { name="GraphPAC"; version="1.36.0"; sha256="19925ha3mr7j399nlwb2vjvsrf7s4xjbq8b6z1k304kxk7d13yp5"; depends=[igraph iPAC RMallow TSP]; }; GreyListChIP = derive2 { name="GreyListChIP"; version="1.26.0"; sha256="1h7h27q6l9d8j0shklyrh135zrwx56v4zzmm21cj1b7dvmwvpbcv"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; }; Guitar = derive2 { name="Guitar"; version="2.10.0"; sha256="082yja4mmsq77sllv3c88agxjbb6jxwil2krb8fkfsijvyyx11c9"; depends=[AnnotationDbi dplyr GenomicFeatures GenomicRanges ggplot2 knitr magrittr rtracklayer]; }; - Gviz = derive2 { name="Gviz"; version="1.38.0"; sha256="0nqa7m300d7gpsayb6c6rv64d3y8c390wvwgz7v29zs9c025s9a8"; 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.38.3"; sha256="0fmykq3b697n6lf33n5ldv2zxp7ccihpad1n95dqmrgfq4919kis"; 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.22.1"; sha256="1al4a88pgdl7hfhphsnwl1gg1c1kmw37wcdr4v4pfsw5l8ff7nx4"; depends=[BiocGenerics DelayedArray IRanges Matrix rhdf5 rhdf5filters Rhdf5lib S4Vectors]; }; HDTD = derive2 { name="HDTD"; version="1.28.0"; sha256="1pd0bbni121b5yq3j3sn8n67xgjfm4zygcpx7zgddcnq250544vl"; depends=[Rcpp RcppArmadillo]; }; HELP = derive2 { name="HELP"; version="1.52.0"; sha256="17bhh9phny0cw3n61582wywl395ls0ak68y8fqv1ibbqiip193ag"; depends=[Biobase]; }; HEM = derive2 { name="HEM"; version="1.66.0"; sha256="1jv8fwqsk05g7l7bbl7z928m83gk0gw70pix0dp901j9hm1xqjpb"; depends=[Biobase]; }; HGC = derive2 { name="HGC"; version="1.2.0"; sha256="0skvfx81xvfi8bwlskq1ylr6c5sblh3qzidbz1nb2xa2m4pck2q0"; depends=[ape dendextend dplyr ggplot2 Matrix mclust patchwork RANN Rcpp RcppEigen]; }; - HIBAG = derive2 { name="HIBAG"; version="1.30.1"; sha256="1ca0gin0hd2vh2pvx4xrca6iqr2nncfzsk5s7az8v2mwm9q6i09s"; depends=[RcppParallel]; }; + HIBAG = derive2 { name="HIBAG"; version="1.30.2"; sha256="0wg0p650dlnky62rbhfs1gg4hmq93dkmmxswkhdqkkbdqi62d107"; depends=[RcppParallel]; }; HIPPO = derive2 { name="HIPPO"; version="1.6.0"; sha256="0fr1zhavdzf7rmf0diy4r9qphfcphzbcqcs4370fyd4vyz5bid6l"; depends=[dplyr ggplot2 ggrepel gridExtra irlba magrittr Matrix reshape2 rlang Rtsne SingleCellExperiment umap]; }; HIREewas = derive2 { name="HIREewas"; version="1.12.0"; sha256="0bjj5h9vc1fhzcn31hvkpcmnx6gzmz3fhczgy21q0ngp26ny10yd"; depends=[gplots quadprog]; }; HMMcopy = derive2 { name="HMMcopy"; version="1.36.0"; sha256="0kbvdsvvrrzy05a5qiybc9chjfiidcz5mk09nj9s2x6vsj2whwxi"; depends=[data_table]; }; @@ -457,9 +452,7 @@ in with self; { Harshlight = derive2 { name="Harshlight"; version="1.66.0"; sha256="0a0zxy2f5ff74gaa24mahym2az2azp4k4i4hw8kgj7zj4mj6pzjz"; depends=[affy altcdfenvs Biobase]; }; Heatplus = derive2 { name="Heatplus"; version="3.2.0"; sha256="0yrnjrbfn8vjzvp2742lyxdqca4s18h73j44qxw7ib95x3p4lndf"; depends=[RColorBrewer]; }; HelloRanges = derive2 { name="HelloRanges"; version="1.20.0"; sha256="1f9fyafp3spxb76xl8ncww0dzfi4dbzh9ijqzs89dc7m10saq89p"; depends=[BiocGenerics Biostrings BSgenome docopt GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; - Herper = derive2 { name="Herper"; version="1.3.0"; sha256="038cavnbz7gvmv9mpnf88n8dzrg7yl306y68zsq5hpkrj6qax9vr"; depends=[reticulate rjson withr]; }; - HiCBricks = derive2 { name="HiCBricks"; version="1.11.0"; sha256="12s01r9z569pp6amlvcs7fqmwivw9jb2ahnnyq6nzflsyn5277kl"; depends=[BiocParallel curl data_table digest GenomeInfoDb GenomicRanges ggplot2 IRanges jsonlite R_utils R6 RColorBrewer readr reshape2 rhdf5 S4Vectors scales stringr tibble viridis]; }; - HiCDCPlus = derive2 { name="HiCDCPlus"; version="1.2.0"; sha256="0csm0ffbn3ya8fb936dy9g5sbvszsn274wszm871n248s9vqn8k7"; depends=[bbmle Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicInteractions GenomicRanges InteractionSet IRanges MASS pscl R_utils Rcpp rlang rtracklayer S4Vectors tibble tidyr]; }; + HiCDCPlus = derive2 { name="HiCDCPlus"; version="1.2.1"; sha256="0ywy0xwymrd9pknnz654vz31463js3rl3f1avmzjzd4krkf2vdgh"; depends=[bbmle Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicInteractions GenomicRanges InteractionSet IRanges MASS pscl R_utils Rcpp rlang rtracklayer S4Vectors tibble tidyr]; }; HiCcompare = derive2 { name="HiCcompare"; version="1.16.0"; sha256="0g2gsy27prk8b4anywim0qskishc52zh0p3854v04l6jax26675r"; depends=[BiocParallel data_table dplyr GenomicRanges ggplot2 gridExtra gtools InteractionSet IRanges KernSmooth mgcv pheatmap QDNAseq rhdf5 S4Vectors]; }; HiLDA = derive2 { name="HiLDA"; version="1.8.0"; sha256="02yss2nr6f9zb6kd11id4p3zcgdvr66zlf4s404nh1aag221bc7h"; depends=[abind BiocGenerics Biostrings BSgenome_Hsapiens_UCSC_hg19 cowplot forcats GenomicFeatures GenomicRanges ggplot2 R2jags Rcpp S4Vectors stringr tidyr TxDb_Hsapiens_UCSC_hg19_knownGene XVector]; }; HiTC = derive2 { name="HiTC"; version="1.38.0"; sha256="1ckiwqfq86k8p3y36iwr7k3y6g4z80n8hb047c0i2491lrn23rhx"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; }; @@ -481,7 +474,7 @@ in with self; { IPO = derive2 { name="IPO"; version="1.20.0"; sha256="0cmdz3d5ayjgk4dwdscczxz1zcrfcsq2ajj5rzwhz9jxh8j272c9"; depends=[BiocParallel CAMERA rsm xcms]; }; IRISFGM = derive2 { name="IRISFGM"; version="1.2.0"; sha256="1yqn4yy7bi6xkywr8pr742a87vxfynwxk67ddld7642dz0mfcb85"; depends=[AdaptGauss AnnotationDbi anocva clusterProfiler colorspace DEsingle DrImpute ggplot2 ggpubr ggraph igraph knitr Matrix MCL mixtools org_Hs_eg_db org_Mm_eg_db pheatmap Polychrome RColorBrewer Rcpp scater scran Seurat SingleCellExperiment]; }; IRanges = derive2 { name="IRanges"; version="2.28.0"; sha256="07zs231wbfwwc1c1165rhp711fbss40p9l8kyjjv9flzpr3hr1pg"; depends=[BiocGenerics S4Vectors]; }; - ISAnalytics = derive2 { name="ISAnalytics"; version="1.4.2"; sha256="0czvf3r4aj6xdfny28irkf8k0jrkjvmdxzrcdfqnm0mh7vmqbgaq"; depends=[BiocParallel data_table dplyr fs ggplot2 ggrepel lifecycle lubridate magrittr psych purrr Rcapture readr readxl rlang stringr tibble tidyr zip]; }; + ISAnalytics = derive2 { name="ISAnalytics"; version="1.4.3"; sha256="1ki8b92qd361pmb9azy2kd4nsxjr9rz3cvxg5ih92k0ps4yhadak"; depends=[BiocParallel data_table dplyr fs ggplot2 ggrepel lifecycle lubridate magrittr psych purrr Rcapture readr readxl rlang stringr tibble tidyr zip]; }; ISoLDE = derive2 { name="ISoLDE"; version="1.22.0"; sha256="16qfv44341n1l69zh86k445kspaygy0y4by7jms8fhnyiw7pd261"; depends=[]; }; ITALICS = derive2 { name="ITALICS"; version="2.54.0"; sha256="17d12vcbwmvqfg5bfp5854g2n3c6mg30gdm5cm07k29h1y6q25h7"; depends=[affxparser DBI GLAD ITALICSData oligo oligoClasses pd_mapping50k_xba240]; }; IVAS = derive2 { name="IVAS"; version="2.14.0"; sha256="02cwi01iamig91hwjsx481l61cxxzrhazxfnw2p1q18ydkc9w6fv"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges ggfortify ggplot2 IRanges lme4 Matrix S4Vectors]; }; @@ -542,7 +535,6 @@ in with self; { MBASED = derive2 { name="MBASED"; version="1.28.0"; sha256="11rbsaki3nbzil2p8fv7b7biykb60398ayq8sc8drqpiam15myy7"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; }; MBAmethyl = derive2 { name="MBAmethyl"; version="1.28.0"; sha256="1jkvx523spv55qrikg26xc2r9qb72y7kfa161ha6jjm8l57rb6bv"; depends=[]; }; MBCB = derive2 { name="MBCB"; version="1.48.0"; sha256="06idlf8s0a59q45rckflxi5m3i7rgn8lphzyw2fgajvv4df5j7q3"; depends=[preprocessCore tcltk2]; }; - MBQN = derive2 { name="MBQN"; version="2.5.0"; sha256="01pf9wkk3dsxgx1y8mxfxn9m2j2hqipc5kajm7w8g60bj9flg09j"; depends=[BiocFileCache ggplot2 limma PairedData preprocessCore rappdirs RCurl rpx SummarizedExperiment xml2]; }; MBttest = derive2 { name="MBttest"; version="1.22.0"; sha256="115bkavx4pqy7sh70m5jmghk784f4cqm6z91z5s44m8c00a58vnp"; depends=[gplots gtools]; }; MCbiclust = derive2 { name="MCbiclust"; version="1.18.0"; sha256="1sswmmdkxw41pzqzqxs8rq581jx1wprcmafagnn4n39h2mw00wwy"; depends=[AnnotationDbi BiocParallel cluster GGally ggplot2 GO_db org_Hs_eg_db scales WGCNA]; }; MDTS = derive2 { name="MDTS"; version="1.14.0"; sha256="124ixdshragwgnr4rz5qii2j0j74ybm5h8y3k2h1kba56632ff1s"; depends=[Biostrings DNAcopy GenomicAlignments GenomicRanges IRanges Rsamtools stringr]; }; @@ -562,7 +554,7 @@ in with self; { MLSeq = derive2 { name="MLSeq"; version="2.12.0"; sha256="0z722cbbvkkfpzli47n9dhyj3n02gibffy1l06imwvzxcvahcfyj"; depends=[Biobase caret DESeq2 edgeR foreach ggplot2 limma pamr plyr sSeq SummarizedExperiment testthat VennDiagram xtable]; }; MMAPPR2 = derive2 { name="MMAPPR2"; version="1.8.0"; sha256="1fl8dmbxr407f0vzv4q3jpaia28igzqxjb6azbck7zgn64wh5i3c"; depends=[Biobase BiocGenerics BiocParallel data_table dplyr ensemblVEP GenomeInfoDb GenomicRanges gmapR IRanges magrittr Rsamtools S4Vectors stringr tidyr VariantAnnotation VariantTools]; }; MMDiff2 = derive2 { name="MMDiff2"; version="1.22.0"; sha256="1a74q87mlf1pvgy47gyncllsdz460iyk1nrh4m75jywhbxjf36z0"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; }; - MMUPHin = derive2 { name="MMUPHin"; version="1.8.0"; sha256="00gi53nm19q1282lk435mvm908ldslfcqs70fbz69ysxp6a4qv9v"; depends=[cowplot dplyr fpc ggplot2 igraph Maaslin2 metafor tidyr]; }; + MMUPHin = derive2 { name="MMUPHin"; version="1.8.1"; sha256="161s7505hyacn9632yaq8a0arqac1g11vbz4awjrhqjlma12c9m1"; depends=[cowplot dplyr fpc ggplot2 igraph Maaslin2 metafor tidyr]; }; MODA = derive2 { name="MODA"; version="1.20.0"; sha256="00v40gsp1x5gbjg4ilnsjq1j512lwl3sbhqmavyxs20i8c8xjcqf"; depends=[AMOUNTAIN cluster dynamicTreeCut igraph RColorBrewer WGCNA]; }; MOFA2 = derive2 { name="MOFA2"; version="1.4.0"; sha256="0vl2ffvh9nsdgw94yavkdkkhihpcb8fdbn3f19aygmwbfg78j3w9"; depends=[basilisk corrplot cowplot DelayedArray dplyr forcats ggplot2 ggrepel HDF5Array magrittr pheatmap RColorBrewer reshape2 reticulate rhdf5 Rtsne stringi tidyr uwot]; }; MOGAMUN = derive2 { name="MOGAMUN"; version="1.4.0"; sha256="0jq863ql6ydykrbriw5h6ibinchkhsgxq8908gyg5f5jl2sgc8pc"; depends=[BiocParallel igraph RCy3 RUnit stringr]; }; @@ -575,17 +567,16 @@ in with self; { MSGFplus = derive2 { name="MSGFplus"; version="1.28.0"; sha256="1k0qm049gk4gjhd88zhxxrpc944r7ndq8dys08ai2kbaqignvb7y"; depends=[mzID ProtGenerics]; }; MSPrep = derive2 { name="MSPrep"; version="1.4.0"; sha256="0nkmmjzkdxizk2yv1ahgsp8zsr4jjazpzqqwcsx86dhrgf5jk5cz"; depends=[crmn ddpcr dplyr magrittr missForest pcaMethods preprocessCore rlang S4Vectors stringr SummarizedExperiment sva tibble tidyr VIM]; }; MSnID = derive2 { name="MSnID"; version="1.28.0"; sha256="0dks5h3vp9ly8x24px2rl5blqicxybpxjnxvg2p1bwq8zvjkm38p"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics BiocStyle Biostrings data_table doParallel dplyr foreach ggplot2 iterators msmsTests MSnbase mzID mzR ProtGenerics purrr R_cache Rcpp reshape2 rlang RUnit stringr tibble xtable]; }; - MSnbase = derive2 { name="MSnbase"; version="2.20.1"; sha256="0ip614mdwisz2hlmyfgngysq1s3hajb88cgdmygfc8i6kyxjkjzl"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant MASS MsCoreUtils mzID mzR pcaMethods plyr ProtGenerics Rcpp S4Vectors scales vsn XML]; }; + MSnbase = derive2 { name="MSnbase"; version="2.20.4"; sha256="0d3b0i154dyz1wvy2jwf5831bzbmalw7rzvxj8rd7658zjhghgzc"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant MASS MsCoreUtils mzID mzR pcaMethods plyr ProtGenerics Rcpp S4Vectors scales vsn XML]; }; MSstats = derive2 { name="MSstats"; version="4.2.0"; sha256="1i36a0vhqb2sjllyh6ascfm5fbzf8awazbk1vjq5n8mh2cq72ri9"; depends=[checkmate data_table ggplot2 ggrepel gplots limma lme4 marray MASS MSstatsConvert preprocessCore Rcpp RcppArmadillo survival]; }; - MSstatsConvert = derive2 { name="MSstatsConvert"; version="1.4.0"; sha256="0p44g7kv2zyknmiki94w0v4zq1qpa2ly17hbfqkfy9c1xql7b38g"; depends=[checkmate data_table log4r stringi]; }; + MSstatsConvert = derive2 { name="MSstatsConvert"; version="1.4.1"; sha256="0n8dhc8x9z9n3j91zac67asqgx6q6ikwhcpd56h5x1rhggy8s5db"; depends=[checkmate data_table log4r stringi]; }; MSstatsLOBD = derive2 { name="MSstatsLOBD"; version="1.2.0"; sha256="0d78hd9ip2amkj5pjmwy376qhzfd46wqmzl38rbm52d946c69sb8"; depends=[ggplot2 minpack_lm Rcpp]; }; MSstatsLiP = derive2 { name="MSstatsLiP"; version="1.0.0"; sha256="1vf3f3yd9sgaqs9asq1x2819wkj2x68086g8hag1ln6q7q5j0xws"; depends=[Biostrings checkmate data_table dplyr factoextra ggplot2 ggpubr gridExtra MSstats MSstatsConvert MSstatsPTM purrr Rcpp scales stringr tibble tidyr tidyverse]; }; MSstatsPTM = derive2 { name="MSstatsPTM"; version="1.4.2"; sha256="1g4m2z9hw86w7fj0539jkfjwjdx47kp4lhy9xa7032dr4aiwkvbh"; depends=[Biostrings checkmate data_table dplyr ggplot2 ggrepel gridExtra MSstats MSstatsConvert MSstatsTMT Rcpp stringr]; }; MSstatsQC = derive2 { name="MSstatsQC"; version="2.12.0"; sha256="087lr0maf5kpl642kvvkd9pyakqxy152rzhvrlaj0rxbrfqgxnsw"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics]; }; MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.14.0"; sha256="0ygw1zrq219grfy6h650icai9khx49fvdbby5cyydrqbp8m64w77"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly shiny]; }; MSstatsSampleSize = derive2 { name="MSstatsSampleSize"; version="1.8.0"; sha256="0ckdy0qy2s2rvh4ijdddkk9calf1s9s0hr52y0kpgr4mb5zrl0jp"; depends=[BiocParallel caret ggplot2 gridExtra MSstats reshape2]; }; - MSstatsTMT = derive2 { name="MSstatsTMT"; version="2.2.0"; sha256="0bx96v57lhr8mmvy30cpmbr3mc4ykqwjvqld5gvc01f0h79x8545"; depends=[checkmate data_table ggplot2 limma lme4 lmerTest MSstats MSstatsConvert]; }; - MSstatsTMTPTM = derive2 { name="MSstatsTMTPTM"; version="1.1.2"; sha256="16qnddwhwhjjfr5akdrmp93gkxq2r41s82hb1blbz47lwbj5kaj5"; depends=[dplyr ggplot2 gridExtra MSstatsTMT Rcpp reshape2 stringr]; }; + MSstatsTMT = derive2 { name="MSstatsTMT"; version="2.2.7"; sha256="158s2hdnxlaxcpvybg1r5n89qyhj1rvzvxhp02mc2v4m27rw256n"; depends=[checkmate data_table ggplot2 limma lme4 lmerTest MSstats MSstatsConvert]; }; MVCClass = derive2 { name="MVCClass"; version="1.68.0"; sha256="088gzh33vjkjf78xczqfs89pyg0k7c3533yfvijqxl84ni2ky78z"; depends=[]; }; MWASTools = derive2 { name="MWASTools"; version="1.18.0"; sha256="0i8880nb6y7sanb9w8cwvd69990p1zmfyi3d98259hl2ly65zywj"; depends=[boot car ComplexHeatmap ggplot2 glm2 gridExtra igraph KEGGgraph KEGGREST ppcor qvalue RCurl SummarizedExperiment]; }; Maaslin2 = derive2 { name="Maaslin2"; version="1.8.0"; sha256="08zncj3ywc5pcywi3zgqvvlmqgp9j165b3vrkipvwv15b647jqvp"; depends=[biglm car chemometrics cplm data_table dplyr edgeR ggplot2 glmmTMB hash lme4 lmerTest logging lpsymphony MASS metagenomeSeq optparse pbapply pcaPP pheatmap pscl robustbase vegan]; }; @@ -593,7 +584,7 @@ in with self; { MassArray = derive2 { name="MassArray"; version="1.46.0"; sha256="1m3a0h5jmjifm16z9l37rij00jka0k22qryq0lmhvfmidzvn7pbf"; depends=[]; }; MassSpecWavelet = derive2 { name="MassSpecWavelet"; version="1.60.0"; sha256="1icqyxkx5a9y3wahkxpxngw85c7l4hih1ym9nwwn9qy93pnw1zi4"; depends=[waveslim]; }; MatrixGenerics = derive2 { name="MatrixGenerics"; version="1.6.0"; sha256="1s75p8rrmj24r0vcbaiyw8xg8y84j388mv6iawai7pypfcl8s1z3"; depends=[matrixStats]; }; - MatrixQCvis = derive2 { name="MatrixQCvis"; version="1.2.0"; sha256="0isahwrq232fkls7bsjlnsfi2q1yimfx61k7as8in82a5jf56rs1"; depends=[ComplexHeatmap dplyr ggplot2 Hmisc htmlwidgets impute imputeLCMD limma openxlsx pcaMethods plotly proDA rlang rmarkdown Rtsne S4Vectors shiny shinydashboard shinyhelper shinyjs SummarizedExperiment tibble tidyr umap UpSetR vegan vsn]; }; + MatrixQCvis = derive2 { name="MatrixQCvis"; version="1.2.2"; sha256="1czw4v7dyggk6dkhvqsx01wd5rp9rds3h4g9dbycgb9gz5qmza0h"; depends=[ComplexHeatmap dplyr ggplot2 Hmisc htmlwidgets impute imputeLCMD limma openxlsx pcaMethods plotly proDA rlang rmarkdown Rtsne S4Vectors shiny shinydashboard shinyhelper shinyjs SummarizedExperiment tibble tidyr umap UpSetR vegan vsn]; }; MatrixRider = derive2 { name="MatrixRider"; version="1.26.0"; sha256="0mv0w3m7waqfm8gy39hmdn00p6cq0a0ndr01scfg1js29jm6sgc2"; depends=[Biostrings IRanges S4Vectors TFBSTools XVector]; }; MeSHDbi = derive2 { name="MeSHDbi"; version="1.30.0"; sha256="0m4vak1sqh28dz4s2i3nhvhpns024kqnapqa6ibqq0spac8fvknr"; depends=[AnnotationDbi Biobase RSQLite]; }; MeasurementError_cor = derive2 { name="MeasurementError.cor"; version="1.66.0"; sha256="119d7wz374vshg89p72qbnnxwdk32h4rhz8ay505vnnqkyyiw5ag"; depends=[]; }; @@ -602,14 +593,13 @@ in with self; { MesKit = derive2 { name="MesKit"; version="1.4.0"; sha256="1bz5krwx8v63s9mzbxivkj88vp0f1i3xk4mplkhra8wrn5kc7qvf"; depends=[AnnotationDbi ape Biostrings circlize ComplexHeatmap cowplot data_table dplyr ggplot2 ggrepel ggridges IRanges mclust phangorn pracma RColorBrewer S4Vectors tidyr]; }; MetCirc = derive2 { name="MetCirc"; version="1.24.0"; sha256="0wgf6l6ficl4456sa56ccjgj4z9iwp94ar2dhqjyjqz5fxdz4cvk"; depends=[amap circlize ggplot2 MSnbase S4Vectors scales shiny]; }; MetID = derive2 { name="MetID"; version="1.12.0"; sha256="08n0b76vzv5zlcw0icc2155wbyik2r7x43gf7rxj929l9yx213py"; depends=[ChemmineR devtools igraph Matrix stringr]; }; - MetNet = derive2 { name="MetNet"; version="1.12.0"; sha256="1h8n595qz0wjg4mx4wccmxz7j9wlkqzbg8c2a30gkhlwknc3k8qh"; depends=[BiocParallel bnlearn dplyr GENIE3 ggplot2 mpmi parmigene ppcor psych rlang S4Vectors stabs SummarizedExperiment tibble tidyr]; }; + MetNet = derive2 { name="MetNet"; version="1.12.1"; sha256="0s54q5q9lw2aljdvy5ab4f9j52jiji582mfa0n26mcv8waq39r4i"; depends=[BiocParallel bnlearn dplyr GENIE3 ggplot2 mpmi parmigene ppcor psych rlang S4Vectors stabs SummarizedExperiment tibble tidyr]; }; MetaCyto = derive2 { name="MetaCyto"; version="1.16.0"; sha256="0rhxnj7s01mvfg6bnrx86qm88dihzcivz66z0l52qvc13q38zxv7"; depends=[cluster fastcluster flowCore FlowSOM ggplot2 metafor tidyr]; }; MetaNeighbor = derive2 { name="MetaNeighbor"; version="1.14.0"; sha256="16j9xx7hka13shih9cb3l49vd06ay83pg434lxz0pkdl3zlfhkak"; depends=[beanplot dplyr ggplot2 gplots igraph Matrix matrixStats RColorBrewer SingleCellExperiment SummarizedExperiment tibble tidyr]; }; MetaVolcanoR = derive2 { name="MetaVolcanoR"; version="1.8.0"; sha256="178wva1km2j53yr3j49pzahsixqlcln750l433vzl111p7db1xc6"; depends=[cowplot data_table dplyr ggplot2 htmlwidgets metafor metap plotly rlang tidyr topconfects]; }; Metab = derive2 { name="Metab"; version="1.28.0"; sha256="1syd548djqcmx8d094mzgj4mw9zzfq2sn9fqxm4z2kpgzqnmy400"; depends=[pander svDialogs xcms]; }; MetaboCoreUtils = derive2 { name="MetaboCoreUtils"; version="1.2.0"; sha256="1srmpyccpdqxxlwq68d03yddb74a3kb6yw6yb6v92mpfal1qgdss"; depends=[MsCoreUtils stringr]; }; MetaboSignal = derive2 { name="MetaboSignal"; version="1.24.0"; sha256="1rn6i6masadz5y2lrhjfw2rkfri25rnfnx0gxg9pqsg523bz2plb"; depends=[AnnotationDbi biomaRt EnsDb_Hsapiens_v75 hpar igraph KEGGgraph KEGGREST MWASTools mygene org_Hs_eg_db RCurl]; }; - MethCP = derive2 { name="MethCP"; version="1.7.0"; sha256="1smhwmrgckgivf6xfk54sz197cw1mar95chzkrfpf4wxw3jzbbkn"; depends=[BiocParallel bsseq DNAcopy DSS GenomeInfoDb GenomicRanges IRanges methylKit S4Vectors]; }; MethPed = derive2 { name="MethPed"; version="1.22.0"; sha256="1a48yhnaw0lxb9cj0ywd59j7yf109bii0qq7d8v9rl9l1l4apmy8"; depends=[Biobase randomForest]; }; MethReg = derive2 { name="MethReg"; version="1.4.0"; sha256="1axqcza16r7wqnd78bdzh2sv5yi00ikymawkq0y2spcafb85facr"; depends=[DelayedArray dplyr GenomicRanges ggplot2 ggpubr IRanges MASS Matrix plyr progress pscl readr rlang S4Vectors sesameData sfsmisc stringr SummarizedExperiment tibble tidyr]; }; MethTargetedNGS = derive2 { name="MethTargetedNGS"; version="1.26.0"; sha256="1n5gsizg9cfq2mi2v7f81ika423ci7vdgddnlxj5x8vszn5jfavk"; depends=[Biostrings gplots seqinr stringr]; }; @@ -621,26 +611,26 @@ in with self; { MiPP = derive2 { name="MiPP"; version="1.66.0"; sha256="1m42rv20f9cwnr97ckx4lm193zf0kjr2v33fisymyaq5rrl7ppfn"; depends=[Biobase e1071 MASS]; }; MiRaGE = derive2 { name="MiRaGE"; version="1.36.0"; sha256="10laq0b1acsirykb5cjxlpj91lqvmhsd3ammk331njaaczh4mjrx"; depends=[AnnotationDbi Biobase BiocGenerics BiocManager S4Vectors]; }; MicrobiomeProfiler = derive2 { name="MicrobiomeProfiler"; version="1.0.0"; sha256="13awswgm1n30fy73xxlph5aay8a4nkb1gjjzhqy9w7djpm99nw8g"; depends=[clusterProfiler config DT enrichplot ggplot2 golem htmltools magrittr shiny shinycustomloader shinyWidgets]; }; - MicrobiotaProcess = derive2 { name="MicrobiotaProcess"; version="1.6.3"; sha256="0k67ajgz87lanfkg38zhihnfvq31n7x4093a42bh0dx69m92rcbh"; depends=[ape Biostrings coin dplyr dtplyr foreach ggplot2 ggrepel ggsignif ggstar ggtree ggtreeExtra magrittr MASS patchwork pillar rlang SummarizedExperiment tibble tidyr tidyselect tidytree treeio vegan zoo]; }; + MicrobiotaProcess = derive2 { name="MicrobiotaProcess"; version="1.6.5"; sha256="065axmzs5nzbfm85aah6a5gyp5clffndml26h62fhs0i2msiz3j9"; depends=[ape Biostrings coin dplyr dtplyr foreach ggplot2 ggrepel ggsignif ggstar ggtree ggtreeExtra magrittr MASS patchwork pillar rlang SummarizedExperiment tibble tidyr tidyselect tidytree treeio vegan zoo]; }; MineICA = derive2 { name="MineICA"; version="1.34.0"; sha256="00pbhbz44dx5gfzzf1drwny4a779zxk4hjavb1fkpg15cm7c152x"; 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.38.0"; sha256="077prww1k374czkd8dlpy081ki101vpl2gpi4dmjbzzq5q45ld7f"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice MatrixGenerics matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; }; ModCon = derive2 { name="ModCon"; version="1.2.0"; sha256="1pgvkscvsacm7ag6yyqlpxs6c5vyb3hlmk6gzkiarsc1b29iqhm4"; depends=[data_table]; }; Modstrings = derive2 { name="Modstrings"; version="1.10.0"; sha256="0lnfvv8k0ffpf72zvhxy6831mgr4gajd4miad8rjzaajhqndr2yf"; depends=[BiocGenerics Biostrings crayon GenomicRanges IRanges S4Vectors stringi stringr XVector]; }; MoonlightR = derive2 { name="MoonlightR"; version="1.20.0"; sha256="1sxdalili8vkp07fn558pcg3azi3v1gqjp6h9cvv1cxdcnjrykkh"; depends=[Biobase circlize clusterProfiler doParallel DOSE foreach GEOquery gplots HiveR limma parmigene randomForest RColorBrewer RISmed SummarizedExperiment TCGAbiolinks]; }; MotifDb = derive2 { name="MotifDb"; version="1.36.0"; sha256="0a2zg26zzk7bj5c33mbwl8dx9lh1hns8q8kwp09rbfjdichv7425"; depends=[BiocGenerics Biostrings GenomicRanges IRanges rtracklayer S4Vectors splitstackshape]; }; - MouseFM = derive2 { name="MouseFM"; version="1.4.1"; sha256="1b80syai2wj9xg3ivxnjqkb1nwkfwmkrm40j7g085fdmdd2r08q1"; depends=[biomaRt curl data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gtools httr IRanges jsonlite reshape2 rlist scales tidyr]; }; + MouseFM = derive2 { name="MouseFM"; version="1.4.2"; sha256="0pjqzf10541qd651m26l3265q01g1nziajy8428n1lwn9h2n74ai"; depends=[biomaRt curl data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gtools httr IRanges jsonlite reshape2 rlist scales tidyr]; }; MsBackendMassbank = derive2 { name="MsBackendMassbank"; version="1.2.0"; sha256="10dgck0rwzfxzlbdf8fclrci6858iqbl9g690fva4zsjllzykbl5"; depends=[BiocParallel DBI IRanges MsCoreUtils ProtGenerics S4Vectors Spectra]; }; MsBackendMgf = derive2 { name="MsBackendMgf"; version="1.2.0"; sha256="0p7lmiijxgms01qsrgih9r8y5q355w67nqmpj5l70c0b52cv3ri9"; depends=[BiocParallel IRanges MsCoreUtils S4Vectors Spectra]; }; MsBackendRawFileReader = derive2 { name="MsBackendRawFileReader"; version="1.0.0"; sha256="0gg71a5y6m46xnm45cmkjqbss4c416v8k8s21yp3qids7zc36izi"; depends=[BiocParallel IRanges MsCoreUtils rawrr S4Vectors Spectra]; }; - MsCoreUtils = derive2 { name="MsCoreUtils"; version="1.6.0"; sha256="1w8d1v2r3plwwcz23zhbpvklhapf2a6x3xmglyh4sh6sy9ynkgrv"; depends=[clue MASS Rcpp S4Vectors]; }; + MsCoreUtils = derive2 { name="MsCoreUtils"; version="1.6.2"; sha256="0614a830gf676ck8j5lkm04158pfvhjb61p3xfdd69gg3d44mk1d"; depends=[clue MASS Rcpp S4Vectors]; }; MsFeatures = derive2 { name="MsFeatures"; version="1.2.0"; sha256="020ifrijlzdd3qk4bhd9z4knj5d87ildrkl3wcmxvwkvs9rbh8rq"; depends=[MsCoreUtils ProtGenerics SummarizedExperiment]; }; Mulcom = derive2 { name="Mulcom"; version="1.44.0"; sha256="0s03qi0288fzzby5iyzgy4rarrxfxcyp6434755268vzz2s6pyj5"; depends=[Biobase fields]; }; MultiAssayExperiment = derive2 { name="MultiAssayExperiment"; version="1.20.0"; sha256="1h3b8vqlbd04amjprxd1814zksdrbi01a0xn3906vkbqi43hfyn9"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors SummarizedExperiment tidyr]; }; MultiBaC = derive2 { name="MultiBaC"; version="1.4.0"; sha256="0pwg6zmrfqrzra1r6ai68ya5fjf6dy2sl035xnxl617iii96jada"; depends=[ggplot2 Matrix MultiAssayExperiment plotrix ropls]; }; MultiDataSet = derive2 { name="MultiDataSet"; version="1.22.0"; sha256="17asldnxqvp3sijx7nbi2lbbgnq4iq8z72qlg9080sm5lga1yy1s"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 ggrepel IRanges limma qqman S4Vectors SummarizedExperiment]; }; MultiMed = derive2 { name="MultiMed"; version="2.16.0"; sha256="1dkvvrvjfc04ad48zywbrmbvm1lcnni6rvvl9gdax11y9lz19341"; depends=[]; }; - MungeSumstats = derive2 { name="MungeSumstats"; version="1.2.0"; sha256="06n1nxk2hz9gx6wwz0wljxjhyjz3j4njjdwy0vx7zai7rzdv0211"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges googleAuthR httr jsonlite magrittr R_utils RCurl rtracklayer stringr VariantAnnotation]; }; - MutationalPatterns = derive2 { name="MutationalPatterns"; version="3.4.0"; sha256="1n9rakj57yf17hay1bzvwc2h761yijmlflb3crg1bzwvmn32yhsl"; depends=[BiocGenerics Biostrings BSgenome cowplot dplyr GenomeInfoDb GenomicRanges ggalluvial ggdendro ggplot2 IRanges magrittr NMF pracma purrr RColorBrewer S4Vectors stringr tibble tidyr VariantAnnotation]; }; + MungeSumstats = derive2 { name="MungeSumstats"; version="1.2.3"; sha256="04lv8yqpjwa6p9n6jpd9mpnnn0r1yv8b6rig6w1zgmhi31cigz7j"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges googleAuthR httr jsonlite magrittr R_utils RCurl rtracklayer stringr VariantAnnotation]; }; + MutationalPatterns = derive2 { name="MutationalPatterns"; version="3.4.1"; sha256="0i6fq6736gvrqn45r7nrhl0ns45qwj1bl4yc6qlalw2g46mjxf6k"; 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.18.0"; sha256="0glcjxgydj2k7h4963fl465y398xqvq4g393ainvwcgz77kx4sk0"; 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.10.0"; sha256="1him4qg3xmgisl3jsws690ciknvj2876xn8n9gxc8l08cihfminf"; depends=[BiocParallel DESeq2 genefilter mgcv S4Vectors SummarizedExperiment]; }; NBSplice = derive2 { name="NBSplice"; version="1.12.0"; sha256="12i5zqzxqzh4rfqh02mf2lr9k7xsz1hb945lcng0fc01l7dawd0a"; depends=[BiocParallel car edgeR ggplot2 MASS mppa reshape2]; }; @@ -671,7 +661,7 @@ in with self; { OMICsPCA = derive2 { name="OMICsPCA"; version="1.12.0"; sha256="0d5hplm94k7hz6lap31jsb5pdh8lb7xl9i0swznm5vzrxrjdifyd"; 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.16.0"; sha256="1zkbhb70aam3g1arfb8bc8z4c4bd1qyr1zidz6srx1n25pkhp4ii"; depends=[MASS qvalue tibble]; }; ORFhunteR = derive2 { name="ORFhunteR"; version="1.2.0"; sha256="0jkpq3hiv6n5c4hy3khs59020p98ig91w78ab37jam3sibykr0c6"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg38 data_table Peptides randomForest Rcpp rtracklayer stringr xfun]; }; - ORFik = derive2 { name="ORFik"; version="1.14.6"; sha256="11f0p5m0r0qhf86n56s6pwiswn3sp1x8pz4gksa5yvhqrkbq6q8q"; depends=[AnnotationDbi BiocGenerics BiocParallel biomartr Biostrings BSgenome cowplot data_table DESeq2 fst GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra httr IRanges jsonlite R_utils Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment xml2]; }; + ORFik = derive2 { name="ORFik"; version="1.14.7"; sha256="0n04h94jdq99rggq4bydric0f957kd34yzfqpgafn7hy15p23a7z"; depends=[AnnotationDbi BiocGenerics BiocParallel biomartr Biostrings BSgenome cowplot data_table DESeq2 fst GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra httr IRanges jsonlite R_utils Rcpp Rsamtools rtracklayer S4Vectors SummarizedExperiment xml2]; }; OSAT = derive2 { name="OSAT"; version="1.42.0"; sha256="1ibhrrlfjjils0w6n586s5ws0ybv7ija2p2f0jq3m3m9l324iyx9"; depends=[]; }; OTUbase = derive2 { name="OTUbase"; version="1.44.0"; sha256="18wmllkc3h8x9ihrg0lzk4jvxjwrccl1jr37inkdmzv4aq5b7ygs"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; }; OUTRIDER = derive2 { name="OUTRIDER"; version="1.12.0"; sha256="0ygsk0q1n8h02y4x3ccajkyyryn8gq0dz397l3jryb248g564a4h"; 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]; }; @@ -680,7 +670,7 @@ in with self; { OmicCircos = derive2 { name="OmicCircos"; version="1.32.0"; sha256="1lkncbdq93azp1gv0z4bwdi6l1gpywm096hhn45q7w6f0dy5ydqs"; depends=[GenomicRanges]; }; OmicsLonDA = derive2 { name="OmicsLonDA"; version="1.10.0"; sha256="1vdnpsbpm4zyc17nah5qnlw66bihc7svqvbwgbxmyfp84c2vbxjy"; depends=[BiocGenerics BiocParallel ggplot2 gss plyr pracma SummarizedExperiment zoo]; }; Omixer = derive2 { name="Omixer"; version="1.4.0"; sha256="1pdsxcih642csqga7wy93bbhib2v08pywa8aw67zy7p62hvrxwim"; depends=[dplyr forcats ggplot2 gridExtra magrittr readr stringr tibble tidyselect]; }; - OmnipathR = derive2 { name="OmnipathR"; version="3.2.0"; sha256="1q89mxnp8cig9r1499g7fb9p9x9ryz1dmc3w6ps5ww9n6rl8jqk8"; depends=[checkmate crayon curl digest dplyr httr igraph jsonlite later logger magrittr progress purrr rappdirs readr readxl rlang stringr tibble tidyr tidyselect xml2 yaml]; }; + OmnipathR = derive2 { name="OmnipathR"; version="3.2.8"; sha256="0vr16ar3rbjsfw4qz2g86lbhvmqwgq0vcahc6vrc4d9rdjxwg6sb"; depends=[checkmate crayon curl digest dplyr httr igraph jsonlite later logger magrittr progress purrr rappdirs readr readxl rlang stringr tibble tidyr tidyselect xml2 yaml]; }; OncoScore = derive2 { name="OncoScore"; version="1.22.0"; sha256="0pva48qjbxibgk2wxpaxr4xfq9i8dxbml418wx2nrjj20dn2dhcv"; depends=[biomaRt]; }; OncoSimulR = derive2 { name="OncoSimulR"; version="3.2.0"; sha256="0dcx1qg42pxlcdpl07f53zkk32qpa8hd7fzdz5acvq3zm8yjmhlk"; depends=[car data_table dplyr ggplot2 ggrepel graph gtools igraph RColorBrewer Rcpp Rgraphviz smatr stringr]; }; OpenStats = derive2 { name="OpenStats"; version="1.6.0"; sha256="17gvfvii7z8w9l6w5p0i05374d6sw704w627fnasbrcmkfqnvwka"; depends=[AICcmodavg car Hmisc jsonlite knitr MASS nlme rlist summarytools]; }; @@ -713,7 +703,7 @@ in with self; { PSEA = derive2 { name="PSEA"; version="1.28.0"; sha256="14whd775m4pvf0mggrdw0jyz5wrhqdyj647qvrnkjnvnfkhivh1a"; depends=[Biobase MASS]; }; PSICQUIC = derive2 { name="PSICQUIC"; version="1.32.0"; sha256="0zqz9jyca75ahmkds61cl03i68n3v25n7nmfwc9niv23ikp18pj4"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; }; PWMEnrich = derive2 { name="PWMEnrich"; version="4.30.0"; sha256="16nphxfmfrxpf6w4xccpr132a7jz34nhjv0rg58n6n7kfsf9h4k7"; depends=[BiocGenerics Biostrings evd gdata S4Vectors seqLogo]; }; - PanVizGenerator = derive2 { name="PanVizGenerator"; version="1.22.0"; sha256="0rhx2jc5kc9bl00v16frh8b4075n0jqn4s37pkvqp3ypcbqws32d"; depends=[FindMyFriends igraph jsonlite pcaMethods shiny]; }; + PanVizGenerator = derive2 { name="PanVizGenerator"; version="1.22.0"; sha256="0rhx2jc5kc9bl00v16frh8b4075n0jqn4s37pkvqp3ypcbqws32d"; depends=[igraph jsonlite pcaMethods shiny]; }; Path2PPI = derive2 { name="Path2PPI"; version="1.24.0"; sha256="07a0z9islqnla01pmqni4a3l90iq1c4bwhycnarmdhhrcq4ms2v9"; depends=[igraph]; }; PathNet = derive2 { name="PathNet"; version="1.34.0"; sha256="1syd5k54jj74f39z871a9xc5snslmsv6h9f0lacpf8chcpbs47hy"; depends=[]; }; PathoStat = derive2 { name="PathoStat"; version="1.20.0"; sha256="0vaidkwnny60m0qpkraz6cnzmwm344niwk325dyqyc348r99bk1s"; depends=[ape BiocStyle ComplexHeatmap corpcor DESeq2 devtools dplyr DT edgeR ggplot2 glmnet gmodels knitr limma matrixStats phyloseq plotly plyr RColorBrewer rentrez reshape2 ROCR scales shiny shinyjs tidyr vegan webshot XML]; }; @@ -724,7 +714,7 @@ in with self; { PhenStat = derive2 { name="PhenStat"; version="2.30.0"; sha256="0b423kkbyyjk4ns4pdwh1lag2k0v7wn17h4l4aca3zkjrsf5522n"; depends=[car corrplot ggplot2 graph knitr lme4 logistf MASS msgps nlme nortest pingr reshape SmoothWin]; }; PhenoGeneRanker = derive2 { name="PhenoGeneRanker"; version="1.2.0"; sha256="1x5fbipgsiz2ipg9yh2r8wr8w1s6q01vq4149gjjxgx779xz250n"; depends=[doParallel dplyr foreach igraph Matrix]; }; PhosR = derive2 { name="PhosR"; version="1.4.0"; sha256="0ssfvc9qqj25j48srjjissq034f7giddx45w236yssaynw3ykslr"; depends=[BiocGenerics circlize dendextend dplyr e1071 GGally ggdendro ggplot2 ggpubr ggtext igraph limma network pcaMethods pheatmap preprocessCore RColorBrewer reshape2 rlang ruv S4Vectors SummarizedExperiment tidyr]; }; - PhyloProfile = derive2 { name="PhyloProfile"; version="1.8.3"; sha256="0mnfqbyarknjh6zxq399msl2kbqa1rnw7gqw6k3z2slal2x53ris"; depends=[ape BiocStyle bioDist Biostrings colourpicker data_table DT energy ExperimentHub ggplot2 gridExtra OmaDB pbapply plyr RColorBrewer RCurl shiny shinyBS shinyjs xml2 yaml zoo]; }; + PhyloProfile = derive2 { name="PhyloProfile"; version="1.8.6"; sha256="157g1xj5iwyy9zmgd26jwws2qwln79pkn2chg6rmj54kslk1shyg"; 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.6.0"; sha256="14bpqzwx59shx5467nj0g6wj58qh9zqhy1i9l1n1gk7wd52ig5ql"; 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.20.0"; sha256="1rdz2d5fy6gpdvzv5vfgxngwkag062i6bvvjqkyflabn0yijjpmi"; depends=[BiocStyle bnlearn C50 clusterProfiler DBI dplyr gdata ggplot2 GO_db graph impute MASS matrixStats openxlsx partykit pheatmap preprocessCore ReactomePA Rgraphviz WGCNA]; }; PloGO2 = derive2 { name="PloGO2"; version="1.6.0"; sha256="0i5b7nfifjx1ywvdq4mhvy3wzdg8cqdcc7sw1awsz9xfnrjnhcdp"; depends=[GO_db GOstats httr lattice openxlsx xtable]; }; @@ -732,19 +722,19 @@ in with self; { PoTRA = derive2 { name="PoTRA"; version="1.10.0"; sha256="0qqr9mjqhfk76pnpzd0hzxw180swqr9b1dhakj65lha5mha4vgid"; depends=[BiocGenerics graph graphite igraph org_Hs_eg_db]; }; PrInCE = derive2 { name="PrInCE"; version="1.10.0"; sha256="09fvk96zxj0bglbs8kgnbg3xxri2pial14g4kcsynaac0m2lmdyk"; depends=[Biobase dplyr forecast Hmisc LiblineaR magrittr MSnbase naivebayes progress purrr ranger Rdpack robustbase speedglm tester tidyr]; }; PrecisionTrialDrawer = derive2 { name="PrecisionTrialDrawer"; version="1.10.0"; sha256="1zr1jpbnjjrgrbm99n8182akp7xg75bf54gy0wc66r7dxj4vivfl"; depends=[BiocParallel biomaRt brglm cgdsr data_table DT GenomicRanges ggplot2 ggrepel googleVis httr IRanges jsonlite LowMACAAnnotation magrittr matrixStats RColorBrewer reshape2 S4Vectors shiny shinyBS stringr XML]; }; - Prostar = derive2 { name="Prostar"; version="1.26.2"; sha256="0wm9kmd3f4zwwn80b13n0am9vl2786pm9gl620qdc7s2pva9y1vc"; depends=[BiocManager colourpicker DAPAR DAPARdata data_table DT future highcharter htmlwidgets later promises R_utils rclipboard rhandsontable sass shiny shinyAce shinyBS shinycssloaders shinyjqui shinyjs shinythemes shinyTree shinyWidgets tibble webshot XML]; }; + Prostar = derive2 { name="Prostar"; version="1.26.4"; sha256="0488x3dsbfydymc7bvh70v77rc3gfqkc56ykvfalrzl85r9zmlk0"; depends=[BiocManager colourpicker DAPAR DAPARdata data_table DT future highcharter htmlwidgets later promises R_utils rclipboard rhandsontable sass shiny shinyAce shinyBS shinycssloaders shinyjqui shinyjs shinythemes shinyTree shinyWidgets tibble webshot XML]; }; ProtGenerics = derive2 { name="ProtGenerics"; version="1.26.0"; sha256="0x53pk7h47gjza1q5pz7jb1qqhwa9z2rr5fr61qc92zl3mqk57m0"; depends=[]; }; ProteoDisco = derive2 { name="ProteoDisco"; version="1.0.0"; sha256="14rizjlwf87qhi929b4vafjzvx7p112bsq0zb2wppxh3m7izs4zp"; 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.12.0"; sha256="1y7w6rs11kclh5nipnrh02ny12bgf2rkb2dghqcybl80s6r8m6bm"; depends=[biomaRt gdata ggplot2 ggrepel gtools matrixStats]; }; ProteomicsAnnotationHubData = derive2 { name="ProteomicsAnnotationHubData"; version="1.24.0"; sha256="0qs5hbx7pww7qxxaimp2xqvs3lwcd41ndls0xcvvlk7pnp4i4sk8"; depends=[AnnotationHub AnnotationHubData Biobase BiocManager Biostrings GenomeInfoDb MSnbase mzR RCurl]; }; PubScore = derive2 { name="PubScore"; version="1.6.0"; sha256="0b68pzz9iav2d18w6prpp4h6623mfm4qkp36mmr7jqd1ghgj4nc7"; depends=[dplyr ggplot2 ggrepel igraph intergraph network progress rentrez sna]; }; - PureCN = derive2 { name="PureCN"; version="2.0.1"; sha256="0527sfywa692pvj1kh6xvciryivmvyx1czq502rj3qi3abdqzwl8"; depends=[Biobase BiocGenerics Biostrings data_table DNAcopy futile_logger GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra IRanges Matrix mclust RColorBrewer rhdf5 Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VGAM]; }; + PureCN = derive2 { name="PureCN"; version="2.0.2"; sha256="0hc752ylpd30hjicj76hqf582akdp5ayh1g2rhvc14v2pin452w8"; depends=[Biobase BiocGenerics Biostrings data_table DNAcopy futile_logger GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra IRanges Matrix mclust RColorBrewer rhdf5 Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VGAM]; }; Pviz = derive2 { name="Pviz"; version="1.28.0"; sha256="0n5bgnhngb38fgrjbibjs7wvmrglrlsr62c27y7k7rqckyrpv21l"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; }; QDNAseq = derive2 { name="QDNAseq"; version="1.30.0"; sha256="1sza9br8agpdz1k9fn5wisir44sj8v0rk4wbx35d2c2kp9q70pqj"; depends=[Biobase CGHbase CGHcall DNAcopy future_apply GenomicRanges IRanges matrixStats R_utils Rsamtools]; }; QFeatures = derive2 { name="QFeatures"; version="1.4.0"; sha256="1rvdfs50hi4a6i9iah916c0yxl31yljs4k62mr839bi162zg4pj1"; depends=[AnnotationFilter Biobase BiocGenerics igraph IRanges lazyeval MsCoreUtils MultiAssayExperiment plotly ProtGenerics S4Vectors SummarizedExperiment]; }; QSutils = derive2 { name="QSutils"; version="1.12.0"; sha256="1qcxarsk9625xsms0fpmlkrpzfbj4rnd8m03k6h1n08imj6x8z4d"; depends=[ape BiocGenerics Biostrings psych]; }; QUBIC = derive2 { name="QUBIC"; version="1.22.0"; sha256="0arhrnn9mfcb3jppkxvv4a1g9rpziv53y9scin2gsk1qrqk17gfa"; depends=[biclust Matrix Rcpp RcppArmadillo]; }; - Qtlizer = derive2 { name="Qtlizer"; version="1.8.0"; sha256="1a9fq4qv9qsgfkddpxdgl0m879aprf1sijmys83lrx834kggzy02"; depends=[curl GenomicRanges httr stringi]; }; + Qtlizer = derive2 { name="Qtlizer"; version="1.8.1"; sha256="0jbk7jmxvxnya2myh0i6syii8cxk61fx5j431vk9rq4dcdylzxcs"; depends=[curl GenomicRanges httr stringi]; }; QuartPAC = derive2 { name="QuartPAC"; version="1.26.0"; sha256="01v4icdwfx9l1md2wxcwh3qn8m7lc133slwdlssa0f1h6r2f7w0g"; depends=[data_table GraphPAC iPAC SpacePAC]; }; QuasR = derive2 { name="QuasR"; version="1.34.0"; sha256="0d292xgaq8d3cdpa9anabda03lis46xc29iw9c5k5i3sj7dcr4g5"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicFiles GenomicRanges IRanges Rbowtie Rhtslib Rsamtools rtracklayer S4Vectors ShortRead]; }; QuaternaryProd = derive2 { name="QuaternaryProd"; version="1.28.0"; sha256="0ijig5jmh5b1dzsmibzij1hhdn4b3nz6rvjx9rdvk0rhs7nhh5c1"; depends=[dplyr Rcpp yaml]; }; @@ -803,7 +793,7 @@ in with self; { RTN = derive2 { name="RTN"; version="2.18.0"; sha256="0yjbvcaci77xbxkl35i03vdmd2ascaphv2lpagcib4wlj2qsg57y"; depends=[car data_table igraph IRanges limma minet mixtools pheatmap pwr RedeR S4Vectors snow SummarizedExperiment viper]; }; RTNduals = derive2 { name="RTNduals"; version="1.18.0"; sha256="1h646yysi879v1w60sc1f6wckyz788cq2psyihnp873k001yzgv9"; depends=[RTN]; }; RTNsurvival = derive2 { name="RTNsurvival"; version="1.18.0"; sha256="158ffqrysprfx5g5m9mc645bjcpdjr3cksl521jc4ak401va7l7l"; depends=[data_table dunn_test egg ggplot2 pheatmap RColorBrewer RTN RTNduals scales survival]; }; - RTopper = derive2 { name="RTopper"; version="1.40.0"; sha256="18x3qmqxh6y64bmp2a8d7f794inglx7mvaiva5rs04y26qlwww9s"; depends=[Biobase limma multtest]; }; + RTopper = derive2 { name="RTopper"; version="1.40.1"; sha256="1mdp498x90rvlq8v1mfs067r4vprliiqf30f3smqh1b2bljcfpcc"; depends=[Biobase limma multtest]; }; RUVSeq = derive2 { name="RUVSeq"; version="1.28.0"; sha256="1a19klscykdgsd7izcxyr45ml7g0gpdj65gvbaw124mal2p4zi9q"; depends=[Biobase EDASeq edgeR MASS]; }; RUVcorr = derive2 { name="RUVcorr"; version="1.26.0"; sha256="0va76nl1j4f5cs1d7cxz2gx7v80r42ia178c9nb2fb91lmahalsn"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; }; RUVnormalize = derive2 { name="RUVnormalize"; version="1.28.0"; sha256="1yqnp1fpln7g4h20fikr9hh7x80s93pdip9g612m0djp5p2xlvlx"; depends=[Biobase RUVnormalizeData]; }; @@ -848,10 +838,9 @@ in with self; { Ringo = derive2 { name="Ringo"; version="1.58.0"; sha256="0bjsyp6gsdgny0jg363z46sihqmv0xka7mzzkv1gjhiyk7zh8gs6"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; }; Risa = derive2 { name="Risa"; version="1.36.0"; sha256="0fmdsl86swj1sv6j4g3ljbcxp6xqnnxjpzqabjyzbicl3flmqcyv"; depends=[affy Biobase biocViews Rcpp xcms]; }; Rmagpie = derive2 { name="Rmagpie"; version="1.50.0"; sha256="0yn1v4z25ifb00xg3mp0ajskv8502yl317pj2j04ax62qny95ykg"; depends=[Biobase e1071 kernlab pamr]; }; - RmiR = derive2 { name="RmiR"; version="1.49.0"; sha256="16nwh4a97qvyicm4f102xs52lx8cld0b80fykgil86kkd6v8zlja"; depends=[DBI RmiR_Hs_miRNA]; }; Rmmquant = derive2 { name="Rmmquant"; version="1.12.0"; sha256="0wklqi37jgdfsf26zgfhq0rvb6xvg4v9z197mcwirqp7y1jm8rmm"; depends=[BiocStyle DESeq2 devtools GenomicRanges org_Mm_eg_db Rcpp S4Vectors SummarizedExperiment TBX20BamSubset TxDb_Mmusculus_UCSC_mm9_knownGene]; }; RnBeads = derive2 { name="RnBeads"; version="2.12.2"; sha256="042bh4p567xkwqn0hxqji7mk0lhbh0vxdrrhcpya22yyrs1716d0"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr S4Vectors]; }; - RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="2.4.0"; sha256="04zf30583wdn2q7wnj3hp81sa1h4dhd6yvl22sj0yxdqw919jvrj"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp RnaSeqSampleSizeData]; }; + RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="2.4.1"; sha256="1rmzgvkf3vpdpjx792lcgk3j0br5mbp36cb0hzz5y10fn8qxyml8"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp RnaSeqSampleSizeData]; }; Rnits = derive2 { name="Rnits"; version="1.28.0"; sha256="0wzg0wq0kyarl6s8lmmd6nkqfvvph46bvd4wxh5zy94zqbad7q0b"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; }; RpsiXML = derive2 { name="RpsiXML"; version="2.36.0"; sha256="19jc5dhwyy2z1cwbvgvw54v7kkbgh7g0wzy4frxv91zdgaj7wmhy"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; }; Rqc = derive2 { name="Rqc"; version="1.28.0"; sha256="0hcxkrfja0gmd8r2llijdvaw2xiiplk037305inimz0qna6w2071"; depends=[BiocGenerics BiocParallel BiocStyle Biostrings biovizBase GenomicAlignments GenomicFiles ggplot2 IRanges knitr markdown plyr Rcpp reshape2 Rsamtools S4Vectors shiny ShortRead]; }; @@ -868,7 +857,7 @@ in with self; { SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.36.0"; sha256="16d161x1npa4lh6ckp0p9ykdrj3x36gsylmq1kjm2vw8g4zknszv"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; }; SCANVIS = derive2 { name="SCANVIS"; version="1.8.0"; sha256="08cpq7cklv1z108cy0d6abv8xq8ins4ihdwzr04fr8bg2ikbi21z"; depends=[IRanges plotrix RCurl rtracklayer]; }; SCATE = derive2 { name="SCATE"; version="1.4.0"; sha256="1b04bggi0rw9jmgak5j2ca6msqdrq1qdphg3g9w77a1rqyxza86s"; depends=[GenomicAlignments GenomicRanges mclust preprocessCore Rtsne SCATEData splines2 xgboost]; }; - SCArray = derive2 { name="SCArray"; version="1.2.0"; sha256="1jji2cikxkc40zaqwcknrpz5a6nyrqhbirx5ivsdnwslm8l79xmk"; depends=[BiocGenerics DelayedArray DelayedMatrixStats gdsfmt IRanges S4Vectors SingleCellExperiment SummarizedExperiment]; }; + SCArray = derive2 { name="SCArray"; version="1.2.1"; sha256="1p69m8jp3fz71a726h2r8zjgxj01bbsnnjz9714siz6awswm816l"; depends=[BiocGenerics DelayedArray DelayedMatrixStats gdsfmt IRanges S4Vectors SingleCellExperiment SummarizedExperiment]; }; SCBN = derive2 { name="SCBN"; version="1.12.0"; sha256="19jpbr5nr59dc9khbbx60gzbsg8llfd1zqwb9v88nr43v059k13f"; depends=[]; }; SCFA = derive2 { name="SCFA"; version="1.4.0"; sha256="1850c78niv5hp3c6axi5nmv4qawqca1ip3xppp2nar8f9xiqjd6l"; depends=[BiocParallel cluster clusterCrit glmnet igraph keras Matrix matrixStats psych RhpcBLASctl survival tensorflow]; }; SCOPE = derive2 { name="SCOPE"; version="1.6.0"; sha256="01sj416q0qzpji7k34xz37l4955fa3l2imms96k8zz1gs2a1xm3j"; depends=[BiocGenerics Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 DescTools DNAcopy doParallel foreach GenomeInfoDb GenomicRanges gplots IRanges RColorBrewer Rsamtools S4Vectors]; }; @@ -885,7 +874,7 @@ in with self; { SIMD = derive2 { name="SIMD"; version="1.12.0"; sha256="0bsp7ma0c9j9k3agxchyp54kp126qjvgmaqgi2flgmgwnmkwwbii"; depends=[edgeR methylMnM statmod]; }; SIMLR = derive2 { name="SIMLR"; version="1.20.0"; sha256="19vhv7j29hiimznazpz986api12ry6pd8cgpkwrnwybr4gdvkm7c"; depends=[Matrix pracma Rcpp RcppAnnoy RSpectra]; }; SISPA = derive2 { name="SISPA"; version="1.24.0"; sha256="1gzcc2vq9wvsh92lp80y0dlsi67bws6ng76ab2a4ak1n2lqhm7ak"; depends=[changepoint data_table genefilter ggplot2 GSVA plyr]; }; - SLGI = derive2 { name="SLGI"; version="1.54.0"; sha256="03jwdq4k44rys3f773c6l985a6v1bacbdghw97p0qpwspmzra8rs"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice ScISI]; }; + SLGI = derive2 { name="SLGI"; version="1.54.0"; sha256="03jwdq4k44rys3f773c6l985a6v1bacbdghw97p0qpwspmzra8rs"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice]; }; SLqPCR = derive2 { name="SLqPCR"; version="1.60.0"; sha256="1sy722nw7fax0m9nnv2d3gy9g5fc4x2xfar521x7x7psfydmy5b6"; depends=[]; }; SMAD = derive2 { name="SMAD"; version="1.10.0"; sha256="1l0x22cg14aj40039jzw1yl3cncil91nv97y9sqs54ay8rvyr5aj"; depends=[dplyr magrittr Rcpp RcppAlgos tidyr]; }; SMAP = derive2 { name="SMAP"; version="1.58.0"; sha256="03fdxaqsxjdq93xazw8rgv22smdwr0ji1rcf6rk20a0p0wvrdpxh"; depends=[]; }; @@ -905,11 +894,10 @@ in with self; { SRAdb = derive2 { name="SRAdb"; version="1.56.0"; sha256="18z62c2w6spsmnyqcmc57w41vli5vrcrl3hpy1al1n1yy9fgil0y"; depends=[GEOquery graph RCurl RSQLite]; }; STAN = derive2 { name="STAN"; version="2.22.0"; sha256="1inqjw11a791c6svw0y4p3m8rd09fjcna3j4p5950f975aph1q4g"; depends=[BiocGenerics GenomeInfoDb GenomicRanges Gviz IRanges poilog Rsolnp S4Vectors]; }; STATegRa = derive2 { name="STATegRa"; version="1.30.0"; sha256="10a230bvfjvjwsjkh0v3fjbrjkwcvsdch8bfv1s6h4yav1m4wca7"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; }; - STRINGdb = derive2 { name="STRINGdb"; version="2.6.0"; sha256="1hvb73anhbf1g82nn5m11s783z6ihvlavf7p30w29qggxggnl6lm"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; }; + STRINGdb = derive2 { name="STRINGdb"; version="2.6.1"; sha256="14yn0fi6ghlv41z5vk4wvrx51hlpx7z9k5fk5jyb50l2g8wwzjhi"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; }; STROMA4 = derive2 { name="STROMA4"; version="1.18.0"; sha256="10v8kgmx79zd2vgzwij3il80l724sdl0k4a3rm73kd4jw2wvhkrh"; depends=[Biobase BiocParallel cluster matrixStats]; }; SWATH2stats = derive2 { name="SWATH2stats"; version="1.24.0"; sha256="0ifl1y3rs0r2zqkpcpiibyv12mjqz6wxs296f691k1qfz9qvx8kg"; depends=[biomaRt data_table ggplot2 reshape2]; }; SamSPECTRAL = derive2 { name="SamSPECTRAL"; version="1.48.0"; sha256="1xxz5ggxj10psrz5rm0xjr8mxwc3cfyl9chsa9w2wxrrixypdnah"; depends=[]; }; - ScISI = derive2 { name="ScISI"; version="1.65.0"; sha256="0q3bbfsink5d8xslhp129qwvlq5mdzw8zkv9msd0q8qmkclsbiz1"; depends=[annotate AnnotationDbi apComplex GO_db org_Sc_sgd_db RpsiXML]; }; Scale4C = derive2 { name="Scale4C"; version="1.16.0"; sha256="0gw89mnnpspi5y03ck8gqinnwbkykmf2k65gxm8m9j4l63gg33m8"; depends=[GenomicRanges IRanges smoothie SummarizedExperiment]; }; ScaledMatrix = derive2 { name="ScaledMatrix"; version="1.2.0"; sha256="0vz8441gl5gycy1ypybwhq97bnyvhhlg6gxpi1dsdy2c9b6d81kc"; depends=[DelayedArray Matrix S4Vectors]; }; Sconify = derive2 { name="Sconify"; version="1.14.0"; sha256="0dan0nbar8f5x6l7cwlx4f4yycpxj3j3f0xx3nfm8n07g1gbcf04"; depends=[dplyr flowCore FNN ggplot2 magrittr readr Rtsne tibble]; }; @@ -929,7 +917,7 @@ in with self; { SingleCellExperiment = derive2 { name="SingleCellExperiment"; version="1.16.0"; sha256="01075vbs8hy399pxalav9rbkz4djvl84ip559jkz51fypd0m4i39"; depends=[BiocGenerics DelayedArray GenomicRanges S4Vectors SummarizedExperiment]; }; SingleCellSignalR = derive2 { name="SingleCellSignalR"; version="1.6.0"; sha256="1iw9yis5d6m2bzqkyncz5cy49rncnjrbzwah4c3il8aq5a21hrfh"; depends=[BiocManager circlize data_table edgeR foreach gplots igraph limma multtest pheatmap Rtsne scran SIMLR stringr]; }; SingleMoleculeFootprinting = derive2 { name="SingleMoleculeFootprinting"; version="1.2.0"; sha256="0abaxk5ck81libsfhy1w9jx1jjf7cix7znl2gydh2fd5qaafzfd3"; depends=[BiocGenerics Biostrings BSgenome data_table GenomeInfoDb GenomicRanges IRanges plyr QuasR RColorBrewer]; }; - SingleR = derive2 { name="SingleR"; version="1.8.0"; sha256="19lsn3cpghkhfbx4jqgbwwrnacrl7vj3r91ymd1gk02c9pn5dmci"; depends=[beachmat BiocNeighbors BiocParallel BiocSingular DelayedArray DelayedMatrixStats Matrix Rcpp S4Vectors SummarizedExperiment]; }; + SingleR = derive2 { name="SingleR"; version="1.8.1"; sha256="0j0h6ipm65wv38qx40z16h01mfirpshfn4lhlwlg2nri4vmihlpi"; depends=[beachmat BiocNeighbors BiocParallel BiocSingular DelayedArray DelayedMatrixStats Matrix Rcpp S4Vectors SummarizedExperiment]; }; SomaticSignatures = derive2 { name="SomaticSignatures"; version="2.30.0"; sha256="1dxzfkvljnydv7kfybfa52dwcbkkci2r8gjspjf90k2bxf10phql"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; }; SpacePAC = derive2 { name="SpacePAC"; version="1.32.0"; sha256="1pgpfxyw621f7ljwy4y6q9fdlk263b4rwz9vg1f2h61nz097nk2l"; depends=[iPAC]; }; Spaniel = derive2 { name="Spaniel"; version="1.8.0"; sha256="0js302hgxn0q9xy7s6pdxidvhfcvm711bci6cw3a3bwhq2kacvnc"; depends=[dplyr DropletUtils ggplot2 igraph jpeg jsonlite magrittr png S4Vectors scater scran Seurat shiny SingleCellExperiment SummarizedExperiment]; }; @@ -938,7 +926,7 @@ in with self; { SpatialDecon = derive2 { name="SpatialDecon"; version="1.4.3"; sha256="11hb28m7h78cvzz9s545jzssnbxjbhfmdb03rxbvxq1rdh0whljr"; depends=[Biobase GeomxTools Matrix repmis SeuratObject]; }; SpatialExperiment = derive2 { name="SpatialExperiment"; version="1.4.0"; sha256="1jn2xr51hv1pm53pgsilhbwal0bnz7mc17z5plpjxgh7jn9bx4x2"; depends=[BiocFileCache BiocGenerics DropletUtils magick rjson S4Vectors SingleCellExperiment SummarizedExperiment]; }; SpeCond = derive2 { name="SpeCond"; version="1.48.0"; sha256="1mpzf9l7yim59wfg244rzqxm9vb10lp88688p5v2whcv5xx0a34a"; depends=[Biobase fields hwriter mclust RColorBrewer]; }; - Spectra = derive2 { name="Spectra"; version="1.4.1"; sha256="01vaxhk1xz54wxcywnsx8z3qbjchg1i8rv0ks7i2c72sqmamhajc"; depends=[BiocGenerics BiocParallel fs IRanges MsCoreUtils ProtGenerics S4Vectors]; }; + Spectra = derive2 { name="Spectra"; version="1.4.3"; sha256="0dyjczbvyxx86rqw8h2svgx5ridil7nwb7lj675j8vgj5dcn0rza"; depends=[BiocGenerics BiocParallel fs IRanges MsCoreUtils ProtGenerics S4Vectors]; }; SpectralTAD = derive2 { name="SpectralTAD"; version="1.10.0"; sha256="00yx87zkyyzpzkm9slmhs78pqivcfladsrnvh3wwlkgi2rky7qps"; depends=[BiocParallel cluster dplyr GenomicRanges HiCcompare magrittr Matrix PRIMME]; }; SpidermiR = derive2 { name="SpidermiR"; version="1.24.0"; sha256="1mwqfg5vgc262bhjnbhn8yvjgmqyafc9kzln1a5pidpj5gyr757q"; depends=[AnnotationDbi gdata ggplot2 gplots gridExtra httr igraph lattice latticeExtra MAGeCKFlute miRNAtap miRNAtap_db org_Hs_eg_db TCGAbiolinks]; }; SplicingFactory = derive2 { name="SplicingFactory"; version="1.2.0"; sha256="0gdk14591slhwnb6rpnksdirzgd7ga03sqkr3k7wndgk5h6dp2jb"; depends=[SummarizedExperiment]; }; @@ -959,7 +947,7 @@ in with self; { TAPseq = derive2 { name="TAPseq"; version="1.6.0"; sha256="0y40z1xpqif09yins9jf4k0h7wljdf3qwgzykxcq5lfgns66cx91"; depends=[BiocGenerics BiocParallel Biostrings BSgenome dplyr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges S4Vectors tidyr]; }; TBSignatureProfiler = derive2 { name="TBSignatureProfiler"; version="1.6.0"; sha256="0sdgbkg0mv742y9b7frp4i2zrknfw87ghz6wvw4w0y0gjrbasj9r"; depends=[ASSIGN BiocGenerics BiocParallel ComplexHeatmap DESeq2 DT edgeR gdata ggplot2 GSVA magrittr RColorBrewer reshape2 rlang ROCit S4Vectors singscore SummarizedExperiment]; }; TCC = derive2 { name="TCC"; version="1.34.0"; sha256="0298zfvrs7x6050s3222fg5yp60siz85pfh6541wmah7j0wzpgsd"; depends=[baySeq DESeq2 edgeR ROC]; }; - TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.22.2"; sha256="0l7hfwgd8aiqv2k98jchkr3sdp9hwdg7pzm3bnvr6k7p93ifr6wc"; 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]; }; + TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.22.4"; sha256="071wz6dm6dypbfzvxd6j67l1iawlb6d5sfzq871zh06fzaxjm332"; 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]; }; TCGAbiolinksGUI = derive2 { name="TCGAbiolinksGUI"; version="1.20.0"; sha256="0941xcd42kz72vlhlm93681dwgi4afli5j8cfs331fpddpv7l4af"; depends=[caret clusterProfiler colourpicker data_table downloader DT ELMER ggplot2 ggrepel maftools pathview plotly readr sesame shiny shinyBS shinydashboard shinyFiles shinyjs stringr SummarizedExperiment TCGAbiolinks TCGAbiolinksGUI_data]; }; TCGAutils = derive2 { name="TCGAutils"; version="1.14.0"; sha256="0gjmgz20hmy8c7igy5xvwql37k0v7662qkxwsc2vi01x6y781bcj"; depends=[AnnotationDbi BiocGenerics GenomeInfoDb GenomicDataCommons GenomicFeatures GenomicRanges IRanges MultiAssayExperiment RaggedExperiment rvest S4Vectors stringr SummarizedExperiment xml2]; }; TCseq = derive2 { name="TCseq"; version="1.18.0"; sha256="1kzz3fl19d1ivb6l55xadwg202vq4wza3r7wgf6fx196s20vnvng"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; }; @@ -973,7 +961,7 @@ in with self; { TIN = derive2 { name="TIN"; version="1.26.0"; sha256="07m8q3lgcflmrchpw88y4w62iwq5cxd0sw1lbassvgych7dnq3ks"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; }; TMixClust = derive2 { name="TMixClust"; version="1.16.0"; sha256="1i69q92ss9q2vv6hyxvq8wv55w1937rmda43a8qfblzy0jr5avww"; depends=[Biobase BiocParallel cluster flexclust gss mvtnorm SPEM zoo]; }; TNBC_CMS = derive2 { name="TNBC.CMS"; version="1.10.0"; sha256="1iz2jb895hsliavk9g93mvvccla461cmifmsam3qdscj09gfl17x"; depends=[e1071 forestplot GGally ggplot2 ggpubr GSVA pheatmap pracma quadprog R_utils RColorBrewer SummarizedExperiment survival]; }; - TOAST = derive2 { name="TOAST"; version="1.7.1"; sha256="1r0kpk6i1b5r5swp4l5yw8mid719li4yqa82p9kzmgg7z0xxvmaz"; depends=[corpcor EpiDISH limma nnls SummarizedExperiment]; }; + TOAST = derive2 { name="TOAST"; version="1.8.2"; sha256="1j0a3ll0mkp0jgw8hfl8xs5yj4baqjxfvg09zb8sh82jim1my77z"; depends=[corpcor doParallel EpiDISH GGally ggplot2 limma nnls quadprog SummarizedExperiment tidyr]; }; TPP = derive2 { name="TPP"; version="3.22.1"; sha256="0vr8sv22rhhrv63arz33vbkp5i3cwd03bz54qwx3zbdcf5l3snhy"; depends=[Biobase biobroom broom data_table doParallel dplyr foreach futile_logger ggplot2 gridExtra knitr limma magrittr MASS mefa nls2 openxlsx plyr purrr RColorBrewer RCurl reshape2 rmarkdown stringr tibble tidyr VennDiagram VGAM]; }; TPP2D = derive2 { name="TPP2D"; version="1.10.0"; sha256="183gf3v1nj0nqll817whxdif0kiwscil88ig0vjj1hn3936q59v6"; depends=[BiocParallel doParallel dplyr foreach ggplot2 limma MASS openxlsx RCurl stringr tidyr]; }; TRESS = derive2 { name="TRESS"; version="1.0.0"; sha256="0zmzbpzhcsykbpifs5m8md2lhami0ya7y9sf2rdmadgbx17gvzj7"; depends=[AnnotationDbi GenomicFeatures GenomicRanges IRanges Matrix matrixStats Rsamtools rtracklayer S4Vectors]; }; @@ -985,7 +973,7 @@ in with self; { TarSeqQC = derive2 { name="TarSeqQC"; version="1.24.0"; sha256="0303kqwgs442vf0j0rpw15qjk6snvayd9rrjbll8gjnv34xzmw7d"; depends=[BiocGenerics BiocParallel Biostrings cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 Hmisc IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; }; TargetDecoy = derive2 { name="TargetDecoy"; version="1.0.0"; sha256="0bvby24gqwkxmcq0d9c5ix5kx1svc59vcil5xv0fmsdzp9bgv4c4"; depends=[ggplot2 ggpubr mzID mzR]; }; TargetScore = derive2 { name="TargetScore"; version="1.32.0"; sha256="15yh0ms1i38541kf7lxjk3xs9gpm4ixaykq6mhn572slkxdx737y"; depends=[Matrix pracma]; }; - TargetSearch = derive2 { name="TargetSearch"; version="1.50.0"; sha256="0ikwbgrjp8i5g27acs4qzr8v7gzky209w3zdb6877y9hpvl5kvyv"; depends=[assertthat ncdf4]; }; + TargetSearch = derive2 { name="TargetSearch"; version="1.50.1"; sha256="1l84lajyrx9x6b3spbjc3zf83bmy4s5qv1a3hz8i56pc9wmqpfyz"; depends=[assertthat ncdf4]; }; TileDBArray = derive2 { name="TileDBArray"; version="1.4.0"; sha256="007qdq6w0i9b2mbcdbdjm62nzwy15scsxml6fqr0fwgzjfzvzb0z"; depends=[DelayedArray Rcpp S4Vectors tiledb]; }; TimeSeriesExperiment = derive2 { name="TimeSeriesExperiment"; version="1.12.0"; sha256="0fphnkkd3i7zf33a9lhw95n80vzv1z7fmn7mhrfb949yz4jdvk7d"; depends=[DESeq2 dplyr dynamicTreeCut edgeR ggplot2 Hmisc limma magrittr proxy S4Vectors SummarizedExperiment tibble tidyr vegan viridis]; }; TimiRGeN = derive2 { name="TimiRGeN"; version="1.4.0"; sha256="1lpvw24gnm1rdl4p2vxh07z82x7wcwcpmak7rjh3yq409lwi72i0"; depends=[biomaRt clusterProfiler dplyr FreqProf ggdendro gghighlight ggplot2 gplots gtools igraph Mfuzz MultiAssayExperiment RCy3 readxl reshape2 rWikiPathways scales stringr tidyr]; }; @@ -1023,7 +1011,6 @@ in with self; { ViSEAGO = derive2 { name="ViSEAGO"; version="1.8.0"; sha256="0chb10y97j7kv00i4wbnkxyd7iwf28ybdnkd4ijsamf7ddl814hq"; 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]; }; VplotR = derive2 { name="VplotR"; version="1.4.0"; sha256="0ahf7nqxymx46w3rs8qq6jpvw41avzmssw7apnax13x9gn29kbg6"; depends=[cowplot GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges magrittr RColorBrewer reshape2 Rsamtools S4Vectors zoo]; }; Wrench = derive2 { name="Wrench"; version="1.12.0"; sha256="1vzv7sswijgb8nq58yrc19wlw2nnpjvans86fqqzs4p8wvq8j06n"; depends=[limma locfit matrixStats]; }; - XCIR = derive2 { name="XCIR"; version="1.7.0"; sha256="0n42pw01wv1sk06hby9kwijx6zwaw4lrlpsa0wlkrkf323slkllw"; depends=[biomaRt data_table ggplot2 IRanges readxl S4Vectors seqminer VariantAnnotation]; }; XDE = derive2 { name="XDE"; version="2.40.0"; sha256="0f7liqy2gf6ka7wjj591yi8805m3nn21c440vz9iqsanszxnsi6q"; depends=[Biobase BiocGenerics genefilter GeneMeta gtools mvtnorm RColorBrewer siggenes]; }; XINA = derive2 { name="XINA"; version="1.12.0"; sha256="14j1rn3p7i0rlqkbbg0a6pyhb97ifzvsbw6vfxw9pna7zv7rbhsp"; depends=[alluvial ggplot2 gridExtra igraph mclust plyr STRINGdb]; }; XNAString = derive2 { name="XNAString"; version="1.2.2"; sha256="0rc02n3dijcmfj9dr02zlvqr38vmjy3w2drj2fg8i7yrhqp51a9l"; depends=[Biostrings BSgenome data_table formattable future_apply GenomicRanges IRanges Rcpp S4Vectors stringi stringr]; }; @@ -1060,7 +1047,7 @@ in with self; { amplican = derive2 { name="amplican"; version="1.16.0"; sha256="1p4n0bm4hsw20iyxghnc7k06q2w3hs044zsyl5ysd9xxiggi628l"; depends=[BiocGenerics BiocParallel Biostrings clusterCrit data_table dplyr GenomeInfoDb GenomicRanges ggplot2 ggthemes gridExtra gtable IRanges knitr Matrix matrixStats Rcpp rmarkdown S4Vectors ShortRead stringr waffle]; }; animalcules = derive2 { name="animalcules"; version="1.10.0"; sha256="0l7lyw1a51piq20lh49ss4c2i75lrs1xq532jgf65n8vkm8asc88"; depends=[ape assertthat biomformat caret covr DESeq2 dplyr DT forcats ggplot2 glmnet GUniFrac lattice limma magrittr Matrix MultiAssayExperiment plotly plotROC rentrez reshape2 S4Vectors scales shiny shinyjs SummarizedExperiment tibble tsne umap vegan XML]; }; annaffy = derive2 { name="annaffy"; version="1.66.0"; sha256="0crj37v571005brdd0ypfx2a7d1f829xxj2hahp2gy8aj9xm4s8l"; depends=[AnnotationDbi Biobase BiocManager DBI GO_db]; }; - annmap = derive2 { name="annmap"; version="1.36.0"; sha256="0j8zvg3670dg0smyrdwsc42h64n4c6rm855zawlwgchx3vdgb8gn"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; }; + annmap = derive2 { name="annmap"; version="1.36.99"; sha256="1q129ah96d1vz5d73a5xngz0fzh2zvq793xxha80r3lx2bgld7an"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; }; annotate = derive2 { name="annotate"; version="1.72.0"; sha256="0p7q5hdk7003q72vg4hrgdzn463spybxhrkvcq3a6l6jkgy9sf84"; depends=[AnnotationDbi Biobase BiocGenerics DBI httr XML xtable]; }; annotationTools = derive2 { name="annotationTools"; version="1.68.0"; sha256="0grdswbf8nj0qwl0n5pqsir9242dry85j6m688j81gwwjgmzidvh"; depends=[Biobase]; }; annotatr = derive2 { name="annotatr"; version="1.20.0"; sha256="1ha2wn56cdab4p3wdwv4xlqjsgl7sd8phbx71qbclrbdwpq2mi7i"; depends=[AnnotationDbi AnnotationHub dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges readr regioneR reshape2 rtracklayer S4Vectors]; }; @@ -1069,20 +1056,20 @@ in with self; { antiProfiles = derive2 { name="antiProfiles"; version="1.34.0"; sha256="0h9jvb579vy8744mmhg5m7964f24pwm4v02fivxq0z06ccbm79dm"; depends=[locfit matrixStats]; }; apComplex = derive2 { name="apComplex"; version="2.60.0"; sha256="09014csh7wic7hsjri45ply2fkg93gq7xp4ckaj0yr4invjrw3m3"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; }; apeglm = derive2 { name="apeglm"; version="1.16.0"; sha256="11w4vyc1sllmm5lh42krhidazid78n4s3lhikpy9kk2l57jmifbr"; depends=[emdbook GenomicRanges Rcpp RcppEigen RcppNumerical SummarizedExperiment]; }; - appreci8R = derive2 { name="appreci8R"; version="1.12.0"; sha256="10sxxsp1c3mmhf4pgqb71vpj3izy16dcm30gklw5axkv45lkpp7f"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 COSMIC_67 DT GenomicFeatures GenomicRanges GenomicScores Homo_sapiens IRanges MafDb_1Kgenomes_phase3_hs37d5 MafDb_ExAC_r1_0_hs37d5 MafDb_gnomADex_r2_1_hs37d5 openxlsx PolyPhen_Hsapiens_dbSNP131 rentrez Rsamtools rsnps S4Vectors seqinr shiny shinyjs SIFT_Hsapiens_dbSNP137 SNPlocs_Hsapiens_dbSNP144_GRCh37 stringr SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation XtraSNPlocs_Hsapiens_dbSNP144_GRCh37]; }; + appreci8R = derive2 { name="appreci8R"; version="1.12.1"; sha256="15dp3arq80cmqnbd7qnca7liy5hrmm96f5x9z1y9zkhpr0q6jpgv"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 COSMIC_67 DT GenomicFeatures GenomicRanges GenomicScores Homo_sapiens IRanges MafDb_1Kgenomes_phase3_hs37d5 MafDb_ExAC_r1_0_hs37d5 MafDb_gnomADex_r2_1_hs37d5 openxlsx PolyPhen_Hsapiens_dbSNP131 rentrez Rsamtools rsnps S4Vectors seqinr shiny shinyjs SIFT_Hsapiens_dbSNP137 SNPlocs_Hsapiens_dbSNP144_GRCh37 stringr SummarizedExperiment TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation XtraSNPlocs_Hsapiens_dbSNP144_GRCh37]; }; aroma_light = derive2 { name="aroma.light"; version="3.24.0"; sha256="12qa85hsp8d1xhgn27iymknbhpnp9bd7hsgqxwvp1i8kki06z5hp"; depends=[matrixStats R_methodsS3 R_oo R_utils]; }; arrayMvout = derive2 { name="arrayMvout"; version="1.52.0"; sha256="180bdk6p1lmd24ihc90b8r6dgr0vgclassgzblnwd95ya68a25xq"; depends=[affy affyContam Biobase lumi mdqc parody]; }; arrayQuality = derive2 { name="arrayQuality"; version="1.72.0"; sha256="1qlg9xb17sgxfbsnxqs48qzmxc5fhchv5sszxxafkjd0pbfzkllv"; depends=[gridBase hexbin limma marray RColorBrewer]; }; arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.50.0"; sha256="034xdnqvgwqy1wh17mmjzmhzj0iy8sdx4al0ngdxdfnxcjk4gfny"; depends=[affy affyPLM beadarray Biobase genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG svglite vsn XML]; }; artMS = derive2 { name="artMS"; version="1.12.0"; sha256="0gaxd759zv273jh15l5zifh7k995sx8yda097lhjafdph7jmf0nh"; depends=[AnnotationDbi bit64 circlize cluster corrplot data_table dplyr getopt ggdendro ggplot2 ggrepel gplots limma MSstats openxlsx org_Hs_eg_db pheatmap plotly plyr RColorBrewer scales seqinr stringr tidyr UpSetR VennDiagram yaml]; }; atSNP = derive2 { name="atSNP"; version="1.10.0"; sha256="0yy731ivpcrmjwpljxzvlk7n2pygydw2q58gq90d1midch1nf0lx"; depends=[BiocFileCache BiocParallel BSgenome data_table ggplot2 lifecycle motifStack rappdirs Rcpp testthat]; }; - atena = derive2 { name="atena"; version="1.0.1"; sha256="0v7asl17wvdj5qbss2kpkb2xvkmlxf04f7f1cmkzk8kv0xa9qa1h"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Matrix Rsamtools S4Vectors sparseMatrixStats SQUAREM SummarizedExperiment]; }; + atena = derive2 { name="atena"; version="1.0.5"; sha256="0w593x10xls1ypbagdwb7cpfjfdxcd98rm7c4i09qg5zdrwad476"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Matrix Rsamtools S4Vectors sparseMatrixStats SQUAREM SummarizedExperiment]; }; attract = derive2 { name="attract"; version="1.46.0"; sha256="1vh6wgi6wmjry25khzbq32s67jjn581zjhhfqbl7y2dkfq2fvybf"; depends=[AnnotationDbi Biobase cluster GOstats KEGGREST limma org_Hs_eg_db reactome_db]; }; autonomics = derive2 { name="autonomics"; version="1.2.0"; sha256="1j0nsbdw7sahy031bvp8pg8a1fg7ql0is65d0mfh8345lbmr29sn"; depends=[abind assertive BiocFileCache BiocGenerics colorspace data_table edgeR ggplot2 ggrepel gridExtra limma magrittr matrixStats MultiAssayExperiment pcaMethods R_utils rappdirs readxl rlang S4Vectors scales stringi SummarizedExperiment tidyr]; }; awst = derive2 { name="awst"; version="1.2.0"; sha256="0qxi4f7ngfsx17q9szhl95bhihcfx36bw4n175zyfdnac6cb9kap"; depends=[SummarizedExperiment]; }; bacon = derive2 { name="bacon"; version="1.22.0"; sha256="13dhma34j9ggryainn4x6qvd3hphpxks5gf0mysia00r9hhpwwlc"; depends=[BiocParallel ellipse ggplot2]; }; ballgown = derive2 { name="ballgown"; version="2.26.0"; sha256="0fiky82arvgzgxrm4bqn74m5kngqpdaqf6ks4cr89nlnhfq0v6rf"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; }; - bambu = derive2 { name="bambu"; version="2.0.1"; sha256="0bzbaw57syaw2c8d4484dl229brw2d33105ak6krjpl9kd6av9y9"; depends=[BiocGenerics BiocParallel data_table dplyr GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rcpp RcppArmadillo Rsamtools S4Vectors SummarizedExperiment tidyr xgboost]; }; + bambu = derive2 { name="bambu"; version="2.0.6"; sha256="049pc2npfzmlxpnypi5gfvick5jq6yj6clwy388ijz9g3b50x5d9"; 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.26.0"; sha256="03m3yaagplh7j4q5hp3cfcdqwsnh1pwrlla9cv3ajnfd83s8ncqv"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; }; banocc = derive2 { name="banocc"; version="1.18.0"; sha256="0p5v601j1lkgh9prlvalp3xpqw87xq7ql0bak212443n15pfj3a4"; depends=[coda mvtnorm rstan stringr]; }; barcodetrackR = derive2 { name="barcodetrackR"; version="1.2.0"; sha256="1z7sj2ykp34g9bf0x0s3qavrprbiaksgk5r4hsakb24jjbi65jnh"; depends=[circlize cowplot dplyr ggdendro ggplot2 ggridges magrittr plyr proxy RColorBrewer rlang S4Vectors scales shiny SummarizedExperiment tibble tidyr vegan viridis]; }; @@ -1114,7 +1101,7 @@ in with self; { biodbKegg = derive2 { name="biodbKegg"; version="1.0.0"; sha256="16xmm3ymzd4jf55plahbxi844hpv0hpqq6v2ygcjf6wrs0yy2mhd"; depends=[biodb chk lifecycle R6]; }; biodbLipidmaps = derive2 { name="biodbLipidmaps"; version="1.0.1"; sha256="14086f88r7mavpzp823mhpi4b9zq8q2kqxlwnmp02i03jj8mjnr8"; depends=[biodb lifecycle R6]; }; biodbUniprot = derive2 { name="biodbUniprot"; version="1.0.0"; sha256="1aydkqqb8vs5b844ff1j09a7g8rmf7qr6rg2aw8nqshihq510v4d"; depends=[biodb R6]; }; - biomaRt = derive2 { name="biomaRt"; version="2.50.1"; sha256="1lm8axjmi2k1d2x0gdlvs0fzsd68xvxx7sn1wn6v4wr0pv85qhkz"; depends=[AnnotationDbi BiocFileCache digest httr progress rappdirs stringr XML xml2]; }; + biomaRt = derive2 { name="biomaRt"; version="2.50.3"; sha256="01mv05fj5iqvjb5xz9k92kx1a9d95mprb6isy57n0x20vd3cxdx1"; depends=[AnnotationDbi BiocFileCache digest httr progress rappdirs stringr XML xml2]; }; biomformat = derive2 { name="biomformat"; version="1.22.0"; sha256="0xf99j4lhf8kh9h1317hrbzxdv6rljs1fn68r8s40x6y4db3l817"; depends=[jsonlite Matrix plyr rhdf5]; }; biomvRCNS = derive2 { name="biomvRCNS"; version="1.34.0"; sha256="01nhjhfyzs67p97bk9bjqdxk239ckl8sgfj55azk1zmw92aw2hfy"; depends=[GenomicRanges Gviz IRanges mvtnorm]; }; biosigner = derive2 { name="biosigner"; version="1.22.0"; sha256="189018qahyw33dmg73wa7k4rp8nzrx6ai8f2dr6vhbpcdc1gnm0z"; depends=[Biobase e1071 MultiDataSet randomForest ropls]; }; @@ -1134,12 +1121,12 @@ in with self; { bsseq = derive2 { name="bsseq"; version="1.30.0"; sha256="1i30zf6457a0qd64s89x9l544y1h0hj9rfgf1m8l4krd487a9b9d"; 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.0.1"; sha256="1wrk9m4ja129d4al3w286hzg2gjcnq5riaa99q35psqcwm1bp94f"; depends=[BiocFileCache vroom]; }; bumphunter = derive2 { name="bumphunter"; version="1.36.0"; sha256="0d5cz9xy7vhcaj5n3h4cfiv08sn7wn83458525pdwvdzzm449xgv"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; }; - cBioPortalData = derive2 { name="cBioPortalData"; version="2.6.0"; sha256="0bapc4c9x328l0wrnm6zzq1byf1l33rza8xmadrfqfiq6j56qakq"; depends=[AnVIL BiocFileCache digest dplyr GenomeInfoDb GenomicRanges httr IRanges MultiAssayExperiment RaggedExperiment readr RTCGAToolbox S4Vectors SummarizedExperiment TCGAutils tibble tidyr]; }; + cBioPortalData = derive2 { name="cBioPortalData"; version="2.6.1"; sha256="1sscczza5a2drm5h8h628nc8ajxx20gr48j2srli8a7c47lzyv6f"; depends=[AnVIL BiocFileCache digest dplyr GenomeInfoDb GenomicRanges httr IRanges MultiAssayExperiment RaggedExperiment readr RTCGAToolbox S4Vectors SummarizedExperiment TCGAutils tibble tidyr]; }; cTRAP = derive2 { name="cTRAP"; version="1.12.0"; sha256="13q0pyc6vvxl41hg8cz4rdqrq0vppnna5fw2cin58dm2mayhd6p9"; 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]; }; caOmicsV = derive2 { name="caOmicsV"; version="1.24.0"; sha256="0snr67g9bqwyvrr1gxmgdjhrybgcpl38dwik583752sgdyf84c6p"; depends=[bc3net igraph]; }; cageminer = derive2 { name="cageminer"; version="1.0.0"; sha256="140w8ccm5j5kl3gyn6437a2zqlzf5277k3g3c9i22n1jkdp947yn"; depends=[BioNERO GenomeInfoDb GenomicRanges ggbio ggplot2 ggtext IRanges reshape2]; }; calm = derive2 { name="calm"; version="1.8.0"; sha256="1sq78fv4s6ja9yw84k20zl10pbkk8g2kf38p6nbxkhi4rvz8b5r2"; depends=[mgcv]; }; - canceR = derive2 { name="canceR"; version="1.28.0"; sha256="1iii7r1dg4khplqacr1lncks7iqqvgzqfb5vd84bbw2cvc9dbl63"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; }; + canceR = derive2 { name="canceR"; version="1.28.02"; sha256="00h8jklisp1vapqz8z4l4qk2273p2n33f0sfrgc6gpraiypvqr10"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; }; cancerclass = derive2 { name="cancerclass"; version="1.38.0"; sha256="1kp764g9jms7r95wh58c4d1yli7xfvhfvi50x2s8rzi4bhi3zik6"; depends=[binom Biobase]; }; casper = derive2 { name="casper"; version="2.28.0"; sha256="0z85zq5crf3806c16hv0gpv072k2bf7hdyhq958y33282wybr4zd"; depends=[Biobase BiocGenerics coda EBarrays gaga GenomeInfoDb GenomicFeatures GenomicRanges gtools IRanges limma mgcv Rsamtools rtracklayer S4Vectors sqldf survival VGAM]; }; categoryCompare = derive2 { name="categoryCompare"; version="1.38.0"; sha256="1175is4gr6nr393lk5ha2c3rqsdzsl1mfnhkajcym8n0927rx8n8"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCy3]; }; @@ -1148,7 +1135,7 @@ in with self; { ccfindR = derive2 { name="ccfindR"; version="1.14.0"; sha256="00xaspkckhnflkaj0wfs06kbz6y6cfshr1mq4zhh7yszppgqflzd"; depends=[ape gtools irlba Matrix RColorBrewer Rcpp RcppEigen Rdpack Rmpi Rtsne S4Vectors SingleCellExperiment SummarizedExperiment]; }; ccmap = derive2 { name="ccmap"; version="1.20.0"; sha256="1z5lyv7m55wcncjlrqzflmp1jm2580k1pvajj3gjqif8kx477q3d"; depends=[AnnotationDbi BiocManager ccdata data_table doParallel foreach lsa xgboost]; }; ccrepe = derive2 { name="ccrepe"; version="1.30.0"; sha256="05wazs9bv4nlkzb3r98v31w0vpkv4071f9zw9dlh9jd8cm91ppk1"; depends=[infotheo]; }; - ceRNAnetsim = derive2 { name="ceRNAnetsim"; version="1.6.0"; sha256="126wkhzj2f5b691jc34a6cqn2rznv531gg1cqfqs4j7k47hfy0in"; depends=[dplyr furrr future ggplot2 ggraph igraph purrr rlang tibble tidygraph tidyr]; }; + ceRNAnetsim = derive2 { name="ceRNAnetsim"; version="1.6.99"; sha256="1309ccqq3p970p5v0b2syqv91vs2d0svij0xdqzr6g46sazgkrr7"; depends=[dplyr furrr future ggplot2 ggraph igraph purrr rlang tibble tidygraph tidyr]; }; celaref = derive2 { name="celaref"; version="1.12.0"; sha256="0rxcy7sw1l2r8j1sralvqwl7ml2hf6x74qmfam87s6gal021z6qj"; depends=[BiocGenerics DelayedArray dplyr ggplot2 magrittr MAST Matrix readr rlang S4Vectors SummarizedExperiment tibble]; }; celda = derive2 { name="celda"; version="1.10.0"; sha256="1qlkkh1h6pjv6rjk5p50iq1dhzn1l6sqnm61y6jlg1hqkdc76wbb"; depends=[circlize ComplexHeatmap data_table dbscan DelayedArray digest doParallel enrichR foreach ggplot2 ggrepel gtable Matrix matrixStats MCMCprecision multipanelfigure plyr RColorBrewer Rcpp RcppEigen reshape2 Rtsne S4Vectors scales scater scran SingleCellExperiment stringr SummarizedExperiment uwot withr]; }; cellHTS2 = derive2 { name="cellHTS2"; version="2.58.0"; sha256="0h5vif8xi7axfh41mmp0b8zm1r07mnlnqq6bp0fkwqyas7gbzahh"; depends=[Biobase BiocGenerics Category genefilter GSEABase hwriter locfit RColorBrewer splots vsn]; }; @@ -1183,7 +1170,7 @@ in with self; { clstutils = derive2 { name="clstutils"; version="1.42.0"; sha256="0zbyppajhkzims3cb631ylfl132a07b1w91kp3ba6hg4f7zxw06q"; depends=[ape clst lattice rjson RSQLite]; }; clustComp = derive2 { name="clustComp"; version="1.22.0"; sha256="0n1qpjxffx8jm8m3gw891irpzagpi91r46xa6iznsskh8nhmh44y"; depends=[sm]; }; clusterExperiment = derive2 { name="clusterExperiment"; version="2.14.0"; sha256="0riray1f841d5fx6mbcki5xmqz21kg5q5l0qz4pkgg9c1d9f7mbc"; 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.2.1"; sha256="08jhcbanz24x7zdkxznxz787g0nk3jfzd7zsap13sra7qnwaswq4"; depends=[AnnotationDbi DOSE downloader dplyr enrichplot GO_db GOSemSim magrittr plyr qvalue rlang tidyr yulab_utils]; }; + clusterProfiler = derive2 { name="clusterProfiler"; version="4.2.2"; sha256="1y8ay3fxvcc7a7yqvfc95jfn800ikvs56j17byyp6v08w2j00y76"; depends=[AnnotationDbi DOSE downloader dplyr enrichplot GO_db GOSemSim magrittr plyr qvalue rlang tidyr yulab_utils]; }; clusterSeq = derive2 { name="clusterSeq"; version="1.18.0"; sha256="1qyycc8wrik54bc2rvzisv6p05jnh1kf68jafqgw9lqpp5gk40bl"; depends=[baySeq BiocGenerics BiocParallel]; }; clusterStab = derive2 { name="clusterStab"; version="1.66.0"; sha256="1863jpdwx27snpil38waj3zr0w2m0q7xj8g1zm8c5cbx9as1cwkd"; depends=[Biobase]; }; clustifyr = derive2 { name="clustifyr"; version="1.6.0"; sha256="1jz6wfv1b585yf6m9f265ig29p5qxilri40lnpry6h0am2s72xr3"; depends=[cowplot dplyr entropy fgsea ggplot2 httr Matrix matrixStats proxy readr rlang S4Vectors scales SingleCellExperiment stringr SummarizedExperiment tibble tidyr]; }; @@ -1195,11 +1182,9 @@ in with self; { coMET = derive2 { name="coMET"; version="1.26.0"; sha256="0n4fhhx27qrqs855qjx6ng7xdgcxlv3krj5sy4sxrhsahslad9v4"; depends=[biomaRt colortools corrplot GenomicRanges gridExtra Gviz hash IRanges psych rtracklayer S4Vectors]; }; coRdon = derive2 { name="coRdon"; version="1.12.0"; sha256="1m5k0cp61x50izgpb748h8dh2ab98i3vlsf63lhcvhvirind96fw"; depends=[Biobase Biostrings data_table dplyr ggplot2 purrr stringr]; }; codelink = derive2 { name="codelink"; version="1.62.0"; sha256="13ydy59qk5walsifyl8gfd181wbkf1jam3242407fsskw5ia4kfv"; depends=[annotate Biobase BiocGenerics limma]; }; - coexnet = derive2 { name="coexnet"; version="1.15.0"; sha256="1h3l7rjk757qbddyg0p8l21h8z3i4n3ml295lmavszsm9knyc2fk"; depends=[acde affy Biobase GEOquery igraph limma minet rmarkdown siggenes STRINGdb SummarizedExperiment vsn]; }; cogena = derive2 { name="cogena"; version="1.28.0"; sha256="077cmcsqvc2d26ywm6537l538pnn9473sh3q0z91zvmw0886iava"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2 stringr tibble tidyr]; }; cola = derive2 { name="cola"; version="2.0.0"; sha256="13ibslqhqa0xgg79n3cbgpmzlhf9nhibn4wm4mdcyxarxlqlqrsh"; depends=[BiocGenerics brew circlize clue cluster ComplexHeatmap crayon digest doParallel eulerr foreach GetoptLong GlobalOptions httr impute irlba knitr markdown matrixStats mclust microbenchmark png RColorBrewer Rcpp skmeans xml2]; }; combi = derive2 { name="combi"; version="1.6.0"; sha256="0wca0wjmyr0jfy366b2xqfk56qd1y2s43ccbnhbzmvaj7hafnnbc"; depends=[alabama BB Biobase cobs ggplot2 limma Matrix nleqslv phyloseq reshape2 SummarizedExperiment tensor vegan]; }; - compEpiTools = derive2 { name="compEpiTools"; version="1.27.0"; sha256="0hk3yd7ql91wg9r24r57ybhs1nx6zbd5v199sv7xd91k980n2ay5"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges GO_db gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; }; compartmap = derive2 { name="compartmap"; version="1.12.0"; sha256="0dhkrskw1hb2vxq3dkxl6ccf0mxpydszpd7d6lpqrk2x62i7hhk5"; depends=[BiocSingular DelayedArray DelayedMatrixStats GenomicRanges ggplot2 HDF5Array Matrix RaggedExperiment reshape2 RMTstat rtracklayer scales SummarizedExperiment]; }; compcodeR = derive2 { name="compcodeR"; version="1.30.0"; sha256="0793wkv967w5sicg4spx1mw48pgn18rwb7wkcqc98sc7d0fvi1vb"; depends=[caTools edgeR ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; }; conclus = derive2 { name="conclus"; version="1.2.0"; sha256="1c4n4ybm0ppd83ydhxghs5kv93djqxin0ppkg4n6rbjw7m9qx1p2"; depends=[AnnotationDbi Biobase BiocFileCache biomaRt clusterProfiler dbscan doParallel dplyr factoextra foreach fpc GEOquery ggplot2 gridExtra pheatmap Rtsne scales scater scran SingleCellExperiment stringr SummarizedExperiment]; }; @@ -1217,7 +1202,7 @@ in with self; { coseq = derive2 { name="coseq"; version="1.18.0"; sha256="0g3bningjbnjys7ksdxx68lnp7qfg2fwpp2m82s61rpyb06j5v4r"; depends=[BiocParallel capushe compositions corrplot DESeq2 e1071 edgeR ggplot2 HTSCluster HTSFilter mvtnorm Rmixmod S4Vectors scales SummarizedExperiment]; }; cosmiq = derive2 { name="cosmiq"; version="1.28.0"; sha256="0b0d7d7fdf0rgkrpp92n6k1vkxswm63p1qmqb3b2c0nwpj68ybph"; depends=[faahKO MassSpecWavelet pracma Rcpp xcms]; }; cosmosR = derive2 { name="cosmosR"; version="1.2.0"; sha256="0y1a3yr23zbyg0b7yl7rbbfn930g72fpw8dz6vcfz73yjj6psxv1"; depends=[AnnotationDbi biomaRt CARNIVAL dorothea dplyr ggplot2 GSEABase igraph magrittr org_Hs_eg_db plyr purrr readr rlang scales stringr tibble visNetwork]; }; - countsimQC = derive2 { name="countsimQC"; version="1.12.0"; sha256="0ldjav5wsj1shjiyxi0mh3yxhmpwgwfvp9ijml6jii60hnbkrqck"; depends=[caTools DESeq2 dplyr DT edgeR genefilter GenomeInfoDbData ggplot2 randtests rmarkdown SummarizedExperiment tidyr]; }; + countsimQC = derive2 { name="countsimQC"; version="1.12.1"; sha256="1ayjhbh6dc8grnizgc77460qn24ll3brybp8p7j2wmpc97dhs6kr"; depends=[caTools DESeq2 dplyr DT edgeR genefilter GenomeInfoDbData ggplot2 randtests rmarkdown SummarizedExperiment tidyr]; }; covEB = derive2 { name="covEB"; version="1.20.0"; sha256="0r0b1hih0wijcpn2xxjq56z185a5ij3l49g6wxbp5kcd7w5apmhp"; depends=[Biobase gsl igraph LaplacesDemon Matrix mvtnorm]; }; covRNA = derive2 { name="covRNA"; version="1.20.0"; sha256="16d5pdq2zhymxpv1xx66bb8kn037559mbp3lrcmhddy46xb519cv"; depends=[ade4 Biobase genefilter]; }; cpvSNP = derive2 { name="cpvSNP"; version="1.26.0"; sha256="1z3lzj2izqmy1m8y73za4pfk158rfxbs8janvq776aqzcaa5pf0k"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; }; @@ -1237,13 +1222,13 @@ in with self; { cycle = derive2 { name="cycle"; version="1.48.0"; sha256="1zcxvf41ick80pi929vabbs632dml2rcxwjzz5z5pvz9ppm70vab"; depends=[Biobase Mfuzz]; }; cydar = derive2 { name="cydar"; version="1.18.0"; sha256="0wsfcwfsm7lf6q13cgcwg189zjabdxnlaqbdb6gh1pk27mh3s70g"; depends=[Biobase BiocGenerics BiocNeighbors BiocParallel flowCore Rcpp S4Vectors shiny SingleCellExperiment SummarizedExperiment viridis]; }; cytoKernel = derive2 { name="cytoKernel"; version="1.0.0"; sha256="1n48bz8ainax53m6d5i5zyjlja3v5nv9vhx45r5746sr9rppbljw"; depends=[ashr BiocParallel circlize ComplexHeatmap data_table dplyr magrittr Rcpp rlang S4Vectors SummarizedExperiment]; }; - cytolib = derive2 { name="cytolib"; version="2.6.1"; sha256="16m5w6cp28p4fs2p8c8rjcg1d686xl8mpas816i7zxfh8m0bcqc9"; depends=[BH Rcpp RcppArmadillo RcppParallel Rhdf5lib RProtoBufLib]; }; + cytolib = derive2 { name="cytolib"; version="2.6.2"; sha256="0ycr4wmkfi0rvzwicblkfjgppk72gwwpim0rfiz1s44lycsf4py5"; depends=[BH Rcpp RcppArmadillo RcppParallel Rhdf5lib RProtoBufLib]; }; cytomapper = derive2 { name="cytomapper"; version="1.6.0"; sha256="0vmklch5g82pbhpax2flizglyndhs1dmdq015wclj0a9wyflzn6d"; depends=[BiocParallel DelayedArray EBImage ggbeeswarm ggplot2 HDF5Array matrixStats raster RColorBrewer rhdf5 S4Vectors shiny shinydashboard SingleCellExperiment SummarizedExperiment svglite svgPanZoom viridis]; }; dStruct = derive2 { name="dStruct"; version="1.0.0"; sha256="0sy05n0zgd9d8jm352drw7xbcd37ghxzq7fwc3icm8hgqfx43qyk"; depends=[ggplot2 IRanges purrr reshape2 rlang S4Vectors zoo]; }; daMA = derive2 { name="daMA"; version="1.66.0"; sha256="0m7192md5956mbklw0j7z0b82inr6h0p2c9vvjsmd5ivlbz1zdri"; depends=[MASS]; }; dada2 = derive2 { name="dada2"; version="1.22.0"; sha256="1mj2fiqanr8lp1883bali00la38d9g1krqz9v7f396s1f5x8yll6"; depends=[BiocGenerics Biostrings ggplot2 IRanges Rcpp RcppParallel reshape2 ShortRead XVector]; }; dagLogo = derive2 { name="dagLogo"; version="1.32.0"; sha256="1gqb56zg11cl7ldww15zmn09f1f5i60mshwrv7gsb3yc79zs48s1"; depends=[BiocGenerics biomaRt Biostrings motifStack pheatmap UniProt_ws]; }; - dasper = derive2 { name="dasper"; version="1.4.0"; sha256="02gfagylbmpylq0cszppyxindiw3swm5n36cnfc9w08jfyisz571"; depends=[basilisk BiocFileCache BiocParallel data_table dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggpubr ggrepel IRanges magrittr megadepth plyranges readr reticulate rtracklayer S4Vectors stringr SummarizedExperiment tidyr]; }; + dasper = derive2 { name="dasper"; version="1.4.2"; sha256="1c0kz52wwz7b8fxgzj7drs8mqr5r2cl25n58rralqb7mgn926v62"; depends=[basilisk BiocFileCache BiocParallel data_table dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggpubr ggrepel IRanges magrittr megadepth plyranges readr reticulate rtracklayer S4Vectors stringr SummarizedExperiment tidyr]; }; dcGSA = derive2 { name="dcGSA"; version="1.22.0"; sha256="0j697q02zys9brmc7xn1yh7lir7k1m7hlr752ykydqx9qzzw0m77"; depends=[BiocParallel Matrix]; }; dcanr = derive2 { name="dcanr"; version="1.10.0"; sha256="0xrfdwcs4qxgasm318nd2cdqmr9ksaxig1frs8h6a7lg8wvh5f2x"; depends=[circlize doRNG foreach igraph Matrix plyr RColorBrewer reshape2 stringr]; }; dce = derive2 { name="dce"; version="1.2.0"; sha256="0wzi9hv975ib7nvd6qqnlhzfzgx9wydxxs1pkklzzgwlwm4gr971"; depends=[assertthat CombinePValue dplyr edgeR epiNEM expm ggplot2 ggraph glm2 glue graph graphite harmonicmeanp igraph logger MASS Matrix metap mnem naturalsort org_Hs_eg_db pcalg ppcor purrr reshape2 Rgraphviz rlang tidygraph tidyverse]; }; @@ -1264,7 +1249,7 @@ in with self; { derfinder = derive2 { name="derfinder"; version="1.28.0"; sha256="1hxf40ijrlmyrv3rprv5wx3am2vraplbsfg77kk9qd3gjq6q3ylp"; depends=[AnnotationDbi BiocGenerics BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; }; derfinderHelper = derive2 { name="derfinderHelper"; version="1.28.0"; sha256="06x0wy2wzpngak1pnrj2p0xzlx1nbcz0hs3p9q5ic6ib2rgwrh35"; depends=[IRanges Matrix S4Vectors]; }; derfinderPlot = derive2 { name="derfinderPlot"; version="1.28.1"; sha256="021w4vb8al3gc6rsc6qgywd5wxmysf2jif7cazxl4xhh37g1anni"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 S4Vectors scales]; }; - destiny = derive2 { name="destiny"; version="3.8.0"; sha256="01662p5j9l12ylf5a5djg4cjppd2n3chrygzw8nnrcf1806xn58y"; depends=[Biobase BiocGenerics ggplot_multistats ggplot2 ggthemes irlba knn_covertree Matrix pcaMethods proxy Rcpp RcppEigen RcppHNSW RSpectra scales scatterplot3d SingleCellExperiment smoother SummarizedExperiment tidyr tidyselect VIM]; }; + destiny = derive2 { name="destiny"; version="3.8.1"; sha256="1f2mp2sxbf1zi61npj5rl5pl7z30rkj5953521iiv0w99mdfwhsc"; depends=[Biobase BiocGenerics ggplot_multistats ggplot2 ggthemes irlba knn_covertree Matrix pcaMethods proxy Rcpp RcppEigen RcppHNSW RSpectra scales scatterplot3d SingleCellExperiment smoother SummarizedExperiment tidyr tidyselect VIM]; }; diffGeneAnalysis = derive2 { name="diffGeneAnalysis"; version="1.76.0"; sha256="1aprngqc2aqdw91q9c57y15xpkm4da4czf8ki55vnyngb9nlpabp"; depends=[minpack_lm]; }; diffHic = derive2 { name="diffHic"; version="1.26.0"; sha256="0xhm6jgalgb2v8k99k1z99rwhcaqjhhklm5ih8b6ayfmgmf6x7ih"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges InteractionSet IRanges limma locfit Rcpp rhdf5 Rhtslib Rsamtools rtracklayer S4Vectors SummarizedExperiment zlibbioc]; }; diffUTR = derive2 { name="diffUTR"; version="1.2.0"; sha256="0lmsbaaqzzvk25bxjb8ngvx0l5aqsmk7nng5kv4nghm7y7ipp1gf"; depends=[ComplexHeatmap DEXSeq dplyr edgeR ensembldb GenomeInfoDb GenomicRanges ggplot2 ggrepel IRanges limma matrixStats Rsubread rtracklayer S4Vectors stringi SummarizedExperiment viridisLite]; }; @@ -1285,7 +1270,6 @@ in with self; { dpeak = derive2 { name="dpeak"; version="1.6.0"; sha256="12a1zz8zj0kp2iprnckij98illb9jf2lg4nz144wjlfwiv3mq0y6"; depends=[BSgenome IRanges MASS Rcpp]; }; drawProteins = derive2 { name="drawProteins"; version="1.14.0"; sha256="1imsisl2bwzf3dzhslmlqm6zwzil8a2l8kk7fkkc0dqka63kcwai"; depends=[dplyr ggplot2 httr readr tidyr]; }; drugTargetInteractions = derive2 { name="drugTargetInteractions"; version="1.2.0"; sha256="1jcmkh1rjhk862f6kzqfw9zkk795yiwxq57bxbsqf9kwyykgwq7y"; depends=[AnnotationFilter BiocFileCache biomaRt dplyr ensembldb rappdirs RSQLite S4Vectors UniProt_ws]; }; - dualKS = derive2 { name="dualKS"; version="1.53.0"; sha256="16cfcylmmcj8x2808529lbpm7qbbrxygic0jkaglhqcdxgrqw3rw"; depends=[affy Biobase]; }; dupRadar = derive2 { name="dupRadar"; version="1.24.0"; sha256="06s3661vlsy4n9p59wb8f9gmmwd2kwz0z2ydq2diix0hajz8h5fi"; depends=[Rsubread]; }; dyebias = derive2 { name="dyebias"; version="1.54.0"; sha256="0iha3n4p01gphsp5jn5ypm9b8mfn2dlz1sdz179i5cmycwgg6p7s"; depends=[Biobase marray]; }; easier = derive2 { name="easier"; version="1.0.0"; sha256="1wlpmx9ghbz9ikmw70b0lhsvkbcry5rmrkq8kxm0439wwwfd0ayj"; depends=[arules BiocParallel coin DESeq2 dorothea dplyr easierData ggplot2 ggrepel matrixStats progeny quantiseqr reshape2 rlang ROCR rstatix]; }; @@ -1299,14 +1283,14 @@ in with self; { eisaR = derive2 { name="eisaR"; version="1.6.0"; sha256="1gfcmxdbzpb8rfdk7c1y7jhqanipa6jyxy2cg6f9jsp9x73fs61w"; depends=[BiocGenerics edgeR GenomicRanges IRanges limma S4Vectors SummarizedExperiment]; }; enhancerHomologSearch = derive2 { name="enhancerHomologSearch"; version="1.0.0"; sha256="1v8zgp33kabf5qjf7aklb1lbzsvlh1jv30g0f79djf2i9khcxlkm"; depends=[BiocFileCache BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges httr IRanges jsonlite Matrix motifmatchr Rcpp rtracklayer S4Vectors]; }; enrichTF = derive2 { name="enrichTF"; version="1.10.0"; sha256="0ssjsl5vh0wdq0584yl6c61d8bp5n3qvkgfrqdlpjfwb7b7gh4xv"; 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.14.1"; sha256="0nsx96mkcg0hhg3x8jndzq3xvq9bq7m4yf1b3ry73b17ladx81ch"; depends=[aplot DOSE ggplot2 ggraph ggtree GOSemSim igraph magrittr plyr purrr RColorBrewer reshape2 scatterpie shadowtext yulab_utils]; }; + enrichplot = derive2 { name="enrichplot"; version="1.14.2"; sha256="1rjiqmc32c9gxckgrgbypxpp0m8y0kahvhzvjzymda25xp8zqjs2"; depends=[aplot DOSE ggplot2 ggraph ggtree GOSemSim igraph magrittr plyr purrr RColorBrewer reshape2 scatterpie shadowtext yulab_utils]; }; ensemblVEP = derive2 { name="ensemblVEP"; version="1.36.0"; sha256="1b9i8qv16mrr31qpvvcimcd80nkykky8dygi90jinkzgvkzdxi64"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; }; - ensembldb = derive2 { name="ensembldb"; version="2.18.2"; sha256="0q56gv0isa9ayw505py7i7x65pvcshmd2j1mna1wpbk66wqj4qzx"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; }; + ensembldb = derive2 { name="ensembldb"; version="2.18.3"; sha256="0rbd8ycvl1aydbd8xcbkhgqxqkrflymgah3wm6nx76csapbzh4q9"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; }; epiNEM = derive2 { name="epiNEM"; version="1.18.0"; sha256="0xs9jzy0d9iv45d5ina7ki79wix96318yp17mxhp1l4vdkpm3fk7"; depends=[BoolNet e1071 graph gtools igraph latex2exp lattice latticeExtra minet mnem pcalg RColorBrewer]; }; epialleleR = derive2 { name="epialleleR"; version="1.2.0"; sha256="1zgwwzrg9ngsfq186qsmvgwxcz0b9avr8wk1yadjlrjc9avgh2d3"; depends=[BH BiocGenerics data_table GenomeInfoDb GenomicRanges Rcpp Rhtslib stringi SummarizedExperiment VariantAnnotation zlibbioc]; }; epidecodeR = derive2 { name="epidecodeR"; version="1.2.0"; sha256="1fy3i7djpj2inlcpa2h4n5hzp0q6a555sc5axg1jwxiala9l8siv"; depends=[dplyr EnvStats GenomicRanges ggplot2 ggpubr IRanges rstatix rtracklayer]; }; epigenomix = derive2 { name="epigenomix"; version="1.34.0"; sha256="0yyxm97cqyy9r6bxsw40dl8nh2f1lxw41w3i3av8lixp72wxy3ml"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; }; - epigraHMM = derive2 { name="epigraHMM"; version="1.2.1"; sha256="1cxj50wfvgcajxgnhk3gpdhql6z6jbmdaarw09ls0wvnga9sn24p"; 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.2.2"; sha256="0cymyvhcv9msrkbh0sp3wr02924arrls3id9563givkrzl48gab3"; 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]; }; epihet = derive2 { name="epihet"; version="1.10.0"; sha256="086x87yzjmg0l95kd0mdxysqgdj7bmc4mr95h6mkyv70nsdfyfs4"; depends=[data_table doParallel EntropyExplorer foreach GenomicRanges ggplot2 igraph IRanges pheatmap qvalue ReactomePA Rtsne S4Vectors WGCNA]; }; epistack = derive2 { name="epistack"; version="1.0.0"; sha256="0g5v30v7afx5wppg1fxpqba0inn6k25ljy7x3fim6vcwdhdnl95n"; depends=[BiocGenerics GenomicRanges IRanges plotrix S4Vectors viridisLite]; }; epivizr = derive2 { name="epivizr"; version="2.24.0"; sha256="1xxs34580gm2l222qf9m63id8282n2vg41s8ng6mrrd239pxpv2f"; depends=[bumphunter epivizrData epivizrServer GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; @@ -1415,7 +1399,7 @@ in with self; { ggmsa = derive2 { name="ggmsa"; version="1.0.0"; sha256="0w4jqmsa87ijflmyya8fnwmgha6s5ax2r9d67b0a3d7yz3d1kms8"; depends=[aplot Biostrings dplyr ggalt ggforce ggplot2 magrittr R4RNA RColorBrewer seqmagick tidyr]; }; ggspavis = derive2 { name="ggspavis"; version="1.0.0"; sha256="0lm7z8fzvw47zq618lfyxszy42qwhjr71xsyjsygvcl604z68jx0"; depends=[ggplot2 ggside SingleCellExperiment SpatialExperiment SummarizedExperiment]; }; ggtree = derive2 { name="ggtree"; version="3.2.1"; sha256="0qk39gdpy4kznjhmvi25y2spcdj2r1i6mv673vx8dzf66zfs20v8"; depends=[ape aplot dplyr ggfun ggplot2 magrittr purrr rlang scales tidyr tidytree treeio yulab_utils]; }; - ggtreeExtra = derive2 { name="ggtreeExtra"; version="1.4.1"; sha256="1lrnwzpkddc3byag4zyjiqhvkdkln03yq9qrxq0981cp6mai3aq7"; depends=[ggnewscale ggplot2 ggtree rlang]; }; + ggtreeExtra = derive2 { name="ggtreeExtra"; version="1.4.2"; sha256="0c7kf0a5hr63y9w6f09z8dfd3apbhx6i6cd31fvl1wiy977pn2ly"; depends=[ggnewscale ggplot2 ggtree rlang]; }; girafe = derive2 { name="girafe"; version="1.46.0"; sha256="1al296zsp454lap05mh58y5lmrd0bfc4vmwaq5icnna56i4bi9m9"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; }; glmGamPoi = derive2 { name="glmGamPoi"; version="1.6.0"; sha256="1yffzcy910cawz2lzjqg8h1hrjvrkhz3pdif5q352kpzjklr5qjm"; depends=[beachmat BiocGenerics DelayedArray DelayedMatrixStats HDF5Array matrixStats Rcpp RcppArmadillo SummarizedExperiment]; }; glmSparseNet = derive2 { name="glmSparseNet"; version="1.12.0"; sha256="14qyj2jgjapjjznjzhslhcfbyxm9z0p28z8qrjqkxcb5z2hw9arq"; depends=[biomaRt dplyr forcats futile_logger ggplot2 glmnet glue httr loose_rock Matrix MultiAssayExperiment readr reshape2 sparsebn sparsebnUtils stringr SummarizedExperiment survminer]; }; @@ -1443,14 +1427,14 @@ in with self; { gwasurvivr = derive2 { name="gwasurvivr"; version="1.12.0"; sha256="1q31ydns5i8jk4p4731i57f80iwx6qm0r9fka4xd4wdxzk5kps8z"; depends=[GWASTools matrixStats SNPRelate SummarizedExperiment survival VariantAnnotation]; }; h5vc = derive2 { name="h5vc"; version="2.28.0"; sha256="0i4p122cavihc29javrgg5ywqn1fkg73hp46hfj3v2qmwakihk4w"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra h5vcData IRanges reshape rhdf5 Rhtslib Rsamtools S4Vectors]; }; hapFabia = derive2 { name="hapFabia"; version="1.36.0"; sha256="0niwlfy2ljsx1ivdxrpm0f8w75bs03xb2l43dkcm5gclwac2ys1v"; depends=[Biobase fabia]; }; - hca = derive2 { name="hca"; version="1.2.1"; sha256="0yczfbs3w4f4zwv2zq9m58w7xirhjys654g87j643yr1rfixf7l1"; depends=[BiocFileCache digest dplyr httr jsonlite readr tibble tidyr]; }; + hca = derive2 { name="hca"; version="1.2.2"; sha256="0jdn93r48id24n8ha2yn2d256mz446j6hfvn0dz0y1kniff154cc"; depends=[BiocFileCache digest dplyr httr jsonlite readr tibble tidyr]; }; heatmaps = derive2 { name="heatmaps"; version="1.18.0"; sha256="11fi0kzqx6ihvvwc852xhj34xv4aik0zyv47ad4zbhvb1mvxqv8a"; depends=[BiocGenerics Biostrings EBImage GenomeInfoDb GenomicRanges IRanges KernSmooth Matrix plotrix RColorBrewer]; }; hiAnnotator = derive2 { name="hiAnnotator"; version="1.28.0"; sha256="1hjgn9gszr38q9syjl9qqw3lml5falp08asn01mq4h1m53akwxxv"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; }; hiReadsProcessor = derive2 { name="hiReadsProcessor"; version="1.30.0"; sha256="02y6gy9h841aag0v88j1g0hw0ckd4zd3agjgvzi9mcmb76zhxz8k"; depends=[BiocGenerics BiocParallel Biostrings dplyr GenomicAlignments GenomicRanges hiAnnotator readxl sonicLength]; }; hierGWAS = derive2 { name="hierGWAS"; version="1.24.0"; sha256="1mxlk73p4vhnhs5yv5fbxdz3i8d425535r0zwinpi1jhshimr1mw"; depends=[fastcluster fmsb glmnet]; }; hierinf = derive2 { name="hierinf"; version="1.12.0"; sha256="1qmpxajvclk3m7yl6h5hp4yixgf1v5whiaqh8k7z8g9kz148hi45"; depends=[fmsb glmnet]; }; hipathia = derive2 { name="hipathia"; version="2.10.0"; sha256="1w14rgl96xssijjgzqdjjs15p33nrqg2wnvv70z5k2i7xzrjwfff"; depends=[AnnotationHub coin DelayedArray igraph limma matrixStats MultiAssayExperiment preprocessCore S4Vectors servr SummarizedExperiment]; }; - hmdbQuery = derive2 { name="hmdbQuery"; version="1.14.0"; sha256="07xvfxpajwchi570739a2ax25bam852q1ifa8w5a02zb32rfbb6l"; depends=[S4Vectors XML]; }; + hmdbQuery = derive2 { name="hmdbQuery"; version="1.14.2"; sha256="0q741bwana06i4l07h1ckkfkhmhxqshkq94brd1ym6kvayaqrxb5"; depends=[S4Vectors XML]; }; hopach = derive2 { name="hopach"; version="2.54.0"; sha256="1mj8glhsxkhfbj8mlghplz1dghdr7041r48njzzprx06x94aandi"; depends=[Biobase BiocGenerics cluster]; }; hpar = derive2 { name="hpar"; version="1.36.0"; sha256="1inajapdhjxg0vwhsdnhfq22h3fv7ad7m1lv58y5v41p59av1w76"; depends=[]; }; hummingbird = derive2 { name="hummingbird"; version="1.4.0"; sha256="1cp3agr0nzsqgs4s253vwdbzw5fkjdkas03svy8iwlzncgd000j5"; depends=[GenomicRanges IRanges Rcpp SummarizedExperiment]; }; @@ -1481,7 +1465,7 @@ in with self; { idr2d = derive2 { name="idr2d"; version="1.8.1"; sha256="1cbzyf9nwqgqvz03526v3hxgkrrpfs4m8ajw186cxa4h6kdm232x"; depends=[dplyr futile_logger GenomeInfoDb GenomicRanges ggplot2 idr IRanges magrittr reticulate scales stringr]; }; igvR = derive2 { name="igvR"; version="1.14.0"; sha256="0i55zx2y92cl22d4x4h4gjdaknyxidsxqz22fpgyfd5abryx5ni3"; depends=[BiocGenerics BrowserViz GenomicAlignments GenomicRanges httpuv MotifDb RColorBrewer rtracklayer seqLogo VariantAnnotation]; }; illuminaio = derive2 { name="illuminaio"; version="0.36.0"; sha256="0icsp610am5vrd8x2h9c450phn4vl9c5wnzqmkix5hkqzrykk34m"; depends=[base64]; }; - imageHTS = derive2 { name="imageHTS"; version="1.44.0"; sha256="1dg4p6qdhyhqdnpf3gaa1nlnw7d01yxhbhsbaiqnw9q9aprgi8hk"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; }; + imageHTS = derive2 { name="imageHTS"; version="1.44.1"; sha256="0m64d9csya84s2vsbmkflys03a27z8r9pa6mdd28aqaqwv0ww9dr"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; }; imcRtools = derive2 { name="imcRtools"; version="1.0.2"; sha256="05xw15d0sbjnrb8ffnajzz4wd1fygn3092za9y9sz3pcmkzbmhkf"; depends=[abind BiocNeighbors BiocParallel concaveman cytomapper data_table dplyr DT EBImage ggplot2 ggraph igraph magrittr pheatmap readr RTriangle S4Vectors scuttle sf SingleCellExperiment SpatialExperiment stringr SummarizedExperiment tidygraph viridis vroom]; }; immunoClust = derive2 { name="immunoClust"; version="1.26.0"; sha256="0vqn8455spray252b6kg771mwz4b6f51d4k7srg2i3rn7kyp7r38"; depends=[flowCore lattice]; }; immunotation = derive2 { name="immunotation"; version="1.2.0"; sha256="1rdmy46grqjf8ydgq0pgaja3jv4jna0yffw7fmiirfh96m2qvb00"; depends=[curl ggplot2 maps ontologyIndex readr rlang rvest stringr tidyr xml2]; }; @@ -1495,14 +1479,14 @@ in with self; { inveRsion = derive2 { name="inveRsion"; version="1.42.0"; sha256="0205fmv174x23gl5ka8k5j2x1lrwqc31zx7p0ngr9877kbi5idrj"; depends=[haplo_stats]; }; ipdDb = derive2 { name="ipdDb"; version="1.12.0"; sha256="0q4lrhj3l5ayfx1bba9176r2wybpn710yxxrcprgr87h95wqac8v"; depends=[AnnotationDbi AnnotationHub assertthat Biostrings DBI GenomicRanges IRanges RSQLite]; }; isobar = derive2 { name="isobar"; version="1.40.0"; sha256="0njl7b0k5hnwlj060ry6a8zjw035c21d107n0j2fyxg8nx4icqsx"; depends=[Biobase biomaRt distr ggplot2 plyr]; }; - isomiRs = derive2 { name="isomiRs"; version="1.22.0"; sha256="16af3cqdc283bhz1b365hiq7xmkgamggdw8bgsvpqifzssqs2jj1"; depends=[AnnotationDbi assertive_sets Biobase BiocGenerics broom cluster cowplot DEGreport DESeq2 DiscriMiner dplyr GenomicRanges GGally ggplot2 gplots gridExtra gtools IRanges limma RColorBrewer readr reshape rlang S4Vectors stringr SummarizedExperiment tibble tidyr]; }; + isomiRs = derive2 { name="isomiRs"; version="1.22.1"; sha256="1jzk47dxwk396adc7mzi9pil1dzbs0vjsibgclgs8lggm37dxq93"; depends=[AnnotationDbi assertive_sets Biobase BiocGenerics broom cluster cowplot DEGreport DESeq2 DiscriMiner dplyr GenomicRanges GGally ggplot2 gplots gridExtra gtools IRanges limma RColorBrewer readr reshape rlang S4Vectors stringr SummarizedExperiment tibble tidyr]; }; iterClust = derive2 { name="iterClust"; version="1.16.0"; sha256="0ggr9h3kyyjnfiqwk4w22icg8fg5bln1vygk1ip0badcxk2b6gyw"; depends=[Biobase cluster]; }; iterativeBMA = derive2 { name="iterativeBMA"; version="1.52.0"; sha256="1s86cq9c5a330cpxjpxgj1ibphmfsrxp1dn2gp7n50qkp2pyjsqa"; depends=[Biobase BMA leaps]; }; iterativeBMAsurv = derive2 { name="iterativeBMAsurv"; version="1.52.0"; sha256="0jrjyrg2kfmgiybwdglrbfvfziy8i6jnkzb2ddr8z0670bmv8wxw"; depends=[BMA leaps survival]; }; iteremoval = derive2 { name="iteremoval"; version="1.14.0"; sha256="15ls501y27lc9iyvz9fmk8w09512bg7cxl763amck1f6r3qnm8hl"; depends=[GenomicRanges ggplot2 magrittr SummarizedExperiment]; }; ivygapSE = derive2 { name="ivygapSE"; version="1.16.0"; sha256="1a35z2ndvdqj84g5327cpz3s6aqn953ycwgglcqxpaabf2jh18sq"; depends=[ggplot2 hwriter plotly S4Vectors shiny SummarizedExperiment survival survminer UpSetR]; }; - karyoploteR = derive2 { name="karyoploteR"; version="1.20.0"; sha256="0x3mld9q55r2fy452wxq5sjzmms10zmpkzs71c3w1fdli5hwszdq"; depends=[AnnotationDbi bamsignals bezier biovizBase digest GenomeInfoDb GenomicFeatures GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; - kebabs = derive2 { name="kebabs"; version="1.28.0"; sha256="0454drbsl9fz0s7k00qd56wj0lwvwmyzn4nlsww7nfgszw95ac4q"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; }; + karyoploteR = derive2 { name="karyoploteR"; version="1.20.3"; sha256="0bcc1ln7602lrbm9wckgyfd9slsqiljjmymj28rfpax1n8rbq44m"; depends=[AnnotationDbi bamsignals bezier biovizBase digest GenomeInfoDb GenomicFeatures GenomicRanges IRanges memoise regioneR Rsamtools rtracklayer S4Vectors VariantAnnotation]; }; + kebabs = derive2 { name="kebabs"; version="1.28.1"; sha256="19i62ga793vza60bzq0hpr5y85vrrcsmjckyyasjzfipn3nwf98f"; depends=[apcluster Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; }; keggorthology = derive2 { name="keggorthology"; version="2.46.0"; sha256="1rckw5yg9swf86cmh4nmrzb37w8m023c7q0pis1nqbcx9lgdgiw5"; depends=[AnnotationDbi DBI graph hgu95av2_db]; }; kissDE = derive2 { name="kissDE"; version="1.14.0"; sha256="1k6aljlhj3k06a95imnna1jmx1xwvnbc72sbp2jqn2hc69pkyi2j"; depends=[aod Biobase DESeq2 doParallel DSS foreach ggplot2 gplots matrixStats]; }; lapmix = derive2 { name="lapmix"; version="1.60.0"; sha256="17niykbr8c388qbvjix2hc3zmpa5335bhmwsvnna4qa9v9fi9ln2"; depends=[Biobase]; }; @@ -1511,10 +1495,10 @@ in with self; { les = derive2 { name="les"; version="1.44.0"; sha256="08kahiq7j7xwr9hpynzcnbr3jchdd83iacywrnb03plz5jx22q9n"; depends=[boot fdrtool gplots RColorBrewer]; }; levi = derive2 { name="levi"; version="1.12.0"; sha256="0mn8hcbld16qcdmb35hamg9p1rs7264k25s1bhw2ipcipkjv6fh3"; depends=[colorspace dplyr DT ggplot2 httr igraph knitr RColorBrewer Rcpp reshape2 rmarkdown shiny shinydashboard shinyjs testthat xml2]; }; lfa = derive2 { name="lfa"; version="1.24.0"; sha256="02b90xjb2lfm86hbsdrvzpv20pijnq78ibz4dwjzqd9v4xhia3wr"; depends=[corpcor]; }; - limma = derive2 { name="limma"; version="3.50.0"; sha256="05ypmax1s6y1nz42bxn61wxhzzw6185q633crzpdcbbz3dz4vgvy"; depends=[]; }; + limma = derive2 { name="limma"; version="3.50.1"; sha256="0plffhwh73k6rkcpyhhzvfgni1kgxg9zmqaf08l8ir6x04fgw8kz"; depends=[]; }; limmaGUI = derive2 { name="limmaGUI"; version="1.70.0"; sha256="0g4bp8ih848kh907ykmn6q1nzwabg5ifqb7123m87wdhrw224xjp"; depends=[limma R2HTML tkrplot xtable]; }; lionessR = derive2 { name="lionessR"; version="1.8.0"; sha256="0n4ky9g2a4n5wisvkj9afkvaqdq4yxfabnx26vrjy8g34dg5dz3l"; depends=[S4Vectors SummarizedExperiment]; }; - lipidr = derive2 { name="lipidr"; version="2.8.0"; sha256="0w300ac15ra2yl3lz05wdg4vy2skxqdmnwljjcldgacgdfs012zb"; depends=[data_table dplyr fgsea forcats ggplot2 imputeLCMD limma magrittr rlang ropls S4Vectors SummarizedExperiment tidyr]; }; + lipidr = derive2 { name="lipidr"; version="2.8.1"; sha256="0a007pbn438ba8zykf99x4lhb5yni5ycsd1wcacj8vmx34g1k0zd"; depends=[data_table dplyr fgsea forcats ggplot2 imputeLCMD limma magrittr rlang ropls S4Vectors SummarizedExperiment tidyr]; }; lisaClust = derive2 { name="lisaClust"; version="1.2.0"; sha256="0n3vwawlmybjbgvgb66pc0if63dn7mqhk74jpskqzv7c6f5nbvdv"; depends=[BiocGenerics BiocParallel class concaveman data_table dplyr ggplot2 purrr S4Vectors spatstat_core spatstat_geom spicyR tidyr]; }; lmdme = derive2 { name="lmdme"; version="1.36.0"; sha256="0wi1lsaix6dgmj69kpm8rg5jbhv2a7r7a4n6zz1zg0q288pzs34s"; depends=[limma pls stemHypoxia]; }; loci2path = derive2 { name="loci2path"; version="1.14.0"; sha256="18wzbsa22ix5q6icr2mmcfijrlv4dg222icyixlpzrcbhc8r42sq"; depends=[BiocParallel data_table GenomicRanges pheatmap RColorBrewer S4Vectors wordcloud]; }; @@ -1533,14 +1517,14 @@ in with self; { maanova = derive2 { name="maanova"; version="1.64.0"; sha256="1bifi7fzjhc00j8ckifh8vs4l3vxmqfh5kpwd1qgcg8q25hpx7gw"; depends=[Biobase]; }; macat = derive2 { name="macat"; version="1.68.0"; sha256="17jxgq0cblw77anx4kd3gnj1yjffid1iw2yg8kw2wvslzwyrnyn9"; depends=[annotate Biobase]; }; made4 = derive2 { name="made4"; version="1.68.0"; sha256="0jnzxd9dk3ihbjpybb9f43iww1xsz8l85ivav9a4s8zwc8nbwn8c"; depends=[ade4 Biobase gplots RColorBrewer scatterplot3d SummarizedExperiment]; }; - maftools = derive2 { name="maftools"; version="2.10.0"; sha256="1s8w3xwwigz803l81bs9cb2dbvvw5r9z8jjcav1rmh9wm8909nfd"; depends=[data_table RColorBrewer Rhtslib survival zlibbioc]; }; + maftools = derive2 { name="maftools"; version="2.10.05"; sha256="1m38j8b79xdkfaar62gpv2b31g61n6giijffmff8ryicvhkb157k"; depends=[data_table RColorBrewer Rhtslib survival zlibbioc]; }; maigesPack = derive2 { name="maigesPack"; version="1.58.0"; sha256="19xixj4mk4vgh1rvxgnscyz6mx17nyqyhj64pixhz80mwa1w5vdd"; depends=[convert graph limma marray]; }; makecdfenv = derive2 { name="makecdfenv"; version="1.70.0"; sha256="1v4x4x6x65sjdl194adhsz3l2lgcri9mmwix6dvcvd0pb321jpwn"; depends=[affy affyio Biobase zlibbioc]; }; mapscape = derive2 { name="mapscape"; version="1.18.0"; sha256="0cim9svg45glfyli0liphhix2k0864fr0kl9kafv4zigbmfv83jy"; depends=[base64enc htmlwidgets jsonlite stringr]; }; marr = derive2 { name="marr"; version="1.4.0"; sha256="00wq5s68fxp9cdc77frzk6pyim89yk3gk9786g6szx2acbaqas0j"; depends=[dplyr ggplot2 magrittr Rcpp rlang S4Vectors SummarizedExperiment]; }; marray = derive2 { name="marray"; version="1.72.0"; sha256="1la805y8j522vpiazm1z6wpq4ibia9bib5fpiia5mxmpzmqg6gzz"; depends=[limma]; }; martini = derive2 { name="martini"; version="1.14.0"; sha256="0ml5b38ivszn5qyqfi5c8xs43z05xiqhgybqaqxiasfl7rv18ikd"; depends=[igraph Matrix Rcpp RcppEigen snpStats]; }; - maser = derive2 { name="maser"; version="1.12.0"; sha256="1yb0c4jyxanqkzrznqzddhdm0lv3m991irkk0by11sssbqbmpsnd"; depends=[BiocGenerics data_table dplyr DT GenomeInfoDb GenomicRanges ggplot2 Gviz IRanges reshape2 rtracklayer]; }; + maser = derive2 { name="maser"; version="1.12.1"; sha256="1axgjckdf88nia8p6bpkxzblqydql4hbnapfspgwb4pv08409537"; depends=[BiocGenerics data_table dplyr DT GenomeInfoDb GenomicRanges ggplot2 Gviz IRanges reshape2 rtracklayer]; }; maskBAD = derive2 { name="maskBAD"; version="1.38.0"; sha256="1fkzisfa0bazg0n41g9ixzh5xaw34wdkb56dx0ljg8n1dkq28jbn"; depends=[affy gcrma]; }; massiR = derive2 { name="massiR"; version="1.30.0"; sha256="142lidx7j4n1sfizwwlschjc4di2cqz5v1q9p4v4i1xndpdxdwya"; depends=[Biobase cluster diptest gplots]; }; matchBox = derive2 { name="matchBox"; version="1.36.0"; sha256="13i22m51g72jahxpxnfjr1jxbphiihy7yhwhm0ywxra9vmabpknp"; depends=[]; }; @@ -1549,7 +1533,7 @@ in with self; { mdp = derive2 { name="mdp"; version="1.14.0"; sha256="0q721w901pxyjygz63d7a39h762ngqk8dqhn0grad82n90bywx0m"; depends=[ggplot2 gridExtra]; }; mdqc = derive2 { name="mdqc"; version="1.56.0"; sha256="06yvmgn8qhh1lmm338sdp50jfw7v148sn2mwmcps3l56vh4bci74"; depends=[cluster MASS]; }; megadepth = derive2 { name="megadepth"; version="1.4.0"; sha256="0mg7n3990qv65rg624473ssccka0yjpgc20glrdc5saci891j44r"; depends=[cmdfun dplyr fs GenomicRanges magrittr readr xfun]; }; - memes = derive2 { name="memes"; version="1.2.4"; sha256="1bdgxhy2w5yg3j41zrc7mcrgi5plc9dxg7w40skh8kdpa5s3dvmz"; depends=[Biostrings cmdfun dplyr GenomicRanges ggplot2 ggseqlogo magrittr matrixStats patchwork processx purrr readr rlang tibble tidyr universalmotif usethis xml2]; }; + memes = derive2 { name="memes"; version="1.2.5"; sha256="1524h2qq8ymy1vdqpja1yjn0wj07aawfiwjgc4lmclpjbkn57yhg"; depends=[Biostrings cmdfun dplyr GenomicRanges ggplot2 ggseqlogo magrittr matrixStats patchwork processx purrr readr rlang tibble tidyr universalmotif usethis xml2]; }; meshes = derive2 { name="meshes"; version="1.20.0"; sha256="1mwdrpqj7vphb30ii958hglzr0h4z7nv99v5sqvgjql76m8z0hcg"; depends=[AnnotationDbi AnnotationHub DOSE enrichplot GOSemSim MeSHDbi yulab_utils]; }; meshr = derive2 { name="meshr"; version="2.0.2"; sha256="030wxk7aj6d5wkfmzdji4dharmwhh9hx6rgy0igjb4lp4ih6wram"; depends=[BiocGenerics BiocStyle Category fdrtool knitr markdown MeSHDbi rmarkdown RSQLite S4Vectors]; }; messina = derive2 { name="messina"; version="1.30.0"; sha256="1k00l4qq5jn6lkna7ch9dyycrgfs446hajwki836hm1bvdfsz2q9"; depends=[foreach ggplot2 plyr Rcpp survival]; }; @@ -1575,7 +1559,6 @@ in with self; { methylInheritance = derive2 { name="methylInheritance"; version="1.18.0"; sha256="1vz2aww1523h7lrac04sq4p521bbhw4l1cx4j20ijjddd9v5kr45"; depends=[BiocParallel GenomicRanges ggplot2 gridExtra IRanges methylKit rebus S4Vectors]; }; methylKit = derive2 { name="methylKit"; version="1.20.0"; sha256="02px46h2ynprss7kwll3i0jz0clrdg0bys70jacd432xw34nm2sx"; depends=[data_table emdbook fastseg GenomeInfoDb GenomicRanges gtools IRanges KernSmooth limma mclust mgcv qvalue R_utils Rcpp Rhtslib Rsamtools rtracklayer S4Vectors zlibbioc]; }; methylMnM = derive2 { name="methylMnM"; version="1.32.0"; sha256="1l87588frvl2cs9gf45axq90xhz94xx825zhm1w0gg7pjxgkwdmb"; depends=[edgeR statmod]; }; - methylPipe = derive2 { name="methylPipe"; version="1.27.0"; sha256="0z2md9n1flzfsgsbzwffn4q6yfcjyj03bg1vi4phcknigbhg1viy"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; }; methylSig = derive2 { name="methylSig"; version="1.6.0"; sha256="0kp1ckxbidwlbv4690g236qhbh9rzjglx8gpmkihq67hfci7537v"; depends=[bsseq DelayedArray DelayedMatrixStats DSS GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; methylclock = derive2 { name="methylclock"; version="1.0.1"; sha256="00j1crflmpk02xxs0gfidrd04s8gaw3l1hiqs7qj522j13ks1q45"; depends=[Biobase devtools dplyr dynamicTreeCut ExperimentHub ggplot2 ggpmisc ggpubr impute methylclockData minfi PerformanceAnalytics preprocessCore quadprog Rcpp RPMM tibble tidyr tidyverse]; }; methylscaper = derive2 { name="methylscaper"; version="1.2.0"; sha256="0ygkx6fs8rjbqp4ry3am7vd3jsqx3nac1z1hdiib2pvgr7b6h1r7"; depends=[BiocParallel Biostrings data_table Rfast seqinr seriation shiny shinyFiles shinyjs SummarizedExperiment]; }; @@ -1591,15 +1574,15 @@ in with self; { miRSM = derive2 { name="miRSM"; version="1.12.0"; sha256="1p6qg1wnill41amv8sppz51b4li8zdlh8fq577fwl6yrp63rp319"; depends=[BiBitR BicARE biclust Biobase dbscan dynamicTreeCut energy fabia flashClust GFA GSEABase iBBiG igraph isa2 linkcomm MatrixCorrelation MCL mclust miRspongeR NMF org_Hs_eg_db PMA ppclust Rcpp rqubic s4vd SOMbrero subspace SummarizedExperiment WGCNA]; }; miRcomp = derive2 { name="miRcomp"; version="1.24.0"; sha256="1kknr5m62ly03p5yzam5c3hwpaky25g3y92h6z3sg7xfjgsd9qpz"; depends=[Biobase KernSmooth miRcompData]; }; miRmine = derive2 { name="miRmine"; version="1.16.0"; sha256="0cx7181dsfclq2dplx1wcgnaqhxlgyfxsi0g4ii82yp1ka5fpml4"; depends=[SummarizedExperiment]; }; - miRspongeR = derive2 { name="miRspongeR"; version="1.20.0"; sha256="06nczhbbvx1dmmwry88057zbvw3dq64qn5mn91ipi5qfnckb84wd"; depends=[clusterProfiler corpcor DOSE igraph linkcomm MCL org_Hs_eg_db Rcpp ReactomePA survival varhandle]; }; - mia = derive2 { name="mia"; version="1.2.3"; sha256="1la5p4p2m1c4j3i3mzlm0in8vrivkbwrfil597yjlp0z4j9ai481"; depends=[ape BiocGenerics BiocParallel Biostrings DECIPHER decontam DelayedArray DelayedMatrixStats DirichletMultinomial dplyr IRanges MASS MultiAssayExperiment rlang S4Vectors scater scuttle SingleCellExperiment SummarizedExperiment tibble tidyr TreeSummarizedExperiment vegan]; }; + miRspongeR = derive2 { name="miRspongeR"; version="1.20.1"; sha256="1xzi7irlgdqnnh9s4qrwv3p7l8y7k44iiqlc8hnyymxfhbymadym"; depends=[clusterProfiler corpcor DOSE igraph linkcomm MCL org_Hs_eg_db Rcpp ReactomePA survival varhandle]; }; + mia = derive2 { name="mia"; version="1.2.7"; sha256="10mk41v88xjk0sanxrdsa6q41j2m5a35b2b9sp993b5xrglxdrlz"; depends=[ape BiocGenerics BiocParallel Biostrings DECIPHER decontam DelayedArray DelayedMatrixStats DirichletMultinomial dplyr IRanges MASS MultiAssayExperiment rlang S4Vectors scater scuttle SingleCellExperiment SummarizedExperiment tibble tidyr TreeSummarizedExperiment vegan]; }; miaSim = derive2 { name="miaSim"; version="1.0.0"; sha256="0870jvqwcg08fyzb4c9qsb6sk7r4sxqzrrfzijd25sdjbqly4zzx"; depends=[deSolve poweRlaw SummarizedExperiment]; }; miaViz = derive2 { name="miaViz"; version="1.2.1"; sha256="02fm69mfdgh8p10ajyxrl55c5f9kwql3a2xniwllv2cic0fcf1xi"; depends=[ape BiocGenerics BiocParallel DelayedArray DirichletMultinomial dplyr ggnewscale ggplot2 ggraph ggtree mia purrr rlang S4Vectors scater SummarizedExperiment tibble tidygraph tidyr tidytree TreeSummarizedExperiment viridis]; }; microRNA = derive2 { name="microRNA"; version="1.52.0"; sha256="0x145alfh8qnbnhahxhfygcqc4xwiiirabl9k9nbcyadc5fawfc1"; depends=[Biostrings]; }; microbiome = derive2 { name="microbiome"; version="1.16.0"; sha256="0j00xbw5gh53bfij8q3q2pa8lwvn3wb23vs9lybvlhjp725h064z"; depends=[dplyr ggplot2 phyloseq reshape2 Rtsne scales tibble tidyr vegan]; }; microbiomeDASim = derive2 { name="microbiomeDASim"; version="1.8.0"; sha256="0g3lnwr5v62lkfz5fwdpjs9lr9vb8h8grqqrvwhyin5xmgkr5lnn"; depends=[Biobase ggplot2 MASS Matrix metagenomeSeq mvtnorm pbapply phyloseq tmvtnorm]; }; microbiomeExplorer = derive2 { name="microbiomeExplorer"; version="1.4.0"; sha256="0ghsv6yf6v3b2xqv6a5r2q0glzajmy5wa3qhsnds6v0gj62v5ycg"; depends=[Biobase biomformat broom car DESeq2 dplyr DT forcats heatmaply knitr limma lubridate magrittr matrixStats metagenomeSeq plotly purrr RColorBrewer readr reshape2 rlang rmarkdown shiny shinycssloaders shinydashboard shinyjs shinyWidgets stringr tibble tidyr vegan]; }; - microbiomeMarker = derive2 { name="microbiomeMarker"; version="1.0.1"; sha256="1q0d3vi0gvxyj7sala385b7xxy6qynq4agmn6lhfgipw05qr1fyk"; depends=[ALDEx2 ANCOMBC Biobase BiocGenerics biomformat Biostrings caret coin ComplexHeatmap DESeq2 dplyr edgeR ggplot2 ggsignif ggtree IRanges limma magrittr MASS metagenomeSeq multtest patchwork phyloseq plotROC purrr rlang S4Vectors tibble tidyr tidytree yaml]; }; + microbiomeMarker = derive2 { name="microbiomeMarker"; version="1.0.2"; sha256="1caf3cd5rl1kikyf66zjzwfk7w43ix0hh0f98r3y0mipdcp97rfw"; depends=[ALDEx2 ANCOMBC Biobase BiocGenerics biomformat Biostrings caret coin ComplexHeatmap DESeq2 dplyr edgeR ggplot2 ggsignif ggtree IRanges limma magrittr MASS metagenomeSeq multtest patchwork phyloseq plotROC purrr rlang S4Vectors tibble tidyr tidytree yaml]; }; midasHLA = derive2 { name="midasHLA"; version="1.2.0"; sha256="1dnqx9h3qz5p6l19s0nm90a35523cn32ymgg8pri5rc3jfrilv9k"; depends=[assertthat broom dplyr formattable HardyWeinberg kableExtra knitr magrittr MultiAssayExperiment qdapTools rlang S4Vectors stringi SummarizedExperiment tibble]; }; miloR = derive2 { name="miloR"; version="1.2.0"; sha256="1pvd8kdh6mmv10ryq038qwr07w5g0n6pnpchb653i3dixygkgd94"; depends=[BiocNeighbors BiocParallel BiocSingular cowplot dplyr edgeR ggbeeswarm ggplot2 ggraph ggrepel gtools igraph irlba limma Matrix matrixStats patchwork RColorBrewer S4Vectors SingleCellExperiment stringr SummarizedExperiment tibble tidyr]; }; mimager = derive2 { name="mimager"; version="1.18.0"; sha256="0xd5yxbljyxzvdr8y28qk1pl9sy44q9pxkpcfmxphsbf6bvy0d5b"; depends=[affy affyPLM Biobase BiocGenerics DBI gtable oligo oligoClasses preprocessCore S4Vectors scales]; }; @@ -1620,7 +1603,7 @@ in with self; { monaLisa = derive2 { name="monaLisa"; version="1.0.0"; sha256="0idfq3l3sxx2gxcksvvk6ayyv2zb9hb5bls6dkincv7mraa20max"; depends=[BiocGenerics BiocParallel Biostrings BSgenome circlize ComplexHeatmap GenomeInfoDb GenomicRanges glmnet IRanges S4Vectors stabs SummarizedExperiment TFBSTools vioplot XVector]; }; monocle = derive2 { name="monocle"; version="2.22.0"; sha256="0wb2c1jf502lrfx3d0amb09fvhalrwxvpsp99jsab162v4hddg85"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree densityClust dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; }; mosaics = derive2 { name="mosaics"; version="2.32.0"; sha256="09qz4xl9xhzidw0w41bp0adkbhnasa309yn8rdi9nsfpswhaiysb"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; }; - mosbi = derive2 { name="mosbi"; version="1.0.1"; sha256="1sazkkwm95j6yrnmin22dh0ir08d6l3i85imqzlvyf1qigqgyk2d"; depends=[akmbiclust BH biclust fabia igraph isa2 QUBIC RColorBrewer Rcpp RcppParallel xml2]; }; + mosbi = derive2 { name="mosbi"; version="1.0.3"; sha256="1l3zvc2pwd0z37v28fabrxnzfq53fmg58p3jhwb6mzi8rdmq6vak"; depends=[akmbiclust BH biclust fabia igraph isa2 QUBIC RColorBrewer Rcpp RcppParallel xml2]; }; motifStack = derive2 { name="motifStack"; version="1.38.0"; sha256="1ck6bbnrab8mbf70alfdsrcv6lq0fkvcy3klhcwyxxir7r9sgbaz"; depends=[ade4 Biostrings ggplot2 htmlwidgets XML]; }; motifbreakR = derive2 { name="motifbreakR"; version="2.8.0"; sha256="0lrgy64sv2ma6kylp4lsbwkg6ci1kn6qkk0cvzw3m4k3bgia1npj"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges grImport Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr SummarizedExperiment TFMPvalue VariantAnnotation]; }; motifcounter = derive2 { name="motifcounter"; version="1.18.0"; sha256="17yhhg423yjhaix9x2w2484l22vj6ra086ymzdfhygnjz5vanpmd"; depends=[Biostrings]; }; @@ -1643,7 +1626,7 @@ in with self; { multiscan = derive2 { name="multiscan"; version="1.54.0"; sha256="0qjh302hpld7zdrfqkbx8a5hrp3bwfn539pv36mwizjigjznnsi9"; depends=[Biobase]; }; multtest = derive2 { name="multtest"; version="2.50.0"; sha256="03z71r7g318nwwgiz0k8qwbhghw1hhdhh1an4qnb0nc62c5x9kns"; depends=[Biobase BiocGenerics MASS survival]; }; mumosa = derive2 { name="mumosa"; version="1.2.0"; sha256="093mzbkx7sf5gg5qcvyzgkfzzdpjm8pd6hb7dwavcjxf90y14l1h"; depends=[batchelor beachmat BiocGenerics BiocNeighbors BiocParallel BiocSingular DelayedArray DelayedMatrixStats igraph IRanges Matrix metapod S4Vectors ScaledMatrix scran scuttle SingleCellExperiment SummarizedExperiment uwot]; }; - muscat = derive2 { name="muscat"; version="1.8.0"; sha256="0m5i1sqi3nzxlja9nvz9msmic9mf8y9s6f60c9b2mgbfp2kyf55w"; depends=[BiocParallel blme ComplexHeatmap data_table DESeq2 dplyr edgeR ggplot2 glmmTMB limma lme4 lmerTest Matrix matrixStats progress purrr S4Vectors scales scater sctransform scuttle SingleCellExperiment SummarizedExperiment variancePartition viridis]; }; + muscat = derive2 { name="muscat"; version="1.8.1"; sha256="0dpzid0zxcyb395yaz4gbgqlv7ngfxw1i5rfybp6cf37cfrk4m70"; depends=[BiocParallel blme ComplexHeatmap data_table DESeq2 dplyr edgeR ggplot2 glmmTMB limma lme4 lmerTest Matrix matrixStats progress purrr S4Vectors scales scater sctransform scuttle SingleCellExperiment SummarizedExperiment variancePartition viridis]; }; muscle = derive2 { name="muscle"; version="3.36.0"; sha256="0a081ay0360h0r9731d145prdg15d1g96s7zzcn411qa8fwg7rv0"; depends=[Biostrings]; }; musicatk = derive2 { name="musicatk"; version="1.4.0"; sha256="168578fg6gmg48gwd6944ln30g75nyq16yzyjw175yanj09g9qfs"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 BSgenome_Hsapiens_UCSC_hg38 BSgenome_Mmusculus_UCSC_mm10 BSgenome_Mmusculus_UCSC_mm9 cluster ComplexHeatmap cowplot data_table decompTumor2Sig deconstructSigs dplyr factoextra GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel gridExtra gtools IRanges maftools magrittr MASS matrixTests MCMCprecision NMF philentropy plotly rlang S4Vectors shiny shinyalert shinyBS shinybusy shinydashboard shinyjqui shinyjs sortable stringi stringr SummarizedExperiment TCGAbiolinks tibble tidyr topicmodels TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene uwot VariantAnnotation withr]; }; mygene = derive2 { name="mygene"; version="1.30.0"; sha256="1s9hlcj9g2a3q2aa3ahjk3j2ksk4v9mpax1cxm739gywaf4sbknp"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; }; @@ -1725,13 +1708,11 @@ in with self; { pepStat = derive2 { name="pepStat"; version="1.28.0"; sha256="07k5hilmnjhqcndq6vmibargf7fr0ah4zpcd2mm6656w3xy1ywax"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; }; pepXMLTab = derive2 { name="pepXMLTab"; version="1.28.0"; sha256="0wk502spk5cmhvygnirfywk4dq13imvvbnxy97ak2c011phpaxf1"; depends=[XML]; }; periodicDNA = derive2 { name="periodicDNA"; version="1.4.0"; sha256="1v6rl234qs0la2r7qwiahslw7yr8mppcdcpand2lk8w862k67nda"; depends=[BiocParallel Biostrings BSgenome cowplot GenomeInfoDb GenomicRanges ggplot2 IRanges magrittr rtracklayer S4Vectors zoo]; }; - perturbatr = derive2 { name="perturbatr"; version="1.13.0"; sha256="0ssk8cr42hibn917s2z2nzcdan54c7xiydypbi8f3g4w68q4ly31"; depends=[assertthat diffusr doParallel dplyr foreach formula_tools ggplot2 igraph lazyeval lme4 magrittr rlang scales tibble tidyr]; }; pgca = derive2 { name="pgca"; version="1.18.0"; sha256="1wrp4k0b1sj75yhw799aqcb6dmimza6gvcxkn5ayfn6x3hfifwwl"; depends=[]; }; phantasus = derive2 { name="phantasus"; version="1.14.0"; sha256="0p8xa0jqasgn61qzzva7wrjk8d2xcsn9kd20c4dbc61sg3cxrcir"; depends=[AnnotationDbi assertthat Biobase ccaPP curl DESeq2 fgsea GEOquery ggplot2 gtable htmltools httpuv httr jsonlite limma Matrix opencpu pheatmap protolite rhdf5 Rook scales stringr svglite]; }; - phemd = derive2 { name="phemd"; version="1.9.0"; sha256="0hqivlc9hzcfcprng1499nas84fwvgisg8976vsjciyn903355jr"; depends=[Biobase BiocGenerics cluster cowplot destiny ggplot2 igraph maptree monocle phateR pheatmap pracma RANN RColorBrewer reticulate Rtsne S4Vectors scatterplot3d Seurat SingleCellExperiment SummarizedExperiment transport VGAM]; }; phenoTest = derive2 { name="phenoTest"; version="1.42.0"; sha256="0ci44hwicvz32sgv6mywawyygd1wzz2bayx6rshwvpmz1mixncq6"; depends=[annotate AnnotationDbi Biobase biomaRt BMA Category ellipse genefilter ggplot2 gplots GSEABase Heatplus hgu133a_db Hmisc hopach limma mgcv survival xtable]; }; phenopath = derive2 { name="phenopath"; version="1.18.0"; sha256="1c0cxm3cwxprjkkwimzgjz0h67dykx2jy7jin13h7vzpwwvphh2p"; depends=[dplyr ggplot2 Rcpp SummarizedExperiment tibble tidyr]; }; - philr = derive2 { name="philr"; version="1.20.0"; sha256="0dndab3wsj9mvgjpkmazd55w72cjh5xwjqs0xzjbfmkx7786rk09"; depends=[ape ggplot2 ggtree phangorn tidyr]; }; + philr = derive2 { name="philr"; version="1.20.1"; sha256="1ra7wnnn0blxvxvsa570cf6jiqd9fh0ki90j2vbckrzh33z6plyv"; depends=[ape ggplot2 ggtree phangorn tidyr]; }; phosphonormalizer = derive2 { name="phosphonormalizer"; version="1.18.0"; sha256="0qbls06h7fkqsg8yhnc8dmbqhkgxxxa29j3h7cwxdq4nvg66frjl"; depends=[matrixStats plyr]; }; phyloseq = derive2 { name="phyloseq"; version="1.38.0"; sha256="0k0aj8f7g1vr7l0qcc507b3w67zc1k9x7sdblm7mjb20zqr3916s"; depends=[ade4 ape Biobase BiocGenerics biomformat Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; }; piano = derive2 { name="piano"; version="2.10.0"; sha256="13nnysbr2ljh0r303aja797bjxppksc6ac0qms8qy8nkn155gcw3"; depends=[Biobase BiocGenerics DT fgsea gplots htmlwidgets igraph marray relations scales shiny shinydashboard shinyjs visNetwork]; }; @@ -1744,7 +1725,7 @@ in with self; { plgem = derive2 { name="plgem"; version="1.66.0"; sha256="06w8xlw4j1fc9ipdgw55dvhp07f04icmhr20lqzwwhqd5pskrra3"; depends=[Biobase MASS]; }; plier = derive2 { name="plier"; version="1.64.0"; sha256="1sw89kici1h2xfg7zvrfdm7b7iw5n3mzwhyz82676w2vk0lgkpn4"; depends=[affy Biobase]; }; plotGrouper = derive2 { name="plotGrouper"; version="1.12.0"; sha256="191grbs8sy8jfxz9a6vsp9qf3zaqppp23fcl5qdrmfzims9krhlw"; depends=[colourpicker dplyr egg ggplot2 ggpubr gridExtra gtable Hmisc magrittr readr readxl rlang scales shiny shinythemes stringr tibble tidyr]; }; - plotgardener = derive2 { name="plotgardener"; version="1.0.9"; sha256="0xv1ygbk0hv57jqfjbya85wjilyang8hbfh3fv1zpy143khmy8di"; depends=[curl data_table dplyr ggplotify plyranges purrr RColorBrewer Rcpp rlang strawr]; }; + plotgardener = derive2 { name="plotgardener"; version="1.0.15"; sha256="0gwvxvfcvcank7dny901kr74a3n52l16bf9lmas660ydhfn7g4x0"; depends=[curl data_table dplyr ggplotify IRanges plyranges purrr RColorBrewer Rcpp rlang strawr]; }; plyranges = derive2 { name="plyranges"; version="1.14.0"; sha256="1s4zyr57x71v9ywdz6s27z158nhazwhmhkx3944l8zsqd5ciwnnc"; depends=[BiocGenerics dplyr GenomeInfoDb GenomicAlignments GenomicRanges IRanges magrittr rlang Rsamtools rtracklayer S4Vectors tidyselect]; }; pmm = derive2 { name="pmm"; version="1.26.0"; sha256="0vmkpqxf0lfgkbmyvham128201d33dv3wf9g31nrlwnxd0jcxszn"; depends=[lme4]; }; pmp = derive2 { name="pmp"; version="1.6.0"; sha256="15yggymqh329f2ibhmg9wmh76hbyn0gpz9k1cxzkvh787lss1w72"; depends=[ggplot2 impute matrixStats missForest pcaMethods reshape2 S4Vectors SummarizedExperiment]; }; @@ -1772,7 +1753,7 @@ in with self; { progeny = derive2 { name="progeny"; version="1.16.0"; sha256="0zhr5i5v87akzqjb6wid67nhg2icrw6w0awdy87x848c6c1i6j9y"; depends=[Biobase dplyr ggplot2 ggrepel gridExtra tidyr]; }; projectR = derive2 { name="projectR"; version="1.10.0"; sha256="1ny6fdjqc4smd2b7s5zknm0m8mi1wrapcbzlj4n8d1mhd1xxms0d"; depends=[cluster CoGAPS dplyr ggalluvial ggplot2 limma NMF RColorBrewer reshape2 ROCR scales viridis]; }; proteinProfiles = derive2 { name="proteinProfiles"; version="1.34.0"; sha256="049q579x3m1sw0l5n22ldsrdkmcx61j8jlabq8kydwdhr6d9mbli"; depends=[]; }; - psichomics = derive2 { name="psichomics"; version="1.20.0"; sha256="158a9v201z1ad3fm572nz57l8czs8d5nhk9ig162cl1mpfhfrh35"; depends=[AnnotationDbi AnnotationHub BiocFileCache cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma pairsD3 plyr purrr R_utils Rcpp recount reshape2 Rfast shiny shinyBS shinyjs stringr SummarizedExperiment survival XML xtable]; }; + psichomics = derive2 { name="psichomics"; version="1.20.1"; sha256="1ycsazxm3ghjwawsxjyk5jm1m7nrk03y77x1lfzyqy87s1vzfy9i"; depends=[AnnotationDbi AnnotationHub BiocFileCache cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma pairsD3 plyr purrr R_utils Rcpp recount reshape2 Rfast shiny shinyBS shinyjs stringr SummarizedExperiment survival XML xtable]; }; psygenet2r = derive2 { name="psygenet2r"; version="1.26.0"; sha256="1fs2ljshqfyq4hnlm882fc0vd7x4sif5k3qlliqbxai6k5sdh3li"; depends=[BgeeDB Biobase biomaRt ggplot2 GO_db igraph labeling RCurl reshape2 stringr topGO]; }; ptairMS = derive2 { name="ptairMS"; version="1.2.0"; sha256="1y6wpg85058migpgyankns5v84jv4fk8n7raxxfryn85bqsn0ida"; depends=[Biobase bit64 chron data_table doParallel DT enviPat foreach ggplot2 ggpubr gridExtra Hmisc minpack_lm MSnbase plotly Rcpp rhdf5 rlang scales shiny shinyscreenshot signal]; }; pulsedSilac = derive2 { name="pulsedSilac"; version="1.8.0"; sha256="0k2rq76bxg9cq6vjvwwx51hph6s0z1xmka62x6hv19qwakc64qnn"; depends=[cowplot ggplot2 ggridges MuMIn R_utils robustbase S4Vectors SummarizedExperiment taRifx UpSetR]; }; @@ -1785,7 +1766,7 @@ in with self; { qckitfastq = derive2 { name="qckitfastq"; version="1.10.0"; sha256="177agr9q2rjdk67kc2nv6idnqqk2aq595yc83r8pq6h2wp2ynmn0"; depends=[data_table dplyr ggplot2 magrittr Rcpp reshape2 rlang RSeqAn seqTools zlibbioc]; }; qcmetrics = derive2 { name="qcmetrics"; version="1.32.0"; sha256="1wfc8v1z77wpqfslls8vkw9vi51ylnr8ssr6lm8xz1jd9zijf9ny"; depends=[Biobase knitr pander S4Vectors xtable]; }; qpcrNorm = derive2 { name="qpcrNorm"; version="1.52.0"; sha256="0zbp5kd6lm1qg9xzg9mibcqm7r3ap9gz7fhaf07ls5q1zk63cdj9"; depends=[affy Biobase limma]; }; - qpgraph = derive2 { name="qpgraph"; version="2.28.0"; sha256="03xkx3ck41xd62v5xnyzkqr4mj9cxsyx20fm4cw5688a1w6znafc"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; }; + qpgraph = derive2 { name="qpgraph"; version="2.28.1"; sha256="1xn414b4sibvzf2lynn3a2555kvp2lrb821dry76d2csbcdp92xk"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; }; qrqc = derive2 { name="qrqc"; version="1.48.0"; sha256="1bnm1shj543kfzljlp5hzk40k6sijja161g2fi06xy2qydilxsml"; depends=[Biostrings biovizBase brew ggplot2 plyr reshape Rhtslib testthat xtable]; }; qsea = derive2 { name="qsea"; version="1.20.0"; sha256="095ais50x4csqxjj3nq7w2h3xkr4acn3bbkmqilmy7nnpj9z9dnz"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges gtools HMMcopy IRanges limma Rsamtools rtracklayer zoo]; }; qsmooth = derive2 { name="qsmooth"; version="1.10.0"; sha256="01h7amkhbnzrp5m3j5gb1qqmfszi1qpz5vsimkrzkmpvidg932jh"; depends=[Hmisc SummarizedExperiment sva]; }; @@ -1821,10 +1802,10 @@ in with self; { reconsi = derive2 { name="reconsi"; version="1.6.0"; sha256="0djiq9l70wvicbqia14n1bbd9c7ykvsyrp0r2arw2b2pqh8281fh"; depends=[ggplot2 KernSmooth matrixStats phyloseq reshape2]; }; recount = derive2 { name="recount"; version="1.20.0"; sha256="1maa0fi6dqkcsjlbm52gl0r37qcv951xrc6m4rc6fvp6cb83x68p"; depends=[BiocParallel derfinder downloader GenomeInfoDb GenomicRanges GEOquery IRanges RCurl rentrez rtracklayer S4Vectors SummarizedExperiment]; }; recount3 = derive2 { name="recount3"; version="1.4.0"; sha256="0ciaab6q0pix7zhz7948b8w3qki8dfy9lpa0wffhqjr7fvfh2km2"; depends=[BiocFileCache data_table GenomicRanges Matrix R_utils RCurl rtracklayer S4Vectors sessioninfo SummarizedExperiment]; }; - recountmethylation = derive2 { name="recountmethylation"; version="1.4.0"; sha256="14b06842a97q9cggz6l7kfrlal1kaiq49j2f8sql4b2p6qdh4dpn"; depends=[BiocFileCache HDF5Array minfi R_utils RCurl rhdf5 S4Vectors]; }; + recountmethylation = derive2 { name="recountmethylation"; version="1.4.2"; sha256="11z8ssn7s5mgb92jcr6jcw2rxja8kdddv7bwrqhgns2qkgj52n6w"; depends=[BiocFileCache HDF5Array IlluminaHumanMethylation450kmanifest minfi R_utils RCurl rhdf5 S4Vectors]; }; recoup = derive2 { name="recoup"; version="1.22.0"; sha256="00qxkjjb4bx6vak50jjpl2l9y7myri9x7m17h01j2v2cncg48s55"; depends=[BiocGenerics biomaRt Biostrings circlize ComplexHeatmap GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 httr IRanges Rsamtools RSQLite rtracklayer S4Vectors stringr]; }; regionReport = derive2 { name="regionReport"; version="1.28.1"; sha256="03d7nbfsk55mrlhzzr81mx3ndswkfj7fajyh1yz4jakjdclvzlxm"; depends=[BiocStyle DEFormats derfinder DESeq2 GenomeInfoDb GenomicRanges knitr knitrBootstrap RefManageR rmarkdown S4Vectors SummarizedExperiment]; }; - regioneR = derive2 { name="regioneR"; version="1.26.0"; sha256="0y1mawzfvxrympc47q3isk96sl9d1bc8kdsxpm8rnhqg5bmgwya6"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer S4Vectors]; }; + regioneR = derive2 { name="regioneR"; version="1.26.1"; sha256="0k500fdmv5l0v7b9pj73bjk3h9k261mfqi6vl52khlw0fafn9b6p"; depends=[Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges memoise rtracklayer S4Vectors]; }; regsplice = derive2 { name="regsplice"; version="1.20.0"; sha256="1vm1vvi5gfw5ssyi0qng3jmanvyl2mx08w9bi5990pj0j6ycc70y"; depends=[edgeR glmnet limma pbapply S4Vectors SummarizedExperiment]; }; regutools = derive2 { name="regutools"; version="1.6.0"; sha256="03gjlpn1pk2xkcbg4i1az505nq2gi6ajplq3asbg1fl9p2dbw8kh"; depends=[AnnotationDbi AnnotationHub BiocFileCache Biostrings DBI GenomicRanges Gviz IRanges RCy3 RSQLite S4Vectors]; }; restfulSE = derive2 { name="restfulSE"; version="1.16.0"; sha256="118zmj9jhgblkgi1arwndrigc1gl37q6gydhw3xfdiml4lp2zags"; depends=[AnnotationDbi AnnotationHub bigrquery Biobase DBI DelayedArray dplyr ExperimentHub GO_db magrittr reshape2 rhdf5client rlang S4Vectors SummarizedExperiment]; }; @@ -1844,8 +1825,8 @@ in with self; { rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.24.0"; sha256="0asx51fxg9hc0brbqlxl0jyfyidh4fbwyclrvczzzqasf277f23w"; depends=[RColorBrewer]; }; roar = derive2 { name="roar"; version="1.30.0"; sha256="0hqh4vsnxl2sn1bf6s6wxl2nskb40rhvrysdvb6dr60zkih3g347"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges rtracklayer S4Vectors SummarizedExperiment]; }; rols = derive2 { name="rols"; version="2.22.0"; sha256="08asfjl6smdg05m41m0bdc2awiqbhyb016z9f77adx3vc73mh613"; depends=[Biobase BiocGenerics httr jsonlite progress]; }; - ropls = derive2 { name="ropls"; version="1.26.0"; sha256="0mz5lrdsihx66sgx9klnvpxvw1mjjcbijcsdbgxwaimzl9k1kr05"; depends=[Biobase MultiDataSet]; }; - rpx = derive2 { name="rpx"; version="2.1.12"; sha256="0ykafx304g8gdry2r1l91zbnr6zv7jkknjyv5p0dkf0wvpqy82iy"; depends=[BiocFileCache curl jsonlite RCurl xml2]; }; + ropls = derive2 { name="ropls"; version="1.26.4"; sha256="19f3wd55860x959h5n7mrivyjdas5b3jmx74lf24xnx23g26f8rn"; depends=[Biobase MultiDataSet]; }; + rpx = derive2 { name="rpx"; version="2.2.2"; sha256="05qgfchg4pyff0xqrnycxzpan0w5ry1f9w30irhpjiglp7ggf882"; depends=[BiocFileCache curl jsonlite RCurl xml2]; }; rqt = derive2 { name="rqt"; version="1.20.0"; sha256="0v2bm774y2ikwppp0w0ydqzak96ax7ga1d303vgll13xan50d391"; depends=[car CompQuadForm glmnet Matrix metap pls ropls RUnit SummarizedExperiment]; }; rqubic = derive2 { name="rqubic"; version="1.40.0"; sha256="0drzggalrvijqvq2x38r2l07rr2248rrw8lvhnfkszabb5qg4a71"; depends=[biclust Biobase BiocGenerics]; }; rrvgo = derive2 { name="rrvgo"; version="1.6.0"; sha256="0sxybvvbgrxpddfr80cla6pmf8q3kiqrd9r9ca0hq8m4av9nv9cc"; depends=[AnnotationDbi ggplot2 ggrepel GO_db GOSemSim pheatmap shiny tm treemap wordcloud]; }; @@ -1909,7 +1890,7 @@ in with self; { selectKSigs = derive2 { name="selectKSigs"; version="1.6.0"; sha256="03c1dm883vdm5cq4v0dp7kbglxvjljxls6hf7rqqaq7xbw6c9l33"; depends=[gtools HiLDA magrittr Rcpp]; }; semisup = derive2 { name="semisup"; version="1.18.0"; sha256="0zjpcw04mrxg2c31cwbfiv1kymq9zpfmwwffjhq046fiikvkda51"; depends=[VGAM]; }; seq2pathway = derive2 { name="seq2pathway"; version="1.26.0"; sha256="0r780ralqw02871ww4prm73g18wh6nxs0g0cck135kcmp1a9nbwr"; depends=[biomaRt GenomicRanges GSA nnet seq2pathway_data WGCNA]; }; - seqCAT = derive2 { name="seqCAT"; version="1.16.0"; sha256="1c63yp16rp1bfgrd6cxycwpgzglqm4hngbcr7gy4myxqqhsbrimi"; depends=[dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges rlang rtracklayer S4Vectors scales SummarizedExperiment tidyr VariantAnnotation]; }; + seqCAT = derive2 { name="seqCAT"; version="1.16.1"; sha256="011rfyb5jgcfc2g92v9d19n75wsziga16s3iqg78zb5vp3vcwnlk"; depends=[dplyr GenomeInfoDb GenomicRanges ggplot2 IRanges rlang rtracklayer S4Vectors scales SummarizedExperiment tidyr VariantAnnotation]; }; seqCNA = derive2 { name="seqCNA"; version="1.40.0"; sha256="1v8j1mm40r67ab5x38jzynrfmmlpfkwv7afrsr3zwcmxr3h2c7i3"; depends=[adehabitatLT doSNOW GLAD seqCNA_annot]; }; seqLogo = derive2 { name="seqLogo"; version="1.60.0"; sha256="013hwj2lp29nqa8mkvm25aliarg0k725crg4cpsbj0iiskyrs6rl"; depends=[]; }; seqPattern = derive2 { name="seqPattern"; version="1.26.0"; sha256="1mik575qaxw9h9qyjn971207pfgbc8p1mx60jrb20jbrrihgg2na"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; }; @@ -1917,7 +1898,7 @@ in with self; { seqbias = derive2 { name="seqbias"; version="1.42.0"; sha256="1q608c1madij8l52ljl3w52vi3cssr6ikny84yj6n8s7yvpx5jpr"; depends=[Biostrings GenomicRanges Rhtslib]; }; seqcombo = derive2 { name="seqcombo"; version="1.16.0"; sha256="0xyrjbvgrld5sy6g6sp79f43j93jnyccwg21il65fqrzb7z4d7xk"; depends=[Biostrings cowplot dplyr ggplot2 igraph magrittr yulab_utils]; }; seqsetvis = derive2 { name="seqsetvis"; version="1.14.1"; sha256="1ja286qz7m15k97ms7rm81l0picsjjpm7fmsdpbklc66y3syl089"; depends=[data_table eulerr GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 ggplotify IRanges limma pbapply pbmcapply png RColorBrewer Rsamtools rtracklayer S4Vectors UpSetR]; }; - sesame = derive2 { name="sesame"; version="1.12.7"; sha256="1gcf761alh6b86ncg8nknfshqg34102zgwcy3xjapjn37ncl7qan"; depends=[BiocParallel DNAcopy e1071 fgsea GenomicRanges ggplot2 ggrepel illuminaio IRanges KernSmooth MASS matrixStats preprocessCore randomForest reshape2 S4Vectors sesameData stringr SummarizedExperiment tibble wheatmap]; }; + sesame = derive2 { name="sesame"; version="1.12.9"; sha256="0sqmykp5nc87ixhf330bhz0vh28si3c6kfvr8rrfhhf3jvy34a2k"; depends=[BiocParallel DNAcopy e1071 fgsea GenomicRanges ggplot2 ggrepel illuminaio IRanges KernSmooth MASS matrixStats preprocessCore randomForest reshape2 S4Vectors sesameData stringr SummarizedExperiment tibble wheatmap]; }; sevenC = derive2 { name="sevenC"; version="1.14.0"; sha256="06m6479ps7896zaks8jnnak8l7c6abbsdx56k3l5ir78681g4bq1"; depends=[BiocGenerics boot data_table GenomeInfoDb GenomicRanges InteractionSet IRanges purrr readr rtracklayer S4Vectors]; }; sevenbridges = derive2 { name="sevenbridges"; version="1.24.0"; sha256="03p7p1mwa3m8zvyz5761xmqhch6cfgy42cv0swwgj0n9jr83sc23"; depends=[curl data_table docopt httr jsonlite objectProperties S4Vectors stringr uuid yaml]; }; shinyMethyl = derive2 { name="shinyMethyl"; version="1.30.0"; sha256="0ihs4l4r46qyv7j8a2g590x86y0dwki2gzllwq2a31il34jrbgq5"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; }; @@ -1935,7 +1916,7 @@ in with self; { singleCellTK = derive2 { name="singleCellTK"; version="2.4.0"; sha256="1a3j012jgysfbrknv1pp1az0zsk48yj1sjcjjchakl6lm7anzvhz"; depends=[AnnotationDbi ape batchelor Biobase BiocParallel celda celldex circlize cluster colorspace colourpicker ComplexHeatmap cowplot data_table DelayedArray DelayedMatrixStats DESeq2 dplyr DropletUtils DT enrichR ExperimentHub fields fishpond ggplot2 ggplotify ggrepel ggtree gridExtra GSEABase GSVA GSVAdata igraph KernSmooth limma magrittr MAST Matrix matrixStats metap msigdbr multtest plotly R_utils RColorBrewer reshape2 reticulate rlang rmarkdown ROCR Rtsne S4Vectors scater scDblFinder scds scMerge scran scRNAseq Seurat shiny shinyalert shinycssloaders shinyjs SingleCellExperiment SingleR SummarizedExperiment sva TENxPBMCData tibble tximport VAM withr yaml zinbwave]; }; singscore = derive2 { name="singscore"; version="1.14.0"; sha256="1mmp0sgx684d1yxpminllzb6pnl66jlrqhxifvv7g5iivqqsrm2p"; depends=[Biobase BiocParallel edgeR ggplot2 ggrepel GSEABase magrittr matrixStats plotly plyr RColorBrewer reshape reshape2 S4Vectors SummarizedExperiment tidyr]; }; sitadela = derive2 { name="sitadela"; version="1.2.0"; sha256="14r07kxj0fy1i2zmm1v8i7cwx5ff14xlmg5cdrjyzi6zws09vdp8"; depends=[Biobase BiocGenerics biomaRt Biostrings GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools RSQLite rtracklayer S4Vectors]; }; - sitePath = derive2 { name="sitePath"; version="1.10.0"; sha256="063nry7xxnic984qm29axki5rrp2dmp7kgdcjkvh8bi6y41a58sj"; depends=[ape aplot ggplot2 ggrepel ggtree gridExtra RColorBrewer Rcpp seqinr tidytree]; }; + sitePath = derive2 { name="sitePath"; version="1.10.2"; sha256="0xwv469sb0zyhzn62ps4hfbsh2vivghlflhm16l9fkaix1mgmd4j"; depends=[ape aplot ggplot2 ggrepel ggtree gridExtra RColorBrewer Rcpp seqinr tidytree]; }; sizepower = derive2 { name="sizepower"; version="1.64.0"; sha256="1jcv4hy4gq5javqvdla122d36m3gfpwwa5qv5d21fh2s90ycm3rm"; depends=[]; }; skewr = derive2 { name="skewr"; version="1.26.0"; sha256="10mfb1yklns9zhy3p9gxxdk3gihlszynilb8b20gb7522yrd124x"; depends=[IlluminaHumanMethylation450kmanifest methylumi minfi mixsmsn RColorBrewer S4Vectors wateRmelon]; }; slalom = derive2 { name="slalom"; version="1.16.0"; sha256="130qqbm63iwymwk0lwlp8sns62853l1fabij7iy30ax8hgi681kc"; depends=[BH ggplot2 GSEABase Rcpp RcppArmadillo rsvd SingleCellExperiment SummarizedExperiment]; }; @@ -1954,13 +1935,13 @@ in with self; { sparsenetgls = derive2 { name="sparsenetgls"; version="1.12.0"; sha256="0g8vbzhzyccyi77x49c8idhwy357a2azywvllinjapgwiy88s02a"; depends=[glmnet huge MASS Matrix]; }; spatialDE = derive2 { name="spatialDE"; version="1.0.0"; sha256="01dqrs8a23b0j5a0zk31g1ld5783dd6fsjiaj1vgc767mjwh0vsx"; depends=[basilisk checkmate ggplot2 ggrepel gridExtra Matrix reticulate S4Vectors scales SpatialExperiment SummarizedExperiment]; }; spatialHeatmap = derive2 { name="spatialHeatmap"; version="2.0.0"; sha256="0a67dk5jvww8lrjqq8yxbqnm2lasjhypi1k16qa7gwd2x84phghf"; depends=[av BiocFileCache data_table DESeq2 distinct dynamicTreeCut edgeR flashClust genefilter ggdendro ggplot2 ggplotify gplots gridExtra grImport HDF5Array htmlwidgets igraph limma magick plotly rappdirs reshape2 rols rsvg S4Vectors shiny shinydashboard SummarizedExperiment UpSetR visNetwork WGCNA xml2 yaml]; }; - spatzie = derive2 { name="spatzie"; version="1.0.0"; sha256="1k88ibhm8k19i1jb1xsp6xqva8gdmgcp6gqmza7snh2hk5a4r9ll"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicFeatures GenomicInteractions GenomicRanges ggplot2 IRanges matrixStats motifmatchr S4Vectors SummarizedExperiment TFBSTools]; }; + spatzie = derive2 { name="spatzie"; version="1.0.1"; sha256="08fk50y10pkpwq5cvlafs24kvzha9p6nk982vhjl0dbhlysa86vc"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicFeatures GenomicInteractions GenomicRanges ggplot2 IRanges matrixStats motifmatchr S4Vectors SummarizedExperiment TFBSTools]; }; specL = derive2 { name="specL"; version="1.28.0"; sha256="1fsv1vi7wghrn6xgkdfsr5c53jv1kfpxygzpvnc8pa37l6jfzdfg"; depends=[DBI protViz RSQLite seqinr]; }; spicyR = derive2 { name="spicyR"; version="1.6.0"; sha256="1a7nidfa0vq7qbs5j1yl429q1adic8p3pagrvw3362b59j36ryxx"; depends=[BiocGenerics BiocParallel concaveman data_table dplyr ggplot2 IRanges lme4 lmerTest mgcv pheatmap rlang S4Vectors scam spatstat_core spatstat_geom tidyr]; }; spikeLI = derive2 { name="spikeLI"; version="2.54.0"; sha256="1ndxvamn2q6ad86dfql1qa7c87xfg8q3zk6f33ip458ikmx16h3f"; depends=[]; }; spiky = derive2 { name="spiky"; version="1.0.0"; sha256="0r8n6icjkhwaq395ikcw64wgks89s84a97xc8lwgrb4lkmnlkgyj"; depends=[bamlss Biostrings BlandAltmanLeh BSgenome GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges Rsamtools S4Vectors scales]; }; spkTools = derive2 { name="spkTools"; version="1.50.0"; sha256="1fbh8lfhl3j7dgx7my3ajjfvzfl0x5rm3m0hszm9dk7zvn6zl67x"; depends=[Biobase gtools RColorBrewer]; }; - splatter = derive2 { name="splatter"; version="1.18.1"; sha256="1cbq3yfgpv54xkgax1m4c4vh29afdfffs7f8xi7fp7acvp365azx"; depends=[BiocGenerics BiocParallel checkmate crayon edgeR fitdistrplus ggplot2 locfit matrixStats S4Vectors scales scater SingleCellExperiment SummarizedExperiment]; }; + splatter = derive2 { name="splatter"; version="1.18.2"; sha256="1azcn3fckqaz8kyqzlmb25fbncyyk9ai7d9gj9bq9xnqhjr5ni1a"; depends=[BiocGenerics BiocParallel checkmate crayon edgeR fitdistrplus ggplot2 locfit matrixStats S4Vectors scales scater SingleCellExperiment SummarizedExperiment]; }; splineTimeR = derive2 { name="splineTimeR"; version="1.22.0"; sha256="0pbfflicb2zpiddslivyh9i2vly6h8jfbmpm38ljijzshmsvra6v"; depends=[Biobase FIs GeneNet GSEABase gtools igraph limma longitudinal]; }; splots = derive2 { name="splots"; version="1.60.0"; sha256="0ng1shqpjmgbfs4hlcfncq4ipl59a9xwv42h7zcc45hzm7013fq9"; depends=[RColorBrewer]; }; spqn = derive2 { name="spqn"; version="1.6.0"; sha256="081b87w4gsrqp9ny9gqc85g4nm17kxrs2bagxgja280hf7ry2f08"; depends=[BiocGenerics ggplot2 ggridges matrixStats SummarizedExperiment]; }; @@ -1977,7 +1958,7 @@ in with self; { stepNorm = derive2 { name="stepNorm"; version="1.66.0"; sha256="1v5a5zcczd65kzmpkjhr793z74f1758mbql0izwavc609ai5a241"; depends=[marray MASS]; }; strandCheckR = derive2 { name="strandCheckR"; version="1.12.0"; sha256="1j7h8psn90zdz78j2115gwpdikkvpcfbv8izpwazawgl59byb4w8"; 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.6.0"; sha256="1vnszdh24f8hh2kcpxr9whbpbws3qnm0zldjg5pdvkfvnsq6fa00"; depends=[knitr ontologyIndex rols S4Vectors SummarizedExperiment]; }; - structToolbox = derive2 { name="structToolbox"; version="1.6.0"; sha256="06b29kxi0gsai959vpqaknpccb20r7ij1dhj73nwcy9a0lc92n0z"; depends=[ggplot2 ggthemes gridExtra scales sp struct]; }; + structToolbox = derive2 { name="structToolbox"; version="1.6.1"; sha256="1p39d2w0q1hi7jm6chm29pf68wp241hzr0p65hjfqdcq4bq39jkp"; depends=[ggplot2 ggthemes gridExtra scales sp struct]; }; subSeq = derive2 { name="subSeq"; version="1.24.0"; sha256="1yyj74cff2zjl7i5ms44805jb65f1xbd0f9yh084n4f3qn0vp7jh"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; }; supersigs = derive2 { name="supersigs"; version="1.2.0"; sha256="0g622ci7761nk8baxi3w4m9qfalv2l97irkrpjsglmqf3rnc1h47"; depends=[assertthat Biostrings caret dplyr rlang rsample SummarizedExperiment tidyr]; }; supraHex = derive2 { name="supraHex"; version="1.32.0"; sha256="00z4dir261xr5v2ajs8vifhyy35agcqjph9jlwg8q9f3s2n89c6x"; depends=[ape dplyr hexbin igraph magrittr MASS purrr readr stringr tibble tidyr]; }; @@ -1991,7 +1972,7 @@ in with self; { switchBox = derive2 { name="switchBox"; version="1.30.0"; sha256="09z9wi8yzjq49rjmn707a1kvf7c203lbxcnc7znwhy7lv51svj67"; depends=[gplots pROC]; }; switchde = derive2 { name="switchde"; version="1.20.0"; sha256="1n815zwj5znddgc3pz87089q8bvb14n2g61zfang8d8pna4zbf7v"; depends=[dplyr ggplot2 SingleCellExperiment SummarizedExperiment]; }; synapsis = derive2 { name="synapsis"; version="1.0.0"; sha256="1kqapzcd2zvmyaqshcrfxkkaf6k7kwaqnd6g4dhnjcf2wqnf6fs5"; depends=[EBImage]; }; - synergyfinder = derive2 { name="synergyfinder"; version="3.2.2"; sha256="0kpvp0lamchbgs4p34pbq14y3zrmgk0pgil0qhsrm3kv1pizk1w8"; depends=[dplyr drc furrr future ggforce ggplot2 ggrepel gstat kriging lattice magrittr metR mice nleqslv pbapply plotly purrr reshape2 sp SpatialExtremes stringr tidyr tidyverse vegan]; }; + synergyfinder = derive2 { name="synergyfinder"; version="3.2.8"; sha256="07fjam0c6j5ga75601vsbp4x1x8h31gxwxanwjxmixnv7md0pdms"; depends=[dplyr drc furrr future ggforce ggplot2 ggrepel gstat kriging lattice magrittr metR mice nleqslv pbapply plotly purrr reshape2 sp SpatialExtremes stringr tidyr tidyverse vegan]; }; synlet = derive2 { name="synlet"; version="1.24.0"; sha256="1xidxlkppap0x8h9iiyl78lcx50ckpg46n8pl49vz4435vd6grp2"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; }; systemPipeR = derive2 { name="systemPipeR"; version="2.0.5"; sha256="1j91pyfjsqngxxlxjqc477pznlfax4vayrks2q12rxw76ija80hf"; depends=[BiocGenerics Biostrings crayon GenomicRanges ggplot2 htmlwidgets magrittr Rsamtools S4Vectors ShortRead stringr SummarizedExperiment yaml]; }; systemPipeShiny = derive2 { name="systemPipeShiny"; version="1.4.0"; sha256="0h803ijajf32igfknkaivlzrc323apzligq1j8ghpf02q7f5q830"; depends=[assertthat bsplus crayon dplyr drawer DT ggplot2 glue htmltools magrittr openssl plotly R6 rlang RSQLite rstudioapi shiny shinyAce shinydashboard shinydashboardPlus shinyFiles shinyjqui shinyjs shinytoastr shinyWidgets spsComps spsUtil stringr styler tibble vroom yaml]; }; @@ -2030,14 +2011,14 @@ in with self; { traseR = derive2 { name="traseR"; version="1.24.0"; sha256="0ch8hamhjjdcpi95gjqybzmk8vgx2j70gnlfiswvp8bjwf15hlfp"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; }; traviz = derive2 { name="traviz"; version="1.0.0"; sha256="03w4jpx5vp4cf3g77cks6dp8dkl66bbjsixr4j25xc3xr26g6kw0"; depends=[Biobase ggplot2 mgcv princurve RColorBrewer rgl SingleCellExperiment slingshot SummarizedExperiment viridis]; }; treeio = derive2 { name="treeio"; version="1.18.1"; sha256="19i8jhvycv57zbxhpn5gx5ymdiws64kc3nidc00xh1j9a8xkj1aq"; depends=[ape dplyr jsonlite magrittr rlang tibble tidytree]; }; - treekoR = derive2 { name="treekoR"; version="1.2.0"; sha256="1xrq8j7cr6s4a9171xqm1iw3a1dzdnmgyy68knilr42nxak064nn"; depends=[ape data_table diffcyt dplyr edgeR ggiraph ggplot2 ggtree hopach lme4 multcomp patchwork SingleCellExperiment tidyr]; }; + treekoR = derive2 { name="treekoR"; version="1.2.1"; sha256="07bgxrb523abdvzg1c7ahl1mkkfiisl1z97jb3yjdp024zg64qdi"; depends=[ape data_table diffcyt dplyr edgeR ggiraph ggplot2 ggtree hopach lme4 multcomp patchwork SingleCellExperiment tidyr]; }; trena = derive2 { name="trena"; version="1.16.0"; sha256="1kz68z0dixiiryd62diddq352h8sx6r15flxm7h715abcniniyjn"; 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 vbsr WGCNA xgboost]; }; - tricycle = derive2 { name="tricycle"; version="1.2.0"; sha256="1jcvbzpd5cfyyy6n6kvi0biyrv4m86z5fdmhjkg5wm4dm61r5n9q"; depends=[AnnotationDbi circular dplyr GenomicRanges ggplot2 IRanges RColorBrewer S4Vectors scater scattermore SingleCellExperiment SummarizedExperiment]; }; + tricycle = derive2 { name="tricycle"; version="1.2.1"; sha256="19yh7yif8630j845m9rddva2z0xy4jcw9j4hvyr076jqbyxz998r"; depends=[AnnotationDbi circular dplyr GenomicRanges ggplot2 IRanges RColorBrewer S4Vectors scater scattermore SingleCellExperiment SummarizedExperiment]; }; trigger = derive2 { name="trigger"; version="1.40.0"; sha256="0irlxzy6vhp2q3lr9b4qnv7w43c3sdh7ali3rw1fgfpg29i4jc1f"; depends=[corpcor qtl qvalue sva]; }; trio = derive2 { name="trio"; version="3.32.0"; sha256="16bnh1q53b2pkw4v7why5b1srl39zw6iza34yxynv34b8529sl46"; depends=[LogicReg siggenes survival]; }; triplex = derive2 { name="triplex"; version="1.34.0"; sha256="0niyiafps242y9gnrc85ncb28c1q9ny1b20la53397h5w46sqq6i"; depends=[Biostrings GenomicRanges IRanges S4Vectors XVector]; }; tripr = derive2 { name="tripr"; version="1.0.0"; sha256="0lcyjqn2my782hq8bmab08hpp0sgaz3c6wbcywn3pidcc0zqr56p"; depends=[config data_table dplyr DT golem gridExtra plot3D plotly plyr pryr RColorBrewer shiny shinyBS shinyFiles shinyjs stringdist stringr]; }; - tscR = derive2 { name="tscR"; version="1.6.0"; sha256="0mbyl00mylw0cvlbh93vxbc86y7fgn6n0zw7k0ix9cx7dx7kjwfm"; depends=[class cluster dplyr dtw GenomicRanges ggplot2 gridExtra IRanges kmlShape knitr latex2exp prettydoc RColorBrewer rmarkdown S4Vectors SummarizedExperiment]; }; + tscR = derive2 { name="tscR"; version="1.6.1"; sha256="1k9f79gy0ickf8mizkmxzazkrbpl0rssdjafpcvx37a1ykgn9qax"; depends=[class cluster dplyr dtw GenomicRanges ggplot2 gridExtra IRanges kmlShape knitr latex2exp prettydoc RColorBrewer rmarkdown S4Vectors SummarizedExperiment]; }; tspair = derive2 { name="tspair"; version="1.52.0"; sha256="0pm1rdiiza2737nar790zi2b37n25gpdxbg8ljg3a84mlji5jsws"; depends=[Biobase]; }; ttgsea = derive2 { name="ttgsea"; version="1.2.1"; sha256="0b6c55vzay7jaacff3nrd0ks6l4qsmhjja38rs2qlabzqhyrfzi4"; depends=[data_table DiagrammeR keras purrr stopwords text2vec textstem tm tokenizers]; }; tweeDEseq = derive2 { name="tweeDEseq"; version="1.40.0"; sha256="0xqd0i5d5q5fm58gxpxac24zpqpyj5dgab0kziwyn8pfyp1w5s4h"; depends=[cqn edgeR limma MASS]; }; @@ -2049,7 +2030,7 @@ in with self; { uSORT = derive2 { name="uSORT"; version="1.20.0"; sha256="0y6a6ksvbrxyqri0mc01nbls107sacs66zmbjs4qxq52rmy5xvcd"; depends=[Biobase BiocGenerics cluster fpc gplots igraph Matrix monocle plyr RANN RSpectra VGAM]; }; uncoverappLib = derive2 { name="uncoverappLib"; version="1.4.0"; sha256="0nh5z1iirqdiv5q66k1r8byv9dasnzyinl0plan68gxvia770cnb"; depends=[BiocFileCache BSgenome_Hsapiens_UCSC_hg19 condformat DT EnsDb_Hsapiens_v75 EnsDb_Hsapiens_v86 GenomicRanges Gviz Homo_sapiens markdown openxlsx org_Hs_eg_db OrganismDbi processx rappdirs rlist Rsamtools shiny shinyBS shinycssloaders shinyjs shinyWidgets stringr TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; }; unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.30.0"; sha256="0kw26bm2yyna38q5r4zb2alpa3j4gx7v970419mnjlif4g0hmggk"; depends=[BiocGenerics HTqPCR]; }; - universalmotif = derive2 { name="universalmotif"; version="1.12.2"; sha256="1p9zdrsxqn4ayvbj05xgpzpbzkzrh7k0d62x10069687vfl6dlxg"; depends=[BiocGenerics Biostrings ggplot2 IRanges MASS Rcpp RcppThread rlang S4Vectors yaml]; }; + universalmotif = derive2 { name="universalmotif"; version="1.12.4"; sha256="01skcvzd815m3c15ka2pk7z6bggc4l8bhvaf4z9v95i36k4mn5zd"; depends=[BiocGenerics Biostrings ggplot2 IRanges MASS Rcpp RcppThread rlang S4Vectors yaml]; }; variancePartition = derive2 { name="variancePartition"; version="1.24.0"; sha256="0f5y61dpzwmr8v7npim18zvxa8n49rbzclb9j72haba0px6ibhvw"; depends=[Biobase BiocParallel doParallel foreach ggplot2 gplots iterators limma lme4 lmerTest MASS Matrix pbkrtest progress reshape2 rlang scales]; }; vbmp = derive2 { name="vbmp"; version="1.62.0"; sha256="0yavhi3n9nlgq2s0xvglsnfi9yxdl0di8vs30h9p6a0hh3d1c8ql"; depends=[]; }; velociraptor = derive2 { name="velociraptor"; version="1.4.0"; sha256="16v1qxl8z5pr3ygvby5n2klw0wm468fbsch1b9a67il8bjxslg0j"; depends=[basilisk BiocGenerics BiocParallel BiocSingular DelayedArray Matrix reticulate S4Vectors scuttle SingleCellExperiment SummarizedExperiment zellkonverter]; }; @@ -2079,11 +2060,30 @@ in with self; { zinbwave = derive2 { name="zinbwave"; version="1.16.0"; sha256="05w95bnq63a339d8x4932k81ycqf825s3qwn98vr52v5g2hv46fq"; depends=[BiocParallel edgeR genefilter Matrix SingleCellExperiment softImpute SummarizedExperiment]; }; zlibbioc = derive2 { name="zlibbioc"; version="1.40.0"; sha256="0a0dl7z58zxdj6938zbxixphgljj1giylk1nd05bb7qsccmp0xhj"; depends=[]; }; ALPS = derive2 { name="ALPS"; version="1.5.0"; sha256="1aydvzc6x0871iasij68xqdlhjyg69qbqxm0qh1q52w8gj2nyq3p"; depends=[assertthat BiocParallel ChIPseeker corrplot data_table dplyr genefilter GenomicRanges GGally gghalves ggplot2 ggseqlogo Gviz magrittr org_Hs_eg_db plyr reshape2 rtracklayer stringr tibble tidyr TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene]; broken = true; }; + Autotuner = derive2 { name="Autotuner"; version="1.7.0"; sha256="0k07gs6bnxs0894iqi1lhk96mifjcdf68bv4q9fjv50nzqpzqd8l"; depends=[assertthat Biobase cluster entropy MSnbase mzR RColorBrewer scales]; broken = true; }; + CHETAH = derive2 { name="CHETAH"; version="1.9.0"; sha256="1nfz8zpkrghfh942cr8xwvrj0d47h1nbf3nv534mp7rii38v07j3"; depends=[bioDist corrplot cowplot dendextend ggplot2 gplots pheatmap plotly reshape2 S4Vectors shiny SingleCellExperiment SummarizedExperiment]; broken = true; }; CompGO = derive2 { name="CompGO"; version="1.28.0"; sha256="16nlrk9wbxj51y8s7s58mdhpi70ghfacxi283406gwya3cm79f0n"; depends=[GenomicFeatures ggplot2 pathview pcaMethods reshape2 Rgraphviz rtracklayer TxDb_Mmusculus_UCSC_mm9_knownGene]; broken = true; }; + CountClust = derive2 { name="CountClust"; version="1.21.0"; sha256="17px9jkpjwz0j2f5h8xv52wh24ilqvlb6dvczjc36lb7mq4cw3sq"; depends=[cowplot flexmix ggplot2 gtools limma maptpx picante plyr reshape2 slam SQUAREM]; broken = true; }; EasyqpcR = derive2 { name="EasyqpcR"; version="1.31.0"; sha256="0lb2px789668fr1gxghycy7lbdkpwmippv6xmmwws6rbanvfd6v4"; depends=[matrixStats plotrix plyr]; broken = true; }; + FindMyFriends = derive2 { name="FindMyFriends"; version="1.23.0"; sha256="0xbhl6ljxb522r5062vv6xdziaaqkkwylmvlymvc5f1grjz0a4z9"; depends=[Biobase BiocGenerics BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; broken = true; }; FlowRepositoryR = derive2 { name="FlowRepositoryR"; version="1.23.0"; sha256="04lk2cahf6zqnhpzh0zwas4vmvaz4kcik9ri65bs9d9ximzjam91"; depends=[jsonlite RCurl XML]; 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; }; + Herper = derive2 { name="Herper"; version="1.3.0"; sha256="038cavnbz7gvmv9mpnf88n8dzrg7yl306y68zsq5hpkrj6qax9vr"; depends=[reticulate rjson withr]; broken = true; }; + HiCBricks = derive2 { name="HiCBricks"; version="1.11.0"; sha256="12s01r9z569pp6amlvcs7fqmwivw9jb2ahnnyq6nzflsyn5277kl"; depends=[BiocParallel curl data_table digest GenomeInfoDb GenomicRanges ggplot2 IRanges jsonlite R_utils R6 RColorBrewer readr reshape2 rhdf5 S4Vectors scales stringr tibble viridis]; broken = true; }; + MBQN = derive2 { name="MBQN"; version="2.5.0"; sha256="01pf9wkk3dsxgx1y8mxfxn9m2j2hqipc5kajm7w8g60bj9flg09j"; depends=[BiocFileCache ggplot2 limma PairedData preprocessCore rappdirs RCurl rpx SummarizedExperiment xml2]; broken = true; }; MSEADbi = derive2 { name="MSEADbi"; version="1.2.0"; sha256="1g1kg3nh7iwg5nrpmig6srw6as4yfwmbqn965pffrk0zp19llsbf"; depends=[AnnotationDbi Biobase DBI RSQLite]; broken = true; }; + 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.7.0"; sha256="1smhwmrgckgivf6xfk54sz197cw1mar95chzkrfpf4wxw3jzbbkn"; depends=[BiocParallel bsseq DNAcopy DSS GenomeInfoDb GenomicRanges IRanges methylKit S4Vectors]; broken = true; }; + RmiR = derive2 { name="RmiR"; version="1.49.0"; sha256="16nwh4a97qvyicm4f102xs52lx8cld0b80fykgil86kkd6v8zlja"; depends=[DBI RmiR_Hs_miRNA]; 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; }; SwimR = derive2 { name="SwimR"; version="1.29.0"; sha256="0n58x3i4k3icvhg8z60zlhpszv8bb9pain07nl9rszyvmpi71vg2"; depends=[gplots R2HTML signal]; broken = true; }; + XCIR = derive2 { name="XCIR"; version="1.7.0"; sha256="0n42pw01wv1sk06hby9kwijx6zwaw4lrlpsa0wlkrkf323slkllw"; depends=[biomaRt data_table ggplot2 IRanges readxl S4Vectors seqminer VariantAnnotation]; broken = true; }; affyPara = derive2 { name="affyPara"; version="1.51.0"; sha256="01165f84snc3ksk0ghw631i2l5jklp4n826jwy5926wvxy3zlwz0"; depends=[affy affyio aplpack snow vsn]; broken = true; }; + coexnet = derive2 { name="coexnet"; version="1.15.0"; sha256="1h3l7rjk757qbddyg0p8l21h8z3i4n3ml295lmavszsm9knyc2fk"; depends=[acde affy Biobase GEOquery igraph limma minet rmarkdown siggenes STRINGdb SummarizedExperiment vsn]; broken = true; }; + compEpiTools = derive2 { name="compEpiTools"; version="1.27.0"; sha256="0hk3yd7ql91wg9r24r57ybhs1nx6zbd5v199sv7xd91k980n2ay5"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges GO_db gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; broken = true; }; + dualKS = derive2 { name="dualKS"; version="1.53.0"; sha256="16cfcylmmcj8x2808529lbpm7qbbrxygic0jkaglhqcdxgrqw3rw"; depends=[affy Biobase]; broken = true; }; methyAnalysis = derive2 { name="methyAnalysis"; version="1.34.0"; sha256="05k3n7iy5ijidbnblbqqas8dsj8drwzbhyrbs8wl1ypkg51havi0"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges lumi methylumi org_Hs_eg_db rtracklayer SummarizedExperiment VariantAnnotation]; broken = true; }; + methylPipe = derive2 { name="methylPipe"; version="1.27.0"; sha256="0z2md9n1flzfsgsbzwffn4q6yfcjyj03bg1vi4phcknigbhg1viy"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; broken = true; }; + perturbatr = derive2 { name="perturbatr"; version="1.13.0"; sha256="0ssk8cr42hibn917s2z2nzcdan54c7xiydypbi8f3g4w68q4ly31"; depends=[assertthat diffusr doParallel dplyr foreach formula_tools ggplot2 igraph lazyeval lme4 magrittr rlang scales tibble tidyr]; broken = true; }; + phemd = derive2 { name="phemd"; version="1.9.0"; sha256="0hqivlc9hzcfcprng1499nas84fwvgisg8976vsjciyn903355jr"; depends=[Biobase BiocGenerics cluster cowplot destiny ggplot2 igraph maptree monocle phateR pheatmap pracma RANN RColorBrewer reticulate Rtsne S4Vectors scatterplot3d Seurat SingleCellExperiment SummarizedExperiment transport VGAM]; broken = true; }; } diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index dec48149e935..ee3f719fd12e 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -4,7 +4,7 @@ # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix { self, derive }: -let derive2 = derive { snapshot = "2022-01-05"; }; +let derive2 = derive { snapshot = "2022-03-10"; }; in with self; { A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; }; AATtools = derive2 { name="AATtools"; version="0.0.1"; sha256="08is383xhs2lc9wfffykcwqyl8mwcxfpk3lnvlpkp96hq9m9ikbf"; depends=[doParallel dplyr foreach magrittr]; }; @@ -17,15 +17,18 @@ in with self; { ABPS = derive2 { name="ABPS"; version="0.3"; sha256="0n3f66nmfi5v94il1mxy026mi84w01ph2aljk60vn3mrz8kwf2ll"; depends=[kernlab]; }; ACA = derive2 { name="ACA"; version="1.1"; sha256="1i3hm27nvnkvc39xlh0d1blq8q0q02czmvgi3cazmjx3jvxay0vq"; depends=[]; }; ACD = derive2 { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; }; + ACDC = derive2 { name="ACDC"; version="1.0.0"; sha256="11nlg6pcmfa8pl1f5fxxcig1z1j74yizllh5y9rcdbdfzcasvnzn"; depends=[colorspace deSolve dplyr ggplot2 latex2exp magrittr patchwork tibble tidyr]; }; ACDm = derive2 { name="ACDm"; version="1.0.4"; sha256="0b4f02ga5ra66mbrm79g0bnlzmii82rks9kmxixxqgf18yhlyjil"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; }; ACEsearch = derive2 { name="ACEsearch"; version="1.0.0"; sha256="1ssq8avj20dk2mal0j5dvshf7qgk0as90sgl71cn91cq8lbiilpn"; depends=[httr testthat]; }; ACEt = derive2 { name="ACEt"; version="1.8.1"; sha256="0b5lfpnppyk0237phr2aybhx29nhm8ngwk2qa1y4lshrvsw97wg4"; depends=[BH MASS Rcpp RcppArmadillo]; }; ACNE = derive2 { name="ACNE"; version="0.8.1"; sha256="0kzapsalzw6jsi990qicp4glijh5ddnfimsg5pidgbwxg4i05grl"; depends=[aroma_affymetrix aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; ACSWR = derive2 { name="ACSWR"; version="1.0"; sha256="195vjrkang5cl7gwsna0aq4p0h4jym9xg9yh94bnf8vq6wf8j83n"; depends=[MASS]; }; ACTCD = derive2 { name="ACTCD"; version="1.2-0"; sha256="0mzjxxr2zfdidw8ibh6w8mvpkw3q3nvngqi05g9ind26ckvk053p"; depends=[GDINA R_methodsS3]; }; + ACWR = derive2 { name="ACWR"; version="0.1.0"; sha256="19q8m5swp7ivrxi8rbkpp37d6fwr35zd8xs4ygpfgd07axc9451s"; depends=[r2d3]; }; ADAPTS = derive2 { name="ADAPTS"; version="1.0.21"; sha256="0ddmgk1syi0mafgp3fyvgz95ny8disyvmkd859ya32lykjjmwsxv"; depends=[ComICS doParallel e1071 foreach missForest nnls pcaMethods pheatmap preprocessCore quantmod ranger]; }; ADCT = derive2 { name="ADCT"; version="0.1.0"; sha256="1glf83ydx4v3ld8c4gb9h3jk6srd054bis5l8k57p1ba4fnqnnpp"; depends=[mvtnorm]; }; ADDT = derive2 { name="ADDT"; version="2.0"; sha256="044bb1jw2m8vwk5q8l7rlz4kqphjvy8i9d59rjg0k5q5l9vczfrp"; depends=[coneproj Matrix nlme]; }; + 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]; }; @@ -45,7 +48,7 @@ in with self; { AGD = derive2 { name="AGD"; version="0.39"; sha256="0hmq684snnffc2v7vmns4ky200a6zh1ggiap03n5cvpb3nlqc6lr"; depends=[gamlss gamlss_dist]; }; AGHmatrix = derive2 { name="AGHmatrix"; version="2.0.4"; sha256="1pvnv3fzxfdzjz9il0022k46kkcb57ypz31qn0br7mck64bkzsia"; depends=[Matrix zoo]; }; AGPRIS = derive2 { name="AGPRIS"; version="1.0"; sha256="0xlaz75d19adfq79sh5aa52bzpmjqawshay2a3vw9mq8l23z64if"; depends=[Matrix matrixcalc maxLik plyr rgdal sp spacetime spdep]; }; - AGSDest = derive2 { name="AGSDest"; version="2.3.2"; sha256="0f3qchvdi2n1cr8ipjj332dw8hdza58dvfk21p0c6bhmxzg7f71i"; depends=[ldbounds]; }; + AGSDest = derive2 { name="AGSDest"; version="2.3.4"; sha256="140bqzgaagdyzgxsn998jw2sxak448i47xyacn2psfnps440gfjr"; depends=[ldbounds]; }; AGread = derive2 { name="AGread"; version="1.1.1"; sha256="0ar0cnlaxxmvn2gdydmm9vr45xjhx06kky556d17l93k0xwfvzm3"; depends=[anytime binaryLogic data_table DescTools dplyr GGIR lubridate magrittr PAutilities Rcpp reshape2 rlang seewave stringr]; }; 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.3"; sha256="0ygdxyliq9wmpmjgmq1wb6a1g9pv6jl0lzaz7545gzwn7nwdw1y7"; depends=[coda mvtnorm plotrix RandomFields raster sp spdep unmarked]; }; @@ -60,6 +63,7 @@ in with self; { ALSCPC = derive2 { name="ALSCPC"; version="1.0"; sha256="0ippxzq5qwb9dnpvm1kxhc0fxh83rs9ny5rcvd30w2bp632q9qdx"; depends=[]; }; ALSM = derive2 { name="ALSM"; version="0.2.0"; sha256="1g7zk8q462j4faq5wzzghkjc003ny6rj8hrymsgvh3fg3a72lvy3"; depends=[car leaps SuppDists]; }; ALTopt = derive2 { name="ALTopt"; version="0.1.2"; sha256="1nbbvniramajg6k83xqgx7r0abjrfja8zz0y3g3j8qmvbcqmjx13"; depends=[cubature lattice]; }; + ALUES = derive2 { name="ALUES"; version="0.2.1"; sha256="12fayxz0cb8wibccgz62gzrbkwzw2y4xljixrh02i1lbfwgsky14"; depends=[Rcpp]; }; ALassoSurvIC = derive2 { name="ALassoSurvIC"; version="0.1.0"; sha256="0q02rz947bp6i7sbb5nzxq8ky74iprdnpbwnmnn7vg29vhca4b09"; depends=[Rcpp]; }; AMAP_Seq = derive2 { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; }; AMAPVox = derive2 { name="AMAPVox"; version="0.1.0"; sha256="1c91ghjyaxqc23bvq3n4drjpqskbnr32d988hsbph44ypj0n2acj"; depends=[data_table stringr]; }; @@ -69,7 +73,7 @@ in with self; { AMModels = derive2 { name="AMModels"; version="0.1.4"; sha256="18h075bzk8s75b3zmjd0x8c6dpl40445d4kv8n0p4ldnx80b1aha"; depends=[unmarked]; }; AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; }; AMPLE = derive2 { name="AMPLE"; version="1.0.0"; sha256="1lcwwf41i0mkg2bv8z5mzrj6h3pa31h33mrmbxbndjgb3ivz2wf5"; depends=[ggplot2 markdown R6 RColorBrewer scales shiny shinyjs shinyscreenshot]; }; - AMR = derive2 { name="AMR"; version="1.7.1"; sha256="1ggd3lwiimlb6qrd444jcx0capkq5rxr7m8wb9q663z1332grv1b"; depends=[]; }; + AMR = derive2 { name="AMR"; version="1.8.0"; sha256="0vxm8rd2c4v4v0xq3h1yfxdjibz72pv9a8z43f3ii2ymgdwg5d31"; 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]; }; @@ -81,9 +85,10 @@ in with self; { APAtree = derive2 { name="APAtree"; version="1.0.1"; sha256="0vhvx2xp62avyq405jqn4i3z8awlifcs1lb527brxxhybrhnk4rv"; depends=[BH FD lwgeom raster Rcpp sf units]; }; APCI = derive2 { name="APCI"; version="1.0.5"; sha256="0wkpcjsgzk01x4qc395wwqr856fr096v8vhydcw84yrmp8w3clxx"; depends=[data_table dplyr gee ggplot2 ggpubr magrittr stringr survey]; }; APCanalysis = derive2 { name="APCanalysis"; version="1.0"; sha256="11snn5i8zyjpzf58ica762fpp14v7x5h8a8iwx4s4v81pgvlx862"; depends=[]; }; + APCtools = derive2 { name="APCtools"; version="1.0.1"; sha256="1aq55a3glsqyp7gzly1nfaxxlyiq2ki6h9i5qwgz7dbni4vwggd4"; depends=[checkmate colorspace dplyr ggplot2 ggpubr knitr mgcv scales tidyr]; }; APFr = derive2 { name="APFr"; version="1.0.2"; sha256="1vax7rfccds6qz3bi6n1h3nzl9jnxpwk331wmpsbqlk23md3m4g4"; depends=[]; }; APIS = derive2 { name="APIS"; version="1.0.1"; sha256="1af82mixamllly7v1jfvn1anpm1pafkv5mshwp6nmc27vaq201z5"; depends=[doParallel foreach ggplot2 gridExtra]; }; - APML = derive2 { name="APML"; version="0.0.2"; sha256="08krjwc807k72ir27p6rpipk8am8q4cj8nblc15mf6i234rg1s88"; depends=[dplyr dummies ggplot2 h2o performanceEstimation pROC survival tidyverse]; }; + APML = derive2 { name="APML"; version="0.0.4"; sha256="1zvrl73fhq4lbxdjxg0kxl44qqc7692q3k05lrrz5bkajz4c4ikr"; depends=[dplyr dummies ggplot2 h2o performanceEstimation pROC survival]; }; 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]; }; APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; @@ -97,12 +102,12 @@ in with self; { ARDL = derive2 { name="ARDL"; version="0.1.1"; sha256="0vmx21dvbz5l67drdma77z9x30j6sw650lhkrkcbifjn915x6dks"; depends=[aod dplyr dynlm lmtest msm stringr zoo]; }; ARHT = derive2 { name="ARHT"; version="0.1.0"; sha256="1fz81a202r8vk655dg6a03zfq3gfkimqjvmc95k3j02xz0iv58kn"; depends=[]; }; ARIbrain = derive2 { name="ARIbrain"; version="0.2"; sha256="18c7yxkrnqh18gcfzvdc5wqig6ywdmjcy8rlz0fdj3b8fb84dfpr"; depends=[hommel plyr RNifti]; }; - AROC = derive2 { name="AROC"; version="1.0-3"; sha256="07kzkb0mlx8nj8c0kz2b6in51biwawv7vvqqkg0h5zfj92k26hdb"; depends=[Hmisc MASS Matrix moments nor1mix np spatstat spatstat_geom]; }; - ARPALData = derive2 { name="ARPALData"; version="1.2.2"; sha256="1mp5wrkl6d0yg8vrp7p2b6jg6d1gchkda1nyxhcpa7wj96khnh2w"; depends=[aweek data_table doParallel dplyr eurostat ggplot2 lubridate magrittr moments purrr readr rlang RSocrata sf stringi stringr tibble tidyr tidyselect tidyverse tm]; }; + 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.2.3"; sha256="1zpl3dpqkf9m9d4hqqmcbqb3dz8gcqyp0rhs8gvs5vgidsy5sjv8"; depends=[aweek data_table doParallel dplyr eurostat ggplot2 lubridate magrittr moments mondate purrr readr rlang RSocrata sf stringi stringr tibble tidyr tidyselect tidyverse tm]; }; ARPobservation = derive2 { name="ARPobservation"; version="1.2.1"; sha256="1gpq5wl3mwp4hi49h1g6nnizzpnfc19pv8chdyhv8y5sraq1k2ag"; depends=[]; }; ART = derive2 { name="ART"; version="1.0"; sha256="186w1ivj5v3h906crl953qxgai5wiznaih83dgvwgnmabs9p1wvk"; depends=[car]; }; ARTP2 = derive2 { name="ARTP2"; version="0.9.45"; sha256="12nqxry2jkl1n07rbms38mrnp39cn00d0h272d9f1z5x883flv62"; depends=[data_table Formula]; }; - ARTofR = derive2 { name="ARTofR"; version="0.3.3"; sha256="1ha76ilbbl8bfls8sbk98k6qysymy3jphmkn51j9sr60ghsdlxg4"; depends=[bannerCommenter clipr]; }; + 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.1"; sha256="0fj5mcaqpvgcwb6zp8yc5747clm6js99r3lqx5d3536w6k0f51r0"; depends=[gmm lmec MASS Matrix mnormt MomTrunc mvtnorm numDeriv sandwich tmvtnorm TTmoment]; }; ASGS_foyer = derive2 { name="ASGS.foyer"; version="0.3.1"; sha256="089c4vm629rni0dfgg3r2a9s9yisdx1qs2dwssg44qw1w4hf1f50"; depends=[sp]; }; @@ -115,13 +120,13 @@ in with self; { AST = derive2 { name="AST"; version="0.1.0"; sha256="0z5dw5qw0i61v4796ms7pp66f9y4ylxrcls31ixzcmkklh3rcnp3"; depends=[]; }; ATAforecasting = derive2 { name="ATAforecasting"; version="0.0.56"; sha256="1gqqs0jf6wwiza0wncyymjigz5010c3i6rl8zlwvylgwpby1p9rj"; depends=[forecast Rcpp RcppArmadillo Rdpack seasonal stlplus stR timeSeries TSA tseries xts]; }; ATE = derive2 { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; }; + ATNr = derive2 { name="ATNr"; version="1.0.1"; sha256="1ryh99yifldml6fpprz01lap1nzlifjb2w8wgnmx95byz7gayrm9"; depends=[deSolve 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]; }; ATmet = derive2 { name="ATmet"; version="1.2.1"; sha256="17lzb4qnxgvlwy5zaz250mb0c4ayk509700k8mj8zf4dgv51kxa3"; depends=[DiceDesign lhs metRology msm sensitivity]; }; AUC = derive2 { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; }; AUCRF = derive2 { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; }; AUtests = derive2 { name="AUtests"; version="0.99"; sha256="0ima350mjlqvij6f9xy6wfcibvlji7nh0prpqngj7apn82ri4m2k"; depends=[logistf]; }; - AWAPer = derive2 { name="AWAPer"; version="0.1.46"; sha256="02n662wvd8qwshfmj9qfff730qs6ls82hkdsphw05jj6llddi4k5"; depends=[chron Evapotranspiration maptools ncdf4 raster sp xts zoo]; }; AWR = derive2 { name="AWR"; version="1.11.189-1"; sha256="1imvpmq6br0z7l67w66a5s1ylbv6xvypj0wc09bmjy7sapdmkn4x"; depends=[rJava]; }; AWR_Athena = derive2 { name="AWR.Athena"; version="2.0.7-0"; sha256="1j9bqhyk0jzry4g379ml65gwxlszn7pjif1dywgns98jbry8mavh"; depends=[rJava RJDBC]; }; AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; }; @@ -134,14 +139,14 @@ 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.1.2"; sha256="13b5yazgv9kckcp6gck183mh1m0q8lc5ixagmcy9s8kv2wz7wq45"; 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.0.3"; sha256="0xcn2ymxb4npk1q8hap1ckj27mrkici44wjckc9v42mija29n8wk"; depends=[data_table ggplot2]; }; + ActivePathways = derive2 { name="ActivePathways"; version="1.0.4"; sha256="1prhwx0nnwy2q62l2r0z31mhk4mq6xdr6mjihdlwpwgwq4rfi60y"; depends=[data_table ggplot2]; }; ActivityIndex = derive2 { name="ActivityIndex"; version="0.3.7"; sha256="1zj2b6x31a1kxl80rarmkrlm7ack4154mrkbqs3fpi48zpmjbgd5"; depends=[data_table matrixStats R_utils]; }; AcuityView = derive2 { name="AcuityView"; version="0.1"; sha256="0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l"; depends=[fftwtools imager plotrix]; }; - AdMit = derive2 { name="AdMit"; version="2.1.8"; sha256="0fp2y6cxl9iklvd4w6igmwr2qi5vpqyl7rzli48cxz1pvgb9qz4x"; depends=[mvtnorm]; }; + AdMit = derive2 { name="AdMit"; version="2.1.9"; sha256="0dlmqpwqfhhc4z2xr44f00xsg0hbmw2c5z2d4pbifv36jlrdxbip"; depends=[mvtnorm]; }; AdaSampling = derive2 { name="AdaSampling"; version="1.3"; sha256="1c8dh8lxyb076317n4qk2g3qv5j4mc1dszbh3k1p2b0nxiprqk5i"; depends=[caret class e1071 MASS]; }; AdapEnetClass = derive2 { name="AdapEnetClass"; version="1.2"; sha256="01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc"; depends=[glmnet imputeYn lars quadprog]; }; AdapSamp = derive2 { name="AdapSamp"; version="1.1.1"; sha256="1jayjrsiib2ij4rxxj59g71r3xhzl5yqh0lhi8k6cfy03i7dkvis"; depends=[pracma]; }; - AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.67"; sha256="0s8vv960pkbccpwlfsg1jsfjnfmq9iy8cj1fak5fn2s60zb7nm0a"; depends=[MASS mgcv nlme SemiPar]; }; + AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.68"; sha256="0hcmqiczb03377msz1m75nnpa6wc6zfgpz3cp0qpc9msdl1y83hh"; depends=[MASS mgcv nlme SemiPar]; }; AdaptGauss = derive2 { name="AdaptGauss"; version="1.5.6"; sha256="076jjnqp4ayq4kh95qns4kfzfvl6mjllhsq6hfp66bww7w976xxh"; depends=[DataVisualizations pracma Rcpp shiny]; }; AdaptiveSparsity = derive2 { name="AdaptiveSparsity"; version="1.6"; sha256="0imr5m8mll9j6n4icsv6z9rl5kbnwsp9wvzrg7n90nnmcxq2cz91"; depends=[MASS Matrix Rcpp RcppArmadillo]; }; AdequacyModel = derive2 { name="AdequacyModel"; version="2.0.0"; sha256="0amp6ic1wylk24sp9wpx3ci38njj7b9qjqfp89j39hkl6kc1q7sq"; depends=[]; }; @@ -155,8 +160,9 @@ in with self; { AeroSampleR = derive2 { name="AeroSampleR"; version="0.1.12"; sha256="0p9mnmvr3mq41a39b8gcj99f4nh7wxwv4xly3c7bwwy2mi5c4qm5"; depends=[dplyr ggplot2 ggthemes magrittr 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.2.5"; sha256="1j0snk71i0kwq5zjagi3ksk2nqprdg0ff711r01nr7gxaznn1rzx"; depends=[cowplot crayon drc dunn_test emmeans ggplot2 ggrepel lme4 lmtest MASS multcomp multcompView nortest RColorBrewer]; }; + AgroR = derive2 { name="AgroR"; version="1.2.7"; sha256="0fk1q9pqqxmllk0462nlbijg61qixbfqv78r0gf3y9ch5njj0hgh"; depends=[cowplot crayon drc dunn_test emmeans ggplot2 ggrepel lme4 lmtest MASS multcomp multcompView nortest RColorBrewer]; }; AgroReg = derive2 { name="AgroReg"; version="1.2.1"; sha256="0pdr39vimd749h4khw9jj48k3k6ysi50ppc8jcca4sr7rmq138dc"; depends=[boot broom dplyr drc egg ggplot2 minpack_lm rcompanion]; }; + AgroTech = derive2 { name="AgroTech"; version="1.0.1"; sha256="1r04ns77axjm1nfhxbdq2zwr8gkbxrxblh9kicpv8jznc7ngb8mi"; depends=[crayon ggplot2 ggrepel gridExtra lmtest nortest readxl xlsx]; }; AhoCorasickTrie = derive2 { name="AhoCorasickTrie"; version="0.1.2"; sha256="0zh3y5jd8m0xbj6lqr01zvwj9qd1xr3iq7vd6sgr3g3qh4kqm5pq"; depends=[Rcpp]; }; 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]; }; Ake = derive2 { name="Ake"; version="1.0"; sha256="1dj598xfdyjqvysc39a0d5gizgk367c5lkddmwmsqa8zjmvpr15a"; depends=[]; }; @@ -165,8 +171,9 @@ in with self; { AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; }; AlleleRetain = derive2 { name="AlleleRetain"; version="2.0.2"; sha256="0b6h5giskqbjbrk8nf29i75wrhxsjw1c87laiqzrpbp9n717bl20"; depends=[]; }; AlleleShift = derive2 { name="AlleleShift"; version="1.0-2"; sha256="0pmjh5nq67fxnwlszp5rlmnmzg4gdjkr9dzaz6b0p7vh2cfy9m45"; depends=[adegenet BiodiversityR vegan]; }; - AlphaPart = derive2 { name="AlphaPart"; version="0.8.4"; sha256="177208h034xzjkn965si83v92qaniayhdl1bpvrvmp6q8anmywp4"; depends=[directlabels gdata ggplot2 pedigree Rcpp reshape]; }; - AlphaSimR = derive2 { name="AlphaSimR"; version="1.0.4"; sha256="115rn03dgpgcb5h9f2f5rz7kmlrfqdr0xdw7l9f4v7wkbdmr9h0l"; depends=[BH R6 Rcpp RcppArmadillo]; }; + Allspice = derive2 { name="Allspice"; version="1.0.3"; sha256="1l11alczi3bq8l9np4wzwf19sfnkqpbllqw54mx30py7qz6p1ng3"; depends=[]; }; + AlphaPart = derive2 { name="AlphaPart"; version="0.9.2"; sha256="1k0ib1v8jssdgnjjkwapiy4vjf380dk103kmxlziz771vq2wsaix"; depends=[directlabels dplyr gdata ggplot2 magrittr pedigree Rcpp reshape]; }; + AlphaSimR = derive2 { name="AlphaSimR"; version="1.1.2"; sha256="0pc3byi19ydlnmddgc76gdqgvlyw7ixa3k55471x8kxnz22fhcx1"; depends=[BH R6 Rcpp RcppArmadillo]; }; Amelia = derive2 { name="Amelia"; version="1.8.0"; sha256="0plrnmlwn91bmrx8ip83nqb15ykjxjl6m49788sinq5cinkdbh9y"; depends=[foreign Rcpp RcppArmadillo]; }; AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; }; AmesHousing = derive2 { name="AmesHousing"; version="0.0.4"; sha256="080r0fkmqsdrjgwbmdzacnkmd8py611z54i6r7nzj14r295d5qhk"; depends=[dplyr magrittr]; }; @@ -175,16 +182,14 @@ in with self; { AmpGram = derive2 { name="AmpGram"; version="1.0"; sha256="1j5zx6n8cyzh6dnv96234zmlfj90fs9w4vm32xw8iqgvpcviqyz6"; depends=[biogram devtools pbapply ranger shiny stringi]; }; AmpliconDuo = derive2 { name="AmpliconDuo"; version="1.1.1"; sha256="0vw06x47vc0dqzafgpkn4abdsrhxfs9dq8nnrr2pl49skj5n4hks"; depends=[ggplot2 xtable]; }; AmyloGram = derive2 { name="AmyloGram"; version="1.1"; sha256="1xdi3i3nw4fzj4d040r55f0gid72gy3vbz5nbdrvapl97zk3kp8c"; depends=[biogram ranger seqinr shiny]; }; - AnDE = derive2 { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization foreign functional stringr]; }; AnaCoDa = derive2 { name="AnaCoDa"; version="0.1.4.4"; sha256="1b03bxysvw9v4j3bzsmrjf5ci06v6s83ix89qxy73ba5akf2gb7h"; depends=[mvtnorm Rcpp VGAM]; }; AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-24"; sha256="0qkhw6bik6s82h4yb5bashqjl8wfxarivvz6r5ffn9cgrvlwyahd"; depends=[fastICA R_matlab]; }; AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; }; AnchorRegression = derive2 { name="AnchorRegression"; version="0.1.3"; sha256="1bmlxk5j3i9mm71cwz785q5sysp8hsyy0080kgd3ksx78p68ara5"; depends=[glmnet mgcv selectiveInference]; }; - Andromeda = derive2 { name="Andromeda"; version="0.5.0"; sha256="1cr4lhaf6h2albipn23ly4h9d84krva92kdj36a8z0m646273rlp"; depends=[cli DBI dbplyr dplyr hms pillar rlang RSQLite tidyselect zip]; }; + Andromeda = derive2 { name="Andromeda"; version="0.6.0"; sha256="0q102bspkbx0nh80q92c8841fqz1y4rh1w29sw8shd5jplbfp5af"; depends=[cli DBI dbplyr dplyr hms pillar rlang RSQLite tidyselect zip]; }; AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="1.0.2"; sha256="1nhd0i30g5wb5jh96gfaa0lgnbnj0m2vy4gz7v2c3142396zalnx"; depends=[dplyr ggplot2]; }; AnimalHabitatNetwork = derive2 { name="AnimalHabitatNetwork"; version="0.1.0"; sha256="1bhqypkiw5v9w26jbdmhndqj5hjfmf7zwivrq2hgs0zcjxwa8gfn"; depends=[ggplot2 igraph]; }; AnnoProbe = derive2 { name="AnnoProbe"; version="0.1.6"; sha256="182m711l5m037mfyvr6334pmv338fxb3007j6713abvylsh6x06q"; depends=[Biobase DT ggplot2 ggpubr pheatmap]; }; - AnnotLists = derive2 { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; }; AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.3.0"; sha256="1q5yxzzmzvw1r64r4y0xh1fiyhaqbx5q4lzpawqaggra4w9igdl8"; depends=[ape seqinr]; }; AnnuityRIR = derive2 { name="AnnuityRIR"; version="1.0-0"; sha256="0yvfqzwhm5nhywfhzkxkfm07c0qi6z21j1cdaypz89qn567aj1d9"; depends=[actuar EnvStats fitdistrplus mc2d tseries]; }; AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; }; @@ -197,13 +202,14 @@ in with self; { AovBay = derive2 { name="AovBay"; version="0.1.0"; sha256="110y9wbqr0m9b6wr1c5mncrdjpg247308989bswkqnim2msvnzcf"; depends=[BayesFactor BH broom car dplyr DT highcharter htmltools moments nortest purrr Rcpp RcppEigen RcppParallel reshape rstan rstantools shiny shinycssloaders shinydashboard shinydashboardPlus StanHeaders stringr tibble waiter]; }; ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.3"; sha256="0h4snigh1yhp34vw52h4b6qbh9c4cvwz2cx8fwvbnw6lslmg5cgv"; depends=[doParallel foreach stringr]; }; AppliedPredictiveModeling = derive2 { name="AppliedPredictiveModeling"; version="1.1-7"; sha256="1wi0sw5w1c51rmh9z98wdpk5rgzsylkkb6g019djiwxvj92l99hh"; depends=[CORElearn ellipse lattice MASS plyr reshape2]; }; + AquaBPsim = derive2 { name="AquaBPsim"; version="0.0.1"; sha256="0bf83kp8j7il5q9kr8r0pxlnsf6l9nvhgkny4y5wgc8pbki0dsmz"; depends=[MASS matlib pedigree readxl]; }; AquaEnv = derive2 { name="AquaEnv"; version="1.0-4"; sha256="07yx7mbslqgqg7ky67n3xfhskaj7s3w5mvl7xkih48xbsdlmxi4l"; depends=[minpack_lm]; }; ArArRedux = derive2 { name="ArArRedux"; version="1.0"; sha256="11h88gnj54cn5fbxf163s8kjqc1q452nzb218fjlwsxxwzaz5gbr"; depends=[]; }; ArCo = derive2 { name="ArCo"; version="0.3-1"; sha256="1afjdmcalx3m19jlvqs83fg5qlds59l5zzg3pzk13qk31r0hz7mk"; depends=[boot glmnet Matrix]; }; ArDec = derive2 { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; }; ArchaeoChron = derive2 { name="ArchaeoChron"; version="0.1"; sha256="1qma2432mm73h72g9ah1k02wlcb6yrhc6mpai9nj7v58s126ffxn"; depends=[ArchaeoPhases Bchron coda rjags]; }; - ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.5"; sha256="1jp5ip595vvni1iqqm5wiqmqw9g2d1vvvwl06cr8qj8yh4n6xsfw"; depends=[coda digest dplyr DT ggalt ggplot2 ggthemes gplots hdrcde magrittr readr reshape2 shiny shinythemes tibble toOrdinal]; }; - ArchaeoPhases_dataset = derive2 { name="ArchaeoPhases.dataset"; version="0.1.0"; sha256="1bwfw3azhz4cbcinimj1nnmz04zw4lmn3bh419w73jmcswqrym0n"; depends=[]; }; + ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.6"; sha256="0yhvk5lc80fdhcc0m2rp7li0l370c6d1ka0hf00nwcf4xdmd9hsy"; depends=[coda digest dplyr DT ggalt ggplot2 ggraph ggthemes gplots gtools hdrcde magrittr readr reshape2 shiny shinythemes tibble toOrdinal]; }; + ArchaeoPhases_dataset = derive2 { name="ArchaeoPhases.dataset"; version="0.2.0"; sha256="0yffzc9jmyiil3p0bvf0fpq64mn55swcnizi3bgsl44d4j93y68q"; depends=[]; }; Arothron = derive2 { name="Arothron"; version="2.0.3"; sha256="0rb1n9pmp7q2wdihn26kbpyvyznlk8mrs8c26l1ar4q29jw44rw4"; depends=[abind alphashape3d compositions doParallel foreach geometry Morpho rgl Rvcg stringr vegan]; }; AsioHeaders = derive2 { name="AsioHeaders"; version="1.16.1-1"; sha256="0hp08v6if476745v2mk9k2sp1ikiac94fcnp8v9jdcyx954fqqlq"; depends=[]; }; AssetCorr = derive2 { name="AssetCorr"; version="1.0.4"; sha256="0r98li2lxhfap1hn6h0l78phpm9m1nlcqhwzpq0ahhw0b1rd4qkf"; depends=[boot ggplot2 knitr mvQuad mvtnorm numDeriv qpdf Rdpack VineCopula]; }; @@ -214,7 +220,7 @@ in with self; { AsthmaNHANES = derive2 { name="AsthmaNHANES"; version="1.1.0"; sha256="106c6fh20s98fzixs4jpa4d413himrfg31rzwsxp72yldqxg70fx"; depends=[]; }; AsyK = derive2 { name="AsyK"; version="1.5.5"; sha256="0mr09gfxq2xsdrh7h28fkczhs44m367gf7zj09kc5lc5zwd9fs83"; depends=[DELTD]; }; AsynchLong = derive2 { name="AsynchLong"; version="2.1"; sha256="111kg1cacqlz4df1lnijybnrifjscjm78ji9p0ia615gacvdcfxa"; depends=[]; }; - AtmChile = derive2 { name="AtmChile"; version="0.2.0"; sha256="0hrga00jsg6k7cjck7a4pqj0gx8n4issblp372vxhnpa5slqy1gg"; depends=[data_table DT lubridate openair plotly shiny shinycssloaders]; }; + AtmChile = derive2 { name="AtmChile"; version="0.2.1"; sha256="1f4csk8qa6pimyhycnbd7jyj85gzadcxlfq8bfmjrs7rqydx7bqh"; depends=[data_table DT lubridate openair plotly shiny shinycssloaders]; }; AtmRay = derive2 { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; }; AugmenterR = derive2 { name="AugmenterR"; version="0.1.0"; sha256="0hi501p8ksaqzc9dq16dbmkz50kakgw3k0awdkbpci5can2sqvfl"; depends=[]; }; AurieLSHGaussian = derive2 { name="AurieLSHGaussian"; version="0.2.0"; sha256="0dzwqv396inbx4r6758vr4gip1y42ahavspadgm4xhafvipg73rb"; depends=[flexclust igraph lsa reshape2 stringdist]; }; @@ -238,7 +244,7 @@ in with self; { AzureKusto = derive2 { name="AzureKusto"; version="1.0.6"; sha256="02wj1nzbs9l6aapk94p89gahbffmk3gy80l57bd1l0afpw0y3jr8"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble 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]; }; - AzureStor = derive2 { name="AzureStor"; version="3.6.0"; sha256="0yghwrhapamwfa4rbqmkk0ng68sl3f4jr0h3zr2lb4bqa4mc9nam"; depends=[AzureRMR httr mime openssl R6 vctrs xml2]; }; + AzureStor = derive2 { name="AzureStor"; version="3.6.1"; sha256="090nkkg30s2fzxkywjy5c82x76pmg53affyin0xq2fbxxg3gp5vi"; 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]; }; @@ -259,7 +265,8 @@ in with self; { BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; BASS = derive2 { name="BASS"; version="1.2.2"; sha256="14zimfdkpsil22n1z4ldpi9smmja5kf7qqlklr5sr7y5avnh0hd9"; depends=[hypergeo truncdist]; }; BASiNET = derive2 { name="BASiNET"; version="0.0.4"; sha256="0pmn4znqhpav729ai7zr027a7sx6bz2lmlk086crmwm1fnwipqq4"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; }; - BAT = derive2 { name="BAT"; version="2.7.1"; sha256="03p2nfws16ya9zxqdnx7v02pvd0hqh34j6g0xk72wa2kpx4lv0jr"; depends=[ape geometry hypervolume MASS nls2 raster vegan]; }; + BASiNETEntropy = derive2 { name="BASiNETEntropy"; version="0.99.1"; sha256="1jacfcnl86frnrnhil4xx8hi7v2l0na7ldb8nfhic1cdrmz323jr"; depends=[Biostrings igraph randomForest]; }; + BAT = derive2 { name="BAT"; version="2.8.0"; sha256="102z5x2c1dvmizza4zbzldimxl0vrvr9dnsm9jq7k9ml2mbipv3l"; depends=[ape geometry hypervolume MASS nls2 raster vegan]; }; BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; 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]; }; BB = derive2 { name="BB"; version="2019.10-1"; sha256="0kf9sfsm3n036a8a8gjfpc9qdryvadb019kqjh80n1szdv7bdl04"; depends=[quadprog]; }; @@ -281,7 +288,6 @@ in with self; { 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.1"; sha256="058iir5mhgc7zy1nha8g6299ya9jvg1skxj3flgn3b97snjx5qky"; depends=[igraph Rcpp stringr]; }; BCellMA = derive2 { name="BCellMA"; version="0.3.4"; sha256="1njprs7ksv0w18ffs0agz0290aa2akw48225iaa3bjhbl08dpidl"; depends=[ggplot2 reshape2]; }; BCgee = derive2 { name="BCgee"; version="0.1"; sha256="0ad0dj2ymgvkmcmq3jlpmn0pgigdql0xgvcwsbpdydv33a6snr04"; depends=[]; }; BClustLonG = derive2 { name="BClustLonG"; version="0.1.3"; sha256="1p6fm60vhs9l3b120h2l7nz4rf4ckhka7124kzwjd7znax2a336g"; depends=[lme4 MASS mcclust Rcpp RcppArmadillo]; }; @@ -294,10 +300,11 @@ in with self; { BED = derive2 { name="BED"; version="1.4.4"; sha256="1hbdjxh695607ppmk39xclh26k1bq9hrysyp8nc5axhhg1drpiff"; depends=[dplyr DT htmltools miniUI neo2R readr rstudioapi shiny stringr visNetwork]; }; BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; }; BEDMatrix = derive2 { name="BEDMatrix"; version="2.0.3"; sha256="1pq333x1shxw3wcqgcb4gqg6rwa0hyc24rib235q4zg10r2gyrbm"; depends=[crochet]; }; + BEKKs = derive2 { name="BEKKs"; version="1.0.1"; sha256="0r8hcbkby9b60qyc0hjr1hi0k1zyzg546ggx8hfm83z0507qsdj0"; depends=[expm forecast future future_apply ggfortify ggplot2 gridExtra mathjaxr 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.4.1"; sha256="1jaqsj3gyl1jdpl9m2jm10s9zpwr25s70nxn4yg14aik5grccd6r"; depends=[Rcpp]; }; + BET = derive2 { name="BET"; version="0.4.2"; sha256="14d5b90rnf0hh2jsyagm3lg5fk3iri4jw9zwxjfbqhqmsf5hkqi7"; 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]; }; BFS = derive2 { name="BFS"; version="0.4.1"; sha256="1crlx3v6bsd5gi0f1hhlcykydbpqn9fryfw5k0ynlcivgif0ll9z"; depends=[janitor jsonlite lifecycle magrittr pxweb rvest tibble tidyRSS xml2]; }; BFpack = derive2 { name="BFpack"; version="1.0.0"; sha256="1z5j6gd8zv39advb4xmpcbixbg8n516h0gpqkblb8dnb4mbh6d1s"; depends=[bain extraDistr lme4 MASS Matrix mvtnorm pracma]; }; @@ -316,7 +323,7 @@ in with self; { BHTSpack = derive2 { name="BHTSpack"; version="0.6"; sha256="01y3ly83i70lkg2kgbw1r7r1g4k9rk41qyzzscbp8zgc9z63ll8z"; depends=[R2HTML xtable]; }; BI = derive2 { name="BI"; version="1.0.0"; sha256="192qdw2ag8sdw5v7xsc19y2a6w7gs58lnlh0yakc2i0jjad3iyw5"; depends=[]; }; BICORN = derive2 { name="BICORN"; version="0.1.0"; sha256="0mqk8vgp6jdk7f0paa06yqlibkd1y3vs69pg7i9mkvxmda7p4nkq"; depends=[]; }; - BIEN = derive2 { name="BIEN"; version="1.2.4"; sha256="1dagrs54ciagm2mgqrvxl6k2akahr0qk63ifxqnks7iljm0x1gw6"; depends=[ape DBI doParallel fasterize foreach raster rgdal rgeos RPostgreSQL sf sp]; }; + BIEN = derive2 { name="BIEN"; version="1.2.5"; sha256="0s98n6zbf48vssd3h63k6kashcxv1kawcb026n0ngsfpc5dv6i48"; depends=[ape DBI doParallel fasterize foreach raster rgdal rgeos RPostgreSQL sf sp]; }; BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="3.3-12"; sha256="1kphczvj3rxyjvi93cx2j714scvmmpqv5wrg5pdyy8l891jxsr89"; depends=[miceadds Rcpp RcppArmadillo]; }; BIGDAWG = derive2 { name="BIGDAWG"; version="3.0.3"; sha256="1zbikvhyaksbddv2kz8nqkidjy4qsfp6a8wwyxjy5a0wcnqnwsxf"; depends=[haplo_stats httr XML]; }; BIGL = derive2 { name="BIGL"; version="1.6.5"; sha256="1ksp88nspjd2si0kicv3j6fvb8i46phgpf6mw8ihfxkn9mrjbs2v"; depends=[ggplot2 MASS minpack_lm nleqslv numDeriv progress rgl robustbase scales]; }; @@ -325,6 +332,7 @@ in with self; { BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; }; BIOMASS = derive2 { name="BIOMASS"; version="2.1.7"; sha256="015gfn7b0viymrb06q33gwz8ljpiwawrdscb2q2bk0j6vi1gnncx"; depends=[data_table jsonlite minpack_lm proj4 rappdirs raster sp]; }; BIOdry = derive2 { name="BIOdry"; version="0.8"; sha256="1zga8g50wjnnz2h9b3ak9q67qnl1f14cq6hvdzf9f84pphsnpasa"; depends=[ecodist nlme]; }; + BISdata = derive2 { name="BISdata"; version="0.1-1"; sha256="0h0fw2qhv0jq9h7mig7rfg5w9gc9q3hz6jl5n3v85yjkw5fxfdns"; depends=[]; }; BKPC = derive2 { name="BKPC"; version="1.0.1"; sha256="17gmhf6qq8jn2xzkqvjq60xzy0slz6kgfpd0d6hlpnf30ww7q923"; depends=[kernlab]; }; 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=[]; }; @@ -345,7 +353,7 @@ in with self; { 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]; }; BMTME = derive2 { name="BMTME"; version="1.0.19"; sha256="07iw6aqcwn4a29b85cavfw6hp66csdzlaqwas40zr5ga3kp72j51"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; }; - BMisc = derive2 { name="BMisc"; version="1.4.3"; sha256="1v7869kppbavr6y57bsafw8qc92p6ap1gkgzk8vgq3qj7blirpw6"; depends=[Rcpp RcppArmadillo tidyr]; }; + BMisc = derive2 { name="BMisc"; version="1.4.4"; sha256="0ppi3yfk4ll16njj4d25cckk4g5b989zn49hk2if8yimqhmhgnsx"; depends=[data_table Rcpp RcppArmadillo]; }; BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; }; BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.3"; sha256="1dnylvag24zqp93acdbn0ilbdzbn250pjjp6hjdd9d1zvla2ck85"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; }; BNPTSclust = derive2 { name="BNPTSclust"; version="2.0"; sha256="1ymvklv6d9684xzwdkvaxdjd1q20xmsf6kkfibn2wphlaqs2rh2n"; depends=[MASS mvtnorm]; }; @@ -366,15 +374,15 @@ in with self; { BRDT = derive2 { name="BRDT"; version="0.1.0"; sha256="1yv2fh4cc9h35l8cngpxnqa83a7bx79pr7c1gp9h84p1pigg8282"; depends=[]; }; BRETIGEA = derive2 { name="BRETIGEA"; version="1.0.3"; sha256="0q4phggz6smzd294znr1fp0gskpcwdbd6hnvvl3q3z1h7cpf40sn"; depends=[]; }; BRINDA = derive2 { name="BRINDA"; version="0.1.3"; sha256="1nq7wlwwlyfff0rn4yv8bws0ibd7wssb1jd6ccc7xvhdb2bqv9kc"; depends=[berryFunctions data_table dplyr Hmisc rlang]; }; - BRISC = derive2 { name="BRISC"; version="1.0.2"; sha256="1qkb98wlqyhi378darx62f5ymsr290pqq82msqwcj6ks0xi9mj2s"; depends=[matrixStats pbapply RANN rdist]; }; + BRISC = derive2 { name="BRISC"; version="1.0.4"; sha256="1gvasqx9876jirh37imvxhlnr2qri0gd5nz5fjk9d0vj15w7kxsc"; depends=[matrixStats pbapply RANN rdist]; }; BRL = derive2 { name="BRL"; version="0.1.0"; sha256="13qi78v3057qn4hfby14sp26hy3ibl50f06x8gpak6gi76g8bhwi"; depends=[]; }; BRugs = derive2 { name="BRugs"; version="0.9-1"; sha256="1m3dlw6201bzf6fcm4qscpsmgjkpidwiil3m4iwfn0b0iv3dclcv"; depends=[coda]; }; BSBT = derive2 { name="BSBT"; version="1.2.0"; sha256="1whf34fbnsjargby8dq2784rj9mj80ldjgdd3nm897h05h17bs9f"; depends=[expm igraph MASS]; }; BSDA = derive2 { name="BSDA"; version="1.2.1"; sha256="0vcf3h1rkgs0mr6rri2zjkb3c62dmndm281zh4ddz2vyw27wpwg2"; depends=[e1071 lattice]; }; BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; }; BSGW = derive2 { name="BSGW"; version="0.9.2"; sha256="1q6qvm9yxh35wywrzs3kr31jsa0bmbwrqh0r3qjc0dzi6q8n6pjy"; depends=[doParallel foreach MfUSampler survival]; }; - BSL = derive2 { name="BSL"; version="3.2.2"; sha256="0yn0ay7f9214d8f5ghrpn4bzwfxv5gk13ip10f1mpkhqv0cjbham"; depends=[coda copula DBI doRNG foreach ggplot2 glasso gridExtra MASS mvtnorm Rcpp RcppArmadillo Rdpack stringr whitening]; }; - BSPADATA = derive2 { name="BSPADATA"; version="1.0"; sha256="1g709i0icxlxq2ljb2sm5iyc8ljqxadi62xc4mg702fsgl0x5ny9"; depends=[mvtnorm pscl spdep]; }; + BSL = derive2 { name="BSL"; version="3.2.4"; sha256="16w5lkzwq8b393cxga4cdcwk1f185g24k7lq0xr842g94cc8jdpl"; depends=[coda copula DBI 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]; }; BSS = derive2 { name="BSS"; version="0.1.0"; sha256="1lxmrdmr6c0niqz61kc9ybzszprn66jyinfy4dr9r6i161gvs4qg"; depends=[hypergeo MASS phangorn]; }; BSSasymp = derive2 { name="BSSasymp"; version="1.2-3"; sha256="1nqj8w8ilyhladjzhjp1rhi3ff7ik1m76pdhgs16ph7pzdw36w6i"; depends=[fICA JADE]; }; BSSprep = derive2 { name="BSSprep"; version="0.1"; sha256="0dkhx8vx9kg902i6nzkzbighf2szq12l0p8iwinlpb2qdf526lk6"; depends=[Rcpp RcppArmadillo]; }; @@ -387,7 +395,7 @@ in with self; { 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]; }; BUCSS = derive2 { name="BUCSS"; version="1.2.1"; sha256="1nf0xpy5r49yfd0xydzxxxrc6isj14s8lswrf5nhh7g60nkkwcxr"; depends=[]; }; - BVAR = derive2 { name="BVAR"; version="1.0.2"; sha256="12x6jkfgmskhvr8xgyfik8i5hkb8garq27k3nyvl69ickhgwrjk3"; depends=[mvtnorm]; }; + BVAR = derive2 { name="BVAR"; version="1.0.3"; sha256="0x0cb0hj7a7lww0mvgj2i907ww390wyznwqqn5b5dk0pgi28wy5z"; depends=[mvtnorm]; }; 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]; }; @@ -396,6 +404,7 @@ in with self; { BaM = derive2 { name="BaM"; version="1.0.2"; sha256="017x6i8glbbx8aqglyglv9pvcss4vg6l6rnwzaa4vbln95y4582d"; depends=[dlm MASS mice]; }; BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; }; BaSTA = derive2 { name="BaSTA"; version="1.9.4"; sha256="1j092gsdip7rpw0g74ha0kjsrqpp5swi7wd4sxlmx6zarcqnxlal"; depends=[snowfall]; }; + BaSkePro = derive2 { name="BaSkePro"; version="0.1.0"; sha256="06wnl128anr0isq07qn2xr426c8iybmrbixz93hxx1pshcm64f37"; depends=[MASS]; }; 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]; }; BalanceCheck = derive2 { name="BalanceCheck"; version="0.2"; sha256="0aal641vfbjk3w6ipwbqqmm9nnxs962hjmpph9wnqaqk5r6s7brs"; depends=[ade4 mvtnorm]; }; BalancedSampling = derive2 { name="BalancedSampling"; version="1.5.5"; sha256="01ayvjfs83dbnk0m9xb7y9rnxxpfpb6w4qjdffd6hdhcn2s5f73d"; depends=[Rcpp SamplingBigData]; }; @@ -411,13 +420,13 @@ in with self; { BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.6.1"; sha256="0jm4bswczmha7p8xb78n4q3wxyjxmi7ya5zrfm0gb31g7r275wba"; depends=[crayon curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; }; BatchJobs = derive2 { name="BatchJobs"; version="1.8"; sha256="1zz4sspj596pijxlz321g0jy2rg9ki83j6fihbwisjwr66p2vk1m"; depends=[backports BBmisc brew checkmate data_table DBI digest RSQLite sendmailR stringi]; }; BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; }; - BayLum = derive2 { name="BayLum"; version="0.2.0"; sha256="1i0pfqygn8s6r63089wgs74fx6cwm7ypascr70g4zwgbgkp8l80d"; depends=[ArchaeoPhases coda hexbin KernSmooth Luminescence rjags runjags]; }; + BayLum = derive2 { name="BayLum"; version="0.2.1"; sha256="0h0x18al2rqs6wjf4jayc1qv8lkn7rvkbjmr5h1gcggn2c4byyjn"; depends=[ArchaeoPhases coda hexbin KernSmooth Luminescence rjags runjags]; }; BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; }; BayesARIMAX = derive2 { name="BayesARIMAX"; version="0.1.1"; sha256="1rcfq0r8sqiqs65mbpcr8i4667cdb50k6bx6wdh9spr0djh8gfv0"; depends=[coda forecast]; }; BayesBEKK = derive2 { name="BayesBEKK"; version="0.1.0"; sha256="0fykcmf54820krwy7q573gmlcrx96i94knx7rgzc83i287lnpnfg"; depends=[coda MTS mvtnorm]; }; BayesBP = derive2 { name="BayesBP"; version="1.1"; sha256="043msccrins1smaizmf7qc6q1cyjdzirw2ygnvi56lskib1cls7m"; depends=[iterators openxlsx]; }; BayesBinMix = derive2 { name="BayesBinMix"; version="1.4.1"; sha256="1b18qg0mjbmrilwqffrq33gw04fzask2xgj1bp4cli51cjf2slf7"; depends=[coda doParallel foreach label_switching]; }; - BayesCACE = derive2 { name="BayesCACE"; version="1.0"; sha256="0j7j9ir7x892mc53b16grb8l7q52d7ynk1d4la05bw92z28nfjrg"; depends=[coda forestplot lme4 MASS metafor mvtnorm Rdpack rjags]; }; + BayesCACE = derive2 { name="BayesCACE"; version="1.2"; sha256="0rzjnhjvcnfy7dffq2jpybg6ybgkzfibz5kbd2qwbflj62h3v899"; depends=[coda forestplot lme4 metafor Rdpack rjags]; }; BayesCR = derive2 { name="BayesCR"; version="2.1"; sha256="1qav7l64iqqdvr1v6c7hlzvbx7zbvsa55pyisvkq5rsayy1rdsl1"; depends=[mnormt mvtnorm rootSolve truncdist]; }; BayesCTDesign = derive2 { name="BayesCTDesign"; version="0.6.1"; sha256="1277w6cv6b1s0wm492a79qrj9a4jzq1gizlpwkvwnvxzdl9f84r3"; depends=[eha ggplot2 reshape2 survival]; }; BayesCombo = derive2 { name="BayesCombo"; version="1.0"; sha256="01rzjja0xzvqyjivl8a9da13v13ylm4dwv4f27cmgz2znakfg5y8"; depends=[]; }; @@ -430,7 +439,7 @@ in with self; { BayesGESM = derive2 { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; }; BayesGOF = derive2 { name="BayesGOF"; version="5.2"; sha256="17wm0228xq3db431abyi9jr0q1q86nnajsn7hmy4dwzgvrlz5s0i"; depends=[Bolstad2 nleqslv orthopolynom VGAM]; }; BayesGPfit = derive2 { name="BayesGPfit"; version="0.1.0"; sha256="1sz0bb102h5fj1yz0k89cvcy0pvsh6rfm06i6lfz3pdhdjszsx00"; depends=[lattice]; }; - BayesGWQS = derive2 { name="BayesGWQS"; version="0.0.2"; sha256="0xy71d121hl8mg71cfyqw3j0sjx46qj5bifdk55h7jyfynr80pax"; depends=[coda rjags]; }; + BayesGWQS = derive2 { name="BayesGWQS"; version="0.1.1"; sha256="1vxln01194ipfhzid48x95hrpzkwylhr3nx1dh38rkfsg9fpl2af"; depends=[coda plyr rjags stringr]; }; BayesLCA = derive2 { name="BayesLCA"; version="1.9"; sha256="11ji5s1njip57zkr4bxwp3agx1ddv7yagm5prn9ckcbasan4rbx1"; depends=[coda e1071 fields MCMCpack nlme]; }; BayesLN = derive2 { name="BayesLN"; version="0.2.2"; sha256="1vxbc365g32q6b1rg68fg6dgzavzbq5wzhnwmnygn8pqk9malnxj"; depends=[coda data_table fAsianOptions ghyp lme4 MASS Matrix optimx Rcpp RcppEigen]; }; BayesLogit = derive2 { name="BayesLogit"; version="2.1"; sha256="0w3bzk39sxdskwikcz5i0xwfsll4sqgkpr8vw8jvzlcy6dl3yhis"; depends=[]; }; @@ -440,7 +449,7 @@ in with self; { BayesMassBal = derive2 { name="BayesMassBal"; version="1.0.0"; sha256="158vwfp5wn9g28fg48zmd95lfsr6flmcdm4igfw4cmgp4w0w69lq"; depends=[coda HDInterval LaplacesDemon Matrix pracma Rdpack tmvtnorm]; }; BayesMixSurv = derive2 { name="BayesMixSurv"; version="0.9.1"; sha256="19kf39881q00pap9afwvvggk4s4w3qpz17b7065nig1mvk8dnp8r"; depends=[survival]; }; BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; }; - BayesNSGP = derive2 { name="BayesNSGP"; version="0.1.1"; sha256="11c83iafhl8yasyy8xwk9wladbj986xpmgc8d3yd9dxkic71flw8"; depends=[FNN Matrix nimble StatMatch]; }; + BayesNSGP = derive2 { name="BayesNSGP"; version="0.1.2"; sha256="0va4gvyfwfdk3yvhdyxc49qlmzxfblwlmwqh79b93zkv8239kkk1"; depends=[FNN Matrix nimble StatMatch]; }; BayesNetBP = derive2 { name="BayesNetBP"; version="1.5.9"; sha256="05khqmsr7p9x6s4h7ffkh1sa2aqj42f00z6xkxwm0xlxa6ji6v4s"; depends=[bnlearn doBy fields graph igraph RColorBrewer]; }; BayesOrdDesign = derive2 { name="BayesOrdDesign"; version="0.1.0"; sha256="19fgx66r0hxm4ybjj9pw0xy4a6bw1rgfl0kjz6xwdyh9y9m3c8c6"; depends=[coda fda ggplot2 gsDesign madness ordinal R2jags rjags rjmcmc schoolmath superdiag tidyverse]; }; BayesPPD = derive2 { name="BayesPPD"; version="1.0.4"; sha256="1kyr9f1r6m3zb095x88hgbma51si5b2vzddi7zkzl02ildkqghgl"; depends=[Rcpp RcppArmadillo RcppEigen RcppNumerical]; }; @@ -464,20 +473,20 @@ in with self; { BayesTree = derive2 { name="BayesTree"; version="0.3-1.4"; sha256="0saca1ln582szqzc2c78z24b1lszzhc9hvsin73kb7r2dlg5ciii"; depends=[nnet]; }; 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]; }; - BayesValidate = derive2 { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; }; BayesVarSel = derive2 { name="BayesVarSel"; version="2.0.1"; sha256="1107amhj3bclc434qizffjfmsa2w36qkp6gq7vgl0hwv0ncc0vyn"; depends=[MASS mvtnorm]; }; BayesX = derive2 { name="BayesX"; version="0.3-1"; sha256="0g4cdkvicqzg75qgr62j89dc9mni38ai7705j6jbfx59vn6dbrr5"; depends=[coda colorspace maptools shapefiles sp]; }; - BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-1.1"; sha256="00q7hwan8db1a3wxczksl52bghyhfql3wj7sjvq50zsp0pjr6vng"; depends=[]; }; + BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-2"; sha256="04p17d87b2gg3p08jmdmg570ppdzci8r4qxcq115qs58bvqih47v"; depends=[]; }; BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; }; - BayesianFROC = derive2 { name="BayesianFROC"; version="0.5.0"; sha256="0v19rpk8i0jrb3za6lsdwb97f2qkn3ja8sym8q43nqg5sfwsp5fw"; depends=[bridgesampling car crayon fastDummies ggplot2 knitr pracma Rcpp rhandsontable rstan shiny shinydashboard shinyjs shinythemes]; }; + 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]; }; 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]; }; BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.5"; sha256="0vnnxzxz68dkfwr9wif8lam3a4khgbslbf49xkygqm8n1swysx2x"; depends=[bnlearn heatmaply lattice networkD3 plotly rintrojs shiny shinyAce shinydashboard shinytest shinyWidgets testthat]; }; BayesianPower = derive2 { name="BayesianPower"; version="0.2.3"; sha256="00rn3wmqrhk2pssbq5j2prl8m6cgfarr49672pnksp2dcbi47p20"; depends=[]; }; - BayesianReasoning = derive2 { name="BayesianReasoning"; version="0.4.0"; sha256="1lxrsqsm1p69liy6114hkdpn395f4ggxvq7sas2vrbfy7vhscs82"; depends=[dplyr ggforce ggplot2 magrittr reshape2 tibble tidyr]; }; + 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.7"; sha256="0330bbnny35h4gsmwg31p3n3i511wrckzmp174ydm55pvsdkhjdg"; depends=[bridgesampling coda DHARMa ellipse emulator gap IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp tmvtnorm]; }; Bayesiangammareg = derive2 { name="Bayesiangammareg"; version="0.1.0"; sha256="0b0fqmig7vgmlrq2884q0apfd89nn5k4dj8rqjizkkbw4qpzmylb"; depends=[mvtnorm]; }; - Bayesrel = derive2 { name="Bayesrel"; version="0.7.1"; sha256="080wxv9ik1ph7h74xfsa57dsddsvlvag0iybgrdajkn0svc5qb9m"; depends=[coda LaplacesDemon lavaan MASS Rcpp RcppArmadillo Rdpack]; }; + Bayesiantreg = derive2 { name="Bayesiantreg"; version="1.0"; sha256="0m8snwhjskwxdm0a2wsmf1j7d0xxvg4sh0ix64zss71l610wica7"; depends=[MASS Matrix mvtnorm]; }; + Bayesrel = derive2 { name="Bayesrel"; version="0.7.4"; sha256="1mjfjyvzacbc4gmg69vr6mdkxl9133dl13czy4dvf6phgfwqgz2b"; depends=[coda LaplacesDemon lavaan MASS progress Rcpp RcppArmadillo Rdpack]; }; BcDiag = derive2 { name="BcDiag"; version="1.0.10"; sha256="1gyinmx5wn2kk70hiy28ghilkhfirfjbfqdrqq5h3wfb4khnq6pz"; depends=[fabia]; }; 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]; }; @@ -486,34 +495,33 @@ in with self; { BenfordTests = derive2 { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; }; Bergm = derive2 { name="Bergm"; version="5.0.3"; sha256="0wi8l2xwfiw8slg37z2milck6js26iy0yaj7m6sxgfh16j3n2gwx"; depends=[coda ergm Matrix matrixcalc MCMCpack mvtnorm network statnet_common]; }; Bessel = derive2 { name="Bessel"; version="0.6-0"; sha256="0iwm08nhlivi4zwcqdi296a1l4n4lfanfxhaysh9vcsyk1kpiacf"; depends=[Rmpfr]; }; - Bestie = derive2 { name="Bestie"; version="0.1.3"; sha256="08999wvz0zm55b2yg2f4qdizl83fyppsij5lk20cwr60awbqc3gx"; depends=[BiDAG mvtnorm Rcpp]; }; + Bestie = derive2 { name="Bestie"; version="0.1.4"; sha256="1w8d1zrxp5v0wlldzj0kmcrdwyn5f2klbdpkhd79hvpf3lpq6h68"; depends=[BiDAG mvtnorm Rcpp]; }; BetaBit = derive2 { name="BetaBit"; version="1.4"; sha256="11cvl9m20ycc0zsxbdapjflgsiaxx4dzaygjhv948adjfi5fycbn"; depends=[digest]; }; BetaPASS = derive2 { name="BetaPASS"; version="1.1-1"; sha256="17q1bfmijv38zyaj5fxlylf5zmkqry4ca9wm5km6zpksgsg2kjjq"; depends=[betareg ggplot2 pbapply]; }; + BetterReg = derive2 { name="BetterReg"; version="0.1.0"; sha256="0v9vw77h469352w0apy3ybwcjq64qdrizlrlmxk8c1x9kc624264"; 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]; }; Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; }; BiBitR = derive2 { name="BiBitR"; version="0.3.1"; sha256="0wfwph6nw12hb43j14i9ycj8m2zn0m5ynp7afq9cray8rbgvxfv6"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; }; BiDAG = derive2 { name="BiDAG"; version="2.0.4"; sha256="1vbkjz7sdmnqyhc5br8d0g1dgrx59v0lqjbk9ya64c2c6izhlq3c"; depends=[graph pcalg RBGL Rcpp Rgraphviz]; }; - BiDimRegression = derive2 { name="BiDimRegression"; version="2.0.0"; sha256="0k0708z6xn04zjkc4sk15649wji6hl5q4rvd28sz5kbq7z54j1j5"; depends=[Formula]; }; + 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"; sha256="0sjq5a21vpsjs0ad0v8gsqlbk3n8virg1hzj0nvgm3h3xqhymh1d"; depends=[diptest]; }; - BiasCorrector = derive2 { name="BiasCorrector"; version="0.2.0"; sha256="1kkadpwcbd1x5vgfrhwf1560fc4b624wiq8ciciakb8l5hyw53bq"; depends=[data_table DT magrittr rBiasCorrection shiny shinydashboard shinyjs]; }; + BiasCorrector = derive2 { name="BiasCorrector"; version="0.2.1"; sha256="1f1r1s7rbia6n7v5xnz1kj459n34xdz0qwkf5pipknmjzsc9f4nj"; depends=[data_table DT magrittr rBiasCorrection shiny shinydashboard shinyjs]; }; BiasedUrn = derive2 { name="BiasedUrn"; version="1.07"; sha256="13i2lgfnjhlbbm2yxfc2l5hswqw6x03pwba5csjmirv8kpjw4xr3"; 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]; }; - BigDataStatMeth = derive2 { name="BigDataStatMeth"; version="0.99.14"; sha256="05mmi12wn0xis4vwjn9zi3gcpxm9jmp7kpfazxsasbwgvrdd9k3q"; depends=[beachmat BH data_table Rcpp RcppEigen RcppParallel RCurl rhdf5 Rhdf5lib RSpectra]; }; - BigQuic = derive2 { name="BigQuic"; version="1.1-9.1"; sha256="0b1vi06zakxcw045h6dnx6sy1fxzsmh69zh0m34vwr0rd18rrj5j"; depends=[Matrix Rcpp scalreg]; }; - BigTSP = derive2 { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; }; + BigQuic = derive2 { name="BigQuic"; version="1.1-11"; sha256="1dxzkj26hd05mi02i35k7dknlikjfbsgvjrqwf42k3kjpf501xh4"; depends=[Matrix Rcpp scalreg]; }; BigVAR = derive2 { name="BigVAR"; version="1.0.6"; sha256="03d5a61clkngq67mkf2pyjj3k633kxp7g37myfplbxi55bdfmdlz"; depends=[lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; }; BimodalIndex = derive2 { name="BimodalIndex"; version="1.1.9"; sha256="1m1dcj0ryjicaqjlkch7aymsklmvjvn2dvnbssi1cpi54bzn8l7g"; depends=[mclust oompaBase]; }; BinGSD = derive2 { name="BinGSD"; version="0.0.1"; sha256="0ygr5na7s82xa6vv9f3j6ns5sfhdacyykl1fg422lpkwbss39dnn"; depends=[mvtnorm]; }; - BinMat = derive2 { name="BinMat"; version="0.1.2"; sha256="17f5aaz8csfs1x1x7dxvbi4g97cp75kz7ikijsyk4pgpalld58a4"; depends=[magrittr MASS pvclust]; }; + BinMat = derive2 { name="BinMat"; version="0.1.5"; sha256="1brgv0zmprvwx6x670mmxxlk50nh4ds63bip48mlh0p1qv8pm9db"; depends=[ggpubr MASS pvclust tibble]; }; BinNonNor = derive2 { name="BinNonNor"; version="1.5.3"; sha256="0ijjv2w4bx0i3mks7s4vii21hc9iq69p3jld1qg68a6115njsm24"; depends=[BB corpcor Matrix mvtnorm]; }; BinNor = derive2 { name="BinNor"; version="2.3.3"; sha256="07r7nf4ygilp470z93x9dc5zddc96m2dkw6d2s4an8fbr4pljc1y"; depends=[corpcor Matrix mvtnorm psych]; }; BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.5.2"; sha256="17981jfjjgsfzjwbv9cjgqdha846rf03nfd8kgj4wiljgz855mz9"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; }; BinQuasi = derive2 { name="BinQuasi"; version="0.1-6"; sha256="0jf7zf3yqr2kgcm6h35234x2dqf65d2dzsh63b4q8m5l36r77k59"; depends=[BiocGenerics csaw edgeR GenomicAlignments GenomicRanges IRanges mgcv pracma quadprog RMySQL Rsamtools S4Vectors SummarizedExperiment]; }; - BinSegBstrap = derive2 { name="BinSegBstrap"; version="1.0"; sha256="0iia9sbpnqp07h591d7ifvxq74nvnv0xspka2479qy7il9p65d3r"; depends=[Rcpp]; }; + BinSegBstrap = derive2 { name="BinSegBstrap"; version="1.0-1"; sha256="1ikaqhcymy27qrpf85a23dpazy8gd407yi0z0w3nl5l38clz4h8w"; depends=[Rcpp]; }; Binarize = derive2 { name="Binarize"; version="1.3"; sha256="0xmgxlfyvgkv7xpngy9am6ihzwbjbfgp7psfnyhb1v0kj9iy7ids"; 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=[]; }; @@ -531,12 +539,12 @@ in with self; { BiocManager = derive2 { name="BiocManager"; version="1.30.16"; sha256="0m9qxwqajg8lp0z06blbpgk3zw0z73aly1cvmjk6mvwja6jm99vm"; 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.13-1"; sha256="0x9z9v79mxzqsvi6v93ffm440fkbfqb1x6wd8csy6zwrg5xyj8cb"; depends=[Rcmdr vegan]; }; + BiodiversityR = derive2 { name="BiodiversityR"; version="2.14-1"; sha256="1pla3jqjawcii7skpc3yc2pmkc8r8cm507b50r2lg2criy0xf4fx"; depends=[Rcmdr vegan]; }; Bioi = derive2 { name="Bioi"; version="0.2.10"; sha256="1ay8889490nfhxhh72fvk9z4h58xknm2b145xhbx2wbzj65zf9ib"; depends=[assertthat dplyr igraph Rcpp]; }; Biolinv = derive2 { name="Biolinv"; version="0.1-3"; sha256="1c081rhbgl6n76p2knaiyvjx0l02slix92vgfl2spss5cb9qzkln"; depends=[classInt fields raster sp spatstat spatstat_core spatstat_geom]; }; Biopeak = derive2 { name="Biopeak"; version="1.0"; sha256="1l08m1jl8yygbdfzk8klpj1q2m7icvxi98vmk7akxs0sswjc6wd2"; depends=[cluster dbscan factoextra gplots RColorBrewer]; }; Bios2cor = derive2 { name="Bios2cor"; version="2.2"; sha256="1wkj9vr33m9jilidil9jpw5rzr3pf7gkimxdvch22ks4bgkx7l1w"; depends=[bigmemory bio3d circular igraph]; }; - Biostatistics = derive2 { name="Biostatistics"; version="1.0.3"; sha256="1005i99gaj2qj1qgpxz1i4yhd9h5y1dixvh70pr1a2igqf88cziv"; depends=[learnr]; }; + Biostatistics = derive2 { name="Biostatistics"; version="1.0.4"; sha256="1fcrj53rqg7mdhrrsl95l0n6hycb0863isch2f6zzsqdqbxhq7dh"; depends=[learnr]; }; BiplotML = derive2 { name="BiplotML"; version="1.0.1"; sha256="08n5cxylzj9d3x2b9pbs14viw63wn1k7kdgayp017v6mj9s09wpl"; depends=[optimr optimx shapes]; }; BisRNA = derive2 { name="BisRNA"; version="0.2.2"; sha256="11jl5109nlm272vncprwplkz4kpvg7yx6yfnbjg47lfrsxcj8n0g"; depends=[MASS]; }; BisqueRNA = derive2 { name="BisqueRNA"; version="1.0.5"; sha256="0p3p5lp69gri7vs6qfpm7br4ksbs4l7clm4nj8ki99wpqiqni23n"; depends=[Biobase limSolve]; }; @@ -563,7 +571,7 @@ in with self; { BoltzMM = derive2 { name="BoltzMM"; version="0.1.4"; sha256="17nsjr2y8nniaxd6f13g85gb9rshar72qqp45yh2ygg4zrx1d226"; depends=[BH Rcpp RcppArmadillo]; }; BonEV = derive2 { name="BonEV"; version="1.0"; sha256="0lmgrg53b0abb5hidyjjmwn7lf2ani84k9fil7g6j6mdajjhh1b7"; depends=[qvalue]; }; BondValuation = derive2 { name="BondValuation"; version="0.1.0"; sha256="1sgnf5a6rm1br6i82bmp7s044012bwfxa9yb6bjkq8kr83mf7i6v"; depends=[Rcpp timeDate]; }; - BoneProfileR = derive2 { name="BoneProfileR"; version="2.0"; sha256="067fvsrldg79csvjn3qizfrsggm2s9kn3wzf5516ggq6v5k0842a"; depends=[HelpersMG imager knitr rmarkdown shiny]; }; + BoneProfileR = derive2 { name="BoneProfileR"; version="2.1"; sha256="1wdwf15x6rz7dciqyyqjlgzgqxas9lzmg3410qhbvcslf6w9gq0y"; 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.5"; sha256="11fysc39vfk3zb9qklryi8gl42c3hqgzlvci4jj0zkqnm0v9amqk"; depends=[igraph XML]; }; Boom = derive2 { name="Boom"; version="0.9.7"; sha256="0zw5i6xigpg8jnk4k2w8iqnxlbgk8zzd5dmfmi5wjc153vgssk12"; depends=[MASS]; }; @@ -575,14 +583,13 @@ in with self; { Boptbd = derive2 { name="Boptbd"; version="1.0.5"; sha256="1p786avc37yq5g01zh6sqx7b1rvbxrh6gbxsad4bdvr12cjdsss6"; depends=[igraph MASS Matrix]; }; Boruta = derive2 { name="Boruta"; version="7.0.0"; sha256="0y2w4wb45kfnzrxcrdsiwgal9fsnlr3wad1sqdc70qv8gp921xbg"; depends=[ranger]; }; BosonSampling = derive2 { name="BosonSampling"; version="0.1.3"; sha256="0dxvjdvzv2b3763x4wrkw02q57l42286w9bg2xhcngmcpdhnkg51"; depends=[Rcpp RcppArmadillo]; }; - BoutrosLab_plotting_general = derive2 { name="BoutrosLab.plotting.general"; version="6.0.3"; sha256="0sirpdp7k28wwn5k5wyc0ib6abb5b1qpjrrk3m168x5yg1s2hqkf"; 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="0.32.1"; sha256="0hnwfn3z9d22jp9xqgz7sz3yqlay863ys9czvd07xyscqpzq973k"; depends=[devtools dplyr extrafont ggplot2 gridGraphics gridSVG hunspell knitr magrittr mathjaxr moments nortest reticulate rlang rmarkdown roloc rolocISCCNBS whisker XML xtable]; }; BrainCon = derive2 { name="BrainCon"; version="0.1.0"; sha256="10c76l14kdvcyfhph5zsrn4ayh0x454cxbn1v85jamcalp610n69"; depends=[glmnet MASS]; }; Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; }; BrazilMet = derive2 { name="BrazilMet"; version="0.1.0"; sha256="0yrc0ha7ysmad7l0kwylgmmd0b5zy86dsba4lrj8qa294lgxl5fa"; depends=[dplyr readxl stringr tidyr]; }; BreakPoints = derive2 { name="BreakPoints"; version="1.2"; sha256="125fvzkmfnriyd4y4nywj5ihm766xlsyi7dpnq57fa9d38ffbyf2"; depends=[MASS zoo]; }; - Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-6"; sha256="1m3ajvcksqfck5l5hj5xiflj4ry6d896ybv4f0xxks8chgnwmv0r"; depends=[]; }; + Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-7"; sha256="0hnp5nrpnscykvgrrbgp7987660hcbv92zc2q8lmpnin4ws399vk"; depends=[]; }; 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]; }; @@ -593,16 +600,17 @@ in with self; { BurStFin = derive2 { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; }; BurStMisc = derive2 { name="BurStMisc"; version="1.1"; sha256="0cyi42zkn2dby162x9f95b3hpqxbzx25s7nahb4p86r60xj3a5c0"; depends=[]; }; BusinessDuration = derive2 { name="BusinessDuration"; version="0.2.0"; sha256="17923n1r3n8kp7qqzr2dv8ffax355yyc3b9f6mv2hxy6k31hrrb8"; depends=[chron]; }; - BuyseTest = derive2 { name="BuyseTest"; version="2.3.9"; sha256="0qvwv1yg18f4q3k5iad25zl3ww8zqas1miamk456wlqb345rfakx"; depends=[data_table doParallel foreach ggplot2 lava prodlim Rcpp RcppArmadillo riskRegression]; }; + BuyseTest = derive2 { name="BuyseTest"; version="2.3.10"; sha256="19mp6hyj4fdq7gmpd9jfg6rgf7mazbgxzpf9fs258s91pm35vljp"; depends=[data_table doParallel foreach ggplot2 lava prodlim Rcpp RcppArmadillo riskRegression]; }; Bvalue = derive2 { name="Bvalue"; version="1.0"; sha256="17zlllzjrcq4grggal3hlg384990n62wnflr2g21fa6hcnglwy7d"; depends=[]; }; - C443 = derive2 { name="C443"; version="3.2.2"; sha256="0fs8pcqwhb9wqwharghr05v6jvgsqln3mya2v0zzcmir6qql33v2"; depends=[cluster ggplot2 gridExtra igraph MASS partykit plyr qgraph RColorBrewer reshape2 rpart]; }; - C50 = derive2 { name="C50"; version="0.1.5"; sha256="1mqn7xzl9sbx61jhhkiq1gllwf8s6l1cgz7mck53461p6147phgh"; depends=[Cubist partykit]; }; - CA3variants = derive2 { name="CA3variants"; version="3.0"; sha256="0n0a4rxaskz94kibcycrsg46w8r515r4pzadvlv6b43qpgwrqh92"; depends=[checkmate ggforce ggplot2 ggrepel gridExtra multichull plotly]; }; + BwQuant = derive2 { name="BwQuant"; version="0.1.0"; sha256="0pna0ppj9hkxpc2mbyy0ss7zrl5y736h5xsfkhmqr0389vmgibrj"; depends=[KernSmooth nleqslv quantreg]; }; + C443 = derive2 { name="C443"; version="3.2.3"; sha256="0zjnwkn17213x2zhflmmrplp6kr8zg04pfynpkwsgmf4rqyfyjvx"; depends=[cluster ggplot2 gridExtra igraph MASS partykit plyr qgraph RColorBrewer reshape2 rpart]; }; + C50 = derive2 { name="C50"; version="0.1.6"; sha256="1d4cy6xps17c97r5hipa2ar9hrw17iq1ld7afv5fd1v2cpic086c"; depends=[Cubist partykit]; }; + CA3variants = derive2 { name="CA3variants"; version="3.1"; sha256="0gfr8giwb9z840gbf0xzdyd1xxjhd2m28fg4djja83kdwjf73fb5"; depends=[checkmate ggforce ggplot2 ggrepel gridExtra multichull plotly]; }; CADFtest = derive2 { name="CADFtest"; version="0.3-3"; sha256="06bwv728ckalzibxginzfica24w18m4g87i0i064m3q89ghmnlqm"; depends=[dynlm sandwich tseries urca]; }; CADStat = derive2 { name="CADStat"; version="3.0.8"; sha256="0wdglw1vyd5gz70r9ma0mwshvizv39nb4ahp8pvr70c4qqzsfhc0"; depends=[bio_infer car gdata gmodels JavaGD JGR lattice MASS quantreg rJava rpart XML]; }; CAISEr = derive2 { name="CAISEr"; version="1.0.16"; sha256="08br6hdpgf9y2fix299diwd8r3q4gylpbzll4knpxq0vi18a3hz3"; depends=[assertthat ggplot2 gridExtra pbmcapply]; }; CALANGO = derive2 { name="CALANGO"; version="1.0.8"; sha256="0i9n03km29bnhikk0a4dsh4pdchbynqmcvwzply7y2fgzs9bfwx4"; depends=[ape assertthat BiocManager dendextend DT ggplot2 heatmaply htmltools htmlwidgets knitr nlme pbmcapply pkgdown plotly rmarkdown taxize]; }; - CALF = derive2 { name="CALF"; version="1.0.16"; sha256="1y3db8yxgman6jx8ghqcqfh201zj1fykinm9rhfbgb0ixk9dq1yc"; depends=[data_table ggplot2]; }; + CALF = derive2 { name="CALF"; version="1.0.17"; sha256="021x1gp0493g6qnfih755c0xcddz77i3p22bgjlx1lpzgqmrgrki"; depends=[data_table ggplot2]; }; CALIBERrfimpute = derive2 { name="CALIBERrfimpute"; version="1.0-6"; sha256="0ghi6pkv9ki0iz4lkli3hkrsk6xiph2ha2pij6dg4wi7mcjdhsbi"; depends=[mice mvtnorm randomForest]; }; CAMAN = derive2 { name="CAMAN"; version="0.74"; sha256="0d932fbqzlxlhn7m8zfx7wr02pc7fm8398rym1jh2cdy2fk5im08"; depends=[mvtnorm sp]; }; CAMML = derive2 { name="CAMML"; version="0.1.1"; sha256="06xszdr3v41qqd2l0s3kdbzwn03054imazndplbihx5a7032gxvj"; depends=[AnnotationDbi dplyr edgeR MASS Matrix org_Hs_eg_db org_Mm_eg_db Seurat SeuratObject VAM]; }; @@ -625,7 +633,7 @@ in with self; { 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]; }; CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; }; - CBPS = derive2 { name="CBPS"; version="0.22"; sha256="1vws60xfn8hnh9hsmps0wxm21rr4ms3fx8m02myp60jzfvk4g4ni"; depends=[glmnet MASS MatchIt nnet numDeriv]; }; + 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=[]; }; @@ -635,19 +643,19 @@ in with self; { CCP = derive2 { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; 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]; }; - CCpop = derive2 { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; }; 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="7.5-15"; sha256="159ny2dz0rf1r3k1mqlfwambffc8rx425sggf5bn51nybpzanq3l"; depends=[mvtnorm polycor Rcpp RcppArmadillo]; }; CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; }; CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; }; - 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]; }; CDVineCopulaConditional = derive2 { name="CDVineCopulaConditional"; version="0.1.1"; sha256="1wyy324vrwipdsq0p021bj1gdhyxg09g3dkw8wv5v6rfrrs84m9k"; depends=[combinat VineCopula]; }; CDatanet = derive2 { name="CDatanet"; version="0.0.1"; sha256="05nh56w18bf1yk2i74ppslvd3307b6pqif7bbjcgm8q6nha2mrfq"; depends=[ddpcr Formula formula_tools Matrix Rcpp RcppArmadillo RcppProgress]; }; CEC = derive2 { name="CEC"; version="0.10.3"; sha256="0yypiy5xxrlckly4qpnf1wxg4hwza4y4da6y0jz4ldz918vskaci"; depends=[]; }; + CEDA = derive2 { name="CEDA"; version="1.0.2"; sha256="1nsflq7bnrakf564cazskdmba5xfamjyvm0gd5ws51qlxl1ajxv1"; depends=[ggplot2 limma mixtools]; }; CEDARS = derive2 { name="CEDARS"; version="1.90"; sha256="1fngyc08kvilfd2d75gjg0s6c5zvjywym35sk568yzxnsz89b7yy"; depends=[fastmatch jsonlite mongolite readr shiny udpipe]; }; CEGO = derive2 { name="CEGO"; version="2.4.2"; sha256="00nc6c1b6ylqlh6hm8lh8nasz7q12pqckdqbf1yq21khki9ldbll"; depends=[DEoptim fastmatch MASS Matrix ParamHelpers quadprog]; }; CENFA = derive2 { name="CENFA"; version="1.1.1"; sha256="0b1zpazbqynlnmf8k25r5bjmidymskqc96xpmwqkl23xlz1f2x3s"; depends=[doSNOW foreach magrittr pbapply raster Rcpp snow sp]; }; + CEOdata = derive2 { name="CEOdata"; version="0.2"; sha256="1zc69acy2jvawbv43wg52gnak3klavcr1yzab6rbabav5vk53vhn"; depends=[dplyr haven jsonlite stringr urltools]; }; CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; }; CFAcoop = derive2 { name="CFAcoop"; version="1.0.0"; sha256="1qnqbqh3p8grp6mxhqrwfm1nf1sxhqa6pjxkpf7vk9nx40g815gn"; depends=[Hmisc]; }; CFC = derive2 { name="CFC"; version="1.1.2"; sha256="0k0685cgsd0lm7id6h216r4x236xn3nqj4h906qn2i0kvwmx4nda"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; }; @@ -656,16 +664,18 @@ in with self; { 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"; sha256="1wmp5im18s447rjkj891skrm7558xkqlbx43n9hyxiqg49zq1ng9"; depends=[]; }; + CGNM = derive2 { name="CGNM"; version="0.1.1"; sha256="0i43pqvyz1brzlypmqsiynw997x8rh8im65yvh4zlnh3bjwrvcrs"; depends=[ggplot2]; }; CGP = derive2 { name="CGP"; version="2.1-1"; sha256="05a6gydlb99yk2jpy2hyg4c30hqyp8dg2i9dmbjc1n5cmgpg3im9"; depends=[]; }; CGPfunctions = derive2 { name="CGPfunctions"; version="0.6.3"; sha256="12l3ww9wfrk8i0a63wv5h4ayqj6fj5fz5yvkiskvaaida32vds2m"; depends=[BayesFactor DescTools dplyr forcats ggmosaic ggplot2 ggrepel paletteer partykit purrr rlang scales sjstats stringr tidyr]; }; CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; }; CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; }; CHMM = derive2 { name="CHMM"; version="0.1.1"; sha256="07fdvnwhblwvljbl2z0vs42nwki67yl5ly3fj40p50k3rnqqmavj"; depends=[mclust]; }; CHNCapitalStock = derive2 { name="CHNCapitalStock"; version="0.1.0"; sha256="1w8abj1rxkpql696dr6w19xsgxjmkm0jwnln7lp48fnxdsa424x8"; depends=[dplyr magrittr]; }; - CHNOSZ = derive2 { name="CHNOSZ"; version="1.4.1"; sha256="0q541a7gr8lg25y37qy067aik0ncay401hm7ml0sag0gwl1whi4k"; depends=[]; }; + CHNOSZ = derive2 { name="CHNOSZ"; version="1.4.3"; sha256="0hckcvrl9hk3gin5v3jbb6wp40k4vhqdnwb2z34fmaksdngnag3y"; 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="0.1.0"; sha256="0f765c1sqvcg11071008vn6gnk0v0lwmlhnqxgqy0r8cw05s2ggq"; depends=[ica NMFN]; }; CIDER = derive2 { name="CIDER"; version="0.99.0"; sha256="1qjr2xrcxhbkjjdv7714i6fyyn5rb5r9g79h5vnbd2bmswsgdyi3"; depends=[dbscan doParallel edgeR foreach ggplot2 igraph kernlab limma pheatmap Seurat viridis]; }; CIEE = derive2 { name="CIEE"; version="0.1.1"; sha256="03kq9cp0v41y0r2l9j5imcrsail2xsvlzhhhsrw454d4s9gqdql9"; depends=[survival]; }; @@ -675,6 +685,7 @@ in with self; { CINID = derive2 { name="CINID"; version="1.3-0"; sha256="06n5bwjr44rx0m12xradzaca26rvh01mlimbn0gr3jfzkmyj2f1g"; depends=[]; }; CINNA = derive2 { name="CINNA"; version="1.1.55"; sha256="0xw3ndjy262ljv6mk43ysb7mf4m02kcb5kzz1gzdxdwhj3v7ylgb"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph intergraph network pheatmap plyr qdapTools Rtsne sna viridis]; }; CINmetrics = derive2 { name="CINmetrics"; version="0.1.0"; sha256="1csh22b7ap7isnrjak7yp32hasxq8x4j094i9shrnzsz6sxcmc28"; depends=[]; }; + CIS_DGLM = derive2 { name="CIS.DGLM"; version="0.1.0"; sha256="0c7jxfb8gaklf6p83152wb2nszm2p806p3n523xajf4ha368d3kq"; depends=[dglm dplyr ggplot2 RColorBrewer]; }; CISE = derive2 { name="CISE"; version="0.1.0"; sha256="10mbi4v8dfdc9ngnrrmxpng8fnig5m8nv7799jksbcf6pnj8yv51"; depends=[far gdata glmnet MASS Matrix rARPACK]; }; CITAN = derive2 { name="CITAN"; version="2021.11-1"; sha256="15dy0n8yms8c01wp38wnn6541a9gq8q7x4sb76ggm9y4bldj6xj3"; depends=[agop DBI hash RSQLite stringi]; }; CIplot = derive2 { name="CIplot"; version="1.0"; sha256="0hx3dn7d8hvsh75747d9046iqriy3bjnchph8xllnvlhkrm4di1f"; depends=[MASS multcomp]; }; @@ -685,9 +696,8 @@ in with self; { CLA = derive2 { name="CLA"; version="0.96-2"; sha256="0cfa7zm13bin8hx8ki20kaz8fvkwdaiyl0pjghhld8vr5d3289kq"; depends=[]; }; 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]; }; - CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; }; CLUSTShiny = derive2 { name="CLUSTShiny"; version="0.1.0"; sha256="19mh5g1ylvlab4xjxw7girxk9zkpxxczhbfijf11b592hbw0qxqk"; depends=[cluster dplyr klaR MASS psycho rmarkdown shiny]; }; - CLVTools = derive2 { name="CLVTools"; version="0.8.1"; sha256="0c1wsfgzq8w4q0zg7cg2j1yhljqjcnx93qf0w4xdwvbam96pb4z6"; depends=[data_table ggplot2 lubridate MASS Matrix optimx Rcpp RcppArmadillo RcppGSL]; }; + CLVTools = derive2 { name="CLVTools"; version="0.9.0"; sha256="11vifpsq3acdkrkjpssd29w69rwxccv7848rd71375dc26x22sw1"; depends=[data_table ggplot2 lubridate MASS Matrix optimx Rcpp RcppArmadillo RcppGSL]; }; CMAPSS = derive2 { name="CMAPSS"; version="0.1.1"; sha256="1rig2v1cl9ybnbikqfwbp4ji1jcxm6383xbdf8wz2f3lxk7iis8z"; depends=[Rdpack]; }; CMC = derive2 { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; }; CMF = derive2 { name="CMF"; version="1.0.2"; sha256="0hm6srsylg1syz86iz93qyxr7xgh1qvmp27k2hgkj1z1z8lsw1ca"; depends=[Rcpp]; }; @@ -695,7 +705,7 @@ in with self; { 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]; }; CMatching = derive2 { name="CMatching"; version="2.3.0"; sha256="0q0hplhsamj46z7g6pa7yg1bap5822ka1419yhcip551djhvnpmv"; depends=[lme4 lmtest Matching multiwayvcov]; }; - CMplot = derive2 { name="CMplot"; version="3.7.0"; sha256="0d6ww8pdrawdg5acbhiyi2jpmapf2ghixy9mi4kmsq8yg36pksfh"; depends=[]; }; + CMplot = derive2 { name="CMplot"; version="4.0.0"; sha256="0xyh75y0c84nnkrv6c8xrvla54w51phgdwn8a69799f2r87z7c81"; depends=[]; }; CNAIM = derive2 { name="CNAIM"; version="1.0.1"; sha256="1k1n4a60mslkrazarn12yaj54kibqsdhj44himpcjvf4kzv8k7vd"; depends=[dplyr htmltools htmlwidgets jsonlite magrittr plyr r2d3 readxl stringr testthat tibble widgetframe]; }; 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]; }; @@ -719,11 +729,12 @@ in with self; { COST = derive2 { name="COST"; version="0.1.0"; sha256="06xgnsccd621ihlrdmnnh14vh83q1r2bnp3iqi7vp5553b3y4l3w"; depends=[copula mvtnorm]; }; COUNT = derive2 { name="COUNT"; version="1.3.4"; sha256="02f7779fy0d2bql88x5v9csbxljhnyvl8wb8h83xrmwl7kaxsdpy"; depends=[MASS msme sandwich]; }; COUSCOus = derive2 { name="COUSCOus"; version="1.0.0"; sha256="1ykqi72v8v1b3g9qy6h34dvk5fynzf1rl2mby65p08axmaba5798"; depends=[bio3d matrixcalc]; }; - COVID19 = derive2 { name="COVID19"; version="3.0.1"; sha256="190l1g3hfwsbjhxbx58zlw5fyi7cqkh9avzkvss15iafr5crbvkj"; depends=[data_table R_utils]; }; + COVID19 = derive2 { name="COVID19"; version="3.0.2"; sha256="0ljhvip944gv44b5nswcp59n0qjsyniynq2wiwcb03lv6pvvmz1x"; depends=[data_table R_utils]; }; COVIDIBGE = derive2 { name="COVIDIBGE"; version="0.1.8"; sha256="014g50ixnm9rnw2pgsgw6qvfk7wn75hbss3n2ylr1i5ndnr72m49"; depends=[dplyr httr magrittr projmgr RCurl readr readxl survey tibble timeDate]; }; CP = derive2 { name="CP"; version="1.6"; sha256="18zblf13riiz3mq3hkvg6vhiwjzpsn6mvgc2p0bqyldy98v4aisd"; depends=[survival]; }; CPAT = derive2 { name="CPAT"; version="0.1.0"; sha256="0zygncwww3cazwmx06bhzq0g41xcqfpw307azdhygc8jmcy6qj71"; depends=[purrr Rcpp RcppArmadillo Rdpack]; }; CPBayes = derive2 { name="CPBayes"; version="1.1.0"; sha256="1kw0r8spqm0s7cb3w5gplw67mhfmcbbf3ligngbary77ghkzirnb"; depends=[forestplot MASS mvtnorm purrr]; }; + CPE = derive2 { name="CPE"; version="1.5.2"; sha256="1m6v104hhxl12zc6lmwm2g5jh3ppyi0m18m1zl30xcid6agayq6v"; depends=[rms survival]; }; CPGLIB = derive2 { name="CPGLIB"; version="1.0.1"; sha256="18gf0l7fqfi4vl0aylna6s7n6f4kwlaxkqnbdy2qgrvr5vs2j0qn"; depends=[Rcpp RcppArmadillo]; }; CPMCGLM = derive2 { name="CPMCGLM"; version="1.2"; sha256="07hx2ik5zg05w1h6i94398mp54q958phws9ydgp6syjqlp9dpf1p"; depends=[abind mvtnorm plyr]; }; CPNCoverageAnalysis = derive2 { name="CPNCoverageAnalysis"; version="1.1.0"; sha256="0w4yw6d41sgl1ypcmp3bxgz4p3cpnbqx73id17zklid4avr3y9yi"; depends=[]; }; @@ -757,13 +768,13 @@ in with self; { CTTShiny = derive2 { name="CTTShiny"; version="0.1"; sha256="1c9vsiqyig6kfjpy3dfrysc466h4v9530m49aynz65i1njplswyh"; depends=[CTT ltm psych shiny shinyAce]; }; CTTinShiny = derive2 { name="CTTinShiny"; version="0.1.0"; sha256="1dc6kaxajkvviszmrcvhh9cg2k8g1hbpf1f6fg3wlgnb80fsx9b7"; depends=[CTT foreign shiny]; }; CUB = derive2 { name="CUB"; version="1.1.4"; sha256="1l47fkfvd91mbfzgl0vwaahbyi53jv3md6zah9ns85ns6xlwap7n"; depends=[Formula]; }; - CUFF = derive2 { name="CUFF"; version="1.7"; sha256="1fvzr5fq4ciwqkfcasv9lad3g831l2nmx307ya91qamjblaaryqb"; depends=[DT lmerTest nlme xlsx xtable]; }; + CUFF = derive2 { name="CUFF"; version="1.8"; sha256="09rf08nm1zmwgw342kixph9hdxd5397rlx1bb29fj0zgfp071czc"; depends=[dplyr DT haven lmerTest nlme xlsx xtable]; }; CUMP = derive2 { name="CUMP"; version="2.0"; sha256="0rdscywmi4sylpjpr8r472iapddizb1mqyrd532cvw6frxins7w0"; depends=[]; }; CUSUMdesign = derive2 { name="CUSUMdesign"; version="1.1.5"; sha256="1qxq1a8b5pnmlq6rpjzvcp32scn2qknafch3h7qjsy8499zzbxx8"; depends=[]; }; CVD = derive2 { name="CVD"; version="1.0.2"; sha256="0agb0liwbp4wvmxbyxgfb7471ki1agfb6ssh77kvwbkxqmrc8d96"; depends=[]; }; CVEK = derive2 { name="CVEK"; version="0.1-2"; sha256="03z4s0szi8rl3izc651rvrhl2z247aaflyphzizplgmpw81xv1ry"; depends=[limSolve MASS]; }; CVR = derive2 { name="CVR"; version="0.1.1"; sha256="1y8m9r409jq5h6xx1rvz7c7aj882jldfxly89zf3cvp2qg3jh7rj"; depends=[PMA Rcpp RcppArmadillo]; }; - CVST = derive2 { name="CVST"; version="0.2-2"; sha256="05l3yzkfrbds09ah9cdwn2sn4ryhq78lz33ryzrgkv176jc8qjw5"; depends=[kernlab Matrix]; }; + CVST = derive2 { name="CVST"; version="0.2-3"; sha256="0bgk0d6w3dyhb5s30idnp6jpb3m8wf3b79wqlg127wwm0cird8pg"; depends=[kernlab Matrix]; }; CVThresh = derive2 { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[EbayesThresh wavethresh]; }; CVTuningCov = derive2 { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; }; CVXR = derive2 { name="CVXR"; version="1.0-10"; sha256="0cklfwsr3p4x4w7n6y3h3m4i3si8q0pwyp2vzv7kzawrmqc80484"; depends=[bit64 ECOSolveR gmp Matrix osqp R6 Rcpp RcppEigen Rmpfr scs]; }; @@ -789,11 +800,13 @@ in with self; { CatDataAnalysis = derive2 { name="CatDataAnalysis"; version="0.1-3"; sha256="15wz7yjb83rd6d3xx0lb0p4x3ccnqpdkfanmbhykia50y8y32k5n"; 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]; }; + CatPredi = derive2 { name="CatPredi"; version="1.3"; sha256="0wj37pav20s273ha8pwmzypcdl8frakrxn5k149lg6vkgl6qmj8x"; depends=[mgcv rgenoud rms survival]; }; CatReg = derive2 { name="CatReg"; version="2.0.3"; sha256="02pxarc4v45w8ncx8hq084m69qgl9s2lkrv1biz60vrvl99dg016"; depends=[Rcpp Rdpack]; }; + CatastRo = derive2 { name="CatastRo"; version="0.2.1"; sha256="1ccigv8d3qrh2r99c2hkgbnx2xnagq692l0s3sw9gmqcb5zs6wd8"; depends=[dplyr httr lifecycle mapSpain rappdirs sf stringi terra tibble xml2]; }; CateSelection = derive2 { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; }; CauchyCP = derive2 { name="CauchyCP"; version="0.1.0"; sha256="012aw8cgrwwcsbs93nfsdlv1j72mc96gaxvdrhs9njqd9anamsgl"; depends=[survival]; }; CausalGAM = derive2 { name="CausalGAM"; version="0.1-4"; sha256="1riz11hfg96iks7734rg692l75nfrd3hmr9gw563j27rkk1nfkl6"; depends=[gam]; }; - CausalGPS = derive2 { name="CausalGPS"; version="0.2.6"; sha256="0ynqyjm3a9cqq3dfkcfc5bj0gj6idrhibmfq1vyllai5v19s8p28"; depends=[data_table earth gam ggplot2 gnm KernSmooth logger MASS polycor ranger Rcpp rlang SuperLearner tidyr wCorr xgboost]; }; + CausalGPS = derive2 { name="CausalGPS"; version="0.2.7"; sha256="07izwbz9j664p9c210d21i86w41ql5fs5fwmm7kbwbczdzx7kh7q"; depends=[data_table earth gam ggplot2 gnm KernSmooth logger MASS polycor ranger Rcpp rlang SuperLearner tidyr wCorr xgboost]; }; CausalImpact = derive2 { name="CausalImpact"; version="1.2.7"; sha256="1sbi58zs39cxyq4h8d9h9w2s2qbnj5jkpc68cibwxlzkyllaks52"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; }; CausalKinetiX = derive2 { name="CausalKinetiX"; version="0.2.1"; sha256="0haxw4vvbw48hlvsl1d1y3xm48qm5vl0d3k5lj89ajwc618nk5jg"; depends=[cvTools deSolve fda glmnet pspline quadprog randomForest sundialr]; }; CausalMBSTS = derive2 { name="CausalMBSTS"; version="0.1.1"; sha256="1mjw2zyddkci6vkbyz3d94l5z1aj3rc2w6lag5igbfv4q0n5qcrp"; depends=[CholWishart forecast KFAS MASS Matrix MixMatrix]; }; @@ -808,24 +821,24 @@ in with self; { Census2016 = derive2 { name="Census2016"; version="0.2.0"; sha256="1c88jmd565v19w8dbvai10f9y5lyfmzsxsjblc3gdykf9kharvcq"; depends=[data_table]; }; CepLDA = derive2 { name="CepLDA"; version="1.0.0"; sha256="15vhk7l5mw2kicw2x60r4z71hc415g8kaf2p06jgf7ykxmzkj7kg"; depends=[astsa class MASS multitaper]; }; CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.1.9"; sha256="0s3pd4y165v69m4wmg9jlc7dl4gz64la9yic67l3n4242wa84p19"; depends=[robustbase]; }; + Certara_R = derive2 { name="Certara.R"; version="1.0.0"; sha256="0na4411rxxqjyrxjmj27i9b5lrig2jysazk9fnpvrws8c63zl39y"; depends=[batchtools data_table dplyr DT ggplot2 htmltools jsonlite magrittr plotly remotes reshape rlang shiny shinyjqui shinyjs shinymaterial shinyWidgets sortable ssh xml2]; }; CfEstimateQuantiles = derive2 { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; }; ChIPtest = derive2 { name="ChIPtest"; version="1.0"; sha256="1yn5b5s56k2dbhw6damxj18xbaiz180ym7fiq2i3p2gkcgwpddbz"; depends=[]; }; - ChainLadder = derive2 { name="ChainLadder"; version="0.2.14"; sha256="02zy3aj03mi6a2kb9g8bm2v8dhmswxp5b2d0mald28sa188cnp21"; depends=[actuar cplm ggplot2 lattice MASS Matrix statmod systemfit tweedie]; }; + ChainLadder = derive2 { name="ChainLadder"; version="0.2.15"; sha256="1csi6hbbxnm4ilss2qganimh2sqgk2xb8dxa6fz0bdh0s5f6x79j"; depends=[actuar cplm ggplot2 lattice MASS Matrix statmod systemfit tweedie]; }; ChangePointTaylor = derive2 { name="ChangePointTaylor"; version="0.1.1"; sha256="1jfymyqdcyxfgn15y0iff7midkfd69fh3amz201idg6248g1y6n8"; depends=[bench dplyr ggplot2 magrittr purrr Rcpp rlang tidyr]; }; ChangepointTesting = derive2 { name="ChangepointTesting"; version="1.0"; sha256="1nb78b1jpp0wpy9ah2fxkh53hlmb2f82b68msbfhancb8zp2lclv"; depends=[]; }; - ChannelAttribution = derive2 { name="ChannelAttribution"; version="2.0.4"; sha256="1m9fwlkd39q5dmlw71rasj2cjnlj03295ck9lgb7yl72v7sws22d"; depends=[Rcpp RcppArmadillo]; }; + ChannelAttribution = derive2 { name="ChannelAttribution"; version="2.0.5"; sha256="09qdj93al6r7pg9s2xvwks7d73bgjsn1k7h8rcdzf245r89l8726"; depends=[Rcpp RcppArmadillo]; }; ChannelAttributionApp = derive2 { name="ChannelAttributionApp"; version="1.3"; sha256="0n9g8wwvc8p5clypl7z23w8fs6d0c47bblijwd4pjwy26bcb4m8h"; depends=[ChannelAttribution data_table ggplot2 shiny]; }; Chaos01 = derive2 { name="Chaos01"; version="1.2.1"; sha256="1wk70l1y0yzbjcjp0r334l1q3hzki0vzn6wbza97mq9pz8wp050r"; depends=[]; }; ChaosGame = derive2 { name="ChaosGame"; version="1.1"; sha256="1gwrym3vjcqlj0ih479ipbajypajy9ga9sr3laj7g5zxx3cm4y4c"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; }; ChargeTransport = derive2 { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; }; CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; }; - ChemoSpec = derive2 { name="ChemoSpec"; version="6.0.1"; sha256="1kcvfd0vhpn81bw4a46jnfrfn6nhsllxc7bfh4i0qwbp2wr1gaf5"; depends=[ChemoSpecUtils ggplot2 magrittr patchwork plotly plyr readJDX reshape2]; }; + ChemoSpec = derive2 { name="ChemoSpec"; version="6.1.2"; sha256="0g09zr1ysafzafs8gjzacrqpgd6vad39i1vsmr3smprp8f4739mq"; depends=[ChemoSpecUtils ggplot2 magrittr patchwork plotly plyr readJDX reshape2]; }; ChemoSpec2D = derive2 { name="ChemoSpec2D"; version="0.5.0"; sha256="05k46fn2i0ipn14zignxvykr8018wxql26x2r5b479hbkg1rk5s4"; depends=[ChemoSpecUtils colorspace ggplot2 readJDX]; }; ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="1.0.0"; sha256="15w9v4g7myw0ygd9dvalz900yzgz5j2jnmw4j3zfp04fgm3wgbfq"; depends=[ggplot2 ggrepel magrittr plotly plyr]; }; ChillModels = derive2 { name="ChillModels"; version="1.0.2"; sha256="06hgg893anh5z8an4l1xl4liz7d0m79n21h116vkdlymayccydbr"; depends=[]; }; ChineseNames = derive2 { name="ChineseNames"; version="1.1.1"; sha256="1vkf4573iq7fqxwig7sphsbfpa9jbx36dayywdjx3n8nx8lksdqa"; depends=[bruceR data_table]; }; ChoR = derive2 { name="ChoR"; version="0.0-4"; sha256="08mildsx542zfm0kcdakcv7c71hb4jgbcq1lhidf0fz76zj1pzk1"; depends=[commonsMath rJava]; }; - ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; 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=[]; }; @@ -835,7 +848,7 @@ in with self; { CircularDDM = derive2 { name="CircularDDM"; version="0.1.0"; sha256="1wxdjj7dndvhvl00cykcrwmw9f7halsg3a0db56kp2mhf54rj37z"; depends=[Rcpp RcppArmadillo]; }; CityPlot = derive2 { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; }; CityWaterBalance = derive2 { name="CityWaterBalance"; version="0.1.0"; sha256="0nvm6bv2cxszjf33xgn1xcvhrgrgbdcar0jahwf7bs03gdlpmgi1"; depends=[dataRetrieval dplyr EcoHydRology geoknife lubridate reshape2 tgp xts zoo]; }; - Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.3.3"; sha256="0k08smvgplzcjq1rdbxyalw6iynr129bhdq0wcdn95baqpb5w556"; depends=[Rcpp Rdpack]; }; + Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.3.4"; sha256="1lr9pang73hzmwlak9hc9sgsnqkw06ipfarfdbxz5ycibasvb4a6"; 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.1.0"; sha256="1v2bs6mz2jfsv4v3p3gmmpv8fg565nbqcnfcg6clgs9d54w6qrnm"; depends=[geometry rgl]; }; ClamR = derive2 { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; }; @@ -846,9 +859,8 @@ in with self; { ClickClustCont = derive2 { name="ClickClustCont"; version="0.1.7"; sha256="1caymvpwvxq4rirnjm2kwzvqm1pl01rdc3785k8mq4k2m0n6l2rz"; depends=[gtools]; }; CliftLRD = derive2 { name="CliftLRD"; version="0.1-1"; sha256="0qsdv568klxg6chgw329jbfjmf6w61hly2vxp90yzdfkca03z2s4"; depends=[CNLTreg liftLRD]; }; ClimClass = derive2 { name="ClimClass"; version="2.1.0"; sha256="1r836md31z2r5d9xckkbalzbhm4kf5paljv71kxpy53q92k7yi91"; depends=[geosphere ggplot2 reshape2]; }; - ClimDown = derive2 { name="ClimDown"; version="1.0.8"; sha256="0qcag9jwvhi9yss55wy5jxabrvym9hljn1fs5gfkzjs5hiwv3gxv"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; }; ClimInd = derive2 { name="ClimInd"; version="0.1-3"; sha256="0n5kd001nkpks16c3msvn2qvzyrjawa2rqwh8zph2qr5hgpwcpg7"; depends=[chron SPEI weathermetrics]; }; - ClimMobTools = derive2 { name="ClimMobTools"; version="0.4.2"; sha256="0y0x5h281xr7bcwqzl19x5azysnf8f2bwqcncm2bnka1wvlckjby"; depends=[climatrends httr jsonlite Matrix PlackettLuce RSpectra sf]; }; + ClimMobTools = derive2 { name="ClimMobTools"; version="0.4.5"; sha256="1cnjhk1gw2qc0kl669g4nlnf7cfzld05qfwrxm3yml6rpv781lwx"; depends=[httr jsonlite Matrix RSpectra sf]; }; ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.1.3"; sha256="1grhg0ajf5lfm7pi5mm0hgp0cmln1jwrgkrfb4ci85fpqn96ddji"; depends=[climdex_pcic multiApply PCICt plyr]; }; ClinSigMeasures = derive2 { name="ClinSigMeasures"; version="1.0"; sha256="0fw89a1q92ck32z6w4zn1ldvky6ag1gi7b9bbv10mhmqhq4w3k58"; depends=[]; }; ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="1.1.1"; sha256="0b5by4sn9yvrvxr9921yqsgp8ma3g1hi2qbp5j9m836db1zjhyla"; depends=[Rcpp]; }; @@ -862,7 +874,7 @@ in with self; { 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.1.1"; sha256="1was06w9glqg8dgawx40jkxngcr04bm58yjqyi9fy0qzvcf9m78x"; depends=[dplyr fastcluster ggplot2 igraph magrittr Matrix Rcpp rlang]; }; + 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="2.4.0"; sha256="1bl0a32il4ai181q5s2fvmpm4jbqwxjvrrxwkaqxb7dnb846cmv0"; 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]; }; @@ -871,7 +883,7 @@ in with self; { ClustVarLV = derive2 { name="ClustVarLV"; version="2.0.1"; sha256="1wl4kkhf17fi3vgbv0ph0yii2l93cgisxm3s0g9w8zhyn60dwwb0"; depends=[doParallel foreach iterators plyr Rcpp RcppEigen]; }; Cluster_OBeu = derive2 { name="Cluster.OBeu"; version="1.2.3"; sha256="10i7mnaq968my1c5hi8bdsj05m64wlmrf4n4m118is5h1q7zss8r"; depends=[car cluster clValid data_tree dendextend jsonlite mclust RCurl reshape reshape2 stringr]; }; ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="1.1.2"; sha256="1ha50yzc2arlz4c2g7r9w891fk775xfbhz0gky3zxawlsa02213s"; depends=[dplyr magrittr]; }; - ClusterR = derive2 { name="ClusterR"; version="1.2.5"; sha256="1fsb9pzs1paw1cbyr5a56lfh8h2d50232p6isk0xg5sl110ql7kx"; depends=[ggplot2 gmp gtools Rcpp RcppArmadillo]; }; + ClusterR = derive2 { name="ClusterR"; version="1.2.6"; sha256="00mha8madcba83ix4fc04rb7sagfm0lxlh1wvs7dvjdrngps41jr"; depends=[ggplot2 gmp gtools Rcpp RcppArmadillo]; }; ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; }; ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; }; ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; }; @@ -885,10 +897,10 @@ in with self; { CoOL = derive2 { name="CoOL"; version="1.0.3"; sha256="0iigndir0saxaxw233bfb31if6v9fm95fxxw43bqamfmk6g7b8r4"; 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.5.2"; sha256="1q0pd6vrlgsnrrdv4xc6rv26jabnvj3fyzav6qyb0k7df9pdshn3"; depends=[abind crayon ctsem doParallel foreach lavaan MASS MBESS OpenMx openxlsx psych rootSolve RPushbullet scholar stringi zcurve]; }; + CoTiMA = derive2 { name="CoTiMA"; version="0.5.4"; sha256="02bg0bckg5h8bk4plxjni5kya9rmqhz5d9dvfa19hmyd384hdxhv"; depends=[abind crayon ctsem doParallel foreach lavaan MASS MBESS OpenMx openxlsx psych rootSolve RPushbullet scholar stringi zcurve]; }; 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]; }; - CohortPlat = derive2 { name="CohortPlat"; version="1.0.3"; sha256="0na4idcckfqwwynx3kbfyqimzl46pna24aa9xlyjwbczf441gafm"; depends=[doParallel dplyr epitools forcats foreach ggplot2 openxlsx plotly purrr tidyr zoo]; }; + CohortPlat = derive2 { name="CohortPlat"; version="1.0.5"; sha256="01jvi7k3lvx684c4cwn3xrpwjsksk7gjvs3db64ji7chc4lkajv4"; depends=[doParallel dplyr epitools forcats foreach ggplot2 openxlsx plotly purrr tidyr zoo]; }; CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; }; 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]; }; @@ -920,7 +932,7 @@ in with self; { ComparisonSurv = derive2 { name="ComparisonSurv"; version="1.0.9"; sha256="1xvxkj0i59fq05df6szx4k32w2447mxcx3877l2myag4x6i6c74l"; depends=[muhaz survival survRM2 TSHRC]; }; Compind = derive2 { name="Compind"; version="2.3"; sha256="0im7wpgigkd3nwg6crnp4c3ndd3b6763f0f4v512r9a13hm48ms0"; 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]; }; - Compositional = derive2 { name="Compositional"; version="5.3"; sha256="1h5xv85r3vw3b62d8rbjx43cag4krldivfn09faga1lmg0zvbjwa"; depends=[codalm Directional doParallel emplik energy FlexDir foreach glmnet MASS mda mixture NlcOptim nnet pchc RANN Rfast Rfast2 sn]; }; + Compositional = derive2 { name="Compositional"; version="5.4"; sha256="0nh4b6wkydx97sxan3w8fx8i75n5xnl4hmhvcnvzpp7v1gdsx89c"; depends=[codalm Directional doParallel emplik energy FlexDir foreach glmnet MASS mda mixture NlcOptim nnet pchc RANN Rfast Rfast2 sn]; }; CompoundEvents = derive2 { name="CompoundEvents"; version="0.1.0"; sha256="03shw3016xc41a6by8pnpqs7mmnhs0qmg5aqd4hlfcy3dv2w9wkf"; depends=[]; }; Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; }; ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6.1"; sha256="1ziy646lbx297kia797xjxa8hyl826x1hiighyjslvnlvrhapx08"; depends=[Rcpp]; }; @@ -931,6 +943,7 @@ in with self; { ConcordanceTest = derive2 { name="ConcordanceTest"; version="1.0.0"; sha256="03d780y7wik2j9l4bq50j8c3g4j3zh8wzq4al6zjch9g9krdankz"; depends=[Rglpk]; }; CondIndTests = derive2 { name="CondIndTests"; version="0.1.5"; sha256="0km4z8wnj5msg1pmphk2fccbw1cidsxv174817lwcyii9nf5iwsm"; depends=[caTools kernlab lawstat MASS mgcv mize pracma quantregForest randomForest RPtests]; }; CondReg = derive2 { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; }; + CondiS = derive2 { name="CondiS"; version="0.1.1"; sha256="16nhqbcmq1swlhbal3q7i11y6kk7r48nxfqgzgbyrqf9qwc7jfpd"; depends=[caret kernlab purrr survival survminer tidyverse]; }; ConfIntVariance = derive2 { name="ConfIntVariance"; version="1.0.2"; sha256="0xm3vh3vmf16faa3934100rnrg4rvlqkgjlsqa2smzcvy5vb86z4"; depends=[]; }; ConfigParser = derive2 { name="ConfigParser"; version="1.0.0"; sha256="0jjh6gz5qcqhirzkmg7a4lnf8n3mjly15x2mvbvdpjkk7iv3w9m3"; depends=[ini R6]; }; ConformalSmallest = derive2 { name="ConformalSmallest"; version="1.0"; sha256="0r74hbz0dmz69zsw2vdl858vj27p6f2xcpv1l1il4r52cmshg1h8"; depends=[glmnet MASS mvtnorm quantregForest]; }; @@ -950,13 +963,13 @@ in with self; { 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]; }; CopCTS = derive2 { name="CopCTS"; version="1.0.0"; sha256="1j0bhkjk181y9k69442diswgwax5whmh5vfqydhf3b1r5ll1wkm3"; depends=[copBasic copula msm]; }; - CopernicusDEM = derive2 { name="CopernicusDEM"; version="1.0.1"; sha256="0pf3y335agfkdnxjyfcfkbrk2999p5h0by959ahc1wxyrxdghxsl"; depends=[doParallel foreach gdalUtils glue sf]; }; + CopernicusDEM = derive2 { name="CopernicusDEM"; version="1.0.2"; sha256="1jgvq1c86xgdyp17z1pmz01lfw5nsfc2x71pcn399vcgij5j1jrf"; depends=[doParallel foreach glue sf]; }; 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.1"; sha256="1zs2jvb07948g2aspy8877j4hdzavd57lmv4x2yrf6gb4xzs3x3n"; depends=[]; }; + Copula_surv = derive2 { name="Copula.surv"; version="1.2"; sha256="1sashpxwbw0a5q8qvs8pwgxk0h5d3njw7j4gqrc8fh7bx71bqq7l"; depends=[]; }; CopulaCenR = derive2 { name="CopulaCenR"; version="1.1.3"; sha256="03hd6cw1mymkdcjf211g2c4m049d61hva8n4nxsrp2lpzxq3yz3s"; depends=[caret copula corpcor flexsurv icenReg magrittr plotly pracma survival]; }; CopulaDTA = derive2 { name="CopulaDTA"; version="1.0.0"; sha256="1bx0jvlbhaxf4yhrfpd5l5zp7kmp6f17ckb1y9974sgc7s3hpqcd"; depends=[ggplot2 plyr reshape2 rstan]; }; - CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.3"; sha256="152g8nfa3ksj0dlzlch9a6g18b1vi6dlw748a6m55haghchbyr9l"; depends=[matlab mc2d statmod tensor]; }; + CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.5"; sha256="0ryqh6aikakpkrkqxy853qlyxzwhmhwgiz7ba2w872wysdpp82k3"; depends=[matlab mc2d statmod tensor]; }; CopyDetect = derive2 { name="CopyDetect"; version="1.3"; sha256="1g3bwd805h62x93xvvn67acf9v6vn7s7ghxpvjhwcfdfj7fwzh6l"; depends=[mirt]; }; CorBin = derive2 { name="CorBin"; version="1.0.0"; sha256="0mjvhj9cw21xjg96fz5bcyfxgwdw367l1942a38by77ylypdfq3y"; depends=[]; }; CorDiff = derive2 { name="CorDiff"; version="1.0"; sha256="12rgfhygrdq1ign4ybr8g171wxic8zbp83n1xdsnqpj910k5jdr5"; depends=[mcc]; }; @@ -964,7 +977,7 @@ in with self; { CornerstoneR = derive2 { name="CornerstoneR"; version="2.0.2"; sha256="04dvryhcyi7f6bmm4067cn5vmy7kdqi3bys7ln8nnsc0kkdjxhi5"; depends=[checkmate data_table minpack_lm ranger SpatialTools vcd]; }; CorrBin = derive2 { name="CorrBin"; version="1.6"; sha256="0iwad5qf7hqii02s5f85155c5s7v8ghnac4l6l3c45dshrpapp2m"; depends=[boot combinat dirmult geepack mvtnorm]; }; CorrMixed = derive2 { name="CorrMixed"; version="1.0"; sha256="0rj987k8pzsw9n9a20ky23rwc3zyqsl0fcibpmry7p8pw2miaj0z"; depends=[nlme psych]; }; - CorrToolBox = derive2 { name="CorrToolBox"; version="1.6.3"; sha256="1mvw23f411vcmjq8lz4jx559ix8iz1c9zaynpkaviqz007amh6wa"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm 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]; }; CorrectedFDR = derive2 { name="CorrectedFDR"; version="1.1"; sha256="1p0gp7m7v6nly0kr4pkjwxaa941z80nfc8ji5w0y73i79d024c2s"; depends=[]; }; CosW = derive2 { name="CosW"; version="0.1"; sha256="12l4w8b5jnr8773hxk7khrdn705x6bdbw7s8z8w95bfbbi12dj6v"; depends=[fdrtool pracma]; }; @@ -977,6 +990,7 @@ in with self; { CovSelHigh = derive2 { name="CovSelHigh"; version="1.1.1"; sha256="0dvvpkqml2k00gicpgp475z1rjspq3s37ys1mam29k54qlshhny6"; depends=[bartMachine bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest tmle xtable]; }; CovTools = derive2 { name="CovTools"; version="0.5.4"; sha256="1bkqg3kzy2ahjqldcf6x55wkrmb4s6y72y9cj0jwb1fph0a1p3sm"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes SHT]; }; CovidMutations = derive2 { name="CovidMutations"; version="0.1.3"; sha256="03bl9frjfj8i7ydgi245113yzyg8rkgqxasicmqcjdd68zbz00kn"; depends=[cowplot dplyr ggplot2 ggpubr seqinr stringr VennDiagram]; }; + 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]; }; CoxPhLb = derive2 { name="CoxPhLb"; version="1.2.0"; sha256="0jlh2k5ygj896sfx7dcw5qlb80bl64rsvqfayv0c6a107bmrzsw4"; depends=[survival]; }; CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; }; @@ -984,7 +998,6 @@ in with self; { CpGFilter = derive2 { name="CpGFilter"; version="1.1"; sha256="0ccvk7lawmay0wqdyhs6ww7396dcfzazn72sq6zwyw7dl45k2j0i"; depends=[matrixStats]; }; CpGassoc = derive2 { name="CpGassoc"; version="2.60"; sha256="1zx18x8pxjl2ajnj7a7lb8383m75ysg17f4mzz0vkgl5mnf617ny"; depends=[nlme]; }; Cprob = derive2 { name="Cprob"; version="1.4.1"; sha256="1m4ys8xpj1jbn3lf8fym935y94dxipiimsf9zxwyw5sy71y7skgq"; depends=[geepack lattice lgtdl prodlim tpr]; }; - CreditMetrics = derive2 { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; }; CreditRisk = derive2 { name="CreditRisk"; version="0.1.3"; sha256="09ks8xlsrbp3an1drcwmmd6df4fsfz61z21ma2p62a1pk0bnc86c"; depends=[fOptions]; }; Cronbach = derive2 { name="Cronbach"; version="0.1"; sha256="1gkapi7pgf1mwidhgdf3y5cm4bz5igzb7mdflz560aa67asp1qyf"; depends=[boot]; }; CropDetectR = derive2 { name="CropDetectR"; version="0.0.1"; sha256="14sabqld94if7f2m39bh6652cb62hcwx53k8q5k23anzzsn93qlj"; depends=[dplyr EBImage imager reshape2]; }; @@ -992,14 +1005,15 @@ in with self; { CrossVA = derive2 { name="CrossVA"; version="1.0.0"; sha256="16ahw8h27acvqqixmwmsyl6rbjzxbn4pfyh2ls9rq852mc7mdg9b"; depends=[stringi]; }; CrossValidate = derive2 { name="CrossValidate"; version="2.3.4"; sha256="1q5wnw2llvlw3hbjg0zccipk3ns31m2339x1aj6m526zhvgl2wvx"; depends=[Modeler oompaBase]; }; Crossover = derive2 { name="Crossover"; version="0.1-20"; sha256="1mm8zc845v077rnhijammpq72dsm9smwiixr0iygcadb5vbkfpib"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; }; - CruzPlot = derive2 { name="CruzPlot"; version="1.4.6"; sha256="12q0cs11kkpb6p5msjalffx8ni4qx9fw4kj8zjm9n446xx53yb4k"; depends=[dplyr DT geosphere mapdata maps marmap shiny shinydashboard shinyjs stringr swfscDAS]; }; + CruzPlot = derive2 { name="CruzPlot"; version="1.4.7"; sha256="0ywa0wqwcapnxjhd5hw9cnxss8rjj31lxn9j2g19c3mfxkqpqc29"; depends=[dplyr DT geosphere mapdata maps marmap shiny shinydashboard shinyjs stringr swfscDAS]; }; CrypticIBDcheck = derive2 { name="CrypticIBDcheck"; version="0.3-3"; sha256="1c7n020i9lxp0fam05k9v4az4rvx8fakhzi9fkma82smpl709x8q"; depends=[car chopsticks ellipse rJPSGCS]; }; CsChange = derive2 { name="CsChange"; version="0.1.6"; sha256="0ahgzir1rz5hh2jkgabp9vccg527vbvmkdyxf9lyz5yxkig3jv2s"; depends=[boot Hmisc rms survival]; }; - Cubist = derive2 { name="Cubist"; version="0.3.0"; sha256="0qxjkv7lswzg5j3cwfbva64xh0a2a2iycz59ff59g3lahmznx9w8"; depends=[lattice reshape2]; }; + Cubist = derive2 { name="Cubist"; version="0.4.0"; sha256="0y2mjqg8285vprm42z1dsqhs5k6g3703ysg3225a7qq08ga787rs"; depends=[lattice reshape2]; }; 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]; }; Cyclops = derive2 { name="Cyclops"; version="3.1.2"; sha256="13nwcksfxvjz2wh7dr500y0xy69hfl4k0ddsr6m24qh2km8spp6n"; depends=[Andromeda BH bit64 dplyr Matrix Rcpp RcppEigen rlang survival]; }; + CytOpT = derive2 { name="CytOpT"; version="0.9.4"; sha256="008qm2kzclp0sy4ys7y0dsc894qrn7mazz9216w97rs2sn7kcrzx"; depends=[ggplot2 MetBrewer patchwork reshape2 reticulate testthat]; }; CytobankAPI = derive2 { name="CytobankAPI"; version="1.4.0"; sha256="19jlpx914sqiqfba9ypylnaiswvbn641wkgzaihbjj1h61jjzihk"; depends=[curl httr jsonlite]; }; CytobankBridgeR = derive2 { name="CytobankBridgeR"; version="1.0.0"; sha256="0m8gxbm3p9gvdszymqx10n5rzb406r4f70a0in798c56mp2rcsl4"; depends=[CytobankAPI]; }; D2MCS = derive2 { name="D2MCS"; version="1.0.0"; sha256="14c02p9shfhvpafvm10xpy2r5x1h2pqrbj07dnz7pviqndxjp7ma"; depends=[caret devtools dplyr FSelector ggplot2 ggrepel gridExtra infotheo mccr mltools ModelMetrics questionr R6 recipes tictoc varhandle]; }; @@ -1012,22 +1026,23 @@ in with self; { DAIME = derive2 { name="DAIME"; version="2.1.3"; sha256="099pbzgryz9lxhcqlrywcv8zl5af4ir5dyyqvgc16xi5bddxk7ld"; depends=[]; }; DAISIE = derive2 { name="DAISIE"; version="3.0.1"; sha256="10b55m4ycb07l0mfjx58zfmckk627arj575p9via6kr7lp1c3j59"; depends=[DDD deSolve doParallel foreach magrittr Matrix pracma subplex tensor testit]; }; DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; }; - DALEX = derive2 { name="DALEX"; version="2.3.0"; sha256="0x8rcl3p1h1dpzgsfnalfjhvv345gg5v0z8dxqwrk6i32xk5wmzb"; depends=[ggplot2 iBreakDown ingredients]; }; + DALEX = derive2 { name="DALEX"; version="2.4.0"; sha256="1s7r7k5ihdbj69r27vbcs3ghra9s4yqw7cyh2rkm2ry901zq3114"; depends=[ggplot2 iBreakDown ingredients]; }; DALEXtra = derive2 { name="DALEXtra"; version="2.1.1"; sha256="1xqqisrqal0spzkbc1x5rj3xpycfqj4g87wc3nl2j76frj8mnmdy"; depends=[DALEX ggplot2 reticulate]; }; 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]; }; - DAMisc = derive2 { name="DAMisc"; version="1.6.2"; sha256="0arazw6pjgd9xgsdnyz8ccwyrpakyqzraw6j08zlrnn6hv7p29mr"; depends=[AICcmodavg boot car clarkeTest coda dplyr DT effects gamlss ggplot2 glue haven janitor jtools lattice latticeExtra magrittr MASS nnet optiscale rlang rstan survey tibble tidyr tidyselect xtable]; }; + 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]; }; DAP = derive2 { name="DAP"; version="1.0"; sha256="0zzb05yxfaqp6qnr979q20rqy8sl5l825mxs0x9366qr7mz5k5ws"; depends=[MASS]; }; - DArand = derive2 { name="DArand"; version="0.0.1.1"; sha256="0cmwqbhi073zj8ipgib6a6ss6h4r0x2w541xl24jyk5xz3c6s697"; depends=[]; }; + DArand = derive2 { name="DArand"; version="0.0.1.2"; sha256="1pwd5srrjy8mhs40k6g6x5j3vk9cr5hylk8sdyiiqalpq490nzqy"; depends=[]; }; DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; }; DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; }; DBI = derive2 { name="DBI"; version="1.1.2"; sha256="0n2gf5flmcrkad7p0pzsnsgwjl5006yi7lyz9lisqxhw8xykgv2n"; depends=[]; }; DBItest = derive2 { name="DBItest"; version="1.7.2"; sha256="0zx58nq6l21g0sbrmrnmckw0x20i2f6lv81cczh02yrv4r968cmh"; depends=[blob callr DBI desc hms lubridate palmerpenguins R6 rlang testthat vctrs withr]; }; DBfit = derive2 { name="DBfit"; version="2.0"; sha256="1b5fy4xya5k31937ccjsq1gj9y39lh1vb48jfc0sr56isrx0c496"; depends=[Rfit]; }; + DBpower = derive2 { name="DBpower"; version="0.1.0"; sha256="04wwhzlc9g6il478ax5yvh74bbb6hs29jyslkiz3k1hi25hlpkrn"; depends=[combinat dplyr GBJ kit magrittr mvtnorm]; }; DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; }; DCCA = derive2 { name="DCCA"; version="0.1.1"; sha256="06xdx79r7dr14dlk5vgcyd8ar4sc72imlyk66bnia1kvlynvdy69"; depends=[checkmate]; }; DCD = derive2 { name="DCD"; version="0.1.0"; sha256="0p6vk8fdvpcvb1bb5fwy3h1v8y3djlvcm5jl5lnx30ngqj6d7rcj"; depends=[data_table doParallel foreach ggplot2 igraph lattice lsa Matrix plyr qlcMatrix Rdpack ROCR WGCNA]; }; - DCEM = derive2 { name="DCEM"; version="2.0.4"; sha256="1g4c7h02rv467sgvjv19s0w4xcm11mwfamfs3sdy44ra9dgaf1af"; depends=[MASS matrixcalc mvtnorm Rcpp]; }; + DCEM = derive2 { name="DCEM"; version="2.0.5"; sha256="04z0lya1dbkdzjbgn8g6p16969kc6s4zrk87wy0i42h2hx0yx1zv"; depends=[MASS matrixcalc mvtnorm Rcpp]; }; DCEmgmt = derive2 { name="DCEmgmt"; version="0.0.1"; sha256="1vv212baycn0xkk2caj1f00ps1512261h21akmyqjhij3q4lxikx"; depends=[mlogit survival]; }; DCEtool = derive2 { name="DCEtool"; version="0.3.1"; sha256="05pmdd5ryv0jyqkqknjb33lvfcv4vqfqw46q231l5ixxcwapfvxr"; depends=[bslib commonmark DT htmltools idefix MASS mlogit readxl shiny shinycssloaders shinyglide shinyhelper shinyjs shinythemes stringr survival writexl]; }; DCG = derive2 { name="DCG"; version="0.9.3"; sha256="08718x6v3g7kpfv0gpgm19cn3d3ynj7yagzs0jic1j5rwvn04pfb"; depends=[]; }; @@ -1065,9 +1080,9 @@ in with self; { DGCA = derive2 { name="DGCA"; version="1.0.2"; sha256="0k2a24ycagyxdx54dh9w8km25xhmmmhyyl26g76z4g5gqvcw092k"; depends=[matrixStats WGCNA]; }; DGEobj = derive2 { name="DGEobj"; version="1.0.3"; sha256="0n2i6y2vhhypn3sgsysvfpxdfvhb3fq7pz2lv71bnn1fz3lghbsx"; depends=[assertthat GenomicRanges magrittr stringr]; }; DGEobj_utils = derive2 { name="DGEobj.utils"; version="1.0.4"; sha256="0mad5cph7bszb7xykgsd9gk5d2zb0kwvb4yjrh84zfdnxgw8799w"; depends=[assertthat DGEobj dplyr edgeR limma qvalue stringr sva]; }; - DGLMExtPois = derive2 { name="DGLMExtPois"; version="0.1.3"; sha256="1prsnkkhb61y01flxz57875a9arvyy2qxjl0lz5ajpmf8dhr08j8"; depends=[COMPoissonReg nloptr progress]; }; + DGLMExtPois = derive2 { name="DGLMExtPois"; version="0.2.0"; sha256="0d0c2pv4srb20ly5i43zy3h1y9yng2lz5djpprhbqxim80lv05wc"; 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.4"; sha256="1jpda8jpjpkkjh1cl28fzcx7fr7jz0czchsa0zr48wdg9zw7785m"; depends=[ape gap lme4 lmtest Matrix qgam]; }; + DHARMa = derive2 { name="DHARMa"; version="0.4.5"; sha256="1gw8kpa0lrcdifpqgfwxhbmwqc56xzw0bznq23qdzgmsk84l3k8g"; depends=[ape gap lme4 lmtest Matrix qgam]; }; DHBins = derive2 { name="DHBins"; version="1.1"; sha256="1g69acac7pxw8x0d9czyds7xljhbv9d686c99a3y8b4vh7dnx62s"; depends=[ggplot2]; }; DHS_rates = derive2 { name="DHS.rates"; version="0.9.1"; sha256="1mbp38kbs22wr1aq1gs2m7xcsk3gadik7yxlandhvhnrnacc4pd7"; depends=[crayon dplyr haven matrixStats reshape rlang survey]; }; DICOMread = derive2 { name="DICOMread"; version="0.0.0.3"; sha256="1wrgx5b9w476g8s3jmccc027xdqbmcmnlhwf02g6j213rgy87p73"; depends=[matlabr]; }; @@ -1082,12 +1097,14 @@ in with self; { DIMORA = derive2 { name="DIMORA"; version="0.2.0"; sha256="1ig2h2v199r5ryia35fx2540px7n2qshpma73599l82dr7k9hb33"; depends=[deSolve forecast minpack_lm numDeriv reshape2]; }; DIRECT = derive2 { name="DIRECT"; version="1.0.1"; sha256="00z4xlc9kxn19lw2b8xq6krsf5v3wfbr1ghl5ah5shr9dnv84lc1"; depends=[]; }; DISTRIB = derive2 { name="DISTRIB"; version="1.0"; sha256="0whwmmdx2k2vrjjkz4ww9v7z9ad3835819pby91119lyic27w727"; depends=[]; }; - DIZutils = derive2 { name="DIZutils"; version="0.0.9"; sha256="1vl8qyp3f5dw5f7qv1738gg7qvr43i29svapd62smb064cb9plld"; depends=[config data_table DBI Hmisc parsedate psych rapportools RJDBC RJSONIO RPostgres shiny shinyjs xml2]; }; + DIZtools = derive2 { name="DIZtools"; version="0.0.4"; sha256="17fgkcj27cx19q4w5c6r6gr3cqlgvdbnsk640zzhwgk67cavq3v4"; depends=[cleaR config logger magrittr parsedate]; }; + DIZutils = derive2 { name="DIZutils"; version="0.0.15"; sha256="1hnpzv0mqqwh5sdyw8pvalr7bm2girmgd7gh4f2l704ihffp3r36"; 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.1"; sha256="0767xanj4dck6hxx392fcavwsjz8d30wymxnabr5v8s7pcsmv18p"; depends=[hnp 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]; }; DJL = derive2 { name="DJL"; version="3.7"; sha256="0j8535gdn5h1rjc357w30sdmarmm9sx9n62fiji191wpk1mm1dmh"; 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]; }; DLMtool = derive2 { name="DLMtool"; version="6.0.3"; sha256="00gh4di7ngn56v5hy7l5ybj6zg71fxaqyp1chmz22arb7rvj4q08"; depends=[dplyr ggplot2 MSEtool Rcpp]; }; DMCfun = derive2 { name="DMCfun"; version="2.0.2"; sha256="1phzi3an03akf04q1j6s1dmqmfzg1r52ga7685wimcbxy4cbq323"; depends=[BH DEoptim dplyr pbapply Rcpp shiny tidyr]; }; DMLLZU = derive2 { name="DMLLZU"; version="0.1.1"; sha256="0ck87abcd5gkq69q1g5g0yshfhx94m3vgayvxgzgnkidn9mivx22"; depends=[caret gbm ISLR lmtest nnet randomForest rlang sandwich]; }; @@ -1099,6 +1116,7 @@ in with self; { DMwR2 = derive2 { name="DMwR2"; version="0.0.2"; sha256="1vzfbz2k05j8r2hpig3d2grb99rnnh2s1sviii3prcyqicxfh0i9"; depends=[class DBI dplyr quantmod readr rpart xts zoo]; }; DNAseqtest = derive2 { name="DNAseqtest"; version="1.0"; sha256="1mpmf40vrpw8m75rlqchsnyrz12pgg5bkz7wfca5yy5sbbiwk5pf"; depends=[]; }; DNAtools = derive2 { name="DNAtools"; version="0.2-3"; sha256="10j95g9jqr7jk9ph9j3i2yblkmp4v4py8vq70rv7q56cv7dq7z32"; depends=[multicool Rcpp RcppParallel RcppProgress Rsolnp]; }; + DNH4 = derive2 { name="DNH4"; version="0.1.12"; sha256="0g3ibacsbsk34b6411j3n3q9dxqq1iqdnisppmmq7s2bp94ab771"; depends=[httr rvest tibble tidyr]; }; DNLC = derive2 { name="DNLC"; version="1.0.0"; sha256="05410xgpfjsydjmnzry454qcjpws9vhh252q2xq7l0scdj87ly00"; depends=[caTools fdrtool GOstats igraph locfdr mvtnorm spdep]; }; DNMF = derive2 { name="DNMF"; version="1.3"; sha256="09yp6x6vd44ahklcag96fpjgyphyn45rkqkbwr1n36a2d8vxk9nc"; depends=[doParallel foreach gplots Matrix]; }; DOBAD = derive2 { name="DOBAD"; version="1.0.6"; sha256="0ifrrfm4yp1416z58qgnak042rgj1xvqby2vvzgrv19z6b3250p3"; depends=[lattice Matrix numDeriv]; }; @@ -1115,7 +1133,9 @@ in with self; { DPQmpfr = derive2 { name="DPQmpfr"; version="0.3-1"; sha256="0f3l6dhiqnlix5vdz65pnxic43hcd4xiz64sh3cp8xs8cbmlnqcw"; depends=[DPQ gmp Rmpfr]; }; DPWeibull = derive2 { name="DPWeibull"; version="1.8"; sha256="05sasi42cakq0k3syvn2hnvb0sl2dflw6x98riwgrjvsmnw6bh2g"; depends=[binaryLogic prodlim Rcpp RcppArmadillo survival truncdist]; }; DPtree = derive2 { name="DPtree"; version="1.0.1"; sha256="0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7"; depends=[MASS MCMCpack plyr Rdpack]; }; - DR_SC = derive2 { name="DR.SC"; version="2.3"; sha256="0hrp2d6frivj2q8js103gla5wrzqy814izzji6n8lc4x088dwrjg"; depends=[CompQuadForm cowplot ggplot2 GiRaF MASS Matrix mclust purrr RColorBrewer Rcpp RcppArmadillo Seurat spatstat_geom]; }; + DQAgui = derive2 { name="DQAgui"; version="0.1.9"; sha256="1cq002anhdk6hqnlskngyr14jbaaxvwzql4ry30g4j0d6x6dy5s6"; 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.2.6"; sha256="1z3mmrd5vdd9z973y8d77r610b1ns8viwmncckcl813rd2fz2dki"; depends=[data_table DIZtools DIZutils future future_apply jsonlite kableExtra knitr magrittr parsedate rmarkdown tinytex]; }; + DR_SC = derive2 { name="DR.SC"; version="2.7"; sha256="1ap30phavskiy9vn7jzh8iajfr1ds3gwpcdh59vawf8xv1w8lwpi"; depends=[CompQuadForm cowplot ggplot2 GiRaF 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]; }; DRDID = derive2 { name="DRDID"; version="1.0.3"; sha256="1xlz4vc43myxximzcf87bk52pd5rplcbi5655m18xk7jx2l95ksb"; depends=[BMisc trust]; }; DRDRtest = derive2 { name="DRDRtest"; version="0.1"; sha256="1vrvwr441w526a80s0r2fwqlllvn05ir8v2152jz2wxrwhnpq1s0"; depends=[KernSmooth SuperLearner]; }; @@ -1124,8 +1144,8 @@ in with self; { DRIP = derive2 { name="DRIP"; version="1.6"; sha256="08qyv2xwl3a70jrpmyxq37g0cryzc0ca904znyhzidmjgy13d18i"; depends=[]; }; DRR = derive2 { name="DRR"; version="0.0.4"; sha256="1y70si1gig4l7jx5jiqsqliyywfsvimkx53x3zh1lc3yj2j6bqwk"; depends=[CVST kernlab Matrix]; }; DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; }; - DRomics = derive2 { name="DRomics"; version="2.3-0"; sha256="0jkiz7018az7gjv38diwxgfgyd6a0k004mb6xb917qpd56ng4rjs"; depends=[DESeq2 ggplot2 limma SummarizedExperiment]; }; - DRviaSPCN = derive2 { name="DRviaSPCN"; version="0.1.0"; sha256="1h8wy577q5fy1pjnyr7cfk33yg0cvw59ppky8gml2ir6hggyd88p"; depends=[ChemmineR clusterProfiler GSVA igraph pheatmap rvest xml2]; }; + DRomics = derive2 { name="DRomics"; version="2.4-0"; sha256="1ld83nwslbxcd63s1xhkc4380q87wnmgzx3kx5nv978zh9dqc92x"; depends=[DESeq2 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.3"; sha256="1igwm6zm987xjyfvwakxa5ckb1chiaykcjcambkxpjyi1b6gg6gf"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra lhs nloptr plotly rlang shiny XML]; }; DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; }; @@ -1134,19 +1154,18 @@ in with self; { DSLite = derive2 { name="DSLite"; version="1.3.0"; sha256="05wm02bwa4kcbg0q95368pnmnm0lpn6abk4ffliygha19d0pgpsf"; depends=[DSI R6]; }; DSMolgenisArmadillo = derive2 { name="DSMolgenisArmadillo"; version="1.4.0"; sha256="036ha5m6q2i8s13mdgzs7r35j88z6xk2c8bdwn090akb0fqwq52y"; depends=[base64enc DSI httr MolgenisAuth stringr urltools]; }; DSOpal = derive2 { name="DSOpal"; version="1.3.1"; sha256="1f5lh3j7yfxa5rpcfknwqralnn108mg8813k8sclav8f2y3qh9pi"; depends=[DSI opalr]; }; - DSSAT = derive2 { name="DSSAT"; version="0.0.5"; sha256="0sqd0ma6cx1pj92l28xr2zhqv8i9vphvyvzvyb6vpcy2wrgs9h8h"; depends=[dplyr glue lubridate purrr readr rlang stringr tidyr]; }; + DSSAT = derive2 { name="DSSAT"; version="0.0.6"; sha256="13h2vslghy0127ycd9s1fynfqxh52vr3zbrryh20r7q0fzlka3fi"; depends=[dplyr glue lubridate purrr readr rlang stringr tidyr]; }; DSWE = derive2 { name="DSWE"; version="1.5.1"; sha256="129dx5sf938pqpbqbar6zwma58m59if45pp7x6zwvnh2n03gaxy8"; depends=[BayesTree 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]; }; DSsim = derive2 { name="DSsim"; version="1.1.5"; sha256="0dr8dc91m7s5c198k9cb26a09f14wb8ihr46c0mr9cg33l2wf3nv"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; }; - DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; }; DSviaDRM = derive2 { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; }; - DT = derive2 { name="DT"; version="0.20"; sha256="17xs18i439p15agyk7z2xyyrwgrpn5pw09kd3jwxn7qhxi4pyvf6"; depends=[crosstalk htmltools htmlwidgets jquerylib jsonlite magrittr promises]; }; + DT = derive2 { name="DT"; version="0.21"; sha256="1yhlph9h8z78wqjddv598l2xrqpp605d70cxfb69m53hanw4hmzn"; depends=[crosstalk htmltools htmlwidgets jquerylib jsonlite magrittr promises]; }; DTAT = derive2 { name="DTAT"; version="0.3-4"; sha256="1ddmih8cxbgc1p4m0sm8gdbnf0d3ka8z7014zd4aykz75j3pr002"; 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.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; }; - DTDA = derive2 { name="DTDA"; version="3.0"; sha256="1agra6qsdqxjra8kdw5y1ya2l32xrg11py5sr18ddyf3gp5g3w98"; depends=[doParallel foreach]; }; + 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"; sha256="0c45cz4y629bc0jnf3m35ywqkrnjcdqbssbb6m10j8b4gszdi35i"; depends=[]; }; DTK = derive2 { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; }; @@ -1174,7 +1193,7 @@ in with self; { Data2LD = derive2 { name="Data2LD"; version="3.2.1"; sha256="1y6nyysm96q5mlrcl0vkjhq5lr624n2266xpmyl4ck0h1dhjb6bz"; depends=[deSolve fda knitr rmarkdown]; }; DataClean = derive2 { name="DataClean"; version="1.0"; sha256="0wkafjyp6c2mx7g1bpz2pbxyl5nm2wba2hly8miizv0fdc762za5"; depends=[xlsx XML]; }; DataCombine = derive2 { name="DataCombine"; version="0.2.21"; sha256="0iwb4726bk0cjhay694dp43b1553yyk9lpxbncs85kz229b26arm"; depends=[data_table dplyr]; }; - DataEditR = derive2 { name="DataEditR"; version="0.1.4"; sha256="0skra1453ndzjbsfqb17yzb1h25hl3g3jpqc67kh0m3ijc7ch0ps"; depends=[htmltools miniUI rhandsontable rstudioapi shiny shinyBS shinyjs shinythemes]; }; + DataEditR = derive2 { name="DataEditR"; version="0.1.5"; sha256="0kwjgr6kaai42mhcljjs6i93m966x45gic5jgqsrkgfwjmmgf043"; depends=[bslib htmltools miniUI rhandsontable rstudioapi shiny shinyBS shinyjs]; }; DataExplorer = derive2 { name="DataExplorer"; version="0.8.2"; sha256="0451fnlaqvyzpqhn25g6lj2svjfsfaxii9vmwhqw7p29fl71zaln"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; }; DataFakeR = derive2 { name="DataFakeR"; version="0.1.2"; sha256="0158ffj6yfvdirxar39rl6n730sza0lzq48v65p43whz6jbf9ybb"; depends=[dplyr glue magrittr purrr R6 tibble tidygraph yaml]; }; DataGraph = derive2 { name="DataGraph"; version="1.2.5"; sha256="0f5wh2lyddr48wdcqgk1y1jbs9q9rim86v4g1c7m4xgnvyp81mih"; depends=[Rcpp]; }; @@ -1183,25 +1202,24 @@ in with self; { DataSpaceR = derive2 { name="DataSpaceR"; version="0.7.5"; sha256="0n7f7092lmhac1xb7yw4a68nmnk0cad2j6lkaj2v0d1nl2q7pvam"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; }; DataVisualizations = derive2 { name="DataVisualizations"; version="1.2.2"; sha256="1fqsim2kz57f4c9isj6pivxnsabhdpj17dpyly4d4jh5bgyscqzm"; 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="5.0.0"; sha256="1gv5awdd6xm72j7w787aiq8y8zbf56xswkpr67zjynhkh8q6jrf1"; depends=[bit64 DBI readr rJava rlang SqlRender stringr urltools]; }; + DatabaseConnector = derive2 { name="DatabaseConnector"; version="5.0.2"; sha256="03gh1x560c2zflcha7k04y3zcav03jb8wqpnk50389mwmggl9k4q"; depends=[bit64 DBI readr rJava rlang SqlRender stringr urltools]; }; DatabaseConnectorJars = derive2 { name="DatabaseConnectorJars"; version="1.1.0"; sha256="18m6ynj30r5xdy51b3s39h0jcz1k2wgka888skr6ds2233lhqk2w"; depends=[rJava]; }; DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.1.5"; sha256="1m5ydlyj54ybw38b6i78krrvqj29bp24x19xbqz9fgwpqimnv79y"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; }; DatastreamDSWS2R = derive2 { name="DatastreamDSWS2R"; version="1.8.2"; sha256="018733gm5z90qhbci6khxx27pn074si176mwnlq53bd6r722jiwm"; depends=[dplyr foreach httr jsonlite stringi stringr xts zoo]; }; - Davies = derive2 { name="Davies"; version="1.1-9"; sha256="19n2szki2dc8z01zh5a7bq4scgisnpd2qqbiimgrswjrykgh2fpm"; depends=[]; }; - DeCAFS = derive2 { name="DeCAFS"; version="3.2.3"; sha256="1sc9wx33lhdwp5ql4cq3jrqilrykhn44p9idccsn702pyf9xy4lq"; depends=[ggplot2 Rcpp robustbase]; }; + Davies = derive2 { name="Davies"; version="1.2-0"; sha256="0n2pqipv0b1w2zjvycms0kyk7h8ps49f5jlzgyxhy9dlyr0ivaml"; depends=[mathjaxr]; }; + DeCAFS = derive2 { name="DeCAFS"; version="3.3.1"; sha256="1508pl1jwp9ypfg31ygyrx1abckivv3xb69qd7hq6w1xvlkc83qr"; depends=[ggplot2 Rcpp robustbase]; }; DeLorean = derive2 { name="DeLorean"; version="1.5.0"; sha256="1ry6j4mvxms9hddi9c56p9yhjh66fzss41wqkf6xq398h1wbn4q1"; depends=[BH broom coda dplyr fastICA functional ggplot2 kernlab lattice MASS memoise Rcpp RcppEigen reshape2 rstan rstantools seriation StanHeaders stringr]; }; DeRezende_Ferreira = derive2 { name="DeRezende.Ferreira"; version="0.1.0"; sha256="05c99z3hlwwm0p02cl9z6gjwfxfq2b2qn90l85270bi16llgf42h"; depends=[xts]; }; - DeclareDesign = derive2 { name="DeclareDesign"; version="0.28.0"; sha256="0ggqagmcqsw7g5pqyzpxzy5r8kn0q3i4b4kzywvshln95gdwliwj"; depends=[estimatr fabricatr generics randomizr rlang]; }; + DeclareDesign = derive2 { name="DeclareDesign"; version="0.30.0"; sha256="1p6nazfja6lmlxlinr84a1gp48vzwypydjxiqd6a1kqr73m90kj3"; depends=[estimatr fabricatr generics randomizr rlang]; }; DecomposeR = derive2 { name="DecomposeR"; version="1.0.4"; sha256="0px999jzxnsl9mg4nch0zwzfjpm5mfj1yk5q42vbb7q42iv1ifbf"; depends=[colorRamps dplyr hexbin hht 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]; }; DeducerPlugInExample = derive2 { name="DeducerPlugInExample"; version="0.2-0"; sha256="03aw7wr957xzw920ybyzxnck5kx0q2xpcrpq8jh2afyzszy6hzbi"; depends=[Deducer]; }; DeducerPlugInScaling = derive2 { name="DeducerPlugInScaling"; version="0.1-0"; sha256="1qg11vi4szznchh54p9345jbmrfzfr9z5l3x5xz4m86myjkys1mb"; depends=[Deducer GPArotation irr klaR mvnormtest psych]; }; - DeducerSpatial = derive2 { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[Deducer Hmisc JavaGD maptools OpenStreetMap rgdal scales sp UScensus2010]; }; DeducerSurvival = derive2 { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; }; DeducerText = derive2 { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer RColorBrewer SnowballC tm wordcloud]; }; DeductiveR = derive2 { name="DeductiveR"; version="1.0.0"; sha256="0bx1ad2gw0pf03z0im31mzaa26jxwws6fkbcj319kd8b4s4wp92y"; depends=[dplyr ggplot2 moments reshape2]; }; - Delaporte = derive2 { name="Delaporte"; version="8.0.1"; sha256="0ijhmwclpg5czs2sl2vykcw8qj2pxy26xf6knh62rqq6p6sm43f4"; depends=[]; }; + Delaporte = derive2 { name="Delaporte"; version="8.0.2"; sha256="10xsmms2jfw7x4hmgpd35dv4n4azpjzmfid6585kg6qfh2zg23g5"; depends=[]; }; DelayedEffect_Design = derive2 { name="DelayedEffect.Design"; version="0.0.4"; sha256="0n1dw9bqisfarg7him49mzqn60gcfr660d5x9k6b37r12dnmy48v"; depends=[msm survival]; }; Delta = derive2 { name="Delta"; version="0.2.0.3"; sha256="0bi9qca4ky481zycp8r7ihvqfjkpvi7hb9wrjsw9avawqa6ck9bv"; depends=[]; }; Demerelate = derive2 { name="Demerelate"; version="0.9-3"; sha256="1bsf09di6nh0hznqx829jnbn3092rya03hnc82cns6rm8d3bn0a9"; depends=[fts mlogit sfsmisc vegan]; }; @@ -1212,11 +1230,11 @@ in with self; { DensParcorr = derive2 { name="DensParcorr"; version="1.1"; sha256="1ifkg7cpimf27yhr60rks77r16kmhwa5h10wv7b64sbfncnyzfmj"; depends=[clime gplots]; }; Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; }; DepLogo = derive2 { name="DepLogo"; version="1.2"; sha256="13y3akmrj5x1mn1sgha1jryzswg4kqxwswbm3m5z92mcm2zw4r9l"; depends=[]; }; - DepthProc = derive2 { name="DepthProc"; version="2.1.4"; sha256="0fa15qcga72db040rscmvp31jdi477wxyyx4c3mwmpjhf81a5978"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; }; + 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.44"; sha256="04wp3sp6sahgq167465y38y13h1ia5a4zqazysacpjxd1if0578j"; depends=[BH boot data_table Exact expm gld MASS mvtnorm Rcpp rstudioapi]; }; DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.9"; sha256="12zwhy05wkwxldjyjxqcfsww73pxyni17c5g3b0slrxk6ag13wl7"; depends=[DescTools foreign manipulate rstudioapi writexl]; }; - DescrTab2 = derive2 { name="DescrTab2"; version="2.1.7"; sha256="09lsz4cqfkp75cc00vif3373wcd1qlzpjv6kl2i6hrk28lmnnwx8"; depends=[cli DescTools dplyr exact2x2 flextable forcats haven Hmisc kableExtra knitr magrittr nlme officer rlang rmarkdown scales stringr tibble tidyselect]; }; + DescrTab2 = derive2 { name="DescrTab2"; version="2.1.9"; sha256="0742xawfawc16vm3xhrmpjgazzfgdgzfhhadrcgmch019z1ls9cr"; depends=[cli DescTools dplyr exact2x2 flextable forcats haven Hmisc kableExtra knitr magrittr nlme officer rlang rmarkdown scales stringr tibble tidyselect]; }; DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.7"; sha256="0241mbz0y3ala7fsb4fwjd0xigsk0wq77hfrjyvnnp97rfjfzmcv"; depends=[GGally ggplot2 plyr reshape2 scales]; }; 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=[]; }; @@ -1232,9 +1250,8 @@ in with self; { DiNAMIC_Duo = derive2 { name="DiNAMIC.Duo"; version="1.0.0"; sha256="0yln7cvw3rribcqzdp20widdvlzgl64js7zvib0jn3ynxdl06n2y"; depends=[biomaRt dinamic plyr reticulate]; }; DiPALM = derive2 { name="DiPALM"; version="1.1"; sha256="0wni4xz8a9mf9pih332k1fmc62bha9rs63x56dn6w85hsd8wqz7n"; depends=[ggplot2 limma WGCNA]; }; DiPhiSeq = derive2 { name="DiPhiSeq"; version="0.2.0"; sha256="11l2inf99vxz9k292307j8c2b25kc1066svy3vxrfl72rrm4fqa7"; depends=[]; }; - DiPs = derive2 { name="DiPs"; version="0.6.2"; sha256="13n50wakvh7ny342xl007k1dfbwmgzg8kxvgcpfblaypqn48q09f"; depends=[liqueueR mvnfast plyr]; }; DiSSMod = derive2 { name="DiSSMod"; version="1.0.0"; sha256="199yipbc2sx2lsl51rpfyh80bfxaahfd2llqmfsp946gvj7339hv"; depends=[MASS matrixcalc psych sfsmisc]; }; - DiagrammeR = derive2 { name="DiagrammeR"; version="1.0.6.1"; sha256="0gb7ccdrh7jlyqafdk8zs465ygczxxd25s05whn914in1994qkmy"; depends=[downloader dplyr glue htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; }; + DiagrammeR = derive2 { name="DiagrammeR"; version="1.0.9"; sha256="1gqaqk7jdh37zzadv0aymr9yb8lpqgj3l8n1n3cds38i4zz2d934"; depends=[downloader dplyr glue htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; }; DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; }; DiallelAnalysisR = derive2 { name="DiallelAnalysisR"; version="0.4.0"; sha256="087kzxdvhabl1f9q5mbr4dllrpsx86a08bs34xsam2g2x63vmdxq"; depends=[ggplot2]; }; DiceDesign = derive2 { name="DiceDesign"; version="1.9"; sha256="1a8ixa65xgyfri03cviic8qi2plbhdyz8m02bwif8w94w0q3ghlk"; depends=[]; }; @@ -1256,10 +1273,11 @@ in with self; { 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="5.2"; sha256="19vz0i3q4560fknvr9d7b5plq3xvydrw2kk91qngrx5dsml0mx0k"; depends=[bigstatsr doParallel foreach ggplot2 magrittr RANN Rfast Rfast2 rgl rnaturalearth sf]; }; + Directional = derive2 { name="Directional"; version="5.3"; sha256="0a6yp939dlfm23glwvb4hcpd8g9lajw9jbj9k4kwism23jbx9kcg"; 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.15"; sha256="1cksc68gqvlah6rzlh1h7glsl55v9kxkayvv05hz6fkcds01qkga"; depends=[dplyr purrr rlang tidyr tidyselect]; }; + DisImpact = derive2 { name="DisImpact"; version="0.0.16"; sha256="0zybgv09d1l2wbqz773sya9kldmz9dy4m8ll2df9f11hwlpaf4dz"; depends=[dplyr purrr rlang tidyr tidyselect]; }; + DisaggregateTS = derive2 { name="DisaggregateTS"; version="1.0"; sha256="1r55ipjssyxp8frw02587mmpmsgi169hbsj6c5bccd9agcys9h5s"; depends=[lars Matrix Rdpack withr zoo]; }; DiscreteFDR = derive2 { name="DiscreteFDR"; version="1.3.6"; sha256="06z9phxg3wjxvndcl3fnh99wbs2j8j2m7wndm0hskhcgijab5cgg"; depends=[Rcpp]; }; DiscreteInverseWeibull = derive2 { name="DiscreteInverseWeibull"; version="1.0.2"; sha256="0vjsvl4m4zccfgizv7mzidbbpzqcm101x448vllcdcrn2xlnkmnq"; depends=[Rsolnp]; }; DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1.1"; sha256="17w4vjvsm7jacvwckjczyah3hglq044r3m6vqdcrg8haz884rav2"; depends=[]; }; @@ -1268,6 +1286,7 @@ in with self; { DiscriMiner = derive2 { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; }; Disequilibrium = derive2 { name="Disequilibrium"; version="1.1"; sha256="1jm5n01ih4rnga13058yh939zp2lvjn5pgb6rrwp5fdlk5kqsgb0"; depends=[Formula numDeriv optimr]; }; DisimForMixed = derive2 { name="DisimForMixed"; version="0.2"; sha256="00mknsalikangr17946877m5fy2jgkgasgl6ng4f2nr44f0q9l6q"; depends=[cluster dplyr]; }; + DistPlotter = derive2 { name="DistPlotter"; version="0.0.1"; sha256="02260wl216zq69l3acllcx026y3zy2cxyhxgfp7in7wdd4c3jxj2"; depends=[colourpicker dplyr DT extraDistr ggplot2 rio scales shiny shinyalert shinyBS shinyjs shinyWidgets stringi stringr]; }; Distance = derive2 { name="Distance"; version="1.0.4"; sha256="14sdkggacwv3dl8wd2vspy9vn1psz8yw2nvs12c2vjkgxa75dgcl"; depends=[dplyr mrds rlang]; }; DistatisR = derive2 { name="DistatisR"; version="1.0.1"; sha256="0myzfki8yrk0nhgdgsqs4wjbqhzmkdil1g005hc7p4lz3gi09bfx"; depends=[car prettyGraphs]; }; DistributionFitR = derive2 { name="DistributionFitR"; version="0.1"; sha256="0wg43gqsdy1ja0l489k27k9q1w2zq45wzmqnv9wfc734rf8kvlba"; depends=[doParallel foreach stringr]; }; @@ -1294,9 +1313,8 @@ in with self; { DoubleML = derive2 { name="DoubleML"; version="0.4.1"; sha256="01mrak86wwyb83jnya0rk4wm4yp77sandzgkhzv8mia74w6p2h77"; depends=[checkmate clusterGeneration data_table mlr3 mlr3learners mlr3misc mlr3tuning mvtnorm R6 readstata13]; }; Dowd = derive2 { name="Dowd"; version="0.12"; sha256="1fgaq22n7gm8pqxdfkiayqgjfqjn7knjjjr1x12jgv77cv08xyjk"; depends=[bootstrap forecast MASS]; }; Dpit = derive2 { name="Dpit"; version="1.0"; sha256="02pnc00sk3bwxmxrg27638x0q62r7nsx2nr14zjjc5q880prdisv"; depends=[fitdistrplus gsl moments VGAM]; }; - DrBats = derive2 { name="DrBats"; version="0.1.5"; sha256="1iaffippp9kwfrwryf7klmn8nsm2k8pc0bkgpxcsl4vxyy2na3mp"; depends=[ade4 coda MASS Matrix rstan sde]; }; + DrBats = derive2 { name="DrBats"; version="0.1.6"; sha256="1623h8s6y4klq8xmj480ga2wl6n4c2f26v1dwysyvcrk6lnaghdm"; depends=[ade4 coda MASS Matrix rstan sde]; }; DrImpute = derive2 { name="DrImpute"; version="1.0"; sha256="1adzarrwqb282pqgx2yqswp9rpwd1naxsmar54kddr6qyd6b923b"; depends=[Rcpp RcppArmadillo]; }; - DrInsight = derive2 { name="DrInsight"; version="0.1.2"; sha256="1zz9i4aj0ijqfgp30wv0bvrgx2n003dysqg0pm13f7hni27819ff"; depends=[igraph qusage]; }; 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]; }; @@ -1347,22 +1365,22 @@ in with self; { EEMDelm = derive2 { name="EEMDelm"; version="0.1.0"; sha256="18m4b22sar14admlhagjdxzq16ynvam2c0cv3z168x8xh6zv2xpr"; depends=[forecast nnfor Rlibeemd]; }; EESPCA = derive2 { name="EESPCA"; version="0.5.0"; sha256="1vkyds5mpiaccg18i6483zymikadxb7mq4gsqh85r291zvllb7wl"; 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.3"; sha256="0pvdssdcqxynqpwvy0cfw9pgq5m9g3bhn2s57s5qfnf606xal0jy"; depends=[EFAtools polycor psych]; }; + EFA_dimensions = derive2 { name="EFA.dimensions"; version="0.1.7.4"; sha256="0798kmgh1d7k389kgw31qg617vhqqgz3ychw7ji4xqkxjadvm34n"; depends=[EFAtools polycor psych]; }; EFAtools = derive2 { name="EFAtools"; version="0.3.1"; sha256="1s0x8vp18yixn1vscmad8bgmp6nvn8zxx8xx435bmdlxml73c8xd"; 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.1"; sha256="0kdwdjv4c9rfy49qs7a4134vwa2sm2pcam17a3xii2dq8mghg1za"; depends=[GPArotation MASS mvtnorm plyr]; }; EFDR = derive2 { name="EFDR"; version="1.2"; sha256="1k6y2qxfw5py1brh25apmzqm00y3a458x0wrrmdg604g1m9zlkg5"; 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.0.0"; sha256="0mr63x5gx8yy9gp19glvqcsdmxbd29mnv4v29kjpfr21ij46h60a"; depends=[dplyr fitdistrplus GGally ggplot2 ggpubr glasso igraph lavaan Matrix network NetworkToolbox qgraph semPlot wTO]; }; - EGRET = derive2 { name="EGRET"; version="3.0.6"; sha256="0klpfrq2392s56x5q5pxvli4m7ivn146dwyh1svqz9pngqnwbif3"; depends=[dataRetrieval fields foreach MASS survival truncnorm]; }; + EGRET = derive2 { name="EGRET"; version="3.0.7"; sha256="1fxpcdsq7njf1hjy3a4i0fx0ah9v7jzmdwg4c7009nikyhx5ri6x"; depends=[dataRetrieval fields foreach MASS survival truncnorm]; }; EGRETci = derive2 { name="EGRETci"; version="2.0.4"; sha256="1g01a03smn5yp261cyk3x310m1mcv4bqyh8y123wam9gpa7dxrp6"; depends=[binom EGRET]; }; EHR = derive2 { name="EHR"; version="0.4-4"; sha256="0b42ny3xc936qgbfgibywpmancrbdvkcwwhy55lbqlm8xhzyr6s8"; 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]; }; - EIAdata = derive2 { name="EIAdata"; version="0.1.1"; sha256="06xq17x3zdk5q9zjvw3lxvayyggnz4ck4wpzzpsdd3s6j1b0fmhz"; depends=[XML xts zoo]; }; + EIAdata = derive2 { name="EIAdata"; version="0.1.3"; sha256="0cx8x16jn8pfik7yd6vfqh23fqlfxnfj3ya42h5zbvsbka8rislh"; depends=[httr XML xts zoo]; }; EILA = derive2 { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; }; 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.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; }; EL2Surv = derive2 { name="EL2Surv"; version="1.1"; sha256="0bn2481rf61qnia468y7k95hhazjaghrv919a2y9ar5wcz5nq2kk"; depends=[survival]; }; + ELCIC = derive2 { name="ELCIC"; version="0.2.0"; sha256="1iildkyiia2zinnfjyxvcmc1xd7chrcsdqzc0v7cl9b1jsqa8361"; depends=[bindata geepack MASS mvtnorm PoisNor wgeesel]; }; 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=[]; }; @@ -1377,6 +1395,7 @@ in with self; { EMDSVRhybrid = derive2 { name="EMDSVRhybrid"; version="0.1.0"; sha256="0wis8dh4xd5xldrrfzfr625pix2fvp139q6kj9ff2m6p5wafiabw"; depends=[e1071 EMD]; }; EML = derive2 { name="EML"; version="2.0.5"; sha256="0g4ilk2d68i1iz2b0ip6kngygvsw457x17f2vhfy3b26xf6ch2q1"; depends=[digest dplyr emld jqr jsonlite rmarkdown uuid xml2]; }; EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.7"; sha256="1wz4zw45xfqbk589cpd188j7619h2ar2czfkisil9x8ksijfixls"; depends=[caTools GPArotation limSolve matrixStats shiny]; }; + EMMIXSSL = derive2 { name="EMMIXSSL"; version="1.1.0"; sha256="14zhb065amcs7w7kr3ygwpclnf0fxil8xbipb2w0pq24d091vlxd"; depends=[mvtnorm]; }; EMMIXgene = derive2 { name="EMMIXgene"; version="0.1.3"; sha256="0a5q78s9y6ba1641lrv87kglg39x9wbk5xg7ihzbpl4adrb5sz4f"; depends=[BH ggplot2 mclust Rcpp RcppArmadillo reshape scales]; }; EMMIXmfa = derive2 { name="EMMIXmfa"; version="2.0.11"; sha256="06lfmpw908chhzx512anqacixvvx3y02wm1n4wmpb890rd85n11r"; depends=[]; }; EMMLi = derive2 { name="EMMLi"; version="0.0.3"; sha256="1b36kyzvrdljmkysggv8jyaip78pj32ms0xhj2y568hd419lkh2p"; depends=[]; }; @@ -1384,17 +1403,17 @@ in with self; { EMP = derive2 { name="EMP"; version="2.0.5"; sha256="0piagbxk8siagmvzqv2bh12g1y0hy3c0vkxpddlmp7gm3i304rpi"; depends=[ROCR]; }; EMSC = derive2 { name="EMSC"; version="0.9.3"; sha256="0mk7plkp1mfgi6krxn90vyah4x42960wh9v8k81wvxhyg67wc0ml"; depends=[pracma]; }; EMSNM = derive2 { name="EMSNM"; version="1.0"; sha256="0rhaadzhq9jfpnwxfqcsb3yz96rqlwkm165k5n5jxzwxpg1rg2n0"; depends=[]; }; - EMSS = derive2 { name="EMSS"; version="1.1.0"; sha256="0rvpi1kymvqcls9fp88dir4jwfqk0823km81wxngy0yi1cxg6va5"; depends=[mvtnorm sampleSelection]; }; + 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.2"; sha256="07c25nw8n6294f7q1axwraqp4x2p5dprgd8f9sldn2w6jslzvvc8"; depends=[]; }; EMVS = derive2 { name="EMVS"; version="1.2.1"; sha256="1aikms2i77hwv6hrk8kn9wrh1v5j5zm918cwdwm5s6cy8fcqf406"; depends=[Rcpp RcppArmadillo]; }; EMbC = derive2 { name="EMbC"; version="2.0.3"; sha256="0ns6jmshblf00n4harhls03q9c6h1wvgvjzn8jvr3kf4gm2iz2jd"; depends=[maptools mnormt RColorBrewer Rcpp RcppArmadillo sp]; }; EMpeaksR = derive2 { name="EMpeaksR"; version="0.2.0"; sha256="1f8s6p3h5594aajrvrx8iv5x8m97xbc1pynsrk6i13aw5r73ysb1"; depends=[]; }; - ENMTools = derive2 { name="ENMTools"; version="1.0.5"; sha256="1lvvby77j3abf3gmm12091mcgijxcg7vilr2j9q3fi5n87wqhl12"; depends=[dismo ENMeval forcats ggplot2 ggpubr gridExtra knitr lhs magrittr raster rgdal rgeos sp spatstat spatstat_core spatstat_geom]; }; - ENMeval = derive2 { name="ENMeval"; version="2.0.2"; sha256="00557sjrf0fmdddqgppfcambpi1z3j61mi9pdqrslr7rjpdcaha7"; depends=[dismo doParallel doSNOW dplyr foreach ggplot2 glmnet magrittr maxnet rangeModelMetadata raster rlang sp testthat tidyr]; }; + ENMTools = derive2 { name="ENMTools"; version="1.0.6"; sha256="0idjq7jk1yrbk9w0799x991n1sj71j09hkgn6dhwshgpyxh7c4qj"; depends=[dismo ENMeval forcats ggplot2 ggpubr gridExtra knitr lhs magrittr raster rgdal rgeos sp spatstat_geom spatstat_random]; }; + ENMeval = derive2 { name="ENMeval"; version="2.0.3"; sha256="0h9wikxs01xhpkp1khhxnnqvg4fgmdvh37jh15nz7i4xilx1ffab"; depends=[dismo doParallel doSNOW dplyr foreach ggplot2 glmnet magrittr maxnet rangeModelMetadata raster rlang sp testthat tidyr]; }; EPGMr = derive2 { name="EPGMr"; version="1.0.0"; sha256="1ii4lccv4hyydy3sd5l7c22pgx27x3mdml20sfbdj85pmpyab6q9"; depends=[]; }; - EPP = derive2 { name="EPP"; version="0.3.5"; sha256="15zncf1ydkrhckdpsghk29csccdkpb1rvxfd510qs52w2k6rjgpp"; depends=[assertthat clipr cpp11 curl deldir dplyr flexclust httr leaflet leaflet_extras maptools nngeo osrm plyr rgdal rgeos s2 sf sp tibble]; }; - EPT = derive2 { name="EPT"; version="0.7.5"; sha256="1llypf8600mk62cqxnwv5fds8ypfx5is2qkpbp4bh70l3s3lvj31"; depends=[]; }; + 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]; }; + EPT = derive2 { name="EPT"; version="0.7.6"; sha256="1hkisfisi63dd9lai662y387av1g77fkbai0p2a346n8zgahysji"; depends=[]; }; EPX = derive2 { name="EPX"; version="1.0.4"; sha256="0d0qddk4c835gkh4lydaypxzakjz3qw9ai7y35kbaflj08fismc6"; depends=[doParallel doRNG foreach nnet randomForest rngtools]; }; EQL = derive2 { name="EQL"; version="1.0-1"; sha256="0pa33h0f30l352m6ix296l55lvqxdaib666x2dwy9zx0lmk23w8m"; depends=[lattice ttutils]; }; EQUIVNONINF = derive2 { name="EQUIVNONINF"; version="1.0.2"; sha256="08d74jm9my2p9r491v1hya7w2m9b4mf3vk812jsmrdfzdw3x47ab"; depends=[BiasedUrn]; }; @@ -1405,8 +1424,8 @@ in with self; { ESEA = derive2 { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph parmigene XML]; }; ESG = derive2 { name="ESG"; version="1.2"; sha256="17kw82dikcibqsdb1fvbx2x2f3shzbqggygabprcvwki8bg9hgni"; depends=[]; }; ESTER = derive2 { name="ESTER"; version="0.2.0"; sha256="1jiyqq5hgqc754r434sik9jnlpw66xz56cjdf5ig95qkffzsg224"; depends=[brms cowplot doParallel dplyr foreach ggplot2 lme4 magrittr rlang tidyr]; }; - ETAS = derive2 { name="ETAS"; version="0.4.7"; sha256="1l8l0vmar720jz893kv8d2gg1m1jyxh1dkanh9aaiivdw0wg6k9b"; depends=[fields goftest lattice maps Rcpp spatstat spatstat_core spatstat_geom]; }; - ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; }; + ETAS = derive2 { name="ETAS"; version="0.4.9"; sha256="11sv5slr3s6w82ksgbw0qlzi9palznbzprq2n9iiifxz6ff5drvd"; depends=[fields goftest lattice maps Rcpp spatstat_core spatstat_geom spatstat_random]; }; + ETC = derive2 { name="ETC"; version="1.5"; sha256="16ciff8bf2p56941r83y7405sp5pfms63dwjd232ih3mnznjpc0f"; depends=[mvtnorm]; }; ETLUtils = derive2 { name="ETLUtils"; version="1.5"; sha256="0s0q4f3wzpdd87l3pnzysa8aq7zgz29589xnm65a6xfy9znbpzs3"; depends=[bit ff]; }; EValue = derive2 { name="EValue"; version="4.1.3"; sha256="0ip4cyipbs6g0znrdh5zs4xizmqgdznq8riggkgyv06wipgx9a2j"; depends=[boot dplyr ggplot2 metadat metafor MetaUtility]; }; EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; }; @@ -1416,15 +1435,14 @@ in with self; { EZtune = derive2 { name="EZtune"; version="3.1.1"; sha256="0scslbgbbwma7sr0w9awg58ly5jwn877xsk6q1gq0ss3rd17pmfk"; depends=[ada BiocStyle e1071 GA gbm glmnet optimx ROCR rpart]; }; Eagle = derive2 { name="Eagle"; version="2.5"; sha256="18y0hc5461gh7kp095xfpwpfnl7k3v545r8w6nrhabrhwsflrrij"; depends=[data_table fontawesome ggplot2 ggthemes mmap plotly R_utils Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; }; EasyABC = derive2 { name="EasyABC"; version="1.5"; sha256="17qv6y8sf2iwwqcv5wfg6sii259gv5jyr72dnfpir2bw78wb3mqx"; depends=[abc lhs MASS mnormt pls tensorA]; }; - EasyDescribe = derive2 { name="EasyDescribe"; version="0.1.0"; sha256="0is3j7myj4vjkg5hjwd1yzwyf1y8pxyn6710rphhaw85y86ba2mh"; depends=[CATT FSA gmodels multiCA psych rcompanion trend]; }; - EasyHTMLReport = derive2 { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; }; + EasyDescribe = derive2 { name="EasyDescribe"; version="0.1.1"; sha256="15g37m28l40w71bvj02cbhfc6x77bjvr8mjr89iipdqzndp23g1i"; depends=[CATT fitdistrplus FSA gmodels multiCA nortest psych rcompanion]; }; EasyMx = derive2 { name="EasyMx"; version="0.2-12"; sha256="00wj08nwv5zi5d4a1fss40f4cms4svam1hmmxvh60hvc55ygsc3z"; depends=[OpenMx]; }; EbayesThresh = derive2 { name="EbayesThresh"; version="1.4-12"; sha256="07a2dd3za2dc81n6m2xy794sclp3yw7f46lg1igaflh7m9407198"; depends=[wavethresh]; }; Ecdat = derive2 { name="Ecdat"; version="0.3-9"; sha256="112yg3v0pwssfw38nbbrrn1zrlg2h39brr79m3rdlp8hr810q92b"; depends=[Ecfun]; }; Ecfun = derive2 { name="Ecfun"; version="0.2-5"; sha256="0lwpgpjax149kyc9fzxdz0v4marm5agrhdgfmvm9956sslzksabj"; depends=[BMA fda jpeg MASS mvtnorm rvest stringi TeachingDemos tis xml2]; }; EcoDiet = derive2 { name="EcoDiet"; version="1.0.0"; sha256="19x2ypmsw6jnq1s0nqk3pdkwi5g3g92r6fgxrxlnyvd0jqi9l8b3"; depends=[coda ggplot2 rjags]; }; EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12.1"; sha256="075kgy6cxppkclk6nj5xs1f5yv9w8cpr09xwhf2101a6wswknb88"; depends=[DEoptim operators topmodel XML]; }; - EcoIndR = derive2 { name="EcoIndR"; version="1.7"; sha256="1sa6207zvmbgvl060i43yzsq6nb2mqgpvm2bzg742qll6y4nh217"; depends=[rgeos]; }; + EcoIndR = derive2 { name="EcoIndR"; version="1.8"; sha256="008wgp9zc8a8knz9ighgavrdm0yf37m5jahnq5kndjhld0359z6h"; depends=[rgeos]; }; EcoNetGen = derive2 { name="EcoNetGen"; version="0.2.3"; sha256="05j8m9vzkwlsw1h69s5myhbg85vyhqdxcl9r5mdwsrk9f58wajmz"; depends=[ggplot2 igraph]; }; EcoTroph = derive2 { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; }; EcoVirtual = derive2 { name="EcoVirtual"; version="1.1"; sha256="1aryl2sb5ak390lgnm427ilm6xv9lmsjhwdnapzc033zvqb099gj"; depends=[]; }; @@ -1439,15 +1457,17 @@ in with self; { EffectTreat = derive2 { name="EffectTreat"; version="1.1"; sha256="1kw1vq9y1q3xyiqsk855wjn9jqkzdh6h4xklbl9kvbqsvvhhsgkz"; depends=[]; }; EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; }; EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.4"; sha256="1s0i9a2vk2g4f5gadsvzjfkw91hcjsrbyjg2vgnj1v17xrwgp40w"; depends=[]; }; - EigenR = derive2 { name="EigenR"; version="1.1.0"; sha256="0382xjbw3hz2w0mnrjazwxkj06r7jci4rc10shic28wwyv0icnmy"; depends=[Rcpp RcppEigen]; }; + EgoCor = derive2 { name="EgoCor"; version="0.1.0"; sha256="197wf7v51qf2wc2gks68v3kpkcv0fmrbj3wrksixh1sphbl52rig"; depends=[geoR lme4 Rdpack shiny SpatialTools]; }; + EigenR = derive2 { name="EigenR"; version="1.2.2"; sha256="02cg898hm2byhnbfihg8mnygjsfpyrpq4y3lw2dnrglcj75qr71b"; depends=[Rcpp RcppEigen]; }; EleChemr = derive2 { name="EleChemr"; version="1.2.0"; sha256="1wr2lkaf56qxsnqi7mgbgzy72lhkr0xlr1w1l9hy1dpmmqcqw7l3"; depends=[ggplot2]; }; + ElliptCopulas = derive2 { name="ElliptCopulas"; version="0.1.1"; sha256="00cxyn6w9zy993lqyyn9yjvpw7h4wckp63s3apf1jv8b09l0kdn5"; depends=[Matrix pcaPP Runuran]; }; 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]; }; ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; }; EmbedSOM = derive2 { name="EmbedSOM"; version="2.1.1"; sha256="1w61dni4vsglxqdhwdy5dcmzb6hx1wb9fhfki8wmal1yaza23ljy"; depends=[FNN ggplot2 igraph Matrix Rtsne umap uwot]; }; EmiStatR = derive2 { name="EmiStatR"; version="1.2.3.0"; sha256="1cwzzkynhnpjd1slnifdmkrshfpv99ryilxj27f98kwgbnb6i81a"; depends=[doParallel foreach lattice xts zoo]; }; - EmissV = derive2 { name="EmissV"; version="0.665.5.2"; sha256="056xg4gmjwykgjzd5x21blkvwprfw8yl8rw8h1ym0kp1cljy2qdm"; depends=[data_table ncdf4 raster rgdal sf sp units]; }; + EmissV = derive2 { name="EmissV"; version="0.665.6.0"; sha256="06bsn9lgi8bzcs073d664i1q61bqg4w08x60qk9scvxhb3b5q49i"; depends=[data_table ncdf4 raster sf sp units]; }; EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="3.0.0"; sha256="02mcnxd3ndz7zafpxhyf52am5ncbwz743apy2n3q0i07hs33blyk"; depends=[ggplot2 gridExtra Rcpp rlang]; }; EncDNA = derive2 { name="EncDNA"; version="1.0.2"; sha256="0wy2cmcvyqjhg5mqbvdzmihfv8swx7ym2n9mjdqgx0kgnc7k614y"; depends=[Biostrings]; }; EnergyOnlineCPM = derive2 { name="EnergyOnlineCPM"; version="1.0"; sha256="1a3wvclqdwcvq5inhliwjnd7xzqbjvzs8h8ncy6qlhjq6s5n7nm8"; depends=[energy MASS]; }; @@ -1464,7 +1484,7 @@ in with self; { 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.4.0"; sha256="0505j1hh1xky6hm2i8m22pkw62ql7plkxn0v0bcb6dr085v9wia9"; depends=[ggplot2 MASS nortest]; }; + EnvStats = derive2 { name="EnvStats"; version="2.7.0"; sha256="10axzd4458lwvjibkk3i1szpmnx1hnhair3ihclwfmh8nvaz19h9"; depends=[ggplot2 MASS nortest]; }; EnviroPRA = derive2 { name="EnviroPRA"; version="1.0"; sha256="0yirh3vy7wap0qmm3kvjz9y68gcvp9i8qshv80wh8aijxwklpr8n"; depends=[fitdistrplus kSamples MASS truncdist]; }; EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; }; Epi = derive2 { name="Epi"; version="2.44"; sha256="1wcxr1f7irgfdwzz4vf67114yhxrhxxxnhy4hfaww0zy91vzxx10"; depends=[cmprsk data_table dplyr etm MASS Matrix mgcv numDeriv plyr purrr survival zoo]; }; @@ -1475,7 +1495,7 @@ 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]; }; EpiLPS = derive2 { name="EpiLPS"; version="1.0.2"; sha256="1fjy7rdqmf2crlhr5bbm5h25wskmw6yh8mb9isp0dc33r9pn2iwf"; depends=[coda crayon EpiEstim ggplot2 gridExtra MASS progress Rcpp RcppArmadillo]; }; - EpiModel = derive2 { name="EpiModel"; version="2.2.0"; sha256="1hpar16srsz0jnf44iqh376kd0qb4zfidkf09zzby9iicij7rv64"; depends=[ape deSolve doParallel dplyr ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer Rcpp statnet_common tergm tibble]; }; + EpiModel = derive2 { name="EpiModel"; version="2.2.1"; sha256="0gykqk9n3i4779zm1npsq9q07230nrxk0cm48gmnq587yf7n6fa2"; depends=[ape deSolve doParallel dplyr ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer Rcpp statnet_common tergm tibble]; }; EpiNow2 = derive2 { name="EpiNow2"; version="1.3.2"; sha256="1rcyhk0f18asrym9zd7hr5ss7aw2dd2m5wrjcsqkr8q7x6apwh3g"; depends=[BH cowplot data_table futile_logger future future_apply ggplot2 lifecycle lubridate patchwork progressr purrr R_utils Rcpp RcppEigen rlang rstan runner scales StanHeaders truncnorm]; }; EpiReport = derive2 { name="EpiReport"; version="1.0.2"; sha256="1dh9rjdjgmwzvfslzgnmd37ipj7ydbn4pnngz4sw7nknqy7r4dpx"; depends=[dplyr flextable ggplot2 officer png tidyr tidyselect zoo]; }; EpiSignalDetection = derive2 { name="EpiSignalDetection"; version="0.1.2"; sha256="17mawnx3c87kgfa7aj42a7db9c1ciyxdfgka9sgx6lc0yw5249as"; depends=[dplyr ISOweek rmarkdown shiny surveillance]; }; @@ -1498,7 +1518,7 @@ in with self; { EvalEst = derive2 { name="EvalEst"; version="2021.2-1"; sha256="0ws7x0dkzb3h2m801dkzx2as146whm63mcipy4iia90jd9944zir"; depends=[dse setRNG tfplot tframe]; }; EvaluateCore = derive2 { name="EvaluateCore"; version="0.1.2"; sha256="0yqv5srnbczdx8h3cxvj6hfas0436xc8hz698zi7ypms34r9c1ly"; depends=[agricolae car cluster dplyr entropy ggcorrplot ggplot2 gridExtra kSamples mathjaxr psych Rdpack reshape2 vegan]; }; EvaluationMeasures = derive2 { name="EvaluationMeasures"; version="1.1.0"; sha256="0b65y4rb650hhlgc18z0sm0danrrawqkazzdl9krl877djrgx87g"; depends=[]; }; - Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.15"; sha256="1hvvlc8qwgal4lhlccf4dk817xgpyyiqzzlzk7w3ydnczr8pk4bk"; depends=[zoo]; }; + Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.16"; sha256="0mdy9f20fwhak1a830mq2dnvkal0whgfdr8bqkkg2hb9351ahl15"; depends=[zoo]; }; EventDetectGUI = derive2 { name="EventDetectGUI"; version="0.3.0"; sha256="02gwgbp692cfmf933jg1f7h4gghhc1v2cswz7rpcazm8h39mc4wh"; depends=[DT EventDetectR ggplot2 plotly shiny shinyBS shinydashboard shinyjs XML]; }; EventDetectR = derive2 { name="EventDetectR"; version="0.3.5"; sha256="0wx3bcs8n95fmyc5vnlrwd75bzqqvy6czb9bsbp04g3770c5ja0r"; depends=[forecast ggplot2 gridExtra imputeTS neuralnet]; }; EventStudy = derive2 { name="EventStudy"; version="0.37"; sha256="1bf7ngwl3gxq3gi2s9z2c4pd0d2gjh9y9vrwzay6x66981sa84h9"; depends=[curl data_table dplyr ggplot2 httr jsonlite magrittr miniUI openxlsx purrr RColorBrewer readr rlang rstudioapi scales shiny stringr testthat tidyquant tidyr]; }; @@ -1513,6 +1533,7 @@ in with self; { ExPosition = derive2 { name="ExPosition"; version="2.8.23"; sha256="0x9400ggmgrnaish0cfgnyvw549g4ibfv9aj6vzq7j68n58vq405"; depends=[prettyGraphs]; }; Exact = derive2 { name="Exact"; version="3.1"; sha256="1kz3hw11sl142mai4ly2r85rwdbjz8q7b38ybmjym6r0n5qmqzyn"; depends=[rootSolve]; }; ExactCIdiff = derive2 { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; }; + ExactMed = derive2 { name="ExactMed"; version="0.1.0"; sha256="0mnmlfnpqkz82iphga3b3xd85xh7jb211m6ahx4jf6y6y4rv5isj"; depends=[logistf]; }; 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.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[SpatialTools splancs]; }; @@ -1524,7 +1545,7 @@ in with self; { 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]; }; - ExpImage = derive2 { name="ExpImage"; version="0.3.0"; sha256="0rakxpgfmpn1x3jvvkhlzpqx2pwvcbwz4cazci5c1gw5flvb63ka"; depends=[crayon doParallel foreach raster]; }; + ExpImage = derive2 { name="ExpImage"; version="0.4.0"; sha256="1nikj1hqpd57x3ra6kmql23qp037mn7y9njx51fcgjiw23k37gys"; depends=[crayon doParallel foreach ggplot2 progress raster rstudioapi]; }; ExpRep = derive2 { name="ExpRep"; version="1.0"; sha256="0spv3wd9c8sr338n5kdzrs28yh7s90fl70wsdnkibmlxhnh3ay3g"; depends=[]; }; ExpertChoice = derive2 { name="ExpertChoice"; version="0.2.0"; sha256="1pd4v240ywc4wzh249axxb4kz5dccizc08jdjnaygz35hjdg5hvj"; depends=[DoE_base dplyr far purrr rlist]; }; ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.3.0"; sha256="14m3b9fsrpfpr8avsnhl8b3bzk2xlhwgkwag5iq8bj7bzvv4yck1"; depends=[CORElearn semiArtificial]; }; @@ -1541,19 +1562,20 @@ in with self; { FAIRmaterials = derive2 { name="FAIRmaterials"; version="0.0.2"; sha256="169hcwjm0plhkqbhz3b5cqgc2nnkibn94cimrs39sn9z62radb7x"; depends=[dplyr glue stringr]; }; FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; }; FAMT = derive2 { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; }; - FAMetA = derive2 { name="FAMetA"; version="0.1.1"; sha256="1w99pl47ljdhqdjqw6cdx4jqm40wzy601wm6rbnwws37iwq0pj76"; depends=[accucor gplots gtools knitr LipidMS minpack_lm plyr rmarkdown scales tidyr]; }; + FAMetA = derive2 { name="FAMetA"; version="0.1.4"; sha256="1c5y3x06ln1w8nkwmnc13hn8jhj0vbmwbx70kylcf93a1fq5rkbz"; depends=[accucor gplots gtools knitr LipidMS minpack_lm plyr rmarkdown scales tidyr]; }; FAMoS = derive2 { name="FAMoS"; version="0.3.0"; sha256="14gr9wv9bpibk0rrzzwijvdncx1fgnpbv55nqzbb4jhq7fdckmsa"; depends=[future R_utils]; }; FAO56 = derive2 { name="FAO56"; version="0.1.0"; sha256="0dl56gdsmx3ixxakz2xqrirss5xxbz62mvp7jdrgaizrn8xd802i"; depends=[]; }; - FAOSTAT = derive2 { name="FAOSTAT"; version="2.2.1"; sha256="1i1zd62qv1zrrnpkrchhk3maj9pfabvbc960gck3ry8l0ns926q9"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO XML]; }; + FAOSTAT = derive2 { name="FAOSTAT"; version="2.2.3"; sha256="12wjcjyjdw8jgla9yqddr3ibi6v47lfdlnyf5s5d8ms3ck6ic8sl"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO XML]; }; FARDEEP = derive2 { name="FARDEEP"; version="1.0.1"; sha256="0blvjakcpkh9vpxryk7qyaqnija0r375ckv37kjlr34xg8pg9qnm"; depends=[nnls preprocessCore]; }; FASeg = derive2 { name="FASeg"; version="0.1.9"; sha256="0lazx8dyycyycr8467m9rkxkxhp4r2w737kpkb40y59wncmbvkik"; depends=[]; }; - FAdist = derive2 { name="FAdist"; version="2.3"; sha256="0vy9yavg5apawjfvch5a7abrmsnx36zhlk8jff3dvcx409lykrrn"; depends=[]; }; - FAmle = derive2 { name="FAmle"; version="1.3.5"; sha256="1j6x5bbxnrwp9d6xlxc861xslawzfqhi3d11nphyc97afsz0ymnr"; depends=[mvtnorm]; }; + FAdist = derive2 { name="FAdist"; version="2.4"; sha256="166w9i8fgklx12jiq4n7l081znmdi6yvazhlxny4rgqif0z2kr9q"; depends=[]; }; + FAmle = derive2 { name="FAmle"; version="1.3.7"; sha256="1g6jacbphbfqn0kkfgdv0g9v8xnzx70872byy0rxp5g2ags6hj2b"; depends=[mvtnorm]; }; FAwR = derive2 { name="FAwR"; version="1.1.2"; sha256="1x90wvp0w7fhid7i5160b4fiv4xn5mpvy33zjzy0mvqvp0yp8xf0"; depends=[glpkAPI lattice MASS]; }; FBFsearch = derive2 { name="FBFsearch"; version="1.1"; sha256="17fi501prnwwy5dh7kv7cx2zlz2dknjj542ga024s7jvg7i2rhg0"; depends=[Rcpp RcppArmadillo]; }; FBN = derive2 { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; }; FCGR = derive2 { name="FCGR"; version="1.0-0"; sha256="015nnnc9fasx0qjrc3lbxv14rqwyx36xzsw9076grwm5pqahrdsb"; depends=[kerdiest KernSmooth MASS mgcv nlme pspline sfsmisc]; }; FCMapper = derive2 { name="FCMapper"; version="1.1"; sha256="1yjh8rs65nqslvwv7x4rif469zds41s7v3vhq6pca1y17kvj2in1"; depends=[igraph]; }; + FCO = derive2 { name="FCO"; version="0.7.2"; sha256="1bavlkrd0957lxv3n8wqv83sxddpihrwr91f2sgshwlczksl05kn"; depends=[checkmate data_table lavaan semTools]; }; FCPS = derive2 { name="FCPS"; version="1.3.0"; sha256="0cz04pjhps7grnvx50gnpmhlp4rvl9xx1dnsabn2pg075y5r5bgk"; 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.1"; sha256="1vnfy3485mm29w0hzkmpr50yc9prmgha9hxxb7k9b9li3pzyhl17"; depends=[fracdist pracma]; }; @@ -1562,8 +1584,9 @@ in with self; { FDRestimation = derive2 { name="FDRestimation"; version="1.0.0"; sha256="1m4k71bsfj2sbsnyqi1s9p5wxbvvn24w98lqwms6z4irc0sk6r3g"; depends=[Rdpack]; }; FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; }; FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; }; - FDX = derive2 { name="FDX"; version="1.0.3"; sha256="1bwads0w8g2w4vb78rq6j4gy5i9f12pcb4y1l540y1acb7d1dsji"; depends=[DiscreteFDR PoissonBinomial pracma Rcpp]; }; + FDX = derive2 { name="FDX"; version="1.0.4"; sha256="15qjy216n87ylk8kwjhgz0mwdhgy57xn2l8x38ffgff3n3v0gwcn"; depends=[DiscreteFDR PoissonBinomial pracma Rcpp]; }; FDboost = derive2 { name="FDboost"; version="1.0-0"; sha256="1227fda2m8lsq3cndv0xgbgbcfdxhc4fjiyj2dmha1z4sycd7a28"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; }; + FEA = derive2 { name="FEA"; version="0.0.1"; sha256="0rg7l5hmaksiz5hg8llwa5kk17by29qvqncyksv16bf8rsjlm732"; depends=[geometry geosphere MASS ptinpoly sp]; }; FENmlm = derive2 { name="FENmlm"; version="2.4.3"; sha256="1a205a4iv54haixanyzx210lzqg7cnryjvqayvkdj1lhmdql4anw"; 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=[]; }; @@ -1576,16 +1599,18 @@ in with self; { FHDI = derive2 { name="FHDI"; version="1.4.1"; sha256="1n1rbrqdphp0prmkili6rnpxwdb7fgwsgncllr6yxlrkr5rb76pm"; depends=[]; }; FHtest = derive2 { name="FHtest"; version="1.5"; sha256="00mql2r4f5hxhdqf27q3x9s5rz2zzakx2myym97b1w1s7c5znl4q"; depends=[interval KMsurv MASS perm survival]; }; FI = derive2 { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; }; + FIESTAutils = derive2 { name="FIESTAutils"; version="1.0.0"; sha256="144q4z6g5lflha3wdizc09lpwr2bgxgpbq4bbmflr2ijrq25zy88"; depends=[data_table DBI hbsae JoSAE mase nlme RColorBrewer Rcpp rgdal RPostgreSQL RSQLite sae sf sp sqldf units xml2]; }; FILEST = derive2 { name="FILEST"; version="1.1.2"; sha256="0x95in9yad93j8kbxjykz04x756i1c1cq854c220cc0l3rm3npnl"; depends=[KRIS rARPACK]; }; FIT = derive2 { name="FIT"; version="0.0.6"; sha256="1nkjms9cvigc9sjha1krzhd3nmwsfh8pi0f1plf5k8zpb773zzb2"; depends=[gglasso MASS Rcpp RcppEigen XML]; }; FITSio = derive2 { name="FITSio"; version="2.1-6"; sha256="1qch6z9r8h95jijjdwsi81majgacl42ryzlkn0m1wifkly9mjjrb"; depends=[]; }; FKF = derive2 { name="FKF"; version="0.2.3"; sha256="0hw8gfmnx05cajbfiffqsbgq164qaf16qsa7wa133pzkpl6b0f0f"; depends=[]; }; FKF_SP = derive2 { name="FKF.SP"; version="0.1.3"; sha256="0pbqpaddk5yhh0lycqncfc029md4if93p07jvnixjn0mrraxj6b5"; depends=[curl mathjaxr Rdpack]; }; - FKSUM = derive2 { name="FKSUM"; version="0.1.4"; sha256="02nicfw0wcprdg0p2p44g740j6bjf6xgzjxcvyfcbcsbr6bpjknx"; depends=[MASS rARPACK Rcpp RcppArmadillo]; }; + FKSUM = derive2 { name="FKSUM"; version="1.0.0"; sha256="1a0fk3k5mmkv26lmf14wiaj0hq19m92681a1p5ldnzpqr54w9igz"; 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]; }; FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; }; FLSSS = derive2 { name="FLSSS"; version="8.6.6"; sha256="0kw28zmvgdy4zmj2vnrs84n0rg6jvqj3x8f3ihjjkzkwqrqyiia9"; 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]; }; FMAdist = derive2 { name="FMAdist"; version="0.1.0"; sha256="0aa4sw93ia6cp386hrq6x448x4w0p6k198rjaqs474j25gqgxrv0"; depends=[EnvStats extraDistr fitdistrplus MASS quadprog STAR]; }; FMC = derive2 { name="FMC"; version="1.0.0"; sha256="1pfqxx7slgcmw4al7i8hy59f4han6b0b7b5az7yh1mscdnghl9bj"; depends=[minimalRSD]; }; FMCCSD = derive2 { name="FMCCSD"; version="1.0"; sha256="0c50km5ba6biq9p3mycxhy00ij2gr6y5zf3q8ycq0g1mbk8ybfb7"; depends=[numDeriv orthopolynom Rcpp RcppArmadillo splines2]; }; @@ -1600,7 +1625,7 @@ in with self; { FORTLS = derive2 { name="FORTLS"; version="1.0.6"; sha256="0w6a17n1f9vq7j9ajlqkrbxgajhh4qrj5lwfqfkk9g1h5vsr8xn2"; depends=[dbscan Distance ggvoronoi htmlwidgets lidR moments plotly progress raster Rcpp RcppEigen RCSF scales sp tidyr vroom]; }; FPCA2D = derive2 { name="FPCA2D"; version="1.0"; sha256="18bb90ppd9gd8pg9jxfyfkmlsaqk8w25fgaj9fk18ybm2nhsxqm6"; depends=[corpcor]; }; FPCA3D = derive2 { name="FPCA3D"; version="1.0"; sha256="1hrk9caad2s76dx59clxhia45a85khk1y2ii7955f336x55q34a5"; depends=[]; }; - FPDclustering = derive2 { name="FPDclustering"; version="2.0"; sha256="04anczbml5mpxi65qalafs5q4pign6abhqsc2birvvg23r3hhhfh"; depends=[cluster ExPosition GGally ggplot2 klaR MASS mvtnorm rootSolve ThreeWay]; }; + FPDclustering = derive2 { name="FPDclustering"; version="2.1"; sha256="0p5rx3js5sdmdabdplhkl5hgainspj63iz0wgns4jxb4lhs825sa"; 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=[]; }; @@ -1609,12 +1634,12 @@ in with self; { 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.3.1"; sha256="1d8ya1pqy1zc9hxp7s211n0wa3n63jgpxh5ngysbh0dn488l8vgg"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; }; - FRK = derive2 { name="FRK"; version="2.0.2"; sha256="0i54qq0vadxjaxh7x7k1i325cczyxrs97cm41nwzqr2zcl2nji6w"; depends=[digest dplyr ggplot2 ggpubr Hmisc Matrix plyr Rcpp RcppEigen reshape2 scales sp spacetime sparseinv statmod TMB]; }; - FSA = derive2 { name="FSA"; version="0.9.1"; sha256="19acr6cwy4qh78d0zyawwrpkl6kkv88bqzyz4a40b3ajyg69cqbn"; depends=[car dplyr dunn_test lmtest plotrix sciplot withr]; }; - FSAdata = derive2 { name="FSAdata"; version="0.3.8"; sha256="0i7wkz0baxcf1dv6qvc891b4ja4x65p4qicil472k6a9gcf5d4qm"; depends=[]; }; + FRK = derive2 { name="FRK"; version="2.0.4"; sha256="119r0hnmffmlj27v0bwcrq99k4lg5dzws4m2nskddr4v37wpwpv8"; depends=[digest dplyr ggplot2 ggpubr Hmisc Matrix plyr Rcpp RcppEigen reshape2 scales sp spacetime sparseinv statmod TMB]; }; + FSA = derive2 { name="FSA"; version="0.9.3"; sha256="10ax191r71gny976hgxgs0gz2548sjjaq3hqy7xkzbj2mcmjq41w"; depends=[car dunn_test lmtest plotrix withr]; }; + FSAdata = derive2 { name="FSAdata"; version="0.3.9"; sha256="1ycllz83lmbd93fdrkj0sjg8bygivp60fv768kk0diamjb16xlmq"; 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.2"; sha256="0baar5dg9zz89bz4f9x074qknxs296bdclipdy8m1ljzclhxpsbf"; depends=[dplyr googlesheets purrr R_utils readtext readxl rjson rlang shiny stringr tibble tidyr XML xml2 zip]; }; + 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]; }; FSM = derive2 { name="FSM"; version="1.0.0"; sha256="03w182a9i7mra7wpvkm4q4kwhzjs5kc9h4hh26gygl49jkcvril8"; depends=[]; }; 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]; }; @@ -1630,9 +1655,9 @@ in with self; { FactoClass = derive2 { name="FactoClass"; version="1.2.7"; sha256="0hvlr9cw6wfckl8rzl5qqyp0h8rv8gcnyj6x930jq7h44kj0ji7d"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; }; FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.7"; sha256="0lndh80pmr5zhhh7j9lhxl4j007rak5gh3dwxd1883cy0d6whjs9"; depends=[FactoMineR ggplot2 rmarkdown rrcov]; }; FactoMineR = derive2 { name="FactoMineR"; version="2.4"; sha256="0lg8n9fxxk46nchnj4pbpqqf4swxfsq7r9jzr36dmd36kb7avqxr"; depends=[car cluster DT ellipse flashClust ggplot2 ggrepel lattice leaps MASS scatterplot3d]; }; - FactorAssumptions = derive2 { name="FactorAssumptions"; version="1.1.2"; sha256="0k5jjqfajrq5wc0vp07s6kbfyjks6124hpy09nxw2blrai66vhcm"; depends=[MASS psych]; }; + FactorAssumptions = derive2 { name="FactorAssumptions"; version="2.0.1"; sha256="0d7dh67r8s0v952palhx9h6bhhlxw9xcjbj7dxsp2hdhwap72s2y"; depends=[MASS psych]; }; FactorCopula = derive2 { name="FactorCopula"; version="0.8"; sha256="1zrla429hmqlnjxkyscwcs58fav65wwyk1h2m4kwzsqf3g6hqnyr"; depends=[abind matlab polycor statmod VineCopula]; }; - FactorsR = derive2 { name="FactorsR"; version="1.4"; sha256="1nw63j9bi4x09pgdvdml0w0qxfy1dda5hkxbhd3d6f7rky1z0nyf"; depends=[]; }; + 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]; }; @@ -1646,6 +1671,8 @@ in with self; { 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]; }; FastHCS = derive2 { name="FastHCS"; version="0.0.7"; sha256="0l3fi3siwg2jhsj0jbhgccx8pnwd8h8f4z37g1najb41hw8dwn8d"; depends=[matrixStats Rcpp RcppEigen]; }; + FastImputation = derive2 { name="FastImputation"; version="2.1"; sha256="1h6nvrb7d0l5vdqzxi20cgh6yw90mmjrzbnn1lrkwr3n9fzfqw0l"; depends=[Matrix]; }; + FastJM = derive2 { name="FastJM"; version="1.1.2"; sha256="1ip5s8jrgkyrs51i7n0xqv2gicpp4kdizm7h6kff9da675bcv9jr"; depends=[dplyr MASS mvtnorm nlme Rcpp RcppEigen statmod survival]; }; FastKM = derive2 { name="FastKM"; version="1.0"; sha256="0sqxd2pg9y6yn1lnxni32ca3bgbmz04k9z37q9pzgijvf9qvik3f"; depends=[rARPACK]; }; FastKNN = derive2 { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[assertthat pdist]; }; FastLZeroSpikeInference = derive2 { name="FastLZeroSpikeInference"; version="2018.12.10"; sha256="0ybpmns7bc1j5xzqjl7734grihmvvpa3h52gixv3h70l0r89d8ys"; depends=[]; }; @@ -1687,21 +1714,22 @@ in with self; { FishResp = derive2 { name="FishResp"; version="1.1.0"; sha256="12b0akpx8xjarhjrn47x930vqh3kswm784xd1k14fx6bxjjy8ais"; depends=[chron lattice mclust respirometry rMR]; }; FisherEM = derive2 { name="FisherEM"; version="1.6"; sha256="18xn0hnj5diq7falrjl04abqyyrvyzaikb9l6wh7hfhflhsd382c"; depends=[elasticnet ellipse ggplot2 MASS plyr]; }; FitAR = derive2 { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[bestglm lattice leaps ltsa]; }; - FitARMA = derive2 { name="FitARMA"; version="1.6.1"; sha256="02di0pkz6hh92glpn3li6z9azkcqa64ja8zfpy0mkh1l97mw6jsv"; depends=[FitAR]; }; FitUltD = derive2 { name="FitUltD"; version="3.1.0"; sha256="17fj211riybq71k63wjfv2ndc2h46ay5svrac2v5i3b92cb9hkbv"; depends=[ADGofTest assertthat cowplot fitdistrplus ggplot2 MASS mclust purrr]; }; FixSeqMTP = derive2 { name="FixSeqMTP"; version="0.1.2"; sha256="0v1cwq8gapgandm7wiw8p6av6qigydlpmwi6w02p1y7f0hf5ifnp"; depends=[]; }; FixedPoint = derive2 { name="FixedPoint"; version="0.6.2"; sha256="1jgqc7m3cvyvxlpkvcqqyfmjl8harsb4kl7msk3qd8mn4qjvvyms"; depends=[MASS]; }; FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; }; + FlexDotPlot = derive2 { name="FlexDotPlot"; version="0.2.1"; sha256="1h5mxddvxqqbi3mzyk8hblviyw55s6ly6vqqcilznh328wl0qg85"; 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.0"; sha256="0zwm9jd7idakmf344fh7bgwyl20cl5iszxh7rk1iw94yjcq3g06l"; depends=[bayesplot BH Formula ggplot2 loo Rcpp RcppEigen rstan rstantools StanHeaders]; }; - FlexScan = derive2 { name="FlexScan"; version="0.2.1"; sha256="1p9kzj58zzkkxjq4gnhln1av53an05m3qbyzh5i92vcgnn3z1s79"; depends=[smerc sp spdep]; }; + FlexReg = derive2 { name="FlexReg"; version="1.1"; sha256="0p52qszn5vvci57f4jxynm1kiwdd105cg096ijg6w481v24a0qb3"; depends=[bayesplot BH faraway Formula ggplot2 loo Rcpp RcppEigen 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.0"; sha256="0bbk7ac4s3gbcjhfg3yz06pxjid3hpd0mqzxzlj5sghn95f479h9"; depends=[jsonlite magrittr RCurl stringr]; }; FlowRegEnvCost = derive2 { name="FlowRegEnvCost"; version="0.1.1"; sha256="0lw4kv4z0s23jy11y53rxxh7zxa7vajxrcnjgxd74xxs64vjlj88"; depends=[zoo]; }; FlowScreen = derive2 { name="FlowScreen"; version="1.2.6"; sha256="1s9xyrvfsgrl2zxm2an5qj3rs1qx7v7j8wc83jzl28pkwa5xr351"; depends=[changepoint evir zyp]; }; FluMoDL = derive2 { name="FluMoDL"; version="0.0.3"; sha256="0vp3w6hpph6svz8940w9yk9c5iv4n9mj94f9si1ks0xjbi948rqd"; depends=[dlnm mvmeta tsModel]; }; FlyingR = derive2 { name="FlyingR"; version="0.2.0"; sha256="0smishimssanzssndbwh9d276sq8vdldpzb3ww9c4nlwypxjmr8z"; depends=[kableExtra knitr Rcpp rmarkdown]; }; - FoReco = derive2 { name="FoReco"; version="0.2.1"; sha256="19mrw1yah2nzajgzai1vxm38pp8mry3143wjm3g3447iajjh1hry"; depends=[cli corpcor mathjaxr Matrix osqp]; }; + FlywayNet = derive2 { name="FlywayNet"; version="0.1.0"; sha256="00sp3m3iv6qifrkk0rncmzidv15b5fj138g0mai95lp280b040va"; depends=[EasyABC igraph modeest Rcpp]; }; + FoReco = derive2 { name="FoReco"; version="0.2.2"; sha256="01ak3dpvsmlvzb2k714scxsaavihfjsi4gwsqyv0hxpq457sd3rr"; depends=[cli corpcor mathjaxr Matrix osqp]; }; ForIT = derive2 { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; }; ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; }; ForeCA = derive2 { name="ForeCA"; version="0.2.7"; sha256="1falhz9v0z76h60gz66rh9wvk3jsjv8fvbkhkx9jmzbrkla397cd"; depends=[astsa MASS reshape2]; }; @@ -1719,7 +1747,7 @@ in with self; { 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.2-2"; sha256="048awbsyzpjmr0kmz3k5yi5vksa9iiffabp6q8xsww097vcngxzb"; depends=[DoE_base igraph scatterplot3d sfsmisc]; }; - FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; }; + FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-2"; sha256="0r5v3922gsrsyrdin5dwdygnj9i23gwa67p7kll6ac6xxp8gig4w"; 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=[]; }; @@ -1729,8 +1757,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.2"; sha256="0ds8gx86bi882nmdlivvigr53kq1dcq4cqj03szg44j8p6q3vhkx"; depends=[BH dqrng Rcpp Rdpack]; }; - FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; }; - FunWithNumbers = derive2 { name="FunWithNumbers"; version="1.0"; sha256="0kzmfy2dn41v7991crshxjcycp1s432ip0ivw8bq6x9v638skwkk"; depends=[gmp Rmpfr]; }; + FunWithNumbers = derive2 { name="FunWithNumbers"; version="1.1"; sha256="16w5hna0dm89alkch9wf7n8mqqz75scwg0g84qf57bl6sihnp750"; depends=[gmp Rmpfr]; }; 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]; }; FunnelPlotR = derive2 { name="FunnelPlotR"; version="0.4.1"; sha256="0cfvg47fwxwjhgxd5if81jg9nkj42i1yvykqd7g01n7ymirp7kf6"; depends=[dplyr ggplot2 ggrepel scales]; }; @@ -1738,12 +1765,13 @@ in with self; { 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]; }; FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-6"; sha256="0k1cqyswhzp31dq91xigirkqhw3imkx68n4vasyvrgq6fm97dl1n"; 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]; }; 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.3.1"; sha256="1k3n91dlc9zigfj61hqlifw5851n6m54dbwg3nz43s1pkcvdjdj1"; depends=[ttutils]; }; + FuzzyResampling = derive2 { name="FuzzyResampling"; version="0.4.1"; sha256="0dli2r4w8s8wx6i3y31lpy181l1awx8qg8gvnn2yhpcija389zjs"; depends=[ttutils]; }; FuzzySTs = derive2 { name="FuzzySTs"; version="0.2"; sha256="0zs1pyn9apysspxa0glqc96h6npmvvhiqvqpcm0brslz0b6xnilp"; depends=[FuzzyNumbers polynom]; }; FuzzyStatProb = derive2 { name="FuzzyStatProb"; version="2.0.4"; sha256="1jpqb8xczi1d4g306vrwpi02f9h59aki1pgnckvfmiclr306prpb"; depends=[DEoptim FuzzyNumbers MultinomialCI]; }; FuzzyStatTra = derive2 { name="FuzzyStatTra"; version="1.0"; sha256="1ijrlnlmq9d5ahgrpzba6kzkaq1zq59zqdgcizybsf9alsswcm00"; depends=[]; }; @@ -1764,7 +1792,7 @@ in with self; { GARCHIto = derive2 { name="GARCHIto"; version="0.1.0"; sha256="1rh9da9gb1krxasx1apldns5k3wl2xjjqc8bidsd5c0h5jlqdvr6"; depends=[Rsolnp]; }; GARCHSK = derive2 { name="GARCHSK"; version="0.1.0"; sha256="0fwzv8js3d9klbzs58m946k7q50yxpf0cxia3r2z2gy85xphrsm0"; depends=[Rsolnp]; }; GARCOM = derive2 { name="GARCOM"; version="1.2.0"; sha256="1fgr03gw86fjrj6hx32qvl6jsc6ax9i1ss4bbfmi8iz2f1nq43wi"; depends=[data_table vcfR]; }; - GAS = derive2 { name="GAS"; version="0.3.3"; sha256="0w5rgx3f965jxl2r6rhsj5ad4bbbwir8hbki3q0cs2z9hc4g6vh9"; depends=[cubature MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; }; + GAS = derive2 { name="GAS"; version="0.3.4"; sha256="014b2y9qrv44j5v559bnw7yiacs9aarsgpbrj3clxm4n0srhv843"; depends=[cubature MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; }; GAabbreviate = derive2 { name="GAabbreviate"; version="1.3"; sha256="0cq6bg3w0ji44rsz1p4j17fk0jg8rafbjixwi3fjdndc3yd874r5"; depends=[GA psych]; }; GAparsimony = derive2 { name="GAparsimony"; version="0.9.4"; sha256="1p1s5q1basy9v3jy1qxpx5g8mzpkwdfarxmmf7s06c6wq0dl9vp8"; depends=[foreach iterators]; }; GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; }; @@ -1780,13 +1808,14 @@ in with self; { GCalignR = derive2 { name="GCalignR"; version="1.0.3"; sha256="0fq5jglgbw2cqm4pa7x4lczqjr1w65ddnhzlr2i97skzk0gcdlr5"; depends=[ggplot2 pbapply readr reshape2 stringr tibble]; }; GD = derive2 { name="GD"; version="1.10"; sha256="1sy77yxnwh2n48zahh498v30nl3hivrsmyp0jf3gyyzhxm8z1n5l"; depends=[badger]; }; GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; }; - GDAtools = derive2 { name="GDAtools"; version="1.7"; sha256="1fsx2kxilvfvm9nccn1a9ly6kavz9l8np6az2ax9dd00rbvqjcjl"; depends=[FactoMineR GGally ggplot2 ggrepel MASS nleqslv nnet RColorBrewer rlang wdm]; }; + GDAtools = derive2 { name="GDAtools"; version="1.7.2"; sha256="0rqrc9andckh4nf8s87gwkpw2kgc2jsynsvsy1xlnvfp753d4dxp"; depends=[FactoMineR GGally ggplot2 ggrepel MASS nleqslv nnet RColorBrewer rlang wdm]; }; GDELTtools = derive2 { name="GDELTtools"; version="1.5"; sha256="1lhsyf7kd1lnx2dgifmrd89yl95sf9k6ay19dll2p8b9h3vs7hci"; depends=[dplyr plyr TimeWarp]; }; - GDINA = derive2 { name="GDINA"; version="2.8.7"; sha256="08cdjp4mqn81j3wa770v7n8zkslys9jqqb3d3c09dkfmgdk6hga4"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; - GDPuc = derive2 { name="GDPuc"; version="0.5.1"; sha256="1pdhl8mccxb613994f3y59a89rvksi8kb7j2aaf7msnh67rndrrn"; depends=[cli crayon dplyr glue lifecycle magrittr rlang stringr tibble tidyselect]; }; - GE = derive2 { name="GE"; version="0.2.3"; sha256="1gjni9kpa9s5yp1pyn87v3k2ckzb0v65310piy1lfj7pz0cjmkgg"; depends=[CGE data_tree DiagrammeR]; }; + GDINA = derive2 { name="GDINA"; version="2.8.8"; sha256="1slq1npsq8s8aghnrpm6vvc6kxj4svz0kr2x0akblndrcr25wxjr"; depends=[alabama ggplot2 MASS numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; + GDPuc = derive2 { name="GDPuc"; version="0.8.0"; sha256="0nbqhqddz5k3rcwif69pzf7cbkg5ycwvlscx470c9rhzrdffsm16"; depends=[cli crayon dplyr glue lifecycle magrittr rlang tibble tidyselect withr]; }; + GE = derive2 { name="GE"; version="0.2.6"; sha256="0vxrw08851n6vfqsvr11746l36n8m4sq5qyhgw1yrcj5g4qwnbf9"; 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.3"; sha256="1xprkpjp1pkq4ci1n32d3yy80hx3r4xf2j7f6hv7dvsn4cvdp417"; depends=[gee]; }; + GEInfo = derive2 { name="GEInfo"; version="1.0"; sha256="08ha9w3c64x9ib2fbh4djbhg7y6lykibx93mbm7i3gdvpajqk0jx"; depends=[dplyr glmnet MASS pheatmap rvest]; }; GEInter = derive2 { name="GEInter"; version="0.3.1"; sha256="10f2s2w8kh35aidg4ixb71v1j9817k5y6dmddm2kvxhzk6b6f7gn"; depends=[ggplot2 Hmisc MASS pcaPP quantreg reshape2 survAUC survival]; }; GENEAclassify = derive2 { name="GENEAclassify"; version="1.5.2"; sha256="1rddzf1qdi2xslb7qbrb60940ccq6a17wzsbmvwl2wliv183xhwm"; depends=[changepoint GENEAread MASS rpart signal]; }; GENEAread = derive2 { name="GENEAread"; version="2.0.9"; sha256="00whn2xqlcdcgmrifng04j2csxynfb1dmj9wkx981ylz13jsnwm9"; depends=[bitops mmap]; }; @@ -1796,21 +1825,21 @@ in with self; { GEOmap = derive2 { name="GEOmap"; version="2.4-4"; sha256="0wk2v0fwcwcm59k711fg829h2w58wkd36im4mg974iai6mqif7qh"; depends=[fields MBA RPMG splancs]; }; GESE = derive2 { name="GESE"; version="2.0.1"; sha256="0h3s2sbnv5wilr2mj6bnl2892p16pxrs341gg6jql1a540p669sk"; depends=[kinship2]; }; GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; }; - GET = derive2 { name="GET"; version="0.2-4"; sha256="15vn970jsx1iysrx5bva0zbhhlzsjcz62651pply095jkn4z5mdg"; depends=[ggplot2 gridExtra viridisLite]; }; + GET = derive2 { name="GET"; version="0.2-5"; sha256="1mh8afgzz4yq4hpx0f0fiw1j6jmaq5b24ja2d5krvm5s83gi356r"; depends=[cluster ggplot2 gridExtra viridisLite]; }; 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=[]; }; GEint = derive2 { name="GEint"; version="0.1.5"; sha256="179gpq4qjhgx1fhyjdb80rf2ip80zhhfyn8xjgwq1a425163q1y7"; depends=[bindata geepack mvtnorm nleqslv pracma rje speedglm]; }; GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; }; GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; }; - GFD = derive2 { name="GFD"; version="0.3.2"; sha256="15chm0r9sgdvjg0f4cayqj92blxkj5949mwhpx72bqcwzh3h8f4x"; depends=[magic MASS Matrix plotrix plyr shiny shinyjs shinythemes shinyWidgets tippy]; }; + GFD = derive2 { name="GFD"; version="0.3.3"; sha256="1d40fwk367ww544z25jwlx2kdm1gv7y6ijl8vnpi198n7k1hdgpl"; depends=[magic MASS Matrix plotrix plyr shiny shinyjs shinythemes shinyWidgets tippy]; }; GFDsurv = derive2 { name="GFDsurv"; version="0.1.0"; sha256="1kyazvyz9rgjklh63aq70f3jsv1fpy3ws5wbg4vdah52p8fk35j9"; 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]; }; - GFisher = derive2 { name="GFisher"; version="0.1.0"; sha256="1k5ik1q78gy2x0qr15shdr9rry93dh68876l6ifh21ppqw3y1x9j"; depends=[Matrix mvtnorm]; }; + GFM = derive2 { name="GFM"; version="1.1.0"; sha256="02k1g2rq32ghd3yivjrfz0wjid1kbkraqrb5cmc8640lv7k8l0xr"; depends=[doSNOW MASS]; }; + 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]; }; - GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; }; - GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.2"; sha256="0zizc8xz16hfcw7jfwn8lmv1mqnnzrj0dx1dk0ak8j7svfkskw0y"; depends=[ggforce ggplot2 scales]; }; - GGIR = derive2 { name="GGIR"; version="2.5-0"; sha256="1w34hiandjq8xakybw6khdgqb7xwav3s7rp4pvxr330d6nazz9k9"; depends=[bitops data_table doParallel foreach GENEAread ineq matlab Rcpp signal tuneR unisensR zoo]; }; + GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.3"; sha256="0h7irlmq283bx1hlqyv8bi228kd6xkc7sdw6nq18v3s7b0a9bhcm"; depends=[ggforce ggplot2 scales]; }; + GGIR = derive2 { name="GGIR"; version="2.6-0"; sha256="1pzgmly9zda3m9k8dm31qar4md4mknxnpjf389818jih8v9a7ihf"; depends=[activityCounts bitops data_table doParallel foreach GENEAread ineq matlab R_utils Rcpp read_gt3x signal tuneR unisensR zoo]; }; 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.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; }; @@ -1819,7 +1848,6 @@ in with self; { GGUM = derive2 { name="GGUM"; version="0.4-3"; sha256="1r4ijkc5xrlp2sq4jnhcrzzmkzilc4lbz3q5zc0kgcz348hf1a7w"; 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]; }; GHS = derive2 { name="GHS"; version="0.1"; sha256="1khjfy62a67r59s2rax9mmnqy5xnnwhbydzhqwwmyspl48mxycdj"; depends=[MASS]; }; - GHap = derive2 { name="GHap"; version="2.0.0"; sha256="0br9civfdlksn5xmyrvz2y0knikcd2i175kddxjdqmiyyayckc8w"; depends=[class data_table e1071 lme4 Matrix]; }; GIC = derive2 { name="GIC"; version="1.0.0"; sha256="0wjrv5rpzcyng0vvpr59l148lxzqnqq4c045fw2x9ynffyb71h99"; depends=[cluster ggplot2 randomForest]; }; GIFTr = derive2 { name="GIFTr"; version="0.1.0"; sha256="101vr2qasky8hnxp5i3lhlnymwzciypqwvhpl6mrr0r0czgpcz2f"; depends=[glue stringr]; }; GIGrvg = derive2 { name="GIGrvg"; version="0.5"; sha256="0mx4n4kf34343yiww80fw5yy0x624xsj71n8fr4dm0a2338pxq8v"; depends=[]; }; @@ -1830,9 +1858,9 @@ in with self; { GK2011 = derive2 { name="GK2011"; version="0.1.3"; sha256="13vafhbgcsj485f12qv962y07v3hil3pla51vkl2b030amzy86jv"; depends=[]; }; GLDEX = derive2 { name="GLDEX"; version="2.0.0.7"; sha256="1w5ahwbnz9xsn3rdxzcxxvc6m5cgq46nln3i5v8vp4imrs8aafb3"; depends=[cluster]; }; GLDreg = derive2 { name="GLDreg"; version="1.0.7"; sha256="1wjrr4x1k0fz8nx9idb4ysamldypriiypj96b5v028lx38jwsk3l"; depends=[ddst GLDEX]; }; - GLIDE = derive2 { name="GLIDE"; version="1.0.3"; sha256="0jy3l1c2wls3hq63jny9zg2mjkn332ki6dk7pfcqyk0nfxi5grw7"; depends=[doParallel foreach MASS]; }; + GLIDE = derive2 { name="GLIDE"; version="1.0.4"; sha256="0270dsilmmm7llk1dchy4bvps4jbb5zkb1kg8ndgsbl12gsmwx3z"; depends=[doParallel foreach MASS]; }; GLMMRR = derive2 { name="GLMMRR"; version="0.5.0"; sha256="072zwi1rs6d84iszn09v5g19bkpla19nfqk4pq40ad8368zkbhcm"; depends=[lattice lme4 RColorBrewer]; }; - GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.8-2"; sha256="12lz7rkd4jfwp3gpwp2awzdkdw1qpbdi2l1b48s1drzjymjk0m0g"; depends=[MASS matrixStats nlme]; }; + GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.8-5"; sha256="1vzqyw2wkhjc0gj25pf9hbc8lii8bjv10391b9g0qv6w3bpgsnkn"; depends=[MASS matrixStats nlme]; }; GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; }; GLMcat = derive2 { name="GLMcat"; version="0.2.4"; sha256="0m9vl7x9r68w4dgz29sg3rpmggqpgzfsrhsn8f2q6i184g73cvng"; depends=[BH 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]; }; @@ -1864,6 +1892,7 @@ in with self; { GPBayes = derive2 { name="GPBayes"; version="0.1.0-3"; sha256="0zihn6489xk5ckah6ax5dmzqsdwhpdfwm1zv8ihrrhk93z5fgzar"; depends=[Rcpp RcppEigen RcppProgress]; }; GPCMlasso = derive2 { name="GPCMlasso"; version="0.1-5"; sha256="0v4n8m3pcqxjyvli2wag3frzbqxpk9bjl8zkyz6sq2cwypv5wvyv"; depends=[caret cubature ltm mirt mvtnorm Rcpp RcppArmadillo statmod TeachingDemos]; }; GPFDA = derive2 { name="GPFDA"; version="3.1.1"; sha256="1yivqyk8wlrpfxpnqdjkyzbbykfpmk5qg7cy6kxv469fhadccybc"; 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.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; }; @@ -1883,6 +1912,7 @@ in with self; { GRANCore = derive2 { name="GRANCore"; version="0.2.7"; sha256="0xnm7jb2s4ag4qvsfs1fq0f2ikvfqm3bvxhj8kmmxwynwl5pw287"; depends=[switchr]; }; GRAPE = derive2 { name="GRAPE"; version="0.1.1"; sha256="1jzvf45ch8x8f2x9kmvv02xz9bix5vplh8143vc4m1yyq42x09c6"; depends=[]; }; GRCdata = derive2 { name="GRCdata"; version="1.0"; sha256="0nshii6kfvffncgcrmm7wvniq94j9djj84jikcb6ck49viikkrky"; depends=[cubature nloptr]; }; + GREENeR = derive2 { name="GREENeR"; version="0.1.0"; sha256="0m66k1g9lci3csxpcdx80lhip94iazlfpr29qa02h574c03drwya"; depends=[classInt data_table dplyr FME ggplot2 gridExtra hydroGOF magrittr networkD3 parallelly reshape2 sf tidyselect tmap]; }; GREMLINS = derive2 { name="GREMLINS"; version="0.2.0"; sha256="0wdqikz6k5d2cxcb347lhy7rj54blgf1m4sjv64zd4nx6c4r0ai8"; depends=[aricode blockmodels igraph mclust pbmcapply R6]; }; GRNNs = derive2 { name="GRNNs"; version="0.1.0"; sha256="1c36km6g4fcsvpirlh88fl3zq9pdpdyfilahfx949salj0gnqsn6"; depends=[cvTools rdist scales vegan]; }; GROAN = derive2 { name="GROAN"; version="1.2.1"; sha256="07419rpd6492gwzn3lgxl37hdfama7wpzni1gj7dy8bvhn8l1m2a"; depends=[plyr rrBLUP]; }; @@ -1904,27 +1934,28 @@ in with self; { 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]; }; GUIDE = derive2 { name="GUIDE"; version="1.2.7"; sha256="0klaczmn3jnlzyh45yaqlc897irjfk467f4w03awmflaiwan3h6v"; depends=[rpanel tkrplot]; }; - GUILDS = derive2 { name="GUILDS"; version="1.3"; sha256="0zl6x0vn93ybps63fqazvd93f2zwdq0rqqrp7d6n5rnamx99mm8d"; depends=[pracma Rcpp]; }; + GUILDS = derive2 { name="GUILDS"; version="1.4.1"; sha256="1j0nhrd2anxmd35v5xz1y3bq8w757qif7h69r5wh0yphrkcxqn4v"; depends=[pracma Rcpp subplex]; }; 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.4"; sha256="1dya9shxcd1xbwhlk1vqpxag2vnwzca2lddcy1kfn8yjrws8slk8"; depends=[ape dirmult foreach ggplot2 ggrepel lmerTest MASS Matrix matrixStats modeest Rcpp rmutil statmod vegan]; }; GVARX = derive2 { name="GVARX"; version="1.3"; sha256="00iqwkshp1i9338x9khh8hyszad6150qb11jlvky5fm488wcw1y3"; 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="1.2"; sha256="036lv8f58kz6qdwaviyk1q1qsgcj9cimipq1cjrfpn8snkn7s1gh"; depends=[horseshoe mombf speedglm]; }; - GWASinspector = derive2 { name="GWASinspector"; version="1.5.2"; sha256="13biq6mln2nwddvzy5ng45wbdpa0r98ydr5ra42vx1aw0d1f96wd"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr R_utils rmarkdown RSQLite]; }; + GWASinspector = derive2 { name="GWASinspector"; version="1.5.7.1"; sha256="0sz4c5qimsqchjy9659h7436zim2f10hf1aw861iyxbjl81srfhp"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr 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]; }; GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; 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.1.1"; sha256="130mndfvxq8mr4ml57pr5xp3wv1b6z99f965pw6fnrgwl4hyl584"; depends=[data_table doParallel dplyr foreach GWmodel iterators lmtest plm sp]; }; GWRM = derive2 { name="GWRM"; version="2.1.0.4"; sha256="13g91bx7b0cf1rnyc6azkvjilvc3kjynb8nclmbh8n3ccm6b0v2r"; depends=[doParallel foreach]; }; - GWSDAT = derive2 { name="GWSDAT"; version="3.1.0"; sha256="1ka461xilsdqc4frh46bicxfnm543k95chnlxghq6j9rjgkx4k0q"; depends=[deldir digest geometry Kendall lattice lubridate MASS Matrix officer raster readxl rhandsontable sf shiny shinycssloaders shinydashboard shinyjs sm sp splancs zoo]; }; + 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]; }; GWmodel = derive2 { name="GWmodel"; version="2.2-8"; sha256="18jd18mysf7li6c7ywd5cjkwzcvpprc93z8ycndyh0jmyzdr062v"; depends=[FNN maptools Rcpp RcppArmadillo robustbase 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=[]; }; GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; }; - GaSP = derive2 { name="GaSP"; version="1.0.0"; sha256="0jm9fqlfxkl5pfr1ijbj8qci5xb974wk660xvh488xfwdwj02fnc"; depends=[]; }; + GaSP = derive2 { name="GaSP"; version="1.0.1"; sha256="0l1a5w3wphm1748qmh3abv9yd1w92wg7irqpgdg6pc7598dvlkr9"; depends=[]; }; GameTheory = derive2 { name="GameTheory"; version="2.7"; sha256="0vb7sjia5s58gw9zpkzddps8knxvbrz7fbi3m6digl8bf5vwhxxw"; 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=[]; }; @@ -1958,7 +1989,7 @@ in with self; { 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]; }; GenomeAdapt = derive2 { name="GenomeAdapt"; version="1.0.0"; sha256="0jsxqhx62vbsr0hcqk9wrfsg3l3wbnx64pzxx18ps366vg7fxmii"; depends=[gdsfmt qvalue robust SNPRelate]; }; - GenomeAdmixR = derive2 { name="GenomeAdmixR"; version="2.1.1"; sha256="1c8d2s13hibwymxxra2gbma78d44zx9cbwm4901iz1prdn4p8vl6"; depends=[ggplot2 ggridges hierfstat Rcpp RcppArmadillo RcppParallel rlang stringr tibble vcfR]; }; + GenomeAdmixR = derive2 { name="GenomeAdmixR"; version="2.1.7"; sha256="14qnabg1pj8sg2bvd3k4m467bh1q2zfjr0ljxn1ny031sqwis4cy"; depends=[ggplot2 ggridges hierfstat Rcpp RcppArmadillo RcppParallel rlang stringr tibble vcfR]; }; GenomicMating = derive2 { name="GenomicMating"; version="2.0"; sha256="02v1pkarmardf7g8hf2n4jj4cq4707g5lcc7gnwsiyyh7pknd1y6"; depends=[dplyr emoa kohonen LowRankQP magrittr plotly qtl Rcpp RcppArmadillo scatterplot3d SOMbrero]; }; GenomicTools = derive2 { name="GenomicTools"; version="0.2.9.7"; sha256="196shxbrcgiwaa7aav2aipsbj1smrkbhinn44aw9qfvz2x9zdz0m"; depends=[circlize data_table GenomicTools_fileHandler gMWT Rcpp RcppArmadillo snpStats stringr]; }; GenomicTools_fileHandler = derive2 { name="GenomicTools.fileHandler"; version="0.1.5.9"; sha256="09l87wf78bj49cdh7r3x81hn15c4pihxih8l59xxrpgdhp69268c"; depends=[data_table snpStats]; }; @@ -1968,18 +1999,19 @@ in with self; { 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]; }; GeoTcgaData = derive2 { name="GeoTcgaData"; version="1.0.2"; sha256="1s3l445igzf1xirfxjkp34djcfipbpcgyd5fd3icnsy2dkfkc787"; depends=[cqn data_table magrittr plyr]; }; + GeoWeightedModel = derive2 { name="GeoWeightedModel"; version="0.9.1"; sha256="0fg41vn6k47ib8y4hdywi3nmn25i6ldqib5v7bhcrkzsvcqj7l5n"; depends=[beepr cartography dplyr DT GWmodel raster readxl shiny shinyalert shinyBS shinybusy shinydashboard shinyjs shinyWidgets sp]; }; 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.3"; sha256="07hsv8hj9p6qg0d51jfrlv28s3ddfarcnhdv6y073blrcfigi70n"; depends=[agricolae dplyr DT ggplot2 purrr shiny tibble tidyr]; }; GetBCBData = derive2 { name="GetBCBData"; version="0.6"; sha256="0dwkps7396rkk5fsh8ynl1l9465s6zm5mind16a5y2n8swi2ndyk"; depends=[curl dplyr furrr future jsonlite lubridate memoise purrr RCurl readr stringr]; }; GetDFPData = derive2 { name="GetDFPData"; version="1.6"; sha256="1yxf1i5bipz16pbydl6qxlalh2zpdiigbxd1qczbjc1z78bl5727"; depends=[crayon curl dplyr lubridate readr reshape2 stringr tibble xlsx XML]; }; - GetDFPData2 = derive2 { name="GetDFPData2"; version="0.5"; sha256="0grriq5a6n36gbb24cwajrm3971dqvc0ascdgych9wqdj23c3gjr"; depends=[curl dplyr lubridate magrittr memoise purrr RCurl readr rvest shiny stringr tidyr writexl xml2]; }; + GetDFPData2 = derive2 { name="GetDFPData2"; version="0.6.1"; sha256="03wjxy9f0aqbc87awl8j2c70cm9dvchp6dxvc94in8zarvbsi5pf"; depends=[dplyr lubridate magrittr memoise purrr RCurl readr rvest shiny stringr tidyr writexl xml2]; }; GetFREData = derive2 { name="GetFREData"; version="0.7"; sha256="134aw3dginxv0b1bvrfm71qyfg8a01d87f2bnagcsksg7403npia"; depends=[dplyr lubridate magrittr purrr readr rvest stringr XML xml2]; }; GetLattesData = derive2 { name="GetLattesData"; version="1.4"; sha256="129hnhmw8aw81whyj3g7npwgmg4fmvsji9h2xfg78nrp0abjxijv"; depends=[curl dplyr readr stringdist stringr XML]; }; GetQuandlData = derive2 { name="GetQuandlData"; version="0.1.0"; sha256="1g1as4m853ab1wp57rzqm0552g0vm7kxzypibv0xywc85084pnmc"; depends=[dplyr jsonlite memoise purrr readr scales stringr]; }; GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; }; - GetTDData = derive2 { name="GetTDData"; version="1.4.2"; sha256="1qz75hq1c89riq0jpzjkr9gbk5y7894kb0ydhdyji7kjl1kvgyvx"; depends=[bizdays curl RCurl readxl rvest stringi stringr tidyr XML xml2]; }; + GetTDData = derive2 { name="GetTDData"; version="1.4.4"; sha256="0hgnwja6z8x9faj8g2kyvdhj5j8qxpgy39863hhqyil71vxmlcrw"; depends=[bizdays curl dplyr readxl rvest stringr tidyr xml2]; }; GetoptLong = derive2 { name="GetoptLong"; version="1.0.5"; sha256="00fpm6nd3kqa2ikasxa62jzywi46fvvmx1mdavcp5yrxxn37j8wc"; depends=[crayon GlobalOptions rjson]; }; Ghat = derive2 { name="Ghat"; version="0.1.0"; sha256="1w5agphnbngc0ldb3gbgh4b8ww956lf31bfyxw2zp56crx4akcxf"; depends=[rrBLUP]; }; Ghost = derive2 { name="Ghost"; version="0.1.0"; sha256="0anrb1n3f3jnq2p0dgqzw5a0gby2slafv2bybgy5gm3f9fsj831w"; depends=[R6]; }; @@ -1998,11 +2030,11 @@ in with self; { GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; }; GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; }; GlobalOptions = derive2 { name="GlobalOptions"; version="0.1.2"; sha256="0gkm77w6db9ajyncy1xdcivplap06a51zi99m009kylccschd2a7"; depends=[]; }; - GmAMisc = derive2 { name="GmAMisc"; version="1.2.0"; sha256="1rdypld7viski65kqh5m6jhmxgxx8mc3dn8kvy710h5wsii3nn04"; depends=[caTools classInt cluster coin corrplot DescTools dismo ggplot2 ggrepel gridExtra Hmisc InPosition kimisc lsr maptools plyr pROC raster RcmdrMisc rgdal rgeos sp spatstat spatstat_core spatstat_geom spatstat_linnet]; }; + 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]; }; Gmedian = derive2 { name="Gmedian"; version="1.2.6"; sha256="1kb60f9r9lq5blv07jjln1j5fq1whjcc54zn7bglpp4hl4f74j5d"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; }; Gmisc = derive2 { name="Gmisc"; version="3.0.0"; sha256="051bcp15xpxpdq2r2d29wgm49c0n5r0vikwgzciclxs64j1a57ip"; depends=[abind checkmate forestplot glue Hmisc htmlTable knitr lattice lubridate magrittr Rcpp rlang rmarkdown stringr XML yaml]; }; GoFKernel = derive2 { name="GoFKernel"; version="2.1-1"; sha256="0xygsdmggl35fafyp431mkwalwixw2r3f32qll1pf72dfwd8y8d3"; depends=[KernSmooth]; }; - GofCens = derive2 { name="GofCens"; version="0.91"; sha256="1imf52isvvyf0p1mbj4cbwn3d6gn02vnmzw7biwmy29r45s6wghx"; depends=[actuar eha fitdistrplus ggplot2 gridExtra survival survsim]; }; + 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]; }; GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.3"; sha256="1d0xkmkcfcwx0qs8m4b9dgrbkg1qpb859mmzg4d1rww8rc0wxh9h"; depends=[classInt corrplot]; }; @@ -2019,11 +2051,11 @@ in with self; { GreedyExperimentalDesignJARs = derive2 { name="GreedyExperimentalDesignJARs"; version="1.0"; sha256="14i6m5qlh1fca9xmzid01hicd3bkf6rzl139ss78gvw544zrapw7"; depends=[rJava]; }; Greg = derive2 { name="Greg"; version="1.4.0"; sha256="0n5w4z4czrgp8mdbpxiw3ha41dax4nns8na5xzq2qc94nig8k97m"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; }; GreyModel = derive2 { name="GreyModel"; version="0.1.0"; sha256="0vxl4kgihcyl96qiz6sz5icznaa1jpsqqbn1irwmzyngwsh1qvzw"; depends=[]; }; - GridOnClusters = derive2 { name="GridOnClusters"; version="0.0.8"; sha256="16wr7zssiy6y0hvg2s7vhy30qxq5ja8yplv8xncn6iz8giy1wdww"; depends=[cluster dqrng fossil plotrix Rcpp Rdpack]; }; + GridOnClusters = derive2 { name="GridOnClusters"; version="0.1.0"; sha256="11jir34jdq2kkkgm0rsdn2ivy4r1pkzj0681hxzy9v388lb3icym"; depends=[Ckmeans_1d_dp cluster dqrng fossil mclust plotrix Rcpp Rdpack]; }; GrimR = derive2 { name="GrimR"; version="0.5"; sha256="005ywc31yn1cs54kjlkrryw0s7zm8dqqfjkdlkm4s1sbc9r3mssz"; depends=[car]; }; GroupBN = derive2 { name="GroupBN"; version="1.2.0"; sha256="0x41x7npaawnh6nxh4d4vmv2zwzc6c5ijrhh6fdpwzl4p75qlh1x"; depends=[arules bnlearn ClustOfVar magrittr MLmetrics PCAmixdata plyr PRROC rlist stringr visNetwork zoo]; }; GroupComparisons = derive2 { name="GroupComparisons"; version="0.1.0"; sha256="0fxgh1mksrfmd4yjrpxg3nfby5wyx75lj0shb5xrdzl7pxzh56ai"; depends=[car]; }; - GroupSeq = derive2 { name="GroupSeq"; version="1.3.5"; sha256="0c74nlsqa5ly0kf6p4n7gfvd0ygkq78bx851ryniwpnnalvsq8l7"; depends=[]; }; + GroupSeq = derive2 { name="GroupSeq"; version="1.4.0"; sha256="0dgm53wagwfsmv308ipx7v29qh7p5xwvbnni5zrc3a575ch1b7hb"; depends=[container mvtnorm tcltk2]; }; GroupTest = derive2 { name="GroupTest"; version="1.0.1"; sha256="1v2230mw0irsr5y8n45g8sd362jp7f6dy2r532mhflfdqy6i2khs"; depends=[]; }; GrpString = derive2 { name="GrpString"; version="0.3.2"; sha256="14ss6assqk6s9kv4bvzlydm8qrbnslm4vj876q5dn2dw4k50dai1"; depends=[cluster plyr Rcpp]; }; GsymPoint = derive2 { name="GsymPoint"; version="1.1.1"; sha256="1fg8vqd86kcpciphmlcxlm0rk01iza7md5y8kcxp9i732n4zn7r8"; depends=[ROCR Rsolnp truncnorm]; }; @@ -2042,7 +2074,9 @@ in with self; { HBglm = derive2 { name="HBglm"; version="0.1"; sha256="1sral7lh5qw5mn31n8459pk52frgw1bjq0z5ckpsnbc4qf3xxcjn"; depends=[bayesm Formula MfUSampler sns]; }; HCD = derive2 { name="HCD"; version="0.1"; sha256="158szwhpxwj2dj7sibyh8l92dk9cmy6acapmk8wf5hmfybdpgbsh"; depends=[data_table data_tree dendextend irlba Matrix randnet RSpectra stringr]; }; HCR = derive2 { name="HCR"; version="0.1.1"; sha256="14s46dyw3ifp3pwwlcwbbl47i6hy2whjj1n65i28am5a33nycgha"; depends=[data_table]; }; + HCTDesign = derive2 { name="HCTDesign"; version="0.7.0"; sha256="0qg6c8sndyk5jgihfdcgk4syp7rwcd8zkb5ndx3rfzdmyfcyrl31"; depends=[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.2"; sha256="05w742g89r0hr90awwjqlszib2jjfly52l9c7ag3n22vg4d1ixw1"; depends=[ggplot2 mvtnorm survival]; }; HDBRR = derive2 { name="HDBRR"; version="1.1.3"; sha256="1awz9s7g5fcy2anrq3fmyjcvi3kr2b3vmky63nv964821b8x9vh1"; depends=[bigstatsr MASS numDeriv]; }; HDCI = derive2 { name="HDCI"; version="1.0-2"; sha256="0wxbv54kbygymhh4r7052vnbj603c1kya01ykvmqzzkjyyfzidkz"; depends=[doParallel foreach glmnet iterators lattice Matrix mvtnorm slam]; }; @@ -2050,9 +2084,9 @@ 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.2"; sha256="1vb5fn9zfig0jqs3mvkpik4wvrndj4qmxqx8rg0iv8nvqc4fnzh4"; depends=[]; }; - HDLSSkST = derive2 { name="HDLSSkST"; version="2.0.0"; sha256="17s3xa33c7671fraw56jsc2wqnkxzl0sjjhgkiryma3q0f01dczf"; depends=[Rcpp]; }; + HDLSSkST = derive2 { name="HDLSSkST"; version="2.1.0"; sha256="19snvpgiq8kxzqv6yimzn7nfxkch2xkm0sk41m7g4xwr412dn49j"; depends=[Rcpp]; }; HDMD = derive2 { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[MASS psych]; }; - HDMT = derive2 { name="HDMT"; version="1.0.4"; sha256="1smzbly1jfb38jgl2f8jf6f4by1nr6zwf4xhqwhv5xfw6ina9q6a"; depends=[fdrtool]; }; + HDMT = derive2 { name="HDMT"; version="1.0.5"; sha256="11wr7n6gj75k3a339h9hm167pni3vdbbnwwblc2b0wfljxsif6hf"; depends=[fdrtool qvalue]; }; HDPenReg = derive2 { name="HDPenReg"; version="0.94.7"; sha256="16kmx3lddjvz8k7sric0s9ajhlgp62gf1zkyiscaf7w0pjwzin28"; depends=[Matrix Rcpp rtkore]; }; HDShOP = derive2 { name="HDShOP"; version="0.1.2"; sha256="0qnxgp7fjinj9c96w724nxvmb2xbihj2wd6ysibr5dk4rvlq16p0"; depends=[Rdpack]; }; HDSpatialScan = derive2 { name="HDSpatialScan"; version="1.0.2"; sha256="0j6frhnxbchy2r425zhx952vvdivrpcrq0440rr4mbr4rla2ci4s"; depends=[DT fmsb matrixStats plotrix purrr Rcpp RcppArmadillo rgdal rgeos sp SpatialNP swfscMisc TeachingDemos]; }; @@ -2061,7 +2095,7 @@ in with self; { 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.1"; sha256="1j9y1sc642ghz0rfdsrsg46c56mgdg9444a4b5zv2ami9b4zs2an"; depends=[circular Directional movMF NPCirc rgl]; }; - HDoutliers = derive2 { name="HDoutliers"; version="1.0.3"; sha256="167g72b23jpjfhnz2faxia2lma328gvqkrlnz6xizzq7vb7cmb18"; depends=[FactoMineR FNN mclust]; }; + HDoutliers = derive2 { name="HDoutliers"; version="1.0.4"; sha256="0vc3g36cghs2ln8a3pb344b3vw1jpz9r8ld77ldd898vg9rhkq2m"; depends=[FactoMineR FNN mclust]; }; HDtest = derive2 { name="HDtest"; version="2.1"; sha256="1c9x4s59762sp7drbm5h1xv22kpifq7p0x3dkrfcd0ficbbma5v8"; depends=[checkmate clime doParallel expm fastclime foreach MASS mvtnorm]; }; HDtweedie = derive2 { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; }; HEDA = derive2 { name="HEDA"; version="0.1.5"; sha256="0arya76isiaxmgmhl7q93vmga9apmbkq3scgz7zhgnrkd8mkh0i1"; depends=[dplyr ggplot2 lubridate rlang zoo]; }; @@ -2070,10 +2104,10 @@ in with self; { HGMND = derive2 { name="HGMND"; version="0.1.0"; sha256="1iwqssj66q9dfgddzwqmnnpvxnvlrq7p1axm95lpkf3vrpn5rp6b"; depends=[genscore]; }; HGNChelper = derive2 { name="HGNChelper"; version="0.8.1"; sha256="0qwkk5658j4j6w2wgvxkp38cyvscjp93d3zc7gb97vcihqx0ngxa"; depends=[]; }; HGSL = derive2 { name="HGSL"; version="1.0.0"; sha256="1p453xr3d1bmqc6mrmzb0hz9p0gp25m6v6qr0l3bapcf71vzbvq1"; depends=[]; }; - HH = derive2 { name="HH"; version="3.1-43"; sha256="0nr3sa6di06cjmljdxfq7bcpnp9d6kna4f9lrv9fk4khr67mrlrf"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; }; + HH = derive2 { name="HH"; version="3.1-47"; sha256="1h47s1rp49p3fy4ssh4jxyxp87306lsl2hkfdksjs4j9vv3hm4ah"; 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]; }; HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; }; - HIMA = derive2 { name="HIMA"; version="1.1.0"; sha256="0xdi9vc8k9k9ixg9n18lb3k0zpavx0z0076la5bvazlkjkz8rfv6"; depends=[doParallel foreach glmnet HDMT iterators MASS ncvreg survival]; }; + HIMA = derive2 { name="HIMA"; version="2.0.0"; sha256="0r6hb3hi0z7mzw7m8qafbk6qqw9fs5119fnsnbinmfwx1w9wci2v"; depends=[doParallel foreach glmnet HDMT hommel iterators MASS ncvreg survival]; }; HIV_LifeTables = derive2 { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; }; HIest = derive2 { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; }; HK80 = derive2 { name="HK80"; version="0.0.2"; sha256="0c8scpzl5xgqm9rlsvh5nl3bz42i5pzvb873j9bn3bi15gcknbny"; depends=[]; }; @@ -2096,10 +2130,8 @@ in with self; { HPLB = derive2 { name="HPLB"; version="1.0.0"; sha256="1xxckjz90sdmng0sm9dlhwpzj79pxa3vd1cidxc44wjk4h25rq7q"; depends=[data_table]; }; HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; }; HRM = derive2 { name="HRM"; version="1.2.1"; sha256="0qsxwi0v61k1waw21nrz86jazd5wgq2drhan3w8pmb35q2z20s35"; depends=[data_table doBy ggplot2 MASS matrixcalc mvtnorm plyr pseudorank Rcpp reshape2 xtable]; }; - HRM_curve = derive2 { name="HRM.curve"; version="0.0.1"; sha256="0p3kvldpz347c0cdjkrdm0x2nfj85hm5cp59lirqhq77hf1zfnd5"; depends=[]; }; 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]; }; - HSAR = derive2 { name="HSAR"; version="0.5.1"; sha256="03ryscvgiiwjcqk6gy3251nqqk43x508kz3ibw35hi84m2s7fsxj"; depends=[Rcpp RcppArmadillo spatialreg spdep]; }; HSAUR = derive2 { name="HSAUR"; version="1.3-9"; sha256="0b2hyn59lr2pma87fcj7mli3qmrbnfhgd8fv02fa317rj52399qz"; depends=[]; }; HSAUR2 = derive2 { name="HSAUR2"; version="1.1-18"; sha256="0ggya24clwydi7aligdayds3jpq2ckr4xfm4nik0r6j97x4gl1mj"; depends=[]; }; HSAUR3 = derive2 { name="HSAUR3"; version="1.0-12"; sha256="002vrxrdhi328ngb7ijz67bbjsg4zapv2gy08xnn9l5idgpnly6q"; depends=[]; }; @@ -2128,13 +2160,13 @@ in with self; { HazardDiff = derive2 { name="HazardDiff"; version="0.1.0"; sha256="048lvhb4545a487kyknf5b5v8q3a9nsipbh0ii2k3pcc5vfql1h4"; depends=[ahaz Rdpack rootSolve survival]; }; HeckmanEM = derive2 { name="HeckmanEM"; version="0.1.2"; sha256="1q9sad19ccq30ggvcj1byhka4dwa94k6z31ig56vi3031nx2424n"; depends=[MomTrunc mvtnorm PerformanceAnalytics sampleSelection]; }; HellCor = derive2 { name="HellCor"; version="1.3"; sha256="1bzc2ipm7vw7s849d43lcs0xrk2rs67h223dn9kahqg152mmknza"; depends=[energy FNN orthopolynom]; }; - HelpersMG = derive2 { name="HelpersMG"; version="4.8"; sha256="1n349vmywd2n1gw7arl2qrs06gz9zm5y5mmn1gmp7y7nq987kdi3"; depends=[coda lme4 MASS Matrix]; }; + HelpersMG = derive2 { name="HelpersMG"; version="5.1"; sha256="0wdqfg3vlia2mx8vpm406pcb9l4aa9q94var912k8lsv0al7d30i"; depends=[coda lme4 MASS Matrix]; }; 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]; }; HextractoR = derive2 { name="HextractoR"; version="1.4"; sha256="1wp7n92wgrjyklq159ymrw8y5ads6lhj2fcz54rzdnccdyx5naxi"; depends=[doParallel foreach seqinr]; }; HiCfeat = derive2 { name="HiCfeat"; version="1.4"; sha256="1imz7zfax74aakzk8457jww9r66qxpr2ncyvjj0y5paxdn76lnnq"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; }; - HiClimR = derive2 { name="HiClimR"; version="2.2.0"; sha256="0pq2rlxqm0jip9fyyqlqnxig5s886fk31g0c2plvddg139q2sd6z"; depends=[ncdf4]; }; + HiClimR = derive2 { name="HiClimR"; version="2.2.1"; sha256="11aip68cjyy70xr0la1apk6gbkabg8vnc3s5cbydyz7yl4v80nn8"; depends=[ncdf4]; }; HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; }; HiDimDA = derive2 { name="HiDimDA"; version="0.2-4"; sha256="0gxkxzys9mcy33xvsim8klaqmb2xwvy5bvgkn9r400j4qfjd3cgg"; depends=[]; }; HiLMM = derive2 { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; }; @@ -2159,13 +2191,12 @@ in with self; { HuraultMisc = derive2 { name="HuraultMisc"; version="1.1.1"; sha256="0bi1y7icrg0f4n9ah9dsrijnfr39bqg3799rz4hccd1b061f0rvj"; depends=[cowplot dplyr ggplot2 HDInterval Hmisc magrittr reshape2 rstan tidyr]; }; HyPhy = derive2 { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; }; HyRiM = derive2 { name="HyRiM"; version="2.0.1"; sha256="09njf2gscn13x5mfd7g76cam9bzbibcnc383gb8h0kks7x16d3p9"; depends=[compare grImport2 orthopolynom purrr Rglpk]; }; - HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; }; HydeNet = derive2 { name="HydeNet"; version="0.10.11"; sha256="1qi87k2drizqba1nz8psh697ks8ai8xz492kzsrs76xlxpbk1i9k"; depends=[checkmate DiagrammeR dplyr graph magrittr nnet pixiedust plyr rjags stringr]; }; HydroCode = derive2 { name="HydroCode"; version="1.0.2"; sha256="1igshik28xcxrdg116vs9s2yfbz5fik9xvlgfkgai3w9qj0x1h5q"; depends=[sp]; }; HydroMe = derive2 { name="HydroMe"; version="2.0-1"; sha256="1pzf3z3f2xqmj7ixdg01k8552l4vz7yaf2mb53q59ihfhlbqchni"; depends=[]; }; HyperG = derive2 { name="HyperG"; version="1.0.0"; sha256="0w84ph0vd03i22s8g52jf2w96yd80ynbh6x0p88apg92jdsapcrc"; depends=[gtools igraph Matrix mclust proxy RSpectra]; }; - HyperbolicDist = derive2 { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; }; - HypergeoMat = derive2 { name="HypergeoMat"; version="3.1.0"; sha256="1pnwj0mqzangjvxnp5yq1ll4qhkpkvv427nzq3sqwpn9qd8gisvf"; depends=[gsl Rcpp RcppArmadillo]; }; + HyperbolicDist = derive2 { name="HyperbolicDist"; version="0.6-4"; sha256="0xsgy995z79qdamwdgs335r8zr2bk5cyw4wijqyvgwx3pqmwvvmr"; depends=[]; }; + HypergeoMat = derive2 { name="HypergeoMat"; version="4.0.1"; sha256="0l000hanjlyz76vvvp7sh6d03m3mj7wld4ph9dzhf1z9b4x9i2bz"; depends=[EigenR gsl JuliaConnectoR Rcpp RcppEigen]; }; IASD = derive2 { name="IASD"; version="1.1"; sha256="1slhd42k639mbyxccl7n69p7ng2qx6pqag8wz3kdwn479spkavzn"; 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=[]; }; @@ -2209,30 +2240,34 @@ in with self; { ICglm = derive2 { name="ICglm"; version="0.1.0"; sha256="1dmnz6sf311xsvyg8dh082pxgzizm701cf1ml0xg4s9kls3fd2i8"; depends=[Matrix]; }; ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; }; ICtest = derive2 { name="ICtest"; version="0.3-4"; sha256="130n25xxq0iav5y2anyhjjkpvfs438qxjgrbil7yzpaaifhxrmi2"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey xts zoo]; }; - ICvectorfields = derive2 { name="ICvectorfields"; version="0.1.1"; sha256="15djyammyss0vqvknkd30xxd2pwmi4jzrb2x711sxhz9yx8arhqf"; depends=[fftwtools Rcpp terra]; }; + ICvectorfields = derive2 { name="ICvectorfields"; version="0.1.2"; sha256="0h10ijh00ahk2aawg090sspdyxzln8cwzvrfqyi45p19sbx93503"; depends=[fftwtools Rcpp terra]; }; IDCard = derive2 { name="IDCard"; version="0.3.0"; sha256="06b5zqmgh4clni3mv6ab2a52r4z34isbz0hd1i61793gps9fkc0y"; depends=[stringr]; }; + IDConverter = derive2 { name="IDConverter"; version="0.2.0"; sha256="1w0j833wxmfc3sy2jwnvz15bvlgy0zss9m9s7md1jkkvhjbxcvnk"; depends=[data_table httr]; }; IDE = derive2 { name="IDE"; version="0.3.0"; sha256="1m1y7gd8i14kl54qxhjy7bnf2md5vs7bb73k7k92nizv941qn0mn"; depends=[DEoptim dplyr FRK ggplot2 Matrix sp spacetime sparseinv tidyr]; }; - IDF = derive2 { name="IDF"; version="2.1.0"; sha256="01hfnjiq0a9xmg605kyvvx44pm1fm1h1li6gkp0yw3ryz15r654n"; depends=[evd fastmatch ismev pbapply RcppRoll]; }; + IDF = derive2 { name="IDF"; version="2.1.1"; sha256="045z32zv18hnzddhqk3r7dgql6lavkrjwgsn9lwcjhv1v8j3x6cw"; 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]; }; IDSA = derive2 { name="IDSA"; version="2.1"; sha256="0ld2359ksnw9jrjicnqikh5r321mfy2i7vzlhh9phm60k0qf5j98"; depends=[GD ggplot2 kableExtra reshape2]; }; IDSL_IPA = derive2 { name="IDSL.IPA"; version="1.3"; sha256="1lmmr43cblxi0652hi6nk08c8yv3s6m1aqyysmk4xh2mhnr8hqpb"; depends=[BiocManager doSNOW foreach ggplot2 gridExtra mzR png Rcpp readxl]; }; + IDSL_MXP = derive2 { name="IDSL.MXP"; version="1.0"; sha256="09r4s7zkc25cfg0dsli5igv9cpywifgqiysspfs5bah4abv4v7f1"; depends=[base64enc xml2]; }; IDSL_UFA = derive2 { name="IDSL.UFA"; version="1.0"; sha256="0digl6s13mnknihpg5zy0b2ak9rmwz40ya9bym10bsam86rx3r93"; depends=[BiocManager doParallel doSNOW foreach GA ggplot2 gridExtra IDSL_IPA mzR Rcpp readxl stringi]; }; + IDSL_UFAx = derive2 { name="IDSL.UFAx"; version="1.0.1"; sha256="11jc1np6b22qr33rilvb557c0aphvb07601a3hw9zmf8s31xs2dg"; depends=[BiocManager doSNOW foreach IDSL_IPA IDSL_UFA mzR Rcpp RcppAlgos readxl stringr]; }; IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.3.12"; sha256="0gkicafnzq8aq9bmbbr9n868sh91dwkhs1dk4wry5vkbfaawfxis"; depends=[doParallel foreach igraph spatstat_core spatstat_geom]; }; IDetect = derive2 { name="IDetect"; version="0.1.0"; sha256="1q1jwgildhx6sp883ni7vcsa3gj997855v5ky41dyf34kv7hvdl1"; depends=[]; }; 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]; }; - IFAA = derive2 { name="IFAA"; version="1.0.3"; sha256="05hib1nc2w2fjypvbqjp92j0463k79fpj0l4068x876nhnx3ms2a"; depends=[doParallel expm foreach future glmnet HDCI mathjaxr Matrix picasso qlcMatrix rlecuyer]; }; + IFAA = derive2 { name="IFAA"; version="1.0.4"; sha256="0lqppf8sd7b82g8qp0ijwl3jn4idxvgz4zhia6kh936sq27qicx6"; depends=[doParallel expm foreach future glmnet HDCI mathjaxr Matrix picasso qlcMatrix rlecuyer]; }; IFC = derive2 { name="IFC"; version="0.1.2"; sha256="1g5l85mjnf08dxszbybwg5z1k2dwgvhbrls8r37iq45rcb31pmyh"; depends=[DT gridExtra jpeg KernSmooth lattice latticeExtra png Rcpp RcppProgress tiff visNetwork xml2]; }; IFP = derive2 { name="IFP"; version="0.2.4"; sha256="066wz6bjqcvq22gjg2wcmglp798f87rsc8yhm13p0dic3arb5ph6"; depends=[coda haplo_stats]; }; IGG = derive2 { name="IGG"; version="1.0"; sha256="1cibb9z18xc1zx1813lk14n6p5am84hm7w0hkrsif4j3p89lrwif"; depends=[GIGrvg glmnet MASS Matrix pscl]; }; IGP = derive2 { name="IGP"; version="0.2.0"; sha256="1hsyl6cjm84w4f4v0gw4hi5y483r8v78xb3k3h1ixix9ymjqr8y5"; depends=[R6 reticulate]; }; IGST = derive2 { name="IGST"; version="0.1.0"; sha256="12ycrfsgwakaj3k39k1j4ky58wr7a2ibyz6j9cznvjjv6cgz9zg5"; depends=[BootMRMR e1071]; }; + IGoRRR = derive2 { name="IGoRRR"; version="0.3.1"; sha256="0vbg3rm0l1fx9s0waj9ginqgyyr781nmj38m78mhxsvbhccqdjr0"; depends=[clipr dplyr feather fst fuzzyjoin ggformula glue haven Hmisc htmltools jsonlite lubridate magrittr mapsf purrr readODS readxl rhandsontable rio shiny shinydashboard shinyFiles shinyWidgets skimr sortable stringr tables tibble tidyr zoo]; }; IHSEP = derive2 { name="IHSEP"; version="0.2"; sha256="1qb6mn9bsd69pifmphywmj6j71v14wklydw23pbj5980c5hrlwsj"; depends=[lpint Rcpp]; }; IIVpredictor = derive2 { name="IIVpredictor"; version="0.1.0"; sha256="15361j8b60jj3bh8cjxs39d9bir1aywy9bd254s5w94cakhy0ld5"; depends=[lavaan R2jags]; }; ILS = derive2 { name="ILS"; version="0.2"; sha256="0lj3ripkaq6jn00lpxjihjhm8g1gbkppmb1y9kkrymphg80k1by7"; depends=[depthTools fda_usc lattice MASS multcomp]; }; - IMAGE = derive2 { name="IMAGE"; version="1.0"; sha256="0xgrja7qhklcmbm0zz5xg94gw5kl05nk3v77l7vxq2d5sk0435g3"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; }; + ILSE = derive2 { name="ILSE"; version="1.1.7"; sha256="0jx0f7lk18k0wsypi4ynq1zqbb9hsmcmf0chxyrpqkadfqb6mgwr"; depends=[pbapply Rcpp RcppArmadillo]; }; IMD = derive2 { name="IMD"; version="1.0.2"; sha256="13l15gdwib09gs5bqga1hr5z9vym0f9jiki4il22mrzkhw34y2j8"; depends=[devtools dplyr Hmisc httr janitor readODS readr readxl rlang tibble tidyr]; }; IMEC = derive2 { name="IMEC"; version="0.2.0"; sha256="1k85pr6s6lysn53n59i8rcdhyg7r3il5avbckvvz43p6lh0fgxpy"; depends=[igraph IsingSampler qgraph]; }; IMFData = derive2 { name="IMFData"; version="0.2.0"; sha256="1mlxpsbyvh1zi8ivdblbd58zfv5hflnknbasz5z8xk9911czrn6p"; depends=[httr jsonlite plyr]; }; @@ -2248,15 +2283,14 @@ in with self; { INQC = derive2 { name="INQC"; version="2.0.5"; sha256="1gz7gyq5n2bmh18yrg29nz8kmdc0b35chwqxr6y2sggdm8j28akd"; depends=[evd gdata suncalc]; }; 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.1"; sha256="0iipdksj9bxcf3k2acm6ay1sjk9hcp860kqf7dflvcmf3i271rfc"; depends=[bsplus colorRamps colorspace colourpicker data_table dplyr DT ggplot2 httr kableExtra knitr magrittr markdown plotly RColorBrewer Rcpp reshape2 shiny shinydashboard shinyjs stringi]; }; + 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]; }; IOHexperimenter = derive2 { name="IOHexperimenter"; version="0.1.4"; sha256="0aacliznncl488rjsnx02pfj1mchhcyb36v816g959ll38pvc6bk"; depends=[assertthat BH magrittr Rcpp]; }; 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.2"; sha256="1xz020w2cx83wcadnjsqlpfyir2apj7bsjpka77pwyg2h2fqc76m"; depends=[dplyr eeptools effsize gtsummary hash kableExtra lubridate stringr testthat tidyverse]; }; + 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="0.1.3"; sha256="0h1b9h33zxx23rj8c9790nsqykwhznavy8hfkgv9gx7nphrsy5ma"; depends=[MASS numDeriv]; }; IPLGP = derive2 { name="IPLGP"; version="2.0.0"; sha256="0vzppfc42p51a7rjg6w02w45kh0rymqjfgb6979g9pm35dpppbgz"; depends=[ggplot2 sommer]; }; - IPMRF = derive2 { name="IPMRF"; version="1.2"; sha256="1zvwwhiy0p134zvm5ldc92pdd1ap72bhbrlf02rz9m2hlsxmwy67"; depends=[gbm party randomForest]; }; IPMbook = derive2 { name="IPMbook"; version="0.1.3"; sha256="0wjzp3l7w4cp0g6c1q84l18pkb0sjjnspidxdv32pn7rqj7wsmcf"; depends=[abind]; }; IPPP = derive2 { name="IPPP"; version="1.1"; sha256="19ccs25fd56ns7ssi51w2jzjd4d57vyimwmfvf27mmigb537bd5y"; depends=[]; }; IPV = derive2 { name="IPV"; version="0.2.0"; sha256="0qkh4c865rlzzcj9j8bdwj9y57s8mahry7lxg2q61dqzb51nlvsn"; depends=[ggforce ggplot2 lavaan Matrix reshape2 stringr]; }; @@ -2266,7 +2300,6 @@ in with self; { IRCcheck = derive2 { name="IRCcheck"; version="1.0.0"; sha256="035sx36qf5hdnc51h8251qwxfm30r8h2v2qs2x161ip4cqghw019"; depends=[corpcor GGMncv glmnet MASS Rdpack]; }; IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.4.4"; sha256="0pnqmzzzbyqdg5hy4jjmlw38cpi81gsphfs4bqwbhmx77dp7ib06"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; }; IRISSeismic = derive2 { name="IRISSeismic"; version="1.6.3"; sha256="0krq0xxxwl59cp8mn82f9xlincvl6l8r6cq5axfmk99nrzcfdy5g"; depends=[pracma RCurl seismicRoll signal stringr XML]; }; - IRSF = derive2 { name="IRSF"; version="1.0.3"; sha256="1cq196z2i4by7dfij6w849a49d8dzzcdk5a68nxvmvwq3xskywam"; depends=[abind randomForestSRC survival]; }; IRTBEMM = derive2 { name="IRTBEMM"; version="1.0.7"; sha256="09siwm2shjb8hhk64r66fspzykzr2r0m011pv8qcl9k7g040mxpi"; depends=[]; }; IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; }; IRdisplay = derive2 { name="IRdisplay"; version="1.1"; sha256="0awdiv4rr93y8jb1d64sm1iy37ywyniqm7w98yv6qm0zz47h7sw3"; depends=[repr]; }; @@ -2276,9 +2309,9 @@ in with self; { ISBF = derive2 { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; }; ISCO08ConveRsions = derive2 { name="ISCO08ConveRsions"; version="0.1.1"; sha256="1vqg28alpjb1m33hzh4ixfd6f3gzc6l9989gpszvl3ishki05xqf"; depends=[]; }; ISLR = derive2 { name="ISLR"; version="1.4"; sha256="1hr0r00m9y39gzb4q7nip07mhxmaly12zwmwkisyx641h0vcclbi"; depends=[]; }; - ISLR2 = derive2 { name="ISLR2"; version="1.3"; sha256="1153s2zgiq242jrf45hnbv092y5g8hy3nhnx34xhdhl9v1wp4lly"; depends=[]; }; + ISLR2 = derive2 { name="ISLR2"; version="1.3-1"; sha256="1hmcpw3nrldxayklp0whlgd5xi1zap8j5g2231i5hp3lsqh6skg6"; depends=[]; }; ISM = derive2 { name="ISM"; version="0.1.0"; sha256="0by0w6zgnwcwzbmxx16s8mb1avhc6aiavqp0qkxx6hr70vrgb997"; depends=[rJava xlsx xlsxjars]; }; - ISOcodes = derive2 { name="ISOcodes"; version="2021.02.24"; sha256="19irnn2yi1bzhf03g666la84kj8040f5913kfrmd16dfnjy6j9qm"; depends=[]; }; + ISOcodes = derive2 { name="ISOcodes"; version="2022.01.10"; sha256="0gy7n5bgxnl4rawry0pg078bkks9lzsbsrwjq8q5cvxl4k3dwpdj"; depends=[]; }; 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="2021.9.24"; sha256="0y1hggkb3d2nvnadr9qg83lsrzzwdnzywpqjkjf460lrmazki5dq"; depends=[MASS]; }; @@ -2290,11 +2323,12 @@ in with self; { IUPS = derive2 { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[boot Matching R2jags]; }; IVYplot = derive2 { name="IVYplot"; version="0.1.0"; sha256="1v739xlim3mcw09cyp4z3cbb25ipkpwm9h378fwy2ycp8lmq32gy"; depends=[plyr]; }; Iboot = derive2 { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; }; + IceSat2R = derive2 { name="IceSat2R"; version="1.0.1"; sha256="0xmx6schcg03p1c7v86m8r7yh78gc5dgiqa1v1d3s030r787ds6a"; 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=[]; }; ImaginR = derive2 { name="ImaginR"; version="0.1.7"; sha256="12ypfrqw6xym84i1axd3h0qd2md96rc0glas3rgzpdhdyw4lbfmn"; depends=[imager jpeg]; }; Imap = derive2 { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; }; Immigrate = derive2 { name="Immigrate"; version="0.2.1"; sha256="0pnnvv63kkg7pgyblb1vlx54c6169n40fn58aypdy5xcnknabvxn"; depends=[pROC Rcpp]; }; - ImpactEffectsize = derive2 { name="ImpactEffectsize"; version="0.6.1"; sha256="12pl4kif6s8jllncm3r5133vrknq98h8awbskq4sh55p1ldaldfq"; depends=[caTools matrixStats parallelDist Rcpp]; }; + 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]; }; 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]; }; @@ -2305,7 +2339,7 @@ in with self; { IndTestPP = derive2 { name="IndTestPP"; version="3.0"; sha256="1z48pr8znbk1gdvjfdvszxlzhj7v88p3y7zhi1f0xw75dkfpnwwy"; depends=[]; }; IndepTest = derive2 { name="IndepTest"; version="0.2.0"; sha256="017jasqsxm5m13rhfy9gxvd8nfib5k5y5c8520p3hcffqrxr683p"; depends=[FNN mvtnorm Rdpack]; }; IndexConstruction = derive2 { name="IndexConstruction"; version="0.1-3"; sha256="08bi3x7a9plxshgj6hq58mzkf1117a7p0fd1akqjh7k8mgywifwf"; depends=[fGarch KernSmooth lubridate RcppBDT xts zoo]; }; - IndexNumR = derive2 { name="IndexNumR"; version="0.4.0"; sha256="1jvwfrjjhl9b3siifyzxnchd0nhb8d4shsaaxmxgn6xl5cifm0j2"; depends=[]; }; + IndexNumR = derive2 { name="IndexNumR"; version="0.5.0"; sha256="15rjhzwygs4an51lxn66jlfww4j361b1jw4a6q3dz31bmlc9i5pg"; depends=[]; }; IndexNumber = derive2 { name="IndexNumber"; version="1.3.2"; sha256="0ff6fnkgbfwn3sasglr1aygvm9bawrvcj432xgka1vk28qnns0if"; depends=[]; }; IndianTaxCalc = derive2 { name="IndianTaxCalc"; version="1.0.2"; sha256="1fxw884wj9n8drk2xz3rgr4f7b4fckh5firrf5gdz6d1nk9hdvc1"; depends=[]; }; InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; }; @@ -2334,7 +2368,6 @@ in with self; { InteractiveIGraph = derive2 { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; }; Interatrix = derive2 { name="Interatrix"; version="1.1.3"; sha256="1pjyfg5p6081hng9h6wcmfnlfkcs300c3x9ksdj01587b97ph9s1"; depends=[MASS]; }; InterfaceqPCR = derive2 { name="InterfaceqPCR"; version="1.0"; sha256="12nmkv6qnzh2dnbhk1656dla6mrznh24gqblmn4xai7wg4p92fbx"; depends=[plyr reshape2 tkrplot xlsx]; }; - Interpol_T = derive2 { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[chron date]; }; InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="1.2"; sha256="1iaw4i14l2vp1f163g2q4pwv9cnqrx14ik4s8zw0iha4zwcrc3ja"; depends=[DBI doParallel enviPat foreach plyr Rdisop RSQLite]; }; IntervalSurgeon = derive2 { name="IntervalSurgeon"; version="1.1"; sha256="0dhsy40wx47g7h8ivriscyvxwl991lfal4nq0j476kamxax0yzbw"; depends=[Rcpp]; }; InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.8"; sha256="01ckyvjl9lxdpkr0v1da4n4lw3b5z1bxlmf0v6ibqly1mhfwybjl"; depends=[glmnet mboost]; }; @@ -2342,7 +2375,7 @@ in with self; { Inventorymodel = derive2 { name="Inventorymodel"; version="1.1.0"; sha256="1l87xghdksgmb2k3a8j382p7ffi2pma38a6pn31sfjsa6bgmrdnk"; 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.3"; sha256="1qmpim7r5wzifr73bb261xhpsxz93n5h70yc883wiaikjg031abb"; depends=[data_table geepack survival]; }; + 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]; }; @@ -2352,11 +2385,11 @@ in with self; { 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="4.2"; sha256="18yc6d09850fjrgxdmnfgm572czyx0z40smhlix81pwn2pm8vq92"; depends=[MASS]; }; - IsoplotRgui = derive2 { name="IsoplotRgui"; version="4.2"; sha256="0l30bv9nzamh6aj2b5497hnn298lcim5nhp3isqnm0r1wpnpjk71"; depends=[httpuv IsoplotR jsonlite later]; }; + IsoplotR = derive2 { name="IsoplotR"; version="4.3"; sha256="0m77ffpwhnhpig8fli36jmwj728s2866wyjmdl8a2jd9lnygw4vw"; depends=[MASS]; }; + IsoplotRgui = derive2 { name="IsoplotRgui"; version="4.3"; sha256="1yql59cvljh63k5lmgxajbr8slbk4nsi140s5hmr9q1qfk90bncj"; depends=[httpuv IsoplotR jsonlite later]; }; IsoriX = derive2 { name="IsoriX"; version="0.8.2"; sha256="1yk2xlz658c1kvm3kb89qmacy5g9qnzjawi2pk5xkn7g9v214adr"; depends=[lattice latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; }; IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; }; - IxPopDyMod = derive2 { name="IxPopDyMod"; version="0.1.0"; sha256="12b4ffkq8788yhj2xs6fsm8dw0607ifj3yy1lylcy3z2nn2bzap7"; depends=[dplyr ggplot2 igraph magrittr readr rlang stringr tibble tidyr yaml]; }; + 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]; }; JASPAR = derive2 { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; }; JBrowseR = derive2 { name="JBrowseR"; version="0.9.0"; sha256="0wwcz5dzjmss2rdqdfxrxbaj01f9avh7h5clzl9aqvql2g0gllbl"; depends=[cli dplyr htmltools htmlwidgets httpuv ids jsonlite magrittr mime reactR readr stringr]; }; @@ -2364,12 +2397,12 @@ in with self; { JFE = derive2 { name="JFE"; version="2.5.2"; sha256="15y8l2cdw8g4abwiv1ddxb42kcpajp0azzpbqcj4h95ibr4j61i2"; depends=[caret fPortfolio magrittr tcltk2 xts zoo]; }; 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-0"; sha256="1h885gbcb6pq0ipzc4lai0crfm0plhvanlirn76v4sq8h9l6gn31"; depends=[JavaGD rJava]; }; - JM = derive2 { name="JM"; version="1.4-8"; sha256="1nq07hw30fqnag1h08b7crl2yfs85gyrn70aaw11bdbjv06r2x55"; depends=[MASS nlme survival]; }; + JGR = derive2 { name="JGR"; version="1.9-1"; sha256="0zh9v16ymq68xv1canfh0hafizb722632pv7r5xb1fsc230hbcc7"; depends=[JavaGD rJava]; }; + JM = derive2 { name="JM"; version="1.5-1"; sha256="1nx4dcd3p8f30kryp09iylnnlrvhx0dbx4f51ag7ij5m4ml80zxc"; depends=[MASS nlme 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.1-8"; sha256="16fy3j52xd3d1bjpzrs0qaajiw9fvpdvm19jx0nbwh16npid494f"; depends=[coda ggplot2 GLMMadaptive gridExtra matrixStats nlme Rcpp RcppArmadillo survival]; }; - JMdesign = derive2 { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; }; + JMbayes2 = derive2 { name="JMbayes2"; version="0.2-0"; sha256="1r28b5bgw5q1a23lmdyapahpd50s9259xq7hzq4x0xl0cln8l95l"; depends=[coda ggplot2 GLMMadaptive gridExtra matrixStats nlme Rcpp RcppArmadillo survival]; }; + JMdesign = derive2 { name="JMdesign"; version="1.2"; sha256="0l3cc7dacjx78l81v0fxda20jd8mlbaaf6vflbn6y42aq79s1yyq"; depends=[]; }; JOPS = derive2 { name="JOPS"; version="0.1.15"; sha256="01yaw657826vfsfdscv3aqgswb5s2054s755agfxqm7g6sswpa13"; 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]; }; @@ -2393,9 +2426,9 @@ in with self; { JointAI = derive2 { name="JointAI"; version="1.0.3"; sha256="1dg685lpqxs1a2mf584a0l0a6zz6bkp06n3ydvgnvngrclhv18zj"; depends=[coda foreach future MASS mathjaxr mcmcse rjags rlang survival]; }; JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; }; JointNets = derive2 { name="JointNets"; version="2.0.1"; sha256="18n9dsy0w0nh7dznp6gw6g5fhhjhf5y589nb49hri0721kq1h3rb"; depends=[brainR igraph JGL lpSolve MASS misc3d oro_nifti pcaPP rgl shiny]; }; - Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; }; + Julia = derive2 { name="Julia"; version="1.3.1"; sha256="0wkpz6i29mg3hls4gk09ik6s3dxmn4g8lrgflcjwgkglnwzl9r9v"; depends=[]; }; JuliaCall = derive2 { name="JuliaCall"; version="0.17.4"; sha256="0ys2sm8yf41zqkvwz9cavkqk8br338w93wq0h8lggfq4q0l85n21"; depends=[knitr Rcpp]; }; - JuliaConnectoR = derive2 { name="JuliaConnectoR"; version="1.1.0"; sha256="0dqgrhnfcwx7gprvxm8kqcmmrgs5zpi23b8aiy46s9i9b59y8kmw"; depends=[]; }; + JuliaConnectoR = derive2 { name="JuliaConnectoR"; version="1.1.1"; sha256="0chbax02l1p3qr0skvnxw1b8g7kf6s7sk2f3gj0ddl5kj6ls1p5n"; depends=[]; }; JumpTest = derive2 { name="JumpTest"; version="1.1"; sha256="0y375m5477nq0ybnjmfnd8hi45d8jmdnprqvw5f70llpd7bcghh0"; depends=[MASS Rcpp RcppEigen]; }; JumpeR = derive2 { name="JumpeR"; version="0.3.0"; sha256="1bh2448462xgiv4k19qgm3dc4wa00ad8v3l6v22pg0l5kpmlx5i2"; depends=[dplyr magrittr pdftools purrr rvest stringr SwimmeR xml2]; }; JustifyAlpha = derive2 { name="JustifyAlpha"; version="0.1.1"; sha256="0bd7sn4sn95kal5q2x1q78fsk1mhakr5fax3z6ny2yda2h266af9"; depends=[BayesFactor ggplot2 pwr qpdf shiny shinydashboard stringr Superpower]; }; @@ -2406,7 +2439,7 @@ in with self; { KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; }; KFAS = derive2 { name="KFAS"; version="1.4.6"; sha256="1395xqm8rbg0i2vrd9n83fslf8v40csh0h17wczdnwnff3z3gpfy"; depends=[]; }; KFKSDS = derive2 { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; }; - KFPCA = derive2 { name="KFPCA"; version="1.0"; sha256="1v76rgmg2ww5784jpcd7mg68n1r0vczrisfw1c59cpnmgr365hsy"; depends=[fda fdapace kader pracma]; }; + KFPCA = derive2 { name="KFPCA"; version="2.0"; sha256="1dzywxnp3ywg3zbvmacj3a1i7w5cg1g93a9ncl7ddwb7wqpzg6x1"; depends=[fda fdapace kader pracma]; }; KGode = derive2 { name="KGode"; version="1.0.3"; sha256="0r5664vwq3nsjg08xxsx3lrvc4z2758fc013j8djwz5ydaas7xxs"; depends=[mvtnorm pracma pspline R6]; }; KHQ = derive2 { name="KHQ"; version="0.2.0"; sha256="1vg0p3igbw81fbp2gli9msqbvymbn0qf3g3y0nb3q51d7wfax0qd"; depends=[magrittr openxlsx]; }; KLexp = derive2 { name="KLexp"; version="1.0.0"; sha256="1knnqzzywh6zcj60133a5bfzqqxmf86gn4m1kggm7gzv1k9mx90b"; depends=[glmnet]; }; @@ -2415,7 +2448,6 @@ in with self; { KMunicate = derive2 { name="KMunicate"; version="0.2.1"; sha256="19bsnixy59jqpj414827l2r65jimf0swxg36bi90s3pr4mvf7snq"; 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]; }; KOBT = derive2 { name="KOBT"; version="0.1.0"; sha256="0dw6s68x95d4z5a6p8bs1368jcxv5jx0wd87js28i2qm3q57ss71"; depends=[glmnet knockoff MASS Rdpack spcov xgboost]; }; - KODAMA = derive2 { name="KODAMA"; version="1.8"; sha256="0i1lwjzxjpm9yng763hkbi88q13i9bhcwwin6b3lkif34r4c3n8y"; depends=[minerva Rcpp RcppArmadillo]; }; KOGMWU = derive2 { name="KOGMWU"; version="1.2"; sha256="1vz0099gp1r10n7w4p480l8rswdw100sns196d9xin2ibmmd2fx9"; depends=[pheatmap]; }; KONPsurv = derive2 { name="KONPsurv"; version="1.0.4"; sha256="08z24w04rzydm86z201crcmyw88sg92yqma5hzj0blj0fyqakwmi"; depends=[Rcpp survival]; }; KPC = derive2 { name="KPC"; version="0.1.1"; sha256="09zhmjv7dskkdkhrk5alxpxiwlgl9n2whfhxf237q5zfyxxa8pm9"; depends=[data_table kernlab mlpack proxy RANN]; }; @@ -2436,17 +2468,15 @@ in with self; { Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; }; KernSmooth = derive2 { name="KernSmooth"; version="2.23-20"; sha256="0fgclmzk3ksjsh3j47jqzm3jhqrwn12rkp7f84yr6wr43q2pbsr0"; depends=[]; }; KernSmoothIRT = derive2 { name="KernSmoothIRT"; version="6.4"; sha256="0qqlmcd04m89pmhrbmxxx4lzzb6sksgrm0j8x7fs5r0sxdqy6rcp"; depends=[plotrix Rcpp rgl]; }; - KernelICA = derive2 { name="KernelICA"; version="0.1.0"; sha256="1yq7w24qq23c81a9y0jn36iw7zjbxsj3b3p1rq6yl0lanzda9bsr"; depends=[ICtest inline JADE ManifoldOptim Rcpp RcppArmadillo RcppEigen]; }; KernelKnn = derive2 { name="KernelKnn"; version="1.1.4"; sha256="07sjf3ambfih34gm2gkall4h60jy9am8dvakr71wk0lsabih3wqx"; depends=[Rcpp RcppArmadillo]; }; - Kernelheaping = derive2 { name="Kernelheaping"; version="2.2.8"; sha256="0abv5cq9vjdb8jy3niv6xj3gyz4i1l9h7227lrldq43w049i04jx"; depends=[fastmatch fitdistrplus GB2 ks magrittr MASS mvtnorm plyr sp sparr]; }; + Kernelheaping = derive2 { name="Kernelheaping"; version="2.3.0"; sha256="0nd8kbprpm2jrpnqr4xb4z8wklv5js2y3kdpjc2q0ay229hf85j8"; depends=[dplyr fastmatch fitdistrplus GB2 ks magrittr MASS mvtnorm plyr sp sparr]; }; Keyboard = derive2 { name="Keyboard"; version="0.1.0"; sha256="12i9zfpbh2297j78yrz6nnbmj926n3xdkbzmy1p9z7g9bi4cqrp1"; depends=[Iso Rcpp]; }; KingCountyHouses = derive2 { name="KingCountyHouses"; version="0.1.0"; sha256="17l415v290lm99rsifpk6324mm1sk79ns4cvjkyh9ibj8n7l44c1"; depends=[]; }; KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; }; KneeArrower = derive2 { name="KneeArrower"; version="1.0.0"; sha256="1blmim4l7375psa9c3wbpksywj5nfbawly4001n6311wcv4dybl5"; depends=[signal]; }; KnockoffScreen = derive2 { name="KnockoffScreen"; version="0.3.0"; sha256="01r04d9ha9l5pkz3lwdcb5x5qqwk8vil9avnbnfn76wg63mdfhbk"; depends=[bigmemory CompQuadForm data_table irlba Matrix seqminer SPAtest]; }; - Knoema = derive2 { name="Knoema"; version="0.1.19"; sha256="16izh1viaqxvhgfxy2g6b9hhvm1n6nbjsj2xd45qwdibl3ly8d0f"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; }; - KnowBR = derive2 { name="KnowBR"; version="2.0"; sha256="0i934gff8ldg0lm5cfcf3ip7abnparaaviq8avs7cbnacs6nw8i1"; depends=[fossil mgcv plotrix sp vegan]; }; - KnowGRRF = derive2 { name="KnowGRRF"; version="1.0"; sha256="0nk0baibd184rsg23jx1wg4c2fcaqf8ww7822xrs3w5ym6vwd0rs"; depends=[MASS PRROC randomForest RRF]; }; + KnockoffTrio = derive2 { name="KnockoffTrio"; version="1.0.0"; sha256="1lsaslv4p5f4488rqf8fqydpdykdqifsdf2aa9dg1mx8d1agzcb5"; depends=[]; }; + KnowBR = derive2 { name="KnowBR"; version="2.1"; sha256="0r4df95axsrsr72ksy3sdc37sjjd6fvcpj5si7jag7q7ffs8kzmw"; depends=[fossil mgcv plotrix sp vegan]; }; 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]; }; KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.2.1"; sha256="0yzilmiiyzd2x3v0cnjphf0wdwiblh37kgrvmfrdy49qly48pvi2"; depends=[dplyr ggplot2 magrittr tibble]; }; @@ -2455,14 +2485,14 @@ in with self; { L0Learn = derive2 { name="L0Learn"; version="2.0.3"; sha256="1lfbggh2bal8a6krg262v2pd90cd49aaxmz7crcdws4mx82srzmk"; depends=[ggplot2 MASS Matrix Rcpp RcppArmadillo reshape2]; }; L1mstate = derive2 { name="L1mstate"; version="1.0.1"; sha256="1nkx2h1fl32h0sx03f23x3sfxj5mnarbnpy0wmjji90chff7m2vz"; depends=[colorspace MASS Matrix mstate Rcpp RcppEigen]; }; L1pack = derive2 { name="L1pack"; version="0.38.196"; sha256="1cayk11wp6f2vpyz14j7my8wpd8hny2mxpjsdsw4wlz0mmwml70l"; depends=[fastmatrix]; }; - L2DensityGoFtest = derive2 { name="L2DensityGoFtest"; version="0.3.0"; sha256="1zdvqprgdfbrabqgfqjg965rs7hnj387jk33p571zd7svgn1lngv"; depends=[fGarch kedd nor1mix]; }; + L2DensityGoFtest = derive2 { name="L2DensityGoFtest"; version="0.4.0"; sha256="0gxn8w6dycnvi30zxwz60s0jmsrcy0f7nwssqlm14q418mwn21j2"; depends=[boot fGarch kedd nor1mix]; }; + L2E = derive2 { name="L2E"; version="1.0"; sha256="1y1cm4fsb1yf9nqvhz7i2bg3f8ds461bkn3cbrx87d66j43pdi2f"; depends=[cobs isotone]; }; LA = derive2 { name="LA"; version="0.1.3"; sha256="0yvgrm64g910h4zgavinj6ri5gvy5yjd3ydr9gqm7qdj05dsgz66"; depends=[LHD]; }; LAGOSNE = derive2 { name="LAGOSNE"; version="2.0.2"; sha256="0fhy590mnkypknxk34c7vrhwrgsjrkf1f0yvfbjy1kvzvla0hjkl"; depends=[curl dplyr lazyeval magrittr memoise progress purrr qs rappdirs rlang sf stringr tibble tidyr]; }; LAM = derive2 { name="LAM"; version="0.5-15"; sha256="18p8w2n2k4788vpxhdxnmcafwj7a5bvihk530fiynkra3xrn1cr4"; depends=[CDM Rcpp RcppArmadillo sirt]; }; - LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; }; LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; }; LARGB = derive2 { name="LARGB"; version="0.1.0"; sha256="0ksyagp4wy1rm7kll6rgdx2735k6ywlaf08d6yys9cv090rpc8l3"; depends=[dplyr imager]; }; - LARisk = derive2 { name="LARisk"; version="0.1.0"; sha256="05pszgm53dndq114qqb3kcddbvc16a9mgalxjsyh56aa2a4wh7q6"; depends=[Rcpp]; }; + LARisk = derive2 { name="LARisk"; version="1.0.0"; sha256="13d008v8aypqlx35bf16y7rcfcv5qnbsi8q0zpfcl03rzxmqpb8b"; depends=[dplyr Rcpp]; }; LAWBL = derive2 { name="LAWBL"; version="1.4.0"; sha256="13drqwyg6avmsn3s2d521x1cvlqg85qv999lwnvnyszvz8grahcr"; depends=[coda MASS]; }; LBSPR = derive2 { name="LBSPR"; version="0.1.6"; sha256="075wcjhvp90fj37ihrplnrc0vy8wpav5qivkw1rgv00fa8xj7pw0"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; }; LCA = derive2 { name="LCA"; version="0.1.1"; sha256="014kih33y8b9nls0pcigw68jbz7vgnq8w1xbwm2d37g1m5y6xlyw"; depends=[]; }; @@ -2478,7 +2508,6 @@ in with self; { LDAvis = derive2 { name="LDAvis"; version="0.3.2"; sha256="1y9wd379rfv3rd3f65ll21nvh6i8yafvv11f8gw8nn06194dgfzg"; depends=[proxy RJSONIO]; }; LDLcalc = derive2 { name="LDLcalc"; version="1.1"; sha256="1vxf6280kjy144mqxyrhvxa9hr3jg8qvyd9dff5haa604sr2s778"; depends=[caret caretEnsemble corrplot Cubist data_table earth gbm glmnet kernlab lares lattice randomForest RColorBrewer resample]; }; LDNN = derive2 { name="LDNN"; version="1.10"; sha256="092mnjdmc0l471vd8nym09r9sfx1scp4x6nh22mj6413vaicagq0"; depends=[devtools keras reticulate tensorflow]; }; - LDOD = derive2 { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rmpfr Rsolnp]; }; LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; }; LDRTools = derive2 { name="LDRTools"; version="0.2-1"; sha256="05srfyplsypi3whfa71lx7pnad23irpf0p7rxmrpv28jgdmrz6wf"; depends=[]; }; LDcorSV = derive2 { name="LDcorSV"; version="1.3.3"; sha256="0wr8i9q9p48vpcia8v3rd8bb2pfijr9r6kg9x26k4wncpg7n83cp"; depends=[]; }; @@ -2487,7 +2516,7 @@ in with self; { LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; }; LEAP = derive2 { name="LEAP"; version="0.2"; sha256="1yrhanxvr7krvllqzv17qkc4wvmd7mgl57am8sn53773dbfipfc4"; depends=[]; }; LEAPFrOG = derive2 { name="LEAPFrOG"; version="1.0.7"; sha256="0z9ahkk4qzc45h1r806frv9cd84vvshvn5mr84gx7qdxljfkfq6h"; depends=[alabama MASS]; }; - LEGIT = derive2 { name="LEGIT"; version="1.3.1"; sha256="19wkqj7wj8lpni2i2bbfa8l77xb0wbb121fb82srsi6hn76i392g"; depends=[boot doSNOW foreach formula_tools glmnet Hmisc iterators pROC RColorBrewer snow]; }; + 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"; sha256="0jyzn5k1h629ybx8f09vsnvdmc2qbigaqy6rrcica2sh5if2b4w4"; depends=[DT EBImage fs ggplot2 mgcv shiny shinyFiles shinyjs shinyMobile shinythemes]; }; LFDR_MLE = derive2 { name="LFDR.MLE"; version="1.0.1"; sha256="0ykcd24w71zxb53nch041g7xh83gmg1ia3sysdpn0yzkhm0w7cdl"; depends=[]; }; LFDR_MME = derive2 { name="LFDR.MME"; version="1.0"; sha256="1ln0s3ki37cz1a7r96xn0zqw42im7fcanmz2vjk5zycshb423y22"; depends=[]; }; @@ -2498,24 +2527,24 @@ in with self; { LIC = derive2 { name="LIC"; version="0.0.1"; sha256="1fmd3sjzzkcpbin9ak72yvv4ibrrwhzqxymmpsppqfv1syk6h6s4"; depends=[]; }; LICORS = derive2 { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[fields FNN locfit Matrix mvtnorm RColorBrewer zoo]; }; LIHKGr = derive2 { name="LIHKGr"; version="0.1.0"; sha256="16yyalsdbaxncgfabsz2q2fixzmwyd62gvnvnxazf4vlypp6xlqz"; depends=[dplyr magrittr purrr R6 raster RSelenium rvest tibble xml2]; }; - LIHNPSD = derive2 { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[BB Bolstad2 moments optimx Rmpfr sn]; }; LIM = derive2 { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[diagram limSolve]; }; LINselect = derive2 { name="LINselect"; version="1.1.3"; sha256="1qxqwph5ja2kf1s4ggsv8w6hjgf9mr53a0gahhjix2v78309z42g"; depends=[elasticnet gtools MASS mvtnorm pls randomForest]; }; LIStest = derive2 { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; }; - LKT = derive2 { name="LKT"; version="1.0.1"; sha256="1a3mpjzl04gp7688gaknp8la84ljsj49id06b5y6r51kyiqip6dv"; depends=[data_table glmnet glmnetUtils LiblineaR lme4 Matrix SparseM]; }; + LKT = derive2 { name="LKT"; version="1.1.0"; sha256="18dphv8rgdf3plci4i57hdryra43mvaifr4xh88ckddza42a3af7"; depends=[data_table glmnet glmnetUtils LiblineaR lme4 Matrix SparseM]; }; LLM = derive2 { name="LLM"; version="1.1.0"; sha256="0kxppzaim7cmjawg5rjih4dsz8adq0asairgq3vx5lyjppb2cybx"; depends=[partykit reghelper RWeka scales stringr survey]; }; LLSR = derive2 { name="LLSR"; version="0.0.3.1"; sha256="0nci8p3gw35a3ifwrq7r2jih718p2iwmmh3495qnh0fk304y7kbi"; depends=[crayon digest dplyr ggplot2 minpack_lm nleqslv openxlsx rootSolve svDialogs svglite]; }; LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="3.0"; sha256="0jg889qh5a9wdi01yiw6z7kivs9dzh5dcq39f4zifdpqzglhshzb"; depends=[fields LCFdata lme4 Matrix mgcv]; }; LMMELSM = derive2 { name="LMMELSM"; version="0.1.0"; sha256="1wrda19629k7fg3rryk9sf16h1w5915cifv7iiqqg64k8w1vwnaj"; depends=[BH Formula loo MASS nlme Rcpp RcppEigen rstan rstantools StanHeaders]; }; LMMsolver = derive2 { name="LMMsolver"; version="1.0.0"; sha256="0ri89i5q3026ambm1zk24adi0jf22wb9assklwsqzz2kmh54k282"; depends=[agridat ggplot2 maps Matrix Rcpp sp spam]; }; - LMMstar = derive2 { name="LMMstar"; version="0.4.4"; sha256="0fjw0q65xid0389in4jiha6m4n720444cm7plc0l59rcp65n8xwg"; depends=[emmeans ggplot2 lava Matrix multcomp nlme numDeriv reshape2 sandwich]; }; + LMMstar = derive2 { name="LMMstar"; version="0.5.2"; sha256="0s5j6lwyh8wswkkgi3d2j0cb3md5x2xk086hr3hjhimbazcr46xr"; depends=[emmeans ggplot2 lava Matrix multcomp nlme numDeriv reshape2 sandwich]; }; + LMN = derive2 { name="LMN"; version="1.1.2"; sha256="17xsf61dnpvbhxwbgqjj9k26xwd9s90vfzv2ymj1i2g5zdd6w9k7"; depends=[Rcpp RcppEigen SuperGauss]; }; LMest = derive2 { name="LMest"; version="3.0.2"; sha256="0x80cgd54qw1l4wayxwyyccmajn5i227727wlsgm6s4chnpvispz"; depends=[diagram Formula MASS mclust mix MultiLCIRT mvtnorm scatterplot3d]; }; LMfilteR = derive2 { name="LMfilteR"; version="0.1.3"; sha256="0c27154jghfl83n3sn26pr8mjcybrq02glvnjcx8hllrmz4gmnmi"; 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]; }; LOGAN = derive2 { name="LOGAN"; version="1.0.0"; sha256="00y8kcykw01gv2g20vmpwkc3qqyafwbiw5pa731xlfnh1b8sn0hi"; depends=[dplyr foreign ggplot2 magrittr modules pander psych rlang stringr]; }; LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; - LOMAR = derive2 { name="LOMAR"; version="0.1.0"; sha256="1rd3xnidhk6a3yawlk8ilr8v1a8ghsj3sxx5mp2x47dc8k4bj4da"; depends=[aws data_table dbscan doParallel EBImage ff foreach pracma proxy RANN reshape2 TDA transport]; }; + LOMAR = derive2 { name="LOMAR"; version="0.2.0"; sha256="1wfkair4zzd58s36mc9gyk7d24cp6y2lrg7qsg0acx3b00wzdjwq"; depends=[aws BH data_table dbscan doParallel EBImage ff FNN foreach pracma proxy RANN Rcpp reshape2 transport]; }; LOPART = derive2 { name="LOPART"; version="2020.6.29"; sha256="1zxaag5pj3l9rzxhlrkx8q4adlap7wsdysb4y6ijvsmxvv63j22k"; depends=[data_table Rcpp]; }; 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]; }; @@ -2533,6 +2562,7 @@ in with self; { LPower = derive2 { name="LPower"; version="0.1.1"; sha256="00sabp2snfm0175c0cfyv83yd1zb3b8h2wrr7yxgkmr4i3py1fn7"; depends=[MASS nlme]; }; LPsmooth = derive2 { name="LPsmooth"; version="0.1.3"; sha256="0fvn6vwfl37xhzzj44vadk8fr3d85zv58jjg7qfdjqvyw8khd59p"; depends=[Hmisc LPBkg LPGraph nloptr orthopolynom polynom truncnorm]; }; 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=[]; }; LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; }; @@ -2542,8 +2572,9 @@ in with self; { LSAmitR = derive2 { name="LSAmitR"; version="1.0-2"; sha256="15qyij193scrvc1ghcssr6qdzxc4l4qh199s09bz5hvr62zwfdgb"; depends=[Hmisc lme4]; }; LSC = derive2 { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[fields gam LICORS Matrix RColorBrewer]; }; LSD = derive2 { name="LSD"; version="4.1-0"; sha256="17pbdlcbhzf3v7l42mjikln1ga5xjp5r78gjg6a88iahk0lwwlvm"; depends=[]; }; - LSDinterface = derive2 { name="LSDinterface"; version="1.1.0"; sha256="0mr4d7l7hvn4m2ny8zz6ffyxxmlgqjg5v7pc83q4gq1fzvxs2bhy"; depends=[abind boot]; }; - LSDsensitivity = derive2 { name="LSDsensitivity"; version="1.1.2"; sha256="10654gc46szavgw2nzg3s6bid57jgd291qbb6xl0wprzwsg006j5"; depends=[abind car DiceKriging diptest kSamples lawstat LSDinterface randtoolbox rgenoud sensitivity tseries]; }; + LSDinterface = derive2 { name="LSDinterface"; version="1.2.0"; sha256="00adw2cdfcfnp2f3i31fcm531iw9ik9csfhygd2171a32rdkj752"; depends=[abind boot TSdist]; }; + LSDsensitivity = derive2 { name="LSDsensitivity"; version="1.2.0"; sha256="0fi3k5j3si85p95b40jp6fqfsy7qay0xf3sjq6a0pf4j7j59agb3"; depends=[abind car DiceKriging diptest kSamples lawstat LSDinterface randtoolbox rgenoud sensitivity tseries]; }; + LSE = derive2 { name="LSE"; version="1.0.0"; sha256="01qj0zasv7dbwg0qxryz1d5jp4rapvnm9i6a4jd7c4pxqdm11j7y"; depends=[MASS pracma]; }; LSMRealOptions = derive2 { name="LSMRealOptions"; version="0.2.1"; sha256="0paa5yahpyr8jpgy8aqk2fcixdny6ip09vqm8varvpiqfxrjd6ww"; depends=[]; }; LSMonteCarlo = derive2 { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[fBasics mvtnorm]; }; LSPFP = derive2 { name="LSPFP"; version="1.0.3"; sha256="0wxqpwfyyhk9dig9ji5na7czk19jx14lr9iqb2rllggz4cji9y65"; depends=[bit64 data_table R_utils RCurl seqinr]; }; @@ -2551,11 +2582,12 @@ in with self; { LST = derive2 { name="LST"; version="1.1.0"; sha256="0vmdd4mvpm1mkb2qffkjpzwsg7xiw8sr2q4a69694bsy59vk43cd"; depends=[raster]; }; LSTS = derive2 { name="LSTS"; version="2.1"; sha256="0pxcw5awm6fr6v1n8gd7yap0y1mba9khwgq27qlv9h2kmrzbr3hp"; depends=[ggplot2 patchwork Rdpack scales]; }; LSVAR = derive2 { name="LSVAR"; version="1.2"; sha256="0lhx9a5l3s2c5isd3fhvxxfdazdxddpkg07hk4rckvhmxln7j1dj"; depends=[igraph mvtnorm pracma]; }; - LSX = derive2 { name="LSX"; version="1.0.2"; sha256="16dmi4nl4mxx37bb0cp5bpx2817smhq4vxh3bsz4p3am1jfrhzak"; depends=[digest ggplot2 ggrepel irlba locfit Matrix proxyC quanteda quanteda_textstats reshape2 rsparse RSpectra rsvd stringi]; }; + LSWPlib = derive2 { name="LSWPlib"; version="0.1.0"; sha256="1z4lcpmbm3wdzbi04flvspkimk4jfhjqi5pd0ab4pbb0ii1z26hs"; depends=[waveslim wavethresh]; }; + LSX = derive2 { name="LSX"; version="1.1.1"; sha256="0dmxxqy0yjyif3w3dxfxyfkmnyvxfrjgr4mvy41cw5smkrhh7b49"; depends=[digest ggplot2 ggrepel irlba locfit Matrix proxyC quanteda quanteda_textstats reshape2 rsparse RSpectra rsvd stringi]; }; LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; }; LTRCforests = derive2 { name="LTRCforests"; version="0.5.5"; sha256="0f0am4wydk4wqiwjzxj2ibdkp5sd47qam4218nn0489knkvas3s7"; 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.1.0"; sha256="133cxmvsxm26jmx65snfswqf69ch10bnfbninkks80h2c1y46kq6"; depends=[boot glasso glmnet lbfgs mclust networkD3 nnet]; }; + LUCIDus = derive2 { name="LUCIDus"; version="2.1.4"; sha256="1df3k5jl57l07f13k854izmxf1vnml54lx1d3zrz3gqvhhzrpl40"; depends=[boot glasso glmnet jsonlite mclust networkD3 nnet]; }; 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.4.5"; sha256="1mqxay678baxqkmbcknn5bq3bw6fk9nr04ljsbh13wqxz27iw5bj"; depends=[data_table doFuture foreach future iterators progressr vegperiod]; }; @@ -2569,7 +2601,8 @@ in with self; { Lahman = derive2 { name="Lahman"; version="9.0-0"; sha256="0q6whyqlxdkm17i6hichnd89y3pnjc0xc5aabdanf1i4lpv5vynr"; depends=[dplyr]; }; LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.5.0"; sha256="06mvdrdyl0rh9rwd0jxww0sycadcp7cj08hq35q6vyzq0jkxn2xf"; depends=[plyr rLakeAnalyzer]; }; Lambda4 = derive2 { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; }; - LambertW = derive2 { name="LambertW"; version="0.6.6"; sha256="02pi98nnscaz044jkh2nrxxdyafdbiy9x0szdfkx894s3bwrf29i"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; }; + LambertW = derive2 { name="LambertW"; version="0.6.7"; sha256="15ad642cldn2dy6c1dcsyngv94901imi76v6yi50nr1qqad0jilq"; 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]; }; LaplacesDemon = derive2 { name="LaplacesDemon"; version="16.1.6"; sha256="1dsfp65cg06f25zjzd5ib4qyn1alfhbhpgyvpcw5n6bszn13idap"; depends=[]; }; @@ -2588,6 +2621,7 @@ in with self; { LearnBayes = derive2 { name="LearnBayes"; version="2.15.1"; sha256="0ch54v2zz2yyyk0lvn5rfikdmyz1qh9j1wk3585wl8v58mc0h4cv"; depends=[]; }; 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.1.1"; sha256="0crsgpzha1pqg0iqwqp4bqsbl6cg3x8qqkg1qkdyzkl19f3mdgnq"; depends=[]; }; LearningRlab = derive2 { name="LearningRlab"; version="2.2"; sha256="15lkcrdfdrip1s4rpsn6kshjzsg1hfryh6lgbiqw9x2h0xvfj4da"; 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=[]; }; @@ -2600,7 +2634,7 @@ in with self; { LifeInsuranceContracts = derive2 { name="LifeInsuranceContracts"; version="0.0.3"; sha256="0qdwz7fm5y3nvmqnw20jghzi0qm9bx52rnk4di74j60x2y13wf4m"; depends=[abind dplyr kableExtra lubridate MortalityTables objectProperties openxlsx pander R6 rlang scales stringr tidyr]; }; LifeTables = derive2 { name="LifeTables"; version="1.0"; sha256="1dyivvi5cjsnbhncj3arkrndadg7v81nzdf6p6mpgqwqvwn5li8x"; depends=[mclust]; }; LightningR = derive2 { name="LightningR"; version="1.0.2"; sha256="1va673aw2hgir8ybbjad6dhbs8izs1z4jcikwa7qp3mkv0zqd0vq"; depends=[httr R6 RCurl RJSONIO]; }; - LilRhino = derive2 { name="LilRhino"; version="1.2.0"; sha256="1d1mg77k67b5ddlp41haygagash48b6jy30q20lb231lbiss9ncp"; depends=[beepr data_table dplyr e1071 fastmatch FNN ggplot2 keras neuralnet readr SnowballC stringi textclean tm]; }; + LilRhino = derive2 { name="LilRhino"; version="1.2.1"; sha256="1ml0b2d5agjjvn0wk7j1bjh4bazp1qh2x8zccdvk19q4cf28v4qm"; depends=[beepr data_table dplyr e1071 fastmatch FNN ggplot2 keras neuralnet readr SnowballC stringi textclean tm]; }; LimnoPalettes = derive2 { name="LimnoPalettes"; version="0.1.0"; sha256="0qzcx182nn5ygqlsqmxl1r4r0gg89q0qqgk6hk5lvgb5ghf91z3y"; depends=[]; }; LinCal = derive2 { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; }; LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-3"; sha256="1rkxvkv3ls0cgqcvs74dy6qabh62cjc0xh89dlk88bpc8mz76k8z"; depends=[rpanel xtable]; }; @@ -2612,7 +2646,7 @@ in with self; { LinkageMapView = derive2 { name="LinkageMapView"; version="2.1.2"; sha256="101g4djzkxgxbn87an2vz4s9nwn8gwz7a3p3wg0y4zpdd1pdp716"; depends=[plotrix qtl RColorBrewer]; }; LinkedGASP = derive2 { name="LinkedGASP"; version="1.0"; sha256="1win1yd8y677rmic531dyd29f49p7pr1r3kbjysvv9syi5nkydyj"; depends=[nloptr spBayes]; }; LinkedMatrix = derive2 { name="LinkedMatrix"; version="1.4.0"; sha256="0p6qjnrljxnj3c5nynmx563vcqhxj4jf7czqdg750h38gjy8qzxi"; depends=[crochet]; }; - LipidMS = derive2 { name="LipidMS"; version="3.0.1"; sha256="1cphi3qflalszyyi9sah05gbvapir44yg0iqhhrwx170khywmskl"; depends=[CHNOSZ doParallel foreach iterators readMzXmlData scales shiny shinythemes]; }; + LipidMS = derive2 { name="LipidMS"; version="3.0.3"; sha256="0i7b9lw40i6hrbzzqs9jncw9qx2hm8z7xc4jnn3nyjlw2qps5asg"; depends=[CHNOSZ doParallel foreach iterators readMzXmlData scales shiny shinythemes]; }; Lmoments = derive2 { name="Lmoments"; version="1.3-1"; sha256="0pc63bj9a8hzr5m3yssrc4kin39fffwkl8rggs3sagzr12d4i7bw"; depends=[Rcpp RcppArmadillo]; }; LncFinder = derive2 { name="LncFinder"; version="1.1.5"; sha256="0mb41fjph4svn2amdx6fb2j8pzgll17c0xxwnsan9vjipnmj59hi"; depends=[caret e1071 seqinr]; }; LncPath = derive2 { name="LncPath"; version="1.1"; sha256="1cpsy681yq96867nr9g75xb0dilb016shqlhxpdn5xyiakrgjl4v"; depends=[igraph]; }; @@ -2621,13 +2655,14 @@ in with self; { LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.3.3"; sha256="05vggk5d0w3f9w5217c9hzy5jhwv24p2g8pcj0l6zxkhic01nbrl"; 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-4"; sha256="0lfpsm9iqjl8hmagbd26ks7pwngn5z57s6iiy2l6n8xbnvaax2x8"; depends=[MASS mclust mvtnorm]; }; - LogRegEquiv = derive2 { name="LogRegEquiv"; version="0.1.2"; sha256="158glnha6vl8kc2g6rg8m8xi400pyqgrh2scmb3bsxbbbqd5z1p8"; depends=[]; }; + LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-5"; sha256="0pwq1bdmn040bkwal7xsmjv2asvpyshipbglqb16h2z7yq0vwmv7"; depends=[MASS mclust mvtnorm]; }; + LogRegEquiv = derive2 { name="LogRegEquiv"; version="0.1.5"; sha256="1j23w3fmd2swk2mzbmsq7hy878cm7cs1li65srjc9m79az9vgr3h"; depends=[]; }; LogicReg = derive2 { name="LogicReg"; version="1.6.4"; sha256="0517rp55c1h8hwrz3dmnkdc6wzs6ialzdpw50icadcg9q8d0h9i0"; depends=[survival]; }; LogisticDx = derive2 { name="LogisticDx"; version="0.3"; sha256="1hry32grqwlarp0cplx8szf4pf7ml1nxd11ahffmr72ihcv5ckga"; depends=[aod data_table pROC RColorBrewer rms speedglm statmod]; }; - LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; }; + LogisticRCI = derive2 { name="LogisticRCI"; version="1.1"; sha256="158rl8jjmmhnja287i29rjiq309niwbvxmzx4f9lkl83nxn4mzf7"; depends=[]; }; LogrankA = derive2 { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; }; LongCART = derive2 { name="LongCART"; version="3.1"; sha256="0f6kzlswxb1jb8hg4c3966ihwcqbkd5mkfqjjkzviq8idpyhsk4x"; depends=[Formula magic nlme rpart survival survminer]; }; + LongDat = derive2 { name="LongDat"; version="1.0.3"; sha256="05mb6nszh7dl81n9rps1bvslsc4hf9cq1mfnigkkkfv6z4pg4rf1"; depends=[bestNormalize car dplyr effsize emmeans ggplot2 glmmTMB lme4 magrittr MASS patchwork reshape2 rlang rstatix stringr tibble tidyr]; }; LongMemoryTS = derive2 { name="LongMemoryTS"; version="0.1.0"; sha256="0n378sad8i283vs7q63spdhwpwjly2d5zj15d4v2085j7sc7z8vi"; depends=[fracdiff longmemo mvtnorm partitions Rcpp RcppArmadillo]; }; LongituRF = derive2 { name="LongituRF"; version="0.9"; sha256="0h70g0qhv0rgz40i58ykrcak1wibbvya7fql0v79xkd21217y1av"; depends=[latex2exp mvtnorm randomForest rpart]; }; LoopAnalyst = derive2 { name="LoopAnalyst"; version="1.2-6"; sha256="1gy9v6qiwkwbwp4snif2imf6zn50ffjrig54ln57c5v5pk3phnvv"; depends=[nlme]; }; @@ -2637,7 +2672,7 @@ in with self; { LowRankQP = derive2 { name="LowRankQP"; version="1.0.4"; sha256="0cg8f42s15vphnifw6gnrhxaj6j5hmgbq8xki5mkwjsizd0ch5na"; depends=[]; }; LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; }; LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; }; - Luminescence = derive2 { name="Luminescence"; version="0.9.17"; sha256="078jdq0f0kihadjgggqlzq3pdgkbaajjn4d3ffnl2iiwbw9rx6ms"; depends=[bbmle data_table DEoptim httr lamW matrixStats mclust minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; }; + Luminescence = derive2 { name="Luminescence"; version="0.9.18"; sha256="1jv6pdc1i8vwnbq17qvyj0rvjlyr5xdgbgx5z4cib32z2v1xygw6"; 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]; }; M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; }; @@ -2645,24 +2680,25 @@ in with self; { MABOUST = derive2 { name="MABOUST"; version="1.0.1"; sha256="044k29nibl5zc32zz2696kbhrz5dafgaikgmjqznsq25p48si453"; depends=[Rcpp RcppArmadillo]; }; MACER = derive2 { name="MACER"; version="0.1.1"; sha256="006f15s75hnyacc31ni4gf1r4j32hlv5bqmnnl9fkcgf9jxs9hw4"; depends=[ape httr rentrez]; }; MADPop = derive2 { name="MADPop"; version="1.1.2"; sha256="0hwnkjrc3w9x3gha0y70fidfc587b6gfdhzwzdzrfvxrhsdy05yd"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; }; - MAGEE = derive2 { name="MAGEE"; version="1.0.1"; sha256="09csg35kmq8i5hg8vpnjsss1h007kznkysb38jkhzcps5j9hxccx"; depends=[CompQuadForm foreach GMMAT MASS Matrix Rcpp RcppArmadillo SeqArray SeqVarTools]; }; + MAFDash = derive2 { name="MAFDash"; version="0.2.0"; sha256="0hb5dqjncb5if15l9215v0p5rkywg7vld1gdbjhgj8xjqjg9mhki"; depends=[bsplus canvasXpress circlize ComplexHeatmap crosstalk data_table dplyr DT ensurer flexdashboard GenomicRanges ggbeeswarm ggplot2 htmltools IRanges knitr maftools pheatmap plotly readr reshape2 rmarkdown TCGAbiolinks tibble tidyr]; }; + MAGEE = derive2 { name="MAGEE"; version="1.0.2"; sha256="1kmh7hdgk7p5blh9kfid7h3iaa5cjl1m0kfky8fjfnnjsid2f4b7"; depends=[CompQuadForm foreach GMMAT MASS Matrix Rcpp RcppArmadillo SeqArray SeqVarTools]; }; 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.6.2"; sha256="0c2llzjhrv1jn5zna654bjgyq5q0hqwzfv9kda9mfjf20pfc34my"; depends=[GGally ggplot2 MASS mclust miscTools pcaPP Rcpp RcppArmadillo robustbase rrcov sn withr]; }; + MAKL = derive2 { name="MAKL"; version="1.0.0"; sha256="0x0b7jpx3hiipmy7jgh8dnz1rnbh512g81fv62049c8v6wg47pd7"; depends=[AUC grplasso]; }; MALDIquant = derive2 { name="MALDIquant"; version="1.21"; sha256="1y1g3819ss06dry70kfhg2syddw71682qmzkcyppfsma6hhghw87"; depends=[]; }; - MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.12"; sha256="1r37x1hnhq246dazc76d17jfjc57khxayswbzvc4md39z8dnbihx"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; }; - MALDIrppa = derive2 { name="MALDIrppa"; version="1.0.5-1"; sha256="0wchd0g5bl4hd1y8a6ic13n35l9b68rlzx8sa745grj3bnb2a955"; depends=[lattice MALDIquant robustbase signal]; }; - MAMS = derive2 { name="MAMS"; version="1.4.2"; sha256="026np007p4n70dgwgr4ighkcdbyhsisfczxba90vm8hggh5qr2v1"; depends=[mvtnorm]; }; + MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.13"; sha256="0xxdvfg9h6vl2g2wlxfmrskn8576rd958mn5jblryyqg9xbanlhr"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; }; + MALDIrppa = derive2 { name="MALDIrppa"; version="1.1.0"; sha256="0463wm7y4xj15f8601ng744gzsn3bj4iczv8bsjyx0asbsxha9fx"; depends=[lattice MALDIquant robustbase signal waveslim]; }; + MAMS = derive2 { name="MAMS"; version="2.0.0"; sha256="05pnrxziwsgnhy05fac8smxcm65zxi2dl7lar2jakiamd2hxv3c2"; depends=[future future_apply mvtnorm]; }; MANCIE = derive2 { name="MANCIE"; version="1.4"; sha256="0940xl3z5bca6hcnj2bj341l79wajilxlxzmyz3dlgrz0b3bbdmm"; depends=[]; }; - MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.5.2"; sha256="02wf071xl3bk5550qwzk8bpv8zaphrpdx52xkhw36np6j5qgp779"; depends=[data_table ellipse magic MASS Matrix multcomp plotrix plyr]; }; + MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.5.3"; sha256="0gdyd7avdc7jh1hp03wlbqi5krijxrgargkivq97qyk83zf387dx"; 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.4"; sha256="02s223s58k2jk49m0xlz3q9m3nip3h4dl4v58j18z2vgi54dwnjr"; depends=[forecast RColorBrewer smooth]; }; MAPITR = derive2 { name="MAPITR"; version="1.1.2"; sha256="0vmsdspja4qfs2z14p835g78zggk8h54v25cn268z1hg2p6zxish"; depends=[CompQuadForm doParallel Rcpp RcppArmadillo]; }; - MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; }; MARSANNhybrid = derive2 { name="MARSANNhybrid"; version="0.1.0"; sha256="1xs0gjdjl9c5i1i8ds9s3sq0764267h6gngkbwimfa8miq287idm"; depends=[earth neuralnet]; }; MARSS = derive2 { name="MARSS"; version="3.11.4"; sha256="10mf1vs51yqqg6s2435j84xbaxvr6wdraha07mqlr2rmprgl5a0r"; depends=[KFAS mvtnorm nlme]; }; MARSSVRhybrid = derive2 { name="MARSSVRhybrid"; version="0.1.0"; sha256="10b8d75q5hiqf8id1qsvjx379xyx4vphq5r1iwvykjaw4zxbyx65"; depends=[e1071 earth]; }; MARX = derive2 { name="MARX"; version="0.2"; sha256="1rc87hz719khl8mclbkfdix499nsc4nyihaaavd73nany7iprm02"; depends=[fBasics matlab metRology stabledist tseries]; }; - MASS = derive2 { name="MASS"; version="7.3-54"; sha256="08g8ashbcas3ac98kxvchbwc8da9dq9anpngb4arnw62npawq05q"; depends=[]; }; + MASS = derive2 { name="MASS"; version="7.3-55"; sha256="191i1iylvh2w2hi99fnm06731lma7z5snpjknfff1m9ziyy9qab5"; depends=[]; }; MASSExtra = derive2 { name="MASSExtra"; version="1.1.2"; sha256="0jzzm3ahn1iisdp632hcn8lnk6hhh699jqfj6v0164qxd6487xvs"; depends=[demoKde MASS]; }; MASSTIMATE = derive2 { name="MASSTIMATE"; version="2.0-1"; sha256="1dvidwjw4zgflms5njbd9n85g1gbgfg6hk0fb63q5n65iyxxfmyh"; depends=[]; }; MAT = derive2 { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; }; @@ -2670,7 +2706,6 @@ in with self; { MATTOOLS = derive2 { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; }; MAVE = derive2 { name="MAVE"; version="1.3.11"; sha256="01n204bxabbm8pcpayy2s0jvhg73r5cv0026lb3vbk0m40z02kcz"; depends=[mda Rcpp RcppArmadillo]; }; MAVTgsa = derive2 { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach MASS multcomp randomForest]; }; - MAc = derive2 { name="MAc"; version="1.1.1"; sha256="1dawqmziffaz8wgcqzwc0yifdq65abgn24vafkrwa9850048c26f"; depends=[]; }; MAclinical = derive2 { name="MAclinical"; version="1.0-5"; sha256="1g0ka1kqww2xim8rp5rznkzn0a541zvf841s3lbphfh9k3y3ixs3"; depends=[e1071 party plsgenomics st]; }; MAd = derive2 { name="MAd"; version="0.8-2.1"; sha256="096vdhfsp7bd3zvv6ydai6p230r16jx8zlqc4hlhnzma8rqypm35"; depends=[]; }; MAnorm2 = derive2 { name="MAnorm2"; version="1.2.0"; sha256="0g2njf2jfra1yd8i6bxivpp4jhqxkwn1hlhfg7n3ggzixmnbgai6"; depends=[locfit scales statmod]; }; @@ -2679,10 +2714,10 @@ in with self; { MBC = derive2 { name="MBC"; version="0.10-5"; sha256="0iks5nhk4im7l1dxgwcwi4mlnh271zfq9mrlaklpk38zakzyf2n4"; depends=[energy FNN Matrix]; }; MBCbook = derive2 { name="MBCbook"; version="0.1.1"; sha256="0jmvgyzrahnxfkwdn86k3ffk0zfbbd34ya4zmlnsmp2m9xds7lgn"; depends=[MASS mclust mvtnorm Rmixmod]; }; MBCluster_Seq = derive2 { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; }; - MBESS = derive2 { name="MBESS"; version="4.8.1"; sha256="09r9rkyprajrq30v671xsf1q5nmy2fijw19dd73rpnfmdg3nqiyf"; depends=[boot lavaan MASS mnormt nlme OpenMx sem semTools]; }; - MBHdesign = derive2 { name="MBHdesign"; version="2.1.11"; sha256="0qybdkzmgfpsrqpmxa91kbq2cxhalj3vfvxjj31lic6kk56dllj4"; depends=[class geometry mgcv mvtnorm randtoolbox]; }; + MBESS = derive2 { name="MBESS"; version="4.9.0"; sha256="0qmyvjx2zn5hlzdbz8c94g8l4707swhn7sq9mxkdqiydmflzv0b5"; 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]; }; MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; }; - MBNMAdose = derive2 { name="MBNMAdose"; version="0.3.0"; sha256="12ij19828nd1r0x1vp7clkwr0zfksk3f755xghzylz0ryjjb716d"; depends=[checkmate dplyr formatR igraph magrittr R2jags Rdpack reshape2 rgeos rjags scales utf8]; }; + MBNMAdose = derive2 { name="MBNMAdose"; version="0.4.1"; sha256="1825vqdwzachig7fg3s8gq64m1gdh9gjccv5y9r0qh9x5015s0f1"; depends=[checkmate dplyr igraph magrittr R2jags Rdpack reshape2 rgeos rjags scales]; }; MBNMAtime = derive2 { name="MBNMAtime"; version="0.2.1"; sha256="1qm8g9hljl3qsnh434dzg2y0iyq635ym1ygfzr0q8l6h76qr7p1j"; depends=[checkmate dplyr 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="1.0"; sha256="0mds6jfqgmnm4saqqqqqfcg8zh4qsvd2503g3ij1sn70f0aakwaj"; depends=[coda GIGrvg MASS Matrix MCMCpack]; }; @@ -2695,16 +2730,16 @@ in with self; { MCI = derive2 { name="MCI"; version="1.3.3"; sha256="1wn8lcr5sq3697nsmly6syb9jv7p99ks0fy933ff5rx54x3rf9hz"; depends=[]; }; MCID = derive2 { name="MCID"; version="0.1.0"; sha256="034r4qxbqnl9hhkpv9r79p26lzj5qh0379ya43ynyvbbi8b8z3rl"; depends=[]; }; MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; }; - MCM = derive2 { name="MCM"; version="0.1.4"; sha256="0m5gc8qbdf04nkhkx5k3wzz2c32g7pzwi8x7jlrf55cb1nyfgrnv"; depends=[dplyr gee lme4 parameters stringr survey]; }; + MCM = derive2 { name="MCM"; version="0.1.5"; sha256="1yi0p766vky1b7xyn47v5a7dd4dnmrhr9rbsnsrsyf0sym0q8bdr"; depends=[dplyr gee lme4 parameters stringr survey]; }; MCMC_OTU = derive2 { name="MCMC.OTU"; version="1.0.10"; sha256="15k3y4bm4cxjb6r30afpw9gksflsxigzb17zwm1ipygq0d0h0zkg"; depends=[coda ggplot2 MCMCglmm]; }; MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.4"; sha256="0v0d43wnq3swbrcsbg9qmwkmk4s50grd6cik4ng5baj2i6i4hd2n"; depends=[coda ggplot2 MCMCglmm]; }; MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.1"; sha256="06p6xdbja7vrdq4vnhybpkmyf4rkaihcmy9sc81sb0h2wa21vcq0"; depends=[evir]; }; - MCMCglmm = derive2 { name="MCMCglmm"; version="2.32"; sha256="1czhsgb5pc2xxkkinf03z60c8qfwcn3xqxll4cpjz48g1lg6w5d9"; depends=[ape coda corpcor cubature Matrix tensorA]; }; + MCMCglmm = derive2 { name="MCMCglmm"; version="2.33"; sha256="1z6l2lbirjrdvvkd6yp55p6gjlc0bcz79k2yl2i5zvgqk7kp4vdm"; depends=[ape coda corpcor cubature Matrix tensorA]; }; MCMChybridGP = derive2 { name="MCMChybridGP"; version="5.4"; sha256="19nbch76g7jf53nrb1lyzr3zd0z6rpz2k86mq1r9aidwwxh81g7p"; depends=[MASS]; }; - MCMCpack = derive2 { name="MCMCpack"; version="1.6-0"; sha256="16zjx8yz29ii75wfxj3p562l657bng8jnwzp2b54s7fiaws4kfdm"; depends=[coda lattice MASS mcmc quantreg]; }; + MCMCpack = derive2 { name="MCMCpack"; version="1.6-1"; sha256="1skanp6czfk83s13dnjrb699m9z6a0r59q0f79fv0k560jc8vbrj"; 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.15.3"; sha256="0519pm6khya2jxkqbyiv6h17m0ijczivq7sfn3i8jmgvz4r7zqmr"; depends=[coda overlapping rlang rstan]; }; + MCMCvis = derive2 { name="MCMCvis"; version="0.15.5"; sha256="1sh8znwk2s6gx7q6h1ps5yid24ywj2fpng0c7nckrfkywb5h5j14"; 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]; }; MCPModGeneral = derive2 { name="MCPModGeneral"; version="0.1-1"; sha256="0izhbiivlb818ak49hl1f7li1chlyrxk5f80cmw4zkim3l6ddaxq"; depends=[DoseFinding MASS]; }; @@ -2732,6 +2767,7 @@ in with self; { 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.1"; sha256="0kzqx6m0vyq5g3ngah58mryvqdcxvlk3iqp4v4m2dq172dm47ig0"; depends=[doParallel foreach ggpubr missForest progress]; }; MESS = derive2 { name="MESS"; version="0.5.7"; sha256="0c3fs07szzr023pw92drd3a85vqp0ydfh30x235f0cssny1kxlj8"; depends=[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]; }; @@ -2739,8 +2775,9 @@ in with self; { MFAg = derive2 { name="MFAg"; version="1.8"; sha256="1kkcx6290ffk8g3amakaa5z5hz07z9iiqp2jxvma4pk85w6qay83"; depends=[]; }; MFDFA = derive2 { name="MFDFA"; version="1.1"; sha256="0nr78p6y4jpg1hrl0h7b7hyvwbr61paf85y3f2dx815x5hscmdhy"; depends=[numbers]; }; MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; }; + 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-9"; sha256="1cajh9aiirngc8p68kfll17mf2a874pk55cjrmxzr1l8p3ipd7s5"; depends=[abind foreach funData irlba Matrix mgcv plyr]; }; - MFSIS = derive2 { name="MFSIS"; version="0.1.1"; sha256="0yx6bc154yb11i7cs5jzcr3bw82qkv9ws5lnak7k37bpzaajiglr"; depends=[Ball cli crayon dr fs MASS pkgdown reticulate survival]; }; + MFSIS = derive2 { name="MFSIS"; version="0.1.2"; sha256="0s4rswhc5aigp7f0yq91f131ghx2jjsmxikp9i2ycqg8bcza17nv"; depends=[Ball cli crayon doParallel dr foreach fs MASS reticulate survival]; }; MFT = derive2 { name="MFT"; version="2.0"; sha256="0n1xws3dw0650037qyqgp600p8cf098qa5hkbncdfdbl0w34qamy"; depends=[]; }; MGBT = derive2 { name="MGBT"; version="1.0.7"; sha256="0wrw5yjaw3sgsw0l8q5gq95i5q1wxwgcffkxkxaa1cygblrrz12y"; depends=[]; }; MGDrivE = derive2 { name="MGDrivE"; version="1.6.0"; sha256="0ynn7iwxi5yfpjyrvfr6ym4ns7h8qfy8c10clab7i72pv90jqqlr"; depends=[R6 Rcpp Rdpack]; }; @@ -2784,10 +2821,11 @@ in with self; { ML_MSBD = derive2 { name="ML.MSBD"; version="1.2.1"; sha256="1cpwq0vilbyz837d8k8pjipw3cwdsggbs88nwp827s4w2f1m7pap"; depends=[ape foreach]; }; ML2Pvae = derive2 { name="ML2Pvae"; version="1.0.0"; sha256="0laazb78qz6348kdyivb062nrmiz45imr3l3ck338a230avy4w4d"; 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.2"; sha256="14sd9ybwyilympnbyaqmwdrbip4vyn1p93rh9mlxls3bmk6nc4hv"; depends=[]; }; + MLCM = derive2 { name="MLCM"; version="0.4.3"; sha256="1sz5c3wxvnyxd3bf53i8x2jw591phx2np6c6bj4cqppb98ab83f3"; depends=[]; }; MLDAShiny = derive2 { name="MLDAShiny"; version="0.1.0"; sha256="14n8pffzw5y7lq3qx1xly4jwm05cyvs14gn838h6y9yssb16xnmr"; depends=[caret DiscriMiner dplyr e1071 klaR MASS rhandsontable rmarkdown shiny]; }; MLDAShiny2 = derive2 { name="MLDAShiny2"; version="0.1.0"; sha256="1mx8js54mrrf16jriy467dysxpkcsza9fvdmpdbmxr5m3y564sc7"; depends=[caret DiscriMiner dplyr e1071 klaR MASS rhandsontable rmarkdown shiny]; }; - MLDS = derive2 { name="MLDS"; version="0.4.7"; sha256="0j19zfjd74xxckv749wn2r536bq4h0sj1z51zqf4msxa728mzp9q"; depends=[MASS]; }; + MLDS = derive2 { name="MLDS"; version="0.4.901"; sha256="0zswlng1vksnx1m6ycna2hbqmzzcfpqz1wgy519fr0j87bqxks69"; depends=[MASS]; }; + MLDataR = derive2 { name="MLDataR"; version="0.1.3"; sha256="13jfq4i0dz9nwkzfkc6lx52cni23q4369lmca7vd0jfzffn4zzvv"; depends=[caret ConfusionTableR dplyr ggplot2 OddsPlotty parsnip ranger recipes rsample varhandle workflows]; }; MLEcens = derive2 { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; }; MLGL = derive2 { name="MLGL"; version="0.6.5"; sha256="1qrqw39hghdlbrs0dkv38awrgwdf8lj95rhb3hixcc6nfb2lkr8j"; depends=[FactoMineR fastcluster gglasso MASS Matrix parallelDist]; }; MLGdata = derive2 { name="MLGdata"; version="0.1.0"; sha256="0ysvrnx8m903h99wr40zgg1c6d26m9vsh62zjxh8mvndh69ikzid"; depends=[]; }; @@ -2795,9 +2833,8 @@ in with self; { 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.1.0"; sha256="1yq5ifp12k1pd59s5m1306934f4f2l9vlhqlfg22vcr7l9pqkw9s"; depends=[lme4 Matrix nlme]; }; MLPUGS = derive2 { name="MLPUGS"; version="0.2.0"; sha256="1yda37073g640g1qrkjrwa8hbyq6bjlcw3wpznx0bk5h0639bc0s"; depends=[]; }; - MLRShiny = derive2 { name="MLRShiny"; version="0.1.0"; sha256="06zcyz8l4754sjbcql3jd3nq1d2lgj92p5h2bh708z52mww71isw"; depends=[corrgram dplyr forecast psych QuantPsyc shiny shinyAce]; }; - MLRShiny2 = derive2 { name="MLRShiny2"; version="0.1.0"; sha256="1ygamp0ldz1i0w2xyi205rpd1gd5asw61l36z06j41ghdyiz1lww"; depends=[corrgram dplyr forecast psych QuantPsyc shiny shinyAce]; }; MLVSBM = derive2 { name="MLVSBM"; version="0.2.2"; sha256="0cxjk89i1pjq829168ad30dw73x65ywsc4d6vj6q6wlg746a1izf"; depends=[ape blockmodels cluster magrittr R6]; }; MLZ = derive2 { name="MLZ"; version="0.1.3"; sha256="0yj9241k3yk8qy6w2q26gwbj9b9qynv3s3jpyfxixvkc9kji3wc2"; depends=[dplyr ggplot2 gplots RcppEigen reshape2 TMB]; }; MLeval = derive2 { name="MLeval"; version="0.3"; sha256="1g2w5lrr7199n4zyaalbp9xdgl858hdg1pqr3rpd7v5fmamawc69"; depends=[ggplot2]; }; @@ -2845,7 +2882,7 @@ in with self; { MPN = derive2 { name="MPN"; version="0.3.0"; sha256="0rrigkq5bkarncswv8kgvvwd1vrq5cqnb5vypa9d39q2ksqf8j3d"; depends=[]; }; MPR_genotyping = derive2 { name="MPR.genotyping"; version="0.8"; sha256="0lsrbks7nhfnrmk8kclh09rc132j3divjxrzjfrg8zijbzkfx1pn"; depends=[qtl]; }; MPS = derive2 { name="MPS"; version="2.3.1"; sha256="08yzynznf33y7y3pf7fayks5hi3cdvzwzn8axg7aky5kvi2bfv22"; depends=[]; }; - MPSEM = derive2 { name="MPSEM"; version="0.3-6"; sha256="0kw3aixhl5j8nq4lcx65l80v4lihvpa4qd12n2jrc96lnm6mw00b"; depends=[ape MASS]; }; + 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.57"; sha256="1b2xxkh55lzz9addjxa0jjp3lrpf6c31knah4xwhgbmrg4r6rl0n"; depends=[KernSmooth lattice]; }; @@ -2869,9 +2906,9 @@ in with self; { MSCMT = derive2 { name="MSCMT"; version="1.3.4"; sha256="1vh0i9nxqiy3qdnb7z7cn5kpp2jahdmaqpnv7q5650pkswhwmfpc"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; }; MSCquartets = derive2 { name="MSCquartets"; version="1.1.0"; sha256="1rik3ma537qkj63j5v0gcf6g3qi68z49w21z96mm88b7nq15xpjh"; depends=[ape doParallel foreach phangorn RandomFieldsUtils Rdpack zipfR]; }; MSCsimtester = derive2 { name="MSCsimtester"; version="1.0.0"; sha256="0k04fdprwa56vm6n372lipybgq1plhmjbxvp58wqmpgzpnhcxkvd"; depends=[ape kSamples Rdpack]; }; - MSEtool = derive2 { name="MSEtool"; version="3.3.0"; sha256="0sgiwfjc24c49w4vblasy84clgwjgzcgii1fi4jkc940k6vcz4kf"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo snowfall]; }; + MSEtool = derive2 { name="MSEtool"; version="3.4.0"; sha256="1v3qld7gnsvf5aa0vmfiaj48irkawsl1nbxxi4rqbhbg60kb7zzm"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo snowfall]; }; MSG = derive2 { name="MSG"; version="0.8"; sha256="178209p30fmh3c03w8iakz306h2xswcj4ffxg1s9s8md156rbj7s"; depends=[RColorBrewer]; }; - MSGARCH = derive2 { name="MSGARCH"; version="2.42"; sha256="1n5fvj6yx8sfi1vizw89410hc0d37w8mpqfsksdv01pgnfdcs11a"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; + MSGARCH = derive2 { name="MSGARCH"; version="2.50"; sha256="0gq0n9v2vdsg899bic24hdp72sr39xcmc3iam4h4yx2b8bl7mxdb"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; MSGARCHelm = derive2 { name="MSGARCHelm"; version="0.1.0"; sha256="172xpvs98b9ay44ffb8bp9k4zsjzhy92pp7bv3d1j186pqhl13ib"; depends=[forecast MSGARCH nnfor]; }; MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; }; MSMwRA = derive2 { name="MSMwRA"; version="1.5"; sha256="062d37h47p3sx65k5jh8n900dfzm1mvi18ikral3ajdhy7x2cif9"; depends=[]; }; @@ -2880,7 +2917,8 @@ 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]; }; - MSbox = derive2 { name="MSbox"; version="1.4.0"; sha256="0v0prgrnvfr57934lra9w15danzygqnm3mi9n2k2jrkmcdj8dsrm"; depends=[crayon ggfortify ggplot2 plotly reshape2 stringr xml2]; }; + MSbox = derive2 { name="MSbox"; version="1.4.6"; sha256="1wlfbkjsw2bzznh6fwhfllgnj80zpfab82x43a83k3mjd41rf9f9"; depends=[crayon ggfortify ggplot2 plotly reshape2 stringr xml2]; }; + MSclassifR = derive2 { name="MSclassifR"; version="0.2.0"; sha256="1450i3f3f02sp6bnvvwgj4r64bfkjcb5dbcyy5src3lmly6d6jdi"; depends=[caret dplyr e1071 fuzzyjoin ggplot2 glmnet MALDIquant MALDIquantForeign MALDIrppa metap mixOmics nnet reshape2 VSURF xgboost]; }; 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]; }; MSwM = derive2 { name="MSwM"; version="1.5"; sha256="0ny5apvww1537qhiwb3f8x173rh7mypvgpw0i46dkvn897i0dq36"; depends=[nlme]; }; @@ -2890,7 +2928,7 @@ in with self; { MTE = derive2 { name="MTE"; version="1.0.1"; sha256="0ybzf8fsysxld9d17jh1wggglaa58n5szynnrhif12cifgcrl2dx"; depends=[glmnet quantreg]; }; MTLR = derive2 { name="MTLR"; version="0.2.1"; sha256="070121qn7vmxmxgvzv7ymhk19j9kxks4xa7qpd8vkc2rp3ara4cp"; depends=[Rcpp RcppArmadillo survival]; }; MTPS = derive2 { name="MTPS"; version="1.0.1"; sha256="1jdlw943ywmrp64w1qrjqymqjh2jahnq0i5px8af1l3msznj20x4"; depends=[class e1071 glmnet MASS rpart]; }; - MTS = derive2 { name="MTS"; version="1.0.3"; sha256="1v1pid42a7jw4qrvp2y3pqzfn6vcldfkgvny5c6z8bsrjlc9ah8n"; depends=[fBasics fGarch mvtnorm Rcpp]; }; + MTS = derive2 { name="MTS"; version="1.1.1"; sha256="0mb7h4h94a2x104ybkg9836k3szdimlcdccwxjc5naarxhdifv60"; depends=[fBasics fGarch mvtnorm Rcpp RcppEigen]; }; MTSYS = derive2 { name="MTSYS"; version="1.2.0"; sha256="04dkan3hxl3difflskp7d1lw1bvxhg4s28ssy2v4m7z7wbpj3v1m"; depends=[]; }; 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=[]; }; @@ -2902,7 +2940,7 @@ in with self; { MVNtestchar = derive2 { name="MVNtestchar"; version="1.1.3"; sha256="0w5008zknrl5r7l4dmj2fbm7vvg2f1wynzf38kabns4j7hb1nmxw"; depends=[ggplot2 Hmisc knitr]; }; MVQuickGraphs = derive2 { name="MVQuickGraphs"; version="0.1.2"; sha256="1937w8y866bsn9kn6a98c91akhm9ddc5dr9wqm51lkbjyz1zm0j1"; depends=[plotrix]; }; MVR = derive2 { name="MVR"; version="1.33.0"; sha256="1ygz47a2p5r5axql5zsxvsn25pcqyxz6mpw50zfmzrcqdrfa3bg8"; depends=[statmod]; }; - MVTests = derive2 { name="MVTests"; version="2.0.8"; sha256="00r23jxijsid67qdqaxgmq148njkbd6d5lbsfgzazx1v7scqih3x"; depends=[mvtnorm rrcov]; }; + MVTests = derive2 { name="MVTests"; version="2.1.1"; sha256="10zybrcwyq37z8pk0ck4bravbrryx705vd7v4mb4c2vavnshxfq3"; depends=[mvtnorm robustbase rrcov]; }; MVar = derive2 { name="MVar"; version="2.1.8"; sha256="00mn0aqj2yvspi9jzx01d6aiwsxkfa7rp1ahh6p86bmf5j8rqanj"; depends=[MASS]; }; MVar_pt = derive2 { name="MVar.pt"; version="2.1.8"; sha256="1hs39rybs3yih0nc0xhn3c1ip8z6pzdzvfki6fpx981f41lk9cwg"; depends=[MASS]; }; MVisAGe = derive2 { name="MVisAGe"; version="0.2.1"; sha256="1plrzzj7cr2hxk1npadvjnk7sanhilh99l5vrkjjh3l6li2ym09b"; depends=[]; }; @@ -2912,7 +2950,7 @@ in with self; { MXM = derive2 { name="MXM"; version="1.5.2"; sha256="0h95v74sk0c10i1rvbbl6f98spv86jfz7xji3d3wd1v4zacq3hhz"; 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]; }; MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; }; - MachineShop = derive2 { name="MachineShop"; version="3.2.0"; sha256="1m3p2m19dl2z9rlmd9si67xzc592y9gym9mn919cdgsy3zrif4ld"; depends=[abind cli dials foreach ggplot2 kernlab magrittr Matrix nnet party polspline progress Rcpp recipes rlang rsample Rsolnp survival tibble]; }; + MachineShop = derive2 { name="MachineShop"; version="3.3.0"; sha256="1xrj6c0bryd2dldh2npaqznzvy4588jx4lplhsgffn07j4z0wz9g"; depends=[abind cli dials foreach ggplot2 kernlab magrittr Matrix nnet party polspline progress recipes rlang rsample Rsolnp survival tibble]; }; Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; }; MajKMeans = derive2 { name="MajKMeans"; version="0.1.0"; sha256="1zphrxyx3jd6rnh1y1qnc6bip34kfqk1a5ms4ps39gfngznh482m"; depends=[MASS]; }; MakefileR = derive2 { name="MakefileR"; version="1.0"; sha256="1pfjic2lsar8ghbb6byr4rqrs30qrgfih092z4rxdpsiwkk3y7l1"; depends=[magrittr]; }; @@ -2937,7 +2975,7 @@ in with self; { MatManlyMix = derive2 { name="MatManlyMix"; version="1.1.1"; sha256="1d2vd5b9lirdybjclxh0nn4mghq64qjj4l8vnj95cni5pfa18a2c"; depends=[]; }; MatSkew = derive2 { name="MatSkew"; version="0.1.5"; sha256="019v2b1r0bvw84xs50smjb3jdz7gd2adz5d84xd8zq43lnml96d1"; depends=[]; }; MatTransMix = derive2 { name="MatTransMix"; version="0.1.15"; sha256="1s2wmhiqn024x9l217xak3wp3dbd3mfrih70xc5mc1b4555f2fbm"; depends=[mvtnorm]; }; - MatchIt = derive2 { name="MatchIt"; version="4.3.2"; sha256="1fw1lb3w27652bvy612f9c09dzb02w3nrjzr1gn3svkldsaic4bg"; depends=[backports Rcpp RcppProgress]; }; + MatchIt = derive2 { name="MatchIt"; version="4.3.4"; sha256="052dv7zk156qlrg5j4kjzr3mryj1g7cmbc5zal7vky6ss87ahid6"; depends=[backports Rcpp RcppProgress]; }; MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.3"; sha256="1si0zn6vlgyj08841hfjx8an96a8ipnawl4zbalabmpy7r5bfwx8"; depends=[Hmisc Matching]; }; MatchThem = derive2 { name="MatchThem"; version="1.0.1"; sha256="1g3vzbxrbmgmxlnn6i2i1wdk949i547ywgxcw05na71kc1nvwvfd"; depends=[MatchIt mice rlang survey WeightIt]; }; Matching = derive2 { name="Matching"; version="4.9-11"; sha256="123np8gwjrbmkl65kj7qfa52i9msnkjyhvj4pwwqh5mkca2clw8w"; depends=[MASS]; }; @@ -2955,23 +2993,25 @@ in with self; { MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-3"; sha256="1cmxfdkm5k85b4ivlfy5521hkfj0gq2pb1qlxxklh0fprw87kp9c"; depends=[ggplot2 raster]; }; MaximinInfer = derive2 { name="MaximinInfer"; version="1.0.0"; sha256="1m6xb4blpahgm7b4h96rdg2qakgn893sfjk45flxnvn8gipbwlrh"; depends=[CVXR glmnet intervals MASS SIHR]; }; MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.10"; sha256="0085miwwda387k33hf6l8p3f0pp8714nq0whzmf89l3yn932ai33"; depends=[devtools digest dplyr futile_logger lubridate magrittr purrr rlang rvest stringr tibble xml2]; }; - MazamaLocationUtils = derive2 { name="MazamaLocationUtils"; version="0.2.7"; sha256="12ghd0h9127isbxkaapnl94r2snfpa8dcmp9j9h51knfqjaj6qmw"; depends=[digest dplyr geodist httr jsonlite leaflet lubridate magrittr MazamaCoreUtils MazamaSpatialUtils readr rlang stringr]; }; + MazamaLocationUtils = derive2 { name="MazamaLocationUtils"; version="0.3.3"; sha256="1ysdqrsifxf547i9gpbssd801sxh11cyvahkziz0zqwpcp301424"; 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.1.2"; sha256="1gkxq6lnvdv24nvc34fmxz4qilzljxcls1lq29a5ag67dffz7kcj"; depends=[dplyr magrittr MazamaCoreUtils MazamaSpatialUtils rlang sf sp tmap]; }; MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.7.6"; sha256="07qr6cwa29brsp567vjhfv8pkqijxhhz98bxvagrpjj5gbx1179s"; depends=[cleangeo countrycode dplyr magrittr MazamaCoreUtils rgdal rgeos rlang rmapshaper sp stringr]; }; + MazamaTimeSeries = derive2 { name="MazamaTimeSeries"; version="0.2.2"; sha256="1snx71jcv9q1fw7njfccd0lvgi3mim6sahzcnc6136pblnjs29kg"; depends=[dplyr geodist lubridate magrittr MazamaCoreUtils readr rlang stringr]; }; Mcomp = derive2 { name="Mcomp"; version="2.8"; sha256="1wz5fr3dhxn4s0qvxm2mzq9dbz3x0vgh6pixjrgk9d4i9w2p7s60"; depends=[forecast ggplot2]; }; MeTo = derive2 { name="MeTo"; version="0.1.0"; sha256="14hdyh3p3q8yb9w2li2y9pc356jnymsn6n2750zdsrh52b751lpm"; depends=[lubridate]; }; MedDietCalc = derive2 { name="MedDietCalc"; version="0.1.1"; sha256="11q1yn6l697qa33wqik9y9lji39r6pph109yxkkprg9p80c187xy"; depends=[]; }; MedLEA = derive2 { name="MedLEA"; version="1.0.1"; sha256="0lw3m0wdsiypkyvpiacj4k9534x9clna38pwr4mrdy09hc435q3j"; depends=[patchwork tidyverse tm wordcloud2]; }; - MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; }; MedSurvey = derive2 { name="MedSurvey"; version="1.1.1.3.0"; sha256="11lkli2arl5w2aizzd93fb6xsy30000nf3qc08qirrm07rwypaly"; depends=[lavaan Matrix survey]; }; 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.7"; sha256="177wzlq8z0b5qw2vpzy224i11a9x9179ni81bmxi8cvza4rx211h"; depends=[devEMF doParallel doRNG flextable foreach mvtnorm officer Rcpp RcppEigen RcppNumerical 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.5.1"; sha256="1qi5v4m19025zcigl6wxmj3vi6zjlzgsm6cj75kywq2qabrzk2fw"; depends=[ggplot2 glmnet iterpc knitr Matrix plotly quantreg rjson rmarkdown robustbase]; }; + MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.6.0"; sha256="0qf2kb04ia5rdasvs34ziwyan5k327gi45frjkhmi5qsz64z51bg"; depends=[ggplot2 glmnet iterpc knitr Matrix plotly quantreg rjson rmarkdown robustbase]; }; Mercator = derive2 { name="Mercator"; version="1.1.1"; sha256="0jg5dm65smq67k35p8acqd5kdsv7py8plaamagbsc84617r0iaik"; depends=[ClassDiscovery cluster dendextend flexmix igraph KernSmooth kohonen Polychrome Rtsne Thresher umap]; }; MetABEL = derive2 { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; }; + MetAlyzer = derive2 { name="MetAlyzer"; version="0.1.0"; sha256="1mqc2037q71n1k7ncym52vn0cc5ndsxq4r87k492lp1b3i7h1wi3"; depends=[agricolae dplyr openxlsx rlang tibble tidyr]; }; + MetBrewer = derive2 { name="MetBrewer"; version="0.1.0"; sha256="1wf8bpsj9py69x7k4i18na0rr2d1f3bw3jds94jr13g7m70i6js7"; depends=[]; }; MetFns = derive2 { name="MetFns"; version="3.2.2"; sha256="15fd2d0yysibi2x43qv6b8i1pa18l7z4n0zpmrqhsmvqkgy8sla0"; depends=[astroFns lubridate plotrix pracma]; }; MetGen = derive2 { name="MetGen"; version="0.5"; sha256="00yzaicrpwfnxi5mdzwx1ai721vczkkf2yl50q9wwpxhmfx0xbbh"; depends=[chron glmnet MASS]; }; MetNorm = derive2 { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1avs3ji0a2nlrrljz5d0l66zfh4474jb4"; depends=[]; }; @@ -2984,10 +3024,10 @@ in with self; { MetaDBparse = derive2 { name="MetaDBparse"; version="2.0.0"; sha256="0ssbjm9x3f7j2blpjdjfcsrp2486g55rwkw7xhlkrw307q6i40gq"; depends=[ChemmineR cmmr data_table DBI enviPat gsubfn Hmisc httr jsonlite KEGGREST pacman pbapply progress R_utils rcdk RCurl Rdisop readxl reshape2 rJava RJSONIO rlist RSQLite rvest SPARQL stringi stringr webchem WikidataQueryServiceR XML xml2 zip]; }; MetaIntegration = derive2 { name="MetaIntegration"; version="0.1.2"; sha256="0dbmpls6gipd81c79lvxqgyhzl3nmi0ma4szv8fcrh50jbwfvsql"; depends=[corpcor knitr MASS Rsolnp]; }; MetaIntegrator = derive2 { name="MetaIntegrator"; version="2.1.3"; sha256="1763in7zcfr4abhwc0sy27c1qbzbhkyjsasrhwdjjmsc645sqxlx"; depends=[AnnotationDbi Biobase BiocManager boot COCONUT data_table DBI dplyr DT GEOmetadb GEOquery ggplot2 ggpubr gplots HGNChelper httpuv magrittr manhattanly Metrics multtest pheatmap plotly plyr pracma preprocessCore readr reshape2 rmarkdown rmeta Rmisc RMySQL ROCR RSQLite stringr zoo]; }; - MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.8"; sha256="1p182792vx1nix385kpgvdl0yff12xy5v1k6giaj0cxgfvhrqqar"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat_core spatstat_geom zipfR]; }; + MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.9"; sha256="0x418csk1bcg1ld5rwlrd3qr95bp10q5nzix1n23ss550sn527ml"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat_geom spatstat_random zipfR]; }; MetaLonDA = derive2 { name="MetaLonDA"; version="1.1.8"; sha256="0nalkmsii2anw07r16zcpgafb01l87hgpfr1mwc7nggvhdfp3w2g"; depends=[DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr pracma zoo]; }; MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; }; - MetaStan = derive2 { name="MetaStan"; version="0.4.0"; sha256="1qdb1y4hwkrhdyhjvig7vfybz0ixmm6w85yq0bmapxj10qs8ars9"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; }; + MetaStan = derive2 { name="MetaStan"; version="1.0.0"; sha256="00rj11q20apw7f5s6vw8fh7qxgfksndyiks1w907zzjlxhy9b4pj"; depends=[BH coda forestplot HDInterval loo metafor Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; MetaSubtract = derive2 { name="MetaSubtract"; version="1.60"; sha256="19xg95g2qgyi90pz3733l596gzdj6dmb0k9i4qmhaq4yck69rrhj"; depends=[]; }; MetaUtility = derive2 { name="MetaUtility"; version="2.1.2"; sha256="0pddp4h7jk2y140yiw4j5661011v1ym1dnb4ds9ai6i3iic23373"; depends=[dplyr metadat metafor purrr rlang stringr tidyr]; }; MetaboList = derive2 { name="MetaboList"; version="2.0"; sha256="10skvf14ls4qll0l9p6cig4lmj7138khcksyjvd1pqym9axk3wxn"; depends=[dplyr enviPick ggplot2 scales]; }; @@ -2997,33 +3037,34 @@ in with self; { MetabolomicsBasics = derive2 { name="MetabolomicsBasics"; version="1.2"; sha256="0gd93l9rm00x9g6ffppywpbccmhxgl4s4z4ba7al8lpjval9srzw"; depends=[C50 caret e1071 mixOmics pcaMethods plyr rlang ropls rpart]; }; MetaheuristicFPA = derive2 { name="MetaheuristicFPA"; version="1.0"; sha256="096k866mgrdgj55rzvdj080z80hzlj0667mydpz7gjaqdfriw8jg"; depends=[Rcpp RcppArmadillo]; }; Metatron = derive2 { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 Matrix mpt]; }; - Meth27QC = derive2 { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0jmv64iyq7slp1x1xl35h2rv1b6zbd4658"; depends=[gplots]; }; MethComp = derive2 { name="MethComp"; version="1.30.0"; sha256="1vmwb4zw4gm2x0j2nzm2vjfj7x19ws8njr6dcglzjpbbha7nxjp6"; depends=[coda nlme rjags]; }; - MethodCompare = derive2 { name="MethodCompare"; version="0.1.1"; sha256="1akp4azjnia142bdjjdfaj55jipmrcbwcy3jx27l765biaqws97c"; depends=[nlme]; }; + MethodCompare = derive2 { name="MethodCompare"; version="0.1.2"; sha256="1nxr2fgmfixjkdparavi156qqqchjwaxpjk9i2xgc1yhp1p01pll"; depends=[nlme]; }; Methplot = derive2 { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; }; MethylCapSig = derive2 { name="MethylCapSig"; version="1.0.1"; sha256="16ch9aldr6a9jn42h387n7qvnzs0yx28f2yj6xq0kp476q7rf4ql"; depends=[geepack]; }; Metrics = derive2 { name="Metrics"; version="0.1.4"; sha256="0fh8qbjlwzagh272lgwr4bxcqcjb1qpz53mgs8rzlvncax6nk5bk"; depends=[]; }; - MetricsWeighted = derive2 { name="MetricsWeighted"; version="0.5.3"; sha256="0wi83gk3rrvfkl48x0sml3k0bazsm6ycb4kdk3y1kp83pxdls43p"; depends=[]; }; - MfUSampler = derive2 { name="MfUSampler"; version="1.0.4"; sha256="0i5siq1jacxbfvakb97qnj3h7pk471rrx8ckwm0d8nl3j586s36y"; depends=[ars coda HI]; }; + MetricsWeighted = derive2 { name="MetricsWeighted"; version="0.5.4"; sha256="1hv2bgd64km303l09kva0pa9wx95f82qa9c4zl8nrmfhi2dvckqh"; depends=[]; }; + MfUSampler = derive2 { name="MfUSampler"; version="1.0.6"; sha256="0lw60dnlkcs59wf5yzqj3yq8k529s5mrjj33nyvzqgqqmln9v1x8"; depends=[ars coda HI]; }; MiDA = derive2 { name="MiDA"; version="0.1.2"; sha256="144gxsxqljzskxsw5k0y69ix0pxlfvyyznxkjpf2ng4l47pg11z5"; depends=[caret gbm genefilter limma preprocessCore pROC SQN]; }; MiRKAT = derive2 { name="MiRKAT"; version="1.2.1"; sha256="1ypxs6p8jzd2y5rxbfrr2z1xib6im9i58wvcz4cqcgpw298w7ard"; depends=[CompQuadForm GUniFrac lme4 MASS Matrix mixtools PearsonDS permute quantreg survival]; }; MiRNAQCD = derive2 { name="MiRNAQCD"; version="1.1.2"; sha256="1alpa7xsk669rsh0s7kjdnk1ymlfm81rw011pk29fi7p2jc505iv"; depends=[ggplot2 pROC]; }; MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; }; MiSPU = derive2 { name="MiSPU"; version="1.0"; sha256="1l6q0fm5z5i6gigr940h8kc5rka08psmhcprp8grmsxk3qy2kply"; depends=[ape aSPU cluster Rcpp RcppArmadillo vegan]; }; MiST = derive2 { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; }; - MicSim = derive2 { name="MicSim"; version="1.0.15"; sha256="0nbrl013i1jz5hsq5a6526rlsp0qvvrbs86md6yrvhh90bsnf65p"; depends=[chron rlecuyer snowfall]; }; + MicSim = derive2 { name="MicSim"; version="1.1.0"; sha256="0nkprbb9lgnfzl1bj0k4rkd7v8g35cvhl9bqa91q2lc2rimzfl20"; depends=[chron rlecuyer snowfall]; }; MicroDatosEs = derive2 { name="MicroDatosEs"; version="0.8.2"; sha256="0k0hmi3ciipizmgjw1i5rrsg34yx21s1msn40vc4qc9s1n4wd8dl"; depends=[readr]; }; MicroMacroMultilevel = derive2 { name="MicroMacroMultilevel"; version="0.4.0"; sha256="1q5cyqr4hdl1wp2isk6p4p084i83kg6hd406wdp1nj9lv5i0xvgw"; depends=[]; }; + MicroMoB = derive2 { name="MicroMoB"; version="0.0.11"; sha256="1a3fknakn98k73mkfk81fypznhhr2npd9w34s57yaqj5z3c4i5xj"; depends=[abind extraDistr httpuv jsonlite plumber]; }; MicroNiche = derive2 { name="MicroNiche"; version="1.0.0"; sha256="166ci4crkwnnh05rhs5hyrljgm4cdf7gp0ff8kjxjmd60byw80mz"; depends=[ggplot2 reshape2]; }; MicroSEC = derive2 { name="MicroSEC"; version="1.1.3"; sha256="1imdxm15f792xw5kc9lhry5jsw739j6y3f2fs64abj22hqxfwypi"; depends=[BiocGenerics Biostrings data_table dplyr GenomeInfoDb GenomicAlignments gtools magrittr openxlsx R_utils Rsamtools stringr tidyr]; }; - MicrobiomeStat = derive2 { name="MicrobiomeStat"; version="1.0"; sha256="1pi1lvy6lqdm3niw69p6j86z1nbix4bc1846rz06qfss0s5yas0q"; depends=[foreach ggplot2 ggrepel lmerTest MASS Matrix matrixStats modeest statmod]; }; - Microsoft365R = derive2 { name="Microsoft365R"; version="2.3.2"; sha256="1qc4716mvkfvxwkzjihf00my6y4va3day3lnh5iwpb5k9kgrnhgm"; depends=[AzureAuth AzureGraph curl httr jsonlite mime R6 vctrs]; }; - MinBAR = derive2 { name="MinBAR"; version="1.1.2"; sha256="099afazil0gfs5yq92clc7ahis5azyvlql4zs7fhp82v9m6b80qj"; depends=[dismo ecospat geosphere lattice latticeExtra maxnet raster rgdal sp]; }; + MicrobiomeStat = derive2 { name="MicrobiomeStat"; version="1.1"; sha256="1j5sar85a1gksc83pc4ypxwb0c7whxglx069zarphrgqfazcr1m4"; depends=[foreach ggplot2 ggrepel lmerTest MASS Matrix matrixStats modeest phyloseq statmod]; }; + Microsoft365R = derive2 { name="Microsoft365R"; version="2.3.3"; sha256="17zlkbap7svj7g3jk1jb7582crkfsgh4xka4nmzaj3lzkwwx429k"; depends=[AzureAuth AzureGraph curl httr jsonlite mime R6 vctrs]; }; + MinBAR = derive2 { name="MinBAR"; version="1.1.3"; sha256="0d0l7sr99kg6s0pxw10zrnwz699kzqaylawymd7kggc3dag9frbx"; depends=[dismo ecospat geosphere lattice latticeExtra maxnet raster rgdal sp]; }; MinEDfind = derive2 { name="MinEDfind"; version="0.1.3"; sha256="1y0iv92mp7hf14vrj54qd0yvmjrv52jv3vg25kc5q7pml63njkqa"; depends=[ggplot2 gridExtra Iso]; }; MindOnStats = derive2 { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; }; Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; }; Minirand = derive2 { name="Minirand"; version="0.1.3"; sha256="19lib0qh3xfzvpgsskl3yypmjygss0w7pimz0136av0px5b4jran"; depends=[]; }; MisRepARMA = derive2 { name="MisRepARMA"; version="0.0.2"; sha256="0bay8grq49yin9yy9h9ynb8flsbrb10h4lp7sdzp9ih5b9w21y7z"; depends=[boot mixtools tseries]; }; + MitoHEAR = derive2 { name="MitoHEAR"; version="0.1.0"; sha256="1lb36w374wjp6f9ydkas21rwc2shlav1xq2rfzig1k034fkva8bj"; depends=[Biostrings circlize ComplexHeatmap dynamicTreeCut GenomicRanges ggplot2 gridExtra IRanges magrittr mcclust rdist reshape2 rlist Rsamtools]; }; MittagLeffleR = derive2 { name="MittagLeffleR"; version="0.4.1"; sha256="1qlz418im27v7q3xk09a2w3zdx7ky5imcyi3kpg1s3bz5zx57p2f"; depends=[stabledist]; }; MixAll = derive2 { name="MixAll"; version="1.5.1"; sha256="1jsh29ygy1n7lbz93ks725li9hnvfa0kp1qik13m72nmgw7g7q5a"; depends=[Rcpp rtkore]; }; MixGHD = derive2 { name="MixGHD"; version="2.3.6"; sha256="0vx32ay7r8d22j53fsi6ff8l2zg97524dy7ir59ldafjfn15nc7k"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; }; @@ -3034,14 +3075,14 @@ in with self; { 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]; }; MixSim = derive2 { name="MixSim"; version="1.1-5"; sha256="16l27y8wgy44zpavl3as0qdm1csjrmh2iy7idd2j6l8cba8z2l0i"; depends=[MASS]; }; - MixTwice = derive2 { name="MixTwice"; version="1.1"; sha256="1vzy31aaxyfr28xsk9358laqg429lnrkxdmm63maz15wcbxha9zq"; depends=[alabama ashr fdrtool]; }; - MixedIndTests = derive2 { name="MixedIndTests"; version="0.1.5"; sha256="1vlkpm1qx3mh3c08d0hwyzdap8s8kpdiiik49yphgmqgb8xg7i9n"; depends=[doParallel foreach ggplot2 survey]; }; + MixTwice = derive2 { name="MixTwice"; version="2.0"; sha256="11j591z1pnql84sfczvry7mg4hs0jghgp170y5j5wwhs7l5kc7r7"; depends=[alabama ashr fdrtool Iso]; }; + MixedIndTests = derive2 { name="MixedIndTests"; version="0.8.0"; sha256="0hafcz05042nhl8qwrjhr04k6xwz4pkd90ca7vcyijcay2nvx20z"; depends=[copula doParallel foreach ggplot2 survey]; }; 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]; }; - MixtureMissing = derive2 { name="MixtureMissing"; version="1.0.0"; sha256="1sqpv8ysn0y28x8pbz75lqc066sdbpmfmxzb1q39aa83siysc06q"; depends=[cluster ContaminatedMixt GGally ggplot2 mnormt mvtnorm rootSolve]; }; + MixtureMissing = derive2 { name="MixtureMissing"; version="1.0.2"; sha256="03ql591891jvhycagkjl5gj83mjlrv5m95kpgkgph8gim71q2di1"; depends=[cluster ContaminatedMixt MASS mnormt mvtnorm rootSolve]; }; MixtureRegLTIC = derive2 { name="MixtureRegLTIC"; version="1.0.0"; sha256="052gyk4gqv49fa2rxbxnib29f1vjxiw4q8llkfhsv8kw5pw38699"; depends=[]; }; MoBPS = derive2 { name="MoBPS"; version="1.6.64"; sha256="12czwx362pn0crj047rqb9ambl1fw73k474i7vcxhz53kbw21wj0"; depends=[]; }; MoEClust = derive2 { name="MoEClust"; version="1.4.2"; sha256="13bc5ypq95f56mimqgmvvzhbsgm2j6j6bwigk6kx68l2qvzj12vl"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; }; @@ -3071,35 +3112,36 @@ in with self; { MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.6"; sha256="1jwq3by8zfy6sbzahcj5l0vicqn7yyqpb7xhfsaymfspm7xyq6pj"; depends=[abind codetools reshape rlecuyer snow snowfall]; }; MonteCarloSEM = derive2 { name="MonteCarloSEM"; version="0.0.3"; sha256="1kamhwqw3px5l4pz50zksfsfhjv03wc31xi8v6fl6h9xxmvw52gd"; depends=[lavaan Matrix]; }; Morpho = derive2 { name="Morpho"; version="2.9"; sha256="1gsns3ab9x24czl53p15cja9vw881iwnhc0ix50i8vzkx184wsib"; depends=[bezier colorRamps doParallel foreach jsonlite MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; }; - MorphoTools2 = derive2 { name="MorphoTools2"; version="0.9.1.1"; sha256="0s5ll7lrhrvkj9vig90j33q1kfskzwqiqmf8cjd22r6dlajp9gg2"; depends=[ade4 candisc car class ellipse fpc heplots MASS plot3D StatMatch vegan]; }; + MorphoTools2 = derive2 { name="MorphoTools2"; version="0.9.1.2"; sha256="0ddjk39jz46xnig1b6iv5qdpxmwh76i4axfchghiy17hbpacbdlg"; depends=[ade4 candisc car class ellipse heplots MASS plot3D StatMatch vegan]; }; MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; }; MortCast = derive2 { name="MortCast"; version="2.6-1"; sha256="0w7fd5n3wafix4l29svnja0l675pdpj64vgh113mzsn08h3kpwid"; depends=[wpp2017]; }; MortalityGaps = derive2 { name="MortalityGaps"; version="1.0.0"; sha256="0nfm8xa7gnshrl8hsvmvr3za8nbppp7f7i5h4ni204w7xwvh8jxc"; depends=[crch forecast MASS pbapply]; }; - MortalityLaws = derive2 { name="MortalityLaws"; version="1.8.5"; sha256="1kkf2blrv68s7rjcmcq6nbaxlizxqnrsy69cqk077ga0arlzjq1i"; depends=[minpack_lm pbapply RCurl tidyr]; }; + MortalityLaws = derive2 { name="MortalityLaws"; version="1.9.3"; sha256="12sfc4lhp01caknpw25gmchh8gv2wjlgpq0lby7iayl9lnsg1x92"; depends=[minpack_lm pbapply RCurl tidyr]; }; MortalityTables = derive2 { name="MortalityTables"; version="2.0.3"; sha256="0ldj8gq5xpbxkjcvdysrcq7a0xv7caz1rc8v6bpn5hkr866lqnmw"; depends=[ggplot2 pracma scales]; }; MplusAutomation = derive2 { name="MplusAutomation"; version="1.0.0"; sha256="0hkz76gmmz1cpsjmz7jscwvdc8aar1g9468b5cr21zyl5slna0cg"; depends=[boot checkmate coda data_table digest fastDummies ggplot2 gsubfn lattice pander plyr rlang texreg xtable]; }; - MplusTrees = derive2 { name="MplusTrees"; version="0.1.1"; sha256="1s119p1fgr27rkh671zpzbfnd368m0s1607r8xwgjm0y5ncxwkv7"; depends=[MplusAutomation nlme rpart rpart_plot]; }; + MplusTrees = derive2 { name="MplusTrees"; version="0.2.1"; sha256="0bc8663h746wxrb4x1b65k013byfpz80l9mz0090jwa3q710g506"; depends=[MplusAutomation nlme rpart rpart_plot]; }; Mqrcm = derive2 { name="Mqrcm"; version="1.2"; sha256="1alfv76b90frimihjcq8whzqkwvhnnw2fd92nrfpnfj5dw0b56f5"; depends=[Hmisc pch]; }; MrSGUIDE = derive2 { name="MrSGUIDE"; version="0.1.2"; sha256="1hd0lvvy12r6kxa64vwnjavyv2f7a9jqgjxgmlw86wwh5g09hvfd"; depends=[BH magrittr Rcpp RcppArmadillo yaml]; }; MsdeParEst = derive2 { name="MsdeParEst"; version="1.7"; sha256="1zhi1jr30sl7jpsw37lc3akfzixlhm9k2hjkha1pjy5fmd5lddlx"; depends=[MASS moments mvtnorm sde]; }; MtreeRing = derive2 { name="MtreeRing"; version="1.4.5"; sha256="1i6ljz950n9fpgci9b5777dg3b88ihhz8jvyw621hg218imswhxz"; depends=[bmp dplR dplyr imager jpeg magick magrittr measuRing png shiny shinydashboard shinyWidgets spatstat_geom tiff]; }; MuChPoint = derive2 { name="MuChPoint"; version="0.6.1"; sha256="15bqsc7bsjg55qxjwxh58bxbwz61a6wv4xxph994g4020b98l01x"; depends=[capushe Matrix Rcpp shiny]; }; MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; }; - MuMIn = derive2 { name="MuMIn"; version="1.43.17"; sha256="1ac78wg94j37ikwb8r1lxk6jlj3m804q94630i5vcm663p99cqdc"; depends=[Matrix nlme]; }; + MuMIn = derive2 { name="MuMIn"; version="1.46.0"; sha256="0290dn4vw082rp4ps324bdpbifzmjs4jqca9c33yky7004qwklik"; depends=[Matrix nlme]; }; MuViCP = derive2 { name="MuViCP"; version="1.3.2"; sha256="1wkiwdz4bblxf1zr57khljqkga9ks9aj1lnidvmhib94q6b8fnf4"; depends=[gtools MASS sm]; }; MullerPlot = derive2 { name="MullerPlot"; version="0.1.2"; sha256="0am5brdmbh2mw74fbw9nha6h4qlhj8psg3142mql1ad99bd0zg4w"; depends=[RColorBrewer]; }; MultAlloc = derive2 { name="MultAlloc"; version="1.2"; sha256="0c3sqfaa08s8mk4yz77kh6q6v9ic5xp52g9prfw1k2kv4nw1k2qd"; depends=[Rglpk]; }; 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.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; }; + 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.6"; sha256="034a6yx2z93llkg7m3f20ibajwc2m23i13jqsk3fpgzx6f1dnbfk"; 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.0.1"; sha256="0p35is4kgpwxhmnmjsmphgy33dbj4f4jmysjmi75dbxbns129lig"; depends=[ggplot2 hablar pracma wrapr zoo]; }; + MultiATSM = derive2 { name="MultiATSM"; version="0.1.1"; sha256="0c9vjlpyn0gm46mwhcvni3vw9k5djbw3aiws1pz1aih93pdsyvrx"; depends=[ggplot2 hablar pracma wrapr zoo]; }; MultiBD = derive2 { name="MultiBD"; version="0.2.0"; sha256="1qjfr8hx8sr5m8370yzi09r8jnh3i6907wzj3v4h83vmjh81db71"; depends=[BH Rcpp RcppParallel]; }; MultiCNVDetect = derive2 { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; }; - MultiFit = derive2 { name="MultiFit"; version="1.0.1"; sha256="1hy2xsmdcsn4jwa06ffymhhd4prxjnqw0jxl77sxq8yb1fc2vk64"; depends=[data_table Rcpp RcppArmadillo]; }; + MultiFit = derive2 { name="MultiFit"; version="1.1.1"; sha256="086bnqp61mfanrhi7dqaq5j2ddg3rfiyms0f5wj34svcjal9wjvc"; depends=[data_table Rcpp RcppArmadillo]; }; MultiGHQuad = derive2 { name="MultiGHQuad"; version="1.2.0"; sha256="00prkn5awxrh365j1jz312har1x4p8v52a0sqfy00pqr44ncmqqq"; depends=[fastGHQuad Matrix mvtnorm]; }; + MultiGroupO = derive2 { name="MultiGroupO"; version="0.1.0"; sha256="18d7wfsfyqzrjicp2grfgh582pr6a1fqx7xbnqaj93x3w30pxscg"; depends=[cowplot expm ggplot2 ggrepel gplots gridExtra mgm mvtnorm plsgenomics qgraph rlist]; }; MultiHorizonSPA = derive2 { name="MultiHorizonSPA"; version="1.0.0"; sha256="04361yz2l3zwg30m5i3zd6lsclxis9shy9hi17x4s62hskjav12h"; depends=[matlab]; }; MultiJoin = derive2 { name="MultiJoin"; version="0.1.1"; sha256="0cfk6yc5jagj9y8xybw6yg0yph4zah2vzaxv0384ad6r0r3x3nm8"; depends=[]; }; MultiKink = derive2 { name="MultiKink"; version="0.1.0"; sha256="0vi629mjmyrh03g3kx4vl47s52bggdxbq2wrdcf892g7xasbmv2b"; depends=[MASS quantreg]; }; @@ -3125,7 +3167,9 @@ in with self; { MulvariateRandomForestVarImp = derive2 { name="MulvariateRandomForestVarImp"; version="0.0.2"; sha256="0gbr44rwwb4nq2s4ix1ckfdjahsfx9sjfbww5wjcm1v68w6bk5ca"; depends=[MASS MultivariateRandomForest]; }; MvBinary = derive2 { name="MvBinary"; version="1.1"; sha256="1lrrxvphxv4gmlazx67q4bck9373nqylqgkwcjzwb52291a3zyiv"; depends=[mgcv]; }; My_stepwise = derive2 { name="My.stepwise"; version="0.1.0"; sha256="10wka6kzk8krwdsyjfnn78dfqflq4zg3vjkk0i2ywjm5vap6aqa5"; depends=[car lmtest survival]; }; - N2R = derive2 { name="N2R"; version="1.0.0"; sha256="1pxxj8s0ybydsm1x9s4841arqwhxvi1b6nyd8j7gs4b08b9n6yxm"; depends=[Matrix Rcpp RcppEigen RcppSpdlog]; }; + Mychisq = derive2 { name="Mychisq"; version="0.1.2"; sha256="0yf1xgrp5gajla7prb1524586662wnjjjkc1xpyim6zfjkg89rbr"; depends=[]; }; + N2H4 = derive2 { name="N2H4"; version="0.6.1"; sha256="00bbdy2f4bsb8b4j6n2zhmp7zif79yx14g4f4jylh1050r1y31rk"; depends=[dplyr httr jsonlite lubridate rvest tibble urltools]; }; + N2R = derive2 { name="N2R"; version="1.0.1"; sha256="12bv7xx6j6222qgpv6g61i68017fz0x6fjg9a9k5yhgw3zk05hpk"; depends=[Matrix Rcpp RcppEigen RcppSpdlog]; }; NACHO = derive2 { name="NACHO"; version="1.1.0"; sha256="0ji9kcfbnsrn6h4p0y0ly5nwyfwh3y01wm80a7syg4mjj0nd4z0g"; depends=[cli crayon dplyr ggbeeswarm ggforce ggplot2 ggrepel knitr magrittr purrr rlang rmarkdown rstudioapi scales sessioninfo shiny shinyWidgets tibble tidyr]; }; NADA = derive2 { name="NADA"; version="1.6-1.1"; sha256="0jp4mqr77cx7q5lff84s6wb0dwjy9mi0jyhbjc5fsx50bdczc3v7"; depends=[survival]; }; NADA2 = derive2 { name="NADA2"; version="1.0.1"; sha256="01x3ylrp3kizq9aa0wyaj4jbyr4si2vi8rc3b8r0bllnsl2ia2ix"; depends=[cenGAM coin EnvStats fitdistrplus Kendall mgcv multcomp NADA perm survival survminer vegan]; }; @@ -3133,16 +3177,17 @@ in with self; { NAEPirtparams = derive2 { name="NAEPirtparams"; version="1.0.0"; sha256="0qhfmkhi38z27ky3xbkvra5r6lw3kj9p3xrblm9j2657rj9kxc9j"; depends=[]; }; NAEPprimer = derive2 { name="NAEPprimer"; version="1.0.1"; sha256="19p1livdnayfcl88f8r9x1vg30x522q8lgx66pfgwpkxjzvrqa2l"; depends=[]; }; NAM = derive2 { name="NAM"; version="1.7.3"; sha256="12d2yjl0af2ailvwk30fswalx1wzyj500qbrhiczsg1vr4rcqhkh"; depends=[Rcpp]; }; - NAP = derive2 { name="NAP"; version="1.0"; sha256="00ym7pqzksc9263mv98cxzi3d0qg5pbyfwyznl648fdca2fqjlay"; depends=[doParallel foreach]; }; + NAP = derive2 { name="NAP"; version="1.1"; sha256="19j1ngl92vqjqsk893zfsgk6fard2aswcm1553kh9fzv2idvr36s"; depends=[doParallel foreach]; }; NB = derive2 { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; }; NB_MClust = derive2 { name="NB.MClust"; version="1.1.1"; sha256="0hzmrszxgx3pylf9pjjwk2ryjhwz7naxxkhcqpnfjv337vv5dg0i"; depends=[MASS]; }; NBAloveR = derive2 { name="NBAloveR"; version="0.1.3.3"; sha256="0k1f14srzks26x5wnhj8mrfwcq7wgbywcklr804lxsh04h4d6pwp"; depends=[dplyr magrittr tidyr]; }; + NBBDesigns = derive2 { name="NBBDesigns"; version="1.0.0"; sha256="0fm7i6cvwy7b29d1ig3s7akpb2kqf5xm5nqarhwmy79c1kll9jyb"; depends=[MASS]; }; NBBttest = derive2 { name="NBBttest"; version="1.0.0"; sha256="165j4smwqz4yra3946nd7ssgfwf7wjpysn22yj0bml36qk9y6vs7"; depends=[gplots gtools]; }; NBDdirichlet = derive2 { name="NBDdirichlet"; version="1.3"; sha256="1657mqwn5i1b0g0gva387zl02vpymn98f71b0p7i7xv033mqnpqw"; depends=[]; }; NBDesign = derive2 { name="NBDesign"; version="2.0.0"; sha256="0593rh2lf8wlxzjmwh2xx3jsb6miqx0wipqw9di10cbxbf6binb1"; depends=[MASS PWEALL]; }; - NBLDA = derive2 { name="NBLDA"; version="1.0.0"; sha256="0sw84h1mgzhr6vmvxi4smk57r4gplg3kxq38gydcy6ckv2g8nzz2"; depends=[ggplot2]; }; + NBLDA = derive2 { name="NBLDA"; version="1.0.1"; sha256="0h71c3kgqaijpnrz2cx2k4311j61paxnj96kwpv2dcdy9rhkbwar"; depends=[ggplot2]; }; NBPSeq = derive2 { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[qvalue]; }; - NBR = derive2 { name="NBR"; version="0.1.3"; sha256="1bh1xwr80qz7qvk3m5ilk9ci03wmjb1bm8qq8kzbg35six6n4har"; depends=[nlme]; }; + NBR = derive2 { name="NBR"; version="0.1.4"; sha256="1dkrknml2nkgya5hm4iai6ivxp4jmr8s794xiqcm7ih6mk8a0wj0"; depends=[nlme]; }; NBShiny = derive2 { name="NBShiny"; version="0.1.0"; sha256="0hcmdhj26hc3c8d5nb6yb7amv0rbdxywima0l0jqkxipx56idlcx"; depends=[caret dplyr e1071 rhandsontable rmarkdown shiny]; }; 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]; }; @@ -3155,7 +3200,7 @@ in with self; { NEONiso = derive2 { name="NEONiso"; version="0.5.3"; sha256="19w2za7f6vy1b2h4np4r1cpp9z3aha0485rh08zb3p5y15j1c021"; depends=[data_table dplyr httr lifecycle lubridate magrittr neonUtilities R_utils rhdf5 rlang tidyselect zoo]; }; NEff = derive2 { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[bit msm]; }; NEpiC = derive2 { name="NEpiC"; version="1.0.1"; sha256="11zf112xcsg3k93vks2fnsflw2v2d56a0bsjpd460d21k3gipfz8"; depends=[igraph PairedData]; }; - NFCP = derive2 { name="NFCP"; version="1.2.0"; sha256="1dav6h0bk4c787g5wskpsfqdbsgalq0xpbzq6nk1sg54g6wd76q2"; depends=[curl FKF_SP LSMRealOptions MASS mathjaxr numDeriv Rdpack rgenoud]; }; + 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.3.0"; sha256="0gmr47pzyys3d4kmmbxznhs3vsi83vb6xv16bhg0zljkdp80fp44"; depends=[data_table progress]; }; NFP = derive2 { name="NFP"; version="0.99.4"; sha256="1ybkkqdwq72inwyak5d2598xizfph5sg3zzb855l0kpxplcqnp2f"; depends=[apcluster dplyr ggplot2 graph igraph KEGGgraph magrittr plyr stringr tidyr]; }; NFWdist = derive2 { name="NFWdist"; version="0.1.0"; sha256="0833lg0pd763awrc6ibidwf2ldl79w9lmm5acq4bnpd2hzsx60l8"; depends=[]; }; @@ -3165,7 +3210,7 @@ in with self; { NHANES = derive2 { name="NHANES"; version="2.1.0"; sha256="0aphv3rakfcfrv2km1xyxpj1bxiazy6gwrvs7lyhxmq468fk4c9a"; depends=[]; }; NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; }; NHMM = derive2 { name="NHMM"; version="3.11"; sha256="1ynxk4dpllb3w8229dmxzjdmf0zh5cgmh3wa55d02disc6yhm77k"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; }; - NHMSAR = derive2 { name="NHMSAR"; version="1.17"; sha256="149zzk8apl4zv60xagl8zk3zv1fnrbfijmlwn8c4vypvlfdsr981"; depends=[glasso lars ncvreg ucminf]; }; + NHMSAR = derive2 { name="NHMSAR"; version="1.19"; sha256="0xbnzq3zlpda1xcfiz1lsa5q5frvrsf87z3xc41fvk1n5viak5fk"; depends=[glasso lars ncvreg ucminf]; }; NHPoisson = derive2 { name="NHPoisson"; version="3.3"; sha256="1i6n59ckcxk1hwyz97jmnv4yb96ianjma6ka8lpz79ivs41jniad"; depends=[car]; }; NHSDataDictionaRy = derive2 { name="NHSDataDictionaRy"; version="1.2.5"; sha256="17jvyjxc28bmxadvcjhal4shklh24636zw6hrc7p7m71lbcw86aw"; depends=[dplyr httr magrittr purrr rvest stringr tibble xml2]; }; NHSRdatasets = derive2 { name="NHSRdatasets"; version="0.3.0"; sha256="1l4zrprnb3fsb2mibq8749a15xbvhn1g5yajbjf7gls81c8f2r7p"; depends=[tibble]; }; @@ -3176,7 +3221,6 @@ in with self; { NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; }; NISTunits = derive2 { name="NISTunits"; version="1.0.1"; sha256="0km9l3k9p35sb1qrhrz4ijjsdihvsp6j7cz5kh46lgf7nn6xdk7a"; depends=[]; }; NITPicker = derive2 { name="NITPicker"; version="1.0.1"; sha256="00jmin7y1bp7a4a1qcvv3rkgiy9qij7gbkxcdgpiyzcs6aaif59z"; depends=[fda fda_usc fdasrvf]; }; - NLMR = derive2 { name="NLMR"; version="1.1"; sha256="1m08nm71wbam6d8nj8akwqrm6nq5bvm3v76kdlasdgs7v36xzri6"; depends=[checkmate dplyr fasterize igraph RandomFields raster Rcpp sf spatstat_core spatstat_geom tibble]; }; NLP = derive2 { name="NLP"; version="0.2-1"; sha256="1dpj04fmld2lnhg072ahgjbhmciqqy9h1lrz0wf32mr7mm9s9sh5"; depends=[]; }; NLPclient = derive2 { name="NLPclient"; version="1.0"; sha256="0jhlz9mqziyk5574vl8qjjs4g75x27rlk90wvzm3q9kjrjyvad35"; depends=[curl NLP xml2]; }; NLPutils = derive2 { name="NLPutils"; version="0.0-5"; sha256="1jxxly85iajzb9qckkkar0przyxv005cyvry0qi5dkzhbyl5k490"; depends=[NLP qdap SnowballC]; }; @@ -3189,10 +3233,10 @@ in with self; { NMMIPW = derive2 { name="NMMIPW"; version="0.1.0"; sha256="13mv6dpmlldqxkxq6kiydsfwyys5w7i8ws80a5l3377i5chdqi2c"; depends=[lava nloptr numDeriv]; }; NMOF = derive2 { name="NMOF"; version="2.5-0"; sha256="1ix3jkhivq2xmyn7dc216cp3q2sgd6d1f9n0rds2zil6dp418jgl"; depends=[]; }; NMVANOVA = derive2 { name="NMVANOVA"; version="1.1.0"; sha256="1jlqyg5vn7j8srvifjghd5a7820kadl8kbwib4qxalrfprq81h8p"; depends=[]; }; - NMdata = derive2 { name="NMdata"; version="0.0.9"; sha256="0ldab8brzhxpjgswh9fgla9xb2k703vf8syd5im3ixjz6ngmkn2m"; depends=[data_table]; }; + NMdata = derive2 { name="NMdata"; version="0.0.11"; sha256="0yzjrx885zq7pnajm3s2nxjcza8pcxbn0ni60bwvr85havcs1wpj"; depends=[data_table]; }; NMproject = derive2 { name="NMproject"; version="0.6.7"; sha256="0sri85n5i5w56bmbcg3yca3r5lh9j59gwwjidwhvxvxbg6czw6n7"; depends=[crayon diffobj dplyr DT dygraphs git2r htmltools lifecycle magrittr miniUI reshape2 rlang rmarkdown rprojroot rstudioapi shiny stringr tidyr usethis]; }; NNMIS = derive2 { name="NNMIS"; version="1.0.1"; sha256="1w2i4xlx249p589yqdgbx1ra406ycxw729vbk1lqadbn71m6blaz"; depends=[survival]; }; - NNS = derive2 { name="NNS"; version="0.8.3"; sha256="0pg848qdf2sg6qldym3wxxi60bngwb63gagx0xw4wlwr15p0i02h"; depends=[caret data_table doParallel dtw dynlm meboot Quandl Rfast rgl stringr tdigest tseries zoo]; }; + NNS = derive2 { name="NNS"; version="0.8.5"; sha256="0yf0r6zvxydwj883ahvp5mx2pr9qifrkiizd0mnc8w7g6cmw7bm8"; depends=[caret data_table doParallel dtw dynlm meboot Quandl Rfast rgl stringr tdigest tseries 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.4"; sha256="10q5h9kafni3wlnn1gdsgd9a90km5snrjz1nr0ilafmdvw9vg6v1"; depends=[MASS MCMCglmm metafor]; }; @@ -3207,7 +3251,6 @@ in with self; { NPIstats = derive2 { name="NPIstats"; version="0.1.0"; sha256="0hbx2mzz1z2158c943dqfn0pq1aybj1xxy55mmvld4djr5zrlz9w"; depends=[dplyr]; }; NPMLEcmprsk = derive2 { name="NPMLEcmprsk"; version="3.0"; sha256="0nm88fsxgrfk0j0lmir57bhxy4p8ah503gpj6jdlvjqw862jigiq"; depends=[]; }; NPMLEmix = derive2 { name="NPMLEmix"; version="1.2"; sha256="056jb3kz34lajryfbzkhq0g372iib6h8mr74mq18xkarp5blgmsl"; depends=[CAMAN dplyr FDRreg Hmisc latexpdf Matrix mosaic pbapply pracma progress R_utils Rcpp REBayes Rmosek spatstat]; }; - NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; }; NPP = derive2 { name="NPP"; version="0.4.0"; sha256="1891s5j39i728vqs6xz1bywnvgalsbiknn3yqsg71zlhj3h8ikll"; depends=[]; }; NPRED = derive2 { name="NPRED"; version="1.0.6"; sha256="1mdnjfh100hckyqkyq4651ymi6lzbgfy6dy4xjxbal2q5rn6swvl"; depends=[]; }; NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; }; @@ -3226,24 +3269,25 @@ in with self; { NatureSounds = derive2 { name="NatureSounds"; version="1.0.4"; sha256="1l8c0zn0bbrcdf098pcbr8fvrl614cl6iq820q0sd7sr36n3k1jr"; depends=[knitr tuneR]; }; NbClust = derive2 { name="NbClust"; version="3.0"; sha256="1vwb48zy6ln1ddpqmfngii1i80n8qmqyxnzdp6gbaq96lakl3w3c"; depends=[]; }; NegBinBetaBinreg = derive2 { name="NegBinBetaBinreg"; version="1.0"; sha256="0ryi9gdf4sis77c0qxm6r86mfkk1nq9djs297y64nr6ng3rv9p9d"; depends=[boot Matrix mvtnorm]; }; + NegativeControlOutcomeAdjustment = derive2 { name="NegativeControlOutcomeAdjustment"; version="0.0.4"; sha256="1lx60nl73y6c5785h0a1b59wz04lldrpsydbrwnb9ixbp8ibzp5h"; depends=[]; }; Neighboot = derive2 { name="Neighboot"; version="1.0.0"; sha256="116q82svg8sw1xwnx253nd8vrv5i70rj45v7lf00m778rh9l2rmr"; depends=[dplyr igraph magrittr RDS RDStreeboot]; }; NestedCategBayesImpute = derive2 { name="NestedCategBayesImpute"; version="1.2.1"; sha256="15j54whvhqy26v1iikpk8ys75d7m5b188ggdzrlgzhjg0f9j45fl"; depends=[coda dplyr Rcpp RcppParallel]; }; NetCluster = derive2 { name="NetCluster"; version="0.2"; sha256="0aby8kfniw07jap795cwk69z83p45q5rap73zp1qbmkm3qcb31g4"; depends=[sna]; }; NetComp = derive2 { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; }; - NetData = derive2 { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; }; + NetDA = derive2 { name="NetDA"; version="0.1.0"; sha256="01wrngk0cdlz3qf1kj2z75p2b4q0lhkpyjgaskn6vldsdgh94wri"; depends=[glasso]; }; NetExplorer = derive2 { name="NetExplorer"; version="0.0.2"; sha256="0k8jhl0p2dp45lx4h77r0bkcff8vn1f9gvr475cshpmyipziiwnq"; depends=[]; }; - NetFACS = derive2 { name="NetFACS"; version="0.3.0"; sha256="1pkwgszjcgqbn397nlmr2blngbf6xbhwkr5qzlnhm142vixknxha"; depends=[arrangements doParallel dplyr ggplot2 ggraph igraph magrittr patchwork picante Rfast rlang tibble tidygraph tidyr]; }; + NetFACS = derive2 { name="NetFACS"; version="0.3.1"; sha256="0z4smbh8dcb0nffyzn0yyndzniw6wh026hvdj18bz5qqv32pcq1b"; depends=[arrangements doParallel dplyr ggplot2 ggraph igraph magrittr patchwork picante Rfast rlang tibble tidygraph tidyr]; }; NetIndices = derive2 { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; }; - NetLogoR = derive2 { name="NetLogoR"; version="0.3.9"; sha256="035nsxgzh7dg9bjcwqbf5228ph90ff629di4ff3pdvr40jki60f1"; depends=[abind car CircStats data_table Hmisc matrixStats plyr quickPlot raster rgeos sp SpaDES_tools]; }; + NetLogoR = derive2 { name="NetLogoR"; version="0.3.10"; sha256="1ns35pn5h63lg5wzwyvbyyv770vkxhh2b7n85h8rfazgkyv0w3la"; depends=[abind CircStats data_table matrixStats quickPlot raster rgeos sp SpaDES_tools]; }; NetMix = derive2 { name="NetMix"; version="0.2.0"; sha256="097cyk0lf3h4v3ff0icqj7a80yvs06damw1sc4hdqf2f21d6qihh"; depends=[clue gtools igraph lda MASS Matrix poisbinom Rcpp RcppArmadillo]; }; - NetOrigin = derive2 { name="NetOrigin"; version="1.1-2"; sha256="0jm1iqv3ljplf38zxrxh4hjvz30m7i18vizr9pcrx010fcgqxqhp"; depends=[colorspace corpcor Hmisc igraph mvtnorm]; }; + NetOrigin = derive2 { name="NetOrigin"; version="1.1-4"; sha256="061hfllic8z3ps4znk3c7qjhzqdifk99ikvczxacih5hw86a9j4m"; depends=[colorspace corpcor Hmisc igraph mvtnorm plyr]; }; NetPreProc = derive2 { name="NetPreProc"; version="1.1"; sha256="0r51dqymf2nqm86py4zwdlf7qf120j0bg9r6a9c0gsyyijh4z40p"; depends=[graph]; }; NetRep = derive2 { name="NetRep"; version="1.2.4"; sha256="1swlb2k9bc7whvslxbklz864j9ynvna73hvq5rhv61cv5vy05ksd"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo RhpcBLASctl statmod]; }; NetSci = derive2 { name="NetSci"; version="0.1.2"; sha256="187gg3h8wkcvh9wrrjgyaqja0fib3xks9vr3z1jsr70i2jdx7r0f"; depends=[binr BiRewire CoDiNA cubature dplyr igraph magrittr Rfast wTO]; }; NetSimR = derive2 { name="NetSimR"; version="0.1.1"; sha256="01w2nlk1g0h81pbn3g3ch09k3ljcisysgpwihv6wlgd1wclaafmz"; depends=[]; }; 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.7"; sha256="0d9p52n4krhxy5l3f27xs90jw4am0slvyv3p6q57ba8sbwliafrf"; depends=[abind GGally ggplot2 ggrepel ggvis gridExtra igraph MASS MCMCpack mvtnorm network qgraph RColorBrewer reshape rlang Rmpfr sna tidyr]; }; + 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]; }; 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="0.1.1"; sha256="1958kpdcqp4hhkqmfjg2qnrzhwcmfkbgdriq9iyqmmcr7qm8c1y7"; depends=[broom dplyr ggplot2 magrittr network scales sna tidyr]; }; @@ -3251,8 +3295,8 @@ in with self; { NetworkReg = derive2 { name="NetworkReg"; version="1.0"; sha256="0ymbigvl1n5348g77jqs1bcda00kdqrm7zifc0ibh5mwsrx6cmds"; depends=[Matrix randnet RSpectra]; }; NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.4"; sha256="1121ma43jxc4p9rw0sc8w32shf9xrmn5qd1xsqgzr8diymc49zhg"; depends=[dplyr expm ggplot2 Matrix]; }; NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.4.2"; sha256="026gizms1xsmlpzgssgqi2y5lfhvvbqkwy5q3a0d4xvzbmyan3y7"; depends=[corrplot doParallel fdrtool foreach igraph IsingFit MASS pbapply ppcor psych pwr qgraph R_matlab]; }; - NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.2"; sha256="0d73rbp8v0k0j8dp4yigan7krhglx6qfbadvyg7nsj67xc00vbfd"; depends=[ggplot2 nnet reshape2 scales tidyr]; }; - NeuralSens = derive2 { name="NeuralSens"; version="0.2.2"; sha256="17i4dyd487wnvw1zj3jciw684spc62hmjxkcy5scjbpvjv1ymn4y"; depends=[caret fastDummies ggforce ggnewscale ggplot2 gridExtra Hmisc NeuralNetTools reshape2 scales stringr]; }; + NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.3"; sha256="1q3q3vc1f0lglyx5ydv5nx6ywpvz50a9w7cql2j7cjvh4pd3pibs"; depends=[ggplot2 nnet reshape2 scales tidyr]; }; + NeuralSens = derive2 { name="NeuralSens"; version="0.2.3"; sha256="11m2bpkdn2p7fay3p208jsifad470aq4paagyh335nzgsmp47jgb"; depends=[caret fastDummies ggforce ggnewscale ggplot2 gridExtra Hmisc magrittr NeuralNetTools reshape2 scales stringr]; }; Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; }; NewmanOmics = derive2 { name="NewmanOmics"; version="1.0.4"; sha256="1ny1w4kwdgfzm4jsj6mf3k0c10bwzwz4gmpb5vg3qffddly9wfaz"; depends=[oompaBase]; }; NicheBarcoding = derive2 { name="NicheBarcoding"; version="1.0"; sha256="16jkznc4624ww7vwid6f3m90wm2ds2c7zf1j1sw16dyrqmlyk9w3"; depends=[ape dismo e1071 maps pROC randomForest raster rJava spider vegan]; }; @@ -3262,25 +3306,26 @@ in with self; { 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]; }; Nmisc = derive2 { name="Nmisc"; version="0.3.7"; sha256="1k43cp63h96xv3f28fpvw7p2yh3lv1jbhq9bdp3yk6cg0870vya7"; depends=[dplyr magrittr purrr rappdirs rlang stringr tibble tidyselect]; }; + Nmix = derive2 { name="Nmix"; version="1.2.1"; sha256="1jjzwcrb41m0jjfcylcgqv53psw88kmm3kq13n5c1s2nl3isk1i8"; depends=[]; }; NobBS = derive2 { name="NobBS"; version="0.1.0"; sha256="0i0jyny1c29knpcl4szqwyxvdc3dqjfk5lf2xvwjdx3qas92w03l"; depends=[coda dplyr magrittr rjags]; }; NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; }; NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; }; - NonCompart = derive2 { name="NonCompart"; version="0.4.9"; sha256="0c1dhljc1xzqxs5483nkq3sjqxk75c8809ah8jr97y6ff4i1pvb9"; depends=[]; }; + NonCompart = derive2 { name="NonCompart"; version="0.5.0"; sha256="0chskza5d14pf4drj4i56hpf61md69vqnq4w75zsxy3zrsb23xcy"; depends=[]; }; NonNorMvtDist = derive2 { name="NonNorMvtDist"; version="1.0.2"; sha256="11xqdrx03q3anavyxpzb0hz6mcbdy252rzzjlpa2byfdlrfvn178"; depends=[cubature]; }; NonParRolCor = derive2 { name="NonParRolCor"; version="0.6.0"; sha256="0z4c5f2x995k2lgfwnylag69sgrzq1n3qg9c8fn1mhzkdw4y4108"; 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]; }; NonpModelCheck = derive2 { name="NonpModelCheck"; version="4.1"; sha256="0yd30gy1145zizdvy2zh73ppbiz3awg8j1h7j6iabqxy61h0llnw"; depends=[dr]; }; - Nonpareil = derive2 { name="Nonpareil"; version="3.3.4"; sha256="1hhshcggfv92ll5zqh8hd3pldp07n0684yh1252z2jv2vbl87v3z"; depends=[]; }; + Nonpareil = derive2 { name="Nonpareil"; version="3.4.0"; sha256="130aags0pgry0d34mj1n4lavc8q43hls7c3jhmkr8k6vyg3ij372"; depends=[]; }; NormExpression = derive2 { name="NormExpression"; version="0.1.0"; sha256="1j4q8mb70ig40acfd9kfy12vxdvq3qpf53rxh47kkw8mywnd0449"; depends=[]; }; NormPsy = derive2 { name="NormPsy"; version="1.0.8"; sha256="13w4xjdjjg9mzmfaflc0gp306kazyvxshpj4vnl6gym3vpi9qax8"; depends=[lcmm]; }; NormalBetaPrime = derive2 { name="NormalBetaPrime"; version="2.2"; sha256="03il9c57dbwgw38rzckkk0wkc37z8kfdrb7b4k471gm7mqhsm3m3"; depends=[GIGrvg glmnet HyperbolicDist MASS Matrix pracma pscl truncnorm]; }; NormalGamma = derive2 { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[histogram optimx]; }; NormalLaplace = derive2 { name="NormalLaplace"; version="0.3-0"; sha256="0njgjdx2yvvy5jb5zn6zr7jdz5hck5bbkicv15z4ai4ibmckqjmh"; depends=[DistributionUtils GeneralizedHyperbolic]; }; - NormalityAssessment = derive2 { name="NormalityAssessment"; version="0.0.1"; sha256="1syxv75dmwshxh8ahwywyd1jyk3ryhdi5ig22gw1k2kkddy5j49f"; depends=[dplyr DT ggplot2 rio shiny shinyalert shinyBS stringi stringr]; }; + NormalityAssessment = derive2 { name="NormalityAssessment"; version="0.0.2"; sha256="0i02mqxgyzm6y02rbk6skqp58hf35cg4wpfa9abx8rsmbg09jpxj"; depends=[dplyr DT ggplot2 rio shiny shinyalert shinyBS stringi stringr]; }; NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; }; Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; }; - Numero = derive2 { name="Numero"; version="1.8.4"; sha256="0kkska60ilk3lqf5w6z21pjldipg4pky0qgzpbsl69ial62z8xsy"; depends=[Rcpp]; }; + Numero = derive2 { name="Numero"; version="1.9.0"; sha256="0knfp10f8apq2bbp4pbkqwhzwhlvcxnbihdy4gn7parfm07q5wws"; depends=[Rcpp]; }; NutrienTrackeR = derive2 { name="NutrienTrackeR"; version="1.2.0"; sha256="0n54kgxcj8w3r3iqdr13kia49b9zgxiki64h90yygpbg32hqdn8b"; depends=[ggplot2 shiny]; }; OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-3"; sha256="00j5f6kw67qr83cmds9y5rzwiv2sb2b2bfbr5cclpr3wcsw278fs"; depends=[curl xml2]; }; OBASpatial = derive2 { name="OBASpatial"; version="1.8"; sha256="1xc4qz3i5pphgf17asyiafdnlhv5k88rw0fwkwfh8cz767wip1hw"; depends=[cubature HDInterval invgamma LaplacesDemon modeest mvtnorm truncdist]; }; @@ -3292,6 +3337,7 @@ in with self; { 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]; }; ODEsensitivity = derive2 { name="ODEsensitivity"; version="1.1.2"; sha256="0yddv5h3y0xfviqjgrbixawd00jc1rh9ngckfqka5j855vhchh66"; depends=[checkmate deSolve ODEnetwork sensitivity]; }; + ODMeans = derive2 { name="ODMeans"; version="0.1.0"; sha256="1f8difw0npidsnn9sis8pf73i8p4p5cl63g4v02jaxmlmm184wvf"; depends=[geosphere ggplot2]; }; ODS = derive2 { name="ODS"; version="0.2.0"; sha256="0i7giibass7hadvv6mb7k9xrykgfss57jmm6gpbym8qcywhzq4ny"; depends=[cubature survival]; }; OData = derive2 { name="OData"; version="0.6"; sha256="10r4kfhdabramjmkgc4fl0bljaiqbvc7rq4byas7q8cmji2czw6f"; depends=[RJSONIO XML]; }; ODataQuery = derive2 { name="ODataQuery"; version="0.5.3"; sha256="058j3rc5kh134ndsxn5gck2xh6llrs73cyxpa5z8zkmsw9am22qj"; depends=[httr jsonlite R6 rlang]; }; @@ -3308,17 +3354,18 @@ in with self; { 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]; }; OOmisc = derive2 { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; }; OPDOE = derive2 { name="OPDOE"; version="1.0-10"; sha256="04z944i4f3i0cjnxh32wf7n2dfyynnvkz4lxdkn90flam2np58yv"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; }; - OPI = derive2 { name="OPI"; version="2.9"; sha256="0nkdzl4c6k77phiig3mjwp9dkyarcr4k07mxc6ff72yr776s2pma"; depends=[]; }; + OPI = derive2 { name="OPI"; version="2.10.1"; sha256="0yzl3s0bkygwh1mg2fshf370k7hr0iw091k1jpwf92fvym1a68ia"; depends=[]; }; ORCI = derive2 { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; }; ORCME = derive2 { name="ORCME"; version="2.0.2"; sha256="1pm8ajj24qqj2fir0gjzq5f4mfpl1cnj6fm2z5qg6g3sbnm57ayk"; depends=[Iso]; }; ORDER2PARENT = derive2 { name="ORDER2PARENT"; version="1.0"; sha256="04c80vk6z227w6qsnfls89ig4vqyiiymdarhq1pxa0gpr8j2ssx5"; depends=[Matrix]; }; ORIClust = derive2 { name="ORIClust"; version="1.0-1"; sha256="1biddddyls2zsg71w4innxl0ckfb80q2j9pmd56wvbc0qnbm0w3q"; depends=[]; }; - ORION = derive2 { name="ORION"; version="1.0.2"; sha256="04wlrn9w2wmm8cz1ifjxdv00iy4r5ghk3syq1d5c350bisr3fkrz"; depends=[doParallel e1071 foreach igraph knitr randomForest rmarkdown TunePareto]; }; + ORION = derive2 { name="ORION"; version="1.0.3"; sha256="0zzlvx1yd3hy8dy7nbmkj7d2k6609ys91s894qcgx5n7jirqviy3"; depends=[doParallel e1071 foreach igraph knitr randomForest rmarkdown TunePareto]; }; + ORKM = derive2 { name="ORKM"; version="0.0.0.3"; sha256="12pgiwnay2fgi6wdx4a4m1x2kaqw9jgdy2lnvh4r9x4rldz1skjb"; depends=[MASS Matrix]; }; ORMDR = derive2 { name="ORMDR"; version="1.3-2"; sha256="0y7b2aja3zvsd6lm7jal9pabcfxv16r2wh0kyzjkdfanvvgk3wmm"; depends=[]; }; ORTSC = derive2 { name="ORTSC"; version="1.0.0"; sha256="0byja1gi44ymn68cfai8apcimlxmnflqr1pj8k4y7l8lqd3fyz60"; depends=[googleAuthR googleCloudVisionR]; }; ORdensity = derive2 { name="ORdensity"; version="1.0"; sha256="1g9d85dyfhlqmwsigdn64hifasbvw70g3wpph2h9v2ksvia0cd31"; depends=[cluster distances doParallel doRNG foreach plyr Rfast]; }; OSCV = derive2 { name="OSCV"; version="1.0"; sha256="17wrfak6b6m2l3iqbhdwcfh0rlqb14rkvrbari7v46gya9v7hq20"; depends=[mc2d]; }; - OSDR = derive2 { name="OSDR"; version="1.1.3"; sha256="059sj003zsrabmjfhwvvpi599ssrckcqpiw2b3vz405ljnhjmlap"; depends=[]; }; + OSDR = derive2 { name="OSDR"; version="1.1.4"; sha256="0yf9l0fkqf9adanl8182nyislj2s2xvsnf2xp5y7pdj3af2k4m7w"; depends=[]; }; OSMscale = derive2 { name="OSMscale"; version="0.5.1"; sha256="0rjhyhh1iafgd9h1pbd2clyg2sh0gg7y1aqmiislqyn6h6jrvgqn"; depends=[berryFunctions OpenStreetMap sp]; }; 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]; }; @@ -3339,15 +3386,15 @@ in with self; { Ohit = derive2 { name="Ohit"; version="1.0.0"; sha256="132d4drc2phw9ppxnczb1ycdg3dv085k8p6bcaj3v866j0hfxjgb"; depends=[]; }; OjaNP = derive2 { name="OjaNP"; version="1.0-0"; sha256="0xddspnnwlcxh2i66ilh6i920k53y7fv6m1hgj9h28qg2wy0vyah"; depends=[ICS ICSNP Rcpp]; }; OkNNE = derive2 { name="OkNNE"; version="1.0.0"; sha256="0ggx508cqkqc51qw10cajm8r3k5h474n7y8dgck2fr4db047zmcm"; depends=[FNN]; }; + OlinkAnalyze = derive2 { name="OlinkAnalyze"; version="3.0.0"; sha256="1kgfv8v9q2kx8cn1rvizvlybv7qd5qc6n27cxackv97w8jx73s59"; depends=[broom car dplyr emmeans forcats generics ggplot2 ggpubr ggrepel lme4 lmerTest magrittr readxl rlang stringr tibble tidyr tidyselect]; }; OmegaG = derive2 { name="OmegaG"; version="1.0.1"; sha256="1aihcrgml67rvnx9vpnq2nnbc79kicw4ks1fradsa36ykkdz6b1g"; depends=[]; }; 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]; }; OmicKriging = derive2 { name="OmicKriging"; version="1.4.0"; sha256="08frr38yf5d0l3zwkbq9465xrbyzsn8sx9icqc3yvfnxrkhrpzig"; depends=[doParallel foreach irlba ROCR]; }; OmicNavigator = derive2 { name="OmicNavigator"; version="1.8.0"; sha256="081ibvrz5qc6biql6mx0454kfgmm5sgfrjgdf7y3kb1bn7b2x9wq"; depends=[data_table jsonlite]; }; OmicsPLS = derive2 { name="OmicsPLS"; version="2.0.2"; sha256="08vx4925j5ln366h7nzhf1ra5ciplrqw911258chi9di7gpm8g50"; depends=[dplyr ggplot2 magrittr softImpute tibble]; }; - Omisc = derive2 { name="Omisc"; version="0.1.4"; sha256="1f6aakywjabq0xds5yl70ivr1jmw26zry2m65xszfp8p5mp45c7g"; 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=[]; }; - OncoBayes2 = derive2 { name="OncoBayes2"; version="0.8-2"; sha256="0hhj1sdn0yzcib0dh5prc93ill2a3mvh5a8jjsvigk3j5bvhbfwi"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 Rcpp RcppEigen RcppParallel rlang rstan rstantools scales StanHeaders tibble tidyr tidyselect]; }; + OncoBayes2 = derive2 { name="OncoBayes2"; version="0.8-5"; sha256="09im0d01cknxc9kwzpl6xr34fhbj3yqgjgjpfczwmxf4gdhvxvx2"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 Rcpp RcppEigen RcppParallel rlang rstan rstantools scales StanHeaders tibble tidyr tidyselect]; }; Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; }; OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; }; OneSampleMR = derive2 { name="OneSampleMR"; version="0.1.0"; sha256="0gxsfx5www0ndmxaymva2krsyricf4b6nyvjz1hlyjckl3drmqbw"; depends=[Formula gmm ivreg lmtest msm]; }; @@ -3356,10 +3403,10 @@ in with self; { OpVaR = derive2 { name="OpVaR"; version="1.2"; sha256="1923p60yzh8fycwl1fwy01r7ml5yx0kx01ckhgii7slm4cachf5f"; depends=[actuar evmix MASS pracma ReIns tea truncnorm VineCopula]; }; OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.3"; sha256="0mmn4dpk1wl8slg55xzhpk7jdwhkrka53rwmrsr73sikkh3mcyfn"; depends=[digest ggplot2 httpRequest igraph plyr RCurl reshape2 rgdal rjson sp triangle xtable]; }; OpenCL = derive2 { name="OpenCL"; version="0.2-2"; sha256="0gxzda615f67nbljancb8kixzdzkjsy8i0345mlnmlr8kqv4qyhw"; depends=[]; }; - OpenImageR = derive2 { name="OpenImageR"; version="1.2.0"; sha256="161bic7vjknv0hnf8qkkwqbxjcb9mhg62kp7dqrxxrgmgcvazb6g"; depends=[jpeg png R6 Rcpp RcppArmadillo shiny tiff]; }; + OpenImageR = derive2 { name="OpenImageR"; version="1.2.1"; sha256="16c80b62f2cinvhr5v3rdhkx2s69nvjq25szbnj5ipky31ap5aif"; depends=[jpeg png R6 Rcpp RcppArmadillo shiny tiff]; }; OpenLand = derive2 { name="OpenLand"; version="1.0.2"; sha256="02d1dflcbjvm9hgvsm5gpc3s0n0njf4w3224yqk9nc0i49nw01fi"; depends=[circlize dplyr ggplot2 gridExtra networkD3 raster tidyr]; }; OpenML = derive2 { name="OpenML"; version="1.10"; sha256="132swv22ymm0wxq8y65y2niq8chmga1mnl1lgn6m3cgljvwad47r"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise stringi XML]; }; - OpenMx = derive2 { name="OpenMx"; version="2.19.8"; sha256="0q37mwxqhgdi05rwdfwfapgazfp541xsvw3yskf21lv11y2yjjyb"; depends=[BH digest lifecycle MASS Matrix Rcpp RcppEigen RcppParallel rpf StanHeaders]; }; + OpenMx = derive2 { name="OpenMx"; version="2.20.6"; sha256="1v969100hllh0lwlxd2gv0k7krrsp9gc07iinx0nn04wkzh0rib5"; depends=[BH digest lifecycle MASS Matrix Rcpp RcppEigen RcppParallel rpf StanHeaders]; }; OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.12"; sha256="02p9b2y99z9yrrm2pl86p0yqwah0yjic2wdcd4k0mhccimmmkaip"; depends=[abind colorspace GPArotation openxlsx plyr psych pvclust rgl stringr XML]; }; OpenRepGrid_ic = derive2 { name="OpenRepGrid.ic"; version="0.5.1"; sha256="06yy2c64lrqj6h36swbxqsmphsglynxlbb76s5rc79d1627hsmdc"; depends=[dplyr DT formattable igraph magrittr openxlsx RColorBrewer reshape2 rintrojs scales shiny shinyBS shinycssloaders shinydashboard shinydashboardPlus shinyFeedback shinyjs shinythemes shinyWidgets stringr testthat tidyr tidyverse withr]; }; OpenSpecy = derive2 { name="OpenSpecy"; version="0.9.3"; sha256="1wm720g21x0f79ayrjm46vp08zkapjk78p9b5m2ch11vs9blxkd5"; depends=[digest dplyr hexView hyperSpec osfr rlang shiny signal]; }; @@ -3369,6 +3416,7 @@ in with self; { 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]; }; OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; }; OptM = derive2 { name="OptM"; version="0.1.6"; sha256="1x3df5qmbs920rgxpc32grwran49nxpnw9swrba9877c0ixg2dww"; depends=[boot SiZer]; }; OptSig = derive2 { name="OptSig"; version="2.1"; sha256="1k43qsjdc00plgsindjkfn6v098v0zfy7sjkh4n4ybib2qx3v8fn"; depends=[pwr]; }; @@ -3390,20 +3438,20 @@ in with self; { OutlierDM = derive2 { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[MatrixModels outliers pcaPP quantreg]; }; 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.4"; sha256="18hqwp7cj0fdvvqn0bd2grrp80qsm989mwc6vna4fj75a8xpvcqn"; depends=[BH Rcpp RcppEigen RcppNumerical]; }; + OwenQ = derive2 { name="OwenQ"; version="1.0.5"; sha256="02x21ab8yifv1lpk45njmvqawnrch0mrnabav414b7qsaihvg364"; 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]; }; PACLasso = derive2 { name="PACLasso"; version="1.0.0"; sha256="1qzzymhfsjy8mk0r0xpd5h4wrx4wk8gq3vi6fnawkq5xkrg26rld"; depends=[lars limSolve MASS penalized quadprog]; }; PACVr = derive2 { name="PACVr"; version="0.9.4"; sha256="0sj5ibqaw452lncxxbm6xkgmmh9ny6hx4b9hppzwglpgk6vvb5f3"; depends=[BiocGenerics Biostrings genbankr GenomicAlignments GenomicRanges IRanges optparse RCircos]; }; - PAFit = derive2 { name="PAFit"; version="1.2.4"; sha256="13zhlh6fbrlqh6w6bdmlqrwynyk4fbxk0wbkgvrm2pp8cyyv509a"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; }; + PAFit = derive2 { name="PAFit"; version="1.2.5"; sha256="07n27g2yy2lskna7qa4j6am3prdcwfnx98ppvcarsxgzvywz0scv"; depends=[ggplot2 igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; }; PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; }; PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; }; PAMA = derive2 { name="PAMA"; version="1.2.0"; sha256="12fvkcdkn66gzr193fq9byf64qlq2x9dkjv9hpfw770l4yw496jn"; depends=[ExtMallows mc2d PerMallows rankdist Rcpp]; }; 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.7.0"; sha256="1ghhipx42g7s3aplk6c9qwsvr78dzl88czrmhavxfvv5vmdm9n02"; depends=[dplyr geosphere ggplot2 hoardr httr lubridate magrittr ncdf4 PamBinaries purrr RcppRoll rerddap RSQLite seewave stringr tuneR viridis viridisLite xml2]; }; - PAMpal = derive2 { name="PAMpal"; version="0.14.4"; sha256="01fxypdsgshv1bkyqqkd68xnmyz3mcv2hhy2nzfvddfyly7ixys8"; depends=[data_table dplyr gam ggplot2 knitr lubridate magrittr manipulate PamBinaries PAMmisc purrr readr reticulate rjson rlang RSQLite rstudioapi seewave signal stringr tidyr tuneR xml2]; }; + PAMmisc = derive2 { name="PAMmisc"; version="1.8.3"; sha256="0k1zg992ygg9c75lf5nmnrvq2fbl2j5hgcyhzxyjdm0hmznv6r6m"; depends=[dplyr geosphere ggplot2 hoardr httr lubridate magrittr ncdf4 PamBinaries purrr RcppRoll rerddap RSQLite seewave stringr tuneR viridis viridisLite xml2]; }; + PAMpal = derive2 { name="PAMpal"; version="0.16.0"; sha256="0chpsqwrimn6v5i24r77dr4ib9kgi71ppmjzjyhck1ygv702g260"; depends=[data_table dplyr gam ggplot2 knitr lubridate manipulate PamBinaries PAMmisc purrr reticulate rlang RSQLite rstudioapi seewave signal stringr tidyr tuneR xml2]; }; PAS = derive2 { name="PAS"; version="1.2.5"; sha256="175p3bnpnhknfsc29hri0l2ipz1x6qcxs2bq7awns8lccam466r2"; depends=[glmnet]; }; - PASSED = derive2 { name="PASSED"; version="1.1-1"; sha256="06dr5q14lyam6ywn6bg6vfkb68jqb6hw2phd10jcpdzcjvhsbz0r"; depends=[betareg rootSolve]; }; + PASSED = derive2 { name="PASSED"; version="1.2-1"; sha256="1qzxc2xwqw1vc4ld8iask1aijmsl0jhw17rgph08hwl8cqmnm4nd"; depends=[betareg rootSolve]; }; PASWR = derive2 { name="PASWR"; version="1.1"; sha256="1rxymnqvflypc6m62f5vw65l8x1m2yah7r11hhpmzdq2l2sg8fci"; 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]; }; @@ -3422,7 +3470,7 @@ in with self; { PBSmodelling = derive2 { name="PBSmodelling"; version="2.68.8"; sha256="07qaqb6sd1idmryxlz0gxb4d3apzql9vp4b16nazba08ksx0y7wf"; depends=[XML]; }; PCA4TS = derive2 { name="PCA4TS"; version="0.1"; sha256="1qi9nlaf5181afrdvddh10a9vxyhry102n3dhai86im8yz4if9y6"; depends=[tseries]; }; PCADSC = derive2 { name="PCADSC"; version="0.8.0"; sha256="0pwkmmnsw3c6ch2k5wdc8ig71994pdp79v3a5aa9n9aq55a8c2ir"; depends=[ggplot2 Matrix pander reshape2]; }; - PCAmatchR = derive2 { name="PCAmatchR"; version="0.3.0"; sha256="181glfz5nqffdyycycf4w96lyjkvqsbs3av47ah2hagl3innr1vk"; depends=[]; }; + PCAmatchR = derive2 { name="PCAmatchR"; version="0.3.2"; sha256="1dpilm3f6jylm2zggdpdz1gx0z6i56p8rxj744d9lqs1lp6nf37y"; depends=[]; }; PCAmixdata = derive2 { name="PCAmixdata"; version="3.1"; sha256="0flrsnbchwk06dmkg3vqykp9n4pqs265szn1r10navp8ki3rrmvh"; depends=[]; }; PCDimension = derive2 { name="PCDimension"; version="1.1.11"; sha256="0kpw0rpb9k82psfpd19vvvsakvm0pcz1n3kkkcihagp1kzlv4xkw"; depends=[changepoint ClassDiscovery cpm kernlab oompaBase]; }; PCFAM = derive2 { name="PCFAM"; version="1.0"; sha256="196jzv0f6j60zkyagm9n98339ipn8mrhmhl3q4g053z8f6mm9zmv"; depends=[]; }; @@ -3441,11 +3489,12 @@ in with self; { PDE = derive2 { name="PDE"; version="1.3.0"; sha256="1nz0xrhs2iin2grqvxhp99775q8wrjp7isyr1i415vi936jabs0i"; depends=[tcltk2]; }; PDFEstimator = derive2 { name="PDFEstimator"; version="3.1"; sha256="0l9iq7jr266f44laxbhj23ngp5m4fimhxmr4nszajr0j3w14wmrl"; depends=[]; }; 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"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; }; PDShiny = derive2 { name="PDShiny"; version="0.1.0"; sha256="0s09sywvy83dj06rkxzyi06wfymwnfpgf3lpgjbb8ps8q3byd4vs"; depends=[shiny]; }; - PDtoolkit = derive2 { name="PDtoolkit"; version="0.0.9"; sha256="1hlnivz67i2ifs38ky2dr3n02hpjx62iqlnw7vfxnx0jj23bchg6"; depends=[dplyr monobin rpart]; }; + PDtoolkit = derive2 { name="PDtoolkit"; version="0.2.0"; sha256="1glfwq8yw4m4iwipnbc95lp4gbkg0xp28f5cz6gixg4ik3a789px"; 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=[]; }; PEIP = derive2 { name="PEIP"; version="2.2-3"; sha256="1ljalgffgrn9l3q914jjxrn1j740jqk4j8q1vzn3si4np9mz92vp"; depends=[bvls fields geigen Matrix pracma RSEIS]; }; @@ -3462,13 +3511,14 @@ in with self; { PHInfiniteEstimates = derive2 { name="PHInfiniteEstimates"; version="2.1"; sha256="1q10ccdc1jhnddfrh5017cx05kdpfpq1z5jvhnidxaz50sccymmf"; depends=[coxphf lpSolve mlogit Rdpack survival]; }; PHSMM = derive2 { name="PHSMM"; version="1.0"; sha256="1phfdzhfdhyry11plfd8a2lcn3rg02m84brw7fp2lg3hsxjg5ch7"; depends=[Rcpp RcppArmadillo]; }; PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.11"; sha256="1fq2ny093b4881nwgj6wr8qd5g4dcxb51sdx40ndyxxpq6jj16n9"; depends=[]; }; + 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]; }; PINSPlus = derive2 { name="PINSPlus"; version="2.0.6"; sha256="0mws1064kwfm3csdzpfn4g2pwjasdmx9nz5x28znxv8hwrlgm2zw"; depends=[cluster doParallel entropy FNN foreach impute irlba matrixStats mclust Rcpp RcppArmadillo RcppParallel]; }; PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; }; PK = derive2 { name="PK"; version="1.3-5"; sha256="1wzz2qv6h6nc2hcsg4098951i608xbbhc9f9ngamfigh5sbmzbh6"; depends=[]; }; - PKI = derive2 { name="PKI"; version="0.1-9"; sha256="1j8zwjp59bvm1f6cid232n242afjg23q1s438dbzz9wsyc2hx7y6"; depends=[base64enc]; }; + PKI = derive2 { name="PKI"; version="0.1-10"; sha256="08h9am4k69x3ayvp8ah42m2k989ii5j1lm9240v60l2dailij48m"; depends=[base64enc]; }; PKLMtest = derive2 { name="PKLMtest"; version="1.0.1"; sha256="0i1kxczlhn95jw1w7vw87svqhpq9j6xi4fhy974yjx9xhax171hq"; depends=[ranger]; }; PKNCA = derive2 { name="PKNCA"; version="0.9.5"; sha256="0grz5akbpb6i2dg8s9v34qr1zw1r8pczqw2amm6ihi8bxr799223"; depends=[digest dplyr nlme purrr rlang tibble tidyr]; }; PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; }; @@ -3478,7 +3528,7 @@ in with self; { PLFD = derive2 { name="PLFD"; version="0.1.1"; sha256="0zzvrhjv7jxil326sqp0xmna0lc708wx1wv33qf0jf1ggr4hhqqm"; depends=[mathjaxr Rcpp RcppArmadillo]; }; PLIS = derive2 { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; 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="0.11.4"; sha256="13yv6jwayl9d6iwllidn7hh52nybajvwfxg71dy4dh5y3lxpr0ib"; depends=[corrplot dplyr future future_apply ggplot2 glassoFast gridExtra igraph magrittr MASS Matrix nloptr purrr R6 Rcpp RcppArmadillo rlang tidyr]; }; + PLNmodels = derive2 { name="PLNmodels"; version="0.11.6"; sha256="1vmcwh81cfkifbirqk2zs8pxn9ng1934q6cw478px9gaqgxfsyaa"; depends=[corrplot dplyr future future_apply ggplot2 glassoFast gridExtra igraph magrittr MASS Matrix nloptr purrr R6 Rcpp RcppArmadillo rlang tidyr]; }; PLRModels = derive2 { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; }; PLSiMCpp = derive2 { name="PLSiMCpp"; version="1.0.1"; sha256="0dxfv2l2bbg0wfybk6w8p0m5skc9kx7i3ch72j9cvzvza0zqp2ln"; depends=[crayon Rcpp RcppArmadillo]; }; PLmixed = derive2 { name="PLmixed"; version="0.1.5"; sha256="03ivginsg1zhdxv5bzzmh6mxjz2b6qi8p4cq7sfm5q4llkld46x6"; depends=[lme4 Matrix numDeriv optimx]; }; @@ -3499,12 +3549,13 @@ in with self; { POMaSPU = derive2 { name="POMaSPU"; version="1.0.0"; sha256="0jz3jgzdykv0xvfw3ix0hbs32as6dp7p5v8bj5nddknx10d0siya"; depends=[MASS matrixStats Rcpp RcppArmadillo]; }; POSTm = derive2 { name="POSTm"; version="1.1"; sha256="0ax0ky2xbaymw4fdipxvy1gh5wfnnm8hwxcg6hksasaz366widhm"; depends=[ape CompQuadForm]; }; POSetR = derive2 { name="POSetR"; version="1.0.4"; sha256="1fxs741rb4x9b92c1x5i1ngxwaa0r5j2x1x5i4k3y71x67pklmf8"; depends=[igraph Rcpp Rdpack]; }; - POT = derive2 { name="POT"; version="1.1-7"; sha256="1xxm293lmj22dsiaimivpd90xpwnrr36xa371zg6k6w05q4jjfn3"; depends=[]; }; + POT = derive2 { name="POT"; version="1.1-8"; sha256="1j117ld9qww6miz3g8mqhdmznar9ki23pgdz8rzm4mnbkw4vsdpy"; depends=[]; }; 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="1.0"; sha256="0lhqkjl3l77117sk6zq2abc54q7vr2bdbfhfw4nfrzl0m7ypqqba"; depends=[cvCovEst genlasso ggplot2 glmnet MASS]; }; PPMR = derive2 { name="PPMR"; version="1.0"; sha256="07fky5xc1dmmn23wwdjm46c86i7q20dv5f2147828v52hhky873g"; depends=[Rcpp RcppArmadillo]; }; PPQplan = derive2 { name="PPQplan"; version="1.1.0"; sha256="072r7myqsnpyla37q6bj9glwvbygb9g8xkl60q055yzxmfh4rsbr"; depends=[ggplot2 plotly]; }; PPRL = derive2 { name="PPRL"; version="0.3.6"; sha256="08z7fnvz9wdsdba6n19qxg6n32azka9890w16jj7qpv25bpkqvl1"; depends=[Rcpp settings]; }; @@ -3524,10 +3575,9 @@ in with self; { PROJ = derive2 { name="PROJ"; version="0.4.0"; sha256="1rqw28qqcyzla3ssif9jghvv0nyms9riabj2lxhlx1l3rbz0rsfx"; depends=[]; }; PROMETHEE = derive2 { name="PROMETHEE"; version="1.1"; sha256="0r53mb9ndwm4yli3h50cfamsjzpq6b67g72mszm7lpbqpj58wqw6"; depends=[lpSolve]; }; PROSPER = derive2 { name="PROSPER"; version="0.3.3"; sha256="1wdrdqii7d4yfky6706n9xjmabnz99jjja1c80nbj3fp8idsbli5"; depends=[data_table]; }; - PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; }; PROreg = derive2 { name="PROreg"; version="1.1"; sha256="0jws41hgrpcih5ispp6f627f81sjbdygzgjbw4gawf31n5z8pi5a"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; }; - PROscorer = derive2 { name="PROscorer"; version="0.0.1"; sha256="0mgj0mi0vzdk0agimsx4k9i4bss0j5lqiayzhldr1hrqrx2a4f3d"; depends=[PROscorerTools]; }; - PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.1"; sha256="1vliffkfqdn5l96bncfgayv19i20kmawlxi8q853wamj6npdpv5r"; depends=[]; }; + PROscorer = derive2 { name="PROscorer"; version="0.0.3"; sha256="1wmv3yg1njgjc7vr3nkmq4643xfyxinrgjsfkkpahp5xbyyqb222"; depends=[PROscorerTools]; }; + PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.2"; sha256="0fd50c54afa7w687nzw6gpnpn63pjv8brsivrgsv93b1iz8762k4"; depends=[]; }; PROsetta = derive2 { name="PROsetta"; version="0.3.5"; sha256="1igwhksfqv6pxf5jrhds4xvax0sif62vwj7hk3d3gdq0brgi27b9"; depends=[equate lavaan mirt mvnfast plink psych]; }; PRP = derive2 { name="PRP"; version="0.1.1"; sha256="1q4idlk2crxsd841b203hkcyp9glqhsg83liddqlxixxih7rkzp1"; depends=[mvtnorm]; }; PRROC = derive2 { name="PRROC"; version="1.3.1"; sha256="1m28h8pcd78049lz2qixhkcr9h5b3jik3maqzfbvq9y58z71i4a7"; depends=[]; }; @@ -3538,6 +3588,7 @@ in with self; { PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; 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]; }; PSF = derive2 { name="PSF"; version="0.4"; sha256="1hjry8vjqr6zk2i2ppf3fcpsr4v4jm1705qv6i1iz2agl6g2rcnp"; depends=[cluster data_table forecast knitr]; }; + PSGD = derive2 { name="PSGD"; version="1.0.0"; sha256="08wrz1vwvicjxjkj38xr28s84ckvyvaxybvb6fw8m3gkfmgkd7b8"; depends=[Rcpp RcppArmadillo]; }; PSIMEX = derive2 { name="PSIMEX"; version="1.1"; sha256="0cndzasvg4y49incyd9nfz8y3z88ywbc7xk0zzjir665pv2xn23b"; depends=[knitr MCMCglmm pedigree plotrix]; }; PSLM2015 = derive2 { name="PSLM2015"; version="0.2.0"; sha256="1f8kzlqil2ac8a9fbj9fhdni2narh2yaaz044mlx7gsv2ns3ai19"; depends=[dplyr ggplot2 magrittr]; }; PSPManalysis = derive2 { name="PSPManalysis"; version="0.3.7"; sha256="1l8pik1abfrcid8ffwp3gjl9z5iby6l5xcmv1vcg1cbd96z4rvqn"; depends=[pkgbuild rstudioapi]; }; @@ -3549,19 +3600,20 @@ in with self; { PSweight = derive2 { name="PSweight"; version="1.1.6"; sha256="1llb6x30gn230qvgmfzd1fz7f8g6dgjy9mq0x8820mprpd9sjyxs"; depends=[gbm ggplot2 MASS nnet numDeriv SuperLearner]; }; PTAk = derive2 { name="PTAk"; version="1.4-0"; sha256="0hm1xij32wgirj7k7qv162zl5r7aj1iyyhpnlbm9wx1mbw72ccbc"; depends=[tensor]; }; PTE = derive2 { name="PTE"; version="1.7"; sha256="1azkrij4kfmvp03lnzm88gwgvz8g54jq94j0qg8ynxvyjzrppc98"; depends=[doParallel foreach survival]; }; + PTSR = derive2 { name="PTSR"; version="0.1.2"; sha256="0zwqw8zdp0p05nm64yg658iqfbj26n3v2py8r5m6g1sjispm5whf"; depends=[actuar extraDistr numDeriv SuppDists]; }; PTXQC = derive2 { name="PTXQC"; version="1.0.12"; sha256="0k9qvaf2dxfy2lcqnw0zyi17l682rma4c4hhh56m4bycwl2prmv2"; depends=[data_table ggdendro ggplot2 gtable jsonlite kableExtra knitr ontologyIndex plyr R6 R6P RColorBrewer reshape2 rmarkdown seqinr UpSetR xml2 yaml]; }; PTwins = derive2 { name="PTwins"; version="0.1.1"; sha256="166mc7w52n9d3n72h5jvvhbki87prkils3yigdf57dn9pyixrd66"; depends=[]; }; + PUMP = derive2 { name="PUMP"; version="1.0.0"; sha256="03xy77hq9d375v2hpszbnh700lkb4yfd2xn20lwh0bawx94m7rsy"; depends=[dplyr future ggplot2 ggpubr here magrittr mvtnorm purrr randomizr readr rlang stringr tibble tidyr tidyselect]; }; PUPAIM = derive2 { name="PUPAIM"; version="0.2.0"; sha256="1ky6f4yhm3hjrfxwk8vfalzzjgkq1922my26w457q8nfng7f2m53"; depends=[Metrics minpack_lm nls2]; }; PUlasso = derive2 { name="PUlasso"; version="3.2.4"; sha256="0mcmya0a5wzmssq05vpmkx9icfrq49kc0dc9ri3d9kx4w0sabffh"; depends=[doParallel foreach ggplot2 Matrix Rcpp RcppEigen]; }; 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.0"; sha256="1ssmdhq2qczk6n50f8jj4j3nym7jj9bshfc1f29lccvmp7wxdp9a"; depends=[broom cluster dplyr ggplot2 magrittr minpack_lm purrr rlang segmented stlplus tidyr]; }; PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; }; PWEALL = derive2 { name="PWEALL"; version="1.3.0"; sha256="0nb0v6wvj9ay90qcbrr9drg2g84fb7a9m78pzb69wp8789i8ixhk"; depends=[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]; }; PabonLasso = derive2 { name="PabonLasso"; version="1.0"; sha256="158xg9i13nqy1bnpch8r6a7yas01hsdidmcypgccmyh7d7l52mr1"; depends=[]; }; - Pade = derive2 { name="Pade"; version="1.0.3"; sha256="0q4pk2qk7v9wn5sdlvrwn9ir01jxy9nlzygnwkjzhq5vfa720d1k"; depends=[]; }; - PairViz = derive2 { name="PairViz"; version="1.3.4"; sha256="1jd99b4bc2yiv91z7szhrgqhrbh6h6qwacvwf1cl6r8nrv5kqd13"; depends=[graph gtools TSP]; }; + Pade = derive2 { name="Pade"; version="1.0.4"; sha256="0v1ymsmsj3mabq825ciib9mgaszml5iglixhihibd72qj52vg798"; depends=[]; }; + PairViz = derive2 { name="PairViz"; version="1.3.5"; sha256="1fyyfpdsrl75mh0ypzvwcbg95yz6j2v15f30anrc9p8ngdxqwq4a"; 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]; }; PakPMICS2014Ch = derive2 { name="PakPMICS2014Ch"; version="0.1.0"; sha256="0gjrx34613d9wzal292zfzh8hmkav271fqb0skdxd1f8rs2c79dg"; depends=[data_table]; }; @@ -3585,26 +3637,24 @@ in with self; { ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="1.2.4"; sha256="0x6r54gawbfa75qmadhbxw9mgbinwxl84h54w6j6iwg3jbyrnzp8"; 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.1"; sha256="02m7hvjjzwxz1apw4dv8ypxkd8i41if5s83fp2algf4kyv2s44nx"; depends=[caret geoR gstat pryr quantregForest randomForest raster rgdal snowfall sp stringr]; }; - ParallelLogger = derive2 { name="ParallelLogger"; version="2.0.2"; sha256="03wpcdafxfg2k25qdm043brp72qpypzzps4ayzdar85khi5g7znj"; depends=[jsonlite snow xml2]; }; + ParallelLogger = derive2 { name="ParallelLogger"; version="3.0.0"; sha256="1vvh1kzdq3bz7s3yg8kr3zc15qj0qy3d4k13ygd546374w1ywn0k"; depends=[jsonlite snow xml2]; }; ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; }; - ParallelTree = derive2 { name="ParallelTree"; version="0.1.3"; sha256="1h53qwhc63fglm452b3by7f3g6f3hyqwkmwmbdqdb9rv3j4gvnvg"; depends=[ggplot2]; }; ParamHelpers = derive2 { name="ParamHelpers"; version="1.14"; sha256="1sx2ddm8hwvvmk0z65wa689w80py3fny82zjd4d29qwxlv854xmi"; depends=[backports BBmisc checkmate fastmatch]; }; Pareto = derive2 { name="Pareto"; version="2.4.2"; sha256="0396jixa4scqcgq8qyhin91mppg4knz2bfik67jh119clwdrd8vj"; 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]; }; Partiallyoverlapping = derive2 { name="Partiallyoverlapping"; version="2.0"; sha256="0pb0digyigqyzb0zqikgz002kqf1xprcjhxr62a7iqbzy1yycayf"; depends=[]; }; PathSelectMP = derive2 { name="PathSelectMP"; version="1.1"; sha256="036b70bpylmibny6dny79f7gdzn78arqgl2hfs031vygw63yyh9b"; depends=[mice MplusAutomation]; }; - PatternClass = derive2 { name="PatternClass"; version="2.0.1"; sha256="1xwlk6shms38nqxad3d15254wgnkfzy7jyf5w9bbm96kg05mndbz"; depends=[landscapemetrics raster]; }; Patterns = derive2 { name="Patterns"; version="1.3"; sha256="1jmj7jr7q5f6iqrrlv6dz0n2igbppnxfvbdh5nwf5bndyxlldqxn"; depends=[abind gplots igraph jetset KernSmooth lars lattice limma magic Mfuzz movMF msgps nnls plotrix SelectBoost survival 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=[]; }; PeakSegDP = derive2 { name="PeakSegDP"; version="2017.08.15"; sha256="1ndf4d4ikcyqi0k51kil2jw777z4c1m4pda3dahrjmjyz0jhrhkw"; depends=[]; }; - PeakSegDisk = derive2 { name="PeakSegDisk"; version="2020.8.13"; sha256="11nw8x0fr6474yvcf3fhyjql91vknmdsdvx1q1dwblyqd10f120h"; depends=[data_table]; }; + PeakSegDisk = derive2 { name="PeakSegDisk"; version="2022.2.1"; sha256="1wvsg87frdyi7q58b438n331irlgm7wnfd3rf3ca5m636xz6cnr9"; depends=[data_table]; }; PeakSegJoint = derive2 { name="PeakSegJoint"; version="2018.10.3"; sha256="0f0dw6swhhf301j4ci3rs8cmzd39dcjlb0kqxpdh7f00gp3qn7da"; depends=[PeakError penaltyLearning]; }; PeakSegOptimal = derive2 { name="PeakSegOptimal"; version="2018.05.25"; sha256="0j39jzy4r0h787vs3klgbpcmb096ds3hzhvv5w3xs53kl0qkypj4"; depends=[penaltyLearning]; }; PearsonDS = derive2 { name="PearsonDS"; version="1.2.1"; sha256="094q0vxqkm8r30rhgck3vh44qbaj00liddn23cnl7rglil5y6jrm"; depends=[]; }; - PearsonICA = derive2 { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; }; + PearsonICA = derive2 { name="PearsonICA"; version="1.2-5"; sha256="04xi911wzkgsh1ajqamgwgv7wnpgyc20brjcr4jh6gfkfhacjprv"; depends=[]; }; PedCNV = derive2 { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; }; 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]; }; @@ -3618,6 +3668,7 @@ in with self; { PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="2.0.4"; sha256="0ci26hsj4wnw9g0mh4vrn0cg986cpcpx169rvw6v6rbnjxq718bq"; depends=[quadprog xts zoo]; }; PeriodicTable = derive2 { name="PeriodicTable"; version="0.1.2"; sha256="133rwbvapk99dmh3vi8p7sa81d7hjmy0g4a5hcmwr3mdq8jzgwrj"; depends=[]; }; PermAlgo = derive2 { name="PermAlgo"; version="1.1"; sha256="16fhdgr4nza9yknsbwiv8pgljfwp8hhva0crs4dbfd0w4j97n5fp"; depends=[]; }; + PermutationR = derive2 { name="PermutationR"; version="0.1.0"; sha256="1rxz5zkl99bkx6zw8mkr4zr02g7w8wkc9sz3z2wwvgb8rmb7vyir"; depends=[]; }; PerseusR = derive2 { name="PerseusR"; version="0.3.4"; sha256="1k03flbnjndx5mm26hysk64z89858m50kjs8gyldm4s5f09iny6p"; depends=[Biobase plyr stringr XML]; }; PersianStemmer = derive2 { name="PersianStemmer"; version="1.0"; sha256="1dpfkafijg7g7hzka93l1ymq5rcnjsfgvkvbpdx3vjnid05kh4v1"; depends=[]; }; PersomicsArray = derive2 { name="PersomicsArray"; version="1.0"; sha256="1d5gxd65b01m13rgbdhk6w3l43vqcbdk0s1pbgc8h6cnipj55z0i"; depends=[jpeg raster stringr tiff]; }; @@ -3628,13 +3679,13 @@ in with self; { PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; }; Phase123 = derive2 { name="Phase123"; version="2.1"; sha256="0bz867wsnrflzlzrql1vgacymx70rb9wik9jw3g34i2vigpl8x8i"; depends=[Rcpp RcppArmadillo survival]; }; Phase12Compare = derive2 { name="Phase12Compare"; version="1.5"; sha256="0n9rjgdllpnj451a8d4p8x3mjf23czcmk7cn1c9v3l7mg4jn18h2"; depends=[mvtnorm Rcpp RcppArmadillo]; }; - PhaseTypeR = derive2 { name="PhaseTypeR"; version="1.0.1"; sha256="0kr8ysk2zlaap70v1nz9kcxppc9zb49xrwcv103lcn7gacz0iavx"; depends=[expm igraph]; }; + PhaseTypeR = derive2 { name="PhaseTypeR"; version="1.0.2"; sha256="0xm8h1wnq4j76my5ygih8ykrkji70fw74s9bpn2fwxm069h38npy"; 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]; }; 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]; }; - PhitestR = derive2 { name="PhitestR"; version="0.1.0"; sha256="0xk1jpxmqvqqfiaxd43xf5h9g7yxirkqji1g2sa8avd1h5bfqyk8"; depends=[fitdistrplus Seurat]; }; + 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]; }; @@ -3646,19 +3697,19 @@ in with self; { Pijavski = derive2 { name="Pijavski"; version="1.0.3"; sha256="0jspc19fn1mqv3zjr89sy7rqbbyjk3ij3rhrg2dsw167w63lpykx"; depends=[Rcpp]; }; PivotalR = derive2 { name="PivotalR"; version="0.1.18.5"; sha256="1xcr7769d9jixq0lbc89jqzzxnnzxb8gjlws2l6cjm40hcid2yc9"; depends=[Matrix semver]; }; PlackettLuce = derive2 { name="PlackettLuce"; version="0.4.1"; sha256="1l3lh4nvadr4qrpx8mdw7bgaq1w9fhkkaz42pc9hkwbp76brb52i"; depends=[CVXR igraph Matrix matrixStats partykit psychotools psychotree qvcalc R6 RSpectra sandwich]; }; - PlaneGeometry = derive2 { name="PlaneGeometry"; version="1.3.0"; sha256="0sy6hcm8yqr6pfazr19apbpqpwl9nfxmai2q0jipz1h59ha57c8y"; depends=[gsl R6 sdpt3r stringr uniformly]; }; + PlaneGeometry = derive2 { name="PlaneGeometry"; version="1.3.1"; sha256="1ylf7770pz16gh823kf3r2lh5cipkm81s1d9nwp01rapi4zzb6cd"; depends=[fitConic gsl R6 sdpt3r stringr uniformly]; }; Planesmuestra = derive2 { name="Planesmuestra"; version="0.1"; sha256="0v7l4hrfckcf7zmk0ihq2ij0qli7x12j17vd6752d1yjk27fgk57"; depends=[]; }; - PlanetNICFI = derive2 { name="PlanetNICFI"; version="1.0.3"; sha256="03nm6lrn0gm3fl8v7mz2pglr9gbh7vfh03j1pfqyfk0k58a92a48"; depends=[data_table gdalUtils glue httr raster sf]; }; + PlanetNICFI = derive2 { name="PlanetNICFI"; version="1.0.4"; sha256="0xjvdz1vk8wkq8b58l9rm2x4nci76k09kx3vdjhqjgcq0a4kyvql"; 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]; }; 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]; }; - Platypus = derive2 { name="Platypus"; version="3.2.3"; sha256="1idmarx9r2iyp1wpcw46kfjgjzdws75kdiaz9vg6m618fj4n88cl"; depends=[BiocGenerics Biostrings dplyr ggplot2 jsonlite knitr Matrix plyr reshape2 rmarkdown seqinr Seurat SeuratObject stringr tibble tidyr useful]; }; + Platypus = derive2 { name="Platypus"; version="3.3.2"; sha256="0k0c8i0an9pvk4j185s7dacp43fi5439mri4liy42h62kwkf0sl9"; depends=[BiocGenerics Biostrings dplyr ggplot2 jsonlite knitr Matrix plyr reshape2 seqinr Seurat SeuratObject stringr tibble tidyr useful]; }; PlayerRatings = derive2 { name="PlayerRatings"; version="1.1-0"; sha256="04hdjv1gb5b3zym2ryjpqrqhs823nlkmbimfnxw1cfn921ljjgpj"; depends=[]; }; 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]; }; PlotRegionHighlighter = derive2 { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; 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.0"; sha256="09bp31j3qvxancfiz242g752jms5nkjdsl63qinfi96pdq6snbrj"; depends=[Iso knitr magick]; }; + PoPdesign = derive2 { name="PoPdesign"; version="1.0.1"; sha256="14bfxsnbbyfql590f2yhm161qdbnfj7apb0jpiiw5d2bpppx3np8"; 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]; }; PoiClaClu = derive2 { name="PoiClaClu"; version="1.0.2.1"; sha256="1q89b0nypz2iivmgwg1nb1l7p285wy00s40j3qp8zc78ra1rjhyx"; depends=[]; }; @@ -3670,8 +3721,8 @@ in with self; { PoisNonNor = derive2 { name="PoisNonNor"; version="1.6.3"; sha256="1572ma1vk17gp2j9fvmbiaxmnmb773mw15z6mlcf1slgpayp1ldb"; depends=[BB corpcor MASS Matrix]; }; PoisNor = derive2 { name="PoisNor"; version="1.3.3"; sha256="1qi54fg2b1qc305kaihfwr2dkh3b3dd6l67yp9gi61n29kfxaqmf"; depends=[corpcor Matrix mvtnorm]; }; PoissonBinomial = derive2 { name="PoissonBinomial"; version="1.2.4"; sha256="0nx1xqqwsxrfyzrxl3lqmd7d7ljgp6k3z3cw49xbc2z6gbizgm7g"; depends=[Rcpp]; }; + PoissonMultinomial = derive2 { name="PoissonMultinomial"; version="1.0"; sha256="0h8486f5a74yik340ghg6mwb80sj38r02lzjsm0wvv07kb7zq9zp"; depends=[mvtnorm Rcpp RcppArmadillo]; }; PoissonPCA = derive2 { name="PoissonPCA"; version="1.0.3"; sha256="0hdfnq427cywkpb34nj8kdjrc3yligzqag0729qnhh90si0ad036"; depends=[]; }; - PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; }; PolicyPortfolios = derive2 { name="PolicyPortfolios"; version="0.2.2"; sha256="1mfhyy4qyadk389jj6q8livfj45qdwb57wx74cg85jiqd2g19d90"; depends=[dplyr ggplot2 ineq mgcv reshape2 vegan]; }; PolyHaplotyper = derive2 { name="PolyHaplotyper"; version="1.0.1"; sha256="1sc1n42h78nyv004ddykvh1ljjczyiv5rl9sgxhi207lql1zd3wa"; depends=[XML]; }; PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.2"; sha256="1z1hwvsw7b6cz5xfy35a5ldrzb3fhp3swiyz56v1zqblpsaz8n9g"; depends=[gtools]; }; @@ -3679,11 +3730,10 @@ in with self; { Polychrome = derive2 { name="Polychrome"; version="1.3.1"; sha256="044vbylgbqf0ccv4r15nmbw1vz0j95g67i6blw73hvbvbm6w5x4d"; depends=[colorspace scatterplot3d]; }; PolynomF = derive2 { name="PolynomF"; version="2.0-3"; sha256="067l71i2zjv6gvd0br2m034ls3r5lcmc0amml1qbj4wchd7mqlw9"; depends=[Rcpp]; }; Pomic = derive2 { name="Pomic"; version="1.0.4"; sha256="0xy5fgimbgqqac3n7akhwyvnrvd9fpvx9h8nk4spxrxc8x0km1w7"; depends=[]; }; - PoolTestR = derive2 { name="PoolTestR"; version="0.1.1"; sha256="1p6gg8npdw426irsai8y2bzblbpn4zjca3pyfzzgigy4hz89y1db"; depends=[BH brms dplyr lme4 progress Rcpp RcppEigen rstan rstantools StanHeaders stringr]; }; + PoolTestR = derive2 { name="PoolTestR"; version="0.1.2"; sha256="0bl8zgfdaff9h77cnv8y7y152pq930svr0jwhpnz7a4ig446n66g"; depends=[BH brms dplyr lme4 progress Rcpp RcppEigen rstan rstantools StanHeaders stringr]; }; 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]; }; - PopGenKit = derive2 { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; }; PopGenReport = derive2 { name="PopGenReport"; version="3.0.4"; sha256="0x9j9f9k65rfr4fxyrxqa9220psfh1bicls6vwbxmqsfdsfnvs0j"; depends=[ade4 adegenet calibrate data_table dismo gap gdistance genetics GGally ggplot2 knitr lattice mmod pegas plyr R_utils raster reshape rgdal RgoogleMaps sp vegan xtable]; }; PopGenome = derive2 { name="PopGenome"; version="2.7.5"; sha256="0xdwgih1n7bkykbzrnp293yzrlj80vr2v6rlsww61nxlhynbh9yn"; depends=[ff]; }; PopVar = derive2 { name="PopVar"; version="1.3.0"; sha256="1yc2qz7g5jv752yrhjq1ymfdjbqwdcp0hv7pm93qsn51k8fc8i9i"; depends=[BGLR qtl rrBLUP]; }; @@ -3697,12 +3747,11 @@ in with self; { PostcodesioR = derive2 { name="PostcodesioR"; version="0.3.1"; sha256="0mxfcc913l6mhijzfn5rqmri7qbdg1g94g4nqadyxkzw067w7drh"; depends=[httr]; }; PosteriorBootstrap = derive2 { name="PosteriorBootstrap"; version="0.1.1"; sha256="12ial0bcrh3k3z5927zh0bvd413jrz606b07jgbym87kb3n1fxbi"; depends=[dplyr e1071 ggplot2 gridExtra MASS Rcpp rstan StanHeaders tibble]; }; PottsUtils = derive2 { name="PottsUtils"; version="0.3-3"; sha256="165k4sjh3kqkb8bzi68wx00yl77yfbgs70fcbpzmsmcw4g4hdpzn"; depends=[miscF]; }; - PoweR = derive2 { name="PoweR"; version="1.0.7"; sha256="040wc7hxa8y6bm1rs7ip2skdxmmwksxkyb6xzqgdjp8m7a25fppb"; depends=[Rcpp RcppArmadillo]; }; Power2Stage = derive2 { name="Power2Stage"; version="0.5-4"; sha256="1g4zrprbd5q1dn4jfq5c9ayss4p0ljhbsfr3h8h9sjbmcg62rsal"; depends=[cubature mvtnorm PowerTOST]; }; PowerNormal = derive2 { name="PowerNormal"; version="1.2.0"; sha256="1kryqcjvgwk0l4z3gqxdiz47mha3jw5583jlb9z7ml6v7cam06sm"; depends=[]; }; - PowerTOST = derive2 { name="PowerTOST"; version="1.5-3"; sha256="0473vm267hsq7s8ggm4m01jig067qcpm30cza0j1kx9cw6ghq68d"; depends=[cubature mvtnorm TeachingDemos]; }; + PowerTOST = derive2 { name="PowerTOST"; version="1.5-4"; sha256="0k7vbgw0jswynwrammzzlc5radszjyqw9y5h3kh22bzpq4njvl1z"; depends=[cubature mvtnorm TeachingDemos]; }; PowerUpR = derive2 { name="PowerUpR"; version="1.1.0"; sha256="0bnkngdqhzhsbkzp4cxhgm8rzn83q4vm3fj2gkp7z4qznp37lh3j"; depends=[]; }; - PracTools = derive2 { name="PracTools"; version="1.2.4"; sha256="1w53wszn133zvj6bpfr6kkjyx0rqfb7hz93414dn7fwa5x7mczh2"; depends=[]; }; + PracTools = derive2 { name="PracTools"; version="1.2.5"; sha256="1ysp8cwfmr9hihvb59y7gc74gw2a3bgbh57h99xp246i7d12bbhn"; depends=[]; }; 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]; }; @@ -3713,7 +3762,7 @@ in with self; { PredictABEL = derive2 { name="PredictABEL"; version="1.2-4"; sha256="144xmfsp62ssmg501f4y173jrqyv8vps36j4yrwg6ghcmyc01wf8"; depends=[Hmisc lazyeval PBSmodelling ROCR]; }; PredictionR = derive2 { name="PredictionR"; version="1.0-12"; sha256="0kgc8rjdqskasdaxsbir9gwvm55rw5cpdg3y9nsj7ccg9fc1ji19"; depends=[fitdistrplus Renext]; }; PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; }; - PresenceAbsence = derive2 { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; }; + PresenceAbsence = derive2 { name="PresenceAbsence"; version="1.1.10"; sha256="0z4wc0ahqb5n6ikharpamcaim3g3mww0bkyblz61xaq2yzyny9jr"; depends=[]; }; PressPurt = derive2 { name="PressPurt"; version="1.0.2"; sha256="05kca0rlhlvhgnw3r3p4sh42zwvhrhcjdwz65ykp14jxybfhc8in"; depends=[data_table ggplot2 gridExtra reticulate]; }; PrevMap = derive2 { name="PrevMap"; version="1.5.4"; sha256="12cw4dmbsnx9c4y5l5k0paqn1wwbxy9ciw46r254n5rd275fhksh"; depends=[lme4 Matrix maxLik numDeriv pdist raster splancs truncnorm]; }; PriceIndices = derive2 { name="PriceIndices"; version="0.0.6"; sha256="18ci20z07xx7q1mr007hwn2sx65fmvli9w23brgvbpa1wyhh3lhg"; depends=[caret dplyr ggplot2 lubridate reclin reshape strex stringr xgboost]; }; @@ -3721,7 +3770,7 @@ in with self; { PriorGen = derive2 { name="PriorGen"; version="1.1.2"; sha256="0qvdqqdy7wdwwcq95mkgfyf7xf6xlpwdfs3gq299yyv2ba57flnm"; depends=[rootSolve]; }; PrivateLR = derive2 { name="PrivateLR"; version="1.2-22"; sha256="0d142fa3wk7yadvs8jszajs6hq9m03p0j6h5r4pbw7j0d1l72hgc"; depends=[]; }; ProAE = derive2 { name="ProAE"; version="0.2.8"; sha256="1dx5ddkvd8a8z53y1bvx7w7iljyzg15g1gcwqza0skc14s62p4zk"; depends=[DescTools dplyr ExactCIdiff ggnewscale ggplot2 ggtext gridExtra Hmisc magrittr]; }; - ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; }; + ProDenICA = derive2 { name="ProDenICA"; version="1.1"; sha256="0g1ldrb6gsrgm09xjl0dynqaargkj1in8k39rnpanf4zzyrj5181"; depends=[gam]; }; ProFit = derive2 { name="ProFit"; version="1.3.3"; sha256="0jrw0v7dg5mf4zxg7pqybh9qzsiqb3nnz8g5qlc4iz73mhr9gm2b"; depends=[celestial checkmate cubature FITSio LaplacesDemon magicaxis RColorBrewer]; }; 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.1"; sha256="08bhqm64r79ywj394l1ywwcsjc79wzi85wlbp5xnr49bxzaysfp1"; depends=[config dplyr httr lubridate stringr]; }; @@ -3732,7 +3781,7 @@ in with self; { ProbReco = derive2 { name="ProbReco"; version="0.1.0.1"; sha256="0ck5jvbgmf2j4qr4rsamjdrds5jzcggwcvs2hqzhh23ildk7hj7h"; depends=[BH mvtnorm purrr Rcpp RcppEigen Rdpack StanHeaders]; }; ProbSamplingI = derive2 { name="ProbSamplingI"; version="0.1.0"; sha256="1s72jvzayrscn5k43gwip28lax4k24b6piy1wmwvkmpf2xx57wiv"; depends=[]; }; ProbYX = derive2 { name="ProbYX"; version="1.1-0"; sha256="0dphf6jr72l235v3yjhwi8bqmv6ac7yrbyfwhx4qjrrcdnsb7qhl"; depends=[rootSolve]; }; - ProbeDeveloper = derive2 { name="ProbeDeveloper"; version="1.0.0"; sha256="1d2zr8ikia3mspp2arpx7iwf4a4pq1ywl82pxbxrw6xpz313d5x9"; depends=[Biostrings TmCalculator]; }; + ProbeDeveloper = derive2 { name="ProbeDeveloper"; version="1.1.0"; sha256="0ixmxa8sndd16062xd4vivagzd0ghb8d3n153i2wg7rq7g85c1dg"; depends=[Biostrings TmCalculator]; }; 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]; }; @@ -3767,8 +3816,8 @@ in with self; { 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]; }; QBAsyDist = derive2 { name="QBAsyDist"; version="0.1.2"; sha256="1yql29npaq9yz02bv3hqf5m2mhscjms7qqf4vlaxm8s665rxcxad"; depends=[ald Deriv GoFKernel locpol nloptr quantreg scdensity zipfR]; }; - QBMS = derive2 { name="QBMS"; version="0.6"; sha256="083asm4qck29n7mm0b39h1gv7mbsa62w7xn16vy7cmyim9si5h3z"; depends=[httr jsonlite]; }; - QCA = derive2 { name="QCA"; version="3.13"; sha256="1v85bcir1jpkm61zpv9zyf79qv3nb4z0z5lh1r10b9idffddcjws"; depends=[admisc shiny venn]; }; + QBMS = derive2 { name="QBMS"; version="0.7.0"; sha256="14mq0l2ih6vchn7q2ssscxyrhrvfic3hnb4qyhd6sfy9a8cs8klm"; depends=[httr jsonlite]; }; + QCA = derive2 { name="QCA"; version="3.15"; sha256="1rijfdslq44w8abamplhj5f0l9jq43jcklcza64rfyxqfavc8mia"; depends=[admisc shiny venn]; }; QCAcluster = derive2 { name="QCAcluster"; version="0.1.0"; sha256="094p11c9arry793zibr8x3xhpbrym9bfky95nds53g3yliprdd63"; depends=[data_table magrittr plyr purrr QCA rlist stringi testit UpSetR]; }; QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; }; QCApro = derive2 { name="QCApro"; version="1.1-2"; sha256="1glfb1x1h05cs07nq5glqvlil58wp3c0kaxi1l7k94y797i8r7hq"; depends=[lpSolve]; }; @@ -3786,6 +3835,7 @@ in with self; { QGglmm = derive2 { name="QGglmm"; version="0.7.4"; sha256="0ghvicz4ia1180byj28lmg49889hqhb94g1jrkhm6hnzgqbjnfmd"; depends=[cubature]; }; QHOT = derive2 { name="QHOT"; version="0.1.0"; sha256="02z0n2jawd6m7bvyvpcy0j13p1c0zm036g62n56xva18qnq5c9lb"; depends=[]; }; QHScrnomo = derive2 { name="QHScrnomo"; version="2.2.0"; sha256="1g7gx1mhvqnldqwi9dx5f7nxqrra9mgfn5rq467f1nhlv6m2kzn6"; 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=[]; }; QPmin = derive2 { name="QPmin"; version="0.5-1"; sha256="1hfvbi2qfynnkg2pmr7qsw75bmijwglnxchbzxcbikm5yw3sd2mz"; depends=[Matrix]; }; QQperm = derive2 { name="QQperm"; version="1.0.1"; sha256="06xhv54zgnx8i22j23a0dqxhh7my416idpkkwq93qd1rdzgamzc8"; depends=[]; }; @@ -3796,24 +3846,26 @@ in with self; { QRank = derive2 { name="QRank"; version="1.0"; sha256="1f924r5bf5vjfl12hk1n5m3f94g30f6vmvzq2bn8295dflyndck0"; depends=[quantreg]; }; QRegVCM = derive2 { name="QRegVCM"; version="1.2"; sha256="0fcydkf6r2qxd59ylr8vn76bkxks91v58gfzvq3rjd5mqf9vsaaq"; depends=[quantreg SparseM truncSP]; }; QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; }; - QTL_gCIMapping = derive2 { name="QTL.gCIMapping"; version="3.3.1"; sha256="01lxa52fm6pzicjg252fxqy9hcj0rf511nzc3fcq25cfi9cly0v1"; depends=[data_table doParallel foreach glmnet MASS openxlsx qtl Rcpp stringr]; }; + 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.1.0"; sha256="0gwxrsbpbn1v3z0yal8qrnamzq1gjax9d9nja8bbcgw8cbf3gamf"; depends=[mvtnorm]; }; - QTLRel = derive2 { name="QTLRel"; version="1.7"; sha256="00k0kwxy9jnxk56a87xra5gbgrhdhpyhyvghmsq3lxb7iim91qgw"; depends=[gdata lattice]; }; + QTLRel = derive2 { name="QTLRel"; version="1.9"; sha256="10lydj6zgijk2dxkncp35vrvic1v2s3v1zv44w7xi1i3wb3ifksx"; depends=[gdata lattice]; }; QTOCen = derive2 { name="QTOCen"; version="0.1.1"; sha256="0wlbxk1rd56k02jf3pfzbx6xx5mmf6sb7gvds0067cvb7m42ghcr"; depends=[MatrixModels quantreg Rdpack rgenoud survival]; }; QUALYPSO = derive2 { name="QUALYPSO"; version="1.2"; sha256="0hp99hhlv7rijn34ncshpvbnmhbx3f5km7bzr0z7yr7l3j1vx3sc"; depends=[doParallel expm foreach MASS Rfast]; }; - QWDAP = derive2 { name="QWDAP"; version="1.1.10"; sha256="1cq5cnap4hbzaswcy9ld4q9jkx3cxgs3mysh30fwq8xmf56hh7dy"; depends=[CORElearn MTS pls progress StepReg]; }; + QWDAP = derive2 { name="QWDAP"; version="1.1.11"; sha256="1kin58d2kaxy1zyzln95xxj8lrjir3zq9gfc2c026sq2pcaqlxkv"; depends=[CORElearn MTS pls progress StepReg]; }; + QZ = derive2 { name="QZ"; version="0.2-2"; sha256="13s9yp9dz95iar2s8mhyi1sfba4wsdddpjard01665s34cvf1xw9"; depends=[Matrix]; }; Qapprox = derive2 { name="Qapprox"; version="0.2.0"; sha256="0mv3xfy847lqh95mpccjiw5jjbml7dwrna7i16532sdqcxaq4m02"; depends=[]; }; + QoLMiss = derive2 { name="QoLMiss"; version="0.1.0"; sha256="00g1ykwlmc4w0bmzj0jg9ckr2bvkl8qcxd67wdc12alccqqd584v"; depends=[dplyr missMethods survival]; }; Qtools = derive2 { name="Qtools"; version="1.5.5"; sha256="0kmd5cd299gjw5qbk8yhlzxcwa3ykrr36zcpk773mykyz57q46hb"; depends=[boot glmx gtools MASS Matrix np numDeriv quantreg Rcpp RcppArmadillo]; }; QuACN = derive2 { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; }; QuClu = derive2 { name="QuClu"; version="0.1.0"; sha256="0a2malh9vz5jcjgdx4d98k0c61vz3ip8ynqh5i85x8hzcby11qgj"; 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=[]; }; QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; }; Quandl = derive2 { name="Quandl"; version="2.11.0"; sha256="1bsba6blbcq0my8wm0qcy0qabbgx344gjljnjwaqfrqkjcphf5xs"; depends=[httr jsonlite xts zoo]; }; QuantNorm = derive2 { name="QuantNorm"; version="1.0.5"; sha256="1hds9ybwsgnmcpa22vlmgdq02ilhn0c6a7z1qjiq4i5iqjd4gwf6"; depends=[]; }; - QuantPsyc = derive2 { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; }; QuantTools = derive2 { name="QuantTools"; version="0.5.7.1"; sha256="1nkf7ihzfwgz7svh1jybgcvqwbim2dqzi00l4m9pma463va4q19d"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; }; - QuantileGH = derive2 { name="QuantileGH"; version="0.1.0"; sha256="0mg5fd5673kgaq3zjfbk17awni9xyn5dxivkql76ac2cbfg6dxy2"; depends=[ggplot2 rstpm2 scales tclust]; }; + QuantileGH = derive2 { name="QuantileGH"; version="0.1.1"; sha256="0ah1l5zzlsda2s6x0i4rcln8smg52jwpxcaf52zfarfbw30a88jp"; depends=[ggplot2 goftest LaplacesDemon rstpm2 scales tclust]; }; 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=[]; }; @@ -3841,7 +3893,7 @@ in with self; { R2HTML = derive2 { name="R2HTML"; version="2.3.2"; sha256="00kxny7hajs9r2kw63qk7d03ggdxx2j1g8vbrmzp806y8aczvik9"; depends=[]; }; R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-7"; sha256="1r12b0gy5747acn0jyf3n2f210a51pgl6vkk1rd4fbbj0dk5bwmf"; depends=[broom coda digest doParallel foreach foreign lattice Matrix memisc R2WinBUGS texreg tibble]; }; R2OpenBUGS = derive2 { name="R2OpenBUGS"; version="3.2-3.2.1"; sha256="0689aqa034xkbyy46m3sjanjkxrii4ma1crm5qw5kaqbx7dg153c"; depends=[boot coda]; }; - R2SWF = derive2 { name="R2SWF"; version="0.9-6"; sha256="0ag4w9cgxwfxfpywq3nv04n2mlwj07r04pg48pmlvkw0h7fjlfjl"; depends=[sysfonts]; }; + R2SWF = derive2 { name="R2SWF"; version="0.9-7"; sha256="1pr3klgb731zwhwkz2c0wj2mvhy5qixzg1x451ik683ycni81qlw"; depends=[sysfonts]; }; R2WinBUGS = derive2 { name="R2WinBUGS"; version="2.1-21"; sha256="0k8k214x712vjj2k1am4zzf6scccs3b98ysiz4lwxpzm818wp1ps"; depends=[boot coda]; }; R2admb = derive2 { name="R2admb"; version="0.7.16.2"; sha256="1gwp850ff76lqqn6amj75rjqb1szk6x2vlhqgwng4z45i56bmdf7"; depends=[coda lattice]; }; R2jags = derive2 { name="R2jags"; version="0.7-1"; sha256="0si2f0lmnpjcsmy54k51kwj1fkx24dshiidv46h8j2xjq1hp429v"; depends=[abind coda R2WinBUGS rjags]; }; @@ -3860,8 +3912,8 @@ in with self; { 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]; }; RAEN = derive2 { name="RAEN"; version="0.2"; sha256="098d990qa987hx2llqwdw2bmi5nmrlda23j1rgmw5nirllk28d30"; depends=[boot doParallel fastcmprsk foreach glmnet lars]; }; - RAINBOWR = derive2 { name="RAINBOWR"; version="0.1.26"; sha256="1x2gdx9fk28r7q6i5b8x0kald2qfiljqm62fpwhg57vz0q53pl51"; depends=[ape cluster expm ggplot2 ggtree haplotypes here htmlwidgets MASS Matrix optimx pbmcapply pegas phylobase Rcpp RcppEigen Rfast rrBLUP scatterpie stringr]; }; - RALSA = derive2 { name="RALSA"; version="1.0.2"; sha256="066m08v3kd5y3cw3s9d8ijchwfd4fw8ps4mgh4q3zy2y7g0wda97"; depends=[data_table DT foreign Hmisc openxlsx readr shiny shinydashboard shinyFiles shinyjs stringi stringr]; }; + RAINBOWR = derive2 { name="RAINBOWR"; version="0.1.29"; sha256="0g82wi0bffkkb86axsa814dbqhscs9mlgk43j3j375v9kbd4136c"; depends=[ape cluster expm gaston here htmlwidgets MASS Matrix MM4LMM optimx pbmcapply pegas Rcpp RcppEigen Rfast rrBLUP stringr]; }; + RALSA = derive2 { name="RALSA"; version="1.1.0"; sha256="01c4l18mkk59px11fcdc5hqmbm7ycsq519y89zvlbw22qnawi6l6"; depends=[data_table DT foreign Hmisc openxlsx readr shiny shinydashboard shinyFiles shinyjs stringi stringr]; }; 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]; }; RAMClustR = derive2 { name="RAMClustR"; version="1.2.2"; sha256="0v75dxwn1bybjw3zybvz60j01nffl0nzybw5k0a7kqhbcb7cdpqw"; depends=[BiocManager dynamicTreeCut e1071 fastcluster ff ggplot2 gplots httr InterpretMSSpectrum jsonlite MSnbase pcaMethods preprocessCore RCurl stringi stringr webchem xml2]; }; RAMP = derive2 { name="RAMP"; version="2.0.2"; sha256="0836fiycrsxiwdw7srz1rvsf639iqh2rk89gavx4kvn0i0sc8d2x"; depends=[]; }; @@ -3871,21 +3923,20 @@ in with self; { RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; }; RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; }; RAPTOR = derive2 { name="RAPTOR"; version="1.0.1"; sha256="1bj3xsl83mb8zwap8icywrfdld382fram79b0n14jbk1l87rj9r4"; depends=[mgcv]; }; - RAQSAPI = derive2 { name="RAQSAPI"; version="2.0.2"; sha256="0325s4b62a1kpq8r4bcxa0njbih71aywbvpzxf0w0qsrbrk4wdq7"; depends=[dplyr glue gtools httr jsonlite lifecycle lubridate magrittr purrr rlang stringr tibble]; }; + RAQSAPI = derive2 { name="RAQSAPI"; version="2.0.3"; sha256="0y9x5s1r5qfxx93wvcpa62s486d6yrrn56ks5wfgpx18jlm39q8d"; depends=[dplyr glue httr jsonlite lifecycle lubridate magrittr purrr rlang stringr tibble]; }; RAT = derive2 { name="RAT"; version="0.1.1"; sha256="02cd7lp9dzabmb1ll59xflyhlhhfnzhbdwcn68vrdjmxyppw6crl"; depends=[ggplot2 mapproj wosr]; }; RATest = derive2 { name="RATest"; version="0.1.9"; sha256="02673wbss90c192rxbzxfsbnirl63k7d8fq989chmjc5z2xjzajj"; depends=[ggplot2 gridExtra quantreg]; }; RAdwords = derive2 { name="RAdwords"; version="0.1.18"; sha256="1c3m2j2cf1s51p783rdng5ns913bv7rbjc1vpmrmsxg2kf5f6qyq"; depends=[RCurl rjson]; }; RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.6"; sha256="15j6vb6rm4ykwjachqyyfvjshiilyjqnpj8x6qc93savk04rf279"; depends=[]; }; RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; }; RAppArmor = derive2 { name="RAppArmor"; version="3.2.2"; sha256="0l0f4k666nh00db94sjxz60anr4l9vm0259pcc2a4whk2pmjcq5n"; depends=[unix]; }; - RAthena = derive2 { name="RAthena"; version="2.4.0"; sha256="10zg9df5n9il6w7088l6kkzd4g9clvc98l5cppci41vn6smsswr4"; depends=[data_table DBI reticulate uuid]; }; + RAthena = derive2 { name="RAthena"; version="2.5.1"; sha256="1hnw7p0hzx1y3x4qpg7ry1yy9bf58q9d5yfya7h1dl1cw2qj1jkx"; depends=[data_table DBI reticulate uuid]; }; RBF = derive2 { name="RBF"; version="2.1.0"; sha256="0062ckvrjfkkl5lfrshrr2cynrxsrp4zpdpl8nij06hm00i3gfs5"; depends=[]; }; RBMRB = derive2 { name="RBMRB"; version="2.1.7"; sha256="09x7zaigflc0d3pbdrvfv1kdklrlzgd4v2ma3dcr96l36n1iqqns"; depends=[data_table ggplot2 httr plotly rjson]; }; 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.0.0"; sha256="0nj9sc14bc0m0xkdqnc3h7frcn4y0wbdpr6wnd8kvnipcrr3jcrl"; depends=[data_table dplyr httr magrittr openssl pingr R6 RCurl rex stringr tibble]; }; RBesT = derive2 { name="RBesT"; version="1.6-3"; sha256="0nbqkxsi6di4sd26l9c212sjs2lsvnabwbnf0cx00hmxrxzy0lhl"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 mvtnorm Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; - RBestMatch = derive2 { name="RBestMatch"; version="0.1.1"; sha256="1nx1dnhlqi4gad1yw6h91av911wv6dap252hza98dgjysv46spya"; depends=[DiPs mvnfast plyr]; }; RBitmoji = derive2 { name="RBitmoji"; version="0.0.2"; sha256="1v9qj3vmqsvnccsy735nbflmd81183h2flm0f1ckd4kl08r2fr3f"; depends=[getPass httr jsonlite png RCurl]; }; 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]; }; @@ -3893,28 +3944,29 @@ in with self; { RCALI = derive2 { name="RCALI"; version="0.3.1"; sha256="0hc7h55qi8bpmp9rfh1wgxqs28kbs4yqxch2jlgl42vk5383askq"; depends=[splancs]; }; RCBR = derive2 { name="RCBR"; version="0.5.9"; sha256="1nxaf485jfg1kr80bxwczf27xz5ab7yz61c5l3bg9192jdf432ql"; depends=[Formula Matrix mvtnorm orthopolynom REBayes Rmosek]; }; RCCPCA = derive2 { name="RCCPCA"; version="0.1.0"; sha256="0nix6d8cxi64qfnsk00rpzq9kf07a5skc8zkvywl2y2aw6wrlvnd"; depends=[]; }; + RCDT = derive2 { name="RCDT"; version="1.0.0"; sha256="1l72dbgxkkhv4v8mjrz1zsq3jhvan4krgkjbjyd9hd5faj7hhrcy"; depends=[gplots randomcoloR Rcpp RcppArmadillo]; }; RCEIM = derive2 { name="RCEIM"; version="0.3"; sha256="1kil5r88b6lf8vxmswz0wn0hhjxjm8jmlcl5kxjwl6fwjyy2z120"; depends=[]; }; RCGLS = derive2 { name="RCGLS"; version="1.0.3"; sha256="12mmfs91fmhdxdxr7q16hnjlg7bz2bbkf8chld4cyf8clnflzvsj"; depends=[ncdf4 raster RCurl sp]; }; - RCLabels = derive2 { name="RCLabels"; version="0.1.0"; sha256="0p41i2cxv81g57xv1vba2dzn2xqpv7gy04wpyaxg325xh3zf1mf0"; depends=[assertthat Hmisc magrittr purrr]; }; + RCLabels = derive2 { name="RCLabels"; version="0.1.1"; sha256="1nvjq40labgrrn3lbyvnk9zir0ghgxkqrniddp4w7wffsfz4dj00"; depends=[assertthat Hmisc magrittr purrr]; }; RCMinification = derive2 { name="RCMinification"; version="1.0"; sha256="1n8rb5lz0bansggma8gs45xbmmzh98xcsg1vcwwviv2zgq8ww7jf"; depends=[]; }; + RCPA3 = derive2 { name="RCPA3"; version="1.1.1"; sha256="0zq700g7gwnf3rw0zd4m4h0rhp10d4ar5fdxwzbkn708c2m4znxg"; depends=[beepr car descr haven Hmisc knitr lmtest survey weights]; }; RCPmod = derive2 { name="RCPmod"; version="2.190"; sha256="1r24g8fcizyqzgp0da90sxpwalgcsgz2b168j2smpylxraiqb037"; depends=[fishMod glmnet gtools MASS]; }; RCRnorm = derive2 { name="RCRnorm"; version="0.0.2"; sha256="1mz1jb7mc9c47hbk9flnddny4zir6r2k5qis30iynwqny521l6ln"; depends=[truncnorm]; }; RCSF = derive2 { name="RCSF"; version="1.0.2"; sha256="1hjl7qsdgcddn3nh2likndhfhnw9gj3453xqq96gddgb1y0m3bh1"; depends=[Rcpp]; }; RCT = derive2 { name="RCT"; version="1.1.1"; sha256="01ir440zgxjvzwn5vazxib0w14nqy7lk7glwvba39xqghb3xw85z"; depends=[broom dplyr forcats ggplot2 glue lfe magrittr MASS pracma purrr rlang stringr tidyr tidyselect]; }; - RCarb = derive2 { name="RCarb"; version="0.1.4"; sha256="0mlas45ypwdkk6gr35fhsrjgn8am06ikh123drmky1yj1kkg6p76"; depends=[interp matrixStats]; }; + RCarb = derive2 { name="RCarb"; version="0.1.5"; sha256="1ww10kzc6lhhfsipfdf005ic2wf6kmr5dyahsj4bi2jp2fbh2g0m"; depends=[interp matrixStats]; }; RCassandra = derive2 { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; }; 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.5.2"; sha256="1ii4d1nh15km1savahpwgvdn3lb2y7sa44izqydckw1xawwgf7xr"; depends=[bit64 DBI dbplyr dplyr Rcpp]; }; + RClickhouse = derive2 { name="RClickhouse"; version="0.6.3"; sha256="1xvx098amys1816lkb1gdz5wz5lp58dw9bp9f4dlgbzjdl027ns5"; depends=[bit64 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]; }; - RClone = derive2 { name="RClone"; version="1.0.3"; sha256="1zcb7s88qkpcbkhvawggsckzs5d9s9l9kr2c2njrr86ymq7lgwdj"; depends=[]; }; RColetum = derive2 { name="RColetum"; version="0.2.1"; sha256="1hgk9p234m3w49sw2j2rg8c14z3gz1mabvb69b1bxrg7f1mz9slg"; depends=[dplyr httr jsonlite]; }; RColorBrewer = derive2 { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; }; RConics = derive2 { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; 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]; }; - RCurl = derive2 { name="RCurl"; version="1.98-1.5"; sha256="13b9vlvknxlcmqgaaxb33srvyshsh59zmdsz4pfgz24i0fd7q63k"; depends=[bitops]; }; + RCurl = derive2 { name="RCurl"; version="1.98-1.6"; sha256="18nif4phr5vfhri07mnchiym0qfm31ak9nxvb2v9ac84mij6idbc"; depends=[bitops]; }; RCytoGPS = derive2 { name="RCytoGPS"; version="1.2.1"; sha256="1ppxyrm9h09kk6lnr6yg3n3xl08l9zp4rqliz92k5h42hmgj6f02"; depends=[rjson]; }; RCzechia = derive2 { name="RCzechia"; version="1.9.1"; sha256="1xwzbbap6h02z7jpzrgh0lmrzxssdjh0gr8fk0ivnl8zgfqrfk86"; depends=[curl httr jsonlite magrittr sf]; }; RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; @@ -3944,26 +3996,25 @@ in with self; { RESS = derive2 { name="RESS"; version="1.3"; sha256="1vddmifp47ia0sk35rnjpvw6gr9ygygafqczq268h17i1qs6ar22"; depends=[]; }; REST = derive2 { name="REST"; version="1.0.1"; sha256="16v89z7p9qkg7bsypf9vkrnbmb2n7gw3fqnfzbyxwj496wzxdv1x"; depends=[Rcmdr]; }; REdaS = derive2 { name="REdaS"; version="0.9.3"; sha256="09mmcvzgsxvrcq7sq3pw81pxgb1493p8lx8p5hhz8i42vshza6pn"; depends=[]; }; - REddyProc = derive2 { name="REddyProc"; version="1.3.1"; sha256="1n9ykffn7sw6y7ywg0hl9gldn9nrzjmis03ikfjjd8khz4jrqhgy"; depends=[bigleaf dplyr magrittr mlegp purrr Rcpp readr rlang solartime tibble]; }; + 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.3"; sha256="1h7ycxwklb9dbb8q0g9cagjl93jhbjc86l25s1imdp1rqfsv8i6c"; depends=[AER corpcor data_table Formula lme4 lmtest Matrix mvtnorm optimx Rcpp RcppEigen]; }; RFCCA = derive2 { name="RFCCA"; version="1.0.7"; sha256="0v0himz0zz6f52vvc5h33qiij0101zgihzwak8cw5193xzsfmr4g"; depends=[CCA PMA]; }; RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; }; - RFLPtools = derive2 { name="RFLPtools"; version="1.9"; sha256="0vcxlvfhm6sksjs7zx45jss31310fvglzaj948j49xhf08rik0iz"; depends=[RColorBrewer]; }; + 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]; }; RFclust = derive2 { name="RFclust"; version="0.1.1"; sha256="0030d6831lvlhy7k9q5pin1jarzz4z242wncfsa520md1kvqs77d"; depends=[ConsensusClusterPlus iCluster randomForest]; }; - RFishBC = derive2 { name="RFishBC"; version="0.2.3"; sha256="1xhjsinb6dfr1zzzyvawc6bb10dnr3nbx86mi6lrzav42sbq31ni"; depends=[cli clisymbols crayon readbitmap rlang settings stringr tidyr withr]; }; + RFishBC = derive2 { name="RFishBC"; version="0.2.4"; sha256="1wh1j5lciff1vgjwrmc2hhr0yfq289l6k917pzhpl5bk6r4ml0fs"; depends=[cli clisymbols crayon readbitmap rlang settings stringr tidyr withr]; }; RFmerge = derive2 { name="RFmerge"; version="0.1-10"; sha256="1gcdd0a0czimzmzq2izskdaj26cc7qchrwlhssvnh5k59yx54r4l"; depends=[pbapply randomForest raster sf sp zoo]; }; RFormatter = derive2 { name="RFormatter"; version="0.1.1"; sha256="0jmzdc2cl4vvffsyfwp493fiygh9xinhv970qxp1667rw8wlap8l"; depends=[formatR]; }; - RFpredInterval = derive2 { name="RFpredInterval"; version="1.0.4"; sha256="0p1plszxqy6xxngrgzr6m0724rjz3caynipdb2r5sd9d2yc7cs3z"; depends=[data_table data_tree DiagrammeR hdrcde ranger]; }; + RFpredInterval = derive2 { name="RFpredInterval"; version="1.0.5"; sha256="1ri62dfgwsbgrvjx7qn4mbv1p0mk2ynkrnw9s1klv31p2431rli5"; depends=[data_table data_tree DiagrammeR hdrcde ranger]; }; RFreak = derive2 { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; }; RGA = derive2 { name="RGA"; version="0.4.2"; sha256="0pjizgvrh0gbjlyxlb3v93nhigg8rpq3mziv1qlp6r0s5y7cmpi9"; depends=[httr jsonlite lubridate plyr]; }; RGBM = derive2 { name="RGBM"; version="1.0-8"; sha256="0xd64g07y808nzs4zvbx6bxdpbj2ndqg6yzc3p0l43pxm4hyxva0"; depends=[doParallel foreach plyr]; }; RGCCA = derive2 { name="RGCCA"; version="2.1.2"; sha256="0zcxakqnmih0243y5b6r9nmcfanzxd6q344pd5bca5pnm3y43wr0"; depends=[Deriv MASS]; }; - RGCxGC = derive2 { name="RGCxGC"; version="1.1-2"; sha256="03ihqra8q50a98adgxrx8l7js963f41kg2fy3lxzh9zma4gzj62q"; depends=[colorRamps mixOmics ptw Rdpack RNetCDF]; }; RGE = derive2 { name="RGE"; version="1.0"; sha256="1ild1if10xicfapfcmydz1cgvn5fyydrik8qclb90i95bl9bs4ia"; depends=[coda Matrix MatrixModels]; }; - RGENERATE = derive2 { name="RGENERATE"; version="1.3.6"; sha256="08jx52bfiy1mzcrps93sx4c8swnc0v8n62wqws527mvbblihfn05"; depends=[magrittr RMAWGEN]; }; - RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2.8"; sha256="1y70fs8d7vldwijgzny3awcvx97sghclyrb40dzvffli2q15ym9f"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; }; + RGENERATE = derive2 { name="RGENERATE"; version="1.3.7"; sha256="0w6hqrf2lr6qz79skml2vjpfwfv5vxj94rghxxa3rp9dqzhi7rc0"; depends=[magrittr RMAWGEN]; }; + RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2.9"; sha256="0bnw77vny61pkhp9pb3v3ckz6immm4pp9f7qzyhc97646fci9ysl"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; }; RGF = derive2 { name="RGF"; version="1.0.8"; sha256="0nd38cn3248kgzknr0ba3wg5y1g15vh74y9y94i2bqr1vchf6xsm"; depends=[Matrix R6 reticulate]; }; RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; }; 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]; }; @@ -3998,14 +4049,14 @@ in with self; { RImpact = derive2 { name="RImpact"; version="1.0"; sha256="010bdq6r2fv4rs78kl1ixnw1di39v90ckh8bblzi0wv4adlbaza4"; depends=[]; }; RInSp = derive2 { name="RInSp"; version="1.2.4"; sha256="1rfikmrz1y7sx9qwsqh5ifqryf6218n9dbhfmk2w2vl2pdgw4xyr"; depends=[]; }; RInside = derive2 { name="RInside"; version="0.2.16"; sha256="03iabanmj5xkgq7r1n1rkmzjf2zz484637nmd1qg61ga53hsvr3s"; depends=[Rcpp]; }; - RItools = derive2 { name="RItools"; version="0.1-17"; sha256="1shcvkgsyjk9jmpf7icj1zjlvmqa11scmymc8cycnffax604frbm"; depends=[abind SparseM survival svd xtable]; }; + RItools = derive2 { name="RItools"; version="0.1-18"; sha256="0a591xm1nxrlhx3r6yss0ii0rv5gd6nfv4yzbmfzxjjaw3c8aiki"; depends=[abind SparseM survival svd xtable]; }; RJDBC = derive2 { name="RJDBC"; version="0.2-8"; sha256="1qfq1vjlxhg3hmb1169zkss7kng74jhjninqkfr3cca8x1fq9593"; depends=[DBI rJava]; }; RJDemetra = derive2 { name="RJDemetra"; version="0.1.9"; sha256="0av3yqibyipxvch5p2zv9r82pvpvl406nxd5pkm4pnbjndw09j3s"; depends=[rJava]; }; RJSDMX = derive2 { name="RJSDMX"; version="2.3-3"; sha256="02lbg82g4abng5vcn2g8ghvmg69q35my8smnbvd09yvha8hb49ps"; depends=[rJava zoo]; }; RJSONIO = derive2 { name="RJSONIO"; version="1.3-1.6"; sha256="17x0ayk7daprbc8w2hvb2jl9mfnw4dic9yc3sr5adcjqfzmcklc2"; depends=[]; }; RJSplot = derive2 { name="RJSplot"; version="2.7"; sha256="02q5isc137nx7qil2p3903xfsjwk54507rs72dfaiy6a8scys5j9"; depends=[]; }; RJafroc = derive2 { name="RJafroc"; version="2.0.1"; sha256="1vrjnqn1lv10945ba29zjlbkh3zyw28ppv4093v24lirw8vzmjp4"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp readxl stringr]; }; - RJcluster = derive2 { name="RJcluster"; version="3.2.2"; sha256="16p7c3c63kyqfkjrblf9p2nhaf03aq8ffn0pyah7rpv2qdvj7iyc"; depends=[foreach infotheo matrixStats mclust profvis Rcpp RcppArmadillo rlang]; }; + 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]; }; @@ -4014,20 +4065,20 @@ in with self; { RKHSMetaMod = derive2 { name="RKHSMetaMod"; version="1.1"; sha256="1h8gqqfmlrzyj4n997yn13vqpaw2kwzl45gscy3fdhskzmyg0ss3"; depends=[Rcpp RcppEigen RcppGSL]; }; RKUM = derive2 { name="RKUM"; version="0.1.1"; sha256="1w0v6l61dm7xixnyywsc7xziixz7k9r1ja26zcy77nry5kn6v60q"; depends=[]; }; RKelly = derive2 { name="RKelly"; version="1.0"; sha256="0mkpc95j67rg2gcj2fc4w8kv4v31cpiyvh660y8kc2fjr5q4aj3l"; depends=[]; }; - RKorAPClient = derive2 { name="RKorAPClient"; version="0.7.1"; sha256="0caqj4dj6pnjzkaa3xjxblwwypff3fksv6cgkg7dxg0qznkyac7g"; depends=[broom dplyr ggplot2 highcharter httr jsonlite keyring lubridate magrittr PTXQC purrr R_cache stringr tibble tidyr urltools]; }; + RKorAPClient = derive2 { name="RKorAPClient"; version="0.7.2"; sha256="0rgk3bpxpdxqjgkbp75cfyykkzgz9fl8mfz504ng0j3mpj0mzaig"; depends=[broom curl dplyr ggplot2 highcharter httr jsonlite keyring lubridate magrittr PTXQC purrr R_cache stringr tibble tidyr urltools]; }; RLRsim = derive2 { name="RLRsim"; version="3.1-6"; sha256="1wkkibr250frsbfq70m9jdrylxb492zibf5w03z6zis98pjffssp"; depends=[lme4 mgcv nlme Rcpp]; }; - RLT = derive2 { name="RLT"; version="3.2.3"; sha256="0zaha6fgj3j5524w8mym0p4dyg1z8z9mkz4hm9xbjz0ybrmfqr8h"; depends=[]; }; + RLT = derive2 { name="RLT"; version="3.2.4"; sha256="1vycsi213pcy5x9qpvim0nbsx4sk2125bficssv9v154w2xrgvf8"; depends=[]; }; RLeafAngle = derive2 { name="RLeafAngle"; version="1.0"; sha256="1anks22hn6qpac556p99kilkhc80h572dvcyz3wj1nqffdrhgrh3"; depends=[]; }; RLogicalOps = derive2 { name="RLogicalOps"; version="0.1"; sha256="1qyn80x3x3bb5wgzyzw6pxs8a6q26yq1fkmkz7f5wywsnrj8hzfj"; depends=[rstackdeque stringr]; }; - RLumCarlo = derive2 { name="RLumCarlo"; version="0.1.7"; sha256="1r70d68y3l43pb47wxhhbgbirnnx0hyaklvphlqrhnlkxp04r4xk"; depends=[abind doParallel foreach khroma magrittr Rcpp RcppArmadillo scatterplot3d]; }; - RLumModel = derive2 { name="RLumModel"; version="0.2.9"; sha256="15cllm4iywa74bmxlvasy7xkr86c4ghw2ii0656q0413dgasygjr"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; }; - RLumShiny = derive2 { name="RLumShiny"; version="0.2.2"; sha256="0rwl555564ccw4pdzya88s3h3q30iq5dmi77141ji8ir91x4rz3g"; depends=[data_table DT googleVis knitr Luminescence RCarb readxl rhandsontable rmarkdown shiny shinydashboard shinyjs]; }; + RLumCarlo = derive2 { name="RLumCarlo"; version="0.1.8"; sha256="0j4c3xfdxmdpkqpvhv8mybslwk4xvwpw6w8khpp8x3q7806z4wyx"; depends=[abind doParallel foreach khroma magrittr Rcpp RcppArmadillo scatterplot3d]; }; + RLumModel = derive2 { name="RLumModel"; version="0.2.10"; sha256="1klb7zvxksij517bi8xi68bia6y7jlp3ils659mmwdm2w0ljmwa6"; depends=[deSolve khroma Luminescence Rcpp RcppArmadillo]; }; + RLumShiny = derive2 { name="RLumShiny"; version="0.2.3"; sha256="12dc30q41b1vha52mn9rr1m86ykp3yfsyxcxxwklavd60g76b8vd"; depends=[data_table DT googleVis knitr Luminescence markdown RCarb readxl rhandsontable shiny shinydashboard]; }; RM_weights = derive2 { name="RM.weights"; version="2.0"; sha256="1by1z7gwwx0jjhhvsjkr7f6m7n0x43bj080ah5275cja7xqr5nm6"; depends=[Hmisc psychotools]; }; - RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; }; RM2006 = derive2 { name="RM2006"; version="0.1.1"; sha256="1bx2y58c8fkpv0d1sn5abxbajks3sbz2v00idnvbp7rw1i05i5q4"; depends=[]; }; RMAT = derive2 { name="RMAT"; version="0.2.0"; sha256="15bn9smlw9czryh6dvkpqxcp25sqd1vfq2cbs8wpg7nq58xyc6y4"; depends=[dplyr magrittr purrr]; }; RMAWGEN = derive2 { name="RMAWGEN"; version="1.3.7"; sha256="10hgssy59fcjbv333grpf6f3m7924hav66xxqhdlsdnwix19q7sb"; depends=[chron date vars]; }; RMBC = derive2 { name="RMBC"; version="0.1.0"; sha256="1fqbr28d09j01rmr9gylzkpvrd6bc9rnjbyzv06hmlx5mmjmzkb4"; depends=[ktaucenters MASS mvtnorm]; }; + RMCC = derive2 { name="RMCC"; version="0.1.0"; sha256="12ksv4yms1pgk7yj40yjmbc5rz1ai1mn8xd3a4w2pdx0mwjin6sz"; depends=[BH Rcpp]; }; RMKdiscrete = derive2 { name="RMKdiscrete"; version="0.1"; sha256="0b4adw46sn98qmy4nxv5l5svcjrp5532x7slfhhgsskqx408lzjf"; depends=[]; }; RMLPCA = derive2 { name="RMLPCA"; version="0.0.1"; sha256="1xzh6fwl71dzdpbqgpkqnmdzdk8rblg6n1ddic5yxxfvzg3bh13x"; depends=[Matrix pracma RSpectra]; }; RMOA = derive2 { name="RMOA"; version="1.0.2"; sha256="16j01m9drrhxr1vv5lwg3x42jc0ivbm3p2pkjhmsv6m6a87hhggl"; depends=[rJava RMOAjars]; }; @@ -4037,7 +4088,7 @@ in with self; { RMTL = derive2 { name="RMTL"; version="0.9"; sha256="08da67wvzmibziqhnlzh43sydaihk4rsq2k5hs6ih3jkkidrhlgv"; 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"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; }; - RMVL = derive2 { name="RMVL"; version="0.0.4.1"; sha256="1ms06bxak9vf5a1nf9r0mvzg51468j1wghvcwkpv1ad112h90g0l"; depends=[]; }; + RMVL = derive2 { name="RMVL"; version="0.0.4.4"; sha256="01w649iw62kpyp4a3lyrqcfb8iqcd0v8zwz6aq1cnxhw04hz0c1w"; depends=[]; }; RMaCzek = derive2 { name="RMaCzek"; version="1.3.5"; sha256="19hb25rl4fmyyaklj0jlvdh41zg9k2d6hkmm4ixvh8y9dbp675c8"; depends=[GA seriation]; }; RMallow = derive2 { name="RMallow"; version="1.1"; sha256="1s6a3347739rfc8rrh2773b278gcbp8hf5j5psm61fz7bavy9gcj"; depends=[combinat]; }; RMariaDB = derive2 { name="RMariaDB"; version="1.2.1"; sha256="032zrwqf2w1cfkm0ryblc4sms2y5cl0fzyp0ijlk7kjld04nl5y9"; depends=[bit64 blob DBI hms lubridate plogr Rcpp rlang]; }; @@ -4045,7 +4096,7 @@ in with self; { RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; }; RMixpanel = derive2 { name="RMixpanel"; version="0.7-1"; sha256="1xwmmfvky49n1l0w3kwcyaf2h4rhzz4k5icjwvpc90fqk8sxib6a"; depends=[base64enc jsonlite RCurl uuid]; }; RMixtComp = derive2 { name="RMixtComp"; version="4.1.3"; sha256="0v1qhqvl0s2b93xhykjr99h5gbz48l9npp0vyazh0ncx8gnxrzfl"; depends=[ggplot2 plotly RMixtCompIO RMixtCompUtilities scales]; }; - RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.6"; sha256="1r0za8s31mk9d3vgvsj930qpy5xnzdfgz06fjg5qzzc2l6jp96k3"; depends=[BH doParallel foreach Rcpp RcppEigen]; }; + RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.7"; sha256="1z2jw89xrin1hh6scfkvvxag57w558rd8vdf08wzhp2glwdqrfr8"; depends=[BH doParallel foreach Rcpp RcppEigen]; }; RMixtCompUtilities = derive2 { name="RMixtCompUtilities"; version="4.1.4"; sha256="1rhdmiap7xm96igclas67dz8naywjkddydbk9m3hp0d0zhgblc5i"; depends=[ggplot2 plotly scales]; }; RMySQL = derive2 { name="RMySQL"; version="0.10.23"; sha256="05aavyggyjv46awa7ggbxlfcy9707vak5kh7kj0ljdx8zga7xb7l"; depends=[DBI]; }; RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.4"; sha256="16ab0p0378j4vvcazynffsgx1rq32llf1sz4h4pp5lrx820j6qvx"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; }; @@ -4058,14 +4109,15 @@ in with self; { RNHANES = derive2 { name="RNHANES"; version="1.1.0"; sha256="045ykpgxvc22blbp47ysbk6a6x4akjd39pjr114cr23s7f48g6h4"; depends=[dplyr foreign rvest survey xml2]; }; RNOmni = derive2 { name="RNOmni"; version="1.0.0"; sha256="1zn0yswycvzc3bm5rd7n84b2jbb5rdl66m4x5miz9pv7h6wsckkv"; depends=[plyr Rcpp RcppArmadillo]; }; RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; }; - RNeXML = derive2 { name="RNeXML"; version="2.4.5"; sha256="1wsl4xq9w5bp3wk69dw57bg0qcw1vs6ajwya4p0w1r00ck5pwrib"; depends=[ape dplyr httr lazyeval plyr reshape2 stringi stringr tidyr uuid XML xml2]; }; + RNeXML = derive2 { name="RNeXML"; version="2.4.6"; sha256="0k56brcg80mvx35hgc5gj8arwba4k7q0075g38qp0qgq9d1b87cs"; depends=[ape dplyr httr lazyeval plyr reshape2 rlang stringi stringr tidyr uuid XML xml2]; }; RNentropy = derive2 { name="RNentropy"; version="1.2.2"; sha256="0chvmrvpyyghilwb63y6pd1zp94i5qhpv5w19x9nw0ypk86pp2dj"; depends=[]; }; RNetCDF = derive2 { name="RNetCDF"; version="2.5-2"; sha256="0i5a0v6ajabn59y73sbm5j85ppgpchr1ggm27xl8m4x07jj4dzpq"; depends=[]; }; RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; }; RNewsflow = derive2 { name="RNewsflow"; version="1.2.6"; sha256="06hz5fim5ad8kbpc4crs9vdn7k9q5phhzscd46s4xk0b3n0i8wi1"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales stringi tm wordcloud]; }; - RNifti = derive2 { name="RNifti"; version="1.3.1"; sha256="0bz10ar6hrgkvlzh9j2im24kwi3s2nnax668z40a2wj6s5xghqlr"; depends=[Rcpp]; }; + RNifti = derive2 { name="RNifti"; version="1.4.0"; sha256="0kkj9dby85iwnlqb7zwrh1xidlvqip7i1mbgckb5qg4b0a3zgibc"; depends=[Rcpp]; }; RNiftyReg = derive2 { name="RNiftyReg"; version="2.7.0"; sha256="0y7s2zcjjnb9jakdhyd6hmdj9axdpvbnhijs2finnlwc0d09jpz1"; depends=[ore Rcpp RcppEigen RNifti]; }; 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]; }; ROCaggregator = derive2 { name="ROCaggregator"; version="1.0.1"; sha256="1l53z1xz5ww0bdd3pcmscmm4ypg0fdl4a03vv8ya2jk0zzlndlnq"; depends=[magrittr]; }; @@ -4081,7 +4133,6 @@ in with self; { 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-1"; sha256="1h59i7mc21kgwi4mz0qpfj855bp6d2qkrp40lm02dqhf79sps26k"; depends=[ROI]; }; ROI_plugin_alabama = derive2 { name="ROI.plugin.alabama"; version="1.0-0"; sha256="1h4154w730y06zak0s199lafwnip4xqnnh33ghkyg39y71sn9nfz"; depends=[alabama ROI]; }; - ROI_plugin_clp = derive2 { name="ROI.plugin.clp"; version="0.4"; sha256="0fzrb4q2mcf3j4d4j8r354n6fyv2rik0ypp01l54zbm8s2r29bwb"; depends=[Matrix 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-0"; sha256="1v093r6d14w12p2lmzcnlja9q5lhfvrmfbd3ws7x4igs0fmcdq2y"; depends=[DEoptim DEoptimR ROI]; }; ROI_plugin_ecos = derive2 { name="ROI.plugin.ecos"; version="1.0-0"; sha256="0wdb86r0z0ck27mn0rfb5l72xq7km2annyk5c5n8nk460j0kygqf"; depends=[ECOSolveR Matrix ROI slam]; }; @@ -4102,7 +4153,7 @@ in with self; { ROP = derive2 { name="ROP"; version="1.0"; sha256="12gh83r3hp1qdmw3p5rr1wfhsh90pirx67q456gl9ai6zgd8nkq8"; depends=[ROCR]; }; 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.52.0"; sha256="1vm50h7ys24az57pbnpgkzkpkdbvhb98rm09yb3z0wvnwyx7k8qv"; depends=[pkgbuild]; }; + ROpenCVLite = derive2 { name="ROpenCVLite"; version="4.52.1"; sha256="0fwbizw9rb44fqi4hry0s0i44l7bs36wqsjjk49b79728b6sirpy"; depends=[pkgbuild]; }; ROpenDota = derive2 { name="ROpenDota"; version="0.1.2"; sha256="17s73yj2w5hlpy09ad83m4s2d9shg5h4zg64wvbp1ivyvpp7l308"; depends=[jsonlite RCurl]; }; ROpenFIGI = derive2 { name="ROpenFIGI"; version="0.2.8"; sha256="0fvd25vsqkgi3jv4s2lnfag5qksyzyb48d7rhfw6z8piz37n4xaj"; depends=[httr jsonlite]; }; ROpenWeatherMap = derive2 { name="ROpenWeatherMap"; version="1.1"; sha256="0h1yw93v06bx8svhghh1fsrf837qax9896klh64b06djpgg9ngb9"; depends=[httr jsonlite RCurl]; }; @@ -4112,7 +4163,6 @@ in with self; { ROptSpace = derive2 { name="ROptSpace"; version="0.2.3"; sha256="18fz285hr4fdkkbs4b13gmwz0sqbgk6di6m3c6ic0wvs35mpmcfz"; depends=[Rcpp RcppArmadillo Rdpack]; }; ROracle = derive2 { name="ROracle"; version="1.3-1.1"; sha256="1k5w6fi1f83mhlc8hx6y305llcwxl22h6lpkib1yvm4557k1c7zz"; depends=[DBI]; }; RPANDA = derive2 { name="RPANDA"; version="2.0"; sha256="1xszarf0857msiq27ghq8vz0sr8lziajwssm07k46x7p3jk4rk3b"; depends=[ape bipartite cluster coda deSolve fields fpc glassoFast igraph Matrix mvMORPH phytools picante pspline pvclust raster Rmpfr TESS]; }; - RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; }; RPEGLMEN = derive2 { name="RPEGLMEN"; version="1.1.1"; sha256="1hm68f6ipiy2518viz182psqgh5krq9aihid0njg4817cyssg95z"; 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.4"; sha256="0m80b5k0jq0yglb9gnzxl4h8j5y9ir2npni7gdwil2kw6nnhrb3f"; depends=[boot RobStatTM RPEGLMEN RPEIF xts zoo]; }; @@ -4135,18 +4185,18 @@ in with self; { RPushbullet = derive2 { name="RPushbullet"; version="0.3.4"; sha256="1mx433hvx660a63s5dzn655zmqv1c1qij0hzddl9z38032brc4ii"; depends=[curl jsonlite]; }; RPyGeo = derive2 { name="RPyGeo"; version="1.0.0"; sha256="1alqgx6blqqwxm76w05g82kc2icx8nvjw7qkdz73gf9ckgza5bb3"; depends=[magrittr purrr raster reticulate rmarkdown sf stringr]; }; RQEntangle = derive2 { name="RQEntangle"; version="0.1.3"; sha256="178haddk8nnscy2vym3k2a3ca9lf6nl7rpjja8lxqdjninvhvwb2"; depends=[iterators itertools]; }; - RQuantLib = derive2 { name="RQuantLib"; version="0.4.14"; sha256="0lwpm6059s5k2qi44b1h6ys28syc4h0i3yk42qa1ya4zj5clj3y1"; depends=[Rcpp zoo]; }; + RQuantLib = derive2 { name="RQuantLib"; version="0.4.15"; sha256="18j3bm5imxbx888pywqhzfbc19b8xlll18jy0g4g8bskqycfqh69"; depends=[Rcpp zoo]; }; RRBoost = derive2 { name="RRBoost"; version="0.1"; sha256="0zp3csrpi0awk88m6sq5sf5v7j32q5sd4mwv61x6bblg991k404k"; depends=[RobStatTM rpart]; }; - RRF = derive2 { name="RRF"; version="1.9.1"; sha256="135adnf7cfs8gddmmmgmzarjzg0qfrd7l67367yhy2b1k0s5ng1w"; depends=[]; }; + RRF = derive2 { name="RRF"; version="1.9.3"; sha256="04mvnijxgmjinc6bbasvximbdlw78pldb6ym5dm32ap68jh5bxyy"; depends=[]; }; 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.1.2"; sha256="1h40gql8id8a0skvfnc2vra13g76lfhlhks4h7janjg3p4ykymib"; depends=[ape ggplot2 Matrix]; }; + RRPP = derive2 { name="RRPP"; version="1.2.1"; sha256="0pzm0i250pscgj403s5yfbxn9hyh0kmsrkljf55aa3smycic4hqa"; depends=[ape ggplot2 Matrix]; }; RRRR = derive2 { name="RRRR"; version="1.1.0"; sha256="0h5r668qn8hp4j4zhxhn4b3lqm138n6kc1c7vf95hmbh4ah6wzf7"; 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=[]; }; RRedshiftSQL = derive2 { name="RRedshiftSQL"; version="0.1.2"; sha256="03jbml8d19hcg6achnyc4hcnl5j10yvsx59j80r46zyn0flsnizq"; depends=[DBI RPostgreSQL]; }; - RRphylo = derive2 { name="RRphylo"; version="2.5.9"; sha256="0w6h1k3jp6kvws7yh0fnsw7xf8yyxk9mxhxi8l9qbhvvrm9dxabr"; depends=[ape doParallel emmeans foreach geiger phytools]; }; + RRphylo = derive2 { name="RRphylo"; version="2.6.0"; sha256="1m75g8d9081a2cpjnypklrd9qmbbxsq0gsg6kyr5jngb42qcqcf2"; depends=[ape doParallel emmeans foreach geiger phytools]; }; RRreg = derive2 { name="RRreg"; version="0.7.3"; sha256="1nk2gg41bdhfnz7plkj4rnzl40sd6jd5z9843kxijp9ymagimwx4"; depends=[doParallel foreach lme4]; }; RSA = derive2 { name="RSA"; version="0.10.4"; sha256="0i0li587i6bjnmz9d1j1dyhpy7bfnq6298wr67fygcxfaszij16b"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer]; }; RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; @@ -4164,14 +4214,14 @@ in with self; { RSNNS = derive2 { name="RSNNS"; version="0.4-14"; sha256="081c20dcac8xxb0sp7kwzm4b7h5jrgcxxsfckjbxbda95g5n4qkz"; depends=[Rcpp]; }; RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; }; RSQL = derive2 { name="RSQL"; version="0.1.4"; sha256="0zda6cgsx1bd3xw2r9flsphbkrgma95qqv5vz70f234y9gkmc6v3"; depends=[DBI knitr lgr R6 RSQLite]; }; - RSQLite = derive2 { name="RSQLite"; version="2.2.9"; sha256="075vsnbkcwpwnn87b06mhbg2fflqhjvbylhbkg0d3v3rl7zg28s4"; depends=[bit64 blob DBI memoise pkgconfig plogr Rcpp]; }; - RSSL = derive2 { name="RSSL"; version="0.9.3"; sha256="10rrgxc0ddnd4b4g7qqgpjkc8gh07bnc94xwmgdp1lx7v7ypcziv"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; }; + RSQLite = derive2 { name="RSQLite"; version="2.2.10"; sha256="1a00i24g4d4gvp7qmivpyfm24yfz4w4wsy2kplgfz0i0j0rzzbh6"; depends=[bit64 blob DBI memoise pkgconfig plogr Rcpp]; }; + RSSL = derive2 { name="RSSL"; version="0.9.5"; sha256="1h94dhs5yl1i7n153rbmj883iz3hql0b0cr12357nk4nvf36yih8"; 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]; }; RSarules = derive2 { name="RSarules"; version="1.0"; sha256="0lrql4q45hyhqbix86ixl12mknnjbz3137gx2zkvqpz91bsk145j"; depends=[arules Matrix]; }; 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-6"; sha256="0vhj2f7bgjcfbshbprqxqyxv6bxkfzn3gpjp7hqnw72da602igya"; depends=[]; }; + RSclient = derive2 { name="RSclient"; version="0.7-8"; sha256="0iy2y63yl35im6n8hg77gzfr6mk7z4yi4lpl50mig1jj9rvqw3n5"; depends=[]; }; RSeed = derive2 { name="RSeed"; version="0.1.60"; sha256="0rvb6w4z5c2wcdgx5w6vv7c8il8d0096pgv3fyvw21ag25z605jc"; depends=[graph RBGL sybil]; }; RSelenium = derive2 { name="RSelenium"; version="1.7.7"; sha256="1xn5fdbzmq7b1f5fc9ls23g177bmnd8bn4p4d8aafr6z3jwkmfir"; depends=[binman caTools httr openssl wdman XML]; }; RSentiment = derive2 { name="RSentiment"; version="2.2.2"; sha256="15d1llzxg1apkwykpb7pic2d5lfj9i9a55hab067wrz2yq5jsyfa"; depends=[NLP openNLP plyr stringr]; }; @@ -4185,7 +4235,7 @@ in with self; { 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]; }; - RStoolbox = derive2 { name="RStoolbox"; version="0.2.6"; sha256="1pq0vxq53x8f0358qfq1rakb59cdfi4micp7hjb9fbz95q9am8mj"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; }; + 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]; }; 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]; }; @@ -4196,9 +4246,9 @@ in with self; { 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=[]; }; RTIGER = derive2 { name="RTIGER"; version="0.99.0"; sha256="0g1qccjslf90lsc965klnkdkij16frfk3ig6yjpldh8j2yv66zg3"; depends=[e1071 GenomeInfoDb GenomicRanges ggplot2 IRanges JuliaCall qpdf reshape2 TailRank]; }; - RTL = derive2 { name="RTL"; version="0.1.8"; sha256="0rvwgw1cx7y9rxlnc0ijgyjp0raxslaqkxipi0183l0idlc4as53"; depends=[dplyr fabletools feasts forecast ggplot2 httr jsonlite lubridate magrittr plotly purrr RCurl readr rlang stringr tibble tibbletime tidyquant tidyr tidyverse timetk tsibble xts zoo]; }; + RTL = derive2 { name="RTL"; version="1.0.0"; sha256="19v9npbnr0hp6gk9minil53imjvhqhzzvq3fg3xlg2kdf0d4s87d"; depends=[cli dplyr fabletools feasts ggplot2 glue httr jsonlite lifecycle lubridate magrittr plotly purrr RCurl readr rlang stringr tibble tidyquant tidyr timetk tsibble withr xts zoo]; }; RTOMO = derive2 { name="RTOMO"; version="1.1-6"; sha256="03jb96ahzgp662vj2v65giv8ss61vad5w26kvq8hg9q06z879jza"; depends=[GEOmap RPMG RSEIS splancs]; }; - RTTWebClient = derive2 { name="RTTWebClient"; version="0.1.2"; sha256="0r5nkaypym79h5r7n8h932i08awkpzn5fygww0z5q7y5m6kchbmx"; depends=[base64enc data_table digest httr jsonlite withr]; }; + 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"; sha256="0nrj5iccxqj3nk28s9z6bncpih5zq2nz4pylmm0pkpl5dfz923m4"; depends=[]; }; RTextTools = derive2 { name="RTextTools"; version="1.4.3"; sha256="0fxjviqc36k06rn8xzbi8ylzzj9zgf3zsp6xv0kssakss1a45lzz"; depends=[caTools e1071 glmnet ipred nnet randomForest SparseM tau tm tree]; }; RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; }; @@ -4207,7 +4257,7 @@ 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-81"; sha256="1niq4imvgn8v9lkcysfksb9mhmdkf3790sycfk8c85psrh9l294x"; depends=[ade4 boot car FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; }; + RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-81-2"; sha256="137374nikk2jji1fnx1vnsj1v6n3s9kbif5rcvla0kbg3xn6ndps"; depends=[ade4 boot car FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; }; RVCompare = derive2 { name="RVCompare"; version="0.1.5"; sha256="17ralm3xbzgi1ngblwf6pmpaz7c5vwkfinnpwyxvlrwi8mxi554h"; depends=[ggplot2 pracma Rcpp]; }; RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; }; RVIpkg = derive2 { name="RVIpkg"; version="0.2.8"; sha256="0hh3kqzfwbp0qc1v5baixnl3px54dwvljd1r23s8lxlg434pl7fz"; depends=[]; }; @@ -4224,8 +4274,8 @@ in with self; { RWekajars = derive2 { name="RWekajars"; version="3.9.3-2"; sha256="06nsylv65z9hxym1b6qnwllh306bq5phsgr0qn4nyr5im8cv1rhn"; depends=[rJava]; }; 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.1"; sha256="1p2ksnwwbp5dhj4lmz09fbghs010p7nhpx039lc96n1h7y6azzqs"; depends=[raster sf sp units]; }; - RWsearch = derive2 { name="RWsearch"; version="4.9.8"; sha256="068kbbh13a7j0h356dl0dy29221r37mjazvki7wpf64nb01r916d"; depends=[brew latexpdf networkD3 sig sos XML]; }; + 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.0"; sha256="105laxdjnqpkp74675asihcry6ahaihphkbnpxyi6xpskga0k1ka"; depends=[ellipse lars]; }; @@ -4255,8 +4305,8 @@ in with self; { RandPro = derive2 { name="RandPro"; version="0.2.2"; sha256="092mm9gybvcby2n161nldlq8s2ja2bc43jnkln6ss3lr29rmi9b3"; depends=[caret e1071]; }; RandVar = derive2 { name="RandVar"; version="1.2.1"; sha256="17c6bx644n604zpggmwx1z3krgd9v7c88il45cf5yhp7zf7cc718"; depends=[distr distrEx startupmsg]; }; RandomCoefficients = derive2 { name="RandomCoefficients"; version="0.0.2"; sha256="04l0aczrlbkjk0687w2gxs85ia71yy69mgankwkl37ksznh6y81m"; depends=[fourierin ks orthopolynom polynom RCEIM rdetools robustbase sfsmisc snowfall statmod tmvtnorm VGAM]; }; - RandomFields = derive2 { name="RandomFields"; version="3.3.13"; sha256="0j9z7m4i6kc5v6xn6806735srxsqvmf3ghk56sss37577652my6v"; depends=[RandomFieldsUtils sp]; }; - RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.5.6"; sha256="02s837ka3dl7anbmb1b3d1vyfnbsdviz2mhfagxm7azz7m289x07"; depends=[]; }; + RandomFields = derive2 { name="RandomFields"; version="3.3.14"; sha256="0c5r7l642cw56km56ijachnqhjh5k0izy03cl14rvbwkpywh09i4"; depends=[RandomFieldsUtils sp]; }; + RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="1.1.0"; sha256="17aa29ll1wminzpdl2lq6m1pc6wcdj5ap1sp5rd516j4xlpn0wpl"; depends=[]; }; RandomForestsGLS = derive2 { name="RandomForestsGLS"; version="0.1.3"; sha256="1xqzpfgs6hdkaf99xgrxc4m5k73vpvkhpgb4bw01rhhay08zzv4g"; depends=[BRISC matrixStats pbapply randomForest]; }; Randomuseragent = derive2 { name="Randomuseragent"; version="0.0.1"; sha256="1ym272z5a2wnprz59db8knszzqglmrdmk77r7cfyzy5jwcqzy4jn"; depends=[]; }; RanglaPunjab = derive2 { name="RanglaPunjab"; version="2.3.4"; sha256="01j3gww9kil02d44jwlkz6j7lwn2him830bnshkly0s7mgh22pgr"; depends=[jpeg shiny tidyverse]; }; @@ -4264,11 +4314,11 @@ in with self; { RankAggregator = derive2 { name="RankAggregator"; version="0.0.1"; sha256="0j4s4fv28fbc6ij6fzpmza9n5lfrql8ll33fi65vhczz9pjhpjii"; depends=[]; }; RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; }; Rankcluster = derive2 { name="Rankcluster"; version="0.94.5"; sha256="1ddfcmiqy20s7sfjbxax0rvc9vb1ckr46icy1zsa103hhbp5pjqb"; depends=[Rcpp RcppEigen]; }; - RankingProject = derive2 { name="RankingProject"; version="0.3.1"; sha256="11n5v8hnpldwkb5fz3y0nfjcrshns49yrrdf9205y7g80r34wmg7"; depends=[]; }; + 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.1.0"; sha256="038x4q6h0pf062nhjivfbb74f43li35pgjl8w8rzwr5pcsbjsif8"; depends=[bigreadr bigsnpr coloc curl data_table dplyr GenomicRanges IRanges RCurl]; }; Raquifer = derive2 { name="Raquifer"; version="0.1.0"; sha256="148inkn6yiyvicw0b4kw99n172xsvhrrdx1khghqs966smjw54wy"; depends=[dplyr gsl magrittr pracma Rdpack]; }; - RareComb = derive2 { name="RareComb"; version="1.0"; sha256="09hrsxnw50033hlc45hrb9vvv8ycj1i9i11kpqnk0rp0vqph3lzl"; depends=[arules dplyr magrittr pwr reshape2 sqldf stringr tidyr]; }; + 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"; sha256="1flpi5amv2q2kl75gab4bwv1b7nmsnr6lyanwwiky6zq0xridkw5"; 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=[]; }; @@ -4276,14 +4326,14 @@ in with self; { RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.4"; sha256="1d37l4xgg1iba2rbhp4c5i7igrcy0zgbdvzk3yc0wj2x1mm5dayk"; depends=[ggplot2 pROC]; }; RationalExp = derive2 { name="RationalExp"; version="0.2.2"; sha256="0a51sfps3sfb71m93jdsmbvj6kafbyfrq790ix238j570f5xafpg"; depends=[snowfall]; }; Ravages = derive2 { name="Ravages"; version="1.0.0"; sha256="1967s8hp6nd1a1d385rx6sp4hd01h0gcd7hvdakc2lh7xbdnlj8i"; depends=[bedr BH curl dfidx Formula gaston mlogit Rcpp RcppEigen RcppParallel]; }; - RavenR = derive2 { name="RavenR"; version="2.1.4"; sha256="09gz4n1rvzzrmc1wszkyxa1zs6mj6sg9b997yiszlk89nvcbyr2v"; depends=[colorspace cowplot DiagrammeR dplyr dygraphs gdata ggplot2 igraph lubridate magrittr purrr Rcpp RCurl scales stringr tidyr xts zoo]; }; + RavenR = derive2 { name="RavenR"; version="2.1.7"; sha256="1aapipzsy389zl0b8p0p0zfm72syki8vv9n2zr54drb8vm33ipjs"; depends=[colorspace cowplot DiagrammeR dplyr dygraphs gdata ggplot2 igraph lubridate magrittr purrr Rcpp RCurl scales stringr tidyr visNetwork xts zoo]; }; RawHummus = derive2 { name="RawHummus"; version="0.2.1"; sha256="1x23mzqj13mns80pac4zmxj7c571y9k4qss2zmz6fza7hvarkdcf"; depends=[data_table dplyr kableExtra markdown plotly purrr RaMS RColorBrewer rmarkdown shiny shinycustomloader shinydashboard shinydashboardPlus shinyFiles shinyMatrix shinyvalidate]; }; - Rbeast = derive2 { name="Rbeast"; version="0.9.2"; sha256="1vmnmyj6470mm3wvb6dy5hb39hdjrm12lzwizlqvh9pjkvi339v3"; depends=[]; }; + Rbeast = derive2 { name="Rbeast"; version="0.9.3"; sha256="1mh9gmg1gj1l42av16ndyzndix4y2jbgn59adhcgdyyb1cm3d62n"; depends=[]; }; Rbent = derive2 { name="Rbent"; version="0.1.0"; sha256="0xkb57dhhfd3342rv0xwbhbhn4zp5fbfch84fbh0sickm09l9vrj"; depends=[Rfit]; }; Rbgs = derive2 { name="Rbgs"; version="0.2"; sha256="1q0dnbcpgx7x9klr6z33z6g2p9p8mrmhnsqjy6qw15ch720rrgn3"; depends=[imager magrittr rJava]; }; Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; }; RblDataLicense = derive2 { name="RblDataLicense"; version="0.2.4"; sha256="0if4xwjkh4hw8mhfyw6sz0lpb3wcaz7kcx00axi035yf63bmplzg"; depends=[RCurl xts]; }; - Rblpapi = derive2 { name="Rblpapi"; version="0.3.12"; sha256="0c3b7viiyffk8vzgmbbbw3sz5n3j24sqcf70skfqrqccr4wpacpv"; depends=[BH Rcpp]; }; + Rblpapi = derive2 { name="Rblpapi"; version="0.3.13"; sha256="0xqlh441bvvag8xafhyxrgsfydw1rqiv9mzki5z6m94dfbxscf0y"; depends=[BH Rcpp]; }; Rborist = derive2 { name="Rborist"; version="0.2-3"; sha256="0qf4m6ibr4mlrmsybb5b8f1hkmp9n6ksjsxc4msd3q4rr99zkczk"; depends=[data_table digest Rcpp]; }; Rcan = derive2 { name="Rcan"; version="1.3.82"; sha256="0asmlhh786c9gfgxkqybv8xzz8bqzirxvq8nr4gglx1pc812idkb"; depends=[data_table ggplot2 scales]; }; Rcapture = derive2 { name="Rcapture"; version="1.4-3"; sha256="1rk1zgab6zi7hcmyqlb18kycv3cd15c7lwhw5kig96f2n3xymzig"; depends=[]; }; @@ -4295,8 +4345,8 @@ in with self; { 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]; }; Rchoice = derive2 { name="Rchoice"; version="0.3-3"; sha256="09fssba9wi290i9nd0vxbhz29bgm7rj4aanvxkma2pdk6impcvfq"; depends=[Formula maxLik memisc miscTools msm numDeriv plm plotrix sandwich]; }; RclusTool = derive2 { name="RclusTool"; version="0.91.3"; sha256="0f6v2p6dg3fq3vzys6hgwmmgyrxfj2kb4wpbywd7f9p5yd9cfd88"; depends=[class cluster conclust corrplot e1071 factoextra FactoMineR ggplot2 jpeg MASS mclust mda mmand nnet png randomForest reshape sp stringi stringr tcltk2 tkrplot]; }; - Rcmdr = derive2 { name="Rcmdr"; version="2.7-1"; sha256="1rqj5xdafiqks42ai5rdmvk6szjn1b8yrpssx969d6pdv2pxv96j"; depends=[abind car effects lme4 RcmdrMisc relimp tcltk2]; }; - RcmdrMisc = derive2 { name="RcmdrMisc"; version="2.7-1"; sha256="1djm21mfk1l8zmaz6p51li0swpvzs05z9p11ad83d5rbbkdpwl7w"; depends=[abind car colorspace e1071 foreign haven Hmisc lattice MASS nortest readstata13 readxl sandwich]; }; + Rcmdr = derive2 { name="Rcmdr"; version="2.7-2"; sha256="16sx43887zb30j1c8f4xlf4jy5ij8v5kfr3mlsymj99v0i3dq4fs"; 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]; }; RcmdrPlugin_BWS1 = derive2 { name="RcmdrPlugin.BWS1"; version="0.1-5"; sha256="1rwfmkpalyhmdfhwszk9q21l362qwq305b3jqh0nrwmmnr09v34w"; depends=[crossdes Rcmdr support_BWS support_CEs survival]; }; RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.3"; sha256="1v0vdr6rffcq5qjqwmnmxbjwcf01zp7lrj81grnjxwqg4xjrcj69"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr s4vd superbiclust viridis]; }; RcmdrPlugin_DCCV = derive2 { name="RcmdrPlugin.DCCV"; version="0.1-1"; sha256="1snlzffs9f300iyxsbarykc53pfa8h9qsk354xki7n0wz5jp1lc3"; depends=[DCchoice Rcmdr]; }; @@ -4308,7 +4358,6 @@ in with self; { RcmdrPlugin_EcoVirtual = derive2 { name="RcmdrPlugin.EcoVirtual"; version="1.0"; sha256="0q879wnrmgbaddv883q9zdnp0i7kjcgn8cffv7lp8nrsqil6l7mc"; depends=[EcoVirtual Rcmdr]; }; RcmdrPlugin_Export = derive2 { name="RcmdrPlugin.Export"; version="0.3-1"; sha256="17fn3si6b6h20c52k1k6fv9mslw3f9v0x1kxixzcvq54scdx0sk0"; depends=[Hmisc Rcmdr xtable]; }; RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.7"; sha256="1145rpzhq219sl0j2bg5xa0ihq13lmr7ahcn3db4a8mqlz2fp8zy"; depends=[FactoMineR Rcmdr]; }; - RcmdrPlugin_FuzzyClust = derive2 { name="RcmdrPlugin.FuzzyClust"; version="1.1"; sha256="1lg6k3h4n45s6wjkl3ycwfngfr2i6mkhirifhbazsvv297bg0iba"; depends=[clue doParallel foreach ggplot2 iterators MASS Rcmdr reshape2 tcltk2 tkrplot]; }; RcmdrPlugin_GWRM = derive2 { name="RcmdrPlugin.GWRM"; version="1.0.2"; sha256="01q4k9s815pgd5cavm6nyxy5npmpxryari9v6wys4n5cjpn5g6xq"; depends=[GWRM Rcmdr RcmdrMisc]; }; RcmdrPlugin_HH = derive2 { name="RcmdrPlugin.HH"; version="1.1-47"; sha256="1bba11izs1jhjsyb0d45c34gcihapk231qbiabcxf8x93sdmg6ga"; depends=[HH lattice mgcv Rcmdr]; }; RcmdrPlugin_IPSUR = derive2 { name="RcmdrPlugin.IPSUR"; version="0.2-1.1"; sha256="0dbdsxdxhxm79cq7hi0rh8qphan73521lmivcnb4ca8g6ha2y32v"; depends=[Rcmdr]; }; @@ -4336,24 +4385,24 @@ in with self; { RcmdrPlugin_sampling = derive2 { name="RcmdrPlugin.sampling"; version="1.1"; sha256="0fx0s63wq0si1jydl9xyj9ny7iglg91zpvkyrnc05i5pan9l3xd9"; depends=[lpSolve MASS Rcmdr sampling]; }; RcmdrPlugin_sos = derive2 { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[Rcmdr sos tcltk2]; }; RcmdrPlugin_steepness = derive2 { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; }; - RcmdrPlugin_survival = derive2 { name="RcmdrPlugin.survival"; version="1.2-1"; sha256="15hjcp9bmn410mzd7vk47l1163vsjck09gw8smvw1xlhczr4a4y6"; depends=[date Rcmdr survival]; }; + RcmdrPlugin_survival = derive2 { name="RcmdrPlugin.survival"; version="1.2-2"; sha256="1c5xm1h2lza6bxwxn7q4999x4gykn7v04wkx6vs799g4wqlby2dz"; depends=[date Rcmdr survival]; }; RcmdrPlugin_sutteForecastR = derive2 { name="RcmdrPlugin.sutteForecastR"; version="1.0.0"; sha256="1np42kizkk572vharki84ka34lr7bdlckn4227bnq2l37c0zsq5y"; depends=[Rcmdr sutteForecastR]; }; 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]; }; Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; }; Rcompadre = derive2 { name="Rcompadre"; version="1.1.0"; sha256="025r6dq5qs3ri5nkg4mr76jzps2p9y56i8514m97amq8lzrxl8h4"; depends=[popdemo tibble]; }; Rcplex = derive2 { name="Rcplex"; version="0.3-5"; sha256="10z5akab66d8a3rcs5dbqq1w59hhyn52mq8vpjhcxpzqqc3c7442"; depends=[slam]; }; - Rcpp = derive2 { name="Rcpp"; version="1.0.7"; sha256="07fwlgmx0ib4nziqbrylla2dlakw04vzny9w4qbfvnhn49rs9r8m"; depends=[]; }; + Rcpp = derive2 { name="Rcpp"; version="1.0.8"; sha256="1vkqyqly6lzr1h3szaihmayvpjkzscxp4y258vnw8nh4pjb957w7"; depends=[]; }; Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0.1"; sha256="0vw41plcl7hbi0af3la0sb4x8zqnhxjpjslx8r8cllfamy9dixki"; depends=[]; }; RcppAPT = derive2 { name="RcppAPT"; version="0.0.8"; sha256="19814v7gi01dqjm7lrrhw4c5ww69zj20qfli4530qzsq7v6rapzp"; depends=[Rcpp]; }; RcppAlgos = derive2 { name="RcppAlgos"; version="2.4.3"; sha256="1vclvkd9gikx9n7cvgbf8j9sahmy0wfrgzb1hcpsdj8l6ymjc91k"; depends=[gmp Rcpp RcppThread]; }; RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.19"; sha256="12k8ny981dmky5js8yl6bih5r5mq3w43f2f9admhkwqn0n80kcl9"; depends=[Rcpp]; }; - RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.10.7.5.0"; sha256="0516j6n657kxm8sdbxf3jd9z40px9mv7zza4fz8nih63f5iiw1kw"; depends=[Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.10.8.1.0"; sha256="1x7mk85rc4pmn17nm63k6rbkarsmghjapznias268545nfpib97g"; depends=[Rcpp]; }; RcppBDT = derive2 { name="RcppBDT"; version="0.2.4"; sha256="11xq2lz4n4gyqk4pz8c3zr5ll8jlh1qlbf9rbqd3q6s3qzphpybd"; depends=[BH Rcpp]; }; RcppBigIntAlgos = derive2 { name="RcppBigIntAlgos"; version="1.0.1"; sha256="157a14kqcf0q3z01mn4w1194k2l39dd4qmqs0i115p8bvkjc6ncd"; depends=[gmp Rcpp RcppThread]; }; RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.10"; sha256="0jj4w8141xl3yvr4ss8c48kiib5d0rsj7f6csn3hq9viqy71hy1s"; depends=[Rcpp]; }; - RcppCGAL = derive2 { name="RcppCGAL"; version="5.3.1"; sha256="1652741qzfspnljp48y4ccsgh1sycxr38c5ailcs6349faykgamd"; depends=[]; }; + RcppCGAL = derive2 { name="RcppCGAL"; version="5.3.1.1"; sha256="0pxfvcpizvqlixz8547m7wf7haza5ca9bslvg8wwwmnpwrifz4fy"; depends=[Rcpp]; }; RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.10"; sha256="175bn75akwgz3vcp0n59kiqqz7q9cwkvih241nj8v810cp4gpmkp"; depends=[Rcpp]; }; - RcppCWB = derive2 { name="RcppCWB"; version="0.4.4"; sha256="1jzfpqgr339f6qrbvxv8zlhfw56vvr18gm6a8ik1w138s1xanh6f"; depends=[Rcpp]; }; + RcppCWB = derive2 { name="RcppCWB"; version="0.5.1"; sha256="0ly5snza8jryrmnlk3bi8br5mcc4nhnk35r6y2drschzbi60fybk"; depends=[fs Rcpp]; }; RcppCensSpatial = derive2 { name="RcppCensSpatial"; version="0.1.0"; sha256="0ckyl88b81l58dkk0s40mcanjqaibi106q6jsrak79as93g1dbh1"; depends=[ggplot2 gridExtra MomTrunc mvtnorm Rcpp RcppArmadillo RcppProgress Rdpack roptim tlrmvnmvt]; }; RcppClassic = derive2 { name="RcppClassic"; version="0.9.12"; sha256="0v9v34i1c4dkplavdl14kz1k2rnk4hsaiyv6rkc9403z9isvzzr0"; depends=[Rcpp]; }; RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.2"; sha256="0dr2104miy7psr73nicfs84652ai0d5liw6wxcwyrx7fmys3p638"; depends=[Rcpp RcppClassic]; }; @@ -4365,7 +4414,7 @@ in with self; { RcppDynProg = derive2 { name="RcppDynProg"; version="0.2.0"; sha256="10nc0sx3n83kg8rddbajifr9q8iyjmm59z5xcpqfmmfi345i26al"; depends=[Rcpp RcppArmadillo wrapr]; }; RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.9.1"; sha256="0qp9gypar280lm84pc8w0fxw4jgwqygwi3qnl5sl52kpkcj8c14a"; 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.18.1.1"; sha256="1xbxyxsx2vczf003b9kj3xyph3bkawp3h4lvxblxmklxpd1s8lfb"; depends=[Rcpp RcppArmadillo]; }; + RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.18.2.1"; sha256="10y86c809ijzvli3vbkm7i6si3ik83ppsr6pivqznx9wslzvk79i"; depends=[Rcpp RcppArmadillo]; }; RcppExamples = derive2 { name="RcppExamples"; version="0.1.9"; sha256="0568zipgjxgmx086mlfpp5n7v8kf50gwrylvhl1bgvzb2vvr9dhj"; depends=[Rcpp]; }; RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; }; RcppFarmHash = derive2 { name="RcppFarmHash"; version="0.0.2"; sha256="0nkismq7hmp1ahwv4z438zrcj7mqsfmas2yd6av6k2cmkgklqkbk"; depends=[Rcpp]; }; @@ -4375,25 +4424,25 @@ in with self; { 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.3.0"; sha256="01z0plf1i6dyibw4ica8shmijyk1grpqb886hcga72z2cpm4xsx0"; depends=[Rcpp]; }; - RcppHungarian = derive2 { name="RcppHungarian"; version="0.1"; sha256="1yx7kjjampjk47l8cqpv727g0nv23dnld9n8iwf7h1myfrl3yb6h"; depends=[Rcpp]; }; + RcppHungarian = derive2 { name="RcppHungarian"; version="0.2"; sha256="0x8jnlc49yng555sl7nvs19x3ydx1bhz0d7ym2igam4xx89hsh9k"; depends=[Rcpp]; }; 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.4-0"; sha256="1a92fql6mijhnr1kxkcxwivf95pk9lhgmhzkshs51h0ybfv5krik"; depends=[Rcpp RcppEigen]; }; - RcppParallel = derive2 { name="RcppParallel"; version="5.1.4"; sha256="10pa9vaz7p4m6hjca2cpy6vj7rvgly4zv0q1g2xfsmcchyk4bdbn"; depends=[]; }; + RcppParallel = derive2 { name="RcppParallel"; version="5.1.5"; sha256="1sn211ajlb1p12sglxqns175rg078yvww268m8cp0vvd7cmk55k3"; depends=[]; }; RcppProgress = derive2 { name="RcppProgress"; version="0.4.2"; sha256="0j2b37gwjpgmrnr00srdzm751hzlpsjb54ph63xxmcdfnwhlnqmi"; depends=[]; }; RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.1.0"; sha256="0nclclhrhvdma8s07jly0xrmaf8iqigln137wmjnsmj6hg7r8ph9"; depends=[BH Rcpp]; }; - RcppRedis = derive2 { name="RcppRedis"; version="0.1.11"; sha256="0aill5ng6ifcafsij1nsqcchca8sxdd87645c45sx7dznpsgrhvj"; depends=[BH RApiSerialize Rcpp]; }; + RcppRedis = derive2 { name="RcppRedis"; version="0.2.0"; sha256="070q8kp5lkz22g4w8fkh5cg3lcc2zwvkpkqz1smi6xcjv7m37bnh"; depends=[RApiSerialize Rcpp]; }; RcppRoll = derive2 { name="RcppRoll"; version="0.3.0"; sha256="0srzfhzkk42kzrdjnhbb37946jp1p688rgysy6k3i2is8jb21zyb"; depends=[Rcpp]; }; RcppSMC = derive2 { name="RcppSMC"; version="0.2.6"; sha256="1svpzx4h9baipqnx2793vkjh1lnr92y82whpryqzzm4i7b6zx27i"; depends=[Rcpp RcppArmadillo]; }; - RcppSimdJson = derive2 { name="RcppSimdJson"; version="0.1.6"; sha256="06d2w7a57sidw06ymk3kb0bc1xp0fzzz39m7niwpz0f10203ky0z"; depends=[Rcpp]; }; + RcppSimdJson = derive2 { name="RcppSimdJson"; version="0.1.7"; sha256="0ajbm7qy3fqlaadpzfhzsaczszlw6l5p31mmr1xd2cb31wszpg9r"; depends=[Rcpp]; }; RcppSpdlog = derive2 { name="RcppSpdlog"; version="0.0.7"; sha256="13cn8dm68mhpgimgvk2ybsccs3qjg8c975zdjr8h86vfwyjj4gnv"; depends=[Rcpp]; }; 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.1.7"; sha256="0h8517ipwqhqkhcfiyqmvsb585g01p0ra0azbpzyxip6pq6g029g"; depends=[Rcpp]; }; - RcppThread = derive2 { name="RcppThread"; version="1.0.0"; sha256="1xfcxrny779kgknlvnc4j02ifprnakndnkhx8bhy50d39vp4hjjl"; depends=[]; }; - RcppUUID = derive2 { name="RcppUUID"; version="1.0.0"; sha256="0sx25z71bkjsf3ggljqkv1pji5kc32i3lkq28igiwixxfl2kj89b"; depends=[BH Rcpp]; }; + RcppThread = derive2 { name="RcppThread"; version="2.1.1"; sha256="14i3bphg4gkw1hsd5d2w3sjys6da8ac7lbd470v4m98v4d3d0hcd"; depends=[]; }; + RcppUUID = derive2 { name="RcppUUID"; version="1.1.1"; sha256="0sxdj5ay90i1bs3wizij31n21ym8l0q0c79959arp1gd303sd8b8"; depends=[BH Rcpp]; }; RcppXPtrUtils = derive2 { name="RcppXPtrUtils"; version="0.1.1"; sha256="0jh64c46gp99d2nsih14vx34pamc8i7gkmiy2nj94rx3sxq62yh5"; depends=[Rcpp]; }; RcppXsimd = derive2 { name="RcppXsimd"; version="7.1.6"; sha256="1iwiz4964dw015cbxcanks8xkjan39hfzf8x6bhvf6dqqwkc4bh7"; depends=[Rcpp]; }; RcppXts = derive2 { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; }; @@ -4404,13 +4453,13 @@ in with self; { Rcssplot = derive2 { name="Rcssplot"; version="1.0.0"; sha256="0hnzwjwk9zh4zbzy8sa0z6amikvpd9k1p1abd38khr8q8k1k8jiv"; depends=[]; }; Rcurvep = derive2 { name="Rcurvep"; version="1.2.0"; sha256="1j067b98hcwm2ha0yrzbwjm54f4z5yqi04y9jkh9k2avpcpdbqxx"; depends=[boot dplyr ggplot2 magrittr purrr Rdpack rlang stringr tibble tidyr tidyselect]; }; Rd2md = derive2 { name="Rd2md"; version="0.0.5"; sha256="1kqni87jg3avpcir1ls2kkf6qafkkdkcv51d9azsbqmji5168vlf"; depends=[knitr]; }; - Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.12"; sha256="0ajbi1v2hgfal5phrgdp172qkl0n1x67pqi0srbclk1ymjnlnrjh"; depends=[formatR roxygen2 xfun]; }; + Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.13"; sha256="1dbysss9m1av5405w7cvkfzkzb3pyl9xlikk6az7qzfdr56zm4b3"; depends=[formatR roxygen2 xfun]; }; Rdca = derive2 { name="Rdca"; version="0.1.0"; sha256="06s4n5xpla937q9f55xmsickvdiwiapxmwqvn6k0zsacisscaagl"; depends=[dplyr magrittr minpack_lm Rcpp RcppArmadillo Rdpack]; }; Rdiagnosislist = derive2 { name="Rdiagnosislist"; version="1.0"; sha256="0f7dikc23z7gyhi29dg2l4l1q178d16nad98xvmdbygah8k1b377"; depends=[bit64 data_table]; }; Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; }; - Rdimtools = derive2 { name="Rdimtools"; version="1.0.8"; sha256="0hzr8yiiwjik0ppr7lak864nngr9i68ib01x9v4g86ixmgakha0w"; depends=[CVXR maotai MASS mclustcomp RANN Rcpp RcppArmadillo RcppDE RcppDist Rcsdp Rdpack RSpectra]; }; + Rdimtools = derive2 { name="Rdimtools"; version="1.0.9"; sha256="1fb5daizc615g58yai6p4lqczwi8kq6fyyifnyn8izxjdpqh0ivm"; depends=[CVXR maotai MASS mclustcomp RANN Rcpp RcppArmadillo RcppDE RcppDist Rcsdp Rdpack RSpectra]; }; Rdistance = derive2 { name="Rdistance"; version="2.1.3"; sha256="03wh6y9h5jgfc6xdncpgyz0v7lqavikp3pf5wwfmm2rqfj7yjr8c"; depends=[]; }; - Rdpack = derive2 { name="Rdpack"; version="2.1.3"; sha256="1f2m9pxm4s4gkrqh58jznkqj2fcw6f29c1l05k5mmkwsdf3ai0c3"; depends=[rbibutils]; }; + Rdpack = derive2 { name="Rdpack"; version="2.1.4"; sha256="0r242a352wa7kha0n62ng6ri0qi14hwjknnyjvfcd7mx4qvfwhgv"; depends=[rbibutils]; }; Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; }; Rdrw = derive2 { name="Rdrw"; version="1.0.2"; sha256="1487r8z6h1y0v6fxkp7qfbh7j96hw8gqbb0fc90m4cxwz0hrqrn2"; depends=[mvtnorm]; }; Rdsdp = derive2 { name="Rdsdp"; version="1.0.5.1"; sha256="0x5dcgl25i6j2pg6d69rinal0yi8w0jwlfg05bnk9bg9v7i7db67"; depends=[]; }; @@ -4419,7 +4468,7 @@ in with self; { Rdtq = derive2 { name="Rdtq"; version="0.1"; sha256="114pyf95nl132014ygn84xi41c2zf1ii2wfgd1acwnnmfzvdw24s"; depends=[Matrix Rcpp]; }; Rduino = derive2 { name="Rduino"; version="0.1"; sha256="0r1yy3a2n8a4niasfjn77gv130a062i802r7xhbg0abljv5m6ra5"; depends=[serial]; }; ReCiPa = derive2 { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; }; - ReDaMoR = derive2 { name="ReDaMoR"; version="0.4.3"; sha256="0dpqa1j43zgrbp77hyymnw6llqfii95q9ivsxidslkdrj3bqb5dc"; depends=[colourpicker crayon dplyr DT igraph jsonlite magrittr markdown readr rintrojs rstudioapi shiny shinyjs visNetwork]; }; + ReDaMoR = derive2 { name="ReDaMoR"; version="0.5.2"; sha256="0yc1jh2ashgy9zcns7dcd5zgnpgigmzrcxi28xwkgjzaidsc7lm7"; depends=[colourpicker crayon dplyr DT igraph jsonlite magrittr markdown 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.10"; sha256="04rqb2jhmgq1az1c1rbs6jfg6gpxjs34k0m4w3a8gnq48l6dwqi8"; depends=[doParallel foreach Rcpp survival]; }; ReacTran = derive2 { name="ReacTran"; version="1.4.3.1"; sha256="05c9jfvj134gy3by7m3r1fbar0m39vaydr7d2py9cakzs44fqfpj"; depends=[deSolve rootSolve shape]; }; @@ -4429,10 +4478,10 @@ in with self; { RecAssoRules = derive2 { name="RecAssoRules"; version="1.0"; sha256="0jvl9yl1rg69bqb1cimi8r0bry73jhsq73fxfyy33ljwym2cdgv6"; depends=[Rcpp]; }; Recocrop = derive2 { name="Recocrop"; version="0.3-2"; sha256="1kcw0qkxwa58yk6iclbg5c0m3q2ylqwra24y9vxjpr2ajmsr5lf8"; depends=[meteor Rcpp terra]; }; Recon = derive2 { name="Recon"; version="0.3.0.0"; sha256="11gag2bl00pcy7ysfycaa58qarh6aigznldkc4kkn2178bl4ii62"; depends=[rootSolve]; }; - RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-12.1"; sha256="0l837hmcn1gwisn1y9q745grg1fyrdbx44jhj81475h2zdn8dbs4"; depends=[ada data_table DBI e1071 evd ff ipred nnet rpart RSQLite xtable]; }; + RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-12.3"; sha256="11nlmg1hcf4nv69ampc4mdq2lz27mq9yn4q7c0k45g0ilydb0pg3"; depends=[ada data_table DBI e1071 evd ff ipred nnet rpart RSQLite xtable]; }; RecordTest = derive2 { name="RecordTest"; version="2.1.0"; sha256="0a5hbhqx97kllwf5k6lrhcqixhqqj8ndklcvpmsp9jdf011b1100"; depends=[ggplot2]; }; Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; }; - RedditExtractoR = derive2 { name="RedditExtractoR"; version="3.0.5"; sha256="09f815av0sn9cz5n3l02k1rrl91d4f67xkwqpdpadw7hnv516pwf"; depends=[RJSONIO rlang]; }; + RedditExtractoR = derive2 { name="RedditExtractoR"; version="3.0.6"; sha256="18apw0qjzk4lc02bx8kfi7hqxyb23zz2r7zw93dgf04aa8q49x2i"; depends=[RJSONIO rlang]; }; RedisBaseContainer = derive2 { name="RedisBaseContainer"; version="1.0.1"; sha256="0pnjj3rbp2as7h92907g338bd173ygl1zfnlfw6c9wpzfvw909rr"; depends=[DockerParallel]; }; Rediscover = derive2 { name="Rediscover"; version="0.3.0"; sha256="0396shg9gf0r7q5jlrab5mr003fz7kj8xdq5chnzmild6kwyq3sk"; depends=[data_table maftools Matrix matrixStats PoissonBinomial RColorBrewer ShiftConvolvePoibin speedglm]; }; Redmonder = derive2 { name="Redmonder"; version="0.2.0"; sha256="02qrz1b0g7hdacj2s2bks5gfwnypkbiwlmn0bv7im1zz1swg9cp8"; depends=[]; }; @@ -4446,7 +4495,6 @@ in with self; { RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; }; 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]; }; - Reliability = derive2 { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; }; RelimpPCR = derive2 { name="RelimpPCR"; version="0.2.4"; sha256="0svfyh313wawzqx9hfb4cg0wn2ir6nd769z1k3dckdsb8d7xkh3q"; depends=[caret ggplot2 relaimpo reshape2 Rmisc]; }; Renext = derive2 { name="Renext"; version="3.1-0"; sha256="074djs4y71667aylpgh514pzijr90rgpzm4w5ayq9cgaqz22m3am"; depends=[evd numDeriv]; }; RenvModule = derive2 { name="RenvModule"; version="1.1"; sha256="1wmz6k0f9lpa8d7qxqm308l7h11k0cj07q3qisfjic5sp308c3d2"; depends=[]; }; @@ -4457,7 +4505,7 @@ in with self; { RepertoiR = derive2 { name="RepertoiR"; version="0.0.1"; sha256="1m7n7p40n3djy91z8z3gqqwscqgij63rjrj2bqbl3baqz16nf4hc"; depends=[circlize igraph reshape2 stringdist stringi stringr]; }; Replicate = derive2 { name="Replicate"; version="1.2.0"; sha256="0kqy248c8n7qr5hwzvqm7flnjlwd60c577r1d4vzgfxn7azd5v3v"; depends=[ggplot2 metafor]; }; Replication = derive2 { name="Replication"; version="0.1.2"; sha256="1za7zcdaf839xf8hxy4rcrr1p80n6a3ywb2bsl3wikwa0pxdvvbh"; depends=[blavaan lavaan MASS mice quadprog rjags runjags]; }; - ReplicationSuccess = derive2 { name="ReplicationSuccess"; version="1.1.1"; sha256="169zdf6hb7g9699w5izs149v79f3jbvrq82vq71ri8k07kzbshlk"; depends=[]; }; + ReplicationSuccess = derive2 { name="ReplicationSuccess"; version="1.2"; sha256="0x470102sr819jgm1h5b228qcckghnfv8badgb53jy05ral7lrc2"; depends=[]; }; Repliscope = derive2 { name="Repliscope"; version="1.1.0"; sha256="0hij4ng77bkd979ndbhx1nqq2rfb69q23ghyd7illgvgrc79y9mr"; depends=[colourpicker ggplot2 shiny]; }; RepoGenerator = derive2 { name="RepoGenerator"; version="0.0.1"; sha256="0d6s2sqyycaqrg32xdkp3pr5i7qmvwrfrjcd7f94a9y3lz4bz5b5"; depends=[git2r httr rmarkdown rstudioapi]; }; Require = derive2 { name="Require"; version="0.0.13"; sha256="09i5pq0qx1n10sbby0jqgs7arw46a31c4wn9mnz71gjad5kv375d"; depends=[data_table remotes]; }; @@ -4474,39 +4522,38 @@ in with self; { Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; }; RfEmpImp = derive2 { name="RfEmpImp"; version="2.1.5"; sha256="1bvjk71rfhpbj2j7raibsb0y3skbv1qba7yl2g00npnkk2zk14xj"; depends=[mice ranger]; }; Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; }; - Rfast = derive2 { name="Rfast"; version="2.0.4"; sha256="1n9imwkkq14ickp0g34jyha4jkr180xj0ar8xh3hqqi4dvihg6cm"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; + Rfast = derive2 { name="Rfast"; version="2.0.6"; sha256="0zxykq021h57mq0n6giqbx8ncjsdly0arhmaj3fcp3yfcxf4ns9l"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; Rfast2 = derive2 { name="Rfast2"; version="0.1.1"; sha256="1sqd5614gw1ag7wjidjv8bxf3qz8lkz7m9gangihgrlf0bm4944h"; depends=[RANN Rcpp RcppArmadillo Rfast]; }; Rfit = derive2 { name="Rfit"; version="0.24.2"; sha256="1b3pza2xdpifvrcqbdp5r2wy82ws1844bnpna01hqj65xbw2iix8"; depends=[]; }; Rfmtool = derive2 { name="Rfmtool"; version="4.1.4"; sha256="0vli7n957vrxs47nq5h4aqd9nwq7alj47q91zqc009rfx7wgx2k5"; depends=[]; }; Rfolding = derive2 { name="Rfolding"; version="1.0"; sha256="15lf73zxr1slin9faj9k0z8qkb1g9nb7h080nfv99gsi2ks68ssg"; depends=[]; }; - Rforestry = derive2 { name="Rforestry"; version="0.9.0.57"; sha256="1sm45ivij3pdgr5n2mqz25613nq7865d0mk9c2k33sb3z1lbfi73"; depends=[dplyr glmnet onehot Rcpp RcppArmadillo RcppThread visNetwork]; }; + Rforestry = derive2 { name="Rforestry"; version="0.9.0.95"; sha256="0m6znm0yir0vlbp4vc517pxvbb81xg85cpgc9b12k5ay65lrzxq5"; depends=[dplyr glmnet onehot Rcpp RcppArmadillo RcppThread visNetwork]; }; Rfractran = derive2 { name="Rfractran"; version="1.0"; sha256="0cwc069f7rhkxkr5kn0n43mdy8m47gh0q6d5ijwzkhncrijb10cy"; depends=[gmp]; }; - Rfssa = derive2 { name="Rfssa"; version="2.0.0"; sha256="13pp2nw14pivjnxw69j9hdqhsf980xjr94ccxi48ak2hvh4za2zg"; depends=[dplyr fda ggplot2 hrbrthemes httr lattice markdown plotly Rcpp RcppArmadillo RcppEigen RSpectra Rssa shiny tibble]; }; + Rfssa = derive2 { name="Rfssa"; version="2.0.1"; sha256="07aj8gmr6sjrmx82g2g6xn40c3kb8i9bknsd0db0av6kfd8x6giy"; depends=[dplyr fda ggplot2 hrbrthemes httr lattice markdown plotly Rcpp RcppArmadillo RcppEigen RSpectra Rssa shiny tibble]; }; Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; }; Rgb = derive2 { name="Rgb"; version="1.6.1"; sha256="0qs3dlv4g45dqphqjm23ky3w6rxh8ff2q6b17kvf57skyf1b1yn8"; depends=[]; }; Rgbp = derive2 { name="Rgbp"; version="1.1.4"; sha256="1y51sms321sbrl3rgzp5hq4y5mqkrjxsyrq75gkcbwfvlakjcfrg"; depends=[mnormt sn]; }; Rglpk = derive2 { name="Rglpk"; version="0.6-4"; sha256="19mzpyimzq9zqnbi05j79b2di3nzaln8swggs9p8sqdr60qvr3d2"; depends=[slam]; }; RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.5.3"; sha256="02v8k0bw70q4qwx4lcdy8p25q7n3ql2ll46lfpqllxa1p26svmfi"; depends=[png sp]; }; RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.21-247.1"; sha256="0scpr6jq25xx7wmqyc380ann4h536ll0g7wblikk25yqvpamzrav"; depends=[]; }; - RichR = derive2 { name="RichR"; version="1.0.0"; sha256="0z0ri90jqdmw0vwxd1b4wr9if5cgm1gqpf6g9p1fdvncf4sdi9by"; depends=[magrittr metap plyr reshape2]; }; RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; }; Ridit = derive2 { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; }; RiemBase = derive2 { name="RiemBase"; version="0.2.5"; sha256="1ikv7n8hp23a5dbmnfypdkx74vxwjd9br0hvysnhhpg1ffvr5vhi"; depends=[pracma Rcpp RcppArmadillo Rdpack]; }; - Riemann = derive2 { name="Riemann"; version="0.1.3"; sha256="1yy4vc70raa57iz5chp367qwd8dgy3cdl7kzlkq1jchwry6l27xc"; depends=[CVXR DEoptim ggrepel lpSolve maotai Matrix Rcpp RcppArmadillo Rdimtools Rdpack RiemBase T4cluster]; }; + Riemann = derive2 { name="Riemann"; version="0.1.4"; sha256="1a3mlfgnzdvl5x1nqnmm4v3xb2nkdq87c21m6xyxbm7zh5vx5b6m"; depends=[CVXR DEoptim lpSolve maotai Matrix Rcpp RcppArmadillo Rdimtools Rdpack RiemBase T4cluster]; }; Riex = derive2 { name="Riex"; version="1.0.2"; sha256="03627dik6dd9d2kwv757zanh0i4invmcwg162m9ayhv41ygj5z1l"; depends=[dplyr ggplot2 httr purrr quantmod rjson stringr tibble tidyr TTR urltools xts zoo]; }; Rilostat = derive2 { name="Rilostat"; version="1.1.8"; sha256="02fmz4jla151w6bz0zg766q4d34kz1jf43156yr2f90zj8x4jjx4"; depends=[data_table dplyr DT haven plyr RCurl readr stringr tibble tidyr xml2]; }; Rip46 = derive2 { name="Rip46"; version="1.0.2"; sha256="0wfp6fm5mgmjqjkn0c5hvjd95yn4zcv0s8xc5294qf5jqxp8b1w7"; depends=[Rcpp]; }; Rirt = derive2 { name="Rirt"; version="0.0.2"; sha256="0npd2g3a4dh5hlj6l06k1pf0j4731ybqqd4mpi4id16nf81cg104"; depends=[ggplot2 Rcpp reshape2]; }; Risk = derive2 { name="Risk"; version="1.0"; sha256="1i42xcc699syj108mvgklwb30wkf9c9jrg5rmd2ypnqk9mnyg2fg"; depends=[]; }; RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.7"; sha256="07mhn8imn4y8kf50x2g7i55dyksh0sryjkzb09rkf64x49vq7ban"; depends=[MASS nloptr quadprog]; }; - Rita = derive2 { name="Rita"; version="1.0.0"; sha256="05zk2akr35zlwpylgmg67m4gizdkxydds2isjmaj1bnz848s2dmd"; depends=[lattice]; }; + Rita = derive2 { name="Rita"; version="1.1.0"; sha256="1kpnb8dk81w6gi8wmp1qfjkg9bqzbsniax4hdr6qg921rqaxwack"; depends=[lattice]; }; Ritc = derive2 { name="Ritc"; version="1.0.2"; sha256="03smhxjhjfkc9pxhlgg54b6v2jznpmnws8373qpvn9a9ky5bcq2l"; depends=[minpack_lm]; }; RiverBuilder = derive2 { name="RiverBuilder"; version="0.1.1"; sha256="06cd1m4liv2bsh2sxplq2zl45g9zq8gsgvh14d0zr0pqm8z4dsyw"; depends=[]; }; RiverLoad = derive2 { name="RiverLoad"; version="1.0.3"; sha256="01nrkj75smnsfrl0x82dif67q9xs15ngksz0p73i7xf6dqprjjcf"; depends=[imputeTS]; }; Rivivc = derive2 { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; }; RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; }; Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; }; - Rlabkey = derive2 { name="Rlabkey"; version="2.8.2"; sha256="1ja7ac41nb0x82ajr1k7av1fvx1blpsnbdm5771li6jwnmasf8hh"; depends=[httr jsonlite Rcpp]; }; + Rlabkey = derive2 { name="Rlabkey"; version="2.8.3"; sha256="0p6b0vm7kp7fq9cghj92j98zkiwy22dnpbaqcsms25dd08ra49x7"; depends=[httr jsonlite Rcpp]; }; Rlda = derive2 { name="Rlda"; version="0.2.6"; sha256="0i8n01h9072q339p1kiqhcpwphw0d2x6bsszbhgfqc2b160dk2bl"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; }; Rlgt = derive2 { name="Rlgt"; version="0.1-3"; sha256="0g610v5rch5s31gc7dy9zx4mcgsdhn82y1pmr2rs14qma0v7x515"; depends=[BH forecast Rcpp RcppEigen rstan rstantools sn StanHeaders]; }; Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.2"; sha256="0hzsnrz30429pavf7qghknykah9ks4msb96zwa1xgvqb4zd512dg"; depends=[Rcpp]; }; @@ -4529,7 +4576,7 @@ in with self; { Rnmr1D = derive2 { name="Rnmr1D"; version="1.3.0"; sha256="1x06a2bsfpx27pgpxj0dih72pav26g3j0lmh0fa8gjw45jc64f4a"; depends=[base64enc doParallel foreach ggplot2 igraph impute MASS MassSpecWavelet Matrix minqa plotly plyr ptw Rcpp signal speaq XML]; }; Rnumerai = derive2 { name="Rnumerai"; version="2.1.4"; sha256="0zxpim1wgymdhdyl7dcvc16iic57wmn8qvxicps9kgr8wxgic0p8"; depends=[arrow data_table dplyr ggplot2 httr lubridate purrr tidyr]; }; Rnvd3 = derive2 { name="Rnvd3"; version="1.0.0"; sha256="13l5vcbcm88jfsc11ijkvr1s8qk8fflclazs4kl1k2wzpnlr6z6a"; depends=[data_table htmltools htmlwidgets jsonlite lazyeval lubridate viridisLite]; }; - RoBMA = derive2 { name="RoBMA"; version="2.1.1"; sha256="0i4pawqsa4iy0xa1sahnbchbrip2cbqklfks29ffjwa511h8g510"; depends=[BayesTools bridgesampling callr coda extraDistr ggplot2 psych Rdpack rjags runjags scales]; }; + RoBMA = derive2 { name="RoBMA"; version="2.1.2"; sha256="0qp2rs6wvkfprzi3rwb32wfnjvp7fs74a6mxl4bzfwgpv2ai4g33"; depends=[BayesTools bridgesampling callr coda extraDistr ggplot2 psych Rdpack rjags runjags scales]; }; RobAStBase = derive2 { name="RobAStBase"; version="1.2.1"; sha256="0dn93bcyz9kxbj38sc1wisfa6v0666v9gk6y3zq0ihjkkhkmdwq3"; 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]; }; @@ -4542,18 +4589,18 @@ in with self; { RobRSVD = derive2 { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; }; RobRex = derive2 { name="RobRex"; version="1.2.0"; sha256="1npgbdvdzb0p0w77fsngrwg968y621p3lx8qw69ns8qgxjkismqp"; depends=[distr RandVar RobAStBase ROptRegTS]; }; RobStatTM = derive2 { name="RobStatTM"; version="1.0.3"; sha256="12m10jcy929143kl6v9x45vqcsjvpqhwsnd9sfn2bfb30v31335r"; depends=[pyinit robustbase rrcov]; }; - RobinHood = derive2 { name="RobinHood"; version="1.6"; sha256="1513z92kk7p1d25zlm597yfswdx4x2w880366cs06j7nfg32izir"; depends=[dplyr httr jsonlite lubridate magrittr profvis uuid]; }; + RobinHood = derive2 { name="RobinHood"; version="1.6.2"; sha256="0sqqsakqg05dc7g0l1ypx5xkvy5bnk7m4bdpcfxgbshry7402kh3"; depends=[dplyr httr jsonlite lubridate magrittr profvis uuid]; }; Robocoap = derive2 { name="Robocoap"; version="0.1-1"; sha256="0aj6iv85a1zfaknjhrzf6lnf0qn726dvnj4dywg9nii1kkqrkq2w"; depends=[data_table igraph markovchain tm]; }; RobustAFT = derive2 { name="RobustAFT"; version="1.4-5"; sha256="1i119qqlavfj7k0srb8fbbyy2nhsjv9rgrni854liizr9m51cgac"; depends=[robustbase survival]; }; 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.1"; sha256="0wsnvryvrl37acljrda2dm1d8aynqiy66yd2i857m035whixfpqa"; depends=[Rcpp RcppEigen RobustGaSP]; }; - RobustGaSP = derive2 { name="RobustGaSP"; version="0.6.3"; sha256="14frbm41f75664ik520724psnh6h24qhp09fbwbcm6waqavs3q12"; depends=[nloptr Rcpp RcppEigen]; }; + RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.2"; sha256="0004rjgdl4g6ghn29zzvz6q877njxwr4cvc2r6i6cmsdjav9kqis"; depends=[nloptr Rcpp RcppEigen RobustGaSP]; }; + RobustGaSP = derive2 { name="RobustGaSP"; version="0.6.4"; sha256="04l6glx7ys4v3z96h0sfcxfcdnq5aj5z7qyxljgjal91rgxbmn9j"; depends=[nloptr Rcpp RcppEigen]; }; RobustLinearReg = derive2 { name="RobustLinearReg"; version="1.2.0"; sha256="06137f516gyj64qdmwby7m1xnvj4hxzpqj454jn0xcinvl89380w"; depends=[]; }; RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; }; RockFab = derive2 { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[EBImage rgl]; }; - Rodam = derive2 { name="Rodam"; version="0.1.12"; sha256="01pjyz4sjdvmjicvajvhryv9b3kzwdyba0vwj0gvyrf6wiahv4qx"; depends=[httr]; }; - Rogue = derive2 { name="Rogue"; version="2.0.0"; sha256="1dxyxgwy0hylbbgi9vc6g8cll2qxim2wl9zva643g4aq4da5wwsg"; depends=[ape cli fastmatch matrixStats Rdpack Rfast TreeDist TreeTools]; }; + Rodam = derive2 { name="Rodam"; version="0.1.14"; sha256="1vnr57qq56svrlixmimh4x0irprsvanj2hz95yb7fhl26kgy0mmk"; depends=[httr]; }; + Rogue = derive2 { name="Rogue"; version="2.1.0"; sha256="1dr7rknvkrwkd53ah92wkrn1k3jr3bkzkp5r90v9mq0vlq9hvvn2"; depends=[ape cli fastmatch matrixStats Rdpack Rfast TreeDist TreeTools]; }; RolWinMulCor = derive2 { name="RolWinMulCor"; version="1.2.0"; sha256="0vfsgp0qvv6pnpai8nyy0xzzlzyjwx98xrhlwlks9dbm84wg8vqr"; depends=[colorspace gtools pracma scales zoo]; }; RonFHIR = derive2 { name="RonFHIR"; version="0.4.0"; sha256="1ajpgpp300m0zzqzzwsn8sfy8x751hrr8py9n9xvzjmkgyrh4hhw"; depends=[httr jsonlite R6 stringr]; }; Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; }; @@ -4579,8 +4626,9 @@ in with self; { 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.2"; sha256="1v4q5pgk4ycwi2m807iqz6j2bvsm4x4dvqg5vr5fa8ggfw40xvz7"; depends=[curl rjson stringr]; }; Rrdrand = derive2 { name="Rrdrand"; version="0.1-16"; sha256="0j9yyvq8r1cgwj3kw1ak6hyazr67f2q0c1m651wdm0wcvm1ajx7f"; depends=[]; }; - RsSimulx = derive2 { name="RsSimulx"; version="1.0.1"; sha256="0fg19mmgcqz39mxhnxlsd1l1qmkjrvbc3149hrib0mayy1b1fqw4"; depends=[ggplot2 gridExtra]; }; + RsSimulx = derive2 { name="RsSimulx"; version="2.0.0"; sha256="11ji1fvf6rclzh8yw1d7d4zkfzsyw4jsfwyhxlx9j0kqyr0jz5bc"; depends=[ggplot2 gridExtra]; }; Rsagacmd = derive2 { name="Rsagacmd"; version="0.1.2"; sha256="0zj9a63hq8pm592lvf3n62pzn0lfkh02d4v4mkqhgixx7jaxyz2x"; depends=[foreign generics processx raster rgdal 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]; }; @@ -4588,7 +4636,7 @@ in with self; { 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="3.0.0"; sha256="04d47l8s8hi8gyca4j60zj35wpvr4mml282w586c8x24g62jznvk"; depends=[ggplot2 gridExtra MASS]; }; + Rsmlx = derive2 { name="Rsmlx"; version="4.0.2"; sha256="05g89qpfbivw1j647vgsdqkqalzzcywkqy21vyiwi0j9va92482p"; depends=[dplyr ggplot2 gridExtra MASS]; }; Rsolnp = derive2 { name="Rsolnp"; version="1.16"; sha256="0w7nkj6igr0gi7r7jg950lsx7dj6aipgxi6vbjsf5f5yc9h7fhii"; depends=[truncnorm]; }; Rspc = derive2 { name="Rspc"; version="1.2.2"; sha256="1cnzqpnh009wfs51dc4id9q3giaa8b6dc75b1lhzpwcvw0cxcy4y"; depends=[]; }; Rspotify = derive2 { name="Rspotify"; version="0.1.2"; sha256="1q8ajjx5ghlgxgch9gifvhi2gmsi0ph8pygwrb9jrd3ijahlw5k4"; depends=[dplyr httr jsonlite magrittr plyr]; }; @@ -4600,12 +4648,12 @@ in with self; { 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]; }; Rtauchen = derive2 { name="Rtauchen"; version="1.0"; sha256="09282k6qsjxgm26682npfjymmbx5g8flcc44awmkjl2k4fa1q9ha"; depends=[]; }; - Rthingsboard = derive2 { name="Rthingsboard"; version="0.2.4"; sha256="0577fb7f1dm5a3xz6q9gmg97i2080hv2qpq944wilfmfzz0xa4h1"; depends=[dplyr httr logger]; }; + Rthingsboard = derive2 { name="Rthingsboard"; version="0.2.7"; sha256="165yx215vmsx3r5zqzh0awf5jzznxsapq49c3q5qrhcircbnjfcg"; depends=[dplyr httr logger]; }; Rtnmin = derive2 { name="Rtnmin"; version="2016-7.7"; sha256="0f8ii87v29v61b93hx2yxdppp3nvgnl5imp80sbb4bjsdg0mf989"; depends=[]; }; Rtrack = derive2 { name="Rtrack"; version="1.0.0"; sha256="01xgbz37rsbjkix9nlx64qyimsbbgsmyswcv4jbpqasvkp6d480q"; depends=[crayon Hmisc KernSmooth openxlsx pbapply randomForest raster readxl rgeos rjson sp]; }; Rtropical = derive2 { name="Rtropical"; version="1.2.1"; sha256="1r4585z1fna9s8whaq1w0drndg9cpqmrmqylj3m2ahfppb0xr3ic"; depends=[ape caret lpSolve lpSolveAPI RcppAlgos Rfast]; }; Rtsne = derive2 { name="Rtsne"; version="0.15"; sha256="0v17vxizrs1msay24xl2bckfajr2c82wpqj07lyssbrq197nwdsn"; depends=[Rcpp]; }; - Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.9"; sha256="0w9ybqvr4bvpa2dyfkrscg4in0x2dkzmxdn1n6003j1rss7f8rw6"; depends=[]; }; + Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.10"; sha256="1fp1y0kxa5xg8w0dplm12wfm8h78az4k6ql1758wwhb3d17np241"; depends=[]; }; 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]; }; Rtwalk = derive2 { name="Rtwalk"; version="1.8.0"; sha256="0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5"; depends=[]; }; Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; }; @@ -4615,22 +4663,21 @@ in with self; { Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; }; Rwave = derive2 { name="Rwave"; version="2.6-0"; sha256="1si4iambn5kxagc24gy83hlvv5zgypz6dqxbzk24qxzfwglkhqzb"; depends=[]; }; RweaveExtra = derive2 { name="RweaveExtra"; version="1.0-0"; sha256="1jg4dn2x8d74z0wy9j9azvb8f1g0449ji5yl6g964lv2g3fpq6qh"; depends=[]; }; - Rwhois = derive2 { name="Rwhois"; version="1.0.8"; sha256="0czsxqvr07676jsxv4bnjfyr9n2zj34pdirhd259113ypv542590"; depends=[stringr]; }; - Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1.1"; sha256="0kaxhaa65k1hkhl4kqfxyyk6v967xncrdr5hy8b808zlbqriankc"; depends=[]; }; + Rwhois = derive2 { name="Rwhois"; version="1.0.9"; sha256="0jf7byg5ah4djj4b3l0760x9bk9yh6b23aa3w0q1cqlx4j9drf2w"; depends=[stringr]; }; Rwofost = derive2 { name="Rwofost"; version="0.8-3"; sha256="1x6ia49xrdqcxilq12g47gd00smm5jdrq7xavndd3dcnvl1nqk1y"; depends=[meteor Rcpp]; }; Rwordseg = derive2 { name="Rwordseg"; version="0.3-2"; sha256="10jhfalh45rrcm76hwz4b5yl408ndx2wkr0i3q1avx6z6i45d8s6"; depends=[HMM tmcn]; }; Rwtss = derive2 { name="Rwtss"; version="0.9.1"; sha256="0ihpn96l0bj34ph747q7rfq78sbjjb4hhdjr2a7agc97rrggcr94"; depends=[assertthat dplyr geosphere ggplot2 httr jsonlite lubridate magrittr purrr reshape2 stringr tibble zoo]; }; RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-5"; sha256="01n74xnhz1fdvb63g0lxkzsdp1frspin4a764l358immjivdrx2v"; depends=[coda lattice MASS MCMCpack mvtnorm]; }; - RxODE = derive2 { name="RxODE"; version="1.1.2"; sha256="12x8mi2d4s1qpqic8fp2axgn1gj4nfylsp4i5wkl1if6876kl3ip"; depends=[assertthat backports BH checkmate cli dparser ggplot2 inline lotri magrittr memoise PreciseSums qs Rcpp RcppArmadillo RcppEigen rex sitmo StanHeaders sys]; }; + RxODE = derive2 { name="RxODE"; version="1.1.4"; sha256="108anb3zyyr378qwnsf1mdxsmkl3h333b4fzclr9xc351x0j1rdm"; depends=[assertthat backports BH checkmate cli dparser ggplot2 inline lotri magrittr memoise PreciseSums qs Rcpp RcppArmadillo RcppEigen rex sitmo StanHeaders sys]; }; RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; }; Ryacas = derive2 { name="Ryacas"; version="1.1.3.1"; sha256="0c258p7ibas4xbq1wh8c1nfqf6r9d0hicrf8mkkyriw4mb6wmzqq"; depends=[magrittr Rcpp]; }; Ryacas0 = derive2 { name="Ryacas0"; version="0.4.3"; sha256="1qsj6hbydi923bvc8qy1k34nl73xf3fsmr5ww3dw9gzn1kzg2470"; depends=[Rcpp settings xml2]; }; S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; }; - SACCR = derive2 { name="SACCR"; version="3.1"; sha256="1nngjaay4n856a1naw8niw30rhzrxxvnkma6wx721r4zv24nkw3k"; depends=[data_tree jsonlite Trading]; }; + 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]; }; - SAEval = derive2 { name="SAEval"; version="0.1.0"; sha256="1vakvgcr289b9c58x83mjj88ksshbh71gxcna0vfpiyl4rdc052b"; depends=[car ggplot2 ggspatial lmtest]; }; + SAEval = derive2 { name="SAEval"; version="0.1.1"; sha256="036k13q0746rcshpwzrf33mrwa8c3i4bdh14s53xngzzdfxckxlr"; 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=[]; }; SAGMM = derive2 { name="SAGMM"; version="0.2.4"; sha256="18ig7ncmrfs5cyc28xpbqk9zjhwqfp7gwix7y2v1j4j2wbdc2hzs"; depends=[lowmemtkmeans mclust MixSim Rcpp RcppArmadillo]; }; @@ -4643,22 +4690,21 @@ in with self; { SAMTx = derive2 { name="SAMTx"; version="0.3.0"; sha256="18r03w74fcra3c0xa76jnkkms9pjirdmgb2k1dnz7symqf9cvc5l"; depends=[BART]; }; SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; }; SAMURAI = derive2 { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; }; - SAMtool = derive2 { name="SAMtool"; version="1.2.4"; sha256="04c6z00bxa3isfvav2s2wsgw8dvv1ym32hj2h4xwf608fsbrqar5"; depends=[corpcor dplyr gplots MSEtool RcppEigen rmarkdown snowfall TMB vars]; }; + SAMtool = derive2 { name="SAMtool"; version="1.2.5"; sha256="0br63g50x2pldf1xy72ji57ajkzil4jvw118bjarqjkjz68yk2ak"; depends=[corpcor dplyr gplots MSEtool RcppEigen rmarkdown snowfall TMB vars]; }; SAPP = derive2 { name="SAPP"; version="1.0.8"; sha256="1lb148s8rdx1phmx8ihncgb45iqxzracxznys7zyzs8qcf6hm5wq"; 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="0.8.7"; sha256="1yq1rvalibdja12461nivaifhdip3w0qzm0z99zcl0h13r6zl55r"; depends=[base64enc]; }; - SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; }; SAScii = derive2 { name="SAScii"; version="1.0"; sha256="0nq859xmrvpbifk8q1kbx3svg61rqdg8p8gr1pn85fr0j3w7h666"; depends=[]; }; SASmarkdown = derive2 { name="SASmarkdown"; version="0.4.3"; sha256="0jc21ylflvv4snik13731acxh9zw79s7hpswk58p2wzvavq8k9zn"; depends=[knitr]; }; SASmixed = derive2 { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; }; SASxport = derive2 { name="SASxport"; version="1.7.0"; sha256="1na94lxrn8kbhxpiflg14nkdx13rjq9bvvqbxyxh1mq0q7vz7a2l"; depends=[Hmisc stringi]; }; - SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; }; 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]; }; 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]; }; SBRect = derive2 { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; }; SBSA = derive2 { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp RcppArmadillo]; }; SBSDiff = derive2 { name="SBSDiff"; version="0.1.0"; sha256="0mw1646dmhxw6zz4pq7j0g3mf9bjn72g43sq7m72r8ma8ciqj7r2"; depends=[]; }; @@ -4698,13 +4744,12 @@ in with self; { SDD = derive2 { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; }; SDDE = derive2 { name="SDDE"; version="1.0.1"; sha256="14vql1bypn409w9xcx1jdzff6apiagcz2wng3y24h3mk7yjv9bzy"; depends=[doParallel foreach igraph iterators]; }; SDEFSR = derive2 { name="SDEFSR"; version="0.7.22"; sha256="10rxq2y7a9rbzgl5s5fdh93jm4w5kqbyyflw5xfsdwymjj9p4b7m"; depends=[foreign ggplot2 shiny]; }; - SDLfilter = derive2 { name="SDLfilter"; version="2.1.2"; sha256="17h3s2giczcisvpcf7am5kh3nrh70gn58mlfc0x91d34awbn1z2z"; depends=[data_table dplyr ggmap ggplot2 ggsn gridExtra lubridate maps plotKML plyr pracma raster sp trip]; }; + SDLfilter = derive2 { name="SDLfilter"; version="2.2.0"; sha256="150rc426q8axf3f1i50k1bjdbac9mcm8yb6zqg6b82qhf2hbb4c4"; depends=[data_table dplyr emmeans ggmap ggplot2 ggsn gridExtra lubridate maps plotKML plyr pracma raster sp trip]; }; SDMPlay = derive2 { name="SDMPlay"; version="2.0"; sha256="1qdvpa57p4p3949rjmvvvz41a3hm3jb34dnn8s2pi04rzrjkys0f"; depends=[dismo raster]; }; SDMtune = derive2 { name="SDMtune"; version="1.1.5"; sha256="1nfxm1g7kyvn7j7zkjwsn6bi5xz77bjna1dcbak9k8xnk627kxjw"; depends=[dismo gbm ggplot2 jsonlite maxnet nnet progress randomForest raster Rcpp rlang rstudioapi stringr whisker]; }; SDT = derive2 { name="SDT"; version="1.0.0"; sha256="1jwpfd1pnzy9wcl90qv5bgwi19shsw9064dvml9zwbif8yw8dzjj"; depends=[quadprog]; }; SDaA = derive2 { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; }; SE_EQ = derive2 { name="SE.EQ"; version="1.0"; sha256="09fqx2rcqpiv072l6gqgfz9pdhas98q4kkkm7m4y28k13q2gicgl"; depends=[MASS]; }; - SEA = derive2 { name="SEA"; version="2.0"; sha256="1pw1509qjjqz63a8biwakdxqgln7kjviacqrjvp1323vf55bi4fs"; depends=[data_table doParallel foreach kolmim KScorrect MASS shiny]; }; SEAGLE = derive2 { name="SEAGLE"; version="1.0.1"; sha256="1j5wjjw7fl2m4h9brg8dyahf1vmn9wgc7jaajaz6z1xqm6fc0d9k"; depends=[CompQuadForm Matrix]; }; SEAsic = derive2 { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; }; SECFISH = derive2 { name="SECFISH"; version="0.1.7"; sha256="0yd9k6anz9g4psg5kh1bhp0lr1i4y7in1m0mxk4qp14nl1zqy4fy"; depends=[ggplot2 Hmisc optimization]; }; @@ -4713,8 +4758,7 @@ in with self; { SEIRfansy = derive2 { name="SEIRfansy"; version="1.1.1"; sha256="0xnyrsv04n22s71v1wajwpccwk78q27fgry9dhxxzw8a6yd082x8"; depends=[arm DescTools dplyr ggplot2 ggpubr knitr magrittr patchwork pbapply rlang scales]; }; SEL = derive2 { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[lattice quadprog]; }; SELF = derive2 { name="SELF"; version="0.1.1"; sha256="1yafjhxwsanr33dqy7w9x61ghldr29s8k6h68idq6nnfb77ghjyx"; depends=[bnlearn CompareCausalNetworks data_table Rcpp xgboost]; }; - SEMID = derive2 { name="SEMID"; version="0.3.2"; sha256="0v1zrx5xxramsg2zzk7b2fyv6kky7xb1q1cg8vi6zg6ln9vgm2dk"; depends=[igraph R_methodsS3 R_oo R_utils]; }; - SEMModComp = derive2 { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; }; + SEMID = derive2 { name="SEMID"; version="0.4.0"; sha256="1888l4m7d944j4cmh6l19fjmrsh6r6xlfwjzpvyanxd769xmyfzc"; depends=[igraph R_methodsS3 R_oo R_utils]; }; SEMgraph = derive2 { name="SEMgraph"; version="1.0.5"; sha256="1yr77c46y009h7ra842flvlmi7q1n9bk6ji9wlwkyl62caqn5ksi"; depends=[boot cate corpcor dagitty diffusr flip gdata ggm GGMncv glmnet graph igraph lavaan Matrix pbapply protoclust RcppEigen Rgraphviz]; }; SEMrushR = derive2 { name="SEMrushR"; version="0.1.0"; sha256="19prwbh429ra69nz3nx4vzqmb46xssci74rk9mhpnzbi52ycg5gd"; depends=[]; }; SEMsens = derive2 { name="SEMsens"; version="1.0.2"; sha256="18qcwhn1j9ci6338spwgym9g8590p5nc5sdvnpby3xrs9wv76nqs"; depends=[lavaan]; }; @@ -4722,7 +4766,7 @@ in with self; { SEchart = derive2 { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; }; SEofM = derive2 { name="SEofM"; version="0.1.0"; sha256="0662f4ayr05h33myxbfal682fxfwpl3a94kv4bzc8hil9bcqcznf"; depends=[]; }; SFS = derive2 { name="SFS"; version="0.1.4"; sha256="1pig64pj30yyfzyv97f74gshw4lnklrx0npp4da3absk6anb3iv7"; depends=[Rcpp RcppArmadillo]; }; - SFSI = derive2 { name="SFSI"; version="1.0.0"; sha256="19bazsxkl7nv71spkgk18b3cq94xaw63s6jzai2lg1rnhz14yf6j"; depends=[float]; }; + SFSI = derive2 { name="SFSI"; version="1.0.1"; sha256="1k2bshl8grivzy1rmwlp4f2v994zv83rkw3ia72fa1q85wrwdhab"; depends=[float]; }; 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=[]; }; @@ -4739,36 +4783,35 @@ in with self; { SIDES = derive2 { name="SIDES"; version="1.16"; sha256="0hp0dkdmc5srqjbpvcq2ynwzrfdx06xn4s4a7a3wlssmn4indj69"; 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="0.2.0"; sha256="1km82hrwsdz0chkpsad7bylnkcc7pwc7j0s9ng2hd0w5m85cigc4"; depends=[CVXR glmnet Matrix qpdf Rdpack scalreg]; }; - SII = derive2 { name="SII"; version="1.0.3.1"; sha256="1xvk04b7725ksfd7h4p7px5zanbf6s7xlmjpb7w0nvbi6km2f7ri"; depends=[]; }; SILGGM = derive2 { name="SILGGM"; version="1.0.0"; sha256="1lhmisgg2zbfksl7czz0fqag3732gkjc44n615ipxbdi2pvnc7m0"; depends=[glasso MASS Rcpp reshape]; }; SILM = derive2 { name="SILM"; version="1.0.0"; sha256="1iaivpdx18djfm5dqak0q9kfl1xfrnx3gk5x9a4y53h1d7jhl9p6"; depends=[glmnet hdi scalreg SIS]; }; - SIMMS = derive2 { name="SIMMS"; version="1.3.1"; sha256="0kgaky1hpvvbs2hbzaili9h9pv34c5drfh0d1rc8vf9099xw8575"; depends=[doParallel foreach glmnet MASS randomForestSRC survival]; }; - SIMPLE_REGRESSION = derive2 { name="SIMPLE.REGRESSION"; version="0.1.2"; sha256="128ljx9pzpy812z9ni60k6xynm64z9aijmr7rp9ap9ifmhyv914v"; depends=[nlme]; }; + SIMEXBoost = derive2 { name="SIMEXBoost"; version="0.1.0"; sha256="0gxw8xb2hvsizawfd863c268q5wq1cdsmdsand5iys2b9gry1pmq"; depends=[MASS]; }; + SIMPLE_REGRESSION = derive2 { name="SIMPLE.REGRESSION"; version="0.1.4"; sha256="0psmkkfm3i4wffnplm3mclpvkd28lb6kfj8idspmcpvp7414xl3m"; depends=[nlme]; }; SIN = derive2 { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; }; SIPDIBGE = derive2 { name="SIPDIBGE"; version="0.1.6"; sha256="1g8sz5jcndx33456cxciq85lq1jf8sbny649rzq1figbwvcz83ih"; depends=[cli COVIDIBGE PNADcIBGE png PNSIBGE POFIBGE purrr rstudioapi tibble]; }; SIRE = derive2 { name="SIRE"; version="1.1.0"; sha256="0f624j087k7krg73bqn2qxdgzq66jyhvzz8n024vz3h4hwagxs5n"; depends=[dplyr igraph magrittr MASS Matrix matrixcalc numDeriv psych Rsolnp stringr systemfit]; }; SIRmcmc = derive2 { name="SIRmcmc"; version="1.1"; sha256="1dqcp0mrddw0zl3zx0z077vd1x0p3q1j5cv8hxln9blmiv1lggx1"; depends=[Rcpp]; }; SIS = derive2 { name="SIS"; version="0.8-8"; sha256="1f5czwcgpmmn8habm24p3xh4w7jn2faais2x2gmaiq4dpjfnv6h8"; depends=[glmnet ncvreg survival]; }; - SISIR = derive2 { name="SISIR"; version="0.1-2"; sha256="1bhvgkcnv27av2z5pifs76j4dwpkhzwg7c3jxpc8pwac1s9jiz53"; depends=[doParallel expm foreach glmnet Matrix RSpectra]; }; + SISIR = derive2 { name="SISIR"; version="0.1-3"; sha256="093a202byak1839d6949yv4f0i43jlcvfmzd41qy4l0i7qdhvr72"; depends=[doParallel expm foreach glmnet Matrix RSpectra]; }; SITH = derive2 { name="SITH"; version="1.1.0"; sha256="1626nsbnz4fh49wymxm1cqb0nrfyxhmh9fmdxr62dzj5b53amknc"; depends=[Rcpp scatterplot3d]; }; SIfEK = derive2 { name="SIfEK"; version="0.1.0"; sha256="037ps6yfy7w6i8vm0b78c8w9kdmw312dl5nc2qz86rfk8kjg7w27"; depends=[MASS numDeriv ramcmc smfsb]; }; SK = derive2 { name="SK"; version="1.1"; sha256="19yg7yc2k4zz29bh42lw2jpjvkdj33f26xkfs8vz8lpp98yjf2vx"; depends=[FitAR GD MASS RColorBrewer rgeos rtop sp]; }; SKAT = derive2 { name="SKAT"; version="2.0.1"; sha256="1iz8s2r295w36m44s2frrz00q4zm78fyzx7kprmnz4kbg3spqqy8"; depends=[Matrix SPAtest]; }; - SKNN = derive2 { name="SKNN"; version="2.0"; sha256="021mc20mp1p87l48fy1v4lji0qg2cx5mzirv8c77q1x6378zjcfw"; depends=[]; }; + SKNN = derive2 { name="SKNN"; version="3.0"; sha256="1zcsyc8x4cfkj5im9hsv091f2hca3y09fra3y0rl19jiwzvpjgy9"; depends=[]; }; SLBDD = derive2 { name="SLBDD"; version="0.0.2"; sha256="1ixynzrj6vdxn406zcisrkhf9yr172s80k70dishrainkpw2dk58"; depends=[cluster corpcor fGarch forecast glmnet gsarima imputeTS MASS Matrix matrixcalc MTS rnn TSclust tsoutliers]; }; SLC = derive2 { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; }; 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="1.0"; sha256="171pqh3lv1zk508ny2qymryq58w0d6fpcl7jj1n7xwclf9sk5037"; depends=[fda fdapace psych]; }; + SLFPCA = derive2 { name="SLFPCA"; version="2.0"; sha256="1lcyqxqjpzw6zcyhr8c1wb6j10l2z341fma5pmmii8lc6y0qmd14"; depends=[fda fdapace psych]; }; SLHD = derive2 { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; }; SLICER = derive2 { name="SLICER"; version="0.2.0"; sha256="10i0hfl6js26n8xwk9pldzm9vv7hmii6gzj04lhqy0g3njds25kp"; depends=[alphahull igraph lle]; }; SLIDE = derive2 { name="SLIDE"; version="1.0.0"; sha256="0x4fm29r7icg33k8gw3vqvxib8n9a1xwg484x9yffybips9ka22c"; depends=[]; }; + SLModels = derive2 { name="SLModels"; version="0.1.2"; sha256="1c9r4kd2kfh2cn82kngzcqhdmxc4i7djp436s116gy9xs2gd2042"; depends=[ROCR]; }; SLOPE = derive2 { name="SLOPE"; version="0.4.0"; sha256="18lw7csji9n10zk4lhcvy9193sra08pwvh1yrhl33bl17m026nkv"; depends=[foreach lattice Matrix Rcpp RcppArmadillo]; }; 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]; }; - SMC = derive2 { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; }; 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]; }; SMFI5 = derive2 { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[corpcor ggplot2 reshape]; }; @@ -4788,8 +4831,9 @@ in with self; { SMVar = derive2 { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; }; SNFtool = derive2 { name="SNFtool"; version="2.3.1"; sha256="05hz230aq5wbzhknxzr4iqv3nqjhbpf66n6bp1rc5h2jgz2yfbwq"; depends=[alluvial ExPosition]; }; SNPMClust = derive2 { name="SNPMClust"; version="1.3"; sha256="1gad1jfla4qpczh8vpwyss5cckzgpffsyj0d71r8drbspr4i3r90"; depends=[MASS mclust]; }; + SNPannotator = derive2 { name="SNPannotator"; version="0.2.0.0"; sha256="080gxik9ab0n7vl7l3grmqdc63b3df8wqcr7m8bc1963x014g2cs"; depends=[data_table doParallel foreach ggplot2 httr jsonlite kableExtra openxlsx progress rmarkdown xml2]; }; SNPassoc = derive2 { name="SNPassoc"; version="2.0-11"; sha256="13njyhz4qk9kx9jv1hspzh1y8j8v8igxg9jcmlkfljvniam5cf6g"; depends=[BiocStyle Biostrings GenomicRanges ggplot2 haplo_stats IRanges mvtnorm org_Hs_eg_db plyr poisbinom S4Vectors survival tidyr TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; }; - SNPfiltR = derive2 { name="SNPfiltR"; version="0.1.0"; sha256="1s6yj71yz4rkbpp27by5sb4lkcwcvyw7zj10wlzgfrm8sy3vv2wj"; depends=[adegenet cluster ggplot2 ggridges gridExtra Rtsne vcfR]; }; + SNPfiltR = derive2 { name="SNPfiltR"; version="0.1.1"; sha256="1g0hj277cfx6n21zic2n96xlrg9dhziwmvk9hh1gx1vxr6qxb2zf"; depends=[adegenet cluster ggplot2 ggridges gridExtra Rtsne vcfR]; }; SNPknock = derive2 { name="SNPknock"; version="0.8.2"; sha256="121pdgvdffj61hw8x8m76na0cg5iw5gb586q05ikw5d959mmbzrs"; depends=[Rcpp RcppArmadillo RcppProgress Rdpack]; }; SNPmaxsel = derive2 { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[combinat mvtnorm]; }; SNSchart = derive2 { name="SNSchart"; version="1.4.0"; sha256="18rpg2zkqa6bxnbq3s0hlsg4wizz6iw3vckf5z66q3awxqycabg9"; depends=[MASS]; }; @@ -4804,7 +4848,7 @@ in with self; { 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]; }; SOPC = derive2 { name="SOPC"; version="0.0.1"; sha256="0xji7c2v8rmsdvpk8g35m8bx9lk0cy29yc5f4q8zv8qjxiy9yz7v"; depends=[elasticnet]; }; - SOPIE = derive2 { name="SOPIE"; version="1.5"; sha256="0isvb2vzzpn57bq0ix2pfaqdnl5z8qk6v6fvf15vnxcqg2sm63q5"; depends=[ADGofTest circular]; }; + SOPIE = derive2 { name="SOPIE"; version="1.6"; sha256="1q6991l1wldywv685dv1pkd8ma8jlx4inqr6p1fw1xr7ymm8b1q2"; depends=[ADGofTest circular]; }; SOR = derive2 { name="SOR"; version="0.23.1"; sha256="1accs4bqy080nfmgkdg7bgamdrcwcn01y6nydvvq12w3v8asdvwh"; depends=[Matrix]; }; SOUP = derive2 { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; }; SP2000 = derive2 { name="SP2000"; version="0.2.0"; sha256="01wrc7p36js20jv04zhphj2vq7qqfgxmrzic066wij0c0mnh0xn5"; depends=[DT jsonlite pbmcapply purrr rlist tibble urltools XML xml2]; }; @@ -4818,14 +4862,13 @@ in with self; { SPCALDA = derive2 { name="SPCALDA"; version="1.0"; sha256="1bmp2zz0favmpyp0ap8a2r1mg1nlan7zg5cj75drdnfpqlsn5vgl"; depends=[MASS]; }; 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]; }; - SPECIES = derive2 { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; }; - SPEDInstabR = derive2 { name="SPEDInstabR"; version="1.8"; sha256="09kdky1v5vx1xjdlb27228hijfb2g70nxsddj950gdp9sllxkncz"; depends=[]; }; + SPEDInstabR = derive2 { name="SPEDInstabR"; version="1.9"; sha256="0z27h9yl5lyayqa1wqj700kxrgyi1h13bqm3bbq8zml91dyq209c"; depends=[]; }; SPEI = derive2 { name="SPEI"; version="1.7"; sha256="0lj7d3bbik7q4di5nqc3a1rn94z2y2v9x45r1jjkvgf03frj96qd"; depends=[ggplot2 lmomco]; }; SPIAssay = derive2 { name="SPIAssay"; version="1.1.0"; sha256="0y02122lj4v95g62w84jmdjdazfz3rch133aid5sgakj2kv68cvh"; depends=[]; }; SPIGA = derive2 { name="SPIGA"; version="1.0.0"; sha256="0yd06x5rh1h1s4v9apj43c90rkz8m5kssbny7y5mnw5mr2acds9b"; depends=[GA]; }; SPINA = derive2 { name="SPINA"; version="4.1.0"; sha256="0x7y150iq072qqci2niqk7j8pvhcylb7kdvwambg1r1gi3ffycm9"; depends=[]; }; SPIn = derive2 { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; }; - SPLICE = derive2 { name="SPLICE"; version="1.0.0"; sha256="1rmva1nl05f5dfv4nl7bcj6sa8rnpy9ikshasaa54r40217b5832"; depends=[SynthETIC zoo]; }; + SPLICE = derive2 { name="SPLICE"; version="1.1.0"; sha256="1jcw7nikla75aqfbplv2cklq19rfd8naamldvllzy2pjb879vqkk"; depends=[lifecycle SynthETIC zoo]; }; SPODT = derive2 { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; }; SPORTSCausal = derive2 { name="SPORTSCausal"; version="1.0"; sha256="1ww1wi3kflwj1f5slfv0mfi7gbaj7y8rk1m3n15szpxb9zm8grks"; depends=[CausalImpact keras]; }; SPOT = derive2 { name="SPOT"; version="2.5.18"; sha256="1zgcvz78q8hd9bzhayv35rwgwansank1d9yb2qyihy3m0jw6c428"; depends=[DEoptim ggplot2 glmnet laGP MASS nloptr plgp plotly randomForest ranger rgenoud rpart rsm]; }; @@ -4834,10 +4877,10 @@ in with self; { SPREDA = derive2 { name="SPREDA"; version="1.1"; sha256="0fn4p5apjq8zgd3zms2b88ga5wbsv86y59ac5x06w75rf071xglv"; depends=[nlme survival]; }; SPRT = derive2 { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; }; SPSL = derive2 { name="SPSL"; version="0.1-9"; sha256="0kf6mmbvavid3dw2l4fkclk669wi13wkyykhwn5272d6qnhlhhca"; depends=[]; }; - SPSP = derive2 { name="SPSP"; version="0.1.0"; sha256="15ad0binagm1g1gmk11n0zxy3rbkz3n49cc1jaa0vvzbwcvhh65r"; depends=[glmnet lars MASS Rcpp]; }; + SPSP = derive2 { name="SPSP"; version="0.1.1"; sha256="0bzlgjijwp5y6lk9hjqc2p8b1i6mp8jd7j7gsl47whc3lavr1nn8"; depends=[glmnet lars Rcpp]; }; SPUTNIK = derive2 { name="SPUTNIK"; version="1.4"; sha256="1sspsvll7b03z2ag2iixydcbbjr2glg1n6k7m1lapq4ra77arh7i"; depends=[doSNOW e1071 edgeR foreach ggplot2 imager infotheo irlba reshape spatstat spatstat_core spatstat_data spatstat_geom spatstat_linnet spatstat_sparse spatstat_utils testthat viridis]; }; SPYvsSPY = derive2 { name="SPYvsSPY"; version="0.1.1"; sha256="1hxc73wwrzqh1r1xr9yd4hy4ma24virg4iv978lfyc9f9n56znp5"; depends=[]; }; - SPlit = derive2 { name="SPlit"; version="1.0"; sha256="10al2qzcxirrzdsgrjhnh7k1l9faqfbqgy50a81bjns0v3kk4m27"; depends=[Rcpp RcppArmadillo]; }; + SPlit = derive2 { name="SPlit"; version="1.1"; sha256="0vxbwclcipf0wz391yp5qb8ndxqxq8pzkf4vz7fszdb70yrqa5b7"; depends=[Rcpp RcppArmadillo]; }; SPmlficmcm = derive2 { name="SPmlficmcm"; version="1.4"; sha256="1acs3560a7h6xx286m40abr9b7i5qihn6wni8flj0biahmsszzx6"; depends=[nleqslv]; }; SPreg = derive2 { name="SPreg"; version="1.0"; sha256="1702i86qcbnqyi7r5wc2ciyk3l46329kmnrz91jzqq85z8cwgak1"; depends=[sn ucminf]; }; SQB = derive2 { name="SQB"; version="0.4"; sha256="12ii8xlwd2r77bj76j7l43898ras25z3plhhv106jaklhpcnk23m"; depends=[caret nnet pls rpart]; }; @@ -4863,6 +4906,7 @@ in with self; { SSRA = derive2 { name="SSRA"; version="0.1-0"; sha256="1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37"; depends=[shape stringr]; }; SSRMST = derive2 { name="SSRMST"; version="0.1.1"; sha256="15s6vcmk8a27yw3rlfkajby6qkizp4sfiyi63m7hc86svd15x4wg"; depends=[survival survRM2]; }; SSRTcalc = derive2 { name="SSRTcalc"; version="0.3.3"; sha256="0m8qc1rzx3rag69m0jvanx524d49smkgnmj99fl54frzqh0ji1ss"; depends=[]; }; + SSVS = derive2 { name="SSVS"; version="1.0.0"; sha256="1x8s93cfhx6xrdknqmhgaqidk1qhgnbkdv9snpshvkfc92byh162"; depends=[bayestestR BoomSpikeSlab checkmate ggplot2 rlang]; }; 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]; }; @@ -4884,25 +4928,25 @@ in with self; { STV = derive2 { name="STV"; version="1.0.2"; sha256="02cd78z2k08gg5kskw1m53dc2xyl9f8qhcnhvy9n90ckakw6h19h"; depends=[]; }; STraTUS = derive2 { name="STraTUS"; version="1.1.2"; sha256="0n3i7gbycp1f10058h9xlh3yk21w2izdb3xgs793mmh1i1sjy394"; depends=[ape ggplot2 ggtree gmp igraph phangorn RcppAlgos]; }; SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; }; - SUMMER = derive2 { name="SUMMER"; version="1.2.0"; sha256="1y9mq6smpnhwl6ah6z57z0rcm4jqyi82076w0xb9ghwidncpszz4"; depends=[data_table ggplot2 ggridges Matrix RColorBrewer reshape2 shadowtext sp spdep survey survival viridis]; }; - SUNGEO = derive2 { name="SUNGEO"; version="0.2.27"; sha256="1hbww2n7vm689rf2vfjyzlgr1s3dc56dmkbx4bkihwd6560qajs4"; depends=[automap cartogram data_table dplyr fasterize httr jsonlite measurements packcircles purrr RANN raster Rcpp RCurl rlang rmapshaper sf sp spdep]; }; + SUMMER = derive2 { name="SUMMER"; version="1.2.1"; sha256="0wg9nz46dy5mll7dam8g24iaxn390lnggl7x2b88rrzy2kgcd11l"; depends=[data_table ggplot2 ggridges Matrix RColorBrewer reshape2 scales shadowtext sp spdep survey survival viridis]; }; + SUNGEO = derive2 { name="SUNGEO"; version="0.2.288"; sha256="0c8y0ngx1020rw2v00rxmq8syd72f41ckik5sg7gigg7d80gi31w"; depends=[automap cartogram data_table dplyr fasterize httr jsonlite measurements packcircles purrr RANN raster Rcpp RCurl rlang rmapshaper sf sp spdep]; }; SVMMaj = derive2 { name="SVMMaj"; version="0.2.9"; sha256="1405gigyjfp8by8nfx4g3rhw9x6r6g7dkpgw52jllv6n4036xa3h"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; }; SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; }; SVN = derive2 { name="SVN"; version="1.0.1"; sha256="0n93lqb1f2s2qvzc8lrcqmr0fhd57xqbi0ymrqqmll31ns679m92"; depends=[data_table igraph memoise]; }; - SWIM = derive2 { name="SWIM"; version="0.2.2"; sha256="18w7rgs9i9flzayy9rvqx447wjhxqbglcjqcmajmywgajwdzbrrf"; depends=[ggplot2 Hmisc nleqslv plyr Rdpack reshape2]; }; + SWIM = derive2 { name="SWIM"; version="1.0.0"; sha256="1pfrwxn4rha7a68b82lq18x6acyhjy9d8nn2hdwd9hhf576vkvhg"; depends=[ggplot2 Hmisc nleqslv plyr Rdpack reshape2]; }; SWMPr = derive2 { name="SWMPr"; version="2.4.1"; sha256="1dqhsqigfbfj167mp2h0wfybaymj9zlywh5d3syrrmpr694f9kz5"; depends=[data_table dplyr ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; }; - SWMPrExtension = derive2 { name="SWMPrExtension"; version="2.1.0"; sha256="1vb3gj3hpyr8cadgz01c151akyr4w6ss37hr9rz2fjdr8xq5ihp7"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes lubridate magrittr officer purrr RColorBrewer rlang scales sf SWMPr tidyr tidyselect]; }; - SWTools = derive2 { name="SWTools"; version="0.2.2.0"; sha256="07cp2v7njzzclq3x6wl55y8ymv5f55g1b31ss26xbiwsc4ri5z8k"; depends=[dplyr forcats ggmap ggplot2 ggrepel httr hydroTSM jsonlite lubridate magrittr RColorBrewer reshape2 rlang rmarkdown segmented sf stringr tibble tidyr zoo]; }; + SWMPrExtension = derive2 { name="SWMPrExtension"; version="2.1.1"; sha256="1d8lpz2ywr50m9w0a53rff26l33vx2a1lbx5hsiiq0mbg4m5r9jc"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes lubridate magrittr officer purrr RColorBrewer rlang scales sf SWMPr tidyr tidyselect]; }; + SWTools = derive2 { name="SWTools"; version="0.2.3.0"; sha256="04csm7m9xrs4d5b37yy2hzi35m03rm6kqxmzh8lwqj5qbyd07gdp"; depends=[dplyr forcats ggmap ggplot2 httr hydroTSM 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]; }; 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.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; }; - SampleSizeProportions = derive2 { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; }; SamplerCompare = derive2 { name="SamplerCompare"; version="1.3.2"; sha256="09j06ycr749dbr6xbn5pxw7rp1p3cri40z38hf1kp5kvjxkkpy2w"; depends=[mvtnorm]; }; SamplingBigData = derive2 { name="SamplingBigData"; version="1.0.0"; sha256="0khrh7vfqqzpfp16x0ic5ml854wr2fj28cx95s6c0pz91hzlxkns"; depends=[]; }; - SamplingStrata = derive2 { name="SamplingStrata"; version="1.5-1"; sha256="01kjm45pc1zfy2xlp9fhynv4x2mzsgjwymr5j7narpmdsm14mxcx"; depends=[doParallel formattable memoise pbapply]; }; + SamplingStrata = derive2 { name="SamplingStrata"; version="1.5-2"; sha256="1wqqcqka2an5ily91c2z8qw061xfbxgnxr783h584lbyx6ckzj4a"; 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]; }; Scalelink = derive2 { name="Scalelink"; version="1.0"; sha256="0likfjw5999zd0kv1ykby78bl0x3xgh0v1yjssk7fnw1ghkxgdib"; depends=[Rcpp RcppParallel]; }; 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]; }; @@ -4931,7 +4975,7 @@ in with self; { SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; }; 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]; }; 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.1.9"; sha256="03wgdjw6raf2a15g5a6lp6id537zzvjf0k0gzmycyzpxvifa8ryv"; depends=[easycsv knitr]; }; + 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]; }; SemiCompRisks = derive2 { name="SemiCompRisks"; version="3.4"; sha256="0xxdb3k7d9rqq94d2x862jl67s3pkzwigwlcvrybclm6b5gb86x4"; depends=[Formula MASS survival]; }; SemiEstimate = derive2 { name="SemiEstimate"; version="1.1.3"; sha256="0zqxy50glx3xkzz6z41nifqxjgva5fk2x6fbbhdm39fham2yb34f"; depends=[]; }; @@ -4950,13 +4994,13 @@ 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="0.1.1"; sha256="079qm4klgaml99j4cshy3n54pg7q537zlagib4xd8mswdmqdvll6"; depends=[Rcpp RcppProgress selectiveInference]; }; - Sequential = derive2 { name="Sequential"; version="4.1"; sha256="1wl499i18nkxjwv27c030jsxij2wa68c99h2wa445wa5xrhn6kvx"; depends=[boot]; }; + SequenceSpikeSlab = derive2 { name="SequenceSpikeSlab"; version="1.0.0"; sha256="1aa89qnx43ia6lkaaz26jcrx8i9yxjsx5dpz8rpa0hv1h12g5ani"; depends=[Rcpp RcppProgress selectiveInference]; }; + Sequential = derive2 { name="Sequential"; version="4.2"; sha256="0ilpbzxgdqp8xzhyk51kvzigy0s8vpcwsjq9j7n83ca37anc83hf"; depends=[boot]; }; SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; }; SetMethods = derive2 { name="SetMethods"; version="3.0"; sha256="14hh1rb8bma0cx3v9dmn58mkv6sky7xcnhwxwij5x8hp93a1i9is"; 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.0.6"; sha256="15lja989mlr4ar5pk1bagbfwv1v9n9646vja4kahcghgkgrn15l9"; 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 RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR Rtsne scales scattermore sctransform SeuratObject shiny spatstat_core spatstat_geom tibble uwot]; }; + Seurat = derive2 { name="Seurat"; version="4.1.0"; sha256="0p9i3fnkqa3vranr7c7ckzp1kq42d7p0gcfi9ml4kr334yd84195"; 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 RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR Rtsne scales scattermore sctransform SeuratObject shiny spatstat_core spatstat_geom tibble uwot]; }; SeuratObject = derive2 { name="SeuratObject"; version="4.0.4"; sha256="1308hjbs8br3gp9vwm65awgp6vimwgi2jyl1ryn96l84savn2ljq"; depends=[Matrix Rcpp RcppEigen rlang]; }; ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; }; ShapePattern = derive2 { name="ShapePattern"; version="2.2.0"; sha256="0x4a9qg5g44kdras8j7f0yyw44qfpizpmj657xgmbrwcai4ic1dh"; depends=[igraph landscapemetrics raster rgdal rgeos sp]; }; @@ -4979,7 +5023,7 @@ in with self; { 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.4.2"; sha256="0hll6cfl0zkxvdbfs7cdmqazinyyrg9vk4px2gb9s1dqix7cyvv5"; depends=[formula_tools Matrix msm plyr survey]; }; - Signac = derive2 { name="Signac"; version="1.5.0"; sha256="1dl05n2pmfn8yk1p1073a47l6d54p5wc46h5lzfcll9s58qgpq64"; depends=[BiocGenerics data_table dplyr fastmatch future future_apply GenomeInfoDb GenomicRanges ggforce ggplot2 ggrepel ggseqlogo IRanges irlba lsa Matrix patchwork pbapply qlcMatrix Rcpp RcppRoll Rsamtools S4Vectors scales Seurat SeuratObject stringi tidyr]; }; + Signac = derive2 { name="Signac"; version="1.6.0"; sha256="1fh0n15snbj3cv1wfzl084188g9xsxxi4j511j3rvji3ik0nbd6z"; depends=[BiocGenerics data_table dplyr fastmatch future future_apply GenomeInfoDb GenomicRanges ggforce ggplot2 ggrepel ggseqlogo IRanges irlba lsa Matrix patchwork pbapply qlcMatrix Rcpp RcppRoll Rsamtools S4Vectors scales Seurat SeuratObject stringi tidyr tidyselect]; }; 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.2"; sha256="0bgw6dkn15rlpcqfpbar3nxvcvwd0afa3lss4idnb65kvcyzzljk"; depends=[car]; }; Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.8"; sha256="16pzcs1g5ihza9a2glnkgd5pxi77l6w34vkn0vxcb78gc6syhbrd"; depends=[Deriv MASS]; }; @@ -5005,17 +5049,15 @@ in with self; { SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; }; SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; }; SimSurvNMarker = derive2 { name="SimSurvNMarker"; version="0.1.1"; sha256="0jncq5q3ijczpa4h1i74035w36grjy2p8x71gx58v69ab3ca62k6"; depends=[Rcpp RcppArmadillo]; }; - SimSurvey = derive2 { name="SimSurvey"; version="0.1.3"; sha256="0l0592ah6mqz8gyvlcnw8642dganvg4h6isv6swmgaz49pvq63pf"; depends=[data_table doParallel foreach magrittr plotly progress raster rgeos rlang sp]; }; + SimSurvey = derive2 { name="SimSurvey"; version="0.1.4"; sha256="0n3acx279qrw5bxx77b1rpq12hrm26di2csxkhdv8c0mbwv4p2pf"; depends=[data_table doParallel foreach magrittr plotly progress raster rlang sp]; }; 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"; sha256="1mbvn8s557wmdsdr0q6pdvmzma2yd0mi7x01kdwpym6n2sh7szjc"; depends=[wBoot]; }; + SimVitD = derive2 { name="SimVitD"; version="1.0.1"; sha256="1rpsvi5pdj4njvbdz1xpq6qhplk07p4qsm4dmbbbkl648674bqb0"; depends=[wBoot]; }; 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=[]; }; - SimpleTable = derive2 { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; }; 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.0.2"; sha256="1jax36yqr1j9zwbv69x81fyyd5ymy84k9mvvn3qvvngab6daqxlg"; depends=[boot cccrm dplyr emmeans ggplot2 jmvcore lme4 magrittr sjstats stringr tidyr tidyselect]; }; - Simpsons = derive2 { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; }; SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; }; SingleCaseES = derive2 { name="SingleCaseES"; version="0.5.0"; sha256="17fvh327cwc809v3zkz3xqb0i1nc954xha60yq6wjc8n33d8qlqy"; 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]; }; @@ -5050,8 +5092,8 @@ in with self; { 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]; }; SoftClustering = derive2 { name="SoftClustering"; version="1.1902.2"; sha256="1r709r96ra9knkprjw6c227r7w6wygfpwc9pwwsjyw166305pxfs"; depends=[]; }; - SoftRandomForest = derive2 { name="SoftRandomForest"; version="0.1.0"; sha256="1k439hcp53yg6f2x4bgafsri4jjgpva97dphzsdk5icfs5d38bh8"; depends=[boot]; }; SoilHyP = derive2 { name="SoilHyP"; version="0.1.5"; sha256="0mpsy1fzy33vhb1la2y87c95bhc0ci4jfwzbsd47jz1s3pw6vzrl"; depends=[data_table lubridate]; }; + SoilR = derive2 { name="SoilR"; version="1.2.105"; sha256="0liygb46900i6x4y6vhav7w7g4jw5chi4372jwdhn1kxp2g8zgfa"; depends=[assertthat deSolve expm igraph purrr sets]; }; SoilTaxonomy = derive2 { name="SoilTaxonomy"; version="0.1.4"; sha256="061m4di9h03phhx78xx3w8hvcssvkw96vz3szyghkmf7ill15w1n"; depends=[stringr]; }; Sojourn = derive2 { name="Sojourn"; version="1.1.0"; sha256="0dy3xb6nazify29xir2krj9509bqa68b1jwq3lvvhfakxjqm0j05"; depends=[dplyr lubridate magrittr nnet PAutilities rlang svDialogs zoo]; }; Sojourn_Data = derive2 { name="Sojourn.Data"; version="0.3.0"; sha256="1flxiga9szhifndrhmf4blgms477gnnf4gd6wkxqgv3vgisc4q4i"; depends=[]; }; @@ -5069,10 +5111,10 @@ in with self; { SpNMF = derive2 { name="SpNMF"; version="0.1.1"; sha256="1xybxx47i3ww5d7chwl38xc48fbsclgyxcki8h85c6dkm49dxy8i"; depends=[NMF]; }; 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]; }; SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; }; - SpaDES = derive2 { name="SpaDES"; version="2.0.7"; sha256="186qds86nnlcq754mk9xpnhr75rw0ifrldi2gzjqn5xa07byjqjv"; depends=[quickPlot reproducible SpaDES_core SpaDES_tools]; }; + SpaDES = derive2 { name="SpaDES"; version="2.0.8"; sha256="0gzhhqfszssf56v7mi735znwk4x061k5rar3baibs1qdf17p0c12"; depends=[quickPlot reproducible SpaDES_core SpaDES_tools]; }; SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.3"; sha256="0bhn9rj9p5rkcxz0pn2n1l3vij6khxhla0vgzrazh9f7s4hyyymp"; depends=[devtools magrittr miniUI reproducible rstudioapi shiny SpaDES_core stringi]; }; - SpaDES_core = derive2 { name="SpaDES.core"; version="1.0.9"; sha256="1p9p4l263565k3bi9ynibsxhf07klvclxzqn3f63hd7k38da8xhi"; depends=[crayon data_table fastdigest igraph qs quickPlot raster reproducible Require whisker]; }; - SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.3.9"; sha256="1wq09r2zhk4in6d98i9g3lp8ajsazabxwgwlrdnp8n7dbpslgp44"; depends=[backports checkmate CircStats data_table fastmatch fpCompare magrittr quickPlot raster Rcpp reproducible rgeos sp]; }; + SpaDES_core = derive2 { name="SpaDES.core"; version="1.0.10"; sha256="0yg3fdw1m7gfr9g3zy73qnpqb33v0brkx68fwmlbmygfk9yhzqh5"; depends=[crayon data_table fastdigest igraph qs quickPlot raster reproducible Require whisker]; }; + SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.3.10"; sha256="151csnabpckzl3jgxj26jnfnghkmahdp35rf7r0wmajcaddhfk5s"; depends=[backports checkmate CircStats data_table fastmatch fpCompare magrittr quickPlot raster Rcpp Require rgeos sp]; }; SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0.1"; sha256="0w2jxaz2kxfksyss5vy6xy499p8jg8lpqlykwgm2srp1fd2l3rs9"; depends=[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]; }; @@ -5084,7 +5126,7 @@ in with self; { SparseMDC = derive2 { name="SparseMDC"; version="0.99.5"; sha256="0d3ashk3l9fjdbiyjhaxc05ayyscissrg7lwhnh46hv3fydbixlj"; depends=[doParallel doRNG foreach]; }; 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]; }; - SpatEntropy = derive2 { name="SpatEntropy"; version="2.0-1"; sha256="1hr81babgml8mikpfkzk99xhpmxg36dxi9m7f22p23mhvg1xmn5i"; depends=[spatstat spatstat_core spatstat_geom spatstat_linnet]; }; + SpatEntropy = derive2 { name="SpatEntropy"; version="2.1-1"; sha256="0navil5wjzw67diz87ijnaikx4ws7fnbqqbmpdxhla6dfdd8yhd5"; depends=[spatstat spatstat_core spatstat_geom spatstat_linnet spatstat_random]; }; SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-4"; sha256="09rkzfzg6nh4n7dizkqrz651kp617l2557c9qpxacspl3ngbm82i"; depends=[sp]; }; SpatialBSS = derive2 { name="SpatialBSS"; version="0.12-0"; sha256="173zr8r0wp7zcg4ziqagfzzlwf5gjcywj5nqvsnnpwbgjagpfla1"; depends=[JADE Rcpp RcppArmadillo sp]; }; SpatialBall = derive2 { name="SpatialBall"; version="0.1.0"; sha256="09iy1smfqnb0rd2s9a1wqgscb1plwcwwph6a8215l4zrs6svszv2"; depends=[dplyr ggplot2 hexbin lubridate RColorBrewer]; }; @@ -5092,7 +5134,7 @@ in with self; { SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-9"; sha256="1mhn1c8n3bmgf0fjyac3wji4790zswzkqliqcv3n8kv9806crb0y"; depends=[fields maps]; }; SpatialFloor = derive2 { name="SpatialFloor"; version="1.1.0"; sha256="07mwgcvkkq478l6wxvrdjs9d578x0kgs5xy86lgy5my0xqfcv6y8"; depends=[blocksdesign fields reshape2 taRifx]; }; SpatialGraph = derive2 { name="SpatialGraph"; version="1.0-2"; sha256="0cwswa5g3a6ng8qkwi04jz9pma4i0c16m7jpq6z3djzjin0znyk2"; depends=[igraph rgeos shape sp splancs]; }; - SpatialKDE = derive2 { name="SpatialKDE"; version="0.6.2"; sha256="00gdx9jhfybxvfigsym122wfc72vks9bs4zlsij5wp9d1l3r0kfr"; depends=[dplyr glue magrittr raster Rcpp rlang sf vctrs]; }; + SpatialKDE = derive2 { name="SpatialKDE"; version="0.7.0"; sha256="0qmky12886bw2i7lnhcqq9zzyzmbh1670c8l2adqjiz9k0cykmp4"; depends=[dplyr glue magrittr raster Rcpp rlang sf vctrs]; }; SpatialKWD = derive2 { name="SpatialKWD"; version="0.4.0"; sha256="0nsrf30bl3yc1h1kldv1ah1jjb4qh4hd99rd1nz9q9rqmdp0dcrw"; depends=[Rcpp]; }; SpatialML = derive2 { name="SpatialML"; version="0.1.3"; sha256="0akip0kkd1jjid12iwmaxkhkvcfzkxmrnrsv0b6nnvpjdl1jb589"; depends=[randomForest]; }; SpatialNP = derive2 { name="SpatialNP"; version="1.1-5"; sha256="0cxh1f4182mfihq6m82zh2lgafrsiqvgrfxbk66zkjrrbfn8gkcl"; depends=[]; }; @@ -5102,7 +5144,7 @@ in with self; { SpatialRoMLE = derive2 { name="SpatialRoMLE"; version="0.1.0"; sha256="1m80vcd27g11v0gxnjz6p4ghljpxdb8jpkns8ry5yzhfvcpf29jc"; depends=[]; }; SpatialTools = derive2 { name="SpatialTools"; version="1.0.4"; sha256="0jgbrzsx2klvihv65y1ycqyr8awp5kqqz4qwfyfibx3b56lzna1q"; depends=[Rcpp RcppArmadillo spBayes]; }; SpatialVS = derive2 { name="SpatialVS"; version="1.1"; sha256="1xghfiz9wmmx11ssms7zjy3ggkjmc6kkbdwp3v5wjwpwapafzdk3"; depends=[fields MASS nlme]; }; - SpatialVx = derive2 { name="SpatialVx"; version="0.8"; sha256="10l1f9cs5h2sy8i5wy96vwh0ypwkx9xzidlg96qc3qg1ww7dlsiw"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat spatstat_core spatstat_geom spatstat_linnet turboEM waveslim]; }; + SpatialVx = derive2 { name="SpatialVx"; version="0.9"; sha256="0dbjllcfay8iaqmw4xmf5axpa4xd34qqf6x7p4fn02kwjzivc12x"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat spatstat_core spatstat_geom spatstat_linnet turboEM waveslim]; }; Spbsampling = derive2 { name="Spbsampling"; version="1.3.4"; sha256="1rsgrfhipx743qdcpii727hxwg9wqcavy67z5b3kwawss8gf8arc"; depends=[Rcpp RcppArmadillo]; }; 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]; }; @@ -5116,13 +5158,13 @@ in with self; { Spillover = derive2 { name="Spillover"; version="0.1.0.1"; sha256="0jwhih0jzd6grd9y967k7j5vwv9sd20xqi2270y1cgl64v21bjzm"; depends=[fastSOM vars zoo]; }; Splinets = derive2 { name="Splinets"; version="1.0.0"; sha256="1fws9svxvn03xgfqmqwr169wgl544zv87yrdi4nl5z32cq5c9yk5"; depends=[]; }; SplitGLM = derive2 { name="SplitGLM"; version="1.0.2"; sha256="0708jz8j44lw6zs5f6w4v9pf7apd22j15g7lszc8kwlm8xsnnkf6"; depends=[Rcpp RcppArmadillo]; }; - SplitKnockoff = derive2 { name="SplitKnockoff"; version="1.0"; sha256="0mnjrxcd5gq723i9cf62jpijyl879j8lkp808mm860islnqsm1qq"; depends=[ggplot2 glmnet latex2exp MASS Matrix mvtnorm RSpectra]; }; + SplitKnockoff = derive2 { name="SplitKnockoff"; version="1.1"; sha256="090q3hw010rnnqj7qi615h6xlbkaxkrv9gsaxdfwhcffvpfi9anr"; depends=[ggplot2 glmnet latex2exp MASS Matrix mvtnorm RSpectra]; }; SplitReg = derive2 { name="SplitReg"; version="1.0.2"; sha256="1s012qldrsq8rpfpzf7kyd7631b65zai269x53xcaqn75r5ssh3f"; depends=[Rcpp RcppArmadillo]; }; SplitSoftening = derive2 { name="SplitSoftening"; version="2.1-0"; sha256="1fgcqax81zpknw642fm9dx1f6dpdgbcf3va0m1bhj6kl98yq7dqd"; depends=[]; }; SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; 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.8.1"; sha256="1yar1pfdzk1x14x6x5l94ygvqh3gki77gwgnw6z6pn2kzzk367bf"; depends=[rJava rlang]; }; + SqlRender = derive2 { name="SqlRender"; version="1.9.0"; sha256="1ivikd86kb6z5w6i7aqpn9a51g9z6p298amf36l1a9azqwggxm5l"; depends=[rJava rlang]; }; Sshaped = derive2 { name="Sshaped"; version="1.0"; sha256="0zvbgn9hxp2a23g3q028k8ywrwkbzx17a3szvmbj0gcn3kcafvdi"; 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]; }; @@ -5139,7 +5181,7 @@ in with self; { Stat2Data = derive2 { name="Stat2Data"; version="2.0.0"; sha256="1fpp3b4k7x915a9wkpyj4dvvqp0wz7c3lpbh154vrxrdsr712z0k"; depends=[]; }; StatDA = derive2 { name="StatDA"; version="1.7.4"; sha256="1ld7fx1lip54n24r2d9zvd4hri3w02vd174bdi8pi9j5n8xpxl02"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat sp xtable]; }; StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; }; - StatMatch = derive2 { name="StatMatch"; version="1.4.0"; sha256="0nd4s57rzq4zgi5b7krbdhz9vwxvj5j63kazdyhlwwqk4b6r2042"; depends=[ggplot2 lpSolve proxy survey]; }; + StatMatch = derive2 { name="StatMatch"; version="1.4.1"; sha256="1iavyaj6q8rbvhki98q8zwikfrgjrp6w8prhnqhiv0yb8k27jm0c"; depends=[ggplot2 lpSolve proxy survey]; }; StatMeasures = derive2 { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; }; StatPerMeCo = derive2 { name="StatPerMeCo"; version="0.1.0"; sha256="1nm6brlj6h7jx8nqagrfk294ay3pfmkiizabwlb87qfnsfwchpk3"; depends=[]; }; StatRank = derive2 { name="StatRank"; version="0.0.6"; sha256="14d8v3bp8vgksi6q0mxajwd9s8zi6lns3qwi1vcr5xp9rjp4n6iy"; depends=[ggplot2 plyr truncdist]; }; @@ -5148,7 +5190,8 @@ in with self; { SteinerNet = derive2 { name="SteinerNet"; version="3.1.0"; sha256="03wr746dkwp8vg91y986q0xvgz1y9b5q25g0kig2sx6m75li3yif"; depends=[igraph]; }; Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; }; StempCens = derive2 { name="StempCens"; version="1.1.0"; sha256="0jphyikfggx0yj5f5k3fykf3fdv9msppymzpyin1m7xfmfi5cwia"; depends=[distances ggplot2 MCMCglmm mvtnorm Rcpp RcppArmadillo Rdpack tmvtnorm]; }; - StepReg = derive2 { name="StepReg"; version="1.4.2"; sha256="0phabq5miri0zbbnmgb06k21z0kjrv9n88vfnaj4d0js7b973r9j"; depends=[Rcpp RcppEigen]; }; + StepBeta = derive2 { name="StepBeta"; version="0.1.0"; sha256="1z19adh5ldcpx3g473f6j5kv2s37wbsrv36g0ss09c87z89zp5wz"; depends=[betareg glue]; }; + StepReg = derive2 { name="StepReg"; version="1.4.3"; sha256="0c9zxrm5nrxnibrg59gzlz4axnj1c9m6y5wawpak6k41c61q6x2y"; depends=[survival]; }; StepSignalMargiLike = derive2 { name="StepSignalMargiLike"; version="2.6.0"; sha256="0j85lvs2bljfhf482r31sq3xgk8l73hcw22wgxxp8z8nla38cwf9"; depends=[Rcpp]; }; SteppedPower = derive2 { name="SteppedPower"; version="0.3.1"; sha256="1iaaih7pwrs9icn0x7zpqicwnbpgb4azsy0dh238aq2ghawx0p2s"; depends=[Matrix plotly Rfast]; }; StepwiseTest = derive2 { name="StepwiseTest"; version="1.0"; sha256="1fdm4s9l6grgd45r98ybbsh40rnmnn16c0id6lv28cpmssi0iphi"; depends=[Rcpp RcppArmadillo]; }; @@ -5169,6 +5212,7 @@ in with self; { StroupGLMM = derive2 { name="StroupGLMM"; version="0.1.0"; sha256="1w0xizdmwqflfhqwygyq7fw5ci7pdzmr8dfv3j0g3ljbj84kndzd"; depends=[aod broom car ggplot2 lme4 lmerTest lsmeans MASS mutoss nlme pbkrtest phia survey]; }; StructFDR = derive2 { name="StructFDR"; version="1.3"; sha256="1y0wj7y36iq0lznc4qpsr2yis3an34iilpabkaxxmas2q4abg0qb"; depends=[ape cluster dirmult matrixStats nlme]; }; 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=[]; }; 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]; }; @@ -5184,11 +5228,11 @@ in with self; { SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; }; SupMZ = derive2 { name="SupMZ"; version="0.2.0"; sha256="1n81wqacrpk5x6i1pd1zsjivv2jk41743kg1h7gnp0rb3k58vp7r"; depends=[dplyr magrittr]; }; SuperExactTest = derive2 { name="SuperExactTest"; version="1.0.7"; sha256="1ysfsdzbkldcn7hzxhqikf5h2h9747xhfrirqgr8xx8q81wq989s"; depends=[]; }; - SuperGauss = derive2 { name="SuperGauss"; version="2.0.2"; sha256="1wbx1s1260qg731n4zj212b6kffdppxw1fg0n8yjp2mc8zgp7r9d"; depends=[fftw R6 Rcpp RcppEigen]; }; + SuperGauss = derive2 { name="SuperGauss"; version="2.0.3"; sha256="174gicpk2jwbzg39m44sxp7506cja9cnn95r287sq7049lrj302a"; depends=[fftw R6 Rcpp RcppEigen]; }; SuperLearner = derive2 { name="SuperLearner"; version="2.0-28"; sha256="00any24msgflyagy87nznpfjz5g9v15frqda6c679wa8plx26hjz"; depends=[cvAUC gam nnls]; }; SuperPCA = derive2 { name="SuperPCA"; version="0.4.0"; sha256="0bpcxg9rh3ig5fzml026glws13daf5hiqbvdy7hsriv8y8qlxnfk"; depends=[fBasics glmnet MASS matlab matlabr Matrix matrixStats pracma psych R_matlab RSpectra spls timeSeries]; }; SuperRanker = derive2 { name="SuperRanker"; version="1.2.0"; sha256="01wilk3cy33z50yhg4i4gci298fj8s4xbrkb7k3i9gn8q13vviin"; depends=[prodlim Rcpp]; }; - SuperpixelImageSegmentation = derive2 { name="SuperpixelImageSegmentation"; version="1.0.4"; sha256="0s6cizdxbv56sn2cijl7sdnvk4cpkmndmv01v4kvh1lwcfq8zz76"; depends=[ClusterR lattice OpenImageR R6 Rcpp RcppArmadillo]; }; + SuperpixelImageSegmentation = derive2 { name="SuperpixelImageSegmentation"; version="1.0.5"; sha256="01j8p1vfnswy41b7nzmwml4aq8s00xwdk3zjcc1b6n9bqv0cgnaz"; depends=[ClusterR lattice OpenImageR R6 Rcpp RcppArmadillo]; }; Superpower = derive2 { name="Superpower"; version="0.1.2"; sha256="0nas4mha5m2vk210g52pk5n1y4vy3pzmbxysmkvjl0slwavi9gsi"; depends=[afex dplyr emmeans ggplot2 gridExtra Hmisc magrittr MASS mvtnorm reshape2 tidyr tidyselect]; }; SuppDists = derive2 { name="SuppDists"; version="1.1-9.7"; sha256="025b9nlxz62wk84295csyzbncpn80i3iby3sxdigf3swcgi2fmbb"; depends=[]; }; SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="1.0.2"; sha256="1l586x9np5rclqdrnv8b72ixlppzlnsq4yf99ny6aq5a9lwzmcgm"; depends=[gstat raster rgeos sp]; }; @@ -5198,20 +5242,17 @@ in with self; { SurrogateTest = derive2 { name="SurrogateTest"; version="1.3"; sha256="0vs1ii3l6i6cmswyv6xjbya5filfixppyzmnw099g9s4x8kn0kq7"; depends=[survival]; }; SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; }; SurvDisc = derive2 { name="SurvDisc"; version="0.1.1"; sha256="0ajvnm0a4krbm0m584bg58hd7dzl0f2rz5as1zsajx8agywb5qmv"; depends=[cubature MASS mvtnorm nlme simex survival]; }; - SurvGSD = derive2 { name="SurvGSD"; version="1.0.0"; sha256="0aa5zaf9akkqkxs8iqwnm93sfwakhhhs3qfafbk0vrwmb5yvzzm1"; depends=[flexsurv ldbounds mnormt]; }; 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.1"; sha256="1lkbz5wa6ggwvg2aq13bc4hm6lqsj3wal5c33kamnrg9pk2cssj8"; depends=[]; }; SurvMI = derive2 { name="SurvMI"; version="0.1.0"; sha256="0qgsgz11vz73v83bkxrrjwk7i26rllkxk97if3nw2rgl9jnmiih0"; depends=[survival zoo]; }; - SurvMetrics = derive2 { name="SurvMetrics"; version="0.3.5"; sha256="06wzzg20p7nmnmbkzkh3xs82g328ad1cws1jqywsv0mzd2a3wcvx"; depends=[MASS survival survminer]; }; - SurvRegCensCov = derive2 { name="SurvRegCensCov"; version="1.4"; sha256="0ipr7lajnrklk963lrlgx946l6r191q3bfif4njkdmw0x797nzm2"; depends=[numDeriv survival]; }; + SurvMetrics = derive2 { name="SurvMetrics"; version="0.4.5"; sha256="0mdvygcx7cdffsfyxzg30ri9n2kn31cbwy6izq9g7dm2g0gxplg8"; depends=[MASS survival survminer]; }; + SurvRegCensCov = derive2 { name="SurvRegCensCov"; version="1.5"; sha256="0p39xqrnx2x0fgdfdr9ffv2x9zcgi53kqya821gpbnn3ccjzxx58"; depends=[numDeriv survival]; }; SurvTrunc = derive2 { name="SurvTrunc"; version="0.1.0"; sha256="0b6s7llljp75agd57lmc1yq5acnfwy113khrfjcbm1l5ply6pz7f"; depends=[survival]; }; - Survgini = derive2 { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; }; SurviMChd = derive2 { name="SurviMChd"; version="0.1.1"; sha256="1sj3i950nmam3r70as85kdx6nd88iidb5jpiz2a5a39i5lb7mgf7"; depends=[dplyr ICBayes icenReg R2jags Rdpack readr rjags rlang survival tidyverse]; }; SvyNom = derive2 { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; }; SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-6"; sha256="09xq7jx70qjyhblzh6kc40hdr0636rqqdnbka7m6rawhd8ivp8yz"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; }; SwimmeR = derive2 { name="SwimmeR"; version="0.13.0"; sha256="16vimqdbsj7nb1cv0in6qza00qicajpdcpmzf3lv47wm5kp2iv6n"; depends=[dplyr magrittr pdftools purrr readr rvest stringr xml2]; }; SwissAir = derive2 { name="SwissAir"; version="1.1.5"; sha256="0lh69924vhyilgn562jqn8m7z4dq3xmdj09501sbs7hbxfaiiyly"; depends=[]; }; - SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; }; SyScSelection = derive2 { name="SyScSelection"; version="1.0.2"; sha256="16zx507hlzhdxbh6gzndbgmzpyp6vc59h441l4gv8lx58zi9kyjd"; depends=[pracma]; }; SymTS = derive2 { name="SymTS"; version="1.0-1"; sha256="1g1kjcba25g3nphbndkzvkipvihiqb6lvijsicqr7qh57g94gqpl"; depends=[]; }; SymbolicDeterminants = derive2 { name="SymbolicDeterminants"; version="2.0.0"; sha256="0hf9b9g2vgpyqbxgi5rkkls2b8vw1zrwl8lymwvwb6y1vwfl9pym"; depends=[arrangements fs]; }; @@ -5219,7 +5260,7 @@ in with self; { SyncRNG = derive2 { name="SyncRNG"; version="1.3.0"; sha256="0sywfmmy6mq6qsxkxjc67665snn1jds01j3h7ni1200igja139g2"; depends=[]; }; SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; }; Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; }; - SynthCast = derive2 { name="SynthCast"; version="0.2.0"; sha256="1jw6w32cdi1nyr1ljswylci39mp74i0i7ix75j44dghvql9a99rn"; depends=[dplyr forcats Synth tidyr]; }; + SynthCast = derive2 { name="SynthCast"; version="0.2.1"; sha256="0gln7x1vlfdnr0qaqgagr93r484hv3dp65n24b3wl3p02msz9bgn"; depends=[dplyr forcats Synth tidyr]; }; SynthETIC = derive2 { name="SynthETIC"; version="1.0.2"; sha256="1z7jyal707a93hv0fsgnkxpnywqw6ksifk0546alzm32g5lp4655"; depends=[ggplot2 magrittr rlang]; }; SynthTools = derive2 { name="SynthTools"; version="1.0.1"; sha256="19vasz3nnm5vgwqs6g2a5bibmk44br1bxga5zavsx938x3jw9gnd"; depends=[dplyr magrittr Rdpack]; }; SystemicR = derive2 { name="SystemicR"; version="0.1.0"; sha256="1vk08w734zxvrwzd81iy0azwcj53k6wvgc1qlaxw96hirdwdg6zr"; depends=[igraph Matrix quantreg xts]; }; @@ -5241,7 +5282,6 @@ in with self; { TCGAretriever = derive2 { name="TCGAretriever"; version="1.5"; sha256="1xg1rz2h5jbpdd5axli3ripqxb0bj64yrd4y5nzr8axajiaybkj9"; depends=[httr]; }; TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.6"; sha256="15f3w6vhbqy4xzidxasjnqigxchd3jbr2kpm3gggjnkp7rzsfgaf"; depends=[httr jsonlite]; }; TCIU = derive2 { name="TCIU"; version="1.2.0"; sha256="0cyagbvcb8x1bszwq8id75838n53l1kcdah7hhm679j2wm4i487s"; depends=[AnalyzeFMRI cubature doParallel dplyr DT extraDistr fancycut fmri foreach forecast geometry ggplot2 ggpubr gridExtra ICSNP MultiwayRegression plotly pracma RColorBrewer reshape2 rrcov scales spatstat_core spatstat_geom tidyr zoo]; }; - TDA = derive2 { name="TDA"; version="1.7.7"; sha256="1vrpqzswhjwqc4rsvapzfd92cmkvnibibiiac44i8ic50nryw00j"; 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]; }; TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; }; TDAstats = derive2 { name="TDAstats"; version="0.4.1"; sha256="1zmickqk60vm9rzy67hib835v3c45aqjk441p31vpbvhbiy58nq5"; depends=[ggplot2 Rcpp]; }; @@ -5249,14 +5289,14 @@ in with self; { TDD = derive2 { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[pracma RSEIS signal]; }; TDMR = derive2 { name="TDMR"; version="2.2"; sha256="19ljgj5iy41m7rrawzkxkln7acydssk8zm05k3sfb483s8zygwiq"; depends=[adabag SPOT testit twiddler]; }; TDPanalysis = derive2 { name="TDPanalysis"; version="1.0"; sha256="0kvbsgwl7b9a3hn4d3snajqmynbajd2d8lc1na0hri2cv8qm8x9h"; depends=[plyr]; }; - TDbook = derive2 { name="TDbook"; version="0.0.4"; sha256="04ljp2rxk959143wri4l5xq4yhby0ld42a0s9z027i1z7qn4072v"; depends=[]; }; + TDbook = derive2 { name="TDbook"; version="0.0.5"; sha256="0g3kj17l176j7sg5vf3992icg61sbrjkhjmp7j53hpxz8xh2kygg"; depends=[]; }; TDboost = derive2 { name="TDboost"; version="1.2"; sha256="0sc9vby4892gm5b5h8gbdl4misqvgbkfp8fms53dk83malxkw1zx"; 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]; }; TEQR = derive2 { name="TEQR"; version="6.0-0"; sha256="112znsz36jqh3krnr4j05xl70picih8qpmqky2gllgyr8nky39fr"; depends=[]; }; TERAplusB = derive2 { name="TERAplusB"; version="1.0"; sha256="0mshx615awcf2arm39mgw2gzgpyn7a3f767484g7z4nqqlikwpgc"; depends=[]; }; - TESS = derive2 { name="TESS"; version="2.1.0"; sha256="05xsz2v847pwj4ja7hmg3zfbfqrwwzpf0ri0gjzb8snm2a7xm23y"; depends=[ape coda deSolve Rcpp]; }; + TESS = derive2 { name="TESS"; version="2.1.1"; sha256="0cbrs4x026pbnclfz584gaj42d4gvma68cd6cgx2my54j42jcn73"; 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.8"; sha256="0h9qkl15k8v17v3g9bdnfwvh2s04ywjgg5y0xn2077dmywlja1bd"; depends=[Rcpp]; }; TFX = derive2 { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; }; @@ -5264,19 +5304,19 @@ in with self; { TGS = derive2 { name="TGS"; version="1.0.1"; sha256="01mwdlgfjlxy0q5lxcmzk6lsb806987va7yag0zpjjd2bzmdh70k"; depends=[bnstruct doParallel foreach ggm minet rjson]; }; TGST = derive2 { name="TGST"; version="1.0"; sha256="1xnb41ksggdi57gnkjaab98c4nfdkxqx53rv9pyh3j0cg0kbkk9v"; depends=[ggplot2 knitr]; }; TH_data = derive2 { name="TH.data"; version="1.1-0"; sha256="0ghihfpk5d8gsdlzf6phw7dwwz3adx64pxk82vlmlqx53ljpxcr1"; depends=[MASS survival]; }; - TIGERr = derive2 { name="TIGERr"; version="0.1.0"; sha256="1m9hbiflg6m7nvqklsnm027c4spspda1xmb69667nlnw0yvksqnm"; depends=[caret pbapply ppcor randomForest]; }; + TIGERr = derive2 { name="TIGERr"; version="1.0.0"; sha256="04nnm0adf0sbgv7a2ikaq2a5kb9j1xmdfmssizm49q5j457rrl7d"; depends=[pbapply ppcor randomForest]; }; TIMP = derive2 { name="TIMP"; version="1.13.2"; sha256="1y1bc6wsd32792apsc6qncxbw5y8ww9xlhy9v49mhwbffgzn6llg"; depends=[colorspace deSolve fields gclus gplots minpack_lm nnls]; }; TITAN2 = derive2 { name="TITAN2"; version="2.4.1"; sha256="16zf42s1as2xrvyhd0lnv36mgnr5w19xv11pkl0k8imb5bdkhxa2"; depends=[cowplot dplyr ggplot2 ggridges glue purrr snow tibble]; }; TInPosition = derive2 { name="TInPosition"; version="0.13.6.1"; sha256="1c0h9zg71whmsjn5rnzv5kdrabl9kqrq627caznvrpa74c7pjks9"; depends=[ExPosition InPosition prettyGraphs TExPosition]; }; - TKCat = derive2 { name="TKCat"; version="0.5.4"; sha256="061xdb5gqdxik3wwp9daz3kj9kjd77dzq7h5q883nqdlg4gzksp3"; depends=[base64enc DBI dplyr DT future getPass jsonlite jsonvalidate magrittr markdown promises RClickhouse readr ReDaMoR rlang shiny shinydashboard tidyselect visNetwork]; }; TLMoments = derive2 { name="TLMoments"; version="0.7.5.2"; sha256="0l9d4yafkkn3qdg9ypy3fiqnzxzv8yzxkq6mh1j28g94s4h6lybh"; depends=[ggplot2 hypergeo lmomco Rcpp]; }; - TMB = derive2 { name="TMB"; version="1.7.22"; sha256="116k7ffgadhkqq4lckfd4403qvybcls1hcs1ap1b7lkylghjahf2"; depends=[Matrix RcppEigen]; }; + TMB = derive2 { name="TMB"; version="1.8.0"; sha256="158spsz8inxhs3dw6cq2wwkkhvgkfjyyz577s89x08yly7layq2l"; depends=[Matrix RcppEigen]; }; TMDb = derive2 { name="TMDb"; version="1.1"; sha256="062n9mi2f9g2xxpnymja57xnpl855d8mwyfwci7a8cq4c7w7avj7"; depends=[httr jsonlite stringi]; }; TMTI = derive2 { name="TMTI"; version="0.1.0"; sha256="16fa512f8hhfsinn57p98yvw58hjymki7xnvrfz9fidkqva0wm1x"; depends=[dplyr]; }; TNC = derive2 { name="TNC"; version="0.1.0"; sha256="0639wvylmk9mapvmz79ij65g1phv3ylc683awi4pgaf9yfwlmjkn"; depends=[]; }; + TNRS = derive2 { name="TNRS"; version="0.3.0"; sha256="0r4pd8r7whd9hd47isy3hxzkv9ar3i5hqhixaxr691ck1szkj1f2"; depends=[httr jsonlite]; }; TOC = derive2 { name="TOC"; version="0.0-5"; sha256="0zk6j1yc4gpvkswnfrlyfvqc69wr4q3ys59y7v03fhzwasqj0an2"; depends=[bit raster rgdal]; }; TOHM = derive2 { name="TOHM"; version="1.4"; sha256="15i9hrvxlnwbs9vrsyrfhnm4xwmi97hss2da0xqs1xj5nmzwymqh"; depends=[EQL igraph Matrix nloptr Rmpfr]; }; - TOSTER = derive2 { name="TOSTER"; version="0.3.4"; sha256="1pxcvlw2nhh1sv0d662xc61rykf7kz7f4xjq3yrqf119gjcmps5s"; depends=[ggplot2 jmvcore R6]; }; + TOSTER = derive2 { name="TOSTER"; version="0.4.0"; sha256="0zfalngjjg1p4516r60ma03d2ndw2w417p7bp3b9l4cyv5jy5qjv"; depends=[cowplot distributional ggdist ggplot2 jmv jmvcore R6 tidyr]; }; TP_idm = derive2 { name="TP.idm"; version="1.5"; sha256="07rxn0mpar3p6blg8fd3kbvdngyz9h9n0r0lcljnfdajfzbysv7h"; depends=[]; }; 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]; }; @@ -5285,7 +5325,7 @@ in with self; { TPmsm = derive2 { name="TPmsm"; version="1.2.5"; sha256="1aj0gj74w7ak2csdybfmzwq873kj12jhs0rnqa0lbw6627h0g7pc"; depends=[KernSmooth]; }; TR8 = derive2 { name="TR8"; version="0.9.22"; sha256="12miq65yl39pngpsa30qjcwp21vn93a4wvid03pmbf6x6hq0v4k7"; depends=[dplyr plyr rappdirs RCurl readxl reshape shiny taxize XML]; }; TRADER = derive2 { name="TRADER"; version="1.2-3"; sha256="1w9m2b866dyj82s118m64q8j9a1chpq2km2pnn9mfwwj8sivgdgn"; depends=[dplR]; }; - TRAMPR = derive2 { name="TRAMPR"; version="1.0-9"; sha256="16fbzp6b6y25k9h7m4qpmbgj10przywm2rh8kvw8a8p0xkskc9k5"; depends=[]; }; + TRAMPR = derive2 { name="TRAMPR"; version="1.0-10"; sha256="0nndacpj1bnj6klvf8z4hl05krlnmyc9h9f813kmypk5fqjnhh38"; depends=[]; }; TRD = derive2 { name="TRD"; version="1.1"; sha256="0bhn4bcrq39f5dgqc74jqsfhs1iqfxhawacqqyncbk2372013nqp"; depends=[Rlab]; }; TRES = derive2 { name="TRES"; version="1.1.5"; sha256="0hrlqr6va7f17i4zizc2val2jxl151h8dbp4f97g0ixlqnv39qjl"; depends=[ManifoldOptim MASS pracma rTensor]; }; TREXr = derive2 { name="TREXr"; version="1.0.0"; sha256="1dkp3l5cix06bhidmr9npd2f2my9hcm0qmdar0hwkcm1zrl1ha4w"; depends=[boot chron doParallel doSNOW dplyr foreach lhs lubridate magrittr msm randtoolbox sensitivity solaR tibble zoo]; }; @@ -5304,12 +5344,13 @@ in with self; { TSGS = derive2 { name="TSGS"; version="1.0"; sha256="0lsl6lmyg57bbw0pm22clxvzgwz44r8pizjqn1g67c76vmrsgpd4"; depends=[caret e1071 edgeR fastmatch genalg kernlab]; }; TSGSIS = derive2 { name="TSGSIS"; version="0.1"; sha256="0zrlin6xi6sv5qb18a0wi8lzldqlwa9lbwnra44w3jza3kakff7n"; depends=[glmnet MASS]; }; TSHRC = derive2 { name="TSHRC"; version="0.1-6"; sha256="13x5l0y0nh972p39s32dv8byds19g8265s2mphbrzz1v59aq0xk3"; depends=[]; }; + TSLSTM = derive2 { name="TSLSTM"; version="0.1.0"; sha256="0q00h8hf5xdwvpw1z7f2zxsbwynby1qdzbafdlsrxi0l51mz5r76"; depends=[keras tensorflow tsutils]; }; TSMCP = derive2 { name="TSMCP"; version="1.0"; sha256="1wzi6wzd8l5bkm0qc1mfvj067xywm208xl6r87a4svcn1ydr4vl4"; depends=[lars plus]; }; TSMN = derive2 { name="TSMN"; version="1.0.0"; sha256="12wgcc7szbcbk3d1a17wz96rlwp5l39cn0i03hjsb0sbrs7mjwg5"; depends=[]; }; TSMSN = derive2 { name="TSMSN"; version="0.0.1"; sha256="0zy9r6i1p161h1zh0vnz1npsh48q3nc2c5hcgzvf78nfznnn6wg1"; depends=[mvtnorm numDeriv progress sn]; }; TSMining = derive2 { name="TSMining"; version="1.0"; sha256="1n32acagffiw31pr485ly3phx33zw7vj009bvw4lbqpixa1pszj2"; depends=[foreach ggplot2 plyr reshape2]; }; TSMySQL = derive2 { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[DBI RMySQL tframe TSdbi TSsql]; }; - TSP = derive2 { name="TSP"; version="1.1-11"; sha256="0gdwxbj2gria7jhsswmfvc32r43sdd63z3lyy21gbvmfcakvb8j9"; depends=[foreach]; }; + TSP = derive2 { name="TSP"; version="1.2-0"; sha256="022k0972kcxb0w6qhx09l9cif8fmpkpvwddvgxiy60bx343ywzia"; depends=[foreach]; }; TSPostgreSQL = derive2 { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[DBI RPostgreSQL tframe tframePlus TSdbi TSsql]; }; 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]; }; @@ -5317,7 +5358,7 @@ in with self; { TSSS = derive2 { name="TSSS"; version="1.3.1"; sha256="06wnbj741yyi5b483zhbaccvqpbg8lh3z9vnrxy64x28hnn79cly"; depends=[]; }; TSTr = derive2 { name="TSTr"; version="1.2"; sha256="0nljkqsrwzg7i82arpfrz2k9m1k1akin1akf01c5cadxq4rgarsf"; depends=[data_table stringdist stringr]; }; TSTutorial = derive2 { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; }; - TSVC = derive2 { name="TSVC"; version="1.2.1"; sha256="11qivqrss54mzgkma0bkjrpiks5rxc43bmygp6i4chka45k8xiq3"; depends=[mgcv plotrix]; }; + TSVC = derive2 { name="TSVC"; version="1.2.2"; sha256="0c2dwsb17al6vfgk38xlbzww08xa1i2lji1bhzc3zlp7nb4mkxy8"; depends=[mgcv plotrix]; }; TSclust = derive2 { name="TSclust"; version="1.3.1"; sha256="1pj984sf7z0bakr55jqcrxr4mh4gihdv197m2k05phpp5hsplsjh"; depends=[cluster dtw forecast KernSmooth locpol longitudinalData pdc]; }; TScompare = derive2 { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[DBI tfplot tframe TSdbi]; }; TSdata = derive2 { name="TSdata"; version="2016.8-1"; sha256="199dy4phc6z0kzbp4kks55519c3xgsx4dkwrypr9sg8xhprrwnib"; depends=[]; }; @@ -5332,6 +5373,7 @@ in with self; { TSsmoothing = derive2 { name="TSsmoothing"; version="0.1.0"; sha256="1m4y6hfw5ghqmvbnha05w6k0abbr08xdcahmh897g68b06vcrjsl"; depends=[ggplot2 gridExtra MASS Matrix]; }; TSsql = derive2 { name="TSsql"; version="2017.4-1"; sha256="0f71q6gqfx4r3ghsmr572cvkpmf2xf7kipf10ii99z1y23dxmsdn"; depends=[DBI tframe tframePlus TSdbi zoo]; }; TSstudio = derive2 { name="TSstudio"; version="0.1.6"; sha256="1r45s4xgc9a2rdh225xzmwr7g6qahmjj7v1a6g7haghnhaq6hv4s"; depends=[data_table dplyr forecast forecastHybrid future future_apply lubridate magrittr plotly purrr RColorBrewer reshape2 scales tidyr tsibble viridis xts zoo]; }; + TT = derive2 { name="TT"; version="0.92"; sha256="0r9cr2jfjxz0sw17whls4m6ilqn5gs1fc9vy2i66abkd95ix73wn"; depends=[data_tree dplyr DT htmlwidgets magrittr purrr]; }; TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.8"; sha256="14bws9z57prnbb30ivl8zzyqi9hrj0nhm3m5i249rn2kyzw70gw1"; depends=[e1071 multcomp mvtnorm nlme pastecs relimp reshape rkt stlplus tcltk2 zoo]; }; TTCA = derive2 { name="TTCA"; version="0.1.1"; sha256="16slr4c2nwbchsg6fk5prq22p2v4cjxzk93wd3xggav2lzrf8a5h"; depends=[MASS Matrix quantreg RISmed tcltk2 VennDiagram]; }; TTR = derive2 { name="TTR"; version="0.24.3"; sha256="11xsmbvmxq2j119j2z58bx1fkkb2xlhmzc35z5fbwr3nchrfz6jd"; depends=[curl xts zoo]; }; @@ -5350,14 +5392,14 @@ in with self; { TailRank = derive2 { name="TailRank"; version="3.2.1"; sha256="142m0cq9j8y5g9wh4plxya1jqi0dv6p6praxx3jb84kwqspi91xr"; 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]; }; - TapeR = derive2 { name="TapeR"; version="0.3.3"; sha256="0q5j7pn05z7hinwl5ypnrgh9ibsw6hvdfszjbnvavzab3bx8l6nn"; depends=[nlme pracma]; }; + TapeR = derive2 { name="TapeR"; version="0.5.0"; sha256="161qwwqcq94j3h49k6fn6g146hczpaq6vygai5kwl6i8wpdfzc5a"; depends=[nlme pracma]; }; TargomoR = derive2 { name="TargomoR"; version="0.2.0"; sha256="0dzlqv8v36cm5b9hc9am4351nigknq7vr0mki9kzk2979c18if6b"; depends=[geojsonsf httr jsonlite leaflet magrittr sf tibble xml2]; }; Tariff = derive2 { name="Tariff"; version="1.0.5"; sha256="1mdbc6yyaddkyj617kx93d2737gijh063v8w8jqw4lwmbwyc4a4w"; depends=[]; }; TauP_R = derive2 { name="TauP.R"; version="1.5"; sha256="02vk9rj8yx4n2pihgk93bs2f9wkpkyfqm2kp7ixj4wpa29a0iq6v"; depends=[]; }; TauStar = derive2 { name="TauStar"; version="1.1.4"; sha256="06bb6570mqzfbjw2qp4bjl4a1bdpwsvcr0vw2y4l1x444m670ds1"; depends=[Rcpp RcppArmadillo]; }; TaxicabCA = derive2 { name="TaxicabCA"; version="0.1.1"; sha256="0izjf6vrdjvs9axvafr2mamr157i8w6d7m5sfjch1p5c174cpr9c"; depends=[]; }; Taxonstand = derive2 { name="Taxonstand"; version="2.4"; sha256="0zph4618bwjfvx41ap9d2534kknbni216y90nmcvaniskw4ixm7d"; depends=[pbapply]; }; - TcGSA = derive2 { name="TcGSA"; version="0.12.7"; sha256="0l28sldpavyvhm9hab9gb7i7rmlxpj7ivffi6xx8lg7qjn6d21v5"; depends=[cluster cowplot ggplot2 GSA gtools lme4 multtest reshape2 stringr]; }; + TcGSA = derive2 { name="TcGSA"; version="0.12.10"; sha256="1bdffzq3zwvr0qsp71mp0fqf9dgx9n3f08c53adwavycwr6zg1l7"; depends=[cluster cowplot ggplot2 GSA gtools lme4 multtest reshape2 stringr]; }; Tcomp = derive2 { name="Tcomp"; version="1.0.1"; sha256="1k0gsf3yr5n9zc2yi6szxm6s7bf61lz4fx8m3v48jlp5w900prwb"; depends=[forecast Mcomp]; }; TeXCheckR = derive2 { name="TeXCheckR"; version="0.7.0"; sha256="0r85yhk3p4ibkzkbjm7j9zpryp1dhajbmaqyfwr4bv1zh29smrxa"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr rstudioapi zoo]; }; TeachHist = derive2 { name="TeachHist"; version="0.1.2"; sha256="0s1bmg0ff0b045r99xxy47ydwda55mzsbnsc21g92qxvsh8hlcga"; depends=[dplyr ggplot2]; }; @@ -5367,14 +5409,16 @@ 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]; }; Temporal = derive2 { name="Temporal"; version="0.3.0"; sha256="1f1gp7zqaa2phv9rik6nmlj4dcqlm7z9s6y5iify3v6vai9sky72"; depends=[dplyr expint numDeriv tidyr]; }; + TemporalGSSA = derive2 { name="TemporalGSSA"; version="1.0.0"; sha256="05jcixlakjzn2bkwxqpaypp1zyxfziaqdlb2830rjidamf3qrdr2"; 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]; }; TensorComplete = derive2 { name="TensorComplete"; version="0.1.0"; sha256="06lr0blkf5pv1zwlffn7m0xxscjii4jg930nkzrh2k7dnbka6vsx"; depends=[MASS pracma tensorregress]; }; TensorTest2D = derive2 { name="TensorTest2D"; version="1.1.1"; sha256="1yx1ggsbximbsrwimyg7jblbqr0f75z278f38hg61qjxzf9m4ndk"; depends=[]; }; Ternary = derive2 { name="Ternary"; version="2.0.0"; sha256="1qkf54h3pg2zjbmhas8b2jxizqd2z626qivdpirjypvzp9243458"; depends=[shiny viridisLite]; }; + TesiproV = derive2 { name="TesiproV"; version="0.9.1"; sha256="0a2rr2i7skbg5fdwhcz0wqx7y5cdw6kjgxrml27p2r15q3lvz808"; depends=[edfun ggplot2 gridExtra nloptr pracma]; }; 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.2.6"; sha256="19kaqvlghiwgfnr53f7grj2bsih743i3mls57sblzwzwr3p59qkd"; depends=[crayon foreach logitnorm lpSolve Rcpp RcppArmadillo]; }; + TestDesign = derive2 { name="TestDesign"; version="1.2.7"; sha256="195j5l6axphkwbjdpj26k2fzs7nbj0kb8gw6271jzwb94b2xfgrb"; depends=[crayon foreach logitnorm lpSolve Rcpp RcppArmadillo]; }; TestDimorph = derive2 { name="TestDimorph"; version="0.4.1"; sha256="09r265mmr3bk78pqca30n9bz62p6822mg0nhrfaip2lxhl3bfqcw"; depends=[caret corrplot cutpointr dplyr ggplot2 Morpho multcompView tidyr tmvtnorm truncnorm]; }; TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; }; TestGardener = derive2 { name="TestGardener"; version="2.0.0"; sha256="1n38y2b3r0xf44jasga67cg820f1llb52farkv8dnp4v7bzld6zs"; depends=[dplyr fda ggplot2 ggpubr knitr pracma rgl rmarkdown stringr tidyr utf8]; }; @@ -5385,6 +5429,7 @@ in with self; { TextMiningGUI = derive2 { name="TextMiningGUI"; version="0.3"; sha256="0hl4rswc3icwf11idk9ydrbd3ghz6mb1vnabknal0fxffpdi37dd"; depends=[dplyr ggplot2 ggwordcloud RColorBrewer slam syuzhet tibble tidyr tidytext tm]; }; ThankYouStars = derive2 { name="ThankYouStars"; version="0.2.0"; sha256="0r77ns3102wj1wvrfsa06l427imxyfhigpbs36cdxl2j87qrjzl6"; depends=[httr jsonlite]; }; ThermIndex = derive2 { name="ThermIndex"; version="0.2.0"; sha256="0s9d55577dq61qixwwfwmqc2k2c8my00j2ng97ng42cw0jc7aylm"; depends=[]; }; + ThermalSampleR = derive2 { name="ThermalSampleR"; version="0.1.0"; sha256="1cl14scgczsc9xvvp5cjk548a48a7vmnc6dgsdhl8bqlkkrp1aly"; depends=[cowplot dplyr EnvStats ggplot2 janitor magrittr MASS purrr rlang sn tidyr]; }; Thermimage = derive2 { name="Thermimage"; version="4.1.3"; sha256="1623r64v97ii8qq6cfrg0jrdl7nwxswjgif5l85vak8xjkfwsq7q"; depends=[png tiff]; }; Thinknum = derive2 { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; }; ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="1.0-3"; sha256="06jhgl1fzvkvnhrjs4xcyw6yymwl499rw9xnfwpx44dzxi7nynxj"; depends=[MASS numDeriv]; }; @@ -5393,7 +5438,7 @@ in with self; { 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.0"; sha256="1mzz05aqq6crcfm5bbv0gbpvndk0yy1lf4fxz8zva790g16cilq0"; depends=[ks MASS numDeriv pROC]; }; - TiPS = derive2 { name="TiPS"; version="1.1.0"; sha256="08xa0xg8kgjccd8qhplpxyfikrm1yfx2spn6y381p7z08985vnsk"; depends=[gtools inline Rcpp stringr]; }; + TiPS = derive2 { name="TiPS"; version="1.1.1"; sha256="1bdkd7x4g1dfiw6bs59gz79kdqkz02hvqbh3bgcd5gxwad5ka5zp"; depends=[gtools inline Rcpp stringr]; }; TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; }; TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; }; TideCurves = derive2 { name="TideCurves"; version="0.0.5"; sha256="1cnfnmwmlicsi243058zq3302niwk2l1agrrjy4k7rf1v7gfy6xx"; depends=[chron data_table fields]; }; @@ -5401,14 +5446,17 @@ in with self; { 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]; }; - TidyMultiqc = derive2 { name="TidyMultiqc"; version="1.0.0"; sha256="1dbkn6vgzkmp3vs528f1vf10hk4ph381z6bq8nshim5ggmvl4wvy"; depends=[assertthat dplyr jsonlite magrittr purrr rlang stringr tibble]; }; + TidyDensity = derive2 { name="TidyDensity"; version="1.0.0"; sha256="0wzl2jijzga2wc65hjk7v4nlifapc9cg8318jcwiaprndm5gd2cg"; depends=[actuar dplyr ggplot2 magrittr plotly purrr rlang stringr tidyr]; }; + TidyMultiqc = derive2 { name="TidyMultiqc"; version="1.0.2"; sha256="0acgq3npl7l2j3wv9gxlnkajb7sjacnsaxh3p4jrcqvam173bkps"; depends=[assertthat dplyr jsonlite magrittr purrr rlang stringr tibble]; }; + TileManager = derive2 { name="TileManager"; version="0.4.1"; sha256="0pcskdqxxm07j47bw1j4d3jqf64pk0jqwcp5379hnpi6kr7f5gvh"; depends=[APfun raster rgeos sp XML]; }; TimeProjection = derive2 { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; }; 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]; }; TimeWarp = derive2 { name="TimeWarp"; version="1.0.15"; sha256="1v6f6d1h9dc8npdy0ph5hhc4jjkzh8kac48lz4ahgngi9n0xwql9"; depends=[]; }; Tinflex = derive2 { name="Tinflex"; version="1.8"; sha256="053w4l5j499brlbbh1bc41nj01j1533ixd9vggmvpkzk7zgdsasy"; depends=[]; }; TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.1-0"; sha256="07lw6jnr76qrxwrwv90hi5ih2xf6g4sz4hfapk5vf1y3ayfskkl0"; depends=[DescTools mclust TeachingDemos]; }; - TmCalculator = derive2 { name="TmCalculator"; version="1.0.1"; sha256="1h1dk4kq6zi3a9wi6bxsqz3b9jk740811dp65sb6lqc668xy5mps"; depends=[]; }; + 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]; }; 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]; }; @@ -5418,15 +5466,15 @@ in with self; { 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="0.4.3"; sha256="0lick8z4fbalzhqrhh5a5bjq74rwb0hy2g7z91g2xlr49ihi51av"; depends=[assertthat dplyr forcats lifecycle magrittr purrr rlang stringr tibble tidyr tidyselect]; }; - TraMineR = derive2 { name="TraMineR"; version="2.2-2"; sha256="1acpfgapaid4wii9vj0gnbgy5ln0k4hw5niniygndfwiypi2620c"; depends=[boot cluster cNORM colorspace Hmisc psych RColorBrewer]; }; - TraMineRextras = derive2 { name="TraMineRextras"; version="0.6.2"; sha256="0j39sxd3x447lnn2sxhn3z6qp5spfsfvpy4w0438pw55w8djxs33"; depends=[cluster colorspace doParallel foreach gtools RColorBrewer survival TraMineR]; }; + Tplyr = derive2 { name="Tplyr"; version="0.4.4"; sha256="1lvr04c3apqk3h191qghyk4lx5axc0rh9skzf42dl6prxqc5wbg0"; depends=[assertthat dplyr forcats lifecycle magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + TraMineR = derive2 { name="TraMineR"; version="2.2-3"; sha256="1jvjidkfisxvfp3ldnk8cljj6b67z5srqrwb6mqbwpsmg57qws9w"; depends=[boot cluster cNORM colorspace RColorBrewer weights]; }; + TraMineRextras = derive2 { name="TraMineRextras"; version="0.6.3"; sha256="1lw89h24h9aqrf0pxv6fm0fpiykv1qawfyjsp9afq2ygins8p4xc"; depends=[cluster colorspace doParallel foreach gtools 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.2"; sha256="0g2jcfp2yp3x6rbf1wvbmq7mkf0r6ssj6j4r1b41f2llw2pgqnnr"; depends=[PerformanceAnalytics reticulate]; }; TraitStats = derive2 { name="TraitStats"; version="1.0.1"; sha256="00la8ix8wskn1354anx0zd70q1rj65a3407sq25b04hif340liyg"; depends=[gridExtra lattice qpdf rlist]; }; TrajDataMining = derive2 { name="TrajDataMining"; version="0.1.6"; sha256="1n5qcyc1kb8rdrqaji7pp63l2gyr6jim8spm8ydb4lnqfcnrin9g"; depends=[geosphere rgdal RPostgreSQL sp spacetime trajectories xts]; }; - TransModel = derive2 { name="TransModel"; version="2.1"; sha256="0brlr4w5k8xsgbrizm7ha0cmq0kqzd2fcjpszq7gym844jj93csi"; depends=[MASS survival]; }; + 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]; }; Tratamentos_ad = derive2 { name="Tratamentos.ad"; version="0.2.2"; sha256="0w8bgkinnawdp3h6nhqypc7xg93y4nnk5hczijys713a4bv26gb2"; depends=[crayon]; }; @@ -5434,12 +5482,13 @@ in with self; { TreeBUGS = derive2 { name="TreeBUGS"; version="1.4.7"; sha256="0cwhgphdk0zndnqx0qcq42zajhwvgs9myg9dmm6dnp0ik0g5syqa"; 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.1"; sha256="08r3lj6jryisskgfzv4yaawmghqx3sk8cjmk0rm2q46ajcf2dihd"; depends=[fitdistrplus igraph mlpack nFactors RColorBrewer Rcpp Rdpack]; }; TreeDist = derive2 { name="TreeDist"; version="2.3.0"; sha256="1rmd0j8pa7i3q4dqx40gk3kvm0gv8yyrh98ssbslzqsbll84q0y1"; depends=[ape cli colorspace memoise phangorn Rcpp Rdpack shiny shinyjs TreeTools]; }; TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; }; - TreeSearch = derive2 { name="TreeSearch"; version="1.0.1"; sha256="0if768mwnrh56srn1y669gwgn0r5cpgqgpa18zqyf8vangzq60yl"; depends=[ape cli cluster fastmatch future phangorn promises protoclust Rcpp Rdpack Rogue shiny shinyjs TreeDist TreeTools]; }; + TreeSearch = derive2 { name="TreeSearch"; version="1.1.0"; sha256="0fhkfbq3f4m6lm0kw81wwl809lwv6dq8l9k461v76vqvh7xgs7nl"; depends=[ape cli cluster fastmatch future phangorn 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.5.1"; sha256="19xl9qn82zs3mxws7mygrz16rsqw92an5aasfdrpn3jvrlcpc4i4"; depends=[ape bit64 colorspace fastmatch phangorn R_cache Rcpp Rdpack]; }; + TreeTools = derive2 { name="TreeTools"; version="1.6.0"; sha256="0a6q2fr9frk38378zvd1njkrwwmw943plxmi337wrdvgaikkg5jj"; depends=[ape bit64 colorspace fastmatch lifecycle R_cache Rcpp Rdpack]; }; 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]; }; Trendtwosub = derive2 { name="Trendtwosub"; version="0.0.2"; sha256="12ibxxq58h9w7hlrsxwdirh02casj495rxbfknaggwfx3w30nm56"; depends=[magrittr usethis]; }; @@ -5452,6 +5501,7 @@ in with self; { TropFishR = derive2 { name="TropFishR"; version="1.6.3"; sha256="0nkw7dcb2kvgvvfla6ns60n460wsamwcp88281q6lyb6yb8k14bv"; depends=[doParallel GA GenSA MASS Matrix msm reshape2]; }; TrtCombo_FactorialExp_SR = derive2 { name="TrtCombo.FactorialExp.SR"; version="4.0.4"; sha256="1kc5nqivsia801hdll5zcl4w6ayx7pabx7xz70l75h1f966ahnr7"; depends=[]; }; TrueSkillThroughTime = derive2 { name="TrueSkillThroughTime"; version="0.1.0"; sha256="1ak7w10qss1jlf8gy4sri678nqcw6rc79kwr6anqcjxick1000j9"; depends=[hash]; }; + TruncExpFam = derive2 { name="TruncExpFam"; version="1.0.0"; sha256="0059afyfvzliwpw4l1846yxcpqqdy9c2kk0xa0fl5nxh89c2hr7v"; depends=[invgamma rmutil]; }; TruncatedNormal = derive2 { name="TruncatedNormal"; version="2.2.2"; sha256="05cfn7mdq0hgw97bbb227in9ccjz727sp67xpnpx2r1ajvl6gxdf"; depends=[alabama nleqslv randtoolbox Rcpp RcppArmadillo]; }; Tsphere = derive2 { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; }; TukeyC = derive2 { name="TukeyC"; version="1.3-4"; sha256="1ly09pll86zkn6m8rc6d66f3d7hf98fiij0psaigq6wdgf5an8ig"; depends=[doBy xtable]; }; @@ -5462,6 +5512,7 @@ in with self; { TwitterAutomatedTrading = derive2 { name="TwitterAutomatedTrading"; version="0.1.0"; sha256="1aa6fxxvy0s8al30w19wa2pwzp60zbbdvp5myigv8x26k6w2jwgv"; depends=[curl dplyr jsonlite lubridate magrittr naptime plyr purrr tibble tidytext twitteR]; }; TwoArmSurvSim = derive2 { name="TwoArmSurvSim"; version="0.2"; sha256="0isb1nmm6hxwn6p52an1axj30ilkr5c8xi86zx2b8acivdz2xr12"; depends=[blockrand dplyr simsurv survival]; }; TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; }; + TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.2"; sha256="1ifdj17rlr8nd0pqpcqi6835ymdhngif279i27s6lvwha924l81c"; depends=[survival]; }; TwoRegression = derive2 { name="TwoRegression"; version="0.1.2"; sha256="0qr9zrfmbh4c4207gvwa384q5njjx6nsl6lc58d25m8bkfalifpi"; depends=[data_table dplyr magrittr seewave]; }; TwoSampleTest_HD = derive2 { name="TwoSampleTest.HD"; version="1.0"; sha256="0xdib7hwbpy549pxihai8dpy91h94wwl3b76jn7p0m15ky7z18df"; depends=[]; }; TwoStepCLogit = derive2 { name="TwoStepCLogit"; version="1.2.5"; sha256="050y7na91izg36gkwd8yn8rx3r39dk6qlvhd3137f3jnk4v00bck"; depends=[survival]; }; @@ -5469,20 +5520,20 @@ in with self; { UBCRM = derive2 { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; }; UBL = derive2 { name="UBL"; version="0.0.7"; sha256="1zppc8mgmj4ymxfdvhqiirlf80wh65y58wqm92fgjdn7s06v5skf"; depends=[automap gstat MBA randomForest sp]; }; UCR_ColumnNames = derive2 { name="UCR.ColumnNames"; version="0.1.0"; sha256="1nwwq93f60r9aik51l7mzckg81f81nz5kgzynyzp5sm4y2wmpzwn"; depends=[]; }; - UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="1.1.4"; sha256="1ixiy1zdrxnp7srp2ak765v640xxfwlx609z0zdk9akavj4w0crf"; depends=[dplyr ezcox forcats ggplot2 ggpubr magrittr ppcor psych purrr shiny stringr tibble tidyr UCSCXenaTools]; }; + UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="1.1.5"; sha256="0x2nlf5s4456yq2k0m1m12mngln9ny65vjm4c7jmdk4ldq14x37s"; depends=[dplyr ezcox forcats ggplot2 ggpubr magrittr ppcor psych purrr shiny stringr tibble tidyr UCSCXenaTools]; }; UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.4.7"; sha256="1s3x9vmvnb0g3fmrgjw636g3nhshbgkv0g2dyrk347bv7bdj52zg"; depends=[digest dplyr httr jsonlite magrittr readr rlang]; }; UComp = derive2 { name="UComp"; version="2.2.2"; sha256="024fmarngqmj8db7rkah2cnsix3m0zqz153j5585caij302v8rkl"; depends=[Rcpp RcppArmadillo]; }; 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.0"; sha256="1v54qmqr05z64ls3vih0iinxax76vz3cas2b0sbgqxf0mgif07s9"; depends=[]; }; + UKFE = derive2 { name="UKFE"; version="0.2.2"; sha256="1cgs6ma0k3v8m9x3s9d0kiddcmw2q7f5258dh32y07jm9m6aqqpi"; depends=[]; }; 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]; }; - UNF = derive2 { name="UNF"; version="2.0.7"; sha256="1i7aj9w90c1bn581l820iasxhs4ibs7xwbhid7gdkz9f87cz568r"; depends=[base64enc digest]; }; UNPaC = derive2 { name="UNPaC"; version="1.1.0"; sha256="12w6vjvkzivnqa6jd75dwr8h8d8xbc2519pqnqw9fk3yanqzx9rk"; 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.2.2"; sha256="01w54qbbyiwlw1dymi5gmxd26vds1am7r32p3gpq2ybfghk9kxbw"; depends=[coda ggplot2 knitr matrixStats mnormt pgdraw Rcpp RcppArmadillo RcppProgress reshape2]; }; UPMASK = derive2 { name="UPMASK"; version="1.2"; sha256="160rsb0nbndf61khcs3s8xv9nj7ln8zl6l11157ywdcjqd2q5qnq"; depends=[DBI dimRed loe MASS RSQLite]; }; UPSvarApprox = derive2 { name="UPSvarApprox"; version="0.1.2"; sha256="0kgbpk2wc7zsiln7301z8fa1fp4911kpg1zfpjyfw3cv7dqaznv2"; depends=[]; }; + USA_state_boundaries = derive2 { name="USA.state.boundaries"; version="1.0.0"; sha256="1zxycl0dkwa0bc1axj9s4yw1ld4zkxgbvdzrwwwr3iwddpk8mrdf"; depends=[sp]; }; USAboundaries = derive2 { name="USAboundaries"; version="0.4.0"; sha256="0wwaywg01vz8hmwm58bnf86m8yqivi53bww5y3ycg891msnjwrgr"; depends=[]; }; USP = derive2 { name="USP"; version="0.1.2"; sha256="1fngs82r1xbym8qa1lj9jv1i57r3nx9rr093nfpjl82f7r0kr3sn"; depends=[Rdpack]; }; UScancer = derive2 { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; }; @@ -5502,15 +5553,15 @@ in with self; { UncDecomp = derive2 { name="UncDecomp"; version="1.0.1"; sha256="1m44pgk7nffay09m4gkwb0khq0qjd7bq1p72blsmib46wmnwqfsa"; depends=[dplyr ggplot2]; }; UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; }; Unicode = derive2 { name="Unicode"; version="14.0.0-1"; sha256="11jsbpkqg80a8657arklz1ixmc0shk8s5ggb9q8a39nmwk0j536z"; depends=[]; }; - UnifiedDoseFinding = derive2 { name="UnifiedDoseFinding"; version="0.1.8"; sha256="1mkqfdbjk3yk5clad9vlhzr5ab8v14ywz9jvrvk9m4yjh43p2h3i"; depends=[]; }; + UnifiedDoseFinding = derive2 { name="UnifiedDoseFinding"; version="0.1.9"; sha256="173mlgrq5xi2rsrx3k56rmawlwc92wbch028vgvp9zsf1nd52r1n"; depends=[]; }; UniprotR = derive2 { name="UniprotR"; version="2.1.0"; sha256="1ykdfl8qi1sjv1algpmcp6fg5llnbggm963iqkk23cm7fz98pzr3"; 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=[]; }; UpSetR = derive2 { name="UpSetR"; version="1.4.0"; sha256="007i0njnjjy7vbrxabwav7a1kk2n0hn2mkvqsdzzfk10ckp5y7im"; depends=[ggplot2 gridExtra plyr scales]; }; - UsingR = derive2 { name="UsingR"; version="2.0-6"; sha256="1lr8z45r5s7fxrd42rswm6w7s3k5nds244b9d525jb5v4n8w9kpw"; depends=[HistData Hmisc MASS]; }; + 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.0.0"; sha256="1j5vknhq12kfzda46y7nwiqdzqipzgympqzjq9d8ckr6f6v4qshl"; depends=[curl jsonlite Rcpp]; }; + V8 = derive2 { name="V8"; version="4.1.0"; sha256="15ylzcxlhkba99cccw5rvhwhg9i4zcax2fhmr03w8g4fdhbd3n89"; depends=[curl jsonlite Rcpp]; }; VALERIE = derive2 { name="VALERIE"; version="1.1.0"; sha256="15z8234jhh7hv3gijrvy8hap6gdgvm6qll9b00qbji7vyc3dg4pg"; depends=[GenomicAlignments GenomicRanges ggplot2 ggplotify ggpubr IRanges pheatmap plyr Rsamtools scales]; }; VAM = derive2 { name="VAM"; version="1.0.0"; sha256="04lq8i4zwdc9a4n4hvabdyv4a4cmmqbf534cdnnck7jc0dk5rphr"; depends=[MASS Matrix]; }; VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; }; @@ -5523,18 +5574,18 @@ in with self; { VBLPCM = derive2 { name="VBLPCM"; version="2.4.8"; sha256="1yqwhmk0ziy0l3hvvpi2s62p43gm4lavl3dagn3647lrx99nmngn"; depends=[ergm mclust network sna]; }; VBTree = derive2 { name="VBTree"; version="0.1.0"; sha256="0g0lyvclnfmd3zc8yhcibhli0hyxrba6wb3hx039fsg80q7y02h4"; depends=[tensorA]; }; VBsparsePCA = derive2 { name="VBsparsePCA"; version="0.1.0"; sha256="0h1kzz7rjh4wn4nbq1v3r4f6nrmlh0lscww2vwfz886x1w2c9sys"; depends=[MASS pracma]; }; - VC2copula = derive2 { name="VC2copula"; version="0.1.1"; sha256="1ylfsszf98b3sp0zr8z67ag8gsa5614ikbv4p1gnhssxrc8s6rwx"; depends=[copula VineCopula]; }; + VC2copula = derive2 { name="VC2copula"; version="0.1.2"; sha256="1kbzscdblb3n7mkkhvd75h8hyd6xbfb0lcjgysvyip4v7zc7whvc"; depends=[copula VineCopula]; }; VCA = derive2 { name="VCA"; version="1.4.3"; sha256="0hqvqq8kvqgrli9426x9npy86nzgc3mhfgq45d8vm7ns3fc6zsay"; 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]; }; VDSM = derive2 { name="VDSM"; version="0.1.1"; sha256="09h09av2yydq1vwd77lgfjjk87432sas60905sxkw0mjixf6hq22"; depends=[dplyr ggplot2 gridExtra knitr plyr viridis]; }; VDSPCalibration = derive2 { name="VDSPCalibration"; version="1.0"; sha256="1hrmmhvk3mhd3bdl0msnm5shcj4cjgd3pn1rkfkv8fh4llqvz7w8"; depends=[]; }; VEwaning = derive2 { name="VEwaning"; version="1.1"; sha256="176f0y60pcw29iq6rs636mybbnxq9fhgwhsxaykiijz5d0jhkmbn"; depends=[ggplot2 survival]; }; - VEwaningVariant = derive2 { name="VEwaningVariant"; version="1.1"; sha256="1jchs1ddvdmha7ivxi99mvr4vl7jggpv6mnv7d6xcrfyw3gh1bj1"; depends=[ggplot2 Rcpp RcppArmadillo survival]; }; + VEwaningVariant = derive2 { name="VEwaningVariant"; version="1.2"; sha256="1zhyjyp3vdlpjvx7q3zdf4c8gdfpwphqhl6vzpfl12486nlxlv2q"; depends=[ggplot2 Rcpp RcppArmadillo survival]; }; VFP = derive2 { name="VFP"; version="1.4"; sha256="0p964fag5a0p23x6jgyc5bx4kp3ar9jdh88n4nybiv884sdfbk90"; depends=[gnm MASS VCA]; }; VFS = derive2 { name="VFS"; version="1.0.2"; sha256="1b8sl8id2gj4iqkpjzd3giybbix2jvskwsbw1kqj3zqr77hygxwg"; depends=[e1071 nleqslv]; }; - VGAM = derive2 { name="VGAM"; version="1.1-5"; sha256="1fx123h4x5awzshv0m4jqbbllrdjfpslb2i8gl9phm1y1wahn69h"; depends=[]; }; - VGAMdata = derive2 { name="VGAMdata"; version="1.1-5"; sha256="1n5g2ymcanf6msjix6y9lsff65iq4898zmd5blfj57d2vbp6ibsa"; depends=[VGAM]; }; + VGAM = derive2 { name="VGAM"; version="1.1-6"; sha256="05yl1lbpambwg3i3rqn6aanaym7c3s8g7hi0bph98iyxqnx62sj4"; depends=[]; }; + VGAMdata = derive2 { name="VGAMdata"; version="1.1-6"; sha256="14s8118k66yy0dljr364dbq1hrvjwmg69n3ls3dbmxfm1f9vrmnw"; 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.4"; sha256="1q4ayvq0adln9vv3r05gc2rmkd2pbzrsqd8dsgmindzwqbxsps36"; depends=[foreach lubridate Rcpp RcppArmadillo]; }; @@ -5545,7 +5596,7 @@ in with self; { VIRF = derive2 { name="VIRF"; version="0.1.0"; sha256="0bdkmbmkmmj78h9x025qsdzjzcx8xr2s98wlspcsghlz4hxkzcas"; depends=[BigVAR expm gnm ks matlib matrixcalc mgarchBEKK rmgarch]; }; VLF = derive2 { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; }; VLMC = derive2 { name="VLMC"; version="1.4-3-1"; sha256="0cwfpxcj8g68j9z9fl66i0amj8ypf199iv3yyxzsmniqv4w5x4ar"; depends=[MASS]; }; - VLTimeCausality = derive2 { name="VLTimeCausality"; version="0.1.3"; sha256="1a5v2yp2pmnx0h0k2kvpw0cpn1bwz3c68vwdj7sz8r85c7mw326d"; depends=[dtw ggplot2 RTransferEntropy tseries]; }; + VLTimeCausality = derive2 { name="VLTimeCausality"; version="0.1.4"; sha256="09fpjskdc3bz1qjqvcivk873jyl0mcjm4zds2xa6bd82ka8rb4b8"; depends=[dtw ggplot2 RTransferEntropy tseries]; }; 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]; }; VSURF = derive2 { name="VSURF"; version="1.1.0"; sha256="1azfd4sb89mp27l86k293qj81x94gfiy1ihwnb6c558p8h69xsgf"; depends=[doParallel foreach randomForest ranger Rborist rpart]; }; VSdecomp = derive2 { name="VSdecomp"; version="0.1.1"; sha256="1vx68rhsxvi3kkrwr98hqhivhdmb9dm9rnmgspx74dskhkysjwbg"; depends=[ggplot2 Hmisc lfe reshape rlang]; }; @@ -5587,16 +5638,16 @@ in with self; { 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]; }; WARN = derive2 { name="WARN"; version="1.2-4"; sha256="18gfk9vqcqarj7j5i240wqv2dclg3csng4mih5izj40xaaxaf6q5"; depends=[MASS]; }; - WASP = derive2 { name="WASP"; version="1.4.1"; sha256="1af2qqsq811bvcwns4i0kvy36xxi9pkdawwq2n75yd9dhpv5whav"; depends=[ggplot2 sp tidyr waveslim]; }; + WASP = derive2 { name="WASP"; version="1.4.2"; sha256="0gdz1vqd7mj9n683qz3ngmk844ba81g2fz1pi9fi2mly5lfp28n3"; depends=[ggplot2 sp tidyr waveslim]; }; WCE = derive2 { name="WCE"; version="1.0.2"; sha256="105pwpd9ikm0gwz4r12jl6cgs1riwsk9pn5qk9cn3msgwa0sdynx"; depends=[plyr survival]; }; WCM = derive2 { name="WCM"; version="0.2.2"; sha256="0w1m2vcxc64ksw3dm94wdigil2fpv3cvzyqmkhs2zrfjlgrdchcd"; depends=[pracma raster]; }; WCQ = derive2 { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; }; - WDI = derive2 { name="WDI"; version="2.7.4"; sha256="153ddpjhi8d88i2p5mrzg9fpg9ixvssg6qfk49y8qsfm3qy2k6pp"; depends=[RJSONIO]; }; + WDI = derive2 { name="WDI"; version="2.7.6"; sha256="1466mcxn04qbs71r121h5v5jl5bfsjja2cg932rxnf9s9s261vkp"; depends=[RJSONIO]; }; WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; }; WEGE = derive2 { name="WEGE"; version="0.1.0"; sha256="17g4cgx0ajgj7lgxzi467cjbmbc47skyarcm88vqjc3i1j55dw12"; depends=[raster sf sp]; }; WGCNA = derive2 { name="WGCNA"; version="1.70-3"; sha256="1m6b4a2xpb02c1ajndhk8qlqnhwxa7lkkwj6nzv3l618jy1kp15r"; 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]; }; - WINS = derive2 { name="WINS"; version="1.0"; sha256="0v32fvhyavbrk57jsdfm2xmg6hhlxpxyj4syj3qgzxqqpw5rpk2m"; depends=[copula ggplot2 ggpubr reshape2 stringr survival viridis]; }; + WINS = derive2 { name="WINS"; version="1.1"; sha256="0vsvrs74n1jkgsw2razfj207hin3yv60r05m6ypv9qqf1835s3rq"; depends=[copula ggplot2 ggpubr reshape2 stringr survival viridis]; }; WLasso = derive2 { name="WLasso"; version="1.0"; sha256="0q44ljdsqsnnwfnnsmyn3p65inbw0y71v7v5pp7cz2dzbhhpfzpw"; depends=[genlasso ggplot2 MASS Matrix tibble]; }; WLinfer = derive2 { name="WLinfer"; version="1.1.0"; sha256="0vz5vxn4915z5061iczpl51d7vdz28ss6ghfnllrg4lagn4m1mh6"; depends=[bbmle boot cubature goftest LindleyR nleqslv pracma]; }; WLreg = derive2 { name="WLreg"; version="1.0.0"; sha256="0paghjcshhrr6y1gm98d6gr78zvgzhl678g9f96hppfa4q3lfpr7"; depends=[inline survival]; }; @@ -5611,7 +5662,7 @@ in with self; { WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.2"; sha256="1ssrqqf2hypif4nnfyl4lq03glyyg9ry9s14llf1njxamhjggfgg"; 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.2"; sha256="07gwb984mmfwi9b7m44d60f787szw089xlvqwclpkpjgz677k1cg"; depends=[cdata ggplot2 gridExtra mgcv rqdatatable rquery sigr wrapr]; }; - WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; }; + 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]; }; Watersheds = derive2 { name="Watersheds"; version="1.1"; sha256="1gn52nl0rr29pqq94gjasc4fi1kjxlrpjdkgm2x56j5jbd162drk"; depends=[lattice maptools rgeos sp splancs]; }; @@ -5620,13 +5671,16 @@ in with self; { WaveletArima = derive2 { name="WaveletArima"; version="0.1.1"; sha256="19hz2q280m41qh3m9lx3i9p6p5fl6pw8r9b06xk6sn04hxbim8xx"; depends=[forecast fracdiff wavelets]; }; WaveletComp = derive2 { name="WaveletComp"; version="1.1"; sha256="07w2aa0jiflvxyqhgh48705hg8hjspd103jd00i2pcw2v42hwmf8"; depends=[]; }; WaveletGARCH = derive2 { name="WaveletGARCH"; version="0.1.1"; sha256="0dj5bmvzfhj1cpn8qi2ax3iipr7jlq0f9vk4b1idqgh5dmdi8lh6"; depends=[FinTS forecast fracdiff rugarch wavelets]; }; + 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]; }; Wcompo = derive2 { name="Wcompo"; version="1.0"; sha256="1rd7y86q8qi7w9878ng0zdk3zpxnjyzpmrm2mj5lm60hkd72xyrw"; depends=[survival]; }; WeMix = derive2 { name="WeMix"; version="3.2.1"; sha256="0y7xw7ardij56x4s2ls1vfa8a3pjl14jj5y987p3xx8pca409pp6"; depends=[lme4 Matrix minqa NPflow numDeriv Rmpfr statmod]; }; + WebAnalytics = derive2 { name="WebAnalytics"; version="0.9.1"; sha256="1nllvrwk7lqdvghfzjvvjihsymn36rphfpfwn3j6mlzq2v2vawra"; depends=[brew digest fs ggplot2 scales testthat xtable]; }; WebGestaltR = derive2 { name="WebGestaltR"; version="0.4.4"; sha256="1rgf9s80hk35baiknrwgnqnhxssrcxdansgpvpyhqv07bqd472nn"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph jsonlite Rcpp readr rlang svglite whisker]; }; WebPower = derive2 { name="WebPower"; version="0.6"; sha256="1gw6191v9sgycis3vyjznaaiyhmp0j23h9k8g8adchpyss7017ab"; depends=[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.1"; sha256="09b8rjc1k80d6k01vppayswmkdiqmvfqfsw812b5000kk1zng2sm"; depends=[Rcpp RcppArmadillo]; }; + WeibullR = derive2 { name="WeibullR"; version="1.1.5"; sha256="1dkvdja7zm1v7z9011qms9k84wqywbl7k64jlfrp6fn2k0y6nxgj"; depends=[Rcpp RcppArmadillo]; }; WeightIt = derive2 { name="WeightIt"; version="0.12.0"; sha256="1x71ifvxl1zn1iaapfz8sscag2h4yim3ycqiink02sy3sfl0hj4n"; depends=[backports cobalt crayon ggplot2]; }; WeightSVM = derive2 { name="WeightSVM"; version="1.7-9"; sha256="0467rj0qvlyzzpjdxbwwa8gzyalifvjza4pvakbrl7b332v36dwq"; depends=[]; }; Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; }; @@ -5651,7 +5705,7 @@ in with self; { WordR = derive2 { name="WordR"; version="0.3.2"; sha256="1bng0rhhhnryhjw9xpd38v7sdcw9cgqrdryh5bfwk26wjk8jjdms"; depends=[dplyr flextable officer xml2]; }; WorldFlora = derive2 { name="WorldFlora"; version="1.10"; sha256="0wh5jmzfy1fja6iw4vd8p9xir2kd3yh6y4plqs95dlhf1s84awyb"; depends=[]; }; WrightMap = derive2 { name="WrightMap"; version="1.2.3"; sha256="0i84xkd1agyp45r84zsk8vvc02ln8qhxvl4n72xjqib12b38kqzl"; depends=[]; }; - WriteXLS = derive2 { name="WriteXLS"; version="6.3.0"; sha256="0ssjdv7vr66sl1yfg0l38xddrvrfzhf7vdq342izc22bprx9h78b"; depends=[]; }; + WriteXLS = derive2 { name="WriteXLS"; version="6.4.0"; sha256="1dqr98kx930y6mcvb9b39xiwshhs250gkd2vw2v6iil34sl90jv4"; depends=[]; }; WtTopsis = derive2 { name="WtTopsis"; version="1.0"; sha256="0zwx75rgdyh7pjxjvd5xvxqkfryvhq2csn4sd0py0dgmjxb5p3ja"; depends=[]; }; WufooR = derive2 { name="WufooR"; version="1.0.1"; sha256="0iq1lc1b22zdvclkr4yivxxf8z5mdxik7lx9r3b38h2qy2rckqb2"; depends=[dplyr httr jsonlite]; }; XBRL = derive2 { name="XBRL"; version="0.99.19"; sha256="0l25lfy8vzkgdq7i4bafh8b1246f8p2a6sy7c4kswzz4bnxnrihc"; depends=[Rcpp]; }; @@ -5659,7 +5713,8 @@ in with self; { XICOR = derive2 { name="XICOR"; version="0.3.3"; sha256="0xhb58bk3r8spd8ah3r7568np27nlrc18cswcsgavaikjpfda9vr"; depends=[psychTools]; }; XKCDdata = derive2 { name="XKCDdata"; version="0.1.0"; sha256="1lx9frlbc549qrh4d3m79r3l9icfzqkgfgp8raa8x46a2havi0a5"; depends=[assertthat dplyr glue htmltools httr jsonlite magrittr tibble]; }; XLConnect = derive2 { name="XLConnect"; version="1.0.5"; sha256="1b8nr8mjxi8bq4b2c191n4gpjq1fx2vqblp5kb3zmk18gzsjwp4p"; depends=[rJava]; }; - XML = derive2 { name="XML"; version="3.99-0.8"; sha256="0l3bsgqw4bicv3sl2bfag7p4rh1y2pcyg0ajr73kkbg85qf6j7q8"; depends=[]; }; + XLS = derive2 { name="XLS"; version="0.0.9"; sha256="0c9x1rlh7q0x1m57dg4knbvdhqg3mffnwcd50yr29a4h6dy7jjf9"; depends=[mpoly rlang]; }; + XML = derive2 { name="XML"; version="3.99-0.9"; sha256="02ba407ddgil4jbjzrbw756hlxzy3mihc5dk1ngcbvsp67gxw5cw"; depends=[]; }; XML2R = derive2 { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[plyr RCurl XML]; }; XNomial = derive2 { name="XNomial"; version="1.0.4"; sha256="1mwx302576rmsjllbq2clfxilm3hkyp5bw0wmwqbn0kgv5wpy8z6"; depends=[]; }; XR = derive2 { name="XR"; version="0.7.2"; sha256="0j8rkjw9y7mb0yj24nlisfd84148pnnakz8i2y35y2b8gmh5zhvz"; depends=[jsonlite]; }; @@ -5695,7 +5750,7 @@ in with self; { aCRM = derive2 { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[ada dummies kernelFactory randomForest]; }; aGE = derive2 { name="aGE"; version="0.0.9"; sha256="17niwni6sd2mdvhskq6vfwplynh67hwq9ijrlgjvhkcslpb2ilp3"; depends=[MASS nlme survey]; }; aLFQ = derive2 { name="aLFQ"; version="1.3.6"; sha256="0kphpvhz36859f5l0k8mbf59g9871mynbs4ybdi0h5nm2cdjy9vx"; depends=[bio3d caret data_table lattice plyr randomForest reshape2 ROCR seqinr]; }; - aMNLFA = derive2 { name="aMNLFA"; version="1.1.1"; sha256="1vghwkz14j8vwnkf54ykqgm4vk84wm260pnmaa66xh1466qf4i55"; depends=[devtools dplyr ggplot2 gridExtra MplusAutomation plyr reshape2 stringi stringr]; }; + aMNLFA = derive2 { name="aMNLFA"; version="1.1.2"; sha256="1bks7g6zc8817gr4j1mxzmyhw23mwafb6816a26vylk8d9k9d315"; depends=[devtools dplyr ggplot2 gridExtra MplusAutomation plyr reshape2 stringi stringr]; }; aPCoA = derive2 { name="aPCoA"; version="1.3"; sha256="0ybp7jd1q0md4wbal5cmcl6hg3c1wkdz5mi1w5qddgi472vv1z83"; depends=[ape car cluster randomcoloR vegan]; }; aRchi = derive2 { name="aRchi"; version="1.0.5"; sha256="1sn321d2qh7vvwfbr62lg3c5ggg8df0w0q6mwcg5pr3jqhiif076"; depends=[circular data_table DiceKriging dplyr FNN gtools lidR pkgcond plyr progress rgl stringr]; }; aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.1"; sha256="0ghg43rd6bnv4jp8pkpd1ixp5l6kq5pr0mxq61q24s24g0m3s64p"; depends=[]; }; @@ -5712,7 +5767,7 @@ in with self; { abc = derive2 { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data locfit MASS nnet quantreg]; }; abc_data = derive2 { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; }; abcADM = derive2 { name="abcADM"; version="1.0"; sha256="0vcabnnnwc0psv9v3rda5aap9s8cq1pjh02zva3ki64hlavf2a10"; depends=[BH Rcpp]; }; - abcdeFBA = derive2 { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; }; + abclass = derive2 { name="abclass"; version="0.1.0"; sha256="1942a0sws4y6hj9z95rn5vdy9qw9xcdqhdb2pjpk7r6g0vckap07"; depends=[Rcpp RcppArmadillo]; }; abcrf = derive2 { name="abcrf"; version="1.8.1"; sha256="1ghbd24yhqy3xhdxas6ccn84nkavqpgldx5ck8kijknc7qjm8k27"; 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.3"; sha256="07s9dg10i8lsxl73b4n2hynca2fjgb0ykb0dz8c3zv6cgw3cyx97"; depends=[abc abind Hmisc plyr]; }; @@ -5723,16 +5778,18 @@ in with self; { abf2 = derive2 { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; }; 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=[]; }; - abjutils = derive2 { name="abjutils"; version="0.3.1"; sha256="18mmlkqsrjfclk8islfjdsp8sbw6dpjj5x45kqilxdiss69gg5zd"; depends=[dplyr magrittr purrr rlang rstudioapi stringi stringr tidyr]; }; + abjutils = derive2 { name="abjutils"; version="0.3.2"; sha256="0lmf4va8qnzwg698i2h4fcwvd6dhsgdkqsfh41aa3wg1flimhsr7"; depends=[dplyr magrittr purrr rlang rstudioapi stringi stringr tidyr]; }; + abn = derive2 { name="abn"; version="2.6-0"; sha256="0fr5pyc43hly5ry5bbygibbh9mnql7vl4r5qz42d0ry4hahyxa4w"; depends=[doParallel foreach lme4 nnet Rcpp RcppArmadillo Rgraphviz rjags]; }; abnormality = derive2 { name="abnormality"; version="0.1.0"; sha256="1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v"; depends=[MASS Matrix]; }; abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; }; 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]; }; abundant = derive2 { name="abundant"; version="1.2"; sha256="15m3ngj5aipjg961yy5kvdg9xlfcpliw30dq6gchzxabhnfzcipd"; depends=[glasso]; }; - academictwitteR = derive2 { name="academictwitteR"; version="0.3.0"; sha256="07fmkrh90ji04qkcad6f3xk4ndin38w1w5ywygv588in1psqfjci"; depends=[dplyr httr jsonlite lubridate magrittr purrr rlang tibble tidyr tidyselect usethis]; }; + academictwitteR = derive2 { name="academictwitteR"; version="0.3.1"; sha256="055n0y8g2ibai5zyvw9cqbi0l1zi792cgf65jhy6mrf7j6lgrzhw"; depends=[dplyr httr jsonlite lubridate magrittr purrr rlang tibble tidyr tidyselect usethis]; }; acc = derive2 { name="acc"; version="1.3.3"; sha256="1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m"; depends=[circlize DBI ggplot2 iterators mhsmm nleqslv PhysicalActivity plyr R_utils Rcpp RcppArmadillo RSQLite zoo]; }; accSDA = derive2 { name="accSDA"; version="1.0.0"; sha256="0sgxy5y8kkc1n35657kifwfjsba7y5m1vbr7rkk5lmbpkzahqm61"; depends=[ggplot2 ggthemes gridExtra MASS rARPACK sparseLDA]; }; + acca = derive2 { name="acca"; version="0.2"; sha256="0h9dyzd1pbr4rvxqz69vlfmbibcd1n72qqgjvci7fdjjvfq2mc9p"; depends=[ggplot2 plyr]; }; 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="0.8.3"; sha256="0qn4lm6bk0z2iijwsfbymx1c9y39988fw124ncgmlrgw5kv80b7x"; depends=[dplyr reldist]; }; @@ -5763,18 +5820,20 @@ in with self; { activityCounts = derive2 { name="activityCounts"; version="0.1.2"; sha256="0zgxr2sk3a8kmygfxx1p5hnrfwdkxx7php6jlrhm8wv6052ck8jz"; depends=[lubridate magrittr seewave signal tibble]; }; 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]; }; - actuar = derive2 { name="actuar"; version="3.2-0"; sha256="015brjjgmkwmjajdjdw8gs02jrd96if425pk9a97d499hzsq3xds"; depends=[expint]; }; + actuar = derive2 { name="actuar"; version="3.2-1"; sha256="1avqgkls4xvwgfr6j7g2f7p474rlpi82q5aksw8nzf8wcyp7592f"; depends=[expint]; }; actuaryr = derive2 { name="actuaryr"; version="1.1.1"; sha256="08dzn565ax2l2hrn2m32k6magjbskybywl0hsgkg11nrjvkznwnx"; depends=[crayon dplyr lubridate magrittr purrr tibble]; }; 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]; }; adabag = derive2 { name="adabag"; version="4.2"; sha256="109wrl1pwvmyv2l909hrvk7dg4aa9pv449mvdycp50zwrsw9w0a7"; depends=[caret doParallel foreach rpart]; }; adagio = derive2 { name="adagio"; version="0.8.4"; sha256="0ihv05402iq003m0338f85pnqnlnrmx0pf1mg8cz9sgi5h98mbnl"; 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]; }; adapt4pv = derive2 { name="adapt4pv"; version="0.2-1"; sha256="0kl7fh2nmc1kb0hxfxg6ml1a2ygi5b8zzfb4mv29qszlhsmpjldd"; depends=[doParallel foreach glmnet Matrix speedglm xgboost]; }; adaptDiag = derive2 { name="adaptDiag"; version="0.1.0"; sha256="02xpphdhvryc06yji89mn7m2djgkpy19ph4sd52rhfsma7xn6hyf"; depends=[doParallel extraDistr foreach pbmcapply]; }; 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.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; }; + adaptTest = derive2 { name="adaptTest"; version="1.1"; sha256="1qfhb3c64a5pl23vk7z6a3h46yb69cvzp1bpxnpybhxs42s80l5q"; depends=[lattice]; }; adaptalint = derive2 { name="adaptalint"; version="0.2.4"; sha256="15qdcvnnbgcps8j5k79354wsc9alswijv8lcafg2i3lghaw536yf"; depends=[dplyr lintr purrr]; }; adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1.2"; sha256="0bb6hw77dfa66b12xyazlp992gwjb1plylixlmq4cv4yjhnl9n5z"; depends=[ape ggplot2 phyloseq shiny]; }; adaptivetau = derive2 { name="adaptivetau"; version="2.2-3"; sha256="1jficl4yidix35q8yqs3pcv813wq3pg4hpw4ah4dprvg95bl7wwx"; depends=[]; }; @@ -5787,13 +5846,13 @@ in with self; { addinsJoaoMelo = derive2 { name="addinsJoaoMelo"; version="0.1.0"; sha256="1slx9vfcpb468asvgcj0vh7djc5rndzdpcp96qmnis77fx67xj5s"; depends=[dplyr purrr rstudioapi stringr]; }; addinsOutline = derive2 { name="addinsOutline"; version="0.1.6"; sha256="125qfqbpv5xflw8qlyh8m3iyd6biyp3arls3z7y8bqkbghifl730"; depends=[dplyr DT fs miniUI rmarkdown rstudioapi shiny shinyFiles stringr tibble yaml]; }; addinslist = derive2 { name="addinslist"; version="0.4.0"; sha256="0dg91lcb2xgsg6sim9fi9m2p203g2dp5bm5q7k0hy084057c22a5"; depends=[curl DT miniUI rappdirs remotes rmarkdown rvest shiny shinyjs xml2]; }; - additive = derive2 { name="additive"; version="0.0.3"; sha256="15ib1j62dmb48k26snmf5fjzl2slsj1j0bsjbrrc5aciz30zhyml"; depends=[dplyr mgcv parsnip purrr rlang tibble]; }; + additive = derive2 { name="additive"; version="0.0.4"; sha256="1m3ns6fxis6wh0dly7dcvsg02d0bbs98w7jldxxp7kn30ihdmfc3"; depends=[dplyr mgcv parsnip purrr rlang tibble]; }; additiveDEA = derive2 { name="additiveDEA"; version="1.1"; sha256="15nxpdybsda6yhjk23bpafr8v1zdx8332pcxf26k795q3ypjpiy2"; depends=[Benchmarking lpSolveAPI]; }; additivityTests = derive2 { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; }; addreg = derive2 { name="addreg"; version="3.0"; sha256="13bwmgxylwi02g60j1rr51cr5jvvkl2nvf2lnnhnq46fhvs2ma7s"; depends=[combinat glm2 turboEM]; }; ade4 = derive2 { name="ade4"; version="1.7-18"; sha256="09f5kh2mwygqpnvf53k0r54k0cvaafxm9x4nm819gwv05k2g9dpc"; depends=[MASS pixmap sp]; }; ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.3-1"; sha256="1y0f62n8iv002ayd1nyl3bmszw558niwnfzjpvk0a7cbvfdyvwcg"; depends=[ade4 adegraphics lattice]; }; - adea = derive2 { name="adea"; version="1.2.1"; sha256="0crhv3kfxlmw0g5qb2rpq519bzd4w46lbhalqg2rfq324apxvmdj"; depends=[Benchmarking combinat knitr lpSolveAPI rmarkdown]; }; + adea = derive2 { name="adea"; version="1.3.1"; sha256="0jvxgqwfga4gsn5jcdklfq2qci3xyvmkdfjappjwf72swb2rkv0n"; depends=[Benchmarking combinat knitr lpSolveAPI rmarkdown]; }; adegenet = derive2 { name="adegenet"; version="2.1.5"; sha256="1wjp31634n6z6wglf4z3ydrhhn5jmpwwckmp3n2b0v5f3p2fivp4"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny vegan]; }; adegraphics = derive2 { name="adegraphics"; version="1.0-16"; sha256="0fpch8mffac68b64gh8jah8k9zcg8pphi38i9ddw5qggmvlrr9bv"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; }; adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.19"; sha256="1zmsvv651l13pyc1f2jhmnzcv1a620mb7y3gmi7sdfh7jgms3g76"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; }; @@ -5815,18 +5874,21 @@ 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-1"; sha256="14q7fnhlqvxdhnfjhdhfmadz241srplbm069a7ybbsql21cphpf3"; depends=[EbayesThresh]; }; - admisc = derive2 { name="admisc"; version="0.21"; sha256="196m4cf1fjn221jblrimzn3pjhlgqha1cyzs0hks7qbyrv95vwr5"; depends=[]; }; + admiral = derive2 { name="admiral"; version="0.6.3"; sha256="0b40v2y09ia8fhl70i261dmhl18vcn9dy5crr2hb44dnz3rb533c"; depends=[admiral_test assertthat dplyr hms lubridate magrittr purrr rlang stringr tidyr tidyselect]; }; + admiral_test = derive2 { name="admiral.test"; version="0.1.2"; sha256="0p5qv43cbyyxj2i6awkayrfk9rc07h55ck9xpknyd5nf9c08gd1y"; depends=[dplyr magrittr rlang]; }; + admisc = derive2 { name="admisc"; version="0.25"; sha256="0cf8dy0mi3ynm2ic8jp0qi1samyzashwlzz0l64izqqv2s4hpyzp"; depends=[]; }; admix = derive2 { name="admix"; version="0.3.2"; sha256="0si2avjqw6rmv2ndsj1ppmqkafnsjx06m2h4jxfrwf2kxfp2rrn1"; depends=[fdrtool Iso latex2exp MASS orthopolynom pracma Rcpp]; }; admixr = derive2 { name="admixr"; version="0.9.1"; sha256="0wszpzs53cbnha13g2ldpq6z5ndw2v2xgrzadqkjm3hsp6akv4bl"; depends=[dplyr magrittr readr rlang stringr tibble]; }; 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.2.1"; sha256="1bibaayvcgmcxyd9wnmbg86jj6rp0pyi6pjpb84kbqhq91q78z41"; depends=[assertthat dplyr ggplot2 glue httr jose jsonlite knitr lifecycle lubridate progress purrr purrrlyr R6 rlang scales stringr tibble tidyr vctrs]; }; + adobeanalyticsr = derive2 { name="adobeanalyticsr"; version="0.3.0"; sha256="1i5bc6lmsynfyhz7kr7zv2nx5ixlnkh6zl5grr2yh0n5g44m19nr"; 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.1"; sha256="0p2gyfc4rxmms8zdsq4hjsh1njfl2s736arq8aq1am2wh1w9k5ch"; depends=[Rcpp]; }; ads = derive2 { name="ads"; version="1.5-5"; sha256="1i6cv296i5di9irmch9wg6bpxg7s026axspq0mhcwrfyqnw8xnxs"; depends=[ade4 spatstat_geom]; }; adsDataHubR = derive2 { name="adsDataHubR"; version="0.1.1"; sha256="19csivbg3f0g2r11l7jrciqq2lhg50km7qv29xfs6ba5cf678hb9"; depends=[httr jsonlite lubridate]; }; advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; }; adventr = derive2 { name="adventr"; version="0.1.8"; sha256="0nja1a2xhaimz1fg2bb838x9a37sswjqjc68mp59gbdwkfpdii37"; depends=[BayesFactor boot car dplyr effects effsize forcats GGally ggplot2 Hmisc learnr lm_beta nlme readr robust sandwich sjstats tidyr WRS2]; }; + adw = derive2 { name="adw"; version="0.1.0"; sha256="1s1w68d7xw3sff5lkvr9bnhhkjxpc2r5gqj2lw8mkw0fm48m9ky0"; depends=[geosphere magrittr rnaturalearth sf]; }; 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=[]; }; @@ -5834,14 +5896,14 @@ in with self; { afex = derive2 { name="afex"; version="1.0-1"; sha256="1k04n6gwk2n8kg0l3yk5j3wrqgkv5f6w04yjpif9y451hx5w7svg"; depends=[car lme4 lmerTest pbkrtest reshape2]; }; affinity = derive2 { name="affinity"; version="0.2.5"; sha256="0nfh3g8nifv5773pihgzxh62wa837i2dk1kgf15z28cb5xfj2y8h"; depends=[raster reproj]; }; affinitymatrix = derive2 { name="affinitymatrix"; version="0.1.0"; sha256="10i7wzl4xiphj5f466ga7c4ha3mkyqn63x1z0jyx50m0b84sggq1"; depends=[expm ggplot2 ggrepel Hmisc MASS]; }; - affluenceIndex = derive2 { name="affluenceIndex"; version="2.0"; sha256="0icr4rlass7vgcyy5q4nbsf4ck79vm25whycwmndxypp3289r3aw"; depends=[spatstat spatstat_geom]; }; + affluenceIndex = derive2 { name="affluenceIndex"; version="2.1"; sha256="0vcg4gphs0yxdxsgw7kj9r3hvjpfs2z8sjvllvfw9ki3y7jy5jb8"; depends=[spatstat spatstat_geom]; }; 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.1"; sha256="0cg5cdm9nl1hs6f3j0ljpw4bkqvh3ksyj615b9nnbqs5k28lyds9"; depends=[]; }; aftgee = derive2 { name="aftgee"; version="1.1.6"; sha256="1sq6d6zkr4whg61phz22gb5zh7wxg2il39w2g5s812i4hiipqj4r"; depends=[BB geepack MASS survival]; }; afthd = derive2 { name="afthd"; version="1.1.0"; sha256="0gg2cp3sj28f3pi5rqh737hna3imwarwas01jacm0m2h27587k7y"; depends=[glmnet photobiology R2jags rstpm2 survival]; }; agRee = derive2 { name="agRee"; version="0.5-3"; sha256="1wi8jn14kpsj5z49my6fz8j6zxysddxm8svw86cnzsmnbj6mzq7x"; depends=[coda lme4 miscF R2jags]; }; aggregation = derive2 { name="aggregation"; version="1.0.1"; sha256="0j9g604m2ccc7hcy02539yja9cf3xcbl25gvp838bp4x8w18my46"; depends=[]; }; - aghq = derive2 { name="aghq"; version="0.3.1"; sha256="1sl2w6avkrz3j1yhyzvg88l1yvf2mi6zbdjr3zdrzm2ccgkww725"; depends=[Matrix mvQuad numDeriv polynom rlang]; }; + aghq = derive2 { name="aghq"; version="0.4.0"; sha256="12zzadx0qfh5wg8092w777c9ymd1m6gq3gwmfp9pf9bn3s31vij3"; 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]; }; @@ -5854,7 +5916,8 @@ in with self; { agrostab = derive2 { name="agrostab"; version="0.1.0"; sha256="0mcskv3144j594wqljzn5pwbhkxh6sb76b1c2wabzjvi61zrapiv"; depends=[dplyr ggplot2 rlang]; }; agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; }; agtboost = derive2 { name="agtboost"; version="0.9.3"; sha256="1z2ys4cn859vas3q1if50k46cryn7wwy1pjqbc8n9dhdn5zxn3sk"; depends=[Rcpp RcppEigen]; }; - ahMLE = derive2 { name="ahMLE"; version="1.18"; sha256="1yf8v2im13lsa6qadxws9cxvqf0fq17s27ran9lr1bbmxh84prpr"; depends=[invGauss Matrix Rcpp RcppArmadillo survival]; }; + agvgd = derive2 { name="agvgd"; version="0.1.1"; sha256="015izbi0f208ff0b6n2h4vjkdvi7wjzx8qkcyh7c556ikhijaxk5"; depends=[crayon dplyr grantham magrittr purrr rlang seqinr stringr tibble tidyr vctrs]; }; + ahMLE = derive2 { name="ahMLE"; version="1.20.1"; sha256="1phfzl0kynrq1if12h736jdxrfqc3i4kd32hp7sy2k2z7hkj1dkm"; depends=[invGauss Matrix Rcpp RcppArmadillo survival]; }; ahaz = derive2 { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; }; ahnr = derive2 { name="ahnr"; version="0.3.1"; sha256="1g8m3q108ricfyn4fjjaihpr93xz7fm2sfzg3i0fz1n1i703jwm8"; depends=[ggplot2 magrittr matrixcalc pdist pracma purrr visNetwork]; }; ahpsurvey = derive2 { name="ahpsurvey"; version="0.4.1"; sha256="1r7x4c318nzbx0ppm9272kfpz2bln1cafkv9irnj85nsdcravr33"; depends=[dplyr knitr magrittr randomNames Rdpack tidyr]; }; @@ -5866,9 +5929,10 @@ in with self; { aif360 = derive2 { name="aif360"; version="0.1.0"; sha256="0r9x9q8kc9alk1j3p0y23ispcbfac89q0c043vh8dw89q267plf8"; depends=[reticulate rstudioapi]; }; aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; }; aimsir17 = derive2 { name="aimsir17"; version="0.0.2"; sha256="0v804maqaygqhw3y9wqap3h9vvjniqnnbsv1psjj500r2yscicxs"; depends=[tibble]; }; - airGR = derive2 { name="airGR"; version="1.6.12"; sha256="1jcnjrx7pgdj1mr1vrpm0cvmh243lpgwn1h3zsbk7rjwvapr3hji"; depends=[]; }; + airGR = derive2 { name="airGR"; version="1.7.0"; sha256="0miqkhapw3ch4wss8dkygf5j5rj9jwdm7xdb4c5jfdnxdbbsxwjs"; depends=[]; }; airGRdatassim = derive2 { name="airGRdatassim"; version="0.1.3"; sha256="05c108rcj4rlzrbabai95abxhyjsrrrsgvds4zamvyzpjl64f9ps"; depends=[airGR]; }; - airGRteaching = derive2 { name="airGRteaching"; version="0.2.12"; sha256="0l6isv18fj1ka5n97nfhn7pgmvn8xpb23ry7dw22rd7rb2p63bxa"; depends=[airGR dygraphs markdown plotrix shiny shinyjs xts]; }; + airGRiwrm = derive2 { name="airGRiwrm"; version="0.6.1"; sha256="1dr7xg8a6xfdihmf4x03wm268iz78lks15fx9hmpw6sp15xv5kdj"; depends=[airGR DiagrammeR dplyr]; }; + airGRteaching = derive2 { name="airGRteaching"; version="0.2.13"; sha256="1j95b1rz83f1x8gp6107rdk9g81j47yhgdlf8y17f0ffgrvwwfky"; depends=[airGR dygraphs markdown plotrix shiny shinyjs xts]; }; aire_zmvm = derive2 { name="aire.zmvm"; version="0.8.2"; sha256="0z9knqdl7ihx2vph154qi1lh4s6yvlcw6kwry8k47mhh3p7pynsd"; depends=[dplyr httr lubridate progress readr readxl rvest sp stringr tidyr xml2]; }; airportr = derive2 { name="airportr"; version="0.1.3"; sha256="1h8h0cdfqgxv8cf9hp82sx5n4a1z88qyyxicj7d2kmmybqqz2r5n"; depends=[dplyr]; }; airports = derive2 { name="airports"; version="0.1.0"; sha256="1ahfqqfcvr731hj0h7d00jd87h1adiryh42sv4mh318lk5rglm6f"; depends=[]; }; @@ -5876,7 +5940,7 @@ in with self; { airr = derive2 { name="airr"; version="1.3.0"; sha256="1lpzd8qz1dr6kkrbc8lnqbknxyamv4y6ahad5w9q5dgwdwn0kpym"; depends=[readr stringi yaml]; }; airt = derive2 { name="airt"; version="0.2.1"; sha256="1az5fd9zr6lgmcim4v6rzckl9yyw9myvhmzs76n71864gnzkbna4"; depends=[dplyr EstCRM magrittr mirt pracma rlang tibble tidyr]; }; ajv = derive2 { name="ajv"; version="1.0.0"; sha256="1qd5ncb7rdnnvqfknsvq9nrpxrh0zv3jyh4b91dcvfvhp262vfrm"; depends=[RJSONIO V8 yaml]; }; - akc = derive2 { name="akc"; version="0.9.5"; sha256="0mjqz5csckdnl9wb2lypcj907qbkvppwbzvmfcl1a06431pj8zgv"; depends=[data_table dplyr ggforce ggplot2 ggraph ggwordcloud igraph magrittr rlang stringr textstem tibble tidygraph tidytext widyr]; }; + akc = derive2 { name="akc"; version="0.9.6"; sha256="0q2qvr1qq0vmc8hv7ryzw6z2c9vsk78xrx2dzyw0jd4yk0vxiaf7"; depends=[data_table dplyr ggforce ggplot2 ggraph ggwordcloud igraph magrittr rlang stringr textstem tibble tidyfst tidygraph tidytext]; }; akiFlagger = derive2 { name="akiFlagger"; version="0.3.0"; sha256="08z5jvigzvl3af17dd8l6zil0s694i22x0a7xvb3n4fvg6fargz4"; depends=[data_table dplyr shiny zoo]; }; akima = derive2 { name="akima"; version="0.6-2.3"; sha256="0hvaa2n1r82fd60ksx4n4ia02fbm67fqdijfy2b2xywq8861i6rv"; depends=[sp]; }; akmbiclust = derive2 { name="akmbiclust"; version="0.1.0"; sha256="19dj12vlry6f3agzrnshx2c4rpa2h7dlx2138r49jjy9sm48pyfw"; depends=[]; }; @@ -5884,13 +5948,12 @@ in with self; { akmedoids = derive2 { name="akmedoids"; version="1.3.0"; sha256="19d9fh1cygn04riwc7y7lzdncyxki9rzikf9f5m96vp0y687z2ka"; depends=[clusterCrit dplyr ggplot2 Hmisc kml signal]; }; alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; }; alakazam = derive2 { name="alakazam"; version="1.2.0"; sha256="0lqvfamx9lqcg6ig70zzxan2zchab68g6qxa734d6dsdgyfkiwnm"; 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-2"; sha256="1rwaw7809lzdv89lfq9li8jdb7pbb0wjqyiidxl7pxg7d5nxj06h"; depends=[lattice Matrix multiway pracma]; }; + albatross = derive2 { name="albatross"; version="0.3-4"; sha256="0fnywnydzn7mmdnlb413px08k09y5ac2ib3p8jic77i09g1v554m"; 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.4"; sha256="1dnmm3driw8ybqd10zlsaink5zh5f0pj2qqxda7y34s9shz7yqh9"; depends=[checkmate numDeriv optimr]; }; alfr = derive2 { name="alfr"; version="1.2.1"; sha256="1ldq8gvgqjjabn86hdqb6hxch8x4hvr6djv5ly4mx039dipc8jxi"; depends=[httr jsonlite magrittr stringr]; }; alfred = derive2 { name="alfred"; version="0.2.0"; sha256="1y0s6vn0piq4wnlc6v143va0qkklm67aa653lwgq926nfnjxz6as"; depends=[curl dplyr httr jsonlite lubridate magrittr rlang tibble tidyr]; }; - algaeClassify = derive2 { name="algaeClassify"; version="1.2.0"; sha256="1sna5rij2ngpgqfz5cviqdbyr43xph8cbjc4vnm238n72zgg7cb6"; depends=[httr lubridate plyr RCurl rvest taxize XML xml2]; }; algo = derive2 { name="algo"; version="0.1.0"; sha256="1g18p8jyj9crkqm16y2im3r9xzqwa36javv4vi1wvsqkg31d81si"; depends=[glue htmltools jsonlite]; }; algorithmia = derive2 { name="algorithmia"; version="0.3.0"; sha256="1ccmcsyxncyv8k0fjvr5y44amygqi7qx2dy6rsy3a5pw281hllr4"; depends=[base64enc httr rjson]; }; aliases2entrez = derive2 { name="aliases2entrez"; version="0.1.2"; sha256="11myzwvmagnj35qrrxr35hklzv76c0c4h2zl64y3lzzn5rfii0n6"; depends=[AnnotationDbi doParallel foreach limma org_Hs_eg_db RCurl readr]; }; @@ -5898,38 +5961,40 @@ in with self; { allcontributors = derive2 { name="allcontributors"; version="0.0.2"; sha256="0b9qiwp6z33fgci7np4qhsb39rzmarajsj3pa98vkmdn71bw1bxf"; depends=[cli clipr ghql git2r httr jsonlite magrittr]; }; alleHap = derive2 { name="alleHap"; version="0.9.9"; sha256="1fqrw645s3f5363p7jl3dzy8xphxdr1v6wdsjmqcqwpgvjqfr2zz"; depends=[abind]; }; allelematch = derive2 { name="allelematch"; version="2.5.1"; sha256="00117cj01psax4rjvy2nja5r2ss9l8zzjicczh46kp401i1ghmwc"; depends=[dynamicTreeCut]; }; - allestimates = derive2 { name="allestimates"; version="0.2.1"; sha256="1znjzqansh2117xpnwpsw450z20q6rz91h2kg35ygssg5skk8z6q"; depends=[broom dplyr ggplot2 speedglm stringr survival tibble tidyr]; }; + allestimates = derive2 { name="allestimates"; version="0.2.2"; sha256="0g0j6q810665lfa3a9xwmv0hkgcp2a8g0xq0vfpvyykyqykgid3z"; depends=[broom dplyr ggplot2 speedglm stringr survival tibble tidyr]; }; alluvial = derive2 { name="alluvial"; version="0.1-2"; sha256="039frwrsxq1lb97s7vf2vbyyadimkigs628ymym06fxka53drdkp"; depends=[]; }; almanac = derive2 { name="almanac"; version="0.1.1"; sha256="0qsczk74ihy7ac5c4dzd6ax5gfmr56wfnjxg396qc2c3xykb7dd5"; depends=[glue lubridate magrittr R6 rlang V8 vctrs]; }; alookr = derive2 { name="alookr"; version="0.3.5"; sha256="04ivvr9x5glxsz5077z0ahw0x242dgxnch4i6ybmv59jp6gpf4hg"; depends=[caTools cli dlookr dplyr future ggmosaic ggplot2 glmnet MASS MLmetrics party purrr randomForest ranger rlang ROCR rpart tibble tidyr tidyselect unbalanced xgboost]; }; alpaca = derive2 { name="alpaca"; version="0.3.3"; sha256="1mpyy9wg2wvznkd9vgzaxyz87py9zmlrlrzrhqbmqiwqh5y99wnq"; depends=[data_table Formula MASS Rcpp RcppArmadillo]; }; alphaOutlier = derive2 { name="alphaOutlier"; version="1.2.0"; sha256="09yrbv7jsiymw5gzp8p92ki70v1fys2k75x4sb9s7wy3c58wn1cd"; depends=[nleqslv quantreg Rsolnp]; }; alphabetr = derive2 { name="alphabetr"; version="0.2.2"; sha256="1pmp6zwhgycb38y5jbvrbv2nza7gyjh508vy09ml483c2cysvc1r"; depends=[clue dplyr multicool Rcpp]; }; - alphahull = derive2 { name="alphahull"; version="2.2"; sha256="024d70z9pasyfp83zwgh7fkjky70l74pbzw1wvazzq75p9m91vzv"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; }; + alphahull = derive2 { name="alphahull"; version="2.3"; sha256="0vir69bgydkb3l47kn0fs8x6nkh6vgbhrjsfhf1gnzvwj66iig29"; depends=[ggplot2 R_utils sgeostat spatstat_geom spatstat_random splancs tripack]; }; alphashape3d = derive2 { name="alphashape3d"; version="1.3.1"; sha256="0d3rxvsb0yl900dlpr1v5w56z8ci9rbp5dlwx7l2laifyprsns2i"; depends=[geometry rgl]; }; alphastable = derive2 { name="alphastable"; version="0.2.1"; sha256="01gwrcxlj2jlb8axs5qmrsixk3a8b7044ypyjg6dpdcxfbcf5fvp"; depends=[mvtnorm nlme nnls stabledist]; }; alphavantager = derive2 { name="alphavantager"; version="0.1.2"; sha256="0c97p8njga4xffvsa0kj0s4y0agjr44y9bnjxs5phm1ldcqjs0yj"; depends=[dplyr glue httr jsonlite purrr readr stringr tibble tidyr timetk]; }; 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.1.1"; sha256="0fdhv23clmfcajjdrph0m8psrh5wr2giwhydbcrap9mdgbr0rkbk"; depends=[assertthat htmlwidgets magrittr repr reticulate vegawidget]; }; + altair = derive2 { name="altair"; version="4.2.1"; sha256="1132q369yxrfix76xizw22rpbixqbfsf23c3p1m751h536hmx2f6"; depends=[assertthat htmlwidgets magrittr repr reticulate vegawidget]; }; altfuelr = derive2 { name="altfuelr"; version="0.1.0"; sha256="0k3f4wr9gbn5aig40xg817hrnz2lx8g4adyy18s59fs8dw03v87h"; depends=[dplyr httr jsonlite lubridate magrittr purrr stringr]; }; - altmeta = derive2 { name="altmeta"; version="3.3"; sha256="1xq12hnzxh7kgv2i36xprg4lkvqfmxwz3sq4a1jlq2d5g3narvcm"; depends=[coda lme4 Matrix metafor rjags]; }; - amanida = derive2 { name="amanida"; version="0.1.0"; sha256="1z6i76b1qljw4fdaa5bbv0jhim1hyn3ysvl9ls2rglg4qzbv5bdn"; depends=[dplyr ggplot2 ggrepel kableExtra knitr magrittr readr readxl rmarkdown tibble tidyr tidyverse]; }; + altmeta = derive2 { name="altmeta"; version="4.0"; sha256="17cyiydf4n5j64izj7jph2v43h4x9kfd5b0x6m0ik5ci2aw8xzr5"; depends=[coda lme4 Matrix metafor rjags]; }; + amanida = derive2 { name="amanida"; version="0.2.0"; sha256="164ln3dagmdcbqbgywhgxkq0nbnf83p8hw16bvkdhydhzg82s021"; depends=[dplyr ggplot2 ggrepel kableExtra knitr magrittr readr readxl rmarkdown tibble tidyr tidyverse webchem]; }; amanpg = derive2 { name="amanpg"; version="0.3.3"; sha256="0hmdc4kiaxa41hvva93dl48c1lbwih24pjpy569n0cg1zq16fc9x"; depends=[]; }; amap = derive2 { name="amap"; version="0.8-18"; sha256="0zpcb73w413na23f6giml9311jh0j0y766w2fh9i40d2h7bbvyvs"; depends=[]; }; amapGeocode = derive2 { name="amapGeocode"; version="0.6.0"; sha256="0j04hg2ks7578fiaymj295yll77xm6x5svmxx6m4n0djky8j10n1"; depends=[data_table furrr httr jsonlite magrittr sjmisc xml2]; }; ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; }; ambient = derive2 { name="ambient"; version="1.0.0"; sha256="0b8nd8g0ydglql2cwi4wmlnv5kyid8q51vz0p08f9m5x73k3z2bd"; depends=[Rcpp rlang]; }; - ambiorix = derive2 { name="ambiorix"; version="1.0.2"; sha256="1yzrh5nqhcri9ik25fc969fvckkwxp0hnwhfbdk61lp2gx6ll93k"; depends=[assertthat cli fs glue here httpuv jsonlite log promises websocket]; }; + ambiorix = derive2 { name="ambiorix"; version="2.0.0"; sha256="106lcrg4pj6zniib5zm8bp2s94lhwr9nmx2lxv684vg145m4pia5"; depends=[assertthat cli fs glue httpuv jsonlite log promises websocket]; }; amelie = derive2 { name="amelie"; version="0.2.1"; sha256="0f4rfijskrw9nmyzbrbz6yfa9d0a5cxjw8n9c36hc6jvh377i7k7"; depends=[]; }; amen = derive2 { name="amen"; version="1.4.4"; sha256="00c4dw6s8yxagbgadvcpw4ima89aqjqgpm3460zi97xwq9404f1d"; depends=[]; }; + amerifluxr = derive2 { name="amerifluxr"; version="1.0.0"; sha256="099vv1axgp4jfi9ic4rqsdcv8a5dz1z0zdmdx8r8h474p3jdqm7c"; depends=[heatmaply httr jsonlite memoise RCurl readxl]; }; amerika = derive2 { name="amerika"; version="0.1.0"; sha256="1c0bi0wrc89d0zv0wzmdvka66mcikgi1w4gn1i22mvg5bivhzaqx"; depends=[]; }; aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; }; + ammiBayes = derive2 { name="ammiBayes"; version="1.0-0"; sha256="1j5zr1yk2qwba1j5kjc48f9jygi6zn6d33m13jarmczn8y6nxf22"; depends=[bayesplot coda distfree_cr Hmisc lattice latticeExtra movMF msm spam]; }; ammistability = derive2 { name="ammistability"; version="0.1.2"; sha256="0ak20y5iv1cg5y06srdlfk5qp5c463ky41l350shnqpq550azy11"; depends=[agricolae ggcorrplot ggplot2 mathjaxr Rdpack reshape2]; }; 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.1.5"; sha256="0j74h6s4c7j15hnkfpak6shds818g09qg3s9snys3s87hxf78vb9"; depends=[checkmate circular ctmm dplyr fitdistrplus lubridate magrittr purrr raster Rcpp Rdpack rgeos rlang sf sp survival tibble tidyr]; }; + amt = derive2 { name="amt"; version="0.1.7"; sha256="04sjvb4zvalv22q90n50rdkkj002vr5shhpgxacaac7hy0pgpcyc"; depends=[checkmate circular ctmm dplyr fitdistrplus lubridate magrittr purrr raster Rcpp Rdpack rgeos rlang sf sp survival tibble tidyr]; }; anMC = derive2 { name="anMC"; version="0.2.2"; sha256="0ab215nrqn535g9ayqzvgdckhwcrij1mc1296pvlj3grn3f8rhws"; depends=[mvtnorm Rcpp RcppArmadillo]; }; anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; }; analogsea = derive2 { name="analogsea"; version="1.0.3"; sha256="1mf9baniria2vq5k5djm8jfj3lyr2p9q9idcy0ifcrmzyrmgwwi3"; depends=[httr jsonlite magrittr yaml]; }; @@ -5939,7 +6004,6 @@ in with self; { analyz = derive2 { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; }; analyzer = derive2 { name="analyzer"; version="1.0.1"; sha256="1729dnghdca7dr4l5cxazg68ipkm63mvk2danwm3bva62sza29p6"; depends=[dplyr ggplot2 gridExtra]; }; anapuce = derive2 { name="anapuce"; version="2.3"; sha256="05k3ypy4dc8q4jv0by37k66pdwb1wmsd24i6nciris5knfdy9csg"; depends=[]; }; - anchors = derive2 { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[MASS rgenoud]; }; andrews = derive2 { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; }; 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]; }; @@ -5950,6 +6014,7 @@ in with self; { animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; }; 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]; }; animation = derive2 { name="animation"; version="2.7"; sha256="0sg4sz5lkn85yzpcg22xkr7921cbnh7g74nlp9imjy7c0hdqyhc8"; depends=[magick]; }; + animint2 = derive2 { name="animint2"; version="2022.1.25"; sha256="0c4pb0wzd84a79lbqwjl87q5d3vainhxr9ifq5k05rxhdizpjwd0"; depends=[digest gtable knitr lazyeval MASS plyr reshape2 RJSONIO scales tibble]; }; anipaths = derive2 { name="anipaths"; version="0.10.1"; sha256="14shy474795mivxvn0vyfgzwabvhxafgjazcwhz2250smjzdhw03"; depends=[animation crawl dplyr ellipse ggmap ggplot2 igraph lubridate magrittr mgcv raster RColorBrewer scales sp stringr tidyr tidyselect]; }; aniview = derive2 { name="aniview"; version="0.1.0"; sha256="1klakkmdk4xllaxd0pllvxi4396n6rz2idz55niy91mp0fhcjhwf"; depends=[htmltools jsonlite]; }; anndata = derive2 { name="anndata"; version="0.7.5.3"; sha256="115v7gdilayd18hd519vzkixp2s6rvvrd1inc1i6amn7d0spy8r1"; depends=[assertthat Matrix R6 reticulate]; }; @@ -5960,7 +6025,7 @@ in with self; { anscombiser = derive2 { name="anscombiser"; version="1.0.0"; sha256="0jpmxgr5hfyv1hcjn4h1063ch3b3xlgqv983f4f9d2ajz5i5mdwv"; depends=[]; }; antaresEditObject = derive2 { name="antaresEditObject"; version="0.3.0"; sha256="04rdq3kbliac1iaxqflf3qhh58qgl9pxb2qh44wkknb91ga0845x"; depends=[antaresRead assertthat data_table doParallel pbapply whisker]; }; antaresProcessing = derive2 { name="antaresProcessing"; version="0.18.1"; sha256="1dlq850xqh9534ws88ma3vv5r79cbabn6r6a2jmicxx116s7wjrz"; depends=[antaresRead data_table]; }; - antaresRead = derive2 { name="antaresRead"; version="2.2.9"; sha256="1g91fm614q3v5i5v6smp70fipya9rlcdshqixcsjniqcwvpvb01c"; depends=[bit64 data_table doParallel httr jsonlite lubridate pbapply plyr shiny stringr]; }; + antaresRead = derive2 { name="antaresRead"; version="2.2.95"; sha256="0w6pzgrj4bgfz9n8g6fjy13gfp2pybav5k23jpmlp5wsnq8lmb7i"; depends=[bit64 data_table doParallel httr jsonlite lubridate pbapply plyr shiny stringr]; }; antaresViz = derive2 { name="antaresViz"; version="0.17"; sha256="18f398qvy88w9rlkd08h5gvk7vwh349cjxi4pa59s5fs4ihhmdd2"; 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]; }; anthroplus = derive2 { name="anthroplus"; version="0.9.0"; sha256="1wnj2idgdnh2gdw34x40adijf2sxp3k72j45pqqxg4aqc1wrvvv1"; depends=[anthro]; }; @@ -5976,7 +6041,6 @@ in with self; { aods3 = derive2 { name="aods3"; version="0.4-1.1"; sha256="1kdmgzd5nkzm0awdjls6fc8p9hxsph9ha9k1jxbppdi4i6f0i7rv"; depends=[boot lme4]; }; aof = derive2 { name="aof"; version="0.1.2"; sha256="0552i5wvm04dq8a8y1x36sprc9cbx6k7c3bmsgqxm71dpsxajb0i"; depends=[bcpa]; }; aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; }; - aopdata = derive2 { name="aopdata"; version="0.2.2"; sha256="1i62c119zxbn7qaywis99njjyqy17cgvdsng5sqm6ibnz2w0qzri"; depends=[crul curl data_table httr sf]; }; aoristic = derive2 { name="aoristic"; version="1.1.0"; sha256="1i4bihdl4d0ihxf61xdqsb9k8j6im5dfqczy9nlc4xyn68b9m0l8"; depends=[dplyr ggplot2 lubridate openxlsx plyr scales tidyr]; }; 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]; }; @@ -5986,47 +6050,48 @@ in with self; { apache_sedona = derive2 { name="apache.sedona"; version="1.1.1"; sha256="1bsxyb1303s907w5h7m7wacgsjjgb1y35zvkpmn1ymz0zsfbad4p"; depends=[DBI dbplyr dplyr 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.1.7"; sha256="071gax2w9b0l74vls59y6syg2swiagz5xkab1x2wmmxk16y49l1s"; depends=[Rcpp]; }; - apcluster = derive2 { name="apcluster"; version="1.4.8"; sha256="0lzf2jqm56i74wif6x5sw3j0w2qc4sni49zq2fgbl89b7lwkvchj"; depends=[Matrix Rcpp]; }; + apcluster = derive2 { name="apcluster"; version="1.4.9"; sha256="0wnbb3kj9m7rfq63xr43jjf6n8jxm1r2wvvx6g0qkss0wvipbb1s"; depends=[Matrix Rcpp]; }; apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; }; - ape = derive2 { name="ape"; version="5.6"; sha256="075d446jh337zg7w47bvxcbc942wy7jw8gych4ffmkqw7khjavyf"; depends=[lattice nlme Rcpp]; }; + ape = derive2 { name="ape"; version="5.6-2"; sha256="0mqjsh7maczd02iwa4fb896q3kgd9jnlilq7y1yz18ch0c54aqlv"; depends=[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.3.0"; sha256="1ds2qil4jwvfbiv39agpiwq3r54pbi4963n6i25nzfkdclw3hbjl"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr rlang shiny]; }; + apexcharter = derive2 { name="apexcharter"; version="0.3.1"; sha256="1kvlsnsvgiz3akcqpiyxin264qpjbz3m8g98jgfwyiqkjhqs441a"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr rlang shiny]; }; aphid = derive2 { name="aphid"; version="1.3.3"; sha256="1jqpn7w5sgy4k49qd9ci6yj89s55gzwl5w5ldw793mzpg6if7lfn"; depends=[kmer openssl Rcpp]; }; + aphylo = derive2 { name="aphylo"; version="0.2-1"; sha256="0kvxz5r1z63610k127ji7dangrq7pd0zfgf5yqsvn0v7j4c9c5v5"; depends=[ape coda fmcmc MASS Matrix Rcpp xml2]; }; apisensr = derive2 { name="apisensr"; version="0.3.0"; sha256="1mis266s4m0hp34m7b7p008dvw7780r8rypgbpk7h5hgd1w5d7m0"; depends=[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.1.1"; sha256="067yzy35spvs6jbccqpmvnjilglxzda6qqlqhjv311kfvnppzsyf"; depends=[ggfun ggplot2 ggplotify magrittr patchwork yulab_utils]; }; + aplot = derive2 { name="aplot"; version="0.1.2"; sha256="1w09flb6a4fxibfrm1z24pg672r80b7phgc0m7mv3vfw3l84v749"; depends=[ggfun ggplot2 ggplotify magrittr patchwork 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.2.6"; sha256="1qnh5r885myirqrrpwfxkbim1bsaqnkghgc8issd794r64ji2kpw"; depends=[coda Deriv matrixStats maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB tibble]; }; + apollo = derive2 { name="apollo"; version="0.2.7"; sha256="05c3wkvpg3n44k9lbrsd0i4l1q554mqfcx7cqph60ngqfbrkvlcg"; depends=[coda Deriv matrixStats maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB stringr tibble]; }; appler = derive2 { name="appler"; version="0.1.2"; sha256="03sivpv12ssn7dzq780rb4fg4nc7da7nlk6cijzq9yadxgv53svm"; depends=[glue httr jsonlite rvest xml2]; }; applicable = derive2 { name="applicable"; version="0.0.1.2"; sha256="0yzfk4ajdx4l3xivf6v9vn7fqvzfma4842cvjixrng83p2v25sdq"; depends=[dplyr ggplot2 glue hardhat Matrix proxyC purrr rlang tibble tidyr tidyselect]; }; appnn = derive2 { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; }; + approxOT = derive2 { name="approxOT"; version="1.0.1"; sha256="0gp2p8biq2c7n3gasvwk72zqs5b623gphqh82n3j6sg9bm0i7r17"; depends=[BH Rcpp RcppCGAL RcppEigen]; }; approximator = derive2 { name="approximator"; version="1.2-7"; sha256="0smqjdla9mvzy164nsb0pw0sgal3w2wnyhqidp74h0smyczrr1zw"; depends=[emulator mvtnorm]; }; approxmatch = derive2 { name="approxmatch"; version="2.0"; sha256="1n6v1h4zf1nf8j1a5d0h95v6q8dff39v9061i7zzi9ci3lw04748"; depends=[]; }; 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]; }; - apsrtable = derive2 { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; }; apt = derive2 { name="apt"; version="3.0"; sha256="14njvpf6q34nffm3r9gqcszlabzbydsxqj0ln9nk4mv59izp8sqm"; depends=[car erer urca]; }; apyramid = derive2 { name="apyramid"; version="0.1.2"; sha256="0ws6dfd6v3p9rhpmf06786yl2gaw1h2n1d76a054iap8bvgyahzw"; depends=[dplyr forcats ggplot2 glue rlang scales tidyselect]; }; - aqp = derive2 { name="aqp"; version="1.40"; sha256="07xs6yk3mqlhipwbnwygc0hklm6pr8rc6lmyl5n24vm01zkfnzwp"; depends=[cluster data_table lattice plyr sp stringr]; }; - aquodom = derive2 { name="aquodom"; version="0.1.0"; sha256="1ww80pglvpyi84z6zi475y9clx2zyys0qy2g2579wmyqs4hc36p6"; depends=[cachem dplyr glue httr lubridate magrittr memoise openxlsx readr rlang stringr tibble]; }; + aqp = derive2 { name="aqp"; version="1.41"; sha256="1md0ah0i8ifcmqc7q38mgbdhpnxvjmiax9ic8w0bqayw6lh9vyi6"; depends=[cluster data_table lattice plyr 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.1"; sha256="0fb8qn9a7xyk2civs1s3cx61hxmkrj6pkwnfq7pbjdm2dh6xjfky"; depends=[purrr stringr]; }; arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; }; - arakno = derive2 { name="arakno"; version="1.1.1"; sha256="0l17h1xzd2nlq79n4g89cp6rmrk03vlnw01rja46cm1ckhyhw1by"; depends=[httr jsonlite rgbif rworldmap rworldxtra]; }; + arakno = derive2 { name="arakno"; version="1.2.0"; sha256="00byazqa95zjgm04ycky2lvw0i2dwp66nwb1k1vdf8s3cx9jv3hr"; depends=[httr jsonlite rgbif rworldmap rworldxtra]; }; arc = derive2 { name="arc"; version="1.3"; sha256="0isfa7d26jpj004lf4f06krbfa68zyzrh5431xa63k2dykvg8c5j"; depends=[arules discretization Matrix R_utils]; }; archdata = derive2 { name="archdata"; version="1.2-1"; sha256="1dahfl9xdnqiwzdrff98x23k1dl19sfdqnv7jlg1xzgvhj1fhk0d"; depends=[]; }; - archeofrag = derive2 { name="archeofrag"; version="0.7"; sha256="15bz2czjxiw0q46sbalfcqk3jacpf4zcaa8x8d6jvbsf4hib6i28"; depends=[igraph RBGL]; }; + archeofrag = derive2 { name="archeofrag"; version="0.8"; sha256="148fhivihph2sg1wmdzw6ls1i3z28phywp4nvl0dsr00y09vsh4k"; depends=[igraph RBGL]; }; 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.3"; sha256="0nrd8b5q0fjyrayn9lh5hznr40gjfb6a9z92zvh5sp3w4b0qdj8v"; depends=[cli cpp11 glue rlang tibble]; }; - archiveRetriever = derive2 { name="archiveRetriever"; version="0.1.0"; sha256="1pfq63db0g818vavf9syf2psqvj7xk9n243hqilf21ijgqwfh165"; depends=[anytime dplyr ggplot2 gridExtra httr jsonlite lubridate rvest stringr tibble tidyr xml2]; }; + archive = derive2 { name="archive"; version="1.1.4"; sha256="1bhw3k1fwvvvacgsz1qgzc513lsz3y62cnvnvgabl6aqpn6fs29n"; depends=[cli cpp11 glue rlang tibble]; }; + archiveRetriever = derive2 { name="archiveRetriever"; version="0.1.1"; sha256="0vm2nncf98vhdv5yq8k66z9bffpxq9hck11r09dmcls997h2p27x"; 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]; }; - arcpullr = derive2 { name="arcpullr"; version="0.2.1"; sha256="12gr2q5ipm20clbpv1snhfff9cp2dr60m3mv0s4iibipv7fhpl4s"; depends=[dplyr ggplot2 httr jsonlite raster rlang sf tidyr]; }; + arcpullr = derive2 { name="arcpullr"; version="0.2.3"; sha256="1g0038pc20nq4wj6ra0vjdynvlkqv95x33ncvrmi4pfa7wbsgh4x"; depends=[bslib dplyr DT ggplot2 httr jsonlite raster rgdal rlang sf tidyr]; }; arctools = derive2 { name="arctools"; version="1.1.4"; sha256="0ldhmv2fs3gi5v5d36y8i1mbw3w4vf2h8f7avlk5zgywn46j75zf"; depends=[lubridate runstats]; }; areabiplot = derive2 { name="areabiplot"; version="1.0.0"; sha256="0izgvlg174jbr3fm3qc8zh23kfs7hn9bwd40x6vm90iivrrgdcp7"; depends=[nipals]; }; areal = derive2 { name="areal"; version="0.1.7"; sha256="1kdnf7c21g51mhf428nl5jl96cfrk5iw1npzp5rv5ys3jp2mvhhi"; depends=[dplyr glue purrr rlang sf]; }; @@ -6035,7 +6100,7 @@ in with self; { arenar = derive2 { name="arenar"; version="0.2.0"; sha256="08b865v7ringqzm5m4ib4nrmlyqywir6bjj7alzmg06dy7mrl9s7"; depends=[auditor DALEX fairmodels gistr iBreakDown ingredients jsonlite plumber]; }; arfima = derive2 { name="arfima"; version="1.7-0"; sha256="0kj8qv6m2fcdw8x735n8fk9cynm0jxi5v9hif0f879sxk6qkxb9y"; depends=[ltsa]; }; argo = derive2 { name="argo"; version="3.0.1"; sha256="1q7gbyk2f8vimwzdmd1mfqyaql2gyawywilwzs6g1716gbk3gd80"; depends=[boot glmnet Matrix XML xtable xts zoo]; }; - argoFloats = derive2 { name="argoFloats"; version="1.0.3"; sha256="085bw6jwm73yryibd5znzs4a0qf1f9w2iha15kkpx517y4z71pgn"; depends=[oce]; }; + argoFloats = derive2 { name="argoFloats"; version="1.0.4"; sha256="0n3c7gs5991fv6ypiagyxb0kzrbv80r7z0kspzbsp8ss04q2ymgc"; depends=[oce]; }; argon2 = derive2 { name="argon2"; version="0.4-0"; sha256="09hzl0wz0lw2v7g64rdv0lij2hq36zl37a6rmxwvinmjdzijcsyw"; depends=[]; }; 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]; }; @@ -6045,7 +6110,7 @@ in with self; { ari = derive2 { name="ari"; version="0.3.5"; sha256="03w99c918jp23d0kl26vx4m7xjicpgwl5rhn9d0fsm4kvv7j87li"; depends=[hms progress purrr rmarkdown rvest text2speech tuneR webshot xml2]; }; ariExtra = derive2 { name="ariExtra"; version="0.3.1"; sha256="1j8x2m9799i5kxrvsf2cjrffb5p6r4zjrr0khsy4i22xn7kyl8nf"; depends=[ari docxtractr httr jsonlite magrittr mime pdftools rmarkdown rvest text2speech tuneR xml2 yaml]; }; aricode = derive2 { name="aricode"; version="1.0.0"; sha256="0i6vynhby4sjiaxscjrgrb5d96f307yjr8r9ff1fhv264lydcqwl"; depends=[Matrix Rcpp]; }; - arkdb = derive2 { name="arkdb"; version="0.0.14"; sha256="1ih85bc9yz3a9j4k5dgfv7mg907mxj839f4g0w8fdrny0j11dnfg"; depends=[DBI]; }; + arkdb = derive2 { name="arkdb"; version="0.0.15"; sha256="0gbhqkfdivb1b6pw7w7xiypd305kwawdgswb87pq9jld0h0dwzlp"; depends=[DBI]; }; arkhe = derive2 { name="arkhe"; version="0.4.0"; sha256="15dvkbixkxlayd9kwv03y8bx2kvhaiv1sb2s7xgcv9kqf43zankf"; depends=[]; }; arm = derive2 { name="arm"; version="1.12-2"; sha256="0pagrc1vkaz460d0lvrgb4xj6gcd920f4mrc8zpzw07c3v1s2sw1"; 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]; }; @@ -6059,12 +6124,12 @@ in with self; { arrApply = derive2 { name="arrApply"; version="2.1"; sha256="0qy7iwi580rrf3sycsbv6qgxsqcdy9pdbnkdrx81j68qni9iw737"; 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="6.0.1"; sha256="14fghz9xijcrck0c65crvfidgyhgzy9b2apwmg7qrgn2sy09xm0p"; depends=[assertthat bit64 purrr R6 rlang tidyselect vctrs]; }; + arrow = derive2 { name="arrow"; version="7.0.0"; sha256="1s9h2aw6iig45nz2rfk13qbp0qydx6cc4r6qs58f9cm9vgwsg76l"; depends=[assertthat bit64 cpp11 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]; }; - arules = derive2 { name="arules"; version="1.7-2"; sha256="16fk4j1pl8yycf9lbvgf10d7iwpsvwpncb7v8sx1dkfsh2a4kw7b"; depends=[generics Matrix]; }; + arules = derive2 { name="arules"; version="1.7-3"; sha256="05g6ik4z87g83nlicmb380331f84sqchvv1vch49zb7rq6v8gw6r"; depends=[generics Matrix]; }; arulesCBA = derive2 { name="arulesCBA"; version="1.2.1"; sha256="1lsy1h37rb3jinh26d668z1v04rh5m1gkfhl3wfkg546hbpq4644"; 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-25"; sha256="0vd5fgi1b45kgfm5yi9ygaxm0sb8qarz5lsknwh5gla3h0k7l66b"; depends=[arules]; }; @@ -6081,14 +6146,15 @@ 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-47"; sha256="1rqb5j30ylaf1h4l66x4jxyn5inrvhc42d90qd5mgkxsq0ghdlr4"; depends=[etrunct invgamma Matrix mixsqp Rcpp SQUAREM truncnorm]; }; - asht = derive2 { name="asht"; version="0.9.6"; sha256="0zi0v7v7ivis5v6a8m1vh21c1wymshxcb948amgrq1j6svm505sf"; depends=[bpcp coin exact2x2 exactci perm ssanv]; }; + ashr = derive2 { name="ashr"; version="2.2-54"; sha256="177xs3apnc6yy6737qqv4z8snf0hkpbghab63hrplbyb9wfssfga"; depends=[etrunct invgamma Matrix mixsqp Rcpp SQUAREM truncnorm]; }; + asht = derive2 { name="asht"; version="0.9.7"; sha256="15sd6hvg41z1bvv1003p0hmy4350if67wqp124nfz0m6ix0xb7lw"; depends=[bpcp coin exact2x2 exactci perm ssanv]; }; askpass = derive2 { name="askpass"; version="1.1"; sha256="07q0ik8jzk44vpwh48rr3fnpd7dzsdhjjsl4l850rffv3dyq4h6v"; depends=[sys]; }; aslib = derive2 { name="aslib"; version="0.1.1"; sha256="0vzrxxj298skgv6gn9cbhr75ywmh5amsk9m02zncl20jcydf9j91"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; }; asnipe = derive2 { name="asnipe"; version="1.1.16"; sha256="0ky4v85gry8r265z8p7mi9kzq6j3s032jg4wddkzjjqgxzyzjl5y"; depends=[MASS Matrix]; }; aspect = derive2 { name="aspect"; version="1.0-5"; sha256="0pbc0daxw20xcbgqyyd5gbs9kmbaf2dq8ajllx0mnfwdcak9jfgj"; depends=[]; }; aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; }; asremlPlus = derive2 { name="asremlPlus"; version="4.3-31"; sha256="07wljbi1j1g8g3w5shz2n3945ixap75hvx114rbi8313iwmfr3xw"; depends=[dae doParallel dplyr foreach ggplot2 RColorBrewer reshape sticky stringr]; }; + assemblerr = derive2 { name="assemblerr"; version="0.1.1"; sha256="12kwdp71bgbk67d4038j2bhbw9ja3vqm0m01bzdsrpk4dxh2p3d3"; depends=[cli glue magrittr purrr rlang tidyselect vctrs]; }; 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]; }; assertive = derive2 { name="assertive"; version="0.3-6"; sha256="02palil82idqhhshcdjsfsja9qkqnd0dczqzj5gbccy4hfg1c0y4"; depends=[assertive_base assertive_code assertive_data assertive_data_uk assertive_data_us assertive_datetimes assertive_files assertive_matrices assertive_models assertive_numbers assertive_properties assertive_reflection assertive_sets assertive_strings assertive_types knitr]; }; @@ -6110,11 +6176,11 @@ in with self; { assertr = derive2 { name="assertr"; version="2.8"; sha256="00764vv86r3bn4r85in4w637harffyw605fgq0dj6mrbrwcfb650"; 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.1.1"; sha256="10494lg0ph5c4ks2z2ndajx3fiwv2my4i32jg89l0z0dxgfaz7lf"; depends=[maptools mvnfast raster rgdal rlang sp]; }; + assignR = derive2 { name="assignR"; version="2.2.0"; sha256="0bz45d9j6d4xq8bdqzv5g063ail38k1j2xmpd88nzj448ch3kcig"; depends=[geosphere maptools mvnfast raster rgdal rlang sp]; }; assist = derive2 { name="assist"; version="3.1.7"; sha256="0avxaa3v4gvb5d7fg761f9l5nr8nyqdq6sq408zpyaki6s6q3acf"; depends=[lattice nlme]; }; assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; }; assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; }; - asteRisk = derive2 { name="asteRisk"; version="1.2.0"; sha256="11vldhydpx75bc6m3lfl42i9k8mk55famrad48znaqb8r8y44rai"; depends=[deSolve nanotime]; }; + asteRisk = derive2 { name="asteRisk"; version="1.4.0"; sha256="0sph8jjayrgq0gl6n8hlhxpi4xv5bk2h2g47xx1jajihgkh88wgm"; depends=[deSolve nanotime onion Rcpp RcppParallel]; }; 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.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; }; @@ -6131,12 +6197,12 @@ in with self; { asymptor = derive2 { name="asymptor"; version="1.0"; sha256="0fdib7wnfdb0vjflds68638wafw79i0wvwa5ak8q3f7ywawzngzx"; depends=[]; }; asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; }; ata = derive2 { name="ata"; version="1.1.1"; sha256="08wcnfkbcq2al5ivdjkrjr8alaz0026992ra3ihyw6sd74mcracx"; depends=[lpSolve]; }; - atable = derive2 { name="atable"; version="0.1.10"; sha256="1jbpqsyhkkpiwnhwy9alh5s8q68amh0mylyzlc5pilpw0mnq9cjd"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; }; + atable = derive2 { name="atable"; version="0.1.11"; sha256="0xna86l26f00n22hm3fn7kiqij87k6k7b5pa8jmld1bhw6j3cl4w"; 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]; }; atlas = derive2 { name="atlas"; version="1.0.0"; sha256="02wm22j40llmdi6z3rzgbc5fpkzmjfq0xar33bypvj1dx1zxygnd"; depends=[httr testthat]; }; atmcmc = derive2 { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; }; atmopt = derive2 { name="atmopt"; version="0.1.0"; sha256="1h79ngq1236gz4w29fs3nj46a3m1x8a28z3xnhc6wn3a46cf8zzi"; depends=[DoE_base gtools hierNet]; }; - atom4R = derive2 { name="atom4R"; version="0.1"; sha256="1z1b5nl4cd6dla74n3afr556mbjhk1dl7lfxy9rikf0si4dwzay4"; depends=[httr jsonlite keyring R6 rdflib XML zip]; }; + atom4R = derive2 { name="atom4R"; version="0.1-2"; sha256="19wv79gy2n0fxi1djlhcswggr43na42qqhpw60q5s1zaiqcfc3k9"; depends=[httr jsonlite keyring R6 rdflib XML zip]; }; atsd = derive2 { name="atsd"; version="1.2.0"; sha256="0jan8r5f2r3l2xpdf9rrv4smkr2l645rfdgdfjb1xa54jd3pqvqs"; depends=[httr RCurl]; }; attachment = derive2 { name="attachment"; version="0.2.4"; sha256="1nvq94l544rgddx5jcvwhap7qz8h292pphvb97ip6jljgjc1dlqw"; depends=[desc glue knitr magrittr rmarkdown roxygen2 stringr]; }; attempt = derive2 { name="attempt"; version="0.3.1"; sha256="1ylgg7jcp8wqmxgf1mydnvh26k0mr8jyjla4hw06730r40yrs58m"; depends=[rlang]; }; @@ -6152,11 +6218,13 @@ in with self; { 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="1.0.1"; sha256="06r9gn3rdqxln197iyajdsx8ikq0m2hik171403y3dxxr5bf8jsf"; depends=[abind fANCOVA ggplot2 imputeTS lubridate modeest moments narray purrr rBayesianOptimization readr scales stringr tictoc xgboost]; }; + audubon = derive2 { name="audubon"; version="0.1.1"; sha256="14p07cxswgsdsmblwid9m5nmr0qr00cficg50qlb53fal8n1fajq"; depends=[dplyr magrittr 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.5"; sha256="1bfb1jqakghf1nb3zwzf69cywwxwr1whzvyig8g3qa8ciq5f1h3i"; depends=[dplyr emmeans flextable ggplot2 mathjaxr moments multcomp multcompView officer Rdpack reshape2 stringi]; }; auk = derive2 { name="auk"; version="0.5.1"; sha256="0mf2rwf7sihmk6mla87gznh0s1rqxpijcjjv035iq3id6c81h03l"; depends=[assertthat countrycode dplyr httr magrittr readr rlang stringi stringr tidyr]; }; + aum = derive2 { name="aum"; version="2022.2.7"; sha256="0a2nh1fnn7z4c592gj280w8yb54wi8msfdmg8gzbz52m1x3pxbi0"; depends=[data_table Rcpp]; }; aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; }; - aurin = derive2 { name="aurin"; version="0.5.1"; sha256="1yhpygjk0c3wz5wg5pfqba3r189xnd6h06rlb9042dzkfq18dlfp"; depends=[checkmate cli glue httr jsonlite magrittr ows4R R6 sf stringr]; }; + aurin = derive2 { name="aurin"; version="0.6.0"; sha256="0nh6jy0pkwfxzcxz1xcdcnqd9pkrddmdmfb2pjalfmp04z66h6dv"; depends=[checkmate cli glue httr jsonlite magrittr ows4R R6 sf stringr]; }; ausplotsR = derive2 { name="ausplotsR"; version="1.2.7"; sha256="0vlldbdbgplk6a9n2xkac8i5nxf0y2p4zbrw5q9a3qc71zfl33yj"; depends=[betapart curl ggplot2 gtools httr jose jsonlite mapdata maps maptools plyr R_utils sp vegan]; }; auth0 = derive2 { name="auth0"; version="0.2.1"; sha256="077nqh28q3b9jb25fy0157l06zpx3x0rg4z5dz2dqsh88xy4nhqj"; depends=[htmltools httr shiny shinyjs yaml]; }; auto_pca = derive2 { name="auto.pca"; version="0.3"; sha256="01m2ldpcxzj7fhgmr9wp4ha3gqdyh7l5bkrnw83smcbq5229hsyy"; depends=[plyr psych]; }; @@ -6165,7 +6233,9 @@ in with self; { autoFC = derive2 { name="autoFC"; version="0.1.2"; sha256="1hxpmd753qpzlyjivn37m1kij3gpp9x6xyw1x6090h9n4girnya2"; depends=[irrCAC]; }; autoFRK = derive2 { name="autoFRK"; version="1.4.3"; sha256="1k3h2gsck06dnvrifg9rhxi6b3fwfjrkvg0q2wzb9kdnnzgiwcln"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS mgcv Rcpp RcppEigen RcppParallel RSpectra spam]; }; autoMFA = derive2 { name="autoMFA"; version="1.0.0"; sha256="1sbcl38cq7y7hln1qffk5s71xgg9hs7dlwyvynqf96z2z2421pw4"; depends=[abind expm MASS Matrix pracma Rdpack Rfast usethis]; }; - autoMrP = derive2 { name="autoMrP"; version="0.99"; sha256="13rg5v7ivyqzrvlw7zvhxily667sin9ir87g9bdz09lcpcjybnqg"; depends=[doParallel doRNG dplyr e1071 EBMAforecast foreach gbm ggplot2 glmmLasso knitr lme4 purrr rlang tibble tidyr]; }; + autoMrP = derive2 { name="autoMrP"; version="1.0.1"; sha256="1ipqzjd9knpyz2ajxw38z8sbg4w4cgyg6627xlyx8i14wbdgrxmy"; depends=[doParallel doRNG dplyr e1071 EBMAforecast forcats foreach gbm ggplot2 glmmLasso knitr lme4 purrr R_rsp rlang tibble tidyr]; }; + autoRasch = derive2 { name="autoRasch"; version="0.1.5"; sha256="16xwh8v6p3ympn0xljb7d77n04g31gcppv8v39p96yfc9vaxkhsw"; depends=[doParallel foreach lavaan Rcpp RcppArmadillo]; }; + autoReg = derive2 { name="autoReg"; version="0.1.0"; sha256="1c5b02jxfsjk9byyj5z5491lv7dbzx2hp3kwbjcy0wvpz7wg1gnc"; depends=[boot broom cmprsk dplyr flextable ggplot2 mice moonBook nortest officer patchwork purrr rlang stringr survival tidyr tidyselect]; }; 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]; }; @@ -6179,10 +6249,10 @@ in with self; { automl = derive2 { name="automl"; version="1.3.2"; sha256="1nrg8q3y6rv69nmnsylg8rps4b4prx46j5a8ljlr24yc34504ck3"; depends=[]; }; autoplotly = derive2 { name="autoplotly"; version="0.1.4"; sha256="1z577jvadgiz028z7x0786d3qhlkrvv9i34xmllizvg94kxv3bl1"; depends=[ggfortify ggplot2 plotly]; }; autoshiny = derive2 { name="autoshiny"; version="0.0.2"; sha256="0s06ynnirgsh19x8qq4020piirkhvjqpvz372syygvlal062y6cn"; depends=[shiny]; }; - autostats = derive2 { name="autostats"; version="0.2.0"; sha256="0w2ca0lxbcjgvvd9zz7ym7bnfdp94kjk72igq7v93l6hq2s681jr"; depends=[agtboost BBmisc broom broom_mixed Ckmeans_1d_dp dials dplyr flextable forcats framecleaner ggeasy ggplot2 ggstance ggthemes glmnet gtools hardhat janitor jtools lubridate magrittr Matrix nnet parsnip party patchwork presenter purrr readr recipes rlang rlist rsample stringr tibble tidyr tidyselect tune workflows xgboost yardstick]; }; - autostsm = derive2 { name="autostsm"; version="2.1"; sha256="138fcfq75zrpbxprgy9wn3w8f5sxlbmsxbsfdh5ivsadl8j9i8sw"; depends=[data_table doSNOW foreach forecast ggplot2 ggrepel gridExtra lmtest lubridate maxLik progress Rcpp RcppArmadillo sandwich strucchange]; }; + autostats = derive2 { name="autostats"; version="0.3.0"; sha256="11girpxlqfvxwp7356yjin8gyxw5mj64yr1gpj35ljc7ycx6j1kz"; depends=[agtboost BBmisc broom broom_mixed Ckmeans_1d_dp data_table dials dplyr flextable FOCI forcats framecleaner ggeasy ggplot2 ggstance ggthemes glmnet gtools hardhat janitor jtools lubridate magrittr Matrix nnet parsnip party patchwork presenter purrr readr recipes rlang rlist rsample stringr tibble tidyr tidyselect tune workflows xgboost XICOR yardstick]; }; + autostsm = derive2 { name="autostsm"; version="3.0.0"; sha256="1pv8pfj0wmfrxng2a3vkq0asa1dld4ibz5px4hkk0pfkkqvwg8m3"; depends=[data_table doSNOW foreach forecast ggplot2 ggrepel gridExtra lmtest lubridate maxLik progress Rcpp RcppArmadillo sandwich strucchange]; }; autothresholdr = derive2 { name="autothresholdr"; version="1.4.0"; sha256="1n8kfl7zk7smwmkj1rlp4j4i0jnwi2f0aw58jhlf7ivahrq0rmnk"; depends=[checkmate ijtiff magrittr purrr Rcpp rlang strex stringr]; }; - av = derive2 { name="av"; version="0.6.0"; sha256="0g6815y24h4la714a5bkj7nj4n39jycfynkli6y3jlijql96j2il"; depends=[]; }; + av = derive2 { name="av"; version="0.7.0"; sha256="004crdrsgh2dak64zmr5w0pj94vpalgmb76g1cb452djavbp7rxl"; depends=[]; }; available = derive2 { name="available"; version="1.0.5"; sha256="1mlyzmfskam3d0mnr5hncxi2jhc5lhny1ynvxvbnx15vj8f6r7y5"; depends=[cli clisymbols crayon desc glue jsonlite memoise SnowballC stringdist tibble tidytext udapi yesno]; }; avar = derive2 { name="avar"; version="0.1.1"; sha256="1i0bk3y0ca58ihwn4di8rpkp5vs2j5b80rcvaf72n9h2hp8i2ncz"; depends=[Rcpp RcppArmadillo simts]; }; averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; }; @@ -6193,7 +6263,7 @@ in with self; { aws_alexa = derive2 { name="aws.alexa"; version="0.1.8"; sha256="0m1i1xgi9fqixq90ai2ag0079aa75nlyhbr3ln3yhk5g8zx9i9m9"; depends=[aws_signature dplyr httr xml2]; }; aws_comprehend = derive2 { name="aws.comprehend"; version="0.2.1"; sha256="0qn4mkdd17c8kmrm4ml7l1x3rzaw3gbykhrj3m0ga53crcqdhqri"; depends=[aws_signature httr jsonlite]; }; aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.2.0"; sha256="1lbljg2fp3yh1hwlbmprkc1prw80jv0ycvpg1vggagm68wm5x288"; depends=[curl jsonlite]; }; - aws_ecx = derive2 { name="aws.ecx"; version="1.0.4"; sha256="04g6q5c7sxp15756saij5pivdvsznpbdwic32pvk1cw704kq88iz"; depends=[aws_signature httr rjson xml2]; }; + aws_ecx = derive2 { name="aws.ecx"; version="1.0.5"; sha256="1yz20h2k5rf13jsgpk8aj6d27a1zj602g916pngq525m08cmbvka"; depends=[aws_signature httr rjson xml2]; }; aws_iam = derive2 { name="aws.iam"; version="0.1.8"; sha256="1p4w50icfw6mrzr6aazdbh977yvyvsf1yavjscyvv11xf3y9f9j2"; depends=[aws_signature httr jsonlite xml2]; }; aws_kms = derive2 { name="aws.kms"; version="0.1.4"; sha256="0f9l62g4z68ickzi4if3pw3algb41rn47z9cpxga8aggkclk86l4"; depends=[aws_signature base64enc httr jsonlite]; }; aws_lambda = derive2 { name="aws.lambda"; version="0.2.0"; sha256="0vp13qw7mw8dz01q30z7bnj47qx9js1zmxasc2n733gi07fdj62f"; depends=[aws_signature base64enc httr jsonlite]; }; @@ -6210,9 +6280,9 @@ in with self; { bRacatus = derive2 { name="bRacatus"; version="1.0.7"; sha256="1xzrwmd6wj5c1nqrg7wry4zjq2np010dzilg631vgf7f7vg9ch94"; 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="1.6.6"; sha256="1m5spafvl5pn0s60vaf8wz7iaibsa7laq7kp8y9xj20pp3f76hvr"; depends=[Rcpp]; }; + bWGR = derive2 { name="bWGR"; version="2.0"; sha256="16yhy6gnjkgrlj41mszfadzvb83c8l4wa5gvlvzlm7cdrdrp33p0"; depends=[Matrix Rcpp RcppEigen]; }; baRcodeR = derive2 { name="baRcodeR"; version="0.1.5"; sha256="1fdywv7mvxx3q8pildsfllmw814f2p71xcwvfmplngv2vgrpzz9w"; depends=[DT miniUI qrcode rstudioapi shiny]; }; - baRulho = derive2 { name="baRulho"; version="1.0.5"; sha256="0419nfhk5846ysc5p3dnlzfc1q5nsksgpwbjcif23fk4w13c7b9x"; depends=[fftw pbapply seewave tuneR warbleR]; }; + baRulho = derive2 { name="baRulho"; version="1.0.6"; sha256="17g3xs0lxdpbbi52x27r00vfdgxdhjblyy939scm3c5z01fhxxnb"; depends=[fftw pbapply seewave tuneR warbleR]; }; babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; }; babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; }; babelgene = derive2 { name="babelgene"; version="21.4"; sha256="1gk5pm3b3shr1id66a11ywc1b823gbj8yckg24szzfhj8g4ixyf0"; depends=[dplyr rlang]; }; @@ -6228,15 +6298,15 @@ in with self; { backtest = derive2 { name="backtest"; version="0.3-4"; sha256="1s0mf247dz2vvyf4m3sp9xiqhv7xcs4rphyg9gdcy73060sah2ad"; depends=[lattice]; }; bacondecomp = derive2 { name="bacondecomp"; version="0.1.1"; sha256="1sd6pbhmx8vxz5c2cvvadbjy7p15y91gzs3n0ish7h5br1vq8fpm"; depends=[]; }; bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; }; - badgecreatr = derive2 { name="badgecreatr"; version="0.2.0"; sha256="0mdixklaxky5gs8zm99ky280vxxlbq1mxnaarq6x0d1cb71bzv4l"; depends=[git2r]; }; badger = derive2 { name="badger"; version="0.1.0"; sha256="09g8183dz58546mcql7fs2px71ycpi2jfw69zca9d96c9py98ryn"; depends=[desc dlstats rvcheck usethis]; }; bagged_outliertrees = derive2 { name="bagged.outliertrees"; version="1.0.0"; sha256="0fcd54j6vci2yvlb609dck4pwbn54irkdk472cjc965rcw6dz9z7"; depends=[data_table doSNOW dplyr foreach outliertree rlist]; }; baggedcv = derive2 { name="baggedcv"; version="1.0"; sha256="1rqs4sm6g1anck5s2dxlm1vcmylpphcbs2dpvf1sjki5lrzdq9z4"; depends=[doParallel foreach kedd mclust]; }; baggingbwsel = derive2 { name="baggingbwsel"; version="1.0"; sha256="0khvkxml4nwkahgl5ijdv0bjgwabmznzq99p71iw26ck808hafkl"; depends=[doParallel foreach kedd mclust misc3d nor1mix Rcpp rgl rpanel sm tkrplot]; }; baggr = derive2 { name="baggr"; version="0.6.18"; sha256="0qmsg3w6blpj9nlk0blzlm7l04z4r33gw17r6n52l2wf8x0giirx"; depends=[bayesplot BH crayon forestplot ggplot2 gridExtra Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders testthat]; }; - baguette = derive2 { name="baguette"; version="0.1.1"; sha256="0srvvnyhi22r3l8j996zpq8mm140imdrijc0xhb8j9qgkqaia1b7"; depends=[butcher C50 dials dplyr earth furrr generics hardhat magrittr parsnip purrr rlang rpart rsample tibble tidyr withr]; }; + baguette = derive2 { name="baguette"; version="0.2.0"; sha256="0ik19w7cgbzp4n4f9v1s7sf668m45sqfw4m4ny7mbfjdq53iag28"; 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]; }; + 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]; }; bama = derive2 { name="bama"; version="1.2"; sha256="1amxls4jl2ys5wkn600xmx0y3d9zhkz2s96vn7h8fnrrv35212yp"; depends=[BH Rcpp RcppArmadillo RcppDist]; }; bamboo = derive2 { name="bamboo"; version="0.9.25"; sha256="1il8sn8ck36b1m9hazhf6gmr58iqi2hjn0rrpcv1laij0lybrcws"; depends=[rscala]; }; bamdit = derive2 { name="bamdit"; version="3.3.2"; sha256="11v9hy8ijbcqhwim0s3y69dz11jvys4vjvfnshj4p5qdz38sji6l"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; }; @@ -6247,7 +6317,6 @@ in with self; { bannerCommenter = derive2 { name="bannerCommenter"; version="1.0.0"; sha256="1i0b3v4n0xylcbrg9i3a28z037m27vjfg61xz2hl99wavn0bsl1j"; depends=[]; }; banter = derive2 { name="banter"; version="0.9.4"; sha256="076jjgfw193bzmymqgsgg4fppd2zvwskjw9b3zxzybnydyz7shfi"; depends=[dplyr ggplot2 gridExtra magrittr randomForest rfPermute rlang swfscMisc tibble tidyr]; }; banxicoR = derive2 { name="banxicoR"; version="0.9.0"; sha256="0vchm2hnqm45fhn8k38rcam4vkazmifcl40390s2r04bgvqr0pnl"; depends=[rvest stringr xml2]; }; - bapred = derive2 { name="bapred"; version="1.0"; sha256="08kvc4cc984jv08ikwbja8zxidrcdiwi5w88hlqakbm8yc6hzssa"; depends=[affy affyPLM Biobase FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; }; barcode = derive2 { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; }; bardr = derive2 { name="bardr"; version="0.0.9"; sha256="02499b3j10j7qq3whz9qijfp3amp0s1ji8qk76c53dsnkj8f9hvs"; depends=[]; }; barplot3d = derive2 { name="barplot3d"; version="1.0.1"; sha256="182kpiknv3id1bsgcc6b3ahbxmm8x3lxcpf1r6rckpr3s0whfx3g"; depends=[rgl]; }; @@ -6261,10 +6330,10 @@ 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]; }; - basecamb = derive2 { name="basecamb"; version="1.0.4"; sha256="02sak07dfiiwn55fnv9b48gm2y25kqg6xrlj5zipapg3nffdgyxi"; depends=[assertive_types assertthat dplyr Hmisc mice purrr]; }; - basedosdados = derive2 { name="basedosdados"; version="0.1.0"; sha256="0igk1mdq1ibv3r5cfyd976vn2rylcz45ghl8z1hgkqbhp8b0wav3"; depends=[bigrquery cli DBI dbplyr dotenv dplyr fs glue googleAuthR httr magrittr purrr readr rlang scales stringr tibble writexl]; }; + basecamb = derive2 { name="basecamb"; version="1.1.0"; sha256="02svxz0mlk2r4s0g8lizcwmp9nhbwgp6q3c9p9pmsf1nry4j3lbf"; depends=[assertive_types assertthat dplyr Hmisc mice purrr survival]; }; + basedosdados = derive2 { name="basedosdados"; version="0.2.0"; sha256="0hv6gv49bcs6fyqvk4kzvh4q33lbbn1mahrqc4vg2da0jr431vmx"; depends=[bigrquery cli DBI dbplyr dotenv dplyr fs glue googleAuthR httr magrittr purrr Rcpp readr rlang scales stringr tibble typed writexl xml2]; }; baseflow = derive2 { name="baseflow"; version="0.13.2"; sha256="02ygx32dfszk66f33wfszkvwi51v8zw2s45y9nlrgfws9rlpzll2"; depends=[airGR]; }; - basefun = derive2 { name="basefun"; version="1.1-1"; sha256="1bn32bxk36h4xy7q1wq522cw7dd1b4zixzzp04fsg2w692044vkh"; depends=[Matrix orthopolynom polynom variables]; }; + basefun = derive2 { name="basefun"; version="1.1-2"; sha256="02jrjxkzg5pzw73kzypdazqjrg8azhbv09157j3px3d2331qiy9d"; depends=[Matrix orthopolynom polynom variables]; }; baseline = derive2 { name="baseline"; version="1.3-1"; sha256="1spmp8z0hrb6db0r52i16524cp9zy1d1hr4y3b3i9q38m1iskpms"; depends=[limSolve SparseM]; }; basemaps = derive2 { name="basemaps"; version="0.0.1"; sha256="15fgk5x9n8nfmhclydwaypzqv5dl6s1r9v40ahdnpc50y5p8zjay"; depends=[curl httr magick pbapply raster sf slippymath stars]; }; basetheme = derive2 { name="basetheme"; version="0.1.2"; sha256="0yck4qc7qd406s7kw95xgnfc0pfvzk3ylhkv6mk6l2wbkfm8ldrb"; depends=[]; }; @@ -6291,7 +6360,7 @@ in with self; { bayes4psy = derive2 { name="bayes4psy"; version="1.2.8"; sha256="0fmp88mrnmx4langd014l6jf06zmvwhclw4k0aw88v996hzv76bx"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen reshape rstan rstantools scales 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.5"; sha256="13wd83qwv7qi8v6nb7sn18hdcb11cpd2qr6js6kzsx65p08cmz2a"; depends=[ggplot2 MCMCpack Rcpp RcppArmadillo survival]; }; + bayesDP = derive2 { name="bayesDP"; version="1.3.6"; sha256="0li063187icw96shrbawfa00vkb42m5y38a4j2aahryajjlsva57"; depends=[ggplot2 MCMCpack Rcpp RcppArmadillo survival]; }; bayesDccGarch = derive2 { name="bayesDccGarch"; version="3.0.3"; sha256="0qgcy70sp3mlcpdkkg3nvxrvwgwy698r19yg31s3qjak17jnp8qn"; depends=[coda numDeriv]; }; bayesGAM = derive2 { name="bayesGAM"; version="0.0.1"; sha256="072q3kybnxjwc4s6qlww492cg43cr4zk6midyp5av7y3hnxbmqm8"; 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]; }; @@ -6313,15 +6382,14 @@ in with self; { 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]; }; 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.7"; sha256="0f53f1x9zcq33pwxxnsrzk5sm18dwc2ypz088mmg2z6qv7smfjg0"; depends=[brms dplyr parsnip purrr rlang tibble]; }; + bayesian = derive2 { name="bayesian"; version="0.0.8"; sha256="0ldmhw5m8j89j5spca6k8gc2n7v5qkyvm1zak3czkmngk07cciq4"; depends=[brms dplyr parsnip purrr rlang tibble]; }; bayesianETAS = derive2 { name="bayesianETAS"; version="1.0.3"; sha256="0nbif0b6lcik2kh948zg5ska5mvkdsfr0dg8ndnfpscm2mp7y1dg"; depends=[]; }; bayeslincom = derive2 { name="bayeslincom"; version="1.3.0"; sha256="0gk2ybp0m717kv986j91n5amfc282gdpcrjkq46gwzn0zhyxg8b8"; depends=[ggplot2]; }; bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; }; bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; }; bayesm = derive2 { name="bayesm"; version="3.1-4"; sha256="154glks7rsjkza0sfi1kj7wj727py9sl1ba6sswflwmwc9n226q6"; depends=[Rcpp RcppArmadillo]; }; - bayesmeta = derive2 { name="bayesmeta"; version="2.7"; sha256="1zl2y916jgl40mqzphgjwsqr4mbxvvggp0irirbb9nyzj5frqpjg"; depends=[forestplot metafor numDeriv]; }; + bayesmeta = derive2 { name="bayesmeta"; version="3.0"; sha256="035kjg86sfd3j8g9421id6z208rfmpk63qp0fpssv44zb96wy4wv"; depends=[forestplot metafor mvtnorm numDeriv]; }; bayesmix = derive2 { name="bayesmix"; version="0.7-5"; sha256="0s1a221vwia92pinja2r5b5abm4dhcrs81m4frqnf0522qh0y75f"; depends=[coda rjags]; }; - bayesmodels = derive2 { name="bayesmodels"; version="0.1.1"; sha256="1m9428fzirpfzypd2zdcqhjv2cm05s3qmlxj4ymz6i1dg32svqzr"; depends=[BASS bayesforecast brms bsts cli crayon dials dplyr magrittr modeltime parsnip purrr rlang Rlgt rstan rstudioapi tibble timetk workflows]; }; 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.0.2"; sha256="1ps00byg0s0wf86w9nq6yhn4ak1ca6gmkafz3bmycr4alxhgjdqr"; depends=[brms dplyr evaluate extraDistr formula_tools ggplot2 loo purrr rlang tidyr tidyselect]; }; bayesplay = derive2 { name="bayesplay"; version="0.9.2"; sha256="06i16a36b26p0r635bl37kvk7k083p970154yhkv80p7qc84n4sv"; depends=[gginnards]; }; @@ -6336,16 +6404,16 @@ in with self; { bayfoxr = derive2 { name="bayfoxr"; version="0.0.1"; sha256="1295296mbjpmd0bg1pfxvyp0az3sry6gsq9ir3l8x64w5a4qrzd5"; depends=[]; }; baymedr = derive2 { name="baymedr"; version="0.1.1"; sha256="0lsp9g9xjwwf2znh4vld41pgdn55ncvmdsyg84ifhdqzjrsgwc6f"; depends=[rlang stringr]; }; baystability = derive2 { name="baystability"; version="0.1.0"; sha256="1zv4bf5a4p21w2qpr6lcsgsxb0xv15v8p33031rsypmnbs9i80dp"; depends=[dplyr ggfortify ggplot2 lme4 magrittr MASS matrixStats reshape2 rlang rstiefel scales tibble tidyr tidyverse]; }; - baytrends = derive2 { name="baytrends"; version="2.0.5"; sha256="02cxb1iw6h0zj6f3qh52rndv50lvzkjbxnc7fqnkg022gximc201"; depends=[dataRetrieval digest lubridate memoise mgcv plyr survival]; }; + baytrends = derive2 { name="baytrends"; version="2.0.7"; sha256="1nzwj2k07w4yvgs1vf0mbsqyvyppx2mj6hqkcvb9npalsc8g9dm4"; depends=[dataRetrieval digest dplyr fitdistrplus knitr lubridate memoise mgcv pander plyr readxl sessioninfo survival]; }; bazar = derive2 { name="bazar"; version="1.0.11"; sha256="1q2w5pvlb51lzbb5k719sf1lrhffandkfqlcvi2prw4dmq7qjxv9"; depends=[kimisc]; }; bbdetection = derive2 { name="bbdetection"; version="1.0"; sha256="1j6xcbfsrg3wcr1rpddj7ia33szn5bs0wk4mzq42d761clsr5qq8"; depends=[ggplot2 Rcpp xtable zoo]; }; bbefkr = derive2 { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; }; bbemkr = derive2 { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; }; - bbl = derive2 { name="bbl"; version="0.4.1"; sha256="1iwljhs7mn6l6pvfrksdiq29f3d4cmhm079nbf4zpv5yq2rksdyq"; depends=[pROC RColorBrewer Rcpp]; }; + bbl = derive2 { name="bbl"; version="1.0.0"; sha256="135i619lliy93dvgb7ymrcdh20y2b1j7s0y6awzcs3w0hbyd8j5z"; depends=[pROC RColorBrewer Rcpp]; }; bbmle = derive2 { name="bbmle"; version="1.0.24"; sha256="1bck8rmink4wsk8pcbnj4d60svxymp29pxbzwj8p9gzsg42c1v81"; depends=[bdsmatrix lattice MASS Matrix mvtnorm numDeriv]; }; bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; }; - bbotk = derive2 { name="bbotk"; version="0.4.0"; sha256="09cw6z397laszsg5wsgpjh7jda74amqrcl2p25bgjg33ina2nvg7"; depends=[checkmate data_table lgr mlr3misc paradox R6]; }; - bbreg = derive2 { name="bbreg"; version="2.0.1"; sha256="0wixhqfw8yp37874zwqb4vwi9xrzlkb761lbw7h70bds0dy6jcg5"; depends=[expint Formula pbapply statmod]; }; + bbotk = derive2 { name="bbotk"; version="0.5.1"; sha256="1171vcs96j8f4n0rjsbbiscs4nxgd4209lr9biy99lvhjvjdsfsm"; depends=[checkmate data_table lgr mlr3misc paradox R6]; }; + bbreg = derive2 { name="bbreg"; version="2.0.2"; sha256="0mi2834v4cvrhvpnzkb4lgkqq993c3c1yzsxdnmny4p6yxw1q547"; depends=[expint Formula pbapply statmod]; }; bbricks = derive2 { name="bbricks"; version="0.1.4"; sha256="1hv4hvnns9vgl6c3n7kg3g9mfcp26ksps29hdl5nwi28cgkx80w2"; depends=[]; }; bbsBayes = derive2 { name="bbsBayes"; version="2.3.8.2020"; sha256="043wj15w7vb5xzwyrzfzf19n3iccly9mdw75lw176i3wfdnprhfv"; depends=[dplyr geofacet ggplot2 ggrepel jagsUI latticeExtra progress rappdirs rgdal sbtools sf stringr]; }; bbw = derive2 { name="bbw"; version="0.1.3"; sha256="1z3an561qh0rfi3jhh1ghsdbg8aimqmf4hpqri2jz39in3p0gwg4"; depends=[car]; }; @@ -6353,10 +6421,9 @@ in with self; { bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-5"; sha256="1jj7iag9azmxccc8a45vaxi6lw4jbfzj68wm0zdsggplgvzljn1f"; depends=[boot nnet Rcpp RcppArmadillo rgl]; }; bcTSNE = derive2 { name="bcTSNE"; version="0.11.1"; sha256="1j7aab9j30iypbjvid3dfg8rnz69i83k59ympkycv9k6xwpi330p"; depends=[RSpectra Rtsne splatter]; }; bcaboot = derive2 { name="bcaboot"; version="0.2-3"; sha256="0b1m4lwi9hwd4xswabzyy2svc91ppiym8bi9f1wj79w5sg2hxpn7"; depends=[]; }; - bcc = derive2 { name="bcc"; version="1.3.1"; sha256="0ac0wasdifd0v47r9sxrsix5hv7masiphn6dyxpqdrd11z7iimgz"; depends=[qcc]; }; bccp = derive2 { name="bccp"; version="0.5.0"; sha256="0g9yzqzf977rx97c77krdhl7c499r58xcbzx0nihk73143ynf17w"; depends=[pracma]; }; bcdata = derive2 { name="bcdata"; version="0.3.0"; sha256="13s8x7zr8650jzkjlripikha7sk4x70ld9pgxm057m2vqqplj8av"; depends=[cli crul DBI dbplyr dplyr glue jsonlite leaflet leaflet_extras purrr readr readxl rlang sf tibble tidyselect xml2]; }; - bcf = derive2 { name="bcf"; version="1.3"; sha256="1f8szjgsyhnff3zzmmy7bnsam12ywj46n3fxsj1y3fn1m5wnd8mz"; depends=[Rcpp RcppArmadillo]; }; + bcf = derive2 { name="bcf"; version="1.3.1"; sha256="04vjvzh8y1dfk6ms5zwbylbfalwngvyjbjcszx26v2fakdk990p7"; depends=[Rcpp RcppArmadillo]; }; bcfrailph = derive2 { name="bcfrailph"; version="0.1.0"; sha256="0l5v3bc8xw71cj012sbmq1f0glg7m545jzqyg01gzl8kbgm3lbbj"; depends=[survival]; }; bcfrailphdv = derive2 { name="bcfrailphdv"; version="0.1.0"; sha256="06xzz5m4s5fp36j3saxmpw1p0bhh42cjd35cadwkk3vg836kj1na"; depends=[bcfrailph survival]; }; bcgam = derive2 { name="bcgam"; version="1.0"; sha256="1dg2fcjw8xal77irviiz260qpar2iqkjvi2k4qfm71jyq0ir0axk"; depends=[coda igraph nimble]; }; @@ -6365,16 +6432,17 @@ in with self; { bcp = derive2 { name="bcp"; version="4.0.3"; sha256="0vhs89lb2wpanqsljclpvwbjmgdsc3jicws8bzqiqh8mbs3nzpxy"; depends=[Rcpp RcppArmadillo]; }; bcpa = derive2 { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; }; bcpmeta = derive2 { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; }; - bcputility = derive2 { name="bcputility"; version="0.2.0"; sha256="0aybhgi6pnl9xzx0gvinsj4g2gvnpxssar2v7imdz5yqsdvcw6yr"; depends=[data_table DBI odbc sf]; }; + bcputility = derive2 { name="bcputility"; version="0.3.0"; sha256="19yyc15d11k2az7ah4ql0m6w9iwc3h370r0ak2nmzldsjsajm8fd"; depends=[data_table DBI odbc sf]; }; bcrm = derive2 { name="bcrm"; version="0.5.4"; sha256="1j8bfa3x7h77vs41k4nqbqlb961szp1fkhc181wzb3zpbnzmjhhy"; depends=[ggplot2 knitr mvtnorm rlang]; }; bcrypt = derive2 { name="bcrypt"; version="1.1"; sha256="1wwdin8x09y8n8zrwj1ylh5ikcz0v0la4wmrsvbdr61cg336wzx4"; depends=[openssl]; }; bcv = derive2 { name="bcv"; version="1.0.1.4"; sha256="1iln1blr2sdjjv66g73jkj26h1kzfs2sfvw5k7b76mgc0703k45s"; depends=[]; }; bdDwC = derive2 { name="bdDwC"; version="0.1.15"; sha256="0yraq8a0wgz12rzi2dx0gdcz5rx99qd2pzw972wjqyq3rs41pwx0"; depends=[shiny shinyBS shinydashboard shinyFiles shinyjs]; }; bda = derive2 { name="bda"; version="15.2.5"; sha256="19m7xrsckw0lncmi0qsmy194f2c9lmi1vac37h9jfvkb3i30fx20"; depends=[boot]; }; + bdc = derive2 { name="bdc"; version="1.0.0"; sha256="1hpdkdhhfs3c0i7xv27jmhfq0yrj4mn64c725m468v9kxnqpqih9"; 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]; }; bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; }; - bdl = derive2 { name="bdl"; version="1.0.3"; sha256="1p33lx50789v2k2j3c95n5pzzgxrn3lb9w6a6kx710p8cbbdyfxp"; depends=[dplyr ggplot2 ggpubr httr jsonlite magrittr purrr randomcoloR sf tibble tidyr tmap tmaptools]; }; + bdl = derive2 { name="bdl"; version="1.0.4"; sha256="01z6kv2wv67byyw49smri8zvi6mhwr5i8li4yhk96rrdjf4xwpxp"; depends=[dplyr ggplot2 ggpubr httr jsonlite magrittr progress purrr randomcoloR sf tibble tidyr tmap tmaptools]; }; bdlp = derive2 { name="bdlp"; version="0.9-2"; sha256="14fxwgcn3g6k1cdimgfp6zmsgqi4s7sh6kapnls229qiin2nijjl"; depends=[DBI GenOrd MASS MultiOrd rgl RSQLite stringdist]; }; bdots = derive2 { name="bdots"; version="1.0.1"; sha256="014gxykqfh8lnbdz9w6ir8jsrb5bklgww4qhapzadym06n69c86x"; depends=[data_table mvtnorm nlme]; }; bdpar = derive2 { name="bdpar"; version="3.0.1"; sha256="05si6164gbnx6lbjyzd40zpg0q4hfhirzwa7ica9rbj8l73j6zpw"; depends=[digest R6 rlist]; }; @@ -6388,7 +6456,7 @@ in with self; { bdynsys = derive2 { name="bdynsys"; version="1.3"; sha256="07gfyp0qwq9y1cnh7lhcz7q0b1s51cjwlbpll50l2cza2dszmf29"; depends=[caTools deSolve Formula Hmisc MASS matrixStats plm pracma]; }; 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]; }; beadarrayFilter = derive2 { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[beadarray RColorBrewer]; }; - beadplexr = derive2 { name="beadplexr"; version="0.4.0"; sha256="0y5xrs88zm2bp2dlz8bndldispyj6ipgjr7vzrfl26yd2p7qjqd0"; depends=[cluster dplyr drc fpc ggplot2 magrittr mclust purrr raster rlang tibble tidyr yaml]; }; + beadplexr = derive2 { name="beadplexr"; version="0.4.1"; sha256="1n37qk4p2kgcrb2w4xmgnrgibjv0pdmlzd1y0c1z6njszg2livgz"; depends=[cluster dplyr drc fpc ggplot2 magrittr mclust purrr raster rlang tibble tidyr yaml]; }; beakr = derive2 { name="beakr"; version="0.4.3"; sha256="0l6475l5d58g5ahz4b3vrdlvl656p2rasni17gz4y1l2rd0pvvh4"; depends=[base64enc httpuv jsonlite magrittr mime R6 stringr webutils]; }; beam = derive2 { name="beam"; version="2.0.2"; sha256="17c7zww1160jxm0q6vb5h59zipjjfyc3pls30y5v4vyk7kr9rdvx"; depends=[assertthat BH fdrtool igraph knitr Matrix Rcpp RcppArmadillo]; }; beanplot = derive2 { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; }; @@ -6418,7 +6486,7 @@ in with self; { benford_analysis = derive2 { name="benford.analysis"; version="0.1.5"; sha256="0y0c7l2r9s7lg9bw4ndcqwisa5l6a2cpydn1vmz88h3yva0l68cg"; depends=[data_table]; }; bentcableAR = derive2 { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; }; benthos = derive2 { name="benthos"; version="1.3-6"; sha256="1vywnc6k37gpaq7g59v3qa6619svcmnd8ri5zm5l0ila2s3ccb2c"; depends=[dplyr lazyeval readr]; }; - berryFunctions = derive2 { name="berryFunctions"; version="1.20.1"; sha256="03kccwvkc5nwpyg97dsigmwgk8nwk4j9rpn2z8gc71pcf2b3ixyj"; depends=[abind]; }; + berryFunctions = derive2 { name="berryFunctions"; version="1.21.0"; sha256="0pzb9lsbls7jcyaj1vg9cqgdqc8gbjab83xlsbdi8w40zgsv85vf"; depends=[abind]; }; bestNormalize = derive2 { name="bestNormalize"; version="1.8.2"; sha256="0pbyn0ay43jcxssxgvivvfakcwq0y23c2qq6a01656q9lqbv9f1r"; depends=[butcher doParallel doRNG dplyr foreach 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]; }; @@ -6426,7 +6494,6 @@ in with self; { betaBayes = derive2 { name="betaBayes"; version="1.0"; sha256="15dp5dd0sw613xjkdfqw4iizfdagflp0qwykmng8ml6agwd21s4p"; depends=[betareg coda Rcpp RcppArmadillo]; }; betaboost = derive2 { name="betaboost"; version="1.0.1"; sha256="1zdyzxl2kp2i5lkiz280wz4av9wqklbn25zmq6n4yb6a579yjfn8"; depends=[gamboostLSS mboost]; }; betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; }; - betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; }; betafunctions = derive2 { name="betafunctions"; version="1.6.1"; sha256="051d4fryvcdfbsm087mxqlx247jz671wx5rffsffg828azj2mxh9"; depends=[]; }; betalink = derive2 { name="betalink"; version="2.2.1"; sha256="1wskr8nh1jzcrnc8fn58lscphsvj5z9p1i1pnpfdjn60mdb09rkp"; depends=[igraph plyr stringr]; }; betapart = derive2 { name="betapart"; version="1.5.4"; sha256="1m2rykch2vhh90s08s9s2kmmrxhp9ik32s5zkdw8991cbw2j7n68"; depends=[ape doSNOW fastmatch foreach geometry itertools picante rcdd snow]; }; @@ -6436,13 +6503,13 @@ in with self; { bethel = derive2 { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; }; bets_covid19 = derive2 { name="bets.covid19"; version="1.0.0"; sha256="1pqa6zpkkcmnm9a4m3676css0fi2lp4ik6mmhfhnsr4v4kv2pq2s"; depends=[rootSolve]; }; bettermc = derive2 { name="bettermc"; version="1.1.2"; sha256="1g264b21kh5kf0v5qk09gf3ya0amblwnqlpw93h6g0k0dd3vks0h"; depends=[checkmate]; }; - beyondWhittle = derive2 { name="beyondWhittle"; version="1.1.1"; sha256="1nr414wvfwycp3s9v592jd4gk5wdjfklk7ypqabx73k5fsxrcc0g"; depends=[BH forecast ltsa MASS MTS Rcpp RcppArmadillo]; }; + beyondWhittle = derive2 { name="beyondWhittle"; version="1.1.2"; sha256="0gi2pz591iqkjxg2jnn6igflyakdb4p40yafrw5gxcqa0kfj79h9"; depends=[BH forecast ltsa MASS MTS Rcpp RcppArmadillo]; }; bezier = derive2 { name="bezier"; version="1.1.2"; sha256="1vw5128v8h973xwa1fdm9cw2jvrldj87nd55lddlp3qsz3ag4br6"; depends=[]; }; bfast = derive2 { name="bfast"; version="1.6.1"; sha256="1vjklk7d9b0q7j348aqvspm7rn80bh06hz66r2z1qs9436ppkx5a"; depends=[forecast Rcpp Rdpack strucchangeRcpp zoo]; }; - bfp = derive2 { name="bfp"; version="0.0-42"; sha256="19azhsaa1cgpz2zs5ijmr1pcbcqjlmc0w990hbbwkk79bpc3dpn4"; depends=[Rcpp]; }; + bfp = derive2 { name="bfp"; version="0.0-44"; sha256="1lh25g4ac1f1asz4i0mnizbxqzslz6kjlg1d7mcjnp6qn7pkmg20"; depends=[Rcpp]; }; bfsMaps = derive2 { name="bfsMaps"; version="0.9.6"; sha256="0k3bwda32j0rfdkzddqf81mpaa1z73cm05xh19psa51vgrbn9gg9"; depends=[DescTools maptools rgdal rgeos rlang sp spdep]; }; bfsl = derive2 { name="bfsl"; version="0.2.0"; sha256="10z3w1fk4va2ajvpnqp0llgw4a047iaya6xi57if1a7jd7r1jxfh"; depends=[generics]; }; - bfw = derive2 { name="bfw"; version="0.4.1"; sha256="1dwl6p70wbgippysl7vk8nv6rc78f6h5xl8fna98zv99qf0ib31c"; depends=[coda MASS runjags]; }; + bfw = derive2 { name="bfw"; version="0.4.2"; sha256="0qgq47axa0r9653d1sjm00fvfx49v28id5sngwyrgkppcngmbg9p"; depends=[circlize coda data_table dplyr ggplot2 magrittr MASS officer plyr png runjags rvg scales]; }; bgeva = derive2 { name="bgeva"; version="0.3-1"; sha256="0qm4xknyab8hdyn3in2hsvm8s062cnmqqf41b5jvax1mi5hs0z8c"; depends=[magic mgcv trust]; }; bggAnalytics = derive2 { name="bggAnalytics"; version="0.2.0"; sha256="01wflzgb2156xaial47ms740xaddvx9anyv8vv760dw2r79wfac0"; depends=[checkmate data_table pryr R6 stringr xml2]; }; bggum = derive2 { name="bggum"; version="1.0.2"; sha256="04vr9z81awavkhk3lbi8yasmi242lrbnq0pzqp38xlrn5xkf8b1w"; depends=[Rcpp RcppDist]; }; @@ -6451,22 +6518,24 @@ in with self; { 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]; }; bhm = derive2 { name="bhm"; version="1.17"; sha256="14n78ca8qxdjdk3pxi72fcajcw5ndfncc8a6bc8k2jqj6l0k05qf"; depends=[coda ggplot2 MASS survival]; }; - bhmbasket = derive2 { name="bhmbasket"; version="0.9.3"; sha256="1avd1w8qrnlydmzv9r2lvdilailzdcsib3zcn4461qh3qxlwn52f"; depends=[foreach R2jags]; }; + bhmbasket = derive2 { name="bhmbasket"; version="0.9.5"; sha256="1mcgbvlnrmxlxqcjmc7ij7qn3zqfwsmbx2r2facbqrf043hmiipc"; depends=[doRNG foreach R2jags]; }; bhpm = derive2 { name="bhpm"; version="1.7"; sha256="0fhk2gmghibf7la864dzm19bm76525gzbj03vw0y0zwbv9shbpcp"; depends=[coda]; }; biClassify = derive2 { name="biClassify"; version="1.3"; sha256="14z3kmpmlvnkjwpjspajdfx5951cmck4binszzdd7nqbai5f1dwv"; depends=[DAAG expm fields MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; bib2df = derive2 { name="bib2df"; version="1.1.1"; sha256="0d57883df774qqwpssmly3f1gci32yc5sgwc3x8f2rjih23s1nf6"; depends=[dplyr httr humaniformat stringr]; }; biblio = derive2 { name="biblio"; version="0.0.6"; sha256="079p0qzmi3sg2ff7ln9lg65lf7r402rldqfpxmfvckhm9s6b29b4"; depends=[stringr yamlme]; }; - bibliometrix = derive2 { name="bibliometrix"; version="3.1.4"; sha256="14s1mn0j9120m1nh46380qbffy6d4zcx9ii3axbcwmhry0yr2ndw"; depends=[bibliometrixData dimensionsR dplyr DT factoextra FactoMineR forcats ggplot2 ggrepel igraph Matrix openxlsx plotly pubmedR RColorBrewer readr readxl rscopus shiny SnowballC stringdist stringr tidyr tidytext]; }; + bibliometrix = derive2 { name="bibliometrix"; version="3.2.1"; sha256="1iar9v9isn8c445lj5g6wrznsy9xn7xmyik0km5c98hxjsibwfzx"; depends=[bibliometrixData dimensionsR dplyr DT factoextra FactoMineR forcats ggplot2 ggrepel igraph Matrix openxlsx plotly pubmedR RColorBrewer readr readxl rscopus shiny SnowballC stringdist stringr tidyr tidytext]; }; bibliometrixData = derive2 { name="bibliometrixData"; version="0.1.0"; sha256="0fdfgqsfiq3iacj4vb3bvx98waqzqxdsn2ds8wq86a30lm055d7n"; depends=[]; }; biblionetwork = derive2 { name="biblionetwork"; version="0.1.0"; sha256="0nhx9bk7r5l0bvj98clnmwf53ihghf48zai4nj6pcgr2rb69fvjj"; depends=[data_table Rdpack]; }; + bibs = derive2 { name="bibs"; version="1.1.1"; sha256="0slxqhcm4fhdmr2dj1c31zs8sgl39267179nbc59jlpb0z77z2d6"; depends=[GIGrvg]; }; bibtex = derive2 { name="bibtex"; version="0.4.2.3"; sha256="0vdwx6808r73pk15263f33bkqbfmb08d8jkmr4d7h4ml414ikbbv"; depends=[stringr]; }; biclique = derive2 { name="biclique"; version="1.0.5"; sha256="1fdf2r1jc2x8yw0fcw7yyjdxz4b870w6y7mr68qixqxwpl6943zq"; depends=[]; }; biclust = derive2 { name="biclust"; version="2.0.3"; sha256="0lgyc2f04dhr65cwga78pradxsdzgjrpp8vphchqn60ab1z95dlp"; depends=[additivityTests colorspace flexclust ggplot2 lattice MASS tidyr]; }; biclustermd = derive2 { name="biclustermd"; version="0.2.3"; sha256="1knhz96k5giq3d16i3akl5gbxrzx3vxm97cb3ivaw835fr9zrmr5"; depends=[biclust doParallel dplyr foreach ggplot2 magrittr nycflights13 phyclust tidyr]; }; - bidask = derive2 { name="bidask"; version="0.1.0"; sha256="1npiz3nmbly0lhha90b6v2ml8fmi32rdjr6bx7f008aa9p4cpcip"; depends=[xts zoo]; }; + bidask = derive2 { name="bidask"; version="0.1.1"; sha256="1xykrk993bq1diflwbw4340b2jsn51l962qgwm50rz6hrakjhn6q"; depends=[xts zoo]; }; bife = derive2 { name="bife"; version="0.7.1"; sha256="0d1hfzji3769nsa5xvlmn7sbn21igwx3aa7vxlcdn1b9ykh7fx76"; depends=[data_table Formula Rcpp RcppArmadillo]; }; bifurcatingr = derive2 { name="bifurcatingr"; version="1.0.0"; sha256="0msbdr2m4xmvnd00yklk2b8c8qwr11d5gc1x22sqd16fgj9y0qvf"; depends=[igraph MASS]; }; + bigDM = derive2 { name="bigDM"; version="0.4.1"; sha256="147xqnrmdsg0p359idxwhjqzi68w03mbhzbggzcfrngf5pj5dbyn"; depends=[crayon future future_apply MASS Matrix RColorBrewer Rdpack rlist sf spatialreg spdep]; }; bigGP = derive2 { name="bigGP"; version="0.1-7"; sha256="0slg87g6lrdlzlcqxmcyxcwzrnmiz6ps0n14p27zcv0n687xifid"; 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]; }; @@ -6479,11 +6548,10 @@ in with self; { bigchess = derive2 { name="bigchess"; version="1.9.1"; sha256="1vdzx185y1agh1xjf7qcfi2s6l7qzm1kx6b2kr3cbz2in88bws3n"; depends=[processx]; }; bigdatadist = derive2 { name="bigdatadist"; version="1.1"; sha256="16gkybwcp9sxqb0iic2fhmc4gndr44ayg14wrfcjvjaj4g5r6xs2"; depends=[FNN MASS pdist rrcov]; }; bigdist = derive2 { name="bigdist"; version="0.1.4"; sha256="1qfnmhyfadmnnagbhdl4jjrb53i1srszf19idp8fy6bczbjq85yi"; depends=[assertthat bigstatsr furrr proxy]; }; - biglasso = derive2 { name="biglasso"; version="1.4.1"; sha256="1q3lilqdbra8wm8cs49d9kl044dlsr69mjax1rvhb9jciyfbrbhw"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; }; + biglasso = derive2 { name="biglasso"; version="1.5.1"; sha256="18f7xa1fdgp3xjf4ihwhrhg8pk2rg79zgk3fcwgh0nywv6zmsfb8"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; }; bigleaf = derive2 { name="bigleaf"; version="0.7.1"; sha256="0hsssz5973vapkmmh9dgzrijyjj1s75iarq3cpfi7ljm4n748qig"; depends=[robustbase solartime]; }; biglm = derive2 { name="biglm"; version="0.9-2.1"; sha256="0iy9xr2bq42wlizgwlz7w5kh9206yqkw9h2cr6mcsmizgjg3rkvd"; depends=[DBI]; }; biglmm = derive2 { name="biglmm"; version="0.9-2"; sha256="1zj1h2hszps3w913j2dk4cyj5jsqkkxsm3pcjlc4jnq810j100l6"; depends=[DBI]; }; - bigmatch = derive2 { name="bigmatch"; version="0.6.2"; sha256="16nmc0n78gzk8x8jhxdilj47gjqqv46sgiivccn5zkv08k1h3jj2"; depends=[liqueueR mvnfast plyr rcbalance]; }; bigmds = derive2 { name="bigmds"; version="2.0.1"; sha256="05sph85z4c4fiwd429hx9chgd7rsn48irr168yy1dj9daaqm49pl"; depends=[]; }; bigmemory = derive2 { name="bigmemory"; version="4.5.36"; sha256="03pg8mxdc7q0249visjmc8bc3xmwxsfg3i2n6higicj4cfz7zihq"; depends=[BH bigmemory_sri Rcpp]; }; bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; }; @@ -6492,10 +6560,10 @@ in with self; { bigreadr = derive2 { name="bigreadr"; version="0.2.4"; sha256="0650mbgbzl2582d02ma3kd8iqdimjajk9gnx70hdjl489q15w80f"; depends=[bigassertr data_table parallelly Rcpp]; }; bigrquery = derive2 { name="bigrquery"; version="1.4.0"; sha256="02msq61l7vamzpvbhvalh3qil1aa7pr68pwpsivbb6pvz6p4zyns"; depends=[assertthat bit64 curl DBI gargle glue httr jsonlite lifecycle prettyunits progress rapidjsonr Rcpp rlang tibble]; }; bigsimr = derive2 { name="bigsimr"; version="0.11.2"; sha256="1mygsc865hki6z2bilvbnymk8r4p73ams7iah9qpqi0ap6cqqz8p"; depends=[JuliaCall]; }; - bigsnpr = derive2 { name="bigsnpr"; version="1.8.1"; sha256="1kwzphhhc3rmczv426sz67hsyfp67mbrhgna406fvw50p7ql76d8"; depends=[bigassertr bigparallelr bigreadr bigsparser bigstatsr bigutilsr data_table foreach ggplot2 magrittr Matrix Rcpp RcppArmadillo rmio vctrs]; }; - bigsparser = derive2 { name="bigsparser"; version="0.5.0"; sha256="0g6fbhgc51jb2rnccimnsz3y0ivq9ylgk1rnm863l4hyc43balhp"; depends=[bigassertr Rcpp RcppEigen rmio]; }; + bigsnpr = derive2 { name="bigsnpr"; version="1.9.11"; sha256="01ldd86mvavqidmdmd6hzsbrds34ygndys9s3pf9l8cxjr58r2az"; depends=[bigassertr bigparallelr bigreadr bigsparser bigstatsr bigutilsr data_table foreach ggplot2 magrittr Matrix Rcpp RcppArmadillo rmio vctrs]; }; + bigsparser = derive2 { name="bigsparser"; version="0.6.0"; sha256="1v4jyxgz2ikjp7l91klrbshg93d644343y2qswsr5cbmnvc4fa3d"; depends=[bigassertr Rcpp RcppEigen rmio]; }; bigsplines = derive2 { name="bigsplines"; version="1.1-1"; sha256="1kf04p2lglzdi1fdryk27nmj2a2jca2ii7ki8vak93sq21isb179"; depends=[quadprog]; }; - bigstatsr = derive2 { name="bigstatsr"; version="1.5.5"; sha256="1h69hn0sfani08bdrp9453kmmb1xynghh11208sxpnn43mv64iq0"; depends=[bigassertr bigparallelr cowplot foreach ggplot2 ps Rcpp RcppArmadillo rmio RSpectra tibble]; }; + bigstatsr = derive2 { name="bigstatsr"; version="1.5.6"; sha256="1mir9fr2c9wrx0ldmwliv99z2qrpy8fij1bzjy40pzcaim9mfk7d"; depends=[bigassertr bigparallelr cowplot foreach ggplot2 ps Rcpp RcppArmadillo rmio RSpectra tibble]; }; bigstep = derive2 { name="bigstep"; version="1.0.3"; sha256="0ygp1vljqqn5vzpjxlv9d6fxxv3bi2kfyqfs1gf0jgxwb9417b82"; depends=[bigmemory magrittr matrixStats R_utils RcppEigen speedglm]; }; bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; }; bigtcr = derive2 { name="bigtcr"; version="1.1"; sha256="1l03yc28afdm7glbw4ay0zsywjgqg5l90qz1hfhslsy8gg7d5wq5"; depends=[]; }; @@ -6507,7 +6575,7 @@ in with self; { billboard = derive2 { name="billboard"; version="0.1.0"; sha256="1z3y8dijhc1381y91n5zq305xzm1gpvs0g4mdpfr7zrblpa8ws39"; depends=[tibble]; }; billboarder = derive2 { name="billboarder"; version="0.3.1"; sha256="189ngvg84rcwhrivxskmjv3srhadvzr4p1v8pf11axyv2qn01b0x"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr rlang scales shiny]; }; bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; - bimets = derive2 { name="bimets"; version="1.5.3"; sha256="1m4vzbc5g1f98izz638pxzr67k1sljy8g2qqb6nlwglg7zi7bvak"; depends=[xts zoo]; }; + bimets = derive2 { name="bimets"; version="2.0.2"; sha256="0ch83l0g5zalbwxj0682yak99mlfba2i0lnmb44g74dcsism6psg"; depends=[xts zoo]; }; bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; }; binGroup = derive2 { name="binGroup"; version="2.2-1"; sha256="0cb7j6b0s3y56mv1967awwri0kv0rf3sr3vwf9gc2zbjggxi9ffp"; depends=[partitions Rdpack]; }; binGroup2 = derive2 { name="binGroup2"; version="1.1.0"; sha256="1hgz1w0bxbd82rx96s6b63wjczsb1x2l6j526wcnwix36kibv3p3"; depends=[ggplot2 partitions rBeta2009 Rcpp RcppArmadillo Rdpack scales]; }; @@ -6525,7 +6593,6 @@ in with self; { bingat = derive2 { name="bingat"; version="1.3"; sha256="1y68rgafipfad78yrzcygdszgy1d5q739kap06pzr78bn3i8hiwa"; depends=[doParallel foreach gplots matrixStats network vegan]; }; binhf = derive2 { name="binhf"; version="1.0-3"; sha256="1vdw2s8zddp7gad8l3c4jpmnjcc0f5wpqbrp6gp9lgp1c3qa505y"; depends=[adlift EbayesThresh wavethresh]; }; binman = derive2 { name="binman"; version="0.1.2"; sha256="00l7m98h41r67gf0qxqis3vx63j7wylnk9vlgcyk41szkrz8ikkc"; depends=[assertthat httr jsonlite rappdirs semver xml2 yaml]; }; - binnednp = derive2 { name="binnednp"; version="0.4.0"; sha256="1qswrr982x5hy2vl2fc603j98cjli9l40zzvvjy2l91p8xxrc5dn"; depends=[doParallel fitdistrplus foreach kedd mclust nor1mix Rcpp Rdpack]; }; binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; }; binomSamSize = derive2 { name="binomSamSize"; version="0.1-5"; sha256="1an6dcqsjh5r0w4kc3n6yfvvha5qhrb2i4bpf7g5ykhl3i60zfcc"; depends=[binom]; }; binomialRF = derive2 { name="binomialRF"; version="0.1.0"; sha256="1liqhnp4j3fxy552fi4yz5vmfzh5blpmxx6fa3g62dgnhcm9sy18"; depends=[data_table randomForest rlist]; }; @@ -6533,7 +6600,7 @@ in with self; { binomlogit = derive2 { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; }; binovisualfields = derive2 { name="binovisualfields"; version="0.1.1"; sha256="0s2p0miqjckkj4v9l0c7zsdnnq69j08p4c5sgdxvkzlv23rnrkyd"; depends=[gtools plotrix shiny]; }; binr = derive2 { name="binr"; version="1.1"; sha256="0kgk91zy7bdrhpkh9c5bi206y9hjwjwzb508i8qqmznqyxmza70r"; depends=[]; }; - binsegRcpp = derive2 { name="binsegRcpp"; version="2020.9.3"; sha256="0vkvczm32nx67aw1mw53yc6jlbsk70faa5mvwq6k6bzv3nb2c48a"; depends=[data_table Rcpp]; }; + binsegRcpp = derive2 { name="binsegRcpp"; version="2022.1.24"; sha256="1chp9ac99r990x4wx39y2cwiqmnmx58c89l3wx5civgn2z3l9l5p"; depends=[data_table Rcpp]; }; binseqtest = derive2 { name="binseqtest"; version="1.0.3"; sha256="0661a2bqmv6bckq23c6m04ggwrp8z10lfgjg9dgkz4bfxsd297gs"; depends=[clinfun]; }; binsmooth = derive2 { name="binsmooth"; version="0.2.2"; sha256="1sidv8ra377glaacib1j4ksg5bg759hk7h6fadrfzip3hgxgjg9x"; depends=[ineq pracma triangle]; }; binsreg = derive2 { name="binsreg"; version="0.7"; sha256="1qxf5096vzf2j9d7yya0pr1hgxgkxm5llvz5ddyf0hqp22cjcsf7"; depends=[ggplot2 matrixStats quantreg sandwich]; }; @@ -6544,9 +6611,11 @@ in with self; { 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.5.2"; sha256="1kx1vh6p37170f1crylwyzap0c7s5d82rx7qqi95f8d26niqcjn9"; depends=[assertthat curl data_table fields ggmap ggplot2 lubridate lutz maptools raster rgdal rhdf5 sp tidyr viridis viridisLite]; }; - bioacoustics = derive2 { name="bioacoustics"; version="0.2.7"; sha256="0jsvmx4kx1jx4ljrrax9v3nr3fs2r0kg4n1a0qbwcbfbgykqng87"; depends=[htmltools moments Rcpp stringr tuneR]; }; + 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]; }; + bioclim = derive2 { name="bioclim"; version="0.2.0"; sha256="101ykpwvjgn62hqvsdh0mhwivv7iv23y57v65c85bk054y7wv6nq"; depends=[berryFunctions ggplot2 reshape2 rmarkdown terra]; }; biocompute = derive2 { name="biocompute"; version="1.1.0"; sha256="05pqrm1j0d21w70jnsf9zvh55h85i676xwvqzsk51llw52v16d4d"; depends=[cli crayon curl digest httr jsonlite jsonvalidate magrittr rmarkdown stringr uuid yaml]; }; + biodosetools = derive2 { name="biodosetools"; version="3.6.0"; sha256="06i6vg0n98x91j8mkh0mbh4m7a34ghr22x6msrhdig0xh522ia5z"; depends=[bsplus cli config dplyr ggplot2 golem htmltools magrittr MASS maxLik mixtools msm pkgload 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]; }; biogram = derive2 { name="biogram"; version="1.6.3"; sha256="1y7yaa6xwv11b6a4qf4qb3d7rsz0yiiq1k5mb0dbm3avydnl9c4b"; depends=[combinat entropy partitions slam]; }; @@ -6555,7 +6624,8 @@ in with self; { bioinactivation = derive2 { name="bioinactivation"; version="1.2.3"; sha256="0gz1bbakf6b23jsbvrr8314yxajxcr1akm5srgm883lrf1p5ax13"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS purrr rlang]; }; biokNN = derive2 { name="biokNN"; version="0.1.0"; sha256="113lynbxmv88ycvbsq9drn2f75md7yajhicfw8qd8l6lawiq1fqc"; depends=[cluster desc dplyr ggplot2 lme4 magrittr mice mitml tidyr]; }; biolink = derive2 { name="biolink"; version="0.1.7"; sha256="1i9aisvb3lvljird89fy9fx7h3s1wi6dpilycbynqyhz8xqnnszj"; depends=[DBI glue memoise rentrez RMySQL xml2]; }; - biomartr = derive2 { name="biomartr"; version="0.9.2"; sha256="12bw15hvjg7fbrq1mwn2xgzbplydy8rlq982hs118mlwdrlqb06q"; depends=[biomaRt Biostrings curl data_table downloader dplyr fs httr jsonlite philentropy purrr R_utils RCurl readr stringr tibble XML]; }; + biomartr = derive2 { name="biomartr"; version="1.0.2"; sha256="0hr7wks88lbfcqzjzm4x265dk4lpmc3i2ndp7xcrx8ssj76wrmkz"; 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.0.0"; sha256="1lh2bjagab644j68dwfk6q88nmb1rvclqi87mxb1cwx6y7mjyr69"; depends=[agricolae cowplot curl ellipsis farver ggplot2 interp lattice multcompView predictmeans rlang scales stringi withr]; }; biomod2 = derive2 { name="biomod2"; version="3.5.1"; sha256="065cq36phf7ncd1na440f50aa467qbwkb7pchabsan05k3zk7v9h"; depends=[abind caret checkmate dismo doParallel dplyr earth ENMeval foreach gbm ggplot2 lattice MASS maxnet mda nnet PresenceAbsence pROC purrr randomForest raster rasterVis reshape rlang rpart sp tidyr]; }; bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; bios2mds = derive2 { name="bios2mds"; version="1.2.3"; sha256="1k0r3fnkzfczx3wp3m8zpndk6gxca7idsp0z13rw84zjrgqaw6jm"; depends=[amap cluster e1071 rgl scales]; }; @@ -6569,6 +6639,7 @@ in with self; { biotools = derive2 { name="biotools"; version="4.2"; sha256="1dyy9mk2afjbc8g1qygy6h1aksbhndm53c4sb5mfzriydl03ibxv"; depends=[boot MASS]; }; bipartite = derive2 { name="bipartite"; version="2.16"; sha256="10flnwgsll86w1dgn4rswbshag8l35hski0nf7xkvp5fj39sy4wp"; 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.2"; sha256="0lm6yi4xnpl1vrai75jb8958mqwzilp42vik7z282g6p4ggx4ka8"; depends=[coda dplyr mvtnorm rjags]; }; 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]; }; @@ -6578,7 +6649,7 @@ in with self; { bisect = derive2 { name="bisect"; version="0.9.0"; sha256="1dr95gnc9rb3i8603wspf0hznmvk5akk46nyf1bhv88mjz2i5q77"; depends=[]; }; bisectr = derive2 { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; }; bisque = derive2 { name="bisque"; version="1.0.2"; sha256="0zp2r1vg29q2ds34hhyjv9pz761mi0qncx9p4ilwnfd5yj9pmzwq"; depends=[foreach itertools mvQuad Rcpp RcppArmadillo RcppEigen]; }; - bistablehistory = derive2 { name="bistablehistory"; version="1.0.0"; sha256="04hwwf1pmm6h78xaaax5r59kcc065h9d49fngqqriwp513q7c4xp"; 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.0"; sha256="1bxhv772vsnpmjsj82k351mm54w9vb29d1nd3daz9pk5j52ilih4"; depends=[BH boot dplyr future glue loo magrittr purrr Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders tibble tidyr]; }; bit = derive2 { name="bit"; version="4.0.4"; sha256="0s7isadibxp2wr62r5cpbyh9z31sczzfz4j3rm7gxgjfpqgq8174"; 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]; }; @@ -6591,10 +6662,11 @@ in with self; { 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"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; }; - bizdays = derive2 { name="bizdays"; version="1.0.8"; sha256="1aiwnhgd2h7j36xj7165fc1fnvl8qn4y8c1lbdlsbanmvayydmr5"; depends=[jsonlite]; }; + bizdays = derive2 { name="bizdays"; version="1.0.9"; sha256="1ddl7mnxf5prvcmkdfmfhvxrcv8c7clm21qvmr54gwqf759afh07"; depends=[jsonlite]; }; + bizicount = derive2 { name="bizicount"; version="1.0.0"; sha256="1h11cxl56j5mzdjrsb9x7csxad33xx4rd0sgvz3dbd759nbmi9am"; depends=[DHARMa Formula MASS numDeriv pbivnorm rlang texreg]; }; bjscrapeR = derive2 { name="bjscrapeR"; version="0.1.0"; sha256="18chbgiwify272iqf0w4vsqh73wbk12d8m2awc5hbnfqblz3phwd"; depends=[dplyr glue readr tibble]; }; - bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; }; - bkmrhat = derive2 { name="bkmrhat"; version="1.1.1"; sha256="0mak91p8vrvmqscghqgpzwcrxn7mm9km6wks1lrwixivlq0g1cdj"; depends=[bkmr coda data_table future rstan]; }; + bkmr = derive2 { name="bkmr"; version="0.2.1"; sha256="0606i94lkici73g86xap142xkgrxk5pjid8c6rybjqqz9vqz48cv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; }; + bkmrhat = derive2 { name="bkmrhat"; version="1.1.2"; sha256="0wd8n9lwrrgs2mdxbhyx3sq5xkc7ifvbcwf260m8jgpblp9nn2yz"; depends=[bkmr coda data_table future rstan]; }; blackbox = derive2 { name="blackbox"; version="1.1.32"; sha256="180y19ls0vdk98smhs9hxpcwg3hwpl62d19zdiml38bjlxmr0kav"; depends=[foreach geometry lattice MASS nloptr numDeriv pbapply proxy rcdd Rcpp RcppEigen spaMM]; }; blaise = derive2 { name="blaise"; version="1.3.8"; sha256="1jvjli349rzyiij80ggb27fsqp0hd1fz2pw93rj6cssgipl911xl"; depends=[dplyr readr stringr tibble]; }; blandr = derive2 { name="blandr"; version="0.5.1"; sha256="1rqas71hlf000b3z824d8ljshf8bx91bbrzaxxnx5n3chv19w6z6"; depends=[ggplot2 jmvcore knitr R6 rmarkdown stringr]; }; @@ -6602,13 +6674,13 @@ in with self; { blaster = derive2 { name="blaster"; version="1.0.4"; sha256="0y2vdksmy1xngqvf7wxy5yf58830sm0bi82vn02yba1x6345ghjr"; depends=[Rcpp]; }; blastula = derive2 { name="blastula"; version="0.3.2"; sha256="084mk6xb8ivqrp8anvisfk8rvwi7qfrp5kmy66vpihmjmqh7dkyc"; 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.3-18"; sha256="0rg86gsgi3kp2krhw8rabwpidcnlq6chsbmdw9jwfhf75yi60f9p"; depends=[bayesplot BH coda future_apply lavaan loo Matrix MCMCpack mnormt nonnest2 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; + blavaan = derive2 { name="blavaan"; version="0.4-1"; sha256="192a3k5fnfd2khm4g8rj7ja4501m6n1wnb7g8mphpvw45zbpgc5g"; depends=[bayesplot BH coda future_apply lavaan loo Matrix MCMCpack mnormt nonnest2 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders tmvnsim]; }; blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; }; blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; blin = derive2 { name="blin"; version="0.0.1"; sha256="1h94azm7gli9i4v3li5c1p36p3rkcj2p5j6rqzlzf0pcqs0bsc09"; depends=[abind glmnet MASS Matrix mvtnorm]; }; blindrecalc = derive2 { name="blindrecalc"; version="0.1.3"; sha256="1kaia4mpwjh9p0m9jc694i2gy1hfqa3k04w17cnmwsfppgwq11ls"; depends=[Rcpp]; }; blink = derive2 { name="blink"; version="1.1.0"; sha256="053nw592sglzh6fgz7hj8ra6q7lqs83hhv14kcgs67b56q8a3crb"; depends=[plyr stringdist]; }; - bliss = derive2 { name="bliss"; version="1.0.2"; sha256="064w4q29ddcdwpj30y90v0dmpgpd3wjvka4xfn9f09mxl0dgnw41"; depends=[MASS Rcpp RcppArmadillo rockchalk]; }; + bliss = derive2 { name="bliss"; version="1.0.4"; sha256="02kln40z10wngydn7y4x5shd2dff74gb340nhagf49k8ql9p78xw"; depends=[MASS Rcpp RcppArmadillo]; }; blm = derive2 { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; }; blme = derive2 { name="blme"; version="1.0-5"; sha256="0413j7gwr5yj14jamkizj55q7xii1a0kgazzj0ilqn2ascclz6k7"; depends=[lme4]; }; blmeco = derive2 { name="blmeco"; version="1.4"; sha256="1370djpy87816bfr0g8730x7q4d4xx9aa41iqm622q5b5zm2jzmp"; depends=[arm lme4 MASS]; }; @@ -6616,20 +6688,19 @@ in with self; { blockCV = derive2 { name="blockCV"; version="2.1.4"; sha256="1fikskjjq571rzmzmqf72z92qkvjb9wdx598kvd28y1ic0xzrgm6"; depends=[progress raster sf]; }; blockForest = derive2 { name="blockForest"; version="0.2.4"; sha256="14xggdm34hmdlz3hvvp5layk6mb016yppqf9x9rbia9lmmjbhgfh"; depends=[Matrix Rcpp RcppEigen survival]; }; blockRAR = derive2 { name="blockRAR"; version="1.0.2"; sha256="1d9izlcgz85kcz1sh11mcxq96qh0cwv6638jha851h2f4lnc8aa4"; depends=[arm dplyr ldbounds magrittr tibble]; }; - blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; }; blockcluster = derive2 { name="blockcluster"; version="4.5.1"; sha256="1f152m3fv0aaw2csgqvf1y231f5rjhwrkn69yyx9yb3ff65z49d8"; depends=[Rcpp rtkore]; }; - blocklength = derive2 { name="blocklength"; version="0.1.4"; sha256="13hsk15r2m2rnmdjs1apz6bhpm877pkc0rph2lvwgpm85ki0rr7z"; depends=[tseries]; }; + 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.0.5"; sha256="1vc8gy4slsywcwxq532373i0dq73fhs5cac9mr6zz2pjaaxjghhq"; 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]; }; - blogdown = derive2 { name="blogdown"; version="1.7"; sha256="0v3sxbq35azak6g4a7k6pq9z9qgx4yf138r1r5yl76grrq4k9gka"; depends=[bookdown htmltools httpuv jsonlite knitr later rmarkdown servr xfun yaml]; }; + blogdown = derive2 { name="blogdown"; version="1.8"; sha256="05rzxwap8i7h5ijy04322cyim6kxhdhgq8y8nvp9q9gq3183bmrs"; 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-1"; sha256="0p0nmbxil4l89fcryrgsg9mxzb5fyg93p50aqkjy00ms05hwd0hx"; depends=[boot mvtnorm openxlsx reshape2 rjags]; }; blsR = derive2 { name="blsR"; version="0.2.1"; sha256="0wbcpvgj72fkhv4z1gllf9lkq45mdwwnf8dnmaqwl9i5qnihy1yy"; depends=[dplyr httr jsonlite purrr rlang]; }; bltm = derive2 { name="bltm"; version="0.1.0"; sha256="1sx4ii65ddvdw45za8j320v1s9d1pz5k2gx979yymhyxi8fmq69z"; depends=[mvnfast Rfast]; }; - bmabasket = derive2 { name="bmabasket"; version="0.1.1"; sha256="1hgbl1x38snhzbh5j1qz81azkdwzmm4idacyyyrn895vl71ypfrn"; depends=[partitions Rcpp RcppArmadillo]; }; + 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="1.8"; sha256="1nhybz8aarzlqjx4443hsflflgy2jcprz5dv6mwxacnyspm93vlq"; depends=[Amelia lavaan MASS 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]; }; @@ -6652,34 +6723,33 @@ in with self; { 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.11"; sha256="0vlmaz75mnbj4js3h5j11rs7q7yx5agwi1y7hq16nb8x81arhwai"; depends=[bitops igraph]; }; + bnstruct = derive2 { name="bnstruct"; version="1.0.12"; sha256="04rlv2xb7bwbh0dd4kc2k07vpdb6vjhln6kdxim6cja27b9j9h46"; 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=[]; }; bodenmiller = derive2 { name="bodenmiller"; version="0.1.1"; sha256="0rdbk3f95iw4352fl9d81ir503q072chbb4hn1k12sp1wjc3apid"; depends=[]; }; + bodycomp = derive2 { name="bodycomp"; version="0.1.0"; sha256="1fzw8g1dxvigknx8s6kd05z13p7ak0941y9bqzklgsfm9afiaj4d"; depends=[]; }; boilerpipeR = derive2 { name="boilerpipeR"; version="1.3.2"; sha256="1dws84ghc5r6zpnr23qd4l9bkazds8ar723wkrkikjni58vshjf1"; depends=[rJava]; }; bolasso = derive2 { name="bolasso"; version="0.1.0"; sha256="1radw0h1y1gq0lzfrdh2phnvbrxzlklm7hhbz6x4xpw6vybwbp1j"; depends=[future_apply gamlr ggplot2 glmnet Matrix progressr Rdpack tibble]; }; bold = derive2 { name="bold"; version="1.2.0"; sha256="0r54ylxgmq9qnh1f36k4hafh80n86ibk4a994f8b1rnb9bq9f5cg"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; }; bookdown = derive2 { name="bookdown"; version="0.24"; sha256="1qqvvfbpbd6sin8vpvr3zzlhlyx1i6b98yp77xj5zl220nid5slb"; depends=[htmltools jquerylib knitr rmarkdown tinytex xfun yaml]; }; bookdownplus = derive2 { name="bookdownplus"; version="1.5.8"; sha256="1cdxz5c69cgdk7wxr0xwhzw361rpg7j8xjv9hjf1877qqmhxbrkd"; depends=[bookdown knitr magick xaringan]; }; boomer = derive2 { name="boomer"; version="0.1.0"; sha256="0nb58msk7ycim15ssjwig9i62x51ydnakq83jg6vcbqjg1a9anry"; depends=[crayon pryr rlang rstudioapi styler withr]; }; - boostmtree = derive2 { name="boostmtree"; version="1.5.0"; sha256="18w5h8m6g4aszffyn0ixhzn2bgbrwrrcq2k54b70vbw00xqxmg1q"; depends=[nlme randomForestSRC]; }; boot = derive2 { name="boot"; version="1.3-28"; sha256="0cjafhqv1c1mrjjcasqr767vs96wjcc6am9r1icryr8l4zymhwcz"; 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"; sha256="05gxpky92f9jhvhv4faj49ql8a9mrfqdgk802i0hdw4lmnn90k7j"; depends=[boot car lme4 Rdpack survival]; }; - bootComb = derive2 { name="bootComb"; version="1.1.1"; sha256="00hfd705zadap6rmaraiqsrw31rf9cw8ggaai4x00xqcf6wl1lmv"; depends=[MASS]; }; + bootComb = derive2 { name="bootComb"; version="1.1.2"; sha256="0gg07ck2nf0ddqc5nflk5ms16m3c6dlf1a77m58q581mkavj6gyb"; depends=[MASS]; }; bootES = derive2 { name="bootES"; version="1.2.1"; sha256="16b14bycy3ds09hsxnk738k2xq9qmwcy3kzdqd6rw9w4j7167kf0"; depends=[boot]; }; bootGOF = derive2 { name="bootGOF"; version="0.1.0"; sha256="11nn4lc9wdx1z35mfpc3zkk1xr0pvvjyvjzpjlq3z4gm0hmniifz"; depends=[checkmate R6]; }; bootImpute = derive2 { name="bootImpute"; version="1.2.0"; sha256="04i81dqxygl3hv55kn8nkrqzhqsxw2lpdmdfh8inf8rjcpql5bgw"; depends=[mice smcfcs]; }; bootLR = derive2 { name="bootLR"; version="1.0.2"; sha256="1aj5l42d5y7czxzlg6r9ykdxyjf8m8bahl41xk4k6xpxckdnka14"; depends=[binom boot]; }; bootPLS = derive2 { name="bootPLS"; version="0.9.9"; sha256="1i0bzykwjimyswb0z23sqbhm98b9lxifnkby682khva7yfk7k8qr"; depends=[bipartite boot doParallel foreach mvtnorm pls plsRglm spls]; }; bootSVD = derive2 { name="bootSVD"; version="1.1"; sha256="16d3qv8vzhfvl9vbfglkb3csmc4npb29jcq9apv89hj7bkcapvi9"; depends=[ff]; }; - bootStepAIC = derive2 { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; }; + bootStepAIC = derive2 { name="bootStepAIC"; version="1.3-0"; sha256="1dmziq6yfycpap4hhlzl3xg2hsx4y135hy7r6qh9p98vxpa6mycl"; depends=[MASS]; }; bootUR = derive2 { name="bootUR"; version="0.4.2"; sha256="1vf6qynakcil8sz161c8jvkg7c5b5qmkzmsgd5vhp3yrjf1wbhf7"; depends=[parallelly Rcpp RcppArmadillo RcppParallel RcppThread urca]; }; - bootcluster = derive2 { name="bootcluster"; version="0.2.5"; sha256="0jhq0f8a3lajhqksvxd3k703b50vzll43q9w4iaqv4ylsg9l6pyr"; depends=[cluster doParallel dplyr flexclust foreach fpc GGally ggplot2 gridExtra igraph intergraph mclust network plyr sna]; }; + 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"; sha256="13pfmr259yikkb3y9438xz4bjn6kx5w5d2jhx441a00rvv1kb3hi"; depends=[abind corpcor dplyr ggplot2 gtools igraph IsingFit IsingSampler Matrix mgm mvtnorm NetworkToolbox networktools pbapply qgraph rlang snow tibble tidyr]; }; bootruin = derive2 { name="bootruin"; version="1.2-4"; sha256="1gbvh99snchipf13kjhymcx60s2kni23y7lv8lhzd3d402grp68h"; depends=[]; }; - bootsPLS = derive2 { name="bootsPLS"; version="1.1.2"; sha256="19ikz3l0qds25hgcxvhsvqy6jyshcdvnxw6774ifl9ylngxvlfh0"; depends=[mixOmics]; }; bootspecdens = derive2 { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; }; bootstrap = derive2 { name="bootstrap"; version="2019.6"; sha256="1546jqhhw5h177ii8jkdikyd26rv6gwkav816np1zks4p7zgsljj"; depends=[]; }; bootstrapFP = derive2 { name="bootstrapFP"; version="0.4.4"; sha256="1j9ag18s2n7cihs5hbjhibx8gikxf8fs5hx2ljfzcn0gv492qm02"; depends=[sampling]; }; @@ -6696,6 +6766,7 @@ in with self; { boxplotdbl = derive2 { name="boxplotdbl"; version="1.3.0"; sha256="1y1b45q69sxbszd83s8ch10z4i55h34ixm8q7yxr7byx3px8y65n"; depends=[]; }; boxr = derive2 { name="boxr"; version="0.3.6"; sha256="1hdm4p7zx2r566zaiyw06qg3c790gsvylrvav7g9fl4i1x6qgkyk"; depends=[assertthat bit64 digest dplyr fs glue httpuv httr jsonlite lifecycle magrittr mime purrr rio rlang stringr tibble]; }; bp = derive2 { name="bp"; version="2.0.1"; sha256="0r41ardnxgkwd1ib8krasrhzw5q840xs1qrahh6nq38c4yw2b9yi"; depends=[cowplot dplyr ggplot2 gridExtra gtable lubridate magrittr tibble tidyr tidyselect]; }; + bpAcc = derive2 { name="bpAcc"; version="0.0-1"; sha256="1q0gn6n215720d0c39awdjpxpp5ijv4yp6wah9snw1jhiphdl68q"; depends=[]; }; 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.4"; sha256="05knl0lmhbc399zwb35r8m1w5jvmwad8rg5m7m633pg7cfijayb9"; depends=[]; }; @@ -6704,10 +6775,11 @@ in with self; { 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]; }; bpgmm = derive2 { name="bpgmm"; version="1.0.7"; sha256="0abh6jjglims8hjm2fwh0dz2qsgxy0fglxl5fnfgkwc139rsrhgy"; depends=[fabMix gtools label_switching MASS mclust mcmcse mvtnorm pgmm Rcpp RcppArmadillo]; }; bpnreg = derive2 { name="bpnreg"; version="2.0.2"; sha256="1acf7smlcg8b29ga47wpb23zpfb90iz19fjc5v0zppc8q20lgggl"; depends=[BH haven Rcpp RcppArmadillo]; }; - bpp = derive2 { name="bpp"; version="1.0.3"; sha256="05ddqc9vyyf5zqy43xxqx3kqnzs9f2imailscf1r3qqbmifk9xxr"; depends=[mvtnorm]; }; + bpp = derive2 { name="bpp"; version="1.0.4"; sha256="07vz00y9m71n3a847jpviwyy0zb59402yyklsfmyxmggjivpjshi"; depends=[mvtnorm]; }; bpr = derive2 { name="bpr"; version="1.0.4"; sha256="1pi5p0av40lhyc5vskrkkclx30amzry484g91s63cmffbfn08jsc"; depends=[BH coda MASS Rcpp RcppArmadillo]; }; bqror = derive2 { name="bqror"; version="1.3.0"; sha256="1qwng7hxbw7ilqjvw2nv38im1axq56sw04d75sygs9lg1jcgh4lv"; depends=[GIGrvg invgamma MASS NPflow pracma truncnorm]; }; bqtl = derive2 { name="bqtl"; version="1.0-33"; sha256="1sbzpi9z94f010lw2y1gmifjrvpmiqs4m26za7vr1xz72azrqvs9"; depends=[]; }; + braQCA = derive2 { name="braQCA"; version="1.2.1.29"; sha256="0w1mg8lzl64mp5clinq3zai733iz3628zp4pw6vr51z24s56jg6i"; depends=[bootstrap dplyr QCA]; }; bracer = derive2 { name="bracer"; version="1.2.1"; sha256="0q47p43957nlaqsz0hhbica2hlar95c2i8avgq024yhccik5nx6f"; depends=[stringr]; }; braggR = derive2 { name="braggR"; version="0.1.1"; sha256="1sq7knrnz3nqprlvsj24f9gj1i0viawq3wcv2b97dmbwa7rd5qfz"; depends=[Rcpp]; }; braidReports = derive2 { name="braidReports"; version="0.5.4"; sha256="1455pswcbz3zscvk6rgvgrjcp154l5lfx5m7s24m91rpjmc2y7pk"; depends=[braidrm ggplot2]; }; @@ -6719,18 +6791,20 @@ in with self; { brant = derive2 { name="brant"; version="0.3-0"; sha256="0rcp0am4wjlkinvmv0n5bky84v31ds28v163p5mlp343cgma2b62"; depends=[MASS Matrix]; }; bravo = derive2 { name="bravo"; version="2.1.2"; sha256="0gs8vplb3sfp82bldbq1glqhr6j2p4pbzxfbhy61sjs88kvh0bp2"; depends=[Matrix Rcpp]; }; brea = derive2 { name="brea"; version="0.2.0"; sha256="0mb043fdhxrg9gyf4g55ydjx37j20394nvd4d0fmiym98lccyi04"; depends=[]; }; + bread = derive2 { name="bread"; version="0.1.7"; sha256="1ynf27ibj5ahnkk09xpk75wf43y3z4321kx31k0964y17pxf1ksk"; depends=[data_table dplyr stringr]; }; breakDown = derive2 { name="breakDown"; version="0.2.1"; sha256="1jm9zmyfcnr9mjz7b30k34h47msvik9ngfysi6dc48gvrk41yk9q"; depends=[ggplot2]; }; breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; }; + breakaway = derive2 { name="breakaway"; version="4.7.9"; sha256="149n30lxkyh9qapm9xfarxbrxlp2fkar437ndajryq8m4i39w08i"; depends=[ggplot2 lme4 magrittr MASS phyloseq tibble]; }; breakfast = derive2 { name="breakfast"; version="2.2"; sha256="1bdzi0czhjwiqid6xz1b10p9wqy051sy5jhxnwzh9bxzh94a79lk"; depends=[ggplot2 plyr Rcpp]; }; breakpoint = derive2 { name="breakpoint"; version="1.2"; sha256="004vi1qr7iib8ykg6sp7xzv0bb841h4vsz2x0cyrhkdp41frglx9"; depends=[doParallel foreach ggplot2 MASS msm]; }; breathtestcore = derive2 { name="breathtestcore"; version="0.8.1"; sha256="1cdv3qc5bydpchw2qz8wgqsc1hjn0q97bsk05gm8s0xfxmkfn3jb"; depends=[assertthat broom dplyr ggfittext ggplot2 MASS multcomp nlme purrr readr readxl signal stringr tibble tidyr xml2]; }; breathteststan = derive2 { name="breathteststan"; version="0.8.0"; sha256="1h05yqpsa1r6p0iybwh7rap0n10vr2wj2driq7qyq6wk6y14m8hc"; depends=[BH dplyr purrr Rcpp RcppEigen rstan rstantools StanHeaders stringr tibble tidyr]; }; - brew = derive2 { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; }; + brew = derive2 { name="brew"; version="1.0-7"; sha256="0vp7d628j6zzxhh6xfw5jlkv7wh6z2l3snbwjgv7jd56vk0mkf1q"; depends=[]; }; brglm = derive2 { name="brglm"; version="0.7.2"; sha256="08shcz0j1npdn7xkhsvlzs3z4rdwq3g4rk6a4xx8wirqw8n8s2an"; depends=[profileModel]; }; brglm2 = derive2 { name="brglm2"; version="0.8.2"; sha256="065ldmbagarhipl6hl25rlpcnp7c3h1adadyq2wgx0g09hq5ibjf"; depends=[enrichwith MASS Matrix nnet numDeriv]; }; briKmeans = derive2 { name="briKmeans"; version="0.1"; sha256="026wga5lqr8i6zxi8jnw466d40r9qf1blb7l331h9vaj2j169iax"; depends=[boot cluster depthTools]; }; brickr = derive2 { name="brickr"; version="0.3.5"; sha256="1a6yxhq2zly3i3gs4dd19xhyrin1qaxdr7x3a887j7zbcj0j4z9q"; depends=[colorspace dplyr farver ggplot2 magrittr purrr rgl scales tidyr]; }; - bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; }; + bridgedist = derive2 { name="bridgedist"; version="0.1.1"; sha256="1jvjfbk4p5n02xx74bis0z9nzpbn8c5in9qlfr2wpwfqdplprxhl"; depends=[]; }; bridger = derive2 { name="bridger"; version="0.1.0"; sha256="1rx16zwa3zz4bs7h0b75vsx78dvkif8d9c7prb5pmwccizll7v53"; depends=[cowplot dplyr ggedit ggplot2 glue gridExtra kableExtra magrittr patchwork pdftools scales stringr tibble tidyr]; }; bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; }; bridgesampling = derive2 { name="bridgesampling"; version="1.1-2"; sha256="0sry1xwiv4y52k44hq6z8y2kysp5kxgl4dix3m94svg3ladd7v2l"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; }; @@ -6746,16 +6820,15 @@ in with self; { brokenstick = derive2 { name="brokenstick"; version="2.0.0"; sha256="0si4chi6fcp6n8wwvx6mrj9xlrldwhvcrx1kv7xbfd0p7kaz89qh"; depends=[coda dplyr lme4 matrixsampling rlang tidyr]; }; brolgar = derive2 { name="brolgar"; version="0.1.2"; sha256="0xhv76z75zsrvcy606cv8qvz14w5g02gcs2744kv1kflaaics7dx"; depends=[dplyr fabletools ggplot2 glue magrittr purrr rlang tibble tidyr tsibble vctrs]; }; broman = derive2 { name="broman"; version="0.76"; sha256="1yjalfrfy1hvrcs3ky452mdg2ss8ikascj9yngp5fnfrrljcg9wg"; depends=[ggplot2]; }; - broom = derive2 { name="broom"; version="0.7.11"; sha256="069fp8lscw59nmsm658w0164cpgfa36xx09s9j7jxisscg99jfcy"; depends=[backports dplyr ellipsis generics ggplot2 glue purrr rlang stringr tibble tidyr]; }; - broom_helpers = derive2 { name="broom.helpers"; version="1.5.0"; sha256="0s0hs41z4jqz7kwxc168l2vnlacaa6s8q5mfmkmcvf3cdqqi3hyq"; depends=[broom cli dplyr labelled lifecycle purrr rlang stringr tibble tidyr]; }; + broom = derive2 { name="broom"; version="0.7.12"; sha256="1nbv4a4s8548h2q226xmhyp42higayh95yvllh1rcs264lmw3yh4"; depends=[backports dplyr ellipsis generics ggplot2 glue purrr rlang stringr tibble tidyr]; }; + broom_helpers = derive2 { name="broom.helpers"; version="1.6.0"; sha256="11svlfn80xl8vyrq8vqxrqii5c77kp67drnal9v9l7q1frlnq509"; depends=[broom cli dplyr labelled lifecycle purrr rlang stringr tibble tidyr]; }; broom_mixed = derive2 { name="broom.mixed"; version="0.2.7"; sha256="1fh1vxi8n5y30mayk4aa1yis4c064fz5xyrg8m0rl8xgaxakhagz"; depends=[broom coda dplyr nlme purrr stringr tibble tidyr]; }; broomExtra = derive2 { name="broomExtra"; version="4.3.0"; sha256="1f2xsq0r0m991y3p6639v16kjwm3im8yys7brzvgmsv04rg29rhq"; depends=[broom broom_mixed dplyr magrittr parameters performance rlang]; }; brotli = derive2 { name="brotli"; version="1.2"; sha256="07rgdgxh9bvn0qavpclxmkglwyl6ndqasxcs6j12if698dkn976b"; depends=[]; }; brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; }; brranching = derive2 { name="brranching"; version="0.7.0"; sha256="06jy3qhbr0v4m1j4j8a7fb7ic59sx4zhlsm1yb3g6rdwc00d67wj"; depends=[ape conditionz crul curl phylocomr phytools taxize]; }; - bruceR = derive2 { name="bruceR"; version="0.8.2"; sha256="1g1k4kdbddv7pacba8jwbz1rsgii586sjyyywphd8355ziyfpj0c"; depends=[cowplot crayon data_table dplyr effectsize emmeans forcats ggplot2 ggtext glue interactions lavaan lmerTest mediation performance psych see stringr tidyr]; }; - brulee = derive2 { name="brulee"; version="0.0.1"; sha256="131hfcascn1ybfhn2akczfv2dl1m9lh7ybzcrpqm9aiib9fs9j1h"; depends=[cli coro dplyr generics ggplot2 glue hardhat rlang tibble torch]; }; - brunnermunzel = derive2 { name="brunnermunzel"; version="1.4.1"; sha256="1lba5cpiray65zg1pv3xv6yl1xg78rqlwxkcmhgizlh1rhpd430p"; depends=[]; }; + bruceR = derive2 { name="bruceR"; version="0.8.5"; sha256="04x2mvp9w0fngsmsgcrs40km6k1ydji7j515cm5bs7xbfm6li8l4"; depends=[afex cowplot crayon data_table dplyr effectsize emmeans forcats ggplot2 ggtext glue interactions lavaan lmerTest mediation performance psych see stringr tidyr]; }; + brulee = derive2 { name="brulee"; version="0.1.0"; sha256="18qglyb3s45rzdp2qxc582v9rpilgqf55cs3r7zyj423ik99sgf4"; depends=[cli coro dplyr generics ggplot2 glue hardhat rlang tibble torch]; }; brxx = derive2 { name="brxx"; version="0.1.2"; sha256="08qlfnf84k3yjcvr1wm6gd96mk26xf2gz59ychb3m981228hbbs6"; depends=[blavaan blme GPArotation MASS MCMCpack rstan TeachingDemos]; }; bs4Dash = derive2 { name="bs4Dash"; version="2.0.3"; sha256="17vpng0s0sr3bnaqq3d545s72zd5a7isdbvzh01148lzq0va710g"; depends=[bslib fresh htmltools httpuv httr jsonlite lifecycle shiny waiter]; }; bs4cards = derive2 { name="bs4cards"; version="0.1.1"; sha256="0fhjj3wjhxl263lhlbm5jw9l227a5k9cpannpankr5h8bkn1408h"; depends=[htmltools magrittr rlang]; }; @@ -6771,7 +6844,7 @@ in with self; { bsplus = derive2 { name="bsplus"; version="0.1.3"; sha256="1grn2i2xxq5fhkqb7lqsfhbfckr6i3ddy7mikgxz6lifk4rc4mxx"; depends=[glue htmltools jsonlite lubridate magrittr purrr rmarkdown stringr]; }; bspm = derive2 { name="bspm"; version="0.3.9"; sha256="1r0c0gnj0ps5cs9grwss7jxx5znywi80kng0rsb3dsmacwsfpkk1"; depends=[]; }; bspmma = derive2 { name="bspmma"; version="0.1-2"; sha256="1a3p1h7bks5yrxv791wfa680v4a6q10p59iz6wvfifhf3ndlaw49"; depends=[]; }; - bsreg = derive2 { name="bsreg"; version="0.0.1"; sha256="06kabvchg9jk9x6rgjlphnggpbfppzghqj7pw2nx1wizi2dw0sal"; depends=[Matrix R6]; }; + bsreg = derive2 { name="bsreg"; version="0.0.2"; sha256="13701llj5k7vssmgb4fvxswcf9bsc4pxjvh67znbsvrv5cmjh5x3"; depends=[Matrix R6]; }; bssm = derive2 { name="bssm"; version="2.0.0"; sha256="10gk0b235c3szll3g48w9r2iryc0hfx6chh9bvxhm5r0qsfigmla"; depends=[checkmate coda diagis dplyr magrittr posterior ramcmc Rcpp RcppArmadillo rlang sitmo tidyr]; }; bssn = derive2 { name="bssn"; version="1.0"; sha256="1brxbvcvqy8n9xpvp5kz47x5ps8hdqgnh6s49051qaylp95qm432"; depends=[ClusterR mvtnorm sn ssmn]; }; bst = derive2 { name="bst"; version="0.3-23"; sha256="1wx039cl8s1j1dwjg50ivn39fckkf8mzgrm953bg02w0p0fpz5bh"; depends=[doParallel foreach gbm rpart]; }; @@ -6785,6 +6858,7 @@ in with self; { buildmer = derive2 { name="buildmer"; version="2.3"; sha256="1marbhayiv00wrhjp2cnsg3p7zkzd6f82x13m7xdlx71zbvc4rfh"; depends=[lme4 mgcv nlme plyr]; }; buildr = derive2 { name="buildr"; version="0.1.0"; sha256="125s41d2ahww7ngli2mgl5999syjm5q5mxskv6jjrnfv7l6vhm3k"; depends=[glue magrittr readr rstudioapi stringr tibble usethis]; }; bujar = derive2 { name="bujar"; version="0.2-9"; sha256="1hx9yrry1v3vl14y1wpfp1l3cymyqhnff86sv6b112b9cfjpwmvq"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms survival]; }; + bulkAnalyseR = derive2 { name="bulkAnalyseR"; version="0.1.1"; sha256="18jzx4kv7sbyg834qqsm25k9s5kccljrnp4z9iy43f9kv0afan4i"; depends=[circlize ComplexHeatmap DESeq2 dplyr DT edgeR GENIE3 ggforce ggnewscale ggplot2 ggrastr ggrepel glue gprofiler2 magrittr matrixStats noisyr preprocessCore RColorBrewer rlang scales shiny shinyjqui shinyjs shinythemes shinyWidgets tibble tidyr visNetwork]; }; 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]; }; bullwhipgame = derive2 { name="bullwhipgame"; version="0.1.0"; sha256="03nwf2v4zhgkxvkghpkbkxz0cnkqcwwl51ykrk25qciakfqkgfws"; depends=[shiny]; }; @@ -6795,12 +6869,12 @@ in with self; { bundesbank = derive2 { name="bundesbank"; version="0.1-9"; sha256="05sc6m2v8bfgdka7v28rxhq5a8c88gsxkv0zjk08rpw8k8zql0dk"; depends=[]; }; bundesligR = derive2 { name="bundesligR"; version="0.1.0"; sha256="0dnhbh9jh7dfbk7mfh8msq4ys5kakalr0kwkycycrb2q8rd049vp"; depends=[]; }; bupaR = derive2 { name="bupaR"; version="0.4.4"; sha256="0ysxvp9ksn00mghll62k0a2qgrqccvprn5zwywsp77rhfb97pfdg"; depends=[data_table dplyr eventdataR forcats glue lubridate magrittr miniUI purrr rlang shiny stringr tidyr]; }; - burnr = derive2 { name="burnr"; version="0.6.0"; sha256="1xpdd6nni3zca2mabrq1bkgiqlk67v6mn6ykfrx95h8afzjr4k1p"; depends=[forcats ggplot2 MASS plyr reshape2 rlang stringr tidyr]; }; + burnr = derive2 { name="burnr"; version="0.6.1"; sha256="0pgki4inyql8h10i78yzqm73jy2h7rdp9ywsk65virxaadpngy9c"; depends=[forcats ggplot2 MASS plyr reshape2 rlang stringr tidyr]; }; bursts = derive2 { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; }; busdater = derive2 { name="busdater"; version="0.2.0"; sha256="0hib73zay9r7rv49zv1lx0l15jzjyli9f1vrk414l8apggvx4c6s"; depends=[lubridate]; }; butcher = derive2 { name="butcher"; version="0.1.5"; sha256="1yzp4zz2r9xwv2cxywwx2xmh9asnw0lyj15fix4h1ypadbxz68pd"; depends=[fs lobstr purrr rlang tibble usethis]; }; bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; }; - bvartools = derive2 { name="bvartools"; version="0.2.0"; sha256="0s5i902f35zkdm12zl3dmf896hv1bll0rnxl58679bam9q50dqk5"; depends=[coda Rcpp RcppArmadillo]; }; + bvartools = derive2 { name="bvartools"; version="0.2.1"; sha256="18spmp2w6gzh3pyfa3x609jp7f3asmkba74kpmb5sqgjvrhxybxa"; depends=[coda Rcpp RcppArmadillo]; }; bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; }; bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; }; bvpSolve = derive2 { name="bvpSolve"; version="1.4.3"; sha256="07a41nppzan812jbyj06nxdqnpw01v7snmdp5xwlm4wjw1v8z8aw"; depends=[deSolve rootSolve]; }; @@ -6810,16 +6884,16 @@ in with self; { bysykkel = derive2 { name="bysykkel"; version="0.3.1"; sha256="1lvqbax7dvli4265856f9667ckp9g5l4radz2cp0yk0slsjgsdpg"; depends=[glue httr jsonlite lubridate tibble]; }; bytescircle = derive2 { name="bytescircle"; version="1.1.2"; sha256="0786dkdww0qyhqr1di7pdcwrnymdcqq7kwrjalagykc41aa4jgza"; depends=[]; }; bzinb = derive2 { name="bzinb"; version="1.0.4"; sha256="1424lwsm2ra124h0ahbl42szbx500fqkf9ccw9k1688iwxnfg7f2"; depends=[BH Rcpp]; }; - c060 = derive2 { name="c060"; version="0.2-8"; sha256="1lazxvlgj340bvnx9h1ihnnrjm9rrq8j9qv6glpyvaw1dzb1a60m"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; }; + c060 = derive2 { name="c060"; version="0.2-9"; sha256="0bcip5lydd3alll6c8r7i0avs92rxc14i40lhmbbg5nygif4h8dn"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; }; c212 = derive2 { name="c212"; version="0.98"; sha256="0pzg239602iq56nhxfdvlk26z58lz6vvlbwsdpwhmich0by4gx4x"; depends=[coda]; }; c2c = derive2 { name="c2c"; version="0.1.0"; sha256="149np512wjnlr9glmqxpiamf6c31v0bh6ym95jpdhk0iw3ic9kvh"; depends=[]; }; c2d4u_tools = derive2 { name="c2d4u.tools"; version="1.2"; sha256="1ssp3sk5kml8in1ggnir77cq2kpmdmrhjblvw67ydxp22sqw7vwr"; depends=[]; }; c3 = derive2 { name="c3"; version="0.3.0"; sha256="1c2k7ml153bby749qi3a6nckhwwr71mvvps9dkbzkxkwnmlwpz1h"; depends=[data_table dplyr htmlwidgets jsonlite lazyeval viridis]; }; c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; 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.1"; sha256="1x7cbawzzpzripzyg4yavc9s6kx06ff4q151kbvylr9wsf78s6qg"; depends=[Rcpp RcppArmadillo]; }; + cIRT = derive2 { name="cIRT"; version="1.3.2"; sha256="1iwgxc1jl118j9yjhjix9f7dm75sj82iz7ic58g5625fxzdgnw25"; depends=[Rcpp RcppArmadillo]; }; cNORM = derive2 { name="cNORM"; version="2.1.0"; sha256="01iigvxl01h320yppnjlr46j7s2gz2g6yk00kfcr7b5zq8qzil2j"; depends=[lattice latticeExtra leaps]; }; - cOde = derive2 { name="cOde"; version="1.0.0"; sha256="12222wlsk9l6m9y477mjl8x279xhs8c1l1wsq92khwycm1j06jfy"; depends=[]; }; + 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=[]; }; cRegulome = derive2 { name="cRegulome"; version="0.3.2"; sha256="0cvxad73l85zsgqmis5p24v71kkzi784b8v5z07f0dh9yp41p96q"; depends=[DBI ggplot2 ggridges httr igraph R_utils RSQLite UpSetR VennDiagram]; }; @@ -6827,12 +6901,12 @@ in with self; { ca = derive2 { name="ca"; version="0.71.1"; sha256="095lk7p2b9835hc3a03c4019wg0baf0dhz6c2vqpaq1m9k4jy304"; depends=[]; }; caMST = derive2 { name="caMST"; version="0.1.4"; sha256="0467xfwqx6jwj442rlzkgyry8lnhvbxdazfpsy3wyd2iidb9a2g4"; depends=[catR diagram mstR]; }; caROC = derive2 { name="caROC"; version="0.1.5"; sha256="0cklvzfg95yyr37hdfmrna2z6lnhf9f6rrqcjsba1wjmqs8abgsh"; depends=[quantreg RColorBrewer]; }; - caRamel = derive2 { name="caRamel"; version="1.2"; sha256="15w1p770cjsxs198rlc8fzs9m8a4pg5day2iya7xz0fkwb3xmm2z"; depends=[geometry]; }; + 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.0"; sha256="1a473ca90306brhfrzf5hw6d6v252kd2vfwkvgblwy26jmrrr2km"; depends=[lpSolve]; }; + cabootcrs = derive2 { name="cabootcrs"; version="2.1.0"; sha256="0aqp8ip0s9raz4minhaw7vcn253xld4dgr957wsl2sp2nd8z66rq"; depends=[colorspace lpSolve]; }; cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; }; cache = derive2 { name="cache"; version="0.0.2"; sha256="0ffny3wbba755h6rs842z0hj5wyjhjin3b5lrxg09yqcjz03pll1"; depends=[cli digest here r_assert]; }; cachem = derive2 { name="cachem"; version="1.0.6"; sha256="0r0q5w8lsxak46crnkbi739qzys90hlw7cqqqhv99xzkpkvm554s"; depends=[fastmap rlang]; }; @@ -6841,7 +6915,7 @@ in with self; { 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="0.3.2"; sha256="1x3bcdd422wqv9gk9r2m8g19qcga220sm5rxdp4bgfc6vlqzzz7y"; depends=[Rcpp]; }; + calculus = derive2 { name="calculus"; version="0.3.3"; sha256="1fhvr0l2mqik3d95v0vanafxmiab147g5a87q956g2i945wc5f22"; depends=[Rcpp]; }; calendR = derive2 { name="calendR"; version="1.1"; sha256="1gji7ns35swdgg7bzq3vrzi4hnb98c5iw6r1j0k7nn2fdx7kbffp"; 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]; }; @@ -6849,19 +6923,23 @@ in with self; { calibrateBinary = derive2 { name="calibrateBinary"; version="0.1"; sha256="1k6sl4bg05piyczpk6wsva914gcmy8viyz4423gx9i6ddflb7xdb"; depends=[gelnet GPfit kernlab randtoolbox]; }; calibrator = derive2 { name="calibrator"; version="1.2-8"; sha256="1m9g1pmnr6d9jkg5ab0l0cbqfj7kmx7sdmcdqdhn9ifyhhn7812y"; depends=[cubature emulator mvtnorm]; }; callr = derive2 { name="callr"; version="3.7.0"; sha256="02inaf3c7b0hikii7p2zwaphrq5myv4in92d9jxd1ilmhla5awnn"; depends=[processx R6]; }; - calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; + calmate = derive2 { name="calmate"; version="0.13.0"; sha256="17gfk3am8frj9pqx31pmjswm5nvca9nqbanl0qj4ypsr8wymix7w"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; calpassapi = derive2 { name="calpassapi"; version="0.0.3"; sha256="1vhx5h7ah75cs1mlw25x7hal90m47596kr7fx2pd8fslq7il7p1b"; depends=[digest dplyr httr jsonlite stringr]; }; campfin = derive2 { name="campfin"; version="1.0.8"; sha256="06shr4p4g3cwxs1iszpvpk83k2mss6za68fqkv5pjiz44pc89v80"; depends=[dplyr fs ggplot2 glue httr lubridate magrittr purrr readr rlang scales stringdist stringr tibble]; }; + campsis = derive2 { name="campsis"; version="1.2.0"; sha256="1nngm2g2j8q7kfa7pl11zg28mb8m9kyyc3lfxsldydm6vijlckv7"; depends=[assertthat campsismod dplyr ggplot2 MASS plyr purrr rlang tibble tidyr]; }; + campsismod = derive2 { name="campsismod"; version="0.8.0"; sha256="1h919ci4jnwi812grbi4wjl7r86142xvb83hbhjni3yl93k0627s"; depends=[assertthat dplyr magrittr plyr purrr readr]; }; camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; }; camtrapR = derive2 { name="camtrapR"; version="2.0.3"; sha256="13zg8kx28il7rbyr2p3c1xdxx84b7shpcmgavzjqzh6wjm5bh5mh"; depends=[data_table overlap secr sp]; }; + canadacovid = derive2 { name="canadacovid"; version="0.3.3"; sha256="1xgabz1klq4rgbs1wdffgyyq35kcs9giwc55g76kd7psnf2giclk"; depends=[dplyr httr jsonlite lubridate magrittr purrr rlang stringr tibble tidyr tidyselect]; }; canadamaps = derive2 { name="canadamaps"; version="0.1"; sha256="1i3yjhr5p06k6id3gws5dzdhf4jy143brbfhi2z4srq67xlz5agl"; depends=[dplyr magrittr rlang rmapshaper sf]; }; - cancensus = derive2 { name="cancensus"; version="0.4.8"; sha256="0j4q00av0wssd0nwhgkdsyrcvicc4lial66ibfh5pyzih5i0dhpg"; depends=[digest dplyr httr jsonlite rlang]; }; + canadianmaps = derive2 { name="canadianmaps"; version="1.0.0"; sha256="1r45d65w8yfgwj8xf6lhsw0fi1b8j8gyayxrcs7wy56kacjjvym8"; depends=[dplyr ggplot2 ggrepel RColorBrewer rgdal sp]; }; + cancensus = derive2 { name="cancensus"; version="0.5.0"; sha256="0cnf16b2hn414w3saw84g7v06bhz2yi676ipzbp75dcsr0gk71pw"; depends=[digest dplyr httr jsonlite rlang]; }; cancerGI = derive2 { name="cancerGI"; version="1.0.0"; sha256="1chkcyf9m98gbn6b3vmb1baw7kii4g5vxvg2xfi7i6wwdn8sqr65"; 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.0"; sha256="0y6azzs603bf7rrz8hfql754xsdywl35846hj70f6sn1dj5wbzlk"; depends=[MASS rmarkdown xtable]; }; + canprot = derive2 { name="canprot"; version="1.1.2"; sha256="1lwlgzy0gxp7jrak838awmqz3w0x7qd51bkyhydb1s61073w77x8"; depends=[CHNOSZ MASS rmarkdown xtable]; }; cansim = derive2 { name="cansim"; version="0.3.10"; sha256="0cg6fjw7mbzhlbc83s0wv313hhvm2jc9phs6m97nigi5yy05faa2"; depends=[DBI digest dplyr httr jsonlite purrr readr rlang RSQLite rvest stringr tibble xml2]; }; - canvasXpress = derive2 { name="canvasXpress"; version="1.37.0-1"; sha256="1knq67j40vbrcdqbr1z3g5b5i5x62i07jy89sqx3045y3p66wsma"; depends=[htmltools htmlwidgets httr jsonlite]; }; + canvasXpress = derive2 { name="canvasXpress"; version="1.37.4"; sha256="00k7599b1lifbaxv7iqgb48mwd6r25wdkwi6qrzg4jzl41acx4pg"; 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.0"; sha256="0r20c5z28jyc5djymwkfzczyi3rlnj20p00jhc4dsywjcp68fx6n"; depends=[abind caTools corpcor doParallel evd foreach here igraph Matrix pheatmap propagate qtl qtl2 qtl2convert R6 RColorBrewer regress shape stringr yaml]; }; @@ -6875,9 +6953,9 @@ in with self; { capushe = derive2 { name="capushe"; version="1.1.1"; sha256="1aa76ir1kp67hiz7dr60azyc71yzslshyc640fjh0fpw0sp5kwbc"; depends=[MASS]; }; capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; }; car = derive2 { name="car"; version="3.0-12"; sha256="00kk8l71508f73kyn21is1mx6kjbrzdq3ls94c5ajhiqmvpsd6dq"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg]; }; - carData = derive2 { name="carData"; version="3.0-4"; sha256="09270j39n4jpswxqps20b12zaj8dz4rrqpk2l2j5bnf1xzizb9nd"; depends=[]; }; + 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="1.1.1"; sha256="0s97if3sgsji9qah66ha328lvsjgpdyw6wvkgmfcy5r4974qfi71"; depends=[magrittr reticulate]; }; + caracas = derive2 { name="caracas"; version="1.1.2"; sha256="0my74q2l4vncans5s541mphl5pvkd4knxb0i396yf5w6a1vnqwlw"; depends=[magrittr reticulate]; }; carat = derive2 { name="carat"; version="2.0.2"; sha256="0f6r4x5skjq7vcmwfhnrzrf69ry360y7wqrr5gsys8l5nv6qbjii"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo stringr]; }; carbonate = derive2 { name="carbonate"; version="0.1.3"; sha256="0y1wjrlh0rbfl1wz9028b637gs20giifp9ykg1yir2ak7fpwbq85"; depends=[clipr details httr magick R6 RSelenium rtweet wdman yaml]; }; carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; }; @@ -6887,6 +6965,7 @@ in with self; { careless = derive2 { name="careless"; version="1.2.1"; sha256="1zlkzrc9fw926knj6w7flv4q0w29k4aichawvprk94rk1bnrvdz5"; depends=[psych]; }; caret = derive2 { name="caret"; version="6.0-90"; sha256="1g36m06hp2fxxwv155bwbqlf97xhcia1lmg3axg6d74kgpns8lg8"; depends=[e1071 foreach ggplot2 lattice ModelMetrics nlme plyr pROC recipes reshape2 withr]; }; caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.1"; sha256="127gqd23xjis62irqviihzk80zydrdplwh65zcmd7ng29ih5wnby"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; }; + caretForecast = derive2 { name="caretForecast"; version="0.0.2"; sha256="1vnmwamgj5g7i2285krwi2m7p4jzvi7zk6bzqbj2jsblhbhdmf0i"; depends=[caret forecast magrittr]; }; carfima = derive2 { name="carfima"; version="2.0.2"; sha256="1n68jqn42m54xn7jq8qywrpnvggrcsgvgnlqg6nw0pgiplbkynih"; depends=[DEoptim invgamma mvtnorm pracma truncnorm]; }; cargo = derive2 { name="cargo"; version="0.1.38"; sha256="0a6pkfgs8nzn65a5nckaak7hjf30k68ghw1n82vh4gf3fjijqkiv"; depends=[]; }; caribou = derive2 { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; }; @@ -6899,26 +6978,25 @@ in with self; { cartography = derive2 { name="cartography"; version="3.0.1"; sha256="1ginq160ag0sv5xfiqc5a5vizsqvl3maw61yskwhfnjb2lcgk2yg"; depends=[classInt curl png raster Rcpp rgeos sf slippymath sp]; }; cartools = derive2 { name="cartools"; version="0.1.0"; sha256="0gc5502373f0c2m2rh6awvyfqrg1wx1f341dm2byk9znba887lgs"; depends=[animation devtools dplyr gapminder ggplot2 knitr rlist rmarkdown roxygen2 sde shiny tidyverse usethis]; }; carx = derive2 { name="carx"; version="0.7.1"; sha256="1qyqsj6pfzzqyaj6076zvgcimhl4cll6sxfb6aigm02rwfkq5gvh"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; }; + casabourse = derive2 { name="casabourse"; version="1.2.0"; sha256="13i8fzcqlld50522x6nlqfpdg9pf1f32l3r98i7c9y38kpf6yg8p"; depends=[gsheet RJSONIO rvest]; }; cascadess = derive2 { name="cascadess"; version="0.1.0"; sha256="105m5w8rb8bkzmlc5nwb4g0wl8jgvz63jxq665x4jfq0z78qiwgd"; depends=[crayon htmltools magrittr rlang]; }; - caschrono = derive2 { name="caschrono"; version="2.2"; sha256="0lbf7j6p5gzm4kk8sgzcmxwwzg59wp6g6l38m04609lpcsvxkd52"; depends=[Hmisc zoo]; }; cascsim = derive2 { name="cascsim"; version="0.4"; sha256="0n6frnbby1pjpx1z9lzxflmja2mg0dy99c5f7biakpaqi82x5xjb"; depends=[copula fitdistrplus moments R2HTML scatterplot3d]; }; caseMatch = derive2 { name="caseMatch"; version="1.0.8"; sha256="0bp2g0zzcspa6riinsa3bp1qwiip6z058hn2y5mw0w9xah8a685a"; depends=[]; }; casebase = derive2 { name="casebase"; version="0.10.1"; sha256="0yrzl961apslhk77gdnl9mmh1sdxw1az8lpl393n30qs1kl6g4zv"; depends=[data_table ggplot2 mgcv survival VGAM]; }; casen = derive2 { name="casen"; version="0.1.4"; sha256="19f52vqrzqd8mmnaf39jmsm5mhydv74gpnb4rxr3n9w07ppb77c9"; depends=[dplyr glue haven janitor labelled magrittr purrr rlang srvyr survey tibble tidyr]; }; 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]; }; - castor = derive2 { name="castor"; version="1.7.0"; sha256="1l5kds6g0dbnwlyjlpmy9jzdm6x5xm4qmagfy505i0g7l8065wfl"; depends=[Matrix naturalsort nloptr Rcpp RSpectra]; }; + castor = derive2 { name="castor"; version="1.7.2"; sha256="013mxk7r0p41l15slpjx5q3axhj3bd3cx1slpw1c11hlja6v3shn"; depends=[Matrix naturalsort Rcpp RSpectra]; }; cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; }; cat_dt = derive2 { name="cat.dt"; version="0.3.1"; sha256="0qr3azaxs339kfiiyzasc46xz4rb37prdwvdmv0c40cvba6zvapf"; depends=[ggplot2 Matrix Rglpk]; }; - cat2cat = derive2 { name="cat2cat"; version="0.2.1"; sha256="0hjx14g97dsdbk2fzficbinl04n5gs2ccr2c813q6xda28al5bam"; depends=[assertthat caret data_table dplyr MASS progress randomForest rlang tidyr]; }; + cat2cat = derive2 { name="cat2cat"; version="0.3.1"; sha256="1gh1vnyzgrfr8i2mkjnk8aaxal9ygbjvg28l76ilkrklzrpw1nqj"; depends=[assertthat dplyr MASS progress rlang tidyr]; }; catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; }; catR = derive2 { name="catR"; version="3.16"; sha256="1w39dxfzqk065v64qzmfamx8p1njsv13a461s6clagbqmhysmzbx"; depends=[]; }; catSplit = derive2 { name="catSplit"; version="0.1.0"; sha256="0nifbwczfs5g9xxlmqfwvcaxd940k5xmbdmamwlhvgif7myi6xr4"; depends=[caret data_table dplyr farff OpenML rpart stringr]; }; catSurv = derive2 { name="catSurv"; version="1.4.0"; sha256="02hrq51yk7zxz6vr4ykjwjnim9g09d63vpy3g0sm9hidbxryq139"; depends=[BH jsonlite ltm plyr Rcpp RcppArmadillo RcppGSL RcppParallel]; }; - cata = derive2 { name="cata"; version="0.0.10.3"; sha256="0gqscxzz7n04lh71481rzf6lmdg2xdsdpgp6viwxmmqm4zl5g1xj"; depends=[]; }; + cata = derive2 { name="cata"; version="0.0.10.8"; sha256="0mh74d1vr78ikpyrzv56sfc62ip4f8dhykzfgln9ri033nc5pvjp"; depends=[]; }; catalog = derive2 { name="catalog"; version="0.1.0"; sha256="15bxlwypk0xgf0qggq6jgxa951ipmn61w370f3lcywkvaxw1h4ca"; depends=[dplyr sparklyr]; }; catch = derive2 { name="catch"; version="1.0.1"; sha256="1a63d1a6pzzirdzswngjj036jmg41hbiadwriws7k05qp95jdh6a"; depends=[MASS Matrix tensr]; }; - catchr = derive2 { name="catchr"; version="0.2.31"; sha256="0mj3cgv2d217hcmyr8x0i83wysxhixgly5y1fs6jb1x09gs1cwnd"; depends=[purrr rlang]; }; catcont = derive2 { name="catcont"; version="0.5.0"; sha256="0ix6ipm3nn9aq5vxirjga2kwwfnxn4v8ggfjlg5v9027v2r8rb96"; depends=[dplyr]; }; catdap = derive2 { name="catdap"; version="1.3.5"; sha256="0fyhl69z2lznymvpzxra9qvcg85ggzkfjy68c6mzdmf1ja44d2k5"; depends=[]; }; catdata = derive2 { name="catdata"; version="1.2.2"; sha256="14kx7yi0cv6dyh9wjasb8gn6cp1bhglgwql7dc2a7lqvdcp0d5vj"; depends=[MASS]; }; @@ -6926,7 +7004,7 @@ in with self; { categoryEncodings = derive2 { name="categoryEncodings"; version="1.4.3"; sha256="0ns8ml2hm41650bi8yag6w3k9nb2ky43370444cgy3i7ajpzw87w"; depends=[data_table glmnet sparsepca]; }; catenary = derive2 { name="catenary"; version="1.1.2"; sha256="1n64kq3lkaf00a2mghs67hnxvi4dp6g12pwifyx0bd418wkw9wf3"; depends=[boot broom dplyr ggplot2 tidyverse]; }; catfun = derive2 { name="catfun"; version="0.1.4"; sha256="1482rll333fvy4h58f15flfs7qrck3vk9bzpdn3hayhnmc7svmma"; depends=[broom cli DescTools epitools Hmisc magrittr rlang]; }; - cati = derive2 { name="cati"; version="0.99.3"; sha256="0hq6hdzriab380pc0mx6g8xqflqj5mznr4b7fqw2f51kx8ang8hg"; depends=[ade4 ape e1071 FD geometry hypervolume nlme rasterVis vegan]; }; + cati = derive2 { name="cati"; version="0.99.4"; sha256="02g33kkp97kswiyjsd378zpa3fc9rjk2d9f4l1gdh7pzglabsmgl"; depends=[ade4 ape e1071 FD geometry hypervolume nlme rasterVis vegan]; }; catlearn = derive2 { name="catlearn"; version="0.8"; sha256="0vk4amvl6l4cxhfcr9z5glyb752vfsizlzqb14jv04am391xl4qd"; depends=[doParallel dplyr foreach Rcpp RcppArmadillo tidyr]; }; catmap = derive2 { name="catmap"; version="1.6.4"; sha256="18449qh10jxfi8p49gmbnib5y013nfdgdblbs4n0mfs0nnzb10sx"; depends=[forestplot metafor]; }; catmaply = derive2 { name="catmaply"; version="0.9.0"; sha256="0x2pzvjjhbwnvj8q1882bvqg895nj2airgmcidkixjmbq267vajz"; depends=[dplyr lubridate magrittr plotly rlang tidyverse]; }; @@ -6935,7 +7013,7 @@ in with self; { catsim = derive2 { name="catsim"; version="0.2.3"; sha256="1gz38xrzbray5ciiimkzdass8bhmiqxh6bcngjm5i8dvafk5gf9g"; depends=[Rcpp testthat]; }; catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; }; cattonum = derive2 { name="cattonum"; version="0.0.5"; sha256="11h9nh2i2bmd0b562l5avhwpj9ppnfmzd9nsv94cymhwn5h6nmg6"; depends=[dplyr purrr Rcpp rlang tibble tidyselect]; }; - causact = derive2 { name="causact"; version="0.4.0"; sha256="1mghawijsr0rpyy9pzvad11bf4qgfva7rb2pdkidm675a123sgc7"; depends=[coda cowplot DiagrammeR dplyr forcats ggplot2 greta htmlwidgets igraph magrittr purrr rlang rstudioapi stringr tidyr]; }; + causact = derive2 { name="causact"; version="0.4.1"; sha256="1acg73qaldhccc0k5wc76m4hwgzwyhfsm7721bwk5wns1q5l72vs"; depends=[coda cowplot DiagrammeR dplyr forcats ggplot2 greta htmlwidgets igraph magrittr purrr rlang rstudioapi stringr tidyr]; }; causal_decomp = derive2 { name="causal.decomp"; version="0.0.1"; sha256="08ccdzb5ssqhzkr3z3b8vz762mwflh33s6rrmsb9srvkk661lly2"; depends=[CBPS MASS nnet PSweight spelling SuppDists]; }; causalCmprsk = derive2 { name="causalCmprsk"; version="1.0.3"; sha256="0s1jshh30jmkk2cx29dfhibmfzbpaqk7i0f8wayb204r73a58f8a"; depends=[data_table doParallel foreach inline purrr survival]; }; causalPAF = derive2 { name="causalPAF"; version="1.2.4"; sha256="1ild77iiibzqbyxk3j20dydwmbrjf66r7qhd2ip2b3x9qbqq5wmh"; depends=[checkmate dagitty dplyr forestplot ggdag ggplot2 gridExtra magrittr MASS reshape2 rlist]; }; @@ -6967,7 +7045,7 @@ in with self; { ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.5"; sha256="171k70p4qyasr385ma3cvcga2b4nbz2dfry78wqx5yb1aa6wwcyc"; depends=[Rcpp sparsebnUtils]; }; cchs = derive2 { name="cchs"; version="0.4.2"; sha256="18zk50g7rw8cb09fczpcdgzjl1b06rgf6lwy99sg7nq4scnzgzm8"; depends=[survival]; }; cchsflow = derive2 { name="cchsflow"; version="2.0.0"; sha256="1r8m072f6idmmirwgr71llcka6f254jzhcs53yx6fxzncp5l2g6n"; depends=[dplyr haven magrittr sjlabelled stringr]; }; - ccid = derive2 { name="ccid"; version="1.1.0"; sha256="1c4nbbc99r3v075ymg174ivrrhdss7in1k5h773zp80aa1k1xalj"; depends=[gdata GeneNet hdbinseg IDetect]; }; + ccid = derive2 { name="ccid"; version="1.2.0"; sha256="0cmkkllcny53dayl74wqhphjznwj7nw7hvaj1fn6mlp6338h3rp8"; depends=[gdata GeneNet hdbinseg IDetect]; }; cclust = derive2 { name="cclust"; version="0.6-23"; sha256="00p4f558117p48jmkr2wh9smp58qkk4cx2gc19lm5krskm52nh71"; 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]; }; @@ -6995,7 +7073,6 @@ in with self; { cds = derive2 { name="cds"; version="1.0.3"; sha256="1h34k96h7ajkaqsw4dlqri63hrbnshaqwrdl74wlgycdlbvrqj05"; depends=[clue colorspace copula limSolve MASS]; }; ceRtainty = derive2 { name="ceRtainty"; version="1.0.0"; sha256="01wgvjpxqwhgh6vx9vbmiv4d88bps790l6ij3gw5w69hbrrd9ixi"; depends=[dplyr RColorBrewer tidyr]; }; cec2013 = derive2 { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; }; - cecs = derive2 { name="cecs"; version="0.2.3"; sha256="1x5p38yd8fjyghwzm5qvsfpa7vhy7yknrjwvp9viy6vdq0kfjcd6"; depends=[cec2013 stringr]; }; ced = derive2 { name="ced"; version="1.0.1"; sha256="0xrf3y1cr4dylhh2xr1gggnwdwn7riz37g6yw55hyryg03hxkms6"; depends=[Rcpp]; }; ceg = derive2 { name="ceg"; version="0.1.0"; sha256="01la7kv0a3inc9vy5x010ysicfiv404bqfgs8csvqixviap9rd74"; depends=[graph Rgraphviz]; }; celestial = derive2 { name="celestial"; version="1.4.6"; sha256="1gls0qvr8mxz79lsmk76v253f747g0cqys8p8wjmpijs8r0pyr4z"; depends=[NISTunits pracma RANN]; }; @@ -7009,7 +7086,7 @@ in with self; { cenROC = derive2 { name="cenROC"; version="1.2.0"; sha256="07ja3yyqmb9cs76if32aksgcwki3y6nh13lvn9j0bdgbgqx65f3r"; depends=[condSURV icenReg Rcpp RcppEigen survival]; }; censCov = derive2 { name="censCov"; version="1.0-0"; sha256="0i9vmyi12f1m5xnrl4cxk3z9qv7ymzxsyf4gbnpg1ph63yfnhv3g"; depends=[survival]; }; censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; }; - censReg = derive2 { name="censReg"; version="0.5-32"; sha256="044f3a1vkr318drcipv9zz5qsx85ld95x7fsy0w6cpc6zlkwxsyb"; depends=[glmmML maxLik miscTools plm sandwich]; }; + censReg = derive2 { name="censReg"; version="0.5-34"; sha256="025r19w40bc1vzz45sz1zywsfwp9p157mmlr4k78mvp6c096idwl"; depends=[glmmML maxLik miscTools plm sandwich]; }; censable = derive2 { name="censable"; version="0.0.3"; sha256="15274slkqkmwvipjb7p58knwpmq6iahpik2dg80j96fjdrpppl0g"; depends=[dplyr magrittr memoise rlang sf stringr tibble tidycensus]; }; censo2017 = derive2 { name="censo2017"; version="0.6.1"; sha256="02q25kxv6kxj3634xk7vd3mwa8qvnmagwyh020z9yq6l6qfn2s6b"; depends=[cli crayon DBI duckdb httr purrr rstudioapi tibble]; }; censorcopula = derive2 { name="censorcopula"; version="2.0"; sha256="16pk4xlpliif02qznrhvl8qmrr6k4kknygqxcm83nsjxy6dcyga8"; depends=[copula]; }; @@ -7033,10 +7110,10 @@ 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.6.4"; sha256="0harc4b3qxdb2gy01p6si7na8lrqjidw6ysndj12snyhdrx2id1m"; depends=[cli dplyr furrr future glue httr janitor jsonlite magrittr mgcv nnet progressr purrr rlang stringi stringr tibble tidyr xgboost]; }; - cfda = derive2 { name="cfda"; version="0.9.11"; sha256="0zlsrbn5yc3cvj8b3kgkc6ah6lqdqx1315cz1qac4m9yx9cybvlg"; depends=[diagram fda ggplot2 mgcv msm pbapply]; }; + cfda = derive2 { name="cfda"; version="0.9.12"; sha256="0xhw3vkvgzg1gg7zvnzp1xpja82791sgmclb0pbl7lcx2fbqigcx"; 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.18"; sha256="15bl1sfm2yz897b5w0x0kvyf2z3rx32n436gsnsx5gd32v5v18w1"; depends=[data_table doParallel foreach geosphere raster rgdal]; }; - cffr = derive2 { name="cffr"; version="0.2.0"; sha256="1wkixz388ix81kpprm7chl9dvi7c2rk6ajbc132crfm9ymfgpy1q"; depends=[crayon desc jsonlite jsonvalidate yaml]; }; + cffr = derive2 { name="cffr"; version="0.2.1"; sha256="0xnql538s5q8vdky343knkld7b400z22mx7znib17an7jjd4wz6v"; depends=[crayon desc jsonlite jsonvalidate yaml]; }; cfid = derive2 { name="cfid"; version="0.1.2"; sha256="0hy2vq3izj4938sgzmgpp4m9d49hpiqh9jd1wjf5g54x3v1yzy89"; depends=[]; }; cfma = derive2 { name="cfma"; version="1.0"; sha256="006z5g3rqpg44jqdf6ivyxr47sxm5cd9cqhayfi8qk73xx5w4lv9"; depends=[]; }; cfmortality = derive2 { name="cfmortality"; version="0.3.0"; sha256="0dgwv89fzylznc6jr41ixzfs1gfs3np4gf46bk6pcd09l1kbx3lc"; depends=[]; }; @@ -7067,7 +7144,7 @@ in with self; { changepoints = derive2 { name="changepoints"; version="1.0.0"; sha256="0ilzanfinzkadflknr9b4l9s1y2yl6vs4h5z1zi6kp9qps2asd10"; depends=[data_tree gglasso glmnet ks MASS Rcpp RcppArmadillo]; }; changepointsHD = derive2 { name="changepointsHD"; version="0.3.3"; sha256="1wdhmkg21kb5jd95a0aqqp2qgdkndc69rbdxjf792gq8f1rigarh"; depends=[Rcpp RcppArmadillo]; }; changepointsVar = derive2 { name="changepointsVar"; version="0.1.0"; sha256="0kj9m9jik1dm5fx4c4hb559f5irpl1mvxk4wwajd5577a2fdqxb5"; depends=[lars MASS]; }; - changer = derive2 { name="changer"; version="0.0.3"; sha256="1pmnspadkshz7z9f275vks1xjh6a9k37h7j51dqdjrqilzq7y6sf"; depends=[available devtools git2r]; }; + changer = derive2 { name="changer"; version="0.0.4-1"; sha256="0d5rh5a7ja5n390ikys939j8wc8kyvrv7pddpnzj8vmq7a90zzkd"; 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.4.0"; sha256="0hrc4kdympi05j6gx0x6vy4jb1mvxxi7pcrnpzcp8vxvd6r3wjmq"; depends=[R6 tibble whisker]; }; chartql = derive2 { name="chartql"; version="0.1.0"; sha256="108csn7q8qrjhiss54f5bliv3av7psq7kfryspajbdb6wm9ciz3p"; depends=[ggplot2 stringr]; }; @@ -7079,7 +7156,7 @@ in with self; { checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; }; checkdown = derive2 { name="checkdown"; version="0.0.7"; sha256="1bjij565vss2x8xbgq5qxx1d1snfw9wnphj0jhbm6vxxh2hg6g46"; depends=[knitr markdown]; }; checkmate = derive2 { name="checkmate"; version="2.0.0"; sha256="193gkifr9spp0x0rwnjq1spdhjkfkh4mv27iklskcj604075phhd"; depends=[backports]; }; - checkpoint = derive2 { name="checkpoint"; version="1.0.0"; sha256="19w5l1psjrhhx9n3sa258xvfgwp0jsdkjab757h2kjk36w4lcqfk"; depends=[jsonlite pkgdepends withr yaml]; }; + 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]; }; cheddar = derive2 { name="cheddar"; version="0.1-636"; sha256="1lf39v0p583jgiyb02vx0rgbwzmmhgkfpwjib2fzh9ffbs8bfk66"; depends=[]; }; cheese = derive2 { name="cheese"; version="0.1.1"; sha256="1r4n9li33am0bsyl57kzg1m9g4w0pzbw6garcdp3qk7lwqxy2y26"; depends=[dplyr forcats kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyselect]; }; @@ -7089,22 +7166,24 @@ in with self; { 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]; }; - chest = derive2 { name="chest"; version="0.3.5"; sha256="0jmihq8p6gxyxgmpdgwmnhl98s38pqzdzdqzqiy54zyqgd69plh8"; depends=[broom dplyr forestplot generics ggplot2 MASS speedglm survival tibble]; }; + chessR = derive2 { name="chessR"; version="1.5.0"; sha256="0ikpr4xaysnjzclj1x9lq8fm7rak2z5y3wn9494dk6lgwmk3hrr6"; depends=[curl dplyr jsonlite lubridate magrittr purrr rlang rvest stringr tidyr xml2]; }; + chest = derive2 { name="chest"; version="0.3.6"; sha256="12n65l4r85cr16c3p2w1krnqnxkvalrpi8xnbzw4y2m0sp42ydgl"; depends=[broom dplyr forestplot ggplot2 MASS speedglm survival tibble]; }; chi = derive2 { name="chi"; version="0.1"; sha256="1y91mwahj4j2wz0y5k5vdpq7ygq834h8jkn37n74lqnwvv1968rr"; depends=[]; }; chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; }; chicane = derive2 { name="chicane"; version="0.1.8"; sha256="0963r5jzyjihidh18ny9nqkim00bys3psdgrxhbah43bbl0kx43r"; depends=[bedr data_table doParallel foreach gamlss gamlss_tr iterators knitr MASS rmarkdown]; }; 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]; }; childdevdata = derive2 { name="childdevdata"; version="1.1.0"; sha256="016x6xhqq1mfqlj9m5qv63k639xnqnrf5h6rdcyaa8sxn7nv34zm"; depends=[]; }; - childesr = derive2 { name="childesr"; version="0.2.2"; sha256="1r4s6klwpdx1w17b611lqf6q9wpqknvqc6890jfav740dg8icl9z"; depends=[DBI dbplyr dplyr jsonlite magrittr purrr RMySQL]; }; + childesr = derive2 { name="childesr"; version="0.2.3"; sha256="1a58s0zph4mfmh9sdfbv7yaa20lx5gi0mca0ikzarfwxjl5knp39"; depends=[DBI dbplyr dplyr jsonlite magrittr purrr RMySQL]; }; childhoodmortality = derive2 { name="childhoodmortality"; version="0.3.0"; sha256="1ixd10jyzgr1ssnjas35kngpsqyjzl73wwpvcspv06cn12sv2b8d"; depends=[dplyr matrixStats plyr]; }; - childsds = derive2 { name="childsds"; version="0.7.6"; sha256="1h3p80byfma8zhivlq9jmdszm793chggnhb93qjnbl3vmnmnxgg7"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr purrrlyr reshape2 tibble tidyr VGAM]; }; + 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.2"; sha256="0s2f5bhr7d64rlk4x7cv6zjrbnf5g86lgg026svgrdxvs1vqa4as"; depends=[dplyr magrittr rlang rmapshaper sf stringr]; }; - chillR = derive2 { name="chillR"; version="0.72.6"; sha256="10ax14nlkfmamljrrm46b118f0l0b830mmys2n8dlbklgphqy479"; 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.72.7"; sha256="0wjxvrinl2zshgq15pm2l4ibl3y7aihg767sn8awvcdywl0dfkxx"; 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]; }; 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.2"; sha256="0lvrlpsvncyyzli84ivzmknk0g5g3lhciwl35wmrgyxf08bs4bqb"; depends=[crul jsonlite sf]; }; + 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=[]; }; - chk = derive2 { name="chk"; version="0.7.0"; sha256="1fxsxgvd08lkb6amjgs4x48dhqr046mmjngjfgy2ya9cl2shd7ls"; depends=[lifecycle rlang]; }; + chisquare = derive2 { name="chisquare"; version="0.1"; sha256="000y0wk2gh6yd4bh2n50v6zjr19ims6g7v7a1jc89iccqcgnff43"; depends=[formattable]; }; + chk = derive2 { name="chk"; version="0.8.0"; sha256="10gcv00mgi88vgxr9jrs0ar67crmdcdi4m9g86cm6pg3ly0v097y"; depends=[lifecycle rlang]; }; chlorpromazineR = derive2 { name="chlorpromazineR"; version="0.2.0"; sha256="0w7v6xk3vyf9dyf9bh5v9516v78yhcdvy7h1140pg2yw8xmfyr0r"; depends=[]; }; chngpt = derive2 { name="chngpt"; version="2021.5-12"; sha256="00g724b0w7dd95s2k9x10yi9xz2qfkxrpa98npbfq2w1pb8mgc57"; depends=[boot kyotil lme4 MASS RhpcBLASctl survival]; }; choiceDes = derive2 { name="choiceDes"; version="0.9-3"; sha256="1nsc8p4svfc6z7ckffl24c0acnaxi6cnpz7jq03vzn6spxvpjcmw"; depends=[AlgDesign]; }; @@ -7116,26 +7195,25 @@ in with self; { choroplethrAdmin1 = derive2 { name="choroplethrAdmin1"; version="1.1.1"; sha256="13ljs21hdhiv6n4napmk1gjnjhpll6j5wyijzv4xnnbi1y3ns7a9"; depends=[ggplot2]; }; choroplethrMaps = derive2 { name="choroplethrMaps"; version="1.0.1"; sha256="0ghqb2d1h0qkbcsll6ck2qk5sfvdwsrlh3phlbsjbak30832j7fr"; depends=[]; }; chorrrds = derive2 { name="chorrrds"; version="0.1.9.5"; sha256="045m3hqfk63zlb44s07wflaawzn030fg0nqck4w852m52a0r1z5v"; depends=[dplyr forcats magrittr purrr rlang rvest stringr xml2]; }; - christmas = derive2 { name="christmas"; version="1.1.0"; sha256="092fwc293mix7jw2i6d5xlymzq5smcza5xy35xs1f4fqyq0pw0ll"; depends=[animation]; }; + christmas = derive2 { name="christmas"; version="1.1.1"; sha256="0lxz71vbfqngkn4mg0c74ainww3vbzn8f4s5kmnw5bsd2mmwism7"; depends=[animation]; }; chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; }; - chromoMap = derive2 { name="chromoMap"; version="0.3.1"; sha256="06iy8rip99bsw5vadf6f7gpxarj4hs2japjq39zgzws8rrzvqccm"; depends=[htmltools htmlwidgets]; }; + chromoMap = derive2 { name="chromoMap"; version="0.4.1"; sha256="0iiiwxzbq2d3vrzijgw1ahrw1zkk55bvp2g31jjfzzff3xs05h23"; depends=[htmltools htmlwidgets]; }; chromseq = derive2 { name="chromseq"; version="0.1.3"; sha256="0m9dnm50iw176ffn6syd3538hxmjhkrxfzaf13210q100wk0lgz2"; depends=[]; }; chron = derive2 { name="chron"; version="2.3-56"; sha256="0p9zz96jfyf139924hdwkzhr8knkjvx6547ac53rknm3a6wwngl6"; 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]; }; chronochrt = derive2 { name="chronochrt"; version="0.1.0"; sha256="0n4921bxh7v5gbq65dsppcj9hs54ay6s219cmzqwhlgb2pv0mhmp"; depends=[dplyr ggplot2 magick magrittr readr rlang tibble tidyr tidyselect]; }; chronosphere = derive2 { name="chronosphere"; version="0.4.1"; sha256="1x4w4kap7cwkmrq4v6bvhlzm299i8chh4k02873ipnnqrhjxdhka"; depends=[raster sp]; }; chunkR = derive2 { name="chunkR"; version="1.1.1"; sha256="1kw3hsx5k4cdicx0hc1v0mf2nzvqg95shx2xv05vb2pass48qw48"; depends=[Rcpp]; }; - chunked = derive2 { name="chunked"; version="0.5.1"; sha256="08gw05bng4p35kfd9zcxz1l73jhlxlymw55vrsl6f2771l1r4bz5"; depends=[DBI dplyr LaF progress rlang]; }; + 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=[]; }; 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=[]; }; cicerone = derive2 { name="cicerone"; version="1.0.4"; sha256="1z3i720970kmczg01wxwbyqwd9zby69lchw3pgqwpn2bjr66jimh"; depends=[assertthat R6 shiny]; }; - cif = derive2 { name="cif"; version="0.0.9"; sha256="1rs44di1qjf6j89xg2x0a3s3lsnqxwnz0wcnys8xp68q198gipb6"; depends=[lubridate]; }; + 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.7.0"; sha256="1i3wbbd20vaa4p0xqyxpz8ayacn88a9b7cfr4m6ckxmdbz2jwlsj"; depends=[fields gifti oro_nifti RColorBrewer rgl RNifti viridisLite xml2]; }; + ciftiTools = derive2 { name="ciftiTools"; version="0.8.0"; sha256="0riladbcjgx4xgjxd1hbiaaghpgr5qn7lvgrpky4xhng8qycckp7"; 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]; }; - cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; }; cinaR = derive2 { name="cinaR"; version="0.2.1"; sha256="0i0fkh5j494fy9zy0p67ashqsa7vw3jhf092sw3nfyvmb7k4spnj"; 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=[]; }; cinterpolate = derive2 { name="cinterpolate"; version="1.0.0"; sha256="1aw6hs41xin2hhgmi4pr5510v4sn6x735lachpc5gpbxch5h3f82"; depends=[]; }; @@ -7143,12 +7221,13 @@ in with self; { circacompare = derive2 { name="circacompare"; version="0.1.1"; sha256="15vpnh20wni2wmp86xql9737kbxbi28s9a4pi3rihr1w5mcgqfaj"; depends=[ggplot2]; }; circle = derive2 { name="circle"; version="0.7.1"; sha256="04gb3575sdlhh5z6bkam8sj2wg9npgq0b9572qm2dlrspmjqvcd4"; depends=[cli httr jsonlite]; }; circletyper = derive2 { name="circletyper"; version="1.0.1"; sha256="11jqcz0faxd7g50nmxa58c3gyaysvzcrgh6yalpxapz06md17wq5"; depends=[shiny]; }; - circlize = derive2 { name="circlize"; version="0.4.13"; sha256="16rnqlkgzhnm69y70k9fiz8vvwlm5dyng04hlxqvvaxix3wdpfkc"; depends=[colorspace GlobalOptions shape]; }; - circular = derive2 { name="circular"; version="0.4-93"; sha256="0hki85rs8wc5950pjaw28q54rly2napfbcrx3pchlfap6wwy5kkn"; depends=[boot mvtnorm]; }; + circlize = derive2 { name="circlize"; version="0.4.14"; sha256="0b0yqjmbj1s1jg7y6cgyawadlfv0i6xrls8a4qy9qs7hz8zrpvb1"; depends=[colorspace GlobalOptions shape]; }; + circular = derive2 { name="circular"; version="0.4-94"; sha256="0wanbd6n7g1avvyc7pm0lnkwg868dix2byiz4wm6vmxzm0y47fmr"; depends=[boot mvtnorm]; }; circularEV = derive2 { name="circularEV"; version="0.1.0"; sha256="03qr0sfiqpz0zvm9xihwi07snhxkj5h6bcsxhrsr89xyb70wqwg0"; depends=[circular doParallel foreach ggplot2 mgcv NPCirc]; }; circumplex = derive2 { name="circumplex"; version="0.3.8"; sha256="1c6h06ccsql3yy3304b537wl40wd8f0sgj3gwi376irfz5zq227j"; depends=[assertthat boot dplyr ggforce ggplot2 htmlTable magrittr purrr Rcpp RcppArmadillo rlang tibble tidyr]; }; cit = derive2 { name="cit"; version="2.3.1"; sha256="1i1179d0rjnmrlwh031dxmvwp2w6k1c9fj5g3cfmzjk4xxb2bjha"; depends=[]; }; - citation = derive2 { name="citation"; version="0.4.1"; sha256="050dx029kz37rjmgcbik7rpa34bhhr81lrrsi17v50cy3nkr83x2"; depends=[desc jsonlite yaml]; }; + citation = derive2 { name="citation"; version="0.6.2"; sha256="15j2rxjfyfzkl3hrbfk9qb5zn39qgk6lyy0qzfx1nv083gx3xllh"; 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]; }; citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; }; citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; }; citecorp = derive2 { name="citecorp"; version="0.3.0"; sha256="0lqxa6qfysrk3rpg9fnsxhrfsd0qsbfxhc3b43090fhlxq9gk3wm"; depends=[crul data_table fauxpas jsonlite]; }; @@ -7157,24 +7236,27 @@ in with self; { ciuupi = derive2 { name="ciuupi"; version="1.1.0"; sha256="0czfmmf62p1vml24s87pdwv52spqycchpkqzwk8vyd4n1z27r5s2"; depends=[functional nloptr pracma statmod]; }; ciuupi2 = derive2 { name="ciuupi2"; version="1.0.1"; sha256="04x02qmqqyrc4h4z4mpl4zn5vr9y28k6j6n30fbr9q238zd543db"; depends=[functional nloptr pracma PreciseSums statmod]; }; civis = derive2 { name="civis"; version="3.0.0"; sha256="12q96bj21832zqqbisfxmnpqw7w72v350lyf7cpjgr7cq7b51brd"; depends=[future httr jsonlite memoise]; }; - cjbart = derive2 { name="cjbart"; version="0.2.0"; sha256="04zcy1051q9kgvjf9y3a952qz07r2syw80asndg9hbwx0jbvvpqm"; depends=[BART ggplot2 randomForestSRC Rdpack rlang tidyr]; }; + cjar = derive2 { name="cjar"; version="0.1.0"; sha256="1lachh62jsv4risbn4krd59hd8ni22figkfznh03w1mzygbvrkbg"; depends=[assertthat dplyr glue httr jose jsonlite lubridate magrittr memoise openssl progress purrr R6 rlang stringr tibble vctrs]; }; + cjbart = derive2 { name="cjbart"; version="0.2.2"; sha256="11ml35q1vjc696n6pwpbhzhf6g9r62l1yahbwkqbyd1jnkhpxmw4"; 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]; }; ckanr = derive2 { name="ckanr"; version="0.6.0"; sha256="1fhyyyklfsi1zva9vg397x8p0zbnchajkjb1kcfm4f861xq60j16"; 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.4.0"; sha256="14czria38vk64pxj8jrw4yix33fgwidygqjslgyjj07xfmwsdf1v"; depends=[IntCal]; }; - clampSeg = derive2 { name="clampSeg"; version="1.1-0"; sha256="1138wphhmf5hn5yh8p1fwix4lf2yncbc7xxcnnv2xz1z8b041qhs"; depends=[lowpassFilter stepR]; }; + clampSeg = derive2 { name="clampSeg"; version="1.1-1"; sha256="1zrndnd8n7ssn2fm0l7y31a2la0nsybqsl4j44r0mmc1m0m94vks"; depends=[lowpassFilter stepR]; }; clarifai = derive2 { name="clarifai"; version="0.4.2"; sha256="0igi4xl27nz0r85hpws2zfc2gn5z2nmywp3saxgp74mh2y99lg6s"; depends=[curl jsonlite]; }; clarkeTest = derive2 { name="clarkeTest"; version="0.1.0"; sha256="0vbb3j9rnh42qyp78a4jykp7p560d0ryfp28xgvxax8h8hr80457"; depends=[]; }; - class = derive2 { name="class"; version="7.3-19"; sha256="0dxyxk59fs90713qisanlvk4p0d3l8n8n7zdd4d5c290naaaw83q"; depends=[MASS]; }; + class = derive2 { name="class"; version="7.3-20"; sha256="10slys2jny4k2j8l8k97hwrwd6ryzajfnzywqpq2yc9bqxmh8nz6"; depends=[MASS]; }; classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; }; classInt = derive2 { name="classInt"; version="0.4-3"; sha256="1b1lqhpzxm6b8pza8l3s0cxy74mm9y45lcd3354i2v3bg8m7mply"; 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"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; }; - classmap = derive2 { name="classmap"; version="1.1.1"; sha256="0zr9yp21g8xyn1km9lrb9sydslkg86zpw06k65y7ly11liiv6gfc"; depends=[cellWise cluster e1071 ggplot2 gridExtra kernlab randomForest robustbase rpart]; }; + classmap = derive2 { name="classmap"; version="1.2.0"; sha256="0f5b1hx1n72042kkzkl4n9vr2w7q1pc1ivl0n907k4a7jzi3q63k"; depends=[cellWise cluster e1071 ggplot2 gridExtra kernlab randomForest robustbase rpart]; }; + 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]; }; cld2 = derive2 { name="cld2"; version="1.2.1"; sha256="01p64r2ij1i0xm3835vfnpxmmbnnaigp0md9x1hrq8gfsdwnzv3x"; depends=[Rcpp]; }; cld3 = derive2 { name="cld3"; version="1.4.2"; sha256="1f276kpg5ir1dmaacii55zb05d9r11995zv70lzrs4jn3q2h3qn6"; depends=[Rcpp]; }; clda = derive2 { name="clda"; version="0.1"; sha256="03zfanvpz1h42h2z38a63fck1p5hqig4w2svknzpw7mryji5q9b1"; depends=[MASS]; }; + cleaR = derive2 { name="cleaR"; version="0.0.1"; sha256="080jgkrzhk1h16ijf4q0x7ks9f96sx92dgxvqz22956gm0q8yxjy"; depends=[]; }; clean = derive2 { name="clean"; version="2.0.0"; sha256="0zvk3a5yz54g2mn7y1d91z6ljglbyq1hkh4iip1dfyi15chrqv7y"; depends=[cleaner]; }; cleanNLP = derive2 { name="cleanNLP"; version="3.0.3"; sha256="0bc0ya36yhknqhqc76yf9clgiacyb6zypzirzg6i0213bqw2ihdp"; depends=[Matrix reticulate stringi udpipe]; }; cleanTS = derive2 { name="cleanTS"; version="0.1.0"; sha256="0axrc6ax2d37mlx2cix9jbk9j2ksa86g074w70lymvl40f0zaz41"; depends=[anomalize data_table gganimate ggplot2 ggtext glue imputeTestbench imputeTS lubridate shiny stringr tibble tibbletime transformr]; }; @@ -7188,7 +7270,7 @@ in with self; { 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]; }; 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.1.0"; sha256="04ff3bgsahi736s8l6a26zlwwil8jw4shx7bb56ah1pp1f1n22n7"; depends=[glue]; }; + cli = derive2 { name="cli"; version="3.2.0"; sha256="0qp8k1afrn6ppwi6d9n05fjgj02196qcsppji3q37ph99msinnnd"; depends=[glue]; }; 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.8.0"; sha256="0j8hl5cgdm4j4h3x3h7fp6w3xr8p350icvmf123z56f6fkj6c22z"; depends=[beeswarm stringdist]; }; clickstream = derive2 { name="clickstream"; version="1.3.1"; sha256="0z1yy5lr9m5x9ybimjy3f6kn490abdi038xi0qw7ny80f1ca6ry7"; depends=[arules ClickClust data_table ggplot2 igraph linprog MASS plyr reshape2 Rsolnp]; }; @@ -7196,27 +7278,27 @@ in with self; { clifford = derive2 { name="clifford"; version="1.0-5"; sha256="1n7wra4z73nxv2hkdl65iwfl9cr3wn7sa6wpvfg1c7yp72kskbp0"; 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.0.0"; sha256="19i89274m7ybnlzgm5bgw6nwiwicc3fd2clmgiqklr23sq8zvn6w"; depends=[dplyr ggplot2 httr jsonlite lubridate rappdirs readr rlang tibble tidyr]; }; - climate = derive2 { name="climate"; version="1.0.3"; sha256="0wdns4zndnc4k2f6k22imr85glld9lsg3l43cprn0r8vcnzlhn08"; depends=[curl data_table httr XML]; }; + climaemet = derive2 { name="climaemet"; version="1.0.1"; sha256="1kvv0xbdcgkyg0pj7hs1552dqvl94z5gvik9p77lzq65kb17zsmg"; depends=[dplyr ggplot2 httr jsonlite rappdirs readr rlang tibble tidyr]; }; + climate = derive2 { name="climate"; version="1.0.4"; sha256="03yccy41rsxa7vy1qjpdkhfnbaaz4nndrn7zbn2lk746pdckhkmz"; depends=[curl data_table httr XML]; }; climateStability = derive2 { name="climateStability"; version="0.1.3"; sha256="1zag722sznr22xid2v1k4a9sh3sr3grfa3wwd2m943zpvyi1sk9a"; depends=[raster]; }; climatol = derive2 { name="climatol"; version="3.1.2"; sha256="0p3nk4n7izj0cmmqd9apa1gix5lfdzp08ydy0n7rkl5kbkmrkb6n"; depends=[mapdata maps]; }; - climatrends = derive2 { name="climatrends"; version="0.1.7"; sha256="0dj095jafl571hvf2bp21mdbp2pln0li9bgpymzjbpnbkvn8309j"; depends=[]; }; + climatrends = derive2 { name="climatrends"; version="0.2"; sha256="1jhj8h4as0qkbf4692z4rcvpg86cfs2fjks386gn0q1ayqn0cq91"; depends=[]; }; climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-11"; sha256="01ax0kas43g3h21ixzc80f9gl4m9846gmk8v48rr0gkhcmbcc6jx"; depends=[PCICt Rcpp]; }; clime = derive2 { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; }; climextRemes = derive2 { name="climextRemes"; version="0.2.2"; sha256="04ra2xqkf9zg7hbmb5ycfql9nwkabxy8412d05ajshld4cr0gi45"; 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.3.5"; sha256="0p5pq0kpm8sfxv1a1dp2wyykp1qqbxbjz0c4f20igc25aazd7kaz"; depends=[doParallel DoseFinding dplyr foreach ggplot2 glue magrittr purrr rstan shiny tibble tidyr waiter]; }; - clinDataReview = derive2 { name="clinDataReview"; version="1.2.1"; sha256="1p4kq18nkf5iqni17ry7zzxax85iri1v8nwn4vgwsv8qw8k29r8r"; depends=[bookdown clinUtils crosstalk data_table ggplot2 haven htmltools htmlwidgets jsonlite jsonvalidate knitr plotly plyr rmarkdown stringr yaml]; }; + clinDataReview = derive2 { name="clinDataReview"; version="1.2.2"; sha256="0j9w2fvbar30c03zcbhmy8qgdcv5hwj0q873hslxs9l4sca108zd"; depends=[bookdown clinUtils crosstalk data_table ggplot2 haven htmltools htmlwidgets jsonlite jsonvalidate knitr plotly plyr rmarkdown stringr yaml]; }; clinPK = derive2 { name="clinPK"; version="0.9.0"; sha256="1n1m8szd8mxdshwz8l3hfdxi7zrmsah46kxkv7jiffwnfhijfhsm"; depends=[curl testit]; }; clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; }; - clinUtils = derive2 { name="clinUtils"; version="0.1.0"; sha256="1sd71jxb0h69kpqj0606v4km2m28acqc8a5d4nhvr97l7isdm9lv"; depends=[crosstalk data_table DT haven htmlwidgets knitr plyr viridisLite]; }; - clinfun = derive2 { name="clinfun"; version="1.0.15"; sha256="0cv1kdxj911scri82ms21lk9frsdp4251fawdsbqinby7k6hhmkc"; depends=[mvtnorm]; }; + clinUtils = derive2 { name="clinUtils"; version="0.1.1"; sha256="0j06plczw3k54yc07dv6x931nmg2cfvkcmza16pji1zlx7nzs3sc"; depends=[crosstalk data_table DT haven htmlwidgets knitr plyr viridisLite]; }; + clinfun = derive2 { name="clinfun"; version="1.1.0"; sha256="1fca5nd36xzb50ccbwrb4xxvzhqg7s60smwr42k5z9sfywfh79y8"; depends=[mvtnorm]; }; 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.8.5"; sha256="0prrzs18sscna37nv5kxwczdy9jk9xxib1myi1fnxvincrhczmrj"; depends=[signal xml2]; }; + clintools = derive2 { name="clintools"; version="0.9.3"; sha256="0cf0gc3nhhjp5mf90qnbxfl6dsxjfbvddfw88xhi6j5nnfaxd44x"; depends=[lme4 signal xml2]; }; clipp = derive2 { name="clipp"; version="1.1.0"; sha256="1mh3rhkjm13yp1890d7zy2qn50nv177z74kr4pgnp5i7vlr8zqr6"; depends=[]; }; - clipr = derive2 { name="clipr"; version="0.7.1"; sha256="1ywa4kipwc2d7na6iiz3wzdah99h6aynnh74yxl3nzl40xxlgbgz"; depends=[]; }; + clipr = derive2 { name="clipr"; version="0.8.0"; sha256="1s9vvv3cxnz8w11gsi8z9ddv9jzib5qf5qqxnwqrrv7vj8cr7hij"; depends=[]; }; clisymbols = derive2 { name="clisymbols"; version="1.2.0"; sha256="1q7gi2zmykhzas9v8fdnbpdq7pzdcpbhim1yxvd2062l777g4j86"; depends=[]; }; clock = derive2 { name="clock"; version="0.6.0"; sha256="0vx77zgb19khwikvbl4cw6v0zkgxdz79l9j1knfl5l2cn4nj7sl5"; depends=[cpp11 ellipsis rlang tzdb vctrs]; }; clockify = derive2 { name="clockify"; version="0.0.9"; sha256="1m8jpafraycb85g7z4nna3isjyd5vfacbrxwpgn9745rbkg5iwly"; depends=[anytime dplyr httr janitor logger lubridate purrr tibble tidyr]; }; @@ -7226,16 +7308,17 @@ in with self; { clordr = derive2 { name="clordr"; version="1.6.0"; sha256="1w9km87wndr4fssfn7c9g2sy5lnk1ik0sqqwqyas7qc2h48la4di"; depends=[doParallel foreach MASS pbivnorm rootSolve tmvmixnorm ttutils]; }; cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; }; 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.2.0"; sha256="0n0ldg81k6i0wqnzzimkr7pyi2q705g9hia4ckf1cp2sskgrfvj0"; depends=[dplyr ggplot2 httr jsonlite rappdirs tibble]; }; - cloudstoR = derive2 { name="cloudstoR"; version="0.1.0"; sha256="0bcdm3qp1bcgb7wksvjisd7m629cqbdvf8779gmlqi3w5daw4lpq"; depends=[cli curl getPass httr keyring rio XML]; }; + cloudos = derive2 { name="cloudos"; version="0.3.0"; sha256="1rb82p77ipwvc57h46ph9gy0p6a4sq6mcz1cmq29jhs5by87kr21"; 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]; }; 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.3"; sha256="0jazgka18bb5n58d5sn94q7rc9sac82qrpl2i5b4rkx9q2pb39cn"; depends=[sandwich]; }; + clubSandwich = derive2 { name="clubSandwich"; version="0.5.5"; sha256="1ifnc2rg5agf7lpilmm27iq0af7ghfhkvwykajhvykgf6h4clvhf"; depends=[sandwich]; }; clue = derive2 { name="clue"; version="0.3-60"; sha256="0apgpdnn74mqg2bnr8yjyxgyvdl411h0r2b1r2xd67k21pyxs8bd"; depends=[cluster]; }; 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-1"; sha256="05zapv3rsil98rw59yakyszladifd7snknaz9k6g501jkpi79qcf"; depends=[MASS Rcpp]; }; + clusrank = derive2 { name="clusrank"; version="1.0-2"; sha256="1kpcdq0mnanfnbsbpbcv96ijgf2gv3n6i69jihmw8id7mjqjh2a9"; depends=[MASS Rcpp]; }; clust_bin_pair = derive2 { name="clust.bin.pair"; version="0.1.2"; sha256="11lqd3vmx4kg08n6iv9na8rra49dkldx4f8jyf43hppbjrbvfinm"; depends=[]; }; + clustAnalytics = derive2 { name="clustAnalytics"; version="0.3.1"; sha256="1himrajf9fw7j06bq0y0l6k10wa9fsn1v9bdk95jfkjfyna71vc2"; depends=[boot dplyr fossil igraph mcclust mclust Rcpp Rdpack truncnorm]; }; clustDRM = derive2 { name="clustDRM"; version="0.1-0"; sha256="1c5z08a15scp3nrwyh0c03pdaawvm3ivbygqpbglwxim7zf73rd2"; depends=[caret doParallel DoseFinding DT foreach IsoGene MCPMod multcomp ORCME ORIClust pheatmap RColorBrewer readr shiny]; }; clustEff = derive2 { name="clustEff"; version="0.2.0"; sha256="0kh3jzzqnchkgp0w1pz2sjxr215lyjh62v5857g94h91h5kn70y6"; 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]; }; @@ -7243,6 +7326,7 @@ in with self; { clustcurv = derive2 { name="clustcurv"; version="2.0.1"; sha256="1xkl84pd1a3phl5yfm21yr5c0gbmmg1wk9b0lyl2x8466v5hl53q"; depends=[doParallel doRNG foreach ggfortify ggplot2 Gmedian npregfast RColorBrewer survival]; }; cluster = derive2 { name="cluster"; version="2.1.2"; sha256="168l653ygkg21fwrqrf7lsqi5p6jzhgmcvhrwv7lznkdzdhag2jw"; 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]; }; clusterCrit = derive2 { name="clusterCrit"; version="1.2.8"; sha256="10pz1bikdbkm2ky3xnagp0qv60whalavp6j39b4p7d75jj5xcxgk"; depends=[]; }; clusterGeneration = derive2 { name="clusterGeneration"; version="1.3.7"; sha256="0p1dwl08bf20h7pnspnsycrp3v48nm2miwcnlklyc4gdyzc2jksk"; depends=[MASS]; }; clusterGenomics = derive2 { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; }; @@ -7255,10 +7339,10 @@ in with self; { clusterhap = derive2 { name="clusterhap"; version="0.1"; sha256="1ic6588mqp146jsvrxlxk449zw4n81xixgrny9r29497z7hg5a1m"; depends=[]; }; clustering_sc_dp = derive2 { name="clustering.sc.dp"; version="1.0"; sha256="0cppka7613cbjjf1q2yp6fln511wbqdhh8d4gs6p0fbq379kzmvc"; 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.2"; sha256="1p5jy4mq70wh8rrkppshjy9pksw06k9l2d65c6sj1ykhvqiwcpcc"; depends=[narray progress purrr R6 Rcpp]; }; + clustermq = derive2 { name="clustermq"; version="0.8.95.3"; sha256="1h6s31ni8q5x062sgp7mhm1aw099nsj21diw00mr3m76yizsram7"; depends=[narray progress purrr R6 Rcpp]; }; clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; }; - clustertend = derive2 { name="clustertend"; version="1.5"; sha256="194acf2pd71jxyyjj7ri9mpnx094zziwmq6w9lfclifrnkqv6ra9"; depends=[]; }; - clustra = derive2 { name="clustra"; version="0.1.5"; sha256="1aw1jw8lq8qpsfgzkpjp00xhmk7rl99yc43jvjc8c5sp5bibcll0"; depends=[data_table mgcv MixSim]; }; + 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]; }; clustrd = derive2 { name="clustrd"; version="1.3.9"; sha256="0w644h2sr0nwx3qh15qbmbrnfzmf3rzv9ka7nfskq2si4yrj25z4"; depends=[ca cluster corpcor dplyr fpc GGally ggplot2 ggrepel plyr rARPACK tibble]; }; clustree = derive2 { name="clustree"; version="0.4.4"; sha256="0vwmicajl7c0rmjdmf4f857fii0xrxz25vjkn888svlsikw00qbs"; 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]; }; @@ -7269,39 +7353,40 @@ in with self; { cmaRs = derive2 { name="cmaRs"; version="0.1.1"; sha256="0y9p1r58q45adsb60fvdvqn6m0a6ad32vl15fsy9l83r7aimcwci"; depends=[AUC earth Matrix Rmosek Ryacas0 stringr]; }; cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; }; cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; }; - cmcR = derive2 { name="cmcR"; version="0.1.8"; sha256="06sxfmwrwplw0zghajaygzjlbl9cbnazn0sbff6n73ia8pl3yxkr"; depends=[assertthat dplyr ggnewscale ggplot2 imager magrittr purrr quantreg rlang scales stringr tibble tidyr x3ptools zoo]; }; + cmcR = derive2 { name="cmcR"; version="0.1.9"; sha256="06pw7lbp85xfnglcc86h1b4ipy1igvf43ihpqm9m67d4jc9r6acs"; depends=[assertthat dplyr ggnewscale ggplot2 imager magrittr purrr quantreg rlang scales stringr tibble tidyr x3ptools zoo]; }; cmce = derive2 { name="cmce"; version="0.1.0"; sha256="0d52ci906zbd4q43qylcyw93acxh7f20jn3r0k74ynyy47131dnd"; depends=[]; }; 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.1"; sha256="0f7bci6nn63q243i7wvhr9mqlf64gw8w042nc1lqb986p7zfxihk"; depends=[glmnet hierNet MASS Rcpp RcppArmadillo sparsenet]; }; - cmfrec = derive2 { name="cmfrec"; version="3.3.0"; sha256="01wiv1mx89sb465vc9wbh4f856al860y4v27c62bcbs11jfvz43q"; depends=[]; }; - cml = derive2 { name="cml"; version="0.0.1"; sha256="18zzb1vldgn61jlds7p79wr13jl13q9icfiraj33kwdmx3q6yh2c"; depends=[MASS vegan]; }; + cmfrec = derive2 { name="cmfrec"; version="3.4.2"; sha256="0qg2ssrijfsrpr4gl0rri7kxyf1s8ifdvsizpxm5r8srl0j64hq1"; depends=[]; }; + cml = derive2 { name="cml"; version="0.0.2"; sha256="0i1c9xfrb5d5krza5p88cvnhkswp49csihy6ijwxqmqk20g78r3c"; depends=[MASS vegan]; }; cmm = derive2 { name="cmm"; version="0.12"; sha256="0q6hs56hhi9vaanx7i7gg7ncv0h29lndla66g9chzmh3lchq3r20"; depends=[]; }; cmmr = derive2 { name="cmmr"; version="0.1.2"; sha256="0nik1pzd1rckalvn7xh6s699kkdjnra3q3bn5x16c1lmpz5bp2s4"; depends=[httr progress RJSONIO]; }; cmna = derive2 { name="cmna"; version="1.0.5"; sha256="161qc7q88ajm3l62bq03lpf35bdii1w1d111085zvs3hrf09iybw"; depends=[]; }; cmocean = derive2 { name="cmocean"; version="0.3-1"; sha256="0y6yd3x2swx88r7kv6f9lrbf3zzawhf2x8izszgg4zb21pkal6k8"; depends=[]; }; - cmprsk = derive2 { name="cmprsk"; version="2.2-10"; sha256="1xnx2zanw548prxsw2zw5cddkkg6kj97jgyzw67achq5mnsvfbg8"; depends=[survival]; }; + cmprsk = derive2 { name="cmprsk"; version="2.2-11"; sha256="050f24l5ab1ds9824c7yjahimf6pg8ih2k83jzpzfb0n5k5jfh44"; depends=[survival]; }; cmprskQR = derive2 { name="cmprskQR"; version="0.9.2"; sha256="1b3di5fsgglriv00fxydpc4p8lh0xcgi6jc04awq2vmp6s8kvjmw"; depends=[quantreg survival]; }; cmprskcoxmsm = derive2 { name="cmprskcoxmsm"; version="0.2.1"; sha256="1q17nzvqv0c8p2fs34fqszllp6g7kdbsmw4frlxpbjr3gwgd8rlk"; depends=[ggplot2 sandwich survival twang]; }; cmpsR = derive2 { name="cmpsR"; version="0.1.0"; sha256="0gxngq2awpignkdwi5cn6gxwk0q2fi3zy55jg5mlkihz2sq9iyyg"; 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.3.1"; sha256="150bqj6ccws8i0nsmnpsx68h8ghzhi46nj9jam7qkj32s8d5bc9g"; depends=[cmsafops cmsafvis colorspace colourpicker data_table fields FNN mapproj maps maptools ncdf4 R_utils raster rworldxtra SearchTrees shiny shinyFiles shinyjs shinythemes sp xml2]; }; - cmsafops = derive2 { name="cmsafops"; version="1.2.2"; sha256="14m51hljcq08m3mf4h6bq5izykc0wa0kby44c4pk9vx1fsq4x8z6"; depends=[assertthat fields FNN ncdf4 progress rainfarmr raster SearchTrees sp trend]; }; - cmsafvis = derive2 { name="cmsafvis"; version="1.1.9"; sha256="0qjfx5d1fcalvhjahkz501dvc6l2sxrrsa6gpdgkm93vafiw6wf5"; depends=[animation assertthat cmsafops colorspace countrycode fields gridExtra mapproj maps maptools ncdf4 png progress raster rasterVis RColorBrewer rgdal rworldxtra SearchTrees sp yaml]; }; + cmsaf = derive2 { name="cmsaf"; version="3.4.0"; sha256="1j5ajahk5vx15ii1zsldm7aikqhlhm3gl7gx6ykx3lxjbanp5hv8"; depends=[cmsafops cmsafvis colorspace colourpicker data_table fields FNN mapproj maps maptools ncdf4 R_utils raster rworldxtra SearchTrees shiny shinyFiles shinyjs shinythemes sp xml2]; }; + cmsafops = derive2 { name="cmsafops"; version="1.2.3"; sha256="194y5i54vbqlmjmf5dfcq0lxffavnnv9vp9b8cafs2zlh6xyxl4j"; depends=[assertthat fields FNN ncdf4 progress rainfarmr raster SearchTrees sp trend]; }; + cmsafvis = derive2 { name="cmsafvis"; version="1.1.10"; sha256="0jfb6jvv6jncl5625sskqn6v3aqs4283swg9py71i0jv55bzd0ws"; depends=[animation assertthat cmsafops colorspace countrycode fields gridExtra mapproj maps maptools ncdf4 png progress raster rasterVis RColorBrewer rgdal rworldxtra SearchTrees sp yaml]; }; cmstatr = derive2 { name="cmstatr"; version="0.9.1"; sha256="18kcrnbi3r8n8d7s8cl55r2n41cv4q4h6g8lf4pdkv06axg3l7ad"; depends=[dplyr generics ggplot2 kSamples MASS purrr rlang tibble]; }; - cmtest = derive2 { name="cmtest"; version="0.1-1"; sha256="0ahdgmqzqggv2qas9b116k0dizvwph736jj0d0dj381d6zgwqda4"; depends=[Rdpack]; }; - cmvnorm = derive2 { name="cmvnorm"; version="1.0-6"; sha256="1wf23w9gxrrgw7j740r381xrss09inzd7mrg6g7wz883c9madbfn"; depends=[elliptic emulator]; }; + 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.3.0"; sha256="1wnimcp3mpilam02x7d34mi6xavz2mw61n5axkllz1jl1p2pjmmz"; depends=[car Matrix matrixStats Rcpp]; }; cnaOpt = derive2 { name="cnaOpt"; version="0.5.0"; sha256="0vfbyfd5gwyz7fykskwargckmzq5v6h5irmb3khmpk9a882w1s32"; depends=[cna dplyr ggplot2 matrixStats Rcpp]; }; cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; }; cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; }; cns = derive2 { name="cns"; version="0.1.0"; sha256="1kn1cq32pp05ag22n7iwjxn6lxpqn443npzk6vdskjm5pbnsc33k"; depends=[]; }; cnum = derive2 { name="cnum"; version="0.1.3"; sha256="0iphbx5ii4ij0bi9nqdz793i4gk2164jlgz5xn8yzsayjmizhdk2"; depends=[BH Rcpp stringr]; }; - coRanking = derive2 { name="coRanking"; version="0.2.2"; sha256="04ad3w7fpzp3dni7z8k9fiba8vi7rvfpyik81cx0smh84i4m8m5v"; depends=[]; }; + coRanking = derive2 { name="coRanking"; version="0.2.3"; sha256="09dq4xxpi632jb9vh96rsy2g51sn6apbccx9c8073hfsm078b4w6"; depends=[]; }; + coala = derive2 { name="coala"; version="0.6.1"; sha256="0c29bwlls22gfkxyc51gx1fnk8725327j6kfvrjcg5ckyw5ydqhq"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; }; coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; }; coalitions = derive2 { name="coalitions"; version="0.6.20"; sha256="0v9345xscfdyn5qdj6ncwzbbpry942dlly91l997ba42f9j6qdjk"; depends=[checkmate dplyr ggplot2 gtools jsonlite lubridate magrittr purrr RCurl rlang rvest stringr tibble tidyr xml2]; }; coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-6"; sha256="1g9hxyp2vdhq1zr18qlf2aqwp9d9hr07k6grmvblj2xrwlzfvc1p"; depends=[MCMCpack]; }; - cobalt = derive2 { name="cobalt"; version="4.3.1"; sha256="1y7fh3lrbj5sqkqhnyl4lm7g75dld96gap95xfds70x01iq6mqk7"; depends=[backports crayon ggplot2 gridExtra gtable rlang]; }; + cobalt = derive2 { name="cobalt"; version="4.3.2"; sha256="0k1ibmnh46wk6bq1xra5chi0l6a4ncgaagwgzmhnmpj1drsd1gxr"; depends=[backports crayon ggplot2 gridExtra gtable rlang]; }; cobiclust = derive2 { name="cobiclust"; version="0.1.0"; sha256="068cqrhx7lxsvcjb62rgrca7y20cybz4445bl1qc6k16ca4bh0m9"; depends=[cluster]; }; cobs = derive2 { name="cobs"; version="1.3-4"; sha256="0hiw5smk6kgk0gb9840kcqkhkybl7n30s77xhjc395x09izbgix1"; depends=[quantreg SparseM]; }; coca = derive2 { name="coca"; version="1.1.0"; sha256="1lh7q3ip1jaz5zj5zcnd5whwpjw6zcrxs6j0j8mnmjsnw2kr4m5n"; depends=[caret cluster fpc glmnet Matrix nnet pheatmap RColorBrewer sparcl]; }; @@ -7311,6 +7396,7 @@ in with self; { cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; }; coda = derive2 { name="coda"; version="0.19-4"; sha256="13z5dwfpnyyhpsbpg4xr9g5c1685jhqj90f4x4qkcykr6kykqba2"; depends=[lattice]; }; coda_base = derive2 { name="coda.base"; version="0.3.1"; sha256="0rz0hlhww9ja1y40yi4fah468apwp1xcnbbl1qmfggil863l5fqa"; depends=[Rcpp RcppArmadillo]; }; + codacore = derive2 { name="codacore"; version="0.0.3"; sha256="1zfzhpax625qpj8s9i91pxljkmszgkxj7n0brz9pd9n84r66vr90"; depends=[gtools keras pROC R6 tensorflow]; }; codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; codalm = derive2 { name="codalm"; version="0.1.2"; sha256="09q7i96wga55xl8wwkb4i2sisn97wd21zqpmasykpi1aamzysqki"; depends=[future future_apply SQUAREM]; }; codeCollection = derive2 { name="codeCollection"; version="0.1.2"; sha256="0jimahw008l2x4c646dwf6f5vw9xlh8rfm7l6kgj8q4iymzbr8rm"; depends=[Epi]; }; @@ -7327,7 +7413,7 @@ in with self; { codingMatrices = derive2 { name="codingMatrices"; version="0.3.3"; sha256="0nbx3w016d8rw4pidf72zcw1hf95y7h0rb5ska49nfnjkh3qc0p2"; depends=[fractional Matrix]; }; codyn = derive2 { name="codyn"; version="2.0.5"; sha256="1iqlh3ydnqi7s2b3fa2zgb05j763qgxriys4piawwmgrdrvd3d9q"; depends=[assertthat permute vegan]; }; coefficientalpha = derive2 { name="coefficientalpha"; version="0.7"; sha256="0li1js501sa8m0ba76ymn4lz5y4np7kf96gnxz9kypg50kd58yis"; depends=[lavaan rsem]; }; - coefplot = derive2 { name="coefplot"; version="1.2.7"; sha256="1r0izd51vhp7z2lf6z2ddqidy1ik0ziks847ixmhyhgf7hpkmflk"; depends=[dplyr dygraphs ggplot2 magrittr plotly plyr purrr reshape2 tibble useful]; }; + 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]; }; coexist = derive2 { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; }; @@ -7341,19 +7427,19 @@ in with self; { cohorttools = derive2 { name="cohorttools"; version="0.1.4"; sha256="1zpf3qgzkn34wc36r89ymzfx4fvlgl7x1yiwdwzzd20xv3nx2b5h"; depends=[cmprsk DiagrammeR DiagrammeRsvg Epi ggplot2 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]; }; - coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.3.2"; sha256="0n62kcw7yxpvxd2bzki432cis5rvfw8b8syfvgv5wpq53bavq3px"; depends=[cli crayon curl data_table ggplot2 jsonlite]; }; + 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.6.5"; sha256="0ijsp4azblyvgryx94ymfzcc6d5f3g794z8yv3amxsxmc8x2l8qy"; depends=[Rcpp]; }; + collapse = derive2 { name="collapse"; version="1.7.6"; sha256="0hyxdmy3nm1jwls6h6q487hsx5yjiiy2l3wy1x29k4k69fc3xkxw"; 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]; }; collectArgs = derive2 { name="collectArgs"; version="0.4.0"; sha256="0fz5w1xsxiddzrwahrg50px4igyhd4plq655jaix6grancs7kvix"; depends=[magrittr]; }; collections = derive2 { name="collections"; version="0.3.5"; sha256="053ig88pva78wxxwya3v7cz853k563dkpgxrf2xvd0l0d9fanxmz"; depends=[]; }; collidr = derive2 { name="collidr"; version="0.1.3"; sha256="18ki8mwf5ihbgfbhdbbk9ljs44js3rqgl1g6g3ch6dynz61sr6hn"; depends=[dplyr jsonlite stringr]; }; - collin = derive2 { name="collin"; version="0.0.1"; sha256="08yg1gdp04l5rxkyvm784n2iqszgb4rlsv3b46n5bzwr334nmsav"; depends=[dlnm MASS mgcv nlme VGAM]; }; + collin = derive2 { name="collin"; version="0.0.2"; sha256="12gxndq5xqfvc9m10y6pjf99npr65dp1fhpy5lg9wnq7r4zv2610"; 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.1.0"; sha256="1sxcav8z988x40883qayylvzg9wrnh84x6vv7r8jc1jxyk76abws"; depends=[data_table ggplot2 susieR viridis]; }; @@ -7378,7 +7464,7 @@ in with self; { colorpatch = derive2 { name="colorpatch"; version="0.1.2"; sha256="18p9hgccp37pbdf437xffkv6z500896v08fsw2jm8zcl9ladygaf"; depends=[colorspace ggplot2 gridExtra TSP]; }; 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.0-2"; sha256="0fhq2aykdkxh3r90i8aqjyb37p5api3mjd19ch8mzv99q4pcv4dq"; depends=[]; }; + colorspace = derive2 { name="colorspace"; version="2.0-3"; sha256="0zw52s8g2gxp8i1ax96azxmxqrbhb7aad5px0c1vgr6n9p682mp7"; depends=[]; }; colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; }; colourlovers = derive2 { name="colourlovers"; version="0.3.6"; sha256="13fqn6hbqjk3d8krpqb3hmsq06qrbks8a9ia5441hd6m7m8wjjkc"; depends=[httr jsonlite png XML]; }; colourpicker = derive2 { name="colourpicker"; version="1.1.1"; sha256="1q1wi3g403fbzp4ys3gsjbwdc86x770cx323qgi47ca8n219kl50"; depends=[ggplot2 htmltools htmlwidgets jsonlite miniUI shiny shinyjs]; }; @@ -7387,7 +7473,7 @@ in with self; { colr = derive2 { name="colr"; version="0.1.900"; sha256="0ilz1y0jd2vgyh81g3dwx2l64sir6z6sgmqx7lnvr1hafsqnwfc8"; depends=[]; }; colt = derive2 { name="colt"; version="0.1.1"; sha256="028jqvgr14ig8jxp8h2lrf7mainzppgqh6v1479qfv4l9is3bnwy"; depends=[crayon]; }; comFuncs = derive2 { name="comFuncs"; version="0.0.5"; sha256="1n17s28rf6jbii8cffzxylp5dr47x4my7chvf2j1zh4vrkml0n1n"; depends=[rstudioapi shiny]; }; - comat = derive2 { name="comat"; version="0.9.2"; sha256="0y42ljjgmqa2bp4d1xnx71x79j4xsq2f53fa8m5p6sw3w667ifjr"; depends=[Rcpp RcppArmadillo]; }; + comat = derive2 { name="comat"; version="0.9.3"; sha256="0igcqvz1sjprxw6qf3wy9awywx9g5xcdkr9sl3vb61jyxxppnagh"; depends=[Rcpp RcppArmadillo]; }; comato = derive2 { name="comato"; version="1.1"; sha256="0lidwr5vw10655p7q0iqzq3phq5y1i86w3bjdv87cwx3m6333bz6"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; }; 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]; }; @@ -7399,10 +7485,10 @@ in with self; { cometr = derive2 { name="cometr"; version="0.2.0"; sha256="0fbg1lfw0q4lfk4svflfwjfmwxbrdvmrvxry90xp39i7g8zd2ahd"; depends=[callr httr jsonlite R_utils R6 yaml]; }; comf = derive2 { name="comf"; version="0.1.10"; sha256="0iimah487k6wf9sf4y39ldlm8ww017629bj8115ri9ffp0353g33"; depends=[plyr reshape]; }; commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; }; - commonmark = derive2 { name="commonmark"; version="1.7"; sha256="024iz1qp2kv6iz6y69ir0jk3qhjps86rhkzlcmhqsxx97rx7cjni"; depends=[]; }; + commonmark = derive2 { name="commonmark"; version="1.8.0"; sha256="0s765c650id19ygx57bsjsw93fwxywmp50zid671bkxi6wlyf1vx"; depends=[]; }; commonsMath = derive2 { name="commonsMath"; version="1.2.5"; sha256="1c4lgmggpc22mhwcpy521b2pg8wf4bbjp0a6rbcn0aki90xw9ckk"; 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="0.5.3"; sha256="10zlq1586abngdrw5hgba78ridn3xj4q68f34slxpk0gxwa94n7p"; depends=[checkmate data_table]; }; + comorbidity = derive2 { name="comorbidity"; version="1.0.0"; sha256="0cv3gay7mxba8kr19580dv7vyqlacdybxf5a2y96ll43g64w1gyp"; depends=[checkmate data_table stringi]; }; compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; }; compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; }; comparator = derive2 { name="comparator"; version="0.1.1"; sha256="02j36dm9vg53v224djy6v7jicd1d5sdx148r8qh096zb942wpvp6"; depends=[clue proxy Rcpp]; }; @@ -7413,7 +7499,7 @@ in with self; { compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; comparer = derive2 { name="comparer"; version="0.2.2"; sha256="1rhx9an7qi9r3cv2zpnb9qw0byg06zabg99v51mal218080r6rvm"; depends=[R6]; }; comparison = derive2 { name="comparison"; version="1.0-5"; sha256="0vg8s9j2xjzv7bidd59givxgcqzhdd29q84dj4ww2a6vkmq269r7"; depends=[isotone]; }; - compas = derive2 { name="compas"; version="0.1"; sha256="1ckryllwd8avz6456970qhfa3wpcsmhkicnibnv7gl4crzf44xgx"; depends=[bio3d Rcpp RcppEigen]; }; + 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.5"; sha256="0pfpbnbnpln3srn2m248v0n72mw72fh0rvqpvswi1qmjcpkfkd7v"; depends=[dplyr magrittr rlang tibble tidyr]; }; competitiontoolbox = derive2 { name="competitiontoolbox"; version="0.7.0"; sha256="0cb298fnivw3hqn99jgxlg7qfjkwy6zs0vgkc3x7vz3alk17p5p1"; depends=[antitrust ggplot2 rhandsontable shiny trade]; }; @@ -7422,7 +7508,7 @@ in with self; { complexity = derive2 { name="complexity"; version="1.1.1"; sha256="1lpsvry88jpqfw0wkdlwjzkqjl17f4adjcqvq0dwk483mi54xnfk"; depends=[combinat shiny]; }; complexplus = derive2 { name="complexplus"; version="2.1"; sha256="16w9v7d1ckavqmr86l34frr37pkvdn0iqnb17ssb8xaggns5lgqx"; depends=[expm Matrix]; }; complmrob = derive2 { name="complmrob"; version="0.7.0"; sha256="0dvkc5y53041agkjz3rl898hkq686pxzr6flf2qx1g3jbza3pk1y"; depends=[boot ggplot2 robustbase scales]; }; - compositions = derive2 { name="compositions"; version="2.0-2"; sha256="05pji62pzgfk9dyiybmr16q0h6mdzsmvyzxdni3hn0dvl4a7mr5m"; depends=[bayesm MASS robustbase tensorA]; }; + compositions = derive2 { name="compositions"; version="2.0-4"; sha256="1bqg0qqzsf92q0jb7hdjycr54bwv8rk7ajhvxgch5yslyqxpm73v"; depends=[bayesm MASS robustbase tensorA]; }; composits = derive2 { name="composits"; version="0.1.0"; sha256="1j2bbl0p7dhlf18n1164qdbch2qa5nzk66qh4xlrrhr36zip88y4"; depends=[anomalize dobin dplyr fastICA forecast ggplot2 gridExtra ICS kableExtra otsad pracma rlang tibble tidyr tsoutliers]; }; compound_Cox = derive2 { name="compound.Cox"; version="3.20"; sha256="18fgc58jqrjls1rkzrpy338m3yyxaqkv7dfv31a2sf551ynajcfy"; depends=[numDeriv survival]; }; comprehenr = derive2 { name="comprehenr"; version="0.6.10"; sha256="1wlc06swm45nxg9hgik3wj832sr074i3p0j5kxm0i2r74klfy22w"; depends=[]; }; @@ -7462,25 +7548,28 @@ in with self; { 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=[]; }; - confintr = derive2 { name="confintr"; version="0.1.1"; sha256="18nkgcpl43hih7l04rxv21pil48h780wjna3vm2763ffkilkk5cl"; depends=[boot]; }; + confintr = derive2 { name="confintr"; version="0.1.2"; sha256="06c42jhqp7gp9062jf8f9py1lh34vx38q0g7b6l5kyf7a310ixr6"; depends=[boot]; }; conflicted = derive2 { name="conflicted"; version="1.1.0"; sha256="1qg9ar114r98wm0pnf65mss4v2ksq3924rlpm13mqp4s3p6j9yi4"; depends=[memoise rlang]; }; conflr = derive2 { name="conflr"; version="0.1.1"; sha256="1bjdmvi0n8746g7dxwgzh3fi33sq4bgfr0nd3nqd2caj8ryi2gv9"; depends=[askpass commonmark curl glue httr knitr miniUI purrr R6 rlang rmarkdown rstudioapi shiny stringi xml2]; }; conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; }; + conformalInference_fd = derive2 { name="conformalInference.fd"; version="1.1.0"; sha256="00qdkp70ncwxqgj847yyak3lgfirjh3m81fapjww588hq34wds1v"; depends=[fda future future_apply ggplot2 gridExtra]; }; + conformalInference_multi = derive2 { name="conformalInference.multi"; version="1.1.0"; sha256="1bixhwm8jrsrixzk80dp8m0kq85pmqjadj2hwwcqc2amyspcfbs7"; depends=[future future_apply ggplot2 glmnet gridExtra hrbrthemes]; }; confoundr = derive2 { name="confoundr"; version="1.2"; sha256="000vf828qv04pplx8yc8q3mafxf4g0axip6z5zbsj2581yxv9jjh"; depends=[dplyr ggplot2 gridExtra magrittr purrr rlang Rmpfr scales stringr tidyr]; }; confreq = derive2 { name="confreq"; version="1.5.6-4"; sha256="0mi6panjdvgpxwpylg6s3bhx9679jpqrxsicb14lq1w6c20rg7qj"; depends=[gmp vcd]; }; conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; }; conics = derive2 { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; }; conjoint = derive2 { name="conjoint"; version="1.41"; sha256="1iq3226a6fn1gddmh2nxlzvjcvbj7502r9520g9d4xdmk8smfx33"; depends=[AlgDesign broom cluster fpc ggfortify ggplot2]; }; conjurer = derive2 { name="conjurer"; version="1.4.0"; sha256="0llvqjg0rrd75n1gz9b1njizs6s1mgygcv7hmalknqibvxd185ac"; depends=[]; }; - conleyreg = derive2 { name="conleyreg"; version="0.1.6"; sha256="1q4i87l1bq17km0c60jm0585dsly05i85wddd2hbprkv5llxwbyp"; depends=[data_table doParallel fixest foreach lmtest lwgeom Matrix Rcpp RcppArmadillo Rdpack s2 sf]; }; + 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]; }; connectwidgets = derive2 { name="connectwidgets"; version="0.1.1"; sha256="0sj8nik6dyyzflpq9vqd8wzlhky6jl2wfiaz788i6a2wdhckyc1m"; 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.4.4"; sha256="0rfsm7w7dz3dygmqih6qw6dhyg7c58yxpsnq59pb48zfvyzwcq2y"; depends=[abind ComplexHeatmap cowplot dendextend dplyr ggplot2 ggrepel gridExtra igraph irlba leidenAlg magrittr Matrix Matrix_utils N2R R6 Rcpp RcppArmadillo RcppEigen RcppProgress reshape2 rlang Rtsne sccore]; }; + conos = derive2 { name="conos"; version="1.4.5"; sha256="1c2yn3nsvwwglgxghnrybmkcvdc16gxxbcfqfnp70q4h6nz7f65g"; depends=[abind ComplexHeatmap cowplot dendextend dplyr ggplot2 ggrepel gridExtra igraph irlba leidenAlg magrittr Matrix Matrix_utils N2R R6 Rcpp RcppArmadillo RcppEigen RcppProgress reshape2 rlang Rtsne sccore]; }; conover_test = derive2 { name="conover.test"; version="1.1.5"; sha256="0f1p10klidk1xic1wd48j9rjh2fb3z6pfjx4y021lglx1w3av68k"; depends=[]; }; - conquer = derive2 { name="conquer"; version="1.2.1"; sha256="0i9g27f52zl2kb2392g0y614drf6s87dqz12aphj889ajq7zjm0k"; depends=[caret Matrix matrixStats Rcpp RcppArmadillo]; }; + conquer = derive2 { name="conquer"; version="1.2.2"; sha256="1z07p4xcrxvnicwgga7hqvqzcxavwirw828285i0xlnz54rqhsc8"; depends=[Matrix matrixStats Rcpp RcppArmadillo]; }; conquestr = derive2 { name="conquestr"; version="0.8.5"; sha256="1xh09a379g1msib5fvf72llvf2gwqb7ciacw7j7iqrkb2ddpaglk"; depends=[ggplot2 ggrepel Rcpp reshape rlang stringr]; }; 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.0.0"; sha256="0f1ac4k3w2qkxhzxqsm9v9wanq27g0fr77g63zy84b38c9zkmgch"; depends=[]; }; consort = derive2 { name="consort"; version="1.0.1"; sha256="16i7hd433f3lfs6saa20m2jk9926r9jaln74333dmx5ld0294q99"; 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=[]; }; @@ -7489,15 +7578,16 @@ in with self; { contTimeCausal = derive2 { name="contTimeCausal"; version="1.0"; sha256="1lyiy0hs5xms6hgr7cv5cxh7v09612qsknjwmrr8w07y0h37qg5l"; depends=[dplyr survival zoo]; }; contact = derive2 { name="contact"; version="1.2.8"; sha256="1db3vgjlz0ivw3sx37mwy7ngjx0in3rxlm3i3akh4xzbfp9gjj87"; depends=[ape data_table doParallel foreach igraph lubridate raster rgdal rgeos sp]; }; contactdata = derive2 { name="contactdata"; version="0.2.0"; sha256="1hcibqkfisv28d38ymgvmkkbs4jl3lbp2safyd5abf185043263d"; depends=[]; }; - container = derive2 { name="container"; version="1.0.0"; sha256="0yr06z6vdz1qz7vp3hf1zqnk0n2g77iaq9nfx6r9275m5v2hl6iw"; depends=[data_table R6]; }; + container = derive2 { name="container"; version="1.0.1"; sha256="0a8wlszclnl2hm15mgrq25mkq13x890qv2mg9rqx8ns7953829sa"; depends=[data_table R6]; }; contentid = derive2 { name="contentid"; version="0.0.15"; sha256="0r5lrq82vfv698g8md8kdhl83gi8rx5hrhk2qddykxlxk4krzagi"; depends=[curl fs httr openssl]; }; contfrac = derive2 { name="contfrac"; version="1.1-12"; sha256="0sq5c7ny235yrkv2xc4insgxby6rvzc1qsj8h301cd2if3lwbgwm"; depends=[]; }; conting = derive2 { name="conting"; version="1.7"; sha256="08f271j3gxcp4shda08kkv0v9ayaadvxgcglfsn6hjmw4hn298zg"; depends=[BMS coda gtools mvtnorm tseries]; }; contingency = derive2 { name="contingency"; version="0.0.6"; sha256="0bwvrwsa41s24j612w4jyhlfp2r6qa37ljsb3lxx27mkd9r0286d"; depends=[rje]; }; + contingencytables = derive2 { name="contingencytables"; version="1.0.0"; sha256="0xpc5x90cvxfhg0aybrrqyg7ar29jbswpinnq07pfg9d6kycrlgm"; 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.1"; sha256="1119c7p8ly3zb5pxzgridqvmbq5v0jx557qqaa0rbmdr7rih74aq"; depends=[nlme rms sandwich]; }; - contribution = derive2 { name="contribution"; version="0.2.0"; sha256="0di6jhljdfvzpifnb3pvyn2la5h5r1dw03dx4zhpn4y10dg6898p"; depends=[dplyr ggplot2 gh magrittr rlang tidyr]; }; + contribution = derive2 { name="contribution"; version="0.2.1"; sha256="1m9bjpmf1ljygjlx3jg8hvnrq6sxx1cscg30dc3phpnj3w55jxln"; depends=[dplyr ggplot2 gh magrittr rlang tidyr]; }; 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]; }; convdistr = derive2 { name="convdistr"; version="1.5.3"; sha256="1cp2qpyl0jxp0lwznlc94mcigfgysyq9xmi1z7ihd7jxd9mk8aw9"; depends=[dplyr extraDistr ggplot2 MASS pryr RColorBrewer SHELF shiny tidyr]; }; @@ -7510,6 +7600,7 @@ in with self; { convey = derive2 { name="convey"; version="0.2.4"; sha256="0khhnvazslvv7ma4fk70qzcazgv1aair1vcvx22bsic2mvgdb0fc"; 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]; }; + cooltools = derive2 { name="cooltools"; version="1.7"; sha256="147hpa1vavs51fp0r8siyf0g3830g5ngs1nwd5a4nrahzl6f1jn4"; depends=[bit64 celestial cubature data_table jpeg magicaxis MASS plotrix png pracma 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]; }; cooptrees = derive2 { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; }; @@ -7536,7 +7627,7 @@ in with self; { coreSim = derive2 { name="coreSim"; version="0.2.4"; sha256="1fhlss420rhs21l9i2ag5g3j0vnrkpqdh13ca4rwfan6h35qr3sm"; depends=[dplyr MASS]; }; coreTDT = derive2 { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; }; corehunter = derive2 { name="corehunter"; version="3.2.1"; sha256="0cxvhmi768kz3q8hydb6y9nqvc8hvkmq8nc5yfry4k94whk12wax"; depends=[naturalsort rJava]; }; - corels = derive2 { name="corels"; version="0.0.3"; sha256="1lkgvrdqjm3grkv5isar2fdv1gpa569dxp00rswbslp11h1ag90f"; depends=[Rcpp]; }; + 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.2.0"; sha256="1q8mznhwfzw9qkxxcvnkln2xxp3mdbdb63c39k6mnpfhr4b10wy3"; depends=[detectseparation dplyr ggplot2 magrittr Matrix numDeriv optimr phyloseq rmutil scales trust VGAM]; }; @@ -7546,17 +7637,17 @@ in with self; { corona = derive2 { name="corona"; version="0.3.0"; sha256="1hggsmvmbim7f6bybmdhxznmqib0k2plm370mjs7dp85i564sjkm"; depends=[gganimate ggplot2 gridExtra plyr qicharts2 reshape2]; }; coronavirus = derive2 { name="coronavirus"; version="0.3.31"; sha256="187k5phjxkzkkgszrww0ayk50n399bxa83r59h3whk81788hdmwf"; depends=[devtools]; }; corpcor = derive2 { name="corpcor"; version="1.6.10"; sha256="028fw61n61i79fhnaqx7gmdifdpbvp3yiaq9vvfrbv4k7i84r83i"; depends=[]; }; - corpora = derive2 { name="corpora"; version="0.5"; sha256="0b4yw37msx9h8hf5mjs4h10gdmc1qc2gv5bzyj1r90n4gcli042d"; depends=[]; }; + corpora = derive2 { name="corpora"; version="0.5-1"; sha256="1bkmarwxqfb4jf7aa1x82lhykmy25z1pknfmq1g1g789g074090k"; depends=[]; }; corporaexplorer = derive2 { name="corporaexplorer"; version="0.8.4"; sha256="0ffickzig9798273gm401ma0lm32zgcd5p549935gfgbyjlxzxps"; depends=[data_table dplyr ggplot2 lubridate magrittr padr plyr RColorBrewer rlang rmarkdown scales shiny shinydashboard shinyjs shinyWidgets stringi stringr tibble tidyr]; }; corpus = derive2 { name="corpus"; version="0.10.2"; sha256="0fxa38xbd5fyhh0q1ycx8snj7ly8hv9jclbs77agkb6pb6p7yr64"; depends=[utf8]; }; - corpustools = derive2 { name="corpustools"; version="0.4.8"; sha256="06x8lxcpizlmxnj4vg2k5inb4kb4jfx973x5pg3wiw4vyp3wvcck"; depends=[data_table digest igraph Matrix pbapply quanteda R6 Rcpp RcppProgress RNewsflow rsyntax SnowballC stringi tokenbrowser udpipe wordcloud]; }; + corpustools = derive2 { name="corpustools"; version="0.4.9"; sha256="0239nx4r8q3jkzymr3l2zc9y0b75frp7rxn2wl6rv721p33dbykr"; depends=[data_table digest igraph Matrix pbapply quanteda R6 Rcpp RcppProgress RNewsflow rsyntax SnowballC stringi tokenbrowser udpipe wordcloud]; }; corr2D = derive2 { name="corr2D"; version="1.0.2"; sha256="1g8vxqbyp162a9jm4dwhyviifddddri585xn42gd6gwfx0vzmaji"; depends=[colorspace doParallel fields foreach mmand profr xtable]; }; corrDNA = derive2 { name="corrDNA"; version="1.0.1"; sha256="1mfjrzpcb63ydyj1yxa0wd3vh4z0rdwsqv09w0a0l4l7mhb5jz2k"; depends=[mvtnorm]; }; 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]; }; 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.7.1"; sha256="03ghgaf7c6zjsa5j3916l4f5fq4b6i1hn7g3njgzq2z2zz8nd5yn"; depends=[bayestestR datawizard insight parameters]; }; + correlation = derive2 { name="correlation"; version="0.8.0"; sha256="0gpdif7pp12iacs06njqcvis93qfanpf8awzdy1f6kjn0rc2wrim"; depends=[bayestestR datawizard insight parameters]; }; correlationfunnel = derive2 { name="correlationfunnel"; version="0.2.0"; sha256="0xil7cihqk7gzpy0q97sg5sw5z0gy7zqvx0f0bizcfks9gwp43cv"; depends=[cli crayon dplyr forcats ggplot2 ggrepel magrittr plotly purrr recipes rlang rstudioapi stringr tibble tidyr]; }; correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; }; corrgram = derive2 { name="corrgram"; version="1.14"; sha256="12dhvwaprdmzxxk52w8sb3cx99dmzb9yhcm01pri0vcz671p57v1"; depends=[]; }; @@ -7576,7 +7667,7 @@ in with self; { cosso = derive2 { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[glmnet quadprog Rglpk]; }; costat = derive2 { name="costat"; version="2.4"; sha256="0c47bklqjgjmdglw3mi9lvygwjr5w6i1zv91ll3vpnl5dnay0692"; depends=[wavethresh]; }; costsensitive = derive2 { name="costsensitive"; version="0.1.2.10"; sha256="192q55123yzcjjh4047ppxa3h7gk9afqnvm1nlhzs4ccqz71g411"; depends=[]; }; - cotram = derive2 { name="cotram"; version="0.3-1"; sha256="0rmc8siij4k3rwhy3pb0acap342b2wq1a0dsc45n79lnl7bks4ig"; depends=[alabama basefun Matrix mlt tram variables]; }; + cotram = derive2 { name="cotram"; version="0.3-2"; sha256="1g2chlpmbbalqx1agyk2kkc41rgmq30cxr60h4xcjbr6mx1vgwxw"; depends=[alabama basefun Matrix mlt 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]; }; countHMM = derive2 { name="countHMM"; version="0.1.0"; sha256="12z0nz7in2msb5wa5yyjxx19ih8psw06m7xwlapvjksslippp6gs"; depends=[]; }; @@ -7586,7 +7677,7 @@ in with self; { countdata = derive2 { name="countdata"; version="1.2"; sha256="1yx75x4yg5ysx9zjzd4g5bd0qn11ngdsw1k36k809rd68v690awr"; depends=[]; }; 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]; }; - countrycode = derive2 { name="countrycode"; version="1.3.0"; sha256="03y7bc4lss3hwb5bwwspi28razwbdi0pjvy5dpay3v3iwwb18dil"; depends=[]; }; + countrycode = derive2 { name="countrycode"; version="1.3.1"; sha256="1hfw0084f82v4xy2lc88iwxlk0c8vaiybvrx6asadh0922y577aj"; depends=[]; }; countyfloods = derive2 { name="countyfloods"; version="0.1.0"; sha256="0ld8p8dfk9khvwffbn8sad0j3an25s7cvbi6jxljgx4zc6ldh699"; depends=[dataRetrieval dplyr ggplot2 lubridate maps plyr R_utils tidyr]; }; countytimezones = derive2 { name="countytimezones"; version="1.0.0"; sha256="0sk22fmz9d3wvlfvjl1xdavvl04q1ywy8ww2gi5am3yiizkf0v9w"; depends=[dplyr lubridate]; }; covBM = derive2 { name="covBM"; version="0.1.0"; sha256="0ky1lhr8m4hy2ss1nr2xymf6cmj1rr8px8zsxna6bsisf5bq4j4w"; depends=[nlme]; }; @@ -7595,7 +7686,7 @@ in with self; { covTestR = derive2 { name="covTestR"; version="0.1.4"; sha256="0j9kay8lwkhpdyg0fbfars1m58v0i58v1v5sm7m72s7kz8qh2yfs"; depends=[purrr Rcpp RcppArmadillo rlang]; }; covafillr = derive2 { name="covafillr"; version="0.4.4"; sha256="1vsay0qlqcw3l6xp18rxrkhwsadsv9rpxwpj9f4d3vlr8inkiv4h"; depends=[Rcpp RcppEigen]; }; covatest = derive2 { name="covatest"; version="1.2.0"; sha256="13kmkgn2xjci694g27ii9q6xqxqgxw4hykzynxqxn0v7i6y96xwz"; depends=[gstat lubridate sp spacetime zoo]; }; - coveffectsplot = derive2 { name="coveffectsplot"; version="0.0.9.1"; sha256="0yklw2bnaz9abi92rgr14415s5lr23y3qnkj89q08hrkxj61jxmj"; depends=[colourpicker data_table dplyr egg ggplot2 markdown shiny shinyjs table1 tidyr]; }; + coveffectsplot = derive2 { name="coveffectsplot"; version="1.0.0"; sha256="0hh7vwz0a0440n8rqn536mg5jw6zrg1gmjzr8i92zipq7llf16jd"; depends=[colourpicker data_table dplyr egg ggplot2 markdown shiny shinyjs shinymeta table1 tidyr]; }; 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]; }; @@ -7611,8 +7702,8 @@ in with self; { covid19us = derive2 { name="covid19us"; version="0.1.7"; sha256="1gy3cbfq89mg0465n4vwqnknnv988i9l2fv6dara8hr1jysic2n3"; depends=[curl dplyr glue httr lubridate magrittr purrr snakecase stringr tibble tidyr]; }; covidcast = derive2 { name="covidcast"; version="0.4.2"; sha256="1lgpkwhyx8pff2p82w5has1jqmj10kniqd1rkhfxr4b1xp21y8z8"; depends=[dplyr ggplot2 httr MMWRweek purrr rlang sf tidyr]; }; covidprobability = derive2 { name="covidprobability"; version="0.1.0"; sha256="00kiwxhkbq70650azgd6ylh7w7w4h5l8l7rmr2bijlm05xn3g154"; depends=[]; }; - covidregionaldata = derive2 { name="covidregionaldata"; version="0.9.2"; sha256="1pnsafq5p1m5ij7z5k39g5j2m4qiridj6k6dwpka3b9d9jz7apfk"; depends=[countrycode dplyr httr lifecycle lubridate magrittr memoise purrr R6 readxl rlang stringr tibble tidyr tidyselect vroom withr xml2]; }; - covidsymptom = derive2 { name="covidsymptom"; version="0.9.2"; sha256="00qqllg0p21a2gw9xq57ladlf96kxrmc3yx1kzgd81pxvrxqkk9d"; depends=[]; }; + 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]; }; + covidsymptom = derive2 { name="covidsymptom"; version="0.9.3"; sha256="0svfc911n6cl056vn7l9khg4c6rc54qhxsgjg3jpxqvikyqmmrx7"; depends=[]; }; covr = derive2 { name="covr"; version="3.5.1"; sha256="0v5cv3cw2kpdr6wxmkbd3wclavr17zipypdcb10hhmpa4cvgqk55"; depends=[crayon digest httr jsonlite rex withr yaml]; }; covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; covsep = derive2 { name="covsep"; version="1.1.0"; sha256="19dvwhl85yx9ddwxvnq5sdd534s6llcw61gckrav48hq49x1bqld"; depends=[mvtnorm]; }; @@ -7634,6 +7725,8 @@ in with self; { cpa = derive2 { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; }; cpca = derive2 { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; }; cpd = derive2 { name="cpd"; version="0.1.0"; sha256="1qcyb7n69ppa0py7w31msim7gf2wdh94hmsilsdk8ivxljc1gv8n"; depends=[fAsianOptions Rdpack]; }; + cpfa = derive2 { name="cpfa"; version="1.0-0"; sha256="06aiq9zq4471hajzca15vs79nwsk4q3bbi5fh6vz0qra50i64ang"; depends=[doParallel e1071 foreach glmnet multiway randomForest]; }; + 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-9"; sha256="057m61rq2hzb55imj3922zmc9kjxh053k3kgy54a4l0jlxb90lyj"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; }; cpm = derive2 { name="cpm"; version="2.3"; sha256="07zbvc5jkwv76lkzby6r073fxjsqgnrdl2w9lcph577knnip89jx"; depends=[]; }; @@ -7642,9 +7735,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.4.5"; sha256="1maqc5lr21h59wk4449zl8b8p9fzp9z6va52mc3k6z4sq4f784na"; depends=[httr jsonlite tibble]; }; + cpsR = derive2 { name="cpsR"; version="0.5.0"; sha256="0mfagw8in5qn48mwglvrfs5h8vkyz69hxrq9klfdd84x2wys5n30"; depends=[httr jsonlite tibble]; }; cpss = derive2 { name="cpss"; version="0.0.2"; sha256="1a6nphzf9y1p1ic51f0zll6g3j3flr7szrvzac1w4a023fj7301r"; depends=[dplyr ggplot2 gridExtra magrittr mvtnorm Rcpp RcppArmadillo Rfast rlang tibble tidyr]; }; - cpsurvsim = derive2 { name="cpsurvsim"; version="1.2.0"; sha256="1fn88cqryji1syzhnx726m5svxnrlyynxk4jhp5ny8g3knai6nnk"; depends=[Hmisc knitr plyr]; }; + cpsurvsim = derive2 { name="cpsurvsim"; version="1.2.1"; sha256="1wsb5hrds0ym49r0lyb3l37q1qpqy4qjhqcyd7awavdx2pk94pgi"; 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=[]; }; @@ -7659,19 +7752,19 @@ in with self; { 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]; }; cranly = derive2 { name="cranly"; version="0.5.4"; sha256="02g3r8y3yj6pajjzzf7akgpjgg6vnv3mp9pqpqcfrrckvmvysm35"; depends=[colorspace countrycode ggplot2 igraph magrittr stringr tm visNetwork wordcloud]; }; - crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; }; crassmat = derive2 { name="crassmat"; version="0.0.6"; sha256="1c4ii34vh8y5b3z2maby4cafb3n2m9bnxv3762cy0z12mbg7zk1s"; depends=[svMisc]; }; crawl = derive2 { name="crawl"; version="2.2.1"; sha256="18mr7vp72jj5msj9mbq45jy3f6qhn45azsmkq07i2d30gwdj0c3a"; depends=[dplyr gdistance lubridate magrittr mvtnorm purrr raster Rcpp RcppArmadillo rmapshaper sf shiny sp tibble]; }; - crayon = derive2 { name="crayon"; version="1.4.2"; sha256="0mxq87qsvz5znfncrb6yjchzv6iwpn9lr386i02y6xiycizkjd7f"; depends=[]; }; + crayon = derive2 { name="crayon"; version="1.5.0"; sha256="0m3rckps0c8v14h9vqnr81acv0az1jqwlsradcbkb2ndvnpjq4j4"; depends=[]; }; crch = derive2 { name="crch"; version="1.0-4"; sha256="18qjvh1lkw1f6rrhnb21f30xxrcq8whbs3x1jgkw6q14rf1483ri"; depends=[Formula ordinal sandwich scoringRules]; }; crctStepdown = derive2 { name="crctStepdown"; version="0.2.1"; sha256="1v6r0w9wrwa7hwyyhzdybv1mshdw3wxa098mbn48101dhhy75945"; depends=[fastglm ggplot2 ggpubr lme4 Rcpp RcppArmadillo rlang stringr]; }; credentials = derive2 { name="credentials"; version="1.3.2"; sha256="1f18j3zrq8c9kah57xwahmmljsjg5qphlgamvx507ynvpq8pryig"; depends=[askpass curl jsonlite openssl sys]; }; - creditmodel = derive2 { name="creditmodel"; version="1.3.0"; sha256="0cq21y6kzz2gf6kqqkhxlhhkjfm71kx4rqzwwfm1c5572x65x7hm"; depends=[cli data_table doParallel dplyr foreach ggplot2 glmnet rpart xgboost]; }; + 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]; }; crestr = derive2 { name="crestr"; version="1.0.0"; sha256="1vps3rf2mnzmfzml22cyvi7khgakjx6yzwiziyjdl8dalrhrpwsc"; depends=[clipr DBI plyr raster rgdal rgeos RPostgres scales sp stringr viridis]; }; crfsuite = derive2 { name="crfsuite"; version="0.4"; sha256="0arxbszaf1y8cqgzbq9a5l58n3c3rhjfp78lnhdxg95cdmdzhcfd"; depends=[data_table Rcpp]; }; + cricketdata = derive2 { name="cricketdata"; version="0.1.1"; sha256="1xv85mkln539jp9r7p8gnigiyrwwppi3ska3yjcjbzrl617w0877"; depends=[dplyr lubridate magrittr progress 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=[]; }; crimedata = derive2 { name="crimedata"; version="0.2.0"; sha256="073zlk9b4saz72d33z73mc9qzfk49bxwjhph6zbw27nl38k74j7d"; depends=[digest dplyr httr magrittr purrr readr sf stringr tibble]; }; @@ -7679,7 +7772,8 @@ in with self; { crimeutils = derive2 { name="crimeutils"; version="0.3.0"; sha256="1g7na36k1na7bsq8xqi01ja2fpb09r2davpi56jn5k1lih93kp8k"; depends=[dplyr ggplot2 gridExtra gt magrittr readr rlang scales tidyr]; }; crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; }; crispRdesignR = derive2 { name="crispRdesignR"; version="1.1.6"; sha256="1h9153iv55qkx9hyf3gs118m99mkzj5mbj6i3jg58chfp0m6jx78"; depends=[BiocGenerics Biostrings DT gbm GenomeInfoDb GenomicRanges IRanges rtracklayer S4Vectors shiny stringr vtreat]; }; - criticalpath = derive2 { name="criticalpath"; version="0.1.0"; sha256="1b8qid85727j6ai7wmm30g44jzsq8im9i29hw1xas09qky63z1n9"; depends=[igraph R6]; }; + criticality = derive2 { name="criticality"; version="0.9.1"; sha256="1bi2h56bbrbjybawrxjm724i2rcpla0rmlcf5vp3g5qfmcc4cz15"; depends=[bnlearn caret dplyr evd fitdistrplus ggplot2 keras magrittr reticulate scales]; }; + criticalpath = derive2 { name="criticalpath"; version="0.2.0"; sha256="1bnsmns1zrzfymy1wrbpbs7x1arcc55bqwapvvvjyz3mwxkbi56x"; depends=[dplyr igraph magrittr R6 stringr tibble]; }; critpath = derive2 { name="critpath"; version="0.1.4"; sha256="1jr5ra8gwzcfnap87z4snb5mmfqq2iaas2x54kqqcsb2gsk3gchs"; depends=[DiagrammeR ggplot2 reshape2]; }; crmPack = derive2 { name="crmPack"; version="1.0.0"; sha256="11zy1ci9d0zjbmc0gws9j9qrnfcqvky1ws9p41wjn0zifcckc5gi"; depends=[GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; crmReg = derive2 { name="crmReg"; version="1.0.2"; sha256="0y6xb0sxhsqcmcwbkwvk70snwqhxgzl513ld9dp53cm88qdwaj1r"; depends=[FNN ggplot2 gplots pcaPP plyr robustbase rrcov]; }; @@ -7687,7 +7781,7 @@ in with self; { crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; }; crochet = derive2 { name="crochet"; version="2.3.0"; sha256="0zvjaf6cv0nrjb4l4llkr0mmgha7ig31p4ri2rlnqyjlxi5l8hyq"; depends=[]; }; cromwellDashboard = derive2 { name="cromwellDashboard"; version="0.5.1"; sha256="0d57c1wdd1ds9fr7p256la63qbv8mirljgrvl1k8fp5gcnkps5wb"; depends=[dplyr DT httr shiny shinydashboard stringr]; }; - cronR = derive2 { name="cronR"; version="0.6.0"; sha256="0y56d4hxd73w6gk6byp4dn9bx9jra2882h09gj9wksc6hqags5m7"; depends=[digest]; }; + cronR = derive2 { name="cronR"; version="0.6.2"; sha256="1w1100lapy3zi238nmh2vc7yadqvb8p3wz86k223bqgr6lia28ng"; depends=[digest]; }; 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=[]; }; @@ -7701,7 +7795,7 @@ in with self; { crossmap = derive2 { name="crossmap"; version="0.3.0"; sha256="0dw1sg1by5805l72s5sbldznyp9qph9qrm4sizvqdx74bhb59s1y"; depends=[backports broom dplyr purrr rlang]; }; crossmatch = derive2 { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; }; crossrun = derive2 { name="crossrun"; version="0.1.0"; sha256="0br57nraqhs5f1cpidc8kd31izm82wvhiw9pxcdj9v51l9vifbmx"; depends=[Rmpfr]; }; - crosstable = derive2 { name="crosstable"; version="0.3.2"; sha256="17agqfwcz04d69xsf7k6dybv66wlgjcvhsxym48p7sy8s19vrb6b"; depends=[checkmate dplyr flextable forcats glue lifecycle officer purrr rlang stringr survival tibble tidyr tidyselect]; }; + crosstable = derive2 { name="crosstable"; version="0.4.1"; sha256="1c3hzmm8s72qsppzh8z3ivf88hlx571jz1pymrzppdikxm9z013h"; depends=[checkmate dplyr flextable forcats glue lifecycle officer purrr rlang stringr tibble tidyr tidyselect]; }; crosstalk = derive2 { name="crosstalk"; version="1.2.0"; sha256="180y7mhpj17axpadwhh7s0qvrpdnag7g977vk256l96d6nmvlds2"; depends=[htmltools jsonlite lazyeval R6]; }; crossval = derive2 { name="crossval"; version="1.0.4"; sha256="0vshlyc6w4kfs03n56ylapiqgdyday7068wmfsphj4lhw322s4yp"; depends=[]; }; crossvalidationCP = derive2 { name="crossvalidationCP"; version="1.0-1"; sha256="0hxy9c83j8afgf4zg560x21yc4iyb1ykfv6mi1ak5qf5czhnnckf"; depends=[changepoint FDRSeg stepR wbs]; }; @@ -7715,7 +7809,7 @@ in with self; { crrp = derive2 { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; }; crrstep = derive2 { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; }; crs = derive2 { name="crs"; version="0.15-33"; sha256="0zzi3l35r4slq5iplgds4pkw4nf5594i5cwp4jrz5rbncw2vp19a"; depends=[boot np quantreg]; }; - crseEventStudy = derive2 { name="crseEventStudy"; version="1.2.1"; sha256="1nw96h23zyfybxzlwnkcn5rskjpbd3qgldizngxwgpaqkmkgm880"; depends=[sandwich]; }; + crseEventStudy = derive2 { name="crseEventStudy"; version="1.2.2"; sha256="0zqqd1d1k200kah03qvpfiyshs18s5h4j8y9mwr0fbhkfj7xags7"; depends=[sandwich]; }; crsmeta = derive2 { name="crsmeta"; version="0.3.0"; sha256="19v0bq80cma74jjl0k42pmlpd5jfv6b0hr7j2iq0d47h50pvrd02"; depends=[]; }; crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; }; crso = derive2 { name="crso"; version="0.1.1"; sha256="1r10vz8z5y52a5v5phw22fhqwv9p7g66xfsx0906bcx74dn3f2b3"; depends=[foreach]; }; @@ -7723,14 +7817,14 @@ in with self; { crsuggest = derive2 { name="crsuggest"; version="0.3.1"; sha256="13h6hfj3bvdb5wzq1f2m5s9crjmg0ijhfh87y1dmyimv76kr31k6"; 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.2.0"; sha256="133g0skz4lifl8hm8pqdryd2m2drbrm6mdfzbbsrw8fg46di86my"; depends=[curl httpcode jsonlite mime R6 urltools]; }; - crunch = derive2 { name="crunch"; version="1.28.2"; sha256="11llq25jnjy54j5w5mfkfm5cw4zf3lm76zcjmi7hy61y8w04bc4i"; depends=[abind crayon curl httpcache httr jsonlite]; }; + crunch = derive2 { name="crunch"; version="1.29.0"; sha256="0isvz222pivdrbl08284xci38mbz6ldhj8bv0lag3h49zi1k02sv"; 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]; }; cry = derive2 { name="cry"; version="0.4.1"; sha256="14wicmlg8vzrqv4wf5xzf37l29ch3cbglbanmgbqdi8p49jpw1cf"; depends=[zoo]; }; - crypto2 = derive2 { name="crypto2"; version="1.3.0"; sha256="06jja7jl942zzs4pv9k7pfbllxdn6lh59h86dri1lnyglr7syy9j"; depends=[cli dplyr jsonlite lubridate progress purrr tibble tidyr]; }; + crypto2 = derive2 { name="crypto2"; version="1.4.3"; sha256="0c4ih53s6k3wf7zksz4x1vp27685s1qlyxarcfgvs2176zhnd42h"; depends=[cli dplyr jsonlite lubridate plyr progress purrr tibble tidyr]; }; + cryptoverse = derive2 { name="cryptoverse"; version="0.1.0"; sha256="169afkvinngwhrxi50a4r07lhgb6x9dxjbi3bj0gc7iyxa8cl9c5"; depends=[]; }; cryptowatchR = derive2 { name="cryptowatchR"; version="0.2.0"; sha256="0lf94l5klkx1j1fgaq2qjqr2y8ckm5raa3a508x72ph45v10pfyq"; depends=[httr jsonlite lubridate]; }; cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; }; - csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; }; csa = derive2 { name="csa"; version="0.7.0"; sha256="0cmabcvfxfplnzx7mdsfas3jhgz44y86411amaphm75zmv8khcif"; depends=[data_table doParallel foreach ggplot2 ggpubr Lmoments moments raster reshape2 scales]; }; csabounds = derive2 { name="csabounds"; version="1.0.0"; sha256="15l7i15w5jk4h3148dlk8v2i4awns5vxvv6m59qcv0hzns6jhx9j"; depends=[BMisc ggplot2 pbapply progress qte]; }; csampling = derive2 { name="csampling"; version="1.2-2.1"; sha256="0kqx7j96yafsqi9cz551fqpwkbcabxl8zpwa2jms862z41xbgsv3"; depends=[marg statmod survival]; }; @@ -7740,7 +7834,7 @@ in with self; { csodata = derive2 { name="csodata"; version="1.2.2"; sha256="1xm51vz45kbn6gckd96qbbafvzm10nllfrv01s9538nwbz1whb03"; depends=[dplyr httr jsonlite lubridate R_cache reshape2 rjstat sf]; }; cspec = derive2 { name="cspec"; version="0.1.2"; sha256="049vynbffxyd5zwxwyz1jv05zgq7zrx1ypzv5j62ph64gl42m13p"; depends=[]; }; cspp = derive2 { name="cspp"; version="0.3.2"; sha256="13iy6kz1v0dbrry18lkjmmgd6bsazbjbaa0bdabpg0hyw241j8b4"; depends=[csppData dplyr ggcorrplot ggplot2 haven mapproj purrr readr rlang stringr tidyselect]; }; - csppData = derive2 { name="csppData"; version="0.1.4"; sha256="1wwj2fscwyrn5ghgr6i422mnbkn9hyqb1h8wwmqn82rxgcm12w9s"; depends=[]; }; + csppData = derive2 { name="csppData"; version="0.2.51"; sha256="17w0wl6nc37ncdz481i3nm7nwsh6aim6lnaa5i6ralaa1pdyq2bd"; depends=[]; }; csrplus = derive2 { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; }; 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]; }; @@ -7751,12 +7845,13 @@ in with self; { csvwr = derive2 { name="csvwr"; version="0.1.6"; sha256="1wwj0zx4jawfl5264qxa90qwll971c24hyk645r0c7wwvwa8dd9r"; depends=[jsonlite magrittr purrr readr rlang stringr]; }; csvy = derive2 { name="csvy"; version="0.3.0"; sha256="0id015szw1c63vd1h0515jsqdhyn32sxpxm89f3sb1qkgq3yynmy"; depends=[data_table jsonlite yaml]; }; cta = derive2 { name="cta"; version="1.3.0"; sha256="1i8psw6p6f4633ad17apm6v5ikrpv1dagm0s8pggpsjbbw8d655v"; depends=[intervals limSolve numDeriv]; }; + ctbi = derive2 { name="ctbi"; version="1.0.1"; sha256="1p6qv4187qjnz36gs328bm337f72jybyf3x490qn18pxjwkczj4x"; depends=[data_table]; }; ctf = derive2 { name="ctf"; version="0.1.0"; sha256="1vwqfh1y2if79rkpy6b0ay50fyis7h5rlpvhgikahnmcr2q5l14m"; depends=[iotools jsonlite]; }; ctgdist = derive2 { name="ctgdist"; version="0.1.0"; sha256="1m3ryppfvd984n5xfphjqhi9i1sigl17v897mqaichj21dzaq62f"; depends=[mirt]; }; ctgt = derive2 { name="ctgt"; version="2.0"; sha256="0g2ibk9pxay0idj55q0yh4vbdb6l6460r997fnapimn7fgyz6f66"; depends=[BH Rcpp]; }; - cthist = derive2 { name="cthist"; version="0.1.2"; sha256="1457nx79p0c69f1fsf0g7b1yg1nyl2f6my75q41mdhaxy14xbcnb"; depends=[dplyr httr jsonlite magrittr readr rlang rvest selectr stringr tibble]; }; + cthist = derive2 { name="cthist"; version="0.1.3"; sha256="03ns8ckacnz3k5dmyzkhg61wrp7syg1igmp96y4nwkl0z9lz3294"; depends=[dplyr httr jsonlite magrittr readr rlang rvest selectr stringr tibble]; }; cthreshER = derive2 { name="cthreshER"; version="1.1.0"; sha256="18b66d08dq8pvnixmm4ir4r800b37z5yillaa88l317mdilbci9s"; depends=[Matrix]; }; - ctl = derive2 { name="ctl"; version="1.0.0-4"; sha256="027cij4vdsq3xhi38izzn07q6xwja7n8v95l7kk1pp92y9qkvqv3"; depends=[MASS qtl]; }; + ctl = derive2 { name="ctl"; version="1.0.0-7"; sha256="1a01rha6sgv8zmcfjb1c438s9d9bjzdjf2pmyml1m5jmz93q70ds"; depends=[MASS qtl]; }; ctmcd = derive2 { name="ctmcd"; version="1.4.1"; sha256="01nflgdyb70kh4f8bnxpavr31fz4fh02kgz2nlx3zzblnm2idbcx"; 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]; }; @@ -7766,9 +7861,9 @@ in with self; { ctrdata = derive2 { name="ctrdata"; version="1.8.0"; sha256="15jaxwqhx8fwzsnjgqqxkc6ngd1pqcgn1ffyl1hpwr92p9j7vkf9"; depends=[clipr curl httr jsonlite nodbi rvest stringi 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.5.4"; sha256="1gzv3i43nknd2fkjhrgwq8kf5z5vl52k5715sjzad9bmdjqf9wdl"; depends=[BH cOde data_table Deriv expm ggplot2 MASS Matrix mize mvtnorm pkgbuild plyr Rcpp RcppEigen RcppParallel rstan StanHeaders tibble]; }; + ctsem = derive2 { name="ctsem"; version="3.5.5"; sha256="1pgyq5s22gxsx2g42li1rcgf68llc8qv7f2y1abz57rm9maq07yz"; depends=[BH cOde data_table Deriv expm ggplot2 MASS Matrix mize mvtnorm pkgbuild plyr Rcpp RcppEigen RcppParallel rstan StanHeaders tibble]; }; ctsemOMX = derive2 { name="ctsemOMX"; version="1.0.4"; sha256="1sjsm573alsg3dvj58rwknqapcydx77zbs0b8hcf59qbbhfa3djv"; depends=[ctsem Matrix OpenMx plyr]; }; - ctv = derive2 { name="ctv"; version="0.9-1"; sha256="0lq657n7km070l3h6k036qm5l65bqab4z7d6bvrdffcfa3abi6rn"; depends=[]; }; + ctv = derive2 { name="ctv"; version="0.9-2"; sha256="1fzmsfmcvyhfrqi802s87fxc0x76p7n7azrnybl03kw14vv4k62p"; depends=[]; }; cuRe = derive2 { name="cuRe"; version="1.0.1"; sha256="0vw2iv9inz8md7lz6f1p456wxjc07kap1mvqf58hixqxbrb23dgi"; depends=[date numDeriv relsurv rstpm2 statmod survival]; }; cubature = derive2 { name="cubature"; version="2.0.4.2"; sha256="0kk9lw3s66h0sayza3in8rdj7bmgqn4v5lfckhslarpvj2fxsnv0"; depends=[Rcpp]; }; cubelyr = derive2 { name="cubelyr"; version="1.0.1"; sha256="1g3pvam1fkqh63snibqcfaazvj7lrkfip8w9pjvwdclj0l8382kl"; depends=[dplyr glue pillar purrr rlang tibble tidyselect]; }; @@ -7776,7 +7871,7 @@ in with self; { cubfits = derive2 { name="cubfits"; version="0.1-4"; sha256="1dg60162s77p82v8vig52yl8ar8h0pijps8kqq35v1hvp5a3ny5q"; depends=[coda foreach]; }; cubicBsplines = derive2 { name="cubicBsplines"; version="1.0.0"; sha256="1dzwadhhrxgral9x4hxyyy1fyn45pmbwv6wiwfxhivkxmd3s2xdr"; depends=[]; }; cubing = derive2 { name="cubing"; version="1.0-5"; sha256="1q23fplvklaaldicqic0zpnh301m08zb9k21l47zj47g9m9pj4bc"; depends=[rgl]; }; - cuda_ml = derive2 { name="cuda.ml"; version="0.3.1"; sha256="13zxq1a2dfvfj1hsbyzmbibnvw2csifj51kq5afr95dda67zncda"; depends=[ellipsis hardhat parsnip Rcpp rlang]; }; + cuda_ml = derive2 { name="cuda.ml"; version="0.3.2"; sha256="0vqmy8qs3234gllpymvnf2x4a5g9rcmn9ja8cvccksvx6bh10mgz"; depends=[ellipsis hardhat parsnip Rcpp rlang]; }; cultevo = derive2 { name="cultevo"; version="1.0.2"; sha256="0rmncp4mrdpf3izhhqn9406i36j3d3d7i8cglip04lkfbypl9jvy"; depends=[combinat Hmisc pspearman stringi]; }; cumSeg = derive2 { name="cumSeg"; version="1.3"; sha256="0n1hp0abnd6zn72fkgkj9k875vivn5kr3q76sjy6q6va7x24j6sg"; depends=[lars]; }; cuml4r = derive2 { name="cuml4r"; version="0.1.0"; sha256="0zwm8laprwhkjn2ji16f08952hri3bk1qvpj8yhwaqiv4cj2q43k"; depends=[magrittr Rcpp rlang zeallot]; }; @@ -7802,8 +7897,8 @@ in with self; { cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; }; cutpointr = derive2 { name="cutpointr"; version="1.1.1"; sha256="1lcs4dv13y9q6iwan7livlfaf5bqgg116br1knm4wk56jhxjaf4k"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr tidyselect]; }; cuttlefish_model = derive2 { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; }; - cvAUC = derive2 { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[data_table ROCR]; }; - cvCovEst = derive2 { name="cvCovEst"; version="1.0.1"; sha256="0hc6dvxnl4d6fcwh4sq2q41f75vmfh6c6wsv0pgbwf0h9hslzd2v"; depends=[assertthat coop dplyr ggplot2 ggpubr Matrix matrixStats origami purrr RColorBrewer Rdpack rlang RSpectra stringr tibble]; }; + cvAUC = derive2 { name="cvAUC"; version="1.1.4"; sha256="1m2y50a1yapf1c74km9a4r47ds2z2bfp4wwwkqin7swv9v1s7d28"; depends=[data_table ROCR]; }; + cvCovEst = derive2 { name="cvCovEst"; version="1.0.2"; sha256="138jhwy0dhnrvvxvnplhnqcrjdfdvqwb81605z1an4cbyxvgxyqi"; depends=[assertthat coop dplyr ggplot2 ggpubr Matrix matrixStats origami purrr RColorBrewer Rdpack rlang RSpectra stringr tibble]; }; cvGEE = derive2 { name="cvGEE"; version="0.3-0"; sha256="085qjm520l2441nakfxy851s6bfy5832b5fy54z5fp4xr1jn6snm"; depends=[]; }; cvTools = derive2 { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; }; cvam = derive2 { name="cvam"; version="0.9.2"; sha256="0ylfs2ry1ppigvs7py71vbslxga1d3kaijzwr8v923f3j14zkm54"; depends=[coda Formula]; }; @@ -7820,7 +7915,7 @@ in with self; { cwbtools = derive2 { name="cwbtools"; version="0.3.4"; sha256="1wj42n6phniwh6ms5xfmfazd8a0lkaf46wzv916i9xzsaf6hzqr7"; depends=[cli curl data_table fs httr jsonlite lifecycle pbapply R6 RcppCWB rstudioapi stringi xml2 zen4R]; }; cwhmisc = derive2 { name="cwhmisc"; version="6.6"; sha256="1pf365g4f51cfrhlff9mqw2ddvkps0abax17zcn3vw1ba2djalnp"; depends=[lattice]; }; cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; }; - cxhull = derive2 { name="cxhull"; version="0.2.0"; sha256="1m03ym83ghgmb0j14aihfj6divmnr13f5s9jwknicjsxz3p3divk"; depends=[]; }; + cxhull = derive2 { name="cxhull"; version="0.4.0"; sha256="0hgx4y1svx9dcwjx254hmawyswsv17wn7kg2wwg8hyal9qgmh0wa"; depends=[Morpho rgl Rvcg]; }; cxr = derive2 { name="cxr"; version="1.0.0"; sha256="12rx7hna3h84a2xb2ir43xgb3zfmh0fhn5wcdjklk2g94dmwid28"; depends=[mvtnorm optimx]; }; cxxfunplus = derive2 { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; }; cycleRtools = derive2 { name="cycleRtools"; version="1.1.1"; sha256="1l7w2lm4s149ndd85v41pkdrdig6l3nmhl14bdx56aw8q57fxmb0"; depends=[Rcpp xml2]; }; @@ -7828,6 +7923,7 @@ in with self; { cyclocomp = derive2 { name="cyclocomp"; version="1.1.0"; sha256="0gky3svk02wiajw7nfjh30684h3qxili4bvsab0m7b6cggw6bgyd"; depends=[callr crayon desc remotes withr]; }; cycloids = derive2 { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; }; cyclomort = derive2 { name="cyclomort"; version="1.0.2"; sha256="0qmfwhrp7bq7av0yc95xnz2sd1jxfaiys9smrk1kpclnynnra9rr"; depends=[flexsurv lubridate magrittr mvtnorm plyr scales survival]; }; + cyjShiny = derive2 { name="cyjShiny"; version="1.0.34"; sha256="0n5vlg9y8zpa2mnxz47h47y4l6vi1x1xi47rihiai6ijz61aqvnx"; depends=[base64enc graph htmlwidgets jsonlite shiny]; }; cylcop = derive2 { name="cylcop"; version="0.1.0"; sha256="1cj76614jqvs2k5n5lbws0jgabr93yd6nvzr4zkgh9zdicxh731h"; depends=[circular copula cowplot data_table dplyr extraDistr ggplot2 GoFKernel infotheo MASS movMF mvtnorm plotly purrr Rdpack rgl rlang stringr viridis]; }; cymruservices = derive2 { name="cymruservices"; version="0.5.0"; sha256="1xhdvijybdy7312qdbp50881yix587pmym0hchnwb3h0vhjv553v"; depends=[memoise pingr stringi]; }; cyphid = derive2 { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; }; @@ -7838,7 +7934,7 @@ in with self; { 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]; }; - czso = derive2 { name="czso"; version="0.3.7"; sha256="1gq5arnysd81i9psljzamkgxkjwxmlmqv074bhpi7xv6ij6j1886"; depends=[curl dplyr httr jsonlite lifecycle magrittr readr rlang stringr tibble usethis]; }; + czso = derive2 { name="czso"; version="0.3.9"; sha256="1smvjgf0vjykx4nknmrlbq5iv0j84idl4yhhwcwg2rylsbbh7hi8"; 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]; }; @@ -7851,16 +7947,18 @@ in with self; { dCovTS = derive2 { name="dCovTS"; version="1.2"; sha256="0gzilpz2hwibvwjpndi2nw61knhi4v0bhz5z4idffszgc9mjw1wm"; 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.6.2"; sha256="0hh9nyk5x0yzy2l8gnjn0zkq3xx26pdlvk8myl7ma4y0qyk77587"; depends=[AER dynlm formula_tools lmtest MASS nardl plyr roll sandwich strucchange wavethresh]; }; + dLagM = derive2 { name="dLagM"; version="1.1.7"; sha256="1i5fwzdscp7wpzbsdvwvak26p0aj0xviisp0aglaa7nrwixx8y0w"; 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="1.0.4"; sha256="1wxni1m9iaak0isc1sl205dnx3v8pzqyj22aj7alzwim6d6a4hjq"; depends=[dbscan e1071 exactci ggplot2 ggpubr raster rlist scales shiny shinyjs stringr]; }; dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; }; + dTBM = derive2 { name="dTBM"; version="2.0"; sha256="14y0x97gb1345ybvpd4rk0bidlzl613lgrl9pa4y197nhdkqdrx0"; depends=[EnvStats tensorregress WeightedCluster]; }; daarem = derive2 { name="daarem"; version="0.5"; sha256="167sqp7fnyhwgk7crl3b6m6i8mpn3hmsaqzi4v5ggi48fg19bis7"; depends=[]; }; dabestr = derive2 { name="dabestr"; version="0.3.0"; sha256="0i4k8h46cw5ds1cammxxli8kpc82ill81xw3izi33lja7wl9vmnw"; depends=[boot cowplot dplyr effsize ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr plyr RColorBrewer rlang simpleboot stringr tibble tidyr]; }; dabr = derive2 { name="dabr"; version="0.0.3"; sha256="1x7vh5s2gd7x62c30hqhs6rbif9jpmfvqzlxlqwc6hc5wqd3x6q6"; depends=[knitr magrittr RMariaDB tibble]; }; dad = derive2 { name="dad"; version="4.0.0"; sha256="154afqf3xwbdjp9qr3rlz06ln2cnwzafk3p9h73k0h2g5n8yp5b9"; 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-13"; sha256="0mq94ah21p1glvsbvdmi2p7nlgz1bvq7w3rz2z3mdqq18kz6nkjw"; depends=[ggplot2 plyr]; }; daewr = derive2 { name="daewr"; version="1.2-7"; sha256="138hmmrm3zcdb2rcilvrasndvsq38agp9bpikd3xbb7j4z1nrsl7"; depends=[FrF2 lattice stringi]; }; daff = derive2 { name="daff"; version="0.3.5"; sha256="00zcdf215m7p3xm9yv571v09znhdqacxg69hb5b5j749mp4wdsyj"; depends=[jsonlite V8]; }; @@ -7870,6 +7968,7 @@ in with self; { dagitty = derive2 { name="dagitty"; version="0.3-1"; sha256="1a78g2nr8i7mzzxyb6mfsqqgjyf3s4hwngvyd9vyygzcb79bai3x"; depends=[boot jsonlite MASS V8]; }; dagwood = derive2 { name="dagwood"; version="0.1.3"; sha256="1z4a02b7z2wihsxm7p19478p3ix0f7j3kly2x43ib5207fh9m1yb"; depends=[dagitty]; }; daiR = derive2 { name="daiR"; version="0.9.0"; sha256="0kq633jpiagbpsj0190pzpxmz8df6niqc6lwqgrahxfpda798srk"; depends=[base64enc curl fs gargle glue googleCloudStorageR httr jsonlite magick pdftools purrr stringr]; }; + dail = derive2 { name="dail"; version="1.1"; sha256="1j7czlx8j3cfqh11cc5srm86fn5rky28pdj0is31abp5ff05017q"; depends=[dplyr magrittr readr stopwords stringr tidytext]; }; dalmatian = derive2 { name="dalmatian"; version="1.0.0"; sha256="0hpyg8sl5v87l1hxax9sj863hy9njdyp7hnsaw3cida365p0dswa"; depends=[coda dglm dplyr ggmcmc rlang tidyr]; }; dam = derive2 { name="dam"; version="0.0.1"; sha256="1b0fi3l8jxgpr9fwvi03giq7wm39msbh0c82ffgkh54a3bbf5blc"; depends=[]; }; dampack = derive2 { name="dampack"; version="1.0.1"; sha256="0mh3x0xgcipbd9341x3sfapysrd9m8aaakc1f53vwjj31c8vayqc"; depends=[dplyr ellipse ggplot2 ggrepel mgcv reshape2 scales stringr triangle truncnorm]; }; @@ -7877,12 +7976,12 @@ 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.2"; sha256="115mc2mrmriyp24i8xgr58bjfgz6rzccl7s4akzp8rq5vhca707y"; depends=[fpc ggplot2 MASS purrr Rcpp RcppArmadillo rlang stringr tibble]; }; + dann = derive2 { name="dann"; version="0.2.6"; sha256="1kmhif5vpj221pmpv5l3a8dspcgqg4ygbvi4s51yyi9pxnlf3mvw"; depends=[fpc ggplot2 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.1"; sha256="09fmnpp4nl6n1z834dxzs2v56ba9sfb4mrmc1nrrixxhfsxshmb7"; depends=[bupaR dplyr edeaR glue lubridate magrittr miniUI purrr readr rlang shiny stringdist stringr tidyr xesreadR]; }; darksky = derive2 { name="darksky"; version="1.3.0"; sha256="1740cw5qifgvqa0nafd6lmllxi32n1zm45zlify1yn3h1qdcszhb"; depends=[ggplot2 gridExtra gtable httr plyr]; }; dartR = derive2 { name="dartR"; version="1.9.9.1"; sha256="1i2ha796k5xhyzz8q26pygc9hy2ay2b357h50ljfs2rf4np6l0sz"; depends=[adegenet ape crayon devtools dplyr foreach ggplot2 gridExtra HardyWeinberg hierfstat MASS plyr PopGenReport robustbase SNPRelate sp StAMPP stringr tidyr vegan]; }; - darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; }; dash = derive2 { name="dash"; version="0.9.3"; sha256="1wsvhnvh7sxi4gr88k6kycdr6is8akz9qjy70pl3whykyvx4cjq0"; depends=[assertthat base64enc brotli crayon digest fiery glue htmltools jsonlite magrittr mime plotly R6 reqres rlang routr]; }; dashCoreComponents = derive2 { name="dashCoreComponents"; version="1.10.0"; sha256="11jrlls6k6qlvi81741ga908aw22m05fhhr9jpzli982s611jrwl"; depends=[]; }; dashHtmlComponents = derive2 { name="dashHtmlComponents"; version="1.0.3"; sha256="01zrwjlhwwajk2lnv7is1r6nril83l65pynx856y9mvnm05xkb7m"; depends=[]; }; @@ -7893,13 +7992,14 @@ in with self; { 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.2"; sha256="0arx5wna0sh0vf5q8rjhh8nqdmnvg2pdpbhljl9l0x4kwm8vjhgp"; depends=[]; }; data_tree = derive2 { name="data.tree"; version="1.0.0"; sha256="0pizmx2312zsym4m42b97q2184bg3hibvbdrblcga05xln84qrs0"; depends=[R6 stringi]; }; + data_validator = derive2 { name="data.validator"; version="0.1.6"; sha256="1qzgwi9agsli96whzsyx7qxqzc5sixpqrd7z6fh4yrcv1i3li8yr"; depends=[assertr dplyr htmltools htmlwidgets knitr purrr R6 rlang rmarkdown shiny shiny_semantic tibble tidyr]; }; data360r = derive2 { name="data360r"; version="1.0.8"; sha256="0g3prfaqy7d5fdla4l31cj87vhzi945g22zr7pi2c2whlk4q4n09"; depends=[curl data_table jsonlite reshape2]; }; dataCompareR = derive2 { name="dataCompareR"; version="0.1.4"; sha256="1rapnlbi43z4sx4rq3fp8kpqhdj4g02fi3xglldbdp0c59f9vacg"; depends=[dplyr knitr markdown stringi]; }; dataMaid = derive2 { name="dataMaid"; version="1.4.1"; sha256="06jywq3llwafjnpklqimra456crdi752zxci6z1w0v7p8blf4vjw"; depends=[ggplot2 gridExtra haven htmltools magrittr pander rmarkdown robustbase stringi whoami]; }; dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; }; dataPreparation = derive2 { name="dataPreparation"; version="1.0.4"; sha256="05vjngp9d2fzfb15z6zfkdhcsw3nsf12pskbidzs25v8xh6avlg7"; 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.10"; sha256="0lmd2j9inc29s2xk09gk7rbypgcqzpb2vmnnbmbg1liw96jsz5wl"; depends=[curl httr jsonlite lubridate readr xml2]; }; + dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.11"; sha256="0dhayggsnxjqr4wpplydayya3cns78iikmzsn3dclvyr3aw8352r"; depends=[curl httr jsonlite lubridate readr xml2]; }; 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]; }; datadigest = derive2 { name="datadigest"; version="1.0.2"; sha256="1v4nwflrgjhwkrdlrjnqyq1spv1jkgxn1kmapml0zrvnvwf0r1a1"; depends=[haven Hmisc htmltools htmlwidgets jsonlite miniUI shiny tibble]; }; datadogr = derive2 { name="datadogr"; version="0.1.2"; sha256="10zbxb9gkymw78ras9y4wrifz7cxh3y630yzjcf9ds2p557vcjzp"; depends=[anytime dplyr glue httr lubridate purrr stringr tibble tidyr]; }; @@ -7907,16 +8007,14 @@ 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]; }; datagovindia = derive2 { name="datagovindia"; version="1.0.5"; sha256="1k04k2bz56d3k1nbx8p8pc1x3cxrdmnpgbrgmxl5i1qg3yashj91"; depends=[curl dplyr httr magrittr plyr rlang stringr]; }; - datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; }; datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; }; datamods = derive2 { name="datamods"; version="1.2.0"; sha256="1k5nbpy40jzk6jhgigq74qxvb0ni44p3iwb342950qbnb8aniwxw"; depends=[data_table DT htmltools phosphoricons readxl rio rlang shiny shinyWidgets tibble]; }; datanugget = derive2 { name="datanugget"; version="1.0.0"; sha256="1ki4kgz6y9a313f07jml39pdxhadgs287rkpnlwvcw6kgj5qxala"; depends=[doSNOW foreach]; }; dataonderivatives = derive2 { name="dataonderivatives"; version="0.4.0"; sha256="0bp1ynarz70c2clsz60dqfd4vmgm3251jv6821db5n7fffdrr7qa"; depends=[httr2 readr tibble vetr]; }; dataone = derive2 { name="dataone"; version="2.2.1"; sha256="1gnzyjiwppx5mjwf38nm146vvmy6vlpqy9ibd2rc5f744pdvifxb"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringi stringr uuid XML]; }; datapack = derive2 { name="datapack"; version="1.4.0"; sha256="1n69ycca7f7igl9n6spdhn2s431vrljmd0v80q3s5jnyb4mf4xyd"; depends=[digest hash redland uuid XML]; }; - datapackage_r = derive2 { name="datapackage.r"; version="1.3.4"; sha256="19zdy82skzx1mp32vm2lbzyqf8a9szzizdg8f9sif33sszyly96q"; depends=[config future httr iterators jsonlite jsonvalidate purrr R_utils R6 readr rlist stringr tableschema_r urltools V8]; }; datapasta = derive2 { name="datapasta"; version="3.1.0"; sha256="0sqv29iv2rv50rbw1601rn8p7gv7rsw00djhl7h1znr0igzi5b82"; depends=[clipr readr rstudioapi]; }; - dataprep = derive2 { name="dataprep"; version="0.1.4"; sha256="0knzwnhpj7ahrd12n56f65wmsmrapgnnqdl10b5cacf0idih12g5"; depends=[data_table doParallel dplyr foreach ggplot2 reshape2 scales zoo]; }; + 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="1.0.9"; sha256="0wc7vjjjffvmg9ahbqnygfrsk97n7k4y1y0ichvpr2nc8pfi7772"; depends=[dplyr emmeans ggplot2 ggpubr lme4 lubridate MASS MultinomialCI parallelMap patchwork R_devices reshape rlang robustbase]; }; datardis = derive2 { name="datardis"; version="0.0.2"; sha256="1ijwrbkz5dp19b225n6dcbjw264pad4imgm0yf1nqr106h92yjdv"; depends=[dplyr magrittr]; }; dataresqc = derive2 { name="dataresqc"; version="1.1.0"; sha256="1m7c93yk3dp1l5ysgscjvmv7z0xnmgaz4bkci4ljmmmn5a9v6r3c"; depends=[]; }; @@ -7925,22 +8023,22 @@ in with self; { datasailr = derive2 { name="datasailr"; version="0.8.10"; sha256="03bnrgpwhmh67zrvap3cbaqd5k6nkp63b2h8m08xrdp1ngp5inik"; depends=[Rcpp]; }; datasauRus = derive2 { name="datasauRus"; version="0.1.4"; sha256="1w1yhwwrmh95bklacz44wjwynxd8cj3z8b9zvsnzmk18m5a4k0fl"; depends=[]; }; dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; }; - datasets_load = derive2 { name="datasets.load"; version="1.6.0"; sha256="0ybxqk0azzaxvcdffqb8d62sap11sx2zp7j1ndva83pmamwpckfj"; depends=[DT miniUI shiny]; }; + datasets_load = derive2 { name="datasets.load"; version="2.0.0"; sha256="11ckwijflh915gj4w1gwaj8v58ksl3q33rdafb82p2m4gx41rlr5"; 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]; }; datastructures = derive2 { name="datastructures"; version="0.2.9"; sha256="0prw24iy1af02g1nzw588dv085bdnl6pzvizpxspmwzj6vrfbaav"; depends=[BH purrr Rcpp]; }; - dataverse = derive2 { name="dataverse"; version="0.3.9"; sha256="10kdqav21j5f18jgf754d1wvlx1j61xs4kj31jwj48nkwr38719x"; depends=[checkmate httr jsonlite readr xml2]; }; - datawizard = derive2 { name="datawizard"; version="0.2.2"; sha256="0sd0blrczf9qz5kd0jg112fag2w401kkbw1gp9wi5pgffgwp6va3"; depends=[insight]; }; - datazoom_amazonia = derive2 { name="datazoom.amazonia"; version="0.2.0"; sha256="0l24blbscai47rj9s8a0znd5q4mayddp639107r8dib466ykrz3g"; depends=[data_table dplyr geobr googledrive Hmisc janitor labelled lubridate magrittr purrr RCurl readr readxl sf sidrar stringi stringr tibble tidyr XML]; }; + dataverse = derive2 { name="dataverse"; version="0.3.10"; sha256="0fhxzd83hl2qgif8d5caw893i5w2b951yl7a5dmbj69ihcn0xfrg"; depends=[checkmate httr jsonlite readr xml2]; }; + datawizard = derive2 { name="datawizard"; version="0.3.0"; sha256="1jmrkfymh66d0n4256hamvrbqipfl3bl05q618z4flmq2byifibs"; depends=[insight]; }; date = derive2 { name="date"; version="1.2-39"; sha256="0mwp1619rxqyyyyxk224fh0x6g4rgyvr97q0kj076cxp71b97cdm"; depends=[]; }; - datefixR = derive2 { name="datefixR"; version="0.1.3"; sha256="0vphkw0db0wvcq10kclz5xw5kfckmj6nqp2p3l8l82p5aqgp0ij8"; depends=[stringr]; }; + datefixR = derive2 { name="datefixR"; version="0.1.4"; sha256="185lv1dap6xkmyqkv4fjmlmf6w95gm6szi0pps0pfrmcj42ng1fa"; depends=[stringr]; }; + datelife = derive2 { name="datelife"; version="0.6.1"; sha256="0fv478ykka6m5j3d6k7265xp76qc78fr7ms9khx349qbylj67306"; depends=[abind ape BiocManager bold cluster compare geiger httr ips knitcitations paleotree phangorn phylobase phylocomr phytools plyr rotl stringr taxize treebase]; }; daterangepicker = derive2 { name="daterangepicker"; version="0.1.0"; sha256="1605ch84ad3nmmad0yy3id0izv0nz536lxwib6rkdkjik5761gqk"; depends=[htmltools jsonify shiny]; }; datetime = derive2 { name="datetime"; version="0.1.4"; sha256="0nn1yxknsn3crmwbkws5kvfjhd65dw0fkfbg67gba0dyaqp1jg37"; depends=[]; }; datetimeutils = derive2 { name="datetimeutils"; version="0.5-0"; sha256="030md2pydhgx8x8chga7byl8x41m2dbw94b4ds7md2nqkdrq7hqz"; depends=[]; }; 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.3.0"; sha256="0q0qjk9iahxzz4gycmiq4nb34kiqxb9bxbh55slp31bvx32zcz6n"; depends=[babynames dplyr forcats fueleconomy gapminder ggplot2 Lahman nasaweather nycflights13 rlang tibble tidyr yaml]; }; + datos = derive2 { name="datos"; version="0.4.0"; sha256="0clr3g8iaypazlb8gmx8mnydg34bn8wv9q7x6z01jp58z5hp5fyc"; depends=[babynames dplyr forcats fueleconomy gapminder ggplot2 Lahman 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]; }; @@ -7954,37 +8052,36 @@ in with self; { 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]; }; dbarts = derive2 { name="dbarts"; version="0.9-20"; sha256="0ap9lmkx2z4fgc5b9kws6pgvshkr9ngr1z1qgmivf698h6ayfx8x"; depends=[]; }; - dbcsp = derive2 { name="dbcsp"; version="0.0.1.0"; sha256="08y111ivy5f8jgmlsmf52vxxc64j2z4lijvdx1bx6a90vcvlqc51"; depends=[caret geigen ggplot2 MASS Matrix parallelDist plyr TSdist]; }; + dbcsp = derive2 { name="dbcsp"; version="0.0.2.0"; sha256="1g4f4l20g9ljm53hvq9caz87fsch6ikqqdmaf856bmc2bh6dckca"; depends=[caret geigen ggplot2 MASS Matrix parallelDist plyr TSdist zoo]; }; dbd = derive2 { name="dbd"; version="0.0-22"; sha256="13qdm0y5dvc107xnv6663gbvmkw77150r073lp1jppf3gs8s587b"; depends=[]; }; dbflobr = derive2 { name="dbflobr"; version="0.2.1"; sha256="0q736fpz18kq18jr8ga1jxh3vggmd7xws0sda83h95gkfx96pf8p"; depends=[blob chk clisymbols crayon DBI flobr glue rlang RSQLite]; }; dbglm = derive2 { name="dbglm"; version="1.0.0"; sha256="1ljfi31n8d1mh1lr4q00klp74fz0c0jy9wdy2svhlzaszbrg76ky"; depends=[DBI dbplyr dplyr knitr purrr rlang stringr tibble tidypredict tidyr tidyverse vctrs]; }; dbhydroR = derive2 { name="dbhydroR"; version="0.2-8"; sha256="1gd3n6i47qbxp6d3y5sjvgmxc5p3afy2lhkg9020ws1xm0bk9q7d"; depends=[httr reshape2 XML]; }; dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; }; dblr = derive2 { name="dblr"; version="0.1.0"; sha256="0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw"; depends=[CatEncoders data_table Metrics xgboost]; }; - dbmss = derive2 { name="dbmss"; version="2.7-7"; sha256="0pzk9xb3zxnk42mashigd1qyg4yvd06wd92lqcbf37cyv2jgwynv"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 spatstat_core spatstat_geom spatstat_utils tibble]; }; + dbmss = derive2 { name="dbmss"; version="2.7-8"; sha256="0zh2ipf089pjib3nikhlqpvdfj13h8j5c49fksrk2mmd7rpfrg15"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 spatstat_core spatstat_geom spatstat_random spatstat_utils tibble]; }; dbnR = derive2 { name="dbnR"; version="0.7.1"; sha256="19d6vzsx84xbcmpk57si6pc940m6i8dlaa9163r09i6hndd11rx3"; depends=[bnlearn data_table magrittr R6 Rcpp]; }; dbnlearn = derive2 { name="dbnlearn"; version="0.1.0"; sha256="0kmyiad7v96mnfi24d2pn3dqmk3g82sx348m1vhhqwijfnj53brb"; depends=[bnlearn bnviewer ggplot2]; }; dbparser = derive2 { name="dbparser"; version="1.2.0"; sha256="06yk6i80xlvrjgi8lpzz82rhhmkbj980vpmpil57acjkfvaznwj6"; depends=[DBI dplyr odbc progress purrr readr RMariaDB RSQLite tibble XML]; }; dbplot = derive2 { name="dbplot"; version="0.3.3"; sha256="1svizj9hcd417yii8ll9s3mnvdqpa5awy9xl71kbwpfcnpdzqf1r"; depends=[dplyr ggplot2 magrittr purrr rlang]; }; dbplyr = derive2 { name="dbplyr"; version="2.1.1"; sha256="025wqpmxdhzblb0pf58m3qh5h6bf5x8qvkf47vyl1cjsp13wz95b"; depends=[assertthat blob DBI dplyr ellipsis glue lifecycle magrittr purrr R6 rlang tibble tidyselect vctrs withr]; }; - dbscan = derive2 { name="dbscan"; version="1.1-8"; sha256="18mgax837daipjx9w7f6iy824ph47sd16bkc4gp8k35knnawxxnz"; depends=[Rcpp]; }; + dbscan = derive2 { name="dbscan"; version="1.1-10"; sha256="1h8x1v9kk5zmw5qd575cyr16yz8l226lsaq71n079l4i8crcrzg1"; depends=[Rcpp]; }; dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; 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]; }; 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]; }; 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]; }; dclone = derive2 { name="dclone"; version="2.3-0"; sha256="0w1bhzsnmnhsrrw5ffm89pj2wy2fmx14y7g6b1mb2wlwbczjzzsh"; depends=[coda Matrix rjags rstan]; }; dclust = derive2 { name="dclust"; version="0.1.0"; sha256="1icfx52v3g7kkkc11pw0xlrc8dlx5q3n2zbrd3fccmw17jzxqbg7"; depends=[openssl phylogram]; }; dcminfo = derive2 { name="dcminfo"; version="0.1.7"; sha256="03r0ynzc5cck2rz20zbg5zx8v6s66ivizqav1pjkyvp6kxkmnf8q"; depends=[CDM]; }; dcmle = derive2 { name="dcmle"; version="0.3-1"; sha256="1d6zk9413h30wcw8q1gnjzk67vshmjcpnh8zjxrsh1h69i1z6rpy"; depends=[coda dclone lattice]; }; dcmodify = derive2 { name="dcmodify"; version="0.1.9"; sha256="0p4xw74rls7i3fymsjcrazkrp22cfrfffz63l7wyb842z902smls"; depends=[settings validate yaml]; }; - dcmodifydb = derive2 { name="dcmodifydb"; version="0.1.2"; sha256="0hkp62nffqaqcphq9w0g2mhbvjqz45vwzhmfvj4g980nh8g4bk1p"; depends=[DBI dbplyr dcmodify dplyr validate]; }; - dcortools = derive2 { name="dcortools"; version="0.1.2"; sha256="0p4qbah5jnb6jraka8bg6cks3namrz66bya2iz98q2adarqd517h"; depends=[ggplot2 Hmisc pheatmap Rcpp RcppArmadillo RcppEigen Rdpack Rfast]; }; + dcmodifydb = derive2 { name="dcmodifydb"; version="0.2.0"; sha256="1m85vvflq2hgyi2b0mhwy1yln5wqdslj0zap592r6yqcjci38fq7"; depends=[DBI dbplyr dcmodify dplyr validate]; }; 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]; }; dcurves = derive2 { name="dcurves"; version="0.2.0"; sha256="0vm1cg6sr152fg5bgy2inf4x42vkbvw9ahy5b1dda8jgc6s7zr9v"; depends=[broom dplyr ggplot2 glue purrr rlang scales survival tibble]; }; - dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; }; ddalpha = derive2 { name="ddalpha"; version="1.3.11"; sha256="1sdnb47r534nh138zk3a6b2mgi74nvshc7p5m304vjs9jlx4l2y3"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; }; dde = derive2 { name="dde"; version="1.0.1"; sha256="0qgnxb27a2wnrbfk5v22i985mqhjp4hp05vl1ccsapbxkpf0gqcv"; depends=[ring]; }; ddi = derive2 { name="ddi"; version="0.1.0"; sha256="0pnkylz7l6brx6i73wys637w811psxhnr39lcmkag41s6jcgabd5"; depends=[]; }; @@ -7998,7 +8095,7 @@ in with self; { deSolve = derive2 { name="deSolve"; version="1.30"; sha256="0j7mmg1mimdpql8f4i9dn920ciyyq80a5qnc4fq5xn5lyrx5vxir"; depends=[]; }; deTS = derive2 { name="deTS"; version="1.0"; sha256="08yq7vfcd8fv8qw2w0f1rnj3rzys9kslmkqspmiz6prmzqvj1zf1"; depends=[pheatmap RColorBrewer]; }; deTestSet = derive2 { name="deTestSet"; version="1.1.7.3"; sha256="0v59cczhwjrk7qgngmiyc7jvx11h808w4s3ww6l83n1ylx81fgll"; depends=[deSolve]; }; - deaR = derive2 { name="deaR"; version="1.2.4"; sha256="1nkz9gac79rgyn8jlx35cx524c3v68bs6y0zbi2dbff9smxhbh93"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; }; + deaR = derive2 { name="deaR"; version="1.2.5"; sha256="1k38j9l6rhw2gkpvz202gsja1jz3p57d8s3iv2nm7ph9000z03p9"; 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-39"; sha256="0sw0v1mm004ky1gjw3dmvf2vb7nf2j9s9386bhqxijw63j7xnjd3"; depends=[]; }; deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; }; @@ -8007,13 +8104,13 @@ in with self; { 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.109"; sha256="1ijrnbxx6l500jzlwmjrgb6na09avdp0s4gral8kh9zdswnm380n"; depends=[assertthat chillR dplyr fANCOVA ggplot2 ggstance magrittr msm mvtnorm nleqslv patchwork rriskDistributions stringr tidyr tidyselect]; }; + decisionSupport = derive2 { name="decisionSupport"; version="1.110"; sha256="1yqdffrqk18vmna6vv699pa987cd266gihsccs47a2vdhlhgrk2m"; depends=[assertthat chillR dplyr fANCOVA ggplot2 ggstance magrittr msm mvtnorm nleqslv patchwork rriskDistributions stringr tidyr tidyselect]; }; deckgl = derive2 { name="deckgl"; version="0.2.7"; sha256="0ifv6j0kbwayl60bf1rwd1h7424npqsqsvb44ngg7v0ik4bgbyfx"; depends=[base64enc htmltools htmlwidgets jsonlite magrittr readr tibble yaml]; }; - declared = derive2 { name="declared"; version="0.7"; sha256="17jc2d2gw6ss8w5d6a5w1mh3h3yyg0mrpys8kqkb5hpfr19r16c7"; depends=[admisc]; }; + declared = derive2 { name="declared"; version="0.11"; sha256="1m882i1hrz3zv4hawnypl06izv9d3bb16mhdyhb419b5nh2vksyg"; depends=[admisc]; }; 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.1.3"; sha256="0p9n0qi21facdp9c4fzs78ap4w1wvpvkv51kgx1gkr949kw8cv4n"; depends=[forecast PSF Rlibeemd tseries]; }; - decompr = derive2 { name="decompr"; version="6.0.0"; sha256="10j2lyly7parlx54bapf1dqh2mxjx9sf4ki4rjh90rlmw9qd0kpn"; depends=[matrixStats]; }; + decompr = derive2 { name="decompr"; version="6.2.0"; sha256="13a1f6qhzn37z765vqwa4l6yp24jjg8721x0rw9a0wbbzxsxjb09"; depends=[matrixStats]; }; decon = derive2 { name="decon"; version="1.3-4"; sha256="036cv56wf42q2p3d5h15hbrp5rc29xxy20qwv4k1qzhkq6hmw0qs"; depends=[]; }; deconstructSigs = derive2 { name="deconstructSigs"; version="1.8.0"; sha256="014x0nb23jb98666kaav2phkvmkr38pi38jv0dqd4jv7zp0gdf1a"; depends=[BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb reshape2]; }; deconvolveR = derive2 { name="deconvolveR"; version="1.2-1"; sha256="191bgncgwjhb13i27bf8072a0z3mkpjbbp06ys3nri0ggsv5r108"; depends=[]; }; @@ -8034,7 +8131,7 @@ in with self; { deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; deepredeff = derive2 { name="deepredeff"; version="0.1.1"; sha256="027dsmc3wmm61qc0vybn02c5dbnz5nwf80m9sywci4nhirz978ik"; depends=[Biostrings dplyr ggplot2 ggthemes keras magrittr purrr reticulate rlang seqinr tensorflow]; }; deepregression = derive2 { name="deepregression"; version="0.1"; sha256="0k062wkhfcnbkg2l09zr56p7fzgxcwllzycmpp4m5swigl6g9z1n"; depends=[dplyr keras magrittr Matrix Metrics mgcv purrr R6 reticulate tensorflow tfprobability tfruns]; }; - deeptime = derive2 { name="deeptime"; version="0.2.0"; sha256="1nc7n2x7glrmbgsgnmwqggwp45ir8y31g11s2iq5v68ad78pl0x3"; depends=[ggfittext ggforce ggnewscale ggplot2 gridExtra gtable lattice rlang scales]; }; + deeptime = derive2 { name="deeptime"; version="0.2.1"; sha256="1b0ba304950y2w7x8q5ag66fpfv7c4lpcdglf47yfps5nivkjk4n"; depends=[ggfittext ggforce ggnewscale ggplot2 gridExtra gtable lattice rlang scales]; }; default = derive2 { name="default"; version="1.0.0"; sha256="0hzxgp9la9kll5cw3m4gd02rii571xsn1v53kz407k7k6rfg5mda"; depends=[]; }; define = derive2 { name="define"; version="0.2.9"; sha256="0sq7ryiz1py0yw7g2bncd834zsdiy1y7rck8k4grrx2ips5gv2jy"; depends=[encode Hmisc latexpdf SASxport spec]; }; deflateBR = derive2 { name="deflateBR"; version="1.1.2"; sha256="17zsy10k12gmffbk7nagi60xj347q0bf7wr885fiylqz2xiy9fl9"; depends=[dplyr httr lubridate]; }; @@ -8046,7 +8143,7 @@ in with self; { deldir = derive2 { name="deldir"; version="1.0-6"; sha256="1igq0l2knsbhizncgydcsidgkvvlwwlkrifbcdyhnzk0bhrdixkd"; depends=[]; }; delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; }; deltaPlotR = derive2 { name="deltaPlotR"; version="1.6"; sha256="15vjg3viyfrxvvh34p8i7j8p0vpg5628g8198adhi0i2ri3ygz9a"; depends=[MASS]; }; - deltar = derive2 { name="deltar"; version="1.0.0"; sha256="1ki89ysz4qlq5z094ybg3aqfcb6g633ccvpj1cg6nri9z5qjwpm1"; depends=[Bchron]; }; + 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]; }; 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]; }; @@ -8057,7 +8154,7 @@ in with self; { demu = derive2 { name="demu"; version="0.3.0"; sha256="1mp5iz8mg0d6cyqi3f6fdhk6x5xxvng5bi13b7jnlp60wpjrq0il"; depends=[ClusterR fields Matrix Rcpp RcppArmadillo spam]; }; dendRoAnalyst = derive2 { name="dendRoAnalyst"; version="0.1.3"; sha256="1rg8xra4z3q9czkqydn2587iqwp7whscv8camrkhjpc38788cf4q"; depends=[boot pspline zoo]; }; dendextend = derive2 { name="dendextend"; version="1.15.2"; sha256="06wjs8451hmnimzgngpzbai3yrgy33133vzzapa8jib9crdqi8sb"; depends=[ggplot2 magrittr viridis]; }; - dendroTools = derive2 { name="dendroTools"; version="1.2.6"; sha256="0s395c24k0q0wp818mswph09f2qi9cywggbyyxd8482n34g1pq6x"; depends=[boot brnn Cubist dplR dplyr ggplot2 knitr lubridate magrittr MLmetrics oce plotly psych randomForest reshape2 scales viridis]; }; + dendroTools = derive2 { name="dendroTools"; version="1.2.7"; sha256="00a37mvka1wqj0jghgss3jp4jwvcr74lpf5shmba3jwiaapm3ab9"; depends=[boot brnn Cubist dplR dplyr ggplot2 knitr lubridate magrittr MLmetrics oce plotly psych randomForest reshape2 scales viridis]; }; dendroextras = derive2 { name="dendroextras"; version="0.2.3"; sha256="0hb7crbgsnbcwvbk05iz5ik45n7zgysmwjj6xc46131yd8l0i1qx"; depends=[]; }; dendrometeR = derive2 { name="dendrometeR"; version="1.0.0"; sha256="1par27ipgbfbrmdlwvkf82i5dgnfrcawmavakrf8lplin2hhb7gs"; depends=[forecast pspline zoo]; }; dendsort = derive2 { name="dendsort"; version="0.3.4"; sha256="0rs7y471wrhkgibxdmfh5xhp3pa004rrlm2w08b6qli5gq4im5d2"; depends=[]; }; @@ -8068,7 +8165,7 @@ in with self; { densEstBayes = derive2 { name="densEstBayes"; version="1.0-2"; sha256="16fb7vkic9q5p8s4f0f215zmb36fcizqr4r2vm9dxxj9rasrg2f3"; depends=[BH MASS nlme Rcpp RcppArmadillo RcppEigen RcppParallel rstan StanHeaders]; }; denseFLMM = derive2 { name="denseFLMM"; version="0.1.2"; sha256="1lfhd73zvvz6glq41lb2a9x63fjwjfp53zmy9g78fg6gz5lbnbpm"; depends=[MASS Matrix mgcv mvtnorm]; }; densitr = derive2 { name="densitr"; version="0.1.0"; sha256="1vqdvfka6wdfxqfy2qcacss0h6wxykmwyijr5blpvlpafjdmngaq"; depends=[changepoint]; }; - densityClust = derive2 { name="densityClust"; version="0.3"; sha256="1zry0vafajzmr37aylglxfvwplhdygbkb9cvzvh8cy0xgnjrnx13"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; }; + densityClust = derive2 { name="densityClust"; version="0.3.2"; sha256="05x2fi1zdnkrg2nimf8k904j3lpyw0f7nmk6ax5p7x7a98wb2iqs"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; }; 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=[]; }; @@ -8082,7 +8179,7 @@ in with self; { depthTools = derive2 { name="depthTools"; version="0.7"; sha256="00pn4ccsg1hjv83xqk4g0g24cz2a87shlbg8kd2dri4dcagzifg0"; depends=[]; }; dequer = derive2 { name="dequer"; version="2.0-1"; sha256="04kzlff8xa733qkkx0gacgig7d4l7yvgqmzva0mj8di12byh214p"; depends=[]; }; derivmkts = derive2 { name="derivmkts"; version="0.2.4"; sha256="1ncqhi6f69jv75dad1l9wsrfxi5m2wizywikkbg7i9qmh42xkh8w"; depends=[mnormt]; }; - desc = derive2 { name="desc"; version="1.4.0"; sha256="0jfnwn1kpiill8v4hmzdk90yz4gk2ha0prr2p0hq36s40v3y8842"; depends=[crayon R6 rprojroot]; }; + desc = derive2 { name="desc"; version="1.4.1"; sha256="0m3g5m0g08k674zh4lq0ihmqiwz8jpsfqrdwfqp5p4ngxi8vp7lg"; depends=[cli R6 rprojroot]; }; descomponer = derive2 { name="descomponer"; version="1.6"; sha256="1yznb6j850gap1bacvx5dkh4030x38041ll61z6an6h7j71yyc5p"; depends=[]; }; descr = derive2 { name="descr"; version="1.1.5"; sha256="00l3h71y4yfys60sqhifxyxvnjbkxxfxdb4zqjyy0v91pf3z2zv9"; depends=[xtable]; }; describedata = derive2 { name="describedata"; version="0.1.0"; sha256="10ryy886jr2gwi6h90girl82ivwrmhz1vcwi4f6khmmpwsy95hav"; depends=[broom dplyr forcats ggplot2 haven lmtest purrr rlang stringr tibble tidyr]; }; @@ -8117,9 +8214,9 @@ in with self; { devoid = derive2 { name="devoid"; version="0.1.1"; sha256="14cf75wih7401vmrfmswc9cihgmbyn90wg2vjkzv628mm5fgg01h"; depends=[]; }; devtoolbox = derive2 { name="devtoolbox"; version="0.1.0"; sha256="0ry0liw7a27nndhb5p7migx2ji2g3n1qpip1yr7mlikb7vxap2d6"; depends=[dplyr DT flexdashboard ggiraph ggplot2 gh htmltools httr jsonlite lubridate magrittr markdown purrr reshape2 rmarkdown stringr tidyr tidyselect]; }; devtools = derive2 { name="devtools"; version="2.4.3"; sha256="0kvbw218jp8pd2lgdjyn94v2iji75s385hkn1qbikcm0pjlmj8g4"; depends=[callr cli desc ellipsis fs httr lifecycle memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; }; - dexter = derive2 { name="dexter"; version="1.1.4"; sha256="0clyhpnzm8an5hcs4lf34ydqnvj0gpsikfwhd3pmh4sg9rkhiwl5"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; }; - dexterMST = derive2 { name="dexterMST"; version="0.9.2"; sha256="118y8a33l85klj6w5vj5mkr64xvmbf16n6ff3nsk7nx7v1f26x6d"; depends=[crayon DBI dexter dplyr igraph Rcpp RcppArmadillo rlang RSQLite tidyr]; }; - dextergui = derive2 { name="dextergui"; version="0.2.3"; sha256="1vq2flgry3dl90laj6dq3wsd6b90h3s3kbaqj99f67majagqqdcl"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets jsonlite networkD3 RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; }; + dexter = derive2 { name="dexter"; version="1.1.5"; sha256="013yjv36nfkqxch513gwhasbiwch084235q02lblqg1hyg1fswnx"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; }; + dexterMST = derive2 { name="dexterMST"; version="0.9.3"; sha256="1c30v83lx6p90l8a9kia5p0361j3ymbabyb2r6dkkak8n8zwfydl"; depends=[crayon DBI dexter dplyr igraph Rcpp RcppArmadillo rlang RSQLite tidyr]; }; + dextergui = derive2 { name="dextergui"; version="0.2.5"; sha256="1ms5ypi734yyjp4bxd3hvllm9lpamdk9ynlgfcypw0sji5x7g19j"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets jsonlite networkD3 RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; }; dfCompare = derive2 { name="dfCompare"; version="1.0.0"; sha256="1lhx69j0bkjbnp5jz23hrbxjcf04vf3big4k593ixz003xs2077f"; depends=[]; }; dfadjust = derive2 { name="dfadjust"; version="1.0.3"; sha256="0s9wsws1nxf3fij0jgi6aqqvbx0clk1rdjjyw9in3d1a6ywzcx89"; depends=[]; }; dfcomb = derive2 { name="dfcomb"; version="3.0-0"; sha256="1vsqlhmajv33nbnh8igisyv3rzzh2fdwbk5y0zlnrwvr79r19k5w"; depends=[BH Rcpp RcppProgress]; }; @@ -8152,16 +8249,17 @@ in with self; { diagram = derive2 { name="diagram"; version="1.6.5"; sha256="1r3lyl0h7mk9cfg8smr3jydfkjdawaphnxibkxfjqa7029vkxh79"; depends=[shape]; }; dialectR = derive2 { name="dialectR"; version="1.0"; sha256="11fd2fdxczlcxkk3pwhiw0vb51bndh9qcfp7pqcfj1z7aga52xk0"; depends=[deldir dplyr dtw ggplot2 ggvoronoi Rcpp RcppProgress reticulate sf tibble]; }; dialr = derive2 { name="dialr"; version="0.4.0"; sha256="1di5b3w1iif8702j5gnkwp55psbgzwb54ccxah3xscy75sg3zmpm"; depends=[dialrjars rJava]; }; - dialrjars = derive2 { name="dialrjars"; version="8.12.38"; sha256="0x0m5lza7qpm7167mzg8980my72yrwiqsladnlgvi52z7vdisaq8"; depends=[rJava]; }; - dials = derive2 { name="dials"; version="0.0.10"; sha256="1vhqcfwgic01pkw0i3000fvqq9yxfzsv26c0psfjhxkkdcz8h2px"; depends=[DiceDesign dplyr glue purrr rlang scales tibble vctrs withr]; }; + dialrjars = derive2 { name="dialrjars"; version="8.12.42"; sha256="0fn2ic9vllar3wgmgvzx4b2sw5sixzfnjmmk71fnmkii2mfp3s38"; depends=[rJava]; }; + dials = derive2 { name="dials"; version="0.1.0"; sha256="02i9ddzi7gk5bwg87x8bpazk89mn102awgxzp9yw85dgbafqsydh"; depends=[DiceDesign dplyr glue hardhat lifecycle purrr rlang scales tibble vctrs withr]; }; diaplt = derive2 { name="diaplt"; version="1.3.0"; sha256="1kkqhkv3s8rrpqd05jidjdnqmlnb3s9f8rr34rfqj7k4nh0qzzcz"; depends=[]; }; - diathor = derive2 { name="diathor"; version="0.0.9"; sha256="1p6y89vi37a8i3fwnj7rb0hdggk6qrxnsrw0sbpajzkwv1jvyal0"; depends=[algaeClassify data_table ggplot2 purrr stringdist stringr tibble tidyr vegan]; }; + dibble = derive2 { name="dibble"; version="0.1.0"; sha256="1b1z53w6n1ks3iiz1p2rs7ry9w03g5c8vzx4i3zqaqh16shn8p26"; depends=[dplyr pillar rlang tibble tidyselect vctrs]; }; dice = derive2 { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; }; diceR = derive2 { name="diceR"; version="1.1.0"; sha256="01jh69b7x4agw5w2y9dal9g0nbq8s1ff36vcz2xfsjc0vi76irfs"; depends=[abind assertthat class clue clusterCrit clValid dplyr ggplot2 infotheo klaR magrittr mclust NMF purrr RankAggreg Rcpp stringr tidyr yardstick]; }; dichromat = derive2 { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; }; dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; 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]; }; - did = derive2 { name="did"; version="2.1.0"; sha256="00wzb02s4hs7ijf4bg0kz1bchabzk127l5h5fvnjq8r62y46jv2b"; depends=[BMisc DRDID generics ggplot2 ggpubr Matrix pbapply tidyr]; }; + did = derive2 { name="did"; version="2.1.1"; sha256="004n56wjmd75sm9hy48m6kbmrzk47zgq3lkzz0mdnpq55am40w5z"; depends=[BMisc DRDID generics ggplot2 ggpubr Matrix pbapply tidyr]; }; did2s = derive2 { name="did2s"; version="0.4.0"; sha256="0ipp0wk3xx3y0q66469inkw3q9b7x5gdi1bpplng88w0ismkb0di"; depends=[broom cli did didimputation dplyr fixest ggplot2 glue gt magrittr Matrix purrr Rcpp RcppArmadillo rlang rsample staggered stringr tibble tidyr]; }; didimputation = derive2 { name="didimputation"; version="0.1.0"; sha256="0bdvhbxy57a5k7cahrhp8dzcskpbanb11497kg5mbw240ilgh6x3"; depends=[broom dplyr fixest glue magrittr Matrix Rcpp RcppArmadillo rlang stringr]; }; didrooRFM = derive2 { name="didrooRFM"; version="1.0.0"; sha256="12clfnbm56jwldw0afb0nb0argnd97mx7369jiywhxy0p4xqibqq"; depends=[dplyr]; }; @@ -8198,7 +8296,7 @@ in with self; { dils = derive2 { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; }; dimRed = derive2 { name="dimRed"; version="0.2.4"; sha256="1534axd5gcwma3nbglrn0l2an53n3yyya30fqkgb4d8l124ygb7j"; depends=[DRR magrittr]; }; dimensio = derive2 { name="dimensio"; version="0.2.2"; sha256="1340z0ibzmnbxghjw5w2afr6agwyz5kcan5hgibfi08y7axpdx4k"; depends=[ggplot2 rlang]; }; - dimensionsR = derive2 { name="dimensionsR"; version="0.0.2"; sha256="1g9yjrq7xnqh427kzmhhmdavykzxidv51i2wx2w0kwhl6fqdd2fk"; depends=[httr jsonlite]; }; + 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=[]; }; dineR = derive2 { name="dineR"; version="1.0.1"; sha256="1nnfg4kylb8ivwij1qdn9qv5jciinl4jk4gghfw97jphp4da91pw"; depends=[MASS Matrix progress]; }; @@ -8206,7 +8304,7 @@ in with self; { dint = derive2 { name="dint"; version="2.1.3"; sha256="0nxppn7gx4sjwn7jns5bwbqfid3jkbsx2lxi0rjdkbsawy77fc85"; depends=[]; }; dipm = derive2 { name="dipm"; version="1.5"; sha256="1mqannl493mic8qx75qq8147jb6hddsxsk7q8h51zjb3zr6b9hjp"; depends=[ggplot2 partykit survival]; }; diproperm = derive2 { name="diproperm"; version="0.2.0"; sha256="0qh8zzpbsjfwh8q833n5pchb6dakqdza77ab7vmsidfbzndka11m"; depends=[dplyr DWDLargeR e1071 ggplot2 gridExtra lemon Matrix sampling SparseM usethis]; }; - dipsaus = derive2 { name="dipsaus"; version="0.1.9"; sha256="0rpx6nasgf1dcrksvp7zp4pc1gjx64vbcxa0f6189agsnwz6w4yj"; depends=[base64enc base64url cli digest fastmap future future_apply jsonlite progressr R6 Rcpp RcppParallel rlang rstudioapi shiny startup stringr synchronicity]; }; + dipsaus = derive2 { name="dipsaus"; version="0.2.0"; sha256="069l6fv3hxsgsxyg51am2yr6n3vd4kym08f28mn741ik7m1y6yjj"; depends=[base64enc base64url cli digest fastmap future future_apply jsonlite progressr R6 Rcpp RcppParallel rlang rstudioapi shiny startup stringr synchronicity]; }; 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]; }; @@ -8215,15 +8313,15 @@ in with self; { dirichletprocess = derive2 { name="dirichletprocess"; version="0.4.0"; sha256="1gspaynxq5czvnpni57swcqqy17lryjlh3cn9x0mghl527rkbpna"; depends=[ggplot2 gtools mvtnorm]; }; dirmcmc = derive2 { name="dirmcmc"; version="1.3.3"; sha256="117p3jvinmha7a2phcpzq38ig05kcranp15xbxqvv0cgh3c95fjr"; depends=[mcmcse]; }; dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; }; - disaggR = derive2 { name="disaggR"; version="1.0.2"; sha256="1vm9p0kil0yr18g1d8xqkf89la3fnxz6r8b6hjlbpv96j3gj0zjk"; depends=[RColorBrewer]; }; + disaggR = derive2 { name="disaggR"; version="1.0.3.1"; sha256="1nl19kr14i73c165nagb8crhzn8yr18q21f2i7508n90yl61cnfk"; depends=[RColorBrewer]; }; disaggregation = derive2 { name="disaggregation"; version="0.1.3"; sha256="04wmwwhmcgi1cdr8iyhilsphpzb7r5xs04vhqx5z01y7cgardivx"; depends=[cowplot doParallel dplyr foreach ggplot2 maptools Matrix raster RcppEigen rgdal rgeos sp sparseMVN splancs TMB]; }; disastr_api = derive2 { name="disastr.api"; version="1.0.5"; sha256="1h5i6pwak16w0gdk8qjz4w9qpffjhzlsrvjkb4acrvgjgrsvz9kp"; depends=[httr jsonlite]; }; discAUC = derive2 { name="discAUC"; version="0.4.0"; sha256="1l80xz5wrcikrs2b2i05jq3qkx468k891gwmmy5d1mymp4si3z0h"; depends=[dplyr glue rlang tibble]; }; - discSurv = derive2 { name="discSurv"; version="1.4.1"; sha256="0xi016ah8xc8bv92qvyslvx30anncrki49ccg3qw79yh5vzns1wk"; depends=[data_table functional mgcv mvtnorm]; }; + 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]; }; discgolf = derive2 { name="discgolf"; version="0.2.0"; sha256="07clh1awnibgrh7vl4a51r8dbya2rbmicm8v8x8mq8h8am2b3j0s"; depends=[crul jsonlite xml2]; }; discharge = derive2 { name="discharge"; version="1.0.0"; sha256="1hwsdrbajmpfdc9arb1pjhx2w45dy3zrba9ibcrnpyqhhr4i1c5m"; depends=[boot checkmate CircStats ggplot2 lmom]; }; - disclap = derive2 { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; }; + disclap = derive2 { name="disclap"; version="1.5.1"; sha256="0qsycr04xz1h90jyzxwagfkc4rkc8mb9srasvhrp7grynjxlbb9f"; depends=[]; }; disclapmix = derive2 { name="disclapmix"; version="1.7.3"; sha256="0hh20ff3szh9s9r1hdymk73ysn0v5lh2gfzgqpvfvdhcc5z8xjk7"; depends=[cluster disclap MASS Rcpp RcppProgress]; }; discnorm = derive2 { name="discnorm"; version="0.1.1"; sha256="0qqnn9dcsd3wxg358mrri91j913alb2hclj3xl305r6b5dmg1g1m"; depends=[arules lavaan MASS pbivnorm sirt]; }; disco = derive2 { name="disco"; version="0.6"; sha256="1abvhf0yb4mw02j1krjb7q68jpwdnl2narcalf3vkjcbflcp76z3"; depends=[ggplot2 RColorBrewer tmod]; }; @@ -8234,24 +8332,24 @@ in with self; { discreteMTP = derive2 { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; }; discreteRV = derive2 { name="discreteRV"; version="1.2.2"; sha256="1lhf67cccr96zl3j1sysh2bv0pbgvkbgjdzm35fvrdm7k74ypjsi"; depends=[MASS plyr]; }; discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.7"; sha256="01x3qfjj7dwv0m9q8zdhfrpbj9ys9y5p7d3z8ywjrqy4jw88svjs"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; }; - discretefit = derive2 { name="discretefit"; version="0.1.1"; sha256="00na797gvcv6mk78kcmd82xgcz9qmv489hm3i9lg6gr593iw1xsw"; depends=[Rcpp]; }; + discretefit = derive2 { name="discretefit"; version="0.1.2"; sha256="0xyv3lff6xmz9q1k2lprll68fw9ckqhgl1z87pd9rm0ldy969m9p"; depends=[Rcpp]; }; discretization = derive2 { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; }; - discrim = derive2 { name="discrim"; version="0.1.3"; sha256="1m54qq2a9k5xphmz7a1701vxvfzyb0g477mb74x0s152gj49xcm0"; depends=[dials parsnip purrr rlang tibble withr]; }; + discrim = derive2 { name="discrim"; version="0.2.0"; sha256="1w8ji9wj2wm8gvzi3w78dcf6jabjzn32hf2saiz1mybix63rpqxd"; depends=[dials parsnip purrr rlang tibble withr]; }; disdat = derive2 { name="disdat"; version="1.0-0"; sha256="1q8v40m0vjni3kx0f04qb99adxcx783p9lfixvvq6viz13v1ygcw"; depends=[]; }; diseasemapping = derive2 { name="diseasemapping"; version="1.5.1"; sha256="0pqilkl56753j1fxy6mh7nx24n6qg2j5faxyxj6abcm6xrnkhmy9"; depends=[rgeos sp]; }; - diseq = derive2 { name="diseq"; version="0.3.1"; sha256="1d5cff0igmyd6l9xi0z4nz8r5pygk4dldl53h61jm6zwv2xxrfml"; depends=[bbmle dplyr magrittr MASS png Rcpp RcppGSL RcppParallel rlang systemfit tibble tidyr]; }; - disk_frame = derive2 { name="disk.frame"; version="0.5.0"; sha256="127ms95z23053phlbh2arhvydj319vg04i35nsdl8pix23zgh9an"; depends=[benchmarkme bigreadr bit64 crayon data_table dplyr fs fst furrr future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; }; + diseq = derive2 { name="diseq"; version="0.4.3"; sha256="1dfcgw1qzw2fax5vzw9fjh72hnim2n4d3wa3nd616vx6ydly216l"; depends=[bbmle dplyr Formula magrittr MASS Rcpp RcppGSL RcppParallel rlang systemfit tibble tidyr]; }; + disk_frame = derive2 { name="disk.frame"; version="0.7.2"; sha256="016sxjvbw8j6inwr1y66hck1dzpnjr79v2fiiylcpgdnc39hc0hn"; depends=[arrow benchmarkme bigreadr bit64 crayon data_table dplyr fs fst future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; }; diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; }; dismo = derive2 { name="dismo"; version="1.3-5"; sha256="1rqf6h4imbqvs7hjd1k4my6154wg0qnmnp5byan403rcshr1jbl1"; depends=[raster Rcpp sp terra]; }; disordR = derive2 { name="disordR"; version="0.0-9"; sha256="1x9lvdwgvi6gmjfgl03ccqkjpmibz3kswlqnw8flj7x2sx969i4h"; depends=[digest]; }; - dispRity = derive2 { name="dispRity"; version="1.6.0"; sha256="0fwwjfz4ljlr9135r9kdkd3djkawz2wjf8ki2xdjsbfh6s0c7gnc"; depends=[ade4 ape castor Claddis geiger geometry geoscale mnormt phangorn phyclust scales vegan]; }; + dispRity = derive2 { name="dispRity"; version="1.6.8"; sha256="0jg3jmpdfr48hgia7rgdnnqx5w7vcypnamfnqbw886mxxwkq50z0"; depends=[ade4 ape castor Claddis geiger geometry geoscale mnormt phangorn phyclust scales vegan]; }; disparityfilter = derive2 { name="disparityfilter"; version="2.2.3"; sha256="0dkk3qws631mf0g02di5rsrvh5954cykysyri0g8aqgik0j9dg06"; depends=[igraph]; }; displayHTS = derive2 { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; }; dispmod = derive2 { name="dispmod"; version="1.2"; sha256="16r6is0pchzc9mxpz0c44f72j76vsh3j9damalcxajrha06dkdq4"; depends=[]; }; disposables = derive2 { name="disposables"; version="1.0.3"; sha256="0q5wacjclspn2fh7z1pg2l67ll51n75wck5h2fdq2vxy3qn3vwis"; depends=[]; }; dispositionEffect = derive2 { name="dispositionEffect"; version="1.0.0"; sha256="0vx87xylpx3np6afwwylzwp0nb9g8r04ngn8mgr88ycys815fkqw"; depends=[dplyr lubridate magrittr progress purrr rlang]; }; disprofas = derive2 { name="disprofas"; version="0.1.3"; sha256="16gbd9algrs6pqid8k96p9r9pzfy337jv506alnajvwirs59sldd"; depends=[boot ggplot2]; }; - disprose = derive2 { name="disprose"; version="0.1.2"; sha256="1xdc1lsf3mp4465nhc617p79gl5ljn3ms6a2b7pz34mswiq21ah0"; depends=[]; }; + disprose = derive2 { name="disprose"; version="0.1.5"; sha256="0drnqpgmisavy9rqk3p0f1safw4fshpjn9lq3vjay4k5s8dg37h7"; depends=[]; }; dissCqN = derive2 { name="dissCqN"; version="0.1.0"; sha256="142f4ggzwdhf2vm9kisayna9a5j17mmy2jckhjrvxh4k5dc3ssf6"; depends=[]; }; dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; }; dissever = derive2 { name="dissever"; version="0.2-3"; sha256="1lgs5nmv3lpm4gsryxvcwiwibvvg9flv23q8maisp77x49c18qcp"; depends=[boot caret dplyr foreach magrittr plyr raster sp viridis]; }; @@ -8269,7 +8367,7 @@ in with self; { 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.8.0"; sha256="1dyff4m33xmw6hxb3jxzr8vvajg3qz3rfcrfxjxwsswlddfz0zdv"; depends=[MASS sfsmisc startupmsg]; }; - distr6 = derive2 { name="distr6"; version="1.6.2"; sha256="19xyivl0prrmqdjg61d5yw5763f0j6h9ji8am2d5iydlqvwl2x7f"; depends=[checkmate data_table param6 R6 Rcpp set6]; }; + distr6 = derive2 { name="distr6"; version="1.6.7"; sha256="0drk81lhmfx199pb5vq5chbxcm8774iqyzw605pj6n2jcz09zhq2"; depends=[checkmate data_table param6 R6 Rcpp set6]; }; distrDoc = derive2 { name="distrDoc"; version="2.8.0"; sha256="1iq2gbfbsf3h279yh3fnqsi39gdw15vc6r1g33xcb8kgmmqmvf0p"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg]; }; distrEllipse = derive2 { name="distrEllipse"; version="2.8.0"; sha256="1ymfa8xpgs8zjp4psiwmll5z0vji496fivxmcavspzxy31cw70wx"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; }; distrEx = derive2 { name="distrEx"; version="2.8.0"; sha256="1gwhsnlrnzyp2x97d9wfdy5pa9z3q5il934wjv4kxs9wsvkwsr5h"; depends=[distr startupmsg]; }; @@ -8278,29 +8376,29 @@ in with self; { distrSim = derive2 { name="distrSim"; version="2.8.0"; sha256="0g16mljlz7fnb5k6c9h5vplm3n51sdbybv9cifbia0y6p9zml383"; depends=[distr setRNG startupmsg]; }; distrTEst = derive2 { name="distrTEst"; version="2.8.0"; sha256="06rdcwfgbhc81zqisg414nj0kji59xvhm782b63hk54a8b2zwhh5"; depends=[distrSim setRNG startupmsg]; }; distrTeach = derive2 { name="distrTeach"; version="2.8.0"; sha256="1qgkd4yipk29q8k334fz97n6dxlxnsback7v5a05m6ragc37wzag"; depends=[distr distrEx startupmsg]; }; - distreg_vis = derive2 { name="distreg.vis"; version="1.7.2"; sha256="0wyxw479jvh007hdyhyaqz8cn3ng03612p7bms1d6l6jk7dlncf9"; depends=[bamlss betareg formatR gamlss gamlss_dist ggplot2 magrittr rhandsontable shiny]; }; + distreg_vis = derive2 { name="distreg.vis"; version="1.7.3"; sha256="1dnpcd0dpbgvnwcc83n15gr9risyzvnp5f45wg11l9fp5yi63s8j"; depends=[bamlss betareg formatR gamlss gamlss_dist ggplot2 magrittr rhandsontable shiny]; }; distribglm = derive2 { name="distribglm"; version="0.4.1"; sha256="09gpkp7s8y2dcpjhqgi2nl6j8pmd500y89d8c8x8sxmh5mg8n5si"; depends=[readr]; }; - distributional = derive2 { name="distributional"; version="0.2.2"; sha256="0ps30ijlf0xwranxkq1z29d76d3zgy8drwxpnxp6ffmyma8mm3h2"; depends=[digest ellipsis farver generics ggplot2 lifecycle numDeriv rlang scales vctrs]; }; + distributional = derive2 { name="distributional"; version="0.3.0"; sha256="1mji8xlhwrw8msih5wdpbzwv4g59kly0xkdklhn8yzb18rrnrczs"; depends=[digest ellipsis farver generics ggplot2 lifecycle numDeriv rlang scales vctrs]; }; distributions3 = derive2 { name="distributions3"; version="0.1.2"; sha256="098da9lyimwrnyxqqnssm87lg8c7nbmcbwbjpwdwvvyq2xjzc0my"; depends=[ellipsis ggplot2 glue]; }; distributionsrd = derive2 { name="distributionsrd"; version="0.0.6"; sha256="0ykzxcxh5l9l5z3546iqlllryw2xyixz1hiynx19k8bsn8k7dxyp"; depends=[flexmix modeltools Rdpack]; }; distro = derive2 { name="distro"; version="0.1.0"; sha256="03b8mkjhxxh93675mmj443a83mgfwhkdar7dfbf3agf6aqnadn2g"; depends=[]; }; distrom = derive2 { name="distrom"; version="1.0"; sha256="0wylw7yaylf5j8cy8g45jrw91mwx6w0i7vf9ysnj5kxyznq1gl6y"; 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.7"; sha256="1wdcggphyxy58zyqdsyz2z3q4rb69wady63l79s1ivjwzgjrsxmi"; depends=[]; }; + disttools = derive2 { name="disttools"; version="0.1.8"; sha256="1jm3nqyywdzpbfvk2mffmhp75al1hcvd5l4r21fbd3iz2anll0ma"; depends=[]; }; dittodb = derive2 { name="dittodb"; version="0.1.3"; sha256="0wkiy3vgqrpmc34hxw30rfgg01d941gxz8fr2h9i9gvddnxnywdc"; depends=[DBI digest glue lifecycle testthat]; }; 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.1"; sha256="0ghcipx0wyp1750ggys8zq8nxpqm7hac6xvkyjs2dgqjmlh3mzz2"; depends=[Rcpp]; }; diveMove = derive2 { name="diveMove"; version="1.6.0"; sha256="0ddlc89wi76kja8zz9j72p57hz3rw9xjzrj6k5h60573c5b9b1ig"; 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]; }; diveRsity = derive2 { name="diveRsity"; version="1.9.90"; sha256="11pfq3syvjmfwfimjc2jnlprcnynvargr4yjd8h0aa6qzgdrrx5q"; depends=[ggplot2 qgraph Rcpp shiny]; }; - diverge = derive2 { name="diverge"; version="2.0.1"; sha256="0pa60dwnpsks7y19msgz259g6wsjhbv9nyaq43d1g75hy9ipdrg4"; depends=[truncnorm]; }; + diverge = derive2 { name="diverge"; version="2.0.4"; sha256="11hhak3ldnf83aaq7wd8f2wqcd3lqgmda78zdgcd6ksljq3mvwcx"; depends=[truncnorm]; }; diverse = derive2 { name="diverse"; version="0.1.5"; sha256="10kmx3qv58xhqs1icsxqq0y0cm8y2hx9ysb65brd3hhg33alzvk3"; depends=[foreign proxy reshape2]; }; diversitree = derive2 { name="diversitree"; version="0.9-16"; sha256="0rzrk7xsn4gy271pbcw3azndhx0c06bmsgrg6libjmlfnmq6j8sc"; depends=[ape deSolve Rcpp subplex]; }; - diversityForest = derive2 { name="diversityForest"; version="0.3.2"; sha256="09rn8ddczvclj3xqmbsnymx6s3gg0w48swxxvssf7xkxv0hzz490"; depends=[gam ggplot2 ggpubr MapGAM Matrix nnet RColorBrewer Rcpp RcppEigen rlang rms scales sgeostat survival]; }; - divest = derive2 { name="divest"; version="0.10.1"; sha256="0gbzji3v4qnv49mqqpadjskz265iwdvvd3mqwhmcq72125jh86sq"; depends=[Rcpp RNifti]; }; + diversityForest = derive2 { name="diversityForest"; version="0.3.3"; sha256="056rfg44xw4kyp7l1bpm31vm5pn9xk5pxv97w6yc91dmky08jwyf"; depends=[gam ggplot2 ggpubr MapGAM Matrix nnet RColorBrewer Rcpp RcppEigen rlang rms scales sgeostat survival]; }; + divest = derive2 { name="divest"; version="0.10.2"; sha256="1r49glh66vdrj7hp8xlqc3g1c13hjl24x7rhd27vv6l1jgvhllgb"; depends=[Rcpp RNifti]; }; divo = derive2 { name="divo"; version="1.0.1"; sha256="06c4kjl6llvvdr2gk480jcmj2abmqwph7x4vk5nflxm7piimvg7v"; depends=[cluster]; }; divseg = derive2 { name="divseg"; version="0.0.4"; sha256="0iwxckdfsb28wgpv6d1r8idyn974c38ylpiaxsvn9m8x1wnpnbp7"; depends=[dplyr magrittr rlang sf tibble tidyselect units]; }; - dixon = derive2 { name="dixon"; version="0.0-7"; sha256="0crpzkshil8836axcywj0r95qmkv31vrw9gqnjqj3xgx6hml6xym"; depends=[spatstat spatstat_geom splancs]; }; + dixon = derive2 { name="dixon"; version="0.0-8"; sha256="1mflg9mpcidjq1ljgzqdwp6x0g930v9y5jgma1qxi5c5l3irkvg3"; depends=[spatstat spatstat_geom splancs]; }; dixonTest = derive2 { name="dixonTest"; version="1.0.3"; sha256="1a3yc30g5rbb0jhm2b0iir5i1dy4jyl67spkhx4yysg4snz131wv"; depends=[]; }; diyar = derive2 { name="diyar"; version="0.4.1"; sha256="0ydpwvjg1vlqn571lwcgsi1ahczqd316c8qc1szg36ashn1imj7f"; depends=[ggplot2 Rfast rlang]; }; dkDNA = derive2 { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; }; @@ -8313,13 +8411,13 @@ in with self; { dlr = derive2 { name="dlr"; version="1.0.1"; sha256="13gr8rk8igbypq9mg00pyk2pjczxr1ghkj5287gijxnxch7zdknc"; depends=[digest fs rappdirs rlang]; }; dlsem = derive2 { name="dlsem"; version="2.4.6"; sha256="1h3bwqqpfjkl41b2mbfhsj0pi9kri0h0i28wiid6arjrmm87nsf8"; depends=[graph Rgraphviz]; }; dlstats = derive2 { name="dlstats"; version="0.1.4"; sha256="1j415v3kajn269md046b05pwklqwm4rwk2f7q3mwax9yx4m5nc0n"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; }; - dm = derive2 { name="dm"; version="0.2.6"; sha256="0jjsl70gwpa9syprj02way20l2675g090ai1633i3bh98slbkkxj"; depends=[backports cli DBI dplyr ellipsis glue igraph lifecycle magrittr memoise pillar purrr rlang tibble tidyr tidyselect vctrs]; }; + dm = derive2 { name="dm"; version="0.2.7"; sha256="1fh34vgpr8w1kr7w667mzalg014lm1h82jr3gl1w0s5x93w3qi06"; depends=[backports cli DBI dplyr ellipsis glue igraph lifecycle magrittr memoise pillar purrr rlang tibble tidyr tidyselect vctrs]; }; dma = derive2 { name="dma"; version="1.4-0"; sha256="003snr09hazszwqnvjrbv8vyz6ihgcfcfhrlshg451dddn920615"; depends=[MASS]; }; dmacs = derive2 { name="dmacs"; version="0.1.0"; sha256="1prw6h8sj6fcpajg6xwqhi8v5jfl74mbjdjrdy524miw56fh9h0r"; depends=[lavaan MplusAutomation]; }; dmai = derive2 { name="dmai"; version="0.4.0"; sha256="0ma89jl0l598sffpikvjj40f2djjcnjq29k6y1bav4dm2g51qgmq"; depends=[dplyr ggplot2 magrittr stringr tibble tidyr]; }; dmbc = derive2 { name="dmbc"; version="1.0.0"; sha256="0hfcc12v73c0x11jvp0pm2ddm2qd1fdv8667k67r7d1zi0cp2i5g"; depends=[abind bayesplot coda ggplot2 ggrepel MCMCpack modeltools pcaPP Rcpp RcppArmadillo RcppProgress robustbase]; }; dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; }; - dmlalg = derive2 { name="dmlalg"; version="1.0.1"; sha256="1jgypgclv9609i2vfwskjy61vl3giv7ia79d3d20ly324khxalhb"; depends=[glmnet lme4 matrixcalc randomForest]; }; + dmlalg = derive2 { name="dmlalg"; version="1.0.2"; sha256="1ixjpalg3q0wnddrli6v66kky3pxf90sjgiia8jhk4nds0h58a72"; depends=[glmnet lme4 matrixcalc randomForest]; }; dmm = derive2 { name="dmm"; version="2.1-7"; sha256="0zn7d2lr2vig8q6h5dd5zk7ra1f0mkm6pszl3v06aghcflg63ng3"; depends=[MASS Matrix nadiv pls robustbase]; }; dmri_tracking = derive2 { name="dmri.tracking"; version="0.1.0"; sha256="0aij0n5p6cp75r5b3bfpmhnmz2nixbb4kwacixg66g6kilwj3sis"; depends=[rgl]; }; dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; }; @@ -8331,15 +8429,15 @@ 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.11"; sha256="1xhjh2d7zfgw8wbcj5yfscvmwbjar1w544ika13da69dydm44j81"; depends=[broom curry Deriv dplyr ggplot2 magrittr MASS Matrix microbenchmark pbkrtest tibble]; }; + doBy = derive2 { name="doBy"; version="4.6.12"; sha256="1m60ya4cdickqsj0dc90bv4n47df6qg6n82fikxrkl4yhg7yyn1i"; depends=[broom Deriv dplyr ggplot2 magrittr MASS Matrix microbenchmark pbkrtest tibble]; }; doFuture = derive2 { name="doFuture"; version="0.12.0"; sha256="1hqzdlgcrc5l6xjwdylsc9iiysi2wx8k1j1vmw3wryj26057c9y4"; depends=[foreach future globals iterators]; }; - doMC = derive2 { name="doMC"; version="1.3.7"; sha256="0kdmfhp5m1wisjbfyl9d040jrmjmhcgjb0vdi536g2i9vixb5yny"; depends=[foreach iterators]; }; + doMC = derive2 { name="doMC"; version="1.3.8"; sha256="18qrcvqwm4cclvk8spvyi281y8prwzivj52xmzk1l9a82j2ny65j"; depends=[foreach iterators]; }; doMIsaul = derive2 { name="doMIsaul"; version="1.0.1"; sha256="17a363gj8hsdpga6b07c4lzrswgf553dfqxacv2jfx0rswxnrsb0"; depends=[aricode arules clusterCrit dplyr ggplot2 Gmedian MASS mice NbClust ncvreg plyr scales survival withr]; }; doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; }; - doParallel = derive2 { name="doParallel"; version="1.0.16"; sha256="1cjf0mxrxgls5pl7aj22fv9j488craib1wkc9np4f3gkckwjdfzi"; depends=[foreach iterators]; }; + doParallel = derive2 { name="doParallel"; version="1.0.17"; sha256="1mxbg2qqda1775vb4s26gz27p5n91lljgjmlqxq4sras22njasmr"; depends=[foreach iterators]; }; doRNG = derive2 { name="doRNG"; version="1.8.2"; sha256="1jff27zzrvd1fd61x2m9468h8xn3s1c9f6wibviy5zdhj5dx9s9k"; depends=[foreach iterators rngtools]; }; doRedis = derive2 { name="doRedis"; version="3.0.0"; sha256="05xvan8djif0mkvk32lg20ffrb6x013a5ia1wc1k0g5n4jkg6rs4"; depends=[foreach iterators redux]; }; - doSNOW = derive2 { name="doSNOW"; version="1.0.19"; sha256="0f07b38cl7s61vwzkyqkzzsic9g4sw9k6ndbxk3g90l4ca0d1ljc"; depends=[foreach iterators snow]; }; + doSNOW = derive2 { name="doSNOW"; version="1.0.20"; sha256="1f5v0k2w0b2478p6iqa3hn2lwd1x3rzc348n57nd38ka2vnsnz4i"; depends=[foreach iterators snow]; }; dobin = derive2 { name="dobin"; version="1.0.2"; sha256="1vhvwdl7a8bf4q64jz8a6afm3smdn3jgxvs17jjlilarpdazl3p5"; depends=[pracma RANN]; }; dobson = derive2 { name="dobson"; version="0.4"; sha256="0xfn7s3wzrv1md40bdjrnjfiqyxg5c6lrcpnvayjdgrhxq161hhq"; depends=[]; }; doc2concrete = derive2 { name="doc2concrete"; version="0.5.4"; sha256="0ng1dsczyk6mxg5x5c4ms57yk7zhyn16alj2xd0h21hhbx3n2m9g"; depends=[english glmnet quanteda SnowballC stringi stringr textstem tm]; }; @@ -8349,6 +8447,7 @@ in with self; { doconv = derive2 { name="doconv"; version="0.1.3"; sha256="0aqdylp3lzn1jl96sq4xaipyxpi1hai0n9msk9gfm20gdpsnn1w5"; depends=[locatexec magick pdftools rappdirs]; }; docopt = derive2 { name="docopt"; version="0.7.1"; sha256="1zxhwizs916qm5by7nfslqnarl2q5202xc2azlhrnzk0wj3khiwz"; depends=[]; }; docopulae = derive2 { name="docopulae"; version="0.4.0"; sha256="186mfiy4ygx6spnv7yrm5h0k6nf2g1xhk1l05iij39j5al5d9j21"; depends=[]; }; + docore = derive2 { name="docore"; version="1.0"; sha256="0x6c2yqr05v62ksn9a5swf44q8w7acfk00589mkipw643rg4l64y"; depends=[bit64 pracma]; }; docreview = derive2 { name="docreview"; version="0.0.1"; sha256="0cmgl1q1whb38iiljaz0f5vyxniyaaxm8xpbzd56cayqgbvl92b8"; depends=[cli parsermd purrr quanteda quanteda_textstats rlang stringr yaml]; }; docstring = derive2 { name="docstring"; version="1.0.0"; sha256="19z5frhxbdc5c4vrkckgqbh9mx4d9w1icw8szsw9yadvbg48nlhl"; depends=[roxygen2]; }; docuSignr = derive2 { name="docuSignr"; version="0.0.3"; sha256="0q90z31svbdnvylfr0yj2f0gahvpi089c1d5llvwqy8qc5p9fbqw"; depends=[httr jsonlite magrittr]; }; @@ -8362,7 +8461,7 @@ in with self; { doex = derive2 { name="doex"; version="1.2"; sha256="1r999z30ipa04pgck0hfalqxihb1bj8sdhlkkhf4plb7maaz3qm3"; depends=[]; }; dominanceanalysis = derive2 { name="dominanceanalysis"; version="2.0.0"; sha256="0qxldvlgbysy9j17kb0a9p132a04a4j12h4m0r70zv2752fj24c0"; depends=[]; }; domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; }; - domir = derive2 { name="domir"; version="0.2.0"; sha256="0zy0ymsx6m6d26szpk3h85yknqraa7gxi8765qdxjs1cajl0dgll"; depends=[]; }; + domir = derive2 { name="domir"; version="0.3.0"; sha256="141xs38j0cdrygqv7pdrbrbfa7b74dgk01d6apxvk3lafy1b8fqv"; depends=[]; }; donut = derive2 { name="donut"; version="1.0.2"; sha256="0idynkhcdn9va32m1n1rxjyb7ghbkhyy1959wks2bn1a7k4yg87i"; depends=[]; }; doolkit = derive2 { name="doolkit"; version="1.0.1"; sha256="09kgd1ca1aacvh9gjfns85m36zl5bj095j21avn1jgp8h5mk7301"; 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]; }; @@ -8382,7 +8481,7 @@ in with self; { doubt = derive2 { name="doubt"; version="0.1.0"; sha256="16avp0f7ks2zd4ckakvfm57zng2jk0fg3fz6vbm05lzhqymh6y30"; depends=[unglue]; }; downlit = derive2 { name="downlit"; version="0.4.0"; sha256="10zvrqdpwavdy97h3q26bqh3k63z61fmc04w9vwsnvmnv8hnh3vl"; depends=[brio desc digest evaluate fansi memoise rlang vctrs yaml]; }; downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; }; - downloadthis = derive2 { name="downloadthis"; version="0.2.1"; sha256="12df3cxg1x84f3sibllykd5wqs11mr4nlyv8hj8bh9d6wjvwj2li"; depends=[base64enc bsplus fs ggplot2 htmltools magrittr mime readr writexl zip]; }; + downloadthis = derive2 { name="downloadthis"; version="0.3.1"; sha256="1367hxfi5si9df8pnnq8v8cx6n91hlp95yyl7as8875qbfpjw10v"; depends=[base64enc bsplus fs ggplot2 htmltools magrittr mime readr writexl zip]; }; downscale = derive2 { name="downscale"; version="4.2-0"; sha256="1ha36jiahvrg75qwzp9wpgnqqizw6ivc02q24fyz5frzssda6wd8"; depends=[cubature minpack_lm raster Rmpfr sp]; }; 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.2"; sha256="18b9shd79z0bsdnp0apqqwv6c73j4wnfiv41ywqz761nmxbldxbn"; depends=[magrittr R_utils]; }; @@ -8392,7 +8491,8 @@ in with self; { dpcid = derive2 { name="dpcid"; version="1.0"; sha256="1gx8gyrxvm07mjiasl0b80y0x3crq6gy170v6s817d11jw44n86z"; depends=[]; }; dplR = derive2 { name="dplR"; version="1.7.2"; sha256="1g57azixwv3c6x60l1kqdnzylf0ayv3s15wi0av2qcca35z3baa1"; depends=[digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; }; dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; }; - dplyr = derive2 { name="dplyr"; version="1.0.7"; sha256="0g8jsxclj9cgm7a2lyazy78sj62rbzw812lsw3fdsbz0pknkmznj"; depends=[ellipsis generics glue lifecycle magrittr pillar R6 rlang tibble tidyselect vctrs]; }; + dplbnDE = derive2 { name="dplbnDE"; version="0.1.1"; sha256="0hwb4lvydqlkbcxp3jwgzkqk6sqdjkcmkya1cah60sc15n816ksd"; depends=[bnclassify]; }; + dplyr = derive2 { name="dplyr"; version="1.0.8"; sha256="0xb04ckp29pva1h2rfahqhmk9gcwp2dbbx3av8ip40v7dnha6siv"; depends=[generics glue lifecycle magrittr pillar R6 rlang tibble tidyselect vctrs]; }; dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.4.1"; sha256="0ygn8cq4dnmzzxfskcir7g0bksgby5sw2j135gvrk599z3v6avg1"; depends=[bit64 DBI dbplyr dplyr odbc]; }; 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]; }; @@ -8422,13 +8522,13 @@ in with self; { drhur = derive2 { name="drhur"; version="0.1.0"; sha256="1a13fpczvq0a93q2ldh2h42hk7firmcbr478vkli8y6d1bwlj567"; depends=[arm car dotwhisker gapminder ggeffects ggthemes gt interplot kableExtra knitr learnr likert modelsummary moments nnet ordinal performance scales summarytools tibble tidyverse]; }; 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.2.1"; sha256="1zc14j7aarxbw11p5gardqkwrab71b8wfrpd1q2g6r9dg98w146i"; depends=[caret GenomeInfoDb GenomicFeatures GenomicRanges org_Hs_eg_db randomForest rlang S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene]; }; + driveR = derive2 { name="driveR"; version="0.3.0"; sha256="12yr2vbfg2ps7prb2kd1si4349rqyvk5c6gckfragc6dw3hzxzbb"; depends=[caret GenomeInfoDb GenomicFeatures GenomicRanges org_Hs_eg_db randomForest rlang S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene]; }; drmdel = derive2 { name="drmdel"; version="1.3.2"; sha256="1772fxm3qs01h14qklp2rawcdm0vmjmb2mi62v1zl1hbxisnfq4s"; depends=[]; }; droll = derive2 { name="droll"; version="0.1.0"; sha256="0gd1vnvkjdsw7gz4czi4g9zq5080awfr4dy2srgksh4ah4ki4vm3"; depends=[Ryacas]; }; dropR = derive2 { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; }; 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.0"; sha256="1rj3aycvkb0f85p12l356rlhid4zfzqkhks20x2hhwvpk8nhri8h"; depends=[copula]; }; + 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.0"; sha256="08a6k0nrg6mqdslwjc71583x52vnax87nbfalk98zczwvrrdwvxa"; depends=[future_apply np SuperLearner]; }; drugprepr = derive2 { name="drugprepr"; version="0.0.4"; sha256="07401dqw4krqh3rv7y13526n0xjdlaw14gcxwranksjchmqjd3ij"; depends=[DescTools doseminer dplyr purrr rlang sqldf stringr tidyr]; }; @@ -8437,7 +8537,7 @@ in with self; { ds4psy = derive2 { name="ds4psy"; version="0.7.0"; sha256="1dyylnx2lsdvsv9cydjp4qm1dgn4lv44afr2hplqyi45jmmzy8mm"; 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.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; }; - dsb = derive2 { name="dsb"; version="0.2.0"; sha256="10ybwid05rggascxrycpd36gwfgs07736sv0vzrgxndbamk66xis"; depends=[limma magrittr mclust]; }; + dsb = derive2 { name="dsb"; version="0.3.0"; sha256="0b7da10i45vxik2mbxb9bjwkhw62nafh09j8qixx4nc1j5a7dp3f"; depends=[limma magrittr mclust]; }; dscore = derive2 { name="dscore"; version="1.4.0"; sha256="0vjrxdgss79pmd8vkarvgqqm465byz17r7r93k5i3923xm02kavr"; depends=[dplyr Rcpp RcppArmadillo stringr tidyr tidyselect]; }; dse = derive2 { name="dse"; version="2020.2-1"; sha256="170rxrniszs8h59ah4mn4mz8d7kzix4g3vlz4icd8w6bl40c6ykc"; depends=[setRNG tfplot tframe]; }; dsims = derive2 { name="dsims"; version="0.2.0"; sha256="1yj6rk6wvxhwzfrbvy5ljsp94pfxrf9vwaccr9gbffg0b3c1badb"; depends=[Distance dssd ggplot2 gridExtra mgcv mrds rgeos rlang rstudioapi sf sp]; }; @@ -8445,27 +8545,30 @@ in with self; { dslice = derive2 { name="dslice"; version="1.2.0"; sha256="1k9hxpmr563p8bpd9m991lx5ig366mzk9j1lzldci9pq4jiayin1"; depends=[ggplot2 Rcpp scales]; }; dsm = derive2 { name="dsm"; version="2.3.1"; sha256="0flmbypplk99n3b3lkai2lz162w4bnizw2bpdk91db53w2jfp3i9"; depends=[ggplot2 mgcv mrds nlme numDeriv plyr statmod]; }; dsmisc = derive2 { name="dsmisc"; version="0.3.3"; sha256="19760hcb5154rayhj72r48r7glh2qyaf178zkxplywmsw338kws4"; depends=[Rcpp stringr]; }; + dsos = derive2 { name="dsos"; version="0.1.0"; sha256="00m31l38q6i2m5p9k2x0d6n0b8hyvpgv6b5n8s8069zannqx8fgz"; depends=[data_table ggplot2 isotree ranger scales simctest WeightedROC]; }; dsrTest = derive2 { name="dsrTest"; version="0.2.1"; sha256="1kljlfi7jf6fa8b5f3wxjsa9rlmzcp4qix3m2qyapz2lqd85mbb7"; depends=[asht exactci loglognorm]; }; dssd = derive2 { name="dssd"; version="0.3.1"; sha256="0q98cn1hyaavzmc2kygpsab7vlzzmqwwc8avf3g1palmn9d4n8k2"; depends=[ggplot2 plot3D rgdal sf]; }; dst = derive2 { name="dst"; version="1.5.1"; sha256="08cw09hf5jx1qfmrqmhm4713gzq21p0ss3nx7qrs92mpsvprq3yc"; depends=[]; }; dstat = derive2 { name="dstat"; version="1.0.4"; sha256="023jp0xdbg200ww1gnr3fzgjqd82acag0jps7q6j6m27q11psvgz"; depends=[]; }; dtangle = derive2 { name="dtangle"; version="2.0.9"; sha256="0yg1fbrqixqp93vdw3grvz1la5l2kidgs730qp6yihkp3260cxf3"; depends=[DEoptimR]; }; + dtgiw = derive2 { name="dtgiw"; version="0.1.0"; sha256="0iamvnf8s19wxs1wddzag4sgg6dhcplgj4gz8z2zalskpx02ss11"; depends=[]; }; dti = derive2 { name="dti"; version="1.5.1"; sha256="08da7v7sl88g2jixfplvw9rc5rvlifq3fvyrgh9naa5jsmd8h5ia"; 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.2.0"; sha256="053l0w97sfsdx3n3b65likdbzdv0q0sbcnh0kp9c3pw0vnvdzpm6"; depends=[crayon data_table dplyr ellipsis glue lifecycle rlang tibble tidyselect vctrs]; }; + dtplyr = derive2 { name="dtplyr"; version="1.2.1"; sha256="1wyhhn16mvdj55k2xsh7vy489l7xk4mkz7pjrw16z87awk6yjh16"; depends=[crayon data_table dplyr ellipsis glue lifecycle rlang tibble tidyselect vctrs]; }; dtrSurv = derive2 { name="dtrSurv"; version="1.2"; sha256="104hz8nqn02rk2wg15j4qap7r7cq4162agjaflv2dxmyb9zj0cb2"; depends=[survival]; }; dtree = derive2 { name="dtree"; version="0.4.2"; sha256="1cpv0pyf515610djxzfw1c83p3alk5a93clg4x9gk7a7qy4cyhr1"; depends=[caret evtree party partykit rpart]; }; dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; }; dttr2 = derive2 { name="dttr2"; version="0.4.0"; sha256="1a7fmby2bassj3wnx2wk3c4fzzx63saw3963kfs6pq58cbwpqk09"; depends=[chk hms lifecycle]; }; + dtts = derive2 { name="dtts"; version="0.1.0"; sha256="0jha4fpx7fi9xrw0677i07ip7ydrvyq8g2lfy8g80jkfy6d6pbdd"; depends=[bit64 data_table nanotime Rcpp RcppCCTZ RcppDate]; }; dtw = derive2 { name="dtw"; version="1.22-3"; sha256="004gm4mzgdzdj807j3bwqsv5lizmnmz5jq514bdjshhkysnzjz6z"; depends=[proxy]; }; dtwSat = derive2 { name="dtwSat"; version="0.2.7"; sha256="16crcvwj1s45gkg1gl6blll64wf4676qmzrx0kv55sylq0rjlxhf"; depends=[caret data_table dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer Rdpack reshape2 rgdal scales sp xtable zoo]; }; - dtwclust = derive2 { name="dtwclust"; version="5.5.6"; sha256="05dszmj89id2hk9apxa7721737s6292w2l7vazj7aqwk1jyghjpm"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel RcppThread reshape2 RSpectra shiny shinyjs]; }; + dtwclust = derive2 { name="dtwclust"; version="5.5.8"; sha256="11kyppfhcw6p9dw8mp1rxj1ba293v0dlcw8r32zz9ji2lmnixv6n"; 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.3"; sha256="1alxh9mj610m7wgr6a97mpzy5ia9vzckhz6wmxyix7xh9mzbn1gw"; depends=[]; }; dualtrees = derive2 { name="dualtrees"; version="0.1.4"; sha256="05mxwiwnv48jf6ya5qmfc7g2w8wkzhk56k9g0gr2m4cpfab7d5h2"; 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.3.1-1"; sha256="1v9l2vlg0xhyj07q6kplqksw48fiivlfjgpc74x11kbmilz768qg"; depends=[DBI]; }; + duckdb = derive2 { name="duckdb"; version="0.3.2-1"; sha256="1z0zpw4aqr21lwsdb9c8rj8nmnd2xh7cbwqiv3mlmrl0xn6jgjxs"; depends=[DBI]; }; duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; }; dumbbell = derive2 { name="dumbbell"; version="0.1"; sha256="0v0b4wbfskvcnzx10z9v4rf3mq8ccswz63pd6i1z7mggnwv38ps5"; depends=[data_table dplyr ggplot2 rlang rstatix tidyr tidyverse]; }; dummies = derive2 { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; }; @@ -8480,6 +8583,7 @@ in with self; { dvqcc = derive2 { name="dvqcc"; version="0.1.0"; sha256="011mwdwh046wninfjdy00wxn312ykzn90nz9fz3l7c5cw9gzzfkg"; depends=[ggplot2 tsDyn]; }; dwdradar = derive2 { name="dwdradar"; version="0.2.7"; sha256="0y75gd9d7y2myp6filg2liv1r8rxwnffa9y9b2dq283m8kcwwai0"; depends=[]; }; dwlm = derive2 { name="dwlm"; version="0.1.0"; sha256="0n5dil9qvyy4gish3wnv8bzq0ci1p0dr2vmbbadl29jl7rd1v0rc"; depends=[]; }; + dwp = derive2 { name="dwp"; version="1.0"; sha256="1q8gbn18gsgknazzvdg5qg2lzqdaz3x14w210hw06q98dfpkvfih"; depends=[boot expint GenEst gtools invgamma magrittr MASS matrixStats mvtnorm numDeriv plotrix pracma sf statmod VGAM]; }; dyads = derive2 { name="dyads"; version="1.1.4"; sha256="1k043cd3rqi89czmk0y5q9j54dhp0ndjj8jij9nww2gfqq1ydqx0"; depends=[CholWishart MASS mvtnorm RcppZiggurat Rfast]; }; dycdtools = derive2 { name="dycdtools"; version="0.3.1"; sha256="1ax38336mnp4a42x83jf9q0hawa5grffizall4gh1iil7zm9pnfl"; depends=[dplyr ggplot2 hydroGOF lubridate ncdf4 R_utils RColorBrewer tidyr]; }; dydea = derive2 { name="dydea"; version="0.1.0"; sha256="15alr3f6wkkpjd5wmcjazi58yc8gwcqr662mjwlfg15r94fzqrlg"; depends=[Chaos01]; }; @@ -8490,9 +8594,13 @@ in with self; { dynRB = derive2 { name="dynRB"; version="0.16"; sha256="07hbfnzyzsg290l6w953v5yh2dbmqr9jb20gnxf8zn7dcggkl6sq"; 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-10"; sha256="1ng672mlv98xnsbd4xq70hxc8j158la4n63y46rw74granaz29ya"; depends=[]; }; + dynamAedes = derive2 { name="dynamAedes"; version="2.0.2"; sha256="0pxj09pz9l2p5g5r31a6jgw283xj12jh3j0x2s63lczj236agl97"; depends=[doParallel drc fields foreach insol raster slam sp]; }; dynamac = derive2 { name="dynamac"; version="0.1.11"; sha256="0dzw4h128z53vwdpkikhxqil0xjrcjrp1zmz0fy2qhq0n74sdyar"; depends=[lmtest MASS]; }; + dynamic = derive2 { name="dynamic"; version="1.1.0"; sha256="15jxly44rj2x79jvps2ln0hrm1384p56yll9jk96w1vhaf3gbsxm"; depends=[dplyr ggplot2 lavaan magrittr patchwork purrr simstandard stringr tibble tidyr]; }; dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; }; dynamichazard = derive2 { name="dynamichazard"; version="1.0.1"; sha256="0z0hyj8qrs7x5cfj20sww1rs207v4bqgz86x0nq1z7mwdrpa7b4v"; depends=[boot Rcpp RcppArmadillo survival]; }; + dynatop = derive2 { name="dynatop"; version="0.2.1"; sha256="0by0kvb1pivh5mjsf1a7qcgzz3x160cvgvwwcsynh37askxd2wf1"; depends=[R6 Rcpp xts zoo]; }; + dynatopGIS = derive2 { name="dynatopGIS"; version="0.2.1"; sha256="15k8s3nydv0kgx77czd17fjjif37jx9ys85k93d404sw7bnifhmm"; depends=[jsonlite R6 raster rgeos]; }; dyncomp = derive2 { name="dyncomp"; version="0.0.2-1"; sha256="13wp2k8nbgrbrqng2dmgy0ixgidk51wq9y7mv5pdbvdajxdsyh11"; depends=[zoo]; }; dyndimred = derive2 { name="dyndimred"; version="1.0.4"; sha256="1rj45bgms1x0zm1xjw2ylm45w9xnd68pmgb8dckzkszqg27d0fbh"; depends=[dynutils irlba lmds tibble]; }; dynetNLAResistance = derive2 { name="dynetNLAResistance"; version="0.1.0"; sha256="018y3m648ni31rlisjfnrx1d10mm48wpxanlnnxxpnqxjcywg2x8"; depends=[doParallel foreach igraph]; }; @@ -8509,23 +8617,22 @@ in with self; { dynr = derive2 { name="dynr"; version="0.1.16-27"; sha256="0rrzi2x19sdi42vpdi8a3lpsbna5kpf2rzvpf3m632b16wca2vnx"; 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]; }; dynsim = derive2 { name="dynsim"; version="1.2.3"; sha256="1fk23cp2hvkn7msxrdc9cnm4pmcmhcdf3q6rwm507bniigrswnx4"; depends=[ggplot2 gridExtra MASS]; }; - dynsurv = derive2 { name="dynsurv"; version="0.4-2"; sha256="0gy9q7l7k37bxm3d37adpvqa45lvr048a309jqc052f179v38mlb"; depends=[BH data_table ggplot2 nleqslv splines2 survival]; }; + dynsurv = derive2 { name="dynsurv"; version="0.4-3"; sha256="1vqf0f3x671vz1w5s2axq159jb1pzjx402qjiwy5ymp05vi0kql3"; depends=[BH data_table ggplot2 nleqslv splines2 survival]; }; dynutils = derive2 { name="dynutils"; version="1.0.9"; sha256="1pcj4igaw1g898xb42kcpzfmqy80xai5ki5bpnkf8hg738wm00qz"; depends=[assertthat crayon desc dplyr magrittr Matrix proxyC purrr Rcpp remotes stringr tibble]; }; dynwrap = derive2 { name="dynwrap"; version="1.2.2"; sha256="0jsikx274nyjq4w286j4wqxrwyv6hvgx923clvdm6ygng1pn1cfr"; depends=[assertthat babelwhale crayon dplyr dynparam dynutils glue igraph magrittr Matrix processx purrr readr reshape2 stringr tibble tidyr yaml]; }; e1071 = derive2 { name="e1071"; version="1.7-9"; sha256="09i2hmyf1bxansqp24p9n9djlzzarclqs173gjjv3fg0giga3ycv"; depends=[class proxy]; }; eAnalytics = derive2 { name="eAnalytics"; version="0.1.4"; sha256="15hhd4q2yxzq3a3awvk81ixa43hk519ym8ap7v1ahghyr0njnyyf"; depends=[dplyr DT energyr googleVis leaflet plotly shiny shinydashboard shinytest shinyWidgets]; }; - eBsc = derive2 { name="eBsc"; version="4.13"; sha256="0n4v07462kxcsyjdy0cjbkn48ryzfnrvj28gxpsxwzn2sddfpl86"; depends=[Brobdingnag MASS Matrix nlme Rcpp RcppArmadillo]; }; eCAR = derive2 { name="eCAR"; version="0.1.1"; sha256="01yfvvp4615vj6sdz751xkmvf5j22jk5fgrj6bhblr6xv0j25xc0"; depends=[Matrix]; }; eChem = derive2 { name="eChem"; version="1.0.0"; sha256="0wmf204hqd4s5har5l9bkcbrbmbqbb8m11w2aivi2gs98f3hy51p"; depends=[animation plot3D]; }; 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]; }; - eHOF = derive2 { name="eHOF"; version="1.9"; sha256="13m64vdbcr6ify7p6zj0dh5rsy87c9r7m4sslmgh0afbglszzrcs"; depends=[lattice mgcv]; }; + eHOF = derive2 { name="eHOF"; version="1.11"; sha256="0g6x987fdjj130r26d2if4bqir121wqx1g4j3csnf00l17prwmbv"; 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.6.4"; sha256="1illpky5p3jappqia1334ra804h18l065r1vkfvpjw8y3hxg2ls2"; depends=[CircStats ggplot2 pbapply plotly raster rasterVis tiff]; }; + 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]; }; 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]; }; @@ -8540,8 +8647,8 @@ in with self; { 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]; }; - easyDifferentialGeneCoexpression = derive2 { name="easyDifferentialGeneCoexpression"; version="0.9"; sha256="0nmfkb5dsz93h56vcmz70irr1pd9y8195q5fd079l3bhslabymk2"; depends=[annotate Biobase diffcoexp geneExpressionFromGEO GEOquery jetset magrittr R_utils stringi xml2]; }; - easyNCDF = derive2 { name="easyNCDF"; version="0.1.0"; sha256="1p6b1lcbw2ix6hqqghgfid5yd58yqg1cqnj99r5svli3ivr7x6js"; depends=[abind ClimProjDiags ncdf4]; }; + easyDifferentialGeneCoexpression = derive2 { name="easyDifferentialGeneCoexpression"; version="1.0"; sha256="1dzm01hscq8dyb2kpra3bh9hfh6pjwvxbf4dip18sjgsl8vn058r"; depends=[annotate Biobase diffcoexp geneExpressionFromGEO GEOquery jetset limma magrittr R_utils stringi xml2]; }; + easyNCDF = derive2 { name="easyNCDF"; version="0.1.1"; sha256="1ffpl5zf9i62ifiasimv32j9s9bpmbqi9wrv520124arv4lwcyix"; depends=[abind ClimProjDiags ncdf4]; }; easyPSID = derive2 { name="easyPSID"; version="0.1.2"; sha256="0npih5xpf2a5xw2iz68z9ckm8d4cpradzzdn50rdpg4gqvaq7azp"; depends=[foreign LaF stringr]; }; easyPubMed = derive2 { name="easyPubMed"; version="2.13"; sha256="1wd8idyqz7kgygp34mjp2abx82775ry8l07vsqdlqnc6fdnvg55d"; depends=[]; }; easySVG = derive2 { name="easySVG"; version="0.1.0"; sha256="03gl5gl0yqgpygd4kna79wrhflbnq3zrz3iq2i8hk9xqd83mszh3"; depends=[]; }; @@ -8549,18 +8656,19 @@ in with self; { easyVerification = derive2 { name="easyVerification"; version="0.4.4"; sha256="08mih1arx01vj7cs1jsln644pcvslpyw1rgr6jmv2czr6xd8qb7d"; depends=[pbapply Rcpp SpecsVerification]; }; easyalluvial = derive2 { name="easyalluvial"; version="0.3.0"; sha256="02l0jy3bwp3qrz6g5iknl2fsfqi6a6wzn8q18k8518xczlsn1gbd"; depends=[dplyr forcats ggalluvial ggplot2 ggridges gridExtra magrittr progress progressr purrr randomForest RColorBrewer recipes rlang stringr tibble tidyr]; }; easyanova = derive2 { name="easyanova"; version="7.0"; sha256="1zpwh3r1r0n11hgqzph8f2aac44qb6rpnhk73hcblq0f9vs0an55"; depends=[nlme]; }; + easycensus = derive2 { name="easycensus"; version="0.2.1"; sha256="1kf1pszhxw8b95dy07fby16zspdicjisblngyxs5iahi5fhjfl71"; depends=[cli dplyr rlang stringr tidycensus]; }; easycsv = derive2 { name="easycsv"; version="1.0.8"; sha256="1i2k5372b6a5pypk6m0rsvvkcy0y51pvh57a60rpgqk8q0yq8pig"; depends=[data_table]; }; easylabel = derive2 { name="easylabel"; version="0.2.4"; sha256="1pqdaymcrqjdqj0fhb1q7i1i8p7r7iwzcn08mcq5wlwr52kcpvfy"; depends=[DT gtools plotly RColorBrewer shiny shinybusy shinycssloaders splus2R]; }; easynls = derive2 { name="easynls"; version="5.0"; sha256="1ma2q4y5dxk6q99v880vqfsgy1fha96j7pi8ch699l0pi6bx0d6c"; depends=[]; }; easypackages = derive2 { name="easypackages"; version="0.1.0"; sha256="00paxdwz4bw3imqhcsw6hj1h0gmnpishlxcj79n826vhdy23jc4y"; depends=[assertthat devtools]; }; easypower = derive2 { name="easypower"; version="1.0.1"; sha256="1vf0zv55yf96wjxja6ifdjvgc9nw0jl0hnc1ygyjd8pmwbgdz9bl"; depends=[pwr]; }; - easyr = derive2 { name="easyr"; version="0.5-4"; sha256="1d9yb9rix10l3n3ah6r532ahn26wdh2a6lby8ssv5azynlqd2l12"; depends=[data_table digest dplyr foreign glue Hmisc lubridate openssl readxl rlang rprojroot stringr XML]; }; + easyr = derive2 { name="easyr"; version="0.5-8"; sha256="0izwxv78gq1y05h2miqc5741xnixsnn45snrqw1dl0ipw388zjrl"; depends=[data_table digest dplyr foreign glue Hmisc lubridate openssl readxl rlang rprojroot stringr XML]; }; easyreg = derive2 { name="easyreg"; version="4.0"; sha256="1w4wlhziyhdyldm0zgnm73fnxrh0fv8hwcw5j8ircxb4npx7bcgg"; depends=[nlme]; }; - eat = derive2 { name="eat"; version="0.1.0"; sha256="0rm5fq24gara9lplpxz1g1xawxm9qvz4bpipqi21p0s6g5617s8a"; depends=[conflicted dplyr ggparty ggplot2 ggrepel knitr lpSolveAPI partykit Rdpack reshape2]; }; + eat = derive2 { name="eat"; version="0.1.2"; sha256="0n98va7yzk0vx0zixxzmj266w12p39vxj97icpr1di3hmrdax215"; depends=[conflicted dplyr ggparty ggplot2 ggrepel lpSolveAPI partykit Rdpack reshape2]; }; eatATA = derive2 { name="eatATA"; version="1.0.0"; sha256="1n966jrcmifi1gbzcnyavsnzmcgsp138x32mcl8pj6w3by97i781"; depends=[lpSolve mathjaxr Matrix Rglpk]; }; eatDB = derive2 { name="eatDB"; version="0.5.0"; sha256="0lym1g411ykb2vzi5yr570lmyh30br667wkm5dvnvfs7bsmk05il"; depends=[DBI RSQLite]; }; - eatGADS = derive2 { name="eatGADS"; version="0.18.1"; sha256="09hjn1w2mng2ypmlm8zw9dl4q430c75i5nil4x86bm9ap8zw511n"; depends=[data_table eatDB eatTools haven hms plyr stringi tibble]; }; - eatRep = derive2 { name="eatRep"; version="0.13.7"; sha256="1667cq00gvcbvsfmplv97bmgkfyq9zi08d5yzpa0l7x7d5xgxmm2"; depends=[BIFIEsurvey boot car combinat eatGADS eatTools EffectLiteR estimatr fmsb Hmisc janitor lavaan lme4 mice miceadds msm plyr progress reshape2 survey tidyr]; }; + eatGADS = derive2 { name="eatGADS"; version="0.19.1"; sha256="1pvflb6pkylsawc4wrk1hzlg79y5hwvdn4gr1dm0qi27vlckw00n"; depends=[data_table eatDB eatTools haven hms plyr stringi tibble]; }; + eatRep = derive2 { name="eatRep"; version="0.14.0"; sha256="11850yxmjhqivrn1z44jn4f1bvcmcwkmsnb665gmxx4w231smc5x"; 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.1"; sha256="1ppkpgcq6bjyl1lyqfzm5d6wdh4wirny88h94sh1029wlrr5qksb"; depends=[data_table]; }; ebGenotyping = derive2 { name="ebGenotyping"; version="2.0.1"; sha256="1jllzc7kvvckrws8qhgvwy626llyb68sp1davp7swx48sf7rwcxc"; depends=[]; }; ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; }; @@ -8569,16 +8677,17 @@ in with self; { ebci = derive2 { name="ebci"; version="1.0.0"; sha256="00fa2y4ha9nlbjd01qckrrn721s63ja61n5jr4wm7ac6y7xivb2i"; depends=[]; }; ebdbNet = derive2 { name="ebdbNet"; version="1.2.6"; sha256="1qzwpr76nwvgylqdg7vhrbvh2lb1zrxx3g120yz156hhs4awv4kz"; depends=[igraph]; }; ebirdst = derive2 { name="ebirdst"; version="0.3.3"; sha256="05k388rsqjgia9jgnlq799l22zg10kvxs7l4b51kknrpqd5pis8d"; depends=[DBI dplyr fasterize gbm ggplot2 gridExtra jsonlite magrittr mgcv PresenceAbsence rappdirs raster rgdal rlang RSQLite sf stringr tidyr viridisLite xml2]; }; + ebmc = derive2 { name="ebmc"; version="1.0.1"; sha256="1z6s1blc2b6b13pk2sd6lcczdcldgjh65cnycjcw7d2g2hnxcifh"; depends=[C50 e1071 pROC randomForest rpart smotefamily]; }; ebmstate = derive2 { name="ebmstate"; version="0.1.3"; sha256="04pg9yqbjrq10ai13c8zm8sy7spnf96ldbbql7qysjl91ljgrqz6"; depends=[HDInterval mstate Rcpp survival]; }; + ebnm = derive2 { name="ebnm"; version="1.0-9"; sha256="0izzfylcmq6zajngjyw85kbr8jys49qcgsadqkj85v2k1hg2jw7q"; depends=[ashr deconvolveR dplyr ggplot2 horseshoe magrittr mixsqp rlang truncnorm trust]; }; ebreg = derive2 { name="ebreg"; version="0.1.3"; sha256="1xrs9afjd5hkdmhglj3md5i5hm7awlcdlccz3y2lw4c73lx31ywz"; depends=[lars Rdpack]; }; ec50estimator = derive2 { name="ec50estimator"; version="0.1.0"; sha256="1zg4p1734q2jzifzfi2lf9wz3687s3cdn0yzkiwbc6w49mgdw877"; depends=[dplyr drc magrittr tibble tidyr]; }; ecap = derive2 { name="ecap"; version="0.1.2"; sha256="0d260y4phh1a7zlj2lgvdf7xd2z14l9djv7nrwa84pwqqyijc7rl"; depends=[ggplot2 quadprog]; }; ecb = derive2 { name="ecb"; version="0.4.0"; sha256="0hn1d1hxilwxxmxzzpdcj81d4vy8fbjk1z09kw7j0b2p04wrdlkc"; depends=[curl httr rsdmx xml2]; }; - ecce = derive2 { name="ecce"; version="1.0.7"; sha256="03p64l9krnpzdgqyj1fygqq36llsv4jc4bal1qvvgaf652w8fqwy"; depends=[RCurl rjson stringr]; }; + ecce = derive2 { name="ecce"; version="1.0.9"; sha256="071ahimmwc1bgcwli4c40h7drdg5ldhh0w1ldzxkjc78qyw8s23d"; depends=[purrr RCurl rjson stringr]; }; ecd = derive2 { name="ecd"; version="0.9.1"; sha256="0d8mf5q6n7k5qj6kxvrb3habl0qmn2rxv814kydkrz2bg0scvm1q"; depends=[digest ggplot2 gridExtra gsl moments optimx polynom RcppFaddeeva 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-13"; sha256="0a8s923xzw6wkl9240mqsr7lpvjmi20kqn2zsbax3rrrdf4gqfkx"; depends=[spatstat spatstat_core spatstat_geom]; }; - ech = derive2 { name="ech"; version="0.1.1.2"; sha256="1mw68dkm6n6zj27rmyw33gaha1nly1srr6v1d5iib72b1gwnik8l"; depends=[assertthat curl dplyr fs geouy glue haven janitor labelled laeken purrr readxl rlang srvyr statar stringr survey tidyr]; }; + ecespa = derive2 { name="ecespa"; version="1.1-14"; sha256="07pldcwm1pi117rjl3y05x6kxl5lxs4y5aiwq0jd02mx43zy296c"; depends=[spatstat spatstat_core spatstat_geom spatstat_random]; }; echarts4r = derive2 { name="echarts4r"; version="0.4.3"; sha256="1hjjqbc6dvz6bi6lsqlvlkrmzqv1g205cd0f8k0a7lq37hcqsw7s"; depends=[broom corrplot countrycode dplyr htmltools htmlwidgets jsonlite purrr rstudioapi scales shiny]; }; echarty = derive2 { name="echarty"; version="1.4.3"; sha256="047vqwspl7x94xlj2726hyma9f61406vq7vm7hk3j94r2zk64vs1"; depends=[dplyr htmltools htmlwidgets jsonlite shiny]; }; echelon = derive2 { name="echelon"; version="0.1.0"; sha256="0dw15igx8jwgfr1f7p5pspxjiqhqmfp7shdhq8g07f4bj76irzm4"; depends=[]; }; @@ -8589,9 +8698,9 @@ in with self; { 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]; }; ecmwfr = derive2 { name="ecmwfr"; version="1.3.0"; sha256="0xwbcgd590vk4civa4s039avvvxsazzh9y05lw591mpm79lz19mj"; depends=[curl getPass httr keyring memoise]; }; - ecoCopula = derive2 { name="ecoCopula"; version="1.0.1"; sha256="18gkib3m4p7vi9jgzyrnznl9kcjizlh77icqrv8xjpi40ksw9m2r"; depends=[betareg doParallel foreach glasso glm2 igraph MASS mgcv mvabund ordinal plyr sna tweedie]; }; - ecochange = derive2 { name="ecochange"; version="2.2"; sha256="0mcd6b148xmwyycjqn0aapfahk63idp5lp2q3vjqdjb8qq55gjss"; depends=[curl data_table dplyr forcats gdalUtilities gdalUtils getPass ggplot2 httr landscapemetrics lattice R_utils raster rasterDT readr rgdal rgeos rlang rvest sf sp tibble viridis xml2]; }; - ecocomDP = derive2 { name="ecocomDP"; version="1.2.0"; sha256="0kfj4fn6wa0fygrdzxqm3msvwrljiazwav35gk57yp2zvdj2n34z"; depends=[data_table dplyr EML emld geosphere ggplot2 httr lubridate magrittr neonUtilities RColorBrewer rlang rmarkdown stringr tidyr uuid xml2]; }; + ecoCopula = derive2 { name="ecoCopula"; version="1.0.2"; sha256="1j3n9h7rm66r8vmzzhy5mjh36gs1qnsh7rq33ymjpkkfy698gbpm"; depends=[betareg doParallel foreach glasso glm2 igraph MASS mgcv mvabund ordinal plyr sna tweedie]; }; + ecochange = derive2 { name="ecochange"; version="2.5"; sha256="1lvwsi4g0b1whdcjpiri6ml90155cc5nfvxp9cnhmp9q3j9bjy1a"; depends=[curl data_table dplyr forcats gdalUtilities getPass ggplot2 httr landscapemetrics lattice R_utils raster rasterDT readr rgdal rgeos rlang rvest sf tibble viridis xml2]; }; + ecocomDP = derive2 { name="ecocomDP"; version="1.2.1"; sha256="06im6d0fx749ic6kjbxa6mk4cn98lz2q7939v627qrhwjkmmgx7a"; 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.7"; sha256="1dkf2m6glry5wzwfjiyw6sac89v6g0frbagr9cyfp2hcp0y5g4n2"; depends=[]; }; ecolMod = derive2 { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; }; ecolTest = derive2 { name="ecolTest"; version="0.0.1"; sha256="0gkhf8gdjvkys54x0qx0h5i0lz0ksba6xdy15wzblzhym43vh9wf"; depends=[]; }; @@ -8605,7 +8714,7 @@ in with self; { ecorest = derive2 { name="ecorest"; version="1.0.0"; sha256="13x95z99yqld1fvfgzbm6ahrnvfvcqwlb23yjr187yg83iynh79v"; depends=[viridis]; }; ecosim = derive2 { name="ecosim"; version="1.3-3"; sha256="190xf0xy1cw40qx8x6y4m9avspxh0y11ffl3s18d5d2zr7rj3ag2"; depends=[deSolve stoichcalc]; }; ecospace = derive2 { name="ecospace"; version="1.4.2"; sha256="0vfaf27bv687ypxg5apzv63rl495rxyflqw33j17i4h0s7cjkgrm"; depends=[FD]; }; - ecospat = derive2 { name="ecospat"; version="3.2"; sha256="1w937f56q8lgjyqc575vxy3vfhd53ri9yiw300qqx6mnj66ijsl8"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators ks maps maptools matrixStats nabor poibin PresenceAbsence randomForest raster rms snowfall sp vegan]; }; + ecospat = derive2 { name="ecospat"; version="3.2.1"; sha256="14m27biw3zp4ly3jf4q562mxcilnkdgf2wf6hv4fbhw5fh2rhbcp"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools Hmisc iterators ks maps maptools matrixStats nabor poibin PresenceAbsence randomForest raster rms snowfall sp vegan]; }; ecostats = derive2 { name="ecostats"; version="0.1.4"; sha256="0xkhkcc6psgvvwhys9azhxisnqw0azd7brp0rg60d725jqvwhbyp"; depends=[GET mgcv mvtnorm]; }; ecostatscale = derive2 { name="ecostatscale"; version="1.0"; sha256="14i5wg5qxqn3qzycgqda6blb0imkckq23gl3c3whfa72a3a8y30q"; depends=[deSolve mvtnorm]; }; ecotox = derive2 { name="ecotox"; version="1.4.4"; sha256="01sc2lf2kca7wqqyd3gk48va39gb7ijzgs2smgb2k4xbzjqndg08"; depends=[tibble]; }; @@ -8620,7 +8729,6 @@ in with self; { ed50simulation = derive2 { name="ed50simulation"; version="0.1.1"; sha256="00fknpssrpin8bpjhf2lsjx3lbpinrmqa6jzmgy3nslkc51x0939"; depends=[boot]; }; eda4treeR = derive2 { name="eda4treeR"; version="0.3.0"; sha256="1shhajd9m9cxj9hdz34bnbs6sx20si37wh6ljw0wx5yrc9m7z9ib"; depends=[dae dplyr emmeans ggplot2 lme4 magrittr pbkrtest tidyverse]; }; edbuildmapr = derive2 { name="edbuildmapr"; version="0.3.1"; sha256="0hc5vfpilqxva88dzgp57j9cgsq64r75vhm3hhl8lhi2wwapwk1d"; depends=[dplyr magrittr sf spdep stringr tibble tidyselect tmap]; }; - edbuildr = derive2 { name="edbuildr"; version="0.3.0"; sha256="19fsk8qkxyzncn614fy6hmmxpv1dikqghs101hbzd0g0a511xk8f"; depends=[dplyr magrittr openxlsx scales stringr tidyselect]; }; edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; }; edci = derive2 { name="edci"; version="1.1-3"; sha256="1f1ry2adfranfrrvf1gkiy58pra3z6bray4v5fgr0z9n1ybcaff0"; depends=[]; }; edcpR = derive2 { name="edcpR"; version="1.0.1"; sha256="02d33cd9pkcjrbl9qipcjzkhrc68j7bybg1hpnsngiz4wmf3bfik"; depends=[]; }; @@ -8632,17 +8740,18 @@ 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.4"; sha256="0l4pkiyf0b5q4ldr0iw3ix1aq1xjrz5p6bkxmwxlgwcnrlhjlm2w"; depends=[qdapRegex R_utils stringi stringr tm XML]; }; + edgar = derive2 { name="edgar"; version="2.0.5"; sha256="1rm6ba4rncfsq7ndqdlkwrqqsak1n7ywsrcnxyr6ysnzgqx65y9n"; 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=[]; }; edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; }; - edgebundle = derive2 { name="edgebundle"; version="0.3.0"; sha256="0hwj4qwb3x5y6svzf9wi9bb5q73x3qyknq0v659i9x99pnszqsld"; depends=[igraph interp Rcpp reticulate]; }; + edgebundle = derive2 { name="edgebundle"; version="0.3.1"; sha256="19vz2451sqqprvjxjbk7wv0yqw5yh3yc8hb1s7dhv28y0ng6pcz6"; 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=[]; }; 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]; }; 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.0"; sha256="008wyzmrnzga470p88hg6zxqj6jn5y27vadxk03nx9qx0ap6f97r"; depends=[Rcpp stringr]; }; edmcr = derive2 { name="edmcr"; version="0.2.0"; sha256="06ms8zyygkgq3divall8paiiw5blqxfgml8iy339zfyiwfxabw5a"; depends=[igraph lbfgs MASS Matrix nloptr sdpt3r truncnorm vegan]; }; edmdata = derive2 { name="edmdata"; version="1.2.0"; sha256="042imrnn242jzb9wb4ghjganqmx61zjwspqy9qpkxqi9nr7zxr75"; depends=[]; }; edrGraphicalTools = derive2 { name="edrGraphicalTools"; version="2.2"; sha256="105jv2sz10xbl881lkhgmxzgmb8629mqsminhd197khrkf9nv40i"; depends=[lasso2 MASS mvtnorm rgl]; }; @@ -8656,27 +8765,26 @@ in with self; { eegkitdata = derive2 { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; 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.4"; sha256="048gz26dqgfsnxhp4r99j7p4s4d5pxsjci5zw8wjvv35lizij573"; depends=[arm data_table ggplot2 maptools 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.1.0"; sha256="0qvlgp4am5al8bf6wz2sa597mxz1hp6q22lp7xpsn5470gphlnvl"; depends=[data_table]; }; + efdm = derive2 { name="efdm"; version="0.2.0"; sha256="1b1ay4gssyhmgzklklx0zg424sp5jb3nmn0ry4fix8z3jaf412il"; depends=[data_table]; }; eff2 = derive2 { name="eff2"; version="1.0.1"; sha256="0872xms2i8k128h3cn2n9dwa4apdyvxhb1h759cmyw63fw4wm8kx"; depends=[igraph pcalg RBGL]; }; effectFusion = derive2 { name="effectFusion"; version="1.1.3"; sha256="0653857zgfv2lrksja6k9i7m2jn3ha4lri6mlmcn6fgxkmr54bgw"; depends=[bayesm cluster ggplot2 GreedyEPL gridExtra MASS Matrix mcclust]; }; effectR = derive2 { name="effectR"; version="1.0.2"; sha256="1icr1sx98x3h8rbky1agdh809arhjqcypyajl7y50yis8a5pkycb"; depends=[ggplot2 reshape2 rmarkdown seqinr shiny viridis]; }; - effects = derive2 { name="effects"; version="4.2-0"; sha256="0iks79rd4knrd81x4kvcpgpclr69l0m0v6sfla8k3wzkcnydycv8"; depends=[carData colorspace estimability insight lattice lme4 nnet survey]; }; - effectsize = derive2 { name="effectsize"; version="0.5"; sha256="0w7m3hzmwral9cycpvknrkbdvgk230b3vg5sxbm84x72mw534hnh"; depends=[bayestestR datawizard insight parameters performance]; }; + effects = derive2 { name="effects"; version="4.2-1"; sha256="0h3n2kd43fddy29hlv1nckw3wglykwrgk1hp8khb0pnm2i12b5sk"; depends=[carData colorspace estimability insight lattice lme4 nnet survey]; }; + effectsize = derive2 { name="effectsize"; version="0.6.0.1"; sha256="1rhpbhyrv0avinm6dz6v2qw4xxdl9m1wknq1dv2flfxgcz0k9qiz"; 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=[]; }; eflm = derive2 { name="eflm"; version="0.3.0"; sha256="0pl1z0yy257x4yhy2m7w6xkicr2a5b37rdsrf7a5ramk7z2nvs4m"; depends=[tibble]; }; efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; }; - efts = derive2 { name="efts"; version="0.9-0"; sha256="1cdn37sij3q73z9gal6x3nnnds55whfj5ywyww119hx092xcb2h4"; depends=[lubridate magrittr ncdf4 plyr stringr udunits2 xts]; }; ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; }; - egcm = derive2 { name="egcm"; version="1.0.12"; sha256="0nssf5six1j7z6fss7478zdbsfx60myzw833m7nsnaf1r8n4ixaf"; 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-1"; sha256="0pm96j7sacy56kvif6950jdxqqzn8y3alnkd4j4pr2a6a3mszfzj"; depends=[BH boot coda lattice numbers Rcpp RcppEigen RcppParallel rootSolve rstan rstantools StanHeaders]; }; - egor = derive2 { name="egor"; version="1.21.10"; sha256="1pnj0y1n60n7s8qlzcagifm3a27g7z0sc5pw7wmmg3w0bqa2ph26"; depends=[dplyr purrr rlang srvyr tibble tidygraph tidyr]; }; + eggCounts = derive2 { name="eggCounts"; version="2.3-2"; sha256="1hb7a78db97xz5hm311d60n2kg1wdlrf57vg4ixamqihyrcs5r4v"; depends=[BH boot coda lattice numbers Rcpp RcppEigen RcppParallel rootSolve rstan rstantools StanHeaders]; }; + egor = derive2 { name="egor"; version="1.22.1"; sha256="15nl5lz5n3qil84fsfq966q6rks7wgx1dc2bfcgiaavff4n22acz"; depends=[dplyr purrr rlang srvyr tibble tidygraph tidyr]; }; eha = derive2 { name="eha"; version="2.9.0"; sha256="069nxf7mfx2b2r1961jf0mcgxbc132ljykr17p3k8pax39m2p78n"; depends=[survival]; }; ehaGoF = derive2 { name="ehaGoF"; version="0.1.1"; sha256="15hpzj3ridl6w3pd5z86d88cc88jw09qpqhsdwkar4dby8lgxhi0"; depends=[]; }; ehelp = derive2 { name="ehelp"; version="1.2"; sha256="0264nx4bidrbwhlxx9llarvh4zb3xnzln8km14823q1hclkpm2fq"; depends=[]; }; @@ -8698,8 +8806,9 @@ in with self; { eive = derive2 { name="eive"; version="2.3"; sha256="073hwx944db7zxq6yib6yvciaic11k49zl1iqphippcd5ygkad80"; depends=[Rcpp]; }; eivtools = derive2 { name="eivtools"; version="0.1-8"; sha256="0ynmrql6dv10m7cwba5mzwlbvp6ab53nzqqvk3ihwyiqzmnnmpk4"; depends=[R2jags]; }; eixport = derive2 { name="eixport"; version="0.5.0"; sha256="1k5p9v5jmw5cs31sn69fjdfhh5yyzk85828aljsmsyx1ycibnwmg"; depends=[cptcity data_table ncdf4 raster sf sp]; }; + eks = derive2 { name="eks"; version="1.0.0"; sha256="1r9f5j2drsc8ladhbhsls29wqsmm4wprfmapas0ba3h2anw75scd"; depends=[dplyr FNN 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="0.1.4"; sha256="0swfnp359ba8ihg1nsqapghb9k8ihg7nj93gjspxrr1z74vw49y5"; depends=[numDeriv]; }; + elasdics = derive2 { name="elasdics"; version="0.1.5"; sha256="1q6l32v3y5l1n9g4si6swc3ck1nndn4xsj0hw1q9b4x5dlxvfziv"; depends=[numDeriv]; }; elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; }; elastic = derive2 { name="elastic"; version="1.2.0"; sha256="0k98ziacyxl1pyhyynmswcncqwl0a05sawypncdpdd9xr77nvgi6"; depends=[crul curl jsonlite R6]; }; elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; }; @@ -8712,9 +8821,10 @@ in with self; { electivity = derive2 { name="electivity"; version="1.0.2"; sha256="0clxsn9zkpdlq9jgq029ag310ji0hd0l23wfyqh8gkkj0091ip5a"; depends=[]; }; electoral = derive2 { name="electoral"; version="0.1.2"; sha256="1kf5ix0bmrh7zwgg87zf10s8pvq32fpqlmyw2dq1kf9gv3s91p04"; 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.1"; sha256="07y4jza4v5aqvf9k8lvh5cqapvyyfdhs9hfd0msncisv7jlz6lwf"; depends=[furrr future httr jsonlite progressr purrr raster sf sp units]; }; + elevatr = derive2 { name="elevatr"; version="0.4.2"; sha256="1a5j7hb9fsy9ybrdlywbm552kb2hj6ch1m8kvi2hybm99yw33n81"; depends=[furrr future httr jsonlite progressr purrr raster sf slippymath sp 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.2.3"; sha256="00rkhw4h7i1clnfmg6dhc8gz9wwmaaywnc9wrs28h0b8a8lls9nh"; depends=[ggplot2 quantreg RJSONIO 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]; }; @@ -8723,22 +8833,22 @@ in with self; { 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.3"; sha256="1cv6si3vd91q42dfg4dbyn3qd8ah4pywsdpma84y9kdnn1mmvnxb"; depends=[KernelKnn Rcpp RcppArmadillo]; }; + 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]; }; 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]; }; - emIRT = derive2 { name="emIRT"; version="0.0.11"; sha256="1h91q9vi9cv14bmkaakyynw2z9sx51w0c2kw2in0x91wx7scmd0p"; depends=[pscl Rcpp RcppArmadillo]; }; - emayili = derive2 { name="emayili"; version="0.7.0"; sha256="0gskq9qhblgly2r726qhmxhxc7a4p5g0dgx1kc5v2kkkigpr5haj"; depends=[base64enc commonmark curl digest dplyr glue htmltools httr logger magrittr mime purrr rmarkdown stringi stringr tidyr urltools vctrs xfun xml2]; }; + emIRT = derive2 { name="emIRT"; version="0.0.13"; sha256="1z6yd9m6vggbp42qms2sg0rbxjpg15x9m8gkdz1p3q4aqrc2ncj0"; depends=[pscl Rcpp RcppArmadillo]; }; + emayili = derive2 { name="emayili"; version="0.7.5"; sha256="1kkcnj7knfiq1pr0yq2sfldvrxjw5j9xg62crsiiwsj0ilnzw6bk"; depends=[base64enc commonmark curl digest dplyr glue htmltools httr logger magrittr mime purrr rmarkdown rvest stringi stringr tidyr urltools xfun xml2]; }; 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]; }; embed = derive2 { name="embed"; version="0.1.5"; sha256="029ysbfvgb1sb14xs0p6dswcxbpgnhvshhs2hcqbrizysb7c7bj2"; depends=[dplyr generics keras lifecycle purrr recipes rlang rsample tensorflow tibble tidyr uwot withr]; }; - embryogrowth = derive2 { name="embryogrowth"; version="8.2"; sha256="1dq3vz70ai63mfmhfs9mavmx3kqsbdy2m7pfv74lk3gj42rzdbvx"; depends=[deSolve HelpersMG numDeriv optimx]; }; + embryogrowth = derive2 { name="embryogrowth"; version="8.3-4"; sha256="0f2ks472c9nr4k9vr2ig1jr2syklm8yahhlchs8b6af10dz7sf0n"; depends=[deSolve HelpersMG numDeriv optimx]; }; emdbook = derive2 { name="emdbook"; version="1.3.12"; sha256="0ls3zxxlwmdv7zn1v9i1y9zc2sn0hbgmyjvsj7zn3ajsw7wwlih6"; depends=[bbmle coda lattice MASS plyr]; }; emdi = derive2 { name="emdi"; version="2.1.1"; sha256="1imw4zlx338yfp4kb6ax4z1ni5f6q5mlcvfx7xm05j0nqigjphv9"; 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-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; + emdist = derive2 { name="emdist"; version="0.3-2"; sha256="05mv6xhm15b0mq9kzyiblkb14bdqmjrwl64ghdk66il0w8i7p6nh"; depends=[]; }; emg = derive2 { name="emg"; version="1.0.9"; sha256="04sm05xnjns7wcvpk35ywkxy6g0mm84r060mkmzh64wq58c2q06l"; depends=[moments]; }; emhawkes = derive2 { name="emhawkes"; version="0.9.5"; sha256="0b6kjwx2lsz5rj8819n71nvvchjpys90ns5n6gcgfwn5afzfdvql"; depends=[maxLik]; }; emld = derive2 { name="emld"; version="0.5.1"; sha256="0cvnfvzskvpcqzs6fwrpjcqrc6yrfciliy9jj0c9h4iyag0g0b9b"; depends=[jsonld jsonlite xml2 yaml]; }; - emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; }; emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; }; emmeans = derive2 { name="emmeans"; version="1.7.2"; sha256="1g112yvqvxi83x128hwz4qpifwihlm0y5szg82cdsx3c9cm1rrfk"; depends=[estimability mvtnorm numDeriv xtable]; }; emoa = derive2 { name="emoa"; version="0.5-0.1"; sha256="0rkr4d4fyqxmsrlbzar27z97qkw4cl1dkvfnhbdwpgg9fi1cixmz"; depends=[]; }; @@ -8759,10 +8869,11 @@ in with self; { 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.0.1"; sha256="1a71w8pqi54g4m814r7z7ywd4fkhlnvrxbrb7s5zlfb5r829b69h"; depends=[MASS maxLik pbivnorm statmod]; }; endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; }; endorse = derive2 { name="endorse"; version="1.6.1"; sha256="067wrb5vhi9qn66rwp38cb4kss2yc55blh5dnl99fsvpc0qs146p"; depends=[coda]; }; endtoend = derive2 { name="endtoend"; version="2.29"; sha256="0dqzh2blb2h8ngchvfvnzx0gmilvx9ydvzqwfy4d9f58ixybn4d9"; depends=[ggplot2 pastecs]; }; - energy = derive2 { name="energy"; version="1.7-8"; sha256="12a7gy681aq3l55iys044cs6sn1s2l5qihghpdl01cvv0ggfh26y"; depends=[boot gsl Rcpp]; }; + energy = derive2 { name="energy"; version="1.7-9"; sha256="1ndssfi0hbnsm5jwrns7m63ppxm221hd6gk0b0wa1a7mk7ny1l38"; depends=[boot gsl Rcpp]; }; energyr = derive2 { name="energyr"; version="0.1.2"; sha256="0gjw2cvpvhyywxlx3vfkhlh7zjwig46z1zwdc01zxwflvdx3z40n"; depends=[RgoogleMaps]; }; enerscape = derive2 { name="enerscape"; version="0.1.3"; sha256="0m4dalrm11pyxxbcfsq9mcblm35v77vxyryal4p9mnv7pc4fc352"; depends=[gdistance Matrix raster rgdal rgeos sp]; }; enetLTS = derive2 { name="enetLTS"; version="0.1.0"; sha256="0lqnhrsg9fnkn8z5crdrajpgavk1knr9z4sbdffpa6q9n8s5pmhr"; depends=[cvTools ggplot2 glmnet reshape robustHD]; }; @@ -8778,14 +8889,14 @@ 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=[]; }; - entcn = derive2 { name="entcn"; version="0.1.0"; sha256="0wpa1293d1bdlx8pikzfh4vqhw7p45bi140aj3x4m8p21h5b4gd6"; depends=[bitops RCurl rjson RYoudaoTranslate stringr]; }; - entropart = derive2 { name="entropart"; version="1.6-8"; sha256="1z6v7gszlmjppp9q69k0awjdkjp0xj2b57g1m52klhcvrf8cp8ad"; depends=[ade4 ape EntropyEstimation ggplot2 ggpubr reshape2 SPECIES tibble vegan]; }; + entcn = derive2 { name="entcn"; version="1.0.0"; sha256="0zwhhjrc24d3hr9494p9ayxlkd0g6jml9raxwv59mpvpprrasdws"; depends=[RYoudaoTranslate stringr]; }; + entropart = derive2 { name="entropart"; version="1.6-9"; sha256="0xwsascm9m2fxbnb0msv20kbg8xjrn17fggsl7ws8pdq8xg912c8"; depends=[ape EntropyEstimation ggplot2 ggpubr reshape2 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.1"; sha256="1lvzb8jdbvrigw5va39fsfnkvwrgb9wvarrdllipszqxmnc8g5rk"; depends=[drc ggplot2 lmtest]; }; enveomics_R = derive2 { name="enveomics.R"; version="1.8.0"; sha256="00akdhqs7jabk7g33rwmxs92jcr39shy9s456nqxk6x4244d2vb3"; depends=[fitdistrplus investr sn]; }; - envi = derive2 { name="envi"; version="0.1.10"; sha256="0wpdykcg3c8zph6jg70l864dx98x78d6v3s9d2y54zvk104hhq4q"; depends=[concaveman cvAUC doFuture doRNG fields foreach future iterators maptools pls raster rgeos ROCR sp sparr spatstat spatstat_core spatstat_geom spatstat_linnet]; }; + envi = derive2 { name="envi"; version="0.1.11"; sha256="0l5pc5qqgprqkyjv8bmk5yay25bbnrsx3kx6lzcdnhwkvr4izrs8"; depends=[concaveman cvAUC doFuture doRNG fields foreach future iterators pls raster rgeos ROCR sp sparr spatstat_geom spatstat_random]; }; enviGCMS = derive2 { name="enviGCMS"; version="0.6.6"; sha256="01y3qqh99aclarglpdg8mb9iikzkm1w62mv93m22lm8ami25a372"; depends=[animation BiocParallel data_table mixtools RColorBrewer Rdisop]; }; enviPat = derive2 { name="enviPat"; version="2.4"; sha256="1gvb7jmwwh4l44b50xmrq3bysr2iv6442yh9pdk6n81g3bgpz1d0"; depends=[]; }; enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; }; @@ -8794,6 +8905,7 @@ in with self; { envlpaster = derive2 { name="envlpaster"; version="0.1-2"; sha256="11a5n40k1ln5gxxvwq1vh4dhmhifhlm89hkhf36qnhj4bjh3v3y0"; depends=[aster aster2 caTools MASS]; }; 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.2"; sha256="1lyv8dh3h4g4zcndv9b5m7zp0g22hznzshy4z55i058w82079c7d"; depends=[cli httr2 rstudioapi yaml]; }; eoR = derive2 { name="eoR"; version="0.4.0"; sha256="0vn4s4af94n9h6x7z14qwpz94rgsd5m3mv55wva7x3h99ryhm83s"; depends=[data_table]; }; eoffice = derive2 { name="eoffice"; version="0.2.1"; sha256="03g8r3xnsnnlyj7y07jm3qjhlv3pkf8v2lxpqzd24ncncxmbcxmi"; depends=[broom devEMF dplyr flextable ggplot2 ggplotify htmlwidgets magick magrittr officer plotly R_devices rvg]; }; epade = derive2 { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; }; @@ -8804,15 +8916,15 @@ in with self; { epcc = derive2 { name="epcc"; version="1.4.7"; sha256="0j4cb17gvwsaacmhvm8qp5chr384kl7gj6089gjrc2hqi6kjr0rx"; depends=[cowplot deSolve formattable ggplot2 httr nls2 proto raster readxl rgdal rlang sp]; }; eph = derive2 { name="eph"; version="0.4.0"; sha256="0yznfhsp6sgymq02m4g477pnqlmmbdvwv32sidaa2giaf3nr4izj"; depends=[assertthat attempt curl dplyr expss glue htmltools janitor leaflet magrittr purrr questionr readr readxl rlang rvest stringr tibble tidyr tidyverse xml2 zoo]; }; epiDisplay = derive2 { name="epiDisplay"; version="3.5.0.1"; sha256="08ym6hcbmajzr4rasdb35fxk79vgpzfc16rmcm34f7f3zzz09dyl"; depends=[foreign MASS nnet survival]; }; - epiGWAS = derive2 { name="epiGWAS"; version="1.0.2"; sha256="0jqblfmz02za3b2pgi15379bzgh98yv5kyv8kh0lkzhrmpgph2zj"; depends=[DescTools glmnet matrixStats SNPknock]; }; - epiR = derive2 { name="epiR"; version="2.0.40"; sha256="1vjkiji10gki0hanhnh6g3k9g7bmnkazwnisikfr2wyjjps133q3"; depends=[BiasedUrn lubridate pander sf survival]; }; + epiR = derive2 { name="epiR"; version="2.0.43"; sha256="0kicviwj3kvak1n58snmr9vz6ir8n624pzv5sdk9cc7kambydldi"; depends=[BiasedUrn lubridate pander sf survival zoo]; }; epibasix = derive2 { name="epibasix"; version="1.5"; sha256="0ivr51x37cbdryli9b4p4iq9v2c90zwmywrwdmg7ryq5vprvvbp0"; depends=[]; }; epicontacts = derive2 { name="epicontacts"; version="1.1.2"; sha256="07vnvfqm9vghmrjy3g1x3mz6qsf09qi04xq2nm9n4cgxjmbr0gia"; 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]; }; 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]; }; + epidm = derive2 { name="epidm"; version="1.0.2"; sha256="0ckm5rg4729f27gkg5zynv52gi6z8v45575paf9pvrzpsblsyhw5"; 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.0"; sha256="09ri1p73ih0i08irc06ff169hi5vcl8bdi63b056kzxgmv17yqkp"; depends=[epicontacts geosphere ggmap ggplot2 htmltools htmlwidgets leaflet sp tibble visNetwork]; }; - epigraphdb = derive2 { name="epigraphdb"; version="0.2.2"; sha256="1kd46anhijcx4sw4ghzd417vwdl64375cbrlj0shcvv9gcc3h38n"; depends=[glue httr jsonlite magrittr purrr tibble]; }; + epigraphdb = derive2 { name="epigraphdb"; version="0.2.3"; sha256="11ja2r024a4sfk6xjhwn2mj4fz2msf6jx85w3cxr2hvp9sl3zgc9"; depends=[glue httr jsonlite magrittr purrr tibble]; }; epikit = derive2 { name="epikit"; version="0.1.2"; sha256="0b9kc7qr7nkafmak60pyj7hln19w4zp33pk5y48qmfsxgarl6pv3"; depends=[binom dplyr forcats glue rlang scales tibble tidyr tidyselect]; }; epimdr = derive2 { name="epimdr"; version="0.6-5"; sha256="1nxdlz7gl9vrha9iw92y0s9dmm101gkz0rsqxqg1rdxanr6hs6sh"; depends=[deSolve polspline shiny]; }; epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; }; @@ -8825,8 +8937,8 @@ in with self; { 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.2.2"; sha256="1rqpvdky002h6mz636b77l4kd0im16pww62l6vnwh83si1m9pkki"; depends=[distcrete sodium stringi]; }; - epitweetr = derive2 { name="epitweetr"; version="0.1.28"; sha256="0iqdn1vc3h3ng10vhljnr8bs5sn0mnfwpv11zq1dvw6yyh9b5ia6"; depends=[bit64 dplyr DT emayili ggplot2 httpuv httr jsonlite keyring magrittr plotly plyr readxl rgdal rgeos rmarkdown rnaturalearthdata rtweet shiny sp stringr tidytext tidyverse tokenizers xml2 xtable]; }; - eplusr = derive2 { name="eplusr"; version="0.15.0"; sha256="09j90bcc45f19pfcs44gqp42f0142hhxy3vzdmkbf1w2q8h7d77z"; depends=[callr checkmate cli crayon data_table hms lubridate processx progress R6 RSQLite stringi units]; }; + epitweetr = derive2 { name="epitweetr"; version="2.0.3"; sha256="0wxzhhx7l0w5g6zihglxhgzibj69pj929zsh54zp5qg1jr00znyj"; depends=[bit64 crul curl dplyr DT emayili future ggplot2 htmltools httpuv httr janitor jsonlite keyring knitr magrittr openxlsx plotly plyr readxl rlang rmarkdown rnaturalearthdata rtweet shiny sp stringr tibble tidytext tidyverse tokenizers xml2 xtable]; }; + eplusr = derive2 { name="eplusr"; version="0.15.1"; sha256="09s0fibf390jixdvn3kdsxdvm3xy1cfk4v0hakvidq9v56hshkhy"; depends=[callr checkmate cli crayon data_table hms lubridate processx progress R6 RSQLite stringi units]; }; eply = derive2 { name="eply"; version="0.1.2"; sha256="0al44pvqf6ls3dh129vlv3g56hk1nbql09rj0qsb04d9kaz9anrp"; depends=[magrittr]; }; 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.7"; sha256="1i3hiyk8337cpfir25j9afjq6kjy4p2s407nv66kzxp9945fjc8i"; depends=[dplyr ellipsis lubridate magrittr rlang tibble tidyr tidyselect units vctrs]; }; @@ -8839,18 +8951,17 @@ in with self; { epxToR = derive2 { name="epxToR"; version="0.4-1"; sha256="00m64ham9fd9dsw37ic2m62fy4pvmwfwmjx8cg6n4rwbgq9q49sg"; depends=[httr XML]; }; eq5d = derive2 { name="eq5d"; version="0.10.1"; sha256="00474dmjpifl7xrm2ln5znghyy7sm1r16dqfk49vafnd4wa89wm1"; depends=[]; }; eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; }; - eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; }; equalCovs = derive2 { name="equalCovs"; version="1.0"; sha256="18w7panyd6mhdr3x1iz9fkrw7min22rishs4xhkxgxs3nnyglkrn"; depends=[]; }; equaltestMI = derive2 { name="equaltestMI"; version="0.6.1"; sha256="09wh4907vf54z3g2a1i1j4m5vkaz97jp3qyrmxbg0bbbq0c68ffg"; depends=[lavaan]; }; equatags = derive2 { name="equatags"; version="0.1.1"; sha256="0rw9vipqk0gdkd73b04lw13fs5pjdvjqnn17n7xg1z0fk11k4qqw"; depends=[locatexec xml2 xslt]; }; equate = derive2 { name="equate"; version="2.0.7"; sha256="07cji0z139fk70d4wvrpk5m34fq1pfnqrsw336lgnp5a7zp3jz7n"; depends=[]; }; equateIRT = derive2 { name="equateIRT"; version="2.2.1"; sha256="0y7jn9k3swndqs4x545capy6srb1zjcjy8mq6kprb21a4bdyh383"; depends=[mirt statmod]; }; equateMultiple = derive2 { name="equateMultiple"; version="0.1.0"; sha256="0ciwzaybr15r5b72mba9hhxlnbyfbc895a2yj6wz25dghcs6vlhx"; depends=[equateIRT numDeriv Rcpp RcppArmadillo statmod]; }; - equatiomatic = derive2 { name="equatiomatic"; version="0.3.0"; sha256="1sv5l1mvfqssrig7v5ciqqvdmc4l4abqklq57j5z0ds5kri39vhm"; depends=[broom broom_mixed knitr shiny]; }; + equatiomatic = derive2 { name="equatiomatic"; version="0.3.1"; sha256="0gy1wy10zc7h7h1s0hwd545iv4af5x2g8pqsgzyryydd6426g2gj"; depends=[broom broom_mixed knitr shiny]; }; equivUMP = derive2 { name="equivUMP"; version="0.1.1"; sha256="05ihbr6dd9qv89ll90ynk4g3d3xy2w5q0m696djfa63f1x92c01w"; depends=[]; }; equivalence = derive2 { name="equivalence"; version="0.7.2"; sha256="170l5gnk0dkjkfsx7qyrw56ircwsjzz9cvhakgyrqh7bj5734i79"; depends=[boot lattice PairedData]; }; equivalenceTest = derive2 { name="equivalenceTest"; version="0.0.1.1"; sha256="1lr1qc4mv8f9hwqidj1rwhxqm1fb8cf1hnb1k32xpdqwzsxbfa47"; depends=[cubature polynom Rdpack rootSolve]; }; - era = derive2 { name="era"; version="0.3.1"; sha256="1x633yz49sfm27gby5sa6nbwx0mc1h606hxh5yvrjqnjlkk7xpgr"; depends=[magrittr pillar rlang vctrs]; }; + era = derive2 { name="era"; version="0.4.0"; sha256="1r726zcaayg6chh1466z9q4y3vd1z5hbz3kvqbfp6dqj7dx8qhgw"; depends=[pillar rlang vctrs]; }; erah = derive2 { name="erah"; version="1.1.2"; sha256="0dyjb2ja5199z8is11in11a95l2dbhaa2qj42pikh0ydk47qhd6v"; depends=[igraph ncdf4 nnls quantreg Rcpp signal XML]; }; erboost = derive2 { name="erboost"; version="1.3"; sha256="09hlpn6mqsmxfrrf7j3iy8ibb2lc4aw7rxy21g3pgqdmd9sbprim"; depends=[lattice]; }; ercv = derive2 { name="ercv"; version="1.0.1"; sha256="0rs4yhm9sjnqkrgqqy6b8wj9fgk910hxc8d7zi4qwql0v1gid27l"; depends=[]; }; @@ -8888,16 +8999,16 @@ in with self; { 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]; }; - esquisse = derive2 { name="esquisse"; version="1.0.2"; sha256="1xfjpbsf7idmwvniji4n64j0wa7h0hr7r9s3rhxsg0yl4acjxfdc"; depends=[datamods ggplot2 htmltools jsonlite rlang rstudioapi scales shiny shinyWidgets]; }; + esquisse = derive2 { name="esquisse"; version="1.1.0"; sha256="14s3qs5k2b6m36sr1f3klbdjfsr5852c4ng5d545r7idg0n33f94"; depends=[datamods ggplot2 htmltools jsonlite phosphoricons rlang rstudioapi scales shiny shinyWidgets]; }; esreg = derive2 { name="esreg"; version="0.5.0"; sha256="1njwqm3hrcxwl6y7gwa4zq0q5139293qk503ahw23dxwzdsiy2z5"; depends=[Formula quantreg Rcpp RcppArmadillo]; }; ess = derive2 { name="ess"; version="1.1.2"; sha256="1cmw20nn39ssyqiyn50w0ws28mq4cd26yhzr7mv97haaqjjjkv5h"; depends=[igraph Rcpp]; }; essHist = derive2 { name="essHist"; version="1.2.2"; sha256="0rvlxfcl42h4pjqf37mx7bc4k21iwvnys6l5rf2jsl7yk1b9hmbn"; depends=[Rcpp]; }; essentials = derive2 { name="essentials"; version="0.1.0"; sha256="163wv4szfanbpiw5f6lhw1dnns5prql43iz27zgcp5z2rsxlb894"; depends=[]; }; - essurvey = derive2 { name="essurvey"; version="1.0.7"; sha256="07z6bdk76528cg5pdchh1kcsm7xrhpqzzxm2llyh0y12fa7mwscy"; depends=[haven httr rvest tibble xml2]; }; - estadistica = derive2 { name="estadistica"; version="0.1.0"; sha256="1xhxy4nzpv5qw6nfg8zrhh6lvcrwz2kf793safah4snfqir0qx6w"; depends=[data_table dplyr ggplot2 magrittr plotly rio shiny shinydashboard tidyr tidyverse]; }; + essurvey = derive2 { name="essurvey"; version="1.0.8"; sha256="1b78am4vnyg3k2hjjkjyhnjgm6rsmjwvqys030qybkgfplsbgra3"; depends=[haven httr rvest tibble xml2]; }; + estadistica = derive2 { name="estadistica"; version="0.2.1"; sha256="0r0hchsdfraiafjldkd3sy6ndx7qm6p5c04gnk6rbhbbfr8xhyhy"; depends=[data_table dplyr forecast ggplot2 gridExtra knitr magrittr plotly rio shiny shinydashboard tidyr tidyverse]; }; estatapi = derive2 { name="estatapi"; version="0.4.0"; sha256="0wp5w9w0b832fnl7kchjqmychnf5896q50grw8hwdc1km14dfzkg"; depends=[dplyr httr purrr readr rlang tibble]; }; estimability = derive2 { name="estimability"; version="1.3"; sha256="0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"; depends=[]; }; - estimatr = derive2 { name="estimatr"; version="0.30.4"; sha256="0qvic3dviz28syxlw92wzwdl6qj2n23cvm0sc3ww23vwg5hdnk8m"; depends=[Formula generics Rcpp RcppEigen rlang]; }; + estimatr = derive2 { name="estimatr"; version="0.30.6"; sha256="03y9hcdj5y2bhz7k8sh5mmv619zpbqh4gyv82sf9s57infhc3zph"; depends=[Formula generics Rcpp RcppEigen rlang]; }; estimraw = derive2 { name="estimraw"; version="1.0.0"; sha256="0z591mblbzc3qv9pyv8zn0r5r3d8f1l02sxdc649gl1lb40kalz0"; depends=[dplyr]; }; estmeansd = derive2 { name="estmeansd"; version="0.2.1"; sha256="053mf9yq095dvlz2cj5haav6yabvgj78qpp411xd9nr1ac17jxz9"; depends=[metaBLUE]; }; estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; }; @@ -8914,21 +9025,21 @@ in with self; { etrader = derive2 { name="etrader"; version="0.1.3"; sha256="1iq80vn7j2sywlla01f6vrfyjjs4lk606kc8z4xlfqj8d27r9r9w"; depends=[dplyr httr jsonlite magrittr purrr rvest urltools]; }; etrm = derive2 { name="etrm"; version="1.0.1"; sha256="0jzwvz2ddh3w4y1kgqwdj7py376w6dwbvqhjmiiikr7qsgap23fk"; depends=[ggplot2 reshape2]; }; etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; }; - eudract = derive2 { name="eudract"; version="0.9.3"; sha256="0bbs9lqmw992q6d9bp7xsssnn8hipb4zx9lyvpdakfmv08ykl3fn"; depends=[dplyr magrittr tidyr xml2 xslt]; }; + eudract = derive2 { name="eudract"; version="0.10.1"; sha256="0qznnfflmxgx6ic5lfw0vcv1jm6hs7g3srly90vj70adjcb49sbd"; depends=[dplyr httr magrittr tidyr xml2 xslt]; }; eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; }; eulerr = derive2 { name="eulerr"; version="6.1.1"; sha256="0lldp2319qd08y87f862gx8a77rvikcnkmdl9xgx4glynfs3hk19"; depends=[GenSA polyclip polylabelr Rcpp RcppArmadillo]; }; - eurlex = derive2 { name="eurlex"; version="0.3.6"; sha256="00x02q9dm4f2y8appa24n67d5l0994ll4jsgl2jfsk06h8y0m10i"; depends=[antiword curl dplyr httr magrittr pdftools readr rlang rvest stringr tidyr xml2]; }; + eurlex = derive2 { name="eurlex"; version="0.4.0"; sha256="0pzwpdhkf0mn2fy1b11sjmczjdngvjwb6gpm9wir23qfbhfhc4pj"; depends=[antiword curl dplyr httr magrittr pdftools readr rlang rvest stringr tidyr xml2]; }; eurocordexr = derive2 { name="eurocordexr"; version="0.2.2"; sha256="081p9qs09xif2cck0gmmqgzaly1r2p77kla2nhcvjgxgdylbsdkd"; depends=[data_table fs lubridate magrittr ncdf4 ncdf4_helpers PCICt]; }; europepmc = derive2 { name="europepmc"; version="0.4.1"; sha256="16japbndid34shqg8n0bmjrxn84xmhrylvz832zclcllm6i93fn1"; 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.7.5"; sha256="1398jmg4z9lnlm7hsr492ybj958gnn4hk5fmy7dillfvimx9x2gy"; depends=[broom classInt countrycode curl dplyr httr jsonlite lubridate magrittr RColorBrewer readr RefManageR sf stringi stringr tibble tidyr]; }; + eurostat = derive2 { name="eurostat"; version="3.7.10"; sha256="05132pid3gjp9qgksvz087vy323dp1s31w46q7a9553kxsqkgkw5"; depends=[broom classInt countrycode curl dplyr httr 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.0.3"; sha256="0wd5wjsj9gbvbncaa97g1sp0211aq3nn5jc91lvhka6h34wxkcgc"; depends=[]; }; evalITR = derive2 { name="evalITR"; version="0.2.2"; sha256="0xdf3jyrsnf2jb28fwf8ydlid1n74ka7mx98jp6fidzcinw4mzmj"; depends=[]; }; - evaluate = derive2 { name="evaluate"; version="0.14"; sha256="0a2y7j534gbgixkwj9r1z76l2vssw4g1hznzbpclc076wkdqpj58"; depends=[]; }; + evaluate = derive2 { name="evaluate"; version="0.15"; sha256="0pbwj02y2j7r0msa7747ih1p32xm9bcyr8fa7bysfslb199ywnl8"; depends=[]; }; evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; }; 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-3"; sha256="1d2r8ppblxrq6s60pf0gv4rp8ja58j8lbpax8a996ais1hpfzi9g"; depends=[]; }; + evd = derive2 { name="evd"; version="2.3-4"; sha256="1vkg50kha3jskrsf80ir5nv9gnpcgbiw9ls9jmvcwz8wca5ml511"; depends=[]; }; evdbayes = derive2 { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; }; event = derive2 { name="event"; version="1.1.1"; sha256="0w3v8j61y7vr0cjl8a1rkvi4pyjlfhmzzn1n4dgkivac4iafzqjj"; depends=[rmutil]; }; eventInterval = derive2 { name="eventInterval"; version="1.3"; sha256="0nybzy2mpmazcvz06mkv7l9741mjm3i2q2sindq0777vb2k4504v"; depends=[MASS]; }; @@ -8941,7 +9052,7 @@ in with self; { evian = derive2 { name="evian"; version="2.1.0"; sha256="1slnzq55gg3p16fs22v69mafiggiy5f70sj8fh65lc0hphybh6w2"; depends=[doParallel foreach ProfileLikelihood sandwich]; }; evidence = derive2 { name="evidence"; version="0.8.10"; sha256="02kqk95kx4nv13fg6z55a5rv6sq6lv8azg0jjxbkg1j6hg15p7ai"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; }; evidenceFactors = derive2 { name="evidenceFactors"; version="1.8"; sha256="0g9w1q8ir6qmvk5vvbpipiyias7nj74ks2h94ja7al8sz68gralx"; depends=[sensitivitymv]; }; - evident = derive2 { name="evident"; version="1.0.2"; sha256="1dniqb6k28c7fisav7yvi94qfl582hssf78qxxmpj4yp58jw1i6z"; depends=[DOS2 MASS sensitivity2x2xk sensitivitymult sensitivitymv senstrat]; }; + evident = derive2 { name="evident"; version="1.0.4"; sha256="1nffcfkny79d3f776p8j4g71cc3n991v56jwjyrg3vkgs05w13cn"; depends=[DOS2 MASS sensitivity2x2xk sensitivitymult sensitivitymv senstrat]; }; evir = derive2 { name="evir"; version="1.7-4"; sha256="1h7a7z7v5k33y5hsdfczsri3vpbwspfgazhv4saknv2h11rgfpki"; depends=[]; }; evmix = derive2 { name="evmix"; version="2.12"; sha256="02rabc9snci00s1x7h0svfr66lmw1wjcdg0149wc52mnccsdaivf"; depends=[gsl MASS SparseM]; }; evobiR = derive2 { name="evobiR"; version="1.1"; sha256="0502xj1gv2g943vfqyllz4sr5z4mixf5vqlqi2v96mymnv9iwsr8"; depends=[ape geiger phytools seqinr shiny]; }; @@ -8965,6 +9076,7 @@ in with self; { exams2sakai = derive2 { name="exams2sakai"; version="0.3"; sha256="0lgnk2g4q0vbkvcrhb815lah24rhaknnmsbhhkgbdkl0c5mx1yjg"; depends=[exams glue stringi stringr xml2]; }; 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"; sha256="03s284pvbvhxzmqbdx00ic4a2xyg3y3hzr1ks913bxacz46g157d"; depends=[dplyr ggplot2 lubridate readxl scales]; }; excelstrippr = derive2 { name="excelstrippr"; version="0.1.2"; sha256="1ly76qja9b5l3xwfhigm1apd114y2iq5wdl27sd2h1y80n8xxf2v"; depends=[dplyr readxl tidyr]; }; excerptr = derive2 { name="excerptr"; version="2.0.1"; sha256="0lmcxlpxvldxwqxrprqq39hk5f770ii1x38jm2jbs4n75smp4m21"; depends=[checkmate reticulate]; }; excessmort = derive2 { name="excessmort"; version="0.6.1"; sha256="0qkj30csq96qg7r8vdl79n31dhz69vh49qz4gpb3r2fr32pn497k"; depends=[dplyr ggplot2 lubridate rlang scales tidyr]; }; @@ -8983,19 +9095,20 @@ in with self; { expectreg = derive2 { name="expectreg"; version="0.51"; sha256="0ab9xkfa3wkhrzj7lj6jgdcxzgp1xjsk6ah71f6qd11bafq7j720"; depends=[BayesX colorspace fields Matrix mboost quadprog Rcpp RcppEigen]; }; experDesign = derive2 { name="experDesign"; version="0.1.0"; sha256="1v2j3jyxyzwkzc3y5n6pzd31yigkfwcmf12df3104m3kn86iq81r"; depends=[]; }; experiment = derive2 { name="experiment"; version="1.2.0"; sha256="0f8h4pj2y7cd2s1q44q4mrg9cirnpz0bkn4xm04hz1rpjxb4xlv1"; depends=[boot MASS]; }; - expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; }; + experimentr = derive2 { name="experimentr"; version="0.1.0"; sha256="0ji2031r108rzna00zhsh70kfcnhcscz0an0jv0vvj00hrakl0yr"; depends=[]; }; expint = derive2 { name="expint"; version="0.1-6"; sha256="0iai25cglcdnf44d2d1fz1xpw4q600my4zq4493fk4cs5673mlf7"; depends=[]; }; expirest = derive2 { name="expirest"; version="0.1.2"; sha256="1fzgs8pniypgd1ws5dkiylgjdwgxwyrblcnvirmwfzcrgyvbmwfs"; depends=[ggplot2]; }; explor = derive2 { name="explor"; version="0.3.9"; sha256="0sfpw9lgpr9hyn93jwxhijbfqnj466wc5ilszki2r7ziik3nb79i"; 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="0.7.1"; sha256="05hf6wk6vyqfxdhy9vl2f31ylr8hcmdgzjafyp6ifmwvydigrj94"; depends=[assertthat broom DBI dplyr DT forcats ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny stringr tibble tidyr]; }; + explore = derive2 { name="explore"; version="0.8.0"; sha256="1jlyal2yqfq9laj3g1810pzky987gsfcrdl3ycvwl00mbjkk5h4m"; depends=[assertthat broom dplyr DT forcats ggplot2 gridExtra magrittr MASS rlang rmarkdown rpart rpart_plot shiny stringr tibble tidyr]; }; exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; }; expm = derive2 { name="expm"; version="0.999-6"; sha256="1p5dapwv8ycxaysgi6imnby04i4kh1c5a2czqa4wygz0s8pr2y9c"; depends=[Matrix]; }; expose = derive2 { name="expose"; version="0.0.3"; sha256="0dlxlxm3g9d8vmgp13i1825z1jzah94ih1vyif46s43xq0nf9anj"; depends=[e1071 foreach gam ggplot2 glmnet Matrix nnet polspline RColorBrewer Rcpp repmis SuperLearner xgboost]; }; expp = derive2 { name="expp"; version="1.2.5"; sha256="0hb4392biyy85gs7af4p9m7r51ijmqr7wp7c7b0i7lzdf1bnd7fz"; depends=[deldir rgeos sp spatstat_geom spdep]; }; expperm = derive2 { name="expperm"; version="1.6"; sha256="0cybna0q3qn3slyc4lv5rby4pr0xkwq0h6n7hl1zhsaqv4c2zc5b"; depends=[Rcpp]; }; expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; }; - expss = derive2 { name="expss"; version="0.10.7"; sha256="0br10ydhv7xz297nzz3qql3cvs1950g1szshywcnxnf58limsw1y"; depends=[data_table foreign htmlTable magrittr matrixStats]; }; + expss = derive2 { name="expss"; version="0.11.1"; sha256="11g50v3cgr7j1gi9i301lbl58dhjsfhw0x7462fgldwr90k3b94z"; depends=[data_table htmlTable maditr matrixStats]; }; + expstudy = derive2 { name="expstudy"; version="1.0.0"; sha256="1b66pfx8smrwwrryxa8rmn4gv692hmllqzy968fp7n58qzciv550"; depends=[assertthat checkmate cli data_table dplyr dtplyr glue lifecycle magrittr pillar purrr rlang stringr tibble tidyr tidyselect withr]; }; exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; }; exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; }; exsic = derive2 { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; }; @@ -9070,34 +9183,33 @@ in with self; { fUnitRoots = derive2 { name="fUnitRoots"; version="3042.79"; sha256="1hsv47dm0hx3s04g9h0bjdgi79zbfihnfxxdc2jskqp94yl7azsy"; depends=[fBasics timeDate 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]; }; - fabisearch = derive2 { name="fabisearch"; version="0.0.3.9"; sha256="0nzv2wkv1l4r2pqq6j2y16lj61djp6bjydsk4xvxlhdnifx5cmhm"; depends=[doParallel doRNG foreach NMF pkgmaker reshape2 rgl]; }; + fabisearch = derive2 { name="fabisearch"; version="0.0.4.3"; sha256="08wb7r6mzcxfb87nwyicklj43j6vrvdbws7gawxrqfb1x4xi6q30"; depends=[doParallel doRNG foreach NMF pkgmaker reshape2 rgl]; }; fable = derive2 { name="fable"; version="0.3.1"; sha256="185l3gd83nys11k389ha2ssdm9rkw9aackmz2cd2mvlym72rsnq7"; depends=[distributional dplyr fabletools Rcpp rlang tibble tidyr tsibble]; }; fable_ata = derive2 { name="fable.ata"; version="0.0.3"; sha256="0rjy5kj10sw2i9ghrsz67l40j7niw9mxm14kzg6prnc34200ki0n"; 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.2"; sha256="1appg3pzw6b08nxh0p1ldbvv1j091v0kcygm808nf04v9axp5f95"; depends=[distributional dplyr generics ggplot2 lifecycle progressr R6 rlang tibble tidyr tidyselect tsibble vctrs]; }; - fabricatr = derive2 { name="fabricatr"; version="0.14.0"; sha256="1smy9c34y47xdfmkgm90xyxagnj9qsgxg70mf75z1006m4npbdg8"; depends=[rlang]; }; + fabricatr = derive2 { name="fabricatr"; version="0.16.0"; sha256="0f9p90klcv7k6ajcwqrwzzgxna3ciwpms4vcsxnkb3vy2skhbrzz"; depends=[rlang]; }; fabricerin = derive2 { name="fabricerin"; version="0.1.2"; sha256="0ynvnxzxx1iybyy5pvwfsj5y9jjixyrpji9vcl5fq5mjnpg8mpqk"; depends=[glue htmltools]; }; face = derive2 { name="face"; version="0.1-6"; sha256="0lvagpn6sa22zj4phz1vi1ccd8xasrgcq6ypwj7qx4bf1xjc95b1"; depends=[Matrix matrixcalc mgcv]; }; facerec = derive2 { name="facerec"; version="0.1.0"; sha256="1dipcnxjz6yd34w0jrrvj5p0pwdgz1l5m9zvri7mflnz7g34gmaj"; depends=[dplyr httr jsonlite knitr magrittr rlang snakecase stringr]; }; - facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; }; factiv = derive2 { name="factiv"; version="0.1.0"; sha256="1m43kg8mrlnkzs667s4a8c2jkfdgv2pjbwf45vf2w4nlp84camxx"; depends=[Formula generics]; }; factoextra = derive2 { name="factoextra"; version="1.0.7"; sha256="1allvdjhd3pq8xz30b1cymwcik5iaahghrjrlnn54cwkfhfg0kv2"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; }; factoptd = derive2 { name="factoptd"; version="1.0.3"; sha256="1ir50im3kr1xhqk4qwrm2h5fq9gqgrwshbamvjlf8n1wnn03mcb6"; depends=[MASS partitions]; }; factor_switching = derive2 { name="factor.switching"; version="1.2"; sha256="1va8xah0r7622svybv9r2v0s9wbl15p4lkrbqmaf5p5izijg32xs"; depends=[coda HDInterval lpSolve MCMCpack]; }; factorEx = derive2 { name="factorEx"; version="1.0.1"; sha256="03dgxxykxgq63cgan5gy5vz4hnwqmg48z2wdv8f69mk9452mg9m2"; depends=[arm doParallel estimatr foreach genlasso igraph mvtnorm pbapply pbmcapply prodlim sandwich stringr]; }; 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]; }; - factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; }; 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]; }; 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]; }; - factualR = derive2 { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RCurl RJSONIO]; }; + factset_protobuf_stach_v2 = derive2 { name="factset.protobuf.stach.v2"; version="1.0.3"; sha256="1b8w4fcjlznpwziwb7cv9a5nhc410h8a9af09430379qhmvin9mx"; depends=[R6 RProtoBuf]; }; + factset_protobuf_stachextensions = derive2 { name="factset.protobuf.stachextensions"; version="1.0.1"; sha256="1mqni01ryv8m4yw87c1m0qf4nr5zhs3654ph04xbqxhq5h0qrwng"; depends=[jsonlite R6 stringr]; }; fad = derive2 { name="fad"; version="0.3-3"; sha256="1xii15lcfb72jmwgqfb4x0h0xs7cxj1hzx8289sq1ibakiwkkv5l"; depends=[Matrix Rcpp RcppEigen RSpectra]; }; fail = derive2 { name="fail"; version="1.3"; sha256="0vfm6kmpmgsamda5p0sl771kbnsscan31l2chzssyw93kwmams7d"; depends=[BBmisc checkmate]; }; fairadapt = derive2 { name="fairadapt"; version="0.2.1"; sha256="13qly0yjf33z1n1id2a5hrciq17fgfw87rj7gyicy23jsc21va0w"; depends=[assertthat cowplot ggplot2 igraph qrnn quantreg ranger scales]; }; - fairml = derive2 { name="fairml"; version="0.6"; sha256="0fzzk2gip46q24n71b8irwcsg38bgah7i56djfvpqa8ki43syqj7"; depends=[CVXR glmnet optiSolve]; }; + fairml = derive2 { name="fairml"; version="0.6.1"; sha256="0nnz62r50gh2wbqxq1l6s0r4vf0dxiqfr39s1yv2zhghph9hc7rj"; depends=[CVXR glmnet optiSolve]; }; fairmodels = derive2 { name="fairmodels"; version="1.2.0"; sha256="0mrr1a5f208wimzrfvknwqv89vzfidsai1nrd672384915fkrcwn"; 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]; }; @@ -9110,12 +9222,13 @@ in with self; { fam2r = derive2 { name="fam2r"; version="1.2"; sha256="0pq5cmzwk3s8cz5x8dsfb2d6qfpapkrwbzvkqmqkhcwhwryy40mm"; depends=[Familias paramlink]; }; famSKATRC = derive2 { name="famSKATRC"; version="1.1.0"; sha256="1xbh0by4sjxrmy00v1svcj3lb98p9krpncbhpjbli1jd2p47yk60"; depends=[bdsmatrix CompQuadForm coxme kinship2]; }; fame = derive2 { name="fame"; version="2.21.1"; sha256="18lzf2vxyzlmd73m9q0si663mjjm66nrf7q1iy0fw73gpvxqr9bf"; depends=[tis]; }; - familial = derive2 { name="familial"; version="1.0.1"; sha256="01vswgjr2kpmrrfhlbkz023mawklw2ff9l9z9nx2x2hs48kxgkh1"; depends=[DepthProc ggplot2 matrixStats]; }; + familial = derive2 { name="familial"; version="1.0.2"; sha256="1pk4l8bgfs6nl8d3w8gksv4szfbqnw6sv0lzh1piyvkpyylfm1i7"; depends=[DepthProc ggplot2 matrixStats]; }; + familiar = derive2 { name="familiar"; version="1.0.0"; sha256="04shvnx81vppswyj3x4zi4rp0mll8l165ckmv27fsbgf5iija70m"; depends=[data_table rlang rstream stringi survival]; }; fanc = derive2 { name="fanc"; version="2.2"; sha256="1gdkxb2ay0lyldjpg4s2fbavjxl4q1bf9q438csqa4vzl5ywv2w8"; depends=[Matrix]; }; fancycut = derive2 { name="fancycut"; version="0.1.2"; sha256="1xg5qjxf77g10h07x6rvb8c3klc9gbr77bkw352qpas268pkswl2"; 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="0.5.0"; sha256="0kx5kjhr8dvqz1mq1zkijkgp29jv8b0irm1xplx1d74n2v1zh6wx"; depends=[]; }; + fansi = derive2 { name="fansi"; version="1.0.2"; sha256="0mxm06png4lrl5gy5giws5dgig2faryang8y0wcvwfk120pczqni"; 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-5"; sha256="18lj2mgnn9s59ypkr19zzv0sffwpx9mgk975xmpvw4kkl84dykis"; depends=[nlme]; }; @@ -9147,6 +9260,7 @@ in with self; { fastText = derive2 { name="fastText"; version="1.0.1"; sha256="0l0pkr3a8qckvzazh6rsz94rab8v96y4wis2my29srkwv4h447bn"; depends=[data_table ggplot2 glue Rcpp]; }; fastTextR = derive2 { name="fastTextR"; version="2.0.0"; sha256="1ggmwsw2qnq8v3s8iaxi8q66c898pc15wfgpsp6h0mc761qih5lf"; depends=[Rcpp slam]; }; fasta = derive2 { name="fasta"; version="0.1.0"; sha256="0wnppxn3039dj58xm0b66fsyq537bk8k8m56im11xj1iwc3zc6vw"; depends=[]; }; + fastadi = derive2 { name="fastadi"; version="0.1.0"; sha256="0vrsz2vf2rxj2vyv1dcjwy8g7s942j5695lb7jkmdaw6lp3k4gh0"; depends=[ellipsis glue logger LRMF3 Matrix Rcpp RcppArmadillo RSpectra]; }; fastai = derive2 { name="fastai"; version="2.1.0"; sha256="1ssmx49c4qzvr4m84s8vwyrg890l2vfglh9rqkf4ljc1x2bkf8z1"; depends=[generics ggplot2 ggpubr glue png reticulate]; }; fastclime = derive2 { name="fastclime"; version="1.4.1"; sha256="0zcir8r11b2hxr9vvkmvxlzmhfcaxbr0wbjy86ysr912mp8fs9i3"; depends=[igraph lattice MASS Matrix]; }; fastcluster = derive2 { name="fastcluster"; version="1.2.3"; sha256="009amz7i5yndqw2008fgd3p11n4fsb291k2ypg3pip6dw4lr28hz"; depends=[]; }; @@ -9155,16 +9269,16 @@ in with self; { fastcox = derive2 { name="fastcox"; version="1.1.3"; sha256="0jn19v6mkwgyz8x63xrfgkgnf0f2rq338r5qkhz690mdzr4c47a3"; depends=[Matrix]; }; fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; }; fasterElasticNet = derive2 { name="fasterElasticNet"; version="1.1.2"; sha256="1hr0wc6s6zpq1hkfgshf0dqjxb7s2849bb8lb04nmi6p42r3628g"; depends=[Rcpp RcppArmadillo]; }; - fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; }; fasterize = derive2 { name="fasterize"; version="1.0.3"; sha256="10bzl77c1b9jhcn1xp467qzp2n8c7s3wpxn53qjh1nwvbri5kd32"; depends=[raster Rcpp RcppArmadillo sp]; }; fastglm = derive2 { name="fastglm"; version="0.0.1"; sha256="1vqw02j4y28mngki87r42f1mhlkvajqp2gpbvk0l2adrkz70l0bn"; depends=[Rcpp RcppEigen]; }; + fasthplus = derive2 { name="fasthplus"; version="1.0"; sha256="05j4lg1gkkz1vi99dx73igvk9xyrli8j6m4hzhpcnyhy0h9bxiqj"; depends=[]; }; 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.0"; sha256="0aw29hnq3ppn7bsnwg9d9sp84k1cvq30lrmfzqn315n0nhkfa4wi"; depends=[]; }; fastmatch = derive2 { name="fastmatch"; version="1.1-3"; sha256="0qcq1gwl9pijgp34giyq5y9rk0ly3d7xza2b7r68xx63ifqa1vqx"; depends=[]; }; - fastmatrix = derive2 { name="fastmatrix"; version="0.3-8196"; sha256="1dlgjz7kh995hwz74kgin7ip8x0nnar18gnc3h4mm6bvc9yf1ykj"; depends=[]; }; + fastmatrix = derive2 { name="fastmatrix"; version="0.4"; sha256="1mbqyrj01fqbnpncqy9lk2dshqk1l55i2r2ll7gs10ykqbbjjlsp"; 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.4.1"; sha256="0h6drzzc3f1dc5ydi5x9c7wday18sgzi8zn4pf5wxlzsc4qj0pzf"; depends=[future MASS plyr Rcpp RcppArmadillo RcppProgress]; }; @@ -9174,7 +9288,7 @@ in with self; { fastrmodels = derive2 { name="fastrmodels"; version="1.0.2"; sha256="1333546nk429l6s4icbmx8hmh29wsc252wbmmhsmgb116l4ra9zi"; depends=[xgboost]; }; fastshap = derive2 { name="fastshap"; version="0.0.7"; sha256="0gxch67i3bj6m8nb94m5hswq058w6n1q9war4dy2qnimlv7cmhdv"; depends=[abind ggplot2 gridExtra matrixStats plyr Rcpp RcppArmadillo tibble]; }; fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; }; - fastverse = derive2 { name="fastverse"; version="0.2.1"; sha256="0ys75qw5ag7mynwk4xyjb8jlsgbffqjxn2h1dznxzhsa953v39xk"; depends=[collapse data_table fst kit magrittr matrixStats]; }; + fastverse = derive2 { name="fastverse"; version="0.2.3"; sha256="1jp9lipx19zihakjp2la8rk4pxks0p8saagp75nr0xq2vdylqg27"; depends=[collapse data_table fst kit magrittr matrixStats]; }; fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.5"; sha256="08bbd17aqmfcacvk283bpf9cp1isf5pgfdciwxn0f7ahdzd81g4s"; depends=[kinship2 multgee]; }; faux = derive2 { name="faux"; version="1.1.0"; sha256="0cmgsm8c8w5d5zk00j4872x7fby0rdi7lmw0w0ncahlnh72grpjm"; depends=[dplyr ggplot2 jsonlite lme4 rlang truncnorm]; }; fauxnaif = derive2 { name="fauxnaif"; version="0.6.1"; sha256="1hw6lkxvxd65wajr0mpmbg8lvx0sd84py1apzqfnr7xpb4r1hi85"; depends=[glue lifecycle rlang]; }; @@ -9184,19 +9298,20 @@ in with self; { fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; }; fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; }; 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-4"; sha256="0vqn73zcqgg89zkfgf0ika0s87f4gb6nxds1dmliiq36p28dhv2c"; depends=[fgui pbatR rootSolve]; }; + fbati = derive2 { name="fbati"; version="1.0-5"; sha256="037rzw2mnhb7m83hrx8pzwy2n4fyhbjzg2nhmlgxyr1qra638p3v"; depends=[fgui pbatR rootSolve]; }; fbroc = derive2 { name="fbroc"; version="0.4.1"; sha256="1v73wl3yckcqx43fz1lzcsy6v08vmbmi7yi623yhgqywixxv2bx3"; depends=[ggplot2 Rcpp]; }; - fbst = derive2 { name="fbst"; version="1.5"; sha256="05dnnwbqsj1rjka8p3mjhzj5h11ac8cvqg51qc8fdssqx2ldcqdw"; depends=[bayestestR]; }; + fbst = derive2 { name="fbst"; version="1.7"; sha256="1gawrkv13yizmsyvlz8rcq0jbylh423ip28hbicpkycr6hb3xnkh"; depends=[bayestestR]; }; fc = derive2 { name="fc"; version="0.1.0"; sha256="0x41xfchy499kz0qi7fp12vpkbcddprv19mmk48lxzavv4f5avfh"; depends=[codetools]; }; fca = derive2 { name="fca"; version="0.1.0"; sha256="0jcdyylb0byz70k3kypa2mdd5sc5nq81jfbpljjg2amczq7s5wzy"; depends=[]; }; fcaR = derive2 { name="fcaR"; version="1.1.1"; sha256="1jhhjsgw3vsgrz5mv961m61y39cs5zpi0m82yf38r6ngrjy52cqg"; depends=[forcats fractional magrittr Matrix purrr R6 Rcpp registry settings stringr tibble tikzDevice]; }; - fcci = derive2 { name="fcci"; version="1.0.0"; sha256="1rz46dbh11i8ycxhdjhjqhb65f25qyb0ip7lgrcwkc6bidg7kc5d"; depends=[assertthat Rcpp rlang]; }; + fcci = derive2 { name="fcci"; version="1.0.1"; sha256="02q6q0q7fqdbp20fdf33jbkh0aj9nzl6dwysr0nn146ciz3vqgin"; depends=[assertthat Rcpp rlang]; }; fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; }; + 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]; }; fclust = derive2 { name="fclust"; version="2.1.1"; sha256="11dsf7mb075m1m1ilqsacc0s4907wq6alvdfh6nizsyr01wiqw3b"; 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]; }; fcros = derive2 { name="fcros"; version="1.6.1"; sha256="04yr6lqs38lczsmdvdm78qn63836qj7xwspgh3h3n3gh8cssd83x"; depends=[]; }; - fctbases = derive2 { name="fctbases"; version="1.1.0"; sha256="1jf6ngdph45l105cib13lghan7d68hsjqdr8wsjz2kls8il6kz9s"; depends=[Rcpp RcppArmadillo]; }; fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; }; fdANOVA = derive2 { name="fdANOVA"; version="0.1.2"; sha256="1pycq5a4czqzi8wcfmlc9ncg827j7n0qxyj90wcv39nbcrnl3da1"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; }; fda = derive2 { name="fda"; version="5.5.1"; sha256="0fm2vswc8fdi2p1axby0hjwh8m6lc1zrdikrpiamilr6w9m2zanw"; depends=[deSolve fds Matrix]; }; @@ -9233,12 +9348,13 @@ in with self; { features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; }; featuretoolsR = derive2 { name="featuretoolsR"; version="0.4.4"; sha256="0zrb3hb9axcfqc1b5cyhasm3p6jvgh7hd3085w7zag66pizqjwws"; depends=[caret cli dplyr magrittr purrr reticulate rstudioapi stringr testthat tibble]; }; featurizer = derive2 { name="featurizer"; version="0.2"; sha256="05jvwsvpbdj94q3wl7ld6xmfc9p7ff9zsmryd3mmxz0hzbq2cnkc"; depends=[]; }; + febr = derive2 { name="febr"; version="1.9.9"; sha256="13jkp5dbjvb94da1a4vcfkr6gp04xyfj8lv76d8xc3af507k3mqs"; depends=[data_table]; }; fec16 = derive2 { name="fec16"; version="0.1.3"; sha256="0azvrg98li535mqa2awhmfisfyfr4d8dw0ynikxmp0z1w9l3dx1p"; depends=[dplyr readr vroom]; }; fechner = derive2 { name="fechner"; version="1.0-3"; sha256="0bassigcipwlr2g8cdjh8jyhmb903k3hla9gnigcbz7qwzlfwa86"; depends=[]; }; federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; }; fedmatch = derive2 { name="fedmatch"; version="2.0.5"; sha256="1k6gj0aaihxqwvvvic8s5bhjqlxg6m37yj3bk9hbxy1lijv89w8j"; depends=[BH data_table forcats magrittr purrr Rcpp scales SnowballC stringdist stringr]; }; fedregs = derive2 { name="fedregs"; version="1.0.0"; sha256="171j6r6qxnx9gk9x9gpdyh51ssrgmf7sczc4889qr3qqw15sm4bn"; depends=[dplyr httr magrittr purrr rvest stringi tidyr tidytext xml2]; }; - fedstatAPIr = derive2 { name="fedstatAPIr"; version="0.1"; sha256="0ll86fp9kaddacsy9jfnwrq353kx4gny8vmxg8vnfx9kcl3bv95z"; depends=[dplyr httr jsonlite magrittr readsdmx rlang rsdmx rvest stringr xml2]; }; + fedstatAPIr = derive2 { name="fedstatAPIr"; version="0.2.0"; sha256="07pr6c4275jb9dkx2pdrkykqawlxdmp3g6v4v2kzsnrcdlxs0h57"; depends=[dplyr httr jsonlite magrittr readsdmx rlang rvest stringr xml2]; }; feisr = derive2 { name="feisr"; version="1.2.0"; sha256="012rspsw1xwl11gdr3nlpdmf24y9d2shwj81iqj1xill3l0mchwc"; depends=[aod dplyr Formula plm Rdpack]; }; fellov = derive2 { name="fellov"; version="0.1"; sha256="0z4b08ykajzwa5852dknqz5qqlmhklbwdq8x5zhyfmwba5zfbjav"; depends=[]; }; felp = derive2 { name="felp"; version="0.2.3"; sha256="05380225n0l2p8x4yr41frgvfzfl8x5b18v7qn8a4j9afki9y1g5"; depends=[curl prettycode]; }; @@ -9248,22 +9364,23 @@ in with self; { ferrn = derive2 { name="ferrn"; version="0.0.1"; sha256="1zp18hfnvmdb2w0qj432yj9a3939lad2hqymrmj8y1w3k0razifk"; depends=[dplyr geozoo gganimate ggforce ggplot2 ggrepel magrittr purrr rlang scales stringr tibble tidyr tourr]; }; ff = derive2 { name="ff"; version="4.0.5"; sha256="0dsh6llfdz04w94xr3yl2b4vkk9g3rwhvfnxcd025v2424krxfls"; depends=[bit]; }; ffbase = derive2 { name="ffbase"; version="0.13.3"; sha256="1dp6lblfq2j7r1b4b8ls47jlx8j27n88d5vp8w116lb8pa01zxmk"; depends=[bit fastmatch ff]; }; - fflr = derive2 { name="fflr"; version="2.0.1"; sha256="0yc3xr97iprnr4snsm3vf4bimx56vxw6dpkdqxv20qs5jd9bshcw"; depends=[httr jsonlite tibble]; }; + fflr = derive2 { name="fflr"; version="2.0.2"; sha256="057m2lgzfvid4618vlzmxgrw7vg1bff6i0qy8b2khk8dynk8p25v"; depends=[httr jsonlite tibble]; }; ffmanova = derive2 { name="ffmanova"; version="1.1.0"; sha256="0019m9vxnh5yxr5k7zflzyhd533a842cjjkcpqyannshnrbfndvy"; depends=[]; }; ffmetadata = derive2 { name="ffmetadata"; version="1.0.0"; sha256="0gjv5fl3p0kz28c91l4qf34a2685a24l5841ixdg7wivfs5v9npv"; depends=[httr jsonlite]; }; - ffp = derive2 { name="ffp"; version="0.1.0"; sha256="11c25lcy5fzchc00cv7r9g92gnb6iffmcylibs1w42245r69bsnh"; depends=[assertthat dplyr forcats ggdist ggplot2 lubridate magrittr mvtnorm NlcOptim pracma purrr rlang scales tibble tidyr usethis vctrs xts]; }; + ffp = derive2 { name="ffp"; version="0.2.0"; sha256="1bx9ymd7mmic01wkwaczdxw1y4a7cb8ayl42k743hznqnr8vrpmn"; 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.7"; sha256="1qfclfvz1xa9mamn9rjmwyrrpsj8cr6ri5040g2gfxjag0by5n21"; depends=[cachem checkmate dplyr glue httr jsonlite lifecycle magrittr memoise nflreadr purrr rappdirs ratelimitr rlang stringr tibble tidyr]; }; ffsimulator = derive2 { name="ffsimulator"; version="1.2.0"; sha256="134qcvi698ynrf3c1pg4mfd5hf2jv4x5qh1jsldfy1fhmrnaxj81"; depends=[checkmate cli data_table ffscrapr glue magrittr nflreadr Rglpk rlang tidytable]; }; ffstream = derive2 { name="ffstream"; version="0.1.6"; sha256="036ikhah4y85khgfmvxwsn3vavvw1is8i9k2lw474wxlh4cxa3kd"; depends=[Rcpp]; }; fftw = derive2 { name="fftw"; version="1.0-6.1"; sha256="1s16r8qr1w85k5i0wfj4gc3cnwqg3yx2nbk9mcfb3j95jx7jphzz"; depends=[]; }; fftwtools = derive2 { name="fftwtools"; version="0.9-11"; sha256="0zrchp4l0jdbir2gibjf00x225y9giqk80zvqmr2yyvc12lwkw7i"; depends=[]; }; fgac = derive2 { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; }; - fgdr = derive2 { name="fgdr"; version="1.1.0"; sha256="0xllws7z3crbwibyhm3w06zagvlbmn3rcy8ccgkdhl0am3q7dz0a"; depends=[data_table jpmesh magrittr purrr raster readr rlang sf stars stringr terra tibble units xml2]; }; + fgdr = derive2 { name="fgdr"; version="1.1.1"; sha256="12rccdh1dmh8azwid8wgkdz8d7lqrdzr5n294j2fawqf4naff2gm"; depends=[data_table jpmesh magrittr purrr raster readr rlang sf stars stringr terra tibble units xml2]; }; fgeo = derive2 { name="fgeo"; version="1.1.4"; sha256="0axglmk05li3plb79rccskhddjzq3pdx3mgxr8yqysymf1nscrq6"; depends=[cli crayon dplyr fgeo_analyze fgeo_plot fgeo_tool fgeo_x glue magrittr purrr rlang rstudioapi]; }; fgeo_analyze = derive2 { name="fgeo.analyze"; version="1.1.14"; sha256="0pnmvq6imnffvr4qlmygmmw18g33s81f5jrrs7n4ahwi0qmf5qaj"; depends=[dplyr fgeo_tool glue lubridate magrittr MASS purrr rlang tibble tidyr withr]; }; fgeo_plot = derive2 { name="fgeo.plot"; version="1.1.10"; sha256="0lg74ckdm3nn91526cg6gly3lpsv315n2kfmf4bsmprj8k0zj31s"; depends=[dplyr fgeo_tool ggplot2 ggrepel glue magrittr purrr rlang stringr]; }; fgeo_tool = derive2 { name="fgeo.tool"; version="1.2.7"; sha256="1272zaa78s6ypfavhf6fy0fl23i71w4s549bpkb94rvalg2026ak"; depends=[dplyr glue magrittr purrr readr rlang tibble tidyselect]; }; fgeo_x = derive2 { name="fgeo.x"; version="1.1.4"; sha256="0swps9rli74fmfb2j4kf55kw39gxz0q49m74ad4vcs0ylyp0sxrb"; depends=[memoise]; }; + fgitR = derive2 { name="fgitR"; version="0.2.0"; sha256="0ncwd3wgkll11447qjlq3ihx876d1jv067pcrfswia31jrb700wl"; depends=[devtools git2r httr]; }; fglsnet = derive2 { name="fglsnet"; version="1.0"; sha256="00qn4k4xm1zfkz77lys468c1mfx3vyfjkf19wdbcvgssrmf6w0xd"; depends=[lmtest MASS Matrix matrixcalc network sandwich sna]; }; fgm = derive2 { name="fgm"; version="1.0"; sha256="0i6lbqxxjq78dql14qwqs7slnn0kyls2g3a9biabny2narwf6n3m"; depends=[fdapace JGL]; }; fgof = derive2 { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; }; @@ -9272,16 +9389,16 @@ in with self; { fhircrackr = derive2 { name="fhircrackr"; version="1.0.1"; sha256="0dq7gwfcksjqirhmq4hxfrm64i2gaqjqklkrv7xq7ribvzb8accv"; depends=[data_table dplyr httr plyr stringr xml2]; }; fiberLD = derive2 { name="fiberLD"; version="0.1-6"; sha256="1i3bl2qsc77m81l11an9ihl4vy86s8jd5x6pasib77rl2877ad4x"; depends=[doParallel foreach Matrix VGAM]; }; fic = derive2 { name="fic"; version="1.0.0"; sha256="18xz94w1ab17jfi61bdg9z3pm63g488v17ns2ivizkza4gg07pv8"; depends=[abind ggplot2 mvtnorm numDeriv scales survival tensor]; }; - fidap = derive2 { name="fidap"; version="0.0.3"; sha256="0zq07395qx59xxb3cj5axhpkwnad2h88qbm3aan43q5cip9wi2bx"; depends=[httr jsonlite]; }; 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.0"; sha256="09gfji61hixwcr7yrygjzw49c7d586a6b497mvkj9whjdi1dw4vv"; depends=[BH dplyr ggplot2 phyloseq purrr Rcpp RcppEigen RcppNumerical RcppZiggurat rlang tidybayes tidyr]; }; fieldRS = derive2 { name="fieldRS"; version="0.2.3"; sha256="0jr2l5cnrawd6wibmb6r0sngd851z9mbz4mwprnbbqbv3hzzrpm9"; depends=[caret concaveman geosphere ggplot2 raster rgeos sp stringdist vegan]; }; fields = derive2 { name="fields"; version="13.3"; sha256="1hs4k5a9hh0r5fsrnpnvs6wvf78xpjzj8a2j6643dsz73a5q6ln6"; depends=[maps spam viridis]; }; fiery = derive2 { name="fiery"; version="1.1.3"; sha256="1rwnmm4n59wdsvb57bj8mx1qhz93jbvfb73sl111nwqazphrhid1"; depends=[assertthat crayon future glue httpuv later R6 reqres stringi uuid]; }; figpatch = derive2 { name="figpatch"; version="0.1.0.1"; sha256="1chshlyc3ygyvgzyph4mix3a6kvv4w0vbnss58472h0mgl7mgx8v"; depends=[ggplot2 magick patchwork]; }; - file2meco = derive2 { name="file2meco"; version="0.2.0"; sha256="0x45nr344k3nmcrjrlm2fczcxrh5n807v7qymffkkq7v589nfcyl"; depends=[ape dplyr magrittr Matrix microeco R6 rhdf5 tidyr yaml]; }; - filearray = derive2 { name="filearray"; version="0.1.2"; sha256="1fs19jpnnkb40rv2z9fxvj7snvmd41nhb8z61a4f2jslkrw9cs23"; depends=[BH Rcpp]; }; + file2meco = derive2 { name="file2meco"; version="0.2.1"; sha256="1m9r7vp766p4lsbzpfzwfp37ylrbnsz63fwnl0h4ykcfqmf9b12m"; depends=[ape dplyr magrittr Matrix microeco R6 rhdf5 tidyr yaml]; }; + filearray = derive2 { name="filearray"; version="0.1.3"; sha256="10kpr5c7yq9hk1b6x611vi1pcsis0x1xpi0rs1dqgv310hswa0k5"; depends=[BH digest Rcpp]; }; filebin = derive2 { name="filebin"; version="0.0.5"; sha256="1k13vwppk3f3acnyz32wrjmr80x0lbdzv0sx74xr87n1kbrrv5fn"; depends=[dplyr httr janitor logger purrr stringi tibble tidyr]; }; - filehash = derive2 { name="filehash"; version="2.4-2"; sha256="14zv7h5195dmfksgk8qvjgc2qq8253vga6267aa1bqs5bpvmdl5n"; depends=[]; }; + filehash = derive2 { name="filehash"; version="2.4-3"; sha256="1ga17smgjd4qsnf5a7qk0giwhpc5969ylqj520favs1k6b4y557k"; depends=[]; }; filehashSQLite = derive2 { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[DBI filehash RSQLite]; }; filelock = derive2 { name="filelock"; version="1.0.2"; sha256="00ql5fw1hidpfnm0szaavf43ahmsnvdbi8i5lr1nrcc90yaiaadc"; depends=[]; }; filematrix = derive2 { name="filematrix"; version="1.3"; sha256="1v3aj1ng742msb0sfdnjsbqb508mqjf8jlq2v33vxldhradw5w0b"; depends=[]; }; @@ -9299,48 +9416,50 @@ in with self; { findR = derive2 { name="findR"; version="0.2.1"; sha256="1a7cf6kd7i2l4ffr2b17nb9xnpsjhf6fcwpjy06r0qgcapnfp54b"; depends=[pdftools stringr]; }; findpython = derive2 { name="findpython"; version="1.0.7"; sha256="0jf10jpqla90x03kl3k77gnd255zmw9rvr8d724vb17cqawh9yar"; depends=[]; }; findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; }; - finetune = derive2 { name="finetune"; version="0.1.0"; sha256="1raj7knxw6qw1jvd4dgps6v8zcn7akncxar7xwz63sqvw8yav45g"; depends=[cli dials dplyr ggplot2 purrr ranger rlang tibble tidyr tidyselect tune vctrs workflows yardstick]; }; + finetune = derive2 { name="finetune"; version="0.1.1"; sha256="0yi76ww7m4nfd1b7cd3ixarbjwpzh8g016byz2pvchmz2mb10s6h"; depends=[cli dials dplyr ggplot2 purrr rlang tibble tidyr tidyselect tune vctrs workflows]; }; fingerPro = derive2 { name="fingerPro"; version="1.1"; sha256="1a1lj8gyrbgcg8hr03cj2bjzlaafddspri7abc83ys1raqwd4j68"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL RcppProgress reshape rgl scales]; }; fingerprint = derive2 { name="fingerprint"; version="3.5.7"; sha256="04jcwkydjrs31pia6kq8z2n9s54im950q08hs2ay15xjxxkmb8ic"; depends=[]; }; finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; }; finity = derive2 { name="finity"; version="0.1.4.1"; sha256="0xs3vx0vj165hj4dq8ivrdf6fcvj23zhp2ai79rgpyb5rr5ndkvc"; depends=[BH Rcpp RcppArmadillo stabledist]; }; - finreportr = derive2 { name="finreportr"; version="1.0.3"; sha256="1xa94x69czy9cn9r6hklv6b91514aqvcam29pcrb0w6gypwlm1pw"; depends=[curl dplyr httr rvest XBRL xml2]; }; + finnishgrid = derive2 { name="finnishgrid"; version="0.1.0"; sha256="0gndrllz3y7yqrg5vw6ba7dg7hn4w3085rpy7h9hdd8swxqfvlc6"; depends=[httr jsonlite]; }; + finnts = derive2 { name="finnts"; version="0.1.0"; sha256="1jvyl2c7szl4xwv5kyd3d1cm7cpmfjqlpg42kpvxqf1bvsbrws6n"; depends=[cli Cubist dials doParallel dplyr earth foreach generics glmnet gtools hts kernlab lubridate magrittr modeltime modeltime_gluonts modeltime_resample parsnip plyr purrr recipes rsample rules stringr tibble tidyr tidyselect timetk tune workflows]; }; + finreportr = derive2 { name="finreportr"; version="1.0.4"; sha256="145idg2c6qmqp29afalnhxxzky08j21dmm05mp3zf63aq9mq41d4"; depends=[curl dplyr httr rvest XBRL xml2]; }; fipe = derive2 { name="fipe"; version="0.0.1"; sha256="055jav8h4wws76jahm2d5dj49wkvzchh3f2vk5d50pny4dc7smar"; depends=[dplyr forcats furrr future httr jsonlite lubridate magrittr purrr readr stringr tibble tidyr]; }; fipio = derive2 { name="fipio"; version="1.1.0"; sha256="1y153096wkihzcwcycf492wbc4mwlmqsm8hyjljx3zddmx2iklvk"; depends=[]; }; fipp = derive2 { name="fipp"; version="1.0.0"; sha256="0wr3czwsqwa1bpdcjk0r1739vjanxc0fv0vnl3r5lgykrbhw9v3r"; depends=[matrixStats Rcpp RcppArmadillo]; }; - firebase = derive2 { name="firebase"; version="1.0.0"; sha256="0bva63wkawvw74r3kj0lagx3bkq7yx4lzjafhxa2jk9xrnsg6gmw"; depends=[base64enc cli htmltools jose jsonlite openssl R6 shiny]; }; + firebase = derive2 { name="firebase"; version="1.0.1"; sha256="0sdv3l13byqn4sfp360scj4260adyvnbvzxkc88zvg3k33fx5hmn"; depends=[base64enc cli htmltools jose jsonlite openssl R6 shiny]; }; firebehavioR = derive2 { name="firebehavioR"; version="0.1.2"; sha256="10krny60dkpgwjjnriap91qmrnfq1rl5ck4ynf4h6x016bv0m374"; depends=[ggplot2]; }; fishMod = derive2 { name="fishMod"; version="0.29"; sha256="0pbs4z27vwa3c42xdw3mr6l2i581bgvn2pk52kawbcnnlsff92ar"; depends=[]; }; fishbc = derive2 { name="fishbc"; version="0.2.1"; sha256="15mlr113qgndjhyry8img50jfk0si81kw2cdgl896b0g4djc5la3"; depends=[]; }; fishdata = derive2 { name="fishdata"; version="1.0.1"; sha256="0hskmw93pyrm5wxn1dw8vi18v11jnf03yx375hjkk38hcfnp6n5k"; depends=[]; }; - fisheyeR = derive2 { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; }; - fishflux = derive2 { name="fishflux"; version="0.0.1.5"; sha256="0ni3r37s6dvj3mmr04fnr7fird4x2wxdxq9vxzabcgmx9f4ydfiz"; depends=[BH curl dplyr fishualize ggplot2 httr plyr Rcpp RcppEigen RcppParallel rfishbase rstan rstantools StanHeaders tidybayes tidyr]; }; + fisheye = derive2 { name="fisheye"; version="0.1.0"; sha256="0yrgr0nhnn768q6hc2dsjz7y3n7p7ci0rdfqsickafgv2srdrh83"; depends=[sf]; }; fishkirkko2015 = derive2 { name="fishkirkko2015"; version="1.0.0"; sha256="1s8vsf604rc6qk0gahn61p3q8p9dhsbq14wsmrin7icq2xgl3y81"; depends=[]; }; - fishmethods = derive2 { name="fishmethods"; version="1.11-2"; sha256="0gbxm0x1pnygk7dhssarn0nps2djn03rdb6cgpl7z0ma9b9lczfm"; depends=[boot bootstrap data_table lme4 MASS numDeriv]; }; + fishmethods = derive2 { name="fishmethods"; version="1.11-3"; sha256="17fghylmc4xs8b9p2ybgdpjxkjb4zg7qxhb75sdj0q0bvs1mhyiq"; depends=[boot bootstrap data_table lme4 MASS numDeriv]; }; fishmove = derive2 { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; }; fishtree = derive2 { name="fishtree"; version="0.3.4"; sha256="00g8p885z5xcqp2chncb177s0l6lab2f069szj861z9dyf93xx4z"; depends=[ape jsonlite memoise rlang]; }; - fishualize = derive2 { name="fishualize"; version="0.2.2"; sha256="19iq2n9pxqf1yl6k2231lrc0ny5r7s0h5s59whrhwfh328q5cfqa"; depends=[curl downloader dplyr ggplot2 gridExtra httr magrittr png rlang scales stringr tidyr]; }; + 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.1"; sha256="0xlyv60r4fqvg3qhy4s9zkm2w65y4pg5nzl7a3k2z3fdpfcvkinz"; depends=[pracma]; }; + fitConic = derive2 { name="fitConic"; version="1.2"; sha256="0mwnbq32mpj8d4127jwb283mn3gs4hm0klwk9prsrfkdnhqai41i"; depends=[pracma]; }; fitDRC = derive2 { name="fitDRC"; version="1.1.1"; sha256="09z9l27iwl0fd3zy6rsdhmy8qbm5d9a4wcaj5rxp7ynlnpi102aa"; depends=[]; }; fitHeavyTail = derive2 { name="fitHeavyTail"; version="0.1.2"; sha256="17jdqxrycqkpmb9pzfqrwcax12j6dx7w122989qrpwqsx48ax133"; depends=[ICSNP mvtnorm]; }; fitODBOD = derive2 { name="fitODBOD"; version="1.4.1-1"; sha256="0sx7la3bcii8fh8ril5ibbr4x97zgqwl7h889gnk6j733pcmgx0p"; depends=[bbmle hypergeo]; }; fitPoly = derive2 { name="fitPoly"; version="3.0.0"; sha256="0ws1vsh8if9i9i7820ak32b0bysjc0z09nbrk17qpms0b11cpc3g"; depends=[foreach]; }; fitTetra = derive2 { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; }; fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.8"; sha256="0b4d7xw6inp6l1dkfwyrzxwg4vspp4vzlwrhv14ajxrqz6irj8a0"; depends=[httr jsonlite stringr]; }; - fitbitViz = derive2 { name="fitbitViz"; version="1.0.2"; sha256="1jvjb7plgfzak3j6wpgp0rzm7y6caja5ibkqfahfhid3li2iiwv0"; depends=[data_table exactextractr geodist ggplot2 ggthemes glue hms httr jsonlite leafgl leaflet lubridate magrittr OpenImageR paletteer patchwork raster rayshader rstudioapi scales sf sp varian viridis XML]; }; + fitbitViz = derive2 { name="fitbitViz"; version="1.0.4"; sha256="1cp5nkaj9ikqcv3yp030id1wklj3jnx002sz2ib0vzza81zyw8bw"; depends=[data_table ggplot2 ggthemes glue hms httr jsonlite leafgl leaflet lubridate magrittr paletteer patchwork raster rayshader rstudioapi scales sf terra varian viridis XML]; }; fitbitr = derive2 { name="fitbitr"; version="0.2.0"; sha256="1v5mhqdiynla7rmspxp5bg6xjjxac0y3qh2nv82pr3fvzvxrrqz8"; depends=[dplyr httr janitor jsonlite lubridate magrittr purrr rlang tibble tidyr]; }; - fitdc = derive2 { name="fitdc"; version="0.0.1"; sha256="1b1abib7jkl7a6r686r53qjw2ywb9q2h67is8691kkaqxpawg30p"; depends=[]; }; fitdistrplus = derive2 { name="fitdistrplus"; version="1.1-6"; sha256="1glnbcm1gghzgvzpxcfsmn7dp2f9jqyx39n3ydwp9fx38409khhp"; depends=[MASS survival]; }; fitmix = derive2 { name="fitmix"; version="0.1.0"; sha256="1z7jgxz119lkyggmgpykcslv56z1i7pnbp872jkdni77sx94x89c"; depends=[]; }; fitplc = derive2 { name="fitplc"; version="1.2-3"; sha256="1yg3ch907c4gk7q8hxgwqxgngkmy125j3ni917nkzi7hn59krd1n"; depends=[car nlme]; }; - fitteR = derive2 { name="fitteR"; version="0.1.0"; sha256="1kgnyl7am966vkfap8gmvchlpankrcj5dv5aj7ws8ix9shr76db6"; depends=[dplyr DT maxLik R_utils shiny]; }; + fitscape = derive2 { name="fitscape"; version="0.1.0"; sha256="0y9x0n61y366f35d594523l3c5sjaf87msxhnlbs2w3g7d53yvfb"; depends=[]; }; + fitteR = derive2 { name="fitteR"; version="0.2.0"; sha256="0l33j69fdfpsp77a1vwqg07b65qaxs875r7lhy2bfi6mxgcklby9"; depends=[dplyr DT maxLik R_utils shiny]; }; fitur = derive2 { name="fitur"; version="0.6.2"; sha256="0bx1w1bpz3i2ybwl386s8y8nxyqwk6w33aqyyw94aq6ink3bw2aw"; depends=[actuar DT e1071 fitdistrplus ggplot2 goftest miniUI rstudioapi shiny]; }; - fitzRoy = derive2 { name="fitzRoy"; version="1.0.0"; sha256="0mf8qksv01ahpnm7a76a5nnv4w0hma4hs0m1k7mwk9kpz2qzzq21"; depends=[cli dplyr glue httr jsonlite lubridate magrittr progress purrr readr rlang rvest stringr tibble tidyr tidyselect xml2]; }; + fitzRoy = derive2 { name="fitzRoy"; version="1.1.0"; sha256="1vv1sahxbabmqh3h8p60af8xbjp3irp2nmdd3a1w4nwjpykycrqy"; depends=[cli dplyr glue httr jsonlite lubridate magrittr progress purrr readr rlang rvest stringr tibble tidyr tidyselect xml2]; }; fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.6.2"; sha256="0nja8zbbkrxrvznyi1c38yzv6djx58ac5y4l1nkf07ph5d9i3k81"; depends=[]; }; fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0.1"; sha256="18cqbxrs69p60anvii22mhqkwh5y2mxapmznff9g7j1j6h4h62lr"; depends=[]; }; fixerapi = derive2 { name="fixerapi"; version="0.1.6"; sha256="0ikf8dn0l9c9gshp4bph3wasl0bh6lfybinc8n1rvb202231hmgb"; depends=[jsonlite tibble tidyr]; }; - fixest = derive2 { name="fixest"; version="0.10.1"; sha256="0gjzgchlcx8vmfbqg80xwj6azna5l7dw9l31bcybd2fg817mixvm"; depends=[dreamerr nlme numDeriv Rcpp sandwich]; }; + fixest = derive2 { name="fixest"; version="0.10.3"; sha256="1idc20ih5qmifi0w74zp1ak19qcz4k0718i2210k0b2rc2axl4fm"; depends=[dreamerr nlme numDeriv Rcpp sandwich]; }; + fixtuRes = derive2 { name="fixtuRes"; version="0.1.3"; sha256="1vmdbx1pfk4kcxq5q5hj4v6rz403xw66gpg6zpvrxkpcgkx2dwyz"; depends=[checkmate dplyr glue lubridate purrr R6 rlang stringi yaml]; }; fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; }; flacco = derive2 { name="flacco"; version="1.8"; sha256="15h2q9xgddy7gw6r52c2nk618f3z1mjn4xz9pzdvhm1d3kqggwa4"; depends=[BBmisc checkmate mlr]; }; flagr = derive2 { name="flagr"; version="0.3.2"; sha256="195c78cml2pjzfvpkaxbzcg1dfdqxi76138p0v3x3zzva9d8nlji"; depends=[]; }; @@ -9362,7 +9481,7 @@ in with self; { flexCWM = derive2 { name="flexCWM"; version="1.92"; sha256="1fxwq12mki10ikf5lyh1pb58svfzs4llg68v4d9iznia8aa0grhq"; depends=[ContaminatedMixt mclust numDeriv statmod]; }; flexclust = derive2 { name="flexclust"; version="1.4-0"; sha256="0x7wxk8y46ndyz6fdacym0rd6p9wh3pcfr28chjcg5d7fm849zl2"; depends=[class lattice modeltools]; }; flexdashboard = derive2 { name="flexdashboard"; version="0.5.2"; sha256="1bh759llp15fxrx2rwvxd8p3w84vjmkid32ism7zg49a127fjib4"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; }; - flexiblas = derive2 { name="flexiblas"; version="3.0.0"; sha256="1nlddwqnqkq5lv0bnsg0rbci6sjwkplqp71zdxn6pqyysyq036gb"; depends=[]; }; + flexiblas = derive2 { name="flexiblas"; version="3.1.0"; sha256="0kgkxzx8lgw0lmszwd4fipvhpgak753bdcm81w25ilp5pzd8x6ii"; depends=[]; }; flexmet = derive2 { name="flexmet"; version="1.1"; sha256="1xcs4gs5aanvfsf6bgj28jsjdxrx0dz475xsw8hd6y44qdgw1sqb"; depends=[]; }; flexmix = derive2 { name="flexmix"; version="2.3-17"; sha256="0jangf89174p0idh9afbicfiln2sz8jxc3bjc6n0j9036dw9n09n"; depends=[lattice modeltools nnet]; }; flexmixNL = derive2 { name="flexmixNL"; version="0.0.1"; sha256="0bk5v0cnsn1qkd1b86vj0bnpr4l9d6523kpkgzb1l1sqyscawfmm"; depends=[flexmix gnm]; }; @@ -9370,10 +9489,10 @@ in with self; { flexrsurv = derive2 { name="flexrsurv"; version="1.4.5"; sha256="1xwh6fj854hr5j1mdh4cbp3hbrbdl4nb2ili876rq08wb9wq5pkf"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis statmod survival]; }; flexsurv = derive2 { name="flexsurv"; version="2.1"; sha256="0kwij9nkdvnsn1kn12fj3hjkd2qpgw7bdda4qad7basq5p6divlp"; depends=[assertthat deSolve dplyr generics magrittr Matrix mstate muhaz mvtnorm numDeriv purrr quadprog Rcpp rlang rstpm2 survival tibble tidyr tidyselect]; }; flexsurvcure = derive2 { name="flexsurvcure"; version="1.2.0"; sha256="06qppcjml380drd6brc60j1swasqrmdx82h6x69xpb65zn9wpa3c"; depends=[flexsurv gtools survival]; }; - flextable = derive2 { name="flextable"; version="0.6.10"; sha256="01nm0357b0z4dgrplbq9ms63j51n0rgvvxyy068zdsc5p7j3lql2"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown uuid xml2]; }; + flextable = derive2 { name="flextable"; version="0.7.0"; sha256="15vr5lb87712mymsvv01kz9s1fb54sx5kybsa2x547k5g10dbrbm"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown uuid xml2]; }; flifo = derive2 { name="flifo"; version="0.1.5"; sha256="03x66l3ryrjvwbxxd0ncjrb5w9kc7fswmp5psb1cb7r87f395gm3"; depends=[bazar pryr]; }; - flightplanning = derive2 { name="flightplanning"; version="0.8.4"; sha256="1n0mjrqlnfv4fvl512slw3d3vmlcn2lhf89jlfg2s0xfrd9k4pq8"; depends=[rgdal rgeos sp]; }; 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.1.1"; sha256="0wgiikbz8jm3pgj47jad9mzvdgbp1wbwfr3ps0ncrk11vdw2iqpf"; depends=[data_table httr parzer pbapply rvest]; }; flintyR = derive2 { name="flintyR"; version="0.0.2"; sha256="13bzglcwd4r6q8ix8diy2dljns722k29zbd782fvkxc59ikx7dja"; depends=[assertthat doParallel foreach Rcpp RcppArmadillo testthat]; }; flip = derive2 { name="flip"; version="2.5.0"; sha256="08x5hwxaxbgc745gblja7gcy0b5wbp7jf90lkha75zl5cc9iyksl"; depends=[cherry e1071 plyr someMTP]; }; flipbookr = derive2 { name="flipbookr"; version="0.1.0"; sha256="0ls51risk3qn5fagw31i2kibrxk7xk3845a1cccd83sc4c8ilgjx"; depends=[dplyr glue knitr magrittr purrr rmarkdown stringi stringr tibble tidyr]; }; @@ -9387,7 +9506,7 @@ in with self; { flock = derive2 { name="flock"; version="0.7"; sha256="1zg93p74icj4bhxnmnssj2xp6vw4yaksyavq03497v33xfpdxss7"; depends=[Rcpp]; }; flood = derive2 { name="flood"; version="0.1.1"; sha256="0nlmjh2l7dij1aqd70hhj0m550knlin3am14azqkx4pacs1kir3p"; depends=[copula evd magrittr TLMoments]; }; flora = derive2 { name="flora"; version="0.3.4"; sha256="17drlfvvrndal4cf5nw20xb9viybagvb4vll1kxdrhvsvfz5yap6"; depends=[dplyr httr jsonlite stringdist]; }; - flow = derive2 { name="flow"; version="0.0.2"; sha256="0aa2nfk1i99mcsnfmziyfbsg4w1x58xnqzgwpyrx31yigrd20515"; depends=[htmlwidgets nomnoml rstudioapi styler webshot]; }; + flow = derive2 { name="flow"; version="0.1.0"; sha256="1d5cj0qbmx6cwzik83vb0vijryq4b93y5wwgm8k92wg3lgknzdj6"; depends=[here htmlwidgets lifecycle nomnoml rstudioapi styler webshot]; }; flower = derive2 { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; }; flowfield = derive2 { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; }; flowr = derive2 { name="flowr"; version="0.9.11"; sha256="1cbbfrvgzqclvbhy20vjwgxbvnn3ljh0k1k54jf2si10bfw3zzi5"; depends=[diagram params readr whisker]; }; @@ -9399,20 +9518,21 @@ in with self; { flying = derive2 { name="flying"; version="0.1.3"; sha256="04wfcsbq8icvk1nnczvic5cp4nb40hxj3g6lasyb1dvhsh0svg0q"; depends=[kableExtra knitr Rcpp rmarkdown]; }; fma = derive2 { name="fma"; version="2.4"; sha256="1x175mhljvplm7b2iwcvkzalv3a79p8gqj9d4f06l5v4shxlrab9"; depends=[forecast]; }; fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; }; - fmcmc = derive2 { name="fmcmc"; version="0.5-0"; sha256="0z1r5fdz1dpf3rvppk28g43xwvpi0l3207338rgfr8zbvlgwfa1a"; depends=[coda MASS Matrix]; }; + fmcmc = derive2 { name="fmcmc"; version="0.5-1"; sha256="1w8qchyh3ry5nphv76pdbryp6hq8bccfhwzmsnghgzfd8hirrg27"; depends=[coda MASS Matrix]; }; fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; }; fmerPack = derive2 { name="fmerPack"; version="0.0-1"; sha256="0p9jfgkzs97r6ya1x8ax7bza17b03grqxa22ja13s12vj0cdkv78"; depends=[abind flexmix glmnet MASS Rcpp RcppArmadillo]; }; 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.6"; sha256="1wh77xwpm8f9d9vky3r7vfmkik3hls008ifk8hkm2rq6i06jj53n"; depends=[aws metafor nlme]; }; 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.2"; sha256="1ylwj4385wg7rymx0m3kayyvrbil89wxb7phdl0fvi0xq2krkzhb"; depends=[]; }; - fmtr = derive2 { name="fmtr"; version="1.5.4"; sha256="0xrl22f02q2m66k9h1134iwdmzhvk0ni9dfrgzpi8rnfdf4svx4i"; depends=[crayon Rcpp tibble]; }; + fmsb = derive2 { name="fmsb"; version="0.7.3"; sha256="1gi94xr0b1yk9xzwfprfafxi25yic1lcivd66p73n6iqfzdaimbk"; depends=[]; }; + fmtr = derive2 { name="fmtr"; version="1.5.5"; sha256="0vxdcjr0azmcsq59gp31c1zkgcf2sbi5z8qmjcz0507sn81r73wf"; depends=[crayon Rcpp tibble]; }; focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; }; foghorn = derive2 { name="foghorn"; version="1.4.2"; sha256="11riav36ncxybx4yrrrwrykg9xmh2fpp5m92zl9prhi7g0rllg6f"; depends=[clisymbols crayon curl httr jsonlite rlang rvest tibble xml2]; }; 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]; }; folderfun = derive2 { name="folderfun"; version="0.1.4"; sha256="0rns8590r1897lj0gyrlj0zbaxjw2gjaxwnwdxiiw2kvyq7mjkis"; depends=[]; }; folio = derive2 { name="folio"; version="1.0.0"; sha256="1al4ampy95fsxxlqhp63qmc0xn51gfa0gw2gghy28a4dqjg39sfg"; 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=[]; }; fontHind = derive2 { name="fontHind"; version="0.1.1"; sha256="0qz3bj8vdy6jayy84p3vyxfwqll4v4qlklwq9wl981ii2k7g0vxf"; depends=[extrafont ggplot2 hrbrthemes]; }; fontLiberation = derive2 { name="fontLiberation"; version="0.1.0"; sha256="1w1rl0g4ayyp8lwppmz9yzj9cizg7i50g07216jkm1q5w0is9pmc"; depends=[]; }; @@ -9423,23 +9543,25 @@ in with self; { foodingraph = derive2 { name="foodingraph"; version="0.1.0"; sha256="0v40yk7lx0zxvpd3vz48h5gzx8ds8v3l12i2r7v9safgfvip6fvn"; depends=[cowplot dplyr ggplot2 ggraph igraph labeling magrittr minerva rlang stringr tibble tidyr viridis]; }; foodweb = derive2 { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; }; 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]; }; 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="1.7.1"; sha256="10vyf98xzriiqqpmmzz3nzhrnnxfjp7h71dxgwsikg3j9va8pfqk"; depends=[dplyr ggplot2 ggplotify ggprism gridExtra lmodel2 lubridate magrittr plyr reshape2 rvest scales stringr xml2]; }; + foqat = derive2 { name="foqat"; version="2.0.1"; sha256="1p607kiw04cq6jrpbmcmpaqilaa2c1mhvqz10fld01mz6k29f7p0"; 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]; }; forcats = derive2 { name="forcats"; version="0.5.1"; sha256="12d2nv2w15085jscgidmjdnr1ryymciflcmal6ldmgp2fkl9dyy4"; depends=[ellipsis magrittr rlang tibble]; }; foreSIGHT = derive2 { name="foreSIGHT"; version="1.0.0"; sha256="0f1wy7iy3189890qi0gfqwbif3qlp9bfnzzqlg1yvwxi5pw55ikm"; depends=[cowplot directlabels doParallel fields GA ggplot2 jsonlite moments progress RColorBrewer rcorpora Rcpp rlang scales viridisLite zoo]; }; - foreach = derive2 { name="foreach"; version="1.5.1"; sha256="1qb83b1jvpmk8d6kfibkm5q2hiki0x5gipy758mwa62n56gdcnpv"; depends=[codetools iterators]; }; + foreach = derive2 { name="foreach"; version="1.5.2"; sha256="1r5gdf9fp3rprvrhf0gzl9qmmqhgdn5gscpm5hk8zxpraf3qscsn"; depends=[codetools iterators]; }; forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; }; - forecast = derive2 { name="forecast"; version="8.15"; sha256="0x4ij55sb45qnwba3bybs50vsvv82q3j8p47xmbv959h13nsnfn7"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; }; + forecast = derive2 { name="forecast"; version="8.16"; sha256="0zvn44k7npxai8kj0hgxaaqv1hgd8rxicnvj4cg7wfl8ba4yn0cz"; depends=[colorspace fracdiff 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]; }; 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]; }; - foreign = derive2 { name="foreign"; version="0.8-81"; sha256="0b4rca1bl8xxna05057hchbwfmgjgx0n140szabpc0raizqzks0s"; depends=[]; }; + forecasteR = derive2 { name="forecasteR"; version="1.1.6"; sha256="1lqlmiwr34rim50y9vxinf23xi9gj0y6p1y1wp3vlfycdkd0lca5"; depends=[colourpicker config DT echarts4r forecast golem htmltools htmlwidgets lubridate rlang scales shiny shinyAce shinycustomloader shinydashboard shinydashboardPlus shinyjs stringr]; }; + foreign = derive2 { name="foreign"; version="0.8-82"; sha256="1yw07yqzfm4w1h92ijyamrmf7rmkqxgamqfd74x7zv4vsn20dvgq"; depends=[]; }; forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; }; forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; }; - forestControl = derive2 { name="forestControl"; version="0.2.1"; sha256="1m75s98bs8n3qad8gp6a333dh3mbi0rbbic9iwnsqyklzkhmx1nr"; depends=[dplyr magrittr purrr Rcpp tibble]; }; + 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]; }; @@ -9448,6 +9570,7 @@ in with self; { forestmangr = derive2 { name="forestmangr"; version="0.9.4"; sha256="1zlp7lnawbfqw60552cwnh280spqj7p2qvn2xwz5y7wly2d7d4fm"; 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="2.0.1"; sha256="0bzwi6ws0qjq1pqiadssynbkxxd4zjp974jfdplmv16fcyszqhyi"; depends=[checkmate magrittr]; }; + forestploter = derive2 { name="forestploter"; version="0.1.2"; sha256="1vqc1prlzgssc7ywvlgd7c6rysrmb9145fh9akhra6rs1pnrv9pf"; 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]; }; @@ -9458,7 +9581,8 @@ in with self; { 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.1.0"; sha256="15zkzq8vb6ydvic3r2lsna64vqlq12225cpdr7dsrfkn6kqjjzd5"; depends=[]; }; - forrel = derive2 { name="forrel"; version="1.3.0"; sha256="0dlp318dh77fwjcqyzx9ldwvcxa4xpwkpvnizgvbifnwxkggdj7j"; depends=[glue pedmut pedprobr pedtools ribd]; }; + forrel = derive2 { name="forrel"; version="1.4.1"; sha256="1328cbcnnpy3n8na2brxf2q5i3czkkiajri6zi5yfajwrb2vyg33"; depends=[glue pedmut pedprobr pedtools ribd]; }; + forsearch = derive2 { name="forsearch"; version="1.0.0"; sha256="047iizf9pfgq292zkhkdwq44ij4kixvxd7d0qqyayckh3c1k9290"; depends=[Cairo ggplot2 Hmisc nlme tibble]; }; fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; }; forward = derive2 { name="forward"; version="1.0.5"; sha256="0cc0s534s32b9ark2zazwqhgy0zsxb2p63r6503v82784rpqv2yv"; depends=[MASS]; }; forwards = derive2 { name="forwards"; version="0.1.3"; sha256="07374a1ak5h8q3diqyvsw3q1grqi3679w9sshf1jkhlrj7wn0dmv"; depends=[]; }; @@ -9470,7 +9594,6 @@ in with self; { fpCompare = derive2 { name="fpCompare"; version="0.2.3"; sha256="1pyv52rvbqd5v6ns86pc119q019ps070bd819x7a98s4hmbf76zq"; depends=[]; }; fpa = derive2 { name="fpa"; version="1.0"; sha256="0kgpl9qq0l10h0vdd2f8vnir0kdylh1jvvv5z4d9ygj1pl9qywhk"; depends=[fields reshape]; }; fpc = derive2 { name="fpc"; version="2.2-9"; sha256="0f7sfmpcycr9y7cy5gasyjm2ardxa62kglqms92mcr68jrp01c19"; depends=[class cluster diptest flexmix kernlab MASS mclust prabclus robustbase]; }; - fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; }; 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=[]; }; @@ -9502,25 +9625,29 @@ in with self; { frbs = derive2 { name="frbs"; version="3.2-0"; sha256="0biv6j31qi0f4i063ygmbp6v6ws1nxijn5kyhg5sz1rnbr0msl28"; depends=[]; }; frechet = derive2 { name="frechet"; version="0.2.0"; sha256="1006mgy9avwkwy0666maac59xp4j27wq5yy3pwc3h1r05myxw379"; depends=[corrplot fdadensity fdapace Matrix osqp pracma]; }; fredr = derive2 { name="fredr"; version="2.1.0"; sha256="0073qh0drf1p38hc84m54n35hyza90m8zn48ihx3alxkiq1m8ijp"; depends=[httr jsonlite rlang tibble]; }; - freealg = derive2 { name="freealg"; version="1.0-3"; sha256="14jr00j2ky5sq8bhbr2i41mqj3jqk204nh6983wxi4qnmpvxhm1f"; depends=[disordR mathjaxr partitions Rcpp]; }; + free = derive2 { name="free"; version="1.0.1"; sha256="0r9vd1d4pi19mnvdchx95axp0hiqs8lpgp0fn40dm89h5fd6zyb0"; depends=[Rcpp RcppArmadillo]; }; + freealg = derive2 { name="freealg"; version="1.0-4"; sha256="0bv31pydjhqhfin4ydd49aqzsxn0zhhismm0l4ijabrrvkw3n1hc"; depends=[disordR mathjaxr partitions Rcpp]; }; freedom = derive2 { name="freedom"; version="1.0.1"; sha256="1mrdl2cqdm2c68lx7lyixgiqw6xzwnx9c8j5q4annhiz107i9i22"; depends=[]; }; freegroup = derive2 { name="freegroup"; version="1.1-3"; sha256="11v0ph0mhk8g9zwapcp2wgr1sbdwdqh7nhbrci87myapypdncqjc"; depends=[magic magrittr plyr]; }; freesurfer = derive2 { name="freesurfer"; version="1.6.8"; sha256="0ks6ms5vp38pykcg66w960nmfgq383iprrbbzw5dlx9xnrx4yhbh"; depends=[neurobase R_utils reshape2]; }; - freesurferformats = derive2 { name="freesurferformats"; version="0.1.16"; sha256="0aax9dimig3cn8mqnl8xdj9khs7fga08fx7vw9qkwrv4bnls8zvz"; depends=[pkgfilecache rmarkdown xml2]; }; + freesurferformats = derive2 { name="freesurferformats"; version="0.1.17"; sha256="125vmx9gw9czlp86c2byv1fdslzhjn8q0plgqnk065sjhbla46cn"; depends=[pkgfilecache rmarkdown xml2]; }; frenchCurve = derive2 { name="frenchCurve"; version="0.1.0"; sha256="1b8lkmhydz4jq8h5p117fwaygbsillzcfx0p7w0ljj8b8v57r6l9"; depends=[sp]; }; frenchdata = derive2 { name="frenchdata"; version="0.2.0"; sha256="13n0phncbxim9ak897hmjw1p7ph5wi3jn2m8hgmm3bywxbxcg1qz"; depends=[assertthat cli dplyr fs httr magrittr purrr readr rlang rvest stringr tibble tidyr]; }; freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; }; + freqdistributionNogives = derive2 { name="freqdistributionNogives"; version="0.1.1"; sha256="1y01yiyzgcsr8xcjgxq75ky8a6f4d2h3x82la3zcrczy7fplblq4"; depends=[]; }; freqdom = derive2 { name="freqdom"; version="2.0.1"; sha256="0ig0ygnlcb5ndjjm5x8jpp37gvgwli9xv6zsvbbgfh72q418qswp"; depends=[matrixcalc mvtnorm]; }; freqdom_fda = derive2 { name="freqdom.fda"; version="0.9.1"; sha256="15wq9s3v441dybc8kglpbv9hdvsr9rjjq4qp4d2ipxglfp0iqj9p"; depends=[fda freqdom mvtnorm]; }; freqparcoord = derive2 { name="freqparcoord"; version="1.0.1"; sha256="011p8xh0i0x0w5rv5qz5a7fxwdhxd8l2bqi9bxv5almxd0y7ajqx"; depends=[FNN GGally ggplot2 mvtnorm]; }; + freqpcr = derive2 { name="freqpcr"; version="0.4.0"; sha256="04s6yrzxk4v86nhs9mwam1y2lfac73r6i8af9xbbmrlzj61wiia9"; depends=[cubature]; }; freqtables = derive2 { name="freqtables"; version="0.1.0"; sha256="0d2yibb8689786icfladxfm51sqng909wigvqmwij9lkqq14rd80"; depends=[dplyr rlang stringr]; }; frequency = derive2 { name="frequency"; version="0.4.1"; sha256="0sjsc803ysyg2gfzb7z4jb2sikwxs99is2m03k5glfy3ylgphn0d"; depends=[DT ggplot2 gtools knitr rmarkdown]; }; frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.2.3"; sha256="1yzpgflldcdsd5kj0jpyj0vwx25f3l0x344glbrwvlwgdax9dkg8"; depends=[knitr pbapply urca vars]; }; frequentdirections = derive2 { name="frequentdirections"; version="0.1.0"; sha256="0rmifh221c8z3cqyqg0bfxnih9f64hvv98jz44i6grnlablfwwgw"; depends=[ggplot2]; }; frequentistSSD = derive2 { name="frequentistSSD"; version="0.1.0"; sha256="0r2vy8n6d8c2vdijd0cyg9vv4m0w0a6m2piblky48c1wm2qznfd2"; depends=[survival]; }; fresh = derive2 { name="fresh"; version="0.2.0"; sha256="1787mm6w2s5x9scxy7r9cb77rgpmy4ngwkn4z8g3gs48mrab4bd9"; depends=[htmltools rstudioapi sass shiny]; }; + frictionless = derive2 { name="frictionless"; version="1.0.0"; sha256="17an6wxwb9qcj42rsm3311jx1f2d91fpq0d0831xswngc548bmp5"; 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="3.1.0"; sha256="0yfhz73v7zp6zrq8pyl57j8nmdaqx1giwyssx5l73p0jqjc6d528"; depends=[]; }; + fritools = derive2 { name="fritools"; version="3.2.0"; sha256="1kjzc97ivz95rvhs0jzfvyfvznkcgklc7f9xplbim3yfl07w2hsc"; depends=[]; }; frm = derive2 { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; }; frmhet = derive2 { name="frmhet"; version="1.1.3"; sha256="07sgsfhzrci8g1b0gicjfca1mgd8ppfqpkpp4q9bdxnjvdvlf45s"; depends=[]; }; frmpd = derive2 { name="frmpd"; version="1.1.0"; sha256="0irgqdr0vr8k408lsxcrjkjbjvqvmy5mnjw9c1ghs86isrp5mciz"; depends=[]; }; @@ -9530,26 +9657,24 @@ in with self; { frontiles = derive2 { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; }; frost = derive2 { name="frost"; version="0.0.4"; sha256="03snjlq4b9j84v0yimc3xzgjvryzzi76b9n53k0s2lvv1yzrri7x"; depends=[]; }; frostr = derive2 { name="frostr"; version="0.2.0"; sha256="1bsgdskdbyryq7jvhnb4z4xb1m5vadqv00qjlkgp41xh71wp2brs"; depends=[httr jsonlite tibble tidyr]; }; - frscore = derive2 { name="frscore"; version="0.1.0"; sha256="19i7m8r8qmhymav36jzfg6zyhjscazs9pqzbxbb0dgjqjkm9j5qh"; depends=[cna dplyr magrittr Rfast rlang]; }; + frscore = derive2 { name="frscore"; version="0.1.1"; sha256="0x5hyjh3n28yanpgx4yb2afjlwknaa4dd5fsy857hbdm0wf2jz9v"; depends=[cna dplyr magrittr Rfast rlang]; }; fruclimadapt = derive2 { name="fruclimadapt"; version="0.4.4"; sha256="19siwjjcjh0kh2wpbabgzjwrfgg2al0g7d4z91wdcp3spwx308vk"; depends=[data_table lubridate tidyverse zoo]; }; fs = derive2 { name="fs"; version="1.5.2"; sha256="11qr3v0xn65vfhgcxl4l6yv48s4w0w3ldp3anpzc25vd3mwd3jim"; depends=[]; }; - fsMTS = derive2 { name="fsMTS"; version="0.1.5"; sha256="1vxj9wkzpbk44hby4fdyhj72748c65by612kpphs6vmgzmw4y471"; depends=[freqdom glasso lars mpmi randomForestSRC]; }; - fsbrain = derive2 { name="fsbrain"; version="0.5.2"; sha256="1vqj8x6wsaz89dl58nqhmz9vla0vjzdn8gzppkfggb44i2q1xm55"; depends=[data_table fields freesurferformats magick pkgfilecache reshape rgl squash viridis]; }; + fsbrain = derive2 { name="fsbrain"; version="0.5.3"; sha256="10xfc6b9wwadafqr8ndz9rkbi94ql4kywpb085b5k5yncmfcbq5m"; depends=[data_table fields freesurferformats magick pkgfilecache reshape rgl squash viridis]; }; fscaret = derive2 { name="fscaret"; version="0.9.4.4"; sha256="18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw"; depends=[caret gsubfn hmeasure]; }; fsdaR = derive2 { name="fsdaR"; version="0.6-5"; sha256="0j6nvlp527b4g36jg6mcq8w2mc8p795q68d11yi41fvlcw7v6vym"; depends=[ggplot2 rJava rrcov]; }; fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; }; fslr = derive2 { name="fslr"; version="2.24.1"; sha256="1psjqvjv8krlkj7dcfwygz563a4cpn7h21z330hxh5q10rwhabi8"; depends=[neurobase oro_nifti R_utils]; }; - fsn = derive2 { name="fsn"; version="0.1"; sha256="1a5vsrk9l19rh46kxrfmgcv07l0pr4zn1q2f0chivq43pwmfm194"; depends=[Rfast]; }; + fsn = derive2 { name="fsn"; version="0.2"; sha256="12n1v8nhfn5pjjsrp41wk848yw797wxa9anx9dm8rd278smrk01f"; depends=[Rfast]; }; fso = derive2 { name="fso"; version="2.1-1"; sha256="0hn2ypm0nwfbmnh9il78pi30x7gfmayfangqyh0d63ngyz40bvma"; depends=[labdsv]; }; fspe = derive2 { name="fspe"; version="0.1.0"; sha256="0cdl6749nqz2nmknn8mjxxxm8axix9iv2micviwg7fhynqhsffp1"; depends=[corpcor GPArotation psych]; }; - fsr = derive2 { name="fsr"; version="1.0.0"; sha256="0mavf8kbs8176j6qp773myc7h8m4l8x10n3w630jp6d6csj8jgb2"; depends=[dplyr e1071 FuzzyR ggplot2 lwgeom pso rlang sf stringr tibble]; }; - fssemR = derive2 { name="fssemR"; version="0.1.6"; sha256="1l80anvlf21kvwb95w5mn0i2q773z0vbznx1lqvgsawprhcdiv20"; depends=[glmnet igraph MASS Matrix mvtnorm qtl Rcpp RcppEigen stringr]; }; - fst = derive2 { name="fst"; version="0.9.4"; sha256="0vwclzxww8mw9nnpyj29bn71mrr8jjg7ka03979h9rbzw6d9bjrr"; depends=[Rcpp]; }; - fstcore = derive2 { name="fstcore"; version="0.9.6"; sha256="1445m8gn41q9l9m25d5m4682yy0msb5jnmdd8w310cxxs1riza93"; depends=[Rcpp]; }; + fsr = derive2 { name="fsr"; version="1.0.1"; sha256="1h0ljb28nffjjjry93lsvw2i109g0mmjgdd335y7r3zgz1s34x2d"; depends=[dplyr e1071 FuzzyR ggplot2 lwgeom pso rlang sf stringr tibble]; }; + fssemR = derive2 { name="fssemR"; version="0.1.8"; sha256="1rja69b6x5vc302nksh5m6ssp2lx8drv9gjnkv6j9xr3hd2407xi"; depends=[glmnet igraph MASS Matrix mvtnorm qpdf qtl Rcpp RcppEigen stringr]; }; + fst = derive2 { name="fst"; version="0.9.8"; sha256="0r96inwrr960m7wmc80603bw2vvvwab225bh9dq3lalwhy4yiis4"; depends=[fstcore Rcpp]; }; + fstcore = derive2 { name="fstcore"; version="0.9.8"; sha256="1qicjwsm87wgjm5mxrsgi697fmcfz6wyqcxfgngwxrf8kq4awjsf"; 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.3.0"; sha256="1aal3cwdp9gnc0gnigk7789rak3s6i5jav01d9z25gm977683b76"; depends=[dplyr flextable jsonlite magrittr purrr rlang rmarkdown stringr tibble tidyr tidyselect vctrs xfun yaml]; }; - ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; }; ftrCOOL = derive2 { name="ftrCOOL"; version="2.0.0"; sha256="0jy0dhkf7hlrriz32abp0h52fw92i5k8x25bjqlzd0khyv2vhj0i"; depends=[]; }; fts = derive2 { name="fts"; version="0.9.9.2"; sha256="08pwhi19db173d4nsk5rl8xa8qmaddj4bn3cjxb8ql4kny59i57q"; depends=[BH zoo]; }; ftsa = derive2 { name="ftsa"; version="6.1"; sha256="0j8jr0sbvxfzqfy8va7axljp660jkpqwg9djbis9ikf4x9n9f7n9"; depends=[boot colorspace e1071 ecp evgam fda fdapace fGarch forecast glue KernSmooth LaplacesDemon MASS pcaPP pdfCluster psych rainbow ROOPSD sde strucchange vars]; }; @@ -9572,9 +9697,9 @@ in with self; { funchir = derive2 { name="funchir"; version="0.2.0"; sha256="1rj5khv1xcaaip5xh8kcsp2jgmbmnc9q5kwr46l4mxvxyndndi1k"; depends=[data_table]; }; functClust = derive2 { name="functClust"; version="0.1.6"; sha256="0mdfxvrx3wk497a9bbkwnzbm6hm2s4wqs3h09m3hj48ybpqmhz9i"; depends=[clusterCrit multcompView]; }; functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; - functiondepends = derive2 { name="functiondepends"; version="0.2.1"; sha256="0i6ppm5xz1m3m29lvz4nqm31k33w18j8af160lalgc01i1n4n11c"; depends=[dplyr magrittr purrr stringr tibble tidyr tidyselect]; }; + functiondepends = derive2 { name="functiondepends"; version="0.2.3"; sha256="0p831i8l81dbrncmr69024gm5g14p0xiv7li0ljdlqnrbc0fj64n"; depends=[dplyr magrittr purrr stringr tibble tidyr tidyselect]; }; fundiversity = derive2 { name="fundiversity"; version="0.2.1"; sha256="11gz1h7mlb0880w3cv5sb4h6qpfs6az3vfhd3527s6sw43n87l29"; depends=[future_apply geometry Matrix vegan]; }; - fungible = derive2 { name="fungible"; version="1.99"; sha256="1hjngz3jbrcx0ri7054rbhcnhb3d1yf7mlb9m1ivdmpih8f5c3vj"; depends=[clue GPArotation lattice MASS mvtnorm nleqslv Rcsdp RSpectra]; }; + fungible = derive2 { name="fungible"; version="2.0"; sha256="1xwmw6d3lzq4b2n8amhllciq28x85wrcmd7mpxml3zn9las19wrx"; depends=[clue GPArotation lattice MASS mvtnorm nleqslv Rcsdp RSpectra]; }; funique = derive2 { name="funique"; version="0.0.1"; sha256="0p9k4nxjns1xid9vmslkaap0hm6yq6pbyvylgygd808if4q1z8k6"; depends=[]; }; 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]; }; @@ -9583,7 +9708,7 @@ in with self; { funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; }; funrar = derive2 { name="funrar"; version="1.4.1"; sha256="0xqccch59f8cz4a7ybjdr6k625bir5nsjrp4iyfirrb877d17m5z"; depends=[cluster]; }; funreg = derive2 { name="funreg"; version="1.2.2"; sha256="0dagzz5pl16l2jkkj11z41y68s75jxmyl46csda6vzlgjc7n4ji8"; depends=[MASS mgcv mvtnorm]; }; - funtimes = derive2 { name="funtimes"; version="8.1"; sha256="08vz05db6krrcppk0fd05n366isrqrmgwbp6y6c0n9rzbgav511k"; depends=[dbscan FNN igraph Jmisc Kendall Rdpack TDA]; }; + funtimes = derive2 { name="funtimes"; version="8.2"; sha256="15fhqjagarzfd1zicl684rlcy0rcifpl4wl1fs645nr8lq4y9ygg"; depends=[dbscan FNN igraph Jmisc Kendall Rdpack]; }; furniture = derive2 { name="furniture"; version="1.9.10"; sha256="02dqs0b0vpn2chqhjylanq9xdrj2hw7ynd6xv94gkfk8syz3dqda"; depends=[dplyr knitr]; }; furrr = derive2 { name="furrr"; version="0.2.3"; sha256="001p2yhznrpnrjvdcmf2h3wpgdnw01wnqgid7wbq8bhavhi3888a"; depends=[ellipsis future globals lifecycle purrr rlang vctrs]; }; fusen = derive2 { name="fusen"; version="0.3.0"; sha256="11rsk5yzdzdak24knpxp38p83j0qhbhqc5skfvpmdwncyzf6fv5r"; depends=[attachment cli desc devtools glue here magrittr parsermd roxygen2 stringr tibble tidyr usethis]; }; @@ -9594,24 +9719,23 @@ in with self; { futile_options = derive2 { name="futile.options"; version="1.0.1"; sha256="0w15agpi88y3qkv6fl72zy2pzyplzgvnj41a4ixhg64mw1sck73s"; depends=[]; }; futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; futility = derive2 { name="futility"; version="0.4"; sha256="0zjb87brz7pkx3nq3q30y69cmcxpqqsra447p60qh7005kgr9vx4"; depends=[]; }; - future = derive2 { name="future"; version="1.23.0"; sha256="1y5qzpsg0r2dccynyybbb2ngxbl1y3phs1dq2jj3f2bwhc7chsfq"; depends=[digest globals listenv parallelly]; }; + future = derive2 { name="future"; version="1.24.0"; sha256="0xmj17fq9paww796490bmakv6pcvrzk15i8mzhxk1mp9l0mj32vv"; depends=[digest globals listenv parallelly]; }; future_apply = derive2 { name="future.apply"; version="1.8.1"; sha256="1ix61bfbk43pwnjb0wk8lkfgdsy5zi8svk74gar5nrl90b5w6nqd"; depends=[future globals]; }; future_batchtools = derive2 { name="future.batchtools"; version="0.10.0"; sha256="1ly98h2g7wpfxp2r8vl1hy7wqqgwgawjagz0m2iczjmcj4ix6avk"; depends=[batchtools future]; }; future_callr = derive2 { name="future.callr"; version="0.7.0"; sha256="0y5x2xz29j7aidk3c1iby3dk23gpxmgzp4f5z5bdgd1w0n4jslg4"; depends=[callr future]; }; future_tests = derive2 { name="future.tests"; version="0.3.0"; sha256="1ssr0sd9h10151m5iaad17zqii7d18nnszq2svj0i8izk83xhrik"; depends=[cli crayon future prettyunits sessioninfo]; }; 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]; }; - fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; }; fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.4"; sha256="04841fh4nf7qriqk0b2ny943bji60bj42j8czg056d2dza4q4039"; depends=[]; }; - fuzzySim = derive2 { name="fuzzySim"; version="3.0"; sha256="18h0lxzqyp7fzjv7vnyfbwpaxjx15sw0h9l5yq846xzhkza79xxp"; depends=[]; }; + fuzzySim = derive2 { name="fuzzySim"; version="3.7"; sha256="0m37fgqiy025db5ciz8lb2a8132iprn6fssy1bpingw3nb88r3vp"; 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.5.2"; sha256="1ppgyavkq8nys6fs9is7x08kclaa9g4h04a55bdkk6jjm36if914"; depends=[limSolve quadprog]; }; + fuzzyreg = derive2 { name="fuzzyreg"; version="0.6"; sha256="1v100flbnw3mjmakgswj0zfla2rm0s0vpg8w8v7j1lr9sfjz4s7c"; depends=[limSolve quadprog]; }; fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.5"; sha256="1g73xivxyh5fvppccgnxhgar6jsl6zsr2djkg0bhh10i633l56ia"; depends=[R6 reticulate]; }; fwi_fbp = derive2 { name="fwi.fbp"; version="1.7"; sha256="1wk9cr0kk6zkbf111bv87n7b1wwx1qrsbjxydvbjvy8bgz0nfa62"; depends=[]; }; fwildclusterboot = derive2 { name="fwildclusterboot"; version="0.7"; sha256="1rhaisq2x9skhlils9iry7x8xzsi59pp6i9whg6jrjphgz96976f"; depends=[collapse dqrng dreamerr Formula generics gtools Matrix Matrix_utils Rcpp RcppEigen]; }; fwsim = derive2 { name="fwsim"; version="0.3.4"; sha256="0fy87c1x5hihfcppv1pvk3b0pwl6ygqpka40x55gbpkgssdigb1l"; depends=[Rcpp]; }; - fxTWAPLS = derive2 { name="fxTWAPLS"; version="0.0.7"; sha256="0pfp64qi0mnxsf0pmgi5pafalzp997q6wx9fhkk04llzcj9ppdl8"; depends=[doFuture foreach future geosphere ggplot2 JOPS MASS progressr]; }; + fxTWAPLS = derive2 { name="fxTWAPLS"; version="0.1.0"; sha256="0p51b907sz8357yb5kpxjpip7fa6xznlw1k508jlmkp2dlwnpjpr"; depends=[doFuture foreach future geosphere ggplot2 JOPS MASS progressr]; }; 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]; }; g_data = derive2 { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; }; @@ -9637,14 +9761,14 @@ in with self; { gStream = derive2 { name="gStream"; version="0.2.0"; sha256="1f4xnbavm99yhjmaahazigps41mqlfvvl29kf4fs1yjqr531y36b"; depends=[]; }; gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; }; 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-8"; sha256="0p6lav6lrwgsw29sl8vshzgi8j2smcavx047qq31s9bsn2dcw58n"; depends=[digest]; }; - gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-6"; sha256="0arh0yxx63m4df1ccrv0q3vkjncwv3ink8vkalp6ashi2932yfma"; depends=[digest gWidgets2 memoise]; }; + 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.7"; sha256="1p7jpwy65gdl6kli1h2m9yi5p5ah1vm23xs03sm9l42fcbn7ffdw"; depends=[]; }; gafit = derive2 { name="gafit"; version="0.5.1"; sha256="160z3cv22prf7118447dla9g1gimwkfad8zdil3fg8n4l22rk51a"; depends=[]; }; gaiah = derive2 { name="gaiah"; version="0.0.4"; sha256="1ibsbmmpagr7ix1c3bszrglqx95w44qyfy80vcq3w2dprs8vrrw6"; depends=[dplyr geosphere magrittr maptools 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.3.1"; sha256="1z7kwmpmsr7fy9x3z6bivx0vvfrb9k5lgvcdnj3z46hi2vn6i8xn"; depends=[assertthat crul data_table data_tree digest httr jsonlite sf sp stringr wellknown]; }; + galah = derive2 { name="galah"; version="1.4.0"; sha256="1szc10fh5fliry91357pxl4q3ry496l5j49mpqh3fsydz5cd8ck4"; depends=[assertthat crul data_table data_tree digest glue httr jsonlite lifecycle rlang sf stringr tibble tidyselect wellknown]; }; 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]; }; galvanizer = derive2 { name="galvanizer"; version="0.5.3"; sha256="1b9431mmgpqyd49b8nlsrlxjq9j9fyj73226bi9jic1p867533kk"; depends=[dplyr httr jsonlite lubridate magrittr rlang tibble tidyjson tidyr tidyselect]; }; @@ -9661,14 +9785,15 @@ in with self; { games = derive2 { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; }; gamesGA = derive2 { name="gamesGA"; version="1.1.3.7"; sha256="0km0z2haqgykl01xkzsbkpwibavgqfjygx7cg08ni68gw501689l"; depends=[shiny]; }; gamlr = derive2 { name="gamlr"; version="1.13-7"; sha256="0p0q77lkb5j9p1gd2z1n74pphx7h0lynzdamxrhz2w6bif1431wz"; depends=[Matrix]; }; - gamlss = derive2 { name="gamlss"; version="5.3-4"; sha256="06mh00jjxnqwknbv777hawjk0zm81ixrp35fg59mrlqz8y3p2w3j"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; + gamlss = derive2 { name="gamlss"; version="5.4-1"; sha256="0fp9bmgykpqd950bk58dk423iy5r1fm3dy2gw0cwwmgivpq2lx0q"; 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_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-1"; sha256="0m41n7zf7m0mh1w9ql70wqnzsf2f013ql699im7zmp6fdggb8qxm"; depends=[MASS]; }; + gamlss_dist = derive2 { name="gamlss.dist"; version="6.0-3"; sha256="1gqjr419v8z2ygh0h1xz7bipnsbp820njzwq7z3r9f41rn1ym47c"; depends=[MASS]; }; gamlss_foreach = derive2 { name="gamlss.foreach"; version="1.1-3"; sha256="0q9r92q21miisarbgvjdlqy6mp4b76ns49fw09zx8xypg74m2kl9"; depends=[doParallel foreach gamlss gamlss_data gamlss_dist glmnet]; }; + gamlss_ggplots = derive2 { name="gamlss.ggplots"; version="1.0-0"; sha256="0z19jvgan08jijijcx5aswq2c4c5pbdyhhgb9idvhv7bir5qim06"; depends=[ellipse gamlss gamlss_dist gamlss_foreach 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]; }; @@ -9681,8 +9806,9 @@ in with self; { gammSlice = derive2 { name="gammSlice"; version="2.0-2"; sha256="1klxg1yhmfaz1zjnw1kxl1lm5plkakqh014rpkak2lj8zgf8qnyy"; depends=[KernSmooth lattice mgcv]; }; gamma = derive2 { name="gamma"; version="1.0.1"; sha256="1m2wxqprfxb51fih5f9l4s0lk42gyglbgvhfxc0cm9n7pn3dhprl"; 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-1"; sha256="107hbshi36dcyykhy6w1i1ih84xwdqv1q3nad73d3krf7bhvhg5f"; depends=[foreach mda]; }; - ganGenerativeData = derive2 { name="ganGenerativeData"; version="1.2.0"; sha256="1ha7sf69ys8gz3fv1k3h32qr6cfjvrirkx0rcyq7pscxychwslca"; depends=[Rcpp tensorflow]; }; + gamsel = derive2 { name="gamsel"; version="1.8-2"; sha256="1w1z2g0njsfv1ah6w3zw4lcgnaxask5mgykb204jzp6hpnc1a6cb"; depends=[foreach mda]; }; + gamselBayes = derive2 { name="gamselBayes"; version="1.0-2"; sha256="1dqxc7g529lkdk2lvn3ls4gxij7djs5xycrzlw49wf79pns2s5cc"; depends=[Rcpp RcppArmadillo]; }; + ganGenerativeData = derive2 { name="ganGenerativeData"; version="1.3.3"; sha256="07hdvch67c4liqb9f01j3aflivgpzgxdsg16zvvhwbyzch94xmv2"; depends=[Rcpp tensorflow]; }; 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]; }; gap = derive2 { name="gap"; version="1.2.3-1"; sha256="1rw93dnv3id64al46iybyznnvprv871qa4lnwdx18x8ym66fafil"; depends=[]; }; gap_datasets = derive2 { name="gap.datasets"; version="0.0.4"; sha256="1zlxm3nh1b1mqb94fq2b7sc7v99m9ywz7bz9lz5bhwblk5fzmjii"; depends=[]; }; @@ -9694,18 +9820,18 @@ in with self; { garchx = derive2 { name="garchx"; version="1.3"; sha256="0fpanzl6nfq6dar5chmqqfndb3w01mcypkhj0ya6v3d77m02b5mf"; depends=[zoo]; }; gargle = derive2 { name="gargle"; version="1.2.0"; sha256="0fypj70c1fjmvs57birik76wfx8a2fs4gzicbb52k57i6clwlijd"; depends=[cli fs glue httr jsonlite rappdirs rlang rstudioapi withr]; }; gargoyle = derive2 { name="gargoyle"; version="0.0.1"; sha256="0lsjplfrc047lb3zjfsc8wl47kll7d85v824k7zlr0n34xbbypq7"; depends=[attempt shiny]; }; - garma = derive2 { name="garma"; version="0.9.10"; sha256="1a6j1ym4rn4bvnh6b17gczg9x7f8gvmjw094694smkw0js5v7ig8"; depends=[BB crayon dfoptim FKF forecast GA ggplot2 lubridate nloptr pracma pso Rsolnp signal tswge zoo]; }; + 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]; }; garray = derive2 { name="garray"; version="1.1.2"; sha256="0s2dgi556x9jnhafvzz4qkxdbq9dm12gsvsqd2g9iy3468fx9flq"; depends=[]; }; - gaselect = derive2 { name="gaselect"; version="1.0.9"; sha256="089gyllcmq5rgf5yffclifc7rc8rmq4wk1dhznigxkij4zap67hx"; depends=[Rcpp RcppArmadillo]; }; + gaselect = derive2 { name="gaselect"; version="1.0.10"; sha256="14gz6429hap8gj7is0p9qigdzn1zzyqh1dykrpk4wvhqbid8ir73"; depends=[Rcpp RcppArmadillo]; }; gasfluxes = derive2 { name="gasfluxes"; version="0.4-4"; sha256="0gi0zk0h5rw75n6znada0cwa9qzy8higsiiqwgdm3q827j1x8iva"; depends=[AICcmodavg data_table MASS sfsmisc]; }; gasper = derive2 { name="gasper"; version="1.1.1"; sha256="10kl5d8lm2jvqrfk0qliyb3afmk9bhjm5zvs4g31zpa3icbz9r2p"; depends=[ggplot2 Matrix Rcpp RcppArmadillo RSpectra]; }; gastempt = derive2 { name="gastempt"; version="0.5.4"; sha256="02b35y0sq0piq5p8k5fviymqyqx1c2k793pm7j79xymmpzf8f52r"; depends=[assertthat BH dplyr ggplot2 nlme Rcpp RcppEigen RcppParallel rstan shiny StanHeaders stringr tibble utf8]; }; gaston = derive2 { name="gaston"; version="1.5.7"; sha256="14z94dpln4dvgrv2w7w9ik7h6rpvbf02qhq1hqzx8c2cndzxr21i"; depends=[Rcpp RcppEigen RcppParallel]; }; - gateR = derive2 { name="gateR"; version="0.1.9"; sha256="18q3bqjjzvrp20mdksps0ddjdz4i8crh26iirradiss4xphk0gm3"; depends=[fields lifecycle raster rlang sparr SpatialPack spatstat spatstat_core spatstat_geom spatstat_linnet tibble]; }; + gateR = derive2 { name="gateR"; version="0.1.10"; sha256="06qzjvd0na5s6pc11lmr45m8ixnsk57in00ca7vivpa182zvdp6p"; depends=[fields lifecycle raster rlang sparr SpatialPack spatstat_geom tibble]; }; gatepoints = derive2 { name="gatepoints"; version="0.1.4"; sha256="0gwyrkxn4xd79cl60xa312k6nz17mdjdiym65dq7s2384fa80wbm"; depends=[]; }; gauseR = derive2 { name="gauseR"; version="1.1"; sha256="0jlbaylglyza6hlf62g3z0n349zlzlhx6g4jwdzg8b2sh4c3c9yn"; depends=[deSolve]; }; gaussDiff = derive2 { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; }; - gausscov = derive2 { name="gausscov"; version="0.1.3"; sha256="0lnma7pr3sp99an8d340qxxzpzrrww71mfid0y300sadjvymi9mx"; depends=[]; }; + gausscov = derive2 { name="gausscov"; version="0.1.5"; sha256="0628bwazanqp8zkci93nyaa7hqwdwwlbcq4mwmkgf6xkbqmi00z8"; 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-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[orthopolynom polynom]; }; @@ -9718,7 +9844,7 @@ in with self; { gbm = derive2 { name="gbm"; version="2.1.8"; sha256="1h9f4ww9yc3nsvghgr2q7jjrlz29ibabxjbax1sk5wmqh2wy6pbx"; depends=[lattice survival]; }; gbm_auto = derive2 { name="gbm.auto"; version="1.5.0"; sha256="03fn5kr7pl1wzmmw6k86v2yv0a3l6pwyggvvdxsqnamd29jm5h54"; depends=[beepr dismo gbm mapplots maptools raster rgdal rgeos sf shapefiles]; }; gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; }; - gbmt = derive2 { name="gbmt"; version="0.1.2"; sha256="1jk04wjykxb89b9m7ppyl6hp4z00f4vbmsrhisvzz184bwghigdf"; depends=[Matrix]; }; + 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]; }; gbs2ploidy = derive2 { name="gbs2ploidy"; version="1.0"; sha256="0gdjfqs9ccyaw7vi22wbyc742n1badr5ypr08g6rvi8ka5lmx836"; depends=[MASS rjags]; }; gbts = derive2 { name="gbts"; version="1.2.0"; sha256="1v8x4dnja8va28rjznyqa6js9wazndijasb95lfj2qwhxhgf5h65"; depends=[doParallel doRNG earth foreach gbm]; }; @@ -9736,7 +9862,7 @@ in with self; { gcookbook = derive2 { name="gcookbook"; version="2.0"; sha256="11g1q187l4j31b6cdzdx5z3s14z3s09l7ynl36pzzn9j19l8cmrc"; depends=[]; }; gdalUtilities = derive2 { name="gdalUtilities"; version="1.2.0"; sha256="0nxnw9azlml13a6rqhxjrwq8v7fb2pjcb07dp5r2p5bzyzvldm7a"; depends=[sf]; }; gdalUtils = derive2 { name="gdalUtils"; version="2.0.3.2"; sha256="0krapdy50nd5dvcdflz39dzxpig3zklng3hgxavqg2nvwazalvsc"; depends=[foreach R_utils raster rgdal sp]; }; - gdalcubes = derive2 { name="gdalcubes"; version="0.5.1"; sha256="15d17if1513pylqbnv2yqy3i9p6m7x8frw5kjqx1jil9xck55iil"; depends=[jsonlite ncdf4 Rcpp RcppProgress]; }; + gdalcubes = derive2 { name="gdalcubes"; version="0.6.0"; sha256="05hgnplbps3kk7p19mf7j0a3dlf7061yxi2sq9p9ydaywav0z4ji"; depends=[jsonlite ncdf4 Rcpp]; }; gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; }; gde = derive2 { name="gde"; version="0.2.0"; sha256="1xrncdmidzz9dv51bnbcrdh92im0lr97xi4rgb30p5sfxc4axml9"; depends=[data_table dplyr DT ggplot2 httr jsonlite leaflet progress R_utils readr RSQLite shiny shinycssloaders shinyWidgets stringr XML]; }; gdiff = derive2 { name="gdiff"; version="0.2-2"; sha256="0hg9mf3qyg19wwpiv3lz2z1000jw73s2pwb8y8hjgpv69wwsskfi"; depends=[magick pdftools]; }; @@ -9745,15 +9871,16 @@ in with self; { gdns = derive2 { name="gdns"; version="0.5.0"; sha256="1bicimkxsyfg9yqaikapwlv8x9xdvsb00fqnfka07i6b63109sxh"; depends=[httr jsonlite magrittr stringi tinytest]; }; gdpc = derive2 { name="gdpc"; version="1.1.2"; sha256="0g1mnxm78n928g7qjf0w7jzfm27z6mvz5p1rm25mxv7wsif5m6s6"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; }; gds = derive2 { name="gds"; version="0.1.1"; sha256="0gwq0k80rnbg4ibz6dz8sk6hqaklrdbv4vzv8zyk74am3aqipn20"; depends=[]; }; - gdtools = derive2 { name="gdtools"; version="0.2.3"; sha256="1p3ip0qwpg8f63jfx0b8vbac6l20ddid8xvxzkfi6i858pybnawp"; depends=[Rcpp systemfonts]; }; + gdtools = derive2 { name="gdtools"; version="0.2.4"; sha256="0a1hqg5b484ji4g9dy0zi06wn9w7pk6hiy5ljzc1zgj9mbhlr21j"; depends=[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]; }; geckor = derive2 { name="geckor"; version="0.2.0"; sha256="06infn0icgsa10szsc8bqams57swx6a4ch3a1n2a68rp8q2f6lw2"; depends=[curl dplyr httr jsonlite knitr lifecycle magrittr rlang tibble tidyr tidyselect]; }; - gee = derive2 { name="gee"; version="4.13-20"; sha256="167pzgnmj4cjc41ykps1mfwi6s7y32zxyycn5z17vn4v0pp4q0ak"; depends=[]; }; + gee = derive2 { name="gee"; version="4.13-22"; sha256="1wbwn7bjqz09l6clh43dy3x5qgv9b9wwn7xnfw9fkkrhn6rvc3rw"; depends=[]; }; geeCRT = derive2 { name="geeCRT"; version="0.1.1"; sha256="1dwll5k99mj1a6nakxzihk87dvnqfsymly7kn1b8wkrfpljhrj4v"; 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]; }; - geepack = derive2 { name="geepack"; version="1.3-2"; sha256="19kh0rvc961y836rfjmh1j42ygji2vp6yghl5d1agzg5yx03xdcr"; depends=[broom magrittr MASS]; }; + geepack = derive2 { name="geepack"; version="1.3.3"; sha256="1n2wb72h76mifzzyif4znqdm1rb682g0b11xlbxj9mk648yfzd81"; depends=[broom magrittr MASS]; }; geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; }; geex = derive2 { name="geex"; version="1.0.12"; sha256="0zqfd416wl6inr423xzxrnc0as0yrxfqy7fdjyc39i60kghfqyh3"; depends=[lme4 Matrix numDeriv rootSolve]; }; geigen = derive2 { name="geigen"; version="2.3"; sha256="0blg4w9wjprbax8z6md3285v12ajcjmcrpca52l3kd5qmxlvizy7"; depends=[]; }; @@ -9781,18 +9908,18 @@ in with self; { geneExpressionFromGEO = derive2 { name="geneExpressionFromGEO"; version="0.9"; sha256="15dvx2f4nsmw1mgjfpcdcfnx8335fd043xb4hdnqcbjzf9h228bp"; depends=[annotate Biobase BiocManager GEOquery markdown R_utils xml2]; }; geneHummus = derive2 { name="geneHummus"; version="1.0.11"; sha256="1m6yyjsvmn3w87cw4da8js5vi74k5y739gxdx1yscx1n50bc3m34"; depends=[curl dplyr httr rentrez stringr]; }; geneListPie = derive2 { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; }; - geneNetBP = derive2 { name="geneNetBP"; version="2.0.1"; sha256="0sp1chyln5k2zsq7cdhvrqxwr2nhrll1pdl1l5g6fd4gjl2m1nwk"; depends=[bnlearn ggm gRain graph igraph Rgraphviz scales]; }; geneSignatureFinder = derive2 { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; }; + genekitr = derive2 { name="genekitr"; version="0.5.3"; sha256="1znbxgfhq652gxl75if0gzk1n7bclacazwjh5vn97cmm78kkm20k"; depends=[clusterProfiler dplyr ggplot2 rlang stringi stringr tibble tidyr VennDiagram]; }; genemodel = derive2 { name="genemodel"; version="1.1.0"; sha256="1x6n6k9ifv2swhyrghvm6fsz5vh85cdik8225175i9msvmkh928n"; depends=[stringr]; }; genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; }; genepop = derive2 { name="genepop"; version="1.1.7"; sha256="0b36nspq3kkad52k0viw1pdsf7h9h5ivi0ix7zg8i0z7vkhnm0cy"; depends=[Rcpp RcppProgress stringr]; }; generalCorr = derive2 { name="generalCorr"; version="1.2.2"; sha256="1ncr3s5mpd8f2a1ijzmns380fj05xicnjmwlgfzabnrmhzh2pxcd"; 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.1"; sha256="04hrn6g5m5vi3znrcha3jw2q16lnmm3ygx2jl5aqiahg3azqwix2"; depends=[]; }; + generics = derive2 { name="generics"; version="0.1.2"; sha256="162q9hdsnfcwjj255ahbi6v9vnyynvda7gb75p721y28j5xb7sk3"; depends=[]; }; genero = derive2 { name="genero"; version="0.1.0"; sha256="0akwwy5xbh7s40v8dr1zr7jfglv0iyh4zn0sb0rnz4r57qr6nh8w"; depends=[]; }; genesysr = derive2 { name="genesysr"; version="1.0.0"; sha256="05jp8z7313r5wi9a5yw7fh198l7nd2ywzwg4f23yp4kfrkkgawn5"; depends=[dplyr httr jsonlite]; }; - geneticae = derive2 { name="geneticae"; version="0.2.0"; sha256="1rjl5jwx1a0kkbv0bncyhj7d4r8i70wbvf8czf2hl17q3iwfdwyd"; depends=[bcv calibrate dplyr GGEBiplots ggforce ggplot2 MASS matrixStats missMDA pcaMethods prettydoc reshape2 rrcov scales tidyr]; }; + geneticae = derive2 { name="geneticae"; version="0.3.0"; sha256="1f3ixsmpn87cjrbmwrlzqjxf29vxym6xq8dkgl40zzr7hp628an7"; depends=[bcv calibrate dplyr GGEBiplots ggforce ggplot2 MASS matrixStats missMDA pcaMethods prettydoc reshape2 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]; }; genieclust = derive2 { name="genieclust"; version="1.0.0"; sha256="1gbbblr5yv686llych5cj9jc8vc57y53qknzld5z51za9aw6azn3"; depends=[Rcpp]; }; @@ -9801,7 +9928,7 @@ in with self; { geniusr = derive2 { name="geniusr"; version="1.2.0"; sha256="04h0a61ngs0cmjf23imx76bm82dzkp4q4j31h3xlic05dx2lvyan"; depends=[curl dplyr httr purrr rvest stringr tibble xml2]; }; genlasso = derive2 { name="genlasso"; version="1.5"; sha256="07f0gqvngiyd3x01qxbqz7xrz10ck1cbypp51ldg8lg8ln1zw76y"; depends=[igraph Matrix]; }; genlogis = derive2 { name="genlogis"; version="1.0.0"; sha256="01av5invhviii7adqihh10ib47rjzwfsqdgw3lfg1c72kzrqywgr"; depends=[distr doParallel foreach ggplot2 manipulate]; }; - geno2proteo = derive2 { name="geno2proteo"; version="0.0.3"; sha256="1q054ai42f5gmrj791abj02f663zs7ymdh3pfs3b2lq6i4w9s2fb"; depends=[BiocGenerics GenomicRanges IRanges R_utils RUnit S4Vectors]; }; + geno2proteo = derive2 { name="geno2proteo"; version="0.0.5"; sha256="0aaxjgl037xmxdni03vrmlk444bpmw0c170ai8ijiyhy3j6xi8hk"; depends=[BiocGenerics GenomicRanges IRanges R_utils RUnit S4Vectors]; }; genoPlotR = derive2 { name="genoPlotR"; version="0.8.11"; sha256="01qn81nsdk3s150gqwisb7xnm4hq5sfzd2zrzpn9kj0rigzgf9zi"; depends=[ade4]; }; genodds = derive2 { name="genodds"; version="1.1.0"; sha256="1qsl134grmpk3yvgg106kawrx7g423jqlqgg9r2r46ry31i3hvhv"; 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]; }; @@ -9824,7 +9951,6 @@ in with self; { geoR = derive2 { name="geoR"; version="1.8-1"; sha256="1lvgkpvv4a05lsb1dgphpv733lxbpcj7p2bj1yjjbfch8n04f1lr"; depends=[MASS RandomFields sp splancs]; }; geoSAE = derive2 { name="geoSAE"; version="0.1.0"; sha256="16fkai95cqwxkylpk1gddyzja80036ghfb4ps3rz1vbbqzhg01x8"; depends=[MASS nlme]; }; geoTS = derive2 { name="geoTS"; version="0.1.3"; sha256="12v50r2ym3nb21sskq7h4xsk6nzci06l9iync2ny91iwl7c9nrjc"; depends=[doParallel ff foreach iterators raster sp]; }; - geobr = derive2 { name="geobr"; version="1.6.5"; sha256="08kl0215q524dq5scx2cm11a7m65xh0wzryl71grrlbqm5000pjj"; 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.2.0"; sha256="1m1wvhrqpr0sav0v3qpj8kymdr52gfcjv18hshd4kaj309qpq8yl"; depends=[dplyr fclust fmsb future_apply ggplot2 leaflet matrixStats plotly progressr raster Rcpp RcppArmadillo Rdpack reldist reshape2 rgdal rgeos shiny sp spdep]; }; geodaData = derive2 { name="geodaData"; version="0.1.0"; sha256="003m5wff0q4fdlg64qispmhj2aw83isxg3ijxwkwhvi33bpwpq4z"; depends=[]; }; @@ -9838,26 +9964,27 @@ in with self; { 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.5"; sha256="06d0nr42gdb5lm3kcrx2jacdpl26m1wrqsvc85w87ff7rxgp145s"; depends=[curl dplyr httpcache httr purrr rlang sf xml2 yaml]; }; + geofi = derive2 { name="geofi"; version="1.0.6"; sha256="1pqaf6wx0iicwjalm00gq83nrq1bzzbj7qawjs8xsb3wz7406wgf"; 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.1"; sha256="0ks6ga1vsp5z7sy0xcq9nacffmfsx6yqdlnhqflsb8zb9qbygazf"; depends=[]; }; geojson = derive2 { name="geojson"; version="0.3.4"; sha256="0fvlw06hjb7z0mfsf8vhv1dchdjlvklyzjqlaydjzbwb1kvbhpq7"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; }; geojsonR = derive2 { name="geojsonR"; version="1.1.0"; sha256="0yqmz5snl5mpkbp2m5nddvqy7y72kcpgzy3d5b55l4sfzh7wfg4d"; depends=[R6 Rcpp RcppArmadillo]; }; geojsonio = derive2 { name="geojsonio"; version="0.9.4"; sha256="13lzc5hcs84gs1qnyi7lvy3yq1jz68jibmnww04lb91920msdxjv"; depends=[crul geojson geojsonsf jqr jsonlite magrittr maptools readr rgeos sf sp V8]; }; geojsonlint = derive2 { name="geojsonlint"; version="0.4.0"; sha256="0l6xlf6l9shyvdd2ghkhcgbkxpmycapfpxakzbvd92j1x8dmr9az"; depends=[crul jsonlite jsonvalidate V8]; }; - geojsonsf = derive2 { name="geojsonsf"; version="2.0.1"; sha256="1gxzi0wqmrif6bkw7z21aa2j8i0bd7a5nyyrkjiybv7v7d1l1ps2"; depends=[geometries jsonify rapidjsonr Rcpp sfheaders]; }; + geojsonsf = derive2 { name="geojsonsf"; version="2.0.2"; sha256="1fj8jazpyjx1qygyasbw58mgl91ahqjdrk8cj9y861c709szs4vd"; depends=[geometries jsonify rapidjsonr Rcpp sfheaders]; }; geoknife = derive2 { name="geoknife"; version="1.6.6"; sha256="0g4aia9v9f76njpjnd0silx7mqapycp2w5akyipwdag9gyizps61"; depends=[curl httr progress sp whisker xml2]; }; - geomander = derive2 { name="geomander"; version="2.0.2"; sha256="1kpqsv21avw07bxd77galmwv2a8pkkvva8mzx42k3qg6c9qfaj6k"; depends=[censable cli dataverse dplyr geos ggplot2 magrittr Rcpp readr sf stringr tibble tidyr tigris]; }; + geomander = derive2 { name="geomander"; version="2.0.3"; sha256="05qbq6a4cdnaazh0bwi5l523lm8y1ax5zf32pyl34rlqv70450sd"; depends=[censable cli dataverse dplyr geos ggplot2 magrittr Rcpp readr sf stringr tibble tidyr tigris]; }; geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; }; geomedb = derive2 { name="geomedb"; version="2.0.1"; sha256="1l35c9x1mhqd7z5ragd7w3ay8v2fdnbmbfx9grwi622j8yz1fbmq"; depends=[ape httr jsonlite]; }; geomerge = derive2 { name="geomerge"; version="0.3.2"; sha256="1i6n88k8icwihr9w7ipjb50f68zad602dipb3hd887y4kyf14wni"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; }; - geometa = derive2 { name="geometa"; version="0.6-5"; sha256="0iyn0zjb73i5cpj0xzhpxd90g72mqzrz09cdcklilpdhsbl32x9a"; depends=[httr jsonlite R6 XML]; }; + geometa = derive2 { name="geometa"; version="0.6-6"; sha256="08029c5gk0rjv1kxqrcw2s6ggh2ql465a92amr474i8cnlgaaqqx"; depends=[httr jsonlite keyring R6 XML]; }; geometr = derive2 { name="geometr"; version="0.2.10"; sha256="00yhw6k9wj3q0mmhwrjvhybsz5fcx86ms5n1q2l492jljplp46cr"; depends=[checkmate crayon deldir dplyr purrr raster Rcpp rgdal rlang sf sp tibble]; }; geometries = derive2 { name="geometries"; version="0.2.0"; sha256="05036q4dccmmd955g4n2s5ncc9zxd9v9qyamszszwn147i7hkxcc"; depends=[Rcpp]; }; geometry = derive2 { name="geometry"; version="0.4.5"; sha256="1n10l8ax3783v3lgaacb15qsn8b3f0wpmhg3k39j31s6ciyd3vcg"; depends=[linprog lpSolve magic Rcpp RcppProgress]; }; - geomorph = derive2 { name="geomorph"; version="4.0.1"; sha256="05qiqyrc0vn1hi8g4hfs6hcysar3yqkw9r6hr3fg5f6qdnlznm4x"; depends=[ape ggplot2 jpeg Matrix rgl RRPP]; }; + geomorph = derive2 { name="geomorph"; version="4.0.3"; sha256="0qz2hiqpn8sxd5kqvmvr1fx2vl8h70jj4jxcmbjg31gfybnppmwg"; depends=[ape ggplot2 jpeg Matrix rgl RRPP]; }; + geomtextpath = derive2 { name="geomtextpath"; version="0.1.0"; sha256="19hxqwzz3vli7f5631njz142ca01b4zfs72g4wwpswm5vkpkizdx"; depends=[ggplot2 rlang scales systemfonts textshaping]; }; geonames = derive2 { name="geonames"; version="0.999"; sha256="0yz1b7y3vwa4izrhpry4n3iwzb7y67s5p3kgnd7d29cl5pcbpmqx"; depends=[rjson]; }; - geonapi = derive2 { name="geonapi"; version="0.5"; sha256="10pj56bwwd8bfwwfyvijdk4xr0pgbz4sdkis3d6zr56lay91x7fv"; depends=[geometa httr keyring openssl R6 XML]; }; + geonapi = derive2 { name="geonapi"; version="0.5-3"; sha256="0kmqax0wvhdw0rhrj5091wlhcsdfala6grspdss9s4q857xacx85"; depends=[geometa httr keyring openssl R6 XML]; }; geonet = derive2 { name="geonet"; version="0.6.0"; sha256="0zav0r4q8i8mxwnr3a7j2ldprfb979pmcx76ssks4p6cfqp0syj4"; depends=[dplyr ggplot2 igraph Matrix mgcv spatstat_core spatstat_geom spatstat_linnet]; }; geonetwork = derive2 { name="geonetwork"; version="0.4.1"; sha256="04vf39hxl1a2kbgqc054xg9w6hbd3fwag6sy0j8a9agrd5wgks7h"; depends=[geosphere igraph rgdal sf sp]; }; geophys = derive2 { name="geophys"; version="1.4-1"; sha256="1s64sbr0chv0z2vaw059khfkv8iga1kr6428kkglgafq5x2d6h3q"; depends=[cluster GEOmap RFOC RPMG RSEIS]; }; @@ -9870,7 +9997,8 @@ in with self; { geosphere = derive2 { name="geosphere"; version="1.5-14"; sha256="0bg4vfmrw140j2ax0p6bflvb77w03ir39wa87l96rj473jpa9hzj"; depends=[sp]; }; geospt = derive2 { name="geospt"; version="1.0-2"; sha256="1814nn0naxvbn0bqfndpmizjbqcs6rm87g2s378axkn6qpii4bh8"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; }; geosptdb = derive2 { name="geosptdb"; version="0.5-0"; sha256="0m0dlazhq2za71mi3q8mz2zvz7yrmda7lha02kh9n820bx89v33z"; depends=[FD fields geospt gsl limSolve minqa sp StatMatch]; }; - geostats = derive2 { name="geostats"; version="1.3"; sha256="1k999b8dgwvajialsbijscndvbbm4hvvdlmycn8xwbbiqdz074ms"; depends=[]; }; + geostan = derive2 { name="geostan"; version="0.2.1"; sha256="136y4d5wk0pcsbi0av6k3knjqdw665cb9hv892gdslclqlkni0r4"; depends=[BH ggplot2 gridExtra MASS Matrix Rcpp RcppEigen RcppParallel rstan rstantools sf signs spdep StanHeaders truncnorm]; }; + geostats = derive2 { name="geostats"; version="1.4"; sha256="0knxv0jnrpijc6wg46qrrrsjikd37dgrkdp8l2kva18zl4cgh922"; depends=[]; }; geotech = derive2 { name="geotech"; version="1.0"; sha256="18s7w6h1svc4n1hcgj5njfkf3nflkc53cdwsq5112p3442rlz33f"; depends=[]; }; geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; }; geotoolsR = derive2 { name="geotoolsR"; version="1.1"; sha256="162s37j7wh14h91b6acn453bvgpk3cakfi7mgrdvr5bjdqqn7j7v"; depends=[dplyr geoR ggplot2 tidyr]; }; @@ -9886,14 +10014,14 @@ in with self; { gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; }; gesisdata = derive2 { name="gesisdata"; version="0.1.0"; sha256="02xjpw41gm3778lj01kcwjx0lr1i95a0wlrfvs0r5xlajq13jr67"; depends=[dplyr magrittr rio RSelenium stringr]; }; gesso = derive2 { name="gesso"; version="1.0.2"; sha256="0i7a927mbll8mlisxb0ic62fvq1wp5v0m69n7zkhcjabkxr7gbn3"; depends=[BH bigmemory dplyr Matrix Rcpp RcppEigen RcppThread]; }; - gestalt = derive2 { name="gestalt"; version="0.1.8"; sha256="1cb04rd3yvkd47byynrn0pq6brlsi2z2iavh4gfrwmqyvks34k51"; depends=[rlang]; }; + gestalt = derive2 { name="gestalt"; version="0.1.9"; sha256="1sqaf9m32r71icbsp26jx95p89nzfw4iapl68priqqjy4jqqaxpm"; depends=[rlang]; }; gestate = derive2 { name="gestate"; version="1.5.0"; sha256="028ij0yyqrwaf5c1a7qkgl0r0m9n98vn182brx923mfxr9gji6pn"; depends=[doParallel foreach shiny shinythemes survival]; }; gesttools = derive2 { name="gesttools"; version="1.3.0"; sha256="1lrjr60vrl0j31hb12i8c78k5554vwpgj8pzzrhbdhmb6y0972fx"; depends=[DataCombine geeM magrittr nnet rsample testthat tibble tidyr tidyselect]; }; getDTeval = derive2 { name="getDTeval"; version="0.0.2"; sha256="16y24jhy9k1adlmf6yqzc8kla2vw7r0c6zd52jpfkiljxwkm4634"; depends=[data_table formulaic microbenchmark]; }; getLattes = derive2 { name="getLattes"; version="0.2.0"; sha256="1rrd9x9jmnsy0770c86lqws4a6b2zxf3384h1dcvzrmlk20hhqxw"; depends=[dplyr janitor pipeR purrr rlang tibble xml2]; }; getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; }; getPass = derive2 { name="getPass"; version="0.2-2"; sha256="03ydafhh0sk3rcnpr3paajyji64x2ddp6p814p9mvbmyrblcgzcc"; depends=[rstudioapi]; }; - getProxy = derive2 { name="getProxy"; version="1.12"; sha256="0qcxihgwy3h2b98z2hwjszwqbz117d89xjys7fy0f8m9hv7rf6ph"; depends=[bitops data_table dplyr httr jsonlite RCurl]; }; + getProxy = derive2 { name="getProxy"; version="1.13"; sha256="0n8ja0i1v0cd2piqyx4hfc4qw18d535j3ffpz164c3r8cmppnqzd"; depends=[cli httr]; }; getable = derive2 { name="getable"; version="1.0.3"; sha256="0v45nqpx55vbj68gj4wxr0bdlrl897ayac78rxjd2lkkjx49hlyh"; depends=[knitr]; }; gethr = derive2 { name="gethr"; version="0.1.0"; sha256="0kpi9b9yg2nh332zkml24pmj6vgjfh8mrfjjg5a636s2rg98g5g7"; depends=[httr jsonlite]; }; getip = derive2 { name="getip"; version="0.1-0"; sha256="0l7692ddgidy3jyg7mw5nnh0agkyj7pf8v8clcinzs2y3q5qic6f"; depends=[]; }; @@ -9905,9 +10033,9 @@ in with self; { gettz = derive2 { name="gettz"; version="0.0.4"; sha256="1j83pdny3phfflkdjwiflyfvighn73pysw5bac4hx079dda8k25g"; depends=[]; }; gexp = derive2 { name="gexp"; version="1.0-1"; sha256="1i3sarsawax1landjbm8gxrcrimwzdgrbybzipqwxdrmlgvxslqk"; 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.0"; sha256="07rdgf2i908ihqzq0gjp414gwvikbxfyj6j4nvz8l4krs32avl87"; depends=[mboost mvtnorm pcaPP]; }; + 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]; }; - gfer = derive2 { name="gfer"; version="0.1.11"; sha256="08lchdynxv5pxbvk9jqblc515c9fx64mmprvpwwgznczyvhm89j8"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; }; + 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]; }; gfilmm = derive2 { name="gfilmm"; version="2.0.4"; sha256="16lcjknamq4zm9aqj36ag1ykg635syl54amfxp04xhanqas505bf"; depends=[forcats lazyeval Matrix Rcpp RcppEigen rgr spatstat spatstat_geom]; }; @@ -9919,15 +10047,18 @@ in with self; { ggBubbles = derive2 { name="ggBubbles"; version="0.1.4"; sha256="116rl8j0s9xwhh9jl5yj9fspkhv2zrirbx9247hhns9ngrdn4i3x"; depends=[dplyr ggplot2]; }; ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; }; ggDCA = derive2 { name="ggDCA"; version="1.1"; sha256="0jpg7n6nk2jgq668ff0l9zk26zk39abc74f6w5x8gf4zsb8y0zp9"; depends=[base_rms do ggplot2 rms set survival]; }; + ggDoubleHeat = derive2 { name="ggDoubleHeat"; version="0.1.0"; sha256="106n2r6l4grg0g8w8z5nb4fw33sh62nyssbqmkq1w82xs73529i4"; depends=[ggnewscale ggplot2 rlang]; }; + ggESDA = derive2 { name="ggESDA"; version="0.1.0"; sha256="0j2ix9abzsxdmjklg44ajz69hlhpg9a31rjqrwymrlkdgdswpzvk"; depends=[dplyr ggforce ggplot2 ggpubr ggthemes gridExtra gtools magrittr prodlim R6 rlang RSDA stringr tibble tidyr tidyverse]; }; ggExtra = derive2 { name="ggExtra"; version="0.9"; sha256="18mbi6gblqmrsciad1d2c9ngllk6mayaqj43k40hjq9ydqnvjbgj"; depends=[colourpicker ggplot2 gtable miniUI R6 scales shiny shinyjs]; }; ggHoriPlot = derive2 { name="ggHoriPlot"; version="1.0.0"; sha256="198l1jzs2wybg8ixq8aacrs3b7g2hpxbi7gajr2z5hyiv7317lrq"; depends=[dplyr ggplot2 glue magrittr stringr tidyr]; }; - ggPMX = derive2 { name="ggPMX"; version="1.2.4"; sha256="1jf1yn4l3mp79njqsjx2axzc26nxbi07m9pk1zwnyf0im3j65k0h"; depends=[assertthat checkmate data_table dplyr GGally ggplot2 gtable knitr magrittr purrr R6 readr rlang rmarkdown scales stringr tibble tidyr yaml zoo]; }; + ggOceanMaps = derive2 { name="ggOceanMaps"; version="1.2.6"; sha256="1ac3n5fw00w2ganfbzgpinwpzp51qqdw8hv691qmivwxxgkzj2zp"; depends=[dplyr ggplot2 ggspatial raster rgeos sf smoothr sp stars units]; }; + ggPMX = derive2 { name="ggPMX"; version="1.2.6"; sha256="191i2pa41441bdqb3j1hykvh0fqawrsydnpqbzx8z6f71461dzsw"; depends=[assertthat checkmate data_table dplyr GGally ggplot2 gtable knitr magrittr purrr R6 readr rlang rmarkdown scales stringr tibble 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]; }; ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; }; - ggRandomForests = derive2 { name="ggRandomForests"; version="2.0.1"; sha256="0f8m0j79d8wbac14zk1s8812rz6vgf04bz1iqq8p4d3sxwnvaj7q"; depends=[ggplot2 randomForest randomForestSRC survival tidyr]; }; ggResidpanel = derive2 { name="ggResidpanel"; version="0.3.0"; sha256="1vsjw229pd36100ix1sgfmk5lb9b0fx3l6pxg1irsfhm2ypbg1ig"; depends=[cowplot ggplot2 MASS plotly qqplotr stringr]; }; 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.0"; sha256="1mjs488npnxd53nsw936iw2vzv7z38h8d02pm4lwrz4i83jg3www"; depends=[dplyr ggplot2 magrittr plotly purrr RVenn sf stringr tibble]; }; ggalignment = derive2 { name="ggalignment"; version="1.0.0"; sha256="07f1l7pav36i2z75bvwcwkamw5i36fh5klh5djglxnq1a3v8jm79"; depends=[dplyr ggimage ggplot2 magrittr rlang]; }; ggallin = derive2 { name="ggallin"; version="0.1.1"; sha256="0hrxa7m07ppvnndivxcgxksdyblb6fw17aw46maqavlvcrz3fjgm"; depends=[ggplot2 scales]; }; @@ -9935,12 +10066,14 @@ in with self; { ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; }; ggamma = derive2 { name="ggamma"; version="1.0.1"; sha256="1zc4p2bz4pxqycrzgb9wwl53lxqcikxsihna6ff8pmw1n623j85z"; depends=[]; }; gganimate = derive2 { name="gganimate"; version="1.0.7"; sha256="046v6j92xxgaghsnh88dy5h8x040qsfa8csvhp4dmsfmrrf0dz0f"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; }; + ggarchery = derive2 { name="ggarchery"; version="0.2.0"; sha256="1w9dfjvhxrf8alf155jjjhk5380pk1n3asmqayg0rggsq98bj0jh"; depends=[ggplot2 glue purrr rlang tidyverse]; }; ggasym = derive2 { name="ggasym"; version="0.1.6"; sha256="1vgsqq2m4w5clmf27mmj6jqn2s8m1izz3gj2bxqpmdcvzf5vxkgr"; depends=[dplyr ggplot2 magrittr purrr rlang scales stringr tibble tidyr]; }; ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.6.0"; sha256="0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"; depends=[beeswarm ggplot2 vipor]; }; ggborderline = derive2 { name="ggborderline"; version="0.1.0"; sha256="02m7g0fmayp0zscj3x167n96cj6kn62a8nw67d42k6p74bard2sy"; depends=[ggplot2 scales]; }; - ggbreak = derive2 { name="ggbreak"; version="0.0.7"; sha256="14cs0fni67gidkkaflqvckgqbi4hjwxpzwyv6p8h2dxy8n5m6x92"; depends=[aplot ggfun ggplot2 ggplotify rlang]; }; + ggbreak = derive2 { name="ggbreak"; version="0.0.9"; sha256="1m93dwdhbibvmhzdk06z9kxdsv435rrs3g2m6lji5pajmf6qf72s"; depends=[aplot ggfun ggplot2 ggplotify rlang]; }; ggbuildr = derive2 { name="ggbuildr"; version="0.1.0"; sha256="0pld635v6fv46ky7s4icwxlcnr7z6bp5ikf20adpkljwhy0wwxak"; depends=[ggplot2 purrr readr]; }; ggbump = derive2 { name="ggbump"; version="0.1.0"; sha256="15cnzv2q3gylkmd1zj044cp14ldnkc4fzwmxaqpc8cagwf9i10zk"; depends=[dplyr ggplot2 purrr tidyr]; }; + 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]; }; ggconf = derive2 { name="ggconf"; version="0.1.3"; sha256="0g4xasqhdiqfqahakv6p5npl56f2iakx4bnc9v9zcjr077kdda4n"; depends=[ggplot2 rly]; }; @@ -9948,8 +10081,9 @@ in with self; { ggdag = derive2 { name="ggdag"; version="0.2.4"; sha256="18085dxp9fv1l192mgadwlsa114fj370pd8r98q3g5pd1ppw8bip"; depends=[dagitty dplyr forcats ggplot2 ggraph ggrepel igraph magrittr pillar purrr stringr tibble tidygraph]; }; ggdark = derive2 { name="ggdark"; version="0.2.1"; sha256="1w93g2j4g45x9s841v9zi18lxzda81ipa13fajqc6p9xk8frvgrf"; depends=[ggplot2]; }; ggdemetra = derive2 { name="ggdemetra"; version="0.2.2"; sha256="1j0nwmv2acyrkpn230jj6yf5nnl40kpqdqaglrnrfqw5rp357krp"; depends=[ggplot2 ggrepel gridExtra RJDemetra]; }; - ggdendro = derive2 { name="ggdendro"; version="0.1.22"; sha256="0skbj487b6f6pj2iz4yq2b9gbgb39cv5dyzhdl3w7ay1k0s5z9ph"; depends=[ggplot2 MASS]; }; - ggdist = derive2 { name="ggdist"; version="3.0.1"; sha256="0g8b3ipj0yk9ckf0f1d7lxhaw2x5rscga74mbi0hkfygsks1iafa"; depends=[distributional dplyr ggplot2 HDInterval rlang scales tibble tidyselect vctrs withr]; }; + ggdendro = derive2 { name="ggdendro"; version="0.1.23"; sha256="1f4fz9llmbpb8gh90aid7dvriadx16xdhsl7832yw4pyqj4fjcrs"; depends=[ggplot2 MASS]; }; + ggdensity = derive2 { name="ggdensity"; version="0.0.1"; sha256="0jvybcxcrdr05ca9s9l7941zklr5dpvx5rg789591dvdllfz0dbm"; depends=[ggplot2 isoband MASS scales]; }; + ggdist = derive2 { name="ggdist"; version="3.1.1"; sha256="177dnaz3gzs8mw95dwcssf87va5cyjm1g4ds3b6mwmz88ywq4a6r"; depends=[distributional dplyr ggplot2 glue HDInterval numDeriv 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]; }; ggeasy = derive2 { name="ggeasy"; version="0.1.3"; sha256="0zp9jhm8vc1gpja5s6g92snd1jnskadafc226l51y8cps7lj8f6q"; depends=[ggplot2 rlang]; }; @@ -9964,16 +10098,17 @@ in with self; { ggforce = derive2 { name="ggforce"; version="0.3.3"; sha256="0bwzjbjl678xvc2ihm80dwn9pidwafqjdab3k299csys16s3na1a"; depends=[ggplot2 gtable MASS polyclip Rcpp RcppEigen rlang scales tidyselect tweenr withr]; }; ggformula = derive2 { name="ggformula"; version="0.10.1"; sha256="1ph5jd8svk8hmshi894vmmpq3zwgdmf4yn3gmdlkad68z8jynhsp"; depends=[ggforce ggplot2 ggridges ggstance labelled magrittr mosaicCore rlang scales stringr tibble]; }; ggfortify = derive2 { name="ggfortify"; version="0.4.14"; sha256="038m74azpy43869ax1yi6wxbl1kr59iaxl8raiikjg749vcx6njw"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; }; - ggfun = derive2 { name="ggfun"; version="0.0.4"; sha256="07njcjcj212zxanq8x3nkh7mgvqmym08rx5s41rz9flhk9gkc9jr"; depends=[ggplot2 rlang]; }; + ggfun = derive2 { name="ggfun"; version="0.0.5"; sha256="10spayf5jzmizhs6aassjplrjr9mr6bcww30pyxzyb1djfl41qxi"; depends=[ggplot2 rlang]; }; ggfx = derive2 { name="ggfx"; version="1.0.0"; sha256="1q9ppp88yj6lplj7wxnf18aa7a8f5iz35765bdfhsrkdxlrkny7h"; 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.4.1"; sha256="1s4knz2g06w46jbi037l9ii0kkxvl7gnljp54s4z36hnswsrv8jk"; 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.1-1"; sha256="0s377jh3lma9la6qml6hc1w3bxlzdmy8fz749s27n3ygpy2krg21"; depends=[ggplot2]; }; + gggrid = derive2 { name="gggrid"; version="0.2-0"; sha256="0g8msi5qpnr2npcgjvdjncrq6p61ddpzasy5g0fxqbybbpfxsyi8"; depends=[ggplot2]; }; ggh4x = derive2 { name="ggh4x"; version="0.2.1"; sha256="1r49yfm5fqv5s7jb92ad6rf8hd9plcry6f500czjhnhhrp16cqfp"; depends=[ggplot2 gtable rlang scales vctrs]; }; gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; }; gghalves = derive2 { name="gghalves"; version="0.1.1"; sha256="1w4j8grir1i8ar7fdsk4f6czkl5j2wwn67y746mis2diwnzhcil3"; depends=[ggplot2 gtable]; }; + gghdr = derive2 { name="gghdr"; version="0.1.0"; sha256="112bvbcsvhmwqnjs3ijs3i4ilhkbc1fwzy4h6x4fbc49bam492cj"; depends=[digest farver ggplot2 hdrcde scales tibble]; }; ggheatmap = derive2 { name="ggheatmap"; version="2.1"; sha256="1dks2fmkaaws5v7mgcw6rbvb5nfr7c9mmg0pqwywwx7rxj3gm05q"; depends=[aplot factoextra ggplot2 ggpubr patchwork tibble tidyr]; }; gghighlight = derive2 { name="gghighlight"; version="0.3.2"; sha256="0bxgn4srxz1qhawqa8ck57p8hg5ikwfa9ll03zmnn8fb19akwm2v"; 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]; }; @@ -9982,7 +10117,7 @@ in with self; { gginference = derive2 { name="gginference"; version="0.1.3"; sha256="1r960cglnkii8xih4r1r7wd857jqn53f08zi9dnj54bpqrs374zx"; depends=[ggplot2 rlang]; }; gginnards = derive2 { name="gginnards"; version="0.1.0-1"; sha256="1kgyrssmkyaqkahdqbc7abx955iyfls96kfamryhcarvbclkf2jx"; depends=[ggplot2 magrittr rlang stringr tibble]; }; ggip = derive2 { name="ggip"; version="0.2.0"; sha256="0jfh6sr34nbqwqypx6qdjggl2q6qbmpl17cmy45v6zdr5phrzhrx"; depends=[dplyr ggplot2 glue ipaddress Rcpp rlang tidyr vctrs]; }; - ggiraph = derive2 { name="ggiraph"; version="0.8.1"; sha256="0skdf7ga8a169xrbgljydk6yc18spi1m1s5604m576pkbc47zv87"; depends=[ggplot2 htmltools htmlwidgets purrr Rcpp rlang systemfonts uuid]; }; + ggiraph = derive2 { name="ggiraph"; version="0.8.2"; sha256="1wqc490ly9v3m3xszk8xj2x6i36bppzmm39xn4w0qfabrnqzzbg0"; depends=[ggplot2 htmltools htmlwidgets purrr Rcpp rlang systemfonts uuid]; }; ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.3.0"; sha256="0q8ppixw5i1hpphmswpw6lvq7gx8rx4gfs2b8d31wbn32ziiv2rk"; depends=[dplyr ggiraph ggplot2 magrittr mgcv mycor plyr ppcor purrr RColorBrewer reshape2 scales sjlabelled sjmisc stringr tidyr]; }; ggjoy = derive2 { name="ggjoy"; version="0.4.1"; sha256="012md2m0jqfcccb933j423m3ck31v3p0pd41gjxpyg9082y7ixyj"; depends=[ggplot2 ggridges]; }; gglasso = derive2 { name="gglasso"; version="1.5"; sha256="12l0ac1n54z41yw7c00fm6q2mjmhp9blk4f8vp7q2my2xxwh1fmj"; depends=[]; }; @@ -9992,7 +10127,7 @@ in with self; { gglorenz = derive2 { name="gglorenz"; version="0.0.2"; sha256="1kag8p2chd0sbn8affpxzi4aawpm71ls97dwdgx7mxxfwkdb2q0y"; depends=[ggplot2 ineq]; }; ggm = derive2 { name="ggm"; version="2.5"; sha256="11wc6k2kj2ydy0dyks5mbvbhxm1r43id87anl1jg6dn0yv4m78di"; depends=[graph igraph]; }; ggmap = derive2 { name="ggmap"; version="3.0.0"; sha256="13dmzl6z62pzjiffilarkji46vy0sacxa8a7mhrhc3biq3ylzhln"; depends=[bitops digest dplyr ggplot2 glue httr jpeg magrittr plyr png purrr RgoogleMaps rjson scales stringr tibble tidyr]; }; - ggmatplot = derive2 { name="ggmatplot"; version="0.1.0"; sha256="06wgbpbgx7wnbi1l8p7avn0mqg6nvl9h4ba0xy077rnjzybfdn46"; depends=[ggplot2]; }; + ggmatplot = derive2 { name="ggmatplot"; version="0.1.1"; sha256="07di071iv2zab8w5l60llb05h9lbrmaam65z5wiy0g27swvnv6i1"; depends=[ggplot2]; }; ggmcmc = derive2 { name="ggmcmc"; version="1.5.1.1"; sha256="1y6ya2qihm8h6ds84akhmsxn9c8jriw03wakaqzsmi21agz87n21"; depends=[dplyr GGally ggplot2 tidyr]; }; ggmix = derive2 { name="ggmix"; version="0.0.2"; sha256="158pzmr4vmy2qxmp3nrabjgkg11mrdvl1skzxgwida2is900f7gf"; depends=[glmnet MASS Matrix]; }; ggmosaic = derive2 { name="ggmosaic"; version="0.3.3"; sha256="1zm1zfbd0qk6icw65m9hz1hgyqj632ibq3qilidvx5jy7jh8nbpy"; depends=[dplyr ggplot2 ggrepel plotly productplots purrr rlang scales tidyr]; }; @@ -10001,7 +10136,7 @@ in with self; { ggmuller = derive2 { name="ggmuller"; version="0.5.4"; sha256="0y7bm9fm5i8acpy6fa903ca2r9yasky7kg2hicm4xz5ni09jm20x"; depends=[ape dplyr ggplot2]; }; ggmulti = derive2 { name="ggmulti"; version="1.0.4"; sha256="07kqhfpg7alayfq4a86wq18jzdcmxd99607w1amzidizmwgd54d8"; depends=[dplyr ggplot2 tidyr]; }; ggnetwork = derive2 { name="ggnetwork"; version="0.5.10"; sha256="0gqdgy5yh700dg0f7xb80hczlnqfisn8l55j7amd1n7fp2x5sr8v"; depends=[ggplot2 ggrepel igraph network sna]; }; - ggnewscale = derive2 { name="ggnewscale"; version="0.4.5"; sha256="1hjysfagd2lqy8yivqq9q7l6hbvyq8kasw3zqh5fk9xn18ikc702"; depends=[ggplot2]; }; + ggnewscale = derive2 { name="ggnewscale"; version="0.4.6"; sha256="08xqhv6y9m9f2p8q3h0dh7mbpqg3r2i590x2983k69plfa5jxzv3"; depends=[ggplot2]; }; 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]; }; @@ -10010,6 +10145,7 @@ in with self; { ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; }; ggparliament = derive2 { name="ggparliament"; version="2.0.0"; sha256="04za4lm3lir95bgda1rzlsyil2fkac3j5f5f1pjw2samy6pjz80r"; depends=[dplyr ggplot2 rlang]; }; ggparty = derive2 { name="ggparty"; version="1.0.0"; sha256="0s6hr5p930kl3pj6ajwgwqz6yikc3l9hhzy1yn0nqc0r8pp2jyqf"; depends=[checkmate ggplot2 gtable partykit rlang survival]; }; + ggpattern = derive2 { name="ggpattern"; version="0.4.2"; sha256="12xzvdhq2g3h5gggmm6rk7hdjici2kl7wjs98l5yh6yqnbglig74"; depends=[ggplot2 glue gridpattern rlang scales]; }; ggperiodic = derive2 { name="ggperiodic"; version="1.0.1"; sha256="084n37jwldnhqx61ayq9b55bi4dp2iqyrj2qbp67w0ps1xn5jm6b"; depends=[data_table dplyr ggplot2 sticky tidyselect]; }; ggplot_multistats = derive2 { name="ggplot.multistats"; version="1.0.0"; sha256="1afzfa86vc484bcwpg7m1ky03jpax584rigzgai8w06pifkmz0il"; depends=[ggplot2 hexbin rlang scales]; }; ggplot2 = derive2 { name="ggplot2"; version="3.3.5"; sha256="1si46bf9p09qzs208hqffwcb40305p361whmwhc1pwrsmx7jjxdh"; depends=[digest glue gtable isoband MASS mgcv rlang scales tibble withr]; }; @@ -10020,6 +10156,7 @@ in with self; { ggplotlyExtra = derive2 { name="ggplotlyExtra"; version="0.0.1"; sha256="1m2rhylpzj934gb50lxjp47rxz0kwl9i1p3n7w1rz4qi96pr5p1c"; depends=[ggplot2 plotly rlang]; }; ggpmisc = derive2 { name="ggpmisc"; version="0.4.5"; sha256="036y3zhl9ndj5wlqy2nkp95vi7pjfpvf63ndsigramzad0fz0c98"; depends=[dplyr generics ggplot2 ggpp lmodel2 lubridate MASS 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.1"; sha256="01w4aa84lrk4lwv2a0jhbia8c60mc9jqp9jplrnvngna17wlq2f1"; 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.0"; sha256="0i795635yziz1qssrvnvpbar5fdp4vxfmzaaxdlw6cccf3qfnnvq"; depends=[ggplot2]; }; ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; }; @@ -10053,7 +10190,7 @@ in with self; { ggspectra = derive2 { name="ggspectra"; version="0.3.7"; sha256="0xd8g2m73qa5bd4wk1a81ayy48agqm4h9nadafs3qrcg8wszk8nm"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tibble tidyr]; }; ggstance = derive2 { name="ggstance"; version="0.3.5"; sha256="0jz9vvnmcc6a38n8nzr458r65sna23bgn5r8mxdhzdlyqibihr7d"; depends=[ggplot2 plyr rlang withr]; }; ggstar = derive2 { name="ggstar"; version="1.0.3"; sha256="0d96qsx0id82isaz62plkxwc8a6zcs19s1asyx316ciq9a325pr3"; depends=[ggplot2 gridExtra scales]; }; - ggstatsplot = derive2 { name="ggstatsplot"; version="0.9.0"; sha256="12ybhfz50gjnjsi63x36pz2ynvhcf29xdpx08imb88y1ibq8qk1c"; depends=[correlation datawizard dplyr ggplot2 ggrepel ggsignif insight paletteer parameters patchwork performance PMCMRplus purrr rlang statsExpressions tidyr WRS2]; }; + ggstatsplot = derive2 { name="ggstatsplot"; version="0.9.1"; sha256="1x2g7zb2lm0jyv5qncr4bv84yhc00n6c3nxvyskv22fh3yljxm26"; depends=[correlation dplyr ggplot2 ggrepel ggsignif glue insight paletteer parameters patchwork performance purrr rlang statsExpressions tidyr WRS2]; }; 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]; }; ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; }; @@ -10070,7 +10207,8 @@ in with self; { ggwordcloud = derive2 { name="ggwordcloud"; version="0.5.0"; sha256="0mr92738s3j9wm6mkr5hd2flqsqw3vfjifv3fajsygysbwrl8dn8"; depends=[colorspace ggplot2 png Rcpp scales]; }; ggx = derive2 { name="ggx"; version="0.1.1"; sha256="13yvckny2b7b7rhgi28xm8379paskin78wm5095s1ily9a2dxgkg"; depends=[ggplot2 sets]; }; gh = derive2 { name="gh"; version="1.3.0"; sha256="077drbxz3rx7idv6w24ipj1p6jnzv86a3iyryab699cc9q2kjh54"; depends=[cli gitcreds httr ini jsonlite]; }; - ghcm = derive2 { name="ghcm"; version="2.0.0"; sha256="0c09galykcn4nsbkvgh0i5mk8jxwi1vddqq4my2q3ybjipcv23if"; depends=[CompQuadForm MASS refund]; }; + 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]; }; ghee = derive2 { name="ghee"; version="0.1.0"; sha256="0b3czx2ibi5p8xl7i36zxnab032vrkh5bv204r7wgg1xpx8pdlra"; depends=[gh jsonlite]; }; ghibli = derive2 { name="ghibli"; version="0.3.2"; sha256="0762dy3x7w0q1swag2lh33cpqdr9bbqw0963ymdpnchawdh5m50z"; depends=[prismatic]; }; ghql = derive2 { name="ghql"; version="0.1.0"; sha256="19awg98r2hwwwwrwh0166y8ij1clf58vrf02i8fhhfzddx3an6bz"; depends=[crul graphql jsonlite R6]; }; @@ -10092,20 +10230,21 @@ in with self; { 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.29.0"; sha256="13nlrhma6kavvhranb43w3003vadfkyrn2f4l3r63iqavj0s3xzq"; depends=[]; }; git2rdata = derive2 { name="git2rdata"; version="0.3.1"; sha256="0nvx6lfp66l44n3xwkj5biirrzwvl52dssfx8jysqjl1kgfrwwh3"; depends=[assertthat git2r yaml]; }; + git4r = derive2 { name="git4r"; version="0.1.1"; sha256="1z00m1l5gd1r03pnr7jcdzfba3vcak84xv3fbwhw8zcfjghsp3rc"; depends=[diffr git2r]; }; gitcreds = derive2 { name="gitcreds"; version="0.1.1"; sha256="1snzn7nxy0rwz0bzjsg6k04c0n811dgn8gn9cmn2v78aj57ayjmi"; depends=[]; }; - gitdown = derive2 { name="gitdown"; version="0.1.3"; sha256="0sspwbymzalf4fh180cpjv8mymh8j8v7absnc6mrix2bd89jymsd"; depends=[attempt bookdown dplyr git2r knitr magrittr purrr rmarkdown stringi tidyr]; }; + 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.6.6"; sha256="1c8404mqcl5cp5wxm2mszry7a29da96hd5ng3f2ynbfvxis709km"; 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]; }; 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.0"; sha256="0snd1pscv09wn3vjvfbvf87dcd43i25m2x3ra8vw37c2zd8hj500"; depends=[arpr base64enc dplyr httr magrittr purrr shiny stringr tibble]; }; gitlink = derive2 { name="gitlink"; version="0.1.3"; sha256="1g34cyx35wlpq42alsayk69x708zxqgvbdndb7j6n1q0rm4vncvd"; depends=[htmltools rlang]; }; + gittargets = derive2 { name="gittargets"; version="0.0.3"; sha256="00mv901r116s1jshbxinfnckh88q2083628898dag31ixj3bqlim"; depends=[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.5"; sha256="03nijxddj67bd47qiccklls94fygx1s80pqxwxbf96xks08982za"; depends=[MASS RANN Rcpp RcppArmadillo]; }; + gjam = derive2 { name="gjam"; version="2.5.2"; sha256="0shq8cq7dq13f3x0ycx56izf9158aap76kghlcxhl8y42mgarxl5"; depends=[MASS RANN Rcpp RcppArmadillo]; }; gk = derive2 { name="gk"; version="0.5.1"; sha256="1hgxb1lp78pbnj22i7ryf46im301j05y7hh75z2fxvv5nqgg2v75"; depends=[Ecdat lubridate progress]; }; gkgraphR = derive2 { name="gkgraphR"; version="1.0.2"; sha256="1sb52hhpwm3bq7rn2xdq5vly6z1c5yab9a26xzgj3c5s47vk02pa"; depends=[httr ISOcodes jsonlite]; }; gkmSVM = derive2 { name="gkmSVM"; version="0.81.0"; sha256="119g5rhc7ffyviz04r04aj5z1g6abnj3ddd01g7db505sdr6lapj"; depends=[kernlab Rcpp ROCR seqinr]; }; - glacierSMBM = derive2 { name="glacierSMBM"; version="0.1"; sha256="0117fzz2b1lccs0kkwz59w2yysi72j54yvz7373pz11w7rjds84f"; depends=[raster sp udunits2]; }; 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]; }; @@ -10118,7 +10257,7 @@ in with self; { gld = derive2 { name="gld"; version="2.6.4"; sha256="08rkv7g6ci969vh9fbyg3lrpfmjhbiwzdhcjs9j6s9bf3gpdmdhd"; 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.16"; sha256="06mgnx70l87ib1v6fqg7b9m61jxqdl9sxz2jd12fnscj4k4r52fc"; depends=[ape BB lbfgsb3c numDeriv plyr Rcgmin rlang]; }; + glinvci = derive2 { name="glinvci"; version="1.1.17"; sha256="0rl7qka0pk57yxyh6rmkgf69czm1b6gz3v1fsm0qaf9dbqcnpnrm"; depends=[ape BB lbfgsb3c numDeriv plyr Rcgmin rlang]; }; gllm = derive2 { name="gllm"; version="0.37"; sha256="169y3yz947d8qdphqv2a6yrdash6v2h9jfvj2fk7rcpmz0r45kl6"; depends=[]; }; gllvm = derive2 { name="gllvm"; version="1.3.1"; sha256="1im5q5137jf8cwpydy6p8lip9v43fvgb5hi11ff2wwhc9yw74gyd"; depends=[fishMod MASS Matrix mgcv mvabund RcppEigen statmod TMB]; }; glm_deploy = derive2 { name="glm.deploy"; version="1.0.4"; sha256="1akklvbhz2pp0sv1hax1jq0s9ajbfv1597z643gh5l9hwizj2h9m"; depends=[Rcpp]; }; @@ -10133,9 +10272,11 @@ in with self; { 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.2"; sha256="03jgj3ssza2j2cg6nl4pbbmj57s951mxbas32cg5789zh9hjbygg"; depends=[doParallel foreach itertools Matrix mvtnorm trust]; }; + glmm_hp = derive2 { name="glmm.hp"; version="0.0-2"; sha256="1fjhrfgpl0xf7v6zls8v1dqm0bqds96mkiqk27bx6iy6wmadlwgk"; depends=[ggplot2 lme4 MuMIn]; }; glmmEP = derive2 { name="glmmEP"; version="1.0-3.1"; sha256="0fql85m0mxn58jh3mgrcw56bb4dx7amrz39ngqrljwi5pv5i7aj4"; depends=[lme4 matrixcalc]; }; glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; }; glmmML = derive2 { name="glmmML"; version="1.1.1"; sha256="1m2dcw522nd78x7z7la7a4cii3030s0bl4sqxbvkxn1k15jf4pr5"; depends=[]; }; + glmmPen = derive2 { name="glmmPen"; version="1.5.1.8"; sha256="04pxkhklyx26mngg7bwhlrqd3bh1ay1h5ddfacpg5jnigp2rlk84"; depends=[BH bigmemory ggplot2 lme4 MASS Matrix mvtnorm ncvreg Rcpp RcppArmadillo RcppEigen reshape2 rstan rstantools StanHeaders stringr]; }; glmmSeq = derive2 { name="glmmSeq"; version="0.1.0"; sha256="0mdcwh6vvh4pc64r4jl78dr6x8fwclbbx8s9kf2sj39mm7iqpkqz"; depends=[car gghalves ggplot2 ggpubr lme4 MASS pbapply pbmcapply plotly qvalue]; }; glmmTMB = derive2 { name="glmmTMB"; version="1.1.2.3"; sha256="1yfwwz2dhd34vgagg8hi7irkqw8padavbc7337jdiwgk3w01wqsm"; depends=[lme4 Matrix nlme numDeriv RcppEigen TMB]; }; glmmfields = derive2 { name="glmmfields"; version="0.1.4"; sha256="0gnb2s34xz7cjyaa2w2wq7n6c5016a14mc03kalvwdv3f7b98zan"; depends=[assertthat BH broom broom_mixed cluster dplyr forcats ggplot2 loo mvtnorm nlme Rcpp RcppEigen reshape2 rstan rstantools StanHeaders tibble]; }; @@ -10149,13 +10290,14 @@ in with self; { 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.2"; sha256="1f3kw9w5i8jd9j9xmdq9327dh77xichssw53nsayn9w41n9ky431"; depends=[numDeriv Rfast]; }; - glmtrans = derive2 { name="glmtrans"; version="1.0.0"; sha256="1r8zgdybl2z9bivcfdmbx2wfpaj82d95gdkaixwzwjknjn50ccyv"; depends=[assertthat caret doParallel foreach formatR ggplot2 glmnet]; }; + 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]; }; glmvsd = derive2 { name="glmvsd"; version="1.4"; sha256="03axsn85axs4d6fdlr3wcdwq6qa4991svkqc7k9r52kk1ar0w5zz"; depends=[brglm glmnet MASS ncvreg]; }; glmx = derive2 { name="glmx"; version="0.1-1"; sha256="06v2qxgr16w0qnfhjr9vdqcad5v475pwg2yhw0i236yzqbnsssh6"; depends=[Formula lmtest MASS sandwich]; }; + glmxdiag = derive2 { name="glmxdiag"; version="1.0.0"; sha256="0m077j7prjc38yshq8ahprfsai0rc20qma2njjbdi975mrwxi25c"; depends=[VGAM]; }; globalGSA = derive2 { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; }; - globalKinhom = derive2 { name="globalKinhom"; version="0.1.3"; sha256="1hj2f8sd9mfr44g93y2j6sazrlkpkgb10jw5fcjcf3w5738pvh5a"; depends=[spatstat spatstat_core spatstat_geom]; }; + globalKinhom = derive2 { name="globalKinhom"; version="0.1.4"; sha256="0ah05yl0fxiih3lfh8gxls01ikanwg3z8npbgv625zjfrqp1qwsw"; depends=[spatstat_core spatstat_geom spatstat_random]; }; globalOptTests = derive2 { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; }; globals = derive2 { name="globals"; version="0.14.0"; sha256="1wrjiiif6rpc268zz79pvpw33si6n6ffgxdnxmmcracwhb5vqg90"; depends=[codetools]; }; globe = derive2 { name="globe"; version="1.2-0"; sha256="0xa0q5dac0g7xdlr679f3km8nqxlm7gi4msp9fbfivfvy0rmri96"; depends=[]; }; @@ -10163,7 +10305,7 @@ in with self; { glow = derive2 { name="glow"; version="0.10.1"; sha256="1br29hy5j30k5q4xk1dglxlhqalhm76hnx8xg73v6whcg5j11392"; depends=[ggplot2 R6 Rcpp RcppEigen RcppParallel scales]; }; glpkAPI = derive2 { name="glpkAPI"; version="1.3.3"; sha256="07bksiqmq2n7ki3f3sxph4v44k7q2b0d88jwjgfxzdn33i65wqyq"; depends=[]; }; glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; }; - glue = derive2 { name="glue"; version="1.6.0"; sha256="0f23dgnc7rv81vhmdhmiwk666mqwb602hxzai1hssyn4y9zg7gkp"; depends=[]; }; + glue = derive2 { name="glue"; version="1.6.2"; sha256="1gzxk5jgdh2xq9r7z09xs306ygzf27vhg3pyfl7ck1755gqii9cx"; depends=[]; }; gluedown = derive2 { name="gluedown"; version="1.0.4"; sha256="1rvaac27kc4mppmw9kdwjaqsa7lwfzwffv63c8cky1z0xrsc5zz1"; depends=[glue magrittr]; }; gluvarpro = derive2 { name="gluvarpro"; version="4.0"; sha256="09l9yincr1k5j9wnj3zvfzsffjh3r54aa8fn0ik8vhlbq13ag8kp"; depends=[ggplot2 gridExtra pracma scales tidyr zoo]; }; glvmfit = derive2 { name="glvmfit"; version="0.1.0"; sha256="1nb34dm4m0nq7cr9f9jsacnk0xjv451m419sdwbk11ykpqkh9cdk"; depends=[]; }; @@ -10181,20 +10323,24 @@ in with self; { gmm = derive2 { name="gmm"; version="1.6-6"; sha256="16vkb472bjlfccfpl94mz772nbyf76wkwb2shai18jja3fnj3cxi"; depends=[sandwich]; }; 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"; sha256="0s8kd8krqk4kwv2zqxpsfy3w8qdwf5naf4b5l383vidq9sil0qb2"; depends=[gdata MASS]; }; - gmp = derive2 { name="gmp"; version="0.6-2.1"; sha256="1mj7hy6riaxl9n4q2cnyyjazwad90xbjszk25si968618rih4n64"; depends=[]; }; + gmp = derive2 { name="gmp"; version="0.6-4"; sha256="0vfhz5cpffcrmq011h7jvy1r6d5pbbpkxj8431bhj5x5h25x7sjn"; depends=[]; }; + gmpoly = derive2 { name="gmpoly"; version="1.0.0"; sha256="0nl5cbp6kk382nd1w7zpb571zyf4jark51xih34bnhy6kyq04xkw"; depends=[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.2"; sha256="0z5abh0kw97y90nxkkxxg2xgv1avxijf71v88lwhy25jgv8r7b38"; depends=[]; }; - gmvarkit = derive2 { name="gmvarkit"; version="2.0.1"; sha256="16q412isjbx3b8bdapjyx9rg2afld2si6jnh6886ar33m1s35i21"; depends=[Brobdingnag gsl mvnfast pbapply]; }; + gmvarkit = derive2 { name="gmvarkit"; version="2.0.2"; sha256="0si4a4ds9804rssim7vljv3q7ny54kd1lf9sljisrfilnbj69qsy"; depends=[Brobdingnag gsl mvnfast pbapply]; }; 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-1"; sha256="1lddsdsg43wpg681s906i4xqqfbjdd1qb9ml5dfprb02i1806aa2"; 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]; }; gnorm = derive2 { name="gnorm"; version="1.0.0"; sha256="17h43qwb07wk5hiif89k6dgn6bbdsqfy2jy3k5blbdhhp3b9jcqp"; depends=[]; }; + gnrprod = derive2 { name="gnrprod"; version="1.0.0"; sha256="0ndrw2ym0f9m593q51lf069nf6fasrwb3psv1qr914jpm6vcp9di"; depends=[data_table]; }; gnumeric = derive2 { name="gnumeric"; version="0.7-8"; sha256="0iwl00mzsg8h8q67bjp6485idjlmj24362b1rbmkifckss8hrc98"; depends=[XML]; }; goeveg = derive2 { name="goeveg"; version="0.5.1"; sha256="1dg0aw3sfar706jyiy5m5qz3nzs6sy3ljs9jp0p65b0v01rw8sbs"; 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.0"; sha256="0xxqq6bnc543k7b69ix255x4hv95cy4w2ffiq5v22dal456ggy9m"; 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]; }; @@ -10202,14 +10348,14 @@ in with self; { gogarch = derive2 { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fastICA fGarch]; }; goldi = derive2 { name="goldi"; version="1.0.1"; sha256="191ac02bwrxr3khq6qirhxzfhv7pqfhqyg7jb473p5vwygpvc53l"; depends=[dplyr futile_logger magrittr Rcpp RcppArmadillo SnowballC tm]; }; goldilocks = derive2 { name="goldilocks"; version="0.3.0"; sha256="1h16kfalyklc7i3rix1ml83wjcbi9wv3z3rwxa83gp2h6nfpzpwl"; depends=[dplyr fastlogranktest pbmcapply PWEALL rlang survival]; }; - golem = derive2 { name="golem"; version="0.3.1"; sha256="1amasx97ywyp0x7khdwmliaql4cnpc6gsn10rbd128wqcbma504k"; depends=[attempt cli config crayon desc dockerfiler fs here htmltools jsonlite pkgload remotes rlang roxygen2 rstudioapi shiny testthat usethis yaml]; }; + golem = derive2 { name="golem"; version="0.3.2"; sha256="008zhhmbgx6v3acw1gmzgzcpq8xj1i5mxpns6ixn538slrhlj5fx"; depends=[attempt brio cli config crayon desc fs here htmltools pkgload roxygen2 rstudioapi shiny usethis yaml]; }; gomms = derive2 { name="gomms"; version="1.0"; sha256="1i9d5y28wrhal990x7xxy99v3z9y2pzlakj7wnynd3dpx5pqr0jj"; depends=[]; }; gontr = derive2 { name="gontr"; version="1.1.0"; sha256="0asvpc3nizcn7cqdxr1j9hvhprmrazd8c7a2svhmln4vg9x1zzkp"; depends=[]; }; good = derive2 { name="good"; version="1.0.1"; sha256="0lgp8kpdiaprq78fzny5c344m2s1vb24y9x9m8rkg1kd769h56pv"; depends=[copula maxLik plyr]; }; goodpractice = derive2 { name="goodpractice"; version="1.0.2"; sha256="08rnm8z0pry5mwpc7p37r6f2rd56dry9djpcvvs9yl170w56psx0"; depends=[clisymbols covr crayon cyclocomp desc jsonlite lintr praise rcmdcheck rstudioapi whoami withr xml2 xmlparsedata]; }; googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="1.0.1"; sha256="02lipd1li3jmnjyc0f19fsblji3sjjzdy9zyq1f0ay5lfa6j2x51"; depends=[assertthat cli dplyr googleAuthR httr jsonlite magrittr measurementProtocol memoise purrr rlang tibble tidyr usethis whisker]; }; - googleAuthR = derive2 { name="googleAuthR"; version="1.4.1"; sha256="06ksv2xv8zpd9s0vq7vgq5zc4i3xz203f9l9891zmzpjd7x03qb1"; depends=[assertthat cli digest gargle httr jsonlite memoise rlang]; }; - googleCloudRunner = derive2 { name="googleCloudRunner"; version="0.4.1"; sha256="0mvwgx2i4n0qymib1a7v3n7fa88hpwqh6fffclasxsr1ncdxankq"; depends=[assertthat cli curl googleAuthR googleCloudStorageR httr jose jsonlite openssl plumber progress usethis yaml]; }; + googleAuthR = derive2 { name="googleAuthR"; version="2.0.0"; sha256="1svgjrh4wb3qdavhmks2lmncqrapvw17dvlbk0z1nbny7fplnl5s"; depends=[assertthat cli digest gargle httr jsonlite memoise rlang]; }; + googleCloudRunner = derive2 { name="googleCloudRunner"; version="0.5.0"; sha256="14nynl56gc8aj03wxbj243fz80j1wxd93ywfaivy1cgyfi3rid6z"; depends=[assertthat cli curl googleAuthR googleCloudStorageR googlePubsubR httr jose jsonlite openssl plumber usethis withr yaml]; }; googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.7.0"; sha256="1yp8h87i17kald9pkr9icxd918n5vywk0h9q8lclip2slx9bry1p"; depends=[assertthat cli curl googleAuthR httr jsonlite openssl yaml zip]; }; googleCloudVisionR = derive2 { name="googleCloudVisionR"; version="0.2.0"; sha256="1n4gkmnwp9wadxz1izggxnpcpm4bz3imhq5y3i2szr8zwafcqqjv"; depends=[data_table glue googleAuthR jsonlite purrr]; }; googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.3.0"; sha256="1s0qvnijzkja645lim373swk815n3s1292q6sk3q36ss70q42cfg"; depends=[assertthat future googleAuthR httr jsonlite]; }; @@ -10217,29 +10363,29 @@ in with self; { googlePolylines = derive2 { name="googlePolylines"; version="0.8.2"; sha256="1z8ml0xiyqy1ygairgs9w10q4a7msd6gkzjv7kf6r8xv4bpc02pd"; depends=[BH Rcpp]; }; googlePrintr = derive2 { name="googlePrintr"; version="0.0.1"; sha256="19rm78x8qd61ilc6h1kn3dw63m6dfsckqkd3n76krvi0akgl72w5"; depends=[googleAuthR httr jsonlite]; }; googlePublicData = derive2 { name="googlePublicData"; version="0.16.1"; sha256="15hyslpqvncg21q581h061rfyg99y8lavqw1x8hzl7xzd49bn9r5"; depends=[readxl XML]; }; - googlePubsubR = derive2 { name="googlePubsubR"; version="0.0.2"; sha256="1paw25q5p82m60dyxn38qi4ykranrr0gb253a7nhh5nckb4rz7hi"; depends=[cli googleAuthR magrittr]; }; + googlePubsubR = derive2 { name="googlePubsubR"; version="0.0.3"; sha256="114yhhqjpg7khgq82y1qdpnm6pbqinlgwh5n1lx6fzsm1ajhl0kv"; depends=[cli googleAuthR magrittr]; }; googleTagManageR = derive2 { name="googleTagManageR"; version="0.1.6"; sha256="1y2avhgvzrpmpyx341di8ml2pdj10y8sdhn7zwjpxgzrxkmf4xxi"; depends=[assertthat dplyr future googleAuthR httr jsonlite purrr]; }; - googleVis = derive2 { name="googleVis"; version="0.6.10"; sha256="0jjqlcxfbpkl2kdpp8vr27yi178ryg62yy7rjafzda1npg010f3x"; depends=[jsonlite]; }; + googleVis = derive2 { name="googleVis"; version="0.6.11"; sha256="15vvk08fwqbik3dyq927ccdvmyi4zjc2sxpnpy2g2yysa5n0pjgq"; depends=[jsonlite]; }; googledrive = derive2 { name="googledrive"; version="2.0.0"; sha256="09jsiknzyfgxd0nzdr3wrrjw24allch2x74h96qg8vh8dad4cp30"; depends=[cli gargle glue httr jsonlite lifecycle magrittr pillar purrr rlang tibble uuid vctrs withr]; }; googleformr = derive2 { name="googleformr"; version="0.0.3"; sha256="0smykcjyqmk61ws5jk462l8x5hg0h9nwq55q5pqfgcq1j3yfniqh"; depends=[httr rvest xml2]; }; googlenlp = derive2 { name="googlenlp"; version="0.2.0"; sha256="0d0g18i3im2s5f14k69ym3vwf9a7zkaval3nwrip97xcl6kf4x9h"; depends=[dplyr httr jsonlite purrr readr rlang]; }; googler = derive2 { name="googler"; version="0.0.1"; sha256="1aayji3ncqxl58k29d93dbx05s9rp9bc63fl2cpl1cys7gilblxx"; depends=[jsonlite tibble]; }; - googlesheets = derive2 { name="googlesheets"; version="0.3.0"; sha256="11q07nxys72wkxx9mawmjyf20gvwvrb7h3gpa73h6lgh2vgrwnv8"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tibble tidyr xml2]; }; googlesheets4 = derive2 { name="googlesheets4"; version="1.0.0"; sha256="0yncqwv9l5knyrv88ys5gwcv44hl1j0mbklpins6v7f9m9v7s40a"; depends=[cellranger cli curl gargle glue googledrive httr ids magrittr purrr rematch2 rlang tibble vctrs]; }; - googleway = derive2 { name="googleway"; version="2.7.3"; sha256="0n2ybkjwwhq7kpyv0ryz4mp5w06psbcm2gyfwk0d3wp1i43ajsn4"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; }; + googleway = derive2 { name="googleway"; version="2.7.6"; sha256="07jyawybdrfb7rzxba6mqlz98slv6j1bdqv5lqc06zf5x84r0wwd"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; }; 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]; }; + gosset = derive2 { name="gosset"; version="0.3"; sha256="0symqdgihj3m4a8j0nl1xw9kj3n13k75m1b9dzyhpp60q017nd59"; depends=[BradleyTerry2 ggparty ggplot2 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="0.2.2"; sha256="0c9n921wn4hhlvjq96r4nkk96s5788376cbldr7y7bwz348200iz"; depends=[]; }; + gower = derive2 { name="gower"; version="1.0.0"; sha256="0p9qx9aafkdm7wibfwk59jzw6vspsff6zwp84bc40lg0myxbf737"; depends=[]; }; goxygen = derive2 { name="goxygen"; version="1.0.3"; sha256="0825zl16ap0k3jqhrjw4hfsw97ils77jmf4yqq347k3bb8i3dm79"; depends=[citation gms pander stringi yaml]; }; gpairs = derive2 { name="gpairs"; version="1.3.3"; sha256="08m1ydrr239vnhjbl47mng3i2w9bqmd8fijrwsraq5ysvn826n27"; depends=[barcode colorspace lattice MASS vcd]; }; gpbStat = derive2 { name="gpbStat"; version="0.3.5"; sha256="1inmh8r02fn48p2f150d3prxlkf61549027vc64a3kyyk5q167ib"; depends=[data_table dplyr magrittr]; }; - gpboost = derive2 { name="gpboost"; version="0.7.0"; sha256="0d94izg7r43w812h9l5ldkr298ll09jz46v926cv6inw7638c1c2"; depends=[data_table Matrix R6 RJSONIO]; }; + gpboost = derive2 { name="gpboost"; version="0.7.2"; sha256="05khnv1zfp0f8aj4ljkfrlwhqay565imr5ks636sgy6ivsb6c1w0"; depends=[data_table Matrix R6 RJSONIO]; }; gpclib = derive2 { name="gpclib"; version="1.5-6"; sha256="11jjgg74l8hy9jz4jylhriqnzv8jcf12y1bkx22v29z3fhgkwkps"; depends=[]; }; gpg = derive2 { name="gpg"; version="1.2.6"; sha256="17rvi3qff2kanqr3g20dzhn48bfh5sv57g0wsamndzcif7rhjhby"; depends=[askpass curl]; }; - gpindex = derive2 { name="gpindex"; version="0.3.9"; sha256="18qja4chz91qybc07xcxcrbvgng5ybd03v9965wcivd2w2xrpxq6"; depends=[]; }; + gpindex = derive2 { name="gpindex"; version="0.4.2"; sha256="1id5mmdmjw34y80cnjfxgldd83bzfifh0jk4ym4wp7h3dbpqr8n5"; depends=[]; }; gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; }; gplite = derive2 { name="gplite"; version="0.12.0"; sha256="1cm846jayqvb3xrd3h6pxq6wmww1ghhkr6dffschk0xycix6alw9"; depends=[Matrix Rcpp RcppArmadillo]; }; gplm = derive2 { name="gplm"; version="0.7-4"; sha256="0apvj14nl5qbi4dhhdx5nih5lvjwfcipvr8cyk6xsz4r5gfr2iw4"; depends=[AER]; }; @@ -10248,6 +10394,7 @@ in with self; { gpmap = derive2 { name="gpmap"; version="0.1.2"; sha256="1n1r4rda9v4zw8zz4vcagmkkpgirwydhqz36pyq0assxwclnkcz0"; depends=[foreach ggplot2 isotone plyr]; }; gppm = derive2 { name="gppm"; version="0.2.0"; sha256="1n9is3xj52lsck2fiy9j320p2ca6ib36s251i7g3iz99a77b0ahh"; depends=[ggplot2 ggthemes MASS mvtnorm Rcpp rstan]; }; gprofiler2 = derive2 { name="gprofiler2"; version="0.2.1"; sha256="0r0h34b35xzgd9rh55yndn0anxy0z45zdlqa6qfmpn91b6v1bb1g"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly RCurl tidyr viridisLite]; }; + gps = derive2 { name="gps"; version="1.0"; sha256="1yzmv0zpgnis3v2f7m9j02zxw31kgcw9fny3vrvk4637jzz2ij56"; depends=[Matrix]; }; gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; }; gpx = derive2 { name="gpx"; version="1.1.0"; sha256="0x9b3mnbrim690l4wnyzk47bgywvnw4h4l8qznnx7zkpqib2hn5i"; depends=[lubridate rvest xml2]; }; gqlr = derive2 { name="gqlr"; version="0.0.2"; sha256="0gzhqyrbnz3qjzkr4slryrlfhlaxm474y9fahlj0sb0hvcx68pxj"; depends=[graphql jsonlite magrittr pryr R6]; }; @@ -10259,17 +10406,18 @@ in with self; { 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="2.1.0"; sha256="0l5i27ifm2xxg7vs2wkcwqm60wgvxc397x1wg654qjvh1ggpd1qn"; depends=[broom_mixed car emmeans ggplot2 Hmisc lme4 lmerTest magrittr purrr tidyr]; }; grainchanger = derive2 { name="grainchanger"; version="0.3.2"; sha256="1anq9gmbf9cjh6f9q2h7f65j220f56rmb59zhp5j2d26bs7dbnz8"; depends=[checkmate furrr raster sf usethis]; }; grainscape = derive2 { name="grainscape"; version="0.4.3"; sha256="0mc9mgc70ysqal8pjslmr7dzig3d08jcdpba348hmgyh0w9b6s07"; depends=[ggplot2 igraph raster Rcpp rgdal sp]; }; gramEvol = derive2 { name="gramEvol"; version="2.1-4"; sha256="1am5nlnyawi4lybi10ag4fdhddvbwsdzrmr6f66bzspdpl4s26g9"; depends=[]; }; grangers = derive2 { name="grangers"; version="0.1.0"; sha256="15q8hv7p5g5m7v6lx6nq5394fa6p05xgawnsrn1v5aslmmbbzyvl"; depends=[tseries vars]; }; granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; 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.0"; sha256="0cc83bbfshg8q65jg6ibs6wm0xlpwpyq1rxn19p5axqwnpc60dzg"; depends=[dplyr magrittr rlang tibble tidyr vctrs]; }; + 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]; }; graph3d = derive2 { name="graph3d"; version="0.2.0"; sha256="1c4pmx37nf4nm6svrn9dqr50gb2fckx8635zg0n4gnzgdca1iyv4"; depends=[htmlwidgets lazyeval]; }; - graph4lg = derive2 { name="graph4lg"; version="1.2.0"; sha256="0bfmi74hsd1hvvxls5a0gqdhxirjdzkjrpnq0p84na6sblmfbja6"; depends=[adegenet diveRsity ecodist foreign gdistance ggplot2 igraph knitr MASS Matrix pegas rappdirs raster Rdpack rmarkdown sf sp spatstat_core spatstat_geom spatstat_linnet stringr tidyr vegan]; }; + graph4lg = derive2 { name="graph4lg"; version="1.4.0"; sha256="0lllz8wcqb2qf0byn6npklk88nl0k6f7q21iv02q1x4kdhsd5d95"; depends=[adegenet diveRsity ecodist foreign gdistance ggplot2 igraph MASS Matrix pegas rappdirs raster Rdpack sf sp spatstat_geom spatstat_linnet stringr tidyr vegan]; }; graphTweets = derive2 { name="graphTweets"; version="0.5.3"; sha256="0jf52lclwvqgybdj6fknzx046bh6jgwxvqs4c5g1ii8f2lsz9y07"; depends=[combinat dplyr igraph magrittr purrr rlang tidyr zeallot]; }; grapherator = derive2 { name="grapherator"; version="1.0.0"; sha256="071by9b8figbsf4g0f8a8mgcdksjksc57mnlgggilw7py1yjnjlh"; depends=[BBmisc checkmate deldir ggplot2 lhs reshape2 vegan]; }; graphframes = derive2 { name="graphframes"; version="0.1.2"; sha256="1bv7d0sggwab4rd486ayw9gkb5ja5p5fin5pn92xnrmz8cgwsfxq"; depends=[forge sparklyr tibble]; }; @@ -10281,17 +10429,19 @@ in with self; { graphon = derive2 { name="graphon"; version="0.3.5"; sha256="1x61pdsb3s1vi1iiy9pjq0iz0m5j5b6q3rqhwvx9kvmg4r8yifpv"; depends=[Rdpack ROptSpace]; }; graphql = derive2 { name="graphql"; version="1.5"; sha256="0zi1l93yk5rlgdy4j2nph14w0h8kgvnbzk9fi2jfys8s3fz54ksr"; depends=[jsonlite Rcpp]; }; graphsim = derive2 { name="graphsim"; version="1.0.2"; sha256="09is0yr17vxr08zb3p240n0aapm63418dzx4ilwq08y8050jqqr7"; 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]; }; grates = derive2 { name="grates"; version="0.3.0"; sha256="0ycgh6fzrsjv3n0wzcaybk686lq074krayz5jfx690iqj5fjkjqi"; depends=[clock ellipsis rlang vctrs]; }; - gratia = derive2 { name="gratia"; version="0.6.0"; sha256="1425dq805a0hk1w243y0mzvdyqvi0n08ghwvsgfwdx3i0d066nba"; depends=[dplyr ggplot2 mgcv mvnfast patchwork purrr rlang tibble tidyr vctrs]; }; + gratia = derive2 { name="gratia"; version="0.7.0"; sha256="02yg6ab23yvkx0yshybayal6dfjvrq9hligfg5rj0mlvl7dnz3ad"; depends=[dplyr ggplot2 lifecycle mgcv mvnfast nlme patchwork purrr rlang stringr tibble tidyr tidyselect vctrs]; }; graticule = derive2 { name="graticule"; version="0.1.6"; sha256="0y8cyhlfm8amdb23cvxy508mpd4d64xgnk1xlr37ss2pqrxdhpir"; depends=[geosphere quadmesh raster sp]; }; - gratis = derive2 { name="gratis"; version="0.2.1"; sha256="035jk2nc8xs0n3ak6k6i42h5gw2n57rrrarb1xwb17khg05dzk25"; depends=[doRNG dplyr foreach forecast GA magrittr mvtnorm polynom purrr shiny tibble tsfeatures tsibble]; }; - grattan = derive2 { name="grattan"; version="1.9.0.9"; sha256="177mq9iy3p17dzxx8jlw2pnj3fvw9wpiwl66z22534fxm9wrskwm"; depends=[assertthat checkmate data_table fastmatch forecast fy hutils hutilscpp ineq magrittr Rcpp zoo]; }; + gratis = derive2 { name="gratis"; version="1.0.0"; sha256="0dkgbha7ijwvddqxcnfn9gfz29kjzykifbr252qp3qjzkdqw50hi"; depends=[doRNG dplyr foreach forecast GA generics magrittr mvtnorm polynom purrr shiny tibble tsfeatures tsibble]; }; + grattan = derive2 { name="grattan"; version="1.9.0.10"; sha256="09724322yrylq9i38j4vb41p4vvfz14h40gjb7r60kkybzpjvkwn"; depends=[assertthat checkmate data_table fastmatch forecast fy hutils hutilscpp ineq magrittr Rcpp zoo]; }; 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="0.9.9"; sha256="1x912mg7cnday7lji48mw9f5drd732qlnrq4d6d75s5pgfps91p6"; depends=[censReg dplyr glm2 lmtest magrittr MASS multiwayvcov purrr Rdpack rlang sandwich survival tibble tidyr]; }; + gravity = derive2 { name="gravity"; version="1.0"; sha256="1xbdw1gl3vsjfg90bb1pqy4jhp2wd4ss96z2xd3pbgyanf6fkdkf"; depends=[censReg dplyr glm2 lmtest magrittr MASS multiwayvcov purrr Rdpack rlang sandwich survival tibble tidyr]; }; + greatR = derive2 { name="greatR"; version="0.1.0"; sha256="1h1qrgpydh3rqrccr05rp2y2n05k84gjmnp2bj3ffdpflhhp0yiz"; depends=[cli cowplot data_table dplyr ggplot2 ggpubr ggrepel magrittr rlang Rtsne scales stringr viridis]; }; grec = derive2 { name="grec"; version="1.4.1"; sha256="1vy3idjvayzx9j9pf5bv5bxycjca3w3c4x4lzzbrdi3c97508sa8"; depends=[imagine raster]; }; greed = derive2 { name="greed"; version="0.5.1"; sha256="1g33wzcld9gh4x7nhbfb022xjrn2lz8dwf4aqir8ymm0sr6cln87"; depends=[cba future GGally ggplot2 ggpubr listenv Matrix Rcpp RcppArmadillo RSpectra]; }; greekLetters = derive2 { name="greekLetters"; version="0.0.7"; sha256="0r6c4y6dnd3mm5i7y5cy7xz3w2j7qkfkkvxg9ig138has6115gjj"; depends=[assertthat stringr]; }; - greeks = derive2 { name="greeks"; version="0.4.1"; sha256="0szs1hyzh31mvbys5c4bc96rlq5z0514q1jz0v8kb8l0209bb539"; depends=[dqrng magrittr matrixStats Rcpp]; }; + greeks = derive2 { name="greeks"; version="0.5.0"; sha256="0nwpw9iqczm4i2asqsh679s5pd2ia7ifdjaz6mdml1gdjkp85zlk"; depends=[dqrng magrittr Rcpp]; }; greenclust = derive2 { name="greenclust"; version="1.1.0"; sha256="198ix55x8cl5wx09p6ahzy3bvig86mvqf2qywjfilp6b4hnjgk7l"; depends=[]; }; gregRy = derive2 { name="gregRy"; version="0.1.0"; sha256="1b8c8wwp8r2v51ayy7rbav24wfz75z1pylg0p4vsasaw9p06dlbz"; depends=[dplyr magrittr purrr tidyr]; }; gremes = derive2 { name="gremes"; version="0.1.0"; sha256="1ih5303sis2icic1q13gh6h3qbb1fzw0j7pdla75csiffjc77hw7"; depends=[abind copula gRbase gRim igraph mev mvtnorm quadprog]; }; @@ -10302,7 +10452,7 @@ in with self; { gretel = derive2 { name="gretel"; version="0.0.1"; sha256="1yyj4aing56f2vy0gshxwb623g9idg8k4701v3s53lqn4m2ybazk"; depends=[Rcpp ResistorArray]; }; gretlR = derive2 { name="gretlR"; version="0.1.0"; sha256="0lpznicpjlvp5kkhmlfr4as7px545k416i3f54900jnc7xa7fm8p"; depends=[knitr]; }; grex = derive2 { name="grex"; version="1.9"; sha256="0s6nan76rrmh3yhgvzb7pqdrzx2w9px8ay4v9yiib4bamy9wmhpb"; depends=[]; }; - greybox = derive2 { name="greybox"; version="1.0.2"; sha256="12h2lj2xwa5mp6id28a1z2b5nzgdkx00z7rpzjlyc6h2hdysw4pl"; depends=[lamW nloptr pracma Rcpp statmod texreg zoo]; }; + greybox = derive2 { name="greybox"; version="1.0.4"; sha256="03k8g5wjn3jvw037ibavppbghc9zbj70w8q45rrv02gy5n5ph5c4"; depends=[generics lamW nloptr pracma Rcpp statmod texreg zoo]; }; greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; }; grf = derive2 { name="grf"; version="2.0.2"; sha256="01dmakzwgpkjqqhfvvgj356zklmqkhfprczb1xg2saknayh22gq4"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; }; gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; @@ -10312,8 +10462,8 @@ in with self; { gridGeometry = derive2 { name="gridGeometry"; version="0.2-0"; sha256="0y7y1ld03cqpibmjssid6n3n8gf98hi9ngcfbkh6acyzck812bc7"; depends=[polyclip]; }; gridGraphics = derive2 { name="gridGraphics"; version="0.5-1"; sha256="12yswy02j3h5wir7m5jnkhpjmb0sa4snn61vjd68i49qwsa6w219"; depends=[]; }; gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; }; - gridSVG = derive2 { name="gridSVG"; version="1.7-2"; sha256="0vxhdz6a759q6q9lpmyjwkvrjr52dfz609jbwrd0pnfyffmmpzh0"; depends=[jsonlite XML]; }; - gridpattern = derive2 { name="gridpattern"; version="0.3.1"; sha256="1lyxq43j9zpql27mijrd53kj24fnkwvcn1zmrh9xc4i5jmfqmkqs"; depends=[glue memoise png rlang sf]; }; + gridSVG = derive2 { name="gridSVG"; version="1.7-4"; sha256="1jspjn56yrkx98hhs98npzm0k0kwpv8x1hg40kphx5ikhvincxmr"; depends=[jsonlite XML]; }; + gridpattern = derive2 { name="gridpattern"; version="0.5.1"; sha256="1yql0kwp7rs95w1iqh5qwd5s9bfpzrqqrr2z84z7l7n6yxkgfs9w"; depends=[glue memoise png rlang sf]; }; gridsampler = derive2 { name="gridsampler"; version="0.6"; sha256="0wqpqg9c372sv8zqks6v93gawiyfghw58hn7m8q45dxpqm16ss3k"; depends=[BiasedUrn ggplot2 plyr reshape2 shiny shinyBS shinythemes]; }; gridtext = derive2 { name="gridtext"; version="0.1.4"; sha256="131kw7nkfwksviwfifd2kk7lyvhxzzzv1nnj8rahkr3dik3akk61"; depends=[jpeg markdown png Rcpp RCurl rlang stringr xml2]; }; gripp = derive2 { name="gripp"; version="0.2.20"; sha256="0rshipm8rdynl19a4dsvvvlhkd0n4vjfkidwnv5iilc5ini7c4qr"; depends=[GA GenSA usethis]; }; @@ -10329,10 +10479,10 @@ in with self; { 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.0"; sha256="1s642fj0zwr6lw5dwf4y351igz0y2yl7g42wa8wi1wpa65p62553"; depends=[checkmate dplyr lifecycle numbers plyr purrr rearrr rlang tibble tidyr]; }; - grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; }; groupedSurv = derive2 { name="groupedSurv"; version="1.0.4.2"; sha256="015av2087i0vxh3axl91crwvparhpc4w2p2j9fq7wylg1gsarraa"; depends=[BH doParallel foreach qvalue Rcpp RcppEigen]; }; groupr = derive2 { name="groupr"; version="0.1.0"; sha256="1gych92dpyxg2vfm3h6djw61d9z2n6q2kvbz1xpq1p0zcyiw16gy"; depends=[dplyr purrr rlang tibble tidyr vctrs]; }; groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; }; + groupwalk = derive2 { name="groupwalk"; version="0.1.1"; sha256="1l7yk0nllap4q0sqybj4bl93399ddn6xc0bbrgrvsk9qvzywgd9q"; depends=[]; }; grove = derive2 { name="grove"; version="1.1"; sha256="0fqsj5dx7py7cin3hvfkxglh8v3x0dwj6cxy4h5vbddjl687db5x"; depends=[Rcpp RcppArmadillo wavethresh]; }; 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]; }; @@ -10346,16 +10496,15 @@ in with self; { grplasso = derive2 { name="grplasso"; version="0.4-7"; sha256="0jf48ahc6d6biwx235dlvbk1papxkqbcnvxsr93p5047pjm02y3a"; depends=[]; }; grplassocat = derive2 { name="grplassocat"; version="1.0"; sha256="0pi5vq7yqg0ha91y6296ckshxyq3135cg6zcs9x6xba5m5024k4p"; depends=[grplasso]; }; grpreg = derive2 { name="grpreg"; version="3.4.0"; sha256="1bfnahkb249996m3qmf96g4ldgnw7xfcm2wr45ccrlk3mw5x4mzx"; depends=[Matrix]; }; - grpsel = derive2 { name="grpsel"; version="1.1.1"; sha256="1nzxkbrv58d3rdqdk4db4r927zmb88fb1w0ak2b7lbyda87farld"; depends=[ggplot2 Rcpp RcppArmadillo]; }; + grpsel = derive2 { name="grpsel"; version="1.2.0"; sha256="0lgm1aisxphds99m96r9i39rb8wc6ljjm6j9b32q0x930wh3sn8n"; depends=[ggplot2 Rcpp RcppArmadillo]; }; grpseq = derive2 { name="grpseq"; version="1.0"; sha256="187c3y3rsls1a66phb6kvndfh0rz7h8kl6w10gi9k6r8q6isvl9i"; depends=[mvtnorm]; }; grr = derive2 { name="grr"; version="0.9.5"; sha256="0arbcgrvhkwb5xk4nry1ffg2qj0v8ivhjghdr505ib4357g0c9i9"; depends=[]; }; grt = derive2 { name="grt"; version="0.2.1"; sha256="1dw5rjs82r82l6qryyyq9cczm770v4iv60d7pi1nb4b0733ndbd5"; depends=[MASS]; }; - gsDesign = derive2 { name="gsDesign"; version="3.2.1"; sha256="09chif5shwyq47rbhr1cwdfcncxj746shwbd4ldgcslrz2xcbdf7"; depends=[dplyr ggplot2 magrittr rlang tidyr xtable]; }; + gsDesign = derive2 { name="gsDesign"; version="3.2.2"; sha256="1r2yz34v7lrh0vzbhby9raxbspfmlfnk4904kr2nz1w5aj0280q7"; depends=[dplyr ggplot2 magrittr rlang tidyr xtable]; }; gsEasy = derive2 { name="gsEasy"; version="1.4"; sha256="1m3vrwcbkswr0b6rzyydxaibda6lv1m9kmxm9yh2sphk4mdwqxxj"; depends=[ontologyIndex Rcpp]; }; gsalib = derive2 { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; }; gsarima = derive2 { name="gsarima"; version="0.1-5"; sha256="0nmn4hlvhl8dw7pkpf010x9qjd6w8drdlcj47qv0sap8wngrwhzg"; depends=[MASS]; }; gsbDesign = derive2 { name="gsbDesign"; version="1.0-2"; sha256="1q958l9f03lk0wpcgqxqwcbj6jlgkmj6vj4gyj51pp8kfkxal59x"; depends=[gsDesign lattice]; }; - gsbm = derive2 { name="gsbm"; version="0.2.1"; sha256="16j4g0wl9phmx85dbrzxsdjcv0nnipgj214fvbz9m6n66khr5pkp"; depends=[doParallel foreach Matrix RSpectra softImpute]; }; gscaLCA = derive2 { name="gscaLCA"; version="0.0.5"; sha256="12zksjp0wh95qg7vxh22z652hk35r9sp0qxrms4y1laixa8vr71x"; depends=[devtools doSNOW fastDummies fclust foreach ggplot2 gridExtra MASS nnet progress psych stringr]; }; gscounts = derive2 { name="gscounts"; version="0.1-4"; sha256="1wcna4bcm38ivmys5hv30b72bvn0ja0n30zhwns94n4v2z1d24k4"; depends=[Rcpp]; }; gset = derive2 { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; }; @@ -10375,13 +10524,13 @@ in with self; { gsubfn = derive2 { name="gsubfn"; version="0.7"; sha256="00j6b8b6xsx6v370h220x233rpk6asca78165y3d48jpwvwisdc9"; depends=[proto]; }; gsw = derive2 { name="gsw"; version="1.0-6"; sha256="1sqxxbghsii5lph4r9j6w752zd95xxi2hwfbz6d7jxsplwyyfz0l"; 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.3.1"; sha256="06b029z32za010pfjj1pp5nqjamc58k87nxj5fsx2mpi8vjgxlfx"; depends=[base64enc bitops checkmate commonmark dplyr fs ggplot2 glue htmltools magrittr rlang sass scales stringr tibble tidyselect]; }; + gt = derive2 { name="gt"; version="0.4.0"; sha256="1sqb2a9amc0xwbm7vshs290aikhy9bd744qyx18j7c45rp6p8v9g"; depends=[base64enc bitops checkmate commonmark dplyr fs ggplot2 glue htmltools magrittr rlang sass scales stringr tibble tidyselect]; }; gt4ireval = derive2 { name="gt4ireval"; version="2.0"; sha256="1d567iz57xqszm45l1wq4n2qrrmyz8ssll1vllfmncb9ibbnx4f3"; depends=[]; }; gtWAS = derive2 { name="gtWAS"; version="1.1.0"; sha256="1kbkz0iwc3gfj982m93m2wdr1xm5rhy70k6bdc7kms9ivh5fh6sh"; depends=[]; }; gtable = derive2 { name="gtable"; version="0.3.0"; sha256="1lyncxf2dqdjgw1071cn9c8zwzkz6sldnd5cgmicf70bc726qf7x"; depends=[]; }; gtcorr = derive2 { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; }; gte = derive2 { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; }; - gtfs2gps = derive2 { name="gtfs2gps"; version="1.5-4"; sha256="0hqqi4gm6zbrys0yd0ayyas2pxfx4r98fi45rfmdzffrx8qd0p9r"; depends=[data_table furrr future gtfsio lwgeom magrittr pbapply progressr raster Rcpp readr rgdal rgeos sf sfheaders sp units]; }; + gtfs2gps = derive2 { name="gtfs2gps"; version="2.0-1"; sha256="10v8b7qs0s5w4api08acjgll8zs1frz4ar02g68gmipwks5d6mvg"; depends=[data_table furrr future gtfsio lwgeom magrittr pbapply progressr Rcpp readr sf sfheaders terra units]; }; gtfsio = derive2 { name="gtfsio"; version="1.0.0"; sha256="05210ii5b754ryk296knqm3sf9yi5xwvcrq6rb9w71njqgvykwcj"; depends=[data_table zip]; }; gtfsrouter = derive2 { name="gtfsrouter"; version="0.0.5"; sha256="0yxgc4pi0g2wqswvwba0ij263i8b8p6wgsy6hbvklq0gim616shi"; depends=[cli data_table geodist Rcpp]; }; gtfstools = derive2 { name="gtfstools"; version="1.0.0"; sha256="0qwpnhjl80g0h0samsh8hs3df85ax329aaaxgjzn5b8h6xi31p6z"; depends=[checkmate cpp11 data_table gtfsio sf sfheaders units]; }; @@ -10389,35 +10538,33 @@ in with self; { gtools = derive2 { name="gtools"; version="3.9.2"; sha256="0lx97yafrms2mjym8rhcq5586z7s1iqgy8qfm4px3xl1yn5qkc83"; depends=[]; }; gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; }; gtrendsR = derive2 { name="gtrendsR"; version="1.5.0"; sha256="15jpda67c81j9qsjcx1kffk0my198z7myafsdw91chj7hjzyw6kl"; depends=[anytime curl ggplot2 jsonlite]; }; - gtsummary = derive2 { name="gtsummary"; version="1.5.0"; sha256="19qi0w1ymvaw9m3l1ynj681q4bqhrnjn0ir8jg50ia5jql8mxpal"; depends=[broom broom_helpers cli dplyr forcats glue gt knitr lifecycle purrr rlang stringr tibble tidyr]; }; - guaguas = derive2 { name="guaguas"; version="0.2.0"; sha256="1b5bmjd3l9npmjlmd3qq3kxcrm1dqv8m60s89fcybjlaf0942ms8"; depends=[]; }; + gtsummary = derive2 { name="gtsummary"; version="1.5.2"; sha256="1vmzlpn7h68cgxpnsh49qj6xzanhrxa2v3d1f4s96y6kwla0s395"; depends=[broom broom_helpers cli dplyr forcats glue gt knitr lifecycle purrr rlang stringr tibble tidyr]; }; + guaguas = derive2 { name="guaguas"; version="0.3.0"; sha256="0ngdwg297ndn763vx0qnvcsy5bhsr026hv8hvwgrz5w32mpw252d"; depends=[]; }; guardianapi = derive2 { name="guardianapi"; version="0.1.1"; sha256="17xmmr6pfzhdnmf45jzvk84gbfnmlw1qfv1gqjaw85vgm8b6jn6l"; depends=[dplyr httr jsonlite rlang tibble]; }; guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; }; - guf = derive2 { name="guf"; version="1.0.2"; sha256="1dfmja2da211pcid4hr7x9q0sgz37756rpykm1ax862avdl8hsmc"; depends=[]; }; - guiplot = derive2 { name="guiplot"; version="0.1.0"; sha256="0h14ki1lwr9gln9yqhg2y81sgnz60sjy31cygxplapf215xbmjs2"; depends=[DT ggplot2 magrittr R6 rlang shiny svglite]; }; + guiplot = derive2 { name="guiplot"; version="0.2.0"; sha256="03anbbd5iqmjv12aqgcmii5s0shig0vikz1rhabjrhpz9scabc53"; depends=[DT ggplot2 magrittr R6 rlang shiny svglite]; }; 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]; }; gunit = derive2 { name="gunit"; version="1.0.0"; sha256="0vmm47f21n9f334aj38gzrmv1c4sp76njk95ld9gv6fcfxgsipyh"; 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.3"; sha256="08az0j9cfalf2jf6qhsxhml3ranvacan85xp4d6zqdrgly00qsr2"; depends=[Matrix]; }; gutenbergr = derive2 { name="gutenbergr"; version="0.2.1"; sha256="0rsk583x4i1ac6rbxr5f5cmczr4525bkv20jw7777n8fwn91zvyr"; depends=[dplyr lazyeval purrr readr stringr urltools]; }; - gvc = derive2 { name="gvc"; version="6.0.0"; sha256="0sn2rhab39biqbmab7z12wkyar5h44hzdvds94ybyb1dgcsa3sfl"; depends=[decompr diagonals]; }; + gvc = derive2 { name="gvc"; version="6.2.1"; sha256="1ndg0hmnzn30i5xqp454lp5gwmfl4x3fwpcmjzj3by9i1aa8z2a3"; depends=[decompr diagonals]; }; gvcR = derive2 { name="gvcR"; version="0.1.0"; sha256="0r54924b9a65k11p8y3p7jxbvmpb7s7vs87v65hhl98gxacj5hk8"; depends=[dplyr eda4treeR lme4 magrittr]; }; gvcm_cat = derive2 { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; }; gvlma = derive2 { name="gvlma"; version="1.0.0.3"; sha256="16dhd407bwjs91c3p9kk43646197s7n9vbyghxb4ckrpv3fsaxp0"; depends=[]; }; gwaRs = derive2 { name="gwaRs"; version="0.3.0"; sha256="1mjwsf1sbrd88psiz6f74zddv1wvhpxk5nxbfjpdrxs74rkc36fs"; depends=[data_table dplyr ggplot2 ggrepel RColorBrewer scales tidyr]; }; gwasforest = derive2 { name="gwasforest"; version="1.0.0"; sha256="122fg4pc409lvw4yvrc8ijm6d6j29b4aacd319a16caxkkydgwlb"; depends=[colorspace data_table dplyr ggplot2 ggrepel glue]; }; gwasrapidd = derive2 { name="gwasrapidd"; version="0.99.12"; sha256="0pn7mdip361s2l3nqmjl0zqmr0g5406cfr1v5l20m2gkacxqfds6"; depends=[assertthat concatenate dplyr glue httr jsonlite lubridate magrittr pingr plyr progress purrr rlang stringr testthat tibble tidyr urltools]; }; - gwdegree = derive2 { name="gwdegree"; version="0.1.1"; sha256="0p06hjp7vay83kbpqsgfr1d8z3ayv483rxbv86fdka94gvi1sjyc"; depends=[dplyr ergm ggplot2 gtools magrittr network scales shiny shinydashboard sna tidyr]; }; + gwavr = derive2 { name="gwavr"; version="0.1.0"; sha256="04myyx5jll0xiarsdj513rlqg5hci1204kyzfknff874l2qxm2j7"; depends=[dplyr httr jsonlite leaflet leaflet_extras magrittr miniUI nhdplusTools promises purrr scales sf shiny shinyWidgets tidyr units]; }; gwer = derive2 { name="gwer"; version="3.0"; sha256="0jiq5v37mbn6y7vl5gs8qahb796jrfqj0m54sd38vim8yhhjwfy8"; depends=[assertthat glogis GWmodel maptools Matrix sp spData spdep spgwr]; }; - gwerAM = derive2 { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; }; 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-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; - gwsem = derive2 { name="gwsem"; version="2.1.3"; sha256="0jvwgam7y2zxpcqc1idxjbfjva8rjjv13vlgsagcxryppahbk0n1"; depends=[BH data_table lifecycle OpenMx qqman Rcpp]; }; gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; }; - h2o = derive2 { name="h2o"; version="3.36.0.1"; sha256="17i0mmsaq6c8xy8qm4ib7z7vd8n8bpy7wxw1ik93bk7m1yy35y89"; depends=[jsonlite RCurl]; }; + gyro = derive2 { name="gyro"; version="0.1.0"; sha256="0knghb9hb9f1vli860qcaklb4d6pfmzyyx5ffyld7mimwmcwxyns"; depends=[clipr cxhull Morpho purrr rgl rstudioapi Rvcg]; }; + h2o = derive2 { name="h2o"; version="3.36.0.3"; sha256="0jn1nkh5vgcx6dqzja64fr3qlpn34r7ajgnivqdfqkcjhbj6j8qn"; depends=[jsonlite RCurl]; }; h2o4gpu = derive2 { name="h2o4gpu"; version="0.3.3"; sha256="004sskj3a1mzjfh86m0rq02z1f3kd6650bzv1d3j8pj0xdmqb86c"; depends=[magrittr reticulate]; }; h3jsr = derive2 { name="h3jsr"; version="1.2.3"; sha256="0amj7ks83zisy18fgnsy6zx4rg88ldyr0vhanh96dw3fbhhdh7kc"; depends=[geojsonsf sf tidyr V8]; }; hBayesDM = derive2 { name="hBayesDM"; version="1.1.1"; sha256="16ilkmhyb7lgfd8s2qhjg952gfwkmfg154w4nw306j988a2ivc6h"; depends=[BH data_table ggplot2 loo Rcpp RcppEigen rstan StanHeaders]; }; @@ -10426,14 +10573,15 @@ in with self; { 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.1"; sha256="1jwqjzr0zpckzh2jpqh17v6ypq4mzn5khlv6p37y59zz8bh9mvxp"; depends=[coda]; }; - haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; }; hablar = derive2 { name="hablar"; version="0.3.0"; sha256="12gm5n3p2kmjwhkf60n4bjn3lrj7lrs5sgmvads9sfp2ckhaiysk"; 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.1"; sha256="1gf80drfriw0x86mf4bwlvjypz1q7vcjk35c9df5mms6ly1dnfkc"; depends=[dplyr future_apply rlang tibble tidyr]; }; + hacksig = derive2 { name="hacksig"; version="0.1.2"; sha256="0sc35vyi00r2b3hgn1xw2zffd704adschjwhx0niv5a1l33dxbkp"; depends=[dplyr future_apply rlang tibble tidyr]; }; hadron = derive2 { name="hadron"; version="3.1.2"; sha256="04qd3lb6im5shf24ss88jkskab1rwn7m2d94x0ybbmfcg3l5dhm0"; depends=[abind boot dplyr R6 Rcpp stringr]; }; hagis = derive2 { name="hagis"; version="3.1.3"; sha256="1x2vnym7da8kbj3ifi09z9dlqgprh73n03535gankqzd6pd7n1k4"; depends=[data_table ggplot2 pander]; }; hakaiApi = derive2 { name="hakaiApi"; version="1.0.0"; sha256="0wk0qmg2g1hj6bsvhr5xys02l32adn1qypv8rdma643qfvlcp46c"; depends=[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]; }; hamlet = derive2 { name="hamlet"; version="0.9.6"; sha256="076fh28grlrv38qywshi79m84jsz1ck9k4n0rg4svvr3gqkdbcn2"; depends=[]; }; handlr = derive2 { name="handlr"; version="0.3.0"; sha256="0l0jwlslz2pyg7q447k56acfhgmx5njsriqdrwd02zzbsc3g6wm5"; depends=[crul jsonlite mime urltools xml2 yaml]; }; @@ -10446,11 +10594,12 @@ in with self; { haploR = derive2 { name="haploR"; version="4.0.6"; sha256="1cg92v64xdzmr5hbjhd11rz6rkdddsxcxkqdgbj5hd1ldqsrjj45"; 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.2"; sha256="07grdwli0kxnnnf7mg8z7gjpny88h71vf867g50f08yybgb46y70"; depends=[ape network phangorn plotrix sna]; }; + happign = derive2 { name="happign"; version="0.1.3"; sha256="099zmz8dsr6hwb9lxlrkndcq5sfm327n0fpxzqr3cr4f52pgwvmx"; depends=[curl dplyr httr magrittr sf stars tidyr xml2]; }; happytime = derive2 { name="happytime"; version="0.1.0"; sha256="03iblwb6w2dh9sibfi4nlswidck13hzsn7123838zp4sxfnrp041"; depends=[]; }; hapsim = derive2 { name="hapsim"; version="0.31"; sha256="0jw6iw89d4y8wjy58biv40szp123ql7frz1mmdjdxljmwaby963h"; depends=[MASS]; }; - hardhat = derive2 { name="hardhat"; version="0.1.6"; sha256="07mx8c24gy0xfmip9hb5w29gp10sfnpnilzc1pi0hjadnrqz8mks"; depends=[glue rlang tibble vctrs]; }; + hardhat = derive2 { name="hardhat"; version="0.2.0"; sha256="0a4nq93cmps5xy8h0qsv6xyzrbsz9ka4iwkrvb8m8v10wq7wm5wl"; depends=[glue rlang tibble vctrs]; }; harmonicmeanp = derive2 { name="harmonicmeanp"; version="3.0"; sha256="17irfw8788yhh36698p9w8wab6wcin1yzfinlbs3gdg70d42zcnd"; depends=[FMStable]; }; - harmonizer = derive2 { name="harmonizer"; version="0.1.0"; sha256="1xrb127irxbbjfvqanj3m8n4wj5qhk6nxmq0633pnm435n9zgrm2"; depends=[]; }; + harmonizer = derive2 { name="harmonizer"; version="0.2.1"; sha256="1zqb375i2bqlw2ag184implm09ydh9g09wbgv6mbnf1gx49qk1dr"; depends=[]; }; harmony = derive2 { name="harmony"; version="0.1.0"; sha256="0jkj9y4j6ja2d6y5j0akmkkgpppprk65i6bwwhs163g918i8qng0"; depends=[cowplot dplyr ggplot2 irlba Matrix Rcpp RcppArmadillo RcppProgress rlang tibble tidyr]; }; 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]; }; @@ -10467,13 +10616,14 @@ in with self; { hbim = derive2 { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; }; hbm = derive2 { name="hbm"; version="1.0"; sha256="0qz28azm91a6pbss1mfc47a21d3q9rs3mmw0kgwc7i2a2m43mysm"; depends=[doParallel foreach Matrix]; }; hbmem = derive2 { name="hbmem"; version="0.3-3"; sha256="1rajd5h9gp0rrpc0q0m0fx37mv2n70da3gnfvvnjc5a77mzfyqkp"; depends=[]; }; - hbsae = derive2 { name="hbsae"; version="1.0"; sha256="1iwmpi0pn5fxyxkwqkbmy6w1f1wcx0p809jnviim0ypwib32mhh7"; depends=[arm Matrix]; }; + hbsae = derive2 { name="hbsae"; version="1.2"; sha256="0fg782gxivkkwhqvxf09j1q20f2dqm7bd1y9bp99fy7mg88zp0gn"; depends=[Matrix]; }; hcandersenr = derive2 { name="hcandersenr"; version="0.2.0"; sha256="0r8z8kb9hwvgcsxbd7arbmqclhwlbcjpnf3p9mp5vgyxm84iz515"; depends=[]; }; hcc = derive2 { name="hcc"; version="0.54"; sha256="14b3pamkywb0wsjpbm0wpflcds0b5mfymvgk92rmf6ngz1bkpdbq"; depends=[]; }; hcci = derive2 { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; }; hchinamap = derive2 { name="hchinamap"; version="0.1.0"; sha256="1pia593g50zf3286f9g51slkvrpj1iy7lws9d7a3nqgb2v3yji1y"; depends=[htmlwidgets]; }; hcp = derive2 { name="hcp"; version="0.1"; sha256="0hhcy70g13kclxv733kgiys7qn5bi28abpkli5n2vj0a58ac333m"; depends=[]; }; hctrial = derive2 { name="hctrial"; version="0.1.0"; sha256="19li8i8hx0r3b63q80cnj6pr72rdbmykxq0kcfbn4azq3sdd046y"; depends=[clinfun GenBinomApps]; }; + hdImpute = derive2 { name="hdImpute"; version="0.1.0"; sha256="1n0y3k4rbjq1b2cr13c6axnx2c253ahch6ys53sb5v15xns78954"; depends=[dplyr magrittr missForest missRanger plyr purrr tibble tidyselect tidyverse usethis]; }; 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]; }; hdbm = derive2 { name="hdbm"; version="0.9.0"; sha256="0lvaica195chl6bb10wvvr7fbmh8b954fpxcm9r0gyp0d0i2a2w4"; depends=[Rcpp RcppArmadillo]; }; @@ -10492,11 +10642,11 @@ in with self; { hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; }; healthcareai = derive2 { name="healthcareai"; version="2.5.0"; sha256="05qsmgrnaagnavlrs9c6j01j9c3lcc9j7cmbrx3y6lb6pf4zs195"; depends=[caret cowplot data_table dplyr e1071 generics ggplot2 glmnet lubridate MLmetrics purrr ranger recipes rlang ROCR stringr tibble tidyr xgboost]; }; healthfinance = derive2 { name="healthfinance"; version="0.1.0"; sha256="163zhdd5mqp0q872dmr3xzw2ppapnwp46rr7vkkfnglz635nxvpz"; depends=[ggplot2 lubridate readr scales shiny tibble]; }; - healthyR = derive2 { name="healthyR"; version="0.1.6"; sha256="1px9c0i0qf0b85nbwjv0cccy2viqvi6c2pd1vx3s6yncj3vx3a5x"; depends=[cowplot dplyr ggplot2 ggrepel lifecycle lubridate magrittr plotly purrr rlang scales sqldf stringr tibble tidyr timetk writexl]; }; - healthyR_ai = derive2 { name="healthyR.ai"; version="0.0.4"; sha256="0nxz4fsxp7ra3inb7qpj2xp49980ksqjr9wz18yi9l969swhqv6c"; depends=[broom dplyr forcats ggplot2 ggrepel h2o magrittr parsnip purrr recipes rlang rsample tibble tidyr]; }; + healthyR = derive2 { name="healthyR"; version="0.1.8"; sha256="0phqlf38g38rrvp1h8cvcfqrnb4bik2ndhsli5nkhlhywh4azjfm"; depends=[cowplot dplyr ggplot2 ggrepel lubridate magrittr plotly purrr rlang scales sqldf stringr tibble tidyr timetk writexl]; }; + healthyR_ai = derive2 { name="healthyR.ai"; version="0.0.6"; sha256="0vpry1ixnwh6nfjx36xk6pql57ym84xzw5jmanzbnbsf8jnnq1zy"; depends=[broom dplyr forcats ggplot2 ggrepel h2o magrittr purrr recipes rlang tibble tidyr]; }; healthyR_data = derive2 { name="healthyR.data"; version="1.0.1"; sha256="18b7aqdy9a0ldf2ib2d0a07k6bfmgdp61y8hl8yl19v35nqj6dvh"; depends=[]; }; - healthyR_ts = derive2 { name="healthyR.ts"; version="0.1.7"; sha256="04sihmw238ddd3c9zp16lf579czzahxdbikwn5g26c6g8a5z44wp"; depends=[cowplot dplyr earth forcats ggplot2 lubridate magrittr modeltime parsnip plotly purrr recipes rlang stringi tibble tidyquant tidyr timetk workflowsets]; }; - healthyverse = derive2 { name="healthyverse"; version="1.0.1"; sha256="088vf0va382341jri9y8p5ygdz76jv3fnjf6y0ldf535grifb3dc"; depends=[cli crayon dplyr healthyR healthyR_ai healthyR_data healthyR_ts magrittr purrr rlang rstudioapi tibble]; }; + healthyR_ts = derive2 { name="healthyR.ts"; version="0.1.8"; sha256="09p3bc4ajdhr13k8hgwa6mha9p6l5p61fq4sgki0w6f2g2gcqrkq"; depends=[cowplot dplyr earth forcats ggplot2 lubridate magrittr modeltime parsnip plotly purrr recipes rlang stringi tibble tidyquant tidyr timetk workflowsets]; }; + healthyverse = derive2 { name="healthyverse"; version="1.0.2"; sha256="1ngxadwpd62lx6y41szqckv1f2j8ja1hy4qx08vccpjbmlcg8v1b"; depends=[cli crayon dplyr healthyR healthyR_ai healthyR_data healthyR_ts magrittr purrr rlang rstudioapi tibble 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]; }; @@ -10538,6 +10688,7 @@ in with self; { hexbin = derive2 { name="hexbin"; version="1.28.2"; sha256="0bbhs5pwxh474w62sq6gqvih7habancxng9wd4f2rgn6lv9zhhb2"; depends=[lattice]; }; hextri = derive2 { name="hextri"; version="0.6"; sha256="05rvigi225npncbr1brc6apc7gsg9a5jzcbmhvflwp3hbcg3hn02"; depends=[FNN hexbin]; }; hflights = derive2 { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; }; + hfr = derive2 { name="hfr"; version="0.5.0"; sha256="0wq48x22xmshw4d3i3n0q47h2y9h646fw578kahvfhh9ksxbpf94"; depends=[dendextend quadprog RColorBrewer RcppArmadillo]; }; hglasso = derive2 { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; 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]; }; @@ -10546,10 +10697,10 @@ in with self; { hhcartr = derive2 { name="hhcartr"; version="1.0.0"; sha256="104xy3ihpi031pyzifnpc0jfq68gsbc12gzv6hp1vjrgy0nqw5l1"; depends=[bookdown captioner checkmate DiagrammeR DiagrammeRsvg ggplot2 hash Matrix rsvg]; }; hhh4contacts = derive2 { name="hhh4contacts"; version="0.13.1"; sha256="1cqwn09iqgh6131cm4b5j0kx7k5vil0ak42v064g4maayj0yqy7p"; depends=[surveillance]; }; hhi = derive2 { name="hhi"; version="1.2.0"; sha256="1yl52c3nqdi8v60sr01l0vv8359803dm2i4c9ifazgj3h3a4h0yp"; depends=[ggplot2]; }; - hhsmm = derive2 { name="hhsmm"; version="0.2.3"; sha256="0m6fx4d8xm0jvcygmhwnjbmq8jvzmfwhkj1hrf9dpsryp44hk2hf"; depends=[CMAPSS MASS mice mvtnorm Rcpp Rdpack]; }; + hhsmm = derive2 { name="hhsmm"; version="0.3.1"; sha256="1jxic441bg7g15fv4jvl6xfrl61781s7p7x05wcfqayia82c76vr"; depends=[CMAPSS cpr magic MASS mice mvtnorm progress psych Rcpp Rdpack splines2]; }; hht = derive2 { name="hht"; version="2.1.4"; sha256="0i4rjr507k555pvf7q6y6b3df56rjc6igrv8dk0mhyfws49jw9m9"; depends=[EMD fields spatstat spatstat_core spatstat_geom spatstat_linnet]; }; hiPOD = derive2 { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; }; - hibayes = derive2 { name="hibayes"; version="1.0.0"; sha256="1bpn2d59fbp7b286sl1izfzlfygqc8m5f7p1d8a4jg1fh1yyxzxm"; depends=[BH bigmemory Matrix Rcpp RcppArmadillo RcppProgress]; }; + hibayes = derive2 { name="hibayes"; version="1.0.1"; sha256="0ah81gwbsz2j466jwk39w6h4fi02ivwxi9ppir9svyf1nxig409j"; depends=[BH bigmemory Matrix Rcpp RcppArmadillo RcppProgress]; }; hiddenf = derive2 { name="hiddenf"; version="2.0"; sha256="0shc1kfiq527mkc5i97zcm51hsvknnhjg7dyfvbfqyk145v6sz00"; depends=[]; }; hier_part = derive2 { name="hier.part"; version="1.0-6"; sha256="15wlpb2rsn6am8galsbjiy4psp78nlv1x2hz3cnqbwj508w6gsj0"; depends=[betareg gtools MASS]; }; hierBipartite = derive2 { name="hierBipartite"; version="0.0.2"; sha256="1f6agxrv363wksi33b29v42hys90351ninb4li9m52n0kzv25m1f"; depends=[irlba magrittr]; }; @@ -10565,14 +10716,14 @@ in with self; { highDmean = derive2 { name="highDmean"; version="0.1.0"; sha256="0z81iw1nb8y4pvmhk8ay9pq4kvqxwxwv8q6p47hy8s2b465sfy1f"; depends=[]; }; highMLR = derive2 { name="highMLR"; version="0.1.0"; sha256="1pb3fgycbrvzbd27p9hmq7wq9b8dbdb3r4q81nr9nnk2d5v00nai"; depends=[coxme dplyr gtools missForest mlr3 mlr3learners mlr3proba survival tibble]; }; highSCREEN = derive2 { name="highSCREEN"; version="0.4"; sha256="1nd4jayfhz89kpk4i7s3n3wlza1ik4w3gspplnjmfz951f8i3wlg"; depends=[gplots]; }; - highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; }; + highTtest = derive2 { name="highTtest"; version="1.2"; sha256="14y2dsdkalrxcj52rsj2aw6b8sdhw2hcvlwz0bmvihj19j6xhaw4"; 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="0.9.1"; sha256="1bbvcp5dw98hgwyzc8gh1rmqjgbbgd673agjs37s6ias8kf2y2nl"; depends=[cubature data_table mvtnorm numDeriv quantmod Rcpp RcppArmadillo RcppRoll robustbase Rsolnp sandwich xts zoo]; }; + highfrequency = derive2 { name="highfrequency"; version="0.9.2"; sha256="02d4ixw74yvzhrkxivi6cm9kahyhgsgzbrngqg7x0ixzli272h63"; depends=[data_table numDeriv quantmod Rcpp RcppArmadillo RcppRoll robustbase Rsolnp sandwich xts zoo]; }; highlight = derive2 { name="highlight"; version="0.5.0"; sha256="1shar4y07wyixg0ichdrn2xhgwkl3mv2pxkalqzisc69w605b3hf"; depends=[]; }; highlightHTML = derive2 { name="highlightHTML"; version="0.2.5"; sha256="0j3zrvil7k5wfsbgfj2b4nbx77qsj3b4makv5angcf8s59p7q80r"; depends=[]; }; highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; }; highr = derive2 { name="highr"; version="0.9"; sha256="0kgdv2vf1lz3b5kbal9s83gg6812nw7fvrq0rkyr0v4k1lwi3zxy"; depends=[xfun]; }; - highriskzone = derive2 { name="highriskzone"; version="1.4.6"; sha256="1nl3l7zq4j0vmkflkl716519llpbixjfknvb6razrrdwi6mml250"; depends=[deldir fields ks maps Matrix mvtnorm rgeos spatstat spatstat_core spatstat_geom]; }; + highriskzone = derive2 { name="highriskzone"; version="1.4.7"; sha256="1ylbmk6a2d6prwips2da6syzxpbfhda93abdw98pjj658p7l3m0r"; depends=[deldir fields ks maps Matrix mvtnorm rgeos spatstat spatstat_core spatstat_geom spatstat_random]; }; higlasso = derive2 { name="higlasso"; version="0.9.0"; sha256="09d500jsxlrv658i90xnb2wj1ad89v1iwb6y7vascyvg3cff104h"; depends=[gcdnet gglasso purrr Rcpp RcppArmadillo]; }; higrad = derive2 { name="higrad"; version="0.1.0"; sha256="0q9av8qyvmvgy6a3l7svcmbkjjgnp4iny1cld4g3qsbaz3yp3jaj"; depends=[Matrix]; }; hilbertSimilarity = derive2 { name="hilbertSimilarity"; version="0.4.3"; sha256="1251df3q7c7c69f8q9y9bxj210bk2dh80c8ca4s58isf0hr2x7zp"; depends=[entropy Rcpp]; }; @@ -10584,7 +10735,7 @@ in with self; { himach = derive2 { name="himach"; version="0.2.3"; sha256="0gc9ii6wqr2calrqgma7dc9vrp0fqxq019cr1ims06h55c5qzand"; 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-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; }; + hint = derive2 { name="hint"; version="0.1-3"; sha256="00ppz8009cp0wbkmrxdg8x9jjqqb803bl6ki13hsqz07aya0j4iy"; depends=[]; }; hiphop = derive2 { name="hiphop"; version="0.0.1"; sha256="0k071kxf04b95f3z5y2h9dhnqrvzwgyhi3q26ghn3s76c155f1k1"; depends=[]; }; hipread = derive2 { name="hipread"; version="0.2.2"; sha256="1y51yif2spl6brqjvb20k9r6xwkr5f6brv08qcl4g9xg561yngff"; depends=[BH R6 Rcpp rlang tibble]; }; hisse = derive2 { name="hisse"; version="2.1.6"; sha256="08pz0ys0hk7kjfz18959v5kkw5xijnkp97l9fagwb8wjgsk5lbb7"; depends=[ape corHMM data_table deSolve diversitree geiger GenSA igraph nloptr paleotree phangorn phytools plotrix subplex TreeSim]; }; @@ -10599,14 +10750,14 @@ in with self; { hkdatasets = derive2 { name="hkdatasets"; version="1.0.0"; sha256="1a594fgwc5bvimwp5m2zpb6pjy4iavcylxdmsq3hrnh9ll5g5582"; depends=[fst]; }; hkevp = derive2 { name="hkevp"; version="1.1.4"; sha256="01m5yywi4vjnwhdayaqaqcp5lz70mllj5ifnwdb4c60wm9aby9pm"; depends=[Rcpp RcppArmadillo]; }; hkex_api = derive2 { name="hkex.api"; version="0.1"; sha256="0hqwihlrppchpaz2yaq92gf779yi5k8n7sxy1kbpjxs2qc18xvj2"; depends=[httr RCurl XML]; }; - hlaR = derive2 { name="hlaR"; version="0.1.1"; sha256="01zw9221may6nslnvdx2ziddjkk67x4vmng1il3wkk98l334i5b8"; depends=[devtools dplyr here purrr readr readxlsb reshape2 schoolmath stringr tibble tidyr tidyverse usethis]; }; + hlaR = derive2 { name="hlaR"; version="0.1.2"; sha256="1n2spkdd41c37rpa6978dlyml3r2rmmjly2ga451ri678s53l7hm"; depends=[devtools dplyr here purrr readr readxlsb reshape2 schoolmath stringr tibble tidyr tidyverse usethis]; }; hlidacr = derive2 { name="hlidacr"; version="0.2.0"; sha256="02l86bvb4w8wdq9mk9zh5wkf5i5y5jlgld0ciz851p5ra70c395p"; depends=[curl glue httr jsonlite purrr stringr urltools usethis]; }; 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=[]; }; hmgm = derive2 { name="hmgm"; version="1.0.3"; sha256="12gaz2pi9ny7y772yzrfvl02p3n89cq1l5dzmcksd172gv9ayyz1"; depends=[binaryLogic glmnet MASS Matrix nat Rcpp rgl]; }; 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]; }; hmlasso = derive2 { name="hmlasso"; version="0.0.1"; sha256="0ydcyz9pw30ji8ghrvkgcbmp27d661vajl97b8cwis52605a3gfx"; depends=[BH MASS Matrix Rcpp RSpectra]; }; - hmm_discnp = derive2 { name="hmm.discnp"; version="3.0-6"; sha256="0jb4ga50d0qy9kz13qjsbwbvyhn8qiqsjsai2m6kvxb7qzd33g26"; depends=[nnet]; }; + hmm_discnp = derive2 { name="hmm.discnp"; version="3.0-7"; sha256="09nr7hmb7iwn8pk6lkcjagkyql53hh68245chx3xxlbvjxy8l471"; depends=[nnet]; }; hmma = derive2 { name="hmma"; version="1.1.0"; sha256="1qsvczqq44h46z0nfblv4rarbg64imz8m0jhxdhva27kbzdvqf97"; depends=[bnlearn graph MCMCpack mhsmm Rgraphviz]; }; 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]; }; @@ -10629,8 +10780,8 @@ in with self; { hoopR = derive2 { name="hoopR"; version="1.5.0"; sha256="1ndw76a733q225r67w6qxhkbbz5f4bll7bxfl3psy58z60qg02dh"; depends=[cli data_table dplyr furrr future glue janitor jsonlite magrittr progressr 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.10.3"; sha256="1dhfsbf4j2acncw0ypg44lkphhznafd80880jxfl6jdhd9fg2nn8"; depends=[MASS Matrix Rcpp RcppEigen Rdpack survey]; }; + hopkins = derive2 { name="hopkins"; version="1.0"; sha256="06fdks0jxv47d9xsyxzx2fdrbjw40dqj26qfkv5wdlcyv3lcfc4y"; depends=[donut pdist RANN]; }; hornpa = derive2 { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; }; - horserule = derive2 { name="horserule"; version="1.0.0"; sha256="0d348pn0ld7lr9lfl1z05905l9kl296j0xic1pib6r5l1c5600r9"; depends=[gbm ggplot2 inTrees MASS mvnfast randomForest RColorBrewer Rdpack]; }; horseshoe = derive2 { name="horseshoe"; version="0.2.0"; sha256="1qhkw6agkhpmgf27429c3kqqhbvpg61l0dvfxg7n564y2ha76r3c"; depends=[]; }; horseshoenlm = derive2 { name="horseshoenlm"; version="0.0.6"; sha256="1m3n12wgmb1wnxc40bzpna261das8hy47l7hmvhfbzhmp7v803v5"; depends=[msm survival]; }; hospitals = derive2 { name="hospitals"; version="0.1.0"; sha256="03bg0fl1wpc7rxlzxgjdk48x8zsd7lv64dcs0fbg573wkhp02vim"; depends=[magrittr stringr tibble]; }; @@ -10653,7 +10804,7 @@ in with self; { hrqglas = derive2 { name="hrqglas"; version="1.0.1"; sha256="1fmizzs7d42dziih5yaj449k1gw6fxraw72z9h1l2jz6qqgd8938"; depends=[MASS Matrix Rcpp]; }; hrt = derive2 { name="hrt"; version="1.0.1"; sha256="0l0hjspncr6pkc3sg11p63k1gy1jmc70g6581ykh6zy0b07zm8rk"; depends=[CompQuadForm Rcpp RcppEigen]; }; hscovar = derive2 { name="hscovar"; version="0.4.2"; sha256="06bkqcp0vcnkp0jqi0qjvxnw0lk0w4mrf88h1769ak7r49vzlr6f"; depends=[foreach Matrix pwr rlist]; }; - hsdar = derive2 { name="hsdar"; version="1.0.3"; sha256="1slb2m62j86hn1kvpv72fvp48sxl7zb2znrr70jqqbrah8n1ynnl"; depends=[Boruta caret raster rgdal signal]; }; + hsdar = derive2 { name="hsdar"; version="1.0.4"; sha256="1z38qmy8jqzy52qwpbsr4xgdby2c73144bxrn0ywyqdgjz1b6g8j"; depends=[Boruta caret raster rgdal signal]; }; hse = derive2 { name="hse"; version="0.0-28"; sha256="14w09wm1kk7b4q8cl5cwjfqvzm2fb4ls8qjw6i0l54184fmw4dah"; depends=[]; }; hsem = derive2 { name="hsem"; version="1.0"; sha256="0dgp65isbfmw0q4sn36l5226sf6vrl7mvn7gn50xvgybh0l6y7vk"; depends=[boot Matrix mvtnorm numDeriv]; }; hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; }; @@ -10663,12 +10814,12 @@ in with self; { hsrecombi = derive2 { name="hsrecombi"; version="0.3.4"; sha256="0ca6672px0y5cibv9hk4hc638rp4d3bhbw0qn81irwwk84yacspv"; depends=[curl data_table dplyr hsphase quadprog Rcpp rlist]; }; hsstan = derive2 { name="hsstan"; version="0.8.1"; sha256="0k7sqwx73zid68ji9l2hfihqdlk3rdpid81pp8g3fmi8dpvrzkms"; depends=[BH ggplot2 loo pROC Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; }; - htestClust = derive2 { name="htestClust"; version="0.2.0"; sha256="1nwj74w5hyz929jz2qci12x1zpk9gva75gn68k70l6xc5vya60qn"; depends=[bootstrap MASS]; }; + htestClust = derive2 { name="htestClust"; version="0.2.1"; sha256="01gcg2ad1fprn6fwzwjcjpvirz9dvrlns9l8rhf5h9j17p6vb1d1"; depends=[bootstrap MASS]; }; htm2txt = derive2 { name="htm2txt"; version="2.1.1"; sha256="09q026yy8qm1fb3a4bf9vsp4j09kayl7xmk0p58ikar5l3bmfdjv"; depends=[]; }; html2R = derive2 { name="html2R"; version="0.1.0"; sha256="1zdnwbqlpjh8r2xcl83da9pzh9cb8h908krnrs61vqhka7zb82ng"; depends=[glue shiny shinyAce shinyjqui shinythemes]; }; html5 = derive2 { name="html5"; version="0.1.0"; sha256="0ainfi0gb3ylg10j910z61j6qppfl6jh8399ng9wlpv8c7pjzs8l"; depends=[]; }; htmlTable = derive2 { name="htmlTable"; version="2.4.0"; sha256="17csp0ry4iy4m5xy271dn5wd81v4p03l79swmvlfxkvpdmhvb8jc"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; }; - htmldf = derive2 { name="htmldf"; version="0.4.0"; sha256="11xsrc5wxppyzi639jrqmd09js4mv8nrvn6zhnk5i06jirc0w0v7"; depends=[cld3 dplyr httr lubridate magrittr processx progress R_utils ranger rvest stringr tibble tidyr urltools xml2]; }; + htmldf = derive2 { name="htmldf"; version="0.5.0"; sha256="088hqvg24m8sikg1kzirwrjni6m0p4qkw2h0kxg27fvb6q1zn05p"; depends=[cld3 dplyr httr lubridate magrittr processx progress R_utils ranger rvest stringr tibble tidyr urltools xml2]; }; htmltab = derive2 { name="htmltab"; version="0.8.2"; sha256="09hnf339f3hzll7a0shq615h9d6f6xqrcv0c9iid6575m5qsallf"; depends=[httr XML]; }; htmltidy = derive2 { name="htmltidy"; version="0.5.0"; sha256="1djkjff3750fm1sp54kf9cjvsqz2x7ia1ns12h5vqqcvwzfd0701"; depends=[htmltools htmlwidgets Rcpp XML xml2]; }; htmltools = derive2 { name="htmltools"; version="0.5.2"; sha256="1yv74ydyqm28gfhimmr7825sj1iaawpwsnzq05c2ma756q2dbivx"; depends=[base64enc digest fastmap rlang]; }; @@ -10680,16 +10831,17 @@ in with self; { httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; }; httpcache = derive2 { name="httpcache"; version="1.2.0"; sha256="026sl19301al3sid9hlwq8jz5b0zvh9a4n3cl4niqvc2b57h133r"; depends=[digest httr]; }; httpcode = derive2 { name="httpcode"; version="0.3.0"; sha256="0xig0rvc81hg7mw0iq9s0an1nw24fg0kfs2p2n6dzhwl9w506fjr"; depends=[]; }; - httpgd = derive2 { name="httpgd"; version="1.2.1"; sha256="1zidky766b2vzvgdc7dhrsaang8a0ak3shysza2ai8q5khbw87by"; depends=[BH cpp11 later systemfonts]; }; + httpgd = derive2 { name="httpgd"; version="1.3.0"; sha256="0pzkydsgfnszzcvc9qfaksw4rp97ir63kq9164l0k0ha2nncvmpk"; depends=[BH cpp11 later systemfonts]; }; httping = derive2 { name="httping"; version="0.2.0"; sha256="0hdcf51yak8yagy4xj9cyck934lgmvpkd08jvlql33ir5mqvvv3i"; depends=[httpcode httr jsonlite magrittr pryr]; }; httpproblems = derive2 { name="httpproblems"; version="1.0.1"; sha256="0zd683xd9f9hz6dxm4bmic54jqjcabr23kwl6afsmdjwnrwwsn06"; depends=[]; }; httptest = derive2 { name="httptest"; version="4.1.0"; sha256="1k5z55f5l7khi142787ignf57rfhxzf442rzbhpr04182g906xfx"; depends=[curl digest httr jsonlite testthat]; }; - httpuv = derive2 { name="httpuv"; version="1.6.4"; sha256="0nx6fakpj9qh6izs6n26y3i8v4dm16h61ijw3gymsbif34fx532f"; depends=[later promises R6 Rcpp]; }; + httptest2 = derive2 { name="httptest2"; version="0.1.0"; sha256="18i4lzqkmhd500rjfkh24drcqvw8ric3disddcl7bm3rddwn4bvh"; depends=[digest httr2 jsonlite rlang testthat]; }; + httpuv = derive2 { name="httpuv"; version="1.6.5"; sha256="0mlilxh2mlrsbbrncla2rg02crr8nnajv649d8whx7ayr8lkdxpm"; depends=[later promises R6 Rcpp]; }; httr = derive2 { name="httr"; version="1.4.2"; sha256="1y8y1g1dkgv9jafrk1kj6pzxpw95c0rr9lplblfq2byrs1pfsas6"; depends=[curl jsonlite mime openssl R6]; }; httr2 = derive2 { name="httr2"; version="0.1.1"; sha256="1lkl73wignikdldxbmb8iic55x2l9h3jh2936db4g8jp8xkn3jhd"; depends=[cli curl glue magrittr openssl R6 rappdirs rlang withr]; }; hues = derive2 { name="hues"; version="0.2.0"; sha256="062i7yc16nmnp15c1jh4xffw2lpklp36wkn1yvagh186ahnlgffx"; depends=[colorspace]; }; huge = derive2 { name="huge"; version="1.3.5"; sha256="1sl457a1lndrx98y2j9a2smanawx2iqlhl82iand0g3p5xp8ch4j"; depends=[igraph MASS Matrix Rcpp RcppEigen]; }; - huito = derive2 { name="huito"; version="0.1.1"; sha256="1md8s5d1w1sz2zj4dn3palc6vr4ha5cdwv28x2pdi61dnfxm4q9z"; depends=[cowplot dplyr ggplot2 magick pdftools purrr qrcode showtext sysfonts tibble tidyr]; }; + huito = derive2 { name="huito"; version="0.1.2"; sha256="0pws7si5x3vxqs3lc5pj1i1za1psq85l8l7xhrvasn1zzfgim2q4"; depends=[cowplot dplyr ggplot2 magick pdftools purrr qrcode showtext sysfonts tibble tidyr]; }; humanFormat = derive2 { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; }; humaniformat = derive2 { name="humaniformat"; version="0.6.0"; sha256="0vaynjzz57pk4y1liag9lpn9jkag2033a6bkn28zzm7ndg3344l6"; depends=[Rcpp]; }; humanize = derive2 { name="humanize"; version="0.2.0"; sha256="0hhhd640n77s8xaa2gbd9fckdk2yjg68gdb7wjy56a2khzqfssxr"; depends=[assertthat glue lubridate]; }; @@ -10713,7 +10865,7 @@ in with self; { 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]; }; hydra = derive2 { name="hydra"; version="0.1.0"; sha256="0r3r8cds4h15narawxhzkrvgnf00vlgrgqdgnmbzjyyb1dmry8wn"; depends=[]; }; - hydraulics = derive2 { name="hydraulics"; version="0.4.0"; sha256="0kabxcg7ajl1kgfiy2zr0zsb10wp13742s5nmphgx59wbm67vjz1"; depends=[ggplot2 gtools reshape2 units]; }; + hydraulics = derive2 { name="hydraulics"; version="0.4.1"; sha256="0pqll9k2240jqc59n36iygygcl364jw8nsga81i4vx39x7yfms19"; depends=[ggplot2 gtools reshape2 units]; }; hydroApps = derive2 { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; }; hydroEvents = derive2 { name="hydroEvents"; version="0.10"; sha256="1w7nswdmg52ldzzz4gphqnp5gfgh9pvgyq9w0phpzj5ff19bxbxz"; depends=[]; }; hydroGOF = derive2 { name="hydroGOF"; version="0.4-0"; sha256="0fw8b66k7gdkdjxgmdpp3lk9d8p0wmlvhq2rkcvajjb5wd09f43a"; depends=[hydroTSM xts zoo]; }; @@ -10735,11 +10887,12 @@ in with self; { 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.0.0"; sha256="1iscpr7vldsr6wfnvgyfkylkp8mb0l7939hkwlmxj4nnxvhaphfc"; depends=[caret data_table doParallel dplyr e1071 fastcluster foreach geometry ggplot2 hitandrun ks maps MASS mvtnorm palmerpenguins pbapply pdist progress purrr raster Rcpp RcppArmadillo rgeos sp]; }; + hypervolume = derive2 { name="hypervolume"; version="3.0.2"; sha256="03cmimncj3jj0q5f04mmy0a7xh4928278fvqy3lfg3snc3k7n7m7"; depends=[caret data_table doParallel dplyr e1071 fastcluster foreach geometry ggplot2 hitandrun ks maps MASS mvtnorm palmerpenguins pbapply pdist progress purrr raster Rcpp RcppArmadillo rgeos sp]; }; hypoRF = derive2 { name="hypoRF"; version="1.0.0"; sha256="1yyq1pjxm9p395wq4zfimvcagspl8vlk0kzpa92pr084q5f7jcyr"; depends=[ranger]; }; hypothesestest = derive2 { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; }; hypothesisr = derive2 { name="hypothesisr"; version="0.1.1"; sha256="0z06risagphhvqiw4lrxy52q6q2yr10w2yxsm8iz1wh9ik097pcv"; depends=[dplyr httr jsonlite]; }; hypr = derive2 { name="hypr"; version="0.2.2"; sha256="1bmg8pz57qxyyicfsyv3s2mk9y914jsids4glsm640kvpy9a59q6"; depends=[cli magrittr MASS 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.2"; sha256="01nrbk48r1hf1yc953yf1pzryzrjjckwdqhb3pbnwfza8q0aqsfq"; depends=[httr jsonlite lubridate]; }; hysteresis = derive2 { name="hysteresis"; version="2.7"; sha256="1nnfr50nafhimj2j5xpxly3i8xvkwwddz864gklwm9jzdpmv02yh"; depends=[car MASS msm]; }; hzar = derive2 { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; }; @@ -10768,19 +10921,18 @@ in with self; { iGasso = derive2 { name="iGasso"; version="1.4"; sha256="17xxqncl5xcphdqclghcazygcgibf8ijdf4kkl3ga11xf70sahj2"; depends=[CompQuadForm lattice]; }; iGraphMatch = derive2 { name="iGraphMatch"; version="2.0.0"; sha256="0xqf04wc5rm7x281pmnpz6a5ax26i9drgy90ixl4bchcx5ma0mr5"; depends=[clue igraph irlba Matrix Rcpp]; }; iIneq = derive2 { name="iIneq"; version="1.0.2"; sha256="15487majkslabw33dgqfx0jmbzzjhiy8z07bki5540d1wf6rmmnn"; depends=[doParallel foreach]; }; - iMRMC = derive2 { name="iMRMC"; version="1.2.3"; sha256="1qga4mm5vslfmxcm3p99nijr4573kq71pfb6yd2ayl6lgjf3y0c3"; depends=[]; }; + iMRMC = derive2 { name="iMRMC"; version="1.2.4"; sha256="1cs5ghrd78h92bmws5z8adawjalvplri9wx2p9w7nq76h31wqhzw"; depends=[]; }; iMediate = derive2 { name="iMediate"; version="0.5.5"; sha256="1lwhrzm4g2fcazh782g7p11v5pyx165ig1dzgkmdmjffpwk0w8b4"; depends=[MBESS mvtnorm plotly]; }; iNEXT = derive2 { name="iNEXT"; version="2.0.20"; sha256="14bagsb0ja3j53i0g4a2ax2gj7lyc6sjcc7isdjx94clbnc2zcsg"; depends=[ggplot2 reshape2]; }; - iNZightMR = derive2 { name="iNZightMR"; version="2.2.5"; sha256="1zxvlz0wyf4n2kpyk82grlww71agvfqp3apswbrimpvi13c9nzhl"; depends=[]; }; - iNZightPlots = derive2 { name="iNZightPlots"; version="2.13.3"; sha256="0dj39qwcxr9pbqpkq40m4758014rwd5hi219slnjcwl6pikf6ndm"; depends=[boot chron colorspace dichromat hexbin hms iNZightMR iNZightTools lubridate magrittr quantreg rlang s20x scales survey]; }; - iNZightRegression = derive2 { name="iNZightRegression"; version="1.3.1"; sha256="0vqk4574xm7xwdg1vmlc4alhfby02ifvrkc1q3vabs7zxix0xn35"; depends=[car dplyr ggplot2 ggrepel ggtext iNZightPlots multcomp patchwork]; }; - iNZightTS = derive2 { name="iNZightTS"; version="1.5.8"; sha256="0nqjxjphd9lrwkj8qs05qk8sf70kyi6akvcpp9f5shb043csnbqr"; depends=[colorspace dplyr forcats ggplot2 ggtext glue gridExtra magrittr patchwork rlang tidyr]; }; - iNZightTools = derive2 { name="iNZightTools"; version="1.12.1"; sha256="17danz18f3j3xwgy3nf88d53a3z8b5yyxf1mdq7rn61zhjiprkim"; depends=[chron dplyr forcats glue haven lubridate magrittr RcppTOML readr readxl srvyr stringr styler survey tibble tidyr validate zoo]; }; - iRF = derive2 { name="iRF"; version="2.0.0"; sha256="1ll4lxg743p2zipxcq13yjsc7j7dk766dcyixwxilllbisg0dh8y"; depends=[AUC data_table doParallel dplyr foreach Matrix RColorBrewer Rcpp]; }; + iNZightMR = derive2 { name="iNZightMR"; version="2.2.6"; sha256="1r2lzi9fw46q2k87zfhrfninmvbz15805za60lbfmlv32b29d82y"; depends=[]; }; + iNZightPlots = derive2 { name="iNZightPlots"; version="2.14.0"; sha256="01sjbk3gj0hcpagy5xqxyhg9vfpm027hqs8qdxbc1rrx0vf2giph"; depends=[boot chron colorspace dichromat emmeans hexbin hms iNZightMR iNZightTools lubridate magrittr quantreg rlang s20x scales survey]; }; + iNZightRegression = derive2 { name="iNZightRegression"; version="1.3.2"; sha256="1cjr6kzxja4vlkz7yk992p07f7g0sqrfmbmvgai03vyh37p67sq9"; depends=[car dplyr 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.12.2"; sha256="07jwcvzpc5n88lw3nv2qaiv1lgn14gq9a3k3kw782ps0jxs1k88l"; depends=[chron dplyr forcats glue haven lubridate magrittr RcppTOML readr readxl srvyr stringr styler survey tibble tidyr validate zoo]; }; 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.1"; sha256="1sqg1n83m1308v6bk8ilra8w01frqyd8vpvmv63rllxz38r3vyhz"; depends=[]; }; - iRoCoDe = derive2 { name="iRoCoDe"; version="1.0.0"; sha256="1ikvaygwm4w7zfghdn8r0zlrv22z17kp8mcgykdwrrdv50pdypxh"; 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]; }; @@ -10809,7 +10961,6 @@ in with self; { ibr = derive2 { name="ibr"; version="2.0-3"; sha256="1plyz4sl0i8qhk9dh3h7zvh9h8wqr589jvasmvp7r3slp4ndhp1r"; 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]; }; - ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; }; icRSF = derive2 { name="icRSF"; version="1.2"; sha256="1a7046lspk70cvrvzwzhnqcmc3cqa5a9bmzlw012jvcn39m2ca3l"; depends=[icensmis Rcpp]; }; ica = derive2 { name="ica"; version="1.0-2"; sha256="0ya1nph1zwhad0bfz4yxs27kl45yk1dhnphdlrq34p8pqrpmj8g7"; depends=[]; }; ical = derive2 { name="ical"; version="0.1.6"; sha256="1raanaagas1c8w66d8s045z5ip1i97xca4233d55jk6cazv0mb1w"; depends=[V8]; }; @@ -10826,11 +10977,17 @@ in with self; { icenReg = derive2 { name="icenReg"; version="2.0.15"; sha256="1cjlvj4i5bir5769a22w8bb9477h04d8rpxk9ks72jp6zjjkq5qa"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; }; icensBKL = derive2 { name="icensBKL"; version="1.2"; sha256="1zzv80jnn8ilnc1gv4nj24l2fl8805rjhqjgkb0xx4y9zhpg1jkp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; }; icensmis = derive2 { name="icensmis"; version="1.5.0"; sha256="1afpn07a25j2jh89r78bvarg2kr0sk3ap8gdmvk75lc6g3dhvri9"; depends=[Rcpp]; }; - icesAdvice = derive2 { name="icesAdvice"; version="2.0-0"; sha256="0sx93fsx2srmynnvs3bjb525m9a5w70qr9lghmkqa07crd991vfr"; depends=[]; }; - icesDatras = derive2 { name="icesDatras"; version="1.3-0"; sha256="0yaqlximxa3rcjxgrd0mii02mm9gpcxgw3i8pymp00bk8zixvj30"; depends=[]; }; + icertool = derive2 { name="icertool"; version="0.0.3"; sha256="0wwkqcvjmv2z8a8j597c2fjjcka1jz932i94rmqxcy31brvbi2nl"; depends=[digest DT ggplot2 ggrepel purrr readxl shiny shinyhelper shinythemes tidyverse]; }; + icesAdvice = derive2 { name="icesAdvice"; version="2.1.1"; sha256="1i47kz45m45nn23j0ydq8vahw97py2im80yxadlqbvldjcm98vdw"; depends=[]; }; + icesConnect = derive2 { name="icesConnect"; version="1.0.0"; sha256="067jh43vp79pcw8bs1iarrd680x0ajc25vp91ckpjpzm22311wbr"; depends=[base64enc getPass httr jsonlite keyring whoami]; }; + icesDatras = derive2 { name="icesDatras"; version="1.4.0"; sha256="00vfd589y617lbjadmajjdq9c9d9w2c81pxqfzlsh50rz9y7qjsk"; depends=[]; }; + icesDatsu = derive2 { name="icesDatsu"; version="1.1.0"; sha256="0vprh8y6x28q33b6zx9qhq991q0aqn5rhccf44k8211n5dwa555k"; depends=[httr icesConnect jsonlite]; }; + icesDatsuQC = derive2 { name="icesDatsuQC"; version="1.0.0"; sha256="18c48qvls9ngf6mszx5wdkm1xxijc9i005kfa5zkww6bj0ran80g"; depends=[icesDatsu sqldf]; }; + icesSAG = derive2 { name="icesSAG"; version="1.4.0"; sha256="0y6sajhl8bj2yzyrdnmlaq2kfnf3jzz99s66gg1gjpdhksn77dba"; depends=[httr icesVocab openssl png xml2]; }; + icesSD = derive2 { name="icesSD"; version="2.0.0"; sha256="1k0i79hh63bmsqw5m6ym2h3dydrjji57lkysp5n9x293lgh04pf2"; depends=[httr icesConnect]; }; icesTAF = derive2 { name="icesTAF"; version="3.6.0"; sha256="1g2qlpbi94731vvzdnc16f1gpgn49sxzlsljzzapfgk14dcm96b1"; depends=[glue jsonlite lattice purrr roxygen2]; }; - icesVocab = derive2 { name="icesVocab"; version="1.1.9"; sha256="14zbc31xb7lizz1ki85nxb6lzmwjdyfajv0j43hmbbh3yscjd9p3"; depends=[xml2]; }; - ichimoku = derive2 { name="ichimoku"; version="1.2.5"; sha256="0d4pcfq153csaxabs0z09gcjv08nmp2ry3nf79lsrlmzc51sl6nm"; depends=[cpp11 curl ggplot2 gtable jsonlite tibble xts zoo]; }; + icesVocab = derive2 { name="icesVocab"; version="1.2.0"; sha256="0cd2w0w2m176mpfd3lzvxl88bcli1qrkjrli539i764nlyh0ipl0"; depends=[xml2]; }; + ichimoku = derive2 { name="ichimoku"; version="1.3.0"; sha256="1h4h0ms88sh841gcwb1sgwhg9j4qvikajfzflylr0xbrlly9rhp6"; depends=[curl ggplot2 jsonlite tibble 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.10.1"; sha256="025bqlgx4p1kxpmizfzgiamcq2f5nj5m2ky25fpgdm714sybvwvi"; depends=[igraph Rcpp sp]; }; @@ -10838,33 +10995,32 @@ in with self; { icr = derive2 { name="icr"; version="0.6.2"; sha256="1xqvzn02x13d706irv83zycpxhm8yq1c34rh1nphddy5gri7gwjb"; depends=[Rcpp]; }; icrf = derive2 { name="icrf"; version="2.0.0"; sha256="0kx687q0fv5agjwfsqx12wbayrzr02x316gg3y0rklqyq5aapvfv"; depends=[]; }; icsw = derive2 { name="icsw"; version="1.0.0"; sha256="0g7bcqs0rpbs1p202i9wjbl8hhy3r196zambm044xyf7kvsbzzf6"; depends=[]; }; - idar = derive2 { name="idar"; version="1.2"; sha256="0bsh0dx44fi2ggf33xin94fh2yjkr0bbib68cy7k5c9z363zwhfc"; depends=[ape FD picante spatstat spatstat_core spatstat_geom]; }; + idar = derive2 { name="idar"; version="1.3"; sha256="16n2vpc6zx8sz2pr8nmza7127s3vwinjrrmmxc63q8cmb1ifi3gv"; depends=[ape FD picante spatstat spatstat_core spatstat_geom spatstat_random]; }; idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; idbr = derive2 { name="idbr"; version="1.0"; sha256="0silsd3ydrrg924klga8dascxjfmi2czw7sz3ap2j7gkgvxcfcpv"; depends=[countrycode dplyr httr jsonlite purrr rnaturalearthdata sf]; }; ideamdb = derive2 { name="ideamdb"; version="0.0.9"; sha256="1f4dcv6c8ny7pik547f4840vhll26mzfcijnfsiqx31xhn0gsizd"; depends=[dplyr ggplot2 stringr tidyr]; }; idefix = derive2 { name="idefix"; version="1.0.1"; sha256="1hqq9w0hssczmy8kvpp438fz0r5wdrxzxpkhrljz50rqazr61asy"; depends=[dplyr MASS mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; }; idem = derive2 { name="idem"; version="5.1"; sha256="1i5h0hg76rrxharlfv33kcbwmvkfyfk92wim93dvpkflnbwsmzfl"; depends=[BH mice Rcpp RcppEigen rstan sqldf StanHeaders survival]; }; idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; }; - identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; - ideq = derive2 { name="ideq"; version="0.1.4"; sha256="06xk9ghvh3fb79lbkmbqsk07xj06qaigiw41rzbi3bji3fjq1prw"; depends=[matrixcalc mvtnorm pdist Rcpp RcppArmadillo rgen]; }; ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; }; - idiogramFISH = derive2 { name="idiogramFISH"; version="2.0.6"; sha256="1gxc89x765759gbm4g20iyiaf80qa8ascpm1j6vgy9karrixv4dr"; depends=[crayon dplyr plyr rlang tidyr]; }; + idiogramFISH = derive2 { name="idiogramFISH"; version="2.0.8"; sha256="1m45858da25zwrm74h69a2a5ly4yy0cl12vkkaqrwzn72snsq3c2"; depends=[crayon dplyr plyr rlang tidyr]; }; idm = derive2 { name="idm"; version="1.8.2"; sha256="04f0i0kwdxywmj2i184knx5a5v9svx0lbam6wpz49hghg7qpy0w5"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; }; idmTPreg = derive2 { name="idmTPreg"; version="1.1"; sha256="1329sjb4dnw3yiyg16whbj4l2v0kg8phg1x4ysvyp2kqkmw14yq6"; depends=[doParallel foreach survival]; }; idmodelr = derive2 { name="idmodelr"; version="0.3.2"; sha256="02hvlmk38rs0iavwz0qa3ryvyw1ixhjf9bksmadlhxl5pd18016j"; depends=[deSolve dplyr furrr future ggplot2 magrittr purrr rlang stringr tibble tidyr viridis]; }; idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; 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.8.6"; sha256="1kfqzl12ybxa4wgijww27hq2m9bjai2pc9lx6dg9ly7ki25crqpk"; depends=[data_table gWidgets2 gWidgets2tcltk lubridate mgsub openxlsx reader readxl stringi]; }; + ie2misc = derive2 { name="ie2misc"; version="0.8.8"; sha256="06nf5g6lcn8wif9k3qd580s2w30yyqqvybzg36q2mil8fnpl2568"; depends=[assertthat checkmate data_table gWidgets2 gWidgets2tcltk lubridate mgsub openxlsx reader readxl stringi]; }; + ie2miscdata = derive2 { name="ie2miscdata"; version="1.0.2"; sha256="0n5aya9g5xzbnx611ji7bxy2zb04ijmjb8kc6ac7kb2nm9n6dxbn"; depends=[lubridate]; }; ieeeround = derive2 { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; }; iemisc = derive2 { name="iemisc"; version="0.9.9"; sha256="1hay4d85xw81cgzkm21db8mssqqb8cw4bsg3qypm59bqwmqpl8md"; depends=[CHNOSZ data_table fpCompare gsubfn iemiscdata pracma r_import rgdal sp stringi testit units zoo]; }; iemiscdata = derive2 { name="iemiscdata"; version="0.6.1"; sha256="0a9x90kisgmrka0frk9myb1qdq3nl092n78wrif31b42arifa8h9"; 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]; }; ifa = derive2 { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; }; - ifaTools = derive2 { name="ifaTools"; version="0.22"; sha256="16wgq7b4xffgrmy10f58kwqd3m3p3lwa4ck92jb6gb8gml1n9g82"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; }; + ifaTools = derive2 { name="ifaTools"; version="0.23"; sha256="16xf3165gkmh3f9843m0n4wqdwwdfs6rjh64qcpz8srsm2z5y3l2"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; }; ifctools = derive2 { name="ifctools"; version="0.3.4"; sha256="1cxxk1ysb5ya81g669xyalzmkpfjsjsrrqmvnsg1z0kwh5yv54ds"; depends=[]; }; ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; }; - ifultools = derive2 { name="ifultools"; version="2.0-23"; sha256="16a7rbvlym3bnfm93ikr5kl0l86ppk0s41fva6idvcx765g3fqkk"; depends=[MASS splus2R]; }; 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]; }; @@ -10874,6 +11030,7 @@ in with self; { igraphdata = derive2 { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; }; igraphinshiny = derive2 { name="igraphinshiny"; version="0.1"; sha256="1ww5s4jfihzcx4k35lbhzsf54z720xh7b2p5alzk843m6rx77986"; depends=[igraph shiny]; }; igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; }; + igrf = derive2 { name="igrf"; version="1.0"; sha256="1287mx1fpbq9y8jbyb43hlignkqg313rn3kc52pm6b2n77ipkrc6"; depends=[]; }; iheatmapr = derive2 { name="iheatmapr"; version="0.5.1"; sha256="1pwkwh7ljlpr6zyz6j8knpz3iw60xzkw8amc98x4pc2mw148jvzx"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr RColorBrewer scales]; }; iheiddown = derive2 { name="iheiddown"; version="0.8.6"; sha256="0w36w875fzxx8parjc6lb9nwvfjs0p2vv1pzd12cb160pgn9y7mc"; depends=[bib2df bookdown crayon dplyr fs gender ggplot2 pdftools purrr readr remotes 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]; }; @@ -10891,13 +11048,15 @@ in with self; { image_dlib = derive2 { name="image.dlib"; version="0.1.0"; sha256="118zwalpxcnn2fgjv8xsp763yvbqcyv81p6fblxizlnimyrjva71"; depends=[Rcpp]; }; image_libfacedetection = derive2 { name="image.libfacedetection"; version="0.1"; sha256="0mr7zrqd73mhvs918615lwsf2bgg63x3wh16wdpwhb2zd7ybm87a"; depends=[Rcpp]; }; image_textlinedetector = derive2 { name="image.textlinedetector"; version="0.1.5"; sha256="1bbakqz7zrsdyzxgvv6czh8cgwj0qbazhfpacbm04pbpji5iilxw"; depends=[magick Rcpp]; }; + image2data = derive2 { name="image2data"; version="1.0.0"; sha256="0jyicd6i15lb7d5vp1d7r2b2nsind1glylscix86lpkv6pcdz1as"; depends=[readbitmap]; }; imageData = derive2 { name="imageData"; version="0.1-61"; sha256="0bavyd8njfjd0l8dcsm6gklgc81kykl275w2gpvb5cxrhb9yp32n"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape]; }; imagefluency = derive2 { name="imagefluency"; version="0.2.3"; sha256="0f4kizxc86q6pgx5dbp14y6866b1ldyf7zgpfikd2iqhvxbs7qwa"; 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.42.11"; sha256="1a1jhmgrpv1d0fk14axj88qvxgb25bqnj65d60g1k985ipzvgy27"; depends=[downloader igraph jpeg magrittr png purrr Rcpp readbitmap stringr]; }; + imager = derive2 { name="imager"; version="0.42.13"; sha256="0zygnmxwbbmj5i2l2affzdz90xvsa7b5pbkzkhjbm40is69rh2nr"; depends=[downloader igraph jpeg magrittr png purrr Rcpp readbitmap stringr]; }; imagerExtra = derive2 { name="imagerExtra"; version="1.3.2"; sha256="1f6mxfn7am4ph9acbbx53r4bk4vsm73p7arh8rvrsic9pgma3gqf"; depends=[fftwtools imager magrittr Rcpp]; }; imageseg = derive2 { name="imageseg"; version="0.4.0"; sha256="1i3bwhc4251ah2vq3s7jy941qdxy8jjrs3ay8297nd2b4v18y8as"; depends=[doParallel dplyr foreach keras magick magrittr purrr tibble]; }; imageviewer = derive2 { name="imageviewer"; version="0.1.0"; sha256="1rsrwy5v0gnsmbay1zqijhvll2l1bs844m52w65588j9nlx4fci9"; depends=[htmlwidgets]; }; + imaginator = derive2 { name="imaginator"; version="1.0.0"; sha256="0wjgfsp7dhy8q7rai4bvikmw1y3iancnqdnqlhbi7a563s4mkpkr"; depends=[assertthat checkmate distributions3 dplyr lubridate magrittr rlang stringi tibble]; }; imagine = derive2 { name="imagine"; version="1.5.3"; sha256="1ss0gm769s8cmma3hnah15vmc2c5wxn0l3s4vas7jbvkwi62am6h"; depends=[Rcpp]; }; imbalance = derive2 { name="imbalance"; version="1.0.2.1"; sha256="14f7p3x8818b1asfynp3w4sxdacsd14dzs7r166s1jdadwwfwi1s"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; }; imbibe = derive2 { name="imbibe"; version="0.1.0"; sha256="0l7wn7vcbb466a4i3w302ficdy0jvy2jh5qizfn7ahpcs7lpx6hr"; depends=[magrittr Rcpp RNifti]; }; @@ -10915,9 +11074,9 @@ in with self; { imola = derive2 { name="imola"; version="0.3.2"; sha256="0v41xprzqhhj0463g9176jc3zr7g6mjrcgs8vrcn3g5lmg6c9z7z"; depends=[glue htmltools magrittr shiny stringi yaml]; }; imp4p = derive2 { name="imp4p"; version="1.2"; sha256="1ld8bjjrlij9m7xns7izibag9mndrfh21xgq1w7g3bh5ag9p9fs0"; depends=[Iso missForest missMDA norm Rcpp truncnorm]; }; impactflu = derive2 { name="impactflu"; version="0.1.0"; sha256="0wpaq2q61g6hl9fffs5cjbzdz1qc8dxsbknfs0iarwkn08460bn5"; depends=[dplyr glue lubridate magrittr Rcpp rlang tibble]; }; - impactr = derive2 { name="impactr"; version="0.3.0"; sha256="1a1psp1jjnczza0skws75rn80xn5krmpbdfq75cdjfg03vqc95kx"; depends=[glue lubridate lvmisc pillar pracma purrr Rcpp rlang signal stringr tibble toOrdinal vroom]; }; + impactr = derive2 { name="impactr"; version="0.4.0"; sha256="0nywix00j2j4gql83w81c7kyhlvfzydvjgzd1495xsiyy0a8c4jn"; depends=[glue lubridate lvmisc pillar pracma purrr Rcpp rlang signal stringr tibble toOrdinal vroom]; }; impimp = derive2 { name="impimp"; version="0.3.1"; sha256="0xkxph4f1rcpkryx9v339bfbsnq3xwdj1flb4j2dgh99apj126sq"; depends=[]; }; - implicitMeasures = derive2 { name="implicitMeasures"; version="0.2.0"; sha256="0w0dwnzfhw5v5j7q3zpfsca4ydmq7b9fzspvyf9sibyh587isb9c"; depends=[ggplot2 stringr tidyr xtable]; }; + implicitMeasures = derive2 { name="implicitMeasures"; version="0.2.1"; sha256="177d69fbyzrg28ddxqlqbf7hm25mj5rpmpslh0mad2xqzyvdylvn"; depends=[ggplot2 stringr tidyr xtable]; }; implied = derive2 { name="implied"; version="0.4.0"; sha256="00wv05pb59p86ddfwha7ilfss36si8yljnmkmayiqcazn32ylzg8"; 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.2.0"; sha256="018s0x224gqnv4cjfh0fwliyfg6ma9vslmwybrlizfsmqcc5wp37"; depends=[]; }; @@ -10926,21 +11085,20 @@ in with self; { impressionist_colors = derive2 { name="impressionist.colors"; version="1.0"; sha256="03z5w7y7vbvlnn30r9y3ip93h364f87nhwdb9hcki26csiq2bnlv"; depends=[]; }; imptree = derive2 { name="imptree"; version="0.5.1"; sha256="0f087000092ydnpj3ch4mbip8wp32scn8xw4vlkq5lf6130gfs1b"; depends=[Rcpp]; }; 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.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[impute norm pcaMethods tmvtnorm]; }; imputeMDR = derive2 { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; }; imputeMissings = derive2 { name="imputeMissings"; version="0.0.3"; sha256="1dfhi235j1qz2mv89j92b903j5mdwlzisiyvvi9mmiacdj5ln89z"; depends=[randomForest]; }; imputeMulti = derive2 { name="imputeMulti"; version="0.8.3"; sha256="0vk5fz6cr14czr2ycvvc1xh2cdf0k7sw0jbbjaf7dp8i4hr1j1vn"; depends=[data_table gtools Rcpp]; }; - imputePSF = derive2 { name="imputePSF"; version="0.1.0"; sha256="0xfd2mybg0cbi3n35j28s4xq4iwr5rq4mqwgdqml7l2rlzidcwc8"; depends=[PSF]; }; imputeR = derive2 { name="imputeR"; version="2.2"; sha256="0jfyl6k285x4lc58q13fhi004l4yaqas0d4g08rx78ml7p6l1r48"; depends=[reshape2]; }; imputeTS = derive2 { name="imputeTS"; version="3.2"; sha256="19kzwa4xih7y1rilgqa945d35agma9qfnj9fraancy49b06axrx9"; depends=[forecast ggplot2 ggtext magrittr Rcpp stinepack]; }; imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.3"; sha256="0yc1l3r7g7x2pgyli6j08ikvsbvr24kijnn7pdj54blw7c0pdmm2"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; }; 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.1.0"; sha256="0a7r6k1fkky0x13z2shy6smkh0nl7pm8kkyk001f4s8g008v2bc2"; depends=[clinUtils cowplot flextable ggplot2 ggrepel magrittr officer plyr reshape2 scales]; }; - inTrees = derive2 { name="inTrees"; version="1.2"; sha256="1mwn2ijkyw0y9xcgrr56wxd2326ikarlsi79l59dplvlx2iwbi6c"; depends=[arules data_table gbm RRF xgboost xtable]; }; + inTextSummaryTable = derive2 { name="inTextSummaryTable"; version="3.1.1"; sha256="0js287j0bz7plc9xaclksvss2xj43g735xczvxsfnydrma2wvhzi"; depends=[clinUtils cowplot flextable ggplot2 ggrepel magrittr officer plyr reshape2 scales]; }; inaparc = derive2 { name="inaparc"; version="1.1.0"; sha256="0ni34bkl7v1ypci8j8qhkfbf7gnx77wi4v9w1ww18z2jizsrk5h3"; depends=[kpeaks lhs]; }; - inbreedR = derive2 { name="inbreedR"; version="0.3.2"; sha256="09fr13ckyn2skiigkn4qdx5g080gcmyyrvzhcp0wrml9wpmy0h4z"; depends=[data_table]; }; + inbreedR = derive2 { name="inbreedR"; version="0.3.3"; sha256="0g7h4jgmnbpm4c6pb6fkmpzdg4adkc0k72444jpxbvyddq3hqh24"; depends=[data_table]; }; incR = derive2 { name="incR"; version="1.1.0"; sha256="0q41bs7pf6hqyfwvcwc2sxq44jq95qq3qsddz53f8gphwjsyf1v7"; depends=[dplyr ggplot2 lubridate maptools rgeos]; }; 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]; }; @@ -10952,16 +11110,15 @@ in with self; { 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]; }; index0 = derive2 { name="index0"; version="0.0.1"; sha256="1kdjc86312a9x800h0i7z0z7bwbxyrqds8wnrm15aljkvk83xwxl"; depends=[]; }; - indicspecies = derive2 { name="indicspecies"; version="1.7.9"; sha256="1xza0ha42frz5wizf268j49y3201vpsm4kgj0czsw9wygzjl008f"; depends=[permute]; }; + indicspecies = derive2 { name="indicspecies"; version="1.7.12"; sha256="0ihlbbqygjpp6ynpk047f6n041fghhcyy9xkkgvrciqqvnif17vq"; depends=[permute]; }; indiedown = derive2 { name="indiedown"; version="0.1.1"; sha256="0r46r6s0asd182gs5map4wilhfb7jhgrcinnl36ib3q1xxn06457"; depends=[cli fs gfonts rlang withr]; }; - indirect = derive2 { name="indirect"; version="0.2.0"; sha256="1k7xwsx655nzl43s1mkaysyn5gydq973gynmqip67lssnm7cnch4"; depends=[gplots MASS]; }; + indirect = derive2 { name="indirect"; version="0.2.1"; sha256="1iaks18xcxqr2afzbzgxj4jr77p6gw2zmgb1398cgqkgdwb1yj13"; depends=[gplots MASS]; }; individual = derive2 { name="individual"; version="0.1.7"; sha256="0by56qwxdgrb8f1x8d1yv5alf22m375a6gjcr3i31hvzn53ncc6w"; depends=[R6 Rcpp testthat]; }; 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]; }; ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; ineqJD = derive2 { name="ineqJD"; version="1.0"; sha256="0anv384jwzn5gkc0jqsl81bkmrjd21br99c5q30xd6ncxavj4s57"; depends=[]; }; infer = derive2 { name="infer"; version="1.0.0"; sha256="1qbpcn7jqbvgwnpiyylj021j8m33p58a204yd1pfkpzd3x2lbsm6"; depends=[broom dplyr generics ggplot2 glue magrittr patchwork purrr rlang tibble tidyr]; }; - inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; }; 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]; }; @@ -10988,16 +11145,17 @@ in with self; { inldata = derive2 { name="inldata"; version="1.0.3"; sha256="0iz3dlmaw6p81lj406nq4sg4qvl289mn95by10r3zrikf39l0jq2"; depends=[raster sp]; }; inline = derive2 { name="inline"; version="0.3.19"; sha256="1mcr9hgq6kkq03n7pkcccxa7vg8jma0q7lfxc5vvkc6snydk1s8f"; depends=[]; }; inlinedocs = derive2 { name="inlinedocs"; version="2019.12.5"; sha256="11d8cnrzgq95w7hn234rcwrr1mmrv63f69807pnzxizxbgnp7wz3"; depends=[]; }; - inlmisc = derive2 { name="inlmisc"; version="0.5.2"; sha256="1jg92fy9dg9rv0sdzzcc7vylkx6z3l0b2q7rba63dpkdb1vqrwls"; depends=[checkmate data_table GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos rmarkdown scales sp tinytex webshot wordcloud2 xtable yaml]; }; + inlmisc = derive2 { name="inlmisc"; version="0.5.5"; sha256="0d7yqbd7bqsk312g28pqgdpcpqd06abyra2inmnj8fkgpmv3wjf6"; depends=[checkmate data_table GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos rmarkdown scales sp tinytex webshot wordcloud2 xtable yaml]; }; + inlpubs = derive2 { name="inlpubs"; version="1.0.2"; sha256="1hl2n919x263k0kq7j7p52n6kxjls86ff92vrxs0xahhibv9b8my"; depends=[checkmate tm]; }; innsight = derive2 { name="innsight"; version="0.1.0"; sha256="1df1byv5jnv895b6aywvkalxx5clw6p6yl0lpihf7qnzsgm8wz49"; depends=[checkmate ggplot2 R6 torch]; }; 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]; }; inplace = derive2 { name="inplace"; version="0.1.2"; sha256="06jb8xzjqywdww8j2i59c8663dfbrhnvj0lh3xm73j39sig6vh7l"; depends=[Rcpp]; }; insane = derive2 { name="insane"; version="0.1.0"; sha256="144fq1lys6wy78vnmz1vd4ghs8agraj1hgg0vwlxcnbykmf50i95"; depends=[broom dplyr DT ggbeeswarm 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]; }; - insee = derive2 { name="insee"; version="1.1.2"; sha256="1sp135r3fx2akiy3rp987k8m00vrzmqfxxl62r8sdhzx1slq5glb"; depends=[crayon dplyr httr openssl purrr rappdirs readsdmx rlang stringr tibble tidyselect xml2]; }; + insee = derive2 { name="insee"; version="1.1.3"; sha256="103b9aw6afq169k839lydfc904wqrwh1bh2r69wa2s61rpwiinwc"; depends=[crayon dplyr httr openssl purrr rappdirs readsdmx rlang stringr tibble tidyselect xml2]; }; insiderTrades = derive2 { name="insiderTrades"; version="0.0.1"; sha256="1hz2jmghfihbn1dbrr38zlwa0s44gm84pjhhk0yfrnljg9mqf4qy"; depends=[magrittr RCurl stringr]; }; - insight = derive2 { name="insight"; version="0.14.5"; sha256="10kc72g2hfsiipba4kalda1wxsb01nq2ax2yim386bkk0vjszwfx"; depends=[]; }; + insight = derive2 { name="insight"; version="0.16.0"; sha256="0gcyps0889rys04bj70br5zfvzcqxd55yawykmns17n9hsixfi3r"; depends=[]; }; insol = derive2 { name="insol"; version="1.2.2"; sha256="166kgxgzbh55y2qqya6c2si22x0v7asi70im054g6xxwc5187kh3"; depends=[raster]; }; inspectdf = derive2 { name="inspectdf"; version="0.0.11"; sha256="19ainhxgda58cb70gwxki618wln1v1k4iwvnlvy6s7aldry4wgc4"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; }; inspector = derive2 { name="inspector"; version="1.0.3"; sha256="16gc98af6wmwf32fz8zml5v17g5lkiybzyzsqgphx0k19hrbc6kr"; depends=[Rdpack]; }; @@ -11007,6 +11165,7 @@ in with self; { insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; }; insurancerating = derive2 { name="insurancerating"; version="0.6.9"; sha256="02nwc1429v8yvnpd5s7b9fywyzbccbqpfyq25pn5d166ly3vaqa5"; 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="0.2.0"; sha256="01bgh88f94imqhx63miv0gyjw51sbqidp6p3g0f6p8rl95aqnq6h"; depends=[dplyr FNN ggplot2 knitr MCMCpack pheatmap Rcpp RcppArmadillo reshape2 rlang salso]; }; intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; }; intamap = derive2 { name="intamap"; version="1.4-9"; sha256="060sghkqsdrxpa340rvjskh2wafdkffa5q8nlbg1msnsmk639lkn"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; }; intccr = derive2 { name="intccr"; version="3.0.3"; sha256="1sg4pda60xx2zqhwckc0nq4b82xxw0jinaw13p671pw9gb4mz38g"; depends=[alabama doParallel foreach MASS]; }; @@ -11017,8 +11176,9 @@ in with self; { integr = derive2 { name="integr"; version="1.0.0"; sha256="172vj29bdk42ibgwj7dl06wslpg2dccp1i8iscbz1yd0j5kw36sq"; depends=[DiagrammeR DiagrammeRsvg dplyr gtools rsvg]; }; intensegRid = derive2 { name="intensegRid"; version="0.1.1"; sha256="15vjf39fx6bkay15nbmqnv5vp8w6xy6fzf1lglqr6506pyaqh8w8"; 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]; }; - interacCircos = derive2 { name="interacCircos"; version="1.0.0"; sha256="1waj0saavvaw2qzhbwcj1k0a2dnmq7zbkdnmb93xj6j1lhfjhbdy"; depends=[htmlwidgets jsonlite plyr RColorBrewer]; }; + intensitynet = derive2 { name="intensitynet"; version="1.0.0"; sha256="1mwgz8rp180x7n08clqr0g19f0kxnparv10k98ysxq7shpwqimr1"; depends=[ggplot2 igraph intergraph Matrix sna spatstat_geom spdep viridis]; }; interactionR = derive2 { name="interactionR"; version="0.1.3"; sha256="1wckp3vz06ary2ydk22iykp1ck3i0bqhq51d8jyafq2h0rjhkyc8"; 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]; }; interep = derive2 { name="interep"; version="0.3.2"; sha256="1a4ws8wsrlkiq8dxrx85cq758dim3ym0sirag1k7hhv6pl825cxs"; depends=[MASS Rcpp RcppArmadillo]; }; @@ -11033,13 +11193,14 @@ in with self; { interp = derive2 { name="interp"; version="1.0-33"; sha256="115yz7vvlga24m5dz3kirr2vzh59ki3gypvxwvaab8zy2mqr47v6"; depends=[deldir Rcpp RcppEigen]; }; interplot = derive2 { name="interplot"; version="0.2.3"; sha256="1qs0ni16rbjilkahn15yn9sil3ba4n935bxpdbpwlsjina504jqj"; depends=[abind arm dplyr ggplot2 interactionTest purrr]; }; interpret = derive2 { name="interpret"; version="0.1.26"; sha256="0f7bhz5gj0f5dxjcc9xlrx4y474akn6q0d7z71yypyw6bawvqkbn"; 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]; }; interval = derive2 { name="interval"; version="1.1-0.8"; sha256="0g0k9nri19p3y3s70ic1w3i3sxq8fbsxaikd7c4d6afqzr8hk2nl"; 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.2"; sha256="0mvwfwc03ifb30a3dzbmkv9adwqb8ajxhcw24d8xip8px063plhb"; depends=[]; }; intervcomp = derive2 { name="intervcomp"; version="0.1.2"; sha256="1l6x1fl84li6is3b92b96q3fbv0rpgqy2lvw9cbi2cq8nh9imnyx"; depends=[]; }; interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; }; - inti = derive2 { name="inti"; version="0.5.2"; sha256="1h0xkp9lqqqly5ldjz6ycja9b1q62ydysihjz2w7ajvrkjxhagbs"; depends=[agricolae dplyr DT emmeans FactoMineR ggplot2 lme4 purrr shiny stringi stringr tibble tidyr]; }; + inti = derive2 { name="inti"; version="0.5.4"; sha256="1y6hpxhish3byrd3jlsinhwwfvz4mpcmhbhzxc2fjwyc4a3h36kh"; 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]; }; intmed = derive2 { name="intmed"; version="0.1.2"; sha256="0amcqzinj35yvb9nfy808bz098dqmnds13z335lgqm6sykriyjpl"; depends=[doParallel dplyr foreach MASS mice stringr tibble]; }; intrinsicDimension = derive2 { name="intrinsicDimension"; version="1.2.0"; sha256="0cka20ifxx9njnvp18bzhrvmh3cwjnxkc0a23qzi43dahc51ijbc"; depends=[yaImpute]; }; @@ -11052,10 +11213,11 @@ in with self; { inum = derive2 { name="inum"; version="1.0-4"; sha256="1khkzja8lwn9075864vbyajqina9m588ahf1fsrrajrsqilyzssz"; depends=[libcoin]; }; invGauss = derive2 { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[optimx survival]; }; invLT = derive2 { name="invLT"; version="0.2.1"; sha256="0dcr2cclgzkvsw1lysmjrkwgahas96rjc328yc7a1a56pf62kw2v"; depends=[]; }; - invacost = derive2 { name="invacost"; version="1.1"; sha256="0ri743v8a1fh4gpy9va38in20784g6rxvm34aw0k3clispixxl6k"; depends=[dplyr earth ggplot2 lmtest mgcv quantreg robustbase sandwich scales]; }; + invacost = derive2 { name="invacost"; version="1.1-4"; sha256="0nj1zzlj7n05ajp7c228cgs0vzlniam4d3x804ncy1wl3d920hc9"; depends=[dplyr earth ggplot2 lmtest mgcv quantreg robustbase sandwich scales]; }; invctr = derive2 { name="invctr"; version="0.1.0"; sha256="0jrbr53kvwrf800z18vz9df9bk7swpd4avnyf59ggz2bc0z2ijwk"; depends=[plyr rlang]; }; inventorize = derive2 { name="inventorize"; version="1.0.6"; sha256="01rwqqljmlk5bwnvlx0qy6n67q2swjcxp90fp2wipyvl1f46h3m1"; depends=[dplyr ggplot2 magrittr plotly plyr tidyr]; }; inverseRegex = derive2 { name="inverseRegex"; version="0.1.0"; sha256="1wk3ac2rfy0m8442sa2m75s6l3wadx4d4cwas6c8n2xqkrphci87"; depends=[]; }; + invertiforms = derive2 { name="invertiforms"; version="0.1.0"; sha256="131h5dlyj38bis2rk2ji3dpdd45iiavfwb4d6cf0gn8rr7ldkwgl"; depends=[glue Matrix sparseLRMatrix]; }; investr = derive2 { name="investr"; version="1.4.0"; sha256="0l47bfwxssfr3maprkpwnmgxnxccl3ch4grc7f968iiqk83mcxw9"; depends=[nlme]; }; invgamma = derive2 { name="invgamma"; version="1.1"; sha256="12ga2y4wc9bc5zz6vimvxwgjpsx3ys3209nq63gscbw559ydxa5a"; depends=[]; }; io = derive2 { name="io"; version="0.3.2"; sha256="1cyl8wvbngdrdkkckng1bs699rjp737j99kbd8r155fjj0370nx4"; depends=[filenamer stringr]; }; @@ -11065,24 +11227,24 @@ in with self; { ionr = derive2 { name="ionr"; version="0.3.0"; sha256="18rv5n5gihb6pz36s45yj17sdjsbj4485k4lnggdjj1gbbjkz2ni"; depends=[gplots psych]; }; iopsych = derive2 { name="iopsych"; version="0.90.1"; sha256="0adxwxnb1zdlld3icdggx7cq6cp8z4h1jf105485w322a8c6s9ik"; depends=[mco mvtnorm]; }; iosmooth = derive2 { name="iosmooth"; version="0.94"; sha256="06xgzhjgb6pznjzfli193q7kn8sh5jmqsssgymwj98bw7iwn4q3z"; depends=[]; }; - iotables = derive2 { name="iotables"; version="0.4.7"; sha256="0v8ixajmdxi1rczdxvl8kzqmj3yg2ihblg5x1bx044lp489mk4mw"; depends=[assertthat dplyr eurostat forcats glue kableExtra knitr lubridate magrittr plyr readxl rlang tibble tidyr]; }; + iotables = derive2 { name="iotables"; version="0.9"; sha256="0kjy6lh9s8x7fdm9pnp52zj2rgrkm89fjwfdhffmah4n3ra13664"; depends=[assertthat dplyr eurostat forcats glue kableExtra knitr lubridate magrittr plyr readxl rlang tibble tidyr tidyselect]; }; iotools = derive2 { name="iotools"; version="0.3-2"; sha256="07q0z0kszm1xx5hfhisfliyrcsxd8dc5mx0a2bwwnv5l1xzmix17"; depends=[]; }; ip2location = derive2 { name="ip2location"; version="8.0.1"; sha256="0mf6ncckjjrq4dvd8pifz4izn4vqmsqq0pw36gm1zqzbyyvmqqya"; depends=[jsonlite reticulate stringr]; }; ip2proxy = derive2 { name="ip2proxy"; version="1.1.0"; sha256="1hs7n33cn2drqig0p2ns0bnyx2af58x2rslih3yj85xx0dn87qgp"; depends=[jsonlite reticulate stringr]; }; ipADMIXTURE = derive2 { name="ipADMIXTURE"; version="0.1.0"; sha256="1fl7nyxg7gakjdggdc311wf037zaxwpqsw3ax7liq1pvw6flb9h7"; depends=[ape treemap]; }; ipa = derive2 { name="ipa"; version="0.1.0"; sha256="029vz7pb37vnqm7x6h53p0y7z0nx2s36yklyfn9sz21gknsi983j"; depends=[stringi]; }; - ipaddress = derive2 { name="ipaddress"; version="0.5.3"; sha256="0jyhwxbphlmsk4kab2bl38x90szhw1pa35rq7kr1wdq4w0yaa696"; depends=[AsioHeaders Rcpp rlang vctrs]; }; + ipaddress = derive2 { name="ipaddress"; version="0.5.4"; sha256="1rj4ydbkhizdnj7x3zm9ggfbvvp8alza8gvxqijjl6y6gljlg7cv"; depends=[AsioHeaders Rcpp rlang vctrs]; }; ipc = derive2 { name="ipc"; version="0.1.3"; sha256="10h54j83l7khk1lkpdwn6hwaz31i3v6svg4q1lxzvr2aqdsj7hy0"; depends=[R6 shiny txtq]; }; ipcwswitch = derive2 { name="ipcwswitch"; version="1.0.4"; sha256="12z16c8sv1nhdv70kwx1a0wh588znkv5y5r0s9kcws0n3rjhzh9p"; depends=[survival]; }; ipdw = derive2 { name="ipdw"; version="0.2-9"; sha256="1vjq5wxfmx1vfclrj68mf3w0lmsxrppin1kph38s2qzcg0y74ghg"; depends=[gdistance raster rgeos sp]; }; - ipeadatar = derive2 { name="ipeadatar"; version="0.1.4"; sha256="1gr4snvls0c90ywfgm5274zx1mwhbdvvd7rb31697jpfnp9sdx32"; depends=[curl dplyr jsonlite lubridate magrittr purrr rlang sjlabelled stringr]; }; + ipeadatar = derive2 { name="ipeadatar"; version="0.1.6"; sha256="1j600mhvy023ry9hx8ib6wqdv4mip1cjbwzs9190v8qpc9r2a460"; depends=[curl dplyr jsonlite lubridate magrittr purrr rlang sjlabelled stringr]; }; ipflasso = derive2 { name="ipflasso"; version="1.1"; sha256="0gf1yj35vr92qi59hffcf4hzrh2b439kfd6m745wgpxq6wic1hs3"; depends=[glmnet survival]; }; ipfp = derive2 { name="ipfp"; version="1.0.1"; sha256="12aklhf9p70r9b2wi0qgbl835b4lil805c31n1ka4kdix4b4cpr4"; 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.4"; sha256="12ddzqfdvz98568kwzrhlxv5j51g2qmxi2jyyvfm39rxncvsgrx1"; depends=[remotes]; }; iplots = derive2 { name="iplots"; version="1.1-7.1"; sha256="1bz8n9cnx6zy3wsr49h55r0l5ikfl0xjg4r76fi4giid2a3ba4lf"; depends=[png rJava]; }; ipmr = derive2 { name="ipmr"; version="0.0.4"; sha256="1j1dkfgglsx80872ck2hfd2bl4f2hzhfmlnlvyw6vdj2cnh728jv"; depends=[magrittr purrr Rcpp rlang]; }; - ipptoolbox = derive2 { name="ipptoolbox"; version="1.2"; sha256="0scbny4crgr23qcp0vgsxhwmj5g5q5c1c4mb5mmb5njyvc34s01l"; depends=[AlgDesign copula evd kolmim triangle]; }; ipr = derive2 { name="ipr"; version="0.1.0"; sha256="1db06r784c6jga0anp6p5b3k47yfhr84nzxyjn52pc9zkg3yifjm"; depends=[]; }; ipred = derive2 { name="ipred"; version="0.9-12"; sha256="0hsq00382pfd9hzpcgphjxazbxm4zx0k2r6pk6kib56k0ibm7qfn"; depends=[class MASS nnet prodlim rpart survival]; }; iprior = derive2 { name="iprior"; version="0.7.3"; sha256="15qzqwikxy85fcd7psz363b5wb0kpi85icfyb47hbgdhln8fi2qb"; depends=[doSNOW foreach ggplot2 mvtnorm Rcpp RcppEigen reshape2 scales]; }; @@ -11092,9 +11254,9 @@ in with self; { ipw = derive2 { name="ipw"; version="1.0-11"; sha256="11a34j6lp329ran2r9kxn8184kfmibkdig74lsy6lj4w4w0d71cm"; 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]; }; - iq = derive2 { name="iq"; version="1.9.1"; sha256="1n4hdkw37364ilc8v3bffmnwd7r8cpysn7jssf9h9jxh9pyd612y"; depends=[]; }; iqLearn = derive2 { name="iqLearn"; version="1.5"; sha256="1zn43zvx0mjzh96bm73scacmladamy8jmhxim7hcfq39cfhiw3c8"; depends=[]; }; irace = derive2 { name="irace"; version="3.4.1"; sha256="1dhlspv1gqg7cm7j95zhl0k2zr0s159krjmxm07k5fp68ax95sky"; depends=[R6]; }; + irboost = derive2 { name="irboost"; version="0.1-1.1"; sha256="03rgcmaahq1mhv15lid41n39wiqn4lrnc4q0rq25q7xg328vc9d5"; depends=[mpath xgboost]; }; ircor = derive2 { name="ircor"; version="1.0"; sha256="07apa4l4ib11xw25d44b403s3la29sqlid13q41hjrlfxafm91ld"; depends=[]; }; irg = derive2 { name="irg"; version="0.1.6"; sha256="1c9v5yk1512ga51356fjyl8zblw61p9m55vx89fy81qi0vcwxrgj"; depends=[chk data_table RcppRoll]; }; iriR = derive2 { name="iriR"; version="0.2.2"; sha256="0dzjafj2bnp9ss173pmzx61l50rr9a5lpiljjlf7y1pai9k0aay8"; depends=[dplyr ggplot2 ggsci gsheet reshape2 scales WDI]; }; @@ -11117,7 +11279,7 @@ in with self; { isdals = derive2 { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; 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=[]; }; - islasso = derive2 { name="islasso"; version="1.4.2"; sha256="0nks1ck5im83745argdkl53h2al3d23mmpws9qr688z800yxsznl"; depends=[glmnet Matrix]; }; + islasso = derive2 { name="islasso"; version="1.4.3"; sha256="0ym8yxpqhs8msi5svqa3mzp3x4jd7j4d8aampwchpkzyp2306rmv"; depends=[glmnet Matrix]; }; ismev = derive2 { name="ismev"; version="1.42"; sha256="19giigxwf62cdkf7mglsca649n2ignb9bxyg9zl7im1vm3ngnmqd"; depends=[mgcv]; }; 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=[]; }; @@ -11134,28 +11296,29 @@ in with self; { isokernel = derive2 { name="isokernel"; version="0.1.0"; sha256="04mrbq2822yhcq4q82xwm61a38zsk6w55jgjkp0xnardpv8a39pb"; depends=[Matrix RANN]; }; isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; }; isopat = derive2 { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; }; - 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]; }; isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; }; isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; }; - isotracer = derive2 { name="isotracer"; version="1.1.0"; sha256="14px45yqr0xgaqj7ssn2mb9n3gf6vpl6mvfg4qav6y082w5bgrgl"; depends=[BH coda data_table dplyr latex2exp magrittr pillar purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders tibble tidyr tidyselect]; }; - isotree = derive2 { name="isotree"; version="0.3.9"; sha256="07jmf23iklcvvh705jy8pv3lqfw9qdrd073bcx8jmakzhga8rxa5"; depends=[Rcpp]; }; + isotracer = derive2 { name="isotracer"; version="1.1.2"; sha256="1p78p6604hcrnjvahk6q9dqcg6fcqgbqanrc820zxixn34k49v15"; depends=[BH coda data_table dplyr latex2exp magrittr pillar purrr Rcpp RcppEigen rlang rstan StanHeaders tibble tidyr tidyselect]; }; + isotree = derive2 { name="isotree"; version="0.5.14"; sha256="1bza63nm9sxlr126rilvlvpc43dng0ln4mp40lwb5s8xiv5qai29"; depends=[Rcpp]; }; ispd = derive2 { name="ispd"; version="0.2"; sha256="06h4z342d17rkpr2wwck4sq79kprdq6fgqf10jg8cs1f52q6pq0h"; depends=[ibd]; }; isqg = derive2 { name="isqg"; version="1.3"; sha256="1988bc5n4b5mgxrfl1774vfgaw7rxm9vlaxnkx26phjzhlr1ix9h"; depends=[BH R6 Rcpp Rdpack]; }; istacr = derive2 { name="istacr"; version="0.1.3"; sha256="14nhd3v8l827mb1fxfhsxklzxbf4316ijp2qkc99qp7ydmxbk0rd"; depends=[curl jsonlite]; }; 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="2.0.1"; sha256="0bvdi18dmjvxf5wrvipsf1q2bsmiwh2pb57kyrb2zlkfz3hz53ww"; depends=[ggplot2 reshape]; }; + 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]; }; itdr = derive2 { name="itdr"; version="1.0"; sha256="1113lr17m370ipg3sxghqvk4fj36bgqs5bfvnli8rss2ffyzfin0"; depends=[MASS]; }; iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; }; iterLap = derive2 { name="iterLap"; version="1.1-3"; sha256="079d4hxf1ha8pgibzb4r1yk7xqpzndd7hjbp8294qb26jvvcnd8q"; depends=[quadprog randtoolbox]; }; - iterators = derive2 { name="iterators"; version="1.0.13"; sha256="190i1y2493v5c9z8978rb3idlwsjymy67k1assa9znljqbj313kp"; depends=[]; }; + iterators = derive2 { name="iterators"; version="1.0.14"; sha256="0yv7rh6ghlfx727xy2aq64a7skyxp9msakaffs641q9h15d0gwyf"; depends=[]; }; iterpc = derive2 { name="iterpc"; version="0.4.2"; sha256="06q7l8mz8ws4nn6gb0whnlqs8my2n8z2d2g8fvv3cxd28904dg9q"; depends=[arrangements gmp iterators]; }; itertools = derive2 { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; }; itertools2 = derive2 { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; }; itraxR = derive2 { name="itraxR"; version="1.4"; sha256="0gybgzc37q1i2zdik1xjn1l6p98jx8r8k722fsgfb17pxj4l4bkf"; depends=[broom compositions dplyr ggcorrplot ggfortify ggplot2 janitor 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"; sha256="0759l7hhvj05dp92pz59xwrxjm9s1iwkwrdhs68l0fq57550j70l"; depends=[mgcv plotfunctions]; }; + itscalledsoccer = derive2 { name="itscalledsoccer"; version="0.1.0"; sha256="03ssjjzwjizmydy8534y27n020y2mvzdwinjckj96cfgrdw1px7m"; depends=[clisymbols crayon data_table dplyr glue httpcache httr jsonlite magrittr R6 rlang stringi tidyr]; }; + itsdm = derive2 { name="itsdm"; version="0.1.1"; sha256="17r9m726grqwfjyy6gmnagc0yav358sxgcglyyww7k39cbhmyk57"; depends=[checkmate dplyr ecospat fastshap ggplot2 isotree ncdf4 outliertree patchwork raster rlang ROCit sf stars stringr tidyselect]; }; itsmr = derive2 { name="itsmr"; version="1.9"; sha256="0dmijaq6q31irwrjqv5gq1yfbgggwb3m6rwbg4lx1r9l3cqays7i"; depends=[]; }; iva = derive2 { name="iva"; version="0.1.0"; sha256="0dchb263ygilxapwsw2gpl18z12wcjsz8zz5fg7h068hmcysa88g"; depends=[Formula ucminf]; }; ivdesc = derive2 { name="ivdesc"; version="1.1.0"; sha256="06jqnh6i8szygc00d6ys0wwvh9br33zmwc430q2ann1qmrkaxxj5"; depends=[knitr purrr rsample]; }; @@ -11170,14 +11333,16 @@ in with self; { ivprobit = derive2 { name="ivprobit"; version="1.1"; sha256="05b5gf5gmi2yrkg61n7w12qlgpnjakd1z8hhqxy6py8hahsf84gm"; depends=[Formula]; }; ivreg = derive2 { name="ivreg"; version="0.6-1"; sha256="1dv1vmhnf31a2rn02yy9r34jzfwb8k34y15zpsqp8557ylr1s7nm"; depends=[car Formula lmtest MASS]; }; ivregEX = derive2 { name="ivregEX"; version="1.0"; sha256="0zh3rqvhn8ald6lxv9kywy2v1p0nr9ijv6plhpbxc6k51zzsgyl8"; depends=[AER Formula lmtest sandwich]; }; - ivsacim = derive2 { name="ivsacim"; version="1.3.1"; sha256="0bd14ydv0pz9yfvr2v1anrgahf4is15mfbdgi8ik96rq9kmlfhk9"; depends=[lava Rcpp survival]; }; + ivsacim = derive2 { name="ivsacim"; version="2.1.0"; sha256="0pldg086kaaqc2wab1m61anabqaf0mffv1hsb8plz1qn2f8gdcp3"; depends=[Rcpp RcppArmadillo]; }; ivtools = derive2 { name="ivtools"; version="2.3.0"; sha256="1wv0r9dy893hafbbrjcjrphb8dgql71ya4zfbkl5dfp7d4ncfxl0"; depends=[ahaz data_table nleqslv numDeriv Rcpp survival]; }; ivx = derive2 { name="ivx"; version="1.1.0"; sha256="1dg09aajk9rqmrlwq4xw7qd5ra1z8wjxipy5l85sl1nzii250drq"; depends=[Rcpp RcppArmadillo]; }; - jSDM = derive2 { name="jSDM"; version="0.1.0"; sha256="0lkapg6v5lh53vnsg5hcr9qis8qimb6ilds23dqcyhi6w3dys9nb"; depends=[coda corrplot Rcpp RcppArmadillo RcppGSL]; }; + jSDM = derive2 { name="jSDM"; version="0.2.0"; sha256="13l3xpk7qfwvsq3zbpiq20j6168f4xxric055vf5p1siw0akvsh1"; depends=[coda corrplot doParallel foreach MASS Rcpp RcppArmadillo RcppGSL stringi]; }; jScore = derive2 { name="jScore"; version="0.1.0"; sha256="0hb63l10cwvpvix155d16v35lp1v88lp69f6q1s09njc6qdsg212"; depends=[]; }; jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; }; + jaatha = derive2 { name="jaatha"; version="3.2.2"; sha256="1if21hlbf0gz6p6f9h21cxdxcqxv3b54wx5zl4hmiaq9i6zrf8rr"; depends=[assertthat R6]; }; + jab_adverse_reactions = derive2 { name="jab.adverse.reactions"; version="1.0.1"; sha256="0z7i6ni1bhih5yxwng1xxf8cgg3bb1il3p32rp5vfz2hfdm68vag"; depends=[]; }; jaccard = derive2 { name="jaccard"; version="0.1.0"; sha256="1dmla6qc1k8iw2d7zfjqhf13gqd2lpsrj09yh47ljf994fpab936"; depends=[dplyr magrittr qvalue Rcpp]; }; - jack = derive2 { name="jack"; version="1.1.1"; sha256="1mp7cfmh3bzfansb3dyqq347qk6kkf4ndn23pbd78h1xcb54555b"; depends=[DescTools gmp multicool mvp partitions]; }; + jack = derive2 { name="jack"; version="2.0.0"; sha256="1pm2d1k138qfz3rvvh83ybyvgr687y95c352629lyy1j87bsd15g"; depends=[DescTools gmp JuliaConnectoR multicool mvp partitions Ryacas]; }; jackalope = derive2 { name="jackalope"; version="1.1.3"; sha256="1cslrl2cvcpi2kisb2plkz8c3wfxkbkf816nnyb06k4mv3gy4r5d"; depends=[ape R6 Rcpp RcppArmadillo RcppProgress Rhtslib zlibbioc]; }; jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; }; jackstrap = derive2 { name="jackstrap"; version="0.1.0"; sha256="09y9pgb920lnbzlgm6j188q8lw1air83kx383a2f89zz7hhgg7jr"; depends=[Benchmarking doParallel dplyr fBasics foreach ggplot2 plyr reshape rlang scales tidyr]; }; @@ -11200,9 +11365,9 @@ in with self; { jds_rmd = derive2 { name="jds.rmd"; version="0.3.0"; sha256="0xrs0xabh0m9ax9praiwj1l7z6mb53q53pqvcgwqw7xld6kkgzh7"; depends=[bookdown rmarkdown]; }; jeek = derive2 { name="jeek"; version="1.1.1"; sha256="15n0k0i1wwp72g8zqrjmglnckab3p65q3rnpg6d6h8hjcpv82i7g"; depends=[igraph lpSolve pcaPP]; }; jenga = derive2 { name="jenga"; version="1.0.0"; sha256="1lnqvq979yw3im2cll2bynqafgcs81ndqkzi37smys4fnlb7kyi6"; depends=[abind ggplot2 imputeTS lubridate modeest moments narray philentropy purrr readr scales stringr tictoc]; }; - jetpack = derive2 { name="jetpack"; version="0.5.0"; sha256="17dixhg5nwv2fhp7gvcc927kfxzj07x288g6ywbba1mphk9j5nam"; depends=[desc docopt remotes renv]; }; + jetpack = derive2 { name="jetpack"; version="0.5.2"; sha256="15hmkppq775crmwichg0fsg3ki7xqfavm9bz4li79armyiry44w2"; depends=[desc docopt remotes renv]; }; jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; }; - jfa = derive2 { name="jfa"; version="0.6.1"; sha256="1f0y13kh3mi5x50wsw5yp88l6d4874nrp0fdpi6nashcffznk8zg"; depends=[extraDistr]; }; + jfa = derive2 { name="jfa"; version="0.6.3"; sha256="1p4lw8yfkrw7187q4pcjai3ly5xlxvivwghi61jh89zrq8n54vbb"; depends=[extraDistr]; }; jgcricolors = derive2 { name="jgcricolors"; version="1.0.0"; sha256="1lg6yzqly5y2cf396b6rvfqplnfyz9v9ay2g4q9m110mng5ln96l"; depends=[ggplot2 knitr markdown RColorBrewer stringr]; }; jiebaR = derive2 { name="jiebaR"; version="0.11"; sha256="08v64xwr9jp4vh88x7y935khh4cmj8rwsjaxfd2c67n0445qppmd"; depends=[jiebaRD Rcpp]; }; jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; }; @@ -11217,7 +11382,7 @@ in with self; { 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.0"; sha256="0fhjp3ih46r34yiqxbd2kpwp88nhyrqfwh729l14sj3aw142nlbi"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; }; - jmvReadWrite = derive2 { name="jmvReadWrite"; version="0.2.2"; sha256="1i9gl79pdr73mkzpqbainsrwa942nvmzmflcy7mcp8lli7xbcpsm"; depends=[rjson]; }; + jmvReadWrite = derive2 { name="jmvReadWrite"; version="0.3.1"; sha256="0yg6j122x9hcyjw5lfdz6fj4mpj5w8z3cdn9nlfi79yl7ivzf9dm"; depends=[rjson zip]; }; jmvconnect = derive2 { name="jmvconnect"; version="2.0.0"; sha256="1q412v8z0wbiqab4czabg75w976591lh59gbbhqz1avkas3jjhf2"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; }; jmvcore = derive2 { name="jmvcore"; version="2.2"; sha256="009hkg378vfkzxbz323m7zfmfyh0j742xf4381qb6s81v3wmg4dq"; depends=[base64enc jsonlite R6 rlang stringi]; }; job = derive2 { name="job"; version="0.3.0"; sha256="0d7pw3q5lqlgmav1vx63y8l6gdav96656bg378wj001rx5gx052h"; depends=[digest rstudioapi]; }; @@ -11225,22 +11390,22 @@ in with self; { joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; }; joineR = derive2 { name="joineR"; version="1.2.6"; sha256="11pdpivqrbx9zp43yrj52r40n5pql99zhlsazh8pk61zca93gmbm"; depends=[lattice MASS nlme statmod survival]; }; joineRML = derive2 { name="joineRML"; version="0.4.5"; sha256="0rj6ag1qlz1iyia89pkxw8l2aj8msph17g7qkgc3g99v4i9rj2pp"; depends=[cobs doParallel foreach generics ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival tibble]; }; - joineRmeta = derive2 { name="joineRmeta"; version="0.1.2"; sha256="0lkj3rry8kvdcl3dxrkvnql8rl3fsgc4lk5qdifhl41aws2q7ccs"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm statmod survival]; }; joinet = derive2 { name="joinet"; version="0.0.10"; sha256="1jjx1rvg2x9zdfdqsjk04hcn7qsf8g7pq8q0x9q83kd8sb1ikjk5"; depends=[cornet glmnet palasso]; }; - joint_Cox = derive2 { name="joint.Cox"; version="3.15"; sha256="0g1ypwsnnm3068n7d3whmrlsc4c7banj49af1id7x174ibh20gqd"; depends=[survival]; }; + joint_Cox = derive2 { name="joint.Cox"; version="3.16"; sha256="0i2lf4q5w3893wppcig85r3ljr84j0d2m2id9kw9g194c8qgaqmm"; depends=[survival]; }; 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=[]; }; jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; }; jointseg = derive2 { name="jointseg"; version="1.0.2"; sha256="0zilkxk30w3l9mwikmsgvpy5misjggs98c3bjrjy1pfc4b0is943"; depends=[acnr DNAcopy matrixStats]; }; - jomo = derive2 { name="jomo"; version="2.7-2"; sha256="1sbcpacxnxbzwa8rr9x2bq7hh0s3sw6yznr90dkp43n6xk5xaqir"; depends=[lme4 MASS ordinal survival]; }; + jomo = derive2 { name="jomo"; version="2.7-3"; sha256="0qq03zspmh8x2c8w882ynsw7wshr9b0fyrpwnqx5yc1xlzrqffcx"; depends=[lme4 MASS ordinal survival tibble]; }; jordan = derive2 { name="jordan"; version="1.0-1"; sha256="1d0my0lf8bmlmygz9f23skywzsrhy4xaykyrblbmhb00l0vxpa5s"; depends=[emulator mathjaxr onion]; }; josaplay = derive2 { name="josaplay"; version="0.1.3"; sha256="0q6kjk3mjxwbqvq3zz0ylpi1viznp9pxzngqpjzv5sibv0ndh0lf"; depends=[magrittr utf8]; }; jose = derive2 { name="jose"; version="1.2.0"; sha256="09k6wnnqlsbmlag4156rcsnavph52grqagkax9kd1sxgpknril3v"; depends=[jsonlite openssl]; }; journalabbr = derive2 { name="journalabbr"; version="0.3.0"; sha256="1q1dmvx4b55bbd2qn920kmi962ignj2h36y7f22bqi5kcgzfgx9d"; depends=[dplyr httr knitr purrr rlang rmarkdown shiny stringi stringr tibble]; }; joyn = derive2 { name="joyn"; version="0.1.4"; sha256="17x9rwcrqv7qx9w0cfyshjsij9cdl0fk13cfqbv0ibnc2nfycw87"; depends=[cli data_table glue rlang]; }; jpeg = derive2 { name="jpeg"; version="0.1-9"; sha256="0wihj538wdnr71wdldym83qadb4kh68a6rkallwbh2f25r27b881"; depends=[]; }; - jpmesh = derive2 { name="jpmesh"; version="2.0.2"; sha256="1rq8xqngizgib5lq60zkpd744f7lf8q69dzhxwlbnhirysnvp1p7"; depends=[leaflet magrittr memoise miniUI purrr rlang sf shiny tibble 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.2.0"; sha256="051mlyxd3xbik8fw1343xi72smmbaz6lvyn340m745y4jjx48006"; depends=[dplyr httr lubridate navigatr pillar progress purrr rlang stringi stringr tibble tidyr vctrs]; }; jqr = derive2 { name="jqr"; version="1.2.2"; sha256="1v3qjqblwn15mlw3cgmrmh78kcckqrj54wnfyfhrfxdsiqi5d0dk"; depends=[lazyeval magrittr]; }; jquerylib = derive2 { name="jquerylib"; version="0.1.4"; sha256="04a40v4znpj98j7y6009d74a6g9dchj5rr3p08cgz9p3rlfw3g7h"; depends=[htmltools]; }; jrc = derive2 { name="jrc"; version="0.5.1"; sha256="0lg647nfijj6grlmwkasd6di5h6286dxmw1373k6n5gwym1g1l36"; depends=[httpuv jsonlite mime R_utils R6 stringi stringr]; }; @@ -11249,25 +11414,26 @@ in with self; { 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="1.4.0"; sha256="0gvrp7qmjd8qikb0vd72fb43csd7505szjkxghbzbpp65n14z55r"; depends=[base64enc fontawesome htmltools htmlwidgets jquerylib miniUI R_utils rstudioapi shiny shinyAce]; }; + jsTreeR = derive2 { name="jsTreeR"; version="1.6.0"; sha256="0dq9616dcg9pmrj8gn2njfqh509f7syyy10kmlpdcry9fji8msz6"; depends=[base64enc fontawesome htmltools htmlwidgets jquerylib miniUI R_utils rstudioapi shiny shinyAce]; }; jskm = derive2 { name="jskm"; version="0.4.3"; sha256="04bm4haylhjj5wf09jmpznav7shnlnhag7kxl4yqp3z5572dvj1g"; depends=[ggplot2 gridExtra scales survey survival]; }; - jsmodule = derive2 { name="jsmodule"; version="1.2.0"; sha256="1pnj6y3i0g75l8q6na0s78rwfj11nfmk2lw99qhxvbwcg5by7fhj"; depends=[data_table devEMF 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 survC1 survey survIDINRI survival timeROC]; }; + jsmodule = derive2 { name="jsmodule"; version="1.3.0"; sha256="0a8ckml3i792y0ddff34l686f07vl1bqrs6q3gjmqs0hcrwl0lll"; depends=[data_table devEMF 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 survC1 survey survIDINRI survival timeROC]; }; json64 = derive2 { name="json64"; version="0.1.3"; sha256="19q8qgf4wnd3np12ajy180klpjy0g2csw5micwb4sl7qfzl6wc7j"; depends=[jsonlite]; }; jsonStrings = derive2 { name="jsonStrings"; version="1.0.0"; sha256="1rcgfzcbypmq2fcngl63ik6z13ir1687ya8aww2v8bk56h19pdxa"; depends=[Rcpp]; }; jsonify = derive2 { name="jsonify"; version="1.2.1"; sha256="1kpv6whi6bggi0ij7krzfr0fly6c2j9y54fr5ahgcjp36amr34cj"; depends=[rapidjsonr Rcpp]; }; jsonld = derive2 { name="jsonld"; version="2.2"; sha256="0bplz2s97wl9yp383jazykh5647iw6kbr1zanqai2s0sxp1xbwn8"; depends=[curl jsonlite V8]; }; - jsonlite = derive2 { name="jsonlite"; version="1.7.2"; sha256="1lhzcpz9clwq04i5m6jzkvw9x03pwlqrixv4l9xzchjr8d84nd86"; depends=[]; }; + jsonlite = derive2 { name="jsonlite"; version="1.8.0"; sha256="0k6dal7gmm19jl5sjsry5gwbnhsbrnn00q3iixig8k6bxgpr463v"; depends=[]; }; jsonstat = derive2 { name="jsonstat"; version="0.0.2"; sha256="0p0d3snl1971p5ikrkmwqrjjh4fy0b89qk3rnd1dayfb0r80xnnj"; depends=[cli dplyr jsonlite rlang]; }; jsontools = derive2 { name="jsontools"; version="0.1.0"; sha256="13i1g8lmzgs7hd0xay4gm8z2myzbjzi73fwp9x4f4f9mywj7zl5s"; depends=[bit64 DBI glue jsonlite magrittr pillar purrr rlang RSQLite tibble tidyselect vctrs withr]; }; jsonvalidate = derive2 { name="jsonvalidate"; version="1.3.2"; sha256="0myvm93azl6mj60l8fp91qa3ln3nnwj4p48xli8k215sm6zhhv1b"; depends=[V8]; }; jstable = derive2 { name="jstable"; version="1.0.7"; sha256="1hs202z49aazsadr0jb67wk43i18y3h1aw0xflfmvirxjxr63xm8"; 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]; }; - jti = derive2 { name="jti"; version="0.8.0"; sha256="15rx44psz5hbpqzlmwnmqzzdf6488n17mbhyh52wyaaa70gk9ndh"; depends=[igraph Rcpp RcppArmadillo sparta]; }; + jti = derive2 { name="jti"; version="0.8.3"; sha256="1bys01nd4smihm98g6ldfvglj3ba10006qkkxamnf0i3kvm2v6cf"; depends=[igraph Rcpp RcppArmadillo sparta]; }; jtools = derive2 { name="jtools"; version="2.1.4"; sha256="1zbzhr7bz735b8pvqjxhqnmh3sl12xvpz5fpkmjngvwi4yz5873r"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; }; jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; }; jubilee = derive2 { name="jubilee"; version="0.3.3"; sha256="1j2y44pfx9z2k169lh42b4dnfrrnk8jqsjn3wz4l9iscr6r91lx7"; depends=[data_table dplyr readxl xts yaml zoo]; }; juicr = derive2 { name="juicr"; version="0.1"; sha256="0vkbgbagcgaxj6k62b033ik85jnkzvshg8dm9cz7vq4yjqj3icip"; depends=[RCurl XML]; }; - junctions = derive2 { name="junctions"; version="2.0.1"; sha256="19fjh9nf3dp88gdxf6a1f49bann7g21g9rhrqj0fv38wss97cssr"; depends=[nloptr Rcpp RcppParallel tibble]; }; + junctions = derive2 { name="junctions"; version="2.0.3"; sha256="0lm3n8n9dfi9nsdazj74pd57kxm2kzrd1gxdzd0izzwgkjnsrsqc"; depends=[nloptr Rcpp RcppParallel tibble]; }; + just_install = derive2 { name="just.install"; version="1.0.2"; sha256="1g82g4lhdk8mf1v4j47y2pgdrryz4175djx42kmg85vw7mlpvlcj"; depends=[dplyr remotes]; }; justifier = derive2 { name="justifier"; version="0.2.2"; sha256="1ww9rdi9khylvr15crkjibdzydlynwscphqyrcpnfig346i9yv72"; depends=[data_tree DiagrammeR DiagrammeRsvg purrr yaml yum]; }; jvcoords = derive2 { name="jvcoords"; version="1.0.3"; sha256="1ixmz3pj18zddgah59iqd4zbm5praw0dvn6c93dn5mrwx92pa65c"; depends=[]; }; jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; }; @@ -11287,7 +11453,7 @@ in with self; { kaps = derive2 { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[coin Formula survival]; }; karaoke = derive2 { name="karaoke"; version="1.0"; sha256="1kx11lijdffhhh8prjgsamshgg2v29b2i129fjqi079waa335352"; depends=[seewave tuneR]; }; karel = derive2 { name="karel"; version="0.1.0"; sha256="0ncjzfzm8a6vx2mswvck3j6vnpqhzrjd5gd371xa5cgi0w1figa9"; depends=[dplyr gganimate ggplot2 gifski magrittr purrr tidyr]; }; - katex = derive2 { name="katex"; version="1.3.0"; sha256="07f381ja2pwgnjz9794zc6cg4qzr16zfm116f4dwjghyfblxs3qa"; depends=[V8]; }; + katex = derive2 { name="katex"; version="1.4.0"; sha256="0kgz2qck90h9kaxvy40nii03ib02z757bmw8sgacik82hmj0fxx8"; depends=[V8]; }; kayadata = derive2 { name="kayadata"; version="1.0.0"; sha256="1zmdwds1p430770426lhwhffissb44x27wqh1vbz7z52ma0h7l91"; depends=[dplyr forcats ggplot2 magrittr scales stringr tidyr]; }; kazaam = derive2 { name="kazaam"; version="0.1-0"; sha256="0j7vysnmiv9sggcxdn3nrgfvyl52pza4kkjnsa0xlb3fzq9qpwlz"; depends=[pbdMPI]; }; kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; }; @@ -11308,9 +11474,9 @@ in with self; { kendallRandomWalks = derive2 { name="kendallRandomWalks"; version="0.9.4"; sha256="1mfqblvsn9p6gdcnbypfpzk0xzn6bz1ajbrkz2dap5w35dia3kxa"; depends=[actuar dplyr ggplot2 tibble]; }; kequate = derive2 { name="kequate"; version="1.6.3"; sha256="1ii3wlypm2qqkfxr3z1sdnmgc43h2zzlw6v4h2xxjdlznzxkp3mr"; depends=[equateIRT ltm mirt]; }; kerTests = derive2 { name="kerTests"; version="0.1.3"; sha256="0981q4n4wrv62x4b8jccj5hx58n975rls3sn3s0mz7ajhh1xxbi9"; depends=[]; }; - keras = derive2 { name="keras"; version="2.7.0"; sha256="004z9aajc0b7lw7g68ri7ndabdwbylmnlyvmziljmm29z6fzk8y5"; depends=[ellipsis generics glue magrittr R6 reticulate rlang tensorflow tfruns zeallot]; }; + keras = derive2 { name="keras"; version="2.8.0"; sha256="10zvy4lmhb2sbn0gsm12pf95pxj9bmi8241ap1n6170xsld9phcf"; depends=[ellipsis generics glue magrittr R6 reticulate rlang tensorflow tfruns zeallot]; }; kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; }; - kerastuneR = derive2 { name="kerastuneR"; version="0.1.0.3"; sha256="1lky84mgppsbn2wn0livx2j18x5vg92mskhb3pyf4ig9qyfxgjkk"; depends=[crayon data_table dplyr echarts4r keras magick plotly reticulate rjson RJSONIO rstudioapi tensorflow tidyjson]; }; + kerastuneR = derive2 { name="kerastuneR"; version="0.1.0.4"; sha256="1xpilrlf0l323aikq1lflc166wr0xffj0psq1pfhlmm51zhv8190"; depends=[crayon data_table dplyr echarts4r keras magick plotly reticulate rjson RJSONIO rstudioapi tensorflow tidyjson]; }; kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; }; 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=[]; }; @@ -11322,6 +11488,7 @@ in with self; { kernlab = derive2 { name="kernlab"; version="0.9-29"; sha256="0vqhndl4zm7pvkfvq0f6i9cbrm7pij6kmdp7d7w39pa100x6knn3"; depends=[]; }; kernplus = derive2 { name="kernplus"; version="0.1.2"; sha256="0z5zpj89nw7cdphg6frmjwqjxsl6g95xsa8zgsxmw2q75wwj1saz"; depends=[circular KernSmooth mixtools]; }; kernscr = derive2 { name="kernscr"; version="1.0.5"; sha256="1kcj710q8jbc34g6fcv2nk07hpsb81mfx8hvivgxq8x58028gjzs"; depends=[MASS mvtnorm]; }; + kesernetwork = derive2 { name="kesernetwork"; version="0.1.0"; sha256="0q42zry3qgg38aas0cxy7lwpj9mj45crcbs353d1d1is0w1avh09"; depends=[config data_table dplyr DT ggplot2 golem htmltools plotly reactable rintrojs rlang shiny shinyBS shinycssloaders shinydashboard shinydashboardPlus shinyhelper shinyWidgets stringr visNetwork yaml]; }; keyATM = derive2 { name="keyATM"; version="0.4.0"; sha256="1505r5753fv2xifcm960mzis0w8z4ax7rdbvvcy8bqckzi873m7n"; depends=[dplyr fastmap future_apply ggplot2 ggrepel magrittr MASS Matrix matrixNormal pgdraw purrr quanteda Rcpp RcppEigen RcppProgress rlang stringr tibble tidyr]; }; keyToEnglish = derive2 { name="keyToEnglish"; version="0.2.1"; sha256="1wzn93gp1v6y8qh9kypydqadnf6fc7xzjili77b7j402hvb0a8zg"; depends=[jsonlite openssl stringr]; }; keyholder = derive2 { name="keyholder"; version="0.1.6"; sha256="0f8pqmp4va8y92zlld42shig0r9idif5wi1vi378753pkibfd4yb"; depends=[dplyr rlang tibble]; }; @@ -11330,13 +11497,13 @@ in with self; { keyring = derive2 { name="keyring"; version="1.3.0"; sha256="1j8l6nmh4dr70kwybiais8yh687fdwrj134xynq68igw1b1rm8ga"; depends=[askpass assertthat filelock openssl R6 rappdirs sodium yaml]; }; keyringr = derive2 { name="keyringr"; version="0.4.0"; sha256="04f0z6mqj75l5qhiab0zvjsvz3jz1bp6dfazkpgihjmls5k11dnh"; depends=[stringr]; }; keys = derive2 { name="keys"; version="0.1.1"; sha256="0jq7c70hyxpaxkrciy2jz4bf2mdcbcnmpjniwqffk1lkaxr0ni9b"; depends=[htmltools jsonlite shiny]; }; - kfa = derive2 { name="kfa"; version="0.1.0"; sha256="1nq4lmnw9bfck98q43ldnbg94q0cq495qb0xsfgzpagg0y7dhml5"; depends=[caret doParallel flextable foreach GPArotation knitr lavaan officer rmarkdown semPlot semTools simstandard]; }; + kfa = derive2 { name="kfa"; version="0.2.0"; sha256="10y01rrmla58w7w10mbskf0hszfxy91r2d8cjmvzxg9qr0zsyyaw"; depends=[caret doParallel flextable foreach GPArotation knitr lavaan officer rmarkdown semPlot semTools simstandard]; }; kfda = derive2 { name="kfda"; version="1.0.0"; sha256="0861hzry55gj8ykdd8cwil1wb7234pkmipp4v1749fpmzggq1xgi"; depends=[kernlab MASS]; }; kfigr = derive2 { name="kfigr"; version="1.2.1"; sha256="0kys4j2n2n1v918v877798m34q431fpz0p0s6gxnfqnn26z2hy14"; depends=[knitr]; }; kgc = derive2 { name="kgc"; version="1.0.0.2"; sha256="14zbcimnglh5jj07dcaxp1dfjaz8syswy29nf8z39qmslv1hg9kk"; depends=[plyr shiny shinythemes]; }; kgrams = derive2 { name="kgrams"; version="0.1.2"; sha256="0m1cw55lr0bl83p379wh3103d1rw9933lvf457kvxy56r1164l2h"; 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.7.0"; sha256="146kc7mazzznaih9sjqf7cylpxq08lnhijmrapqyhk00f3i6h52n"; depends=[]; }; + khroma = derive2 { name="khroma"; version="1.8.0"; sha256="07z0k3gg5hr61l03xljfmgjsrsbljpb3ha0mhkwgfq85wiwkmnr3"; 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=[]; }; kim = derive2 { name="kim"; version="0.4.21"; sha256="0sn6m3mnf8d8ghdybyrsckvvmj8j5djg41f87ar7m764pm39prhl"; depends=[data_table remotes]; }; @@ -11354,9 +11521,10 @@ in with self; { 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]; }; + kko = derive2 { name="kko"; version="1.0.1"; sha256="08mgi7j1kirfnjsj3xi2wgr32cnqb88vxs15gfm6f1gq853xvhch"; depends=[doParallel ExtDist foreach grpreg knockoff]; }; klaR = derive2 { name="klaR"; version="0.6-15"; sha256="1bhgkq6spjawy5lsh663rnby4fzrx4k2qwqp4ci4p9pq8g35pzjv"; depends=[combinat MASS questionr]; }; - klassR = derive2 { name="klassR"; version="0.1.7"; sha256="1y2jbpb7yyah62a6ii61xllskz5h4jcnw7sxmwzfnw6jpnd5m3gr"; depends=[httr jsonlite tm]; }; - klausuR = derive2 { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; }; + klassR = derive2 { name="klassR"; version="0.1.9"; sha256="1drpiwmqyql6q69ldr8ya8sqg1m2jld5j7xs4dghwdpjlbipy6zv"; depends=[httr jsonlite tm]; }; + klausuR = derive2 { name="klausuR"; version="0.12-13"; sha256="0j05vmdcw0jagixw5b1s4lasv1n7bdlayxdqrnz97iv501pkj2qb"; depends=[psych xtable]; }; kldtools = derive2 { name="kldtools"; version="1.2"; sha256="1r6j6ddylzxsfmymnf8hp7sm8c2ckr8xrdz75xlkgp4fgay106r2"; depends=[]; }; klexdatr = derive2 { name="klexdatr"; version="0.1.2"; sha256="141xs03sb0ixhjpr388fwf5h124mqkbj0k1xqw0whdhrm5051qsz"; depends=[sf]; }; klic = derive2 { name="klic"; version="1.0.4"; sha256="1ggsdq8xcg6hi12rq356myhngx3j475gpwlvpynm1581r4z0lkbk"; depends=[cluster coca Matrix pheatmap RColorBrewer]; }; @@ -11380,8 +11548,8 @@ in with self; { knn_covertree = derive2 { name="knn.covertree"; version="1.0"; sha256="0msfcmwydws7q7m5jdb0dxab0nkbl7mq5llg6v3r4qrnlvrdggvz"; depends=[Matrix Rcpp RcppEigen]; }; knnIndep = derive2 { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; }; knnp = derive2 { name="knnp"; version="2.0.0"; sha256="0qgq8la3zndlb1wwqv9b2kw52y9ns36pi4ds68pkm81bhzq5nqis"; depends=[doParallel foreach forecast parallelDist plyr]; }; - knnwtsim = derive2 { name="knnwtsim"; version="0.1.0"; sha256="0b902w012lkj18piyfn8mkjh45fdvw19v3wpsw5ng9gk4j7g4mwj"; depends=[]; }; - knockoff = derive2 { name="knockoff"; version="0.3.3"; sha256="1nswpchpk1ccvhlgz1h3ka3c65mjfrrykfgv824fyncmfxaz8lmw"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; }; + knnwtsim = derive2 { name="knnwtsim"; version="1.0.0"; sha256="1sxz1hzbx41z3w1qf2zf8fmf3pd64jrnc37ndxx28yc70vhwjd1n"; depends=[]; }; + knockoff = derive2 { name="knockoff"; version="0.3.5"; sha256="00nh1wwj66krdng4afxkv0c0xyi5lk6f2g8iwzcd7c5l5ladab7y"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; }; knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; }; kntnr = derive2 { name="kntnr"; version="0.4.4"; sha256="1af5qhj82dixf1qcbz3sfj52pzgy8gnafzifwxnhrp7vpn4rnv6m"; depends=[base64enc dplyr httr jsonlite lubridate purrr rlang rstudioapi stringr tibble tidyr]; }; koRpus = derive2 { name="koRpus"; version="0.13-8"; sha256="0r9a2fzi3w53kixcjzbij8qmmkjl2p53dazys34s0czb5qrlm6hf"; depends=[data_table Matrix sylly]; }; @@ -11390,7 +11558,6 @@ in with self; { kofnGA = derive2 { name="kofnGA"; version="1.3"; sha256="0w0881ydnqdah04sifi25ypzxdwnsiqxfq1xam4yhr670bdak1vm"; depends=[bigmemory]; }; kohonen = derive2 { name="kohonen"; version="3.0.10"; sha256="1ck7j13x701g67bx81x7plszz804jfhl1yg42krcj9x88vm5cscr"; depends=[Rcpp]; }; kokudosuuchi = derive2 { name="kokudosuuchi"; version="1.0.0"; sha256="0h4r7bd9989pahx34lc2i5h1f8nipir941l7sahhgz28lskfkc3h"; depends=[glue rlang sf stringr tibble]; }; - kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; }; komaletter = derive2 { name="komaletter"; version="0.4.2"; sha256="1cll8cb69gyxl5mg04jibxf7szh38xrqksjkcswbgjcqidp6yxi2"; depends=[rmarkdown]; }; konfound = derive2 { name="konfound"; version="0.4.0"; sha256="14d8a1ngrf24gbxfg8c8h4svjvsjc3gflcnzxza17xv2rcgzygnr"; depends=[broom broom_mixed crayon dplyr ggplot2 mice purrr rlang tibble tidyr]; }; kosel = derive2 { name="kosel"; version="0.0.1"; sha256="1gdsy4i58byqxddpsm5nk1r3hlgik5gs2b8jqcm8n1r4ib6pg0ay"; depends=[glmnet ordinalNet]; }; @@ -11403,7 +11570,7 @@ in with self; { kriging = derive2 { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; }; krippendorffsalpha = derive2 { name="krippendorffsalpha"; version="1.1-1"; sha256="1vaqwimlmbxh2jy08f3bkpb9r4fz6gkx6cpzjkgiyspjaqhc8a1a"; depends=[]; }; krm = derive2 { name="krm"; version="2020.5-20"; sha256="1b6477cjv5k30djvrlbmwn91ghgwk24cfd58cb0q80xqhgiqvrzb"; depends=[kyotil]; }; - ks = derive2 { name="ks"; version="1.13.3"; sha256="0wyfdmhr753vpizns9kl7h7pfnnb16c7m7w9a4bpz62xcvgq1yyy"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv multicool mvtnorm plot3D pracma]; }; + ks = derive2 { name="ks"; version="1.13.4"; sha256="15sm1ys7sk0gn7hr1vik4xrn4jdf837knwk7j8h32lr29w9mh917"; 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.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; }; ksharp = derive2 { name="ksharp"; version="0.1.0.1"; sha256="1dnkj838y8c1b53mlljhjqs3nd864i9xcqsv9n4fw28b4br9m570"; depends=[]; }; @@ -11416,7 +11583,7 @@ in with self; { kuiper_2samp = derive2 { name="kuiper.2samp"; version="1.0"; sha256="0gcgayh7qdic9zprdvs6r8qvpqs467zrm0qzp2acb7alcp01jhpi"; depends=[]; }; kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; }; kutils = derive2 { name="kutils"; version="1.70"; sha256="06jk66wbq3jmdf2jdhqns6r3yk36l2x7c907x977zv80sqxa1l37"; depends=[foreign openxlsx plyr RUnit xtable]; }; - kvh = derive2 { name="kvh"; version="1.4.1"; sha256="0hnqlybphx8qnx98ynykxpz4ys4prp9zbmkak02qlvmnxwc2cqg0"; depends=[Rcpp]; }; + 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]; }; kyotil = derive2 { name="kyotil"; version="2021.5-14"; sha256="1wimyjh78w3bimijr8ym0642kdag4zryildyx3v1p37cjy8788b9"; depends=[]; }; kza = derive2 { name="kza"; version="4.1.0.1"; sha256="1vx7wc8iwmr9d6ff2kcy6y3nyfj6jfzv4hxkv1fsas0rbjgfick4"; depends=[]; }; @@ -11426,8 +11593,8 @@ in with self; { l0ara = derive2 { name="l0ara"; version="0.1.6"; sha256="1cv48rbq080z7zx32hmlkpq7mi5axr09a1hyv3knl1vb9gql4qjq"; depends=[Rcpp RcppArmadillo]; }; l1ball = derive2 { name="l1ball"; version="0.1.0"; sha256="1ryq1vfkwg465kgxbb2wf8df7qa85yr8lbx3a58j0az8dqkyzqix"; depends=[VGAM]; }; l1kdeconv = derive2 { name="l1kdeconv"; version="1.2.0"; sha256="1mk92sz9nsmxsn7yplhfcz07k022lrr61114ckrmm0x8hfd89zj8"; depends=[ggplot2 mixtools]; }; - l1spectral = derive2 { name="l1spectral"; version="0.99.5"; sha256="077aq547sniva7p9zv0dg0dg8xmw4mb9200856aw66fbhk1khq0g"; depends=[aricode caret cvTools dplyr ggplot2 glmnet igraph Matrix Rcpp RcppArmadillo]; }; - l2boost = derive2 { name="l2boost"; version="1.0.1"; sha256="0f2gapzpvjnr8n1jgn60jpmcas4s8nk2q8q4k5v4ypwvpfqp7kk1"; depends=[MASS]; }; + l1spectral = derive2 { name="l1spectral"; version="0.99.6"; sha256="19q30g67pf2gx2h6s3il87n910f011lih3lh9321pkh4idl4awnb"; depends=[aricode caret cvTools dplyr ggplot2 glmnet igraph Matrix Rcpp RcppArmadillo]; }; + l2boost = derive2 { name="l2boost"; version="1.0.3"; sha256="1ma11x5wb2iqh10wdlwbwdvgzm4qxp94c5pxgvnmwqzmjgngirdh"; depends=[MASS]; }; laGP = derive2 { name="laGP"; version="1.5-5"; sha256="1a269cy9qmjldb5hv1nl9naq1rr35z37xjpp4kannj6p560fm476"; depends=[tgp]; }; labdsv = derive2 { name="labdsv"; version="2.0-1"; sha256="099rzl9hy70rmb5fg0vx26mlhr4ra2s0hl3jgv22s8hqpvlmakas"; depends=[cluster MASS mgcv Rtsne]; }; label_switching = derive2 { name="label.switching"; version="1.8"; sha256="0xwwhn249aibip12yxjwlrpyqj6zvc95zc7n9jf2vjjpashyc3yk"; depends=[combinat lpSolve]; }; @@ -11444,16 +11611,15 @@ in with self; { lacrmr = derive2 { name="lacrmr"; version="1.0.3"; sha256="0zpfc4a7krwkwbf31idpmdzks4qassqnhxk1f9fcq1qjzqzhjkvi"; depends=[dplyr httr janitor jsonlite magrittr sjmisc stringr]; }; lactater = derive2 { name="lactater"; version="0.1.0"; sha256="0g3hl8q3rdxpn8m4yngmlswyqlnlgj528amn26msybcjzp7r2dbz"; depends=[broom dplyr forcats ggplot2 ggtext lubridate magrittr minpack_lm patchwork pracma rlang segmented stringr tidyr]; }; lactcurves = derive2 { name="lactcurves"; version="1.1.0"; sha256="1ksllpgz519gzrs8gwfgg7743vj3j7ikmbwgisdjs77sdxxl7xyz"; depends=[orthopolynom polynom]; }; - lacunaritycovariance = derive2 { name="lacunaritycovariance"; version="1.1-2"; sha256="15s05igbrvsl0jlc84750l4i1pahigjacvq6b6gjj9gbyjfs6cbm"; depends=[RcppRoll spatstat spatstat_core spatstat_geom spatstat_linnet]; }; + lacunaritycovariance = derive2 { name="lacunaritycovariance"; version="1.1-3"; sha256="0rf74mxylg9j5apcxk40wyfbwgsjwh322kc6wxbqxm4rgscs6shw"; depends=[RcppRoll spatstat spatstat_core spatstat_geom spatstat_random]; }; laeken = derive2 { name="laeken"; version="0.5.2"; sha256="1p3ccbaydlr52p8qmgmm2l6kryvq6jjjx7mqn2vv0gpjaxqhyy92"; depends=[boot MASS]; }; - laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; }; lagged = derive2 { name="lagged"; version="0.3-1"; sha256="1zkfx1s6xvxagn4vrv3zkfkrwwibmqmilrfras2813v4y419kfcd"; 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]; }; laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; }; - lamW = derive2 { name="lamW"; version="2.1.0"; sha256="09f93gf9q3bxa2a2g5kgzc69s6izn8z243160280vbqzsy55m28q"; depends=[Rcpp RcppParallel]; }; + lamW = derive2 { name="lamW"; version="2.1.1"; sha256="05b37kx4jpszx2hkm47d7cjkf8544f7r8x26q68yp9c6zqm9gbc3"; depends=[Rcpp RcppParallel]; }; lambda_r = derive2 { name="lambda.r"; version="1.2.4"; sha256="1mh1g0gsd58gng0hb29vww2yqb2jfs07kba5kxnnqck5j3izwlnj"; depends=[formatR]; }; - lambdaTS = derive2 { name="lambdaTS"; version="1.0.0"; sha256="0bd1kvvw573vagx7k2nylawgaf826bvqms4ar56cx54hys0blmm5"; depends=[abind bestNormalize bizdays fANCOVA ggplot2 imputeTS lubridate modeest narray purrr readr scales stringr tictoc torch]; }; + 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.1.0"; sha256="02piqnw1n444sa396bbmplf3br7bh70qkn4dwvkzxj558ddv9l83"; depends=[httr jsonlite logger]; }; lamme = derive2 { name="lamme"; version="0.0.1"; sha256="1x9jl79iqikpjixajly1k8w2nkzskns2m0v242giknl0ikw298h1"; depends=[]; }; landest = derive2 { name="landest"; version="1.1"; sha256="1gcjxn9g3zq37glb92xgv2r9w5yq6hwsmgfmv2ijr66lla0qxsf4"; depends=[survival]; }; @@ -11464,14 +11630,14 @@ in with self; { landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; }; landscapemetrics = derive2 { name="landscapemetrics"; version="1.5.4"; sha256="1qsm0h6lcg4a7s6g1am305rcxbrrf2hb6ypd29g5k7kj80fwg1rl"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; }; landscapetools = derive2 { name="landscapetools"; version="0.5.0"; sha256="11zp6r414nkj8vhsbryzhkxmpal2bva8msaxf1v69xax70ilxyf1"; depends=[ggplot2 raster Rcpp tibble]; }; - landsepi = derive2 { name="landsepi"; version="1.1.1"; sha256="036f9gr5dhjh803958vrw2nnrd4fqqwh79j95fcrr2bx5lnf5x4g"; depends=[DBI doParallel fields foreach Matrix mvtnorm Rcpp RSQLite sf sp splancs testthat]; }; + landsepi = derive2 { name="landsepi"; version="1.1.2"; sha256="18mgscfc21rl4fdsrhw06ydrd29w2wwfn69lm3cvw4illb2vn64r"; depends=[DBI doParallel fields foreach Matrix mvtnorm Rcpp RSQLite sf sp splancs testthat]; }; 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.12"; sha256="0dmsjnn84r3wlzrf91xwxcwi4y9vcrwiymz14ixw0jc0kys185a3"; 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.1.0"; sha256="0svqaz1j8vhfnm31bfp4gqshdj73wmljva4kxcv2qajmcdiqbd2s"; depends=[dplyr ggplot2 R_matlab reshape2 rlang tidyr]; }; lar = derive2 { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; }; - lares = derive2 { name="lares"; version="5.0.4"; sha256="1yj8cn4a2m5z7884mk44nyc2xpar740x76w6s052h9s9yfix471q"; depends=[dplyr ggplot2 h2o httr jsonlite lubridate magrittr openxlsx patchwork pROC rlang rpart rpart_plot rvest stringr tidyr yaml]; }; + lares = derive2 { name="lares"; version="5.1.0"; sha256="0g85csp1f2yc8jwlzanjivp6s3jx44w4p3ippcarq6s7nrz9p228"; depends=[dplyr ggplot2 h2o httr jsonlite lubridate magrittr openxlsx patchwork pROC rlang rpart rpart_plot rvest stringr tidyr yaml]; }; largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; }; lars = derive2 { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; }; lasso2 = derive2 { name="lasso2"; version="1.2-22"; sha256="1l87djh539m444p5nl9975dd3v5nc7j8af9rj4xr54h5d0mbcbjv"; depends=[]; }; @@ -11483,23 +11649,24 @@ in with self; { latentgraph = derive2 { name="latentgraph"; version="1.1"; sha256="11h7nrd81licvdikiwwfkz4x9i7drz09w5ns672b7fw0pj4qqgsr"; depends=[glmnet MASS pracma Rcpp RcppArmadillo]; }; latentnet = derive2 { name="latentnet"; version="2.10.5"; sha256="05yjf7a16imv1p2lg5dmfk183xll49crnkg0mbz4c4b39nksy85v"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; }; later = derive2 { name="later"; version="1.3.0"; sha256="0acqg29hcm2iq1418b54np7zb5pnr3xzrwc3ijv2pz9wra10ix88"; depends=[Rcpp rlang]; }; - latex2exp = derive2 { name="latex2exp"; version="0.5.0"; sha256="0qknpw7zwwbzsbry94j8fn48mq7kq5rc5448g9hybbisain3wfvg"; depends=[magrittr stringr]; }; + latex2exp = derive2 { name="latex2exp"; version="0.9.4"; sha256="0zbbrbgg524lpm733j8qsqk5ssg75c51s6dgzb18c6fk8byrx945"; depends=[magrittr stringr]; }; latexdiffr = derive2 { name="latexdiffr"; version="0.1.0"; sha256="021lhswy8nik2h1951h1affg8x5lchsa2amyx7fwrajp4bgq72yk"; depends=[fs rprojroot]; }; latexpdf = derive2 { name="latexpdf"; version="0.1.7"; sha256="0n0hzr9jkg13kn56jcghcg4a6y8x0c3jffcvxv621azd9ldljgfl"; depends=[]; }; - latrend = derive2 { name="latrend"; version="1.1.2"; sha256="1g4dv648wfczjkncqrrzr2qzsjj93w6c4lsa3hivddpi9vbbl19w"; depends=[assertthat caret clusterCrit data_table foreach ggplot2 lme4 longitudinalData magrittr matrixStats mclust mclustcomp plyr R_utils Rdpack scales stackoverflow]; }; + latrend = derive2 { name="latrend"; version="1.2.1"; sha256="1dn0s015mjb9kv4gjswd439hbmr6r8xn0s4ckwp23wg6srhnmiza"; depends=[assertthat data_table foreach magrittr matrixStats R_utils Rdpack]; }; 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.20-45"; sha256="1b87fmyjzbg854vpi03my1p25n3d0bchhwsdm2frblxppn98sf12"; 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-29"; sha256="04fzwcqs594rk5qp98yilh3kdh3sw4xf8wld5rp94ggpaqfw7bbc"; depends=[jpeg lattice png RColorBrewer]; }; lava = derive2 { name="lava"; version="1.6.10"; sha256="0bi3c1aqwlq7jbz4raz6vga4r264w7lldi0i62xjlbl7hnlgi23s"; depends=[future_apply numDeriv progressr SQUAREM survival]; }; lavaSearch2 = derive2 { name="lavaSearch2"; version="1.5.6"; sha256="0m5dwfmpcmicrpasx2raac2zylss416bxxgb3mg3abpll89iw9fx"; depends=[doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme Rcpp RcppArmadillo reshape2 sandwich]; }; - lavaan = derive2 { name="lavaan"; version="0.6-9"; sha256="12hhbwxaiprs9bmclwhhdpv42h4mrl4gj92zq3wk8rb883mw816l"; depends=[MASS mnormt numDeriv pbivnorm]; }; + lavaan = derive2 { name="lavaan"; version="0.6-10"; sha256="0dwc8rgrzyrrb0ivx297ln2qbrsxbpn6mdf7laiffhspdpml8sad"; depends=[MASS mnormt numDeriv pbivnorm]; }; lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; }; lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; }; 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]; }; lawstat = derive2 { name="lawstat"; version="3.4"; sha256="1zrx5lsqfxlqjr68iz9hqghsla4m25hn5lyf8jwhw5229sw0n7a1"; depends=[Kendall mvtnorm Rdpack]; }; lax = derive2 { name="lax"; version="1.2.0"; sha256="0v05088a3hfmb2m6mzc6m7nibiq4qs5j052pnigyqkadf8mcyvjq"; depends=[chandwich numDeriv revdbayes sandwich]; }; + layer = derive2 { name="layer"; version="0.0.1"; sha256="0mmijkk4ppbmhlp6ah88a9v3iwdd9j6yw7ff8kk7p1iw63qkiyxi"; depends=[dplyr ggnewscale ggplot2 raster scico sf stars]; }; lazy = derive2 { name="lazy"; version="1.2-16"; sha256="1psh3sng1pm23pjwy7iszb21ys7d29ry34ymvpgxj6zdhywwi5n7"; depends=[]; }; lazyData = derive2 { name="lazyData"; version="1.1.0"; sha256="0mbmmx6dh8ph4lrx1b4gxbwz3jwxv4nqi0xvfzpzrm3bwbsjc634"; depends=[]; }; lazyWeave = derive2 { name="lazyWeave"; version="3.0.2"; sha256="1a7l0rgkp3xq2s6bikciq778fwyr282baa6jk9ip4a71s931p2ag"; depends=[Hmisc labelVector]; }; @@ -11511,18 +11678,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.4"; sha256="0izqndm992zv3sg8v5lpnxbdbxhpxl6hq3bf6xgq3pnw8vl3f6nb"; depends=[alabama MASS plotrix rgl scatterplot3d]; }; lbfgs = derive2 { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; }; lbfgsb3c = derive2 { name="lbfgsb3c"; version="2020-3.2"; sha256="07mhiaxhjjma5c65z3pz7wchgsqn4b19labzyq25ncnmj319fxrg"; depends=[numDeriv Rcpp RcppArmadillo]; }; lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; }; lbm = derive2 { name="lbm"; version="0.9.0.2"; sha256="0mn0k5liwrnbsl5lf4k5b8j2y79bkk689v8wrvcmj3l7q2abaxhf"; depends=[]; }; + lboxcox = derive2 { name="lboxcox"; version="1.0"; sha256="1fvi8gmnajj6nl9dlg5056mx4yblra54c18l62f5yy5wd7byr18x"; depends=[doParallel foreach 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]; }; lcc = derive2 { name="lcc"; version="1.1.3"; sha256="0hbv0nv421ldk10b4qr8dq7ww4w1342sl3s8gw0slfigxbbxv4bh"; depends=[doRNG doSNOW foreach ggplot2 hnp nlme]; }; - lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; }; lchemix = derive2 { name="lchemix"; version="0.1.0"; sha256="1g2w57fi6kvsyir14hnxh0v6xwjdnbisafvjxvn1g6a4h55dg9i0"; depends=[MCMCpack mvtnorm]; }; lclGWAS = derive2 { name="lclGWAS"; version="1.0.3"; sha256="03b6ijqvyirv96hc3dsqf4f0zzqlmq5451mcb14d2mw3s6xy1vmq"; depends=[BH Rcpp]; }; - lcmm = derive2 { name="lcmm"; version="1.9.3"; sha256="0r2wx28yky3x23f2pjgfnibwba59y633c13fw7qcn2n3n5q3yzwl"; depends=[mvtnorm survival]; }; + lcmm = derive2 { name="lcmm"; version="1.9.5"; sha256="0c88hy8bqkf2h8a6q06l5sk294g68hkwniv3dv6c4nf9dazvzi7n"; depends=[mvtnorm nlme randtoolbox survival]; }; lconnect = derive2 { name="lconnect"; version="0.1.1"; sha256="1lx0z72aiy2hbh0wxn3ni3dyr3s2v8xirkvszlxvgfzkfmjx05j5"; depends=[igraph sf]; }; lcopula = derive2 { name="lcopula"; version="1.0.4"; sha256="11rjymm4zj3brifzrrfwqv9v8rzkzqk072xlzyjxm2p08dd11xxb"; depends=[copula pcaPP Rcpp]; }; lcpm = derive2 { name="lcpm"; version="0.1.1"; sha256="0pqmizli5rhyaxvxrjycf8d5kqrm23i3vdz00r8zmijjpiz2p9s2"; depends=[Matrix numDeriv plyr]; }; @@ -11536,10 +11702,10 @@ in with self; { 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="1.1-1.1"; sha256="10rmkidvvhwnrkc62c5ld44xhbvx1k8mch28h1yryakn8gznp3p8"; depends=[lattice]; }; + ldbounds = derive2 { name="ldbounds"; version="2.0.0"; sha256="0sm2hy1bqp4z78vgd7m4a307mzqz8jwfwdyga683yr2jk5grs9yl"; depends=[]; }; lddmm = derive2 { name="lddmm"; version="0.1.0"; sha256="19y2249fj1k1qq4lp6qzbd3jjwlz2li1710k3l7j7a9gg3rq9gfs"; depends=[dplyr ggplot2 gtools LaplacesDemon latex2exp plyr RColorBrewer Rcpp RcppArmadillo RcppProgress reshape2 rgen tidyr]; }; 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.2"; sha256="1kpqmwphkhw9l2s8mz4s6mjfjlysivpzqvhpncw5nphhgdqd22j6"; depends=[abind ashr corrplot doParallel foreach lpSolve matrixStats modeest Rcpp RcppArmadillo]; }; + ldsep = derive2 { name="ldsep"; version="2.1.4"; sha256="0wl446ajx4k8zsfybr4n385phblxpa74gi7d3m86zyn1x4z9md50"; 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]; }; leabRa = derive2 { name="leabRa"; version="0.1.0"; sha256="08yiwyfg9bp4i9w5yyw9p63wyvgj39kd64y3h21j2jmpw8zxncdq"; depends=[plyr R6]; }; leaderCluster = derive2 { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; }; @@ -11548,8 +11714,8 @@ in with self; { leafdown = derive2 { name="leafdown"; version="1.0.0"; sha256="1zvgbglrb4javazvyph7b48x3qab7kiziiya1a1wccdm9l6qh58w"; depends=[checkmate leaflet magrittr R6 shiny shinyjs]; }; leafem = derive2 { name="leafem"; version="0.1.6"; sha256="0ml110rva6ca8ycy0mrivq3wsj0dvyi5f62i92948r7mk6kf0l6a"; 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="0.5.0"; sha256="1h4yjw3apzw0gbay6s6cxr7r6bxq8jvm4nfv3csh2qrdqlzsb6h9"; depends=[base64enc htmltools htmlwidgets leaflet]; }; - leaflet = derive2 { name="leaflet"; version="2.0.4.1"; sha256="07whi3zkz1lmbqx5ydpiya802ck22ny0s7gskwnx7r8xbwlkiw5h"; depends=[base64enc crosstalk htmltools htmlwidgets leaflet_providers magrittr markdown png raster RColorBrewer scales sp viridis]; }; + leaflegend = derive2 { name="leaflegend"; version="0.6.1"; sha256="1wby363xbl8kc47pn5057gl812kazyi892067928ikyxq81lxqgl"; depends=[base64enc htmltools htmlwidgets leaflet]; }; + leaflet = derive2 { name="leaflet"; version="2.1.0"; sha256="0i2ziy3zmya3i0v4ma0b1ymw4mds7di0xjirs452n20z8l31lhhs"; depends=[base64enc crosstalk htmltools htmlwidgets leaflet_providers magrittr markdown png raster RColorBrewer scales sp viridis]; }; 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.1.0"; sha256="138d2ajma3fkz7nsh50z4gw5zaflas39gsy7k5l120hxr7nmzgfk"; depends=[htmltools leaflet magrittr]; }; @@ -11575,22 +11741,26 @@ in with self; { learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; }; leastcostpath = derive2 { name="leastcostpath"; version="1.8.0"; sha256="1106wh2yy048jimiyb3gwm9d00jfq4wk0dnj4a5sfk90rkg28acw"; depends=[gdistance Matrix pbapply raster rgdal rgeos sp]; }; 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="4.1.1"; sha256="0lkhzrk64zci6k6h7wzpyz9i2npgfd1c00r72hcyim5wf0dnm3fc"; depends=[glmmTMB lme4 MASS MuMIn pscl Rcpp RcppArmadillo SparseM stringr VGAM]; }; + lefko3 = derive2 { name="lefko3"; version="5.0.1"; sha256="1mf507kxl4g6jyvnvn5g8f8h3p18napgrbnvkmpnda8b564960m2"; depends=[BH glmmTMB lme4 MASS MuMIn pscl Rcpp RcppArmadillo SparseM VGAM]; }; legco = derive2 { name="legco"; version="0.1.4"; sha256="0fd1d2zf510lyrwclsy57d8lgqprk6p8c6ghxglgm6gbx9d2yrgg"; depends=[dplyr httr jsonlite]; }; - legion = derive2 { name="legion"; version="0.1.0"; sha256="0lpxg3jx9ll3748aixr84yl44ig8arqj6axzr80402kzjndc2z3h"; depends=[greybox nloptr pracma Rcpp RcppArmadillo smooth statmod zoo]; }; + legion = derive2 { name="legion"; version="0.1.1"; sha256="11gh281hf3nqzd3lbiqdp7y2qbpb933p92ix92hyg3rqai1fd0hb"; depends=[generics greybox nloptr Rcpp RcppArmadillo smooth zoo]; }; legislatoR = derive2 { name="legislatoR"; version="1.0"; sha256="1553hpb2cmv3hw6v4c7qwgg8n18jwx101yaqnmaaiv8gfyh6j43m"; depends=[curl dplyr]; }; legocolors = derive2 { name="legocolors"; version="0.3.1"; sha256="0ds9c2x0x590yk7mrjm4hh7k72p51slssg7jlprd71mw6hry91ma"; depends=[]; }; + lehdr = derive2 { name="lehdr"; version="1.0.1"; sha256="0hg5a4w37wi6bqks2298ajsj8q6y3lvbx80wwg5364vnv7na3308"; depends=[dplyr glue httr rappdirs readr rlang stringr]; }; leiden = derive2 { name="leiden"; version="0.3.9"; sha256="03gaxpcab3a1av5lk8r5ll1s858gvyx5ndknci1sia96w1v44xc1"; depends=[igraph Matrix reticulate]; }; - leidenAlg = derive2 { name="leidenAlg"; version="1.0.1"; sha256="0d7g7l06gmind603v525nqgl3h2c24mbhrn6j6fi7hipbihzjnsm"; depends=[igraph Matrix Matrix_utils Rcpp RcppArmadillo RcppEigen sccore]; }; + leidenAlg = derive2 { name="leidenAlg"; version="1.0.2"; sha256="04n2sfz2s6jvls9i6x5ka5nday2ah6j2npwksh1dqwjib8dsqnsf"; depends=[igraph Matrix Matrix_utils Rcpp RcppArmadillo RcppEigen sccore]; }; + leidenbase = derive2 { name="leidenbase"; version="0.1.8"; sha256="0i8s9glgqffqiiriwcvmv6zlm83wbgkwwsd6wdkw7b7ladyzmhlf"; depends=[igraph]; }; leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; - lemna = derive2 { name="lemna"; version="0.9.0"; sha256="0bnnxhna75970vfhfw1wc2346hqgw2i3jh8bbq05977bcvd2l51j"; depends=[deSolve ggplot2 gridExtra]; }; + lemna = derive2 { name="lemna"; version="0.9.1"; sha256="0aamkqcjw8n9mly8a7m1s1wfi6j5mx2kbbxfn9vbb21b9pqi2jl5"; depends=[deSolve ggplot2 gridExtra]; }; lemon = derive2 { name="lemon"; version="0.4.5"; sha256="1y3ljidhqdakxlya2npj2w0az820g8kw6gl1cfm4f0cxvzgd1ly4"; depends=[ggplot2 gridExtra gtable knitr lattice plyr rlang scales]; }; 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]; }; 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=[]; }; - lessR = derive2 { name="lessR"; version="4.1.4"; sha256="01mb5kn2rbdmvhsk0k8809z3rd6jj3zyf6gyvlk0z177134vgnvl"; depends=[colorspace ellipse knitr lattice latticeExtra leaps openxlsx robustbase shiny viridisLite]; }; + lessR = derive2 { name="lessR"; version="4.1.6"; sha256="0b62cyvq40fx0kd829c58nwmpz2p0qdvqrc9ndynalrph6l183kx"; depends=[colorspace ellipse knitr lattice latticeExtra leaps openxlsx robustbase shiny viridisLite]; }; lest = derive2 { name="lest"; version="1.1.0"; sha256="1d69kvdl31crv4ik8bwylq3s3f4skzrjc4x49c79w443g64n2jp9"; depends=[]; }; lestat = derive2 { name="lestat"; version="1.9"; sha256="1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd"; depends=[MASS]; }; letsR = derive2 { name="letsR"; version="4.0"; sha256="07l1wgwnkqnvh47ssg62vj88vgml52n0934w00pjxdk90kk3c5zs"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; }; @@ -11607,13 +11777,14 @@ in with self; { 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.7"; sha256="0i45n31wxznl6485zsa5nnfhy4f3lya9sijyavdcwx0v8j2gkpvr"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_core spatstat_geom spatstat_utils]; }; + lglasso = derive2 { name="lglasso"; version="0.1.0"; sha256="0qkmlr7gfbw9m403676p4ip4hn2v2ll1jcwj5vhshcyb5whsr866"; depends=[glasso]; }; lgpr = derive2 { name="lgpr"; version="1.1.5"; sha256="03wf6n3agls48r1a82aw6sywj3hzs0pza29l3p68nlqlkf9amnnw"; depends=[bayesplot BH ggplot2 gridExtra MASS Rcpp RcppEigen RcppParallel RCurl rstan rstantools StanHeaders]; }; lgr = derive2 { name="lgr"; version="0.4.3"; sha256="18s92qyakhvp336kk2777ydypwfrfwfz6a1gqkq812zy3kcb4mcc"; depends=[R6]; }; lgrExtra = derive2 { name="lgrExtra"; version="0.0.5"; sha256="0h34rb8diavs7an45nng8xfs96x3h2kkl9xy7yzjg851m3f7pbiq"; depends=[data_table lgr]; }; lgrdata = derive2 { name="lgrdata"; version="0.1.1"; sha256="0h1crdhqfp6hzx30lp0w015scf2566hhrl2i7mkxy868rkl3aig9"; depends=[]; }; lgtdl = derive2 { name="lgtdl"; version="1.1.5"; sha256="1sixq56d2px36q0xq3kl0zwj2yzm3q8fhgqjvmajcdd5jl8l7130"; depends=[]; }; lhmixr = derive2 { name="lhmixr"; version="0.1.0"; sha256="1c4ydgq1z2y0xk8xqdsim6xvgxdbl3gglfk5kcr9k4m01arvv0rf"; depends=[]; }; - lhs = derive2 { name="lhs"; version="1.1.3"; sha256="1l861h76q5w0nbnbybhgg7hiw7fks677jakyd49n1whwvd48sfz4"; depends=[Rcpp]; }; + lhs = derive2 { name="lhs"; version="1.1.4"; sha256="1dim6pw2vjvsk269dff5bzpnyh9rp4qa9gj8y61bd31384q5c92c"; depends=[Rcpp]; }; liGP = derive2 { name="liGP"; version="1.0.1"; sha256="01yhrzx67gz7j201mkv1aracrvjh4hxkrc7jn48cfwz0dp1lznws"; depends=[doParallel foreach hetGP laGP]; }; liayson = derive2 { name="liayson"; version="1.0.4"; sha256="0xxl2l24km563n649kxzr15q0f6ks7l5yab3ig229s50i6sbn8nd"; depends=[ape arules biomaRt distances e1071 gplots matlab phangorn plyr proxy RColorBrewer]; }; libbib = derive2 { name="libbib"; version="1.6.2"; sha256="1d6d4fc9bpj8lkkblqcccdcsf21136vdr38kzy91259z3525gvcg"; depends=[curl data_table pbapply stringr xml2]; }; @@ -11622,11 +11793,11 @@ in with self; { libr = derive2 { name="libr"; version="1.2.2"; sha256="1b3wfkzmxvfjrapydm3i5kgld6vpl6b9ywbili8zygs3p5pfyp5b"; depends=[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=[]; }; - libsoc = derive2 { name="libsoc"; version="0.7"; sha256="1r548rvj98wl0yp6jx5d2qhvy1y4883qp0w3jjk97vp07a1cywn8"; depends=[]; }; + libsoc = derive2 { name="libsoc"; version="0.7.3"; sha256="0baglknb67gmzr4cimlvz44f11np8glcdjdgs3jy8qlz0c8pm95p"; depends=[]; }; libstableR = derive2 { name="libstableR"; version="1.0.2"; sha256="1gkcgbc8a7ks9x8mqmlz98hk55q3qy62izam7csz1s0r5dzsyqcr"; depends=[Rcpp RcppGSL]; }; - lidR = derive2 { name="lidR"; version="3.2.3"; sha256="0132vbfdppw9fr029w8c6lcfg8jxbfvb2y3p3wgs2n776c6y6wky"; depends=[BH data_table future geometry glue lazyeval raster Rcpp RcppArmadillo rgl rlas sf sp]; }; + lidR = derive2 { name="lidR"; version="4.0.0"; sha256="1vmkmcgp509g6fcn8dphs8qv9hf9n6f5cx23n8h8d38mzf71x9vi"; depends=[BH classInt data_table glue lazyeval raster Rcpp RcppArmadillo rgl rlas sf sp stars terra]; }; lidaRtRee = derive2 { name="lidaRtRee"; version="3.1.2"; sha256="09gbiy18jd08h7fvshv36zil51hjmiib2sqcpv1vnrnmfly2fyrs"; depends=[car gvlma imager leaps lidR raster reldist sp]; }; - lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.7"; sha256="00vqbrv1y3hg8iqx6mfm7p81a23hf69kc20pzacsx93yqdh97841"; depends=[markovchain Rcpp]; }; + lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.8"; sha256="0q9lvckd98w87xl0045b0n76yy1q0yxacwrmh3xgp1xnzxv95wph"; depends=[markovchain Rcpp]; }; lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; }; lifecycle = derive2 { name="lifecycle"; version="1.0.1"; sha256="183v1z1h037pvsgrj6vakpwhnhsr29hsw8p16k59dgpi00f6x9qx"; depends=[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]; }; @@ -11635,7 +11806,7 @@ in with self; { 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.1"; sha256="0hvpwirskzcd7ww47f9gllgl3wjvpghnwj8a41glpppwwaaxa0z4"; depends=[data_table jsonlite Matrix R6]; }; + lightgbm = derive2 { name="lightgbm"; version="3.3.2"; sha256="12hbvm1va6sb5yny564jvhhzrkcq4j33rcdhqhwxaac2m08cpi8s"; depends=[data_table jsonlite Matrix R6]; }; lightr = derive2 { name="lightr"; version="1.6.2"; sha256="1dq4gj4yxqxaqip2vy3jynxrsllqlcjlg9v83m0ilrf6nhnigm2i"; depends=[future_apply progressr xml2]; }; lightsout = derive2 { name="lightsout"; version="0.3"; sha256="0ypniqf9wk35dd9j57wd7gxchr5hy25fwhmkndz2z8b9ajhm3c9b"; depends=[magrittr shiny shinyjs]; }; likelihood = derive2 { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; }; @@ -11643,12 +11814,14 @@ in with self; { likelihoodExplore = derive2 { name="likelihoodExplore"; version="0.1.0"; sha256="13cnql7pbx8qq1j3cfb3lkzzf2k55shpfa0jd00z30ys6imxzcfn"; depends=[lazyeval plyr]; }; likelihoodR = derive2 { name="likelihoodR"; version="1.0.7"; sha256="1bcrfx3v9xjyb2q44x26wf4d7p0f8nbcp1xhimk7y9rg05s7cxc9"; depends=[]; }; likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; }; - lilikoi = derive2 { name="lilikoi"; version="2.0.4"; sha256="037iq4kqn9iwdq70hq1l7w1ak533ba43npnkr6yk6jnl7avf4bma"; depends=[car caret dplyr gbm ggplot2 glmnet h2o impute infotheo limma M3C Metrics MLmetrics pathifier pathview plyr preprocessCore pROC RCy3 reshape reticulate RWeka scales stringr survival survminer]; }; + lilikoi = derive2 { name="lilikoi"; version="2.1.0"; sha256="1xdw5vfwg5ccjzw4n63fqcgnn6v3i7c94dvhpfa1dd1qm7p4daf8"; 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.9"; sha256="0ljqfl9w26z61fivzlr4sh371s418alzzkdlhghsq0w03871wd3h"; depends=[ddpcr dplyr knitr pracma progress rlang survival tidyr]; }; limSolve = derive2 { name="limSolve"; version="1.5.6"; sha256="1829rd2cnd8qj80z9a7sgc7gx4sf3kvl5g6d2a0lqqw30f9sjzmr"; depends=[lpSolve MASS quadprog]; }; lime = derive2 { name="lime"; version="0.5.2"; sha256="03b88s82f0386c44j3z74dwp9f765wx9n1ahrjpy0s2j0pfa5z09"; 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]; }; - limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; }; + limonaid = derive2 { name="limonaid"; version="0.1.1"; sha256="0zch942aqxznxs1fghnxxxi5j700xfxnj2xn968nmnlnvayp8hhs"; depends=[httr jsonlite R6]; }; + limorhyde = derive2 { name="limorhyde"; version="1.0.1"; sha256="0ksz8chs5v7qss5yf24zcpszi6v0ylbn98zaxy7mz62qfx5i441g"; depends=[pbs]; }; + limorhyde2 = derive2 { name="limorhyde2"; version="0.0.7"; sha256="06w3yf391gzaz0rssbl8jp3n9jmywwkmaxbf8mqxds5zy94f4bry"; depends=[abind ashr checkmate data_table DESeq2 foreach HDInterval iterators limma mashr pbs zeallot]; }; lin_eval = derive2 { name="lin.eval"; version="0.1.2"; sha256="05saxzzwh3gs6a4ii63n5kjm06p399xkyrjnqvn9f164322p7pwb"; depends=[broom]; }; linERR = derive2 { name="linERR"; version="1.0"; sha256="1mhiyqfpwagg161ncp5ndd22hlh12qzr360nms13rgyd8a077cq7"; depends=[survival]; }; linLIR = derive2 { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; }; @@ -11662,7 +11835,8 @@ in with self; { linemap = derive2 { name="linemap"; version="0.2.0"; sha256="04nb0hmmikksp7ak4vdam9r2dpv7w3r5wkxxbjr7yk9pfq5gjncp"; depends=[sf]; }; lineup = derive2 { name="lineup"; version="0.40"; sha256="01m50q9qdryav94rmspm4dk17m7kfcxb0p502cbxmnajklz3ajgg"; depends=[class qtl]; }; lineup2 = derive2 { name="lineup2"; version="0.6"; sha256="0qkxwn30g0bjm9aq9a59pb3xq844qr43ribnk607zlf8lwbibsk2"; depends=[Rcpp]; }; - lingmatch = derive2 { name="lingmatch"; version="1.0.2"; sha256="1986vi8r105wsd27vzy7wq9w0flgmgigssa3p0j7xmgr4kmjkks4"; depends=[Matrix Rcpp RcppParallel]; }; + lingglosses = derive2 { name="lingglosses"; version="0.0.2"; sha256="006i9a44gqhcf0lqnxjvnjsj4k751lxc4cqi90jkc5bcphanpczp"; depends=[kableExtra knitr rmarkdown]; }; + lingmatch = derive2 { name="lingmatch"; version="1.0.3"; sha256="0802dkvy5mbnc8gbpws3znvy91zv3glwpfpyn6yypaj8zdijbjji"; depends=[Matrix Rcpp RcppParallel]; }; lingtypology = derive2 { name="lingtypology"; version="1.1.8"; sha256="184mb7f7lgzvc7ynx6zdfgccx7q0il5d3s4pcq1l58rbnv7bi17w"; 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.4-7"; sha256="0fl7m1r7iaihkym0k65gg2dqr03fra93zjwbddq14lsm1bx1hg7w"; depends=[devtools R_utils raster roxygen2 sf stringr]; }; @@ -11673,20 +11847,19 @@ in with self; { linl = derive2 { name="linl"; version="0.0.4"; sha256="1wq0wm3k12sfvg0nzdsdxb4qc79kny7qvckxplfgaj6y62vcjxxl"; depends=[knitr rmarkdown]; }; linne = derive2 { name="linne"; version="0.0.2"; sha256="19x13hf3skvxihlpa8wy05vlc94yv7nfs8b1pr8br76wk1xdkjvx"; depends=[cli magrittr purrr R6 rlang shiny]; }; linpk = derive2 { name="linpk"; version="1.1.1"; sha256="0bii49b19kf50gbnv2am7kwy2gb9gkxv8vplcwlmm6k9b4gw9pjb"; depends=[mvtnorm]; }; - linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; }; + linprog = derive2 { name="linprog"; version="0.9-4"; sha256="1d34m2nyk7m6j2dci69bhy5mlw479xax1517j7f14pq7vhpsm9l1"; depends=[lpSolve]; }; lintools = derive2 { name="lintools"; version="0.1.5"; sha256="08n4nrrpp9k39f8zl75zn88gk3wdm3cvfsxcp4jzpwhlzz9v5bh9"; depends=[]; }; lintr = derive2 { name="lintr"; version="2.0.1"; sha256="14yfh641afg6griaadbdciyr3k94fl55s055qwzghgk5gdsj61zy"; depends=[codetools crayon cyclocomp digest httr jsonlite knitr rex rstudioapi testthat xml2 xmlparsedata]; }; lipidomeR = derive2 { name="lipidomeR"; version="0.1.2"; sha256="1a9zi821mn7w18lg7psc9bagi3c5snvwqgda2f10rw5jff60fkfd"; depends=[BiocManager dplyr ggplot2 knitr limma reshape2 shadowtext stringr tableone tidyr]; }; liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; }; lira = derive2 { name="lira"; version="2.0.1"; sha256="10bjmapnlw5z5cnbdpkwisvjkmk7zi9xqrvgmb5psj317zcxfc2p"; depends=[coda rjags]; }; lisa = derive2 { name="lisa"; version="0.1.2"; sha256="05hijs66jfyr68yvmm1dn262p1k6y4q7f2zvqkfagcb483rhwi53"; depends=[tibble]; }; - lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; }; lisrelToR = derive2 { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; }; list = derive2 { name="list"; version="9.2"; sha256="1gn0g4qq9rr6vwnwq6525hx7iy3q3vmy3g2v3ba69v4jcdc0a0mx"; depends=[arm coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; }; listArray = derive2 { name="listArray"; version="0.1.1"; sha256="0j8hdsda7p6m1q06mi32yh3wqsdjr77kb8js42nm63dgpfy7mvv5"; depends=[]; }; listWithDefaults = derive2 { name="listWithDefaults"; version="1.2.0"; sha256="1rv9jq9zlr5dm08mimba6ni2p5vkfybrgrqk1alm7y6mqpx56byp"; depends=[assertthat]; }; listarrays = derive2 { name="listarrays"; version="0.3.1"; sha256="0nfpqywq9pl9yj566y0jw0h89g0ppsc614538ns1jc3l5r2myils"; depends=[]; }; - listcomp = derive2 { name="listcomp"; version="0.3.0"; sha256="09dazc1s06f2pk696jc64lnhs007hqrjjx6z2m6rrswp8yq1p2p2"; depends=[digest rlang]; }; + listcomp = derive2 { name="listcomp"; version="0.4.1"; sha256="0h3wmlm3y3vr21x4ik785ring57z5cjhlwvsljh06m5m3fkv8nxr"; depends=[rlang]; }; listcompr = derive2 { name="listcompr"; version="0.4.0"; sha256="1pmk56wz6yl1qixfk9ci1p96z7qwz65xyb6k5k46l5nbwal6ik4a"; depends=[]; }; listdown = derive2 { name="listdown"; version="0.4.1"; sha256="1i7vx71nc3vig73kxwaccdgjr91pa3sbl886qppqz4i3ns3z5vgr"; depends=[crayon yaml]; }; listdtr = derive2 { name="listdtr"; version="1.1"; sha256="13p27cx2w3qb1rcizrva2ib7x7sm310gasi7n5pvvd8rkpwaypzq"; depends=[ggplot2]; }; @@ -11699,7 +11872,7 @@ in with self; { 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.10"; sha256="0mmlaw8xn4fwwwxchi7mlvhcg4z04v6x472478qsmmf3vsbdjg3a"; depends=[class ggplot2]; }; + liver = derive2 { name="liver"; version="1.11"; sha256="1lrs33qvgg6flapazjx9x2han0x0n45zchdi63xvsbafi6cg3a93"; 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]; }; llbayesireg = derive2 { name="llbayesireg"; version="1.0.0"; sha256="0jhkmrjkqfm1flwsbpv6060j6g7cj4ngm0drvrlvsiqpni0k96mh"; depends=[coda ggplot2 llogistic MASS MCMCpack Rcpp rstan StanHeaders]; }; @@ -11715,17 +11888,15 @@ in with self; { lmSubsets = derive2 { name="lmSubsets"; version="0.5-2"; sha256="1afdpcp3qiiprzc47cbckf49jd3f8ip81441ghgx0kfx54d1m305"; depends=[]; }; lmboot = derive2 { name="lmboot"; version="0.0.1"; sha256="1v7a3vlv0187mpg3y3pj7f3pbk1v5n6amw732chy10vdw5nmfkwd"; depends=[evd]; }; lmds = derive2 { name="lmds"; version="0.1.0"; sha256="130azb0nc2wwxv0qi8v5s4rd02p9lc92zwn634pv7b8awbw81i65"; depends=[assertthat dynutils irlba Matrix]; }; - lme4 = derive2 { name="lme4"; version="1.1-27.1"; sha256="1i9f8kl2qj48j75dbn1vmwxz1xlbikdr7v2yq542w6dq74z8gyi5"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; + lme4 = derive2 { name="lme4"; version="1.1-28"; sha256="03nw76bfyas6cdm9chyxqm5ks6r0qklf2fdy7h4pqrqss325x1fi"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; lmeInfo = derive2 { name="lmeInfo"; version="0.1.3"; sha256="1y75dv90jj8jzz4z4iixbv7ipbdx9f7wrjbjj46a8wjiidj1l5zw"; depends=[nlme]; }; lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; }; lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; }; lmeSplines = derive2 { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; }; lmec = derive2 { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; }; - lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; }; lmerTest = derive2 { name="lmerTest"; version="3.1-3"; sha256="1zd8gqjkazhxgpnnr484xwsq30p62fq8592nzyc171zjyplpbaim"; depends=[ggplot2 lme4 MASS numDeriv]; }; - lmeresampler = derive2 { name="lmeresampler"; version="0.2.0"; sha256="1qjxv3vrgw183hvya2k4qidnnx9w64lcksjm6v727kcigl3x9h1f"; depends=[catchr dplyr forcats ggdist ggplot2 HLMdiag magrittr Matrix nlmeU purrr statmod]; }; lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; - lmfor = derive2 { name="lmfor"; version="1.5"; sha256="1r301ajcp9ag23n0nw1rgwg8ss5cvinwqargbdg0jpqbhdrgaq7y"; depends=[magic nlme spatstat]; }; + lmls = derive2 { name="lmls"; version="0.1.0"; sha256="0gv7mawdpcqvvf3f61aa1l0yi32z9bs41i36ggn1nwga837g33k3"; depends=[generics]; }; lmm = derive2 { name="lmm"; version="1.3"; sha256="13b5rvdbzljir1fn4zxv2lshbga64vwzn6884izif9v5dkd5b29j"; 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]; }; @@ -11746,7 +11917,7 @@ in with self; { loadings = derive2 { name="loadings"; version="0.1.1"; sha256="0nickkdjkfsjy8k52243181fdd1jvj3rgpzkcfjsmacbjcdl169g"; depends=[]; }; loadr = derive2 { name="loadr"; version="0.1.3"; sha256="01nsjsv7c8grsizfisczqwjrz5saff0pgn7716ig4i8nzargvz7a"; depends=[]; }; lobstr = derive2 { name="lobstr"; version="1.1.1"; sha256="0vkif17825x33cz8r89j0qph4wj5l8fzfgl8nh2g7m2v140cxjdq"; depends=[crayon Rcpp rlang]; }; - locStra = derive2 { name="locStra"; version="1.7"; sha256="0pvxifzhafhb0iv2d9ar90j2436zjgdzav0dyjir7xrc4s597bxk"; depends=[Matrix Rcpp RcppEigen Rdpack RSpectra]; }; + locStra = derive2 { name="locStra"; version="1.8"; sha256="1013xilzp6ly88nr26jzmcyvxadccv72m4s6pc9z5qv2baykbisw"; depends=[Matrix Rcpp RcppEigen Rdpack RSpectra]; }; localFDA = derive2 { name="localFDA"; version="1.0.0"; sha256="099hqnd0q4ylg03qi7icc6a9w1x7p76vlv5wxk8f53l7y9pp27b3"; depends=[]; }; localICE = derive2 { name="localICE"; version="0.1.1"; sha256="1pyq6kdahsy9qa0jzmring48r0i9h4rkp8lxpf9afksgm1qn0c5z"; depends=[checkmate ggplot2]; }; localIV = derive2 { name="localIV"; version="0.3.1"; sha256="1z3q5hk6qfc1pzqdrxwm8y3am27648lfz66lm84bf8abifw4kk60"; depends=[KernSmooth mgcv rlang sampleSelection]; }; @@ -11757,7 +11928,7 @@ in with self; { locatexec = derive2 { name="locatexec"; version="0.1.1"; sha256="03vssc243nczwqp6z4adchcxql5aq0h3cs0daq5xwnncjmy3k7mx"; depends=[]; }; 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.4"; sha256="1vcw16qww4v4547w0gfvhqg60l051bsdlxa6zfcgcj9xbxf6dlyr"; depends=[lattice]; }; + locfit = derive2 { name="locfit"; version="1.5-9.5"; sha256="08yywswywmvyys8380576n43h3xyiviq1p2392zcivlbknnjp7zx"; depends=[lattice]; }; locits = derive2 { name="locits"; version="1.7.3"; sha256="0sjnwqiqwzdkglvbdxbkg17gjp0vyqvywsy0qq7adxj5hh0yah05"; depends=[igraph wavethresh]; }; locpol = derive2 { name="locpol"; version="0.7-0"; sha256="1p915n0l09kbwkly627074jslxl01yssp1rf0c7sygvsw6sgy5lm"; depends=[]; }; locpolExpectile = derive2 { name="locpolExpectile"; version="0.1.1"; sha256="1phwcnbk1vmdk3qmfx2nd6crplly2lb8gb57yl67ky3c4sryh358"; depends=[expectreg lestat locpol matrixcalc quantreg]; }; @@ -11767,7 +11938,7 @@ in with self; { lodr = derive2 { name="lodr"; version="1.0"; sha256="0bmdw489dv1069krnx9yi0bcgx1vx4ymc6s4pix4shha5c5fbiz4"; depends=[Rcpp RcppArmadillo Rdpack]; }; loe = derive2 { name="loe"; version="1.1"; sha256="1n16pgfxg9vcn729xxjbbvavg2ywbdcch9v2ph8nv3z7psc0q46c"; depends=[MASS]; }; loewesadditivity = derive2 { name="loewesadditivity"; version="0.1.0"; sha256="0j9vvh2ys09hy2k3mbrlf0p493ymrxvfsdcjw0p6rlls54z9lqqc"; depends=[dplyr ggplot2 gridExtra magrittr metR rlang rootSolve tidyr viridis]; }; - log = derive2 { name="log"; version="1.1.0"; sha256="04cl8qb2ivdili89h4cghcjqywpkz85v48g2vkg6hdlimcd63wff"; depends=[cli crayon R6]; }; + log = derive2 { name="log"; version="1.1.1"; sha256="1vzssrg2qqxd27b9d36v3mmkhgkx8n724ql9yhl5p8dy28zgsdxd"; depends=[cli crayon R6]; }; log4r = derive2 { name="log4r"; version="0.4.2"; sha256="0d7yxp3h7iy0miaprgp16n5vbxk0mvy8aci8r0mmml6wcl2h4jlj"; depends=[]; }; logKDE = derive2 { name="logKDE"; version="0.3.2"; sha256="09gachibj0klqa9ijw572lwphbh9qj6zqray5byq1dh7zsiq516q"; depends=[pracma Rcpp]; }; logNormReg = derive2 { name="logNormReg"; version="0.5-0"; sha256="0lv5m6yz1v8pi1svw9qh3gkq3r0lp13qhx3p6g6yvzqwd0px0pip"; depends=[]; }; @@ -11784,21 +11955,22 @@ in with self; { logib = derive2 { name="logib"; version="0.1.2"; sha256="09c528wrgyk0cg1flx2fsl53q4v9442rr44g9kh5jznqs788608b"; depends=[lubridate readxl]; }; logicDT = derive2 { name="logicDT"; version="1.0.1"; sha256="0gdzrbjq2pyfhsm8840q8dvrcfj3kvzkc8grgvpv05j11fpzwyq3"; depends=[]; }; logihist = derive2 { name="logihist"; version="1.0"; sha256="1q3322rh3g31c5i80aw54pln0m1jgxmbx30cn31nlh3ijkvnpq9a"; depends=[ggplot2]; }; - logistf = derive2 { name="logistf"; version="1.24"; sha256="0syrg4v1cik0vn2h7452n84nbpdbhs5h0g5k9jaqkdr1zq8x6qb5"; depends=[formula_tools mgcv mice]; }; + logistf = derive2 { name="logistf"; version="1.24.1"; sha256="0qd64sz8cj7s200fq00phjw6bfy8y7ys1bv3lcdj5wzp9h2xkq77"; depends=[formula_tools mgcv mice]; }; logistic4p = derive2 { name="logistic4p"; version="1.5"; sha256="0h0dxyklqc95ykyril1a3d2bdnszj5l9dqbxzh2wbfmk06prvh8b"; 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="0.5.0"; sha256="13rg9ki20px0bhajbhx0q66kg1qs915vrg66v13nckrzqkiza2fk"; depends=[MASS nloptr randtoolbox]; }; loglognorm = derive2 { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; }; - logmult = derive2 { name="logmult"; version="0.7.3"; sha256="10dmvvwlaw8dn6h0343d8apn7rlc2b8nys3f38x9wlvd9xhhlwxm"; depends=[gnm qvcalc]; }; + 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.2.7"; sha256="0ns4i2snvcfbrb00wlp570j9y67rb4vmxgyz1vzllskz3klraqly"; depends=[this_path withr]; }; + logr = derive2 { name="logr"; version="1.2.9"; sha256="0kji2dp2bnfff4x4lq1gz57k4zsjc4i56slb8kxiiipchmv6drrj"; depends=[this_path withr]; }; logspline = derive2 { name="logspline"; version="2.1.16"; sha256="12hkdi77vkic05p2vhap025xdcg1n53ywm239v18713pihdlj63l"; depends=[]; }; lokern = derive2 { name="lokern"; version="1.1-9"; sha256="1fms79bb4y6ryzmxhpc544zh52xgd879gpcigc24bjhd7whl9nry"; depends=[sfsmisc]; }; lolR = derive2 { name="lolR"; version="2.1"; sha256="0lrmn9lzyyfr1y0i7qp6xfpdxyisbkajwg0jkrqkiw687psnh2rc"; depends=[abind ggplot2 irlba MASS pls robust robustbase]; }; lolog = derive2 { name="lolog"; version="1.3"; sha256="0lfb3d7rxssvzd70gixpmr8r8hcmxplg5yy181hdrvjsdc8w8jn4"; depends=[BH ggplot2 intergraph Matrix network Rcpp reshape2]; }; - lomb = derive2 { name="lomb"; version="2.0"; sha256="08h1qk28vvia19rjcicjf8j1f7fhvk23k79yg7bprmffhj9r6vxw"; depends=[ggplot2 gridExtra]; }; + lomb = derive2 { name="lomb"; version="2.1.0"; sha256="1hgf28bs5g07v7j05qxahs0q3j683401ssqk1r256pvk8x9j445l"; depends=[ggplot2 gridExtra plotly pracma]; }; 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]; }; @@ -11808,16 +11980,17 @@ in with self; { longitudinalData = derive2 { name="longitudinalData"; version="2.4.1"; sha256="0lnvcfgj721bawl1ciz0jw83mfsnzkhg6jn824vr3qdm4rbib2vd"; depends=[class clv misc3d rgl]; }; longitudinalcascade = derive2 { name="longitudinalcascade"; version="0.3.2.1"; sha256="03nqglxyz6qfalxdnyh2aarxv3agn0b3r4nhsji4v9703h4m1fvg"; depends=[dplyr ggplot2 lubridate rlang scales survival tidyr zoo]; }; longmemo = derive2 { name="longmemo"; version="1.1-2"; sha256="01rj5x9cgscsrakbx9155mbvs35fd3j484cfz5cds9vl521fjr3r"; depends=[]; }; + longmixr = derive2 { name="longmixr"; version="1.0.0"; sha256="03hh1zrpxqnal4j7rmlllzdhhmrvbdnvdr7rd955hlnkr9946p6c"; depends=[checkmate ConsensusClusterPlus flexmix StatMatch]; }; longpower = derive2 { name="longpower"; version="1.0.23"; sha256="0fxs3zaciyydl3w0a4d5pi8bbr8yhmh17wi0n39j073pacvzmqf6"; depends=[lme4 nlme]; }; longurl = derive2 { name="longurl"; version="0.3.3"; sha256="16r6gzyfy7aq8sqdzvc6wqinfp0yj46bsz4yg8n3jf0jdyx0zrc8"; depends=[httr]; }; loo = derive2 { name="loo"; version="2.4.1"; sha256="0l2v8zpashqbnck3qx5lp1gqjcfphzky8mxyw5gfk9wk99mzn8dw"; depends=[checkmate matrixStats]; }; lookout = derive2 { name="lookout"; version="0.1.0"; sha256="16pny894diircf7w8b7kmmjpp8j864dj9iivh1n41aafjml4xk8g"; depends=[evd ggplot2 RANN TDAstats tidyr]; }; lookup = derive2 { name="lookup"; version="1.0"; sha256="0ncmj1df64088qv0g2c0wd8n43qmi15358mz289hakg6z4h0dmyi"; depends=[]; }; lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; }; - loon = derive2 { name="loon"; version="1.3.8"; sha256="0mcycainp38r000xphgnms3vxd7x6j9gsvnclc36grx0rp32dam0"; depends=[gridExtra]; }; + loon = derive2 { name="loon"; version="1.3.9"; sha256="1phvfgbv4wnrr3m2lbs5iaqsh9m69kf4wcvzvvnf5a23y3gpvw3d"; depends=[gridExtra]; }; loon_data = derive2 { name="loon.data"; version="0.1.3"; sha256="0sdld3yggjadykqaljf0p4cymy2c47yaxjphc6jwyragzpv4awzw"; depends=[]; }; - loon_ggplot = derive2 { name="loon.ggplot"; version="1.3.0"; sha256="0bzsyj1z2abqp8k6mnn8x2sk28g8r55csfwkxy0gm35mclv7qzmv"; depends=[ggmulti ggplot2 gridExtra loon patchwork rlang scales]; }; - loon_shiny = derive2 { name="loon.shiny"; version="1.0.1"; sha256="0103n5bvabs8dv9dx8nq4lvf5wi7s3knfdifvr9hhvyb59iqkgaw"; depends=[base64enc colourpicker gridExtra loon loon_ggplot shiny]; }; + loon_ggplot = derive2 { name="loon.ggplot"; version="1.3.1"; sha256="19g90mfin902d5ywi5ivkhga0jwm7l7lswfs08slq3fmn1ibzpsv"; depends=[ggmulti ggplot2 gridExtra loon patchwork rlang scales]; }; + loon_shiny = derive2 { name="loon.shiny"; version="1.0.2"; sha256="00h10jlwxbanwp9mwfjy66nx49d5258qb3m2s9asvkky6g2sghax"; depends=[base64enc colourpicker gridExtra loon loon_ggplot shiny]; }; loon_tourr = derive2 { name="loon.tourr"; version="0.1.3"; sha256="1vdxqdsr89gzvsw9gx001rw416586lqyq0rp3g55n1lh6h9cy19d"; depends=[loon loon_ggplot MASS tibble tourr]; }; loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; }; loose_rock = derive2 { name="loose.rock"; version="1.2.0"; sha256="13p3mp8m2in3cbcwgj42hgzrwxmgalc2v0z3r1zn1n77iqjvcd7r"; depends=[digest dplyr futile_options ggplot2 httr MASS reshape2]; }; @@ -11828,12 +12001,12 @@ in with self; { lori = derive2 { name="lori"; version="2.2.2"; sha256="1153ilp1i849rwbbms4vfc6c1mxgpav04zfqm2sdj7s63nvknx6r"; depends=[data_table rARPACK svd]; }; lotri = derive2 { name="lotri"; version="0.3.1"; sha256="042jbvpaawmfklak56gnmwyp43q9scm539crlv38j8aafik1g2s5"; depends=[]; }; lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; }; - lowpassFilter = derive2 { name="lowpassFilter"; version="1.0-0"; sha256="1f05z18nn3184rksmsarfz79bxn3gj760f1z9h5h3agqc180krm3"; depends=[Rcpp]; }; + lowpassFilter = derive2 { name="lowpassFilter"; version="1.0-1"; sha256="02an3845dsxym2r8xb4xlg699vha28gw2jgy1hhmxs0mgklj6w2a"; depends=[Rcpp]; }; lpSolve = derive2 { name="lpSolve"; version="5.6.15"; sha256="1fpkyjyqykwa1dxnhiky01pm09syxg169lm7hpy39bdbg10vw9s6"; depends=[]; }; lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.7"; sha256="1fsmipb97gglihrf424mz063fn67bf55jjahnbh53svkmm2qxg4y"; depends=[]; }; lpbrim = derive2 { name="lpbrim"; version="1.0.0"; sha256="1cbkzl23vgs9hf83ggkcnkmxvvj8867k5b9vhfdrznpqyqv1f2gp"; depends=[Matrix plyr RColorBrewer]; }; lpc = derive2 { name="lpc"; version="1.0.2.1"; sha256="1g1dzm7pcrbrdk1dmhbdhj58j69dzar41al3i8q4gysf3adqzsvv"; depends=[]; }; - lpdensity = derive2 { name="lpdensity"; version="2.2"; sha256="0ibr4js9iwwnzp872n56xbzap8dpz9zjv4y5alcc8rdh0y55sa7r"; depends=[ggplot2 MASS]; }; + lpdensity = derive2 { name="lpdensity"; version="2.3"; sha256="06wa6ngfzlicx8g336b2034r54zflfjlrfllr0wkf87sq84x936i"; depends=[ggplot2 MASS]; }; lphom = derive2 { name="lphom"; version="0.3.0-14"; sha256="02s3a7a8n1c17c0rcq6knz3xddmfg41iahq2hpgqsm6d9502hybz"; depends=[lpSolve Rsymphony]; }; lpint = derive2 { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; }; lpirfs = derive2 { name="lpirfs"; version="0.2.0"; sha256="1jn2faqj7szsfc0bicgym493y4cyncbg93rmcc3yv59b0rbxhc8m"; depends=[doParallel dplyr foreach ggplot2 ggpubr gridExtra lmtest plm Rcpp RcppArmadillo sandwich]; }; @@ -11847,7 +12020,7 @@ 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.1"; sha256="1r5cbj27iyrnkzv4d2rcc2pbsxyz9yhjf7vxng6j9k7y8c16fg3s"; depends=[Rcpp]; }; + lrstat = derive2 { name="lrstat"; version="0.1.3"; sha256="1fcqpaw3rkns0lsaixfv2fh4k852gz063y21kk65v4hdv7aizlwr"; depends=[Rcpp]; }; lsa = derive2 { name="lsa"; version="0.73.2"; sha256="1a33irqa6qvbc02z12rgbgv8kxq2gmahy7j5bg8b23lvvaxif06b"; depends=[SnowballC]; }; lsasim = derive2 { name="lsasim"; version="2.1.2"; sha256="1x6vgdslw6v91l1p1igrvnj3s4ap2igqcx3m95y1ada7kpl3b2jk"; depends=[cli mvtnorm polycor]; }; lsbclust = derive2 { name="lsbclust"; version="1.1"; sha256="1pbai58pfvhfcrd0nj13d54vrn9wrx2xapqhgqa1pkrjwbk5amj7"; depends=[clue doParallel foreach ggplot2 gridExtra mvtnorm plyr Rcpp reshape2]; }; @@ -11856,9 +12029,10 @@ in with self; { lsdv = derive2 { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; }; lsei = derive2 { name="lsei"; version="1.3-0"; sha256="1dka0rigfw4vj809qma2dkiwjb3nw5635ynnba5cm299cn7hb2b2"; depends=[]; }; lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; + lsirm12pl = derive2 { name="lsirm12pl"; version="1.0.0"; sha256="0lsmp2nrzi2nqch0qhbgfm17a8ibkwpxving5pka4kzyrbc02qzh"; depends=[ggplot2 GPArotation MCMCpack Rcpp RcppArmadillo]; }; lsl = derive2 { name="lsl"; version="0.5.6"; sha256="1hwzklx1qp5ljc059j2hridg3caw4cgn7rbqs8xh2arzcvqdw3rb"; depends=[ggplot2 lavaan reshape2]; }; lslx = derive2 { name="lslx"; version="0.6.10"; sha256="189gpp1ikcp5ld4avipwckdz997v1cx2zas5a8b54nv246kb5hmd"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; }; - lsm = derive2 { name="lsm"; version="0.2.0"; sha256="1rc55w526ss99parjb40w3fbqlxfkhzknxysmqn4fkxrhrylzqn5"; depends=[]; }; + lsm = derive2 { name="lsm"; version="0.2.1.2"; sha256="1sp6c3r3g0q9lynzpcjvfwrp7xml11q66cqcisjvidm79vxjgi5v"; depends=[dplyr ggplot2]; }; lsmeans = derive2 { name="lsmeans"; version="2.30-0"; sha256="1z35dzfgib0fk201gzjhgmnryhl3mkz50gz8g6nfv4mj9kzc5x5f"; depends=[emmeans]; }; 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=[]; }; @@ -11868,7 +12042,7 @@ in with self; { lss2 = derive2 { name="lss2"; version="1.1"; sha256="1rkv26zq36zyh891xkkllxphwplljmzpy15g619x1w4qvsajyyg8"; depends=[quantreg]; }; ltable = derive2 { name="ltable"; version="2.0.1"; sha256="15il58g7m09z0alln12xp1g6y3i8vaxggf229nbgb5gmcf4z97dx"; depends=[clipr Rcpp RcppGSL]; }; ltbayes = derive2 { name="ltbayes"; version="0.4"; sha256="0kv5k56hmc1m7bv5pmmmk46822szsgwqgpwydn0x56az7xn6hjk6"; depends=[mcmc MHadaptive numDeriv]; }; - ltm = derive2 { name="ltm"; version="1.1-1"; sha256="1qrgzwx5l58qf5rfp1knxc84r0g943q5sdr3ky74zzwpnmrf2vf7"; depends=[MASS msm polycor]; }; + 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.2-0"; sha256="1mqrf77319cjs3q48iigrkjc3rjibz7qyij49a7l0nim3c1hd0b0"; depends=[Matrix matrixStats speedglm]; }; ltsa = derive2 { name="ltsa"; version="1.4.6"; sha256="10wmw9r00400ng2zlysd8jqgypjclshxj83x32002j2a9cz4f186"; depends=[]; }; @@ -11906,7 +12080,7 @@ in with self; { 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.1"; sha256="1hq3981xar786bhg4xdvp17v4nds0fd1pgj7pcn8zyykr3r44g84"; depends=[ade4 ape betapart cluster dendextend FactoMineR gawdis geometry ggplot2 ggrepel Hmisc patchwork reshape2 rstatix vegan]; }; - mFLICA = derive2 { name="mFLICA"; version="0.1.4"; sha256="07d1b86q9p61maknbqp4w0h5y2ayvn2az3icarij2qn25g5pqsg3"; depends=[dtw ggplot2]; }; + mFLICA = derive2 { name="mFLICA"; version="0.1.5"; sha256="0znjp95ifwqpqwrnlcb77r1cdwpvbpql6ggnck018xddc8x40hzv"; depends=[dtw ggplot2]; }; mFilter = derive2 { name="mFilter"; version="0.1-5"; sha256="0anc93mciq8j64knd0i38sfgv10w1gd375wnfzn1fq8sj3lby7kb"; depends=[]; }; mGSZ = derive2 { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; }; mHG = derive2 { name="mHG"; version="1.1"; sha256="1rz5ncrvvv9h9grls15apa63v2nh9j87fmp4mwjjil37jx6a5zki"; depends=[]; }; @@ -11937,28 +12111,29 @@ in with self; { mads = derive2 { name="mads"; version="0.1.6"; sha256="0nz1fg3gyj72k6dpkjnwqjvps0inv1qgk5vlc8ycj3k720qcsd81"; depends=[mrds]; }; madsim = derive2 { name="madsim"; version="1.2.1"; sha256="11gfyimbz363p5xy1x6rsz5fcgzcr55myc5aaz5lazjkcnfn17aq"; depends=[]; }; magclass = derive2 { name="magclass"; version="6.0.9"; sha256="1a7qs93hww88skzcbrqlajhlxqp7x39bwclw4kd2af263iwjch4h"; depends=[abind data_table forcats maptools sp]; }; - magic = derive2 { name="magic"; version="1.5-9"; sha256="0snmdh6vk0p6ar1swsihisinxrx7l8371dri5lk0z24ysgr5w7gs"; depends=[abind]; }; + magi = derive2 { name="magi"; version="1.1.5"; sha256="0f322m2rrq1r8wnr9x86zs0kv2ca4wqf0a72saf37qg8r66gnf1b"; depends=[BH deSolve gridBase gridExtra Rcpp RcppArmadillo roptim]; }; + magic = derive2 { name="magic"; version="1.6-0"; sha256="1gybia2aq80ldk1d845y5srncfzbbmpqhgl7vfaz7qqqjs6d85j5"; depends=[abind]; }; magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; }; - magicaxis = derive2 { name="magicaxis"; version="2.2.1"; sha256="1ba8psg3ja8b69s1afywsjz5sfljryhk5vvq1n4dzm1gsz6c772l"; depends=[celestial mapproj MASS plotrix RANN RColorBrewer sm]; }; + 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.3"; sha256="0h942bn7wfnzbbgq9hrs75c7igmg5r1c5sad2v0znhza4cp7p1w3"; depends=[curl magrittr Rcpp]; }; magickGUI = derive2 { name="magickGUI"; version="1.3.0"; sha256="114l5mga9x3vn9qqydyq1v75gqldh4p6m4i8ak0xw3v7p6wsf8gn"; 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.1"; sha256="0pxd99fvg406whqsk9wh756rayrwh84xn3h44zmlpcy23kanbhkm"; depends=[]; }; + magrittr = derive2 { name="magrittr"; version="2.0.2"; sha256="19k3q76qlri459iyyfgn9gl0w9lnv9v604yhpbc94nx71l6zvrkv"; depends=[]; }; maic = derive2 { name="maic"; version="0.1.3"; sha256="1s6rq3v0dk0fm1csq0w8bb52kldaimmsgprmcjj1il6pr2936d3a"; 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]; }; - mailmerge = derive2 { name="mailmerge"; version="0.2.3"; sha256="0sc2201cvyis59lqs56x520q9hpp39hcm807diqr0wnip41h0f3i"; depends=[commonmark dplyr fs glue gmailr googledrive googlesheets4 lifecycle magrittr miniUI purrr rmarkdown rstudioapi shiny withr]; }; + mailmerge = derive2 { name="mailmerge"; version="0.2.4"; sha256="0rffvkh7v9r3pdbdclj5mx78dk5qszqpm8z7jp4x9h3jiyrh40gp"; 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]; }; majesticR = derive2 { name="majesticR"; version="0.1.1"; sha256="0x23p4js9cfnj8c33cp0fql5pvs4fn4frbbzpq85mxjhiifkxxpf"; depends=[jsonlite urltools]; }; makeFlow = derive2 { name="makeFlow"; version="1.0.2"; sha256="0r7a0klgx144rnks0fhjflnf8vfyyx2544n86nnxkp6cdvw0b4pw"; depends=[dplyr RColorBrewer]; }; makeProject = derive2 { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; }; makedummies = derive2 { name="makedummies"; version="1.2.1"; sha256="062rvijhy2dybpgxzp44cg46bfyb8lp9yasv3mhskhf3yg717sqp"; depends=[tibble]; }; - makemyprior = derive2 { name="makemyprior"; version="1.0.0"; sha256="0l4xpalw13x07fr1g9h6dfcmb16dk712pp70mnshqjhy1vlq2ajp"; depends=[ggplot2 knitr MASS Matrix rlang rmarkdown shiny shinyBS shinyjs testthat visNetwork]; }; + makemyprior = derive2 { name="makemyprior"; version="1.0.1"; sha256="0lal0nklw0f9340gdrl2icp9qvcnjasx07a04zr3iw2rgaq5r48c"; depends=[ggplot2 MASS Matrix rlang shiny shinyBS shinyjs visNetwork]; }; makepipe = derive2 { name="makepipe"; version="0.1.0"; sha256="087lp7s70nx1zfs3mw4jk43miw4sc0gfd5faxqpnkgbpx01iaa51"; depends=[cli R6 visNetwork]; }; - maketools = derive2 { name="maketools"; version="1.2.0"; sha256="1i2s48s0qfk9nwkkbx5hr0q7b0c8xziyrsg1klianmk9jqfngg36"; depends=[sys]; }; + maketools = derive2 { name="maketools"; version="1.2.2"; sha256="1p98vg5404np5fbiqajznmiqah8lyfv2xf741wjfm2jqkki9nk40"; depends=[sys]; }; 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]; }; @@ -11975,12 +12150,12 @@ in with self; { 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]; }; manymodelr = derive2 { name="manymodelr"; version="0.3.7"; sha256="0kc4y9i21qkcg0pkwlas2mm06s54s70w5ybw4215qjwiy6xax268"; depends=[caret dplyr e1071 ggplot2 lme4 Metrics]; }; - maotai = derive2 { name="maotai"; version="0.2.2"; sha256="10s9fcfn6i0rkfhv8bq452ianjkah6srxa5fc2ymhqzm6m1r5b3j"; depends=[cluster dbscan fastcluster labdsv Matrix RANN Rcpp RcppArmadillo RcppDist Rdpack RSpectra Rtsne shapes]; }; + maotai = derive2 { name="maotai"; version="0.2.4"; sha256="178gsci0sdlqzdi18cnc7qvs008w5db50hd9ayzlvabsc0dk19z2"; depends=[cluster dbscan fastcluster labdsv Matrix 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.4.0"; sha256="043a79q2pc4c6w01pad2zyk3chjkv26vxhlvym30qq6ipdljl0sh"; depends=[countrycode giscoR rappdirs sf]; }; + mapSpain = derive2 { name="mapSpain"; version="0.6.1"; sha256="1zjg6g96fc76wkrawzan8gmhvy5n55zb9lgqv67jm8gxrzh8li69"; depends=[countrycode giscoR rappdirs sf]; }; mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; }; mapaccuracy = derive2 { name="mapaccuracy"; version="0.1.0"; sha256="1rrnbmar8s48kww2x9qjlm68xs55mbc8cnms2crdsaah7787s6aa"; depends=[assertthat gtools reshape]; }; - mapbayr = derive2 { name="mapbayr"; version="0.5.0"; sha256="12k8n3fcm9km14ih4vspv4p314yqqim2v3hgcd4h98jwsp3ls6aq"; depends=[dplyr ggplot2 magrittr mrgsolve optimx purrr rlang stringr tibble tidyr]; }; + mapbayr = derive2 { name="mapbayr"; version="0.6.0"; sha256="06kczyij4y10xs0ydj85qhgxbgcw2dwa8gjc19di7cwjhbzp9si7"; depends=[dplyr ggplot2 magrittr mrgsolve optimx purrr rlang stringr tibble tidyr]; }; mapboxapi = derive2 { name="mapboxapi"; version="0.3.1"; sha256="1rqkzc3ggccvn9s1ib23yv3531j433z4xwl0alr8qk23pj3290ff"; 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]; }; @@ -11989,23 +12164,24 @@ in with self; { mapdeck = derive2 { name="mapdeck"; version="0.3.4"; sha256="0agbf6bs3z7gwx1dj9jqlq6cllq5b65x89lkplm5mwhr20lzwvhr"; depends=[BH colourvalues geojsonsf geometries googlePolylines htmlwidgets jsonify magrittr rapidjsonr Rcpp sfheaders shiny spatialwidget]; }; mapedit = derive2 { name="mapedit"; version="0.6.0"; sha256="1ix0sjsqb6646xyi73am9ic97plw9y9p4pl8mrkpzvqzm0pxdhxx"; depends=[dplyr htmltools htmlwidgets jsonlite leafem leaflet leaflet_extras leafpm mapview miniUI raster scales sf shiny sp]; }; mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; }; - mapi = derive2 { name="mapi"; version="1.0.4"; sha256="0mlm3vp5ffjszl6zprfanr6gjbrdjrl82m7hk5q7z42h37aasc45"; depends=[data_table pbapply Rcpp sf]; }; + mapi = derive2 { name="mapi"; version="1.0.5"; sha256="1yljvapzkb43i2sbqsmn5aqp95hm8gjkz8m41x1chwyfddrzjsbw"; depends=[data_table pbapply Rcpp sf]; }; mapmisc = derive2 { name="mapmisc"; version="1.8.0"; sha256="0xp2ns6j8craz74jw4gjjhzkfbbihcy8d9dg1i08hiws743kzd8s"; depends=[raster sp]; }; 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]; }; mappings = derive2 { name="mappings"; version="0.1"; sha256="1f7m6nbdzdcxsk4m8rh8fzrck8pzxl2lgfz5c6wramwmp8rxczzb"; depends=[]; }; mapplots = derive2 { name="mapplots"; version="1.5.1"; sha256="18s2y66f8vi8g2r8a25zbgp2xm079r8v8qxv0w71h8krycs6vs9p"; depends=[]; }; - mappoly = derive2 { name="mappoly"; version="0.2.3"; sha256="1swnll428dxd8v1sa42m6x9azr5g7jxvk4q37nzsinwd7b4cw8pa"; depends=[cli crayon dendextend dplyr fields ggplot2 ggpubr ggsci magrittr plotly princurve Rcpp RCurl reshape2 rstudioapi scatterplot3d smacof vcfR zoo]; }; - mapproj = derive2 { name="mapproj"; version="1.2.7"; sha256="0nscsfq8md6ri9258xz57c3dj81wdl6kdwf4a9qcrwwbn20i427h"; depends=[maps]; }; + mappoly = derive2 { name="mappoly"; version="0.3.0"; sha256="1fb8g991s872j6wrqb4x47w164w1808y6sv51a2l62iasw8q90ah"; depends=[cli crayon dendextend dplyr fields ggplot2 ggpubr ggsci magrittr plotly princurve Rcpp RcppParallel RCurl reshape2 rstudioapi scatterplot3d 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.8"; sha256="10bpib827011fpgvzsmlv4j3i41s0r3cv1hvawwdlk753s7i0pw6"; depends=[maps]; }; mapr = derive2 { name="mapr"; version="0.5.2"; sha256="0qc1zqa2yqgy777wbm6lj37vzaaxaz0gdimr62wv9fyddkbkshk4"; depends=[data_table ggplot2 gistr jsonlite leaflet maps RColorBrewer sp spocc]; }; maps = derive2 { name="maps"; version="3.4.0"; sha256="0ispkx1szgwxhr0zzhdzgqqwcgc6psg7vry4sj4rb89w76rcq63r"; depends=[]; }; mapsFinland = derive2 { name="mapsFinland"; version="0.1.1"; sha256="0kx9r28lvc6bbl478i9gyy58kbp5hi7akysyld87fxk5x0601j19"; depends=[]; }; mapsPERU = derive2 { name="mapsPERU"; version="1.0.2"; sha256="0ld6dyqrppmc1pna2h8szvr61d3bhljx9pv616wsp5j74na3ynbg"; depends=[tibble]; }; mapsRinteractive = derive2 { name="mapsRinteractive"; version="1.0.1"; sha256="03x5mza9y5kdqshma0k7bynmd3fffayy1j243m5bhw7ln85ws73x"; depends=[gstat raster rgdal rgeos sp]; }; - mapsapi = derive2 { name="mapsapi"; version="0.5.0"; sha256="0cf9ycj1a0vik0j10nif69n7rirrvkan9md55mgicw4wmcn1rs6i"; depends=[bitops magrittr RgoogleMaps sf stars xml2]; }; + mapsapi = derive2 { name="mapsapi"; version="0.5.3"; sha256="15k7wgbfkcjnsg9qazch949pqha2iv4mg9qzzb7lnb2597il78j7"; 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.4.0"; sha256="1h6szi33rbk279sh1ws4vhx6h7dl6zk5dpd7rjhay7811dq6q7wh"; depends=[classInt Rcpp sf]; }; maptiles = derive2 { name="maptiles"; version="0.3.0"; sha256="025n9fpl55n9wnslpjqr4z5y0q4mn68dplb3fm7wyn968kw7sbig"; depends=[curl png sf slippymath terra]; }; - maptools = derive2 { name="maptools"; version="1.1-2"; sha256="0fa4a43zax8gn3jdp4ngqav61x4g6l33bg9wzqbngkbjhipck59r"; depends=[foreign lattice sp]; }; + maptools = derive2 { name="maptools"; version="1.1-3"; sha256="0ixvh4qbdjjl19ghgbb2r26yksya977q1yzs4yn5wshwm0763xph"; depends=[foreign lattice sp]; }; maptpx = derive2 { name="maptpx"; version="1.9-7"; sha256="0f85i3vwr5rvz261z6j7x15gsahxrq4qqddfb0qyhypgihvwh857"; depends=[slam]; }; maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; }; mapview = derive2 { name="mapview"; version="2.10.0"; sha256="1amscd7h5c26r8w6bp68a855vy7y8h84z7dvcc8vz6jbcln915xm"; depends=[base64enc htmltools htmlwidgets lattice leafem leaflet leafpop png raster satellite scales servr sf sp webshot]; }; @@ -12014,11 +12190,12 @@ in with self; { 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]; }; marg = derive2 { name="marg"; version="1.2-2.1"; sha256="1r6rl7dhvm8dghm7pm4hfw3924qja65hczl6d47v9ixnv4rxyzr9"; depends=[statmod survival]; }; - marginaleffects = derive2 { name="marginaleffects"; version="0.2.0"; sha256="1xarmk46348dq3wna07mbv97s4vr11kj511bifzh6pazvyyrnpbh"; depends=[checkmate generics insight numDeriv]; }; + margaret = derive2 { name="margaret"; version="0.1.1"; sha256="0qbbbc3ca8ps6b2k3i3rbhz5yr2szrwypqhrjqlhs893nybh3nlq"; depends=[devtools dplyr igraph lubridate purrr readr rlang rvest scholar SnowballC stringi stringr tibble tidyr tidytext tidyverse treemapify usethis widyr writexl]; }; + marginaleffects = derive2 { name="marginaleffects"; version="0.3.4"; sha256="0ph91ga6jfdsm480kcmyjlrxf44qxcaywq2fqdaw3md0m1hkkxrl"; depends=[checkmate generics insight]; }; 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.4.1"; sha256="1lcax5bi00n7as4pm2149rjvymrlasf0837k0iyvb58k7nyhwv9x"; depends=[magrittr]; }; + mark = derive2 { name="mark"; version="0.5.0"; sha256="11w0lkc0nvm2rprkn0mwh5acdr6wf86ijhqzqjd6aw95ziqyrkgj"; depends=[magrittr]; }; markdown = derive2 { name="markdown"; version="1.1"; sha256="06zwbrp14bri3470anadd7dvgmw06xf8df6v2pk64wx3f9sd934d"; depends=[mime 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]; }; @@ -12030,17 +12207,16 @@ in with self; { markovchain = derive2 { name="markovchain"; version="0.8.6"; sha256="1al3b76qi6var3gpfqxy6kp0varyp7sbblrhm6hvzf8nwqvl3hq2"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; }; marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; }; marmap = derive2 { name="marmap"; version="1.0.6"; sha256="16r7in3m63l7fdwxwfdphcd4fr073fb675zabjxphpxmclikyxdz"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; - marqLevAlg = derive2 { name="marqLevAlg"; version="2.0.5"; sha256="0cp3p9cgnb9hw08s8gjs7yj51d4fsa5zkkrikbgzkw0skj1gaa51"; depends=[doParallel foreach]; }; + marqLevAlg = derive2 { name="marqLevAlg"; version="2.0.6"; sha256="12jvrya818rdg6bn45v16hz78kxzzf53w914vdfqcd644438xad8"; depends=[doParallel foreach]; }; 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.50"; sha256="0dj5h7fksy36ksancrvadxfn3915m22aza9qyksf7dmqj1mghd9g"; depends=[abind ashr assertthat mvtnorm plyr Rcpp RcppArmadillo RcppGSL rmeta softImpute]; }; + mashr = derive2 { name="mashr"; version="0.2.57"; sha256="1jjmqd3z3f7bxj6zw7yw6k9j6aiwnihd8cm14271kkpyy0id8slm"; depends=[abind ashr assertthat mvtnorm plyr Rcpp RcppArmadillo RcppGSL rmeta softImpute]; }; maskRangeR = derive2 { name="maskRangeR"; version="1.0"; sha256="12g9cx7l2bwl3wzka11p73r6w47h4nma3rdlhm9kq1a69ig5cm68"; depends=[dismo dplyr e1071 gdalUtils lubridate magrittr maptools raster rgdal sp tidyverse virtualspecies]; }; 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]; }; mastif = derive2 { name="mastif"; version="1.0.1"; sha256="1jw7dz4qxyj848qm7lwg0klcw028260nizdi5gdwf7wd5a2nis9c"; depends=[corrplot RANN Rcpp RcppArmadillo repmis xtable]; }; matR = derive2 { name="matR"; version="0.9.1"; sha256="1qw2vqmpq7gc3dmr9r000ccjj7xa0h82waxnvryz3l17ggryyjjm"; depends=[BIOM_utils MGRASTer]; }; matahari = derive2 { name="matahari"; version="0.1.3"; sha256="03mhn4qh1vcz2hr0mxp6gijwgrzvbpfb8dq7lqhchbk5gq5g3fnh"; depends=[clipr jsonlite purrr readr rlang rstudioapi tibble]; }; - match2C = derive2 { name="match2C"; version="1.1.1"; sha256="05akm5xw14fngf52zw2r5jri8m0d2hrzaq944jyv285pfi5sd46v"; depends=[ggplot2 mvnfast rcbalance Rcpp]; }; - matchMulti = derive2 { name="matchMulti"; version="1.1.7"; sha256="0k5psmjzcyr7pm603vni7w2hvslck05r81cngm26pql2prdrv5yk"; depends=[coin Hmisc MASS mvtnorm plyr rcbsubset weights]; }; + match2C = derive2 { name="match2C"; version="1.2.2"; sha256="0sacmxq9igvkn4qq1fzynbyiq13jj92k2gx42bbfnm4g8gjlhpch"; depends=[ggplot2 mvnfast rcbalance Rcpp]; }; matchbook = derive2 { name="matchbook"; version="1.0.7"; sha256="0xfqg8z2zkn215kqmjjkqdwrgsk7cn4jdpxfgd6razhcbvflg48j"; depends=[]; }; matchingMarkets = derive2 { name="matchingMarkets"; version="1.0-2"; sha256="1jj5hzxiivqinkpddmkqdxgi83jm6blann9wgv4g8prn3lvp0i85"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; }; matchingR = derive2 { name="matchingR"; version="1.3.3"; sha256="1wr1faaixn5scx2c8g2jfvfm489k0ah9isza67gz0db8knja9nig"; depends=[Rcpp RcppArmadillo]; }; @@ -12048,10 +12224,11 @@ in with self; { matchr = derive2 { name="matchr"; version="0.1.0"; sha256="01nvas5ngkhzhr98n1786zsih2n2lbxx3ajwaqfd96ai0yqw2jnh"; depends=[rlang]; }; matconv = derive2 { name="matconv"; version="0.4.2"; sha256="1iyy344p3fsfx3gw9kzr0x9zhsplba22fpzl1mhk10wvf99xiwb3"; depends=[]; }; materialmodifier = derive2 { name="materialmodifier"; version="1.1.0"; sha256="116d8pppibi4kfd4jx4pc80n036lj86fprjnakkv4m890nkbznjr"; depends=[downloader imager jpeg magrittr moments png readbitmap stringr]; }; - mathjaxr = derive2 { name="mathjaxr"; version="1.4-0"; sha256="0rywdm4ki569hzmpwnzhr3h6slkkakf4l19rb2fa74ym6s13fmxs"; depends=[]; }; + mathjaxr = derive2 { name="mathjaxr"; version="1.6-0"; sha256="0yf1sfkb2kjsplipl2v4k2gp20li9xzsynclg228sy0v243pdi7c"; depends=[]; }; mathpix = derive2 { name="mathpix"; version="0.4.0"; sha256="0wwagf8v7awgiyi8vrfay5m2pbl1czn62g5bkg037wwy0c68n8va"; depends=[base64enc httr magick purrr rstudioapi texPreview]; }; matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; }; matlab = derive2 { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; }; + matlab2r = derive2 { name="matlab2r"; version="1.0.0"; sha256="0sg0llilxf3xfv4d9wskp6zh4b00sv7cf1xdc56icwj78sz2d7pk"; depends=[]; }; matlabr = derive2 { name="matlabr"; version="1.5.2"; sha256="1ba6cajnzldb1gmn7rf0b198h6mdh58r3frm0z0cmvbinspwz3x7"; depends=[stringr]; }; matlib = derive2 { name="matlib"; version="0.9.5"; sha256="0m03zygd43r0z7cldiwsc91p1xyni6pdvwm8pz4jcg5bmqasfg0w"; depends=[car MASS rgl xtable]; }; matman = derive2 { name="matman"; version="1.1.3"; sha256="0mwxxqqlg6yydc06hrjqk5ly686s21w5i5z40axxwkmpzyz84sqv"; depends=[data_table dplyr DT forecast lubridate parsedate plotly shiny shinydashboard shinyWidgets tidyr tidyselect]; }; @@ -12083,11 +12260,12 @@ in with self; { maxnet = derive2 { name="maxnet"; version="0.1.4"; sha256="05l24dksdgb43dpi4py4qkh8j9ynrnsglydy3gph1b61ygnfa8gx"; depends=[glmnet]; }; maxnodf = derive2 { name="maxnodf"; version="1.0.0"; sha256="1czhy3177bb4a5rxi2s4j3c9xn9f0b2pbkdka1dzw6ga389wdwb3"; depends=[Rcpp]; }; maxstat = derive2 { name="maxstat"; version="0.7-25"; sha256="114z1rwxwvk05ijjhdppzm148n1h192fp0w12ky10zkrhf6kphbg"; depends=[exactRankTests mvtnorm]; }; + maybe = derive2 { name="maybe"; version="0.2.0"; sha256="1nr7ivz9d5rpkxha89na8wgy7ds2v1n3pmjzxq5qdpfjfaphp84z"; depends=[]; }; mazeGen = derive2 { name="mazeGen"; version="0.1.3"; sha256="192xygg3l4rpqp49sgd5hpp4h3f8wjhyldn0l8abxhsks7jd2kfb"; depends=[igraph]; }; mazealls = derive2 { name="mazealls"; version="0.2.0"; sha256="14j6syw1zkgs4cnmxzqpm6klmgvck2gg97wkzmy9al6n0biy8gmb"; depends=[TurtleGraphics]; }; mazeinda = derive2 { name="mazeinda"; version="0.0.1"; sha256="0ns4ib73y4fghf7p1wg0a05js4mqr66dpp49p1h039pqrb0f1vwd"; depends=[foreach]; }; mazing = derive2 { name="mazing"; version="1.0.5"; sha256="1nabv5hxb58d56r4z8v4glhwiz5lf8j9gdlwncxazm6j2fcjh26s"; depends=[]; }; - mbRes = derive2 { name="mbRes"; version="0.1.2"; sha256="04pqffkj3p0hyd5jrj74878lrlhprlh0497fqngfii6zpmjikvbh"; depends=[cowplot data_table dplyr forcats ggplot2 magrittr purrr rlang tibble tidyr]; }; + mbRes = derive2 { name="mbRes"; version="0.1.3"; sha256="1gm195lwhjhkajsksa53b7fpn1574m6ayciplj74biyiz9pwyjms"; depends=[cowplot data_table dplyr forcats ggforce ggplot2 magrittr purrr rlang 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]; }; mbend = derive2 { name="mbend"; version="1.3.1"; sha256="0g7hqjdhaj99rd2jqfb6x7k7gsfcvhdibai3093qcvhv6grb3v7m"; depends=[]; }; @@ -12098,7 +12276,7 @@ in with self; { mboost = derive2 { name="mboost"; version="2.9-5"; sha256="0yg07fdd1sbjfhhxn1dqgph2vzqyq7l52cdk5iq2a2zy1vh176yg"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; }; mboxr = derive2 { name="mboxr"; version="0.2.0"; sha256="1d11fpz17k65dzw9sjc7zfs1jpajzrh2pvr2s435p83g3mpf40vz"; depends=[dplyr lubridate magrittr purrr reticulate stringr tibble tidyr]; }; mbr = derive2 { name="mbr"; version="0.0.1"; sha256="08534d0ssj5zli7880a2wzl46ydf87gn5xlv6xp0iph71wlpc52y"; depends=[data_table dplR MASS Matrix Rfast]; }; - mbrdr = derive2 { name="mbrdr"; version="1.0.8"; sha256="03snwvj71q4gfrl6f96bdldh39s2cj9aa07avr7y8vnp8yhm7wg0"; depends=[]; }; + mbrdr = derive2 { name="mbrdr"; version="1.1.1"; sha256="1ck0l2zp10xlg2d99glb76fxhc1r21aknk8x8452v25gpaqvir4c"; depends=[]; }; mbrglm = derive2 { name="mbrglm"; version="0.0.1"; sha256="0yxq1xk8qy5hpiqqldyrs78lp4ggdp5lj2lmh8rqq1xvsfr6nrh4"; depends=[enrichwith nleqslv]; }; mbsts = derive2 { name="mbsts"; version="2.2"; sha256="07sizvj627vhkpkg044593gh8lsmhw7ahqavmrindzjlfwwlfidb"; 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]; }; @@ -12109,9 +12287,10 @@ in with self; { mcStats = derive2 { name="mcStats"; version="0.1.2"; sha256="1r8dxdfcvznl2968xr6fbany1rh7wq5z1p7fhdf5g4b5l28j8pf9"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr rlang tidyr]; }; mcb = derive2 { name="mcb"; version="0.1.15"; sha256="0k986m2vyvfqxw3jmlyvf6r5bq68y92fymy03lffq5lmiqhypixj"; depends=[ggplot2 glmnet lars leaps MASS ncvreg reshape2 smoothmest]; }; mcbiopi = derive2 { name="mcbiopi"; version="1.1.6"; sha256="1caw2sy15hw2zw0bdynwnsa7hn4rly34hlxp06nwm5lssz8l2597"; depends=[]; }; - mcboost = derive2 { name="mcboost"; version="0.3.3.0"; sha256="07yslqdf0ra4s3lxfxnizf9p7dn045mbcpczp1czhxrwxl6qws03"; depends=[backports checkmate data_table glmnet mlr3 mlr3misc mlr3pipelines R6 rpart]; }; + mcboost = derive2 { name="mcboost"; version="0.4.0"; sha256="1p9bh1w4d215y971dj9n5bh9i5svi1vr48v3spw1qs0idcj122q4"; depends=[backports checkmate data_table glmnet mlr3 mlr3misc mlr3pipelines mlr3proba R6 rpart]; }; mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; }; mcca = derive2 { name="mcca"; version="0.7.0"; sha256="01nm0plgkik241qhd06v1vs84lf7agc0vkxa27cpr5qlfl4cm4zb"; depends=[caret e1071 MASS nnet pROC rgl rpart]; }; + mccca = derive2 { name="mccca"; version="0.1.0"; sha256="111phszicjn8ihcdlg9x41j3jllbz3hl12m58w1l25jd6mrrss9v"; depends=[dummies ggplot2 magic RColorBrewer stringr wordcloud]; }; mccf1 = derive2 { name="mccf1"; version="1.1"; sha256="023pvjfc1iv7hac3gz5rakg6ljs92j0qfm4givad5iiwv5n4k3zr"; depends=[ggplot2 ROCR]; }; mcclust = derive2 { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; }; mccmeiv = derive2 { name="mccmeiv"; version="2.1"; sha256="1lkghvvwxvg474p37h1mpbackr5qmy05qkx8yiq4x066wrfq1w1i"; depends=[MASS numDeriv survival]; }; @@ -12122,7 +12301,7 @@ in with self; { mcgibbsit = derive2 { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; }; mcglm = derive2 { name="mcglm"; version="0.7.0"; sha256="0xk641g4ymbvh8dhg83d66ybcib52fyxdfigvmc8xghd8x9w2prh"; depends=[assertthat Matrix Rcpp RcppArmadillo]; }; mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; }; - mclcar = derive2 { name="mclcar"; version="0.1-9"; sha256="0bwnivmajsrvmwskhk44qhz4nnc0irxq83g0kzbj4wshhivnwryp"; depends=[fields maxLik nleqslv rsm spam spdep]; }; + mclcar = derive2 { name="mclcar"; version="0.2-0"; sha256="0zgf7ha22586nh1yzdnhz1rzrqkn6yzr12qva9ag297ry4z4bn5y"; depends=[fields maxLik nleqslv rsm spam spatialreg spdep]; }; mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; }; mclogit = derive2 { name="mclogit"; version="0.8.7.3"; sha256="1as3mqqzxjdr7saw4vpgg88yqbax86z1qhl9s1jm49cw7nyqigxz"; depends=[Matrix memisc]; }; mclust = derive2 { name="mclust"; version="5.4.9"; sha256="0s4mva0n04f3pl41msmzhlh7pnk0zbmf06n826smxkw6mz327wb5"; depends=[]; }; @@ -12138,12 +12317,11 @@ in with self; { mcmcse = derive2 { name="mcmcse"; version="1.5-0"; sha256="0qvlkv7j35h2lxdzhbsbsrf1cgsbgf4in7lxgwmx7vs85k10v0ja"; depends=[ellipse fftwtools Rcpp RcppArmadillo testthat]; }; mco = derive2 { name="mco"; version="1.15.6"; sha256="10h5d2lw6ybyva44nn5wml6v3ljpnv9m1b2lh36vg2cwrdwy5sqp"; depends=[]; }; mcompanion = derive2 { name="mcompanion"; version="0.5-3"; sha256="0051agyzbhrsxi9wpfpqcq98h7y25627s2czf30qxcq80m7xbhj0"; depends=[gbutils MASS Matrix Rdpack]; }; - mcp = derive2 { name="mcp"; version="0.3.1"; sha256="07acx5mvp4znibjyacyjrnb4f5glq1xh4qhzysvkqj4vl1wai6vl"; depends=[bayesplot coda dplyr future future_apply ggplot2 loo magrittr patchwork rjags rlang stringr tibble tidybayes tidyr tidyselect]; }; + mcp = derive2 { name="mcp"; version="0.3.2"; sha256="0vqn0lb7nc5hp2ls2h17ybldxrqj6l1hd4pk5pr4d22yyidlvx96"; 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.2.2"; sha256="0n1wd8z7j9s20ym8m6vbpixibmfb3qkykb3z92jv3pbamjf2sxsc"; depends=[]; }; mcreplicate = derive2 { name="mcreplicate"; version="0.1.2"; sha256="12pmfp75sc00cdrkx4xniq74qqx3y67qxwdrrbp2mf562pdn2gmn"; depends=[]; }; - mcsm = derive2 { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; }; mctest = derive2 { name="mctest"; version="1.3.1"; sha256="1d248r9ifwl1xhvka6z69l943rvbq7s7ag6vqp9lljkcybvg75f2"; depends=[]; }; mctq = derive2 { name="mctq"; version="0.1.0"; sha256="1j4f5jfwq827x0dd19xfwjrxf1rclr5813l2rcirxifsncs5hbnc"; depends=[checkmate cli dplyr hms lifecycle lubridate]; }; mcunit = derive2 { name="mcunit"; version="0.3.2"; sha256="16nnm50g87iaf058b1w5w5hphx99xplczndcbv1356f2gs2gfy6l"; depends=[Rdpack rlang simctest testthat]; }; @@ -12155,7 +12333,7 @@ in with self; { 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]; }; mdatools = derive2 { name="mdatools"; version="0.12.0"; sha256="11dav3ljfff945lr1ldbn9g7grjnny5dmk0w723lrk63cx6jd5f0"; depends=[Matrix]; }; mdbr = derive2 { name="mdbr"; version="0.1.2"; sha256="1c33v2dqz1jjh730p486bi07h9m9clpcfrbvhbvwb8fslqxg76qd"; depends=[readr]; }; - mde = derive2 { name="mde"; version="0.3.1"; sha256="07idj8yp5adw2qx8nvq0zyg83db6mgp2ndb33grkkzy75vyhgs50"; depends=[dplyr tidyr]; }; + 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]; }; mdftracks = derive2 { name="mdftracks"; version="0.2.1"; sha256="0j1j3dbl5g8zv59ppyvnxp39vpd24ygxbdhnavjwnw1v1fpippbf"; depends=[]; }; @@ -12171,9 +12349,8 @@ in with self; { mdsr = derive2 { name="mdsr"; version="0.2.5"; sha256="0mw6kpd2p0yqkjjl1jy6bhc8dy2skxiq0k204y8kzr0l9rqk76zs"; depends=[babynames DBI dbplyr downloader dplyr fs ggplot2 htmlwidgets kableExtra RMySQL skimr stringr tibble webshot]; }; 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]; }; - meaRtools = derive2 { name="meaRtools"; version="1.0.4"; sha256="1nxyvdq4670696mhg0svxxlvk9hnr8szai8b18pw6754kmw1bjvn"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; }; meanShiftR = derive2 { name="meanShiftR"; version="0.56"; sha256="1bn75r5mf3pr1mr8384w175yabw75cynxlz2xh1gl2nar86k4m0x"; depends=[]; }; - meanr = derive2 { name="meanr"; version="0.1-3"; sha256="1b2xj62qz9919qgy62qn7k4cfxaizfb79rzbca5ksyb2fh8qwh5s"; depends=[]; }; + meanr = derive2 { name="meanr"; version="0.1-4"; sha256="1k5ygyxa5ixynvh1nfkgm4x9w0wk637m1jnrvkjhyq3jaqwwi859"; depends=[]; }; meantables = derive2 { name="meantables"; version="0.1.0"; sha256="1007w4vjb472v15ny1h8dxdzxhddk4z5s5n77ayvcbwpc8nlzmk7"; depends=[dplyr rlang tibble]; }; measuRing = derive2 { name="measuRing"; version="0.5"; sha256="0yblqkv5444y75jkb6d0zs728i6vybm294h7b5622pwfjqlfhnh2"; depends=[dplR pastecs png tiff]; }; measurementProtocol = derive2 { name="measurementProtocol"; version="0.1.0"; sha256="0vyfkrlinwq2930xqwp1hb8g7g3q7h7yg6y0c8gkwgscrxswifhg"; depends=[assertthat cli httr jsonlite rappdirs]; }; @@ -12186,7 +12363,7 @@ in with self; { medfate = derive2 { name="medfate"; version="2.3.7"; sha256="1mxfvaamswm9zw1jbs9p94h0krrdw4xma4j8wa2w453pyikcpcxk"; depends=[ggplot2 meteoland Rcpp shiny]; }; medflex = derive2 { name="medflex"; version="0.6-7"; sha256="171vp0wmmmbz42xcwjy065vhvig49s4ac2hzawfww2mvpfj0g0fj"; 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.1.0"; sha256="0xz07kvpyczhjgvli1f6d9k5khj9zwnwy51gakj3zm85nq64kxyn"; depends=[boot]; }; + mediateP = derive2 { name="mediateP"; version="0.2.0"; sha256="0qmams2hdvhq7abfidblgdz44nh5ja3byn233q3k61hvz7asxmc7"; depends=[boot]; }; mediation = derive2 { name="mediation"; version="4.5.0"; sha256="0i88wvqqw8cmxmh9i78rqzp4s16zhf12dgl9fsk9bhw7hxhhc0i1"; depends=[boot Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; }; mediationsens = derive2 { name="mediationsens"; version="0.0.2"; sha256="1wvd9kcz4sh0ylydp8q49013i408bn9w5m5ihg0s5r0489359385"; depends=[distr mediation]; }; medicaldata = derive2 { name="medicaldata"; version="0.2.0"; sha256="0dljqg24mkn7bjbbz5dp0z8yb5sl3i4a89rl32grlvwf0z3b1njn"; depends=[]; }; @@ -12202,20 +12379,20 @@ in with self; { mefa4 = derive2 { name="mefa4"; version="0.3-8"; sha256="09y8mhmcd82gz582lskvy0yx6vh6jjyxmh7i35041knqcjyp6lpc"; depends=[Matrix]; }; meifly = derive2 { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; }; mekko = derive2 { name="mekko"; version="0.1.0"; sha256="09y50k4r4mnx351a5zhkqg9s2xyl3d149dhmfy2z6hzm5yg2ajyi"; depends=[ggplot2]; }; - melt = derive2 { name="melt"; version="1.1.0"; sha256="1fl8900ynmd2v7dpi8ldzl553yqbfxx0wfy063yhwa0hvzvk73kv"; depends=[Rcpp RcppEigen RcppProgress]; }; + melt = derive2 { name="melt"; version="1.3.0"; sha256="1fxzffz1rwlmp58i4a00707flnzch1kyhm9izvsqykwqx4rqdbca"; depends=[Rcpp RcppEigen RcppProgress]; }; meltr = derive2 { name="meltr"; version="1.0.0"; sha256="0pcpgwk7if9f441z0vwh9g0ydhzkv3h4db433snkk5g4rfikx3ad"; depends=[cli cpp11 R6 rlang tibble]; }; - meltt = derive2 { name="meltt"; version="0.4.1"; sha256="1113rdw0jglwkcd3g31llhgzqmwpxfz2bp60m3x2zdbdrvwc1z9n"; depends=[dplyr ggplot2 leaflet plyr Rcpp RcppArmadillo reticulate shiny shinyjs tibble tidyr]; }; + meltt = derive2 { name="meltt"; version="0.4.2"; sha256="0pj4z5nlb3ngx50r25d80z275rcf571imapq83yg0djp5lwzml0c"; depends=[dplyr ggplot2 leaflet plyr Rcpp RcppArmadillo reticulate shiny shinyjs tibble tidyr]; }; mem = derive2 { name="mem"; version="2.16"; sha256="16xm9hai1aqhrbpxln6az4qbwz3kk2izmq39nzpzjc3ardpq1ljr"; depends=[boot dplyr EnvStats ggplot2 mclust purrr RColorBrewer RcppRoll sm tidyr]; }; memapp = derive2 { name="memapp"; version="2.14"; sha256="0w2lbypz0bc50s6yrvidz96wpz53cxpk5a9yhbq7rp8chr9r8cm3"; depends=[dplyr DT foreign formattable ggplot2 haven mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes 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]; }; - memgene = derive2 { name="memgene"; version="1.0.1"; sha256="1x3vf2f1yh40xw5vqcjlrn07zn9zh3sx4kc9dijxzygd9crl5a29"; depends=[ade4 gdistance raster vegan]; }; + 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.30.7"; sha256="0j1y4dv38irz3117inz2d298rbi3lj2r68acaynfj6lj21nx292k"; depends=[data_table lattice MASS repr]; }; memo = derive2 { name="memo"; version="1.0.1"; sha256="14nvqi1qsin45ksd0wp9cigjk1gghr4jijdqkaqh177dwa244r9j"; 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.1-3"; sha256="1p3s0rv4l44gx726frrwp64xv7xakyh2svjqglg85pv3krhlw4b4"; depends=[bookdown rmarkdown usethis]; }; + memoiR = derive2 { name="memoiR"; version="1.1-4"; sha256="03za09ka1w882wczdn9xnn5j0ahkz1i515wfh5wj1q9hqfqm40cv"; depends=[bookdown rmarkdown 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]; }; @@ -12226,14 +12403,13 @@ in with self; { mergedblocks = derive2 { name="mergedblocks"; version="1.1.0"; sha256="0hgfyb99hdph4rx32072v40j3z56bwl8lvpxqmms783b997alaml"; depends=[randomizeR]; }; 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=[]; }; - meshed = derive2 { name="meshed"; version="0.1.4"; sha256="1fqfn4di04ysbafxd0anxsf3n9zr6xwgw4x78szlygkr7qv1chz1"; depends=[dplyr glue magrittr Rcpp RcppArmadillo rlang]; }; + meshed = derive2 { name="meshed"; version="0.2.1"; sha256="1n19d1isy0x8yramkvj1ckk3s92qagppm2rngxsz2kj6ir2nyyb9"; depends=[dplyr glue magrittr Rcpp RcppArmadillo rlang]; }; messaging = derive2 { name="messaging"; version="0.1.0"; sha256="0q19cqp1zgh0yhk1ql0jqf414bhx6jwhkairq6wx2cmkli2g7k1y"; depends=[dplyr glue magrittr rlang stringr]; }; - messydates = derive2 { name="messydates"; version="0.2.0"; sha256="193rc2723i6a75g8qmrf743h89nsxm9j1dlvxncsxk1jpj5hzd43"; depends=[dplyr lubridate purrr stringr tibble]; }; - met = derive2 { name="met"; version="0.1.0"; sha256="0714103xzc4n178307czxmcv7ygjiigjr9b6xnj240ljp7qmln19"; depends=[DiPs]; }; - metR = derive2 { name="metR"; version="0.11.0"; sha256="09ar9lckrzbvcy0jgnwlrnj96ln426yh70dgjfmlac68bhinv2fw"; depends=[checkmate data_table digest fields Formula formula_tools ggplot2 gtable isoband lubridate memoise plyr purrr RCurl scales sp stringr]; }; + messydates = derive2 { name="messydates"; version="0.2.1"; sha256="0nqllz9rkfhwg1c6fhi1l7wib7sn96274d7p4z2p9l6h5vw8b4dg"; depends=[dplyr lubridate purrr stringr tibble]; }; + metR = derive2 { name="metR"; version="0.12.0"; sha256="0zz45zxzkfx5bgvwrrpbsndd01qncsvfw2pbi5kivic309r89c4s"; depends=[checkmate data_table digest fields Formula formula_tools ggplot2 gtable isoband lubridate memoise plyr purrr RCurl scales sp stringr]; }; metRology = derive2 { name="metRology"; version="0.9-28-1"; sha256="1syjwblyd18myxrs0hx4m91fgb6zs3r4g7w701j2f2pw6j9mvz0y"; depends=[MASS numDeriv robustbase]; }; metScanR = derive2 { name="metScanR"; version="1.2.3"; sha256="1v7zrxj3wspx6f5n5s75skcygbf3r85rn4p0z9iwbrbrgxwi4qgs"; depends=[geosphere leaflet matlab plyr RCurl]; }; - meta = derive2 { name="meta"; version="5.1-1"; sha256="1nl279b1h2vwk00r1yp9pw6xa5gbjl7wjsmzxi2nadfhxcwfa0cl"; depends=[CompQuadForm lme4 metafor xml2]; }; + meta = derive2 { name="meta"; version="5.2-0"; sha256="0x3v6xxlxrmyv1cpyjr83n39v29439qpzd9v2avyirbk58v85qyb"; depends=[CompQuadForm lme4 metafor xml2]; }; meta_shrinkage = derive2 { name="meta.shrinkage"; version="0.1.2"; sha256="0grdafisqaj1gfbcmg9y9iidx96j9kjpi4a2ml5h9x3r3knsnxmm"; 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]; }; @@ -12249,13 +12425,15 @@ in with self; { metaSDTreg = derive2 { name="metaSDTreg"; version="0.2.1"; sha256="0nqnb0isjz2czvih6zr4jglrwfmf9ahm9a3nwkvr2cwbmdh5clq2"; depends=[Matrix maxLik ordinal truncnorm]; }; metaSEM = derive2 { name="metaSEM"; version="1.2.5.1"; sha256="027qwbnn63c09ac560gr99fxv4ccfzd1drdcp2r610y5z9079i7i"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; }; metaSurvival = derive2 { name="metaSurvival"; version="0.1.0"; sha256="05f103fi287y64gys73a55snw54bnph69q8dykfii10dykd44g0y"; depends=[mvtnorm survival]; }; - metaboData = derive2 { name="metaboData"; version="0.6.2"; sha256="1iiy9ipyp3h1rvcbjld6bdy1jgnxbixvgs5xqwly1yj4mvri0bsg"; depends=[dplyr fs magrittr piggyback purrr readr rlang stringr tibble yaml]; }; + 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.0"; sha256="1bk8d0sxlgc17d7x02zmx23fdqz39c9zpin16bzhcj602kjcq0y8"; depends=[cli dplyr forcats ggfittext ggimage ggplot2 glue magrittr meta patchwork purrr rmarkdown scales stringr tibble tidyr usethis]; }; + metabolighteR = derive2 { name="metabolighteR"; version="0.1.3"; sha256="0ip7cy40jndcwp8yc42pjzklv35dkxjd3pdlpwk0r0jngp7nbjim"; depends=[crayon dplyr httr magrittr purrr]; }; metacart = derive2 { name="metacart"; version="2.0-3"; sha256="1wim72fvhx6cyc16c9gl8cwzbhlpzilk7q8gi4jnzzazqmc1kb5n"; depends=[ggplot2 gridExtra Rcpp rpart]; }; metacoder = derive2 { name="metacoder"; version="0.3.5"; sha256="0d0ihglsal9cx03jjq472x2xlqdflgxhzkr0vwvjpq0rqvq5syva"; depends=[ape cowplot crayon dplyr GA ggfittext ggplot2 igraph lazyeval magrittr R6 Rcpp RCurl readr rlang seqinr stringr taxize tibble vegan]; }; metacom = derive2 { name="metacom"; version="1.5.3"; sha256="0c0gzn28cl2sl52wx2n36jm9c18d9s3yqjyx88kgbmd9069z1nvk"; depends=[vegan]; }; metaconfoundr = derive2 { name="metaconfoundr"; version="0.1.0"; sha256="13b0xbfm90g14grvpffnj7xhkgymzcayq1hh2vi0q1ah8bl8z504"; depends=[dplyr ellipsis forcats ggplot2 glue magrittr purrr rlang shiny stringr tibble tidyr tidyselect]; }; metacor = derive2 { name="metacor"; version="1.0-2.1"; sha256="0y3z7jbhw5c2dbn9fx9wlw1311irjc2xvnm5hnaixbbj53qz24n0"; depends=[gsl rmeta]; }; + metacore = derive2 { name="metacore"; version="0.0.3"; sha256="19q88g9vcqwp5p42x6agsxhwmvlqgprdq3ydqvv9c41yp03bqypq"; depends=[dplyr magrittr purrr R6 readxl rlang stringr tibble tidyr tidyselect XML]; }; metadat = derive2 { name="metadat"; version="1.0-0"; sha256="172bvdkmjvxx5cylb4wxbrhnmlzrc3ipfq7343ggypqln975lczd"; depends=[mathjaxr]; }; metadynminer = derive2 { name="metadynminer"; version="0.1.6"; sha256="0zg08lwnimnmfwac0d5kg8yhsl88gmn029dra18phy1jzkfnsx34"; depends=[Rcpp]; }; metadynminer3d = derive2 { name="metadynminer3d"; version="0.0.1"; sha256="0riqr2hhk4h0rm7m4njb2dd2f24jff7lzf9chh83sq4q3wldgpz5"; depends=[metadynminer misc3d Rcpp rgl]; }; @@ -12274,7 +12452,7 @@ in with self; { metamisc = derive2 { name="metamisc"; version="0.2.5"; sha256="1fg6k2sr74iprjx2bwqqfnp67c493fkilncy2nbynv4sqmbl8s0i"; depends=[dplyr ggplot2 lme4 metafor mvtnorm plyr pROC]; }; metan = derive2 { name="metan"; version="1.16.0"; sha256="09qa46069xb7vrmp8r0nq84fvwzzx5bqav3x3cfc2shxm6dxmf0g"; depends=[dplyr GGally ggforce ggplot2 ggrepel lme4 lmerTest magrittr mathjaxr patchwork purrr rlang tibble tidyr tidyselect]; }; metansue = derive2 { name="metansue"; version="2.4"; sha256="1ja7a3z4d764a1rcf256kmzf8xc6d8x7mqq12vzznw5ks8r2p9hk"; depends=[]; }; - metap = derive2 { name="metap"; version="1.7"; sha256="0hlcyl8lgcnihzc7xfsm1wmq2kksaz2n342l512dwdqfgmh13dfr"; depends=[lattice mathjaxr mutoss Rdpack TFisher]; }; + metap = derive2 { name="metap"; version="1.8"; sha256="0asmypxfxly4xmcjf3yzid5zqlzg88z0brij2splfk4avsl035gf"; depends=[lattice mathjaxr mutoss qqconf Rdpack TFisher]; }; metapack = derive2 { name="metapack"; version="0.1.5"; sha256="112mhfg01hci09qj9l2l3xww3za20kd1z6jshj4893mlqpmvl177"; 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]; }; metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; }; @@ -12283,10 +12461,10 @@ in with self; { metapower = derive2 { name="metapower"; version="0.2.2"; sha256="1r6mmdxxi83isjjyfzblwpzfgqdmfhbqmq49zm2b4jd0zvc0lfcx"; depends=[cowplot dplyr ggplot2 knitr magrittr rlang testthat tidyr]; }; metaprotr = derive2 { name="metaprotr"; version="1.2.2"; sha256="1iz5aqd8ha0h19sa58s7xd4h26lbqp68dxy93pxnx9bj3bv615b3"; depends=[ade4 dendextend dplyr ggforce ggrepel reshape2 stringr tidyverse]; }; metarep = derive2 { name="metarep"; version="1.0.1"; sha256="0jnxx11jxj63ry0bkjlh9g2x2pr2qi24nql99iibz2ckbx8344p3"; depends=[meta]; }; - metasens = derive2 { name="metasens"; version="1.0-0"; sha256="1f0bjfm8bbmpgi1ng4k7g38hryzv9yyaw8r6rsxzafc31mcwm7vm"; depends=[meta]; }; + metasens = derive2 { name="metasens"; version="1.0-1"; sha256="10ii6q1f9064j3jm9rm1ffm2mzpjlqnqhhvpp27s27i6r9jbma3w"; depends=[meta]; }; metatest = derive2 { name="metatest"; version="1.0-5"; sha256="1h3dcs1m7606b3a41yw2lak3lrqmsbpnx67qv24wvq003apz1sfd"; depends=[]; }; metathis = derive2 { name="metathis"; version="1.1.1"; sha256="0vac4sjlbz1cpdx0yc6q52mj174xay5j81cl5f4z2q9in0jy8f8b"; depends=[htmltools knitr magrittr purrr]; }; - metaumbrella = derive2 { name="metaumbrella"; version="1.0.0"; sha256="11r6fwbg8zsijj9jvd7iqmawd4422i8ynypvc8inbr3afn26gnv9"; depends=[meta powerSurvEpi readxl withr writexl xtable]; }; + metaumbrella = derive2 { name="metaumbrella"; version="1.0.2"; sha256="16v8q97f5a6dcwwii3hfkw7skbifihkv2sr2rbbyxb23fz2ypzpd"; depends=[meta powerSurvEpi readxl withr writexl xtable]; }; metavcov = derive2 { name="metavcov"; version="2.1.2"; sha256="1jf4xig6lshf5kda4cj7w72121jp8bq52f4752bl8sxgnfqgfkr5"; 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]; }; @@ -12294,7 +12472,7 @@ in with self; { meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; }; meteoForecast = derive2 { name="meteoForecast"; version="0.54"; sha256="046c0z66hsyfrnksdq40xv3kf2di0ywv5wfb9s7b7999s694ak18"; depends=[ncdf4 raster sp XML zoo]; }; meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; }; - meteoland = derive2 { name="meteoland"; version="1.0.1"; sha256="1160yjawyb0icgmxz963la722dqdil72kjp4253yraanw0zdzy64"; depends=[httr jsonlite meteospain ncdf4 Rcpp rgdal sf sp spdep units xml2]; }; + meteoland = derive2 { name="meteoland"; version="1.0.2"; sha256="1z8ndbvd5ah4w9c2db0wq9chy2dwa81wgcagfnv6xj72yh3f0k86"; depends=[meteospain ncdf4 Rcpp rgdal sf sp spdep units]; }; meteor = derive2 { name="meteor"; version="0.3-4"; sha256="01009d9wpxybig4n82m48hqqg1k4x4shcjxfy8y0kk7cgfdb4naw"; depends=[Rcpp]; }; meteorits = derive2 { name="meteorits"; version="0.1.1"; sha256="1vk8pbhfc5mbkbpw7ml81gx9i8187xp3vx36pbyyhjbrpy6gqabx"; depends=[MASS pracma Rcpp RcppArmadillo]; }; meteospain = derive2 { name="meteospain"; version="0.0.3"; sha256="0qqlfli9k4472ajx57xkf9laym0znl43qy8xzdq8xnq5alv0yrsw"; depends=[assertthat cachem crayon dplyr glue httr jsonlite lubridate magrittr memoise purrr rlang sf stringr tidyr units vctrs xml2]; }; @@ -12307,20 +12485,21 @@ in with self; { metsyn = derive2 { name="metsyn"; version="0.1.2"; sha256="0iwp0nz07yd33qd93fjblmvik1l1xkv6rkccn3054zs2bkrzjq4f"; depends=[foreach readr stringr tibble]; }; mev = derive2 { name="mev"; version="1.13.1"; sha256="1zbr5f8w56c9z0lp4ak47fxnnfrdm74liqcjvij0n4ajqs6glaak"; depends=[alabama boot evd nleqslv nloptr Rcpp RcppArmadillo TruncatedNormal]; }; mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; }; - mexhaz = derive2 { name="mexhaz"; version="2.1"; sha256="0a2nw09339jbkfp1g2p8bblqb9n2cgacnfkwinpm3745nghdbbfv"; depends=[lamW MASS numDeriv statmod survival]; }; + mexhaz = derive2 { name="mexhaz"; version="2.2"; sha256="0fyb2sh635lc8wp80jpqiigzq7jbj12j7ynmn2nlls0jpsyrmpxn"; depends=[lamW MASS numDeriv statmod survival]; }; mexicolors = derive2 { name="mexicolors"; version="0.2.0"; sha256="0vbhwaq19hqd63qjybssgqxkawjr6vnar6k0nrb583hh1q9hjyg2"; depends=[]; }; mfGARCH = derive2 { name="mfGARCH"; version="0.2.1"; sha256="1pcabijwhdxhdlrdjvi2zl8la939igsdy3j1yv0ic8wvkpw1sh4x"; depends=[maxLik numDeriv Rcpp zoo]; }; mfaces = derive2 { name="mfaces"; version="0.1-3"; sha256="0pqmsflph2iplr0jlwpgbfgg523v0nw41gvjb88q1d993pyfhfdl"; depends=[face Matrix matrixcalc mgcv]; }; mfbvar = derive2 { name="mfbvar"; version="0.5.6"; sha256="1wv46h6cr0xnvr8dxymx362skf7nf77yw84y6g48rj9mbq8kkkcj"; depends=[dplyr ggplot2 GIGrvg lubridate magrittr Rcpp RcppArmadillo RcppParallel RcppProgress stochvol tibble zoo]; }; mfdb = derive2 { name="mfdb"; version="7.2-0"; sha256="0jmydw6kv4lnyyx05ih5k4xah42pg3sjckhgxmykrpsgdvd8f96j"; depends=[DBI duckdb getPass logging rlang RPostgres RSQLite]; }; mfe = derive2 { name="mfe"; version="0.1.5"; sha256="1pw9gw9bd778s57dyjwbmrmsla4m8dkf8g49gplv4zrsvlgsgbr3"; depends=[cluster clusterCrit e1071 ECoL infotheo MASS rpart rrcov]; }; - mfp = derive2 { name="mfp"; version="1.5.2.1"; sha256="1k0di144sfy9fbw4lnwzxf7j7ah0isr38jafxkgl8fx1ys8y3pvh"; depends=[survival]; }; + mfp = derive2 { name="mfp"; version="1.5.2.2"; sha256="1w61hj0dizgcpa3qv9ks9lvvbic7xp2cnip4klkdb9ss63vws8bv"; depends=[survival]; }; mfx = derive2 { name="mfx"; version="1.2-2"; sha256="04pwp67i4sn4rf497pgy6qifwvrcmwyxn8x5sn96fy8qyrdzjfhj"; depends=[betareg lmtest MASS sandwich]; }; mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; 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]; }; - mgcv = derive2 { name="mgcv"; version="1.8-38"; sha256="1fyx8b0xjyx75mp90v314gayzydkca5y90p76jnwxzfnhxbys4nd"; depends=[Matrix nlme]; }; + mgcv = derive2 { name="mgcv"; version="1.8-39"; sha256="15h1k9qyn8s8xy4x2361mj42vdq8ml5xskzqpkc45zj1a3gss6w4"; depends=[Matrix nlme]; }; mgee2 = derive2 { name="mgee2"; version="0.2"; sha256="1bhjajcjvm8brc92v6ij378i0d3vniip77m4pz7n02sgswj0w61a"; depends=[ggplot2 MASS]; }; + mglasso = derive2 { name="mglasso"; version="0.1.1"; sha256="0h5npy9innq8dxyp1aq0agffrp29zrzfrcs8bzy43a60bhsil55l"; depends=[corpcor gridExtra Matrix R_utils reticulate]; }; mglmn = derive2 { name="mglmn"; version="0.1.0"; sha256="1g642hhs28q6x34xgrfrmmsb2jsn9zy4jxad0x5ai3px48zzdb4r"; depends=[mvabund snowfall]; }; mgm = derive2 { name="mgm"; version="1.2-12"; sha256="0p5l1mcgz47rri800i78q7f89s2ll5w5kqmj1lkd4i93fj4bh585"; depends=[glmnet gtools Hmisc qgraph stringr]; }; mgpd = derive2 { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; }; @@ -12355,23 +12534,22 @@ in with self; { miceafter = derive2 { name="miceafter"; version="0.1.0"; sha256="0wiljd1dm1h7frhkf304i5sc8w5af9f6jhz3cd8f0r13n3z1r6yi"; depends=[car dplyr magrittr mice mitml mitools pROC purrr rlang rms stringr survival tibble tidyr]; }; micemd = derive2 { name="micemd"; version="1.8.0"; sha256="1vds5199bv3lgpn3qzra6gakvabyz6a83p55xjxgs9zk9chgf9yw"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; }; michelRodange = derive2 { name="michelRodange"; version="1.0.0"; sha256="1pykqb9hmpvn77k0vhfh36iyhamz9h5kpswq3ql31h9nknfy3ixi"; depends=[magrittr]; }; - miclust = derive2 { name="miclust"; version="1.2.7"; sha256="1kpr798r9dz3rs4ixwzgihjn7a0z3j0nmv76my8mbay84zr2kn74"; depends=[combinat doBy flexclust irr matrixStats]; }; + miclust = derive2 { name="miclust"; version="1.2.8"; sha256="0qxbbybak0illkn99bsmmqlh923g0gw6znjh05wdmgqdsjh3fx1v"; depends=[combinat doBy flexclust irr matrixStats]; }; micompr = derive2 { name="micompr"; version="1.1.1"; sha256="11whyvqyzjdpw2q9yqw21s8paiq992z346zi947mc9d78g1z3djw"; depends=[]; }; - microPop = derive2 { name="microPop"; version="1.5"; sha256="1gikp20n2b50fkybbg2hmlfjdcm0imjwygjsjnyv3wrjzypm2i78"; depends=[deSolve]; }; + microPop = derive2 { name="microPop"; version="1.6"; sha256="0if218csmnp5vcbcgr9zjk8d7y17al04rpfhjvp76v03xvwjizp5"; depends=[deSolve testthat visNetwork]; }; microSTASIS = derive2 { name="microSTASIS"; version="0.1.0"; sha256="09zyf80l964lfil56vln70i0r2d8ry2ffx4zz3f3xcka22m94r78"; depends=[crayon fmsb future future_apply ggplot2 ggside progressr reshape2 stringr]; }; microbats = derive2 { name="microbats"; version="0.1-1"; sha256="1mahvblaiwg1xk2s34wd1ic8ddc9lh6g0azik2pd97bsf0krkyw8"; depends=[]; }; microbenchmark = derive2 { name="microbenchmark"; version="1.4.9"; sha256="1lpzpffnjiwnxxl0jhrvyj88fvxqksnpccbpq953xwqf6ypjqga4"; 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]; }; - microclustr = derive2 { name="microclustr"; version="0.1.0"; sha256="04xn8p4wgmxq1jbxawq0rhx6l7y1kddlbdfid8zsi4x4arkz7hvp"; depends=[Rcpp]; }; microcontax = derive2 { name="microcontax"; version="1.2"; sha256="004g979hyg0asbah7hxr445fidil4ibw1b8pqpjdbgmpm1qgvw7y"; depends=[microseq]; }; microdemic = derive2 { name="microdemic"; version="0.6.0"; sha256="1w4zh0vagnar95l5b8cgmcvp8q7vk2iba5g8d8g2ywynqiqcx5fc"; depends=[crul data_table httpcode jsonlite tibble]; }; - microeco = derive2 { name="microeco"; version="0.6.0"; sha256="1kfbfvlq2h738ipm4481jh785pvpl3xsyb37gplg9aj3s0a6q7j7"; depends=[ape data_table dplyr ggplot2 magrittr R6 RColorBrewer reshape2 rlang scales tibble vegan]; }; + microeco = derive2 { name="microeco"; version="0.6.5"; sha256="1syvssymnqzc8yvghc24ccb1gj490ly7mq1sgslvipvgd060jsid"; depends=[ape data_table dplyr ggplot2 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.5"; sha256="18y8m63k9l4dir8w1qbbi1g86506yajvi6qs0j1588575lak1l62"; depends=[ggplot2 maptools RColorBrewer rgdal sf sp]; }; micromapST = derive2 { name="micromapST"; version="1.1.1"; sha256="15ch132x3wnpf7rmy25nah7iyfxfk90p7lvavqjhrnavhjsfxbxx"; depends=[labeling RColorBrewer stringr]; }; micropan = derive2 { name="micropan"; version="2.1"; sha256="16zs6sqi2c5lwzhd5gbyddp8q4gx5r5sg0pbpk7924i8x4hh081h"; depends=[dplyr igraph microseq rlang stringr tibble]; }; - microplot = derive2 { name="microplot"; version="1.0-44"; sha256="1sx3544yvv5dxpgqw1582574z1vcxh9rc82x1z37ad7ayzxyyb1v"; depends=[cowplot flextable ggplot2 HH Hmisc htmltools lattice officer]; }; + 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]; }; microservices = derive2 { name="microservices"; version="0.1.2"; sha256="18inmqwdb2cz0i0q9rh7mm3bi0hg193kkipbzhgk0bk8i8gkdy84"; depends=[config desc dplyr glue purrr withr]; }; @@ -12379,7 +12557,7 @@ in with self; { microsynth = derive2 { name="microsynth"; version="2.0.31"; sha256="0wmrp9igylzp4qbvdr13r2rxfkcq9xwg8gw29j1g6kcqyq4aflds"; depends=[boot kernlab LowRankQP nleqslv pracma survey]; }; midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; }; midas2 = derive2 { name="midas2"; version="0.1.0"; sha256="0k670ppbw12s4wgliiqgc5fr0sajr5axlkwa5i54hrappkh1vlb4"; depends=[coda MCMCpack R2jags]; }; - midasml = derive2 { name="midasml"; version="0.1.8"; sha256="13mn1j5mlz4ss2dk8pjadyymv8lp2v1scd8lr8glqmjy2r81gjlf"; depends=[doParallel doRNG foreach lubridate Matrix mcGlobaloptim]; }; + midasml = derive2 { name="midasml"; version="0.1.9-1"; sha256="15r6sdq788x3gj8n8b2ykhrp8habx8rjhsiy3phlp98vm7m58b2z"; depends=[doParallel doRNG foreach lubridate Matrix mcGlobaloptim]; }; midasr = derive2 { name="midasr"; version="0.8"; sha256="0mzyxf8q2wmbsiczkhhgigy7jmi8zr4w4a83f97va35vfhxi217k"; depends=[forecast Formula MASS Matrix numDeriv optimx quantreg sandwich texreg zoo]; }; midastouch = derive2 { name="midastouch"; version="1.3"; sha256="1pjzcf0hjfhr5p0la8pz1njw7bhfrcrzpqfsdqk2z5c6dbh4awzq"; depends=[]; }; midrangeMCP = derive2 { name="midrangeMCP"; version="3.1.1"; sha256="1yfwyglyxxk4i914m8n148cjydlcg7r16zl8acb1w8h963svirk9"; depends=[SMR writexl xtable]; }; @@ -12390,7 +12568,7 @@ in with self; { migration_indices = derive2 { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; }; migui = derive2 { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; }; miic = derive2 { name="miic"; version="1.5.3"; sha256="1wrvgzi91jirn5n5fvvbhhpcga7l75h149sz1g1r1wbci181l3bg"; depends=[ppcor Rcpp scales]; }; - mikropml = derive2 { name="mikropml"; version="1.2.0"; sha256="1h4nqmm7cqfsv3dff7akpy3mx3smdgdwak62l5h7lmisfj6xyk87"; depends=[caret dplyr e1071 glmnet kernlab MLmetrics randomForest rlang rpart xgboost]; }; + mikropml = derive2 { name="mikropml"; version="1.2.2"; sha256="01xr970bpg038a0kn36i7r9d8l3jdnkmlafkw082nl7vnx8gcxh7"; depends=[caret dplyr e1071 glmnet kernlab MLmetrics randomForest rlang rpart xgboost]; }; 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]; }; mime = derive2 { name="mime"; version="0.12"; sha256="0j9qbq9jfsp61h2d0xmb87pa2wi8nhb1h2wih7l5drf1sr8i0059"; depends=[]; }; @@ -12398,18 +12576,18 @@ 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.0.1"; sha256="0kj3kalr11c4jab9b5w0i2w2z0dsdmm22szgfzyrc3y2w6jdhvjw"; depends=[BiocParallel]; }; - mind = derive2 { name="mind"; version="0.1.4"; sha256="0zalbxd4mbi5snidz60pdnm1bkgbp5pabwc4p3qfvix6ll863kmc"; depends=[data_table dplyr JWileymisc MASS Matrix qdap]; }; + mind = derive2 { name="mind"; version="0.1.5"; sha256="104cya2g0fw4cg1ihmznhhwwrbmwbbck9zfwgr5snmmhs4q244dy"; depends=[data_table dplyr JWileymisc MASS Matrix qdap 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]; }; minerva = derive2 { name="minerva"; version="1.5.10"; sha256="03srkii3rmx40lyr050bnrxil6w0hfv5pr64k339m66ciwyka9ig"; depends=[Rcpp RcppArmadillo]; }; - miniCRAN = derive2 { name="miniCRAN"; version="0.2.14"; sha256="1i1rf97m7c8x65rfy8c26l0kbl4zq7ha1f9yi413fk9jlngxajj3"; depends=[assertthat httr igraph]; }; + 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]; }; miniUI = derive2 { name="miniUI"; version="0.1.1.1"; sha256="1h5h2sc57h95d6bsgs95l26911g38hvjc1v50bc31xl9689l2as5"; depends=[htmltools shiny]; }; - minidown = derive2 { name="minidown"; version="0.3.0"; sha256="1x0xsag8lbghnbgjlwd73m24cpvil75056pl3j2fhhsydbikhifw"; depends=[htmltools knitr mime rmarkdown xfun]; }; + 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.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; }; + minimax = derive2 { name="minimax"; version="1.1"; sha256="0108gwdaaag219f2azzmd365d866bvlxvg247xin58f7sfdy038w"; 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]; }; minimist = derive2 { name="minimist"; version="0.1"; sha256="007y829d766b1v6wkrhk7pkg99r38bvmhc8bwvs8rs13dr7444ln"; depends=[V8]; }; minpack_lm = derive2 { name="minpack.lm"; version="1.2-1"; sha256="18ym2pdql5vzngc7q5gn66d153hrfrnd8ilv8yh6vd7j7sx7vjql"; depends=[]; }; @@ -12419,6 +12597,7 @@ in with self; { minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; 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.1.0"; sha256="014mqn9f25hgzrvyh46axhgak8h945asdslyflf99w0pdl6xl22x"; depends=[nanonext]; }; mirt = derive2 { name="mirt"; version="1.35.1"; sha256="0gmssa6cx2rdphq6v5d3jhxrjkhc4sngsp7bj3szaj3xkd4px2vq"; depends=[dcurver Deriv GPArotation gridExtra lattice Matrix mgcv Rcpp RcppArmadillo vegan]; }; mirtCAT = derive2 { name="mirtCAT"; version="1.12"; sha256="0pi6xwvia0njkmdpvr8bbp7ha05rcazw3qbva9gf518ffwvda9gy"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; }; mirtjml = derive2 { name="mirtjml"; version="1.4.0"; sha256="1zvm8acywpzi87lz0hpxmr8c9kyqkbx0490q3vlwxd90ffcdp9ml"; depends=[GPArotation Rcpp RcppArmadillo]; }; @@ -12434,7 +12613,7 @@ in with self; { 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.1.5"; sha256="0mipc3s0n7j48nrahb2zz5kmh9656gx2gp67riva3nsj5iax0d7g"; depends=[DirichletReg dplyr forrel highcharter pedtools plotly tidyr tidyverse]; }; + mispitools = derive2 { name="mispitools"; version="0.1.9"; sha256="1p9w742jsp7dx104s29z5hk2c61m48kg52db7vifj5m85l5g0i5b"; depends=[DirichletReg dplyr forrel highcharter pedtools plotly 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]; }; missCompare = derive2 { name="missCompare"; version="1.0.3"; sha256="03j69xw54d076znx19dplw4xznvgky90hxh3wgypg0g5pjg63y53"; depends=[Amelia data_table dplyr ggdendro ggplot2 Hmisc ltm magrittr MASS Matrix mi mice missForest missMDA pcaMethods plyr rlang tidyr VIM]; }; @@ -12442,25 +12621,25 @@ in with self; { missDiag = derive2 { name="missDiag"; version="1.0.1"; sha256="04zd3nds44sy7nz73kdq9wjis3r9zyp0kda54mfqps1sh9jnizlq"; depends=[cobalt Formula]; }; missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; }; missMDA = derive2 { name="missMDA"; version="1.18"; sha256="1s7ph89y0mrksdi73nnjnxl2354401ny8ziijzf036rcsiyvl8m5"; depends=[doParallel FactoMineR foreach ggplot2 mice mvtnorm]; }; - missMethods = derive2 { name="missMethods"; version="0.2.0"; sha256="0rsx7fdg0k8ajpj81ybl2jc9s8sprc2si6zx7mkvcqgw9iacrdik"; depends=[]; }; + missMethods = derive2 { name="missMethods"; version="0.3.0"; sha256="12hr9j0433cjm1qk8fma7sqlim4klay83mvpai9csqil214sb73a"; depends=[]; }; missRanger = derive2 { name="missRanger"; version="2.1.3"; sha256="1kk64q9ip6hhjcyrvnm5yd8ikilrvvw1vjz8166c6jb8xrqwbb2v"; depends=[FNN ranger]; }; - missSBM = derive2 { name="missSBM"; version="1.0.1"; sha256="1hy9q27sqgasd60davx53z33m8f3ilzrlqv0xcrpd84l8ahi6wrk"; depends=[future_apply ggplot2 igraph magrittr Matrix nloptr R6 Rcpp RcppArmadillo rlang sbm]; }; + missSBM = derive2 { name="missSBM"; version="1.0.2"; sha256="09i7cm4nsssn0scr5lmxs4yczcm7z3b4crj8jl7nhqf1azsvcd0n"; depends=[future_apply ggplot2 igraph magrittr Matrix nloptr R6 Rcpp RcppArmadillo rlang RSpectra sbm]; }; missSOM = derive2 { name="missSOM"; version="1.0.0"; sha256="02hi37jha49dppcv5cyzpcayb4b7mpmcp56nspbrlnxp9dgy7pim"; depends=[kpodclustr Rcpp]; }; missingHE = derive2 { name="missingHE"; version="1.4.1"; sha256="1bxpp88rwnv4fc9lm606cczj1dx63p507sqsr71dblgsfw3aw7xy"; depends=[bayesplot BCEA coda ggmcmc ggplot2 ggpubr ggthemes gridExtra loo mcmcplots mcmcr R2jags]; }; mistat = derive2 { name="mistat"; version="2.0.3"; sha256="068ycnnkqcmf3sracsa279lggyc1qxdkpcba7ghax0xl4y505yxj"; depends=[]; }; mistr = derive2 { name="mistr"; version="0.0.5"; sha256="02jm6z4a6zkqh7bfdmc1pqvdvz03crihwi9s60gv15c8xwr1dq7p"; 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.4.3"; sha256="1i18yd6swhx945g99yfh9dcs8zm4gzln4qhw5lzf65ggwhcwqkdy"; depends=[haven lavaan lme4 norm readxl]; }; + misty = derive2 { name="misty"; version="0.4.4"; sha256="1cixlngn782gcjpyzci0xbw5lk852azrc5540kdci6bpx5h677mj"; depends=[ggplot2 haven lavaan lme4 nlme norm r2mlm readxl writexl]; }; mitml = derive2 { name="mitml"; version="0.4-3"; sha256="00i18nnvrdrg91crgcp2a431xs71cawaip3xkqk2myv0iav3xga9"; 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-10"; sha256="0z16ddbh79kqxi64bl1h2sd8anpgc48n9d1nyr2zlln39nhv8w8g"; depends=[]; }; mixAK = derive2 { name="mixAK"; version="5.3"; sha256="12vhg3qaz39hcc581gn0wfmcxj1yhggcsqic4ngy4gpmrg27yls0"; depends=[coda colorspace fastGHQuad lme4 mnormt]; }; - mixAR = derive2 { name="mixAR"; version="0.22.5"; sha256="09r6zzfckwqh9giiw7y24aip3cgdwdv2q9xx4mjbfim5hrjai81k"; depends=[BB combinat e1071 fGarch gbutils MCMCpack mvtnorm permute Rdpack timeDate]; }; + mixAR = derive2 { name="mixAR"; version="0.22.6"; sha256="1q1ibqv4mi2zxs0qq0r4c7vrsvkrdg8c0rs56kyv0ykgqirda4gz"; depends=[BB combinat e1071 fGarch gbutils MCMCpack mvtnorm permute Rdpack timeDate]; }; mixComp = derive2 { name="mixComp"; version="0.1-2"; sha256="01zgf31mmnjnwwji9yadfhwa49xy4i3wf0f5glifmpnvmr6d7y1d"; depends=[boot cluster expm kdensity matrixcalc Rsolnp]; }; mixEMM = derive2 { name="mixEMM"; version="1.0"; sha256="0344ay1avi37kvh5w9bknayx67yh7rflj6zhw68d2888v7cbghjy"; depends=[]; }; mixIndependR = derive2 { name="mixIndependR"; version="1.0.0"; sha256="0wjzs56axdjas2a9ynw3gd78h0fgcfjpx3bk7nm895lmadyzih6y"; depends=[data_table]; }; - mixKernel = derive2 { name="mixKernel"; version="0.7"; sha256="02llsy2y45qsbzvz8bx66ijf2pl7aiy3dc3ni7jyzbnc3gfsjh2c"; depends=[corrplot ggplot2 LDRTools Matrix mixOmics phyloseq psych quadprog reticulate vegan]; }; + mixKernel = derive2 { name="mixKernel"; version="0.8"; sha256="0slw5fvmzkfpx7nq5fbfldjrgh92v4g7j86jhbhghbkpwzzsjnyi"; 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]; }; mixRasch = derive2 { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; }; @@ -12477,7 +12656,7 @@ in with self; { mixedsde = derive2 { name="mixedsde"; version="5.0"; sha256="0ss1ng4nx91gxj85wxxfyh9ljxsj3ag6lsj1a5d2815p9jzl7dsv"; depends=[MASS moments plot3D sde]; }; mixexp = derive2 { name="mixexp"; version="1.2.5"; sha256="0nbf10xhrr51rb1b2apcj4p3ci8xbi7flgz500ar3mxh8h8l74sq"; depends=[daewr gdata lattice]; }; mixl = derive2 { name="mixl"; version="1.3.3"; sha256="0vxvs6lvnkijhdy78lw19hp11ylf4afyg0v5xc5izbhwk3cp5nga"; depends=[maxLik numDeriv randtoolbox Rcpp readr sandwich stringr]; }; - mixlm = derive2 { name="mixlm"; version="1.2.5"; sha256="0k7sy2bkf6vsp5qkz33327p1kjyzn3cxmxzc6dmw6g29c4dyxkac"; depends=[car leaps multcomp pls pracma]; }; + mixlm = derive2 { name="mixlm"; version="1.2.6"; sha256="1qccwiaqyvmpyklbbp6ay3xvln9wfizaxi6fjizzx2bjpng5043p"; depends=[car leaps multcomp pls pracma]; }; mixmeta = derive2 { name="mixmeta"; version="1.2.0"; sha256="093f6jjq0hc49k5kmjp17s2lv3swpssfxnra80bwv59ggav8w8d8"; depends=[]; }; mixpoissonreg = derive2 { name="mixpoissonreg"; version="1.0.0"; sha256="1pk45p96kwl3gvi5523vm824s1bb5aqpn9qqpqy8kjy2pd2a4k32"; depends=[dplyr Formula gamlss gamlss_dist generics ggplot2 ggrepel gridExtra lmtest magrittr pbapply Rfast rlang statmod tibble]; }; mixreg = derive2 { name="mixreg"; version="2.0-10"; sha256="1vmidnhb899lmprybym71w0l869msrgvlqr3099kwj05sph85pwm"; depends=[]; }; @@ -12494,7 +12673,7 @@ in with self; { mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; }; mkin = derive2 { name="mkin"; version="1.0.5"; sha256="1nxdzll5v8551sgq0whqs2270lzvw923rl0kxvxbcwnsz27z26da"; depends=[deSolve inline lmtest nlme numDeriv pkgbuild purrr R6]; }; mknapsack = derive2 { name="mknapsack"; version="0.1.0"; sha256="1kzmx7d512681a4hjirfgcd7a8rvndb4da66p16gms5nnxzsby9c"; depends=[assertthat data_table lpSolve]; }; - mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; }; + mkssd = derive2 { name="mkssd"; version="1.2"; sha256="1vgg5azr4qydqb6xbdbff9256bwz7gl3k3hpn7998rm9jhdmynnd"; depends=[]; }; mlVAR = derive2 { name="mlVAR"; version="0.5"; sha256="11mn7gaqlmw01gvg7psqkkr5bgv4iclv0590av4xzbvq8496f5g2"; depends=[abind arm clusterGeneration corpcor dplyr graphicalVAR lme4 MplusAutomation mvtnorm plyr qgraph rlang]; }; mlapi = derive2 { name="mlapi"; version="0.1.0"; sha256="023vk5bp8cjcq88sapkl87kdxr92bay1dyxl6xirnyj699pyj51k"; depends=[Matrix R6]; }; mlbench = derive2 { name="mlbench"; version="2.1-3"; sha256="157iqsld0wj8g8cbs7nh6p2x6kasmkhs3078hsmqac946gk2pydi"; depends=[]; }; @@ -12508,8 +12687,7 @@ in with self; { mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; }; 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="1.22.0"; sha256="1gv5y3ns7r4w4rg7vabrxwf67sc91g793ng0kjffxfdzfsgpdf27"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; }; - mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; }; + mlflow = derive2 { name="mlflow"; version="1.24.0"; sha256="0yqz0zlm2plz0i2p1zb3jaz4v8slr1p4jbk96cj9b5f6jsrvdkr2"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr yaml zeallot]; }; mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; }; mlmRev = derive2 { name="mlmRev"; version="1.0-8"; sha256="0ln4nazhc1prnlmvhfzhx268vx3klb0xnz1nsiwh0pwyskskyzym"; depends=[lme4]; }; mlma = derive2 { name="mlma"; version="6.1-1"; sha256="1z3v00g7ji0xkpz9ri4li3r7s8g2rcp2pc1p060cwsaidizs38dr"; depends=[abind car coxme gplots lme4 survival]; }; @@ -12517,39 +12695,40 @@ in with self; { mlmi = derive2 { name="mlmi"; version="1.1.1"; sha256="0ksx5qih54ww983ycs08hhr50ms2c2k6pk07mrcwdgli7irzc2cc"; 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=[]; }; + mlmts = derive2 { name="mlmts"; version="1.0.0"; sha256="0vgrwcbhj4a3vlf9bddzfnicc6bsq0q2ryilq7kdv4yn58d5ggxx"; depends=[AID caret ClusterR complexplus DescTools dtw e1071 evolqg fda_usc forecast freqdom geigen ggplot2 MASS Matrix MTS multiwave pracma pspline psych quantspec 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-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; }; mlpack = derive2 { name="mlpack"; version="3.4.2.1"; sha256="0fqpajcmqn9rijzjg7qj0zd2lik4xmhp5dmhbm3mdc9ssdg0axbr"; depends=[BH Rcpp RcppArmadillo RcppEnsmallen]; }; - mlquantify = derive2 { name="mlquantify"; version="0.1.5"; sha256="00fxsg5p1fv1x102gz4541swinbc3c592qlfp123hy25h4bgdarj"; depends=[caret randomForest]; }; + mlquantify = derive2 { name="mlquantify"; version="0.2.0"; sha256="1fpwvix0f4bmqb1y1b6wryndqp6j24dwsspbfx1zrnhzwj1v4i9i"; depends=[caret FNN randomForest]; }; mlr = derive2 { name="mlr"; version="2.19.0"; sha256="04v1br59ykzhzaiybjyyknbrc7ai5nl5l106b7482r49afscjj8i"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; - mlr3 = derive2 { name="mlr3"; version="0.13.0"; sha256="1729wbdp62cjjk775qxrahyskp191s9qqnmqbxncfjrpdxphxk34"; depends=[backports checkmate data_table future future_apply lgr mlbench mlr3measures mlr3misc palmerpenguins paradox parallelly R6 uuid]; }; + mlr3 = derive2 { name="mlr3"; version="0.13.3"; sha256="010kl51zsgpc0qv63g1fg9kiw9m0wzqskcr14f1j8b9zi1lwi0bf"; depends=[backports checkmate data_table evaluate future future_apply lgr mlbench mlr3measures mlr3misc palmerpenguins paradox parallelly R6 uuid]; }; mlr3benchmark = derive2 { name="mlr3benchmark"; version="0.1.3"; sha256="0j56l8yi1c0sa3fsychrvv42rpip2d300yccps0bj636c5r7na64"; depends=[checkmate data_table ggplot2 mlr3misc R6]; }; mlr3cluster = derive2 { name="mlr3cluster"; version="0.1.2"; sha256="15sbxpp3lawh30dh3hznig12xp68p83p4rz6si6b6jjddcgsw3rq"; depends=[backports checkmate clue clusterCrit data_table mlr3 mlr3misc paradox R6]; }; mlr3data = derive2 { name="mlr3data"; version="0.5.0"; sha256="1bck1rsnp4a9bkzyjrdxn1n12lkgkj0gwiwxrf9maj0l8x3kfpyw"; depends=[]; }; mlr3db = derive2 { name="mlr3db"; version="0.4.2"; sha256="17gahnzhraixxxmyinsh1pnrsfqy5kznw5ynfcwyrzpbinx4drih"; depends=[backports checkmate data_table mlr3 mlr3misc R6]; }; - mlr3filters = derive2 { name="mlr3filters"; version="0.4.2"; sha256="1xlyj7ai230pmcqgyj2zkhqjw819fy88b3ismc4hnq7gwkp0z360"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; }; - mlr3fselect = derive2 { name="mlr3fselect"; version="0.6.0"; sha256="1xzwzxffa4lwdmpqrg05vgj4pfr3rph5zq4123ssjn5b5396shiz"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc mlr3pipelines paradox R6]; }; - mlr3hyperband = derive2 { name="mlr3hyperband"; version="0.2.0"; sha256="0jdgmnxq1f9h7zlhdrafs21r80216lwfgd450swm7p4ibnd93fy4"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc mlr3tuning paradox R6]; }; - mlr3learners = derive2 { name="mlr3learners"; version="0.5.1"; sha256="1yc3mrk1b9h1k342wnw7sm4zmcw7w31l5ybh558g88f5hmibdl98"; depends=[checkmate data_table mlr3 mlr3misc paradox R6]; }; - mlr3measures = derive2 { name="mlr3measures"; version="0.4.0"; sha256="1qlqfan5akz42zwkcz3ncln6rd9c302dy4cyp7nx0jcafr5i459f"; depends=[checkmate PRROC]; }; - mlr3misc = derive2 { name="mlr3misc"; version="0.9.5"; sha256="1ax1mvnm8xjcskq12x63jkal766v1zwilpgrkdv6yawd7yrww4q9"; depends=[backports checkmate data_table digest R6]; }; + mlr3filters = derive2 { name="mlr3filters"; version="0.5.0"; sha256="14qq42rj8r6304yb54bs4fjld202zqf2lwd0vrz8ak6sn6jn7dbs"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; }; + mlr3fselect = derive2 { name="mlr3fselect"; version="0.6.1"; sha256="064rc35ij833pwcwg0xx600j8vbv762irr4cld7x356ijprd51ys"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc mlr3pipelines paradox R6]; }; + mlr3hyperband = derive2 { name="mlr3hyperband"; version="0.4.0"; sha256="0r7wm6s1k5jsx18f625970vxj7mccla5hxwnxhn6m8w5fic2kaa3"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc mlr3tuning paradox R6]; }; + mlr3learners = derive2 { name="mlr3learners"; version="0.5.2"; sha256="1d9hcrnj622ynrzg0ii0fkhz2n66ip46yln21jq1pwpwkqwqzv35"; depends=[checkmate data_table mlr3 mlr3misc paradox R6]; }; + mlr3measures = derive2 { name="mlr3measures"; version="0.4.1"; sha256="1kbw3xd7c9x65v9zzs8i5skmrvl0mf2wsbyssmiif0lvrbzfhcmb"; depends=[checkmate PRROC]; }; + mlr3misc = derive2 { name="mlr3misc"; version="0.10.0"; sha256="1wnzyij1x67smkb3gjb9gpp7iy5andfl0s1c78xx4wylhycc6m11"; depends=[backports checkmate data_table digest R6]; }; mlr3oml = derive2 { name="mlr3oml"; version="0.5.0"; sha256="1w4hjzzmy968mzgyg6ybcpq09n9zkhiwi2ccm41rvwaysl27rgfd"; depends=[backports checkmate curl data_table jsonlite lgr mlr3 mlr3misc R6 stringi]; }; mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.4.0"; sha256="0913f67c1r9bi68gxh1prsp0vch21bl6plahnvjrlbq8rrs1sr6p"; depends=[backports checkmate data_table digest lgr mlr3 mlr3misc paradox R6 withr]; }; - mlr3proba = derive2 { name="mlr3proba"; version="0.4.2"; sha256="01k49spc52i8bnwi61b1knw0xnll4hgd489pswfdm7367yskhb2r"; depends=[checkmate data_table distr6 mlr3 mlr3misc paradox R6 Rcpp survival]; }; + mlr3proba = derive2 { name="mlr3proba"; version="0.4.4"; sha256="03ypd6mvqapgisb75y619v5pqdbpx3s68q5vdffp4nzpj2wzvnmi"; depends=[checkmate data_table distr6 mlr3 mlr3misc paradox R6 Rcpp survival]; }; 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]; }; - mlr3spatial = derive2 { name="mlr3spatial"; version="0.1.0"; sha256="14wbdgad7ajmwg7gz91gpdd5wvvrxmkzsk40vgfgbybmffz7zafb"; depends=[checkmate data_table lgr mlr3 mlr3misc R6 terra]; }; - mlr3spatiotempcv = derive2 { name="mlr3spatiotempcv"; version="1.0.0"; sha256="0y04w96xk3m786aamqv9p91gqqyi19dc0shgkwlba32lkd5rqj0w"; depends=[checkmate data_table ggplot2 mlr3 mlr3misc paradox R6]; }; - mlr3tuning = derive2 { name="mlr3tuning"; version="0.9.0"; sha256="0i428kdbak81j1wlwmdf9y40hqi63azhyny802ms2z04wl8lwnvs"; depends=[bbotk checkmate data_table digest lgr mlr3 mlr3misc paradox R6]; }; - mlr3tuningspaces = derive2 { name="mlr3tuningspaces"; version="0.1.0"; sha256="0s2l45jlmhhz5sm6k4b8245xa6qp2val5k93kamd1l24yrlw7f7d"; depends=[checkmate data_table mlr3 mlr3misc mlr3tuning paradox R6]; }; - mlr3verse = derive2 { name="mlr3verse"; version="0.2.2"; sha256="1rgvhxjqxdrdhbslfxcli4mlafgvswc164yzv7rms60asvq1sndw"; depends=[bbotk data_table mlr3 mlr3cluster mlr3data mlr3filters mlr3fselect mlr3learners mlr3misc mlr3pipelines mlr3proba mlr3tuning mlr3viz paradox]; }; + mlr3spatial = derive2 { name="mlr3spatial"; version="0.1.2"; sha256="1iwbrr9bmwk3bdf7qycn8kpfyqb6n8cracrjj2cafb3xj2r5vimn"; depends=[checkmate data_table lgr mlr3 mlr3misc R6 terra]; }; + mlr3spatiotempcv = derive2 { name="mlr3spatiotempcv"; version="1.0.1"; sha256="1fws2jqjbjkbcww1nkl6pvj1gzwb3b52q8fykwf7mivgqf93ipzf"; depends=[checkmate data_table ggplot2 mlr3 mlr3misc paradox R6]; }; + mlr3tuning = derive2 { name="mlr3tuning"; version="0.12.1"; sha256="0qly6bsfazqcf0a7c2a6k3wghczm8v1fxw9pxa76gpw51x2j2ld0"; depends=[bbotk checkmate data_table lgr mlr3 mlr3misc paradox R6]; }; + mlr3tuningspaces = derive2 { name="mlr3tuningspaces"; version="0.1.1"; sha256="14hsm00n3nk7x6521kccakkj0hpmw3c3yjl7dh6hjhggg9p6xkz9"; depends=[checkmate data_table mlr3 mlr3misc mlr3tuning paradox R6]; }; + mlr3verse = derive2 { name="mlr3verse"; version="0.2.4"; sha256="02bmdvkh76qzimkrkaqkmjxpzx1sds3wkawp8d62a3dqd5225f9s"; depends=[bbotk data_table mlr3 mlr3cluster mlr3data mlr3filters mlr3fselect mlr3hyperband mlr3learners mlr3misc mlr3pipelines mlr3proba mlr3tuning mlr3tuningspaces mlr3viz paradox]; }; mlr3viz = derive2 { name="mlr3viz"; version="0.5.7"; sha256="1agl6s6i9l7mk8mrvmnz7csqsc77dwjnymlrqcy5vxddr2nfc47l"; depends=[checkmate data_table ggplot2 mlr3misc]; }; mlrCPO = derive2 { name="mlrCPO"; version="0.3.7-3"; sha256="0vq163ca446l2sb3jbn8wmvj26zsrpz52b1w7d8xgb0jjf2jhp91"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; }; mlrMBO = derive2 { name="mlrMBO"; version="1.1.5"; sha256="1f2ryd0mrlnnwxgwiria2sxqkb09kskfqjzsh32cbxh6ml4d3fbs"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; }; mlrintermbo = derive2 { name="mlrintermbo"; version="0.5.0"; sha256="1nyaqf6vkckdh7jb27iwv5dnvrh4bp0kkc5jzbqkyi8af11phg1l"; depends=[backports bbotk callr checkmate data_table lhs mlr3misc mlr3tuning paradox R6]; }; 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.3-2"; sha256="13b4zkwwwvvqrsixamafv7fcfzvika4pz11rgxfckaasav1fycjr"; depends=[alabama basefun BB coneproj Matrix nloptr numDeriv sandwich survival variables]; }; - mlt_docreg = derive2 { name="mlt.docreg"; version="1.1-2"; sha256="1qrgz483q3msyrrpf2ci0czxxpxjr4syqbqvf99ysi2g86042v2k"; depends=[eha flexsurv lattice mlt multcomp np numDeriv survival truncreg]; }; + mlt = derive2 { name="mlt"; version="1.4-0"; sha256="1xb3rmps998sfzlkkrk6k0q1b7gj01q1p4hr5anax66xhcj0529p"; depends=[alabama basefun BB coneproj Matrix numDeriv sandwich survival variables]; }; + mlt_docreg = derive2 { name="mlt.docreg"; version="1.1-3"; sha256="1ndx570ds8xagcp8d8adx64c2pv71kx3f7d640v638afjlcfc7h9"; depends=[eha flexsurv lattice mlt multcomp np 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]; }; @@ -12585,9 +12764,8 @@ in with self; { 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]; }; - mobsim = derive2 { name="mobsim"; version="0.2.0"; sha256="0an8j5kj0cs1bjz9kwzwc54hm0zaiz5rsaw78ihldw0mx5n175gn"; depends=[Rcpp sads vegan]; }; moc = derive2 { name="moc"; version="2.0"; sha256="0fgp8dg9qf7aw1qawmszlxs4bcccqmd87y4kkzdqggm807c2k5gh"; depends=[]; }; - mockery = derive2 { name="mockery"; version="0.4.2"; sha256="16zayzi2qdmiy513hvlci9f4p8jwry24006yfzrgmrvf6sf293lq"; depends=[testthat]; }; + mockery = derive2 { name="mockery"; version="0.4.3"; sha256="0sj77m9vgn4bzb8c8nq93xb9lm8ih8rcb7sfccripraibibg3jcz"; depends=[testthat]; }; mockr = derive2 { name="mockr"; version="0.1"; sha256="0340v6189ivlzzriwk7yhf3v2k651x05fd1xrqfxxjgwhysaqj6z"; depends=[lazyeval]; }; mockthat = derive2 { name="mockthat"; version="0.2.6"; sha256="12srlafk3ykzhrw65s1qzw3l566j285hi28rzrcpbgyr12720raa"; depends=[]; }; mod = derive2 { name="mod"; version="0.1.3"; sha256="0z5a6ps2m0cbw0n9kn44767m5jnbf1dl077i2p40fipv8xali9fb"; depends=[]; }; @@ -12597,7 +12775,6 @@ in with self; { modQR = derive2 { name="modQR"; version="0.1.2"; sha256="0x4405gaxpmmy6a0r8s7sxdi2lnc76f2i174h7xqlrwqy13xyfvv"; 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]; }; - modcmfitr = derive2 { name="modcmfitr"; version="0.1.0"; sha256="1d6fi7pc10w2a97h1prhkg5cvzmxjp11c5bwrz90zry0m8anwjyh"; depends=[gtools nloptr]; }; modeLLtest = derive2 { name="modeLLtest"; version="1.0.3"; sha256="0hf7y78yp3jb0af9df3df6n1z66y2iyhhmgyfz12c4iadly0v6x1"; 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=[]; }; @@ -12605,8 +12782,8 @@ in with self; { 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.1"; sha256="0afws8vd7qj9m2ikj0ph1vp2rgr3v979hp3qjapgmln1cwglchlw"; depends=[]; }; modelROC = derive2 { name="modelROC"; version="1.0"; sha256="0iyx7c98ym7dy6pfssj7474h9wjpzjwy0fyc5bnqyi1lmjgd508k"; depends=[do ggplot2 ROCit survivalROC tmcn]; }; - modelStudio = derive2 { name="modelStudio"; version="3.0.0"; sha256="0gs9r5502ks44ks1phfj8lq13rh6pl8rc2d2fcxadfpvm7ym7x5r"; depends=[DALEX digest iBreakDown ingredients jsonlite progress r2d3]; }; - modelbased = derive2 { name="modelbased"; version="0.7.0"; sha256="0jq9zb2avs7qwins32rpdymndwh4kpsdjy5gbjwacjh4ksxks3fz"; depends=[bayestestR effectsize insight parameters performance]; }; + modelStudio = derive2 { name="modelStudio"; version="3.1.0"; sha256="0hd3x5jnj3s4b0hahxzjxfclhr92adf1xhs7hgc1k8bm9ngnqqxm"; depends=[DALEX digest iBreakDown ingredients jsonlite progress r2d3]; }; + modelbased = derive2 { name="modelbased"; version="0.7.2"; sha256="1akwp565ab26w32v3s1w1xi3baw5mrp46jjjv347w6nbbb7c1w4f"; depends=[bayestestR datawizard effectsize insight parameters performance]; }; modelc = derive2 { name="modelc"; version="1.0.0.0"; sha256="0xz1zgv5yyvq0yfnhm1kvb4wvlyn4ccd0lkwji55vq8hndvjvk98"; depends=[]; }; modeldata = derive2 { name="modeldata"; version="0.1.1"; sha256="0jgrwf9k8p9j3ywg3yv2wzwsx3snlwm3dd9vfqwhlr7j63jg3cm4"; depends=[]; }; modeldb = derive2 { name="modeldb"; version="0.2.2"; sha256="14s8xh05qxv414xcnww1b3s0jqwnjb3l1dqf7q1qbw33ilwcmsfb"; depends=[dplyr ggplot2 progress purrr rlang tibble tidypredict]; }; @@ -12615,9 +12792,9 @@ in with self; { 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.8"; sha256="1i31nff7bqibk6r4hhd4j1vzwbyaf8493v0bjaagn36njmysfnw2"; depends=[broom magrittr purrr rlang tibble tidyr tidyselect vctrs]; }; - modelsummary = derive2 { name="modelsummary"; version="0.9.4"; sha256="0dpzhvkcbc52ykxn7ccb6aapl65p7zzs82bg585g4clakldb9q6c"; depends=[broom checkmate generics glue insight kableExtra parameters performance rlang tables]; }; + modelsummary = derive2 { name="modelsummary"; version="0.9.6"; sha256="1nzahrqqfkc7zbksmlpyvnp7izpcyvck7nhg3nmr6q5paxm1g0f6"; depends=[broom checkmate generics glue insight kableExtra parameters performance rlang tables]; }; modeltests = derive2 { name="modeltests"; version="0.1.4"; sha256="0ii5sh8yz5yvf0gq41ia55dvbg8x9042x82j52ck6haxa0w8zpfy"; depends=[dplyr generics purrr testthat tibble]; }; - modeltime = derive2 { name="modeltime"; version="1.1.0"; sha256="005jj1n6z343h9wspli7hxjmy2zxjkl7rkzc0bapl76j44rv022r"; depends=[cli dials doParallel dplyr forcats foreach forecast ggplot2 glue gt hardhat janitor magrittr parsnip plotly prophet purrr reactable rlang scales StanHeaders stringr tibble tidyr timetk workflows xgboost yardstick]; }; + modeltime = derive2 { name="modeltime"; version="1.1.1"; sha256="1m888hbnwvxmvbf4mk219vhiq2fglc6545j26hc1m73bfaxg73dv"; depends=[cli dials doParallel dplyr forcats foreach forecast ggplot2 glue gt hardhat janitor magrittr parsnip plotly prophet purrr reactable rlang scales StanHeaders stringr tibble tidyr timetk workflows xgboost yardstick]; }; modeltime_ensemble = derive2 { name="modeltime.ensemble"; version="1.0.0"; sha256="01mi6pkjn97c77kyddz6xsyz11kchkdqy6672p8r96h0wy7530a1"; 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_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]; }; 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]; }; @@ -12625,7 +12802,7 @@ in with self; { modeltools = derive2 { name="modeltools"; version="0.2-23"; sha256="1vqh69256h344sbj5affm0kmc77dakrxp6442xfdnfd0y5d8sgkb"; depends=[]; }; modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; }; modernVA = derive2 { name="modernVA"; version="0.1.1"; sha256="1kjfgr7fcf0w27gx1wwapxcw5wisfv75mq9qc5hjnaivmsnkwsv3"; depends=[]; }; - moderndive = derive2 { name="moderndive"; version="0.5.2"; sha256="0s9ja6akkzq71hy62zgcxasazzsf7yrahyrrzy1lh0rkxis53xkr"; depends=[broom dplyr formula_tools ggplot2 glue infer janitor knitr magrittr rlang stringr tibble]; }; + moderndive = derive2 { name="moderndive"; version="0.5.3"; sha256="0j2wd5ydsdcr2v2qqs6h8m5jgmyv8j77pls0wr94pgp44zcprlw6"; 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]; }; modesto = derive2 { name="modesto"; version="0.1.3"; sha256="1121zlbsp71rca7bqrhl2yshrz99iw48aldg506vcfcmym8hx7dy"; depends=[markovchain Rcpp]; }; modgetxl = derive2 { name="modgetxl"; version="0.4"; sha256="0j9fmhy3wra9qr8753a495ligfz5fwgydv3ixlfzx3sgbq882hic"; depends=[DT readxl shiny shinydashboard]; }; @@ -12660,16 +12837,17 @@ in with self; { monitoR = derive2 { name="monitoR"; version="1.0.7"; sha256="1h1g0m1j13mz37xxwck4s7a0bfqvi0nrzfw60j7bkzaah8zxcc9n"; depends=[tuneR]; }; monmlp = derive2 { name="monmlp"; version="1.1.5"; sha256="19cx60csm8mnf6ksg64vlhi8wi1c7bmv9l55y9zmaljblr0kmzxf"; depends=[optimx]; }; 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.1"; sha256="13261k81xpjvbjny938y124r2cqn36c93s177gbg1m0c8k4jlb4i"; depends=[dplyr Hmisc]; }; + monobin = derive2 { name="monobin"; version="0.2.2"; sha256="1l3nc1sw206wdxswrz1l93zh0p9bi8xzipnszrab4jbcydn1f6qd"; 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.0"; sha256="1zm5d4ipjlkvlhcqnq2cl5amv85n3iflb34915n12rjs68hbcjmd"; depends=[scales]; }; monographaR = derive2 { name="monographaR"; version="1.2.1"; sha256="09fkcw13h7dx7j5vyp48fk6yzv9n64568zf2zvmm2c008jw3gkbm"; depends=[circular maptools png raster rmarkdown sp]; }; monomvn = derive2 { name="monomvn"; version="1.9-13"; sha256="1hm5qf28bh0q7f4zcjqx1qxw3l8hzkx349c1y3nwyfg7436vff6a"; depends=[lars MASS mvtnorm pls quadprog]; }; + monoreg = derive2 { name="monoreg"; version="2.0"; sha256="059y5rj74b2rgkqmqqa4v74ih6knydj3kb2hr7hz4xj36cg01x54"; depends=[]; }; monotone = derive2 { name="monotone"; version="0.1.0"; sha256="1091xqa88gdp64b65610mfcknyz29kb980iqbvwnmlk12csszr1w"; 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="0.3.2"; sha256="0c2p4p6payaq0r2mcw1kxhz5hg9aklbfny6j3ssjk0b05ngca5dv"; depends=[anytime cli config DBI dplyr ggplot2 ggwordcloud glue here lifecycle rlang RMariaDB RSQLite scales stringr tidytext]; }; - moonBook = derive2 { name="moonBook"; version="0.2.4"; sha256="0z78pzc8sr2g19xjdd9cmai4iqyifmh79gj8x40ddww6a27dalry"; depends=[magrittr nortest sjmisc stringr survival ztable]; }; + moonBook = derive2 { name="moonBook"; version="0.3.1"; sha256="1ml4vvm0mvrprpyi0l50aw38brx18bk2qny4gybmkvlbakalz9bx"; depends=[crayon magrittr nortest sjmisc stringr survival]; }; mopac = derive2 { name="mopac"; version="0.1.0"; sha256="07ljy6rwicyrv20l7zyxq2lb7qqfpl5mpv834m2n5c4air7sy23m"; depends=[]; }; mopsocd = derive2 { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; }; moreparty = derive2 { name="moreparty"; version="0.2.1"; sha256="0p30skq5x3rz3xbp2izq44v5c0byw7cw2han6bardah7xniz3w2d"; depends=[foreach ggplot2 iml MASS measures party partykit pdp plyr rlang varImp vip]; }; @@ -12695,7 +12873,7 @@ in with self; { motifr = derive2 { name="motifr"; version="1.0.0"; sha256="01synariq39mzhx12jbcpwn982piakakl97sgs33xa8xrbwzcxgm"; depends=[dplyr ggplot2 ggraph igraph intergraph network purrr RColorBrewer reshape2 reticulate rlang scales tibble tidygraph]; }; motmot = derive2 { name="motmot"; version="2.1.3"; sha256="09qsyc4ifdl316kjqqkarmflpjcd0ivkhx5fzi3502anj6dxpjnq"; depends=[ape caper coda ks mvtnorm Rcpp]; }; motoRneuron = derive2 { name="motoRneuron"; version="1.0.0"; sha256="1hdsf4c1v5hfaqpi5y1v60zqq5fdmlqdvzpsq77diclp9vzdshja"; depends=[dygraphs ggplot2]; }; - moult = derive2 { name="moult"; version="2.2.0"; sha256="15r5s5ghqip28g12bwcn407lhgfv6408gndw4nvm3nhi8z0hwvrd"; depends=[Formula Matrix]; }; + moult = derive2 { name="moult"; version="2.2.1"; sha256="1aarny5p0rpmzibfsz27allr6xc6267ylc3wvpk7pzch6yj759zm"; depends=[Formula Matrix]; }; mountainplot = derive2 { name="mountainplot"; version="1.3"; sha256="1mgvcv58pb3ximrf7gq1ii53gmjrn1qajayjlx8qqzsvjkn3myin"; depends=[lattice]; }; mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; }; 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]; }; @@ -12704,11 +12882,10 @@ in with self; { moveHMM = derive2 { name="moveHMM"; version="1.7"; sha256="031msh427hgjyr37imalr7smd79yqscw9xq5rjrixxc2w5qly9jj"; depends=[boot CircStats geosphere ggmap ggplot2 MASS numDeriv Rcpp RcppArmadillo sp]; }; moveVis = derive2 { name="moveVis"; version="0.10.5"; sha256="1lj22yr6v3vg795r72gkbhyabycppxbjsaldqiqgckhkdfh3lziw"; depends=[av cowplot curl ggplot2 gifski lubridate lwgeom magick magrittr move pbapply raster sf slippymath]; }; moveWindSpeed = derive2 { name="moveWindSpeed"; version="0.2.3"; sha256="14a2iymn4j831xlh42z5qxmhnh7xpp5bxasgpkhnb3v0b5ldyilh"; depends=[move Rcpp]; }; - movecost = derive2 { name="movecost"; version="1.4"; sha256="1fmfzrgk7a5fcqp61a8755fyasn217ixkwmpmjkpjfk77m1wdali"; depends=[chron elevatr gdistance maptools raster rgdal rgeos sp spatstat_geom]; }; + movecost = derive2 { name="movecost"; version="1.5"; sha256="0f80gpzghxnq80sl17zzpi3xj4gxgfiyx5jh1j01bngq1iy7m0r1"; depends=[chron elevatr gdistance maptools raster rgdal rgeos sp spatstat_geom]; }; mozzie = derive2 { name="mozzie"; version="0.1.0"; sha256="09dwrv4r0hi19gzi1vpif3q4wlbny9h22430g1hhv0wkqs86mhmw"; depends=[]; }; mp = derive2 { name="mp"; version="0.4.1"; sha256="0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq"; depends=[Rcpp RcppArmadillo]; }; - mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; }; - mpath = derive2 { name="mpath"; version="0.4-2.20"; sha256="08ph3vzrd2k2njd1gl4pxlmrnn2sxrs60ah8cb0m6f173lcapgwm"; depends=[bst doParallel foreach glmnet MASS numDeriv pamr pscl WeightSVM]; }; + mpath = derive2 { name="mpath"; version="0.4-2.22"; sha256="0i4vyli3sr1lzrj0ayzsq55cpsv0xrwn216lgzmfyjr5n8r9aw7r"; depends=[bst doParallel foreach glmnet MASS numDeriv pamr pscl WeightSVM]; }; mpbart = derive2 { name="mpbart"; version="0.2"; sha256="1145n0lxmm0kjm2lc358d79hqws48crj17pjvmchl1pbfd7zi4r8"; depends=[bayesm cvTools mlbench mlogit]; }; mpcmp = derive2 { name="mpcmp"; version="0.3.6"; sha256="1jzrmaxm133zy4wi5pzjlj6gnh89nx4j69dnwm4s4y3i7ixch908"; depends=[dplyr generics ggplot2 ggpubr purrr Rcpp rlang stringr tibble]; }; mpcv = derive2 { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; }; @@ -12720,6 +12897,7 @@ in with self; { mpoly = derive2 { name="mpoly"; version="1.1.1"; sha256="10is69ks22ka1cqw3xk0fvy4z3b2drm8lanqwj178qrzj7ipf7i0"; depends=[ggplot2 orthopolynom partitions plyr polynom stringi stringr tidyr]; }; mppR = derive2 { name="mppR"; version="1.3.0"; sha256="12fjb8q3yhhpsdb0wiv6bamw6a4igv2as9vqq6ac1gab454b9fxn"; depends=[ggplot2 igraph qtl]; }; mppa = derive2 { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; }; + mpr = derive2 { name="mpr"; version="1.0.6"; sha256="155cjdcyvxnmqxx3zg2dvzk7av2jcn67lj2vdpd2ahbznax76ghk"; depends=[survival]; }; mpspline2 = derive2 { name="mpspline2"; version="0.1.3"; sha256="0yadvnfsj1c9mm28v6501510dhcg77nzcvky32zmhaa21gwszcij"; depends=[]; }; mpt = derive2 { name="mpt"; version="0.7-0"; sha256="1nwc3szl5g5cd39z7ydr91bvvg58gb7r5zbjbylp93yx3pr7bsjh"; depends=[]; }; mptools = derive2 { name="mptools"; version="1.0.1"; sha256="1g4fbfwxv9hir0jn22nh9854blgkh0b5jan3lv0888izj4isa1hc"; depends=[animation lattice latticeExtra raster rasterVis sp viridis zoo]; }; @@ -12729,18 +12907,18 @@ in with self; { mra = derive2 { name="mra"; version="2.16.11"; sha256="0268msdy4cs2ifpagmwiabi6aav54ckn214ai18aqv2h97hmixw0"; depends=[]; }; mratios = derive2 { name="mratios"; version="1.4.2"; sha256="18pi0dks0qmw0gv76yqm4gvxdqrcvr25j1vb8k4mkp5p35kzkzff"; depends=[multcomp mvtnorm survival survPresmooth]; }; mrbayes = derive2 { name="mrbayes"; version="0.5.1"; sha256="11n3d18di01vmwqs5a0i1h8839aammzbcavi1jk58bmrwb3l771j"; depends=[BH plyr Rcpp RcppEigen rstan rstantools StanHeaders]; }; - mrbin = derive2 { name="mrbin"; version="1.6.1"; sha256="09rqvd9qakn2868f2l6f50gg0y8vwpp2pgkwp006jnk06bylrdfh"; depends=[]; }; + mrbin = derive2 { name="mrbin"; version="1.6.3"; sha256="0w9m1mmvp6m3zhkxdr7fj96z143kq0qnc6kpg2ixn1sl4nzdfx0c"; depends=[]; }; mrbsizeR = derive2 { name="mrbsizeR"; version="1.2.1.1"; sha256="0v06sd5sh7ghlr8lgrv6l4glmv7chj3951pw4ssxrly4hz2rh6i0"; depends=[fields maps Rcpp]; }; mrds = derive2 { name="mrds"; version="2.2.5"; sha256="1659nzdykl4mgfgyniwnwrn1a0m6wiz7c02ygwpm90bnz8f4g5y2"; depends=[mgcv numDeriv optimx Rsolnp]; }; mreg = derive2 { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; }; mregions = derive2 { name="mregions"; version="0.1.6"; sha256="0ix77hqcllhcpldchlnvciiflm6ysylynnnqvczpf8vx7gwa3lrk"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; }; - mrf = derive2 { name="mrf"; version="0.1.5"; sha256="169sw6wvxdy6j9b1vcng6dsxvq1h23pyzp0dnry3yp06yjz76wq6"; depends=[DEoptim forecast limSolve monmlp nnfor]; }; - mrf2d = derive2 { name="mrf2d"; version="0.5"; sha256="0vp5rcmrsyfsnh5rmv130081yzrxf7g0pdvydrlvfabsx9his6pl"; depends=[dplyr ggplot2 Rcpp RcppArmadillo Rdpack tidyr]; }; + 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.13"; sha256="177331j30n707mcl1ghxjc53xjs9qsal15kccc71b0rabkjdq2wv"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; mrfse = derive2 { name="mrfse"; version="0.2"; sha256="1dx21m54jsprlngj20q1bgvbw1bbm0sm8i01xanj68bx796ng14j"; depends=[]; }; - mrgsim_parallel = derive2 { name="mrgsim.parallel"; version="0.1.1"; sha256="0xsq7538z8rw4b5q3bcrspgfjw965yr5v7f8k3za04ksx775nfy2"; depends=[dplyr future_apply mrgsolve]; }; + mrgsim_parallel = derive2 { name="mrgsim.parallel"; version="0.2.0"; sha256="1qdaaa4zklsn9bwlkv654y5m2r9hj6rviv3ag5ibqk0d1h1l9kzk"; 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="0.11.1"; sha256="1hgrbj92m610a4kblvd1dbxgfc2cckfpjxp3xir5764gii6dvcd7"; depends=[BH dplyr glue lifecycle magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; }; + mrgsolve = derive2 { name="mrgsolve"; version="1.0.0"; sha256="0k8cac0sslzs3d5nl55713dxbv3009fvzssyz7mli7s5hn0yyx3c"; 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-2"; sha256="07b1b2k1ka43ikj2mhwnazw3ig7w10bf759fimxpksvk5k6wanx2"; depends=[lattice misc3d oro_nifti]; }; mro = derive2 { name="mro"; version="0.1.1"; sha256="00gc2hd8q5hb2xrswclcqqw1gxl83zmpma6bhsggg3kppsw1dpjv"; depends=[MASS matrixcalc]; }; @@ -12779,16 +12957,17 @@ in with self; { 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]; }; - mssm = derive2 { name="mssm"; version="0.1.5"; sha256="0mwcbqndaczxxg9pvzpgd6j5v73pp5cplah4ss48h7sh984nbjwx"; depends=[nloptr Rcpp RcppArmadillo testthat]; }; + mssm = derive2 { name="mssm"; version="0.1.6"; sha256="08bgfli7kvvsfpvlvlcdxp301gy6wggidlgllarxjwi06v9c8as5"; depends=[nloptr Rcpp RcppArmadillo testthat]; }; mstDIF = derive2 { name="mstDIF"; version="0.1.6"; sha256="0zhslqzvvk8wbgqvcipmzhy94awwfmkv5yfl812m8wmwgpkcqzpb"; depends=[eRm expm Matrix mirt PP scDIFtest]; }; mstR = derive2 { name="mstR"; version="1.2"; sha256="0v8cv9pswkvw0lva6jx5vavsb20dawgq83gn4rgydyhvigcl5szd"; depends=[]; }; mstate = derive2 { name="mstate"; version="0.3.2"; sha256="054dzrd5b0xjjjl7862q3aq1jwgrxbkqz7zpvbdirqsld3zksirw"; depends=[data_table lattice RColorBrewer rlang survival viridisLite]; }; + mstclustering = derive2 { name="mstclustering"; version="1.0.0.0"; sha256="1m2hmjia3r5ph5zl2314kq8dmjggzvw3ad8cixjjd70hi8570fpw"; depends=[data_table reshape2]; }; mstherm = derive2 { name="mstherm"; version="0.4.7"; sha256="04jrp0w17svwmrvx356jmh04npbwhk9nvfy3r39vqr82yrvn6jip"; depends=[doParallel foreach nls2 plotrix RColorBrewer]; }; mstknnclust = derive2 { name="mstknnclust"; version="0.3.1"; sha256="0bg38gnaf2jjva8l2wk862ch2cpqvw7szvvvpb2bnz02fp795p3g"; depends=[igraph]; }; mstrio = derive2 { name="mstrio"; version="11.3.0.1"; sha256="1qjqxrgy2amm0ikfixkqjix3d6jzh1y3abnbzq41ibl5qiz8pjxy"; depends=[crul data_table httr jsonlite openssl R6 rstudioapi shiny shinyjs]; }; msu = derive2 { name="msu"; version="0.0.1"; sha256="1vhh9725dbywmzihnmsq1jircpn91r8227j2f76fvma9rwss90p7"; depends=[entropy]; }; - mt = derive2 { name="mt"; version="2.0-1.18"; sha256="11a01ji5vniz82y56wpdv5j10kfp9c982lhdl0d8xnqkw4xgw06b"; depends=[class e1071 ellipse lattice latticeExtra MASS pls randomForest]; }; - mtb = derive2 { name="mtb"; version="0.1.1"; sha256="1ncisrv738s0ddripji02pyykkb1h25z5dpn5asqgjp0qp5611qv"; depends=[ggplot2 htmltools labeling scales]; }; + mt = derive2 { name="mt"; version="2.0-1.19"; sha256="184lksilj5q1bhlwsh850gm2qzjcpyaa4gj20r5m1smmhdcdwd1d"; depends=[class e1071 ellipse lattice latticeExtra MASS pls randomForest]; }; + mtb = derive2 { name="mtb"; version="0.1.6"; sha256="1zqn9ng0axyhbdwp683hkqq19w0x18bf1lk2kxakmwgvpcs4h67d"; depends=[ggplot2 htmltools labeling scales]; }; mtconnectR = derive2 { name="mtconnectR"; version="1.2.1"; sha256="0hl46h535mjqwgrhmxlixhfsych3blzcynffp55nr1ynrra4dn06"; depends=[data_table dplyr dtw ggplot2 lubridate magrittr plyr proxy stringr tidyr XML]; }; mthapower = derive2 { name="mthapower"; version="0.1.1"; sha256="0g6dn0qn7z6qc1gbzspy1n7b803427bc9fv5yqk7j8i1is1p8h94"; depends=[]; }; mtk = derive2 { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[lhs rgl sensitivity stringr XML]; }; @@ -12822,6 +13001,7 @@ in with self; { multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; }; 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.1.0"; sha256="077qyqfbp2r5ah08biiswn4jg03h2jcvi0gij6h5wip16vr0d0yx"; depends=[gplots MASS]; }; multiband = derive2 { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; }; multibiplotGUI = derive2 { name="multibiplotGUI"; version="1.0"; sha256="0ig7r4p8mq594cjwclbqwjk8saqkvjqjbbnnxj1hc1sdj7qdlcpf"; depends=[cluster dendroextras Matrix rgl shapes tcltk2 tkrplot]; }; multiblock = derive2 { name="multiblock"; version="0.8.1"; sha256="1c7k5qkzh638xi07yknzjycsadkcnlrb6sdgq44nakna8ax4kdr2"; depends=[ade4 car FactoMineR geigen knitr lme4 MASS mixlm plotrix pls plsVarSel pracma progress r_jive Rcpp RcppEigen RegularizedSCA RGCCA RSpectra SSBtools]; }; @@ -12834,7 +13014,7 @@ in with self; { multicon = derive2 { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; }; multicool = derive2 { name="multicool"; version="0.1-12"; sha256="0djacq0irfqz4nlnx238kja73yvr1n5qybbfyl6bw1n6qgcjhza8"; depends=[Rcpp]; }; multicross = derive2 { name="multicross"; version="2.1.0"; sha256="17hk03wsms9ij6hp6dw77cvvngdb5i66is6pcl1q21pyp327zqi6"; depends=[crossmatch MASS Matrix nbpMatching]; }; - multid = derive2 { name="multid"; version="0.2.0"; sha256="1vkrrnj9dmgljxxy975pdisf8lwnn1bsfz5835pji2ivnrj0y66s"; depends=[dplyr glmnet pROC]; }; + multid = derive2 { name="multid"; version="0.4.0"; sha256="14vp8k1iwn0s97p877bwzc4ng12kdhcr1zs3w35aaypa5d2khsyx"; depends=[dplyr emmeans glmnet lavaan lme4 pROC]; }; multidplyr = derive2 { name="multidplyr"; version="0.1.1"; sha256="1cc8p9l6nn6n3dvivqyn8pwj0wn2vz40jcbb38zkg109a4c06jbb"; depends=[callr 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]; }; @@ -12844,22 +13024,23 @@ in with self; { multigraphr = derive2 { name="multigraphr"; version="0.1.0"; sha256="018kwpphwkpm07by7pvrwp5wvrasnpaxbs67pdrbfxzc139d15q9"; depends=[]; }; multigroup = derive2 { name="multigroup"; version="0.4.5"; sha256="1d3m2c3md9iiv1gfqfyik1xj3fsas85bmf2vbkaks8ljxa42f55k"; depends=[MASS]; }; multilaterals = derive2 { name="multilaterals"; version="1.0"; sha256="11zfdhn6qzqz0n31g23bn40wnfzkjndb753iiqvihirphzb74v5v"; depends=[ape igraph]; }; - multilevel = derive2 { name="multilevel"; version="2.6"; sha256="19zrvpq23dn69d7kai1rgw5b8ibmgybnbg6isliq0n8bv9jvrzia"; depends=[MASS nlme]; }; + 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]; }; - multimark = derive2 { name="multimark"; version="2.1.3"; sha256="13arvjxfnxq7dr5r8cqwxxkravwwf4dq5hq263ss353fdi2qv4i0"; depends=[Brobdingnag coda Matrix mvtnorm prodlim raster RMark sp statmod]; }; + multilinguer = derive2 { name="multilinguer"; version="0.2.2"; sha256="1i8c3sz6h42nca13ycjkmsmjbg8lj1xhkvyga97lp2wgkrrywpwb"; depends=[askpass rappdirs sys usethis]; }; + multimark = derive2 { name="multimark"; version="2.1.4"; sha256="1x194h1jzxm3va933vqqk0qdg7pgrc5hqwdd1bwh0sjavygwanqz"; depends=[Brobdingnag coda Matrix mvtnorm prodlim raster RMark sp statmod]; }; multimode = derive2 { name="multimode"; version="1.5"; sha256="0qxb67qss2pmid0wiwblqng5qmihqchdhbkyjklgj20pvbjz1wjm"; depends=[diptest ks rootSolve]; }; multimorbidity = derive2 { name="multimorbidity"; version="0.5.0"; sha256="1x4869pqckldx6g4zhawjbin03glkxzfszb4qiq7yy2xi444jkl0"; depends=[devtools dplyr lubridate magrittr rlang sqldf stringr tidyr tidyselect tidyverse]; }; multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; }; multinet = derive2 { name="multinet"; version="4.0.1"; sha256="0j4hdw47vf5rkd4vqr6bs5740h17kvw7208a434q0ms2vlmm40cg"; depends=[igraph RColorBrewer Rcpp]; }; multinets = derive2 { name="multinets"; version="0.2.2"; sha256="1i5jsq1xy0g0l5d1z3hz4gj6inj4rhd6lf2s5xzd5k8ccp5aba8c"; depends=[igraph Rcpp]; }; - multinma = derive2 { name="multinma"; version="0.3.0"; sha256="0841p1lg54cbyxca89y0rw6542bjrxhlvcjkp77vswcjsnx5ay4a"; depends=[bayesplot BH copula dplyr forcats ggdist ggplot2 ggraph glue igraph Matrix purrr randtoolbox Rcpp RcppEigen RcppParallel Rdpack rlang rstan rstantools StanHeaders stringr tibble tidyr truncdist]; }; + multinma = derive2 { name="multinma"; version="0.4.2"; sha256="128p2a20kcdkqv9zq4i9hiy9fyqasmrfz162yz00fmyxkp50g63a"; depends=[bayesplot BH copula dplyr forcats ggdist ggplot2 ggraph glue igraph Matrix purrr randtoolbox Rcpp RcppEigen RcppParallel Rdpack rlang rstan rstantools StanHeaders stringr tibble tidyr truncdist]; }; multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; }; - multinomineq = derive2 { name="multinomineq"; version="0.2.1"; sha256="09h5nccfcrnl78rdxwsw5cqirfq40a6x4dmpkibc475z3xndk2rm"; depends=[coda quadprog Rcpp RcppArmadillo RcppProgress RcppXPtrUtils Rglpk]; }; + multinomineq = derive2 { name="multinomineq"; version="0.2.3"; sha256="0hf3sv8gmdga7grina97wsya3d1cvb63h2j0sv6s10k9ccpv0ysn"; depends=[coda quadprog Rcpp RcppArmadillo RcppProgress RcppXPtrUtils Rglpk]; }; multipanelfigure = derive2 { name="multipanelfigure"; version="2.1.2"; sha256="0cm5bd7k0fx6d3gybcll6vvh14byanyk6dj4civqij7psa48iagc"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types ggplot2 gridGraphics gtable magick magrittr stringi]; }; multipleNCC = derive2 { name="multipleNCC"; version="1.2-2"; sha256="0bnc14l5b3x68qnwf3ma8wrclmp6n7fxsc0sbd7cfaayhp8dzcb1"; depends=[mgcv survival]; }; multiplestressR = derive2 { name="multiplestressR"; version="0.1.1"; sha256="167ch16bdlk4syjbgn1149q1np90w6299ph35p9npdh1zcynm95f"; depends=[ggplot2 patchwork viridis]; }; - multiplex = derive2 { name="multiplex"; version="2.9.6"; sha256="0dy34ijdk83gjmmwjwkdzpr0wzrcg4xpw5s08jv59af1asyrr3n7"; depends=[]; }; + multiplex = derive2 { name="multiplex"; version="2.9.8"; sha256="1rc5jj92s3dkkqp2aa833zn16g0h3nl4qk3vwqg5a08rqk5qyi87"; depends=[]; }; multipol = derive2 { name="multipol"; version="1.0-7"; sha256="1rkrg3kayxa05jayg8bk1mm3hcvi76570wqfja5953hd9j4krgha"; depends=[abind]; }; multirich = derive2 { name="multirich"; version="2.1.3"; sha256="1vv4jhhq46wp6znfv9c47q9z4smn1c560wnbp77qfhiix098wzfj"; depends=[]; }; multiridge = derive2 { name="multiridge"; version="1.9"; sha256="1z77gabrm8dpyp4fssh1rqw58y1fspp5ypv2xybwr7k3fbvyd1vg"; depends=[mgcv pROC risksetROC snowfall survival]; }; @@ -12869,7 +13050,7 @@ in with self; { multisom = derive2 { name="multisom"; version="1.3"; sha256="0msxmrj4iawxg4vf4r7kj26zalxz4di2w4nxgxiakiig4g4ggy9z"; depends=[class kohonen]; }; multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; }; multitaper = derive2 { name="multitaper"; version="1.0-15"; sha256="1gm3wr8xqpqiby7q1dr3zxim77v0bvvrqi0hlazf5g3gnkrp2zc3"; depends=[]; }; - multivar = derive2 { name="multivar"; version="0.0.2"; sha256="0ijv7zsznqsf8g6lgnaccfi76j04ycxd0zgjw5wbf03in5vxzlpc"; depends=[MASS Rcpp RcppArmadillo]; }; + multivar = derive2 { name="multivar"; version="1.0.0"; sha256="0lw7jisq7933za4y8hvalgzhvfm1ai50mhls5fvrjyk87f45y7cn"; depends=[ggplot2 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]; }; multiverse = derive2 { name="multiverse"; version="0.5.0"; sha256="1mffmcbc5l4753dj7h9h82gf76xbigrbb5lbwjr5ycpcyzcpsldk"; depends=[berryFunctions collections dplyr evaluate formatR knitr magrittr purrr R6 rlang rstudioapi tibble tidyr tidyselect]; }; @@ -12882,8 +13063,9 @@ in with self; { mumm = derive2 { name="mumm"; version="0.2.1"; sha256="1wjg2pqn2wb9hk9mqgpi3k26qwjnkmp4apx09lxcwrz35bbwhfzv"; depends=[lme4 Matrix Rcpp RcppEigen stringr TMB]; }; munfold = derive2 { name="munfold"; version="0.3.5"; sha256="17zizx9r0f8dxb7dkgn1nn0fp7ydy6r155p1zfz0v93jc26lc1hb"; depends=[MASS memisc]; }; munsell = derive2 { name="munsell"; version="0.5.0"; sha256="16g1fzisbpqb15yh3pqf3iia4csppva5dnv1z88x9dg263xskwyh"; depends=[colorspace]; }; - munsellinterpol = derive2 { name="munsellinterpol"; version="2.7-1"; sha256="13b8bac9z1zg4qxf1fphwx2dx29p6znzd9pyw1i76h2ccpyxbsl5"; depends=[rootSolve spacesRGB spacesXYZ]; }; + munsellinterpol = derive2 { name="munsellinterpol"; version="2.8-2"; sha256="0ypvlfzvy0kv9ih0w0h5f5jnljlhgp7nj08rlp6hafajbhqp6k1y"; depends=[rootSolve spacesRGB spacesXYZ]; }; murphydiagram = derive2 { name="murphydiagram"; version="0.12.2"; sha256="0f699cdfsl4f9w9f18cxkdlq1vyhsv83ynl6ck0r3wwh8f1zsmnd"; depends=[]; }; + musclesyneRgies = derive2 { name="musclesyneRgies"; version="1.1.3"; sha256="12cmxavj6k08pbk0ywmip1wph5jgq9y1ghj0dwq177sf8icmy9l6"; depends=[FNN ggplot2 gridExtra gtools plyr proxy reshape2 signal umap]; }; music = derive2 { name="music"; version="0.1.1"; sha256="04ygmlga7i8bpxcrlmj8wc956asf73krghga6fnh2flm675dp42f"; depends=[audio crayon]; }; musicNMR = derive2 { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; }; musica = derive2 { name="musica"; version="0.1.3"; sha256="0cfzfar706l0xdb0n11m18mayj5rrplvf4qry36vgxsiaxcba90r"; depends=[data_table lubridate magrittr qmap]; }; @@ -12903,12 +13085,13 @@ in with self; { mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; }; mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.7.3"; sha256="1f048j48mv654n8yswvlj9q4rr2kpyi4b4mibg28cspayidq9yyc"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase TreeSim]; }; mvShapiroTest = derive2 { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; - mvabund = derive2 { name="mvabund"; version="4.1.12"; sha256="107pwv2bwird1a98chcnbld2wqj9prkf4pkncyrrp304zpdkkby1"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; + mvabund = derive2 { name="mvabund"; version="4.2.1"; sha256="01kss9dx4an1ir5zs46jypvhj8sdc8wcs00i1223ai09av4lcsgd"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; mvbutils = derive2 { name="mvbutils"; version="2.8.232"; sha256="0awd0jy492ha321c20kmmgl20kqphdmrmswakc0rq6h8z9d55kdg"; depends=[]; }; - mvc = derive2 { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; }; + mvc = derive2 { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[]; }; mvcluster = derive2 { name="mvcluster"; version="1.0"; sha256="0yfl31scdgsiljvpv1yxc5bwwzr6kbhpjwqh2kql7xf0m0hc1pr4"; depends=[Rcpp RcppArmadillo]; }; mvctm = derive2 { name="mvctm"; version="1.2"; sha256="0810bmk748cvbls4djspqvkk65j605djqicqg4rkwy2a799l3rgc"; depends=[Formula MNM nlme quantreg Rfit SpatialNP]; }; mvdalab = derive2 { name="mvdalab"; version="1.6"; sha256="0i4hhm9bkp13j8cy6fspdn619d00jh615njwr49rwzgjyj418k6l"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; }; + mvgb = derive2 { name="mvgb"; version="0.0.1"; sha256="0rp9z6zp2nl09aq1xxq08h23zb5pidxjq0byryf3vy72ldq7y72c"; depends=[mvtnorm]; }; mvglmmRank = derive2 { name="mvglmmRank"; version="1.2-2"; sha256="00zxqby8syb959fqgw9i7b0yamgjwddq32jlin6qmnzys5bg1556"; depends=[MASS Matrix numDeriv]; }; mvinfluence = derive2 { name="mvinfluence"; version="0.8-3"; sha256="0nygsldkm61ny5ljcc1r667rywj239j4x59ssi81cb2005kkjgm5"; depends=[car heplots]; }; mvmesh = derive2 { name="mvmesh"; version="1.6"; sha256="1y6p7xp9fv0xswjdc6py1xqlx1ys1iyr559s9wkyja4hzcpya2my"; depends=[abind geometry rcdd rgl SimplicialCubature]; }; @@ -12922,7 +13105,7 @@ in with self; { mvnpermute = derive2 { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; }; 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-8"; sha256="0i2fd9s0dlpaa4vwkiq5is2d4vxc90hkdl0yk57gl651i8nxwnha"; depends=[magic magrittr mpoly partitions Rcpp]; }; + mvp = derive2 { name="mvp"; version="1.0-12"; sha256="135v24hjg9zgnl6k27jvcgxflqhjrmdkp3p2nda3izfvlvxijr0h"; depends=[digest disordR magic magrittr mpoly partitions Rcpp]; }; mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; }; mvrsquared = derive2 { name="mvrsquared"; version="0.1.2"; sha256="1x9ck55b5fiakvbn2nr3h75ksawjaijm2bg1xqavncl3cvlfqahl"; depends=[Matrix Rcpp RcppArmadillo RcppThread]; }; mvrtn = derive2 { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; }; @@ -12931,11 +13114,11 @@ in with self; { mvtsplot = derive2 { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; }; mwTensor = derive2 { name="mwTensor"; version="0.99.5"; sha256="11zn2g1gxl1x6ci3wqkr7a37jwc4rdcbgdagy5gf3jgkmmr5an3w"; depends=[ccTensor ica igraph MASS nnTensor rTensor]; }; mwa = derive2 { name="mwa"; version="0.4.3"; sha256="100d3c1070ir64iv848kws5fna141gcq5p66ip873cr632a042qs"; depends=[cem MASS rJava]; }; - mwaved = derive2 { name="mwaved"; version="1.1.8"; sha256="092sqd9harx289bgghw9x495llzhab0vkgkjka5jhi4ad1rfk3vh"; depends=[Rcpp shiny]; }; mwcsr = derive2 { name="mwcsr"; version="0.1.2"; sha256="1s7l3id3yashmscdd1kdcw1i4agpd6z12c7wxj18h3g2c82s7ad6"; depends=[igraph Rcpp]; }; mwshiny = derive2 { name="mwshiny"; version="2.1.0"; sha256="0c1a0d9qnaszffhzanmk31mdxqi7j3rn6bk7a3dwg4bq1da3rlgl"; depends=[htmltools shiny]; }; - mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; }; + 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.1"; sha256="0crqzbxvb459pzi6znhm06irfs09f1nsy0r1lnglzi7v1r5sh9n0"; depends=[caret data_table dplyr e1071 fda fossil ggplot2 glue KernSmooth kSamples lme4 magrittr psych reticulate rlang stringr tidyr uwot]; }; 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]; }; mycobacrvR = derive2 { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; }; mycor = derive2 { name="mycor"; version="0.1.1"; sha256="00hqmvga22bv43833s974s7ky7lbry3r2bb5kza7kvkn1p6773rg"; depends=[lattice]; }; @@ -12948,30 +13131,32 @@ in with self; { nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; }; nFactors = derive2 { name="nFactors"; version="2.4.1"; sha256="1diybai7pwaj9adn60b7nhvvpjjkwg3jimwp2ahgca9askmv93h2"; 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.3"; sha256="0gpmlvam7k4gsiidblfl4f57mgkbq2pakzqak4yx4pxa9f8gpilm"; depends=[ape coda deSolve testit]; }; + nLTT = derive2 { name="nLTT"; version="1.4.6"; sha256="1w073m8pq9372y1df5w77ghqsf0pyhld6hkpwf18bzwdr57nzr64"; depends=[ape coda testit]; }; nVennR = derive2 { name="nVennR"; version="0.2.3"; sha256="035gblc8427v0vq288rib3jfpz5fmcpvqg6nfaijwmbkz3gd41b6"; depends=[Rcpp]; }; na_tools = derive2 { name="na.tools"; version="0.3.1"; sha256="1lbzsckfg297n85kzbin65x1l6qgg9l50hd3xi2gflxc7n2xb8bw"; depends=[]; }; naaccr = derive2 { name="naaccr"; version="1.0.0"; sha256="1hw74a2gjm3gxq0s0qlndhqw0vij6p31walz1ic741z7hqsffqq7"; depends=[data_table stringi]; }; nabor = derive2 { name="nabor"; version="0.5.0"; sha256="1nj39cdfwrmhgsi3cq8imxv3n6xzc1v6dzdb2cf2hybjk368v4s7"; depends=[BH Rcpp RcppEigen]; }; nadiv = derive2 { name="nadiv"; version="2.17.1"; sha256="1v1fbnps55pbaz0q88y8vrxjd503krymc7f8i0xx3yxgdxl56x8q"; depends=[Matrix]; }; - naijR = derive2 { name="naijR"; version="0.3.4"; sha256="1rvaknidf3k3fwya14bknwcg2ldgvgr9vigh39j5vwrql7hqvv4j"; depends=[lifecycle magrittr mapdata maps RColorBrewer rgdal rlang]; }; + naflex = derive2 { name="naflex"; version="0.1.0"; sha256="18fqfhm6p38z4h8dznac5v8yz53n86cw2x6ma29kvcbvdp4r3yd2"; depends=[]; }; + naijR = derive2 { name="naijR"; version="0.4.0"; sha256="0bwq3990rsb2f97y7vyrqy5ll1h5yqs4c55dkg05hs9vfyk2b0iw"; depends=[lifecycle magrittr mapdata maps RColorBrewer rgdal rlang]; }; naivebayes = derive2 { name="naivebayes"; version="0.9.7"; sha256="070m78d8hsbqfbapb6g8vvh91gyznqfdpqsaq6z3raps8zlybsag"; depends=[]; }; naivereg = derive2 { name="naivereg"; version="1.0.5"; sha256="1cxfl419pp7xh1xrad29gvpn6hm0rhk40vylj97ypndh6gmnynzz"; depends=[glmnet gmm grpreg ncvreg]; }; nakagami = derive2 { name="nakagami"; version="1.1.0"; sha256="0bxsg5k51x7qrw34l16da79ck212drkgvzgn9d5zanx5dwv5asl2"; depends=[assertthat]; }; namedCapture = derive2 { name="namedCapture"; version="2020.4.1"; sha256="0zdw3h3n4qjv9cpidb3g523ld6rrh49l2c1yhfqhk5wb7vddrs46"; depends=[]; }; - namer = derive2 { name="namer"; version="0.1.5"; sha256="1687x6rc46bp2bmqkixzry5cc7lxjqwjk8ngrbg2fk7mzb4pwvnq"; depends=[dplyr fs glue magrittr purrr rstudioapi tibble]; }; + namedropR = derive2 { name="namedropR"; version="2.2.3"; sha256="08280hsb23pvjr0zrgfjmgmr4jiasrv0lbkjp92lwhkaljlhrpfy"; depends=[bib2df dplyr here htmltools lubridate qrcode readr webshot]; }; namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; }; nametagger = derive2 { name="nametagger"; version="0.1.1"; sha256="17g8y7x83p1pkgj5hgildndchxsp70va25h93p7r1yjllm56zqv8"; 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="0.6.1"; sha256="0l3l2x85v3srilww483kpgp4zlwixyml257b0cqly8kcpwawlinm"; depends=[dplyr forcats ggplot2 glue magrittr norm purrr rlang tibble tidyr UpSetR viridis visdat]; }; + nanonext = derive2 { name="nanonext"; version="0.2.0"; sha256="04r119v74i1wymhdyjjcdybjvd7i5fhx8n8zq233iq7rrszcr8cd"; depends=[]; }; nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; }; nanostringr = derive2 { name="nanostringr"; version="0.2.0"; sha256="13rcc33zfqlx8m5bmr5hh87gp0g5wlg2cwlj1683kw9adj2y3fdf"; depends=[assertthat ccaPP dplyr epiR magrittr purrr rlang]; }; - nanotime = derive2 { name="nanotime"; version="0.3.5"; sha256="1813740pjm4h27xhyipw58f4049qb49840axhnjcxfjjhkjsmpj4"; depends=[bit64 Rcpp RcppCCTZ RcppDate zoo]; }; + nanotime = derive2 { name="nanotime"; version="0.3.6"; sha256="1pv8hlw76n7qqrmw9lirjgg0zlp7ffy367ndca3sra8wn5f1lxfz"; depends=[bit64 Rcpp RcppCCTZ RcppDate zoo]; }; 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.4.1.1"; sha256="1xyyn6v3khk5x759fr9h96z036hbb87fzfqgdpw907bc95gjnkz9"; depends=[progress stringr]; }; nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; }; - nasapower = derive2 { name="nasapower"; version="4.0.3"; sha256="043p85n7vkmr82a27v5ind79z4kibrzl5qdjq42liisa2cmvh9mr"; depends=[crul jsonlite lubridate readr tibble]; }; + nasapower = derive2 { name="nasapower"; version="4.0.6"; sha256="0pz0v4waipd52saq92fws1xlh3fcal1q4dpcdspnp78n6z3nsxjc"; 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.18"; sha256="0sbyd16109nbi20fk4fwjz0p9hva8pbn370a60wjwjgn9jd90b90"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; }; @@ -12985,15 +13170,18 @@ in with self; { naturaList = derive2 { name="naturaList"; version="0.4.2"; sha256="03a5gbp5hv93p6y9ribagzs5q94c5v54j20zmg306irnp8n58iqy"; depends=[dplyr fasterize htmltools leaflet leaflet_extras magrittr raster rlang sf shiny shinydashboard shinyWidgets sp stringr tidytext vegan]; }; natural = derive2 { name="natural"; version="0.9.0"; sha256="0zxwbf3gg2h0bhl2w0md3rd162vlsgg0dv3187hc0ax7333cc4cx"; depends=[glmnet Matrix]; }; naturalsort = derive2 { name="naturalsort"; version="0.1.3"; sha256="0mz801y9mzld9ypp3xmsjw2d8l9q97sdnv09wrci9xi3yg2sjf6d"; depends=[]; }; + navigatr = derive2 { name="navigatr"; version="0.1.1"; sha256="0yy3vj3r7lgi9k930nb8cnlrwcc0vg73szkdcmmsy8bj98d0gb3s"; depends=[cli dplyr pillar purrr rlang tidyselect vctrs]; }; nawtilus = derive2 { name="nawtilus"; version="0.1.4"; sha256="1agqx9wiiypkpjrwahwlw5qkvqgkh01swyzc75csf9698x0779pm"; depends=[MASS]; }; nbTransmission = derive2 { name="nbTransmission"; version="1.1.2"; sha256="0vaj2zfyvm2vm1ly1419ysxxrqkv73802n96ifajknh1pair31zk"; depends=[caret dplyr lubridate poisbinom rlang tidyr]; }; nbapalettes = derive2 { name="nbapalettes"; version="0.1.0"; sha256="1wrh2qcm90fcybhcc8wvs2s4a4z8y3mrhc28dvrkwynqwzsbalzs"; depends=[dplyr]; }; nbconvertR = derive2 { name="nbconvertR"; version="1.3.2"; sha256="0yhmz177r1miain65vspclahhz8cg7638ldbpsw8ylgf7a60l0sg"; depends=[]; }; - nberwp = derive2 { name="nberwp"; version="1.0.0"; sha256="0f45bprdrly8zgpwrljmfch76gbai1lvknkiyqlfndilpcginfkw"; depends=[]; }; + nberwp = derive2 { name="nberwp"; version="1.1.0"; sha256="0wy3n8p16l7x2hf35k3r7apxm72k38nmc407vh883jg5fci41ljn"; depends=[]; }; + nbfar = derive2 { name="nbfar"; version="0.1"; sha256="1gr9q83ff950x2lcyv9apsnjah4kpi8805mci9m0s3gvr7llpjq4"; depends=[glmnet magrittr MASS mpath Rcpp RcppArmadillo RcppParallel rrpack]; }; + nbody = derive2 { name="nbody"; version="1.31"; sha256="0a5lqpbmb4gqb4mgp9hqc2fz92x9aaiqfqas1xxry7jvjngby30n"; depends=[magicaxis Rcpp]; }; nbpMatching = derive2 { name="nbpMatching"; version="1.5.1"; sha256="0f90k9vq05gkc0sgywb98frig63df0ih4z41dq7m2inx1zk5rqns"; depends=[Hmisc MASS]; }; nc = derive2 { name="nc"; version="2020.8.6"; sha256="19qsa5k38ajsbigccpch05m156n5wnd7c54j09fanjrpzy2048w2"; 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.4"; sha256="1b37isgj7njpyh3js2kyl6vil9v8azh7n04m5yn4pcvyz02sqkx8"; depends=[NonCompart rtf]; }; + ncar = derive2 { name="ncar"; version="0.4.5"; sha256="1ymxb3av7vd7vljr8h3ga6v01z6nf5j9mc095z0hi31d1khwrd02"; depends=[NonCompart rtf]; }; ncbit = derive2 { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; }; ncdf4 = derive2 { name="ncdf4"; version="1.19"; sha256="0qzvin2fjzcb7h2knlnw14s6043pwi1nm7yf6p27ax7w269173fb"; depends=[]; }; ncdf4_helpers = derive2 { name="ncdf4.helpers"; version="0.3-6"; sha256="0qnm41rbxb6v7aqh1mdkjhcc2rhs4wg6wmrllldzd99mzz8slv1r"; depends=[abind ncdf4 PCICt]; }; @@ -13008,16 +13196,19 @@ in with self; { ndjson = derive2 { name="ndjson"; version="0.8.0"; sha256="0lvzbgfi1sg4kya1mvv67z14qk3vz9q57x22qh57xq8ampdkg812"; depends=[data_table Rcpp tibble]; }; ndl = derive2 { name="ndl"; version="0.2.18"; sha256="0b235v6jf98rrqp5aqw3jkk7mq8dbqmhb758zbzza1mavh4n2k7s"; depends=[Hmisc MASS Rcpp]; }; ndtv = derive2 { name="ndtv"; version="0.13.2"; sha256="0symd0rwzk8kcq7f0flbw3pnyigybgsypjaaq5b5p1pjm1dz0c8j"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; }; + ndvtest = derive2 { name="ndvtest"; version="1.0-0"; sha256="15jqh58n63g2vr919z10d5ryhvk7325bv4gmd2xgdpi76p2dbyg0"; depends=[CompQuadForm nonnest2 Rdpack sandwich]; }; neariso = derive2 { name="neariso"; version="1.0.1"; sha256="1b2gnws75kkqsi8mg9n0zzdaawx57a6zz47cswabj5m6nb09ikh8"; depends=[]; }; neat = derive2 { name="neat"; version="1.2.3"; sha256="0mdv47l50wzxnjfk1sway7gzpkyf57svqip16fqn0hrc1fsrifbn"; depends=[igraph]; }; neatRanges = derive2 { name="neatRanges"; version="0.1.3"; sha256="1zfp6f1q7m0bks0shvzr120nd5jxba28xhi7vrd55qfy7g72167g"; depends=[data_table Rcpp]; }; - neatStats = derive2 { name="neatStats"; version="1.8.1"; sha256="0kxhl4h3xq6qg4fpxxji3j3p0yg5g271c3p9zbngkp7q8fiqz5vd"; depends=[BayesFactor bayestestR car Exact ez ggplot2 ggpubr logspline MBESS plyr PoweR pROC viridis]; }; + neatStats = derive2 { name="neatStats"; version="1.10.1"; sha256="0miamjzk5sa0f76pgni2fx3sczd065axxc92dzphx66xczql98fw"; depends=[BayesFactor bayestestR car data_table Exact ez fBasics ggplot2 ggpubr logspline MBESS pROC viridis]; }; neatmaps = derive2 { name="neatmaps"; version="2.1.0"; sha256="1kz1na3fzpd8vkxmpp5rz8ksyf8q2wk456csiii82winv9a2zxc9"; depends=[ConsensusClusterPlus dplyr ggplot2 heatmaply igraph]; }; + nebula = derive2 { name="nebula"; version="1.2.0"; sha256="1a4jsqxprp4pn7f5nxgha3jvjkcp7rdjlpcjwfc3f89530jhmnyv"; depends=[MASS Matrix nloptr Rcpp RcppEigen Rfast trust]; }; needmining = derive2 { name="needmining"; version="0.1.1"; sha256="0qsj0ihjchrnl4s44rpsizbcz033z00dmzvic2y1msv0bnfawl6p"; depends=[randomForest rtweet SnowballC SparseM stringr tau tm]; }; needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; }; needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; }; negenes = derive2 { name="negenes"; version="1.0-12"; sha256="0b82822vl86gni0pv5f6pjfzmks35i7q2rqkhgyb9z9c677g991q"; 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]; }; neo2R = derive2 { name="neo2R"; version="2.1.0"; sha256="1fhi74d4730pxrmv1p2gz8ylvnilxn4l837nha6ndyhy00xfgkk6"; depends=[base64enc jsonlite RCurl]; }; neo4jshell = derive2 { name="neo4jshell"; version="0.1.1"; sha256="03qnv5xf7dvlzq259brfwk7vfr05q7labakv9mj27x70yhxq1z7m"; depends=[fs magrittr R_utils ssh sys]; }; 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]; }; @@ -13025,16 +13216,17 @@ in with self; { neonstore = derive2 { name="neonstore"; version="0.4.4"; sha256="0fhjm6513kd4y3lry8dwcwk13ns92yk5h3san7ww2ahhdhy4hx9c"; depends=[DBI duckdb httr progress R_utils thor vroom zip]; }; neotoma = derive2 { name="neotoma"; version="1.7.4"; sha256="1fknzp7qg5l5lkfvqfld0x67zj3xmi8vivsg70m47mbpcs92hmcf"; depends=[analogue dplyr httr jsonlite leaflet plyr reshape2 xml2]; }; nephro = derive2 { name="nephro"; version="1.2"; sha256="1izmzx8lah322xzb42asfnrvr2c9yqd0zf7fmrhwd3p4rr1rqa7d"; depends=[]; }; - neptune = derive2 { name="neptune"; version="0.1.2"; sha256="1yk5w7520flprs7wvsdfmsdyg85snpcm7q9gjh3cx2fhaj5xvcl3"; depends=[reticulate]; }; + neptune = derive2 { name="neptune"; version="0.2.1"; sha256="1lnrhld77rq3s01fx4168a9ixmyxinpc32m0yyvzz5wk7bkx928s"; depends=[ggplot2 htmlwidgets plotly reticulate rstudioapi this_path]; }; nesRdata = derive2 { name="nesRdata"; version="0.3.1"; sha256="1lxvg11g8nizfn8sghirq2749fs9i4w1wiaz3v1djqbkzqcqfrcj"; depends=[dataone dplyr purrr rappdirs readr]; }; - nestfs = derive2 { name="nestfs"; version="1.0"; sha256="0lzbjj287s5kmw9635gfyl3jdgfh5mxbwxqxmnwynbwccixk0akc"; depends=[dgof pROC]; }; - nestr = derive2 { name="nestr"; version="0.1.1"; sha256="1azk3rjr9kkdqw1z5v49gmwd7i31jdmx332jpdnys6vwqci52zk0"; depends=[magrittr rlang tidyselect vctrs]; }; + nestfs = derive2 { name="nestfs"; version="1.0.1"; sha256="1y10plfiyv5ws4xpmwgvm77kp07525zv02rza08xm8qhyq4f64zc"; 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.0"; sha256="0aqagzrycgm6qnappbgi6pin10gnf9h3gj39wnncdsb2nf417ynr"; 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.20"; sha256="1kmv8sfzyh7cgp4s86rw4znjqpckgw8xiqs6a144g7k2vlfm28fk"; depends=[haven igraph Matrix rD3plot]; }; netSEM = derive2 { name="netSEM"; version="0.5.1"; sha256="0k4ngl4p1v2rp1sf2x65m7p0cd6ha98fyx21b73ki0531q0d9fil"; depends=[DiagrammeR DiagrammeRsvg gtools htmlwidgets knitr magrittr MASS png rsvg segmented svglite]; }; netassoc = derive2 { name="netassoc"; version="0.6.3"; sha256="1hyshnbpq60a3y13b4sh1c2rk78x09q01b7q6xrgv10w7bn9r2sg"; depends=[corpcor huge igraph infotheo vegan]; }; netchain = derive2 { name="netchain"; version="0.2.0"; sha256="1skpf1n6a17mjkcxqpl6vrskk04yvqa0v4n2zw9x5r1h46q9m6qk"; depends=[gtools igraph Matrix Rcpp stringr]; }; + netcmc = derive2 { name="netcmc"; version="1.0"; sha256="1ny12qr1vbqqqiksgna7d135036ixrrgp2dc270bkqzf6ags2is1"; depends=[coda ggplot2 MASS MCMCpack mvtnorm Rcpp RcppArmadillo RcppProgress]; }; netcom = derive2 { name="netcom"; version="2.1.5"; sha256="1lg2b3lhnhiqqb06b31vbsbfbk9hifbl5dvp45flf83vn3g21ci0"; 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]; }; netdiffuseR = derive2 { name="netdiffuseR"; version="1.22.3"; sha256="1vb3ql37fh5104ks65i03mz7ka1xk1rb8xnm2wxd654khkwjcp0m"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM viridisLite]; }; @@ -13043,11 +13235,13 @@ in with self; { netgwas = derive2 { name="netgwas"; version="1.13"; sha256="156axkl61z0s3zm8plkcc3s46x0881mqnk94azl3p0nphblhmhcv"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; }; netie = derive2 { name="netie"; version="1.0"; sha256="0ja59rfg576z8rbv073aaab32qazlrqhvyvxpssibwsvbfcrhklm"; depends=[]; }; netjack = derive2 { name="netjack"; version="1.2.0"; sha256="060ygb0kxi0gx1ya38cmf5hhyy6jkwq5519azdqhq5i324cwzzm7"; depends=[brainGraph ggplot2 igraph Rdpack]; }; - netmeta = derive2 { name="netmeta"; version="2.0-1"; sha256="0yssxp42l2krrkb7cna7rgk80mzhl8lcmkn1r3i5ymckgnj8y9pz"; depends=[ggplot2 magic MASS meta metafor]; }; + netmap = derive2 { name="netmap"; version="0.1.0"; sha256="07rrfvqmlp8srxam70ajwdwdm5bk49zhngsl1yzh8an303la6rfc"; depends=[ggnetwork igraph network rlang sf sna]; }; + netmeta = derive2 { name="netmeta"; version="2.1-0"; sha256="0m0jv0cmg6dkyssw4qk19fqqdqqdsrdq9q0sj8fdi9rr41kmvakx"; 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.1.1"; sha256="146678dj5kg9bs12y9i2azxq5c4lfp9917fvhpp19sdqw2p31dp8"; 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]; }; netseg = derive2 { name="netseg"; version="1.0-0"; sha256="0y7pc4dz78l6fi6z810bkzl7550vh4167axbnib55czgf7minhv6"; depends=[igraph]; }; netstat = derive2 { name="netstat"; version="0.1.1"; sha256="1h87cl3ry5hwwqxza3n24zpvwn89hhclsa2400sw4ijdy2ivpn2j"; depends=[]; }; @@ -13082,27 +13276,31 @@ in with self; { 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.0"; sha256="0rm91dfzfjhi51gk65gvq2z7aywg6y8ay3hrjnp6frlmyvh661sp"; depends=[tidyRSS]; }; newsmap = derive2 { name="newsmap"; version="0.7.4"; sha256="1k7jbfz3hrpy8z3zfn0gcm9fzmfiaf3qkx1m89c5q072zpdpiajn"; depends=[Matrix quanteda quanteda_textstats stringi]; }; - newsmd = derive2 { name="newsmd"; version="0.3.1"; sha256="0xgrxz0ppvja4avff2l4kjnbw90ynbrziih0iqfjsvnvy92msalg"; depends=[R6]; }; + newsmd = derive2 { name="newsmd"; version="0.4.0"; sha256="1pzsblkvs374nc6795llm9lbqj5z410g1mgr3q4fgpm0398zmsrv"; depends=[R6]; }; nfer = derive2 { name="nfer"; version="1.0.1"; sha256="1dbvadpfgwanfdc9kvm620r5nj7l9kvbbhfcg80z5jbdn38jgh3r"; depends=[]; }; nfl4th = derive2 { name="nfl4th"; version="1.0.1"; sha256="11hk9446ckhg46dzkbvd12n6k02m6qx265spwqdm23xpncamjlkk"; depends=[dplyr glue httr janitor jsonlite magrittr mgcv nflfastR nflreadr purrr stringr tibble tidyr tidyselect xgboost]; }; nflfastR = derive2 { name="nflfastR"; version="4.3.0"; sha256="1vg27m51q01m6rypaksr5dw7qg3i638dypm31v5gimbdkjmgs2j7"; depends=[cli curl dplyr fastrmodels furrr future glue janitor lifecycle mgcv nflreadr progressr rlang stringr tibble tidyr tidyselect xgboost]; }; - nflreadr = derive2 { name="nflreadr"; version="1.1.2"; sha256="0m793qyi0p3ja2kryg6l41mqr943lqc6pb878chff9arbd1b66kx"; depends=[cachem cli curl data_table glue memoise qs rappdirs Rcpp RcppParallel rlang]; }; + nflplotR = derive2 { name="nflplotR"; version="1.0.0"; sha256="0jcj3jv7qsjn7nxs9rycqc039rcx69nznfv2adg4xv4ybw0s1q6s"; depends=[cli ggplot2 magick magrittr nflreadr rlang scales]; }; + nflreadr = derive2 { name="nflreadr"; version="1.1.3"; sha256="1wif90lngvpzj36s7r1frchi50qksbsjscy156n740x2f3by9zjx"; depends=[cachem cli curl data_table glue memoise qs rappdirs Rcpp RcppParallel rlang]; }; nflseedR = derive2 { name="nflseedR"; version="1.0.2"; sha256="061jd3mr06mxs5riwlph3a1hsk5jypws71jy9jzhhqnijdy96bki"; depends=[cli crayon curl dplyr furrr future glue gsubfn magrittr progressr purrr readr rlang tibble tidyr]; }; - nftbart = derive2 { name="nftbart"; version="1.1"; sha256="1fsch7dh7d17y8x1jxwf1d36badhkljrldpysv3izncwqvkj2a3c"; depends=[nnet Rcpp survival]; }; + nflverse = derive2 { name="nflverse"; version="1.0.1"; sha256="1miacjvfl3968m54d6b5qgs7y3w6qw49nw96qxdwb2175gwhbl51"; depends=[cli crayon magrittr nfl4th nflfastR nflplotR nflreadr nflseedR rlang rstudioapi]; }; + nftbart = derive2 { name="nftbart"; version="1.2"; sha256="18yca2qg6d2960yvnplf70a7kd61qhmp42rd3alhg901a8py6qk5"; depends=[nnet Rcpp survival]; }; + ngboostForecast = derive2 { name="ngboostForecast"; version="0.0.2"; sha256="1jh3acr2asc8ih7kv05z4n7ialvvbkg61w01n9avvvgjw9ifsf4x"; depends=[dplyr forecast magrittr R6 reticulate]; }; ngram = derive2 { name="ngram"; version="3.2.0"; sha256="1g57md4s73qpxzqxr8sgzvbkx3y4zmw4hfq6zsysnw4h2dbqxm1l"; depends=[]; }; - ngramr = derive2 { name="ngramr"; version="1.7.4"; sha256="11v7vl55bfh9fqdkggpxykglyjqdcnl53if0vki8al67qfwsh9i7"; depends=[cli dplyr ggplot2 httr lifecycle RCurl rjson rlang scales stringr textutils tibble tidyr xml2]; }; + ngramr = derive2 { name="ngramr"; version="1.7.5"; sha256="1zs6ninvhz6lavxnp59105wy0n0j839ps6yaaz21s42xk11lfp1k"; depends=[cli dplyr ggplot2 httr lifecycle RCurl rjson rlang scales stringr textutils tibble tidyr xml2]; }; 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.6.5.3"; sha256="00sfbzh7r2lvc19prjm3zfgs62j6frh5rw6jvb25z8wzrhw52z3f"; depends=[Hmisc magrittr plyr rvest stringr xml2]; }; nhdR = derive2 { name="nhdR"; version="0.5.7"; sha256="1nvnfkp60y317cgqpyxz6hbkqhm3xaicdicjljmb9hhqm04hbjp5"; depends=[curl dplyr foreign ggplot2 httr maps memoise purrr rappdirs rgdal rlang rvest sf stringr units xml2]; }; - nhdplusTools = derive2 { name="nhdplusTools"; version="0.4.3"; sha256="01462pmvmy8j3p5l9qdd6xdn1jv7gi9m1vn9mbcn0gmdkll888vd"; depends=[dataRetrieval dplyr fst httr igraph jsonlite magrittr pbapply prettymapr R_utils RANN rosm sf tidyr units xml2 zip]; }; + nhdplusTools = derive2 { name="nhdplusTools"; version="0.5.1"; sha256="0f0vph1931cdkh9kx4d4nm7nmj9rav99wlcd1l8684mb8l9p9z7c"; depends=[dataRetrieval dplyr fst httr jsonlite magrittr pbapply prettymapr R_utils RANN rosm 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]; }; nhs_predict = derive2 { name="nhs.predict"; version="1.4.0"; sha256="0lgyi1v940pjqfpwligw5ml6vagiz8wwsxbr9kfd1j70b5i0kjwd"; depends=[]; }; nhsnumber = derive2 { name="nhsnumber"; version="0.1.2"; sha256="10vm3591gjr13ggnagjkh0v2915yl05mwyphpckimmrrbc3zsdip"; depends=[]; }; nhstplot = derive2 { name="nhstplot"; version="1.1.0"; sha256="1yk7q731a4y9mhngdsb8xdw2id6m1q78329ja19hdpi6nnd7nhgn"; depends=[ggplot2]; }; - niaidMI = derive2 { name="niaidMI"; version="1.0.0"; sha256="0n7hhvcbnhzfvj3whvqd66bh4sbl70278qms9q8bzss6d0w2wp1k"; depends=[Rcpp]; }; + niaidMI = derive2 { name="niaidMI"; version="1.1.0"; sha256="0cg349qdlbixdyfzs5ahaf218a8gcpb2rvm0xaabsq9ray9gmq1a"; depends=[Rcpp]; }; + nic = derive2 { name="nic"; version="0.0.1"; sha256="0nr84a0vvl682ahp9xq50y6mk5dsircgz4l2rqp0jgv2h7fkd0n2"; depends=[]; }; nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; }; nicheROVER = derive2 { name="nicheROVER"; version="1.1.0"; sha256="0chg2bnz929mq17qylf3f57g6bg4ih6w20019yh7vkz7mwjnvi3p"; depends=[]; }; nichevol = derive2 { name="nichevol"; version="0.1.19"; sha256="0qj5cb0fyw0x1bczl6l0kl6jqir4yg8sb9fsfkd3h64d0ls2arl5"; depends=[ape castor concaveman geiger raster rgdal rgeos sf sp stringr]; }; @@ -13110,7 +13308,7 @@ in with self; { nightmares = derive2 { name="nightmares"; version="0.0.2"; sha256="1dmqrb17ncwazy1nb0zzfy7fq51ah7rz0xmhmmx6d30paaix2vc7"; depends=[raster rgdal sp]; }; nilde = derive2 { name="nilde"; version="1.1-6"; sha256="0ibml22frqmk4llzymvd4h1p2qnn46x5l0z4111m8h12czr1d9hw"; depends=[]; }; nima = derive2 { name="nima"; version="0.6.2"; sha256="0n8r8h1m0v0ssbpv6p32jby49f45qbicwr0awm7x054p48qk49cy"; depends=[assertthat dplyr ggplot2 ggthemes gridExtra gtools scales]; }; - nimble = derive2 { name="nimble"; version="0.12.1"; sha256="1n37g22wj5zlvb8lgxh9gi7mk011lyrmg3kaibhcpj2858hz681m"; depends=[coda igraph R6]; }; + nimble = derive2 { name="nimble"; version="0.12.2"; sha256="06qs22q0l1iv82q5q48f5hpn0jxy8pds378k9cxhnzws2nms7xra"; depends=[coda igraph R6]; }; nimbleAPT = derive2 { name="nimbleAPT"; version="1.0.4"; sha256="0615fm6sa6nf607ay98r81m0pp8yvydpwzn3972imf87irps2k3l"; depends=[nimble]; }; nimbleCarbon = derive2 { name="nimbleCarbon"; version="0.1.2"; sha256="1cj1yik4knxniag12qr8hqxkqhcm5lhq8xw7g8iibv3rxq0jvkki"; depends=[coda doSNOW foreach nimble rcarbon snow]; }; nimbleEcology = derive2 { name="nimbleEcology"; version="0.4.1"; sha256="1z4byxsana1fa2y7qhmiqbb8ana6zbas0cmbgcc703mqh1642jb2"; depends=[nimble]; }; @@ -13121,6 +13319,7 @@ in with self; { nitrcbot = derive2 { name="nitrcbot"; version="1.2"; sha256="0lainbw9j5aj9s824afpxdjl3q2f728jfpdfji7kpi9hdg8jixhx"; depends=[dplyr httr jsonlite RCurl]; }; nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; }; nixmass = derive2 { name="nixmass"; version="1.0.2"; sha256="0g8hm0mnbwahbnk44rfciiggxn5bscfni5gqc6y3za496cf9wlk1"; depends=[lubridate zoo]; }; + njgeo = derive2 { name="njgeo"; version="0.1.0"; sha256="1cc6gm0l5z31hqif2d8wd503pb48xsmyr28pbildkxgy9z022af5"; depends=[curl dplyr httr jsonlite sf]; }; njtr1 = derive2 { name="njtr1"; version="0.3.1"; sha256="125c5qp2d4q2h4darhx2acqk898kh5775rxjyfjidl0nxhvcvn4q"; depends=[curl dplyr httr lubridate readr stringr tidyselect]; }; nlMS = derive2 { name="nlMS"; version="1.1"; sha256="01ijg1bp3r0dg8ph7qpsx3hqzrrvfhbykml20hqchxk7c5n2w9wz"; depends=[nlme]; }; nlWaldTest = derive2 { name="nlWaldTest"; version="1.1.3"; sha256="1cppdz8qvigjdz4sgr1gm2j09zi407xxmryc28zc7ps7rvgy344h"; depends=[]; }; @@ -13129,7 +13328,7 @@ in with self; { nleqslv = derive2 { name="nleqslv"; version="3.3.2"; sha256="1v9znvncyigw9r25wx2ma0b7ib179b488dl0qsrhp5zrcz7mcjgm"; depends=[]; }; nlirms = derive2 { name="nlirms"; version="3.4.4"; sha256="1njyfip377a0f6hf9y32s077b4jv4h8ydbjgnl68yfypxbfn2xyx"; depends=[gridExtra gtable]; }; nlist = derive2 { name="nlist"; version="0.3.3"; sha256="1wq7bp834c7cl37wbrgd9ars3mm0s5c3l3fxlrry728a27c27f9h"; depends=[abind chk coda extras generics lifecycle purrr term tibble universals]; }; - nlme = derive2 { name="nlme"; version="3.1-153"; sha256="1qw0sq64iybyidj0s8m76z4i1gxb1fn27s29i63fw5hvvy7aj9rx"; depends=[lattice]; }; + nlme = derive2 { name="nlme"; version="3.1-155"; sha256="0kzzpl63l298yy18x62ypgbhdw61fgm30lc4nlhjjhjj5220yfcz"; depends=[lattice]; }; nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; }; nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; }; nlmeVPC = derive2 { name="nlmeVPC"; version="2.2"; sha256="0dkj0l0rkml6nydg3k04dzcp17sn59p3hnaqmnqa0arbzv0rsq8i"; depends=[dplyr ggplot2 Hmisc magrittr optimx plyr quantreg Rcpp RcppArmadillo tidyr timeDate]; }; @@ -13137,9 +13336,9 @@ in with self; { nlmm = derive2 { name="nlmm"; version="1.0.1"; sha256="0q5vz4xqdb510i26zbcq4djcribn7h477akh8f56nzjgq231vhcq"; depends=[BH HI lqmm MASS Matrix mvtnorm nlme numDeriv Qtools Rcpp RcppArmadillo statmod]; }; nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; }; nlnet = derive2 { name="nlnet"; version="1.4"; sha256="13lv4b6chsjrhimny3wc1y9ljgbxmm1byj4j04n4vj8icn87gyfd"; depends=[coin e1071 earth fdrtool igraph randomForest ROCR TSP]; }; - nloptr = derive2 { name="nloptr"; version="1.2.2.3"; sha256="1zznk9f2w2g02zqzay21k8xqzfvc6icxfzp6bx2wpd77sm7vf25g"; depends=[]; }; + nloptr = derive2 { name="nloptr"; version="2.0.0"; sha256="16k124ll14p3ygny6i1zd7yza83bv2sk87x922n1bfn9rx4k3jk5"; depends=[testthat]; }; nlpred = derive2 { name="nlpred"; version="1.0.1"; sha256="05jna8hzd5v36a0dwag6zr8ms1pkryas3qarwb946bkxlslffp27"; depends=[assertthat bde cvAUC data_table np Rdpack ROCR SuperLearner]; }; - nlraa = derive2 { name="nlraa"; version="0.98"; sha256="1vihk6k8582iwwn2gzpbs1amg8wbvpiar4diljvjx75172lc1s0h"; depends=[boot knitr MASS Matrix mgcv nlme]; }; + nlraa = derive2 { name="nlraa"; version="1.2"; sha256="1h4hhjxys3sgk3cvhjcmfpxaqmkcmvsr5an6rgqqbg0zwgqizl1s"; 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.3"; sha256="1w788fs9zkcbg99csiynd6cw9p8na2g5sg85065d17l6wxmxk7va"; depends=[crayon dplyr EasyABC furrr genalg GenSA igraph lhs magrittr progressr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; }; @@ -13149,6 +13348,7 @@ in with self; { nlsem = derive2 { name="nlsem"; version="0.8"; sha256="0q3wk7x67mh2447ah807djyklia2x2d45krsskffynazm83msnj9"; 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.1"; sha256="1gy9z6zmf3c39s7wbdd5a1hrlnq0njj96wc2pxmnp5ihjawinq78"; depends=[nnls]; }; nlsmsn = derive2 { name="nlsmsn"; version="0.0-6"; sha256="1wrqfmsb3l4bsdncyjl7hh3vwj9s6l43p7klww6f4k21asvh4p5s"; depends=[]; }; nlsr = derive2 { name="nlsr"; version="2021.8.19"; sha256="021brwb73gg2c3ingrdk81dm4mx0g2s2k8nk2qcz3zqmd0gzadn6"; depends=[digest]; }; nlsrk = derive2 { name="nlsrk"; version="1.1"; sha256="0yqcsz5pdhqsrd86g0yx8bdac13fbmvg89phj3v4qvla2jfznjba"; depends=[]; }; @@ -13169,10 +13369,10 @@ in with self; { nnGarrote = derive2 { name="nnGarrote"; version="1.0.4"; sha256="0km7vx9qkfijj2af5ma4q88mhgkrw361hpv3n8dyzpr8654hrw4v"; depends=[glmnet]; }; nnTensor = derive2 { name="nnTensor"; version="1.1.5"; sha256="0sxmx34xb0fk5fcynry1vrfk7jr2w6kyjyghlqg8j94rn4hamjsb"; depends=[fields ggplot2 plot3D rTensor tagcloud]; }; nna = derive2 { name="nna"; version="0.0.2.1"; sha256="17cz1jf7iv61wspqldfdwbdjhlr0wq09idkzlivfb8aik5w9f0z5"; depends=[]; }; - nnet = derive2 { name="nnet"; version="7.3-16"; sha256="0smmyx4vhlz99vy4w238y913gq74845v0l1p0g1kgydsp9lijlcr"; depends=[]; }; + nnet = derive2 { name="nnet"; version="7.3-17"; sha256="0rws3rkd7dz1maz2mkld29jfrixjgacay8rqz7nmi82a2sw0nxgf"; depends=[]; }; nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; }; nnfor = derive2 { name="nnfor"; version="0.9.6"; sha256="0bciy6k79g7abvj3pmmdc4wzg5mp11zgmdbx17x4by993p2clhw9"; depends=[forecast glmnet MASS neuralnet plotrix tsutils uroot]; }; - nngeo = derive2 { name="nngeo"; version="0.4.4"; sha256="0k189ih47n20g70y6sxff8dyjlyv09pc03ynwhm1d7pr3l8hxin4"; depends=[data_table lwgeom nabor s2 sf units]; }; + nngeo = derive2 { name="nngeo"; version="0.4.5"; sha256="1davvn7ggbs41d172hq9mq0scndcp16ygan6g8qm15ywp4rs8c17"; depends=[data_table lwgeom nabor s2 sf units]; }; nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; }; nnlib2Rcpp = derive2 { name="nnlib2Rcpp"; version="0.1.8"; sha256="0bwf96q4hb54my57bb540a8brpiqmrk0f6mms2bv9ci1624x0k80"; depends=[Rcpp]; }; nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; @@ -13182,13 +13382,13 @@ in with self; { 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.4.0"; sha256="1dzpa7ksf3mj97mhsxzigppcsjwxzr9x8rc0b13hcsjgawxlq5f1"; depends=[data_table DBI paws uuid]; }; + noctua = derive2 { name="noctua"; version="2.5.1"; sha256="1bl80z2pffzf8dsy2xwjhyb9nb5v1zglcvap2xm6amnm2i0c3cdj"; depends=[data_table DBI paws uuid]; }; nodbi = derive2 { name="nodbi"; version="0.7.0"; sha256="0g5b3cbdf15f76dql2p7mh00xs3nrnfq5hg3pyk071fa55wf2532"; depends=[DBI elastic jqr jsonify jsonlite mongolite RPostgres RSQLite sofa stringi uuid]; }; node2vec = derive2 { name="node2vec"; version="0.1.0"; sha256="03gfpn4xgmdwlrpwi9pdpnh6k75mwp85j6vywkj0jsxhz3rbg95g"; depends=[data_table dplyr igraph rlist vctrs vegan word2vec]; }; nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; }; - nodeSub = derive2 { name="nodeSub"; version="1.2"; sha256="06yk8kk959grnmvnhqj7z7k02ykxr04mrz63k8ppbmwb4q60q5nv"; depends=[ape apTreeshape assertthat babette beastier beautier DDD geiger mauricer nLTT pbapply phangorn phylobase rappdirs Rcpp Rmpfr RPANDA stringr testit tibble tracerer]; }; + nodeSub = derive2 { name="nodeSub"; version="1.2.3"; sha256="0whg8yz3padlfygwwb3cs57p33vkxa0py4lbnj23iqypni7lna75"; depends=[ape apTreeshape assertthat babette beastier beautier DDD geiger mauricer nLTT pbapply phangorn phylobase rappdirs Rcpp Rmpfr RPANDA stringr testit tibble tracerer]; }; nodiv = derive2 { name="nodiv"; version="1.4.0"; sha256="1k7pr9d1mgxw3szxcmnkkz498x7629wf2z65qlclywka3xgzpkxc"; depends=[ape picante raster sp vegan]; }; - nofrills = derive2 { name="nofrills"; version="0.3.1"; sha256="0302q1c82k0ryadasl3x8zvpfsh8c2smjyi2g4vaxf9gbnvl5sc0"; depends=[rlang]; }; + nofrills = derive2 { name="nofrills"; version="0.3.2"; sha256="1sclrzn7m0r4pxmv9vs0ay0l892p6kdz3yzdqwfkzzp8z45n6yzk"; depends=[rlang]; }; noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; }; noise = derive2 { name="noise"; version="1.0.1"; sha256="0xqcg79v03d5x783pby6gqxrhylm67xk4ic9ib4jmjyrrbqklad1"; depends=[preprocessCore]; }; noisyCE2 = derive2 { name="noisyCE2"; version="1.1.0"; sha256="02zkkyys9qknwm39gz4j4pvlvkd5qlvxqaprklzsd40dgz39cwq4"; depends=[magrittr]; }; @@ -13197,8 +13397,8 @@ in with self; { nombre = derive2 { name="nombre"; version="0.4.0"; sha256="0bc66vc8xxg8q2x7nh4si04qgb2gxzl61jf4k10vc6v8dsglk77k"; depends=[fracture]; }; nomclust = derive2 { name="nomclust"; version="2.5.0"; sha256="17vqxbx5bpja2fxp83w0sbgbs61b2vaak9zzvvxkicxqwk09ix2v"; depends=[cluster Rcpp]; }; nominatimlite = derive2 { name="nominatimlite"; version="0.1.5"; sha256="0x3vaidx7w5v0713ddsj3dgczf788dpq7irjl63ihslvd4ncr6ba"; depends=[dplyr jsonlite rlang sf tibble]; }; - nomisr = derive2 { name="nomisr"; version="0.4.4"; sha256="1qa7k4fh7n2imf91nfcdg32dacraay343jv9sczs6qc37nadhdbg"; depends=[dplyr httr jsonlite readr rlang rsdmx snakecase tibble]; }; - nomnoml = derive2 { name="nomnoml"; version="0.2.3"; sha256="08zraip0v4jc51zv2zsvka6k8d1ry2ac9d70xpavfggbgmrmz987"; depends=[htmlwidgets lifecycle png rlang webshot]; }; + nomisr = derive2 { name="nomisr"; version="0.4.6"; sha256="1d1qyx7iv22d1n274yz11wj0cpm3xycs330s2m7ri4cjhnw8wwjn"; depends=[dplyr httr jsonlite rlang rsdmx snakecase tibble]; }; + nomnoml = derive2 { name="nomnoml"; version="0.2.5"; sha256="1c1pv3c1s6cdc75malnhy69cc9za3hmikd46d35x1n2ww54lmldc"; depends=[htmlwidgets lifecycle png rlang webshot]; }; nomogramEx = derive2 { name="nomogramEx"; version="3.0"; sha256="16235rwblnzn8k53817llwy2pzhnpifh6ij159nxymjm8ar9qpbp"; depends=[pracma rms]; }; nomogramFormula = derive2 { name="nomogramFormula"; version="1.2.0.0"; sha256="1j6g5kndl0n2g8acwq8pn09sk0bjcsphbcd77ha1j5dnwdmy73c0"; depends=[do Hmisc rms]; }; nomordR = derive2 { name="nomordR"; version="0.1"; sha256="02d5gk5pd4vpd61ys9x81maxjrmbshx1wdv6xxsvafrnz7a7pmks"; depends=[]; }; @@ -13214,14 +13414,12 @@ in with self; { nonpar = derive2 { name="nonpar"; version="1.0.2"; sha256="0gflldd3kjbpdlvbwi073igj6shcqr9g5x6zcp5gfa12404qpflq"; depends=[]; }; nonparaeff = derive2 { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; }; nonparametric_bayes = derive2 { name="nonparametric.bayes"; version="0.0.1"; sha256="1acrjh0fcr15b9k2hpg0ihfav0w2lzjdpjyayz3f4hx596j32vi8"; depends=[mvtnorm progress]; }; - nontarget = derive2 { name="nontarget"; version="1.9"; sha256="0ndqcr73sja5ks5kdahhakpz9lw3rp26imklagdv4f5agqnb608s"; depends=[enviPat mgcv nontargetData]; }; - nontargetData = derive2 { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; }; nopaco = derive2 { name="nopaco"; version="1.0.6"; sha256="0q705b7bjzq0b6vfp6yargybc8h07adx8al1ip7pxkmfcpilj66v"; depends=[Matrix]; }; nopp = derive2 { name="nopp"; version="1.1.0"; sha256="1zn3ss89i7fwqps6b8syd9jzm68k95p3fdlf285q819dzlk61ypk"; depends=[MASS mlogit]; }; 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.0.0"; sha256="1rsbrxfnb0fip781591pk8hb1fj873iswyqgk0vadqhzvk7iid1w"; depends=[data_table DBI httr jsonlite magrittr odbc RSQLite writexl]; }; + norgeo = derive2 { name="norgeo"; version="2.1.0"; sha256="1qvcv63pwbsprxaw3nb5qbsr7fwphf62c7fgd5lvjbnnwgqbmnx8"; depends=[data_table DBI httr jsonlite magrittr odbc progressr RSQLite vcr writexl]; }; norm = derive2 { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; }; norm2 = derive2 { name="norm2"; version="2.0.4"; sha256="0ahz6x59k00pqalzjc3ajiby1ysmarjssga9amwh9vd6vmzzyfb7"; depends=[]; }; normalp = derive2 { name="normalp"; version="0.7.2"; sha256="0fqpz6v9v3xjmyh7mh2yvkjdn3v4d0nk93x7s0gj28kazl7137kz"; depends=[]; }; @@ -13234,7 +13432,7 @@ in with self; { nos = derive2 { name="nos"; version="1.1.0"; sha256="0hbncama8cx8q0rc56bil38fbj33z49v4d6zdkvxs6wgmmglnrfs"; depends=[dplyr gmp]; }; nose = derive2 { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; }; nosoi = derive2 { name="nosoi"; version="1.1.0"; sha256="1b7csrgax5ig9ibiwbhh2cl357hvdc6my4408vld498c8jjf0lyw"; depends=[data_table raster]; }; - not = derive2 { name="not"; version="1.2"; sha256="1671j3yirzdyhb02khx1yddslyig5jlnb0bdbgdlkb21n4zwaqa4"; depends=[]; }; + not = derive2 { name="not"; version="1.3"; sha256="0ks1xpr5r0b7v77pyr9fnk7gkznrk95fsdicww8wv4mv3jplvh1h"; depends=[]; }; notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; }; notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; }; novelforestSG = derive2 { name="novelforestSG"; version="1.2.1"; sha256="17gn4qc5f3n0gdmm0r1zlg6jlzd3n5d8a3fx6fynxnj8ncq604i7"; depends=[]; }; @@ -13247,7 +13445,7 @@ in with self; { npROCRegression = derive2 { name="npROCRegression"; version="1.0-6"; sha256="122sy722wbslmd0yq5gc9zs87ng45zlwcsfvl962czk3yncrn1bv"; depends=[lattice]; }; nparACT = derive2 { name="nparACT"; version="0.8"; sha256="0zwhz52j526n3xd21s7kghjaby56a8g296bkkc6scaa23zn1xg4b"; depends=[ggplot2 stringr zoo]; }; nparLD = derive2 { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; }; - nparMD = derive2 { name="nparMD"; version="0.1.0"; sha256="0kxbcykc01b1c68hk3akfhs9xzmshxvjvhm69k4j1c4nvpz8y9z9"; depends=[Formula gtools MASS matrixcalc matrixStats]; }; + nparMD = derive2 { name="nparMD"; version="0.2.1"; sha256="0wfmw1d4w8frbimq62749siy28bzci3h3lhsl5jx7zl7mxpl0q9a"; depends=[Formula gtools MASS matrixcalc matrixStats]; }; nparcomp = derive2 { name="nparcomp"; version="3.0"; sha256="1cs1idaylxdajb9vwpp6rkk56178i4c9nd0rxj8jbmdr56w4nrgq"; depends=[multcomp mvtnorm]; }; nparsurv = derive2 { name="nparsurv"; version="0.1.0"; sha256="1qy9qkkpqrk49vjxbyvl25i4kfk0py6v64izd8lmaw38dynybpy2"; depends=[survival TH_data]; }; npbr = derive2 { name="npbr"; version="1.6"; sha256="1jvq4snwrwjhhjgm8n8yxd5y94ks5zzi0xwdn931yp300qnikyzc"; depends=[Benchmarking np quadprog Rglpk]; }; @@ -13260,6 +13458,7 @@ in with self; { nphPower = derive2 { name="nphPower"; version="1.0.0"; sha256="0jqrbjm56nmhrmhsidz0bzyifq6kpqch8r64j8vd98b7xgcb6w4h"; depends=[MASS mvtnorm survival zoo]; }; nplplot = derive2 { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; }; nplr = derive2 { name="nplr"; version="0.1-7"; sha256="1h3qv9dlw2gx8km3slyvrl588nif1n87df8xwmm6p75ziqhn2f56"; depends=[]; }; + npm = derive2 { name="npm"; version="1.0.0"; sha256="01v913ylsh895yxkkpyviplcxcc3c90znccvjp7wbflmxxnvrasd"; depends=[assertthat cli crayon erratum]; }; 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=[]; }; @@ -13268,7 +13467,7 @@ in with self; { nppbib = derive2 { name="nppbib"; version="1.2-0"; sha256="1nn6wf89jhr3gy4rcd6px0cd5b1bsr7pbaxng4adba8n3yrss7vs"; depends=[]; }; npphen = derive2 { name="npphen"; version="1.1.1"; sha256="0xfsi6y4233gwslrh86chfpc71fdp5pfh4v9c9qcjqaib9hxvixn"; depends=[ks lubridate raster rgdal snow]; }; nprcgenekeepr = derive2 { name="nprcgenekeepr"; version="1.0.5"; sha256="1j6pfc694yf1m42a0fhlbh5wdbmgs61fswbw7083h69d2sr2zq05"; depends=[anytime futile_logger htmlTable lubridate Matrix plotrix readxl Rlabkey rlang shiny stringi WriteXLS]; }; - npreg = derive2 { name="npreg"; version="1.0-6"; sha256="0a28hj4a8j46zyh483y4b5abwy18yl648rf99nj8a2blhdmipyla"; depends=[]; }; + npreg = derive2 { name="npreg"; version="1.0-7"; sha256="1gr3nbzwa88favbfg9s3053s0jybblfbmhllfjc1a6p32s2p3yax"; depends=[]; }; npregderiv = derive2 { name="npregderiv"; version="1.0"; sha256="1k873cs3rs15l13z8017n4anacandx7di6yk1zlamcc5p3vlh59n"; depends=[]; }; npregfast = derive2 { name="npregfast"; version="1.5.1"; sha256="0s9ci3nybzwykrgi9z2rqp6l15mqbxf759ks0clvkbm7wxv3whk5"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; }; nprobust = derive2 { name="nprobust"; version="0.4.0"; sha256="1vry64r3xms6xls6bqq918prjyhs5svhl2yjvq0jxycaaqw2sgyp"; depends=[ggplot2 Rcpp RcppArmadillo]; }; @@ -13290,16 +13489,17 @@ in with self; { nsdr = derive2 { name="nsdr"; version="0.1.1"; sha256="1p73aj465lk52n3dikkqi54zm2f9v00ikpmry10p42qhfkgrw61l"; depends=[]; }; nse = derive2 { name="nse"; version="1.20"; sha256="037z164m78hdbwgnaa10jq50ngg3n9iigmyd1r5gz6hgvsr5sbnf"; depends=[coda mcmc mcmcse np Rcpp sandwich]; }; nse2r = derive2 { name="nse2r"; version="0.1.5"; sha256="1gwq8x3sn2f4p3yivmg2dljpdjcwsy2s6467pnwlcjdmr3sqgv2b"; depends=[httr jsonlite magrittr rvest xml2]; }; - nser = derive2 { name="nser"; version="1.3.4"; sha256="11pkabv3m4592l480mxkw91z58c91yi0n19yq5si0hv8rxgs592v"; depends=[dplyr googleVis jsonlite lubridate magrittr purrr readr RSelenium rvest stringr tidyverse]; }; + nser = derive2 { name="nser"; version="1.4.0"; sha256="1zbnf240f1r0nxhaijvzwa9830jisp6z2cmlp80zbwxgq2yc13d6"; depends=[dplyr googleVis jsonlite lubridate magrittr purrr readr RSelenium rvest stringr tidyverse]; }; nseval = derive2 { name="nseval"; version="0.4"; sha256="18avir5zllvm2sbi9616k7dlb8yxhvnbji7xshr4kcfvy1fvn2ia"; depends=[]; }; nsga2R = derive2 { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l33cr7xawz5w0mm4pwr6djhd8nfhx"; depends=[mco]; }; nsga3 = derive2 { name="nsga3"; version="0.0.3"; sha256="1jv3kw22jw24n7lnwhq3857mygr2yfv8c5xp3lbqqgz5840cdfa1"; depends=[mlr parallelMap rPref xgboost]; }; nsgp = derive2 { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; }; + nsm3data = derive2 { name="nsm3data"; version="0.1"; sha256="15m3x7jmwmh3rs65v5j39672253crc379zq3k6xigi6p7qnba7sn"; depends=[]; }; nsp = derive2 { name="nsp"; version="1.0.0"; sha256="1dbq6i79r3rlf69scgczv0p940mcza1l90l42af7xdhan0gh6z99"; depends=[lpSolve]; }; nspmix = derive2 { name="nspmix"; version="1.5-0"; sha256="1jaaw5ibn614yhlid0csnzj31npdx5zivm2nhnvyghzcmvyxavr8"; depends=[lsei]; }; nsprcomp = derive2 { name="nsprcomp"; version="0.5.1-2"; sha256="1zlc1ximx96f235c0l8qfs6vbp1kpnbf943wxsfahnnlnxvwi59f"; depends=[]; }; nsrr = derive2 { name="nsrr"; version="0.2.0"; sha256="1x1c7pvyfvzmaymxcz6ghr5002wz48796c3hsihwbx6951w623sq"; depends=[digest httr jsonlite]; }; - nsyllable = derive2 { name="nsyllable"; version="1.0"; sha256="004qb43j8ygr9ay63b38w0fwm24bhlzd206sxg88hh5ia69fw8ms"; depends=[]; }; + nsyllable = derive2 { name="nsyllable"; version="1.0.1"; sha256="1rxzfivg5pkx8485l4bxxrdnvik31g5jps5l386x0w7mfs6498jg"; 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=[]; }; @@ -13310,15 +13510,16 @@ in with self; { 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.1"; sha256="0ya95h88jkiwc7cg7ic8bmyd7b0lgnhxrywwqvi2j6m6nbvvaxzy"; depends=[glasso huge igraph Matrix tmvtnorm]; }; + nutrientr = derive2 { name="nutrientr"; version="0.1"; sha256="09623rimvy0jd6i26bm8d80jhvgwril9r2vbnlcwznmqr4fr6fhm"; depends=[dplyr ggplot2 httr jsonlite qpdf stringr testthat tibble tidyr tidyselect]; }; nvctr = derive2 { name="nvctr"; version="0.1.4"; sha256="1r7q9snr9ya1586fwbyvnk8rlb9yikl4yp3bn9kni0sw820npk1d"; depends=[magrittr pracma]; }; - nvmix = derive2 { name="nvmix"; version="0.0-7"; sha256="1lwyzdyd9n1131srmiirwf84d1zwr79qch9hbhlk88hf6prqz144"; depends=[ADGofTest copula Matrix mnormt pcaPP pracma qrng]; }; + nvmix = derive2 { name="nvmix"; version="0.0-8"; sha256="0vm10zjk69qmwii7qsgwwi6vp7mak2vxbm051ww6vzk0zfbhmvrf"; depends=[ADGofTest copula Matrix mnormt pcaPP pracma qrng]; }; nycflights13 = derive2 { name="nycflights13"; version="1.0.2"; sha256="07aa76c77pm1wpzkwjmzv8n6ir5i6fxawx8wx586gwc5wajcb1qf"; depends=[tibble]; }; nzelect = derive2 { name="nzelect"; version="0.4.0"; sha256="19kcbq454yg9g76ix7v3nibgw2203d7vv6f2d6d2zkcc0h08bjm7"; depends=[]; }; - nzffdr = derive2 { name="nzffdr"; version="1.0.0"; sha256="1r7pdv3jrkwnncyq61nb8js9y3kmxlg3d2cvb8b3i9fchx4059z6"; depends=[chron curl httr jsonlite stringr xml2]; }; + nzffdr = derive2 { name="nzffdr"; version="2.0.0"; sha256="1g32bra2z6a20jjqm6d7irccmr0x36h576bws6kh5x3h25i3plfv"; depends=[curl httr stringi xml2]; }; nzilbb_labbcat = derive2 { name="nzilbb.labbcat"; version="1.0-1"; sha256="0lypdwyvihza88jnccvh4wapfivsjy9sgxj4hvai52bkrw92578d"; depends=[httr jsonlite rstudioapi stringr]; }; nzpullover = derive2 { name="nzpullover"; version="0.3.0"; sha256="0b3mz5i58m48fa1x7gv4l3gqj0gvrar201ph2l1gkbcnfmazwjp8"; depends=[]; }; o2geosocial = derive2 { name="o2geosocial"; version="1.1.0"; sha256="158nbc45h4k677lgx9n976d9kz7hy8fb7z5s2v6pmkmh521jdn2a"; depends=[data_table geosphere ggplot2 outbreaker2 Rcpp visNetwork]; }; - o2plsda = derive2 { name="o2plsda"; version="0.0.12"; sha256="1rm57bnmzqz86yfbz2wnn6xfd5mr7pdbq89855hg40a59i3yhp04"; depends=[dplyr ggplot2 ggrepel magrittr Rcpp RcppArmadillo RcppEigen]; }; + o2plsda = derive2 { name="o2plsda"; version="0.0.15"; sha256="0ngnj0r14w5zjiv3y4a3ijgr3jb1kvvlifnzk25m5zidz36lyjap"; depends=[dplyr ggplot2 ggrepel magrittr Rcpp RcppArmadillo]; }; oRus = derive2 { name="oRus"; version="1.0.0"; sha256="0q6hgiidcpm95pyisndihxjg78v6k1zycdqd72309aankdk0g5h4"; depends=[dplyr knitr rmarkdown stringr tibble tidytext tm topicmodels xlsx]; }; oaColors = derive2 { name="oaColors"; version="0.0.4"; sha256="040sdqrk9dciylnnrrshlj06s9qhvngii9shx1p8412ip7mk8r1m"; depends=[MASS RColorBrewer]; }; oaPlots = derive2 { name="oaPlots"; version="0.0.25"; sha256="0c5ig1ar02vg38pjjmp3gd53ij1j7pzajs0zrlfajz141qkv2ysr"; depends=[ggplot2 oaColors]; }; @@ -13336,10 +13537,11 @@ in with self; { obsSens = derive2 { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; }; observer = derive2 { name="observer"; version="0.1.2"; sha256="1027827k57qb4xppx0xxxffd1s3n7pz754irdx3v1v3piix8xi8m"; depends=[bazar bit dplyr lazyeval magrittr tibble]; }; occ = derive2 { name="occ"; version="1.1"; sha256="1aka29qqwbd494kvi15yyyqkb9hks4ky2gcvykxhx2drm2fnsn4g"; depends=[]; }; + occCite = derive2 { name="occCite"; version="0.5.2"; sha256="0v0zjnjxd2swj5m1vaclajfrf9jgqyvpnfkzzcg7hjl6f870b368"; depends=[bib2df BIEN curl DBI dplyr ggplot2 htmltools httr leaflet lubridate RColorBrewer rgbif rlang RPostgreSQL stringr taxize tidyr viridis waffle]; }; occupancy = derive2 { name="occupancy"; version="1.2"; sha256="0j50vg1405n1hp72xqsq1hp3gdbfx5yq9w1zdv6dzjc6vjhbx00d"; depends=[matrixStats]; }; ocd = derive2 { name="ocd"; version="1.1"; sha256="06pyc352pvn85k76z9797gwk0ksbb3snvh6krysp68k3lcygq872"; depends=[]; }; - oce = derive2 { name="oce"; version="1.4-0"; sha256="0224fgd51fchn8apdi6x0n3ycl6zdbwch9janmidqr0i01418d1v"; depends=[gsw Rcpp sf testthat]; }; - oceanic = derive2 { name="oceanic"; version="0.1.0"; sha256="1bbbd6l4piimn8z51j205i3dmkz001qfpzisi7zkpq80r9adnqss"; depends=[sf]; }; + oce = derive2 { name="oce"; version="1.6-1"; sha256="1w0pbhki3z9qwaq6qgq3l4wr77yhs6xpd5fxpckw9ciwbj62v4ci"; depends=[gsw Rcpp]; }; + oceanic = derive2 { name="oceanic"; version="0.1.2"; sha256="15pnq3sf1h75np3xjvi3yap76z4jcpj1djm6i6cn16dbdx5p9cv3"; depends=[broom ggplot2 maps rgdal rgeos sf sp spData]; }; oceanis = derive2 { name="oceanis"; version="1.8.4"; sha256="0m0mhab74wnd9hm0im47c14m5mzsrvs61d07vikd8f1sly36h943"; depends=[classInt dplyr DT ggplot2 leaflet leaflet_extras lwgeom mapview sf shiny shinyBS shinyjs shinythemes stringr zip]; }; oceanmap = derive2 { name="oceanmap"; version="0.1.1"; sha256="06h4yxqcn3rjr3m2n82w128z110a4k5rg6msrbd0gcqksxc4vd2v"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; }; oceanwaves = derive2 { name="oceanwaves"; version="0.2.0"; sha256="1v4gj4ippv1l3r77z2ic19x5zi5lpsh5wihaqay3264zhpb3kv9a"; depends=[bspec ggplot2 signal]; }; @@ -13359,16 +13561,17 @@ in with self; { odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; }; odin = derive2 { name="odin"; version="1.2.1"; sha256="0xx31wyjdmad66ijwks64irf0j78hdjcifs5i8pla587xyv26ykk"; depends=[cinterpolate deSolve digest glue jsonlite R6 ring withr]; }; odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; }; - odpc = derive2 { name="odpc"; version="2.0.4"; sha256="1525apa5x4jqf8ijdc9xl60fgxsi5xsirhd35cmnc362sd7k2jjd"; depends=[doParallel foreach forecast MASS Rcpp RcppArmadillo]; }; + odpc = derive2 { name="odpc"; version="2.0.5"; sha256="0cbkq8parb8br1j386xk5mgwz8gkmwvp79f9sjvzhs7z6wlbp0pv"; depends=[doParallel foreach forecast MASS Rcpp RcppArmadillo]; }; odr = derive2 { name="odr"; version="1.2.1"; sha256="1k5qr5s28x14k831l92gx3zwfadq0q7nbnxj172hadhmggxfhkqc"; depends=[]; }; oem = derive2 { name="oem"; version="2.0.10"; sha256="1nf9ja4l7b9gnnvv216dz9siy02432qgyg930vcrqq3l8g05r6zc"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; }; oenb = derive2 { name="oenb"; version="0.0.2"; sha256="1jgxw7ycx2lcdzglg9nix8k08fs4r6i5jdsjzrd6w1dg6smsinl5"; depends=[dplyr XML]; }; ofGEM = derive2 { name="ofGEM"; version="1.0"; sha256="0xdkl8k12an9pdy6i5nay4m2iakrwsp0lr3zl8gphii75j0ywz7k"; depends=[CompQuadForm forestplot MASS]; }; - officedown = derive2 { name="officedown"; version="0.2.3"; sha256="1wz3312hq5ybichb0js7jiig7y0wb1nyd2lcsk1nlq70cqsgrv4w"; depends=[knitr memoise officer rlang rmarkdown rvg uuid xml2 yaml]; }; + officedown = derive2 { name="officedown"; version="0.2.4"; sha256="0h2zd7dzg63chakxsdb9n1w3sz684p63r6g1fphh4jcdmsbs5z2n"; depends=[knitr memoise officer rlang rmarkdown rvg uuid xml2 yaml]; }; officer = derive2 { name="officer"; version="0.4.1"; sha256="1gfx299zr4q2264q37994pirv5bd5isn1cszccz603ij3q40wajr"; depends=[R6 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]; }; 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]; }; ohtadstats = derive2 { name="ohtadstats"; version="2.1.1"; sha256="0hkjs322vii1dsminlkwpwi12sc9pd88jag7p4dmy6nfw2hh2d69"; depends=[lattice]; }; 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]; }; @@ -13380,11 +13583,13 @@ in with self; { omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; }; omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; }; 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.2"; sha256="12fv9hlffxfs1b86gbq994yq4ha10yakrs8b44j11ncqjk1n16dk"; depends=[]; }; omopr = derive2 { name="omopr"; version="0.2"; sha256="1ng94jnarj7pszxzvdlnrr2dbcvv5p5yrscjw6ihqkskpraw9f7w"; depends=[DBI dbplyr dplyr RSQLite]; }; - ompr = derive2 { name="ompr"; version="0.8.1"; sha256="10q6p1j7y22w82b73806ixcwvmpf5cffn1d84p7zqlgxcj6sk24w"; depends=[data_table lazyeval Matrix progress Rcpp rlang]; }; - ompr_roi = derive2 { name="ompr.roi"; version="0.8.0"; sha256="1cbrchvpd31lxpxvw2l3q9k5jmffarb1shca8kwm76y5a6zxxq63"; depends=[Matrix ompr ROI slam]; }; + ompr = derive2 { name="ompr"; version="1.0.2"; sha256="0n68i5papc3nsx2zf6azxw1gz0x7zsj8q0hqmv73fk885l1awyd0"; depends=[data_table fastmap lazyeval listcomp Matrix rlang]; }; + ompr_roi = derive2 { name="ompr.roi"; version="1.0.0"; sha256="1nv6cpnhfxz55r0y27i7rk81v45wblqhb9gis14rqdiypb74paif"; 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.0.4"; sha256="03dvbgxf5d181wka0gpf3sr008fzzva57xvdniynbgqskgcn4qi3"; depends=[dplyr ggfortify ggplot2 KEGGREST magrittr plyr reshape2 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.2"; sha256="1dxwxf0jy0cvizwdk0429x4bgzrk99mr1frfrf8hdw18ysjqwcfz"; depends=[dplyr flextable ggplot2 magrittr officer rlang stringr yaml]; }; onc_api = derive2 { name="onc.api"; version="2.0.1.0"; sha256="10scbhg6aniqzrbkblhfhz9ni710xzppbzfrr4wrhsy1z5y2nfwc"; depends=[anytime crayon httr humanize lubridate stringi testthat tictoc]; }; @@ -13395,12 +13600,12 @@ in with self; { oneclust = derive2 { name="oneclust"; version="0.2.1"; sha256="04nafy0bv3g5vjd5k7858lvs9rc141kzpblsdcb7sl4kfw76s11z"; depends=[magrittr Rcpp]; }; onehot = derive2 { name="onehot"; version="0.1.1"; sha256="1cdsz007wr054k5phvihhg4qx0fc039k2s6484m92kws8mb2ziix"; depends=[]; }; onelogin = derive2 { name="onelogin"; version="0.2.0"; sha256="06p3a8kaxmvsj8nn7dy8w6wv1jjw67is991hqg9q0fa20ifym3dl"; depends=[glue jsonlite magrittr R6 safer tibble]; }; - onemap = derive2 { name="onemap"; version="2.8.1"; sha256="0rc714ymwcgk05qcqzsispm8y8ip8h0y17fscgfyhwq2jh65a9sd"; depends=[dendextend dplyr ggplot2 ggpubr htmlwidgets plotly princurve RColorBrewer Rcpp rebus reshape2 smacof stringi tidyr vcfR]; }; + onemap = derive2 { name="onemap"; version="2.8.2"; sha256="14p3p3bvcgl63fk8sivwgqdcm7cydyh106rz26zk30gcjgvn91rm"; depends=[dendextend dplyr ggplot2 ggpubr htmlwidgets plotly princurve RColorBrewer Rcpp rebus reshape2 smacof stringi tidyr vcfR]; }; onemapsgapi = derive2 { name="onemapsgapi"; version="1.0.0"; sha256="11w3xkjxhjf0b78hfjxjk650giswaf1js471backz4pcb97gaigl"; depends=[dplyr furrr future httr purrr rlang stringr tidyr]; }; onepass = derive2 { name="onepass"; version="0.1.2"; sha256="1r8wk00aqc0sc7l6mmy1k4hkijfikynysrx5vvahbd6mlcdb3bmp"; depends=[jsonlite]; }; onewaytests = derive2 { name="onewaytests"; version="2.6"; sha256="05q2ir65x9pvsiim4l029hjhm12niiqjgk5rsx47i6vx23ffg8ir"; depends=[car ggplot2 moments nortest]; }; onion = derive2 { name="onion"; version="1.5-0"; sha256="07q5wwphb6jsk7ya7hgsf5782yalvhyc7h43hsd9rg4rhpmy8in9"; depends=[emulator]; }; - onlineBcp = derive2 { name="onlineBcp"; version="0.1.3"; sha256="1bnpl94v30h3il8flin85nsnm27z8ghscmzqj9mc3afv2rzi8kb4"; depends=[VIM]; }; + onlineBcp = derive2 { name="onlineBcp"; version="0.1.4"; sha256="0605hzmx42nd2ln4zv4kkhms6g8ffln3g4lnbpm93isgcxfxm3wg"; 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]; }; onlineVAR = derive2 { name="onlineVAR"; version="0.1-1"; sha256="01z2d91mbdjvwwiqjq1dbqp50jbc9v6d7nw4gs7d1abhsqyiqa13"; depends=[lattice]; }; @@ -13408,8 +13613,8 @@ in with self; { onlineretail = derive2 { name="onlineretail"; version="0.1.2"; sha256="0lid3g4v51c664304cxgjm209qxv88hqglv89frmj4afc0y6k7sc"; depends=[]; }; onls = derive2 { name="onls"; version="0.1-1"; sha256="0m7pnlzkqwzi6jncjzxzfvznipd4wg03zd9fc0ymwm9jvhm4p14g"; depends=[minpack_lm]; }; onnx = derive2 { name="onnx"; version="0.0.3"; sha256="1s0swrcff9v9ffbjkraahmb398gh2jrca2wf5k6gs8037frnl8wd"; depends=[reticulate]; }; - onpoint = derive2 { name="onpoint"; version="1.0.1"; sha256="13367azi6wcdc7gbpfk02d2mc5waqh4jfsd7zrxzbqb2qka9pfhr"; depends=[ggplot2 spatstat_core spatstat_geom]; }; - onsr = derive2 { name="onsr"; version="1.0.0"; sha256="04q88v07r2nzsrxxjy8wlmr65m8czllyv4wq40ms46m83s4pfhpj"; depends=[httr jsonlite readr tibble]; }; + onpoint = derive2 { name="onpoint"; version="1.0.2"; sha256="0l1dblj6cr2qagxmgx5ma455qazg1br5y0zpl2dv7jcdb24f7pnq"; depends=[ggplot2 spatstat_core spatstat_geom spatstat_random]; }; + onsr = derive2 { name="onsr"; version="1.0.1"; sha256="0qazwqdbbinsrimn7rf7xcjz5l5zp372i5j54rp87xy098q7c0l3"; depends=[httr jsonlite readr tibble]; }; ontoFAST = derive2 { name="ontoFAST"; version="1.0.0"; sha256="0l3d8bp86849rp0qrs1dfv7bjmrfdqvahb1x656vk69fi20722ma"; depends=[dplyr ontologyIndex pbapply plyr shiny shinydashboard stringr sunburstR usethis visNetwork]; }; ontologyIndex = derive2 { name="ontologyIndex"; version="2.7"; sha256="0j3h1spqwjhh1wbmwivmqcyi042yy7d565c3kxgn70xrmy693x1k"; depends=[]; }; ontologyPlot = derive2 { name="ontologyPlot"; version="1.6"; sha256="0n51x2im134wq3a54wrv02j1pgkpm1qcgb9hd0y6fchz43i039j1"; depends=[ontologyIndex paintmap Rgraphviz]; }; @@ -13417,34 +13622,36 @@ in with self; { oolong = derive2 { name="oolong"; version="0.4.1"; sha256="16f5r2z9p87k3pi643s63nxxnh7gn4x70m5jpk48hwb2s1rdar9h"; 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.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; }; - ooplah = derive2 { name="ooplah"; version="0.1.0"; sha256="0hrbpidcrnvm14qdjhcz4j4im1caydxkj4k9zmqs7dq3wv10rgr9"; depends=[R6]; }; - oops = derive2 { name="oops"; version="0.1.0"; sha256="06kyb01f09ah8aamyrazpyafbvs5vq32p16kbn12qi9zkwn0m9kk"; depends=[pryr]; }; + ooplah = derive2 { name="ooplah"; version="0.2.0"; sha256="1p74jh9g62yicrw0lhpbn0diqi2myl24z28kpd2b3mglyffadr0b"; depends=[R6]; }; + oops = derive2 { name="oops"; version="0.2.0"; sha256="0xg69riqphvsqqa953v4mlcakvl0invf29678nrljibg31n4wak5"; depends=[]; }; opGMMassessment = derive2 { name="opGMMassessment"; version="0.3"; sha256="1y6g65y6r3l0p7dbw70w8lbp4c888llwd7ak9wliwin0a54y13lz"; depends=[AdaptGauss caTools cluster ClusterR DataVisualizations DistributionOptimization doParallel dplyr foreach ggplot2 mclust mixAK mixtools multimode NbClust rlang]; }; + opa = derive2 { name="opa"; version="0.2.0"; sha256="05jqqqrrzv6mmhk78zjyryjy5lh693ywg1rnaanmxzbjmwikinrs"; depends=[assertthat combinat ggplot2 Rcpp]; }; opalr = derive2 { name="opalr"; version="3.0.2"; sha256="0nwa77l4d4zz3jxmfgm8h8k823lvcvjzbk3i6ahscrhzw2ky2phc"; depends=[httr jsonlite labelled mime progress]; }; opdisDownsampling = derive2 { name="opdisDownsampling"; version="0.8.1"; sha256="18y2p13q9ib5siml00ycjq395saqpnn0wa0jf2936v48ji4kjjzp"; depends=[benchmarkme caTools doParallel foreach memuse pracma twosamples]; }; - openCR = derive2 { name="openCR"; version="2.2.1"; sha256="0v3n1w0lxbz7hf68b2dp0vsgvby9vywd35w1n7d78gwznjlisfk8"; depends=[abind BH MASS nlme plyr Rcpp RcppParallel secr stringr]; }; + openCR = derive2 { name="openCR"; version="2.2.2"; sha256="1w3lrlc4w60fv026sbvmdki2jvg45m8mlbidwyd749vm93i3w6cs"; depends=[abind BH MASS nlme plyr Rcpp RcppParallel secr stringr]; }; openEBGM = derive2 { name="openEBGM"; version="0.8.3"; sha256="120lp7fy6abj6f8g6naq4018d0dfzz6bq3dlh0xdhd4iclb7pplv"; 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.2"; sha256="0f3nv6b33r3m7xlh2adbi0wlzr2dw6jfsrmz8fjrlh0l7xakf1hz"; depends=[data_table progress raster rgdal rgrass7 sp SSN]; }; + 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.0.13"; sha256="1hps67qlimhrjk3ymmr0jgqac8z6vilqgrchqp6z7vydqirfyp5l"; depends=[cli crayon ggplot2 InSilicoVA InterVA4 InterVA5 Tariff]; }; openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; }; openair = derive2 { name="openair"; version="2.8-6"; sha256="1h3klcg6gjr6q2pgcd317zyw9rpj4ngmkii0azcvrkpmqpbdkzrp"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tidyr]; }; + 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.6"; sha256="0cmjfhkbk4im3x8aas0q5pivlsxgqixf4f3jiindchki7g9nsw91"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sys webutils zip]; }; + opencpu = derive2 { name="opencpu"; version="2.2.7"; sha256="06jpmk95hm39ib5c75xw0mdrdv9x9zz1qil3m8ysb6pp1xx47jz0"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sys webutils zip]; }; opencv = derive2 { name="opencv"; version="0.2.1"; sha256="1zb6qdvlgylzm9afq8ybcrn2w5wcym6zi4b36sycp4clbc7gncq5"; depends=[magrittr Rcpp]; }; opendatatoronto = derive2 { name="opendatatoronto"; version="0.1.4"; sha256="0ggf25ry31xz69fl95cglg45ld8w7rc83wci609fmb63bhj8dzlg"; 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.1.0"; sha256="1vdga91jiw2dxfvjwr12kip60m8pdcvsan3g9cn9hhhpxsgidw6q"; depends=[base64enc httr jsonlite lubridate R6]; }; - openintro = derive2 { name="openintro"; version="2.2.0"; sha256="0jvgbb9az73sidr58lpz2p8gjigmi4873dpvzqbv7r8jzr1vqhvz"; depends=[airports cherryblossom ggplot2 readr rmarkdown tibble usdata]; }; + openintro = derive2 { name="openintro"; version="2.3.0"; sha256="0iknd0sk28qwm09zcs1dqqwlq28ph00swp75rbp6sfl0ypcnm7m5"; depends=[airports cherryblossom ggplot2 readr rmarkdown tibble usdata]; }; openmetrics = derive2 { name="openmetrics"; version="0.3.0"; sha256="0bcljsirlkxn0h87j2g2jb6spcik84h7nms06mcj40ckx188yr82"; depends=[R6]; }; - openssl = derive2 { name="openssl"; version="1.4.6"; sha256="0na3yficxg0hjql9pvz96f66yh4g5k2hfwcricb705z7f2pk5f23"; depends=[askpass]; }; - opentimsr = derive2 { name="opentimsr"; version="1.0.11"; sha256="0ad0kgy2byr228ljl0y6412zw3gy0kr17jyx7022bygpzv9d2158"; depends=[DBI Rcpp RSQLite]; }; + openssl = derive2 { name="openssl"; version="2.0.0"; sha256="0jsnzxa72bfxsdai25xyklmmrraaf9yv2nmqmf0bgzrkbzkgsa7b"; depends=[askpass]; }; + opentimsr = derive2 { name="opentimsr"; version="1.0.12"; sha256="1anxp7lk7dya68lqsy4fs5wf1baaridir1v1qwdlspc7wr0xb9yh"; depends=[DBI Rcpp RSQLite]; }; opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; }; - opentripplanner = derive2 { name="opentripplanner"; version="0.3.1"; sha256="1bavs7k27zicsjvz65va45cpmmviddxsgqir0hvpl9z40ml1gnp0"; depends=[checkmate curl data_table geodist googlePolylines lubridate pbapply rjson sf sfheaders tibble]; }; + opentripplanner = derive2 { name="opentripplanner"; version="0.4.0"; sha256="1q0szrbgcjzc7ny08gilv2q0v1x81i626mzsahkii79qqb7capr1"; depends=[checkmate curl data_table geodist googlePolylines lubridate pbapply rjson sf sfheaders]; }; openxlsx = derive2 { name="openxlsx"; version="4.2.5"; sha256="0695b265g7jwiqk5c3vmmfkvagx82bkpwhvqzhqaqmmn34l6vl35"; depends=[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=[]; }; @@ -13455,10 +13662,9 @@ in with self; { optBiomarker = derive2 { name="optBiomarker"; version="1.0-28"; sha256="10i9ir0056qxyiayg10v6v25m1b94m1wd7c8ssigiqjhjncpddw5"; depends=[e1071 ipred MASS Matrix msm randomForest rgl rpanel]; }; optCluster = derive2 { name="optCluster"; version="1.3.0"; sha256="0vzdd9awxli0zzyh2xb7j7wxza3fz5awyz6bjwf13qbjrrq43q2q"; depends=[cluster gplots kohonen MBCluster_Seq mclust RankAggreg]; }; optR = derive2 { name="optR"; version="1.2.5"; sha256="0q7jf4m0gzm11izl5lff17pvr855smqmc6zzi1bc7m6h3z865l32"; depends=[]; }; - optband = derive2 { name="optband"; version="0.2.1"; sha256="1rv4r7h7x3xipav917cz9bcr6nqjzbinfrqxv8mcls9gdl9ha3y9"; depends=[LambertW]; }; optbdmaeAT = derive2 { name="optbdmaeAT"; version="1.0.1"; sha256="1y1mvcyjihpj1wgjmifhmd10717wr1srp7h87azs4gfypgsiqchn"; depends=[igraph MASS Matrix]; }; optbin = derive2 { name="optbin"; version="1.1"; sha256="1v79qq1az8sg1slh9k3rqznw3dmppg0d0x7i2j5sz78b8gfq2m17"; depends=[]; }; - optedr = derive2 { name="optedr"; version="1.0.0"; sha256="1l1hfcy70d347f85pi6f71bj2hvk2wfzjksr3v8cwr78pz5yn3x7"; depends=[cli crayon dplyr DT ggplot2 hrbrthemes magrittr nleqslv nloptr orthopolynom plotly purrr rlang shiny shinyalert shinydashboard shinyjs]; }; + optedr = derive2 { name="optedr"; version="1.0.1"; sha256="0ywq5s3y30r0il2vsd99qgd8m7c1xsk59fgzz8zs5ips3xsjmnwg"; depends=[cli crayon dplyr DT ggplot2 hrbrthemes magrittr nleqslv orthopolynom plotly purrr rlang shiny shinyalert shinydashboard shinyjs]; }; optextras = derive2 { name="optextras"; version="2019-12.4"; sha256="1sqkid6h13h8i8wzri26s828ycwlxlwpwxd85r8bw9h8hs1n602r"; depends=[numDeriv]; }; optiRum = derive2 { name="optiRum"; version="0.40.1"; sha256="1kl9mzh53pwhrxbn89dsjjpfji7k8vmysscd1qd9sw7vqdan8g6x"; depends=[AUC data_table ggplot2 knitr plyr scales stringr XML]; }; optiSel = derive2 { name="optiSel"; version="2.0.5"; sha256="13rxv6wqz5gpmsfb96173p1y8140zqj4llihxsvjczcqwhrayjha"; depends=[data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv optiSolve pedigree plyr pspline purrr quadprog Rcpp RcppArmadillo reshape2 stringr]; }; @@ -13473,11 +13679,13 @@ in with self; { optimParallel = derive2 { name="optimParallel"; version="1.0-2"; sha256="178ayfaivkbxkghxbg97lx4gl27kxkmgaaw9y8q5206r4cncd6qg"; depends=[]; }; optimStrat = derive2 { name="optimStrat"; version="2.3"; sha256="1jkwhgpw7nknd7h8c01z25x566bw2qb388i6g5nwcygxsshdgpri"; 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.0"; sha256="09vcznvfcgal1cr17byw6c2kwkch6q9v32wvdxyjxrykc5y45hip"; depends=[dplyr glue magrittr rlang tibble]; }; + optimall = derive2 { name="optimall"; version="0.1.1"; sha256="15cq4b50j39ahpx84g0wrg7gs9n36rx4ij2srm14zcjsmvnxbv9p"; 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-8"; sha256="0xxspcv0vwnczi18ndifl8v2jg5i0vy6rp959vrsqcvxqpxp3q2l"; depends=[colorspace Rcpp]; }; + optimization = derive2 { name="optimization"; version="1.0-9"; sha256="1pg9a78hhm0h4pfagj13r1dmynv714knhw2dxhzhcvlgk9inpam8"; depends=[colorspace Rcpp]; }; 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="2021-10.12"; sha256="0hvrpfya767vp3anmb8ih516v4zz1sv4h193rn93kyjydf2lqf1r"; depends=[numDeriv]; }; optinterv = derive2 { name="optinterv"; version="0.1.0"; sha256="1yvjb9fyqj3pfglfdwdq4kpw9i5g5i3klgpqb05xdnacbnpdxvmp"; depends=[boot distances Hmisc lattice pbapply rootSolve weights]; }; @@ -13485,7 +13693,6 @@ in with self; { 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=[]; }; - optmatch = derive2 { name="optmatch"; version="0.9-15"; sha256="1n4ifrb2mvvvjp3q0slfqqx3ly9jlcsdg5x00dkg3drrv6zgs03m"; depends=[digest Rcpp RItools survey survival]; }; optparse = derive2 { name="optparse"; version="1.7.1"; sha256="1rqz0y4r94y3mwbb9kyz97cjqpnprka96qbncvbnbmgg2d630kij"; depends=[getopt]; }; optpart = derive2 { name="optpart"; version="3.0-3"; sha256="18h659gbgzflq81lcchc058xjgljkmhpsjkh51ylygwrv1qjrz2i"; depends=[cluster labdsv MASS plotrix]; }; optrcdmaeAT = derive2 { name="optrcdmaeAT"; version="1.0.0"; sha256="16g4612mwyfsckn6l71fbrjnnjv4yvnac1cccbrn3k8jh07qgb1h"; depends=[igraph MASS Matrix]; }; @@ -13499,6 +13706,7 @@ in with self; { 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]; }; + ordbetareg = derive2 { name="ordbetareg"; version="0.2.1"; sha256="0qxb5vx56250l4l5gk1drrzjwhm74267g98145cn8lwykcwh7vdp"; depends=[brms dplyr faux tidyr]; }; ordcrm = derive2 { name="ordcrm"; version="1.0.0"; sha256="1hy24s23l099b21w5j3p2f0748s8xmhxhslfp65fg7ycwda5qsyw"; depends=[rms]; }; orderbook = derive2 { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[hash lattice]; }; ordering = derive2 { name="ordering"; version="0.7.0"; sha256="0sgwgcjg6sazmi11c9qvxfrzg671kcp18i2q20xbmbj4v3yqhwbh"; depends=[]; }; @@ -13511,7 +13719,7 @@ in with self; { ordinalCont = derive2 { name="ordinalCont"; version="2.0.2"; sha256="1azwcr1si3b8dxf2y59d3rxw4msfq79khzg7zgqd0kbzyka4ygl8"; depends=[boot Deriv]; }; ordinalForest = derive2 { name="ordinalForest"; version="2.4-2"; sha256="0s5isf8z6rrksl4jv1aizffxy3bcl726qjpj5j6z7642wkdkpygi"; depends=[combinat nnet Rcpp verification]; }; ordinalLBM = derive2 { name="ordinalLBM"; version="1.0"; sha256="1sfzkm3f9s5nbalakgk5v919wr7hdlr5p280rw2p8dy4wxr3xk3s"; depends=[RColorBrewer reshape2]; }; - ordinalNet = derive2 { name="ordinalNet"; version="2.10"; sha256="0d2762scs1hwch5dc54dcin8j7ls9an69k68blabpcwq2i429ncz"; depends=[]; }; + ordinalNet = derive2 { name="ordinalNet"; version="2.11"; sha256="1xqrg5aglpm20ddi4ywhkcndi06fw3xxkfffqiapjs4bjayqfjji"; depends=[]; }; ordinalRR = derive2 { name="ordinalRR"; version="1.1"; sha256="1sfkq8gryyls22208ympw5scgb4jkd27pyc1qklw4x7cz9wfnfbp"; depends=[rjags]; }; ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.6"; sha256="0axpndyyns649mwifq8f16l8n8x9nic8cv8l71ljyr2gwlm0nqz0"; depends=[survival]; }; ordinalpattern = derive2 { name="ordinalpattern"; version="0.2.0"; sha256="0nf7323wd8wm4qxlhr6cvm1l87rwfdr5c4qivhncy0m2n5vknc1c"; depends=[gtools mvtnorm]; }; @@ -13544,31 +13752,33 @@ in with self; { oshka = derive2 { name="oshka"; version="0.1.2"; sha256="02hglpq5lknq93zbcf219lhnhppzgygkhxqixb15f89rxf9fczgs"; depends=[]; }; oskeyring = derive2 { name="oskeyring"; version="0.1.2"; sha256="1hwrgxsqd4s3wqvkgnga10382jva7l648jnaaff8pcb70hv4m0xg"; depends=[]; }; osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; }; - osmdata = derive2 { name="osmdata"; version="0.1.8"; sha256="0cypc9ibqhg4yghyq6l9nv3j90ajy1ri7dlsc92bhpc5b7im107n"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; }; + osmdata = derive2 { name="osmdata"; version="0.1.9"; sha256="01w6ikqv4cl5x6zs4pzx4fgrdcgia53c9gqwd52f5pmg088pj1x9"; depends=[curl httr jsonlite lubridate magrittr Rcpp reproj rvest sp tibble xml2]; }; osmextract = derive2 { name="osmextract"; version="0.4.0"; sha256="027mwp909xa2i32ibgig6kqazwy8kqyyqyjiyaqhpajm17kfb011"; depends=[httr jsonlite sf]; }; osmgeosample = derive2 { name="osmgeosample"; version="0.1"; sha256="1vcdisf147mcdqkc35czcphjh6rhaix9vy6l5inknaarmmajri3x"; depends=[dplyr geoR mapview nngeo osmdata pdist processx qpdf Rcpp rgdal sf sp splancs tibble]; }; osmose = derive2 { name="osmose"; version="3.3.4"; sha256="144mklbish59amzz7j95qmn98yqlz3bqzd2rp03wg9f5s69bxjj6"; depends=[fields knitr mgcv ncdf4 rlist rmarkdown stringr]; }; osmplotr = derive2 { name="osmplotr"; version="0.3.3"; sha256="0p94phv7jn0q9k25300zz59ldfphm9xgy6i7n3r8xj4zay0c7mf2"; depends=[e1071 ggm ggplot2 mapproj osmdata rgeos sp spatstat spatstat_core spatstat_geom]; }; - ospsuite_utils = derive2 { name="ospsuite.utils"; version="1.0.0"; sha256="1zbnxqabil52icpr8ykif5b3vs4rb18jiqicw26bvvv5q8aw1hf8"; depends=[R6]; }; + ospsuite_utils = derive2 { name="ospsuite.utils"; version="1.2.0"; sha256="16gcqnkqz0nz7mhgbnji3p1k2vv43jypx2xbcz4i4d8v1368akly"; depends=[R6]; }; osqp = derive2 { name="osqp"; version="0.6.0.5"; sha256="1djsd2fval9g18vx1dym8bnsnlv8p166zfyzdsj105ydn346kz08"; depends=[Matrix R6 Rcpp]; }; - osrm = derive2 { name="osrm"; version="3.5.0"; sha256="1l4i0ynd0vkgs6cf1f7dy8kh85r2yry99zpiyjcqslvlys2bhgd9"; depends=[curl googlePolylines isoband jsonlite sf]; }; + osrm = derive2 { name="osrm"; version="3.5.1"; sha256="1fii7xgcnrqmfp9rak6hfn6fh5pgwvww2nj9zfmrz6ams22ac6sw"; depends=[curl googlePolylines isoband jsonlite sf]; }; osrmr = derive2 { name="osrmr"; version="0.1.36"; sha256="1vnf6g1d9fjckz9ay910nb9gr1km2adwk3b0k460mxvpr36izkh7"; depends=[assertthat bitops R_utils rjson stringr]; }; ot = derive2 { name="ot"; version="0.2.0"; sha256="0lym92hsxhfjdkh738rxlpkq084454055vgxm2b4wdhqw00jwf5y"; depends=[]; }; otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; }; otp = derive2 { name="otp"; version="0.1.0"; sha256="0l0r56kn8jmjxhzz646fimi91blpgpynrrgfd03rh3dbifd5xhdz"; depends=[base64url openssl R6]; }; - otpr = derive2 { name="otpr"; version="0.5.0"; sha256="050w7b9b14w03agahfy2n6y5fpk2y5hp501dnlbxzzj66a714v4h"; depends=[checkmate dplyr geojsonsf httr janitor jsonlite rlang rrapply sf urltools]; }; + otpr = derive2 { name="otpr"; version="0.5.1"; sha256="1wh5rmwwwdf1wkb18ayx6zcnhwf80zziznk64jg1974g8crgdxsb"; depends=[checkmate dplyr geojsonsf httr janitor jsonlite rlang rrapply sf urltools]; }; otrimle = derive2 { name="otrimle"; version="2.0"; sha256="0rca8ln9cyikfpsf1af550cfx2zx110c8jxv64xf8dnnd09s9h7b"; depends=[doParallel foreach mclust mvtnorm robustbase]; }; otsad = derive2 { name="otsad"; version="0.2.0"; sha256="1jb6raxm70aywbgs7bdyw8vccy1nj924f4hkpjrlgnvzmy0hyhvs"; depends=[ggplot2 plotly reticulate sigmoid]; }; + ottr = derive2 { name="ottr"; version="1.1.3"; sha256="1sdr03sid4kix00ip0ipirr9qswxpj40mbhg17hzlj7gvjka77ka"; depends=[jsonlite pryr R6 testthat yaml zip]; }; + ottrpal = derive2 { name="ottrpal"; version="1.0.1"; sha256="02y917r48mqkga27f8019cdbx4mh45dr8l9s2ai1anxgvccnb4yi"; 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]; }; otvPlots = derive2 { name="otvPlots"; version="0.2.1"; sha256="0fjx0kl9y77mazwy7lg4mxc9sg8ysvvbl4h3k6bvfpnjm5x62hff"; depends=[data_table ggplot2 gridExtra Hmisc moments quantreg scales stringi]; }; ouch = derive2 { name="ouch"; version="2.17"; sha256="1a7r24j59xz3lxa5wc694j6b80j8m5l86zd1sw9pvs66l8gd98kf"; depends=[subplex]; }; - outForest = derive2 { name="outForest"; version="0.1.1"; sha256="183chvs5d5bb0qdgw1gxllb2ibjwyzyfn00fjjwnycald65figm3"; depends=[FNN missRanger ranger]; }; + outForest = derive2 { name="outForest"; version="0.1.2"; sha256="0329yrqknr894l5dp7zdbr0mifrafx9km074yqjfbnxbi245fd65"; depends=[FNN missRanger ranger]; }; outbreaker2 = derive2 { name="outbreaker2"; version="1.1.2"; sha256="0za20xl76i17pi2w2l69yiqrhfiichk4mngn062vv1hvqz4qgx4r"; depends=[ape ggplot2 magrittr Rcpp visNetwork]; }; outbreaks = derive2 { name="outbreaks"; version="1.9.0"; sha256="0x6r4rzcvd1rp8j4brq9c0zl2xsl5jfi18dny20an7aqk310p11v"; depends=[]; }; outcomerate = derive2 { name="outcomerate"; version="1.0.1"; sha256="07mwml7r98qjgvrp938sqf7klyspz110583j0zwb72j69n4whmrj"; depends=[Rdpack]; }; outlierensembles = derive2 { name="outlierensembles"; version="0.1.0"; sha256="0m2iaf3rbpwvyrjz6qglbrinmz676hnbqqm6vc38zb3k3cjcllaq"; depends=[airt apcluster EstCRM psych]; }; outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; }; - outliertree = derive2 { name="outliertree"; version="1.7.6-1"; sha256="0hb44l5rr2acpv1szfrmj4gxh1zj25gw6zjvymh2vgk4i9aa20im"; depends=[Rcereal Rcpp]; }; + outliertree = derive2 { name="outliertree"; version="1.8.1"; sha256="00fa8f4m48gig97hk7709r0x9c7v7jncryd4x4py0f9hd18vv4ix"; depends=[Rcereal Rcpp]; }; outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; }; outsider = derive2 { name="outsider"; version="0.1.1"; sha256="082yygvjs31clz8b3p59gkc26249gqp8hl1071gm6zi4vi2ng43x"; depends=[crayon curl jsonlite outsider_base remotes tibble yaml]; }; outsider_base = derive2 { name="outsider.base"; version="0.1.4"; sha256="1wlr3a14a330r9p4lahdmgs4hbgfsp05rsbzr30djwpv21bfl03a"; depends=[callr cli crayon devtools pkgload sys tibble yaml]; }; @@ -13581,9 +13791,9 @@ in with self; { overviewR = derive2 { name="overviewR"; version="0.0.7"; sha256="1y8iqgyhppl2w9z59azi3h1kgzrw5a1zqw09zyjp0ghlvpjbn9cn"; depends=[dplyr ggplot2 tibble]; }; 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]; }; - owidR = derive2 { name="owidR"; version="1.1.0"; sha256="1i9lqmabwk8nnva428syfk3zbr60s6crx6dq8y8i4272xprqd5dk"; depends=[curl dplyr forcats ggplot2 ggrepel htmltools jsonlite leaflet magrittr purrr readr rlang rvest scales sf stringr xml2]; }; + owidR = derive2 { name="owidR"; version="1.2.0"; sha256="0c0i0sbnzg61sx9nbc7srahkypk1fwysvbnrhp6j3vbd1rf6jqfk"; depends=[curl dplyr forcats ggplot2 ggrepel htmltools httr jsonlite leaflet magrittr purrr readr rlang rvest scales sf stringr xml2]; }; owmr = derive2 { name="owmr"; version="0.8.2"; sha256="0qlb5aw6n06yf8y2gd2fjp8kp3w0xgqh3fka7rxqndgvaqmin1a6"; depends=[httr jsonlite magrittr plyr tibble tidyr]; }; - ows4R = derive2 { name="ows4R"; version="0.2"; sha256="00bc5mmwy5dzfyw59amcxg32d5c2jnw5ymf0xvf2bdx6ar4y6z7a"; depends=[geometa httr openssl R6 rgdal sf XML]; }; + ows4R = derive2 { name="ows4R"; version="0.2-1"; sha256="19mm328slb2d8i0qg6nzifah276x637gcivrad24iz8zwn0msdc4"; depends=[geometa httr keyring openssl R6 rgdal sf 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]; }; oxcgrt = derive2 { name="oxcgrt"; version="0.1.0"; sha256="006kdggqdy7nkllln5p7fsapmmn5wlampyw2ifc4ls9jbz0p5h16"; depends=[countrycode dplyr jsonlite magrittr stringr tibble tidyr]; }; @@ -13592,7 +13802,7 @@ in with self; { ozmaps = derive2 { name="ozmaps"; version="0.4.5"; sha256="0sqxaiw1mdcg81228g7k7r6fla6d7hfk9ax2z6pws8457xbvrzka"; depends=[oz sf tibble]; }; p2distance = derive2 { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; }; p3state_msm = derive2 { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64r3abpk60y92k2lk5smlf8na68qazph8llsl2rv"; depends=[survival]; }; - pARI = derive2 { name="pARI"; version="1.1.0"; sha256="0v96a2ppydhjsxm9msyff82g5ajqwnxby8775ra0hy6lrafhbk3h"; depends=[ARIbrain matrixStats plyr Rcpp RcppArmadillo RNifti]; }; + pARI = derive2 { name="pARI"; version="1.1.1"; sha256="17dxrs4ckxh70d33n93bxr0gzsidychnyclwvnb42cqfplbndca5"; depends=[ARIbrain matrixStats plyr Rcpp RcppArmadillo RNifti]; }; pAnalysis = derive2 { name="pAnalysis"; version="2.0"; sha256="0pykdlbynzgcbnjs8xs8frgncf53l8qgf6na34adq7da76n570hi"; depends=[coin ggplot2]; }; pBrackets = derive2 { name="pBrackets"; version="1.0.1"; sha256="1rhsl59wqplpx4iavhm133fywkjdsbxw1x60fz22hby0cc9ckg6i"; depends=[]; }; pCODE = derive2 { name="pCODE"; version="0.9.3"; sha256="067hhlj75l04b404fidvb2rkj6bb3zxrjy37p5vzvc5a1p1pcnf5"; depends=[deSolve fda MASS pracma]; }; @@ -13604,11 +13814,10 @@ in with self; { pROC = derive2 { name="pROC"; version="1.18.0"; sha256="1abvbzdss12n64pp9vlgnn0q3abh0nj4n0a8cinwwvhphjrm9vym"; depends=[plyr Rcpp]; }; pRSR = derive2 { name="pRSR"; version="3.1.1"; sha256="1irx95b7cwvx3gpn9brjjn4k947m8frz542r18nilc9f1159mb3s"; depends=[]; }; pRecipe = derive2 { name="pRecipe"; version="0.1.1"; sha256="05lhviyzsrfh1f7jfp77i9xk5nnj4k3kgynw8brxmkyjnr68rayf"; depends=[curl data_table dplyr gdalUtils getPass ggplot2 hdf5r lubridate maps ncdf4 R_utils raster rgdal sp stringr viridis zoo]; }; - pTITAN2 = derive2 { name="pTITAN2"; version="1.0.1"; sha256="10slq7bazzj8fml0nsc3fkdyljhkh0ni6sf23iwav3f20kyqrzi4"; depends=[data_table]; }; + pTITAN2 = derive2 { name="pTITAN2"; version="1.0.2"; sha256="1mwx7k8ql4l572xvwb5gns9n4kqk779wwm4sg7nbgzz8xvcdh665"; depends=[data_table]; }; pa = derive2 { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; }; pacbpred = derive2 { name="pacbpred"; version="0.92.2"; sha256="13p405vh9rf1r5idxl5payc85vwlzcd87wm15163vc9gmil1ncsf"; depends=[]; }; pack = derive2 { name="pack"; version="0.1-1"; sha256="0x4p8clwp49s2y67y7in530xwhjngnqwagf9xnyb1jp0z3myd3r7"; depends=[]; }; - packClassic = derive2 { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; 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.8.0"; sha256="0jn47zhcfssa2rwjh8jc2zc93g766pslxx8vjm0bsnzyzjl2yqb9"; depends=[ade4 DiscriMiner doParallel FactoMineR foreach MASS pROC]; }; @@ -13619,28 +13828,27 @@ in with self; { packager = derive2 { name="packager"; version="1.14.0"; sha256="1fbwdq2x23l72lwwl1vrw4pdslwqp1dnp0ajpflnpq8yrv44sd7s"; 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="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; }; packcircles = derive2 { name="packcircles"; version="0.3.4"; sha256="05pv5c4k4njkr0xw6i6ksiy34hcyx2lbiqpv5gxw81yrkm0rxfyk"; depends=[Rcpp]; }; - packer = derive2 { name="packer"; version="0.1.1"; sha256="0hvvppkvid0lw93kb238bs22d60l8mf6phh15q9mblsz1gcqxva3"; depends=[assertthat cli fs htmlwidgets jsonlite rprojroot rstudioapi usethis]; }; + packer = derive2 { name="packer"; version="0.1.2"; sha256="1p5482rz3n8rn2hxfrkj64n4l5drp12qhq0xz18l5bzf5gwazqng"; depends=[assertthat cli fs htmlwidgets jsonlite rprojroot rstudioapi usethis]; }; packrat = derive2 { name="packrat"; version="0.7.0"; sha256="1hnwhdgqljqs3m7c4rjlyndyc0k85jpa4rbfymxkm3zjg3yy3g78"; 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.1"; sha256="1ry0lwzphgivmlc8swhk6l26q4ca6x36rm8r7vvjb64y0fvayqk5"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; }; - pacs = derive2 { name="pacs"; version="0.3.5"; sha256="0a8k6i7v26r4njbpcy3zp556kxn1p9rx6v7375k1r4w2b49jba6k"; depends=[memoise stringi xml2]; }; + pacs = derive2 { name="pacs"; version="0.4.3"; sha256="1pa5s69rgxv7z3jyxxkd835pf76zjz24h3hdpqqnxr11mipvv256"; depends=[curl jsonlite memoise renv stringi xml2]; }; pacviz = derive2 { name="pacviz"; version="1.0.1"; sha256="0afh10zf32lk6gh42y6mjfgdw2blhjavhbq2n3s8h62w9blfad5g"; depends=[circlize e1071 plotrix]; }; padr = derive2 { name="padr"; version="0.6.0"; sha256="1l8i40vqpy033j8nc8fqp9ymn378bhyy4hkj8xhk94npv7jibqkk"; depends=[dplyr lubridate Rcpp rlang]; }; paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; }; pafdR = derive2 { name="pafdR"; version="1.0"; sha256="1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5"; depends=[curl exams stringr]; }; pafr = derive2 { name="pafr"; version="0.0.2"; sha256="0ali4m1pv73y88x1dk5rvmg1ysy48janjnc1hnqfcndszfz2b0wm"; depends=[dplyr ggplot2 rlang stringr tibble]; }; - pagedown = derive2 { name="pagedown"; version="0.16"; sha256="0ia1x6sjhwzicw8dr6i12ihcgpf8h0qn3c5343bfvw5lncmrpb74"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; }; + pagedown = derive2 { name="pagedown"; version="0.17"; sha256="100av273xnky7zb0mxxwswv2n711qbc692sz7708pl52xvx29cqs"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; }; pagemap = derive2 { name="pagemap"; version="0.1.3"; sha256="1rwspbk7xmp27iadrd1471a7z71qyzlb0vnkw4ssjk7wi8q48fnj"; depends=[htmlwidgets]; }; pagenum = derive2 { name="pagenum"; version="1.2"; sha256="0nid26wmrm76ifxqpqqry232q4alf80i7df1rg237qil8asx06k1"; depends=[]; }; pageviews = derive2 { name="pageviews"; version="0.5.0"; sha256="1fhlm2y288wx625y0glxybjb0xv9sqvvln35jqlwqq38h3grcpqd"; depends=[curl httr jsonlite]; }; - pagoda2 = derive2 { name="pagoda2"; version="1.0.8"; sha256="1fxcn6g197na4fjs4ra1s1gz1nihcvai2zk4p55hk0qf3nz2r707"; depends=[dendsort drat fastcluster igraph irlba magrittr MASS Matrix mgcv N2R plyr R_utils R6 Rcpp RcppArmadillo RcppEigen RcppProgress rjson rlang RMTstat Rook Rtsne sccore urltools]; }; - pagoo = derive2 { name="pagoo"; version="0.3.9"; sha256="0z8k7hcnc4galr1afwk7zjdjbn298jgzawc09afq6pnhl5mjiya0"; depends=[BiocGenerics Biostrings dendextend DT GenomicRanges ggfortify ggplot2 heatmaply magrittr plotly R6 reshape2 S4Vectors shiny shinydashboard shinyWidgets vegan]; }; + pagoda2 = derive2 { name="pagoda2"; version="1.0.9"; sha256="0dzq40wc9yyfmycb8cghvfmvd6y5qg7q5p3m3g8r1bcjc8qfbl2f"; depends=[dendsort drat fastcluster igraph irlba magrittr MASS Matrix mgcv N2R plyr R_utils R6 Rcpp RcppArmadillo RcppEigen RcppProgress rjson rlang RMTstat Rook Rtsne sccore urltools]; }; + pagoo = derive2 { name="pagoo"; version="0.3.12"; sha256="16d935lwsx2b9g57k8sh48pc6ldgga0q6z2pgm6p4ia07l0p4rd4"; depends=[BiocGenerics Biostrings dendextend DT GenomicRanges ggfortify ggplot2 heatmaply magrittr plotly R6 reshape2 S4Vectors shiny shinydashboard shinyWidgets vegan]; }; painbow = derive2 { name="painbow"; version="1.0.1"; sha256="10c8spknh7sqa4vl0q4bjdwd03nl4qk28hj2qa9sbyb1ryc7p4j9"; depends=[ggplot2]; }; painter = derive2 { name="painter"; version="0.1.0"; sha256="0qr6p13h50rlavcsamxmijfr4dfrbv1k088m28qf8a4gam3ap85b"; depends=[]; }; paintmap = derive2 { name="paintmap"; version="1.0"; sha256="1qw5725yjymxmfhffqjx4lbmzj437c7qwr8xrzmf52f0m28nl3vk"; depends=[]; }; pairedCI = derive2 { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; }; - pairheatmap = derive2 { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; }; pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; }; pairwise = derive2 { name="pairwise"; version="0.5.0-2"; sha256="1h1rqh3c40am73zsg4k8zwb14jipjl2pn2znippsnz3sn6plvm8g"; depends=[]; }; pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-27"; sha256="0yp9nibdrsddjqq6vdlfbpvmfgm209h99b6qqqd6wgfzng327822"; depends=[boot coin MASS MCPAN mcprofile]; }; @@ -13668,36 +13876,37 @@ in with self; { 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]; }; - pammtools = derive2 { name="pammtools"; version="0.5.7"; sha256="09qz67f9qxvsb997vnd6znh9q5x23f33kiz6gyvix7flam317p9n"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv mvtnorm pec purrr rlang survival tibble tidyr vctrs]; }; + pammtools = derive2 { name="pammtools"; version="0.5.8"; sha256="14yang78y4a9qd9haqbzpc6hb5z8zhfar91r187bzy4417fpw69p"; 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.6"; sha256="1dk3jjj826p7xrz10qz04vyc068xnypg7bp0pj4c32z3da0xzh5d"; depends=[]; }; pander = derive2 { name="pander"; version="0.6.4"; sha256="1knjcr50xxns3w3kh15myjpsizn4d7fdqx071a4yj90imif07qjh"; depends=[digest Rcpp]; }; pandocfilters = derive2 { name="pandocfilters"; version="0.1-4"; sha256="1nlnvnvq3zwzpf6hnf8akl0w25kr7hrbr98rw5vgncxw35314xdp"; depends=[jsonlite]; }; - panelView = derive2 { name="panelView"; version="1.1.5"; sha256="1pvi1b571sbqbhma7m277ppcv98c9yc720fr9pgqfdy8hswsd2rd"; depends=[ggplot2 gridExtra]; }; + panelView = derive2 { name="panelView"; version="1.1.9"; sha256="1qrlw4n5sw1mdchgn6p2f2zijmmm87nq5ffdgg4m1gyzkd40qfw8"; depends=[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]; }; panelr = derive2 { name="panelr"; version="0.7.6"; sha256="0vc57c261n9himhxs0yy2pd5vd935cg42hf6jnk84y61glw7dgxk"; depends=[crayon dplyr Formula ggplot2 jtools lme4 lmerTest magrittr purrr rlang stringr tibble]; }; panelvar = derive2 { name="panelvar"; version="0.5.3"; sha256="1ckllb14k2xrnbwi5z84f6003f61vdbw0wcsa4vsma0yp4iybh0q"; 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.1.0"; sha256="0a5b9mzqnvcf0xrd814gnf2nd8incclx214x1k0c3x2zpqbf9p02"; depends=[attempt dplyr glue httr jsonlite magrittr purrr RCurl readr rlang stringr]; }; papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; }; 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=[]; }; parSim = derive2 { name="parSim"; version="0.1.4"; sha256="0iswcw52skx1hxb9bv9ihhwwyybprsk2615pmijsxp0bkzgsjc88"; depends=[dplyr pbapply snow]; }; parade = derive2 { name="parade"; version="0.1"; sha256="07x02j9jlldz4p0cyhw292041l3pziv56bhbzp4f0qpxhcbn5zn4"; depends=[]; }; - paradox = derive2 { name="paradox"; version="0.7.1"; sha256="1difp0bzsfxcmbm1snahh3i6417k1a2w4mnjx65p20n2yiclmrgs"; depends=[backports checkmate data_table mlr3misc R6]; }; - parallelDist = derive2 { name="parallelDist"; version="0.2.4"; sha256="0gqf9vi9hlbflxj941jv7hli8jiy2sqg8b312h401f8rkfqa9ckv"; depends=[Rcpp RcppArmadillo RcppParallel]; }; + paradox = derive2 { name="paradox"; version="0.8.0"; sha256="1jfzbpqi1rp3r8hnk37dqwggp48ha5bnilmdz7dwzfdaskssycxa"; 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.1.0"; sha256="1zppgd0dwxfryv6wfl6k7jrny1yqb5q4f8phnnmzz9ydlv7xyv32"; depends=[htmlwidgets]; }; parallelly = derive2 { name="parallelly"; version="1.30.0"; sha256="0fwzkzw9vjblwk5rg56yl8qfn7irnbpm70405lmj7awvf35q1c5a"; depends=[]; }; - param6 = derive2 { name="param6"; version="0.2.3"; sha256="1d4fhs82qpb18480wg6i1q59kw65hqvafv5nb7p7jqys16mmsj3i"; depends=[checkmate data_table dictionar6 R6 set6]; }; + param6 = derive2 { name="param6"; version="0.2.4"; sha256="0h4r2l670zvsbq0cakbm7f5yc0ghaf40kby80q3ql8lwgfnay1jd"; depends=[checkmate data_table dictionar6 R6 set6]; }; paramGUI = derive2 { name="paramGUI"; version="2.1.4"; sha256="0k2wkl99ji3w7xmd9k7zzvrr3dbf3237q7lxm527dnrq331pmxmi"; depends=[colorspace fields shiny shinydashboard TIMP]; }; - parameters = derive2 { name="parameters"; version="0.15.0"; sha256="0f06bwlc1g0xdyhdqzx8plfx1jwk8a9j4lcbl91wjsil8wja0bkl"; depends=[bayestestR datawizard insight]; }; + parameters = derive2 { name="parameters"; version="0.16.0"; sha256="1i295d5nqjr3pvp9vz59wiasrxy9n78q518phcd15sxcjzcj0l27"; depends=[bayestestR datawizard insight]; }; paramhetero = derive2 { name="paramhetero"; version="0.2.0"; sha256="16gvs8328bnqvhx47f0xwnmbmlakxmp4ivnjxk2b13z6qjs70ij4"; depends=[ggplot2 ggpubr lme4 survey]; }; - paramlink = derive2 { name="paramlink"; version="1.1-2"; sha256="0y6wsrxwyavipmrjjznr2n920w0p6qlwapxc9mnkh9c6w3yznka2"; depends=[assertthat kinship2 maxLik]; }; + paramlink = derive2 { name="paramlink"; version="1.1-4"; sha256="1dwm7kv1a9d07hpk3l6mih6qbq9ga7idqlyqs0impxnd83lwp093"; depends=[assertthat kinship2 maxLik]; }; paramlink2 = derive2 { name="paramlink2"; version="1.0.3"; sha256="0ypn0fdrphblw64sdnfmyf9q4zbakqvl4xzr451phvhx52n1gb73"; depends=[pedprobr pedtools]; }; params = derive2 { name="params"; version="0.7.3"; sha256="0zii9nxgl2z46vyqn2l0kdjmib90534ybpizck74mp2wp1vh9ndj"; depends=[glue purrr RcppTOML readr whisker]; }; paramtest = derive2 { name="paramtest"; version="0.1.0"; sha256="0yn1s1qkgby8x0qn7cy1zhxzc0wyi7bm30pkvijhn5h5afjpylsy"; depends=[boot]; }; @@ -13715,13 +13924,11 @@ in with self; { parqr = derive2 { name="parqr"; version="0.1.0"; sha256="11956dvv46sgpmbv429c24wxdhfqvc07jxc1i4yymyz1l8wgr3yb"; depends=[arrow magrittr purrr]; }; parseRPDR = derive2 { name="parseRPDR"; version="0.2.1"; sha256="1k4153bhf623xla6b174as4n8fh8ic0wnw8psxwa2vj3q3nifwbx"; depends=[bigmemory data_table doParallel foreach readr reticulate stringr]; }; parsec = derive2 { name="parsec"; version="1.2.5"; sha256="1qd9gyb6zkahql74x9nds72fmx0i5cyg9kank929cz5iziqf85y5"; depends=[igraph netrankr]; }; - parsedate = derive2 { name="parsedate"; version="1.2.1"; sha256="05l6f1n3dsm383w7jfg3j38klvmzzfvc7qi9zr5ij13rljj8s1vb"; depends=[rematch2]; }; + parsedate = derive2 { name="parsedate"; version="1.3.0"; sha256="1c2cpsvma3fkx6zp191bpfvf5rmpsr13g8rzqk6ycyb0n7b9k4qy"; depends=[]; }; 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="0.1.7"; sha256="12chngdzplwkk1c9k8y7cwaqlyy72yamlknp7ksg7g9p3b58f1fb"; depends=[dplyr generics globals glue hardhat lifecycle magrittr prettyunits purrr rlang tibble tidyr vctrs]; }; + parsnip = derive2 { name="parsnip"; version="0.2.0"; sha256="0g213c91lzwq9hd22yxkj3igqw04czncnbc4jddnpghp4gpfn1kn"; depends=[cli dplyr generics ggplot2 globals glue hardhat lifecycle magrittr 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]; }; - partialAR = derive2 { name="partialAR"; version="1.0.12"; sha256="0fv1ffgqdbl04b4cmfmvzwah8ms9cxx3dsdralkk92bxxhybcjsl"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; }; - partialCI = derive2 { name="partialCI"; version="1.2.0"; sha256="0hi936yg4g5bg61ix2i68f8q4c5nvvshl2728ynz1rl970qfcrp7"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; }; partialOR = derive2 { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; }; particle_swarm_optimisation = derive2 { name="particle.swarm.optimisation"; version="1.0"; sha256="0y3pq129irxifiph40mf027gbc02c4pwkchs305pcbj3vr9pwsyw"; depends=[R6 rgl]; }; particles = derive2 { name="particles"; version="0.2.2"; sha256="0pncfpk89hsfjch8h5b86rx7hsgdyg9bsxc54f5bf0y8gh9v98qj"; depends=[digest dplyr igraph magrittr mgcv Rcpp rlang tidygraph]; }; @@ -13772,7 +13979,7 @@ in with self; { paws = derive2 { name="paws"; version="0.1.12"; sha256="0kn1z045r106fwqcaz52hb02bhrcblh479cajfjiq480s1iljcw6"; 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.1.12"; sha256="04gnaxmj21l312xkrsd9bisi0bz9h6h5fyhwlqylcxi077z1yb2g"; depends=[paws_common]; }; paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.12"; sha256="0llyd9hc679pad1ih0rcc38q5xxpzinhwrl8cvrkgsjgbc3agq42"; depends=[paws_common]; }; - paws_common = derive2 { name="paws.common"; version="0.3.15"; sha256="0kj5b4253j4rljkj0ibh21kh9r1yq9idz9vf1f4ag775ivsc2dk5"; depends=[base64enc digest httr jsonlite xml2]; }; + paws_common = derive2 { name="paws.common"; version="0.3.16"; sha256="0mdbnbjprghiwz4i9abh62l5q6mncz3iq76wxvj7ncinf89kd83w"; depends=[base64enc digest httr jsonlite xml2]; }; paws_compute = derive2 { name="paws.compute"; version="0.1.12"; sha256="1km6fng6il5fcjlrbbndahsw2dr2ql83hwac9wlpd67zm3wy9lky"; depends=[paws_common]; }; paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.12"; sha256="0in4f8ygw5g2v6vl3lz2y0v51llglh8b1ymbd04d54xxlgn83knh"; depends=[paws_common]; }; paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.12"; sha256="0ac6hzn4ilfjhzdmc9x80999fl18cz16mky31qd3y09m93w2xkdj"; depends=[paws_common]; }; @@ -13788,7 +13995,8 @@ in with self; { pbatR = derive2 { name="pbatR"; version="2.2-13"; sha256="01ra1ggdpxdl1xqjdh86qynr5gkgzw01ww6j9bwgx4mj20i6j1ha"; depends=[rootSolve survival]; }; pbbd = derive2 { name="pbbd"; version="1.0.0"; sha256="07g029qw5949500c879iv86zwg2fldqrz8wzfz335jmcinqimgj6"; depends=[ibd]; }; pbdMPI = derive2 { name="pbdMPI"; version="0.4-4"; sha256="006pm2yn4mdrpwhfflqcybzv41lz7zssrjrcpq5g98zf60p9c07a"; depends=[float rlecuyer]; }; - pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-6"; sha256="0yy3x3l04vx13jbjbvkvsc8jdbf0abndjfknszdx3bi18b2chi4r"; depends=[]; }; + pbdSLAP = derive2 { name="pbdSLAP"; version="0.3-2"; sha256="0zriqilakcpj874wv2jrji4djvgj773xf8rz13bir8vyspkyhh10"; depends=[pbdMPI rlecuyer]; }; + pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-7"; sha256="020qy6fq8w8wq0j3bii14ahrlg8wzl0lrnndfr6scmrg9ghjnbfz"; 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.1"; sha256="1if7msv9i7jhg1as1f7m81a95dnwhwj3yfs24bqr0f6r0ch4b8xj"; depends=[broom dplyr knitr lme4 magrittr MASS Matrix numDeriv]; }; @@ -13807,18 +14015,18 @@ in with self; { pcaPP = derive2 { name="pcaPP"; version="1.9-74"; sha256="1dlrz5plb8b89vr3j6sn9jwryyhcwflqkiilxkybbr379m1pp0sh"; depends=[mvtnorm]; }; pcadapt = derive2 { name="pcadapt"; version="4.3.3"; sha256="01wvcflfsnlsq23vq03n870fxsab3ab29k26nqlqxw82lbvx99s3"; 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-4"; sha256="0yph4w5hvw8ss8w6wkpka4crk9nwmm6d091gz3pr1vv2qifx98ii"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; }; + pcalg = derive2 { name="pcalg"; version="2.7-5"; sha256="136w94s0pi5llyfkh7vdff94yl3x6ajbnzb112fd485wr60f7d5x"; 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=[]; }; pcatsAPIclientR = derive2 { name="pcatsAPIclientR"; version="1.0.0"; sha256="07klw04zq3q18d13grmgjl4fywby7bazxm28v25snrim33n2ybhp"; depends=[httr jsonlite testthat]; }; pccc = derive2 { name="pccc"; version="1.0.5"; sha256="0jh8yadks76ip9jmgvld9nycdm74f5gllkyhfmnrir8vi6xwvbad"; depends=[dplyr Rcpp]; }; pcdpca = derive2 { name="pcdpca"; version="0.4"; sha256="0ys4hrin0w3f87d1d986wvrfkfwapzj9hz7d7v92r60ns74g7r5m"; depends=[fda freqdom]; }; - pcds = derive2 { name="pcds"; version="0.1.2"; sha256="1xzjs1pyjr0mrr9wdn30vkzp2bzc4ms7cby0pb95ysmvrdxl81d7"; depends=[combinat interp plot3D plotrix Rdpack]; }; + pcds = derive2 { name="pcds"; version="0.1.4"; sha256="0fqd5hxnmg4yybwn7wva224paxhnxx4fb2pymrxp716brxwi7gaf"; depends=[combinat interp plot3D plotrix Rdpack]; }; pcensmix = derive2 { name="pcensmix"; version="1.2-1"; sha256="1yrz4hdj52in8z65qyl18kh7frv75rb8ss5ljv3vbm6yhxi32jnd"; depends=[]; }; pcev = derive2 { name="pcev"; version="2.2.2"; sha256="1l0afcdzkxzkhkc8ln2fzi50hc7nfq46lg6hhx6rrzkb41w82iqw"; depends=[corpcor RMTstat]; }; 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="0.6"; sha256="10mjsw07yiwclh5ziy0bkd6mdwawxs5xv18pwxp7pc6bq2ikjjhb"; depends=[bigstatsr bnlearn Rfast Rfast2 robustbase]; }; + pchc = derive2 { name="pchc"; version="0.7"; sha256="0m5s5mdrgnppy54zalc6c7hjvwfd47jr3yls1jvm7455chz18nr9"; depends=[bigstatsr bnlearn Rfast Rfast2 robustbase]; }; pcmabc = derive2 { name="pcmabc"; version="1.1.1"; sha256="1bacxxgcrgsa7h1baybwwinw3n95cx5wkkfm5cb4iscgk910mfmb"; depends=[ape distory geiger mvSLOUCH phangorn TreeSim yuima]; }; pcnetmeta = derive2 { name="pcnetmeta"; version="2.7"; sha256="0jibi4wylxkisgj740xbibjqs60d5xg9my4sx7vshgfl941y9wcv"; depends=[coda rjags]; }; pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; }; @@ -13827,18 +14035,18 @@ in with self; { 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]; }; pct = derive2 { name="pct"; version="0.9.3"; sha256="1y3cmqirh003hyg80bnl0rpbcp9h9bzlv0lbjxq0wmvsb84hbqbn"; depends=[boot readr sf stplanr]; }; - pcts = derive2 { name="pcts"; version="0.15"; sha256="1wl3hgj0sn9128vwcqin37jn5ww3na4g7r1isj39j6m2v76s3ndk"; depends=[BB gbutils lagged lubridate Matrix mcompanion PolynomF Rdpack sarima xts zoo]; }; + pcts = derive2 { name="pcts"; version="0.15.2"; sha256="06dkhpgbn11048hfp4hmrrqaymz50zmv2940496hmqy5c5zfdmd3"; depends=[BB gbutils lagged lubridate Matrix mcompanion PolynomF Rdpack sarima xts zoo]; }; pdR = derive2 { name="pdR"; version="1.7"; sha256="05rnyb9znb71ilr9kf62x30knby1rm0p4ain220wvb62vkz054d7"; depends=[boot car coefplot lmtest papeR plm sandwich]; }; pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.4"; sha256="1sf2d7vh7a1qc0cq230an8pzg9qi9g640z0ql8x2pp9wfawfzn1f"; depends=[ddalpha multitaper Rcpp RcppArmadillo Rdpack]; }; pda = derive2 { name="pda"; version="1.0-2"; sha256="1y067d3v9qlirawy01nmsh4fdynfh80mvg9r55kkban2z7xhql9j"; depends=[data_table httr jsonlite Rcpp RcppArmadillo rvest survival]; }; pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; }; - pder = derive2 { name="pder"; version="1.0-1"; sha256="147fc5swmh0qrg7k3q3gpnvl9f7hhjjzwi8f5dc4fkyj14qi5bm5"; depends=[]; }; + pder = derive2 { name="pder"; version="1.0-2"; sha256="0qrf0igxzalvsanj1mqryi0xl9lq0wlpg8bbgasbx3ibq4yqwn0s"; depends=[plm]; }; pdfCluster = derive2 { name="pdfCluster"; version="1.0-3"; sha256="13m7b2wivvf58vyqbysj4r04w0nj2b5x0xnaxip712a6c66x1h7l"; depends=[geometry]; }; - pdfetch = derive2 { name="pdfetch"; version="0.2.5"; sha256="0dfi259yyhydfbrq09m3x8m12bxpmhm1l187b8m85mp38hwpz504"; depends=[curl httr jsonlite lubridate reshape2 stringr XML xml2 xts zoo]; }; + pdfetch = derive2 { name="pdfetch"; version="0.2.6"; sha256="1nqnjmci2653hvqsh1957vn3pkx1n0264v4sk76manrsdk1s42zk"; depends=[curl httr jsonlite lubridate reshape2 stringr 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.0.1"; sha256="1dcbs5n5y8zi7bbyx491m9ik8kkmjr301x8ms85fmwdfb5a97m8k"; depends=[qpdf Rcpp]; }; + pdftools = derive2 { name="pdftools"; version="3.1.1"; sha256="1lflqf2ypdm4w033vyjykmsy8cl34sp42fzkfgfdhvl2d0xjhl96"; 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"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; }; pdmod = derive2 { name="pdmod"; version="1.0.1"; sha256="04bk9gjg2c55hk6k1hy0m29927s8a5ig6mr4xb89npam68g0pcms"; depends=[mco]; }; @@ -13854,9 +14062,9 @@ in with self; { peakPick = derive2 { name="peakPick"; version="0.11"; sha256="1zf7ff9arm4hkdxrfhb0p8p7npd51icy773g2raaqsfys825xwhm"; depends=[matrixStats]; }; 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="2021.10.11"; sha256="1cb63qrc1lwds5kv55jd2mibsw49bpfaj066kwhs1wgby25h8ydi"; depends=[foreach lava prodlim riskRegression rms survival timereg]; }; + pec = derive2 { name="pec"; version="2022.03.06"; sha256="1v43k2l46dz1myas9afyd5cp9a9rw7l71i7k4z8pwlw6aydispnm"; 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.3.0"; sha256="08y5kymkm8b4a2vymfm9gk0igfd7vbzlz5wjigxiqhlfjggl16jr"; depends=[]; }; + pedSimulate = derive2 { name="pedSimulate"; version="1.3.1"; sha256="0rbk8w742i8s9avn9xn8290nkd2mb9aa7p8vzya1dk72x7l51y7b"; depends=[]; }; pedalfast_data = derive2 { name="pedalfast.data"; version="1.0.0"; sha256="02s6igrybcfs8nyxr50iiwclhrwnq3x2x5w886imrlp2wbkf13m4"; depends=[]; }; pedbuildr = derive2 { name="pedbuildr"; version="0.2.1"; sha256="19yzfg5jms2qnww4p8npmk9815hrgqsbd49h8pi62yy9kjqnccai"; depends=[forrel glue pedprobr pedtools]; }; pedgene = derive2 { name="pedgene"; version="3.3"; sha256="0y6kr5ad4fmxljsj0czs9h1dkz63wvqiira9ibgsf0707xb0vh7f"; depends=[CompQuadForm kinship2 Matrix survey]; }; @@ -13865,14 +14073,15 @@ in with self; { pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; }; pedmod = derive2 { name="pedmod"; version="0.1.0"; sha256="1gkln7z1dbyhl44r2mp5s4sk8az0yyzpwqq8sa9z6pa3zhw55gf7"; depends=[BH Rcpp RcppArmadillo testthat]; }; pedmut = derive2 { name="pedmut"; version="0.3.0"; sha256="0w42jhgrkf5f1baz2jb94fyccm0wx94vg0g1px4p39jvpknz9d6a"; depends=[]; }; - pedprobr = derive2 { name="pedprobr"; version="0.6.0"; sha256="1m5kcjwlpcxhcvk8204vxzahljpwdqdgjff01bz75fkricv4qn2d"; depends=[pedmut pedtools]; }; - pedquant = derive2 { name="pedquant"; version="0.1.7"; sha256="0hy6dz00bgfncndkqhz2ikrmcn08s86cqcyjaj7cnpivlpwvph4i"; depends=[curl data_table ggplot2 gridExtra httr jsonlite plotly readr readxl rvest scales stringi TTR xml2 zoo]; }; - pedsuite = derive2 { name="pedsuite"; version="1.0.4"; sha256="0cg19aln0j9grjh53yckyvzspsclqcrzm0ch2b0854bjbnrzmxz1"; depends=[dvir forrel ibdsim2 paramlink2 pedbuildr pedmut pedprobr pedtools ribd segregatr]; }; + pedprobr = derive2 { name="pedprobr"; version="0.6.1"; sha256="0rz5i03d75nlli8m186b4a1yy3yx54cvm8hvp603ziglp2b5mf2y"; depends=[pedmut pedtools]; }; + pedquant = derive2 { name="pedquant"; version="0.1.8"; sha256="0rzpnsf6d509f4wkkdcrsw7rfdlvg12mr25ha3dy6a47nqscxlhp"; depends=[curl data_table ggplot2 gridExtra httr jsonlite PerformanceAnalytics plotly readr readxl rvest scales stringi TTR webdriver xml2 zoo]; }; + pedsuite = derive2 { name="pedsuite"; version="1.1.0"; sha256="19vbfn8dy7a4hrrv8zsja721lchng55gvc26xlkzx5dl96d2xp9w"; depends=[dvir forrel ibdsim2 paramlink2 pedbuildr pedmut pedprobr pedtools ribd segregatr verbalisr]; }; pedtools = derive2 { name="pedtools"; version="1.1.0"; sha256="0cm2arhn81dl4w26rc701f8b7ldz1r1ad7g7lnw67lq2irnfkgfg"; depends=[kinship2]; }; - peermodels = derive2 { name="peermodels"; version="0.10.2"; sha256="0zmkpfgji375155h8sgz2n1vw2ir9z0n6hd6ha3as3af797bx7f4"; depends=[httr jsonlite stringr]; }; + peermodels = derive2 { name="peermodels"; version="0.10.3"; sha256="116xn5w7rwm9q0m7bj4z29l4hspj2nqdcxzir9dqpdqmf7z58v67"; depends=[curl httr httr2 jsonlite stringr]; }; pegas = derive2 { name="pegas"; version="1.1"; sha256="0ngd0laqbs139ji9hm9kwsm9rm56agw2yyfcplxgqva936l93fl7"; depends=[ape]; }; pema = derive2 { name="pema"; version="0.1.0"; sha256="0z56r7jjigyw3lxf2bvzhfb3a7bs79pj4w7r9qg231z30sf4m1fz"; depends=[BH Rcpp RcppEigen RcppParallel rstan rstantools sn StanHeaders]; }; pems_utils = derive2 { name="pems.utils"; version="0.2.29.1"; sha256="0nmawl1l2wf77r02qpazqwm5708fk98k7l07wyybviwb1j3x1pqj"; depends=[baseline dplyr ggplot2 lattice latticeExtra loa RColorBrewer Rcpp rlang]; }; + penAFT = derive2 { name="penAFT"; version="0.2.0"; sha256="1sqxw3kny7ys9b0zldnfdblg50zccp6kscqy0sx0h7g577zdyk09"; depends=[ggplot2 irlba Matrix Rcpp RcppArmadillo]; }; penDvine = derive2 { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; }; penMSM = derive2 { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; }; penPHcure = derive2 { name="penPHcure"; version="1.0.2"; sha256="1c90d6f78npvzsvcy9vh8s6izfgbcxzly37lpwhqgdl5daww03l1"; depends=[MASS Rcpp RcppArmadillo Rdpack survival]; }; @@ -13881,7 +14090,7 @@ in with self; { penalizedSVM = derive2 { name="penalizedSVM"; version="1.1.2"; sha256="03zw95bc6svbnzak9x72s3b8l9gh581mxn2di1fl89gxlh864amd"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; }; penalizedclr = derive2 { name="penalizedclr"; version="0.1.0"; sha256="0ka27azfdj4wa1p628b99pkrfjy1x8yjyd3d5g2v8mbsfg3j3bwg"; depends=[clogitL1 penalized survival tidyverse]; }; penaltyLearning = derive2 { name="penaltyLearning"; version="2020.5.13"; sha256="0297rp5zn6d0axl44i3baq2vqvhrx6s8irrysvqdcx1rkishf4j0"; depends=[data_table ggplot2]; }; - pencal = derive2 { name="pencal"; version="1.0.1"; sha256="1vlan2578racspfgysj741k5kl2rs4m77jw03pnvjffcnbazalng"; depends=[doParallel dplyr foreach glmnet lcmm magic MASS Matrix nlme survcomp survival survivalROC]; }; + pencal = derive2 { name="pencal"; version="1.0.2"; sha256="1p9s9d8awc3v1g4qkigpp76gmicmhy7mia8vnfpinwmvik6bazim"; depends=[doParallel dplyr foreach glmnet lcmm magic MASS Matrix nlme 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]; }; @@ -13889,7 +14098,7 @@ in with self; { pense = derive2 { name="pense"; version="2.1.0"; sha256="1gz9p3khmv6v4m9aw314zdxdr33qmddb4s2pads0lm5iylngjd4j"; depends=[lifecycle Matrix Rcpp RcppArmadillo rlang]; }; pensim = derive2 { name="pensim"; version="1.3.3"; sha256="1raap4zlqgcqh8x83kp1ss5qcn0p7bwribp4dhfhrh9rl92hh92a"; depends=[MASS penalized]; }; peopleanalyticsdata = derive2 { name="peopleanalyticsdata"; version="0.2.1"; sha256="0ig65y4sl6wagzcvj8wwjw2dblb61hgbsqvp76wvxbhga1q0wnpf"; depends=[]; }; - peperr = derive2 { name="peperr"; version="1.3"; sha256="0pcz7vjl4hgp25a8zv2zcsz3s3ly1zfngkpdnvvviycvq070plv4"; depends=[snowfall survival]; }; + peperr = derive2 { name="peperr"; version="1.4"; sha256="0fcznmpm4f1jvl4yl7aqb637l387g74xk86vj3lwp65jzq6g8i0a"; 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]; }; @@ -13910,7 +14119,7 @@ in with self; { permubiome = derive2 { name="permubiome"; version="1.3.1"; sha256="0a4swfkmqqr8a1psc6rlnxnpm43fj42gjkikcqy8d84wrfz2wrr9"; depends=[dabestr ggplot2 gridExtra Matrix rlang]; }; permuco = derive2 { name="permuco"; version="1.1.1"; sha256="09n0q0p98bcbsp9n6hf4i6jfpnp0j0f97idz2bc8jp2qx5pcr7am"; depends=[Matrix permute Rcpp]; }; permutations = derive2 { name="permutations"; version="1.0-9"; sha256="1701jah8i9frw3cbqlri2l56lansw54l3pp9h1fy36a8ahhcllkg"; depends=[magic numbers partitions]; }; - permute = derive2 { name="permute"; version="0.9-5"; sha256="0ra8p5mf2590azrkas8z2ry7mif77xqxd29n4zgyi5vll225726j"; depends=[]; }; + permute = derive2 { name="permute"; version="0.9-7"; sha256="1h4dyhcsv8p3h3qxsy98pib9v79dddvrnq7qx6abkblsazxqzy7g"; depends=[]; }; permutes = derive2 { name="permutes"; version="2.3.2"; sha256="0xnd44769kxspvsw3yf0alji25vdbvnva8bxaq9filvfx95kcaqp"; 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]; }; @@ -13936,7 +14145,7 @@ in with self; { pgam = derive2 { name="pgam"; version="0.4.15"; sha256="12llflsb32dfvxl3nbyb9bsl9bmd35g5g163hd3axzmg1bgi21ls"; depends=[]; }; pgdraw = derive2 { name="pgdraw"; version="1.1"; sha256="1s1b1izpgryrqsjkdh3yvr137054sipj3kwdkzlx2af8xjr53f85"; depends=[Rcpp]; }; pgee_mixed = derive2 { name="pgee.mixed"; version="0.1.0"; sha256="115vvpv54q80486i3xs2yhmfyx476cf4g1v43q6l7wj3jwzcrvbg"; depends=[copula mvtnorm Rcpp RcppArmadillo]; }; - pgirmess = derive2 { name="pgirmess"; version="1.7.1"; sha256="1jdirknw7hrgjrnpb4va0p58ar5d74vwiyyxvny7synn3bbv8anz"; depends=[boot maptools rgdal rgeos sp spdep splancs]; }; + pgirmess = derive2 { name="pgirmess"; version="2.0.0"; sha256="1j15spsmx1k2kw6vc4brcinpva3wzw4i78626fb5cdrwb8q34i4y"; 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.5"; sha256="09cpjvhjdncrjs7v2hy6xdqq9p57gd1n8gmaq0p3jmhvrbnsgpfy"; depends=[]; }; pgnorm = derive2 { name="pgnorm"; version="2.0"; sha256="1k9z7pvmranr8m62v7amc0pj6lwzh3wqi79gg3mflifn1mr6c057"; depends=[]; }; @@ -13955,8 +14164,9 @@ in with self; { phase1RMD = derive2 { name="phase1RMD"; version="1.0.9"; sha256="0dnyqa6jias2jqjqjpiq32jnd21ghb2shw45vdq8b5xyb8rxclwj"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; }; phaseR = derive2 { name="phaseR"; version="2.1.3"; sha256="1xqh6k8zl0jc2srklb8vg57f88kssm80b286asg2cawanj06qs2k"; depends=[deSolve]; }; phateR = derive2 { name="phateR"; version="1.0.7"; sha256="16xb6fy0aa024054jwfbavjbzhwj6g4p6yrzy1lnzvpn8kb23hn5"; depends=[ggplot2 Matrix memoise reticulate]; }; - phd = derive2 { name="phd"; version="0.1"; sha256="1scwan3pkhdl0nyhpjrkcal1f58x0jkdkhixdcxppr1363r1v22a"; depends=[glmnet]; }; + phd = derive2 { name="phd"; version="0.2"; sha256="14ck98h8ivaw88ybl5pwv70s5jwhkhdgmxg7q0b5bphj8hyf616r"; depends=[glmnet]; }; pheatmap = derive2 { name="pheatmap"; version="1.0.12"; sha256="1hdh74az3vyzz6dqa311rhxdm74n46lyr03p862kn80p0kp9d7ap"; depends=[gtable RColorBrewer scales]; }; + phecodemap = derive2 { name="phecodemap"; version="0.1.0"; sha256="12dhyzazdsf938zp7i4ckbh2h5fvxg209mb4mq319akp34746h50"; depends=[collapsibleTree config dplyr DT golem plotly purrr readr rintrojs shiny shinyBS shinycssloaders shinydashboard shinydashboardPlus]; }; phenModel = derive2 { name="phenModel"; version="1.0"; sha256="07jsc8jiwgxvhv4m6nr7llm22zzh5hd3pakw5c93jzim2835zvkp"; depends=[dplyr ggplot2 reshape]; }; phenability = derive2 { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6jfg23cnwh7hhmwv6538wg2jla9w138la7rhpd1"; depends=[calibrate]; }; phenesse = derive2 { name="phenesse"; version="0.1.2"; sha256="1f5m8pq1n6x9ic4b0cb7j3dwfn1xfkbbpn0zr32frkiai3jmzv3j"; depends=[boot fitdistrplus]; }; @@ -13971,7 +14181,7 @@ in with self; { phenopix = derive2 { name="phenopix"; version="2.4.2"; sha256="0rrp4ch32hzlm727xpwsvfsw7d4qypv7iiq8hrg9az6nb39pbvp7"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster sp stringr strucchange zoo]; }; phiDelta = derive2 { name="phiDelta"; version="1.0.1"; sha256="0g1g5516p8i1gfpvsy75rdirib8sx1ki2mbf1cvgsnzh70h72gbv"; depends=[]; }; phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; }; - philentropy = derive2 { name="philentropy"; version="0.5.0"; sha256="0bs1kk28gjmplnk257cy064hwy360lc378dj4dz3gwsqaj19m7mk"; depends=[dplyr KernSmooth Rcpp]; }; + philentropy = derive2 { name="philentropy"; version="0.6.0"; sha256="1dpf4hfflp4mcql4na46wzcq1flabkipiwyycz9wj5xbxlmcz2hk"; depends=[KernSmooth poorman Rcpp]; }; phm = derive2 { name="phm"; version="0.1.2"; sha256="0jm4w2rj80jz24134y8sj6w7f2icdizs644zfbiq77vzfj1mg8i6"; depends=[data_table shiny slam tm]; }; phonR = derive2 { name="phonR"; version="1.0-7"; sha256="0al2cbynnbvmd90lk1w1g1ppslqq0ng8vbb6bl7m4kqwd2lgv056"; depends=[deldir plotrix splancs]; }; phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; }; @@ -13979,7 +14189,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.1.1"; sha256="0krb1gl5h6k6m289f0hjizrx6ysmv21z9a4h7k6fip0r26fjili6"; depends=[htmltools]; }; - photobiology = derive2 { name="photobiology"; version="0.10.8"; sha256="155pw8ylgnyg5r5z1sir3gnhpp7607w9anxqwlvhwvq2pi0gvfv0"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble tidyr zoo]; }; + photobiology = derive2 { name="photobiology"; version="0.10.9"; sha256="0fjiwp6hpb1fgzv4qfmljrnarvrnwsdy0rqz735mrizxdn1qigqg"; 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.23"; sha256="1g73pjh7yqbdn8sd8r3w19l67yvmxyxd2zwsvywvdh1jj2cn6s7h"; depends=[anytime colorSpec dplyr lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; }; photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.3-1"; sha256="0inhl6ba1fzkak4752m60hkm6fzapzyz5kchvz18yv33dmm13v1c"; depends=[photobiology]; }; @@ -13987,8 +14197,7 @@ in with self; { photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.2"; sha256="0ab5ks72mb5x03xc0ww9fcl0h13ja8402b1s670lqmmhyvp6fj3s"; depends=[photobiology photobiologyWavebands]; }; 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.4.4"; sha256="04bl72jaxm7vfvzss3wxjqf7p4l6rrqv11a7gqyfg0xqy18clnhx"; depends=[photobiology]; }; - photosynthesis = derive2 { name="photosynthesis"; version="2.0.1"; sha256="0drbic4sdx841pzcqvi0gkny7qrnzixlc0wsr6m0llh7pfyl99s6"; depends=[checkmate crayon dplyr furrr future ggplot2 glue gunit magrittr minpack_lm nlme pkgnet purrr rlang stringr tealeaves tidyselect units]; }; + photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.5"; sha256="0lvj5birzzjrkcikg515zgxa2gd06bsbr5i575y9ppxw7kbyqga9"; depends=[photobiology]; }; phuassess = derive2 { name="phuassess"; version="1.1"; sha256="0jplj9gih32dllx2hw5aqvc9b94sbrbv66s3a5r8mdbpjh93rhng"; depends=[]; }; phyclust = derive2 { name="phyclust"; version="0.1-30"; sha256="0fy9q95vmlm9idpax7alhpfwn30gflnc9md72g91jypyxkx5nr7p"; depends=[ape]; }; phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; }; @@ -14015,14 +14224,15 @@ in with self; { phytools = derive2 { name="phytools"; version="1.0-1"; sha256="1j0s7ai3mmhsc94m4gka11mnw9ryvrhnf7s8298i21a2xhsmvgxp"; depends=[ape clusterGeneration coda combinat expm maps MASS mnormt nlme numDeriv phangorn plotrix scatterplot3d]; }; phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; }; piRF = derive2 { name="piRF"; version="0.1.0"; sha256="04k09ylc6hqw57dlv7sfnisn1167dr550y1j9xl7prvlf3jksg06"; depends=[Rdpack]; }; + piar = derive2 { name="piar"; version="0.3.2"; sha256="1z78cf0zqxfdx4lqip17v3c7jdkq1g8db8231az8bv527n2gqh8p"; depends=[gpindex]; }; picante = derive2 { name="picante"; version="1.8.2"; sha256="19savjzj44b7ifdxcp02ynj22z4n4ikq2aipc74ljzy3yykmqmjn"; depends=[ape nlme vegan]; }; picasso = derive2 { name="picasso"; version="1.3.1"; sha256="1z7zm88wjp7fia7054l7i55f152iddrjj9wbcpcskhc8s6kfg53c"; depends=[MASS Matrix]; }; pid = derive2 { name="pid"; version="0.50"; sha256="05s3xqf95d4avh7gkr49jsm8jzacbv694c3wgppkkc40zip6vkc7"; depends=[DoE_base FrF2 FrF2_catlg128 ggplot2 png]; }; - piecemaker = derive2 { name="piecemaker"; version="1.0.0"; sha256="0qm9bbsxfmiycbhappzpm98arlwnbck29c75xjyg03m1dbfykvnk"; depends=[purrr rlang stringi stringr]; }; - piecepackr = derive2 { name="piecepackr"; version="1.9.2"; sha256="01vwp0h4955g9vbblsiq1m4mgc6ilx6iryfv07n81yd6b6s0690d"; depends=[backports gridGeometry grImport2 jpeg png purrr R6 stringr tibble]; }; + piecemaker = derive2 { name="piecemaker"; version="1.0.1"; sha256="1i9k88i0rqsbf2564ims69x1pind1xgvljaf9smnnjpi77442jiw"; depends=[rlang stringi stringr]; }; + piecepackr = derive2 { name="piecepackr"; version="1.10.1"; sha256="189dqwh7kkgcvw2j8bqqff2r9si6i89avip0zdm1h941akc66kdv"; depends=[gridGeometry grImport2 jpeg png purrr R6 rlang stringr tibble]; }; piecewiseSEM = derive2 { name="piecewiseSEM"; version="2.1.2"; sha256="1qxwc1drx26p4cgymrfjmg5i7ypl7gddv40virkpmc0qaag9pq36"; depends=[car DiagrammeR emmeans igraph lme4 MASS multcomp nlme]; }; piggyback = derive2 { name="piggyback"; version="0.1.1"; sha256="1d448hkk772d21ix1l1cgq2a0spyjnppyrn1myjcv3dcrfxndn83"; depends=[clisymbols crayon fs gh httr jsonlite lubridate memoise]; }; - pillar = derive2 { name="pillar"; version="1.6.4"; sha256="17m13rzgwdddwa0n3gpmax6wmfaphbg71l13ffhw5vnxf6i94fh3"; depends=[cli crayon ellipsis fansi lifecycle rlang utf8 vctrs]; }; + pillar = derive2 { name="pillar"; version="1.7.0"; sha256="1fqk18vc9ashf12gdqkdi6n1nj5lh324vwhgiib3b2fcb2bghhbq"; depends=[cli crayon ellipsis 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]; }; pinbasic = derive2 { name="pinbasic"; version="1.2.2"; sha256="0mcw68wrixz2jf62nfifdgg8bnp4h1p3byivz28wi61blj8iaa75"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; }; @@ -14059,20 +14269,21 @@ in with self; { pkdata = derive2 { name="pkdata"; version="0.1.0"; sha256="1kmcalidw2zidd6i8ds0k057b3187by2k8z6764va43d5garbbcv"; depends=[lubridate]; }; pkgKitten = derive2 { name="pkgKitten"; version="0.2.2"; sha256="0rappcycpkdfdivzl6nn3jq1f42r9jqqmkb33asvhmpjs35fyc3s"; depends=[]; }; pkgbuild = derive2 { name="pkgbuild"; version="1.3.1"; sha256="0j6v5nbp8kg1m3j999gd1qsbdmqcqm1mf28ngmm177miwv8q4skw"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; }; - pkgcache = derive2 { name="pkgcache"; version="1.3.0"; sha256="0wclbg0q5gx6dsy58979j3nzpfd6b6y4gxzrihlw37zf7c54cpxx"; depends=[assertthat callr cli curl digest filelock glue jsonlite prettyunits processx R6 rappdirs rlang tibble uuid]; }; + pkgcache = derive2 { name="pkgcache"; version="2.0.1"; sha256="0krgsisnm53vxs4bbz7dm968s9322i6rqdj3bsykqm1hdy669p8s"; depends=[callr cli curl filelock glue jsonlite prettyunits processx R6 rappdirs]; }; pkgcond = derive2 { name="pkgcond"; version="0.1.1"; sha256="03a4blq3niw1mljzylamvmr3l43czqlww4i6n7zb0dlym9x8gs1w"; depends=[assertthat]; }; pkgconfig = derive2 { name="pkgconfig"; version="2.0.3"; sha256="0l1qph8zyi2sic3k2qcd7vlfl7rzfh1q7z7zvjkl5f7y1x2fy3rk"; depends=[]; }; - pkgdepends = derive2 { name="pkgdepends"; version="0.2.0"; sha256="152dpxrsdw5rp0zi0h65p6q0a2hs076wbjpslj5hhqwnwphdpbsr"; depends=[callr cli crayon curl desc filelock glue jsonlite lpSolve pkgbuild pkgcache prettyunits processx ps R6 rematch2 rprojroot tibble withr zip]; }; - pkgdown = derive2 { name="pkgdown"; version="2.0.1"; sha256="154pcj6ggr3g1pdlvnyzh2xssiz7vb88pclzwc0wcck5kyrwnvmp"; depends=[bslib callr crayon desc digest downlit fs httr jsonlite magrittr memoise purrr ragg rlang rmarkdown tibble whisker withr xml2 yaml]; }; + pkgdepR = derive2 { name="pkgdepR"; version="1.0.0"; sha256="098fcj1s5rcjxmn57449f4zk9z2w4mqwxkvxxjazd1nj7wa45z8p"; depends=[dplyr magrittr scales viridisLite visNetwork]; }; + pkgdepends = derive2 { name="pkgdepends"; version="0.3.0"; sha256="1pzfm9k8s7w2jacachppgznf8562dshzm23yg7vwd37b7wvr6qxn"; depends=[callr cli crayon curl desc filelock glue jsonlite lpSolve pkgbuild pkgcache prettyunits processx ps R6 rprojroot withr zip]; }; + pkgdown = derive2 { name="pkgdown"; version="2.0.2"; sha256="11grx7a2rz6b4kwspm7c8crjav677c22hysnp4bkwh5g8kr5nm2h"; depends=[bslib callr crayon desc digest downlit fs httr jsonlite magrittr memoise purrr ragg rlang rmarkdown tibble whisker withr xml2 yaml]; }; 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.0"; sha256="1qjym8kkbmzdz46xn6a4ir8b07ws30s3m7zdrgh98nf0vrv9bkj8"; depends=[cli magrittr remotes]; }; pkgload = derive2 { name="pkgload"; version="1.2.4"; sha256="03yr9mswx9nij27bp21q6c533zx310xwzhwm52dwr7554k42p4fn"; depends=[cli crayon desc rlang rprojroot rstudioapi withr]; }; pkgmaker = derive2 { name="pkgmaker"; version="0.32.2"; sha256="14ggsd24n5g5rvn0wl4w90ipxzmywqikh28llj89q6kpxwnv4iff"; depends=[assertthat codetools digest registry stringr withr xtable]; }; - pkgndep = derive2 { name="pkgndep"; version="1.1.0"; sha256="1fd42v91z2ad6h7vcwy9rbg1s886laapz9n2737vdxywc00ylidb"; depends=[BiocManager brew ComplexHeatmap GetoptLong hash]; }; + pkgndep = derive2 { name="pkgndep"; version="1.1.1"; sha256="0dr5b3ibhvj29f9yvi0v3k41ac6krf85ghxswwr6p4m9vsblmdfx"; 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.0.3"; sha256="1icn8qw6jpcgbmidqpml4ifpv1i5z2i4hp6b0gpb1xk9dlf6mnl2"; depends=[assertthat curl jsonlite parsedate prettyunits tibble]; }; + pkgsearch = derive2 { name="pkgsearch"; version="3.1.0"; sha256="1xr4k7x3qhny9qpn9sr2img6hakp3k2qy85l1hsirnz7kjk4dgbn"; depends=[curl jsonlite parsedate prettyunits]; }; pkgverse = derive2 { name="pkgverse"; version="0.0.1"; sha256="0lsv7s9vsjvfpy19nxbdlbm363j01wwqqnrp0nlrik590hfq4w83"; depends=[devtools usethis]; }; pkmon = derive2 { name="pkmon"; version="1.0"; sha256="0j2v4zlf7vgy5gld29xiii15m9i85cpiwc25rmzjm02cz2p32c72"; depends=[]; }; pkr = derive2 { name="pkr"; version="0.1.2"; sha256="0m045dlcq3rls1w0smy4jvk3c57ckpqdv8xnz261k1gnnyjmz1k2"; depends=[binr foreign forestplot rtf]; }; @@ -14089,29 +14300,31 @@ in with self; { 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]; }; - plater = derive2 { name="plater"; version="1.0.3"; sha256="1sjf1wkpgz5pa5z149bj40haa4srvf4a66rh3ij25bvgasslshfq"; depends=[dplyr rlang]; }; + 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=[]; }; plde = derive2 { name="plde"; version="0.1.2"; sha256="1g1b1sgyfxgfkjcr3sdkan8jd6r7yyi0izc83vyj11bdk08jx22h"; depends=[]; }; pleLMA = derive2 { name="pleLMA"; version="0.2.1"; sha256="1n6q4x8qv00j0hikzzr600xgikhr462zm73zllb9n0valhmzy18z"; depends=[dfidx mlogit]; }; pleio = derive2 { name="pleio"; version="1.6"; sha256="0av1sl0fdn2ia7ddalbvidhcnsvs36iq618s1bknjw29y5yyq020"; depends=[Matrix rms]; }; pleiotest = derive2 { name="pleiotest"; version="1.0.0"; sha256="05mgz42wn1y7q8ffgvak22r3k40q9rv1qvpal8yycp83p7hdzg7v"; depends=[RColorBrewer Rcpp RcppArmadillo]; }; - plfm = derive2 { name="plfm"; version="2.2.2"; sha256="1jgf3jrkdpsf77i4lf68s6sxax95c9is4nryhnzanq9i5f23j24v"; depends=[abind sfsmisc]; }; + plfMA = derive2 { name="plfMA"; version="2.0"; sha256="14v3q4sv3inax3b1sp0i4scrz70ca9yphzikhx0z9dh2w5mggq0k"; depends=[gWidgets2 gWidgets2tcltk limma RColorBrewer tkrplot]; }; + plfm = derive2 { name="plfm"; version="2.2.3"; sha256="18knb9bc6nvr87c60m1mjr7088r71ba3sq9hkh9j4drhl08dqwf7"; depends=[abind sfsmisc]; }; plgp = derive2 { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; }; pliman = derive2 { name="pliman"; version="1.1.0"; sha256="0w7r5xf3n4w455wbbpwjfwzf6ia0p02v9gb23c4h1dg2v4ma4s02"; depends=[lattice]; }; 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]; }; - plm = derive2 { name="plm"; version="2.4-3"; sha256="0b7l4gzksvh32hv9fxiwl62lik01w0x2f0skwkm2xnrc1f3mcwr3"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; }; + plm = derive2 { name="plm"; version="2.6-1"; sha256="1sanrpphdj6pc9f0xcixm19kkr0nl04zhywf7hklmadby4372318"; depends=[bdsmatrix collapse Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; }; plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; }; pln = derive2 { name="pln"; version="0.2-2"; sha256="03jjmfr1dwz6p652y917g9rv2alyam9ws6xh9ig02d3w78b0rsv9"; depends=[]; }; plogr = derive2 { name="plogr"; version="0.2.0"; sha256="0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"; depends=[]; }; - plot_matrix = derive2 { name="plot.matrix"; version="1.6"; sha256="1wx9c46333kz3cgdvczb0ywp8h29p7dmxbim3dv54jv0g5hr6m4n"; depends=[]; }; + plot_matrix = derive2 { name="plot.matrix"; version="1.6.1"; sha256="0nw2irc7bl7pdpc8nj2yqvc942f1znsj9rn34nya611x1kgjffl7"; depends=[]; }; plot3D = derive2 { name="plot3D"; version="1.4"; sha256="1h59zlsyzbjylaziwavppl9bjmnba4iiq34772y3dys6fqclajnh"; depends=[misc3d]; }; plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.2"; sha256="15m48rzs96mgsnlf77823z2c58gry6hab00xg40myfba8j8li1xa"; depends=[plot3D rgl]; }; plot3logit = derive2 { name="plot3logit"; version="3.1.0"; sha256="0iwhaly6lzpfaanyy1qayl6faihw5rkcnh21czdr1g0f9rjimyrb"; depends=[dplyr ellipse forcats generics ggplot2 ggtern lifecycle magrittr purrr Rdpack stringr Ternary tibble tidyr tidyselect]; }; 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-2"; sha256="1hdyvff76k40lrzw4vq8azdpxzxxabgkgxixkqvnw5cda362nyfh"; depends=[aqp classInt colorRamps colorspace dismo gstat landmap pixmap plyr raster RColorBrewer rgdal scales sf sp spacetime stars stringr XML zoo]; }; 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]; }; @@ -14141,12 +14354,12 @@ in with self; { plsdepot = derive2 { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; }; plsdof = derive2 { name="plsdof"; version="0.3-0"; sha256="1axi8bailiq9mjs0dvasy895b7c62114hdsaygxwz4zymfa6a3ny"; depends=[MASS]; }; plsgenomics = derive2 { name="plsgenomics"; version="1.5-2"; sha256="1pvb50nv6jc99bm2hsxpzazg26y49yi24wwwim5xcjj6j1szbip4"; depends=[boot fields MASS plyr reshape2 RhpcBLASctl]; }; - plsmod = derive2 { name="plsmod"; version="0.1.1"; sha256="0jkwmr6lgy2kdxpypzks6fcqxgrgzji5navmbip2qrgnk2c0vfjk"; depends=[dplyr generics magrittr mixOmics parsnip purrr rlang tibble tidyr]; }; + plsmod = derive2 { name="plsmod"; version="0.2.0"; sha256="1xw3m4z78g1ms4kl6k5jh41q8ip4v3ndm91jv0j9lczb2zqhnvxs"; depends=[dplyr generics magrittr mixOmics parsnip purrr rlang tibble tidyr]; }; plsmselect = derive2 { name="plsmselect"; version="0.2.0"; sha256="044mwdqv5vw0apmx3yhn6xkdmw6baalvb8c6hhmawcs279kwi1m9"; depends=[dplyr glmnet mgcv survival]; }; plsr = derive2 { name="plsr"; version="0.0.1"; sha256="0l413m49zjpb35v0zw8dlxn53nh7fghinbmwfmldl3jgdvay2s7x"; depends=[boot ggplot2 reshape2 shiny]; }; pltesim = derive2 { name="pltesim"; version="1.0"; sha256="0mvqp8di2gwhd9wc9kvnnpxd3hkr9b9lj6g5qlkqcbrgkq6fjahs"; depends=[coreSim ggplot2]; }; plu = derive2 { name="plu"; version="0.2.1"; sha256="12m2mb5h5xniy870akmbzgjp6019pnjjzrdkifmlri8vhbyilvh9"; depends=[backports lifecycle]; }; - plugdensity = derive2 { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; }; + plugdensity = derive2 { name="plugdensity"; version="0.8-4"; sha256="0kj7vixfyg4nxq05xgmrhsjd56myz2s1jplhbkmq25kf2r9pb89y"; depends=[]; }; plumber = derive2 { name="plumber"; version="1.1.0"; sha256="0rwr3vx0y2n70bz4aqd9iag9s0ksz4vlvsw16qz84wfcky1b79pi"; 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]; }; @@ -14160,49 +14373,51 @@ in with self; { pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; }; 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.3.2"; sha256="1vx80pzwks0czvsyh48svvm2gb4jyz1m2r5l60dnia07kpz9wrjd"; depends=[curl dplyr httr lubridate magrittr RCurl stringr tidyr]; }; + pmetar = derive2 { name="pmetar"; version="0.3.3"; sha256="0vfsmdkw62ahhic2gqgsbyphnx2phjkswpn3ymb9gdpnzy45aq6h"; 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]; }; pmledecon = derive2 { name="pmledecon"; version="0.1.0"; sha256="0bpfx3lkg7wl7b189gl1m2xz72zna98wiw98yx3hvk6ndv55jy03"; depends=[rmutil splitstackshape]; }; - pmml = derive2 { name="pmml"; version="2.5.1"; sha256="1spi8xfj6ab7niidlalnpwfd16800xdvambkmizjdh5w9i5hklzk"; depends=[stringr XML]; }; + pmml = derive2 { name="pmml"; version="2.5.2"; sha256="1faad5yqyh6dx40056w74vlyw4wxjgh41jv8b2vf2gh26laf22kk"; depends=[stringr XML]; }; pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.3"; sha256="0315kb5x04pidpzr04yaxyynp0mz4ilzp7vkspq4agjkds5hyc88"; depends=[]; }; + pmparser = derive2 { name="pmparser"; version="1.0.4"; sha256="0qf71w6m6cgmx2isizadihjxildqrxygm8vm906fb13ydxslj1xq"; depends=[data_table DBI foreach glue iterators jsonlite R_utils RCurl withr xml2]; }; pmpp = derive2 { name="pmpp"; version="0.1.1"; sha256="1srmkih6zsyf8yf1f045xy1afcz0if6nf1ncslgrq6rgm7330lkw"; depends=[data_table dplyr ggplot2 magrittr MASS Matrix minqa moments plm pracma]; }; pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; }; - pmsampsize = derive2 { name="pmsampsize"; version="1.1.1"; sha256="09z1bhqk451jw5knl58mr3hs1il66hq40g2a9960gz55a8jj6fva"; depends=[]; }; + pmsampsize = derive2 { name="pmsampsize"; version="1.1.2"; sha256="0msbkjpzssgkc4ndx9s1rb8mgg07bx7fdlq48j5s8ak8n1gwdkyk"; depends=[]; }; pmultinom = derive2 { name="pmultinom"; version="1.0.0"; sha256="0p2amb3y4jl24r21fii1qpmdbn5pfgywrx8k7x1jxpg49rk7k0rp"; depends=[fftw]; }; pmwg = derive2 { name="pmwg"; version="0.2.0"; sha256="1f1r66ml24ys7nx5558c189a4gcaqkr16y87dmi4ravick9l5yfi"; depends=[checkmate coda condMVNorm MASS MCMCpack mvtnorm]; }; pmxTools = derive2 { name="pmxTools"; version="1.2.1"; sha256="0r5y09ab6k31d7fbd5pn8lzaafq1ix2lrjci1bsvg0wwcxmdipw6"; depends=[chron data_tree DiagrammeR dplyr ggplot2 ggrepel gridExtra magrittr MASS stringr xml2]; }; png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; }; pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; }; - pnn = derive2 { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; }; poLCA = derive2 { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[MASS scatterplot3d]; }; 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]; }; - poems = derive2 { name="poems"; version="1.0.1"; sha256="15987nz7gx94lrkyizg0jdzkjnib5hykla7xrkg5fi0i6cch40bl"; depends=[abc doParallel foreach gdistance geosphere lhs metRology R6 raster trend]; }; + 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.0.2"; sha256="194448cyzn6qqkikpgxi1n1m98i6dfiwg0016n34ssqpf3vvc6a1"; depends=[abc doParallel foreach gdistance geosphere lhs metRology R6 raster trend]; }; pogit = derive2 { name="pogit"; version="1.2.0"; sha256="1kap1cpfp0k2vm7w4kjfja37n9z3j7ppiwvsdxl6bgpkf7kcnkp2"; depends=[ggplot2 logistf plyr]; }; poibin = derive2 { name="poibin"; version="1.5"; sha256="1sxryvwwz6ldsnkzdy56p8c895s5yvpcai9ndyjv1x5q3l05wf9v"; depends=[]; }; poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; }; pointRes = derive2 { name="pointRes"; version="2.0.0"; sha256="17rrdcpvd8v95g5vmbyq5gjpcc3rfbq3m6ajzc56fcizcqd4xx52"; depends=[DescTools dplR ggplot2 plyr TripleR]; }; - pointblank = derive2 { name="pointblank"; version="0.9.0"; sha256="15f2v6dvbz34vwy1gdc32p511k1klrcjwyvrfk614niz8fygd256"; depends=[base64enc blastula cli DBI dbplyr digest dplyr fs glue gt htmltools knitr magrittr rlang scales testthat tibble tidyr tidyselect yaml]; }; + pointblank = derive2 { name="pointblank"; version="0.10.0"; sha256="0890ss04kvj3p8sj0nlrw9lnb2iy3hdg5lcni5sq2in8kxk59228"; depends=[base64enc blastula cli DBI dbplyr digest dplyr fs glue gt htmltools knitr magrittr rlang scales testthat tibble tidyr tidyselect yaml]; }; pointdensityP = derive2 { name="pointdensityP"; version="0.3.5"; sha256="0n7p3b77m47avbr7n85knf31m9rlp43mdl3748ysj6wvxvhnivx4"; depends=[data_table]; }; pointr = derive2 { name="pointr"; version="0.2.0"; sha256="1qfxcyzi2sa49x00hidz054njj9mm7gkhv99faafb9x4gp3pcq0v"; depends=[stringr]; }; poio = derive2 { name="poio"; version="0.0-4"; sha256="12d47hn9rsx2n0fl107dpswfklnh8nkm0kspcxf7yfljayvxr474"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr purrr R6 stringi tibble whoami]; }; poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; }; 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.3.1-3"; sha256="0li2v84rvyk413h06393ccq5rp0mjy8359frq83k94ii946kf2zl"; depends=[Matrix]; }; + poismf = derive2 { name="poismf"; version="0.4.0"; sha256="0hrmirwri30p68m5l6icjkiygkb8950cl6m95xq9caybkl6yjpck"; depends=[Matrix]; }; poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; }; poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; }; poissonMT = derive2 { name="poissonMT"; version="0.3-5"; sha256="14qkc8qz3423b13gp6gsp8cbb1nv9wwjjfa4i9zc15qy5i99ha26"; depends=[checkmate MASS robcbi robustbase]; }; - poissonreg = derive2 { name="poissonreg"; version="0.1.1"; sha256="0ip17j69b7qfyb691f3qlwydp0qayxrbww63nq8jnh8b92lvvxxs"; depends=[dplyr generics glue parsnip purrr rlang tibble tidyr]; }; + poissonreg = derive2 { name="poissonreg"; version="0.2.0"; sha256="0j6435gqc3cmcx7bfvj926s8hyhkiksjavr69iwbdlw0gw3s20j3"; depends=[dplyr generics glue parsnip purrr rlang tibble tidyr]; }; poistweedie = derive2 { name="poistweedie"; version="1.0.1"; sha256="0236cz8fn3la7df8mk1la8hmr0zzjc1majnq8p0c8grma833j6kp"; depends=[]; }; poker = derive2 { name="poker"; version="0.8.8"; sha256="14ik77440z22k4kwq0p1fn7adzi0p8mh8j8hd7ayinvrab4b5r85"; depends=[]; }; polaroid = derive2 { name="polaroid"; version="0.0.1"; sha256="0m3jbiz4n7mgbbdkd28m6dqsclyjcgshpxd6ws8df7zchx7fch07"; depends=[argonDash argonR colourpicker ggplot2 hexSticker png shiny shinyWidgets]; }; policytree = derive2 { name="policytree"; version="1.1.1"; sha256="0xk3l5cy46br73g8m1gm3dbim72asq0wfsa50mnchkhk42rxv6a3"; depends=[BH grf Rcpp]; }; + polimetrics = derive2 { name="polimetrics"; version="1.2.1.14"; sha256="0zzqzcfmvb6a9lav5sdgzhx4637r068q3kyjqk1ykdjg2d7s7lrv"; depends=[car dplyr formula_tools ggplot2 gplots MASS purrr rlang rstatix stringr tidyverse]; }; 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.5.0"; sha256="1gpk16lm6il4hdbw7rcgdf02a4npmmf68cx5zv8hv5k2j31ixq0h"; depends=[automagic digest dplyr DT htmltools httr jose jsonlite lubridate purrr R6 rlang shiny shinycssloaders shinydashboard shinyFeedback shinyjs shinyWidgets stringr tibble tidyr uuid yaml]; }; + polished = derive2 { name="polished"; version="0.6.1"; sha256="08n8pf1gqd2fyar9mawlvakg9nj715nx4vfnm8ywzb88gmkr64fg"; depends=[automagic digest dplyr DT htmltools httr jose jsonlite lubridate purrr rlang rmarkdown shiny shinycssloaders shinydashboard shinyFeedback shinyjs shinyWidgets stringr tibble tidyr uuid yaml]; }; polite = derive2 { name="polite"; version="0.1.1"; sha256="15hiifaf63hx0xn453lr0xhdnxqifrgyrgrymp0a9k3j7qja59jk"; depends=[here httr magrittr memoise ratelimitr robotstxt rvest usethis]; }; - politeness = derive2 { name="politeness"; version="0.8.5"; sha256="05lwzz6x5afycha0gikffr21z6rplvlnrsi3x96pg8n6mfr8xgam"; depends=[data_table ggplot2 glmnet quanteda spacyr stringi stringr textir tm]; }; + politeness = derive2 { name="politeness"; version="0.8.6"; sha256="12h7gn8br5mrbp3pyls7ljyrqmf8b110kqdz9vspbc1p4w1g6rz2"; depends=[data_table ggplot2 glmnet quanteda spacyr stringi stringr textir tm]; }; pollen = derive2 { name="pollen"; version="0.82.0"; sha256="0vmggbvacpbdz4zvn3cinip1b0ac44vgbydmsk6698hwgx9iwmfp"; depends=[dplyr lubridate purrr]; }; pollimetry = derive2 { name="pollimetry"; version="1.0.1"; sha256="09zmcwlgzl4fnkdg2m424ibv3izzrm595c7pi4mc3bd1g8sa2ypn"; depends=[brms repmis]; }; pollster = derive2 { name="pollster"; version="0.1.3"; sha256="1b5m5g9v8xbs3zz6as4xvzwaqr39477adi4vzxmjvxjsaij6ih5h"; depends=[dplyr forcats labelled rlang stringr tidyr]; }; @@ -14210,35 +14425,36 @@ in with self; { polspline = derive2 { name="polspline"; version="1.1.19"; sha256="0rhzf735hmbqfn2xbgcln4sqx7m9far72g5gq9mghgkw016kqglm"; depends=[]; }; polyCub = derive2 { name="polyCub"; version="0.8.0"; sha256="1f63ikiz988hdihvgd5f2p897qfgv54ysgp2h8avmlc4cj6hgkgl"; depends=[sp]; }; polyMatrix = derive2 { name="polyMatrix"; version="0.9.16"; sha256="13amrjl0nsyz6d9c9xxgnlkhdiicy8rx27ds5k47r8x48386vz14"; depends=[Matrix polynom]; }; - polyPK = derive2 { name="polyPK"; version="3.1.0"; sha256="0cb83sq8iz4swr73vwhh8n4k62p6321nsy1sz5fba0wiicycxf55"; depends=[circlize corrplot gplots Hmisc impute imputeLCMD mixOmics pcaMethods pkr plyr ropls sqldf xlsx]; }; - polyRAD = derive2 { name="polyRAD"; version="1.5"; sha256="12677bbp9hvdr6nkqnl3gi3db2gn7wjvwwm773bhxln9ymh3jnw0"; depends=[fastmatch pcaMethods Rcpp stringi]; }; + polyRAD = derive2 { name="polyRAD"; version="1.6"; sha256="1xvhjzryf35vrnf6iz82g14vbmbbm4g88il02ss5pmvsgxq70x5n"; depends=[fastmatch pcaMethods Rcpp stringi]; }; polySegratio = derive2 { name="polySegratio"; version="0.2-5"; sha256="0djw49mbhd7x6jr0f5qkb9akw3fw3ax4w9xv8iwa5f65q5gbxpdf"; depends=[gdata]; }; polySegratioMM = derive2 { name="polySegratioMM"; version="0.6-4"; sha256="162xj52566kaxgfk7c14170xx07isyjmqb9skvhrdg7sz20lc3l1"; depends=[coda gtools lattice polySegratio]; }; polyaAeppli = derive2 { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; }; polyapost = derive2 { name="polyapost"; version="1.7"; sha256="1inq3b8qq17w5zx2lrkrxjzb7drfajsp4qgy0194971m6x2j4cfx"; depends=[boot rcdd]; }; polyclip = derive2 { name="polyclip"; version="1.10-0"; sha256="0jyk4maqiblvj095jd59dr76kbniyli3v3xvy0a72ljszq6vrnkl"; depends=[]; }; - polycor = derive2 { name="polycor"; version="0.8-0"; sha256="1dnc3ndy5a1pas40xnvgj790ix05mi7bhns3d98nsdkh22lvp0hg"; depends=[Matrix mvtnorm]; }; + 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]; }; polylabelr = derive2 { name="polylabelr"; version="0.2.0"; sha256="01b2v0l5g8nxwbd6nwqv8ahypgh6gfhd4qabg75brlj7z1iyfzf2"; depends=[Rcpp]; }; polymapR = derive2 { name="polymapR"; version="1.1.2"; sha256="0pgwyw6d7myx0ds5dmfwzrnmvzsm1gkpz9qc241isr9d4cj1dinn"; depends=[doParallel foreach igraph knitr MDSMap]; }; polynom = derive2 { name="polynom"; version="1.4-0"; sha256="1pflscwc0qzdf0y60j7s0dkglgmz18xajywfbn6s263idyr8idy5"; depends=[]; }; polypharmacy = derive2 { name="polypharmacy"; version="1.0.0"; sha256="1rimhy7z5xglkxfp3yh4vqm5g075n8g09nl4a8nxxf6cyl504gcv"; depends=[data_table doParallel foreach itertools lubridate stringr]; }; polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; }; - polyqtlR = derive2 { name="polyqtlR"; version="0.0.7"; sha256="1mjvx3204qf3pckxnqfa1x4g9493hywq03dagwl9c4j4badisdk6"; depends=[abind doParallel foreach Hmisc knitr nlme RColorBrewer Rcpp RcppArmadillo reshape2]; }; + polyqtlR = derive2 { name="polyqtlR"; version="0.0.9"; sha256="0j879bvks6ldx53yfmac94p5n4p79pyq29ljdzbvajmxq5b57vf8"; depends=[abind doParallel foreach Hmisc knitr nlme RColorBrewer Rcpp RcppArmadillo reshape2]; }; polyreg = derive2 { name="polyreg"; version="0.7.0"; sha256="1vsg1ldhvdq8pmw16qiv62c5l52mh6ccjcz3i3v06150ma953gcn"; depends=[dummies nnet]; }; polysat = derive2 { name="polysat"; version="1.7-6"; sha256="0h2yqbr0mzv8lk24cd3q242prcz009q8vkvwm9iklpkw49zh8hq5"; depends=[Rcpp]; }; polywog = derive2 { name="polywog"; version="0.4-1"; sha256="02qk1cyvkd77mwlvhj1zzzi0bmy7qxz29j2v730wp7rz4w7h5x5n"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; }; pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; }; pomcheckr = derive2 { name="pomcheckr"; version="0.1.1"; sha256="0fm2v388ya7v4vrb5rvilghlf49d15jlwz0isf95ldr81a55m9ij"; depends=[assertthat dplyr ggplot2 magrittr rlang stringr tidyr]; }; - pomdp = derive2 { name="pomdp"; version="0.99.3"; sha256="0mj2k3s69acgwl00jknxy9ywb73kgqxv5r7yqjlxxsnlp8rixla4"; depends=[igraph]; }; - pomp = derive2 { name="pomp"; version="3.6"; sha256="1x3xim7f663pjc6a23pblsrbqfjjmlac3x2234968cvz2vs22qbl"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; }; + pomdp = derive2 { name="pomdp"; version="1.0.0"; sha256="1wj84qj7xssnw0a9985nr529i93z827b1js5i8mdsgxp8fdl1dgd"; depends=[igraph pomdpSolve]; }; + pomdpSolve = derive2 { name="pomdpSolve"; version="1.0.0"; sha256="0iqpp1y8gz3ihifgln7b5xmwjrvripmkkwg6mr4938yqv7103mz1"; depends=[]; }; + pomodoro = derive2 { name="pomodoro"; version="3.3.0"; sha256="170lvp27gyn189kcpn7nmnkfq2pj6i1ihxqjnf37h7m74msn64si"; depends=[caret dplyr gbm ipred pROC randomForest readr tibble]; }; + pomp = derive2 { name="pomp"; version="4.1"; sha256="1yv29iqzzqdfr34z98x0l8j3s3c45jhaqvb83njv996g11wxbkw4"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; }; pompom = derive2 { name="pompom"; version="0.2.1"; sha256="09jy4lrb2p71yk604ndfhqfz6znlc3bq72k42f0d1i1a8g3by8h6"; depends=[ggplot2 lavaan qgraph reshape2]; }; pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; }; pool = derive2 { name="pool"; version="0.1.6"; sha256="1qfraam1rc2r4mn7yhhfv8lhhc4dzgq0v1y97n4h2z3mgxn5zgnd"; depends=[DBI later R6]; }; poolVIM = derive2 { name="poolVIM"; version="1.0.0"; sha256="19yw6pp5l3jmla4wjbvpjq132f645yks49pzsdv123f3qfr8f0m6"; depends=[EmpiricalBrownsMethod Hmisc ranger]; }; poolfstat = derive2 { name="poolfstat"; version="2.0.0"; sha256="0bwihx9ql0sdmhm160r6vkmph88ms7zamzg7fi93mlx0h7i49phs"; depends=[ape 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.0-0"; sha256="1319q7047pm0giqqkiz1wswpvixwirz1bcn27chvzirp3n4pgxdx"; depends=[mathjaxr]; }; + poolr = derive2 { name="poolr"; version="1.1-1"; sha256="1y8bish2s96b42xsld0x1nrjz9dzqhdr2w95vdpfymq7mg05d1ry"; depends=[mathjaxr]; }; poorman = derive2 { name="poorman"; version="0.2.5"; sha256="05h7rjgri0b5a1jd0388p7lqvvg0y8z6g42f9bxc80jg1z730axr"; depends=[]; }; pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; }; popEpi = derive2 { name="popEpi"; version="0.4.9"; sha256="1a79n3rry85qa52cn7zbhwbsyjgw7b72l97pw3p9sf2lgvacvxr1"; depends=[data_table Epi survival]; }; @@ -14247,29 +14463,29 @@ in with self; { popPyramid = derive2 { name="popPyramid"; version="0.1.1"; sha256="1fvq63d0pjhpzyf6pb2v5w9wy0pskiv2n07jipg98bgyiih1w584"; depends=[dplyr ggplot2 tibble]; }; popRF = derive2 { name="popRF"; version="1.0.0"; sha256="0w3w1ffyy5b8glviib7ryjqzhmfp5aw6am3z8qpvis6l745p7vgh"; depends=[doParallel foreach gdalUtils plyr quantregForest randomForest raster]; }; popReconstruct = derive2 { name="popReconstruct"; version="1.0-6"; sha256="0nmf93dy2qf7z9mafpy99ry53aapbxlismn7drn732r8gvravapx"; depends=[coda]; }; - popbayes = derive2 { name="popbayes"; version="1.0"; sha256="01p0highanjqdslbavykx67ss7w7f5xwczqx1l5pw4gkrvngm992"; depends=[R2jags usethis]; }; + popbayes = derive2 { name="popbayes"; version="1.1"; sha256="04vzz214lrdkzgj8yksb8r81h1mgnbq6pz3r7c115cy4dn0f2m1f"; depends=[R2jags usethis]; }; popbio = derive2 { name="popbio"; version="2.7"; sha256="02dbb2sinn1n8a9dg8lvf35sc8hb14c90mjymz2gk64xdysf0m2j"; depends=[]; }; popdemo = derive2 { name="popdemo"; version="1.3-1"; sha256="0xvqp71spqh5khi2gdzxmj8pp71i6l2qpcgcw8s9xbqwx9w905mq"; depends=[expm MCMCpack]; }; popgenr = derive2 { name="popgenr"; version="0.2"; sha256="164dhizka0yadzihbjqkfs5p0hknw966mq0grigs7r9ppbq9kajh"; depends=[]; }; - popkin = derive2 { name="popkin"; version="1.3.13"; sha256="0b00rs89jrz28p4gj35lngvaq3jynmw1gqvz4pdbsnpan6xr63v1"; depends=[ape RColorBrewer Rcpp RcppEigen]; }; + popkin = derive2 { name="popkin"; version="1.3.17"; sha256="1rmdsb9sdh2f8nx0nydwv8wpxafqaivkqqwd0g6qibx45h012920"; depends=[ape RColorBrewer Rcpp RcppEigen]; }; poppr = derive2 { name="poppr"; version="2.9.3"; sha256="0f8gw14vz4p6jvxa8w3fp84pm1k980mk5sfbj82qmmj236rfvyx9"; 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]; }; poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; }; - populR = derive2 { name="populR"; version="0.1.3"; sha256="1p60dpb756g6cl5rdz457zg47qwsp7b61qvawk9sg04sw7c1h81r"; depends=[Metrics rlang sf]; }; + populR = derive2 { name="populR"; version="0.1.4"; sha256="18va6wfqp3p2vmmiiasv3qnxdi4sbg2kl0s6a1i1qq6qpb7nq2y2"; depends=[Metrics rlang sf]; }; populationPDXdesign = derive2 { name="populationPDXdesign"; version="1.0.3"; sha256="0p73ddv3j1s1vs4j3axnsf39n626qjv0w1qlq9p7km4s6729bhgv"; depends=[devtools ggplot2 plyr roxygen2 shiny shinycssloaders]; }; - porridge = derive2 { name="porridge"; version="0.2.1"; sha256="03ay6nwq0x3vvpicb50zk2l14hfa6hi51j6cc559p6gzcwf70pj1"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; }; + porridge = derive2 { name="porridge"; version="0.3.0"; sha256="0vv6qs937mgiaarwyjfs5g7lzw3sx630lslxldx9gcgkp2n5sd1h"; depends=[MASS Matrix mvtnorm Rcpp RcppArmadillo]; }; portalr = derive2 { name="portalr"; version="0.3.9"; sha256="08f5pq6b0248p3akgw50y22dsmyzcnx5sjl58xqlyp3w1p57a3hd"; depends=[clipr clisymbols crayon dplyr forecast httr lubridate lunar magrittr rlang tidyr tidyselect zoo]; }; portes = derive2 { name="portes"; version="5.0"; sha256="1iarvgz23979lipqyyvh8h0nd978p1nzbbjf020q11yqpl863502"; depends=[forecast]; }; 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.3.1"; sha256="0ycc1jqr27zmv4mwkf168i0v8wh5ga6cw6gp5rrz78zbr4gjaaiz"; depends=[digest evaluate ggplot2 pbapply PerformanceAnalytics quadprog quantmod R_utils rlang xts zoo]; }; portsort = derive2 { name="portsort"; version="0.1.0"; sha256="0swl39dn7lzwvps18bva4l64a441gkf6lbwcwrhlf93f1ardvxji"; depends=[xts zoo]; }; - postGGIR = derive2 { name="postGGIR"; version="2.4.0.1"; sha256="1hl991jf0cgawqb4vzr60dyn44n09fzlksd8521lp9lgd7jrxqhk"; depends=[abind accelerometry ActCR ActFrag cosinor cosinor2 denseFLMM dplyr GGIR ineq kableExtra minpack_lm refund survival tidyr xlsx zoo]; }; + 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]; }; postGIStools = derive2 { name="postGIStools"; version="0.2.4"; sha256="04d6iqnk7j2lgv1h5c94j6y89jk75pmv26sxa51s5iwkjq7rchym"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; }; postHoc = derive2 { name="postHoc"; version="0.1.3"; sha256="1l7r9md9iyav5vvjykpsnqv9whspzcmnppfpqm6qy5s5vk6b8zfd"; depends=[igraph multcomp]; }; - postcards = derive2 { name="postcards"; version="0.2.2"; sha256="0kj4l4qskvwjr22222v08fypzmg089dgs5hmqd2gi2pjfg4zwmr1"; depends=[bslib rmarkdown rstudioapi]; }; + postcards = derive2 { name="postcards"; version="0.2.3"; sha256="0kc8nbrqw5h14qw47rxl20yz9q0s8gk2g3lg7kcgsx7f1q514qsw"; depends=[rmarkdown rstudioapi]; }; posterdown = derive2 { name="posterdown"; version="1.0"; sha256="13plrrnylw3yldm0md1gr5drccfjk9f2wwlhz6lrmb3px7w5nqs0"; depends=[pagedown rmarkdown yaml]; }; - posterior = derive2 { name="posterior"; version="1.1.0"; sha256="1lpldkkkxv94dr30q5wb5qr61qrgp9shqnskgwriigy1phnjdxpg"; depends=[abind checkmate distributional matrixStats pillar rlang tensorA tibble vctrs]; }; + posterior = derive2 { name="posterior"; version="1.2.1"; sha256="1qdg22l868daqg2axr36szl1m9z0rfpgx8zmv1x1xwm1hmlf0mxp"; depends=[abind checkmate distributional matrixStats pillar rlang tensorA tibble vctrs]; }; postinfectious = derive2 { name="postinfectious"; version="0.1.0"; sha256="1v327zxxiwc1cdksk6s39lkkgck5dxg169pp3jiqmm7xs35dcl6y"; depends=[]; }; postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; }; postlogic = derive2 { name="postlogic"; version="0.1.0.1"; sha256="11bpmfn375zpyg90dh44h86cvppzri1smmkn26jyydqjz74f4q9w"; depends=[]; }; @@ -14286,10 +14502,12 @@ in with self; { powerCompRisk = derive2 { name="powerCompRisk"; version="1.0.1"; sha256="11xprjn9hzi8gxrsi7wivwgchg9h2apgxa63fp466ngjfy5ybxf4"; depends=[mvtnorm]; }; powerEQTL = derive2 { name="powerEQTL"; version="0.3.4"; sha256="124mwkjf5m19znn7zdnncdc3klgqyid08kvihk0gws2y9bw0m1zs"; depends=[GLMMadaptive nlme]; }; powerGWASinteraction = derive2 { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; }; + powerHaDeX = derive2 { name="powerHaDeX"; version="1.0"; sha256="188a09jnn8xr5jx1n785gghpn3k8cqkhp76m47gixh5n9v15lzzg"; depends=[checkmate data_table expm ggplot2 glmnet lme4 lmerTest nlme plyr Rcpp signal]; }; powerLATE = derive2 { name="powerLATE"; version="0.1.1"; sha256="1dmvvh7ynvr8krl5p1qbg8ib1s595vqci2r80zmwsm28jhv8ka4w"; depends=[]; }; powerMediation = derive2 { name="powerMediation"; version="0.3.4"; sha256="08zszskhd21pbjamch5q7v7vx2p78c1d53zrp31hmpxk1ymx2xf3"; depends=[]; }; powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.1.3"; sha256="1p1fw4jq4rxc273hmycxf4bkqm6zmfw0jdy2s65jy10q37r53ial"; depends=[pracma survival]; }; powerbydesign = derive2 { name="powerbydesign"; version="1.0.5"; sha256="006m127rc49bshgljd5d3ii6sfx24ndn2690ixj0vnqm2dp3zjnw"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; }; + powerjoin = derive2 { name="powerjoin"; version="0.0.1"; sha256="0hnk573jrpmr5k0yhfq74wksrz6ri5g21zf5853fslcxyjys1v8q"; depends=[cli dplyr generics glue lifecycle magrittr purrr rlang tibble tidyr tidyselect vctrs]; }; powerly = derive2 { name="powerly"; version="1.7.2"; sha256="104wp8cbwzlb6il614aacq608rir3yv18rwjqxljxi597nyy004v"; depends=[bootnet ggplot2 osqp patchwork progress qgraph quadprog R6 rlang splines2]; }; powerpkg = derive2 { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; }; powerplus = derive2 { name="powerplus"; version="3.1"; sha256="0ayp6x34hkzgris4j3zbbs0r23n81bhww3wgfyy630ri4sk6brrn"; depends=[complexplus expm MASS Matrix phonTools]; }; @@ -14303,7 +14521,7 @@ in with self; { 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]; }; ppmHR = derive2 { name="ppmHR"; version="1.0"; sha256="1fc9rrk3ir3dq5d518ih67dvknhz1ln6668wy2mzsdndaysgm12g"; depends=[nleqslv]; }; - ppmSuite = derive2 { name="ppmSuite"; version="0.1.8"; sha256="05qh7bd6d8dp1m4cpd01h5aw3iq6kyly70ng0hbfg53j6kwvlalg"; depends=[]; }; + ppmSuite = derive2 { name="ppmSuite"; version="0.2.1"; sha256="0mghp75lx63wyy5cx5npayidrvpqn6yalaw9xnbm5df9vdfdllaf"; depends=[]; }; ppmf = derive2 { name="ppmf"; version="0.1.3"; sha256="0xphk27frlcr87jwjbgwf77c8bhv0nswmffj9ny2vd1b176bi9xn"; depends=[censable dplyr magrittr readr rlang stringr tibble tidyr zip]; }; pps = derive2 { name="pps"; version="1.0"; sha256="0k06rkzdx07qcndqym44q6xyawdd253i3kbyqlmlavadsizp657g"; depends=[]; }; ppsbm = derive2 { name="ppsbm"; version="0.2.2"; sha256="0y4whxv14jqx7mqxj7n427vpbxb5rkwj8xvx0mj4knnwy9v437z4"; depends=[clue gtools Rfast]; }; @@ -14313,21 +14531,20 @@ in with self; { prLogistic = derive2 { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot Hmisc lme4]; }; 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]; }; - pracma = derive2 { name="pracma"; version="2.3.6"; sha256="1pmqk7b6c600v6pn0s047p3msl13azwk611zvh05w5f993yq7b0p"; depends=[]; }; - pragma = derive2 { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; }; + pracma = derive2 { name="pracma"; version="2.3.8"; sha256="0r17siivm37k4gp253v9mlg5m7cwqp85h9kk2hbp2wkf81ad80i3"; depends=[]; }; prais = derive2 { name="prais"; version="1.1.2"; sha256="16h3771lr6vn0g92bfpdq7r3wpdkspbhmrl5948p4isc5qxy2cgx"; depends=[lmtest pcse sandwich]; }; praise = derive2 { name="praise"; version="1.0.0"; sha256="1gfyypnvmih97p2r0php9qa39grzqpsdbq5g0fdsbpq5zms5w0sw"; depends=[]; }; praktikum = derive2 { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; }; praznik = derive2 { name="praznik"; version="10.0.0"; sha256="199g6wgda6m8ym9kg3qbx42c21bigg9bxkga950k2hdm3f1xa62g"; depends=[]; }; - prcbench = derive2 { name="prcbench"; version="1.0.1"; sha256="1n7f9qn0vz86ir4byvni4fi5x2xa8sdzpb54hwc0b34xy2wjm204"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; }; + prcbench = derive2 { name="prcbench"; version="1.0.2"; sha256="0ilann11cfmbw7xj7j6y6j5y0hlfjf7wvfbq2hfvlxi87hijh3ka"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 ROCR]; }; prclust = derive2 { name="prclust"; version="1.3"; sha256="0p0sf8248aigs99py8mpzz743jnrf7n1nv5shag15arxz9yx7zn3"; depends=[Rcpp]; }; prcr = derive2 { name="prcr"; version="0.2.1"; sha256="0k5vl14akqf8qvak6h7a19qxn4wzpyxq7lyvdhxfh8l4gs4ca2l6"; depends=[class dplyr forcats ggplot2 irr lpSolve magrittr purrr tibble tidyr]; }; - pre = derive2 { name="pre"; version="1.0.1"; sha256="1wvwdwn65n98bzrsghqbxhf1hv2mcpizjxvzx00mplm4xjbzkk7g"; depends=[earth Formula glmnet Matrix MatrixModels partykit rpart stringr survival]; }; + pre = derive2 { name="pre"; version="1.0.2"; sha256="1j2jcq51gkqzy1ip4inf9j3z1p9cr134vjf6mfpq4331hp493hql"; depends=[earth Formula glmnet Matrix MatrixModels partykit rpart stringr survival]; }; precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; }; precisePlacement = derive2 { name="precisePlacement"; version="0.1.0"; sha256="1w48k4kv3xm8br7dgbpx2rcdxjh0g0aw8xa1snqy0ig8a992804b"; depends=[]; }; precisely = derive2 { name="precisely"; version="0.1.2"; sha256="1zzg2fgf58gjq081rklqjf8wxz8mf7rc3vyhbji3j3n6j0x125n4"; depends=[dplyr ggplot2 magrittr purrr rlang shiny shinycssloaders shinythemes tidyr]; }; precommit = derive2 { name="precommit"; version="0.2.2"; sha256="12fq44s16qjbjr6n1cj0z7w3a01bqs5grpnd1mx2sph33xizcmal"; depends=[cli fs here magrittr purrr R_cache rlang rprojroot rstudioapi withr yaml]; }; - precrec = derive2 { name="precrec"; version="0.12.7"; sha256="0vwzaqnh9ymrm52dd79bihwqprnygz0d71ay8fv51hdw0zg6saya"; depends=[assertthat data_table ggplot2 gridExtra Rcpp withr]; }; + precrec = derive2 { name="precrec"; version="0.12.8"; sha256="0kwn902z32qcnkffjm6dqnaxagx31xjdcak50clbgrway2pcdjrm"; depends=[assertthat data_table ggplot2 gridExtra Rcpp withr]; }; predReliability = derive2 { name="predReliability"; version="0.1.0"; sha256="18s9ijg3fcg6qb0y6pnwngmv69ajm93z0xjdzkq3fp5bxk1qylyb"; depends=[cluster rpart]; }; predfairness = derive2 { name="predfairness"; version="0.1.0"; sha256="0b9d6a2rk6vw4y5hnh721gmirnm419yynbfg7arjb96558l282kd"; depends=[]; }; predhy = derive2 { name="predhy"; version="1.2.0"; sha256="0iwlv9j0xpsl2xkvy7yb1irjg67d8xq13bzgjj8i4rqqhv12ap57"; depends=[BGLR doParallel foreach glmnet pls randomForest xgboost]; }; @@ -14339,7 +14556,6 @@ in with self; { predictrace = derive2 { name="predictrace"; version="2.0.0"; sha256="1bk1l9gai4hyck72h81znsm1dzqwm5wddbz0bm9g5igs6zkar2ka"; depends=[dplyr]; }; predint = derive2 { name="predint"; version="1.0.0"; sha256="043nsjvn88dhwvp5snbhmh64m8iy22ws4l474mbkm3rb488i9is9"; depends=[dplyr lme4]; }; predkmeans = derive2 { name="predkmeans"; version="0.1.1"; sha256="0352c50zlyzn8fczrkinayllj9jp978njjl7dazzkzypx0p20va5"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; }; - predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; }; predtools = derive2 { name="predtools"; version="0.0.2"; sha256="1bp0pvpd6s190q9kylvkcfh61jblbsla4d7rmnqv2rhza71mdfkj"; depends=[dplyr ggplot2 magrittr 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.1"; sha256="1wgbwbmghsnc2cargwndda0xhcdswvzd0nkjq5g895kl8zcwgpyf"; depends=[entropy mcmc]; }; @@ -14350,16 +14566,16 @@ in with self; { 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]; }; preputils = derive2 { name="preputils"; version="1.0.3"; sha256="1ryrxmcm9vxhblk9r1vaay8ihff6nnd87dzd3375lfcla2fr9jzv"; depends=[data_table]; }; - prereg = derive2 { name="prereg"; version="0.5.0"; sha256="0bck13iiaxwpqh0rd45mp1s5d8z62ggg0wa7rmyi8a65aywiypsi"; depends=[rmarkdown]; }; - preregr = derive2 { name="preregr"; version="0.1.9"; sha256="04fq2rxqfrpfxpv25biv2rxg0n4zdyyxylcl148x3cwxsc88rad1"; depends=[cli jsonlite rmdpartials yaml]; }; + prereg = derive2 { name="prereg"; version="0.6.0"; sha256="039nrl5cirsx1ysh214dr6xnn1h6h3f90im6k9dgmzfksxdqigpw"; depends=[rmarkdown]; }; + preregr = derive2 { name="preregr"; version="0.2.1"; sha256="01q27p71jn9p1jr1pgrjhd81xywfhk26cdgk7gr3cf4irw5jk50p"; depends=[cli jsonlite rmdpartials yaml]; }; presens = derive2 { name="presens"; version="2.1.0"; sha256="175nr9pqn3m6kh9bcc1gxqmqv05xdsqdw9lx385lmm1g947d2159"; depends=[marelac measurements]; }; presenter = derive2 { name="presenter"; version="0.1.1"; sha256="13q9cn2kglrr37cng9rz3bpl2ipmbiaaf233bn1bw83c6fisrq6m"; depends=[badger berryFunctions dplyr flextable formattable framecleaner janitor lubridate magrittr officer openxlsx purrr randomcoloR rlang rvg stringi stringr tibble tidyr tidyselect]; }; presentes = derive2 { name="presentes"; version="0.1.0"; sha256="0d6zhishc7wxcvvglgw44pc6c172qpxb8i4iw3lqbmji7ash5zpx"; depends=[]; }; preseqR = derive2 { name="preseqR"; version="4.0.0"; sha256="1g2rnnmi45649vpy6z45v5i3wxm54s138ajqrzwi3a5r7x3xnhq1"; depends=[polynom]; }; - presize = derive2 { name="presize"; version="0.2.3"; sha256="0gwavbi9fbwh454n5yg0rwqy13a8zjhs2yj7jhlmjn1bjjmxp8j4"; depends=[kappaSize shiny]; }; + presize = derive2 { name="presize"; version="0.3.1"; sha256="1fmv760c2vgg0cni46fvhlhxs7z94rm2pbxsc8nlh7rn842wv917"; depends=[kappaSize shiny]; }; presmTP = derive2 { name="presmTP"; version="1.1.0"; sha256="134p58zzk8i0whscvl5qdfn4niksypyxavq1m15cvw4zzk4dk6fw"; depends=[mgcv survPresmooth]; }; presser = derive2 { name="presser"; version="1.1.0"; sha256="1slkdfh0wq242adp6a60612sjz117bii3pbahn00bfmnpa9g1wya"; depends=[]; }; - prettifyAddins = derive2 { name="prettifyAddins"; version="2.3.0"; sha256="14all19l4q9n2wjc4y1sv8zncy21aar29al1fnwqkvbp8ghjkx5m"; depends=[httr rstudioapi shiny webdriver xml2 XRJulia]; }; + prettifyAddins = derive2 { name="prettifyAddins"; version="2.4.0"; sha256="0r8kbcrl5d7wvbk1wc40h1d2xk14r9mwpb4xkm8q74jhaxvpxz4f"; depends=[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=[]; }; @@ -14371,12 +14587,11 @@ in with self; { prevR = derive2 { name="prevR"; version="3.4.1"; sha256="02qfyc5j7rgvwl7a5pr1l41jmgjxxsrc674xfm08hcydwda5clq1"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; }; prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; }; prevederer = derive2 { name="prevederer"; version="0.0.1"; sha256="0vkx9nrlgp36xbl95lrb5sb5yivxlcw4yvbs8hgbm31kh0vbz32f"; depends=[httr]; }; - previsionio = derive2 { name="previsionio"; version="11.3.3"; sha256="0mx604y4kwj7d4ssnb1i61fyh3cd6df81yhvpjpf2k4bi6ifcx2s"; depends=[data_table futile_logger httr jsonlite magrittr Metrics plotly XML]; }; + 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]; }; prewas = derive2 { name="prewas"; version="1.1.1"; sha256="16dpwpks0sqfq7pdhbpipb8hnm2viic2dnz1g7v86ar51z8db4xk"; depends=[ape future future_apply phangorn vcfR]; }; priceR = derive2 { name="priceR"; version="0.1.6"; sha256="1c2yxjrd9v5i76hc5dn0hc6k2shy9cs32mvhr579w7n990ksjw23"; depends=[curl dplyr gsubfn jsonlite lubridate purrr stringi stringr]; }; pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="1.2.2"; sha256="0clbc1p809rjgqilv548ck7pfbyajkp2i47vxx8yrrdgkx824gpn"; depends=[ggplot2 rlang survey]; }; - prider = derive2 { name="prider"; version="1.0.2"; sha256="0a7n4b2a0p91q8llgn14czfxvi588v62x5azl7nndvjdk6g4cmmy"; depends=[blaster dplyr gplots magrittr purrr Rcpp stringr tibble tidyr]; }; prim = derive2 { name="prim"; version="1.0.20"; sha256="0z07ddpz6r3sbi5141n9a0snzcc26rdlxiivfnacs8zavs1sk73x"; depends=[plot3D scales]; }; primePCA = derive2 { name="primePCA"; version="1.2"; sha256="0w3w50x17q7gwji19m6dx5vq46h8p62alf3axd10mycl609jlbcb"; depends=[MASS Matrix softImpute]; }; primefactr = derive2 { name="primefactr"; version="0.1.1"; sha256="11hi75jwjxrl9p5m8yjwjb20pc9y9vkhi8sjrnisdq2hm53m483w"; depends=[]; }; @@ -14386,8 +14601,9 @@ in with self; { princurve = derive2 { name="princurve"; version="2.1.6"; sha256="0wzk329bxljkzz57y220lsfckpsn45w348m6dcxh29zbj0ik65h2"; depends=[Rcpp]; }; prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; printr = derive2 { name="printr"; version="0.2"; sha256="0lf538m7skrd7cmy0n118y5s0qk48q0xgqvqag20j34if1h44r4a"; depends=[knitr]; }; + prinvars = derive2 { name="prinvars"; version="0.1.0"; sha256="1fajvl041sxwf6ydqyixqmxinj0k8d413h332gvkqkyyfmx5gnys"; depends=[Rdpack]; }; prioGene = derive2 { name="prioGene"; version="1.0.1"; sha256="0k1rlvmfhj1m2zp5zaac8wcwjypd6f4dd8fxxsyrzsafp9aw189l"; depends=[AnnotationDbi org_Hs_eg_db]; }; - prioriactions = derive2 { name="prioriactions"; version="0.3.2"; sha256="1dghxq22fngv9axf597i9pf0rpfrri3wjd1ql8b4fcfspqbkx5nr"; depends=[assertthat BH dplyr magrittr Matrix proto Rcpp RcppArmadillo rlang Rsymphony tidyr]; }; + prioriactions = derive2 { name="prioriactions"; version="0.4"; sha256="17nypbjfwk77a6vg33my2x5qi82d80rrkpg5h0m9m31mf74pyraw"; depends=[assertthat BH dplyr magrittr Matrix proto Rcpp RcppArmadillo rlang Rsymphony tidyr]; }; prioritizr = derive2 { name="prioritizr"; version="7.1.1"; sha256="1d2nsbixfn6nk6icb78kiddpgpn7z2gvinmd19laqdj7a3lbknax"; depends=[ape assertthat BH data_table doParallel exactextractr fasterize igraph magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sf slam sp tibble uuid withr]; }; prioritizrdata = derive2 { name="prioritizrdata"; version="0.2.4"; sha256="0027nbkvp8b2w4cciabiqjdyxhjwh47k7dc36p79mkqfarh04rgv"; depends=[raster sp]; }; prioritylasso = derive2 { name="prioritylasso"; version="0.2.5"; sha256="1myci7akab1fg7p72q1hrchkixs7q5lagdsfpmdbvd13yy4q3h5z"; depends=[glmnet survival]; }; @@ -14403,7 +14619,7 @@ in with self; { probFDA = derive2 { name="probFDA"; version="1.0.1"; sha256="093k50kyady54rkrz0n9x9z98z5ws36phlj42j25yip7pzhfd6sv"; depends=[MASS]; }; probably = derive2 { name="probably"; version="0.0.6"; sha256="0g7d6mw4nj6lynbpaa4qbnyzpwgw1bwl44b7zxm6x1wal6p679ga"; depends=[dplyr generics rlang tidyselect vctrs yardstick]; }; probemod = derive2 { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; }; - probout = derive2 { name="probout"; version="1.1.1"; sha256="1hasrvxdig8n3fhzsbmq27050dyanzp1j0qlybnrkb41k9gyljda"; depends=[FNN MASS mclust]; }; + probout = derive2 { name="probout"; version="1.1.2"; sha256="1x7q878xzw1b1c6jfx856akxzcxrwanv67jji2ifkcdx2hgmgvpx"; depends=[FNN MASS mclust]; }; proccalibrad = derive2 { name="proccalibrad"; version="0.14"; sha256="0vr55rpcqh9wvy3bklssrimp42x85w3sanjgshfij657v68vmx46"; depends=[]; }; proceduralnames = derive2 { name="proceduralnames"; version="0.2.1"; sha256="0c8yx4yz62aa80v7ildsacxp2vav3skgffb90kn65nz4wryddq37"; depends=[]; }; processR = derive2 { name="processR"; version="0.2.6"; sha256="1k6ili4vx2s36l9xdvm7livnjr4r1pcdg5f92ivdivarcb3h907w"; depends=[diagram dplyr flextable ggplot2 ggrepel interactions lavaan officer predict3d psych purrr rlang rmarkdown rrtable semTools stringr tidyr tidyselect ztable]; }; @@ -14425,7 +14641,7 @@ 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="0.8.5"; sha256="0i41qdgwj9ajgp7a6gl558cbf30hjk12278inbr60jhhd92gaa69"; depends=[Matrix Rcpp RcppArmadillo RcppProgress splines2]; }; + profoc = derive2 { name="profoc"; version="0.9.1"; sha256="033c036ck273zxg0k7qjcvgxm5k05gjxrvnqvyw7hh9g4lgh8824"; depends=[abind Matrix Rcpp RcppArmadillo RcppProgress splines2]; }; 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.7"; sha256="1f86m426pcf90l29hf4hkirzf8f38dihk52bxbdq2gvrrdili5s3"; depends=[htmlwidgets stringr]; }; @@ -14433,11 +14649,12 @@ in with self; { prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; }; progress = derive2 { name="progress"; version="1.2.2"; sha256="0dgzb362641aqm8xd88iqa8jmpdm43xs0aba0d5kk6fvapnxi95l"; depends=[crayon hms prettyunits R6]; }; progressr = derive2 { name="progressr"; version="0.10.0"; sha256="1p5s35rzh28n2id2lipgyqmh3wzib66m7x0pz9028y8cql8xr5ac"; depends=[digest]; }; - proj4 = derive2 { name="proj4"; version="1.0-10.1"; sha256="06fsw7j9c50s0md06niyvj6hvsk3fad0y1r1hsqk0jdsbjz7r1b6"; depends=[]; }; + proj4 = derive2 { name="proj4"; version="1.0-11"; sha256="07fil52jswbg2h807cd82m2wlm5j2fb891ifri9ms037099qdwf5"; depends=[]; }; projections = derive2 { name="projections"; version="0.5.4"; sha256="1c7fm2f3fx0905afw3nrbv6vv0a0awpml1rl2kaxnijjgqcxa6dg"; 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.0.2"; sha256="0nx514mrfh3gv854pr71w5x3zgdnn0kinf5nh7z90q3h7ysry2mg"; depends=[dplyr gamm4 ggplot2 lme4 loo magrittr MASS mgcv optimx Rcpp RcppArmadillo rngtools rstantools tidyverse]; }; + prome = derive2 { name="prome"; version="0.0.0.8"; sha256="1c9jzpapjyfhpxvjw59p7ch99la00c7nhmvdmsxc4fwi0wcj9pb1"; 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]; }; promote = derive2 { name="promote"; version="1.1.1"; sha256="1cdz4xqinyzpbbgkxxd4f86n1h8zj88vp5z6w01cxd5ykyjf5411"; depends=[httr jsonlite stringr]; }; @@ -14451,7 +14668,7 @@ in with self; { prophet = derive2 { name="prophet"; version="1.0"; sha256="06mryavky9xj54ig4scqjgpx7i56nwhs53g0zqsbs9f6qxja7gll"; depends=[BH dplyr dygraphs extraDistr ggplot2 lubridate Rcpp RcppEigen RcppParallel rlang rstan rstantools scales StanHeaders tidyr xts]; }; proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; }; propr = derive2 { name="propr"; version="4.2.6"; sha256="16ghgzpwz6q9zlaa0pc8wqv0wpz81c75n7zwjyr1lv9y19qwlkfg"; depends=[fastcluster ggplot2 igraph Rcpp]; }; - prospectr = derive2 { name="prospectr"; version="0.2.2"; sha256="1nlwwz777nlpdcnsn36j6s0gpdb7ria08x20hklmsa49q2aiqfc1"; depends=[foreach iterators lifecycle mathjaxr Rcpp RcppArmadillo]; }; + prospectr = derive2 { name="prospectr"; version="0.2.3"; sha256="1c2p9dy6h6w31v1hviqjr3kkzzzd303s64qhywcjp0ymjvbzlprp"; depends=[foreach iterators lifecycle mathjaxr Rcpp RcppArmadillo]; }; protViz = derive2 { name="protViz"; version="0.7.0"; sha256="0l1pmfr9kmc90rl5s9b0141451rxrjmiiasp3lsvl2x3ps0smqaj"; 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]; }; @@ -14465,7 +14682,7 @@ in with self; { proton = derive2 { name="proton"; version="1.0"; sha256="1mgaw54is8l6ac1rf8s70rj7kv9xgsfdrlvjz01ggfwg7c6pyr3s"; depends=[digest]; }; prototest = derive2 { name="prototest"; version="1.2"; sha256="07g58hq2qdpczqhjsv6dq1bya9rs958r103n91icw5yc19bvyhi2"; depends=[glmnet intervals MASS Rcpp RcppArmadillo]; }; protr = derive2 { name="protr"; version="1.6-2"; sha256="13vgiqkqqq1w2yj5f6i6scag0mr189zmisyvi6fgaw8g9dgxpxan"; depends=[]; }; - protti = derive2 { name="protti"; version="0.2.0"; sha256="0nrn8lsxhqpq1xp1njly9px9awg33g732sjh8xgw4vfkn0v5qgcm"; depends=[curl data_table dplyr forcats ggplot2 ggrepel janitor lifecycle magrittr plotly progress purrr readr rlang stringr tibble tidyr]; }; + protti = derive2 { name="protti"; version="0.2.2"; sha256="11g04c7yscvxqixjslyiq7nx1l1rq8ari3mzaiw3afb4y87hp4x5"; depends=[curl data_table dplyr forcats ggplot2 ggrepel httr janitor lifecycle magrittr plotly progress purrr readr rlang stringr tibble tidyr]; }; proustr = derive2 { name="proustr"; version="0.4.0"; sha256="1qp4v4vb1qh137qn7zi1d2g999z17kq6kpyxy9355mj8c49iy8pn"; depends=[attempt rlang SnowballC stringr tidyr tokenizers]; }; provDebugR = derive2 { name="provDebugR"; version="1.0.1"; sha256="0ynz5m1gkaj1wks5l71r3iz7npf3mz0r04jsa8zwg670zsv2x7rf"; depends=[httr jsonlite provGraphR provParseR textutils]; }; provExplainR = derive2 { name="provExplainR"; version="1.1"; sha256="1jgxmpzgigpbdqh3r8gy6h0akv11ssl494h2jscdyb8zpjmc92fg"; depends=[diffobj digest dplyr provParseR stringr]; }; @@ -14473,8 +14690,9 @@ in with self; { provParseR = derive2 { name="provParseR"; version="0.3"; sha256="0cmyb6da9l0822xrzni19r1ha6zzya385hk2ym9rmchvb34lax53"; depends=[jsonlite]; }; provSummarizeR = derive2 { name="provSummarizeR"; version="1.4.2"; sha256="1pfnrvgqzpdhrsyh0y75idwj13zgcdj7ql6frpjmc0f5cggv7q1q"; depends=[dplyr provParseR]; }; provTraceR = derive2 { name="provTraceR"; version="1.0"; sha256="19iillyh5zw64mmr6ik4ci1n2p651xqzxa4iq5bwa70imbzyy5ip"; depends=[provParseR]; }; - provViz = derive2 { name="provViz"; version="1.0.7"; sha256="0bjq8mywgm2jr0m0458wk6n5al7jr1psvh4g31z4qzlrrkfqgzzg"; depends=[]; }; + provViz = derive2 { name="provViz"; version="1.0.8"; sha256="0zdfvr9mj2d7h20ahq2fksqqjg6isbhhf4kwg2brxb5fcb9462a4"; depends=[]; }; provenance = derive2 { name="provenance"; version="3.3"; sha256="0kdpv1gjvgv9nxfsarm1z042xas9d4n2smhrqccs450a2mhb5fxr"; depends=[IsoplotR MASS]; }; + proverbs = derive2 { name="proverbs"; version="0.1.0"; sha256="1i3aqlk4xb6zrjb7izyz7m9ys950cc6msvac8ixx74a7s57j99p1"; depends=[cli crayon httr lubridate magrittr purrr]; }; proxirr = derive2 { name="proxirr"; version="0.2"; sha256="0ffnzmd9zy43vzp0mc0ncjwfj5d7p2gzwk8gcwhk1f9yvgiw4wc1"; depends=[]; }; proxy = derive2 { name="proxy"; version="0.4-26"; sha256="0k8sr24mjfvxp12sf1j9228ah3ngy15nqmm0jw14x5s32f1assv7"; depends=[]; }; proxyC = derive2 { name="proxyC"; version="0.2.4"; sha256="1mcimswrx1cjjm7wsgkzfrgh3jpf4sncwfvdvg2f14fzfzy7afd6"; depends=[Matrix Rcpp RcppArmadillo RcppParallel]; }; @@ -14489,7 +14707,7 @@ in with self; { psborrow = derive2 { name="psborrow"; version="0.1.0"; sha256="1swkwi65zdsl8q12191lj2vhwbhkhb302zh6rmhcf0bg9cj0xpj5"; depends=[data_table doParallel dplyr foreach futile_logger ggplot2 MatchIt matrixcalc mvtnorm rjags survival tidyr]; }; pscl = derive2 { name="pscl"; version="1.5.5"; sha256="0vzf5wazs92bhqhqd66v3vwmbfmnh67gb2466g1xxawim649nk05"; depends=[MASS]; }; pscore = derive2 { name="pscore"; version="0.1-2"; sha256="1sfkxs2kv8lq87j3q9ci7j38c7gzfkp2l36lwcdhiidr2nls2x0c"; depends=[ggplot2 lavaan reshape2]; }; - psd = derive2 { name="psd"; version="2.1.0"; sha256="18zd9sa86sx52ncwx6qc9lch2j4kfn8l6w6vryjp5awkf89mv3b2"; depends=[RColorBrewer Rcpp RcppArmadillo]; }; + 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]; }; pse = derive2 { name="pse"; version="0.4.7"; sha256="0kigfzsvx3gw7jwym4f19dydwwarwxgmha7hpy54gg0zzi4k9icl"; depends=[boot Hmisc]; }; @@ -14504,11 +14722,12 @@ in with self; { psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; }; psp = derive2 { name="psp"; version="0.1"; sha256="0ls8nqfddl9yqsz6binjf5smg3vbs5r65dqv92zn6hmb51akf7q5"; depends=[]; }; pspearman = derive2 { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; }; - pspline = derive2 { name="pspline"; version="1.0-18"; sha256="1iwsw52miil1v1yl99mzl28qi8gdjr56rlasmh8faqjlpn9z477p"; 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.0"; sha256="0kb607d8jmxy152s1iigz6qwzrdn38q5bjc5klm8fhkndgj3y91c"; depends=[Matrix Rcpp RcppEigen testthat]; }; + 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="1.3"; sha256="09yzr4g3pldsn95n9nmjm4vj5fbv8xl2n8xr8i1ngf766yn65lqj"; depends=[BH cowplot dplyr ggplot2 randomForest Rcpp RcppEigen rstan StanHeaders]; }; + psre = derive2 { name="psre"; version="0.1.0"; sha256="01g0p5sfhahjs2q13dcaqk816ch3niv1gxw6fpivih3n92r5yygj"; depends=[boot car cowplot DAMisc dplyr fANCOVA ggplot2 ggrepel lawstat magrittr MASS metap mgcv multcomp normwhn_test nortest rlang sm tibble tidyr]; }; + psrwe = derive2 { name="psrwe"; version="3.1"; sha256="0gmsh0294jzazxw4ss6jys92dckgfh4fqirfcdi3pzr6a7nnam8s"; depends=[BH cowplot dplyr ggplot2 randomForest Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders survival]; }; pssm = derive2 { name="pssm"; version="1.1"; sha256="0r3d1mzc7bcz238lqq4y518400m2dqm5a1fb9gkfiari1ax099lv"; depends=[abind MASS MHadaptive numDeriv]; }; 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]; }; @@ -14517,9 +14736,8 @@ in with self; { psych = derive2 { name="psych"; version="2.1.9"; sha256="032h33i2qlwsw2iq82nri5y8hs7d593w40aghcvnibpi2wxf0x8l"; depends=[lattice mnormt nlme]; }; psychReport = derive2 { name="psychReport"; version="3.0.1"; sha256="0mii4n24dfc8rh6jz81sil2wn9ml6vdaqn5m8caf3glv9k0v812c"; depends=[broom cli dplyr ez xtable]; }; psychTools = derive2 { name="psychTools"; version="2.1.12"; sha256="0fqxlggbhi5g016vyiby8g42ll0080fig15p689cas2ydwn5zklk"; depends=[foreign psych]; }; - psychmeta = derive2 { name="psychmeta"; version="2.6.1"; sha256="1kr39il60xa8imikbqcfxr90wwl6bz84mfxnwj2in7h636wnf3fk"; depends=[boot curl dplyr ggplot2 mathjaxr metafor progress purrr rlang tibble tidyr]; }; + psychmeta = derive2 { name="psychmeta"; version="2.6.2"; sha256="0yacf2d2svb95a95cxa37szxpags156kwmn5knpfyn4hgbwp390g"; depends=[boot curl dplyr ggplot2 mathjaxr 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.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; }; psychomix = derive2 { name="psychomix"; version="1.1-8"; sha256="0lfhfcmrk65gkr1yp317b515vmadbcf0vjcnc76d07yp6yfkz5qw"; depends=[flexmix Formula lattice modeltools psychotools]; }; psychonetrics = derive2 { name="psychonetrics"; version="0.10"; sha256="09jv7ladas5yfj51nv323z2hgyamd6q40vi07wfypimpi3h4szyh"; 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-0"; sha256="11gybrf9d90nbqfm76qr2z9y4bn498j1csg5zir38k5inpw5bk3x"; depends=[]; }; @@ -14534,13 +14752,13 @@ in with self; { ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; }; ptf = derive2 { name="ptf"; version="0.0.1"; sha256="1s9nzn823z2capil83vcfs7frg8f6bpygx8aw1zz4sacnhvryr52"; depends=[Matrix plyr rARPACK Rcpp RcppArmadillo]; }; ptinpoly = derive2 { name="ptinpoly"; version="2.8"; sha256="126chp92ha48agx5i819bzdij79zbgj32msijvaid3zhxjx7qy1j"; depends=[misc3d]; }; - ptm = derive2 { name="ptm"; version="0.2.4"; sha256="00szxlil7657ciwh17jkk1mv28m5h1la97ksgn3glypf5z7hsrd4"; depends=[bio3d Biostrings curl httr igraph jsonlite muscle RCurl seqinr xml2]; }; + ptm = derive2 { name="ptm"; version="0.2.5"; sha256="0q3j081fhs0pin8zx6m280hc000cdf9dmbmilyf88c0ryd1cx5bb"; depends=[bio3d Biostrings curl httr igraph jsonlite muscle RCurl seqinr xml2]; }; ptmixed = derive2 { name="ptmixed"; version="1.1.1"; sha256="12yjm73grs14gzwnh61qp0vzbikmwfl1f26s9xfclsp6g61k3rzg"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; }; pts2polys = derive2 { name="pts2polys"; version="0.1.3"; sha256="0rmgryv0vds20npvaqvvwrhrx0grfcz9qwdy2w3bx945r0chhw39"; depends=[Rcpp]; }; 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]; }; ptvapi = derive2 { name="ptvapi"; version="2.0.1"; sha256="01n3am89gcmldcamasjw5666ikpxi68p4mzmkrwy6d1k4shrifbi"; depends=[assertthat digest glue httr jsonlite purrr tibble]; }; - ptw = derive2 { name="ptw"; version="1.9-15"; sha256="0ikvzc5vfcs50jl5n49mhk39pcijyfdxd26adgs01h0b50zh1yi2"; depends=[nloptr]; }; + 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]; }; pubchunks = derive2 { name="pubchunks"; version="0.3.0"; sha256="14jzl0ra0d68s246a9jhfgp1wyy9g7d0rzahvl97crkklld1crvx"; depends=[data_table rcrossref xml2]; }; @@ -14564,7 +14782,7 @@ in with self; { pushbar = derive2 { name="pushbar"; version="0.1.0"; sha256="1gxarv6x32y6ssrhsq3pyihzcvpnnj7bg0jf2cpcr99da78n1d9b"; depends=[jsonlite shiny]; }; pushoverr = derive2 { name="pushoverr"; version="1.1.0"; sha256="05ma76jhk00m9872f7gb0vwmk2q3l79r1ddaf1slbhgd57l1avk2"; depends=[checkmate cli glue httr rlang]; }; puzzle = derive2 { name="puzzle"; version="0.0.1"; sha256="073n074irsvn4w1jy5xmr6l24a209kn0ypvf1d2zn3p6yd93wzss"; depends=[dplyr kableExtra lubridate plyr readr readxl reshape reshape2 sqldf tidyverse]; }; - pvLRT = derive2 { name="pvLRT"; version="0.3"; sha256="0fhnyj0ax9c4k0vah0p7dlf825abxr45bkcx5ifrgbmwdnj783gl"; depends=[bit64 data_table ggplot2 glue magrittr progress RColorBrewer]; }; + pvLRT = derive2 { name="pvLRT"; version="0.4"; sha256="1rvavmnfcbc6qqd5d4611h54hzvd18m2vwxy6xc6grr2w2rrngn1"; depends=[bit64 data_table ggfittext ggplot2 glue magrittr progress RColorBrewer]; }; pvaluefunctions = derive2 { name="pvaluefunctions"; version="1.6.2"; sha256="10dxzbz6fw01qgfm6mmxb1xy14pwxgif0d603m3x146337pccc7q"; depends=[ggplot2 gsl pracma scales zipfR]; }; pvar = derive2 { name="pvar"; version="2.2.5"; sha256="1a5dxhki5nd5s1d5wwnc1dkg7mdib2s8w1i0l8mdg3f1g3l00klz"; depends=[Rcpp]; }; pvclass = derive2 { name="pvclass"; version="1.4"; sha256="1g6x75qz3xybq1xnik0hzi7mcs0gzzqd3f0iwfkzi5d1zcddnw13"; depends=[Matrix]; }; @@ -14574,7 +14792,7 @@ in with self; { pvsR = derive2 { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; }; pwr = derive2 { name="pwr"; version="1.3-0"; sha256="1kfzy73v3z6ipc3kdfkcjrp4b4p5k54nwk796gqi36srm93hgc2v"; depends=[]; }; pwr2 = derive2 { name="pwr2"; version="1.0"; sha256="0zfv7z5yymw310r1sqm8ivsc2pv6dgk2k4b1axmm92gsaj53cn7p"; depends=[]; }; - pwr2ppl = derive2 { name="pwr2ppl"; version="0.2.0"; sha256="0v0f632b0zl4vbzb2x0294xqvsidvckx8b84qmqx5fbwp8jz8kgx"; depends=[afex car dplyr ez lavaan MASS MBESS nlme phia tidyr]; }; + pwr2ppl = derive2 { name="pwr2ppl"; version="0.3.0"; sha256="0ffwsldx9xplf2lqzi0m5a0715437c4g3352r8408n1p53lj2scd"; depends=[afex broom car dplyr ez lavaan lmtest MASS MBESS nlme phia quantreg semTools tidyr]; }; pwrAB = derive2 { name="pwrAB"; version="0.1.0"; sha256="0ifyw40m9gsijw3vm9qb8qk4yydmdixfdpdp45x2hk93j8v61jm1"; depends=[]; }; pwrFDR = derive2 { name="pwrFDR"; version="2.8.9"; sha256="16qlxwhljhf878a7jif2kjj7hvga01bgr8zb6bh555yacxxh4yiz"; depends=[]; }; pwrRasch = derive2 { name="pwrRasch"; version="0.1-2"; sha256="13fr4yfk8aky1vv36pllx673l4lg9q7i661vbyn2zabyizd2rw3b"; depends=[]; }; @@ -14595,17 +14813,20 @@ in with self; { qGaussian = derive2 { name="qGaussian"; version="0.1.8"; sha256="02xy35xg4swr1ldnsbywnz2h0ga1pbsivnj0aqmpll7kvwl9qz4c"; depends=[Rcpp robustbase zipfR]; }; qLearn = derive2 { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; }; qMRI = derive2 { name="qMRI"; version="1.2"; sha256="10x59g8awxjib5j5mc1yd5wsibk3z6ki6zifxsg8azl0zblxbscf"; depends=[adimpro aws awsMethods oro_nifti stringr]; }; + 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.1"; sha256="0b6zpffyxqqp76xajv5sf1ylz8glnsd2ajj91ijdads21hxqfrnw"; depends=[copula cowplot data_table dplyr ggExtra ggplot2 Rcpp viridis]; }; qap = derive2 { name="qap"; version="0.1-1"; sha256="0d2d1ni1camixyi45lfy00f4pn3p063k7bsi8gj5scp6n15mdgb0"; depends=[]; }; qape = derive2 { name="qape"; version="1.1"; sha256="168jcs2p1213k7fdsqvi1hqp9d2y8j2amrbrcxf2cjr5hnck19w9"; depends=[dplyr lme4 Matrix mvtnorm plyr]; }; qat = derive2 { name="qat"; version="0.74"; sha256="04n1jnbkf9dzafjh1n5d4q9p7hvyhnr63nmgl51jqxcf3nan5rlx"; depends=[boot fields gdata gplots moments ncdf4 XML]; }; + 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=[]; }; 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]; }; 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]; }; - qcr = derive2 { name="qcr"; version="1.3"; sha256="0jifg383qv935q9jlrlwy3y00nvjpgp2vm3qv5z0jdlr4kdw0pmm"; depends=[fda_usc MASS mvtnorm qcc]; }; + qcpm = derive2 { name="qcpm"; version="0.1"; sha256="08y02wdmnjlv5r1li3dm2g9hzbl0jm7krb4q5r9q4nf4fvbsm50m"; depends=[broom cSEM quantreg]; }; + qcr = derive2 { name="qcr"; version="1.4"; sha256="14nilw60p2kcabh9w5k8bvdjqx4lm5lj79qiigg3i372byq5gb7r"; depends=[fda_usc MASS mvtnorm qcc]; }; qcv = derive2 { name="qcv"; version="1.0"; sha256="0hf02l9c1cpzs02mfn9swfc8l635qsvh6xrhj21g19h5rxaf8jwg"; depends=[]; }; qdap = derive2 { name="qdap"; version="2.4.3"; sha256="1fadzq7afavxfhcd8q6xy3g8d7jwy24zz1da2ig9bd8vrk5zjmnx"; 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=[]; }; @@ -14614,10 +14835,10 @@ in with self; { qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; qfasar = derive2 { name="qfasar"; version="1.2.1"; sha256="14370bmq4qx5j02va13wz52m2lgl4vb992p9587z9v2sxl1v4jjg"; depends=[Rsolnp]; }; qgam = derive2 { name="qgam"; version="1.3.4"; sha256="1jyamamdffaks89rspyhmg18b4iik0nb1j0vgqzvfnm890514cvn"; depends=[doParallel mgcv plyr shiny]; }; - qgcomp = derive2 { name="qgcomp"; version="2.8.5"; sha256="15nzhwcmg8i6q32af76ap8hs9pv522hcrc03lj57d600l2x6yk49"; depends=[arm future future_apply generics ggplot2 gridExtra pscl survival tibble]; }; + qgcomp = derive2 { name="qgcomp"; version="2.8.6"; sha256="00wfslhj7hm5qgpbz8zg4a3dwrbvnn0g6m0vcq56mjvfinnip8aw"; depends=[arm future future_apply generics ggplot2 gridExtra pscl survival tibble]; }; qgcompint = derive2 { name="qgcompint"; version="0.6.6"; sha256="13r0nzxwz9w5papxiqkxjw594qljpqqxw1wkrhj2n68ykvbvl1n7"; depends=[arm future future_apply ggplot2 gridExtra qgcomp survival]; }; qgg = derive2 { name="qgg"; version="1.0.4"; sha256="1xyviy73jl76bpv5izlkgf171qrypgv2wm5mi3s06cb7md8psrkb"; depends=[data_table MASS MCMCpack statmod]; }; - qgraph = derive2 { name="qgraph"; version="1.9"; sha256="1ahhzp64jdgki5p2wga5mn8a2n1x2zldgpilrpf7hy5l9nf4imz1"; depends=[abind colorspace corpcor fdrtool ggplot2 glasso gtools Hmisc igraph jpeg lavaan Matrix pbapply plyr png psych Rcpp reshape2]; }; + qgraph = derive2 { name="qgraph"; version="1.9.2"; sha256="0r225b7rnsv6wz41ij0msmqr1xy0iqxh9dbsvjixbi1hvgv91wds"; 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]; }; @@ -14627,7 +14848,7 @@ in with self; { 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.1"; sha256="0fpb1jl7bpjrdwlg5rlmbxzwa1is3f6m7q8sibzz4cyva0730avd"; depends=[BH Rcpp]; }; + qlcal = derive2 { name="qlcal"; version="0.0.2"; sha256="1fwk0wiwx8bq1yrqnd3n73ic8m5bc4xw1ziz79vrmfjmvzzkfysj"; depends=[BH Rcpp]; }; qmap = derive2 { name="qmap"; version="1.0-4"; sha256="02xvq1mw83gln7phacbi3vhkvb100crggbldv13mhwq3wjnmg5k2"; depends=[fitdistrplus]; }; qmd = derive2 { name="qmd"; version="1.0.0"; sha256="107z0frnr26qhsk6s930r4x4lqlfvf3m6wj6ppw11zxjsrsp0g5w"; depends=[qad]; }; qmethod = derive2 { name="qmethod"; version="1.8"; sha256="0wv6i48w15pmsd8y0c46r3152w4y7is2xmsy6d9sqys8rbmqk019"; depends=[digest GPArotation knitr psych rjson shiny xtable]; }; @@ -14638,7 +14859,7 @@ in with self; { qpdf = derive2 { name="qpdf"; version="1.1"; sha256="03lnfncw8qd1fwfyqh1mjvnsjr3b63wxbah0wp5g7z7gba90dwbi"; depends=[askpass curl Rcpp]; }; qpmadr = derive2 { name="qpmadr"; version="1.1.0-0"; sha256="0krv3zhr42z2mkkbn2bkglzfxbf06dmd9vnnc3rcyhm1r85n4fbq"; depends=[checkmate Rcpp RcppEigen]; }; qqboxplot = derive2 { name="qqboxplot"; version="0.1.0"; sha256="0807ww7cvc84hmwrwp2q5gy6v0qd01mwhj537403iy9z4z3wsvhv"; depends=[ggplot2]; }; - qqconf = derive2 { name="qqconf"; version="1.1.1"; sha256="1khaipqwhji30jvzn7kh46s7nc8df3w1r3g7c8i48qps3qrimfmh"; depends=[distr dplyr ggplot2 magrittr MASS rlang robustbase]; }; + qqconf = derive2 { name="qqconf"; version="1.2.1"; sha256="195m60wy065yfp3x18hkxn6sr75igg9bcq0rgn8qcfyz4hc2pmgf"; depends=[distr dplyr ggplot2 magrittr MASS Rcpp rlang robustbase]; }; qqman = derive2 { name="qqman"; version="0.1.8"; sha256="1a6qp5wv9bvwjchfw8x4jh48hkynlnfr21a8vqgnswldvwbq7njq"; depends=[calibrate]; }; qqplotr = derive2 { name="qqplotr"; version="0.0.5"; sha256="1ija4ik3bc404yjm5pw4y32krs1gxn6jd05pqmc0ajawydvr4w1r"; depends=[dplyr ggplot2 MASS robustbase]; }; qqr = derive2 { name="qqr"; version="0.0.1"; sha256="1vi4nbm356vahm4hnvy686nysbn4n63p9cjd4i9dm73lhsf9ilmn"; depends=[dplyr rvest stringr tidyverse xml2]; }; @@ -14659,7 +14880,7 @@ in with self; { qrmtools = derive2 { name="qrmtools"; version="0.0-14"; sha256="1gjaq6i0xhsivcmivbn4xxsqasbvf95p1w0rzpycxzgcfarxwwx3"; depends=[ADGofTest lattice Quandl quantmod rugarch xts zoo]; }; qrng = derive2 { name="qrng"; version="0.0-8"; sha256="1yagh7llrg208mdmwyq7gy4c7h20hj4s5ikp6nc3q8pl7avmq3jc"; depends=[copula randtoolbox]; }; qrnn = derive2 { name="qrnn"; version="2.0.5"; sha256="0ligz67kbfg5cmvacnb7y0ms1v0c7mbvbcfsxyfiz543ppl3xn1v"; depends=[]; }; - qs = derive2 { name="qs"; version="0.25.2"; sha256="1gswppmw8rhd7h50hffhss4c4niz0x54r9sc8pgqzy26vkjqlhpy"; depends=[RApiSerialize Rcpp stringfish]; }; + qs = derive2 { name="qs"; version="0.25.3"; sha256="0sxy497v5arjv6lwxng7chkbzrn703waqmgsxv77i7y12ahzdbai"; depends=[RApiSerialize Rcpp stringfish]; }; qsimulatR = derive2 { name="qsimulatR"; version="1.0"; sha256="0d2al6rnsyj58jhwczn2rx09b007s2yjihpk7i65law7v8dmxiaf"; depends=[]; }; qsort = derive2 { name="qsort"; version="0.2.3"; sha256="1xvp29dijfa2207wyw3z09rmffn61fngfy0f00qjk284n1jnnvrg"; depends=[cowplot ggplot2 gridExtra purrr]; }; qst = derive2 { name="qst"; version="0.1.2"; sha256="0f5c4088y9c5fxyy2dyfkp049lnzvys3zyizazxsa82xwkwsbc8a"; depends=[DBI dbplyr dplyr magrittr RSQLite tibble]; }; @@ -14669,17 +14890,17 @@ in with self; { qtl2 = derive2 { name="qtl2"; version="0.28"; sha256="0ppc6dzlq77mppxc6bczai9gi40jrbxd1466y2cn2s8a4ah1jg9y"; depends=[data_table jsonlite Rcpp RcppEigen RSQLite yaml]; }; qtl2convert = derive2 { name="qtl2convert"; version="0.26"; sha256="0m10wwc7v0143h8mbai55qlqpr0hnz9b61frq1vqc5x35rg4nj5g"; depends=[qtl qtl2 Rcpp]; }; qtl2fst = derive2 { name="qtl2fst"; version="0.26"; sha256="0wpqpmj752pwjgghv7b30r69nc950h5fnsszsj142p7vws7ss8j9"; depends=[fst qtl2]; }; - qtl2ggplot = derive2 { name="qtl2ggplot"; version="1.1.0"; sha256="1d2gchcw3ywc8dj3ivrn1qwcyw45m3qx9csya8vkis5zklx55w5q"; depends=[assertthat dplyr ggplot2 ggrepel purrr qtl2 RColorBrewer Rcpp rlang stringr tidyr]; }; - qtl2pattern = derive2 { name="qtl2pattern"; version="1.0.17"; sha256="0g8xk6zvlr6s18mrkw0ry3mas74k0abajp1ddqfdwnj81gsh6vn4"; depends=[assertthat dplyr fst ggplot2 purrr qtl2 qtl2fst RColorBrewer rlang stringr tidyr]; }; + qtl2ggplot = derive2 { name="qtl2ggplot"; version="1.2.1"; sha256="0xr1hhhwifpjbnrp6cwjijic0qwp2yiar7qvb9dl9rb2ww4r369b"; depends=[assertthat dplyr ggplot2 ggrepel purrr qtl2 RColorBrewer Rcpp rlang stringr tidyr]; }; + qtl2pattern = derive2 { name="qtl2pattern"; version="1.2.0"; sha256="0d6s4lx9vxgrj753kn14b2kgmmrmg2x5y1zhhgyfyy0alwxvjcc8"; depends=[assertthat dplyr fst ggplot2 purrr qtl2 qtl2fst RColorBrewer rlang stringr tidyr]; }; qtl2pleio = derive2 { name="qtl2pleio"; version="1.4.3"; sha256="0az71vgj1gv7rfz0hnc9rysh49ak2pnkvmih5mwmymr4an84c34k"; depends=[dplyr gemma2 ggplot2 magrittr MASS Rcpp RcppEigen rlang tibble]; }; qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; }; qtlbook = derive2 { name="qtlbook"; version="0.18-8"; sha256="1c849xy2ki7niddajv5wnsm0zdp5381w8zm9lc8rvkdbs2v6rhf4"; depends=[]; }; qtlc = derive2 { name="qtlc"; version="1.0"; sha256="17ij4alx4qg556b5kq7qsjygj5jf8iyx1f0v52pvx1z2sm6nppww"; depends=[plot3D rgl tiff]; }; - qtlcharts = derive2 { name="qtlcharts"; version="0.14"; sha256="1w83x6yrq3hj2sahc5sz1rj5czn408ig35gb90jn36g4ar8zivxp"; depends=[htmlwidgets qtl]; }; + qtlcharts = derive2 { name="qtlcharts"; version="0.16"; sha256="1bf7cdcbbxblsx357pymq54yr4aa7iaxpq4f73nbxdal9nbcqkda"; depends=[htmlwidgets qtl]; }; qtlhot = derive2 { name="qtlhot"; version="1.0.4"; sha256="0gf0fsq91g830vqg5kz01zznm40qpjncy964ccvmms3i6d3hxd9m"; depends=[corpcor mnormt qtl]; }; qtlmt = derive2 { name="qtlmt"; version="0.1-6"; sha256="023h60z8d05832l2g7mg776hfjb0i7xpvhz3i899rc3h5pgjd94c"; depends=[]; }; qtlnet = derive2 { name="qtlnet"; version="1.5.4"; sha256="0jdf3hyzas0lyv2v4gqai9mhh7218a1mvm0nlwv9hfdbij0hi84v"; depends=[graph igraph pcalg qtl sem]; }; - qtlpoly = derive2 { name="qtlpoly"; version="0.2.2"; sha256="0a7nlc22yndp9xbq5lyabzahgym6vayi46z1a75wwgjdjizji1r0"; depends=[abind CompQuadForm ggplot2 gtools MASS Matrix mvtnorm nlme quadprog Rcpp RcppArmadillo RcppProgress RLRsim]; }; + qtlpoly = derive2 { name="qtlpoly"; version="0.2.3"; sha256="10a9zcsf2f6hkigwa3gpck2vg2pf9qa1z19kpk9kxbv4j1hja23s"; depends=[abind CompQuadForm ggplot2 gtools MASS Matrix mvtnorm nlme quadprog Rcpp RcppArmadillo RcppProgress RLRsim]; }; quRan = derive2 { name="quRan"; version="0.1.0"; sha256="108d797l9ggggc5b61pl7f6avzknmnnib2ys5vrg385zfbx9srvw"; depends=[]; }; quad = derive2 { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; }; quadmatrix = derive2 { name="quadmatrix"; version="0.1.0"; sha256="0nngrvvbalmrr6g9bq9f5qrllvwfq5p1b9yhs4zb098s3wga8jms"; depends=[geigen matrixcalc]; }; @@ -14687,7 +14908,7 @@ in with self; { quadprog = derive2 { name="quadprog"; version="1.5-8"; sha256="1ka9g8zak8sg4y2xbz93dfrldznlk9qpd4pq9z21cdcdn3b8s4i2"; depends=[]; }; quadprogXT = derive2 { name="quadprogXT"; version="0.0.5"; sha256="1yna2kx9pr58vyy6f4mwx4a6avjz84wwhcary88v1k0ihhv9swcz"; depends=[quadprog]; }; quadrupen = derive2 { name="quadrupen"; version="0.2-8"; sha256="1n3wqbdfwkrajhdkng6f8ixdz94znpqdfss872wrk0rz9bhpa03l"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; }; - quadtree = derive2 { name="quadtree"; version="0.1.2"; sha256="1k0hxc7ryw8avnyxs3clldjs9kypz0bh687gp6mhlf255fmpx0z2"; depends=[raster Rcpp]; }; + quadtree = derive2 { name="quadtree"; version="0.1.9"; sha256="1qmy4ndqjy237b5d6k3viir5barnzgq4873qz7fdr6igmz7wnpvk"; depends=[raster Rcpp]; }; qualCI = derive2 { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; }; qualV = derive2 { name="qualV"; version="0.3-4"; sha256="0rkjzva2h158d5c631jmjjh7qjibbyisl0503san80rk9fgxl45b"; depends=[KernSmooth]; }; qualmap = derive2 { name="qualmap"; version="0.2.0"; sha256="04kg4vz18zvkd6m37ng70ggi93pynwxi2ahh4n7n78f4rqa1d3nz"; depends=[dplyr glue leaflet purrr rlang sf]; }; @@ -14698,29 +14919,29 @@ in with self; { 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]; }; quantdates = derive2 { name="quantdates"; version="1.0"; sha256="1hyds8rwr1yg740aq4w5fqjrwdf3dl4phf8mj8qsgbb7i0wbbf3q"; depends=[lubridate]; }; quantdr = derive2 { name="quantdr"; version="1.2.0"; sha256="03dhcb5p9kkyl6qvpxbsjlrnjq0970xcr62j15jyhi878llzqk2n"; depends=[dr KernSmooth MTS mvtnorm quantreg]; }; - quanteda = derive2 { name="quanteda"; version="3.2.0"; sha256="0q72jsc6zalnl35qq02z9niissnyax4zxzqzpfpjsmgmxpd797mw"; depends=[fastmatch magrittr Matrix Rcpp RcppArmadillo RcppParallel SnowballC stopwords stringi xml2 yaml]; }; + quanteda = derive2 { name="quanteda"; version="3.2.1"; sha256="102wlx6481fskgdr5wv467n29f666q0qg9kjm0ivqfg9xsbvza12"; depends=[fastmatch magrittr Matrix Rcpp RcppArmadillo RcppParallel SnowballC stopwords stringi xml2 yaml]; }; quanteda_textmodels = derive2 { name="quanteda.textmodels"; version="0.9.4"; sha256="0r2nls93nriw97z0rmmpn2bb8c3jr571hv5slqj68p7ibr06rh1h"; depends=[glmnet LiblineaR Matrix quanteda Rcpp RcppArmadillo RcppParallel RSpectra SparseM stringi]; }; quanteda_textplots = derive2 { name="quanteda.textplots"; version="0.94"; sha256="1as7mpy3ihja5d9nw7c30w0yhaklpmn41bgw2cvpic2rbp5828fa"; depends=[extrafont ggplot2 ggrepel igraph Matrix network quanteda RColorBrewer Rcpp sna stringi]; }; quanteda_textstats = derive2 { name="quanteda.textstats"; version="0.95"; sha256="100125n2l3mhj0clbwpy3cbb84mwf83ix2c67sy8lmmh71vxz2rk"; depends=[Matrix nsyllable proxyC quanteda Rcpp RcppArmadillo RcppParallel stringi]; }; quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; }; quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; }; - quantilogram = derive2 { name="quantilogram"; version="2.1.1"; sha256="07mvgbk5qhkaihk2dn5c8cfac2xd9hfglh284sg4jkrkq0cfgrl8"; depends=[np quantreg SparseM]; }; + quantilogram = derive2 { name="quantilogram"; version="2.2.1"; sha256="0gvr93d6jjixcrislym0mna2l3plqhl8adaqiagdvxg4y0adfmf0"; depends=[np quantreg SparseM]; }; quantities = derive2 { name="quantities"; version="0.1.6"; sha256="0kz95q8npiir8nadvfnpnnm9z5jg9mqk7b1fp6l0bj8asmjyw1l3"; 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.18"; sha256="0dbcrncv06iqcbkky95dd7l32xq0hhbnkb0kj8wwzym1jf748h5a"; depends=[curl TTR xts zoo]; }; quantoptr = derive2 { name="quantoptr"; version="0.1.3"; sha256="0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3"; depends=[quantreg Rdpack rgenoud stringr]; }; - quantreg = derive2 { name="quantreg"; version="5.86"; sha256="01fnp6ndh7npxj76xlynndacsgmcfr9kgh2waw0clx3mmwlwilbi"; depends=[conquer Matrix MatrixModels SparseM]; }; + quantreg = derive2 { name="quantreg"; version="5.88"; sha256="0grsha18zkiil0qnxc1d7kc3w26i6aaa4av9n9ahdm8yf59yah0r"; depends=[Matrix MatrixModels SparseM]; }; 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.4-0"; sha256="0fw8kdgnlvb9c0xnankmzlpk9qnk52rqrrby32a02mz2f93ddh7k"; depends=[quantreg]; }; quantregRanger = derive2 { name="quantregRanger"; version="1.0"; sha256="1a9q2prr790bpw6s0y5ni5ppd3vqkjr0v4nqp6ywcj5n3sk69pvx"; depends=[ranger Rcpp]; }; quantspec = derive2 { name="quantspec"; version="1.2-3"; sha256="0ifwq2jmvxhpijz9yd9hffkff6ixcliaqkp9ispp9k1b8icwi8zn"; depends=[abind quantreg Rcpp snowfall zoo]; }; - quarks = derive2 { name="quarks"; version="1.0.10"; sha256="13g2pyxb2a4vyyj7nzq23mzbl1j9q5kpvyj0vd1gxvjnds47r5qp"; depends=[rugarch]; }; + quarks = derive2 { name="quarks"; version="1.0.11"; sha256="0zky5gxp9y457b833g3smc9hd875lc1kdnn94p0ykw3lcj9202pd"; depends=[rugarch]; }; quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; }; - quarto = derive2 { name="quarto"; version="1.0"; sha256="1733ck30p163m6zfxwr8kbzf8ks4zi0g5fi1azwdl97np5q3aarw"; depends=[jsonlite later processx rmarkdown rstudioapi yaml]; }; + quarto = derive2 { name="quarto"; version="1.1"; sha256="1j32kahfkca0kz2akah6jg2n1f04ck4y6irjv77s7ar61m5an054"; depends=[jsonlite later processx rmarkdown rstudioapi yaml]; }; queryparser = derive2 { name="queryparser"; version="0.3.1"; sha256="1pz66f3wxvvv42l5hib7hbpy14s8a13gn0n57vf6v5zdnz423kdr"; depends=[]; }; quest = derive2 { name="quest"; version="0.1.0"; sha256="15al3j850v7i59zr9yybxjrb3lnpd14369rp5vnpzwxy80jpy7d9"; depends=[car plyr psych psychTools str2str]; }; - questionr = derive2 { name="questionr"; version="0.7.5"; sha256="18ylfwcjcadh659sjihwzsik7zk477dm0zf3nsyx7a18na55v8m1"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny styler]; }; + questionr = derive2 { name="questionr"; version="0.7.7"; sha256="0mpxkmrv1v7fjj1hz1633n154s525p6skclybdhwmgldv45w896f"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny styler]; }; queuecomputer = derive2 { name="queuecomputer"; version="1.1.0"; sha256="1lzc0hfva8dpz2q5g0abjc2avyqdffi8g1qi5h6mvx8qn5kx7bmw"; depends=[dplyr Rcpp RcppArmadillo tidyr]; }; queueing = derive2 { name="queueing"; version="0.2.12"; sha256="0hw1ykm24cjpfwh7ac7fjf7mhc59mq8wy2g07aacpy5ibwi8bbsf"; depends=[]; }; quhomology = derive2 { name="quhomology"; version="1.1.1"; sha256="0wiih00zk4682wy1r4nyifh76h5bnvl3f785wjzmrwylnfy951l3"; depends=[MASS numbers]; }; @@ -14728,6 +14949,7 @@ in with self; { quickPlot = derive2 { name="quickPlot"; version="0.1.6"; sha256="0mffialxdim8f5s0bw9bb7p8dbrfdgq1wqih441x27lnmrvhlsa8"; depends=[backports data_table fpCompare ggplot2 gridBase igraph raster RColorBrewer rgdal rgeos sp]; }; 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.0"; sha256="005xv322bsmjkrfwsj21j3pci868yac9wbgzxnwl4bmcf81ri09v"; depends=[data_table hedgehog hms purrr testthat tibble]; }; quickerstats = derive2 { name="quickerstats"; version="0.0.1"; sha256="0jlczz042701p6j4m60k425m9x3q88m27mmf62ngz80dylcl2fdx"; depends=[curl httr readr tibble]; }; quickmapr = derive2 { name="quickmapr"; version="0.3.0"; sha256="0962qm8ak0wpqld8nrb8rvvb78743zfrfsq2xrwdlql681j2nv8c"; depends=[httr raster rgdal rgeos sf sp]; }; quickmatch = derive2 { name="quickmatch"; version="0.2.1"; sha256="1qfslhjlbjpzigz8n6b7w41g8pwdiwri091ivd5igp1xy5pv8a3w"; depends=[distances sandwich scclust]; }; @@ -14749,7 +14971,7 @@ in with self; { r_proxy = derive2 { name="r.proxy"; version="0.1.0"; sha256="0k7bcgp1d53ps6aalqz764v33mkamz5czdp72fc69zwrfb9rz63w"; depends=[curl jsonlite]; }; r02pro = derive2 { name="r02pro"; version="0.1"; sha256="1zciq86wpykvbd6zmh8b83dl4vpz53isi6hbbrz0h48sqb1g2006"; depends=[learnr]; }; r2d2 = derive2 { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; }; - r2d3 = derive2 { name="r2d3"; version="0.2.5"; sha256="1wfr5qnywrvps25z9iwn04n6wwvam4340jwpszxbbawby48kjppn"; depends=[htmltools htmlwidgets jsonlite rstudioapi]; }; + r2d3 = derive2 { name="r2d3"; version="0.2.6"; sha256="15mphywsr0603ipbgzac65n1nj7m77fmw3ypc33p9ng4fllg035r"; depends=[htmltools htmlwidgets jsonlite rstudioapi]; }; r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; }; r2dictionary = derive2 { name="r2dictionary"; version="0.1"; sha256="0assylz2ih96l4jily76hp524h5xbnc27ln8yjvk9c4q88yr8xfy"; depends=[rstudioapi stringr]; }; r2dii_analysis = derive2 { name="r2dii.analysis"; version="0.1.12"; sha256="1fnwq5x6mryiafblfn1pks1pf0kca64a9mx3ic9q5f466qjr3flp"; depends=[dplyr glue magrittr r2dii_data rlang tidyr tidyselect zoo]; }; @@ -14761,17 +14983,18 @@ in with self; { r2pmml = derive2 { name="r2pmml"; version="0.26.0"; sha256="15npzyjd5n1zysffhcfp4c0wykk2nhwgs8j2x8fqyn9cv2l8abjk"; 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]; }; - r2rtf = derive2 { name="r2rtf"; version="0.3.2"; sha256="18c430bhf0sk63yvljqmq3qdginp5ybs1j5bl73mmgz7h1p9wdsa"; depends=[]; }; + r2rtf = derive2 { name="r2rtf"; version="0.3.3"; sha256="1a6hbx9cjak2fv5khhq0k4j583qn24sbs5bykz86z530rbwbrc8y"; depends=[]; }; r2shortcode = derive2 { name="r2shortcode"; version="0.1"; sha256="03djy8m146k31xgvwcbrd1nzwj4wdlvvwzgviv80kskgr6ld9jrj"; depends=[magrittr stringr]; }; - r2spss = derive2 { name="r2spss"; version="0.2.0"; sha256="1l3yy4fqnmdndm4mxcn5mnzwcdrsrfgq49z9liivjp587665n8jc"; depends=[car]; }; + r2spss = derive2 { name="r2spss"; version="0.3.0"; sha256="1an0h4zpy0hjnwn6pihchfmbvkzjqd3vdzqnl1hxvs053z5i9549"; depends=[car ggplot2 scales]; }; r2sundials = derive2 { name="r2sundials"; version="5.0.0-10"; sha256="1hv5wq6lxrv57pszxky4xiwhjhjlzxa4fh0flrrmrrk89dygkx9v"; depends=[Rcpp RcppArmadillo rmumps]; }; r2symbols = derive2 { name="r2symbols"; version="0.1"; sha256="1i4sd015dgkv5i89d0cphp3jmn4jn4wqfazklfglysf85b2cm4iw"; depends=[]; }; r3PG = derive2 { name="r3PG"; version="0.1.3"; sha256="188vjzjya3qxi2xgzxxvf6ys97yxgdbjivwc54f4as37k2ad7l6p"; depends=[]; }; r3dmol = derive2 { name="r3dmol"; version="0.1.2"; sha256="06wzszqcy50gks1bss81j1l2a4adi271pnz6310w57g681q1ng19"; depends=[bio3d htmlwidgets magrittr]; }; + 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.36.1"; sha256="03xin7avdbg5ayrcdbw5rx9sh6ingjq2kv3405h01vqf1jhkfsxk"; depends=[coda corpcor gdata gplots gtools kableExtra pso truncnorm]; }; r511 = derive2 { name="r511"; version="0.1.1"; sha256="1njsnjf0746cv6x7fznq4cg556fczqcfawwb869r3w9zv0zj1iy9"; depends=[assertthat dplyr httr tibble xml2]; }; - r5r = derive2 { name="r5r"; version="0.6.0"; sha256="0wzkv7m44vrc9zrffvjxlqnf97cjc40kzjfm6w24xz7ic54glc4z"; depends=[checkmate curl data_table httr raster rJava sf sfheaders]; }; + r5r = derive2 { name="r5r"; version="0.7.0"; sha256="095db1bi06np8m4n3zprwnhazpa1r0jns86r24ddzdpm0ppdbga4"; depends=[checkmate curl data_table httr raster rJava sf sfheaders]; }; r6extended = derive2 { name="r6extended"; version="0.1.2"; sha256="1kq1j5rx57053mslj8jx1s0wjvhis7x3y264zw44q4k2x48q9wxs"; depends=[digest hellno magrittr R6]; }; r6methods = derive2 { name="r6methods"; version="0.1.0"; sha256="18q1qd7hkxbk0yilqdk17cp7qbl4c71jv10z732539wcmy8svb1v"; depends=[dplyr glue magrittr miniUI purrr rstudioapi shiny stringr]; }; rADA = derive2 { name="rADA"; version="1.1.9"; sha256="0p47nqm8mki03pq5gzc2r5vx4vixs6hpf7am1fvadgi2bn2jrcl2"; depends=[car dplyr e1071 forestplot ggplot2 gridExtra Hmisc knitr lme4 lmerTest matrixStats openxlsx reshape2 stringr tidyr]; }; @@ -14786,7 +15009,7 @@ in with self; { rBMF = derive2 { name="rBMF"; version="1.1"; sha256="16yg1k7vv88q421nk1a70626c7c54bwnb3x7kiyxv2c0ha00f3g8"; depends=[Matrix Rcpp]; }; 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.2"; sha256="0lnx38bxf1jgq3frlj1419a957h0abl72hpj0hb0hnlja8vq6fx3"; depends=[data_table future future_apply ggplot2 magrittr nls2 polynom]; }; + rBiasCorrection = derive2 { name="rBiasCorrection"; version="0.3.3"; sha256="0ld4agm490zhxgykcy0638pxdr8pgh9kb8kzsizizm7ws6cj3gw4"; 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"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; }; @@ -14798,9 +15021,8 @@ 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=[]; }; - rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; }; rDppDiversity = derive2 { name="rDppDiversity"; version="0.0.2"; sha256="0833v5wkamqipfxpsdxz040q6vlgg9qqpwiaivvh8ar5sci10v88"; depends=[Rcpp]; }; - rEDM = derive2 { name="rEDM"; version="1.10.0"; sha256="1a5lv6zli9hfc6h1jis1fzvdkkw7pwp8z8cs12231944ckwc309f"; depends=[Rcpp RcppThread]; }; + rEDM = derive2 { name="rEDM"; version="1.10.2"; sha256="1cg4g47q6vl231279zmaq6w743gcxj05xa9kf47wf3hzp01lhl1r"; depends=[Rcpp RcppThread]; }; rEMM = derive2 { name="rEMM"; version="1.1.0"; sha256="18bpskhrafj0b5rnzisrsk5x5gifqn7dpawcsgdrg7rbnz7y1wzr"; depends=[cluster clusterGeneration igraph MASS proxy]; }; rENA = derive2 { name="rENA"; version="0.2.3"; sha256="067xpw1mgb2y15ld4qc6mnf4b9k7nw8am9qz4ms980wyfp4ffjmj"; depends=[concatenate data_table doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo scales]; }; rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; }; @@ -14809,7 +15031,9 @@ in with self; { rFerns = derive2 { name="rFerns"; version="5.0.0"; sha256="1yw3np5iamnr7f3nrd507dkyz76nxmzdpinwxncv87yw30g6gnkq"; depends=[]; }; rForest = derive2 { name="rForest"; version="0.1.4"; sha256="0vk9sfnbzpjqh7mr3qwi5awlh8qc0h1i6qwbyv7qj72apy05s2d8"; depends=[alphashape3d geometry rgl sp]; }; rGammaGamma = derive2 { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; }; + rGhanaCensus = derive2 { name="rGhanaCensus"; version="0.1.0"; sha256="1i8z2cfzk64yhvkia1khsmw666dflai1sj8bhd8n2d97a45nb230"; depends=[]; }; rGroovy = derive2 { name="rGroovy"; version="1.3"; sha256="172vm4diygzi4ipmw8bl03k0x3aps0h1vkvwvw539kamy7xb5w98"; depends=[rJava]; }; + rHL7 = derive2 { name="rHL7"; version="1.0.0"; sha256="1irri5a0fb0wmldh7mv9wbd0scg90c9w9cwdcf4dgbvk08ff1831"; depends=[dplyr lubridate matlab randomNames stringi stringr]; }; rHealthDataGov = derive2 { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; }; rHpcc = derive2 { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; }; rIP = derive2 { name="rIP"; version="1.2.0"; sha256="1f3gbd3ij047n0rh4a7yy6wdjz3b89rki7zaz4y9zgw6bad6ylkl"; depends=[amerika dplyr httr iptools jsonlite]; }; @@ -14825,8 +15049,8 @@ in with self; { 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.0"; sha256="1h5flmysyxv668si4ycfkkgairy7balk3nm0dsm91gns9xhvjqs0"; depends=[]; }; - rMIDAS = derive2 { name="rMIDAS"; version="0.3.0"; sha256="1vs77dbd5fs8h61s1pz5zgi10g14707fms1bzisfpp2xnj93ybvg"; depends=[data_table mltools reticulate]; }; + rMEA = derive2 { name="rMEA"; version="1.2.2"; sha256="18manb926yd6a3b6im7g2vf1cbvvdkg15i6zl223npckhna2nbx0"; depends=[]; }; + rMIDAS = derive2 { name="rMIDAS"; version="0.4.0"; sha256="09dh6lc4vb4015vdhif0ybq149x8b1vd139was9r6w65n533iz1x"; depends=[data_table mltools reticulate]; }; 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]; }; @@ -14842,19 +15066,19 @@ in with self; { rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.2"; sha256="1insdfvcn1pirsnf7nwfia0kzgsmh2zpghgfj2yc35ld1r9j2hp2"; depends=[mvtnorm ssanv]; }; rPraat = derive2 { name="rPraat"; version="1.3.2-1"; sha256="19qd3hylp8m0y171xhdd3k84izxyid7k2f9583gkxq8kik3md1v2"; depends=[dplyr dygraphs readr stringr tuneR]; }; rPref = derive2 { name="rPref"; version="1.3"; sha256="0vlzhxhf2x6gw015sjfw2638wv6hckg068rpbzncp7wprn9msa6y"; depends=[dplyr igraph lazyeval Rcpp RcppParallel]; }; - rQCC = derive2 { name="rQCC"; version="1.20.7"; sha256="0qbwz5imzgwfwkcvy23ayqvsd8da1nzmhzn8biapgn3gr23w2lx2"; depends=[]; }; + rQCC = derive2 { name="rQCC"; version="2.22.1"; sha256="0ahzc4aqx1aw50fcir4s5zig4lgllbqi7kvk1yddk6z0sgcg5p1r"; depends=[]; }; rRAP = derive2 { name="rRAP"; version="1.1"; sha256="1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb"; depends=[lars lassoshooting MASS]; }; rRofex = derive2 { name="rRofex"; version="2.0.6"; sha256="0yg3bxadgmn5d7bljzn9bjzy833lfi6bwz24z52f8qcbm1nqchgb"; depends=[dplyr glue httr jsonlite later lifecycle magrittr purrr rlang tibble tidyr websocket]; }; - rSAFE = derive2 { name="rSAFE"; version="0.1.2"; sha256="0m7xzk76armkd86g643fmpif43dri07vrbq348y8hmys1gnx7ikd"; depends=[DALEX dendextend ggplot2 ggpubr ingredients sets]; }; + rSAFE = derive2 { name="rSAFE"; version="0.1.3"; sha256="0vhphn56y2yxll3437mb3zaayhhy4dxk0wxxy7lk6qgxw4xlbk04"; depends=[DALEX dendextend ggplot2 ggpubr ingredients sets]; }; rSCA = derive2 { name="rSCA"; version="3.1"; sha256="0dhd5325x05cbnw34mlipndw5xnncl9kj7kppb2s5bx2gllcdqqd"; depends=[]; }; rSEA = derive2 { name="rSEA"; version="2.1.1"; sha256="18108ds65ykxygbw1s4i5rb1ngzwymv1x3dhcv1lcwkmqplnaar9"; depends=[ggplot2 hommel]; }; rSFA = derive2 { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; }; rSHAPE = derive2 { name="rSHAPE"; version="0.3.2"; sha256="0z6dizsxlkmaymbd24b1m1i8kmndcf21nxxnyfzq6gvdii7bal4h"; depends=[abind DBI doParallel evd foreach RSQLite sn VGAM]; }; rSPARCS = derive2 { name="rSPARCS"; version="0.1.0"; sha256="0k46nhkdn68c7h7bbbdfwl02bldi1m3m62zbp20kh8np9bxy1rnk"; depends=[data_table geosphere plyr raster sp spatialEco tigris]; }; - rSPDE = derive2 { name="rSPDE"; version="1.0.0"; sha256="0l4wj2hvy8zgiclqrkzaash7pal8z75i9xaxnx6ww8wb9rc2iifa"; depends=[Matrix]; }; + rSPDE = derive2 { name="rSPDE"; version="1.1.1"; sha256="0zji1d292nr8bj149vdk0v48jcg6w56cbxr5xhfm7s5b999qrqxf"; depends=[Matrix]; }; rSQM = derive2 { name="rSQM"; version="1.3.14"; sha256="0m69n2pnfv2085dln6p149a5gw0gif9xk00xmad5s9j68hwjdmym"; depends=[dplyr EcoHydRology ggplot2 gsubfn mise ncdf4 qmap reshape2 stringr yaml zoo]; }; rStrava = derive2 { name="rStrava"; version="1.1.4"; sha256="00y400znkwyr6y33wiz0jikpa31a60hdcmsi9x3724zwjh28vynj"; depends=[bitops dplyr geosphere ggplot2 ggrepel googleway httpuv httr magrittr plyr purrr RCurl rvest tibble tidyr V8 XML xml2]; }; - rTG = derive2 { name="rTG"; version="0.2.2"; sha256="0f1syh2v8a0klcz7rvi8nrn1qv8rjl69ssrliqnh2zpy7c6ck9xs"; depends=[brnn dplyr ggplot2 knitr magrittr mgcv]; }; + rTG = derive2 { name="rTG"; version="1.0.0"; sha256="1v2wj2cv26hk5s7vm2l75lqgki28ivhkd0b8kspxw2c56cm82r70"; depends=[brnn dplyr ggplot2 knitr magrittr mgcv]; }; rTLS = derive2 { name="rTLS"; version="0.2.5.2"; sha256="10fkd8ylj9xwvgwnirjw4n6c4vl8y5x8q4mq2zmwlpjryknx82kv"; depends=[alphashape3d boot data_table doSNOW foreach Rcpp RcppArmadillo RcppHNSW RcppProgress rgeos rgl sp]; }; rTRNG = derive2 { name="rTRNG"; version="4.23.1-1"; sha256="0jlkr57afkg6axkdk020rd3nybx1qzwvy1hjgfw8fwvm79x0kpr7"; depends=[Rcpp RcppParallel]; }; rTableICC = derive2 { name="rTableICC"; version="1.0.7"; sha256="1z896675kmm9p5dnmcnsz2205ynf05laqcxvlc9y0g5i0x8rf8v6"; depends=[aster partitions]; }; @@ -14867,10 +15091,10 @@ in with self; { rWishart = derive2 { name="rWishart"; version="0.1.2"; sha256="0wzijc454mrvmggb7a5jqwjbmk0kzr4bmy0iwniz5cn343pr1rri"; depends=[lazyeval MASS Matrix]; }; rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; }; ra4bayesmeta = derive2 { name="ra4bayesmeta"; version="1.0-7"; sha256="07fcjqw8w787pcfzjxxwq6160433ms6xk9qrvvm8ybxd7n0f5i44"; depends=[bayesmeta]; }; - rabhit = derive2 { name="rabhit"; version="0.2.0"; sha256="1gakdwz05x4g0jqh71vf18qcbkmpbh8g5bb17j7f9d8sb1kpafpl"; depends=[alakazam cowplot data_table dendextend dplyr fastmatch ggdendro ggplot2 gridExtra gtable gtools htmlwidgets plotly plyr RColorBrewer reshape2 rlang splitstackshape stringi tidyr tigger]; }; + rabhit = derive2 { name="rabhit"; version="0.2.1"; sha256="1hgn04qqpp0pbm8c180wc6g3i4dw0wv54b8p8adhkgg3jhbidyv1"; 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.1.0"; sha256="0xgsjg7ck532fzwyn62pn1hq9khkw0i1pdcam09j5l24ny1akajw"; depends=[cli dplyr httr2 pbapply purrr rappdirs retry rlang stringr tidyr withr]; }; - raceland = derive2 { name="raceland"; version="1.1.1"; sha256="1sb56id7h1nm34a7kf6abfxwh4kmnnzc51x23cijq6fd3jm4ggnr"; depends=[comat fasterize plotwidgets raster Rcpp RcppArmadillo rgdal sf]; }; + raceland = derive2 { name="raceland"; version="1.1.2"; sha256="0mkxxqbpq90iw540kzj12352l5r9scgfdj60swqv436jqj21gjah"; depends=[comat fasterize plotwidgets raster Rcpp RcppArmadillo rgdal sf]; }; racir = derive2 { name="racir"; version="2.0.0"; sha256="0qpjnaifx4z1jvyrc8p5jny0ci20w2ri1rs68sv9b93nkaiixnps"; depends=[]; }; ractivecampaign = derive2 { name="ractivecampaign"; version="0.2.0"; sha256="1l7266qryba2zijgs7xj4p073l69q0iin6qgsbnn7dafmggv5mlr"; depends=[cli dplyr httr pbapply retry stringr tidyr]; }; radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; }; @@ -14886,16 +15110,16 @@ in with self; { radlibs = derive2 { name="radlibs"; version="0.2.0"; sha256="1xl7pacqgiv68ay7mkr6bkx3rqqr7z8b9yh42n4zm7ybqfxbx6dr"; depends=[data_table lexicon stringr]; }; radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; }; radous = derive2 { name="radous"; version="0.1.3"; sha256="1pip3givlkzb8i65nz6w724818jjr8j8nizpc3g35r9bvpmn7c2y"; depends=[checkmate curl glue httr readr]; }; - radsafer = derive2 { name="radsafer"; version="2.2.5"; sha256="08088mifqlhkg8qrly2v1idvzl96fg2zymn812yqwppxjgcymzbz"; depends=[dplyr ggplot2 ggthemes magrittr qpdf RadData readr rlang scatterplot3d stringr utf8]; }; + radsafer = derive2 { name="radsafer"; version="2.2.6"; sha256="0dmxdrmi8rvng69hsgqj60gw22daasxmy69z1xygd0w7vcsvn9aw"; depends=[dplyr ggplot2 ggthemes magrittr qpdf RadData readr rlang scatterplot3d stringr utf8]; }; rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; }; - ragg = derive2 { name="ragg"; version="1.2.1"; sha256="08dknkibmmwllycga2cp2732idsi3jfkkl5ghh6r2g2wdli1n2y1"; depends=[systemfonts textshaping]; }; + ragg = derive2 { name="ragg"; version="1.2.2"; sha256="1q43pwmljsqgrikkh2g1n7bpz9c8py5dnj44cfg3y2br7b4m2q9v"; depends=[systemfonts textshaping]; }; rags2ridges = derive2 { name="rags2ridges"; version="2.2.5"; sha256="0aqfm8f58xrq81bd80parkwj28i6m0bxdpq6qp1iy3qyxsq5as64"; 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]; }; rainbow = derive2 { name="rainbow"; version="3.6"; sha256="11vfcck17d2xjc049ci5i8l1nqv345anmd110gdz7654i1pj9lb3"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; }; raincin = derive2 { name="raincin"; version="1.0.3"; sha256="1wi430vsp5c0vm9p1srrs0nrbdb8x31qh7zph4v3fy7j0z226cwh"; depends=[lme4 popdemo]; }; - rainette = derive2 { name="rainette"; version="0.2.1"; sha256="1c1r0d8hddhcg98dg2d6y1wiyiryigwsiaz5xi24jxlwwm7ll2wm"; depends=[dendextend dplyr formatR ggplot2 ggwordcloud gridExtra highr miniUI progressr purrr quanteda quanteda_textstats Rcpp rlang RSpectra shiny stringr tidyr]; }; + rainette = derive2 { name="rainette"; version="0.3.0"; sha256="0hg402i7g8rvb7lv36x1ivx6xjixa9c1lram7swk89mgb55vjjla"; depends=[dendextend dplyr ggplot2 ggwordcloud gridExtra highr miniUI progressr purrr quanteda quanteda_textstats Rcpp rlang RSpectra shiny stringr tidyr]; }; rainfarmr = derive2 { name="rainfarmr"; version="0.1"; sha256="1gasnmyjnis6vv0krx6299ck2a6v9v1fgqajzqdpjaz2fsxn245i"; depends=[]; }; rakeR = derive2 { name="rakeR"; version="0.2.1"; sha256="0cd89q6k0y9z1qk9k06iw56lhj4c52ckr0g4qv6q95lkyrbi3qg8"; depends=[ipfp wrswoR]; }; ralger = derive2 { name="ralger"; version="2.2.4"; sha256="1j0np7h051dglva3dj9b64fagr99hvpsza1q2fnc7g3x1ki7mgni"; depends=[crayon curl dplyr robotstxt rvest stringi stringr tidyr xml2]; }; @@ -14908,16 +15132,15 @@ in with self; { ramsvm = derive2 { name="ramsvm"; version="2.2"; sha256="105f3g2s47sb4vxf88k26lws60ay1h8n3g48rmyhpzhgmwc13027"; depends=[doParallel foreach]; }; randChecks = derive2 { name="randChecks"; version="0.2.1"; sha256="0fwbacnv38zf0014h9l45spfa4yd4wdif7m2a1jbl11pmns70wxm"; depends=[]; }; randNames = derive2 { name="randNames"; version="0.2.3"; sha256="0vhzg14yg4c9inzxin8prfzh6nhf8fvbi4hbn122fyqyp5d6f8zi"; depends=[httr jsonlite tibble]; }; - randaes = derive2 { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; }; randcorr = derive2 { name="randcorr"; version="1.0"; sha256="1hnr0wvbsmgql39wlj4z2qbqn0fdfwyihfl6xgrlzvs9vrmig5xx"; depends=[]; }; randgeo = derive2 { name="randgeo"; version="0.3.0"; sha256="14hlh9k66lcbf0xhnxx12rrnyl8awqcsm3csvxdz23s5wnm2ya5p"; depends=[]; }; randnet = derive2 { name="randnet"; version="0.5"; sha256="131bkfzxjd3x02dj6wc2ilwpgymmm18apd4v1dd70ib4sibvir16"; depends=[AUC entropy irlba Matrix nnls poweRlaw pracma RSpectra]; }; rando = derive2 { name="rando"; version="0.2.0"; sha256="085g48yzwapxxfmm5bvkz0v7pmjwmakb7nl128550ppgc16wxkgb"; depends=[dplyr glue rlang tibble]; }; random = derive2 { name="random"; version="0.2.6"; sha256="0sdhagwjlhldb8hn6h4nd1sflzhwkapzybdlb8hzisy3w2ygjn9b"; depends=[curl]; }; random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-4"; sha256="19yzpjidw5pbrqfa5ln5hgghv0mq3cwl92z2isq25yydfl6qsl6h"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; }; - randomForest = derive2 { name="randomForest"; version="4.6-14"; sha256="0kbmm0l42fc2d1rdq0l7k09d34kd87q4lx651ffsic4y84h8kf7l"; depends=[]; }; + randomForest = derive2 { name="randomForest"; version="4.7-1"; sha256="04q6gb917md4yw837cf9vlx1q8ljl06jw7yhykzb6nl47w55jnkq"; depends=[]; }; randomForestExplainer = derive2 { name="randomForestExplainer"; version="0.10.1"; sha256="1ny8c3vn2zvdx12avwvlm4lp648jigkrkcvnhf5qmj8rh0w069v0"; depends=[data_table dplyr DT GGally ggplot2 ggrepel randomForest ranger reshape2 rmarkdown]; }; - randomForestSRC = derive2 { name="randomForestSRC"; version="3.0.0"; sha256="02izhp3m2avmnxvvdyqz0bsvjs6pmkh8jhq5rv0fra1nqzgf6nwp"; depends=[data_tree DiagrammeR]; }; + randomForestSRC = derive2 { name="randomForestSRC"; version="3.0.2"; sha256="0zfmz1m2kad3ph67zkhvmalaavvyyif5mk9qlc1q2b17246975na"; depends=[data_tree DiagrammeR]; }; randomLCA = derive2 { name="randomLCA"; version="1.1-1"; sha256="08flank5pmyh5ih63bfw5qaby3g8vfh8p36sjbmxfylicdydfjl7"; depends=[boot doParallel doRNG fastGHQuad foreach lattice Matrix Rfast]; }; randomNames = derive2 { name="randomNames"; version="1.5-0.0"; sha256="1lv1vqb4wgs0j1gqy84dpa30qsvbp6928zpshczpw87yf32k71vh"; depends=[crayon data_table toOrdinal]; }; randomUniformForest = derive2 { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[cluster doParallel foreach ggplot2 gtools iterators MASS pROC Rcpp]; }; @@ -14925,7 +15148,7 @@ in with self; { randomizationInference = derive2 { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; }; randomizeBE = derive2 { name="randomizeBE"; version="0.3-5"; sha256="08yfdrf56i8php48ycilc79jk7ms0f6k40swg56mccnqm2yb3b12"; depends=[]; }; randomizeR = derive2 { name="randomizeR"; version="2.0.0"; sha256="1bcdh245lh5a2yim00m2cgcmlcjm2vyba813026v0a4c42gr3b8x"; depends=[ggplot2 plotrix survival]; }; - randomizr = derive2 { name="randomizr"; version="0.20.0"; sha256="0dljyfldnardaps3fq6vi5wcs9x6qfaq5apapa78c51lnaa6fn9h"; depends=[]; }; + randomizr = derive2 { name="randomizr"; version="0.22.0"; sha256="1grm0h3xkb0pdbbv0gd531g1kn6njp0gcy5fh153rrmajxgd8hhw"; depends=[]; }; randquotes = derive2 { name="randquotes"; version="0.1.1"; sha256="0fj9vx0c4059511wka7ip30yz87y144pz7ny840gp72qm73pp8li"; depends=[curl httr jsonlite xml2]; }; randtests = derive2 { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; }; randtoolbox = derive2 { name="randtoolbox"; version="1.31.1"; sha256="1b9vjzqg014hxp1vfb62m01d7xim5vmpbyxzlbll49bqas0jx69h"; depends=[rngWELL]; }; @@ -14958,31 +15181,31 @@ in with self; { rarms = derive2 { name="rarms"; version="1.0.0"; sha256="11wjxd3pxvjv1j2nz26l8f0kykk9w6lf08izhivfngp63dk2akns"; depends=[jsonlite]; }; rasciidoc = derive2 { name="rasciidoc"; version="4.0.2"; sha256="1k3bh1bbjrzhmz2dz98qw8ad46jk7dx7srigp22valk5jz4ni7s5"; depends=[checkmate document 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.2"; sha256="1f8lkv6n701gy8lgzil9kha62w9pqvfzd8ns9900hvrw50kg6aiy"; depends=[cluster data_table dplyr DT foreach GGally ggplot2 histogram KernSmooth kohonen plotly raster rlang scales shiny stringdist stringi terra]; }; - raster = derive2 { name="raster"; version="3.5-11"; sha256="18v1vflq15915dwa3caf5sp1d1kp8w6plpaqk3z6a3164lwq5i76"; depends=[Rcpp sp terra]; }; + rassta = derive2 { name="rassta"; version="1.0.3"; sha256="1shkl4k2hlddph2h0v936yrn6r1gi0dggr19d7v9rqcq5jd84sa1"; depends=[cluster data_table dplyr DT foreach GGally ggplot2 histogram KernSmooth kohonen plotly raster rlang scales shiny stringdist stringi terra]; }; + raster = derive2 { name="raster"; version="3.5-15"; sha256="11fnznymwavpph733dayklhcx4phpjgrijfxlaszi122sg2x7ir9"; depends=[Rcpp sp terra]; }; rasterDT = derive2 { name="rasterDT"; version="0.3.1"; sha256="1dl083jm4x0shl7lq4in2alksgi63hp1p7j2cnsvkmwjaxygzm9v"; 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.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; }; - rasterVis = derive2 { name="rasterVis"; version="0.51.1"; sha256="1mg11njzajx9az6xjghjl2sna6wzs85ga8fhy9w43l2n8icsfbr2"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp terra viridisLite zoo]; }; - rasterbc = derive2 { name="rasterbc"; version="1.0.0"; sha256="0xv4rf4d2az5c8pgf808y1czypdmh5qa0g7z4a20a934wpcazpmi"; depends=[sf terra]; }; - rasterdiv = derive2 { name="rasterdiv"; version="0.2-3"; sha256="1n0zrncda3nk4x8l9wb0acdx25dlki9wwrg874qwhd73cx0iy0rp"; depends=[foreach progress proxy raster svMisc]; }; + rasterVis = derive2 { name="rasterVis"; version="0.51.2"; sha256="0kgg6cm7xjqya2d46w0i1i1wjpkb8f99lyqy7rgwa7l9xmwzj5n1"; 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.2-5"; sha256="1jprhbfih2w3wh9ywmnm42yhsyivqacycgzv9hckb2r49d87zlsv"; depends=[foreach progress proxy raster svMisc terra]; }; rasterize = derive2 { name="rasterize"; version="0.1"; sha256="18nrhmq1qmi05rkyr86xsyc8nz0fbdpf2d45h62bbfzbfynqd4qy"; depends=[png]; }; rasterly = derive2 { name="rasterly"; version="0.2.0"; sha256="1fv0ayh8r78qss7ikcwnj0i5x8iyz4c3icsfb554zji9bw30x7qr"; depends=[data_table ggplot2 magrittr plotly Rcpp rlang]; }; rasterpdf = derive2 { name="rasterpdf"; version="0.1.1"; sha256="0zi54nifbb4dzb29i8rskynblw3z42vzaykwbq30ia5zs9q1bvm5"; depends=[png]; }; + rasterpic = derive2 { name="rasterpic"; version="0.2.0"; sha256="0vlas1b9la6sp3qkcg831lkfa2n9ms2gq7s0k2wk4lqxmrpq0q66"; depends=[png sf terra]; }; ratelimitr = derive2 { name="ratelimitr"; version="0.4.1"; sha256="06x759jxr5zcnvg9q120n5bpipkb16piw15kxrpk7i918mby889b"; depends=[assertthat]; }; ratematrix = derive2 { name="ratematrix"; version="1.2.3"; sha256="0bnwwkmjsxlv4qkkwq93d7nrqb7pyyd70ffpm98xsxfy1ygdxjqq"; depends=[ape coda corpcor ellipse geiger MASS mvMORPH phylolm Rcpp RcppArmadillo readr]; }; rater = derive2 { name="rater"; version="1.2.0"; sha256="1y4hhcnxdlw17w0ihv108p3rkwwdis7i7vc0rp7l6pfz7an8pw8r"; depends=[BH ggplot2 loo Rcpp RcppEigen RcppParallel rlang rstan rstantools StanHeaders]; }; rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; }; raters = derive2 { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; }; ratesci = derive2 { name="ratesci"; version="0.4-0"; sha256="1imraj95vcwz3i6r767zwckjqs1vp7bfww9d792l5nvwi5zyddp4"; depends=[]; }; - rationalfun = derive2 { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; }; + 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]; }; - rattle = derive2 { name="rattle"; version="5.4.0"; sha256="1cg26k491f78yqwis07djad8b3f9ndqwqylbh5sh66l2j9bdpmz5"; depends=[bitops dplyr ggplot2 magrittr rpart_plot stringi stringr tibble tidyr XML]; }; - rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; }; raveio = derive2 { name="raveio"; version="0.0.5"; sha256="0c17f9cgh453d22lxa2ds5q6si27chk55cyzlmp1klipx4mfq3jp"; depends=[callr data_table dipsaus edfReader filearray fst glue hdf5r ini jsonlite R_matlab R6 remotes stringr targets threeBrain yaml]; }; ravelRy = derive2 { name="ravelRy"; version="0.1.0"; sha256="07mywv57rw2b309i2qisbpx1x3sb3z6n2b5gia9bdmb2m4hhpdai"; depends=[dplyr httr jsonlite purrr tibble tidyr]; }; raven_rdf = derive2 { name="raven.rdf"; version="0.2.0"; sha256="12jy3md6d1qwzkks5iljn4h0iv5lj3n39ll7r3fvrxjwh7afvw7r"; depends=[]; }; + ravetools = derive2 { name="ravetools"; version="0.0.3"; sha256="1jw58da0220889vf1pchgnyjwzh2m3zk5kh1ssdp9hx3v8w0jdcj"; depends=[digest filearray Rcpp signal waveslim]; }; raw = derive2 { name="raw"; version="0.1.8"; sha256="1y2vhpgigzkd2xyj3986wlzm1g3pp99w6fspmhlff5czd73g16is"; depends=[]; }; rawKS = derive2 { name="rawKS"; version="0.1.0"; sha256="1yiw9imhgij49qbm9hk6psb73zngqmxxwnaxq144ydwb7fbk6j0z"; depends=[dplyr ggplot2 magrittr ROCR tidyr]; }; raws_profile = derive2 { name="raws.profile"; version="0.1.0"; sha256="04f7wk7x9j3rb6nn3zqss9vw0h9a4vpcjyilc2vqy0fm2by41xkg"; depends=[stringr tibble withr]; }; @@ -14994,6 +15217,8 @@ in with self; { rbace = derive2 { name="rbace"; version="0.2.2"; sha256="04jcbrcp0l1v2q8hhwr5w72spdja8r0fw71v68kx39yigy7m1sgp"; depends=[crul data_table tibble xml2]; }; rbacon = derive2 { name="rbacon"; version="2.5.7"; sha256="14j84bkgmxigzj5nk909b89ails7mzys8wk92gvcywv2p9yhwk6b"; depends=[coda IntCal Rcpp]; }; rbart = derive2 { name="rbart"; version="1.0"; sha256="1byfm1ycw9nfhdblqklyn8pxn6b9q5fa3inbgfpynqpsid97ig35"; depends=[Rcpp]; }; + rbcb = derive2 { name="rbcb"; version="0.1.9"; sha256="1vhdbrci803365ik5y6mbpa9wjg7ixz6vbxw78v31irrnn814ish"; depends=[httr jsonlite tibble xml2 xts]; }; + rbch = derive2 { name="rbch"; version="0.1-1"; sha256="0n2s5qfgjvg7vv65myz6dcmmaf37z883z1sw4hryngz2z6w4zz5q"; depends=[gmp httr openssl rjson]; }; rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; }; 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]; }; @@ -15003,7 +15228,7 @@ in with self; { rbi_helpers = derive2 { name="rbi.helpers"; version="0.3.2"; sha256="1inbf3kpl4y46m7v36akrr24112y4sd3d8yqia16i32wxf53wql5"; depends=[data_table lubridate Matrix rbi reshape2]; }; rbibutils = derive2 { name="rbibutils"; version="2.2.7"; sha256="1iamdbww3hvxy0bbywc307kyhiczx0bvfhw7nngsm33balcng7kw"; depends=[]; }; rbin = derive2 { name="rbin"; version="0.2.0"; sha256="18g6s4m0yc1bzrymk8km553kcwi4vj16b6mxw2lmv48z7243iq87"; depends=[data_table ggplot2]; }; - rbioacc = derive2 { name="rbioacc"; version="1.0.2"; sha256="15244p3k0cmv9fwcffnwzl130wn14l4axkzr29lvic9v4zx28f1q"; depends=[BH GGally ggmcmc ggplot2 loo Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders stringr testthat zoo]; }; + 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.4"; sha256="1w3mahdrqk76g5ygyabvb8kypycwp91k5njwsqhzyfgj2yr67qkn"; 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]; }; @@ -15011,6 +15236,7 @@ in with self; { rbit = derive2 { name="rbit"; version="1.0.0"; sha256="09ywr711gv0vgfims2vfcxk3rnd0iadzlksil0q9159yarapfc59"; depends=[R6]; }; rbitcoinchartsapi = derive2 { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; }; rblt = derive2 { name="rblt"; version="0.2.4.5"; sha256="1pfg8sgm532czz3lhpx7dmg5zik3bc0p4vdq9s0qk5zgq7nnm9sj"; depends=[data_table dygraphs hdf5r shiny xts]; }; + rbmi = derive2 { name="rbmi"; version="1.1.1"; sha256="09d40aqdzri0364k54zwd5ixh7n7bf16nfjb3jb8bcjcpzqsywsr"; depends=[assertthat BH glmmTMB Matrix R6 Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; rbmn = derive2 { name="rbmn"; version="0.9-4"; sha256="039scbjzigj9ks62l8yagfpr3bpslvxg1nqv22pyw8jay8i6993g"; 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]; }; @@ -15020,19 +15246,20 @@ in with self; { rbtc = derive2 { name="rbtc"; version="0.1-6"; sha256="1z5p1jn5b0hzwcbdpiwj224h45x01bbsgkskllir5j13l416561p"; depends=[gmp httr openssl rjson]; }; rbtt = derive2 { name="rbtt"; version="0.1.0"; sha256="1gbsb0vmqxcl28c5nn0rz95bxrvl7i0b17lq90cj5ahbk6x9jblz"; depends=[data_table]; }; rbundler = derive2 { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; }; - rbw = derive2 { name="rbw"; version="0.3.0"; sha256="0mxkwxb54n8vmx0z574mc39v53hlcq91nfmyqcdmxlp2jaz20184"; depends=[dplyr rlang]; }; + 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]; }; rcage = derive2 { name="rcage"; version="1.1"; sha256="0k6x543c0v31yx6b7xiyq7pb3a68sxc7ap8l61h3lp840la6gidp"; depends=[ClustGeo ff fields ggplot2 gridExtra LaplacesDemon MASS Matrix pracma raster rgeos rlang sf sp]; }; + rcaiman = derive2 { name="rcaiman"; version="0.1.1"; sha256="0p6qn23mj90fj81j5gc7s8v1kihfqnv3r03xh9d8rax4jd2dni92"; depends=[colorspace magrittr pracma raster Rdpack rgdal sp spatial testthat]; }; rcane = derive2 { name="rcane"; version="1.0"; sha256="0p2mgkq6fh0n289n2h19c52lnqxl05wvpmd6nwvgnjqwa4wwpa7r"; depends=[]; }; rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; }; - rcarbon = derive2 { name="rcarbon"; version="1.4.2"; sha256="04s1gqrfa5hy93jnqj5sqii49gz7mq7nm23jnd0iwl48f847vka1"; depends=[doSNOW foreach iterators knitr snow sp spatstat spatstat_core spatstat_geom spatstat_linnet]; }; + rcarbon = derive2 { name="rcarbon"; version="1.4.3"; sha256="18yxliq6bxrrkd6xhlrxbbh017lclsfkvmgq662zy58a6wfjmqxh"; depends=[doSNOW foreach iterators knitr snow sp spatstat spatstat_core spatstat_geom spatstat_linnet]; }; rcartocolor = derive2 { name="rcartocolor"; version="2.0.0"; sha256="08ljaag2mnhz2671zvwji1sp003z94lz30vjidmybm9fp8piqw5g"; depends=[ggplot2 scales]; }; - rcbalance = derive2 { name="rcbalance"; version="1.8.5"; sha256="15qlk3cqwsvixl17l1fxcajrabmz4y7q5gz0a1pd66f6i1xskcqq"; depends=[MASS plyr]; }; - rcbayes = derive2 { name="rcbayes"; version="0.1.0"; sha256="00pr7fh33nsl84m5p32a010pyw2cgyjlqsjrlz3hlwwggwlfw1rw"; depends=[BH dplyr magrittr Rcpp RcppEigen RcppParallel Rdpack rlang rstan rstantools shiny shinythemes StanHeaders tibble tidybayes]; }; - rcbsubset = derive2 { name="rcbsubset"; version="1.1.5"; sha256="0qfx8qzsrlgbgpymc67ywy9k8dgfjz5x54xwabf2bjjwrzv2mcl5"; depends=[MASS plyr rcbalance]; }; + rcbalance = derive2 { name="rcbalance"; version="1.8.6"; sha256="140zibpamk9x2xj3ni9p9kgbhxv7rpszlfrvp72854604502zbia"; depends=[MASS plyr]; }; + 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]; }; rcc = derive2 { name="rcc"; version="1.0.0"; sha256="0a77d54c9qahhsjzpa0436ddsj4j44013r7rbxm0fjz04c0d2921"; depends=[]; }; rccdates = derive2 { name="rccdates"; version="1.0.0"; sha256="1f87qlw62am2qy1zzrz91vmsn8axhld44gak61xa7046675hm98s"; depends=[rccmisc]; }; rccmisc = derive2 { name="rccmisc"; version="0.3.7"; sha256="171s2ll759xjdnx0z24ih5ix2vcp4qnmf1nf107gij6wv8k450ab"; depends=[dplyr]; }; + rccola = derive2 { name="rccola"; version="1.0.2"; sha256="0i846y9l3il2y38g32cifwysca06iakqd6vs15fcwqnzm8g0sg5j"; depends=[getPass keyring redcapAPI yaml]; }; rcdd = derive2 { name="rcdd"; version="1.5"; sha256="0zxx0qvv26ba30jkm8mvca4h59rqklay4jwazpcw7h9dzp4189jr"; depends=[]; }; rcdk = derive2 { name="rcdk"; version="3.6.0"; sha256="0v3i1402hrlp3sap3ryjd63gac8wbcwj7lfa3smk1agqy659glcx"; depends=[fingerprint iterators itertools png rcdklibs rJava]; }; rcdklibs = derive2 { name="rcdklibs"; version="2.3"; sha256="16ijvzsc1irpz1z2xd82i2saafsvpn0x5lr54c5gx9bfb35gacyp"; depends=[rJava]; }; @@ -15042,13 +15269,13 @@ in with self; { rchie = derive2 { name="rchie"; version="1.0.2"; sha256="1m89mwq5f81yr2vc3wvnxkpm04bad11sx5fllcd3yy8ilghmbfp6"; depends=[jsonlite V8]; }; rcites = derive2 { name="rcites"; version="1.2.0"; sha256="1lyahgpjskzqlmjnz14kkkrl30by1nzzi02wsf0rfskbdhmwc5in"; depends=[cli curl httr jsonlite]; }; rcitoid = derive2 { name="rcitoid"; version="0.1.0"; sha256="11iqdj1q983w28fh17rqvmhs41ks09b24p408nl7hz4iqg9c7lpi"; depends=[crul curl fauxpas jsonlite]; }; - rclipboard = derive2 { name="rclipboard"; version="0.1.3"; sha256="087ih0b3bizgknccy7gm47r1v9wjmj2fb8i4bp4rszd2kdcbwh29"; depends=[shiny]; }; + rclipboard = derive2 { name="rclipboard"; version="0.1.5"; sha256="0c4h7bzv91issha1ss5mp0iq0aj3aw4y84kw56s3jkxwy9vgvmfn"; depends=[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=[]; }; - rcol = derive2 { name="rcol"; version="0.2.0"; sha256="1ypn5fiwhyvfnmjs2davqqhxf5pjg7f0101v40bqrv4jz563h5n1"; depends=[crul data_table glue jsonlite tibble]; }; rcolors = derive2 { name="rcolors"; version="0.1.0"; sha256="19lkwd1wdwq9if957qjgrz9mq6s8x49dig8snivhw9ksffcfy4xp"; depends=[magrittr]; }; rcompanion = derive2 { name="rcompanion"; version="2.4.13"; sha256="0y5d4z903fj7z326y9alnnlr0hcmxspccv2swra8a4j927csr764"; depends=[boot coin DescTools lmtest multcompView nortest plyr]; }; rcompendium = derive2 { name="rcompendium"; version="0.5.1"; sha256="0zg7051c4wg1jbdf7hshswy53y24x8h8myhshvg9z2pg8mvd8sir"; depends=[clisymbols crayon devtools gert gh gtools rmarkdown rstudioapi stringr usethis xfun]; }; + rconfig = derive2 { name="rconfig"; version="0.1.1"; sha256="0jcwfhbqh4sb8y5wd8l05xz0y7nn28dhfkb2r40jbp6ycrvw8mpp"; depends=[jsonlite yaml]; }; rcoreoa = derive2 { name="rcoreoa"; version="0.4.0"; sha256="0q5dprz0ag04w265bk7isd2lr61nahf223qza47m0izd9nyi9h8a"; depends=[crul hoardr jsonlite pdftools]; }; rcorpora = derive2 { name="rcorpora"; version="2.0.0"; sha256="1b8xa81mn3afadz77576vda9b0d99f1k096drxrpqd989g993aqy"; depends=[jsonlite]; }; rcosmo = derive2 { name="rcosmo"; version="1.1.3"; sha256="08zw2xnchima9gzjn3nchj8q1phf3cchq9340fffsac77l4am3mb"; depends=[cli entropy FITSio geoR mmap nnls Rcpp rgl tibble]; }; @@ -15057,17 +15284,17 @@ in with self; { rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; }; rct3 = derive2 { name="rct3"; version="1.0.4"; sha256="1xm5kni2mnpzby8basmwbm1abg615i4mlf6fn9jr5il94q1bdgly"; depends=[]; }; rcube = derive2 { name="rcube"; version="0.5"; sha256="1162y7fs3fsbb5jj66g9kvxxhggprlifrabqbb9lqm8rrdwhz3r9"; depends=[magrittr]; }; - rdacca_hp = derive2 { name="rdacca.hp"; version="1.0-4"; sha256="0fkyhw0yvbyqcihlwkyv67mwll45lssg9ni2d63bdxxda9pl5443"; depends=[ggplot2 vegan]; }; + rdacca_hp = derive2 { name="rdacca.hp"; version="1.0-7"; sha256="0ww67wa3rjy0p2dgqr4h69sy9jb7ipmrmycx902491jya0gwsw2a"; depends=[ggplot2 vegan]; }; rdatacite = derive2 { name="rdatacite"; version="0.5.2"; sha256="07zbxr89fxx9nlp5w7n60rjm3prck08h0fjrq0pnpkbnnkx9cv9a"; depends=[crul jsonlite tibble]; }; - rdataretriever = derive2 { name="rdataretriever"; version="3.0.0"; sha256="1a01lrzn7gcxid01r0l8nnbpbryvs07z9nf43l1143w2n9bvgn24"; depends=[reticulate semver]; }; rdbnomics = derive2 { name="rdbnomics"; version="0.6.4"; sha256="1h32wxjykz9y3k48rx31cvy485gsx8ix3194r2zgxlwdza3rl3lb"; depends=[curl data_table jsonlite]; }; rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; }; + rddapp = derive2 { name="rddapp"; version="1.3.0"; sha256="1yh5yx0jfvxs566kh4dmx4k9h6gh7n4rvvv8aw4mr52ihisradqm"; depends=[AER DT Formula lmtest plot3D R_utils sandwich shiny sp]; }; rddensity = derive2 { name="rddensity"; version="2.2"; sha256="00xmdy3885j3j5sh3civlgggscr946gh7ibd6namqhbzhsnpwrd3"; depends=[ggplot2 lpdensity]; }; - rddtools = derive2 { name="rddtools"; version="1.5.0"; sha256="174mm48hr0pnisg6k2jha877fhhhp26nz7kdqaprsaacsad1x255"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd rdrobust rmarkdown sandwich]; }; + 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.0"; sha256="1rj9sw6r6rimzxbyjjczi5znmdkvqb7kkrdsnzz35n8g43s7h2wr"; depends=[R6 rlang]; }; rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; }; - rdflib = derive2 { name="rdflib"; version="0.2.4"; sha256="1i08l8s6077xgfm4hkxfs5zq7rkblhbkdiimh4gcynbscs4is0nc"; depends=[dplyr jsonld readr redland stringi tidyr]; }; + rdflib = derive2 { name="rdflib"; version="0.2.5"; sha256="0qbqn72c26pi3mc53z0sip5zpmkdpwggysj5vrn4zgccs7932r79"; depends=[dplyr jsonld 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.3"; sha256="156jsil81ha61az78w1fi8fzrwhlircidha5x6c29zl0l6m4jzv9"; depends=[brio digest foreign getPass haven httr iotools jsonlite magrittr qdapRegex R6 rappdirs rgdal storr xml2]; }; rdi = derive2 { name="rdi"; version="1.0.0"; sha256="1c49mkxfyxhqz8fc155kgy1k5by0y2c1ahy8k6pn9k8l1j4m4m2q"; depends=[beanplot gplots pdist stringr]; }; @@ -15078,7 +15305,7 @@ in with self; { rdmulti = derive2 { name="rdmulti"; version="0.8"; sha256="0hkcvcndfma9sbw6brmj29ka52kn3axhwk1cix3vw5ganwnmpaqh"; depends=[ggplot2 rdrobust]; }; rdnb = derive2 { name="rdnb"; version="0.1-4"; sha256="069xlfdjjyl4a9clxj8m5gfplmll6qiqzms59mnsql3b74jamxi3"; depends=[brew httr stringr xml2]; }; rdoc = derive2 { name="rdoc"; version="0.1.0"; sha256="0ac6413jyrr7m25z30n3bpiafsvjx38ik6rrjzsiqxrfp41j6l9x"; depends=[cli crayon prettycode R6]; }; - rdomains = derive2 { name="rdomains"; version="0.2.0"; sha256="048wdddgg2zaarpmn07dya74xy10831lba1zpq9kjnqk8v286jrw"; depends=[aws_alexa curl devtools glmnet httr jsonlite Matrix rlang urltools virustotal XML xml2]; }; + 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.1"; sha256="1aylzslfjcm84y2nbnlam8pvg1fjgznihhngjvz771rn5klgkznc"; depends=[rdrobust]; }; rdrobust = derive2 { name="rdrobust"; version="1.0.8"; sha256="04z7a5499cc8q61wi2zc370l1r6ymipfd8zk7k93692c6lx3yygz"; depends=[ggplot2 MASS]; }; @@ -15088,7 +15315,7 @@ in with self; { rdwd = derive2 { name="rdwd"; version="1.5.0"; sha256="1x63zarcyc1rapg46h0vlym3v2kbd6ql2vza9jqly371p5g8l1ci"; depends=[berryFunctions pbapply]; }; rdwplus = derive2 { name="rdwplus"; version="0.1.0"; sha256="1y4dnm2bb0w6pim4h79mv2km88s78vhsn5fhs7z45m0564hgk0x2"; depends=[raster rgrass7]; }; re2 = derive2 { name="re2"; version="0.1.1"; sha256="0hjdm96qgbrb6lvgyadl30af93zvvni0rwqhialj8swp341qlvw2"; depends=[Rcpp]; }; - reReg = derive2 { name="reReg"; version="1.4.1"; sha256="12m64rrj0pjhmwgw88ibnb4x0hnfixfsbzg6yany75048y52anis"; depends=[BB dfoptim directlabels ggplot2 MASS nleqslv optimx Rcpp RcppArmadillo reda rootSolve scam SQUAREM survival]; }; + reReg = derive2 { name="reReg"; version="1.4.2"; sha256="1w0h1dsy3hl66fghjcbgc4nh9k1dkga4d53qb5iyd35a5pwpv41v"; depends=[BB dfoptim directlabels ggplot2 MASS nleqslv optimx Rcpp RcppArmadillo reda rootSolve scam SQUAREM survival]; }; reactR = derive2 { name="reactR"; version="0.4.4"; sha256="15c0ij3xglsdavkpzgnkbyl5yb39jrn6zhlrdjiwp1m9cnrqzf2w"; depends=[htmltools]; }; reactable = derive2 { name="reactable"; version="0.2.3"; sha256="17wl75cblm0rgq3chl96vj7wmbcmszss1zjppfccz1hcimfmlrpx"; depends=[digest htmltools htmlwidgets jsonlite reactR]; }; reactablefmtr = derive2 { name="reactablefmtr"; version="1.0.0"; sha256="0c058ar826zfw7g9vdlgfc9sra3sxp1n6m1ijfgrfm04whk2sz50"; depends=[dplyr htmltools htmlwidgets reactable shiny stringr]; }; @@ -15112,7 +15339,7 @@ in with self; { readmnist = derive2 { name="readmnist"; version="1.0.6"; sha256="0f2kp5r04k47gpvbj8x13c47zsis3bw3y8f5f37sh6jggblqr004"; depends=[]; }; 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.1"; sha256="115w3hgp1w6hr0h2nz840i6mm1pnqzwfbxcmf9ca3qs7llc7k4q3"; depends=[cli clipr cpp11 crayon hms lifecycle R6 rlang tibble tzdb vroom]; }; + readr = derive2 { name="readr"; version="2.1.2"; sha256="06qcw57yz0fhh3ni41d5w68cbmwmb6zkp47chllwzax43wxd1bwl"; depends=[cli clipr cpp11 crayon hms lifecycle R6 rlang tibble tzdb vroom]; }; readrba = derive2 { name="readrba"; version="0.1.2"; sha256="1gbyin3lvh4vjwr715xbdjnlzz42f9fs44x1hqmyinya55l9whih"; 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]; }; @@ -15129,7 +15356,7 @@ in with self; { rearrr = derive2 { name="rearrr"; version="0.3.0"; sha256="0cha5klizm1qppvw512j86papnbc5g0k6yyq2bifw831dqb6k9pb"; depends=[checkmate dplyr lifecycle plyr purrr R6 rlang tibble]; }; reasonabletools = derive2 { name="reasonabletools"; version="0.1"; sha256="08i7wy4jic5v9ka7j716lj6p9r55sv46sqrxsy7ad6sgjvrzn0ss"; depends=[]; }; rebird = derive2 { name="rebird"; version="1.3.0"; sha256="1lsmrkp5zfwr9jr26bzw2mk2z4261ylz7qclb0a4j0ma8vrd6f5j"; depends=[assertthat dplyr httr jsonlite]; }; - rebmix = derive2 { name="rebmix"; version="2.13.1"; sha256="1d5s8npnpj7014b6qbin2scvabnx3xmdbi8pg7wqj80mqi02qzrb"; depends=[]; }; + rebmix = derive2 { name="rebmix"; version="2.14.0"; sha256="1rcz7f5d50j4cqhzngzii3p6ydq03zgrlbrkn9c170xj66i7bjqk"; depends=[]; }; rebus = derive2 { name="rebus"; version="0.1-3"; sha256="0ms3dm6g0fq3jycpgjl7q7kyljxc97cczy2jj0lyviwmipdgjg9d"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; }; rebus_base = derive2 { name="rebus.base"; version="0.0-3"; sha256="1n2khszcya9k6379bdkq47xi2nw9jngiwj7z8a14wfswqydczv6y"; depends=[]; }; rebus_datetimes = derive2 { name="rebus.datetimes"; version="0.0-1"; sha256="09lv41mywm13avxb0xp8x1a2xz50zxazh3lpg27m16d4cgijmhm5"; depends=[rebus_base]; }; @@ -15138,8 +15365,9 @@ in with self; { recapr = derive2 { name="recapr"; version="0.4.4"; sha256="1grp8aczn3qjm8ihn2466v5yay60vwyf1x7jsmihgxlvgwki6dh7"; depends=[MASS]; }; 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="0.1.17"; sha256="0gbdc5kvbn14s5zrf4vrdjvkfajs00p7vvb433ii0lqnl07bl87d"; depends=[dplyr ellipsis generics glue gower ipred lifecycle lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate vctrs withr]; }; + recipes = derive2 { name="recipes"; version="0.2.0"; sha256="1950rvva19ms6xy9d3jx94gzy589qprk115zjjd0ib4qxgip601x"; depends=[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]; }; + reclin2 = derive2 { name="reclin2"; version="0.1.1"; sha256="12pb8gp9c5vhfikl4v348dmz0xig10gbrnwxmgmn3jv75ys9ppzq"; 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.11"; sha256="08gbbgm6494s490lw9c85j1bvmd6wnk9r43dh8x4lijb3fhs0dq0"; depends=[GA Rcpp sp]; }; recodeflow = derive2 { name="recodeflow"; version="0.1.0"; sha256="0qi5y1rbdw6dcvkl8gw9fh7rcb0f6ckig8464sgxslgf7cdk2gcz"; depends=[dplyr haven magrittr sjlabelled stringr tidyr XML]; }; @@ -15148,12 +15376,12 @@ in with self; { 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.5-2"; sha256="1i24rh0swd8r5x81322hn7mkqnlwkxbjn9s5m6hjgm4d11bfqcnw"; depends=[float Matrix MatrixExtra Rcpp RhpcBLASctl]; }; + recometrics = derive2 { name="recometrics"; version="0.1.6"; sha256="07mqhkl8xp32917c4gw3ssr9bpkf4amhr30spba9xmz39p26ayir"; depends=[float Matrix MatrixExtra Rcpp RhpcBLASctl]; }; recommenderlab = derive2 { name="recommenderlab"; version="0.2-7"; sha256="016wgzf7hl0kw9qdwc8jwbnq4pkjkid33whh42h10hq8zqsbnivk"; depends=[arules irlba Matrix proxy recosystem registry]; }; recommenderlabBX = derive2 { name="recommenderlabBX"; version="0.1-1"; sha256="042yh0h8qxj7n9hysrfdxnpb3g0zb6s5b683s7hn5mjc55q7nn4g"; depends=[recommenderlab]; }; recommenderlabJester = derive2 { name="recommenderlabJester"; version="0.1-2"; sha256="0kr9xc2gih2myn1a8h8dxxmdhibv1sjwjsvlrj9d5hvd1mgfhks5"; depends=[recommenderlab]; }; reconstructKM = derive2 { name="reconstructKM"; version="0.3.0"; sha256="0fxdmvkm68g114nx2r2r8gy2lwqc5wkfcls7fpdfdfg0aazqqxwq"; depends=[dplyr magrittr rlang survival survminer]; }; - reconstructr = derive2 { name="reconstructr"; version="2.0.2"; sha256="0pzpd2l1b6y1b1lnd95lpc5s8niz7p56vkmxgyi6g6b25vh9c2vi"; depends=[openssl Rcpp]; }; + reconstructr = derive2 { name="reconstructr"; version="2.0.4"; sha256="05nvp19fkmyr2sc7k5qjz2521f8nrzxvjdbnqa148qs0mac84b16"; depends=[openssl Rcpp]; }; recorder = derive2 { name="recorder"; version="0.8.2"; sha256="1j3fqqp5vi8z3hxqgb887v9r8x0cl5jikiyx3c7arwna7k89215a"; depends=[crayon data_table]; }; recosystem = derive2 { name="recosystem"; version="0.5"; sha256="0xpkq500cbq6vzgwq5scq8bj33nrjj94n39zza2cm1fnars6msjq"; depends=[float Rcpp RcppProgress]; }; recurse = derive2 { name="recurse"; version="1.1.2"; sha256="0bdm2nd8cq64dwz9b2hnbjv6c3fwpy7gnmbfi6p49nf285p8y632"; depends=[Rcpp]; }; @@ -15163,11 +15391,11 @@ in with self; { redcapAPI = derive2 { name="redcapAPI"; version="2.3"; sha256="1myycwdrlw1405fxc82zd8ps8bhdvf2ffsb91pia5ijf6952v8pf"; depends=[checkmate chron DBI httr labelVector lubridate readr stringr tidyr]; }; reddPrec = derive2 { name="reddPrec"; version="0.4.0"; sha256="0zmkaiivvjq8mcaz310zgjjc7y0wgsqv29bf8nhli5qawaczvb9a"; depends=[fields snowfall]; }; redist = derive2 { name="redist"; version="3.1.5"; sha256="18g78x6riqqczhi5rixr7fikfzhrf46b62y4ii18r99q9z65k4z4"; depends=[coda doParallel dplyr foreach ggplot2 patchwork Rcpp RcppArmadillo readr rlang servr sf stringr sys tidyselect vctrs]; }; - redistmetrics = derive2 { name="redistmetrics"; version="1.0.0"; sha256="02d2mkgrkb81rgyqzj8yphgq4mbh4m2gah0j58mvqq1mrlhryg7j"; depends=[cli doParallel dplyr foreach geos magrittr Rcpp RcppArmadillo rlang sf]; }; - redland = derive2 { name="redland"; version="1.0.17-15"; sha256="1yh512mfy57kz5ripimzcvqgkkh2zgknfps476yn90y6i5xskapy"; depends=[roxygen2]; }; + redistmetrics = derive2 { name="redistmetrics"; version="1.0.1"; sha256="01s3aim2rmsbs74mc3banqv4m1mdb82qa38wg96pydw7qr7by63w"; depends=[cli doParallel dplyr foreach geos magrittr Rcpp RcppArmadillo rlang sf wk]; }; + redland = derive2 { name="redland"; version="1.0.17-16"; sha256="1nzxyczsz274751z48glh8qzv1v9rdv3raq6whyp63nsi2xdri90"; depends=[roxygen2]; }; redlistr = derive2 { name="redlistr"; version="1.0.3"; sha256="003jxfmj1gryw77vnrvaxmpvjbshlq53wgcrj02mcywfcqzg4jcr"; depends=[plyr raster rgeos sp]; }; redoc = derive2 { name="redoc"; version="2.0.0.49"; sha256="06nfqw6xs0ij21mjbqk9sdvhhh0pqf6fwankvagsbyrv742g7qkx"; depends=[jsonlite]; }; - redux = derive2 { name="redux"; version="1.1.0"; sha256="0a551w7fph338mqzxda6y21lsad19dway7w18jw9cv1rgvcp9nvc"; depends=[R6 storr]; }; + redux = derive2 { name="redux"; version="1.1.3"; sha256="1bbn2aznhfh78gbqq0g2n5lbg1q9aa7v8py3xv9gk97rg27jz49x"; depends=[R6 storr]; }; ref_ICAR = derive2 { name="ref.ICAR"; version="1.0"; sha256="0k6czsbjclgmi7vp5hl50jghkzm573s50993iz3dcv55mv662251"; depends=[coda MCMCglmm mvtnorm Rdpack rgdal spdep]; }; refer = derive2 { name="refer"; version="0.1.0"; sha256="1y0n4xzhn96d25mwjr0735w990rz2kbxhcpsc5k5vwbwq64q6wsd"; depends=[eList matchr]; }; referenceIntervals = derive2 { name="referenceIntervals"; version="1.2.0"; sha256="0wf8c71z7gq2f91q60dyy7mrxsnhq7x3wdllmzn2lpabgv2wrm85"; depends=[boot car extremevalues outliers]; }; @@ -15176,6 +15404,7 @@ in with self; { 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.0"; sha256="0fgf99a9xki9x0kjrhi7lyr1f4gpfl52xis058fd70y4pj1zz37l"; 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]; }; refund = derive2 { name="refund"; version="0.1-24"; sha256="089dl0vjn474gka9j18fk125aqvwd2gx61g1rv8cp6m0caq99pzg"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; }; @@ -15186,7 +15415,9 @@ in with self; { regexPipes = derive2 { name="regexPipes"; version="0.0.1"; sha256="1hk0rhvmgzcyf5cyl8hjznl3ll25kpasqikfr6nxd6ian2slvmmb"; depends=[]; }; regexSelect = derive2 { name="regexSelect"; version="1.0.0"; sha256="0xnb9qa8l63ang4r40ky4qhlrs5mbzvmj98dgij26j3mq1ys1pa7"; depends=[shiny shinyjs]; }; 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]; }; + regfilter = derive2 { name="regfilter"; version="1.0.1"; sha256="19dp0219a789qjxc0flg14bwp297g3kcy5p65m9qsw72658pxw3z"; depends=[e1071 FNN gbm modelr nnet randomForest rpart]; }; reghelper = derive2 { name="reghelper"; version="1.1.0"; sha256="16mj3v9rn9krx4a8xnb2l01wnk17hgn0pkmkvqh4baby9a479hv7"; depends=[ggplot2 lme4 MASS nlme]; }; + regional = derive2 { name="regional"; version="0.3.0"; sha256="1x97jjpn08q0w3xw1r6k8dvildcl16zzwxwrwmbdhavqmcvf0lp8"; 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]; }; registr = derive2 { name="registr"; version="1.0.0"; sha256="1ysj2ab69w6g71d1kpcwyq0py71w6h7lfhk4nzgn2dhh6k8whwbn"; depends=[dplyr ggplot2 gridExtra magrittr Rcpp RcppArmadillo tidyr]; }; @@ -15195,6 +15426,7 @@ in with self; { regmed = derive2 { name="regmed"; version="2.0.4"; sha256="19cc0nx4463jny9cw5smb95crb3makspysfx06h82amhyqjyzw60"; depends=[glasso igraph knitr lavaan Rcpp RcppArmadillo]; }; regmedint = derive2 { name="regmedint"; version="0.2.1"; sha256="0z6yq0r0mq028z09zayfmsyyjjcnh9cg75xwckcxk0xbgs1qk1yx"; depends=[assertthat Deriv MASS Matrix sandwich survival]; }; regnet = derive2 { name="regnet"; version="0.4.0"; sha256="0qb7sp464fyxn0bslkapjni3pzk7l6fdgabfbzja08flsr63r4mh"; depends=[glmnet Rcpp RcppArmadillo]; }; + rego = derive2 { name="rego"; version="1.3.4"; sha256="1dqirk3wk3xps612av54d1f0h3ddh1an9bnxqyb9vbbpml9fw18a"; depends=[Rcpp]; }; regplot = derive2 { name="regplot"; version="1.1"; sha256="048w0hnd2y8k27msjhw2g4ygck6i09698qk24sz7563z82gvj52w"; depends=[beanplot lme4 sm survival vioplot]; }; regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; }; regrap = derive2 { name="regrap"; version="1.0.1"; sha256="0yrxhlam7jmxwk1v53kllv6ja1m938symfvqp84xb278r3wb1wv7"; depends=[mvtnorm]; }; @@ -15206,7 +15438,7 @@ in with self; { regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; }; regtomean = derive2 { name="regtomean"; version="1.0"; sha256="1w5i75iwwc2w2nzw9yap86njhq9jz0pc9cn39ivxdam4a9693jjz"; depends=[effsize formattable mefa plotrix plyr sjlabelled sjmisc sjPlot]; }; regtools = derive2 { name="regtools"; version="1.1.0"; sha256="1kia4h4bwjjfq7jm57ihdgspbqfn683ssbzngp5r069ki931h3nb"; depends=[dummies FNN mvtnorm sandwich]; }; - regweight = derive2 { name="regweight"; version="1.0.1"; sha256="1crw4yw2hxla9xw1zj1dxxj2v1r77vijm9pf8mn9vpdz45mw8pkr"; depends=[checkmate dplyr ggplot2 glue gt lpdensity rlang scales tidyr tidyselect]; }; + regweight = derive2 { name="regweight"; version="1.0.2"; sha256="1ziqii9xlp86n6ga99glwnh2kf6pkm8m326yra40yf2w3h180pbm"; depends=[checkmate dplyr ggplot2 glue gt lpdensity rlang scales tidyr tidyselect]; }; rehh = derive2 { name="rehh"; version="3.2.2"; sha256="1kgabmg0vq8psdhkfcpdv3iy8gj5hmqzhb8bs8rld49nhnnbqs2x"; depends=[rehh_data]; }; rehh_data = derive2 { name="rehh.data"; version="1.0.0"; sha256="1jkvwmnnmfa7iyvrabgcfzw3vfzx0dlgq47s6yf4zayi437v4di0"; depends=[]; }; rehydratoR = derive2 { name="rehydratoR"; version="0.5.2"; sha256="1d94m9hv1l72l9lph2vzbq4qqbfcgyhv2qk82p9vb8l2ckavjzvv"; depends=[dplyr jsonlite rtweet tibble]; }; @@ -15214,10 +15446,9 @@ in with self; { reinsureR = derive2 { name="reinsureR"; version="0.1.0"; sha256="19ayikzcq6z4i7xrlby76yy2nwvrsv6xdfrmvzyr7rz934flh8kd"; depends=[data_table dplyr ggplot2 viridis viridisLite]; }; relMix = derive2 { name="relMix"; version="1.3.3"; sha256="03zzmsx2i7ib1mhdfk5igvr1winl9g2dfjqz2kzvcx3rl7l6hjym"; depends=[Familias gWidgets2 gWidgets2tcltk]; }; relSim = derive2 { name="relSim"; version="0.3-1"; sha256="1d6yihapfyjlfw87l370wyfyby7ivvykx04qljffdv3hi801gn7f"; depends=[multicool Rcpp rvest stringr xml2 xtable]; }; - rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; }; relaimpo = derive2 { name="relaimpo"; version="2.2-6"; sha256="1v2zvakzrnc89dshhpkrikfwa7l786sk5vnz4khil5f53biahm4r"; 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-10"; sha256="13h6snbbczwk4zcpsmbbrxvhy6dwv1pm2zwfh0cz2sr7djhb0q5n"; depends=[cluster sets slam]; }; + relations = derive2 { name="relations"; version="0.6-11"; sha256="1nsl042djnd7l61ckv3pwndqwxjcwvnvpni6d52dxc982gm8sims"; depends=[cluster sets slam]; }; relaxo = derive2 { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; }; reldist = derive2 { name="reldist"; version="1.7-0"; sha256="0i04d6w3r6fzm4bykz6lnnh6dngmd61v5wlpli70r3fzdzhi7fji"; depends=[densEstBayes Hmisc mgcv]; }; relen = derive2 { name="relen"; version="1.0.1"; sha256="0br7c3j30a1yc61pyinmk5lvk8zw9rivd0z2096g6crgmbzix8ml"; depends=[]; }; @@ -15227,8 +15458,8 @@ in with self; { reliaR = derive2 { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; }; reliabilitydiag = derive2 { name="reliabilitydiag"; version="0.2.0"; sha256="0qgvyjc512gwr0rbgxkkf9ipvxfl9y07215f1pdk15xhzkk94m53"; depends=[bde dplyr ggExtra ggplot2 magrittr purrr rlang tibble tidyr vctrs]; }; relimp = derive2 { name="relimp"; version="1.0-5"; sha256="0ydn82g8xdqzhf34187080bbpcpw1zdjbj2i3dv1d6d35vvprb5c"; depends=[]; }; - relliptical = derive2 { name="relliptical"; version="0.9.0"; sha256="1smrbrxaj0jwfsl07pk46s0iqcb1xmww1yzr73kv43ld6py9n4sv"; depends=[FuzzyNumbers_Ext_2 matrixcalc Rcpp RcppArmadillo RcppEigen RcppNumerical Rdpack Ryacas0]; }; - relsurv = derive2 { name="relsurv"; version="2.2-6"; sha256="11g07282k1h7r342ayi1xwk85z5h7j800fqr4zrwm8m00nlwcdch"; depends=[date ggplot2 pammtools scales survival]; }; + relliptical = derive2 { name="relliptical"; version="1.1.0"; sha256="0qarn0gyr1zkr1y9hdy0xmlrx12cp9sfn1fglgprfbymbjr36ncc"; depends=[FuzzyNumbers_Ext_2 matrixcalc Rcpp RcppArmadillo Rdpack Ryacas0]; }; + relsurv = derive2 { name="relsurv"; version="2.2-7"; sha256="05w3j75fvli296bkza1s4jjxsjhiwzrv71dqrf8v7f9y1az4pj42"; depends=[date ggplot2 pammtools scales survival]; }; rem = derive2 { name="rem"; version="1.3.1"; sha256="1q4p26irhhl1lvc0ydv9wmng1y635zm16szpl7gwq1kyn2p90rai"; depends=[doParallel foreach Rcpp]; }; rema = derive2 { name="rema"; version="0.0.1"; sha256="15b68pynac9ff9bina0mf94absvfsn21xcdmvd4lbl97pxwj83ph"; depends=[progress Rcpp Rdpack]; }; remap = derive2 { name="remap"; version="0.2.1"; sha256="0fvi0scrjcghkfamdilfyqqn0v9zlgpjdkqwk4ylhpb85x5pv534"; depends=[sf units]; }; @@ -15242,32 +15473,33 @@ in with self; { remss = derive2 { name="remss"; version="1.0.1"; sha256="15s3qvcfyp1880ddzpvgiw3q5av21052iy1vnpw0hib5pb7xfkfb"; depends=[survival]; }; 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="0.15.0"; sha256="04kl87k42zc1qb8scsijn14g9lxmnfwqcq8b85n2infnd1lmbaza"; depends=[]; }; + renv = derive2 { name="renv"; version="0.15.4"; sha256="0byfs4cydhyqzdrxjv7sa6i30xc7qhnx0qw9d8wwwlzdkv235flf"; 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]; }; - repeated = derive2 { name="repeated"; version="1.1.2"; sha256="19kcsj96i1zpnwfan3gz5vrzc2gqlah0wrdr9vb4vvacz45wcdfq"; depends=[rmutil]; }; + repeated = derive2 { name="repeated"; version="1.1.5"; sha256="1ng2w0zypaa48qrfpdx1mb085yvw9zgk81q96ki2y3rls4g6q84g"; depends=[rmutil]; }; repec = derive2 { name="repec"; version="0.1.0"; sha256="0alr9fbmfxmnnnn1qymy65crcycynwz435jj0vangbb4p0qhv8pm"; depends=[jsonlite]; }; repello = derive2 { name="repello"; version="1.0.1"; sha256="118m0vybgf5ys856zivn7gvjxqq163gkrhrpyl1avylib4bp3mcq"; depends=[dplyr httr stringr]; }; repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; }; replacer = derive2 { name="replacer"; version="1.0.1"; sha256="1y5f61r0rc4snpv8sjh4g5gc0f7rik5wdnh92sakafwiisjssmc1"; depends=[data_table]; }; - replicateBE = derive2 { name="replicateBE"; version="1.1.0"; sha256="0ix6qmgyh4j9klhmb7dqj5zwb42y2grlqxijv72lmkbyl59yqqqw"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; }; + replicateBE = derive2 { name="replicateBE"; version="1.1.1"; sha256="11xhn75n8hfw8ab5gkg9bi6vg66220hsdywjbskycdly4c5444jk"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; }; replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-3"; sha256="1h680xn403fm98ywyxqwhq7llsaghgd4ffjq7r5bdb1r9ahvxrv0"; depends=[spatstat spatstat_core spatstat_geom spatstat_utils]; }; replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; }; repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; }; repmod = derive2 { name="repmod"; version="0.1.7"; sha256="1rpmvxfw2m3bisi5g90sdfm8wmwg2gv9rzblq9kl70kvrs8pj1qs"; depends=[boot flextable lme4 lmerTest officer xtable]; }; repo = derive2 { name="repo"; version="2.1.5"; sha256="13gdka37kbs4mp16pf65bh28f0dkyalrcrdik6lc67jw8r9h94f9"; depends=[digest]; }; + repoRter_nih = derive2 { name="repoRter.nih"; version="0.1.0"; sha256="0kdjg0hmhw4h5gwmzxr44xrr1lkij3p75729mwbqxqfdgn784ajx"; depends=[assertthat crayon dplyr httr janitor jsonlite lubridate magrittr purrr tibble]; }; repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; }; - report = derive2 { name="report"; version="0.4.0"; sha256="1g6xq6gl84ddz03pfnihc501svghdjxsa0f6fmlb3r58h61r8isq"; depends=[bayestestR datawizard effectsize insight parameters performance]; }; + report = derive2 { name="report"; version="0.5.1"; sha256="1x293zjg4zfkcrgl6dsa6jn0igpxr12ic7jlb4ps79221ygga873"; depends=[bayestestR datawizard effectsize insight parameters performance]; }; reportROC = derive2 { name="reportROC"; version="3.5"; sha256="1f3vdxz45bhks1pm3b41pmh8g8vr2czfr1pn4ddy4kgw5h1x3n8n"; depends=[pROC]; }; reportReg = derive2 { name="reportReg"; version="0.3.0"; sha256="0qwrpn61x69hmgln5fpc58dqfa3pba0lgjjyj0f3fh96wc9jyhq1"; depends=[nlme]; }; - reporter = derive2 { name="reporter"; version="1.2.8"; sha256="0944yyxfm1fhn3jbqp5qar5d1kl9xh3vwimd63ndils4saff8kv3"; depends=[crayon fmtr jpeg stringi]; }; + reporter = derive2 { name="reporter"; version="1.2.9"; sha256="0aiv4wqv633jiazyf157dwi1bp6qgv6vnsnsral02cp9sm53cpq9"; depends=[crayon fmtr jpeg stringi]; }; 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.4"; sha256="0h3h14ybamcbwmm31ib66fx13v75vkzn4bn2v26n2h097sl9qybg"; depends=[base64enc htmltools jsonlite pillar]; }; represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; }; - representr = derive2 { name="representr"; version="0.1.2"; sha256="1l3fy3kymzlcw1xckhnr863pi5j0zvy8bc16h0jw7xgj8zsw00zc"; depends=[doParallel dplyr foreach]; }; + representr = derive2 { name="representr"; version="0.1.3"; sha256="0z4bv7n1r8sbk2832sqpkjjpdr4dc6lj6p6c18kbxx9zh660avd4"; depends=[doParallel dplyr foreach Rcpp]; }; represtools = derive2 { name="represtools"; version="0.1.3"; sha256="00hnvzkkcl9d3k115i5l9gs0wah5d11amn7q62m1j158lkqlcfza"; depends=[whisker]; }; reprex = derive2 { name="reprex"; version="2.0.1"; sha256="09k4rasp7mz6n796dsklcbc5l7prljiznrm7fra16qybr9kqcv8f"; depends=[callr cli clipr fs glue knitr rlang rmarkdown rstudioapi withr]; }; reproducer = derive2 { name="reproducer"; version="0.4.2"; sha256="0ip7zh8jnjdwl0lawh60v1rcl0dvrxb6dbrlldb6l1vzbn530him"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 MASS metafor openxlsx readr reshape stringr tibble tidyr xtable]; }; @@ -15284,24 +15516,26 @@ in with self; { resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; }; resampledata = derive2 { name="resampledata"; version="0.3.1"; sha256="1nxjqvxxvycccmh1n7lpc4k8zmwnciicfr5rzfid1icij5fzw3ak"; depends=[]; }; rescue = derive2 { name="rescue"; version="1.0.3"; sha256="0wq4ka1a7yhbjwr99ngykhn2r3czn3rqi63r6jn46pz15vnicwad"; depends=[data_table dbscan igraph irlba Matrix reticulate]; }; + resemble = derive2 { name="resemble"; version="2.1.2"; sha256="0m8vggahf0yrblxsj2qj3s8y5l2w6vvpl5p7p32cmdj63jic80jr"; depends=[data_table foreach iterators lifecycle magrittr mathjaxr Rcpp RcppArmadillo]; }; reservoir = derive2 { name="reservoir"; version="1.1.5"; sha256="1qvjq8j2gxp6b8m3k3822f9na8a1kbwzzsmq70m763dcq293rgiz"; depends=[gtools]; }; - resevol = derive2 { name="resevol"; version="0.2.0.8"; sha256="1s9g034cjrafj8lkk3gahd05cz8kkgal2lsvm4nfx3s7hx91q0ww"; depends=[]; }; + resevol = derive2 { name="resevol"; version="0.2.0.9"; sha256="01w95ylmgyj75shljkmkmh0pb1gl7ys413fay4qbzll1z01rng1w"; depends=[]; }; reshape = derive2 { name="reshape"; version="0.8.8"; sha256="0s6i0sqxg1vldxs6miv8mi0zydxbqzgpmzfiwkj8y7jix3yrfmad"; depends=[plyr]; }; reshape2 = derive2 { name="reshape2"; version="1.4.4"; sha256="1n0jrajpvc8hjkh9z4g8bwq63qy5vy5cgl2pzjardyih4ngcz3fq"; depends=[plyr Rcpp stringr]; }; resourcer = derive2 { name="resourcer"; version="1.1.1"; sha256="0zjr12fxjlw9zwa5n3l7r2m6vrksvczdzyhq3aj3hzqbm148z1cq"; depends=[httr R6]; }; + respR = derive2 { name="respR"; version="2.0.0"; sha256="19pyhplwmghm9qcz6b99nvsr6g3wnilr03ssf1cakh0q8km3x4as"; depends=[assertthat broom cowplot data_table dplyr ggplot2 glue gridExtra lubridate magrittr marelac purrr readxl roll segmented stringr xml2]; }; respirometry = derive2 { name="respirometry"; version="1.3.0"; sha256="1ffhkvf8a8zhkysghd636k47bl7k5bdwkkg4m0pr1zlxpfrif82c"; 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.12.3"; sha256="1jwhc9igcxa8k3hnnf4vpharbh1scbb7m7zvjyv2axbjjz0hr8hs"; depends=[data_table rjson xml2]; }; + restatapi = derive2 { name="restatapi"; version="0.12.8"; sha256="10x6zik6szvkmjzasv6dpa363jwim1jim9z27jc3x29kd3nw79hl"; depends=[data_table rjson xml2]; }; restaurant = derive2 { name="restaurant"; version="0.1.0"; sha256="1dr9nw5xkll1wnra2xi8dg2yiv85nibdg1i9lsn44v7cgr9vb32j"; depends=[]; }; restfulr = derive2 { name="restfulr"; version="0.0.13"; sha256="1dk45mzrr6ka92yjz7hfhkj12kpx1wg4szv1h1mg80mgga4ganbv"; depends=[RCurl rjson S4Vectors XML yaml]; }; restimizeapi = derive2 { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; }; restorepoint = derive2 { name="restorepoint"; version="0.2"; sha256="0pjp5dvycvfg75hhj8lrr2lrjn6n6bqj0ziwyd87lyi15b9j8w4s"; depends=[]; }; restrictedMVN = derive2 { name="restrictedMVN"; version="1.0"; sha256="0qynkg244gzq0yjb0716w7g1sxdq66i11ss8jij86h2mz3ykj137"; depends=[MASS]; }; - restriktor = derive2 { name="restriktor"; version="0.3-100"; sha256="0249zhlskvk3ib1vncqh1vfpssh3la7fxd566ag2anfd53a644m8"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; }; + restriktor = derive2 { name="restriktor"; version="0.3-400"; sha256="0iaxbjci4334aasx62w61jagv1v51355pyyjfj62392vvz11q4mj"; depends=[boot ic_infer lavaan MASS mvtnorm 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.2"; sha256="0ccx6314gh08bnqca8a5x2bq4fk290lba0k72f0anszyamkvgfnj"; depends=[cli Rcpp RcppEigen RcppThread]; }; - reticulate = derive2 { name="reticulate"; version="1.22"; sha256="0v7m2pv94lfqiw8rhz3c9g66vvz4qvih4vd29rhfk2phmcwpnvmh"; depends=[here jsonlite Matrix png rappdirs Rcpp withr]; }; + reticulate = derive2 { name="reticulate"; version="1.24"; sha256="1k0nv43fa9lx44pamxpprnvvmsp15adn5z6hg9siyq0n94hca65r"; depends=[here jsonlite Matrix png rappdirs Rcpp RcppTOML withr]; }; retistruct = derive2 { name="retistruct"; version="0.6.3"; sha256="1zij37n2ja3yx6n1agdkb3lj42p01parcg6djv60bng9c2qq0wsl"; depends=[foreign geometry png R_matlab R6 rgl RImageJROI RTriangle sp ttutils]; }; retractcheck = derive2 { name="retractcheck"; version="1.0.0"; sha256="1c4p8afh9g359s560sswcys3manc0lqvk0aqgvd09p4rpzls2dm7"; depends=[httr plyr textreadr]; }; retriever = derive2 { name="retriever"; version="0.2.1"; sha256="0vachj8rzh8g55y18hz85bsrzr86614frdmr7wz6hszgiq8qgcxy"; depends=[pbapply preprocessCore]; }; @@ -15314,12 +15548,12 @@ in with self; { revdbayes = derive2 { name="revdbayes"; version="1.3.9"; sha256="0j29hp21dab2fnsb6d41ykvyhfkfz1hf0qjpsz4lypc2rnbc3mpm"; depends=[bayesplot 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.0"; sha256="086ar2k3385iq5ci8cjshdciiiw01ixzia3f05gfy4pmzphzz8w8"; depends=[dplyr httr jsonlite magrittr purrr tibble tidyr tidyselect]; }; + reveneraR = derive2 { name="reveneraR"; version="0.1.1"; sha256="12mm5sq54y7hbgn7p4qc5bdb7hvrdap0z4p731kgj83c7lgw9315"; depends=[dplyr httr jsonlite magrittr purrr tibble tidyr tidyselect]; }; revengc = derive2 { name="revengc"; version="1.0.4"; sha256="1nipkff9zmkdi509qfdrmvsq5c643xd7bzzw5bchxd8nmfqb412i"; depends=[dplyr mipfp stringr truncdist]; }; reverseR = derive2 { name="reverseR"; version="0.1"; sha256="0pzk97q1zs5g1v4ngqd6bkwwxcp89j890nycpc99ipycbgm2r9yw"; depends=[DT knitr markdown shiny]; }; revgeo = derive2 { name="revgeo"; version="0.15"; sha256="1ns7d1817475lriss6wwgvdm6lj760p40yxqaifla13c2xb73a55"; depends=[RCurl RJSONIO]; }; revpref = derive2 { name="revpref"; version="0.1.0"; sha256="07gbwrwmnq5b48fgdb7m2j8ygz60qm5m23ai7g7yidwk2fayq7ym"; depends=[gtools]; }; - revss = derive2 { name="revss"; version="1.0.2"; sha256="1kwx3r3ypsl060a22mnpxxcq41k8ygwsd243cz54l0zs2yrv893k"; depends=[]; }; + revss = derive2 { name="revss"; version="1.0.3"; sha256="08gikvz2cqr9na51r3fhi7ncyrsh8hf2wxi185zjjg7vbdiww6h8"; depends=[]; }; revtools = derive2 { name="revtools"; version="0.4.1"; sha256="0nms7rwpdzf3xq2incraxppha4c830gcygpbnhwjs92c836hh2f0"; depends=[ade4 modeltools ngram plotly shiny shinydashboard slam SnowballC stringdist tm topicmodels viridisLite]; }; revulyticsR = derive2 { name="revulyticsR"; version="0.0.3"; sha256="0dz9c26qwasgpp6a5fqh1rgq0hp9dhsrcm1h2hbp0cisri8iwsjf"; depends=[dplyr httr jsonlite magrittr purrr tibble tidyr tidyselect]; }; reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; @@ -15341,14 +15575,14 @@ in with self; { rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; }; rfishnet2 = derive2 { name="rfishnet2"; version="0.2.0"; sha256="0g90h4353kp7szv3971kb4l5x3x08qx4f9ln85n5g3b3zdg77dkz"; depends=[dplyr ggplot2 pracma rworldmap sf]; }; rflexscan = derive2 { name="rflexscan"; version="1.0.0"; sha256="1azjdri1dnxqd128p3iya1x36bbhhrckmj08rp23jzfi5zd71c8s"; depends=[igraph Rcpp rgdal sp]; }; - rflsgen = derive2 { name="rflsgen"; version="0.1.2"; sha256="1jjayksvk78jg9v6dhxd88lvq18vbnwinvxd490yllnpagfhz23x"; depends=[checkmate raster rgdal rJava]; }; + rflsgen = derive2 { name="rflsgen"; version="1.0.0"; sha256="1ljmdxys25gmy0m928xnp9krq43lmrxwip6vwji0jghy4h9b0f49"; depends=[checkmate jsonlite raster rgdal rJava]; }; rfm = derive2 { name="rfm"; version="0.2.2"; sha256="1s8h9ll4l5xq3m7ib83zrab49p5q4wclk8qiy2hgjr2hq1sb7wak"; depends=[dplyr ggplot2 ggthemes lubridate magrittr RColorBrewer rlang tibble tidyr xplorerr]; }; rfoaas = derive2 { name="rfoaas"; version="2.1.0"; sha256="0w6m3lvfb60a2zfvyc0ksnfllb2ndy45b301vk9f3nr27lxdz6dm"; depends=[httr]; }; - rfordummies = derive2 { name="rfordummies"; version="0.1.5"; sha256="1glzc20sbv90fbazy3wh6drqd5dkh47s3fjqzgm78dkmj6gp9hdv"; depends=[openxlsx]; }; + rfordummies = derive2 { name="rfordummies"; version="0.1.6"; sha256="01xv6ds3h8gvi1wi5hgy3r1dhi0767mcgsnshvhva3bnvf1a8398"; depends=[]; }; rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3.1"; sha256="1i521h2nmlkhcxfxqir8jfjv0llwr6cz0ck5w6hzplk48044bn16"; depends=[Rcpp]; }; - rfviz = derive2 { name="rfviz"; version="1.0.0"; sha256="0rzyy7r2ybqjnp1g5bbkxydpa93h8q4r71kdaj77r475m2i4kb6b"; depends=[loon randomForest]; }; + rfviz = derive2 { name="rfviz"; version="1.0.1"; sha256="1pxr9bsqg27vgbngj89hhjq0gyzgdlg69rz6kzvvd8gclg42wisv"; depends=[loon randomForest]; }; rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; }; - rgbif = derive2 { name="rgbif"; version="3.6.0"; sha256="083zj5bcbag2qhx2c04ym666lclfyv10w4zd2kvbm7nqhmy8ah99"; depends=[conditionz crul data_table ggplot2 jsonlite lazyeval magrittr oai R6 tibble wellknown whisker xml2]; }; + rgbif = derive2 { name="rgbif"; version="3.7.0"; sha256="03av5xzf13jnrmwg1jgdixvqb991v1z6kw9wvjihhvc842mbd44b"; depends=[conditionz crul data_table ggplot2 jsonlite lazyeval magrittr oai R6 tibble wellknown whisker xml2]; }; rgdal = derive2 { name="rgdal"; version="1.5-28"; sha256="18k1w8cb77h4mw1m5b21r0fng40arb1md24fyriv83ccz8n46m3z"; depends=[sp]; }; rgdax = derive2 { name="rgdax"; version="1.2.1"; sha256="01hpyyhb6jcw9w0q9h4ghgh4cbba27mfl9zdv4vv4ppakvl80czl"; depends=[digest httr jsonlite plyr RCurl]; }; rgee = derive2 { name="rgee"; version="1.1.2"; sha256="0r0mr2gqj75dkga552xfikiiy76h14js8qh29swin3f23xr9dwz0"; depends=[cli crayon jsonlite leafem leaflet magrittr processx R6 reticulate rstudioapi]; }; @@ -15363,18 +15597,20 @@ in with self; { rgexf = derive2 { name="rgexf"; version="0.16.2"; sha256="00c2zka1n3k7p1l0mlchr063s6x58p9r3fb64d4wgl4rvsq55q3f"; depends=[igraph servr XML]; }; rgl = derive2 { name="rgl"; version="0.108.3"; sha256="0fqkx079z9y5b1gdg6qfz2wpw2j8q3ddflfkd9wwrkyacas6xyc9"; depends=[htmltools htmlwidgets jsonlite knitr magrittr R6]; }; rglobi = derive2 { name="rglobi"; version="0.2.27"; sha256="12rqd92i0n7lgnp57a4pfp1fpnhm8v0lmmlfzcy0d8vhvzwgfhw7"; depends=[curl RCurl readr rjson]; }; + rglplus = derive2 { name="rglplus"; version="1.0"; sha256="1yr93laa48aj3rhnz8kih500kngynwnq2px1xnbgya9xsxyc2l5v"; depends=[rgl]; }; rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; }; rgnparser = derive2 { name="rgnparser"; version="0.2.0"; sha256="01dmnyyprnayzn21vgdj9058l17kx8z4fisw4bp4lc6yif39q1r9"; depends=[jsonlite readr sys tibble]; }; - rgoogleads = derive2 { name="rgoogleads"; version="0.4.1"; sha256="13fg1swqx761h3jwam0pfg772gagyc3pn551sb75ai44dnji2qwd"; depends=[cachem cli dplyr gargle httr jsonlite magrittr memoise pbapply purrr rappdirs rlang rlist rvest snakecase stringr tidyr withr]; }; + rgoogleads = derive2 { name="rgoogleads"; version="0.5.1"; sha256="1j51pkk747vdryiymhd7j3by5z2dz9qi7mnlyp7vc53j835syzlr"; depends=[cachem cli dplyr gargle httr jsonlite magrittr memoise pbapply purrr rappdirs rlang rlist rvest snakecase stringr tidyr withr]; }; rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.2"; sha256="0h9gws1vcf0zdd21d8b65c2yz9kxppp3218h5lhd5iz879ajwa2i"; depends=[assertthat httr jsonlite R6]; }; rgovcan = derive2 { name="rgovcan"; version="1.0.3"; sha256="0b1fk7w3x60y0j74pglv14i0d76f13pzslghrday04qzkxy9smvd"; depends=[ckanr cli crayon crul tibble]; }; rgplates = derive2 { name="rgplates"; version="0.1.0"; sha256="1pxvccyq8m1dbq4rl0fi4vwp6k5w83gjwpga9r182z87cij97j43"; depends=[rgdal sp]; }; rgr = derive2 { name="rgr"; version="1.1.15"; sha256="1mrnmbh2crhkwdi37q59hx76afvkhgzgaacg3688q7jp23d58z6x"; depends=[fastICA MASS]; }; - rgrass7 = derive2 { name="rgrass7"; version="0.2-6"; sha256="0k11qm2fc7bxwlajbrk8k49qf65ca4z71f6cynas8ngq4csyzr5r"; depends=[XML]; }; + rgraph6 = derive2 { name="rgraph6"; version="2.0-1"; sha256="1gjw7pjjpz0n94rij6qnr3rdikk7hw3l9zf4hzsrry7fb3db5fv6"; depends=[Rcpp]; }; + rgrass7 = derive2 { name="rgrass7"; version="0.2-8"; sha256="1crgrc68j7ps1hwph9qyrpamvysqvvi8q1rf8mghrq87vd7g18z8"; depends=[XML]; }; rgrassdoc = derive2 { name="rgrassdoc"; version="1.0.0"; sha256="18fcacf4v9n8cd27rc2lidwqm04151ya30pcs0bfhkssz80x0zds"; depends=[cli rlang rstudioapi xml2]; }; 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.3.1"; sha256="17cvxbjjzyf4v8pwcwikb02qrbwgsr6f6bh4brs48zh1jvzbcgzd"; depends=[jsonlite openssl sf]; }; + rgugik = derive2 { name="rgugik"; version="0.3.2"; sha256="0srrp07410zlydj8d8cyls6sfd5nzpqjiv1dkc0x5r3b6shjgay2"; depends=[jsonlite openssl sf]; }; rgw = derive2 { name="rgw"; version="0.3.0"; sha256="0hzkajmvqkmv6c238rdgyc6g16h96d5a0lnajnn5m87j0gwsl6wa"; depends=[]; }; rhandsontable = derive2 { name="rhandsontable"; version="0.3.8"; sha256="07fj6npq65pq836vdwblkhprdaq4i4f13cwdmm9gmxrnk72xj7lh"; depends=[htmlwidgets jsonlite magrittr]; }; rhcoclust = derive2 { name="rhcoclust"; version="1.1.0"; sha256="1d9a29h4h6z04vjjdfi0sx7wpl8iw5zg2ymjpjlppzbbzzq2l8n2"; depends=[fields igraph]; }; @@ -15384,23 +15620,24 @@ in with self; { 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]; }; - rhosa = derive2 { name="rhosa"; version="0.1.0"; sha256="0aygdp7xp5hvr4i1s0isgbbr3pd164aj1px9bns6vdh0svq533qg"; 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.1"; sha256="05b4phrny85fshismspjbaz1h0klg1fpy4b309si94pnqffxaqx6"; depends=[assertthat callr cli crayon desc digest httr jsonlite parsedate pillar prettyunits processx R6 rappdirs rcmdcheck rematch tibble uuid whoami withr]; }; rhymer = derive2 { name="rhymer"; version="1.1.0"; sha256="00piml975chmmm3ipskzhfbbp5sq47yg5a78hsisssbzwwxsmbs0"; depends=[httr jsonlite]; }; - rhype = derive2 { name="rhype"; version="0.0.1"; sha256="148ssg1rxhw5wsm989fws5dc6lrx23nai22awxmpr1lx06khrm6a"; depends=[R6]; }; + rhype = derive2 { name="rhype"; version="0.2.0"; sha256="0grfa62d54x129l08v22ybfvjvvlzv5la5yxp9wi1a203r792xkr"; depends=[Matrix R6 RSpectra]; }; ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; }; ri2 = derive2 { name="ri2"; version="0.2.0"; sha256="0zadczx7awymn420hf15sci5z1hq5rpid866gpa1wmrhcyh177nh"; depends=[estimatr generics ggplot2 pbapply randomizr]; }; + riAFTBART = derive2 { name="riAFTBART"; version="0.2.0"; sha256="1i2npxr1riip4ac9vlm8bqf72pp3zvl9mhni6w3r1qh53hx8d3q7"; depends=[BART cowplot dbarts doParallel dplyr foreach ggplot2 magrittr MASS MCMCpack msm nnet stringr survival tidyr twang]; }; ribd = derive2 { name="ribd"; version="1.3.1"; sha256="1an3cifgvw7rrsq1plfycpk1yhlsncn83s2f9xl52161iyljwj6g"; 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.1"; sha256="0p5lv9gwy3qkwagj946y60v6qwhpav3iqid4kgfbcxwczjybdapg"; depends=[assertthat backports cli curl data_table fansi fst glue jsonlite openssl prt readr rlang tibble vctrs]; }; - ridge = derive2 { name="ridge"; version="3.0"; sha256="04wifb1dpmkikir2f4qski7l1v86ld19i8p2lk6zx69ww5wwlvlh"; depends=[]; }; + ridge = derive2 { name="ridge"; version="3.2"; sha256="08bl83rbv2rqd96383ymanqk2xy0yr6blklrj6rzi95zvw2xq6jp"; depends=[]; }; ridigbio = derive2 { name="ridigbio"; version="0.3.5"; sha256="0526nscxynl3857zybpms1wr3230qby29kxglm919pcdvpjb5kz5"; depends=[httr jsonlite plyr]; }; ridittools = derive2 { name="ridittools"; version="0.1"; sha256="1m9xbwxb277l4cd85qxmpw66gyavpwamgwr8kyf8vqarzfbwiilr"; depends=[]; }; - riem = derive2 { name="riem"; version="0.2.0"; sha256="1b0kag1drn45lmy786xqr94zsbfk16xp4ia9284x753hzcggnfqd"; depends=[httr jsonlite lubridate tibble]; }; + 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.1"; sha256="0cjk03llklml3h6dmdahdbnxanynii64q664fax62dbkncxg5gqa"; depends=[Exact plyr sandwich survival tibble]; }; riingo = derive2 { name="riingo"; version="0.3.1"; sha256="1ww9ps0v1yga9dwb68crbhf56xw2svl7az95ifrdrswyyikj02vj"; depends=[crayon glue httr jsonlite purrr rlang tibble vctrs]; }; @@ -15414,13 +15651,14 @@ in with self; { rioja = derive2 { name="rioja"; version="0.9-26"; sha256="02af6is38nakzr1hf9688n32m5glk1jyp2d9p4irn0mzk7r6r976"; depends=[mgcv vegan]; }; ripserr = derive2 { name="ripserr"; version="0.1.1"; sha256="1rwsd1yi5vrzdscjgr27fw0d1a6nkc8g2w5hqgqijiwm25h4wl17"; depends=[Rcpp]; }; rise = derive2 { name="rise"; version="1.0.4"; sha256="12r7mbaxp9pjypbpjxlsbqg7spw80gjgm2w0lsvgvclffc50a6ni"; depends=[dplyr ggplot2]; }; - riskCommunicator = derive2 { name="riskCommunicator"; version="0.1.0"; sha256="1f8nfha6sgn52f3qvb2bkawv6c8ivrm5n6sy1ggx9337xjl35baz"; depends=[boot dplyr ggplot2 gridExtra magrittr purrr rlang tidyr tidyselect tidyverse]; }; + riskCommunicator = derive2 { name="riskCommunicator"; version="1.0.0"; sha256="0j4pdz4b0mq116yy9zyz4bf5avvp74q3a026b5hn7dr2xhvp4hb3"; depends=[boot dplyr ggplot2 gridExtra 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="2021.10.10"; sha256="1fhkn9qz7h95qzb2fcai0smy4vsvj7f7538g5jk0pa7wqr8z6wc4"; 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"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; }; riskclustr = derive2 { name="riskclustr"; version="0.3"; sha256="13fl00g0hzcl4vqvl8zl4m5bpp14948yvd4i4dbdrg1h8ym30ir5"; depends=[aod Matrix mlogit stringr]; }; + riskmetric = derive2 { name="riskmetric"; version="0.1.2"; sha256="004a888y0srvaazq90l3v1q11qfl927h87420fs03zklkq27bvr1"; depends=[backports BiocManager covr cranlogs curl devtools httr memoise pillar pkgload tibble urltools vctrs xml2]; }; risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; }; riskyr = derive2 { name="riskyr"; version="0.3.0"; sha256="07fm3gmjydby3mxivwr3rbg6q7fbjlnggfk26sfiqb2wl08dmx6j"; depends=[]; }; ritis = derive2 { name="ritis"; version="1.0.0"; sha256="0dk1hpj2cahlw4lcdjnnllpnvdimaml57sfcw07iz2s0f8c24yrj"; depends=[crul data_table jsonlite solrium tibble]; }; @@ -15437,9 +15675,9 @@ in with self; { rjdqa = derive2 { name="rjdqa"; version="0.1.1"; sha256="0d7jv3a2a7p7h6jnr5znln06x6m4mksb6cy44xdxir1pwcd1z6br"; depends=[plotrix RJDemetra XLConnect]; }; rje = derive2 { name="rje"; version="1.10.16"; sha256="1a9lxikc5n4sb5fzlw8w8ys65npvlvqfail3mq5zi46smd1s9qp8"; depends=[knitr]; }; rjmcmc = derive2 { name="rjmcmc"; version="0.4.5"; sha256="14rzvp6z5avlcnmlmvb6w4gvlh6v4ncbcai3v4c4svnjv555vz45"; depends=[coda madness mvtnorm]; }; - rjpdmp = derive2 { name="rjpdmp"; version="1.0.0"; sha256="017cbrrmgh4p5almsyxrp86yg3kkg59kz5snnb1xb4qr068zfpm7"; depends=[data_table Rcpp RcppArmadillo]; }; + rjpdmp = derive2 { name="rjpdmp"; version="2.0.0"; sha256="0r0r58zrwab4zxhgbfhh4qk6vbbza00m8h73mz70f5kqp786i9wy"; depends=[data_table Rcpp RcppArmadillo]; }; rjqpd = derive2 { name="rjqpd"; version="0.2.3"; sha256="14vbp9s2859h4n3m3bq830nvxvk58h3mvvdnb27qsalbcfwd94v5"; depends=[]; }; - rjson = derive2 { name="rjson"; version="0.2.20"; sha256="0v1zvdd3svnavklh7y5xbwrrkbvx6053r4c5hgnk7hz7bqg7qa1s"; depends=[]; }; + rjson = derive2 { name="rjson"; version="0.2.21"; sha256="1qm27r1w677zg31gsiln60hcciszbymkw78cnaq7s36cbk9mcawq"; depends=[]; }; rjstat = derive2 { name="rjstat"; version="0.4.1"; sha256="0kqnl4wizmain70ady982aldhscf24870shvf3sviknplshhgk8j"; depends=[checkmate jsonlite]; }; rjwsacruncher = derive2 { name="rjwsacruncher"; version="0.1.2"; sha256="0kqr2pd3smqxx0h35k8mf7wamdqpqrncjhmvbiap8bwbkhm4sqhb"; depends=[XML]; }; rkafka = derive2 { name="rkafka"; version="1.3"; sha256="1h6f7wgz8qgh76p9w9vzcvcaa1piwnrx331gm1wxa1m31xs466jd"; depends=[rJava rkafkajars RUnit]; }; @@ -15448,15 +15686,16 @@ in with self; { rknn = derive2 { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; }; rkt = derive2 { name="rkt"; version="1.6"; sha256="1sqij8ivjrrb1lii3jwvgsx9zqv47ib1lhrh6zvvh5a67didwrih"; depends=[]; }; rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; }; - rlang = derive2 { name="rlang"; version="0.4.12"; sha256="05cr08smr8dlk10m810rw4qi1yhgnny83rwkxib0l4my71br29ia"; depends=[]; }; - rlas = derive2 { name="rlas"; version="1.5.0"; sha256="0i1sp8r9r3m9m0r0bn741l9dnz4prn63hfxxzf9i8pshqp1nnnvk"; depends=[BH data_table Rcpp]; }; + rlang = derive2 { name="rlang"; version="1.0.2"; sha256="1k6pzl2x80pycpllvd8n1k62h5cfdwc0hsdwvbicrcxhdwz7rs4d"; depends=[]; }; + rlas = derive2 { name="rlas"; version="1.5.2"; sha256="0ib7nd9fbqyw0bs0p0lh67ml1zfl70h45iyasqv2wvwrmsrh4hy9"; depends=[BH data_table Rcpp]; }; 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]; }; rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; }; rle = derive2 { name="rle"; version="0.9.2"; sha256="0sagl0jggg40lihzy7pfq4593rfvc3b3f7g6ggi85s7n18qvwg40"; depends=[]; }; rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; }; rlecuyer = derive2 { name="rlecuyer"; version="0.3-5"; sha256="09mniai7v8gapr6hd3zm8sm3vi1zcyhgym389904ykb2yx7l68s7"; depends=[]; }; rless = derive2 { name="rless"; version="0.1.1"; sha256="0ham8kf2hbswrcnc5i5b3svywdwq3kwp9n66n4k9sllahl4x9jdn"; depends=[V8]; }; - rlfsm = derive2 { name="rlfsm"; version="1.0.3"; sha256="0pnxy4gnkbk2alm4bjk6i1yik880li1jqkq63dwm7g441fhx30kx"; depends=[doParallel foreach ggplot2 plyr Rcpp Rdpack reshape2 stabledist]; }; + rlfsm = derive2 { name="rlfsm"; version="1.1.1"; sha256="0pv6136b1b5q46q75msjc6bzzx1wcq23313kv1b3bvpwpiyw52gn"; depends=[doParallel foreach ggplot2 plyr Rcpp Rdpack reshape2 stabledist]; }; 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]; }; rlist = derive2 { name="rlist"; version="0.4.6.2"; sha256="15q99rhbbjq8zd976yjmfnny45dd5fg2p2dv1sljg2kwi66nbppb"; depends=[data_table jsonlite XML yaml]; }; rlmDataDriven = derive2 { name="rlmDataDriven"; version="0.4.0"; sha256="1fhh2siafpqmvpxi2piccxvvn5n38s5d6as6iyn43rgpsslswc8g"; depends=[MASS tseries]; }; @@ -15472,7 +15711,7 @@ in with self; { rmapzen = derive2 { name="rmapzen"; version="0.4.3"; sha256="1n44l4sj6s78nr3hqidabkyg9pradk9c1mqfvzhanj2nrfdrwnqj"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp 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.11"; sha256="0xcpg9d009a71p5i6jczw02qcp907p5d52lp6vclrsp7019jawck"; depends=[evaluate htmltools jquerylib jsonlite knitr stringr tinytex xfun yaml]; }; + rmarkdown = derive2 { name="rmarkdown"; version="2.12"; sha256="1476b2wl60p3bq4llf6jzpj7c02fp6v04l2865v3qj32m3nskay3"; depends=[bslib evaluate htmltools jquerylib jsonlite knitr stringr tinytex xfun yaml]; }; rmatio = derive2 { name="rmatio"; version="0.16.0"; sha256="1ar8736x5ww4cky4qp8fxlwa7p00yycs31ryrqsmbwhwvg2ddlkk"; 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.4.5"; sha256="018d3rfh2688yqkarcmxqqfbmmzcmj6q3hwinns4kj6xnnlmv1xr"; depends=[psych RColorBrewer]; }; @@ -15487,11 +15726,11 @@ in with self; { rmdwc = derive2 { name="rmdwc"; version="0.2.1"; sha256="0zbwfi0rsx7mhk6s5798qg1zr7yv8hgw8qazznsd30diyprnyzbq"; depends=[knitr]; }; rmeta = derive2 { name="rmeta"; version="3.0"; sha256="0vkbnxp579v8zmcv1isdbzj5swpr6fq17zwparxcvzswjc2x9ydr"; depends=[]; }; rmetalog = derive2 { name="rmetalog"; version="1.0.3"; sha256="1naqhv81gdcgl2vi2sa3nb006mn8dxc0rdc49v321a5b10bybzvr"; depends=[ggplot2 lpSolve]; }; - rmgarch = derive2 { name="rmgarch"; version="1.3-7"; sha256="108wrbqj4c02c9cyv5m5xlswb1mlfdrhggb005sixr2dcqghb163"; depends=[Bessel corpcor ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; }; + rmgarch = derive2 { name="rmgarch"; version="1.3-9"; sha256="0sg10j4jp74s65lzs2da2qqdcwgkf71rss9p7f1b14n2yz7xdf1v"; depends=[Bessel corpcor ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; }; rmi = derive2 { name="rmi"; version="0.1.1"; sha256="1y0395l9lhskdrk3x9ps2dmv0sznsba0n6a9fmma33dc9dhywgf9"; depends=[BH Rcpp RcppArmadillo]; }; rminer = derive2 { name="rminer"; version="1.4.6"; sha256="1xydc43is756cy4vsm4k4micj88hhqgyrhb8cmvgv1y8zfrzg2qz"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; }; rminizinc = derive2 { name="rminizinc"; version="0.0.8"; sha256="0yyg8ikdlksxlsc8ms4gb8dvpdjk26np6cpm5a7rjp748x8is6qx"; depends=[checkmate R6 Rcpp rjson rlang rlist]; }; - rmio = derive2 { name="rmio"; version="0.3.0"; sha256="0gnd6n43waij1ikr1phv50wqk86zh0kgsdclkm159yr4hflqig01"; depends=[]; }; + 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.1.7"; sha256="0dg6y9zvky5dy0b9948xdpg9cfbsczk0hm98lnl6wnikbvphijv4"; depends=[cdata dplyr ecr ggplot2 plotly reshape2]; }; rmpw = derive2 { name="rmpw"; version="0.0.4"; sha256="1a49rvdwvmccv4gfir48fw0b9jyrpc2q9zfyk5j9b7nxsx6x7abl"; depends=[gtools MASS]; }; @@ -15502,7 +15741,7 @@ in with self; { rmsfuns = derive2 { name="rmsfuns"; version="1.0.0.1"; sha256="18bpj7xh3kc7pl6ivi3cripam26bsaf9r9099cjf22qndvy18hb6"; depends=[dplyr magrittr PerformanceAnalytics purrr readr tbl2xts xts zoo]; }; rmt = derive2 { name="rmt"; version="1.0"; sha256="165cqnwqr0dx7b8dgq7xlfk4j55p9l6dr5b2rzyvfy5l23k4kckn"; depends=[]; }; rmumps = derive2 { name="rmumps"; version="5.2.1-14"; sha256="1bl3wap6qjdryyrxqv85qnb9dv7xkx56c5y8qsaj2979748gwjjj"; depends=[Rcpp]; }; - rmutil = derive2 { name="rmutil"; version="1.1.5"; sha256="1xmjmzws4wb0ksg4z4srzyk6mk2l1cr2ina9rznsdsyssr1ycxv0"; depends=[]; }; + rmutil = derive2 { name="rmutil"; version="1.1.9"; sha256="0g1kf2bf8f34r9qw5x4810kxg6lkml5nh2lnmdmwnkrrb10cqs1s"; depends=[]; }; rmweather = derive2 { name="rmweather"; version="0.1.51"; sha256="0qd49lr12hc39dwg348b021aqxw57pfcb9xxhp51fvnw6gw6bgqd"; depends=[dplyr ggplot2 lubridate magrittr pdp purrr ranger stringr strucchange tibble viridis]; }; rmytarget = derive2 { name="rmytarget"; version="2.4.0"; sha256="1csl5b76r706gzvzhqgg4pdznbdl4i3b0srazwa7xdfc6zbrzljp"; depends=[dplyr httr lubridate purrr stringr tidyr]; }; rnassqs = derive2 { name="rnassqs"; version="0.5.0"; sha256="1mbkv32zidax9i6km93bbi3m7xpnsy805cz4ikdrid84qg94an09"; depends=[httr jsonlite]; }; @@ -15516,12 +15755,12 @@ in with self; { rngtools = derive2 { name="rngtools"; version="1.5.2"; sha256="0kd7x214cqw7hzpmk1iqy1bn7j6x0ady0yz2hsdbclbq9k57d33z"; depends=[digest]; }; rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; }; rnmamod = derive2 { name="rnmamod"; version="0.1.0"; sha256="1ayl5cry7lxdf1zscdrxdf50y78scr4qdkghdki6srkx2r645wx0"; depends=[coda dplyr fdrtool gemtc ggfittext ggplot2 ggpubr ggrepel knitr MASS mcmcplots netmeta pcnetmeta R2jags reshape2 scales writexl]; }; - rnn = derive2 { name="rnn"; version="1.4.0"; sha256="0k960jylbvg8r453430d8dpdzydkk3yr5np8rxkay79533ikrcgy"; depends=[shiny sigmoid]; }; + rnn = derive2 { name="rnn"; version="1.5.0"; sha256="109h3zfpyl3jir27vq1v6z5b3ffjszxvdygq6l787apl5n3j8par"; depends=[shiny sigmoid]; }; rnoaa = derive2 { name="rnoaa"; version="1.3.8"; sha256="12mrvvq93535pk9g52h0sl5wdlw0wpqdchghi24fjdr62r44p5sp"; 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.4"; sha256="0lq9c5in0pf3km6zvfnn71wbh34lk3hgav0b9waspmzsgki8fvl1"; depends=[curl data_table httr jsonlite magrittr plyr raster rgdal sp tibble XML]; }; rnr = derive2 { name="rnr"; version="0.2.1"; sha256="1z9bab3qmq8d79bcvjzldbxlah2w8mqp2ifd0cn1348dafwa0dhi"; depends=[assertthat purrr]; }; rnrfa = derive2 { name="rnrfa"; version="2.0.4"; sha256="0sy64bgb94ksgcy37kmj61iphf66i0jpx0qlrcsr24zr92syc1n2"; depends=[curl ggmap ggplot2 httr jsonlite lubridate rgdal sp tibble zoo]; }; - roadoi = derive2 { name="roadoi"; version="0.7.1"; sha256="1diprwir4agp2ifcgfsla1kd5m0y5cnc7ixhh6pqdvlgax5wx96w"; depends=[dplyr httr jsonlite miniUI plyr purrr rlang shiny tibble tidyr]; }; + roadoi = derive2 { name="roadoi"; version="0.7.2"; sha256="1q2mkd7r5aqvahx7rrzv58nd6d13gvlw7kjidqhm7z89na94pn8w"; depends=[dplyr httr jsonlite miniUI plyr purrr rlang shiny tibble tidyr]; }; 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]; }; robFitConGraph = derive2 { name="robFitConGraph"; version="0.1.0"; sha256="092nc0xnjs2zxd9ij0dl1xggb8mwl8nly284yjhhygmwlwsvhzxm"; depends=[MASS mvtnorm Rcpp]; }; @@ -15533,9 +15772,9 @@ in with self; { robeth = derive2 { name="robeth"; version="2.7-6"; sha256="1x0hzgq7jwl83wwmy581ia8009v0j95aksnr5ywpflnqm76rj6v2"; depends=[]; }; robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; }; robfilter = derive2 { name="robfilter"; version="4.1.2"; sha256="0mvpaf6g694b7175bl3yr6lxbwla4pwp7g4y34qb4klgl5n3nw03"; depends=[lattice MASS robustbase]; }; - robin = derive2 { name="robin"; version="1.0.3"; sha256="1axn687pc6ym5lbrqhsfjw9h5p5famgzqp3q505drysn33fv6nlw"; depends=[DescTools fdatest ggplot2 gprege gridExtra igraph networkD3 qpdf]; }; + robin = derive2 { name="robin"; version="1.1.0"; sha256="11z09g4nzswdqhx5w0vmx1gmxkh0k451hr50avcny6q1r7hykjk6"; depends=[DescTools fdatest ggplot2 gprege gridExtra igraph networkD3 qpdf]; }; robis = derive2 { name="robis"; version="2.8.2"; sha256="0nlvp9w9j2kyv0rrsjkzr3sj77ciz8ink3yr615sjc69iqic34aw"; depends=[curl data_table dplyr ggplot2 httpcache httr jsonlite leaflet mapedit purrr rlang sf stringr tibble tidyr tidyselect xml2]; }; - robmed = derive2 { name="robmed"; version="0.9.0"; sha256="0xjq97jy72hcc03s7z5ckl4f9jwsy2sbhwsr8r7hxgrcc8g1zvwf"; depends=[boot ggplot2 quantreg robustbase shiny sn]; }; + robmed = derive2 { name="robmed"; version="0.10.0"; sha256="020l67zrijcmbfp4nd0hbip1sb5yxhjmjhjk9b5vbk4mz3iqvf4m"; depends=[boot ggplot2 quantreg robustbase sn]; }; robmixglm = derive2 { name="robmixglm"; version="1.2-2"; sha256="117dhnnj55hihpzim45dw3cjm4ma6w21d8j77fybyri2bmpvlypa"; depends=[actuar bbmle boot doParallel doRNG fastGHQuad foreach MASS numDeriv Rcpp VGAM]; }; robnptests = derive2 { name="robnptests"; version="1.0.0"; sha256="0bk3ngwav3r00lf2lb8hq2h578mkfc48gcm845lyxyn7i87vglgg"; depends=[checkmate gtools Rdpack robustbase statmod]; }; robomit = derive2 { name="robomit"; version="1.0.6"; sha256="1yma6m4bxy3hikc9kx7mslqgq1fpi4my7qij9pz77ag836r9hcxm"; depends=[broom dplyr ggplot2 plm tibble tidyr]; }; @@ -15544,11 +15783,11 @@ in with self; { robregcc = derive2 { name="robregcc"; version="1.1"; sha256="06fapmc3jfrfdqvz02jr12dk1d5iw6s3mcb13jz1nm2bybw6r04a"; depends=[magrittr MASS Rcpp RcppArmadillo]; }; robsel = derive2 { name="robsel"; version="0.1.0"; sha256="0vf9hry11hf6bi4pz18c6gh9janx0v6shm2m14kckscvh80z3k5b"; depends=[glasso Rcpp RcppEigen]; }; robservable = derive2 { name="robservable"; version="0.2.1"; sha256="0v4d6yavs58nvwy9bz8wgmm1qb2cqsxkj7rbwngwfzr07ryznd2s"; depends=[htmlwidgets jsonlite]; }; - robslopes = derive2 { name="robslopes"; version="1.0.2"; sha256="04767ggjjsgm31ysk5xw8jvdnjdbk4fmrrsi83ksz746kl0xafzp"; depends=[Rcpp RcppArmadillo]; }; - robsurvey = derive2 { name="robsurvey"; version="0.1.1"; sha256="0rf2sd7maz565hlgpyhvkswqyck01hif4mg5isbnnky9n3nc98pi"; depends=[survey]; }; + robslopes = derive2 { name="robslopes"; version="1.1.0"; sha256="0nlz67nmrb9p1a71xnfdfx8c92h0aag68x4xxlvk464nf6s661qv"; depends=[Rcpp RcppArmadillo]; }; + robsurvey = derive2 { name="robsurvey"; version="0.2"; sha256="0ipkl3bvnymkrh1apnpidxwxpb1xmw5s66wwxs0kbwvsp6l6qh26"; depends=[KernSmooth survey]; }; robumeta = derive2 { name="robumeta"; version="2.0"; sha256="1ynlfxlzh442jd1cf02j0f948m16d536a30gb4bf7208baqri1vg"; depends=[]; }; - robust = derive2 { name="robust"; version="0.6-1"; sha256="0z8i0qqlsa6vpl457qir3dlsynhjfn2g22436d776vxwyqjx4vs9"; depends=[fit_models lattice MASS robustbase rrcov]; }; - robust2sls = derive2 { name="robust2sls"; version="0.1.0"; sha256="149wdrjjpzwm2zi1a2wrv6qcdxya77dz1i7d2vqz4vx4qzw55hf6"; depends=[AER doRNG foreach pracma]; }; + robust = derive2 { name="robust"; version="0.7-0"; sha256="1fc4h19b7gn9ya2j2ia8vfgsycwlyc23frj54k11dr45w4qaq6jy"; depends=[fit_models lattice MASS robustbase rrcov]; }; + robust2sls = derive2 { name="robust2sls"; version="0.2.0"; sha256="0rlajfhrxwap73xdmqdp9gy6qj4vki13i0nqahikr54ky9zypq3r"; depends=[AER doRNG foreach MASS mathjaxr pracma]; }; 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=[]; }; @@ -15560,7 +15799,7 @@ in with self; { robustfa = derive2 { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; }; robustgam = derive2 { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; }; robustlm = derive2 { name="robustlm"; version="0.1.0"; sha256="17l2kr9dc3z02b2jswfxal13md4xfpz4sqjfg6kyg6ilab1cfd06"; depends=[MASS matrixStats]; }; - robustlmm = derive2 { name="robustlmm"; version="2.4-5"; sha256="0y8bjr9xbgnwbg2rilpgfqrdv45g8zxqfajnkfi4r7v0hsr20lz2"; depends=[cubature fastGHQuad ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen robustbase xtable]; }; + robustlmm = derive2 { name="robustlmm"; version="2.5-0"; sha256="0y15w5vd16nfvs3mmvp496hhvgajfgnpgz6vl3vp5yhs1q2xkynk"; depends=[cubature fastGHQuad ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen robustbase xtable]; }; 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]; }; robustreg = derive2 { name="robustreg"; version="0.1-11"; sha256="08c6dyzki68hzl006s12bkjiirlw2n2isirjh8b79sd6zjrjlh72"; depends=[Matrix Rcpp RcppArmadillo]; }; @@ -15572,16 +15811,17 @@ in with self; { rocc = derive2 { name="rocc"; version="1.3"; sha256="1j15l28c7kv7x850ycjprqi5gpbsl6wfv97h9lbrx11q5l4r9ivb"; depends=[ROCR]; }; roccv = derive2 { name="roccv"; version="1.2"; sha256="18kq2gzcbz97dw168xppql8k3slpkfl8yv1d8ac48damlhvipif1"; depends=[glmnet pROC]; }; rock = derive2 { name="rock"; version="0.5.1"; sha256="1abyr9i2p1xjll6cry8hmbgskwr10ki4r0zw29qg8iz2rpxl0zpp"; depends=[data_tree DiagrammeR DiagrammeRsvg dplyr ggplot2 glue htmltools markdown purrr yaml yum]; }; - rockchalk = derive2 { name="rockchalk"; version="1.8.144"; sha256="07dp1n155b9gfvk8l30h6bhjbhbylsjxfzns08mryn4mxj3nqpnb"; depends=[carData kutils lme4 MASS]; }; + rockchalk = derive2 { name="rockchalk"; version="1.8.151"; sha256="17mfaxn3gj0vac5wdmsjj2z2668cszbpvan7hnxp7ic9bvsm1w2y"; depends=[carData kutils lme4 MASS]; }; rocker = derive2 { name="rocker"; version="0.3.0"; sha256="07vlfhp3m8k4ykfmd513ryqk0005mpj2qi64wrpkcg760rbs6wjv"; depends=[DBI R6 sodium]; }; rockr = derive2 { name="rockr"; version="1.0.0"; sha256="190xaxcbb7miqw5mxyfqqlb2vzacifc8a7a3cqfdlpxra4d4jc25"; depends=[httr jsonlite mime progress]; }; - roclang = derive2 { name="roclang"; version="0.1.2"; sha256="139m7biiidcbc3a9nnp5qpdysszrzldhf6dp64rfshp3rjpfssiq"; depends=[dplyr magrittr purrr rex rlang roxygen2 stringr tibble tidyr]; }; + roclang = derive2 { name="roclang"; version="0.1.4"; sha256="1wjpcdlqkfklllxql010yk2v0b6xvlrvmhdfm7ckwry33ijpi14y"; depends=[dplyr magrittr purrr rex rlang roxygen2 stringr tibble tidyr]; }; rocnp = derive2 { name="rocnp"; version="0.1.0"; sha256="1xqlmihhgjn6g3kabgmdx1qn18sxqd43sq3nb39i8pbwvaxhjqjr"; depends=[dplyr glue magrittr purrr rlang stringr tibble]; }; rococo = derive2 { name="rococo"; version="1.1.7"; sha256="1fp3kk5j9kc0vyr50rlbsxjc9p3qz5137sifxsbd297p7zj1fcs2"; depends=[Rcpp]; }; rocsvm_path = derive2 { name="rocsvm.path"; version="0.1.0"; sha256="1pd59bzcz96sxpp725pqa7pjh2gdrfapbilp4wccjkf5290zw56v"; depends=[quadprog svmpath]; }; 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]; }; - roger = derive2 { name="roger"; version="0.99-1"; sha256="190q4ahygfj7czf2gmfb8r73wd8ghf57acx5dq2p9x2ir1giwdkr"; depends=[]; }; + rofanova = derive2 { name="rofanova"; version="1.0.0"; sha256="0w8c5c5q0s2qv1b4nxgf8y1z3g0l9c6jr6i0280b5mp9in9wn8a6"; depends=[abind fda_usc Rcpp RcppArmadillo robustbase]; }; + roger = derive2 { name="roger"; version="0.99-2"; sha256="0h6ym9s3rjyj6a2rbsmr1g9bxxn0bfds0cqfqs8m4bpy9sd8jysi"; depends=[]; }; roistats = derive2 { name="roistats"; version="0.1.1"; sha256="1278cap5il85s1qls3sc0f4gqq2hi80442qidnsc6d8r3l4ba3fr"; depends=[dplyr magrittr purrr rlang tidyr]; }; roll = derive2 { name="roll"; version="1.1.6"; sha256="1crzr0kqdls08n6i3769zrxbxvh2m4hv5k3xi6ky6ps8hhicwqc9"; depends=[Rcpp RcppArmadillo RcppParallel]; }; rollRegres = derive2 { name="rollRegres"; version="0.1.3"; sha256="1rf6hdbndindq6kr5yzyqq4jy1c11shfdvjb8mwm957dd0kbs3rx"; depends=[checkmate Rcpp RcppArmadillo]; }; @@ -15600,7 +15840,7 @@ in with self; { ropenblas = derive2 { name="ropenblas"; version="0.2.10"; sha256="1709kk63d8xv923phadnk30pc895syf4rmfip7v9y3cn734ww38g"; depends=[cli fs getPass git2r glue magrittr pingr RCurl rlang rstudioapi rvest stringr withr XML]; }; ropendata = derive2 { name="ropendata"; version="0.1.0"; sha256="1bv6y241abs6pb4wq5ybx9x4zh72kf8ffs3vlcgdsmhw4jwrsxdl"; depends=[httr jsonlite]; }; ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; }; - roperators = derive2 { name="roperators"; version="1.1.0"; sha256="0klmk1jmh1iysgf345qa6qyjmn1pkz072ha254k90flprgicg7c6"; depends=[]; }; + roperators = derive2 { name="roperators"; version="1.2.0"; sha256="1l9xyb07wi2bls2037a2428hzqbsay01yd3rzviznxcnaarak5ck"; depends=[]; }; ropercenter = derive2 { name="ropercenter"; version="0.3.1"; sha256="1lpqwlw1wqj1whv0wma2y4h16pc15f4c38icwq63nhicn4whzr5w"; depends=[dplyr foreign haven magrittr readr rio RSelenium stringr tibble tidyr]; }; roprov = derive2 { name="roprov"; version="0.1.2"; sha256="16w9i7svlkn2wbv35890f1zpcxilj0ar28d2xrdvmx7ni9vrz61q"; depends=[CodeDepends fastdigest igraph]; }; roptim = derive2 { name="roptim"; version="0.1.5"; sha256="0qcdvs62k9b0dsa68z86yn90ps5aqhxgwg43p2pjml6jjid4rjn9"; depends=[Rcpp RcppArmadillo]; }; @@ -15625,9 +15865,9 @@ in with self; { roxygen2md = derive2 { name="roxygen2md"; version="1.0.0"; sha256="1gvrfy0sk5qi8d93zxj5f7xgnnw0w38zyxdik4ckf0pkk0zdm27a"; depends=[desc devtools enc rex rlang tibble usethis withr]; }; roxytest = derive2 { name="roxytest"; version="0.0.1"; sha256="166m0pklgryh3vildg0bvzh9gs3p71sf61ivgkvkvyy9vhvnp3jf"; depends=[roxygen2]; }; royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; }; - rpact = derive2 { name="rpact"; version="3.2.0"; sha256="1p55jp6bnv2faa8k46bw23babjmxv6qqqmh6fmwiabv3v4g5dd38"; depends=[Rcpp]; }; + rpact = derive2 { name="rpact"; version="3.2.3"; sha256="0znpxqnhvz3vkhv5y3qga8dv4i1b4dgbim1lfqpfq29jw906hsis"; depends=[Rcpp]; }; rpanel = derive2 { name="rpanel"; version="1.1-5"; sha256="0656hxj17arjma8sk0xrjicv6mh7iyxhrvj36q4wdvxwlrvm76p3"; depends=[]; }; - rpart = derive2 { name="rpart"; version="4.1-15"; sha256="0p5frya963ppn476p5dxs2mnarsalksr6gw9zzmjsn8ikq7bx3ib"; depends=[]; }; + rpart = derive2 { name="rpart"; version="4.1.16"; sha256="0p22657j6ps6z1dn0ja2fhq4k5xd1rv3cpwzk6nmjd2si8jpbv17"; 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.0"; sha256="0pn1fkhpv4dkhh7057kjiwmzzrsfsw58n945j357mhdvrb0a1ara"; depends=[rpart]; }; rpart_utils = derive2 { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; }; @@ -15657,24 +15897,24 @@ in with self; { rprime = derive2 { name="rprime"; version="0.1.2"; sha256="1h54vclc800pir3vxqcq4cmmxy9fcar1fydqmba2dzpj8dvlad7v"; depends=[assertthat plyr stringi stringr]; }; rprintf = derive2 { name="rprintf"; version="0.2.1"; sha256="0rwqpln0igxb4m6d6jyp7h3shfb8sbp0kj7cgkffjp88hn9qm4h3"; depends=[stringi]; }; rprojroot = derive2 { name="rprojroot"; version="2.0.2"; sha256="07wy07yhms8zln9qb0iwx69dq08h4lrdi8kavjcplfxcskq638az"; depends=[]; }; + rprojtree = derive2 { name="rprojtree"; version="1.0.0"; sha256="0414srpgx2jgf8jaznpin131hiih17avx45vggf812b3xcicm11b"; depends=[dplyr jsonlite magrittr rjson]; }; rpsftm = derive2 { name="rpsftm"; version="1.2.7"; sha256="0ncf9ci39pd7p048cgvhl6phhk975xwyjm4aqs1b4hjy1nml4iz2"; depends=[ggplot2 survival]; }; - rpsychi = derive2 { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; }; rptR = derive2 { name="rptR"; version="0.9.22"; sha256="0vvjc6qiq71d5wckl77z606q1fp43mgrfzp1bxcab96n5whb2r9k"; depends=[lme4 pbapply]; }; rpubs = derive2 { name="rpubs"; version="0.2.2"; sha256="18cnzhcvm7gx4k01ysqay53smrf8xqlbaszq41mny5c7qqh1fvpz"; depends=[rvest xml2]; }; - rpymat = derive2 { name="rpymat"; version="0.1.1"; sha256="067czg4wkpkgrrw78j9r62i1b82bzfsxgx4mdgab2wq2szdij6rn"; depends=[fastmap rappdirs reticulate]; }; + rpymat = derive2 { name="rpymat"; version="0.1.2"; sha256="1wq60xspjfzmpax79x6sd3bwa3m63mfklpdv7x797p1d0v636lhy"; depends=[fastmap glue IRkernel jsonlite rappdirs reticulate rstudioapi]; }; rqPen = derive2 { name="rqPen"; version="2.2.2"; sha256="077kdvfdyp5h8630k8jigbz8mfyby8vkjiqxpqv0wfi6cqcjlaf2"; depends=[quantreg regpro]; }; - rqdatatable = derive2 { name="rqdatatable"; version="1.3.0"; sha256="0q10fi6xvw7495yrv6y8zzda31xyl6nbinq0dn2brfjp66w864k7"; depends=[data_table rquery wrapr]; }; - rquery = derive2 { name="rquery"; version="1.4.7"; sha256="0m57y5wfg1mvla4d6a8mnxnhz973k1nvz899rbxnxaqfa7azxp62"; depends=[wrapr]; }; + 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]; }; rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; }; rr2 = derive2 { name="rr2"; version="1.0.2"; sha256="099vjg91ni2bnxlra18pvgsvzrl28zrj639cdjrh3wkpqv99d04q"; depends=[ape lme4 Matrix nlme phylolm]; }; rrBLUP = derive2 { name="rrBLUP"; version="4.6.1"; sha256="1ny48ra25rzx3k69pmzpd31ka2zhqyqiq1v7ann862j3ris0w8z9"; depends=[]; }; - rrapply = derive2 { name="rrapply"; version="1.2.3"; sha256="042b7q94lrprxxcyjw8cn3y20dxvq77yk0cihn2xk885gawhwxm6"; depends=[]; }; + rrapply = derive2 { name="rrapply"; version="1.2.4"; sha256="06kdkclvcxyw5hsy18azz7345140079r134dksyb6wv94aiplzkm"; depends=[]; }; rrat = derive2 { name="rrat"; version="1.0.0"; sha256="1j1jd32pgggn5cqv66l63sw5p4hblgpznf33wd0zdbfapwy8rx4r"; depends=[quantreg]; }; - rrcov = derive2 { name="rrcov"; version="1.6-0"; sha256="0i69gv55c86gkclwhch0jzdfyb20l20mx1nx1xp9qz71nd4klpvr"; depends=[lattice mvtnorm pcaPP robustbase]; }; - rrcov3way = derive2 { name="rrcov3way"; version="0.1-18"; sha256="1gpjmmdca2waqks0qykj59p50v6pf1zgl81m5lhbrhpcr4rdr63l"; depends=[nnls robustbase rrcov]; }; + rrcov = derive2 { name="rrcov"; version="1.6-2"; sha256="18x8y2b9n2plpn4086nkjk9c27p7gb78kbrv5pj9r8fb0idl5rn5"; depends=[lattice mvtnorm pcaPP robustbase]; }; + rrcov3way = derive2 { name="rrcov3way"; version="0.2-3"; sha256="0axgdxp216h1zdi4bb4hiynkr0kjxypdzxga51qq430pv9sdl6n0"; depends=[nnls pracma robustbase rrcov ThreeWay]; }; rrcovHD = derive2 { name="rrcovHD"; version="0.2-7"; sha256="1srxgw5qcgpmxqfplvbrlryxvkx0mic5y7v5lxgfvqvlmcb3rm3f"; depends=[pcaPP pls Rcpp robustbase robustHD rrcov spls]; }; rrcovNA = derive2 { name="rrcovNA"; version="0.4-15"; sha256="0r60chxm7bpc6sis60rp8k8xchwfrfa3lrfaidvv22ipx2q0psp7"; depends=[cluster lattice norm robustbase rrcov]; }; - rrd = derive2 { name="rrd"; version="0.2.2"; sha256="104iz2y49vzm92a8nrvgzrjyljxl467mp1hjnjmzl4rhf9kl809y"; depends=[assertthat tibble]; }; + rrd = derive2 { name="rrd"; version="0.2.4"; sha256="05njzrgd5p39zmyqxgnb2x9q3c7669fsv76vspdv9i9n804z5d5d"; depends=[assertthat tibble]; }; rrecsys = derive2 { name="rrecsys"; version="0.9.7.3.1"; sha256="1qnjriv1xq4gjjhzz8jxrbk88mw5xddl2l2i4bmfhnxhi51d2rk3"; depends=[ggplot2 knitr MASS Rcpp registry]; }; rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; }; rredlist = derive2 { name="rredlist"; version="0.7.0"; sha256="1w77cnfrybmqnadsmfkpjv5m49kkr7yc6kcqq165lmj3bijnprnj"; depends=[crul jsonlite]; }; @@ -15692,21 +15932,24 @@ in with self; { rrum = derive2 { name="rrum"; version="0.2.0"; sha256="0w0f2n14if2b8x7n6v8y8q2vghd8j7xm1xhpxnvy3z50flinwgm7"; depends=[Rcpp RcppArmadillo rgen simcdm]; }; rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; rsample = derive2 { name="rsample"; version="0.1.1"; sha256="01xwhj4zfvxbv9cjb6mbz3aphxqc3cnjjx1xy2yx2wd94fbka42z"; depends=[dplyr ellipsis furrr generics lifecycle purrr rlang slider tibble tidyr tidyselect vctrs]; }; + 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]; }; rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; 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.19"; sha256="1wq0wrdbh0gi0bx4m9526qlbjm7nxxqgc17ikdx5mrhcy2f61hjk"; depends=[]; }; - rscc = derive2 { name="rscc"; version="0.2.0"; sha256="0k1p0w90p2qyjhwfgh35ya02hxqm12h3fkyc6wfxbsxiklkw61vz"; depends=[crayon formatR highlight igraph tm]; }; + rscc = derive2 { name="rscc"; version="0.2.1"; sha256="10srbalj8i67z30amvf08zfa4hs6phvq17kfgys9ihwaknckcyx3"; depends=[crayon formatR highlight igraph tm]; }; rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; }; rsconnect = derive2 { name="rsconnect"; version="0.8.25"; sha256="1kyr4v7vds2yw3xmkk2yr56ylz1h95944brylwvwmwj5yxvm419w"; depends=[curl digest jsonlite openssl packrat 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.20.0"; sha256="0psh53r8hvyvg7n20p7dl2qnd5gznx1lfkxqrc05kfksl4zvrrm5"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr tidyselect]; }; + rscorecard = derive2 { name="rscorecard"; version="0.21.0"; sha256="0jf7pan0v50sg8nz72c5rp3pi34b0r75j7laq9idqsfcgsp0flaj"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr tidyselect]; }; + rsdNE = derive2 { name="rsdNE"; version="1.0.0"; sha256="1faa6m2y4i6dqzgzj8glfcf5j438m3qqxcz1rgk7w20x3g24ddyx"; depends=[]; }; rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; rsdmx = derive2 { name="rsdmx"; version="0.6"; sha256="1sw8pp2j22rs1nlsyphyqbhywgplan9qmrs5wm9wvrn5g26k4bg9"; 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]; }; 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.2.2"; sha256="016q6yly2vl6q9mkff2krri2rmzsm9gc9gippd8l38h5c8ri6cdl"; depends=[bookdown knitr magrittr rlang usethis yaml ymlthis]; }; + rshift = derive2 { name="rshift"; version="2.1.1"; sha256="1ihliavs1qsvp732mpbbdp1psr663j3csmg18j74fi26g3ny5kny"; depends=[dplyr ggplot2 magrittr tibble zoo]; }; rsimsum = derive2 { name="rsimsum"; version="0.11.1"; sha256="0i09xx2pzvcabk8bnc0gg99vm2kknwdy0r9d7skqgz3xcbkm3yyn"; 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]; }; @@ -15714,8 +15957,8 @@ in with self; { rslp = derive2 { name="rslp"; version="0.2.0"; sha256="186k1gngirqhvhii4ysq77wjf5gf75c7gya73minb0pfg9fn16l7"; depends=[magrittr plyr stringi stringr tokenizers]; }; rslurm = derive2 { name="rslurm"; version="0.6.1"; sha256="19451icfh7snjbbmpzpr1hrdf52q8ijv0ag1di3y55r2la3jxxcf"; depends=[whisker]; }; rsm = derive2 { name="rsm"; version="2.10.3"; sha256="1dcjsn3wa7rqdpixh37vjgk3z5siwlyn70qffp49m3awn258hwpg"; depends=[estimability]; }; - rsmatrix = derive2 { name="rsmatrix"; version="0.2.0"; sha256="0d3y0ihz32jhqmzlgh7lqw4c122dbai2ic56qkalg63ckfswpzrw"; depends=[Matrix]; }; - rsnps = derive2 { name="rsnps"; version="0.4.0"; sha256="0ppv64yj1nh13q4lks6djrjc37b32qj5pyddy1lfcy066ah63km6"; depends=[crul data_table httr jsonlite plyr RJSONIO stringr]; }; + rsmatrix = derive2 { name="rsmatrix"; version="0.2.1"; sha256="02l7hcbwjilcpmgxi2gs9hcf75kb7g2m2b31rmwd2kvhdn2w4s3q"; depends=[Matrix]; }; + rsnps = derive2 { name="rsnps"; version="0.5.0.0"; sha256="1pnf3j2hdgx4is1387ysrrg3izq1jyn2p00ia5hhdzkkfl1pbqcr"; depends=[crul data_table httr jsonlite plyr stringr]; }; rsoi = derive2 { name="rsoi"; version="0.5.4"; sha256="1gchznfshp91i3if8077qph26flxzwa2xrw3q488ah50725d63hw"; depends=[curl memoise]; }; rsolr = derive2 { name="rsolr"; version="0.0.11"; sha256="0h82x9ihzgw9l1ksn1l5w7x3vgyy6zlbdbvg9a4pa1iinhlf87ic"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; }; rspa = derive2 { name="rspa"; version="0.2.5"; sha256="0jvrr3jaw66zqi5pal9dycpac24dn9v7lf2m63q01wmd8m3mlnv9"; depends=[lintools validate]; }; @@ -15746,23 +15989,23 @@ in with self; { rsurfer = derive2 { name="rsurfer"; version="0.2"; sha256="14zd8fhak12yha6miwb84085722v5ipk8lagijhc6af291kp70i9"; depends=[gdata stringr]; }; 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.1.2"; sha256="10p6aps2rsvhf4xgngl9x20cf2wqbzhlpjds8biyihvj58c1q8nn"; depends=[]; }; + rsvg = derive2 { name="rsvg"; version="2.2.0"; sha256="05mvi1ijnxayyj1f4p8nb56pncmm7x0sbq0d87asv7c7kw765n1a"; depends=[]; }; rsyncrosim = derive2 { name="rsyncrosim"; version="1.3.2"; sha256="1f66mx4s765jsmvgvff3sizp3xmqhc4ipj0j70igyj381xxa937x"; depends=[DBI gtools lifecycle raster RSQLite]; }; - rsyntax = derive2 { name="rsyntax"; version="0.1.2"; sha256="1a0249bzl47vwqivi7rdwfq7b2wx7pxpyps49q0ldn6a0askhhij"; depends=[base64enc data_table digest igraph magrittr png rlang stringi tidyselect tokenbrowser]; }; + rsyntax = derive2 { name="rsyntax"; version="0.1.3"; sha256="13zi05gprmdvb066l3qfxya40rhw4v1wfi0b9v684f6w2v6rsjr6"; depends=[base64enc data_table digest igraph magrittr png rlang stringi tidyselect tokenbrowser]; }; rsyslog = derive2 { name="rsyslog"; version="1.0.2"; sha256="0sc9jiscabr72fsx1wwjvq44casvhdsinj77wrcp017a4f9i0k5b"; 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.4.0"; sha256="1bnrrgybbnpiivdlwihvp5j9rr5fz39vqwl5w8vqvxg1pcjr6qaq"; depends=[htmltools magrittr]; }; rtape = derive2 { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; }; - rtdists = derive2 { name="rtdists"; version="0.11-4"; sha256="12397ljbinrl2zhazvypb7by4rls534dgh21dfjmfj656wbq21dv"; depends=[evd gsl msm Rcpp]; }; + 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]; }; rtemps = derive2 { name="rtemps"; version="0.8.0"; sha256="1x64j13g1lv0s7yy1b4453l7xnscgf079hkgkp8dv9c38g0mfx98"; depends=[bookdown DT ggplot2 knitr rmarkdown xfun]; }; - rtern = derive2 { name="rtern"; version="0.1.1"; sha256="00yhsns89jynh2gpgwwklkf0pbwcriha76ff3sh7pb5n6hl5nr1c"; depends=[lifecycle]; }; + rtern = derive2 { name="rtern"; version="0.1.2"; sha256="0i9493f3rykhjxwbvydz6aikzkwfphq3dyc8jw0fzw057zd24cgb"; depends=[rlang]; }; rtext = derive2 { name="rtext"; version="0.1.22"; sha256="0wsy0iqzbfin92pw0bqj4bxm2p4f2y4frr137l6c3yvd0jrax3q4"; depends=[digest hellno magrittr R6 Rcpp RSQLite stringb]; }; rtf = derive2 { name="rtf"; version="0.4-14.1"; sha256="032ff0yavqmd2d9svgwkmvxwh0cxjbac6pj48v4cshi898f02rhh"; depends=[R_methodsS3 R_oo]; }; - rtgstat = derive2 { name="rtgstat"; version="0.2.1"; sha256="1h597pj7jp7xdylymy4yswpafa12qknyvgadil3lv40cw7bcq2fq"; depends=[cli dplyr httr2 purrr snakecase stringr tidyr]; }; - rticles = derive2 { name="rticles"; version="0.22"; sha256="0jgsmqwwqzvsxcbsm9fx0rp724mn3ipi70883bhvm7n9i8mq877m"; depends=[knitr rmarkdown tinytex xfun yaml]; }; + rtgstat = derive2 { name="rtgstat"; version="0.3.0"; sha256="1zg2xhypv0pycabzn423df9fivyys2vgdwsy60a43s8j9al7iz63"; depends=[cli dplyr httr2 purrr snakecase stringr tidyr]; }; + rticles = derive2 { name="rticles"; version="0.23"; sha256="1ipblw3rmkma22jl2hf1pyfm6l8k31zcmm3swmwii6k0x7khiav1"; depends=[knitr rmarkdown tinytex xfun yaml]; }; rticulate = derive2 { name="rticulate"; version="1.7.2"; sha256="0xgl36m63z9kzqj0srjp3lb65hfizszlgw0kwjwc9li607q4fy6m"; depends=[dplyr ggplot2 glue magrittr mgcv purrr readr rlang stringr tibble tidymv tidyr tidyselect tidyverse]; }; rtide = derive2 { name="rtide"; version="0.0.9"; sha256="0gr0j52jy7y1w1s0s88rjv9l85yvavypagmi0qw2ix9ca2xadlzl"; depends=[abind chk dttr2 tibble]; }; rties = derive2 { name="rties"; version="5.0.0"; sha256="1mxgzrlf41hhawab2664az151fmmhm8ivnnimmzm538yliilc0b7"; depends=[DataCombine DescTools deSolve dplyr ggplot2 gridExtra interactions lattice lme4 MASS mclust nlme nnet plyr zoo]; }; @@ -15777,6 +16020,7 @@ in with self; { rtrend = derive2 { name="rtrend"; version="0.1.2"; sha256="01d2538qjgs9nng7gmb8y9a0wsxg6gm3p9z1m15sap1g5wl3z6fs"; depends=[boot fftwtools ggplot2 magrittr matrixStats Rcpp RcppArmadillo]; }; 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.0.0"; sha256="1sac82z2jk5cp7cr3m6l07b6rk0ims0bsm3pvmk870v014brkim4"; depends=[curl data_table dplyr jsonlite tidyr]; }; rts = derive2 { name="rts"; version="1.1-3"; sha256="1lnfqmi49lmk7zhmgyl1z9hlfxh3gg373wj81x7vw9964564r4wg"; depends=[raster RCurl sp terra xts zoo]; }; rtsVis = derive2 { name="rtsVis"; version="0.0.3"; sha256="0j48p4cdkd3dwc5bxv8kmmqj38yaq4rz0wp47kx21msbajcw5m3m"; depends=[assertthat dplyr forcats ggplot2 magrittr moveVis pbapply raster RStoolbox sf sp tidyr]; }; rtsdata = derive2 { name="rtsdata"; version="0.1.3"; sha256="0ylw8m0wf6jvjl3zirns6qk71lwsrljnvz5dn1ngvp7c1x7y1wn9"; depends=[anytime brotli curl data_table mongolite Quandl quantmod xts zoo]; }; @@ -15785,10 +16029,10 @@ in with self; { rtweet = derive2 { name="rtweet"; version="0.7.0"; sha256="05pbvxm2vmf6935b9s6663k3aifnkr3m52wh2jvnplmrwyrfpn9n"; depends=[httpuv httr jsonlite magrittr progress Rcpp tibble]; }; 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.2"; sha256="1dq7bjb3p87gvsg9b2vpd65xp8ihp68dic2w9my687mpc11fxp1v"; depends=[dplyr gtools magrittr Rcpp RcppParallel readr rlang stringr 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-4"; sha256="06zmii3wncxndd4hhdk7h4d4s2lj5clrrs10zzz4856g9zjzmbq6"; depends=[chron ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; }; + rugarch = derive2 { name="rugarch"; version="1.4-7"; sha256="0i9483gk0x8jhxx9zsh0p3lbs8vslnchb3j78slpzgsc6am43zjh"; depends=[chron ks numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; }; ruimtehol = derive2 { name="ruimtehol"; version="0.3"; sha256="1qscaj28xrrqccav0y82mn5nzkc8zfgmx2axg7bxrrhqaibfpy5j"; depends=[BH Rcpp]; }; ruin = derive2 { name="ruin"; version="0.1.1"; sha256="124xs1c2mjfy6z0bp83rwkqw2y73g77xwn3q4yd2xw0v2frnpvpz"; depends=[ggplot2]; }; ruler = derive2 { name="ruler"; version="0.2.4"; sha256="159k7453jb37zgjg9rcgz566mz2827dpfq5gm40r6zgkia4z3apx"; depends=[dplyr keyholder magrittr rlang tibble tidyr]; }; @@ -15797,7 +16041,7 @@ in with self; { 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.0-3"; sha256="0a5m1nlyrph22s0crmajacy4n4fw9j0bmg1srkgfrygcryqc07qv"; depends=[coda lattice]; }; + runjags = derive2 { name="runjags"; version="2.2.1-5"; sha256="0jj5xacp6f3g7mkz6yd2qay149qmq2jmiza0a5gg42yc8jqb7h52"; depends=[coda lattice]; }; runner = derive2 { name="runner"; version="0.4.1"; sha256="1iic84ab6gbikc2qfqhdg5i48i8hldz59l0k4466n8v6ha2k7hxi"; 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]; }; @@ -15807,7 +16051,7 @@ in with self; { ruta = derive2 { name="ruta"; version="1.1.0"; sha256="1qr2ryz55h2j3wlwg0535lhmk2ydm0idfxl07rlfxq1pi32cjms1"; depends=[keras purrr R_utils]; }; rutifier = derive2 { name="rutifier"; version="1.0.4"; sha256="045pr8apd105azs1glpwqrbamglqddxfpml9yrfrlaivz3fjd9l8"; depends=[R_utils]; }; ruv = derive2 { name="ruv"; version="0.9.7.1"; sha256="1n4q9mrp9f644spbns6bbnzmlabrg90hwkdfg3hnm3rxp9b4xid0"; depends=[ggplot2 gridExtra scales]; }; - rv = derive2 { name="rv"; version="2.3.4"; sha256="0kn56agxv6p861r247yhwfkp8pj33bghy5444a6f3y22yyzc8ngz"; depends=[]; }; + rv = derive2 { name="rv"; version="2.3.5"; sha256="1rjbhlvd7cxn7yw001p859zl5ibxl4di03j1aadm4zycq1zyr6q7"; depends=[]; }; rvHPDT = derive2 { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; }; rvTDT = derive2 { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; }; rvalues = derive2 { name="rvalues"; version="0.7.1"; sha256="0vgizlm5g6mnzvwsprgg0wj0k2y3nc8zn1bqdaw58py92mqpvj1d"; depends=[]; }; @@ -15826,7 +16070,8 @@ in with self; { rwc = derive2 { name="rwc"; version="1.11"; sha256="1qhgkbkp4nz0wq5c4x8232xiszpiyzcdklfgvpnx4cbp3bbfdi4g"; depends=[MASS Matrix mvtnorm raster]; }; rwebstat = derive2 { name="rwebstat"; version="1.1.0"; sha256="106dkhlr33ii17q45c1hrmbslwsj1qlmx325skch2q71mv7ii0lj"; depends=[dplyr getPass htmltools httr jsonlite readr stringr]; }; rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; }; - rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.3"; sha256="029zzlp4pssnvxfd0ggry37f2k3yn78pqh6ghpd164fdy778l33b"; depends=[stringi tibble]; }; + 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]; }; rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; }; rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; }; rwstats = derive2 { name="rwstats"; version="0.1"; sha256="10jj2lkilysz7mmysblj6l4jjc560rqsps0ivkvyr7caj8gfhdlb"; depends=[]; }; @@ -15834,7 +16079,7 @@ in with self; { 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]; }; - rxylib = derive2 { name="rxylib"; version="0.2.6"; sha256="0z0mfk5g7jdrw28f6jzifis2jsw35w7g1p0bv3b6a4rfmbnjhmwk"; depends=[BH Rcpp]; }; + rxylib = derive2 { name="rxylib"; version="0.2.7"; sha256="1vc1g1vm61xhf2dvaxvz2y9z7mqk7508068slq83fjcdnkc1pbfr"; depends=[BH Rcpp]; }; ryandexdirect = derive2 { name="ryandexdirect"; version="3.6.0"; sha256="0f1z8gp1pxfqx694alj435ihzxvd9ban04b1clzipgdq9la1hza8"; depends=[bitops data_table dplyr httr jsonlite magrittr purrr readr stringr tidyr xml2]; }; rym = derive2 { name="rym"; version="1.0.5"; sha256="0brh8hm3x21swypnzj3bbbf7njgarsj4804fp5lcqlr4nadzx26y"; depends=[httr purrr stringr]; }; ryouready = derive2 { name="ryouready"; version="0.4"; sha256="1d9z3paxcrkwsgn5g83x57jwz2iqarks30x0bwg48i5ispw6xbr3"; depends=[car ggplot2 stringr]; }; @@ -15844,7 +16089,7 @@ in with self; { s2 = derive2 { name="s2"; version="1.0.7"; sha256="0gwydn6wdl675ydkcckrci6ylcx30qn8nfhmrp4qx4r9mv3c2410"; depends=[Rcpp wk]; }; s20x = derive2 { name="s20x"; version="3.1-31"; sha256="0gnp703blgawfymd6nxz98w8g7sabagrnk3qc3d3cxj887w83gih"; depends=[]; }; s2dv = derive2 { name="s2dv"; version="1.1.0"; sha256="1sx7zmd0m0ny3jm7m5r1x327pw0qn8j0ny02yv6ki7kpbh6mk0pw"; depends=[abind bigmemory ClimProjDiags easyNCDF mapproj maps multiApply NbClust ncdf4 plyr SpecsVerification]; }; - s2dverification = derive2 { name="s2dverification"; version="2.10.0"; sha256="0sf47jxhw463qfaajiqla21nz7343fw3fzkyzyq2j8zdp7lj7xr2"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; }; + s2dverification = derive2 { name="s2dverification"; version="2.10.1"; sha256="06syzn04da3dka1j936hiqqnpif56mb9q2s42bfv95467zvvf3pg"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; }; s2net = derive2 { name="s2net"; version="1.0.1"; sha256="1f6lc8azx8lax7jc5ggzirwnp5d9ka2plimfkg70vx783xf56zaw"; depends=[MASS Rcpp RcppArmadillo]; }; s4vd = derive2 { name="s4vd"; version="1.1-1"; sha256="1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp"; depends=[biclust foreach irlba]; }; sAIC = derive2 { name="sAIC"; version="1.0"; sha256="1ih63cfs98kb61gwbmrx2yq7iacb5qa1qrh1a264041qd27r5pj5"; depends=[]; }; @@ -15869,25 +16114,30 @@ in with self; { 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]; }; saeBest = derive2 { name="saeBest"; version="0.1.0"; sha256="0s68w9cikhpac1kdlm1pphvnks1izacs5s87d7r380c3lkgkzd76"; depends=[sae]; }; - saeHB = derive2 { name="saeHB"; version="0.1.0"; sha256="1ny22mbf22zlpzl9kh8gxkldi49slw584nvwwi94rvs1wa8j9b8x"; depends=[coda rjags stringr]; }; + saeHB = derive2 { name="saeHB"; version="0.2.0"; sha256="0ahll2jqn7bxd0l629n8zj80y37acspy2m6vhjbg96206i49mnr5"; depends=[CARBayesdata coda MASS nimble rjags stringr]; }; + saeHB_hnb = derive2 { name="saeHB.hnb"; version="0.1.0"; sha256="00sms01xb290h555v5ngp5vnaancq165mcvli8dmni0mfdx5i7p3"; depends=[coda rjags stringr]; }; + saeHB_panel = derive2 { name="saeHB.panel"; version="0.1.0"; sha256="1nj237lpypz9vpamic4qm17x0p36yqdy8mmgy778c1dhmpvmwrfs"; depends=[coda 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.0"; sha256="0jmabk649lfsrjx4an0a8x5kpb4agfw9gqjilsf1pmqvq725a9bv"; depends=[coda data_table rjags stringr]; }; + saeHB_zinb = derive2 { name="saeHB.zinb"; version="0.1.0"; sha256="1gqb6xwfyz171md058m0kva2pj6hir09p784jwch2i1m9mvzinma"; depends=[coda rjags stringr]; }; saeME = derive2 { name="saeME"; version="1.2.4"; sha256="02yf5rf2kavwl3icfnsjg0kxmifrcc7v4j5jsfrfa8ssfbwcivhn"; depends=[ClusterR dplyr expm MASS]; }; saeRobust = derive2 { name="saeRobust"; version="0.2.0"; sha256="1bdfrsm59xwkga0kxl3r5n83mhhkyzj7gplrgx26gyflashyd1zc"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules pbapply Rcpp RcppArmadillo spdep]; }; - saeSim = derive2 { name="saeSim"; version="0.10.0"; sha256="0nh8x2v0g8i0rjq4s5q0ayhyxhl5p0126plmd4vnnhaifm6pn0q3"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; }; + saeSim = derive2 { name="saeSim"; version="0.11.0"; sha256="0s0zcls4j3cx7wbvi0l3q4c3b0f9x9i2wcqnz4gzwyqik6pcfaic"; depends=[dplyr functional ggplot2 MASS parallelMap spdep tibble]; }; saeeb = derive2 { name="saeeb"; version="0.1.0"; sha256="04vjxmnqcgqcamgjd9qq1dbx0msm40mnn94jjy9pzvsj2gsbws39"; depends=[COUNT MASS]; }; saekernel = derive2 { name="saekernel"; version="0.1.1"; sha256="0zk124kkxrwr3bliy01d3ag4r0flnjg4z3lmm5wmq3w0r4gwgy4f"; depends=[]; }; - saemix = derive2 { name="saemix"; version="2.4"; sha256="0w79n28xvkf2iw0vm9bw5dhxlp54bzm1lwl7q2hw356c2gmbpwjh"; depends=[]; }; + saemix = derive2 { name="saemix"; version="3.0"; sha256="17ax2cvlk69y8f00xgbdibycxng45kx175b518sdlkrm49pdxm7h"; depends=[ggplot2 gridExtra npde rlang]; }; saery = derive2 { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; }; safeBinaryRegression = derive2 { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; }; 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.6"; sha256="1rn3hawh6jn8dszdjr80l15g83n52agch2j3znzb0jmg7qkxd383"; depends=[BiasedUrn boot dplyr hypergeo purrr rlang survival]; }; safetyCharts = derive2 { name="safetyCharts"; version="0.2.0"; sha256="1gdrl7wmxlvnk8wghrjv3cnvdsmx79f1s0j51yb4q94dxprssajh"; depends=[dplyr DT forcats ggplot2 huxtable kableExtra knitr pharmaRTF RColorBrewer rlang shiny stringr Tendril Tplyr]; }; safetyData = derive2 { name="safetyData"; version="1.0.0"; sha256="1spa1wh1z8cqsz8vrkj3abny0xs3qp8d80dla8d031d70hvfkdjc"; depends=[]; }; safetyGraphics = derive2 { name="safetyGraphics"; version="2.0.0"; sha256="1y1qj8vhq3z3g4ij2qkc5cpwc5zknmjnp3kpkbcr9cywjrdpa5pq"; depends=[datamods dplyr DT htmlwidgets jsonlite magrittr purrr rclipboard rlang safetyCharts safetyData shiny shinyjs sortable stringr yaml]; }; sageR = derive2 { name="sageR"; version="0.3.0"; sha256="093qxwbkf8cqc3zjad232987qq2155faj8w2qplwxzvg881f0yi0"; depends=[ggplot2]; }; + sahpm = derive2 { name="sahpm"; version="1.0.1"; sha256="1grhfxpqx9dyvqd2v91im3jgki2k3abcaal2ix9pcdzz93fc9xlw"; depends=[mvtnorm]; }; sail = derive2 { name="sail"; version="0.1.0"; sha256="1wrh2dam5lblascqd8gl76jks72ys1amz84c6p08y8ykdmn2saq1"; depends=[gglasso glmnet]; }; - salbm = derive2 { name="salbm"; version="1.0"; sha256="06nizpphyn5q292b2kbsjax0ljw3340n655qwiyp8lvi2zcnl6jy"; depends=[randomForestSRC]; }; - salem = derive2 { name="salem"; version="0.2.0"; sha256="1pk27d57bmds0jvnvwai2scjy798lb7w6lb84yxl4ccgyn1ldh45"; depends=[]; }; - salesforcer = derive2 { name="salesforcer"; version="1.0.0"; sha256="12gc77d6kg7yb9hvbwibahslka8xfqzmwim4q6nkiyq9b0x5wliv"; depends=[anytime base64enc curl data_table dplyr httr jsonlite lifecycle lubridate mime purrr readr rlang rlist tibble vctrs XML xml2 zip]; }; + salesforcer = derive2 { name="salesforcer"; version="1.0.1"; sha256="19z4q5k0k1c1s2piqjg0z6nrwabap016nbx3jpf51lvmh5lp8ycf"; depends=[anytime base64enc curl data_table dplyr httr jsonlite lifecycle lubridate mime purrr readr rlang rlist tibble vctrs XML xml2 zip]; }; salso = derive2 { name="salso"; version="0.3.0"; sha256="05nsnhbb5w69064ddmdkpvx7nw2gbd2l446b89myllw0jzaycza3"; depends=[]; }; salty = derive2 { name="salty"; version="0.1.0"; sha256="1dxq62yrkv416fy09l03slc7ci6mnwiyvjlsxhbqnj8yjy3kbhr6"; depends=[assertthat purrr stringr]; }; sambia = derive2 { name="sambia"; version="0.1.0"; sha256="15yz5lrjav5bs8m52crg3l43xmi4gf7wydji76p181ssyg43z2ln"; depends=[dplyr e1071 FNN mvtnorm pROC ranger smotefamily]; }; @@ -15911,8 +16161,9 @@ in with self; { sams = derive2 { name="sams"; version="0.4.2"; sha256="0k67vdjwnp7ljll87vjqb80axbcfgm05rgw5vadzn67dgghkqd0j"; depends=[]; }; samurais = derive2 { name="samurais"; version="0.1.0"; sha256="0s00hd3ax4r662n8iqmd9i56sgyjxbgc59la7qvh3jwcnzcvmgz9"; depends=[MASS Rcpp RcppArmadillo]; }; sand = derive2 { name="sand"; version="2.0.0"; sha256="0a8skj1wi1n9zlm7jb5cix1i4ssdzfpj4ym2854ala9jy6qj7g7n"; depends=[igraph igraphdata]; }; - sandbox = derive2 { name="sandbox"; version="0.2.0"; sha256="1xwz8bddl9zf75d5xxvyvnljm6x45dwsf7lsks0fw7h5h97cv3xq"; depends=[RLumModel]; }; + sandbox = derive2 { name="sandbox"; version="0.2.1"; sha256="0k86dgfjg7ib79cl6nwxv1g9i15pk501kd8ynlaj3mijpnhgvbal"; depends=[RLumModel]; }; sandwich = derive2 { name="sandwich"; version="3.0-1"; sha256="12aa5083k3sfrfq1jy3l94wffss9h0rga8j71jy3n8pkhiq4nn7n"; depends=[zoo]; }; + sandwichr = derive2 { name="sandwichr"; version="1.0.1"; sha256="114k981kxkf3a8kvzaciimkksnh1g5cyj2ams278r09vi3ic59ia"; depends=[caret dplyr geodetector ggplot2 gridExtra lwgeom sf]; }; sanic = derive2 { name="sanic"; version="0.0.1"; sha256="05fd7jpi7cf9klfh6dqf8wklrjh5q1b3xqddxhdihcsqvcqhg48l"; depends=[Matrix Rcpp RcppEigen]; }; sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; }; sanityTracker = derive2 { name="sanityTracker"; version="0.1.0"; sha256="0y041x840sg5c05ksljb1y4xag1cib19q5ygp443k13ryfbcgs9k"; depends=[checkmate data_table]; }; @@ -15923,21 +16174,21 @@ in with self; { santoku = derive2 { name="santoku"; version="0.6.0"; sha256="1kwyc9c8fhfxr6kh9wkrw1ywqx5hjrp0dfvl97qzcly0g28432fs"; depends=[assertthat lifecycle Rcpp 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]; }; - sapa = derive2 { name="sapa"; version="2.0-3"; sha256="0kj681rd4c2lvqr926lb6f4qwp281x5274dg6vbk8pf5y7s0qlpc"; depends=[ifultools splus2R]; }; sapevom = derive2 { name="sapevom"; version="0.2.0"; sha256="0vq4rx85pdjc0wjxjf7wj8j5qs3cb20hwhlc2ypbgrlw7zkcp1z4"; depends=[]; }; sapfluxnetr = derive2 { name="sapfluxnetr"; version="0.1.3"; sha256="06w3wm8m55ak1zxdyqq01ymgvyw71hk2m1vv378dppjxib7kvh3z"; 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]; }; - sarima = derive2 { name="sarima"; version="0.8.5"; sha256="1850h8rly6kx8lsnpyh16nw69jhmgh5ggp9c8knqz2bm64s7xlwa"; depends=[dplyr FitAR FitARMA FKF Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; }; - sarp_snowprofile = derive2 { name="sarp.snowprofile"; version="1.0.0"; sha256="02g7d5kilfkhqxm02jkhkraqbamxaj1qzzi150k6m55d5bfy4wih"; depends=[data_table xml2]; }; - sarp_snowprofile_alignment = derive2 { name="sarp.snowprofile.alignment"; version="1.0.2"; sha256="1yh4ybnscjzps28ncqd46xzv88fjcn4bhcx6rwz8kl1m253c4wpl"; depends=[dtw sarp_snowprofile shiny]; }; + sara4r = derive2 { name="sara4r"; version="0.0.9"; sha256="1vfaz4fs0yayf01w0smsnviwhvjz10krfagp4vhy4lmdcs99s00h"; depends=[raster rgdal sp tcltk2]; }; + sarima = derive2 { name="sarima"; version="0.9"; sha256="1wh84vg25vkr23ghfjfirsp0yj5537cybn2p623s18fypcfivlns"; depends=[Formula lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; }; + sarp_snowprofile = derive2 { name="sarp.snowprofile"; version="1.2.1"; sha256="1nz9ldc6a2x4a934xkyd3q2rim2bbcvhs3ks1m08q5qdcv1w0hiq"; depends=[data_table xml2]; }; + sarp_snowprofile_alignment = derive2 { name="sarp.snowprofile.alignment"; version="1.1.4"; sha256="0p3acphlc90d8kh0yyvc754vb5xvgzncw6819phzx11c63xmyqk9"; depends=[data_table dtw sarp_snowprofile shiny]; }; sars = derive2 { name="sars"; version="1.3.5"; sha256="07jaagf3q8x4iwjh1avy5vzv9y62ipnjd43acbw0hizh983qlq3r"; depends=[AICcmodavg cli crayon doParallel foreach nortest numDeriv]; }; sarsop = derive2 { name="sarsop"; version="0.6.9"; sha256="1rjpgicgy9vfi9q2vldrbbakybmazal5gh79p2kysnzhcr76v3z5"; depends=[BH digest Matrix processx xml2]; }; sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; }; - sasLM = derive2 { name="sasLM"; version="0.6.4"; sha256="0rqw8phpmv3ij9rz9jl2n0j1mfklh27acijnqqlw2f65qrilqapd"; depends=[mvtnorm]; }; + sasLM = derive2 { name="sasLM"; version="0.6.6"; sha256="04gmh6sakxl2dgslyfqm7pixyjngvnkhw1xpp9n67fv62rjs8vai"; 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]; }; sass = derive2 { name="sass"; version="0.4.0"; sha256="0axw358bbk3vxsqg3wq0bz3xigasa6af8fxvi2ga8hli4cawl1kx"; depends=[fs htmltools R6 rappdirs rlang]; }; - sassy = derive2 { name="sassy"; version="1.0.6"; sha256="1nad1czbd508a0v4mgh5m0na39qv2jzrlzjb008w8q5c08hyp0sd"; depends=[fmtr libr logr reporter]; }; + sassy = derive2 { name="sassy"; version="1.0.7"; sha256="0z65pvvw4hcw605hp7vpr99vmmf7isk2fxvxxa9ahfk1jig62hcc"; depends=[fmtr libr logr reporter]; }; 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.0"; sha256="0ing5vhw8akrpy703fcwn5p0gadfabqb3abc9ircpgb6y2k5axzk"; depends=[geosphere lubridate maps maptools ncdf4 PBSmapping sp splancs]; }; @@ -15948,7 +16199,7 @@ in with self; { sawnuti = derive2 { name="sawnuti"; version="0.1.1"; sha256="07abg9gqm59iz05jly47h9jnf8majnhjqss2ybjpa9mx1aclm50b"; depends=[]; }; saws = derive2 { name="saws"; version="0.9-6.2"; sha256="1ikvky45inz65djv1c9v749a5lq4m0xlzhm4p12am25qyv08hgjz"; depends=[gee]; }; sazedR = derive2 { name="sazedR"; version="2.0.2"; sha256="0v8ap9ivwj5h4w2iwhww16v1jm6jpkkphvkh5vq06mv1a72p0inz"; depends=[bspec dplyr fftwtools pracma zoo]; }; - sbfc = derive2 { name="sbfc"; version="1.0.2"; sha256="1bwwy4yw8wfvmisiqwswd78dy4bjgmhcv0aki1x2sslzazmdy23y"; depends=[DiagrammeR discretization Matrix Rcpp RcppArmadillo]; }; + sbfc = derive2 { name="sbfc"; version="1.0.3"; sha256="0yfbxp3b9j2xjpd1xffkjl2bfxixc7hhzfiwicd9lyi5w2kfwavf"; depends=[DiagrammeR discretization Matrix Rcpp RcppArmadillo]; }; sbgcop = derive2 { name="sbgcop"; version="0.980"; sha256="0vmg8b4462qghlyx6hq0raf9xqvygzgwi5y0cbqcljhmbmqjrwxs"; depends=[]; }; sbioPN = derive2 { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; }; sbl = derive2 { name="sbl"; version="0.1.0"; sha256="1wxzscii0kp55sngmjccrqvc8zm1zamfh406r12irrz2wbxwqnkw"; depends=[]; }; @@ -15960,14 +16211,15 @@ in with self; { sbw = derive2 { name="sbw"; version="1.1.5"; sha256="10ks912f4xiy0i484vf24w5zz9n7kxlcy77ikz95p8vr5zlqkvgc"; depends=[MASS Matrix quadprog slam spatstat_geom]; }; scBio = derive2 { name="scBio"; version="0.1.6"; sha256="1bpizxm9fbxd4sfapi1ayfg5csacb4dvqbvappd79jkq4mrsk12q"; depends=[doSNOW fields foreach LiblineaR limma raster sp]; }; scCAN = derive2 { name="scCAN"; version="1.0.1"; sha256="08rrx3bk1w4lx886lvgc37xblq5hd68jrhg66yp5w16va5a97bqr"; depends=[FNN markdown purrr scDHA]; }; + scCATCH = derive2 { name="scCATCH"; version="3.0"; sha256="0hq65zz8mm71i7hnpfafwmwr5vcf58m62lqqliifjbpl8rgc73yj"; depends=[crayon Matrix progress reshape2]; }; scDHA = derive2 { name="scDHA"; version="1.1.2"; sha256="02iwkbh83h1xdckj30xg1azspq2v6sjrzpjgm6d1n14afgafv8x9"; depends=[cluster clusterCrit 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]; }; - scINSIGHT = derive2 { name="scINSIGHT"; version="0.1.1"; sha256="1a02013l648bz1h3nhflm1j0kdy48vg3y0x4gzjnhz1ihvnjngwl"; depends=[igraph RANN Rcpp RcppArmadillo stringr]; }; - scITD = derive2 { name="scITD"; version="1.0.0"; sha256="0mar8m3qvrvn6cx8nq5dvrc3im27scz1rhpydyx043vmv5yxmldz"; depends=[circlize ComplexHeatmap dplyr edgeR fgsea ggplot2 ggpubr ica Matrix mgcv msigdbr NMF RColorBrewer Rcpp RcppArmadillo RcppProgress reshape2 Rmisc rTensor sccore sva]; }; + scINSIGHT = derive2 { name="scINSIGHT"; version="0.1.3"; sha256="0hffigfi41crib98kazax4m6g70qdbcnhd4ycs432c4nlafbsdfm"; depends=[igraph RANN Rcpp RcppArmadillo stringr]; }; + scITD = derive2 { name="scITD"; version="1.0.1"; sha256="0x20yiwafalsfgxcmbia05vrfp7bpvwkgxgrdrxjpzhs07q527wk"; depends=[circlize ComplexHeatmap dplyr edgeR fgsea ggplot2 ggpubr ica Matrix mgcv msigdbr NMF RColorBrewer Rcpp RcppArmadillo RcppProgress reshape2 Rmisc rTensor sccore sva]; }; scImmuneGraph = derive2 { name="scImmuneGraph"; version="1.1.3"; sha256="0mvajasskcl4v0bjwzvkqjdicxb0329nxk93ich7qr37wfcp2n1n"; depends=[BiocStyle cowplot dplyr easypackages forcats ggplot2 gtools plyr purrr RColorBrewer readr scales stringr tibble tidyr tidyverse]; }; scLink = derive2 { name="scLink"; version="1.0.1"; sha256="0gcwx8kfik1lv949r9d9rqqnvrfkr4bj5cj2i9h1r7l1b76kna74"; depends=[glasso]; }; - scMappR = derive2 { name="scMappR"; version="1.0.7"; sha256="08ifrdmr4ws4z6aq75j84sain8q55ax6h1gzqqnphyw593yh9918"; depends=[ADAPTS downloader ggplot2 gProfileR gprofiler2 GSVA limSolve pbapply pcaMethods pheatmap reshape Seurat]; }; + scMappR = derive2 { name="scMappR"; version="1.0.9"; sha256="1b2jrbqy9dcvv9ng7mz8xxggqc5iy4n0h59xksin3m9gvpvsc0sw"; depends=[ADAPTS downloader ggplot2 gProfileR gprofiler2 GSVA limSolve pbapply pcaMethods pheatmap reshape Seurat]; }; scModels = derive2 { name="scModels"; version="1.0.2"; sha256="02nn8nv77fgmskx5zsa34ij9lzq9jiv8w2vmw5863v55khzvfs53"; depends=[gamlss_dist Rcpp]; }; scPOP = derive2 { name="scPOP"; version="0.1.0"; sha256="0bi9dmqj9cd8f09qmfl3d65922xn3j3jipxi6615jbk6bz67kkh9"; depends=[cluster Matrix RANN Rcpp RcppArmadillo]; }; scRNAstat = derive2 { name="scRNAstat"; version="0.1.1"; sha256="0yv5np7jafmygg77bwisrha5y2rdb1va906ngzs4zc8mvxr0dvlm"; depends=[clustree dplyr ggplot2 magrittr Matrix patchwork Seurat stringr]; }; @@ -15976,6 +16228,7 @@ in with self; { 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]; }; + scaRabee = derive2 { name="scaRabee"; version="1.1-4"; sha256="1p9828ymdm79b91z2fc2r5wy6i4hr1mx8fva6lr154c82ba3569z"; depends=[deSolve lattice neldermead optimbase optimsimplex]; }; scaffolder = derive2 { name="scaffolder"; version="0.0.1"; sha256="1va1mlhqv5qn0hm81ypdir9llr68222qxjp3jink69zpaskfbdib"; depends=[reticulate]; }; scagnostics = derive2 { name="scagnostics"; version="0.2-4.1"; sha256="1azg1xlid63l9mcyns9yyl3a3hykbl0sl0h5jhyvzjzahfyanq53"; depends=[rJava]; }; scaleAlign = derive2 { name="scaleAlign"; version="1.0.0.0"; sha256="0340biwz0md6sxq5iq5wiz6q8kcrll80429f1ab9zz88k3fya2s6"; depends=[]; }; @@ -15990,7 +16243,7 @@ in with self; { scatr = derive2 { name="scatr"; version="1.0.1"; sha256="1c2z722i7d7qflh4mzb8kkix5i22wph98kwz2p98x2mhaml8802d"; depends=[cowplot ggplot2 ggridges ggstance jmvcore R6]; }; scatterD3 = derive2 { name="scatterD3"; version="1.0.1"; sha256="187jq1y5va5npsmpkfyi6mhgynq956590q4z8v1ibadsrcldw34m"; depends=[digest ellipse htmlwidgets]; }; scatterPlotMatrix = derive2 { name="scatterPlotMatrix"; version="0.1.0"; sha256="1xs1rzi6j3yrj4j4yjhlj24nkxdnc4xgpwrdv9p0bzwc4gcarw1j"; depends=[htmlwidgets]; }; - scattermore = derive2 { name="scattermore"; version="0.7"; sha256="18nzlprmphkvjg946h10h2qq0wbkmv2526p8di6k2xl4gccq0qpk"; depends=[ggplot2 scales]; }; + scattermore = derive2 { name="scattermore"; version="0.8"; sha256="1rgqm7r1k7j3h2y4i6d1a2y8fzivfcbmr7dj9d367c0w4vc77pfv"; depends=[ggplot2 scales]; }; scatterpie = derive2 { name="scatterpie"; version="0.1.7"; sha256="1pmspv8a7k20zyd5xvmav2k9mnjrkfhdij3rr9k504zyki8hfy1z"; depends=[ggforce ggfun ggplot2 rlang tidyr]; }; scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-41"; sha256="152xqz9c70qab86mpgng049gxsg5f4fpf1m8dh93fb9v1avjd0sc"; depends=[]; }; scbursts = derive2 { name="scbursts"; version="1.6"; sha256="09yxnq6m35xmp0priavjnh0bdcwkr5hhy7j33cz13xwkrd1cgw5j"; depends=[readxl tibble]; }; @@ -16026,6 +16279,7 @@ in with self; { scoringTools = derive2 { name="scoringTools"; version="0.1.2"; sha256="11bxmpqiqqkjyvmyxlnzz7j64jmy1pjw06128vvydmqhjxxyawjh"; depends=[discretization dplyr magrittr sqldf]; }; scoringutils = derive2 { name="scoringutils"; version="0.1.7.2"; sha256="1njdvy6fzw20xb13mpdqczvap88jfxxnid31nmrkq9yzjdigjv2c"; depends=[data_table forcats ggplot2 goftest scoringRules]; }; scout = derive2 { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; }; + scpi = derive2 { name="scpi"; version="0.1"; sha256="06h8sqqhrja8m9ps8snwzm3zyp6iysdki9n47sv4xw0dixj7v5mp"; depends=[abind CVXR doRNG doSNOW dplyr ECOSolveR fastDummies foreach ggplot2 magrittr Matrix nloptr purrr Qtools rlang stringr tibble tidyr]; }; scpm = derive2 { name="scpm"; version="2.0.0"; sha256="1ib46m3i50annp90n2ih4qdxabxik4ngg9j0a5hgspsvk1i4hrvp"; depends=[interp lattice MASS Matrix mvtnorm RandomFields rgl]; }; scqe = derive2 { name="scqe"; version="1.0.0"; sha256="1113zbc2jyq03fh8l1h6yidf25hh5dcqrk6wkk9flqwnbrvfkwrr"; depends=[AER ggplot2]; }; scraEP = derive2 { name="scraEP"; version="1.2"; sha256="1qkfd4bp3sd3xrh9bdaqwmmvx7f9rvjcch6hi2p387ky04ywwqn4"; depends=[data_table rvest XML xml2]; }; @@ -16033,14 +16287,15 @@ in with self; { scrappy = derive2 { name="scrappy"; version="0.0.1"; sha256="0dckq2pdqabnv5cinfqgbrjxp55x4z81lp8xh4yhyb2cnz9gdsqy"; depends=[magrittr rvest xml2]; }; scrime = derive2 { name="scrime"; version="1.3.5"; sha256="0y2mh9fsffjf3i15bafpasa17z99c1s75r8g6h4hgcwfgpjx75sx"; depends=[]; }; scriptName = derive2 { name="scriptName"; version="1.0.1"; sha256="1rd3qj7c7pg454a5mxhr64g4kp15cqf5lf8lbsh9x88llvkjci5v"; depends=[purrr rlang]; }; - scriptests = derive2 { name="scriptests"; version="1.0-16"; sha256="11l145gvzkxqwbzw976rq94krly1p4lahqw051dwaacarq4hnrdg"; depends=[]; }; scriptexec = derive2 { name="scriptexec"; version="0.3.1"; sha256="0k10x0npdga1nmchzz9xxv0qijnq2n9pb49z1g06bmva1z8wb4wg"; 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]; }; scrollrevealR = derive2 { name="scrollrevealR"; version="0.2.0"; sha256="0k8ffapwxpb25wphm76arma095hrh3wf0gpkx1z6g4rplahf4jxa"; depends=[glue htmltools]; }; scrypt = derive2 { name="scrypt"; version="0.1.3"; sha256="14iblgbp9v2by8fjbrpsd59iknp5babcz7j3yv1yxxzcwyb6wrrm"; depends=[Rcpp]; }; + scryr = derive2 { name="scryr"; version="1.0.0"; sha256="040x2qvgrr8j5k3y2g24kngjys271radqhh3jsqi07dhg9bybr5q"; depends=[dplyr httr purrr tibble]; }; scs = derive2 { name="scs"; version="3.0-0"; sha256="18f1h3j1vzvkr5llqv98026ilrqvrdzckaacscwadzcw99rb2mqz"; depends=[]; }; - sctransform = derive2 { name="sctransform"; version="0.3.2"; sha256="1p3m6i28nlxh6r609syn88cwlbdpl3dw44dy3gsijk2ibq20mfsx"; depends=[future future_apply ggplot2 gridExtra MASS Matrix matrixStats Rcpp RcppArmadillo reshape2]; }; + sctransform = derive2 { name="sctransform"; version="0.3.3"; sha256="0aqbcarsvvzkh5h4i65f08y4b8dfcs3zi62hmvfy24gj81f15bw3"; depends=[dplyr future future_apply ggplot2 gridExtra magrittr MASS Matrix matrixStats Rcpp RcppArmadillo reshape2 rlang]; }; scuba = derive2 { name="scuba"; version="1.11-0"; sha256="0g2n8clr2c0cb0jvfz1g9zv8m72yqwmb3p726k89dzma2lkyramd"; 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]; }; @@ -16049,7 +16304,7 @@ in with self; { sdafilter = derive2 { name="sdafilter"; version="1.0.0"; sha256="0y692j25pln46dp6xvaq17fkym0461yqfa6rv5avfw2b240k8jiq"; depends=[glasso glmnet huge POET]; }; sdamr = derive2 { name="sdamr"; version="0.1.0"; sha256="19mgdipp2fwv0c8g5fc02j4vdnc6v4x0204570swv8mkb2r2acqy"; depends=[car dplyr ggplot2]; }; sdat = derive2 { name="sdat"; version="1.1"; sha256="1mxijw2yfblqjvqqb2xrzhfn9c872i1q9ggw24xicvr2fk4lvjw6"; depends=[]; }; - sdcHierarchies = derive2 { name="sdcHierarchies"; version="0.19.1"; sha256="128mxm7iphg7c5jxpfakdnldc995gdcrlnfaxddw7csvzv547dwa"; depends=[cli data_table jsonlite Rcpp rlang shiny shinyjs shinythemes shinyTree]; }; + sdcHierarchies = derive2 { name="sdcHierarchies"; version="0.19.2"; sha256="198bk08qz5xr07pkc9yj3n9rzgv5ssijhg9fwhhrg35rf7jni1s8"; depends=[cli data_table jsonlite Rcpp rlang shiny shinyjs shinythemes shinyTree]; }; sdcLog = derive2 { name="sdcLog"; version="0.4.0"; sha256="0rph0jha8x5mqzcpad3px89ppqbxccsx896mhpxw9pxrpk82aiig"; depends=[broom checkmate crayon data_table mathjaxr]; }; sdcMicro = derive2 { name="sdcMicro"; version="5.6.1"; sha256="12maw34ibsa2fpdxy4ww8nbsllfvcjvf5idg4m4z0fjsbmd7li51"; 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.1.1"; sha256="1szv2nb758k3x5scxml2ns11fi99rlmd11r3fhzy3dgylf0m0xnm"; depends=[raster]; }; @@ -16060,7 +16315,7 @@ in with self; { sdetorus = derive2 { name="sdetorus"; version="0.1.8"; sha256="1bf622k9szas3bfxz9f82dn28l1hdqxzpvgqwvzygy9vp2gi4gyp"; 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]; }; - sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.11"; sha256="1fazdcxmgwa3m3nd010i3rprnh05ydwh152vvbship7c73czwcs1"; depends=[R_utils raster rgdal]; }; + sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.12"; sha256="1j3z16kdc256k5dn596k3y4dbbp3sjfxbh87a2jiplddq4a8bgff"; depends=[R_utils raster rgdal]; }; 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]; }; @@ -16073,42 +16328,43 @@ in with self; { searchConsoleR = derive2 { name="searchConsoleR"; version="0.4.0"; sha256="1ffg5359pbwylw265wbahwl3hy1b0qqv4al71v5r8lgfircibn0j"; depends=[googleAuthR stringr]; }; searcher = derive2 { name="searcher"; version="0.0.6"; sha256="03q9nq5zkj344swq3ppliz6dhwaddls8xv633s6brccmrcgdaivm"; depends=[]; }; seas = derive2 { name="seas"; version="0.5-2"; sha256="0hn4d5dc01zyycd7l3vj1sx6bq668n7fzffw9ypaa5l20fizs0ay"; depends=[MASS]; }; - season = derive2 { name="season"; version="0.3.13"; sha256="0sn10vxdqvds162i4d7jg6if15h9p8fxia27ihlr4kfyp9113g98"; depends=[ggplot2 MASS survival]; }; + season = derive2 { name="season"; version="0.3.14"; sha256="1hdn0ji631ga0wadd4w0vph0s59dpcq1q36g0aii07jd0mc1wifv"; depends=[ggplot2 MASS survival]; }; seasonal = derive2 { name="seasonal"; version="1.8.4"; sha256="1mqlck752d9hmzmkmjw9qq7g9kkrwbzglsm7sx0xc03qbm5zxd3k"; 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]; }; 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.4.8"; sha256="0lwnqfqc9bwz4fwsp9xis5rb1lykjv6vabbh14hpcpdvsqzslpba"; depends=[abind BH MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sp stringr]; }; - secrdesign = derive2 { name="secrdesign"; version="2.5.11"; sha256="02fysbx6w1iw2ig54f9sgr74c40wfjwiwpdmxdjymsaynqnm9anl"; depends=[abind openCR secr]; }; + secr = derive2 { name="secr"; version="4.5.3"; sha256="1rp36brvpalzria61az514f3drinjxql0c12jgjb71m01vcjqfad"; depends=[abind BH MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sf stringr terra]; }; + secrdesign = derive2 { name="secrdesign"; version="2.6.0"; sha256="0iaby8qpik6g5060m3cykrqslj8cl1ddg0hsqy6vjgy6gg9r6ach"; depends=[abind secr]; }; 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.1.4"; sha256="1qa0vapnhiblz57jrbj9zd1gdmxc1nzzq41b4464373pjfvm5wvj"; depends=[igraph maptools MASS rgdal secr sp]; }; secsse = derive2 { name="secsse"; version="2.1.7"; sha256="0cad1flym8bhra11chc16ylfa3i0nhi9jyy6r4nacwh6qpbbavjg"; depends=[ape apTreeshape DDD deSolve doParallel foreach geiger phylobase]; }; secuTrialR = derive2 { name="secuTrialR"; version="1.0.9"; sha256="0g84jrh42kx3w1m6spw80rwx7vzjf7x1qabqap4h6ayrczacxq4r"; 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]; }; - see = derive2 { name="see"; version="0.6.8"; sha256="0q7hfb94smpyq9wsf48j04hx05nkaijf875fwwz8lfhkfvd8z4kj"; depends=[bayestestR datawizard effectsize ggplot2 ggridges insight parameters rlang]; }; + see = derive2 { name="see"; version="0.6.9"; sha256="0r42dm3zwjszfn6sga6ljgczaksgnn4n92y7bm3qysvcfnywvqq4"; depends=[bayestestR datawizard effectsize ggplot2 insight parameters]; }; seeclickfixr = derive2 { name="seeclickfixr"; version="1.1.0"; sha256="1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n"; depends=[jsonlite RCurl]; }; seecolor = derive2 { name="seecolor"; version="0.1.0"; sha256="1ijxyys8pwlm99ynmv86cgn8pzz1ivaxzh3rq1akzv17nz93jv61"; depends=[crayon dplyr fansi ggplot2 magrittr purrr rstudioapi stringr]; }; seedCCA = derive2 { name="seedCCA"; version="3.0"; sha256="076pkv083dp71m6ifjzx9spfwmc1625r9d72spf0vhf8pwwsha4v"; depends=[CCA corpcor]; }; - seededlda = derive2 { name="seededlda"; version="0.6.0"; sha256="1xbjwarf39w3dgsr7rr5i0q5jbza2rfaxkw66h4gg7bbi5v3kwzi"; depends=[Matrix quanteda Rcpp RcppArmadillo RcppParallel]; }; + seededlda = derive2 { name="seededlda"; version="0.8.0"; sha256="1wl7j2p1hfk1y9c05bq49n6zfcnkmijdp03c16ay7dhjqrhkwad6"; depends=[Matrix quanteda Rcpp RcppArmadillo RcppParallel]; }; seedr = derive2 { name="seedr"; version="0.3.0"; sha256="15drbc0iplb97a2sym6jnrwij7ak5qckcw98n3m65x45apjwdmhq"; depends=[binom data_table]; }; seedreg = derive2 { name="seedreg"; version="1.0.2"; sha256="16nr2hkwc0vfkd76ky592r1ymlmpakvxsmammih3fii9d4l8mlab"; depends=[boot car crayon drc emmeans ggplot2 hnp multcomp multcompView stringr]; }; 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]; }; seer = derive2 { name="seer"; version="1.1.7"; sha256="018621hywk8p3p210dn7ikll5nl188xb8smxsqzkzrf9wc886s3y"; depends=[dplyr forecast forecTheta furrr future magrittr MASS purrr randomForest stringr tibble tsfeatures urca]; }; - seewave = derive2 { name="seewave"; version="2.1.8"; sha256="1szcvryvl4kb3av2pcvl14bz6whl7xrq4wb1ck6w7lfc4mrlirhh"; depends=[tuneR]; }; + seewave = derive2 { name="seewave"; version="2.2.0"; sha256="0bi1l47l3846c18k6h2vrv0xp9xh00n544a578jrndahzrj1hfwl"; 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]; }; 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.3-4"; sha256="0bchqcy308kbywavgyg9kb4543rbkfn753q9c6d7l7aw7sxvyxl2"; depends=[]; }; + segmented = derive2 { name="segmented"; version="1.4-0"; sha256="0xn28gyqzmyz0kv352rkkznbj806arxj2am5a9gqsn1qzv9l0s9h"; depends=[MASS]; }; segmentr = derive2 { name="segmentr"; version="0.2.0"; sha256="0q5kxxiw0akpk7w2a2l9zp7v4pvqblzdvrld5fjyl5f6h8hsb40z"; depends=[foreach glue Rcpp]; }; segmetric = derive2 { name="segmetric"; version="0.1.0"; sha256="19hpfxi5n7azri8bnlddil46252q61cg5pbfd307v5px96fw39xd"; depends=[magrittr sf units]; }; segregation = derive2 { name="segregation"; version="0.6.0"; sha256="0yajbbrbrkk6blb6r5y5fwvfz0j8kbc8fr91kb4f53j1afcbbhbx"; depends=[data_table]; }; segregatr = derive2 { name="segregatr"; version="0.2.0"; sha256="02hdwbahcym98f20nnxnn94xsrl4x6gzz26wrg2nhj2cq20fl4s4"; depends=[pedprobr pedtools]; }; + sehrnett = derive2 { name="sehrnett"; version="0.0.3"; sha256="09h30j390wnkglzq5c7ihladzmv2i439r27p3np2c850a69m0izp"; depends=[DBI dplyr magrittr purrr RSQLite tibble]; }; seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; }; seismicRoll = derive2 { name="seismicRoll"; version="1.1.4"; sha256="036yvfgy6d4dppfgqd8yx08k3mb03p44hch1ihcmmramz5cvdc29"; depends=[Rcpp]; }; sejmRP = derive2 { name="sejmRP"; version="1.3.4"; sha256="1j3sadbp12fip3n96s0hx1sg4kzwx8z01p1c905kv8gffhkz9bh0"; depends=[cluster DBI dplyr factoextra RPostgreSQL rvest stringi tidyr XML xml2]; }; @@ -16116,10 +16372,10 @@ in with self; { 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.3"; sha256="0zvb6wr7ga5618v8rwdvc2bk7gw19gn3kpfn584cfac9j933m62v"; depends=[]; }; - selectiongain = derive2 { name="selectiongain"; version="2.0.591"; sha256="11gd9xdn3jl3mg3c9ykw8bqvcxhihn19iqsy8dl8bacijjv84bva"; depends=[mvtnorm]; }; + selectiongain = derive2 { name="selectiongain"; version="2.0.707"; sha256="17d1m3fmkxfrk0lx4pyz5cwkfdqnj9hca2w4pi406441lk8y4dsn"; 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.3"; sha256="1gl7wi4wfy9rnyralf9051v5yhr27fcw45a8ib4ashcwrd5wcs9j"; depends=[ecespa spatstat spatstat_core spatstat_geom]; }; + selectspm = derive2 { name="selectspm"; version="0.4"; sha256="0yw5xwhv8kw3sizhq0r3wak8a32chkjil3lmxac8c6g9k47q8yrq"; depends=[ecespa spatstat spatstat_core spatstat_geom spatstat_random]; }; seleniumPipes = derive2 { name="seleniumPipes"; version="0.3.7"; sha256="1krpzh2gy3yl07c2n1d8q21xjc2qcv5ac1kv7212710bxkdyfad6"; depends=[httr jsonlite magrittr whisker xml2]; }; selfea = derive2 { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; }; selfingTree = derive2 { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; }; @@ -16127,7 +16383,7 @@ in with self; { sem = derive2 { name="sem"; version="3.1-13"; sha256="0r9g4j0w6q4qy9jl9gkjkihml4109ymg3y6zmhyg806q19qryx07"; depends=[boot MASS mi]; }; semEff = derive2 { name="semEff"; version="0.6.0"; sha256="0w919y49kl2vq9psnjn03cwwp99myip5cbvm6jmkkjiikx8iikh0"; depends=[boot gsl lme4]; }; semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; }; - semPlot = derive2 { name="semPlot"; version="1.1.2"; sha256="0l1v9yi1pv59iwfknw4dh9qskk5y8r347jq1vq13gnfd3bmd71xr"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph regsem rockchalk sem XML]; }; + semPlot = derive2 { name="semPlot"; version="1.1.5"; sha256="0d7v9yqc9nhx3hdrp444w1ah66zai3lg5y778m85r7ngh1prxlvc"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph rockchalk sem XML]; }; semPower = derive2 { name="semPower"; version="1.2.0"; sha256="1y3j6b3ab19fqxzqrrssjcj7f0za0vkwq97s7qs6hwj9yfsg1nas"; depends=[]; }; semTable = derive2 { name="semTable"; version="1.8"; sha256="0qr420rnz59q8arf6x05iy1zyh7pv31ldi2rsw1j2a00fbpp4ndf"; depends=[kutils lavaan plyr stationery xtable]; }; semTools = derive2 { name="semTools"; version="0.5-5"; sha256="1dpsn43ifvfy5v8w2fqdy54yclmy0d3qlzix67lflr2r7isq7y6x"; depends=[lavaan pbivnorm]; }; @@ -16148,7 +16404,6 @@ in with self; { sen2r = derive2 { name="sen2r"; version="1.5.0"; sha256="1k47hb1rnarnz3sgcn1qb5hm0lfhpaw8q3gg8ll6avw5ilgqv2sj"; depends=[data_table doParallel foreach geojsonio httr jsonlite raster RcppTOML rgdal sf stars XML]; }; sendgridr = derive2 { name="sendgridr"; version="0.4.3"; sha256="0gi4b8v6896dp1r984j8pvdxpqik3p7bhnza90vj5b1f4xvb2rcc"; depends=[base64enc cli emayili httr jsonlite magrittr usethis]; }; sendmailR = derive2 { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; }; - sensR = derive2 { name="sensR"; version="1.5-2"; sha256="073za0z6dawba2nd45hs20m0143kckxn3iglkyqz9vdfqwyv7wlq"; depends=[MASS multcomp numDeriv]; }; sense = derive2 { name="sense"; version="1.0.0"; sha256="09idl88n6jlgbn5apgk0vr1bwmqi624ikv1qfx7hvyi79ixg49f4"; depends=[bbotk data_table forcats lubridate Metrics mlr3 mlr3filters mlr3learners mlr3pipelines mlr3tuning mlr3viz paradox purrr readr tictoc visNetwork]; }; 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]; }; @@ -16166,6 +16421,7 @@ in with self; { sensory = derive2 { name="sensory"; version="1.1"; sha256="1zd0ajrymxi6gygcq9fqgwgy0g6c3cqz53x0k5m0ihbmh11rc7s7"; depends=[gtools MASS Matrix]; }; senstrat = derive2 { name="senstrat"; version="1.0.3"; sha256="0j6mb55v5ivqvk8nn8fjlzrbdgj6csa58yc6gy1g07m7gk2qz2np"; depends=[BiasedUrn MASS]; }; sentencepiece = derive2 { name="sentencepiece"; version="0.2.1"; sha256="0mwmgnkmahlik8nl14pkzi351jv9c00iylj7f5h6wkjbrizkdd34"; depends=[Rcpp]; }; + sentiment_ai = derive2 { name="sentiment.ai"; version="0.1.0"; sha256="1i7lihj66wgl1fciqm3kii3plflicjrrpzv8q899wcmky2whfgmf"; depends=[data_table jsonlite reticulate roperators tensorflow tfhub xgboost]; }; 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]; }; sentryR = derive2 { name="sentryR"; version="1.1.0"; sha256="0kz81dbxg4zyns829cjhjm2g88pxzaaxdk7c8qabvl0zgqys2chy"; depends=[httr jsonlite stringr tibble uuid]; }; @@ -16178,11 +16434,11 @@ in with self; { seqR = derive2 { name="seqR"; version="1.0.1"; sha256="0a80w7pyf2hbyzlm010xj3xv1dzkdc2w9s48hhfbsig88f497ki7"; depends=[Matrix Rcpp RcppParallel rlang slam]; }; seqRFLP = derive2 { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; }; seqest = derive2 { name="seqest"; version="1.0.1"; sha256="06zk87n26305m0hy6lg7v3bpxmsqvinwkvw3dvmzkqp5jdkhwikb"; depends=[foreach geepack MASS mvtnorm nnet Rcpp RcppArmadillo VGAM]; }; - seqgendiff = derive2 { name="seqgendiff"; version="1.2.2"; sha256="0vrmh4h2g4hvx8ix5jyc4bhp8vpr00fcqsfbf9r0808jqnlwgcnr"; depends=[assertthat cate clue irlba matchingR pdist sva]; }; + seqgendiff = derive2 { name="seqgendiff"; version="1.2.3"; sha256="0vyrs4i3q3lyqx0b1as7h2rm3s5kbapq6jxzag8dwhf0ch7yz8gv"; depends=[assertthat cate clue irlba matchingR pdist sva]; }; seqhandbook = derive2 { name="seqhandbook"; version="0.1.0"; sha256="0zncpjabazci92wzw126i491669gidkyiw7zjp7iw23m6jaf71l4"; depends=[TraMineR]; }; seqinr = derive2 { name="seqinr"; version="4.2-8"; sha256="1xz9spln6s9mcwpgcv1m4jymn4gnl1bb6vh90bphqcn0vvlk8jsq"; depends=[ade4 segmented]; }; seqmagick = derive2 { name="seqmagick"; version="0.1.5"; sha256="0h1vdsx88k3mpajfv0cgswk2s1560zm6y776b4dqrdkvkcgdbb3g"; depends=[Biostrings magrittr]; }; - seqminer = derive2 { name="seqminer"; version="8.2"; sha256="097313x72jr2q6dp8ma33w8kyp3gfw71snf1qx2maxbwwnysk085"; depends=[]; }; + seqminer = derive2 { name="seqminer"; version="8.4"; sha256="1mbx1hw9dhgry7hhan43g6aiz2lyd5api7wxq3fwajyzjrc6p1g8"; depends=[]; }; seqmon = derive2 { name="seqmon"; version="2.4"; sha256="1aqrg9aqvsabg5mm9jfj5vaxxaapfs1qw3yyzbx7vsspcgjdhyca"; depends=[]; }; seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; }; sequence = derive2 { name="sequence"; version="2.0"; sha256="0r5h96gcp18lwgrl2pjlr71xqspkf6qmm1m0xjq5vadalfa7y294"; depends=[]; }; @@ -16190,10 +16446,10 @@ in with self; { sequenza = derive2 { name="sequenza"; version="3.0.0"; sha256="13l16lacdcf7fn96yj3xqxap0l19ma9ppkxxx5qk9f5abbvdk303"; depends=[copynumber iotools pbapply readr seqminer squash]; }; 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.3.1"; sha256="08c37n3xxc4n4vbkw38k3l3hdlmck8drqpl6z274vkgi2sqv8qyf"; depends=[cluster colorspace gclus MASS qap registry TSP]; }; + seriation = derive2 { name="seriation"; version="1.3.3"; sha256="1f6hxbrixqaj4vh4svff5pz9ny9h10snrrigk2r9c59amhkgih80"; depends=[cluster colorspace gclus MASS qap registry TSP]; }; serieslcb = derive2 { name="serieslcb"; version="0.4.0"; sha256="1ip4k2xzg06hwsni62ai1whs1zzhwlf94507inpfpqz3jmmafrhq"; depends=[gplots shiny]; }; seroincidence = derive2 { name="seroincidence"; version="2.0.0"; sha256="0sam4y7w6prswz0izkm1a9v2k5rv7z22g1ajy15n9xix9aml5ms4"; depends=[]; }; - serp = derive2 { name="serp"; version="0.2.3"; sha256="0fbhcn10vvyg29sg5i39i004vks4in21br1gm8zhlx9sqmw7m0l0"; depends=[crayon ordinal]; }; + serp = derive2 { name="serp"; version="0.2.4"; sha256="0hd25rxknj636ssy2289xjvq5fflp2p561yb9w0siqihfc7cfjpc"; depends=[crayon ordinal]; }; serpstatr = derive2 { name="serpstatr"; version="0.1.0"; sha256="1myxw3dh3mkai803dnfdd1zyr2mjzsd2pw00l1fwmmbdplqg9q20"; 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]; }; @@ -16204,12 +16460,12 @@ in with self; { set = derive2 { name="set"; version="1.2"; sha256="0f36dp9k0nxp1amsd7ybwgbv0vxvgd1kns7cbfsbsh0kljxyplzp"; depends=[do]; }; set6 = derive2 { name="set6"; version="0.2.4"; sha256="06swz60p73a7m7rvsv1545hsr2chkk2w2hmnfwkwfz4hrbdxm709"; depends=[checkmate ooplah R6 Rcpp]; }; setRNG = derive2 { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; }; - sets = derive2 { name="sets"; version="1.0-20"; sha256="1mkmqi3n1lh01k47yvkr0dlf4imqdi6d6bglx9bvrjmg816p4jr3"; depends=[]; }; + sets = derive2 { name="sets"; version="1.0-21"; sha256="1h1a03b1850kh5hd3gxbspx2nxqxvk2gb0wm0s60b70qb6zg0csp"; 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=[]; }; sever = derive2 { name="sever"; version="0.0.7"; sha256="10jckf6q31blsl1yhs5f1mx7b8sm8sqb86iakcvaslf651ijx81m"; depends=[cli htmltools shiny]; }; severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; - sf = derive2 { name="sf"; version="1.0-5"; sha256="1i0s9839m9zffad2aq6zgcpz0d61g68caqh9wxaxaxx7bvx2h319"; depends=[classInt DBI magrittr Rcpp s2 units]; }; + sf = derive2 { name="sf"; version="1.0-7"; sha256="0lsl4rh4lbv386hxlsnnwsjb5x1n9d3z0ckjmxakmmrqjjmiywyh"; depends=[classInt DBI magrittr Rcpp s2 units]; }; sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; sfaR = derive2 { name="sfaR"; version="0.1.0"; sha256="1lgazgj6xfg0syspw6wzmd4xyczydhdgghpaf9kgrqvqfkaqcf8p"; depends=[dplyr emdbook fBasics Formula gsl marqLevAlg MASS maxLik moments nleqslv numDeriv primes qrng randtoolbox trustOptim ucminf]; }; sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; }; @@ -16218,8 +16474,9 @@ in with self; { sfcr = derive2 { name="sfcr"; version="0.2.1"; sha256="05ip1z6rh0k7az0y7nwp9c6rv1s53i0i698yfhx46lfnhzz87anf"; depends=[dplyr expm forcats igraph kableExtra magrittr purrr Rcpp RcppArmadillo Rdpack rlang rootSolve stringr tibble tidyr tidyselect vctrs]; }; sfdct = derive2 { name="sfdct"; version="0.1.0"; sha256="0p3ipp6x8vnsi94078n098yk9wglnawvzh19imcgk2c1l5lazwgf"; depends=[dplyr RTriangle sf sp tibble]; }; sfheaders = derive2 { name="sfheaders"; version="0.4.0"; sha256="0ig02nszrs6fkjkrkqibp23n4a8qr4i09yz7l741yjd0308ddg46"; depends=[geometries Rcpp]; }; + sfhotspot = derive2 { name="sfhotspot"; version="0.2.0"; sha256="1fy0y3nshfi6951qfplmsnrhlw24hwapifqwrffigbk5cq7ls9d3"; depends=[rlang sf SpatialKDE spdep tibble]; }; sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; }; - sfnetworks = derive2 { name="sfnetworks"; version="0.5.4"; sha256="15sxnwg62zwanl6rb1sl5a1l5gvhbvra6ildfi7wp87v99vpss4i"; depends=[crayon dplyr igraph lwgeom rlang sf sfheaders tibble tidygraph units]; }; + sfnetworks = derive2 { name="sfnetworks"; version="0.5.5"; sha256="17lj828ds16v6splx84s8vykvinm3iz0whmx34cr08b7aadw0yqf"; depends=[crayon dplyr igraph lwgeom rlang sf sfheaders tibble tidygraph units]; }; sfo = derive2 { name="sfo"; version="0.1.1"; sha256="0ja0kyrr6vqwk9fj1hq9bvfkak2vgav0hlqpgn4sa9h9j1s8r4js"; depends=[]; }; sfsmisc = derive2 { name="sfsmisc"; version="1.1-12"; sha256="10h76pgzcxv1y5pkmba9607lvjrsyq62sq63s2n7ry7z5151h4lv"; depends=[]; }; sft = derive2 { name="sft"; version="2.2-1"; sha256="0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33"; depends=[fda SuppDists]; }; @@ -16231,7 +16488,7 @@ in with self; { sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; }; sglOptim = derive2 { name="sglOptim"; version="1.3.8"; sha256="15bkkvgp9v9vsp65wps48g3c2fa0fj1025hbrziywq14j7wayyjr"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo RcppProgress]; }; sglasso = derive2 { name="sglasso"; version="1.2.4"; sha256="0sdarn39857405ndmqyka5ksvwczb5ifl5aap96wpm625iz2a1pi"; depends=[igraph Matrix]; }; - sglg = derive2 { name="sglg"; version="0.2.0"; sha256="0xhqilg1adn0758fypbbblxxc2fgf2g5j47003y3zc7v79hp93rz"; depends=[AdequacyModel Formula ggplot2 gridExtra moments plot3D pracma progress Rcpp survival TeachingSampling]; }; + sglg = derive2 { name="sglg"; version="0.2.1"; sha256="1smvzlbcn7gjfb2jnzqdhda607f88kh14wapidc3vhz4l0wnn9xs"; depends=[AdequacyModel Formula ggplot2 gridExtra magrittr moments plot3D plotly pracma progress Rcpp survival TeachingSampling]; }; sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; sgmcmc = derive2 { name="sgmcmc"; version="0.2.5"; sha256="0lq79c7i6bklh8c63wx3k6h9mk8s1abbr0hc41drcm96bbbg0aal"; depends=[reticulate tensorflow]; }; sgmodel = derive2 { name="sgmodel"; version="0.1.1"; sha256="1i13vp91i8s61ylsyg0iij1sfclwif7v91slr2srl8ddz6lm23nx"; depends=[ggplot2 ramify Rtauchen]; }; @@ -16243,7 +16500,7 @@ in with self; { sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; }; shades = derive2 { name="shades"; version="1.4.0"; sha256="1zg95sjhrfvbdlfc387g9p0vnb8nb6agdk1mb3wq3kwkm2da0bqj"; depends=[]; }; shadow = derive2 { name="shadow"; version="0.7.1"; sha256="055064jwxf9fkvw95w8if5aqcxrgg3b224qs1c81v8m8adr46v0r"; depends=[raster rgeos sp]; }; - shadowtext = derive2 { name="shadowtext"; version="0.1.0"; sha256="0b03gc97jbwcjnmjs9vzjid912wj6q27yqmq4bg06plpr0c5sj6l"; depends=[ggplot2 scales]; }; + shadowtext = derive2 { name="shadowtext"; version="0.1.1"; sha256="01h0w3b02r8snjkx5sxkf2x8xm4gd0r8jm27xqz9cv6hgqfmh1pb"; 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=[]; }; @@ -16252,7 +16509,7 @@ in with self; { shapes = derive2 { name="shapes"; version="1.2.6"; sha256="1p9fr95zk3q2v277c5ksb0nh26mcpzwjzjb2lmag51z6hck8cb66"; 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.0"; sha256="1zzg58m38rkqsynczy5jwz97ph3s85aa975ffi4i5vml82zlhc4y"; depends=[condMVNorm data_table Matrix mvnfast Rcpp RcppArmadillo]; }; - shar = derive2 { name="shar"; version="1.3.1"; sha256="10h8qk1syflz9grzzdkbxjl9ym22yimva14xx0m1xcbi20nd6a05"; depends=[classInt raster spatstat_core spatstat_geom]; }; + shar = derive2 { name="shar"; version="1.3.2"; sha256="1fks9gpm01q5phicgv1znl2d7j63w3m0w63xd1a38qypvqd9gqxp"; depends=[classInt raster spatstat_core spatstat_geom spatstat_random]; }; sharpData = derive2 { name="sharpData"; version="1.4"; sha256="1pnza52wqczjds4vp2fy9ky41y7lyj9ywam11nsr0mpv63jglnc5"; depends=[KernSmooth quadprog]; }; sharpPen = derive2 { name="sharpPen"; version="1.7"; sha256="1nhmxfyrzmm6qgwrlfc046lm9n8n5r62ym44956zg2z1m2vhnysf"; depends=[glmnet KernSmooth MASS Matrix np]; }; sharpeRratio = derive2 { name="sharpeRratio"; version="1.4.2"; sha256="1l0ix779kzci647v4irxs0j83zwfchd51k8576ivis7cr5f1a9v6"; depends=[ghyp Rcpp]; }; @@ -16277,13 +16534,13 @@ in with self; { shinyAce = derive2 { name="shinyAce"; version="0.4.1"; sha256="1m33dfm2kjirvgix7ybv1kbzgjkicdpv411g9c0q3fw6rnyhfxxn"; depends=[jsonlite shiny]; }; shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; }; shinyChakraSlider = derive2 { name="shinyChakraSlider"; version="0.1.0"; sha256="1vsbw9dm8ai2w6mfdaksxh13ryh2awajqgkcwcxb99l47h17rvpy"; depends=[htmltools reactR shiny]; }; - shinyChakraUI = derive2 { name="shinyChakraUI"; version="1.1.0"; sha256="128j376fhajw1ilbygf20d9h93889n38qc22hmg0lig7j880z3zx"; depends=[fontawesome formatR htmltools jsonlite reactR rlang shiny stringr]; }; + shinyChakraUI = derive2 { name="shinyChakraUI"; version="1.1.1"; sha256="08qy6qrrprqlarwd3kab9s92dlx51jkhk7mikkf0mdhl6n2q26py"; depends=[fontawesome formatR htmltools jsonlite reactR rlang shiny stringr]; }; shinyCyJS = derive2 { name="shinyCyJS"; version="0.0.11"; sha256="1wvrv5hdr74d2a68iwy76ffawmy4mpw0swrngw41zqpjd6hjiyxd"; depends=[htmlwidgets]; }; shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; }; shinyEffects = derive2 { name="shinyEffects"; version="0.2.0"; sha256="1ajar09hmrk7vcw89wkgvkz2yl0cfnkz915b57w1lmbvpxzgsq3i"; depends=[htmltools shiny]; }; shinyFeedback = derive2 { name="shinyFeedback"; version="0.4.0"; sha256="1xfznq2d4wkk0b0y4k25rwg4d3bhn3gxlkf3chfqk44f4rgril11"; depends=[fontawesome htmltools jsonlite shiny]; }; shinyFiles = derive2 { name="shinyFiles"; version="0.9.1"; sha256="0f8dfdiar376lx0979ccyghgx5rhr08v5z3z60asrrjsxlq4cs85"; depends=[fs htmltools jsonlite shiny tibble]; }; - shinyGovstyle = derive2 { name="shinyGovstyle"; version="0.0.7"; sha256="08lslxzmlzyrphaf0i3pqj21q2iqqskmlr7dnhm4yrfvm6jllglz"; depends=[htmltools jsonlite shiny shinyjs]; }; + 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]; }; 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]; }; @@ -16291,7 +16548,7 @@ in with self; { shinyLP = derive2 { name="shinyLP"; version="1.1.2"; sha256="1sjcll10ciq6pj9h8c6ybjqp8763wc423hddlalcblxxpajf6avz"; depends=[shiny]; }; shinyML = derive2 { name="shinyML"; version="1.0.1"; sha256="086iavycv1gd6scfsixf7cmw0s5a4dc6x5cylfasxrzgiixd76c9"; depends=[argonDash argonR data_table dplyr DT dygraphs ggplot2 h2o lubridate plotly shiny shinycssloaders shinyjs shinyWidgets sparklyr tidyr]; }; shinyMatrix = derive2 { name="shinyMatrix"; version="0.6.0"; sha256="17v7gg5bli6x3w063id804859m6g07i9ksbm2jyb65489pjgpadk"; depends=[jsonlite shiny]; }; - shinyMergely = derive2 { name="shinyMergely"; version="0.1.0"; sha256="04bzrg4n0s3izm3aa2jb141ikvf7gn3qmbjajqcms1i9zyw12y4s"; depends=[shiny]; }; + shinyMergely = derive2 { name="shinyMergely"; version="0.2.0"; sha256="1rvv5lcbb17i263xx1zn9524iwpmw56xwh0b2qii8096l20w6cnd"; depends=[shiny]; }; shinyMobile = derive2 { name="shinyMobile"; version="0.9.1"; sha256="1v3qs6s3k7s1rnliv06ljx06cgkw154xbl0c1aiv9jjqq16rxh01"; depends=[htmltools httr jsonlite magrittr shiny]; }; shinyMolBio = derive2 { name="shinyMolBio"; version="0.2"; sha256="09lq5pvis450il1agcq5n9cilnq84rfv08w2dz1d0bbq1qgrgnvg"; depends=[checkmate dplyr plotly purrr RColorBrewer RDML shiny stringr whisker]; }; shinyMonacoEditor = derive2 { name="shinyMonacoEditor"; version="1.1.0"; sha256="12inzz9vrxi1465l82fafjva198qxyzwailx1s0fm58cqzhnqxr6"; depends=[shiny]; }; @@ -16306,14 +16563,14 @@ in with self; { shinyTime = derive2 { name="shinyTime"; version="1.0.1"; sha256="1d830wf7d5ki7frbr1vgy9d0vllyfcylq7pfkspjkz64b2xfhah3"; depends=[htmltools shiny]; }; shinyToastify = derive2 { name="shinyToastify"; version="2.0.0"; sha256="0ipqwgl89pjiycwg78p0db45lbzry989kn6aqjsf79lpvghnk5qs"; depends=[fontawesome htmltools reactR shiny]; }; shinyTree = derive2 { name="shinyTree"; version="0.2.7"; sha256="0jfx2capckv7hf2yx3fn8i4rcmhi222ah91jnmhg497x8wgz31s3"; depends=[htmlwidgets jsonlite promises shiny stringr]; }; - shinyWidgets = derive2 { name="shinyWidgets"; version="0.6.2"; sha256="097dbzdyw85r7za8hyp9210k9zikxx56y15jb2m7bh5ryl1xj49d"; depends=[bslib htmltools jsonlite sass shiny]; }; + shinyWidgets = derive2 { name="shinyWidgets"; version="0.6.4"; sha256="1j7pii40zc60ny1d5027pjagi1rrcnb9kxn4q9jmd9xv84y5b8sj"; depends=[bslib htmltools jsonlite sass 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]; }; shinyanimate = derive2 { name="shinyanimate"; version="0.3.0"; sha256="0vshid5mfq006cprjj61d0g7ajyc3plc66x55c5jjmijwbp6pw7a"; depends=[shiny]; }; shinyauthr = derive2 { name="shinyauthr"; version="1.0.0"; sha256="0apaqjkxpr96kx9indl0pifk5y75gdx5npfcvxfg5k2crpx9vmxk"; depends=[dplyr glue rlang shiny shinyjs sodium]; }; shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; }; shinybrms = derive2 { name="shinybrms"; version="1.6.0"; sha256="0dbj0sl65sgg293knrarj7rc5fc8xvhdh601b2srs0zqp6vjzhbn"; depends=[brms rlang rstan shiny]; }; - shinybusy = derive2 { name="shinybusy"; version="0.2.2"; sha256="06vfkv382xcpjh30i7d4ym4vyravadp5vjsvrnw4npy0302pdmzl"; depends=[htmltools htmlwidgets jsonlite shiny]; }; + shinybusy = derive2 { name="shinybusy"; version="0.3.0"; sha256="07cx7g55sq36i2fpnf2fz6d4a4dqys00j8fbkfj9kg61gfban5s3"; depends=[htmltools htmlwidgets jsonlite shiny]; }; shinycssloaders = derive2 { name="shinycssloaders"; version="1.0.0"; sha256="0r3xm273lhdhzbs2mkgw1m2kwb7z1dh1pzya8yxy5vacda1l2ikl"; depends=[digest glue shiny]; }; 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]; }; @@ -16326,7 +16583,7 @@ in with self; { shinyglide = derive2 { name="shinyglide"; version="0.1.3"; sha256="095p5rkx1ms3qdcrrnqkdfz5nylj19r4b5rv9jpkf2a1clhwfc0q"; depends=[htmltools shiny]; }; shinyhelper = derive2 { name="shinyhelper"; version="0.3.2"; sha256="1c4hvf19j3yyh8r12nx85ldkxs89g98q74csnqs5ml5l79a65vgp"; depends=[markdown shiny]; }; shinyhttr = derive2 { name="shinyhttr"; version="1.1.0"; sha256="1snrl7bg1bc5jxqs1c5a2ir6qnf1nq576aigk19k0ms4gb9hh66m"; depends=[httr shinyWidgets]; }; - shinyjqui = derive2 { name="shinyjqui"; version="0.4.0"; sha256="0ins0pmfis34jr0rimsp1k1aw856r3xjdnsvv8lkwqhvp58nzqah"; depends=[htmltools htmlwidgets jsonlite shiny]; }; + 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]; }; 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.0"; sha256="00rswic0kbrzr6ix88avsxdfnv2bx94kxjkln8li14zaqsdksivm"; depends=[anytime bit64 data_table digest htmltools jsonlite nanotime shiny]; }; @@ -16344,26 +16601,26 @@ in with self; { 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]; }; shinyservicebot = derive2 { name="shinyservicebot"; version="0.1.0"; sha256="18xbggiai6ssyl3q0nqhnszxb7zlbffaw0iy3r7vbzswzqx522la"; depends=[digest htmltools htmlwidgets shiny]; }; - shinystan = derive2 { name="shinystan"; version="2.5.0"; sha256="18alf5kiqw7y2l6m5nxxizwc2znsf9frxfsqhvgcad8hld9cbya5"; depends=[bayesplot colourpicker DT dygraphs ggplot2 gridExtra gtools markdown reshape2 rsconnect rstan shiny shinyjs shinythemes threejs xtable xts]; }; + 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.1"; sha256="0pjcdkyv1f94fxzpbc9m02kdv8v6jh6dmxsc1kmr22qcj1cbql8s"; depends=[assertthat callr crayon debugme digest htmlwidgets httpuv httr jsonlite parsedate pingr R6 rematch rlang rstudioapi shiny testthat webdriver 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.1"; sha256="04sl1z8i3d2pndxzylc80m435jwjik2yl5g82gaylhz7kj3fqxn4"; depends=[glue htmltools rlang shiny]; }; - shipunov = derive2 { name="shipunov"; version="1.16"; sha256="15960ngphpnljp8nvxcwrvfibs5pj7yygxbd5zlj9nkyaifl8ngs"; depends=[PBSmapping]; }; + shipunov = derive2 { name="shipunov"; version="1.17"; sha256="15gakqapgi9yl9i31nqw1h6p89qphmlyn9dfhmf2ps3ki4ijq44k"; depends=[PBSmapping]; }; shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; }; shopifyr = derive2 { name="shopifyr"; version="1.0.0"; sha256="05hih1v5vvr7vmwarizsdx8517g74s96fdsz3klcz3g12idx1nqn"; depends=[curl jsonlite R6]; }; shortcuts = derive2 { name="shortcuts"; version="1.4.0"; sha256="0y77napfz1v3s667cmyn8357xg5lncbw1hc3hm5kra6nalhq1jps"; depends=[rstudioapi]; }; shorts = derive2 { name="shorts"; version="1.1.6"; sha256="1krjyi9xd7gys5259kf3q2paqwvyhqzici0qbi98754vlbnq53sq"; depends=[ggplot2 LambertW nlme tidyr]; }; shotGroups = derive2 { name="shotGroups"; version="0.8.1"; sha256="17lmdyimz4wsv284520qwb3f2ah7lg2w22rqswkqg0c46sy46gzm"; depends=[boot coin CompQuadForm KernSmooth robustbase]; }; showimage = derive2 { name="showimage"; version="1.0.0"; sha256="1c0x3iqjdjsz3cdhc02b3qm2pwxjr1q2k87jwvxj9lnzzw81f1pl"; depends=[png]; }; - showtext = derive2 { name="showtext"; version="0.9-4"; sha256="1gvj32wrs5q31bmg5dy6n85d0igm3jhkldhdv8kscw0pfrk89y36"; depends=[showtextdb sysfonts]; }; + showtext = derive2 { name="showtext"; version="0.9-5"; sha256="1larnqxn9nanbqiadm35ah5hh89xrzm4fdj9pfc93zzzhlfrvhb3"; 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.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; }; + shrink = derive2 { name="shrink"; version="1.2.2"; sha256="0d80a0qqrsb9ybzqvg3m6a9r16ky7hqchq0hjvj8ipk430mmxdjm"; depends=[MASS mfp rms survival]; }; shrinkDSM = derive2 { name="shrinkDSM"; version="0.1.0"; sha256="01yvs1shsp7npfm9w1caprb1x8w42zlzswc2fk9y6q340i51kfzm"; depends=[coda Rcpp RcppArmadillo RcppProgress shrinkTVP stochvol]; }; - shrinkTVP = derive2 { name="shrinkTVP"; version="2.0.4"; sha256="15avxdrn4734p1hbv8q0kc2zngarsr96ca25dqv4kd75q721c9nz"; depends=[coda GIGrvg Rcpp RcppArmadillo RcppProgress stochvol zoo]; }; + shrinkTVP = derive2 { name="shrinkTVP"; version="2.0.5"; sha256="1qzk53l6n3a58ypqdisf2cj1nvgri2fvy0nz72wpvqnfsj3xcswz"; depends=[coda GIGrvg Rcpp RcppArmadillo RcppProgress stochvol zoo]; }; shuffle = derive2 { name="shuffle"; version="1.0.1"; sha256="0aqb11h340picx7z2jg3k46l3pr6fkknlpyzc0z89hhrc90pss48"; depends=[]; }; shuffleCI = derive2 { name="shuffleCI"; version="0.1.0"; sha256="1n9k28m1fcnw1my9a7v0gy9waygd48lab45vj9k2wwijbc325zai"; depends=[plotrix]; }; shutterplot = derive2 { name="shutterplot"; version="0.1.0"; sha256="129jv20m0dinb07lwiz9fxv4z7sxshcmjab2g0p5vrv8jlp9a0yv"; depends=[]; }; @@ -16374,14 +16631,13 @@ in with self; { siconvr = derive2 { name="siconvr"; version="0.0.1"; sha256="178bqjdx96lk8npa26w29aanal7g6x22b6p1p8gsbyi6h8acgkh0"; depends=[cli data_table dplyr httr magrittr tibble]; }; sideChannelAttack = derive2 { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; }; sidier = derive2 { name="sidier"; version="4.1.0"; sha256="0zayhvhaq0q00rpgy0z01rhf3lcc3791klc8b30pdj627cl9xj01"; depends=[ape ggmap ggplot2 gridBase igraph network]; }; - sidrar = derive2 { name="sidrar"; version="0.2.6"; sha256="069msxwgksvnwf67rb0rsbmfiv2b6xx8ds0fb2zmn2z19bi0pk0f"; depends=[magrittr RCurl rjson rvest stringr xml2]; }; + sidrar = derive2 { name="sidrar"; version="0.2.7"; sha256="120xb1yigi99irb3bn7w9var2h6adpc7ajfw754x3jvrakmfi6jk"; depends=[magrittr RCurl rjson rvest stringr xml2]; }; siebanxicor = derive2 { name="siebanxicor"; version="1.0.0"; sha256="0bnpqqhqvqq9kxvzljzp4d5aw9drh78cwyxyqzdvshijl7mmqjwc"; depends=[httr jsonlite]; }; sievePH = derive2 { name="sievePH"; version="1.0.1"; sha256="1hdccfq39sw3jsakv8lrnjp8mmc431l6ka1g9r53ihrz18s6c39v"; depends=[survival]; }; sievetest = derive2 { name="sievetest"; version="1.2.3"; sha256="17qrm7axvlr2yzp8brbibp26f8qdpqm85hc2kjzxm5zqwfvd6dfs"; depends=[]; }; sift = derive2 { name="sift"; version="0.1.0"; sha256="030vv2rha5d20045bwsp6ihdcgiw9glnchyahpzwym3m6fnkg0y5"; depends=[cpp11 dplyr glue pastecs purrr rlang tibble tidyr tidyselect]; }; sig = derive2 { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; }; sigInt = derive2 { name="sigInt"; version="0.2.0"; sha256="1y3qbfsynssam05q4947zqd0dkrpcnq5pla409i3xy511wv9702d"; depends=[Formula MASS maxLik pbivnorm randomForest stringr xtable]; }; - sigQC = derive2 { name="sigQC"; version="0.1.22"; sha256="17b16mjadmsbqbai90bvryydkfy9k5ww9i65a5ahy3bfjch851f2"; depends=[biclust circlize class cluster ComplexHeatmap fmsb gplots gridGraphics GSVA KernSmooth lattice MASS mclust moments nnet RankProd]; }; sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; }; sigmaNet = derive2 { name="sigmaNet"; version="1.1.0"; sha256="1i0xikwad9kiyrqxi1klkc4h4hyqfkxr388sw4mrx9pswfpbv3xr"; depends=[htmlwidgets igraph jsonlite RColorBrewer]; }; sigmajs = derive2 { name="sigmajs"; version="0.1.5"; sha256="1d26llpgnj687b8rwgbyhw88zakp334n4a9gabf72qwrg4awm1v5"; depends=[crosstalk dplyr htmltools htmlwidgets igraph jsonlite magrittr purrr scales shiny]; }; @@ -16391,7 +16647,7 @@ in with self; { signalHsmm = derive2 { name="signalHsmm"; version="1.5"; sha256="1d4v6cbvcbi8pb5zmn58s01h3jb0kv7yr7qvcnx4p2v82knvhik7"; depends=[Rcpp seqinr shiny]; }; signed_backbones = derive2 { name="signed.backbones"; version="0.91.5"; sha256="0xk8sncblzihqzqfpaq7158slvrb6ww3dc4v5di1m2bqwhykncwi"; depends=[reshape2]; }; signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; }; - signnet = derive2 { name="signnet"; version="0.7.1"; sha256="06mzscjaay0wib8mmnbcacj8zy84nx9p00i8gcpr4nklxfarib3w"; depends=[igraph Matrix Rcpp RcppArmadillo]; }; + signnet = derive2 { name="signnet"; version="0.8.0"; sha256="0iymm9crvppb7yrp163y5i605bl1mdw7bxzgr5s4zflhzf1njv4s"; 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]; }; @@ -16424,16 +16680,17 @@ in with self; { simfam = derive2 { name="simfam"; version="1.0.3"; sha256="0biz3dz1mrzj601p99h4k58p4ybh5f42qzbqivk8irz1wsbm6n4v"; depends=[Rcpp tibble]; }; simfinapi = derive2 { name="simfinapi"; version="0.2.0"; sha256="10s6m6ahkp6gw1b3axr7m2wrbh34m48aml20yl9kypkwd6af865j"; depends=[bit64 checkmate data_table future_apply httr memoise progressr RcppSimdJson]; }; simfit = derive2 { name="simfit"; version="0.1.0"; sha256="0wlkkpxvpxd17y2kgfwjyjlrwj48z27mhss8r7yp4410l0a2llgy"; depends=[ggplot2 magrittr]; }; - simglm = derive2 { name="simglm"; version="0.8.8"; sha256="18k3wd9j4hyph9db4h8r7cc93g8f3jkshraj3jn6mpg6k911w78n"; depends=[broom dplyr future_apply Matrix purrr rlang]; }; + 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.1"; sha256="0hnqvymmyimh6244r8a8qmmsb799pgj6j6yvgdnhvjmss8ymif9d"; depends=[dplyr furrr future magrittr purrr Rdpack rlang rstudioapi tibble tidyr]; }; simlandr = derive2 { name="simlandr"; version="0.1.2"; sha256="1f1r22a7w8xqkgavnb6g06if29vf1905d3h32ww9zzxz65g3a9qa"; depends=[bigmemory digest dplyr forcats gganimate ggplot2 htmlwidgets ks magrittr MASS plotly purrr rlang scales tibble]; }; - simmer = derive2 { name="simmer"; version="4.4.3"; sha256="0vp1dc9kpinl4hkyrig5msssl35wxd9w9jyk7lbknxavjp1aqc69"; depends=[BH codetools magrittr Rcpp]; }; + simmer = derive2 { name="simmer"; version="4.4.4"; sha256="1rk6c4i6w3z3zhv2yr2lzhcr10araxxcycn556pncqp4f0ycb2l8"; depends=[BH codetools magrittr Rcpp]; }; simmer_bricks = derive2 { name="simmer.bricks"; version="0.2.1"; sha256="1s73mfmpjz91n932kjk50aai5j3p1sjibq73yxrjdhlyhiy4d8lp"; depends=[simmer]; }; - simmer_plot = derive2 { name="simmer.plot"; version="0.1.16"; sha256="15snsxbljapk1br3psd6ypwa34a6x57zrblgpjyihpaivpxcz7m6"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; }; + simmer_plot = derive2 { name="simmer.plot"; version="0.1.17"; sha256="15bg7y21kgzvgzwzxpdwq9pay92ms2dkg9a1lpqlg5dx892rfr7n"; 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.4.5"; sha256="0kv3ip0yq3r2a9dglx0pkjvg5bkf9fg2x051dp6z0ld1c0f4p6ms"; depends=[bayesplot boot checkmate compositions ggplot2 MASS R2jags reshape2 viridis]; }; simode = derive2 { name="simode"; version="1.2.0"; sha256="0wlnd01xfdqvjfvmkhkj6nvkrnv5ghjv4md5nhaqsjc8bycawyl0"; depends=[deSolve pracma quadprog]; }; + simphony = derive2 { name="simphony"; version="1.0.0"; sha256="1r95wk526bc1frvcb11zx7hx3lrjvqw5wcwcv0j8mi4ylhhw9w9d"; depends=[data_table foreach]; }; simpleCache = derive2 { name="simpleCache"; version="0.4.2"; sha256="0zayq4n8cc0xgszckjvvf55ygy8hwywv161pp8pqi2k4z91rq4lz"; depends=[]; }; simpleFDR = derive2 { name="simpleFDR"; version="1.1"; sha256="09w7l8pb6kibzifwyqcgshlxjq2gn6s642i78939q00q0m9qvdbk"; depends=[dplyr tidyr]; }; simpleMH = derive2 { name="simpleMH"; version="0.1.0"; sha256="02arll0w39b4cz7gslka26lvjg90xy83kqiyvm4gxnsbw7s9hkyr"; depends=[mvtnorm]; }; @@ -16447,11 +16704,12 @@ in with self; { simplegraph = derive2 { name="simplegraph"; version="1.0.0"; sha256="1gcpbljp1fgaprxnmq23izf1h2x3p5dnxlylwqsnlcj50bvm46gq"; depends=[]; }; simplegraphdb = derive2 { name="simplegraphdb"; version="2021.03.10"; sha256="0573hrv23nimmf3d8dgdynii79h84a3mfr4xxk3cggxhsxpfmb2i"; depends=[DBI rjson RSQLite]; }; simplermarkdown = derive2 { name="simplermarkdown"; version="0.0.4"; sha256="069pgx5m22rdqa21lyn5zqm9ym3g7w6z1d2wjwms8b1f2cp6266g"; depends=[rjson]; }; - simplevis = derive2 { name="simplevis"; version="5.0.0"; sha256="0hrv0dgghl9rba2rk2w1q4vg306djnz69hp4daxf462y95nnh1k7"; depends=[dplyr forcats ggplot2 htmlwidgets leafem leaflet leafpop lubridate magrittr purrr rlang scales sf snakecase stars stringr tidyr tidyselect viridis]; }; + simplevis = derive2 { name="simplevis"; version="6.2.0"; sha256="1w4ahwr7d8s2cfc3n8s8sqkk2gwnwzanqlx03csjbip7kq2lc5qa"; depends=[dplyr forcats ggplot2 htmlwidgets kimisc leafem leaflet leafpop lubridate magrittr plotly purrr rlang scales sf shiny snakecase stars stringr tidyr tidyselect viridis]; }; simplexreg = derive2 { name="simplexreg"; version="1.3"; sha256="1zkh00xbddhgz0qn0a5pj12n0hpx4f5kihpfj71x92pmxpzglcxh"; depends=[Formula plotrix]; }; simplextree = derive2 { name="simplextree"; version="1.0.1"; sha256="18jvzcz4fdsi17j7qdqpjvx6zygvlcvpziikb8qxskaib5180l08"; depends=[magrittr Rcpp]; }; + simpr = derive2 { name="simpr"; version="0.2.2"; sha256="19gc6fxjw4fxz9swf27qf2z5d2mwgcdcg2dyfyvvx3rkzn51bwia"; depends=[broom dplyr furrr generics magrittr purrr rlang tibble tidyr tidyselect]; }; simputation = derive2 { name="simputation"; version="0.2.7"; sha256="0jw0j57pgg06ix7yr01bbv314w2dh08idjvsa46s02xkqn37cb7q"; depends=[gower MASS rpart]; }; - simr = derive2 { name="simr"; version="1.0.5"; sha256="1j5w93iliykfnpxl9kzh1rp6d3iy26ksj3j7yjl348yvplh0iyjl"; depends=[binom car iterators lme4 pbkrtest plotrix plyr RLRsim stringr]; }; + simr = derive2 { name="simr"; version="1.0.6"; sha256="1q8ip54c5pc7pjf8127jpk56nr3f8rmwqdcrr84faj4lfbr27wqb"; depends=[binom car iterators lme4 lmerTest pbkrtest plotrix plyr RLRsim stringr]; }; simrec = derive2 { name="simrec"; version="1.0.0"; sha256="17zzbzgdisp5qh0vlbmkjf6a3axnpwj2kw03wymfbb3z557pbxlr"; 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]; }; @@ -16459,7 +16717,7 @@ in with self; { simsem = derive2 { name="simsem"; version="0.5-16"; sha256="0scjb308pb8ivy5blbk1wj9d1yxcqknhvh95a3728crfq2xcqnh0"; depends=[lavaan]; }; simsl = derive2 { name="simsl"; version="0.2.1"; sha256="12dc9lcy11g1yynycvcqm62npq0v13bg6fnykb5m9ijwga4x51il"; depends=[mgcv]; }; simstandard = derive2 { name="simstandard"; version="0.6.3"; sha256="1l1vny3csrr7krfpn25rzysmwjfv6mclf51y3mq02cimcwq9fzcy"; depends=[lavaan magrittr mvtnorm purrr rlang tibble]; }; - simstudy = derive2 { name="simstudy"; version="0.3.0"; sha256="1dvfdrgyjnqij5hgr4ffw926m5anys03k6zv7h5jx5hpx5lfx5gv"; depends=[backports data_table glue mvnfast mvtnorm Rcpp]; }; + simstudy = derive2 { name="simstudy"; version="0.4.0"; sha256="06dq7kn2k8y84g341bb4jvvjl8x6q5r1asz6v3bgq3pbfl59f9jp"; depends=[backports data_table glue mvnfast mvtnorm Rcpp]; }; 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.0.21"; sha256="0l5x33ik4s8wlh9002dslygprh1q4j3nfr3s4yw8hpq12k5pvg8z"; depends=[PRROC]; }; @@ -16474,9 +16732,10 @@ in with self; { singcar = derive2 { name="singcar"; version="0.1.3"; sha256="17f80cqkgcyvmaavpqia9z54h3yf5as3v294fsc09l3zshzvbzg6"; depends=[CholWishart MASS withr]; }; singleCellHaystack = derive2 { name="singleCellHaystack"; version="0.3.4"; sha256="08s31z15v4px3sfm2q2ips64qknahw04xhh6d5nmlsl65wbd143x"; depends=[ggplot2 Matrix reshape2]; }; sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; }; - siplab = derive2 { name="siplab"; version="1.5"; sha256="1gfncsqgwj7ljm7cik6kmcqynzppqlqlq1f9qpmvzfpf6fd1ccxp"; depends=[spatstat]; }; + 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.1"; sha256="03hwrf40wp6jn6y6s3q0hgv4hnndrck2qb94c4jqj6lcwn673h9f"; depends=[EFA_MRFA lavaan psych]; }; sirt = derive2 { name="sirt"; version="3.11-21"; sha256="06lazl1navs7cpm4ql19y00h4m8yijf2mrjpvr4rsh16b157rssb"; depends=[CDM pbv Rcpp RcppArmadillo TAM]; }; sirus = derive2 { name="sirus"; version="0.3.2"; sha256="1j821vxy81x12yv229k334s8cwjl5fla2wvlhdz01rf688sv0hbs"; depends=[ggplot2 glmnet Matrix Rcpp RcppEigen ROCR]; }; sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; }; @@ -16493,17 +16752,19 @@ in with self; { sivs = derive2 { name="sivs"; version="0.2.5"; sha256="16w1yixb2wfgprnfm408l11nz9j28by7sz82x17rzmjb6p3n1jw5"; 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.10"; sha256="1rnwhh271xj8xgvvlpqw9ain56mfz37fvl7f6jq9nzx9jxx95bjd"; depends=[bayestestR datawizard dplyr effectsize ggeffects ggplot2 insight knitr MASS parameters performance purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; + sjSDM = derive2 { name="sjSDM"; version="1.0.0"; sha256="1jswpi6m0yhq5vf9s6mxg36fi9ig8cs8zbm6yj56khyi3q159lw8"; depends=[abind checkmate cli crayon ggplot2 mathjaxr Metrics mgcv mvtnorm reticulate rstudioapi Ternary]; }; sjdbc = derive2 { name="sjdbc"; version="1.6.1"; sha256="0cz5qc5lsipd3nlkzj8j03xmpzxp52c3q5av8pr7fm3vsdclawfk"; depends=[rJava]; }; sjlabelled = derive2 { name="sjlabelled"; version="1.1.8"; sha256="17gskxr43rgbg7syla3b78g2qgksq2kj07iad4139xycqxblxya0"; depends=[insight]; }; sjmisc = derive2 { name="sjmisc"; version="2.8.9"; sha256="1gzkq95ckxr0vhrzggflzli9hs7zr8c0yym9zn1wf74yrr0mgc3q"; depends=[dplyr insight magrittr purrr rlang sjlabelled tidyselect]; }; sjstats = derive2 { name="sjstats"; version="0.18.1"; sha256="1cv80yjnyh6qihxf57zivihhia20gibr5f03x8aspy6382wnwlka"; depends=[bayestestR broom dplyr effectsize emmeans insight lme4 magrittr MASS modelr parameters performance purrr rlang sjlabelled sjmisc tidyr]; }; - skater = derive2 { name="skater"; version="0.1.0"; sha256="1liykd2gad50k6qhhr789g87vkdpwp561yrxqz5alfclvfax1bdk"; depends=[corrr dplyr kinship2 magrittr purrr readr rlang tibble tidyr]; }; + skater = derive2 { name="skater"; version="0.1.1"; sha256="0cylcwxqc75a7fkyn7llwp0c7k35sfsbylxrjn0cpdnxbyf5xcx5"; depends=[corrr dplyr kinship2 magrittr purrr readr rlang tibble tidyr]; }; skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; - skedastic = derive2 { name="skedastic"; version="1.0.3"; sha256="0f6pq5mj3mbam13283z4zyw7zgkvsld5y7ak0ahby9gb0na1zyhm"; depends=[arrangements bazar berryFunctions boot broom CompQuadForm cubature data_table expm gmp Hmisc MASS mvtnorm pracma quantreg Rdpack Rmpfr]; }; + skedastic = derive2 { name="skedastic"; version="1.0.4"; sha256="07i9sgqc96h9ih8r1n9fvryyw8znpap1bpmvbm62sm3qcj7m856p"; depends=[arrangements bazar boot broom CompQuadForm cubature data_table expm gmp MASS mvtnorm pracma quantreg Rdpack Rmpfr]; }; skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; }; skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; }; sketch = derive2 { name="sketch"; version="1.1.17"; sha256="17lb4fnlwvdxgsm8iipcx4v6fn1vkf5wr9zwmm6m4p770651z116"; depends=[base64enc glue htmltools jsonlite magrittr purrr rlang rstudioapi shiny]; }; sketcher = derive2 { name="sketcher"; version="0.1.3"; sha256="011lx15whrdj5q5h33h9brkzbn2fnpm1nx9ip1v9xl5xfkbj7952"; depends=[downloader dplyr imager jpeg magrittr png readbitmap stringr]; }; + sketchy = derive2 { name="sketchy"; version="1.0.2"; sha256="0nvf87w3zcnly4b39rg8pa1651pk8zixkn6rj7y2hbf1qiyjwsqg"; depends=[crayon git2r knitr packrat stringi]; }; skewMLRM = derive2 { name="skewMLRM"; version="1.6"; sha256="16gr0haag0pqw7k7nvfqlc6s5i92lkpd0ghkgvlwgql8jzw7zmlk"; depends=[clusterGeneration doParallel foreach MASS matrixcalc moments mvtnorm]; }; skewlmm = derive2 { name="skewlmm"; version="1.0.0"; sha256="1z7rz520vmjqmnak2zgxnnj7yhg7k2phclx3ilvkwzn9v8pd224j"; depends=[dplyr furrr future ggplot2 ggrepel haven moments mvtnorm nlme numDeriv optimParallel purrr]; }; skewsamp = derive2 { name="skewsamp"; version="1.0.0"; sha256="1b41zjjnn7vphcrbvrvqx66jfd9fb8v22xmgql6wh26a2y81bman"; depends=[]; }; @@ -16518,14 +16779,14 @@ in with self; { skynet = derive2 { name="skynet"; version="1.4.0"; sha256="1ir8sw99fvdy8zp7ncgdnggr8hv1ph21kvdi9my42vlsh2fqi5ja"; depends=[data_table dplyr geosphere ggplot2 ggrepel httr igraph leaflet maps stringr]; }; skyscapeR = derive2 { name="skyscapeR"; version="1.0.0"; sha256="1x3s003wdmnf0h1k3gl6cvd35g516y7v2yzahr3wxk2np832kjli"; depends=[doParallel foreach httr MESS numDeriv oce plotrix png RColorBrewer rootSolve swephR zoo]; }; slackr = derive2 { name="slackr"; version="3.2.0"; sha256="10klljhkycnyqkzq73gj71c2phdqx9l3lb2jzancc59x21wjqn3b"; depends=[cachem dplyr ggplot2 httr jsonlite magrittr memoise rlang tibble withr]; }; - slam = derive2 { name="slam"; version="0.1-49"; sha256="044hnfqbx57v5zr64gl09b5arj45swn9ywqzrl9rsc8267ys0028"; depends=[]; }; + 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]; }; sld = derive2 { name="sld"; version="1.0.0"; sha256="1027ipymal3wbmzjg8v6rvyb55hlpmj4hd5jwlac0yha1cvm8xyk"; depends=[lmom]; }; sleekts = derive2 { name="sleekts"; version="1.0.2"; sha256="0syk244xrsv8hz5sxm7wizk0kyn1nc6z4c63c8xn57fz130zj75k"; depends=[]; }; sleepr = derive2 { name="sleepr"; version="0.3.0"; sha256="1ka4pl6a09d1qga5svcirc5ywmzz9pcml09053745lz3p1v8fnn3"; depends=[behavr data_table]; }; sleepwalk = derive2 { name="sleepwalk"; version="0.3.2"; sha256="1y0945r9ksz8x6w5rx31sm9x2q2ydd9sc1fwa0paq5f11hygss5d"; depends=[cowplot ggplot2 httpuv jrc jsonlite scales]; }; - sleev = derive2 { name="sleev"; version="1.0.0"; sha256="0xjkh4v0845bpmyxh02avxvp7df9d3w6lack181p3xnm0j9m8g1m"; depends=[Rcpp RcppArmadillo RcppEigen]; }; + sleev = derive2 { name="sleev"; version="1.0.1"; sha256="04kdqzgspkx5f5vby6gzkg9capc2h84x6amp3g4m74vmkvyvgbf8"; depends=[Rcpp RcppArmadillo RcppEigen]; }; slfm = derive2 { name="slfm"; version="1.0.1"; sha256="0s7fdvr4fvsb4789f9ly2x820g4xvabl04wk7k6i8pd5ckj2xjhy"; depends=[coda lattice Rcpp RcppArmadillo]; }; slgf = derive2 { name="slgf"; version="0.1.0"; sha256="0wjj9mbf33x5isi5h3mdas283aw9x2hi5hyqgqbi941vhwf6v31l"; depends=[numDeriv Rdpack]; }; slickR = derive2 { name="slickR"; version="0.5.0"; sha256="1zxj6ivdhi9wvqcrl0p8clwk8nxqmg1bijqamp0lhq82dpyrdngp"; depends=[base64enc htmltools htmlwidgets lifecycle xml2]; }; @@ -16544,7 +16805,7 @@ in with self; { sm = derive2 { name="sm"; version="2.2-5.7"; sha256="03z8igsjqr32x407asxvkrbayvm6yhv9xyfs0n8fkmv8zk5a41r6"; depends=[]; }; smaa = derive2 { name="smaa"; version="0.3-0"; sha256="0y7j4q147fdk7fffyinc803mfzzsmcdfx8bp695w3wkq1wwy9kyl"; depends=[]; }; smacof = derive2 { name="smacof"; version="2.1-3"; sha256="1221k0bkx47j0cpc2f2flhq3f4x7r4mvm4fdv0ba1iaiw10di7h1"; depends=[candisc colorspace doParallel e1071 ellipse foreach Hmisc MASS nnls plotrix polynom weights wordcloud]; }; - smacpod = derive2 { name="smacpod"; version="2.3"; sha256="1z0v82p897a69a9mig1yaawdw30fxfc5bsc1qmzybmsjqcp8gxfc"; depends=[abind pbapply plotrix smerc sp spatstat_core spatstat_geom]; }; + smacpod = derive2 { name="smacpod"; version="2.4"; sha256="0kb26gl3qrldpxiar9cadbpvd6858ax4m2cffw3c4h5nn2zj14hk"; depends=[abind pbapply plotrix smerc sp spatstat_core spatstat_geom spatstat_random]; }; smallarea = derive2 { name="smallarea"; version="0.1"; sha256="0jcv0xbh8v4g6zxxs4yyd0divwzk9d2w7g01r4s65khxvy3av7yx"; depends=[MASS]; }; smam = derive2 { name="smam"; version="0.6.0"; sha256="1vgsx1n9gkkjnv5lrrznpfqvh019qcjki6gy625k3ykqg5zg229v"; 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]; }; @@ -16554,13 +16815,13 @@ in with self; { smartsnp = derive2 { name="smartsnp"; version="1.1.0"; sha256="1gzzhys6bja55iclkji254kri6r3iamiw7bv881mp615wi9r3hx2"; depends=[bootSVD data_table foreach Rcpp RcppArmadillo Rfast RSpectra vegan vroom]; }; smatr = derive2 { name="smatr"; version="3.4-8"; sha256="0qqqbg65flxh48sw7x90zvgzbpcfzb1811h0pz3zlhdw9a7khs9n"; depends=[]; }; smbinning = derive2 { name="smbinning"; version="0.9"; sha256="1sr0nsqqzxdf402g9qx1ycigbh330idl9n2cyli4x4zxj1nqm3yv"; depends=[Formula gsubfn partykit sqldf]; }; - smcfcs = derive2 { name="smcfcs"; version="1.6.0"; sha256="0kvk9izi7bncs14pla7h6b9wjn475f6i6i7vb8qv3fp4vyqpxp6d"; depends=[abind checkmate MASS rlang survival VGAM]; }; + smcfcs = derive2 { name="smcfcs"; version="1.6.1"; sha256="0n94sd2cdf6zsmnph0q5qi50rzaa12lrkj5g74bsbrpxhixw9bba"; depends=[abind checkmate MASS rlang survival VGAM]; }; smco = derive2 { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; }; smcure = derive2 { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; }; smd = derive2 { name="smd"; version="0.6.6"; sha256="1nvlka2prqh1hcj4ngpj2c2gmfryziijqwjyfy9fmq78skiq0jij"; depends=[MASS]; }; smdata = derive2 { name="smdata"; version="1.2"; sha256="1p26b46kg4hmhs2fl9h9vchar00llqv58ylx438bjgzz4f229qvr"; depends=[]; }; smds = derive2 { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; }; - smerc = derive2 { name="smerc"; version="1.5.2"; sha256="0c33xw4kk6x37fscv57lgxxrsg3ypgdsz5xfl4qrqg4svp48f7j7"; depends=[MESS pbapply randtoolbox Rcpp RcppProgress sp]; }; + smerc = derive2 { name="smerc"; version="1.6"; sha256="1jh8fb9zid6wncfcnbmb1kxhagrrwx8nfdxhhwmmpkzr4x052j6w"; depends=[MESS pbapply randtoolbox Rcpp RcppProgress sp]; }; smfishHmrf = derive2 { name="smfishHmrf"; version="0.1"; sha256="1k6mpyp11zv5rc3k98baymr903p2pf424nf9xng20q1li8s8y2ab"; depends=[fs pracma Rdpack]; }; smfsb = derive2 { name="smfsb"; version="1.3"; sha256="1328w7zpwd3nam6ha4bh14g919jjl87v323ijmbp1j71gc64nn2i"; depends=[abind]; }; smicd = derive2 { name="smicd"; version="1.1.2"; sha256="1v80sshsp3qlc1y7yz1pl4s2jk6khdsli3z2v0cjxfsv1izfd02x"; depends=[formula_tools Hmisc ineq laeken lme4 MuMIn mvtnorm truncnorm weights]; }; @@ -16570,7 +16831,7 @@ in with self; { 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.2"; sha256="14zwrsyhbrwggwiaq8vxps8cgkp6glb14b2cp2ph1ppa0abvlbfq"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; }; - smooth = derive2 { name="smooth"; version="3.1.4"; sha256="1h0kfjpjn9lfizd5acn7gvpw2qw4b3y2ysgzm3msmbmmwkfgsdfz"; depends=[greybox MASS nloptr pracma Rcpp RcppArmadillo statmod zoo]; }; + smooth = derive2 { name="smooth"; version="3.1.5"; sha256="0xqb1dj24vwcfnjyfn599y0yfimd4g6d9a7g4bs7wlqfh7zzmd0y"; depends=[greybox MASS nloptr pracma Rcpp RcppArmadillo statmod zoo]; }; smoothAPC = derive2 { name="smoothAPC"; version="0.3"; sha256="11f34qqdm8m0hmy9jf29q439slchvmqgdfrmak7vcdhfnjcylr5r"; depends=[colorspace lmtest quantreg rgl SparseM]; }; smoothHR = derive2 { name="smoothHR"; version="1.0.3"; sha256="0kqj27vsxdiy0fjn0h94lhzw7hjm6qqnzcvhz15iyssl2d2hzxvg"; depends=[survival]; }; smoothROCtime = derive2 { name="smoothROCtime"; version="0.1.0"; sha256="03iihjxb5xdaf74cm9cajqqjli754mdmv5v1y4hla9vv23017ca1"; depends=[ks]; }; @@ -16590,7 +16851,7 @@ in with self; { smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; }; smurf = derive2 { name="smurf"; version="1.1.2"; sha256="00q54pg42anilhcshhjvv277mkszbpzpkf1g7srs7cjd5skjvsaf"; depends=[catdata glmnet MASS Matrix mgcv RColorBrewer Rcpp RcppArmadillo speedglm]; }; smvgraph = derive2 { name="smvgraph"; version="0.1.2"; sha256="06pvnrhd3q913nxhk1icj11xkd1is3qi31b0kv6zbc0qkixn1ym7"; depends=[DescTools fmsb MASS shiny shinydashboard sortable]; }; - sn = derive2 { name="sn"; version="2.0.1"; sha256="1z58kwvq8igjm3biyyjdlhs2qq8hfjq5d9x0lzy80yk5hw08kcw6"; depends=[mnormt numDeriv quantreg]; }; + sn = derive2 { name="sn"; version="2.0.2"; sha256="140p1pl5sq0laxhcm16kbqm986hlhqj90gj3jccga491gh14jywm"; depends=[mnormt numDeriv quantreg]; }; sna = derive2 { name="sna"; version="2.6"; sha256="0ai0v4538d30m4wks5s3lch1yfmx1ml0nnrz7ihs097lv586a09s"; depends=[network statnet_common]; }; snahelper = derive2 { name="snahelper"; version="1.4.0"; sha256="1anfjlp8yqqvw53nyqd96zlvh1pjm9z2yqkrfgmlbhs4m273x9bl"; depends=[colourpicker DT formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; }; snakecase = derive2 { name="snakecase"; version="0.11.0"; sha256="1ky1x2cp5rd0ffd9m1fji9sq4z4jsrpxzg30brw8bb4ihfjj114r"; depends=[stringi stringr]; }; @@ -16613,7 +16874,7 @@ in with self; { snpStatsWriter = derive2 { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace snpStats]; }; snpar = derive2 { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; }; snplist = derive2 { name="snplist"; version="0.18.2"; sha256="1sa2s3br4agx920jpr250iih61p99v500nh0c1w99w0846g9908c"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; }; - snpsettest = derive2 { name="snpsettest"; version="0.1.0"; sha256="0cik8vjyx0a7x9vvxl03lpcpdjqczdfbrlygr5rkpgi6lfijxc9r"; depends=[data_table gaston Rcpp RcppArmadillo]; }; + snpsettest = derive2 { name="snpsettest"; version="0.1.1"; sha256="0vfm09bff7l7z36lzwp0ndnlb230f0kg6dlbjlpk028xd1iy4if1"; depends=[data_table gaston Rcpp RcppArmadillo]; }; sns = derive2 { name="sns"; version="1.1.2"; sha256="132zd57xb2y0nshw4lakf49r2mvvkv7j32f7l7hqrh91mw7wyqpr"; depends=[coda mvtnorm numDeriv]; }; sobolnp = derive2 { name="sobolnp"; version="0.1.0"; sha256="00rmigjyd3fsmhrhbvjzrfsl4ir0xpfr4xbgjws6vkx2rmcqnq1s"; depends=[minqa np pbmcapply]; }; soc_ca = derive2 { name="soc.ca"; version="0.8.0"; sha256="16l0synym91b7djgzdcz43dnvw44fkyxky9gm37ixbxzq1czdp9w"; depends=[dplyr ellipse FactoMineR flextable forcats ggplot2 ggrepel gridExtra htmlTable magrittr Matrix purrr RColorBrewer reshape2 rlang shiny stringr tibble tidyr]; }; @@ -16628,9 +16889,9 @@ in with self; { 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]; }; softclassval = derive2 { name="softclassval"; version="1.0-20160527"; sha256="1f5qj5sajy3dg0mgss6f9w6v5a2prcypld9jcv457bd4n4a409kr"; depends=[arrayhelpers svUnit]; }; - soilDB = derive2 { name="soilDB"; version="2.6.10"; sha256="06lahzk27crks8knjg47zgsx5rafyj8xlj5pnqxjga4mfcpss58l"; depends=[aqp curl data_table DBI raster sp xml2]; }; - soilassessment = derive2 { name="soilassessment"; version="0.2.1"; sha256="14hqwxpqb19g5r7abar40kprfilzxi24mg083gypvxzs48pb6gn8"; depends=[arm caret Cubist deSolve e1071 FuzzyAHP Hmisc kernlab maptools nnet qrnn quantregForest randomForest ranger raster rgdal rpart soiltexture sp]; }; - soilhypfit = derive2 { name="soilhypfit"; version="0.1-4"; sha256="1wmgg5gw2b983p5hz8wknb4v9irgp09qybl3lj7zv3pq61jjh7ps"; depends=[mgcv nloptr quadprog Rmpfr snowfall SoilHyP]; }; + soilDB = derive2 { name="soilDB"; version="2.6.13"; sha256="1g8bk4pwahhhj809py4k13vb3kbvw04iwy8f17gag2fhi8s58sp0"; depends=[aqp curl data_table DBI raster sp xml2]; }; + soilassessment = derive2 { name="soilassessment"; version="0.2.3"; sha256="0fcjw6zl6cvk94hyhqqra6xpnrh8s7wr9va4yknlv5rf0km2vgd2"; depends=[arm caret Cubist deSolve e1071 FuzzyAHP googledrive Hmisc kernlab nnet png qrnn quantregForest randomForest ranger raster rgdal rpart soiltexture sp]; }; + soilhypfit = derive2 { name="soilhypfit"; version="0.1-5"; sha256="07hk7p2gr8an1r295dyj1hpp23103x9qjpscrhlz917p5nr9ix4d"; depends=[mgcv nloptr quadprog Rmpfr snowfall SoilHyP]; }; soilphysics = derive2 { name="soilphysics"; version="4.1"; sha256="1kq92vq45knfag49yvphpcjwp29g2hp0xayhdq8lr20sis7h1y72"; depends=[boot fields MASS shiny shinydashboard]; }; soiltexture = derive2 { name="soiltexture"; version="1.5.1"; sha256="1l9npvk910488qzd45ibc7ss557hnkb78lx1p6fs3nhl8sacgyxh"; depends=[MASS sp]; }; soilwater = derive2 { name="soilwater"; version="1.0.5"; sha256="11gal7hj73j82qx65krmzpmf0gpm41ph8hw70df46dbf4w23vvjn"; depends=[]; }; @@ -16641,7 +16902,7 @@ in with self; { solitude = derive2 { name="solitude"; version="1.1.3"; sha256="1cqbcm72fq13lp0lazfngdylcasck1ffrj16ggxlryzps1181rhy"; depends=[data_table future_apply igraph lgr R6 ranger]; }; solrad = derive2 { name="solrad"; version="1.0.0"; sha256="13ybllvmig1yqsy4md4kazs83hxb9lrlwy64yw1wwr1w6sxpbnp6"; depends=[]; }; solrium = derive2 { name="solrium"; version="1.2.0"; sha256="16x4gjk0x6m9yjq9sk3kwbw8qm7w16vmbnfy5xa9zikw96cl3iky"; depends=[crul dplyr jsonlite plyr R6 tibble xml2]; }; - solvebio = derive2 { name="solvebio"; version="2.11.0"; sha256="00n9ziayjfb645m63nidbnk594y3acfah5rs34fma4gb8qb3cl4s"; depends=[dplyr httr jsonlite mime]; }; + solvebio = derive2 { name="solvebio"; version="2.12.1"; sha256="0dl0sq5jx60qdhwbrzmcdvaznmxc3n2gkvg0hbcp21kl9wk6qplk"; depends=[dplyr httr jsonlite mime]; }; som = derive2 { name="som"; version="0.3-5.1"; sha256="1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56"; depends=[]; }; som_nn = derive2 { name="som.nn"; version="1.1.0"; sha256="0mw2c2lqvdq9bhndpjyawjy43l4x7clcsx2350j45g7fnchhy602"; depends=[class hexbin kohonen som]; }; soma = derive2 { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; }; @@ -16662,12 +16923,13 @@ in with self; { sortable = derive2 { name="sortable"; version="0.4.5"; sha256="1ibycrk9n5pcd6dqc02g52m6b9aanmsjnm0dgwb8l20x0hwnfzd3"; depends=[assertthat ellipsis htmltools htmlwidgets jsonlite learnr rlang shiny]; }; sorvi = derive2 { name="sorvi"; version="0.7.26"; sha256="19lfrc4bdiljs437w3a2bpf7abnkv0934dh929bbj2w1w8rzghjn"; depends=[dplyr ggplot2 RColorBrewer reshape2]; }; sos = derive2 { name="sos"; version="2.1-0"; sha256="14wbq7vkzn4bjx3zpg29vn1n6wz9117rn2lwxi9dj45kzccp7a94"; depends=[brew]; }; - sotkanet = derive2 { name="sotkanet"; version="0.9.76"; sha256="1lha5nicfxpkfaayrswnpipbc08s9blbml65fr5iasvmxhfrfadz"; depends=[rjson]; }; + sotkanet = derive2 { name="sotkanet"; version="0.9.79"; sha256="1d6g09rf7irk3d8hkm6ahp8zl6lj24jnipwvzr0njx2sqi3fwd4f"; depends=[curl httr jsonlite]; }; sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; }; sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; }; + soundClass = derive2 { name="soundClass"; version="0.0.9.1"; sha256="1hjqp8pvi063wwimxvzwpzqkc175smlfcsn6z7iana25gypx0jip"; 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.5.0"; sha256="0shvrz37l65ka8yxqzynanz33wmiiagglnvgqy4ihs6x8yxx10qs"; depends=[doParallel dtw foreach mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs signal tuneR zoo]; }; + soundgen = derive2 { name="soundgen"; version="2.5.1"; sha256="1wzqlc1gnknpyixy0dv6nzgghqc1i2xd2bd688pfmfnqgmr2cm3r"; depends=[doParallel dtw foreach mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs signal tuneR zoo]; }; sourceR = derive2 { name="sourceR"; version="1.1.0"; sha256="09mikl6rkigx2bdnwqsgxwksz40lspq27hsrhlnfyz5yhs31ssda"; depends=[assertthat cluster dplyr gplots gtools R6 Rcpp reshape2 SPIn tensorA]; }; sourcetools = derive2 { name="sourcetools"; version="0.1.7"; sha256="1jnjir0q2dj724f1mjm6p5h77yzyx6xcqy9r2g7gmcxkxw349627"; 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]; }; @@ -16686,44 +16948,44 @@ in with self; { spMaps = derive2 { name="spMaps"; version="0.4.0"; sha256="0n9693aam7gsclfhijq7cy61l0w4mm5vf3rjaz5w0jrz77lrkprh"; depends=[raster rgeos sp]; }; spNNGP = derive2 { name="spNNGP"; version="0.1.6"; sha256="12ys92r2xpmnhy6hw8sldcz0y28gnxpwnj6sm5jc1lfyz7k1ww6f"; depends=[coda Formula RANN]; }; spNetwork = derive2 { name="spNetwork"; version="0.2.1"; sha256="0hmg68v5a7d1ixwj9nvh7kd948r7kspar6nd3yp02mgj495ps1z8"; depends=[BH cubature data_table future_apply ggplot2 igraph maptools progressr raster Rcpp RcppArmadillo RcppProgress Rdpack rgeos SearchTrees sp spdep]; }; - spOccupancy = derive2 { name="spOccupancy"; version="0.2.0"; sha256="1sh8qzk0cqx0gwmvrx4zny58pg3il6wwnsyzgihj8n1fcdf5myp0"; depends=[abind coda doParallel foreach lme4 RANN spBayes]; }; + spOccupancy = derive2 { name="spOccupancy"; version="0.2.1"; sha256="12fpi7ijk1qlhdq280r352aqlymmkis1nbfjbqqr9kkrl141zi56"; depends=[abind coda doParallel foreach lme4 RANN spBayes]; }; + spRingsteen = derive2 { name="spRingsteen"; version="0.0.1"; sha256="0dhrwnns06jqzqbc5mc7bjgs98xkcq591nm6scayxm34mqs3k47m"; depends=[]; }; spTDyn = derive2 { name="spTDyn"; version="2.0.1"; sha256="1wprn2adw4l5pkwkfzdpcr07jxgycx9kaf8w8mfv27nka5hacgqx"; 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.1"; sha256="0lf39n32ifsmbcf35h0g60xniw72mlrzvzax3k6kz5c5k1wszlba"; depends=[coda extraDistr sp spacetime]; }; - spaMM = derive2 { name="spaMM"; version="3.9.25"; sha256="01a05f3wbgi0x6ybdym1g673vnqgkb1r1ldk17wwdj58yz5sdq06"; depends=[boot crayon gmp MASS Matrix minqa nlme nloptr pbapply proxy Rcpp RcppEigen ROI]; }; + spaMM = derive2 { name="spaMM"; version="3.10.0"; sha256="0wlavsaf2k3qxj2n4c9c2y9x110i43yqn4140qk9d0vx397yfvsd"; depends=[boot crayon gmp MASS Matrix minqa nlme nloptr pbapply proxy Rcpp RcppEigen ROI]; }; spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; }; space = derive2 { name="space"; version="0.1-1.1"; sha256="09dpksbda4lg5hax47a9h9shjmggza6583slvdj0fldblykpyxck"; depends=[]; }; spaceNet = derive2 { name="spaceNet"; version="1.2"; sha256="1s2672icxs0qvdhl52xhllgvh1i9mjfrn5j3icyw6h61ljbnhy11"; depends=[MASS mclust permute RcppTN Rfast sna vegan]; }; - spacefillr = derive2 { name="spacefillr"; version="0.2.0"; sha256="1gqwz5j26z7ar3syzgj734mxi77m6mj0jrij32grcls79m8iy329"; depends=[Rcpp]; }; - spacejamr = derive2 { name="spacejamr"; version="0.1.1"; sha256="11mqbzs5px2fcksrf1wbb3vbrcarps45mhdi1i4b1x5fn6xvw60v"; depends=[crsuggest dplyr ggplot2 ggraph ggthemes igraph magrittr sf spatstat_core spatstat_geom]; }; + spacefillr = derive2 { name="spacefillr"; version="0.3.0"; sha256="0c4yasc1zizjmhd2ciyz86lg76fsrxvl19yjkb2fmkda9rmnc0bf"; depends=[Rcpp]; }; + spacejamr = derive2 { name="spacejamr"; version="0.2"; sha256="1hyf4wmwfjlw3qh3rw3wq94slybrpm2zmmcfgy7gqcycmfddrg8w"; depends=[crsuggest dplyr ggplot2 ggraph ggthemes igraph magrittr sf spatstat_geom spatstat_random]; }; spacesRGB = derive2 { name="spacesRGB"; version="1.4-0"; sha256="1py93g7wglszcrkm09y0am2iia972q0jbgwb2wmickw3xsgip8p5"; depends=[]; }; spacesXYZ = derive2 { name="spacesXYZ"; version="1.1-1"; sha256="1jxwhpnfbqa2nz86l8sdxxj3qmasw1wmbii7wr8sqp2819jr5lnd"; depends=[]; }; - spacetime = derive2 { name="spacetime"; version="1.2-5"; sha256="0ii7nwpqi8nq46d7yk5gl7hhnr76f6r6lva7n0pr02kqhqwcqalg"; depends=[intervals lattice sp xts zoo]; }; + spacetime = derive2 { name="spacetime"; version="1.2-6"; sha256="10fxs37bky52wr3ba4vzwy7nxych9004139n377gz2cmxl36dm4g"; depends=[intervals lattice sp xts zoo]; }; spacey = derive2 { name="spacey"; version="0.1.1"; sha256="1p8kx3d08q9kz1wb286m3d8ckwkhfm5n42m65m4w5gz5kpfx0xfz"; depends=[httr jsonlite magrittr png raster rayshader rgdal]; }; 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=[]; }; - spagmix = derive2 { name="spagmix"; version="0.3-4"; sha256="032dmz8cx4j5vl229gi1xkncc1wggfrf1a24qqwl2bzxrdfp27rw"; depends=[abind mvtnorm RandomFields sparr spatstat spatstat_core spatstat_geom spatstat_linnet]; }; - spam = derive2 { name="spam"; version="2.7-0"; sha256="03c50wfyrzcmrcv9mkgj8dmdg2cwkh4p4ys8gaclr8w7ym45qav3"; depends=[dotCall64]; }; - spam64 = derive2 { name="spam64"; version="2.7-0"; sha256="0rl74hp4jnahk7fcz39d9q1ccg05ifk2wfahz537nd2jh14mzws7"; depends=[]; }; + spam = derive2 { name="spam"; version="2.8-0"; sha256="1ann2a2ifr3z983fcg1c0pkgmbxz6a0ym5q1dmq1r382bd1pg0fr"; depends=[dotCall64]; }; + spam64 = derive2 { name="spam64"; version="2.8-0"; sha256="105h8j1ps2g79csbhwfchfdfxhqbbs793pxk3hqln57p6nap74i6"; depends=[]; }; spamtree = derive2 { name="spamtree"; version="0.2.2"; sha256="1z1dyv6cvcdilqyfpzgl3zr0jmzjn2sznrvypvxx7c8i6qfq8nd0"; depends=[dplyr FNN magrittr Rcpp RcppArmadillo rlang tibble]; }; spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; }; spanish = derive2 { name="spanish"; version="0.4.2"; sha256="15drc11lh0qxpww50p0smi8qxfbln82bx0yd74jqf71irhk5jxyp"; depends=[magrittr xml2]; }; - spant = derive2 { name="spant"; version="1.16.0"; sha256="07l5wzwjjgwdyl7cc988icv0z96108lz0f092jgsbvv75ml6nnlh"; depends=[abind expm fields foreach irlba jsonlite magrittr minpack_lm mmand nloptr numDeriv plyr pracma ptw RNifti RNiftyReg signal smoother stringr]; }; + spant = derive2 { name="spant"; version="1.19.0"; sha256="12cnf8s4xzw4qvhc3i10mch2pck9rini5qkvjg19264p4rwh0xpd"; depends=[abind expm fields foreach irlba jsonlite magrittr 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.7.3"; sha256="1rdzlpr4x8gikm8vmb0jdmgvh99wkxd4b8cm40a2bnrbgqxappfq"; depends=[assertthat base64enc blob config DBI dbplyr digest dplyr ellipsis forge generics globals glue httr jsonlite lifecycle openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi stringr tibble tidyr tidyselect uuid vctrs withr xml2]; }; - sparklyr_flint = derive2 { name="sparklyr.flint"; version="0.2.1"; sha256="03dm75nyspnkqhnfmj0w6gliw1b4sfb17mmq5mmzd4a54fbf766j"; depends=[dbplyr dplyr rlang sparklyr]; }; + sparklyr = derive2 { name="sparklyr"; version="1.7.5"; sha256="1iwwvj2cmw7xqx47acznn5k7h6yg6i1v97kglpsngcdkl9x56a1f"; depends=[assertthat base64enc blob config DBI dbplyr digest dplyr ellipsis forge generics globals glue httr jsonlite lifecycle openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi stringr 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.3"; sha256="0lva7fbjp253kxq3970h52cr8s52xycbi03d5shsyna8grhkbczj"; depends=[dplyr jsonlite listviewer purrr rlang sparklyr]; }; sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; }; sparktf = derive2 { name="sparktf"; version="0.1.0"; sha256="0jd018n7553q0ldv6whxbj2s38myig0m8zq4fbp8fsv34q5wnsx4"; depends=[sparklyr]; }; - sparkwarc = derive2 { name="sparkwarc"; version="0.1.5"; sha256="033clhl3pknjc7yzwa67l2l24sb2n61amc60zbvk2vc61yszl66f"; depends=[DBI Rcpp sparklyr]; }; + sparkwarc = derive2 { name="sparkwarc"; version="0.1.6"; sha256="0nzw6lgjrgqd1hj46jd52s8s3vdb7q2nc500jlgd0ydrr12zd123"; depends=[DBI Rcpp sparklyr]; }; sparkxgb = derive2 { name="sparkxgb"; version="0.1.1"; sha256="1h7jk76v9wfm8qzqy6lhsmsp767wydwba9xyqszndl88295iac1j"; depends=[forge sparklyr]; }; - sparr = derive2 { name="sparr"; version="2.2-15"; sha256="0c0vr4js6rcbyk85sld28m130d5zdymncpipzpkpzis3ismnlgp4"; depends=[doParallel foreach misc3d spatstat spatstat_core spatstat_geom spatstat_utils]; }; - sparrpowR = derive2 { name="sparrpowR"; version="0.2.4"; sha256="1mhsnknknlfh2ixz3wsjmqkn7km02j8ipg80xvpmnjmz1221sv1n"; depends=[doFuture doRNG fields foreach future iterators lifecycle raster sp sparr spatstat spatstat_core spatstat_geom spatstat_linnet]; }; + sparr = derive2 { name="sparr"; version="2.2-16"; sha256="0qhlkx7byx3245yzsk30zr4lgndjx5g1vr0s4azmcya245pp6rkw"; depends=[doParallel foreach misc3d spatstat spatstat_core spatstat_geom spatstat_random spatstat_utils]; }; + sparrpowR = derive2 { name="sparrpowR"; version="0.2.5"; sha256="187571srw0yhvqdgfpa374zmlaxhjmj9xlnh9gm2v4j46pfvrs5n"; depends=[doFuture doRNG fields foreach future iterators lifecycle raster sp sparr spatstat_geom spatstat_random]; }; sparseBC = derive2 { name="sparseBC"; version="1.2"; sha256="0a1siyi9kc805qji4alnw3c21spf4iw4wpsbfl50zvs52p8vl8w2"; depends=[fields glasso]; }; sparseEigen = derive2 { name="sparseEigen"; version="0.1.0"; sha256="0vqcy61rarmp3liz8fr3vs3y40hkb3wfw89b5xsj1byaiap4772s"; depends=[]; }; sparseFLMM = derive2 { name="sparseFLMM"; version="0.4.1"; sha256="174lnhqig7m6fjfsj114ld059z9mjih3jzm5cq8iscxnhr9m11lr"; depends=[data_table MASS Matrix mgcv refund]; }; @@ -16740,6 +17002,7 @@ in with self; { sparsebn = derive2 { name="sparsebn"; version="0.1.2"; sha256="1b1601n3nmxck6a27xqxpsa79p4xnz7yyzdfqiddn9zd2b4v9wc5"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; }; 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="0.3.0"; sha256="0aiaspl9sybyg7sa9pzmnrbjdvxplsmzip0v5imrmqvjszrkbrf8"; depends=[assertthat 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]; }; sparsepca = derive2 { name="sparsepca"; version="0.1.2"; sha256="0wk2nm37p15gb8i4s45izzzdmwywr56kv4g0j3jd5s3slm224vv4"; depends=[rsvd]; }; @@ -16750,49 +17013,50 @@ in with self; { sparsevar = derive2 { name="sparsevar"; version="0.1.0"; sha256="1kcy6bm04mccky529nryy5l001bv71hx304ysiabl4myakw0rwy7"; depends=[corpcor doParallel ggplot2 glmnet Matrix mvtnorm ncvreg picasso reshape2]; }; sparsevb = derive2 { name="sparsevb"; version="0.1.0"; sha256="1cigq8hwymrrkiy3iyrxsjjbj228ahrd7mq9lqar4jlb925jzqx4"; depends=[glmnet Rcpp RcppArmadillo RcppEnsmallen selectiveInference]; }; sparsio = derive2 { name="sparsio"; version="1.0.1"; sha256="181kzs9x3h497c7shfalbzrjz05bkj7mmjh9nyphxyi2jjrr6y1q"; depends=[Matrix Rcpp]; }; - sparta = derive2 { name="sparta"; version="0.8.2"; sha256="0gvpa0vikkn51jih4ji569f04dhxrblir761i6xp6r0dh7mifi9i"; depends=[Rcpp RcppArmadillo]; }; + sparta = derive2 { name="sparta"; version="0.8.3"; sha256="0p5a7h278f7lfikp7rayjzjngich3zi8dhn4an5qkkz1jbl2wic6"; depends=[Rcpp RcppArmadillo]; }; spass = derive2 { name="spass"; version="1.3"; sha256="1c148z0i3d185hnf54xmgppjrblv3b2s3sm0lmj78gvav04mj5s4"; depends=[geepack MASS multcomp mvtnorm Rcpp]; }; - spatPomp = derive2 { name="spatPomp"; version="0.28.0.0"; sha256="0yql6llgclynd2nv1y4sm1a6lsc87003bqbq9skh3lgvdgbg5qsr"; depends=[abind dplyr foreach ggplot2 magrittr pomp rlang stringr tidyr]; }; + spatPomp = derive2 { name="spatPomp"; version="0.29.0.0"; sha256="1d3k5m2rlpn1hgpjxb9qx4hz3bl96ch8hmc06lj9jd6awdspdvf5"; depends=[abind dplyr foreach magrittr pomp rlang stringr tidyr]; }; spatgraphs = derive2 { name="spatgraphs"; version="3.2-2"; sha256="09bbcqgmbg6a65mnxivr4pghsanj22x1j0l4hq8bzpwgbas7byhy"; 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-14"; sha256="0dlafq744mahxpb13llmsrg54fzww8ld1nbxmr7m851gff11kk2j"; depends=[]; }; + spatial = derive2 { name="spatial"; version="7.3-15"; sha256="1vwc7ingskdj1k4nq418x9yl3cw699pckb9xh5a1yp3g9plknqg5"; depends=[]; }; spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; }; spatialEco = derive2 { name="spatialEco"; version="1.3-7"; sha256="0yhv4amqwbmcx6anzyrsmlrk25ishdlwyigyw9snd9d2v5k88s1q"; depends=[MASS raster rgeos sf sp spatstat_core spatstat_geom spdep]; }; spatialRF = derive2 { name="spatialRF"; version="1.1.3"; sha256="1ganbsp7krazl90mdlq23g227ixmxpk4yzxl47rayd431vg6fys1"; depends=[doParallel dplyr foreach ggplot2 huxtable magrittr patchwork ranger rlang tibble tidyr tidyselect viridis]; }; spatialTIME = derive2 { name="spatialTIME"; version="1.2.0"; sha256="0pmpk2kfh53gfzw33ncr1pjzyh7zprkdwgxqgajvd8y2wb90a462"; depends=[crayon dplyr furrr future ggplot2 ggpubr magrittr pheatmap plyr purrr RColorBrewer rlang rlist scales spatstat_core spatstat_geom tidyr tidyselect viridis]; }; + spatialfusion = derive2 { name="spatialfusion"; version="0.6-5"; sha256="0hbnnd40z9f2cmgc339v5gq5bqildzn79p24l8rbfbh676a5jfmq"; depends=[fields Rcpp rstan sp]; }; spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; }; - spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; }; + spatialprobit = derive2 { name="spatialprobit"; version="1.0"; sha256="1g65c081xmhfp45lidn57xwryk4pmzzixs3b2qzixzg4knks74dy"; depends=[Matrix mvtnorm spatialreg spdep tmvtnorm]; }; spatialreg = derive2 { name="spatialreg"; version="1.2-1"; sha256="10d0gd21s84r7d5i1h62zavb40ws9c6vikrk8qjii25a66rvch2c"; depends=[boot coda expm gmodels LearnBayes MASS Matrix 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.1.0"; sha256="0w57pl09pamx8mmrwyj2hixxqp9cf0xg06gvsrrg4abjbkj0i1pr"; depends=[dplyr purrr rlang rsample tibble tidyselect vctrs]; }; spatialwarnings = derive2 { name="spatialwarnings"; version="3.0.2"; sha256="1yng9sxhqm04vliwz4jifqsqhvg1nk0icb6j21kp4cfwz81q2s2a"; 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]; }; - spatstat = derive2 { name="spatstat"; version="2.3-0"; sha256="01jckks3j39854mhsarzyzn4rj82h1xrnyd2b6fyzizj48vl80ns"; depends=[spatstat_core spatstat_data spatstat_geom spatstat_linnet spatstat_utils]; }; - spatstat_Knet = derive2 { name="spatstat.Knet"; version="2.0-0"; sha256="1w9ag7v18mvy4dl1gz2w8xjhw9n2sf9zycqz3mraajis831c76ix"; depends=[Matrix spatstat_core spatstat_data spatstat_geom spatstat_linnet spatstat_sparse spatstat_utils]; }; - spatstat_core = derive2 { name="spatstat.core"; version="2.3-2"; sha256="0g7nj8nf9ywhdbc5irxlry6kzq6bwwbkk9cp22kyv1wigycnskbz"; depends=[abind goftest Matrix mgcv nlme rpart spatstat_data spatstat_geom spatstat_sparse spatstat_utils tensor]; }; + spatstat = derive2 { name="spatstat"; version="2.3-3"; sha256="0skk377fw448gvdk6jkcviqbqdjn2vdz19vfk8aiilxax4xba1hr"; depends=[spatstat_core spatstat_data spatstat_geom spatstat_linnet spatstat_random spatstat_utils]; }; + spatstat_Knet = derive2 { name="spatstat.Knet"; version="2.0-1"; sha256="1mxynbk5sclf94fbrf6vicc48hwmdpxhyxylcmpmlqji4nhs97vx"; depends=[Matrix spatstat spatstat_core spatstat_data spatstat_geom spatstat_linnet spatstat_random spatstat_sparse spatstat_utils]; }; + spatstat_core = derive2 { name="spatstat.core"; version="2.4-0"; sha256="1dx6fh6l3bqxqfaczm9gxx1sirmdpx8biag462pj9wjqmw9m4j35"; depends=[abind goftest Matrix mgcv nlme rpart spatstat_data spatstat_geom spatstat_random spatstat_sparse spatstat_utils tensor]; }; spatstat_data = derive2 { name="spatstat.data"; version="2.1-2"; sha256="1r8s4xl25xr71h4g5qqi5y370h2ik3kz5fb4qyml2b6dwsl1ildv"; depends=[Matrix spatstat_utils]; }; - spatstat_geom = derive2 { name="spatstat.geom"; version="2.3-1"; sha256="1h3ja45in7hnar2gwqp18jkz4rcqi99gllar6jqzlsvdbb85hgpj"; depends=[deldir polyclip spatstat_data spatstat_utils]; }; - spatstat_gui = derive2 { name="spatstat.gui"; version="2.0-0"; sha256="0v26pmi6ir38hsfhkmkz7njf8b12y8dgacqz54vy9giq73k71j14"; depends=[rpanel spatstat_core spatstat_data spatstat_geom spatstat_linnet spatstat_utils]; }; - spatstat_linnet = derive2 { name="spatstat.linnet"; version="2.3-1"; sha256="1hrqa2i6mp7d79jw4h56b8hk9590959s79vh9xcsj6k5vbisd6qi"; depends=[Matrix spatstat_core spatstat_data spatstat_geom spatstat_sparse spatstat_utils]; }; - spatstat_local = derive2 { name="spatstat.local"; version="4.1-1"; sha256="185ypf91d5faybm6ixiz419wsip2swsg3vsbbw3z4w1kqrj7m884"; depends=[spatstat_core spatstat_data spatstat_geom spatstat_sparse spatstat_utils tensor]; }; + spatstat_geom = derive2 { name="spatstat.geom"; version="2.3-2"; sha256="0aihimb4r6hmk3g7764d3b43a0znf9bzmc96i1lkqq9hwabj7151"; depends=[deldir polyclip spatstat_data spatstat_utils]; }; + spatstat_gui = derive2 { name="spatstat.gui"; version="2.0-1"; sha256="1snvy4q0w4yn24n2yxyqvdi70i70zpqa7q13cm38d9135hm35cgk"; depends=[rpanel spatstat spatstat_core spatstat_data spatstat_geom spatstat_linnet spatstat_random spatstat_utils]; }; + spatstat_linnet = derive2 { name="spatstat.linnet"; version="2.3-2"; sha256="0y1py6x0xbw4ad3pjwcspi4ysgfh61f5fd79787zzgyyh2va8y4w"; depends=[Matrix spatstat_core spatstat_data spatstat_geom spatstat_random spatstat_sparse spatstat_utils]; }; + spatstat_local = derive2 { name="spatstat.local"; version="4.1-4"; sha256="07hmjxrq7k3z43l4f0a141alcg787xhqgl8skk405s1g29xzpnyc"; depends=[spatstat spatstat_core spatstat_data spatstat_geom spatstat_random spatstat_sparse spatstat_utils tensor]; }; + spatstat_random = derive2 { name="spatstat.random"; version="2.1-0"; sha256="0ggzl64iqf7b6n81ga66wb01sm4rmzrbimv2pmgy047mjnqsnpq4"; depends=[spatstat_data spatstat_geom spatstat_utils]; }; spatstat_sparse = derive2 { name="spatstat.sparse"; version="2.1-0"; sha256="148fxbxss569w73xaqpzwpz9rfjdgznh2ngf06gvm33631222680"; depends=[abind Matrix spatstat_utils tensor]; }; spatstat_utils = derive2 { name="spatstat.utils"; version="2.3-0"; sha256="06nvn2ffyrskhzaavsy6lmdp0m8askkrp1fnwrhjsj01lbjnq2az"; depends=[]; }; - spatsurv = derive2 { name="spatsurv"; version="1.6"; sha256="02bq3hvvjfxndskd5yrchq0r9dv7mxplzq3pvs3jrsd35sfcns3w"; depends=[fields iterators lubridate Matrix RandomFields raster RColorBrewer rgeos sp spatstat spatstat_core spatstat_geom stringr survival]; }; + spatsurv = derive2 { name="spatsurv"; version="1.7"; sha256="01666mp43p0cv0hsn3wbv5vbb4gyjk506spff9ps119bcpqnwqjr"; depends=[fields iterators lubridate Matrix RandomFields raster RColorBrewer rgeos sp spatstat spatstat_core spatstat_geom spatstat_random stringr survival]; }; spbabel = derive2 { name="spbabel"; version="0.5.5"; sha256="0yfkz28nfvl3rm0bxljb3y19zhnx7pabxy81d835pbfmjq5vvp51"; depends=[dplyr rlang sp tibble]; }; spc = derive2 { name="spc"; version="0.6.5"; sha256="1s9f67m3a52mzk5s6hh9jv80m721s0z43x2qj2d4ski2jwqw0iyr"; depends=[]; }; - spc4sts = derive2 { name="spc4sts"; version="0.5.4"; sha256="17pn6hn5x3isyn44xzvvwby2jiapa4gid0y4kirkcvxf6n7rdhjx"; depends=[gridExtra LS2Wstat rpart]; }; + spc4sts = derive2 { name="spc4sts"; version="0.5.5"; sha256="14398a65fpdjlr39lwivin551m31mcr5hx47fx2dx7sklq8kr2bg"; depends=[gridExtra LS2Wstat rpart]; }; spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; }; spcosa = derive2 { name="spcosa"; version="0.4-0"; sha256="0aszpwhf4ww6kb7r75i17kf6mqy9cx021b0w5dzd6185p57g6sxv"; depends=[ggplot2 rJava sp]; }; spcov = derive2 { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; }; spcr = derive2 { name="spcr"; version="2.1"; sha256="08lpcj49sj0bc2vz54wigdb9dqn182c11q31n3sdkc41spgk0s7a"; depends=[]; }; spd = derive2 { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; }; - spdep = derive2 { name="spdep"; version="1.1-13"; sha256="0yyrjp1ngi9699475dr5137xi208q7h15rx0n2120y25d2k4r787"; depends=[boot coda deldir e1071 expm gmodels LearnBayes MASS Matrix nlme s2 sf sp spData units]; }; + spdep = derive2 { name="spdep"; version="1.2-2"; sha256="08sya6vy7s87h337g2fanncw6xx9y9z8nxpqalbdxv9vpsc6zx4l"; depends=[boot deldir e1071 s2 sf sp spData units]; }; spdownscale = derive2 { name="spdownscale"; version="0.1.0"; sha256="0pl560km9629iwy13h7359ab7ixzs09hg986kvk0xbnc348srb86"; depends=[]; }; spdplyr = derive2 { name="spdplyr"; version="0.4.0"; sha256="0lijp78wgrky103137vfk3k4s051qppd6jq6s065k9i7y1azbpc1"; depends=[dplyr rlang sp spbabel tibble]; }; spduration = derive2 { name="spduration"; version="0.17.1"; sha256="1hsz4hcw85f1rj2pd8ppzsd1r8fh4yf6axc11yf2hd287ghzzxzy"; depends=[corpcor forecast MASS plyr Rcpp RcppArmadillo separationplot xtable]; }; - spdynmod = derive2 { name="spdynmod"; version="1.1.5"; sha256="1qxpvjqvfcjsy3z0naz438aa95v2d3imdfxj20vfb2zwpv9l3215"; depends=[animation deSolve raster sp]; }; - spe = derive2 { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; }; + spdynmod = derive2 { name="spdynmod"; version="1.1.6"; sha256="1zbh1p3lmil4vsrw7q6af3p5xqvhw2k9hx59kbzabnzj4gy8wjk3"; depends=[animation deSolve raster sp]; }; speakr = derive2 { name="speakr"; version="3.2.0"; sha256="12m7f4m0jglnbv7i9ackmymh7jc90vjg6yr6ns08b8qcqmzmf9if"; depends=[ggplot2 lifecycle readr stringr tibble]; }; speaq = derive2 { name="speaq"; version="2.6.1"; sha256="15v7lr2mczqc5ma2n9gyszfkyljnsds6c8lc5vy0qkvwfl01sv3v"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 Rfast rvest xml2]; }; spearmanCI = derive2 { name="spearmanCI"; version="1.0"; sha256="1xi51dphv91j5hgrd25sqs1li0g24cwpa1k162arw5b0qfl04f17"; depends=[emplik MASS]; }; @@ -16805,6 +17069,7 @@ in with self; { specs = derive2 { name="specs"; version="0.1.1"; sha256="0x5s7aikj5x1dgxygizh2mcni74hy6dm7084h1pqqbh5ans00c6n"; depends=[Rcpp RcppArmadillo]; }; spectacles = derive2 { name="spectacles"; version="0.5-3"; sha256="0fwj4407dwpvbjhjqwfxb455698ifyramwyddw4jrzgaf11vc4ii"; depends=[baseline epiR ggplot2 plyr reshape2 signal stringr]; }; spectator = derive2 { name="spectator"; version="0.1.0"; sha256="1s18yzqmh67c3xdsi2vw9fl8p3nkgdf5xfkkf0f8ljqvhn19v3rm"; depends=[geojsonsf httr sf]; }; + spectr = derive2 { name="spectr"; version="1.0.1"; sha256="1jbadg9n42qrbw1v6hqrdp5pzy2nn1kvqi4xscxdxvc6c33i7zr4"; depends=[data_table foreach lomb]; }; spectral = derive2 { name="spectral"; version="2.0"; sha256="116gn41nvlw7jmr6qx9pl8hckg2pzgzx49kql52j5xqf39sgyx9p"; depends=[lattice pbapply rasterImage RhpcBLASctl]; }; spectralAnalysis = derive2 { name="spectralAnalysis"; version="3.12.0"; sha256="0mz01hx86qi65k6vzz9k1j9q7gi10dh14cqvrlfy93f3kmi52q0x"; depends=[baseline BiocGenerics data_table ggplot2 hNMF jsonlite magrittr NMF nnls plotly plyr RColorBrewer signal viridis]; }; spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; }; @@ -16813,7 +17078,8 @@ in with self; { spectrolab = derive2 { name="spectrolab"; version="0.0.16"; sha256="0qfzkf8dm5r5sbadipcqvfs1965l365g9000rgl9713v9lmshmy6"; depends=[RColorBrewer shiny shinyjs]; }; sped = derive2 { name="sped"; version="0.2-1"; sha256="05igpk8szdcs6kjhpmd9dmjvqdg199pz3hi0rwkhdjglxivvjzjn"; depends=[pooh]; }; speech = derive2 { name="speech"; version="0.1.4"; sha256="17j4hwfqsazakkdxdrx87dfpmdsh51mms31sm3hpnzh4j7ijcg86"; depends=[dplyr lubridate magrittr pdftools purrr rvest stringr tibble tidyr tm]; }; - speedglm = derive2 { name="speedglm"; version="0.3-3"; sha256="0f37w4lj8dpcg1sfkd7cv6qpdkanmb97mnd8zih2fxzv8bpd0rfh"; depends=[MASS Matrix]; }; + speechbr = derive2 { name="speechbr"; version="1.0.0"; sha256="0nifv74rh4qla3cd92bnjn77n39fyxvxb4hlix3lk096c0qxgp7s"; depends=[abjutils dplyr glue httr janitor lubridate magrittr purrr rlang rvest stringr tibble tidyr xml2]; }; + speedglm = derive2 { name="speedglm"; version="0.3-4"; sha256="1kj662nfkfhvx37jrbvxd4dyjclz5cm3xh50z7s5rbzapiyxn4hs"; depends=[MASS Matrix]; }; speedycode = derive2 { name="speedycode"; version="0.2.0"; sha256="1fz8a6z77r17rld1qqiq3hsk65fpjz8f6czcfqsc8y2fxm0jy602"; depends=[dplyr purrr stringr]; }; spef = derive2 { name="spef"; version="1.0.9"; sha256="115lmv2a21ws1mj22v1fbk72mqn3siqmw3frbg4nci96lnyr7qh6"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; }; speff2trial = derive2 { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; }; @@ -16824,29 +17090,28 @@ in with self; { sperrorest = derive2 { name="sperrorest"; version="3.0.4"; sha256="169bv07vwlbn2ihw0f8hx10qrfdww9lqb2j8wgrkh1xnkskz13hv"; depends=[dplyr future future_apply ROCR stringr]; }; spex = derive2 { name="spex"; version="0.7.1"; sha256="0lsmh1sywd4si0v10aix44hybwph3gan8w8cxz956dcgkz60p41v"; depends=[crsmeta quadmesh raster reproj sp]; }; spfda = derive2 { name="spfda"; version="0.9.0"; sha256="156vs1f75x0wbf65fwzkhlbda649sryf58xixi7gbfjzn873w111"; depends=[mathjaxr]; }; + spfilteR = derive2 { name="spfilteR"; version="1.1.4"; sha256="0cxc7zrzwr07wk7yv26li6fwmbv3q57vdamzalfrj1npszzkg1s7"; depends=[]; }; spflow = derive2 { name="spflow"; version="0.1.0"; sha256="0a5nirccwcc2z4dn3gxdlhdjz7sxv1r23clawy0kwn4ggdkmphp1"; depends=[coda Matrix Rdpack RSpectra]; }; - spfrontier = derive2 { name="spfrontier"; version="0.2.5"; sha256="1vnvwcjbhvbmyn5rp4760amzy8k3y156q629fjymw9rw6zy45pbf"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; }; spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; }; spgrass6 = derive2 { name="spgrass6"; version="0.8-9"; sha256="05xvdhisad0d7c69mvahzg6pvgvmb6dph50r34981palykic7qhn"; depends=[sp XML]; }; spgs = derive2 { name="spgs"; version="1.0-3"; sha256="0a7zqih8q4imi49in8d2j9wa82savp7d2g4xy4wlwblwf6f2ggsh"; depends=[]; }; spgwr = derive2 { name="spgwr"; version="0.6-34"; sha256="1zmd7zp1h98y0xnxacym29b8kcp79yrsss1c49b5rfnml9ksdaqx"; depends=[sp spData]; }; spherepc = derive2 { name="spherepc"; version="0.1.7"; sha256="0y05ylyxzawgjlivaxs513mfjjfmw6fm98b83sq76n8yw56pr9ny"; depends=[geosphere rgl sphereplot]; }; sphereplot = derive2 { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; }; - sphet = derive2 { name="sphet"; version="1.7"; sha256="0savvqz3v5awsr7kcghg6yzkqdpm01kwp7jrg9ajfb3146gg8mlq"; depends=[Matrix nlme sp spdep]; }; + 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]; }; spiR = derive2 { name="spiR"; version="0.2.1"; sha256="0v3304d0ar6344377m6zd4p6f9m8ibq37i5ys4lnxnw41lhjx1x2"; depends=[dplyr ggplot2 ggsci gsheet lubridate readr reshape2]; }; 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.4"; sha256="0lk080s3xksrskc48nckpml74gvs6n7jjr4jgm15jhwp0izjs5y7"; depends=[Rcpp]; }; - spiders = derive2 { name="spiders"; version="1.2"; sha256="1qklm178bgkgpvrjf024jphsdh9can8300sf0702l4h0rk2daqbq"; depends=[plyr]; }; spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-15"; sha256="1kg1vqx9zvn8jqh8ygjifpyd00npqz3ljbs7r3zgh28bclhfywai"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; }; spikes = derive2 { name="spikes"; version="1.1"; sha256="080sna0sgii61kai5sirs6cijnvk1012djwfw705di9y2lvk1hqk"; depends=[emdbook]; }; spikeslab = derive2 { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; }; spinBayes = derive2 { name="spinBayes"; version="0.1.0"; sha256="1qgqxxk4n17wj3q07irm2qj6lwc5188iwwbdkf588hvfy86lwpj8"; depends=[glmnet MASS Rcpp RcppArmadillo]; }; spind = derive2 { name="spind"; version="2.2.1"; sha256="1yasqy086h4dv348krisc024mic0dvdsncqys95l85924djlfipp"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje rlang splancs stringr waveslim]; }; - spinifex = derive2 { name="spinifex"; version="0.3.2"; sha256="1xw70g84jj093rq2vm0wvqbi80q5x7icmkbydcsj7m0h5kfnk5qq"; depends=[gganimate ggplot2 magrittr plotly Rdimtools shiny tourr transformr]; }; + spinifex = derive2 { name="spinifex"; version="0.3.5"; sha256="08sj1crngk28d9b1qayxffwgg16imcqk8mpnp7fsjfrjih68a7sw"; depends=[gganimate ggplot2 magrittr plotly Rdimtools shiny tourr transformr]; }; spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; }; - spiralize = derive2 { name="spiralize"; version="1.0.3"; sha256="11357jgvzxrn02pa1b79k85x4mizkqa49ghps4s2g7f2w9hxdx18"; depends=[circlize GetoptLong GlobalOptions lubridate]; }; + spiralize = derive2 { name="spiralize"; version="1.0.5"; sha256="0m0809b34l8mp0czpcq144hw5p10g35lsb8z7l8ls2kclb8xjcs8"; depends=[circlize GetoptLong GlobalOptions lubridate]; }; spiritR = derive2 { name="spiritR"; version="0.1.1"; sha256="1fjr63rl9hwqxzgm4lkb9v74cxxpi4lrlcgjixdm7zgccm8ihdvh"; depends=[httr magrittr xml2]; }; splancs = derive2 { name="splancs"; version="2.01-42"; sha256="1aph5rns5kzad1vc6y7khs3y8ysf51fgssmskmi0pqi18mvg82lc"; depends=[sp]; }; splash = derive2 { name="splash"; version="1.0.1"; sha256="0f5ap8gi1nqxq8qbi3dz52hlizln1wxfrx5k06bagvxh8za8a08v"; depends=[]; }; @@ -16855,14 +17120,14 @@ in with self; { 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="0.3.1"; sha256="015vk8awxfc3zmcm3h51b6fy7si31g8w7mg4ig5fvpgsnm97h7rw"; depends=[]; }; + splitTools = derive2 { name="splitTools"; version="0.3.2"; sha256="1m1q3klzahlf85s24pklk21pp2hhwlf96fkfyxc3z4ij4lcqhqsx"; depends=[]; }; splitfngr = derive2 { name="splitfngr"; version="0.1.2"; sha256="0cf9y68m72j890a732m0n784nr12ydljr6s8i80f0in6q8lmw8ls"; depends=[lbfgs]; }; splithalf = derive2 { name="splithalf"; version="0.7.2"; sha256="1b66dssjjs3j7wvjx12ql1iavfllh366cb5kbf5scxg882zjdi0l"; depends=[dplyr ggplot2 patchwork plyr Rcpp robustbase tidyr]; }; splithalfr = derive2 { name="splithalfr"; version="2.2.0"; sha256="1c3q7x4fipsym0gz22kgl75r594hylbcci3a76q3yp0zazjmxxhx"; 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.4-11"; sha256="15app94mxs6xlmqqhpa0q041skc4n4l2wfi6pmmhwinrgcqgncln"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; }; + splm = derive2 { name="splm"; version="1.5-3"; sha256="1jgwv1j0x3gj14m1g9z1cl4xf230fmysf27b6jyjdraz5vqml2cb"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spatialreg spdep]; }; splmm = derive2 { name="splmm"; version="1.1.3"; sha256="0z04arwzy5169f6bhc8cbdc07zcmd5safpii5a3g7bqallmzipnr"; depends=[emulator ggplot2 gridExtra MASS miscTools penalized plot3D Rcpp RcppArmadillo]; }; - splot = derive2 { name="splot"; version="0.5.1"; sha256="0m2cx5rrwfyznzn12z9xkyrs9i6qkwyyymbk3z28gjxw31kszlc9"; depends=[]; }; + splot = derive2 { name="splot"; version="0.5.2"; sha256="14i2z4br4sc08nwmcj49wnc5fgzf1v7w2a4kz5q453yn9h8ypp1n"; depends=[]; }; spls = derive2 { name="spls"; version="2.2-3"; sha256="0bmb0ai5z80njhypd342i711x0bdkwcvlyn374lyyzj8h3d97mmv"; depends=[MASS nnet pls]; }; splus2R = derive2 { name="splus2R"; version="1.3-3"; sha256="035zd22zcpkh74rik9ws6g8al6vjz7jgrqs5si361bzb5n290p3x"; depends=[]; }; splusTimeDate = derive2 { name="splusTimeDate"; version="2.5.2"; sha256="06r2px2nsqyvjb1r1gz6wwjyr6rmfzslyxng8ng2n7hwr9ga1kc8"; depends=[]; }; @@ -16877,7 +17142,7 @@ in with self; { 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]; }; - spork = derive2 { name="spork"; version="0.2.1"; sha256="02m9qnwff5gj3p7bmcv56b99y55qhz3a9whknvqvm9f4dz24k9y6"; depends=[ggplot2 latexpdf png]; }; + spork = derive2 { name="spork"; version="0.2.2"; sha256="09n159nkrgpwf6ck24axgsxh6dm1xays9pgx940pzmaq7vzb5ng4"; depends=[ggplot2 latexpdf png]; }; sporm = derive2 { name="sporm"; version="1.1.1"; sha256="1bj795kmzjjcwvnrwg7dfz4jbfj488iydm0s79wrsgdq4chrrgyb"; depends=[]; }; sport = derive2 { name="sport"; version="0.2.0"; sha256="1wb28iaa35naf5aczijb5g0l41yf098f7c20mjmkcd5w04l1mmks"; depends=[data_table ggplot2 Rcpp]; }; sportyR = derive2 { name="sportyR"; version="1.0.1"; sha256="03l5zyqdrzji58acq5mmczz7nx9yk29hf5dzagpgb8fraq1vvddi"; depends=[dplyr ggplot2 glue]; }; @@ -16886,7 +17151,8 @@ in with self; { spotifyr = derive2 { name="spotifyr"; version="2.2.3"; sha256="1gpi7d40rdx4dvx5699xj5zisz48arwni18sszvp8phvhgqbj0lh"; depends=[assertthat dplyr genius ggridges httr janitor jsonlite lubridate magrittr purrr readr rlang rvest stringr tibble tidyr xml2]; }; spotoroo = derive2 { name="spotoroo"; version="0.1.2"; sha256="04zmb0smljr0yszhd789mqm5ds3l71k5cfd9v173d04r5vv8z77a"; depends=[cli dplyr geodist ggbeeswarm ggExtra ggplot2 ggrepel patchwork progress]; }; spp = derive2 { name="spp"; version="1.16.0"; sha256="08zxxgyp0h6733b08jmml7k4rhfd3mi5dda3jrzid0s184y0z29w"; depends=[BH caTools Rcpp Rsamtools]; }; - spray = derive2 { name="spray"; version="1.0-18"; sha256="08lfb3aq2zinrhip4gzdkca5wcawang9dbip4d1vmp920xj6fs16"; depends=[disordR magic mathjaxr partitions Rcpp]; }; + spqdep = derive2 { name="spqdep"; version="0.1.0"; sha256="00scaafr0r8a0qf5nirv0gi6wsjlz6kk6nmb3rk5fd3x5k9p6ck1"; depends=[bookdown broom dplyr ggplot2 gridExtra gt gtools igraph lwgeom magrittr Matrix purrr rsample sf sp spatialreg spdep tidyr]; }; + spray = derive2 { name="spray"; version="1.0-19"; sha256="1x9zn1hw7ndl28c49bka1bqay9wrjvc66d3bs7v7bj53zqmgkac3"; 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.0.0"; sha256="0949ms3d2r94vbsqyfma4vfavf0gdq58xs7nkirgrfxjd1a65vfm"; depends=[interp timeDate]; }; sprex = derive2 { name="sprex"; version="1.4.1"; sha256="14idml4mipd4wyza7hqf49ww4dparmwaps35hxm8jg5h0w1pgh7j"; depends=[swfscMisc]; }; @@ -16896,15 +17162,16 @@ in with self; { sprm = derive2 { name="sprm"; version="1.2.2"; sha256="0iyijkjnyz4yx2cmazlnhkk0f5ls0c2q2aikwlzl13w6zbj040a8"; depends=[cvTools ggplot2 pcaPP reshape2 robustbase]; }; sprsmdl = derive2 { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; }; sprtt = derive2 { name="sprtt"; version="0.1.0"; sha256="1lj4qrn8ajl9lmx9qrcxrrd187khs3afvmf2hpwmakxfn6sajm0z"; depends=[]; }; - sps = derive2 { name="sps"; version="0.1.2"; sha256="1z5r7fmysv9qw8rjrw469mabrdj6pn70y726rqn3ys0kjiz3h47m"; depends=[]; }; - spsComps = derive2 { name="spsComps"; version="0.3.1"; sha256="0wkbxpav823kczqqk8kmax21zpi99bx2gisnqmmqvbb7lsjdlram"; depends=[assertthat crayon glue htmltools magrittr R6 shiny shinyAce shinytoastr stringr]; }; + 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]; }; + sps = derive2 { name="sps"; version="0.1.3"; sha256="0lgrzkwbkyzwbk4fyl012qqvnfmq1ina8cdg3qr25bwjhwhscipx"; depends=[]; }; + spsComps = derive2 { name="spsComps"; version="0.3.2.0"; sha256="1ndii6jjnijkdngngqxwwdxi3p5fcn6g4lzajvhi2ywda0in492p"; 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.0"; sha256="0dkbl5x2h1l34ybhb4zdygnf7fdga78aaq4nb9kqyw6xjfrcsazn"; depends=[car Formula ggplot2 gmodels gridExtra knitr lmtest MASS Matrix minqa numDeriv Rdpack rlang rmarkdown sparseMVN spatialreg spdep]; }; 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.1.0"; sha256="15phg10qczhs7k0hlqd33mcfjh7fcb3l3wyql4x7006rhs7x2z2a"; depends=[boot crossdes deldir lme4 MASS sampling sf survey units]; }; + spsurvey = derive2 { name="spsurvey"; version="5.3.0"; sha256="1wvl6lbww82c1z83928zgn5l1ciayppb6k84l2syxn6fs1xjadbc"; depends=[boot crossdes deldir lme4 MASS sampling sf survey units]; }; spt = derive2 { name="spt"; version="2.5.1"; sha256="04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn"; depends=[]; }; sptm = derive2 { name="sptm"; version="2019.11-25"; sha256="1hdymzngdppmh56dqh0k88n9hg68pbx9rgmimbz4ihnfx2plvadh"; depends=[kyotil survey survival]; }; sptotal = derive2 { name="sptotal"; version="1.0.0"; sha256="0lcq7ldrgy93i1pk2hhwfmhqhmijv9g5p7jdsh9hrfky51w8vrql"; depends=[ggplot2 sp viridis]; }; @@ -16916,17 +17183,18 @@ in with self; { sqlparseR = derive2 { name="sqlparseR"; version="0.1.0"; sha256="0zcna9y61v1qklpnhrwgv1djg4hyx3k5an32caapszi8qm9nq3x8"; depends=[reticulate]; }; sqlscore = derive2 { name="sqlscore"; version="0.1.4"; sha256="1wvjiy7g0rxfy10vssdrv5li5sbvrin9wjy0ai0nxk503kw7g74k"; depends=[dbplyr]; }; sqlutils = derive2 { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[DBI roxygen2 stringr]; }; + squant = derive2 { name="squant"; version="1.1.4"; sha256="1z4qi1svv6186gj3nh4z3hvjd54i7grj6ckgdyk4dmyn7zh8fw5w"; depends=[ggplot2 glmnet survival]; }; squash = derive2 { name="squash"; version="1.0.9"; sha256="1x66iamj5pir6l9aqx4x7xylxxjpjrw8vcix9rbhfd0y0y2iqf7z"; depends=[]; }; squashinformr = derive2 { name="squashinformr"; version="0.2.5"; sha256="1403h52il9kyf16cm44lvib8sgdq0njrqsci8ng5ngryg2h2lacc"; depends=[dplyr Hmisc janitor lubridate naniar plyr polite rlang rvest stringr tibble tidyr]; }; squeezy = derive2 { name="squeezy"; version="1.0"; sha256="0ihlgdnfissi0kaw7gwiihrp7kw5447kbwnb7rb1l2jacs60v41n"; depends=[glmnet Matrix multiridge mvtnorm]; }; - squid = derive2 { name="squid"; version="0.1.2"; sha256="1sf7q9pp68inr4ikaxm51f31gwxq9ixrsismrnnsby3agq6nsmkb"; depends=[arm data_table ggplot2 lme4 MASS shiny]; }; + squid = derive2 { name="squid"; version="0.2.1"; sha256="1zpm787ifzrhww32ghi57ii37p9dssq7q7gbai9iqass78z90y2j"; depends=[arm brms data_table ggplot2 lme4 MASS plotly shiny shinyMatrix]; }; sra = derive2 { name="sra"; version="0.1.3"; sha256="0bdxgsz177szfqmvffidgkhl0lrdd7c1nzdvh7ijx99zmi5ww71n"; depends=[]; }; srcr = derive2 { name="srcr"; version="1.1.0"; sha256="1cv4j27w9lssllih0lg172x1p001sk13p9hg39579lx6rpb9l75q"; depends=[DBI dplyr jsonlite]; }; - sregsurvey = derive2 { name="sregsurvey"; version="0.1.1"; sha256="00yiz95yf3f1nq34ni5i7v7nzvqdxy3jdnsr7aizjiz424b210vp"; depends=[caret dplyr gamlss gamlss_dist magrittr TeachingSampling]; }; + sregsurvey = derive2 { name="sregsurvey"; version="0.1.2"; sha256="1wsfjnkszxvx4pjgpi2v14s94d7rpl13pallja6rfcmsgxp3kc2l"; depends=[caret dplyr gamlss gamlss_dist magrittr TeachingSampling]; }; srm = derive2 { name="srm"; version="0.3-6"; sha256="0mc97pv1hsmia4v2wyb8yi37i3v1xypfv9xmhjb989xnnysf1lm3"; depends=[Rcpp RcppArmadillo]; }; srp = derive2 { name="srp"; version="1.2.0"; sha256="0xdzfvi7z78xmyxwd8fha3lr86jwmgjba1w8hhn4sv3v5gc9vlkh"; depends=[fda mgcv]; }; srt = derive2 { name="srt"; version="1.0.3"; sha256="0m94ycnrlgjvlx9jzb05rdg57yxwsw3p7zjih0m04vb1369j83q1"; depends=[]; }; - srvyr = derive2 { name="srvyr"; version="1.1.0"; sha256="0gq53s3m7vzlyi04zijljmjllwy3gf8kjpb5w3hbiic77g1mlw21"; depends=[dplyr magrittr rlang survey tibble tidyr tidyselect vctrs]; }; + srvyr = derive2 { name="srvyr"; version="1.1.1"; sha256="1sm86r9d9vc3cvi64xvypf65phqbnv527x7v3k3da0gzgz823wsf"; depends=[dplyr magrittr rlang survey tibble tidyr tidyselect vctrs]; }; ss3sim = derive2 { name="ss3sim"; version="1.0.3"; sha256="0s2yajlhi07fvqc0rr4msd9g2jrswb83dx55wsxnw925vikqa5kz"; depends=[bbmle foreach ggplot2 gtools r4ss]; }; ssMousetrack = derive2 { name="ssMousetrack"; version="1.1.5"; sha256="069jsp2l63jp4fv2hwadqxpkp89aqmbh439zy66rx55kws75b556"; depends=[BH CircStats cowplot dtw ggplot2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; ssaBSS = derive2 { name="ssaBSS"; version="0.1"; sha256="1gprl725am933fqlhhxzwrg7k08sy0xndmg8v8hifxfwq9nbk0w9"; depends=[BSSprep ggplot2 ICtest JADE tsBSS xts zoo]; }; @@ -16938,13 +17206,13 @@ in with self; { ssdtools = derive2 { name="ssdtools"; version="0.3.7"; sha256="1mxkbf7skxg073nmy195c78fh8mimxnycnlx921y3pb9vrplsn2a"; depends=[abind actuar chk fitdistrplus ggplot2 lifecycle Rcpp scales tibble 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.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; }; + ssfa = derive2 { name="ssfa"; version="1.2"; sha256="14v10lbv3wlrnz3b2i8i56rj5rr257qvwa8w9j6xqswllb80132r"; depends=[Matrix maxLik sp spatialreg spdep]; }; ssfit = derive2 { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; }; ssgraph = derive2 { name="ssgraph"; version="1.12"; sha256="0mcg8bzgx0376f72xxqmsfwmnmfk6lcmam19d28psr1sxnhngklj"; depends=[BDgraph]; }; ssh = derive2 { name="ssh"; version="0.8.0"; sha256="0y9rrvn21mc9ivjlz6zmg5h282d2gycyjda8sh9k0gx0y4c2m30i"; depends=[askpass credentials]; }; ssh_utils = derive2 { name="ssh.utils"; version="1.0"; sha256="08313zzzgcyvzkrkq0w0yf748ya1a9shx5xnan5891v0lah9v0b1"; depends=[stringr]; }; - sship = derive2 { name="sship"; version="0.7.3"; sha256="0ac882x8p131iy61qkgaiax073387qsc5ahmxw4vvhhlks0kssi2"; depends=[httr jsonlite openssl RCurl yaml]; }; - ssimparser = derive2 { name="ssimparser"; version="0.1.0"; sha256="1h4jwfcbsimwkwwfpjdi9mipc8z8ia6b6ha6v9dz7ghgpp1a2919"; depends=[airportr dplyr magrittr stringr tidyr]; }; + sship = derive2 { name="sship"; version="0.7.4"; sha256="0j36mx15jhg90vpycw57zghw8x9jb8s865yzzrpgz8pg7avgqqzf"; depends=[httr jsonlite openssl RCurl yaml]; }; + ssimparser = derive2 { name="ssimparser"; version="0.1.1"; sha256="01c9kbvdrkchf4rad9hysyflpkgdj294lbk94fc5pkc49fqznmrx"; depends=[airportr dplyr magrittr stringr tidyr]; }; ssize_fdr = derive2 { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; }; ssizeRNA = derive2 { name="ssizeRNA"; version="1.3.2"; sha256="1qw10yswzpg28fhvr6rsq0gh7xivfapw64gxc0hakb1nc31jf8ky"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; }; ssmn = derive2 { name="ssmn"; version="1.1"; sha256="1rab9yjb05g5rphqlhwvdwmsyqlv1f4m0rqxfv8c5pbh170nbwbc"; depends=[mnormt moments sn truncdist]; }; @@ -16961,12 +17229,12 @@ in with self; { ssvd = derive2 { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; }; ssym = derive2 { name="ssym"; version="1.5.7"; sha256="0l5d921vlhd4qwddllrgcxpq3bhivvy5ikh3ixdy3s140rzpgwrv"; 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.4"; sha256="120k8k1l8cfy8x746808jym7lnaplgh4s3lycgyq2wia2c35r0rc"; depends=[foreach forecast Matrix quantreg rgl SparseM]; }; + stR = derive2 { name="stR"; version="0.5"; sha256="1nlb2d8a11kxiipv96sfmmcq185051vmdiwjjqayln143gvhzp7w"; depends=[foreach forecast Matrix quantreg SparseM]; }; sta = derive2 { name="sta"; version="0.1.5"; sha256="0q9pplx4ifndvbh2bfa96vjbcaaqdj6bq57kwlzhavq6hjq7d56v"; depends=[doParallel foreach geoTS iterators mapview raster RColorBrewer rgdal trend]; }; staRdom = derive2 { name="staRdom"; version="1.1.23"; sha256="0gsix1dxk4gn2iq0zqbm7fyzxxnyzbgdlcbk11lqirx9x0xmwj80"; 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="0.1.0"; sha256="1d6aka5k51gnxfwyhv70n9pwxzp7ldyq10ircp6bphalwr0m35vv"; depends=[bigstep broom caret dplyr ggplot2 glmnet ncvreg purrr rsample stringr tibble tidyr]; }; + stabiliser = derive2 { name="stabiliser"; version="0.1.2"; sha256="0vpmq1g4vmg02nydkg4q6li00zwvxwm0bad0prhn4kfnlzhkk864"; depends=[bigstep broom caret dplyr ggplot2 glmnet knitr ncvreg purrr rsample stringr tibble tidyr]; }; stability = derive2 { name="stability"; version="0.5.0"; sha256="0mz7ikfhpfbdcp72klq7fi4zfmx2w18gz46yhwywcc4dyi277m11"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; }; - stable = derive2 { name="stable"; version="1.1.4"; sha256="01azqg4yi5wl6wfdpjq57w41x5z2b4dsp5n3vpkz24b9avk6rm8s"; depends=[rmutil stabledist]; }; + stable = derive2 { name="stable"; version="1.1.6"; sha256="194xsa291v5f0jya1c3aigbclg8cci427ffpb8brxamm6n57hf12"; depends=[rmutil]; }; stableGR = derive2 { name="stableGR"; version="1.1"; sha256="1fbbghqkd6vpnlnzgc6fsdpvlc7lw6nxwy5whdg7zgxkwqvqj8n3"; depends=[mcmcse mvtnorm]; }; stabledist = derive2 { name="stabledist"; version="0.7-1"; sha256="0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86"; depends=[]; }; stablelearner = derive2 { name="stablelearner"; version="0.1-3"; sha256="0h2xqm9g4zx72r6r0a7if1kyrqrjr8hs1pi07h294hbg8l7yvhxb"; depends=[e1071 MASS party partykit randomForest ranger]; }; @@ -16975,31 +17243,31 @@ in with self; { stabreg = derive2 { name="stabreg"; version="0.1.2"; sha256="1jrxyv0d33vd9vdlj1cv1a2qdz8iqgr726f54dgazwsz3cpyy2ia"; depends=[numDeriv]; }; stabs = derive2 { name="stabs"; version="0.6-4"; sha256="1nf1yg14cgxrs4np1yghpzw1nczaslfv3rvf3918wrlzg0vp6l7q"; depends=[]; }; stackoverflow = derive2 { name="stackoverflow"; version="0.7.0"; sha256="0zv8bxzw4pgaa5ra8wsb9p7g8bwffdhc6gqsfrcs61zva7v9izc2"; depends=[]; }; - stacks = derive2 { name="stacks"; version="0.2.1"; sha256="0a69fvj48npcbm0jj0506mq5m9hdprva247nyhiays6ar4ic52kv"; depends=[butcher cli dials dplyr foreach generics ggplot2 glmnet glue parsnip purrr recipes rlang rsample tibble tidyr tune workflows workflowsets yardstick]; }; + stacks = derive2 { name="stacks"; version="0.2.2"; sha256="0fmar6zfhckka0lbn89yhkss0l5zc4d1yy9clid9v5b87g8ka6xh"; depends=[butcher cli dials dplyr foreach generics ggplot2 glmnet glue parsnip purrr recipes rlang rsample tibble tidyr tune workflows workflowsets yardstick]; }; stacomirtools = derive2 { name="stacomirtools"; version="0.6.0"; sha256="1qy9rw38qa0ng7gcnbccws8cm8175rficm5b1jn956qbkcxkz0w8"; depends=[DBI pool RODBC RPostgres xtable]; }; stagePop = derive2 { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; }; stagedtrees = derive2 { name="stagedtrees"; version="2.2.0"; sha256="01qb8pw0al3b3b6smcapd61i81p6xw3hh1x8i6dsb73pdvpbfyxj"; depends=[]; }; staggered = derive2 { name="staggered"; version="1.1"; sha256="0z9358qbgn637j8iz5qwr4nyrlvi9w85l325vxpc61mcwksx5ip8"; depends=[coop dplyr magrittr MASS purrr Rcpp RcppEigen reshape2 tidyr]; }; - stam = derive2 { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; }; stampr = derive2 { name="stampr"; version="0.2"; sha256="10mc71kgnw5712q2gvzd4bmjaw1879r7s599hfsjap21idqb2k2m"; depends=[deldir maptools raster rgdal rgeos sp spdep]; }; stan4bart = derive2 { name="stan4bart"; version="0.0-2"; sha256="0262z83rqwf38z2qrvngdz6wmnrz48w4ijv7wg81w1b1lp807y5s"; depends=[BH dbarts Matrix Rcpp RcppEigen RcppParallel]; }; standardize = derive2 { name="standardize"; version="0.2.2"; sha256="008nz9vf08qxwdsn373yzpmsw5lhbm6mpm6dlwyys58wq0bdvh28"; depends=[lme4 MASS stringr]; }; standartox = derive2 { name="standartox"; version="0.0.1"; sha256="1b5w66x4v8hfxzp3ahw97my6m0rcn22iv5nhgm2wzdq0if0cq8py"; depends=[curl data_table fst httr jsonlite]; }; stapler = derive2 { name="stapler"; version="0.7.1"; sha256="1bzhahn72fzm2bjpis76hphv8whnkp2jq8bm1qldadhng4z1nsak"; depends=[matrixStats RNifti]; }; staplr = derive2 { name="staplr"; version="3.1.1"; sha256="0g3a13qndi4w35wq9bm0gb2b8v9svih9gbj5ymggqlcwz1dzywga"; depends=[assertthat glue rJava stringr XML]; }; - stargazer = derive2 { name="stargazer"; version="5.2.2"; sha256="1pij76r60hkjlvxw6zw1v7gkib81smiqmjq7mwszn6xclq9lmsvh"; depends=[]; }; + 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]; }; stars = derive2 { name="stars"; version="0.5-5"; sha256="0hcbzr8c7wk30qjwrvx6bflzwkjpms79pavaxawnq1h8kry5fngk"; depends=[abind classInt lwgeom 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"; sha256="1nw13r5gf8chr8zc3ypc6zzq811y8m0m2yin5y1gvim3wkfz63xj"; depends=[assertthat leaflet plumber png R6 rlang sf stars units]; }; starschemar = derive2 { name="starschemar"; version="1.2.0"; sha256="0jjaic1zwdc3lvdlgs0vzkjjivjs2dskmhx4qg469ban34az0591"; depends=[dplyr generics pander purrr readr rlang snakecase tibble tidyr tidyselect]; }; - startR = derive2 { name="startR"; version="2.1.0"; sha256="1cgn77jaiy7gfqbhh6w3x0bf57v32vzpp334mp50v827hgv439wy"; depends=[abind bigmemory ClimProjDiags easyNCDF future multiApply s2dverification]; }; + startR = derive2 { name="startR"; version="2.2.0"; sha256="12kigspfpmzibnr7y8m906qj1hm596wx8asghi0fd4598nk1w0s3"; depends=[abind bigmemory ClimProjDiags easyNCDF future multiApply PCICt s2dv]; }; starter = derive2 { name="starter"; version="0.1.8"; sha256="003ih4035hhka5cghr5j3h0gc9a2fxdafag8ffxxg8cvigh2m7fm"; depends=[dplyr fs gert glue here purrr R_utils readr renv rlang stringr tibble usethis]; }; - startup = derive2 { name="startup"; version="0.16.0"; sha256="1lqjig4jvy71w7082b5s209kmkchn39n0fksnvjp1prjvygh575w"; depends=[]; }; + startup = derive2 { name="startup"; version="0.17.0"; sha256="0i9qk9kqwqrgsazivg4prar48h1rvy2fiwrv2igmqggy253pnipm"; depends=[]; }; startupmsg = derive2 { name="startupmsg"; version="0.9.6"; sha256="0vkqxir4ady4dn9s70dfg1fxck2xg8vnmrmxjzvk01i6pc9zyq0x"; depends=[]; }; - starvars = derive2 { name="starvars"; version="1.1.9"; sha256="0h4swxkvcif79258jimrzy4lk370ad6f0w9npjhya6pbjii40j3l"; depends=[doSNOW foreach ks lessR MASS matrixcalc optimParallel quantmod vars xts zoo]; }; - starvz = derive2 { name="starvz"; version="0.7.0"; sha256="166mppribk0hsx4rs3km0k44s7yww6ss5bmxn4434caj43rda5lr"; depends=[arrow BH data_tree dplyr ggplot2 gtools lpSolve magrittr patchwork purrr RColorBrewer Rcpp readr rlang stringr tibble tidyr yaml zoo]; }; + 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]; }; stat_extend = derive2 { name="stat.extend"; version="0.2.1"; sha256="1qwjqnjds733xvxhby604yqvwlj1rkr3411diwzhbgwp89rhy11r"; depends=[sets]; }; statGraph = derive2 { name="statGraph"; version="0.5.0"; sha256="0fd7jsngd8gihivnir3y58961kvbdd5g1m5gm1da91984qs7r9q1"; depends=[cluster doParallel foreach igraph MASS rARPACK]; }; @@ -17011,14 +17279,15 @@ in with self; { 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]; }; statespacer = derive2 { name="statespacer"; version="0.4.0"; sha256="06qjbnp40mkbjxq14cwzpwcqymafm14cli1kmjfqwl4g1v9bvsx3"; depends=[Rcpp RcppArmadillo Rdpack]; }; - statgenGWAS = derive2 { name="statgenGWAS"; version="1.0.7"; sha256="1y740vpymxnyzdizayp6nqhwni363cgsf0323m0vxb76kd78jiid"; depends=[data_table ggplot2 Rcpp RcppArmadillo sommer]; }; + statgenGWAS = derive2 { name="statgenGWAS"; version="1.0.8"; sha256="0n2vkmn1cgping3h05bn66m4yhsd55df9g6iv1y3pz11zvw4w28q"; depends=[data_table ggplot2 Rcpp RcppArmadillo sommer]; }; statgenGxE = derive2 { name="statgenGxE"; version="1.0.4"; sha256="12v9a1lg12pmhzk28c929j1vhhh5x9gzb6ia9izvji2zjx2yigk4"; depends=[emmeans ggplot2 gridExtra knitr lme4 statgenSTA xtable]; }; statgenHTP = derive2 { name="statgenHTP"; version="1.0.5"; sha256="1lclxc4al3h7z5cbjhmm6p1hr22gysz16hlvfams37czbc2prlha"; depends=[animation factoextra ggforce ggnewscale ggplot2 gridExtra locfit lubridate reshape2 scales SpATS]; }; - statgenIBD = derive2 { name="statgenIBD"; version="1.0.2"; sha256="01pk5miwvs3mkx3dqj8pw9f38bikjk3vdih4h0gz2f7qav1kfyy9"; depends=[ggplot2 Rcpp RcppArmadillo]; }; + statgenIBD = derive2 { name="statgenIBD"; version="1.0.4"; sha256="1hjixzzxwvi6a9dz8n3xrz1zy9r7wzf54gp9m76pfbdnhjga3hgk"; depends=[ggplot2 Rcpp RcppArmadillo]; }; statgenSTA = derive2 { name="statgenSTA"; version="1.0.8"; sha256="1734gqcrwkxl3672pf147qh5n8lid4zk81zfanhqi6z83syw5ha5"; depends=[emmeans ggplot2 ggrepel gridExtra knitr lme4 mapproj maps qtl 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]; }; statmod = derive2 { name="statmod"; version="1.4.36"; sha256="1hkvklcav6gj4zib4g3b4xwsdsbsmnzdblr0v6jaqv227p49gs0l"; 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.5.0"; sha256="0bw8dwnv568i60xrj6d7gv0hnna1x7rvqaayy5i0827khvdj7nrw"; depends=[coda]; }; @@ -17026,9 +17295,9 @@ in with self; { statnipokladna = derive2 { name="statnipokladna"; version="0.7.0"; sha256="0xds27abs9x853nhy5xljldmxh5xrkxfgn5q6qw8b093ynrsvbrp"; depends=[curl dplyr httr jsonlite lifecycle lubridate magrittr purrr readr rlang stringi stringr tibble tidyr tidyselect usethis xml2]; }; statprograms = derive2 { name="statprograms"; version="0.2.0"; sha256="0m7px7fmpz2zzlfdi7rbllcjvcjp8iy94f6fa1w4xinh7vz3y6vq"; depends=[]; }; statpsych = derive2 { name="statpsych"; version="1.0.0"; sha256="0rakzsbafhp5xps9bbb4pljv4c49ij1rwz64z0q5jjglc95kw55s"; depends=[mathjaxr Rdpack]; }; - statquotes = derive2 { name="statquotes"; version="0.2.2"; sha256="1xzc3ndddjrlyld0p4zcwwxkj7i3m3adj7c78x9l4lhlw9mxbbqg"; depends=[stringr tidytext wordcloud]; }; + statquotes = derive2 { name="statquotes"; version="0.2.6"; sha256="04pk4fqq6hjpn15f2xp7hy25vhw5z1qj3v79sq6smzak1vz92zsa"; depends=[stringr tidytext wordcloud]; }; stats19 = derive2 { name="stats19"; version="2.0.0"; sha256="0minav2ab9xa9xq5mardjcijaxhs3v1izxmy15v5zf04lhvz4f03"; depends=[readr sf]; }; - statsExpressions = derive2 { name="statsExpressions"; version="1.2.0"; sha256="0d95iv3k260mzsw3krp8vggz8xx7n1l5s8jdhiq1z4vr8mz41gcd"; depends=[BayesFactor correlation datawizard dplyr effectsize insight magrittr parameters performance rlang tibble tidyr WRS2 zeallot]; }; + statsExpressions = derive2 { name="statsExpressions"; version="1.3.0"; sha256="0kml7q4nhnirh8na12mfqgg0ka4vl2333piabw94hx4rjhajwxll"; depends=[BayesFactor correlation datawizard dplyr effectsize glue insight magrittr parameters performance rlang tibble tidyr 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.1.4"; sha256="1q1825aiaq5mfcfdw8fy22w738cn0x2ifij7p3p276x0sl1cbrdm"; depends=[curl dplyr httr jsonlite rlang]; }; @@ -17045,6 +17314,7 @@ in with self; { 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-1"; sha256="0mz88d7214g59nvr40c4gf4grq9skjqqlfgydbdzmc4l315nr4zv"; depends=[digest lowpassFilter R_cache Rcpp]; }; + stepSplitReg = derive2 { name="stepSplitReg"; version="1.0.0"; sha256="0glsc11ylh4bqhw0p8sdf6r171lzb522skcnfg9vwxn4sm9s93zm"; depends=[nnls Rcpp RcppArmadillo SplitGLM]; }; stepgbm = derive2 { name="stepgbm"; version="1.0.0"; sha256="1psjnxc7dadbm1405wm3vgsf9m2pn8bm82rn9md3cxhp33jqh1bx"; depends=[gbm spm steprf]; }; stepjglm = derive2 { name="stepjglm"; version="0.0.1"; sha256="0xsb0wg7ka4ska2jkzaic7kqdzj2fkhpf5sxr3a116f2najj9ax2"; depends=[rsq]; }; stepp = derive2 { name="stepp"; version="3.2.2"; sha256="1iyj1f9gzn44xllhm9y1j0ynfz4q48d2l8ic4mjvzc3p4z8cnpmz"; depends=[car rstudioapi scales survival]; }; @@ -17064,7 +17334,7 @@ in with self; { stlELM = derive2 { name="stlELM"; version="0.1.0"; sha256="1sn4yn24k2nkcc5vxdmzj7ym9kzwffyysd5ckbpv7fggf1vajnif"; depends=[forecast nnfor]; }; stlTDNN = derive2 { name="stlTDNN"; version="0.1.0"; sha256="1j2f9kxlry15xp7bc03h5jr7v8gzq8frdxyzhq9s78m3d3dbixf4"; depends=[forecast nnfor]; }; stlcsb = derive2 { name="stlcsb"; version="0.1.2"; sha256="08pnj1yb4xcbhnrp2wny8lq9rvcvmsgaza07k4358csfksvmcira"; depends=[dplyr lubridate purrr readr readxl rlang rvest sf stringr tibble xml2]; }; - stlnpp = derive2 { name="stlnpp"; version="0.3.7"; sha256="0ycx423qq8h53w6bd1kw6xv0skfsw19fqzyrp2scpw1af2496snq"; depends=[spatstat spatstat_core spatstat_geom spatstat_linnet]; }; + stlnpp = derive2 { name="stlnpp"; version="0.3.8"; sha256="1lx2fkqal2mf55xx0rwy9wf9fkr9n0vrp8fwic4grjcq0v5cf75k"; depends=[spatstat spatstat_core 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]; }; stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; }; @@ -17081,21 +17351,20 @@ in with self; { stockfish = derive2 { name="stockfish"; version="0.1.3"; sha256="0f98xi81kjahvqhmq7hjbrg54kdff5j4q2dq8wj41l13pzi81sac"; depends=[processx R6]; }; 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-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; - stokes = derive2 { name="stokes"; version="1.0-9"; sha256="1hs57fz52zrpmjminsqpxs3bnmgn8fr3mkca9zmh2017ypk7zc1p"; depends=[disordR magrittr mathjaxr partitions permutations spray]; }; + stokes = derive2 { name="stokes"; version="1.1-1"; sha256="1hykdsmslvwbhm75k7q1l2xmr0dhldvq08np64gm8rgbfy4p4vpg"; depends=[disordR mathjaxr partitions permutations spray]; }; stopwords = derive2 { name="stopwords"; version="2.3"; sha256="1ci1cgxrcvlhhplximsfv0plvjdbcd5kv0nphxnpildsn5m1rv65"; depends=[ISOcodes]; }; storr = derive2 { name="storr"; version="1.2.5"; sha256="0qszdq16bf0dbss33zi63ciwmkgjsyc0c3akrr2kl14w3ncw6922"; depends=[digest R6]; }; 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="0.8.6"; sha256="08kxbblp6zb99v303j1m6ijr378m6jj3sfqnlj30ysb9ppy2fdmk"; depends=[curl data_table dplyr geosphere httr jsonlite lwgeom magrittr maptools nabor pbapply raster Rcpp RcppArmadillo rgeos rlang sf sfheaders sp stringr]; }; + stplanr = derive2 { name="stplanr"; version="0.8.7"; sha256="11a0cak6vf5snfpbbv0rbhcjryyd694d6vz1gyshxzwi6wgglhq0"; depends=[curl data_table dplyr geosphere httr jsonlite lwgeom magrittr maptools nabor pbapply raster Rcpp RcppArmadillo rgeos rlang sf sfheaders sp stringr]; }; stpm = derive2 { name="stpm"; version="1.7.10"; sha256="0y9rpqjn33gdqjvag4kb6dr00w80paspgj9ic25brclfv1zmzbhf"; depends=[MASS nloptr Rcpp RcppArmadillo sas7bdat survival]; }; - stpp = derive2 { name="stpp"; version="2.0-5"; sha256="1p7dxzfhi5pvva956nyypl7dfdgq3m0cara73hai87qzc342xcf0"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat_core spatstat_geom splancs]; }; 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]; }; strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; }; strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; }; stratEst = derive2 { name="stratEst"; version="1.1.4"; sha256="1g764h17sh499p0a5ixs61q8l1hssvi7v4c34i90rdf81l72i0mg"; depends=[Rcpp RcppArmadillo]; }; stratallo = derive2 { name="stratallo"; version="0.1.0"; sha256="0i8vqhf70x25p9z8amka2aaij7r28d83sp0nijim4n225bdfj6sk"; depends=[]; }; - stratamatch = derive2 { name="stratamatch"; version="0.1.7"; sha256="0jpdf042gzvg9mhkicpiacbk7kc1r7pvkmk47ja8nzs6icw90pqy"; depends=[dplyr Hmisc magrittr rlang survival]; }; + stratamatch = derive2 { name="stratamatch"; version="0.1.8"; sha256="04shi4qyzqa2xpmwv8jr273575sdn0jkirilqvdj1hhxkb212zks"; depends=[dplyr Hmisc magrittr rlang survival]; }; stratbr = derive2 { name="stratbr"; version="1.2"; sha256="15vkymmc61yz9szhfhc5663hfyqvh499ahwhr9mv1lhv5bikk0kb"; depends=[Rglpk snowfall stratification]; }; strategicplayers = derive2 { name="strategicplayers"; version="1.0"; sha256="19vijrlzawd701vvk9ig7yhzbirh39dxxcwfz8ywwvxxiaky5x55"; depends=[sna]; }; stratification = derive2 { name="stratification"; version="2.2-6"; sha256="1jlks3g8wpqlpci6v0ryyv93agiabdiklmk6ij0pc5icrfiynbhw"; depends=[]; }; @@ -17124,7 +17393,7 @@ in with self; { 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]; }; - strm = derive2 { name="strm"; version="0.1.2"; sha256="09x5h4zgbdqq88xabi7hw506y5jrd26br0233afd46m7c69ayadn"; depends=[dplyr knitr magrittr purrr rgdal rlang rmarkdown spatialreg testthat tidyr]; }; + strm = derive2 { name="strm"; version="0.1.3"; sha256="1jwsdr2pja7gjrrdn37bv9r8xvyzl03akrgldh4qbrvx9p03w67w"; depends=[dplyr knitr magrittr purrr rgdal rlang rmarkdown spatialreg testthat tidyr]; }; strucchange = derive2 { name="strucchange"; version="1.5-2"; sha256="1y022363a4pp0mnji91sjh1qiyspkh09sybqwj03r9pmwrd7q93x"; 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]; }; @@ -17146,12 +17415,12 @@ in with self; { sublime = derive2 { name="sublime"; version="1.3"; sha256="0455fppc68azxknxjvxci4kjpcj6c1jkp9adbxqrn3qnnywaj5v2"; depends=[AnalyzeFMRI downloader oro_nifti]; }; submax = derive2 { name="submax"; version="1.1.1"; sha256="0b9x55gqzw20smr3hx9izvyr0i8zv0h03hadn4c7ks7w8ga5i0kj"; depends=[mvtnorm sensitivityfull]; }; subniche = derive2 { name="subniche"; version="1.4"; sha256="10j7wz4hyqvpi7iqq7m6jb13g0wr7k59rkxyyhfkmcq1vgm2cpdx"; depends=[ade4 polyclip siar wordcloud]; }; - subplex = derive2 { name="subplex"; version="1.6"; sha256="1yfbfjvpbhgky7vihw3f4jl41pxpqb39z4nc045d5z7z48bdl18d"; depends=[]; }; + subplex = derive2 { name="subplex"; version="1.7"; sha256="11zqzydbj6ivgvlw1gv1r2yxra7misbc622g575p2vckhjjg9v6m"; depends=[]; }; subrank = derive2 { name="subrank"; version="0.9.9.1"; sha256="19lgw7248jq6b34i17c7vw208wsvmppni7njswd02i9xdgyjn95z"; depends=[]; }; subsamp = derive2 { name="subsamp"; version="0.1.0"; sha256="1bfz2z2qy1war3id8qr1asygwvwxgf2hhlh075hr6bjdkxz0j0nd"; depends=[]; }; subscore = derive2 { name="subscore"; version="3.1"; sha256="1hb4ci62hxffz09sz0i27jfw7xn0pca87kiq6damz5zi418csa4v"; depends=[boot cocor CTT irtoys ltm sirt]; }; - subscreen = derive2 { name="subscreen"; version="3.0.5"; sha256="0786p2n1a4xjsxnd31w2b079ggdzx9pgn14d5vbngrc6mgjm9hk8"; depends=[bsplus colourpicker data_table dplyr DT jsonlite plyr purrr randomForestSRC shiny shinyjs shinyWidgets]; }; subselect = derive2 { name="subselect"; version="0.15.2"; sha256="0ggpm5bq4ncx4302855s8x1nj0afjizmi81cg6b7xc7rvpirw0fq"; depends=[corpcor ISwR MASS]; }; + 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]; }; subtype = derive2 { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; }; sudachir = derive2 { name="sudachir"; version="0.1.0"; sha256="09ry00c3yhrz8fiyxdxgj9r3x7kldsl6fv35mmi5ysc2549kbcfb"; depends=[cli dplyr glue magrittr purrr reticulate rlang tibble tidyselect]; }; @@ -17160,7 +17429,8 @@ in with self; { sudokuAlt = derive2 { name="sudokuAlt"; version="0.2-1"; sha256="1y3li64xqag2ia8dg7q49jmlb1awl92rz6xa9zsbf0s9jman9wj9"; depends=[magrittr]; }; sugarbag = derive2 { name="sugarbag"; version="0.1.3"; sha256="05j2b9vbhpkfr3xkam9wgm0w4k8blnm1ssf9cd6l5f1y2rrqizsv"; depends=[dplyr geosphere lwgeom progress purrr rlang rmapshaper sf tibble tidyr utf8]; }; sugrrants = derive2 { name="sugrrants"; version="0.2.8"; sha256="08cs74afpkvjh32hlrwbl8sdsi3p0ga4ziw32r9pihs28a060fam"; depends=[dplyr ggplot2 gtable lubridate rlang]; }; - sumFREGAT = derive2 { name="sumFREGAT"; version="1.2.2"; sha256="1phffgscn76xm759jz2fpx82czp91i7q261f6fxlj79kb164njk0"; depends=[GBJ Matrix seqminer]; }; + sumFREGAT = derive2 { name="sumFREGAT"; version="1.2.3"; sha256="191jb3jc0k6ja12955w7r6s0hl6wmwvax9knrb1hd2i5wxaq556i"; depends=[GBJ Matrix seqminer]; }; + sumR = derive2 { name="sumR"; version="0.4.4"; sha256="1cpb59yml038ki2kga3hc1fi4l2d1qa0h0kw0f1bq4vjhjab7wf2"; 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.0"; sha256="04qcysfywljnqkcz2b7kzpy0xv3ykkvvb14vnda63z1wvmadyhkn"; depends=[base64enc checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools tibble tidyr]; }; @@ -17171,13 +17441,15 @@ in with self; { supclust = derive2 { name="supclust"; version="1.1-1"; sha256="1iar957gdarp1m677fjmph0ll8zsqiy2bzkzx03gv37k56w1acpd"; depends=[class rpart]; }; supcluster = derive2 { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[gtools mvtnorm]; }; superMDS = derive2 { name="superMDS"; version="1.0.2"; sha256="0jxbwm3izk7bc3bd01ygisn6ihnapg9k5lr6nbkr96d3blpikk04"; depends=[]; }; + superMICE = derive2 { name="superMICE"; version="1.0.1"; sha256="007qw2ff0mnvwcmi7i1x1gpd54l1zxaqjsw9q55bfshm43zs49mj"; depends=[mice SuperLearner]; }; superb = derive2 { name="superb"; version="0.9.7.8"; sha256="0szx5xrqfgganmgbqbdinaq9rljnl8b6l6ym56ysfjq0v6az2s8a"; depends=[foreign ggplot2 lsr MASS plyr psych Rdpack shiny shinyBS stringr]; }; superbiclust = derive2 { name="superbiclust"; version="1.2"; sha256="0mk3d820skp99hl8ilwic2fz90yb9dwy2jq3vfjb726gj1qich3b"; depends=[biclust fabia Matrix]; }; - supercompress = derive2 { name="supercompress"; version="1.0"; sha256="11japb4cbxsc199p5wplq1znczpjds40vm0mjxc43dg44m7r91rj"; depends=[FNN]; }; + supercells = derive2 { name="supercells"; version="0.8.2"; sha256="1qr990f4i8v9mahysadbdy5z692fbf7r4j3vcc707qqhhvwijris"; depends=[cpp11 future_apply philentropy sf terra]; }; + supercompress = derive2 { name="supercompress"; version="1.1"; sha256="1kz04m37r1g4lx4y0kzjn77p3wra2rq21y93v9llikycsh6vzwp1"; depends=[FNN]; }; 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.3"; sha256="1k0hcjspv0q6wg0yarvgjs7ql7d587nijicmz3lfhpph2n3hghvb"; depends=[assertthat BH data_table Metrics R6 Rcpp RcppArmadillo]; }; - supernova = derive2 { name="supernova"; version="2.5.0"; sha256="0w7h9ynkigc2z4biaxbf68vy8gwqq5gigq8ciqpxp718affv4y6j"; depends=[backports cli ggplot2 lifecycle magrittr pillar purrr rlang stringr tibble vctrs withr]; }; + supernova = derive2 { name="supernova"; version="2.5.1"; sha256="12qkrgcv5wyw2278hzl75irc9n67dd89xcjj1vr6y9x2bdk7qmnj"; depends=[backports cli ggplot2 lifecycle magrittr pillar purrr rlang stringr tibble vctrs withr]; }; 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]; }; @@ -17219,9 +17491,10 @@ in with self; { survSens = derive2 { name="survSens"; version="0.1.0"; sha256="1s4s5l31yps93s2zdxpidkdg8kmmwj6vb3zfndmnxvc07arwhvbv"; depends=[directlabels ggplot2 survival]; }; survSpearman = derive2 { name="survSpearman"; version="1.0.0"; sha256="06xric3fwv2rdrbapsawrg288s2sflzrbx1a4yc7lzxzxbsbs619"; depends=[]; }; surveil = derive2 { name="surveil"; version="0.1.1"; sha256="135y4qdkwpb8dv63bybspdynfr0d3sqz0ayjm82nhy3flah2v5ka"; depends=[BH dplyr ggdist ggplot2 gridExtra Rcpp RcppEigen RcppParallel rlang rstan rstantools scales StanHeaders tidybayes tidyr]; }; - surveillance = derive2 { name="surveillance"; version="1.19.1"; sha256="1665n26qs79b3hj4wdp13qjr13w6g32jvbpc4qpcn39bgql6i599"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat spatstat_geom xtable]; }; + surveillance = derive2 { name="surveillance"; version="1.20.0"; sha256="0dbqr43fhg5zdh6wzw6licq6c5qqab710gw5ag45l8j1z3q06x8i"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat_geom xtable]; }; survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; survey = derive2 { name="survey"; version="4.1-1"; sha256="0ljsszybzri531q6xab04r6zq11vchfs7y0snjzk57m3g0b9ms05"; depends=[lattice Matrix minqa mitools numDeriv survival]; }; + surveyCV = derive2 { name="surveyCV"; version="0.1.1"; sha256="03pyxav8z223qplsi9srmaf156zgdy3814k5krgskb86bhi0881d"; depends=[magrittr survey]; }; surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; }; surveydata = derive2 { name="surveydata"; version="0.2.6"; sha256="1z72l9dzdhg2r7wd284wa569f4bcnqhz6lha1lch1am7g2i3633d"; depends=[assertthat dplyr DT ggplot2 magrittr purrr rlang scales tidyr]; }; surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; }; @@ -17229,21 +17502,20 @@ in with self; { surveyplanning = derive2 { name="surveyplanning"; version="4.0"; sha256="19ydgcwyvkhknf4qmlw7j25skcj9a4rd6s8j5n7bdqpljl60zync"; depends=[data_table laeken]; }; surveysd = derive2 { name="surveysd"; version="1.3.0"; sha256="0d5xjdlccqaa1h437rz5zq6a829rpz426m55jgprhfpcps1wfhbk"; depends=[data_table ggplot2 laeken Rcpp]; }; 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.2-13"; sha256="0zrikancm9shixvgng89f1610sphlwljczi0fnjbdqn4l85rrarz"; depends=[Matrix]; }; - survival_svb = derive2 { name="survival.svb"; version="0.0-1"; sha256="0iv06hnp1fl390yfiv0hwry8wfrqm2gyvkhhmp03jsjz9m5xbwhr"; depends=[glmnet Rcpp RcppEigen survival]; }; + survival = derive2 { name="survival"; version="3.3-1"; sha256="1isdrcvrzi118xiyigckj9sq1xl4m92180brmpzdqzhcrl2qg1ql"; 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.2.0"; sha256="1sx7xjqkwc3788j0520kgv602m3gdlmpg1ps9fm8lhsjb8dmvlya"; depends=[cowplot dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales stringr survival survminer tibble tidyr tidytidbits]; }; + 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]; }; survivalMPL = derive2 { name="survivalMPL"; version="0.2-1"; sha256="1rskhawhpkzi3laq452kgr1740p6998z7c7p95f2023ymkdm4rxv"; depends=[MASS survival]; }; survivalMPLdc = derive2 { name="survivalMPLdc"; version="0.1.1"; sha256="1wqlzpwm1p7nq19l3d7c93zv6fnn0b1w24kak9zwsgyhar3f5lv9"; depends=[copula matrixcalc splines2 survival]; }; survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; - survivalmodels = derive2 { name="survivalmodels"; version="0.1.9"; sha256="13plpgvxlljd953kv0krzzs1rfgl4yv9s7s5naplqfzjrapk0j7z"; depends=[Rcpp]; }; + survivalmodels = derive2 { name="survivalmodels"; version="0.1.11"; sha256="0las1appms4j2g7c31yxm49z1aq2ahjgczilh4m3yy0xg5nckyr1"; depends=[Rcpp]; }; survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; }; - survivoR = derive2 { name="survivoR"; version="0.9.6"; sha256="1knrcp6f1gxad4s9l1zfak805ixsgxvs6d30awv5x34jny1cgj8a"; depends=[dplyr ggplot2 magrittr stringr tidyr]; }; + survivoR = derive2 { name="survivoR"; version="0.9.12"; sha256="0mda9zjag453m60c2njzjpifz88q09vjkys0xds8vsdzmi70vjvv"; depends=[dplyr ggplot2 magrittr stringr tidyr]; }; survminer = derive2 { name="survminer"; version="0.4.9"; sha256="0byh0wxdbjfwdrzsnqv4xlmnik6lj0vkkzfxy7lssk8dv5zmj7nz"; depends=[broom dplyr ggplot2 ggpubr ggtext gridExtra magrittr maxstat purrr rlang scales survival survMisc tibble tidyr]; }; survmixer = derive2 { name="survmixer"; version="1.3"; sha256="00s06h7nn8li4d2kn4yzlnj3px1wkpvnx5w73y98cvrcwm0ad71g"; depends=[]; }; survsim = derive2 { name="survsim"; version="1.1.8"; sha256="0gv54bd94a6vdz8li0j409qv7r0h4d681l1p9hj9ilzk7y5bfm70"; depends=[eha statmod]; }; survtmle = derive2 { name="survtmle"; version="1.1.1"; sha256="1l13rvwq4915ij2a55fxdj3b3wkgjca1fbqzcgkjlpzkcn97k1nj"; depends=[dplyr ggplot2 ggsci Matrix plyr speedglm stringr SuperLearner tidyr]; }; - survxai = derive2 { name="survxai"; version="0.2.2"; sha256="09ig561754kjzpay2hy3n62zlk0bgwkjy8vnslrr428r8m1lj0qr"; depends=[breakDown ggplot2 pec prodlim scales survival survminer]; }; susieR = derive2 { name="susieR"; version="0.11.92"; sha256="1wlw41vslbgf6dmppn2hv2mqrnnza5091qzjl0qjaydsp97h5b3b"; depends=[crayon ggplot2 Matrix matrixStats mixsqp reshape]; }; sutteForecastR = derive2 { name="sutteForecastR"; version="0.1"; sha256="13dd0v3l3s7xb1wnpf6qvnvclzab87831z8bsxsq53vpb26xcw1b"; depends=[forecast forecastHybrid fracdiff robets]; }; svDialogs = derive2 { name="svDialogs"; version="1.0.3"; sha256="0j00xjvkwv992ir48czhvyj29rb9vpd243vbyyj2binn0q0qa431"; depends=[rstudioapi svGUI]; }; @@ -17258,13 +17530,13 @@ in with self; { svTools = derive2 { name="svTools"; version="0.9-5"; sha256="040wr8cr2p35x6pr515bprmsw8ysajx4df5f2njz3ily61xf9szi"; depends=[codetools svMisc]; }; svUnit = derive2 { name="svUnit"; version="1.0.6"; sha256="08nmlbdrmmz04ira30721l99i74w07w2avdr4pypswf2sq1nqgi6"; depends=[]; }; svWidgets = derive2 { name="svWidgets"; version="0.9-45"; sha256="08cpsy4abypjnv33arsgxk5i0gpdvdzj60wa1b22ca1n7d35mc80"; depends=[svMisc]; }; - svars = derive2 { name="svars"; version="1.3.8"; sha256="0ncr944lkb6w3xnkrcz0pigda98yif8psqy9mr4f5pcgv4nwcf01"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange vars zoo]; }; + svars = derive2 { name="svars"; version="1.3.9"; sha256="1i9wnfrgr9x6qfqhl9bc4wiz4wxmzjfcmg7wvy3zjrfszmibaf78"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange vars zoo]; }; svd = derive2 { name="svd"; version="0.5"; sha256="18bi42pgml9i8jflfk29ws0bfblkj3f69z9p9mkd0m8kcx4d8hnh"; depends=[]; }; svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; }; 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.1"; sha256="0xppvrfl7q3viahvwvmn498wli74ldwijapf6n432gvc4phmy7wi"; depends=[Rcpp rjson Rook]; }; - svglite = derive2 { name="svglite"; version="2.0.0"; sha256="19ggknw5322yw7r1bzhw0bqggcrpn0qxddk7kblpqnra2zz2brkn"; depends=[cpp11 systemfonts]; }; + svglite = derive2 { name="svglite"; version="2.1.0"; sha256="16wwhfmp9agdz9azslgd8qs77fllhdp6p0m304qfh2p8qy8gah5d"; depends=[cpp11 systemfonts]; }; svgtools = derive2 { name="svgtools"; version="1.1.0"; sha256="1ipwj3qw8c62381b6yf5mazhg2a3ssddijqrq3bac57i8i6m8az1"; depends=[magick rsvg stringr xml2]; }; svmpath = derive2 { name="svmpath"; version="0.970"; sha256="19b5hfqqsh072l5mbkafm5pjd6qhyj20qd2vq6zl5jjmc45r72w1"; depends=[kernlab]; }; svmplus = derive2 { name="svmplus"; version="1.0.1"; sha256="08cfywrbaxyacqd3l75lysb23ahqbs80959iqkjbb125aafmhvni"; depends=[MASS Matrix quadprog]; }; @@ -17280,25 +17552,25 @@ in with self; { swamp = derive2 { name="swamp"; version="1.5.1"; sha256="1mj6cqrc19p07v051fg6ikhhbccsg2lvz7wjiakaswqqm0269843"; depends=[amap gplots impute MASS]; }; 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.6"; sha256="0gyys5lv8zp6n8ywlnqnzpnmpply32ghhwiwi6rilin08nbd0wm8"; depends=[spatstat_core]; }; - sweater = derive2 { name="sweater"; version="0.1.2"; sha256="0sfyz77i50gs2kndd6zq08l1qji1d4jbnsp6jqj5jv5sazcw1vwn"; depends=[data_table LiblineaR proxy purrr quanteda Rcpp]; }; + swdpwr = derive2 { name="swdpwr"; version="1.7"; sha256="0mljayrs629d0pxbd9lzzplvs31i33fqb0bfb01ryvwyv0ckwjx9"; depends=[spatstat_random]; }; + sweater = derive2 { name="sweater"; version="0.1.4"; sha256="1il3jmcawzy4pjdv0vhril37y5wqlczr0sapsnqgrmcc4szbsba9"; depends=[cli data_table LiblineaR proxy purrr quanteda Rcpp]; }; sweep = derive2 { name="sweep"; version="0.2.3"; sha256="1705mcp9p5h50ifqjjwx61z5wl5izv889nxcgdkx1i0dlcr61l2a"; depends=[broom dplyr forecast lubridate rlang tibble tidyr timetk]; }; sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.2"; sha256="0zzjvwd60w9b5ybsb72aqa42sx6al4ymr591j3zryxgpl6rms5rh"; depends=[checkmate lubridate stringr]; }; swephR = derive2 { name="swephR"; version="0.3.0"; sha256="0fk5wih3i5vpkcc9y1n30xwc1hyqgfgnad9jkdgdx0m31pn1y9j5"; depends=[Rcpp]; }; swfscAirDAS = derive2 { name="swfscAirDAS"; version="0.2.2"; sha256="0xj2r0hv755kqjn4awkf16d24vkmfny6b1xa7ia07pdc25iggrgm"; depends=[dplyr lubridate magrittr readr rlang stringr swfscDAS swfscMisc tidyr]; }; - swfscDAS = derive2 { name="swfscDAS"; version="0.6.0"; sha256="0v3xjshxqfblmsl21265085m2dygf56083mgiqayp23bs1kl9bj7"; depends=[dplyr lubridate magrittr purrr readr rlang sf swfscMisc tidyr]; }; + swfscDAS = derive2 { name="swfscDAS"; version="0.6.1"; sha256="1f9i4vj803jk29cds21mr51wm0z62vx96a4ww0cxi4gbyam7rwks"; depends=[dplyr lubridate magrittr purrr readr rlang sf swfscMisc tidyr]; }; swfscMisc = derive2 { name="swfscMisc"; version="1.5"; sha256="1j762xf9b8clvc3m89s1y3lz5cn8a43wphhfd1wa2f5k1bw3bqd5"; depends=[dplyr ggplot2 ggrepel kknn magrittr mapdata maps rlang 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]; }; 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]; }; swissMrP = derive2 { name="swissMrP"; version="0.62"; sha256="1vy6h6c4v49zlsli77ilj4df8cfh67rqmki71v6j1aqw6kf3b649"; depends=[arm blme lme4 maptools sp]; }; - swissdd = derive2 { name="swissdd"; version="1.1.4"; sha256="0ad260b4sfism5q1jxjazg6q33283ncld1m7gfdrps3xg1kyfirs"; depends=[dplyr ggplot2 httr jsonlite lubridate purrr RCurl sf stringr tibble tidyr]; }; swissparl = derive2 { name="swissparl"; version="0.2.2"; sha256="0rj01qcg0vh3vwrbag42w7mvb9ld800hzn4lszmbiv13yifgi8ys"; depends=[crayon dplyr ggplot2 httr jsonlite magrittr purrr stringr tibble tidyr]; }; switchboard = derive2 { name="switchboard"; version="0.1"; sha256="1qh6cfm5h0j17ldljpgj400f2dhcfaa4x1157d46cyfawfdscvc5"; depends=[magrittr]; }; switchcase = derive2 { name="switchcase"; version="0.1.1"; sha256="0h31nzyf7dzalgl65cw0k1fxylbmx78l45r5id2wcqdym23dv9a9"; depends=[]; }; switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; }; - switchr = derive2 { name="switchr"; version="0.14.3"; sha256="1aw9n6hh62qvggl1flpxfyqgp4sj6vj1mlfqfhx923hl53c7cr31"; depends=[RCurl RJSONIO]; }; + switchr = derive2 { name="switchr"; version="0.14.5"; sha256="1fxn75kgnmq9q4jic4jrqvljylwv9fa25nbhyqm4vmlx5wvissgp"; depends=[RCurl RJSONIO]; }; + switchrGist = derive2 { name="switchrGist"; version="0.2.5"; sha256="0ywx7sihh9q74mn0kvdcdflnks0cfybrgy1b5bvmn6ygxb3s605v"; depends=[gistr httpuv RJSONIO switchr]; }; swmmr = derive2 { name="swmmr"; version="0.9.1"; sha256="140sx0y00ngxsyn7n1l0aay7vk2jk8hf81aiwh46k761cpc5y28d"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; }; sybil = derive2 { name="sybil"; version="2.2.0"; sha256="05ccq2m4z6akslymdm2vd3x99pi9z0ha1xcnhwvwcvibhqn9hmd5"; depends=[lattice Matrix]; }; sybilDynFBA = derive2 { name="sybilDynFBA"; version="1.0.2"; sha256="0351qlvyynygjf43q93gkqzzaff3v6gynvbks1ix1mank3afn226"; depends=[sybil]; }; @@ -17335,11 +17607,11 @@ 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-24"; sha256="180ah91i98gjswpbkkdjgnc2c9rz3pl5bw035iks92nd5vl6w5wz"; depends=[car lmtest MASS Matrix sandwich]; }; - systemfonts = derive2 { name="systemfonts"; version="1.0.3"; sha256="1fmv1ni77ncz6rrm4iv8a7l6pbqnk2ri0yzad2bs943gxbarjz34"; depends=[cpp11]; }; + systemfonts = derive2 { name="systemfonts"; version="1.0.4"; sha256="1h44bal845jp7ya8i7ff1kz1n3wklkb00jk6hb9lgwa2p5snqxpg"; depends=[cpp11]; }; systemicrisk = derive2 { name="systemicrisk"; version="0.4.2"; sha256="021ypw9fag5kmk2q041pj2jfzgfg640yda7wvh0yzdmg73p6fvsw"; depends=[lpSolve Rcpp]; }; 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]; }; - tLagPropOdds = derive2 { name="tLagPropOdds"; version="1.5"; sha256="0d0xg9gnmvnsyirli2rldl78v4jvy9bc1a09n30xq10dn4faqp13"; depends=[dplyr R_utils survival]; }; + tLagPropOdds = derive2 { name="tLagPropOdds"; version="1.7"; sha256="1wsjpn9n1bnhas9bl1kaas9dnmifr7p4g12ys19pvic3gj0867kb"; depends=[dplyr R_utils survival]; }; tRnslate = derive2 { name="tRnslate"; version="0.0.3"; sha256="0sm0cqxylsxmnhqs1c8w81d6q2sj7nmm86mds59kiyspy9m67sbc"; depends=[]; }; tRophicPosition = derive2 { name="tRophicPosition"; version="0.7.7"; sha256="1j06rc5s6jpz8i116m98ygc75sx6lk8jd9gw6fb8q342mbbmqh8h"; depends=[coda data_table ggplot2 gridExtra hdrcde MCMCglmm plyr rjags]; }; tTOlr = derive2 { name="tTOlr"; version="0.2"; sha256="1fk33vp6y65mls1iczjf63wzj1rl1knbdcbd4rnqqfdcqhibb3p3"; depends=[lattice latticeExtra]; }; @@ -17356,20 +17628,22 @@ in with self; { tableExtra = derive2 { name="tableExtra"; version="1.0.1"; sha256="1rbcxd3rjhvcpayj6d7mh30vkbc7g4mv4qa7552xz3x1wny0n4mm"; depends=[gtable]; }; tableHTML = derive2 { name="tableHTML"; version="2.1.0"; sha256="01bffjqi2qs66w67l5nc0imqdcaf4cky930srkd2wmvvawv85kwc"; depends=[htmltools jpeg magrittr png shiny webshot]; }; tableMatrix = derive2 { name="tableMatrix"; version="0.82.0"; sha256="1sskijhbqakamrk2rv7v5zpjsdi8jw0jl2z96l0vhsvsiq0cz1c8"; depends=[data_table]; }; + tableeasy = derive2 { name="tableeasy"; version="1.1.1"; sha256="1xvhxgdpx0a4fk4fv59i1kxplzzqyzjd3ha93l5wjadkl9hijwr9"; depends=[lmtest mgcv nortest survival tableone]; }; tableone = derive2 { name="tableone"; version="0.13.0"; sha256="0ihk29gcbqvvif2y8aalgnpq8y87irrp8z6ik4iaxh2xb6ksawqw"; depends=[e1071 gmodels labelled MASS nlme survey zoo]; }; tablerDash = derive2 { name="tablerDash"; version="0.1.0"; sha256="1mnp6lxa7d669r325aynq1n3f35r9sy4v1fvdh4cymbf33s8mkmm"; depends=[htmltools knitr shiny]; }; tables = derive2 { name="tables"; version="0.9.6"; sha256="1y0gnqd2q0gn1dr2nxdlsvyl4g5jnj9y9lx18bhvhrfzb5038j5w"; depends=[htmltools knitr]; }; tableschema_r = derive2 { name="tableschema.r"; version="1.1.1"; sha256="14cnbijxdhf7qbsiqbk8p516mfh9bgdbcg32vn5pycsp30k78b2h"; depends=[config future httr iterators 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.4.0"; sha256="02s64ckm36k5q8vkpx231jb41pw968my3q00m3saa3iy3v2fzkg3"; depends=[dplyr DT kableExtra rlang spork tidyr]; }; + tablet = derive2 { name="tablet"; version="0.4.9"; sha256="1xn4iyah82y1y0mrg0c7sq7g69b0mah6bxrmn4iy7pxx4by54wc0"; depends=[dplyr DT kableExtra rlang spork tidyr]; }; tabnet = derive2 { name="tabnet"; version="0.3.0"; sha256="04m8bg1glnhxb2pjcxnwlcwzbxvk0bskz00dkd4lyvgsq74xwmvi"; depends=[coro glue hardhat magrittr progress rlang tibble torch vctrs]; }; tabr = derive2 { name="tabr"; version="0.4.5"; sha256="1nkzbqy9nb6pd895glld009vmry5rnhd7h9q31s8xh97kwlwk9c2"; depends=[crayon dplyr ggplot2 magrittr purrr tibble tidyr]; }; - tabshiftr = derive2 { name="tabshiftr"; version="0.3.0"; sha256="05xr8xml7r5kzka9x1lhz0pzq8il1l1zkrjx6mlibkz7l36s6gb2"; depends=[checkmate crayon dplyr magrittr purrr rlang stringr testthat tibble tidyr tidyselect]; }; + tabshiftr = derive2 { name="tabshiftr"; version="0.3.2"; sha256="09fmz9p6ky1z45f4vyp5cq267cijhd5q9aqwwk7r830jhwnm9547"; 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="1.6.1"; sha256="1zjggqv2b2m0mz57ic2q4knm0n1jsb8z1xnb57aajbmqz48zyx3w"; depends=[arkhe dimensio ggplot2 rlang]; }; tabularMLC = derive2 { name="tabularMLC"; version="0.0.3"; sha256="1gppzbf780ci4vrvy7rd3xa0bvwxca5f05a9xk194xv913vyd440"; depends=[Rcpp RcppArmadillo]; }; tabularaster = derive2 { name="tabularaster"; version="0.7.0"; sha256="061nc82svcz37lvwsx549rn6s2q6x75wjs0j9k8zcvlzr5wyyfgi"; depends=[dplyr fasterize magrittr raster silicate spatstat_geom tibble]; }; tabularmaps = derive2 { name="tabularmaps"; version="0.1.0"; sha256="07i76n2fpl2ma6jl3zdbay0zmmaaxrxhv1368xm2d575br42nri4"; depends=[ggforce ggplot2 purrr rlang]; }; + tabulate = derive2 { name="tabulate"; version="0.1.0"; sha256="1x5rf8shd3jxa7k8p8ak5a6c2fmxv476is5vlrg1fsg6f964h01v"; depends=[cli magrittr Rcpp rlang]; }; tabulator = derive2 { name="tabulator"; version="1.0.0"; sha256="1dylmw5prwir3qj13lxkvlzq6j7r23y3gz1g0bjyanb0xmzgxn4k"; depends=[assertthat data_table dplyr magrittr purrr rlang stringr tibble tidyr]; }; tabulog = derive2 { name="tabulog"; version="0.1.1"; sha256="0n6qjd7kmvxx5na71f358pw3bbwa69vh8qjkrs5mkb3izxabcq67"; depends=[yaml]; }; tabxplor = derive2 { name="tabxplor"; version="1.0.2"; sha256="0gwnw4psgz5byfrpvm3s5bfc13fwmw0wh8fafrr8rpbwm8gy33fy"; depends=[cli crayon DescTools dplyr forcats kableExtra magrittr pillar purrr rlang stringi stringr tibble tidyr tidyselect vctrs]; }; @@ -17380,15 +17654,15 @@ in with self; { tailloss = derive2 { name="tailloss"; version="1.0"; sha256="0lmjgjs6d94b70i10vx66fyvlxm5swwqbcjsnqa3lmldzz6m4jc1"; depends=[MASS]; }; taipan = derive2 { name="taipan"; version="0.1.2"; sha256="192sy5pgq74vs31p7jfn6svdzf9mk9ybppzhp1rlki1bagmm5f1r"; depends=[shiny]; }; takos = derive2 { name="takos"; version="0.2.0"; sha256="09w9lkqhxdb26fvrsb8n16601kqpr2smplipx3lj6cdgbyhb1hqz"; depends=[baseline broom colorRamps data_table deSolve devEMF MASS minpack_lm pracma segmented sfsmisc smoother]; }; - tanaka = derive2 { name="tanaka"; version="0.1.3"; sha256="1x5czib9vqpxbr61if1rnlyrld6gx2zf22jz5rcagb8x3bxmd5g6"; depends=[isoband raster sf]; }; + tanaka = derive2 { name="tanaka"; version="0.2.0"; sha256="0s1pmjyjiask5bvrwzllzzhkw6xqqqf5bqf5rc1akl89dacyzwll"; depends=[isoband sf terra]; }; tangles = derive2 { name="tangles"; version="0.8.1"; sha256="06a5hn5hkvgr6pcjz3n0vi1zwmv00wypi5f62agqh8mas80v44vh"; depends=[digest raster sp]; }; tangram = derive2 { name="tangram"; version="0.7.1"; sha256="0p0hrn3jv1l00nsjqa0j9yv4982r08fwgsj01pc06vmipg87kjiy"; depends=[base64enc digest htmltools knitr magrittr R6 stringi stringr]; }; tangram_pipe = derive2 { name="tangram.pipe"; version="1.1.0"; sha256="08whj66nf3idqvjnzgni5iqyqakbdwvrapdixx0zff7q8qbkar8z"; 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.4.0"; sha256="1ajncm404radx0czqmvd7knrlk0kg39s18fav4gxx3y8lk98qw64"; depends=[digest dplyr fs rlang targets tibble tidyselect vctrs withr]; }; + tarchetypes = derive2 { name="tarchetypes"; version="0.4.1"; sha256="1js09qap4a63m7ldfk8lxj438p5fjy893zqck7vvzmv6zyzxhlg6"; depends=[digest dplyr fs rlang targets tibble tidyselect vctrs withr]; }; targeted = derive2 { name="targeted"; version="0.2.0"; sha256="0xcw2xcvp4yz37djl2m7fwr61hfrarbrr05rcnbqkjs3y4q5p99g"; depends=[data_table digest futile_logger future_apply lava optimx progressr Rcpp RcppArmadillo]; }; - targets = derive2 { name="targets"; version="0.9.0"; sha256="13d673v13bn17ykdiw4n164azdshrdggcb5gm7i2ly19njfhfild"; depends=[callr cli codetools data_table digest igraph knitr R6 rlang tibble tidyselect vctrs withr yaml]; }; + targets = derive2 { name="targets"; version="0.10.0"; sha256="1c9llj6iwry6mj92sy1hqk9kkyyxwa60zr20vj4hivlfff1s2h88"; depends=[base64url callr cli codetools data_table digest igraph knitr R6 rlang tibble tidyselect vctrs withr 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]; }; tatest = derive2 { name="tatest"; version="1.0"; sha256="1yd9pdpdhxwpllnj5wxa7ly29qiw8qywx9lx0w3nizczlx35fgjy"; depends=[]; }; @@ -17396,11 +17670,12 @@ in with self; { tau = derive2 { name="tau"; version="0.0-24"; sha256="1q8pd7m6rd0899c44plxns5yydifhsccyb51glgw07ni5v4rz3gh"; depends=[]; }; tauturri = derive2 { name="tauturri"; version="0.3.0"; sha256="014301f5mzy6vblqzb61bxjv46kdynmmrxjpxyvk01w1k8wkwfcn"; depends=[httr magrittr plyr purrr tibble]; }; taxa = derive2 { name="taxa"; version="0.4.0"; sha256="1clvq69z68xidv5m1s8vmavh8l6bv6dpb9iln7axb5jbj0iqx1xj"; depends=[cli crayon dplyr jsonlite knitr lazyeval magrittr pillar R6 rlang stringr tibble tidyr vctrs viridisLite]; }; - taxadb = derive2 { name="taxadb"; version="0.1.3"; sha256="1ai2p58h75170wh8701dpyjb9cx5lfzx5xpq33l4w8pybh24zaab"; depends=[arkdb contentid curl DBI dbplyr dplyr duckdb jsonlite magrittr memoise progress rappdirs readr rlang RSQLite stringi tibble]; }; + taxadb = derive2 { name="taxadb"; version="0.1.4"; sha256="00cbbma9wahm6ka75kzpfqgns0cr2z2ri6bpp919icwkvi5rpbmr"; depends=[arkdb contentid curl DBI dbplyr dplyr duckdb jsonlite magrittr progress R_utils rappdirs readr rlang stringi tibble]; }; taxalight = derive2 { name="taxalight"; version="0.1.5"; sha256="035jzz1dk1icxs9mbd6q091ljf1lalr0wwbcz6a90avwyqphjjx3"; depends=[contentid thor]; }; taxize = derive2 { name="taxize"; version="0.9.99"; sha256="0738fzckbwkgf21vranxhcfjq487rp3kjdnz2gfvdd1dm21jfp8s"; depends=[ape bold cli conditionz crayon crul data_table foreach jsonlite natserv phangorn R6 ritis rotl rredlist tibble wikitaxa worrms xml2 zoo]; }; taxizedb = derive2 { name="taxizedb"; version="0.3.0"; sha256="1d7wz6df624263myq4rlvr3mhzhhhdglrrs7f44j201z4f536a2z"; depends=[curl DBI dbplyr dplyr hoardr magrittr readr rlang RSQLite tibble]; }; taxlist = derive2 { name="taxlist"; version="0.2.2"; sha256="0xdl7aw3ifn4v2wclk38iyayy9r71cx5diir1m4pws986qfdddb4"; depends=[foreign stringdist taxa taxize vegdata]; }; + taxonbridge = derive2 { name="taxonbridge"; version="1.0.4"; sha256="18n87w3nf3qb5f1ci0bcq7mji14mxh5cx6klb6qw4g8qzr35cznk"; depends=[dplyr ggplot2 purrr rje vroom withr]; }; taxonomizr = derive2 { name="taxonomizr"; version="0.8.0"; sha256="0i1xn5x8c555hdlnfbhpga4vzn1l6kcqjgcw472y8yg0n7s2birx"; depends=[curl data_table R_utils RSQLite]; }; taxotools = derive2 { name="taxotools"; version="0.0.79"; sha256="1q69dh1ifa7mc8y3bdgvvg97s9prflh6mczqr4clxnsysd3xhafs"; depends=[plyr sqldf stringdist stringr taxize wikitaxa]; }; tayloRswift = derive2 { name="tayloRswift"; version="0.1.0"; sha256="1gr179hzqxih49v214dqawfhsbsahhyj1lbj77vqv00zq1siigpl"; depends=[]; }; @@ -17408,7 +17683,7 @@ in with self; { tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; }; tbd = derive2 { name="tbd"; version="0.1.0"; sha256="1wmfy3p82gckhfsslxzapryfygmircii7x24j6ysfyx52gy8iwf5"; depends=[numDeriv]; }; tbl2xts = derive2 { name="tbl2xts"; version="1.0.4"; sha256="1h54yhwbmlzgii202dcrz336d790374p213f1ba6rlm5syad88v9"; depends=[dplyr rlang tibble xts zoo]; }; - tbm = derive2 { name="tbm"; version="0.3-4"; sha256="1n2lql8h4ikm49l7cn9n3ybnivhgx373hmxkarwm4an4d0ifri0z"; depends=[basefun coneproj mboost mlt sandwich variables]; }; + tbm = derive2 { name="tbm"; version="0.3-5"; sha256="0qq6zjz37j31jrw0lxsf6vgxwhs8swkqg48jwc320vpz1qjqj7xv"; depends=[basefun coneproj mboost mlt sandwich variables]; }; tbma = derive2 { name="tbma"; version="0.1.0"; sha256="066p3szfayyimwblghm1lipjf21xgscq1fzbzpqz16lqjpb99ni1"; depends=[data_table ranger RcppRoll zoo]; }; tboot = derive2 { name="tboot"; version="0.2.1"; sha256="0pijvs5k28ndnkyy4lwln6wlcag0pnbndg33c5djyaxhns77faz2"; depends=[kernlab quadprog]; }; tbrf = derive2 { name="tbrf"; version="0.1.5"; sha256="1mxfvgb18a62igdh3af4m8x6fl69s25j4x7isd70w744w6jvch3h"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; }; @@ -17418,10 +17693,10 @@ in with self; { tcl = derive2 { name="tcl"; version="0.1.1"; sha256="01klrzvw7vc0iwqpmcikgqm8jx3g7536r5f8gb6vwcik912maxnl"; depends=[colorspace eRm lattice ltm MASS Matrix numDeriv psych psychotools]; }; tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; }; tclust = derive2 { name="tclust"; version="1.4-2"; sha256="1nb5iky4kc832627jf28lzj19wrvgwg5da6fyl3kyf0npmyx1p4m"; depends=[]; }; - tcpl = derive2 { name="tcpl"; version="2.0.2"; sha256="0xic4jy8ldawmkvvwckiyy57ai5wif9yn7hyfndbxr6mvjl3rbbc"; depends=[data_table DBI numDeriv RColorBrewer RMySQL sqldf]; }; + tcpl = derive2 { name="tcpl"; version="2.1.0"; sha256="1rp5i3va11l12q37hl1v26k21i88giganyzycb6x8flank1myjwr"; depends=[data_table DBI numDeriv RColorBrewer RMariaDB sqldf]; }; tcplfit2 = derive2 { name="tcplfit2"; version="0.1.3"; sha256="1y69z27mgphcj5qkhlpgv0as59aralimf7mbfrdz5n6nkqfj5krr"; depends=[future future_apply numDeriv RColorBrewer stringr]; }; tcsinvest = derive2 { name="tcsinvest"; version="0.1.1"; sha256="1harmb5ni70k241aq1vww5w7fmjqmlwd6nfma2xa44f3hj7nrf52"; depends=[data_table httr jsonlite websocket]; }; - td = derive2 { name="td"; version="0.0.5"; sha256="1wbhrz0yv1zv974xbz17k25dgb30afbhgk5xa8g928zfw9hbvrqa"; depends=[RcppSimdJson]; }; + td = derive2 { name="td"; version="0.0.6"; sha256="1zycwnl7n03jw76n8qrk2zhgnakj6npid25pflj6dnmbjc47ih32"; depends=[RcppSimdJson]; }; tdROC = derive2 { name="tdROC"; version="1.0"; sha256="137j1m9pysjcz1gsfcym0438by3c7na21ccjlqf7xfccr1y8k2k6"; depends=[survival]; }; tdaunif = derive2 { name="tdaunif"; version="0.1.0"; sha256="0a24lqiimp54fmj4zi7bakxral8ny60n25h9arwl6m00c7cn98pl"; depends=[]; }; tdigest = derive2 { name="tdigest"; version="0.3.0"; sha256="17axsir4xig3vm3sc2gziy9n0p80b14vg52nwys23bzkfp0n63bm"; depends=[magrittr]; }; @@ -17438,10 +17713,11 @@ in with self; { telefit = derive2 { name="telefit"; version="1.0.3"; sha256="0z6dr4ni00dyagbkzr3c7l4h2g23w3bfj99a9755vmrzyy6r45iq"; depends=[abind coda cowplot dplyr fields foreach ggplot2 gtable itertools mvtnorm raster Rcpp RcppArmadillo RcppEigen reshape2 scales scoringRules sp stringr]; }; telegram = derive2 { name="telegram"; version="0.6.0"; sha256="02wwa115f0vz2d9y4nf01397hjkpc3cv2gdl47snrajrm41gji7y"; depends=[curl httr jsonlite R6]; }; telegram_bot = derive2 { name="telegram.bot"; version="2.4.0"; sha256="1bvfnr6k0zxdawrf63yh8wj9hcgq1xvy791xbqhiy0isaa86yfw9"; depends=[curl httr jsonlite R6]; }; - telemac = derive2 { name="telemac"; version="0.1.0"; sha256="13wdhaiw9d7rzq5hb4k7grkfkngqwkgyw3g76j8si2jfkw6hhwwd"; depends=[dplyr fs gstat lubridate magrittr purrr raster Rcpp rlang sf sp stringr sys tidyr tidyselect]; }; - tempR = derive2 { name="tempR"; version="0.9.9.19"; sha256="0gr60hlah6lngkak158xqxbdavgad3kyq4casc686f52hz1llwic"; depends=[]; }; + 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]; }; + tempR = derive2 { name="tempR"; version="0.9.9.20"; sha256="12wnb9w5ql4q9n0gppjaxa66rrmdp0mklrhpp1chf9qr9wyzjkxi"; depends=[]; }; tempdisagg = derive2 { name="tempdisagg"; version="1.0"; sha256="1n1ng7xki4syy305gsclz7wrqb48vkjw3la0vxs975apv1mc4pzr"; depends=[]; }; temperatureresponse = derive2 { name="temperatureresponse"; version="0.2"; sha256="1id3wjzfs132hj8cm7gpf105qaay9dff07ixah9rmn5sk6si0zmq"; depends=[AICcmodavg broom dplyr minpack_lm numDeriv rootSolve]; }; + templateICAr = derive2 { name="templateICAr"; version="0.3.1"; sha256="1786anjsw2qnbpq6c0xwzngm6qzi84475xms5mqcmmf8vwsa0hbd"; depends=[abind ciftiTools excursions fMRIscrub ica Matrix matrixStats pesel SQUAREM]; }; templates = derive2 { name="templates"; version="0.3.0"; sha256="0xnzj3cvhw1r7zfqaijbfdyclka61jwixcdh05a5z9qwgv0076sh"; depends=[dat magrittr stringr]; }; tempoR = derive2 { name="tempoR"; version="1.0.4.4"; sha256="0gn16j496833pvbjaf6wx26z9ilwssjp947mcyk6n2jb33x93rr2"; depends=[doParallel foreach pls]; }; tenispolaR = derive2 { name="tenispolaR"; version="0.1.4"; sha256="0xpp1hi3xnkg55aixgy2bp5476i503h8gsiss9x7f15274kx0d7s"; depends=[stringr]; }; @@ -17450,20 +17726,20 @@ 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="0.1.2"; sha256="0hwskjw611vlrd3q6yypgk6g8p704yih6m9869hjyn3x0rf2kw7n"; depends=[abind expm MASS Matrix pracma rTensor tensor]; }; - tensorflow = derive2 { name="tensorflow"; version="2.7.0"; sha256="0xgm8jb1hl8564vviqys3aqwzvfbh0d43m154cj07j9spdz306ng"; depends=[config processx reticulate rstudioapi tfautograph tfruns yaml]; }; + tensorflow = derive2 { name="tensorflow"; version="2.8.0"; sha256="19ayjvlxmgjais0kx6fj9an1h1i8mh4c9dhah7dj6390p53pgz93"; depends=[config 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="4.0"; sha256="0pb512v3gahgv3qc31i5v2jg8wixi6ps3p920sq5dgpfrig9hg2q"; depends=[MASS pracma speedglm]; }; tensorsparse = derive2 { name="tensorsparse"; version="3.0"; sha256="0xx003nh5bi87cbsqb7ikpcs4yhjhphh7pybzzas44qkwbn4fn1k"; depends=[]; }; tensr = derive2 { name="tensr"; version="1.0.1"; sha256="1z6b3ra7fgn88mxbhsq65x3frj5j7p17n119s9kbw7sg9y633vfx"; depends=[assertthat]; }; tergm = derive2 { name="tergm"; version="4.0.2"; sha256="0r1afidhfwmfkihcmry37j9imq26b55m84nxgv3r03y9cq8xdcas"; depends=[coda ergm MASS network networkDynamic nlme purrr robustbase statnet_common]; }; tergmLite = derive2 { name="tergmLite"; version="2.5.5"; sha256="0sg19ppvmy1wfqbvchn98maxiqzaa67yz64g4mhyxviksh1yzwxd"; depends=[ergm network networkDynamic Rcpp statnet_common tergm tibble]; }; - term = derive2 { name="term"; version="0.3.3"; sha256="04zl9hb3kgji5y3lq7d1pa4fh7mr0kxxjx1pmyj3dla8mqjxv22r"; depends=[chk extras lifecycle purrr rlang universals vctrs]; }; + term = derive2 { name="term"; version="0.3.4"; sha256="0pa275bzqbi0y58qy6pn5n289w8l5pndmr94sm64al2xdrl4hddl"; depends=[chk extras lifecycle purrr rlang universals vctrs]; }; ternvis = derive2 { name="ternvis"; version="1.2"; sha256="057i6i3ygxrin0npc18gsg3dpdldzafyb5sr6lix5mhy6b09lkxf"; depends=[dichromat maps quadprog]; }; - terra = derive2 { name="terra"; version="1.4-22"; sha256="0xir5d6krf6n5dw9nzy04j4gnrfvyr5f545ksx474mv4cyiwzv5q"; depends=[Rcpp]; }; + terra = derive2 { name="terra"; version="1.5-21"; sha256="0gzl0ka19jjw0dmaghjk2sgwi78kkz4w3rlfkym62rdarhlfj7h9"; depends=[Rcpp]; }; terrainmeshr = derive2 { name="terrainmeshr"; version="0.1.0"; sha256="1xab6wzq2izzdvsss1rlgp5m3cn45naxhymq6cglipj0fd792jbr"; depends=[Rcpp]; }; - terrainr = derive2 { name="terrainr"; version="0.5.1"; sha256="07dy8yqgnidvlnlq05g93grwv9vvyzq0c4g2a0kgcw6y5735nllj"; depends=[base64enc gdalUtils ggplot2 httr magick png raster sf units]; }; - tesseract = derive2 { name="tesseract"; version="4.2.0"; sha256="11js332yps3hq94mzy421ya0wcpfbbarmfd45zspjyh26s48dg1g"; depends=[curl digest pdftools rappdirs Rcpp]; }; - test2norm = derive2 { name="test2norm"; version="0.2.0"; sha256="02dmskqnxinfdxxq5s969p37fps0wpiz6mrcnx03f03a3gzqljl0"; depends=[mfp]; }; + terrainr = derive2 { name="terrainr"; version="0.6.1"; sha256="0xxvd536zgnmgb6p9fvkxaga4mqgb7qzd69xp8zm77a380j8dk05"; depends=[base64enc ggplot2 httr magick png raster rgdal sf units]; }; + tessellation = derive2 { name="tessellation"; version="2.0.0"; sha256="1pgjaisykyh0096ilfxhp5hlh6p82lsi0p184jfig84afcihn9p8"; depends=[cxhull english hash interp R6 randomcoloR rgl Rvcg scales sets]; }; + tesseract = derive2 { name="tesseract"; version="5.0.0"; sha256="1xdwjm3bing15ljdicl20g88ymmd0bbjmlbah5hzvws5b656iicn"; depends=[curl digest pdftools rappdirs Rcpp]; }; testDriveR = derive2 { name="testDriveR"; version="0.5.1"; sha256="0wjdqvsyv33fsg1lljp9m0bhz38mpfgpgickgj4zdspc9x6lbnv6"; 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=[]; }; @@ -17473,17 +17749,17 @@ in with self; { 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.1"; sha256="106gr1l65nvvy376yvv0a9i5vd9vadaxbprfjnpm31rqyns5yxg6"; depends=[brio callr cli crayon desc digest ellipsis evaluate jsonlite lifecycle magrittr pkgload praise processx ps R6 rlang waldo withr]; }; + testthat = derive2 { name="testthat"; version="3.1.2"; sha256="0ndnmv3gbhlsyqya382wqfkkhlrgpdjmh7mymsv6ja52ihbachgd"; depends=[brio callr cli crayon 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.0.0"; sha256="17n6g262f19bvxh0i35xcpf9qbdzaff80vvmx8vsijjiniw2hrbq"; depends=[abind ggplot2 greybox imputeTS lubridate modeest moments narray philentropy purrr readr scales stringr tictoc]; }; texPreview = derive2 { name="texPreview"; version="1.5"; sha256="11njmn29qq50iff30in9i0yfi6ypnpqsx3317smr9fiw3hgda3c5"; depends=[base64enc details fs htmltools knitr lifecycle magick magrittr rematch2 rstudioapi svgPanZoom whisker xml2]; }; texmex = derive2 { name="texmex"; version="2.4.8"; sha256="115x7j2kvifzsrmh8zy6xymm1p01sxk4c26zdmi0p51bsgvs46ih"; depends=[ggplot2 mvtnorm Rcpp]; }; - texreg = derive2 { name="texreg"; version="1.37.5"; sha256="0cb3kvxfi9k9g958fkb73cgqdxx3h9bz2cnaakic4wgrkv27mk2c"; depends=[httr]; }; - text = derive2 { name="text"; version="0.9.10"; sha256="1ramsv2pbg57yyxp5qjkls82gl5icda6f5116hr0w5s0w3jpajmj"; depends=[cowplot dplyr furrr future ggplot2 ggrepel magrittr parsnip purrr recipes reticulate rlang rsample stringr tibble tidyr tokenizers tune workflows yardstick]; }; + texreg = derive2 { name="texreg"; version="1.38.5"; sha256="1d0syszvxhxiplwsbq12s6rw4lrrbn4w3mmljs7vkw8p4gd8fp78"; depends=[httr]; }; + text = derive2 { name="text"; version="0.9.50"; sha256="0s81j3kbrzxcfbwxnk5hbdqlb3pjmlxjswjy8pj7s13h5gnsm1bw"; 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.2"; sha256="0qjnzdm7savn2jqmm23cd3rszyihnhb5rfnygc36ccfd15vav79j"; depends=[Rcpp]; }; - text2map = derive2 { name="text2map"; version="0.1.1"; sha256="1kwbb9bp3ikksh24i69gclmanyqri3xn7rdbf1x93lhj7fxzbxrs"; depends=[doParallel dplyr fastmatch foreach igraph kit magrittr Matrix mlpack qgraph rlang stringi stringr text2vec tibble]; }; + text2map = derive2 { name="text2map"; version="0.1.3"; sha256="0p8knb450rz79531cb9kkc4rlns3p7qrq212jss2jcwxfnl640dv"; depends=[doParallel dplyr fastmatch foreach igraph kit magrittr Matrix mlpack qgraph rlang stringi stringr text2vec tibble]; }; text2sdg = derive2 { name="text2sdg"; version="0.1.2"; sha256="1yq46jh11jymiqb4dmbvl1w35jq9ww6v3kra8px013qfdxvdnvlg"; depends=[corpustools dplyr ggplot2 magrittr stringr tibble tidyr]; }; text2speech = derive2 { name="text2speech"; version="0.2.13"; sha256="0c0h4yfp1gzaf4snav84iy5m0fx8az0pw1h2s33239dxkwcff893"; depends=[aws_signature dplyr googleAuthR googleLanguageR httr knitr magrittr mscstts tuneR]; }; text2vec = derive2 { name="text2vec"; version="0.6"; sha256="0r75cv77x2zm1z66s95hic71dpbqmybz39n48q6mz7gfd3m7312y"; depends=[data_table digest lgr Matrix mlapi R6 Rcpp rsparse stringi]; }; @@ -17521,7 +17797,7 @@ in with self; { tfhub = derive2 { name="tfhub"; version="0.8.1"; sha256="19wbmdh31wsqmxwsm7ks3j5n60my49b3safp587cpwf0y70rihsi"; depends=[magrittr reticulate rstudioapi tensorflow vctrs]; }; tfio = derive2 { name="tfio"; version="0.4.1"; sha256="089vh0k12z0ymk4v585hfnl5yqp28rgzqgy633m874h6fqzhhxvp"; depends=[forge magrittr reticulate tensorflow tfdatasets]; }; tfplot = derive2 { name="tfplot"; version="2021.6-1"; sha256="0w0m9d2lvjl96vxwvks2v086y4gqiv2n0d50j2yrngys9p2nrlxc"; depends=[tframe]; }; - tfprobability = derive2 { name="tfprobability"; version="0.12.0.0"; sha256="1f57fzmvgh5qhpf750c16lmppjcbbdjz6w2cqr85kjv049ch3a50"; depends=[keras magrittr reticulate tensorflow]; }; + tfprobability = derive2 { name="tfprobability"; version="0.15.0"; sha256="0xsszigx805kwr5df4gnyxkng4sq9h0wjxa8lh2nvh4v24s4pgxj"; depends=[keras magrittr reticulate tensorflow]; }; tframe = derive2 { name="tframe"; version="2015.12-1.1"; sha256="1yff22jzh1mp73zbz2mav6z8m42lylfjhb8dgxj4337fv3if3i13"; depends=[]; }; tframePlus = derive2 { name="tframePlus"; version="2016.7-1"; sha256="12xi2xw4pr78n3cppfknpxmjp2263pb4kqj9v412yxwp82rgb6yk"; depends=[tframe timeSeries]; }; tfruns = derive2 { name="tfruns"; version="1.5.0"; sha256="04lfckg1if3kfwcl4s4fcc9aw04crwk4m1qr55ag22j2x2jlb2l9"; depends=[base64enc config jsonlite magrittr reticulate rlang rstudioapi tidyselect whisker yaml]; }; @@ -17532,21 +17808,21 @@ in with self; { tgp = derive2 { name="tgp"; version="2.4-17"; sha256="0hl9nv2nayhq9jiy6lrgn702lb95allqiq8v221rj9pzxpc1230c"; depends=[maptree]; }; tgram = derive2 { name="tgram"; version="0.2-3"; sha256="0vlnry8drq3fqfy8dk50pcwcx9dj657kx6s19fs2b6acigkr4g7w"; depends=[zoo]; }; tgstat = derive2 { name="tgstat"; version="2.3.16"; sha256="12apvcpdwfng0sp2v80xvpk7ynbadi2lvbfk14hlcsvw8h3rb268"; depends=[]; }; + tgver = derive2 { name="tgver"; version="0.2.0"; sha256="0p8pm47kpajwhhk3a96rl2nfj69qqvbw5qwp1in3qv11wxv4cbyj"; depends=[callr geojsonsf plumber]; }; thankr = derive2 { name="thankr"; version="1.0.0"; sha256="089ikp85d5ia6a1qzmw8dkgcmz628cibmwfzcpk7m3ii8acxq91w"; depends=[]; }; 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]; }; - themetagenomics = derive2 { name="themetagenomics"; version="1.0.2"; sha256="14i81cd9cyzhi3j2d9ygwlairkimhx8ffvva3pg3xwwvpywb6mla"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; }; themis = derive2 { name="themis"; version="0.1.4"; sha256="0zc7djygyiy1sjgvbznb6nqcglfnbybxaz5frphns92m7smqy0l9"; depends=[dplyr generics purrr RANN recipes rlang ROSE tibble unbalanced 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.0"; sha256="1xwmmgraaqhwmar1782bm3s5xx6vq6bc5xkclmrzvvy09il1y10v"; depends=[dplyr ggplot2 gridExtra magrittr MASS readr tidyverse usethis]; }; + 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=[]; }; - thickmatch = derive2 { name="thickmatch"; version="0.3.1"; sha256="0q7wpilbk8jm3q7m5hb114jpbv4ri1745v9sbdf222l6ymds6pia"; depends=[DiPs MASS plyr rcbalance]; }; thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; }; thinkr = derive2 { name="thinkr"; version="0.15"; sha256="17mfw067advk8vxlz8x0w0vww3718zp2fcs00sca8ivlh8yh9fcg"; depends=[assertthat crayon devtools dplyr ggplot2 lazyeval lubridate magrittr officer purrr readr rvg stringi stringr tidyr]; }; - this_path = derive2 { name="this.path"; version="0.4.4"; sha256="0z8m0l1sknk5l4gn93f3im8lsr4dxzks8qx26sqsyf98kdi5qxw4"; depends=[]; }; + this_path = derive2 { name="this.path"; version="0.5.0"; sha256="0fcmdkwrg4gmss2q2xkwrlr6wy5v0qzqzb5l890adihmqvlhb8ra"; depends=[]; }; thor = derive2 { name="thor"; version="1.1.2"; sha256="0r4kgzbydjb7z0j808g5zdkx5wmbqncqg453bqm4ylafpj5z79kv"; depends=[R6 storr]; }; thorn = derive2 { name="thorn"; version="0.2.0"; sha256="0sybjqwv9al5khkhhc7khbgr7n2vy6aggarh9n75mxpa8hn7j2qr"; depends=[htmlwidgets]; }; + thredds = derive2 { name="thredds"; version="0.1-1"; sha256="1ssx9sm55ycdny36nlydxqylfr0d51hyj3rgsmnk5d8wyhivnxb9"; depends=[httr magrittr R6 rlang xml2]; }; threeBrain = derive2 { name="threeBrain"; version="0.2.4"; sha256="1pgfphw9xwn23rjzylh3crw10sj86qc7ihh4kzpr758w1b84mfd2"; depends=[digest dipsaus freesurferformats gifti htmlwidgets jsonlite oro_nifti R6 shiny stringr xml2]; }; threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; }; threejs = derive2 { name="threejs"; version="0.3.3"; sha256="1711h351nzxfkbbdwvfzyhciyvi9c6wx3jq1g97lzcqgnb45kivn"; depends=[base64enc crosstalk htmlwidgets igraph]; }; @@ -17557,28 +17833,29 @@ in with self; { threshr = derive2 { name="threshr"; version="1.0.3"; sha256="1vs2jfvh1pjzyfz1s4w92sw13yz2nhc28gc3iyqz8a82rrdm4mdq"; depends=[revdbayes rust]; }; thriftr = derive2 { name="thriftr"; version="1.1.5"; sha256="1s8fn0imja6gh5bb0h2g1pmvkwk5v0dmpml9yvcd5dhz9lxy6vdj"; depends=[R6 rly stringi]; }; thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; }; + thunder = derive2 { name="thunder"; version="0.3.0"; sha256="0lzaab5acgy4s7qkq10l0yfdgrsya74757a025j205jin4m49hai"; depends=[aiRthermo climate dplyr 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]; }; tibble = derive2 { name="tibble"; version="3.1.6"; sha256="14l2i6ri3v5y0h8g0ahc4kz0pdqsp5yabxk2w8wavss6y44xjcsv"; depends=[ellipsis fansi lifecycle magrittr pillar pkgconfig rlang vctrs]; }; tibbletime = derive2 { name="tibbletime"; version="0.1.6"; sha256="0pfph4pyjxkxrir5ca1sh7xz07dylqnq40w0qyqiyaj5s23mbbmb"; depends=[assertthat dplyr glue hms lifecycle lubridate purrr Rcpp rlang tibble tidyselect vctrs zoo]; }; tibblify = derive2 { name="tibblify"; version="0.1.0"; sha256="0mdi9x36nrlcbchl7b2rlf4j1k0y6c7657aznm7xa0396ciij5fk"; depends=[crayon purrr rlang tibble vctrs]; }; tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; }; tictoc = derive2 { name="tictoc"; version="1.0.1"; sha256="0197f540fkcxx5blx9jjnbvwgdnsdv55znmvgdizdp8pqhsib6m0"; depends=[]; }; - tidyBdE = derive2 { name="tidyBdE"; version="0.2.2"; sha256="041hwm73galrwjr4xnwzw5pzwp54g88w0464gmszrhs27lhhsr06"; depends=[dplyr ggplot2 readr scales tibble]; }; + tidyBdE = derive2 { name="tidyBdE"; version="0.2.4"; sha256="0qijyml3z38wq85vjfblgm85gvgmaz0vgffg1fiqjfgx78blk2f0"; depends=[dplyr ggplot2 readr scales tibble]; }; tidyCpp = derive2 { name="tidyCpp"; version="0.0.6"; sha256="1w6fr4q137ar6557a8x1jpmfmlsga59621jwq0sf37bnn535i4gw"; depends=[]; }; - tidyHeatmap = derive2 { name="tidyHeatmap"; version="1.3.1"; sha256="107bfyjakqfiimnwdyl2nhvx1fjpzv693akvi5l0cai6vjs007wj"; depends=[circlize ComplexHeatmap dendextend dplyr lifecycle magrittr purrr RColorBrewer rlang tibble tidyr viridis]; }; + tidyEmoji = derive2 { name="tidyEmoji"; version="0.1.0"; sha256="03amap4lik63nqdznncg8ymw74avmrhci36gy8ckwwskrn9gqw93"; depends=[dplyr emoji purrr stringr tibble tidyr]; }; + tidyHeatmap = derive2 { name="tidyHeatmap"; version="1.6.0"; sha256="15ih0pjm2d5xdqdyfy9mwg0yag1gvdmqdl70a1m3j46qwj5z6chg"; 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]; }; - 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]; }; - tidyREDCap = derive2 { name="tidyREDCap"; version="0.2.0"; sha256="03kx91avw6zbmrcxvhkb7i3syw3ajkv9ypvgn2iq3ki887vbiwzw"; depends=[dplyr janitor magrittr purrr rlang stringr tibble tidyr]; }; + tidyREDCap = derive2 { name="tidyREDCap"; version="0.2.2"; sha256="15xbkcfikzlglhh2y54rbpknbhzm6h9bq72f4h3g8bmfr44vy72g"; depends=[dplyr janitor magrittr purrr rlang stringr tibble tidyr]; }; tidyRSS = derive2 { name="tidyRSS"; version="2.0.4"; sha256="0djkdjgs64f00pcs5gc8vmijyjsfb5sm0p64bybhs1y0kb3wlnl3"; depends=[anytime dplyr glue httr jsonlite magrittr purrr rlang tibble tidyselect vctrs xml2]; }; - tidySEM = derive2 { name="tidySEM"; version="0.2.0"; sha256="115nr2h3bz9pjxf5c1cw3b2v16nix5z41r49zjqzn8yrfjs59crw"; depends=[ggplot2 gtable igraph lavaan MplusAutomation OpenMx psych]; }; - tidyUSDA = derive2 { name="tidyUSDA"; version="0.3.2"; sha256="092zy2k2hajr0g47r7ngsm089j4y70q7biwyhsiz3vfmpg3s3ijb"; depends=[crayon dplyr fuzzyjoin ggplot2 httr jsonlite magrittr purrr sf tigris]; }; - tidybayes = derive2 { name="tidybayes"; version="3.0.1"; sha256="1drgjqcrcxx0jwaj9c0a5j0f6v793pq8rjcw8cv3zc438apfmdsm"; depends=[arrayhelpers coda dplyr ggdist ggplot2 magrittr posterior rlang tibble tidyr tidyselect vctrs withr]; }; + tidySEM = derive2 { name="tidySEM"; version="0.2.1"; sha256="1vq7dfqb2396lw49wa5mjn60nvha6hv9ziknh14b4cj1qh85pz7x"; depends=[ggplot2 gtable igraph lavaan MplusAutomation OpenMx psych]; }; + tidyUSDA = derive2 { name="tidyUSDA"; version="0.3.3"; sha256="1aqcvqc64qb8dbpmiw4cl06k0fh34fz5svzhjdgzrywl5qan3br3"; depends=[crayon dplyr fuzzyjoin ggplot2 httr jsonlite magrittr purrr sf tigris]; }; + tidybayes = derive2 { name="tidybayes"; version="3.0.2"; sha256="00672xhg8a8r4sk36sm827bb435r1hchkphl1jpnkld8vbdhvpd2"; depends=[arrayhelpers 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.1"; sha256="1h32f1qgb7fnlbmqdkgl98cql06ds5r25ad3zbqrcs58ckngs549"; depends=[crayon dplyr httr jsonlite purrr rappdirs readr rlang rvest sf stringr tidyr tigris units xml2]; }; - tidycharts = derive2 { name="tidycharts"; version="0.1.2"; sha256="0afdd5rdpwpyciangybwxahfjivqm13i3az2wzaky4s6mv68x6bd"; depends=[dplyr htmlwidgets lubridate magick magrittr rlang rsvg stringr testthat]; }; - tidycmprsk = derive2 { name="tidycmprsk"; version="0.1.0"; sha256="00wp47kdwp5kln25mn1lvzwchxrf3fq3qlacn9pi2drhjcp7hwj4"; depends=[broom cli cmprsk dplyr ggplot2 gtsummary hardhat purrr rlang stringr survival tibble tidyr]; }; + tidycensus = derive2 { name="tidycensus"; version="1.1.2"; sha256="1762nqx8g6d3h2pl2ph30c8j2gs46ykdvfb17h977rv6m6bxm40m"; depends=[crayon dplyr httr jsonlite purrr rappdirs readr rlang rvest sf stringr tidyr tigris units xml2]; }; + tidycharts = derive2 { name="tidycharts"; version="0.1.3"; sha256="1clpjyvqv6xhv7n64xh411x867fnn581qckzcwn18xbbbs56k6nn"; depends=[htmlwidgets knitr lubridate magick magrittr rlang rsvg stringr testthat]; }; + tidycmprsk = derive2 { name="tidycmprsk"; version="0.1.2"; sha256="1xmi6dgp5b2kad3g0ymayx7slvgw53dmaibyj88yxf67m97p757r"; 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.6"; sha256="1i2z5dxrqz1l3366fmmgc4pfqnhm91nlc0m4y8mvzwgsgmf6dkxp"; depends=[dplyr htmlwidgets jsonlite magrittr visNetwork webshot yaml]; }; @@ -17587,10 +17864,10 @@ in with self; { tidydr = derive2 { name="tidydr"; version="0.0.3"; sha256="1sdh0grqccn1l2i4ji5q1yc5iz4vyzdfmd6qy5ypsza6bnkpgg1d"; depends=[ggplot2 rlang]; }; tidyestimate = derive2 { name="tidyestimate"; version="1.1.0"; sha256="0cwk6clah4sapbmfl5vvcv6di39azxb07z73pypnqx4gd32kk5q7"; depends=[dplyr ggplot2 ggrepel glue rlang]; }; tidyfast = derive2 { name="tidyfast"; version="0.2.1"; sha256="1bfs2wma705nx1lpndq75ama5dr9kkg8hwpklb20csnccnfrlvf6"; depends=[data_table Rcpp]; }; - tidyfst = derive2 { name="tidyfst"; version="1.5.0"; sha256="1ibkdw8xibmn0s4na4ddypg4vbgyb2lqs4hnwz30j0sbpqk5xfgr"; depends=[data_table fst stringr]; }; + tidyfst = derive2 { name="tidyfst"; version="1.6.0"; sha256="1x7aiypcwx9vdfpwgfza86xdk545kf038mc9gl84kga4binic4pl"; depends=[data_table fst stringr]; }; tidyft = derive2 { name="tidyft"; version="0.4.5"; sha256="0l6ixaqj356q319ms0bf655f530cgiia9saqdx9lryaf0b6i2hxb"; depends=[data_table fst stringr]; }; tidygapminder = derive2 { name="tidygapminder"; version="0.1.1"; sha256="1m6bynwnw1msrzvdmy12w3ympinqpd8j3may3rwmg9941nndjv2d"; depends=[data_table dplyr readxl tidyr]; }; - tidygate = derive2 { name="tidygate"; version="0.4.8"; sha256="0rkx0iqk8rgna7vr757h0mkk3rk2xcbnx2p0fqcg8fx77q9f5q73"; depends=[dplyr lifecycle magrittr purrr RColorBrewer rlang scales stringr tibble tidyr viridis]; }; + tidygate = derive2 { name="tidygate"; version="0.4.9"; sha256="0zs2z4xf76d9hw7zwwpd3bisjvq672smbmxl0qgjb7xdzh66cqsf"; depends=[dplyr lifecycle magrittr purrr RColorBrewer rlang scales stringr tibble tidyr viridis]; }; tidygenomics = derive2 { name="tidygenomics"; version="0.1.2"; sha256="1cnwmmmzp9kg4k7iy2kgb22bdllpnz257pv1ahy3l11zy6bl48fc"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp rlang tidyr]; }; 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]; }; @@ -17602,47 +17879,47 @@ in with self; { tidylo = derive2 { name="tidylo"; version="0.1.0"; sha256="135aw7zqgxz7l3zgskhzy72lgm1xwl50566s0s45dq7h6ah0vi5d"; depends=[dplyr rlang]; }; tidylog = derive2 { name="tidylog"; version="1.0.2"; sha256="076am30ayc16wm3bilznxqzd5806yi7dx5m9yv4w7q90i7imsqk7"; depends=[clisymbols dplyr glue tidyr]; }; tidymodels = derive2 { name="tidymodels"; version="0.1.4"; sha256="18krycdn0h1i8swrq6bgj8qnb200rr0pqhr6maq3h1jc66x0y7nd"; 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.2.1"; sha256="1jwq46njsbcdy74cxiqikzksnkrcffcdy699abirw56b6ffsfd71"; depends=[dplyr ggplot2 magrittr mgcv rlang tibble tidyr]; }; + tidymv = derive2 { name="tidymv"; version="3.3.0"; sha256="0r192jiwfj6pk41jpap8gfk0irjkx2877qiqxi1hm196hns6hpjg"; depends=[dplyr ggplot2 magrittr mgcv rlang tibble tidyr]; }; tidync = derive2 { name="tidync"; version="0.2.4"; sha256="1nm3021m3xnn4xkprkxd9sj9bwvfbwhrdhfdkfhsc9azqy3rgg9f"; depends=[dplyr forcats magrittr ncdf4 ncmeta purrr rlang RNetCDF tibble tidyr]; }; - tidyndr = derive2 { name="tidyndr"; version="0.1.1"; sha256="16a0rs83r4pd3cq8qf0638ri1q8nv0jbnpkz3wmxyrj034q261zz"; depends=[dplyr forcats janitor lubridate magrittr purrr rlang tibble tidyr vroom]; }; - tidypaleo = derive2 { name="tidypaleo"; version="0.1.1"; sha256="0xpfzdl6asvpf07s20la4bmm5lr93j7h8kx7v3y79xfjk2q2fzvd"; depends=[digest dplyr ggplot2 ggstance purrr rioja rlang scales stringr styler tibble tidyr tidyselect vctrs withr]; }; + tidyndr = derive2 { name="tidyndr"; version="0.2.0"; sha256="1c4g57zp50mfrsh8lac4iava37fx39i2yrjfrb1m0j22grsczfml"; depends=[dplyr forcats janitor lubridate magrittr purrr rlang stringr tibble tidyr tidyselect vroom]; }; + tidypaleo = derive2 { name="tidypaleo"; version="0.1.2"; sha256="1pxn5hmlnj6bwc4hx45j3757djl1b4b1azgp1vsfkhsnl846lbjm"; depends=[digest dplyr ggplot2 ggstance purrr rioja rlang scales stringr styler tibble tidyr tidyselect vctrs withr]; }; tidypmc = derive2 { name="tidypmc"; version="1.7"; sha256="1fijlvdiw4vwm34wizm4xlm0x10vvpkldzk7rrla44apq7y2w3yq"; depends=[dplyr readr stringr tibble tokenizers xml2]; }; tidyposterior = derive2 { name="tidyposterior"; version="0.1.0"; sha256="1h1664sjrg6akph6nrk8ynn2kjiswv6gshy35gamam1h4axf6wah"; depends=[dplyr generics ggplot2 purrr rlang rsample rstanarm tibble tidyr tune vctrs workflowsets]; }; tidypredict = derive2 { name="tidypredict"; version="0.4.8"; sha256="0fff349pkksss8h1k2qza78l81ha6avx63pxziv6dfa8h62qmrdy"; depends=[dplyr generics knitr purrr rlang stringr tibble tidyr]; }; tidyquant = derive2 { name="tidyquant"; version="1.0.3"; sha256="11acp5mlwhavahl7i60j0ycaxypy7wrp81p7dkl6pxv8mw2gcym8"; depends=[alphavantager cli crayon curl dplyr ggplot2 httr janitor jsonlite lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr riingo rlang rstudioapi stringr tibble tidyr tidyselect timeDate timetk TTR xts]; }; tidyquery = derive2 { name="tidyquery"; version="0.2.3"; sha256="1xkcwccwc58140zdzwv6ip98c5vxjf67y7cbghvdzv2nx5agrhq9"; depends=[dplyr lubridate queryparser rlang stringr]; }; tidyqwi = derive2 { name="tidyqwi"; version="0.1.2"; sha256="16f0c2mdx6aiji6i7237kpc9awqdgrg6rhs408w6ag28dhxpgwlv"; depends=[dplyr furrr future httr jsonlite labelled magrittr purrr stringr tidyr xml2]; }; - tidyr = derive2 { name="tidyr"; version="1.1.4"; sha256="0h8jfsmn4r7zgfyjmg2qkjd54n0sncq07xjh4mdf2cx4k2z9h30b"; depends=[cpp11 dplyr ellipsis glue lifecycle magrittr purrr rlang tibble tidyselect vctrs]; }; + tidyr = derive2 { name="tidyr"; version="1.2.0"; sha256="1a0k296a0jb2xi5zgfrqfmmw8197bwibjl7a04fm49vqx6livl4c"; depends=[cpp11 dplyr ellipsis glue lifecycle magrittr purrr rlang tibble tidyselect vctrs]; }; tidyrules = derive2 { name="tidyrules"; version="0.1.5"; sha256="04y6pnrp132sckjpp9g8yl0z7glcsx9dcfdpa8r27wsc2g491i63"; depends=[assertthat magrittr partykit purrr stringr tibble]; }; - tidyselect = derive2 { name="tidyselect"; version="1.1.1"; sha256="0ss8mq05mwif64cj8zmrfx0ljgy3n0fvyv7f37782shr8rknmsqq"; depends=[ellipsis glue purrr rlang vctrs]; }; - tidyseurat = derive2 { name="tidyseurat"; version="0.3.0"; sha256="19f6046z1apmj11cp481rgv53mv25izwrpijy6s4xv5iqgpczb1n"; depends=[cli dplyr ellipsis fansi ggplot2 lifecycle magrittr pillar plotly purrr rlang Seurat SeuratObject stringr tibble tidyr tidyselect]; }; + tidyselect = derive2 { name="tidyselect"; version="1.1.2"; sha256="0w423pmg9wjx6q2rnp2ap66323rxvpmzd4nnsqq4m58pajqs7283"; depends=[ellipsis glue purrr rlang vctrs]; }; + tidyseurat = derive2 { name="tidyseurat"; version="0.5.1"; sha256="15i75qrvgi88ywn165dhjqmdsh47p4i5clp5mq7d9rc8g7fj984h"; depends=[cli dplyr ellipsis fansi ggplot2 lifecycle magrittr pillar plotly purrr rlang Seurat SeuratObject stringr tibble tidyr tidyselect ttservice]; }; tidysmd = derive2 { name="tidysmd"; version="0.1.0"; sha256="0hbjcccs36i2cip6k56hv39awdxiljv322zlidlphkab7h95xiqc"; depends=[dplyr ellipsis glue purrr rlang smd tidyr tidyselect]; }; - tidysq = derive2 { name="tidysq"; version="1.1.2-1"; sha256="14gsm4hlm9vd85wpsgvk2w5hzmjayxs5ryh1j8zx2rsp98ypxrcm"; depends=[checkmate cli crayon dplyr pillar Rcpp testthat tibble vctrs]; }; + 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.1"; sha256="00fzma64fjih70yp04hpragh9afhn11hdqydagr0yalwg3ixx5iq"; depends=[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.1.0"; sha256="0rckvp51gp22bjcwcszdhhn51bzjivwndnvjcf67h1vmyqa3zjkj"; depends=[dplyr forcats ggplot2 kernlab LowRankQP magrittr optimx rgenoud rlang tibble tidyr]; }; - tidytable = derive2 { name="tidytable"; version="0.6.6"; sha256="0xyr7xqdp7irs3gx7yc1zk5yfsg1a5divnaspll82bn2i6s8vrzh"; depends=[data_table glue lifecycle magrittr pillar rlang tidyselect vctrs]; }; + tidytable = derive2 { name="tidytable"; version="0.7.0"; sha256="14acqg5wvyfndl85fjgnwkyjwvyyvdk0z2884w5gxvc4aj0xy2g3"; depends=[data_table glue lifecycle magrittr pillar rlang tidyselect vctrs]; }; tidytext = derive2 { name="tidytext"; version="0.3.2"; sha256="0as7lscjl6ywk85almmb4f71vxmgkfds46g52ryggkg2isksvq3g"; depends=[dplyr generics hunspell janeaustenr lifecycle Matrix purrr rlang stringr tibble tokenizers vctrs]; }; - tidytidbits = derive2 { name="tidytidbits"; version="0.2.3"; sha256="1sia4bxfnb0hw047l6hl013si3iaisac51lp9b42m22hcxzxwgx0"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; - tidytransit = derive2 { name="tidytransit"; version="1.2.0"; sha256="0zvzjnrn7znm58di38h53kmbyabc9a514010rywpjs6w9blvyb6g"; depends=[checkmate data_table digest dplyr geodist gtfsio hms httr rlang sf]; }; - tidytreatment = derive2 { name="tidytreatment"; version="0.2.1"; sha256="09d9qiwb1mniwfyklkiylr1glix1f441kkxlbff2x99j1xij197x"; depends=[dplyr purrr readr rlang tidybayes tidyr]; }; - tidytree = derive2 { name="tidytree"; version="0.3.6"; sha256="1gnpm4zz0kvqng5s179301q0h5993ajynm8y0zbdz38qcmzfpsdk"; depends=[ape dplyr lazyeval magrittr rlang tibble tidyr tidyselect yulab_utils]; }; - tidytuesdayR = derive2 { name="tidytuesdayR"; version="1.0.1"; sha256="0slpfajv5cxqxfb1sh98574zrcgihiazscpr0zga2i6kiwn3kgpy"; depends=[httr jsonlite lubridate magrittr purrr readr readxl rstudioapi rvest usethis xml2]; }; + tidytidbits = derive2 { name="tidytidbits"; version="0.3.1"; sha256="0fqqmisp339ynr5p5qs2dzshx031kggp7c70zm2w1v932xpalsrz"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + tidytransit = derive2 { name="tidytransit"; version="1.3.0"; sha256="1n7c4iblxa1yifh51x4767k61qp99r6r4pchcyvz4bq7jbvclf18"; depends=[checkmate data_table digest dplyr geodist gtfsio hms httr 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.3.9"; sha256="1prfv2jy6z4zp4gyi9krzbysipsbnjrkxcccflm4nwsd9i7mshqj"; depends=[ape dplyr lazyeval magrittr pillar rlang tibble tidyr tidyselect yulab_utils]; }; + tidytuesdayR = derive2 { name="tidytuesdayR"; version="1.0.2"; sha256="00xlbmgg8779ypqcrdgn56lyklqknhh3pmqfc49f84xa5hrkyjfs"; depends=[httr jsonlite lubridate magrittr purrr readr readxl rstudioapi rvest usethis xml2]; }; tidyverse = derive2 { name="tidyverse"; version="1.3.1"; sha256="0ck6xmsw5p168jmw2fqv79fzfnw5jckfra7mfii261j6kl89bkw3"; depends=[broom cli crayon dbplyr dplyr dtplyr forcats ggplot2 googledrive googlesheets4 haven hms httr jsonlite lubridate magrittr modelr pillar purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; }; tidyvpc = derive2 { name="tidyvpc"; version="1.2.0"; sha256="1xih8gdc44ddi5kqx8kq9i3pz21hddha87fpb58wjfr5hsaw18sy"; depends=[classInt data_table fastDummies ggplot2 magrittr mgcv quantreg rlang]; }; - tidywikidatar = derive2 { name="tidywikidatar"; version="0.4.2"; sha256="006rcm8g5vqrbwvviaclynzrapff8yclqkmq3hkdljm5v972g5gj"; depends=[DBI dplyr fs glue jsonlite magrittr progress purrr rlang RSQLite stringr tibble tidyr usethis WikidataQueryServiceR WikidataR]; }; + tidywikidatar = derive2 { name="tidywikidatar"; version="0.5.0"; sha256="0gbvb5vbxjccs9ac5xjbslqg7h5y2cw71d69q44jc7i1iqwckzys"; depends=[DBI dplyr fs glue jsonlite magrittr pool progress purrr rlang RSQLite stringr tibble tidyr usethis WikidataQueryServiceR WikidataR]; }; tidyxl = derive2 { name="tidyxl"; version="1.0.7"; sha256="1wg8h5fd2hd8ilshrbcs99q18p15687dx8j51v5pyd30pg5cab7b"; depends=[piton Rcpp]; }; - tiff = derive2 { name="tiff"; version="0.1-10"; sha256="1zha6bzb1rmfl6n2xjkygs9wfi3ah9cjr7a6jzk4zqc5kvl58lak"; depends=[]; }; + tiff = derive2 { name="tiff"; version="0.1-11"; sha256="0xgc7vyndxxahfhc2qqzmwi56bnfyl0pn72l820jz5sd24aymhxq"; depends=[]; }; tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; }; tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; }; 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.0"; sha256="12mcq3mvmcpmb7cc0c3sij03wa9i37c3ilxpa3fm2cr3g3yj2r1v"; depends=[alakazam doParallel dplyr foreach ggplot2 gridExtra gtools iterators lazyeval rlang shazam 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="1.5"; sha256="0wj4q09k4nwl1kj7r05ivhdy4vp8x1hfblc6xsbnpb8p72l1rxsy"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; }; + tigris = derive2 { name="tigris"; version="1.6"; sha256="0q8niaa5l4xh2qfp243321ybqxg7s974wvifr4fdwnjgyjxgn57s"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; }; tikzDevice = derive2 { name="tikzDevice"; version="0.12.3.1"; sha256="040yz6wi05151m9nal97symv66a133kk0a8c1h6nz058zk081vav"; depends=[filehash png]; }; - tiledb = derive2 { name="tiledb"; version="0.10.2"; sha256="0my1rc158mvp9126h6vwcnrg97xgyc8m8hvcbrjg0kz9vy3770wl"; depends=[nanotime Rcpp]; }; + tiledb = derive2 { name="tiledb"; version="0.11.0"; sha256="1lgagf8ix8bnl6g7qp0lzaz4xd6wlp9xa02rqyxb30bk0g022ik7"; depends=[nanotime Rcpp]; }; 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.2.5"; sha256="02sxc70s8v5b5lf1fpv1ig1hmpkamsmzbgpk6zds504gh9kz7qxy"; depends=[png raster rgdal sp]; }; @@ -17663,7 +17940,7 @@ in with self; { timereg = derive2 { name="timereg"; version="2.0.1"; sha256="1mrqy54jwgfygjlm7hvlx42c631is1nc1q6jd3chw2cx3pi9lhiq"; depends=[lava numDeriv survival]; }; timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; timeseriesdb = derive2 { name="timeseriesdb"; version="0.4.1"; sha256="1ghb3lg63fs9zx34l5qczv39mdccnmqzlc74l1zhb8qmsg8sm1g2"; depends=[data_table DBI jsonlite openxlsx RPostgreSQL shiny xtable xts zoo]; }; - timetk = derive2 { name="timetk"; version="2.6.2"; sha256="0wmay9ccl398jp1wy2czfpapmf4vy59sz4dc5y6z97jdimjmg46i"; depends=[anytime assertthat dplyr forcats forecast generics ggplot2 hms lubridate padr plotly purrr readr recipes rlang rsample slider stringi stringr tibble tidyr tidyselect timeDate xts zoo]; }; + timetk = derive2 { name="timetk"; version="2.7.0"; sha256="173vg1mq5557fn39h36kqladc6b0bp22kmfv5pwi9lcgyc47sd2a"; 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.14"; sha256="13jchgd9fc8hxj74wm1kg4rwcng4yxblkq04i33djsqghgb5f9mj"; depends=[]; }; timetree = derive2 { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; }; timevis = derive2 { name="timevis"; version="2.0.0"; sha256="07padnd90s8s62sfcmg5l6b64md1cl4cfsxp5xm92nrlz82ksbbs"; depends=[htmltools htmlwidgets jsonlite lubridate magrittr rmarkdown shiny]; }; @@ -17675,15 +17952,16 @@ in with self; { 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.2.7"; sha256="0nhsmgg126x2rfk82d91c8rk74sg7qbshy10vcbqdgcmlz6466mh"; depends=[BiocManager clusterProfiler dplyr ggplot2 limma org_Hs_eg_db patchwork pheatmap stringr survival survminer tibble]; }; - tinylabels = derive2 { name="tinylabels"; version="0.2.2"; sha256="19ak4m5fx6vw50yj33vpqv1bva1i2ivr3238i0xkd0qix0x8haa7"; depends=[]; }; + tinylabels = derive2 { name="tinylabels"; version="0.2.3"; sha256="0knqcdnlrydbfklizvx9mp304sjz6wp54nbx1zhy2g2730nwa61k"; depends=[]; }; tinyscholar = derive2 { name="tinyscholar"; version="0.1.4"; sha256="0lj5ax3m5kr18qf9xmrh6iyy00bp59wwi3ss96ynsyiajmndsajf"; depends=[curl dplyr ggplot2 gt jsonlite magrittr purrr R_utils rlang rvest stringr xml2]; }; tinyspotifyr = derive2 { name="tinyspotifyr"; version="0.2.2"; sha256="19nicp1ml73lylja2np52rcc070maxm9286fjm7bfx3zsblxmakc"; depends=[httr jsonlite]; }; tinytest = derive2 { name="tinytest"; version="1.3.1"; sha256="1mq31f7bzcz5bkgzl9khm1i80axfzra7gcjqxd2yqb4wrw1m3x4s"; depends=[]; }; - tinytex = derive2 { name="tinytex"; version="0.36"; sha256="0y1vfq89yi302cwdcnassm02dk14j9ivk5vf83fp6rb8h6ww3rk5"; depends=[xfun]; }; + tinytex = derive2 { name="tinytex"; version="0.37"; sha256="1na8g4z1crq0ia9ba17d0qxaif47jij2z3y14xlxjv7x243k6krg"; depends=[xfun]; }; + tipa = derive2 { name="tipa"; version="1.0.5"; sha256="1mdjpbdbgd5n22l7fc0bfansh536ib1bgjaxzrl8g534cjxdnhgl"; depends=[optimr]; }; tipitaka = derive2 { name="tipitaka"; version="0.1.2"; sha256="0xf64bpzwywwjm0135c7zjn4ha0h1zj36rj2d4h8dskiq9z90xqi"; depends=[cpp11 dplyr magrittr stringi stringr]; }; - tipom = derive2 { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; }; tippy = derive2 { name="tippy"; version="0.1.0"; sha256="00c9v07ax7l0x5wpx3ca8hqvdqs3p62d58igp51rsbh9x1ylgjcn"; depends=[htmltools htmlwidgets jsonlite shiny]; }; tipr = derive2 { name="tipr"; version="0.3.0"; sha256="1iaj3cklq12xr7xbvkam0mjnq3g2rcmwy1m3kdm26qm793082nyz"; depends=[glue purrr tibble]; }; + tipsae = derive2 { name="tipsae"; version="0.0.4"; sha256="1cz0xwablrfaygq4yfqsq82f5n9im9mqb6ypczr4mgzj93m4v5k7"; depends=[BH broom callr ggplot2 ggpubr gridExtra loo maptools nlme Rcpp RcppEigen RcppParallel Rdpack rgeos rstan rstantools shiny sp spam spdep 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]; }; @@ -17694,9 +17972,8 @@ in with self; { tlemix = derive2 { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; }; tlm = derive2 { name="tlm"; version="0.1.5"; sha256="1iw08pa70nb25fnv64834s5c8vl456a2rcng7x6v9vs5q37610g6"; depends=[boot]; }; tlmec = derive2 { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; }; - tlrmvnmvt = derive2 { name="tlrmvnmvt"; version="1.1.0"; sha256="0mi1261659qg0ym4nqk0w6gw68wx37fq43s899szyyx08dj46mbb"; depends=[BH Rcpp RcppEigen]; }; + tlrmvnmvt = derive2 { name="tlrmvnmvt"; version="1.1.1"; sha256="1w8rahmdz176p7f496saiznk92bpvaq3pvpw235rwxna8vqkr607"; depends=[BH Rcpp RcppEigen]; }; tls = derive2 { name="tls"; version="0.1.0"; sha256="183b5m70s2whlgp9s1gb4xnylhlp4hnh3lw6b8f2vx4kahaid763"; depends=[]; }; - tlsh = derive2 { name="tlsh"; version="0.1.0"; sha256="0106y17cr3hq09ahy3rxhxqzgc0655w2jr0s3iyr8zvxsdv5ahb5"; depends=[bit64 blink igraph plyr]; }; tm = derive2 { name="tm"; version="0.7-8"; sha256="0mk2lsplynms15nw92vbdgsafg4bw1m0ik31gch1mnsnv61idsxi"; depends=[BH NLP Rcpp slam xml2]; }; tm_plugin_alceste = derive2 { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; }; tm_plugin_dc = derive2 { name="tm.plugin.dc"; version="0.2-10"; sha256="0v14fj3r438pvs88k4zwlzkgax8r0k6cx4mqjnzzad15frqficij"; depends=[DSL NLP slam tm]; }; @@ -17707,7 +17984,7 @@ in with self; { tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.2-1"; sha256="0rn8jqv622qmc0zkz534ka5qnbca2rlabxm3vjbqplr6fh1ahwb1"; depends=[NLP tm]; }; tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; }; tm1r = derive2 { name="tm1r"; version="1.1.8"; sha256="15w703rd7mfm32b62yv9mpms2fjq9ifmc1n460vsrpqz1dkiavb9"; depends=[httr jsonlite]; }; - tmap = derive2 { name="tmap"; version="3.3-2"; sha256="16k2nh4b4rkiid5ny97n22wn89pvh4sn6pdykbbj6qjlqp2p9jrb"; depends=[abind classInt htmltools htmlwidgets leafem leaflet leafsync RColorBrewer rlang sf stars tmaptools units viridisLite widgetframe]; }; + 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]; }; 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.3"; sha256="0y05albvggavhdijymwhw2ffg07jnvspppysmbz984c1my98zw4l"; depends=[BH Rcpp RcppEigen RcppParallel rstan StanHeaders TMB]; }; tmcn = derive2 { name="tmcn"; version="0.2-13"; sha256="0rf8mz6kdm83pm85kzfyzb8kd3iwaxv5bgphjpxlnq6z32m9yds7"; depends=[]; }; @@ -17716,13 +17993,16 @@ in with self; { tmod = derive2 { name="tmod"; version="0.46.2"; sha256="139znivmsm7hr5hiiq7f9vab5hm0bzqf2qfs69n340gf1dgpyrd2"; depends=[beeswarm colorDF gplots plotwidgets RColorBrewer tagcloud 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]; }; - tmt = derive2 { name="tmt"; version="0.2.1-0"; sha256="1drb0z9jk76ixn3qw7xb5rirfc9h0frkhl1krs681aiaspqkgswj"; depends=[ggplot2 Rcpp]; }; + tmsens = derive2 { name="tmsens"; version="0.1.0"; sha256="0rvcqf82jlq61rpmbyc5xy3fh0hzj1iy2kf6mmar18k3rhlhgayg"; depends=[]; }; + tmt = derive2 { name="tmt"; version="0.3.0-20"; sha256="1i4y01mbj9qkd4svgmhc18q47yd44jrqv4lsyk69rk1nr09d83lv"; depends=[ggplot2 Rcpp]; }; tmvmixnorm = derive2 { name="tmvmixnorm"; version="1.1.1"; sha256="0i1g3598d43azyy1bsrvkjybqa5cd991fpmfqi5wv5703zaha2fj"; depends=[MASS]; }; tmvnsim = derive2 { name="tmvnsim"; version="1.0-2"; sha256="03xsvsg9bqvgl98ywid3h91mmlhax5s6wvmypp3hq91vmc5kvxlp"; depends=[]; }; tmvtnorm = derive2 { name="tmvtnorm"; version="1.4-10"; sha256="1w3kmpx25l7rb80vpclqq4pbbv12qgysyqxjq3lp55l9nklkb7qs"; depends=[gmm Matrix mvtnorm]; }; + tmvtnsim = derive2 { name="tmvtnsim"; version="0.1.1"; sha256="1gf5gqb333q82cbdw3lfjmxnn8z7qds73xmc8dqm06zcqsfmdbv3"; depends=[Rcpp RcppArmadillo]; }; tnet = derive2 { name="tnet"; version="3.0.16"; sha256="0922y9zb64zazl2irwfxxbghkgcwi2q57gylpiaxgmj4q6lc62l9"; depends=[igraph survival]; }; - toOrdinal = derive2 { name="toOrdinal"; version="1.1-0.0"; sha256="0zg4zk7jx8s57g8nb0jw7r7gss00349jmkglf6sz26p7jldpgmff"; depends=[crayon testthat]; }; - tobit1 = derive2 { name="tobit1"; version="0.1-1"; sha256="0p9mzy1cyd9bz1g6r94h3467c13l6cvm5vdwwhn6ylmrkzr55hs7"; depends=[Formula generics margins numDeriv prediction Rdpack tibble]; }; + toOrdinal = derive2 { name="toOrdinal"; version="1.3-0.0"; sha256="1zfx91024dyafkfyjsm2829qsqkz57g6p5v47lp2x0ykrwpdbm37"; depends=[crayon testthat]; }; + toastui = derive2 { name="toastui"; version="0.2.1"; sha256="0c32410ylnp2b4h72aq7pig423jgcl63x8lmb8cf8m7h83xlj4ah"; depends=[htmltools htmlwidgets magrittr rlang shiny shinyWidgets]; }; + tobit1 = derive2 { name="tobit1"; version="0.1-3"; sha256="08rq1h3psxjzzfna6krji4ixrbd43v77qb9k00v1rysarlqyg0k1"; depends=[Formula generics margins numDeriv prediction Rdpack tibble]; }; todor = derive2 { name="todor"; version="0.1.2"; sha256="1ncg88wh9l2mja5w53ry2b19sa5x9m6cnkvw8lszbmc92idpspig"; depends=[R_utils rex rstudioapi stringr]; }; togglr = derive2 { name="togglr"; version="0.1.33"; sha256="105c9vxa67bqccj31ksk5myfd0v7v0wbz6qqjhxqndlg7v6ggfzc"; depends=[assertthat dplyr getPass glue httr jsonlite keyring lubridate magrittr parsedate prettyunits purrr rstudioapi]; }; tokenbrowser = derive2 { name="tokenbrowser"; version="0.1.5"; sha256="17hbkcan74j4fkk4j1xcgikaanp3xhs5njjxkapg2yjdhmf2dng6"; depends=[Rcpp stringi]; }; @@ -17731,7 +18011,7 @@ in with self; { 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.3"; sha256="0hn2zmb5fa390bbwg03mxzlp3qc5pr61qxm6gjydja29gcpvbk9m"; depends=[dplyr lifecycle PROJ purrr readr rlang sf stringr tibble tidyr]; }; - toolStability = derive2 { name="toolStability"; version="0.1.0"; sha256="1884dq7fys5p837fh7l60kn4jjn4h0zdr3hi2f1qas42zq35mgp2"; depends=[data_table dplyr nortest Rdpack]; }; + toolStability = derive2 { name="toolStability"; version="0.1.1"; sha256="1i5hdar4cv8788fzyfdnvmw3hpn059s2kjyxfcarpnc0clakd0by"; depends=[data_table dplyr nortest Rdpack]; }; toolmaRk = derive2 { name="toolmaRk"; version="0.0.1"; sha256="0pdr8lq4c11ia03v68lbfq38p3qp770mbj0nsbjsgbqi0pv9i1vx"; depends=[dplyr ggplot2 plyr reshape2]; }; tools4uplift = derive2 { name="tools4uplift"; version="1.0.0"; sha256="1izm9q2bj9l2nd9jn0fi3lf9hscfa0vmib58ypgpjsbsn0nd7p2h"; depends=[BiasedUrn dplyr glmnet latticeExtra lhs]; }; topicdoc = derive2 { name="topicdoc"; version="0.1.0"; sha256="0qliy6y8l09nblch1swlywam2awzwjl5xx0w8c3kiz48jxfysw0j"; depends=[slam topicmodels]; }; @@ -17740,20 +18020,26 @@ in with self; { topmodel = derive2 { name="topmodel"; version="0.7.3"; sha256="15w9id90d6l0i0ji3ln3sxnpispb6pgabk4waysqn0nh6y4lfdgb"; depends=[]; }; topoDistance = derive2 { name="topoDistance"; version="1.0.1"; sha256="055z3gvqlb8nyy58ix89w7miav9gj3h43a4wcfc3kagd97xc3222"; depends=[gdistance igraph plotly raster RColorBrewer scales sp]; }; topologyGSA = derive2 { name="topologyGSA"; version="1.4.7"; sha256="073n8bkrapk6il3izqr3bmcdp7yc29yzpbyzh6fvy9rg0x4d3g0z"; depends=[fields graph gRbase qpgraph]; }; + topr = derive2 { name="topr"; version="1.0.0"; sha256="1y4nqwh3s0phxp6ljifg8qaf40si0r771vwj4hv4aiw2yzgsy89y"; depends=[dplyr egg ggplot2 ggrepel gridExtra magrittr readr scales stringr toprdata]; }; + toprdata = derive2 { name="toprdata"; version="1.0.0"; sha256="1fyxhjj4c4j3268bcffq9wff1bkqan696hfz2y67bpg0xq1h3nbb"; 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]; }; - torch = derive2 { name="torch"; version="0.6.0"; sha256="05vxb84qxna1rpzqhjw6gwyc569zyz7rfbdkahglvihqjjwabc4x"; depends=[bit64 callr cli coro ellipsis magrittr R6 Rcpp rlang withr]; }; + torch = derive2 { name="torch"; version="0.7.2"; sha256="163pvl3gyz7l2fmqhgg4k6pw4dmvfir71yp9l5ra2k4zc32lz166"; depends=[bit64 callr cli coro ellipsis magrittr R6 Rcpp rlang withr]; }; torchaudio = derive2 { name="torchaudio"; version="0.2.0"; sha256="1bzx428lzjdwb9ds2pcq7nlalg75s7bvmiimjw3k8lvbq50yjlyh"; depends=[fs glue rappdirs Rcpp rlang torch withr]; }; torchdatasets = derive2 { name="torchdatasets"; version="0.1.0"; sha256="1iliz3iv143zmffd4jvvfxzsqn8bzp1sg5573rqjjbhnvy958mgg"; depends=[fs pins stringr torch torchvision withr zip]; }; - torchvision = derive2 { name="torchvision"; version="0.4.0"; sha256="0ndncq6qn54lp681khlhrwhywjnhi2wwirhysjhjyky6n2y378i4"; depends=[abind fs jpeg png rappdirs rlang torch zip]; }; + torchvision = derive2 { name="torchvision"; version="0.4.1"; sha256="07pdsqcnlmsc1yx7ldi18a0lqkgqbqwsqh7109rbrycczxrc1dqv"; depends=[abind fs jpeg png rappdirs rlang torch withr]; }; + torchvisionlib = derive2 { name="torchvisionlib"; version="0.1.0"; sha256="0kiix21gqpjw4qhz9xwpmlygjy66qxjdk3ja3dbrc1gz3x132drl"; depends=[glue Rcpp rlang torch]; }; + tornado = derive2 { name="tornado"; version="0.1.1"; sha256="12wvcc5p5fk6b1w3qhahjad5k0m34f744jszaid8hnrbbfysp8na"; depends=[assertthat ggplot2 gridExtra scales survival]; }; tosca = derive2 { name="tosca"; version="0.3-2"; sha256="1z8svczy93lpdj7n1gk9jz8jgzkjsf886ldlkgq1mfi1j6m8557y"; depends=[data_table htmltools lda lubridate quanteda RColorBrewer stringr tm WikipediR]; }; + toscutil = derive2 { name="toscutil"; version="2.1.0"; sha256="1ciyfxm3kbgvfqasv90i9ldrbvmkk0ryp310a1f44iih8rpvb2g6"; depends=[]; }; tosls = derive2 { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; }; - tosr = derive2 { name="tosr"; version="0.1.0"; sha256="0ifqzddivb5xn1pm32hi0ys3lcb2ncv7ka8vl4pzmhq0yx05a7dg"; depends=[bibliometrix CINNA dplyr igraph magrittr rebus rlang stringr tibble tidyr]; }; + tosr = derive2 { name="tosr"; version="0.1.1"; sha256="1hif33q73pbzgrs92ffkfiisxgxk35fyf37bvxb5kccrpwly9zih"; depends=[bibliometrix CINNA 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-5"; sha256="0dan4mlvc5lg9v4zj9w6gk3c4cy64kaa984y495xpc1bzmv5c6jd"; depends=[Rcpp]; }; touchard = derive2 { name="touchard"; version="2.0.1"; sha256="06491r4x3ycmv3ddbqwig334wj9qvm395xlaifx4hjjyyi65xb3q"; depends=[MASS nleqslv numDeriv plotrix]; }; tourr = derive2 { name="tourr"; version="0.6.0"; sha256="0mci0y6s851gh1b157mhpvz0p7hkq2f1ccq9jj22p5k7ipxwn8dh"; depends=[dplyr MASS tibble]; }; toxEval = derive2 { name="toxEval"; version="1.2.0"; sha256="11rw8vjnz3kzikd59vbyiv8vc7dijpi6znyxlc7c4rpi41gs6c0m"; depends=[dplyr DT ggplot2 leaflet magrittr RColorBrewer readxl shiny shinyAce shinycssloaders shinydashboard tidyr]; }; + toxpiR = derive2 { name="toxpiR"; version="1.0.3"; sha256="1x72g8caja241cx2lgn70f89ps8af38a3c5lxn90yfpndcp0mb3x"; depends=[BiocGenerics pryr rlang S4Vectors tidyr]; }; toxtestD = derive2 { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; }; tpAUC = derive2 { name="tpAUC"; version="2.1.1"; sha256="0wix9qwcidj7xfqhh7bmrpnadd9qlkvg3515gaamdxkjbz2kyydc"; depends=[pROC]; }; tpfp = derive2 { name="tpfp"; version="0.0.1"; sha256="0vm5qssaanvi0sck2hj1qgjra89a42i6nvzbva5z0aj2hkd5h4vh"; depends=[knitr readxl xlsx]; }; @@ -17768,12 +18054,13 @@ in with self; { trackdf = derive2 { name="trackdf"; version="0.2.2"; sha256="110m7dmciyqbcb69sxi02h5djnf098wzfr84d6yppyc73a81989y"; depends=[data_table lubridate sp 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.1"; sha256="0pys5vw3268j90i2gg6b1sgbx917vvk0x9k2ryh3l3p96vkrqv87"; depends=[changepoint colorspace DT foreach mapdeck mgcv plotly sf shiny shinydashboard shinyjs shinyWidgets trackeR V8 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]; }; 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]; }; trackter = derive2 { name="trackter"; version="0.1.1"; sha256="11rk53w0y9p0az6ydiq3vy50j1pj4p4cml5dqabrpcgfz4icjkrs"; depends=[data_table dplyr EBImage features ggplot2 jpeg Momocs pastecs plyr raster zoo]; }; tractor_base = derive2 { name="tractor.base"; version="3.3.3.1"; sha256="0w5jw7pf77npkgig7667yikpbwv4dfk1dcq63qm88l409ga2f95p"; depends=[ore reportr RNifti shades]; }; trade = derive2 { name="trade"; version="0.8.0"; sha256="1ly8mb1gm40v72lwk29l3g55f2clrcmvn5vgfijfnc4nq37j1h0j"; depends=[antitrust]; }; tradepolicy = derive2 { name="tradepolicy"; version="0.5.0"; sha256="1rjyx6mwqxgjprzll9908jgvl0q9dr8axjy6dp4fsxq2pvlnnz8m"; depends=[broom cli crayon dplyr ggplot2 lmtest magrittr msm purrr rstudioapi sandwich tibble tidyr]; }; + tradestatistics = derive2 { name="tradestatistics"; version="3.0.2"; sha256="18v9iq588fp1w8p72an51dargqa7vcgaln8wiz9d2a0sjhq0gxxk"; 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="1.6.2"; sha256="1q6r7q6k0rsx21bxp2vp4rnrjnslngwbv55kmrlmzn4mw61xh33q"; depends=[ada adabag dplyr dummies e1071 ggplot2 glmnet glue kknn MASS neuralnet nnet randomForest ROCR rpart scales stringr xgboost]; }; @@ -17781,19 +18068,19 @@ in with self; { traitdataform = derive2 { name="traitdataform"; version="0.6.7"; sha256="1p5m480k8da4k091jiryqry0zwg8kw3s1cvvpgqjmjkz3v11dxsd"; depends=[curl data_table getPass plyr RCurl reshape2 suppdata taxize units XML]; }; traits = derive2 { name="traits"; version="0.5.0"; sha256="04s2523wkbjqxpwllvcy7ikyfri5gldgnynjswsxdy0k945wacvz"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; }; traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; }; - trajeR = derive2 { name="trajeR"; version="0.9.0.3"; sha256="08r7201ccqg1p7qpjxfc310814sjhqrj7gf07vzz0xkmyigbjzr9"; depends=[capushe MASS minpack_lm numDeriv Rcpp RcppArmadillo ucminf]; }; + 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-3"; sha256="1k1fyjyng9mi3k5v6bpbv3vkqr7c9zjp4yiyynb3rjxqpn1fxx7k"; depends=[lattice sp spacetime zoo]; }; trajr = derive2 { name="trajr"; version="1.4.0"; sha256="092hx27b6d0vy1pvmga1z3b245aa9gn9aw3hszbhhkkic5zfpgbq"; depends=[plotrix signal]; }; - tram = derive2 { name="tram"; version="0.6-3"; sha256="0qrvl63n9mq6bwm4kif4rciw2ifwxx2bpsvfgxi6shjkv8vn3xdx"; depends=[basefun Formula Matrix mlt multcomp sandwich survival variables]; }; - tramME = derive2 { name="tramME"; version="0.1.2"; sha256="1s6s5m1xkzjchmiwvcgdx7w68igm2dy3wc61v5gd8ihv4l26ccd7"; depends=[alabama basefun coneproj lme4 MASS Matrix mlt mvtnorm nlme numDeriv RcppEigen TMB tram variables]; }; + tram = derive2 { name="tram"; version="0.6-4"; sha256="04vv1ydmcjc6rffl35a898jlc9lgvqrjnbc06k4krr0igq2s39ya"; depends=[basefun Formula Matrix mlt multcomp sandwich survival variables]; }; + tramME = derive2 { name="tramME"; version="0.1.3"; sha256="0gqvk15xk2wl12vlmshj9sz0qvih03wrbs700hkd1ifjlm2kjlnl"; depends=[alabama basefun coneproj lme4 MASS Matrix mlt mvtnorm nlme numDeriv RcppEigen TMB tram variables]; }; tramnet = derive2 { name="tramnet"; version="0.0-6"; sha256="034ij8ir5v31n22pig7v6qizmyhpar1mklifvcskg0ydmpy7qkj4"; 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]; }; tranSurv = derive2 { name="tranSurv"; version="1.2.2"; sha256="17rvzjcn76z5niw1jappiadbkf66a9x0m7p3251lgb7qrnvpx3gk"; depends=[rootSolve SQUAREM survival truncSP]; }; transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; }; transfR = derive2 { name="transfR"; version="0.1.1"; sha256="1pdacv0w5rf7vn6pbyydrjj1v6w8m36v1jaghb28xv3gn27308iy"; depends=[doParallel foreach Rdpack sf stars units]; }; + transforEmotion = derive2 { name="transforEmotion"; version="0.0.1"; sha256="1f4gv78dfbjyr42z908qc92giavhsbm05430c5adyicfpxwnpil7"; depends=[pbapply reticulate]; }; transformmos = derive2 { name="transformmos"; version="0.1.0"; sha256="1hsp399cj6cnsysb4hm4ra075qm2fxkjhyq16m3nai51fvzkak0p"; depends=[]; }; transformr = derive2 { name="transformr"; version="0.1.3"; sha256="1dn6h8i7vli2zv4408djyg74j9fv9sjrqf75hx9dh7qnj352wf69"; depends=[lpSolve Rcpp rlang sf tweenr]; }; - translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; }; translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; }; translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; }; transmdl = derive2 { name="transmdl"; version="0.1.0"; sha256="16lvcjwb7hq4a4925kqnas7c4xqw3gpbad3fcghp0qm4whyig8dg"; depends=[Rcpp RcppEigen statmod survival]; }; @@ -17810,11 +18097,12 @@ in with self; { treeDA = derive2 { name="treeDA"; version="0.0.5"; sha256="0rdqvjj16w7ykpxd6m800h4zv79y9c1phhkl14xy10gbi2cqh10g"; depends=[ape ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; }; 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.5.1"; sha256="1gwsprvr9yi67slrkxf34kbqvqkr4csaqkcdbdi1vwivn2nyb3py"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; }; + 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]; }; 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]; }; treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; }; treeman = derive2 { name="treeman"; version="1.1.4"; sha256="1rlq8sklvpj6an8x9wvs3501y6dpl2vhl5zfmz0yvmif04msf49v"; depends=[ape bigmemory plyr RJSONIO stringr]; }; @@ -17826,14 +18114,14 @@ in with self; { treespace = derive2 { name="treespace"; version="1.1.4.1"; sha256="177n1h4yjvfmdsyy4anwi1gfxcxxvhdlyqagn74ni3pi6mxvjp4s"; depends=[ade4 adegenet adegraphics adephylo 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.3"; sha256="0mmvn6521p4m7xranlzb9cg0gfzg5dzlack2k8xls5s3ydpylirx"; depends=[geometry lidR pryr raster rasterVis RColorBrewer rgdal rgeos rgl sf shiny sp spatstat_core spatstat_geom stars]; }; + treetop = derive2 { name="treetop"; version="0.0.4"; sha256="0lisrbmzkil723jwcj422zglr78lbryny02wmnaw7zv2w9gw3xac"; depends=[geometry lidR pryr raster rasterVis RColorBrewer rgdal rgeos rgl sf shiny sp spatstat_core 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]; }; tremendousr = derive2 { name="tremendousr"; version="1.0.0"; sha256="0jkhpb7q1kg8n2fjj7n3khzwdsz0kh9w7q2wd9xf5mn69066m3f1"; depends=[cli crayon crul jsonlite]; }; trend = derive2 { name="trend"; version="1.1.4"; sha256="1mr5g5gaxiqj6x83ngcbwwh57vhrhcz0x9dh0rmvs9y2ivk29ccs"; depends=[extraDistr]; }; - trendchange = derive2 { name="trendchange"; version="1.1"; sha256="19r0kmwsim78ynssyh6j0zd99cz96cacy3hmyrjabwwvz0f8sk3h"; depends=[]; }; + trendchange = derive2 { name="trendchange"; version="1.2"; sha256="0hsh45mr6az9gj2g8mc0nswarc8hwdv5zldmfvnkmh57rznbqpb3"; depends=[]; }; trendeval = derive2 { name="trendeval"; version="0.0.1"; sha256="1cpv7l26ia40s46wfi4jwhwzl0xxs0dgzv4ngg8frbv5l80fmvmr"; depends=[ellipsis rsample tibble tidyr trending yardstick]; }; trending = derive2 { name="trending"; version="0.0.3"; sha256="1crp8hizvasm47fjlf8pjy5jn7y9s16vm7dmpiyr4qb8sizia6xw"; depends=[ciTools MASS tibble vctrs]; }; trendsegmentR = derive2 { name="trendsegmentR"; version="1.1.0"; sha256="1r582zmxcdmq3sg5wd4zc2p1fv8sgbys5nryvvslak7nj5h0i2yq"; depends=[]; }; @@ -17860,11 +18148,11 @@ in with self; { 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=[]; }; triversity = derive2 { name="triversity"; version="1.0"; sha256="1bar2bpy8jvj91jmzzdwy6rlvirsbxrzqnx4r825irqhc69gc53r"; depends=[data_tree Matrix]; }; - troopdata = derive2 { name="troopdata"; version="0.1.4"; sha256="1sd7f1rm6i6z4kb1414gwkslg3p6yzns5xjap3kk5xi5ckqlbxsa"; depends=[dplyr magrittr rlang tibble]; }; + 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=[]; }; tropicalSparse = derive2 { name="tropicalSparse"; version="0.1.0"; sha256="1ay6i3pzz5lpvznxqln31mijp86p6z0df7rvp0gm4lxvn294m7f8"; depends=[]; }; trotter = derive2 { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; }; - trtf = derive2 { name="trtf"; version="0.3-8"; sha256="0zczfp2yznc11s2bf2k4lhggkmlsi5lyrkhxywp6jm9ygzq14wd9"; depends=[Formula libcoin mlt partykit sandwich variables]; }; + trtf = derive2 { name="trtf"; version="0.3-9"; sha256="0zbad1hpy4glwql0q5l5wn1s5lwpxdh7isxypn5nzwq83vpvcw2y"; depends=[Formula libcoin mlt partykit sandwich variables]; }; truelies = derive2 { name="truelies"; version="0.2.0"; sha256="1qxzw7x7xgp9x6klnq6jv0fl8al2l24br2sd59r5gq076gkqc47k"; depends=[hdrcde]; }; trueskill = derive2 { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; }; truh = derive2 { name="truh"; version="1.0.0"; sha256="0acsyzm6rpmzyq8pg33c631hi4xir49gqxbpshcrr6i2v3q6k14j"; depends=[cluster doParallel foreach fpc iterators Rfast]; }; @@ -17880,7 +18168,7 @@ in with self; { tryCatchLog = derive2 { name="tryCatchLog"; version="1.3.1"; sha256="0k40a48qzwmardjnkf0h5s5zryivzvdanz61kxdqdfqlil19ma0d"; depends=[]; }; ts_extend = derive2 { name="ts.extend"; version="0.1.1"; sha256="03b358nywx0zynb6006886mzvz1mbbaim6b5m641drklh6k0l6r1"; depends=[]; }; 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="10-1.2"; sha256="0wwp18qaxljdy1zqww1qw9fa9ycvgwcf6j52cpx3v2f2177x7snc"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; }; + tsDyn = derive2 { name="tsDyn"; version="11.0.2"; sha256="0dplrl4vknha2aa0h3vg0sivn2dm0h23my6y2gdghhplvzy0qaa4"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; }; tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; }; tsPI = derive2 { name="tsPI"; version="1.0.3"; sha256="00p7275iq8qn6c6dpqjr5s9fzc0a6njqqi9gvqnh5s9lfx9mbk1v"; depends=[KFAS]; }; tsSelect = derive2 { name="tsSelect"; version="0.1.8"; sha256="0ysijzhhwaj5n7h50jacshnla6d0h61q0f6lj19ic0lwvlz4yazy"; depends=[forecast]; }; @@ -17906,7 +18194,7 @@ in with self; { tsgui = derive2 { name="tsgui"; version="0.2.1"; sha256="0crm2ripxpjaz1cqz9lkj3y9xj4ia0hlq4lvz1rff0wq6d5w79dn"; depends=[RandomFieldsUtils tcltk2 tkrplot]; }; tsiR = derive2 { name="tsiR"; version="0.4.3"; sha256="0xzcfdad1z8336wnsrk9sy21psd898wwkdkndq7dshqwp2rj2kxl"; depends=[ggplot2 kernlab reshape2]; }; tsibble = derive2 { name="tsibble"; version="1.1.1"; sha256="172xb358q3fcfs9rdapllqwmw6yj6qx93bc9br6kfd437sk86rx6"; depends=[anytime dplyr ellipsis generics lifecycle lubridate rlang tibble tidyselect vctrs]; }; - tsibbledata = derive2 { name="tsibbledata"; version="0.3.0"; sha256="1lz3kx0r8h9d1flp3j0fsllrk4d7m312pk4w4jdv5p4l5f2sqmnx"; depends=[tsibble]; }; + tsibbledata = derive2 { name="tsibbledata"; version="0.4.0"; sha256="0f9gi8h49xc4xd38fg0s26p4xrkpxr4qfdfapk7p1vfszb31ihjd"; depends=[rappdirs tsibble]; }; tsibbletalk = derive2 { name="tsibbletalk"; version="0.1.0"; sha256="14j1gpimvlz9cgxgl1n68ngkqx4w2ai92782ifrpvc57lqy9cs7v"; depends=[crosstalk dendextend dplyr glue lubridate plotly R6 rlang shiny tsibble vctrs]; }; tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; }; tsmp = derive2 { name="tsmp"; version="0.4.14"; sha256="1ahqdizygbs49xbgn35fdb5drxwyx2z9ima4fm83aqwaan7wrrja"; depends=[audio checkmate doSNOW foreach magrittr progress Rcpp RcppParallel RJSONIO]; }; @@ -17916,7 +18204,7 @@ in with self; { tspmeta = derive2 { name="tspmeta"; version="1.2"; sha256="028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd"; depends=[BBmisc checkmate fpc ggplot2 MASS splancs stringr TSP vegan]; }; tsqn = derive2 { name="tsqn"; version="1.0.0"; sha256="1iv1wwa6a9824dbgfk5a609szppc3a8j250z74hb8csjvwwx9qq9"; depends=[fracdiff MASS robustbase]; }; tsriadditive = derive2 { name="tsriadditive"; version="1.0.0"; sha256="1zk97vz5ag6j0r8w3b5kgl2cx628jmdy73spmwmsw7x5yc24901d"; depends=[survival]; }; - tsrobprep = derive2 { name="tsrobprep"; version="0.3.1"; sha256="1j4y4zslfrrnzimr87fl9am4n8g4b29sqkf608rrqywa08pahsq7"; depends=[glmnet MASS Matrix mclust quantreg textTinyR zoo]; }; + tsrobprep = derive2 { name="tsrobprep"; version="0.3.2"; sha256="0y7h8kh721r859b7y5vxh4q7dmjlx50qcc6pib204x3hhzv1yyrc"; depends=[glmnet MASS Matrix mclust quantreg Rdpack textTinyR zoo]; }; tssim = derive2 { name="tssim"; version="0.1.7"; sha256="154snb0npy8zbkspp475nv9rvv1ls6rbgxz3jr152j79vsiis3ng"; depends=[dsa timeDate tsbox xts zoo]; }; tsutils = derive2 { name="tsutils"; version="0.9.2"; sha256="0gp8f0a9dn3h4lv38xiw04j832igwhfralzc5vd74r952x7b6hbx"; depends=[forecast MAPA plotrix RColorBrewer]; }; tsviz = derive2 { name="tsviz"; version="0.1.0"; sha256="099ga750kr9hrkd8vaxhz6h4gha6zfr9jzqwrmgms2h2h1a7jxr7"; depends=[dplyr forecast ggplot2 lubridate magrittr miniUI plotly shiny shinyhelper]; }; @@ -17925,7 +18213,7 @@ in with self; { tsxtreme = derive2 { name="tsxtreme"; version="0.3.3"; sha256="1725rkdq377z3c06hc2g9l0dwgfy5gz3pgygpz1pyy83s5c7j869"; depends=[evd MASS mvtnorm tictoc]; }; ttScreening = derive2 { name="ttScreening"; version="1.6"; sha256="1i8c9l3sdkzl99zxxyfqm84vkh6wjdh3a32l5q8ikf74g9dhxkf4"; depends=[corpcor limma MASS matrixStats simsalapar sva]; }; ttTensor = derive2 { name="ttTensor"; version="1.0.1"; sha256="0ryfxx4chnc10cl5h5cb4hnvzf2cm64k8m36l4qbjz4f1vkw0a36"; depends=[Matrix PTAk rTensor tensorr]; }; - ttbary = derive2 { name="ttbary"; version="0.2-0"; sha256="1231ssndf0a0b1g8sz8w5ckw7410c5qmflnsxmizc4v8iiscdibc"; depends=[Rcpp spatstat spatstat_core spatstat_geom spatstat_linnet]; }; + ttbary = derive2 { name="ttbary"; version="0.2-2"; sha256="1h3ly8vk5v9ggs2fhl0xql074wc1vxip7x8vm70pnqnx5xzg6dfi"; depends=[Rcpp spatstat spatstat_core spatstat_geom spatstat_linnet spatstat_random]; }; ttbbeer = derive2 { name="ttbbeer"; version="1.1.0"; sha256="1azffcizm3460kxvrxxkilc6qxspyi247x8drrw5ywfichwhmdhc"; depends=[]; }; ttcg = derive2 { name="ttcg"; version="1.0.1"; sha256="1kha6jp89r8qx5rycwlcl1dprw33j71yng03k9l7q3b7d4lz4bg5"; depends=[numDeriv]; }; ttdo = derive2 { name="ttdo"; version="0.0.8"; sha256="184rfmrd4y63j8i62w8cy7d6cqgvlhj8h6zgjzsvad9l6pq2hmb3"; depends=[diffobj tinytest]; }; @@ -17938,7 +18226,7 @@ in with self; { tuber = derive2 { name="tuber"; version="0.9.9"; sha256="1nnjwn3c0rr90jvkwlh9xs5vc2nl6qzjj958hbddfrkny0w88mnp"; depends=[dplyr httr jsonlite plyr purrr]; }; tubern = derive2 { name="tubern"; version="0.1.0"; sha256="0wpn4aig6r1kpncrgrqra4kr0f07rdq7z4p2k0h28f7kww6l52vv"; depends=[httr jsonlite]; }; tuckerR_mmgg = derive2 { name="tuckerR.mmgg"; version="1.5.1"; sha256="0lrylh0np0kbl4xx3gmlvid0g11fh0ad39wdwbz6hrmf5pzsjdjq"; depends=[]; }; - tufte = derive2 { name="tufte"; version="0.11"; sha256="1j0k9c9b8dqhrs1j6fn0lxzlz181776n3r6xchk1s8m6cij339ja"; depends=[htmltools knitr rmarkdown xfun]; }; + tufte = derive2 { name="tufte"; version="0.12"; sha256="1srnrqjw2d0pzl1gpd11m9s8p43hhb0mxm3yd260rvhbsn1x0hs0"; depends=[htmltools knitr rmarkdown xfun]; }; tufterhandout = derive2 { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[knitr rmarkdown]; }; tukeyGH = derive2 { name="tukeyGH"; version="1.0.0"; sha256="1nlhv8lyjaqq95l7j85bdqdrsphagwf69iq8g3ryyyckchirljjg"; depends=[magrittr minqa Rdpack rootSolve]; }; tukeytrend = derive2 { name="tukeytrend"; version="0.7"; sha256="15j7g0drb92rpxq7d0jl9h0hxpi9pbgpvfcxaicrcgypxap3721q"; depends=[lme4 Matrix mgcv multcomp nlme pbkrtest]; }; @@ -17949,7 +18237,6 @@ in with self; { 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]; }; - turfR = derive2 { name="turfR"; version="0.8-7"; sha256="007jmkppfv1x4zzvvd65fhg5k15ybjhsya2zfjgwm77wm34y81ca"; depends=[dplyr]; }; turner = derive2 { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; }; tutorial = derive2 { name="tutorial"; version="0.4.3"; sha256="0sxdlpw0w4azlaxdlk36ycrric6pbj2zi4nyv26pgsp0cr1hrx6r"; depends=[base64enc knitr markdown rjson]; }; tvR = derive2 { name="tvR"; version="0.3.2"; sha256="1i20z09f714fyn3ipcn9i5g4dx7cyjfkyjqzyqzqapkg0m9ny91m"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; }; @@ -17971,6 +18258,7 @@ in with self; { twfy = derive2 { name="twfy"; version="0.1.0"; sha256="14xxl9y8iagnn5jd06k6jyy4wk7crm64svz8h0zmzcvg47k8bwc7"; depends=[httr jsonlite]; }; twiddler = derive2 { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; }; twilio = derive2 { name="twilio"; version="0.1.0"; sha256="0b70vcc2bd5jpd2d82i2k828q90viah0b9abz2r627bbyxivpcnd"; depends=[httr jsonlite lubridate magrittr purrr]; }; + twinning = derive2 { name="twinning"; version="1.0"; sha256="02sa631np01cizzqqh25riqcw31qvszrfbws5h6xs31f7l9wlxdy"; depends=[Rcpp]; }; twitteR = derive2 { name="twitteR"; version="1.1.9"; sha256="1hh055aqb8iddk9bdqw82r3df9rwjqsg5a0d2i0rs1bry8z4kzbr"; depends=[bit64 DBI httr rjson]; }; twitterwidget = derive2 { name="twitterwidget"; version="0.1.1"; sha256="1dlhydhy69284gg3jsxwa6h8cp1rlkg1j8h8z1fjz4fyy1p5xrpv"; depends=[htmlwidgets]; }; twl = derive2 { name="twl"; version="1.0"; sha256="0n2r40ddsr5zpzi92k7f0lvq78k5cmfbqzjxvr78hwq6j13dhar3"; depends=[corrplot data_table MCMCpack Rfast]; }; @@ -17981,6 +18269,7 @@ in with self; { twoway = derive2 { name="twoway"; version="0.6.3"; sha256="02z2syb0g92d97gjxfkarpil9b2n25s128606h071jl0s88cr4ar"; depends=[]; }; twowaytests = derive2 { name="twowaytests"; version="1.1"; sha256="00wz8l4ginv1pp1dbjwqbmn4q8i8fnmhz8x3v6riffndw5ag22f2"; depends=[car ggplot2 nortest onewaytests]; }; twoxtwo = derive2 { name="twoxtwo"; version="0.1.0"; sha256="03wrxzjv21df5c8w9bixfw42m82yf9grv1c4nlw5dy09lsfhl8sv"; depends=[dplyr forcats knitr magrittr rlang tidyr]; }; + txshift = derive2 { name="txshift"; version="0.3.8"; sha256="0lniwb7lijcasqmhs1zryb9wqf5xka13q4yb9m2j8dblb51y3i79"; depends=[assertthat data_table ggplot2 hal9001 haldensify latex2exp lspline mvtnorm Rdpack scales stringr]; }; txtplot = derive2 { name="txtplot"; version="1.0-4"; sha256="00sriml48y70j18jz235dsfm5x3a81bnzskfp3hnv6cbjwwsmca4"; depends=[]; }; txtq = derive2 { name="txtq"; version="0.2.4"; sha256="1fvjprcwfqbw9c4sqcxv8r0jgvqmkip6d86r3cgrhwyic1ndk1l5"; depends=[base64url filelock R6]; }; typed = derive2 { name="typed"; version="0.0.1"; sha256="096rzsxjdycf55jx33cxk1284rzb2vcxvp298y4q6v9x0w36php3"; depends=[waldo]; }; @@ -17990,7 +18279,7 @@ 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.0"; sha256="1n8ishsldfmqdbxz719gakrngrqr9bj7fzddq2ri86yj9krfgas1"; depends=[Brobdingnag gsl pbapply]; }; + uGMAR = derive2 { name="uGMAR"; version="3.4.2"; sha256="1lj08iz59z7qzmhf77m2v9jh99zycggpd7fma02zyn0jvnpigh6w"; 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.5.7"; sha256="04dv1a72b0v8lgdwl10n96953gfal6pmbbih45szdvk4zhks030j"; depends=[brew data_table exifr geosphere jsonlite link2GI log4r raster rgdal rgeos rlang rlist sf sp zoo]; }; @@ -17998,12 +18287,13 @@ in with self; { ubms = derive2 { name="ubms"; version="1.1.0"; sha256="016rdjba3h2hm6ps4jrnqzy1hwm0nmn3yq922dbfw8396qvmr2zf"; depends=[BH ggplot2 gridExtra lme4 loo Matrix pbapply Rcpp RcppArmadillo RcppEigen RcppParallel RSpectra rstan rstantools StanHeaders unmarked]; }; ucbthesis = derive2 { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; }; uchardet = derive2 { name="uchardet"; version="1.1.0"; sha256="1dnvi45npk7l7sqbv3c1mrg0m7vrrp7iya9kjndcg9x3h0iial9z"; depends=[]; }; - ucie = derive2 { name="ucie"; version="1.0.0"; sha256="02dk8r96dgi35qxr20s64jrsxaivj5mvwb22bgyjg8yrbwmwzf88"; depends=[colorspace dplyr geometry pracma ptinpoly remotes rgl]; }; + ucie = derive2 { name="ucie"; version="1.0.1"; sha256="1bi55zw2niv8qixsihwjibfi3k22kvsbi8gcbwxwh93l1mcgicx9"; 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.1-4"; sha256="01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2"; depends=[]; }; udapi = derive2 { name="udapi"; version="0.1.3"; sha256="0qyn6fdh8ia913hn2dl0x99xsm20ps8zm52snswlyb00prinm668"; depends=[curl httr]; }; udpipe = derive2 { name="udpipe"; version="0.8.8"; sha256="0bjl3l652lmq6yyhpc4nyhqgjb0drzk4ppmx4i9m0rrwrf997d9b"; depends=[data_table Matrix Rcpp]; }; - udunits2 = derive2 { name="udunits2"; version="0.13.1"; sha256="1l889f8iy8qaacxfs6ll62d6hs8g8qsr5ynn24grpvp8dk8l888w"; depends=[]; }; + udunits2 = derive2 { name="udunits2"; version="0.13.2"; sha256="0sarkw5ciafiaq1haam8d8w0cmai63wrw2m4rcbjfa5k0648j07f"; depends=[]; }; + ufRisk = derive2 { name="ufRisk"; version="1.0.3"; sha256="0gqc5faf96pj8pgwddvcbgbp52sai9mscaxp20gx2xgx7zp66l89"; depends=[esemifar fracdiff rugarch smoots]; }; ufs = derive2 { name="ufs"; version="0.5.2"; sha256="1lqnib0pizx97isqbr4v2r4qp7fph6znbd5arbjnxmlh2wblfbsl"; depends=[digest diptest dplyr ggplot2 ggrepel ggridges gridExtra gtable htmltools kableExtra knitr pander plyr pwr rmdpartials scales SuppDists]; }; ugatsdb = derive2 { name="ugatsdb"; version="0.2.2"; sha256="0f5fgys80b5nlj5f8jadh5jpylhhb5hsknrsspfac5amncmb0yyv"; depends=[collapse data_table DBI RMySQL writexl]; }; ugomquantreg = derive2 { name="ugomquantreg"; version="1.0.0"; sha256="1a5vc1qgy3kp1by5bp296w980lkxcghzzxibhap2jg06jnzjfcq8"; depends=[gamlss gamlss_dist pracma Rcpp]; }; @@ -18033,7 +18323,7 @@ in with self; { uniReg = derive2 { name="uniReg"; version="1.1"; sha256="0wjc7pgaisvk26j7grxp2ypsabb5my9wg6c9i5w9zhh5jdx1fdab"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; }; uniah = derive2 { name="uniah"; version="1.0"; sha256="19zwy33gwa749i81mi9h05k8k3l4xbbln3k6q70fa7ic5lqbbdzj"; depends=[ahaz Iso survival]; }; unifDAG = derive2 { name="unifDAG"; version="1.0.3"; sha256="052qjrnj04imhj6i62k8jdx9rs8r70n0qrmd2z45x4fimn5py6j5"; depends=[gmp graph]; }; - unifed = derive2 { name="unifed"; version="1.1.5"; sha256="1gc5ny878i1rsr6hxjrf22pgkz1p3him464h2ax6lpidif4d1nbh"; depends=[]; }; + unifed = derive2 { name="unifed"; version="1.1.6"; sha256="0wy2hasgkzw08l50qq30wb62i1q4skc3zccipv8pm911qlldk3sr"; depends=[]; }; uniformly = derive2 { name="uniformly"; version="0.1.0"; sha256="0n3s0x05v4d79jn51nwj06gm074rgy269f57y2q5z0bkwyp6yc7n"; depends=[pgnorm]; }; uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; }; unikn = derive2 { name="unikn"; version="0.4.0"; sha256="0pqkb48rsjl9zny0y1plcnfvzaaqy2cwpgii2pdhh4rfg2ps2n4l"; depends=[ggplot2]; }; @@ -18042,12 +18332,12 @@ in with self; { unisensR = derive2 { name="unisensR"; version="0.3.3"; sha256="1pqfb8i3rj64l9hh1bn9mm78wlfqphgrlp7zrydznqy88f4jwgvy"; depends=[hexView vroom XML]; }; uniset = derive2 { name="uniset"; version="0.2.1"; sha256="1l7a3qv7sa1kbk5r2qxbc0b69s80l0a56g93x1fv6lyx33ghkfb6"; depends=[easycsv]; }; unitedR = derive2 { name="unitedR"; version="0.4"; sha256="0h4i814awb8419693jz3x5cyhs2x6y5flmz339bg6ivmg13d9h3s"; depends=[plyr]; }; - unitizer = derive2 { name="unitizer"; version="1.4.15"; sha256="0n47bksrwyj7pbyzh8hs25nmvmhvdnafjzs94y5ang4hw0is0cpc"; depends=[crayon diffobj]; }; - units = derive2 { name="units"; version="0.7-2"; sha256="1ss0f15h4yqzk488ilsa5d2ibrj3wzwplx4160mn600i8ciy02xr"; depends=[Rcpp]; }; + unitizer = derive2 { name="unitizer"; version="1.4.17"; sha256="1fyqsqnqm0jk31qd2kny2pi7j5z0a4w9lyxnpmg98bc0zi3w6fbq"; depends=[crayon diffobj]; }; + units = derive2 { name="units"; version="0.8-0"; sha256="06mjprqi06xprj6185k5cmrrdl025x0pd1r6a4x3s74ciq9zwilw"; depends=[Rcpp]; }; unittest = derive2 { name="unittest"; version="1.4-0"; sha256="1wyiikccnkw8fzrjrb2a80lw2xyiii4zb0hrbzfszy2bd6prqxx4"; depends=[]; }; univOutl = derive2 { name="univOutl"; version="0.3"; sha256="1hhpxrpmp2wbrynx9xjndnp2sccirgky2x6ksd6yk6phmk0rbzjp"; depends=[Hmisc robustbase]; }; unival = derive2 { name="unival"; version="1.1.0"; sha256="0j7fl77my2273k72s8k9v5pcb85swxfipjxmk4vw487i7aq8b1nq"; depends=[psych]; }; - univariateML = derive2 { name="univariateML"; version="1.1.0"; sha256="1bnpb1g6hm8p3q73kyb4mxijzj53cfp38ns98bq12m9yvsjq1c4n"; depends=[actuar assertthat extraDistr fGarch logitnorm nakagami tibble]; }; + univariateML = derive2 { name="univariateML"; version="1.1.1"; sha256="0a4h19hmw0k2x5yqs92xp48r2srycv4sax97p7gci8hahjw8qzdf"; depends=[actuar assertthat extraDistr fGarch logitnorm nakagami tibble]; }; universals = derive2 { name="universals"; version="0.0.4"; sha256="1dx7xh5l2dkamskpwfc9qsjf7df1fj54ph6s3sxhnhdbppzckd4d"; depends=[]; }; unix = derive2 { name="unix"; version="1.5.4"; sha256="0wj85h5lljzw4qj4ry79y05gd6vakqff8lzw9f70154i79jq74hl"; depends=[]; }; unjoin = derive2 { name="unjoin"; version="0.1.0"; sha256="1hp9fxkb59z0cpnwxpaf5whglrljg2nrmsygdb98klxsama9gr5z"; depends=[dplyr rlang tibble]; }; @@ -18061,10 +18351,8 @@ in with self; { untb = derive2 { name="untb"; version="1.7-4"; sha256="1i7m4vfslsix98dwx4jlrsldm7fhhfp25gr7aapcxqxms7ryaby6"; depends=[Brobdingnag partitions polynom]; }; unusualprofile = derive2 { name="unusualprofile"; version="0.1.0"; sha256="0dasknh8hwbvc530d8i0xfizqxygrlz3w2bdnsgdd9sf84flqajl"; depends=[dplyr ggnormalviolin ggplot2 lavaan lifecycle magrittr patchwork purrr ragg rlang scales simstandard tibble tidyr]; }; unvotes = derive2 { name="unvotes"; version="0.3.0"; sha256="1vfyvwqfbxp29x2a0sqng6l5pkp2hc3hadp95ysnpannnsd6x0jw"; depends=[]; }; - updog = derive2 { name="updog"; version="2.1.1"; sha256="0d5jimrsl30abi2y6023dvrnwcvygn73rzbk8agrklalg260razx"; depends=[assertthat doFuture doRNG foreach future ggplot2 ggthemes iterators Rcpp RcppArmadillo reshape2]; }; - uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; }; - uplifteval = derive2 { name="uplifteval"; version="0.1.0"; sha256="1gnn40c47rpx40j210bz6fb48d70p6spv3drr8hd5b3vzfz6686c"; depends=[dplyr ggplot2 gridExtra whisker]; }; - upsetjs = derive2 { name="upsetjs"; version="1.10.10"; sha256="0cg1d1r7gxl7lq8dzzvz8a371n1c1ixzcb0k7rad0r2h1qmadkhi"; depends=[htmlwidgets magrittr]; }; + updog = derive2 { name="updog"; version="2.1.2"; sha256="0v8a5vlyv1gabjkxj5fnx05pfm1fqf549895gx6gsyzy2iz1652g"; depends=[assertthat doFuture doRNG foreach future ggplot2 ggthemes iterators Rcpp RcppArmadillo reshape2]; }; + upsetjs = derive2 { name="upsetjs"; version="1.10.11"; sha256="0wmd0hxa51d1aw7gglnkzcn8famrnrybypdaml7wi6yxgjy4wa5s"; 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]; }; @@ -18074,7 +18362,7 @@ in with self; { urlshorteneR = derive2 { name="urlshorteneR"; version="1.5.1"; sha256="0vcjjb3r4cmfp5i0zcm3bmn6q4i4xazz1m994yka4gp34zqbz67n"; 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.4"; sha256="1dnqwyw1xmgsb064spynqisyx503nqqq427qvc85fbp0qrhi631l"; depends=[jpeg png rgdal]; }; + ursa = derive2 { name="ursa"; version="3.9.6"; sha256="19bc8sihvyrj4k8wj172b14kknzl5v7y4mpcv97f0pwij3ak7hhc"; depends=[jpeg png rgdal]; }; 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]; }; usdampr = derive2 { name="usdampr"; version="1.0.1"; sha256="0x84hzsylg22jhvhn4xhkzv4g8j17g73cpj274n7f8cwzcmpj9sx"; depends=[dplyr httr jsonlite tidyr]; }; @@ -18084,20 +18372,21 @@ in with self; { usedist = derive2 { name="usedist"; version="0.4.0"; sha256="0ddf1zcalbrn293qmr9kdzz3x16fzc4k1bwb1pjmwnspisqfi8kj"; depends=[]; }; 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]; }; - usemodels = derive2 { name="usemodels"; version="0.1.0"; sha256="17cnjg7vw3f2jxkqlfvxh6kn891h49waf5k5a5vb4yaa2ay6nhp3"; depends=[cli dplyr purrr recipes rlang tidyr tune]; }; + usemodels = derive2 { name="usemodels"; version="0.2.0"; sha256="1dc74v4dnbj532cdphskm0y7sqgq1q4yzq634dbvq2bjpqdzf3si"; depends=[cli clipr dplyr purrr recipes rlang tidyr tune]; }; usethat = derive2 { name="usethat"; version="0.3.0"; sha256="0i6nw3vgll6i31l95iflhq88ssw86pmz46jgw8g6k6f58rgnykmc"; depends=[microservices purrr usethis withr]; }; usethis = derive2 { name="usethis"; version="2.1.5"; sha256="0lph2rxv7nq3h022gp8d50wbq5lwicnx85d2l5dx876wxhb9wlvx"; 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]; }; uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; }; usl = derive2 { name="usl"; version="3.0.0"; sha256="1ahry485kpzfc0pzi4zm039d5mpv1jycmhdpn0n0zn0drcrlhw0g"; depends=[nlsr]; }; - usmap = derive2 { name="usmap"; version="0.5.2"; sha256="0p9f2g3nslxhvm8q7zwwfdw892fxnikr1x06z6rxnkibm4k48dj0"; depends=[]; }; + usmap = derive2 { name="usmap"; version="0.6.0"; sha256="1jdn9rl6kkfmr9d6wrg1673nr7xh5h14ynv2mx64xcn581c9jzis"; depends=[usmapdata]; }; + usmapdata = derive2 { name="usmapdata"; version="0.1.0"; sha256="13a4bj6ixqzfwm60r2c3i9zy96mr2hk77n720zs5i0i16acfnxav"; depends=[]; }; 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.2"; sha256="1x6qg19z4qih9lk3mvnmx0vailm1khp5lylw4hlwz6rssj3yw6m7"; depends=[]; }; utile_tables = derive2 { name="utile.tables"; version="0.2.1"; sha256="0bj3rg4f9dby7qzf0m95dg626ws4nz5v2vn3m50x8g3pqq8m7lmp"; depends=[dplyr purrr rlang tidyselect utile_tools]; }; - utile_tools = derive2 { name="utile.tools"; version="0.2.6"; sha256="1l3l6x37290ism459kjfbgm2s0w7sa84q93nzrij1z250gv6g0rp"; depends=[lubridate purrr vctrs]; }; - utile_visuals = derive2 { name="utile.visuals"; version="0.3.0"; sha256="1653wds2126b82bfm22a17xgrkybw6an5j3apg53ag5ykak9pg87"; depends=[dplyr ggplot2 gridExtra purrr]; }; + utile_tools = derive2 { name="utile.tools"; version="0.2.7"; sha256="1hclxfq7ccrhsirpnpl3kpybd2zn4dc4pk49adqfik5lg9xi8kxh"; depends=[lubridate purrr vctrs]; }; + utile_visuals = derive2 { name="utile.visuals"; version="0.3.1"; sha256="1j13pvzgi8rv38clxl421ji3c47vg8scragg246xpgmd24yk64a5"; depends=[dplyr ggplot2 gridExtra purrr]; }; utilities = derive2 { name="utilities"; version="0.4.0"; sha256="0wyi4qs1lzqdjqkx06xn73fcv25mgqax02zqv15cjvblgq4lil35"; depends=[]; }; utility = derive2 { name="utility"; version="1.4.5"; sha256="0a11bxyg8la6yvxr04qbhay05jb2ihd7calc1zcisgj43kq6k7xd"; depends=[]; }; utilityFunctionTools = derive2 { name="utilityFunctionTools"; version="0.1.1"; sha256="1225nl83yka31j0adm1210kc89vs3hi9i2pqrykax109sgk0nw97"; depends=[spatstat_geom]; }; @@ -18105,6 +18394,7 @@ in with self; { 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.0-3"; sha256="0il35jnci537r8zkinyiy5jp5q530p85ln6dswpj884zclrlcvj5"; 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.11"; sha256="06ylzxmdh8jipbrzgqaiivd2lnqmbcva41cyvc0iyals6vqr1ksg"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppProgress RSpectra]; }; vICC = derive2 { name="vICC"; version="1.0.0"; sha256="13lcs7wwj1xfbjf3q7r8ssf00jg5hr1vjp2pyw0r42iz7mx47xjv"; depends=[coda ggplot2 nlme Rdpack rjags]; }; @@ -18129,18 +18419,19 @@ in with self; { valr = derive2 { name="valr"; version="0.6.4"; sha256="0dd41irvibh6rwi52bw4zg4m7wpyihlp1kdkb8fdji3csw2fiz4k"; depends=[broom dplyr ggplot2 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]; }; - valuer = derive2 { name="valuer"; version="1.1.2"; sha256="0mbwzsvy34ppngyxdzpd9w1r4f00cik4maqab9kpiflrrv9xdp78"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; }; + valuemap = derive2 { name="valuemap"; version="2.0.0"; sha256="03n2jlmd80yi07vcnp0yjbr94dizf4in5hcqyhh70dl26i6qbmck"; depends=[devtools dplyr h3jsr htmltools leaflet sf]; }; vamc = derive2 { name="vamc"; version="0.2.1"; sha256="04kkli4xzf3gzvs215lzch8bl877cdq3awh3mz1k321zhsa1d0jn"; depends=[Rdpack]; }; vampyr = derive2 { name="vampyr"; version="1.1.1"; sha256="137sdv4shmjg1cpndjknrys2jkvyq3p9l11nrdh0bzp9xxc1wkh1"; depends=[corpcor EFA_MRFA fungible GPArotation lavaan moments PCovR psych semPlot]; }; + vandalico = derive2 { name="vandalico"; version="0.0.1"; sha256="0ipx9yq5wgpwphy1wzpa8jh605k3b5nkhplj4k0bym107010s3qd"; depends=[ROCR]; }; vanddraabe = derive2 { name="vanddraabe"; version="1.1.1"; sha256="094kd72slq0n3pk0p6zps241aszb9yql49h4mr007zf0kn8wlf8v"; depends=[bio3d cowplot fastcluster ggplot2 openxlsx reshape2 scales]; }; - vannstats = derive2 { name="vannstats"; version="1.2.1.3"; sha256="05kakmiadggjylcj1kqvdp4idz4dk75rj9djkyi3gxd904v48q43"; depends=[car dplyr formula_tools ggplot2 gplots MASS purrr rlang rstatix stringr tidyverse]; }; + vannstats = derive2 { name="vannstats"; version="1.2.2.27"; sha256="0ixad5934fpfyz831vc14300fkyyc95ia87w5jcqmk0l40sks4d7"; depends=[car dplyr formula_tools gdata ggplot2 gplots MASS purrr rlang rstatix stringr tidyverse]; }; vanquish = derive2 { name="vanquish"; version="1.0.0"; sha256="01di1j36npl7vnyhgsagvyf6j8bxcw867dwf9dgi7l1328s7lf0l"; depends=[changepoint e1071 ggplot2 VGAM]; }; vapour = derive2 { name="vapour"; version="0.8.5"; sha256="14sxn4vdig31vflrbyzpkqfwdcf9xj468wxd7yicvca0ibmr80yf"; depends=[Rcpp]; }; varEst = derive2 { name="varEst"; version="0.1.0"; sha256="0i6nsxl5w4zipzrmdvx8plmxr33n405w2qhks3s7zzs3kcys32v6"; depends=[caret glmnet lm_beta SAM]; }; 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.2.0"; sha256="0n1ph7y4w663kcfb1ylh2i8a0w3iqphmw41x64rxb42db5cijpvw"; depends=[alabama anocva corpcor doParallel foreach lme4 lmeresampler Matrix merDeriv msm mvtnorm nlme quadprog saemix]; }; + varTestnlme = derive2 { name="varTestnlme"; version="1.3.1"; sha256="0ql278pbifxkkz560yd9swlky322yb4bwyb043x9kf86fhf6njvj"; depends=[alabama anocva corpcor doParallel foreach lme4 Matrix merDeriv msm mvtnorm nlme nlmeU purrr 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.5-16"; sha256="0pji7vqpbih01y7n0q6zpxhfszznzig4z3hmmpr4jqpdplv13x8d"; depends=[lattice latticeExtra Matrix nor1mix Rcpp]; }; @@ -18166,7 +18457,7 @@ in with self; { vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; vccp = derive2 { name="vccp"; version="0.1.1"; sha256="1c0mk46c74kj5y9rfniywbxxmwb2z16szzpq6b2sw8q0qi1cf5ji"; depends=[mosum mvtnorm VineCopula]; }; vcd = derive2 { name="vcd"; version="1.4-9"; sha256="13sn77qdcyll9lz7nab0bxzfvpgj8f5rl2cq5ylpz8pibynj1d55"; depends=[colorspace lmtest MASS]; }; - vcdExtra = derive2 { name="vcdExtra"; version="0.7-5"; sha256="0f822xmgw4iyzyz2p9bwiklj9b6faa2wy632p2895h1grgvnnxmd"; depends=[ca gnm MASS vcd]; }; + vcdExtra = derive2 { name="vcdExtra"; version="0.7-6"; sha256="1y8yzy5686hn4pp10pg2kh5ga3z60h1849a3didl0fayvml6091q"; depends=[ca gnm MASS vcd]; }; vcfR = derive2 { name="vcfR"; version="1.12.0"; sha256="0lhxb3ac4fafwik9q3cds46svzf0hyca8k54chw3dpk50c0zz1yx"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble vegan viridisLite]; }; vcmeta = derive2 { name="vcmeta"; version="1.0.0"; sha256="18jg3kqdk9162qvhkmrvq0j86nq82iwws20wrfgb4hy1w63bzfz3"; depends=[ggplot2 mathjaxr Rdpack]; }; vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; }; @@ -18186,12 +18477,12 @@ in with self; { 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.5-7"; sha256="0aj6m9l1vkh32sar6fyvq4p8j4h2f2f347w1300qnzgaa5lmhfz6"; depends=[cluster lattice MASS mgcv permute]; }; vegan3d = derive2 { name="vegan3d"; version="1.1-2"; sha256="01yyhrapdvs6rr5hw1ij4jnpz7mq005s35pn96snpy8ngn6ir386"; depends=[cluster rgl scatterplot3d vegan]; }; - vegawidget = derive2 { name="vegawidget"; version="0.3.3"; sha256="0pyfj7ahz65pxcrf6vr8rl2zw1b7w5d6lvmcxsm1c81xw64xpc1n"; depends=[assertthat digest glue htmltools htmlwidgets jsonlite magrittr rlang]; }; + vegawidget = derive2 { name="vegawidget"; version="0.4.1"; sha256="1rlx090vkvxizwfzcxbsxw5a0swgl3xp7v9d1d9r5v6m9yzam7k3"; depends=[assertthat digest glue htmltools htmlwidgets jsonlite magrittr rlang]; }; vegclust = derive2 { name="vegclust"; version="2.0.0"; sha256="1zxgkq4ymg3w2dccfr448nmxp2kl7ws206djl2ymsrvzigivfqgs"; depends=[MASS sp vegan]; }; - vegdata = derive2 { name="vegdata"; version="0.9.8"; sha256="05sgmas7hlhxx2j95b4r5y2m6hhxa2cswy80bhs8lmjmy3yqyig6"; depends=[foreign plyr xml2]; }; + vegdata = derive2 { name="vegdata"; version="0.9.10"; sha256="1n2569mq4mmdyv8ilx4k9ccmdaycnsw6r438mvr43gdfwzsvn9v2"; depends=[curl DBI dbplyr dplyr foreign hoardr httr magrittr plyr RCurl readr rlang RSQLite tibble xml2]; }; vegperiod = derive2 { name="vegperiod"; version="0.3.1"; sha256="178zp7hw7bicygzl4ql0a9llkmrk4kyszcvvl430pvsc5y6srg75"; depends=[]; }; vegtable = derive2 { name="vegtable"; version="0.1.7"; sha256="1rxc2f4w51p4gr30p56n3shwvknlbqb8wczbs2xxvcf1f823yn38"; depends=[foreign knitr qdapRegex sp stringi taxlist vegdata]; }; - vein = derive2 { name="vein"; version="0.9.4"; sha256="15nipn6z0kladqzki3zryh3gmrljjcbvg075fmxcq4sw6hndr2qg"; depends=[cptcity data_table dotCall64 fields sf units]; }; + vein = derive2 { name="vein"; version="0.9.5"; sha256="1cqm6phr627yplvq7zjzcrk7gdv7lyh16b4yvlqh6zagamib9ph3"; depends=[cptcity data_table dotCall64 fields sf units]; }; 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.10"; sha256="1r31z6s384mcrjqxm9818mvc7v23ir26wcix5lc831fwihajlhk5"; depends=[admisc]; }; @@ -18205,7 +18496,7 @@ in with self; { versionsort = derive2 { name="versionsort"; version="1.0.0"; sha256="0inyzs6y4dsxwyfpwl90rqx11dyc3j3n4347zyqvyqp5icg7x5m0"; depends=[]; }; vertexenum = derive2 { name="vertexenum"; version="1.0.2"; sha256="16ywz3z1kzhb3knhhi2i5igm3djdaaxyyrw69wkc5saa7ayhdb4y"; depends=[numbers]; }; vesselr = derive2 { name="vesselr"; version="0.2.1"; sha256="1wzprnpiv04gxhqgki36gp1a0xj9l3mchllphwkfsdja4axq3prk"; depends=[oro_nifti pbapply pbmcapply]; }; - vetiver = derive2 { name="vetiver"; version="0.1.0"; sha256="0fmlff09mvg9j81vmnmyas5mj52i0fxkc3nxkf10y628x1xa3mrz"; depends=[butcher cli glue hardhat httr jsonlite pins plumber purrr rapidoc readr rlang tibble vctrs withr]; }; + vetiver = derive2 { name="vetiver"; version="0.1.3"; sha256="1yn4vhnkgqqgzkbg2qjpf8n3pm2xdx2p8plxb4y1xffbpzsspjan"; depends=[butcher cli curl generics glue hardhat httr jsonlite lifecycle pins plumber purrr rapidoc readr renv rlang tibble vctrs withr]; }; vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; }; vetr = derive2 { name="vetr"; version="0.2.13"; sha256="0wbhi5wzwvvp645dg8na8mh1yxvvfzwdm34xqrqkzh6cvlvlby4c"; depends=[]; }; vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; }; @@ -18221,16 +18512,15 @@ in with self; { vimp = derive2 { name="vimp"; version="2.2.5"; sha256="13461pcvyc6rad1rf2ymmkyzcwjxw7g4fs8qd51baljhjnjmifv0"; 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.0"; sha256="1v0bk9xm8547g76nd0v4n5wn6v4kagyd5ssqmlpc2768ldmcn64f"; depends=[assertthat BH kde1d Rcpp RcppEigen RcppThread rvinecopulib wdm]; }; + vinereg = derive2 { name="vinereg"; version="0.8.1"; sha256="0aqf6phgbs74zzjylkya9mj6ak9h53jji037p5m225wgm11nlq50"; 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.0"; sha256="02hyc85bmpc4lzpy4yay73gz4v00wns1ghkkf9sljl3kdgybmyi2"; depends=[]; }; vioplot = derive2 { name="vioplot"; version="0.3.7"; sha256="1dmdasp3jldc41233z6r08w3j76vyyp9m3jrj7n4ahk48yd5siq6"; depends=[sm zoo]; }; - viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; }; vip = derive2 { name="vip"; version="0.3.2"; sha256="1qsvyfms79sn46jdmq7q5r0d6gwjqhr9pll1y776rx0bj7vx1ax5"; depends=[ggplot2 gridExtra magrittr plyr tibble]; }; vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; }; viridis = derive2 { name="viridis"; version="0.6.2"; sha256="048kwhbhd49g86cq11fl7vm0whwhjl5gs9xjn040lwcjv78qrdb9"; depends=[ggplot2 gridExtra viridisLite]; }; viridisLite = derive2 { name="viridisLite"; version="0.4.0"; sha256="0siwr0vq80gs3sbyd542zjb0cl9av5zqdm0fqnym5g6ribf5b6c4"; depends=[]; }; - virtualPollen = derive2 { name="virtualPollen"; version="1.0.0"; sha256="16q1smwh3ryids3pa7lb4i4pxmjjyl449w6fikkrm9ybj1k8gfcf"; depends=[cowplot ggplot2 mgcv plyr tidyr viridis]; }; + 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]; }; 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]; }; @@ -18239,7 +18529,7 @@ in with self; { visStatistics = derive2 { name="visStatistics"; version="0.1.1"; sha256="0lp6sf2wrjjp1zh77yhlgr9sfpls54z0bny0l36v98ik4qykky0f"; depends=[Cairo multcompView nortest vcd]; }; 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]; }; - visachartR = derive2 { name="visachartR"; version="1.1.1"; sha256="1qj0ma9dai1q1khwh0cckhi0r6jqbpm2qr6fhlv2skz19s2hvzjs"; depends=[htmlwidgets]; }; + visachartR = derive2 { name="visachartR"; version="2.0.1"; sha256="0kwj8dq6r3rbv3s01dpgnw44ngpchx4rxmykmwff949yck691952"; depends=[htmlwidgets]; }; visae = derive2 { name="visae"; version="0.2.0"; sha256="0ycwb380z8nb646w7w42952lwvdi8prmph7yv1lraswvp4wjfx3p"; depends=[ca dplyr DT ggplot2 ggrepel magrittr rlang shiny shinyjs tidyr]; }; viscomplexr = derive2 { name="viscomplexr"; version="1.1.1"; sha256="1b45yi5xv4vq52pfa064ll3ghxgkwpbknzq94gg60vcvb7spd0if"; depends=[doParallel foreach plotrix Rcpp Rdpack scales]; }; visdat = derive2 { name="visdat"; version="0.5.3"; sha256="1ikqp29nncbw1xlwyb9dqqgcdk9q0bs3wxhnhnjpb11vcjv7cz2j"; depends=[dplyr ggplot2 glue magrittr purrr readr tibble tidyr]; }; @@ -18247,7 +18537,7 @@ in with self; { visreg = derive2 { name="visreg"; version="2.7.0"; sha256="070yhyxxh3w16i54k790n47bgcjn4b10b6g1z553x6afjc3l3a6d"; depends=[lattice]; }; vistime = derive2 { name="vistime"; version="1.2.1"; sha256="0fdjbzdwsy6fby6rf8l940qwdkbs43is0jy7xkf6gg6vlgc9jgni"; depends=[assertive_types ggplot2 ggrepel plotly RColorBrewer rlang]; }; vistributions = derive2 { name="vistributions"; version="0.1.2"; sha256="1nzkbyqks38n7gp55iqhrlxqyfwxk4fvqzi9vsb45h0m0hlmwhxr"; depends=[ggplot2 magrittr]; }; - visualFields = derive2 { name="visualFields"; version="1.0"; sha256="017djw2k9h9dqrndmij061ihjfyx2fdady1vbip09683lyqhggfi"; depends=[boot combinat deldir dplyr DT gtools Hmisc htmlTable oro_dicom plotrix polyclip pracma rlang shiny shinyjs XML]; }; + 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.3"; sha256="01mpiyc893sx8zhx6ddzhdqcgsssz516s4wm0sfkh5fpaz6h1mn5"; depends=[Cairo DT formattable ggdendro ggplot2 ggrepel MASS PBSmapping plot3D plyr pracma psych Rdpack readxl Rtsne shiny shinyBS shinybusy splitstackshape svglite tidyr tikzDevice WriteXLS]; }; @@ -18257,11 +18547,12 @@ in with self; { vitality = derive2 { name="vitality"; version="1.3"; sha256="17micfmlksnw167vavvhlk431fm20k74y5ggs47pgz5fwpm854zp"; depends=[]; }; vivid = derive2 { name="vivid"; version="0.2.3"; sha256="1kqh9skcafng0wcbb2vqdlba7ix3mjhqd2r51npv1ys3p20jrrmw"; depends=[colorspace condvis2 DendSer dplyr flashlight GGally ggalt ggnewscale ggplot2 igraph RColorBrewer tidyr]; }; vivo = derive2 { name="vivo"; version="0.2.1"; sha256="1cfval06byviw7himr5nql34h4jaway9gb6dzya3v994p7v851cg"; depends=[DALEX ggplot2]; }; - vizdraws = derive2 { name="vizdraws"; version="1.1"; sha256="19lr55swfnl79pdkybgfbkm0pvx60x64rlya0wkhdijbizyr1jvb"; depends=[dplyr glue htmlwidgets magrittr stringr tidyr]; }; + vizdraws = derive2 { name="vizdraws"; version="1.2"; sha256="1r4kn8ki4ymqg87j223fs6fs9vyscc5bsfbnc4v9gvjy96jjxy3h"; depends=[dplyr htmlwidgets magrittr stringr]; }; vkR = derive2 { name="vkR"; version="0.2"; sha256="1pk444fcw4yyv2dnfrw9vynbpc4gwr5yv9jd41djp9yipdf6d53l"; depends=[httr jsonlite purrr XML]; }; vlad = derive2 { name="vlad"; version="0.2.2"; sha256="0c3zfjm5nj7iisfnl822sk8wdszv6hcsaf51sn7aqnlp579hq2jk"; depends=[BH checkmate dplyr magrittr Rcpp RcppArmadillo tidyr]; }; vlda = derive2 { name="vlda"; version="1.1.5"; sha256="17xn8qqh043dm05ib3h4l1qx07wxncf5d06x9l1wl6jbkvnsm2nq"; depends=[dplyr ggiraph ggplot2 ggrepel ggsci]; }; vmd = derive2 { name="vmd"; version="0.1.0"; sha256="17c06a9l6i90ivpvf3rgv6yrsqv36qmywmmy92y5b81zqhgmh907"; depends=[ggplot2 magrittr R6 Rcpp reshape2 scales]; }; + vmdTDNN = derive2 { name="vmdTDNN"; version="0.1.0"; sha256="1vxlqfcdkwajz9r6rmz48x87csl6d7dqshabhgwnvgvy206jh3b7"; depends=[forecast nnfor vmd]; }; vmeasur = derive2 { name="vmeasur"; version="0.1.4"; sha256="17rqr8zpfnq3f0d3yi9w09wvrbq79g4w7rkqf4l2wyd8ic5npwb0"; depends=[av crayon doFuture dplyr foreach future ggplot2 ggpubr imager magrittr pdftools pracma progressr purrr readr rlang scales stringr svDialogs tidyr]; }; vmr = derive2 { name="vmr"; version="0.0.3"; sha256="1qxcbmf71xwlmi5wyjs3a86ywjd0cj6f86kyq5bpw4ykn797kciw"; depends=[curl jsonlite]; }; vntrs = derive2 { name="vntrs"; version="0.1.0"; sha256="0ffjjzcs7i4zli7bn83gkgi0q7dmgyxrhv9l3gdambma9hsig45c"; depends=[trust]; }; @@ -18274,7 +18565,7 @@ in with self; { vortexRdata = derive2 { name="vortexRdata"; version="1.0.5"; sha256="0b47q3aslz4110a1bfaa103i098y2ngzrjh01rwasq3gd6xbif9n"; depends=[]; }; voson_tcn = derive2 { name="voson.tcn"; version="0.2.4"; sha256="18h51krjjnvgplgyxyjhm32q602la9ip1wsf37vs41vv591k8ylv"; depends=[dplyr httr jsonlite magrittr openssl rlang stringr tibble tidyr]; }; vosonSML = derive2 { name="vosonSML"; version="0.29.13"; sha256="0xajffifapn0sfnp39p8iv6hdxindzi7vywcwhla9h2hmvraad6w"; depends=[data_table dplyr Hmisc httpuv httr igraph jsonlite lubridate magrittr purrr RCurl rlang rtweet stringr textutils tibble]; }; - vote = derive2 { name="vote"; version="2.3-1"; sha256="1v0q81w01j1c4d0w0w174n7zl8blb1a228vdpccanvfwixx3c1ib"; depends=[data_table fields formattable knitr]; }; + vote = derive2 { name="vote"; version="2.3-2"; sha256="12kvz83ncansrsvw4mrws6fafn9fy6c0nvqvknrzl08kv290c9dr"; depends=[data_table fields formattable knitr]; }; voteogram = derive2 { name="voteogram"; version="0.3.1"; sha256="12xv0c3g4vr23c8adkk8z7m7sx31w5mjvdg9h4qbvaimb99p2r7z"; depends=[dplyr ggplot2 jsonlite scales]; }; votesmart = derive2 { name="votesmart"; version="0.1.0"; sha256="19pp0lnvvii9ac8zr7x775j7a4lzfnjkaall47a3lsv98ql85cza"; depends=[dplyr gestalt glue httr jsonlite lubridate magrittr purrr snakecase stringr tidyr]; }; votesys = derive2 { name="votesys"; version="0.1.1"; sha256="1z7cx3rj3bfrkb6jkmf1m1wad5ff46zrab5vhk69wf3jbwd9h920"; depends=[data_table gtools Matrix]; }; @@ -18287,12 +18578,13 @@ in with self; { vprr = derive2 { name="vprr"; version="0.1.0"; sha256="0wxcaw6r56wd8sxr5xc10xbhg9cbfz82z4cn4x0w8qhrzwl4v0zl"; depends=[dplyr ggplot2 gridExtra gsw interp lubridate magick metR oce stringr tidyr usethis]; }; vrcp = derive2 { name="vrcp"; version="0.1.1"; sha256="1wrch1dqy752gkj24h1dgi2x3kf1797xj4pf1s9mszf3x3ic905d"; depends=[ggplot2]; }; vrmlgen = derive2 { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; }; - vrnmf = derive2 { name="vrnmf"; version="1.0.0"; sha256="1mcmpv30z9zzaq2r7h7r8pgf3fgwv3bx61b9a17a5wv39smnj0x2"; depends=[ica lpSolveAPI nnls quadprog]; }; + vrnmf = derive2 { name="vrnmf"; version="1.0.2"; sha256="0n0kmzhygaii9kipcmr943s0vcf8brxgsk25m9illd4fij6nwpp2"; depends=[ica lpSolveAPI Matrix nnls quadprog]; }; vroom = derive2 { name="vroom"; version="1.5.7"; sha256="1plz20x6s01gkkcac51lhx4r2s024pgh778ri7y25hkiiwacp1yh"; depends=[bit64 cli cpp11 crayon glue hms lifecycle progress rlang tibble tidyselect tzdb vctrs withr]; }; vrtest = derive2 { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; }; vscc = derive2 { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[mclust 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.0"; sha256="0fa3fdjhq59gpx0ac38ska0sfhq07g9x3vhbvrvlpc18kxwj5mzh"; depends=[ggplot2 glue invertiforms LRMF3 magrittr Matrix rlang RSpectra tibble withr]; }; vstsr = derive2 { name="vstsr"; version="1.1.0"; sha256="071nfxkwwpbp2d8khxq7d1pp268pa1fcfj619bs6xwg4wk9srr3k"; depends=[httr jsonlite R6 RCurl]; }; vtable = derive2 { name="vtable"; version="1.3.3"; sha256="1a1rw5n3j2ylhg0sjbdszkw5l9971s7lih9shmyhpikx79j4qgm5"; depends=[haven kableExtra knitr rstudioapi sjlabelled]; }; vtreat = derive2 { name="vtreat"; version="1.6.3"; sha256="181nsjl811m3k1123bvgnnwr253sc2mbj4ljzmawz9wl7dfbwfij"; depends=[digest wrapr]; }; @@ -18301,16 +18593,15 @@ in with self; { vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; }; vueR = derive2 { name="vueR"; version="0.5.3"; sha256="0am4iwgadi9c9f7zm5zx3nrzyhy7w1qgp9rkyypzwb6bicjjb9cz"; depends=[htmltools htmlwidgets]; }; vwline = derive2 { name="vwline"; version="0.2-2"; sha256="1hilr996xn5wh8kfyab55w2i1c02a8x909h4ahag5q6s7603qng5"; depends=[gridBezier polyclip]; }; - vwr = derive2 { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; }; wBoot = derive2 { name="wBoot"; version="1.0.3"; sha256="08qgkkv6jvqmxq5gvfp7jbrc3k8mxajfww7k8a3p8888aq411p7q"; depends=[boot simpleboot]; }; wCorr = derive2 { name="wCorr"; version="1.9.5"; sha256="10mnrs5ymc3ms1z5vs0h05rjq1642n3asvm77x7lxq9qwx67s3vn"; depends=[minqa mnormt Rcpp RcppArmadillo]; }; + wINEQ = derive2 { name="wINEQ"; version="1.0.1"; sha256="0vsi930gp7w2ddqfy7dw82w89v7vrrv8x5zg9j8bhiz4kaf53153"; 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=[]; }; wPerm = derive2 { name="wPerm"; version="1.0.1"; sha256="0f3v0kba87wkwyii0pzvs6a8ja897aifpvwkvryl2hzxxxaml7z4"; depends=[]; }; - wSVM = derive2 { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; }; wTO = derive2 { name="wTO"; version="1.6.3"; sha256="1cgbw37b734ipg5qhjsil55qysfn6xmymj1q99ybkadi0axp55nn"; depends=[data_table igraph magrittr plyr reshape2 shiny som visNetwork]; }; waccR = derive2 { name="waccR"; version="0.1.0"; sha256="092p1bibyqx1gcrch68l9ilzilg5aqf46b6iagm562292cfi074l"; depends=[dplyr lubridate magrittr rvest tibble xml2]; }; - wacolors = derive2 { name="wacolors"; version="0.2.1"; sha256="03ax5r3qshfdrywqwyhz5laqvwajkvvzwq8sh9a6mi3dgr7vcd0m"; depends=[ggplot2 scales]; }; + 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]; }; wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; }; @@ -18318,15 +18609,15 @@ in with self; { 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.3.1"; sha256="16q1xjbl9g04l1r1x3nid9hmz1sa35q6j33bigdzh4y4zcd8qb7c"; depends=[cli diffobj fansi glue rematch2 rlang tibble]; }; - walker = derive2 { name="walker"; version="1.0.3"; sha256="16lkmyabnklrxy09xir9kylrpm7n9ilvf94ygdihd70dvnn3vqv6"; depends=[bayesplot BH coda dplyr ggplot2 Hmisc KFAS loo Rcpp RcppArmadillo RcppEigen RcppParallel rlang rstan rstantools StanHeaders]; }; + walker = derive2 { name="walker"; version="1.0.4"; sha256="0qfvzg6wchl3933f2zahzl665badyj12161h0rz8a92rji004p8i"; depends=[bayesplot BH coda dplyr ggplot2 Hmisc KFAS loo Rcpp RcppArmadillo RcppEigen RcppParallel rlang rstan rstantools StanHeaders]; }; walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; }; - wallace = derive2 { name="wallace"; version="1.1.0"; sha256="0rbk6cma6w16aakqg0ibx2c6ziyb3k0lbsdp7wn3pk9zi8xrs5qk"; depends=[dismo dplyr DT ENMeval jsonlite leaflet leaflet_extras magrittr raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs shinythemes sp spocc spThin zip]; }; + wallace = derive2 { name="wallace"; version="1.1.3"; sha256="0q9nppyiijzbmdi6dvgnh8l8i1vassqcl5wc7bv08hidxbkw3pqs"; depends=[dismo dplyr DT ecospat ENMeval jsonlite leaflet leaflet_extras magrittr raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs sp 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.3"; sha256="1nk2glcvy4hyksl5ipq2mz8jy4fss90hx6cq98m3w96kzjni6jjj"; depends=[ggplot2 jmvcore R6 WRS2]; }; + walrus = derive2 { name="walrus"; version="1.0.4"; sha256="0h1cxkkb53498flx2fbnl3w7pjqs8rgz0hc5nb69n6a4aj6vhyfk"; 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.26"; sha256="1im3ifh1dwj0w8zz0j6023z615qvybm7ycy25sp9ynh67p9yza7v"; depends=[bioacoustics crayon dtw fftw knitr monitoR NatureSounds pbapply Rcpp RCurl rjson seewave stringi tuneR]; }; + warbleR = derive2 { name="warbleR"; version="1.1.27"; sha256="1fd008v3di7z5ixljk5zwaw2wcc4zfqlnw9546894ybw5m9jsk26"; depends=[bioacoustics crayon dtw fftw knitr monitoR NatureSounds pbapply Rcpp RCurl rjson seewave stringi 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=[]; }; @@ -18337,7 +18628,7 @@ in with self; { waterYearType = derive2 { name="waterYearType"; version="1.0.1"; sha256="09brbqcd41khycz9lhn84w68wpk8lsdnzb6lzc10gm5s5ambgj06"; depends=[]; }; waterfall = derive2 { name="waterfall"; version="1.0.2"; sha256="0jy6l9mx0dixwnkychdl18sf4xh73pm0qd1jyxp9rlnv1vcragjp"; depends=[lattice]; }; waterfalls = derive2 { name="waterfalls"; version="0.1.2"; sha256="01gby1mlhrwcalizpywxcakkx2zifswb0188nrl6z9dkkd1866lm"; depends=[ggplot2]; }; - waterquality = derive2 { name="waterquality"; version="0.2.6"; sha256="0386sd772l6vm5pdjj21i5byc6673hwbdixm0av6nc82pqf524xr"; depends=[caret dplyr magrittr pingr purrr raster rgdal vctrs]; }; + waterquality = derive2 { name="waterquality"; version="0.3.0"; sha256="0aikgz4x2ny2q7mnxsyk5pl87yb9gq6pcvvnj1s32383683j5ys9"; depends=[caret dplyr magrittr pingr purrr raster rgdal vctrs]; }; wavScalogram = derive2 { name="wavScalogram"; version="1.1.1"; sha256="15y5gqp39jx0ggsimmf7k22qg1142c55apd04q05jqi50ljzda70"; depends=[abind colorRamps fields]; }; waveband = derive2 { name="waveband"; version="4.7.1"; sha256="1ja8jfvv790s6ih50iz6zykpq06dbzqi28cp8vyqcd1iz2bkdixp"; depends=[wavethresh]; }; waved = derive2 { name="waved"; version="1.2"; sha256="0zv4rgazk9s295pggzfa7sc062zv68dgds1ngxcz7vg1fx0qkgxg"; depends=[]; }; @@ -18345,7 +18636,7 @@ in with self; { 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]; }; - waves = derive2 { name="waves"; version="0.1.1"; sha256="17rnhfpwi71s6g3ai3j14wbgq3askf30phs881kka1k24r6z64k8"; depends=[caret dplyr ggplot2 magrittr pls prospectr randomForest rlang spectacles stringr tidyr tidyselect wesanderson]; }; + waves = derive2 { name="waves"; version="0.2.3"; sha256="0k79mdvr08hbncxr7920blfkjn2pwrsi6qbcqk4bafs8s9c361bq"; depends=[caret dplyr ggplot2 lifecycle magrittr pls prospectr randomForest readr rlang scales spectacles stringr tibble tidyr tidyselect]; }; waveslim = derive2 { name="waveslim"; version="1.8.2"; sha256="0ibivnhz0l06sss5rrrcvyiwg3qpbyk3qn4vx4pp90kj09x4yg0k"; depends=[]; }; wavethresh = derive2 { name="wavethresh"; version="4.6.8"; sha256="1nz74bm7pgck1i9c28svxnic8wkwkm5dhc8bhrxiih5wxb36kcwk"; depends=[MASS]; }; waydown = derive2 { name="waydown"; version="1.1.0"; sha256="1yjx9cd8h8rsi44s7dcqrvfmsbjhw7vkg2z7bl4knsgbki0c978g"; depends=[Matrix numDeriv]; }; @@ -18358,9 +18649,9 @@ in with self; { wcep = derive2 { name="wcep"; version="1.0.0"; sha256="1hpakygvh3b64i5hwkriwq5g8vnvghvgdj0jn9m59j43050k32cy"; depends=[coin dplyr progress tidyr]; }; wdm = derive2 { name="wdm"; version="0.2.2"; sha256="1pidlfp67x3wnmkp0qgna4vz29qx09xsy7gfbqzrjqkdi7q1dihi"; depends=[Rcpp]; }; wdman = derive2 { name="wdman"; version="0.2.5"; sha256="1yf41lsrr9dbf5n4f5hv9mlmzl736fhnp9gxkm2g9apws6gsig02"; depends=[assertthat binman processx semver yaml]; }; - wdnr_gis = derive2 { name="wdnr.gis"; version="0.1.2"; sha256="03z9qayrv34lgajvwg77b0h7z65r04wzlkaazpdfxq9wk027g3a9"; depends=[arcpullr dplyr ggplot2 httr jsonlite rlang sf]; }; wdpar = derive2 { name="wdpar"; version="1.3.2"; sha256="0fgypgv6dl22ni90m7g2fsw56b8ml9pvxrqkwkzmxnlb8hmg0r1k"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp tibble wdman 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.2"; sha256="1i4hkjjx35jkvg7jbiv1szmlnj1nx1s77sa7361407i7wmf41xkf"; 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]; }; weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; }; weatherr = derive2 { name="weatherr"; version="0.1.3"; sha256="14w7kkja3a1zmdc7l084iprx1czqgdfjzjc29wdlwzmaiq02c4d3"; depends=[ggmap lubridate RJSONIO XML]; }; @@ -18378,6 +18669,7 @@ in with self; { websearchr = derive2 { name="websearchr"; version="0.0.3"; sha256="1c6dwm5g5rjq0b12zrwwi5k9760jb0ph83v4j2gm8zm0x9dhiqm9"; depends=[]; }; webshot = derive2 { name="webshot"; version="0.5.2"; sha256="0gq4h8cw51z95yvsnf38kj5l58wgljkm0dalmi8mn1sp06bxr0zi"; depends=[callr jsonlite magrittr]; }; websocket = derive2 { name="websocket"; version="1.4.1"; sha256="1ks9cyj39jnb0rkx2ii3ckmpl373m5f8sz0i4q3gk7kkv3js07r8"; depends=[AsioHeaders cpp11 later R6]; }; + webtools = derive2 { name="webtools"; version="0.7.9"; sha256="0pzfdn323gnzb0mznm8975kz8xwkhqm5df6dr7zqy00vf11mzis9"; depends=[crayon dplyr jsonlite pkgsearch RCurl readr rstudioapi stringr tibble]; }; 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]; }; @@ -18387,7 +18679,7 @@ in with self; { weibull4 = derive2 { name="weibull4"; version="1.0.0"; sha256="1a95yw67iy7dqib33v31apxmskl019zng66jrlflbqx6p2vjdh30"; depends=[]; }; weibullness = derive2 { name="weibullness"; version="1.19.8"; sha256="19s44mxxcnhngifxshsyjr3a9zvbwywmqgby5dxd73yid1p2k9mr"; depends=[]; }; weibulltools = derive2 { name="weibulltools"; version="2.0.0"; sha256="1flgnsivam9vyrs6hwn3119s5bzczjm5qb1xjwydl1cd6r2984k5"; depends=[dplyr ggplot2 lifecycle magrittr plotly purrr Rcpp RcppArmadillo sandwich segmented SPREDA survival tibble tidyr]; }; - weightQuant = derive2 { name="weightQuant"; version="1.0"; sha256="1ngz51wr5qpnb98lfbddwvipcra86dq5whm6z8c4xd921anb15bx"; depends=[doParallel foreach quantreg]; }; + weightQuant = derive2 { name="weightQuant"; version="1.0.1"; sha256="0v2wxgvv8v5filiabcd19bmcprfv3l8gg79v6s3c5wmnzir617s5"; depends=[doParallel foreach quantreg stringr]; }; weightedGCM = derive2 { name="weightedGCM"; version="0.1.0"; sha256="04c24mxpvqdaprg6627w84ikmwxy96c1zcifn2y5n9ir7dlih5r3"; depends=[GeneralisedCovarianceMeasure mgcv xgboost]; }; weightedScores = derive2 { name="weightedScores"; version="0.9.5.3"; sha256="1wf01z94snwbqp22waz7qays3ymg5lsxpfpafdarad2b6mg5j2g8"; depends=[mvtnorm rootSolve]; }; weightedZdiff = derive2 { name="weightedZdiff"; version="0.1.0"; sha256="1mrhjg0h7qiwya8jrmf5h4gc352ahc6fczlk5kfhqw5vkwr0b1k3"; depends=[]; }; @@ -18399,17 +18691,19 @@ in with self; { welo = derive2 { name="welo"; version="0.1.1"; sha256="1bbc75i2l09cvsi1nsm9sdyvpn5rvyzc7w5nbdh28fmxp2bagn6k"; depends=[boot Rdpack 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-1"; sha256="0gpfs0a20hxjkpakmfdpf9a98hipjwgaajdm4364qvqrx8y5ifna"; 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]; }; 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]; }; - wheatmap = derive2 { name="wheatmap"; version="0.1.0"; sha256="1c1xvzy194vw3idkwkqp9kyrfldzczj30cl15jw1bbnw87zcwdzy"; depends=[colorspace RColorBrewer]; }; + wheatmap = derive2 { name="wheatmap"; version="0.2.0"; sha256="064idlrnb85xxav39gp3n854fic6514khvazrf5d0x48crpzyvdp"; depends=[colorspace RColorBrewer]; }; whereami = derive2 { name="whereami"; version="0.1.9"; sha256="0mjq9haacsf0zkgh7xxx8dr67hnw5ijjdhaz8c69mfjmd2zfzfwq"; depends=[cli jsonlite rstudioapi]; }; whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; }; + whippr = derive2 { name="whippr"; version="0.1.0"; sha256="1anrbrb9bp9kll70wjc1861incmjp85w1cw7y9r7pah26ajvxm80"; depends=[broom cli dplyr ggplot2 glue lubridate magrittr minpack_lm nlstools patchwork pillar purrr readxl rlang stringr tibble tidyr usethis zoo]; }; whisker = derive2 { name="whisker"; version="0.4"; sha256="1a7vz0dk95xfjvi38wbpw8vmf5qn3g8p490msz2rw0piwidmk1ks"; depends=[]; }; - whitebox = derive2 { name="whitebox"; version="2.0.0"; sha256="0qw96ma3hbwqc258chcsjgg0c6c3xi6d1q0iin3rdr8nvczinxma"; depends=[]; }; + whitebox = derive2 { name="whitebox"; version="2.1.0"; sha256="17g2kq21bmgq3ywhld14gxrns5l1ghahdi4vim849ybi703x37xn"; depends=[]; }; whitechapelR = derive2 { name="whitechapelR"; version="0.3.0"; sha256="0mnq5m59mw8w5g1p0h2xzlz738j397b3444km59bm5yln3j0nsbi"; depends=[igraph plyr]; }; whitening = derive2 { name="whitening"; version="1.3.0"; sha256="13c06sk4n2821pskqi8vk61khyhswddcir9qr8zy15czn5id3i1j"; depends=[corpcor]; }; whitestrap = derive2 { name="whitestrap"; version="0.0.1"; sha256="1jcnxqxvkhyz9j6jay5834ncv5fxb9qiyyyj3b8al75mqknmn8ra"; depends=[]; }; @@ -18430,19 +18724,19 @@ in with self; { 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.4.1"; sha256="052pls0x5dbcr7f8vcl4c0f8zx1s9cmk9i9dw3r8b0lqd0r2sz02"; depends=[adehabitatLT dplyr rgeos sf sp]; }; + wildmeta = derive2 { name="wildmeta"; version="0.1.0"; sha256="1x4670wjr7ifiar89vbf42i69v80wlizv219y2qixbfs13s6mhlw"; depends=[clubSandwich metafor robumeta sandwich]; }; wildpoker = derive2 { name="wildpoker"; version="1.1"; sha256="1302ain55spz34irmq49sp9b1pvrn2nxmzmqs8m9wdk6g82h3s27"; depends=[]; }; wildviz = derive2 { name="wildviz"; version="0.1.2"; sha256="03vhacaxp5fahq5afcf1q0qvmndpqc6a63pnins7h3p8ryvlpx14"; depends=[DBI dplyr ggplot2 ggthemes httr jsonlite lubridate plotly purrr rnoaa RSQLite shiny shinythemes tibble tidyr]; }; 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]; }; winRatioAnalysis = derive2 { name="winRatioAnalysis"; version="0.1.0"; sha256="1msvc06bfzw9clinxbvr5fdw38dff0c0xii46182nwnk5kj0libr"; depends=[data_table JM Matrix MLEcens mvtnorm nlme plyr pssm survival]; }; winch = derive2 { name="winch"; version="0.0.7"; sha256="0h9xf4qpc1xk04q92dn4n1pjvlwz2sxg0rcv6nkwyp9qj67m6h88"; depends=[procmaps]; }; - windAC = derive2 { name="windAC"; version="1.2.6"; sha256="0yx0jiz3c4slv366sic01k8l460idh4n6a797biy7wyrp6jj241x"; depends=[mvtnorm sf]; }; windex = derive2 { name="windex"; version="2.0.3"; sha256="063lhxpa8gwkaxa5p61dac239s6b11mv53d8dcah5h1q04inshm0"; depends=[ape geiger phangorn scatterplot3d]; }; windsoraiR = derive2 { name="windsoraiR"; version="0.1.2"; sha256="1smd3zw5ra1fba6mds3diadcmbw59jlvmrvfzzi4fss91wv50jql"; depends=[jsonlite]; }; winfapReader = derive2 { name="winfapReader"; version="0.1-3"; sha256="1g5z9kg5ws9cdixky2y0c7dw3f7lmh3ykjxrh3jjmkm75gzgs7p0"; depends=[lubridate]; }; wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; }; wiqid = derive2 { name="wiqid"; version="0.3.0"; sha256="0jqnlyw5iljpm7135fgnkwjvxmbjbqiqq6lchwnjmhbb5xd3kbvr"; depends=[coda HDInterval MASS mcmcOutput plotrix truncnorm]; }; 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]; }; - withr = derive2 { name="withr"; version="2.4.3"; sha256="0k4x2bd9wb24n3dyg7rdjicdjs5ay2kk5lfgkrcjsv6cki2wgnlv"; depends=[]; }; + withr = derive2 { name="withr"; version="2.5.0"; sha256="1h4bzj0am9lawbh1cam1jmgk1xjmn9da14r90w3q984hswz7nc9p"; depends=[]; }; wk = derive2 { name="wk"; version="0.6.0"; sha256="1xga4rrqsr190g55by39az4nimnn06bf5b6mcjgwqvba0lvjhb5g"; depends=[]; }; wkNNMI = derive2 { name="wkNNMI"; version="1.0.0"; sha256="0qpl1b2134kz9mjl38w93lp3g6kpv9ygv9hygpssm845k02hkw7c"; depends=[foreach infotheo]; }; wkb = derive2 { name="wkb"; version="0.4-0"; sha256="0mah538345npkb06bcj18mb6qnnx8nn7bdqmvqqpbawallh546a9"; depends=[sp]; }; @@ -18464,25 +18758,27 @@ in with self; { 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]; }; wordgraph = derive2 { name="wordgraph"; version="0.1.0"; sha256="06q42sjdj7i680zqx66hsvrpmkrlcyxnvsk1lygnqhlv97ycl3vv"; depends=[dplyr ggplot2 ggraph plyr purrr tibble tidygraph]; }; + wordler = derive2 { name="wordler"; version="0.3.1"; sha256="0pvnijh2gvwjbd86ivky0zbi8y1x40xazsv2bdy5s2rfsscf4l88"; depends=[crayon]; }; wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; }; wordnet = derive2 { name="wordnet"; version="0.1-15"; sha256="158c5fps4kvfd9mj1im8jb9rv7ipfshyagrv0q3b55ywnkrkvjqb"; depends=[rJava]; }; - wordpiece = derive2 { name="wordpiece"; version="2.0.1"; sha256="1szyj6yck4xvv41vw6l0bw31jxgxn4qg700cvx1bn40xlg2z05as"; depends=[dlr piecemaker purrr rlang stringi wordpiece_data]; }; - wordpiece_data = derive2 { name="wordpiece.data"; version="1.0.2"; sha256="11nd5zxksyxb26gpp85vfmxgwigskvablgvyd5r914nil9lvi7ca"; depends=[]; }; + wordpiece = derive2 { name="wordpiece"; version="2.1.3"; sha256="1xg9xsaqpz5l2f2vk1qnc7cwplnwvv6jl9wbdg0f92klhk1nanyp"; depends=[dlr fastmatch memoise piecemaker rlang stringi wordpiece_data]; }; + wordpiece_data = derive2 { name="wordpiece.data"; version="2.0.0"; sha256="0x5m8vkszxpz8mf9pblzm39wpaa247336zkja560zsqgzdvcj3hx"; depends=[]; }; wordpredictor = derive2 { name="wordpredictor"; version="0.0.3"; sha256="0079nkjimzz07yzqx8ksgk7isi0b5j1nxmisicbc8qvsamirm68v"; depends=[digest dplyr ggplot2 patchwork SnowballC stringr]; }; 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-6"; sha256="11y57mzd12klwd2xzr38nvlrxg9jsi33mxd8nnvc96hgrjsgwakl"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; }; + wordspace = derive2 { name="wordspace"; version="0.2-7"; sha256="0hrjv5mag7gwl4wj7np248sdyns5i623wl37b11hlgalhbmlypyf"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; }; + workboots = derive2 { name="workboots"; version="0.1.0"; sha256="17j4vz58i645br6pb8b75kk9jib44vs2zjgfc3slj3g39my7n01b"; depends=[assertthat dplyr generics 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]; }; workflows = derive2 { name="workflows"; version="0.2.4"; sha256="1sxrgza922p137z41jcj2iwk19lxzwh6kp4kz7h9kw0b8rvfqwab"; depends=[cli ellipsis generics glue hardhat lifecycle parsnip rlang tidyselect vctrs]; }; workflowsets = derive2 { name="workflowsets"; version="0.1.0"; sha256="0596hb17mshpag3vjy2wl6fi2mdw54i9gc5za10vzy8vpkigb9jy"; depends=[cli dplyr generics ggplot2 hardhat lifecycle 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.4.5"; sha256="13mzgn479002gf0yrd4gisdqk606s7l9jnc0awpiq7d3k74jqr29"; depends=[dplyr glue janitor jsonlite lubridate magrittr progress purrr qdapRegex readr rlang rvest stringi stringr tidyr withr xml2]; }; + worldfootballR = derive2 { name="worldfootballR"; version="0.4.10"; sha256="01fdrz94wys8kkpz6sdrj3iwi00jqkmycb7f6zcg6k1hhyizfqx6"; depends=[dplyr glue janitor jsonlite lubridate magrittr progress purrr qdapRegex readr rlang rvest stringi stringr tidyr withr xml2]; }; worldmet = derive2 { name="worldmet"; version="0.9.5"; sha256="03dc93b6akah0pf36h0327jb65slsb3bypyv57cnkyxwyvni6w4s"; depends=[doParallel dplyr foreach leaflet openair purrr readr tidyr]; }; worms = derive2 { name="worms"; version="0.2.2"; sha256="183chjdi5qvsmdznvc9igcxaz769a37rwh5nzgvf5zf012a85wir"; depends=[httr plyr]; }; worrms = derive2 { name="worrms"; version="0.4.2"; sha256="1gpbyplfpcrapmci8axarrjjijsgh2dmhnsn79g1lhrafvm2ichs"; depends=[crul data_table jsonlite tibble]; }; wosr = derive2 { name="wosr"; version="0.3.0"; sha256="0fl9mizrjg3r7n7gslsxgaw3k2v63scqmvnv6341q8sq7018hzln"; depends=[httr jsonlite pbapply xml2]; }; wowa = derive2 { name="wowa"; version="1.0.1"; sha256="0jdw73z5whvb4bb9syhqscllaa31bhs81gmgckxh7w1r3pp42yha"; depends=[Rcpp]; }; - wpa = derive2 { name="wpa"; version="1.6.3"; sha256="11lw6jgzyq43w401j58yp3qd2xzpq0a45zl2ksc0iwnc563bizhi"; 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.6.4"; sha256="1f0s5sfighc42wgzlcrsndjkln4alv5m026f0fw508lhnrl8bffk"; 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=[]; }; @@ -18493,12 +18789,12 @@ in with self; { wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; }; wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; }; wrGraph = derive2 { name="wrGraph"; version="1.3.0"; sha256="1zw9c3dl5lwksggvxsch1a9brzy7a5m6yi513h4fxf31njpc5s7g"; depends=[lattice RColorBrewer wrMisc]; }; - wrMisc = derive2 { name="wrMisc"; version="1.8.0"; sha256="09zpvmd1r0cj94xx0822ywn5h4i7939l131s9haszaasqjia77ay"; depends=[MASS]; }; - wrProteo = derive2 { name="wrProteo"; version="1.4.3"; sha256="1gqmj8lmc37brbzlzci37zpn9v6shs4ahy65kbx25zgdw19bdd1n"; depends=[knitr limma wrMisc]; }; + wrMisc = derive2 { name="wrMisc"; version="1.8.1"; sha256="0bhdrjq2b26jvzgg5fchp1mvlr7rvqyx1imdgz25k853hk915cl2"; depends=[MASS]; }; + wrProteo = derive2 { name="wrProteo"; version="1.6.0"; sha256="0iq75zdip51aw8y37ckah1mddm69cp0lds2cj0xaavrdbaarww49"; depends=[knitr limma wrMisc]; }; wrTopDownFrag = derive2 { name="wrTopDownFrag"; version="1.0.2"; sha256="1rdg6rzjz2h514i3c8z89mvj2j3h1s7rr5fry2mq3xvrwrgd3738"; depends=[wrMisc wrProteo]; }; wrangle = derive2 { name="wrangle"; version="0.5.7"; sha256="0gap15hinsgfjrxajr9kvs0rp76gl5kk2dqs92s9mfyh10kxxqpa"; depends=[dplyr magrittr rlang tidyr]; }; wrappedtools = derive2 { name="wrappedtools"; version="0.7.9"; sha256="00qp61syakz3wx491ygi2yhlj9b868vjkp8f3d02z8pgljvan93r"; depends=[boot coin dplyr forcats ggplot2 glue kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyverse]; }; - wrapr = derive2 { name="wrapr"; version="2.0.8"; sha256="11jbpfs9isb1aan50iw8ad86jd3hqirvxvvrr75rrqwbh3qz1sdp"; depends=[]; }; + wrapr = derive2 { name="wrapr"; version="2.0.9"; sha256="1swgf10vg9sh29mn4gsia1rjln47lrqsv765yl19hlpk85qwhsk4"; depends=[]; }; wrassp = derive2 { name="wrassp"; version="1.0.1"; sha256="02f4r6ax91sxv05mjbz33g04i33gd3548zym5iszzx26mbr6rwkv"; depends=[tibble]; }; write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; writexl = derive2 { name="writexl"; version="1.4.0"; sha256="0mfzyn8n5x5x5gf382bqgq61zpw9dymrp5kzdm2sbszplmxf6xry"; depends=[]; }; @@ -18520,23 +18816,22 @@ in with self; { 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.9.3"; sha256="05dzf38vlf73bmwdjs6w32d0b91cs6zgdmg7afw9gs36qfi5fahn"; depends=[stringr x13binary]; }; - x13binary = derive2 { name="x13binary"; version="1.1.57-2"; sha256="13j1xylbdsmrnnccn1vcww0y0890vn057j836yqihmlgrh3prcbi"; depends=[]; }; + x12 = derive2 { name="x12"; version="1.10.2"; sha256="13s63w0kgklxsb401w74ndrwqly2qg49sxml81rzd108rckii50d"; depends=[stringr x13binary]; }; + x13binary = derive2 { name="x13binary"; version="1.1.57-3"; sha256="1pha8drk3ax89zfy0pnicpmd1l4amv832a5rcs73nqvwjcdci9bd"; 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]; }; xSub = derive2 { name="xSub"; version="3.0.1"; sha256="0c3jc801pn85wm17jj911spryg6p3gq19im1506zkv8lqwsy1nab"; depends=[countrycode haven RCurl]; }; xVA = derive2 { name="xVA"; version="0.8.5"; sha256="1scn7acp69k80q9ksygj7ns9937yim8iwhpi54ygm28h20jnfllr"; depends=[SACCR Trading]; }; - xaringan = derive2 { name="xaringan"; version="0.22"; sha256="0qk8cp52g18l1pp7i5lhqbklafd20b51fhv7qil2dd397wjqcghk"; depends=[htmltools knitr rmarkdown servr xfun]; }; + xaringan = derive2 { name="xaringan"; version="0.23"; sha256="010k6xhblyanjf0hr4k24m26sb547jizng0nidrb2d4q1m9v1wdm"; depends=[htmltools knitr rmarkdown servr xfun]; }; xaringanthemer = derive2 { name="xaringanthemer"; version="0.4.1"; sha256="05gkk9ll5whfvhbd8x3p180qzqcz6krz2s26lfbrp2y7srpx9jr4"; 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]; }; xergm_common = derive2 { name="xergm.common"; version="1.7.8"; sha256="03mjpafwfkmyj5ba84jydap9rp0i602izjlbd511xbxcw6dx2k0b"; depends=[ergm network]; }; xesreadR = derive2 { name="xesreadR"; version="0.2.3"; sha256="1pvdx0mxg2f885bhy4hb3kqzcgva4q7hzzaipkfzyi5lnjdsbc81"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; }; - xfun = derive2 { name="xfun"; version="0.29"; sha256="1x2f49n3ak85nab937wq6q5sqi1mdlfzwbv8603kxl2k8rxvp1dz"; depends=[]; }; + xfun = derive2 { name="xfun"; version="0.30"; sha256="1vn0cbskyrk8ww9yx75jni9s684yv4cvbj643lvg0lg00briry7b"; depends=[]; }; xgb2sql = derive2 { name="xgb2sql"; version="0.1.2"; sha256="1gw5dw0ck5hip8mv347zaswrggk395bg2hgn02bvqs0d31jhmgvi"; depends=[data_table xgboost]; }; - xgboost = derive2 { name="xgboost"; version="1.5.0.2"; sha256="04xbgrrb3aq067hrivslq5f2rd1v95yfv7lkj596ijyqi6ibjl27"; depends=[data_table jsonlite Matrix]; }; - xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; + xgboost = derive2 { name="xgboost"; version="1.5.2.1"; sha256="13mi3rmpxhgm4qbm4xcqml9n5d1xyai2k1mi52i8x60jd5m8s319"; depends=[data_table jsonlite Matrix]; }; xgxr = derive2 { name="xgxr"; version="1.1.1"; sha256="00fd9n2qivfxg2b7vynssc82afa7nskg4akk6cgxnyhcai5jbmra"; depends=[assertthat binom Deriv DescTools dplyr ggplot2 glue gtable Hmisc labeling magrittr minpack_lm pander png RCurl readr scales stringr tibble]; }; 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]; }; @@ -18547,16 +18842,16 @@ in with self; { xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; }; xmeta = derive2 { name="xmeta"; version="1.3-0"; sha256="1yyqxrdfn23sqfa9765vj5fcwz2v46jvaa9wjkv1w4mvb2k2si4k"; depends=[aod glmmML MASS metafor mvmeta numDeriv plotrix]; }; xml2 = derive2 { name="xml2"; version="1.3.3"; sha256="138w7hb487al9cbahmnk5rhi23k8a9g7nk7s5dyxd3k1646rqknb"; depends=[]; }; - xml2relational = derive2 { name="xml2relational"; version="0.1.0"; sha256="03blvks4z7n4wxz5zbrn6c3a3l4hy9clcjpb834pc07ssz3c2v3g"; depends=[fs lubridate rlang stringr tidyr xml2]; }; + 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]; }; 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.69-2"; sha256="1582flnh76fmqx5v1rzf021hlrcg53f2fdax1a8ad1nrcjpbj18r"; depends=[qtl]; }; + xoi = derive2 { name="xoi"; version="0.70"; sha256="1raa5kr3h62j1lvjb0mn973pknyw8caixfh78rhgrhzxiilllil8"; depends=[qtl]; }; xopen = derive2 { name="xopen"; version="1.0.0"; sha256="1vrvgdika1d63dwygynbv2wmd87ll8dji5dy89hj576n8hw601z2"; depends=[processx]; }; - xpectr = derive2 { name="xpectr"; version="0.4.1"; sha256="0sr3qr8h07s409k1igzvank1hi040rmf2gia8ydazfiff9zn49ni"; depends=[checkmate clipr dplyr fansi lifecycle plyr rlang rstudioapi testthat tibble withr]; }; + xpectr = derive2 { name="xpectr"; version="0.4.2"; sha256="0pbpv3k1h7xglyry1pxjqvkbp6vhk2yl4nlvd5xwz29vlnda7gd8"; 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]; }; xpose = derive2 { name="xpose"; version="0.4.13"; sha256="0sbr5br8jzszn6j7jccrdfn95svdlqxn8xqjp29zdxnp3zjlkkd5"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; }; @@ -18582,11 +18877,11 @@ in with self; { xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; }; yaConsensus = derive2 { name="yaConsensus"; version="1.0"; sha256="1srph1yc8lr00yvx6sjm0br9h2cq94xqb9yjxfb0bqvvmskp6s2s"; depends=[doParallel foreach pheatmap]; }; yaImpute = derive2 { name="yaImpute"; version="1.0-32"; sha256="1zvkrmlj48ahg9jq0fkbn7j603fmmld57yc0gjfas2mqa7cfbvh8"; depends=[]; }; - yacca = derive2 { name="yacca"; version="1.1.1"; sha256="1hxgkyxipk27p74vdkiy8a3wjymhcsc6ad3y9mf15qsl2xim6wwl"; depends=[]; }; + yacca = derive2 { name="yacca"; version="1.4-2"; sha256="197iv7qcbp9xx8kmpwb98acpkgzn9m7sncn6qi7k0chjx78095ws"; depends=[]; }; yager = derive2 { name="yager"; version="0.1.1"; sha256="178ypdr3f0w9rb4ci8q2hshr62b7993m8q6zxc4pf0msq175n1ml"; depends=[lhs MLmetrics randtoolbox]; }; yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; }; - yaml = derive2 { name="yaml"; version="2.2.1"; sha256="10r7g26x73am45niigm3k466030nymnr3v3fjljafzrr5aybf58i"; depends=[]; }; - yamlet = derive2 { name="yamlet"; version="0.7.7"; sha256="0yxvwf1qgjzqci0agnsd91anfjnc892dzqzdrxbqxsrcz28zhvcj"; depends=[csv dplyr encode ggplot2 rlang spork tidyr units xtable yaml]; }; + yaml = derive2 { name="yaml"; version="2.3.5"; sha256="0h2ixd95ww12ir13fdzbvjq4lsz6l8hmgv4bbsi89qd0ah2nrpry"; depends=[]; }; + yamlet = derive2 { name="yamlet"; version="0.8.5"; sha256="0yhfyqkbj147sjrm4sc9va1c59ayzh2wxwasaz8vr2ri9qmmk91i"; depends=[csv dplyr encode ggplot2 rlang spork tidyr units xtable yaml]; }; yamlme = derive2 { name="yamlme"; version="0.1.1"; sha256="1cknx8ndcb9rz1j7z27244vba8hxyh5sa9zwsv6rwk9g1c52vmyg"; depends=[]; }; yap = derive2 { name="yap"; version="0.1.1"; sha256="0m126vpfvlmwkpy14i9wbzr51hb8r6s3wcdm3vp9izfccpnxfxl2"; depends=[lhs randtoolbox]; }; yaps = derive2 { name="yaps"; version="1.2.5"; sha256="0309vc67v5kfbdcah5gnvdqwdxir4k1ik47dw6msw2hvg6lpqvqf"; depends=[circular cowplot data_table ggplot2 ggrepel nloptr plyr Rcpp RcppEigen reshape2 splusTimeSeries tictoc TMB viridis zoo]; }; @@ -18601,35 +18896,36 @@ in with self; { yhatr = derive2 { name="yhatr"; version="0.15.1"; sha256="18g2cr1kjxnfw6cwzl62ynppfv1zz732kbx18zq8918l85kx6wbw"; depends=[httr jsonlite stringr]; }; ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; }; yll = derive2 { name="yll"; version="1.0.0"; sha256="0lf3cd6pfzki29nk2iy0vd6v4dw6zlsbrjh2839zq5vlpiimsvck"; depends=[]; }; + ymd = derive2 { name="ymd"; version="0.0.1"; sha256="02cd7y28s406yzvax2d47xwrsqyd8mhhb879ywjqfj6lvwf3jvkd"; depends=[]; }; ymlthis = derive2 { name="ymlthis"; version="0.1.5"; sha256="02flsiqzpasyvskzlygllmrc1vbd4cv6yx4cdfiqrcq1806kdrf2"; depends=[crayon fs glue magrittr miniUI purrr rlang rmarkdown rstudioapi shiny shinyBS stringr usethis whoami withr yaml]; }; yonder = derive2 { name="yonder"; version="0.2.0"; sha256="1ilzn17w6skd0dhwxyrgnfzyazafp8hsi8q6pfxz6k16cd668mc0"; depends=[htmltools magrittr shiny]; }; - yorkr = derive2 { name="yorkr"; version="0.0.30"; sha256="09xw5igv7p3gyhzfnlzaym61z6ilv7b5lqz2z2qbki1qb3rvh613"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; }; + yorkr = derive2 { name="yorkr"; version="0.0.31"; sha256="0fsj7j3qlf9q708hd9fq2yqsxsyaxr8gd93crq48nnirw3q9nshn"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; }; + youngSwimmers = derive2 { name="youngSwimmers"; version="0.0.1"; sha256="02ih66ad8v5qkgyszllkh9319sfd6fqcci4zrvbjr1dfwlwa2ri1"; depends=[data_table lifecycle]; }; youtubecaption = derive2 { name="youtubecaption"; version="1.0.0"; sha256="15cafl7b03xrql2y2ayy6ajf6v764wym3xqs4pbzlf6ncy8qwl5r"; depends=[dplyr magrittr purrr reticulate stringr tibble writexl]; }; yowie = derive2 { name="yowie"; version="0.1.0"; sha256="1sm3dg4sirvlb17ciwldvnc1zzfgwxm38x1k2n99nwa6sygn1nrw"; depends=[tsibble]; }; ypr = derive2 { name="ypr"; version="0.5.2"; sha256="1bbcwy4hngai6cajgcir1g6hdjh9xdpfcxqzm8ba8ikyjfzwn9bw"; depends=[chk ggplot2 lifecycle purrr scales yesno]; }; ypssc = derive2 { name="ypssc"; version="1.1.0"; sha256="0fpph19amj1cafcbh5k6s75pi7nahzgfvnsbs9i5644gv43iavbj"; depends=[dplyr eulerr Peptides readxl spelling stringr svDialogs]; }; - yuima = derive2 { name="yuima"; version="1.9.6"; sha256="1iqcv6m2lbdnpkcmgbmjhdn233pq3b2g6s9naiq3ks0fyv04zpar"; depends=[boot cubature expm glassoFast mvtnorm Rcpp RcppArmadillo zoo]; }; + yuima = derive2 { name="yuima"; version="1.15.3"; sha256="1l3cxzjm6vffi64dsxryw8y3n8bpkk1yq74a1291z73scjabax34"; depends=[boot calculus coda cubature expm glassoFast mvtnorm Rcpp RcppArmadillo zoo]; }; yuimaGUI = derive2 { name="yuimaGUI"; version="1.3.0"; sha256="1znwfkhnmv9m32izikziqpgxx8gpw50786r81va808x7q058cp5n"; depends=[DT ggplot2 ghyp plotly quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; }; yulab_utils = derive2 { name="yulab.utils"; version="0.0.4"; sha256="1bj93gnj7j4b7dgkbr5v22rsbwfcw5dvipl5irmidaakvrihd19q"; depends=[]; }; yum = derive2 { name="yum"; version="0.1.0"; sha256="1k9q34n1pzv4c7hp7cd4yhm8v1qv41an8vfh65n4byvyzipxp85y"; depends=[yaml]; }; yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; }; - zCompositions = derive2 { name="zCompositions"; version="1.3.4"; sha256="15cfqk1vzamz66y9idnrwxlrp2sirkp44gwkcmia4s13x5pwh8mf"; depends=[MASS NADA truncnorm]; }; - zGPS_AO = derive2 { name="zGPS.AO"; version="0.1.0"; sha256="18dqssnj4gch1yg0qvrj4j2ry95sy6a9z8yz2zi8nzhhsj8dz1qq"; depends=[doParallel doRNG dplyr foreach ggplot2 hrbrthemes MASS plotly pscl questionr viridis]; }; + zCompositions = derive2 { name="zCompositions"; version="1.4.0"; sha256="032kgr5k36d0ffmdg984xx6pl4sq3m9gsiz96qc8p631m05ps3d0"; 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=[]; }; zbank = derive2 { name="zbank"; version="0.1.0"; sha256="0vzvlri3sncvbz2cdg8wzlpskm1lq9ji0jrfy5cx4ib19m6gxhpc"; depends=[crul jsonlite tibble]; }; - zcurve = derive2 { name="zcurve"; version="1.0.9"; sha256="0hrgf8id2fdy5xakgif508kl8sddil01mwrq4fnchajzrgp2lb9w"; depends=[evmix nleqslv Rcpp Rdpack]; }; + zcurve = derive2 { name="zcurve"; version="2.1.2"; sha256="0j5adicqvdbvqq70163ibv09qaxzhdrphh4xgjvipvw9akmmcy0j"; depends=[evmix nleqslv Rcpp Rdpack]; }; zdeskR = derive2 { name="zdeskR"; version="0.1.1"; sha256="0fqayn2g7903qs51x4ymy0aq36bwrgvp1k2701cd02zvnxy91l3j"; 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.1.3.0"; sha256="1rlcrvhic110h8r0mqwhkzq8w566jfymxpcwv63bvs7fd8j98vsv"; depends=[foreach ggplot2 iterators plyr reshape2]; }; zeitgebr = derive2 { name="zeitgebr"; version="0.3.5"; sha256="1h2zx3ah1xdyyag40ragrv7gvpnlzqmappbnjp971dn9khqdxfqs"; depends=[behavr data_table lomb pracma WaveletComp]; }; - zen4R = derive2 { name="zen4R"; version="0.5-2"; sha256="0r9xzi8k4s03hdjg3vs67lbhbslsw3l5q2zplpiv8yw8hngh9dhx"; depends=[httr jsonlite keyring R6 xml2]; }; + zen4R = derive2 { name="zen4R"; version="0.5-3"; sha256="1kw3gx1d1azhxg8rkqib8xvhqfwbxwr6r8gfjw0l9y1c69b6gbni"; depends=[httr jsonlite keyring R6 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]; }; zeroEQpart = derive2 { name="zeroEQpart"; version="0.1.0"; sha256="1n24nqyl0irpyspwx4b73xy228a84aa8zsn9fcf2lrlni5vyzmm0"; depends=[MASS ppcor]; }; zetadiv = derive2 { name="zetadiv"; version="1.2.0"; sha256="0068k5i0dvii3dckgis5424xb7sqqq9s670vgfavc0vncnlycxqk"; depends=[car glm2 Imap mgcv nnls scam vegan]; }; zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; }; - zfit = derive2 { name="zfit"; version="0.1.0"; sha256="0r6qdygpqd06vmfvj68ksxm3bz0jgalczr6rngcr4xl2mkb1cn38"; depends=[magrittr]; }; + zfit = derive2 { name="zfit"; version="0.3.0"; sha256="0qzfl1fvs3rw5fnf27d26arbi70bj2cgbg7b8jbnka2vb2c20kwm"; depends=[]; }; zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; }; zip = derive2 { name="zip"; version="2.2.0"; sha256="1n5ryjdj3i16b4mdp29wapgaklz3yzas5k8ffx7q6fa0jry9i5cz"; depends=[]; }; zipR = derive2 { name="zipR"; version="0.1.1"; sha256="1aaw3dslhsw3zgxvkc1v60vsk44x64i4qmjwx0gq4f7dad1rbiqp"; depends=[]; }; @@ -18640,9 +18936,10 @@ in with self; { ziphsmm = derive2 { name="ziphsmm"; version="2.0.6"; sha256="0lm6m2g9jd1v7gxv4viych8c59phbvz1yly1ydgajl8q251d8n87"; depends=[pracma Rcpp RcppArmadillo]; }; zipsae = derive2 { name="zipsae"; version="1.0.2"; sha256="03kwfpjpwxqlphdy7xyhsf7d0mcg67jhvm7yz4i73ckmjdmq7wrd"; depends=[]; }; zlog = derive2 { name="zlog"; version="1.0.0"; sha256="1d5j31p0h3rrn230087h3ngpvwknlisjv0f1qdbicdj9m177spci"; depends=[]; }; + zmisc = derive2 { name="zmisc"; version="0.2.1"; sha256="10cb1zmzasqxr5sdkqn4hylp7qaxzgdf9gzp0dc97yhgcf5p0i5n"; depends=[]; }; zoeppritz = derive2 { name="zoeppritz"; version="1.0-8"; sha256="1711szx9zz17q6pfinyzlyrw7m9772c8ywlixqar2l165bkjalgm"; depends=[]; }; zoib = derive2 { name="zoib"; version="1.5.5"; sha256="0inm7f2pc68ksqxvq12xp9jc99vj7ydylvs24ip12nksbj5k1n8f"; depends=[abind coda Formula rjags]; }; - zoid = derive2 { name="zoid"; version="1.0.0"; sha256="12gvb80ybnhc3yij1kgffhx2xygamjr4yli405dyndh0n5q6kxvy"; depends=[BH compositions gtools Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; }; + zoid = derive2 { name="zoid"; version="1.1.0"; sha256="0x37250fq3a3jbl1a2p8zkbacwzhc1xylk1nnfmx2fcgjif40lmq"; 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]; }; @@ -18661,101 +18958,193 @@ in with self; { zzlite = derive2 { name="zzlite"; version="0.1.2"; sha256="0vi1slx2s4r5zf82lazqv0c3m12xq73wlgsbz6af4y00h0bkr3ps"; depends=[httr jsonlite]; }; ACSNMineR = derive2 { name="ACSNMineR"; version="0.16.8.25"; sha256="0gh604s8qall6zfjlwcg2ilxjvz08dplf9k5g47idhv43scm748l"; depends=[ggplot2 gridExtra scales]; broken = true; }; AMORE = derive2 { name="AMORE"; version="0.2-16"; sha256="0vw6hhykg1r6xxja6d4zb2y00x7pfkmhcq9xkidz8p4arinb7xnl"; depends=[]; broken = true; }; + AWAPer = derive2 { name="AWAPer"; version="0.1.46"; sha256="02n662wvd8qwshfmj9qfff730qs6ls82hkdsphw05jj6llddi4k5"; depends=[chron Evapotranspiration maptools ncdf4 raster sp xts zoo]; 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; }; 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; }; BALD = derive2 { name="BALD"; version="1.0.0-3"; sha256="1azyqami07g3ax60j0ws3d1qha65k0svn2v5c9pisni0qch5xql0"; depends=[lattice logspline rjags]; broken = true; }; BCA = derive2 { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23cvdj3imps0l6qs1p4465j5nf"; depends=[car clv flexclust Rcmdr RcmdrMisc rpart]; broken = true; }; + BCT = derive2 { name="BCT"; version="1.1"; sha256="058iir5mhgc7zy1nha8g6299ya9jvg1skxj3flgn3b97snjx5qky"; depends=[igraph Rcpp stringr]; broken = true; }; BIS = derive2 { name="BIS"; version="0.2.1"; sha256="0mngmchgc46wc9a7ksyqrvj6k46nm4ih7x69k3xijfia9bgkym0v"; depends=[dplyr readr rvest tidyr xml2]; broken = true; }; BNN = derive2 { name="BNN"; version="1.0.2"; sha256="13h9xqfdqnc9d8brx1xlmvb4nrkpwncwjz98y7i3wijih85wkikd"; depends=[mvtnorm]; broken = true; }; + BayesValidate = derive2 { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; broken = true; }; + BigDataStatMeth = derive2 { name="BigDataStatMeth"; version="0.99.14"; sha256="05mmi12wn0xis4vwjn9zi3gcpxm9jmp7kpfazxsasbwgvrdd9k3q"; 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; }; 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; }; - CPE = derive2 { name="CPE"; version="1.5.1"; sha256="0n3pd6daj0mzhh547syh7nz8iys6q27igqngldb8zd4ib4778603"; depends=[rms survival]; broken = true; }; - CatPredi = derive2 { name="CatPredi"; version="1.2"; sha256="029haj44smz2k6vpk10bv3ri9qsy0ss2fn1mhw8vj42f3g8i39jb"; depends=[CPE mgcv rgenoud rms survival]; broken = true; }; + BoutrosLab_plotting_general = derive2 { name="BoutrosLab.plotting.general"; version="6.0.3"; sha256="0sirpdp7k28wwn5k5wyc0ib6abb5b1qpjrrk3m168x5yg1s2hqkf"; depends=[cluster e1071 gridExtra gtable hexbin lattice latticeExtra MASS]; broken = true; }; + CCpop = derive2 { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; 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; }; + CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; broken = true; }; + ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; broken = true; }; + ClimDown = derive2 { name="ClimDown"; version="1.0.8"; sha256="0qcag9jwvhi9yss55wy5jxabrvym9hljn1fs5gfkzjs5hiwv3gxv"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; broken = true; }; ConfoundedMeta = derive2 { name="ConfoundedMeta"; version="1.3.0"; sha256="17l6dfff2v0a4p022qclrmkzi78ga9adkgxgrgk9imz0n9m9424d"; depends=[ggplot2 metafor]; broken = true; }; + CreditMetrics = derive2 { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; broken = true; }; CytobankAPIstats = derive2 { name="CytobankAPIstats"; version="2.0"; sha256="0xczcgaxd8dv6fd1j5c8y4il852lq8859d1y16sxs8a3gqn9fbz2"; depends=[CytobankAPI pheatmap shiny shinyFiles xlsx]; broken = true; }; - DNH4 = derive2 { name="DNH4"; version="0.1.11"; sha256="15a1hq8f8nz200apbm28dwyphl18rhicmf7irsdj0z1n1j898c44"; depends=[httr rvest tibble tidyr xml2]; broken = true; }; + DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; broken = true; }; DataEntry = derive2 { name="DataEntry"; version="0.9-3"; sha256="0gfsg7wfwy88x7y1dwpgwi6fkizjnhrzj0a5ij70y4a4sjmyiy55"; depends=[digest gWidgets2 gWidgets2RGtk2 RGtk2]; broken = true; }; + DeducerSpatial = derive2 { name="DeducerSpatial"; version="0.7"; sha256="0133qk3yjcifyha7c4pqr5s0hmbci72bzgil2r0sxjmrljs3q727"; depends=[Deducer Hmisc JavaGD maptools OpenStreetMap rgdal scales sp UScensus2010]; broken = true; }; DengueRT = derive2 { name="DengueRT"; version="1.0.1"; sha256="11qfg4l6y3j8qh4dcsz13xjjj1n0q71c9a3c180nm5lgqv0nwb81"; depends=[drc ggplot2 nlme]; broken = true; }; + DiPs = derive2 { name="DiPs"; version="0.6.2"; sha256="13n50wakvh7ny342xl007k1dfbwmgzg8kxvgcpfblaypqn48q09f"; depends=[liqueueR mvnfast plyr]; 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; }; + EL = derive2 { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; broken = true; }; + EasyHTMLReport = derive2 { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; broken = true; }; Eunomia = derive2 { name="Eunomia"; version="1.0.1"; sha256="06a42qsf3nx1pbynikkdvmbhh1rmgnfmiggdn86b3a0ij6cq0p2r"; depends=[DatabaseConnector RSQLite SqlRender]; broken = true; }; - FLightR = derive2 { name="FLightR"; version="0.5.1"; sha256="14188r6kk194ir0l8byaqlly4lsg8w58lw5xx2s4abyhbn35kwq8"; depends=[bit CircStats circular fields GeoLight ggmap ggplot2 ggsn maptools mgcv nlme RcppArmadillo rgdal rgeos sp truncnorm]; broken = true; }; - GUTS = derive2 { name="GUTS"; version="1.2"; sha256="0s6if1b7hl299r03d6w6jvfiwm4xqrqqgqch3wf3b9davk4m7yj5"; depends=[Rcpp]; broken = true; }; + FAVAR = derive2 { name="FAVAR"; version="0.1.0"; sha256="04ajrq5wii4mccnaxn3wsn7kdfd2pydxaygk6dnbhc6610xs8bc5"; depends=[bvartools coda doParallel dplyr foreach ggplot2 magrittr matlab Matrix MCMCpack]; broken = true; }; + FitARMA = derive2 { name="FitARMA"; version="1.6.1"; sha256="02di0pkz6hh92glpn3li6z9azkcqa64ja8zfpy0mkh1l97mw6jsv"; depends=[FitAR]; broken = true; }; + FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; broken = true; }; + GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; broken = true; }; + GHap = derive2 { name="GHap"; version="2.0.0"; sha256="0br9civfdlksn5xmyrvz2y0knikcd2i175kddxjdqmiyyayckc8w"; depends=[class data_table e1071 lme4 Matrix]; broken = true; }; GeneBook = derive2 { name="GeneBook"; version="1.0"; sha256="1cg8zyr7rbshj3shhzkrxs910dsz4brhh51jvn2qzipzd8dbvxiv"; depends=[dplyr repmis stringr svDialogs]; broken = true; }; GeoLight = derive2 { name="GeoLight"; version="2.0.0"; sha256="1i49hyj3f5rcw0s6j2csnfwc6mnp5zn44vxjnk05wdkpw6dpvx5i"; depends=[changepoint fields maps MASS]; broken = true; }; + HRM_curve = derive2 { name="HRM.curve"; version="0.0.1"; sha256="0p3kvldpz347c0cdjkrdm0x2nfj85hm5cp59lirqhq77hf1zfnd5"; depends=[]; broken = true; }; + HSAR = derive2 { name="HSAR"; version="0.5.1"; sha256="03ryscvgiiwjcqk6gy3251nqqk43x508kz3ibw35hi84m2s7fsxj"; depends=[Rcpp RcppArmadillo spatialreg spdep]; broken = true; }; 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; }; + HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; broken = true; }; ICSsmoothing = derive2 { name="ICSsmoothing"; version="1.2.5"; sha256="08m8p6y5zk54ha3wp5x9xbx6f2xkkqx232hsan1f1s8k9j3q5avd"; depends=[ggplot2 polynom]; broken = true; }; + IMAGE = derive2 { name="IMAGE"; version="1.0"; sha256="0xgrja7qhklcmbm0zz5xg94gw5kl05nk3v77l7vxq2d5sk0435g3"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; 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; }; 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; }; ISEtools = derive2 { name="ISEtools"; version="3.1.1.1"; sha256="00d6znqz2mfmyi9ijgrg2pwl4lnvvsy00ysa7a7vjq7ip8qvcjfq"; depends=[coda Xmisc]; broken = true; }; ISR3 = derive2 { name="ISR3"; version="0.98"; sha256="0mmpdl9ndlj9i0k3zl7ja0g7y9pm67igw925ld5qnz7a36plygxs"; 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; }; + Interpol_T = derive2 { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[chron date]; broken = true; }; JMcmprsk = derive2 { name="JMcmprsk"; version="0.9.10"; sha256="1hkylfrr2036vgkxfs98szm3883bmyvvyr0f3a8xygccf3pn28xc"; depends=[dplyr MASS pracma Rcpp reshape2 statmod]; broken = true; }; + KODAMA = derive2 { name="KODAMA"; version="1.8"; sha256="0i1lwjzxjpm9yng763hkbi88q13i9bhcwwin6b3lkif34r4c3n8y"; depends=[minerva Rcpp RcppArmadillo]; broken = true; }; + KernelICA = derive2 { name="KernelICA"; version="0.1.0"; sha256="1yq7w24qq23c81a9y0jn36iw7zjbxsj3b3p1rq6yl0lanzda9bsr"; depends=[ICtest inline JADE ManifoldOptim Rcpp RcppArmadillo RcppEigen]; broken = true; }; + Knoema = derive2 { name="Knoema"; version="0.1.19"; sha256="16izh1viaqxvhgfxy2g6b9hhvm1n6nbjsj2xd45qwdibl3ly8d0f"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; broken = true; }; + KnowGRRF = derive2 { name="KnowGRRF"; version="1.0"; sha256="0nk0baibd184rsg23jx1wg4c2fcaqf8ww7822xrs3w5ym6vwd0rs"; depends=[MASS PRROC randomForest RRF]; broken = true; }; + LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; broken = true; }; LBC = derive2 { name="LBC"; version="1.0"; sha256="027q5dk771a5v7g0il7kcczfyf6cqfb4vb3y0j7gwr02bq4360wm"; depends=[]; broken = true; }; - MAFDash = derive2 { name="MAFDash"; version="0.1.0"; sha256="0xk9zbdwmm597jck8v3w76d2s72k6amv8ya94y7jbnik60ndwnda"; depends=[bsplus canvasXpress circlize ComplexHeatmap crosstalk data_table dplyr DT ensurer flexdashboard GenomicRanges ggbeeswarm ggplot2 htmltools IRanges knitr maftools pheatmap plotly RColorBrewer reshape2 rmarkdown TCGAbiolinks]; broken = true; }; + LDOD = derive2 { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rmpfr Rsolnp]; broken = true; }; + LIHNPSD = derive2 { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[BB Bolstad2 moments optimx Rmpfr sn]; broken = true; }; + LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; broken = true; }; + MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; broken = true; }; + MAc = derive2 { name="MAc"; version="1.1.1"; sha256="1dawqmziffaz8wgcqzwc0yifdq65abgn24vafkrwa9850048c26f"; depends=[]; broken = true; }; MHTcop = derive2 { name="MHTcop"; version="0.1.1"; sha256="1mr8y8brsi37b5qx3fqm0bj90dgknzzwhxfmvyd9kxbxh19whgxq"; depends=[copula matrixStats MCMCpack mvtnorm stabledist]; 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; }; MRMR = derive2 { name="MRMR"; version="0.1.4"; sha256="0dgbhlynaaka7mdzl6igwgcdzvy6cm2y8mbxaf9pfla8w3z8y0lq"; depends=[ggplot2 lmtest lubridate plyr reshape2]; broken = true; }; MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; broken = true; }; + MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; broken = true; }; MetaboLouise = derive2 { name="MetaboLouise"; version="1.0.0"; sha256="1agcp520in0wpxv3x2jvvmv61hasazdymnvjhzl66nwv8lifl98z"; depends=[igraph]; broken = true; }; + Meth27QC = derive2 { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0jmv64iyq7slp1x1xl35h2rv1b6zbd4658"; depends=[gplots]; broken = true; }; Myrrix = derive2 { name="Myrrix"; version="1.2"; sha256="05x2h4ppjhfm0wlpwyp8ycjg59qj3gv0yqdilxrzb1lkrzln92xb"; depends=[Myrrixjars rJava]; broken = true; }; Myrrixjars = derive2 { name="Myrrixjars"; version="1.0-2"; sha256="1hhfg83z5kl6l250z3lippx3qc68k1wj1qlfzd6m66rgmk699gyl"; depends=[rJava]; broken = true; }; - N2H4 = derive2 { name="N2H4"; version="0.5.9"; sha256="09ikdnn17zx9l683k6mrc4hifxnd5d7fjxm6qdvxxbn10dh6qgvj"; depends=[dplyr httr jsonlite lubridate rvest tibble tidyr xml2]; broken = true; }; + NLMR = derive2 { name="NLMR"; version="1.1"; sha256="1m08nm71wbam6d8nj8akwqrm6nq5bvm3v76kdlasdgs7v36xzri6"; depends=[checkmate dplyr fasterize igraph RandomFields raster Rcpp sf spatstat_core spatstat_geom tibble]; broken = true; }; + NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; broken = true; }; + NetData = derive2 { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; broken = true; }; OligoSpecificitySystem = derive2 { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; broken = true; }; + Omisc = derive2 { name="Omisc"; version="0.1.4"; sha256="1f6aakywjabq0xds5yl70ivr1jmw26zry2m65xszfp8p5mp45c7g"; depends=[copula MASS psych]; broken = true; }; OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; broken = true; }; OutlierDC = derive2 { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[Formula quantreg survival]; broken = true; }; PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; broken = true; }; + PCObw = derive2 { name="PCObw"; version="0.0.0"; sha256="1mz9fpd8k0fs14gvs9bhzrpydz200fsg52njaw2nr08184q78r4y"; depends=[Rcpp RcppEigen]; broken = true; }; POPdemog = derive2 { name="POPdemog"; version="1.0.3"; sha256="0j83c853ligmw8ag4pb0vj46sfn2w2ynh4wvgkabzs688hxxni8r"; depends=[]; broken = true; }; + PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; broken = true; }; + PVplr = derive2 { name="PVplr"; version="0.1.0"; sha256="1ssmdhq2qczk6n50f8jj4j3nym7jj9bshfc1f29lccvmp7wxdp9a"; depends=[broom cluster dplyr ggplot2 magrittr minpack_lm purrr rlang segmented stlplus tidyr]; broken = true; }; + ParallelTree = derive2 { name="ParallelTree"; version="0.1.3"; sha256="1h53qwhc63fglm452b3by7f3g6f3hyqwkmwmbdqdb9rv3j4gvnvg"; depends=[ggplot2]; broken = true; }; + PatternClass = derive2 { name="PatternClass"; version="2.0.1"; sha256="1xwlk6shms38nqxad3d15254wgnkfzy7jyf5w9bbm96kg05mndbz"; depends=[landscapemetrics raster]; 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; }; - QZ = derive2 { name="QZ"; version="0.2-1"; sha256="1xivasa5dppm9z02ki6ciqxj0ybxch41w1xszl9zqrf755b6f6xw"; depends=[Matrix]; broken = true; }; + PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; broken = true; }; + PopGenKit = derive2 { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; broken = true; }; + PoweR = derive2 { name="PoweR"; version="1.0.7"; sha256="040wc7hxa8y6bm1rs7ip2skdxmmwksxkyb6xzqgdjp8m7a25fppb"; depends=[Rcpp RcppArmadillo]; broken = true; }; + QuantPsyc = derive2 { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; broken = true; }; QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.6"; sha256="1520jgkzp8g7gv7ggqhvlrdnpdyhygqjgsd1my5jq30afdqj6qmp"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; broken = true; }; RAhrefs = derive2 { name="RAhrefs"; version="0.1.4"; sha256="0yd7jbv2x711dnhbvwjjg7qhg8h8bh5564amsv9bkqw661i042m3"; depends=[assertthat httr jsonlite testthat]; broken = true; }; + RBestMatch = derive2 { name="RBestMatch"; version="0.1.1"; sha256="1nx1dnhlqi4gad1yw6h91av911wv6dap252hza98dgjysv46spya"; depends=[DiPs mvnfast plyr]; broken = true; }; RCSL = derive2 { name="RCSL"; version="0.99.95"; sha256="1ngzbhrc74ljhidsf7a17k4hyx0igv2srgbf822gm2wawzsmp0y2"; depends=[ggplot2 igraph mclust NbClust pracma RcppAnnoy Rtsne SingleCellExperiment umap]; broken = true; }; + RClone = derive2 { name="RClone"; version="1.0.3"; sha256="1zcb7s88qkpcbkhvawggsckzs5d9s9l9kr2c2njrr86ymq7lgwdj"; depends=[]; broken = true; }; RDFTensor = derive2 { name="RDFTensor"; version="1.3"; sha256="1kfhhn0lb1r61bkgxn7rv1smgk8b7vxbc8y97hdmg5argiywc65i"; depends=[doParallel foreach Matrix pracma]; broken = true; }; + RGCxGC = derive2 { name="RGCxGC"; version="1.1-2"; sha256="03ihqra8q50a98adgxrx8l7js963f41kg2fy3lxzh9zma4gzj62q"; depends=[colorRamps mixOmics ptw Rdpack RNetCDF]; broken = true; }; RGtk2 = derive2 { name="RGtk2"; version="2.20.36.2"; sha256="1m3a3h3yxmr2qpcdyxrwxrdplvhb4rprvd8cnmfwk3zkazd69f9n"; depends=[]; broken = true; }; + RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; broken = true; }; RNRCS = derive2 { name="RNRCS"; version="0.2.5"; sha256="19q78l8mh4701vqvr36vqc87n39s5ivzhiy5lvnxbd4dgibk1jr2"; depends=[ggplot2 magrittr rvest xml2]; broken = true; }; + ROI_plugin_clp = derive2 { name="ROI.plugin.clp"; version="0.4"; sha256="0fzrb4q2mcf3j4d4j8r354n6fyv2rik0ypp01l54zbm8s2r29bwb"; depends=[Matrix ROI slam]; broken = true; }; + RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; broken = true; }; RSCABS = derive2 { name="RSCABS"; version="0.9.5"; sha256="193wbf1v18xv098i6abpglb239788d9gjzqbn8p3aai0la6y1pk3"; depends=[gWidgets2 gWidgets2RGtk2 R2HTML RGtk2]; 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; }; RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-7"; sha256="07vh1wyp2rxhfrb4vi5njchrby99bynd88na8qjxcnbypkgsrhbl"; depends=[BH Rcpp RcppArmadillo]; broken = true; }; RefFreeEWAS = derive2 { name="RefFreeEWAS"; version="2.2"; sha256="1aya34iz5v3xfpj86x9ab998m7fdwl138ly007mgdayacvqi4a6y"; depends=[quadprog]; broken = true; }; + Reliability = derive2 { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; 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; }; + Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1.1"; sha256="0kaxhaa65k1hkhl4kqfxyyk6v967xncrdr5hy8b808zlbqriankc"; depends=[]; broken = true; }; + SASPECT = derive2 { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; broken = true; }; + SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; broken = true; }; SDraw = derive2 { name="SDraw"; version="2.1.13"; sha256="1kx8kfga3zspfdgf9vq2lclszrhf3bfwkfhwqri64kn8fdr34jsq"; depends=[covr deldir rgeos sp spsurvey]; broken = true; }; + SEA = derive2 { name="SEA"; version="2.0"; sha256="1pw1509qjjqz63a8biwakdxqgln7kjviacqrjvp1323vf55bi4fs"; depends=[data_table doParallel foreach kolmim KScorrect MASS shiny]; broken = true; }; SEAA = derive2 { name="SEAA"; version="0.9.6"; sha256="0f1j8pq3a0liyjxjlc91v8nm5y0fr8fq7qlhdayvkf1fx96srqs2"; depends=[clusterProfiler ggforce ggplot2 ggpubr ggrepel gridExtra org_Hs_eg_db org_Mm_eg_db reshape2 Rsubread tidyr]; broken = true; }; - SoilR = derive2 { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; broken = true; }; + SEMModComp = derive2 { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; broken = true; }; + SII = derive2 { name="SII"; version="1.0.3.1"; sha256="1xvk04b7725ksfd7h4p7px5zanbf6s7xlmjpb7w0nvbi6km2f7ri"; depends=[]; broken = true; }; + SIMMS = derive2 { name="SIMMS"; version="1.3.1"; sha256="0kgaky1hpvvbs2hbzaili9h9pv34c5drfh0d1rc8vf9099xw8575"; depends=[doParallel foreach glmnet MASS randomForestSRC survival]; broken = true; }; + SMC = derive2 { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; broken = true; }; + SPECIES = derive2 { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; broken = true; }; + SampleSizeProportions = derive2 { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; 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; }; + SoftRandomForest = derive2 { name="SoftRandomForest"; version="0.1.0"; sha256="1k439hcp53yg6f2x4bgafsri4jjgpva97dphzsdk5icfs5d38bh8"; depends=[boot]; 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; }; 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; }; + SurvGSD = derive2 { name="SurvGSD"; version="1.0.0"; sha256="0aa5zaf9akkqkxs8iqwnm93sfwakhhhs3qfafbk0vrwmb5yvzzm1"; depends=[flexsurv ldbounds mnormt]; broken = true; }; + Survgini = derive2 { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; broken = true; }; + SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; broken = true; }; + TDA = derive2 { name="TDA"; version="1.8.5"; sha256="16dpbgwkp58ibjck3yjziv5p852vn8qxv4v77z17r18909a0j8lp"; depends=[BH FNN igraph Rcpp RcppEigen scales]; broken = true; }; + TKCat = derive2 { name="TKCat"; version="0.7.1"; sha256="19iv6srfmvl30mnwxzxwzm5d6fmpgyan490fkszqhq7jjzjhbgg7"; depends=[base64enc DBI dplyr DT future getPass htmltools jsonlite jsonvalidate magrittr markdown promises RClickhouse readr ReDaMoR rlang shiny shinydashboard tidyselect uuid visNetwork xml2]; broken = true; }; TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; broken = true; }; - TNRS = derive2 { name="TNRS"; version="0.1.0"; sha256="146shb1dg4iyaanrdr1l8nqpiqf05la1ai34w74z6wsd1mpcchqy"; depends=[jsonlite RCurl rjson]; broken = true; }; - TileManager = derive2 { name="TileManager"; version="0.4.0"; sha256="0kc3wgk5n8cxg901c19fjfzq7na46jq0x3gy22fi4jccjb0vgv0v"; depends=[APfun raster rgeos sp XML]; broken = true; }; TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.0"; sha256="1lnh9lbjxaradivnd1dkd2szggjh2r4v7klpyxb862dxsmdxxrqw"; depends=[caret data_table dplyr lubridate neuralnet RCurl zoo]; broken = true; }; Tushare = derive2 { name="Tushare"; version="0.1.3"; sha256="12aabkwlifc82yiym3yijpfpjhmhfwpw8mz4fb11qm6n4igr1yhg"; depends=[data_table forecast httr tidyverse]; broken = true; }; - TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.1"; sha256="0xsqiq4x7vmhif9j8zi1smbchwm4fsbgb10i4vxi0biijybizk9z"; depends=[survival]; broken = true; }; + UNF = derive2 { name="UNF"; version="2.0.7"; sha256="1i7aj9w90c1bn581l820iasxhs4ibs7xwbhid7gdkz9f87cz568r"; depends=[base64enc digest]; broken = true; }; UncertainInterval = derive2 { name="UncertainInterval"; version="0.7.0"; sha256="1lywwjkbmlbxhp2ahmsw2f47i0p848cky7xx1lxrg5ydfzq9kzl5"; depends=[car MASS nloptr psych reshape2 shiny zoo]; broken = true; }; VNM = derive2 { name="VNM"; version="7.1"; sha256="19qglcibb7r6jjz0n0piklwfv3hi4jphd6vmyfbm0ccjjkmn5nin"; depends=[Rcpp]; broken = true; }; XPolaris = derive2 { name="XPolaris"; version="1.0.2"; sha256="1l05svscgkv9bzkawi2kp9zhchrhxxma3271b828j34pkrnnmq5m"; depends=[curl dplyr ggplot2 httr magrittr purrr raster sf tidyr]; 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; }; + abcdeFBA = derive2 { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; broken = true; }; abmR = derive2 { name="abmR"; version="1.0.4"; sha256="1sz27ym4lfzsf8413p3zdq51gcn9lp3bbgjgah0wfas4v3yyfsp4"; depends=[geosphere ggplot2 googledrive gstat gtsummary kableExtra purrr raster rgdal rgeos rnaturalearth rnaturalearthdata sf sp swfscMisc table1 tmap]; broken = true; }; - abn = derive2 { name="abn"; version="2.5-0"; sha256="1fqmhw0mhdl6az1gpg0byvx5snhz1pl3fqikhyfjcjrc9xbsq8yw"; depends=[lme4 nnet Rcpp RcppArmadillo Rgraphviz rjags]; broken = true; }; adoption = derive2 { name="adoption"; version="0.6.4"; sha256="1xjkvj1ys2xmjgswqfsrry27zyqcc9hk9khl0j4s72gcc8az8sz6"; depends=[quadprog RandomFieldsUtils tkrplot]; 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.1.0"; sha256="16cyqplzmwziqwkicix0sr06zhc0yx615iv3hda0cxbdyf2rllk3"; depends=[abind cowplot easyNCDF ggforce ggplot2 ggpubr gtable multiApply ncdf4 plyr raster reshape sp zoo]; broken = true; }; + algaeClassify = derive2 { name="algaeClassify"; version="1.2.0"; sha256="1sna5rij2ngpgqfz5cviqdbyr43xph8cbjc4vnm238n72zgg7cb6"; depends=[httr lubridate plyr RCurl rvest taxize XML xml2]; 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; }; - animint2 = derive2 { name="animint2"; version="2020.9.18"; sha256="17gr43hyb7yx9rsa0id5ibix09sai95pknc75cf31ra72mkpym8m"; depends=[digest gtable knitr lazyeval MASS plyr reshape2 RJSONIO scales tibble]; broken = true; }; + anchors = derive2 { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[MASS rgenoud]; broken = true; }; anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; broken = true; }; + aopdata = derive2 { name="aopdata"; version="0.2.3"; sha256="0zrk76p52lh5h34a9akm7fn4d71mk8ai9clsyiqya0hl2slymcm8"; depends=[curl data_table httr sf]; 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; }; arcos = derive2 { name="arcos"; version="1.27"; sha256="02s4vpfsipww6i73lhrdawqlg01gp929n4sx6z869b12jixnq3ni"; depends=[curl dplyr httr jsonlite magrittr stringr tidyr urltools vroom]; broken = true; }; artemis = derive2 { name="artemis"; version="1.1.1"; sha256="1v875xn0mvw7p7jdp6d3hpc4cp8yq2aq0b80rq1c619n9rkjq4ks"; depends=[BH ggplot2 lme4 loo Rcpp RcppEigen RcppParallel rstan rstantools StanHeaders]; broken = true; }; aspline = derive2 { name="aspline"; version="0.1.0"; sha256="1xywp471ly6f0n88lwhpwlg54fizdkjxksli9c60vbi8r56n46mr"; depends=[dplyr fda ggplot2 magrittr Matrix mgcv pryr pspline Rcpp reshape2 rlang splines2 tidyr]; broken = true; }; - assemblerr = derive2 { name="assemblerr"; version="0.1.0"; sha256="13vhn73v2429smf4av414xrm9vmbcxwhfgbq33zfdn7qyrj8wpv1"; depends=[cli glue magrittr purrr rlang tidyselect vctrs]; broken = true; }; automultinomial = derive2 { name="automultinomial"; version="2.0.0"; sha256="04rjg3xjlhnkchzvdxqm762z5abm81s5b9czgzmli30zh07bf3fd"; depends=[igraph Matrix numDeriv]; broken = true; }; + badgecreatr = derive2 { name="badgecreatr"; version="0.2.0"; sha256="0mdixklaxky5gs8zm99ky280vxxlbq1mxnaarq6x0d1cb71bzv4l"; depends=[git2r]; broken = true; }; + bapred = derive2 { name="bapred"; version="1.0"; sha256="08kvc4cc984jv08ikwbja8zxidrcdiwi5w88hlqakbm8yc6hzssa"; depends=[affy affyPLM Biobase FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; broken = true; }; batchr = derive2 { name="batchr"; version="0.0.2"; sha256="0fkrv6dlyla7bbl00f16lypnz5idyjz9kdqslgbx3pnfwx5hngwx"; depends=[chk cli furrr hms hmstimer yesno]; broken = true; }; + bayesmodels = derive2 { name="bayesmodels"; version="0.1.1"; sha256="1m9428fzirpfzypd2zdcqhjv2cm05s3qmlxj4ymz6i1dg32svqzr"; depends=[BASS bayesforecast brms bsts cli crayon dials dplyr magrittr modeltime parsnip purrr rlang Rlgt rstan rstudioapi tibble timetk workflows]; broken = true; }; + bcc = derive2 { name="bcc"; version="1.3.1"; sha256="0ac0wasdifd0v47r9sxrsix5hv7masiphn6dyxpqdrd11z7iimgz"; depends=[qcc]; broken = true; }; + betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; broken = true; }; + bigmatch = derive2 { name="bigmatch"; version="0.6.2"; sha256="16nmc0n78gzk8x8jhxdilj47gjqqv46sgiivccn5zkv08k1h3jj2"; depends=[liqueueR mvnfast plyr rcbalance]; broken = true; }; + binnednp = derive2 { name="binnednp"; version="0.4.0"; sha256="1qswrr982x5hy2vl2fc603j98cjli9l40zzvvjy2l91p8xxrc5dn"; depends=[doParallel fitdistrplus foreach kedd mclust nor1mix Rcpp Rdpack]; broken = true; }; binomialMix = derive2 { name="binomialMix"; version="1.0.1"; sha256="1ak3h0lgjmrv9miwn7fl6jvcp8xdld53swjz71q67q999s42np0m"; depends=[dplyr gmp lubridate MASS rlang Rmpfr stringr]; broken = true; }; + blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; broken = true; }; bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; broken = true; }; bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; broken = true; }; bnpmr = derive2 { name="bnpmr"; version="1.2"; sha256="0vpqhs1h2mphn9w5yngb7lxvmzrhn7mkj7ca6hykhhg48s2ra98g"; depends=[]; broken = true; }; + boostmtree = derive2 { name="boostmtree"; version="1.5.0"; sha256="18w5h8m6g4aszffyn0ixhzn2bgbrwrrcq2k54b70vbw00xqxmg1q"; depends=[nlme randomForestSRC]; 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; }; + brunnermunzel = derive2 { name="brunnermunzel"; version="1.4.1"; sha256="1lba5cpiray65zg1pv3xv6yl1xg78rqlwxkcmhgizlh1rhpd430p"; depends=[]; broken = true; }; cairoDevice = derive2 { name="cairoDevice"; version="2.28.2.1"; sha256="040gd6cyaabdi0lhfdba4isqjihj28hdxm7mc129nl863pxkx6qm"; depends=[]; broken = true; }; caliver = derive2 { name="caliver"; version="2.0.0"; sha256="04qa3zrk70c8ak70djfh23jyfxs8293s8wzkk6cs0nyrknhaxzzj"; depends=[ggplot2 lubridate ncdf4 raster rworldmap]; broken = true; }; + caschrono = derive2 { name="caschrono"; version="2.2"; sha256="0lbf7j6p5gzm4kk8sgzcmxwwzg59wp6g6l38m04609lpcsvxkd52"; depends=[Hmisc zoo]; broken = true; }; + catchr = derive2 { name="catchr"; version="0.2.31"; sha256="0mj3cgv2d217hcmyr8x0i83wysxhixgly5y1fs6jb1x09gs1cwnd"; depends=[purrr rlang]; broken = true; }; + cecs = derive2 { name="cecs"; version="0.2.4"; sha256="1fm1yrb8kd7f97kgsp5wfp02fspzvndki2aqsfcwb0rlrlckflzf"; depends=[cec2013 stringr]; broken = true; }; + cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; broken = true; }; circglmbayes = derive2 { name="circglmbayes"; version="1.3.0"; sha256="0i5aacr7vqznm3rhlznc02xjzjkjliadxhhvsmf8wb2cvivz0wir"; depends=[BH coda ggplot2 Rcpp RcppArmadillo reshape2 shiny]; broken = true; }; clpAPI = derive2 { name="clpAPI"; version="1.3.1"; sha256="0hjpdbmwaww5fznqkkg9jli5y8f8zyd7crn0imdb0xxypmnp7zgf"; depends=[]; 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; }; @@ -18763,109 +19152,203 @@ in with self; { 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; }; coreheat = derive2 { name="coreheat"; version="0.2.2"; sha256="1mahnd6k7whd7nj9ax1fhpm17j35i6prww06qx691l8dfn954ld9"; depends=[Biobase convertid heatmapFlex WGCNA]; broken = true; }; cplexAPI = derive2 { name="cplexAPI"; version="1.4.0"; sha256="00h2zir1ffzjiglfyq8bsfmgq9z155jr0k0fxv8fsbfyw2x9dg10"; depends=[]; broken = true; }; + crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; broken = true; }; + csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; broken = true; }; cuml = derive2 { name="cuml"; version="0.2.1"; sha256="1dmk1gvvzkwfra63qslax9cgqjbsiqam5wcjl955wpb0wdqpa54k"; depends=[ellipsis hardhat magrittr parsnip Rcpp rlang]; broken = true; }; - danstat = derive2 { name="danstat"; version="0.1.0"; sha256="1wb4v4s9qc7qna7jgd1kk0xvyaqmxhnmjvr5wlk5jjl355lhjxbc"; depends=[httr jsonlite readr]; broken = true; }; - data_validator = derive2 { name="data.validator"; version="0.1.5"; sha256="1p2dzn9q3vrqs3askp8ccriaxyhay8iyqhnaryr1drycwrd13wi8"; depends=[assertr dplyr htmltools htmlwidgets knitr purrr R6 rlang rmarkdown shiny shiny_semantic tibble tidyr]; broken = true; }; + darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; broken = true; }; + datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; 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; }; + datazoom_amazonia = derive2 { name="datazoom.amazonia"; version="0.2.0"; sha256="0l24blbscai47rj9s8a0znd5q4mayddp639107r8dib466ykrz3g"; depends=[data_table dplyr geobr googledrive Hmisc janitor labelled lubridate magrittr purrr RCurl readr readxl sf sidrar stringi stringr tibble tidyr XML]; broken = true; }; + dcortools = derive2 { name="dcortools"; version="0.1.2"; sha256="0p4qbah5jnb6jraka8bg6cks3namrz66bya2iz98q2adarqd517h"; depends=[ggplot2 Hmisc pheatmap Rcpp RcppArmadillo RcppEigen Rdpack Rfast]; broken = true; }; + dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; broken = true; }; + deltar = derive2 { name="deltar"; version="1.0.0"; sha256="1ki89ysz4qlq5z094ybg3aqfcb6g633ccvpj1cg6nri9z5qjwpm1"; depends=[Bchron]; broken = true; }; + diathor = derive2 { name="diathor"; version="0.0.9"; sha256="1p6y89vi37a8i3fwnj7rb0hdggk6qrxnsrw0sbpajzkwv1jvyal0"; depends=[algaeClassify data_table ggplot2 purrr stringdist stringr tibble tidyr vegan]; broken = true; }; diffman = derive2 { name="diffman"; version="0.1.1"; sha256="08b4kqxfg8pmyl2xg8flb581s9wnkdcy5rrmrxp8a89y265qmirx"; depends=[data_table dplyr igraph Matrix progress Rcpp sf tidyverse]; broken = true; }; dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; broken = true; }; dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; 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; }; - elo = derive2 { name="elo"; version="2.1.1"; sha256="1i6qcw2plw12v065142kx58d911zr1gcsd1xic152zxvh89nmhxx"; depends=[pROC Rcpp]; broken = true; }; + eBsc = derive2 { name="eBsc"; version="4.13"; sha256="0n4v07462kxcsyjdy0cjbkn48ryzfnrvj28gxpsxwzn2sddfpl86"; depends=[Brobdingnag MASS Matrix nlme Rcpp RcppArmadillo]; broken = true; }; + ech = derive2 { name="ech"; version="0.1.1.2"; sha256="1mw68dkm6n6zj27rmyw33gaha1nly1srr6v1d5iib72b1gwnik8l"; depends=[assertthat curl dplyr fs geouy glue haven janitor labelled laeken purrr readxl rlang srvyr statar stringr survey tidyr]; broken = true; }; + edbuildr = derive2 { name="edbuildr"; version="0.3.0"; sha256="19fsk8qkxyzncn614fy6hmmxpv1dikqghs101hbzd0g0a511xk8f"; depends=[dplyr magrittr openxlsx scales stringr tidyselect]; broken = true; }; + efts = derive2 { name="efts"; version="0.9-0"; sha256="1cdn37sij3q73z9gal6x3nnnds55whfj5ywyww119hx092xcb2h4"; depends=[lubridate magrittr ncdf4 plyr stringr udunits2 xts]; broken = true; }; + egcm = derive2 { name="egcm"; version="1.0.12"; sha256="0nssf5six1j7z6fss7478zdbsfx60myzw833m7nsnaf1r8n4ixaf"; depends=[ggplot2 MASS pracma quantmod tseries urca xts zoo]; broken = true; }; + emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; broken = true; }; emstreeR = derive2 { name="emstreeR"; version="2.2.2"; sha256="0lchkkn6s265xnk25bprijlc6nl62nwcp0l9nwplyw7q492ysg0q"; depends=[BBmisc BH ggplot2 Rcpp RcppArmadillo RcppMLPACK scatterplot3d]; broken = true; }; endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; broken = true; }; + epiGWAS = derive2 { name="epiGWAS"; version="1.0.2"; sha256="0jqblfmz02za3b2pgi15379bzgh98yv5kyv8kh0lkzhrmpgph2zj"; depends=[DescTools glmnet matrixStats SNPknock]; broken = true; }; + eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; 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; }; eventstudies = derive2 { name="eventstudies"; version="1.2.2"; sha256="01vpd0gnxaibxn3nq6618rxlwapm86idz86n0wj5kfz4a9kj7lsx"; depends=[boot sandwich testthat xts zoo]; broken = true; }; expands = derive2 { name="expands"; version="2.1.3"; sha256="00zb57gmpj86c7rvpqywpn4c5wl51immps935n3hd2fyk73vqljh"; depends=[ape commonsMath flexclust flexmix gplots matlab moments NbClust plyr RColorBrewer rJava]; broken = true; }; + expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; broken = true; }; + facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; broken = true; }; + factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; broken = true; }; + factualR = derive2 { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RCurl RJSONIO]; broken = true; }; + fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; broken = true; }; + fctbases = derive2 { name="fctbases"; version="1.1.0"; sha256="1jf6ngdph45l105cib13lghan7d68hsjqdr8wsjz2kls8il6kz9s"; depends=[Rcpp RcppArmadillo]; broken = true; }; + fdacluster = derive2 { name="fdacluster"; version="0.1.0"; sha256="17vk3v8saf3xqab8h92k88l2xfwa3mb0x40p1mdgywgg23nvk3mm"; depends=[dplyr ggplot2 magrittr nloptr purrr Rcpp RcppArmadillo tibble tidyr]; broken = true; }; feedeR = derive2 { name="feedeR"; version="0.0.10"; sha256="1p64c7ibwn6k5k3vsjxrcjr84czild7g8bqw0yv4axk52vk5jfkx"; depends=[digest dplyr lubridate readr stringr tibble xml2]; broken = true; }; + fidap = derive2 { name="fidap"; version="0.0.3"; sha256="0zq07395qx59xxb3cj5axhpkwnad2h88qbm3aan43q5cip9wi2bx"; depends=[httr jsonlite]; broken = true; }; + fisheyeR = derive2 { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; broken = true; }; + fishflux = derive2 { name="fishflux"; version="0.0.1.5"; sha256="0ni3r37s6dvj3mmr04fnr7fird4x2wxdxq9vxzabcgmx9f4ydfiz"; depends=[BH curl dplyr fishualize ggplot2 httr plyr Rcpp RcppEigen RcppParallel rfishbase rstan rstantools StanHeaders tidybayes tidyr]; broken = true; }; + fitdc = derive2 { name="fitdc"; version="0.0.1"; sha256="1b1abib7jkl7a6r686r53qjw2ywb9q2h67is8691kkaqxpawg30p"; depends=[]; broken = true; }; + flightplanning = derive2 { name="flightplanning"; version="0.8.4"; sha256="1n0mjrqlnfv4fvl512slw3d3vmlcn2lhf89jlfg2s0xfrd9k4pq8"; depends=[rgdal rgeos sp]; 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; }; fractalRegression = derive2 { name="fractalRegression"; version="1.0"; sha256="0lkxm3f9xz1c4kc81rfhd521q9jzsdb3ngrgn7nsawllpi2zrgwb"; depends=[Rcpp RcppArmadillo]; broken = true; }; + fsMTS = derive2 { name="fsMTS"; version="0.1.5"; sha256="1vxj9wkzpbk44hby4fdyhj72748c65by612kpphs6vmgzmw4y471"; depends=[freqdom glasso lars mpmi randomForestSRC]; broken = true; }; + ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; broken = true; }; fulltext = derive2 { name="fulltext"; version="2.0"; sha256="104wkas9azyb2drfaz1hrgbx2ilbb0k2mb8411l10rsbkqva099f"; depends=[aRxiv crul data_table digest fauxpas hoardr jsonlite magrittr microdemic pdftools rcrossref rentrez rplos storr tibble xml2]; broken = true; }; + fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; broken = true; }; gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-7"; sha256="14c933j0wj3lb5da75zxg3w3mfqh0nqk8rczbi4dnqd8sna6jks9"; depends=[gWidgets2 memoise RGtk2]; broken = true; }; gdmp = derive2 { name="gdmp"; version="0.2.0"; sha256="0fy8x9l6swrb78apwq9d9msz2y8dkfd2fkyp1pkmzxwdb85lmcdm"; depends=[]; broken = true; }; - genekitr = derive2 { name="genekitr"; version="0.2.1"; sha256="1xns8sq535w47l0pxja35pxgp4a5x0vnnyprmd363fi5ls9rwbi5"; depends=[clusterProfiler dplyr ggplot2 stringi stringr tibble tidyr VennDiagram]; broken = true; }; + geneNetBP = derive2 { name="geneNetBP"; version="2.0.1"; sha256="0sp1chyln5k2zsq7cdhvrqxwr2nhrll1pdl1l5g6fd4gjl2m1nwk"; depends=[bnlearn ggm gRain graph igraph Rgraphviz scales]; broken = true; }; + geobr = derive2 { name="geobr"; version="1.6.5"; sha256="08kl0215q524dq5scx2cm11a7m65xh0wzryl71grrlbqm5000pjj"; depends=[curl data_table httr sf]; broken = true; }; geostatsp = derive2 { name="geostatsp"; version="1.8.6"; sha256="1ciyw84y5zbwsfqvl5dhq8swfpkqcmzhhvdm9hr5rhj3497sls9j"; depends=[abind Matrix numDeriv raster sp]; broken = true; }; gfmR = derive2 { name="gfmR"; version="1.1-0"; sha256="0qzzbcra1fnbp0h31b1as20yhmqmi7p62xrhikj64an9avg9b277"; depends=[faraway nnet]; broken = true; }; + ggRandomForests = derive2 { name="ggRandomForests"; version="2.0.1"; sha256="0f8m0j79d8wbac14zk1s8812rz6vgf04bz1iqq8p4d3sxwnvaj7q"; depends=[ggplot2 randomForest randomForestSRC survival tidyr]; broken = true; }; ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; broken = true; }; + glacierSMBM = derive2 { name="glacierSMBM"; version="0.1"; sha256="0117fzz2b1lccs0kkwz59w2yysi72j54yvz7373pz11w7rjds84f"; depends=[raster sp udunits2]; 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; }; graphscan = derive2 { name="graphscan"; version="1.1.1"; sha256="1dgjb0grdymhimdgwnddjcivgy2i9r1i1nni4v9mx0447skcahk9"; depends=[ape rgl snowfall sp]; broken = true; }; - hal9001 = derive2 { name="hal9001"; version="0.4.1"; sha256="0hclz3rrav536dz7hqzdzck0hxx24pd59p3s2flhkx60wqxajvrq"; depends=[assertthat data_table glmnet Matrix origami Rcpp RcppEigen stringr]; broken = true; }; - haldensify = derive2 { name="haldensify"; version="0.2.1"; sha256="1mckpr70q10qv2m70rbwwzb7a6mvk8hwrkvbnh7v2qksd5lcfxn8"; depends=[assertthat data_table dplyr future_apply ggplot2 hal9001 latex2exp matrixStats origami Rdpack rlang rsample scales tibble]; broken = true; }; + grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; broken = true; }; + gsbm = derive2 { name="gsbm"; version="0.2.1"; sha256="16j4g0wl9phmx85dbrzxsdjcv0nnipgj214fvbz9m6n66khr5pkp"; depends=[doParallel foreach Matrix RSpectra softImpute]; broken = true; }; + guf = derive2 { name="guf"; version="1.0.2"; sha256="1dfmja2da211pcid4hr7x9q0sgz37756rpykm1ax862avdl8hsmc"; depends=[]; 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; }; + gwerAM = derive2 { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; broken = true; }; + gwsem = derive2 { name="gwsem"; version="2.1.4"; sha256="0qqcbkxkkfwraz750wvk1f86mqy6f2ndkspd8qr0ypnnlh3i0yzl"; depends=[BH data_table lifecycle OpenMx qqman Rcpp]; broken = true; }; + haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; broken = true; }; happybiRthday = derive2 { name="happybiRthday"; version="0.0.1"; sha256="0rrvi5kx09p74xwxvqcwibbh4qjlk4jxb89grx74chjxk9ak2yv8"; depends=[data_table dplyr gh lubridate tidyr]; broken = true; }; hddtools = derive2 { name="hddtools"; version="0.9.4"; sha256="011yhs8c6riimz63pa2am56n5aip2yk5gryx2amvk29pzp1v6my9"; depends=[curl raster readxl rgdal sp tidyr XML zoo]; broken = true; }; hdpGLM = derive2 { name="hdpGLM"; version="1.0.0"; sha256="04mn0cbbx66218rsd273yh29h28f1xl8k0whwlyn6hrg035mlk0x"; 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]; broken = true; }; healthforum = derive2 { name="healthforum"; version="0.1.0"; sha256="13ih00amv9hrpngm6pxc8vzqzhx8c0yqgaprxdcp5li90lg5r3av"; depends=[magrittr purrr rvest stringr tokenizers xml2]; broken = true; }; hockeyR = derive2 { name="hockeyR"; version="0.1.1"; sha256="1rzm67ib4i7qa0x302g9k5bm5vabg39l1da5brnkkh9fp6v37lb6"; depends=[dplyr glue httr janitor jsonlite lubridate magrittr polite purrr rvest stringr tidyr zoo]; broken = true; }; + horserule = derive2 { name="horserule"; version="1.0.0"; sha256="0d348pn0ld7lr9lfl1z05905l9kl296j0xic1pib6r5l1c5600r9"; depends=[gbm ggplot2 inTrees MASS mvnfast randomForest RColorBrewer Rdpack]; broken = true; }; + iRF = derive2 { name="iRF"; version="2.0.0"; sha256="1ll4lxg743p2zipxcq13yjsc7j7dk766dcyixwxilllbisg0dh8y"; depends=[AUC data_table doParallel dplyr foreach Matrix RColorBrewer Rcpp]; broken = true; }; + ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; 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; }; + ifultools = derive2 { name="ifultools"; version="2.0-23"; sha256="16a7rbvlym3bnfm93ikr5kl0l86ppk0s41fva6idvcx765g3fqkk"; depends=[MASS splus2R]; broken = true; }; + imputePSF = derive2 { name="imputePSF"; version="0.1.0"; sha256="0xfd2mybg0cbi3n35j28s4xq4iwr5rq4mqwgdqml7l2rlzidcwc8"; depends=[PSF]; broken = true; }; + inTrees = derive2 { name="inTrees"; version="1.2"; sha256="1mwn2ijkyw0y9xcgrr56wxd2326ikarlsi79l59dplvlx2iwbi6c"; depends=[arules data_table gbm RRF xgboost xtable]; broken = true; }; incadata = derive2 { name="incadata"; version="0.9.1"; sha256="0987zazkp3cxvk88i3yqb70s2i1cg108vc8wyhh2867s3rqdrpgh"; depends=[decoder rvest sweidnumbr xml2]; broken = true; }; + inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; broken = true; }; + interacCircos = derive2 { name="interacCircos"; version="1.0.0"; sha256="1waj0saavvaw2qzhbwcj1k0a2dnmq7zbkdnmb93xj6j1lhfjhbdy"; depends=[htmlwidgets jsonlite plyr RColorBrewer]; 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; }; + iq = derive2 { name="iq"; version="1.9.1"; sha256="1n4hdkw37364ilc8v3bffmnwd7r8cpysn7jssf9h9jxh9pyd612y"; depends=[]; broken = true; }; + 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; }; itemanalysis = derive2 { name="itemanalysis"; version="1.0"; sha256="1ksbd69mca45jlr2gpars87cf4jfm5rx6sz009sv6a83x831x5rq"; depends=[car ggplot2 polycor]; broken = true; }; jdx = derive2 { name="jdx"; version="0.1.4"; sha256="0jqf0nkdyv9g4rifzlkls0n64fdcma2yphwl478772jlgfmxm2jb"; depends=[rJava]; broken = true; }; + joineRmeta = derive2 { name="joineRmeta"; version="0.1.2"; sha256="0lkj3rry8kvdcl3dxrkvnql8rl3fsgc4lk5qdifhl41aws2q7ccs"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm statmod survival]; broken = true; }; jsr223 = derive2 { name="jsr223"; version="0.3.4"; sha256="0rir9v0qhnbl2rgkx1qz2ydj68ba9ccbdzsg6y1acczdhpl03j51"; depends=[curl jdx R6 rJava]; broken = true; }; kmcudaR = derive2 { name="kmcudaR"; version="1.1.0"; sha256="16dkv9ag5375zc23nqakbg7v6knxvh1pips9rjsls0d7rw2bg1bs"; depends=[Rcpp RcppEigen]; broken = true; }; + kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; broken = true; }; + laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; broken = true; }; lass0 = derive2 { name="lass0"; version="1.1.0"; sha256="01fafgyhi3fw8ldjw2gf0z9w1si7il3ailwm197fxmw4wqgys9fl"; depends=[doRNG foreach ismev lpSolve]; broken = true; }; + lba = derive2 { name="lba"; version="2.4.4"; sha256="0izqndm992zv3sg8v5lpnxbdbxhpxl6hq3bf6xgq3pnw8vl3f6nb"; depends=[alabama MASS plotrix rgl scatterplot3d]; broken = true; }; + lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; broken = true; }; libproj = derive2 { name="libproj"; version="8.1.0-1"; sha256="16mavs0kpbn1lskfgyzgw5ns270kdvvh2991c8w26cyl23zrcys6"; depends=[cpp11 rappdirs]; 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; }; + lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; broken = true; }; lmSupport = derive2 { name="lmSupport"; version="2.9.13"; sha256="0ln5c91mbxkymgnv2nw5m3nrm5bwckpikgb9x1qhmjc55m98wkb8"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; broken = true; }; + lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; broken = true; }; + lmeresampler = derive2 { name="lmeresampler"; version="0.2.0"; sha256="1qjxv3vrgw183hvya2k4qidnnx9w64lcksjm6v727kcigl3x9h1f"; depends=[catchr dplyr forcats ggdist ggplot2 HLMdiag magrittr Matrix nlmeU purrr statmod]; broken = true; }; + lmfor = derive2 { name="lmfor"; version="1.5"; sha256="1r301ajcp9ag23n0nw1rgwg8ss5cvinwqargbdg0jpqbhdrgaq7y"; depends=[magic nlme spatstat]; broken = true; }; maGUI = derive2 { name="maGUI"; version="3.0"; sha256="1ak2sa6y766v5zh54bf7j9hklmkia40nsdchyw834ybb9ijjyjsm"; depends=[Biobase gWidgets2 gWidgets2RGtk2 impute limma Rgraphviz RGtk2 ssize]; broken = true; }; 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; }; + matchMulti = derive2 { name="matchMulti"; version="1.1.9"; sha256="0357bgwf6xcq19f1xfxv26gk6drq806jknjq4h32rldqn0sfab0p"; depends=[coin dplyr Hmisc MASS mvtnorm plyr rcbsubset rlang sandwich tidyr weights]; broken = true; }; mcmcabn = derive2 { name="mcmcabn"; version="0.4"; sha256="0ym7ngai8pv9xalh1s53p8f96s8xpc05zi6ryih2rjv449ib06kq"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; broken = true; }; - metabolighteR = derive2 { name="metabolighteR"; version="0.1.2"; sha256="1v50b0pp2hzn6b4xrlclaks3kd315rir44acm24mmqhqybj6lhls"; depends=[crayon dplyr httr magrittr purrr]; broken = true; }; + mcsm = derive2 { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; broken = true; }; + meaRtools = derive2 { name="meaRtools"; version="1.0.4"; sha256="1nxyvdq4670696mhg0svxxlvk9hnr8szai8b18pw6754kmw1bjvn"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; broken = true; }; + met = derive2 { name="met"; version="0.1.0"; sha256="0714103xzc4n178307czxmcv7ygjiigjr9b6xnj240ljp7qmln19"; depends=[DiPs]; broken = true; }; miceMNAR = derive2 { name="miceMNAR"; version="1.0.2"; sha256="1s607icaf3c25mn8xdi3zkzmm8m7qd9a6vjdlz5j7ig2gc9f2y2d"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; broken = true; }; + microclustr = derive2 { name="microclustr"; version="0.1.0"; sha256="04xn8p4wgmxq1jbxawq0rhx6l7y1kddlbdfid8zsi4x4arkz7hvp"; depends=[Rcpp]; broken = true; }; migrbc = derive2 { name="migrbc"; version="2.0.9"; sha256="1nbxdm70a9lvbp4sw78719hdpbqnziw1y7r4xk8i390q2c195am1"; depends=[dplyr futile_logger lubridate Rcpp stringr]; 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; }; mixlink = derive2 { name="mixlink"; version="0.1.5"; sha256="0ywgrcplhspc0x5fniw52xqz20y7j9mwgy4ky8lv3vii659mr52m"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; broken = true; }; mlbstatsR = derive2 { name="mlbstatsR"; version="0.1.0.3"; sha256="0rcjfbi383rdk2fyrw47ni0jrzp7yj2sr8xzxvk3gmh321i3pn5d"; depends=[dplyr ggplot2 ggtext glue httr janitor jsonlite purrr rvest stringr tibble tidyr xml2]; broken = true; }; mleap = derive2 { name="mleap"; version="1.1.0"; sha256="0s15srbnk8fs5vj12gdszpg6g563q17v42fng2rydkgi4q7m2vj6"; depends=[digest fs jsonlite purrr rJava sparklyr tibble]; broken = true; }; + mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; broken = true; }; mmpca = derive2 { name="mmpca"; version="2.0.1"; sha256="05vir7hjv5dccfcizyn5n6qxx2p53111if16l44a7ifg5k599xj9"; depends=[digest gsl Rcpp RcppEigen]; broken = true; }; mnlogit = derive2 { name="mnlogit"; version="1.2.6"; sha256="0dfwpkl8g7ap5xr48smiv8vdbamd2r1liy9nwpsn0kcsr9cj65n9"; depends=[Formula lmtest mlogit]; broken = true; }; - monoreg = derive2 { name="monoreg"; version="1.2"; sha256="16n622j1j998a5fhn1c1qbzk5bfa5h09d95ry89gsd00p40hqg0a"; depends=[]; broken = true; }; + mobsim = derive2 { name="mobsim"; version="0.2.0"; sha256="0an8j5kj0cs1bjz9kwzwc54hm0zaiz5rsaw78ihldw0mx5n175gn"; depends=[Rcpp sads vegan]; broken = true; }; + modcmfitr = derive2 { name="modcmfitr"; version="0.1.0"; sha256="1d6fi7pc10w2a97h1prhkg5cvzmxjp11c5bwrz90zry0m8anwjyh"; depends=[gtools nloptr]; broken = true; }; mosaic_find = derive2 { name="mosaic.find"; version="0.1.2"; sha256="1fzgksh8sp701qjfrvjl2bg967qjkjpilxsfkrazhw71cgmzjgjl"; depends=[minpack_lm]; broken = true; }; + mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; broken = true; }; mssqlR = derive2 { name="mssqlR"; version="1.0.0"; sha256="0qdnm7cx9cg14vfcnkmcjqr1jpxsw8xlrbnxldvzz44mzv2n878l"; depends=[magrittr RODBC]; broken = true; }; multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; broken = true; }; - multilinguer = derive2 { name="multilinguer"; version="0.0.4"; sha256="0kavgvbzv8bvv9qlr92j8mx7b802w513mqalrdyln0pw36c9i13x"; depends=[askpass fs rstudioapi rvest sys usethis xml2 zip]; 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; }; nCal = derive2 { name="nCal"; version="2021.9-12"; sha256="133dpy2rp8sabwdlk0wjxs9rzixzcja73im94qaw26z5xsnaydhf"; depends=[drc gdata gWidgets2 kyotil]; broken = true; }; + namer = derive2 { name="namer"; version="0.1.5"; sha256="1687x6rc46bp2bmqkixzry5cc7lxjqwjk8ngrbg2fk7mzb4pwvnq"; depends=[dplyr fs glue magrittr purrr rstudioapi tibble]; broken = true; }; nearfar = derive2 { name="nearfar"; version="1.2"; sha256="116rq797a5fascirz8xg465fywjf40j1k5czryvqzpik0if0w00r"; depends=[car GenSA MASS nbpMatching]; 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; }; ntwk = derive2 { name="ntwk"; version="1.0.0"; sha256="1c12c3pq992f02z3ikx17zv2djq9d9ly232ha0j5jswsksqzx024"; depends=[assertthat copCAR ghyp Matrix mvtnorm pracma zoo]; broken = true; }; oc = derive2 { name="oc"; version="1.2"; sha256="0cw1gvz6gk8j718zmywqp03h9cnzn132nwbv45gr00xg2s9h7dk7"; depends=[pscl]; broken = true; }; - occCite = derive2 { name="occCite"; version="0.5.1"; sha256="1swarf4nwqy20ffy5ff44zq804i8gb095b7p9zay0iccfz9bn2jm"; depends=[bib2df BIEN DBI dplyr ggplot2 htmltools httr leaflet lubridate RColorBrewer rgbif rlang RPostgreSQL stringr taxize tidyr viridis waffle]; broken = true; }; + optband = derive2 { name="optband"; version="0.2.1"; sha256="1rv4r7h7x3xipav917cz9bcr6nqjzbinfrqxv8mcls9gdl9ha3y9"; depends=[LambertW]; broken = true; }; + optmatch = derive2 { name="optmatch"; version="0.9-17"; sha256="1q55dchgdv05s3q6x0k8ybzmfcvzxsf893gvhs2cgijxrfgvgyv0"; depends=[digest Rcpp survey survival]; broken = true; }; + packClassic = derive2 { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; depends=[]; broken = true; }; + 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; }; panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; 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; }; 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; }; - pbdSLAP = derive2 { name="pbdSLAP"; version="0.3-1"; sha256="1iwc5iw6q7r6p08yngczqlbqk779nsx2rmxc3fajzl6d73rprshl"; depends=[pbdMPI rlecuyer]; broken = true; }; pedometrics = derive2 { name="pedometrics"; version="0.7.0"; sha256="0rqldc67yrcg16i5q9wrmfmh3lw3qrfdxwdb4mxkjxx18v4fv737"; depends=[lattice latticeExtra Rcpp]; broken = true; }; permGPU = derive2 { name="permGPU"; version="0.15"; sha256="1bxydc5dw7ka45k6ban35d5xb1dw9yq9480qns8b39cc0x3acmhc"; depends=[Biobase foreach RUnit survival]; broken = true; }; + photosynthesis = derive2 { name="photosynthesis"; version="2.0.1"; sha256="0drbic4sdx841pzcqvi0gkny7qrnzixlc0wsr6m0llh7pfyl99s6"; depends=[checkmate crayon dplyr furrr future ggplot2 glue gunit magrittr minpack_lm nlme pkgnet purrr rlang stringr tealeaves tidyselect units]; broken = true; }; phreeqc = derive2 { name="phreeqc"; version="3.6.3"; sha256="0z20gj1kqhnbvx33sswz5ivj7nk2p4hia4gr2npscs94nc50b5j4"; depends=[]; broken = true; }; - plfMA = derive2 { name="plfMA"; version="1.0.5"; sha256="13hs06n4b28vlik9bzqdx6j85q05bsd6hb10cr39581a3m33rv5m"; depends=[cairoDevice gWidgets2 gWidgets2RGtk2 limma RGtk2]; broken = true; }; + physx = derive2 { name="physx"; version="1.0"; sha256="1b6bx08jzfg4pxicawkn013bqrvqkp19pigxl3iwjrqclvi8mx73"; depends=[celestial cubature data_table docore MASS pracma Rcpp]; broken = true; }; pm4py = derive2 { name="pm4py"; version="1.2.7"; sha256="11xbsmsc9pxd98fy28l3nxzhb6c2pwvh1gmm34jnqn0rjbpb2n9i"; depends=[bupaR petrinetR purrr reticulate stringr]; broken = true; }; pmdplyr = derive2 { name="pmdplyr"; version="0.3.3"; sha256="1grnqqydi84hnig1522lv4xbh9ds32wnq7sha7jn1q4186wlz1qa"; depends=[dplyr lubridate magrittr pillar rlang tibble tidyr tidyselect vctrs]; broken = true; }; - podcleaner = derive2 { name="podcleaner"; version="0.1.1"; sha256="1mgkcmayysm2amz2a94mzsyxa0kgqk4y43qsy4hp81j31ij8chkv"; depends=[dplyr fuzzyjoin magrittr progress purrr readr rlang stringi stringr tibble tidyr]; 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; }; + 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; }; polyglot = derive2 { name="polyglot"; version="0.3.0"; sha256="1mmmdqaq882qys41lmm009ncg9s9h5x1q8psv0v3pwpar0d7vgff"; depends=[magick pins]; broken = true; }; + pragma = derive2 { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; broken = true; }; + predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; broken = true; }; + prider = derive2 { name="prider"; version="1.0.2"; sha256="0a7n4b2a0p91q8llgn14czfxvi588v62x5azl7nndvjdk6g4cmmy"; depends=[blaster dplyr gplots magrittr purrr Rcpp stringr tibble tidyr]; broken = true; }; + psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; broken = true; }; psyosphere = derive2 { name="psyosphere"; version="0.1.6"; sha256="1hcas3jk2n11lyw1ysmci0sysxf7qg9h2msqqg7q9nqp5gbf90np"; depends=[geosphere ggplot2 Hmisc lubridate plyr rgdal RgoogleMaps sp]; broken = true; }; - qbld = derive2 { name="qbld"; version="1.0.1"; sha256="0agx32f2pf1hzs3and40zd7kfkjml7qjbnn0im4dr2v10h1jz6c0"; depends=[knitr mcmcse Rcpp RcppArmadillo RcppDist rmarkdown stableGR]; broken = true; }; qoma_smuggler = derive2 { name="qoma.smuggler"; version="0.0.1"; sha256="03p9i0kr6i3adpb9lcszcmdr9p26nfy7f8hw2sbydazglaw4hscr"; depends=[lubridate rhli tibble]; broken = true; }; + rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; broken = true; }; rGEDI = derive2 { name="rGEDI"; version="0.1.11"; sha256="0fkvy4p82jyfbbfymkfbrdyh13hk6a6wghk2myb64p5nhz8kv7iz"; depends=[bit64 curl data_table fs getPass ggplot2 hdf5r jsonlite lazyeval raster RColorBrewer rgdal rgeos sp]; broken = true; }; rKolada = derive2 { name="rKolada"; version="0.2.0"; sha256="0ikyjzg8xbzyah37dpfwq2slssz956irm4dj8b7zv6x9qxi09gj9"; depends=[dplyr glue httr jsonlite magrittr purrr rlang stringr tibble tidyr urltools]; broken = true; }; rModeling = derive2 { name="rModeling"; version="0.0.3"; sha256="0xrjxayp59f31wwcqqkzs5my2j2lpbv1f4pp709fmqxz02vbdzhv"; depends=[caret e1071 MASS]; broken = true; }; radix = derive2 { name="radix"; version="0.6"; sha256="0290n0yax8649srdjbq4439h0d9f6jsmxayyhp86igcnszcxilnb"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; broken = true; }; + randaes = derive2 { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; broken = true; }; randomsearch = derive2 { name="randomsearch"; version="0.2.0"; sha256="0ywr4ms66p5nmq8bzy04gbvmpp0nhfyf8rvynhr2c4alqva9x3yi"; depends=[checkmate fs parallelMap ParamHelpers smoof]; broken = true; }; + rattle = derive2 { name="rattle"; version="5.4.0"; sha256="1cg26k491f78yqwis07djad8b3f9ndqwqylbh5sh66l2j9bdpmz5"; depends=[bitops dplyr ggplot2 magrittr rpart_plot stringi stringr tibble tidyr XML]; 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; }; rbedrock = derive2 { name="rbedrock"; version="0.1.1"; sha256="0vh6pg1lg2764zjhciswznvq7ccrd71855bmdadlj6cc1gv0fphq"; depends=[bit64 digest dplyr fs magrittr purrr R6 rappdirs readr rlang stringr tibble tidyr vctrs]; broken = true; }; + rcbsubset = derive2 { name="rcbsubset"; version="1.1.6"; sha256="0ks94x34fw7rcvbccli6b0rlvdj3asfy6h4rm19nb022r9dax86f"; depends=[MASS plyr rcbalance]; broken = true; }; + rcol = derive2 { name="rcol"; version="0.2.0"; sha256="1ypn5fiwhyvfnmjs2davqqhxf5pjg7f0101v40bqrv4jz563h5n1"; depends=[crul data_table glue jsonlite tibble]; broken = true; }; rdaemon = derive2 { name="rdaemon"; version="1.0.6"; sha256="1qr6v7kgk9nd5qp96667x51331xmpp1yz1r190dgd1fqigw735s5"; depends=[base64enc futile_logger Rcpp]; broken = true; }; - resemble = derive2 { name="resemble"; version="2.0.0"; sha256="1vr4aydwyipspkw662qw50219r30ms05i567j66yv1ccs574dw6a"; depends=[data_table foreach iterators lifecycle magrittr mathjaxr Rcpp RcppArmadillo]; broken = true; }; + rdataretriever = derive2 { name="rdataretriever"; version="3.0.0"; sha256="1a01lrzn7gcxid01r0l8nnbpbryvs07z9nf43l1143w2n9bvgn24"; depends=[reticulate semver]; broken = true; }; + rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; broken = true; }; retrocombinator = derive2 { name="retrocombinator"; version="1.0.0"; sha256="0ci5cm9ml2gsn0n0scaahpfi8kyn6i0s3fb4mn7m9s83c0ls6xgv"; depends=[dplyr ggplot2 magrittr Rcpp rlang]; broken = true; }; - rgho = derive2 { name="rgho"; version="2.0.1"; sha256="1byvq2swn2j9v0zy5smjklv7bkncrclhli62cf1f2wiah5qg8sv2"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr rlang tibble tidyr]; broken = true; }; + rgho = derive2 { name="rgho"; version="2.0.2"; sha256="02p7xnfczbnvbm60hhfyywwg8iwsakk1gm29xsj9vq3ldxdjxbbv"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr rlang tibble tidyr]; broken = true; }; rijkspalette = derive2 { name="rijkspalette"; version="1.0.2"; sha256="00726q8s36si08ghd9sgi7ikadcj11xqwhgv8f3cml6lvwz7ppzz"; depends=[crayon imager jsonlite]; broken = true; }; rnetcarto = derive2 { name="rnetcarto"; version="0.2.4"; sha256="0fk5rym6zp049bl1f7bkl2231mjh3pgnxn0nhvmzpsah08rh4rr6"; depends=[]; broken = true; }; - rsat = derive2 { name="rsat"; version="0.1.16"; sha256="0d40dh596yr9qk6hyyb37w0jl73595p80sk89yyjknvj3hilsj8y"; depends=[calendR curl fields httr leafem leaflet raster Rdpack rjson rvest sf sp stars terra tmap XML xml2 zip]; broken = true; }; + rpsychi = derive2 { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; broken = true; }; safedata = derive2 { name="safedata"; version="1.0.9"; sha256="0xcpgh4898rqdnnxx21vyxc8aqlwg26aywr591sllasrv1jzsmrc"; depends=[chron curl igraph jsonlite readxl sf]; broken = true; }; - sara4r = derive2 { name="sara4r"; version="0.0.8"; sha256="0b8ir25f0348pd2ckwzv1pyz3iz98zy09baih3rkgxxn8hjdnxj7"; depends=[raster rgdal RGtk2 sp]; broken = true; }; + salbm = derive2 { name="salbm"; version="1.0"; sha256="06nizpphyn5q292b2kbsjax0ljw3340n655qwiyp8lvi2zcnl6jy"; depends=[randomForestSRC]; broken = true; }; + salem = derive2 { name="salem"; version="0.2.0"; sha256="1pk27d57bmds0jvnvwai2scjy798lb7w6lb84yxl4ccgyn1ldh45"; depends=[]; broken = true; }; + sapa = derive2 { name="sapa"; version="2.0-3"; sha256="0kj681rd4c2lvqr926lb6f4qwp281x5274dg6vbk8pf5y7s0qlpc"; depends=[ifultools splus2R]; broken = true; }; + scriptests = derive2 { name="scriptests"; version="1.0-16"; sha256="11l145gvzkxqwbzw976rq94krly1p4lahqw051dwaacarq4hnrdg"; depends=[]; broken = true; }; seedwater = derive2 { name="seedwater"; version="2.0"; sha256="1q6q612245hqqx89jzlp77f73vj2baxi0bghd9l8kpjz4ydh6rv8"; depends=[rpanel]; broken = true; }; + sensR = derive2 { name="sensR"; version="1.5-2"; sha256="073za0z6dawba2nd45hs20m0143kckxn3iglkyqz9vdfqwyv7wlq"; depends=[MASS multcomp numDeriv]; broken = true; }; sequoia = derive2 { name="sequoia"; version="2.3.5"; sha256="1n0c24g5zl0l63nsaywwjfqsjn0ql2ckd3iqmc381qngijnckc17"; depends=[plyr]; 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; }; + sigQC = derive2 { name="sigQC"; version="0.1.22"; sha256="17b16mjadmsbqbai90bvryydkfy9k5ww9i65a5ahy3bfjch851f2"; depends=[biclust circlize class cluster ComplexHeatmap fmsb gplots gridGraphics GSVA KernSmooth lattice MASS mclust moments nnet RankProd]; broken = true; }; simLife = derive2 { name="simLife"; version="0.5.2"; sha256="1dhrjszfgxr0j4dkc2bwykyj515ji5rkb572nmnyjgkyi652j01v"; depends=[splancs]; 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; }; @@ -18873,27 +19356,51 @@ 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; }; sobir = derive2 { name="sobir"; version="0.1.2"; sha256="0di9mk1c1jf8yr7jpmfm19w2w3p9lz1mkgrv3bmfyab83aghvbfp"; depends=[DescTools devtools dplyr ggplot2 raster rlang scales sp statmod stringr tidyr usethis]; broken = true; }; spANOVA = derive2 { name="spANOVA"; version="0.99.3"; sha256="0w817zwbk6amh3n3j8wzjr15qqhfbk9s23c77b27iwcc5akdgbix"; depends=[ape car DT geoR gtools knitr MASS Matrix multcomp multcompView mvtnorm rmarkdown ScottKnott shiny shinyBS shinycssloaders shinythemes spatialreg spdep xtable]; broken = true; }; + spagmix = derive2 { name="spagmix"; version="0.3-4"; sha256="032dmz8cx4j5vl229gi1xkncc1wggfrf1a24qqwl2bzxrdfp27rw"; depends=[abind mvtnorm RandomFields sparr spatstat spatstat_core spatstat_geom spatstat_linnet]; broken = true; }; spate = derive2 { name="spate"; version="1.7"; sha256="1cr5jjrycfj9larsqgzfakk4qgfz8m5djg4ddzk6s3lg2iw06y43"; depends=[mvtnorm truncnorm]; broken = true; }; - spatialfusion = derive2 { name="spatialfusion"; version="0.6-4"; sha256="18ji1pps5kb0mbff620mw7zm6nzyy3nfclmcpl677xd9927apvn9"; depends=[fields Rcpp rstan SDraw sp]; broken = true; }; - spfilteR = derive2 { name="spfilteR"; version="1.1.1"; sha256="0y6jmg4iz584c35r6xs16z8zbs2z5y8g6wshnall7i6g2hv35nnj"; depends=[]; broken = true; }; + spe = derive2 { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; broken = true; }; + spfrontier = derive2 { name="spfrontier"; version="0.2.5"; sha256="1vnvwcjbhvbmyn5rp4760amzy8k3y156q629fjymw9rw6zy45pbf"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; broken = true; }; + spiders = derive2 { name="spiders"; version="1.2"; sha256="1qklm178bgkgpvrjf024jphsdh9can8300sf0702l4h0rk2daqbq"; depends=[plyr]; broken = true; }; spsann = derive2 { name="spsann"; version="2.2.0"; sha256="00nlrwk50ch128brzvfxld0pcpq1syks9rvwdrcf1i2pcxnva7d0"; depends=[pedometrics Rcpp sp SpatialTools]; broken = true; }; sqp = derive2 { name="sqp"; version="0.5"; sha256="0l01zwcryv5bmzmd98gj0m5ip8nvr8lziq1awvfif1bzwvvd2kzx"; depends=[Matrix Rcpp RcppArmadillo RcppEigen Rdpack]; broken = true; }; stacomiR = derive2 { name="stacomiR"; version="0.6.0"; sha256="0mcq7lcwcz9s18vdd7762dfr2fyb5fqvnv0b5ljp7kdbr3ia977y"; depends=[dplyr ggplot2 Hmisc intervals lattice lubridate magrittr mgcv pool RColorBrewer reshape2 rlang RPostgres stacomirtools stringr withr xtable]; broken = true; }; + stam = derive2 { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; broken = true; }; stanette = derive2 { name="stanette"; version="2.21.2"; sha256="1266555964cymrgrmfzjk2x12hpyjvd18c8q0lx92wdssnqzhhzr"; depends=[BH brew coda ggplot2 gridExtra inline lattice loo pkgbuild Rcpp RcppEigen RcppParallel StanHeaders V8 withr]; broken = true; }; + stpp = derive2 { name="stpp"; version="2.0-5"; sha256="1p7dxzfhi5pvva956nyypl7dfdgq3m0cara73hai87qzc342xcf0"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat_core spatstat_geom splancs]; broken = true; }; + subscreen = derive2 { name="subscreen"; version="3.0.5"; sha256="0786p2n1a4xjsxnd31w2b079ggdzx9pgn14d5vbngrc6mgjm9hk8"; depends=[bsplus colourpicker data_table dplyr DT jsonlite plyr purrr randomForestSRC shiny shinyjs shinyWidgets]; broken = true; }; subtee = derive2 { name="subtee"; version="1.0.0"; sha256="09ah1n3whdycygbi1a6pwgm5jqs1srd565p3ihkk5ygp4gl2r3z9"; depends=[ggplot2 MASS matrixStats survival]; broken = true; }; survRatio = derive2 { name="survRatio"; version="0.1"; sha256="1xrqin3q3b7r8ga4i71ci97rsm4lj5ffd0720n7s563jkpnpyb9l"; depends=[ggplot2 ggpubr gridExtra survival]; broken = true; }; + survxai = derive2 { name="survxai"; version="0.2.2"; sha256="09ig561754kjzpay2hy3n62zlk0bgwkjy8vnslrr428r8m1lj0qr"; depends=[breakDown ggplot2 pec prodlim scales survival survminer]; broken = true; }; + swissdd = derive2 { name="swissdd"; version="1.1.4"; sha256="0ad260b4sfism5q1jxjazg6q33283ncld1m7gfdrps3xg1kyfirs"; depends=[dplyr ggplot2 httr jsonlite lubridate purrr RCurl sf stringr tibble tidyr]; 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; }; + test2norm = derive2 { name="test2norm"; version="0.2.0"; sha256="02dmskqnxinfdxxq5s969p37fps0wpiz6mrcnx03f03a3gzqljl0"; depends=[mfp]; broken = true; }; thectar = derive2 { name="thectar"; version="1.0.0"; sha256="1qh0qzg0ybb38kzm56xxlvhm201pdjm16aky5f1fdflcsszgy8mx"; depends=[proxy smacof]; broken = true; }; - txshift = derive2 { name="txshift"; version="0.3.6"; sha256="16ffkzgy9x1ng6338mb4flg3xy3cc32lrhqmb7rgpzs2fb0h20zr"; depends=[assertthat data_table ggplot2 hal9001 haldensify latex2exp lspline mvtnorm Rdpack scales stringr]; broken = true; }; + themetagenomics = derive2 { name="themetagenomics"; version="1.0.2"; sha256="14i81cd9cyzhi3j2d9ygwlairkimhx8ffvva3pg3xwwvpywb6mla"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; broken = true; }; + thickmatch = derive2 { name="thickmatch"; version="0.3.1"; sha256="0q7wpilbk8jm3q7m5hb114jpbv4ri1745v9sbdf222l6ymds6pia"; depends=[DiPs MASS plyr rcbalance]; 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; }; + tipom = derive2 { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; broken = true; }; + tlsh = derive2 { name="tlsh"; version="0.1.0"; sha256="0106y17cr3hq09ahy3rxhxqzgc0655w2jr0s3iyr8zvxsdv5ahb5"; depends=[bit64 blink igraph plyr]; broken = true; }; + translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; broken = true; }; + turfR = derive2 { name="turfR"; version="0.8-7"; sha256="007jmkppfv1x4zzvvd65fhg5k15ybjhsya2zfjgwm77wm34y81ca"; depends=[dplyr]; broken = true; }; uFTIR = derive2 { name="uFTIR"; version="0.1.4"; sha256="1blgwn6i0dadmr7vml6rbniv103mgr9hgx2dwgcxbagfyv00ah24"; depends=[raster Rcpp RcppArmadillo sp]; broken = true; }; unfoldr = derive2 { name="unfoldr"; version="0.7.1"; sha256="1khas7d04g4y2kwldnsja5xk1n5mys2s66pln3l0gqlsbk67na12"; depends=[]; 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; }; usethis2 = derive2 { name="usethis2"; version="0.2.0"; sha256="0ljvfgwg73y71yvyz2pp4c1rzgiqk1x7kmgswxa1ay05zwdgyi0x"; depends=[microservices purrr usethis withr]; broken = true; }; + valuer = derive2 { name="valuer"; version="1.1.2"; sha256="0mbwzsvy34ppngyxdzpd9w1r4f00cik4maqab9kpiflrrv9xdp78"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; 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; }; + viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; broken = true; }; 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; }; + vwr = derive2 { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; broken = true; }; + wSVM = derive2 { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; broken = true; }; water = derive2 { name="water"; version="0.8"; sha256="0qglf922dlgi41jzz3sivq7ckmzl8axqjfg4klcgnddycmm3ha5j"; depends=[raster rgdal sp]; broken = true; }; + wdnr_gis = derive2 { name="wdnr.gis"; version="0.1.2"; sha256="03z9qayrv34lgajvwg77b0h7z65r04wzlkaazpdfxq9wk027g3a9"; depends=[arcpullr dplyr ggplot2 httr jsonlite rlang sf]; 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; }; wflo = derive2 { name="wflo"; version="1.6"; sha256="04qxm1vvmgxbpj1wwj7n48klhsprkj774jnj4qfhqza33mhymydb"; depends=[emstreeR plotrix progress raster rgdal sp]; broken = true; }; + windAC = derive2 { name="windAC"; version="1.2.6"; sha256="0yx0jiz3c4slv366sic01k8l460idh4n6a797biy7wyrp6jj241x"; depends=[mvtnorm sf]; broken = true; }; x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; 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; }; + zGPS_AO = derive2 { name="zGPS.AO"; version="0.1.0"; sha256="18dqssnj4gch1yg0qvrj4j2ry95sy6a9z8yz2zi8nzhhsj8dz1qq"; depends=[doParallel doRNG dplyr foreach ggplot2 hrbrthemes MASS plotly pscl questionr viridis]; broken = true; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index edddcf70765e..ffe277582392 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -321,13 +321,13 @@ let Biostrings = [ pkgs.zlib ]; bnpmr = [ pkgs.gsl ]; cairoDevice = [ pkgs.gtk2.dev ]; - Cairo = with pkgs; [ libtiff libjpeg cairo.dev x11 fontconfig.lib ]; + Cairo = with pkgs; [ libtiff libjpeg cairo.dev xlibsWrapper fontconfig.lib ]; Cardinal = [ pkgs.which ]; - chebpol = [ pkgs.fftw ]; + chebpol = [ pkgs.fftw.dev ]; ChemmineOB = with pkgs; [ openbabel pkg-config ]; curl = [ pkgs.curl.dev ]; data_table = [ pkgs.zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; - devEMF = with pkgs; [ xorg.libXft.dev x11 ]; + devEMF = with pkgs; [ xorg.libXft.dev xlibsWrapper ]; diversitree = with pkgs; [ gsl fftw ]; exactextractr = [ pkgs.geos ]; EMCluster = [ pkgs.lapack ]; @@ -346,7 +346,7 @@ let haven = with pkgs; [ libiconv zlib.dev ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl ]; - imager = [ pkgs.x11 ]; + imager = [ pkgs.xlibsWrapper ]; iBMQ = [ pkgs.gsl ]; igraph = with pkgs; [ gmp libxml2.dev ]; JavaGD = [ pkgs.jdk ]; @@ -493,6 +493,7 @@ let HilbertVisGUI = with pkgs; [ pkg-config which ]; textshaping = [ pkgs.pkg-config ]; ragg = [ pkgs.pkg-config ]; + qqconf = [ pkgs.pkg-config ]; }; packagesWithBuildInputs = { @@ -644,11 +645,12 @@ let PING = [ pkgs.gsl ]; RcppAlgos = [ pkgs.gmp.dev ]; RcppBigIntAlgos = [ pkgs.gmp.dev ]; - HilbertVisGUI = [ pkgs.gnome2.gtkmm.dev ]; + HilbertVisGUI = [ pkgs.gtkmm2.dev ]; textshaping = with pkgs; [ harfbuzz.dev freetype.dev fribidi libpng ]; DropletUtils = [ pkgs.zlib.dev ]; RMariaDB = [ pkgs.libmysqlclient.dev ]; ragg = with pkgs; [ freetype.dev libpng.dev libtiff.dev zlib.dev libjpeg.dev bzip2.dev ]; + qqconf = [ pkgs.fftw.dev ]; }; packagesRequiringX = [ @@ -1096,12 +1098,6 @@ let ]; }); - nloptr = old.nloptr.overrideDerivation (attrs: { - # Drop bundled nlopt source code. Probably unnecessary, but I want to be - # sure we're using the system library, not this one. - preConfigure = "rm -r src/nlopt_src"; - }); - V8 = old.V8.overrideDerivation (attrs: { postPatch = '' substituteInPlace configure \ @@ -1114,7 +1110,7 @@ let patchShebangs configure ''; - R_MAKEVARS_SITE = lib.optionalString (pkgs.system == "aarch64-linux") + R_MAKEVARS_SITE = lib.optionalString (pkgs.stdenv.system == "aarch64-linux") (pkgs.writeText "Makevars" '' CXX14PICFLAGS = -fPIC ''); @@ -1303,6 +1299,10 @@ let geomorph = old.geomorph.overrideDerivation (attrs: { RGL_USE_NULL = "true"; }); + + RNifti = old.RNifti.overrideDerivation (attrs: { + patches = [ ./patches/RNifti.patch ]; + }); }; in self diff --git a/pkgs/development/r-modules/patches/RNifti.patch b/pkgs/development/r-modules/patches/RNifti.patch new file mode 100644 index 000000000000..e8f3561e7508 --- /dev/null +++ b/pkgs/development/r-modules/patches/RNifti.patch @@ -0,0 +1,33 @@ +diff --git a/configure.ac b/configure.ac +index 05e8a1e..2dcde81 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,16 +17,5 @@ CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS` + CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS` + LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS` + +-# Checks for libraries. +-ZLIB_FLAGS="-Izlib" +-ZLIB_OBJECTS=`ls -1 src/zlib/*.c | sed 's/^src\///' | sed 's/\\.c$/\\.o/'` +-AC_SEARCH_LIBS([inflate], [z], [ +- ZLIB_FLAGS="" +- ZLIB_OBJECTS="" +-]) +- +-AC_SUBST(ZLIB_FLAGS) +-AC_SUBST(ZLIB_OBJECTS) +- + AC_CONFIG_FILES([src/Makevars]) + AC_OUTPUT +diff --git a/src/Makevars.in b/src/Makevars.in +index 77da572..358cc1d 100644 +--- a/src/Makevars.in ++++ b/src/Makevars.in +@@ -1,5 +1,5 @@ +-PKG_CPPFLAGS = -DNDEBUG -DHAVE_ZLIB -DUSING_R -DRNIFTI_NIFTILIB_DEDUPLICATE -I../inst/include @ZLIB_FLAGS@ ++PKG_CPPFLAGS = -DNDEBUG -DHAVE_ZLIB -DUSING_R -DRNIFTI_NIFTILIB_DEDUPLICATE -I../inst/include + PKG_LIBS = @LIBS@ + + NIFTI_OBJECTS = znzlib/znzlib.o niftilib/nifti1_io.o niftilib/nifti2_io.o +-OBJECTS = main.o zzz.o @ZLIB_OBJECTS@ $(NIFTI_OBJECTS) ++OBJECTS = main.o zzz.o $(NIFTI_OBJECTS) diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 6a4a87bc8963..7bad0b442da6 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -1,6 +1,6 @@ { stdenv, runCommand, ruby, lib, rsync , defaultGemConfig, buildRubyGem, buildEnv -, makeWrapper +, makeBinaryWrapper , bundler }@defs: @@ -118,9 +118,12 @@ let wrappedRuby = stdenv.mkDerivation { name = "wrapped-ruby-${pname'}"; - nativeBuildInputs = [ makeWrapper ]; - inherit (ruby) gemPath meta; - buildCommand = '' + + nativeBuildInputs = [ makeBinaryWrapper ]; + + dontUnpack = true; + + buildPhase = '' mkdir -p $out/bin for i in ${ruby}/bin/*; do makeWrapper "$i" $out/bin/$(basename "$i") \ @@ -131,6 +134,15 @@ let --set GEM_PATH ${basicEnv}/${ruby.gemPath} done ''; + + dontInstall = true; + + doCheck = true; + checkPhase = '' + $out/bin/ruby --help > /dev/null + ''; + + inherit (ruby) meta; }; env = let diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 330664836821..584a13623ba3 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.2.24"; - source.sha256 = "1x3czmqhlyb593ap7mxkk47idi2jnbnrpwj8xlsjdpi7iair9y62"; + version = "2.3.9"; + source.sha256 = "sha256-VZiKuSDP3sSoBXUPcPmwHR/GbZs47NIF+ZlXtHSZWzg="; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a3d787ad8e9f..485def66de3c 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -550,14 +550,6 @@ in "--with-libvirt-include=${libvirt}/include" "--with-libvirt-lib=${libvirt}/lib" ]; - dontBuild = false; - postPatch = '' - # https://gitlab.com/libvirt/libvirt-ruby/-/commit/43543991832c9623c00395092bcfb9e178243ba4 - substituteInPlace ext/libvirt/common.c \ - --replace 'st.h' 'ruby/st.h' - substituteInPlace ext/libvirt/domain.c \ - --replace 'st.h' 'ruby/st.h' - ''; }; ruby-lxc = attrs: { diff --git a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb index 0d501bd9add7..b0be71102c38 100644 --- a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb +++ b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb @@ -118,9 +118,7 @@ else source = Bundler::Source::Path.new(options) end spec = source.specs.search_all(name).first -Bundler.rubygems.with_build_args build_flags do - source.install(spec) -end +source.install(spec, :build_args => build_flags) msg = spec.post_install_message if msg diff --git a/pkgs/development/tools/abuild/default.nix b/pkgs/development/tools/abuild/default.nix index 144ec8be9d4e..a597213b866c 100644 --- a/pkgs/development/tools/abuild/default.nix +++ b/pkgs/development/tools/abuild/default.nix @@ -1,32 +1,48 @@ { lib , stdenv , fetchFromGitLab +, makeWrapper , pkg-config +, file +, scdoc , openssl , zlib , busybox +, apk-tools +, perl }: stdenv.mkDerivation rec { pname = "abuild"; - version = "3.7.0"; + version = "3.9.0"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = pname; - rev = "v${version}"; - sha256 = "1xsik9hyzzq861bi922sb5r8c6r4wpnpxz5kd30i9f20vvfpp5jx"; + rev = version; + sha256 = "1zs8slaqiv8q8bim8mwfy08ymar78rqpkgqksw8y1lsjrj49fqy4"; }; buildInputs = [ openssl zlib busybox + # for $out/bin/apkbuild-cpan and $out/bin/apkbuild-pypi + (perl.withPackages (ps: with ps; [ + LWP + JSON + ModuleBuildTiny + LWPProtocolHttps + IPCSystemSimple + ])) ]; nativeBuildInputs = [ pkg-config + scdoc + makeWrapper + file ]; patchPhase = '' @@ -43,6 +59,24 @@ stdenv.mkDerivation rec { "sysconfdir=${placeholder "out"}/etc" ]; + postInstall = '' + # this script requires unpackaged 'augeas' rubygem, no reason + # to ship it if we can't provide the dependencies for it + rm -f ${placeholder "out"}/bin/apkbuild-gem-resolver + + # Find all executables that are not compiled binaries and wrap + # them, make `apk-tools` available in their PATH and also the + # $out directory since many of the binaries provided call into + # other binaries + for prog in \ + $(find ${placeholder "out"}/bin -type f -exec ${file}/bin/file -i '{}' + \ + | grep -v x-executable | cut -d : -f1); do + wrapProgram $prog \ + --prefix PATH : "${lib.makeBinPath [ apk-tools ]}" \ + --prefix PATH : "${placeholder "out"}/bin" + done + ''; + meta = with lib; { description = "Alpine Linux build tools"; homepage = "https://gitlab.alpinelinux.org/alpine/abuild"; diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 712f7ad1ca09..c57307391bd5 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "air"; - version = "1.27.8"; + version = "1.28.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - sha256 = "sha256-CVx4TDDAVIrJ3lnD2AIuxhmTV+/sIA0viX20zFkznNc="; + sha256 = "sha256-JbFSEfm8SVyJBgZju3kfIv5WK/kFYTqkU0EH5HXl9cc="; }; - vendorSha256 = "sha256-dloXz1hiKAQUmSQv1rLbE5vYrZpKAcwakC71AFXWZqM="; + vendorSha256 = "sha256-MEIPkron42OJioV7PPhnLWVevjKDs5Bw3jDmvZbac9s="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 92f7e8095128..4ec5b28bdd03 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -17,7 +17,7 @@ let generic = { version, sha256 }: desktopName = "Alloy ${lib.versions.major version}"; genericName = "Relational modelling tool"; comment = meta.description; - categories = "Development;IDE;Education;"; + categories = [ "Development" "IDE" "Education" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix new file mode 100644 index 000000000000..2988a559aa72 --- /dev/null +++ b/pkgs/development/tools/allure/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, makeWrapper, fetchurl, jre }: + +let + pname = "allure"; + version = "2.17.3"; +in +stdenv.mkDerivation rec { + inherit pname version; + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ jre ]; + + src = fetchurl { + url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; + sha256 = "sha256-WGeCzWwyLEb4WmlA6Vs8L2TL3NTL6sky5TLeiwV8iJY="; + }; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p "$out/share" + cd "$out/share" + tar xvzf $src + mkdir -p "$out/bin" + makeWrapper $out/share/${pname}-${version}/bin/allure $out/bin/${pname} \ + --prefix PATH : "${jre}/bin" + ''; + + dontCheck = true; + + meta = with lib; { + homepage = "https://docs.qameta.io/allure/"; + description = "Allure Report is a flexible, lightweight multi-language test reporting tool."; + longDescription = "Allure Report is a flexible, lightweight multi-language test reporting tool. It provides clear graphical reports and allows everyone involved in the development process to extract the maximum of information from the everyday testing process"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} + diff --git a/pkgs/development/tools/amazon-qldb-shell/default.nix b/pkgs/development/tools/amazon-qldb-shell/default.nix new file mode 100644 index 000000000000..6f6ef1ca8af7 --- /dev/null +++ b/pkgs/development/tools/amazon-qldb-shell/default.nix @@ -0,0 +1,41 @@ +{ lib +, clang +, cmake +, fetchFromGitHub +, llvmPackages +, rustPlatform +, testVersion +}: + +let + pname = "amazon-qldb-shell"; + version = "2.0.1"; + package = rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-aXScqJ1LijMSAy9YkS5QyXtTqxd19lLt3BbyVXlbw8o="; + }; + + nativeBuildInputs = [ clang cmake ]; + buildInputs = [ llvmPackages.libclang ]; + + cargoSha256 = "sha256-y3dNEa2U9mwsENPda44zweszlk4UJXGtfeH+er8mi0U="; + + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + + passthru.tests.version = testVersion { inherit package; }; + + meta = with lib; { + description = "An interface to send PartiQL statements to Amazon Quantum Ledger Database (QLDB)"; + homepage = "https://github.com/awslabs/amazon-qldb-shell"; + license = licenses.asl20; + maintainers = [ maintainers.terlar ]; + mainProgram = "qldb"; + }; + }; +in +package diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 784a87233362..080a8362ba70 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -9,7 +9,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { url = @@ -83,10 +83,10 @@ let in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "sha256-XV+SPZD7IirLJDqwn/eV8/Wf8m3dSSW0DF3IcBPcixA="; + sha256 = "sha256-vj0Ze+Tn8jgq1mIVZWq2q768vW6fNXHB28gMcB9bWHU="; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "sha256-rq8SLtj0rb35vcvPsCzhDGR93EjHoU6KAhEjs2WIA6o="; + sha256 = "sha256-ZuPyZFD3/VRP/GegcKqXZm3bveQB/Xr5E39eQktDCJI="; }; } diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index a2c1e0a06c0b..71a9a95d2fca 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -1,8 +1,16 @@ -{ lib, buildGoModule, fetchFromGitHub, ronn, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, makeWrapper +, python3Packages +, ronn +, shellcheck +}: buildGoModule rec { pname = "actionlint"; - version = "1.6.8"; + version = "1.6.10"; subPackages = [ "cmd/actionlint" ]; @@ -10,16 +18,18 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "sha256-wjLY40bxpoMk6YIG/4KbjxSWUDVNn3cX5OcsgfEPjzk="; + sha256 = "sha256-RFsNJiCeSAeEWOUnfBpeIZKoS2mlXazYMQd1M6yFLGU="; }; - vendorSha256 = "sha256-0tytdTZxnWYl8AxaquF0ArY3dy51j8H2kzw69qcSHzk="; + vendorSha256 = "sha256-CxNER8aQftMG14M+x6bPwcXgUZRkUDYZtFg1cPxxg+I="; - nativeBuildInputs = [ ronn installShellFiles ]; + nativeBuildInputs = [ makeWrapper ronn installShellFiles ]; postInstall = '' ronn --roff man/actionlint.1.ronn installManPage man/actionlint.1 + wrapProgram "$out/bin/actionlint" \ + --prefix PATH : ${lib.makeBinPath [ python3Packages.pyflakes shellcheck ]} ''; ldflags = [ "-s" "-w" "-X github.com/rhysd/actionlint.version=${version}" ]; diff --git a/pkgs/development/tools/analysis/bingrep/default.nix b/pkgs/development/tools/analysis/bingrep/default.nix index d354b71fc9f3..2d8348bfc9bc 100644 --- a/pkgs/development/tools/analysis/bingrep/default.nix +++ b/pkgs/development/tools/analysis/bingrep/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bingrep"; - version = "0.8.5"; + version = "0.9.0"; src = fetchFromGitHub { owner = "m4b"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ayA3aEidZPa5GJgbbm5K3X2Xgd5Eb6TgUU80Gw/p07w="; + hash = "sha256-M3BYj1SKQKjEqP9cxaVlh7UeleDbcx6JN+UI6Ez+QJ8="; }; - cargoSha256 = "sha256-XcXllex7UEufV5URhH7aqln1tNxwaiAETO3fUKmHf7s="; + cargoHash = "sha256-botAoLNg/qTh+cjPXcjo/Ol2Vktj/c5130k5falEuLY="; meta = with lib; { description = "Greps through binaries from various OSs and architectures, and colors them"; diff --git a/pkgs/development/tools/analysis/binlore/default.nix b/pkgs/development/tools/analysis/binlore/default.nix index aba1c59b979d..ac46bd4c4185 100644 --- a/pkgs/development/tools/analysis/binlore/default.nix +++ b/pkgs/development/tools/analysis/binlore/default.nix @@ -30,8 +30,8 @@ let src = fetchFromGitHub { owner = "abathur"; repo = "binlore"; - rev = "v0.1.3"; - hash = "sha256-+rgv8gAQ3ptOpL/EhbKr/jq+k/4Lpn06/2qON+Ps2wE="; + rev = "v0.1.4"; + hash = "sha256-+N0Bqyaj/mAwrcgFtUI8czmKo3VW6J8ZRxaPEghp7QM="; }; /* binlore has one one more yallbacks responsible for diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 101a4f948fce..c0609118fc85 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.19.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - sha256 = "sha256-H/EQTS+d317icCZdOWTvykzIFQC7ia7/jYFkImgogps="; + sha256 = "sha256-LMHaRGZZqFUCbrChzlLA/gUArlGC5DUI2fc1bkLU2CA="; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - cargoSha256 = "sha256-A3J5od6yT7eVU66WfvG/umne0RDBZCf8IvQpW6OTZSE="; + cargoSha256 = "sha256-ei+ilmrlJYmt08A+aV2Rc5pn5dkuEBgfm9kyLkfFe9A="; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/development/tools/analysis/cccc/default.nix index bcbda8ad7e60..dc7cccd9dc1d 100644 --- a/pkgs/development/tools/analysis/cccc/default.nix +++ b/pkgs/development/tools/analysis/cccc/default.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl }: -let - name = "cccc"; +stdenv.mkDerivation rec { + pname = "cccc"; version = "3.1.4"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${name}/${version}/${name}-${version}.tar.gz"; + url = "mirror://sourceforge/cccc/${version}/cccc-${version}.tar.gz"; sha256 = "1gsdzzisrk95kajs3gfxks3bjvfd9g680fin6a9pjrism2lyrcr7"; }; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index ab6cbbeba5c9..8cda4a0b2128 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -15,6 +15,16 @@ let doCheck = false; }); + jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { + version = "3.2.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo="; + }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + doCheck = false; + }); + }; }; in @@ -22,13 +32,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.762"; + version = "2.0.988"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-7YINKTvEAAOGoGkc4t2YwuMBF4rvOxRD2XhJxJBWvis="; + hash = "sha256-0/SL20N5d/oqWdyvVMZ+pzpPbehrYepaPi8P8SS8DSA="; }; nativeBuildInputs = with py.pkgs; [ @@ -43,6 +53,7 @@ buildPythonApplication rec { bc-python-hcl2 boto3 cachetools + charset-normalizer cloudsplaining colorama configargparse @@ -61,6 +72,7 @@ buildPythonApplication rec { packaging policyuniverse prettytable + pycep-parser pyyaml semantic-version tabulate @@ -96,9 +108,12 @@ buildPythonApplication rec { "TestSarifReport" # Will probably be fixed in one of the next releases "test_valid_cyclonedx_bom" + "test_record_relative_path_with" + "test_record_relative_path_with_relative_dir" # Requires prettytable release which is only available in staging "test_skipped_check_exists" - "test_record_relative_path_with_relative_dir" + # AssertionError: 0 not greater than 0 + "test_skip_mapping_default" ]; disabledTestPaths = [ diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 06acec262d1d..6c135beea458 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "9.2.1"; + version = "9.3"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-EqZt/Er9A02ggThXF8y5wCjUgTE8mHPBLs9/XNsJ2vY="; + sha256 = "sha256-Aq0zB+RgWafE+K9sX2H0d7xf2RDlavsUXEWQTJXSE6w="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 7491b5892744..a6a95e74e4a1 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.7.3"; + version = "2.8.1"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-wvN9NODw8JV30mDGhs7qlCoyp3Z3bJSGUfQ6+GtE5kE="; + sha256 = "sha256-zZoK5x+nE8AVZWDSMmsVPFuXNnAHBPyu9+1GgSwN19c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index f7e6f040ba2e..993f5dbe7e91 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -1,15 +1,19 @@ -{ lib, stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3 }: +{ lib, stdenv, fetchFromGitHub, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3, python3 }: stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.6"; + version = "2.7.4"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-rQuvhVgpVBdwCCekraG+cqxR9PUs/wm5pjVQHzTpaKI="; + src = fetchFromGitHub { + owner = "danmar"; + repo = "cppcheck"; + rev = version; + sha256 = "sha256-bMDH3TRAdDoI1AaHTpIl4P/yk9wsV0ReNh6bMmCsKys="; }; - buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ]; + buildInputs = [ pcre + (python3.withPackages (ps: [ps.pygments])) + ] ++ lib.optionals withZ3 [ z3 ]; nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; makeFlags = [ "PREFIX=$(out)" "FILESDIR=$(out)/cfg" "HAVE_RULES=yes" ] @@ -19,6 +23,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = true; + postInstall = '' make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man mkdir -p $man/share/man/man1 diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index 983dd2c2a999..49331dbfceb5 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "dotenv-linter"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "dotenv-linter"; repo = "dotenv-linter"; rev = "v${version}"; - sha256 = "sha256-kBBn8Lgb3427K00Ag35Ei9oBD7L0Zp/lr0cAKqZpULo="; + sha256 = "sha256-YWL1aPcMdU4lo7h/T2sdl2H6qnx3lfMtV39Ak4yP88w="; }; - cargoSha256 = "sha256-7Porqqh6lYeBCK2pAtbL9nxtORB9rqSyVdJDoy1/ZDo="; + cargoSha256 = "sha256-q59hpnXc00OzrJk1KOWbIPQYfIE+7ku9XtTDXHgwQBg="; meta = with lib; { description = "Lightning-fast linter for .env files. Written in Rust"; diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix index b8abad44f241..158f6545b714 100644 --- a/pkgs/development/tools/analysis/eresi/default.nix +++ b/pkgs/development/tools/analysis/eresi/default.nix @@ -59,8 +59,8 @@ stdenv.mkDerivation rec { meta = { description = "The ERESI Reverse Engineering Software Interface"; - license = lib.licenses.gpl2; - homepage = "http://www.eresi-project.org/"; + license = lib.licenses.gpl2Only; + homepage = "https://github.com/thorkill/eresi"; # Formerly http://www.eresi-project.org/ platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 8b9d0c23e1e8..2d97b64b11e8 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.169.0"; + version = "0.174.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-QyY0Tb6FalPkWvVGegY6VBqX0pBP15GQgIKLNLPUMYk="; + sha256 = "sha256-lfj6KyB9QYvUy4Ybo8f30omAg4K/jT5MEERJPm0aJ7U="; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix index 26c7b6dd0b70..a1eec36204bf 100644 --- a/pkgs/development/tools/analysis/ikos/default.nix +++ b/pkgs/development/tools/analysis/ikos/default.nix @@ -10,12 +10,12 @@ let in stdenv.mkDerivation rec { - name = "ikos"; + pname = "ikos"; version = "3.0"; src = fetchFromGitHub { owner = "NASA-SW-VnV"; - repo = name; + repo = "ikos"; rev = "v${version}"; sha256 = "0k3kp1af0qx3l1x6a4sl4fm8qlwchjvwkvs2ck0fhfnc62q2im5f"; }; diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix index edad1f0dd9ee..3752fa8e251d 100644 --- a/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/pkgs/development/tools/analysis/oclgrind/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "oclgrind"; - version = "19.10"; + version = "21.10"; src = fetchFromGitHub { owner = "jrprice"; repo = "oclgrind"; rev = "v${version}"; - sha256 = "12v5z5x3ls26p3y3yc4mqmh12cazc0nlrwvmfbn6cyg4af9dp0zn"; + sha256 = "sha256-DGCF7X2rPV1w9guxg2bMylRirXQgez24sG7Unlct3ow="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 64ab4a315de1..503d5c630498 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.41.0"; + version = "6.43.0"; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "sha256-kXyUukqLFIdaBpO+oimyrzmGm6bNwoQaRDIoMtZq45k="; + sha256 = "sha256-+eJCN890vm4WBcMZ2VCGOS8WUyIckL+DfQVNaUSovGE="; }; nativeBuildInputs = [ unzip makeWrapper ]; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://pmd.github.io/"; changelog = "https://pmd.github.io/pmd-${version}/pmd_release_notes.html"; platforms = platforms.unix; - license = with licenses; [ bsdOriginal asl20 lgpl3Plus ]; + license = with licenses; [ bsdOriginal asl20 ]; }; } diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 6b238fb9266e..5ce79a092488 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, qmake, qtbase, perl, python2, php, kcachegrind, wrapQtAppsHook }: -let - name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; - -in stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation { + pname = "qcachegrind"; + version = kcachegrind.version; src = kcachegrind.src; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index c50f75c154ea..d5d393ee96eb 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.5.4"; + version = "5.6.4"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "sha256-zELmNpbT1JCt0UAzHwzcTDN9QZTLQY0+rG9zVRWxiFg="; + sha256 = "sha256-rqGlp9fHTF1z8A+DROYfzHXi5xfLMdUWzssGN5uHQmE="; }; preBuild = '' @@ -62,15 +62,11 @@ stdenv.mkDerivation rec { ''; postFixup = lib.optionalString stdenv.isDarwin '' - for file in $out/bin/rasm2 $out/bin/ragg2 $out/bin/rabin2 $out/lib/libr_asm.${version}.dylib; do + for file in $out/bin/rasm2 $out/bin/ragg2 $out/bin/rabin2 $out/lib/libr_asm.${version}.dylib $out/lib/libr_anal.${version}.dylib; do install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $file done ''; - postInstall = '' - install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm - ''; - WITHOUT_PULL = "1"; makeFlags = [ "GITTAP=${version}" diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 5ea43e5555bc..4c33ef57a47d 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.2.6"; + version = "4.3.0"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "sha256-69cKAyMwORG4A91OARmY4uQKgBZIx9N/zc7TZ086CK0="; + sha256 = "sha256-3svBmXcRvscaK8YD4qm/geQSJ6cAm0en/d7H09h41PQ="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index c4cdf85a7d8a..9b15cdd148d8 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config meson ninja cmake (python3.withPackages (ps: [ ps.setuptools ])) ]; - # meson's find_library seems to not use our compiler wrapper if static paraemter + # meson's find_library seems to not use our compiler wrapper if static parameter # is either true/false... We work around by also providing LIBRARY_PATH preConfigure = '' LIBRARY_PATH="" diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 5f0c7bffe94f..62026d527810 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -1,46 +1,42 @@ -{ stdenv, lib, fetchurl, makeWrapper, bison, gcc -, withISpin ? true, tk, swarm, graphviz }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, bison, gcc, tk, swarm, graphviz }: let - binPath = lib.makeBinPath [ gcc ]; - ibinPath = lib.makeBinPath [ gcc tk swarm graphviz tk ]; + binPath = lib.makeBinPath [ gcc graphviz tk swarm ]; +in -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "spin"; - version = "6.4.9"; - url-version = lib.replaceChars ["."] [""] version; + version = "6.5.2"; - src = fetchurl { - # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL. - # Dropbox mirror from developers: - # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa - # (note that this URL doesn't work aross versions and hash should come from official site) - url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AABtxFePMJmPxsxSvU5cpxh8a/spin${url-version}.tar.gz?raw=1"; - sha256 = "07b7wk3qyfnp4pgwicqd33l7i1krzyihx0cf9zkv81ywaklf5vll"; + src = fetchFromGitHub { + owner = "nimble-code"; + repo = "Spin"; + rev = "version-${version}"; + sha256 = "sha256-drvQXfDZCZRycBZt/VNngy8zs4XVJg+d1b4dQXVcyFU="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bison ]; - sourceRoot = "Spin/Src${version}"; + sourceRoot = "source/Src"; - installPhase = '' - install -Dm644 ../Man/spin.1 $out/share/man/man1/spin.1 + preBuild = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + ''; - install -Dm755 spin $out/bin/spin - wrapProgram $out/bin/spin \ - --prefix PATH : ${binPath} - '' + lib.optionalString withISpin '' - install -Dm755 ../iSpin/ispin.tcl $out/bin/ispin - wrapProgram $out/bin/ispin \ - --prefix PATH ':' "$out/bin:${ibinPath}" + enableParallelBuilding = true; + makeFlags = [ "DESTDIR=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/spin --prefix PATH : ${binPath} ''; meta = with lib; { description = "Formal verification tool for distributed software systems"; homepage = "https://spinroot.com/"; - license = licenses.free; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ pSub ]; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ pSub siraben ]; }; } diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index dc38728a44a2..ef4e31e9481f 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.4.18"; + version = "0.5.1"; src = fetchFromGitHub { owner = "dalance"; repo = "svlint"; rev = "v${version}"; - sha256 = "sha256-p002oWwTQxesWLgLq8oKKzuZKXUdO4C1TZ7lR/Mh1PA="; + sha256 = "sha256-BgkzbKRcZkot3qkwPqSE9QkH3A3HNDuLjpFzKsU+Wb0="; }; - cargoSha256 = "sha256-1WEPJpU/hLn+qjU+ETkmbfZIJTORe3OUdyl605JnYmU="; + cargoSha256 = "sha256-HeFh8H7IN3m4HiEH1QbCBROslzVCzYxGIaeyM4K7gcs="; meta = with lib; { description = "SystemVerilog linter"; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 951e95b1477c..33e5de472c2d 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.34.1"; + version = "0.35.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ltxFduUr+poi4tEjViQXCbe+j3fUdvBG8CTaM7VdpK0="; + sha256 = "sha256-rLPKc9QeT9r0JUYcTMSHPa/4FxYiMLMdnv2iOMdBAy0="; }; - vendorSha256 = "sha256-iZdWCSkdKG0SXcUtZ0DgDGk25vESlv2dSbcK1gUVTV8="; + vendorSha256 = "sha256-J1PgrWFAu1LrAYdoJP3HUunz/MkJ4Co0+hc7e6nFTBo="; doCheck = false; diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 75d1b3035ee3..82e0e1515921 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -1,31 +1,38 @@ { lib -, buildGoPackage +, buildGoModule , fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "tfsec"; - version = "0.63.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-khAVb+uwr3qyAWjvMjPG//+FKQJ9qoVwmhsej++IQhs="; + sha256 = "sha256-4YojzVwvPc+9Mn+xyRMxGEKv68eekXpH0RzSsrd8voY="; }; - goPackagePath = "github.com/aquasecurity/tfsec"; - ldflags = [ - "-w" - "-s" - "-X ${goPackagePath}/version.Version=${version}" + "-s" "-w" + "-X github.com/aquasecurity/tfsec/version.Version=${version}" + ## not sure if this is needed (https://github.com/aquasecurity/tfsec/blob/master/.goreleaser.yml#L6) + # "-extldflags '-fno-PIC -static'" + ]; + + vendorSha256 = "sha256-/r1KMX5YqJ3bVXNYJWv10cHkBQMuS90KMGXWUB6Idw8="; + + subPackages = [ + "cmd/tfsec" + "cmd/tfsec-docs" + "cmd/tfsec-checkgen" ]; meta = with lib; { description = "Static analysis powered security scanner for terraform code"; homepage = "https://github.com/aquasecurity/tfsec"; license = licenses.mit; - maintainers = with maintainers; [ fab marsam ]; + maintainers = with maintainers; [ fab marsam peterromfeldhk ]; }; } diff --git a/pkgs/development/tools/analysis/yallback/default.nix b/pkgs/development/tools/analysis/yallback/default.nix index 17263d1766a8..4e62ff5b9ed8 100644 --- a/pkgs/development/tools/analysis/yallback/default.nix +++ b/pkgs/development/tools/analysis/yallback/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { - version = "0.1.0"; + version = "0.2.0"; pname = "yallback"; src = fetchFromGitHub { owner = "abathur"; repo = "yallback"; rev = "v${version}"; - hash = "sha256-FaPqpxstKMhqLPFLIdenHgwzDE3gspBbJUSY95tblgI="; + hash = "sha256-t+fdnDJMFiFqN23dSY3TnsZsIDcravtwdNKJ5MiZosE="; }; buildInputs = [ coreutils bashInteractive ]; diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 3b9044a544a9..3dda078397ea 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "apktool"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "sha256-91CjzSwflC8n9ff9XRfq2jva/wpmQ/SduEfoQlef3aU="; + sha256 = "sha256-vCuah6xahpBbbKNDwhoNs7w3vdURVLyc32VSPZWJXTQ="; }; dontUnpack = true; diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix new file mode 100644 index 000000000000..e93dfe845436 --- /dev/null +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -0,0 +1,52 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "appthreat-depscan"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "AppThreat"; + repo = "dep-scan"; + rev = "v${version}"; + hash = "sha256-hRmTx0qs/QnDLl4KhGbKw5Mucq4wQCaCIkeObrZlJSI="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + appthreat-vulnerability-db + defusedxml + pyyaml + rich + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov-append --cov-report term --cov depscan" "" + ''; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + disabledTests = [ + # Assertion Error + "test_query_metadata2" + ]; + + pythonImportsCheck = [ + "depscan" + ]; + + meta = with lib; { + description = "Tool to audit dependencies based on known vulnerabilities and advisories"; + homepage = "https://github.com/AppThreat/dep-scan"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix index a52a6ca8179b..9d873b8461f1 100644 --- a/pkgs/development/tools/ashpd-demo/default.nix +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -4,7 +4,6 @@ , nix-update-script , meson , ninja -, python3 , rustPlatform , pkg-config , glib @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { pname = "ashpd-demo"; - version = "0.0.1-alpha"; + version = "0.2.2"; src = let @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { owner = "bilelmoussaoui"; repo = "ashpd"; rev = version; - sha256 = "Lf3Wj4VTDyJ5a1bJTEI6R6aaeEHZ+4hO+BsD98sKb/s="; + sha256 = "9O6XqM4oys/hXgztQQ8tTobJV8U52db/VY6FlTMUvGY="; }; in "${share}/ashpd-demo"; @@ -38,18 +37,18 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-npqC8lu7acAggJyR4iDkcQZYMNNnseV2pB3+j4G/nIk="; + hash = "sha256-eFq42m16zzrUBbAqv7BsAf4VxyO93WynLjvIzKbZwnQ="; }; nativeBuildInputs = [ meson ninja pkg-config - python3 rustPlatform.rust.cargo rustPlatform.cargoSetupHook rustPlatform.rust.rustc wrapGAppsHook4 + rustPlatform.bindgenHook desktop-file-utils glib # for glib-compile-schemas ]; @@ -65,18 +64,6 @@ stdenv.mkDerivation rec { libshumate ]; - # libspa-sys requires this for bindgen - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - # included by libspa-sys requires - BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include"; - - postPatch = '' - patchShebangs build-aux/meson_post_install.py - # https://github.com/bilelmoussaoui/ashpd/pull/32 - substituteInPlace build-aux/meson_post_install.py \ - --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" - ''; - passthru = { updateScript = nix-update-script { attrPath = pname; @@ -86,7 +73,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool for playing with XDG desktop portals"; homepage = "https://github.com/bilelmoussaoui/ashpd/tree/master/ashpd-demo"; - broken = true; # requires older libadwaita license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix index c7a96ce247eb..9f19dee156da 100644 --- a/pkgs/development/tools/avro-tools/default.nix +++ b/pkgs/development/tools/avro-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "avro-tools"; - version = "1.9.2"; + version = "1.11.0"; src = fetchurl { url = "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar"; - sha256 = "169cv4fjsj69fa2s87gh1i7wk0xzh3l7sx5yyz3cgyjalg4a12n1"; + sha256 = "sha256-XnfvND5WPojzIS8t0ntwn+3+Zjz9ABEUK2FO6aD4ulw="; }; dontUnpack = true; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 444bc39bddd0..0bbe2056be54 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -44,11 +44,12 @@ python3.pkgs.buildPythonApplication rec { --replace "dateparser~=1.0" "dateparser>=0.7" \ --replace "docker~=4.2.0" "docker>=4.2.0" \ --replace "Flask~=1.1.2" "Flask~=2.0" \ - --replace "PyYAML~=5.3" "PyYAML" \ + --replace "PyYAML~=5.3" "PyYAML #" \ --replace "regex==" "regex #" \ --replace "requests==" "requests #" \ --replace "typing_extensions==" "typing-extensions #" \ - --replace "tzlocal==3.0" "tzlocal" \ + --replace "tzlocal==3.0" "tzlocal #" \ + --replace "tomlkit==0.7.2" "tomlkit #" \ --replace "watchdog==" "watchdog #" ''; diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index c31529fd4e1d..093a37e2b96d 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "1.2.4"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G1vds0156dYTxB6I155NiTuI9JnqZ7Uh3f5vHNTOMsk="; + sha256 = "sha256-aOxwM9ur0E/biLOzhDyTCWYBwdbpsTQ49aCfkFea5ck="; }; - cargoSha256 = "sha256-ytS+U+Tbyz2cMgXN/rZ5Kf4WgoIr8RIuBwLLUJ2XtHU="; + cargoSha256 = "sha256-AUoLwryuEdUdWasaHuap6qff8DRi90iq/v4afyG9beo="; buildInputs = lib.optional stdenv.isDarwin CoreServices; diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix index f78125ae990b..3d46a77108c7 100644 --- a/pkgs/development/tools/bazel-gazelle/default.nix +++ b/pkgs/development/tools/bazel-gazelle/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-gazelle"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WWAOhV1H/OnARjhoWQYNmd9/y8pD3bRkhncmzt/36mA="; + sha256 = "sha256-wMhFhJruXHuAq81A4efxvR9eJ5YTp7QTnr1gj8RrIX8="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/development/tools/bazel-kazel/default.nix index abb32b3ba513..b3f58262b1dd 100644 --- a/pkgs/development/tools/bazel-kazel/default.nix +++ b/pkgs/development/tools/bazel-kazel/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-kazel"; - version = "0.2.2"; + version = "0.2.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "repo-infra"; rev = "v${version}"; - sha256 = "sha256-EfK8uJQvZkB5V/SGOLRznAFGsgVGwFv6MWkLPWePYvM="; + sha256 = "sha256-Y9VOlFrFmJQCQuwf3UztHGuJqmq/lSibTbI3oGjtNuE="; }; vendorSha256 = "sha256-1+7Mx1Zh1WolqTpWNe560PRzRYaWVUVLvNvUOysaW5I="; diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index e10a455c0906..5b0dd0349439 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -12,7 +12,7 @@ let ]; in buildBazelPackage rec { - name = "bazel-watcher-${version}"; + pname = "bazel-watcher"; version = "0.14.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/bingo/default.nix b/pkgs/development/tools/bingo/default.nix new file mode 100644 index 000000000000..8fe1dbaa4bea --- /dev/null +++ b/pkgs/development/tools/bingo/default.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, testVersion, bingo }: + +buildGoModule rec { + pname = "bingo"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "bwplotka"; + repo = "bingo"; + rev = "v${version}"; + sha256 = "sha256-4D8YaA/AH1gIp5iwD7WEAdBl73sqwHpfOe7bnxVcRcw="; + }; + + vendorSha256 = "sha256-xrz9FpwZd+FboVVTWSqGHRguGwrwE9cSFEEtulzbfDQ="; + + patches = [ + # Do not execute `go` command when invoking `bingo version`. + ./version_go.patch + ]; + + postPatch = '' + rm get_e2e_test.go get_e2e_utils_test.go + ''; + + CGO_ENABLED = 0; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testVersion { + package = bingo; + command = "bingo version"; + version = "v${version}"; + }; + + meta = with lib; { + description = "Like `go get` but for Go tools! CI Automating versioning of Go binaries in a nested, isolated Go modules."; + homepage = "https://github.com/bwplotka/bingo"; + license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; + }; +} diff --git a/pkgs/development/tools/bingo/version_go.patch b/pkgs/development/tools/bingo/version_go.patch new file mode 100644 index 000000000000..2898326a0547 --- /dev/null +++ b/pkgs/development/tools/bingo/version_go.patch @@ -0,0 +1,17 @@ +diff --git a/main.go b/main.go +index 5600f7e..662ed1b 100644 +--- a/main.go ++++ b/main.go +@@ -201,10 +201,8 @@ func main() { + return pkgs.PrintTab(target, os.Stdout) + } + case "version": +- cmdFunc = func(ctx context.Context, r *runner.Runner) error { +- _, err := fmt.Fprintln(os.Stdout, version.Version) +- return err +- } ++ _, _ = fmt.Fprintln(os.Stdout, version.Version) ++ return + default: + exitOnUsageError(flags.Usage, "No such command", flags.Arg(0)) + } diff --git a/pkgs/development/tools/biodiff/default.nix b/pkgs/development/tools/biodiff/default.nix new file mode 100644 index 000000000000..340c3b736caf --- /dev/null +++ b/pkgs/development/tools/biodiff/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "biodiff"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "8051Enthusiast"; + repo = "biodiff"; + rev = "v${version}"; + sha256 = "sha256-M1hwuIe5+quxcvFAacBkxQMiQyN6lhtWA6hEi5Buoho="; + }; + + cargoSha256 = "sha256-NIt4D2/T7Zl7rgksbQeVo6cNBt6cZkUGTJGztnp6SB0="; + + meta = with lib; { + description = "Hex diff viewer using alignment algorithms from biology"; + homepage = "https://github.com/8051Enthusiast/biodiff"; + changelog = "https://github.com/8051Enthusiast/biodiff/blob/v${version}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 514607317840..0f7904fe9bbb 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -5,19 +5,21 @@ , git , testVersion , buf +, installShellFiles }: buildGoModule rec { pname = "buf"; - version = "1.0.0-rc11"; + version = "1.3.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V6xaGnSoKuJC59uZLW8uSLqwseJHvLGjrvhzE8o9fho="; + sha256 = "sha256-rOT7HuvbJFRyBOmCNmx5Vic4zckYgS+1BB0PcpwD9OQ="; }; - vendorSha256 = "sha256-442NHTREM2zC8VA7zAV35YSwX1lM/BXnx6p8a+avzps="; + + vendorSha256 = "sha256-qIWZYsl1hFV4Ts27WSyjQAQ+jWjtLLG+A+yS0Ms7hfI="; patches = [ # Skip a test that requires networking to be available to work. @@ -26,12 +28,15 @@ buildGoModule rec { ./skip_test_requiring_dotgit.patch ]; - nativeBuildInputs = [ protobuf ]; - # Required for TestGitCloner - checkInputs = [ git ]; + nativeBuildInputs = [ installShellFiles ]; ldflags = [ "-s" "-w" ]; + checkInputs = [ + git # Required for TestGitCloner + protobuf # Required for buftesting.GetProtocFilePaths + ]; + preCheck = '' # The tests need access to some of the built utilities export PATH="$PATH:$GOPATH/bin" @@ -42,6 +47,7 @@ buildGoModule rec { installPhase = '' runHook preInstall + # Binaries mkdir -p "$out/bin" # Only install required binaries, don't install testing binaries for FILE in \ @@ -51,6 +57,16 @@ buildGoModule rec { cp "$GOPATH/bin/$FILE" "$out/bin/" done + # Completions + installShellCompletion --cmd buf \ + --bash <($GOPATH/bin/buf completion bash) \ + --fish <($GOPATH/bin/buf completion fish) \ + --zsh <($GOPATH/bin/buf completion zsh) + + # Man Pages + mkdir man && $GOPATH/bin/buf manpages man + installManPage man/* + runHook postInstall ''; diff --git a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 9c64b4a078c9..a133526514f7 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.3.3"; + version = "2.3.6"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3ZN/SCTQ5k0X4cqnrpp8Yt1QDnYkT2RbMLKpDfdWaxk="; + sha256 = "sha256-geb7uHCBvhmqyaDr8wK9sQUcHT3xVgSclovFDpHhIiw="; }; - vendorSha256 = "sha256-XBsYSA0i0q/mp8sQh9h//pjs+TbEDc7UIdNU24/Qemo="; + vendorSha256 = "sha256-wXgW7HigMIeUZAcZpm5TH9thfCHmpz+M42toWHgwIYo="; doCheck = false; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix index f03f42be389f..6168c4a477f6 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix @@ -114,10 +114,10 @@ stdenv'.mkDerivation rec { bashTools = callPackage ./bash-tools-test.nix {}; }; - name = "bazel-${version}"; + pname = "bazel"; src = fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip"; + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; sha256 = "d26dadf62959255d58e523da3448a6222af768fe1224e321b120c1d5bbe4b4f2"; }; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index d9c93c2265f5..3c71c8cc0891 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -613,6 +613,10 @@ stdenv.mkDerivation rec { # runtime dependencies. echo "${python27}" >> $out/nix-support/depends echo "${python3}" >> $out/nix-support/depends + # The string literal specifying the path to the bazel-rc file is sometimes + # stored non-contiguously in the binary due to gcc optimisations, which leads + # Nix to miss the hash when scanning for dependencies + echo "${bazelRC}" >> $out/nix-support/depends '' + lib.optionalString stdenv.isDarwin '' echo "${cctools}" >> $out/nix-support/depends ''; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 6a8792910b11..72c971d1334d 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -660,6 +660,10 @@ stdenv.mkDerivation rec { postFixup = '' mkdir -p $out/nix-support echo "${defaultShellPath}" >> $out/nix-support/depends + # The string literal specifying the path to the bazel-rc file is sometimes + # stored non-contiguously in the binary due to gcc optimisations, which leads + # Nix to miss the hash when scanning for dependencies + echo "${bazelRC}" >> $out/nix-support/depends '' + lib.optionalString stdenv.isDarwin '' echo "${cctools}" >> $out/nix-support/depends ''; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 7950208499ab..b0375db8c65c 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "4.2.5"; + version = "5.0.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "sha256-KY2Sldg3ChKR+rPalCkIVaLuR37s67FjB9aA20ZWD8Y="; + sha256 = "sha256-AIOfudFxr1obuxABEN0ggainci/EjbBrdgr2cjVu2Io="; }; vendorSha256 = "sha256-buMkRxVLlS2LBJGaGWeR41BsmE/0vgDS8s1VcRYN0fA="; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 10d3dca84123..11b25bec3816 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.12"; + version = "1.4.13"; bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "jqcecAM51qEDmTim2VBNm8IO8wQmwU19R57Zk4pxwSA=" - else if stdenv.isDarwin && stdenv.isx86_64 then "15m2rahf9kihw29hp6bwd9xqav6dcr17w5c2rsw0ijpchr2av72q" + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "sha256-jqcecAM51qEDmTim2VBNm8IO8wQmwU19R57Zk4pxwSA=" + else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-WJytRIbsygi4zoIVfkJmzWyFe2p8mQuT4DDO5KDKopY=" else throw "unsupported platform"; }; diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 0d8ca351096c..d577b62a193a 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -1,15 +1,20 @@ -{ lib, stdenv, fetchurl, fetchpatch -, getopt, tzdata, ksh +{ lib +, stdenv +, fetchurl +, fetchpatch +, getopt +, tzdata +, ksh , pkgsMusl # for passthru.tests }: stdenv.mkDerivation rec { pname = "bmake"; - version = "20210621"; + version = "20220208"; src = fetchurl { - url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "0gpzv75ibzqz1j1h0hdjgx1v7hkl3i5cb5yf6q9sfcgx0bvb55xa"; + url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; + hash = "sha256-ewDB4UYrLh5Upk2ND88n/HfursPxOSDv+NlST/BZ1to="; }; # Make tests work with musl @@ -30,8 +35,6 @@ stdenv.mkDerivation rec { ./bootstrap-fix.patch # preserve PATH from build env in unit tests ./fix-unexport-env-test.patch - # Fix localtime tests without global /etc/zoneinfo directory - ./fix-localtime-test.patch # Always enable ksh test since it checks in a impure location /bin/ksh ./unconditional-ksh-test.patch # decouple tests from build phase @@ -48,15 +51,20 @@ stdenv.mkDerivation rec { }) ]; - # The generated makefile is a small wrapper for calling ./boot-strap - # with a given op. On a case-insensitive filesystem this generated - # makefile clobbers a distinct, shipped, Makefile and causes - # infinite recursion during tests which eventually fail with - # "fork: Resource temporarily unavailable" + # The generated makefile is a small wrapper for calling ./boot-strap with a + # given op. On a case-insensitive filesystem this generated makefile clobbers + # a distinct, shipped, Makefile and causes infinite recursion during tests + # which eventually fail with "fork: Resource temporarily unavailable" configureFlags = [ "--without-makefile" ]; + # Disabled tests: + # varmod-localtime: musl doesn't support TZDIR and this test relies on impure, + # implicit paths + # opt-chdir: ofborg complains about it somehow + BROKEN_TESTS = "varmod-localtime opt-chdir"; + buildPhase = '' runHook preBuild @@ -74,11 +82,13 @@ stdenv.mkDerivation rec { ''; doCheck = true; + checkInputs = [ tzdata ] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [ ksh ]; + checkPhase = '' runHook preCheck @@ -89,15 +99,15 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - passthru.tests = { - bmakeMusl = pkgsMusl.bmake; + meta = with lib; { + homepage = "http://www.crufty.net/help/sjg/bmake.html"; + description = "Portable version of NetBSD 'make'"; + license = licenses.bsd3; + maintainers = with maintainers; [ thoughtpolice AndersonTorres ]; + platforms = platforms.unix; + broken = stdenv.isAarch64; # ofborg complains }; - meta = with lib; { - description = "Portable version of NetBSD 'make'"; - homepage = "http://www.crufty.net/help/sjg/bmake.html"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice ]; - }; + passthru.tests.bmakeMusl = pkgsMusl.bmake; } +# TODO: report the quirks and patches to bmake devteam (especially the Musl one) diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix deleted file mode 100644 index ec03e285603f..000000000000 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, curl, expat, zlib, bzip2 -, useNcurses ? false, ncurses, useQt4 ? false, qt4, ps -}: - -with lib; - -assert stdenv ? cc; -assert stdenv.cc ? libc; - -let - os = lib.optionalString; - majorVersion = "2.8"; - minorVersion = "12.2"; - version = "${majorVersion}.${minorVersion}"; -in - -stdenv.mkDerivation rec { - pname = "cmake${os useNcurses "-cursesUI"}${os useQt4 "-qt4UI"}"; - inherit version; - - inherit majorVersion; - - src = fetchurl { - url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc"; - }; - - enableParallelBuilding = true; - - patches = - [(fetchpatch { # see https://www.cmake.org/Bug/view.php?id=13959 - name = "FindFreetype-2.5.patch"; - url = "https://public.kitware.com/Bug/file/4660/0001-Support-finding-freetype2-using-pkg-config.patch"; - sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; - })] ++ - # Don't search in non-Nix locations such as /usr, but do search in our libc. - [ ./search-path-2.8.patch ] ++ - optional (stdenv.hostPlatform != stdenv.buildPlatform) (fetchurl { - name = "fix-darwin-cross-compile.patch"; - url = "https://public.kitware.com/Bug/file_download.php?" - + "file_id=4981&type=bug"; - sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; - }); - - postPatch = '' - substituteInPlace Utilities/cmlibarchive/CMakeLists.txt \ - --replace '"-framework CoreServices"' '""' - ''; - - buildInputs = [ setupHook curl expat zlib bzip2 ] - ++ optional useNcurses ncurses - ++ optional useQt4 qt4; - - propagatedBuildInputs = [ ps ]; - - CMAKE_PREFIX_PATH = concatStringsSep ":" - (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs); - - configureFlags = [ - "--docdir=/share/doc/${pname}-${version}" - "--mandir=/share/man" - "--system-libs" - "--no-system-libarchive" - ] ++ lib.optional useQt4 "--qt-gui"; - - setupHook = ./setup-hook.sh; - - dontUseCmakeConfigure = true; - - preConfigure = with stdenv; '' - fixCmakeFiles . - substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by libc_bin ${getBin cc.libc} \ - --subst-var-by libc_dev ${getDev cc.libc} \ - --subst-var-by libc_lib ${getLib cc.libc} - configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags" - ''; - - hardeningDisable = [ "format" ]; - - meta = { - homepage = "https://cmake.org"; - description = "Cross-Platform Makefile Generator"; - platforms = if useQt4 then qt4.meta.platforms else lib.platforms.unix; - maintainers = with lib.maintainers; [ xfix ]; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 5c57776a918a..47abc7ec767b 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { + lib.optionalString isBootstrap "-boot" + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI"; - version = "3.22.1"; + version = "3.22.2"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - sha256 = "sha256-DpmCKVSdez82hwPSDiSOfuH4U5ENQnBKqHkYwhPqgsA="; + sha256 = "sha256-PBxHi5ZQsQfUUsW9VFxy4vrU43wJuJoZhLmi9G32rO0="; }; patches = [ diff --git a/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch b/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch deleted file mode 100644 index 9fc949661686..000000000000 --- a/pkgs/development/tools/build-managers/cmake/search-path-2.8.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -ru3 cmake-2.8.12.2/Modules/Platform/Linux.cmake cmake-2.8.12.2-new/Modules/Platform/Linux.cmake ---- cmake-2.8.12.2/Modules/Platform/Linux.cmake 2014-01-16 21:15:08.000000000 +0400 -+++ cmake-2.8.12.2-new/Modules/Platform/Linux.cmake 2016-04-13 22:00:32.928575740 +0300 -@@ -36,22 +36,11 @@ - # checking the platform every time. This option is advanced enough - # that only package maintainers should need to adjust it. They are - # capable of providing a setting on the command line. -- if(EXISTS "/etc/debian_version") -- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL -- "Install .so files without execute permission.") -- else() -- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL -- "Install .so files without execute permission.") -- endif() -+ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL -+ "Install .so files without execute permission.") - endif() - - # Match multiarch library directory names. - set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*") - - include(Platform/UnixPaths) -- --# Debian has lib64 paths only for compatibility so they should not be --# searched. --if(EXISTS "/etc/debian_version") -- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) --endif() -diff -ru3 cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake cmake-2.8.12.2-new/Modules/Platform/UnixPaths.cmake ---- cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake 2014-01-16 21:15:08.000000000 +0400 -+++ cmake-2.8.12.2-new/Modules/Platform/UnixPaths.cmake 2016-04-14 00:09:10.106362636 +0300 -@@ -32,9 +32,6 @@ - # List common installation prefixes. These will be used for all - # search types. - list(APPEND CMAKE_SYSTEM_PREFIX_PATH -- # Standard -- /usr/local /usr / -- - # CMake install location - "${_CMAKE_INSTALL_DIR}" - -@@ -44,44 +41,26 @@ - - # List common include file locations not under the common prefixes. - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # Windows API on Cygwin -- /usr/include/w32api -- -- # X11 -- /usr/X11R6/include /usr/include/X11 -- -- # Other -- /usr/pkg/include -- /opt/csw/include /opt/include -- /usr/openwin/include -+ @libc_dev@/include - ) - - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # Windows API on Cygwin -- /usr/lib/w32api -- -- # X11 -- /usr/X11R6/lib /usr/lib/X11 -- -- # Other -- /usr/pkg/lib -- /opt/csw/lib /opt/lib -- /usr/openwin/lib -+ @libc_lib@/lib - ) - - list(APPEND CMAKE_SYSTEM_PROGRAM_PATH -- /usr/pkg/bin -+ @libc_bin@/bin - ) - - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /lib /usr/lib /usr/lib32 /usr/lib64 -+ @libc_lib@/lib - ) - - list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include -+ @libc_dev@/include - ) - list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES -- /usr/include -+ @libc_dev@/include - ) - - # Enable use of lib64 search path variants by default. diff --git a/pkgs/development/tools/build-managers/fac/default.nix b/pkgs/development/tools/build-managers/fac/default.nix index b6481c621e98..ae5a5b30146d 100644 --- a/pkgs/development/tools/build-managers/fac/default.nix +++ b/pkgs/development/tools/build-managers/fac/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchCrate, git }: +{ lib, stdenv, rustPlatform, fetchCrate, git, CoreServices }: rustPlatform.buildRustPackage rec { pname = "fac-build"; @@ -10,6 +10,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+JJVuKUdnjJoQJ4a2EE0O6jZdVoFxPwbPgfD2LfiDPI="; }; + + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; cargoSha256 = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk="; # fac includes a unit test called ls_files_works which assumes it's @@ -40,7 +42,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://physics.oregonstate.edu/~roundyd/fac"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ dpercy ]; mainProgram = "fac"; }; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index b94330d658ce..78376b639c44 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -3,7 +3,7 @@ rec { gen = - { version, nativeVersion, sha256, defaultJava ? jdk8 }: + { version, nativeVersion, sha256, defaultJava ? jdk8, supportedPlatforms ? null }: { lib, stdenv, fetchurl, makeWrapper, unzip, java ? defaultJava , javaToolchains ? [ ], ncurses5, ncurses6 }: @@ -87,7 +87,7 @@ rec { changelog = "https://docs.gradle.org/${version}/release-notes.html"; downloadPage = "https://gradle.org/next-steps/?version=${version}"; license = licenses.asl20; - platforms = platforms.unix; + platforms = if (supportedPlatforms != null) then supportedPlatforms else platforms.unix; maintainers = with maintainers; [ lorenzleutgeb liff ]; }; }; @@ -96,10 +96,13 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_7 = gen { - version = "7.3.3"; - nativeVersion = "0.22-milestone-21"; - sha256 = "00h3z0vxc4hv31sc71gb88r8yabyqgz304wpr0bxhbx2d14f11mm"; + version = "7.4"; + nativeVersion = "0.22-milestone-23"; + sha256 = "0d56bgd2m64pzmycjk29hwdlhbpn1kkm7fjik1sibn6vslw71hlc"; defaultJava = jdk17; + # Gradle 7 ships some binaries that are only available for some platforms + # See https://github.com/gradle/native-platform#supported-platforms + supportedPlatforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-cygwin" "x86_64-windows" "i686-windows" ]; }; gradle_6 = gen { @@ -107,6 +110,9 @@ rec { nativeVersion = "0.22-milestone-20"; sha256 = "13qyk3f6namw27ynh6nxljxpk9r3l12vxl3f0qpglprdf3c6ydcb"; defaultJava = jdk11; + # Gradle 6 ships some binaries that are only available for some platforms + # See https://github.com/gradle/native-platform#supported-platforms + supportedPlatforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" "x86_64-cygwin" "x86_64-windows" "i686-windows" ]; }; # NOTE: No GitHub Release for the following versions. `update.sh` will not work. diff --git a/pkgs/development/tools/build-managers/gradle/update.sh b/pkgs/development/tools/build-managers/gradle/update.sh index 03c914bbdaf4..0d6b78a66525 100755 --- a/pkgs/development/tools/build-managers/gradle/update.sh +++ b/pkgs/development/tools/build-managers/gradle/update.sh @@ -35,9 +35,13 @@ do f="gradle-${v}-spec.nix" - if [ -f "$f" ] + if [[ -n "$1" && "$1" != "$v" ]] then - echo "$v SKIP" + echo "$v SKIP (nomatch)" + continue + elif [ "$1" == "" ] && [ -f "$f" ] + then + echo "$v SKIP (exists)" continue fi @@ -45,12 +49,18 @@ do read -d "\n" gradle_hash gradle_path < <(nix-prefetch-url --print-path $url) # Prefix and suffix for "native-platform" dependency. - gradle_native_prefix="gradle-$v/lib/native-native-" + gradle_native_prefix="gradle-$v/lib/native-platform-" gradle_native_suffix=".jar" - gradle_native=$(zipinfo -1 "$gradle_path" "$gradle_native_prefix*$gradle_native_suffix" | head -n1) + tmp=$(mktemp) + zipinfo -1 "$gradle_path" "$gradle_native_prefix*$gradle_native_suffix" > $tmp + gradle_native=$(cat $tmp | head -n1) gradle_native=${gradle_native#"$gradle_native_prefix"} gradle_native=${gradle_native%"$gradle_native_suffix"} + # Supported architectures + #grep -Pho "(linux|osx)-\w+" $tmp | sort | uniq + rm -f $tmp + echo -e "{\\n version = \"$v\";\\n nativeVersion = \"$gradle_native\";\\n sha256 = \"$gradle_hash\";\\n}" > $f echo "$v DONE" diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 7dfb6c9b2ad5..80919cfc377f 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.9.7"; + version = "2.9.8"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "sha256-948g0ZMfAoJw53vA8MAKWg76Tst6VnYwSjSuT0aeKB0="; + sha256 = "1sgnxw58srjxqnskl700p7r7n23pfpjvqpiqnz1m8r6c76jwnllr"; }; jarsrc = fetchurl { url = "https://github.com/technomancy/leiningen/releases/download/${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-gvAUFKzs3bsOvW1XFQW7Zxpv0JMja82sJGjP5fLqqAI="; + sha256 = "13f4n15i0gsk9jq52gxivnsk32qjahmxgrddm54cf8ynw0a923ia"; }; JARNAME = "${pname}-${version}-standalone.jar"; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index aeddf457f48d..8744407fb96d 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -5,6 +5,7 @@ , pkg-config , python3 , substituteAll +, withDarwinFrameworksGtkDocPatch ? false }: python3.pkgs.buildPythonApplication rec { @@ -61,6 +62,10 @@ python3.pkgs.buildPythonApplication rec { # Meson tries to update ld.so.cache which breaks when the target architecture # differs from the build host's. ./do-not-update-ldconfig-cache.patch + ] ++ lib.optionals withDarwinFrameworksGtkDocPatch [ + # Fix building gtkdoc for GLib + # https://github.com/mesonbuild/meson/pull/10186 + ./fix-gtkdoc-when-using-multiple-apple-frameworks.patch ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch b/pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch new file mode 100644 index 000000000000..eb6d9718bcb2 --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/fix-gtkdoc-when-using-multiple-apple-frameworks.patch @@ -0,0 +1,176 @@ +From 0a008a6c7ecee19f35c8b7ab17b1470d0d1a8a15 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Sat, 26 Mar 2022 02:26:27 +0100 +Subject: [PATCH] gnome: Fix gtkdoc when using multiple Apple frameworks + +The `-framework Foundation -framework CoreFoundation` ended up +de-duplicated by OrderedSet into `-framework Foundation CoreFoundation`. + +Picked from https://github.com/mesonbuild/meson/pull/10186 + +Also pick https://github.com/mesonbuild/meson/commit/68e684d51f1e469e0d9f4b499ffda15146cad98a when resolving conflict. + +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py +index 7113f28d2..d3269b53f 100644 +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -384,13 +384,14 @@ class GnomeModule(ExtensionModule): + def _get_link_args(self, state, lib, depends, include_rpath=False, + use_gir_args=False): + link_command = [] ++ new_depends = list(depends) + # Construct link args + if isinstance(lib, build.SharedLibrary): + libdir = os.path.join(state.environment.get_build_dir(), state.backend.get_target_dir(lib)) + link_command.append('-L' + libdir) + if include_rpath: + link_command.append('-Wl,-rpath,' + libdir) +- depends.append(lib) ++ new_depends.append(lib) + # Needed for the following binutils bug: + # https://github.com/mesonbuild/meson/issues/1911 + # However, g-ir-scanner does not understand -Wl,-rpath +@@ -404,18 +405,24 @@ class GnomeModule(ExtensionModule): + link_command.append('--extra-library=' + lib.name) + else: + link_command.append('-l' + lib.name) +- return link_command +- +- def _get_dependencies_flags(self, deps, state, depends, include_rpath=False, +- use_gir_args=False, separate_nodedup=False): +- cflags = OrderedSet() +- internal_ldflags = OrderedSet() +- external_ldflags = OrderedSet() ++ return link_command, new_depends ++ ++ def _get_dependencies_flags_raw( ++ self, deps, ++ state, ++ depends, ++ include_rpath: bool = False, ++ use_gir_args: bool = False, ++ ) -> T.Tuple[OrderedSet[str], OrderedSet[T.Union[str, T.Tuple[str, str]]], OrderedSet[T.Union[str, T.Tuple[str, str]]], OrderedSet[str], ++ T.List]: ++ cflags: OrderedSet[str] = OrderedSet() + # External linker flags that can't be de-duped reliably because they +- # require two args in order, such as -framework AVFoundation +- external_ldflags_nodedup = [] +- gi_includes = OrderedSet() ++ # require two args in order, such as -framework AVFoundation will be stored as a tuple. ++ internal_ldflags: OrderedSet[T.Union[str, T.Tuple[str, str]]] = OrderedSet() ++ external_ldflags: OrderedSet[T.Union[str, T.Tuple[str, str]]] = OrderedSet() ++ gi_includes: OrderedSet[str] = OrderedSet() + deps = mesonlib.listify(deps) ++ depends = list(depends) + + for dep in deps: + if isinstance(dep, Dependency): +@@ -427,21 +434,20 @@ class GnomeModule(ExtensionModule): + cflags.update(state.get_include_args(dep.include_directories)) + for lib in dep.libraries: + if isinstance(lib, build.SharedLibrary): +- internal_ldflags.update(self._get_link_args(state, lib, depends, include_rpath)) +- libdepflags = self._get_dependencies_flags(lib.get_external_deps(), state, depends, include_rpath, +- use_gir_args, True) ++ _ld, depends = self._get_link_args(state, lib, depends, include_rpath) ++ internal_ldflags.update(_ld) ++ libdepflags = self._get_dependencies_flags_raw(lib.get_external_deps(), state, depends, include_rpath, ++ use_gir_args) + cflags.update(libdepflags[0]) + internal_ldflags.update(libdepflags[1]) + external_ldflags.update(libdepflags[2]) +- external_ldflags_nodedup += libdepflags[3] +- gi_includes.update(libdepflags[4]) +- extdepflags = self._get_dependencies_flags(dep.ext_deps, state, depends, include_rpath, +- use_gir_args, True) ++ gi_includes.update(libdepflags[3]) ++ extdepflags = self._get_dependencies_flags_raw(dep.ext_deps, state, depends, include_rpath, ++ use_gir_args) + cflags.update(extdepflags[0]) + internal_ldflags.update(extdepflags[1]) + external_ldflags.update(extdepflags[2]) +- external_ldflags_nodedup += extdepflags[3] +- gi_includes.update(extdepflags[4]) ++ gi_includes.update(extdepflags[3]) + for source in dep.sources: + if isinstance(source, GirTarget): + gi_includes.update([os.path.join(state.environment.get_build_dir(), +@@ -469,7 +475,7 @@ class GnomeModule(ExtensionModule): + # If it's a framework arg, slurp the framework name too + # to preserve the order of arguments + if lib == '-framework': +- external_ldflags_nodedup += [lib, next(ldflags)] ++ external_ldflags.update([(lib, next(ldflags))]) + else: + external_ldflags.update([lib]) + elif isinstance(dep, (build.StaticLibrary, build.SharedLibrary)): +@@ -480,21 +486,43 @@ class GnomeModule(ExtensionModule): + continue + + if use_gir_args and self._gir_has_option('--extra-library'): +- def fix_ldflags(ldflags): +- fixed_ldflags = OrderedSet() ++ def fix_ldflags(ldflags: T.Iterable[T.Union[str, T.Tuple[str, str]]]) -> OrderedSet[T.Union[str, T.Tuple[str, str]]]: ++ fixed_ldflags: OrderedSet[T.Union[str, T.Tuple[str, str]]] = OrderedSet() + for ldflag in ldflags: +- if ldflag.startswith("-l"): ++ if isinstance(ldflag, str) and ldflag.startswith("-l"): + ldflag = ldflag.replace('-l', '--extra-library=', 1) + fixed_ldflags.add(ldflag) + return fixed_ldflags + internal_ldflags = fix_ldflags(internal_ldflags) + external_ldflags = fix_ldflags(external_ldflags) +- if not separate_nodedup: +- external_ldflags.update(external_ldflags_nodedup) +- return cflags, internal_ldflags, external_ldflags, gi_includes +- else: +- return cflags, internal_ldflags, external_ldflags, external_ldflags_nodedup, gi_includes ++ return cflags, internal_ldflags, external_ldflags, gi_includes, depends ++ ++ def _get_dependencies_flags( ++ self, deps, ++ state, ++ depends, ++ include_rpath: bool = False, ++ use_gir_args: bool = False, ++ ) -> T.Tuple[OrderedSet[str], T.List[str], T.List[str], OrderedSet[str], ++ T.List]: ++ ++ cflags, internal_ldflags_raw, external_ldflags_raw, gi_includes, depends = self._get_dependencies_flags_raw(deps, state, depends, include_rpath, use_gir_args) ++ internal_ldflags: T.List[str] = [] ++ external_ldflags: T.List[str] = [] ++ ++ # Extract non-deduplicable argument groups out of the tuples. ++ for ldflag in internal_ldflags_raw: ++ if isinstance(ldflag, str): ++ internal_ldflags.append(ldflag) ++ else: ++ internal_ldflags.extend(ldflag) ++ for ldflag in external_ldflags_raw: ++ if isinstance(ldflag, str): ++ external_ldflags.append(ldflag) ++ else: ++ external_ldflags.extend(ldflag) + ++ return cflags, internal_ldflags, external_ldflags, gi_includes, depends + def _unwrap_gir_target(self, girtarget, state): + if not isinstance(girtarget, (build.Executable, build.SharedLibrary, + build.StaticLibrary)): +@@ -875,7 +903,7 @@ class GnomeModule(ExtensionModule): + # ldflags will be misinterpreted by gir scanner (showing + # spurious dependencies) but building GStreamer fails if they + # are not used here. +- dep_cflags, dep_internal_ldflags, dep_external_ldflags, gi_includes = \ ++ dep_cflags, dep_internal_ldflags, dep_external_ldflags, gi_includes, depends = \ + self._get_dependencies_flags(deps, state, depends, use_gir_args=True) + scan_cflags = [] + scan_cflags += list(self._get_scanner_cflags(cflags)) +@@ -1170,7 +1198,7 @@ class GnomeModule(ExtensionModule): + deps = extract_as_list(kwargs, 'dependencies') + cflags = [] + cflags.extend(mesonlib.stringlistify(kwargs.pop('c_args', []))) +- deps_cflags, internal_ldflags, external_ldflags, gi_includes = \ ++ deps_cflags, internal_ldflags, external_ldflags, gi_includes, depends = \ + self._get_dependencies_flags(deps, state, depends, include_rpath=True) + inc_dirs = mesonlib.extract_as_list(kwargs, 'include_directories') + for incd in inc_dirs: diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 49d454d86864..21209638c85c 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.10.0"; + version = "0.10.2"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - sha256 = "sha256:1acm1z24cw2yzykwwjfrcf66mi16xvsrnrrhrsd9yqrajqab707n"; + hash = "sha256-lx5saJdGsMS7DLaUngoauzFS1UG4QYvrELEvTjIa1oQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 37cb4dd86609..3ec37b89fd39 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -81,7 +81,7 @@ let (rebar3WithPlugins { globalPlugins = [rebar3-nix]; }) ] } - latest=$(list-git-tags https://github.com/${owner}/${pname}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) + latest=$(list-git-tags --url=https://github.com/${owner}/${pname}.git | sed -n '/[\d\.]\+/p' | sort -V | tail -1) if [ "$latest" != "${version}" ]; then nixpkgs="$(git rev-parse --show-toplevel)" nix_path="$nixpkgs/pkgs/development/tools/build-managers/rebar3" diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 6c366be8b42f..f6d5de348932 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "4.5.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${version}"; - hash = "sha256-5RwhIIOtqeMl/Gyufl5U1gTEpoCjdPJP5MbVnhEKYMM="; + hash = "sha256-4PtLe864MQ9wUn+l1fshiiTQvP06ewD39TDYZl70Hgg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix index 1fb4206d5cec..cd058bfc2632 100644 --- a/pkgs/development/tools/build-managers/samurai/default.nix +++ b/pkgs/development/tools/build-managers/samurai/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "samurai"; @@ -13,6 +13,19 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ]; + patches = [ + (fetchpatch { + name = "CVE-2021-30218.patch"; + url = "https://github.com/michaelforney/samurai/commit/e84b6d99c85043fa1ba54851ee500540ec206918.patch"; + sha256 = "sha256-hyndwj6st4rwOJ35Iu0qL12dR5E6CBvsulvR27PYKMw="; + }) + (fetchpatch { + name = "CVE-2021-30219.patch"; + url = "https://github.com/michaelforney/samurai/commit/d2af3bc375e2a77139c3a28d6128c60cd8d08655.patch"; + sha256 = "sha256-rcdwKjHeq5Oaga9wezdHSg/7ljkynfbnkBc2ciMW5so="; + }) + ]; + meta = with lib; { description = "ninja-compatible build tool written in C"; homepage = "https://github.com/michaelforney/samurai"; diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 3f52f6ca1ba2..267702763722 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "031e092829365768db7f07cb676ef3642e24c1f4"; - version = "2021-10-21"; + rev = "ef403f4ce126441f126dfc61ca6357a7b42539af"; + version = "2022-02-01"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "5e/tvRP6oqlstESY8NH752fujFcGZ9rF/rYW9ZFg0Gk="; + sha256 = "G7nR2wV0Wv019bCA+ecfYhmFh/DDHFjihKGFKNQ5dgM="; }; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index d45f15b59e7a..59d9441a5905 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "sha256-YChr8bh1sx4pVfimmYiM0mEumv2U0DzeCi5x79dJL/w="; + sha256 = "sha256-Y3Y3tsTm+gSrYs02QGHjKxJICwkAHNIzA99is2+t1EA="; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/scala-cli/default.nix b/pkgs/development/tools/build-managers/scala-cli/default.nix index 33f9811ab836..c045944b7737 100644 --- a/pkgs/development/tools/build-managers/scala-cli/default.nix +++ b/pkgs/development/tools/build-managers/scala-cli/default.nix @@ -1,15 +1,15 @@ { stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }: let - version = "0.0.9"; + version = "0.1.2"; assets = { x86_64-darwin = { asset = "scala-cli-x86_64-apple-darwin.gz"; - sha256 = "sha256-1KwJuapqGhMEIMwrJp2LKlpYFtl+OP9DyaMtge9ZedI="; + sha256 = "10453af2kz10k9vmcgdwpk10z36cnblnj6l09wkqngxwx9vxbf9q"; }; x86_64-linux = { asset = "scala-cli-x86_64-pc-linux.gz"; - sha256 = "sha256-IDXO+MgFlnT7VPugcQr/IGLZeD/vWFqJ0D0zVIbTtk4="; + sha256 = "0720c4s717hcssp4b3x295rhgac4ifjr95zn45bm1n70jr3xqzyj"; }; }; in diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 04ab489da1cc..ea6f866a48b1 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.23.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-vAuUA51E1pufn3YvNe4yfqJHXo14iUEA5MzP3/ah+8I="; + sha256 = "sha256-gBO+H26YGmOtP3CUHZjynAaOb0h+MJbJnWqxOZdif6w="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index b9ae4e4dd887..df644935cf16 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-xjuHMjJjA4sx2Hrr6tPpvKtSmhGZ3AZka733DLxmYfk="; + sha256 = "sha256-Pdnu0zG1LteAob0YUuG/XDh2pfBj5UO2GrkWFlMZeGY="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index c10e5e7f459b..d607f7af00c3 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dtDciyQyTYhgYwqRCcxV0kAbPMl3KXhDM0BelPTWymA="; + sha256 = "sha256-nlSJwo2YjbOOKofZwXdWB3fxRUNTeSUcT6jN987SB3o="; }; - vendorSha256 = "sha256-mIXt3rWXQ6lVbV4hT7KRK7VZ4iFuDX6kZjgoE1WvJxI="; + vendorSha256 = "sha256-4uMd0KaV5xrxuJ9yqpxbD3YTNaBHsH2d/IRtYRyN5+0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index 094aa5fe026c..4570faa96f26 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -4,13 +4,13 @@ with lib; buildGoModule rec { pname = "butane"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - sha256 = "sha256-wrz9+McHW2NNMsB3uOZIceykYBlSgl2WErAT8bMlkXo="; + sha256 = "sha256-rS1/LQ5R3WY9ot1pgtN+6t/ZChr9SxPzrsNio7WWNqQ="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/cambalache/default.nix b/pkgs/development/tools/cambalache/default.nix new file mode 100644 index 000000000000..5845ed033c3e --- /dev/null +++ b/pkgs/development/tools/cambalache/default.nix @@ -0,0 +1,96 @@ +{ stdenv +, lib +, fetchFromGitLab +, python3 +, meson +, ninja +, pkg-config +, gobject-introspection +, desktop-file-utils +, shared-mime-info +, wrapGAppsHook +, glib +, gtk3 +, gtk4 +, webkitgtk +, nix-update-script +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cambalache"; + version = "0.8.2"; + + format = "other"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "jpu"; + repo = pname; + rev = version; + sha256 = "sha256-1+IoBoaNHwvN8W+KRyV5cTFkFG+pTHJBehQ2VosCEfs="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection # for setup hook + desktop-file-utils # for update-desktop-database + shared-mime-info # for update-mime-database + wrapGAppsHook + ]; + + pythonPath = with python3.pkgs; [ + pygobject3 + lxml + ]; + + buildInputs = [ + glib + gtk3 + gtk4 + webkitgtk + ]; + + # Not compatible with gobject-introspection setup hooks. + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + # Prevent double wrapping. + dontWrapGApps = true; + + postPatch = '' + patchShebangs postinstall.py + ''; + + preFixup = '' + # Let python wrapper use GNOME flags. + makeWrapperArgs+=( + # For broadway daemons + --prefix PATH : "${lib.makeBinPath [ gtk3 gtk4 ]}" + "''${gappsWrapperArgs[@]}" + ) + ''; + + postFixup = '' + # Wrap a helper script in an unusual location. + wrapPythonProgramsIn "$out/${python3.sitePackages}/cambalache/priv/merengue" "$out $pythonPath" + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + homepage = "https://gitlab.gnome.org/jpu/cambalache"; + description = "RAD tool for GTK 4 and 3 with data model first philosophy"; + maintainers = teams.gnome.members; + license = with licenses; [ + lgpl21Only # Cambalache + gpl2Only # tools + ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index f9e7d215f320..2eadc6b877f7 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -20,20 +20,22 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild + emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el + runHook postBuild ''; installPhase = '' runHook preInstall + mkdir -p $out/bin - mkdir -p $out/templates - mkdir -p $out/share/emacs/site-lisp/cask/bin - install -Dm644 *.el *.elc $out/share/emacs/site-lisp/cask - install -Dm755 bin/cask $out/share/emacs/site-lisp/cask/bin - install -Dm644 templates/* $out/templates/ + dir=$out/share/emacs/site-lisp/cask + install -Dm444 -t $dir *.el *.elc + install -Dm555 -t $dir/bin bin/cask touch $out/.no-upgrade - ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask + ln -s $dir/bin/cask $out/bin/cask + runHook postInstall ''; @@ -48,7 +50,7 @@ stdenv.mkDerivation rec { homepage = "https://cask.readthedocs.io/en/latest/index.html"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ flexw ]; platforms = platforms.all; - maintainers = [ maintainers.flexw ]; }; } diff --git a/pkgs/development/tools/cfn-nag/Gemfile b/pkgs/development/tools/cfn-nag/Gemfile new file mode 100644 index 000000000000..5ccc66872d41 --- /dev/null +++ b/pkgs/development/tools/cfn-nag/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'cfn-nag' diff --git a/pkgs/development/tools/cfn-nag/Gemfile.lock b/pkgs/development/tools/cfn-nag/Gemfile.lock new file mode 100644 index 000000000000..86bfdad86108 --- /dev/null +++ b/pkgs/development/tools/cfn-nag/Gemfile.lock @@ -0,0 +1,51 @@ +GEM + remote: https://rubygems.org/ + specs: + aws-eventstream (1.2.0) + aws-partitions (1.568.0) + aws-sdk-core (3.130.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.525.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-kms (1.55.0) + aws-sdk-core (~> 3, >= 3.127.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.113.0) + aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.4.0) + aws-eventstream (~> 1, >= 1.0.2) + cfn-model (0.6.6) + kwalify (= 0.7.2) + psych (~> 3) + cfn-nag (0.8.9) + aws-sdk-s3 (~> 1.76) + cfn-model (= 0.6.6) + lightly (~> 0.3.2) + logging (~> 2.2.2) + netaddr (~> 2.0.4) + optimist (~> 3.0.0) + rexml + jmespath (1.6.1) + kwalify (0.7.2) + lightly (0.3.3) + little-plugger (1.1.4) + logging (2.2.2) + little-plugger (~> 1.1) + multi_json (~> 1.10) + multi_json (1.15.0) + netaddr (2.0.5) + optimist (3.0.1) + psych (3.3.2) + rexml (3.2.5) + +PLATFORMS + ruby + +DEPENDENCIES + cfn-nag + +BUNDLED WITH + 2.2.28 diff --git a/pkgs/development/tools/cfn-nag/default.nix b/pkgs/development/tools/cfn-nag/default.nix new file mode 100644 index 000000000000..4e25f052401d --- /dev/null +++ b/pkgs/development/tools/cfn-nag/default.nix @@ -0,0 +1,19 @@ +{ lib, bundlerEnv, bundlerUpdateScript, ruby }: + +bundlerEnv { + pname = "cfn-nag"; + version = "0.8.9"; + + inherit ruby; + gemdir = ./.; + + passthru.updateScript = bundlerUpdateScript "cfn-nag"; + + meta = with lib; { + description = "Linting tool for CloudFormation templates"; + homepage = "https://github.com/stelligent/cfn_nag"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/cfn-nag/gemset.nix b/pkgs/development/tools/cfn-nag/gemset.nix new file mode 100644 index 000000000000..e2e39f7a8137 --- /dev/null +++ b/pkgs/development/tools/cfn-nag/gemset.nix @@ -0,0 +1,189 @@ +{ + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ap27g6hxcczpb5dj7v0wzxrvywfa2kf3zx69xnjz1qvxf3plw54"; + type = "gem"; + }; + version = "1.568.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14ymvp06k46gvkpvz5zaqvbvr6wd8vdka5iq25q0wd0fzdx7aivm"; + type = "gem"; + }; + version = "3.130.0"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi"; + type = "gem"; + }; + version = "1.55.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax"; + type = "gem"; + }; + version = "1.113.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; + type = "gem"; + }; + version = "1.4.0"; + }; + cfn-model = { + dependencies = ["kwalify" "psych"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b3ix36yfnfwyxb4w9ss8a7nc6w15m1wbj3q8rarsqjrs3xj6wjs"; + type = "gem"; + }; + version = "0.6.6"; + }; + cfn-nag = { + dependencies = ["aws-sdk-s3" "cfn-model" "lightly" "logging" "netaddr" "optimist" "rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14qlnflxx5chjvda9n2ka2axcfcjbmn9h00cija8k7kvpy1dgqga"; + type = "gem"; + }; + version = "0.8.9"; + }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; + type = "gem"; + }; + version = "1.6.1"; + }; + kwalify = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ngxg3ysq5vip9dn3d32ajc7ly61kdin86hfycm1hkrcvkkn1vjf"; + type = "gem"; + }; + version = "0.7.2"; + }; + lightly = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sgj2r6j7qxb9vqzkx5isjbphi38rplk4h8838am0cjcpq5h3jb3"; + type = "gem"; + }; + version = "0.3.3"; + }; + little-plugger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + logging = { + dependencies = ["little-plugger" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; + type = "gem"; + }; + version = "2.2.2"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + netaddr = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r7nln9xvrralwwhd5s1q4sghp0k9y7g9z5pinzpqkx715xcpdxm"; + type = "gem"; + }; + version = "2.0.5"; + }; + optimist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; + type = "gem"; + }; + version = "3.0.1"; + }; + psych = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10iawnkpa44hcfrapy7yw6zmjn4g1g0y09lw244qiv424f7jasn5"; + type = "gem"; + }; + version = "3.3.2"; + }; + rexml = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; +} diff --git a/pkgs/development/tools/checkmate/default.nix b/pkgs/development/tools/checkmate/default.nix index d5aded2d8e10..bcb115e409b7 100644 --- a/pkgs/development/tools/checkmate/default.nix +++ b/pkgs/development/tools/checkmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "checkmate"; - version = "0.5.3"; + version = "0.5.8"; src = fetchFromGitHub { owner = "adedayo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oBX1MSniVwXvq4Cy9uR3YqxaeSxeWg38oBlCiBy6z/8="; + sha256 = "sha256-nzhzeXy70UQ1HP3/PCBnUPhrjg7CnKURMCH0iJ099E0="; }; - vendorSha256 = "sha256-rlwph9oQXgesLHjrtD+H4zvT2ekTeqZFgRBjXoyFltM="; + vendorSha256 = "sha256-uQRAVbLnzY+E3glMJ3AvmbtmwD2LkuqCh2mUpqZbmaA="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 9e0e40b69f4b..93af8815fb3a 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,8 +1,9 @@ { lib, bundlerEnv, bundlerUpdateScript, ruby, perl, autoconf }: bundlerEnv { - pname = "chef-dk"; - version = "4.13.3"; + name = "chef-dk-4.13.3"; + # Do not change this to pname & version until underlying issues with Ruby + # packaging are resolved ; see https://github.com/NixOS/nixpkgs/issues/70171 inherit ruby; gemdir = ./.; diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix new file mode 100644 index 000000000000..71ac08d26761 --- /dev/null +++ b/pkgs/development/tools/circup/default.nix @@ -0,0 +1,52 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "circup"; + version = "1.0.4"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "adafruit"; + repo = pname; + rev = version; + hash = "sha256-qX3kSlqA2qP8+XiLYx/hKYfyeB6p3tnXEhESox0c/lY="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = with python3.pkgs; [ + setuptools-scm + ]; + + propagatedBuildInputs = with python3.pkgs; [ + appdirs + click + findimports + requests + semver + setuptools + update_checker + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + postBuild = '' + export HOME=$(mktemp -d); + ''; + + pythonImportsCheck = [ + "circup" + ]; + + meta = with lib; { + description = "CircuitPython library updater"; + homepage = "https://github.com/adafruit/circup"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 554488ecea9f..0a369bd5f034 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2022.01.15"; + version = "2022.03.09"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-s1SdCy4GaxFL9M3Fp/WGu1C6qY2Kst5PXFShrGCizUE="; + sha256 = "sha256-gPn3wORb30I/zTXUdxUxMesKFJx6ES7jEjUYuC/DAVI="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 998caa66692d..719e13a5e12a 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.9.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dTS3HNGd5Ga18tERuDAhclWP3zvYO4RWx2nkd+x5D1w="; + sha256 = "sha256-iMPTRPsULrwXbx1xQ9db1s0p9a6YejXkwp7sqZ1ayYU="; }; vendorSha256 = "sha256-McCbogZvgm9pnVjay9O2CxAh+653JnDMcU4CHD0PTPI="; diff --git a/pkgs/development/tools/cmake-language-server/default.nix b/pkgs/development/tools/cmake-language-server/default.nix index 663e0a5b66f1..f50afcd4669f 100644 --- a/pkgs/development/tools/cmake-language-server/default.nix +++ b/pkgs/development/tools/cmake-language-server/default.nix @@ -26,6 +26,11 @@ buildPythonApplication rec { ./disable-test-timeouts.patch ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pyparsing = "^2.4"' 'pyparsing = "^3.0.6"' + ''; + nativeBuildInputs = [ poetry ]; propagatedBuildInputs = [ pygls pyparsing ]; diff --git a/pkgs/development/mobile/cocoapods/Gemfile b/pkgs/development/tools/cocoapods/Gemfile similarity index 100% rename from pkgs/development/mobile/cocoapods/Gemfile rename to pkgs/development/tools/cocoapods/Gemfile diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta b/pkgs/development/tools/cocoapods/Gemfile-beta similarity index 100% rename from pkgs/development/mobile/cocoapods/Gemfile-beta rename to pkgs/development/tools/cocoapods/Gemfile-beta diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/tools/cocoapods/Gemfile-beta.lock similarity index 100% rename from pkgs/development/mobile/cocoapods/Gemfile-beta.lock rename to pkgs/development/tools/cocoapods/Gemfile-beta.lock diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/tools/cocoapods/Gemfile.lock similarity index 100% rename from pkgs/development/mobile/cocoapods/Gemfile.lock rename to pkgs/development/tools/cocoapods/Gemfile.lock diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/tools/cocoapods/default.nix similarity index 96% rename from pkgs/development/mobile/cocoapods/default.nix rename to pkgs/development/tools/cocoapods/default.nix index 8559ff5c74ca..54411fc01586 100644 --- a/pkgs/development/mobile/cocoapods/default.nix +++ b/pkgs/development/tools/cocoapods/default.nix @@ -21,5 +21,6 @@ bundlerApp { peterromfeldhk lilyball ]; + mainProgram = "pod"; }; } diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/tools/cocoapods/gemset-beta.nix similarity index 100% rename from pkgs/development/mobile/cocoapods/gemset-beta.nix rename to pkgs/development/tools/cocoapods/gemset-beta.nix diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/tools/cocoapods/gemset.nix similarity index 100% rename from pkgs/development/mobile/cocoapods/gemset.nix rename to pkgs/development/tools/cocoapods/gemset.nix diff --git a/pkgs/development/mobile/cocoapods/update b/pkgs/development/tools/cocoapods/update similarity index 100% rename from pkgs/development/mobile/cocoapods/update rename to pkgs/development/tools/cocoapods/update diff --git a/pkgs/development/tools/confluent-cli/default.nix b/pkgs/development/tools/confluent-cli/default.nix new file mode 100644 index 000000000000..9664a75703a2 --- /dev/null +++ b/pkgs/development/tools/confluent-cli/default.nix @@ -0,0 +1,42 @@ +{ stdenv, autoPatchelfHook, fetchurl, lib }: + +stdenv.mkDerivation rec { + pname = "confluent-cli"; + version = "2.4.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_v${version}_darwin_amd64.tar.gz"; + sha256 = "1xkf7p9cn37k8j57cgbzxhqgnmchf86jyiza91bf6ddvm6jsm2gd"; + } else { + url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${version}/confluent_v${version}_linux_amd64.tar.gz"; + sha256 = "1wvy7x56cc7imycf0d83mxcqzdvv56cc0zbp913xgghjn9dl2z7a"; + }); + + nativeBuildInputs = [ autoPatchelfHook ]; + + dontStrip = stdenv.isDarwin; + + installPhase = '' + mkdir -p $out/{bin,share/doc/confluent-cli} + cp confluent $out/bin/ + cp LICENSE $out/share/doc/confluent-cli/ + cp -r legal $out/share/doc/confluent-cli/ + ''; + + meta = with lib; { + description = "Confluent CLI"; + homepage = "https://docs.confluent.io/confluent-cli/current/overview.html"; + license = licenses.unfree; + maintainers = with maintainers; [ rguevara84 ]; + + # 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 + # build it. Get the list of supported system by looking at the list of + # 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" ]; + }; +} diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index a1d1453cb104..f200cd742d90 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "sha256-8/eZz5ejw5bahCYwz825HI+oZ6D1odeTpMIJh0TcGMY="; }; - vendorSha256 = "sha256-rYWo0t6iUI6DVsjHJg2fUv2tv3jovndi12prKzLaMlI="; + vendorSha256 = "sha256-wvOtBK3lRK7XwgeClywowgrZLohltSTGdoB+j3NRmkE="; ldflags = [ "-s" diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 897b191cdd66..32be3e432389 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -2,14 +2,14 @@ makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep, nixosTests }: buildGoModule rec { - name = "buildkite-agent-${version}"; - version = "3.33.3"; + pname = "buildkite-agent"; + version = "3.34.1"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-RCKHVFYYcWraUwsGuD/anmWpNwc7cHc9jm0LwR9WRzA="; + sha256 = "sha256-OxZcMPJx83hBQOe4Pc8ERhO9QOc4euVVs+OMbPjA4U0="; }; vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI="; diff --git a/pkgs/development/tools/continuous-integration/drone-cli/0001-use-different-upstream-for-gomod.patch b/pkgs/development/tools/continuous-integration/drone-cli/0001-use-different-upstream-for-gomod.patch new file mode 100644 index 000000000000..e9bd040f6781 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/drone-cli/0001-use-different-upstream-for-gomod.patch @@ -0,0 +1,23 @@ +diff --git a/go.mod b/go.mod +index 99f9b37..ebbdb54 100644 +--- a/go.mod ++++ b/go.mod +@@ -28,3 +28,5 @@ require ( + golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 + golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d + ) ++ ++replace github.com/jackspirou/syscerts => github.com/akhenakh/syscerts v0.0.0-20201230132944-1f7ee1de1ba3 +diff --git a/go.sum b/go.sum +index 8c379ed..283ba39 100644 +--- a/go.sum ++++ b/go.sum +@@ -64,6 +64,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE + github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= + github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= ++github.com/akhenakh/syscerts v0.0.0-20201230132944-1f7ee1de1ba3 h1:2d14fzBv1dj4PimhBxXDlaltfNU6rGmA4NyYa3aB5xQ= ++github.com/akhenakh/syscerts v0.0.0-20201230132944-1f7ee1de1ba3/go.mod h1:ijVDlqqT/Ok/B2v7GaiSj4gfCl7uipB8/8jwgJvrTSk= + github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= + github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= + github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 3eb7c7e261e9..ac434fb9fdd5 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -5,16 +5,18 @@ buildGoModule rec { pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "sha256-bYjEVmQ7lPd+Gn5cJwlzBQkMkLAXA1iSa1DXz/IM1Ss="; + vendorSha256 = "0hh079qvxs4bcf0yy42y6sb303wxxam5h2mz56irdl0q2vqkk0f0"; doCheck = false; + patches = [ ./0001-use-different-upstream-for-gomod.patch ]; + ldflags = [ "-X main.version=${version}" ]; src = fetchFromGitHub { - owner = "drone"; + owner = "harness"; repo = "drone-cli"; rev = revision; sha256 = "sha256-TFIGKTVrAMSOFEmu3afdDKBgyEwF2KIv3rt1fS6rCxw="; @@ -22,7 +24,7 @@ buildGoModule rec { meta = with lib; { mainProgram = "drone"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ techknowlogick ]; license = licenses.asl20; description = "Command line client for the Drone continuous integration server"; }; diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix index a2e7b739718b..fa2957be986d 100644 --- a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "drone-runner-docker"; - version = "1.6.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "drone-runners"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WI3pr0t6EevIBOQwCAI+CY2O8Q7+W/CLDT/5Y0+tduQ="; + sha256 = "sha256-F04h9kwrVvQEenzw1QTeNnQun9tHzu8HT24gNEMcRro="; }; - vendorSha256 = "15lpdliqz129yq5zgzjvndwdxngxa96g0ska4zkny7ycb3vwq0xm"; + vendorSha256 = "sha256-E18ykjQc1eoHpviYok+NiLaeH01UMQmigl9JDwtR+zo="; meta = with lib; { maintainers = with maintainers; [ endocrimes ]; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 0f36f8dc0277..7e00f481752f 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -3,23 +3,23 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.0.3"; + version = "2.11.1"; - vendorSha256 = "sha256-3qTH/p0l6Ke1F9SUcvK2diqZooOMnlXYO1PHLdJJ8PM="; + vendorSha256 = "sha256-oJBGHr4LjrX7e197s4tqkiysWJS3RRW6JWI9ncs/uHw="; doCheck = false; src = fetchFromGitHub { - owner = "drone"; + owner = "harness"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-MKV5kor+Wm9cuIFFcjSNyCgVKtY+/B9sgBOXMMRvMPI="; + sha256 = "sha256-bbWJo7PnwQaVKRpSnRK5pm0cD9orlkEOUa+y7UnACjg="; }; tags = lib.optionals (!enableUnfree) [ "oss" "nolimit" ]; meta = with lib; { - maintainers = with maintainers; [ elohmeier vdemeester ]; + maintainers = with maintainers; [ elohmeier vdemeester techknowlogick ]; license = with licenses; if enableUnfree then unfreeRedistributable else asl20; description = "Continuous Integration platform built on container technology"; }; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index f2136346c1f3..ad9752872738 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.6.0"; + version = "7.7.1"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-Zi+gyO+2AKDgcfgYrzLskJYZ6hQKOVlOL7Y9nxH/pGg="; + sha256 = "sha256-AJvD9re4jj+ixvZKWHDJM0QEv5EPFv3VFJus3lnm2LI="; }; - vendorSha256 = "sha256-OF3parnlTPmcr7tVcc6495sUMRApSpBHHjSE/4EFIxE="; + vendorSha256 = "sha256-G9HdhPi4iezUR6SIVYnjL0fznOfiusY4T9ClLPr1w5c="; doCheck = false; diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 1b95903c6013..c8513d004af5 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.286.0"; + version = "2.289.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-a3Kh65NTpVlKUer59rna7NWIQSxh1edU9MwguakzydI="; + hash = "sha256-5TS/tW1hnDvPZQdR659rw+spLq98niyUms3BrixaKRE="; }; nativeBuildInputs = [ @@ -77,9 +77,6 @@ stdenv.mkDerivation rec { ./patches/use-get-directory-for-diag.patch # Don't try to install systemd service ./patches/dont-install-systemd-service.patch - # Prevent the runner from starting a self-update for new versions - # (upstream issue: https://github.com/actions/runner/issues/485) - ./patches/prevent-self-update.patch ]; postPatch = '' @@ -90,7 +87,7 @@ stdenv.mkDerivation rec { # Disable specific tests substituteInPlace src/dir.proj \ --replace 'dotnet test Test/Test.csproj' \ - "dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&" disabledTests}'" + "dotnet test Test/Test.csproj --filter '${lib.concatStringsSep "&" (map (x: "FullyQualifiedName!=${x}") disabledTests)}'" # We don't use a Git checkout substituteInPlace src/dir.proj \ @@ -105,11 +102,6 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - # Set up Nuget dependencies - export HOME=$(mktemp -d) - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_NOLOGO=1 - # Never use nuget.org nuget sources Disable -Name "nuget.org" @@ -137,18 +129,21 @@ stdenv.mkDerivation rec { doCheck = true; - disabledTests = [ - # Self-updating is patched out, hence this test will fail - "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync_ValidateHash" - "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync" - "FullyQualifiedName!=GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" - ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ - # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" - "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" - ] ++ map - # Online tests - (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") - [ + # Fully qualified name of disabled tests + disabledTests = + [ "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync" ] + ++ map (x: "GitHub.Runner.Common.Tests.Listener.SelfUpdaterL0.TestSelfUpdateAsync_${x}") [ + "Cancel_CloneHashTask_WhenNotNeeded" + "CloneHash_RuntimeAndExternals" + "DownloadRetry" + "FallbackToFullPackage" + "NoUpdateOnOldVersion" + "NotUseExternalsRuntimeTrimmedPackageOnHashMismatch" + "UseExternalsRuntimeTrimmedPackage" + "UseExternalsTrimmedPackage" + "ValidateHash" + ] + ++ map (x: "GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") [ "CompositeActionWithActionfile_CompositeContainerNested" "CompositeActionWithActionfile_CompositePrestepNested" "CompositeActionWithActionfile_MaxLimit" @@ -178,11 +173,20 @@ stdenv.mkDerivation rec { "RepositoryActionWithInvalidWrapperActionfile_Node_Legacy" "RepositoryActionWithWrapperActionfile_PreSteps" "RepositoryActionWithWrapperActionfile_PreSteps_Legacy" - ] ++ map - (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") - [ + ] + ++ map (x: "GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") [ "EnsureDotnetsdkBashDownloadScriptUpToDate" "EnsureDotnetsdkPowershellDownloadScriptUpToDate" + ] + ++ [ "GitHub.Runner.Common.Tests.Listener.RunnerL0.TestRunOnceHandleUpdateMessage" ] + # Tests for trimmed runner packages which aim at reducing the update size. Not relevant for Nix. + ++ map (x: "GitHub.Runner.Common.Tests.PackagesTrimL0.${x}") [ + "RunnerLayoutParts_CheckExternalsHash" + "RunnerLayoutParts_CheckDotnetRuntimeHash" + ] + ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" + "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" ]; checkInputs = [ git ]; @@ -194,6 +198,8 @@ stdenv.mkDerivation rec { ln -s ${nodejs-12_x} _layout/externals/node12 ln -s ${nodejs-16_x} _layout/externals/node16 + printf 'Disabled tests:\n%s\n' '${lib.concatMapStringsSep "\n" (x: " - ${x}") disabledTests}' + # BUILDCONFIG needs to be "Debug" dotnet msbuild \ -t:test \ @@ -290,6 +296,9 @@ stdenv.mkDerivation rec { name = "create-deps-file"; runtimeInputs = [ dotnetSdk nuget-to-nix ]; text = '' + # Disable telemetry data + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + rundir=$(pwd) printf "\n* Setup workdir\n" diff --git a/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/pkgs/development/tools/continuous-integration/github-runner/deps.nix index 1281b9515f59..0db944207322 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -1,15 +1,16 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.0"; sha256 = "1315hycfqlalh6k4zvvz7pz3dylpp0sr45j1v9avcb143hjqnav6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0r6jyxl3h1asj30la78skd5gsxgwjpvkspmkw1gglxfg85hnqc8w"; }) (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.4"; sha256 = "00fkczf69z2rwarcd8kjjdp47517a0ca6lggn72qbilsp03a5scj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "1jpw4s862j4aa7b7wchi03gxcy02j6hhpbsfbcayiyx6ry788i15"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0rrrfgkr7rzhlnsnajvzb1ijkybp99d992bqxy9pbawmq7d60bdk"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.2.1"; sha256 = "1gpka9jm2gl6f07pcwzwvaxw9xq1a19i9fskn0qs921c5grhlp3g"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "5.2.1"; sha256 = "03v6145vr1winq8xxfikydicds4f10qmy1ybyz2gfimnzzx51w00"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.0"; sha256 = "0aska6s99rfg13ngsaxr151a6sk8r68lv3mj8yv0bhvwcpln4342"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.0"; sha256 = "146rbmk0svvqaf0c4msg67h17x4k4gd5kzsbb3iqvs14xfkli2xw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.0"; sha256 = "0qaylw18flrfl3vxnbp8wsiz29znidmn6dhv7k4v4jj2za16wmji"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.3"; sha256 = "1swbrmpsayy99ycwaq68dx9ydd5h3qv9brwig6ryff1xfn1llndq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.3"; sha256 = "0gjj6p2nnxzhyrmmmwiyrll782famhll9lbgj8cji1i93amxq1pb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.3"; sha256 = "0f04srx6q0jk81a60n956hz32fdngzp0xmdb2x7gyl77gsq8yijj"; }) (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"; }) @@ -21,7 +22,6 @@ (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.Windows.ApiSets"; version = "1.0.1-rc2-24027"; sha256 = "034m9p417iq3yzipg393wp4bddsh80di9iad78vvvh7w5difdv0x"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.0.0"; sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.0.0"; sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1-rc2-24027"; sha256 = "1rvb076s4ksvmbvnxi4sv2f9f22izqp2rca0scjqya5x1qhcgkp0"; }) @@ -84,8 +84,8 @@ (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.Collections"; version = "4.0.11-rc2-24027"; sha256 = "0ijpgf7iy3mcvr9327craxsb0lsznprajqzjy59sspc75gk0yahq"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11-rc2-24027"; sha256 = "0ijpgf7iy3mcvr9327craxsb0lsznprajqzjy59sspc75gk0yahq"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12-rc2-24027"; sha256 = "0yhc5q74vb9vb9cmyrr9p4dfql62dr7c8ajbaxnzzs917v2z68q4"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) @@ -96,43 +96,43 @@ (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) (fetchNuGet { pname = "System.Console"; version = "4.0.0-rc2-24027"; sha256 = "072m313av0s5cfpr2rpq07p7c13dy4rh1ngigv3dnr1yyvab9081"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11-rc2-24027"; sha256 = "11rz0kdzk4bw9yc85jmskxla7i1bs61kladqzvymrg8xn3lk488a"; }) (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-rc2-24027"; sha256 = "080gd86c1pkfkzz67ispkzxc426lfh82zajayiizbgwd6yqa7fv5"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1-rc2-24027"; sha256 = "080gd86c1pkfkzz67ispkzxc426lfh82zajayiizbgwd6yqa7fv5"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0-rc2-24027"; sha256 = "0a0c24lm8yn0hbvd5m64lv7xhs2bmhm5fdpk89xvxj14zdarqhm6"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11-rc2-24027"; sha256 = "0yl161lr85smzdfzb7fbk0lfrqk5ns71hcnws6vm3sn2aqvfmhpn"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11-rc2-24027"; sha256 = "0yl161lr85smzdfzb7fbk0lfrqk5ns71hcnws6vm3sn2aqvfmhpn"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1-rc2-24027"; sha256 = "0whr2qird567iyc137s10qs0xi6607kjii9wi8a8g1f9lybzlz5k"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "5.2.1"; sha256 = "08n1z9ngsi26qlhwpjzxafhwl3p279widfci64l2ahxf1gprfqsx"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0-rc2-24027"; sha256 = "0rwqmn743gl21xnb3rwqkdacshd5l86pn23mc4bviva3pbncbjs4"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0-rc2-24027"; sha256 = "0rwqmn743gl21xnb3rwqkdacshd5l86pn23mc4bviva3pbncbjs4"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0-rc2-24027"; sha256 = "07s5zxdw3ihxdv0mjxb2ywzg9phcp4bayrhkadzm95l4kcv0xaij"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1-rc2-24027"; sha256 = "0np6vf9rnfasz0sqys56kpryc84qcqi1a1rfskmycdlxk182p3s2"; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1-rc2-24027"; sha256 = "0hpw3ssnbcv9l1lnlcym2bv3h3sf2znif4brys2i3868s6h946k6"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1-rc2-24027"; sha256 = "0hpw3ssnbcv9l1lnlcym2bv3h3sf2znif4brys2i3868s6h946k6"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "4.4.0"; sha256 = "11sna2bv5ai4sivrs7g2gp7g0yjp02s0kasl01j3fa1cvnwwvgkv"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1-rc2-24027"; sha256 = "04q3sxrfxqgig9scmxblxlb6n6fypv535lby26pi20ixszs19dxc"; }) (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-rc2-24027"; sha256 = "0icbsy0vq07achclz32jvnnfdchkgylsjj67gra3fn5906s40n24"; }) (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"; }) @@ -143,13 +143,13 @@ (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0-rc2-24027"; sha256 = "062kbbvm17nhwmcxjnakfv3i23vrk6c9gmz6x8q79kcr5hxr40qs"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12-rc2-24027"; sha256 = "065p89awfiz9kb304hqs7wkfpykd9z9kkv84ihm813msv54i8lvj"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12-rc2-24027"; sha256 = "065p89awfiz9kb304hqs7wkfpykd9z9kkv84ihm813msv54i8lvj"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.3.0"; sha256 = "06fjipqvjp559rrm825x6pll8gimdj9x1n3larigh5hsm584gndw"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0-rc2-24027"; sha256 = "0717y8iqcw19g2zkcs0hkalvjhnpaq5mapd82kxkhiq1djgjhhi2"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0-rc2-24027"; sha256 = "0717y8iqcw19g2zkcs0hkalvjhnpaq5mapd82kxkhiq1djgjhhi2"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) @@ -157,29 +157,29 @@ (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1-rc2-24027"; sha256 = "0lgz7wwdb02vapa17hgdkf1jnq1mcsbq8gwy6a9iqd04d2mfanv7"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1-rc2-24027"; sha256 = "0lgz7wwdb02vapa17hgdkf1jnq1mcsbq8gwy6a9iqd04d2mfanv7"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1-rc2-24027"; sha256 = "1xjbwji89s69f9lq8wcjfkz8y9ym9zffgj2mg9bv0rxwyqcynpz8"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1-rc2-24027"; sha256 = "1xjbwji89s69f9lq8wcjfkz8y9ym9zffgj2mg9bv0rxwyqcynpz8"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.4.0"; sha256 = "0n9r1w4lp2zmadyqkgp4sk9wy90sj4ygq4dh7kzamx26i9biys5h"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1-rc2-24027"; sha256 = "06lkqk5hjkcna19inpda5fqbxvd9pq5cs61di7kmhrd2sgzbs6xj"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1-rc2-24027"; sha256 = "06lkqk5hjkcna19inpda5fqbxvd9pq5cs61di7kmhrd2sgzbs6xj"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0-rc2-24027"; sha256 = "1g5ghiyfb8njzfz39cswizjbxgaamil7kgkzgab93fhgk7jksmyg"; }) (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.Extensions"; version = "4.1.0-rc2-24027"; sha256 = "09k4c6is31dpccwgb749055m2ad0b84rnapk69fmj3wjswacg26p"; }) (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"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1-rc2-24027"; sha256 = "0lw4amgaryahvija5xxb2vmybq7ks4b4ir7g7nc1xw6x9x58jf2q"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1-rc2-24027"; sha256 = "0lw4amgaryahvija5xxb2vmybq7ks4b4ir7g7nc1xw6x9x58jf2q"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0-rc2-24027"; sha256 = "0v5phdy7yr6d1q13fvb6hhd32k89l93z6x4hlkh5qhm1zlavaabl"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0-rc2-24027"; sha256 = "0v5phdy7yr6d1q13fvb6hhd32k89l93z6x4hlkh5qhm1zlavaabl"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.PInvoke"; version = "4.0.0-rc2-24027"; sha256 = "0qsgwvr6ppvllblb64p5plr7ssbmwfxxc4qf6l1xfincza8np34r"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0-rc2-24027"; sha256 = "03pgqbgahfgvigyrsd08snzsryg90shfjlbdv4jk6yzfr27va3n2"; }) @@ -212,37 +212,37 @@ (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.4.0"; sha256 = "11rr16fp68apc0arsymgj18w8ajs9a4366wgx9iqwny4glrl20wp"; }) (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "4.4.0"; sha256 = "0hyijvysbcjh20mbbgajg9wh04nkjd6y5lqxgm0a6m28zjcjshl6"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11-rc2-24027"; sha256 = "0qkaldb06dwmi8gb940h75n9cs5rgy6sqcpa6f443mhahmagmsbd"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11-rc2-24027"; sha256 = "0qkaldb06dwmi8gb940h75n9cs5rgy6sqcpa6f443mhahmagmsbd"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.4.0"; sha256 = "07bzjnflxjk9vgpljfybrpqmvsr9qr2f20nq5wf11imwa5pbhgfc"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11-rc2-24027"; sha256 = "02xic3hhfy48s50bxh25as1l9v3afgrhlxqfnd5ki4qirxly7qs6"; }) (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.Threading"; version = "4.0.11-rc2-24027"; sha256 = "0aa4zaqma4yagjd44m2j13gr9qzn8rv8dbz3p9mjdk0dx1zpi4iq"; }) (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-rc2-24027"; sha256 = "0fsgdzdxm3yj1cym421ymn8x8anhyzgzc1529q5xd1vq4yknwfq0"; }) (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"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0-rc2-24027"; sha256 = "108sdqpy3ga6gzksl59w1k21a3jlrh8x2igyxh3dm3212rca1pyg"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (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"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11-rc2-24027"; sha256 = "0vywggi6mqkbr6g1a1fh821hqfnyq1k829vlhfw908l7mj75k34d"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11-rc2-24027"; sha256 = "0vywggi6mqkbr6g1a1fh821hqfnyq1k829vlhfw908l7mj75k34d"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11-rc2-24027"; sha256 = "1rvglifac6xq1lawm78w49fq9cl8zvs1g4vrsd2hhf0vb4i85p1z"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11-rc2-24027"; sha256 = "1rvglifac6xq1lawm78w49fq9cl8zvs1g4vrsd2hhf0vb4i85p1z"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.3.0"; sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; }) diff --git a/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch b/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch deleted file mode 100644 index da73cd75a096..000000000000 --- a/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8b77c9c61058842e031dd176df2b9c79bc2c0e28 Mon Sep 17 00:00:00 2001 -From: Vincent Haupert -Date: Sun, 12 Sep 2021 19:52:21 +0200 -Subject: [PATCH] Use a fake version to prevent self-update - ---- - src/Runner.Listener/MessageListener.cs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Runner.Listener/MessageListener.cs b/src/Runner.Listener/MessageListener.cs -index 71e5e43..29945e0 100644 ---- a/src/Runner.Listener/MessageListener.cs -+++ b/src/Runner.Listener/MessageListener.cs -@@ -65,7 +65,7 @@ namespace GitHub.Runner.Listener - { - Id = _settings.AgentId, - Name = _settings.AgentName, -- Version = BuildConstants.RunnerPackage.Version, -+ Version = "2.999.9", - OSDescription = RuntimeInformation.OSDescription, - }; - string sessionName = $"{Environment.MachineName ?? "RUNNER"}"; --- -2.32.0 - diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 57e9d15dce66..f2989545f5c4 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,31 +1,55 @@ -{ lib, buildGoPackage, fetchFromGitLab, fetchurl }: +{ lib, buildGoModule, fetchFromGitLab, fetchurl }: let - version = "14.7.0"; + version = "14.9.1"; in -buildGoPackage rec { +buildGoModule rec { inherit version; pname = "gitlab-runner"; - goPackagePath = "gitlab.com/gitlab-org/gitlab-runner"; - subPackages = [ "." ]; - commonPackagePath = "${goPackagePath}/common"; + + commonPackagePath = "gitlab.com/gitlab-org/gitlab-runner/common"; ldflags = [ "-X ${commonPackagePath}.NAME=gitlab-runner" "-X ${commonPackagePath}.VERSION=${version}" "-X ${commonPackagePath}.REVISION=v${version}" ]; + vendorSha256 = "0ag3pmcrxksgikdcvl9rv2s3kn7l0dj41pf2m9dq0g2a1j45nydn"; + src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0l7bbmhvgz12nq52nmvgs1qmcknikw8f2dn9l93ijb1sr495fygl"; + sha256 = "1h6fyhbc154fr6a8brva3clirgvga6sal6ikylf9mbkxbh7d9rcn"; }; patches = [ ./fix-shell-path.patch + ./remove-bash-test.patch ]; + prePatch = '' + # Remove some tests that can't work during a nix build + + # Requires to run in a git repo + sed -i "s/func TestCacheArchiverAddingUntrackedFiles/func OFF_TestCacheArchiverAddingUntrackedFiles/" commands/helpers/file_archiver_test.go + sed -i "s/func TestCacheArchiverAddingUntrackedUnicodeFiles/func OFF_TestCacheArchiverAddingUntrackedUnicodeFiles/" commands/helpers/file_archiver_test.go + + # No writable developer environment + rm common/build_test.go + rm executors/custom/custom_test.go + + # No docker during build + rm executors/docker/terminal_test.go + rm executors/docker/docker_test.go + rm helpers/docker/auth/auth_test.go + ''; + + preCheck = '' + # Make the tests pass outside of GitLab CI + export CI=0 + ''; + meta = with lib; { description = "GitLab Runner the continuous integration executor of GitLab"; license = licenses.mit; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch index 4a3d37be09cd..b70b95e7be0b 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch @@ -1,5 +1,5 @@ diff --git a/shells/bash.go b/shells/bash.go -index bd99eca1a..9873dff6b 100644 +index 18d608445..f158ffc0b 100644 --- a/shells/bash.go +++ b/shells/bash.go @@ -3,6 +3,7 @@ package shells @@ -10,16 +10,16 @@ index bd99eca1a..9873dff6b 100644 "path" "runtime" "strconv" -@@ -300,7 +301,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (*common.Shell - if info.User != "" { - script.Command = "su" - if runtime.GOOS == "linux" { -- script.Arguments = append(script.Arguments, "-s", "/bin/"+b.Shell) -+ shellPath, err := exec.LookPath(b.Shell) -+ if err != nil { -+ shellPath = "/bin/" + b.Shell -+ } -+ script.Arguments = append(script.Arguments, "-s", shellPath) - } - script.Arguments = append( - script.Arguments, +@@ -307,7 +308,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (*common.Shell + + script.Command = "su" + if runtime.GOOS == OSLinux { +- script.Arguments = []string{"-s", "/bin/" + b.Shell, info.User, "-c", script.CmdLine} ++ shellPath, err := exec.LookPath(b.Shell) ++ if err != nil { ++ shellPath = "/bin/" + b.Shell ++ } ++ script.Arguments = []string{"-s", shellPath, info.User, "-c", script.CmdLine} + } else { + script.Arguments = []string{info.User, "-c", script.CmdLine} + } diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch b/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch new file mode 100644 index 000000000000..5bffd0f4f75e --- /dev/null +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch @@ -0,0 +1,80 @@ +diff --git a/shells/bash_test.go b/shells/bash_test.go +index b8a48f85e..0e3173fc3 100644 +--- a/shells/bash_test.go ++++ b/shells/bash_test.go +@@ -4,12 +4,9 @@ + package shells + + import ( +- "runtime" + "testing" + + "github.com/stretchr/testify/assert" +- "github.com/stretchr/testify/require" +- "gitlab.com/gitlab-org/gitlab-runner/common" + ) + + func TestBash_CommandShellEscapesLegacy(t *testing.T) { +@@ -84,62 +81,3 @@ func TestBash_CheckForErrors(t *testing.T) { + }) + } + } +- +-func TestBash_GetConfiguration(t *testing.T) { +- tests := map[string]struct { +- info common.ShellScriptInfo +- cmd string +- args []string +- os string +- }{ +- `bash`: { +- info: common.ShellScriptInfo{Shell: "bash", Type: common.NormalShell}, +- cmd: "bash", +- }, +- `bash -l`: { +- info: common.ShellScriptInfo{Shell: "bash", Type: common.LoginShell}, +- cmd: "bash", +- args: []string{"-l"}, +- }, +- `su -s /bin/bash foobar -c bash`: { +- info: common.ShellScriptInfo{Shell: "bash", User: "foobar", Type: common.NormalShell}, +- cmd: "su", +- args: []string{"-s", "/bin/bash", "foobar", "-c", "bash"}, +- os: OSLinux, +- }, +- `su -s /bin/bash foobar -c $'bash -l'`: { +- info: common.ShellScriptInfo{Shell: "bash", User: "foobar", Type: common.LoginShell}, +- cmd: "su", +- args: []string{"-s", "/bin/bash", "foobar", "-c", "bash -l"}, +- os: OSLinux, +- }, +- `su -s /bin/sh foobar -c $'sh -l'`: { +- info: common.ShellScriptInfo{Shell: "sh", User: "foobar", Type: common.LoginShell}, +- cmd: "su", +- args: []string{"-s", "/bin/sh", "foobar", "-c", "sh -l"}, +- os: OSLinux, +- }, +- `su foobar -c $'bash -l'`: { +- info: common.ShellScriptInfo{Shell: "bash", User: "foobar", Type: common.LoginShell}, +- cmd: "su", +- args: []string{"foobar", "-c", "bash -l"}, +- os: "darwin", +- }, +- } +- +- for tn, tc := range tests { +- t.Run(tn, func(t *testing.T) { +- if tc.os != "" && tc.os != runtime.GOOS { +- t.Skipf("test only runs on %s", tc.os) +- } +- +- sh := BashShell{Shell: tc.info.Shell} +- config, err := sh.GetConfiguration(tc.info) +- require.NoError(t, err) +- +- assert.Equal(t, tc.cmd, config.Command) +- assert.Equal(t, tc.args, config.Arguments) +- assert.Equal(t, tn, config.CmdLine) +- }) +- } +-} diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index 3041a0317370..47b52e5f70b3 100644 --- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "gocd-agent-${version}-${rev}"; + pname = "gocd-agent"; version = "19.3.0"; rev = "8959"; diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix index 4b3f61cf4b4b..a55d3a2efe7b 100644 --- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "gocd-server-${version}-${rev}"; + pname = "gocd-server"; version = "19.3.0"; rev = "8959"; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 3a04ba2f8660..9c87c5f08f4c 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.319.2"; + version = "2.332.1"; src = fetchurl { - url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0lx5fng98l9qci5jqwav8dmcnp7k7glfg0ccwqi0xqk90jqqs302"; + url = "http://get.jenkins.io/war-stable/${version}/jenkins.war"; + sha256 = "0xrrqdwfz19mr4wl4sdzk0qnq9rjdh65vd1386qsn6a4axwv652s"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix index 05f96c0695b6..3c48506a6bf7 100644 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -25,12 +25,12 @@ let }; in stdenv.mkDerivation rec { pname = "laminar"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "ohwgiles"; repo = "laminar"; rev = version; - sha256 = "sha256-9JiFO5Vi/NT/o7v/KXZw3/P5s5qQwmQXjrQq+uUXHQk="; + sha256 = "sha256-PLnfiWpelgKhs4FNry60sm6/QdhYs76FnZ/ZcRmb4Ok="; }; patches = [ ./patches/no-network.patch ]; nativeBuildInputs = [ cmake pandoc ]; diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix index 44445f86752a..6094df8757a0 100644 --- a/pkgs/development/tools/convco/default.nix +++ b/pkgs/development/tools/convco/default.nix @@ -1,21 +1,30 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, openssl, perl, pkg-config, libiconv, Security }: +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, cmake +, libiconv +, openssl +, pkg-config +, Security +}: rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.3.3"; + version = "0.3.9"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eWe7oTWl7QfIqq3GfMILi5S8zUi03ER1Mzfr8hqUvgw="; + sha256 = "sha256-ys7fuaD1jj3tWD6U+BRvqFneZEdKV5c1RO2FLEtqIUk="; }; - cargoSha256 = "sha256-RuClZ+ChP7d40e9nr1Lg8R0F7rbFbBse79V9Y1AQn3o="; + cargoSha256 = "sha256-5/uF0aPNNNUruRF8euuEnGSJHsRehSZipa0677zc12c="; - nativeBuildInputs = [ openssl perl pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; meta = with lib; { description = "A Conventional commit cli"; diff --git a/pkgs/development/tools/corgi/default.nix b/pkgs/development/tools/corgi/default.nix index e39e42c40af5..ce003457e23d 100644 --- a/pkgs/development/tools/corgi/default.nix +++ b/pkgs/development/tools/corgi/default.nix @@ -1,16 +1,15 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "corgi-${rev}"; - rev = "v0.2.4"; + pname = "corgi"; + version = "0.2.4"; goPackagePath = "github.com/DrakeW/corgi"; src = fetchFromGitHub { - inherit rev; - owner = "DrakeW"; repo = "corgi"; + rev = "v${version}"; sha256 = "0h9rjv1j129n1ichwpiiyspgim1273asi3s6hgizvbc75gbbb8fn"; }; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 85f7e603bbb0..c7450f738a1e 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,7 +2,7 @@ , coreutils, git, gnused, nix, nixfmt }: let - version = "2.0.16"; + version = "2.1.0-M1"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-Yx6PvBo763GnEwU5s7AYUs++Au25TF6cZ4WYGgruHpw="; + sha256 = "sha256-JeqWzAkSSqhdbgkse1uSA3k4bupepWuvx6GUtBfodcg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/crd2pulumi/default.nix b/pkgs/development/tools/crd2pulumi/default.nix index 51077c3178a3..a1d5a69e94af 100644 --- a/pkgs/development/tools/crd2pulumi/default.nix +++ b/pkgs/development/tools/crd2pulumi/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "crd2pulumi"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "crd2pulumi"; rev = "v${version}"; - sha256 = "sha256-7eNjOVTbZVpjQZPo69DgVCLCXqWnb0UVKd/DIY9Tq08="; + sha256 = "sha256-jGCtHDceJMGG2WHRldEyToZRNp3ZTt4Tir7DAsaWgfI="; }; vendorSha256 = "sha256-XM1uedApVLkFzUpNPYS5YyMiWrOpzTvqKjWIV7s/1mI="; diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 9119dbce158d..21370ab9b5a3 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cue"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - sha256 = "1q1mkqb6fk515g556yn8ks3gqrimfbadprmbv5rill1lpipq5xbj"; + sha256 = "sha256-6HD3wcBo21Dep4ckx+oDWAC4nuTvCzlp0bwQxZox2b4="; }; - vendorSha256 = "12p77a97lbff6qhncs5qx13k3wmf9hrr09mhh12isw5s0p0n53xm"; + vendorSha256 = "sha256-tY9iwQW6cB1FgLAmkDNMrvIxR+i4aGYhNs4tepI654o="; checkPhase = "go test ./..."; diff --git a/pkgs/development/tools/database/beekeeper-studio/default.nix b/pkgs/development/tools/database/beekeeper-studio/default.nix index 74c5f35dc240..c00c2e99a14e 100644 --- a/pkgs/development/tools/database/beekeeper-studio/default.nix +++ b/pkgs/development/tools/database/beekeeper-studio/default.nix @@ -2,13 +2,13 @@ let pname = "beekeeper-studio"; - version = "2.1.4"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/beekeeper-studio/beekeeper-studio/releases/download/v${version}/Beekeeper-Studio-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "1aik88wi9axv66axjmmjmlna1sp0pz92z8i2x6pq3bs0gcs4i1q3qxxbrfc14ynbpa65knimfhwzrrshchnijgdazx3qjzh8jwzfiwl"; + sha512 = "sha512:1zv4fclac94fzzhgqmjgc5pllxcxajjx6yjf3zblj53cc7m4sp4ydjx3wh4db57j75x8vh7xc3q1xpq6q3sj1dafnap0j0icfi6wznk"; }; appimageContents = appimageTools.extractType2 { @@ -32,9 +32,9 @@ in appimageTools.wrapType2 { meta = with lib; { description = "Modern and easy to use SQL client for MySQL, Postgres, SQLite, SQL Server, and more. Linux, MacOS, and Windows"; homepage = "https://www.beekeeperstudio.io"; - changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v2.1.4"; + changelog = "https://github.com/beekeeper-studio/beekeeper-studio/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ milogert ]; + maintainers = with maintainers; [ milogert alexnortung ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 6090bc1d75b7..fdc15a9256dd 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "1.2.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ThN1uvofIvV5Dt6dqxLpekTRy9pV4xb0bkVNRcfNJ2c="; + sha256 = "sha256-M9fJFdwNyNOolXFknzEPG7pNDVrqKv/WOQZUHmr8B84="; }; - vendorSha256 = "sha256-OQGpWWerUv2asjpjMLAkgeb0Q+lMAsDXjFCh0I4ze20="; + vendorSha256 = "sha256-d6h0LK4zbrfkUum7FXHIP+hqBx5A0mQmvW5GOi+EMVQ="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 5348d0be88c8..313d2480e95a 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.12.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "sha256-XNxy8CnhO3rQi3VHr7nikFNXvY2eM30jR0ngNc0FV3E="; + sha256 = "sha256-CgThS10mDYRj/VdVJeeVTMEbhvLLpWBweQ4dvo3k3Hg="; }; - vendorSha256 = "sha256-Qe3fwyEf/NiGmUSha/zZHRBR1okw2vE97u7tybqiWNI="; + vendorSha256 = "sha256-cbMCGC78vc61F4cEobarMPwVts2V3NkH4/CnHGeLd/o="; doCheck = false; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 54ede5fc3451..06f4c947b205 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.4.3"; + version = "4.8.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-td+mBf/JhTw5vvlupyllpZ2e4So7y1kEC1OdR4LUv/k="; + sha256 = "sha256-dGK26S9wd+GFiGXEA9UvDc4b1m0DsfrpB4FcEIJf6zM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/database/litestream/default.nix b/pkgs/development/tools/database/litestream/default.nix index 6a7e53e6cf20..00e541efc0d4 100644 --- a/pkgs/development/tools/database/litestream/default.nix +++ b/pkgs/development/tools/database/litestream/default.nix @@ -4,13 +4,13 @@ }: buildGoModule rec { pname = "litestream"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "benbjohnson"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IEdTLf+fEp19FhwL3IaGT9HGKQoa6HwFox2gf0lvFu4="; + sha256 = "sha256-0Yyx8kbpu3T868hI9tJkBIjplAoQDA4XzhraHhOp61Q="; }; ldflags = [ @@ -19,7 +19,7 @@ buildGoModule rec { "-X main.Version=${version}" ]; - vendorSha256 = "sha256-ScG8cukUuChOvN9r0HvVJsYnu1X9DSO7aD32iu55jIM="; + vendorSha256 = "sha256-zCz9dki87dpZCo+/KuFzwtv/0TlBcvQDTxTuLN2FiHY="; meta = with lib; { description = "Streaming replication for SQLite"; diff --git a/pkgs/development/tools/database/pg_activity/default.nix b/pkgs/development/tools/database/pg_activity/default.nix index 6754e76a8977..6282a6b69e5e 100644 --- a/pkgs/development/tools/database/pg_activity/default.nix +++ b/pkgs/development/tools/database/pg_activity/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "pg_activity"; - version = "2.2.0"; + version = "2.3.0"; disabled = python3Packages.pythonOlder "3.6"; src = fetchFromGitHub { owner = "dalibo"; repo = pname; rev = "v${version}"; - sha256 = "145yqjb2rr1k0xz6lclk4fy5zbwcbfkzvn52g9ijjrfl08y15agm"; + sha256 = "sha256-O5ACTWsHoIty+QLTGaSuk985qduH7xBjviiH4yCrY2o="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index eee49d1c6fcc..4a4724858fcc 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -10,19 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "3.8.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-pP5gNWRucr2rJqBPBt4Y/akf7tABFWhmr3EWC3/kj+g="; + sha256 = "sha256-z7ebwidY+p350XaGeyohoSHWc2DhfzpRxsRDLON1BuA="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-F105SOFWEhFVGMmPOEdBZwhNHCYkRh1HI7fESzL2uQw="; + cargoSha256 = "sha256-PQdLoNJL9szPzPtFRznWS0lngTvtWK+Ko2rp4JWH9dQ="; nativeBuildInputs = [ pkg-config ]; @@ -56,6 +56,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.prisma.io/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ pamplemousse pimeys ]; + maintainers = with maintainers; [ pamplemousse pimeys superherointj ]; }; } diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/development/tools/database/sqlcheck/default.nix index 2afd004f4d73..a4aec98cbd09 100644 --- a/pkgs/development/tools/database/sqlcheck/default.nix +++ b/pkgs/development/tools/database/sqlcheck/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sqlcheck"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "jarulraj"; repo = "sqlcheck"; rev = "v${version}"; - sha256 = "0v8idyhwhbphxzmh03lih3wd9gdq317zn7wsf01infih7b6l0k69"; + sha256 = "sha256-rGqCtEO2K+OT44nYU93mF1bJ07id+ixPkRSC8DcO6rY="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index ef95263185c9..da43a4daf7d1 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -10,7 +10,7 @@ let desktopName = "Oracle SQL Developer"; genericName = "Oracle SQL Developer"; comment = "Oracle's Oracle DB GUI client"; - categories = "Development;"; + categories = [ "Development" ]; }; in stdenv.mkDerivation { diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 4dcaa7c43232..cc6757e239a7 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.9.2"; + version = "0.11.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-BzO7S2sxZeklzIh1qRHJ4mGLsKLNpg8PuGGRVAkPlzc="; + hash = "sha256-iEjfp6QXMIk/ehq0Ypa8JXv3/u40w39NHz7HhC1KBms="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 5175a0287601..e908849a3b3a 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { pname = "squirrel-sql"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "sha256-pNcmIey50nWZghoXVGnm0EFzGoqBpAaJ2lhYvVzjWto="; + sha256 = "sha256-Xh6JLfk0xDqEBJiEG3WBKBEqad/O0D8aeJk5s5w8PTI="; }; nativeBuildInputs = [ makeWrapper unzip ]; @@ -63,14 +63,14 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "SQuirreL SQL"; genericName = "SQL Client"; - categories = "Development;"; + categories = [ "Development" ]; icon = "squirrel-sql"; }; meta = with lib; { description = "Universal SQL Client"; homepage = "http://squirrel-sql.sourceforge.net/"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ khumba ]; }; diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index 9c24d35cbf88..be29a0457ee0 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,17 +2,20 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6xMdOqLfD3NQksmcD7rlTW3xoW2Fi6OmwbpjIj9A/tw="; + sha256 = "sha256-p1SU0wnB2XftuPMbm47EbJ2aZGV9amlk0y7FI0QOBkk="; }; vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E="; + # Temporary fix of bug: https://github.com/timescale/timescaledb-tune/issues/95 + patches = [ ./fixMinMaxConn.diff ]; + meta = with lib; { description = "A tool for tuning your TimescaleDB for better performance"; homepage = "https://github.com/timescale/timescaledb-tune"; diff --git a/pkgs/development/tools/database/timescaledb-tune/fixMinMaxConn.diff b/pkgs/development/tools/database/timescaledb-tune/fixMinMaxConn.diff new file mode 100644 index 000000000000..3a0110476cce --- /dev/null +++ b/pkgs/development/tools/database/timescaledb-tune/fixMinMaxConn.diff @@ -0,0 +1,13 @@ +diff --git a/pkg/pgtune/misc.go b/pkg/pgtune/misc.go +index 1fceb6e..3e76be5 100644 +--- a/pkg/pgtune/misc.go ++++ b/pkg/pgtune/misc.go +@@ -35,7 +35,7 @@ const ( + // If you want to lower this value, consider that Patroni will not accept anything less than 25 as + // a valid max_connections and will replace it with 100, per + // https://github.com/zalando/patroni/blob/00cc62726d6df25d31f9b0baa082c83cd3f7bef9/patroni/postgresql/config.py#L280 +- minMaxConns = 25 ++ minMaxConns = 20 + ) + + // MaxConnectionsDefault is the recommended default value for max_connections. diff --git a/pkgs/development/tools/database/webdis/default.nix b/pkgs/development/tools/database/webdis/default.nix index 83d57ba5c2e4..01cbb22c854c 100644 --- a/pkgs/development/tools/database/webdis/default.nix +++ b/pkgs/development/tools/database/webdis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "webdis"; - version = "0.1.19"; + version = "0.1.20"; src = fetchFromGitHub { owner = "nicolasff"; repo = pname; rev = version; - sha256 = "sha256-Q5tFEuyTfjXaa/0JOpNjzokstKaQPwR1szqdzYrqXxc="; + sha256 = "sha256-QvPawRYmk5HcE4XnI4B4G7AAaN/8cFov9lOa2e++g4A="; }; buildInputs = [ hiredis http-parser jansson libevent ]; diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 2eb11b2ffc28..e94917f15d7c 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "datree"; - version = "0.14.87"; + version = "0.15.22"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - sha256 = "sha256-zoFWiqrKdTh6XDrKx2mQe3NqK03so6MqIX0sSQHQa5U="; + hash = "sha256-g5u2QQtVmNp01KtUKwC8uoEIuoBDLHsOlRz1Mv0n/y8="; }; - vendorSha256 = "sha256-SlU1lJcKCDkoihU19c8iky3Bj5ZZD9E9W0QQX9fBT1c="; + vendorSha256 = "1cvlvlwdk41f145kzifg7rv7ymwhc9k0ck91bn106240rq1igcr0"; ldflags = [ "-s" diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 61d8ea77f3e3..fdec9ad19ed0 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ddosify"; - version = "0.7.2"; + version = "0.7.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-QLJB2WcnguknEMdgwJzltp++mJCL4cFOWU568aTk0sc="; + sha256 = "sha256-n9xKg8RN2o20dTsV8a0tAJjmvAlwZ7TF2cTrXx+f49k="; }; - vendorSha256 = "sha256-TY8shTb77uFm8/yCvlIncAfq7brWgnH/63W+hj1rvqg="; + vendorSha256 = "sha256-lbo9P2UN9TmUAqyhFdbOHWokoAogVQZihpcOlhmumxU="; ldflags = [ "-s -w" diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix deleted file mode 100644 index 8286435d9a3a..000000000000 --- a/pkgs/development/tools/deis/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "deis"; - version = "1.13.4"; - rev = "v${version}"; - - goPackagePath = "github.com/deis/deis"; - subPackages = [ "client" ]; - - postInstall = '' - if [ -f "$out/bin/client" ]; then - mv "$out/bin/client" "$out/bin/deis" - fi - ''; - - src = fetchFromGitHub { - inherit rev; - owner = "deis"; - repo = "deis"; - sha256 = "0hndzvlgpfm83c4i1c88byv8j9clagswa79nny8wrw33dx90dym1"; - }; - - preBuild = '' - export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace - ''; - - meta = with lib; { - homepage = "https://deis.io"; - description = "A command line utility used to interact with the Deis open source PaaS"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ - ]; - }; -} diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix deleted file mode 100644 index 67245a5ebbe7..000000000000 --- a/pkgs/development/tools/deisctl/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "deis"; - version = "1.13.3"; - rev = "v${version}"; - - goPackagePath = "github.com/deis/deis"; - subPackages = [ "deisctl" ]; - - src = fetchFromGitHub { - inherit rev; - owner = "deis"; - repo = "deis"; - sha256 = "15q44jyjms8fdmly0z4sn4ymf1dx6cmdavgixjixdj2wbjw0yi2p"; - }; - - preBuild = '' - export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace - ''; - - meta = with lib; { - homepage = "https://deis.io"; - description = "A command-line utility used to provision and operate a Deis cluster"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ - ]; - }; -} diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 54c1f12432b3..478ef3b6fc68 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "delve"; - version = "1.8.0"; + version = "1.8.2"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-NihlBFZ5xu+DMBtUiGyjxpgob2hoLlFJ7MfnM55feuw="; + sha256 = "sha256-rW3uKf5T+ZCjZxVuSFWWXw0mhAW9Y9L83xtU98JTuik="; }; subPackages = [ "cmd/dlv" ]; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 2b122326bfe5..863336257251 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -1,26 +1,24 @@ { lib +, argon2-cffi-bindings , buildPythonApplication -, fetchPypi -# buildInputs -, glibcLocales -, pkginfo , check-manifest -# propagatedBuildInputs -, py , devpi-common -, pluggy -, setuptools -# CheckInputs -, pytest -, pytest-flake8 -, webtest -, mock , devpi-server -, tox -, sphinx -, wheel +, fetchPypi , git +, glibcLocales , mercurial +, mock +, pkginfo +, pluggy +, py +, pytestCheckHook +, pytest-flake8 +, setuptools +, sphinx +, tox +, webtest +, wheel }: buildPythonApplication rec { @@ -29,24 +27,45 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "362eb26e95136a792491861cc2728d14a6309a9d4c4f13a7b9c3e6fd39de58ec"; + hash = "sha256-Ni6ybpUTankkkYYcwnKNFKYwmp1MTxOnucPm/TneWOw="; }; - buildInputs = [ glibcLocales ]; - - propagatedBuildInputs = [ py devpi-common pluggy setuptools check-manifest pkginfo ]; - - checkInputs = [ - pytest pytest-flake8 webtest mock - devpi-server tox - sphinx wheel git mercurial + buildInputs = [ + glibcLocales ]; - # --fast skips tests which try to start a devpi-server improperly - checkPhase = '' - HOME=$TMPDIR py.test --fast + propagatedBuildInputs = [ + argon2-cffi-bindings + check-manifest + devpi-common + pkginfo + pluggy + py + setuptools + ]; + + checkInputs = [ + devpi-server + git + mercurial + mock + pytestCheckHook + pytest-flake8 + sphinx + tox + webtest + wheel + ]; + + preCheck = '' + export HOME=$(mktemp -d); ''; + pytestFlagsArray = [ + # --fast skips tests which try to start a devpi-server improperly + "--fast" + ]; + LC_ALL = "en_US.UTF-8"; __darwinAllowLocalNetworking = true; @@ -57,5 +76,4 @@ buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ lewo makefu ]; }; - } diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix index b647505fe4bf..d117d9319d88 100644 --- a/pkgs/development/tools/dockle/default.nix +++ b/pkgs/development/tools/dockle/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dockle"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0yeHxQW6zX8Mh9JBmp915czEZCmbIom/KYHWLc/O6NY="; + sha256 = "sha256-QC0WAM+qitee0dyJorl5Hio3COy4JiIHmFgBIj7S2yM="; }; - vendorSha256 = "sha256-klTIGmMKA6gp1strgvKnVBtYGQu2407UwxZ8brdGEkQ="; + vendorSha256 = "sha256-9n/782uKu7qNV/WEpbEV3aHcPXipyOhGdAhT/F4O2xc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 9f31ebb0af42..d7667538e8e5 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.68.0"; + version = "1.71.1"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-3W6jDMT4UUtSND9bJJEexQ9LrqxL4oZtpucdcM1McdE="; + sha256 = "sha256-Y6YabrpM1WcNGp5ksvq3SBuAS6KEUVzEfxsPmBDS+Io="; }; meta = with lib; { diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix index 05b7aac82c17..85836f435cba 100644 --- a/pkgs/development/tools/documentation/gi-docgen/default.nix +++ b/pkgs/development/tools/documentation/gi-docgen/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitLab -, fetchpatch , meson , ninja , python3 @@ -8,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2021.8"; + version = "2022.1"; format = "other"; @@ -17,18 +16,9 @@ python3.pkgs.buildPythonApplication rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "Y1IdCH6bytxbKIj48IAw/3XUQhoqwPshvdj/d1hRS3o="; + sha256 = "35pL/2TQRVgPfAcfOGCLlSP1LIh4r95mFC+UoXQEEHo="; }; - patches = [ - # Fix building docs of some packages (e.g. gnome-builder) - # https://gitlab.gnome.org/GNOME/gi-docgen/-/issues/111 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gi-docgen/-/commit/72f3c5dbe27aabb5f7a376afda23f3dfc3c2e212.patch"; - sha256 = "iVXc3idmcjmFVZQdE2QX2V53YZ79lqxZid9nWdxAZ/Q="; - }) - ]; - depsBuildBuild = [ python3 ]; diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index d2c910b2544e..f2bd4bb1b2a2 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.19.2"; + version = "0.22.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-mTurSfYyLDmHCiza/noToRFtQL0zsdzib69PCtUseSI="; + sha256 = "sha256-iYqQABXd3Vra+U7cfGKBEyTXfQGwHxFSxEoDyCfKk5Y="; }; - cargoSha256 = "sha256-B4b6RSegtS3FQ4BHFVmw9+jlA/oKEmB5i/kdb6nuzkQ="; + cargoSha256 = "sha256-QMOS8Pn3RwZZRtKqp077ihh91Q4VPe8alrtQ6dYIXmA="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/tools/dstp/default.nix b/pkgs/development/tools/dstp/default.nix index c0a7f79eae19..7e3dafc5b228 100644 --- a/pkgs/development/tools/dstp/default.nix +++ b/pkgs/development/tools/dstp/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "dstp"; version = "0.4.0"; diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix index a5445c8e021d..20e1ed136e2b 100644 --- a/pkgs/development/tools/dt-schema/default.nix +++ b/pkgs/development/tools/dt-schema/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "dtschema"; - version = "2021.10"; + version = "2022.1"; src = fetchPypi { inherit pname version; - sha256 = "d09c94d13f46e6674ba11ff31220651ad1b02dae860f5a87905dfac6b8d768d9"; + sha256 = "sha256-G5KzuaMbbkuLK+cNvzBld1UwvExS6ZGVW2e+GXQRFMU="; }; nativeBuildInputs = [ setuptools-scm git ]; diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix index 3e228badbd5d..d71b73929cea 100644 --- a/pkgs/development/tools/dyff/default.nix +++ b/pkgs/development/tools/dyff/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dyff"; - version = "1.4.7"; + version = "1.5.1"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-0/pn+Ld7o4gBnddA+uMzBhrFnov1XoqpRGkTT/vNH3Y="; + sha256 = "sha256-SiOaPgwcdYrZBk7vzs6icN+pP0Yc+ImLz5lVtHaXgDc="; }; - vendorSha256 = "sha256-9FkRazgZlzwvimsbqWCYJLxwRRlHa0i/jPPuf+AGSOA="; + vendorSha256 = "sha256-N3LqPnBq+jOUj4yDhY0GS4a4FTOntY4xu1TVac6va+Q="; subPackages = [ "cmd/dyff" diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index c6cc57e14c5c..377d287e531e 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.6.2"; + version = "0.6.12"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-a2NNpQvbhMY66nbk4RAXFb/o1qR5OXPm93ujzS2cxp4="; + sha256 = "sha256-M8DnSpQhW4i83cu9wp0ZKyP7137IQVjyBl0cgVvQmPI="; }; - vendorSha256 = "sha256-0wyefhY/KR79K9DDI4/8EaA/DFI1rf6wxsBIAZo+rUI="; + vendorSha256 = "sha256-GvTWj0uEsCyC4/RL6woym8UwA3OCFx8NWkNQApnVMM8="; ldflags = [ "-s" "-w" @@ -37,6 +37,6 @@ buildGoModule rec { homepage = "https://earthly.dev/"; changelog = "https://github.com/earthly/earthly/releases/tag/v${version}"; license = licenses.bsl11; - maintainers = with maintainers; [ matdsoupe ]; + maintainers = with maintainers; [ zoedsoupe ]; }; } diff --git a/pkgs/development/tools/ec2-metadata-mock/default.nix b/pkgs/development/tools/ec2-metadata-mock/default.nix index 1a2fd8ec0f70..838e99417722 100644 --- a/pkgs/development/tools/ec2-metadata-mock/default.nix +++ b/pkgs/development/tools/ec2-metadata-mock/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ec2-metadata-mock"; - version = "1.9.2"; + version = "1.10.1"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ec2-metadata-mock"; rev = "v${version}"; - sha256 = "sha256-k4YzG4M+r6BHc4DdAMXoUvVDTJqmzr8vIL1J6kbJBeY="; + sha256 = "sha256-sWs3chJqXL1YTHgSY0kD+PINrF4eOThOdcgSis3Mecs="; }; - vendorSha256 = "sha256-uq0gcpFzAcz1HMwI1ZjHykWU93bV2U5kxC/G+J4ob7Q="; + vendorSha256 = "sha256-HbU6Y5SART+FjFyEpzv243yfo/A4yprPen5Mlhq0hbg="; postInstall = '' mv $out/bin/{cmd,ec2-metadata-mock} diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index 01146542d0cc..7408b35fe5ad 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { comment = "Eclipse Memory Analyzer"; desktopName = "Eclipse MAT"; genericName = "Java Memory Analyzer"; - categories = "Development;"; + categories = [ "Development" ]; }; unpackPhase = '' diff --git a/pkgs/development/tools/efm-langserver/default.nix b/pkgs/development/tools/efm-langserver/default.nix index 96a8d694e778..a030a271b487 100644 --- a/pkgs/development/tools/efm-langserver/default.nix +++ b/pkgs/development/tools/efm-langserver/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "efm-langserver"; - version = "0.0.40"; + version = "0.0.42"; src = fetchFromGitHub { owner = "mattn"; repo = "efm-langserver"; rev = "v${version}"; - sha256 = "sha256-0C7iSWO7zzOhPgzxj9k2MK6poi4XaCbMjTGah3ohVJg="; + sha256 = "sha256-1IAPtqIozp9Wp3L95mmhFuWvWvCDuTh1VsCVaJSzyfk="; }; - vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI="; + vendorSha256 = "sha256-KABezphT5/o3XWSFNe2OvfawFR8uwsGMnjsI9xh378Q="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index b7b8e3ed3b71..24dc8614b29a 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -15,6 +15,7 @@ , libxkbcommon , libappindicator-gtk3 , libxshmfence +, libglvnd }@args: let @@ -22,25 +23,7 @@ let in rec { - electron = electron_16; - - electron_7 = mkElectron "7.3.3" { - x86_64-linux = "a947228a859149bec5bd937f9f3c03eb0aa4d78cfe4dfa9aead60d3646a357f9"; - x86_64-darwin = "e081436abef52212065f560ea6add1c0cd13d287a1b3cc76b28d2762f7651a4e"; - i686-linux = "5fb756900af43a9daa6c63ccd0ac4752f5a479b8c6ae576323fd925dbe5ecbf5"; - armv7l-linux = "830678f6db27fa4852cf456d8b2828a3e4e3c63fe2bced6b358eae88d1063793"; - aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066"; - headers = "0ink72nac345s54ws6vlij2mjixglyn5ygx14iizpskn4ka1vr4b"; - }; - - electron_8 = mkElectron "8.5.5" { - x86_64-linux = "8058442ab4a18d73ca644d4a6f001e374c3736bc7e37db0275c29011681f1f22"; - x86_64-darwin = "02bb9f672c063b23782bee6e336864609eed72cffeeea875a3b43c868c6bd8b3"; - i686-linux = "c8ee6c3d86576fe7546fb31b9318cb55a9cd23c220357a567d1cb4bf1b8d7f74"; - armv7l-linux = "0130d1fcd741552d2823bc8166eae9f8fc9f17cd7c0b2a7a5889d753006c0874"; - aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5"; - headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5"; - }; + electron = electron_17; electron_9 = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; @@ -80,43 +63,53 @@ rec { headers = "1idam1xirxqxqg4g7n33kdx2skk0r351m00g59a8yx9z82g06ah9"; }; - electron_13 = mkElectron "13.6.7" { - armv7l-linux = "13acf496801d2a311f9c0644d086df26976259e915cb2201fd29665d8122a98b"; - aarch64-linux = "8d751e9e998f5eece15dba8cae1a7aa4b780da1b802235bafcd86a3540f4efe2"; - x86_64-linux = "af93b62e197a40c648c964d44939d24fc56ff4fa8ccac22cfb020660c726f4e7"; - i686-linux = "68085a6849aa571fea7682b66207abd2b6adb0a515195a00862776f37f2ff3f0"; - x86_64-darwin = "70d51ac6adc50df3195af022e700d3d10056c9e1fb770c79540215cdee9d67b3"; - aarch64-darwin = "4d9facf75a94f6d053c02db97ca4012833274b3d3f9ab0438733a302d4a28f60"; - headers = "1ydyl2s58vf65ywih2n3iam8l6yggmsn6hv0jhwp1rsash8hl4x4"; + electron_13 = mkElectron "13.6.9" { + armv7l-linux = "e70cf80ac17850f3291c19a89235c59a7a6e0c791e7965805872ce584479c419"; + aarch64-linux = "cb570f77e46403a75b99740c41b297154f057dc3b9aa75fd235dccc5619972cf"; + x86_64-linux = "5e29701394041ba2acd8a9bb042d77967c399b8fe007d7ffbd1d3e6bfdb9eb8a"; + i686-linux = "7c31b60ee0e1d9966b8cf977528ace91e10ce25bb289a46eabbcf6087bee50e6"; + x86_64-darwin = "3393f0e87f30be325b76fb2275fe2d5614d995457de77fe00fa6eef2d60f331e"; + aarch64-darwin = "8471777eafc6fb641148a9c6acff2ea41c02a989d4d0a3a460322672d85169df"; + headers = "0vvizddmhprprbdf6bklasz6amwc254bpc9j0zlx23d1pgyxpnhc"; }; - electron_14 = mkElectron "14.2.4" { - armv7l-linux = "d644d2df745a9809794929762db1faa56b77f519ccc0d430dd2238235739ace3"; - aarch64-linux = "1f198a61a5f67954f568e49879e390c94ef9cb05545664e24bac513e05dea0d9"; - x86_64-linux = "faf6c0501811e3dec056f536e53f0ec087345b852e7de47ae86ea175cc070a2f"; - i686-linux = "1f9baa2f3aa1cd935cc29f67aa273c8b1b65da144af3894bd855ce02a6730fc1"; - x86_64-darwin = "4a3c146da911162c7081e280f2c311c41f132e1d3274bc3676ed71cc9392dc5d"; - aarch64-darwin = "279cc3c04c7db9f3361b09f442750f4d18c8b2c7f633bca17aa9fb3656bfb74c"; - headers = "1zkf1j82psbj9mw8zb9ghl9y6bkw77cxqzkp3q1bbn6wvj41lvyh"; + electron_14 = mkElectron "14.2.7" { + armv7l-linux = "bb0c25671daa0dc235e212831d62f18b9a7f2692279bcd8e4a15f2d84ee7124d"; + aarch64-linux = "149c5df2cf98ee0a2ce5445b3fb00752f42c3f7ab9677b7a54ba01fba2e2f4ec"; + x86_64-linux = "ad80f424e8d8d79f0be078d8a1ddef8fd659fa3dd8aaf6704ab97f2a13489558"; + i686-linux = "82b29272cb52dbe969c0bd6cf9b69896c86abe1d9ef473a3844c0ab3dc92b353"; + x86_64-darwin = "2a5d8336dcd140158964801d482344756377d924a06e6605959034a41f7e026b"; + aarch64-darwin = "b45869ff61bdf392bca498529b6445d47a784079f6a33af6b19d517953f03fd8"; + headers = "0339fs3iyp869xi1xmn9z2b1n32wf408cc0z9bz6shns44ymkyhd"; }; - electron_15 = mkElectron "15.3.5" { - armv7l-linux = "c5540cd94711a31fe0098da982d4a25ed1b606e0d4213c9f7863826b2c8e7eaf"; - aarch64-linux = "6550387135605b64b8549b1034eae672a8f94419032dacbaff7b92934cc0508d"; - x86_64-linux = "3b61eaa48f3c5f1983a24152e6b12f39c3a29abb52d17c13891c16a25e3c209a"; - i686-linux = "30d6de074bebe985bb07f20788a8378c7fa1ded564e3c1e8183b0113ba76b282"; - x86_64-darwin = "fe2c138bb11b3db07d02c1cbf7838765036ac2552582f9ce2265ffe6609ea2e1"; - aarch64-darwin = "7c887b8ae24ad7ca9585a001f29108919bc39d27c3818012aeefb8072e23178d"; - headers = "0fkvwlnxjy8dwfnxhgk6i4qayhmg7dbqmd9nfi94a7kdbwp714r5"; + electron_15 = mkElectron "15.4.1" { + armv7l-linux = "e0fe5daed46a5d718b3209fa301aea743df694daf6605f9313f4ca6c70fe5167"; + aarch64-linux = "fa108edd4c146811bdee842fcd278b046ae0ff157de5e072c3ff3ac0bcb310c2"; + x86_64-linux = "867095924d434b3918df8576e7af94fecea4d29461fcfb69c40161f02158ff15"; + i686-linux = "8e79fa9f4125f254abb437445fed8f3f8ec10dd2462e1ced3e7df49c622e087d"; + x86_64-darwin = "899d16a0e0157809c297ceb3710c53441ec4396333d9ad5b65297446874e14dc"; + aarch64-darwin = "8295bf45dab1131dfdfd15654a0b1d85bfae221052ba64353368a2c0faaaa3ff"; + headers = "073697wjq60cnz42xmnjsr0xqcmcsl4m48mmzrz1rxrc8mvi86gr"; }; - electron_16 = mkElectron "16.0.7" { - armv7l-linux = "8a8567c745ab1c2b1de19305da0a0036ba100b27e1fc4eb014aca325aff3193e"; - aarch64-linux = "6d27cc9acc3f580118cdd685d629d39c2a1fc094376b719fa0100a7446f8fede"; - x86_64-linux = "544cd6d48262f24c8a82d2e8079b20889ec5e83959404fdda9ad00c86e9efa70"; - i686-linux = "8b79ce5fbc704eb03c34d4b96765314074a687ae3165cab21f84f77fee36d755"; - x86_64-darwin = "e5c825d4cfc1dabd066986fa1cae3ee880f222b053c760b700b24899fb02d4db"; - aarch64-darwin = "9fa9dc44e5d71de7a999b3db07a583e0a04252747486c16955232eba498b259d"; - headers = "0r4gd2v9rzrg1msxw62rq1s93ifrjj4yb4gfcma5mbj88m3v5p63"; + electron_16 = mkElectron "16.1.0" { + armv7l-linux = "f3ab34c73b4100ffc5041ed9aa0608d1dc6b98fe3c2caa14be3d5c3ffbebda76"; + aarch64-linux = "e80a7e4a59b94c7cd02b16ca37a2b0f26ddb58ddac23135c6180b238589f1c62"; + x86_64-linux = "36c79af4d05e89ef9c9616a156f63adc5b453ee6bee5d8f4331e75ee77198e85"; + i686-linux = "7129a96fc33de70cfe5d6d0e17ecff1b4dcf52d825a6ad05b10ca67da7b43665"; + x86_64-darwin = "723859249e959948cdd339acf708022fb0195b433809af25b4a9f4d69b9da52f"; + aarch64-darwin = "e76558028979f70107e5b1897275a9789be20b13991bfbcebeab7fc220f15764"; + headers = "0yv9rssrfi0hdzrjf1n735dsz9sgy78jzxdcf9is2387yrr1qiyz"; + }; + + electron_17 = mkElectron "17.1.2" { + armv7l-linux = "b561c04c9fa8c512f418ea5c32f5526732e1ccd150ee4830a0091d0fa1b7e31c"; + aarch64-linux = "cda7e66c6672def9edd881107c28e2eec09b7802a38227ac89bb233191ce4840"; + x86_64-linux = "7e7c35e8c1a0fc451e7af19fa73264881ae2c4672c52a2ae1cdd61604650ca94"; + i686-linux = "de87a7952c93c1d8e8c533a700bbfc76d3893e9ad438413507d11450b80a9c97"; + x86_64-darwin = "d4382d3f01b750676a1f3c9e2273ad69cac16dc64a4145469c663bcda8d2471b"; + aarch64-darwin = "135dec87211fcefdb53ab1fef13344c7b71a321f7c4f6846f260c1e0848e73bf"; + headers = "15k234d044lgmc3psyxz9syy9wvzgn54znklak9sv6gcajjzll10"; }; } diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index f70767a05919..08edf8a30927 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -15,11 +15,12 @@ , libxkbcommon , libappindicator-gtk3 , libxshmfence +, libglvnd }: version: hashes: let - name = "electron-${version}"; + pname = "electron"; meta = with lib; { description = "Cross platform desktop application shell"; @@ -28,7 +29,7 @@ let maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ] ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ]; - knownVulnerabilities = optional (versionOlder version "13.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "14.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { @@ -54,7 +55,7 @@ let "Unsupported system: ${platform.system}"; common = platform: { - inherit name version meta; + inherit pname version meta; src = fetcher version (get tags platform) (get hashes platform); passthru.headers = headersFetcher version hashes.headers; }; @@ -64,6 +65,7 @@ let ++ optionals (! versionOlder version "9.0.0") [ libdrm mesa ] ++ optionals (! versionOlder version "11.0.0") [ libxkbcommon ] ++ optionals (! versionOlder version "12.0.0") [ libxshmfence ] + ++ optionals (! versionOlder version "17.0.0") [ libglvnd ] ); linux = { diff --git a/pkgs/development/tools/ent/default.nix b/pkgs/development/tools/ent/default.nix new file mode 100644 index 000000000000..79470814ada0 --- /dev/null +++ b/pkgs/development/tools/ent/default.nix @@ -0,0 +1,40 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "ent-go"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "ent"; + repo = "ent"; + rev = "v${version}"; + sha256 = "sha256-MvfbQKGVYWbZkqc3X3BqsB+z2KMkr0gMOquL02qHwUY="; + }; + + vendorSha256 = "sha256-BF2eD/jOtY1XhZ0hB7f3/frKQYwS9PbuGxum5SSnjzA="; + + subPackages = [ "cmd/ent" ]; + + ldflags = [ + "-s" + "-w" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd ent \ + --bash <($out/bin/ent completion bash) \ + --fish <($out/bin/ent completion fish) \ + --zsh <($out/bin/ent completion zsh) + ''; + + meta = with lib; { + description = "An entity framework for Go"; + downloadPage = "https://github.com/ent/ent"; + license = licenses.asl20; + homepage = "https://entgo.io/"; + maintainers = with maintainers; [ superherointj ]; + }; +} + diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 4995fbe1c3dc..33f3bfc19c12 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.11"; + version = "0.14.28"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-hS+LJfYB+nH5z/UA6RKdqA8qc1jT9Gskt6LufHCiqv8="; + sha256 = "sha256-Z4Na4Tp5zNbzrOH14t+3rUTL8Q9OfyE6mUAdnETzFrs="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; diff --git a/pkgs/development/tools/evans/default.nix b/pkgs/development/tools/evans/default.nix index bfe58a8dd041..95e0839f46b3 100644 --- a/pkgs/development/tools/evans/default.nix +++ b/pkgs/development/tools/evans/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "evans"; - version = "0.10.0"; + version = "0.10.3"; src = fetchFromGitHub { owner = "ktr0731"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ftt3lnwLk2Zx1DxDmZx2hBqXcxzqUb6I/gEdQJuFsCc="; + sha256 = "sha256-4KHJodqmx03uQ+HJBWmKbIBvkLh80N4fHnYL4GLciNc="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-WclmINHcgRtbRSZGv+lOgwuImHKVC9cfK8C+f9JBcts="; + vendorSha256 = "sha256-to75gON3Kl0GHgVhhrW8I6GWOg9/KrUts3rwDLAfFnM="; meta = with lib; { description = "More expressive universal gRPC client"; diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 835641001034..58e048b4f5fe 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -9,15 +9,13 @@ let in buildGoModule rec { pname = "faas-cli"; - # When updating version change rev. - version = "0.14.1"; - rev = "d94600d2d2be52a66e0a15c219634f3bcac27318"; + version = "0.14.3"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "132m9kv7a4vv65n8y3sq1drks6n1pci9fhvq0s637imf2vxccxqr"; + sha256 = "sha256-1aflQXfW/y31Dk0OZW77qNQKEwkhi6p8ZBfTUyRDbdo="; }; CGO_ENABLED = 0; @@ -28,7 +26,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/openfaas/faas-cli/version.GitCommit=${rev}" + "-X github.com/openfaas/faas-cli/version.GitCommit=ref/tags/${version}" "-X github.com/openfaas/faas-cli/version.Version=${version}" "-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.targetPlatform}" ]; @@ -38,13 +36,5 @@ buildGoModule rec { description = "Official CLI for OpenFaaS "; license = licenses.mit; maintainers = with maintainers; [ welteki ]; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - "aarch64-linux" - "aarch64-darwin" - "armv7l-linux" - "armv6l-linux" - ]; }; } diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index ce3420fd911b..4e96294fe3e0 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -47,13 +47,13 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; in stdenv.mkDerivation rec { pname = "flatpak-builder"; - version = "1.2.0"; + version = "1.2.2"; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-38tqPKONYeB3W3CkaatQUoXhKTYUYt8JAE5tQlHCRqg="; + sha256 = "sha256-if2mjlN8Hp3gI1JpC9icMhenKRZFWNNfNbCPea2E4D4="; }; patches = [ @@ -87,10 +87,6 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - # TODO: Remove older versions. - # https://github.com/flatpak/flatpak-builder/pull/437 - docbook_xml_dtd_412 - docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl gettext diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index 68725a16c090..c83966c7d6d3 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "fnm"; - version = "1.29.2"; + version = "1.31.0"; src = fetchFromGitHub { owner = "Schniz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9U0AOFlD7SROTditW/lv12BtvfstCkU5QOMA/19KG+k="; + sha256 = "sha256-8A6MKDeyuk0bzyoDydcOy4LzyYe/S+x+ZJMTOo59UA8="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ]; - cargoSha256 = "sha256-l5H8O0OLnnv3kku/e6yK0Ps1VcIY5YoR5yFTk5w3h4k="; + cargoSha256 = "sha256-oiGYkRqxN6e5EG6EDQalIK0tOekyIVQ+GhxCKK0Sd3g="; doCheck = false; diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/development/tools/fq/default.nix index cafcc859b5ec..ad8c43195c9d 100644 --- a/pkgs/development/tools/fq/default.nix +++ b/pkgs/development/tools/fq/default.nix @@ -1,22 +1,22 @@ { lib -, buildGo117Module +, buildGoModule , fetchFromGitHub , fq , testVersion }: -buildGo117Module rec { +buildGoModule rec { pname = "fq"; - version = "0.0.3"; + version = "0.0.6"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - sha256 = "sha256-yC2Hd7sUPA7SCJNWYlD1u3u9kfTEtkFwdUrNeYoi5xU="; + sha256 = "sha256-/9TBnhFGYNOcCsQKUF0uuJEgnF+qRGly/5z1s3sYhqY="; }; - vendorSha256 = "sha256-89rSpxhP35wreo+0AqM+rDICCPchF+yFVvrTtZ2Xwr4="; + vendorSha256 = "sha256-zvtYyNJO4QoTes3vf6CFa3dYMJqkp0PG9pnOk+aO97Y="; ldflags = [ "-s" @@ -24,6 +24,8 @@ buildGo117Module rec { "-X main.version=${version}" ]; + subPackages = [ "." ]; + passthru.tests = testVersion { package = fq; }; meta = with lib; { diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index fb6a4f496248..ae0db9da3074 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.12"; + version = "3.15.0"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2fXefYvcclcxMeX6JtHjoVNRwJTsUAhxet646BDPHic="; + sha256 = "sha256-EIHaCkqwCyRV1sX+9f39FbByRvhms4rJA9nQoKxxkm8="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-4Ak+mh9ege38iO1QyxvGkYvRyU11QjphfLrit1qfu58="; + vendorSha256 = "sha256-vWqj2fRtaDextDstIb5GrdRn4nxQpCfjegYiVbPILuM="; meta = with lib; { description = "Thrift improved"; diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index 168910da06f5..1048ca194411 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -1,24 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gauge"; - version = "1.1.6"; + version = "1.4.3"; - goPackagePath = "github.com/getgauge/gauge"; excludedPackages = ''\(build\|man\)''; src = fetchFromGitHub { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - sha256 = "02yrk4d5mm4j2grlhqkf4grxawx91kd2vhdn7k5wd2dl6wsnlgcl"; + sha256 = "sha256-TszZAREk6Hs2jULjftQAhHRIVKaZ8fw0NLJkBdr0FPw="; }; + vendorSha256 = "1wp19m5n85c7lsv8rvcbfz1bv4zhhb7dj1frkdh14cqx70s33q8r"; + meta = with lib; { - description = "Light weight cross-platform test automation"; - homepage = "https://gauge.org"; - license = licenses.gpl3; - maintainers = [ maintainers.vdemeester ]; - platforms = platforms.unix; + description = "Light weight cross-platform test automation"; + homepage = "https://gauge.org"; + license = licenses.asl20; + maintainers = [ maintainers.vdemeester ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 0566f0276fbd..6719d7103921 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,21 +2,36 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.0.0"; + version = "2.1.3"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-a3AZ/7UfB9qjMK9yWHSaBRnDA/5FmIGGxXAvNhcfKCc="; + sha256 = "sha256-q+m1NDl9zd6ueyBTzbzlvHIQyoIul5dAfUQ6UK4wlrc="; }; vendorSha256 = "sha256-kMQ60HdsorZU27qoOY52DpwFwP+Br2bp8mRx+ZwnQlI="; - doCheck = false; + + # integration tests expect more file changes + # types tests are missing CodeLocation + excludedPackages = "\\(integration\\|types\\)"; meta = with lib; { - description = "BDD Testing Framework for Go"; - homepage = "https://github.com/onsi/ginkgo"; + homepage = "https://onsi.github.io/ginkgo/"; + changelog = "https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md"; + description = "A Modern Testing Framework for Go"; + longDescription = '' + Ginkgo is a testing framework for Go designed to help you write expressive + tests. It is best paired with the Gomega matcher library. When combined, + Ginkgo and Gomega provide a rich and expressive DSL + (Domain-specific Language) for writing tests. + + Ginkgo is sometimes described as a "Behavior Driven Development" (BDD) + framework. In reality, Ginkgo is a general purpose testing framework in + active use across a wide variety of testing contexts: unit tests, + integration tests, acceptance test, performance tests, etc. + ''; license = licenses.mit; - maintainers = with maintainers; [ saschagrunert ]; + maintainers = with maintainers; [ saschagrunert jk ]; }; } diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index db9aba705cf6..336c24819baf 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-uioL4ysioxo+YMCa3VPoUMpY1cVZJ0Jljt8d9jWRT9k="; + sha256 = "sha256-QmHb5MWZpbZjc93XgdPFabgzT7S522ZN27p6tdL46Y0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/github/bump/default.nix b/pkgs/development/tools/github/bump/default.nix index 487edcde9980..cba623dec790 100644 --- a/pkgs/development/tools/github/bump/default.nix +++ b/pkgs/development/tools/github/bump/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-tgTG/QlDxX1Ns0WpcNjwr/tvsdtgap7RcxX/JuYcxw8="; }; - vendorSha256 = "sha256-2x5rQGEp6ARP2nggE+tvXDRY7AkKCEUXTLEPWDJMCnI="; + vendorSha256 = "sha256-ZeKokW6jMiKrXLfnxwEBF+wLuFQufnPUnA/EnuhvrwI="; doCheck = false; diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 3e5c7b0438fd..adec880eabe0 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -1,6 +1,8 @@ -{ lib, stdenv +{ stdenv +, lib , gettext , fetchurl +, fetchpatch , python3 , meson , ninja @@ -30,6 +32,22 @@ stdenv.mkDerivation rec { sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q"; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:4:5: ERROR: Function does not take positional arguments. + # Taken from https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glade/-/commit/61304b2e8bac8ded76643cb7c3e781f73881dd2b.patch"; + sha256 = "9x6RK8Wgnm8bDxeBLV3PlUkUuH2706Ba9kwE5S87DgE="; + }) + # help/meson.build:6:6: ERROR: Tried to create target "help-glade-da-update-po", but a target of that name already exists. + # Taken from https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/glade/-/commit/04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb.patch"; + sha256 = "j3XfF7P6rndL+0PWqnp+QYph7Ba6bgcp4Pkikr2wuJA="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index fc44efca8289..f3a5ab297eeb 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "go-bindata"; - version = "3.22.0"; + version = "3.23.0"; goPackagePath = "github.com/kevinburke/go-bindata"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "kevinburke"; repo = pname; rev = "v${version}"; - sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x"; + sha256 = "sha256-pIEkD0HD/6JFOzkvEG9j9yQP7hLWvmXU3MiyvVFH2rY="; }; subPackages = [ "go-bindata" ]; diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index b7653aa144e4..d17b2d0c5388 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/pkgs/development/tools/go-repo-root/default.nix @@ -1,16 +1,16 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "go-repo-root"; - version = "20140911-${lib.strings.substring 0 7 rev}"; - rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; + version = "unstable-2014-09-11"; goPackagePath = "github.com/cstrahan/go-repo-root"; - src = fetchgit { - inherit rev; - url = "https://github.com/cstrahan/go-repo-root"; - sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; + src = fetchFromGitHub { + owner = "cstrahan"; + repo = "go-repo-root"; + rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; + sha256 = "sha256-5FVELoUq34KjBl1kzYpExDQFvH2PYQ+dbUOBLSe6n+Y="; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index 0a0eb41d6131..8c340b2ccf6c 100644 --- a/pkgs/development/tools/go-swag/default.nix +++ b/pkgs/development/tools/go-swag/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swag"; - version = "1.6.7"; + version = "1.8.0"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; - rev = "df209afeed2334a97c83aff34ea7abcad85c31f6"; - sha256 = "17pmcfkcmgjvs4drs0fyhp2m39gw83s0ck3rdzdkgdhrbhva9ksx"; + rev = "v${version}"; + sha256 = "sha256-axvc3iwAfsKunheLLKmUThZh27axRh/GJRcKy9EfEBw="; }; - vendorSha256 = "1i2n2sz2hc89nf2fqfq3swldz0xwrnms4j9q0lrss5gm3bk49q7f"; + vendorSha256 = "sha256-QphjiJSQRULphWjrJ8RzrUblTDYL/fYoSNT3+g0tP48="; subPackages = [ "cmd/swag" ]; diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix index 06ae29938198..f96683322443 100644 --- a/pkgs/development/tools/go-swagger/default.nix +++ b/pkgs/development/tools/go-swagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swagger"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "go-swagger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Bw84HQxrI8cSBEM1cxXmWCPqKZa5oGsob2iuUsiAZ+A="; + sha256 = "sha256-sahInHXv1GtylsY8kpw1dDjKiENmq4myx+7mq60vJAI="; }; - vendorSha256 = "sha256-ZNRJZQ7DwT/+scsbSud/IpSX06veOtJ5Aszj0RbS870="; + vendorSha256 = "sha256-KLV6ABo1K+KtAzAQ4FcFiK1LAZEsKup+BtgjRJfonAY="; doCheck = false; diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 05ffe14dd4de..d6e5855d992c 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-E0wMFdLK8lA8oluFQuq7hPMWh4t6OsoJ14d7ErDjAdA="; + sha256 = "sha256-KHeZ0UH7qa+fii+sT7q9ri3DpLOKqQZqCAKQYn4l5M8="; }; - vendorSha256 = "sha256-ClMvbxDKwwoVUC9+AJPZfBxJ26KKuLueUn9Nz/gh4Fs="; + vendorSha256 = "sha256-u+LeH9GijquBeYlA3f2GcyoSP/S7BtBqb8C9OgEA9fY="; doCheck = false; diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index f610b19d79b9..fca346b78c42 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -24,6 +24,8 @@ buildGoModule rec { mv $out/bin/gocode $out/bin/gocode-gomod ''; + doCheck = false; # fails on go 1.17 + meta = with lib; { description = "An autocompletion daemon for the Go programming language"; longDescription = '' diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix index d11cf609328d..096af41ba90d 100644 --- a/pkgs/development/tools/gocyclo/default.nix +++ b/pkgs/development/tools/gocyclo/default.nix @@ -1,28 +1,25 @@ -{ buildGoPackage +{ buildGoModule , lib , fetchFromGitHub }: -buildGoPackage rec { - pname = "gocyclo-unstable"; - version = "2015-02-08"; - rev = "aa8f8b160214d8dfccfe3e17e578dd0fcc6fede7"; - - goPackagePath = "github.com/alecthomas/gocyclo"; +buildGoModule rec { + pname = "gocyclo"; + version = "0.4.0"; src = fetchFromGitHub { - inherit rev; - - owner = "alecthomas"; + owner = "fzipp"; repo = "gocyclo"; - sha256 = "094rj97q38j53lmn2scshrg8kws8c542yq5apih1ahm9wdkv8pxr"; + rev = "v${version}"; + sha256 = "1s9m5m5p76wcxi5n4diz891kd5db4ll21fsh9fnvvf9w7yrmgdw2"; }; + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + meta = with lib; { description = "Calculate cyclomatic complexities of functions in Go source code"; - homepage = "https://github.com/alecthomas/gocyclo"; + homepage = "https://github.com/fzipp/gocyclo"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix index b807006369e5..9c8f5e20b7e5 100644 --- a/pkgs/development/tools/gofumpt/default.nix +++ b/pkgs/development/tools/gofumpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gofumpt"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "mvdan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NkflJwFdVcFTjXkDr8qqAFUlKwGNPTso6hvu7Vikn2U="; + sha256 = "sha256-uXRYVLFDyRZ83mth8Fh+MG9fNv2lUfE3BTljM9v9rjI="; }; - vendorSha256 = "sha256-RZPfdj+rimKGvRZKaXOirkd7ietri55rBofwa/l2z8s="; + vendorSha256 = "sha256-Il1E1yOejLEdKRRMqelGeJbHRjx4qFymf7N98BEdFzg="; doCheck = false; diff --git a/pkgs/development/tools/gokart/default.nix b/pkgs/development/tools/gokart/default.nix index 7722e0b36afe..f7d0857580ef 100644 --- a/pkgs/development/tools/gokart/default.nix +++ b/pkgs/development/tools/gokart/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gokart"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iXdPQkKTRE2BE2yG2KKThpj7HrxXWwBFv2TobEwGLQQ="; + sha256 = "sha256-HsjLNY5Z5UidsLDWSP+1bu3jrfn3oAERPrPV/AkTH8I="; }; - vendorSha256 = "0l5aj7j9m412bgm9n553m2sh9fy9dpzd0bi3qn21gj7bfdcpagnd"; + vendorSha256 = "sha256-S3RukCKAJnPH1KGVdnkgAJQKEDTZYpcMMdoQ4OnHZVg="; # Would need files to scan which are not shipped by the project doCheck = false; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 122b4e0831eb..28b15172e405 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.44.0"; + version = "1.45.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-2hEru7fnc8v7F/RrOB3jFdfLPYLpm0OupzJP6iORs+U="; + sha256 = "sha256-Mr45nJbpyzxo0ZPwx22JW2WrjyjI9FPpl+gZ7NIc6WQ="; }; - vendorSha256 = "sha256-DLvhkTYCaXfNfehEgCNKSKlKaGHo623wBnEhNeTJbmQ="; + vendorSha256 = "sha256-pcbKg1ePN8pObS9EzP3QYjtaty27L9sroKUs/qEPtJo="; doCheck = false; diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index 254113f21064..7a4070d96d6d 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -2,19 +2,17 @@ buildGoModule rec { pname = "gomodifytags"; - version = "1.6.0"; - - vendorSha256 = null; - - doCheck = false; + version = "1.16.0"; src = fetchFromGitHub { owner = "fatih"; repo = "gomodifytags"; rev = "v${version}"; - sha256 = "1wmzl5sk5mc46njzn86007sqyyv6han058ppiw536qyhk88rzazq"; + sha256 = "1yhkn9mdvsn9i5v03c5smz32zlhkylnxhkcbjb7llafxzbhzgfm6"; }; + vendorSha256 = "sha256-8efqJfu+gtoFbhdlDZfb8NsXV9hBDI2pvAQNH18VVhU="; + meta = { description = "Go tool to modify struct field tags"; homepage = "https://github.com/fatih/gomodifytags"; diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/development/tools/google-java-format/default.nix index 2fa6f23be0ef..ddc26be1c647 100644 --- a/pkgs/development/tools/google-java-format/default.nix +++ b/pkgs/development/tools/google-java-format/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.13.0"; + version = "1.15.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-oDask5L/by5mh5EyTCa9c5Y7CWgu1KDUy8EX/W6j/lU="; + sha256 = "sha256-o1a7AjaynFejq2ePF6ewJ6rWA7CWDBg6GPH+Mi5POOo="; }; dontUnpack = true; diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index d541393a8946..069cd2b37fe3 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -1,18 +1,18 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGo118Module, fetchFromGitHub }: -buildGoModule rec { +buildGo118Module rec { pname = "gopls"; - version = "0.7.5"; + version = "0.8.1"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - sha256 = "sha256-2+tbwFkT3Z2dfYCs1Fd/9IqD39VuTMGHQ43b7gBBktM="; + sha256 = "sha256-ypuZQt6iF1QRk/FsoTKnJlb5CWIEkvK7r37t4rSxhmU="; }; modRoot = "gopls"; - vendorSha256 = "sha256-nKjJjtVHk/RLIHI/5v8tO4RcaLLZhr0A6llYGsB0ifQ="; + vendorSha256 = "sha256-SY08322wuJl8F790oXGmYo82Yadi14kDpoVGCGVMF0c="; doCheck = false; diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix index 0131908d0aac..58ff4125c0d0 100644 --- a/pkgs/development/tools/gore/default.nix +++ b/pkgs/development/tools/gore/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gore"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "motemen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uLU4uZaQA9u6BUQZ0Rb4Yqg/oJOZ529gIiOwmmyg05A="; + sha256 = "sha256-ipHvflsVBSjqohV/PliS0s0Nhie4nIP/HgupNH/Yui4="; }; - vendorSha256 = "sha256-/yggEibpQK9Uk116RkE5XbbJe6j4WsIC3GtKPU/P2hU="; + vendorSha256 = "sha256-HrdNWsUVz5G5tG/ZFz2z1Vt4kM12I088/6OIkRFyDl8="; doCheck = false; diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index a7eb80366c4c..ac653db1bf02 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.9.6"; + version = "2.11.0"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eDzLVoOPYm8WG07dfi6s+xtBliCwf1LXoHxQ10YWs1A="; + sha256 = "sha256-AYD45L1FFT/S1toLK489C2TTasTHVXIs4Tf7TLOaye0="; }; - vendorSha256 = "sha256-ELfbdrMMeK6ZG+hnibhHNB+k/Zvkepl+cbUx+E/Dvr8="; + vendorSha256 = "sha256-zzbINVp8EA5aIvwUiFlQRtD6YL0iytbgVzCHbo+clYI="; subPackages = [ "cmd/gosec" diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index 274f7a476c2b..0a55fc66830f 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/default.nix @@ -1,15 +1,15 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gotags"; - version = "20150803-${lib.strings.substring 0 7 rev}"; - rev = "be986a34e20634775ac73e11a5b55916085c48e7"; + version = "unstable-2015-08-03"; goPackagePath = "github.com/jstemmer/gotags"; - src = fetchgit { - inherit rev; - url = "https://github.com/jstemmer/gotags"; - sha256 = "071wyq90b06xlb3bb0l4qjz1gf4nnci4bcngiddfcxf2l41w1vja"; + src = fetchFromGitHub { + owner = "jstemmer"; + repo = "gotags"; + rev = "be986a34e20634775ac73e11a5b55916085c48e7"; + sha256 = "sha256-Su7AA6HCdeZai8+yRSKzlrgXvsSEgrXGot2ABRL2PBw="; }; } diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix index faa2e60aca40..d0d5025b31a4 100644 --- a/pkgs/development/tools/gotests/default.nix +++ b/pkgs/development/tools/gotests/default.nix @@ -1,25 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gotests"; - version = "1.5.3"; - rev = "v${version}"; - - goPackagePath = "github.com/cweill/gotests"; - excludedPackages = "testdata"; - goDeps = ./deps.nix; + version = "1.6.0"; src = fetchFromGitHub { - inherit rev; owner = "cweill"; repo = "gotests"; - sha256 = "1c0hly31ax0wk01zdx0l0yl40xybaizjfb3gjxia2z0mgx330dq9"; + rev = "v${version}"; + sha256 = "sha256-6IzUpAsFUgF2FwiC17OfDn1M+8WYFQPpRyXbkpHIztw="; }; - meta = { + vendorSha256 = "sha256-WMeHZN3s+8pIYEVaSLjI3Bz+rPTWHr1AkZ8lydjBwCw="; + + # tests are broken in nix environment + doCheck = false; + + meta = with lib; { description = "Generate Go tests from your source code"; homepage = "https://github.com/cweill/gotests"; - maintainers = with lib.maintainers; [ vdemeester ]; - license = lib.licenses.asl20; + maintainers = with maintainers; [ vdemeester ]; + license = licenses.asl20; }; } diff --git a/pkgs/development/tools/gotests/deps.nix b/pkgs/development/tools/gotests/deps.nix deleted file mode 100644 index df411303d944..000000000000 --- a/pkgs/development/tools/gotests/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "23463209683dad3f2b9cc7f7c2663e1847c59017"; - sha256 = "1shzfl4zixhj78v4f6y04bcmfl705yr5q8hp72ndbbma0mh09g8f"; - }; - } -] diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 285d546d7421..ea79baa96a70 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,14 +1,13 @@ { lib, buildGoModule, fetchgit }: buildGoModule rec { - pname = "gotools-unstable"; - version = "2021-01-13"; - rev = "8b4aab62c064010e8e875d2e5a8e63a96fefc87d"; + pname = "gotools"; + version = "0.1.10"; src = fetchgit { - inherit rev; + rev = "v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "1cmnm9fl2a6hiplj8s6x0l3czcw4xh3j3lvzbgccnp1l8kz8q2vm"; + sha256 = "sha256-r71+//VhayW18uvMl/ls/8KYNbZ7uDZw3SWoqPL3Xqk="; }; # The gopls folder contains a Go submodule which causes a build failure. @@ -25,7 +24,7 @@ buildGoModule rec { rm -rf gopls ''; - vendorSha256 = "18qpjmmjpk322fvf81cafkpl3spv7hpdpymhympmld9isgzggfyz"; + vendorSha256 = "sha256-UJIXG8WKzazNTXoqEFlT/umC40F6z2Q5I8RfxnMbsPM="; doCheck = false; @@ -53,4 +52,11 @@ buildGoModule rec { # Do not copy this without a good reason for enabling # In this case tools is heavily coupled with go itself and embeds paths. allowGoReference = true; + + meta = with lib; { + description = "Additional tools for Go development"; + homepage = "http://go.googlesource.com/tools"; + license = licenses.bsd3; + maintainers = with maintainers; [ danderson ]; + }; } diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix index b8242cc3cd87..a5247a3f80da 100644 --- a/pkgs/development/tools/gron/default.nix +++ b/pkgs/development/tools/gron/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { }) ]; - vendorSha256 = "0va88c3rjlc2nbpqx4ila36rwrx57wcdhig4jp9q58vv4zqc2yxy"; + vendorSha256 = "sha256-Evn5R/LzripRgG0zOVP/DJrtjwNRwgKapsRdtZaZhlU="; meta = with lib; { description = "Make JSON greppable!"; diff --git a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index 6ac6605797eb..8d6e19124711 100644 --- a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -1,14 +1,14 @@ -{ mkDerivation, base, containers, fetchgit, hedgehog, lib +{ mkDerivation, base, containers, fetchFromGitHub, hedgehog, lib , optparse-applicative, parsec, template-haskell, text }: mkDerivation { pname = "dconf2nix"; version = "0.0.11"; - src = fetchgit { - url = "https://github.com/gvolpe/dconf2nix.git"; - sha256 = "1kv88bxi7l5kcm66m5y85b8fz1zsdshvw37k715g2biwa0an5s6f"; + src = fetchFromGitHub { + owner = "gvolpe"; + repo = "dconf2nix"; rev = "fe7e3d973caa87b1b706096aff3d670f65e39fda"; - fetchSubmodules = true; + sha256 = "sha256-zuhiFVA8LvFKOPMMvqFu+ofv0CrIl2pMZbPQE/tCaM8="; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 2b5f6c4da80e..8c8f016510f2 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,5 +1,11 @@ -{ lib, supportedGhcVersions ? [ "884" "8107" "902" ], stdenv, haskellPackages -, haskell }: +{ lib +, stdenv +, supportedGhcVersions ? [ "884" "8107" "902" ] + ++ lib.optionals (!stdenv.hostPlatform.isAarch64) [ "921" ] +, dynamic ? false +, haskellPackages +, haskell +}: # # The recommended way to override this package is # @@ -8,19 +14,23 @@ # for example. Read more about this in the haskell-language-server section of the nixpkgs manual. # let - inherit (lib) concatStringsSep concatMapStringsSep take splitString; + inherit (lib) concatStringsSep concatMapStringsSep take splitString pipe optionals; + inherit (haskell.lib.compose) justStaticExecutables overrideCabal enableCabalFlag disableCabalFlag; getPackages = version: haskell.packages."ghc${version}"; tunedHls = hsPkgs: - haskell.lib.compose.justStaticExecutables - (haskell.lib.compose.overrideCabal (old: { - postInstall = '' - remove-references-to -t ${hsPkgs.ghc} $out/bin/haskell-language-server - remove-references-to -t ${hsPkgs.shake.data} $out/bin/haskell-language-server - remove-references-to -t ${hsPkgs.js-jquery.data} $out/bin/haskell-language-server - remove-references-to -t ${hsPkgs.js-dgtable.data} $out/bin/haskell-language-server - remove-references-to -t ${hsPkgs.js-flot.data} $out/bin/haskell-language-server - ''; - }) hsPkgs.haskell-language-server); + lib.pipe hsPkgs.haskell-language-server ([ + (haskell.lib.compose.overrideCabal (old: { + enableSharedExecutables = dynamic; + ${if !dynamic then "postInstall" else null} = '' + ${old.postInstall or ""} + + remove-references-to -t ${hsPkgs.ghc} $out/bin/haskell-language-server + ''; + })) + ((if dynamic then enableCabalFlag else disableCabalFlag) "dynamic") + ] ++ optionals (!dynamic) [ + justStaticExecutables + ]); targets = version: let packages = getPackages version; in [ diff --git a/pkgs/development/tools/haskell/hyper-haskell/server.nix b/pkgs/development/tools/haskell/hyper-haskell/server.nix index 47a9c550fa8b..b8e5aa281eaa 100644 --- a/pkgs/development/tools/haskell/hyper-haskell/server.nix +++ b/pkgs/development/tools/haskell/hyper-haskell/server.nix @@ -3,7 +3,8 @@ let hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self); in stdenv.mkDerivation { - name = "hyper-haskell-server-with-packages-${hyperHaskellEnv.version}"; + pname = "hyper-haskell-server-with-packages"; + version = hyperHaskellEnv.version; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix index 72d5469f0f99..4f51c8238ce0 100644 --- a/pkgs/development/tools/haskell/vaultenv/default.nix +++ b/pkgs/development/tools/haskell/vaultenv/default.nix @@ -28,13 +28,13 @@ }: mkDerivation rec { pname = "vaultenv"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "channable"; repo = "vaultenv"; rev = "v${version}"; - sha256 = "sha256-17tdlqG8z4GviI7kkLbktC6SqnQFDdZhWtejscG0n48="; + sha256 = "sha256-sH4iaKQXgwI/WISXzMR7xqh9Dyx61U/gjYn7exgUetI="; }; buildTools = [ hpack ]; diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 205cf4e33db5..bf212008789a 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.59.0"; + version = "7.59.2"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "0whkm8xi918m4y0wjdbma42kl4cc6chakjn5chi75aqd5y3qanpp"; + sha256 = "dbb69d4b5df99ff47ed0f6f1f58d968b3b144b13deee1b33c82fef7ef4006903"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/java/sawjap/default.nix b/pkgs/development/tools/java/sawjap/default.nix index 13532c48d401..b4c682bbd220 100644 --- a/pkgs/development/tools/java/sawjap/default.nix +++ b/pkgs/development/tools/java/sawjap/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit (sawja) src version; - sourceRoot = "source/test"; + prePatch = "cd test"; buildInputs = [ ocaml findlib sawja ]; diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index b9020f2cc0ed..ee72bc62efae 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.1.1"; + version = "2.1.2"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "sha256-LXMPdzIOFPzFUx3uufx+2UeJ6mg/9kJXGews4KU3rrU="; + sha256 = "sha256-khbXzdsC0PA10HEu/dIFQ87+QbKpctmTUTt/zEuxV6c="; }; desktopItem = makeDesktopItem { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { comment = "Java Troubleshooting Tool"; desktopName = "VisualVM"; genericName = "Java Troubleshooting Tool"; - categories = "Development;"; + categories = [ "Development" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 0bbd46b4294c..fbaa9fd1dba7 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.82.1"; + version = "0.92.2"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-C2zsIJvna7iqcaCM4phJonbA9TALL89rACms5II9hhU="; + sha256 = "0gbdbjyyh2if3yfmwfd6d3yq8r25inhw7n44jbjw1pdqb6gk44z1"; }; nativeBuildInputs = [ makeWrapper ]; @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall rm bin/jbang.{cmd,ps1} - rmdir tmp cp -r . $out wrapProgram $out/bin/jbang \ --set JAVA_HOME ${jdk} \ diff --git a/pkgs/development/tools/jd-diff-patch/default.nix b/pkgs/development/tools/jd-diff-patch/default.nix index dae3cbea3e3d..96fd79d62fc6 100644 --- a/pkgs/development/tools/jd-diff-patch/default.nix +++ b/pkgs/development/tools/jd-diff-patch/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "jd-diff-patch"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "josephburnett"; repo = "jd"; rev = "v${version}"; - sha256 = "sha256-OAy4IS2JZYYPeJITNHZKiYEapzGqqYPDBCLflLYetzg="; + sha256 = "sha256-nYV72EgYgXWyGp2s09BlaRmOy6aSMtmrTvWCxk9znp0="; }; # not including web ui excludedPackages = [ "gae" "pack" ]; - vendorSha256 = "sha256-w3mFra7Je+8qIDQMSyUYucoLZ6GtrZmr56O6xmihIYc="; + vendorSha256 = "sha256-uoMOkCmJY417zxkTsXHGy+BZ/BH29nH4MhFaIKofh4k="; doCheck = true; diff --git a/pkgs/development/tools/jd/default.nix b/pkgs/development/tools/jd/default.nix index 96d2807b9ab9..f6ed3f59ac0d 100644 --- a/pkgs/development/tools/jd/default.nix +++ b/pkgs/development/tools/jd/default.nix @@ -1,16 +1,16 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "jd"; version = "0.3.1"; - rev = "2729b5af166cfd72bd953ef8959b456c4db940fc"; goPackagePath = "github.com/tidwall/jd"; - src = fetchgit { - inherit rev; - url = "https://github.com/tidwall/jd"; - sha256 = "0dj4k38pf80dl77jns29vx2dj265s4ksg2q2s9n240b7b8z8mn5h"; + src = fetchFromGitHub { + owner = "tidwall"; + repo = "jd"; + rev = "2729b5af166cfd72bd953ef8959b456c4db940fc"; + sha256 = "sha256-sNiKPlpnASJs0gKLpyfRxQjZRN9JaCvPoQ0gd9GYRDY="; }; meta = with lib; { diff --git a/pkgs/development/tools/jfmt/default.nix b/pkgs/development/tools/jfmt/default.nix new file mode 100644 index 000000000000..cf1292b4b121 --- /dev/null +++ b/pkgs/development/tools/jfmt/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "jfmt"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "scruffystuffs"; + repo = "${pname}.rs"; + rev = version; + sha256 = "07qb0sjwww6d2n7fw8w4razq1mkn4psrs9wqi1ccndrya1y39d8b"; + }; + + cargoSha256 = "19kg2n53y9nazwpp8gcvdprxry2llf2k7g4q4zalyxkhpf7k6irb"; + + meta = with lib; { + description = "CLI utility to format json files"; + homepage = "https://github.com/scruffystuffs/jfmt.rs"; + license = licenses.mit; + maintainers = [ maintainers.psibi ]; + }; +} diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix new file mode 100644 index 000000000000..558c9e019e19 --- /dev/null +++ b/pkgs/development/tools/jless/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, rustPlatform, stdenv, python3, AppKit, libxcb }: + +rustPlatform.buildRustPackage rec { + pname = "jless"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "PaulJuliusMartinez"; + repo = "jless"; + rev = "v${version}"; + sha256 = "sha256-NB/s29M46mVhTsJWFYnBgJjSjUVbfdmuz69VdpVuR7c="; + }; + + cargoSha256 = "sha256-cPj9cTRhWK/YU8Cae63p4Vm5ohB1IfGL5fu7yyFGSXA="; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ python3 ]; + + buildInputs = [ ] + ++ lib.optionals stdenv.isDarwin [ AppKit ] + ++ lib.optionals stdenv.isLinux [ libxcb ]; + + meta = with lib; { + description = "A command-line pager for JSON data"; + homepage = "https://jless.io"; + license = licenses.mit; + maintainers = with maintainers; [ jfchevrette zowoq ]; + }; +} diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix index f1f5b37c10dc..ba78a4ce6bcc 100644 --- a/pkgs/development/tools/jp/default.nix +++ b/pkgs/development/tools/jp/default.nix @@ -1,18 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "jp"; - version = "0.1.3"; - rev = version; - - goPackagePath = "github.com/jmespath/jp"; + version = "0.2.1"; src = fetchFromGitHub { - inherit rev; + rev = version; owner = "jmespath"; repo = "jp"; - sha256 = "0fdbnihbd0kq56am3bmh2zrfk4fqjslcbm48malbgmpqw3a5nvpi"; + hash = "sha256-a3WvLAdUZk+Y+L+opPDMBvdN5x5B6nAi/lL8JHJG/gY="; }; + + vendorSha256 = "sha256-K6ZNtART7tcVBH5myV6vKrKWfnwK8yTa6/KK4QLyr00="; + meta = with lib; { description = "A command line interface to the JMESPath expression language for JSON"; homepage = "https://github.com/jmespath/jp"; diff --git a/pkgs/development/tools/jpexs/default.nix b/pkgs/development/tools/jpexs/default.nix index 5c3e2046bdb4..8c0d20d328d2 100644 --- a/pkgs/development/tools/jpexs/default.nix +++ b/pkgs/development/tools/jpexs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jpexs"; - version = "11.3.0"; + version = "15.0.0"; src = fetchzip { url = "${meta.homepage}/releases/download/version${version}/ffdec_${version}.zip"; - sha256 = "0d1xmq21vdpn0glwfzr00s62ic8jynmgmgxl0m1834xqf3ma0ihv"; + sha256 = "1w8sh0dzln6mxcbibyw6r9f9c8g0cbwxq4qbm5kawq00yydvwfza"; stripRoot = false; }; @@ -36,10 +36,8 @@ stdenv.mkDerivation rec { desktopName = "JPEXS Free Flash Decompiler"; genericName = "Flash Decompiler"; comment = meta.description; - categories = "Development;Java;"; - extraEntries = '' - StartupWMClass=com-jpexs-decompiler-flash-gui-Main - ''; + categories = [ "Development" "Java" ]; + startupWMClass = "com-jpexs-decompiler-flash-gui-Main"; }; meta = with lib; { diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index f18d09bf7d0e..5671f5dbe641 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -72,6 +72,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin globin ]; platforms = platforms.unix; downloadPage = "https://stedolan.github.io/jq/download/"; - updateWalker = true; }; } diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 2dd2b0cdc262..d7f557edfb01 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "3.0.6"; + version = "3.1.3"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3WLbFKK4gRpPjU/qnfRYGvI2o/ASPph8I2ISEbahpCM="; + sha256 = "sha256-kYAVgQa5NAfZ7EVzO/3fW3A5Zl8uaFXguvxBco8DfRY="; }; - cargoSha256 = "sha256-SYsT4/UaUCgmHJPWfSBf1EBJ7aOiRtWDAFjYEhtI2X4="; + cargoSha256 = "sha256-Mz+1A7Wg7sh0pxg7umRym3UkXsMkRE0AQDTkt+e7l+s="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 79c726c27964..c11d386d7464 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -1,29 +1,29 @@ -{ lib, fetchFromGitHub, stdenv, rustPlatform, coreutils, bash, installShellFiles, libiconv }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, coreutils +, bash +, installShellFiles +, libiconv +}: rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.10.5"; + version = "1.1.1"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-PbWV8It/ubDbZooJdt/KWihnp221Pexs0U6zMa8KSMw="; + sha256 = "sha256-hgXMWQ7UlGyeb/j7V/Uw4gZjk/r1hA7lMjVL8i8st7o="; }; - cargoSha256 = "sha256-VRfk6566SNmvCxtD9EdDxDdBvQuEfjPVggXzt4VoYRg="; + + cargoSha256 = "sha256-QJruh4voCB/q7xh5I6XnVtKA4Jbn9U84Mt2pHte7Kog="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - postInstall = '' - installManPage man/just.1 - - installShellCompletion --cmd just \ - --bash completions/just.bash \ - --fish completions/just.fish \ - --zsh completions/just.zsh - ''; - checkInputs = [ coreutils bash ]; preCheck = '' @@ -48,10 +48,17 @@ rustPlatform.buildRustPackage rec { "--skip=edit" # trying to run "vim" fails as there's no /usr/bin/env or which in the sandbox to find vim and the dependency is not easily patched "--skip=run_shebang" # test case very rarely fails with "Text file busy" "--skip=invoke_error_function" # wants JUST_CHOOSER to be fzf - "--skip=status_error" # "exit status" instead of "exit code" - "--skip=exit_status" # "exit status" instead of "exit code" ]; + postInstall = '' + installManPage man/just.1 + + installShellCompletion --cmd just \ + --bash completions/just.bash \ + --fish completions/just.fish \ + --zsh completions/just.zsh + ''; + meta = with lib; { homepage = "https://github.com/casey/just"; changelog = "https://github.com/casey/just/blob/${version}/CHANGELOG.md"; diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 82ae89a699e3..66ff4a8b2df4 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.35.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mSVU/0OdlEfGWxO6Gn/Ji7k2pMO5jWTfxFujN08bZjU="; + sha256 = "sha256-5pxOg+pwa2VrEWinDadx2ZFYXiQgochbU4bCkJEezQw="; }; subPackages = [ "./" ]; diff --git a/pkgs/development/tools/kaf/default.nix b/pkgs/development/tools/kaf/default.nix new file mode 100644 index 000000000000..feb76c2a0b25 --- /dev/null +++ b/pkgs/development/tools/kaf/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kaf"; + version = "0.1.44"; + + src = fetchFromGitHub { + owner = "birdayz"; + repo = "kaf"; + rev = "v${version}"; + sha256 = "sha256-gKg/iESUXS6l3v5ovdvvrfpvaUzahPtqh0/DH5OpXoY="; + }; + + vendorSha256 = "sha256-5WzREsQdcp9lelKUEXw+nHeemHBDsKrvRcG9v+qln/E="; + + # Many tests require a running Kafka instance + doCheck = false; + + meta = with lib; { + description = "Modern CLI for Apache Kafka, written in Go"; + homepage = "https://github.com/birdayz/kaf"; + license = licenses.asl20; + maintainers = with maintainers; [ zarelit ]; + }; +} diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index 9cd1c976162f..fc604a68ceea 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -11,9 +11,7 @@ buildGoModule rec { sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls"; }; - vendorSha256 = "0whqrms5mc7v14p2h1jfvkawm30xaylivijlsghrsaq468qcgg15"; - - doCheck = false; + vendorSha256 = "0zj2hls8m0l9xsfv680wiwq1g2qjdjslv2yx3yd4rzxdsv2wz09a"; subPackages = [ "." ]; diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index ab206a090bb1..f7add96fbad9 100644 --- a/pkgs/development/tools/ko/default.nix +++ b/pkgs/development/tools/ko/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ko"; - version = "0.9.3"; + version = "0.11.2"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cIrlhhk5Lt0Qt7q7rKw8EXrJqZWZEjrEUyHOvHiT6bs="; + sha256 = "sha256-BwK49dSt3D2BrYvluDOBYIH5qEt59HC1hssHl1D2Heg="; }; vendorSha256 = null; @@ -40,8 +40,9 @@ buildGoModule rec { postInstall = '' installShellCompletion --cmd ko \ - --bash <($out/bin/ko completion) \ - --zsh <($out/bin/ko completion --zsh) + --bash <($out/bin/ko completion bash) \ + --fish <($out/bin/ko completion fish) \ + --zsh <($out/bin/ko completion zsh) ''; meta = with lib; { diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix index 341df436e294..d83f6db701a8 100644 --- a/pkgs/development/tools/konstraint/default.nix +++ b/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.15.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vt8/hYsThBoAxMglF8pjdVphmkbHXsuzaHFJhnGXdU4="; + sha256 = "sha256-UHdmC6UoDxl/GfvUOmuBctPpxIYljOurnm1J3eEPFHA="; }; - vendorSha256 = "sha256-3m+mN90Edb/yMgVmkokRQrDM2EdB7cb2opL0QZJ8L+U="; + vendorSha256 = "sha256-UssvmmZhq+SO3cPpZi3Diji7tIxrpyhqNIBajqzRjh8="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/pkgs/development/tools/krew/default.nix b/pkgs/development/tools/krew/default.nix index 69efbb3d209b..78e9f91b3af8 100644 --- a/pkgs/development/tools/krew/default.nix +++ b/pkgs/development/tools/krew/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "krew"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "krew"; rev = "v${version}"; - sha256 = "sha256-P4b8HMkqxzYKz9OgI4pNCjR9Wakh+kIIAnUAkayzGEo="; + sha256 = "sha256-aW9yASskwDt+5Lvsdju9ZR/HeZ4x8heWljdhqK0ZTx8="; }; - vendorSha256 = "sha256-FQQCHq9f0yY8vSsvWIR7WKq+0c+dgGEnoQmXtoN6Ep0="; + vendorSha256 = "sha256-VXGjKzkOpaxyJClwXbxg15xmGdFi6arH8f4nN5/1SA4="; subPackages = [ "cmd/krew" ]; diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 21ab6ddf188f..ad41cf6e4af7 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.43.2"; + version = "0.45.1"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "sha256-HXTkYwN6U8xyxgFnj69nLSpbDCqWUWeSuqlZbquRD6o="; + sha256 = "sha256-fEMLZ8lV1RNFlf5ApfJOG9jI8JumpgP673+XSOWgsKI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/kube-linter/default.nix b/pkgs/development/tools/kube-linter/default.nix index 1b94b956293d..d234e458c184 100644 --- a/pkgs/development/tools/kube-linter/default.nix +++ b/pkgs/development/tools/kube-linter/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-linter"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "stackrox"; repo = pname; rev = "${version}"; - sha256 = "GUDrUEBorV4/ZqPnfNYcsbW4Zr1LpS3yL+4OgxFbTOk="; + sha256 = "nBF/AX4hgZxIj9/RYowpHX1eAJMMhvU7wunvEXWnO80="; }; - vendorSha256 = "xGghTP9thICOGIfc5VPJK06DeXfLiTckwa4nXv83/P8="; + vendorSha256 = "HJW28BZ9qFLtdH1qdW8/K4TzHA2ptekXaMF0XnMKbOY="; ldflags = [ "-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}" diff --git a/pkgs/development/tools/kubepug/default.nix b/pkgs/development/tools/kubepug/default.nix index d14ba450103a..82a130181e0c 100644 --- a/pkgs/development/tools/kubepug/default.nix +++ b/pkgs/development/tools/kubepug/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "kubepug"; version = "1.3.2"; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index f82c20dccf8e..dcaafe676e9a 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "4.4.1"; + version = "4.5.3"; # rev is the commit of the tag, mainly for kustomize version command output rev = "b2d65ddc98e09187a8e38adc27c30bab078c1dbf"; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "sha256-gq5SrI1f6ctGIL0Arf8HQMfgnlglwWlsn1r27Ug70gs="; + sha256 = "sha256-sy429uTTYvjnweZlsuolBamcggRXmaR8uxD043GUIQE="; }; doCheck = true; @@ -25,7 +25,7 @@ buildGoModule rec { # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "sha256-2GbRk7A8VwGONmL74cc2TA+MLyJrSSOQPLaded5s90k="; + vendorSha256 = "sha256-5kMMSr+YyuoASgW+qzkyO4CcDHFFANcsAZTUqHX5nGk="; meta = with lib; { description = "Customization of kubernetes YAML configurations"; diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 04024dc3acfb..4b5e6d8bb388 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZCEgv+2WC1XLDFdRtigkiWu81zLMHvmB8vvIBWN2UYY="; + sha256 = "sha256-6mLfMbYbdsjWHpfUHP3Q5nsqdMXo/82+A9PV8xWZBM0="; }; - vendorSha256 = "sha256-LFa0s2FBkw97P0CV+9JBmUAjaKVO+RzCX+iWGPUD9iA="; + vendorSha256 = "sha256-aRS+MwME72qIMyhnnIRqmrx5hcQ1V0pLIBJqSoR+Fkk="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 5eb03edd6d02..4dca5d98e0b6 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.32.2"; + version = "0.34"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tawsBfHz6gq8va9YLtCwp9Ec8EWcvhdbYwdVtvvtJeY="; + sha256 = "sha256-AXbbgNP10r3BVRXg9R8Ssd8yORCcQwaGRuHV6yXz5i0="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/license_finder/Gemfile b/pkgs/development/tools/license_finder/Gemfile new file mode 100644 index 000000000000..0a936674240b --- /dev/null +++ b/pkgs/development/tools/license_finder/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'license_finder' diff --git a/pkgs/development/tools/license_finder/Gemfile.lock b/pkgs/development/tools/license_finder/Gemfile.lock new file mode 100644 index 000000000000..9adea6fc73ff --- /dev/null +++ b/pkgs/development/tools/license_finder/Gemfile.lock @@ -0,0 +1,26 @@ +GEM + remote: https://rubygems.org/ + specs: + license_finder (7.0.1) + bundler + rubyzip (>= 1, < 3) + thor (~> 1.2) + tomlrb (>= 1.3, < 2.1) + with_env (= 1.1.0) + xml-simple (~> 1.1.9) + rexml (3.2.5) + rubyzip (2.3.2) + thor (1.2.1) + tomlrb (2.0.1) + with_env (1.1.0) + xml-simple (1.1.9) + rexml + +PLATFORMS + ruby + +DEPENDENCIES + license_finder + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/development/tools/license_finder/default.nix b/pkgs/development/tools/license_finder/default.nix new file mode 100644 index 000000000000..954e2dcd5183 --- /dev/null +++ b/pkgs/development/tools/license_finder/default.nix @@ -0,0 +1,19 @@ +{ lib, bundlerEnv, bundlerUpdateScript, ruby }: + +bundlerEnv { + pname = "license_finder"; + version = "7.0.1"; + + inherit ruby; + gemdir = ./.; + + passthru.updateScript = bundlerUpdateScript "license_finder"; + + meta = with lib; { + description = "Find licenses for your project's dependencies"; + homepage = "https://github.com/pivotal/licensefinder"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/license_finder/gemset.nix b/pkgs/development/tools/license_finder/gemset.nix new file mode 100644 index 000000000000..89becfc04d35 --- /dev/null +++ b/pkgs/development/tools/license_finder/gemset.nix @@ -0,0 +1,74 @@ +{ + license_finder = { + dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sig4ifxzvcz3fwjnz93dpv61v6sxpmlknj5f8n112ragrbcj8hb"; + type = "gem"; + }; + version = "7.0.1"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + type = "gem"; + }; + version = "1.2.1"; + }; + tomlrb = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a83cb5xpyzlr651d46rk5xgq37s46hs9nfqy9baawzs31hm9k2g"; + type = "gem"; + }; + version = "2.0.1"; + }; + with_env = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh"; + type = "gem"; + }; + version = "1.1.0"; + }; + xml-simple = { + dependencies = ["rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb9plyl71mdbjr4kllfy53qx6g68ryxblmnq9dilvy837jk24fj"; + type = "gem"; + }; + version = "1.1.9"; + }; +} diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 88b2f63fd5a5..1582ca874026 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -1,13 +1,15 @@ -{ lib, stdenv, fetchgit, ldc, dub }: +{ lib, stdenv, fetchFromGitHub, ldc, dub }: stdenv.mkDerivation { pname = "Literate"; version = "unstable-2021-01-22"; - src = fetchgit { - url = "https://github.com/zyedidia/Literate.git"; + src = fetchFromGitHub { + owner = "zyedidia"; + repo = "Literate"; rev = "7004dffec0cff3068828514eca72172274fd3f7d"; - sha256 = "0x4xgrdskybaa7ssv81grmwyc1k167v3nwj320jvp5l59xxlbcvs"; + sha256 = "sha256-erNFe0+FlrslEENyO/YxYQbmec0voK31UWr5qVt+nXQ="; + fetchSubmodules = true; }; buildInputs = [ ldc dub ]; diff --git a/pkgs/development/tools/mani/default.nix b/pkgs/development/tools/mani/default.nix index 1615c798286c..aa047c2471c7 100644 --- a/pkgs/development/tools/mani/default.nix +++ b/pkgs/development/tools/mani/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mani"; - version = "0.11.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "alajmo"; repo = "mani"; rev = "v${version}"; - sha256 = "sha256-9SvjgXQADDNyv8O9KKE3gKXu67Nz5LepayUXSbWwEoY="; + sha256 = "sha256-sjudHGqSCgwafyT8alrGvTdC3yM2zmbRcYshxSm23Ko="; }; - vendorSha256 = "sha256-cuAZN08A2nND9d4c9w+kTqiMB9yaJ49Q0aT/V0J9FRw="; + vendorSha256 = "sha256-NnXQAf8m2cGLvwSOzQWXffiG1zyVqDPQnGAeqe7EUHY="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/development/tools/mars-mips/default.nix b/pkgs/development/tools/mars-mips/default.nix index 6bca1fa64eee..fa98ab9da8f1 100644 --- a/pkgs/development/tools/mars-mips/default.nix +++ b/pkgs/development/tools/mars-mips/default.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { exec = "mars-mips"; icon = "mars-mips"; comment = "An IDE for programming in MIPS assembly language"; - categories = "Development;IDE;"; + categories = [ "Development" "IDE" ]; }) ]; @@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation rec { description = "An IDE for programming in MIPS assembly language intended for educational-level use"; homepage = "https://courses.missouristate.edu/KenVollmar/MARS/"; license = licenses.mit; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/mask/default.nix b/pkgs/development/tools/mask/default.nix index 25ab4ceab5f5..ed1b80787c4e 100644 --- a/pkgs/development/tools/mask/default.nix +++ b/pkgs/development/tools/mask/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mask"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "jakedeichert"; repo = pname; rev = "v${version}"; - sha256 = "0gsfs837nzh71df6p6klcsgxp471c8hq14xqd62q5bsv7jg9dygc"; + sha256 = "sha256-qRN9M/DxkxcF1/dmYqmf3qB8yHzuaN3LRENy1ehgg0c="; }; - cargoSha256 = "1h4sasqdl3rli0v6lizdci0vvr2fvbyhllddxwv8vx8r7w9ry963"; + cargoSha256 = "sha256-7ts63n9aGtaK8INBh11TShOQCVpV+82VADmNbKURv+g="; # tests require mask to be installed doCheck = false; diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index f88fcd9f4290..a52a2a141c39 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -2,15 +2,19 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.7.0"; + version = "0.7.3"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Zl0OuyqF+bNsp1AqnS8jhQlY7l4U6OjHHgth7pRPwEc="; + sha256 = "sha256-PsTQuEbo1ReWwZV4D14mEGsU99j49kleiL/6Xyk+g9s="; }; + ldflags = [ + "-X github.com/equinix/metal-cli/cmd.Version=${version}" + ]; + vendorSha256 = "sha256-F8d5i9jvjY11Pv6w0ZXI3jr0Wix++B/w9oRTuJGpQfE="; doCheck = false; diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 3d4eb2c7788f..a4fd0ee23380 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.11.1"; + version = "0.11.2"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-wYIuRTvkPqS4SE5RnkBgmLCwmNv+cYB/iPb9TYip9s0="; + outputHash = "sha256-sriiHgKs2hC8inBGWuLM9qFfGgtcYqKHh0VZWNmg51U="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 06a6bd3dfd54..131c899dcfb9 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, flex, bison }: stdenv.mkDerivation rec { pname = "minizinc"; - version = "2.5.5"; + version = "2.6.1"; nativeBuildInputs = [ cmake flex bison ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "MiniZinc"; repo = "libminizinc"; rev = version; - sha256 = "sha256-9z2E6KqOys9UUXlXWB4eDhg34kS3PhUB1Dd1F6iGYoE="; + sha256 = "sha256-JCR2wvtMNyHBIIqrH5eBc0CIOVyo8mnPUZXtwjJt3sw="; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 43bcaa57309d..10fc62fdeffa 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.25"; + version = "0.2.26"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Eo5uWBLriYa7tLpPMa34+l6BYQe9useL1tN9gqUSt0k="; + sha256 = "sha256-DBiBJf4hEjn/sJXjAvsiARWz66sDBIz0hFEdCgS8D4g="; }; - vendorSha256 = "sha256-1v87WcQoVyTyCStiMAoThidIMRqJwdsYNF987kQp5YM="; + vendorSha256 = "sha256-5RvFdtEZEQBWvkUKIcV/A+tCSy9V9DJj4HujGQgTxq0="; doCheck = false; diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index dc36028332ff..4ff990ca0ed2 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, m4, perl, xz }: +{ lib, stdenv, fetchurl, m4, perl }: stdenv.mkDerivation rec { pname = "autoconf"; @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh"; }; - nativebuildInputs = [ xz ]; buildInputs = [ m4 perl ]; doCheck = true; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 0d7ff5a54656..8d759457fa11 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -94,7 +94,8 @@ stdenv.mkDerivation { # indeed GHC will refuse to compile with a binutils suffering from it. See # this comment for more information: # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 - lib.optional (stdenv.targetPlatform.isAarch32 && stdenv.hostPlatform.system != stdenv.targetPlatform.system) ./R_ARM_COPY.patch; + lib.optional (stdenv.targetPlatform.isAarch32 && stdenv.hostPlatform.system != stdenv.targetPlatform.system) ./R_ARM_COPY.patch + ++ lib.optional stdenv.targetPlatform.isWindows ./windres-locate-gcc.patch; outputs = [ "out" "info" "man" ]; diff --git a/pkgs/development/tools/misc/binutils/windres-locate-gcc.patch b/pkgs/development/tools/misc/binutils/windres-locate-gcc.patch new file mode 100644 index 000000000000..721667c62cec --- /dev/null +++ b/pkgs/development/tools/misc/binutils/windres-locate-gcc.patch @@ -0,0 +1,19 @@ +diff --git a/binutils/resrc.c b/binutils/resrc.c +index a875c3a4..0411d047 100644 +--- a/binutils/resrc.c ++++ b/binutils/resrc.c +@@ -521,7 +521,13 @@ read_rc_file (const char *filename, const char *preprocessor, + + cpp_pipe = 0; + +- if (dash) ++ /* Nixpkgs specific : look first at the prefixed path ++ ( there should be no gcc in the binutils folder ) */ ++ if (slash && dash) { ++ cpp_pipe = look_for_default(cmd, slash + 1, dash - slash, preprocargs, filename); ++ } ++ ++ if (dash && ! cpp_pipe) + { + /* First, try looking for a prefixed gcc in the windres + directory, with the same prefix as windres */ diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 31ea03a2f868..cffc73b2dce1 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -19,11 +19,11 @@ let }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.71.0"; + version = "1.75.0"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "8LsYkzNy98qQ9niXrRCkL47Ouyd33ZICnSXx29WIWl4="; + sha256 = "MsmQJSEr1GOqzw2jq77ZJn13AYqMIGY+yez6dMxyOMo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 10e11391cd35..8b5e61580590 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -15,13 +15,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.5.1"; + version = "4.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-AmzfBuase3RDoRVswyIgBnyL5TK0LXEGmYIpDzsCwgs="; + sha256 = "011i1aczv4nixq4gvjixcd73df2xplcrldfv0w12yaz5iy4vaw6b"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index 92a812d5a212..ab9966c6fca6 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cflow"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1mzd3yf0dfv8h2av5vsxxlhpk21nw064h91b2kgfrdz92r0pnj1l"; + sha256 = "sha256-0BFGyvkAHiZhM0F8KoJYpktfwW/LCCoU9lKCBNDJcIY="; }; patchPhase = '' diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index 0e92d373c0b3..62d26c09e514 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cgdb"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { url = "https://cgdb.me/files/${pname}-${version}.tar.gz"; - sha256 = "1671gpz5gx5j0zga8xy2x7h33vqh3nij93lbb6dbb366ivjknwmv"; + sha256 = "sha256-DTi1JNN3JXsQa61thW2K4zBBQOHuJAhTQ+bd8bZYEfE="; }; buildInputs = [ ncurses readline flex texinfo ]; @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { homepage = "https://cgdb.github.io/"; - repositories.git = "git://github.com/cgdb/cgdb.git"; - license = licenses.gpl2Plus; platforms = with platforms; linux ++ cygwin; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 77fe16c442d3..5184f22aecdc 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.16535"; + version = "0.1.16947"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IsFvUWNuQsECh47M6wDpuyDYXrKKaZp2SSmEGFryzM0="; + sha256 = "sha256-RGkC1XhrssrX4IBh1OrzEowvbPPUK7jXZxxa+FEV/WE="; }; - vendorSha256 = "sha256-efrjHwHobML/t2lDSFx+UyAOca9dHjZHcAxkFzJqWEo="; + vendorSha256 = "sha256-7u2y1yBVpXf+D19tslD4s3B1KmABl4OWNzzLaBNL/2U="; doCheck = false; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 7bf32a13ce68..4d39387991b1 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,28 +2,20 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.01.22-01.31.09"; + version = "2022.03.26-18.47.08"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-xQSOJRKKjX3AfQsYe4UNhFlLgWPkoY8NOPXCO1oc3BI="; + sha256 = "sha256-tlI4h9/DTc3JwqCM58YC5x4FDpuPm7Qeik3PJe64nVA="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "sha256-le0+ZmGyhM/UfGUV05FHyx5PlARxL/T2aC8UhiPYjxw"; + sha256 = "4973f5cf45f0b8120206d057d88d6a7fca03e071c8ad1ecd7229db46a0604ed2"; }; - # https://github.com/clojure-lsp/clojure-lsp/blob/2022.01.22-01.31.09/cli/graalvm/native-unix-compile.sh#L18-L27 - # Needs to be inject on `nativeImageBuildArgs` inside shell environment, - # otherwise we can't expand to the value set in `mktemp -d` call - preBuild = '' - export DTLV_LIB_EXTRACT_DIR="$(mktemp -d)" - nativeImageBuildArgs+=("-H:CLibraryPath=$DTLV_LIB_EXTRACT_DIR") - ''; - extraNativeImageBuildArgs = [ "--no-fallback" "--native-image-info" @@ -50,9 +42,9 @@ buildGraalvmNativeImage rec { latest_version=$(curl -s https://api.github.com/repos/clojure-lsp/clojure-lsp/releases/latest | jq --raw-output .tag_name) - old_jar_hash=$(nix-instantiate --eval --strict -A "clojure-lsp-standalone.jar.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g') + old_jar_hash=$(nix-instantiate --eval --strict -A "clojure-lsp.jar.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g') - curl -o clojure-lsp.jar -sL https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp-standalone.jar + curl -o clojure-lsp-standalone.jar -sL https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp-standalone.jar new_jar_hash=$(nix-hash --flat --type sha256 clojure-lsp-standalone.jar | sed -re 's|[+]|\\&|g') rm -f clojure-lsp-standalone.jar @@ -68,8 +60,5 @@ buildGraalvmNativeImage rec { homepage = "https://github.com/clojure-lsp/clojure-lsp"; license = licenses.mit; maintainers = with maintainers; [ ericdallo babariviere ]; - # Depends on datalevin that is x86_64 only - # https://github.com/juji-io/datalevin/blob/bb7d9328f4739cddea5d272b5cd6d6dcb5345da6/native/src/java/datalevin/ni/Lib.java#L86-L102 - broken = !stdenv.isx86_64; }; } diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index d746a6d1ff33..c49fb15610e3 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -17,12 +17,12 @@ let stdenvNoCC.mkDerivation rec { pname = "coreboot-toolchain-${arch}"; - version = "4.15"; + version = "4.16"; src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = version; - sha256 = "1qsb2ca22h5f0iwc254qsfm7qcn8967ir8aybdxa1pakgmnfsyp9"; + sha256 = "073n8yid3v0l9wgwnrdqrlgzaj9mnhs33a007dgr7xq3z0iw3i52"; fetchSubmodules = false; leaveDotGit = true; postFetch = '' diff --git a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix index 9460353873e4..64ee3da1ad92 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -35,10 +35,10 @@ }; } { - name = "acpica-unix2-20210331.tar.gz"; + name = "acpica-unix2-20211217.tar.gz"; archive = fetchurl { - sha256 = "1h98pvc9iy1c49cid0ppjwk5zsy2m1xbvfqb72pkwkrd4rn35arx"; - url = "https://acpica.org/sites/acpica/files/acpica-unix2-20210331.tar.gz"; + sha256 = "0521hmaw2zhi0mpgnaf2i83dykfgql4bx98cg7xqy8wmj649z194"; + url = "https://acpica.org/sites/acpica/files/acpica-unix2-20211217.tar.gz"; }; } { diff --git a/pkgs/development/tools/misc/coreboot-toolchain/update.sh b/pkgs/development/tools/misc/coreboot-toolchain/update.sh index d4c348a5d0c7..3acf22e2cd7d 100755 --- a/pkgs/development/tools/misc/coreboot-toolchain/update.sh +++ b/pkgs/development/tools/misc/coreboot-toolchain/update.sh @@ -8,7 +8,7 @@ fi pkg_dir="$(dirname "$0")" -src="$(nix-build . --no-out-link -A coreboot-toolchain.src)" +src="$(nix-build . --no-out-link -A coreboot-toolchain.i386.src)" urls=$($src/util/crossgcc/buildgcc -u) tmp=$(mktemp) diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index fde7307b27dc..dc6ee4815238 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchsvn, autoreconfHook }: stdenv.mkDerivation rec { - name = "ctags-${revision}"; - revision = "816"; + pname = "ctags"; + version = "816"; src = fetchsvn { url = "https://svn.code.sf.net/p/ctags/code/trunk"; - rev = revision; + rev = version; sha256 = "0jmbkrmscbl64j71qffcc39x005jrmphx8kirs1g2ws44wil39hf"; }; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 3db895f4de01..a394ee615773 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,6 +1,7 @@ { lib , pkg-config , fetchurl +, fetchpatch , meson , ninja , glib @@ -25,6 +26,17 @@ python3.pkgs.buildPythonApplication rec { sha256 = "hzPOS5qaVOwYWx2Fv02p2dEQUogqiAdg/2D5d5stHMs="; }; + patches = [ + # Fix build with meson 0.61 + # data/meson.build:15:0: ERROR: Function does not take positional arguments. + # data/meson.build:27:0: ERROR: Function does not take positional arguments. + # Patch taken from https://gitlab.gnome.org/GNOME/d-feet/-/merge_requests/32 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/d-feet/-/commit/05465d486afdba116dbc22fc22c1e6573aea4f22.patch"; + sha256 = "sFI3nd0YE/deGws/YcTpzC/em9QNgicyb4j7cTfOdhY="; + }) + ]; + nativeBuildInputs = [ gettext gobject-introspection diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index ecb198d72480..49186c75c9a1 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "Graphical front-end for command-line debuggers"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ angustrau ]; + maintainers = with lib.maintainers; [ emilytrau ]; }; } diff --git a/pkgs/development/tools/misc/direvent/default.nix b/pkgs/development/tools/misc/direvent/default.nix index cf2a52276038..79a238ad0c0c 100644 --- a/pkgs/development/tools/misc/direvent/default.nix +++ b/pkgs/development/tools/misc/direvent/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - name = "direvent-${version}"; - version = "5.2"; + pname = "direvent"; + version = "5.3"; src = fetchurl { - url = "mirror://gnu/direvent/${name}.tar.gz"; - sha256 = "0m9vi01b1km0cpknflyzsjnknbava0s1n6393b2bpjwyvb6j5613"; + url = "mirror://gnu/direvent/direvent-${version}.tar.gz"; + sha256 = "sha256-lAWop32kn+krvkrxi/kl/5H20zdMELfXAKAxusuUxJc="; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 6de12a84522e..f5fb8e8eeb1a 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -6,10 +6,10 @@ }: let - name = "distcc"; + pname = "distcc"; version = "2021-03-11"; distcc = stdenv.mkDerivation { - name = "${name}-${version}"; + inherit pname version; src = fetchFromGitHub { owner = "distcc"; repo = "distcc"; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index eb2e124a35e9..893a1925dd71 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, cmake, pcre, doxygen }: +{ lib, stdenv, fetchFromGitHub, cmake, pcre, doxygen }: stdenv.mkDerivation rec { pname = "editorconfig-core-c"; version = "0.12.1"; - src = fetchgit { - url = "https://github.com/editorconfig/editorconfig-core-c.git"; + src = fetchFromGitHub { + owner = "editorconfig"; + repo = "editorconfig-core-c"; rev = "v${version}"; - sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4"; + sha256 = "sha256-pFsbyqIt7okfaiOwlYN8EXm1SFlCUnsHVbOgyIZZlys="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix index 8f5921783e24..b83bb8d33283 100644 --- a/pkgs/development/tools/misc/epm/default.nix +++ b/pkgs/development/tools/misc/epm/default.nix @@ -1,26 +1,40 @@ -{lib, stdenv, fetchFromGitHub, rpm}: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, rpm +}: stdenv.mkDerivation rec { pname = "epm"; - version = "4.4"; + version = "5.0.0"; src = fetchFromGitHub { - repo = "epm"; - owner = "michaelrsweet"; + owner = "jimjag"; + repo = pname; rev = "v${version}"; - sha256 = "0kaw7v2m20qirapkps4dna6nf9xibnwljvvv0l9vpvi920kw7j7p"; + hash = "sha256-o4B5lWBeve+U70FDgF1DrtNrXxaEY4etkPpwbqF7fmc="; }; + patches = [ + # Makefile fix: INSTALL command + (fetchpatch { + url = "https://github.com/jimjag/epm/commit/dc5fcd6fa6e3a74baa28be060769a2b47f9368e7.patch"; + sha256 = "1gfyz493w0larin841xx3xalb7m3sp1r2vv1xki6rz35ybrnb96c"; + }) + # Makefile fix: man pages filenames and docdir target + (fetchpatch { + url = "https://github.com/jimjag/epm/commit/96bb48d4d7b463a09d5a25debfb51c88dcd7398c.patch"; + sha256 = "11aws0qac6vyy3w5z39vkjy4symmfzxfq9qgbgkk74fvx9vax42a"; + }) + ]; + buildInputs = [ rpm ]; - preInstall = '' - sed -i 's/README/README.md/' Makefile - ''; - meta = with lib; { description = "The ESP Package Manager generates distribution archives for a variety of platforms"; - homepage = "https://www.msweet.org/projects.php?Z2"; - license = licenses.gpl2; + homepage = "https://jimjag.github.io/epm/"; + license = licenses.asl20; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index c173b96f6eb0..f21808b1bf70 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -27,16 +27,18 @@ assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { pname = targetPrefix + basename; - version = "11.1"; + version = "11.2"; src = fetchurl { url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; - sha256 = "151z6d0265hv9cgx9zqqa4bd6vbp20hrljhd6bxl7lr0gd0crkyc"; + hash = "sha256-FJfDanGIG4ZxqahKDuQPqreIyjDXuhnYRjw8x4cVLjI="; }; postPatch = if stdenv.isDarwin then '' substituteInPlace gdb/darwin-nat.c \ --replace '#include "bfd/mach-o.h"' '#include "mach-o.h"' + '' else if stdenv.hostPlatform.isMusl then '' + substituteInPlace sim/ppc/emul_unix.c --replace sys/termios.h termios.h '' else null; patches = [ @@ -50,7 +52,11 @@ stdenv.mkDerivation rec { }) ] ++ lib.optionals stdenv.isDarwin [ ./darwin-target-match.patch - ]; + ] ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { + name = "musl-fix-pagesize-page_size.patch"; + url = "https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=fd0975b96b16d96010dce439af9620d3dfb65426"; + hash = "sha256-M3U7uIIFJnYu0g8/sMLJPhm02q7cGOi6pLjgsUUjeKI="; + }); nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ]; diff --git a/pkgs/development/tools/misc/gef/default.nix b/pkgs/development/tools/misc/gef/default.nix new file mode 100644 index 000000000000..0352ebc7cf32 --- /dev/null +++ b/pkgs/development/tools/misc/gef/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, gdb +, python3 +, file +, ps +, git +, coreutils +}: + +let + pythonPath = with python3.pkgs; makePythonPath [ + keystone-engine + unicorn + capstone + ropper + ]; + +in stdenv.mkDerivation rec { + pname = "gef"; + version = "2022.01"; + + src = fetchFromGitHub { + owner = "hugsy"; + repo = "gef"; + rev = version; + sha256 = "sha256-Ot0OYMbXFGCzJdmDHD+LoZRDShCbYJ+IGzLTcU2Rfd4="; + }; + + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/share/gef + cp gef.py $out/share/gef + makeWrapper ${gdb}/bin/gdb $out/bin/gef \ + --add-flags "-q -x $out/share/gef/gef.py" \ + --set NIX_PYTHONPATH ${pythonPath} \ + --prefix PATH : ${lib.makeBinPath [ python3 file ps ]} + ''; + + checkInputs = [ + gdb + file + ps + git + python3 + python3.pkgs.pytest + python3.pkgs.pytest-xdist + python3.pkgs.keystone-engine + python3.pkgs.unicorn + python3.pkgs.capstone + python3.pkgs.ropper + ]; + checkPhase = '' + # Skip some tests that require network access. + sed -i '/def test_cmd_shellcode_get(self):/i \ \ \ \ @unittest.skip(reason="not available in sandbox")' tests/runtests.py + sed -i '/def test_cmd_shellcode_search(self):/i \ \ \ \ @unittest.skip(reason="not available in sandbox")' tests/runtests.py + + # Patch the path to /bin/ls. + sed -i 's+/bin/ls+${coreutils}/bin/ls+g' tests/runtests.py + + # Run the tests. + make test + ''; + + meta = with lib; { + description = "A modern experience for GDB with advanced debugging features for exploit developers & reverse engineers"; + homepage = "https://github.com/hugsy/gef"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ freax13 ]; + }; +} diff --git a/pkgs/development/tools/misc/grcov/default.nix b/pkgs/development/tools/misc/grcov/default.nix new file mode 100644 index 000000000000..04ed4a1046b7 --- /dev/null +++ b/pkgs/development/tools/misc/grcov/default.nix @@ -0,0 +1,38 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "grcov"; + version = "0.8.8"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-OITtZdI9d5zQVI02s5gJF9lWCjZZgE7YZRfFROU040o="; + }; + + cargoSha256 = "sha256-AZVkS/huEsA1wdVB/xUGCCjY5AWJxaU1DD/OlEURw/c="; + + # tests do not find grcov path correctly + checkFlags = let + skipList = [ + "test_coveralls_service_job_id_is_not_sufficient" + "test_coveralls_service_name_is_not_sufficient" + "test_coveralls_works_with_just_service_name_and_job_id_args" + "test_coveralls_works_with_just_token_arg" + "test_integration" + "test_integration_guess_single_file" + "test_integration_zip_dir" + "test_integration_zip_zip" + ]; + skipFlag = test: "--skip " + test; + in builtins.concatStringsSep " " (builtins.map skipFlag skipList); + + meta = with lib; { + description = + "Rust tool to collect and aggregate code coverage data for multiple source files"; + homepage = "https://github.com/mozilla/grcov"; + license = licenses.mpl20; + maintainers = with maintainers; [ DieracDelta ]; + }; +} diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 4521eee95a21..f7d1667dfa24 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "help2man"; - version = "1.48.5"; + version = "1.49.1"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ZznkyqQuau0zmb5Dh8p5OZZAlnM06RcohjuOqpIlgr4="; + sha256 = "sha256-/ZmmZOxL6ahqDdiXGZifFPNnqcB5110OHXHhinu1GwM="; }; strictDeps = true; diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index fd1896f24b81..1ae54d629acc 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -137,6 +137,6 @@ in stdenv.mkDerivation rec { description = "Nix-based continuous build system"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index ac5600519b49..27ff31dae963 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, nixStable, callPackage, nixUnstable, nixosTests }: +{ fetchFromGitHub, callPackage, nixVersions, nixosTests }: { hydra-unstable = callPackage ./common.nix { @@ -9,7 +9,8 @@ rev = "9bce425c3304173548d8e822029644bb51d35263"; sha256 = "sha256-tGzwKNW/odtAYcazWA9bPVSmVXMGKfXsqCA1UYaaxmU="; }; - nix = nixUnstable; + patches = [ ./eval.patch ]; + nix = nixVersions.unstable; tests = { basic = nixosTests.hydra.hydra-unstable; diff --git a/pkgs/development/tools/misc/hydra/eval.patch b/pkgs/development/tools/misc/hydra/eval.patch new file mode 100644 index 000000000000..a1b7599cc2b4 --- /dev/null +++ b/pkgs/development/tools/misc/hydra/eval.patch @@ -0,0 +1,34 @@ +--- a/src/hydra-eval-jobs/hydra-eval-jobs.cc ++++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc +@@ -64,11 +64,11 @@ + + static std::string queryMetaStrings(EvalState & state, DrvInfo & drv, const string & name, const string & subAttribute) + { +- Strings res; ++ std::list res; + std::function rec; + + rec = [&](Value & v) { +- state.forceValue(v); ++ state.forceValue(v, noPos); + if (v.type() == nString) + res.push_back(v.string.s); + else if (v.isList()) +@@ -112,7 +112,7 @@ + callFlake(state, lockedFlake, *vFlake); + + auto vOutputs = vFlake->attrs->get(state.symbols.create("outputs"))->value; +- state.forceValue(*vOutputs); ++ state.forceValue(*vOutputs, noPos); + + auto aHydraJobs = vOutputs->attrs->get(state.symbols.create("hydraJobs")); + if (!aHydraJobs) +@@ -191,7 +191,7 @@ + state.forceList(*a->value, *a->pos); + for (unsigned int n = 0; n < a->value->listSize(); ++n) { + auto v = a->value->listElems()[n]; +- state.forceValue(*v); ++ state.forceValue(*v, noPos); + if (v->type() == nString) + job["namedConstituents"].push_back(state.forceStringNoCtx(*v)); + } diff --git a/pkgs/development/tools/misc/k2tf/default.nix b/pkgs/development/tools/misc/k2tf/default.nix index f4225a901e42..fef4d7d405c6 100644 --- a/pkgs/development/tools/misc/k2tf/default.nix +++ b/pkgs/development/tools/misc/k2tf/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-75L8fcmZbG7PbZrF4cScRQjqbuu5eTnLIaDGzgF57/0="; }; - vendorSha256 = "sha256-hxB+TZfwn16JXGRXZNB6HdDa62JQIQMaYpDzjOcLjFg="; + vendorSha256 = "sha256-YsSOw3G5ufxBn8Wu5J8md2Aaqhl0VJa7uB6ZzSPWo/A="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ]; diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index ae757f0d80d6..03044fe5c444 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -1,13 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, python3, bash }: stdenv.mkDerivation rec { - basename = "kconfig-frontends"; + pname = "kconfig-frontends"; version = "4.11.0.1"; - name = "${basename}-${version}"; src = fetchurl { sha256 = "1xircdw3k7aaz29snf96q2fby1cs48bidz5l1kkj0a5gbivw31i3"; - url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz"; + url = "http://ymorin.is-a-geek.org/download/kconfig-frontends/kconfig-frontends-${version}.tar.xz"; }; nativeBuildInputs = [ bison flex gperf pkg-config ]; diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index 8a36c52e7ae3..aa991e8ea978 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "lit"; - version = "13.0.0"; + version = "14.0.0"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "4da976f3d114e4ba6ba06cbe660ce1393230f4519c4df15b90bc1840f00e4195"; + sha256 = "45e08ce87b0ea56ab632aa02fa857418a5dd241a711c7c756878b73a130c3efe"; }; passthru = { diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 42ff56ed8b04..b7eabf6f9a20 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.13.1"; + version = "2.13.4"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-z+bffagx/Af9B85GtELC7BB0wWevc/OhsdL7oMRTyLU="; + sha256 = "sha256-Vl8xAkEKU9SE9Mj/UXl48dxZ9n+dFvhy9DV/PKEiAPY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/misc/luarocks/3.7.nix b/pkgs/development/tools/misc/luarocks/3.7.nix index aa49af753b32..95fa79c6d125 100644 --- a/pkgs/development/tools/misc/luarocks/3.7.nix +++ b/pkgs/development/tools/misc/luarocks/3.7.nix @@ -77,6 +77,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [raskin teto]; platforms = platforms.linux ++ platforms.darwin; downloadPage = "http://luarocks.org/releases/"; - updateWalker = true; }; } diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index c2449de5dd28..58f5996992af 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -77,6 +77,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [raskin teto]; platforms = platforms.linux ++ platforms.darwin; downloadPage = "http://luarocks.org/releases/"; - updateWalker = true; }; } diff --git a/pkgs/development/tools/misc/luarocks/default.upstream b/pkgs/development/tools/misc/luarocks/default.upstream deleted file mode 100644 index e69de1fe8895..000000000000 --- a/pkgs/development/tools/misc/luarocks/default.upstream +++ /dev/null @@ -1 +0,0 @@ -url http://luarocks.org/releases/ diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index dbcd49dcfbe4..504b79c50048 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "macdylibbundler"; - version = "1.0.0"; + version = "1.0.4"; src = fetchFromGitHub { owner = "auriamg"; repo = "macdylibbundler"; rev = version; - sha256 = "02w04qvaf9v8yw8bgncx5qj3jx08xdfa855isvq92q27hsb8m8hv"; + sha256 = "0j4ij48jf5izgymzxxaakf6vc50w9q0761yir6nfj1n6qlnrlidf"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/development/tools/misc/netcoredbg/default.nix index 1907eb8b3637..cb0c1cdc8ec7 100644 --- a/pkgs/development/tools/misc/netcoredbg/default.nix +++ b/pkgs/development/tools/misc/netcoredbg/default.nix @@ -24,14 +24,7 @@ let unmanaged = clangStdenv.mkDerivation rec { inherit src pname version; - nativeBuildInputs = [ cmake ]; - - # Building the "unmanaged part" still involves compiling C# code. - preBuild = '' - export HOME=$(mktemp -d) - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - ''; + nativeBuildInputs = [ cmake dotnet-sdk ]; hardeningDisable = [ "strictoverflow" ]; diff --git a/pkgs/development/tools/misc/nimlsp/default.nix b/pkgs/development/tools/misc/nimlsp/default.nix index 0e837b8fd614..41eb9567150c 100644 --- a/pkgs/development/tools/misc/nimlsp/default.nix +++ b/pkgs/development/tools/misc/nimlsp/default.nix @@ -2,17 +2,17 @@ nimPackages.buildNimPackage rec { pname = "nimlsp"; - version = "0.3.2"; + version = "0.4.0"; nimBinOnly = true; src = fetchFromGitHub { owner = "PMunch"; repo = "nimlsp"; rev = "v${version}"; - sha256 = "1lm823nvpp3bj9527jd8n1jxh6y8p8ngkfkj91p94m7ffai6jazq"; + sha256 = "sha256-eih8JmofLFXkidanRocjtA6wv84HkA1bi0M4dxkiDr4="; }; - buildInputs = with nimPackages; [ astpatternmatching jsonschema ]; + buildInputs = with nimPackages; [ jsonschema ]; nimFlags = [ "--threads:on" diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix index 7886c7c450ac..bda19f75ff01 100644 --- a/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nix-build-uncached"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-build-uncached"; rev = "v${version}"; - sha256 = "1v9xyv0hhvfw61k4pbgzrlgy7igl619cangi40fkh7gdvs01dxz4"; + sha256 = "sha256-9oc5zoOlwV02cY3ek+qYLgZaFQk4dPE9xgF8mAePGBI="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix index 848afb5b2ca8..7ffd92451bf5 100644 --- a/pkgs/development/tools/misc/nrfutil/default.nix +++ b/pkgs/development/tools/misc/nrfutil/default.nix @@ -68,5 +68,7 @@ buildPythonApplication rec { license = licenses.unfreeRedistributable; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; + # libusb1 1.9.3 uses setuptools' 2to3 translation feature, which has been removed in setuptools 58 + broken = true; }; } diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index c357d47fe611..1ca9c2c5112f 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkg-config, libbpf, cmake, elfutils, zlib }: +{ lib, stdenv, fetchgit, pkg-config, libbpf, cmake, elfutils, zlib, argp-standalone, musl-obstack }: stdenv.mkDerivation rec { pname = "pahole"; @@ -10,7 +10,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ elfutils zlib libbpf ]; + buildInputs = [ elfutils zlib libbpf ] + ++ lib.optional stdenv.hostPlatform.isMusl [ + argp-standalone + musl-obstack + ]; # Put libraries in "lib" subdirectory, not top level of $out cmakeFlags = [ "-D__LIB=lib" "-DLIBBPF_EMBEDDED=OFF" ]; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index 740015dbe984..e62805867504 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "patchelf-${version}"; + pname = "patchelf"; version = "2021-11-16"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix index 28894743dd65..c05581f5591a 100644 --- a/pkgs/development/tools/misc/premake/3.nix +++ b/pkgs/development/tools/misc/premake/3.nix @@ -1,14 +1,11 @@ {lib, stdenv, fetchurl, unzip}: -let baseName = "premake"; +stdenv.mkDerivation rec { + pname = "premake"; version = "3.7"; -in - -stdenv.mkDerivation { - name = "${baseName}-${version}"; src = fetchurl { - url = "mirror://sourceforge/sourceforge/premake/${baseName}-src-${version}.zip"; + url = "mirror://sourceforge/sourceforge/premake/premake-src-${version}.zip"; sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5"; }; diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix index 192a7746203b..35c651f4a18c 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl, unzip }: -let baseName = "premake"; +stdenv.mkDerivation rec { + pname = "premake"; version = "4.3"; -in - -stdenv.mkDerivation { - name = "${baseName}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${baseName}/${baseName}-${version}-src.zip"; + url = "mirror://sourceforge/premake/premake-${version}-src.zip"; sha256 = "1017rd0wsjfyq2jvpjjhpszaa7kmig6q1nimw76qx3cjz2868lrn"; }; diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix index 01b399e15a39..add0c7a5809c 100644 --- a/pkgs/development/tools/misc/pwndbg/default.nix +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -22,14 +22,14 @@ let in stdenv.mkDerivation rec { pname = "pwndbg"; - version = "2021.06.22"; + version = "2022.01.05"; format = "other"; src = fetchFromGitHub { owner = "pwndbg"; repo = "pwndbg"; rev = version; - sha256 = "sha256-8jaWhpn7Q3X7FBHURX6nyOAhu+C113DnC4KBSE3FBuE="; + sha256 = "sha256-24WWA3wLUxylC8LkukwTOcqbpxpAg8DfrEkI3Ikyzlk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/qtspim/default.nix b/pkgs/development/tools/misc/qtspim/default.nix index 23d33a9f81c5..7329ad509671 100644 --- a/pkgs/development/tools/misc/qtspim/default.nix +++ b/pkgs/development/tools/misc/qtspim/default.nix @@ -1,23 +1,17 @@ { lib, stdenv, fetchsvn, wrapQtAppsHook, qtbase, qttools, qmake, bison, flex, ... }: stdenv.mkDerivation rec { pname = "qtspim"; - version = "9.1.22"; + version = "9.1.23"; src = fetchsvn { url = "https://svn.code.sf.net/p/spimsimulator/code/"; - rev = "r739"; - sha256 = "1kazfgrbmi4xq7nrkmnqw1280rhdyc1hmr82flrsa3g1b1rlmj1s"; + rev = "r749"; + sha256 = "0iazl7mlcilrdbw8gb98v868a8ldw2lmkn1xs8hnfvr93l6aj0rp"; }; postPatch = '' cd QtSpim - # Patches from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=qtspim - sed -i 's/zero_imm/is_zero_imm/g' parser_yacc.cpp - sed -i 's/^int data_dir/bool data_dir/g' parser_yacc.cpp - sed -i 's/^int text_dir/bool text_dir/g' parser_yacc.cpp - sed -i 's/^int parse_error_occurred/bool parse_error_occurred/g' parser_yacc.cpp - substituteInPlace QtSpim.pro --replace /usr/lib/qtspim/lib $out/lib substituteInPlace menu.cpp \ --replace /usr/lib/qtspim/bin/assistant ${qttools.dev}/bin/assistant \ @@ -55,7 +49,7 @@ stdenv.mkDerivation rec { description = "New user interface for spim, a MIPS simulator"; homepage = "http://spimsimulator.sourceforge.net/"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index b39ab68f06c0..24038d1c8d4e 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-PneUN59ddYvhVIXqZeDCh0tWADkRTU9Dj0HNf0V8s3g="; + sha256 = "sha256-mMpbV02yoso+Nvq1wkenvlbmTsOcTlpfKIhvyttrIf8="; }; - vendorSha256 = "sha256-NI5pzKfUTjXqDukeQ1wFN/D0TBeXfDPGL69oEL7reCE="; + vendorSha256 = "sha256-UQbZjN7GaGXvBmMPAeQqaWriV+t3XSUd6hUOuZCiR24="; doCheck = false; diff --git a/pkgs/development/tools/misc/rtss/default.nix b/pkgs/development/tools/misc/rtss/default.nix index 36ef4c349e9e..cb5b55b8894c 100644 --- a/pkgs/development/tools/misc/rtss/default.nix +++ b/pkgs/development/tools/misc/rtss/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rtss"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Freaky"; repo = pname; rev = "v${version}"; - sha256 = "1936w161mkbcwicrxn51b42pgir5yjiw85s74lbfq70nddw18nyn"; + sha256 = "sha256-WeeZsB42/4SlIaWwKvOqWiPNV5p0QOToynI8ozVVxJM="; }; - cargoSha256 = "1b1xiaaxbw6y80pkzd594dikm372l1mmymf1wn2acmlz979nmas8"; + cargoSha256 = "sha256-aHK9KBzRbU2IYr7vOdlz0Aw4iYGjD6VedbWPE/V7AVc="; meta = with lib; { description = "Annotate output with relative durations between lines"; diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 02927667775a..242d76174ce9 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }: let name = "saleae-logic-2"; - version = "2.3.39"; + version = "2.3.45"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "1p31i8xillc5vrl2nli74b7p7cv2yz2qafp2gnyjfn0nbx5ij52g"; + sha256 = "sha256-kX8jMCUkz7B0muxsEwEttEX+DA2P+6swdZJGHyo7ScA="; }; desktopItem = makeDesktopItem { inherit name; @@ -13,7 +13,7 @@ let comment = "Software for Saleae logic analyzers"; desktopName = "Saleae Logic"; genericName = "Logic analyzer"; - categories = "Development"; + categories = [ "Development" ]; }; in appimageTools.wrapType2 { diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 5943b57d8088..487445e0fc35 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { comment = "Software for Saleae logic analyzers"; desktopName = "Saleae Logic"; genericName = "Logic analyzer"; - categories = "Development"; + categories = [ "Development" ]; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/misc/semver-tool/default.nix b/pkgs/development/tools/misc/semver-tool/default.nix index 0cfbd0680ba6..407185a474b9 100644 --- a/pkgs/development/tools/misc/semver-tool/default.nix +++ b/pkgs/development/tools/misc/semver-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "semver-tool"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "fsaintjacques"; repo = pname; rev = version; - sha256 = "sha256-coy/g4nEvSN+0/aqK2r3EEIaoUcnsZhzX66H1qsK9ac="; + sha256 = "sha256-LqZTHFiis4BYL1bnJoeuW56wf8+o38Ygs++CV9CKNhM="; }; dontBuild = true; # otherwise we try to 'make' which fails. @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/fsaintjacques/semver-tool"; description = "semver bash implementation"; - license = licenses.gpl3Plus; + license = licenses.asl20; platforms = platforms.unix; maintainers = [ maintainers.qyliss ]; }; diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index 22bf244662b3..0d5ceba12530 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -1,29 +1,29 @@ -{lib, stdenv, fetchurl, ncurses, libpcap }: +{ lib, stdenv, fetchurl, ncurses, libpcap, cmake, openssl, git, lksctp-tools }: stdenv.mkDerivation rec { - version = "3.6.0"; - + version = "3.6.1"; pname = "sipp"; src = fetchurl { url = "https://github.com/SIPp/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1fx1iy2n0m2kr91n1ii30frbscq375k3lqihdgvrqxn0zq8pnzp4"; + sha256 = "sha256-alYOg6/5gvMx3byt+zvVMMWJbNW3V91utoITPMhg7LE="; }; postPatch = '' - sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp + cp version.h src/version.h ''; - configureFlags = [ - "--with-pcap" + cmakeFlags = [ + "-DUSE_GSL=1" + "-DUSE_PCAP=1" + "-DUSE_SSL=1" + "-DUSE_SCTP=${if stdenv.isLinux then "1" else "0"}" ]; + enableParallelBuilding = true; - postInstall = '' - mkdir -pv $out/share/pcap - cp pcap/* $out/share/pcap - ''; - - buildInputs = [ncurses libpcap]; + nativeBuildInputs = [ cmake git ]; + buildInputs = [ ncurses libpcap openssl ] + ++ lib.optional (stdenv.isLinux) lksctp-tools; meta = with lib; { homepage = "http://sipp.sf.net"; @@ -32,4 +32,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/development/tools/misc/spruce/default.nix b/pkgs/development/tools/misc/spruce/default.nix index 16fd6cde043d..7c10a6ee0ca7 100644 --- a/pkgs/development/tools/misc/spruce/default.nix +++ b/pkgs/development/tools/misc/spruce/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "spruce"; - version = "1.29.0"; + version = "unstable-2022-02-10"; src = fetchFromGitHub { owner = "geofffranks"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-HjJWiBYd1YFDZ+XOFcU2Df6bmKFBwVQ6YbiZv1IVN3A="; + rev = "473931f33fceae90b3f5cfb7616c296343a9559b"; + sha256 = "sha256-TFyWkoAKmj3KH2pqhVKMtP6QKTtu0s7H5gNP+fotUzg="; }; deleteVendor = true; - vendorSha256 = "sha256-67PGSW3wV8i3mAt3rCuWbFmeOe+QhHXn2rTUmeN6YMA="; + vendorSha256 = "sha256-VeC5c/BgcxK3Qawb2QOhqtfTIgbQbrQj546zX6yPD+s="; meta = with lib; { description = "A BOSH template merge tool"; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 865784171786..1fd8db8c6e2e 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.16"; + version = "5.17"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3H2yMP8+V8JJgwupSsqyuGLaH8qsVUF+m4UEGoM8ooU="; + sha256 = "sha256-X7KY29EzH9HhvJTFwyOVhg03YQG4fGzT0bqfmqFcFh8="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/misc/svls/default.nix b/pkgs/development/tools/misc/svls/default.nix index 13b529147995..2e3075c7b128 100644 --- a/pkgs/development/tools/misc/svls/default.nix +++ b/pkgs/development/tools/misc/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.1.27"; + version = "0.2.0"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-+/4D0pRZs1Gy6DJnsDZA8wWi1FKhr7gRS0oq1TyWpuE="; + sha256 = "sha256-WZuFYiPV6HbBH9QT4h9FbnmkbFBadUaV0HujiQ0hu7I="; }; - cargoSha256 = "sha256-xkRlUXlkXQwvzIuhExf+tSSBi+8BZv58btvln05UI+k="; + cargoSha256 = "sha256-tafxN3ots1UTSv950NlwCs6TItMnKz5tn5vw7PTcARU="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index a6f195c12ac8..b3fd7a54ec0b 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-QaJoHnuzSQXxEuGpui9lyKAjT2wdz4XmMAh5cAOKvBg="; }; - vendorSha256 = "sha256-7LRq1lG3DT1WQ0+78EEeQqCCrx6n6qTCUcYUuKSfvVE="; + vendorSha256 = "sha256-HcUH3cnaeyB2XnfcRLulsRcHaCwdLkiIb518Ucl2tv8="; doCheck = false; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index de928d35fa0e..e85e014368af 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.25.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dFmXROqh1HYPthzmOE07oyZglaQyx7JqxqYDlLpysrM="; + sha256 = "sha256-Xq9HojFjUrdThXvQ4M8o4LLmxopVErnN3WGUgI79BCw="; }; - vendorSha256 = "sha256-5g/s8WDzxobORFY12YdDQ6rDmr9gQzViv1FFrVwrVIE="; + vendorSha256 = "sha256-iSgK+FOD9olVN4bR2jmtWndaRHrh9pfo/42COTiIh9c="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; diff --git a/pkgs/development/tools/misc/terraformer/default.nix b/pkgs/development/tools/misc/terraformer/default.nix index d4609db2d34e..ccd7c703366a 100644 --- a/pkgs/development/tools/misc/terraformer/default.nix +++ b/pkgs/development/tools/misc/terraformer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraformer"; - version = "0.8.18"; + version = "0.8.19"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-F+OmeXCb0Q2Qqu0T+dqdxvUYszg4ED/zoayH9iO6PCM="; + sha256 = "sha256-h6hqgAHyMNnE7AXNPTUM2srgHW9WGcGmO8d30U2IbSo="; }; - vendorSha256 = "sha256-fCovSA3ZbKn9DrDlb/SXoe8iQTTEAiiDZFSpHUPmxzo="; + vendorSha256 = "sha256-bT6+fH0VJfcgehiiLIDTEYyWgVHIMUGuRaebzm2st60="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 8d8f1e1627aa..b379df09a4b0 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -18,7 +18,7 @@ in with lib; stdenv.mkDerivation { - name = "texinfo-${optionalString interactive "interactive-"}${version}"; + pname = "texinfo${optionalString interactive "-interactive"}"; inherit version; src = fetchurl { diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 5f969721aaf7..8cf86d9d782e 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HX1Mnzq+GsRnUsJERK5gPI5x4op885t+9Vn6vogSK1o="; + sha256 = "sha256-SpfX/3uM1y8skN5BqudUtswkCpinrmHWT7ixbgg8QNI="; }; - cargoSha256 = "sha256-AdzaLqwONI7WEcL8U0OGuyX/pg+BpZbJz9aaSClo47Q="; + cargoSha256 = "sha256-0YipSDKss8qaINkUw9dW8n0fVKp4FmagI9+9jFyXaLA="; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 64d299db155b..3c191d7c6a91 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -1,18 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python2 }: +{ lib, stdenv, fetchFromGitHub, cmake, python3 }: stdenv.mkDerivation rec { - name = "${product}-${version}"; - product = "uncrustify"; - version = "0.72.0"; + pname = "uncrustify"; + version = "0.74.0"; src = fetchFromGitHub { - owner = product; - repo = product; - rev = name; - sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY="; + owner = "uncrustify"; + repo = "uncrustify"; + rev = "uncrustify-${version}"; + sha256 = "0v48vhmzxjzysbf0vhxzayl2pkassvbabvwg84xd6b8n5i74ijxd"; }; - nativeBuildInputs = [ cmake python2 ]; + nativeBuildInputs = [ cmake python3 ]; meta = with lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index 6c1a9009993d..51ea6302743a 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -1,16 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, coreutils, pkg-config, perl, python3Packages, libiconv, jansson }: +{ lib, stdenv, buildPackages, fetchFromGitHub, autoreconfHook, coreutils, pkg-config, perl, python3Packages, libiconv, jansson }: stdenv.mkDerivation rec { pname = "universal-ctags"; - version = "5.9.20210411.0"; + version = "5.9.20220220.0"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; rev = "p${version}"; - sha256 = "0c031y0dl2b70pd0mqfbylplf8f27x11b0ch7ljka3rqav0zb1zr"; + sha256 = "1118iq33snxyw1jk8nwvsl08f3zdainksh0yiapzvg0y5906jjjd"; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoreconfHook coreutils pkg-config python3Packages.docutils ]; buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv; @@ -28,6 +29,11 @@ stdenv.mkDerivation rec { substituteInPlace Tmain/utils.sh \ --replace /bin/echo ${coreutils}/bin/echo + + # Remove git-related housekeeping from check phase + substituteInPlace makefiles/testing.mak \ + --replace "check: tmain units tlib man-test check-genfile" \ + "check: tmain units tlib man-test" ''; postConfigure = '' @@ -36,8 +42,6 @@ stdenv.mkDerivation rec { doCheck = true; - checkFlags = [ "units" ]; - meta = with lib; { description = "A maintained ctags implementation"; homepage = "https://ctags.io/"; diff --git a/pkgs/development/tools/misc/unused/default.nix b/pkgs/development/tools/misc/unused/default.nix index 4c3872377142..de12e527a295 100644 --- a/pkgs/development/tools/misc/unused/default.nix +++ b/pkgs/development/tools/misc/unused/default.nix @@ -1,18 +1,18 @@ { lib, fetchFromGitHub, rustPlatform, cmake }: rustPlatform.buildRustPackage rec { pname = "unused"; - version = "0.2.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "unused-code"; repo = pname; rev = version; - sha256 = "sha256-1R50oCVvk+XJG4EhLusY1aY6RjWNeZvlIDS8PJXIA7o="; + sha256 = "sha256-+1M8dUfjjrT4llS0C6WYDyNxJ9QZ5s9v+W185TbgwMw="; }; nativeBuildInputs = [ cmake ]; - cargoSha256 = "sha256-PjCR+kHlgPWkTkhN0idotGmLSe/FaKkgI9AMEJtoRz8="; + cargoSha256 = "sha256-hCtkR20+xs1UHZP7oJVpJACVGcMQLQmSS1QE2tmIVhs="; meta = with lib; { description = "A tool to identify potentially unused code"; diff --git a/pkgs/development/tools/misc/xspim/default.nix b/pkgs/development/tools/misc/xspim/default.nix index 2e6e3e3eb108..6e11c81cbde0 100644 --- a/pkgs/development/tools/misc/xspim/default.nix +++ b/pkgs/development/tools/misc/xspim/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "A MIPS32 simulator"; homepage = "http://spimsimulator.sourceforge.net/"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/misc/xxgdb/default.nix b/pkgs/development/tools/misc/xxgdb/default.nix index fc0a38ee7499..cd14705e1ebd 100644 --- a/pkgs/development/tools/misc/xxgdb/default.nix +++ b/pkgs/development/tools/misc/xxgdb/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple but powerful graphical interface to gdb"; license = licenses.mit; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index f77ced3a2ada..5853d40eceb1 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, cmake, llvmPackages, boost, python +{ stdenv, lib, fetchFromGitHub, cmake, llvmPackages, boost, python , withGocode ? true, gocode , withGodef ? true, godef , withGotools? true, gotools @@ -12,10 +12,12 @@ stdenv.mkDerivation { disabled = !python.isPy3k; # required for third_party directory creation - src = fetchgit { - url = "https://github.com/Valloric/ycmd.git"; + src = fetchFromGitHub { + owner = "Valloric"; + repo = "ycmd"; rev = "9a6b86e3a156066335b678c328f226229746bae5"; - sha256 = "1c5axdngxaxj5vc6lr8sxb99mr5adsm1dnjckaxc23kq78pc8cn7"; + sha256 = "sha256-xzLELjp4DsG6mkzaFqpuquSa0uoaZWrYLrKr/mzrqrA="; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake ] diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index d0f33d750c23..db1c13da2f98 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -7,17 +7,18 @@ , xxHash , zlib , openssl +, nix-update-script }: stdenv.mkDerivation rec { pname = "mold"; - version = "1.0.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G+mVZS3ZRuBd00xfBqrTvmHOykFk63nJlucxv01nr3k="; + sha256 = "sha256-+uPVt3w3A25JFyENxqhAcjZMRzSowi2uHwGjkeQP8Og="; }; buildInputs = [ zlib openssl ]; @@ -29,6 +30,12 @@ stdenv.mkDerivation rec { LTO = 1; makeFlags = [ "PREFIX=${placeholder "out"}" ]; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "A high performance drop-in replacement for existing unix linkers"; homepage = "https://github.com/rui314/mold"; diff --git a/pkgs/development/tools/nodenv/default.nix b/pkgs/development/tools/nodenv/default.nix new file mode 100644 index 000000000000..d1e38d7bda74 --- /dev/null +++ b/pkgs/development/tools/nodenv/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "nodenv"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "nodenv"; + repo = "nodenv"; + rev = "v${version}"; + sha256 = "0fgc23jd95rjll3dy5hnli8ksfc7rwscw53sdgss4yaharwlg8l2"; + }; + + buildPhase = '' + runHook preBuild + + bash src/configure + make -C src + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r libexec $out/ + cp -r bin $out/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Manage multiple NodeJS versions"; + homepage = "https://github.com/nodenv/nodenv/"; + changelog = "https://github.com/nodenv/nodenv/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ alexnortung ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index f3ec2dabc923..dd3d9cf6faaf 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, buildEnv, makeWrapper , xorg, alsa-lib, at-spi2-core, dbus, glib, gtk3, atk, pango, freetype -, fontconfig , gdk-pixbuf, cairo, mesa, nss, nspr, gconf, expat, systemd +, fontconfig , gdk-pixbuf, cairo, mesa, nss, nspr, expat, systemd , libcap, libdrm, libxkbcommon , libnotify , ffmpeg, libxcb, cups @@ -18,7 +18,7 @@ let paths = [ xorg.libX11 xorg.libXrender glib gtk3 atk at-spi2-core pango cairo gdk-pixbuf freetype fontconfig xorg.libXcomposite alsa-lib xorg.libXdamage - xorg.libXext xorg.libXfixes mesa nss nspr gconf expat dbus + xorg.libXext xorg.libXfixes mesa nss nspr expat dbus xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr xorg.libXScrnSaver xorg.libxshmfence cups libcap libdrm libnotify diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 36a1c7f755e1..5c3153a88493 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sha256 = "0483cs66zsxsavcllpw1qqvyhxb39ddil3h72clcd69g7fyxazl5"; }; - buildInputs = [ ocaml ]; + nativeBuildInputs = [ ocaml ]; + + # build fails otherwise + enableParallelBuilding = false; preBuild = '' mv config/Makefile.unix config/Makefile diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index acf1730af1bc..97a769628fe0 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -55,6 +55,9 @@ stdenv.mkDerivation rec { buildInputs = [ which ocaml ocamlbuild ]; + # build fails otherwise + enableParallelBuilding = false; + dontAddPrefix = true; preConfigure = '' diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index e94e98d8f723..65debca11c23 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, ocaml, perl }: if lib.versionOlder ocaml.version "4.02" +|| lib.versionOlder "4.13" ocaml.version then throw "camlp5 is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 55e9692a0a3b..3134c310c453 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; preBuild = '' - mkdir $out/bin + mkdir -p $out/bin ''; } diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index c55aae7878ef..30962eeba311 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.9.2"; + version = "2.9.3"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-site-${version}.tbz"; - sha256 = "sha256-uOfMUH+5eLRfb9yDnysyAdLB5hHkqOlyyMjP2FIudEc="; + sha256 = "sha256:1ml8bxym8sdfz25bx947al7cvsi2zg5lcv7x9w6xb01cmdryqr9y"; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix new file mode 100644 index 000000000000..f6f45944a816 --- /dev/null +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, ocaml, findlib, darwin }: + +if lib.versionOlder ocaml.version "4.08" +then throw "dune 3 is not available for OCaml ${ocaml.version}" +else + +stdenv.mkDerivation rec { + pname = "dune"; + version = "3.0.3"; + + src = fetchurl { + url = "https://github.com/ocaml/dune/releases/download/${version}/fiber-${version}.tbz"; + sha256 = "sha256-1QRJmhZY8Nmcrvv/1zhvLjHUbOynMWcVf+RobEHlcy8="; + }; + + nativeBuildInputs = [ ocaml findlib ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + ]; + + strictDeps = true; + + buildFlags = "release"; + + dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; + + installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; + + meta = { + homepage = "https://dune.build/"; + description = "A composable build system"; + changelog = "https://github.com/ocaml/dune/raw/${version}/CHANGES.md"; + maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ]; + license = lib.licenses.mit; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 497a8ce91c1d..e7abf32eae5f 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -36,15 +36,21 @@ stdenv.mkDerivation rec { export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs" fi } - createOcamlDestDir () { + exportOcamlDestDir () { export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/" + } + createOcamlDestDir () { if test -n "''${createFindlibDestdir-}"; then mkdir -p $OCAMLFIND_DESTDIR fi } + # run for every buildInput addEnvHooks "$targetOffset" addOCamlPath - preConfigureHooks+=(createOcamlDestDir) + # run before installPhase, even without buildInputs, and not in nix-shell + preInstallHooks+=(createOcamlDestDir) + # run even in nix-shell, and even without buildInputs + addEnvHooks "$hostOffset" exportOcamlDestDir ''; meta = { diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index a08aaac832e3..39f6d5f7aa2d 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -6,6 +6,8 @@ buildDunePackage rec { version = "3.2.1"; pname = "js_of_ocaml-camlp4"; + useDune2 = false; + src = fetchFromGitHub { owner = "ocsigen"; repo = "js_of_ocaml"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index 3375e5ac5a0f..c67d05c15038 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -7,7 +7,7 @@ buildDunePackage { inherit (js_of_ocaml-compiler) version src meta useDune2; - minimalOCamlVersion = "4.03"; + minimalOCamlVersion = "4.02"; propagatedBuildInputs = [ ocamlbuild ]; } diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 831360cd858d..2d030b2d1560 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -57,11 +57,19 @@ buildDunePackage { useDune2 = true; + strictDeps = true; + + nativeBuildInputs = [ + menhir + jq + ]; buildInputs = [ dot-merlin-reader yojson csexp result + menhirSdk + menhirLib ]; doCheck = true; @@ -71,12 +79,6 @@ buildDunePackage { dune runtest # filtering with -p disables tests runHook postCheck ''; - checkInputs = [ - jq - menhir - menhirLib - menhirSdk - ]; meta = with lib; { description = "An editor-independent tool to ease the development of programs in OCaml"; diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 1c9b549d6120..3db5d1377831 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildDunePackage, substituteAll -, dot-merlin-reader, dune_2, yojson, csexp, result }: +, dot-merlin-reader, dune_2, yojson, csexp, result, menhirSdk }: buildDunePackage rec { pname = "merlin"; @@ -22,7 +22,9 @@ buildDunePackage rec { }) ]; - buildInputs = [ dot-merlin-reader yojson csexp result ]; + strictDeps = true; + + buildInputs = [ dot-merlin-reader yojson csexp result menhirSdk ]; meta = with lib; { description = "An editor-independent tool to ease the development of programs in OCaml"; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 10c7bf63aa41..d35ddbe210bf 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -13,11 +13,15 @@ stdenv.mkDerivation { createFindlibDestdir = true; - buildInputs = + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ocamlbuild ocamlmod ocamlify ]; + buildInputs = [ ocamlbuild ]; + configurePhase = '' runHook preConfigure ocaml setup.ml -configure --prefix $out diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix index 0d92840a82be..a37a8c8b3927 100644 --- a/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/pkgs/development/tools/ocaml/obelisk/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, ocamlPackages }: +{ lib, fetchFromGitHub, ocamlPackages, menhir }: ocamlPackages.buildDunePackage rec { pname = "obelisk"; @@ -11,7 +11,10 @@ ocamlPackages.buildDunePackage rec { sha256 = "1jjaqa2b7msl9qd3x7j34vdh1s9alq8hbvzk8a5srb4yyfyim15b"; }; - buildInputs = with ocamlPackages; [ menhir re ]; + strictDeps = true; + + nativeBuildInputs = [ menhir ]; + buildInputs = with ocamlPackages; [ re ]; meta = { description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 7f53ba9203d9..2caf6c67857c 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ocamlbuild"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocamlbuild"; rev = version; - sha256 = "1hb5mcdz4wv7sh1pj7dq9q4fgz5h3zg7frpiya6s8zd3ypwzq0kh"; + sha256 = "sha256-ZL0BwOCWTNDjNkrwNAmzHjHF1Rpg3CUuV4lSqcwDqgI="; }; createFindlibDestdir = true; diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 5686e33f9b73..517ca6585fe1 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -28,8 +28,10 @@ let src = }."${version}"; }; ocamlPackages = - if lib.versionAtLeast version "0.17.0" + if lib.versionAtLeast version "0.19.0" then ocaml-ng.ocamlPackages + else if lib.versionAtLeast version "0.17.0" + then ocaml-ng.ocamlPackages_4_12 else if lib.versionAtLeast version "0.14.3" then ocaml-ng.ocamlPackages_4_10 else ocaml-ng.ocamlPackages_4_07 @@ -48,6 +50,12 @@ buildDunePackage { useDune2 = true; + strictDeps = true; + + nativeBuildInputs = [ + menhir + ]; + buildInputs = if lib.versionAtLeast version "0.20.0" then [ @@ -57,7 +65,6 @@ buildDunePackage { either fix fpath - menhir menhirLib menhirSdk ocaml-version @@ -78,7 +85,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk ocp-indent @@ -96,7 +102,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk dune-build-info @@ -115,7 +120,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk dune-build-info @@ -135,7 +139,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk (ppxlib.override { version = "0.18.0"; }) @@ -154,7 +157,6 @@ buildDunePackage { uuseg uutf fix - menhir menhirLib menhirSdk ] else [ diff --git a/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch b/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch index 4fc887c070d7..e26993f760ae 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch +++ b/pkgs/development/tools/ocaml/ocamlscript/Makefile.patch @@ -1,42 +1,23 @@ ---- a/Makefile 2012-02-04 01:24:21.000000000 +0000 -+++ b/Makefile 2014-10-29 14:42:08.690188302 +0000 -@@ -4,6 +4,8 @@ - version.ml pipeline.mli pipeline.ml common.mli common.ml \ - utils.mli utils.ml ocaml.mli ocaml.ml - -+CAMLP4 := $(shell ocamlfind query camlp4) -+ - STDBIN = $(shell dirname `which ocamlfind`) - ifndef PREFIX - PREFIX = $(shell dirname $(STDBIN)) -@@ -15,7 +17,7 @@ +diff --git a/Makefile b/Makefile +index 894e94d..9adc44b 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,7 +17,7 @@ ifndef BINDIR endif export BINDIR -PACKS = unix str +PACKS = unix str findlib - PP = camlp4o -I . -parser pa_tryfinally.cmo -parser pa_opt.cmo - export PP + # PP = camlp4o -I . -parser pa_opt.cmo + # export PP -@@ -36,11 +38,11 @@ - - common: version.ml - ocamlc -pp 'camlp4orf -loc _loc' -c \ -- -I +camlp4 pa_opt310.ml && \ -+ -I $(CAMLP4) pa_opt310.ml && \ - cp pa_opt310.cmo pa_opt.cmo && \ - cp pa_opt310.cmi pa_opt.cmi - ocamlc -pp 'camlp4orf -loc _loc' -c \ -- -I +camlp4 pa_tryfinally310.ml && \ -+ -I $(CAMLP4) pa_tryfinally310.ml && \ - cp pa_tryfinally310.cmo pa_tryfinally.cmo && \ - cp pa_tryfinally310.cmi pa_tryfinally.cmi - ---- a/main.ml 2014-11-08 09:05:12.516401313 +0000 -+++ b/main.ml 2014-11-08 09:09:59.801311230 +0000 -@@ -250,9 +250,15 @@ - Sys.getcwd ()) - | `File script_name -> "", get_dir script_name in +diff --git a/main.ml b/main.ml +index 288526a..b67c5e9 100644 +--- a/main.ml ++++ b/main.ml +@@ -247,6 +247,11 @@ let write_header ~pos ~source ~source_option ~verbose ~prog_file lines = + Sys.getcwd ()) + | `File script_name -> "", get_dir script_name in + let findlibdir = + Filename.( @@ -46,20 +27,24 @@ let file, oc = Filename.open_temp_file "meta" ".ml" in fprintf oc "\ #%i %S;; +@@ -255,6 +260,7 @@ let () = + try Topdirs.dir_directory (Sys.getenv \"OCAML_TOPLEVEL_PATH\") + with Not_found -> () + ;; +#directory \"%s\";; #use \"topfind\";; #require \"ocamlscript\";; Ocamlscript.Common.verbose := %s;; -@@ -261,7 +267,7 @@ +@@ -263,7 +269,7 @@ Ocamlscript.Common.script_dir := %S;; open Ocamlscript;; open Utils;; #%i %S;;\n" -- pos source verbose script_dir extra_args trash pos source; -+ pos source findlibdir verbose script_dir extra_args trash pos source; - +- pos source verbose script_dir extra_args trash pos source; ++ pos source findlibdir verbose script_dir extra_args trash pos source; + List.iter (output_line oc) lines; -@@ -544,6 +550,7 @@ +@@ -550,6 +556,7 @@ let main () = exit compilation_status let _ = @@ -67,4 +52,16 @@ try main () with Failure s -> eprintf "ocamlscript: %s\n%!" s; - +diff --git a/ocaml.ml b/ocaml.ml +index a1824c6..b8f287e 100644 +--- a/ocaml.ml ++++ b/ocaml.ml +@@ -14,7 +14,7 @@ let ocamlfind = ref "ocamlfind" + let packs = ref [] (* findlib packages *) + let sources = ref [] (* extra sources *) + let use_ocamllex = ref false (* preprocess with ocamllex before camlp4 *) +-let use_camlp4 = ref true (* by default camlp4 is used *) ++let use_camlp4 = ref false (* by default camlp4 is not used *) + let use_ocamlc = ref false (* by default we want native code *) + let use_ocamlfind = ref false (* used only if necessary *) + let revised = ref false (* use this to use the revised syntax *) diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 82a495b733b5..0b4b748f0586 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -1,26 +1,32 @@ -{lib, stdenv, fetchurl, ocaml, findlib, camlp4}: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib }: + +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "ocamlscript is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation rec { - pname = "ocamlscript"; - version = "2.0.3"; - src = fetchurl { - url = "https://mjambon.com/releases/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1v1i24gijxwris8w4hi95r9swld6dm7jbry0zp72767a3g5ivlrd"; + pname = "ocaml${ocaml.version}-ocamlscript"; + version = "3.0.0"; + src = fetchFromGitHub { + owner = "mjambon"; + repo = "ocamlscript"; + rev = "v${version}"; + sha256 = "sha256:10xz8jknlmcgnf233nahd04q98ijnxpijhpvb8hl7sv94dgkvpql"; }; - propagatedBuildInputs = [ ocaml findlib camlp4 ]; + propagatedBuildInputs = [ ocaml findlib ]; patches = [ ./Makefile.patch ]; buildFlags = [ "PREFIX=$(out)" ]; installFlags = [ "PREFIX=$(out)" ]; - preInstall = "mkdir $out/bin"; + preInstall = "mkdir -p $out/bin"; createFindlibDestdir = true; meta = with lib; { - homepage = "http://martin.jambon.free.fr/ocamlscript.html"; + inherit (src.meta) homepage; license = licenses.boost; - platforms = ocaml.meta.platforms or []; + inherit (ocaml.meta) platforms; description = "Natively-compiled OCaml scripts"; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index d47d8a5cc31c..583468521817 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ncurses, cmdliner, re }: -let - version = "1.99.21"; -in -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-ocp-build-${version}"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-ocp-build"; + version = "1.99.21"; src = fetchFromGitHub { owner = "OCamlPro"; diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 716e2679a94a..1ca8cfb5c52c 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -13,7 +13,10 @@ buildDunePackage rec { sha256 = "120w72fqymjp6ibicbp31jyx9yv34mdvgkr0zdfpzvfb7lgd8rc7"; }; - buildInputs = [ cppo cmdliner re ]; + strictDeps = true; + + nativeBuildInputs = [ cppo ]; + buildInputs = [ cmdliner re ]; propagatedBuildInputs = [ ocp-indent ]; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 913871314cfe..3e5471db5ae0 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,26 +1,23 @@ { lib, stdenv, fetchurl, ocaml, findlib -, lambdaTerm, cppo, makeWrapper, buildDunePackage +, lambda-term, cppo, makeWrapper, buildDunePackage }: -if !lib.versionAtLeast ocaml.version "4.03" -then throw "utop is not available for OCaml ${ocaml.version}" -else - buildDunePackage rec { pname = "utop"; - version = "2.8.0"; + version = "2.9.0"; useDune2 = true; + minimalOCamlVersion = "4.03"; + src = fetchurl { url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; - sha256 = "0mi571ifjzq4wcjarn8q1b7yl8nxjm1jfx3afac224lqwn6bhb2d"; + sha256 = "sha256:17jd61bc6pva5wqmnc9xq70ysyjplrzf1p25sq1s7wgrfq2vlyyd"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ cppo ]; + nativeBuildInputs = [ makeWrapper cppo ]; - propagatedBuildInputs = [ lambdaTerm ]; + propagatedBuildInputs = [ lambda-term ]; postFixup = let diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 74341c0a7b49..4acf2264fc9c 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -1,23 +1,36 @@ -{ lib, stdenv, fetchurl, python2 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, python3 +}: + stdenv.mkDerivation rec { pname = "omniorb"; - - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; - sha256 = "0vvsvi5nx4k7kk4qh1pkf3f5fpz7wv4rsdna4hayihbnvz81rh18"; + hash = "sha256-l2BFojQfTpqFBosh9L2SiZMpKTPu7O/qNy2wngIZ6t0="; }; - buildInputs = [ python2 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ python3 ]; + enableParallelBuilding = true; hardeningDisable = [ "format" ]; meta = with lib; { - description = "A robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant"; + description = "A robust high performance CORBA ORB for C++ and Python"; + longDescription = '' + omniORB is a robust high performance CORBA ORB for C++ and Python. + It is freely available under the terms of the GNU Lesser General Public License + (for the libraries),and GNU General Public License (for the tools). + omniORB is largely CORBA 2.6 compliant. + ''; homepage = "http://omniorb.sourceforge.net/"; - license = licenses.gpl2Plus; + license = with licenses; [ gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ smironov ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/omnisharp-roslyn/create-deps.sh b/pkgs/development/tools/omnisharp-roslyn/create-deps.sh index 4e4291a55602..46cbb06951b0 100755 --- a/pkgs/development/tools/omnisharp-roslyn/create-deps.sh +++ b/pkgs/development/tools/omnisharp-roslyn/create-deps.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../.. -i bash -p msbuild dotnet-sdk_3 jq xmlstarlet curl +#!nix-shell -I nixpkgs=../../../../.. -i bash -p dotnet-sdk_6 jq xmlstarlet curl set -euo pipefail cat << EOL @@ -18,7 +18,7 @@ mapfile -t repos < <( done ) -msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \ +dotnet msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \ -p:RestoreNoCache=true -p:RestoreForce=true \ src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj >&2 @@ -48,7 +48,7 @@ do sha256=$(nix-prefetch-url "$url" 2>/dev/null) cat << EOL { - name = "$package"; + pname = "$package"; version = "$version"; src = fetchurl { url = "$url"; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index e2d3b236cdc5..a3f3c7ce4403 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -1,8 +1,6 @@ { lib, stdenv , fetchFromGitHub , fetchurl -, mono6 -, msbuild , dotnetCorePackages , makeWrapper , unzip @@ -11,11 +9,10 @@ let - dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0; deps = map (package: stdenv.mkDerivation (with package; { - pname = name; - inherit version src; + inherit pname version src; buildInputs = [ unzip ]; unpackPhase = '' @@ -41,7 +38,7 @@ let installPhase = '' runHook preInstall - package=$out/lib/dotnet/${name}/${version} + package=$out/lib/dotnet/${pname}/${version} mkdir -p $package cp -r . $package echo "{}" > $package/.nupkg.metadata @@ -66,23 +63,28 @@ let ''; in stdenv.mkDerivation rec { - pname = "omnisharp-roslyn"; - version = "1.37.15"; + version = "1.38.1"; src = fetchFromGitHub { owner = "OmniSharp"; repo = pname; rev = "v${version}"; - sha256 = "070wqs667si3f78fy6w4rrfm8qncnabg0yckjhll0yv1pzbj9q42"; + sha256 = "At8yfp5SDwPSoJM/WdQEBM4EG8q2SlHvp8qZIc9ftlE="; }; - nativeBuildInputs = [ makeWrapper msbuild ]; + nativeBuildInputs = [ makeWrapper dotnet-sdk ]; + + postPatch = '' + # Relax the version requirement + substituteInPlace global.json \ + --replace '6.0.100' '${dotnet-sdk.version}' + ''; buildPhase = '' runHook preBuild - HOME=$(pwd)/fake-home msbuild -r \ + HOME=$(pwd)/fake-home dotnet msbuild -r \ -p:Configuration=Release \ -p:RestoreConfigFile=${nuget-config} \ src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj @@ -92,24 +94,16 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -r bin/Release/OmniSharp.Stdio.Driver/net472 $out/src - cp bin/Release/OmniSharp.Host/net472/SQLitePCLRaw* $out/src - mkdir $out/src/.msbuild - ln -s ${msbuild}/lib/mono/xbuild/* $out/src/.msbuild/ - rm $out/src/.msbuild/Current - mkdir $out/src/.msbuild/Current - ln -s ${msbuild}/lib/mono/xbuild/Current/* $out/src/.msbuild/Current/ - ln -s ${msbuild}/lib/mono/msbuild/Current/bin $out/src/.msbuild/Current/Bin - - makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \ - --suffix PATH : ${dotnet-sdk}/bin \ - --add-flags "$out/src/OmniSharp.exe" + cp -r bin/Release/OmniSharp.Stdio.Driver/net6.0 $out/src + makeWrapper $out/src/OmniSharp $out/bin/omnisharp \ + --prefix DOTNET_ROOT : ${dotnet-sdk} \ + --suffix PATH : ${dotnet-sdk}/bin ''; meta = with lib; { description = "OmniSharp based on roslyn workspaces"; homepage = "https://github.com/OmniSharp/omnisharp-roslyn"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mit; maintainers = with maintainers; [ tesq0 ericdallo corngood ]; }; diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix index 305246ce984d..2744a81f7580 100644 --- a/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -1,38 +1,38 @@ { fetchurl }: [ { - name = "cake.scripting.abstractions"; - version = "0.6.4"; + pname = "cake.scripting.abstractions"; + version = "0.9.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.6.4/cake.scripting.abstractions.0.6.4.nupkg"; - sha256 = "14fcixlj2xazf6cb46gw8jgbsz89c6s8fnhvppxs8q12pygmkx0l"; + url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.9.0/cake.scripting.abstractions.0.9.0.nupkg"; + sha256 = "15nqr100crclha0lzgil25j1wn45517gb34059qypj05j8psfmjx"; }; } { - name = "cake.scripting.transport"; - version = "0.6.4"; + pname = "cake.scripting.transport"; + version = "0.9.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.6.4/cake.scripting.transport.0.6.4.nupkg"; - sha256 = "08cwj572mvmlagj5jry11j2l2fqc6yl4sw0szvql4ard9cx7j51n"; + url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.9.0/cake.scripting.transport.0.9.0.nupkg"; + sha256 = "1gpbvframx4dx4mzfh44cib6dfd26q7878vf073m9gv3y43sws7b"; }; } { - name = "dotnet.script.dependencymodel"; - version = "1.1.0"; + pname = "dotnet.script.dependencymodel"; + version = "1.3.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel/1.1.0/dotnet.script.dependencymodel.1.1.0.nupkg"; - sha256 = "0ly1jwvzndrhgvrwy7kagabyca40j8w9p5jvvfj4wlpffvxq44xl"; + url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel/1.3.1/dotnet.script.dependencymodel.1.3.1.nupkg"; + sha256 = "0bi9rg6c77qav8mb0rbvs5pczf9f0ii8i11c9vyib53bv6fiifxp"; }; } { - name = "dotnet.script.dependencymodel.nuget"; - version = "1.1.0"; + pname = "dotnet.script.dependencymodel.nuget"; + version = "1.3.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel.nuget/1.1.0/dotnet.script.dependencymodel.nuget.1.1.0.nupkg"; - sha256 = "1kvjrm28jlfmcsy5fna8hy814chbcsc39ka12h8mgpdvjkr93njr"; + url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel.nuget/1.3.1/dotnet.script.dependencymodel.nuget.1.3.1.nupkg"; + sha256 = "1v2xd0f2xrkgdznnjad5vhjan51k9qwi4piyg5vdz9mvywail51q"; }; } { - name = "humanizer.core"; + pname = "humanizer.core"; version = "2.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/humanizer.core/2.2.0/humanizer.core.2.2.0.nupkg"; @@ -40,7 +40,7 @@ }; } { - name = "icsharpcode.decompiler"; + pname = "icsharpcode.decompiler"; version = "7.1.0.6543"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/icsharpcode.decompiler/7.1.0.6543/icsharpcode.decompiler.7.1.0.6543.nupkg"; @@ -48,7 +48,7 @@ }; } { - name = "mcmaster.extensions.commandlineutils"; + pname = "mcmaster.extensions.commandlineutils"; version = "3.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/mcmaster.extensions.commandlineutils/3.1.0/mcmaster.extensions.commandlineutils.3.1.0.nupkg"; @@ -56,7 +56,7 @@ }; } { - name = "mediatr"; + pname = "mediatr"; version = "8.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/mediatr/8.1.0/mediatr.8.1.0.nupkg"; @@ -64,47 +64,31 @@ }; } { - name = "messagepack"; - version = "2.1.152"; + pname = "microsoft.aspnetcore.app.runtime.win-arm64"; + version = "6.0.3"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/messagepack/2.1.152/messagepack.2.1.152.nupkg"; - sha256 = "1ks1w6pn96zm8nhz3ff6qdrmf0abppglwaa6vw83kj3d2qw74sw1"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-arm64/6.0.3/microsoft.aspnetcore.app.runtime.win-arm64.6.0.3.nupkg"; + sha256 = "0wxnwqg43hd1hk07j1wqhfrwbjm5ly7bsy9z2jgy9zf8lya4qs9a"; }; } { - name = "messagepackanalyzer"; - version = "2.1.152"; + pname = "microsoft.aspnetcore.app.runtime.win-x64"; + version = "6.0.3"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/messagepackanalyzer/2.1.152/messagepackanalyzer.2.1.152.nupkg"; - sha256 = "18iacmw5v3dp8lma9c0rh5jh8g1hkxnkq78kx7n00wkwxa58badx"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-x64/6.0.3/microsoft.aspnetcore.app.runtime.win-x64.6.0.3.nupkg"; + sha256 = "11kv50kll3iq88kn40f5v5qlq8mydv6y6xz2cbzjw4aadd44njwq"; }; } { - name = "messagepack.annotations"; - version = "2.1.152"; + pname = "microsoft.aspnetcore.app.runtime.win-x86"; + version = "6.0.3"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/messagepack.annotations/2.1.152/messagepack.annotations.2.1.152.nupkg"; - sha256 = "196swfxaz7l26hiyfv1mix0y80amhlq48krc4g5p9894wx1az3c3"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.runtime.win-x86/6.0.3/microsoft.aspnetcore.app.runtime.win-x86.6.0.3.nupkg"; + sha256 = "1c1qx840hwcp6a26dbx10f24pw9kzlvr15w3s1pakldygng5skwm"; }; } { - name = "microsoft.aspnetcore.app.ref"; - version = "3.1.10"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.aspnetcore.app.ref/3.1.10/microsoft.aspnetcore.app.ref.3.1.10.nupkg"; - sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; - }; - } - { - name = "microsoft.bcl.asyncinterfaces"; - version = "1.1.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.0/microsoft.bcl.asyncinterfaces.1.1.0.nupkg"; - sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; - }; - } - { - name = "microsoft.bcl.asyncinterfaces"; + pname = "microsoft.bcl.asyncinterfaces"; version = "1.1.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.1/microsoft.bcl.asyncinterfaces.1.1.1.nupkg"; @@ -112,7 +96,7 @@ }; } { - name = "microsoft.bcl.asyncinterfaces"; + pname = "microsoft.bcl.asyncinterfaces"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/5.0.0/microsoft.bcl.asyncinterfaces.5.0.0.nupkg"; @@ -120,23 +104,31 @@ }; } { - name = "microsoft.build"; - version = "16.10.0"; + pname = "microsoft.bcl.asyncinterfaces"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/16.10.0/microsoft.build.16.10.0.nupkg"; - sha256 = "1ran3fp016wvj8d2ahv0cmwhm6hjjh64w82s7cy52s7qffrgjk46"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/6.0.0/microsoft.bcl.asyncinterfaces.6.0.0.nupkg"; + sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }; } { - name = "microsoft.build.framework"; - version = "16.10.0"; + pname = "microsoft.build"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/16.10.0/microsoft.build.framework.16.10.0.nupkg"; - sha256 = "17a8qxgq0jzxpjannhxkcg0941b64yb7z0yq75gz6hsq9ln3agja"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/17.0.0/microsoft.build.17.0.0.nupkg"; + sha256 = "166brl88y8xn9llc0hmn911k6y74gapmk1mrnfxbv73qj77jxsn1"; }; } { - name = "microsoft.build.locator"; + pname = "microsoft.build.framework"; + version = "17.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/17.0.0/microsoft.build.framework.17.0.0.nupkg"; + sha256 = "08c257dmfa6n41lq4fxb34khi8jbwlqfy1168x7h7zsbh3wss7yq"; + }; + } + { + pname = "microsoft.build.locator"; version = "1.4.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.locator/1.4.1/microsoft.build.locator.1.4.1.nupkg"; @@ -144,15 +136,15 @@ }; } { - name = "microsoft.build.tasks.core"; - version = "16.10.0"; + pname = "microsoft.build.tasks.core"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/16.10.0/microsoft.build.tasks.core.16.10.0.nupkg"; - sha256 = "0yc3p4bksxmbq1n8wfqgn6b6x9ccyzq229f0mn08z4jfima3cnxg"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/17.0.0/microsoft.build.tasks.core.17.0.0.nupkg"; + sha256 = "087mn3rz5plnj7abjqk2di5is35mmfgmdjf0kcdn7jld8rbhk5hx"; }; } { - name = "microsoft.build.tasks.git"; + pname = "microsoft.build.tasks.git"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.git/1.0.0/microsoft.build.tasks.git.1.0.0.nupkg"; @@ -160,23 +152,23 @@ }; } { - name = "microsoft.build.utilities.core"; - version = "16.10.0"; + pname = "microsoft.build.utilities.core"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/16.10.0/microsoft.build.utilities.core.16.10.0.nupkg"; - sha256 = "1rh3gzrz8mmzilvs33cxngv0a805nb47s615rvj4xk5igm384w14"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/17.0.0/microsoft.build.utilities.core.17.0.0.nupkg"; + sha256 = "0b7kylnvdqs81nmxdw7alwij8b19wm00iqicb9gkiklxjfyd8xav"; }; } { - name = "microsoft.codeanalysis.analyzers"; - version = "3.3.2"; + pname = "microsoft.codeanalysis.analyzers"; + version = "3.3.3"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.3.2/microsoft.codeanalysis.analyzers.3.3.2.nupkg"; - sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.3.3/microsoft.codeanalysis.analyzers.3.3.3.nupkg"; + sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }; } { - name = "microsoft.codeanalysis.analyzerutilities"; + pname = "microsoft.codeanalysis.analyzerutilities"; version = "3.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzerutilities/3.3.0/microsoft.codeanalysis.analyzerutilities.3.3.0.nupkg"; @@ -184,103 +176,111 @@ }; } { - name = "microsoft.codeanalysis.common"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.common"; + version = "4.2.0-1.22074.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.0.0-4.21427.11/microsoft.codeanalysis.common.4.0.0-4.21427.11.nupkg"; - sha256 = "15q6a2z3ms2vyrfk4y7biniygy0brr3ddb8mn700zg4sl84vphcz"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.2.0-1.22074.8/microsoft.codeanalysis.common.4.2.0-1.22074.8.nupkg"; + sha256 = "113232x2s787mm0bfvw0iiy5gl2wxs9jw6yrsxah2h7mg8q0s1h8"; }; } { - name = "microsoft.codeanalysis.csharp"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.csharp"; + version = "4.2.0-1.22074.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.4.0.0-4.21427.11.nupkg"; - sha256 = "0x3l774higkpbbk4f1naf57c039g8qvvdvb3963m7g54qn4zhvdh"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.2.0-1.22074.8/microsoft.codeanalysis.csharp.4.2.0-1.22074.8.nupkg"; + sha256 = "017cljjhqyjxdp66f1l1pwxdi2qbfkbabih41frp93n0ips4qzkb"; }; } { - name = "microsoft.codeanalysis.csharp.features"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.csharp.features"; + version = "4.2.0-1.22074.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.features.4.0.0-4.21427.11.nupkg"; - sha256 = "0w0wrssv0ix4z9609a34k6a5kc4p85gy76p676fdg6hyf6pzd78m"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.2.0-1.22074.8/microsoft.codeanalysis.csharp.features.4.2.0-1.22074.8.nupkg"; + sha256 = "04x7jdvlrg4syc3w3j2l3rz9icd6p64km3caaa93pb53k1wmhqb0"; }; } { - name = "microsoft.codeanalysis.csharp.scripting"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.csharp.scripting"; + version = "4.2.0-1.22074.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.scripting.4.0.0-4.21427.11.nupkg"; - sha256 = "0lmfbkxqp8p52wg2lsyxpavabk318s6ci02cxzgmxydc2pd9r70v"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.2.0-1.22074.8/microsoft.codeanalysis.csharp.scripting.4.2.0-1.22074.8.nupkg"; + sha256 = "1lbgxqwi07wfy1xsvqkd4lsw0rmbjkdnwzmzpzaa2lf9k07p9n3h"; }; } { - name = "microsoft.codeanalysis.csharp.workspaces"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.csharp.workspaces"; + version = "4.2.0-1.22074.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.0.0-4.21427.11/microsoft.codeanalysis.csharp.workspaces.4.0.0-4.21427.11.nupkg"; - sha256 = "0j5c9v4nfahvnasz895czk1cp46b2d98px1gdar2ik9c5630vxwi"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.2.0-1.22074.8/microsoft.codeanalysis.csharp.workspaces.4.2.0-1.22074.8.nupkg"; + sha256 = "0jq0g8yi105vap8ssxir86ysmpj61gqh6lgfg2k0y1q67swganlw"; }; } { - name = "microsoft.codeanalysis.externalaccess.omnisharp"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.externalaccess.omnisharp"; + version = "4.2.0-1.22074.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.0.0-4.21427.11/microsoft.codeanalysis.externalaccess.omnisharp.4.0.0-4.21427.11.nupkg"; - sha256 = "0qy8xiv1j8awmbbgy16b2y9rhymxhx8kcmfylhxi1ryqql4mrpg2"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.2.0-1.22074.8/microsoft.codeanalysis.externalaccess.omnisharp.4.2.0-1.22074.8.nupkg"; + sha256 = "0wbbdqvzy0viz4vy6w1vpzjr7gpirkmvz5lcfvcvxv5ygjvxxi2w"; }; } { - name = "microsoft.codeanalysis.externalaccess.omnisharp.csharp"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.externalaccess.omnisharp.csharp"; + version = "4.2.0-1.22074.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.0.0-4.21427.11/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.0.0-4.21427.11.nupkg"; - sha256 = "0mp1gkfdrdjcryqdj76ilpmjh0w8z4h313djjplcawwk76369mnc"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.2.0-1.22074.8/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.2.0-1.22074.8.nupkg"; + sha256 = "0k5lr898hywfcbkfyiz60c28ccd1dka9l07b3c6ccmbpc68ras1w"; }; } { - name = "microsoft.codeanalysis.features"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.features"; + version = "4.2.0-1.22074.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.0.0-4.21427.11/microsoft.codeanalysis.features.4.0.0-4.21427.11.nupkg"; - sha256 = "03vclmmxch3jrjamr9lg899s9wsfxw9yf53p9yfwvcr8wml4cwpz"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.2.0-1.22074.8/microsoft.codeanalysis.features.4.2.0-1.22074.8.nupkg"; + sha256 = "1h0wsw4zg0f36ib3hjcc9y2y8jhaazwy17j2jv17363abbc3pf3l"; }; } { - name = "microsoft.codeanalysis.scripting.common"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.scripting.common"; + version = "4.2.0-1.22074.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.0.0-4.21427.11/microsoft.codeanalysis.scripting.common.4.0.0-4.21427.11.nupkg"; - sha256 = "15fkbw651v9lliqdmg1k61dqzasrssahyhrhwg24m111rgh86fbn"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.2.0-1.22074.8/microsoft.codeanalysis.scripting.common.4.2.0-1.22074.8.nupkg"; + sha256 = "06xzv4jlmz1q9v5r6d2ak734wwskld66maqp763nq3h62nhrxyxg"; }; } { - name = "microsoft.codeanalysis.workspaces.common"; - version = "4.0.0-4.21427.11"; + pname = "microsoft.codeanalysis.workspaces.common"; + version = "4.2.0-1.22074.8"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.0.0-4.21427.11/microsoft.codeanalysis.workspaces.common.4.0.0-4.21427.11.nupkg"; - sha256 = "0k4qjkkg4mllizialzm463ssm3faqcqjnw19kbcnrzm5cd72i7cy"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.2.0-1.22074.8/microsoft.codeanalysis.workspaces.common.4.2.0-1.22074.8.nupkg"; + sha256 = "09fivivc5s2p7iy5939gizs7kyvhn647sgjz55dbhmla5z774l80"; }; } { - name = "microsoft.csharp"; - version = "4.3.0"; + pname = "microsoft.csharp"; + version = "4.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.3.0/microsoft.csharp.4.3.0.nupkg"; - sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.0.1/microsoft.csharp.4.0.1.nupkg"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }; } { - name = "microsoft.diasymreader"; - version = "1.3.0"; + pname = "microsoft.csharp"; + version = "4.7.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.diasymreader/1.3.0/microsoft.diasymreader.1.3.0.nupkg"; - sha256 = "1nswah83z3pfibaqmjd8y96fgnkrak8005qqinc8nqs5mpkf5pfb"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"; + sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }; } { - name = "microsoft.dotnet.platformabstractions"; + pname = "microsoft.diasymreader"; + version = "1.4.0-beta2-21528-02"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.diasymreader/1.4.0-beta2-21528-02/microsoft.diasymreader.1.4.0-beta2-21528-02.nupkg"; + sha256 = "14yfqjfmibyzipy0rdvknvy19brydac9llzrzj82wv6kwb8ap5x2"; + }; + } + { + pname = "microsoft.dotnet.platformabstractions"; version = "3.1.6"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.dotnet.platformabstractions/3.1.6/microsoft.dotnet.platformabstractions.3.1.6.nupkg"; @@ -288,23 +288,23 @@ }; } { - name = "microsoft.extensions.caching.abstractions"; - version = "5.0.0"; + pname = "microsoft.extensions.caching.abstractions"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/5.0.0/microsoft.extensions.caching.abstractions.5.0.0.nupkg"; - sha256 = "0j83zapqhgqb4v5f6kn891km095pfhvsqha357a86ccclmv2czvb"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/6.0.0/microsoft.extensions.caching.abstractions.6.0.0.nupkg"; + sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; }; } { - name = "microsoft.extensions.caching.memory"; - version = "5.0.0"; + pname = "microsoft.extensions.caching.memory"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/5.0.0/microsoft.extensions.caching.memory.5.0.0.nupkg"; - sha256 = "0l8spndl3kvccjlay202msm31iy5iig0i9ddbsdy92wbcjr97lca"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/6.0.0/microsoft.extensions.caching.memory.6.0.0.nupkg"; + sha256 = "0dq1x7962zsp926rj76i4akk4hsy7r5ldys8r4xsd78rq5f67rhq"; }; } { - name = "microsoft.extensions.configuration"; + pname = "microsoft.extensions.configuration"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/2.0.0/microsoft.extensions.configuration.2.0.0.nupkg"; @@ -312,15 +312,15 @@ }; } { - name = "microsoft.extensions.configuration"; - version = "5.0.0"; + pname = "microsoft.extensions.configuration"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/5.0.0/microsoft.extensions.configuration.5.0.0.nupkg"; - sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/6.0.0/microsoft.extensions.configuration.6.0.0.nupkg"; + sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }; } { - name = "microsoft.extensions.configuration.abstractions"; + pname = "microsoft.extensions.configuration.abstractions"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/2.0.0/microsoft.extensions.configuration.abstractions.2.0.0.nupkg"; @@ -328,15 +328,15 @@ }; } { - name = "microsoft.extensions.configuration.abstractions"; - version = "5.0.0"; + pname = "microsoft.extensions.configuration.abstractions"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/5.0.0/microsoft.extensions.configuration.abstractions.5.0.0.nupkg"; - sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/6.0.0/microsoft.extensions.configuration.abstractions.6.0.0.nupkg"; + sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }; } { - name = "microsoft.extensions.configuration.binder"; + pname = "microsoft.extensions.configuration.binder"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/2.0.0/microsoft.extensions.configuration.binder.2.0.0.nupkg"; @@ -344,47 +344,47 @@ }; } { - name = "microsoft.extensions.configuration.binder"; - version = "5.0.0"; + pname = "microsoft.extensions.configuration.binder"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/5.0.0/microsoft.extensions.configuration.binder.5.0.0.nupkg"; - sha256 = "0sld0bh2k5kss32i3nf8mwqkjagmw0d1cdfmxm87ckiicwm413a0"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/6.0.0/microsoft.extensions.configuration.binder.6.0.0.nupkg"; + sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }; } { - name = "microsoft.extensions.configuration.commandline"; - version = "5.0.0"; + pname = "microsoft.extensions.configuration.commandline"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/5.0.0/microsoft.extensions.configuration.commandline.5.0.0.nupkg"; - sha256 = "084hnz5l0vr15ay23rksqipslqnz3pp30w9hsirpx1iqdm5688mc"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/6.0.0/microsoft.extensions.configuration.commandline.6.0.0.nupkg"; + sha256 = "1hb4qrq9xdxzh2px515pv1vkz1jigwaxw1hfg9w8s6pgl8z04l4c"; }; } { - name = "microsoft.extensions.configuration.environmentvariables"; - version = "5.0.0"; + pname = "microsoft.extensions.configuration.environmentvariables"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/5.0.0/microsoft.extensions.configuration.environmentvariables.5.0.0.nupkg"; - sha256 = "03gvckj10ljk1mir9g8cf3cajsnihhvmh8z8341gkr9h5653qkv0"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/6.0.0/microsoft.extensions.configuration.environmentvariables.6.0.0.nupkg"; + sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }; } { - name = "microsoft.extensions.configuration.fileextensions"; - version = "5.0.0"; + pname = "microsoft.extensions.configuration.fileextensions"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/5.0.0/microsoft.extensions.configuration.fileextensions.5.0.0.nupkg"; - sha256 = "1wq229r3xcmm9wh9sqdpvmfv4qpbp2zms9x6xk7g7sbb8h32hnz3"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/6.0.0/microsoft.extensions.configuration.fileextensions.6.0.0.nupkg"; + sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }; } { - name = "microsoft.extensions.configuration.json"; - version = "5.0.0"; + pname = "microsoft.extensions.configuration.json"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/5.0.0/microsoft.extensions.configuration.json.5.0.0.nupkg"; - sha256 = "0hq5i483bjbvprp1la9l3si82x1ydxbvkpfc7r3s7zgxg957fyp9"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/6.0.0/microsoft.extensions.configuration.json.6.0.0.nupkg"; + sha256 = "1c6l5szma1pdn61ncq1kaqibg0dz65hbma2xl626a8d1m6awn353"; }; } { - name = "microsoft.extensions.dependencyinjection"; + pname = "microsoft.extensions.dependencyinjection"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/2.0.0/microsoft.extensions.dependencyinjection.2.0.0.nupkg"; @@ -392,15 +392,15 @@ }; } { - name = "microsoft.extensions.dependencyinjection"; - version = "5.0.0"; + pname = "microsoft.extensions.dependencyinjection"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/5.0.0/microsoft.extensions.dependencyinjection.5.0.0.nupkg"; - sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/6.0.0/microsoft.extensions.dependencyinjection.6.0.0.nupkg"; + sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }; } { - name = "microsoft.extensions.dependencyinjection.abstractions"; + pname = "microsoft.extensions.dependencyinjection.abstractions"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/2.0.0/microsoft.extensions.dependencyinjection.abstractions.2.0.0.nupkg"; @@ -408,47 +408,47 @@ }; } { - name = "microsoft.extensions.dependencyinjection.abstractions"; - version = "5.0.0"; + pname = "microsoft.extensions.dependencyinjection.abstractions"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/5.0.0/microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg"; - sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/6.0.0/microsoft.extensions.dependencyinjection.abstractions.6.0.0.nupkg"; + sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }; } { - name = "microsoft.extensions.dependencymodel"; - version = "5.0.0"; + pname = "microsoft.extensions.dependencymodel"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/5.0.0/microsoft.extensions.dependencymodel.5.0.0.nupkg"; - sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/6.0.0/microsoft.extensions.dependencymodel.6.0.0.nupkg"; + sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }; } { - name = "microsoft.extensions.fileproviders.abstractions"; - version = "5.0.0"; + pname = "microsoft.extensions.fileproviders.abstractions"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/5.0.0/microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg"; - sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/6.0.0/microsoft.extensions.fileproviders.abstractions.6.0.0.nupkg"; + sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }; } { - name = "microsoft.extensions.fileproviders.physical"; - version = "5.0.0"; + pname = "microsoft.extensions.fileproviders.physical"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/5.0.0/microsoft.extensions.fileproviders.physical.5.0.0.nupkg"; - sha256 = "00vii8148a6pk12l9jl0rhjp7apil5q5qcy7v1smnv17lj4p8szd"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/6.0.0/microsoft.extensions.fileproviders.physical.6.0.0.nupkg"; + sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }; } { - name = "microsoft.extensions.filesystemglobbing"; - version = "5.0.0"; + pname = "microsoft.extensions.filesystemglobbing"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/5.0.0/microsoft.extensions.filesystemglobbing.5.0.0.nupkg"; - sha256 = "0lm6n9vbyjh0l17qcc2y9qwn1cns3dyjmkvbxjp0g9sll32kjpmb"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/6.0.0/microsoft.extensions.filesystemglobbing.6.0.0.nupkg"; + sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }; } { - name = "microsoft.extensions.logging"; + pname = "microsoft.extensions.logging"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/2.0.0/microsoft.extensions.logging.2.0.0.nupkg"; @@ -456,15 +456,15 @@ }; } { - name = "microsoft.extensions.logging"; - version = "5.0.0"; + pname = "microsoft.extensions.logging"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/5.0.0/microsoft.extensions.logging.5.0.0.nupkg"; - sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/6.0.0/microsoft.extensions.logging.6.0.0.nupkg"; + sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }; } { - name = "microsoft.extensions.logging.abstractions"; + pname = "microsoft.extensions.logging.abstractions"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.0.0/microsoft.extensions.logging.abstractions.2.0.0.nupkg"; @@ -472,39 +472,31 @@ }; } { - name = "microsoft.extensions.logging.abstractions"; - version = "2.1.1"; + pname = "microsoft.extensions.logging.abstractions"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.1.1/microsoft.extensions.logging.abstractions.2.1.1.nupkg"; - sha256 = "1sgpwj0sa0ac7m5fnkb482mnch8fsv8hfbvk53c6lyh47s1xhdjg"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/6.0.0/microsoft.extensions.logging.abstractions.6.0.0.nupkg"; + sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }; } { - name = "microsoft.extensions.logging.abstractions"; - version = "5.0.0"; + pname = "microsoft.extensions.logging.configuration"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/5.0.0/microsoft.extensions.logging.abstractions.5.0.0.nupkg"; - sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/6.0.0/microsoft.extensions.logging.configuration.6.0.0.nupkg"; + sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }; } { - name = "microsoft.extensions.logging.configuration"; - version = "5.0.0"; + pname = "microsoft.extensions.logging.console"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/5.0.0/microsoft.extensions.logging.configuration.5.0.0.nupkg"; - sha256 = "1kmjax24w0ph362jr64rr6f8pyn6ayq39k502q9yrgr7zgrv65pa"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/6.0.0/microsoft.extensions.logging.console.6.0.0.nupkg"; + sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; }; } { - name = "microsoft.extensions.logging.console"; - version = "5.0.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/5.0.0/microsoft.extensions.logging.console.5.0.0.nupkg"; - sha256 = "162akclrhk5r62fza8yr30p5824inwmrpq2s510c3a64v76v9cqz"; - }; - } - { - name = "microsoft.extensions.options"; + pname = "microsoft.extensions.options"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/2.0.0/microsoft.extensions.options.2.0.0.nupkg"; @@ -512,15 +504,15 @@ }; } { - name = "microsoft.extensions.options"; - version = "5.0.0"; + pname = "microsoft.extensions.options"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/5.0.0/microsoft.extensions.options.5.0.0.nupkg"; - sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/6.0.0/microsoft.extensions.options.6.0.0.nupkg"; + sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }; } { - name = "microsoft.extensions.options.configurationextensions"; + pname = "microsoft.extensions.options.configurationextensions"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/2.0.0/microsoft.extensions.options.configurationextensions.2.0.0.nupkg"; @@ -528,15 +520,15 @@ }; } { - name = "microsoft.extensions.options.configurationextensions"; - version = "5.0.0"; + pname = "microsoft.extensions.options.configurationextensions"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/5.0.0/microsoft.extensions.options.configurationextensions.5.0.0.nupkg"; - sha256 = "1085yrfgc70am43v8i5rxh14kal3bhdd5q85vgny5qp7y1rw0xyw"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/6.0.0/microsoft.extensions.options.configurationextensions.6.0.0.nupkg"; + sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }; } { - name = "microsoft.extensions.primitives"; + pname = "microsoft.extensions.primitives"; version = "2.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/2.0.0/microsoft.extensions.primitives.2.0.0.nupkg"; @@ -544,95 +536,15 @@ }; } { - name = "microsoft.extensions.primitives"; - version = "5.0.0"; + pname = "microsoft.extensions.primitives"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/5.0.0/microsoft.extensions.primitives.5.0.0.nupkg"; - sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/6.0.0/microsoft.extensions.primitives.6.0.0.nupkg"; + sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }; } { - name = "microsoft.netcore.app.ref"; - version = "3.1.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.ref/3.1.0/microsoft.netcore.app.ref.3.1.0.nupkg"; - sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; - }; - } - { - name = "microsoft.netcore.platforms"; - version = "1.0.1"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; - sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; - }; - } - { - name = "microsoft.netcore.platforms"; - version = "1.1.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }; - } - { - name = "microsoft.netcore.platforms"; - version = "2.0.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.0.0/microsoft.netcore.platforms.2.0.0.nupkg"; - sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; - }; - } - { - name = "microsoft.netcore.platforms"; - version = "2.1.2"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg"; - sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; - }; - } - { - name = "microsoft.netcore.platforms"; - version = "3.1.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/3.1.0/microsoft.netcore.platforms.3.1.0.nupkg"; - sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; - }; - } - { - name = "microsoft.netcore.targets"; - version = "1.0.1"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; - sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; - }; - } - { - name = "microsoft.netcore.targets"; - version = "1.1.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }; - } - { - name = "microsoft.netframework.referenceassemblies"; - version = "1.0.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg"; - sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; - }; - } - { - name = "microsoft.netframework.referenceassemblies.net472"; - version = "1.0.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies.net472/1.0.0/microsoft.netframework.referenceassemblies.net472.1.0.0.nupkg"; - sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc"; - }; - } - { - name = "microsoft.net.stringtools"; + pname = "microsoft.net.stringtools"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.net.stringtools/1.0.0/microsoft.net.stringtools.1.0.0.nupkg"; @@ -640,7 +552,135 @@ }; } { - name = "microsoft.sourcelink.common"; + pname = "microsoft.netcore.app.host.win-arm64"; + version = "6.0.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-arm64/6.0.3/microsoft.netcore.app.host.win-arm64.6.0.3.nupkg"; + sha256 = "1dhdr3ccaag3yb803qswkm1zvvwc9q6m3d9nvxvb5f8m94rsbhka"; + }; + } + { + pname = "microsoft.netcore.app.host.win-x64"; + version = "6.0.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-x64/6.0.3/microsoft.netcore.app.host.win-x64.6.0.3.nupkg"; + sha256 = "1y428glba68s76icjzfl1v3p61pcz7rd78wybhabs8zq8w9cp2pj"; + }; + } + { + pname = "microsoft.netcore.app.host.win-x86"; + version = "6.0.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.host.win-x86/6.0.3/microsoft.netcore.app.host.win-x86.6.0.3.nupkg"; + sha256 = "0byyxiv8253zgymn0vwz8zxyasmhdwj891gxg3ydgnc2qf23f16g"; + }; + } + { + pname = "microsoft.netcore.app.runtime.win-arm64"; + version = "6.0.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-arm64/6.0.3/microsoft.netcore.app.runtime.win-arm64.6.0.3.nupkg"; + sha256 = "022kld62v6npxx27mvllg3nv7rpw142q49zwgprzvrxgnn5zszq1"; + }; + } + { + pname = "microsoft.netcore.app.runtime.win-x64"; + version = "6.0.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-x64/6.0.3/microsoft.netcore.app.runtime.win-x64.6.0.3.nupkg"; + sha256 = "1rjkzs2013razi2xs943q62ys1jh8blhjcnj75qkvirf859d11qw"; + }; + } + { + pname = "microsoft.netcore.app.runtime.win-x86"; + version = "6.0.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app.runtime.win-x86/6.0.3/microsoft.netcore.app.runtime.win-x86.6.0.3.nupkg"; + sha256 = "0gsk9939f6vrqbgc7cw8g8q9c7669rkfwwlyhiq13piqmj2kni6g"; + }; + } + { + pname = "microsoft.netcore.platforms"; + version = "1.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }; + } + { + pname = "microsoft.netcore.platforms"; + version = "1.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }; + } + { + pname = "microsoft.netcore.platforms"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.0.0/microsoft.netcore.platforms.2.0.0.nupkg"; + sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; + }; + } + { + pname = "microsoft.netcore.platforms"; + version = "2.1.2"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg"; + sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; + }; + } + { + pname = "microsoft.netcore.platforms"; + version = "3.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/3.0.0/microsoft.netcore.platforms.3.0.0.nupkg"; + sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; + }; + } + { + pname = "microsoft.netcore.platforms"; + version = "3.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/3.1.0/microsoft.netcore.platforms.3.1.0.nupkg"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }; + } + { + pname = "microsoft.netcore.targets"; + version = "1.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }; + } + { + pname = "microsoft.netcore.targets"; + version = "1.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }; + } + { + pname = "microsoft.netframework.referenceassemblies"; + version = "1.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg"; + sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; + }; + } + { + pname = "microsoft.netframework.referenceassemblies.net472"; + version = "1.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies.net472/1.0.0/microsoft.netframework.referenceassemblies.net472.1.0.0.nupkg"; + sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc"; + }; + } + { + pname = "microsoft.sourcelink.common"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.common/1.0.0/microsoft.sourcelink.common.1.0.0.nupkg"; @@ -648,7 +688,7 @@ }; } { - name = "microsoft.sourcelink.github"; + pname = "microsoft.sourcelink.github"; version = "1.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.github/1.0.0/microsoft.sourcelink.github.1.0.0.nupkg"; @@ -656,31 +696,23 @@ }; } { - name = "microsoft.testplatform.objectmodel"; - version = "16.9.4"; + pname = "microsoft.testplatform.objectmodel"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.9.4/microsoft.testplatform.objectmodel.16.9.4.nupkg"; - sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/17.0.0/microsoft.testplatform.objectmodel.17.0.0.nupkg"; + sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }; } { - name = "microsoft.testplatform.translationlayer"; - version = "16.9.4"; + pname = "microsoft.testplatform.translationlayer"; + version = "17.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/16.9.4/microsoft.testplatform.translationlayer.16.9.4.nupkg"; - sha256 = "0y5w2zflvq06jim2i6d49qi45ix0b8vlyf024w29n5g1lb570qf0"; + url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/17.0.0/microsoft.testplatform.translationlayer.17.0.0.nupkg"; + sha256 = "08c6d9aiicpj8hsjb77rz7d2vmw7ivkcc0l1vgdgxddzjhjpy0pi"; }; } { - name = "microsoft.visualstudio.debugger.contracts"; - version = "17.2.0-beta.21417.1"; - src = fetchurl { - url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/78665e4c-b767-412b-9804-2b1ef7a48b8a/nuget/v3/flat2/microsoft.visualstudio.debugger.contracts/17.2.0-beta.21417.1/microsoft.visualstudio.debugger.contracts.17.2.0-beta.21417.1.nupkg"; - sha256 = "14v8d0hp6p1jn4i6b12r6vx4cvxycpb37a0zh0amz0qkg4afr12d"; - }; - } - { - name = "microsoft.visualstudio.sdk.embedinteroptypes"; + pname = "microsoft.visualstudio.sdk.embedinteroptypes"; version = "15.0.12"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.sdk.embedinteroptypes/15.0.12/microsoft.visualstudio.sdk.embedinteroptypes.15.0.12.nupkg"; @@ -688,7 +720,7 @@ }; } { - name = "microsoft.visualstudio.setup.configuration.interop"; + pname = "microsoft.visualstudio.setup.configuration.interop"; version = "1.14.114"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.setup.configuration.interop/1.14.114/microsoft.visualstudio.setup.configuration.interop.1.14.114.nupkg"; @@ -696,7 +728,7 @@ }; } { - name = "microsoft.visualstudio.setup.configuration.interop"; + pname = "microsoft.visualstudio.setup.configuration.interop"; version = "1.16.30"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.setup.configuration.interop/1.16.30/microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg"; @@ -704,7 +736,7 @@ }; } { - name = "microsoft.visualstudio.threading"; + pname = "microsoft.visualstudio.threading"; version = "16.7.56"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading/16.7.56/microsoft.visualstudio.threading.16.7.56.nupkg"; @@ -712,7 +744,7 @@ }; } { - name = "microsoft.visualstudio.threading.analyzers"; + pname = "microsoft.visualstudio.threading.analyzers"; version = "16.7.56"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading.analyzers/16.7.56/microsoft.visualstudio.threading.analyzers.16.7.56.nupkg"; @@ -720,7 +752,7 @@ }; } { - name = "microsoft.visualstudio.validation"; + pname = "microsoft.visualstudio.validation"; version = "15.5.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.validation/15.5.31/microsoft.visualstudio.validation.15.5.31.nupkg"; @@ -728,7 +760,7 @@ }; } { - name = "microsoft.win32.primitives"; + pname = "microsoft.win32.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; @@ -736,7 +768,7 @@ }; } { - name = "microsoft.win32.registry"; + pname = "microsoft.win32.registry"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.3.0/microsoft.win32.registry.4.3.0.nupkg"; @@ -744,7 +776,7 @@ }; } { - name = "microsoft.win32.registry"; + pname = "microsoft.win32.registry"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.6.0/microsoft.win32.registry.4.6.0.nupkg"; @@ -752,7 +784,7 @@ }; } { - name = "microsoft.win32.systemevents"; + pname = "microsoft.win32.systemevents"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.systemevents/4.7.0/microsoft.win32.systemevents.4.7.0.nupkg"; @@ -760,7 +792,7 @@ }; } { - name = "nerdbank.streams"; + pname = "nerdbank.streams"; version = "2.6.81"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nerdbank.streams/2.6.81/nerdbank.streams.2.6.81.nupkg"; @@ -768,7 +800,7 @@ }; } { - name = "netstandard.library"; + pname = "netstandard.library"; version = "1.6.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/netstandard.library/1.6.1/netstandard.library.1.6.1.nupkg"; @@ -776,7 +808,15 @@ }; } { - name = "netstandard.library"; + pname = "netstandard.library"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.0/netstandard.library.2.0.0.nupkg"; + sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; + }; + } + { + pname = "netstandard.library"; version = "2.0.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"; @@ -784,7 +824,7 @@ }; } { - name = "newtonsoft.json"; + pname = "newtonsoft.json"; version = "11.0.2"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/11.0.2/newtonsoft.json.11.0.2.nupkg"; @@ -792,15 +832,15 @@ }; } { - name = "newtonsoft.json"; - version = "12.0.3"; + pname = "newtonsoft.json"; + version = "13.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/12.0.3/newtonsoft.json.12.0.3.nupkg"; - sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/13.0.1/newtonsoft.json.13.0.1.nupkg"; + sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }; } { - name = "newtonsoft.json"; + pname = "newtonsoft.json"; version = "9.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/9.0.1/newtonsoft.json.9.0.1.nupkg"; @@ -808,15 +848,7 @@ }; } { - name = "nuget.common"; - version = "5.10.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.common/5.10.0/nuget.common.5.10.0.nupkg"; - sha256 = "0qy6blgppgvxpfcricmvva3qzddk18dza5vy851jrbqshvf9g7kx"; - }; - } - { - name = "nuget.common"; + pname = "nuget.common"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.common/5.2.0/nuget.common.5.2.0.nupkg"; @@ -824,15 +856,15 @@ }; } { - name = "nuget.configuration"; - version = "5.10.0"; + pname = "nuget.common"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.configuration/5.10.0/nuget.configuration.5.10.0.nupkg"; - sha256 = "0xb1n94lrwa6k83i9xcsq68202086p2gj74gzlbhlvb8c2pw6lbb"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.common/6.0.0/nuget.common.6.0.0.nupkg"; + sha256 = "0vbvmx2zzg54fv6617afi3z49cala70qj7jfxqnldjbc1z2c4b7r"; }; } { - name = "nuget.configuration"; + pname = "nuget.configuration"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.configuration/5.2.0/nuget.configuration.5.2.0.nupkg"; @@ -840,15 +872,15 @@ }; } { - name = "nuget.dependencyresolver.core"; - version = "5.10.0"; + pname = "nuget.configuration"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.dependencyresolver.core/5.10.0/nuget.dependencyresolver.core.5.10.0.nupkg"; - sha256 = "0dhhclm281ihpfsjzxw34l6zlw49nwzyjiynkmsbcj9icfkp3y4r"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.configuration/6.0.0/nuget.configuration.6.0.0.nupkg"; + sha256 = "1qnrahn4rbb55ra4zg9c947kbm9wdiv344f12c3b4c5i7bfmivx3"; }; } { - name = "nuget.dependencyresolver.core"; + pname = "nuget.dependencyresolver.core"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.dependencyresolver.core/5.2.0/nuget.dependencyresolver.core.5.2.0.nupkg"; @@ -856,7 +888,15 @@ }; } { - name = "nuget.frameworks"; + pname = "nuget.dependencyresolver.core"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.dependencyresolver.core/6.0.0/nuget.dependencyresolver.core.6.0.0.nupkg"; + sha256 = "04w7wbfsb647apqrrzx3gj2jjlg09wdzmxj62bx43ngr34i4q83n"; + }; + } + { + pname = "nuget.frameworks"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.0.0/nuget.frameworks.5.0.0.nupkg"; @@ -864,15 +904,7 @@ }; } { - name = "nuget.frameworks"; - version = "5.10.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.10.0/nuget.frameworks.5.10.0.nupkg"; - sha256 = "0gb6n8rg2jpjp52icgpb3wjdfs3qllh5vbcz8hbcix3l7dncy3v2"; - }; - } - { - name = "nuget.frameworks"; + pname = "nuget.frameworks"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.2.0/nuget.frameworks.5.2.0.nupkg"; @@ -880,15 +912,15 @@ }; } { - name = "nuget.librarymodel"; - version = "5.10.0"; + pname = "nuget.frameworks"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.librarymodel/5.10.0/nuget.librarymodel.5.10.0.nupkg"; - sha256 = "0b6mmq2mqfr06ypc772dmcd8bz55gkyfrgn0j3nrgkcdww4fzf9q"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/6.0.0/nuget.frameworks.6.0.0.nupkg"; + sha256 = "11p6mhh36s3vmnylfzw125fqivjk1xj75bvcxdav8n4sbk7d3gqs"; }; } { - name = "nuget.librarymodel"; + pname = "nuget.librarymodel"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.librarymodel/5.2.0/nuget.librarymodel.5.2.0.nupkg"; @@ -896,15 +928,15 @@ }; } { - name = "nuget.packaging"; - version = "5.10.0"; + pname = "nuget.librarymodel"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging/5.10.0/nuget.packaging.5.10.0.nupkg"; - sha256 = "11g0v061axhp0nisclq5cm2mc92d69z92giz9l40ih478c5nishw"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.librarymodel/6.0.0/nuget.librarymodel.6.0.0.nupkg"; + sha256 = "0pg4m6v2j5vvld7s57fvx28ix7wlah6dakhi55qpavmkmnzp6g3f"; }; } { - name = "nuget.packaging"; + pname = "nuget.packaging"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging/5.2.0/nuget.packaging.5.2.0.nupkg"; @@ -912,23 +944,23 @@ }; } { - name = "nuget.packaging.core"; - version = "5.10.0"; + pname = "nuget.packaging"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging.core/5.10.0/nuget.packaging.core.5.10.0.nupkg"; - sha256 = "1frxwwl583qwsj84rjgvd7il6icgxzxxps6yng75qx8ppf99dsr6"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging/6.0.0/nuget.packaging.6.0.0.nupkg"; + sha256 = "0vlcda74h6gq3q569kbbz4n3d26vihxaldvvi2md3phqf8jpvhjb"; }; } { - name = "nuget.projectmodel"; - version = "5.10.0"; + pname = "nuget.packaging.core"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.projectmodel/5.10.0/nuget.projectmodel.5.10.0.nupkg"; - sha256 = "1cqg319n986wciskrqsfawfhqp1d7a7i2qjd0qplpckyw8msng2i"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging.core/6.0.0/nuget.packaging.core.6.0.0.nupkg"; + sha256 = "1kk7rf7cavdicxb4bmwcgwykr53nrk38m6r49hvs85jhhvg9jmyf"; }; } { - name = "nuget.projectmodel"; + pname = "nuget.projectmodel"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.projectmodel/5.2.0/nuget.projectmodel.5.2.0.nupkg"; @@ -936,15 +968,15 @@ }; } { - name = "nuget.protocol"; - version = "5.10.0"; + pname = "nuget.projectmodel"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.protocol/5.10.0/nuget.protocol.5.10.0.nupkg"; - sha256 = "0cs9qp169zx6g2w5bzrlhxv0q1i8mb8dxlb2nkiq7pkvah86rxkc"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.projectmodel/6.0.0/nuget.projectmodel.6.0.0.nupkg"; + sha256 = "1fldxlw88jqgy0cfgfa7drqpxf909kfchcvk4nxj7vyhza2q715y"; }; } { - name = "nuget.protocol"; + pname = "nuget.protocol"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.protocol/5.2.0/nuget.protocol.5.2.0.nupkg"; @@ -952,15 +984,15 @@ }; } { - name = "nuget.versioning"; - version = "5.10.0"; + pname = "nuget.protocol"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/nuget.versioning/5.10.0/nuget.versioning.5.10.0.nupkg"; - sha256 = "10vvw6vjpx0c26rlxh7dnpyp4prahn25717ccd8bzkjmyzhm90cs"; + url = "https://api.nuget.org/v3-flatcontainer/nuget.protocol/6.0.0/nuget.protocol.6.0.0.nupkg"; + sha256 = "16rs9hfra4bly8jp0lxsg0gbpi9wvxh7nrxrdkbjm01vb0azw823"; }; } { - name = "nuget.versioning"; + pname = "nuget.versioning"; version = "5.2.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/nuget.versioning/5.2.0/nuget.versioning.5.2.0.nupkg"; @@ -968,7 +1000,15 @@ }; } { - name = "omnisharp.extensions.jsonrpc"; + pname = "nuget.versioning"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.versioning/6.0.0/nuget.versioning.6.0.0.nupkg"; + sha256 = "0xxrz0p9vd2ax8hcrdxcp3h6gv8qcy6mngp49dvg1ijjjr1jb85k"; + }; + } + { + pname = "omnisharp.extensions.jsonrpc"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc/0.19.0/omnisharp.extensions.jsonrpc.0.19.0.nupkg"; @@ -976,7 +1016,7 @@ }; } { - name = "omnisharp.extensions.jsonrpc.generators"; + pname = "omnisharp.extensions.jsonrpc.generators"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc.generators/0.19.0/omnisharp.extensions.jsonrpc.generators.0.19.0.nupkg"; @@ -984,7 +1024,7 @@ }; } { - name = "omnisharp.extensions.languageprotocol"; + pname = "omnisharp.extensions.languageprotocol"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageprotocol/0.19.0/omnisharp.extensions.languageprotocol.0.19.0.nupkg"; @@ -992,7 +1032,7 @@ }; } { - name = "omnisharp.extensions.languageserver"; + pname = "omnisharp.extensions.languageserver"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageserver/0.19.0/omnisharp.extensions.languageserver.0.19.0.nupkg"; @@ -1000,7 +1040,7 @@ }; } { - name = "omnisharp.extensions.languageserver.shared"; + pname = "omnisharp.extensions.languageserver.shared"; version = "0.19.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageserver.shared/0.19.0/omnisharp.extensions.languageserver.shared.0.19.0.nupkg"; @@ -1008,7 +1048,143 @@ }; } { - name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.any.system.collections"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg"; + sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; + }; + } + { + pname = "runtime.any.system.diagnostics.tools"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tools/4.3.0/runtime.any.system.diagnostics.tools.4.3.0.nupkg"; + sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; + }; + } + { + pname = "runtime.any.system.diagnostics.tracing"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg"; + sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; + }; + } + { + pname = "runtime.any.system.globalization"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg"; + sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; + }; + } + { + pname = "runtime.any.system.globalization.calendars"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.globalization.calendars/4.3.0/runtime.any.system.globalization.calendars.4.3.0.nupkg"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; + }; + } + { + pname = "runtime.any.system.io"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg"; + sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; + }; + } + { + pname = "runtime.any.system.reflection"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }; + } + { + pname = "runtime.any.system.reflection.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.extensions/4.3.0/runtime.any.system.reflection.extensions.4.3.0.nupkg"; + sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; + }; + } + { + pname = "runtime.any.system.reflection.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg"; + sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; + }; + } + { + pname = "runtime.any.system.resources.resourcemanager"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg"; + sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; + }; + } + { + pname = "runtime.any.system.runtime"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + }; + } + { + pname = "runtime.any.system.runtime.handles"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg"; + sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; + }; + } + { + pname = "runtime.any.system.runtime.interopservices"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg"; + sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; + }; + } + { + pname = "runtime.any.system.text.encoding"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; + }; + } + { + pname = "runtime.any.system.text.encoding.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg"; + sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; + }; + } + { + pname = "runtime.any.system.threading.tasks"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg"; + sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; + }; + } + { + pname = "runtime.any.system.threading.timer"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.any.system.threading.timer/4.3.0/runtime.any.system.threading.timer.4.3.0.nupkg"; + sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; + }; + } + { + pname = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1016,7 +1192,7 @@ }; } { - name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1024,7 +1200,7 @@ }; } { - name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1032,7 +1208,7 @@ }; } { - name = "runtime.native.system"; + pname = "runtime.native.system"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; @@ -1040,7 +1216,7 @@ }; } { - name = "runtime.native.system.io.compression"; + pname = "runtime.native.system.io.compression"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.io.compression/4.3.0/runtime.native.system.io.compression.4.3.0.nupkg"; @@ -1048,7 +1224,7 @@ }; } { - name = "runtime.native.system.net.http"; + pname = "runtime.native.system.net.http"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.net.http/4.3.0/runtime.native.system.net.http.4.3.0.nupkg"; @@ -1056,7 +1232,7 @@ }; } { - name = "runtime.native.system.security.cryptography.apple"; + pname = "runtime.native.system.security.cryptography.apple"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.apple/4.3.0/runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; @@ -1064,7 +1240,7 @@ }; } { - name = "runtime.native.system.security.cryptography.openssl"; + pname = "runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1072,7 +1248,7 @@ }; } { - name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1080,7 +1256,7 @@ }; } { - name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1088,7 +1264,7 @@ }; } { - name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple"; + pname = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; @@ -1096,7 +1272,7 @@ }; } { - name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1104,7 +1280,7 @@ }; } { - name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1112,7 +1288,7 @@ }; } { - name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1120,7 +1296,7 @@ }; } { - name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1128,7 +1304,7 @@ }; } { - name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; + pname = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1136,7 +1312,95 @@ }; } { - name = "sqlitepclraw.bundle_green"; + pname = "runtime.win.microsoft.win32.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.microsoft.win32.primitives/4.3.0/runtime.win.microsoft.win32.primitives.4.3.0.nupkg"; + sha256 = "0k1h8nnp1s0p8rjwgjyj1387cc1yycv0k22igxc963lqdzrx2z36"; + }; + } + { + pname = "runtime.win.system.console"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.console/4.3.0/runtime.win.system.console.4.3.0.nupkg"; + sha256 = "0x2yajfrbc5zc6g7nmlr44xpjk6p1hxjq47jn3xki5j7i33zw9jc"; + }; + } + { + pname = "runtime.win.system.diagnostics.debug"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.diagnostics.debug/4.3.0/runtime.win.system.diagnostics.debug.4.3.0.nupkg"; + sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; + }; + } + { + pname = "runtime.win.system.io.filesystem"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.io.filesystem/4.3.0/runtime.win.system.io.filesystem.4.3.0.nupkg"; + sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; + }; + } + { + pname = "runtime.win.system.net.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.net.primitives/4.3.0/runtime.win.system.net.primitives.4.3.0.nupkg"; + sha256 = "1dixh195bi7473n17hspll6i562gghdz9m4jk8d4kzi1mlzjk9cf"; + }; + } + { + pname = "runtime.win.system.net.sockets"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.net.sockets/4.3.0/runtime.win.system.net.sockets.4.3.0.nupkg"; + sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; + }; + } + { + pname = "runtime.win.system.runtime.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win.system.runtime.extensions/4.3.0/runtime.win.system.runtime.extensions.4.3.0.nupkg"; + sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; + }; + } + { + pname = "runtime.win10-arm64.runtime.native.system.io.compression"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win10-arm64.runtime.native.system.io.compression/4.3.0/runtime.win10-arm64.runtime.native.system.io.compression.4.3.0.nupkg"; + sha256 = "1jrmrmqscn8cn2n3piar8n85gfsra7vlai23w9ldzprh0y4dw3v1"; + }; + } + { + pname = "runtime.win7-x64.runtime.native.system.io.compression"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win7-x64.runtime.native.system.io.compression/4.3.0/runtime.win7-x64.runtime.native.system.io.compression.4.3.0.nupkg"; + sha256 = "1dmbmksnxg12fk2p0k7rzy16448mddr2sfrnqs0rhhrzl0z22zi5"; + }; + } + { + pname = "runtime.win7-x86.runtime.native.system.io.compression"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win7-x86.runtime.native.system.io.compression/4.3.0/runtime.win7-x86.runtime.native.system.io.compression.4.3.0.nupkg"; + sha256 = "08ppln62lcq3bz2kyxqyvh98payd5a7w8fzmb53mznkcfv32n55b"; + }; + } + { + pname = "runtime.win7.system.private.uri"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.win7.system.private.uri/4.3.0/runtime.win7.system.private.uri.4.3.0.nupkg"; + sha256 = "0bxkcmklp556dc43bra8ngc8wymcbbflcydi0xwq0j22gm66xf2m"; + }; + } + { + pname = "sqlitepclraw.bundle_green"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.bundle_green/2.0.4/sqlitepclraw.bundle_green.2.0.4.nupkg"; @@ -1144,7 +1408,7 @@ }; } { - name = "sqlitepclraw.core"; + pname = "sqlitepclraw.core"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.core/2.0.4/sqlitepclraw.core.2.0.4.nupkg"; @@ -1152,7 +1416,7 @@ }; } { - name = "sqlitepclraw.lib.e_sqlite3"; + pname = "sqlitepclraw.lib.e_sqlite3"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.lib.e_sqlite3/2.0.4/sqlitepclraw.lib.e_sqlite3.2.0.4.nupkg"; @@ -1160,7 +1424,7 @@ }; } { - name = "sqlitepclraw.provider.dynamic_cdecl"; + pname = "sqlitepclraw.provider.dynamic_cdecl"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.provider.dynamic_cdecl/2.0.4/sqlitepclraw.provider.dynamic_cdecl.2.0.4.nupkg"; @@ -1168,7 +1432,7 @@ }; } { - name = "sqlitepclraw.provider.e_sqlite3"; + pname = "sqlitepclraw.provider.e_sqlite3"; version = "2.0.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.provider.e_sqlite3/2.0.4/sqlitepclraw.provider.e_sqlite3.2.0.4.nupkg"; @@ -1176,7 +1440,7 @@ }; } { - name = "system.appcontext"; + pname = "system.appcontext"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.appcontext/4.3.0/system.appcontext.4.3.0.nupkg"; @@ -1184,7 +1448,7 @@ }; } { - name = "system.buffers"; + pname = "system.buffers"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.3.0/system.buffers.4.3.0.nupkg"; @@ -1192,7 +1456,7 @@ }; } { - name = "system.buffers"; + pname = "system.buffers"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.4.0/system.buffers.4.4.0.nupkg"; @@ -1200,15 +1464,7 @@ }; } { - name = "system.buffers"; - version = "4.5.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.0/system.buffers.4.5.0.nupkg"; - sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; - }; - } - { - name = "system.buffers"; + pname = "system.buffers"; version = "4.5.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; @@ -1216,7 +1472,7 @@ }; } { - name = "system.codedom"; + pname = "system.codedom"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.codedom/4.4.0/system.codedom.4.4.0.nupkg"; @@ -1224,7 +1480,7 @@ }; } { - name = "system.collections"; + pname = "system.collections"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections/4.0.11/system.collections.4.0.11.nupkg"; @@ -1232,7 +1488,7 @@ }; } { - name = "system.collections"; + pname = "system.collections"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections/4.3.0/system.collections.4.3.0.nupkg"; @@ -1240,7 +1496,7 @@ }; } { - name = "system.collections.concurrent"; + pname = "system.collections.concurrent"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg"; @@ -1248,7 +1504,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "1.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg"; @@ -1256,7 +1512,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "1.7.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.7.1/system.collections.immutable.1.7.1.nupkg"; @@ -1264,7 +1520,7 @@ }; } { - name = "system.collections.immutable"; + pname = "system.collections.immutable"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"; @@ -1272,7 +1528,15 @@ }; } { - name = "system.componentmodel.composition"; + pname = "system.componentmodel.annotations"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.annotations/5.0.0/system.componentmodel.annotations.5.0.0.nupkg"; + sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; + }; + } + { + pname = "system.componentmodel.composition"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.composition/4.5.0/system.componentmodel.composition.4.5.0.nupkg"; @@ -1280,7 +1544,7 @@ }; } { - name = "system.composition"; + pname = "system.composition"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition/1.0.31/system.composition.1.0.31.nupkg"; @@ -1288,7 +1552,7 @@ }; } { - name = "system.composition.attributedmodel"; + pname = "system.composition.attributedmodel"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.attributedmodel/1.0.31/system.composition.attributedmodel.1.0.31.nupkg"; @@ -1296,7 +1560,7 @@ }; } { - name = "system.composition.convention"; + pname = "system.composition.convention"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.convention/1.0.31/system.composition.convention.1.0.31.nupkg"; @@ -1304,7 +1568,7 @@ }; } { - name = "system.composition.hosting"; + pname = "system.composition.hosting"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.hosting/1.0.31/system.composition.hosting.1.0.31.nupkg"; @@ -1312,7 +1576,7 @@ }; } { - name = "system.composition.runtime"; + pname = "system.composition.runtime"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.runtime/1.0.31/system.composition.runtime.1.0.31.nupkg"; @@ -1320,7 +1584,7 @@ }; } { - name = "system.composition.typedparts"; + pname = "system.composition.typedparts"; version = "1.0.31"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.composition.typedparts/1.0.31/system.composition.typedparts.1.0.31.nupkg"; @@ -1328,7 +1592,7 @@ }; } { - name = "system.configuration.configurationmanager"; + pname = "system.configuration.configurationmanager"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.configuration.configurationmanager/4.7.0/system.configuration.configurationmanager.4.7.0.nupkg"; @@ -1336,7 +1600,7 @@ }; } { - name = "system.console"; + pname = "system.console"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.console/4.3.0/system.console.4.3.0.nupkg"; @@ -1344,7 +1608,15 @@ }; } { - name = "system.diagnostics.debug"; + pname = "system.diagnostics.debug"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.0.11/system.diagnostics.debug.4.0.11.nupkg"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + }; + } + { + pname = "system.diagnostics.debug"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; @@ -1352,7 +1624,7 @@ }; } { - name = "system.diagnostics.diagnosticsource"; + pname = "system.diagnostics.diagnosticsource"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg"; @@ -1360,15 +1632,31 @@ }; } { - name = "system.diagnostics.diagnosticsource"; - version = "5.0.0"; + pname = "system.diagnostics.diagnosticsource"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/5.0.0/system.diagnostics.diagnosticsource.5.0.0.nupkg"; - sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/6.0.0/system.diagnostics.diagnosticsource.6.0.0.nupkg"; + sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }; } { - name = "system.diagnostics.tools"; + pname = "system.diagnostics.process"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.process/4.3.0/system.diagnostics.process.4.3.0.nupkg"; + sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; + }; + } + { + pname = "system.diagnostics.tools"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.0.1/system.diagnostics.tools.4.0.1.nupkg"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }; + } + { + pname = "system.diagnostics.tools"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.3.0/system.diagnostics.tools.4.3.0.nupkg"; @@ -1376,7 +1664,7 @@ }; } { - name = "system.diagnostics.tracing"; + pname = "system.diagnostics.tracing"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; @@ -1384,7 +1672,7 @@ }; } { - name = "system.drawing.common"; + pname = "system.drawing.common"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.drawing.common/4.7.0/system.drawing.common.4.7.0.nupkg"; @@ -1392,7 +1680,15 @@ }; } { - name = "system.formats.asn1"; + pname = "system.dynamic.runtime"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }; + } + { + pname = "system.formats.asn1"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.formats.asn1/5.0.0/system.formats.asn1.5.0.0.nupkg"; @@ -1400,7 +1696,7 @@ }; } { - name = "system.globalization"; + pname = "system.globalization"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; @@ -1408,7 +1704,7 @@ }; } { - name = "system.globalization"; + pname = "system.globalization"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; @@ -1416,7 +1712,7 @@ }; } { - name = "system.globalization.calendars"; + pname = "system.globalization.calendars"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg"; @@ -1424,7 +1720,7 @@ }; } { - name = "system.globalization.extensions"; + pname = "system.globalization.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg"; @@ -1432,7 +1728,7 @@ }; } { - name = "system.io"; + pname = "system.io"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io/4.1.0/system.io.4.1.0.nupkg"; @@ -1440,7 +1736,7 @@ }; } { - name = "system.io"; + pname = "system.io"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io/4.3.0/system.io.4.3.0.nupkg"; @@ -1448,7 +1744,7 @@ }; } { - name = "system.io.compression"; + pname = "system.io.compression"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.compression/4.3.0/system.io.compression.4.3.0.nupkg"; @@ -1456,7 +1752,7 @@ }; } { - name = "system.io.compression.zipfile"; + pname = "system.io.compression.zipfile"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.compression.zipfile/4.3.0/system.io.compression.zipfile.4.3.0.nupkg"; @@ -1464,7 +1760,15 @@ }; } { - name = "system.io.filesystem"; + pname = "system.io.filesystem"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.0.1/system.io.filesystem.4.0.1.nupkg"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + }; + } + { + pname = "system.io.filesystem"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; @@ -1472,7 +1776,15 @@ }; } { - name = "system.io.filesystem.primitives"; + pname = "system.io.filesystem.primitives"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.0.1/system.io.filesystem.primitives.4.0.1.nupkg"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + }; + } + { + pname = "system.io.filesystem.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; @@ -1480,7 +1792,7 @@ }; } { - name = "system.io.pipelines"; + pname = "system.io.pipelines"; version = "4.7.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/4.7.3/system.io.pipelines.4.7.3.nupkg"; @@ -1488,7 +1800,7 @@ }; } { - name = "system.io.pipelines"; + pname = "system.io.pipelines"; version = "5.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.1/system.io.pipelines.5.0.1.nupkg"; @@ -1496,7 +1808,15 @@ }; } { - name = "system.linq"; + pname = "system.linq"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.linq/4.1.0/system.linq.4.1.0.nupkg"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + }; + } + { + pname = "system.linq"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.linq/4.3.0/system.linq.4.3.0.nupkg"; @@ -1504,7 +1824,15 @@ }; } { - name = "system.linq.expressions"; + pname = "system.linq.expressions"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.1.0/system.linq.expressions.4.1.0.nupkg"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }; + } + { + pname = "system.linq.expressions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg"; @@ -1512,7 +1840,7 @@ }; } { - name = "system.memory"; + pname = "system.memory"; version = "4.5.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.3/system.memory.4.5.3.nupkg"; @@ -1520,7 +1848,7 @@ }; } { - name = "system.memory"; + pname = "system.memory"; version = "4.5.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.4/system.memory.4.5.4.nupkg"; @@ -1528,7 +1856,7 @@ }; } { - name = "system.net.http"; + pname = "system.net.http"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.0/system.net.http.4.3.0.nupkg"; @@ -1536,7 +1864,23 @@ }; } { - name = "system.net.primitives"; + pname = "system.net.http"; + version = "4.3.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.4/system.net.http.4.3.4.nupkg"; + sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; + }; + } + { + pname = "system.net.nameresolution"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.net.nameresolution/4.3.0/system.net.nameresolution.4.3.0.nupkg"; + sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; + }; + } + { + pname = "system.net.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; @@ -1544,7 +1888,7 @@ }; } { - name = "system.net.sockets"; + pname = "system.net.sockets"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg"; @@ -1552,7 +1896,7 @@ }; } { - name = "system.net.websockets"; + pname = "system.net.websockets"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.net.websockets/4.3.0/system.net.websockets.4.3.0.nupkg"; @@ -1560,7 +1904,7 @@ }; } { - name = "system.numerics.vectors"; + pname = "system.numerics.vectors"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; @@ -1568,7 +1912,7 @@ }; } { - name = "system.numerics.vectors"; + pname = "system.numerics.vectors"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; @@ -1576,7 +1920,15 @@ }; } { - name = "system.objectmodel"; + pname = "system.objectmodel"; + version = "4.0.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.0.12/system.objectmodel.4.0.12.nupkg"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }; + } + { + pname = "system.objectmodel"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg"; @@ -1584,7 +1936,15 @@ }; } { - name = "system.reactive"; + pname = "system.private.uri"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg"; + sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; + }; + } + { + pname = "system.reactive"; version = "4.4.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reactive/4.4.1/system.reactive.4.4.1.nupkg"; @@ -1592,7 +1952,7 @@ }; } { - name = "system.reflection"; + pname = "system.reflection"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; @@ -1600,7 +1960,7 @@ }; } { - name = "system.reflection"; + pname = "system.reflection"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; @@ -1608,7 +1968,7 @@ }; } { - name = "system.reflection.dispatchproxy"; + pname = "system.reflection.dispatchproxy"; version = "4.5.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.dispatchproxy/4.5.1/system.reflection.dispatchproxy.4.5.1.nupkg"; @@ -1616,7 +1976,15 @@ }; } { - name = "system.reflection.emit"; + pname = "system.reflection.emit"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.0.1/system.reflection.emit.4.0.1.nupkg"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }; + } + { + pname = "system.reflection.emit"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg"; @@ -1624,15 +1992,15 @@ }; } { - name = "system.reflection.emit"; - version = "4.6.0"; + pname = "system.reflection.emit.ilgeneration"; + version = "4.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.6.0/system.reflection.emit.4.6.0.nupkg"; - sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.0.1/system.reflection.emit.ilgeneration.4.0.1.nupkg"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }; } { - name = "system.reflection.emit.ilgeneration"; + pname = "system.reflection.emit.ilgeneration"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.3.0/system.reflection.emit.ilgeneration.4.3.0.nupkg"; @@ -1640,15 +2008,15 @@ }; } { - name = "system.reflection.emit.ilgeneration"; - version = "4.6.0"; + pname = "system.reflection.emit.lightweight"; + version = "4.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.6.0/system.reflection.emit.ilgeneration.4.6.0.nupkg"; - sha256 = "0jxc26k5q0rwrldi30bfbrfw4jh3kvribzwc8ryzr24kmhr3vv96"; + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.0.1/system.reflection.emit.lightweight.4.0.1.nupkg"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }; } { - name = "system.reflection.emit.lightweight"; + pname = "system.reflection.emit.lightweight"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg"; @@ -1656,15 +2024,15 @@ }; } { - name = "system.reflection.emit.lightweight"; - version = "4.6.0"; + pname = "system.reflection.extensions"; + version = "4.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.6.0/system.reflection.emit.lightweight.4.6.0.nupkg"; - sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.0.1/system.reflection.extensions.4.0.1.nupkg"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }; } { - name = "system.reflection.extensions"; + pname = "system.reflection.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg"; @@ -1672,7 +2040,7 @@ }; } { - name = "system.reflection.metadata"; + pname = "system.reflection.metadata"; version = "1.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg"; @@ -1680,7 +2048,7 @@ }; } { - name = "system.reflection.metadata"; + pname = "system.reflection.metadata"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"; @@ -1688,7 +2056,7 @@ }; } { - name = "system.reflection.primitives"; + pname = "system.reflection.primitives"; version = "4.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; @@ -1696,7 +2064,7 @@ }; } { - name = "system.reflection.primitives"; + pname = "system.reflection.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; @@ -1704,7 +2072,15 @@ }; } { - name = "system.reflection.typeextensions"; + pname = "system.reflection.typeextensions"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }; + } + { + pname = "system.reflection.typeextensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.3.0/system.reflection.typeextensions.4.3.0.nupkg"; @@ -1712,7 +2088,7 @@ }; } { - name = "system.resources.extensions"; + pname = "system.resources.extensions"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg"; @@ -1720,7 +2096,7 @@ }; } { - name = "system.resources.resourcemanager"; + pname = "system.resources.resourcemanager"; version = "4.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; @@ -1728,7 +2104,7 @@ }; } { - name = "system.resources.resourcemanager"; + pname = "system.resources.resourcemanager"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; @@ -1736,7 +2112,7 @@ }; } { - name = "system.runtime"; + pname = "system.runtime"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; @@ -1744,7 +2120,7 @@ }; } { - name = "system.runtime"; + pname = "system.runtime"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; @@ -1752,7 +2128,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.4.0/system.runtime.compilerservices.unsafe.4.4.0.nupkg"; @@ -1760,7 +2136,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.5.2"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.2/system.runtime.compilerservices.unsafe.4.5.2.nupkg"; @@ -1768,7 +2144,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.5.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.3/system.runtime.compilerservices.unsafe.4.5.3.nupkg"; @@ -1776,15 +2152,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; - version = "4.7.0"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.0/system.runtime.compilerservices.unsafe.4.7.0.nupkg"; - sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; - }; - } - { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "4.7.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg"; @@ -1792,7 +2160,7 @@ }; } { - name = "system.runtime.compilerservices.unsafe"; + pname = "system.runtime.compilerservices.unsafe"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg"; @@ -1800,7 +2168,15 @@ }; } { - name = "system.runtime.extensions"; + pname = "system.runtime.compilerservices.unsafe"; + version = "6.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg"; + sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; + }; + } + { + pname = "system.runtime.extensions"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; @@ -1808,7 +2184,7 @@ }; } { - name = "system.runtime.extensions"; + pname = "system.runtime.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; @@ -1816,7 +2192,7 @@ }; } { - name = "system.runtime.handles"; + pname = "system.runtime.handles"; version = "4.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; @@ -1824,7 +2200,7 @@ }; } { - name = "system.runtime.handles"; + pname = "system.runtime.handles"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; @@ -1832,7 +2208,7 @@ }; } { - name = "system.runtime.interopservices"; + pname = "system.runtime.interopservices"; version = "4.1.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; @@ -1840,7 +2216,7 @@ }; } { - name = "system.runtime.interopservices"; + pname = "system.runtime.interopservices"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; @@ -1848,7 +2224,7 @@ }; } { - name = "system.runtime.interopservices.runtimeinformation"; + pname = "system.runtime.interopservices.runtimeinformation"; version = "4.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg"; @@ -1856,7 +2232,7 @@ }; } { - name = "system.runtime.interopservices.runtimeinformation"; + pname = "system.runtime.interopservices.runtimeinformation"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg"; @@ -1864,7 +2240,7 @@ }; } { - name = "system.runtime.interopservices.windowsruntime"; + pname = "system.runtime.interopservices.windowsruntime"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.windowsruntime/4.3.0/system.runtime.interopservices.windowsruntime.4.3.0.nupkg"; @@ -1872,7 +2248,7 @@ }; } { - name = "system.runtime.numerics"; + pname = "system.runtime.numerics"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg"; @@ -1880,7 +2256,15 @@ }; } { - name = "system.security.accesscontrol"; + pname = "system.runtime.serialization.primitives"; + version = "4.1.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.serialization.primitives/4.1.1/system.runtime.serialization.primitives.4.1.1.nupkg"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + }; + } + { + pname = "system.security.accesscontrol"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.5.0/system.security.accesscontrol.4.5.0.nupkg"; @@ -1888,7 +2272,7 @@ }; } { - name = "system.security.accesscontrol"; + pname = "system.security.accesscontrol"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.6.0/system.security.accesscontrol.4.6.0.nupkg"; @@ -1896,7 +2280,7 @@ }; } { - name = "system.security.accesscontrol"; + pname = "system.security.accesscontrol"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.7.0/system.security.accesscontrol.4.7.0.nupkg"; @@ -1904,7 +2288,15 @@ }; } { - name = "system.security.cryptography.algorithms"; + pname = "system.security.claims"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.claims/4.3.0/system.security.claims.4.3.0.nupkg"; + sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; + }; + } + { + pname = "system.security.cryptography.algorithms"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg"; @@ -1912,7 +2304,7 @@ }; } { - name = "system.security.cryptography.algorithms"; + pname = "system.security.cryptography.algorithms"; version = "4.3.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.1/system.security.cryptography.algorithms.4.3.1.nupkg"; @@ -1920,7 +2312,7 @@ }; } { - name = "system.security.cryptography.cng"; + pname = "system.security.cryptography.cng"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.3.0/system.security.cryptography.cng.4.3.0.nupkg"; @@ -1928,7 +2320,7 @@ }; } { - name = "system.security.cryptography.cng"; + pname = "system.security.cryptography.cng"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.7.0/system.security.cryptography.cng.4.7.0.nupkg"; @@ -1936,7 +2328,7 @@ }; } { - name = "system.security.cryptography.cng"; + pname = "system.security.cryptography.cng"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/5.0.0/system.security.cryptography.cng.5.0.0.nupkg"; @@ -1944,7 +2336,7 @@ }; } { - name = "system.security.cryptography.csp"; + pname = "system.security.cryptography.csp"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.csp/4.3.0/system.security.cryptography.csp.4.3.0.nupkg"; @@ -1952,7 +2344,7 @@ }; } { - name = "system.security.cryptography.encoding"; + pname = "system.security.cryptography.encoding"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg"; @@ -1960,7 +2352,7 @@ }; } { - name = "system.security.cryptography.openssl"; + pname = "system.security.cryptography.openssl"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.openssl/4.3.0/system.security.cryptography.openssl.4.3.0.nupkg"; @@ -1968,7 +2360,7 @@ }; } { - name = "system.security.cryptography.pkcs"; + pname = "system.security.cryptography.pkcs"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.pkcs/4.7.0/system.security.cryptography.pkcs.4.7.0.nupkg"; @@ -1976,7 +2368,7 @@ }; } { - name = "system.security.cryptography.pkcs"; + pname = "system.security.cryptography.pkcs"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.pkcs/5.0.0/system.security.cryptography.pkcs.5.0.0.nupkg"; @@ -1984,7 +2376,7 @@ }; } { - name = "system.security.cryptography.primitives"; + pname = "system.security.cryptography.primitives"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg"; @@ -1992,7 +2384,15 @@ }; } { - name = "system.security.cryptography.protecteddata"; + pname = "system.security.cryptography.protecteddata"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.3.0/system.security.cryptography.protecteddata.4.3.0.nupkg"; + sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9"; + }; + } + { + pname = "system.security.cryptography.protecteddata"; version = "4.4.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.4.0/system.security.cryptography.protecteddata.4.4.0.nupkg"; @@ -2000,7 +2400,7 @@ }; } { - name = "system.security.cryptography.protecteddata"; + pname = "system.security.cryptography.protecteddata"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.7.0/system.security.cryptography.protecteddata.4.7.0.nupkg"; @@ -2008,7 +2408,7 @@ }; } { - name = "system.security.cryptography.x509certificates"; + pname = "system.security.cryptography.x509certificates"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg"; @@ -2016,7 +2416,7 @@ }; } { - name = "system.security.cryptography.xml"; + pname = "system.security.cryptography.xml"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.xml/4.7.0/system.security.cryptography.xml.4.7.0.nupkg"; @@ -2024,7 +2424,7 @@ }; } { - name = "system.security.permissions"; + pname = "system.security.permissions"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.permissions/4.5.0/system.security.permissions.4.5.0.nupkg"; @@ -2032,7 +2432,7 @@ }; } { - name = "system.security.permissions"; + pname = "system.security.permissions"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.permissions/4.7.0/system.security.permissions.4.7.0.nupkg"; @@ -2040,7 +2440,23 @@ }; } { - name = "system.security.principal.windows"; + pname = "system.security.principal"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }; + } + { + pname = "system.security.principal.windows"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.3.0/system.security.principal.windows.4.3.0.nupkg"; + sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; + }; + } + { + pname = "system.security.principal.windows"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.5.0/system.security.principal.windows.4.5.0.nupkg"; @@ -2048,7 +2464,7 @@ }; } { - name = "system.security.principal.windows"; + pname = "system.security.principal.windows"; version = "4.6.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.6.0/system.security.principal.windows.4.6.0.nupkg"; @@ -2056,7 +2472,7 @@ }; } { - name = "system.security.principal.windows"; + pname = "system.security.principal.windows"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.7.0/system.security.principal.windows.4.7.0.nupkg"; @@ -2064,7 +2480,7 @@ }; } { - name = "system.text.encoding"; + pname = "system.text.encoding"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; @@ -2072,7 +2488,7 @@ }; } { - name = "system.text.encoding"; + pname = "system.text.encoding"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; @@ -2080,7 +2496,7 @@ }; } { - name = "system.text.encoding.codepages"; + pname = "system.text.encoding.codepages"; version = "4.0.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; @@ -2088,7 +2504,7 @@ }; } { - name = "system.text.encoding.codepages"; + pname = "system.text.encoding.codepages"; version = "4.5.1"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg"; @@ -2096,7 +2512,15 @@ }; } { - name = "system.text.encoding.extensions"; + pname = "system.text.encoding.extensions"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.0.11/system.text.encoding.extensions.4.0.11.nupkg"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }; + } + { + pname = "system.text.encoding.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; @@ -2104,39 +2528,47 @@ }; } { - name = "system.text.encodings.web"; - version = "4.7.0"; + pname = "system.text.encodings.web"; + version = "5.0.1"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/4.7.0/system.text.encodings.web.4.7.0.nupkg"; - sha256 = "0sd3bihfar5rwm6nib4lhyys306nkm02qvk6p6sgzmnlfmma2wn3"; + url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/5.0.1/system.text.encodings.web.5.0.1.nupkg"; + sha256 = "00yg63qnp94q2qryxxggzigi276bibb8b3b96gcvsyrxy7b703n9"; }; } { - name = "system.text.encodings.web"; - version = "5.0.0"; + pname = "system.text.encodings.web"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/5.0.0/system.text.encodings.web.5.0.0.nupkg"; - sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; + url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/6.0.0/system.text.encodings.web.6.0.0.nupkg"; + sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }; } { - name = "system.text.json"; - version = "4.7.0"; + pname = "system.text.json"; + version = "5.0.2"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.0/system.text.json.4.7.0.nupkg"; - sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; + url = "https://api.nuget.org/v3-flatcontainer/system.text.json/5.0.2/system.text.json.5.0.2.nupkg"; + sha256 = "0vd0wd29cdhgcjngl9sw391sn2s8xm974y15zvym0whsdgjwiqfx"; }; } { - name = "system.text.json"; - version = "5.0.0"; + pname = "system.text.json"; + version = "6.0.0"; src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.text.json/5.0.0/system.text.json.5.0.0.nupkg"; - sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; + url = "https://api.nuget.org/v3-flatcontainer/system.text.json/6.0.0/system.text.json.6.0.0.nupkg"; + sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }; } { - name = "system.text.regularexpressions"; + pname = "system.text.regularexpressions"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.1.0/system.text.regularexpressions.4.1.0.nupkg"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }; + } + { + pname = "system.text.regularexpressions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg"; @@ -2144,7 +2576,7 @@ }; } { - name = "system.threading"; + pname = "system.threading"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading/4.0.11/system.threading.4.0.11.nupkg"; @@ -2152,7 +2584,7 @@ }; } { - name = "system.threading"; + pname = "system.threading"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading/4.3.0/system.threading.4.3.0.nupkg"; @@ -2160,7 +2592,15 @@ }; } { - name = "system.threading.tasks"; + pname = "system.threading.overlapped"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.overlapped/4.3.0/system.threading.overlapped.4.3.0.nupkg"; + sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; + }; + } + { + pname = "system.threading.tasks"; version = "4.0.11"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; @@ -2168,7 +2608,7 @@ }; } { - name = "system.threading.tasks"; + pname = "system.threading.tasks"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; @@ -2176,7 +2616,7 @@ }; } { - name = "system.threading.tasks.dataflow"; + pname = "system.threading.tasks.dataflow"; version = "5.0.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.dataflow/5.0.0/system.threading.tasks.dataflow.5.0.0.nupkg"; @@ -2184,7 +2624,15 @@ }; } { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; + version = "4.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.0.0/system.threading.tasks.extensions.4.0.0.nupkg"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }; + } + { + pname = "system.threading.tasks.extensions"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg"; @@ -2192,15 +2640,7 @@ }; } { - name = "system.threading.tasks.extensions"; - version = "4.5.2"; - src = fetchurl { - url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.2/system.threading.tasks.extensions.4.5.2.nupkg"; - sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; - }; - } - { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; version = "4.5.3"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.3/system.threading.tasks.extensions.4.5.3.nupkg"; @@ -2208,7 +2648,7 @@ }; } { - name = "system.threading.tasks.extensions"; + pname = "system.threading.tasks.extensions"; version = "4.5.4"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg"; @@ -2216,7 +2656,23 @@ }; } { - name = "system.threading.timer"; + pname = "system.threading.thread"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg"; + sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; + }; + } + { + pname = "system.threading.threadpool"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }; + } + { + pname = "system.threading.timer"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.threading.timer/4.3.0/system.threading.timer.4.3.0.nupkg"; @@ -2224,7 +2680,7 @@ }; } { - name = "system.valuetuple"; + pname = "system.valuetuple"; version = "4.5.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"; @@ -2232,7 +2688,7 @@ }; } { - name = "system.windows.extensions"; + pname = "system.windows.extensions"; version = "4.7.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.windows.extensions/4.7.0/system.windows.extensions.4.7.0.nupkg"; @@ -2240,7 +2696,15 @@ }; } { - name = "system.xml.readerwriter"; + pname = "system.xml.readerwriter"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.0.11/system.xml.readerwriter.4.0.11.nupkg"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + }; + } + { + pname = "system.xml.readerwriter"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg"; @@ -2248,7 +2712,15 @@ }; } { - name = "system.xml.xdocument"; + pname = "system.xml.xdocument"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.0.11/system.xml.xdocument.4.0.11.nupkg"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }; + } + { + pname = "system.xml.xdocument"; version = "4.3.0"; src = fetchurl { url = "https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.3.0/system.xml.xdocument.4.3.0.nupkg"; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 93493452d238..66648faed1d8 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.36.1"; + version = "0.38.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-Eoc+1Jwv0xUAQNtyHWCKezcpV6zWMFgNYtmkqAoedV0="; + sha256 = "sha256-x8mSlZ2X0DdkhaW5QXs5axERJkwARu8tHueQHXfamXM="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index 23bd877a698e..fabc6e5ac4b9 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.12.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+AWkzv6SI/d3p1ljopSyLg2qi1hv6PsynmVG7+lUSTw="; + sha256 = "sha256-BusShYGgaUGwLMWr/EHS7kDUTnTJyHzWUztlaMJskAg="; }; - vendorSha256 = "sha256-jYBkC0IA2xbRa+56CW/5EWG8sYg3eRuFdLpOFSinuuw="; + vendorSha256 = "sha256-VH2ALKSr+UFk26Y5/1yhLP//wc1t8f9O5dMg0RGz4ZM="; doCheck = false; diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix index 31085e748c2c..32be12511612 100644 --- a/pkgs/development/tools/oq/default.nix +++ b/pkgs/development/tools/oq/default.nix @@ -8,13 +8,13 @@ crystal.buildCrystalPackage rec { pname = "oq"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Blacksmoke16"; repo = pname; rev = "v${version}"; - sha256 = "sha256-La2oi+r9sCmnacgjQe+LcTQ7EXKorSoTTD4LhNtQsYk="; + sha256 = "sha256-iGKyP3NrAnR3ISOBq+YR/vwarlnIY4u4ZwdqSBnBC7U="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/oras/default.nix b/pkgs/development/tools/oras/default.nix new file mode 100644 index 000000000000..94a81144ccc2 --- /dev/null +++ b/pkgs/development/tools/oras/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "oras"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "oras-project"; + repo = "oras"; + rev = "v${version}"; + sha256 = "sha256-6W7vmWFjULIJnOVtgSrCEKw/83W8jNSbM0AF4LZZR6U="; + }; + vendorSha256 = "sha256-3UKsH4Jbq7G5PRwhn5lW0NR80jhmuzT9daa++v2sFWk="; + + ldflags = [ + "-s" + "-w" + "-X github.com/oras-project/oras/internal/version.Version=${version}" + "-X github.com/oras-project/oras/internal/version.BuildMetadata=" + "-X github.com/oras-project/oras/internal/version.GitTreeState=clean" + ]; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/oras --help + $out/bin/oras version | grep "${version}" + + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://oras.land/"; + changelog = "https://github.com/oras-project/oras/releases/tag/v${version}"; + description = "The ORAS project provides a way to push and pull OCI Artifacts to and from OCI Registries"; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/development/tools/oshka/default.nix b/pkgs/development/tools/oshka/default.nix index bf31a9d9f311..5e7ca5a7da2a 100644 --- a/pkgs/development/tools/oshka/default.nix +++ b/pkgs/development/tools/oshka/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "oshka"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "k1LoW"; repo = pname; rev = "v${version}"; - sha256 = "1niyy7yiynpwa2cvcj4r3305v8ca4324q512839y79s3izd6a1lf"; + sha256 = "sha256-fpWhqFK5h/U7DCC/SyhAlMyCMhjZHRLMlwakvlhOd3w="; }; - vendorSha256 = "08aj3nmj8angizkd3rbwbm7qzqxwrgfm1rka2x2a096z6mc3f4k4"; + vendorSha256 = "sha256-ZBI3WDXfJKBEF2rmUN3LvOOPT1185dHmj88qJKsdUiE="; ldflags = [ "-w" diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index fb4abb21c58b..212a710de6e2 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; rev = version; - sha256 = "sha256-/YKj6JkVbQ4Fz+KSmBIRQ7F7A8fxi5Eg+pvKwhjpGYQ="; + sha256 = "sha256-KJyGDrT3dr8DfjfRrWIENoBFuiWrgQx4qz1V+mT8/yI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index e7d5c30b0a5c..d42bb9e2860a 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "packer"; - version = "1.7.9"; + version = "1.8.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-e2G4kxcizE2lfdryS4S04OwWxseyUqGS0SAaBdiXax0="; + sha256 = "sha256-rvOfDMALzZx8LfChgB3nC4GCTlSET43SkhW1EkA59zo="; }; - vendorSha256 = "sha256-5YcDaGbvw6xo5J8mtJ3CUS8JNCqKUD7kdUyfYIkQ6aE="; + vendorSha256 = "sha256-ZQ+7F49VnpPtxWlZVBez2mpVCx8gIPEDKBD5qM9NcMo="; subPackages = [ "." ]; @@ -32,9 +32,8 @@ buildGoModule rec { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = "https://www.packer.io"; license = licenses.mpl20; - maintainers = with maintainers; [ cstrahan zimbatm ma27 ]; + maintainers = with maintainers; [ cstrahan zimbatm ma27 techknowlogick ]; changelog = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md"; platforms = platforms.unix; - broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 }; } diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index 723e5d8bb2d1..61e9b210683f 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/pkgs/development/tools/packet/default.nix @@ -1,25 +1,25 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packet"; - version = "v2.2.2"; + version = "2.2.2"; goPackagePath = "github.com/ebsarr/packet"; - src = fetchgit { - rev = version; - url = "https://github.com/ebsarr/packet"; - sha256 = "18n8f2rlab4icb28k1b9gnh30zy382v792x07fmcdqq4nkw6wvwf"; + src = fetchFromGitHub { + owner = "ebsarr"; + repo = "packet"; + rev = "v${version}"; + sha256 = "sha256-jm9u+LQE48aqO6CLdLZAw38woH1phYnEYpEsRbNwyKI="; }; goDeps = ./deps.nix; - meta = { + meta = with lib; { description = "a CLI tool to manage packet.net services"; homepage = "https://github.com/ebsarr/packet"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.grahamc ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ grahamc ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index b02af6e7e86c..90bd3f38c3b6 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "byacc"; - version = "20211224"; + version = "20220128"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "sha256-e8QoZ6CV3yGJYYtkSXAWKYgY6I5RP8p5LLWtyaaOv7g="; + sha256 = "sha256-QsGAXMUpMU5qdjJv4bM+gMcIYqRLAUdNo2Li99stdJw="; }; configureFlags = [ diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 58f0bb54fb1a..8991c1419f2a 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -47,6 +47,10 @@ stdenv.mkDerivation rec { dontDisableStatic = stdenv.buildPlatform != stdenv.hostPlatform; + postInstall = '' + ln -s $out/bin/flex $out/bin/lex + ''; + meta = with lib; { homepage = "https://github.com/westes/flex"; description = "A fast lexical analyser generator"; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index 402f83bea16b..86697c0acdcb 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, glib, pkg-config, scons }: +{ lib, stdenv, fetchFromGitHub, glib, pkg-config, scons }: stdenv.mkDerivation { pname = "hammer"; version = "e7aa734"; - src = fetchgit { - url = "git://github.com/UpstandingHackers/hammer"; - sha256 = "01l0wbhz7dymxlndacin2vi8sqwjlw81ds2i9xyi200w51nsdm38"; + src = fetchFromGitHub { + owner = "UpstandingHackers"; + repo = "hammer"; rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533"; + sha256 = "sha256-aNSmbSgcABF9T1HoFhCnkmON4hY2MtUs7dW38+HigAY="; }; nativeBuildInputs = [ pkg-config scons ]; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index c23b352decea..8e000cd0fc29 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, transfig, tex, ghostscript, colm +{ lib, stdenv, fetchurl, fig2dev, tex, ghostscript, colm , build-manual ? false }: @@ -13,7 +13,7 @@ let inherit sha256; }; - buildInputs = lib.optional build-manual [ transfig ghostscript tex ]; + buildInputs = lib.optional build-manual [ fig2dev ghostscript tex ]; preConfigure = lib.optionalString build-manual '' sed -i "s/build_manual=no/build_manual=yes/g" DIST diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index c3b09b71d173..41ec653a409b 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -2,18 +2,19 @@ , stdenv , fetchFromGitHub , autoreconfHook +, nix-update-script , python3 }: stdenv.mkDerivation rec { pname = "re2c"; - version = "2.2"; + version = "3.0"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - sha256 = "0snfxk1cf2f4dy4hcxd1fx1grav3di0qjgqqn97k85zsf9f6ys78"; + sha256 = "sha256-ovwmltu97fzNQT0oZHefrAo4yV9HV1NwcY4PTSM5Bro="; }; nativeBuildInputs = [ @@ -28,6 +29,12 @@ stdenv.mkDerivation rec { patchShebangs run_tests.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "Tool for writing very fast and very flexible scanners"; homepage = "https://re2c.org"; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index e81e5e48bdf6..e3d74600c955 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -20,6 +20,7 @@ , enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic , webUISupport ? false +, extraGrammars ? {} }: # TODO: move to carnix or https://github.com/kolloch/crate2nix @@ -29,9 +30,9 @@ let # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) OPTIONAL: Set GITHUB_TOKEN env variable to avoid api rate limit # 4) run the ./result script that is output by that (it updates ./grammars) - version = "0.20.4"; - sha256 = "sha256-H/7j4HnaccmaH5m/FMTbi01uA3JtKVHiJLTQ4VZ7jfo="; - cargoSha256 = "sha256-Pf/gVBQFssOomzq0IZp5H7MYwvFBRjMYfifLKCB7DCs="; + version = "0.20.6"; + sha256 = "sha256-zaxy8VCfJKK8NtfuFFojmmP5a19FP1zO/eB5q1EoQPw="; + cargoSha256 = "sha256-sOOhzm2nz+HC6dvT+8hj/wh19o+OB2zQ6Uz+H89txSA="; src = fetchFromGitHub { owner = "tree-sitter"; @@ -51,26 +52,26 @@ let runCommand "grammars" { } ('' mkdir $out '' + (lib.concatStrings (lib.mapAttrsToList - (name: grammar: "ln -s ${fetchGrammar grammar} $out/${name}\n") + (name: grammar: "ln -s ${if grammar ? src then grammar.src else fetchGrammar grammar} $out/${name}\n") (import ./grammars { inherit lib; })))); - builtGrammars = let change = name: grammar: callPackage ./grammar.nix { } { - language = name; + language = if grammar ? language then grammar.language else name; inherit version; - source = fetchGrammar grammar; + source = if grammar ? src then grammar.src else fetchGrammar grammar; location = if grammar ? location then grammar.location else null; }; - grammars' = (import ./grammars { inherit lib; }); + grammars' = import ./grammars { inherit lib; } // extraGrammars; grammars = grammars' // { tree-sitter-ocaml = grammars'.tree-sitter-ocaml // { location = "ocaml"; }; } // { tree-sitter-ocaml-interface = grammars'.tree-sitter-ocaml // { location = "interface"; }; } // + { tree-sitter-org-nvim = grammars'.tree-sitter-org-nvim // { language = "org"; }; } // { tree-sitter-typescript = grammars'.tree-sitter-typescript // { location = "typescript"; }; } // { tree-sitter-tsx = grammars'.tree-sitter-typescript // { location = "tsx"; }; }; in - lib.mapAttrs change grammars; + lib.mapAttrs change (grammars); # Usage: # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ]) @@ -94,7 +95,7 @@ let (lib.strings.replaceStrings [ "-" ] [ "_" ] (lib.strings.removePrefix "tree-sitter-" (lib.strings.removeSuffix "-grammar" name))) - + stdenv.hostPlatform.extensions.sharedLibrary; + + ".so"; path = "${drv}/parser"; } ) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index a001573b4827..b7ae694c9181 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -34,6 +34,7 @@ tree-sitter-gomod = lib.importJSON ./tree-sitter-gomod.json; tree-sitter-graphql = lib.importJSON ./tree-sitter-graphql.json; tree-sitter-haskell = lib.importJSON ./tree-sitter-haskell.json; + tree-sitter-hcl = lib.importJSON ./tree-sitter-hcl.json; tree-sitter-heex = lib.importJSON ./tree-sitter-heex.json; tree-sitter-hjson = lib.importJSON ./tree-sitter-hjson.json; tree-sitter-html = lib.importJSON ./tree-sitter-html.json; @@ -54,7 +55,7 @@ tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json; tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json; tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json; - tree-sitter-org = lib.importJSON ./tree-sitter-org.json; + tree-sitter-org-nvim = lib.importJSON ./tree-sitter-org-nvim.json; tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json; tree-sitter-php = lib.importJSON ./tree-sitter-php.json; tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json index 3fccfc5f7b01..4527f8d000e8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json @@ -1,9 +1,9 @@ { "url": "https://github.com/sogaiu/tree-sitter-clojure", - "rev": "39bf0977d223879436c1425fe6bfeb3bcfd86f92", - "date": "2021-08-15T13:16:31+09:00", - "path": "/nix/store/7kpf74gw4a68fby6jiw4n7lc4jfkgcf4-tree-sitter-clojure", - "sha256": "0ryj75znysvyvv4qaghygx1srrhlwhfmzmdilm652prkgj6yzh6b", + "rev": "1b24766fe9feacb8f5006233fe5c2ebd0ba31eff", + "date": "2022-02-19T08:24:15+09:00", + "path": "/nix/store/1vxhbw0dxg95z8rbs1b96nrcjvhrhb52-tree-sitter-clojure", + "sha256": "0sqi825gyjndn3v00kvk9scw6s5q0lr3ig6v49sccqc2addnr6di", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json index 61e0ee43fc7a..9e5bce1b0a43 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json @@ -1,9 +1,9 @@ { "url": "https://github.com/uyha/tree-sitter-cmake", - "rev": "f6616f1e417ee8b62daf251aa1daa5d73781c596", - "date": "2021-10-13T08:19:43+02:00", - "path": "/nix/store/p13qh130n5741wdfk2fbmy7ifd1z1zb2-tree-sitter-cmake", - "sha256": "1b5cc84d0gjm8nb73gdvfjxbk9fjrfkd5aay3b0qvk6gar59pcj6", + "rev": "5020572408a386d5d2dfac3516584f5edda7a49b", + "date": "2022-01-26T22:53:15+01:00", + "path": "/nix/store/in8jrkjf5vca2azpnyq2dgmzz9jcvjy6-tree-sitter-cmake", + "sha256": "0y49x8d36vdq2lcj67f3ms53qxym3578b3aw9gs2ckibwzrbfbgy", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json index cefe88d8be12..ed62f80e237d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/thehamsta/tree-sitter-commonlisp", - "rev": "4fd115d3bb7046cd094f21bfe5766c302dbf64cd", - "date": "2021-12-06T20:34:14+01:00", - "path": "/nix/store/vmyfmgyhnx0ipi16d1w7sxsdkprybzk7-tree-sitter-commonlisp", - "sha256": "1kmxmx93f34lba5g7kqa5fcijfak9zc9qydbid9dcqxw6kf65ncg", + "rev": "c7e814975ab0d0d04333d1f32391c41180c58919", + "date": "2022-01-28T21:33:11+01:00", + "path": "/nix/store/1696bj1f92y8vqfk71cha8bzk9cx9rls-tree-sitter-commonlisp", + "sha256": "1hq3pwrp8509scgn983g0mi8pjy2q21pms30xlc3q7yyjxvpsw7b", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 47c6b811ff16..dfbdbd5d9317 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "656d7ea44b2b0daece78791e30281e283f30001e", - "date": "2022-01-17T09:06:11-06:00", - "path": "/nix/store/w4qqya24zf0cd7rqw1440szrrad8nf23-tree-sitter-cpp", - "sha256": "0vfgv9rw8pw4d41p5rndy7cjw8w0k0vnn54cwpxkm3r2vblnjn58", + "rev": "a832195eb3685a279856bb480ce19cff19554b6d", + "date": "2022-03-14T15:34:21-05:00", + "path": "/nix/store/ixca3nass3hkf0pycf7zhz15h2yq11sk-tree-sitter-cpp", + "sha256": "1y0i3w21zg8khns97wy5wpw57bhni4c8faszaz9qb0nrgarbf3i6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json index d9fb78dd2723..282b95895ed7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json @@ -1,9 +1,9 @@ { "url": "https://github.com/thehamsta/tree-sitter-cuda", - "rev": "14cd86e18ba45e327017de5b3e0f8d8f7f8e98ec", - "date": "2022-01-24T00:39:28+01:00", - "path": "/nix/store/3lskjrhqd16ymvsbrwzcsdd80cyr7ljj-tree-sitter-cuda", - "sha256": "09qpl5mfv39788smz87zbzp04i3rdhsckjjqngvr0w24dsw30nyx", + "rev": "5178a7a5b25dc7ee4a69bf72f31bd6d3ff0a0795", + "date": "2022-03-16T21:48:20+01:00", + "path": "/nix/store/gd5s063qfyas370a9rd8mn9wc9d68s15-tree-sitter-cuda", + "sha256": "17zqpd27b09izpp9lvkgc1hcnq5nc58i98pak0qi46z85r6zgp6g", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json index 951daa9e3d9f..072f0eab727b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json @@ -1,9 +1,9 @@ { "url": "https://github.com/camdencheek/tree-sitter-dockerfile", - "rev": "7af32bc04a66ab196f5b9f92ac471f29372ae2ce", - "date": "2021-12-16T07:47:57-07:00", - "path": "/nix/store/gh1pnracilf89q9z5czqr4z7lkd480xb-tree-sitter-dockerfile", - "sha256": "06hy683mrp1jcg2ypd6msbmv0pm2z85y8nqxgrnbr9vbi6syvmp5", + "rev": "d34a0cebd094e830bdd2106a28cb2f1fb22401d8", + "date": "2022-01-27T11:20:14-07:00", + "path": "/nix/store/3whf6fv79zqk5w0d6jbzfgs5jzm4cll4-tree-sitter-dockerfile", + "sha256": "0kf4c4xs5naj8lpcmr3pbdvwj526wl9p6zphxxpimbll7qv6qfnd", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json index 63660cccfb3b..bc84c3b1f37c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json @@ -1,9 +1,9 @@ { "url": "https://github.com/rydesun/tree-sitter-dot", - "rev": "92877bac7033e409ccfb3f07fe28ef1dfd359457", - "date": "2021-10-13T19:28:51+08:00", - "path": "/nix/store/h3dyw3kcgw77lma750wjgr1n8pjllxn6-tree-sitter-dot", - "sha256": "1l8g348nqqil7lygkhzw1ydwf3q2m5786qddp1f9jg1bdrv9p8rl", + "rev": "917230743aa10f45a408fea2ddb54bbbf5fbe7b7", + "date": "2022-03-11T21:17:49+08:00", + "path": "/nix/store/3xvainpyzwpbhbm30mmvvgxpgh4agljh-tree-sitter-dot", + "sha256": "1q2rbv16dihlmrbxlpn0x03na7xp8rdhf58vwm3lryn3nfcjckn2", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json index b0bad04a86fb..c6257a25b157 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json @@ -1,9 +1,9 @@ { "url": "https://github.com/elixir-lang/tree-sitter-elixir", - "rev": "de20391afe5cb03ef1e8a8e43167e7b58cc52869", - "date": "2022-01-10T10:35:12-06:00", - "path": "/nix/store/099pwd7iv86g1j4fplgq33a4jpwbvv60-tree-sitter-elixir", - "sha256": "0zrkrwhw3g1vazsxcwrfd1fk4wvs9hdwmwp6073mfh370bz4140h", + "rev": "b4027d7cfc96935b50878bdf9faf80bd64ac73cf", + "date": "2022-03-04T15:40:04+00:00", + "path": "/nix/store/h3qh2s4q51bnq66p1v067g1fb8bd1743-tree-sitter-elixir", + "sha256": "1pf2n1j8j5w7mrh81yzvha1gh4w3vffngikj04kzd5gkx9asf3x6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json index 3618413500e1..19129d053a05 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json @@ -1,9 +1,9 @@ { "url": "https://github.com/elm-tooling/tree-sitter-elm", - "rev": "bd50ccf66b42c55252ac8efc1086af4ac6bab8cd", - "date": "2021-12-27T23:25:02+01:00", - "path": "/nix/store/l5b9nhvrnq4a105rpmfi59dpg2xqs5nr-tree-sitter-elm", - "sha256": "1ls9l81nkcyym92n6h983m3jjjxdlr27nxa21p9l6czwf34564ky", + "rev": "5128296ba8542853d59e6b7c8dfe3d1fb9a637ea", + "date": "2022-02-04T13:10:25+01:00", + "path": "/nix/store/8brpvn8y88x3f3dsbgqql57kp9bygj3w-tree-sitter-elm", + "sha256": "10hbi4vyj4hjixqswdcbvzl60prldczz29mlp02if61wvwiwvqrw", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json index b824f34f27a0..c948d53289b4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json @@ -1,9 +1,9 @@ { "url": "https://github.com/abstractmachineslab/tree-sitter-erlang", - "rev": "9d5fd0c329280a156bf7614a49dc5e8c58cc037c", - "date": "2021-08-03T11:57:52+02:00", - "path": "/nix/store/35ydhh12dgf4q016gjka35wnqnkwc1jg-tree-sitter-erlang", - "sha256": "0d6wl95wgys21vcix6j0bf7l000glkmk1n6shgcnp4baw9wxh009", + "rev": "fab680273af1a8f5cc0c3a0c62cbf5b1bea71f39", + "date": "2022-03-05T23:18:36+01:00", + "path": "/nix/store/vj28kyy3jg21qicwxq2g1ysrwfqd3mz9-tree-sitter-erlang", + "sha256": "0shzzik8yxwb76kxs3l0fccjwvkarck1q4wqyv5hdma6hwl52b69", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json index 8684e176cb69..5bea07ef1e3c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json @@ -1,9 +1,9 @@ { "url": "https://github.com/travonted/tree-sitter-fennel", - "rev": "fce4331731a960077ff5f98939bc675179f1908a", - "date": "2021-09-30T09:09:52-04:00", - "path": "/nix/store/mhpkw4gl6lzi306q21kckafqcdc0a715-tree-sitter-fennel", - "sha256": "1k8acyav26248liz0psk2r9dl7472mqgdyrjwg3pfxx94jgqjcik", + "rev": "d37fd84a702b78ff0282f223ece83c61ab062a6e", + "date": "2022-02-21T08:13:28-05:00", + "path": "/nix/store/lafx5rw9r9jp9056sv0sk89kxfjlb9x3-tree-sitter-fennel", + "sha256": "1wqvz8v877jh7shv50xbnx1bxvdlnfnpmndwzsb0smidnzx7lbw2", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json index b32445c2804c..a060a455955c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ram02z/tree-sitter-fish", - "rev": "04e54ab6585dfd4fee6ddfe5849af56f101b6d4f", - "date": "2021-08-02T21:46:56+01:00", - "path": "/nix/store/0n3jfh7gk16bmikix34y5m534ac12xgc-tree-sitter-fish", - "sha256": "1810z8ah1b09qpxcr4bh63bxsnxx24r6d2h46v2cpqv1lg0g4z14", + "rev": "d482d70ea8e191c05b2c1b613ed6fdff30a14da0", + "date": "2022-03-14T15:15:13+00:00", + "path": "/nix/store/5ajcf2hl1hph7iky6lwp5vh7a49k587s-tree-sitter-fish", + "sha256": "0idnm9lrvj1jhrvrgcddppkc09hr7inciz6k02d0nnxv8pqaw3w6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index 622f2863290c..49a04edbc37b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-go", - "rev": "0fa917a7022d1cd2e9b779a6a8fc5dc7fad69c75", - "date": "2022-01-06T10:54:10+01:00", - "path": "/nix/store/bw2hilbj37ys9lig2fzz58cvjy7nhn3l-tree-sitter-go", - "sha256": "0kgy4yyd0z8pydldnfwsfw2iwbhn4f43qxfhy94wvpwiwi74kfmg", + "rev": "07d722831382a043b16547b6d9202f3da07f3cb3", + "date": "2022-03-22T15:34:30+01:00", + "path": "/nix/store/9ay5gjwnip3jcmi096sw5fyi1kxqg1pk-tree-sitter-go", + "sha256": "0rc1p5jab08v1r81gzaz5xmxmbspl5i5zxba9immzax8ahzhhaxn", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 31114781f58c..e1d4462e225d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "d6ccd2d9c40bdec29fee0027ef04fe5ff1ae4ceb", - "date": "2022-01-07T03:13:04+01:00", - "path": "/nix/store/biyjfajma7nr175xviaw65jksqfak893-tree-sitter-haskell", - "sha256": "0zfxi3adqhy7d1w2dvnywkms8a4vfxkjswdhar7p5sxyps8a5wry", + "rev": "ed976b81b00ce7b72b99bca75e7a616cc526220c", + "date": "2022-03-20T00:05:14+01:00", + "path": "/nix/store/wzkfkix4q3vcrlsj2v4q32ihw0vdp1li-tree-sitter-haskell", + "sha256": "19g5f59gh6s4xpphrppmrqlh0nfld0q8zffy85pkby4gd6xh73zm", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json new file mode 100644 index 000000000000..24d731be7a2d --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/MichaHoffmann/tree-sitter-hcl", + "rev": "3cb7fc28247efbcb2973b97e71c78838ad98a583", + "date": "2021-09-20T21:50:41+02:00", + "path": "/nix/store/rgd0p162smlfn90ggyq3y6y4q9sgybwh-tree-sitter-hcl", + "sha256": "0hg7w3hsvxjwz1rb1izknn46msm4mkjx2cnq603lzn7i9mb1pbyr", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json index b6ff0d8a3260..654a89b5979b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/connorlay/tree-sitter-heex", - "rev": "d8b5b9f016cd3c7b0ee916cf031d9a2188c0fc44", - "date": "2022-01-23T20:01:08-08:00", - "path": "/nix/store/iv3vxp8cdnfhpr75gvqvm8hmvfw8hw51-tree-sitter-heex", - "sha256": "0dx6l9k6l5ibvrdb7x13lqnpj5nmjz8f5lc8j8wh4cq2jdabfw0k", + "rev": "592e22292a367312c35e13de7fdb888f029981d6", + "date": "2022-01-30T14:04:04-08:00", + "path": "/nix/store/21n6sqyvkfd0q5ass9nj2wgicm9ljmgv-tree-sitter-heex", + "sha256": "1k4nhlbbn7lqrjmkz8rr81rsrfkl9qfwm9q7qd2b18ygzr52payh", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json index 6f9344437bfa..664e31613c5d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-java", - "rev": "a24ae7d16de3517bff243a87d087d0b4877a65c5", - "date": "2022-01-12T08:57:59-08:00", - "path": "/nix/store/dipis7syj55xrmc72gvx2f9q672mn6dg-tree-sitter-java", - "sha256": "0p01xkxzdjwx32hd6k4kqidlhkgj8q9b9lp4g4fra5gx9w159iqm", + "rev": "881b84fe7078651af5077cc4cea4c85f9fddde3b", + "date": "2022-03-21T10:50:51+01:00", + "path": "/nix/store/ii1dwsg972sbllim6vrmjbcaw9fcy2b1-tree-sitter-java", + "sha256": "0kvqqrx669fyaxm55l0p5vbswf9bfknl0brsr6llyzdz81dl0vk4", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json index bfa5df37337e..739e6006c275 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/latex-lsp/tree-sitter-latex", - "rev": "6f796b700c69a8af28132e84ed6d0c8f0c17a5e2", - "date": "2022-01-11T19:20:05+01:00", - "path": "/nix/store/48rdm71qngr9szsfhr85708srwn6b4ra-tree-sitter-latex", - "sha256": "0rbaql6jh3kwa4fap3b438l1733h2pbiazdbjzv38bbigkirad0n", + "rev": "b71e4928a63a6d75bc1670004a5b5a98c850a149", + "date": "2022-03-16T20:19:11+01:00", + "path": "/nix/store/gzpihd6k8cqsl0facz7kfgn2dh294fxw-tree-sitter-latex", + "sha256": "1z2ywj57fpxaym6bv5ixvc01h8szazbhzmzzw960f49mlrima3n6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index 988f76792273..a11ac648fed2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,9 +1,9 @@ { - "url": "https://github.com/nvim-treesitter/tree-sitter-lua", - "rev": "6f5d40190ec8a0aa8c8410699353d820f4f7d7a6", - "date": "2021-08-02T15:13:28+02:00", - "path": "/nix/store/h1bhl291jac001w2c8fxi9w7dsqxq5q0-tree-sitter-lua", - "sha256": "05ash0l46s66q9yamzzh6ghk8yv0vas13c7dmz0c9xljbjk5ab1d", + "url": "https://github.com/MunifTanjim/tree-sitter-lua", + "rev": "547184a6cfcc900fcac4a2a56538fa8bcdb293e6", + "date": "2022-01-28T20:44:16+06:00", + "path": "/nix/store/gvq91asqk6911bci8xxx5wjbp2p3c2lk-tree-sitter-lua", + "sha256": "04z182d591r3jlw0yx29m0hhzw4b14f8m85rz2bw959p0yghs88k", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json index e34455069bc3..5da2dc0585e7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json @@ -1,9 +1,9 @@ { "url": "https://github.com/MDeiml/tree-sitter-markdown", - "rev": "8bee14c30ecadd55c2d65633973b4e81f93525e0", - "date": "2022-01-16T14:47:09+01:00", - "path": "/nix/store/cv7xqvcj4bjifzddkx5n2jd723dc6vlf-tree-sitter-markdown", - "sha256": "0vibmpp86pkqllfhb0kg6zhaz09sh8m6a2d1xa8p2qdi7ryy7wqa", + "rev": "b49b2da50864171eff56acc8ba067c3540a3991f", + "date": "2022-02-26T15:22:17+01:00", + "path": "/nix/store/vllxsz0nvlw6z9y6s199l5z8f5dlhcpv-tree-sitter-markdown", + "sha256": "1adypmkfsf6pgahba588d8l6ib59209rb2fkyk2dv0d3va76pr8x", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json index 189301c7293e..a4846c64e694 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json @@ -1,9 +1,9 @@ { "url": "https://github.com/nvim-neorg/tree-sitter-norg", - "rev": "c4be6addec0a8ada234684ced6c928189fd399af", - "date": "2022-01-22T17:12:52+01:00", - "path": "/nix/store/x73fgsrav1fg0vzydcy4ayrawn0cw7w2-tree-sitter-norg", - "sha256": "14wf53p6lkf4xknzb4bngh9fsas6hnr8iv73xnalyf8mqq1977pc", + "rev": "17d61df817c1e0a9cdef8d915d4e4c556b7cf68c", + "date": "2022-03-16T16:23:43+01:00", + "path": "/nix/store/xjsyabq06584fnwjvqbyqf6yd19i4gn9-tree-sitter-norg", + "sha256": "161pmkpfyfhf4lcgkzcl1wdi4bsmmpwxcz7kjcb0jpjy7bamikch", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json new file mode 100644 index 000000000000..67e75cd60ee2 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/milisims/tree-sitter-org", + "rev": "1c3eb533a9cf6800067357b59e03ac3f91fc3a54", + "date": "2022-02-05T14:19:52-05:00", + "path": "/nix/store/n51rx6d005iibpvb1bb2d7az1l6p6vlq-tree-sitter-org", + "sha256": "06xkhhdlkikvxadp7wnk8riz51mjq9ks1jchdy9x3fmq6bj72y1p", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json deleted file mode 100644 index 23df3b743c7e..000000000000 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "url": "https://github.com/milisims/tree-sitter-org", - "rev": "f110024d539e676f25b72b7c80b0fd43c34264ef", - "date": "2021-11-28T23:04:31-05:00", - "path": "/nix/store/8vc7ddhd2wzrin3cj14zrw5mmi58f8sl-tree-sitter-org", - "sha256": "1gvqvdapqfac1ny1a0l590h1w617wczwv234fsnal6amfdyganxc", - "fetchLFS": false, - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false -} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json index 9585b6c60768..8b4175a4f3cc 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json @@ -1,9 +1,9 @@ { "url": "https://github.com/ganezdragon/tree-sitter-perl", - "rev": "ab2b39439f2fc82fd5ea0b7e08509760d4cbacd5", - "date": "2022-01-23T13:55:11-05:00", - "path": "/nix/store/s55aybm3r5n7l7nx916mhjyry96xcvin-tree-sitter-perl", - "sha256": "16ap0yq9gmh0kbyka7zcpjw3dl368n23sxp3v82z4ccwzmgfmaw4", + "rev": "bbf86084d9b7eb4768f3fb9fe094b3e0600057b1", + "date": "2022-02-26T01:42:56+05:30", + "path": "/nix/store/cpsi8sjl3d1v5sg2rcsw3arf7zwm4l06-tree-sitter-perl", + "sha256": "037kdl6kq47p35qd3p6j4560x6w24zzmjxnz2fkd28xrm0lsh9lm", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index e64e3f6bff36..856d6bbb7e5c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "57f855461aeeca73bd4218754fb26b5ac143f98f", - "date": "2021-11-19T17:22:11+01:00", - "path": "/nix/store/lxl3r0lykb9b3r0sdqb3sqixlnaf6015-tree-sitter-php", - "sha256": "1v7xzc8w8nilmgnx6whdvq03dbi1z8j57aarwwzx9xbb86z2qhvc", + "rev": "0ce134234214427b6aeb2735e93a307881c6cd6f", + "date": "2022-01-31T19:53:17+01:00", + "path": "/nix/store/kdddnbbsik9wvnjh1wnbyzzr1x8v64ps-tree-sitter-php", + "sha256": "0gg3p1zpwfhf0qz0isnca0zi5zkxs5j5bmjix99dv3rkw911vk17", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json index ec69a798aad6..ad0fbd525ed8 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json @@ -1,9 +1,9 @@ { "url": "https://github.com/victorhqc/tree-sitter-prisma", - "rev": "74a721e8eed1a4a25cf495d45974ba24f315f81a", - "date": "2021-11-19T19:52:32+01:00", - "path": "/nix/store/rbr2p57ic1kn0121ca6k0bh2r8svw066-tree-sitter-prisma", - "sha256": "1b8yil6v9jz9ndx2kzln639fkjkj1xb0qfcip1njxcq5mlqlfswd", + "rev": "bf0833cbedb2c5b39250f5ba900f1239a16c6749", + "date": "2022-03-18T18:56:29+01:00", + "path": "/nix/store/9pq2l5b34xvi3v6i9zq1qxh3r2ilg2qs-tree-sitter-prisma", + "sha256": "0idgrra41w4v3sa4sb0p3ba7k6sxfw74px4fkpprddjqjdnsrl50", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 548764811a55..e724e7bbebc4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "24b530ca158d2782ea9046e756057a412e16b52f", - "date": "2021-11-11T20:37:43-08:00", - "path": "/nix/store/1fqgxgb3l6wxvsvzaa2f26h5ywiyxz5h-tree-sitter-python", - "sha256": "1d8d66v64jwwk73y8q94n80w0f0cs7wjnww49b0sbmpa9d3hsfl6", + "rev": "78c4e9b6b2f08e1be23b541ffced47b15e2972ad", + "date": "2022-02-07T12:53:14-08:00", + "path": "/nix/store/9i5fh21cwa6w2zq9fkcn46207pbk2fzn-tree-sitter-python", + "sha256": "09xq6ymwa2ap4432yln5qs0y41iaxbrpp4m07pvydgcmyk3blxvv", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json index dc339fe1fd65..f77e92922533 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json @@ -1,9 +1,9 @@ { "url": "https://github.com/r-lib/tree-sitter-r", - "rev": "d9868735e401e4870a3d4422790b585fea3faec8", - "date": "2022-01-10T10:12:40-05:00", - "path": "/nix/store/b2dp06sk8s3ksm382gndshhd1mxmd6n6-tree-sitter-r", - "sha256": "1pl38gksb4cwdgrb92rbmkanxn65m99i6c8w8xldhs0q97d1v5k0", + "rev": "c19e54de252d5573cc2a762a030957074526fe99", + "date": "2022-01-27T09:41:27-05:00", + "path": "/nix/store/b2h3khs1x0j4j2fvs2sbkx1dp3d8fx4g-tree-sitter-r", + "sha256": "1zan8dhjpxrn7vy7mvbc85hcdd5lls3vzpk6nchvn3j0i1ach85h", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index 1479f09e0673..670103d5c78d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "eeb0702ebdac504b97196577b1dac43c80913d7b", - "date": "2022-01-10T13:05:56-08:00", - "path": "/nix/store/sh170d6b589l16rhlygz6hvn1dmfhlb1-tree-sitter-rust", - "sha256": "1npx8kc4qdjj1fszqx6ks1d0x0pklmzm3gkxracs7y28lh2whrvq", + "rev": "0509e440ae042db6483984b3a56b3c5f24b5d9b9", + "date": "2022-03-09T12:11:47+01:00", + "path": "/nix/store/9jrsqsrql5wlbzmqna111w4a02hf75z2-tree-sitter-rust", + "sha256": "1r8n8441b8bppizlzh4xw7yy3amz4apfxpqxm8hw0n3j3iwnw4pz", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json index 03644c839c3c..0b2637a14389 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json @@ -1,9 +1,9 @@ { "url": "https://github.com/serenadeai/tree-sitter-scss", - "rev": "f3174d3d131eb776f86dfa3d90fe6f7325c0ad9a", - "date": "2021-11-08T17:21:33-08:00", - "path": "/nix/store/qpmqd6a3rnrp451b5jjmqqwark276smj-tree-sitter-scss", - "sha256": "0c8mx5fxcfn8wn361i7pnr3xga7vm2jjj99ilkqljir71nl6bm11", + "rev": "c478c6868648eff49eb04a4df90d703dc45b312a", + "date": "2022-02-03T21:48:21+00:00", + "path": "/nix/store/s49l3jbhjni3l1d0m3xrpzml39aq9yr3-tree-sitter-scss", + "sha256": "15r3jiv36hzx2pmjmp63am3pbc01s52z36xfraa1aw4wlx7lqnq4", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json index 7dcf59de2ff0..24f577629497 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json @@ -1,9 +1,9 @@ { "url": "https://github.com/madskjeldgaard/tree-sitter-supercollider", - "rev": "a7201b61779be59ac0fc0d118746c886dbc3edbd", - "date": "2022-01-14T01:11:12+01:00", - "path": "/nix/store/rgy05854am625shbs13gjx0yggbb6awh-tree-sitter-supercollider", - "sha256": "118mbv8d5n2lb4w5cbjy657g9z9z910gvjjj41a2rkx971vgb6w3", + "rev": "0f0e5b5a96dd3e048a9c3db648ed969c44068bff", + "date": "2022-02-01T13:46:31+01:00", + "path": "/nix/store/5rzm6vnqvpwxwakrjyy93hg0glfvcx93-tree-sitter-supercollider", + "sha256": "0nxl43j7ddsddqcq56p921h1r5jkx8v49zxjzr6mcj6y1ljzndm2", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json index 86e9a86bbcc0..2ffc311fd943 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tlaplus-community/tree-sitter-tlaplus", - "rev": "ffa98bbbd80e425f07e92bf511e64c8b0dffc1c7", - "date": "2022-01-23T09:32:54-05:00", - "path": "/nix/store/rbxa4biim19pwiz6gmh0ag5cz68rws3k-tree-sitter-tlaplus", - "sha256": "0j8bwxdvdhfhvpiahbf0hr9hfkbg75p7qpxx2i1rgvidavflbpiv", + "rev": "dde405e5128c3c47ab8aa014d21b6e5296ca450f", + "date": "2022-02-03T12:27:54-05:00", + "path": "/nix/store/vwmr9wd4agmym5ryrchl470qa46j8ymr-tree-sitter-tlaplus", + "sha256": "06g5pbx4rydfryfxfqjq37akhqn2465xwh90r5yc5rdv0kppvbhq", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json index bb57181f00f6..f4aaecb7bdf3 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/vigoux/tree-sitter-viml", - "rev": "274b004d226a6686546ef83231f0f836b91700ae", - "date": "2022-01-21T14:12:20+01:00", - "path": "/nix/store/lpl3kbb5kwawr71m6qhqrwj1adkll540-tree-sitter-viml", - "sha256": "01bmn3l3fsi1r36ak72ly0v8fr62wchida965c60244bfg2s4r2c", + "rev": "c9d70082af14988842eb071c6c0b07e8d1d993ac", + "date": "2022-03-21T17:11:25+01:00", + "path": "/nix/store/z1bjg25frb0sq7kr0s3sp6jnz888p900-tree-sitter-viml", + "sha256": "05mf8i5ni0kp4g1gdpgwjxi2d86hna2ijp9k7c1gy9j33hsq9i8g", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index 5ab34fb0e25b..a9de3692209e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -1,9 +1,9 @@ { "url": "https://github.com/maxxnino/tree-sitter-zig", - "rev": "93331b8bd8b4ebee2b575490b2758f16ad4e9f30", - "date": "2022-01-10T15:22:15+09:00", - "path": "/nix/store/g54w7vid7nf9shzfipch646dk4d88ah7-tree-sitter-zig", - "sha256": "0irckd6bh3i1vr5bi2lwsbvibbpih3jv3xqdq0dbsiy447dfiv50", + "rev": "42e93d02ca945094699e2dc4de785bbaf8f740ec", + "date": "2022-02-11T10:40:42+09:00", + "path": "/nix/store/2yv27si133zqb93bm9gia0ymib9q2y75-tree-sitter-zig", + "sha256": "14p02b04v67cvkvj7apipsmkmvv3jnhykm0qrrmqqxnkprac31im", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index c0a5812d7e88..961a5e96e0b5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -105,7 +105,7 @@ let repo = "tree-sitter-latex"; }; "tree-sitter-lua" = { - orga = "nvim-treesitter"; + orga = "MunifTanjim"; repo = "tree-sitter-lua"; }; "tree-sitter-fennel" = { @@ -304,10 +304,14 @@ let orga = "victorhqc"; repo = "tree-sitter-prisma"; }; - "tree-sitter-org" = { + "tree-sitter-org-nvim" = { orga = "milisims"; repo = "tree-sitter-org"; }; + "tree-sitter-hcl" = { + orga = "MichaHoffmann"; + repo = "tree-sitter-hcl"; + }; }; allGrammars = @@ -376,7 +380,7 @@ let if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then echo "rate limited" >&2 fi - release=$(printf "%s" "$res" | ${jq}/bin/jq '.tag_name') + release="$(printf "%s" "$res" | ${jq}/bin/jq -r '.tag_name' | tr -d \")" # github sometimes returns an empty list even tough there are releases if [ "$release" = "null" ]; then echo "uh-oh, latest for ${orga + "/" + repo} is not there, using HEAD" >&2 diff --git a/pkgs/development/tools/patatt/default.nix b/pkgs/development/tools/patatt/default.nix new file mode 100644 index 000000000000..fce4f5063763 --- /dev/null +++ b/pkgs/development/tools/patatt/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "patatt"; + version = "0.4.9"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-qHhNxgP43vBSjrHp2Ygzq5J/f6YyBD4VDTp9S1ud6zo="; + }; + + propagatedBuildInputs = with python3Packages; [ + pynacl + ]; + + meta = with lib; { + homepage = "https://git.kernel.org/pub/scm/utils/patatt/patatt.git/about/"; + license = licenses.mit0; + description = "Add cryptographic attestation to patches sent via email"; + longDescription = '' + This utility allows an easy way to add end-to-end cryptographic + attestation to patches sent via mail. It does so by adapting the + DKIM email signature standard to include cryptographic + signatures via the X-Developer-Signature email header. + ''; + maintainers = with maintainers; [ yoctocell ]; + }; +} diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index 653bc8aca729..d759efb2b5b7 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg="; }; - vendorSha256 = "sha256-vciiBzmqUAt5ZWn9go4B1uaz0HsBk5Z9Rbw7/MAimY4="; + vendorSha256 = "sha256-dUvp7FEW09V0xMuhewPGw3TuAic/sD7xyXEYviZ2Ivs="; doCheck = false; diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix deleted file mode 100644 index 5b7e77ee0b5d..000000000000 --- a/pkgs/development/tools/phantomjs/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv, lib, fetchurl, freetype, fontconfig, openssl, unzip }: - -let - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; -in - -stdenv.mkDerivation rec { - pname = "phantomjs"; - version = "1.9.8"; - - # I chose to use the binary build for now. - # The source version is quite nasty to compile - # because it has bundled a lot of external libraries (like QT and Webkit) - # and no easy/nice way to use the system versions of these - - src = if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-linux-i686.tar.bz2"; - sha256 = "11fzmssz9pqf3arh4f36w06sl2nyz8l9h8iyxyd7w5aqnq5la0j1"; - } - else - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-linux-x86_64.tar.bz2"; - sha256 = "0fhnqxxsxhy125fmif1lwgnlhfx908spy7fx9mng4w72320n5nd1"; - } - else # x86_64-darwin - fetchurl { - url = "https://bitbucket.org/ariya/phantomjs/downloads/${pname}-${version}-macosx.zip"; - sha256 = "0j0aq8dgzmb210xdrh0v3d4nblskl3zsckl8bzf1a603wcx085cg"; - }; - - nativeBuildInputs = lib.optional stdenv.isDarwin unzip; - - buildPhase = lib.optionalString (!stdenv.isDarwin) '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \ - bin/phantomjs - ''; - - dontPatchELF = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out/share/doc/phantomjs - cp -a bin $out - cp -a ChangeLog examples LICENSE.BSD README.md third-party.txt $out/share/doc/phantomjs - ''; - - meta = { - description = "Headless WebKit with JavaScript API"; - longDescription = '' - PhantomJS is a headless WebKit with JavaScript API. - It has fast and native support for various web standards: - DOM handling, CSS selector, JSON, Canvas, and SVG. - - PhantomJS is an optimal solution for: - - Headless Website Testing - - Screen Capture - - Page Automation - - Network Monitoring - ''; - - homepage = "https://phantomjs.org/"; - license = lib.licenses.bsd3; - - maintainers = [ lib.maintainers.bluescreen303 ]; - inherit platforms; - }; -} diff --git a/pkgs/development/tools/picotool/default.nix b/pkgs/development/tools/picotool/default.nix index d4a6f1c409b1..507284081f5a 100644 --- a/pkgs/development/tools/picotool/default.nix +++ b/pkgs/development/tools/picotool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "picotool"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = version; - sha256 = "1k5j742sj91akdrgnd3wa5csqb638dgaz0c09zsr22fcqz0qhzig"; + sha256 = "sha256-YjDHoRcDoezyli42bJ0bnfjdNNY8l6ZilrxhOudqvwE="; }; buildInputs = [ libusb1 pico-sdk ]; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 9d2d9b3962c0..c177d18f1369 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -19,11 +19,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2021.11.23"; + version = "2022.3.28"; src = fetchPypi { inherit pname version; - sha256 = "1bde859e8bbd1d21d503fd995bc0170048d6da7686ab885f074592c99a16e8f3"; + sha256 = "sha256-TnquYtrXZ5zoG1TMNFG+GfssRp4mkzWzaxQTL+XO7LM="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/profiling/sysprof/capture.nix b/pkgs/development/tools/profiling/sysprof/capture.nix index 2d33dedbdd25..e6690fc0c68b 100644 --- a/pkgs/development/tools/profiling/sysprof/capture.nix +++ b/pkgs/development/tools/profiling/sysprof/capture.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dwith_sysprofd=none" "-Dlibsysprof=false" + "-Dlibunwind=false" "-Dhelp=false" "-Denable_tools=false" "-Denable_tests=false" diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 319212da7705..e21e71907869 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -8,8 +8,10 @@ , json-glib , itstool , libdazzle +, libunwind , libxml2 -, meson, ninja +, meson +, ninja , pango , pkg-config , polkit @@ -21,13 +23,13 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.42.1"; + version = "3.44.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "F5a4FATudf0eus9URkrXr/6/YvKFHu9STZ+OrAxKIAE="; + sha256 = "q12fW3GXOzCI1Yob/fHcI8OaAvX85OXpxz4DSxeLAFs="; }; nativeBuildInputs = [ @@ -51,6 +53,7 @@ stdenv.mkDerivation rec { polkit systemd libdazzle + libunwind ]; mesonFlags = [ diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 31eafb1086b8..cadf9b9eeb16 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -16,8 +16,8 @@ let pname = "systemtap"; inherit version; src = fetchgit { inherit url rev sha256; }; - nativeBuildInputs = [ pkg-config cpio ]; - buildInputs = [ elfutils gettext python3 python3.pkgs.setuptools ]; + nativeBuildInputs = [ pkg-config cpio python3 python3.pkgs.setuptools ]; + buildInputs = [ elfutils gettext ]; enableParallelBuilding = true; }; @@ -40,7 +40,6 @@ in runCommand "systemtap-${kernel.version}-${version}" { nativeBuildInputs = [ makeWrapper ]; meta = { homepage = "https://sourceware.org/systemtap/"; - repositories.git = url; description = "Provides a scripting language for instrumentation on a live kernel plus user-space"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix index 74f47f3f996e..f60bfb4b724d 100644 --- a/pkgs/development/tools/proto-contrib/default.nix +++ b/pkgs/development/tools/proto-contrib/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ksxic7cypv9gg8q5lkl5bla1n9i65z7b03cx9lwq6252glmf2jk"; }; - vendorSha256 = "1ivvq5ch9grdrwqq29flv9821kyb16k0cj6wgj5v0dyn63w420aw"; + vendorSha256 = "093blawprs2yf478zp9p1zc7mmimgpiwrw6nh8nqml89y5b5zldc"; doCheck = false; diff --git a/pkgs/development/tools/protoc-gen-go-grpc/default.nix b/pkgs/development/tools/protoc-gen-go-grpc/default.nix index 6fd939d00237..b880921e1e0c 100644 --- a/pkgs/development/tools/protoc-gen-go-grpc/default.nix +++ b/pkgs/development/tools/protoc-gen-go-grpc/default.nix @@ -1,24 +1,21 @@ -{ buildGoPackage +{ buildGoModule , fetchFromGitHub , lib }: -buildGoPackage rec { +buildGoModule rec { pname = "protoc-gen-go-grpc"; - version = "1.1.0"; - - goPackagePath = "google.golang.org/grpc"; + version = "1.2.0"; + modRoot = "cmd/protoc-gen-go-grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-go"; rev = "cmd/protoc-gen-go-grpc/v${version}"; - sha256 = "14rjb8j6fm07rnns3dpwgkzf3y6rmia6i9n7ns6cldc5mbf7nwi3"; + sha256 = "sha256-pIHMykwwyu052rqwSV5Js0+JCKCNLrFVN6XQ3xjlEOI="; }; - subPackages = [ "cmd/protoc-gen-go-grpc" ]; - - goDeps = ./deps.nix; + vendorSha256 = "sha256-yxOfgTA5IIczehpWMM1kreMqJYKgRT5HEGbJ3SeQ/Lg="; meta = with lib; { description = "The Go language implementation of gRPC. HTTP/2 based RPC"; diff --git a/pkgs/development/tools/protoc-gen-go-grpc/deps.nix b/pkgs/development/tools/protoc-gen-go-grpc/deps.nix deleted file mode 100644 index d559989244d9..000000000000 --- a/pkgs/development/tools/protoc-gen-go-grpc/deps.nix +++ /dev/null @@ -1,333 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-cloud-go"; - rev = "v0.26.0"; - sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/census-instrumentation/opencensus-proto"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-proto"; - rev = "v0.2.1"; - sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/client9/misspell"; - fetch = { - type = "git"; - url = "https://github.com/client9/misspell"; - rev = "v0.3.4"; - sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/cncf/udpa/go"; - fetch = { - type = "git"; - url = "https://github.com/cncf/udpa"; - rev = "5459f2c99403"; - sha256 = "0i3al193dsp91j7iywqrm6fr56y2sz51ci4vf19mb3j4n2x44gsi"; - moduleDir = "go"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.0"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/envoyproxy/go-control-plane"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/go-control-plane"; - rev = "668b12f5399d"; - sha256 = "0vmhc8ii081x1k2qw4kji7wjyg6l25zp1y6qxi27wq8m341i4rzb"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/protoc-gen-validate"; - rev = "v0.1.0"; - sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.1.1"; - sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.4.2"; - sha256 = "0m5z81im4nsyfgarjhppayk4hqnrwswr3nix9mj8pff8x9jvcjqw"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.5.0"; - sha256 = "04pzp583p6b32y34c6jygfxarff9qjs39rarvfh6467z24sdd9k4"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "v1.1.2"; - sha256 = "1rbpfa0v0ly9sdnixcxhf79swki54ikgm1zkwwkj64p1ws66syqd"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.5.1"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "509febef88a4"; - sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "d0100b6bd8b3"; - sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d8887717615a"; - sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "d2e6202438be"; - sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d0b11bdaac8a"; - sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "2c0ae7006135"; - sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - moduleDir = ""; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.4.0"; - sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; - moduleDir = ""; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/go-genproto"; - rev = "cb27e3aa2013"; - sha256 = "0ml73ghqcwbz7ipfk8fnxb5indcml49b5p7vp1fsyny0abyyrmxf"; - moduleDir = ""; - }; - } - { - goPackagePath = "google.golang.org/protobuf"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/protobuf"; - rev = "v1.25.0"; - sha256 = "0apfl42x166dh96zfq5kvv4b4ax9xljik6bq1mnvn2240ir3mc23"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - moduleDir = ""; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "ea95bdfd59fc"; - sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; - moduleDir = ""; - }; - } -] diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/development/tools/protoc-gen-go/default.nix index 79f97ddd745c..271d51042e25 100644 --- a/pkgs/development/tools/protoc-gen-go/default.nix +++ b/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.27.1"; + version = "1.28.0"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - sha256 = "sha256-wkUvMsoJP38KMD5b3Fz65R1cnpeTtDcVqgE7tNlZXys="; + sha256 = "sha256-GXXhBXzeFgS4DjY3jDRaJu/9PbfUnmWJiE4BwDBh7Ns="; }; vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y="; diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix index acbd23ec2929..279f8101f78f 100644 --- a/pkgs/development/tools/protoc-gen-grpc-web/default.nix +++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "protoc-gen-grpc-web"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-web"; rev = version; - sha256 = "sha256-piKpaylzuanhGR+7BzApplv8e/CWPoR9tG3vHrF7WXw="; + sha256 = "sha256-NRShN4X9JmCjqPVY/q9oSxSOvv1bP//vM9iOZ6ap5vc="; }; sourceRoot = "source/javascript/net/grpc/web/generator"; @@ -17,7 +17,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ protobuf ]; buildInputs = [ protobuf ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=$(out)" "STATIC=no" ]; + + patches = [ + # https://github.com/grpc/grpc-web/pull/1210 + ./optional-static.patch + ]; doCheck = true; checkInputs = [ protobuf ]; diff --git a/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch b/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch new file mode 100644 index 000000000000..a7ca112749c1 --- /dev/null +++ b/pkgs/development/tools/protoc-gen-grpc-web/optional-static.patch @@ -0,0 +1,19 @@ +--- a/Makefile ++++ b/Makefile +@@ -18,12 +18,15 @@ CXXFLAGS += -std=c++11 + LDFLAGS += -L/usr/local/lib -lprotoc -lprotobuf -lpthread -ldl + PREFIX ?= /usr/local + MIN_MACOS_VERSION := 10.7 # Supports OS X Lion ++STATIC ?= yes + + UNAME_S := $(shell uname -s) + ifeq ($(UNAME_S),Darwin) + CXXFLAGS += -stdlib=libc++ -mmacosx-version-min=$(MIN_MACOS_VERSION) + else ifeq ($(UNAME_S),Linux) +- LDFLAGS += -static ++ ifeq ($(STATIC),yes) ++ LDFLAGS += -static ++ endif + endif + + all: protoc-gen-grpc-web diff --git a/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/pkgs/development/tools/protoc-gen-twirp_php/default.nix index a978c2866504..df5afac2dbb2 100644 --- a/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-TaHfyYoWsA/g5xZFxIMNwE1w6Dd9Cq5bp1gpQudYLs0="; }; - vendorSha256 = "sha256-z3Yp+Yy03g2DAvWUZXaOxQWONjnYUl69eTpYIDPhsqc="; + vendorSha256 = "sha256-qQFlBviRISEnPBt0q5391RqUrPTI/QDxg3MNfwWE8MI="; subPackages = [ "protoc-gen-twirp_php" ]; diff --git a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix b/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix index 2aabe3bcce6e..ead72184b7cd 100644 --- a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix @@ -11,7 +11,7 @@ buildGoModule { sha256 = "sha256-LfF/n96LwRX8aoPHzCRI/QbDmZR9yMhE5yGhFAqa8nA="; }; - vendorSha256 = "sha256-WISWuq1neVX4xQkoamc6FznZahOQHwgkYmERJF40OFQ="; + vendorSha256 = "sha256-xZlP4rg1FMx6ddkKYlSdF6NrtY8xBZ3aEZSATgSf13M="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/development/tools/protoc-gen-validate/default.nix new file mode 100644 index 000000000000..9a77437a3723 --- /dev/null +++ b/pkgs/development/tools/protoc-gen-validate/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "protoc-gen-validate"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "envoyproxy"; + repo = "protoc-gen-validate"; + rev = "v${version}"; + sha256 = "sha256-ouo6raNbvQyuY4IY1JEN45Ss7zb3EoR/WIRzL7hXLNI="; + }; + + vendorSha256 = "sha256-HbUEhoB6PPHwN/xym6dTkS54+EqVU1n8EIym8W2wt3I="; + + excludedPackages = [ "tests" ]; + + meta = with lib; { + description = "Protobuf plugin for generating polyglot message validators"; + homepage = "https://github.com/envoyproxy/protoc-gen-validate"; + license = licenses.asl20; + maintainers = with maintainers; [ matthewpi ]; + }; +} diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 4f4c1f58fe24..c375869603f6 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -2,16 +2,23 @@ buildGoModule rec { pname = "pscale"; - version = "0.88.0"; + version = "0.90.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-/QQ35zLqhhJw/h1u08Sb3FDz8O+7kh/pVz1EgEJQUfg="; + sha256 = "sha256-uOKx367fFJQvoqakY5PmesOk2l9eYsnECf6AdO2NsuI="; }; - vendorSha256 = "sha256-kNt7tMHubpcrfzAjf++GxV3kEj2g6fHFrP9cY8UPqB8="; + vendorSha256 = "sha256-IUntyI3EeYsf2tesvm0H+bNCtpnNfQV7WURLFvJXMac="; + + ldflags = [ + "-s" "-w" + "-X main.version=v${version}" + "-X main.commit=v${version}" + "-X main.date=unknown" + ]; meta = with lib; { homepage = "https://www.planetscale.com/"; diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/development/tools/pulumictl/default.nix new file mode 100644 index 000000000000..baa9734d340e --- /dev/null +++ b/pkgs/development/tools/pulumictl/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pulumictl"; + version = "0.0.30"; + + src = fetchFromGitHub { + owner = "pulumi"; + repo = "pulumictl"; + rev = "v${version}"; + sha256 = "sha256-xAlc6dYD73JZqV0QDhvqPmtGF99mqhvdBbDhWlY/4PI="; + }; + + vendorSha256 = "sha256-xalfnLc6bPBvm2B42+FzpgrOH541HMWmNHChveI792s="; + + ldflags = [ + "-s" "-w" "-X=github.com/pulumi/pulumictl/pkg/version.Version=${src.rev}" + ]; + + subPackages = [ "cmd/pulumictl" ]; + + meta = with lib; { + description = "Swiss Army Knife for Pulumi Development"; + homepage = "https://github.com/pulumi/pulumictl"; + license = licenses.asl20; + maintainers = with maintainers; [ vincentbernat ]; + }; +} diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index 0bd33f19f8e9..1747aaa55fda 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -14,11 +14,11 @@ }: mkDerivation { pname = "spago"; - version = "0.20.2"; + version = "0.20.7"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "11jh3bszvl8zfi4xcabpx43jply28dxdywd6fadxspaa05jdxxn2"; - rev = "0f38c9153e46f30e9d87963e181f5c1a595f4b64"; + sha256 = "0k9ablqhx4m1hk0sc0rx824qq5gr7fp7dpg9rj5v793v6hd3q4jv"; + rev = "41d9c967dc1db0de03985e31083eb76b3e2fcce4"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix new file mode 100644 index 000000000000..82a31ea52b10 --- /dev/null +++ b/pkgs/development/tools/quick-lint-js/default.nix @@ -0,0 +1,24 @@ +{ cmake, fetchFromGitHub, lib, ninja, stdenv }: + +stdenv.mkDerivation rec { + pname = "quick-lint-js"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "quick-lint"; + repo = "quick-lint-js"; + rev = version; + sha256 = "1ay59pmprcswip6zzbqfy5g2rdv4lgmps8vrxay4l9w6xn9lg03v"; + }; + + nativeBuildInputs = [ cmake ninja ]; + doCheck = true; + + meta = with lib; { + description = "Find bugs in Javascript programs"; + homepage = "https://quick-lint-js.com"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ratsclub ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index eb7fa4488156..fec73b264819 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "quilt"; - version = "0.66"; + version = "0.67"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - sha256 = "01vfvk4pqigahx82fhaaffg921ivd3k7rylz1yfvy4zbdyd32jri"; + sha256 = "sha256-O+O+CYfnKmw2Rni7gn4+H8wQMitWvF8CtXZpj1UBPMI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index ea842c820899..ee03e043dd86 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { exec = "react-native-debugger"; desktopName = "React Native Debugger"; genericName = "React Native Debugger"; - categories = "Development;Debugger;"; + categories = [ "Development" "Debugger" ]; }; meta = with lib; { diff --git a/pkgs/development/tools/rebazel/default.nix b/pkgs/development/tools/rebazel/default.nix index 5dee0a1b9e86..c28701f96a21 100644 --- a/pkgs/development/tools/rebazel/default.nix +++ b/pkgs/development/tools/rebazel/default.nix @@ -1,4 +1,5 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices }: + rustPlatform.buildRustPackage rec { pname = "rebazel"; version = "0.1.4"; @@ -12,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM="; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + meta = with lib; { description = "tool for expediting bazel build workflows"; homepage = "https://github.com/meetup/rebazel"; diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index a5c6335162aa..f54e6ca26a87 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -4,16 +4,16 @@ let bins = [ "regbot" "regctl" "regsync" ]; in buildGoModule rec { pname = "regclient"; - version = "0.3.8"; + version = "0.3.10"; tag = "v${version}"; src = fetchFromGitHub { owner = "regclient"; repo = "regclient"; rev = tag; - sha256 = "14w0g24sgphgib33sdvrvwk86p7km2pasb5fmr3p48i7sc71ja3h"; + sha256 = "sha256-3nYVhKHNz0V0j6JlZ5Dm5TFWA2kmUhshNVUym/QWSyM="; }; - vendorSha256 = "sha256-9sRjP7lxMRdt9D9ElIX+mbYIvCaknWMgDyYl+1/q0/g="; + vendorSha256 = "sha256-rj4sQ8Ci2KMayJNXn+KVihOiZehk233l48Ps0yjOOE4="; outputs = [ "out" ] ++ bins; diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index 4e11b5a64d84..6cc063386ac7 100644 --- a/pkgs/development/tools/richgo/default.nix +++ b/pkgs/development/tools/richgo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "richgo"; - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "kyoh86"; repo = "richgo"; rev = "v${version}"; - sha256 = "sha256-yVt0iFH9tYCeIWJC16ve988xBXgt96357YiHfsxai7g="; + sha256 = "sha256-USHg1KXl0MOWifiVu+KdjvrbDlAh6T/ReKFKeIpVK0A="; }; - vendorSha256 = "sha256-IJjJ4X3mv2PUmwzt5/hgv1N6R0w+EXGSrCS4q+INJrA="; + vendorSha256 = "sha256-O63QEo0/+m9cYktMg4+RloLuUfAlCG0eGkxpHPFg/Cw="; doCheck = false; diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix index f1e21641c35f..ccc8e88dec8b 100644 --- a/pkgs/development/tools/rnix-lsp/default.nix +++ b/pkgs/development/tools/rnix-lsp/default.nix @@ -1,19 +1,19 @@ -{ lib, fetchFromGitHub, rustPlatform, nix }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, nix }: rustPlatform.buildRustPackage rec { pname = "rnix-lsp"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "nix-community"; repo = "rnix-lsp"; rev = "v${version}"; - sha256 = "sha256-D2ItR8z4LqEH1IL53vq/wPh9Pfe3eB0KsA79aLM/BWM="; + sha256 = "sha256-MfD07ugYYbcRaNoLxOcH9+SPbRewNxbHJA5blCSb4EM="; }; - cargoSha256 = "sha256-71vH8oc8DmwbwM2PgxjGmWAbyC4AByx7waHxLsr2koI="; + cargoSha256 = "sha256-23TJrJyfCuoOOOjZeWQnF/Ac0Xv2k6tZduuzapKvsgg="; - checkInputs = [ nix ]; + checkInputs = lib.optional (!stdenv.isDarwin) nix; meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; diff --git a/pkgs/development/tools/rocminfo/default.nix b/pkgs/development/tools/rocminfo/default.nix index 2734cfa09317..60ca0a51d265 100644 --- a/pkgs/development/tools/rocminfo/default.nix +++ b/pkgs/development/tools/rocminfo/default.nix @@ -7,13 +7,13 @@ # compilers to determine the desired target. , defaultTargets ? []}: stdenv.mkDerivation rec { - version = "4.5.2"; + version = "5.0.1"; pname = "rocminfo"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocminfo"; rev = "rocm-${version}"; - sha256 = "sha256-VIlHYiGLen4xmdP7kpmObj5wKy6Qq7iupJFtPa4Zd98="; + sha256 = "sha256-H9JdrDS/pbvYMKkayu/1rrXusHeXBH1CO9jYArsbCNI="; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix new file mode 100644 index 000000000000..7232089ee997 --- /dev/null +++ b/pkgs/development/tools/rover/default.nix @@ -0,0 +1,56 @@ +{ lib +, callPackage +, fetchFromGitHub +, perl +, rustPlatform +, librusty_v8 ? callPackage ./librusty_v8.nix { } +}: + +rustPlatform.buildRustPackage rec { + pname = "rover"; + version = "0.4.8"; + + src = fetchFromGitHub { + owner = "apollographql"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-9o2bGa9vxN7EprKgsy9TI7AFmwjo1OT1pDyiLierTq0="; + }; + + cargoSha256 = "sha256-4oNuyZ1xNK2jP9QFEcthCjEQRyvFykd5N0j5KCXrzVY="; + + # The v8 package will try to download a `librusty_v8.a` release at build time + # to our read-only filesystem. To avoid this we pre-download the file and + # export it via RUSTY_V8_ARCHIVE + RUSTY_V8_ARCHIVE = librusty_v8; + + nativeBuildInputs = [ + perl + ]; + + # The rover-client's build script (crates/rover-client/build.rs) will try to + # download the API's graphql schema at build time to our read-only filesystem. + # To avoid this we pre-download it to a location the build script checks. + preBuild = '' + mkdir crates/rover-client/.schema + cp ${./schema}/etag.id crates/rover-client/.schema/ + cp ${./schema}/schema.graphql crates/rover-client/.schema/ + ''; + + passthru.updateScript = ./update.sh; + + # Some tests try to write configuration data to a location in the user's home + # directory. Since this would be /homeless-shelter during the build, point at + # a writeable location instead. + preCheck = '' + export APOLLO_CONFIG_HOME="$PWD" + ''; + + meta = with lib; { + description = "A CLI for managing and maintaining graphs with Apollo Studio"; + homepage = "https://www.apollographql.com/docs/rover"; + license = licenses.mit; + maintainers = [ maintainers.ivanbrennan ]; + platforms = ["x86_64-linux"]; + }; +} diff --git a/pkgs/development/tools/rover/librusty_v8.nix b/pkgs/development/tools/rover/librusty_v8.nix new file mode 100644 index 000000000000..3dcb1f95acdd --- /dev/null +++ b/pkgs/development/tools/rover/librusty_v8.nix @@ -0,0 +1,17 @@ +{ rust, 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"; + sha256 = args.shas.${stdenv.hostPlatform.system}; + meta = { inherit (args) version; }; + }; +in +fetch_librusty_v8 { + version = "0.38.1"; + shas = { + x86_64-linux = "sha256-vRkb5ZrIOYSKa84UbsJD+Oua0wve7f1Yf3kMg/kkYSY="; + }; +} diff --git a/pkgs/development/tools/rover/schema/etag.id b/pkgs/development/tools/rover/schema/etag.id new file mode 100644 index 000000000000..369872c3115e --- /dev/null +++ b/pkgs/development/tools/rover/schema/etag.id @@ -0,0 +1 @@ +1bdcf8916afc3cea660add457724dddd70154904f4e360e15da27fa7d5c43cd0 diff --git a/pkgs/development/tools/rover/schema/schema.graphql b/pkgs/development/tools/rover/schema/schema.graphql new file mode 100644 index 000000000000..58198f7e181d --- /dev/null +++ b/pkgs/development/tools/rover/schema/schema.graphql @@ -0,0 +1,172 @@ +"""An organization. Can have multiple members and graphs.""" type Account{auditLogExports:[AuditLogExport!]"""These are the roles that the account is able to use""" availableRoles:[UserPermission!]!"""Get an URL to which an avatar image can be uploaded. Client uploads by sending a PUT request +with the image data to MediaUploadInfo.url. Client SHOULD set the "Content-Type" header to the +browser-inferred MIME type, and SHOULD set the "x-apollo-content-filename" header to the +filename, if such information is available. Client MUST set the "x-apollo-csrf-token" header to +MediaUploadInfo.csrfToken.""" avatarUpload:AvatarUploadResult """Get an image URL for the account's avatar. Note that CORS is not enabled for these URLs. The size +argument is used for bandwidth reduction, and should be the size of the image as displayed in the +application. Apollo's media server will downscale larger images to at least the requested size, +but this will not happen for third-party media servers.""" avatarUrl(size:Int!=40):String billingInfo:BillingInfo companyUrl:String currentBillingMonth:BillingMonth currentPlan:BillingPlan!currentPlanV2:BillingPlanV2!currentSubscription:BillingSubscription currentSubscriptionV2:BillingSubscriptionV2 experimentalFeatures:AccountExperimentalFeatures!expiredTrialSubscription:BillingSubscription expiredTrialSubscriptionV2:BillingSubscriptionV2 graphIDAvailable(id:ID!):Boolean!hasBeenOnTrial:Boolean!hasBeenOnTrialV2:Boolean!"""Globally unique identifier, which isn't guaranteed stable (can be changed by administrators).""" id:ID!"""Internal immutable identifier for the account. Only visible to Apollo admins (because it really +shouldn't be used in normal client apps).""" internalID:ID!invitations(includeAccepted:Boolean!=false):[AccountInvitation!]invoices:[Invoice!]invoicesV2:[InvoiceV2!]!isOnExpiredTrial:Boolean!isOnTrial:Boolean!legacyIsOnTrial:Boolean!memberships:[AccountMembership!]"""Name of the organization, which can change over time and isn't unique.""" name:String!provisionedAt:Timestamp recurlyEmail:String """Returns a different registry related stats pertaining to this account.""" registryStatsWindow(from:Timestamp!resolution:Resolution to:Timestamp):RegistryStatsWindow requests(from:Timestamp!to:Timestamp!):Long requestsInCurrentBillingPeriod:Long roles:AccountRoles """How many seats would be included in your next bill, as best estimated today""" seatCountForNextBill:Int seats:Seats secondaryIDs:[ID!]!"""Graphs belonging to this organization.""" services(includeDeleted:Boolean):[Service!]!"""If non-null, this organization tracks its members through an upstream, eg PingOne; +invitations are not possible on SSO-synchronized account.""" sso:OrganizationSSO state:AccountState """A list of reusable invitations for the organization.""" staticInvitations:[OrganizationInviteLink!]stats(from:Timestamp!"""Granularity of buckets. Defaults to the entire range (aggregate all data into a single durationBucket) when null.""" resolution:Resolution """Defaults to the current time when null.""" to:Timestamp):AccountStatsWindow!@deprecated(reason:"use Account.statsWindow instead")statsWindow(from:Timestamp!"""Granularity of buckets. Defaults to the entire range (aggregate all data into a single durationBucket) when null.""" resolution:Resolution """Defaults to the current time when null.""" to:Timestamp):AccountStatsWindow subscriptions:[BillingSubscription!]subscriptionsV2:[BillingSubscriptionV2!]!"""Gets a ticket for this org, by id""" ticket(id:ID!):ZendeskTicket """List of Zendesk tickets submitted for this org""" tickets:[ZendeskTicket!]}"""Columns of AccountBillingUsageStats.""" enum AccountBillingUsageStatsColumn{OPERATION_COUNT OPERATION_COUNT_PROVIDED_EXPLICITLY SCHEMA_TAG SERVICE_ID TIMESTAMP}type AccountBillingUsageStatsDimensions{operationCountProvidedExplicitly:String schemaTag:String serviceId:ID}"""Filter for data in AccountBillingUsageStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountBillingUsageStatsFilter{and:[AccountBillingUsageStatsFilter!]in:AccountBillingUsageStatsFilterIn not:AccountBillingUsageStatsFilter """Selects rows whose operationCountProvidedExplicitly dimension equals the given value if not null. To query for the null value, use {in: {operationCountProvidedExplicitly: [null]}} instead.""" operationCountProvidedExplicitly:String or:[AccountBillingUsageStatsFilter!]"""Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in AccountBillingUsageStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountBillingUsageStatsFilterIn{"""Selects rows whose operationCountProvidedExplicitly dimension is in the given list. A null value in the list means a row with null for that dimension.""" operationCountProvidedExplicitly:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type AccountBillingUsageStatsMetrics{operationCount:Long!}input AccountBillingUsageStatsOrderBySpec{column:AccountBillingUsageStatsColumn!direction:Ordering!}type AccountBillingUsageStatsRecord{"""Dimensions of AccountBillingUsageStats that can be grouped by.""" groupBy:AccountBillingUsageStatsDimensions!"""Metrics of AccountBillingUsageStats that can be aggregated over.""" metrics:AccountBillingUsageStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type AccountChecksStatsMetrics{totalFailedChecks:Long!totalSuccessfulChecks:Long!}type AccountChecksStatsRecord{id:ID!metrics:AccountChecksStatsMetrics!timestamp:Timestamp!}"""Columns of AccountEdgeServerInfos.""" enum AccountEdgeServerInfosColumn{BOOT_ID EXECUTABLE_SCHEMA_ID LIBRARY_VERSION PLATFORM RUNTIME_VERSION SCHEMA_TAG SERVER_ID SERVICE_ID TIMESTAMP USER_VERSION}type AccountEdgeServerInfosDimensions{bootId:ID executableSchemaId:ID libraryVersion:String platform:String runtimeVersion:String schemaTag:String serverId:ID serviceId:ID userVersion:String}"""Filter for data in AccountEdgeServerInfos. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountEdgeServerInfosFilter{and:[AccountEdgeServerInfosFilter!]"""Selects rows whose bootId dimension equals the given value if not null. To query for the null value, use {in: {bootId: [null]}} instead.""" bootId:ID """Selects rows whose executableSchemaId dimension equals the given value if not null. To query for the null value, use {in: {executableSchemaId: [null]}} instead.""" executableSchemaId:ID in:AccountEdgeServerInfosFilterIn """Selects rows whose libraryVersion dimension equals the given value if not null. To query for the null value, use {in: {libraryVersion: [null]}} instead.""" libraryVersion:String not:AccountEdgeServerInfosFilter or:[AccountEdgeServerInfosFilter!]"""Selects rows whose platform dimension equals the given value if not null. To query for the null value, use {in: {platform: [null]}} instead.""" platform:String """Selects rows whose runtimeVersion dimension equals the given value if not null. To query for the null value, use {in: {runtimeVersion: [null]}} instead.""" runtimeVersion:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serverId dimension equals the given value if not null. To query for the null value, use {in: {serverId: [null]}} instead.""" serverId:ID """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID """Selects rows whose userVersion dimension equals the given value if not null. To query for the null value, use {in: {userVersion: [null]}} instead.""" userVersion:String}"""Filter for data in AccountEdgeServerInfos. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountEdgeServerInfosFilterIn{"""Selects rows whose bootId dimension is in the given list. A null value in the list means a row with null for that dimension.""" bootId:[ID]"""Selects rows whose executableSchemaId dimension is in the given list. A null value in the list means a row with null for that dimension.""" executableSchemaId:[ID]"""Selects rows whose libraryVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" libraryVersion:[String]"""Selects rows whose platform dimension is in the given list. A null value in the list means a row with null for that dimension.""" platform:[String]"""Selects rows whose runtimeVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" runtimeVersion:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serverId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serverId:[ID]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]"""Selects rows whose userVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" userVersion:[String]}input AccountEdgeServerInfosOrderBySpec{column:AccountEdgeServerInfosColumn!direction:Ordering!}type AccountEdgeServerInfosRecord{"""Dimensions of AccountEdgeServerInfos that can be grouped by.""" groupBy:AccountEdgeServerInfosDimensions!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of AccountErrorStats.""" enum AccountErrorStatsColumn{CLIENT_NAME CLIENT_VERSION ERRORS_COUNT PATH QUERY_ID QUERY_NAME REQUESTS_WITH_ERRORS_COUNT SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP}type AccountErrorStatsDimensions{clientName:String clientVersion:String path:String queryId:ID queryName:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in AccountErrorStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountErrorStatsFilter{and:[AccountErrorStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String in:AccountErrorStatsFilterIn not:AccountErrorStatsFilter or:[AccountErrorStatsFilter!]"""Selects rows whose path dimension equals the given value if not null. To query for the null value, use {in: {path: [null]}} instead.""" path:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in AccountErrorStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountErrorStatsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose path dimension is in the given list. A null value in the list means a row with null for that dimension.""" path:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type AccountErrorStatsMetrics{errorsCount:Long!requestsWithErrorsCount:Long!}input AccountErrorStatsOrderBySpec{column:AccountErrorStatsColumn!direction:Ordering!}type AccountErrorStatsRecord{"""Dimensions of AccountErrorStats that can be grouped by.""" groupBy:AccountErrorStatsDimensions!"""Metrics of AccountErrorStats that can be aggregated over.""" metrics:AccountErrorStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type AccountExperimentalFeatures{auditLogs:Boolean!championDashboard:Boolean!derivedLaunches:Boolean!federation2Preview:Boolean!preRequestPreview:Boolean!publicVariants:Boolean!variantHomepage:Boolean!webhooksPreview:Boolean!}"""Columns of AccountFieldLatencies.""" enum AccountFieldLatenciesColumn{FIELD_HISTOGRAM FIELD_NAME PARENT_TYPE SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP}type AccountFieldLatenciesDimensions{field:String fieldName:String parentType:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in AccountFieldLatencies. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountFieldLatenciesFilter{and:[AccountFieldLatenciesFilter!]"""Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:AccountFieldLatenciesFilterIn not:AccountFieldLatenciesFilter or:[AccountFieldLatenciesFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in AccountFieldLatencies. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountFieldLatenciesFilterIn{"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type AccountFieldLatenciesMetrics{fieldHistogram:DurationHistogram!}input AccountFieldLatenciesOrderBySpec{column:AccountFieldLatenciesColumn!direction:Ordering!}type AccountFieldLatenciesRecord{"""Dimensions of AccountFieldLatencies that can be grouped by.""" groupBy:AccountFieldLatenciesDimensions!"""Metrics of AccountFieldLatencies that can be aggregated over.""" metrics:AccountFieldLatenciesMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of AccountFieldUsage.""" enum AccountFieldUsageColumn{CLIENT_NAME CLIENT_VERSION ESTIMATED_EXECUTION_COUNT EXECUTION_COUNT FIELD_NAME PARENT_TYPE QUERY_ID QUERY_NAME REFERENCING_OPERATION_COUNT SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP}type AccountFieldUsageDimensions{clientName:String clientVersion:String fieldName:String parentType:String queryId:ID queryName:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in AccountFieldUsage. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountFieldUsageFilter{and:[AccountFieldUsageFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:AccountFieldUsageFilterIn not:AccountFieldUsageFilter or:[AccountFieldUsageFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in AccountFieldUsage. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountFieldUsageFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type AccountFieldUsageMetrics{estimatedExecutionCount:Long!executionCount:Long!referencingOperationCount:Long!}input AccountFieldUsageOrderBySpec{column:AccountFieldUsageColumn!direction:Ordering!}type AccountFieldUsageRecord{"""Dimensions of AccountFieldUsage that can be grouped by.""" groupBy:AccountFieldUsageDimensions!"""Metrics of AccountFieldUsage that can be aggregated over.""" metrics:AccountFieldUsageMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type AccountInvitation{"""An accepted invitation cannot be used anymore""" acceptedAt:Timestamp """Who accepted the invitation""" acceptedBy:User """Time the invitation was created""" createdAt:Timestamp!"""Who created the invitation""" createdBy:User email:String!id:ID!"""Last time we sent an email for the invitation""" lastSentAt:Timestamp """Access role for the invitee""" role:UserPermission!}type AccountMembership{account:Account!createdAt:Timestamp!"""If this membership is a free seat (based on role)""" free:Boolean permission:UserPermission!user:User!}type AccountMutation{auditExport(id:String!):AuditLogExportMutation """Cancel a pending change from an annual team subscription to a monthly team subscription when the current period expires.""" cancelConvertAnnualTeamSubscriptionToMonthlyAtNextPeriod:Account """Cancel account subscriptions, subscriptions will remain active until the end of the paid period""" cancelSubscriptions:Account """Changes an annual team subscription to a monthly team subscription when the current period expires.""" convertAnnualTeamSubscriptionToMonthlyAtNextPeriod:Account """Changes a monthly team subscription to an annual team subscription.""" convertMonthlyTeamSubscriptionToAnnual:Account createStaticInvitation(role:UserPermission!):OrganizationInviteLink """Delete the account's avatar. Requires Account.canUpdateAvatar to be true.""" deleteAvatar:AvatarDeleteError """Acknowledge that a trial has expired and return to community""" dismissExpiredTrial:Account """Apollo admins only: extend an ongoing trial""" extendTrial(to:Timestamp!):Account """Hard delete an account and all associated services""" hardDelete:Void """Send an invitation to join the account by E-mail""" invite(email:String!role:UserPermission):AccountInvitation """Reactivate a canceled current subscription""" reactivateCurrentSubscription:Account """Refresh billing information from third-party billing service""" refreshBilling:Void """Delete an invitation""" removeInvitation(id:ID):Void """Remove a member of the account""" removeMember(id:ID!):Account requestAuditExport(actors:[ActorInput!]from:Timestamp!graphIds:[String!]to:Timestamp!):Account """Send a new E-mail for an existing invitation""" resendInvitation(id:ID):AccountInvitation revokeStaticInvitation(token:String!):OrganizationInviteLink """Apollo admins only: set the billing plan to an arbitrary plan""" setPlan(id:ID!):Void """Start a new team subscription with the given billing period""" startTeamSubscription(billingPeriod:BillingPeriod!):Account """Start a team trial""" startTrial:Account """This is called by the form shown to users after they cancel their team subscription.""" submitTeamCancellationFeedback(feedback:String!):Void """Apollo admins only: terminate any ongoing subscriptions in the account, without refunds""" terminateSubscriptions:Account """Update the billing address for a Recurly token""" updateBillingAddress(billingAddress:BillingAddressInput!):Account """Update the billing information from a Recurly token""" updateBillingInfo(token:String!):Void updateCompanyUrl(companyUrl:String):Account """Set the E-mail address of the account, used notably for billing""" updateEmail(email:String!):Void """Update the account ID""" updateID(id:ID!):Account """Update the company name""" updateName(name:String!):Void """Apollo admins only: enable or disable an account for PingOne SSO login""" updatePingOneSSOIDPID(idpid:String):Account """Updates the role assigned to new SSO users.""" updateSSODefaultRole(role:UserPermission!):OrganizationSSO """A (currently) internal to Apollo mutation to update a user's role within an organization""" updateUserPermission(permission:UserPermission!userID:ID!):User}"""Columns of AccountOperationCheckStats.""" enum AccountOperationCheckStatsColumn{CACHED_REQUESTS_COUNT CLIENT_NAME CLIENT_VERSION QUERY_ID QUERY_NAME SCHEMA_TAG SERVICE_ID TIMESTAMP UNCACHED_REQUESTS_COUNT}type AccountOperationCheckStatsDimensions{clientName:String clientVersion:String queryId:ID queryName:String schemaTag:String serviceId:ID}"""Filter for data in AccountOperationCheckStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountOperationCheckStatsFilter{and:[AccountOperationCheckStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String in:AccountOperationCheckStatsFilterIn not:AccountOperationCheckStatsFilter or:[AccountOperationCheckStatsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in AccountOperationCheckStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountOperationCheckStatsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type AccountOperationCheckStatsMetrics{cachedRequestsCount:Long!uncachedRequestsCount:Long!}input AccountOperationCheckStatsOrderBySpec{column:AccountOperationCheckStatsColumn!direction:Ordering!}type AccountOperationCheckStatsRecord{"""Dimensions of AccountOperationCheckStats that can be grouped by.""" groupBy:AccountOperationCheckStatsDimensions!"""Metrics of AccountOperationCheckStats that can be aggregated over.""" metrics:AccountOperationCheckStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type AccountPublishesStatsMetrics{totalPublishes:Long!}type AccountPublishesStatsRecord{id:ID!metrics:AccountPublishesStatsMetrics!timestamp:Timestamp!}"""Columns of AccountQueryStats.""" enum AccountQueryStatsColumn{CACHED_HISTOGRAM CACHED_REQUESTS_COUNT CACHE_TTL_HISTOGRAM CLIENT_NAME CLIENT_VERSION FORBIDDEN_OPERATION_COUNT FROM_ENGINEPROXY QUERY_ID QUERY_NAME REGISTERED_OPERATION_COUNT REQUESTS_WITH_ERRORS_COUNT SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP UNCACHED_HISTOGRAM UNCACHED_REQUESTS_COUNT}type AccountQueryStatsDimensions{clientName:String clientVersion:String fromEngineproxy:String queryId:ID queryName:String querySignature:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in AccountQueryStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountQueryStatsFilter{and:[AccountQueryStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fromEngineproxy dimension equals the given value if not null. To query for the null value, use {in: {fromEngineproxy: [null]}} instead.""" fromEngineproxy:String in:AccountQueryStatsFilterIn not:AccountQueryStatsFilter or:[AccountQueryStatsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in AccountQueryStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountQueryStatsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fromEngineproxy dimension is in the given list. A null value in the list means a row with null for that dimension.""" fromEngineproxy:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type AccountQueryStatsMetrics{cacheTtlHistogram:DurationHistogram!cachedHistogram:DurationHistogram!cachedRequestsCount:Long!forbiddenOperationCount:Long!registeredOperationCount:Long!requestsWithErrorsCount:Long!totalLatencyHistogram:DurationHistogram!totalRequestCount:Long!uncachedHistogram:DurationHistogram!uncachedRequestsCount:Long!}input AccountQueryStatsOrderBySpec{column:AccountQueryStatsColumn!direction:Ordering!}type AccountQueryStatsRecord{"""Dimensions of AccountQueryStats that can be grouped by.""" groupBy:AccountQueryStatsDimensions!"""Metrics of AccountQueryStats that can be aggregated over.""" metrics:AccountQueryStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type AccountRoles{canAudit:Boolean!canCreateDevGraph:Boolean!canCreateService:Boolean!canDelete:Boolean!canDownloadInvoice:Boolean!@deprecated(reason:"Use canQueryBillingInfo instead")canManageMembers:Boolean!canQuery:Boolean!canQueryAudit:Boolean!canQueryBillingInfo:Boolean!canQueryInvoices:Boolean!@deprecated(reason:"Use canQueryBillingInfo instead")canQueryMembers:Boolean!canQueryStats:Boolean!canReadTickets:Boolean!canRemoveMembers:Boolean!canSetConstrainedPlan:Boolean!canUpdateBillingInfo:Boolean!canUpdateMetadata:Boolean!}enum AccountState{ACTIVE CLOSED UNKNOWN UNPROVISIONED}"""A time window with a specified granularity over a given account.""" type AccountStatsWindow{billingUsageStats("""Filter to select what rows to return.""" filter:AccountBillingUsageStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountBillingUsageStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountBillingUsageStatsOrderBySpec!]):[AccountBillingUsageStatsRecord!]!edgeServerInfos("""Filter to select what rows to return.""" filter:AccountEdgeServerInfosFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountEdgeServerInfos by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountEdgeServerInfosOrderBySpec!]):[AccountEdgeServerInfosRecord!]!errorStats("""Filter to select what rows to return.""" filter:AccountErrorStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountErrorStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountErrorStatsOrderBySpec!]):[AccountErrorStatsRecord!]!fieldLatencies("""Filter to select what rows to return.""" filter:AccountFieldLatenciesFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountFieldLatencies by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountFieldLatenciesOrderBySpec!]):[AccountFieldLatenciesRecord!]!fieldUsage("""Filter to select what rows to return.""" filter:AccountFieldUsageFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountFieldUsage by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountFieldUsageOrderBySpec!]):[AccountFieldUsageRecord!]!operationCheckStats("""Filter to select what rows to return.""" filter:AccountOperationCheckStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountOperationCheckStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountOperationCheckStatsOrderBySpec!]):[AccountOperationCheckStatsRecord!]!queryStats("""Filter to select what rows to return.""" filter:AccountQueryStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountQueryStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountQueryStatsOrderBySpec!]):[AccountQueryStatsRecord!]!"""From field rounded down to the nearest resolution.""" roundedDownFrom:Timestamp!"""To field rounded up to the nearest resolution.""" roundedUpTo:Timestamp!tracePathErrorsRefs("""Filter to select what rows to return.""" filter:AccountTracePathErrorsRefsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountTracePathErrorsRefs by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountTracePathErrorsRefsOrderBySpec!]):[AccountTracePathErrorsRefsRecord!]!traceRefs("""Filter to select what rows to return.""" filter:AccountTraceRefsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order AccountTraceRefs by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[AccountTraceRefsOrderBySpec!]):[AccountTraceRefsRecord!]!}"""Columns of AccountTracePathErrorsRefs.""" enum AccountTracePathErrorsRefsColumn{CLIENT_NAME CLIENT_VERSION DURATION_BUCKET ERRORS_COUNT_IN_PATH ERRORS_COUNT_IN_TRACE ERROR_MESSAGE PATH QUERY_ID QUERY_NAME SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP TRACE_HTTP_STATUS_CODE TRACE_ID TRACE_SIZE_BYTES TRACE_STARTS_AT}type AccountTracePathErrorsRefsDimensions{clientName:String clientVersion:String durationBucket:Int errorMessage:String path:String queryId:ID queryName:String schemaHash:String schemaTag:String serviceId:ID traceHttpStatusCode:Int traceId:ID traceStartsAt:Timestamp}"""Filter for data in AccountTracePathErrorsRefs. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountTracePathErrorsRefsFilter{and:[AccountTracePathErrorsRefsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose durationBucket dimension equals the given value if not null. To query for the null value, use {in: {durationBucket: [null]}} instead.""" durationBucket:Int """Selects rows whose errorMessage dimension equals the given value if not null. To query for the null value, use {in: {errorMessage: [null]}} instead.""" errorMessage:String in:AccountTracePathErrorsRefsFilterIn not:AccountTracePathErrorsRefsFilter or:[AccountTracePathErrorsRefsFilter!]"""Selects rows whose path dimension equals the given value if not null. To query for the null value, use {in: {path: [null]}} instead.""" path:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID """Selects rows whose traceHttpStatusCode dimension equals the given value if not null. To query for the null value, use {in: {traceHttpStatusCode: [null]}} instead.""" traceHttpStatusCode:Int """Selects rows whose traceId dimension equals the given value if not null. To query for the null value, use {in: {traceId: [null]}} instead.""" traceId:ID}"""Filter for data in AccountTracePathErrorsRefs. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountTracePathErrorsRefsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose durationBucket dimension is in the given list. A null value in the list means a row with null for that dimension.""" durationBucket:[Int]"""Selects rows whose errorMessage dimension is in the given list. A null value in the list means a row with null for that dimension.""" errorMessage:[String]"""Selects rows whose path dimension is in the given list. A null value in the list means a row with null for that dimension.""" path:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]"""Selects rows whose traceHttpStatusCode dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceHttpStatusCode:[Int]"""Selects rows whose traceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceId:[ID]}type AccountTracePathErrorsRefsMetrics{errorsCountInPath:Long!errorsCountInTrace:Long!traceSizeBytes:Long!}input AccountTracePathErrorsRefsOrderBySpec{column:AccountTracePathErrorsRefsColumn!direction:Ordering!}type AccountTracePathErrorsRefsRecord{"""Dimensions of AccountTracePathErrorsRefs that can be grouped by.""" groupBy:AccountTracePathErrorsRefsDimensions!"""Metrics of AccountTracePathErrorsRefs that can be aggregated over.""" metrics:AccountTracePathErrorsRefsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of AccountTraceRefs.""" enum AccountTraceRefsColumn{CLIENT_NAME CLIENT_VERSION DURATION_BUCKET DURATION_NS QUERY_ID QUERY_NAME SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP TRACE_ID TRACE_SIZE_BYTES}type AccountTraceRefsDimensions{clientName:String clientVersion:String durationBucket:Int queryId:ID queryName:String querySignature:String schemaHash:String schemaTag:String serviceId:ID traceId:ID}"""Filter for data in AccountTraceRefs. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input AccountTraceRefsFilter{and:[AccountTraceRefsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose durationBucket dimension equals the given value if not null. To query for the null value, use {in: {durationBucket: [null]}} instead.""" durationBucket:Int in:AccountTraceRefsFilterIn not:AccountTraceRefsFilter or:[AccountTraceRefsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID """Selects rows whose traceId dimension equals the given value if not null. To query for the null value, use {in: {traceId: [null]}} instead.""" traceId:ID}"""Filter for data in AccountTraceRefs. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input AccountTraceRefsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose durationBucket dimension is in the given list. A null value in the list means a row with null for that dimension.""" durationBucket:[Int]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]"""Selects rows whose traceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceId:[ID]}type AccountTraceRefsMetrics{durationNs:Long!traceSizeBytes:Long!}input AccountTraceRefsOrderBySpec{column:AccountTraceRefsColumn!direction:Ordering!}type AccountTraceRefsRecord{"""Dimensions of AccountTraceRefs that can be grouped by.""" groupBy:AccountTraceRefsDimensions!"""Metrics of AccountTraceRefs that can be aggregated over.""" metrics:AccountTraceRefsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""An actor (view of Identity) that performed an action within Studio.""" type Actor{actorId:ID!type:ActorType!}input ActorInput{actorId:ID!type:ActorType!}enum ActorType{ANONYMOUS_USER BACKFILL CRON GRAPH INTERNAL_IDENTITY SYNCHRONIZATION SYSTEM USER}union AddOperationCollectionEntryResult=OperationCollectionEntry|PermissionError|ValidationError union AddOperationCollectionToVariantResult=GraphVariant|InvalidTarget|PermissionError|ValidationError type AffectedClient{"""ID, often the name, of the client set by the user and reported alongside metrics""" clientReferenceId:ID@deprecated(reason:"Unsupported.")"""version of the client set by the user and reported alongside metrics""" clientVersion:String@deprecated(reason:"Unsupported.")}type AffectedQuery{"""If the operation would be approved if the check ran again. Returns null if queried from SchemaDiff.changes.affectedQueries.alreadyApproved""" alreadyApproved:Boolean """If the operation would be ignored if the check ran again""" alreadyIgnored:Boolean """List of changes affecting this query. Returns null if queried from SchemaDiff.changes.affectedQueries.changes""" changes:[ChangeOnOperation!]"""Name to display to the user for the operation""" displayName:String id:ID!"""Determines if this query validates against the proposed schema""" isValid:Boolean """Whether this operation was ignored and its severity was downgraded for that reason""" markedAsIgnored:Boolean """Whether the changes were marked as safe and its severity was downgraded for that reason""" markedAsSafe:Boolean """Name provided for the operation, which can be empty string if it is an anonymous operation""" name:String """First 128 characters of query signature for display""" signature:String}interface ApiKey{id:ID!keyName:String token:String!}type ApiKeyProvision{apiKey:ApiKey!created:Boolean!}type AuditLogExport{actors:[Identity!]bigqueryTriggeredAt:Timestamp completedAt:Timestamp createdAt:Timestamp!exportedFiles:[String!]from:Timestamp!graphs:[Service!]id:ID!requester:User status:AuditStatus!to:Timestamp!}type AuditLogExportMutation{cancel:Account delete:Account}enum AuditStatus{CANCELLED COMPLETED EXPIRED FAILED IN_PROGRESS QUEUED}type AvatarDeleteError{clientMessage:String!code:AvatarDeleteErrorCode!serverMessage:String!}enum AvatarDeleteErrorCode{SSO_USERS_CANNOT_DELETE_SELF_AVATAR}type AvatarUploadError{clientMessage:String!code:AvatarUploadErrorCode!serverMessage:String!}enum AvatarUploadErrorCode{SSO_USERS_CANNOT_UPLOAD_SELF_AVATAR}union AvatarUploadResult=AvatarUploadError|MediaUploadInfo type BillingAddress{address1:String address2:String city:String country:String state:String zip:String}"""Billing address inpnut""" input BillingAddressInput{address1:String!address2:String city:String!country:String!state:String!zip:String!}type BillingInfo{address:BillingAddress!cardType:String firstName:String lastFour:Int lastName:String month:Int vatNumber:String year:Int}enum BillingModel{REQUEST_BASED SEAT_BASED}type BillingMonth{end:Timestamp!requests:Long!start:Timestamp!}enum BillingPeriod{MONTHLY QUARTERLY SEMI_ANNUALLY YEARLY}type BillingPlan{addons:[BillingPlanAddon!]!billingModel:BillingModel!billingPeriod:BillingPeriod capabilities:BillingPlanCapabilities!description:String id:ID!isTrial:Boolean!kind:BillingPlanKind!name:String!"""The price of every seat""" pricePerSeatInUsdCents:Int """The price of subscribing to this plan with a quantity of 1 (currently always the case)""" pricePerUnitInUsdCents:Int!"""Whether the plan is accessible by all users in QueryRoot.allPlans, QueryRoot.plan, or AccountMutation.setPlan""" public:Boolean!tier:BillingPlanTier!}type BillingPlanAddon{id:ID!pricePerUnitInUsdCents:Int!}type BillingPlanAddonV2{id:ID!pricePerUnitInUsdCents:Int!}type BillingPlanCapabilities{clients:Boolean!contracts:Boolean!datadog:Boolean!errors:Boolean!federation:Boolean!launches:Boolean!maxAuditInDays:Int!maxRangeInDays:Int maxRequestsPerMonth:Long metrics:Boolean!notifications:Boolean!operationRegistry:Boolean!ranges:[String!]!schemaValidation:Boolean!traces:Boolean!userRoles:Boolean!webhooks:Boolean!}enum BillingPlanKind{COMMUNITY ENTERPRISE_INTERNAL ENTERPRISE_PAID ENTERPRISE_PILOT TEAM_PAID TEAM_TRIAL}enum BillingPlanKindV2{COMMUNITY ENTERPRISE_INTERNAL ENTERPRISE_PAID ENTERPRISE_PILOT TEAM_PAID TEAM_TRIAL UNKNOWN}enum BillingPlanTier{COMMUNITY ENTERPRISE TEAM}enum BillingPlanTierV2{COMMUNITY ENTERPRISE TEAM UNKNOWN}type BillingPlanV2{addons:[BillingPlanAddonV2!]!billingModel:BillingModel!billingPeriod:BillingPeriod clients:Boolean!contracts:Boolean!datadog:Boolean!description:String errors:Boolean!federation:Boolean!id:ID!isTrial:Boolean!kind:BillingPlanKindV2!launches:Boolean!maxAuditInDays:Int!maxRangeInDays:Int maxRequestsPerMonth:Long metrics:Boolean!name:String!notifications:Boolean!operationRegistry:Boolean!"""The price of every seat""" pricePerSeatInUsdCents:Int """The price of subscribing to this plan with a quantity of 1 (currently always the case)""" pricePerUnitInUsdCents:Int!"""Whether the plan is accessible by all users in QueryRoot.allPlans, QueryRoot.plan, or AccountMutation.setPlan""" public:Boolean!ranges:[String!]!schemaValidation:Boolean!tier:BillingPlanTierV2!traces:Boolean!userRoles:Boolean!webhooks:Boolean!}type BillingSubscription{activatedAt:Timestamp!addons:[BillingSubscriptionAddon!]!autoRenew:Boolean!"""The price of the subscription when ignoring add-ons (such as seats), ie quantity * pricePerUnitInUsdCents""" basePriceInUsdCents:Long!canceledAt:Timestamp currentPeriodEndsAt:Timestamp!currentPeriodStartedAt:Timestamp!expiresAt:Timestamp plan:BillingPlan!"""The price of every seat""" pricePerSeatInUsdCents:Int """The price of every unit in the subscription (hence multiplied by quantity to get to the basePriceInUsdCents)""" pricePerUnitInUsdCents:Int!quantity:Int!"""Total price of the subscription when it next renews, including add-ons (such as seats)""" renewalTotalPriceInUsdCents:Long!state:SubscriptionState!"""Total price of the subscription, including add-ons (such as seats)""" totalPriceInUsdCents:Long!"""When this subscription's trial period expires (if it is a trial). Not the same as the +subscription's Recurly expiration).""" trialExpiresAt:Timestamp uuid:ID!}type BillingSubscriptionAddon{id:ID!pricePerUnitInUsdCents:Int!quantity:Int!}type BillingSubscriptionAddonV2{id:ID!pricePerUnitInUsdCents:Int!quantity:Int!}type BillingSubscriptionV2{"""The price of every unit in the subscription (hence multiplied by quantity to get to the basePriceInUsdCents)""" activatedAt:Timestamp!addons:[BillingSubscriptionAddonV2!]!autoRenew:Boolean!canceledAt:Timestamp currentPeriodEndsAt:Timestamp!currentPeriodStartedAt:Timestamp!expiresAt:Timestamp plan:BillingPlanV2!"""The price of every seat""" pricePerSeatInUsdCents:Int quantity:Int!state:SubscriptionStateV2!"""When this subscription's trial period expires (if it is a trial). Not the same as the +subscription's Recurly expiration).""" trialExpiresAt:Timestamp uuid:ID!}"""Columns of BillingUsageStats.""" enum BillingUsageStatsColumn{ACCOUNT_ID OPERATION_COUNT OPERATION_COUNT_PROVIDED_EXPLICITLY SCHEMA_TAG SERVICE_ID TIMESTAMP}type BillingUsageStatsDimensions{accountId:ID operationCountProvidedExplicitly:String schemaTag:String serviceId:ID}"""Filter for data in BillingUsageStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input BillingUsageStatsFilter{"""Selects rows whose accountId dimension equals the given value if not null. To query for the null value, use {in: {accountId: [null]}} instead.""" accountId:ID and:[BillingUsageStatsFilter!]in:BillingUsageStatsFilterIn not:BillingUsageStatsFilter """Selects rows whose operationCountProvidedExplicitly dimension equals the given value if not null. To query for the null value, use {in: {operationCountProvidedExplicitly: [null]}} instead.""" operationCountProvidedExplicitly:String or:[BillingUsageStatsFilter!]"""Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in BillingUsageStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input BillingUsageStatsFilterIn{"""Selects rows whose accountId dimension is in the given list. A null value in the list means a row with null for that dimension.""" accountId:[ID]"""Selects rows whose operationCountProvidedExplicitly dimension is in the given list. A null value in the list means a row with null for that dimension.""" operationCountProvidedExplicitly:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type BillingUsageStatsMetrics{operationCount:Long!}input BillingUsageStatsOrderBySpec{column:BillingUsageStatsColumn!direction:Ordering!}type BillingUsageStatsRecord{"""Dimensions of BillingUsageStats that can be grouped by.""" groupBy:BillingUsageStatsDimensions!"""Metrics of BillingUsageStats that can be aggregated over.""" metrics:BillingUsageStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""A blob (base64'ed in JSON & GraphQL)""" scalar Blob type Build{input:BuildInput!result:BuildResult}type BuildError{code:String locations:[SourceLocation!]!message:String!}type BuildFailure{errorMessages:[BuildError!]!}union BuildInput=CompositionBuildInput|FilterBuildInput union BuildResult=BuildFailure|BuildSuccess type BuildSuccess{coreSchema:CoreSchema!}enum CacheScope{PRIVATE PUBLIC UNKNOWN UNRECOGNIZED}"""A specific change to a definition in your schema.""" type Change{affectedQueries:[AffectedQuery!]"""Target arg of change made.""" argNode:NamedIntrospectionArg """Indication of the category of the change (e.g. addition, removal, edit).""" category:ChangeCategory!"""Node related to the top level node that was changed, such as a field in an object, +a value in an enum or the object of an interface.""" childNode:NamedIntrospectionValue """Indication of the kind of target and action of the change, e.g. 'TYPE_REMOVED'.""" code:String!"""Human-readable description of the change.""" description:String!"""Top level node affected by the change.""" parentNode:NamedIntrospectionType """Severity of the change, either failure or warning.""" severity:ChangeSeverity!"""Indication of the success of the overall change, either failure, warning, or notice.""" type:ChangeType!@deprecated(reason:"use severity instead")}"""Defines a set of categories that a schema change +can be grouped by.""" enum ChangeCategory{ADDITION DEPRECATION EDIT REMOVAL}"""These schema change codes represent all of the possible changes that can +occur during the schema diff algorithm.""" enum ChangeCode{"""Type of the argument was changed.""" ARG_CHANGED_TYPE """Argument was changed from nullable to non-nullable.""" ARG_CHANGED_TYPE_OPTIONAL_TO_REQUIRED """Default value added or changed for the argument.""" ARG_DEFAULT_VALUE_CHANGE """Description was added, removed, or updated for argument.""" ARG_DESCRIPTION_CHANGE """Argument to a field was removed.""" ARG_REMOVED """Argument to the directive was removed.""" DIRECTIVE_ARG_REMOVED """Location of the directive was removed.""" DIRECTIVE_LOCATION_REMOVED """Directive was removed.""" DIRECTIVE_REMOVED """Repeatable flag was removed for directive.""" DIRECTIVE_REPEATABLE_REMOVED """Enum was deprecated.""" ENUM_DEPRECATED """Reason for enum deprecation changed.""" ENUM_DEPRECATED_REASON_CHANGE """Enum deprecation was removed.""" ENUM_DEPRECATION_REMOVED """Description was added, removed, or updated for enum value.""" ENUM_VALUE_DESCRIPTION_CHANGE """Field was added to the type.""" FIELD_ADDED """Return type for the field was changed.""" FIELD_CHANGED_TYPE """Field was deprecated.""" FIELD_DEPRECATED """Reason for field deprecation changed.""" FIELD_DEPRECATED_REASON_CHANGE """Field deprecation removed.""" FIELD_DEPRECATION_REMOVED """Description was added, removed, or updated for field.""" FIELD_DESCRIPTION_CHANGE """Type of the field in the input object was changed.""" FIELD_ON_INPUT_OBJECT_CHANGED_TYPE """Field was removed from the type.""" FIELD_REMOVED """Field was removed from the input object.""" FIELD_REMOVED_FROM_INPUT_OBJECT """Non-nullable field was added to the input object. (Deprecated.)""" NON_NULLABLE_FIELD_ADDED_TO_INPUT_OBJECT """Nullable field was added to the input type. (Deprecated.)""" NULLABLE_FIELD_ADDED_TO_INPUT_OBJECT """Nullable argument was added to the field.""" OPTIONAL_ARG_ADDED """Optional field was added to the input type.""" OPTIONAL_FIELD_ADDED_TO_INPUT_OBJECT """Non-nullable argument was added to the field.""" REQUIRED_ARG_ADDED """Non-nullable argument added to directive.""" REQUIRED_DIRECTIVE_ARG_ADDED """Required field was added to the input object.""" REQUIRED_FIELD_ADDED_TO_INPUT_OBJECT """Type was added to the schema.""" TYPE_ADDED """Type now implements the interface.""" TYPE_ADDED_TO_INTERFACE """A new value was added to the enum.""" TYPE_ADDED_TO_UNION """Type was changed from one kind to another. +Ex: scalar to object or enum to union.""" TYPE_CHANGED_KIND """Description was added, removed, or updated for type.""" TYPE_DESCRIPTION_CHANGE """Type (object or scalar) was removed from the schema.""" TYPE_REMOVED """Type no longer implements the interface.""" TYPE_REMOVED_FROM_INTERFACE """Type is no longer included in the union.""" TYPE_REMOVED_FROM_UNION """A new value was added to the enum.""" VALUE_ADDED_TO_ENUM """Value was removed from the enum.""" VALUE_REMOVED_FROM_ENUM}"""Represents the tuple of static information +about a particular kind of schema change.""" type ChangeDefinition{category:ChangeCategory!code:ChangeCode!defaultSeverity:ChangeSeverity!}"""Info about a change in the context of an operation it affects""" type ChangeOnOperation{"""Human-readable explanation of the impact of this change on the operation""" impact:String """The semantic info about this change, i.e. info about the change that doesn't depend on the operation""" semanticChange:SemanticChange!}enum ChangeSeverity{FAILURE NOTICE}"""Summary of the changes for a schema diff, computed by placing the changes into categories and then +counting the size of each category. This categorization can be done in different ways, and +accordingly there are multiple fields here for each type of categorization. + +Note that if an object or interface field is added/removed, there won't be any addition/removal +changes generated for its arguments or @deprecated usages. If an enum type is added/removed, there +will be addition/removal changes generated for its values, but not for those values' @deprecated +usages. Description changes won't be generated for a schema element if that element (or an +ancestor) was added/removed.""" type ChangeSummary{"""Counts for changes to fields of objects, input objects, and interfaces.""" field:FieldChangeSummaryCounts!"""Counts for all changes.""" total:TotalChangeSummaryCounts!"""Counts for changes to non-field aspects of objects, input objects, and interfaces, +and all aspects of enums, unions, and scalars.""" type:TypeChangeSummaryCounts!}enum ChangeType{FAILURE NOTICE}type ChangelogLaunchResult{createdAt:Timestamp!schemaTagID:ID!}"""Destination for notifications""" interface Channel{id:ID!name:String!subscriptions:[ChannelSubscription!]!}interface ChannelSubscription{channels:[Channel!]!enabled:Boolean!id:ID!variant:String}type CheckConfiguration{"""Time when check configuration was created""" createdAt:Timestamp!"""Clients to ignore during validation""" excludedClients:[ClientFilter!]!"""Operation names to ignore during validation""" excludedOperationNames:[OperationNameFilter]"""Operations to ignore during validation""" excludedOperations:[ExcludedOperation!]!"""Graph that this check configuration belongs to""" graphID:ID!"""ID of the check configuration""" id:ID!"""Default configuration to include operations on the base variant.""" includeBaseVariant:Boolean!"""Variant overrides for validation""" includedVariants:[String!]!"""Minimum number of requests within the window for an operation to be considered.""" operationCountThreshold:Int!"""Number of requests within the window for an operation to be considered, relative to +total request count. Expected values are between 0 and 0.05 (minimum 5% of +total request volume)""" operationCountThresholdPercentage:Float!"""Only check operations from the last seconds. +The default is 7 days (604,800 seconds).""" timeRangeSeconds:Long!"""Time when check configuration was last updated""" updatedAt:Timestamp!"""Identity of the last user to update the check configuration""" updatedBy:Identity}"""Filter options available when listing checks.""" input CheckFilterInput{authors:[String!]branches:[String!]status:CheckFilterInputStatusOption subgraphs:[String!]}"""Options for filtering CheckWorkflows by status""" enum CheckFilterInputStatusOption{FAILED PASSED PENDING}"""The result of performing a subgraph check, including all steps.""" type CheckPartialSchemaResult{"""Overall result of the check. This will be null if composition validation was unsuccessful.""" checkSchemaResult:CheckSchemaResult """Result of compostion run as part of the overall subgraph check.""" compositionValidationResult:CompositionValidationResult!"""If any modifications were detected in the composed core schema""" coreSchemaModified:Boolean!"""Check workflow associated with the overall subgraph check.""" workflow:CheckWorkflow}type CheckSchemaResult{"""Schema diff and affected operations generated by the schema check""" diffToPrevious:SchemaDiff!"""ID of the operations check that was created""" operationsCheckID:ID!"""Generated url to view schema diff in Engine""" targetUrl:String """Workflow associated with this check result""" workflow:CheckWorkflow}type CheckWorkflow{"""The variant provided as a base to check against. Only the differences from the +base schema will be tested in operations checks.""" baseVariant:GraphVariant completedAt:Timestamp createdAt:Timestamp!"""Contextual parameters supplied by the runtime environment where the check was run.""" gitContext:GitContext id:ID!"""The name of the implementing service that was responsible for triggering the validation.""" implementingServiceName:String """If this check is triggered for an sdl fetched using introspection, this is the endpoint where that schema was being served.""" introspectionEndpoint:String """Only true if the check was triggered from Sandbox Checks page.""" isSandboxCheck:Boolean!"""If this check was created by rerunning, the original check that was rerun.""" rerunOf:CheckWorkflow """Checks created by re-running this check, most recent first.""" reruns(limit:Int!=20):[CheckWorkflow!]startedAt:Timestamp """Overall status of the workflow, based on the underlying task statuses.""" status:CheckWorkflowStatus!"""The set of check tasks associated with this workflow, e.g. OperationsCheck, GraphComposition, etc.""" tasks:[CheckWorkflowTask!]!"""Identity of the user who ran this check""" triggeredBy:Identity """Configuration of validation at the time the check was run.""" validationConfig:SchemaDiffValidationConfig}type CheckWorkflowMutation{"""Re-run a check workflow using the current configuration. A new workflow is created and returned.""" rerun:CheckWorkflowRerunResult}type CheckWorkflowRerunResult{"""Check workflow created by re-running.""" result:CheckWorkflow """Check workflow that was rerun.""" source:CheckWorkflow}enum CheckWorkflowStatus{FAILED PASSED PENDING}interface CheckWorkflowTask{completedAt:Timestamp createdAt:Timestamp!id:ID!status:CheckWorkflowTaskStatus!"""The workflow that this task belongs to.""" workflow:CheckWorkflow!}enum CheckWorkflowTaskStatus{BLOCKED FAILED PASSED PENDING}"""Client filter configuration for a graph.""" type ClientFilter{"""name of the client set by the user and reported alongside metrics""" name:String """version of the client set by the user and reported alongside metrics""" version:String}"""Options to filter by client reference ID, client name, and client version. +If passing client version, make sure to either provide a client reference ID or client name.""" input ClientFilterInput{"""name of the client set by the user and reported alongside metrics""" name:String """version of the client set by the user and reported alongside metrics""" version:String}"""Filter options to exclude by client reference ID, client name, and client version.""" input ClientInfoFilter{name:String """Ignored""" referenceID:ID version:String}"""Filter options to exclude clients. Used as an output type for SchemaDiffValidationConfig.""" type ClientInfoFilterOutput{name:String version:String}enum ComparisonOperator{EQUALS GREATER_THAN GREATER_THAN_OR_EQUAL_TO LESS_THAN LESS_THAN_OR_EQUAL_TO NOT_EQUALS UNRECOGNIZED}"""The result of composition run in the cloud, upon an attempted subgraph deletion.""" type CompositionAndRemoveResult{"""The produced composition config. Will be null if there are any errors""" compositionConfig:CompositionConfig """Whether the removed implementing service existed.""" didExist:Boolean!""" List of errors during composition. Errors mean that Apollo was unable to compose the + graph variant's subgraphs into a GraphQL schema. If present, gateways / routers +are not updated.""" errors:[SchemaCompositionError]!"""ID that points to the results of composition.""" graphCompositionID:String!"""List of subgraphs that are included in this composition.""" subgraphConfigs:[SubgraphConfig!]!"""Whether the gateway/router was updated via Uplink, or would have been for dry runs.""" updatedGateway:Boolean!}"""The result of composition run in the cloud, upon attempted publish of a subgraph.""" type CompositionAndUpsertResult{"""The produced composition config, or null if there are any errors.""" compositionConfig:CompositionConfig """List of errors during composition. Errors mean that Apollo was unable to compose the +graph variant's subgraphs into a supergraph schema. If present, gateways / routers +are not updated.""" errors:[SchemaCompositionError]!"""ID that points to the results of composition.""" graphCompositionID:String!"""Copy text for the launch result of a publish.""" launchCliCopy:String """Link to corresponding launches page on Studio if avaliable.""" launchUrl:String """List of subgraphs that are included in this composition.""" subgraphConfigs:[SubgraphConfig!]!"""Whether the gateway/router was updated via Uplink, or would have been for dry runs.""" updatedGateway:Boolean!"""Whether a subgraph was created as part of this mutation.""" wasCreated:Boolean!"""Whether an implementingService was updated as part of this mutation""" wasUpdated:Boolean!}type CompositionBuildInput{subgraphs:[Subgraph!]!version:String}type CompositionCheckTask implements CheckWorkflowTask{completedAt:Timestamp createdAt:Timestamp!id:ID!"""The result of the composition.""" result:CompositionResult status:CheckWorkflowTaskStatus!workflow:CheckWorkflow!}"""Composition configuration exposed to the gateway.""" type CompositionConfig{"""List of GCS links for implementing services that comprise a composed graph. Is empty if tag/inaccessible is enabled.""" implementingServiceLocations:[ImplementingServiceLocation!]!@deprecated(reason:"Soon we will stop writing to GCS locations")"""Hash of the API schema.""" schemaHash:String!}"""The result of composition run in the cloud.""" type CompositionPublishResult implements CompositionResult{"""The produced composition config. Will be null if there are any errors""" compositionConfig:CompositionConfig """Supergraph SDL generated by composition (this is not the CSDL, that is a deprecated format).""" csdl:GraphQLDocument@deprecated(reason:"Use supergraphSdl instead")"""List of errors during composition. Errors mean that Apollo was unable to compose the +graph variant's subgraphs into a supergraph schema. If present, gateways / routers +are not updated.""" errors:[SchemaCompositionError!]!"""ID for a particular composition.""" graphCompositionID:ID!"""List of subgraphs that are included in this composition.""" subgraphConfigs:[SubgraphConfig!]!"""Supergraph SDL generated by composition.""" supergraphSdl:GraphQLDocument """Whether the gateway/router was updated via Uplink, or would have been for dry runs.""" updatedGateway:Boolean!webhookNotificationBody:String}"""Result of a composition, often as the result of a subgraph check or subgraph publish. +See implementations for more details.""" interface CompositionResult{"""Supergraph SDL generated by composition (this is not the cSDL, a deprecated format).""" csdl:GraphQLDocument@deprecated(reason:"Use supergraphSdl instead")"""List of errors during composition. Errors mean that Apollo was unable to compose the +graph variant's subgraphs into a supergraph schema. If present, gateways / routers +are not updated.""" errors:[SchemaCompositionError!]!"""Globally unique identifier for the composition.""" graphCompositionID:ID!"""List of subgraphs included in this composition.""" subgraphConfigs:[SubgraphConfig!]!"""Supergraph SDL generated by composition.""" supergraphSdl:GraphQLDocument}type CompositionStatusSubscription implements ChannelSubscription{channels:[Channel!]!createdAt:Timestamp!enabled:Boolean!id:ID!lastUpdatedAt:Timestamp!variant:String}"""The composition config exposed to the gateway""" type CompositionValidationDetails{"""List of implementing service partial schemas that comprised the graph composed during validation""" implementingServices:[FederatedImplementingServicePartialSchema!]!"""Hash of the composed schema""" schemaHash:String}"""Metadata about the result of compositions validation run in the cloud, during a subgraph check.""" type CompositionValidationResult implements CompositionResult{"""Describes whether composition succeeded.""" compositionSuccess:Boolean!"""Akin to a composition config, represents the subgraph schemas and corresponding subgraphs that were used +in running composition. Will be null if any errors are encountered. Also may contain a schema hash if +one could be computed, which can be used for schema validation.""" compositionValidationDetails:CompositionValidationDetails """Supergraph SDL generated by composition (this is not the CSDL, that is a deprecated format).""" csdl:GraphQLDocument@deprecated(reason:"Use supergraphSdl instead")"""List of errors during composition. Errors mean that Apollo was unable to compose the +graph variant's subgraphs into a supergraph schema. If present, gateways / routers +are not updated.""" errors:[SchemaCompositionError!]!"""ID that points to the results of this composition.""" graphCompositionID:ID!"""The implementing service that was responsible for triggering the validation""" proposedImplementingService:FederatedImplementingServicePartialSchema!"""List of subgraphs that are included in this composition.""" subgraphConfigs:[SubgraphConfig!]!"""Supergraph schema document generated by composition.""" supergraphSdl:GraphQLDocument """If created as part of a check workflow, the associated workflow task.""" workflowTask:CompositionCheckTask}type ContractPreview{result:ContractPreviewResult!upstreamLaunch:Launch!}type ContractPreviewErrors{errors:[String!]!failedAt:ContractVariantFailedStep!}union ContractPreviewResult=ContractPreviewErrors|ContractPreviewSuccess type ContractPreviewSuccess{apiDocument:String!coreDocument:String!fieldCount:Int!typeCount:Int!}enum ContractVariantFailedStep{ADD_DIRECTIVE_DEFINITIONS_IF_NOT_PRESENT DIRECTIVE_DEFINITION_LOCATION_AUGMENTING EMPTY_OBJECT_AND_INTERFACE_MASKING EMPTY_UNION_MASKING INPUT_VALIDATION PARSING PARSING_TAG_DIRECTIVES PARTIAL_INTERFACE_MASKING SCHEMA_RETRIEVAL TAG_INHERITING TAG_MATCHING TO_API_SCHEMA TO_FILTER_SCHEMA UNKNOWN VERSION_CHECK}type ContractVariantPreviewErrors{errorMessages:[String!]!failedStep:ContractVariantFailedStep!}union ContractVariantPreviewResult=ContractVariantPreviewErrors|ContractVariantPreviewSuccess type ContractVariantPreviewSuccess{baseApiSchema:String!baseCoreSchema:String!contractApiSchema:String!contractCoreSchema:String!}type ContractVariantUpsertErrors{errorMessages:[String!]!}union ContractVariantUpsertResult=ContractVariantUpsertErrors|ContractVariantUpsertSuccess type ContractVariantUpsertSuccess{contractVariant:GraphVariant!}type CoreSchema{apiDocument:GraphQLDocument!coreDocument:GraphQLDocument!coreHash:String!fieldCount:Int!typeCount:Int!}union CreateOperationCollectionResult=OperationCollection|PermissionError|ValidationError type CronExecution{completedAt:Timestamp failure:String id:ID!job:CronJob!resolvedAt:Timestamp resolvedBy:Actor schedule:String!startedAt:Timestamp!}type CronJob{group:String!name:String!recentExecutions(n:Int):[CronExecution!]!}enum DatadogApiRegion{EU EU1 US US1 US1FED US3 US5}type DatadogMetricsConfig{apiKey:String!apiRegion:DatadogApiRegion!enabled:Boolean!legacyMetricNames:Boolean!}union DeleteOperationCollectionResult=DeleteOperationCollectionSuccess|PermissionError type DeleteOperationCollectionSuccess{sandboxOwner:User variants:[GraphVariant!]!}"""The result of attempting to delete a graph variant.""" type DeleteSchemaTagResult{"""WHether a variant was deleted or not.""" deleted:Boolean!}enum DeletionTargetType{ACCOUNT USER}"""Support for a single directive on a graph variant""" type DirectiveSupportStatus{"""whether the directive is supported on the current graph variant""" enabled:Boolean!"""name of the directive""" name:String!}union DuplicateOperationCollectionResult=OperationCollection|PermissionError|ValidationError type DurationHistogram{averageDurationMs:Float buckets:[DurationHistogramBucket!]!durationMs("""Percentile (between 0 and 1)""" percentile:Float!):Float """Counts per durationBucket, where sequences of zeroes are replaced with the negative of their size""" sparseBuckets:[Long!]!totalCount:Long!totalDurationMs:Float!}type DurationHistogramBucket{count:Long!index:Int!rangeBeginMs:Float!rangeEndMs:Float!}input EdgeServerInfo{"""A randomly generated UUID, immutable for the lifetime of the edge server runtime.""" bootId:String!"""A unique identifier for the executable GraphQL served by the edge server. length must be <= 64 characters.""" executableSchemaId:String!"""The graph variant, defaults to 'current'""" graphVariant:String!="current" """The version of the edge server reporting agent, e.g. apollo-server-2.8, graphql-java-3.1, etc. length must be <= 256 characters.""" libraryVersion:String """The infra environment in which this edge server is running, e.g. localhost, Kubernetes, AWS Lambda, Google CloudRun, AWS ECS, etc. length must be <= 256 characters.""" platform:String """The runtime in which the edge server is running, e.g. node 12.03, zulu8.46.0.19-ca-jdk8.0.252-macosx_x64, etc. length must be <= 256 characters.""" runtimeVersion:String """If available, an identifier for the edge server instance, such that when restarting this instance it will have the same serverId, with a different bootId. For example, in Kubernetes this might be the pod name. Length must be <= 256 characters.""" serverId:String """An identifier used to distinguish the version (from the user's perspective) of the edge server's code itself. For instance, the git sha of the server's repository or the docker sha of the associated image this server runs with. Length must be <= 256 characters.""" userVersion:String}"""Columns of EdgeServerInfos.""" enum EdgeServerInfosColumn{BOOT_ID EXECUTABLE_SCHEMA_ID LIBRARY_VERSION PLATFORM RUNTIME_VERSION SCHEMA_TAG SERVER_ID SERVICE_ID TIMESTAMP USER_VERSION}type EdgeServerInfosDimensions{bootId:ID executableSchemaId:ID libraryVersion:String platform:String runtimeVersion:String schemaTag:String serverId:ID serviceId:ID userVersion:String}"""Filter for data in EdgeServerInfos. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input EdgeServerInfosFilter{and:[EdgeServerInfosFilter!]"""Selects rows whose bootId dimension equals the given value if not null. To query for the null value, use {in: {bootId: [null]}} instead.""" bootId:ID """Selects rows whose executableSchemaId dimension equals the given value if not null. To query for the null value, use {in: {executableSchemaId: [null]}} instead.""" executableSchemaId:ID in:EdgeServerInfosFilterIn """Selects rows whose libraryVersion dimension equals the given value if not null. To query for the null value, use {in: {libraryVersion: [null]}} instead.""" libraryVersion:String not:EdgeServerInfosFilter or:[EdgeServerInfosFilter!]"""Selects rows whose platform dimension equals the given value if not null. To query for the null value, use {in: {platform: [null]}} instead.""" platform:String """Selects rows whose runtimeVersion dimension equals the given value if not null. To query for the null value, use {in: {runtimeVersion: [null]}} instead.""" runtimeVersion:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serverId dimension equals the given value if not null. To query for the null value, use {in: {serverId: [null]}} instead.""" serverId:ID """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID """Selects rows whose userVersion dimension equals the given value if not null. To query for the null value, use {in: {userVersion: [null]}} instead.""" userVersion:String}"""Filter for data in EdgeServerInfos. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input EdgeServerInfosFilterIn{"""Selects rows whose bootId dimension is in the given list. A null value in the list means a row with null for that dimension.""" bootId:[ID]"""Selects rows whose executableSchemaId dimension is in the given list. A null value in the list means a row with null for that dimension.""" executableSchemaId:[ID]"""Selects rows whose libraryVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" libraryVersion:[String]"""Selects rows whose platform dimension is in the given list. A null value in the list means a row with null for that dimension.""" platform:[String]"""Selects rows whose runtimeVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" runtimeVersion:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serverId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serverId:[ID]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]"""Selects rows whose userVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" userVersion:[String]}input EdgeServerInfosOrderBySpec{column:EdgeServerInfosColumn!direction:Ordering!}type EdgeServerInfosRecord{"""Dimensions of EdgeServerInfos that can be grouped by.""" groupBy:EdgeServerInfosDimensions!"""Starting segment timestamp.""" timestamp:Timestamp!}enum EmailCategory{EDUCATIONAL}type EmailPreferences{email:String!subscriptions:[EmailCategory!]!unsubscribedFromAll:Boolean!}interface Error{message:String!}"""Columns of ErrorStats.""" enum ErrorStatsColumn{ACCOUNT_ID CLIENT_NAME CLIENT_VERSION ERRORS_COUNT PATH QUERY_ID QUERY_NAME REQUESTS_WITH_ERRORS_COUNT SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP}type ErrorStatsDimensions{accountId:ID clientName:String clientVersion:String path:String queryId:ID queryName:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in ErrorStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ErrorStatsFilter{"""Selects rows whose accountId dimension equals the given value if not null. To query for the null value, use {in: {accountId: [null]}} instead.""" accountId:ID and:[ErrorStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String in:ErrorStatsFilterIn not:ErrorStatsFilter or:[ErrorStatsFilter!]"""Selects rows whose path dimension equals the given value if not null. To query for the null value, use {in: {path: [null]}} instead.""" path:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in ErrorStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ErrorStatsFilterIn{"""Selects rows whose accountId dimension is in the given list. A null value in the list means a row with null for that dimension.""" accountId:[ID]"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose path dimension is in the given list. A null value in the list means a row with null for that dimension.""" path:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type ErrorStatsMetrics{errorsCount:Long!requestsWithErrorsCount:Long!}input ErrorStatsOrderBySpec{column:ErrorStatsColumn!direction:Ordering!}type ErrorStatsRecord{"""Dimensions of ErrorStats that can be grouped by.""" groupBy:ErrorStatsDimensions!"""Metrics of ErrorStats that can be aggregated over.""" metrics:ErrorStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}""" Input parameters for run explorer operation event.""" enum EventEnum{CLICK_CHECK_LIST CLICK_GO_TO_GRAPH_SETTINGS RUN_EXPLORER_OPERATION}"""Excluded operation for a graph.""" type ExcludedOperation{"""Operation ID to exclude from schema check.""" ID:ID!}"""Option to filter by operation ID.""" input ExcludedOperationInput{"""Operation ID to exclude from schema check.""" ID:ID!}type FeatureIntros{devGraph:Boolean!federatedGraph:Boolean!freeConsumerSeats:Boolean!}"""Feature Intros Input Type""" input FeatureIntrosInput{devGraph:Boolean federatedGraph:Boolean freeConsumerSeats:Boolean}"""Subgraph. Federated graph variants that are managed by Apollo Studio are composed of subgraphs. +See https://www.apollographql.com/docs/federation/managed-federation/overview/ for more information.""" type FederatedImplementingService{"""The subgraph schema actively published, used for composition for the graph variant this subgraph belongs to.""" activePartialSchema:PartialSchema!"""Timestamp of when this subgraph was created.""" createdAt:Timestamp!"""The ID of the graph this subgraph belongs to.""" graphID:String!"""Which variant of a graph this subgraph belongs to.""" graphVariant:String!"""Name of the subgraph.""" name:String!"""The particular version/edition of a subgraph, entered by users. Typically a Git SHA or docker image ID.""" revision:String!"""Timestamp for when this subgraph was updated.""" updatedAt:Timestamp!"""URL of the subgraph's GraphQL endpoint.""" url:String}"""A minimal representation of a federated implementing service, using only a name and partial schema SDL""" type FederatedImplementingServicePartialSchema{"""The name of the implementing service""" name:String!"""The partial schema of the implementing service""" sdl:String!}"""Container for a list of subgraphs composing a graph.""" type FederatedImplementingServices{"""The list of underlying subgraphs.""" services:[FederatedImplementingService!]!}"""Counts of changes at the field level, including objects, interfaces, and input fields.""" type FieldChangeSummaryCounts{"""Number of changes that are additions of fields to object, interface, and input types.""" additions:Int!"""Number of changes that are field edits. This includes fields changing type and any field +deprecation and description changes, but also includes any argument changes and any input object +field changes.""" edits:Int!"""Number of changes that are removals of fields from object, interface, and input types.""" removals:Int!}"""Columns of FieldLatencies.""" enum FieldLatenciesColumn{FIELD_HISTOGRAM FIELD_NAME PARENT_TYPE SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP}type FieldLatenciesDimensions{field:String fieldName:String parentType:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in FieldLatencies. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input FieldLatenciesFilter{and:[FieldLatenciesFilter!]"""Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:FieldLatenciesFilterIn not:FieldLatenciesFilter or:[FieldLatenciesFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in FieldLatencies. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input FieldLatenciesFilterIn{"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type FieldLatenciesMetrics{fieldHistogram:DurationHistogram!}input FieldLatenciesOrderBySpec{column:FieldLatenciesColumn!direction:Ordering!}type FieldLatenciesRecord{"""Dimensions of FieldLatencies that can be grouped by.""" groupBy:FieldLatenciesDimensions!"""Metrics of FieldLatencies that can be aggregated over.""" metrics:FieldLatenciesMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of FieldUsage.""" enum FieldUsageColumn{CLIENT_NAME CLIENT_VERSION ESTIMATED_EXECUTION_COUNT EXECUTION_COUNT FIELD_NAME PARENT_TYPE QUERY_ID QUERY_NAME REFERENCING_OPERATION_COUNT SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP}type FieldUsageDimensions{clientName:String clientVersion:String fieldName:String parentType:String queryId:ID queryName:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in FieldUsage. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input FieldUsageFilter{and:[FieldUsageFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:FieldUsageFilterIn not:FieldUsageFilter or:[FieldUsageFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in FieldUsage. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input FieldUsageFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type FieldUsageMetrics{estimatedExecutionCount:Long!executionCount:Long!referencingOperationCount:Long!}input FieldUsageOrderBySpec{column:FieldUsageColumn!direction:Ordering!}type FieldUsageRecord{"""Dimensions of FieldUsage that can be grouped by.""" groupBy:FieldUsageDimensions!"""Metrics of FieldUsage that can be aggregated over.""" metrics:FieldUsageMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type FilterBuildInput{filterConfig:FilterConfig!schemaHash:String!}type FilterConfig{exclude:[String!]!include:[String!]!}input FilterConfigInput{exclude:[String!]!include:[String!]!}type GitContext{branch:String commit:ID commitUrl:String committer:String message:String remoteHost:GitRemoteHost remoteUrl:String}"""This is stored with a schema when it is uploaded""" input GitContextInput{branch:String commit:ID committer:String message:String remoteUrl:String}enum GitRemoteHost{BITBUCKET GITHUB GITLAB}type GlobalExperimentalFeatures{operationsCollections:Boolean!sandboxesFullRelease:Boolean!sandboxesPreview:Boolean!sandboxesSchemaChecksPage:Boolean!sandboxesSchemaDiffPage:Boolean!subgraphsInSandbox:Boolean!}type GraphApiKey implements ApiKey{createdAt:Timestamp!createdBy:Identity id:ID!keyName:String role:UserPermission!token:String!}"""A union of all combinations that can comprise the implementingServices for a Service""" union GraphImplementors=FederatedImplementingServices|NonFederatedImplementingService scalar GraphQLDocument """A variant of a graph, often corresponding to an environment where a graph runs (e.g. staging). +See https://www.apollographql.com/docs/studio/org/graphs/ for more details.""" type GraphVariant{"""As new schema tags keep getting published, activeSchemaPublish refers to the latest.""" activeSchemaPublish:SchemaTag """The version of composition currently in use, if applicable""" compositionVersion:String """Filter configuration used to create the contract schema""" contractFilterConfig:FilterConfig """Preview a Contract schema built from this source variant.""" contractPreview(filters:FilterConfigInput!):ContractPreview!"""Explorer setting for default headers for a graph""" defaultHeaders:String derivedVariantCount:Int!"""Graph the variant belongs to.""" graph:Service!"""Graph ID of the variant. Prefer using graph { id } when feasible.""" graphId:String!"""If the variant has managed subgraphs.""" hasManagedSubgraphs:Boolean """Global identifier for the graph variant, in the form `graph@variant`.""" id:ID!"""Represents whether this variant is a Contract.""" isContract:Boolean!"""Is this variant one of the current user's favorite variants?""" isFavoriteOfCurrentUser:Boolean!"""If the variant has managed subgraphs.""" isFederated:Boolean@deprecated(reason:"Replaced by hasManagedSubgraphs")"""If the variant is protected""" isProtected:Boolean!isPublic:Boolean!"""Represents whether this variant should be listed in the public variants directory. This can only be true if the variant is also public.""" isPubliclyListed:Boolean!"""Represents whether Apollo has verified the authenticity of this public variant. This can only be true if the variant is also public.""" isVerified:Boolean!"""Latest approved launch for the variant, and what is served through Uplink.""" latestApprovedLaunch:Launch """Latest launch for the variant, whether successful or not.""" latestLaunch:Launch """Latest publication for the variant.""" latestPublication:SchemaTag launch(id:ID!):Launch launchHistory(limit:Int!=100):[Launch!]!links:[LinkInfo!]"""Name of the variant, like `variant`.""" name:String!operationCollections:[OperationCollection!]!"""Which permissions the current user has for interacting with this variant""" permissions:GraphVariantPermissions!"""Generate a federated operation plan for a given operation""" plan(document:GraphQLDocument!operationName:String):QueryPlan """Explorer setting for preflight script to run before the actual GraphQL operations is run.""" preflightScript:String readme:Readme """Registry stats for this particular graph variant""" registryStatsWindow(from:Timestamp!resolution:Resolution to:Timestamp):RegistryStatsWindow """The total number of requests for this variant in the last 24 hours""" requestsInLastDay:Long """If the graphql endpoint is set up to accept cookies.""" sendCookies:Boolean sourceVariant:GraphVariant """List of subgraphs that comprise a variant, null if not federated. +Set includeDeleted to see deleted subgraphs.""" subgraphs(includeDeleted:Boolean!=false):[FederatedImplementingService!]"""URL where subscription operations can be executed.""" subscriptionUrl:String """A list of supported directives""" supportedDirectives:[DirectiveSupportStatus!]"""URL where non-subscription operations can be executed.""" url:String """The last instant that usage information (e.g. operation stat, client stats) was reported for this variant""" usageLastReportedAt:Timestamp}"""Result of looking up a variant by ref""" union GraphVariantLookup=GraphVariant|InvalidRefFormat """Modifies a variant of a graph, also called a schema tag in parts of our product.""" type GraphVariantMutation{addLinkToVariant(title:String type:LinkInfoType!url:String!):GraphVariant!configureComposition(enableTagAndInaccessible:Boolean version:String):GraphVariant enableTagAndInaccessible(enabled:Boolean!):GraphVariant@deprecated(reason:"Use configureComposition instead")"""Graph ID of the variant""" graphId:String!"""Global identifier for the graph variant, in the form `graph@variant`.""" id:ID!"""Name of the variant, like `variant`.""" name:String!relaunch:RelaunchResult!removeLinkFromVariant(linkInfoId:ID!):GraphVariant!setIsFavoriteOfCurrentUser(favorite:Boolean!):GraphVariant!updateDefaultHeaders(defaultHeaders:String):GraphVariant updateIsProtected(isProtected:Boolean!):GraphVariant updatePreflightScript(preflightScript:String):GraphVariant updateSendCookies(sendCookies:Boolean!):GraphVariant updateSubscriptionURL(subscriptionUrl:String):GraphVariant updateURL(url:String):GraphVariant updateVariantIsPublic(isPublic:Boolean!):GraphVariant updateVariantIsPubliclyListed(isPubliclyListed:Boolean!):GraphVariant updateVariantIsVerified(isVerified:Boolean!):GraphVariant updateVariantReadme(readme:String!):GraphVariant}"""A map from permission String to boolean that the currently authenticated user is allowed for a particular graph variant.""" type GraphVariantPermissions{canCreateCollectionInVariant:Boolean!"""Whether the currently authenticated user is permitted to manage/update the build configuration (e.g. build pipeline version) for this variant.""" canManageBuildConfig:Boolean!"""Whether the currently authenticated user is permitted to update variant-level settings for the Schema Explorer.""" canManageExplorerSettings:Boolean!"""Whether the currently authenticated user is permitted to publish schemas to this variant.""" canPushSchemas:Boolean!"""Whether the currently authenticated user is permitted to view details regarding the build configuration (e.g. build pipeline version) for this variant.""" canQueryBuildConfig:Boolean!"""Whether the currently authenticated user is permitted to download schemas associated to this variant.""" canQuerySchemas:Boolean!canShareCollectionInVariant:Boolean!canUpdateVariantLinkInfo:Boolean!"""Whether the currently authenticated user is permitted to update the README for this variant.""" canUpdateVariantReadme:Boolean!variantId:ID!}enum HTTPMethod{CONNECT DELETE GET HEAD OPTIONS PATCH POST PUT TRACE UNKNOWN UNRECOGNIZED}input HistoricQueryParameters{"""A list of clients to filter out during validation.""" excludedClients:[ClientInfoFilter!]=null """A list of operation names to filter out during validation.""" excludedOperationNames:[OperationNameFilterInput!]=null from:Timestamp="-86400" """A list of operation IDs to filter out during validation.""" ignoredOperations:[ID!]=null """A list of variants to include in the validation. If no variants are provided +then this defaults to the "current" variant along with the base variant. The +base variant indicates the schema that generates diff and marks the metrics that +are checked for broken queries. We union this base variant with the untagged values('', +same as null inside of `in`, and 'current') in this metrics fetch. This strategy +supports users who have not tagged their metrics or schema.""" includedVariants:[String!]=null """Minimum number of requests within the window for a query to be considered.""" queryCountThreshold:Int=1 """Number of requests within the window for a query to be considered, relative to +total request count. Expected values are between 0 and 0.05 (minimum 5% of total +request volume)""" queryCountThresholdPercentage:Float=0 to:Timestamp="-0"}"""An identity (e.g. Anonymous, a specific User) within Apollo Studio. See implementations.""" interface Identity{"""A view of the identity as an Actor type.""" asActor:Actor!"""An identifier for a given identity, unique within the context of the identity type.""" id:ID!"""A human-readable name for the identity in question.""" name:String!}"""An actor's identity and info about the client they used to perform the action""" type IdentityAndClientInfo{"""Client name provided when the actor performed the action""" clientName:String """Client version provided when the actor performed the action""" clientVersion:String """Identity info about the actor""" identity:Identity}union IdentityMutation=ServiceMutation|UserMutation type IgnoreOperationsInChecksResult{graph:Service!}"""The location of the implementing service config file in storage""" type ImplementingServiceLocation{"""The name of the implementing service""" name:String!"""The path in storage to access the implementing service config file""" path:String!}type InternalAdminUser{role:InternalMdgAdminRole!userID:String!}type InternalIdentity implements Identity{accounts:[Account!]!asActor:Actor!email:String id:ID!name:String!}enum InternalMdgAdminRole{INTERNAL_MDG_READ_ONLY INTERNAL_MDG_SALES INTERNAL_MDG_SUPER_ADMIN INTERNAL_MDG_SUPPORT}type IntrospectionDirective{args:[IntrospectionInputValue!]!description:String locations:[IntrospectionDirectiveLocation!]!name:String!}input IntrospectionDirectiveInput{args:[IntrospectionInputValueInput!]!description:String isRepeatable:Boolean locations:[IntrospectionDirectiveLocation!]!name:String!}"""__DirectiveLocation introspection type""" enum IntrospectionDirectiveLocation{"""Location adjacent to an argument definition.""" ARGUMENT_DEFINITION """Location adjacent to an enum definition.""" ENUM """Location adjacent to an enum value definition.""" ENUM_VALUE """Location adjacent to a field.""" FIELD """Location adjacent to a field definition.""" FIELD_DEFINITION """Location adjacent to a fragment definition.""" FRAGMENT_DEFINITION """Location adjacent to a fragment spread.""" FRAGMENT_SPREAD """Location adjacent to an inline fragment.""" INLINE_FRAGMENT """Location adjacent to an input object field definition.""" INPUT_FIELD_DEFINITION """Location adjacent to an input object type definition.""" INPUT_OBJECT """Location adjacent to an interface definition.""" INTERFACE """Location adjacent to a mutation operation.""" MUTATION """Location adjacent to an object type definition.""" OBJECT """Location adjacent to a query operation.""" QUERY """Location adjacent to a scalar definition.""" SCALAR """Location adjacent to a schema definition.""" SCHEMA """Location adjacent to a subscription operation.""" SUBSCRIPTION """Location adjacent to a union definition.""" UNION """Location adjacent to a variable definition.""" VARIABLE_DEFINITION}"""Values associated with introspection result for an enum value""" type IntrospectionEnumValue{depreactionReason:String@deprecated(reason:"Use deprecationReason instead")deprecationReason:String description:String isDeprecated:Boolean!name:String!}"""__EnumValue introspection type""" input IntrospectionEnumValueInput{deprecationReason:String description:String isDeprecated:Boolean!name:String!}"""Values associated with introspection result for field""" type IntrospectionField{args:[IntrospectionInputValue!]!deprecationReason:String description:String isDeprecated:Boolean!name:String!type:IntrospectionType!}"""__Field introspection type""" input IntrospectionFieldInput{args:[IntrospectionInputValueInput!]!deprecationReason:String description:String isDeprecated:Boolean!name:String!type:IntrospectionTypeInput!}"""Values associated with introspection result for an input field""" type IntrospectionInputValue{defaultValue:String description:String name:String!type:IntrospectionType!}"""__Value introspection type""" input IntrospectionInputValueInput{defaultValue:String deprecationReason:String description:String isDeprecated:Boolean name:String!type:IntrospectionTypeInput!}type IntrospectionSchema{directives:[IntrospectionDirective!]!mutationType:IntrospectionType queryType:IntrospectionType!subscriptionType:IntrospectionType types(filter:TypeFilterConfig={includeAbstractTypes:true includeBuiltInTypes:true includeIntrospectionTypes:true}):[IntrospectionType!]!}"""__Schema introspection type""" input IntrospectionSchemaInput{description:String directives:[IntrospectionDirectiveInput!]!mutationType:IntrospectionTypeRefInput queryType:IntrospectionTypeRefInput!subscriptionType:IntrospectionTypeRefInput types:[IntrospectionTypeInput!]}"""Object containing all possible values for an introspectionType""" type IntrospectionType{"""the base kind of the type this references, ignoring lists and nullability""" baseKind:IntrospectionTypeKind description:String enumValues(includeDeprecated:Boolean=false):[IntrospectionEnumValue!]fields:[IntrospectionField!]inputFields:[IntrospectionInputValue!]interfaces:[IntrospectionType!]kind:IntrospectionTypeKind name:String ofType:IntrospectionType possibleTypes:[IntrospectionType!]"""printed representation of type, including nested nullability and list ofTypes""" printed:String!}"""__Type introspection type""" input IntrospectionTypeInput{description:String enumValues:[IntrospectionEnumValueInput!]fields:[IntrospectionFieldInput!]inputFields:[IntrospectionInputValueInput!]interfaces:[IntrospectionTypeInput!]kind:IntrospectionTypeKind!name:String ofType:IntrospectionTypeInput possibleTypes:[IntrospectionTypeInput!]specifiedByUrl:String}enum IntrospectionTypeKind{"""Indicates this type is an enum. 'enumValues' is a valid field.""" ENUM """Indicates this type is an input object. 'inputFields' is a valid field.""" INPUT_OBJECT """Indicates this type is an interface. 'fields' and 'possibleTypes' are valid +fields""" INTERFACE """Indicates this type is a list. 'ofType' is a valid field.""" LIST """Indicates this type is a non-null. 'ofType' is a valid field.""" NON_NULL """Indicates this type is an object. 'fields' and 'interfaces' are valid fields.""" OBJECT """Indicates this type is a scalar.""" SCALAR """Indicates this type is a union. 'possibleTypes' is a valid field.""" UNION}"""Shallow __Type introspection type""" input IntrospectionTypeRefInput{kind:String name:String!}type InvalidOperation{errors:[OperationValidationError!]signature:ID!}"""Type returned by reference lookup when the reference was invalid""" type InvalidRefFormat implements Error{message:String!}type InvalidTarget implements Error{message:String!}type Invoice{closedAt:Timestamp collectionMethod:String createdAt:Timestamp!invoiceNumber:Int!state:InvoiceState!totalInCents:Int!updatedAt:Timestamp!uuid:ID!}enum InvoiceState{COLLECTED FAILED OPEN PAST_DUE UNKNOWN}enum InvoiceStateV2{COLLECTED FAILED OPEN PAST_DUE UNKNOWN}type InvoiceV2{closedAt:Timestamp collectionMethod:String createdAt:Timestamp!invoiceNumber:Int!state:InvoiceStateV2!totalInCents:Int!updatedAt:Timestamp!uuid:ID!}type Launch{approvedAt:Timestamp build:Build buildInput:BuildInput!completedAt:Timestamp createdAt:Timestamp!downstreamLaunches:[Launch!]!graphId:String!graphVariant:String!id:ID!isAvailable:Boolean isCompleted:Boolean isPublished:Boolean isTarget:Boolean latestSequenceStep:LaunchSequenceStep publication:SchemaTag results:[LaunchResult!]!schemaTag:SchemaTag sequence:[LaunchSequenceStep!]!shortenedID:String!status:LaunchStatus!subgraphChanges:[SubgraphChange!]supersededAt:Timestamp supersededBy:Launch upstreamLaunch:Launch}"""more result types will be supported in the future""" union LaunchResult=ChangelogLaunchResult type LaunchSequenceBuildStep{completedAt:Timestamp startedAt:Timestamp}type LaunchSequenceCheckStep{completedAt:Timestamp startedAt:Timestamp}type LaunchSequenceCompletedStep{completedAt:Timestamp}type LaunchSequenceInitiatedStep{startedAt:Timestamp}type LaunchSequencePublishStep{completedAt:Timestamp startedAt:Timestamp}union LaunchSequenceStep=LaunchSequenceBuildStep|LaunchSequenceCheckStep|LaunchSequenceCompletedStep|LaunchSequenceInitiatedStep|LaunchSequencePublishStep|LaunchSequenceSupersededStep type LaunchSequenceSupersededStep{completedAt:Timestamp}enum LaunchStatus{LAUNCH_COMPLETED LAUNCH_FAILED LAUNCH_INITIATED}type LinkInfo{createdAt:Timestamp!id:ID!title:String type:LinkInfoType!url:String!}enum LinkInfoType{DEVELOPER_PORTAL OTHER REPOSITORY}"""Long type""" scalar Long type MarkChangesForOperationAsSafeResult{"""Nice to have for the frontend since the Apollo cache is already watching for AffectedQuery to update. +This might return null if no behavior changes were found for the affected operation ID. +This is a weird situation that should never happen.""" affectedOperation:AffectedQuery message:String!success:Boolean!}type MediaUploadInfo{csrfToken:String!maxContentLength:Int!url:String!}union MoveOperationCollectionEntryResult=InvalidTarget|MoveOperationCollectionEntrySuccess|PermissionError type MoveOperationCollectionEntrySuccess{operation:OperationCollectionEntry!originCollection:OperationCollection!targetCollection:OperationCollection!}type Mutation{account(id:ID!):AccountMutation """Creates an operation collection for the given variantRefs, or make a sandbox collection without variantRefs.""" createOperationCollection(description:String editRoles:[UserPermission!]isSandbox:Boolean!isShared:Boolean!name:String!variantRefs:[ID!]):CreateOperationCollectionResult!"""Finalize a password reset with a token included in the E-mail link, +returns the corresponding login email when successful""" finalizePasswordReset(newPassword:String!resetToken:String!):String """Mutation a graph.""" graph(id:ID!):ServiceMutation """Join an account with a token""" joinAccount(accountId:ID!joinToken:String!):Account me:IdentityMutation newAccount(companyUrl:String id:ID!):Account newService(accountId:ID!description:String hiddenFromUninvitedNonAdminAccountMembers:Boolean!=false id:ID!isDev:Boolean!=false name:String title:String):Service operationCollection(id:ID!):OperationCollectionMutation """Refresh all plans from third-party billing service""" plansRefreshBilling:Void """Report a running GraphQL server's schema.""" reportSchema("""Only sent if previously requested i.e. received ReportSchemaResult with withCoreSchema = true. This is a GraphQL schema document as a string. Note that for a GraphQL server with a core schema, this should be the core schema, not the API schema.""" coreSchema:String """Information about server and its schema.""" report:SchemaReport!):ReportSchemaResult """Ask for a user's password to be reset by E-mail""" resetPassword(email:String!):Void resolveAllInternalCronExecutions(group:String name:String):Void resolveInternalCronExecution(id:ID!):CronExecution service(id:ID!):ServiceMutation """Set the subscriptions for a given email""" setSubscriptions(email:String!subscriptions:[EmailCategory!]!token:String!):EmailPreferences """Set the studio settings for the current user""" setUserSettings(newSettings:UserSettingsInput):UserSettings signUp(email:String!fullName:String!password:String!referrer:String trackingGoogleClientId:String trackingMarketoClientId:String userSegment:UserSegment utmCampaign:String utmMedium:String utmSource:String):User """This is called by the form shown to users after they delete their user or organization account.""" submitPostDeletionFeedback(feedback:String!targetIdentifier:ID!targetType:DeletionTargetType!):Void """Mutation for basic engagement tracking in studio""" track(event:EventEnum!graphID:String!graphVariant:String!="current"):Void """Rover session tracking. Reserved to https://rover.apollo.dev/telemetry (https://github.com/apollographql/orbiter).""" trackRoverSession(anonymousId:ID!arguments:[RoverArgumentInput!]!ci:String command:String!cwdHash:SHA256!os:String!remoteUrlHash:SHA256!sessionId:ID!version:String!):Void """Unsubscribe a given email from all emails""" unsubscribeFromAll(email:String!token:String!):EmailPreferences user(id:ID!):UserMutation}type NamedIntrospectionArg{description:String name:String}type NamedIntrospectionArgNoDescription{name:String}"""The shared fields for a named introspection type. Currently this is returned for the +top level value affected by a change. In the future, we may update this +type to be an interface, which is extended by the more specific types: +scalar, object, input object, union, interface, and enum + +For an in-depth look at where these types come from, see: +https://github.com/DefinitelyTyped/DefinitelyTyped/blob/659eb50d3/types/graphql/utilities/introspectionQuery.d.ts#L31-L37""" type NamedIntrospectionType{description:String kind:IntrospectionTypeKind name:String}type NamedIntrospectionTypeNoDescription{name:String}"""Introspection values that can be children of other types for changes, such +as input fields, objects in interfaces, enum values. In the future, this +value could become an interface to allow fields specific to the types +returned.""" type NamedIntrospectionValue{description:String name:String printedType:String}type NamedIntrospectionValueNoDescription{name:String printedType:String}"""A non-federated service for a monolithic graph.""" type NonFederatedImplementingService{"""Timestamp of when this implementing service was created.""" createdAt:Timestamp!"""Identifies which graph this non-implementing service belongs to. +Formerly known as "service_id".""" graphID:String!"""Specifies which variant of a graph this implementing service belongs to". +Formerly known as "tag".""" graphVariant:String!}type NotFoundError implements Error{message:String!}"""Arbitrary JSON object""" scalar Object type OdysseyCertification{certificationId:String!earnedAt:Timestamp!id:ID!owner:OdysseyCertificationOwner}type OdysseyCertificationOwner{fullName:String!id:ID!}type OdysseyCourse{completedAt:Timestamp enrolledAt:Timestamp id:ID!}input OdysseyCourseInput{completedAt:Timestamp courseId:String!}type OdysseyTask{completedAt:Timestamp id:ID!value:String}input OdysseyTaskInput{completedAt:Timestamp taskId:String!value:String}type Operation{id:ID!name:String signature:String truncated:Boolean!}type OperationAcceptedChange{acceptedAt:Timestamp!acceptedBy:Identity!change:StoredApprovedChange!checkID:ID!graphID:ID!id:ID!operationID:String!}"""Columns of OperationCheckStats.""" enum OperationCheckStatsColumn{CACHED_REQUESTS_COUNT CLIENT_NAME CLIENT_VERSION QUERY_ID QUERY_NAME SCHEMA_TAG SERVICE_ID TIMESTAMP UNCACHED_REQUESTS_COUNT}type OperationCheckStatsDimensions{clientName:String clientVersion:String queryId:ID queryName:String schemaTag:String serviceId:ID}"""Filter for data in OperationCheckStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input OperationCheckStatsFilter{and:[OperationCheckStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String in:OperationCheckStatsFilterIn not:OperationCheckStatsFilter or:[OperationCheckStatsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in OperationCheckStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input OperationCheckStatsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type OperationCheckStatsMetrics{cachedRequestsCount:Long!uncachedRequestsCount:Long!}input OperationCheckStatsOrderBySpec{column:OperationCheckStatsColumn!direction:Ordering!}type OperationCheckStatsRecord{"""Dimensions of OperationCheckStats that can be grouped by.""" groupBy:OperationCheckStatsDimensions!"""Metrics of OperationCheckStats that can be aggregated over.""" metrics:OperationCheckStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type OperationCollection{createdAt:Timestamp!createdBy:Identity description:String """If a user has any of these roles, they will be able to edit this +collection. This will be null if and only if \`isShared\` is false""" editRoles:[UserPermission!]id:ID!isFavorite:Boolean!isSandbox:Boolean!isShared:Boolean!lastUpdatedAt:Timestamp!lastUpdatedBy:Identity name:String!operation(id:ID!):OperationCollectionEntryResult operations:[OperationCollectionEntry!]!""" Permissions the current user has for this collection""" permissions:OperationCollectionPermissions!variants:[GraphVariant!]!}type OperationCollectionEntry{collection:OperationCollection!createdAt:Timestamp!createdBy:Identity currentOperationRevision:OperationCollectionEntryState!id:ID!lastUpdatedAt:Timestamp!lastUpdatedBy:Identity name:String!orderingIndex:String!}type OperationCollectionEntryMutation{moveToCollection(collectionId:ID!lowerOrderingBound:String upperOrderingBound:String):MoveOperationCollectionEntryResult!reorderEntry(lowerOrderingBound:String upperOrderingBound:String):UpdateOperationCollectionResult updateName(name:String!):UpdateOperationCollectionEntryResult updateValues(operationInput:OperationCollectionEntryStateInput!):UpdateOperationCollectionEntryResult}union OperationCollectionEntryMutationResult=NotFoundError|OperationCollectionEntryMutation|PermissionError union OperationCollectionEntryResult=NotFoundError|OperationCollectionEntry type OperationCollectionEntryState{body:String!createdAt:Timestamp!createdBy:Identity headers:[OperationHeader!]variables:String}input OperationCollectionEntryStateInput{body:String!headers:[OperationHeaderInput!]""" I'm assuming this is non null""" variables:String}type OperationCollectionMutation{addOperation(name:String!operationInput:OperationCollectionEntryStateInput!):AddOperationCollectionEntryResult addToVariant(variantRef:ID!):AddOperationCollectionToVariantResult!@deprecated(reason:"Will throw NotImplemented")delete:DeleteOperationCollectionResult deleteOperation(id:ID!):RemoveOperationCollectionEntryResult duplicateCollection(description:String isSandbox:Boolean!isShared:Boolean!name:String!variantRef:ID):DuplicateOperationCollectionResult!operation(id:ID!):OperationCollectionEntryMutationResult removeFromVariant(variantRef:ID!):RemoveOperationCollectionFromVariantResult!@deprecated(reason:"Will throw NotImplemented")updateDescription(description:String):UpdateOperationCollectionResult updateEditRoles(editRoles:[UserPermission!]!):UpdateOperationCollectionResult updateIsFavorite(isFavorite:Boolean!):UpdateOperationCollectionResult updateIsShared(isShared:Boolean!):UpdateOperationCollectionResult updateName(name:String!):UpdateOperationCollectionResult}type OperationCollectionPermissions{canEditOperations:Boolean!canManage:Boolean!canReadOperations:Boolean!}union OperationCollectionResult=NotFoundError|OperationCollection|PermissionError type OperationDocument{"""Operation document body""" body:String!"""Operation name""" name:String}input OperationDocumentInput{"""Operation document body""" body:String!"""Operation name""" name:String}type OperationHeader{name:String!value:String!}input OperationHeaderInput{name:String!value:String!}"""Operation name filter configuration for a graph.""" type OperationNameFilter{"""name of the operation by the user and reported alongside metrics""" name:String!}"""Options to filter by operation name.""" input OperationNameFilterInput{"""name of the operation set by the user and reported alongside metrics""" name:String!}type OperationValidationError{message:String!}type OperationsCheckResult{"""Operations affected by all changes in diff""" affectedQueries:[AffectedQuery!]"""Summary/counts for all changes in diff""" changeSummary:ChangeSummary!"""List of schema changes with associated affected clients and operations""" changes:[Change!]!"""Indication of the success of the change, either failure, warning, or notice.""" checkSeverity:ChangeSeverity!"""The variant that was used as a base to check against""" checkedVariant:GraphVariant!createdAt:Timestamp!id:ID!"""Number of affected query operations that are neither marked as SAFE or IGNORED""" numberOfAffectedOperations:Int!"""Number of operations that were validated during schema diff""" numberOfCheckedOperations:Int!workflowTask:OperationsCheckTask!}type OperationsCheckTask implements CheckWorkflowTask{completedAt:Timestamp createdAt:Timestamp!id:ID!"""The result of the check.""" result:OperationsCheckResult status:CheckWorkflowTaskStatus!workflow:CheckWorkflow!}enum Ordering{ASCENDING DESCENDING}"""A reusable invite link for an organization.""" type OrganizationInviteLink{createdAt:Timestamp!"""A joinToken that can be passed to Mutation.joinAccount to join the organization.""" joinToken:String!"""The role that the user will receive if they join the organization with this link.""" role:UserPermission!}type OrganizationSSO{defaultRole:UserPermission!idpid:ID!provider:OrganizationSSOProvider!}enum OrganizationSSOProvider{PINGONE}"""PagerDuty notification channel""" type PagerDutyChannel implements Channel{id:ID!name:String!routingKey:String!subscriptions:[ChannelSubscription!]!}"""PagerDuty notification channel parameters""" input PagerDutyChannelInput{name:String routingKey:String!}"""Schema for a subgraph with associated metadata""" type PartialSchema{"""Timestamp for when the partial schema was created""" createdAt:Timestamp!"""If this sdl is currently actively composed in the gateway, this is true""" isLive:Boolean!"""The GraphQL document for a subgraph schema.""" sdl:String!"""The path of deep storage to find the raw enriched partial schema file""" sdlPath:String!}"""Input for registering a partial schema to an implementing service. +One of the fields must be specified (validated server-side). + +If a new partialSchemaSDL is passed in, this operation will store it before +creating the association. + +If both the sdl and hash are specified, an error will be thrown if the provided +hash doesn't match our hash of the sdl contents. If the sdl field is specified, +the hash does not need to be and will be computed server-side.""" input PartialSchemaInput{"""Hash of the partial schema to associate; error is thrown if only the hash is +specified and the hash has not been seen before""" hash:String """Contents of the partial schema in SDL syntax, but may reference types +that aren't defined in this document""" sdl:String}type PermissionError implements Error{message:String!}type PromoteSchemaError{code:PromoteSchemaErrorCode!message:String!}enum PromoteSchemaErrorCode{CANNOT_PROMOTE_SCHEMA_FOR_FEDERATED_GRAPH}type PromoteSchemaResponse{code:PromoteSchemaResponseCode!tag:SchemaTag!}enum PromoteSchemaResponseCode{NO_CHANGES_DETECTED PROMOTION_SUCCESS}union PromoteSchemaResponseOrError=PromoteSchemaError|PromoteSchemaResponse type Protobuf{json:String!object:Object!raw:Blob!text:String!}type Query{"""Account by ID""" account(id:ID!):Account """Retrieve account by billing provider identifier""" accountByBillingCode(id:ID!):Account """Whether an account ID is available for mutation{newAccount(id:)}""" accountIDAvailable(id:ID!):Boolean!"""All accounts""" allAccounts(search:String tier:BillingPlanTier):[Account!]"""All available plans""" allPlans:[BillingPlan!]!allPublicVariants:[GraphVariant!]"""All services""" allServices(search:String):[Service!]"""All timezones with their offsets from UTC""" allTimezoneOffsets:[TimezoneOffset!]!"""All users""" allUsers(search:String):[User!]"""Look up a plan by ID""" billingPlan(id:ID):BillingPlanV2 """All available plans""" billingPlans:[BillingPlanV2!]!"""If this is true, the user is an Apollo administrator who can ignore restrictions based purely on billing plan.""" canBypassPlanRestrictions:Boolean!diffSchemas(baseSchema:String!nextSchema:String!):[Change!]!"""Get the unsubscribe settings for a given email.""" emailPreferences(email:String!token:String!):EmailPreferences experimentalFeatures:GlobalExperimentalFeatures!"""Address of the Studio frontend.""" frontendUrlRoot:String!"""Access a graph by ID.""" graph(id:ID!):Service internalActiveCronJobs:[CronJob!]!internalAdminUsers:[InternalAdminUser!]internalUnresolvedCronExecutionFailures:[CronExecution!]!"""User or graph querying the API, null if not authenticated.""" me:Identity odysseyCertification(id:ID!):OdysseyCertification operationCollection(id:ID!):OperationCollectionResult!operationCollectionEntries(collectionEntryIds:[ID!]!):[OperationCollectionEntry!]!"""Access an organization by ID.""" organization(id:ID!):Account """Look up a plan by ID""" plan(id:ID):BillingPlan """A list of public variants that have been selected to be shown on our Graph Directory.""" publiclyListedVariants:[GraphVariant!]"""Service by ID""" service(id:ID!):Service """Query statistics across all services. For admins only; normal users must go through AccountsStatsWindow or ServiceStatsWindow.""" stats(from:Timestamp!"""Granularity of buckets. Defaults to the entire range (aggregate all data into a single durationBucket) when null.""" resolution:Resolution """Defaults to the current time when null.""" to:Timestamp):StatsWindow!"""Get the studio settings for the current user""" studioSettings:UserSettings """The plan started by AccountMutation.startTeamSubscription""" teamBillingPlan(billingPeriod:BillingPeriod!):BillingPlanV2!"""The plan started by AccountMutation.startTeamSubscription""" teamPlan(billingPeriod:BillingPeriod!):BillingPlan!"""Schema transformation for the Apollo platform API. Renames types. Internal to Apollo.""" transformSchemaForPlatformApi(baseSchema:GraphQLDocument!):GraphQLDocument """The plan started by AccountMutation.startTrial""" trialBillingPlan:BillingPlanV2!"""The plan started by AccountMutation.startTrial""" trialPlan:BillingPlan!"""User by ID""" user(id:ID!):User """Access a variant by reference of the form `graphID@variantName`, or `graphID` for the default `current` variant. +Returns null when the graph or variant do not exist, or when the graph cannot be accessed. +Note that we can return more types implementing Error in the future.""" variant(ref:ID!):GraphVariantLookup}"""query documents to validate against""" input QueryDocumentInput{document:String}type QueryPlan{json:String!object:Object!text:String!}"""Columns of QueryStats.""" enum QueryStatsColumn{ACCOUNT_ID CACHED_HISTOGRAM CACHED_REQUESTS_COUNT CACHE_TTL_HISTOGRAM CLIENT_NAME CLIENT_VERSION FORBIDDEN_OPERATION_COUNT FROM_ENGINEPROXY QUERY_ID QUERY_NAME REGISTERED_OPERATION_COUNT REQUESTS_WITH_ERRORS_COUNT SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP UNCACHED_HISTOGRAM UNCACHED_REQUESTS_COUNT}type QueryStatsDimensions{accountId:ID clientName:String clientVersion:String fromEngineproxy:String queryId:ID queryName:String querySignature:String schemaHash:String schemaTag:String serviceId:ID}"""Filter for data in QueryStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input QueryStatsFilter{"""Selects rows whose accountId dimension equals the given value if not null. To query for the null value, use {in: {accountId: [null]}} instead.""" accountId:ID and:[QueryStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fromEngineproxy dimension equals the given value if not null. To query for the null value, use {in: {fromEngineproxy: [null]}} instead.""" fromEngineproxy:String in:QueryStatsFilterIn not:QueryStatsFilter or:[QueryStatsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID}"""Filter for data in QueryStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input QueryStatsFilterIn{"""Selects rows whose accountId dimension is in the given list. A null value in the list means a row with null for that dimension.""" accountId:[ID]"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fromEngineproxy dimension is in the given list. A null value in the list means a row with null for that dimension.""" fromEngineproxy:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]}type QueryStatsMetrics{cacheTtlHistogram:DurationHistogram!cachedHistogram:DurationHistogram!cachedRequestsCount:Long!forbiddenOperationCount:Long!registeredOperationCount:Long!requestsWithErrorsCount:Long!totalLatencyHistogram:DurationHistogram!totalRequestCount:Long!uncachedHistogram:DurationHistogram!uncachedRequestsCount:Long!}input QueryStatsOrderBySpec{column:QueryStatsColumn!direction:Ordering!}type QueryStatsRecord{"""Dimensions of QueryStats that can be grouped by.""" groupBy:QueryStatsDimensions!"""Metrics of QueryStats that can be aggregated over.""" metrics:QueryStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Query Trigger""" type QueryTrigger implements ChannelSubscription{channels:[Channel!]!comparisonOperator:ComparisonOperator!enabled:Boolean!excludedOperationNames:[String!]!id:ID!metric:QueryTriggerMetric!operationNames:[String!]!percentile:Float scope:QueryTriggerScope!serviceId:String!state:QueryTriggerState!threshold:Float!variant:String window:QueryTriggerWindow!}"""Query trigger""" input QueryTriggerInput{channelIds:[String!]comparisonOperator:ComparisonOperator!enabled:Boolean excludedOperationNames:[String!]metric:QueryTriggerMetric!operationNames:[String!]percentile:Float scope:QueryTriggerScope threshold:Float!variant:String window:QueryTriggerWindow!}enum QueryTriggerMetric{"""Number of requests within the window that resulted in an error. Ignores `percentile`.""" ERROR_COUNT """Number of error requests divided by total number of requests. Ignores `percentile`.""" ERROR_PERCENTAGE """Number of requests within the window. Ignores `percentile`.""" REQUEST_COUNT """Request latency in ms. Requires `percentile`.""" REQUEST_SERVICE_TIME}enum QueryTriggerScope{ALL ANY UNRECOGNIZED}"""Query trigger state""" type QueryTriggerState{evaluatedAt:Timestamp!lastTriggeredAt:Timestamp operations:[QueryTriggerStateOperation!]!triggered:Boolean!}type QueryTriggerStateOperation{count:Long!operation:String!triggered:Boolean!value:Float!}enum QueryTriggerWindow{FIFTEEN_MINUTES FIVE_MINUTES ONE_MINUTE UNRECOGNIZED}"""The documentation for a graph variant, as display in Studio.""" type Readme{"""Content of the document.""" content:String!id:ID!"""Last time the document was updated.""" lastUpdatedAt:Timestamp!"""Identity of who updated the document last.""" lastUpdatedBy:Identity}type RegisterOperationsMutationResponse{invalidOperations:[InvalidOperation!]newOperations:[RegisteredOperation!]registrationSuccess:Boolean!}input RegisteredClientIdentityInput{identifier:String!name:String!version:String}type RegisteredOperation{signature:ID!}input RegisteredOperationInput{document:String metadata:RegisteredOperationMetadataInput signature:ID!}input RegisteredOperationMetadataInput{"""This will be used to link existing records in Engine to a new ID.""" engineSignature:String}type RegistryApiKey{keyName:String token:String!}type RegistryStatsWindow{schemaCheckStats:[AccountChecksStatsRecord!]!schemaPublishStats:[AccountPublishesStatsRecord!]!}type RegistrySubscription implements ChannelSubscription{channel:Channel channels:[Channel!]!@deprecated(reason:"Use channels list instead")createdAt:Timestamp!enabled:Boolean!id:ID!lastUpdatedAt:Timestamp!options:SubscriptionOptions!variant:String}type RelaunchComplete{latestLaunch:Launch!updated:Boolean!}type RelaunchError{message:String!}union RelaunchResult=RelaunchComplete|RelaunchError union RemoveOperationCollectionEntryResult=OperationCollection|PermissionError union RemoveOperationCollectionFromVariantResult=GraphVariant|NotFoundError|PermissionError|ValidationError union ReorderOperationCollectionResult=OperationCollection|PermissionError type ReportSchemaError implements ReportSchemaResult{code:ReportSchemaErrorCode!inSeconds:Int!message:String!withCoreSchema:Boolean!}enum ReportSchemaErrorCode{BOOT_ID_IS_NOT_VALID_UUID BOOT_ID_IS_REQUIRED CORE_SCHEMA_HASH_IS_NOT_SCHEMA_SHA256 CORE_SCHEMA_HASH_IS_REQUIRED CORE_SCHEMA_HASH_IS_TOO_LONG EXECUTABLE_SCHEMA_ID_IS_NOT_SCHEMA_SHA256 EXECUTABLE_SCHEMA_ID_IS_REQUIRED EXECUTABLE_SCHEMA_ID_IS_TOO_LONG GRAPH_REF_INVALID_FORMAT GRAPH_REF_IS_REQUIRED GRAPH_VARIANT_DOES_NOT_MATCH_REGEX GRAPH_VARIANT_IS_REQUIRED LIBRARY_VERSION_IS_TOO_LONG PLATFORM_IS_TOO_LONG RUNTIME_VERSION_IS_TOO_LONG SCHEMA_IS_NOT_PARSABLE SCHEMA_IS_NOT_VALID SERVER_ID_IS_TOO_LONG USER_VERSION_IS_TOO_LONG}type ReportSchemaResponse implements ReportSchemaResult{inSeconds:Int!withCoreSchema:Boolean!}interface ReportSchemaResult{inSeconds:Int!withCoreSchema:Boolean!}type ReportServerInfoError implements ReportServerInfoResult{code:ReportSchemaErrorCode!inSeconds:Int!message:String!withExecutableSchema:Boolean!}type ReportServerInfoResponse implements ReportServerInfoResult{inSeconds:Int!withExecutableSchema:Boolean!}interface ReportServerInfoResult{inSeconds:Int!withExecutableSchema:Boolean!}enum Resolution{R1D R1H R1M R5M R6H R15M}enum ResponseHints{NONE SAMPLE_RESPONSES SUBGRAPHS TIMINGS TRACE_TIMINGS}type RoleOverride{graph:Service!lastUpdatedAt:Timestamp!role:UserPermission!user:User!}input RoverArgumentInput{key:String!value:Object}"""SHA-256 hash, represented in lowercase hexadecimal""" scalar SHA256 type ScheduledSummary implements ChannelSubscription{channel:Channel@deprecated(reason:"Use channels list instead")channels:[Channel!]!enabled:Boolean!id:ID!timezone:String!variant:String!}"""A GraphQL schema document, which may optionally map back to context with which the schema was ingested.""" type Schema{createTemporaryURL(expiresInSeconds:Int!=86400):TemporaryURL """The timestamp of initial ingestion of a schema to a graph.""" createdAt:Timestamp!"""The raw GraphQL document for the schema in question""" document:GraphQLDocument!"""The number of fields; this includes user defined fields only, excluding built-in types and fields""" fieldCount:Int!gitContext:GitContext """The hex representation of the SHA256 of the GraphQL document.""" hash:ID!introspection:IntrospectionSchema!"""The number of types; this includes user defined types only, excluding built-in types""" typeCount:Int!}"""Represents an error from running schema composition on a list of subgraph definitions.""" type SchemaCompositionError{"""A machine-readable error code.""" code:String """Affected locations.""" locations:[SourceLocation]!"""A human-readable locations.""" message:String!}"""The difference between two schemas, as usually computed during a schema check.""" type SchemaDiff{"""Clients affected by all changes in the diff.""" affectedClients:[AffectedClient!]@deprecated(reason:"Unsupported.")"""Operations affected by all changes in the diff.""" affectedQueries:[AffectedQuery!]"""Numeric summary of all changes in the diff.""" changeSummary:ChangeSummary!"""List of schema changes with associated affected clients and operations.""" changes:[Change!]!"""Number of affected query operations that are neither marked as safe or ignored.""" numberOfAffectedOperations:Int!"""Number of operations that were validated during the check.""" numberOfCheckedOperations:Int """Indication of the success of the change; either failure, warning, or notice.""" severity:ChangeSeverity!"""The tag against which this diff was created""" tag:String type:ChangeType!@deprecated(reason:"use severity instead")"""Configuration of validation""" validationConfig:SchemaDiffValidationConfig}type SchemaDiffValidationConfig{"""Clients to ignore during validation.""" excludedClients:[ClientInfoFilterOutput!]"""Operation names to ignore during validation.""" excludedOperationNames:[OperationNameFilter]"""delta in seconds from current time that determines the start of the window +for reported metrics included in a schema diff. A day window from the present +day would have a `from` value of -86400. In rare cases, this could be an ISO +timestamp if the user passed one in on diff creation""" from:Timestamp """Operation IDs to ignore during validation.""" ignoredOperations:[ID!]"""Variants to include during validation.""" includedVariants:[String!]"""Minimum number of requests within the window for a query to be considered.""" queryCountThreshold:Int """Number of requests within the window for a query to be considered, relative to +total request count. Expected values are between 0 and 0.05 (minimum 5% of +total request volume)""" queryCountThresholdPercentage:Float """delta in seconds from current time that determines the end of the +window for reported metrics included in a schema diff. A day window +from the present day would have a `to` value of -0. In rare +cases, this could be an ISO timestamp if the user passed one in on diff +creation""" to:Timestamp}type SchemaPublishSubscription implements ChannelSubscription{channels:[Channel!]!createdAt:Timestamp!enabled:Boolean!id:ID!lastUpdatedAt:Timestamp!variant:String}input SchemaReport{"""A randomly generated UUID, immutable for the lifetime of the edge server runtime.""" bootId:String!"""The hex SHA256 hash of the schema being reported. Note that for a GraphQL server with a core schema, this should be the core schema, not the API schema.""" coreSchemaHash:String!"""The graph ref (eg, 'id@variant')""" graphRef:String!"""The version of the edge server reporting agent, e.g. apollo-server-2.8, graphql-java-3.1, etc. length must be <= 256 characters.""" libraryVersion:String """The infra environment in which this edge server is running, e.g. localhost, Kubernetes, AWS Lambda, Google CloudRun, AWS ECS, etc. length must be <= 256 characters.""" platform:String """The runtime in which the edge server is running, e.g. node 12.03, zulu8.46.0.19-ca-jdk8.0.252-macosx_x64, etc. length must be <= 256 characters.""" runtimeVersion:String """If available, an identifier for the edge server instance, such that when restarting this instance it will have the same serverId, with a different bootId. For example, in Kubernetes this might be the pod name. Length must be <= 256 characters.""" serverId:String """An identifier used to distinguish the version (from the user's perspective) of the edge server's code itself. For instance, the git sha of the server's repository or the docker sha of the associated image this server runs with. Length must be <= 256 characters.""" userVersion:String}"""A specific publication of a graph variant.""" type SchemaTag{"""The result of composition, including either a supergraph schema or errors, +executed during this publication. Only available with managed federation.""" compositionResult:CompositionResult createdAt:Timestamp!"""Differences with the schema from the previous successful publication.""" diffToPrevious:SchemaDiff gitContext:GitContext """List of previously uploaded SchemaTags under the same tag name, starting with +the selected published schema record. Sorted in reverse chronological order +by creation date (newest publish first). + +Note: This does not include the history of checked schemas""" history(includeUnchanged:Boolean!=true limit:Int!=3 offset:Int=0):[SchemaTag!]!"""Number of tagged schemas created under the same tag name. +Also represents the maximum size of the history's limit argument.""" historyLength:Int!"""Number of schemas tagged prior to this one under the same tag name, its position +in the tag history.""" historyOrder:Int!"""The identifier for this specific publication.""" id:ID!"""Time of publication.""" publishedAt:Timestamp!"""The Identity that published this schema and their client info, or null if this isn't +a publish. Sub-fields may be null if they weren't recorded.""" publishedBy:IdentityAndClientInfo """Indicates the schemaTag of the schema's original upload, null if this is the +first upload of the schema.""" reversionFrom:SchemaTag """The published schema.""" schema:Schema!slackNotificationBody(graphDisplayName:String!):String tag:String!@deprecated(reason:"Please use variant { name } instead")"""The graph variant this belongs to.""" variant:GraphVariant!webhookNotificationBody:String!}"""How many seats of the given types does an organization have (regardless of plan type)?""" type Seats{"""How many members that are free in this organization.""" free:Int!"""How many members that are not free in this organization.""" fullPrice:Int!}type SemanticChange{"""Target arg of change made.""" argNode:NamedIntrospectionArg """Node related to the top level node that was changed, such as a field in an object, +a value in an enum or the object of an interface""" childNode:NamedIntrospectionValue """Semantic metadata about the type of change""" definition:ChangeDefinition!"""Top level node affected by the change""" parentNode:NamedIntrospectionType}"""A graph in Apollo Studio represents a graph in your organization. +Each graph has one or more variants, which correspond to the different environments where that graph runs (such as staging and production). +Each variant has its own GraphQL schema, which means schemas can differ between environments.""" type Service implements Identity{"""Organization that this graph belongs to.""" account:Account accountId:ID apiKeys:[GraphApiKey!]"""A view of the identity as an Actor type.""" asActor:Actor!"""Get an URL to which an avatar image can be uploaded. Client uploads by sending a PUT request +with the image data to MediaUploadInfo.url. Client SHOULD set the "Content-Type" header to the +browser-inferred MIME type, and SHOULD set the "x-apollo-content-filename" header to the +filename, if such information is available. Client MUST set the "x-apollo-csrf-token" header to +MediaUploadInfo.csrfToken.""" avatarUpload:AvatarUploadResult """Get an image URL for the service's avatar. Note that CORS is not enabled for these URLs. The size +argument is used for bandwidth reduction, and should be the size of the image as displayed in the +application. Apollo's media server will downscale larger images to at least the requested size, +but this will not happen for third-party media servers.""" avatarUrl(size:Int!=40):String """Get available notification endpoints""" channels(channelIds:[ID!]):[Channel!]"""Get check configuration for this graph.""" checkConfiguration:CheckConfiguration """Get a check workflow for this graph by its ID""" checkWorkflow(id:ID!):CheckWorkflow """Get check workflows for this graph ordered by creation time, most recent first.""" checkWorkflows(filter:CheckFilterInput limit:Int!=100):[CheckWorkflow!]!"""List of options available for filtering checks for this graph by author. +If a filter is passed, constrains results to match the filter.""" checksAuthorOptions(filter:CheckFilterInput):[String!]!"""List of options available for filtering checks for this graph by branch. +If a filter is passed, constrains results to match the filter.""" checksBranchOptions(filter:CheckFilterInput):[String!]!"""List of options available for filtering checks for this graph by subgraph name. +If a filter is passed, constrains results to match the filter.""" checksSubgraphOptions(filter:CheckFilterInput):[String!]!"""Given a graphCompositionID, return the results of composition. This can represent either a validation or a publish.""" compositionResultById(id:ID!):CompositionResult createdAt:Timestamp!createdBy:Identity datadogMetricsConfig:DatadogMetricsConfig deletedAt:Timestamp description:String devGraphOwner:User """Get a GraphQL document by hash""" document(hash:SHA256):GraphQLDocument """When this is true, this graph will be hidden from non-admin members of the org who haven't been explicitly assigned a +role on this graph.""" hiddenFromUninvitedNonAdminAccountMembers:Boolean!"""Globally unique identifier for this graph.""" id:ID!"""List of subgraphs that comprise a graph. A non-federated graph should have a single implementing service. +Set includeDeleted to see deleted subgraphs.""" implementingServices(graphVariant:String!includeDeleted:Boolean):GraphImplementors lastReportedAt(graphVariant:String):Timestamp """Current identity, null if not authenticated.""" me:Identity """The composition result that was most recently published to a graph variant.""" mostRecentCompositionPublish(graphVariant:String!):CompositionPublishResult """Permissions of the current user in this graph.""" myRole:UserPermission """Name of this graph. Note that this field is deprecated.""" name:String!@deprecated(reason:"Use Service.title")operation(id:ID!):Operation """Gets the operations and their approved changes for this graph, checkID, and operationID.""" operationsAcceptedChanges(checkID:ID!operationID:String!):[OperationAcceptedChange!]!"""Get an operations check result for a specific check ID""" operationsCheck(checkID:ID!):OperationsCheckResult """Get query triggers for a given variant. If variant is null all the triggers for this service will be gotten.""" queryTriggers(graphVariant:String operationNames:[String!]):[QueryTrigger!]readme:Readme """Registry specific stats for this graph.""" registryStatsWindow(from:Timestamp!resolution:Resolution to:Timestamp):RegistryStatsWindow """Whether registry subscriptions (with any options) are enabled. If variant is not passed, returns true if configuration is present for any variant""" registrySubscriptionsEnabled(graphVariant:String):Boolean!@deprecated(reason:"This field will be removed")reportingEnabled:Boolean!"""The list of members that can access this graph, accounting for graph role overrides""" roleOverrides:[RoleOverride!]"""Which permissions the current user has for interacting with this graph""" roles:ServiceRoles scheduledSummaries:[ScheduledSummary!]!"""Get a schema by hash or current tag""" schema(hash:ID tag:String):Schema """The current publish associated to a given variant (with 'tag' as the variant name).""" schemaTag(tag:String!):SchemaTag schemaTagById(id:ID!):SchemaTag """Get schema tags, with optional filtering to a set of tags. Always sorted by creation +date in reverse chronological order.""" schemaTags(tags:[String!]):[SchemaTag!]stats(from:Timestamp!"""Granularity of buckets. Defaults to the entire range (aggregate all data into a single durationBucket) when null.""" resolution:Resolution """Defaults to the current time when null.""" to:Timestamp):ServiceStatsWindow!@deprecated(reason:"use Service.statsWindow instead")statsWindow(from:Timestamp!"""Granularity of buckets. Defaults to the entire range (aggregate all data into a single durationBucket) when null.""" resolution:Resolution """Defaults to the current time when null.""" to:Timestamp):ServiceStatsWindow """Generate a test schema publish notification body""" testSchemaPublishBody(variant:String!):String!"""Name of this graph.""" title:String!trace(id:ID!):Trace traceStorageEnabled:Boolean!"""A particular variant often representing a live traffic environment (such as "dev", "staging", or "prod"). +Each variant can represent a specific URL or destination to query at, analytics, and its own schema history. +Pass in a name to get a specific variant. Use `Graph.variants` to get a list of variants.""" variant(name:String!):GraphVariant """The list of variants that exist for this graph""" variants:[GraphVariant!]!}"""Columns of ServiceBillingUsageStats.""" enum ServiceBillingUsageStatsColumn{OPERATION_COUNT OPERATION_COUNT_PROVIDED_EXPLICITLY SCHEMA_TAG TIMESTAMP}type ServiceBillingUsageStatsDimensions{operationCountProvidedExplicitly:String schemaTag:String}"""Filter for data in ServiceBillingUsageStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceBillingUsageStatsFilter{and:[ServiceBillingUsageStatsFilter!]in:ServiceBillingUsageStatsFilterIn not:ServiceBillingUsageStatsFilter """Selects rows whose operationCountProvidedExplicitly dimension equals the given value if not null. To query for the null value, use {in: {operationCountProvidedExplicitly: [null]}} instead.""" operationCountProvidedExplicitly:String or:[ServiceBillingUsageStatsFilter!]"""Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String}"""Filter for data in ServiceBillingUsageStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceBillingUsageStatsFilterIn{"""Selects rows whose operationCountProvidedExplicitly dimension is in the given list. A null value in the list means a row with null for that dimension.""" operationCountProvidedExplicitly:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]}type ServiceBillingUsageStatsMetrics{operationCount:Long!}input ServiceBillingUsageStatsOrderBySpec{column:ServiceBillingUsageStatsColumn!direction:Ordering!}type ServiceBillingUsageStatsRecord{"""Dimensions of ServiceBillingUsageStats that can be grouped by.""" groupBy:ServiceBillingUsageStatsDimensions!"""Metrics of ServiceBillingUsageStats that can be aggregated over.""" metrics:ServiceBillingUsageStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of ServiceEdgeServerInfos.""" enum ServiceEdgeServerInfosColumn{BOOT_ID EXECUTABLE_SCHEMA_ID LIBRARY_VERSION PLATFORM RUNTIME_VERSION SCHEMA_TAG SERVER_ID TIMESTAMP USER_VERSION}type ServiceEdgeServerInfosDimensions{bootId:ID executableSchemaId:ID libraryVersion:String platform:String runtimeVersion:String schemaTag:String serverId:ID userVersion:String}"""Filter for data in ServiceEdgeServerInfos. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceEdgeServerInfosFilter{and:[ServiceEdgeServerInfosFilter!]"""Selects rows whose bootId dimension equals the given value if not null. To query for the null value, use {in: {bootId: [null]}} instead.""" bootId:ID """Selects rows whose executableSchemaId dimension equals the given value if not null. To query for the null value, use {in: {executableSchemaId: [null]}} instead.""" executableSchemaId:ID in:ServiceEdgeServerInfosFilterIn """Selects rows whose libraryVersion dimension equals the given value if not null. To query for the null value, use {in: {libraryVersion: [null]}} instead.""" libraryVersion:String not:ServiceEdgeServerInfosFilter or:[ServiceEdgeServerInfosFilter!]"""Selects rows whose platform dimension equals the given value if not null. To query for the null value, use {in: {platform: [null]}} instead.""" platform:String """Selects rows whose runtimeVersion dimension equals the given value if not null. To query for the null value, use {in: {runtimeVersion: [null]}} instead.""" runtimeVersion:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serverId dimension equals the given value if not null. To query for the null value, use {in: {serverId: [null]}} instead.""" serverId:ID """Selects rows whose userVersion dimension equals the given value if not null. To query for the null value, use {in: {userVersion: [null]}} instead.""" userVersion:String}"""Filter for data in ServiceEdgeServerInfos. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceEdgeServerInfosFilterIn{"""Selects rows whose bootId dimension is in the given list. A null value in the list means a row with null for that dimension.""" bootId:[ID]"""Selects rows whose executableSchemaId dimension is in the given list. A null value in the list means a row with null for that dimension.""" executableSchemaId:[ID]"""Selects rows whose libraryVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" libraryVersion:[String]"""Selects rows whose platform dimension is in the given list. A null value in the list means a row with null for that dimension.""" platform:[String]"""Selects rows whose runtimeVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" runtimeVersion:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serverId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serverId:[ID]"""Selects rows whose userVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" userVersion:[String]}input ServiceEdgeServerInfosOrderBySpec{column:ServiceEdgeServerInfosColumn!direction:Ordering!}type ServiceEdgeServerInfosRecord{"""Dimensions of ServiceEdgeServerInfos that can be grouped by.""" groupBy:ServiceEdgeServerInfosDimensions!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of ServiceErrorStats.""" enum ServiceErrorStatsColumn{CLIENT_NAME CLIENT_VERSION ERRORS_COUNT PATH QUERY_ID QUERY_NAME REQUESTS_WITH_ERRORS_COUNT SCHEMA_HASH SCHEMA_TAG TIMESTAMP}type ServiceErrorStatsDimensions{clientName:String clientVersion:String path:String queryId:ID queryName:String schemaHash:String schemaTag:String}"""Filter for data in ServiceErrorStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceErrorStatsFilter{and:[ServiceErrorStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String in:ServiceErrorStatsFilterIn not:ServiceErrorStatsFilter or:[ServiceErrorStatsFilter!]"""Selects rows whose path dimension equals the given value if not null. To query for the null value, use {in: {path: [null]}} instead.""" path:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String}"""Filter for data in ServiceErrorStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceErrorStatsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose path dimension is in the given list. A null value in the list means a row with null for that dimension.""" path:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]}type ServiceErrorStatsMetrics{errorsCount:Long!requestsWithErrorsCount:Long!}input ServiceErrorStatsOrderBySpec{column:ServiceErrorStatsColumn!direction:Ordering!}type ServiceErrorStatsRecord{"""Dimensions of ServiceErrorStats that can be grouped by.""" groupBy:ServiceErrorStatsDimensions!"""Metrics of ServiceErrorStats that can be aggregated over.""" metrics:ServiceErrorStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of ServiceFieldLatencies.""" enum ServiceFieldLatenciesColumn{FIELD_HISTOGRAM FIELD_NAME PARENT_TYPE SCHEMA_HASH SCHEMA_TAG TIMESTAMP}type ServiceFieldLatenciesDimensions{field:String fieldName:String parentType:String schemaHash:String schemaTag:String}"""Filter for data in ServiceFieldLatencies. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceFieldLatenciesFilter{and:[ServiceFieldLatenciesFilter!]"""Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:ServiceFieldLatenciesFilterIn not:ServiceFieldLatenciesFilter or:[ServiceFieldLatenciesFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String}"""Filter for data in ServiceFieldLatencies. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceFieldLatenciesFilterIn{"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]}type ServiceFieldLatenciesMetrics{fieldHistogram:DurationHistogram!}input ServiceFieldLatenciesOrderBySpec{column:ServiceFieldLatenciesColumn!direction:Ordering!}type ServiceFieldLatenciesRecord{"""Dimensions of ServiceFieldLatencies that can be grouped by.""" groupBy:ServiceFieldLatenciesDimensions!"""Metrics of ServiceFieldLatencies that can be aggregated over.""" metrics:ServiceFieldLatenciesMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of ServiceFieldUsage.""" enum ServiceFieldUsageColumn{CLIENT_NAME CLIENT_VERSION ESTIMATED_EXECUTION_COUNT EXECUTION_COUNT FIELD_NAME PARENT_TYPE QUERY_ID QUERY_NAME REFERENCING_OPERATION_COUNT SCHEMA_HASH SCHEMA_TAG TIMESTAMP}type ServiceFieldUsageDimensions{clientName:String clientVersion:String fieldName:String parentType:String queryId:ID queryName:String schemaHash:String schemaTag:String}"""Filter for data in ServiceFieldUsage. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceFieldUsageFilter{and:[ServiceFieldUsageFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fieldName dimension equals the given value if not null. To query for the null value, use {in: {fieldName: [null]}} instead.""" fieldName:String in:ServiceFieldUsageFilterIn not:ServiceFieldUsageFilter or:[ServiceFieldUsageFilter!]"""Selects rows whose parentType dimension equals the given value if not null. To query for the null value, use {in: {parentType: [null]}} instead.""" parentType:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String}"""Filter for data in ServiceFieldUsage. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceFieldUsageFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fieldName dimension is in the given list. A null value in the list means a row with null for that dimension.""" fieldName:[String]"""Selects rows whose parentType dimension is in the given list. A null value in the list means a row with null for that dimension.""" parentType:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]}type ServiceFieldUsageMetrics{estimatedExecutionCount:Long!executionCount:Long!referencingOperationCount:Long!}input ServiceFieldUsageOrderBySpec{column:ServiceFieldUsageColumn!direction:Ordering!}type ServiceFieldUsageRecord{"""Dimensions of ServiceFieldUsage that can be grouped by.""" groupBy:ServiceFieldUsageDimensions!"""Metrics of ServiceFieldUsage that can be aggregated over.""" metrics:ServiceFieldUsageMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Mutations to a graph.""" type ServiceMutation{"""Check a proposed subgraph schema change. +If the proposal composes successfully, perform a usage check for the resulting schema.""" checkPartialSchema("""Deprecated and ignored.""" frontend:String gitContext:GitContextInput """Specifies which variant of a graph this mutation operates on.""" graphVariant:String!historicParameters:HistoricQueryParameters """Name of the implementing service to validate the partial schema against""" implementingServiceName:String!"""If this check is triggered for an sdl fetched using introspection, this is the endpoint where that schema was being served.""" introspectionEndpoint:String isSandboxCheck:Boolean!=false """The partial schema to validate against an implementing service""" partialSchema:PartialSchemaInput!"""Whether to use the maximum retention for historical validation. This only takes +effect if historicParameters is null.""" useMaximumRetention:Boolean):CheckPartialSchemaResult!"""Checks a proposed schema against the schema that has been published to +a particular variant, using metrics corresponding to `historicParameters`. +Callers can set `historicParameters` directly or rely on defaults set in the +graph's check configuration (7 days by default). +If they do not set `historicParameters` but set `useMaximumRetention`, +validation will use the maximum retention the graph has access to.""" checkSchema(baseSchemaTag:String="current" """Deprecated and ignored.""" frontend:String gitContext:GitContextInput historicParameters:HistoricQueryParameters """If this check is triggered for an sdl fetched using introspection, this is the endpoint where that schema was being served.""" introspectionEndpoint:String isSandboxCheck:Boolean!=false """Only one of proposedSchema, proposedSchemaDocument, and proposedSchemaHash +may be specified""" proposedSchema:IntrospectionSchemaInput proposedSchemaDocument:String proposedSchemaHash:String useMaximumRetention:Boolean):CheckSchemaResult!"""Make changes to a check workflow.""" checkWorkflow(id:ID!):CheckWorkflowMutation createCompositionStatusSubscription("""ID of Slack channel for registry notification.""" channelID:ID!"""Variant to notify on.""" variant:String!):SchemaPublishSubscription!createSchemaPublishSubscription("""ID of Slack channel for registry notification.""" channelID:ID!"""Variant to notify on.""" variant:String!):SchemaPublishSubscription!"""Soft delete a graph. Data associated with the graph is not permanently deleted; Apollo support can undo.""" delete:Void """Delete the service's avatar. Requires Service.roles.canUpdateAvatar to be true.""" deleteAvatar:AvatarDeleteError """Delete an existing channel""" deleteChannel(id:ID!):Boolean!"""Delete an existing query trigger""" deleteQueryTrigger(id:ID!):Boolean!"""Deletes this service's current subscriptions specific to the ID, returns true if it existed""" deleteRegistrySubscription(id:ID!):Boolean!"""Deletes this service's current registry subscription(s) specific to its graph variant, +returns a list of subscription IDs that were deleted.""" deleteRegistrySubscriptions(variant:String!):[ID!]!deleteScheduledSummary(id:ID!):Boolean!"""Delete a variant by name.""" deleteSchemaTag(tag:String!):DeleteSchemaTagResult!"""Given a UTC timestamp, delete all traces associated with this Service, on that corresponding day. If a timestamp to is provided, deletes all days inclusive.""" deleteTraces(from:Timestamp!to:Timestamp):Void disableDatadogForwardingLegacyMetricNames:Service """Hard delete a graph and all data associated with it. Its ID cannot be reused.""" hardDelete:Void id:ID!@deprecated(reason:"Use service.id")"""Ignore an operation in future checks; +changes affecting it will be tracked, +but won't affect the outcome of the check. +Returns true if the operation is newly ignored, +false if it already was.""" ignoreOperationsInChecks(ids:[ID!]!):IgnoreOperationsInChecksResult """Mark the changeset that affects an operation in a given check instance as safe. +Note that only operations marked as behavior changes are allowed to be marked as safe.""" markChangesForOperationAsSafe("""ID of the schema check.""" checkID:ID!"""ID of the operation to accept changes for.""" operationID:ID!):MarkChangesForOperationAsSafeResult!newKey(keyName:String role:UserPermission!=GRAPH_ADMIN):GraphApiKey!"""Adds an override to the given users permission for this graph""" overrideUserPermission(permission:UserPermission userID:ID!):Service """Returns a preview of the Core and API schema contracts derived from a source variant and a set of filter configurations""" previewContractVariant(filterConfig:FilterConfigInput!sourceVariant:String!):ContractVariantPreviewResult!@deprecated(reason:"use GraphVariant.contractPreview instead")"""Promote the schema with the given SHA-256 hash to active for the given variant/tag.""" promoteSchema(graphVariant:String!historicParameters:HistoricQueryParameters overrideComposedSchema:Boolean!=false sha256:SHA256!):PromoteSchemaResponseOrError!"""Publish to a subgraph. If composition is successful, this will update running routers.""" publishSubgraph(activePartialSchema:PartialSchemaInput!gitContext:GitContextInput graphVariant:String!name:String!revision:String!url:String):CompositionAndUpsertResult registerOperationsWithResponse(clientIdentity:RegisteredClientIdentityInput gitContext:GitContextInput """Specifies which variant of a graph these operations belong to. +Formerly known as "tag" +Defaults to "current" +""" graphVariant:String!="current" manifestVersion:Int operations:[RegisteredOperationInput!]!):RegisterOperationsMutationResponse """Removes a subgraph. If composition is successful, this will update running routers.""" removeImplementingServiceAndTriggerComposition("""Do not remove the service, but recompose without it and report any errors.""" dryRun:Boolean!=false graphVariant:String!name:String!):CompositionAndRemoveResult!removeKey("""API key ID""" id:ID):Void renameKey(id:ID!newKeyName:String):GraphApiKey reportServerInfo("""Only sent if previously requested i.e. received ReportServerInfoResult with withExecutableSchema = true. An executable schema is a schema document that describes the full GraphQL schema that an external client could execute queries against. This must be a valid GraphQL schema document, as per the GraphQL specification: https://spec.graphql.org/""" executableSchema:String """Information about the edge server, see descriptions for individual fields.""" info:EdgeServerInfo!):ReportServerInfoResult@deprecated(reason:"use Mutation.reportSchema instead")service:Service!"""Store a given schema document. This schema will be attached to the graph but +not be associated with any variant. On success, returns the schema hash.""" storeSchemaDocument(schemaDocument:String!):StoreSchemaResponseOrError!"""Test Slack notification channel""" testSlackChannel(id:ID!notification:SlackNotificationInput!):Void testSubscriptionForChannel(channelID:ID!subscriptionID:ID!):String!transfer(to:String!):Service triggerRepublish(graphVariant:String!):Void undelete:Service """Revert the effects of ignoreOperation. +Returns true if the operation is no longer ignored, +false if it wasn't.""" unignoreOperationsInChecks(ids:[ID!]!):UnignoreOperationsInChecksResult """Unmark changes for an operation as safe.""" unmarkChangesForOperationAsSafe("""ID of the schema check.""" checkID:ID!"""ID of the operation to unmark changes for.""" operationID:ID!):MarkChangesForOperationAsSafeResult!"""Update schema check configuration for a graph.""" updateCheckConfiguration("""Clients to ignore during validation.""" excludedClients:[ClientFilterInput!]"""Operation names to ignore during validation.""" excludedOperationNames:[OperationNameFilterInput!]"""Operations to ignore during validation.""" excludedOperations:[ExcludedOperationInput!]"""Default configuration to include operations on the base variant.""" includeBaseVariant:Boolean """Variant overrides for validation.""" includedVariants:[String!]"""Minimum number of requests within the window for a query to be considered.""" operationCountThreshold:Int """Number of requests within the window for a query to be considered, relative to +total request count. Expected values are between 0 and 0.05 (minimum 5% of +total request volume)""" operationCountThresholdPercentage:Float """Only check operations from the last seconds. The default is 7 days (604,800 seconds).""" timeRangeSeconds:Long):CheckConfiguration!updateDatadogMetricsConfig(apiKey:String apiRegion:DatadogApiRegion enabled:Boolean):DatadogMetricsConfig updateDescription(description:String!):Service """Update hiddenFromUninvitedNonAdminAccountMembers""" updateHiddenFromUninvitedNonAdminAccountMembers(hiddenFromUninvitedNonAdminAccountMembers:Boolean!):Service updateReadme(readme:String!):Service updateTitle(title:String!):Service """Publish a schema to this variant, either via a document or an introspection query result.""" uploadSchema(errorOnBadRequest:Boolean!=true gitContext:GitContextInput historicParameters:HistoricQueryParameters overrideComposedSchema:Boolean!=false schema:IntrospectionSchemaInput schemaDocument:String tag:String!):UploadSchemaMutationResponse upsertChannel(id:ID pagerDutyChannel:PagerDutyChannelInput slackChannel:SlackChannelInput webhookChannel:WebhookChannelInput):Channel """Creates a contract schema from a source variant and a set of filter configurations""" upsertContractVariant(contractVariantName:String!filterConfig:FilterConfigInput!initiateLaunch:Boolean!=true sourceVariant:String!):ContractVariantUpsertResult!"""Publish to a subgraph. If composition is successful, this will update running routers.""" upsertImplementingServiceAndTriggerComposition(activePartialSchema:PartialSchemaInput!gitContext:GitContextInput graphVariant:String!name:String!revision:String!url:String):CompositionAndUpsertResult """Create/update PagerDuty notification channel""" upsertPagerDutyChannel(channel:PagerDutyChannelInput!id:ID):PagerDutyChannel upsertQueryTrigger(id:ID trigger:QueryTriggerInput!):QueryTrigger """Create or update a subscription for a service.""" upsertRegistrySubscription("""ID of Slack channel for registry notification.""" channelID:ID """ID of registry subscription""" id:ID """Set of options/customization for notification.""" options:SubscriptionOptionsInput """Variant to notify on.""" variant:String):RegistrySubscription!upsertScheduledSummary(channelID:ID enabled:Boolean id:ID """Deprecated, use the 'variant' argument instead""" tag:String timezone:String variant:String):ScheduledSummary """Create/update Slack notification channel""" upsertSlackChannel(channel:SlackChannelInput!id:ID):SlackChannel upsertWebhookChannel(id:ID name:String secretToken:String url:String!):WebhookChannel validateOperations(gitContext:GitContextInput operations:[OperationDocumentInput!]!tag:String="current"):ValidateOperationsResult!"""This mutation will not result in any changes to the implementing service +Run composition with the Implementing Service's partial schema replaced with the one provided +in the mutation's input. Store the composed schema, return the hash of the composed schema, +and any warnings and errors pertaining to composition. +This mutation will not run validation against operations.""" validatePartialSchemaOfImplementingServiceAgainstGraph(graphVariant:String!implementingServiceName:String!partialSchema:PartialSchemaInput!):CompositionValidationResult!"""Make changes to a graph variant.""" variant(name:String!):GraphVariantMutation}"""Columns of ServiceOperationCheckStats.""" enum ServiceOperationCheckStatsColumn{CACHED_REQUESTS_COUNT CLIENT_NAME CLIENT_VERSION QUERY_ID QUERY_NAME SCHEMA_TAG TIMESTAMP UNCACHED_REQUESTS_COUNT}type ServiceOperationCheckStatsDimensions{clientName:String clientVersion:String queryId:ID queryName:String schemaTag:String}"""Filter for data in ServiceOperationCheckStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceOperationCheckStatsFilter{and:[ServiceOperationCheckStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String in:ServiceOperationCheckStatsFilterIn not:ServiceOperationCheckStatsFilter or:[ServiceOperationCheckStatsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String}"""Filter for data in ServiceOperationCheckStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceOperationCheckStatsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]}type ServiceOperationCheckStatsMetrics{cachedRequestsCount:Long!uncachedRequestsCount:Long!}input ServiceOperationCheckStatsOrderBySpec{column:ServiceOperationCheckStatsColumn!direction:Ordering!}type ServiceOperationCheckStatsRecord{"""Dimensions of ServiceOperationCheckStats that can be grouped by.""" groupBy:ServiceOperationCheckStatsDimensions!"""Metrics of ServiceOperationCheckStats that can be aggregated over.""" metrics:ServiceOperationCheckStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of ServiceQueryStats.""" enum ServiceQueryStatsColumn{CACHED_HISTOGRAM CACHED_REQUESTS_COUNT CACHE_TTL_HISTOGRAM CLIENT_NAME CLIENT_VERSION FORBIDDEN_OPERATION_COUNT FROM_ENGINEPROXY QUERY_ID QUERY_NAME REGISTERED_OPERATION_COUNT REQUESTS_WITH_ERRORS_COUNT SCHEMA_HASH SCHEMA_TAG TIMESTAMP UNCACHED_HISTOGRAM UNCACHED_REQUESTS_COUNT}type ServiceQueryStatsDimensions{clientName:String clientVersion:String fromEngineproxy:String queryId:ID queryName:String querySignature:String schemaHash:String schemaTag:String}"""Filter for data in ServiceQueryStats. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceQueryStatsFilter{and:[ServiceQueryStatsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose fromEngineproxy dimension equals the given value if not null. To query for the null value, use {in: {fromEngineproxy: [null]}} instead.""" fromEngineproxy:String in:ServiceQueryStatsFilterIn not:ServiceQueryStatsFilter or:[ServiceQueryStatsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String}"""Filter for data in ServiceQueryStats. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceQueryStatsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose fromEngineproxy dimension is in the given list. A null value in the list means a row with null for that dimension.""" fromEngineproxy:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]}type ServiceQueryStatsMetrics{cacheTtlHistogram:DurationHistogram!cachedHistogram:DurationHistogram!cachedRequestsCount:Long!forbiddenOperationCount:Long!registeredOperationCount:Long!requestsWithErrorsCount:Long!totalLatencyHistogram:DurationHistogram!totalRequestCount:Long!uncachedHistogram:DurationHistogram!uncachedRequestsCount:Long!}input ServiceQueryStatsOrderBySpec{column:ServiceQueryStatsColumn!direction:Ordering!}type ServiceQueryStatsRecord{"""Dimensions of ServiceQueryStats that can be grouped by.""" groupBy:ServiceQueryStatsDimensions!"""Metrics of ServiceQueryStats that can be aggregated over.""" metrics:ServiceQueryStatsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""A map from role (permission) String to boolean that the current user is allowed for a particular graph.""" type ServiceRoles{"""Whether the currently authenticated user is permitted to perform schema checks (i.e. run `rover (sub)graph check`).""" canCheckSchemas:Boolean!"""Whether the currently authenticated user is permitted to create new graph variants.""" canCreateVariants:Boolean!"""Whether the currently authenticated user is permitted to delete the graph in question""" canDelete:Boolean!"""Whether the currently authenticated user is permitted to manage user access to the graph in question.""" canManageAccess:Boolean!"""Whether the currently authenticated user is permitted to manage the build configuration (e.g. build pipeline version).""" canManageBuildConfig:Boolean!"""Whether the currently authenticated user is permitted to manage 3rd party integrations (e.g. Datadog forwarding).""" canManageIntegrations:Boolean!"""Whether the currently authenticated user is permitted to manage graph-level API keys.""" canManageKeys:Boolean!"""Whether the currently authenticated user is permitted to perform basic administration (e.g. set to public) over variants.""" canManageVariants:Boolean!"""Whether the currently authenticated user is permitted to view details about the build configuration (e.g. build pipeline version).""" canQueryBuildConfig:Boolean!"""Whether the currently authenticated user is permitted to view details of the check configuration for this graph.""" canQueryCheckConfiguration:Boolean!canQueryDeletedImplementingServices:Boolean!"""Whether the currently authenticated user is permitted to view which subgraphs the graph is composed of.""" canQueryImplementingServices:Boolean!canQueryIntegrations:Boolean!canQueryPrivateInfo:Boolean!canQueryPublicInfo:Boolean!canQueryReadmeAuthor:Boolean!canQueryRoleOverrides:Boolean!"""Whether the currently authenticated user is permitted to download schemas owned by this graph.""" canQuerySchemas:Boolean!canQueryStats:Boolean!canQueryTokens:Boolean!canQueryTraces:Boolean!"""Whether the currently authenticated user is permitted to register operations (i.e. `apollo client:push`) for this graph.""" canRegisterOperations:Boolean!canStoreSchemasWithoutVariant:Boolean!canUndelete:Boolean!canUpdateAvatar:Boolean!canUpdateDescription:Boolean!canUpdateTitle:Boolean!canVisualizeStats:Boolean!@deprecated(reason:"Replaced with canQueryTraces and canQueryStats")"""Whether the currently authenticated user is permitted to make updates to the check configuration for this graph.""" canWriteCheckConfiguration:Boolean!canWriteTraces:Boolean!@deprecated(reason:"Never worked, not replaced")}"""A time window with a specified granularity over a given service.""" type ServiceStatsWindow{billingUsageStats("""Filter to select what rows to return.""" filter:ServiceBillingUsageStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceBillingUsageStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceBillingUsageStatsOrderBySpec!]):[ServiceBillingUsageStatsRecord!]!edgeServerInfos("""Filter to select what rows to return.""" filter:ServiceEdgeServerInfosFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceEdgeServerInfos by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceEdgeServerInfosOrderBySpec!]):[ServiceEdgeServerInfosRecord!]!errorStats("""Filter to select what rows to return.""" filter:ServiceErrorStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceErrorStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceErrorStatsOrderBySpec!]):[ServiceErrorStatsRecord!]!fieldLatencies("""Filter to select what rows to return.""" filter:ServiceFieldLatenciesFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceFieldLatencies by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceFieldLatenciesOrderBySpec!]):[ServiceFieldLatenciesRecord!]!fieldStats("""Filter to select what rows to return.""" filter:ServiceFieldLatenciesFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceFieldLatencies by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceFieldLatenciesOrderBySpec!]):[ServiceFieldLatenciesRecord!]!fieldUsage("""Filter to select what rows to return.""" filter:ServiceFieldUsageFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceFieldUsage by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceFieldUsageOrderBySpec!]):[ServiceFieldUsageRecord!]!operationCheckStats("""Filter to select what rows to return.""" filter:ServiceOperationCheckStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceOperationCheckStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceOperationCheckStatsOrderBySpec!]):[ServiceOperationCheckStatsRecord!]!queryStats("""Filter to select what rows to return.""" filter:ServiceQueryStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceQueryStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceQueryStatsOrderBySpec!]):[ServiceQueryStatsRecord!]!"""From field rounded down to the nearest resolution.""" roundedDownFrom:Timestamp!"""To field rounded up to the nearest resolution.""" roundedUpTo:Timestamp!tracePathErrorsRefs("""Filter to select what rows to return.""" filter:ServiceTracePathErrorsRefsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceTracePathErrorsRefs by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceTracePathErrorsRefsOrderBySpec!]):[ServiceTracePathErrorsRefsRecord!]!traceRefs("""Filter to select what rows to return.""" filter:ServiceTraceRefsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ServiceTraceRefs by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ServiceTraceRefsOrderBySpec!]):[ServiceTraceRefsRecord!]!}"""Columns of ServiceTracePathErrorsRefs.""" enum ServiceTracePathErrorsRefsColumn{CLIENT_NAME CLIENT_VERSION DURATION_BUCKET ERRORS_COUNT_IN_PATH ERRORS_COUNT_IN_TRACE ERROR_MESSAGE PATH QUERY_ID QUERY_NAME SCHEMA_HASH SCHEMA_TAG TIMESTAMP TRACE_HTTP_STATUS_CODE TRACE_ID TRACE_SIZE_BYTES TRACE_STARTS_AT}type ServiceTracePathErrorsRefsDimensions{clientName:String clientVersion:String durationBucket:Int errorMessage:String path:String queryId:ID queryName:String schemaHash:String schemaTag:String traceHttpStatusCode:Int traceId:ID traceStartsAt:Timestamp}"""Filter for data in ServiceTracePathErrorsRefs. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceTracePathErrorsRefsFilter{and:[ServiceTracePathErrorsRefsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose durationBucket dimension equals the given value if not null. To query for the null value, use {in: {durationBucket: [null]}} instead.""" durationBucket:Int """Selects rows whose errorMessage dimension equals the given value if not null. To query for the null value, use {in: {errorMessage: [null]}} instead.""" errorMessage:String in:ServiceTracePathErrorsRefsFilterIn not:ServiceTracePathErrorsRefsFilter or:[ServiceTracePathErrorsRefsFilter!]"""Selects rows whose path dimension equals the given value if not null. To query for the null value, use {in: {path: [null]}} instead.""" path:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose traceHttpStatusCode dimension equals the given value if not null. To query for the null value, use {in: {traceHttpStatusCode: [null]}} instead.""" traceHttpStatusCode:Int """Selects rows whose traceId dimension equals the given value if not null. To query for the null value, use {in: {traceId: [null]}} instead.""" traceId:ID}"""Filter for data in ServiceTracePathErrorsRefs. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceTracePathErrorsRefsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose durationBucket dimension is in the given list. A null value in the list means a row with null for that dimension.""" durationBucket:[Int]"""Selects rows whose errorMessage dimension is in the given list. A null value in the list means a row with null for that dimension.""" errorMessage:[String]"""Selects rows whose path dimension is in the given list. A null value in the list means a row with null for that dimension.""" path:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose traceHttpStatusCode dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceHttpStatusCode:[Int]"""Selects rows whose traceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceId:[ID]}type ServiceTracePathErrorsRefsMetrics{errorsCountInPath:Long!errorsCountInTrace:Long!traceSizeBytes:Long!}input ServiceTracePathErrorsRefsOrderBySpec{column:ServiceTracePathErrorsRefsColumn!direction:Ordering!}type ServiceTracePathErrorsRefsRecord{"""Dimensions of ServiceTracePathErrorsRefs that can be grouped by.""" groupBy:ServiceTracePathErrorsRefsDimensions!"""Metrics of ServiceTracePathErrorsRefs that can be aggregated over.""" metrics:ServiceTracePathErrorsRefsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of ServiceTraceRefs.""" enum ServiceTraceRefsColumn{CLIENT_NAME CLIENT_VERSION DURATION_BUCKET DURATION_NS QUERY_ID QUERY_NAME SCHEMA_HASH SCHEMA_TAG TIMESTAMP TRACE_ID TRACE_SIZE_BYTES}type ServiceTraceRefsDimensions{clientName:String clientVersion:String durationBucket:Int queryId:ID queryName:String querySignature:String schemaHash:String schemaTag:String traceId:ID}"""Filter for data in ServiceTraceRefs. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input ServiceTraceRefsFilter{and:[ServiceTraceRefsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose durationBucket dimension equals the given value if not null. To query for the null value, use {in: {durationBucket: [null]}} instead.""" durationBucket:Int in:ServiceTraceRefsFilterIn not:ServiceTraceRefsFilter or:[ServiceTraceRefsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose traceId dimension equals the given value if not null. To query for the null value, use {in: {traceId: [null]}} instead.""" traceId:ID}"""Filter for data in ServiceTraceRefs. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input ServiceTraceRefsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose durationBucket dimension is in the given list. A null value in the list means a row with null for that dimension.""" durationBucket:[Int]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose traceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceId:[ID]}type ServiceTraceRefsMetrics{durationNs:Long!traceSizeBytes:Long!}input ServiceTraceRefsOrderBySpec{column:ServiceTraceRefsColumn!direction:Ordering!}type ServiceTraceRefsRecord{"""Dimensions of ServiceTraceRefs that can be grouped by.""" groupBy:ServiceTraceRefsDimensions!"""Metrics of ServiceTraceRefs that can be aggregated over.""" metrics:ServiceTraceRefsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Slack notification channel""" type SlackChannel implements Channel{id:ID!name:String!subscriptions:[ChannelSubscription!]!url:String!}"""Slack notification channel parameters""" input SlackChannelInput{name:String url:String!}input SlackNotificationField{key:String!value:String!}"""Slack notification message""" input SlackNotificationInput{color:String fallback:String!fields:[SlackNotificationField!]iconUrl:String text:String timestamp:Timestamp title:String titleLink:String username:String}type SourceLocation{column:Int!line:Int!}"""A time window with a specified granularity.""" type StatsWindow{billingUsageStats("""Filter to select what rows to return.""" filter:BillingUsageStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order BillingUsageStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[BillingUsageStatsOrderBySpec!]):[BillingUsageStatsRecord!]!edgeServerInfos("""Filter to select what rows to return.""" filter:EdgeServerInfosFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order EdgeServerInfos by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[EdgeServerInfosOrderBySpec!]):[EdgeServerInfosRecord!]!errorStats("""Filter to select what rows to return.""" filter:ErrorStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order ErrorStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[ErrorStatsOrderBySpec!]):[ErrorStatsRecord!]!fieldLatencies("""Filter to select what rows to return.""" filter:FieldLatenciesFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order FieldLatencies by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[FieldLatenciesOrderBySpec!]):[FieldLatenciesRecord!]!fieldUsage("""Filter to select what rows to return.""" filter:FieldUsageFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order FieldUsage by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[FieldUsageOrderBySpec!]):[FieldUsageRecord!]!operationCheckStats("""Filter to select what rows to return.""" filter:OperationCheckStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order OperationCheckStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[OperationCheckStatsOrderBySpec!]):[OperationCheckStatsRecord!]!queryStats("""Filter to select what rows to return.""" filter:QueryStatsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order QueryStats by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[QueryStatsOrderBySpec!]):[QueryStatsRecord!]!"""From field rounded down to the nearest resolution.""" roundedDownFrom:Timestamp!"""To field rounded up to the nearest resolution.""" roundedUpTo:Timestamp!tracePathErrorsRefs("""Filter to select what rows to return.""" filter:TracePathErrorsRefsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order TracePathErrorsRefs by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[TracePathErrorsRefsOrderBySpec!]):[TracePathErrorsRefsRecord!]!traceRefs("""Filter to select what rows to return.""" filter:TraceRefsFilter """The maximum number of entries to return, cannot be more than 15000.""" limit:Int=10000 """A list of OrderBySpecs to order TraceRefs by. The earlier an OrderBySpec appears in the list, the higher priority it has in the final ordering. When empty or null, defaults to sorting by ascending timestamp.""" orderBy:[TraceRefsOrderBySpec!]):[TraceRefsRecord!]!}type StoreSchemaError{code:StoreSchemaErrorCode!message:String!}enum StoreSchemaErrorCode{SCHEMA_IS_NOT_PARSABLE SCHEMA_IS_NOT_VALID}type StoreSchemaResponse{sha256:SHA256!}union StoreSchemaResponseOrError=StoreSchemaError|StoreSchemaResponse type StoredApprovedChange{argNode:NamedIntrospectionArgNoDescription childNode:NamedIntrospectionValueNoDescription code:ChangeCode!parentNode:NamedIntrospectionTypeNoDescription}scalar StringOrInt type StringToString{key:String!value:String!}input StringToStringInput{key:String!value:String!}type Subgraph{hash:String!name:String!routingURL:String!}type SubgraphChange{name:ID!type:SubgraphChangeType!}enum SubgraphChangeType{ADDITION DELETION MODIFICATION}type SubgraphConfig{id:ID!name:String!schemaHash:String!sdl:String!url:String!}type SubscriptionOptions{"""Enables notifications for schema updates""" schemaUpdates:Boolean!}input SubscriptionOptionsInput{"""Enables notifications for schema updates""" schemaUpdates:Boolean!}enum SubscriptionState{ACTIVE CANCELED EXPIRED FUTURE PAST_DUE PAUSED PENDING UNKNOWN}enum SubscriptionStateV2{ACTIVE CANCELED EXPIRED FUTURE PAST_DUE PAUSED PENDING UNKNOWN}type TemporaryURL{url:String!}enum ThemeName{DARK LIGHT}enum TicketPriority{P0 P1 P2 P3}enum TicketStatus{CLOSED HOLD NEW OPEN PENDING SOLVED}"""ISO 8601, extended format with nanoseconds, Zulu (or '[+-]seconds' for times relative to now)""" scalar Timestamp type TimezoneOffset{minutesOffsetFromUTC:Int!zoneID:String!}"""Counts of changes.""" type TotalChangeSummaryCounts{"""Number of changes that are additions. This includes adding types, adding fields to object, input +object, and interface types, adding values to enums, adding members to interfaces and unions, and +adding arguments.""" additions:Int!"""Number of changes that are new usages of the @deprecated directive.""" deprecations:Int!"""Number of changes that are edits. This includes types changing kind, fields and arguments +changing type, arguments changing default value, and any description changes. This also includes +edits to @deprecated reason strings.""" edits:Int!"""Number of changes that are removals. This includes removing types, removing fields from object, +input object, and interface types, removing values from enums, removing members from interfaces +and unions, and removing arguments. This also includes removing @deprecated usages.""" removals:Int!}type Trace{cacheMaxAgeMs:Float cacheScope:CacheScope clientName:String clientVersion:String durationMs:Float!endTime:Timestamp!http:TraceHTTP id:ID!operationName:String protobuf:Protobuf!root:TraceNode!signature:String!startTime:Timestamp!variablesJSON:[StringToString!]!}type TraceError{json:String!locations:[TraceSourceLocation!]!message:String!timestamp:Timestamp}type TraceHTTP{host:String method:HTTPMethod!path:String protocol:String requestHeaders:[StringToString!]!responseHeaders:[StringToString!]!secure:Boolean!statusCode:Int!}type TraceNode{cacheMaxAgeMs:Float cacheScope:CacheScope children:[TraceNode!]!childrenIds:[ID!]!descendants:[TraceNode!]!descendantsIds:[ID!]!endTime:Timestamp!errors:[TraceError!]!id:ID!key:StringOrInt originalFieldName:String parent:ID!parentId:ID path:[String!]!startTime:Timestamp!type:String}"""Columns of TracePathErrorsRefs.""" enum TracePathErrorsRefsColumn{CLIENT_NAME CLIENT_VERSION DURATION_BUCKET ERRORS_COUNT_IN_PATH ERRORS_COUNT_IN_TRACE ERROR_MESSAGE PATH QUERY_ID QUERY_NAME SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP TRACE_HTTP_STATUS_CODE TRACE_ID TRACE_SIZE_BYTES TRACE_STARTS_AT}type TracePathErrorsRefsDimensions{clientName:String clientVersion:String durationBucket:Int errorMessage:String """If metrics were collected from a federated service, this field will be prefixed with `service:.`""" path:String queryId:ID queryName:String schemaHash:String schemaTag:String serviceId:ID traceHttpStatusCode:Int traceId:ID traceStartsAt:Timestamp}"""Filter for data in TracePathErrorsRefs. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input TracePathErrorsRefsFilter{and:[TracePathErrorsRefsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose durationBucket dimension equals the given value if not null. To query for the null value, use {in: {durationBucket: [null]}} instead.""" durationBucket:Int """Selects rows whose errorMessage dimension equals the given value if not null. To query for the null value, use {in: {errorMessage: [null]}} instead.""" errorMessage:String in:TracePathErrorsRefsFilterIn not:TracePathErrorsRefsFilter or:[TracePathErrorsRefsFilter!]"""Selects rows whose path dimension equals the given value if not null. To query for the null value, use {in: {path: [null]}} instead.""" path:String """Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID """Selects rows whose traceHttpStatusCode dimension equals the given value if not null. To query for the null value, use {in: {traceHttpStatusCode: [null]}} instead.""" traceHttpStatusCode:Int """Selects rows whose traceId dimension equals the given value if not null. To query for the null value, use {in: {traceId: [null]}} instead.""" traceId:ID}"""Filter for data in TracePathErrorsRefs. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input TracePathErrorsRefsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose durationBucket dimension is in the given list. A null value in the list means a row with null for that dimension.""" durationBucket:[Int]"""Selects rows whose errorMessage dimension is in the given list. A null value in the list means a row with null for that dimension.""" errorMessage:[String]"""Selects rows whose path dimension is in the given list. A null value in the list means a row with null for that dimension.""" path:[String]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]"""Selects rows whose traceHttpStatusCode dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceHttpStatusCode:[Int]"""Selects rows whose traceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceId:[ID]}type TracePathErrorsRefsMetrics{errorsCountInPath:Long!errorsCountInTrace:Long!traceSizeBytes:Long!}input TracePathErrorsRefsOrderBySpec{column:TracePathErrorsRefsColumn!direction:Ordering!}type TracePathErrorsRefsRecord{"""Dimensions of TracePathErrorsRefs that can be grouped by.""" groupBy:TracePathErrorsRefsDimensions!"""Metrics of TracePathErrorsRefs that can be aggregated over.""" metrics:TracePathErrorsRefsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}"""Columns of TraceRefs.""" enum TraceRefsColumn{CLIENT_NAME CLIENT_VERSION DURATION_BUCKET DURATION_NS QUERY_ID QUERY_NAME SCHEMA_HASH SCHEMA_TAG SERVICE_ID TIMESTAMP TRACE_ID TRACE_SIZE_BYTES}type TraceRefsDimensions{clientName:String clientVersion:String durationBucket:Int queryId:ID queryName:String querySignature:String schemaHash:String schemaTag:String serviceId:ID traceId:ID}"""Filter for data in TraceRefs. Fields with dimension names represent equality checks. All fields are implicitly ANDed together.""" input TraceRefsFilter{and:[TraceRefsFilter!]"""Selects rows whose clientName dimension equals the given value if not null. To query for the null value, use {in: {clientName: [null]}} instead.""" clientName:String """Selects rows whose clientVersion dimension equals the given value if not null. To query for the null value, use {in: {clientVersion: [null]}} instead.""" clientVersion:String """Selects rows whose durationBucket dimension equals the given value if not null. To query for the null value, use {in: {durationBucket: [null]}} instead.""" durationBucket:Int in:TraceRefsFilterIn not:TraceRefsFilter or:[TraceRefsFilter!]"""Selects rows whose queryId dimension equals the given value if not null. To query for the null value, use {in: {queryId: [null]}} instead.""" queryId:ID """Selects rows whose queryName dimension equals the given value if not null. To query for the null value, use {in: {queryName: [null]}} instead.""" queryName:String """Selects rows whose schemaHash dimension equals the given value if not null. To query for the null value, use {in: {schemaHash: [null]}} instead.""" schemaHash:String """Selects rows whose schemaTag dimension equals the given value if not null. To query for the null value, use {in: {schemaTag: [null]}} instead.""" schemaTag:String """Selects rows whose serviceId dimension equals the given value if not null. To query for the null value, use {in: {serviceId: [null]}} instead.""" serviceId:ID """Selects rows whose traceId dimension equals the given value if not null. To query for the null value, use {in: {traceId: [null]}} instead.""" traceId:ID}"""Filter for data in TraceRefs. Fields match if the corresponding dimension's value is in the given list. All fields are implicitly ANDed together.""" input TraceRefsFilterIn{"""Selects rows whose clientName dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientName:[String]"""Selects rows whose clientVersion dimension is in the given list. A null value in the list means a row with null for that dimension.""" clientVersion:[String]"""Selects rows whose durationBucket dimension is in the given list. A null value in the list means a row with null for that dimension.""" durationBucket:[Int]"""Selects rows whose queryId dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryId:[ID]"""Selects rows whose queryName dimension is in the given list. A null value in the list means a row with null for that dimension.""" queryName:[String]"""Selects rows whose schemaHash dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaHash:[String]"""Selects rows whose schemaTag dimension is in the given list. A null value in the list means a row with null for that dimension.""" schemaTag:[String]"""Selects rows whose serviceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" serviceId:[ID]"""Selects rows whose traceId dimension is in the given list. A null value in the list means a row with null for that dimension.""" traceId:[ID]}type TraceRefsMetrics{durationNs:Long!traceSizeBytes:Long!}input TraceRefsOrderBySpec{column:TraceRefsColumn!direction:Ordering!}type TraceRefsRecord{"""Dimensions of TraceRefs that can be grouped by.""" groupBy:TraceRefsDimensions!"""Metrics of TraceRefs that can be aggregated over.""" metrics:TraceRefsMetrics!"""Starting segment timestamp.""" timestamp:Timestamp!}type TraceSourceLocation{column:Int!line:Int!}"""Counts of changes at the type level, including interfaces, unions, enums, scalars, input objects, etc.""" type TypeChangeSummaryCounts{"""Number of changes that are additions of types.""" additions:Int!"""Number of changes that are edits. This includes types changing kind and any type description +changes, but also includes adding/removing values from enums, adding/removing members from +interfaces and unions, and any enum value deprecation and description changes.""" edits:Int!"""Number of changes that are removals of types.""" removals:Int!}"""the TypeFilterConfig is used to isolate +types, and subsequent fields, through +various configuration settings. + +It defaults to filter towards user defined +types only""" input TypeFilterConfig{"""include abstract types (interfaces and unions)""" includeAbstractTypes:Boolean=true """include built in scalars (i.e. Boolean, Int, etc)""" includeBuiltInTypes:Boolean=false """include reserved introspection types (i.e. __Type)""" includeIntrospectionTypes:Boolean=false}type URI{"""A GCS URI""" gcs:String!}type UnignoreOperationsInChecksResult{graph:Service!}union UpdateOperationCollectionEntryResult=OperationCollectionEntry|PermissionError|ValidationError union UpdateOperationCollectionResult=OperationCollection|PermissionError|ValidationError """The result of a schema publish to a graph variant.""" type UploadSchemaMutationResponse{"""A response code for processing via machines (e.g. UPLOAD_SUCCESS or NO_CHANGES)""" code:String!"""Human readable result of a schema publish.""" message:String!"""If successful, the corresponding publication.""" publication:SchemaTag """Whether the schema publish successfully completed or encountered errors.""" success:Boolean!"""If successful, the corresponding publication.""" tag:SchemaTag}"""A registered user.""" type User implements Identity{acceptedPrivacyPolicyAt:Timestamp accounts:[Account!]!@deprecated(reason:"Replaced with User.memberships.account")apiKeys(includeCookies:Boolean=false):[UserApiKey!]!"""Translation of this user identity to an 'Actor' type.""" asActor:Actor!"""Get an URL to which an avatar image can be uploaded. Client uploads by sending a PUT request +with the image data to MediaUploadInfo.url. Client SHOULD set the "Content-Type" header to the +browser-inferred MIME type, and SHOULD set the "x-apollo-content-filename" header to the +filename, if such information is available. Client MUST set the "x-apollo-csrf-token" header to +MediaUploadInfo.csrfToken.""" avatarUpload:AvatarUploadResult """Get an image URL for the user's avatar. Note that CORS is not enabled for these URLs. The size +argument is used for bandwidth reduction, and should be the size of the image as displayed in the +application. Apollo's media server will downscale larger images to at least the requested size, +but this will not happen for third-party media servers.""" avatarUrl(size:Int!=40):String betaFeaturesOn:Boolean!canUpdateAvatar:Boolean!canUpdateEmail:Boolean!canUpdateFullName:Boolean!createdAt:Timestamp!email:String emailModifiedAt:Timestamp emailVerified:Boolean!experimentalFeatures:UserExperimentalFeatures!featureIntros:FeatureIntros fullName:String!"""The user's GitHub username, if they log in via GitHub. May be null even for GitHub users in some edge cases.""" githubUsername:String """The unique identifier for a user.""" id:ID!"""This role is reserved exclusively for internal MDG employees, and it controls what access they may have to other +organizations. Only admins are allowed to see this field.""" internalAdminRole:InternalMdgAdminRole """Last time any API token from this user was used against AGM services""" lastAuthenticatedAt:Timestamp logoutAfterIdleMs:Int """Which organizations a user belongs to.""" memberships:[UserMembership!]!"""The name (first and last) of a user.""" name:String!odysseyCertifications:[OdysseyCertification!]odysseyCourses:[OdysseyCourse!]odysseyHasEarlyAccess:Boolean!odysseyHasRequestedEarlyAccess:Boolean!odysseyTasks:[OdysseyTask!]sandboxOperationCollections:[OperationCollection!]!synchronized:Boolean!"""List of Zendesk tickets this user has submitted""" tickets:[ZendeskTicket!]type:UserType!}type UserApiKey implements ApiKey{id:ID!keyName:String token:String!}type UserExperimentalFeatures{exampleFeature:Boolean!}"""An organization a given user belongs to.""" type UserMembership{"""The organization a user is a member of.""" account:Account!"""When the user joined the organization.""" createdAt:Timestamp!"""What level of access a use has to an organization.""" permission:UserPermission!"""The user that is a member of an organization.""" user:User!}type UserMutation{acceptPrivacyPolicy:Void """Change the user's password""" changePassword(newPassword:String!previousPassword:String!):Void createOdysseyCertification(certificationId:String!):OdysseyCertification createOdysseyCourses(courses:[OdysseyCourseInput!]!):[OdysseyCourse!]createOdysseyTasks(tasks:[OdysseyTaskInput!]!):[OdysseyTask!]"""Delete the user's avatar. Requires User.canUpdateAvatar to be true.""" deleteAvatar:AvatarDeleteError """Hard deletes the associated user. Throws an error otherwise with reason included.""" hardDelete:Void """Create a new API key for this user. Must take in a name for this key.""" newKey(keyName:String!):UserApiKey!"""Create a new API key for this user if there are no current API keys. +If an API key already exists, this will return one at random and not create a new one.""" provisionKey(keyName:String!="add-a-name"):ApiKeyProvision """Refresh information about the user from its upstream service (eg list of organizations from GitHub)""" refresh:User """Removes the given key from this user. Can be used to remove either a web cookie or a user API key.""" removeKey(id:ID!):Void """Renames the given key to the new key name.""" renameKey(id:ID!newKeyName:String):UserApiKey resendVerificationEmail:Void setOdysseyCourse(course:OdysseyCourseInput!):OdysseyCourse setOdysseyTask(task:OdysseyTaskInput!):OdysseyTask """Submit a zendesk ticket for this user""" submitZendeskTicket(collaborators:[String!]email:String!ticket:ZendeskTicketInput!):ZendeskTicket """Update information about a user; all arguments are optional""" update(email:String fullName:String referrer:String trackingGoogleClientId:String trackingMarketoClientId:String userSegment:UserSegment utmCampaign:String utmMedium:String utmSource:String):User """Updates this users' preference concerning opting into beta features.""" updateBetaFeaturesOn(betaFeaturesOn:Boolean!):User """Update the status of a feature for this. For example, if you want to hide an introductory popup.""" updateFeatureIntros(newFeatureIntros:FeatureIntrosInput):User """Update user to have the given internal mdg admin role. +It is necessary to be an MDG_INTERNAL_SUPER_ADMIN to perform update. +Additionally, upserting a null value explicitly revokes this user's +admin status.""" updateRole(newRole:InternalMdgAdminRole):User user:User!verifyEmail(token:String!):User}enum UserPermission{BILLING_MANAGER CONSUMER CONTRIBUTOR GRAPH_ADMIN LEGACY_GRAPH_KEY OBSERVER ORG_ADMIN}enum UserSegment{JOIN_MY_TEAM LOCAL_DEVELOPMENT NOT_SPECIFIED PRODUCTION_GRAPHS SANDBOX SANDBOX_OPERATION_COLLECTIONS TRY_TEAM}type UserSettings{appNavCollapsed:Boolean!autoManageVariables:Boolean!id:String!mockingResponses:Boolean!preflightScriptEnabled:Boolean!responseHints:ResponseHints!tableMode:Boolean!themeName:ThemeName!}"""Explorer user settings input""" input UserSettingsInput{appNavCollapsed:Boolean autoManageVariables:Boolean mockingResponses:Boolean preflightScriptEnabled:Boolean responseHints:ResponseHints tableMode:Boolean themeName:ThemeName}enum UserType{APOLLO GITHUB SSO}type ValidateOperationsResult{validationResults:[ValidationResult!]!}type ValidationError implements Error{message:String!}enum ValidationErrorCode{DEPRECATED_FIELD INVALID_OPERATION NON_PARSEABLE_DOCUMENT}enum ValidationErrorType{FAILURE INVALID WARNING}"""Represents a single validation error, with information relating to the error +and its respective operation""" type ValidationResult{"""The validation result's error code""" code:ValidationErrorCode!"""Description of the validation error""" description:String!"""The operation related to this validation result""" operation:OperationDocument!"""The type of validation error thrown - warning, failure, or invalid.""" type:ValidationErrorType!}"""Always null""" scalar Void """Webhook notification channel""" type WebhookChannel implements Channel{id:ID!name:String!secretToken:String subscriptions:[ChannelSubscription!]!url:String!}"""PagerDuty notification channel parameters""" input WebhookChannelInput{name:String secretToken:String url:String!}type ZendeskTicket{createdAt:Timestamp!description:String!graph:Service id:Int!organization:Account priority:TicketPriority!status:TicketStatus subject:String!user:User}"""Zendesk ticket input""" input ZendeskTicketInput{description:String!graphId:String organizationId:String priority:TicketPriority!subject:String!} diff --git a/pkgs/development/tools/rover/update.sh b/pkgs/development/tools/rover/update.sh new file mode 100755 index 000000000000..50a9945884b7 --- /dev/null +++ b/pkgs/development/tools/rover/update.sh @@ -0,0 +1,96 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused jq nix-prefetch + +set -eu -o pipefail + +dirname=$(realpath "$(dirname "$0")") +nixpkgs=$(realpath "${dirname}/../../../..") + +old_rover_version=$(nix eval --raw -f "$nixpkgs" rover.version) +rover_url=https://api.github.com/repos/apollographql/rover/releases/latest +rover_tag=$(curl "$rover_url" | jq --raw-output ".tag_name") +rover_version="$(expr "$rover_tag" : 'v\(.*\)')" + +if [[ "$old_rover_version" == "$rover_version" ]]; then + echo "rover is up-to-date: ${old_rover_version}" + exit 0 +fi + +echo "Fetching rover" +rover_tar_url="https://github.com/apollographql/rover/archive/refs/tags/${rover_tag}.tar.gz" +{ + read rover_hash + read repo +} < <(nix-prefetch-url "$rover_tar_url" --unpack --type sha256 --print-path) + +# Convert hash to SRI representation +rover_sri_hash=$(nix hash to-sri --type sha256 "$rover_hash") + +# Identify librusty version and hash +librusty_version=$( + sed --quiet '/^name = "v8"$/{n;p}' "${repo}/Cargo.lock" \ + | grep --only-matching --perl-regexp '^version = "\K[^"]+' +) +librusty_arch=x86_64-unknown-linux-gnu +librusty_url="https://github.com/denoland/rusty_v8/releases/download/v${librusty_version}/librusty_v8_release_${librusty_arch}.a" +echo "Fetching librusty" +librusty_hash=$(nix-prefetch-url "$librusty_url" --type sha256) +librusty_sri_hash=$(nix hash to-sri --type sha256 "$librusty_hash") + +# Update rover version. +sed --in-place \ + "s|version = \"[0-9.]*\"|version = \"$rover_version\"|" \ + "$dirname/default.nix" + +# Update rover hash. +sed --in-place \ + "s|sha256 = \"[a-zA-Z0-9\/+-=]*\"|sha256 = \"$rover_sri_hash\"|" \ + "$dirname/default.nix" + +# Clear cargoSha256. +sed --in-place \ + "s|cargoSha256 = \".*\"|cargoSha256 = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"|" \ + "$dirname/default.nix" + +# Update cargoSha256 +echo "Computing cargoSha256" +cargoSha256=$( + nix-prefetch "{ sha256 }: (import $nixpkgs {}).rover.cargoDeps.overrideAttrs (_: { outputHash = sha256; })" +) +sed --in-place \ + "s|cargoSha256 = \".*\"|cargoSha256 = \"$cargoSha256\"|" \ + "$dirname/default.nix" + +# Update librusty version +sed --in-place \ + "s|version = \"[0-9.]*\"|version = \"$librusty_version\"|" \ + "$dirname/librusty_v8.nix" + +# Update librusty hash +sed --in-place \ + "s|x86_64-linux = \"[^\"]*\"|x86_64-linux = \"$librusty_sri_hash\"|" \ + "$dirname/librusty_v8.nix" + +# Update apollo api schema info +response="$(mktemp)" +schemaUrl=https://graphql.api.apollographql.com/api/schema + +mkdir -p "$dirname"/schema + +# Fetch schema info +echo "Fetching Apollo GraphQL schema" +# include response headers, and append terminating newline to response body +curl --include --write-out "\n" "$schemaUrl" > "$response" + +# Parse response headers and write the etag to schema/etag.id +grep \ + --max-count=1 \ + --only-matching \ + --perl-regexp \ + '^etag: \K\S*' \ + "$response" \ + > "$dirname"/schema/etag.id + +# Discard headers and blank line (terminated by carriage return), and write the +# response body to schema/schema.graphql +sed '1,/^\r/d' "$response" > "$dirname"/schema/schema.graphql diff --git a/pkgs/development/tools/rslint/default.nix b/pkgs/development/tools/rslint/default.nix index cff68cc07c4e..1dd66050d2d7 100644 --- a/pkgs/development/tools/rslint/default.nix +++ b/pkgs/development/tools/rslint/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rslint"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "rslint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AkSQpGbhRVmDuDAbMzx00BELpI2szJ+rjKo8Qjcug1E="; + sha256 = "sha256-3DEwi+bhqwP8aMpZYl07GZbe7IecraB3m54lZ5LViVc="; }; - cargoSha256 = "sha256-U8Uf7LG6+dOi+XxRpJrpy0kAqyr8fAlVchE9ZJ+ex/s="; + cargoSha256 = "sha256-bqF5v52uxbvmVmphXAmcWlCI6nbQzZemCxlTcqhRDTY="; cargoBuildFlags = [ "-p" "rslint_cli" diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 6ecbe058328f..6693e80e1161 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }: +{ stdenv, lib, fetchFromGitHub, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }: stdenv.mkDerivation rec { pname = "rtags"; @@ -8,11 +8,12 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ] ++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ]; - src = fetchgit { - rev = "refs/tags/v${version}"; + src = fetchFromGitHub { + owner = "andersbakken"; + repo = "rtags"; + rev = "v${version}"; + sha256 = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c="; fetchSubmodules = true; - url = "https://github.com/andersbakken/rtags.git"; - sha256 = "1iwvp7a69sj3wqjgcnyh581qrpicxzi2lfjkxqpabpyjkl5nk7hh"; # unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation postFetch = '' diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 2c69ad9876ec..444db1173225 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -1,75 +1,47 @@ -{ lib, fetchFromGitHub, rustPlatform, clang, llvmPackages_latest, rustfmt, writeTextFile -, runtimeShell -, bash -}: - -rustPlatform.buildRustPackage rec { - pname = "rust-bindgen"; - version = "0.59.2"; - - RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update - - src = fetchFromGitHub { - owner = "rust-lang"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-bJYdyf5uZgWe7fQ80/3QsRV0qyExYn6P9UET3tzwPFs="; - }; - - cargoSha256 = "sha256-zhENlrqj611RkKDvpDtDFWc58wfQVamkJnpe2nvRieE="; - - #for substituteAll - libclang = llvmPackages_latest.libclang.lib; - inherit bash; - - buildInputs = [ libclang ]; - - propagatedBuildInputs = [ clang ]; # to populate NIX_CXXSTDLIB_COMPILE - - configurePhase = '' - export LIBCLANG_PATH="${libclang.lib}/lib" - ''; - - postInstall = '' - mv $out/bin/{bindgen,.bindgen-wrapped}; +{ rust-bindgen-unwrapped, zlib, bash, runCommand, runCommandCC }: +let + clang = rust-bindgen-unwrapped.clang; + self = runCommand "rust-bindgen-${rust-bindgen-unwrapped.version}" + { + #for substituteAll + inherit bash; + unwrapped = rust-bindgen-unwrapped; + libclang = clang.cc.lib; + meta = rust-bindgen-unwrapped.meta // { + longDescription = rust-bindgen-unwrapped.meta.longDescription + '' + This version of bindgen is wrapped with the required compiler flags + required to find the c and c++ standard libary, as well as the libraries + specified in the buildInputs of your derivation. + ''; + }; + passthru.tests = { + simple-c = runCommandCC "simple-c-bindgen-tests" { } '' + echo '#include ' > a.c + ${self}/bin/bindgen a.c --whitelist-function atoi | tee output + grep atoi output + touch $out + ''; + simple-cpp = runCommandCC "simple-cpp-bindgen-tests" { } '' + echo '#include ' > a.cpp + ${self}/bin/bindgen a.cpp --whitelist-function erf -- -xc++ | tee output + grep erf output + touch $out + ''; + with-lib = runCommandCC "zlib-bindgen-tests" { buildInputs = [ zlib ]; } '' + echo '#include ' > a.c + ${self}/bin/bindgen a.c --whitelist-function compress | tee output + grep compress output + touch $out + ''; + }; + } + # if you modify the logic to find the right clang flags, also modify rustPlatform.bindgenHook + '' + mkdir -p $out/bin + export cincludes="$(< ${clang}/nix-support/cc-cflags) $(< ${clang}/nix-support/libc-cflags)" + export cxxincludes="$(< ${clang}/nix-support/libcxx-cxxflags)" substituteAll ${./wrapper.sh} $out/bin/bindgen chmod +x $out/bin/bindgen ''; - - doCheck = true; - checkInputs = - let fakeRustup = writeTextFile { - name = "fake-rustup"; - executable = true; - destination = "/bin/rustup"; - text = '' - #!${runtimeShell} - shift - shift - exec "$@" - ''; - }; - in [ - rustfmt - fakeRustup # the test suite insists in calling `rustup run nightly rustfmt` - clang - ]; - preCheck = '' - # for the ci folder, notably - patchShebangs . - ''; - - meta = with lib; { - description = "Automatically generates Rust FFI bindings to C (and some C++) libraries"; - longDescription = '' - Bindgen takes a c or c++ header file and turns them into - rust ffi declarations. - As with most compiler related software, this will only work - inside a nix-shell with the required libraries as buildInputs. - ''; - homepage = "https://github.com/rust-lang/rust-bindgen"; - license = with licenses; [ bsd3 ]; - platforms = platforms.unix; - maintainers = with maintainers; [ johntitor ralith ]; - }; -} +in +self diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix new file mode 100644 index 000000000000..65ce8e20bc0e --- /dev/null +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -0,0 +1,63 @@ +{ lib, fetchFromGitHub, rustPlatform, clang, rustfmt, writeTextFile +, runtimeShell +, bash +}: + +rustPlatform.buildRustPackage rec { + pname = "rust-bindgen-unwrapped"; + version = "0.59.2"; + + RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update + + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "rust-bindgen"; + rev = "v${version}"; + sha256 = "sha256-bJYdyf5uZgWe7fQ80/3QsRV0qyExYn6P9UET3tzwPFs="; + }; + + cargoSha256 = "sha256-RKZY5vf6CSFaKweuuNkeFF0ZXlSUibAkcL/YhkE0MoQ="; + + buildInputs = [ clang.cc.lib ]; + + preConfigure = '' + export LIBCLANG_PATH="${clang.cc.lib}/lib" + ''; + + doCheck = true; + checkInputs = + let fakeRustup = writeTextFile { + name = "fake-rustup"; + executable = true; + destination = "/bin/rustup"; + text = '' + #!${runtimeShell} + shift + shift + exec "$@" + ''; + }; + in [ + rustfmt + fakeRustup # the test suite insists in calling `rustup run nightly rustfmt` + clang + ]; + preCheck = '' + # for the ci folder, notably + patchShebangs . + ''; + + passthru = { inherit clang; }; + + meta = with lib; { + description = "Automatically generates Rust FFI bindings to C (and some C++) libraries"; + longDescription = '' + Bindgen takes a c or c++ header file and turns them into + rust ffi declarations. + ''; + homepage = "https://github.com/rust-lang/rust-bindgen"; + license = with licenses; [ bsd3 ]; + platforms = platforms.unix; + maintainers = with maintainers; [ johntitor ralith ]; + }; +} diff --git a/pkgs/development/tools/rust/bindgen/wrapper.sh b/pkgs/development/tools/rust/bindgen/wrapper.sh index 0b3e3cd4c1e0..b7110385c26d 100755 --- a/pkgs/development/tools/rust/bindgen/wrapper.sh +++ b/pkgs/development/tools/rust/bindgen/wrapper.sh @@ -22,7 +22,7 @@ for e in "$@"; do done; cxxflags= if [[ $cxx -eq 1 ]]; then - cxxflags=$NIX_CXXSTDLIB_COMPILE + cxxflags="@cxxincludes@" fi; if [[ -n "$NIX_DEBUG" ]]; then set -x; @@ -30,7 +30,7 @@ fi; export LIBCLANG_PATH="@libclang@/lib" # shellcheck disable=SC2086 # cxxflags and NIX_CFLAGS_COMPILE should be word-split -exec -a "$0" @out@/bin/.bindgen-wrapped "$@" $sep $cxxflags $NIX_CFLAGS_COMPILE +exec -a "$0" @unwrapped@/bin/bindgen "$@" $sep $cxxflags @cincludes@ $NIX_CFLAGS_COMPILE # note that we add the flags after $@ which is incorrect. This is only for the sake # of simplicity. diff --git a/pkgs/development/tools/rust/bootimage/default.nix b/pkgs/development/tools/rust/bootimage/default.nix new file mode 100644 index 000000000000..9da7aeaa8cc3 --- /dev/null +++ b/pkgs/development/tools/rust/bootimage/default.nix @@ -0,0 +1,26 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "bootimage"; + version = "0.10.3"; + + src = fetchFromGitHub { + owner = "rust-osdev"; + repo = pname; + rev = "v${version}"; + sha256 = "12p18mk3l473is3ydv3zmn6s7ck8wgjwavllimcpja3yjilxm3zg"; + }; + + cargoSha256 = "03jximwqgjq7359c5mxbyfja2d04y57h34f87aby8jy0lz99jy2x"; + + meta = with lib; { + description = "Creates a bootable disk image from a Rust OS kernel."; + homepage = "https://github.com/rust-osdev/bootimage"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ dbeckwith ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index 62c9f9b97e55..b6d710bab645 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cache"; - version = "0.7.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "matthiaskrgr"; repo = pname; rev = version; - sha256 = "sha256-MPU+hmYfmWftVEkdT/sZx9ESgCPTb7m4lEnYf5bOSYU="; + sha256 = "sha256-1/h9o8ldxI/Q1E6AurGfZ1xruf12g1OO5QlzMJLcEGo="; }; - cargoSha256 = "sha256-6Ffgg5/B1IFnTlSjzhAsnhxz8jBcgk01RIkwgLqlsvc="; + cargoSha256 = "sha256-yUa40j1yOrczCbp9IsL1e5FlHcSEeHPAmbrA8zpuTpI="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index d7287f59e65f..90ea16582713 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.21.3"; + version = "0.23.1"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-CwECZz+qS5+rgwudRutcKZsYxfMLcVbA/9SZASmF+k4="; + sha256 = "sha256-XzjZEVyPVn+7VrjG4QsqVBFmuGC1TWTWLEoqFcwQhaI="; }; - cargoSha256 = "sha256-7c6Hu6UacQuRsCHlGKr1TtN+XHVGr1sw+HEGWeT9SJA="; + cargoSha256 = "sha256-p87ZnOxaF9ytSUxp0P3QE3K1/jo7hz/N7BH1f2Lc0I0="; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index b895ff703e48..78e7fa7b4c8d 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.11.0"; + version = "0.11.3"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-LYXwdOopQkgq7i4l8dqQFkNLB3r+CVRor4BVeoj0DPs="; + sha256 = "sha256-QpYwH9ZmD/muCGtL+9wzz4UKRyHWaga7vrjNjKz4uVQ="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-SdbDWw4GOvCTKN7vBjhLU5rhdVIpyO+AWaFbo06HXfU="; + cargoSha256 = "sha256-DFGCjA0AENYDs5EnQ3WDkbCEw14ndjOh7qx2ZFgNGH0="; nativeBuildInputs = [ pkg-config ]; @@ -40,6 +40,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/EmbarkStudios/cargo-deny"; changelog = "https://github.com/EmbarkStudios/cargo-deny/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ figsoda matthiasbeyer ]; + maintainers = with maintainers; [ figsoda matthiasbeyer jk ]; }; } diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index b2a0c3fad4df..860d53717098 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,17 +1,22 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, libiconv }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, libiconv +}: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.14"; + version = "1.0.16"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-6Wm/qnrSUswWnXt6CPUJUvqNj06eSYuYOmGhbpO1hvo="; + sha256 = "sha256-NhBUN+pf+j/4IozFDEb+XZ1ijSk6dNvCANyez823a0c="; }; - cargoSha256 = "sha256-1+3NMfUhL5sPu92r+B0DRmJ03ZREkFZHjMjvabLyFgs="; + cargoSha256 = "sha256-7rqtxyoo1SQ7Rae04+b+B0JgCKeW0p1j7bZzPpJ8+ks="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index 22fe3a2b19ce..5893fd2c828c 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "rust-fuzz"; repo = "cargo-fuzz"; - rev = version; - sha256 = "sha256-5dHEUGn2CrEpSTJsbnSRx/hKXx6dLCDcuD1dPOH49d4="; + rev = "v${version}"; + sha256 = "sha256-vjKo0L7sYrC7qWdOGSJDWpL04tmNjO3QRwAIRHN/DiI="; }; - cargoSha256 = "sha256-vZPd8Zzyp0PgIdyp5qY57ex0cCihplw/FY+xf3etuu8="; + cargoSha256 = "sha256-8XVRMwrBEJ1duQtXzNpuN5wJPUgziJlka4n/nAIqeEc="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index 0c3773933545..727e9b38c053 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.7.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; rev = version; - sha256 = "1qzzkhailxjqwp3rmdcpp112wn3x0gfi788vwj77pfdyclhpj0a7"; + sha256 = "sha256-cSQEwsUqn+Q0ZWndBVatHL0btO7xLOJWO+MMjtSL0Zo="; }; sourceRoot = "source/cargo-insta"; - cargoSha256 = "01fj2j7ibrk5dyrfkmc610lh1p6f6bgzbgivq3dsd64vslhqmabw"; + cargoSha256 = "sha256-rn4ln/MeaDAQmWpxeTn3mGH4sEvO4876o1VPYiz/CR8="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 7fc1da095e5f..eede871e38c6 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.13"; + version = "0.4.14"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-sN0i2oo0XuxneIK/w+jpxkcdm2rtqhyH2Y3CMPnH+ro="; + sha256 = "sha256-ooFkw6QlMnlvyHPMkqAZUDaOHH8dktzbob5WevQsYXQ="; }; - cargoSha256 = "sha256-Gv7C4NFThNawhT+IYO0ZbpOh6w/yPeIJKZjzTyM/GJw="; + cargoSha256 = "sha256-MgtFNrSjSvyjp1uD/OueSh+MCYSvZCyDabP20pI/8HI="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index da4345c0e44c..2e2ff56fd050 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.7"; + version = "0.35.10"; src = fetchCrate { inherit pname version; - sha256 = "sha256-rMeaKzCGY9jRrw8GaGtgm1rg3FIdaX/P+bOZRAtAI/s="; + sha256 = "sha256-l34sThvzhAW8VfxVuv+UGVil7yOvsOiWSqr/N91V8C8="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-ZXQM2ij9Cpa5WCEHhcDc/tThfKZ7s1URmYsmqRg73m0="; + cargoSha256 = "sha256-974Gqtv+g32iHrIqIzqwBsE8frzmjF0Ma/hSMGzMaGs="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index aec27c588a90..e3694b310837 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-msrv"; - version = "0.13.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "foresterre"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zIUbPmSlobSC3iJ0ddto40Sa/1xzCYG6eaTjMuUnXNU="; + sha256 = "sha256-rmWPkxxrpVamYHII0xkZq62ubL3/jrcqXUvFH9VuNtg="; }; - cargoSha256 = "sha256-GKU0ootG4fXUGErPplERMVjEBop/0+sfQCYpQwPPcXA="; + cargoSha256 = "sha256-/Bspy94uIP/e4uJY8qo+UPK1tnPjglxiMWeYWx2qoHk="; passthru = { updateScript = nix-update-script { diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix new file mode 100644 index 000000000000..ed0c8c870096 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitHub, rustPlatform, stdenv, libiconv }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-nextest"; + version = "0.9.12"; + + src = fetchFromGitHub { + owner = "nextest-rs"; + repo = "nextest"; + rev = "cargo-nextest-${version}"; + sha256 = "sha256-E3/AgzLvjlMfbmvAOYx4V1/1wSLKlFo61tGv79ow7XY="; + }; + + cargoSha256 = "sha256-zrYmZG3VAneanHaNoG3txv7LbKCYvqIf60g1W7CmPG8="; + + cargoTestFlags = [ # TODO: investigate some more why these tests fail in nix + "--" + "--skip=tests_integration::test_relocated_run" + "--skip=tests_integration::test_run" + "--skip=tests_integration::test_run_after_build" + ]; + + meta = with lib; { + description = "Next-generation test runner for Rust projects"; + homepage = "https://github.com/nextest-rs/nextest"; + license = with licenses; [ mit asl20 ]; + maintainers = [ maintainers.ekleog ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-rr/default.nix b/pkgs/development/tools/rust/cargo-rr/default.nix index 47d58e9b92ac..f2099a855ccb 100644 --- a/pkgs/development/tools/rust/cargo-rr/default.nix +++ b/pkgs/development/tools/rust/cargo-rr/default.nix @@ -1,7 +1,8 @@ { lib , rustPlatform , fetchFromGitHub -, nix-update-script +, genericUpdater +, common-updater-scripts , makeWrapper , rr }: @@ -20,8 +21,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0fjs76n6bbbv83s213h2dgsszgxy4hbjsclyk9m81b3bfbmmb9sa"; passthru = { - updateScript = nix-update-script { - attrPath = pname; + updateScript = genericUpdater { + inherit pname version; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; }; }; diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 8e6e9459aab0..4d99fe1f6309 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.9.6"; + version = "0.11.1"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - sha256 = "0brrpcnsphvl1qn8myrzan0k87ph629gcj6zd54ym9f67qg2nri1"; + sha256 = "sha256-Iafhx0bK386grGadsJc/t1lLjd/C89fCVuHrq3FMaE0="; }; - cargoSha256 = "0d0adpgf0j8xvw0dm3gcd6lnksn6p5rz3limc038fg8k84zf7cdb"; + cargoSha256 = "sha256-ZYZA4H1LvsFQR6mvKAie9Tha3MWocAVpNtG7LwdtcPg="; buildInputs = lib.optional stdenv.isDarwin Security; @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Checks rust documentation for spelling and grammar mistakes"; homepage = "https://github.com/drahnr/cargo-spellcheck"; + changelog = "https://github.com/drahnr/cargo-spellcheck/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ newam ]; }; diff --git a/pkgs/development/tools/rust/cargo-supply-chain/default.nix b/pkgs/development/tools/rust/cargo-supply-chain/default.nix index d5876f240a93..d938b93c2456 100644 --- a/pkgs/development/tools/rust/cargo-supply-chain/default.nix +++ b/pkgs/development/tools/rust/cargo-supply-chain/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-supply-chain"; - version = "0.2.0"; + version = "0.3.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-zjDZJOUjnEQ03rmo5CdSY1emE6YohOPlf7SKuvNLuV0="; + sha256 = "sha256-2iOAa0f0C3tS4oLrSJYjGnuoziPFxcQzXZLqENQq5PY="; }; - cargoSha256 = "sha256-xSJ5rx8k+my0NeGYHZyvDzbM7uMdbViT7Ou9a9JACfs="; + cargoSha256 = "sha256-7wjaakyh27U7jjQQ6wNKR4lKQ7Y/+EEfLCfjVojk3TU="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index b4e0364d0861..c8021a74441c 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.26"; + version = "0.1.27"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7QTlbZZcWZx/E2jYYu0A6kBbScmCml0wpJ17tqLYg90="; + sha256 = "sha256-nxcrllAoS/1e5hFURtrB9e6zyHnot90PFAuyVCsO4lY="; }; - cargoSha256 = "sha256-E9AouGvZTg3wD/loc80Cz933oEnWMSqwQEYTU+NPtjM="; + cargoSha256 = "sha256-AV3fgKloQ/9UEWjYRI4gENSqilhFlpbUrXhXREytcWc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-valgrind/default.nix b/pkgs/development/tools/rust/cargo-valgrind/default.nix index e1f26dc02b2e..ac54657c8af0 100644 --- a/pkgs/development/tools/rust/cargo-valgrind/default.nix +++ b/pkgs/development/tools/rust/cargo-valgrind/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-valgrind"; - version = "2.0.1"; + version = "2.0.3"; src = fetchFromGitHub { owner = "jfrimmel"; repo = "cargo-valgrind"; rev = version; - sha256 = "sha256-PltYUU2O/D1PrU+K8JN4+aUVLzHCeNyIsXMU6HLodXE="; + sha256 = "sha256-PEGDao010COqSJGha7GQvR7vNOV+C7faduijVNjB5DE="; }; - cargoSha256 = "sha256-XiQGkZ6pfyGkNPjpcPoY66qBl7ABTcRHCBjgmXSRrL0="; + cargoSha256 = "sha256-00WUYrkKKJOEN9jXKQ3YraTq89U+3djdvLRuZSbeNHk="; passthru = { updateScript = nix-update-script { diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index e8d62c9252f3..506c71808a05 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.6.2"; + version = "0.6.5"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; rev = "v${version}"; - sha256 = "01whdjryz6zjsk4149h72w5xdjnkpcn5daf0xnsb59b0q38hjgg9"; + sha256 = "sha256-bnceN47OFGlxs3ibcKoZFjoTgXRQxA2ZqxnthJ/fsqE="; }; - cargoSha256 = "036a50shzl6wdjk5wypkacx1kjwbyb4x1aqhbzgjgpxxxrf0lj16"; + cargoSha256 = "sha256-qMPJC61ZVW9olMgNnGrvcQ/je4se4J5gOVoaOpNMUo8="; meta = with lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 69963ea7d1fa..6e8f67bd0a54 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec { description = "A project for generating C bindings from Rust code"; homepage = "https://github.com/eqrion/cbindgen"; license = licenses.mpl20; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix new file mode 100644 index 000000000000..aabb8b94c810 --- /dev/null +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +, runCommand +, fetchCrate +, rustPlatform +, Security +, openssl +, pkg-config +, SystemConfiguration +, libiconv +}: + +rustPlatform.buildRustPackage rec { + pname = "duckscript_cli"; + version = "0.8.10"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-cMvcCX8ViCcUFMuxAPo3/wxXvg5swAcBrLx1x7lSwvM="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; + + cargoSha256 = "sha256-8ywMLXFmdq119K/hl1hpsVhzG+nrdO4eux3lAqUjB+A="; + + meta = with lib; { + description = "Simple, extendable and embeddable scripting language."; + homepage = "https://github.com/sagiegurari/duckscript"; + license = licenses.asl20; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 3cbf9c404c68..204654eb0e78 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.11.3"; + version = "0.12.9"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-jWkrjFQg0EqM+e/IT2n2E4lGL2kT/Wz7r5BLlzvWSO0="; + hash = "sha256-FskCBviLl1yafPOlsp/IjaEOlGUuWLcGlxDrNA/qf8k="; }; - cargoHash = "sha256-+kXwMGeE2HD59EU0Dzvg8I6LcHiPV7SKSFqnCTfkKwY="; + cargoHash = "sha256-zakSQptKK/X/8MDJxRUHTDIGPh77cq5PrOmPEneD0YM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/probe-rs-cli/default.nix b/pkgs/development/tools/rust/probe-rs-cli/default.nix new file mode 100644 index 000000000000..4978c4a3c3e6 --- /dev/null +++ b/pkgs/development/tools/rust/probe-rs-cli/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, rustPlatform, fetchCrate, pkg-config, libusb1, AppKit }: + +rustPlatform.buildRustPackage rec { + pname = "probe-rs-cli"; + version = "0.12.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-XYrB/aKuFCe0FNe6N9vqDdr408tAiN6YvT5BL6lCxmU="; + }; + + cargoSha256 = "sha256-aXSJMSGNl2fzob1j/qiPHHZLisYQeU1gUO5cYbzSHYA="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; + + meta = with lib; { + description = "CLI tool for on-chip debugging and flashing of ARM chips"; + homepage = "https://probe.rs/"; + changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ xgroleau ]; + }; +} diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index 2626de0f84ba..a668fdd11725 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -3,14 +3,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.3.1"; + version = "0.3.2"; src = fetchCrate { inherit pname version; - sha256 = "1nfbpdx378p988q75hka9r8zp3xb9zy3dnagcxmha6dca5dhgsdm"; + sha256 = "sha256-SXA77LXM1SuBJ8BH+ahwJl/3gWsCbdLXBiHZdJySWq0="; }; - cargoSha256 = "05p3vmar00215x4mwsvs5knf4wrwmpq52rmbbi6b4qaqs3gqaghy"; + cargoSha256 = "sha256-e9POSuA/I7IUKUOxMTfCWxNn0AicojpGQpxamzmHa7g="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/knurling-rs/probe-run"; changelog = "https://github.com/knurling-rs/probe-run/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ hoverbear ]; + maintainers = with maintainers; [ hoverbear newam ]; }; } diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 164e57e77490..f155fdbaf788 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-12-27"; - cargoSha256 = "sha256-yok7kLcvKvDwrdgJR0540QLJi5/zXi0NyZxhtoQ8Xno="; + version = "2022-03-07"; + cargoSha256 = "sha256-geMzdo5frW5VkuTwBHKHXCTJZrHDUIRSTs2kkCfA5Vc="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-/195+NsV6Mku2roi8zVy4dw8QGL6rQcnPcQ29Os8oqs="; + sha256 = "sha256-/qKh4utesAjlyG8A3hEmSx+HBgh48Uje6ZRtUGz5f0g="; }; patches = [ diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh index 920b36a5131e..000a728a2b25 100755 --- a/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -1,5 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq nix-prefetch libarchive +# shellcheck shell=bash set -euo pipefail cd "$(dirname "$0")" owner=rust-analyzer diff --git a/pkgs/development/tools/rust/rust-script/default.nix b/pkgs/development/tools/rust/rust-script/default.nix index 2839c2287f89..416506367710 100644 --- a/pkgs/development/tools/rust/rust-script/default.nix +++ b/pkgs/development/tools/rust/rust-script/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-script"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "fornwall"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CYeTt6PzVGu62/GJB+gUlOXG2bs4RV0LWECF4CN3Uic="; + sha256 = "sha256-WcvRkp57VyBB5gQgamFoR6wK1cRJ+3hQqixOBgeapJU="; }; - cargoSha256 = "sha256-IUzaVeOTBAOo/jkDytk6qc7VatKX75l1yZy99iSIqyE="; + cargoSha256 = "sha256-qJIftByppOrT4g3sxmKRSLhxtpAW4eXWX0FhmMDJNu0="; # tests require network access doCheck = false; diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index e86380c53e76..005c5cfc4749 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - sha256 = "sha256-OBIuURj0C/ws71KTGN9EbMwN4QsGMEdgoWyctmHaHjQ="; + sha256 = "sha256-Tz7YzGkQUwH0U14dvsttP2GpnM9kign6L9PkAVs3dEc="; }; - cargoSha256 = "sha256-9+I4mi7w1WK2NkmN65EtC52KtSZR9GjrHCPE9w82IXw="; + cargoSha256 = "sha256-EKuRaVxwotgTPj95GJnrQGbulsFPClSettwS5f0TzoM="; doCheck = false; cargoBuildFlags = [ "-p sqlx-cli" ]; diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index c1b47d901980..6a442424c4f7 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "3.3.1"; + version = "3.4.3"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "hEfy8hNuWin7mKXs9yD9bEKHCVNuxrz5qasTeLOi1zY="; + outputHash = "FWGvhKK/VnvetnHS35/z1errYTRZCrcfWyEAHlhKApk="; }; in stdenv.mkDerivation { diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix index 438555998fde..77928a1f22a5 100644 --- a/pkgs/development/tools/scenebuilder/default.nix +++ b/pkgs/development/tools/scenebuilder/default.nix @@ -64,13 +64,13 @@ let ''; desktopItem = makeDesktopItem { - name = "Scene Builder"; + name = "scenebuilder"; exec = "scenebuilder"; icon = "scenebuilder"; comment = "A visual, drag'n'drop, layout tool for designing JavaFX application user interfaces."; - desktopName = pname; - mimeType = "application/java;application/java-vm;application/java-archive"; - categories = "Development"; + desktopName = "Scene Builder"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/scenic-view/default.nix b/pkgs/development/tools/scenic-view/default.nix index 6dd3e11b6095..1322cfc751a8 100644 --- a/pkgs/development/tools/scenic-view/default.nix +++ b/pkgs/development/tools/scenic-view/default.nix @@ -66,8 +66,8 @@ let desktopName = pname; exec = pname; comment = "JavaFx application to visualize and modify the scenegraph of running JavaFx applications."; - mimeType = "application/java;application/java-vm;application/java-archive"; - categories = "Development"; + mimeTypes = [ "application/java" "application/java-vm" "application/java-archive" ]; + categories = [ "Development" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index 3ec4163ac442..c1c5bbee0ac3 100644 --- a/pkgs/development/tools/sd-local/default.nix +++ b/pkgs/development/tools/sd-local/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.32"; + version = "1.0.40"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4VKTp4q2CoIWQTiSgs254deafuowiTpuLVJ79nmqAaA="; + sha256 = "sha256-/b9ZmwTw9DbdO0KI7rfT0YW0Xo2cxfwhk1TEfTe3ySU="; }; - vendorSha256 = "sha256-4xuWehRrmVdS2F6r00LZLKq/oHlWqCTQ/jYUKeIJ6DI="; + vendorSha256 = "sha256-43hcIIGqBscMjQzaIGdMqV5lq3od4Ls4TJdTeFGtu5Y="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix index dd936781d9d9..37071321f510 100644 --- a/pkgs/development/tools/selene/default.nix +++ b/pkgs/development/tools/selene/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-tA1exZ97N2tAagAljt+MOSGh6objOiqbZXUaBZ62Sls="; + sha256 = "sha256-S0EeFJS90bzQ7C+hN4CyZ7l9wmizT2d3P6utshI5JWs="; }; - cargoSha256 = "sha256-4vCKiTWwnibNK6/S1GOYRurgm2Aq1e9o4rAmp0hqGeA="; + cargoSha256 = "sha256-3J1Q595LxAI0LBP4/cLHDrMbZBnoA2+OSr8/erQcN+0="; nativeBuildInputs = lib.optional robloxSupport pkg-config; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index c47cddea5867..a75488a229df 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, unzip, makeWrapper , cairo, fontconfig, freetype, gdk-pixbuf, glib -, glibc, gtk2, libX11, nspr, nss, pango, gconf +, glibc, gtk2, libX11, nspr, nss, pango , libxcb, libXi, libXrender, libXext, dbus , testVersion, chromedriver }: @@ -30,9 +30,9 @@ let libs = lib.makeLibraryPath [ stdenv.cc.cc.lib cairo fontconfig freetype - gdk-pixbuf glib gtk2 gconf + gdk-pixbuf glib gtk2 libX11 nspr nss pango libXrender - gconf libxcb libXext libXi + libxcb libXext libXi dbus ]; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index b029e7711a3e..975a040b8bc3 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -2,12 +2,12 @@ with lib; let - name = "selendroid-standalone-${version}"; + pname = "selendroid-standalone"; pluginName = "selendroid-grid-plugin-${version}"; version = "0.17.0"; srcs = { jar = fetchurl { - url = "https://github.com/selendroid/selendroid/releases/download/${version}/${name}-with-dependencies.jar"; + url = "https://github.com/selendroid/selendroid/releases/download/${version}/selendroid-standalone-${version}-with-dependencies.jar"; sha256 = "10lxdsgp711pv8r6dk2aagnbvnn1b25zfqjvz7plc73zqhx1dxvw"; }; gridPlugin = fetchurl { @@ -17,9 +17,7 @@ let }; in stdenv.mkDerivation { - - inherit name; - inherit version; + inherit pname version; dontUnpack = true; @@ -28,11 +26,11 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/share/lib/selendroid - cp ${srcs.jar} $out/share/lib/selendroid/${name}.jar + cp ${srcs.jar} $out/share/lib/selendroid/selendroid-standalone-${version}.jar cp ${srcs.gridPlugin} $out/share/lib/selendroid/${pluginName}.jar makeWrapper ${jdk}/bin/java $out/bin/selendroid \ - --add-flags "-jar $out/share/lib/selendroid/${name}.jar" + --add-flags "-jar $out/share/lib/selendroid/selendroid-standalone-${version}.jar" makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \ --add-flags "-Dfile.encoding=UTF-8" \ --add-flags "-cp ${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar:$out/share/lib/selendroid/${pluginName}.jar" \ diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index a3e176216216..2fb0f1ebbeba 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "1.72.0"; + version = "1.74.2"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-2Aj2Y0c8JR8s6Ek7sZfU+5RENkoCVSAxtOvkHilfb48="; + sha256 = "sha256-1A/c5HiXtT6xUTxVInv9DbbCsqpu8iCJ7I0A9wFeaQ0="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-sSIQ7Wa0otbq82WELxP3oFYa1FoaoZz2jCB59Ob6zNM="; + cargoSha256 = "sha256-z++t+Zt40az11z/xhobvvbbSNUBpnMzqlRzoOuYgY2U="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/pkgs/development/tools/shellharden/default.nix b/pkgs/development/tools/shellharden/default.nix index d444a3685c5c..ee56e58f6ca9 100644 --- a/pkgs/development/tools/shellharden/default.nix +++ b/pkgs/development/tools/shellharden/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shellharden"; - version = "4.1.3"; + version = "4.2.0"; src = fetchFromGitHub { owner = "anordal"; repo = pname; rev = "v${version}"; - sha256 = "04pgmkaqjb1lmlwjjipcrqh9qcyjjkr39vi3h5fl9sr71c8g7dnd"; + sha256 = "081b51h88hhyzn9vb9pcszz1wfdj73xwsyfn2ygz708kabzqpvdl"; }; - cargoSha256 = "0bjqgw49msl288yfa7bl31bfa9kdy4zh1q3j0lyw4vvkv2r14pf5"; + cargoSha256 = "1gwlmds417szwvywvm19wv60a83inp52sf46sd05x5vahb8gv8hg"; postPatch = "patchShebangs moduletests/run"; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 2a6154927a5f..4f286cb22d77 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "skaffold"; - version = "1.35.2"; + version = "1.37.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "sha256-s1gkfgpQhmXgbU0iGu71a+cMQsInGTf7GUb8h2SK9qs="; + sha256 = "sha256-mS+q+WOdEMMHjoqoIlDOqkoaRRLlou7FbMjC436k96A="; }; - vendorSha256 = "sha256-jr4HEs2mTRPNAiV/OWUnjYyQ1uSUJfVOTNCRi/18tEo="; + vendorSha256 = "sha256-LiNnTAI7iJkWL657eBw5OsCdvgWE2ZFZ3e+8vJtMhoE="; subPackages = ["cmd/skaffold"]; diff --git a/pkgs/development/tools/skjold/default.nix b/pkgs/development/tools/skjold/default.nix new file mode 100644 index 000000000000..173de27d945e --- /dev/null +++ b/pkgs/development/tools/skjold/default.nix @@ -0,0 +1,79 @@ +{ lib +, fetchFromGitHub +, fetchpatch +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "skjold"; + version = "0.4.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "twu"; + repo = pname; + rev = "v${version}"; + hash = "sha256-xz6N7/LS3wOymh9tet8OLgsSaretzuMU4hQd+LeUPJ4="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + packaging + pyyaml + toml + ]; + + checkInputs = with python3.pkgs; [ + pytest-mock + pytest-watch + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/twu/skjold/pull/91 + (fetchpatch { + name = "switch-poetry-core.patch"; + url = "https://github.com/twu/skjold/commit/b341748c9b11798b6a5182d659a651b0f200c6f5.patch"; + sha256 = "sha256-FTZTbIudO6lYO9tLD4Lh1h5zsTeKYtflR2tbbHZ5auM="; + }) + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'packaging = "^21.0"' 'packaging = "*"' \ + --replace 'pyyaml = "^5.3"' 'pyyaml = "*"' + ''; + + disabledTestPaths = [ + # Too sensitive to pass + "tests/test_cli.py" + ]; + + disabledTests = [ + # Requires network access + "pyup-werkzeug" + "test_ensure_accessing_advisories_triggers_update" + "test_ensure_accessing_advisories_triggers_update" + "test_ensure_gemnasium_update" + "test_ensure_missing_github_token_raises_usage_error" + "test_ensure_pypi_advisory_db_update" + "test_ensure_source_is_affected_single" + "test_osv_advisory_with_vulnerable_package_via_osv_api" + "urllib3" + ]; + + pythonImportsCheck = [ + "skjold" + ]; + + meta = with lib; { + description = "Tool to Python dependencies against security advisory databases"; + homepage = "https://github.com/twu/skjold"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 7b9a727c2ef0..6618c0248514 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.5.2"; + version = "1.7.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-KleTvRQwQFr4rrRXFW2z4N7DXIT920O2gig6wmOFIKs="; + sha256 = "sha256-sbe16IcHkhsiBznsMKtG/xYJYJfJS6aZ34++QhkGTTc="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 7d88df2feb03..aa58b37773ef 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.ralith ]; }; } diff --git a/pkgs/development/tools/sslmate-agent/default.nix b/pkgs/development/tools/sslmate-agent/default.nix new file mode 100644 index 000000000000..ecbaeb816f00 --- /dev/null +++ b/pkgs/development/tools/sslmate-agent/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, dpkg, autoPatchelfHook }: + +stdenv.mkDerivation rec { + pname = "sslmate-agent"; + version = "1.99.11"; + + src = fetchurl { + url = "https://packages.sslmate.com/debian/pool/sslmate2/s/sslmate-client/${pname}_${version}-1_amd64.deb"; + sha256 = "sha256-LBiZI0pGAFWnvTigEhtkhHq4FGdbYiMzjLheMuP0YTU="; + }; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + ]; + + unpackCmd = '' + dpkg-deb -x ${src} ./sslmate-agent-${pname} + ''; + + installPhase = '' + runHook preInstall + + # Not moving etc because it only contains init.rd setttings + mv usr $out + mv lib $out + + substituteInPlace $out/lib/systemd/system/sslmate-agent.service \ + --replace "/usr/s" "$out/" + + runHook postInstall + ''; + + meta = with lib; { + description = "Daemon for managing SSL/TLS certificates on a server"; + homepage = "https://sslmate.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 752803ee05c2..e21f058b8a06 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -1,30 +1,26 @@ { fetchFromGitHub , lib , rustPlatform -, stdenvNoCC , lua52Support ? true , luauSupport ? false }: rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.11.3"; + version = "0.12.5"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9V8vuFfyEdSzOG3Azk/e55N+Oh1VtMgcM+/PEMwJ6DI="; + sha256 = "sha256-4tQQTTAdIAhlkBJevwwwGXOKd6bJJOyG4nlbCv7909Y="; }; - cargoSha256 = "sha256-PrZojkObidzzVv6KwFtI1QUGj5UB5TiMmzdBKq45Ci4="; + cargoSha256 = "sha256-DGe2lB8xZgY9ikTsIHDOdHzTyHfDaSlmy8FU/S9FDCI="; buildFeatures = lib.optional lua52Support "lua52" ++ lib.optional luauSupport "luau"; - # test_standard fails on darwin - doCheck = !stdenvNoCC.isDarwin; - meta = with lib; { description = "An opinionated Lua code formatter"; homepage = "https://github.com/johnnymorganz/stylua"; diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index ee75f2e081bc..88fa62903dd8 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "2.6.0"; + version = "2.6.7"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-8Vfk6B85anlUf09cc08hOGujbcVCMqgEJ1PTxX6llrk="; + sha256 = "sha256-m9vtopRjxT9Re8pDdzfFUpg3zYAFE8zqFemgaNAbsvM="; fetchSubmodules = true; }; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { description = "Lua Language Server coded by Lua "; homepage = "https://github.com/sumneko/lua-language-server"; license = licenses.mit; - maintainers = with maintainers; [ mjlbach ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "lua-language-server"; }; diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 0c33e170f954..ebb07ec2b49c 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.2.1"; - vendorSha256 = "sha256-vnevuJoDiAx/Z6uKO/SX3UV3j/jsXXNlnui6Nzm+tBA="; + version = "5.4.2"; + vendorSha256 = "sha256-MlsgII1QybyW+B7DGbSyn7VQ36n29yOC0pZnaemEHO8="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-51TkiOf3QkwuLv3l+aj5r5tgpDD/VglqeAjliCm5E5M="; + sha256 = "sha256-Ci523YoocpCexbXMg3PjQ/x8z/STWt+nro64l+ckKzM="; }; # Tests requires network access diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/development/tools/tabnine/default.nix index c1a069d36f2d..1209f371a42f 100644 --- a/pkgs/development/tools/tabnine/default.nix +++ b/pkgs/development/tools/tabnine/default.nix @@ -1,17 +1,19 @@ { stdenv, lib, fetchurl, unzip }: let + # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` + version = "4.0.60"; supportedPlatforms = { "x86_64-linux" = { name = "x86_64-unknown-linux-musl"; - sha256 = "sha256-On+Sokm2+BV3JbIwK8oPO6882FOWBlgSaAp3VAyR+RM="; + sha256 = "sha256-v5UxRMDDQxpqIKMe9mYMXcpWiacdXzFfaQ6bgab/WmQ="; }; "x86_64-darwin" = { name = "x86_64-apple-darwin"; - sha256 = "sha256-4YCm42mVcsEvY4I5MWrnbfgUIU7KUIrEirvjN8ISIr0="; + sha256 = "sha256-vFMMzMatuu1TY6dnBXycv0HxvkOj4Axfx8p0VW0hOic="; }; "aarch64-darwin" = { name = "aarch64-apple-darwin"; - sha256 = "sha256-HN4o5bGX389eAR7ea5EY1JlId8q4lSPGJ4cZo9c2aP4="; + sha256 = "sha256-DUeDQLtvSY7W2nG60UunluCSO0ijJP2CYxpRIZA4LTE="; }; }; platform = @@ -20,10 +22,9 @@ let else throw "Not supported on ${stdenv.hostPlatform.system}"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tabnine"; - # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` - version = "3.7.25"; + inherit version; src = fetchurl { url = "https://update.tabnine.com/bundles/${version}/${platform.name}/TabNine.zip"; @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { homepage = "https://tabnine.com"; description = "Smart Compose for code that uses deep learning to help you write code faster"; license = licenses.unfree; - platforms = [ "x86_64-darwin" "aarch64-darwin" "x86_64-linux" ]; + platforms = attrNames supportedPlatforms; maintainers = with maintainers; [ lovesegfault ]; }; } diff --git a/pkgs/development/tools/tokio-console/default.nix b/pkgs/development/tools/tokio-console/default.nix index f04de27f1c24..6ff132e8146a 100644 --- a/pkgs/development/tools/tokio-console/default.nix +++ b/pkgs/development/tools/tokio-console/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "tokio-console"; - version = "0.1.0"; + version = "0.1.3"; src = fetchFromGitHub { owner = "tokio-rs"; repo = "console"; rev = "tokio-console-v${version}"; - sha256 = "sha256-1wxRTdDmgTlGJ3W1txDA/3Rnccs3KBw55vprrGaVnkg="; + sha256 = "sha256-v9BxfBLRJug/1AgvDV7P5AOXwZfCu1mNgJjhbipoZNg="; }; - cargoSha256 = "sha256-RScu5V55OowwWHi3MLjW8DPlTMA/IEBYFt4VUDUHPKo="; + cargoSha256 = "sha256-584EC9x7tJE3pHqgQVh6LWKuCgLXuBBEnaPvo1A8RIs="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/development/tools/toml2json/default.nix b/pkgs/development/tools/toml2json/default.nix new file mode 100644 index 000000000000..0287b75b362f --- /dev/null +++ b/pkgs/development/tools/toml2json/default.nix @@ -0,0 +1,20 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "toml2json"; + version = "1.3.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-TxTxKHf5g+mBXDq147T5tuwCqyfyoz6Mj55g1tlgRDY="; + }; + + cargoHash = "sha256-EYp30TMIpzSCkPIqqdc7sGpfaWs9OLi9ey7DoPE4jzI="; + + meta = with lib; { + description = "A very small CLI for converting TOML to JSON"; + homepage = "https://github.com/woodruffw/toml2json"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ rvarago ]; + }; +} diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 18533469a0c9..23b6f535fc36 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.3.5"; + version = "1.5.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zL9Ylrl541RCSOliH+X7TfvRZyEXvISsH3N1agjoC8U="; + sha256 = "sha256-It112+60ze+5rvq3TYlIU+X4lJ4pgdCO7Gb1ADArDvY="; }; - cargoSha256 = "sha256-qc32MX56/0JaHx/x/5em3SoNi6YM5nduVLrDOQbMZDg="; + cargoSha256 = "sha256-yiy1xLxCdjIzqXUlkxWoOZ7cPZzJgDuTUvNHpnnTnwE="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/udis86/default.nix b/pkgs/development/tools/udis86/default.nix index dd4ad058c8da..aec41c7c97a6 100644 --- a/pkgs/development/tools/udis86/default.nix +++ b/pkgs/development/tools/udis86/default.nix @@ -1,17 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, python2 }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, python3 +}: stdenv.mkDerivation rec { pname = "udis86"; - version = "1.7.2"; + version = "unstable-2014-12-25"; src = fetchFromGitHub { owner = "vmt"; repo = "udis86"; - rev = "v${version}"; - sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1"; + rev = "56ff6c87c11de0ffa725b14339004820556e343d"; + hash = "sha256-bmm1rgzZeStQJXEmcT8vnplsnmgN3LJlYs7COmqsDU8="; }; - nativeBuildInputs = [ autoreconfHook python2 ]; + patches = [ + (fetchpatch { + name = "support-python3-for-building"; + url = "https://github.com/vmt/udis86/commit/3c05ce60372cb2eba39d6eb87ac05af8a664e1b1.patch"; + hash = "sha256-uF4Cwt7UMkyd0RX6cCMQt9xvkkUNQvTDH/Z/6nHtVT8="; + }) + ]; + + nativeBuildInputs = [ autoreconfHook python3 ]; configureFlags = [ "--enable-shared" diff --git a/pkgs/development/tools/uniffi-bindgen/Cargo.lock b/pkgs/development/tools/uniffi-bindgen/Cargo.lock new file mode 100644 index 000000000000..4de3b80928aa --- /dev/null +++ b/pkgs/development/tools/uniffi-bindgen/Cargo.lock @@ -0,0 +1,837 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anyhow" +version = "1.0.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "askama" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" +dependencies = [ + "askama_derive", + "askama_escape", + "askama_shared", +] + +[[package]] +name = "askama_derive" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" +dependencies = [ + "askama_shared", + "proc-macro2", + "syn", +] + +[[package]] +name = "askama_escape" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a1bb320f97e6edf9f756bf015900038e43c7700e059688e5724a928c8f3b8d5" + +[[package]] +name = "askama_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" +dependencies = [ + "askama_escape", + "nom 6.2.1", + "proc-macro2", + "quote", + "serde", + "syn", + "toml", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitvec" +version = "0.19.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + +[[package]] +name = "callbacks" +version = "0.17.0" +dependencies = [ + "lazy_static", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "camino" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3132262930b0522068049f5870a856ab8affc80c70d08b6ecb785771a6fc23" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo-platform" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +dependencies = [ + "serde", +] + +[[package]] +name = "cargo_metadata" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "semver-parser", + "serde", + "serde_json", +] + +[[package]] +name = "cdylib-dependency" +version = "0.17.0" + +[[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 = [ + "bitflags", + "textwrap", + "unicode-width", +] + +[[package]] +name = "coverall" +version = "0.17.0" +dependencies = [ + "lazy_static", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "crate_one" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "crate_two" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "crate_one", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "custom-types" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "serde_json", + "uniffi", + "uniffi_build", + "uniffi_macros", + "url", +] + +[[package]] +name = "ext-types-guid" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "serde_json", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "ext-types-lib" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "custom-types", + "ext-types-guid", + "uniffi", + "uniffi-one", + "uniffi_build", + "uniffi_macros", + "url", +] + +[[package]] +name = "external_types_lib" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "crate_one", + "crate_two", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "ffi-crate" +version = "0.17.0" +dependencies = [ + "cdylib-dependency", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[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 = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "i1015-fully-qualified-types" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "i356-enum-without-int-helpers" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[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 = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + +[[package]] +name = "kotlin-experimental-unsigned-types" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lexical-core" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +dependencies = [ + "arrayvec", + "bitflags", + "cfg-if", + "ryu", + "static_assertions", +] + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "memchr" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" + +[[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 = "6.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6" +dependencies = [ + "bitvec", + "funty", + "lexical-core", + "memchr", + "version_check", +] + +[[package]] +name = "omit_argument_labels" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "once_cell" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" + +[[package]] +name = "paste" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" + +[[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 = "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 = "radium" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" + +[[package]] +name = "ryu" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", + "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.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "syn" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "termcolor" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +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.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 = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "trybuild" +version = "1.0.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099a24e67e2b4083a6d0beb5a98e274c3160edfb879d71cd2cd14da93786a93b" +dependencies = [ + "glob", + "once_cell", + "serde", + "serde_json", + "termcolor", + "toml", +] + +[[package]] +name = "ucd-trie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" + +[[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 = "uniffi" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "cargo_metadata", + "lazy_static", + "log", + "paste", + "static_assertions", + "trybuild", + "uniffi_bindgen", +] + +[[package]] +name = "uniffi-example-arithmetic" +version = "0.17.0" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-callbacks" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-geometry" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-rondpoint" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-sprites" +version = "0.17.0" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-example-todolist" +version = "0.17.0" +dependencies = [ + "lazy_static", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-time" +version = "0.17.0" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-one" +version = "0.17.0" +dependencies = [ + "anyhow", + "bytes", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi_bindgen" +version = "0.17.0" +dependencies = [ + "anyhow", + "askama", + "cargo_metadata", + "clap", + "heck", + "paste", + "serde", + "toml", + "weedle", +] + +[[package]] +name = "uniffi_build" +version = "0.17.0" +dependencies = [ + "anyhow", + "uniffi_bindgen", +] + +[[package]] +name = "uniffi_macros" +version = "0.17.0" +dependencies = [ + "glob", + "proc-macro2", + "quote", + "syn", + "uniffi_build", +] + +[[package]] +name = "uniffi_uitests" +version = "0.17.0" +dependencies = [ + "trybuild", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[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 = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "weedle" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "610950904727748ca09682e857f0d6d6437f0ca862f32f9229edba8cec8b2635" +dependencies = [ + "nom 5.1.2", +] + +[[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 = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/development/tools/uniffi-bindgen/default.nix b/pkgs/development/tools/uniffi-bindgen/default.nix new file mode 100644 index 000000000000..59ecd71a4114 --- /dev/null +++ b/pkgs/development/tools/uniffi-bindgen/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, ktlint +, yapf +, rubocop +, rustfmt +, makeWrapper +}: + +rustPlatform.buildRustPackage rec { + pname = "uniffi-bindgen"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "uniffi-rs"; + rev = "v${version}"; + hash = "sha256-EGyJrW0U/dnKT7OWgd8LehCyvj6mxud3QWbBVyhoK4Y="; + }; + + cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; + cargoHash = "sha256-Fw+yCAI32NdFKJGPuNU6t0FiEfohoVD3VQfInNJuooI="; + + cargoBuildFlags = [ "-p uniffi_bindgen" ]; + cargoTestFlags = [ "-p uniffi_bindgen" ]; + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + postFixup = '' + wrapProgram "$out/bin/uniffi-bindgen" \ + --suffix PATH : ${lib.strings.makeBinPath [ rustfmt ktlint yapf rubocop ] } + ''; + + meta = with lib; { + description = "Toolkit for building cross-platform software components in Rust"; + homepage = "https://mozilla.github.io/uniffi-rs/"; + license = licenses.mpl20; + maintainers = with maintainers; [ vtuan10 ]; + }; +} diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index cf3c17823dc0..ad0e2c998e6b 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -12,7 +12,7 @@ in appimageTools.wrapType2 rec { inherit name src; extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk-pixbuf glib libGL libGLU nss nspr - alsa-lib cups gnome2.GConf libcap fontconfig freetype pango + alsa-lib cups libcap fontconfig freetype pango cairo dbus dbus-glib libdbusmenu libdbusmenu-gtk2 expat zlib libpng12 udev tbb libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5 diff --git a/pkgs/development/tools/vagrant/gemset_libvirt.nix b/pkgs/development/tools/vagrant/gemset_libvirt.nix index 2d59b4c2cf8c..0cec878d3047 100644 --- a/pkgs/development/tools/vagrant/gemset_libvirt.nix +++ b/pkgs/development/tools/vagrant/gemset_libvirt.nix @@ -14,10 +14,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1759s0rz6qgsw86dds1z4jzb3fvizqsk11j5q6z7lc5n404w6i23"; + sha256 = "1yff4s5b8wcrk9ldils2k84l46m9nxr0my0wxchzdmgjbjdfsvww"; type = "gem"; }; - version = "0.79.0"; + version = "0.92.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bwqm9n69y5y0a5iickr358z7w4hml3flqwfz8b7cnj1ldabhnjn"; + sha256 = "06m6hxq8vspx9h9bgc2s19m56jzasvl45vblrfv1q5h1qg1k6amw"; type = "gem"; }; - version = "2.2.3"; + version = "2.3.0"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s62ihwxlwgp84xw32wg6hwcx4422v20c7g7azd0xslb91y1ln1r"; + sha256 = "1s8b3bsajwjyrjs53h0nrfrpzzgi8igsrslprhr6fgl80ig3plld"; type = "gem"; }; - version = "0.8.0"; + version = "0.9.0"; }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; @@ -58,30 +58,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "043lwdw2wsi6d55ifk0w3izi5l1d1h0alwyr3fixic7b94kc812n"; + sha256 = "1vyyb2429xqzys39xyk2r3fal80qqn397aj2kqsjrgg2y6m59i41"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; formatador = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; + sha256 = "1l06bv4avphbdmr1y4g0rqlczr38k6r65b3zghrbj2ynyhm3xqjl"; type = "gem"; }; - version = "0.2.5"; + version = "1.1.0"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; + sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz"; type = "gem"; }; - version = "2.5.1"; + version = "2.6.1"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -89,30 +89,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; type = "gem"; }; - version = "3.3.1"; + version = "3.4.1"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi"; + sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; type = "gem"; }; - version = "3.2021.0225"; + version = "3.2022.0105"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; type = "gem"; }; - version = "2.5.0"; + version = "2.8.0"; }; multi_json = { groups = ["default"]; @@ -130,40 +130,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p"; + sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; type = "gem"; }; - version = "1.11.2"; + version = "1.13.3"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; type = "gem"; }; - version = "1.5.2"; + version = "1.6.0"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; }; ruby-libvirt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d754d6pgdqyq52pl9hp0x38q1vn3vf9nz4nm5gqdj5i4fw7pba6"; + sha256 = "0rnmbfhdz270fky0cm8w1i73gkrnlf3s1hdkm5yxjkdbvapwvjsd"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.0"; }; vagrant-libvirt = { - dependencies = ["fog-core" "fog-libvirt" "nokogiri"]; + dependencies = ["fog-core" "fog-libvirt" "nokogiri" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07j30w23syvzrhznad9dkh1ks4lzxzi7ak2966b7i7wr4kz8x1hp"; + sha256 = "07fhsgqx9iyni41z1lhfmm4wq6cbiyydkmvmib28jbgyznlxjmzv"; type = "gem"; }; - version = "0.4.0"; + version = "0.7.0"; }; } diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index f9c98bc4fb10..d8f316863200 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "vala-lint"; - version = "unstable-2021-12-28"; + version = "unstable-2022-02-16"; src = fetchFromGitHub { owner = "vala-lang"; repo = "vala-lint"; - rev = "1eeb3538b2a71addd0d8adc9f53ffe80fdfb8ce0"; - sha256 = "sha256-u2VJIDc1yvhbBgdMKL1RijoKEL4Vl8sbrGUYu5t/wJI="; + rev = "2f8a970cbf41ac54d2b4124c9d7db64543031901"; + sha256 = "sha256-jIC9nUWxs4iDpqEQGxl8JrHbBEkz60/elWHqGKQqlX8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index a58a0e95a38f..d6ff0825737a 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.23.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-6f9UF0UgwKG3Mdgy85pW2KVjC8nbnMTwQJqIWxA3Jp4="; + sha256 = "sha256-a/fftMJuN6YnjPP0Gk6bMckoCouwgtxhf23OuyLR5Tk="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index 16926b16e981..365bb920e4ac 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -17,7 +17,8 @@ buildGoModule { sha256 = "0n9pf0i5y59kiiv6dq8h8w1plaz9w6s67rqr2acqgxa45iq36mkh"; }; - vendorSha256 = "1lzhhg9wimn8nfzrrla5bshgk1ghnlsdfmq6iask0zqz311g96bv"; + vendorSha256 = "1xgl4avq0rblzqqpaxl4dwg4ysrhacwhfd21vb0v9ffr3zcpdw9n"; + proxyVendor = true; subPackages = [ "." ]; diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index eb08ce7f0dad..6e839617034d 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mT99flZAAhLSynD/8+fa74Mc3KK8pVs+OOFDYNSBzEE="; + sha256 = "sha256-jcZiCZn6AbrjEhMkJQloLhZmfnxqlZxu5TXqH+dDN0s="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 5568f8c457ac..d049d9946363 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.25"; + version = "1.0.27"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "sha256-2go4HR/z96ONisXBGZDSIB5vXtHvRqBMhHOQTBL5G5w="; + sha256 = "sha256-13et9+yoxoITOO9EEyLMNhG4VCj0jd+JhOlw0DxvwOg="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix new file mode 100644 index 000000000000..875ed794647d --- /dev/null +++ b/pkgs/development/tools/wails/default.nix @@ -0,0 +1,78 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, pkg-config +, makeWrapper +, go +, gcc +, gtk3 +, webkitgtk +, nodejs +, upx +, zlib +}: + +buildGoModule rec { + pname = "wails"; + version = "2.0.0-beta.34"; + + src = fetchFromGitHub { + owner = "wailsapp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-dsDruZSmr8qSNpX8L27tLpNxvdSkc2mfNQLRxN9AnCg="; + } + "/v2"; + + vendorSha256 = "sha256-OaSPpCb2VxMGlkUIg3fyEJhjz256amEfXBX+5WMY3a0="; + + proxyVendor = true; + + subPackages = [ "cmd/wails" ]; + + # These packages are needed to build wails + # and will also need to be used when building a wails app. + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + # Wails apps are built with Go, so we need to be able to + # add it in propagatedBuildInputs. + allowGoReference = true; + + # Following packages are required when wails used as a builder. + propagatedBuildInputs = [ + pkg-config + go + gcc + gtk3 + webkitgtk + nodejs + upx + ]; + + ldflags = [ + "-s" + "-w" + ]; + + # As Wails calls a compiler, certain apps and libraries need to be made available. + postFixup = '' + wrapProgram $out/bin/wails \ + --prefix PATH : ${lib.makeBinPath [ pkg-config go gcc nodejs upx ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 webkitgtk ]} \ + --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \ + --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" + ''; + + doCheck = true; + + meta = with lib; { + description = "Build applications using Go + HTML + CSS + JS"; + homepage = "https://wails.io"; + license = licenses.mit; + maintainers = with maintainers; [ ianmjones ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 4416ce1b6cdc..3a36a00c73ec 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.78"; + version = "0.2.79"; src = fetchCrate { inherit pname version; - sha256 = "sha256-5s+HidnVfDV0AXA+/YcXNGVjv/E9JeK0Ttng4mCVX8M="; + sha256 = "sha256-3kWhhzYmIo/GFieI0i7XVJIZxIaaJHHuDp38k5xcFmI="; }; - cargoSha256 = "sha256-CbtjUFwowP/QqyAMCzmUiSib4EpRhQAmO4ekX00xYGE="; + cargoSha256 = "sha256-xKYdvcrx3a9AKiRU8yJ3JNQp1Q2pEufwo+in82yTV6c="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index 58fef12cd6e8..8f8d03db950b 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -19,7 +19,7 @@ python2Packages.buildPythonApplication rec { comment = "Platform independend Python debugger"; desktopName = "Winpdb"; genericName = "Python Debugger"; - categories = "Development;Debugger;"; + categories = [ "Development" "Debugger" ]; }; # Don't call gnome-terminal with "--disable-factory" flag, which is diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index 85dbc4f731a1..0234c936dc15 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -1,13 +1,12 @@ { lib, python3Packages }: python3Packages.buildPythonApplication rec { - version = "1.2.8"; + version = "1.3.1"; pname = "wllvm"; - name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1d88fzg4ba4r3hwrinnv6agiyj3xxdy4yryb8wz2ml51nc6bi591"; + sha256 = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE="; }; meta = with lib; { diff --git a/pkgs/development/tools/worker-build/default.nix b/pkgs/development/tools/worker-build/default.nix new file mode 100644 index 000000000000..4f6c595ee9bc --- /dev/null +++ b/pkgs/development/tools/worker-build/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "worker-build"; + version = "0.0.9"; + + src = fetchFromGitHub { + owner = "cloudflare"; + repo = "workers-rs"; + rev = "v${version}"; + sha256 = "sha256-nrvnIuLBtdMMBcYm8McOxHc/HHYDrogEG9Ii2Bevl+w="; + }; + + cargoSha256 = "sha256-xLssAmyfHr4EBQ72XZFqybA6ZI1UM2Q2kS5UWmIkteM="; + + buildAndTestSubdir = "worker-build"; + + # missing some module upstream to run the tests + doCheck = false; + + meta = with lib; { + description = "This is a tool to be used as a custom build command for a Cloudflare Workers `workers-rs` project."; + homepage = "https://github.com/cloudflare/worker-rs"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 8d8b1a004d5e..0d828eb8b9ed 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,19 +1,25 @@ -{ stdenv, lib, fetchurl, writeText, php, makeWrapper }: +{ stdenv +, lib +, fetchurl +, formats +, installShellFiles +, makeWrapper +, php +}: + let - version = "2.5.0"; + version = "2.6.0"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; - sha256 = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; + hash = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; }; - ini = writeText "php.ini" '' - [PHP] - memory_limit = -1 ; no limit as composer uses a lot of memory + ini = (formats.ini { }).generate "php.ini" { + PHP.memory_limit = -1; # no limit as composer uses a lot of memory + Phar."phar.readonly" = "Off"; + }; - [Phar] - phar.readonly = Off - ''; in stdenv.mkDerivation rec { pname = "wp-cli"; @@ -21,22 +27,22 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; - sha256 = "sha256-vghT6fRD84SFZgcIcdNE6K2B6x4V0V3PkyS0p14nJ4k="; + hash = "sha256-0WZSjKtgvIIpwGcp5wc4OPu6aNaytXRQTLAniDXIeIg="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildCommand = '' dir=$out/share/wp-cli - mkdir -p $out/bin $dir - install -Dm444 ${src} $dir/wp-cli install -Dm444 ${ini} $dir/php.ini - install -Dm444 ${completion} $out/share/bash-completion/completions/wp + installShellCompletion --bash --name wp ${completion} + mkdir -p $out/bin makeWrapper ${lib.getBin php}/bin/php $out/bin/wp \ --add-flags "-c $dir/php.ini" \ - --add-flags "-f $dir/wp-cli" + --add-flags "-f $dir/wp-cli" \ + --add-flags "--" # this is a very basic run test $out/bin/wp --info >/dev/null diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index a6c2b6db9730..dca054db3fea 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.19.7"; + version = "1.19.10"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Bb4vpmWtSW2E2gr6V+tDsc4P5FJfCLLpzQX2WiVzUg="; + sha256 = "sha256-RKOAs7MRHcGx6BNBml7WQ81bNvdB9ipd0R1ErLTwjTQ="; }; - cargoSha256 = "sha256-iAlRdUMR+64ngRT4icY6sTFFeRt4aShV/hj8PXJ0kEk="; + cargoSha256 = "sha256-9GvKDLuDIW5q1R5g20rtSScv2c0sLSo+hI9LSA4W3M8="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index bef8eb906cf1..95013006010d 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -1,17 +1,16 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "ws"; version = "0.2.1"; - rev = "e9404cb37e339333088b36f6a7909ff3be76931d"; goPackagePath = "github.com/hashrocket/ws"; - src = fetchgit { - inherit rev; - url = "https://github.com/hashrocket/ws"; - sha256 = "192slrz1cj1chzmfrl0d9ai8bq6s4w0iwpvxkhxb9krga7mkp9xb"; + src = fetchFromGitHub { + owner = "hashrocket"; + repo = "ws"; + rev = "e9404cb37e339333088b36f6a7909ff3be76931d"; + sha256 = "sha256-q6c761Evz7Q6nH1fHgEn2uCFokoN0OzqhyxIFn6mWqQ="; }; meta = with lib; { diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 50d29cb4a1d4..0e39a714ccda 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yarn"; - version = "1.22.17"; + version = "1.22.18"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1skzlyv2976bl1063f94422jbjy4ns1nxl622biizq31z4821yvj"; + sha256 = "sha256-gI4v/WPWrNa2i2oct8Ns7bpDzmDCy+c86pGKpNznhh0="; }; buildInputs = [ nodejs ]; diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index b0bf715e66e8..3b30e2a8af03 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -74,11 +74,17 @@ in rec { preBuild ? "", postBuild ? "", workspaceDependencies ? [], # List of yarn packages + packageResolutions ? {}, }: let - extraBuildInputs = (lib.flatten (builtins.map (key: - pkgConfig.${key}.buildInputs or [] - ) (builtins.attrNames pkgConfig))); + extraNativeBuildInputs = + lib.concatMap + (key: pkgConfig.${key}.nativeBuildInputs or []) + (builtins.attrNames pkgConfig); + extraBuildInputs = + lib.concatMap + (key: pkgConfig.${key}.buildInputs or []) + (builtins.attrNames pkgConfig); postInstall = (builtins.map (key: if (pkgConfig.${key} ? postInstall) then @@ -93,7 +99,7 @@ in rec { workspaceJSON = pkgs.writeText "${name}-workspace-package.json" - (builtins.toJSON { private = true; workspaces = ["deps/**"]; }); # scoped packages need second splat + (builtins.toJSON { private = true; workspaces = ["deps/**"]; resolutions = packageResolutions; }); # scoped packages need second splat workspaceDependencyLinks = lib.concatMapStringsSep "\n" (dep: '' @@ -106,7 +112,8 @@ in rec { inherit preBuild postBuild name; dontUnpack = true; dontInstall = true; - buildInputs = [ yarn nodejs git ] ++ extraBuildInputs; + nativeBuildInputs = [ yarn nodejs git ] ++ extraNativeBuildInputs; + buildInputs = extraBuildInputs; configurePhase = lib.optionalString (offlineCache ? outputHash) '' if ! cmp -s ${yarnLock} ${offlineCache}/yarn.lock; then @@ -168,7 +175,9 @@ in rec { let package = lib.importJSON packageJSON; - packageGlobs = package.workspaces; + packageGlobs = if lib.isList package.workspaces then package.workspaces else package.workspaces.packages; + + packageResolutions = package.resolutions or {}; globElemToRegex = lib.replaceStrings ["*"] [".*"]; @@ -217,7 +226,7 @@ in rec { inherit name; value = mkYarnPackage ( builtins.removeAttrs attrs ["packageOverrides"] - // { inherit src packageJSON yarnLock workspaceDependencies; } + // { inherit src packageJSON yarnLock packageResolutions workspaceDependencies; } // lib.attrByPath [name] {} packageOverrides ); }) @@ -239,6 +248,7 @@ in rec { extraBuildInputs ? [], publishBinsFor ? null, workspaceDependencies ? [], # List of yarnPackages + packageResolutions ? {}, ... }@attrs: let @@ -258,7 +268,7 @@ in rec { preBuild = yarnPreBuild; postBuild = yarnPostBuild; workspaceDependencies = workspaceDependenciesTransitive; - inherit packageJSON pname version yarnLock offlineCache yarnFlags pkgConfig; + inherit packageJSON pname version yarnLock offlineCache yarnFlags pkgConfig packageResolutions; }; publishBinsFor_ = unlessNull publishBinsFor [pname]; @@ -292,7 +302,7 @@ in rec { '') workspaceDependenciesTransitive; - in stdenv.mkDerivation (builtins.removeAttrs attrs ["yarnNix" "pkgConfig" "workspaceDependencies"] // { + in stdenv.mkDerivation (builtins.removeAttrs attrs ["yarnNix" "pkgConfig" "workspaceDependencies" "packageResolutions"] // { inherit src pname; name = baseName; diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 59ba7ca8db4e..9f31ce6f9434 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.17.2"; + version = "4.24.2"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-jfb/r4Z8i23A0e4cJqZoG2TPXGVFOf64FfnZy/keAeQ="; + sha256 = "sha256-KuaIGIDXdL0d+Wxy2O78XTSBo+2oIrcizfd2jyXghXc="; }; - vendorSha256 = "sha256-0eaD4oT6DyCWkJ0He4A7ysOEJD8CtFH6diQYBuEOoIk="; + vendorSha256 = "sha256-R40zU0jOc/eIFVDsWG3+4o51iro7Sd7jwtyH/fpWVZs="; doCheck = false; diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 978016369f20..7f8498a3523e 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.36.0"; + version = "0.40.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-/o+SgH0wpQQokzpnlK6Im6K9U3Aax3GHe7IPmVg2etk="; + sha256 = "sha256-DtzdgEHgxoZRSvylq2vLzU1PAk1ETBDpBWFHcIW95r4="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/zld/default.nix b/pkgs/development/tools/zld/default.nix new file mode 100644 index 000000000000..408e3308b658 --- /dev/null +++ b/pkgs/development/tools/zld/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchzip }: + +stdenv.mkDerivation rec { + pname = "zld"; + version = "1.3.3"; + src = fetchzip { + url = "https://github.com/michaeleisel/zld/releases/download/${version}/zld.zip"; + sha256 = "0qb4l7a4vhpnzkgzhw0jivz40jr5gdhqfyynhbkhn7ryh5s52d1p"; + }; + + installPhase = '' + mkdir -p $out/bin + cp zld $out/bin/ + ''; + + meta = with lib; { + description = "A faster version of Apple's linker"; + homepage = "https://github.com/michaeleisel/zld"; + license = licenses.mit; + maintainers = [ maintainers.rgnns ]; + platforms = platforms.darwin; + hydraPlatforms = []; + }; +} diff --git a/pkgs/development/tools/zprint/default.nix b/pkgs/development/tools/zprint/default.nix index d28574637a14..f3f8bae1e8e9 100644 --- a/pkgs/development/tools/zprint/default.nix +++ b/pkgs/development/tools/zprint/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "zprint"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}"; - sha256 = "sha256-av1DsTijNzLdnBjTF2fEFqEM/X2VUVFvNuC09ikeDGM="; + sha256 = "sha256-CaugPTfEGC0IFgYUSHcE3nsnrP5DSXS1becXChbPggQ="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/development/web/bloomrpc/default.nix b/pkgs/development/web/bloomrpc/default.nix new file mode 100644 index 000000000000..1c9ed7c2e10e --- /dev/null +++ b/pkgs/development/web/bloomrpc/default.nix @@ -0,0 +1,48 @@ +{ lib, fetchurl, gsettings-desktop-schemas, gtk3, appimageTools }: + +let + pname = "bloomrpc"; + version = "1.5.3"; + + src = fetchurl { + url = "https://github.com/uw-labs/${pname}/releases/download/${version}/BloomRPC-${version}.AppImage"; + name = "${pname}-${version}.AppImage"; + sha512 = "PebdYDpcplPN5y3mRu1mG6CXenYfYvBXNLgIGEr7ZgKnR5pIaOfJNORSNYSdagdGDb/B1sxuKfX4+4f2cqgb6Q=="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname src version; + }; +in +appimageTools.wrapType2 { + inherit pname src version; + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + multiPkgs = null; # no 32bit needed + extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; + + extraInstallCommands = '' + ln -s $out/bin/${pname}-${version} $out/bin/${pname} + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/${pname}.png \ + $out/share/icons/hicolor/512x512/apps/${pname}.png + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "GUI Client for GRPC Services"; + longDescription = '' + Inspired by Postman and GraphQL Playground BloomRPC aims to provide the simplest + and most efficient developer experience for exploring and querying your GRPC services. + ''; + homepage = "https://github.com/uw-labs/bloomrpc"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ zoedsoupe ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index aea8ba6b19aa..3d58b865126a 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,7 +2,6 @@ , autoPatchelfHook , callPackage , fetchzip -, gnome2 , gtk2 , gtk3 , lib @@ -17,11 +16,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "9.2.0"; + version = "9.5.3"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "sha256-NxmGMHAEVuFl/3YgcHSbg+yWHB2tRpVTWlP5p5nGtPc="; + sha256 = "qK1TvAGiTVmEQ4MpqICDSP9swnpAcE6iGkGJOrPQ1bI="; }; # don't remove runtime deps @@ -38,7 +37,6 @@ stdenv.mkDerivation rec { nss gtk2 alsa-lib - gnome2.GConf gtk3 mesa # for libgbm ]; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index a276907f3772..fa2fe98f76cc 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.18.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ov2zCINh4uH5pvhML1fgpnxFhWs680bdv9oqUESFkpw="; + sha256 = "sha256-BqwiconG5hn5RPV+hlKu6e6+GjZA4Im/dD+no3IduYw="; }; - cargoSha256 = "sha256-qYz5p+3QNA/zir2M9/aWxKYOMYI01OsIWZCJ4njjFPc="; + cargoSha256 = "sha256-q/5AezLQgN7WdGsbHoxX5riJMlxw3cTFhVs5OvCeI5U="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 340f50c64e43..a1ea206fabdc 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.38.1"; + version = "0.40.0"; shas = { - x86_64-linux = "sha256-vRkb5ZrIOYSKa84UbsJD+Oua0wve7f1Yf3kMg/kkYSY="; - aarch64-linux = "sha256-o9btdXct/HpUTXlJc2Ydzj2yo2lSV87uo/VyxaxN0fk="; - x86_64-darwin = "sha256-/J/MpXnzvBv70o8Zjc46yPzBrY309o4kDQ9kZzDfhb4="; - aarch64-darwin = "sha256-y4MJIA2HKPm9iLJSxDw43VHsoY5v2WGp7zEsll/EHhI="; + x86_64-linux = "sha256-VHkopvK6f5lxdFLBywHe0Z+su2g5hgBsLcTxrwFgq0Y="; + aarch64-linux = "sha256-awWjziqqUDAl9fcLADUjytLFds1y93y5gZoOtvReL9w="; + x86_64-darwin = "sha256-WlRnGiJK3iFgTjNzr25rvmmiPAICPRLaD5hbys7MoJA="; + aarch64-darwin = "sha256-zblcAQVwnLQWh85wajg8CalqxycSR+4WGoSC2dnX7jA="; }; } diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index fb1eec870b78..9fe93bac4420 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.260"; + version = "0.0.308"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-xjvZp6LAKVYgZpiSHlfZzZ/OBp/UutjvndM46okC0b4="; + sha256 = "sha256-Di0egdreY3c6kulcvAl4dFfYpIuMocQzHiFW48kJ6u4="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-lwayHq4uByCkiwzRd3lPaSAW4XvKNMVNcN4Cfct74e8="; + vendorSha256 = "sha256-2goglOmcUud9KT5accn/AMe4xEgRN2Ep1qMfQHtlI+Q="; doCheck = false; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 2a888b8056d0..5caacbd0d507 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "4.1.0.M1"; + version = "5.1.4"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "0l99x3g485qjpdd7ga553xpi1s6rq21p8v16qjzqwdhyld961qsr"; + sha256 = "sha256-EoMSnT1MmYGeF82XC7Ed9woe8t+xzYJaylLBVpdFvoI="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 041ceed52881..ae6200df5ef0 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, makeWrapper, fetchurl, dpkg, alsa-lib, atk, cairo, cups, dbus, expat -, fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, mesa, nspr, nss, gtk3 +, fontconfig, freetype, gdk-pixbuf, glib, pango, mesa, nspr, nss, gtk3 , at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext -, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2 +, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, nghttp2 , libudev0-shim, glibc, curl, openssl, autoPatchelfHook }: let @@ -15,12 +15,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2021.7.2"; + version = "2022.1.1"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-HkQWW4h2+XT5Xi4oiIiMPnrRKw+GIyjGMQ5B1NrBARU="; + sha256 = "sha256-AaRiXGdKCzcsY4GEgLr5PO+f7STsR+p7ybGISdJlCVk="; }; nativeBuildInputs = @@ -38,7 +38,6 @@ in stdenv.mkDerivation rec { freetype gdk-pixbuf glib - gnome2.GConf pango gtk3 gsettings-desktop-schemas @@ -54,6 +53,7 @@ in stdenv.mkDerivation rec { libXrender libXtst libxcb + libxshmfence mesa # for libgbm nspr nss diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index a1bd3ecd451b..7a3ec5fe4ae3 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kore"; - version = "4.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "jorisvink"; repo = pname; rev = version; - sha256 = "sha256-w5H1USQ2aladwSFdfYsX925pjCt3QWoXK4HqyEL7rH0="; + sha256 = "sha256-MC4PCjRuAqWuGvNDsZXKohb4HdSWMV0Oc0pZ0rnhG7Y="; }; buildInputs = [ openssl curl postgresql yajl ]; diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix index df343f30785b..a87892c5f147 100644 --- a/pkgs/development/web/lucky-cli/default.nix +++ b/pkgs/development/web/lucky-cli/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "lucky-cli"; - version = "0.26.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "luckyframework"; repo = "lucky_cli"; rev = "v${version}"; - sha256 = "sha256-bZWyAZrAYG45fqmEQYXsk8YLKurpppaahOkALAQXGhY="; + sha256 = "sha256-OmvKd35jR003qQnA/NBI4MjGRw044bYUYa59RKbz+lI="; }; # the integration tests will try to clone a remote repos @@ -35,6 +35,7 @@ crystal.buildCrystalPackage rec { meta = with lib; { description = "A Crystal library for creating and running tasks. Also generates Lucky projects"; + homepage = "https://luckyframework.org/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/development/web/lucky-cli/shard.lock b/pkgs/development/web/lucky-cli/shard.lock index f0808622bcf1..854a755b0df8 100644 --- a/pkgs/development/web/lucky-cli/shard.lock +++ b/pkgs/development/web/lucky-cli/shard.lock @@ -2,13 +2,13 @@ version: 2.0 shards: ameba: git: https://github.com/crystal-ameba/ameba.git - version: 0.14.2 + version: 0.14.3 - future: - git: https://github.com/crystal-community/future.cr.git - version: 0.1.0 + lucky_task: + git: https://github.com/luckyframework/lucky_task.git + version: 0.1.1 teeplate: git: https://github.com/luckyframework/teeplate.git - version: 0.8.2 + version: 0.8.5 diff --git a/pkgs/development/web/lucky-cli/shards.nix b/pkgs/development/web/lucky-cli/shards.nix index b4f100518b3f..78c0b4b13385 100644 --- a/pkgs/development/web/lucky-cli/shards.nix +++ b/pkgs/development/web/lucky-cli/shards.nix @@ -2,19 +2,19 @@ ameba = { owner = "crystal-ameba"; repo = "ameba"; - rev = "v0.14.2"; - sha256 = "1l1q1icpzg1zvhfj8948w36j7ikaj7w816677zi29vi6y2d1dmf2"; + rev = "v0.14.3"; + sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1"; }; - future = { - owner = "crystal-community"; - repo = "future.cr"; - rev = "v0.1.0"; - sha256 = "1p88mfn1ab5hz4r81vjfm1vn9rww0lbbii8lyzfx9pkxanh9rp98"; + lucky_task = { + owner = "luckyframework"; + repo = "lucky_task"; + rev = "v0.1.1"; + sha256 = "0w0rnf22pvj3lp5z8c4sshzwhqgwpbjpm7nry9mf0iz3fa0v48f7"; }; teeplate = { owner = "luckyframework"; repo = "teeplate"; - rev = "v0.8.2"; - sha256 = "1v7njslcpir52nnyd30mfnxvqmb7ycqnlq80qnx6myw20iy9dcww"; + rev = "v0.8.5"; + sha256 = "1kr05qrp674rph1324wry57gzvgvcvlz0w27brlvdgd3gi4s8sdj"; }; } diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 42198a65f701..94997b93f81d 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minify"; - version = "2.9.24"; + version = "2.10.0"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4M7Oj/hHFH2OUz0y64GIEnv0Kk0+zAje3kHA2e4RQS0="; + sha256 = "sha256-4wF9bRLrGQftw54b+HrsoJOGsTRTNYVDEMsKsFqnHGY="; }; - vendorSha256 = "sha256-oYZZ9DzpY544QTWDGz/wkHA9aP0riEXLUTWvzV1KxQc="; + vendorSha256 = "sha256-4aoDQKMhczy1u4Eq567aMrFVIBW2L8OgNCqsgmUN6CI="; doCheck = false; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 72615b356222..1e05850884c7 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -19,7 +19,7 @@ let majorVersion = versions.major version; minorVersion = versions.minor version; - baseName = if enableNpm then "nodejs" else "nodejs-slim"; + pname = if enableNpm then "nodejs" else "nodejs-slim"; useSharedHttpParser = !stdenv.isDarwin && versionOlder "${majorVersion}.${minorVersion}" "11.4"; @@ -43,9 +43,7 @@ let extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; self = stdenv.mkDerivation { - inherit version; - - name = "${baseName}-${version}"; + inherit pname version; src = fetchurl { url = "https://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; diff --git a/pkgs/development/web/nodejs/setup-hook.sh b/pkgs/development/web/nodejs/setup-hook.sh index 18368588c2af..878e0693a1e6 100644 --- a/pkgs/development/web/nodejs/setup-hook.sh +++ b/pkgs/development/web/nodejs/setup-hook.sh @@ -1,5 +1,5 @@ addNodePath () { - addToSearchPath NODE_PATH $1/lib/node_modules + addToSearchPath NODE_PATH "$1/lib/node_modules" } addEnvHooks "$hostOffset" addNodePath diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 4eaf37d2bf40..e2db169bad37 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.9"; - sha256 = "0jp2fdl73zj5lqjvw98i8pcf7m05cvjcab231zjvdhl4wl1jr66s"; + version = "12.22.11"; + sha256 = "sha256-XoHaJv1bH4lxRIOrqmjj2jBFI+QzTHjEm/p6A+541vE="; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index d6d94297f373..e2a65ace3811 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.18.3"; - sha256 = "026nd6vihjdqz4jn0slg89m8m5vvkvjzgg1aip3dcg9lrm1w8fkq"; + version = "14.19.1"; + sha256 = "sha256-4a4J3YYas5rwRIO7XA+lTd2CtrFVQ76aJ+pnBKi6ndk="; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index dd1410625db1..7f3dce2d70cf 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "16.13.2"; - sha256 = "185lm13q0kwz0qimc38c7mxn8ml6m713pjdjsa9jna9az4gxxccq"; + version = "16.14.2"; + sha256 = "sha256-6SLiFcxo61+U0z6KC2HiyGO3cxzIYAq5VdOCLakP+NE="; patches = [ ./disable-darwin-v8-system-instrumentation.patch # Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL. diff --git a/pkgs/development/web/nodejs/v17.nix b/pkgs/development/web/nodejs/v17.nix index 5da7cb5497ee..1c4dcc02a971 100644 --- a/pkgs/development/web/nodejs/v17.nix +++ b/pkgs/development/web/nodejs/v17.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchpatch, python3, enableNpm ? true }: +{ callPackage, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -7,15 +7,9 @@ let in buildNodejs { inherit enableNpm; - version = "17.4.0"; - sha256 = "1ch1hc5qc13qbk7gmpw729wb7s9kmda6sjlhzdw53iq6fzq7336g"; + version = "17.8.0"; + sha256 = "0jsf6sv42rzpizvil7g1gf9bskh8lx0gcxg0yzpr4hk7mx7i90br"; patches = [ ./disable-darwin-v8-system-instrumentation.patch - # Fixes node incorrectly building vendored OpenSSL when we want system OpenSSL. - # https://github.com/nodejs/node/pull/40965 - (fetchpatch { - url = "https://github.com/nodejs/node/commit/65119a89586b94b0dd46b45f6d315c9d9f4c9261.patch"; - sha256 = "sha256-dihKYEdK68sQIsnfTRambJ2oZr0htROVbNZlFzSAL+I="; - }) ]; } diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index efed625cd2fa..2c0698b74a8a 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -2,16 +2,16 @@ , atk, at-spi2-atk, at-spi2-core, alsa-lib, cairo, cups, dbus, expat, gdk-pixbuf, glib, gtk3 , freetype, fontconfig, nss, nspr, pango, udev, libuuid, libX11, libxcb, libXi , libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes -, libXrender, libXtst, libXScrnSaver, libxkbcommon, libdrm, mesa +, libXrender, libXtst, libXScrnSaver, libxkbcommon, libdrm, mesa, xorg }: stdenv.mkDerivation rec { pname = "postman"; - version = "9.7.1"; + version = "9.14.0"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "sha256-Ioh2FfcKkpLGQdYmRnJC5cj7bNCwCMkg/gsXwPdQa1U="; + sha256 = "sha256-pA3gT4xoIWhajY03JzVgHK5KyTx1uH6gyasuLTdt6cM="; name = "${pname}.tar.gz"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { comment = "API Development Environment"; desktopName = "Postman"; genericName = "Postman"; - categories = "Development;"; + categories = [ "Development" ]; }; buildInputs = [ @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { libXtst libXScrnSaver libxkbcommon + xorg.libxshmfence ]; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/development/web/protege-distribution/default.nix b/pkgs/development/web/protege-distribution/default.nix index 3b885e651510..a6ef66d06950 100644 --- a/pkgs/development/web/protege-distribution/default.nix +++ b/pkgs/development/web/protege-distribution/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { desktopName = "Protege Desktop"; icon = "protege"; comment = "OWL2 ontology editor"; - categories = "Development"; + categories = [ "Development" ]; exec = "run-protege"; }) ]; diff --git a/pkgs/development/web/shopify-cli/Gemfile b/pkgs/development/web/shopify-cli/Gemfile new file mode 100644 index 000000000000..ec10d4a03468 --- /dev/null +++ b/pkgs/development/web/shopify-cli/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'shopify-cli' diff --git a/pkgs/development/web/shopify-cli/Gemfile.lock b/pkgs/development/web/shopify-cli/Gemfile.lock new file mode 100644 index 000000000000..a137dbdfaa8e --- /dev/null +++ b/pkgs/development/web/shopify-cli/Gemfile.lock @@ -0,0 +1,39 @@ +GEM + remote: https://rubygems.org/ + specs: + ast (2.4.2) + bugsnag (6.24.2) + concurrent-ruby (~> 1.0) + concurrent-ruby (1.1.9) + ffi (1.15.5) + liquid (5.2.0) + listen (3.7.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + mini_portile2 (2.8.0) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) + parser (3.1.1.0) + ast (~> 2.4.1) + racc (1.6.0) + rb-fsevent (0.11.1) + rb-inotify (0.10.1) + ffi (~> 1.0) + shopify-cli (2.14.0) + bugsnag (~> 6.22) + listen (~> 3.7.0) + theme-check (~> 1.10.1) + theme-check (1.10.2) + liquid (>= 5.1.0) + nokogiri (>= 1.12) + parser (~> 3) + +PLATFORMS + ruby + +DEPENDENCIES + shopify-cli + +BUNDLED WITH + 2.2.33 diff --git a/pkgs/development/web/shopify-cli/default.nix b/pkgs/development/web/shopify-cli/default.nix new file mode 100644 index 000000000000..a3ec7ff3f318 --- /dev/null +++ b/pkgs/development/web/shopify-cli/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, ruby }: + +let + rubyEnv = bundlerEnv { + name = "shopify-cli"; + gemdir = ./.; + }; +in +stdenv.mkDerivation rec { + pname = "shopify-cli"; + version = (import ./gemset.nix).shopify-cli.version; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${rubyEnv}/bin/shopify $out/bin/shopify + wrapProgram $out/bin/shopify \ + --prefix PATH : ${lib.makeBinPath [ ruby ]} + ''; + + passthru.updateScript = bundlerUpdateScript "shopify-cli"; + + meta = with lib; { + description = "CLI which helps you build against the Shopify platform faster"; + homepage = "https://github.com/Shopify/shopify-cli"; + license = licenses.mit; + platforms = ruby.meta.platforms; + maintainers = with maintainers; [ onny ]; + }; +} + diff --git a/pkgs/development/web/shopify-cli/gemset.nix b/pkgs/development/web/shopify-cli/gemset.nix new file mode 100644 index 000000000000..1c6d7e891980 --- /dev/null +++ b/pkgs/development/web/shopify-cli/gemset.nix @@ -0,0 +1,149 @@ +{ + ast = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; + type = "gem"; + }; + version = "2.4.2"; + }; + bugsnag = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vlsqawqy8jn6cy03zcqw944p323zmr2lgadbw00m5r4lqc3bll4"; + type = "gem"; + }; + version = "6.24.2"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + type = "gem"; + }; + version = "1.1.9"; + }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + type = "gem"; + }; + version = "1.15.5"; + }; + liquid = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16aqzbvhvm254hbl274l4883h38j8wlwkcarmg09c7wzgpi0jnl1"; + type = "gem"; + }; + version = "5.2.0"; + }; + listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; + type = "gem"; + }; + version = "3.7.1"; + }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + type = "gem"; + }; + version = "2.8.0"; + }; + nokogiri = { + dependencies = ["mini_portile2" "racc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + type = "gem"; + }; + version = "1.13.3"; + }; + parser = { + dependencies = ["ast"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c"; + type = "gem"; + }; + version = "3.1.1.0"; + }; + racc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + type = "gem"; + }; + version = "1.6.0"; + }; + rb-fsevent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06c50pvxib7wqnv6q0f3n7gzfcrp5chi3sa48hxpkfxc3hhy11fm"; + type = "gem"; + }; + version = "0.11.1"; + }; + rb-inotify = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + type = "gem"; + }; + version = "0.10.1"; + }; + shopify-cli = { + dependencies = ["bugsnag" "listen" "theme-check"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fjqahhvmvqvmpfwa337ran9hhn9wk0ylm502qvcy5i4xy5hvd2r"; + type = "gem"; + }; + version = "2.14.0"; + }; + theme-check = { + dependencies = ["liquid" "nokogiri" "parser"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0314f49fg354wgqavvipfaf6a03090kqrgv48qvkb0ikhvqawpdr"; + type = "gem"; + }; + version = "1.10.2"; + }; +} diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/games/2048-in-terminal/default.nix index 8f527534bb44..59012227aeda 100644 --- a/pkgs/games/2048-in-terminal/default.nix +++ b/pkgs/games/2048-in-terminal/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "2048-in-terminal"; - version = "2021-09-12"; + version = "unstable-2021-09-12"; src = fetchFromGitHub { sha256 = "1jgacyimn59kxqhrk8jp13qayc2mncxhx393spqcxbz0sj6lxq9p"; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; description = "Animated console version of the 2048 game"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/games/7kaa/default.nix b/pkgs/games/7kaa/default.nix new file mode 100644 index 000000000000..2b74306cd253 --- /dev/null +++ b/pkgs/games/7kaa/default.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, gccStdenv +, autoreconfHook +, pkg-config +, fetchurl +, fetchFromGitHub +, openal +, libtool +, enet +, SDL2 +, curl +, gettext +, libiconv +}: + +let + + name = "7kaa"; + versionMajor = "2.15"; + versionMinor = "4p1"; + + music = stdenv.mkDerivation rec { + pname = "${name}-music"; + version = "${versionMajor}"; + + src = fetchurl { + url = "https://www.7kfans.com/downloads/${name}-music-${versionMajor}.tar.bz2"; + sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM="; + }; + + installPhase = '' + mkdir -p $out + cp -r * $out/ + ''; + + meta.license = lib.licenses.unfree; + + }; + +in + +gccStdenv.mkDerivation rec { + pname = "${name}"; + version = "v${versionMajor}.${versionMinor}"; + + src = fetchFromGitHub { + owner = "the3dfxdude"; + repo = pname; + rev = "9db2a43e1baee25a44b7aa7e9cedde9a107ed34b"; + sha256 = "sha256-OAKaRuPP0/n8pO3wIUvGKs6n+U+EmZXUTywXYDAan1o="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ openal enet SDL2 curl gettext libiconv ]; + + preAutoreconf = '' + autoupdate + ''; + + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + + postInstall = '' + mkdir $out/share/7kaa/MUSIC + cp -R ${music}/MUSIC $out/share/7kaa/ + cp ${music}/COPYING-Music.txt $out/share/7kaa/MUSIC + cp ${music}/COPYING-Music.txt $out/share/doc/7kaa + ''; + + # Multiplayer is auto-disabled for non-x86 system + + meta = with lib; { + homepage = "https://www.7kfans.com"; + description = "GPL release of the Seven Kingdoms with multiplayer (available only on x86 platforms)"; + license = licenses.gpl2Only; + platforms = platforms.x86_64 ++ platforms.aarch64; + maintainers = with maintainers; [ _1000101 ]; + }; +} diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index 07458cc64463..1cf7829cfcd0 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -16,7 +16,7 @@ let comment = "A silly speed painting game"; desktopName = "90 Second Portraits"; genericName = "90secondportraits"; - categories = "Game;"; + categories = [ "Game" ]; }; in diff --git a/pkgs/games/abuse/default.nix b/pkgs/games/abuse/default.nix index 2e863022a68b..1e2d4f82f837 100644 --- a/pkgs/games/abuse/default.nix +++ b/pkgs/games/abuse/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { icon = "abuse"; desktopName = "Abuse"; comment = "Side-scroller action game that pits you against ruthless alien killers"; - categories = "Game;ActionGame;"; + categories = [ "Game" "ActionGame" ]; }) ]; postInstall = '' diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index 1fe33a86f978..4fc37b0ca25c 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -1,7 +1,9 @@ { lib , rustPlatform , fetchFromGitLab +, fetchpatch , openssl +, libGL , vulkan-loader , wayland , wayland-protocols @@ -16,16 +18,24 @@ rustPlatform.buildRustPackage rec { pname = "airshipper"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitLab { owner = "Veloren"; repo = "airshipper"; rev = "v${version}"; - sha256 = "sha256-m3H2FE1DoV/uk9PGgf9PCagwmWWSQO/gCi7zpS02/WY="; + sha256 = "sha256-nOE9ZNHxLEAnMkuBSpxmeq3DxkRIlcoase6AxU+eFug="; }; - cargoSha256 = "sha256-ddy4TjT/ia+sLBnpwcXBVUzAS07ar+Jjc04KS5/arlU="; + patches = [ + # this *should* be merged in time for the release following 0.7.0 + (fetchpatch { + url = "https://github.com/veloren/Airshipper/commit/97fc986ab4cbf59f2c764f647710f19db86031b4.patch"; + hash = "sha256-Sg5et+yP6Z44wV/t9zqKLpg1C0cq6rV+3WrzAH4Za3U="; + }) + ]; + + cargoSha256 = "sha256-s3seKVEhXyOVlt3a8cubzRWoB4SVQpdCmq12y0FpDUw="; buildInputs = [ openssl @@ -40,14 +50,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config makeWrapper ]; postInstall = '' - mkdir -p "$out/share/applications" && mkdir -p "$out/share/icons" - cp "client/assets/net.veloren.airshipper.desktop" "$out/share/applications" - cp "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico" + install -Dm444 -t "$out/share/applications" "client/assets/net.veloren.airshipper.desktop" + install -Dm444 "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico" ''; postFixup = let libPath = lib.makeLibraryPath [ + libGL vulkan-loader wayland wayland-protocols @@ -57,7 +67,8 @@ rustPlatform.buildRustPackage rec { libXi libXcursor ]; - in '' + in + '' patchelf --set-rpath "${libPath}" "$out/bin/airshipper" ''; diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix index 347ccd8df63b..98b21865d7ca 100644 --- a/pkgs/games/alephone/default.nix +++ b/pkgs/games/alephone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost, curl, ffmpeg, icoutils, libGLU, libmad, libogg +{ lib, stdenv, fetchurl, boost, curl, ffmpeg_4, icoutils, libGLU, libmad, libogg , libpng, libsndfile, libvorbis, lua, pkg-config, SDL2, SDL2_image, SDL2_net , SDL2_ttf, smpeg, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip , alephone }: @@ -20,7 +20,7 @@ let buildInputs = [ boost curl - ffmpeg + ffmpeg_4 libGLU libmad libsndfile @@ -72,7 +72,7 @@ in self // { name = desktopName; exec = pname; genericName = pname; - categories = "Game;"; + categories = [ "Game" ]; comment = meta.description; inherit desktopName icon; }; @@ -91,10 +91,10 @@ in self // { makeWrapper ${alephone}/bin/alephone $out/bin/$pname \ --add-flags $out/data/$pname ''; - + } // extraArgs // { meta = alephone.meta // { license = lib.licenses.free; hydraPlatforms = [ ]; } // meta; - } // extraArgs); + }); } diff --git a/pkgs/games/alephone/infinity/default.nix b/pkgs/games/alephone/infinity/default.nix index f6002469a096..463915314adc 100644 --- a/pkgs/games/alephone/infinity/default.nix +++ b/pkgs/games/alephone/infinity/default.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon-infinity"; desktopName = "Marathon-Infinity"; - version = "20210408"; + version = "20220115"; icon = alephone.icons + "/marathon-infinity.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip"; - sha256 = "sha256-j9iwSrI7cjqnuRQX+qn8sWXQ6E+DQ19l7OzAL9KHcJU="; + sha256 = "sha256-00Wp+y+b82uZZ8fNeU3N5UAKlk0Sd1SfAEGL6RpyVf8="; }; meta = { diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index ed18624deb12..3f706b42c32c 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "angband"; - version = "4.2.3"; + version = "4.2.4"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "sha256-SFHAG74qJcV3E+jxPcOH2moW/kXhpwUwbGZVkNxqWd8="; + sha256 = "sha256-Fp3BGCZYYdQCKXOLYsT4zzlibNRlbELZi26ofrbGGPQ="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index d1def3740097..a25111bddfe9 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -116,6 +116,11 @@ buildPythonApplication rec { url = "https://sources.debian.org/data/main/a/anki/2.1.15+dfsg-3/debian/patches/fix-mpv-args.patch"; sha256 = "1dimnnawk64m5bbdbjrxw5k08q95l728n94cgkrrwxwavmmywaj2"; }) + (fetchpatch { + name = "anki-2.1.15-unescape.patch"; + url = "https://795309.bugs.gentoo.org/attachment.cgi?id=715200"; + sha256 = "14rz864kdaba4fd1marwkyz9n1jiqnbjy4al8bvwlhpvp0rm1qk6"; + }) ]; # Anki does not use setup.py diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index 640ea81c6c6b..1013be2694e9 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { desktopName = "AssaultCube"; comment = "A multiplayer, first-person shooter game, based on the CUBE engine. Fast, arcade gameplay."; genericName = "First-person shooter"; - categories = "Game;ActionGame;Shooter"; + categories = [ "Game" "ActionGame" "Shooter" ]; icon = "assaultcube.png"; exec = pname; }; diff --git a/pkgs/games/ballerburg/default.nix b/pkgs/games/ballerburg/default.nix index 43b274a12825..b15abdbc4703 100644 --- a/pkgs/games/ballerburg/default.nix +++ b/pkgs/games/ballerburg/default.nix @@ -25,11 +25,10 @@ in stdenv.mkDerivation rec { (makeDesktopItem { name = "Ballerburg"; desktopName = "Ballerburg SDL"; - type = "Application"; exec = "_NET_WM_ICON=ballerburg ballerburg"; comment = meta.description; icon = "ballerburg"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 76f22e98d9e9..bd21fc080703 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "blackshades"; - version = "2.4.7"; + version = "2.4.9"; src = fetchFromSourcehut { owner = "~cnx"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-hvJwWUUmGeb7MQgKe79cPS2ckPZ9z0Yc5S9IiwuXPD8="; + sha256 = "sha256-Hg+VcWI28GzY/CPm1lUftP0RGztOnzizrKJQVTmeJ9I="; }; nativeBuildInputs = [ zig ]; diff --git a/pkgs/games/blobby/default.upstream b/pkgs/games/blobby/default.upstream deleted file mode 100644 index 8f2804e07946..000000000000 --- a/pkgs/games/blobby/default.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url https://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/ -SF_version_dir -version_link '[.]tar[.][^.]+/download$' -SF_redirect -do_overwrite(){ - do_overwrite_just_version - set_var_value url $CURRENT_URL -} diff --git a/pkgs/games/blockattack/default.nix b/pkgs/games/blockattack/default.nix index 7616d2e51a34..6deba7987ada 100644 --- a/pkgs/games/blockattack/default.nix +++ b/pkgs/games/blockattack/default.nix @@ -15,14 +15,13 @@ stdenv.mkDerivation rec { pname = "blockattack"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { - name = "${pname}-${version}-src"; owner = "blockattack"; repo = "blockattack-game"; rev = "v${version}"; - hash = "sha256-ySLm3AdoJRiMRdla45OJh8ZIFYNh+HzjG2VnFqoWuZA="; + hash = "sha256-2oKesdr2eNZhDlGrFRiH5/8APFkGJfxPCNvzFoIumdQ="; }; nativeBuildInputs = [ diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index 77811e76e96d..d4f1f8faeeba 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -26,8 +26,7 @@ stdenv.mkDerivation rec { comment = "Brave the Dungeons of Doom!"; icon = "brogue"; exec = "brogue"; - categories = "Game;AdventureGame;"; - terminal = "false"; + categories = [ "Game" "AdventureGame" ]; }; installPhase = '' diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index 837fb4e17682..c837ba39b444 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -5,13 +5,14 @@ stdenv.mkDerivation rec { version = "2.17"; src = fetchurl { - url = "ftp://metalab.unc.edu/pub/Linux/games/bsd-games-${version}.tar.gz"; - sha256 = "0q7zdyyfvn15y0w4g54kq3gza89h61py727m8slmw73cxx594vq6"; + url = "mirror://ibiblioPubLinux/games/${pname}-${version}.tar.gz"; + hash = "sha256-Bm+SSu9sHF6pRvWI428wMCH138CTlEc48CXY7bxv/2A="; }; buildInputs = [ ncurses openssl flex bison ]; patches = [ + # Remove UTMPX support on Makefrag file (fetchurl { url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/dm-noutmpx.patch"; sha256 = "1k3qp3jj0dksjr4dnppv6dvkwslrgk9c7p2n9vipqildpxgqp7w2"; diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index ccba8e23d5ae..1701d84e8df7 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation { ); dontStrip = debug; + enableParallelBuilding = true; passthru = { isTiles = tiles; diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index 1d2b366cf38e..fd8189386e73 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -12,11 +12,11 @@ mkDerivation rec { pname = "chessx"; - version = "1.5.6"; + version = "1.5.7"; src = fetchurl { url = "mirror://sourceforge/chessx/chessx-${version}.tgz"; - sha256 = "sha256-0JpLU0qQnF8aOYxkBlBJov3zBJe8gcy98NlAQSNk0gU="; + sha256 = "sha256-wadIO3iNvj8LgIzExHTmeXxXnWOI+ViLrdhAlzZ79Jw="; }; nativeBuildInputs = [ diff --git a/pkgs/games/cl-wordle/default.nix b/pkgs/games/cl-wordle/default.nix new file mode 100644 index 000000000000..1ad3487c3fed --- /dev/null +++ b/pkgs/games/cl-wordle/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "cl-wordle"; + version = "0.4.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-z2XpXgOviBRcberwpxQ4ml1T04k5kMhG7wA0PAYWENg="; + }; + + cargoSha256 = "sha256-C7UMkhgez2CtddftARlwN1TjZ1N26NnZfpRiX1KkMEA="; + + meta = with lib; { + description = "Wordle TUI in Rust"; + homepage = "https://github.com/conradludgate/wordle"; + # repo has no license, but crates.io says it's MIT + license = licenses.mit; + maintainers = with maintainers; [ lom ]; + mainProgram = "wordle"; + }; +} diff --git a/pkgs/games/clonehero/fhs-wrapper.nix b/pkgs/games/clonehero/fhs-wrapper.nix index 97758b2c1fab..cd7f3986b109 100644 --- a/pkgs/games/clonehero/fhs-wrapper.nix +++ b/pkgs/games/clonehero/fhs-wrapper.nix @@ -13,7 +13,7 @@ let comment = clonehero-unwrapped.meta.description; exec = name; icon = name; - categories = "Game;"; + categories = [ "Game" ]; }; in buildFHSUserEnv { diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index e5eea7ece628..064e1d623a5f 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "crawl${lib.optionalString tileMode "-tiles"}"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "sha256-fyI7OIzhYXNTjIgJLqApyPMmiG3iof1b5XuGudNanos="; + sha256 = "sha256-pVEE3g+NDwpsrakyj4YIk53aE+LCiIaRhOqos4huh9A="; }; # Patch hard-coded paths and remove force library builds diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index c507332399ab..7454242c72b5 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.10.3"; + version = "5.11.1"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-F1cK8qusxOHM0DkLEYV5i2ixP3II8ZttwKxd8htd0+A="; + sha256 = "sha256-2Sjl9XO01ko0BwbFQSFv9mNoetyMa8Dxx17y0JmlLS0="; }; postPatch = '' diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 7f0f50881768..1663e17b14d2 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "15.8.1"; + version = "15.9.1"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-ZxLaGAKBACR65CRCjt3NPSjMNm7GQkESxF6sLv3q4lQ="; + sha256 = "sha256-QGtXI4Dbua5LBXSvB17tnSTGEvCCoopvg1XKBuDIEoQ="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 7a6dc2808805..ac76ab5ad189 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -93,8 +93,10 @@ stdenv.mkDerivation rec { install -Dm755 -t $out/bin devilutionx install -Dm755 -t $out/share/diasurgical/devilutionx devilutionx.mpq install -Dm755 -t $out/share/applications ../Packaging/nix/devilutionx-hellfire.desktop ../Packaging/nix/devilutionx.desktop - install -Dm755 ../Packaging/resources/icon.png $out/share/icons/hicolor/512x512/apps/devilution.png - install -Dm755 ../Packaging/resources/hellfire.png $out/share/icons/hicolor/512x512/apps/devilution-hellfire.png + install -Dm755 ../Packaging/resources/icon.png $out/share/icons/hicolor/512x512/apps/devilutionx.png + install -Dm755 ../Packaging/resources/hellfire.png $out/share/icons/hicolor/512x512/apps/devilutionx-hellfire.png + install -Dm755 ../Packaging/resources/icon_32.png $out/share/icons/hicolor/32x32/apps/devilutionx.png + install -Dm755 ../Packaging/resources/hellfire_32.png $out/share/icons/hicolor/32x32/apps/devilutionx-hellfire.png '') + '' runHook postInstall diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index a87236c48f4a..da75f3fd5d1b 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { name = "dhewm3"; exec = "dhewm3"; desktopName = "Doom 3"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index 0dde8ab16413..b7eae5e5acd6 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -11,15 +11,13 @@ let desktopItem = makeDesktopItem { - type = "Application"; - name = "Domination"; + name = "domination"; desktopName = "Domination"; exec = "domination"; icon = "domination"; }; editorDesktopItem = makeDesktopItem { - type = "Application"; - name = "Domination Map Editor"; + name = "domination-map-editor"; desktopName = "Domination Map Editor"; exec = "domination-map-editor"; icon = "domination"; diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index af34742b9fd8..a4e37081ab0e 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { comment = "Duck-themed action puzzle video game"; desktopName = "Duck Marines"; genericName = "duckmarines"; - categories = "Game;"; + categories = [ "Game" ]; }; src = fetchurl { diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix index c6987a1d16bd..d2e2ec5fd19b 100644 --- a/pkgs/games/dwarf-fortress/themes/default.nix +++ b/pkgs/games/dwarf-fortress/themes/default.nix @@ -6,7 +6,7 @@ listToAttrs (map (v: { inherit (v) name; value = fetchFromGitHub { - name = "${v.name}-${v.version}"; + name = "${v.name}-theme-${v.version}"; owner = "DFgraphics"; repo = v.name; rev = v.version; diff --git a/pkgs/games/ecwolf/default.nix b/pkgs/games/ecwolf/default.nix index 251b51df43a8..f8ca3b40f532 100644 --- a/pkgs/games/ecwolf/default.nix +++ b/pkgs/games/ecwolf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { exec = "ecwolf"; comment = "Enhanced Wolfenstein 3D port"; desktopName = "Wolfenstein 3D"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index c34922349612..4eb46e0ac155 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -11,7 +11,7 @@ let comment = "Duke Nukem 3D port"; desktopName = "Enhanced Duke Nukem 3D"; genericName = "Duke Nukem 3D port"; - categories = "Game;"; + categories = [ "Game" ]; }; wrapper = "eduke32-wrapper"; diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 158e81d91288..506868efe312 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "3D dungeon crawling adventure"; - homepage = "http://www.freedink.org/"; + homepage = "http://egoboo.sourceforge.net/"; license = lib.licenses.gpl2Plus; # I take it out of hydra as it does not work as well as I'd like diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 74702a973397..4cf335a61378 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -53,8 +53,7 @@ let comment = "A game in which you build and maintain factories."; exec = "factorio"; icon = "factorio"; - type = "Application"; - categories = "Game"; + categories = [ "Game" ]; }; branch = if experimental then "experimental" else "stable"; diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 663dffe24982..3c083c555d27 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.53.tar.xz", + "name": "factorio_alpha_x64-1.1.56.tar.xz", "needsAuth": true, - "sha256": "1l5sk9rhf4pq9l87w5sv4a1ikqx8rpby5hf4xn7sdsm9mshd3wyw", + "sha256": "1i9mcq8m48ar0b3x53zgi5x9rsaddmlm2wqaphyf81xampl7ivcx", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.53/alpha/linux64", - "version": "1.1.53" + "url": "https://factorio.com/get-download/1.1.56/alpha/linux64", + "version": "1.1.56" }, "stable": { "name": "factorio_alpha_x64-1.1.53.tar.xz", @@ -20,12 +20,12 @@ }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.53.tar.xz", + "name": "factorio_demo_x64-1.1.56.tar.xz", "needsAuth": false, - "sha256": "0m3mk296w4azma2v5z6pay1caqql2jfnlcyyd120laxl4rdg2k76", + "sha256": "0g1gphysh79h1frcjpfd5i3fpi05y8mq9gwmgnmalmr56w5n4qlz", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.53/demo/linux64", - "version": "1.1.53" + "url": "https://factorio.com/get-download/1.1.56/demo/linux64", + "version": "1.1.56" }, "stable": { "name": "factorio_demo_x64-1.1.53.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.53.tar.xz", + "name": "factorio_headless_x64-1.1.56.tar.xz", "needsAuth": false, - "sha256": "18ra52h32nhdqxz6vagp9nw3an5pgamariy0ny050xr2xpidw3v1", + "sha256": "174fvi9slpdp3y8j46w0w0ays7i7gy98il74xx5wxh7s94zb1b68", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.53/headless/linux64", - "version": "1.1.53" + "url": "https://factorio.com/get-download/1.1.56/headless/linux64", + "version": "1.1.56" }, "stable": { "name": "factorio_headless_x64-1.1.53.tar.xz", diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 287093354fc7..10d7a23aca4e 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.11"; + version = "0.9.13"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-p2FG4oWLTGflOoxsp8A+FpoVHfKiEw3DEnK8n3UiBtU="; + sha256 = "sha256-+VAgS7NR/D0HD/Fy7idSUTMJPp2ctpirMpcFooo+bEg="; }; buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/pkgs/games/fish-fillets-ng/default.nix b/pkgs/games/fish-fillets-ng/default.nix index 5ddad7fda4c9..e610f2427a2e 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { icon = "fish-fillets-ng"; desktopName = "Fish Fillets"; comment = "Puzzle game about witty fish saving the world sokoban-style"; - categories = "Game;LogicGame;"; + categories = [ "Game" "LogicGame" ]; }) ]; postInstall = '' diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix index 9b4b6848aea0..3567a5886055 100644 --- a/pkgs/games/flare/default.nix +++ b/pkgs/games/flare/default.nix @@ -1,7 +1,7 @@ { lib, buildEnv, callPackage, makeWrapper, Cocoa }: buildEnv { - name = "flare-1.12"; + name = "flare-1.13.04"; paths = [ (callPackage ./engine.nix { inherit Cocoa; }) @@ -17,7 +17,7 @@ buildEnv { meta = with lib; { description = "Fantasy action RPG using the FLARE engine"; homepage = "https://flarerpg.org/"; - maintainers = [ maintainers.aanderse ]; + maintainers = with maintainers; [ aanderse McSinyx ]; license = [ licenses.gpl3 licenses.cc-by-sa-30 ]; platforms = platforms.unix; }; diff --git a/pkgs/games/flare/engine.nix b/pkgs/games/flare/engine.nix index fc7415ba3ec3..9e9215ada1f2 100644 --- a/pkgs/games/flare/engine.nix +++ b/pkgs/games/flare/engine.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flare-engine"; - version = "1.12"; + version = "1.13.04"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "0swav6fzz970wj4iic3b7y06haa05720s2wivc8w7wcw9nzcac7j"; + sha256 = "sha256-GPHPYcW0kBDGpZti2kFggNB4RVK/3eQ53M9mJvJuKXM="; }; patches = [ ./desktop.patch ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Free/Libre Action Roleplaying Engine"; homepage = "https://github.com/flareteam/flare-engine"; - maintainers = [ maintainers.aanderse ]; + maintainers = with maintainers; [ aanderse McSinyx ]; license = [ licenses.gpl3 ]; platforms = platforms.unix; }; diff --git a/pkgs/games/flare/game.nix b/pkgs/games/flare/game.nix index 9903f0b58204..791af2645353 100644 --- a/pkgs/games/flare/game.nix +++ b/pkgs/games/flare/game.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flare-game"; - version = "1.12"; + version = "1.13.04"; src = fetchFromGitHub { owner = "flareteam"; repo = pname; rev = "v${version}"; - sha256 = "15k9r7w587pvkzrln0670hhq5fzif8k7xmrhb0nl3z3fi6dw3mmc"; + sha256 = "sha256-7dEIagioM6OZXG+eNaYls8skHXSqGFXZuNhT0zhTFdY="; }; nativeBuildInputs = [ cmake ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fantasy action RPG using the FLARE engine"; homepage = "https://github.com/flareteam/flare-game"; - maintainers = [ maintainers.aanderse ]; + maintainers = with maintainers; [ aanderse McSinyx ]; license = [ licenses.cc-by-sa-30 ]; platforms = platforms.unix; }; diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 6f4a57587de9..d46ee685607b 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -6,7 +6,7 @@ }: let - version = "2020.3.11"; + version = "2020.3.12"; 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-Ej8VGywPQiDw3VXodcpXpOw4qU9x+MBMWMrqwHfitVg="; + sha256 = "sha256-gCsW9e8IuXwmJfAfxJ/nORF5W/PwCka+O8Chwm26OnY="; }; dontUnpack = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-/icGx3B+pzq8URR3PeRfKYYasPj1NWVq8EKO0EnKSpc="; + sha256 = "sha256-wPeZIAiGU0zPBkzeBCO1xEgm+iZd/hWvBEr2ZcsX0Qc="; }; # Of all the files in the source and data archives, there doesn't seem to be @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { comment = "FlightGear Flight Simulator"; desktopName = "FlightGear"; genericName = "Flight simulator"; - categories = "Game;Simulation"; + categories = [ "Game" "Simulation" ]; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index c80dc2b07034..75c50669421d 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { with close compatibility, under multiple platforms. ''; - homepage = "http://www.freedink.org/"; + homepage = "https://www.gnu.org/software/freedink/"; # Formerly http://www.freedink.org license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.bjg ]; diff --git a/pkgs/games/freedroid/default.nix b/pkgs/games/freedroid/default.nix index 266407d17dba..38eb60e7e045 100644 --- a/pkgs/games/freedroid/default.nix +++ b/pkgs/games/freedroid/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "Freedroid Classic"; comment = "A clone of the classic game 'Paradroid' on Commodore 64"; - categories = "Game;ArcadeGame;"; + categories = [ "Game" "ArcadeGame" ]; }) ]; meta = with lib; { diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index e0582c524eca..84fd9c154a24 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, gettext, python3, SDL, SDL_image, SDL_gfx, SDL_mixer, libogg, libvorbis, lua5_3, libjpeg, libpng, zlib, libiconv }: let version = "0.16.1"; @@ -11,6 +11,15 @@ in stdenv.mkDerivation { sha256 = "0n4kn38ncmcy3lrxmq8fjry6c1z50z4q1zcqfig0j4jb0dsz2va2"; }; + patches = [ + # Pull upstream fix for -fno-common tolchains. + (fetchpatch { + name = "fno-common.patch"; + url = "https://gitlab.com/freedroid/freedroid-src/-/commit/e610d427374226b79da5258d979936459f30c761.patch"; + sha256 = "1s7sw4dkc7b6i72j6x47driq6v0k3wss48l9ivd4fw40n3iaxjb1"; + }) + ]; + nativeBuildInputs = [ pkg-config gettext python3 ]; buildInputs = [ diff --git a/pkgs/games/freenukum/default.nix b/pkgs/games/freenukum/default.nix index ff1e8872233e..0d2f833671e3 100644 --- a/pkgs/games/freenukum/default.nix +++ b/pkgs/games/freenukum/default.nix @@ -16,12 +16,9 @@ let name = pname; exec = pname; icon = pname; - terminal = "false"; comment = description; - type = "Application"; - categories = "Game;ArcadeGame;ActionGame"; + categories = [ "Game" "ArcadeGame" "ActionGame" ]; genericName = pname; - fileValidation = false; }; in diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index 0b53e3d0bea3..f987992858da 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -7,12 +7,12 @@ let desktopItem = makeDesktopItem { name = "frogatto"; exec = "frogatto"; - startupNotify = "true"; + startupNotify = true; icon = "${data}/share/frogatto/modules/frogatto/images/os/frogatto-icon.png"; comment = description; desktopName = "Frogatto"; genericName = "frogatto"; - categories = "Game;ArcadeGame;"; + categories = [ "Game" "ArcadeGame" ]; }; version = "unstable-2020-12-04"; in buildEnv { diff --git a/pkgs/games/frozen-bubble/default.nix b/pkgs/games/frozen-bubble/default.nix index f9dd3fd61592..6738f979d00b 100644 --- a/pkgs/games/frozen-bubble/default.nix +++ b/pkgs/games/frozen-bubble/default.nix @@ -25,7 +25,7 @@ perlPackages.buildPerlModule { desktopName = "Frozen Bubble"; genericName = "Frozen Bubble"; comment = "Arcade/reflex colour matching game"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index 2b3ff2b5c2e5..5343bae4a6cb 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -18,29 +18,38 @@ mkDerivation rec { pname = "gcompris"; - version = "2.0"; + version = "2.3"; src = fetchurl { - url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"; - sha256 = "sha256-mrVGYI9IPyXqlXZN2MEDGTjIPUmlLwfaAo+zW4HjqMc="; + url = "https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz"; + sha256 = "sha256-UgWLp5IVqbeFFCO/PRFJ/X1sPm7nSkagVcgEp5SdzGI="; }; cmakeFlags = [ - "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.0" + "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.1" ]; nativeBuildInputs = [ cmake gettext ninja qttools ]; buildInputs = [ - qmlbox2d qtbase qtdeclarative qtgraphicaleffects qtmultimedia qtquickcontrols qtsensors qtxmlpatterns + qmlbox2d + qtdeclarative + qtgraphicaleffects + qtmultimedia + qtquickcontrols + qtsensors + qtxmlpatterns ] ++ (with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad ]); postInstall = '' - install -Dm444 ../org.kde.gcompris.desktop $out/share/applications/gcompris.desktop - install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png + install -Dm444 ../org.kde.gcompris.desktop -t $out/share/applications install -Dm444 ../org.kde.gcompris.appdata.xml -t $out/share/metainfo + install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; @@ -49,6 +58,7 @@ mkDerivation rec { description = "A high quality educational software suite, including a large number of activities for children aged 2 to 10"; homepage = "https://gcompris.net/"; license = licenses.gpl3Plus; + mainProgram = "gcompris-qt"; maintainers = with maintainers; [ guibou ]; platforms = platforms.linux; }; diff --git a/pkgs/games/gnonograms/default.nix b/pkgs/games/gnonograms/default.nix index cfe1085ca27b..21f522d3418f 100644 --- a/pkgs/games/gnonograms/default.nix +++ b/pkgs/games/gnonograms/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , vala , meson , ninja @@ -27,6 +28,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-2uXaybpCAm9cr0o7bqfhgD7mMNPwtv1X/PgnFnSDOl0="; }; + patches = [ + # Fix build with meson 0.61, can be removed on next release + # https://github.com/jeremypw/gnonograms/pull/45 + (fetchpatch { + url = "https://github.com/jeremypw/gnonograms/commit/0e90d8ff42d64a94002ec8500889bc4d7e06c1b6.patch"; + sha256 = "sha256-G/yqsZFmOA69A3E2CROMYAS5vmok/K5l1S/M2m8DMh4="; + }) + ]; + postPatch = '' patchShebangs meson/post_install.py ''; diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix index 6f91b1034581..1c918395d40b 100644 --- a/pkgs/games/gnujump/default.nix +++ b/pkgs/games/gnujump/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { icon = "gnujump"; desktopName = "GNUjump"; comment = "Jump up the tower to survive"; - categories = "Game;ArcadeGame;"; + categories = [ "Game" "ArcadeGame" ]; }) ]; postInstall = '' diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index e38294ff4014..a10b370e648b 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -60,7 +60,7 @@ let name = "gzdoom"; exec = "gzdoom"; desktopName = "GZDoom"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index bcbe2a6c6535..c0416d0dd7e8 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -2,11 +2,11 @@ let pname = "heroic"; - version = "2.0.2"; + version = "2.2.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/download/v${version}/Heroic-${version}.AppImage"; - sha256 = "sha256-4gq0ZCcPIx/CkFNZTM5Atkd/GP6v1t3MO2tibrKkcZQ="; + sha256 = "sha256-zzxf3eM1fUWTVtzzABcwlmptNuCVQafvotnbOiCzu0c="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 08427bd29205..0397bb474da3 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { comment = meta.description; icon = "hyperrogue"; exec = "hyperrogue"; - categories = "Game;AdventureGame;"; + categories = [ "Game" "AdventureGame" ]; }; postInstall = '' diff --git a/pkgs/games/itch-setup/default.nix b/pkgs/games/itch-setup/default.nix new file mode 100644 index 000000000000..55d488bcaac0 --- /dev/null +++ b/pkgs/games/itch-setup/default.nix @@ -0,0 +1,24 @@ +{ lib, writeShellScriptBin, steam-run, fetchurl }: +let + + pname = "itch-setup"; + version = "1.26.0"; + + src = fetchurl { + url = "https://broth.itch.ovh/itch-setup/linux-amd64/${version}/unpacked/default"; + hash = "sha256-bcJKqhgZK42Irx12BIvbTDMb/DHEOEXljetlDokF7x8="; + executable = true; + }; + +in +(writeShellScriptBin pname ''exec ${steam-run}/bin/steam-run ${src} "$@"'') // { + + passthru = { inherit pname version src; }; + meta = with lib; { + description = "An installer for the itch.io desktop app"; + homepage = "https://github.com/itchio/itch-setup"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ pasqui23 ]; + }; +} diff --git a/pkgs/games/itch/default.nix b/pkgs/games/itch/default.nix new file mode 100644 index 000000000000..34a2775c3c80 --- /dev/null +++ b/pkgs/games/itch/default.nix @@ -0,0 +1,62 @@ +{ lib +, stdenvNoCC +, fetchurl +, libnotify +, nss +, gtk3 +, fetchFromGitHub +, makeDesktopItem +, itch-setup +, runtimeShell +}: +stdenvNoCC.mkDerivation rec{ + pname = "itch"; + version = "25.5.1"; + + src = fetchFromGitHub { + owner = "itchio"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Pi3l3uK4kr+N3p7fGQuqckYIzycRqJHDVX00reoSbp4="; + }; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = pname; + tryExec = "itch %U"; + icon = pname; + desktopName = pname; + mimeTypes = [ "x-scheme-handler/itchio" "x-scheme-handler/itch" ]; + comment = "Install and play itch.io games easily"; + categories = [ "Game" ]; + }) + ]; + + itchBin = '' + #!${runtimeShell} + exec ${itch-setup}/bin/itch-setup --prefer-launch -- "$@" + ''; + + passAsFile = [ "itchBin" ]; + + # as taken from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=itch + installPhase = '' + install -Dm0777 $itchBinPath $out/bin/itch + for icon in release/images/itch-icons/icon*.png + do + iconsize="''${icon#release/images/itch-icons/icon}" + iconsize="''${iconsize%.png}" + icondir="$out/share/icons/hicolor/''${iconsize}x''${iconsize}/apps/" + install -Dm644 "$icon" "$icondir/itch.png" + done + ''; + + meta = with lib; { + description = "The best way to play itch.io games"; + homepage = "https://github.com/itchio/itch"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ pasqui23 ]; + }; +} diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index ce0eeea738af..53e1b3cf00e1 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { icon = "ivan.png"; desktopName = "IVAN"; genericName = pname; - categories = "Game;AdventureGame;RolePlaying;"; + categories = [ "Game" "AdventureGame" "RolePlaying" ]; comment = meta.description; }; diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index abfeca69e82d..3265f3d63382 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -29,14 +29,14 @@ assert !enableGPU -> ( # of gcc. If you need to use cuda10, please override stdenv with gcc8Stdenv stdenv.mkDerivation rec { pname = "katago"; - version = "1.10.0"; - githash = "ff49d04ad6bcfa056c63492439a41e2f3bce0847"; + version = "1.11.0"; + githash = "d8d0cd76cf73df08af3d7061a639488ae9494419"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "sha256-ZLJNNjZ5RdOktWDp88d/ItpokANl2EJ0Gbt9oMGm1Og="; + sha256 = "sha256-TZKkkYe2PPzgPhItBZBSJDwU3anhsujuCGIYru55OtU="; }; fakegit = writeShellScriptBin "git" "echo ${githash}"; diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 2a8f68ddd2cc..6ea029176482 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -2,23 +2,31 @@ , fetchurl , makeWrapper , curl +, espeak , file , gtk3 +, gtkdatabox , intltool , pkg-config }: stdenv.mkDerivation rec { pname = "klavaro"; - version = "3.11"; + version = "3.13"; src = fetchurl { url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2"; - sha256 = "1rkxaqb62w4mv86fcnmr32lq6y0h4hh92wmsy5ddb9a8jnzx6r7w"; + sha256 = "0z6c3lqikk50mkz3ipm93l48qj7b98lxyip8y6ndg9y9k0z0n878"; }; nativeBuildInputs = [ intltool makeWrapper pkg-config ]; - buildInputs = [ curl gtk3 ]; + buildInputs = [ curl gtk3 gtkdatabox ]; + + postPatch = '' + substituteInPlace src/tutor.c --replace '"espeak ' '"${espeak}/bin/espeak ' + ''; + + patches = [ ./icons.patch ./trans_lang_get_similar.patch ]; postInstall = '' wrapProgram $out/bin/klavaro \ diff --git a/pkgs/games/klavaro/icons.patch b/pkgs/games/klavaro/icons.patch new file mode 100644 index 000000000000..1717fdf44e68 --- /dev/null +++ b/pkgs/games/klavaro/icons.patch @@ -0,0 +1,146 @@ +--- a/data/klavaro.glade (revision 137) ++++ b/data/klavaro.glade (working copy) +@@ -311,7 +311,7 @@ + + True + False +- gtk-delete ++ edit-delete + + + False +@@ -708,7 +708,7 @@ + True + True + Drag and drop text here to practice with it. +- gtk-clear ++ edit-clear + Press here to restart the exercise. Hotkey: [Ctrl-R] + Press here to restart the exercise. Hotkey: [Ctrl-R] + +@@ -1232,7 +1232,7 @@ + + True + False +- gtk-delete ++ edit-delete + + + False +@@ -1352,7 +1352,7 @@ + + True + False +- gtk-open ++ document-open + + + True +@@ -1510,7 +1510,7 @@ + + True + False +- gtk-open ++ document-open + 2 + + +@@ -1557,7 +1557,7 @@ + + True + False +- gtk-paste ++ edit-paste + 2 + + +@@ -1604,7 +1604,7 @@ + + True + False +- gtk-delete ++ edit-delete + 2 + + +@@ -2051,7 +2051,7 @@ + + True + False +- gtk-delete ++ edit-delete + + + False +@@ -2343,7 +2343,7 @@ + + True + False +- gtk-media-rewind ++ media-seek-backward + 1 + + +@@ -2418,7 +2418,7 @@ + + True + False +- gtk-go-back ++ go-previous + + + False +@@ -2469,7 +2469,7 @@ + + True + False +- gtk-go-forward ++ go-next + + + False +@@ -2577,7 +2577,7 @@ + + True + False +- gtk-save ++ document-save + + + False +@@ -2825,7 +2825,7 @@ + + True + False +- gtk-strikethrough ++ format-text-strikethrough + 6 + + +@@ -2901,7 +2901,7 @@ + + True + False +- gtk-bold ++ format-text-bold + 6 + + +@@ -3630,7 +3630,7 @@ + + True + False +- gtk-goto-top ++ go-top + + + False +@@ -3678,7 +3678,7 @@ + + True + False +- gtk-goto-bottom ++ go-bottom + + + False diff --git a/pkgs/games/klavaro/trans_lang_get_similar.patch b/pkgs/games/klavaro/trans_lang_get_similar.patch new file mode 100644 index 000000000000..3b6644c5f7f7 --- /dev/null +++ b/pkgs/games/klavaro/trans_lang_get_similar.patch @@ -0,0 +1,71 @@ +--- a/src/translation.c (revision 137) ++++ b/src/translation.c (working copy) +@@ -257,23 +257,23 @@ + * Private auxiliar function + */ + static gboolean +-trans_lang_get_similar (gchar * test) ++trans_lang_get_similar (gchar ** test) + { + gint i; + gchar aux_code_2[3]; + + /* Prefer C over en_GB for English variants other than en_GB. (Debian patch 02) */ +- if (g_str_has_prefix (test, "en")) ++ if (g_str_has_prefix (*test, "en")) + { +- g_free (test); +- test = g_strdup ("C"); ++ g_free (*test); ++ *test = g_strdup ("C"); + return (TRUE); + } + +- if (g_str_equal (test, "C")) ++ if (g_str_equal (*test, "C")) + return TRUE; + +- strncpy (aux_code_2, test, 2); ++ strncpy (aux_code_2, *test, 2); + aux_code_2[2] = '\0'; + + for (i = 0; i < lang_num; i++) +@@ -280,15 +280,15 @@ + { + if (strstr (lang[i].code, aux_code_2)) + { +- g_free (test); +- test = g_strdup (lang[i].code); ++ g_free (*test); ++ *test = g_strdup (lang[i].code); + break; + } + } +- if (i == lang_num && g_str_has_prefix (test, "en")) ++ if (i == lang_num && g_str_has_prefix (*test, "en")) + { +- g_free (test); +- test = g_strdup ("C"); ++ g_free (*test); ++ *test = g_strdup ("C"); + return (TRUE); + } + return (i == lang_num ? FALSE : TRUE); +@@ -356,7 +356,7 @@ + lang_ok = (i == 0 ? TRUE : FALSE); + break; + } +- lang_ok = trans_lang_get_similar (tmp_code); ++ lang_ok = trans_lang_get_similar (&tmp_code); + if (lang_ok == TRUE) + break; + g_free (tmp_code); +@@ -368,7 +368,7 @@ + tmp_code = g_win32_getlocale (); + lang_ok = trans_lang_is_available (tmp_code); + if (lang_ok == FALSE) +- lang_ok = trans_lang_get_similar (tmp_code); ++ lang_ok = trans_lang_get_similar (&tmp_code); + #endif + } + if (tmp_code == NULL) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index 93f17dbb8135..0c40d537fcec 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -11,17 +11,19 @@ , rhash , tinyxml-2 , help2man +, testVersion +, lgogdownloader }: stdenv.mkDerivation rec { pname = "lgogdownloader"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "v${version}"; - sha256 = "sha256-LywFJCZevlhthOkAZo7JkXcPT9V6Zh28VD/MVQnMQjo="; + sha256 = "sha256-Qt9uTKsD0kQ6b9Y5+eC+YWpCHMIJGzP+pMfuUBt/fME="; }; nativeBuildInputs = [ @@ -40,15 +42,9 @@ stdenv.mkDerivation rec { tinyxml-2 ]; - doInstallCheck = true; - installCheckPhase = '' - if [[ "$("$out/bin/${pname}" --version)" == "LGOGDownloader ${version}" ]]; then - echo '${pname} smoke check passed' - else - echo '${pname} smoke check failed' - return 1 - fi - ''; + passthru.tests = { + version = testVersion { package = lgogdownloader; }; + }; meta = with lib; { description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader"; diff --git a/pkgs/games/liberation-circuit/default.nix b/pkgs/games/liberation-circuit/default.nix index 478fd606376a..c1f03e036c9f 100644 --- a/pkgs/games/liberation-circuit/default.nix +++ b/pkgs/games/liberation-circuit/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { Escape from a hostile computer system! Harvest data to create an armada of battle-processes to aid your escape! Take command directly and play the game as an RTS, or use the game's built-in editor and compiler to write your own unit AI in a simplified version of C. ''; homepage = "https://linleyh.itch.io/liberation-circuit"; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; license = licenses.gpl3Only; platforms = platforms.linux; }; diff --git a/pkgs/games/linthesia/default.nix b/pkgs/games/linthesia/default.nix new file mode 100644 index 000000000000..0914722a9acb --- /dev/null +++ b/pkgs/games/linthesia/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, libGL, libGLU +, alsa-lib, glibmm, sqlite, SDL2, SDL2_ttf_2_0_15, SDL2_image, gtk3, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "linthesia"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "linthesia"; + repo = "linthesia"; + rev = version; + sha256 = "sha256-bdW0RlV14ttnK8NizfNfXmZ7zlJOqZCpVvt8vT2Pjys="; + }; + + postPatch = '' + patchShebangs meson_post_install.py + ''; + + nativeBuildInputs = [ meson ninja pkg-config python3 wrapGAppsHook ]; + buildInputs = [ + libGL + libGLU + alsa-lib + glibmm + sqlite + SDL2 + SDL2_ttf_2_0_15 + SDL2_image + gtk3.out # icon cache + ]; + + meta = with lib; { + description = "A game of playing music using a MIDI keyboard following a MIDI file"; + inherit (src.meta) homepage; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index 2dc0e14daf8e..17df2565b866 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/pkgs/games/lunar-client/default.nix @@ -2,16 +2,16 @@ let name = "lunar-client"; - version = "2.9.3"; + version = "2.10.0"; desktopItem = makeDesktopItem { - name = "Lunar Client"; + name = "lunar-client"; exec = "lunar-client"; icon = "lunarclient"; - comment = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client"; + comment = "Minecraft 1.7, 1.8, 1.12, 1.15, 1.16, 1.17, and 1.18 Client"; desktopName = "Lunar Client"; genericName = "Minecraft Client"; - categories = "Game;"; + categories = [ "Game" ]; }; appimageContents = appimageTools.extract { @@ -21,7 +21,7 @@ let src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; name = "lunar-client.AppImage"; - sha256 = "sha256-2wlC+OAG2lvUB3yPxppNhhvNDZv4gxrNKpww9vAfStI="; + sha256 = "1kfi3rgy401ll3gn9k30j0a1zds1ghl5g2ibfwlsnr826nckfmzw"; }; in appimageTools.wrapType1 rec { @@ -36,7 +36,7 @@ appimageTools.wrapType1 rec { extraPkgs = pkgs: [ pkgs.libpulseaudio ]; meta = with lib; { - description = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client"; + description = "Minecraft 1.7, 1.8, 1.12, 1.15, 1.16, 1.17, and 1.18 Client"; homepage = "https://www.lunarclient.com/"; license = with licenses; [ unfree ]; maintainers = with maintainers; [ zyansheep Technical27 ]; diff --git a/pkgs/games/maelstrom/default.nix b/pkgs/games/maelstrom/default.nix index 5f78e34edac9..065784d605ef 100644 --- a/pkgs/games/maelstrom/default.nix +++ b/pkgs/games/maelstrom/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { desktopName = "Maelstrom"; genericName = "Maelstrom"; comment = "An arcade-style game resembling Asteroids"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/mari0/default.nix b/pkgs/games/mari0/default.nix index 55ef9f51d5b3..8189c0789811 100644 --- a/pkgs/games/mari0/default.nix +++ b/pkgs/games/mari0/default.nix @@ -10,7 +10,7 @@ let comment = "Crossover between Super Mario Bros. and Portal"; desktopName = "mari0"; genericName = "mari0"; - categories = "Game"; + categories = [ "Game" ]; }; in diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index d28f2b1d1e7f..82df3710c577 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -66,7 +66,6 @@ let ''; desktopItem = makeDesktopItem { - type = "Application"; name = "Mindustry"; desktopName = "Mindustry"; exec = "mindustry"; diff --git a/pkgs/games/minecraft-servers/update.py b/pkgs/games/minecraft-servers/update.py index 4fe84ee21a59..0e7f10a8c932 100755 --- a/pkgs/games/minecraft-servers/update.py +++ b/pkgs/games/minecraft-servers/update.py @@ -4,6 +4,7 @@ import json from dataclasses import dataclass, field from datetime import datetime +from pathlib import Path from typing import Any, Dict, List, Optional import requests @@ -150,6 +151,6 @@ def generate() -> Dict[str, Dict[str, str]]: if __name__ == "__main__": - with open("versions.json", "w") as file: + with open(Path(__file__).parent / "versions.json", "w") as file: json.dump(generate(), file, indent=2) file.write("\n") diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json index ba0b652a6bdc..af1b032bd781 100644 --- a/pkgs/games/minecraft-servers/versions.json +++ b/pkgs/games/minecraft-servers/versions.json @@ -1,8 +1,8 @@ { "1.18": { - "url": "https://launcher.mojang.com/v1/objects/125e5adf40c659fd3bce3e66e67a16bb49ecc1b9/server.jar", - "sha1": "125e5adf40c659fd3bce3e66e67a16bb49ecc1b9", - "version": "1.18.1", + "url": "https://launcher.mojang.com/v1/objects/c8f83c5655308435b3dcf03c06d9fe8740a77469/server.jar", + "sha1": "c8f83c5655308435b3dcf03c06d9fe8740a77469", + "version": "1.18.2", "javaVersion": 17 }, "1.17": { diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 254c01fdf1b6..08104310faa3 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -38,7 +38,7 @@ let icon = "minecraft-launcher"; comment = "Official launcher for Minecraft, a sandbox-building game"; desktopName = "Minecraft Launcher"; - categories = "Game;"; + categories = [ "Game" ]; }; envLibPath = lib.makeLibraryPath [ diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 7ffa361da559..e607fbc71134 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,7 +1,9 @@ { lib, stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp , libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, sqlite, luajit , freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex -, leveldb, postgresql, hiredis, libiconv, OpenGL, OpenAL ? openal, Carbon, Cocoa +, leveldb, postgresql, hiredis, libiconv, zlib, libXrandr, libX11, ninja, prometheus-cpp +, OpenGL, OpenAL ? openal, Carbon, Cocoa +, Kernel }: with lib; @@ -9,6 +11,22 @@ with lib; let boolToCMake = b: if b then "ON" else "OFF"; + irrlichtMt = stdenv.mkDerivation rec { + pname = "irrlichtMt"; + version = "1.9.0mt4"; + src = fetchFromGitHub { + owner = "minetest"; + repo = "irrlicht"; + rev = version; + sha256 = "sha256-YlXn9LrfGkjdb8+zQGDgrInolUYj9nVSF2AXWFpEEkw="; + }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib libjpeg libpng libGLU libGL libXrandr libX11 libXxf86vm ] + ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ]; + outputs = [ "out" "dev" ]; + meta = irrlicht.meta; + }; + generic = { version, rev ? version, sha256, dataRev ? version, dataSha256, buildClient ? true, buildServer ? false }: let sources = { src = fetchFromGitHub { @@ -30,29 +48,41 @@ let src = sources.src; cmakeFlags = [ + "-G Ninja" "-DBUILD_CLIENT=${boolToCMake buildClient}" "-DBUILD_SERVER=${boolToCMake buildServer}" - "-DENABLE_FREETYPE=1" "-DENABLE_GETTEXT=1" + "-DENABLE_SPATIAL=1" "-DENABLE_SYSTEM_JSONCPP=1" - "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht" + "-DIRRLICHT_INCLUDE_DIR=${irrlichtMt.dev}/include/irrlicht" + + # Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_DATADIR=share" + "-DCMAKE_INSTALL_DOCDIR=share/doc" + "-DCMAKE_INSTALL_DOCDIR=share/doc" + "-DCMAKE_INSTALL_MANDIR=share/man" + "-DCMAKE_INSTALL_LOCALEDIR=share/locale" + ] ++ optionals buildClient [ "-DOpenGL_GL_PREFERENCE=GLVND" + ] ++ optionals buildServer [ + "-DENABLE_PROMETHEUS=1" ]; NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 - nativeBuildInputs = [ cmake doxygen graphviz ]; + nativeBuildInputs = [ cmake doxygen graphviz ninja ]; buildInputs = [ - irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses + irrlichtMt luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses gmp libspatialindex ] ++ optionals stdenv.isDarwin [ libiconv OpenGL OpenAL Carbon Cocoa ] ++ optionals buildClient [ libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm ] ++ optionals buildServer [ - leveldb postgresql hiredis + leveldb postgresql hiredis prometheus-cpp ]; postInstall = '' @@ -66,25 +96,20 @@ let license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pyrolagus fpletz ]; + # never built on Hydra + # https://hydra.nixos.org/job/nixpkgs/trunk/minetestclient_4.x86_64-darwin + # https://hydra.nixos.org/job/nixpkgs/trunk/minetestserver_4.x86_64-darwin + broken = (lib.versionOlder version "5.0.0") && stdenv.isDarwin; }; }; - v4 = { - version = "0.4.17.1"; - sha256 = "19sfblgh9mchkgw32n7gdvm7a8a9jxsl9cdlgmxn9bk9m939a2sg"; - dataSha256 = "1g8iw2pya32ifljbdx6z6rpcinmzm81i9minhi2bi1d500ailn7s"; - }; - v5 = { - version = "5.4.1"; - sha256 = "062ilb7s377q3hwfhl8q06vvcw2raydz5ljzlzwy2dmyzmdcndb8"; - dataSha256 = "0i45lbnikvgj9kxdp0yphpjjwjcgp4ibn49xkj78j5ic1s9n8jd4"; + version = "5.5.0"; + sha256 = "sha256-V+ggqvZibSQrJbrtNCEkmRYHhgSKTQsdBh3c8+t6WeA="; + dataSha256 = "sha256-6ZS3EET3nm09eL0czCGadwzon35/EBfAg2KjPX3ZP/0="; }; in { - minetestclient_4 = generic (v4 // { buildClient = true; buildServer = false; }); - minetestserver_4 = generic (v4 // { buildClient = false; buildServer = true; }); - minetestclient_5 = generic (v5 // { buildClient = true; buildServer = false; }); minetestserver_5 = generic (v5 // { buildClient = false; buildServer = true; }); } diff --git a/pkgs/games/minetest/disable_fixup.patch b/pkgs/games/minetest/disable_fixup.patch deleted file mode 100644 index 1c378d7f83fc..000000000000 --- a/pkgs/games/minetest/disable_fixup.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -802,7 +802,6 @@ - install(CODE " - set(BU_CHMOD_BUNDLE_ITEMS ON) - include(BundleUtilities) -- fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/${BUNDLE_PATH}\" \"\" \"\${CMAKE_INSTALL_PREFIX}/${BINDIR}\") - " COMPONENT Runtime) - endif() - diff --git a/pkgs/games/minetest/fix_wordsize_confusion.patch b/pkgs/games/minetest/fix_wordsize_confusion.patch deleted file mode 100644 index 9540a434dafe..000000000000 --- a/pkgs/games/minetest/fix_wordsize_confusion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -17,6 +17,7 @@ - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#include - #include "irrlicht.h" // createDevice - #include "irrlichttypes_extrabloated.h" - #include "chat_interface.h" diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index 2328c20ef91d..a873424aa24c 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -16,7 +16,7 @@ let comment = "Arcade-style fire fighting game"; desktopName = "Mr. Rescue"; genericName = "mrrescue"; - categories = "Game;"; + categories = [ "Game" ]; }; in diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index aacc15d19b97..46ae45b2202b 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -1,5 +1,25 @@ -{ fetchFromGitHub, lib, stdenv, wrapQtAppsHook, git, pcre, pugixml, qtbase, libsForQt5, libsecret, qtmultimedia, qttools, yajl, libzip, hunspell -, boost, libGLU, lua, cmake, which, pkg-config, }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, git +, pkg-config +, qttools +, which +, wrapQtAppsHook +, boost +, hunspell +, libGLU +, libsForQt5 +, libsecret +, libzip +, lua +, pcre +, pugixml +, qtbase +, qtmultimedia +, yajl +}: let luaEnv = lua.withPackages(ps: with ps; [ @@ -8,25 +28,46 @@ let in stdenv.mkDerivation rec { pname = "mudlet"; - version = "4.12.0"; + version = "4.15.1"; src = fetchFromGitHub { owner = "Mudlet"; repo = "Mudlet"; rev = "Mudlet-${version}"; fetchSubmodules = true; - sha256 = "023plm5mwm15xikmdh1mq3gx1n7y4a0r0kw9fvk3rvm9brm78hzp"; + hash = "sha256-GnTQc0Jh4YaQnfy7fYsTCACczlzWCQ+auKYoU9ET83M="; }; - nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook git qttools which ]; + nativeBuildInputs = [ + cmake + git + pkg-config + qttools + which + wrapQtAppsHook + ]; + buildInputs = [ - pcre pugixml qtbase libsForQt5.qtkeychain qtmultimedia luaEnv libsecret libzip libGLU yajl boost hunspell + boost + hunspell + libGLU + libsForQt5.qtkeychain + libsecret + libzip + luaEnv + pcre + pugixml + qtbase + qtmultimedia + yajl ]; WITH_FONTS = "NO"; WITH_UPDATER = "NO"; installPhase = '' + runHook preInstall + mkdir -pv $out/lib cp 3rdparty/edbee-lib/edbee-lib/qslog/lib/libQsLog.so $out/lib mkdir -pv $out/bin @@ -41,15 +82,19 @@ stdenv.mkDerivation rec { cp -r ../mudlet.png $out/share/pixmaps/ makeQtWrapper $out/mudlet $out/bin/mudlet \ + --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \ + --prefix LUA_PATH : "$NIX_LUA_PATH" \ --prefix LD_LIBRARY_PATH : "${libsForQt5.qtkeychain}/lib/" \ --run "cd $out"; + + runHook postInstall ''; meta = with lib; { description = "Crossplatform mud client"; - homepage = "https://mudlet.org"; + homepage = "https://www.mudlet.org/"; maintainers = [ maintainers.wyvie maintainers.pstn ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/games/oh-my-git/default.nix b/pkgs/games/oh-my-git/default.nix index 881935279fe4..57fbad34057b 100644 --- a/pkgs/games/oh-my-git/default.nix +++ b/pkgs/games/oh-my-git/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { desktopName = "oh-my-git"; comment = "An interactive Git learning game!"; genericName = "An interactive Git learning game!"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index c16b38fc8f1f..d2844809eea8 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -8,7 +8,7 @@ let comment = "Open Source Jedi Academy game released by Raven Software"; desktopName = "Jedi Academy (Multi Player)"; genericName = "Jedi Academy"; - categories = "Game;"; + categories = [ "Game" ]; }; jasp = makeDesktopItem rec { name = "jasp"; @@ -17,7 +17,7 @@ let comment = "Open Source Jedi Academy game released by Raven Software"; desktopName = "Jedi Academy (Single Player)"; genericName = "Jedi Academy"; - categories = "Game;"; + categories = [ "Game" ]; }; in stdenv.mkDerivation { pname = "OpenJK"; diff --git a/pkgs/games/opensupaplex/default.nix b/pkgs/games/opensupaplex/default.nix index 44fc219bef91..d3f8155f546c 100644 --- a/pkgs/games/opensupaplex/default.nix +++ b/pkgs/games/opensupaplex/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { icon = "open-supaplex"; desktopName = "OpenSupaplex"; comment = meta.description; - categories = "Application;Game;"; + categories = [ "Application" "Game" ]; })]; meta = with lib; { diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix index 094330faffbb..bb44d9eee0b6 100644 --- a/pkgs/games/openttd/nml.nix +++ b/pkgs/games/openttd/nml.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "openttd-nml"; - version = "0.5.3"; + version = "0.6.1"; src = fetchFromGitHub { owner = "OpenTTD"; repo = "nml"; rev = version; - sha256 = "0kfnkshff3wrxsj1wpfbbw2mmgww2q80v63p5d2pp1f38x8j33w9"; + sha256 = "0z0n4lqvnqigfjjhmmz7mvis7iivd4a8d287ya2yscfg5hznnqh2"; }; propagatedBuildInputs = with python3Packages; [ply pillow]; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 8c115e9b3120..b877c3aac2fd 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation { meta = { description = "Open source clone of UFO: Enemy Unknown"; homepage = "https://openxcom.org"; - repositories.git = "https://github.com/SupSuper/OpenXcom.git"; maintainers = [ lib.maintainers.cpages ]; platforms = lib.platforms.linux; license = lib.licenses.gpl3; diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index c168af81ad6b..34808438da7d 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { comment = "Robot game"; desktopName = "Orthorobot"; genericName = "orthorobot"; - categories = "Game;"; + categories = [ "Game" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 8c6724d9e3f5..2b1a2f044fa0 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2021.1225.0"; + version = "2022.205.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-kN5pR37b0giKGJVnJo/Mce+MWFwZiY+mZAHG/fUt0O4="; + sha256 = "sha256-CzXgj3990qWOwIjhbU8vO29nDO/7HrGDtsc67VIenPI="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; @@ -63,7 +63,7 @@ buildDotnetModule rec { icon = "osu!"; comment = meta.description; type = "Application"; - categories = "Game;"; + categories = [ "Game" ]; })]; meta = with lib; { diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index e6ebf8483016..6ff9f6dfaf80 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -1,12 +1,12 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "AutoMapper"; version = "10.1.1"; sha256 = "1l1p9g7f7finr8laklbm7h2c45k0swl47iq0ik68js5s6pzvd6f8"; }) + (fetchNuGet { pname = "AutoMapper"; version = "11.0.0"; sha256 = "1ni9mmrqfbspwf7xz6by5415ci5zhg15z3f7596qqpmbn8bqg7wq"; }) (fetchNuGet { pname = "DeltaCompressionDotNet"; version = "2.0.0.0"; sha256 = "0zhj7m3zaf9wcg51385in9qg1xgkvp8yyzgq3r5k4sagm7y68aqy"; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.0"; sha256 = "09a8hkbx99iwikfl8war629945yv7i8llj9480dbc4kyp6qqlr00"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) (fetchNuGet { pname = "Fody"; version = "6.6.0"; sha256 = "0cx708ah61cxmvpaq040mhqwrv937rvlmskwihg1w118729k9yv0"; }) (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.39"; sha256 = "05rlw9h3ps1gx4pwdxjwpx1lajyvj1b35j3536ixfmnnvjx4v2yj"; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.40"; sha256 = "0k1cpkfgz4v5qigvmmvlk8lv2a731kqkmx6acf3rzr8rlj3cfnc4"; }) (fetchNuGet { pname = "Humanizer"; version = "2.13.14"; sha256 = "155g2700x6sbym2jd4dshm4rf3jjr8flx6w9xnw28zrrv7r2rdy8"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.13.14"; sha256 = "1ni4mcyhcs46ih9b8c8l3xq3iai56rdlcw0afwhji3hxwbxqbk7i"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.2.0"; sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; }) @@ -111,8 +111,10 @@ (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.2"; sha256 = "0db6d1b076nfqfn5mhy63l3gkfn5kr29hwcrx81ldr7y062r1b9y"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.2.0"; sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) @@ -153,17 +155,19 @@ (fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; sha256 = "041pva6ykc5h6az7bb87mkg32c95cvxlixgspnd34zbdldr4ypdb"; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; }) - (fetchNuGet { pname = "OpenTabletDriver"; version = "0.5.3.1"; sha256 = "16xw8w943x9gvnnpbryahff5azzy8n26j2igyqgv88m352jd9rb8"; }) - (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.5.3.1"; sha256 = "17dxsvcz9g8kzydk5xlfz9kfxl62x9wi20609rh76wjd881bg1br"; }) + (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.0.2"; sha256 = "0blwfs1cacxq0vs6fy7zjnsny8qdsr5jlxix3icmphyqgz0g4g39"; }) + (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.0.2"; sha256 = "18q6gjayqrwk6n1kf359z94z8zyb3yz4hr1dpgglk51sq6wi2z84"; }) + (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.2"; sha256 = "12hf4v8j8asc9wlywpykajb8yrzx10w6h11qbykckmrfxvz8pc0a"; }) + (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.2"; sha256 = "0z2n5jysw06zp2cxmfqddbg3g88jdm1irr2hv04q8valq0plaq5c"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2021.1210.0"; sha256 = "0dn6fc31yllr5nizylvkfl2b603b5m9694nsn5mmkh8w43h0rkbq"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2021.1225.0"; sha256 = "1md0zsjwi8zx2az42cch1wgvb5ygscncmpc4ysgz1pl6jn02v3by"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.204.0"; sha256 = "1dwg45k1qhxj4mhxw49djmab800yi7z7qnvl8ipicli4lg9k5lvf"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2021.1221.0"; sha256 = "1ffxp4nsgbqw1f6nypirmc0a3h203qikbmxm2x8w3kgcfga5dx3k"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2021.1215.0"; sha256 = "1aarb8wkzz31xa8fa6g5axwmvx89ix66ygbqq7zcyz8k9yy2ilh1"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.204.0"; sha256 = "1v4kfphjbkcxswx11c7xh93jwpsyvnskc0zia91d5bp5d11y3z32"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.187"; sha256 = "0ididsxn3005dvs0hvx7bz2xzjsfpa8kmnyfqq4c2ybjxlx15gkw"; }) - (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.486-alpha"; sha256 = "0hp6wfjgpwdgy1ag2bpjkyalw92k6qg9pc5mriij6a5vhxzadhk3"; }) + (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.501-alpha"; sha256 = "03ixv0nhszsyyf0bvyd25nkyn3c3cndzbxnva19lagvf0l9gnvjg"; }) (fetchNuGet { pname = "ppy.squirrel.windows"; version = "1.9.0.5"; sha256 = "0nmhrg3q6izapfpwdslq80fqkvjj12ad9r94pd0nr2xx1zw0x1zl"; }) - (fetchNuGet { pname = "Realm"; version = "10.7.1"; sha256 = "058jigmsxvzb7571ll9qkf0hwmgff5zddfq4pqvnzkf87i5kd2kq"; }) - (fetchNuGet { pname = "Realm.Fody"; version = "10.7.1"; sha256 = "1m3cglh39fr84pr3nr7q1hyiq83gqj0m6h8m79wl96g5xxq5v6pa"; }) + (fetchNuGet { pname = "Realm"; version = "10.8.0"; sha256 = "1ixpms8x9z5ia9yiqvhmgdlcrjvqrhbqnr8b9z6mlxwcms1z2f45"; }) + (fetchNuGet { pname = "Realm.Fody"; version = "10.8.0"; sha256 = "0hj3cqan96y01k5qgs0knkqzg3rlr2794az68xqffd2vqphvqvqq"; }) (fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) @@ -185,7 +189,7 @@ (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "Sentry"; version = "3.12.1"; sha256 = "1bqldqc0bnrxdgfxh71w3vjf3cygcn6jyrhxmjvikciirlgcs3cz"; }) + (fetchNuGet { pname = "Sentry"; version = "3.13.0"; sha256 = "0wnivy7rhzghr94pdczv7kw72y1hv5kp6hw0fkmw1nfgnsh4qjfm"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.17.1"; sha256 = "1ffiacghbcnr3fkgvdcad7b1nky54nhmmn2sm43sks9zm8grvva4"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.30.1"; sha256 = "1hib2hxjrlikwsczym1qn2slaapgjw8qzd8gmid8bryaz8hv044h"; }) (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) @@ -276,7 +280,6 @@ (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.6.0"; sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) @@ -299,6 +302,7 @@ (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-rc.1.21451.13"; sha256 = "0v5bc80p35jj5b5xdgsn5r1v4w68gqz0sahi214rprrrlr3sl206"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix index 213f2c8e4f48..e0bd6909fb94 100644 --- a/pkgs/games/pentobi/default.nix +++ b/pkgs/games/pentobi/default.nix @@ -3,14 +3,14 @@ }: mkDerivation rec { - version = "19.1"; + version = "20.0"; pname = "pentobi"; src = fetchFromGitHub { owner = "enz"; repo = "pentobi"; rev = "v${version}"; - sha256 = "sha256-opJPMvaE8fDoGaBNHySqr/LRU/UPP6292G+nYyBBL08="; + sha256 = "sha256-DQM3IJ0pRkX4OsrjZGROg50LfKb621UnpvtqSjxchz8="; }; nativeBuildInputs = [ cmake docbook_xsl qttools ]; @@ -31,7 +31,7 @@ mkDerivation rec { meta = with lib; { description = "A computer opponent for the board game Blokus"; homepage = "https://pentobi.sourceforge.io"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ ]; platforms = platforms.linux; }; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 82879d0a9d2d..b70ef8c3dab6 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,37 +1,68 @@ -{ fetchFromGitHub, lib, stdenv, cmake, pkg-config, curl, libsigcxx, SDL2 -, SDL2_image, freetype, libvorbis, libpng, assimp, libGLU, libGL -, glew +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, assimp +, curl +, freetype +#, glew +, libGL +, libGLU +, libpng +, libsigcxx +, libvorbis +, lua5_2 +, mesa +, SDL2 +, SDL2_image }: stdenv.mkDerivation rec { pname = "pioneer"; - version = "20210723"; + version = "20220203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = "sha256-w+ECVv96MoS69815+X0PqguDiGDhHoTnAnnYtLpMScI="; + hash = "sha256-HNVg8Lq6k6gQDmgOdpnBwJ57WSEnn5XwtqzmkDU1WGI="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'string(TIMESTAMP PROJECT_VERSION "%Y%m%d")' 'set(PROJECT_VERSION ${version})' + ''; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng - assimp libGLU libGL glew + assimp + curl + freetype + libGL + libGLU + libpng + libsigcxx + libvorbis + lua5_2 + mesa + SDL2 + SDL2_image ]; - preConfigure = '' - export PIONEER_DATA_DIR="$out/share/pioneer/data"; - ''; + cmakeFlags = [ + "-DPIONEER_DATA_DIR:PATH=${placeholder "out"}/share/pioneer/data" + "-DUSE_SYSTEM_LIBLUA:BOOL=YES" + ]; - makeFlags = [ "build-data" ]; + makeFlags = [ "all" "build-data" ]; meta = with lib; { description = "A space adventure game set in the Milky Way galaxy at the turn of the 31st century"; homepage = "https://pioneerspacesim.net"; license = with licenses; [ - gpl3 cc-by-sa-30 + gpl3Only cc-by-sa-30 ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/pkgs/games/polymc/0001-pick-latest-java-first.patch b/pkgs/games/polymc/0001-pick-latest-java-first.patch deleted file mode 100644 index a65dcbfd037d..000000000000 --- a/pkgs/games/polymc/0001-pick-latest-java-first.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 44e1b2a19a869b907b40e56c85c8a47aa6c22097 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= -Date: Tue, 22 Jun 2021 21:50:11 +0300 -Subject: [PATCH] pick latest java first - ---- - launcher/java/JavaInstallList.cpp | 4 ++-- - launcher/java/JavaUtils.cpp | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp -index 0bded03c..40898e20 100644 ---- a/launcher/java/JavaInstallList.cpp -+++ b/launcher/java/JavaInstallList.cpp -@@ -120,8 +120,8 @@ void JavaInstallList::updateListData(QList versions) - - bool sortJavas(BaseVersionPtr left, BaseVersionPtr right) - { -- auto rleft = std::dynamic_pointer_cast(left); -- auto rright = std::dynamic_pointer_cast(right); -+ auto rleft = std::dynamic_pointer_cast(right); -+ auto rright = std::dynamic_pointer_cast(left); - return (*rleft) > (*rright); - } - -diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp -index 5f004a10..6d633631 100644 ---- a/launcher/java/JavaUtils.cpp -+++ b/launcher/java/JavaUtils.cpp -@@ -350,7 +350,6 @@ QList JavaUtils::FindJavaPaths() - qDebug() << "Linux Java detection incomplete - defaulting to \"java\""; - - QList javas; -- javas.append(this->GetDefaultJava()->path); - auto scanJavaDir = [&](const QString & dirPath) - { - QDir dir(dirPath); -@@ -379,6 +378,7 @@ QList JavaUtils::FindJavaPaths() - // general locations used by distro packaging - scanJavaDir("/usr/lib/jvm"); - scanJavaDir("/usr/lib32/jvm"); -+ javas.append(this->GetDefaultJava()->path); - // javas stored in MultiMC's folder - scanJavaDir("java"); - return javas; --- -2.31.1 - diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix index ddfc76b8b97b..57d6a0c9faae 100644 --- a/pkgs/games/polymc/default.nix +++ b/pkgs/games/polymc/default.nix @@ -1,6 +1,5 @@ { lib , mkDerivation -, makeDesktopItem , fetchFromGitHub , cmake , jdk8 @@ -12,26 +11,26 @@ , libpulseaudio , qtbase , libGL +, glfw +, openal , msaClientID ? "" }: mkDerivation rec { pname = "polymc"; - version = "1.0.4"; + version = "1.1.1"; src = fetchFromGitHub { owner = "PolyMC"; repo = "PolyMC"; rev = version; - sha256 = "sha256-8aya0KfV9F+i2qBpweWcR9hwyTSQkqn2wHdtkCEeNvk="; + sha256 = "sha256-virXfnjCzuR2cJoyzapIopT9B+Yi1neff2ZqfOvsmxY="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; buildInputs = [ qtbase jdk8 zlib ]; - patches = [ ./0001-pick-latest-java-first.patch ]; - postPatch = '' # hardcode jdk paths substituteInPlace launcher/java/JavaUtils.cpp \ @@ -39,22 +38,9 @@ mkDerivation rec { --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' ''; - cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" ] ++ + cmakeFlags = [ "-DLauncher_PORTABLE=0" ] ++ lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; - desktopItems = [ - (makeDesktopItem { - name = "polymc"; - desktopName = "PolyMC"; - genericName = "Minecraft Launcher"; - comment = "Free, open source launcher and instance manager for Minecraft."; - icon = "launcher"; - exec = "polymc"; - categories = "Game"; - terminal = "false"; - }) - ]; - dontWrapQtApps = true; postInstall = let @@ -66,10 +52,10 @@ mkDerivation rec { libXxf86vm libpulseaudio libGL + glfw + openal ]; in '' - install -Dm644 ../launcher/resources/multimc/scalable/launcher.svg $out/share/pixmaps/polymc.svg - # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 wrapProgram $out/bin/polymc \ "''${qtWrapperArgs[@]}" \ @@ -86,6 +72,7 @@ mkDerivation rec { their associated options with a simple interface. ''; platforms = platforms.linux; + changelog = "https://github.com/PolyMC/PolyMC/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ cleverca22 starcraft66 ]; }; diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index ec5ae3e7d154..137b86f57b6b 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { name = "quakespasm"; exec = "quake"; desktopName = "Quakespasm"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/randtype/default.nix b/pkgs/games/randtype/default.nix index 0eaf2c092160..97993a5ffdac 100644 --- a/pkgs/games/randtype/default.nix +++ b/pkgs/games/randtype/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dandellion ]; license = licenses.gpl2Only; platforms = platforms.unix; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/randtype.x86_64-darwin }; } diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix new file mode 100644 index 000000000000..9bf3aca75422 --- /dev/null +++ b/pkgs/games/rare/default.nix @@ -0,0 +1,64 @@ +{ lib, fetchPypi, buildPythonApplication, makeDesktopItem, copyDesktopItems, qt5 +, pillow, psutil, pypresence, pyqt5, python, qtawesome, requests }: + +buildPythonApplication rec { + pname = "rare"; + version = "1.8.8"; + + src = fetchPypi { + inherit version; + pname = "Rare"; + sha256 = "sha256-00CtvBqSrT9yJUHZ5529VrIQtCOYkHRc8+rJHmrTSpg="; + }; + + nativeBuildInputs = [ + copyDesktopItems + qt5.wrapQtAppsHook + ]; + + propagatedBuildInputs = [ + pillow + psutil + pypresence + pyqt5 + qtawesome + requests + ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "rare"; + icon = "Rare"; + comment = meta.description; + desktopName = "Rare"; + genericName = "Rare (Epic Games Launcher Open Source Alternative)"; + }) + ]; + + dontWrapQtApps = true; + + preBuild = '' + # Solves "PermissionError: [Errno 13] Permission denied: '/homeless-shelter'" + export HOME=$(mktemp -d) + ''; + + postInstall = '' + install -Dm644 $out/${python.sitePackages}/rare/resources/images/Rare.png -t $out/share/pixmaps/ + ''; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + # Project has no tests + doCheck = false; + + meta = with lib; { + description = "GUI for Legendary, an Epic Games Launcher open source alternative"; + homepage = "https://github.com/Dummerle/Rare"; + maintainers = with maintainers; [ wolfangaukang ]; + license = licenses.gpl3Only; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index fd570e4d7c63..b01d616452bb 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Rocks'n'Diamonds"; genericName = "Tile-based puzzle"; - categories = "Game;LogicGame;"; + categories = [ "Game" "LogicGame" ]; }; buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net ]; diff --git a/pkgs/games/rott/default.nix b/pkgs/games/rott/default.nix index cac357faf2e0..b3a517dab02b 100644 --- a/pkgs/games/rott/default.nix +++ b/pkgs/games/rott/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { name = "rott"; exec = "launch-rott"; desktopName = "Rise of the Triad: ${if buildShareware then "The HUNT Begins" else "Dark War"}"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix index 8128a67ebeee..cad3b539d9ad 100644 --- a/pkgs/games/rpg-cli/default.nix +++ b/pkgs/games/rpg-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; rev = version; - sha256 = "sha256-Ih+1qO/VHkRp766WDe09xXL/pkby+sURopy7m5wRn4Y="; + sha256 = "sha256-rhG/EK68PWvQYoZdjhk0w7oNmh/QiTaAt4/WgEkgxEA="; }; - cargoSha256 = "sha256-Au7Nlpl4XOSG8rW0DaHFDqBr1kUY5Emyw6ff0htPc+I="; + cargoSha256 = "sha256-YXQohmDmkClziaLkL2N4cGURZ0tewyt7BuNY4hS+a4w="; # tests assume the authors macbook, and thus fail doCheck = false; diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 9a2ce6314cd1..d342d543e2fc 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -31,10 +31,9 @@ stdenv.mkDerivation rec { exec = "runelite"; icon = icon; comment = "Open source Old School RuneScape client"; - terminal = "false"; desktopName = "RuneLite"; genericName = "Oldschool Runescape"; - categories = "Game"; + categories = [ "Game" ]; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index 7373779c9e5a..1d2e39d4164e 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { icon = "sauerbraten"; desktopName = "Sauerbraten"; comment = "FPS that uses an improved version of the Cube engine"; - categories = "Application;Game;ActionGame;"; + categories = [ "Application" "Game" "ActionGame" ]; }) ]; diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index e6fb00eb76cf..4711ffa2f549 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -68,7 +68,7 @@ tcl.mkTclDerivation rec { comment = meta.description; icon = "scid"; exec = "scid"; - categories = "Game;BoardGame;"; + categories = [ "Game" "BoardGame" ]; }; meta = with lib; { diff --git a/pkgs/games/scummvm/games.nix b/pkgs/games/scummvm/games.nix index 2ffd176ccf6e..b146bf1bc49d 100644 --- a/pkgs/games/scummvm/games.nix +++ b/pkgs/games/scummvm/games.nix @@ -3,7 +3,7 @@ let desktopItem = name: short: long: description: makeDesktopItem { - categories = "Game;AdventureGame;"; + categories = [ "Game" "AdventureGame" ]; comment = description; desktopName = long; exec = "@out@/bin/${short}"; diff --git a/pkgs/games/sdlpop/default.nix b/pkgs/games/sdlpop/default.nix index f9b91e3dc158..f9f2f6d0dc91 100644 --- a/pkgs/games/sdlpop/default.nix +++ b/pkgs/games/sdlpop/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { exec = "prince"; desktopName = "SDLPoP"; comment = "An open-source port of Prince of Persia"; - categories = "Game;AdventureGame;"; + categories = [ "Game" "AdventureGame" ]; }) ]; meta = with lib; { diff --git a/pkgs/games/sgt-puzzles/default.upstream b/pkgs/games/sgt-puzzles/default.upstream deleted file mode 100644 index b6d048b68ae9..000000000000 --- a/pkgs/games/sgt-puzzles/default.upstream +++ /dev/null @@ -1,5 +0,0 @@ -minimize_overwrite -url http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles.tar.gz -redirect -NEED_TO_CHOOSE_URL= -version '.*[-_.]([0-9]{8}[.][^.]+)[.]tar[.].*' '\1' diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index 59f01f6a2c47..37138f152b6a 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { comment = "Fast-paced one button platformer"; desktopName = "Sienna"; genericName = "sienna"; - categories = "Game;"; + categories = [ "Game" ]; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index bf603e2f5308..55c61c4cbd82 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://springlobby.info/"; - repositories.git = "git://github.com/springlobby/springlobby.git"; description = "Cross-platform lobby client for the Spring RTS project"; license = licenses.gpl2; maintainers = with maintainers; [ qknight domenkozar ]; diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index 4aac0afb22b1..95fb3988f28e 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { comment = meta.description; genericName = "starsector"; desktopName = "Starsector"; - categories = "Game;"; + categories = [ "Game" ]; }) ]; diff --git a/pkgs/games/steam-tui/default.nix b/pkgs/games/steam-tui/default.nix index 66e17b1752ea..63deb3b969ce 100644 --- a/pkgs/games/steam-tui/default.nix +++ b/pkgs/games/steam-tui/default.nix @@ -2,7 +2,7 @@ , rustPlatform , steamcmd , fetchFromGitHub -, steam-run-native +, steam-run , runtimeShell , withWine ? false , wine @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-VYBzwDLSV4N4qt2dNgIS399T2HIbPTdQ2rDIeheLlfo="; - buildInputs = [ steamcmd steam-run-native ] + buildInputs = [ steamcmd ] ++ lib.optional withWine wine; preFixup = '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cat > $out/bin/steam-tui < 2.0, >= 2.0.3) + json_pure (~> 2.3, >= 2.3.1) + thor (~> 1.0, >= 1.0.1) + +PLATFORMS + ruby + +DEPENDENCIES + vimgolf + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/games/vimgolf/default.nix b/pkgs/games/vimgolf/default.nix new file mode 100644 index 000000000000..2847ff7dd3bf --- /dev/null +++ b/pkgs/games/vimgolf/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "vimgolf"; + gemdir = ./.; + exes = [ "vimgolf" ]; + + passthru.updateScript = bundlerUpdateScript "vimgolf"; + + meta = with lib; { + description = "A game that tests Vim efficiency"; + homepage = "https://vimgolf.com"; + license = licenses.mit; + maintainers = with maintainers; [ leungbk ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/games/vimgolf/gemset.nix b/pkgs/games/vimgolf/gemset.nix new file mode 100644 index 000000000000..17d66b934b22 --- /dev/null +++ b/pkgs/games/vimgolf/gemset.nix @@ -0,0 +1,43 @@ +{ + highline = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + type = "gem"; + }; + version = "2.0.3"; + }; + json_pure = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05ddn30jkpw6anfakfm7lffnrl2i0265ryrrwa4j0ivihjr95y82"; + type = "gem"; + }; + version = "2.6.1"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + type = "gem"; + }; + version = "1.2.1"; + }; + vimgolf = { + dependencies = ["highline" "json_pure" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "190dzqkvshd4i6jf30xnpm4sczraw6rdh4wvfh6qnmg0czmj0sny"; + type = "gem"; + }; + version = "0.5.0"; + }; +} diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index 46d847dee690..e6e7d28e17bd 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.16.1"; + version = "1.16.4"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; - sha256 = "sha256-o3FMuMvWxj9ECj77H/q5QkpcFbcZ0eNQ1OS51pUal3c="; + sha256 = "sha256-wdwQ1Dv0872nEOYIB+rEzYtG5rnSw8DZgoSlSvCvtrI="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; @@ -47,8 +47,7 @@ stdenv.mkDerivation rec { exec = "vintagestory"; icon = "vintagestory"; comment = "Innovate and explore in a sandbox world"; - type = "Application"; - categories = "Game;"; + categories = [ "Game" ]; }; installPhase = '' diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 788fbdbf6c8e..a44f965b0e55 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.2.4"; + version = "4.2.7"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "sha256-IkD1WkeKas9qtUUTTo9w4cEoGAoX+d+Cr2C5PTUFaEg="; + sha256 = "sha256-f1J84A7aRAmbGn48MD7eJ2+DX21q2UWwYAoXXdq7ALA="; }; buildInputs = [ diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index fee4699aec92..00a8af6d8b70 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -8,11 +8,10 @@ let desktopItem = makeDesktopItem { desktopName = "World of Goo"; genericName = "World of Goo"; - categories = "Game;"; + categories = [ "Game" ]; exec = "WorldOfGoo.bin.${arch}"; icon = "2dboy-worldofgoo"; name = "worldofgoo"; - type = "Application"; }; in diff --git a/pkgs/games/xbill/default.nix b/pkgs/games/xbill/default.nix index a20b52e78546..765af44936a2 100644 --- a/pkgs/games/xbill/default.nix +++ b/pkgs/games/xbill/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { icon = "xbill"; desktopName = "XBill"; comment = "Get rid of those Wingdows viruses!"; - categories = "Game;ArcadeGame;"; + categories = [ "Game" "ArcadeGame" ]; }) ]; postInstall = '' diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index d5374c5446d1..46b0b594d724 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -50,9 +50,9 @@ let exec = "xonotic"; comment = meta.description; desktopName = "Xonotic"; - categories = "Game;Shooter;"; + categories = [ "Game" "Shooter" ]; icon = "xonotic"; - startupNotify = "false"; + startupNotify = false; }; xonotic-unwrapped = stdenv.mkDerivation rec { diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index ee7cbd8fb48d..ff34bfe729ba 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xsnow"; - version = "3.3.6"; + version = "3.4.4"; src = fetchurl { url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz"; - sha256 = "sha256-rTJO1btS1VBHatj9Yr2R6vZBUPQtCB1Aa6AD6IzwuLg="; + sha256 = "sha256-fPMy5AxKspFkcWphf/IjMc/ZQtayljThKxbcMtvOjRc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/games/xtris/default.nix b/pkgs/games/xtris/default.nix index e6da0c6f17cc..2263a46187e9 100644 --- a/pkgs/games/xtris/default.nix +++ b/pkgs/games/xtris/default.nix @@ -18,10 +18,12 @@ stdenv.mkDerivation rec { ''; buildInputs = [ xorg.libX11 ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + meta = with lib; { description = "A multi-player version of the classical game of Tetris, for the X Window system"; homepage = "https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris.html"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index d079b3f61ca4..49fdc7a829c5 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, openssl, pkgsCross, buildPackages }: +{ lib, stdenv, fetchFromGitHub, openssl, pkgsCross, buildPackages + +# Warning: this blob runs on the main CPU (not the GPU) at privilege +# level EL3, which is above both the kernel and the hypervisor. +, unfreeIncludeHDCPBlob ? true +}: let buildArmTrustedFirmware = { filesToInstall @@ -10,7 +15,7 @@ let , ... } @ args: stdenv.mkDerivation ({ - name = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}-${version}"; + pname = "arm-trusted-firmware${lib.optionalString (platform != null) "-${platform}"}"; inherit version; src = fetchFromGitHub { @@ -20,6 +25,11 @@ let sha256 = "sha256-qT9DdTvMcUrvRzgmVf2qmKB+Rb1WOB4p1rM+fsewGcg="; }; + patches = lib.optionals (!unfreeIncludeHDCPBlob) [ + # this is a rebased version of https://gitlab.com/vicencb/kevinboot/-/blob/master/atf.patch + ./remove-hdcp-blob.patch + ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; # For Cortex-M0 firmware in RK3399 @@ -50,7 +60,7 @@ let meta = with lib; { homepage = "https://github.com/ARM-software/arm-trusted-firmware"; description = "A reference implementation of secure world software for ARMv8-A"; - license = licenses.bsd3; + license = (if unfreeIncludeHDCPBlob then [ licenses.unfreeRedistributable ] else []) ++ [ licenses.bsd3 ]; maintainers = with maintainers; [ lopsided98 ]; } // extraMeta; } // builtins.removeAttrs args [ "extraMeta" ]); diff --git a/pkgs/misc/arm-trusted-firmware/remove-hdcp-blob.patch b/pkgs/misc/arm-trusted-firmware/remove-hdcp-blob.patch new file mode 100644 index 000000000000..7f99fbdcabfd --- /dev/null +++ b/pkgs/misc/arm-trusted-firmware/remove-hdcp-blob.patch @@ -0,0 +1,47 @@ +diff --git a/plat/rockchip/rk3399/drivers/dp/cdn_dp.c b/plat/rockchip/rk3399/drivers/dp/cdn_dp.c +index a8773f4f6..8e28c4830 100644 +--- a/plat/rockchip/rk3399/drivers/dp/cdn_dp.c ++++ b/plat/rockchip/rk3399/drivers/dp/cdn_dp.c +@@ -13,17 +13,6 @@ + + #include + +-__asm__( +- ".pushsection .text.hdcp_handler, \"ax\", %progbits\n" +- ".global hdcp_handler\n" +- ".balign 4\n" +- "hdcp_handler:\n" +- ".incbin \"" HDCPFW "\"\n" +- ".type hdcp_handler, %function\n" +- ".size hdcp_handler, .- hdcp_handler\n" +- ".popsection\n" +-); +- + static uint64_t *hdcp_key_pdata; + static struct cdn_dp_hdcp_key_1x key; + +@@ -38,7 +27,7 @@ uint64_t dp_hdcp_ctrl(uint64_t type) + return 0; + case HDCP_KEY_DATA_START_DECRYPT: + if (hdcp_key_pdata == (uint64_t *)(&key + 1)) +- return hdcp_handler(&key); ++ return PSCI_E_DISABLED; + else + return PSCI_E_INVALID_PARAMS; + assert(0); /* Unreachable */ +diff --git a/plat/rockchip/rk3399/platform.mk b/plat/rockchip/rk3399/platform.mk +index a658fb286..5edb6a25b 100644 +--- a/plat/rockchip/rk3399/platform.mk ++++ b/plat/rockchip/rk3399/platform.mk +@@ -88,11 +88,6 @@ $(eval $(call add_define_val,RK3399M0PMUFW,\"$(RK3399M0PMUFW)\")) + ifdef PLAT_RK_DP_HDCP + BL31_SOURCES += ${RK_PLAT_SOC}/drivers/dp/cdn_dp.c + +-HDCPFW=${RK_PLAT_SOC}/drivers/dp/hdcp.bin +-$(eval $(call add_define_val,HDCPFW,\"$(HDCPFW)\")) +- +-${BUILD_PLAT}/bl31/cdn_dp.o: CCACHE_EXTRAFILES=$(HDCPFW) +-${RK_PLAT_SOC}/drivers/dp/cdn_dp.c: $(HDCPFW) + endif + + # CCACHE_EXTRAFILES is needed because ccache doesn't handle .incbin diff --git a/pkgs/misc/autoadb/default.nix b/pkgs/misc/autoadb/default.nix new file mode 100644 index 000000000000..25043e9d45d6 --- /dev/null +++ b/pkgs/misc/autoadb/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "autoadb"; + version = "unstable-2020-06-01"; + + src = fetchFromGitHub { + owner = "rom1v"; + repo = pname; + rev = "7f8402983603a9854bf618a384f679a17cd85e2d"; + sha256 = "sha256-9Sv38dCtvbqvxSnRpq+HsIwF/rfLUVZbi0J+mltLres="; + }; + + cargoSha256 = "1gzg1lhq8gp790mrc8fw8dg146k8lg20pnk45m2ssnmdka0826f7"; + + meta = with lib; { + description = "Execute a command whenever a device is adb-connected"; + homepage = "https://github.com/rom1v/autoadb"; + license = licenses.asl20; + maintainers = with maintainers; [ shawn8901 ]; + }; +} diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index 92d84bdf6dc8..fe04d28aa9de 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -5,16 +5,16 @@ stdenv.mkDerivation rec { pname = "beep"; - version = "1.4.9"; + version = "1.4.12"; src = fetchFromGitHub { owner = "spkr-beep"; repo = "beep"; rev = "v${version}"; - sha256 = "JLaoiINHpIFWSqsRl8wJ/NeBu7SCcPuT/BzY8szEu0o="; + sha256 = "sha256-gDgGI9F+wW2cN89IwP93PkMv6vixJA2JckF78nxZ+TU="; }; - makeFlags = [ "DESTDIR=\${out}" "prefix="]; + makeFlags = [ "prefix=${placeholder "out"}"]; meta = with lib; { description = "The advanced PC speaker beeper"; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 0e9977f564b1..af43c55072c3 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -18,24 +18,22 @@ , avahi ? null , libpaper ? null , coreutils +, nixosTests }: -### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test -### works at least for your platform. - with lib; stdenv.mkDerivation rec { pname = "cups"; # After 2.2.6, CUPS requires headers only available in macOS 10.12+ - version = if stdenv.isDarwin then "2.2.6" else "2.4.0"; + version = if stdenv.isDarwin then "2.2.6" else "2.4.1"; src = fetchurl (if stdenv.isDarwin then { url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; sha256 = "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"; } else { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "1pm6lf08z8vgs62g5b5rjw32qy3vr0q3sgidpg2lfs6a530wxgls"; + sha256 = "sha256-xzOfdfjU8t7FDGczQaRfwGtohbttQ2bWv1mk5sEK4Xg="; }); outputs = [ "out" "lib" "dev" "man" ]; @@ -137,6 +135,8 @@ stdenv.mkDerivation rec { --replace "Exec=htmlview" "Exec=xdg-open" ''; + passthru.tests.nixos = nixosTests.printing; + meta = { homepage = "https://openprinting.github.io/cups/"; description = "A standards-based printing system for UNIX"; diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix index 916ac32c2e9b..768256e816a4 100644 --- a/pkgs/misc/cups/drivers/hl1110/default.nix +++ b/pkgs/misc/cups/drivers/hl1110/default.nix @@ -17,7 +17,8 @@ lprdeb = fetchurl { }; in stdenv.mkDerivation { - name = "cups-brother-hl1110"; + pname = "cups-brother-hl1110"; + inherit version; srcs = [ lprdeb cupssrc cupsdeb ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/misc/cups/drivers/hl1210w/default.nix b/pkgs/misc/cups/drivers/hl1210w/default.nix index 975e07aa6c3f..abdc5b061ac0 100644 --- a/pkgs/misc/cups/drivers/hl1210w/default.nix +++ b/pkgs/misc/cups/drivers/hl1210w/default.nix @@ -12,7 +12,8 @@ let }; in stdenv.mkDerivation { - name = "cups-brother-hl1210W"; + pname = "cups-brother-hl1210W"; + inherit version; srcs = [ lprdeb cupsdeb ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/misc/cups/drivers/hl3140cw/default.nix b/pkgs/misc/cups/drivers/hl3140cw/default.nix index 255fae09c7a7..fc6a06535ebe 100644 --- a/pkgs/misc/cups/drivers/hl3140cw/default.nix +++ b/pkgs/misc/cups/drivers/hl3140cw/default.nix @@ -17,7 +17,8 @@ let }; in stdenv.mkDerivation { - name = "cups-brother-hl3140cw"; + pname = "cups-brother-hl3140cw"; + inherit version; nativeBuildInputs = [ makeWrapper dpkg ]; buildInputs = [ cups ghostscript a2ps ]; diff --git a/pkgs/misc/cups/drivers/hll2340dw/default.nix b/pkgs/misc/cups/drivers/hll2340dw/default.nix index e61d3ace5f15..5704cb6ccda4 100644 --- a/pkgs/misc/cups/drivers/hll2340dw/default.nix +++ b/pkgs/misc/cups/drivers/hll2340dw/default.nix @@ -16,7 +16,8 @@ let in stdenv.mkDerivation { - name = "cups-brother-hll2340dw"; + pname = "cups-brother-hll2340dw"; + inherit version; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ cups ghostscript dpkg a2ps ]; diff --git a/pkgs/misc/cups/drivers/mfcl2750dw/default.nix b/pkgs/misc/cups/drivers/mfcl2750dw/default.nix new file mode 100644 index 000000000000..f51a5e74666c --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcl2750dw/default.nix @@ -0,0 +1,93 @@ +{ lib +, stdenv +, fetchurl +, dpkg +, autoPatchelfHook +, makeWrapper +, perl +, gnused +, ghostscript +, file +, coreutils +, gnugrep +, which +}: + +let + arches = [ "x86_64" "i686" "armv7l" ]; + + runtimeDeps = [ + ghostscript + file + gnused + gnugrep + coreutils + which + ]; +in + +stdenv.mkDerivation rec { + pname = "cups-brother-mfcl2750dw"; + version = "4.0.0-1"; + + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ]; + buildInputs = [ perl ]; + + dontUnpack = true; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf103530/mfcl2750dwpdrv-${version}.i386.deb"; + hash = "sha256-3uDwzLQTF8r1tsGZ7ChGhk4ryQmVsZYdUaj9eFaC0jc="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out + dpkg-deb -x $src $out + + # delete unnecessary files for the current architecture + '' + lib.concatMapStrings (arch: '' + echo Deleting files for ${arch} + rm -r "$out/opt/brother/Printers/MFCL2750DW/lpd/${arch}" + '') (builtins.filter (arch: arch != stdenv.hostPlatform.linuxArch) arches) + '' + + # bundled scripts don't understand the arch subdirectories for some reason + ln -s \ + "$out/opt/brother/Printers/MFCL2750DW/lpd/${stdenv.hostPlatform.linuxArch}/"* \ + "$out/opt/brother/Printers/MFCL2750DW/lpd/" + + # Fix global references and replace auto discovery mechanism with hardcoded values + substituteInPlace $out/opt/brother/Printers/MFCL2750DW/lpd/lpdfilter \ + --replace /opt "$out/opt" \ + --replace "my \$BR_PRT_PATH =" "my \$BR_PRT_PATH = \"$out/opt/brother/Printers/MFCL2750DW\"; #" \ + --replace "PRINTER =~" "PRINTER = \"MFCL2750DW\"; #" + + # Make sure all executables have the necessary runtime dependencies available + find "$out" -executable -and -type f | while read file; do + wrapProgram "$file" --prefix PATH : "${lib.makeBinPath runtimeDeps}" + done + + # Symlink filter and ppd into a location where CUPS will discover it + mkdir -p $out/lib/cups/filter + mkdir -p $out/share/cups/model + + ln -s \ + $out/opt/brother/Printers/MFCL2750DW/lpd/lpdfilter \ + $out/lib/cups/filter/brother_lpdwrapper_MFCL2750DW + + ln -s \ + $out/opt/brother/Printers/MFCL2750DW/cupswrapper/brother-MFCL2750DW-cups-en.ppd \ + $out/share/cups/model/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://www.brother.com/"; + description = "Brother MFC-L2750DW printer driver"; + license = licenses.unfree; + platforms = builtins.map (arch: "${arch}-linux") arches; + maintainers = [ maintainers.lovesegfault ]; + }; +} diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 98f5880f8995..fdf4f163ba85 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,28 +1,62 @@ -{ lib, stdenv, fetchurl, pkg-config, cups, poppler, poppler_utils, fontconfig -, libjpeg, libpng, perl, ijs, qpdf, dbus, avahi -, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript -, mupdf, dejavu_fonts, liblouis +{ lib +, avahi +, bc +, coreutils +, cups +, dbus +, dejavu_fonts +, fetchurl +, fontconfig +, gawk +, ghostscript +, gnugrep +, gnused +, ijs +, libjpeg +, liblouis +, libpng +, makeWrapper +, mupdf +, perl +, pkg-config +, poppler +, poppler_utils +, qpdf +, stdenv +, which +, withAvahi ? true }: let - binPath = lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ]; + binPath = lib.makeBinPath [ bc coreutils gawk gnused gnugrep which ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "cups-filters"; - version = "1.28.10"; + version = "1.28.12"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz"; - sha256 = "sha256-z4yQRpTETPaJtXJORtI9qa5RJdVDdLNAxkIHfMKcqDc="; + sha256 = "sha256-RuLqPYhK0iK7hjzmUR5ZzzkO+Og1KVvkSoDlALKjOjo="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ - cups poppler poppler_utils fontconfig libjpeg libpng perl - ijs qpdf dbus avahi ghostscript mupdf + cups + dbus + fontconfig + ghostscript + ijs + libjpeg liblouis # braille embosser support - ]; + libpng + mupdf + perl + poppler + poppler_utils + qpdf + ] ++ lib.optionals withAvahi [ avahi ]; configureFlags = [ "--with-mutool-path=${mupdf}/bin/mutool" @@ -37,7 +71,7 @@ in stdenv.mkDerivation rec { "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf" "--localstatedir=/var" "--sysconfdir=/etc" - ]; + ] ++ lib.optionals (!withAvahi) [ "--disable-avahi" ]; makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ]; diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 44c6e8a4c610..6f17bcbf412b 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.45"; + version = "1.1.46"; src = fetchurl { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent # version. - url = "https://download3.ebz.epson.net/dsc/f/03/00/13/38/11/01e244e8529c5cbcec8d39220a9512d5e6c08eec/epson-inkjet-printer-escpr2-1.1.45-1lsb3.2.src.rpm"; - sha256 = "sha256-MZXn1fsD3D6W5vlX+NwRkwLtaBRqQwe9lwnJC2L9Lfk="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/13/43/83/99e36ae2747bfae54a5dd32dacaf189a073278aa/epson-inkjet-printer-escpr2-1.1.46-1lsb3.2.src.rpm"; + sha256 = "sha256-7AeDULD/BB+swLBOwijilcM+yJi5slOMw2lEtquLyYw="; }; unpackPhase = '' diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index adfe889e02d9..a7ee870a74a6 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -14,16 +14,16 @@ let pname = "hplip"; - version = "3.20.11"; + version = "3.21.12"; src = fetchurl { url = "mirror://sourceforge/hplip/${pname}-${version}.tar.gz"; - sha256 = "CxZ1s9jnCaEyX+hj9arOO9NxB3mnPq6Gj3su6aVv2xE="; + sha256 = "sha256-fvRSPvgbztcVFeHIhA72xoxgJjjBWebdmpJpHO7GT5w="; }; plugin = fetchurl { url = "https://developers.hp.com/sites/default/files/${pname}-${version}-plugin.run"; - sha256 = "r8PoQQFfjdHKySPCFwtDR8Tl6v5Eag9gXpBAp6sCF9Q="; + sha256 = "sha256-eyYNhuff8mM4IpRfn/fLBjQJ23JrTdsHBQ/EH7Ug0gw="; }; hplipState = substituteAll { @@ -83,17 +83,13 @@ python3Packages.buildPythonApplication { dbus-python ] ++ lib.optionals withQt5 [ pyqt5 + pyqt5_sip enum-compat ]; makeWrapperArgs = [ "--prefix" "PATH" ":" "${nettools}/bin" ]; patches = [ - # remove ImageProcessor usage, it causes segfaults, see - # https://bugs.launchpad.net/hplip/+bug/1788706 - # https://bugs.launchpad.net/hplip/+bug/1787289 - ./image-processor.patch - # HPLIP's getSystemPPDs() function relies on searching for PPDs below common FHS # paths, and hp-setup crashes if none of these paths actually exist (which they # don't on NixOS). Add the equivalent NixOS path, /var/lib/cups/path/share. @@ -123,19 +119,25 @@ python3Packages.buildPythonApplication { {} + ''; - configureFlags = let out = placeholder "out"; in [ - "--with-hpppddir=${out}/share/cups/model/HP" - "--with-cupsfilterdir=${out}/lib/cups/filter" - "--with-cupsbackenddir=${out}/lib/cups/backend" - "--with-icondir=${out}/share/applications" - "--with-systraydir=${out}/xdg/autostart" - "--with-mimedir=${out}/etc/cups" - "--enable-policykit" - "--disable-qt4" - ] + configureFlags = let out = placeholder "out"; in + [ + "--with-hpppddir=${out}/share/cups/model/HP" + "--with-cupsfilterdir=${out}/lib/cups/filter" + "--with-cupsbackenddir=${out}/lib/cups/backend" + "--with-icondir=${out}/share/applications" + "--with-systraydir=${out}/xdg/autostart" + "--with-mimedir=${out}/etc/cups" + "--enable-policykit" + "--disable-qt4" + + # remove ImageProcessor usage, it causes segfaults, see + # https://bugs.launchpad.net/hplip/+bug/1788706 + # https://bugs.launchpad.net/hplip/+bug/1787289 + "--disable-imageProcessor-build" + ] ++ lib.optional withStaticPPDInstall "--enable-cups-ppd-install" ++ lib.optional withQt5 "--enable-qt5" - ; + ; # Prevent 'ppdc: Unable to find include file ""' which prevent # generation of '*.ppd' files. diff --git a/pkgs/misc/drivers/hplip/image-processor.patch b/pkgs/misc/drivers/hplip/image-processor.patch deleted file mode 100644 index 30df1d29d97e..000000000000 --- a/pkgs/misc/drivers/hplip/image-processor.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 207aa582477dd874d1651db2d0654c5d6adb6e0a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Fri, 20 Dec 2019 13:13:52 +0000 -Subject: [PATCH] remove imageprocessor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - Makefile.am | 4 ++-- - Makefile.in | 2 +- - prnt/hpcups/HPCupsFilter.cpp | 19 ------------------- - 3 files changed, 3 insertions(+), 22 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 891660d..484a051 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER - dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py - endif #HPLIP_CLASS_DRIVER - --dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so -+dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template - dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv - - if !HPLIP_CLASS_DRIVER -@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp - prnt/hpcups/ImageProcessor.h - - hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) --hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS) -+hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS) - #else - #hpcupsdir = $(cupsfilterdir) - #hpcups_PROGRAMS = hpcups -diff --git a/Makefile.in b/Makefile.in -index 16c39f0..46a767e 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -4814,7 +4814,7 @@ libapdk_la_CFLAGS = $(libapdk_la_CXXFLAGS) -Iprnt/hpijs - @HPCUPS_INSTALL_TRUE@ prnt/hpcups/ImageProcessor.h - - @HPCUPS_INSTALL_TRUE@hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS) --@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS) -+@HPCUPS_INSTALL_TRUE@hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS) - #else - #hpcupsdir = $(cupsfilterdir) - #hpcups_PROGRAMS = hpcups -diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp -index 5b282d8..153ee3a 100644 ---- a/prnt/hpcups/HPCupsFilter.cpp -+++ b/prnt/hpcups/HPCupsFilter.cpp -@@ -31,7 +31,6 @@ - \*****************************************************************************/ - - #include "HPCupsFilter.h" --#include "ImageProcessor.h" - - #include - #include -@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) - - - sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); -- image_processor_t* imageProcessor = imageProcessorCreate(); - - while (cupsRasterReadHeader2(cups_raster, &cups_header)) - { - -- IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header); -- if (result != IPE_SUCCESS){ -- dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result); -- } -- - current_page_number++; - - if (current_page_number == 1) { -@@ -745,11 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) - color_raster = rgbRaster; - black_raster = kRaster; - -- result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine); -- if (result != IPE_SUCCESS){ -- dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result); -- } -- - - if ((y == 0) && !is_ljmono) { - //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer -@@ -780,11 +768,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) - } - } // for() loop end - -- result = imageProcessorEndPage(imageProcessor); -- if (result != IPE_SUCCESS){ -- dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result); -- } -- - - m_Job.NewPage(); - if (err != NO_ERROR) { -@@ -800,8 +783,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) - rgbRaster = NULL; - } - -- imageProcessorDestroy(imageProcessor); -- - unlink(hpPreProcessedRasterFile); - return ret_status; - } --- -2.24.1 - diff --git a/pkgs/misc/drivers/logiops/default.nix b/pkgs/misc/drivers/logiops/default.nix new file mode 100644 index 000000000000..71283a406214 --- /dev/null +++ b/pkgs/misc/drivers/logiops/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, udev, libevdev, libconfig }: + +stdenv.mkDerivation rec { + pname = "logiops"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "pixlone"; + repo = "logiops"; + rev = "v${version}"; + sha256 = "sha256-1v728hbIM2ODtB+r6SYzItczRJCsbuTvhYD2OUM1+/E="; + }; + + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ udev libevdev libconfig ]; + + meta = with lib; { + description = "Unofficial userspace driver for HID++ Logitech devices"; + homepage = "https://github.com/PixlOne/logiops"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ckie ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 72c342e7b6a9..f81e81ecbea0 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, sconsPackages +, scons , libX11 , pkg-config , libusb1 @@ -22,10 +22,18 @@ stdenv.mkDerivation rec { }; makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config scons ]; buildInputs = [ libX11 libusb1 boost glib dbus-glib ]; + enableParallelBuilding = true; dontUseSconsInstall = true; + patches = [ + ./fix-60-sec-delay.patch + ./scons-py3.patch + ./scons-v4.2.0.patch + ./xboxdrvctl-py3.patch + ]; + meta = with lib; { homepage = "https://xboxdrv.gitlab.io/"; description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; diff --git a/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch b/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch new file mode 100644 index 000000000000..da543d2cfa01 --- /dev/null +++ b/pkgs/misc/drivers/xboxdrv/fix-60-sec-delay.patch @@ -0,0 +1,27 @@ +From 7326421eeaadbc2aeb3828628c2e65bb7be323a9 Mon Sep 17 00:00:00 2001 +From: buxit +Date: Wed, 2 Nov 2016 16:25:14 +0100 +Subject: [PATCH] fix 60 seconds delay + +use `libusb_handle_events_timeout_completed()` instead of `libusb_handle_events()` +should fix #144 +--- + src/usb_gsource.cpp | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/usb_gsource.cpp b/src/usb_gsource.cpp +index 00bf1315..afb38f65 100644 +--- a/src/usb_gsource.cpp ++++ b/src/usb_gsource.cpp +@@ -174,7 +174,10 @@ USBGSource::on_source_dispatch(GSource* source, GSourceFunc callback, gpointer u + gboolean + USBGSource::on_source() + { +- libusb_handle_events(NULL); ++ struct timeval to; ++ to.tv_sec = 0; ++ to.tv_usec = 0; ++ libusb_handle_events_timeout_completed(NULL, &to, NULL); + return TRUE; + } + diff --git a/pkgs/misc/drivers/xboxdrv/scons-py3.patch b/pkgs/misc/drivers/xboxdrv/scons-py3.patch new file mode 100644 index 000000000000..4aa6fa619317 --- /dev/null +++ b/pkgs/misc/drivers/xboxdrv/scons-py3.patch @@ -0,0 +1,63 @@ +From 17bd43a7d3ef86216abc36b42b4e6a1f70aa9979 Mon Sep 17 00:00:00 2001 +From: xnick +Date: Thu, 12 Oct 2017 20:34:35 +0300 +Subject: [PATCH] Update SConstruct + +python3 compatible +--- + SConstruct | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 4cd79704..c0007054 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -19,7 +19,7 @@ def build_dbus_glue(target, source, env): + xml = re.sub(r"callback = \(([A-Za-z_]+)\) \(marshal_data \? marshal_data : cc->callback\);", + r"union { \1 fn; void* obj; } conv;\n " + "conv.obj = (marshal_data ? marshal_data : cc->callback);\n " +- "callback = conv.fn;", xml) ++ "callback = conv.fn;", xml.decode('utf-8')) + + with open(target[0].get_path(), "w") as f: + f.write(xml) +@@ -29,10 +29,10 @@ def build_bin2h(target, source, env): + Takes a list of files and converts them into a C source that can be included + """ + def c_escape(str): +- return str.translate(string.maketrans("/.-", "___")) ++ return str.translate(bytes.maketrans(b"/.-", b"___")) + +- print target +- print source ++ print(target) ++ print(source) + with open(target[0].get_path(), "w") as fout: + fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n") + +@@ -45,8 +45,8 @@ def build_bin2h(target, source, env): + data = fin.read() + fout.write("// \"%s\"\n" % src.get_path()) + fout.write("const char %s[] = {" % c_escape(src.get_path())) +- bytes_arr = ["0x%02x" % ord(c) for c in data] +- for i in xrange(len(bytes_arr)): ++ bytes_arr = ["0x%02x" % c for c in data] ++ for i in range(len(bytes_arr)): + if i % 13 == 0: + fout.write("\n ") + fout.write(bytes_arr[i]) +@@ -131,12 +131,12 @@ env.Append(CPPDEFINES = { 'PACKAGE_VERSION': "'\"%s\"'" % package_version }) + conf = Configure(env) + + if not conf.env['CXX']: +- print "g++ must be installed!" ++ print('g++ must be installed!') + Exit(1) + + # X11 checks + if not conf.CheckLibWithHeader('X11', 'X11/Xlib.h', 'C++'): +- print 'libx11-dev must be installed!' ++ print('libx11-dev must be installed!') + Exit(1) + + env = conf.Finish() diff --git a/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch b/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch new file mode 100644 index 000000000000..04b05e8d6ffc --- /dev/null +++ b/pkgs/misc/drivers/xboxdrv/scons-v4.2.0.patch @@ -0,0 +1,20 @@ +--- a/SConstruct 2021-10-31 20:42:44.232084185 -0400 ++++ b/SConstruct 2021-10-31 20:42:54.063024444 -0400 +@@ -36,7 +36,7 @@ + with open(target[0].get_path(), "w") as fout: + fout.write("// autogenerated by scons Bin2H builder, do not edit by hand!\n\n") + +- if env.has_key("BIN2H_NAMESPACE"): ++ if "BIN2H_NAMESPACE" in env: + fout.write("namespace %s {\n\n" % env["BIN2H_NAMESPACE"]) + + # write down data +@@ -62,7 +62,7 @@ + for src in source], ",\n")) + fout.write("\n}\n\n") + +- if env.has_key("BIN2H_NAMESPACE"): ++ if "BIN2H_NAMESPACE" in env: + fout.write("} // namespace %s\n\n" % env["BIN2H_NAMESPACE"]) + + fout.write("/* EOF */\n") diff --git a/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch b/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch new file mode 100644 index 000000000000..71d8762cb9ca --- /dev/null +++ b/pkgs/misc/drivers/xboxdrv/xboxdrvctl-py3.patch @@ -0,0 +1,73 @@ +--- a/xboxdrvctl 2021-06-21 19:39:51.000000000 -0400 ++++ b/xboxdrvctl 19:43:27.467984928 -0400 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2 ++#!/usr/bin/env python3 + + ## Xbox360 USB Gamepad Userspace Driver + ## Copyright (C) 2011 Ingo Ruhnke +@@ -37,23 +37,23 @@ + help="print controller status") + + group.add_option("-s", "--slot", metavar="SLOT", type="int", +- dest="slot", ++ dest="slot", + help="use slot SLOT for actions") + + group.add_option("-l", "--led", metavar="NUM", type="int", +- dest="led", ++ dest="led", + help="set LED") + +-group.add_option("-r", "--rumble", metavar="L:R", +- dest="rumble", ++group.add_option("-r", "--rumble", metavar="L:R", ++ dest="rumble", + help="print controller status") + + group.add_option("-c", "--config", metavar="NUM", type="int", +- dest="config", ++ dest="config", + help="switches to controller configuration NUM") + + group.add_option("--shutdown", action="store_true", +- dest="shutdown", ++ dest="shutdown", + help="shuts down the daemon") + + parser.add_option_group(group) +@@ -69,9 +69,9 @@ + try: + bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/Daemon') + except dbus.exceptions.DBusException: +- bus = dbus.SystemBus() ++ bus = dbus.SystemBus() + else: +- print "Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'" ++ print("Error: invalid argument to --bus. Must be 'auto', 'session, or 'system'") + exit() + + if options.status: +@@ -82,19 +82,19 @@ + daemon.Shutdown() + else: + if (options.led or options.rumble or options.config) and options.slot == None: +- print "Error: --slot argument required" ++ print("Error: --slot argument required") + exit() + else: + if options.slot != None: + slot = bus.get_object("org.seul.Xboxdrv", '/org/seul/Xboxdrv/ControllerSlots/%d' % options.slot) +- ++ + if options.led != None: + slot.SetLed(options.led) + + if options.rumble: + m = re.match('^(\d+):(\d+)$', options.rumble) + if not m: +- print "Error: invalid argument to --rumble" ++ print("Error: invalid argument to --rumble") + exit() + else: + left = int(m.group(1)) diff --git a/pkgs/misc/dxvk/darwin-dxvk-compat.patch b/pkgs/misc/dxvk/darwin-dxvk-compat.patch new file mode 100644 index 000000000000..1c68659215f0 --- /dev/null +++ b/pkgs/misc/dxvk/darwin-dxvk-compat.patch @@ -0,0 +1,35 @@ +Source: https://github.com/marzent/dxvk/commit/65247afe2de5dd6b555b8fdd46dddcdc6325e1d6 +--- + src/d3d11/d3d11_device.cpp | 12 +- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp +index 21f0d1b4a..5b1d05335 100644 +--- a/src/d3d11/d3d11_device.cpp ++++ b/src/d3d11/d3d11_device.cpp +@@ -799,8 +799,12 @@ namespace dxvk { + InitReturnPtr(ppGeometryShader); + D3D11CommonShader module; + +- if (!m_dxvkDevice->features().extTransformFeedback.transformFeedback) +- return DXGI_ERROR_INVALID_CALL; ++ if (!m_dxvkDevice->features().extTransformFeedback.transformFeedback) { ++ Logger::err( ++ "D3D11: CreateGeometryShaderWithStreamOutput:" ++ "\n Transform feedback not supported by device"); ++ return S_OK; ++ } + + // Zero-init some counterss so that we can increment + // them while walking over the stream output entries +@@ -1973,8 +1977,8 @@ namespace dxvk { + enabled.core.features.logicOp = supported.core.features.logicOp; + enabled.core.features.shaderImageGatherExtended = VK_TRUE; + enabled.core.features.variableMultisampleRate = supported.core.features.variableMultisampleRate; +- enabled.extTransformFeedback.transformFeedback = VK_TRUE; +- enabled.extTransformFeedback.geometryStreams = VK_TRUE; ++ enabled.extTransformFeedback.transformFeedback = supported.extTransformFeedback.transformFeedback; ++ enabled.extTransformFeedback.geometryStreams = supported.extTransformFeedback.geometryStreams; + } + + if (featureLevel >= D3D_FEATURE_LEVEL_10_1) { diff --git a/pkgs/misc/dxvk/darwin-thread-primitives.patch b/pkgs/misc/dxvk/darwin-thread-primitives.patch new file mode 100644 index 000000000000..c008099407c5 --- /dev/null +++ b/pkgs/misc/dxvk/darwin-thread-primitives.patch @@ -0,0 +1,186 @@ +diff --git a/src/util/thread.h b/src/util/thread.h +index 28aeca8a..db5c9913 100644 +--- a/src/util/thread.h ++++ b/src/util/thread.h +@@ -149,178 +149,8 @@ namespace dxvk { + } + } + +- +- /** +- * \brief SRW-based mutex implementation +- * +- * Drop-in replacement for \c std::mutex that uses Win32 +- * SRW locks, which are implemented with \c futex in wine. +- */ +- class mutex { +- +- public: +- +- using native_handle_type = PSRWLOCK; +- +- mutex() { } +- +- mutex(const mutex&) = delete; +- mutex& operator = (const mutex&) = delete; +- +- void lock() { +- AcquireSRWLockExclusive(&m_lock); +- } +- +- void unlock() { +- ReleaseSRWLockExclusive(&m_lock); +- } +- +- bool try_lock() { +- return TryAcquireSRWLockExclusive(&m_lock); +- } +- +- native_handle_type native_handle() { +- return &m_lock; +- } +- +- private: +- +- SRWLOCK m_lock = SRWLOCK_INIT; +- +- }; +- +- +- /** +- * \brief Recursive mutex implementation +- * +- * Drop-in replacement for \c std::recursive_mutex that +- * uses Win32 critical sections. +- */ +- class recursive_mutex { +- +- public: +- +- using native_handle_type = PCRITICAL_SECTION; +- +- recursive_mutex() { +- InitializeCriticalSection(&m_lock); +- } +- +- ~recursive_mutex() { +- DeleteCriticalSection(&m_lock); +- } +- +- recursive_mutex(const recursive_mutex&) = delete; +- recursive_mutex& operator = (const recursive_mutex&) = delete; +- +- void lock() { +- EnterCriticalSection(&m_lock); +- } +- +- void unlock() { +- LeaveCriticalSection(&m_lock); +- } +- +- bool try_lock() { +- return TryEnterCriticalSection(&m_lock); +- } +- +- native_handle_type native_handle() { +- return &m_lock; +- } +- +- private: +- +- CRITICAL_SECTION m_lock; +- +- }; +- +- +- /** +- * \brief SRW-based condition variable implementation +- * +- * Drop-in replacement for \c std::condition_variable that +- * uses Win32 condition variables on SRW locks. +- */ +- class condition_variable { +- +- public: +- +- using native_handle_type = PCONDITION_VARIABLE; +- +- condition_variable() { +- InitializeConditionVariable(&m_cond); +- } +- +- condition_variable(condition_variable&) = delete; +- +- condition_variable& operator = (condition_variable&) = delete; +- +- void notify_one() { +- WakeConditionVariable(&m_cond); +- } +- +- void notify_all() { +- WakeAllConditionVariable(&m_cond); +- } +- +- void wait(std::unique_lock& lock) { +- auto srw = lock.mutex()->native_handle(); +- SleepConditionVariableSRW(&m_cond, srw, INFINITE, 0); +- } +- +- template +- void wait(std::unique_lock& lock, Predicate pred) { +- while (!pred()) +- wait(lock); +- } +- +- template +- std::cv_status wait_until(std::unique_lock& lock, const std::chrono::time_point& time) { +- auto now = Clock::now(); +- +- return (now < time) +- ? wait_for(lock, now - time) +- : std::cv_status::timeout; +- } +- +- template +- bool wait_until(std::unique_lock& lock, const std::chrono::time_point& time, Predicate pred) { +- if (pred()) +- return true; +- +- auto now = Clock::now(); +- return now < time && wait_for(lock, now - time, pred); +- } +- +- template +- std::cv_status wait_for(std::unique_lock& lock, const std::chrono::duration& timeout) { +- auto ms = std::chrono::duration_cast(timeout); +- auto srw = lock.mutex()->native_handle(); +- +- return SleepConditionVariableSRW(&m_cond, srw, ms.count(), 0) +- ? std::cv_status::no_timeout +- : std::cv_status::timeout; +- } +- +- template +- bool wait_for(std::unique_lock& lock, const std::chrono::duration& timeout, Predicate pred) { +- bool result = pred(); +- +- if (!result && wait_for(lock, timeout) == std::cv_status::no_timeout) +- result = pred(); +- +- return result; +- } +- +- native_handle_type native_handle() { +- return &m_cond; +- } +- +- private: +- +- CONDITION_VARIABLE m_cond; +- +- }; ++ using mutex = std::mutex; ++ using recursive_mutex = std::recursive_mutex; ++ using condition_variable = std::condition_variable; + + } diff --git a/pkgs/misc/dxvk/default.nix b/pkgs/misc/dxvk/default.nix new file mode 100644 index 000000000000..7c466b44ae6b --- /dev/null +++ b/pkgs/misc/dxvk/default.nix @@ -0,0 +1,101 @@ +{ lib +, pkgs +, hostPlatform +, stdenvNoCC +, fetchFromGitHub +, pkgsCross +}: + +let + inherit (hostPlatform.uname) system; + + # DXVK needs to be a separate derivation because it’s actually a set of DLLs for Windows that + # needs to be built with a cross-compiler. + dxvk32 = pkgsCross.mingw32.callPackage ./dxvk.nix { inherit (self) src version dxvkPatches; }; + dxvk64 = pkgsCross.mingwW64.callPackage ./dxvk.nix { inherit (self) src version dxvkPatches; }; + + # Split out by platform to make maintenance easy in case supported versions on Darwin and other + # platforms diverge (due to the need for Darwin-specific patches that would fail to apply). + # Should that happen, set `darwin` to the last working `rev` and `hash`. + srcs = rec { + darwin = { inherit (default) rev hash version; }; + default = { + rev = "v${self.version}"; + hash = "sha256-+6PkrkamSvhCaGj2tq+RXri/yQ7vs0cAqgdRAFtU8UA="; + version = "1.10.1"; + }; + }; + + # Use the self pattern to support overriding `src` and `version` via `overrideAttrs`. A recursive + # attrset wouldn’t work. + self = stdenvNoCC.mkDerivation { + name = "dxvk"; + inherit (srcs."${system}" or srcs.default) version; + + src = fetchFromGitHub { + owner = "doitsujin"; + repo = "dxvk"; + inherit (srcs."${system}" or srcs.default) rev hash; + }; + + # Override this to patch DXVK itself (rather than the setup script). + dxvkPatches = lib.optionals stdenvNoCC.isDarwin [ + # Patch DXVK to work with MoltenVK even though it doesn’t support some required features. + # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well. + ./darwin-dxvk-compat.patch + # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin. + # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/ + ./darwin-thread-primitives.patch + ]; + + outputs = [ "out" "bin" "lib" ]; + + # Also copy `mcfgthread-12.dll` due to DXVK’s being built in a MinGW cross environment. + patches = [ ./mcfgthread.patch ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin $bin $lib + substitute setup_dxvk.sh $out/bin/setup_dxvk.sh \ + --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads}" \ + --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" \ + --replace 'basedir=$(dirname "$(readlink -f $0)")' "basedir=$bin" + chmod a+x $out/bin/setup_dxvk.sh + declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} ) + for arch in "''${!dxvks[@]}"; do + ln -s "''${dxvks[$arch]}/bin" $bin/$arch + ln -s "''${dxvks[$arch]}/lib" $lib/$arch + done + ''; + + # DXVK with MoltenVK requires a patched MoltenVK in addition to its own patches. Provide a + # convenience function to handle the necessary patching. + # + # Usage: + # let + # patchedMoltenVK = dxvk.patchMoltenVK darwin.moltenvk; + # in + # wine64Packages.full.override { moltenvk = patchedMoltenVK; vkd3dSupport = false; } + passthru.patchMoltenVK = moltenvk: + moltenvk.overrideAttrs (old: { + patches = old.patches or [ ] ++ [ + # Apply MoltenVK’s DXVK compatability patch. This is needed to fake support for certain + # extensions. There is no package for a patched MoltenVK to avoid any confusion by users + # whether they should use it. Except with DXVK, the answer is always no. + old.passthru.dxvkPatch + ]; + }); + + meta = { + description = "A Vulkan-based translation layer for Direct3D 9/10/11"; + homepage = "https://github.com/doitsujin/dxvk"; + changelog = "https://github.com/doitsujin/dxvk/releases"; + maintainers = [ lib.maintainers.reckenrode ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + }; + }; +in +self diff --git a/pkgs/misc/dxvk/dxvk.nix b/pkgs/misc/dxvk/dxvk.nix new file mode 100644 index 000000000000..2eb4f30df2bc --- /dev/null +++ b/pkgs/misc/dxvk/dxvk.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, glslang +, meson +, ninja +, windows +, src +, version +, dxvkPatches +}: + +stdenv.mkDerivation { + pname = "dxvk"; + inherit src version; + + nativeBuildInputs = [ glslang meson ninja ]; + buildInputs = [ windows.pthreads ]; + + patches = dxvkPatches; + + mesonFlags = + let + arch = if stdenv.is32bit then "32" else "64"; + in + [ + "--buildtype" "release" + "--cross-file" "build-win${arch}.txt" + "--prefix" "${placeholder "out"}" + ]; + + meta = { + description = "A Vulkan-based translation layer for Direct3D 9/10/11"; + homepage = "https://github.com/doitsujin/dxvk"; + changelog = "https://github.com/doitsujin/dxvk/releases"; + maintainers = [ lib.maintainers.reckenrode ]; + license = lib.licenses.zlib; + platforms = lib.platforms.windows; + }; +} diff --git a/pkgs/misc/dxvk/mcfgthread.patch b/pkgs/misc/dxvk/mcfgthread.patch new file mode 100644 index 000000000000..037071630172 --- /dev/null +++ b/pkgs/misc/dxvk/mcfgthread.patch @@ -0,0 +1,34 @@ +diff --git a/setup_dxvk.sh b/setup_dxvk.sh +index 3e63ecf0..87c04f23 100755 +--- a/setup_dxvk.sh ++++ b/setup_dxvk.sh +@@ -133,6 +133,8 @@ + rm -v "${dstfile}" + fi + $file_cmd "${srcfile}" "${dstfile}" ++ elif [ "${4}" = "--force" ]; then ++ $file_cmd "${srcfile}" "${dstfile}" + else + echo "${dstfile}: File not found in wine prefix" >&2 + return 1 +@@ -170,12 +172,12 @@ + } + + install() { +- installFile "$win64_sys_path" "$dxvk_lib64" "$1" ++ installFile "$win64_sys_path" "$dxvk_lib64" "$1" "${2-}" + inst64_ret="$?" + + inst32_ret=-1 + if $wow64; then +- installFile "$win32_sys_path" "$dxvk_lib32" "$1" ++ installFile "$win32_sys_path" "$dxvk_lib32" "$1" "${2-}" + inst32_ret="$?" + fi + +@@ -214,3 +216,5 @@ + + $action d3d10core + $action d3d11 ++ ++basedir="" dxvk_lib32=@mcfgthreads32@/bin dxvk_lib64=@mcfgthreads64@/bin $action mcfgthread-12 --force diff --git a/pkgs/misc/emulators/dosbox-staging/default.nix b/pkgs/misc/emulators/dosbox-staging/default.nix deleted file mode 100644 index 3322c43a0c54..000000000000 --- a/pkgs/misc/emulators/dosbox-staging/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, fetchFromGitHub, stdenv -, gtest, makeWrapper, meson, ninja, pkg-config -, alsa-lib, fluidsynth, libGL, libGLU, libogg, libpng, munt, opusfile, SDL2, SDL2_net -}: - -stdenv.mkDerivation rec { - pname = "dosbox-staging"; - version = "0.77.1"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "07jwmmm1bhfxavlhl854cj8l5iy5hqx5hpwkkjbcwqg7yh9jfs2x"; - }; - - nativeBuildInputs = [ gtest makeWrapper meson ninja pkg-config ]; - buildInputs = [ alsa-lib fluidsynth libGL libGLU libogg libpng munt opusfile SDL2 SDL2_net ]; - - hardeningDisable = [ "format" ]; - - mesonFlags = [ - "--buildtype=release" - "-Ddefault_library=static" - "-Db_asneeded=true" - "-Dtry_static_libs=png" - "-Dfluidsynth:enable-floats=true" - "-Dfluidsynth:try-static-deps=true" - ]; - - postFixup = '' - # Rename binary, add a wrapper, and copy manual to avoid conflict with vanilla dosbox. - # Doing it this way allows us to work with frontends and launchers that expect the - # binary to be named dosbox, but get out of the way of vanilla dosbox if the user - # desires to install that as well. - mv $out/bin/dosbox $out/bin/${pname} - makeWrapper $out/bin/dosbox-staging $out/bin/dosbox - cp $out/share/man/man1/dosbox.1.gz $out/share/man/man1/${pname}.1.gz - ''; - - meta = with lib; { - description = "A modernized DOS emulator"; - homepage = "https://dosbox-staging.github.io/"; - license = licenses.gpl2; - maintainers = with maintainers; [ joshuafern ]; - platforms = platforms.unix; - priority = 101; - }; -} diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix deleted file mode 100644 index ba4f88dbcad0..000000000000 --- a/pkgs/misc/emulators/dosbox/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU, libGL, libpng, graphicsmagick }: - -stdenv.mkDerivation rec { - pname = "dosbox"; - version = "0.74-3"; - - src = fetchurl { - url = "mirror://sourceforge/dosbox/dosbox-${version}.tar.gz"; - sha256 = "02i648i50dwicv1vaql15rccv4g8h5blf5g6inv67lrfxpbkvlf0"; - }; - - hardeningDisable = [ "format" ]; - - buildInputs = [ SDL SDL_net SDL_sound libGLU libGL libpng ]; - - nativeBuildInputs = [ graphicsmagick ]; - - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - - desktopItem = makeDesktopItem { - name = "dosbox"; - exec = "dosbox"; - icon = "dosbox"; - comment = "x86 emulator with internal DOS"; - desktopName = "DOSBox"; - genericName = "DOS emulator"; - categories = "Emulator;"; - }; - - postInstall = '' - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - - mkdir -p $out/share/icons/hicolor/256x256/apps - gm convert src/dosbox.ico $out/share/icons/hicolor/256x256/apps/dosbox.png - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://www.dosbox.com/"; - description = "A DOS emulator"; - platforms = platforms.unix; - maintainers = with maintainers; [ matthewbauer ]; - license = licenses.gpl2; - }; -} diff --git a/pkgs/misc/emulators/reicast/default.nix b/pkgs/misc/emulators/reicast/default.nix deleted file mode 100644 index f9e8e4d69376..000000000000 --- a/pkgs/misc/emulators/reicast/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, curl -, alsa-lib -, libGLU -, libX11 -, libevdev -, udev -, libpulseaudio -}: - -stdenv.mkDerivation rec { - pname = "reicast"; - version = "20.04"; - - src = fetchFromGitHub { - owner = "reicast"; - repo = "reicast-emulator"; - rev = "r${version}"; - sha256 = "0vz3b1hg1qj6nycnqq5zcpzqpcbxw1c2ffamia5z3x7rapjx5d71"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ - curl - alsa-lib - libGLU - libX11 - libevdev - udev - libpulseaudio - ]; - - # No rule to make target 'install' - installPhase = '' - runHook preInstall - - install -D ./reicast $out/bin/reicast - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://reicast.com/"; - description = "A multi-platform Sega Dreamcast emulator"; - license = with licenses; [ bsd3 gpl2Only lgpl2Only ]; - platforms = ["x86_64-linux" ]; - maintainers = [ maintainers.ivar ]; - }; -} diff --git a/pkgs/misc/emulators/rpcs3/update.sh b/pkgs/misc/emulators/rpcs3/update.sh deleted file mode 100755 index 05be4dfeda1d..000000000000 --- a/pkgs/misc/emulators/rpcs3/update.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p gnused jq nix-prefetch-git curl - -set -eou pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" -if [[ ! "$(basename $ROOT)" == "rpcs3" || ! -f "$ROOT/default.nix" ]]; then - echo "ERROR: Not in the rpcs3 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}' < repo_info -new_hash="$(jq -r ".sha256" < repo_info)" -new_rev="$(jq -r ".rev" < repo_info)" -rm repo_info - -new_version="$( - curl -s https://ci.appveyor.com/api/projects/gdkchan/ryujinx/branch/master \ - | grep -Po '"version":.*?[^\\]",' \ - | sed 's/"version":"\(.*\)",/\1/' - )" -old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" - -if [[ "$new_version" == "$old_version" ]]; then - echo "Already up to date! Doing nothing" - exit 0 -fi - -cd ../../../.. -update-source-version ryujinx "$new_version" "$new_hash" --rev="$new_rev" - -store_src="$(nix-build . -A ryujinx.src --no-out-link)" -src="$(mktemp -d /tmp/ryujinx-src.XXX)" -cp -rT "$store_src" "$src" -chmod -R +w "$src" -pushd "$src" - -mkdir nuget_tmp.packages -dotnet restore Ryujinx.sln --packages nuget_tmp.packages - -nuget-to-nix ./nuget_tmp.packages > "$deps_file" - -popd -rm -r "$src" diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix deleted file mode 100644 index bfe2cae5120f..000000000000 --- a/pkgs/misc/emulators/vice/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib -, stdenv -, fetchurl -, bison -, flex -, perl -, libpng -, giflib -, libjpeg -, alsa-lib -, readline -, libGLU -, libGL -, libXaw -, pkg-config -, gtk2 -, SDL -, SDL_image -, autoreconfHook -, makeDesktopItem -, dos2unix -, xa -, file -}: - -stdenv.mkDerivation rec { - pname = "vice"; - version = "3.6"; - - src = fetchurl { - url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz"; - sha256 = "sha256-Zb/lXM5ifbm1oKx4dqkMCH6f6G6fVRfoCURsQGSi0/0="; - }; - - nativeBuildInputs = [ - autoreconfHook - bison - dos2unix - file - flex - pkg-config - ]; - - buildInputs = [ - alsa-lib - giflib - gtk2 - libGL - libGLU - libXaw - libjpeg - libpng - perl - readline - SDL - SDL_image - xa - ]; - dontDisableStatic = true; - configureFlags = [ "--enable-fullscreen" "--enable-gnomeui" "--disable-pdf-docs" ]; - - desktopItem = makeDesktopItem { - name = "vice"; - exec = "x64"; - comment = "Commodore 64 emulator"; - desktopName = "VICE"; - genericName = "Commodore 64 emulator"; - categories = "Emulator;"; - }; - - preBuild = '' - for i in src/resid src/resid-dtv - do - mkdir -pv $i/src - ln -sv ../../wrap-u-ar.sh $i/src - done - ''; - - postInstall = '' - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - ''; - - meta = { - description = "Commodore 64, 128 and other emulators"; - homepage = "https://vice-emu.sourceforge.io/"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.sander ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix deleted file mode 100644 index c09a83b92ea8..000000000000 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, python2, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL -, wafHook }: - -stdenv.mkDerivation rec { - pname = "wxmupen64plus"; - version = "0.3"; - - src = fetchurl { - url = "https://bitbucket.org/auria/wxmupen64plus/get/${version}.tar.bz2"; - sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c"; - }; - - nativeBuildInputs = [ wafHook ]; - buildInputs = [ python2 wxGTK29 SDL libX11 libGLU libGL ]; - - preConfigure = '' - tar xf ${mupen64plus.src} - APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api) - export CXXFLAGS="-I${libX11.dev}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\"" - export LDFLAGS="-lwx_gtk2u_adv-2.9" - - wafConfigureFlagsArray+=("--mupenapi=$APIDIR" "--wxconfig=`type -P wx-config`") - ''; - - NIX_CFLAGS_COMPILE = "-fpermissive"; - - meta = { - description = "GUI for the Mupen64Plus 2.0 emulator"; - license = lib.licenses.gpl2Plus; - homepage = "https://bitbucket.org/auria/wxmupen64plus/wiki/Home"; - }; -} diff --git a/pkgs/misc/gnash/0001-fix-build-with-ffmepg-4.patch b/pkgs/misc/gnash/0001-fix-build-with-ffmepg-4.patch deleted file mode 100644 index f6316ae972fd..000000000000 --- a/pkgs/misc/gnash/0001-fix-build-with-ffmepg-4.patch +++ /dev/null @@ -1,57 +0,0 @@ -From cb13c20332526a4db99e7fd0818b9a75829affad Mon Sep 17 00:00:00 2001 -From: Zane van Iperen -Date: Sun, 7 Nov 2021 15:36:02 +1000 -Subject: [PATCH] fix build with ffmepg 4 - ---- - libmedia/ffmpeg/MediaHandlerFfmpeg.cpp | 2 +- - libmedia/ffmpeg/MediaParserFfmpeg.cpp | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp b/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp -index 127aaaa..216d96b 100644 ---- a/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp -+++ b/libmedia/ffmpeg/MediaHandlerFfmpeg.cpp -@@ -149,7 +149,7 @@ MediaHandlerFfmpeg::cameraNames(std::vector& /*names*/) const - size_t - MediaHandlerFfmpeg::getInputPaddingSize() const - { -- return FF_INPUT_BUFFER_PADDING_SIZE; -+ return AV_INPUT_BUFFER_PADDING_SIZE; - } - - } // gnash.media.ffmpeg namespace -diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp b/libmedia/ffmpeg/MediaParserFfmpeg.cpp -index 9ceb8b0..a27ca56 100644 ---- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp -+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp -@@ -64,7 +64,7 @@ AVInputFormat* - MediaParserFfmpeg::probeStream() - { - const size_t probeSize = 4096; -- const size_t bufSize = probeSize + FF_INPUT_BUFFER_PADDING_SIZE; -+ const size_t bufSize = probeSize + AV_INPUT_BUFFER_PADDING_SIZE; - - std::unique_ptr buffer(new std::uint8_t[bufSize]); - -@@ -173,7 +173,7 @@ MediaParserFfmpeg::parseVideoFrame(AVPacket& packet) - - // TODO: We might avoid the copy as a whole by making EncodedVideoFrame - // virtual. -- size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE; -+ size_t allocSize = packet.size + AV_INPUT_BUFFER_PADDING_SIZE; - std::uint8_t* data = new std::uint8_t[allocSize]; - std::copy(packet.data, packet.data+packet.size, data); - std::unique_ptr frame(new EncodedVideoFrame(data, packet.size, 0, timestamp)); -@@ -221,7 +221,7 @@ MediaParserFfmpeg::parseAudioFrame(AVPacket& packet) - - // TODO: We might avoid the copy as a whole by making EncodedAudioFrame - // virtual. -- size_t allocSize = packet.size + FF_INPUT_BUFFER_PADDING_SIZE; -+ size_t allocSize = packet.size + AV_INPUT_BUFFER_PADDING_SIZE; - std::uint8_t* data = new std::uint8_t[allocSize]; - std::copy(packet.data, packet.data+packet.size, data); - --- -2.31.1 - diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix deleted file mode 100644 index fc7148b40489..000000000000 --- a/pkgs/misc/gnash/default.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook -, pkg-config, libtool, boost, SDL -, glib, pango, gettext, curl, xorg -, libpng, libjpeg, giflib, speex, atk - -# renderers -, enableAGG ? true, agg ? null -, enableCairo ? false, cairo ? null -, enableOpenGL ? false -, libGLU ? null -, libGL ? null - -# GUI toolkits -, enableGTK ? true, gtk2 ? null, gnome2 ? null -, enableSDL ? false -, enableQt ? false, qt4 ? null - -# media -, enableFFmpeg ? true, ffmpeg ? null - -# misc -, enableJemalloc ? true, jemalloc ? null -, enableHwAccel ? true -, enablePlugins ? false, xulrunner ? null, npapi_sdk ? null -}: - -with lib; - -let - available = x: x != null; - - sound = - if enableFFmpeg then "ffmpeg" else "none"; - - renderers = [] - ++ optional enableAGG "agg" - ++ optional enableCairo "cairo" - ++ optional enableOpenGL "opengl"; - - toolkits = [] - ++ optional enableGTK "gtk" - ++ optional enableSDL "sdl" - ++ optional enableQt "qt4"; - -in - -# renderers -assert enableAGG -> available agg; -assert enableCairo -> available cairo; -assert enableOpenGL -> all available [ libGLU libGL ]; - -# GUI toolkits -assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome2.GConf ]; -assert enableSDL -> available SDL; -assert enableQt -> available qt4; - -# media libraries -assert enableFFmpeg -> available ffmpeg ; - -# misc -assert enableJemalloc -> available jemalloc; -assert enableHwAccel -> all available [ libGLU libGL ]; -assert enablePlugins -> all available [ xulrunner npapi_sdk ]; - -assert length toolkits == 0 -> throw "at least one GUI toolkit must be enabled"; -assert length renderers == 0 -> throw "at least one renderer must be enabled"; - - -stdenv.mkDerivation { - pname = "gnash"; - version = "0.8.11-2019-30-01"; - - src = fetchgit { - url = "git://git.sv.gnu.org/gnash.git"; - rev = "583ccbc1275c7701dc4843ec12142ff86bb305b4"; - sha256 = "0fh0bljn0i6ypyh6l99afi855p7ki7lm869nq1qj6k8hrrwhmfry"; - }; - - postPatch = '' - sed -i 's|jemalloc.h|jemalloc/jemalloc.h|' libbase/jemalloc_gnash.c - ''; - - nativeBuildInputs = [ autoreconfHook pkg-config libtool ]; - buildInputs = [ - glib gettext boost curl SDL speex - xorg.libXmu xorg.libSM xorg.libXt - libpng libjpeg giflib pango atk - ] ++ optional enableAGG agg - ++ optional enableCairo cairo - ++ optional enableQt qt4 - ++ optional enableFFmpeg ffmpeg - ++ optional enableJemalloc jemalloc - ++ optional enableHwAccel [ libGL libGLU ] - ++ optionals enableOpenGL [ libGL libGLU ] - ++ optionals enablePlugins [ xulrunner npapi_sdk ] - ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome2.GConf ]; - - patches = [ - (fetchpatch { # fix compilation due to bad detection of libgif version: https://savannah.gnu.org/patch/index.php?9873 - url = "https://savannah.gnu.org/patch/download.php?file_id=47859"; - sha256 = "0aimayzgi5065gkcfcr8d5lkd9c0471q7dqmln42hjzq847n6d5y"; - }) - - # Fix build with modern Pango - # https://savannah.gnu.org/bugs/index.php?57759 - (fetchpatch { - url = "https://savannah.gnu.org/file/0001-Do-not-depend-on-pangox.patch?file_id=48366"; - sha256 = "02x7sl5zwd1ld2n4b6bp16c5gk91qsap0spfbb5iwpglq3galv2l"; - }) - - ./0001-fix-build-with-ffmepg-4.patch - ]; - - configureFlags = with lib; [ - "--with-boost-incl=${boost.dev}/include" - "--with-boost-lib=${boost.out}/lib" - "--enable-renderer=${concatStringsSep "," renderers}" - "--enable-gui=${concatStringsSep "," toolkits}" - "--enable-media=${sound}" - "--with-npapi-install=prefix" - (enableFeature enablePlugins "plugins") - (enableFeature enableJemalloc "jemalloc") - (optionalString enableHwAccel "--enable-device=egl") - ]; - - meta = { - homepage = "https://savannah.gnu.org/projects/gnash"; - description = "A flash (SWF) player and browser plugin"; - license = licenses.gpl3; - maintainers = with maintainers; [ rnhmjoj ]; - }; -} diff --git a/pkgs/misc/i3a/default.nix b/pkgs/misc/i3a/default.nix new file mode 100644 index 000000000000..36f58c16cc2d --- /dev/null +++ b/pkgs/misc/i3a/default.nix @@ -0,0 +1,21 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "i3a"; + version = "2.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + hash = "sha256-2k1HYtgJ76qXLvX6RmOSKtMMg+K722n8U9YmBANvQvE="; + }; + + nativeBuildInputs = [ python3Packages.setuptools-scm ]; + propagatedBuildInputs = [ python3Packages.i3ipc ]; + + meta = with lib; { + homepage = "https://git.goral.net.pl/mgoral/i3a"; + description = "A set of scripts used for automation of i3 and sway window manager layouts"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/misc/kitty-themes/default.nix b/pkgs/misc/kitty-themes/default.nix new file mode 100644 index 000000000000..16bfa3a54b7f --- /dev/null +++ b/pkgs/misc/kitty-themes/default.nix @@ -0,0 +1,27 @@ +{ fetchFromGitHub, lib, stdenv }: + +stdenv.mkDerivation rec { + pname = "kitty-themes"; + version = "unstable-2022-02-03"; + + src = fetchFromGitHub { + owner = "kovidgoyal"; + repo = pname; + rev = "337d6fcb3ad7e38544edfb8d0f6447894b7e5f58"; + sha256 = "ZP5GrT2QCdXtC5swqI0SXzIlqIcQNsxBlzEplj/hpz4="; + }; + + installPhase = '' + mkdir -p $out/themes + mv themes.json $out + mv themes/*.conf $out/themes + ''; + + meta = with lib; { + homepage = "https://github.com/kovidgoyal/kitty-themes"; + description = "Themes for the kitty terminal emulator"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ nelsonjeppesen ]; + }; +} diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index b75f9c3f8008..9527c156e486 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.22.1"; + version = "2.22.2"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-cqwtVMMQwxQcC3gtTgvvkALVUZz0ZjJ1mx8D72lpzDA="; + sha256 = "sha256-3ekIVPp94QEvThMEpoYXrqmrMiky7AznaYT2DSaqI74="; }; postInstall = '' diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 9f5e550d9720..2cecc22cf5df 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -11,7 +11,7 @@ let beat = package: extraArgs: buildGoModule (rec { sha256 = "sha256-9Jl5Xo1iKdOY9ZE5JXKSL4ee+NdsN3KCY2dDYuxlzPI="; }; - vendorSha256 = "sha256-tyxyM7RsTHTVVxc9gagPsSvFRaWGTmobKzyv9RODXBk="; + vendorSha256 = "sha256-fiqCccS2IAnTzfPfUqY0Wy9uRUuiYNtiVvpAFZJOPVI="; subPackages = [ package ]; diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/misc/logging/pacemaker/default.nix new file mode 100644 index 000000000000..07194380d4a7 --- /dev/null +++ b/pkgs/misc/logging/pacemaker/default.nix @@ -0,0 +1,102 @@ +{ lib +, stdenv +, autoconf +, automake +, bash +, bzip2 +, corosync +, dbus +, fetchFromGitHub +, glib +, gnutls +, libqb +, libtool +, libuuid +, libxml2 +, libxslt +, pam +, pkg-config +, python3 +, nixosTests + +# Pacemaker is compiled twice, once with forOCF = true to extract its +# OCF definitions for use in the ocf-resource-agents derivation, then +# again with forOCF = false, where the ocf-resource-agents is provided +# as the OCF_ROOT. +, forOCF ? false +, ocf-resource-agents +} : + +stdenv.mkDerivation rec { + pname = "pacemaker"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "ClusterLabs"; + repo = pname; + rev = "Pacemaker-${version}"; + sha256 = "1w7vq3lmgcz38pfww9vccm142vjsjqz3qc9nnk09ynkx4agqhxdg"; + }; + + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + ]; + + buildInputs = [ + bash + bzip2 + corosync + dbus.dev + glib + gnutls + libqb + libuuid + libxml2.dev + libxslt.dev + pam + python3 + ]; + + preConfigure = '' + ./autogen.sh --prefix="$out" + ''; + configureFlags = [ + "--exec-prefix=${placeholder "out"}" + "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-initdir=/etc/systemd/system" + "--with-systemdsystemunitdir=/etc/systemd/system" + "--with-corosync" + # allows Type=notify in the systemd service + "--enable-systemd" + ] ++ lib.optional (!forOCF) "--with-ocfdir=${ocf-resource-agents}/usr/lib/ocf"; + + installFlags = [ "DESTDIR=${placeholder "out"}" ]; + + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ + "-Wno-error=strict-prototypes" + ]; + + enableParallelBuilding = true; + + postInstall = '' + # pacemaker's install linking requires a weirdly nested hierarchy + mv $out$out/* $out + rm -r $out/nix + ''; + + passthru.tests = { + inherit (nixosTests) pacemaker; + }; + + meta = with lib; { + homepage = "https://clusterlabs.org/pacemaker/"; + description = "Pacemaker is an open source, high availability resource manager suitable for both small and large clusters."; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ryantm astro ]; + }; +} diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index df812d516ecc..7695f3cebefd 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool }: stdenv.mkDerivation rec { - version="1.33"; + version="1.36"; pname = "mxt-app"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; rev = "v${version}"; - sha256 = "sha256-PgIIxoyR7UA5y4UZ6meJERrbi1Bov03pJkN5St4BWss="; + sha256 = "sha256-hS/4d7HUCoulY73Sn1+IAb/IWD4VDht78Tn2jdluzhU="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/misc/openrussian-cli/default.nix b/pkgs/misc/openrussian-cli/default.nix index 24c0b6bece78..4f30fd918963 100644 --- a/pkgs/misc/openrussian-cli/default.nix +++ b/pkgs/misc/openrussian-cli/default.nix @@ -1,6 +1,9 @@ { stdenv, lib, fetchFromGitHub, gnumake, pkg-config, wget, unzip, gawk -, sqlite, which, luaPackages, installShellFiles, makeWrapper +, 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"; @@ -16,11 +19,11 @@ stdenv.mkDerivation rec { gnumake pkg-config wget unzip gawk sqlite which installShellFiles makeWrapper ]; - buildInputs = with luaPackages; [ lua luasql-sqlite3 luautf8 ]; + buildInputs = [ luaEnv ]; makeFlags = [ - "LUA=${luaPackages.lua}/bin/lua" - "LUAC=${luaPackages.lua}/bin/luac" + "LUA=${luaEnv}/bin/lua" + "LUAC=${luaEnv}/bin/luac" ]; dontConfigure = true; @@ -34,8 +37,8 @@ stdenv.mkDerivation rec { cp openrussian $out/bin wrapProgram $out/bin/openrussian \ - --prefix LUA_PATH ';' "$LUA_PATH" \ - --prefix LUA_CPATH ';' "$LUA_CPATH" + --prefix LUA_PATH ';' '${lua.pkgs.lib.genLuaPathAbsStr luaEnv}' \ + --prefix LUA_CPATH ';' '${lua.pkgs.lib.genLuaCPathAbsStr luaEnv}' runHook postInstall ''; diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 594561593e5a..75caa3fcfb3c 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -2,6 +2,7 @@ , meson , ninja , pkg-config +, installShellFiles , platform-tools , ffmpeg @@ -10,10 +11,10 @@ }: let - version = "1.21"; + version = "1.23"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "sha256-28zKtSPuJnluVeozZSZJ5LevSY7a6ap15NTXhpwKuEg="; + sha256 = "sha256-KpE/1HR4wLMG/KUHywvrYl5JoZ/5/Hq5BONu9bn+fmg="; }; in stdenv.mkDerivation rec { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9MzOaQj+lR1F+E/yoxbL/HMOOuKOU82zkPVq7x6AH3c="; + sha256 = "sha256-WR70wV+EfNFFkMFkffnwaTridd33CpJ0zTAlXYyjZgM="; }; # postPatch: @@ -36,11 +37,9 @@ stdenv.mkDerivation rec { --replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE" ''; - nativeBuildInputs = [ makeWrapper meson ninja pkg-config ]; + nativeBuildInputs = [ makeWrapper meson ninja pkg-config installShellFiles ]; - buildInputs = [ ffmpeg SDL2 ] ++ lib.optionals stdenv.isLinux [ - libusb1 - ]; + buildInputs = [ ffmpeg SDL2 libusb1 ]; # Manually install the server jar to prevent Meson from "fixing" it preConfigure = '' diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 5f0c5ad9e29e..87c81531122a 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchgit, pkg-config, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { pname = "alock"; version = "unstable-2017-07-20"; - src = fetchgit { - url = "https://github.com/Arkq/alock"; + src = fetchFromGitHub { + owner = "Arkq"; + repo = "alock"; rev = "2035e1d4a2293432f5503e82d10f899232eb0f38"; - sha256 = "1by954fjn0ryqda89zlmq3gclakg3gz7zy1wjrbgw4lzsk538va6"; + sha256 = "sha256-Rm00ytSfEv5Wljz4f/4bbyrK3sCV/oRUwz4DKx0pya8="; }; PAM_DEFAULT_SERVICE = "login"; diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix index d25a777e650b..b5e9ba8d2b6a 100644 --- a/pkgs/misc/screensavers/physlock/default.nix +++ b/pkgs/misc/screensavers/physlock/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, pam, systemd }: stdenv.mkDerivation rec { - version = "v13"; + version = "13"; pname = "physlock"; src = fetchFromGitHub { owner = "muennich"; repo = pname; - rev = version; + rev = "v${version}"; sha256 = "1mz4xxjip5ldiw9jgfq9zvqb6w10bcjfx6939w1appqg8f521a7s"; }; diff --git a/pkgs/misc/screensavers/pipes-rs/default.nix b/pkgs/misc/screensavers/pipes-rs/default.nix index 3e2f4179d8ed..d89ac88684db 100644 --- a/pkgs/misc/screensavers/pipes-rs/default.nix +++ b/pkgs/misc/screensavers/pipes-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pipes-rs"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "lhvy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HtwUYYQqldEtE9VkQAJscW8jp/u8Cb4/G5d2uqanOjI="; + sha256 = "sha256-egjmvvbPmIjccg44F2/TiGrn5HRN5hp8XL0yd0/ctv0="; }; - cargoSha256 = "sha256-o/aPB0jfZfg2sDkgCBlLlCK3gbjjHZeiG8OxRXKXJyY="; + cargoSha256 = "sha256-i9aR0dGNRF37Hhs9vq0wpdZGIVkX7M1SzbpASR5ve+g="; doInstallCheck = true; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 8d6b5eba5bf6..ac739d6a0db4 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.68"; + version = "5.69"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-MHMf3LID8W61wcQ8BdQuRSrQ60VVyXxVVmpuyxh3zW4="; + sha256 = "sha256-6pJlTAASJoSHZaJRpzvLxHPM7xe3IcwY1TYfWdvW07k="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index b90f75f6a042..941943a495e0 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - version = "6.02"; + version = "6.03"; pname = "xscreensaver"; src = fetchurl { url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Xm1ssJAzrVYs/m1Gv5MS5EUfeUa+2KRnGqk0TfkZMYQ="; + sha256 = "sha256-Mo1ReXNSrPWMpbq0nnb78mA058rXhfZR6hHOe0P7olo="; }; nativeBuildInputs = [ @@ -62,6 +62,5 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.unix; # Once had cygwin problems downloadPage = "https://www.jwz.org/xscreensaver/download.html"; - updateWalker = true; }; } diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index ffb9d0da8570..ac4c8197e554 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, python2, pkg-config, xlibsWrapper, pam }: +{ lib, stdenv, fetchFromGitHub, python2, pkg-config, xlibsWrapper, pam }: stdenv.mkDerivation { pname = "xtrlock-pam"; version = "3.4-post-20150909"; - src = fetchgit { - url = "https://github.com/aanatoly/xtrlock-pam"; + src = fetchFromGitHub { + owner = "aanatoly"; + repo = "xtrlock-pam"; rev = "6f4920fcfff54791c0779057e9efacbbbbc05df6"; - sha256 = "1z2wlhi5d05b18pvwz146kp0lkcc6z2mnilk01mk19hzbziyqmsc"; + sha256 = "sha256-TFfs418fpjBrAJNGW8U3jE0K7jQkfL4vCquAViKkXPw="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 474e59c590a5..786c3c3a40a4 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib; + postInstall = '' + install -Dm644 contrib/sndiod.service $out/lib/systemd/system/sndiod.service + ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix index b9663cee5c33..922ae4c61bf2 100644 --- a/pkgs/misc/t-rec/default.nix +++ b/pkgs/misc/t-rec/default.nix @@ -9,13 +9,13 @@ let in rustPlatform.buildRustPackage rec { pname = "t-rec"; - version = "0.6.0"; + version = "0.7.3"; src = fetchFromGitHub { owner = "sassman"; repo = "t-rec-rs"; rev = "v${version}"; - sha256 = "InArrBqfhDrsonjmCIPTBVOA/s2vYml9Ay6cdrKLd7c="; + sha256 = "sha256-rVlNyvSeiQbauf8CREJDmb02wv6b/4IeOerRCRWVQVA="; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" ''; - cargoSha256 = "4gwfrC65YlXV6Wu2ninK1TvMNUkY1GstVYPr0FK+xLU="; + cargoSha256 = "sha256-pcdvEHxqU6ZJwcsbnQEd9M0waK7y4aluYEpLIlZoK/s="; meta = with lib; { description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index b04a54874571..8c39ab3f207f 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -132,12 +132,12 @@ in rec { cpu = mkTmuxPlugin { pluginName = "cpu"; - version = "unstable-2020-07-25"; + version = "unstable-2021-12-15"; src = fetchFromGitHub { owner = "tmux-plugins"; repo = "tmux-cpu"; - rev = "20120a38ade17057441482b43eb5390e6ea2c1c1"; - sha256 = "1gdz2awyd9icvyiw2p40gwymh6ngjhb9mkiv63ix53snp9ii794i"; + rev = "9eb3dba66672c5b43065e144cc3a1031f77ad67e"; + sha256 = "sha256-v/jZxsa+JwsSKjmA32VK/4gBNHP/SyOzTaYSSz2c0+4="; }; }; @@ -523,12 +523,12 @@ in rec { tmux-fzf = mkTmuxPlugin { pluginName = "tmux-fzf"; rtpFilePath = "main.tmux"; - version = "unstable-2020-12-07"; + version = "unstable-2021-10-20"; src = fetchFromGitHub { owner = "sainnhe"; repo = "tmux-fzf"; - rev = "5efeb91086040a3becf5372fb38258acd0579954"; - sha256 = "1z0zmsf8asxs9wbwvkiyd81h93wb2ikl8nxxc26sdpi6l333q5s9"; + rev = "1801dd525b39154745ea668fb6916035023949e3"; + sha256 = "e929Jqletmobp3WAR1tPU3pJuYTYVynxc5CvB80gig8="; }; postInstall = '' find $target -type f -print0 | xargs -0 sed -i -e 's|fzf |${pkgs.fzf}/bin/fzf |g' diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index e287066ddb9c..986494e599d1 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -111,7 +111,7 @@ let homepage = "http://www.denx.de/wiki/U-Boot/"; description = "Boot loader for embedded systems"; license = licenses.gpl2; - maintainers = with maintainers; [ dezgeg samueldr lopsided98 ]; + maintainers = with maintainers; [ bartsch dezgeg samueldr lopsided98 ]; } // extraMeta; } // removeAttrs args [ "extraMeta" ]); in { @@ -139,6 +139,12 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootA20OlinuxinoLime2EMMC = buildUBoot { + defconfig = "A20-OLinuXino-Lime2-eMMC_defconfig"; + extraMeta.platforms = ["armv7l-linux"]; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootAmx335xEVM = buildUBoot { defconfig = "am335x_evm_defconfig"; extraMeta.platforms = ["armv7l-linux"]; @@ -395,12 +401,28 @@ in { defconfig = "rpi_3_32b_defconfig"; extraMeta.platforms = ["armv7l-linux"]; filesToInstall = ["u-boot.bin"]; + extraPatches = [ + # Remove when updating to 2022.01 + # https://patchwork.ozlabs.org/project/uboot/list/?series=273129&archive=both&state=* + (fetchpatch { + url = "https://patchwork.ozlabs.org/series/273129/mbox/"; + sha256 = "sha256-/Gu7RNvBNYCGqdFRzQ11qPDDxgGVpwKYYw1CpumIGfU="; + }) + ]; }; ubootRaspberryPi3_64bit = buildUBoot { defconfig = "rpi_3_defconfig"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["u-boot.bin"]; + extraPatches = [ + # Remove when updating to 2022.01 + # https://patchwork.ozlabs.org/project/uboot/list/?series=273129&archive=both&state=* + (fetchpatch { + url = "https://patchwork.ozlabs.org/series/273129/mbox/"; + sha256 = "sha256-/Gu7RNvBNYCGqdFRzQ11qPDDxgGVpwKYYw1CpumIGfU="; + }) + ]; }; ubootRaspberryPi4_32bit = buildUBoot { diff --git a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json b/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json deleted file mode 100644 index 8f90fda228c8..000000000000 --- a/pkgs/misc/vscode-extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "OmniSharp__x86_64-linux": { - "installPath": ".omnisharp/1.37.15", - "binaries": [ - "./mono.linux-x86_64", - "./run" - ], - "urls": [ - "https://download.visualstudio.microsoft.com/download/pr/4fbf71ce-5375-4ca9-b70d-8024ba1b9e0a/b96375395e639233d546a4937be3bd32/omnisharp-linux-x64-1.37.15.zip", - "https://roslynomnisharp.blob.core.windows.net/releases/1.37.15/omnisharp-linux-x64-1.37.15.zip" - ], - "sha256": "0pchywkxy8niq0i6gq2r43cmf58blfhhj8w8zyibf0m9h09h165s" - }, - "Debugger__x86_64-linux": { - "installPath": ".debugger", - "binaries": [ - "./vsdbg-ui", - "./vsdbg" - ], - "urls": [ - "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/dd019b4c839f458596e26bfcfe6a3e7f/coreclr-debug-linux-x64.zip", - "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-x64.zip" - ], - "sha256": "0c5y0035sa07bl3m3iiqccqd92xjwpcfjrqhmi5xligk40q2i2gk" - }, - "Razor__x86_64-linux": { - "installPath": ".razor", - "binaries": [ - "./rzls" - ], - "urls": [ - "https://download.visualstudio.microsoft.com/download/pr/b8678010-2cd7-4201-a5e7-ba57920607d5/b846e9c7d7afdba54a72fae1dcb6c42c/razorlanguageserver-linux-x64-6.0.0-preview.5.21358.6.zip" - ], - "sha256": "0gb36nlb7fgcv03a0awna1qyrsky6ys5gkpsmvxc5j35f1yq337b" - } -} diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json deleted file mode 100644 index 54a931eee86a..000000000000 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "rust-analyzer", - "version": "0.2.834", - "dependencies": { - "https-proxy-agent": "^5.0.0", - "node-fetch": "^2.6.1", - "vscode-languageclient": "8.0.0-next.2", - "d3": "^7.1.0", - "d3-graphviz": "^4.0.0", - "@types/glob": "^7.1.4", - "@types/mocha": "^8.2.3", - "@types/node": "~14.17.5", - "@types/node-fetch": "^2.5.11", - "@types/vscode": "^1.57.0", - "@typescript-eslint/eslint-plugin": "^4.28.2", - "@typescript-eslint/parser": "^4.28.2", - "eslint": "^7.30.0", - "glob": "^7.1.6", - "mocha": "^9.0.2", - "tslib": "^2.3.0", - "typescript": "^4.3.5", - "typescript-formatter": "^7.2.2", - "vsce": "^1.95.1", - "vscode-test": "^1.5.1" - } -} diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 3885da4cbeba..4ff3262d27a5 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IkPv6oPdwfuIQrqQGqZAJ0b9OPRiA3GWDQuPXM/+fY4="; + sha256 = "sha256-IMNHsmL1L+zfGxfdTxJ4HBGiQOzWmYVE0P3ZInbMVl0="; }; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-/56KsEg6deeROERWLd9lX+7v6n5Dx1VCzdr/GtPFuGo="; + cargoSha256 = "sha256-Q8Xl6L41cDeDN370owAAL9xZhdyUuDKrPlZxG3eg87c="; meta = with lib; { description = "A simple and easy to use Wikipedia Text User Interface"; diff --git a/pkgs/os-specific/darwin/dockutil/default.nix b/pkgs/os-specific/darwin/dockutil/default.nix new file mode 100644 index 000000000000..d937ce8fd12a --- /dev/null +++ b/pkgs/os-specific/darwin/dockutil/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "dockutil"; + version = "2.0.5"; + + src = fetchFromGitHub { + owner = "kcrawford"; + repo = "dockutil"; + rev = version; + sha256 = "sha256-8tDkueCTCtvxc7owp3K9Tsrn4hL79CM04zBNv7AcHgA="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 scripts/dockutil -t $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Tool for managing dock items"; + homepage = "https://github.com/kcrawford/dockutil"; + license = licenses.asl20; + maintainers = with maintainers; [ tboerger ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix index 9daed151ce48..db0b1e1dcbae 100644 --- a/pkgs/os-specific/darwin/duti/default.nix +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [matthewbauer]; platforms = platforms.darwin; license = licenses.publicDomain; - homepage = "http://duti.org/"; + homepage = "https://github.com/moretension/duti/"; }; } diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix index f19f5a0275bc..9134fad6012c 100644 --- a/pkgs/os-specific/darwin/m-cli/default.nix +++ b/pkgs/os-specific/darwin/m-cli/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "m-cli"; - version = "0.2.5"; + version = "0.3.0"; src = fetchFromGitHub { owner = "rgcr"; - repo = "m-cli"; + repo = pname; rev = "v${version}"; - sha512 = "0mkcx7jq91pbfs8327qc8434gj73fvjgdfdsrza0lyd9wns6jhsqsf0585klzl68aqscvksgzi2asdnim4va35cdkp2fdzl0g3sm4kd"; + sha256 = "sha256-KzlE1DdVMLnGmcOS1a2HK4pASofD1EHpdqbzVVIxeb4="; }; dontBuild = true; @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Swiss Army Knife for macOS"; inherit (src.meta) homepage; - repositories.git = "git://github.com/rgcr/m-cli.git"; license = licenses.mit; platforms = platforms.darwin; maintainers = with maintainers; []; + mainProgram = "m"; }; } diff --git a/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch b/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch new file mode 100644 index 000000000000..abbb3b8fb0e1 --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/MoltenVK.xcodeproj.patch @@ -0,0 +1,146 @@ +diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj +index c23afce4..12ac12f4 100644 +--- a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj ++++ b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj +@@ -365,13 +365,6 @@ + /* End PBXBuildFile section */ + + /* Begin PBXContainerItemProxy section */ +- 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */ = { +- isa = PBXContainerItemProxy; +- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +- proxyType = 1; +- remoteGlobalIDString = 2FEA0CFF2490381A00EEF3AD; +- remoteInfo = "MoltenVKSPIRVToMSLConverter-tvOS"; +- }; + 2FEA0D1B249040CA00EEF3AD /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +@@ -400,20 +393,6 @@ + remoteGlobalIDString = A93903C71C57E9ED00FE90DC; + remoteInfo = "MVKSPIRVToMSLConverter-macOS"; + }; +- A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */ = { +- isa = PBXContainerItemProxy; +- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +- proxyType = 1; +- remoteGlobalIDString = A93903B81C57E9D700FE90DC; +- remoteInfo = "MVKSPIRVToMSLConverter-iOS"; +- }; +- A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */ = { +- isa = PBXContainerItemProxy; +- containerPortal = A9C86CB61C55B8350096CAF2 /* MoltenVKShaderConverter.xcodeproj */; +- proxyType = 1; +- remoteGlobalIDString = A9092A8C1A81717B00051823; +- remoteInfo = MoltenVKShaderConverter; +- }; + /* End PBXContainerItemProxy section */ + + /* Begin PBXFileReference section */ +@@ -1019,7 +998,6 @@ + buildRules = ( + ); + dependencies = ( +- 2F21D82F24983488009BEA5F /* PBXTargetDependency */, + ); + name = "MoltenVK-tvOS"; + productName = MoltenVK; +@@ -1039,7 +1017,6 @@ + buildRules = ( + ); + dependencies = ( +- A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */, + ); + name = "MoltenVK-iOS"; + productName = MoltenVK; +@@ -1059,7 +1036,6 @@ + buildRules = ( + ); + dependencies = ( +- A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */, + ); + name = "MoltenVK-macOS"; + productName = MoltenVK; +@@ -1476,24 +1452,6 @@ + }; + /* End PBXSourcesBuildPhase section */ + +-/* Begin PBXTargetDependency section */ +- 2F21D82F24983488009BEA5F /* PBXTargetDependency */ = { +- isa = PBXTargetDependency; +- name = "MoltenVKSPIRVToMSLConverter-tvOS"; +- targetProxy = 2F21D82E24983488009BEA5F /* PBXContainerItemProxy */; +- }; +- A981499B1FB6B9CF005F00B4 /* PBXTargetDependency */ = { +- isa = PBXTargetDependency; +- name = "MVKSPIRVToMSLConverter-iOS"; +- targetProxy = A981499A1FB6B9CF005F00B4 /* PBXContainerItemProxy */; +- }; +- A9B1C7F5251AA5AF001D12CC /* PBXTargetDependency */ = { +- isa = PBXTargetDependency; +- name = MoltenVKShaderConverter; +- targetProxy = A9B1C7F4251AA5AF001D12CC /* PBXContainerItemProxy */; +- }; +-/* End PBXTargetDependency section */ +- + /* Begin XCBuildConfiguration section */ + 2FEA0AB824902F9F00EEF3AD /* Debug */ = { + isa = XCBuildConfiguration; +@@ -1586,11 +1544,12 @@ + GCC_WARN_UNUSED_VARIABLE = YES; + GENERATE_MASTER_OBJECT_FILE = YES; + HEADER_SEARCH_PATHS = ( +- "\"$(SRCROOT)/include\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter/SPIRV-Cross\"", +- "\"$(SRCROOT)/../External/cereal/include\"", +- "\"${BUILT_PRODUCTS_DIR}\"", ++ "@@sourceRoot@@/outputs/include", ++ "@@sourceRoot@@/outputs/include/simd_workaround", ++ "@@sourceRoot@@/MoltenVKShaderConverter", ++ "@@cereal@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@vulkan-headers@@/include", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACH_O_TYPE = staticlib; +@@ -1600,6 +1559,10 @@ + MVK_SKIP_DYLIB = ""; + "MVK_SKIP_DYLIB[sdk=appletvsimulator*]" = YES; + "MVK_SKIP_DYLIB[sdk=iphonesimulator*]" = YES; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a"; + PRODUCT_NAME = MoltenVK; + SKIP_INSTALL = YES; +@@ -1658,11 +1621,12 @@ + GCC_WARN_UNUSED_VARIABLE = YES; + GENERATE_MASTER_OBJECT_FILE = YES; + HEADER_SEARCH_PATHS = ( +- "\"$(SRCROOT)/include\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter\"", +- "\"$(SRCROOT)/../MoltenVKShaderConverter/SPIRV-Cross\"", +- "\"$(SRCROOT)/../External/cereal/include\"", +- "\"${BUILT_PRODUCTS_DIR}\"", ++ "@@sourceRoot@@/outputs/include", ++ "@@sourceRoot@@/outputs/include/simd_workaround", ++ "@@sourceRoot@@/MoltenVKShaderConverter", ++ "@@cereal@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@vulkan-headers@@/include", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACH_O_TYPE = staticlib; +@@ -1672,6 +1636,10 @@ + MVK_SKIP_DYLIB = ""; + "MVK_SKIP_DYLIB[sdk=appletvsimulator*]" = YES; + "MVK_SKIP_DYLIB[sdk=iphonesimulator*]" = YES; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRELINK_LIBS = "${CONFIGURATION_BUILD_DIR}/libMoltenVKShaderConverter.a"; + PRODUCT_NAME = MoltenVK; + SKIP_INSTALL = YES; diff --git a/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch b/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch new file mode 100644 index 000000000000..7a7ec7afa2ee --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/MoltenVKShaderConverter.xcodeproj.patch @@ -0,0 +1,180 @@ +diff --git a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj +index c7842b63..d55f73ed 100644 +--- a/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj ++++ b/MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj +@@ -3,7 +3,7 @@ + archiveVersion = 1; + classes = { + }; +- objectVersion = 52; ++ objectVersion = 48; + objects = { + + /* Begin PBXBuildFile section */ +@@ -33,9 +33,6 @@ + A920A8AC251B75B70076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; }; + A920A8AD251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; }; + A920A8AE251B75B80076851C /* GLSLToSPIRVConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A920A8A2251B75B70076851C /* GLSLToSPIRVConverter.h */; }; +- A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; }; +- A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; }; +- A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386FD24EEE93700199A05 /* glslang.xcframework */; }; + A925B71B1C78DEB2006E7ECD /* libMoltenVKShaderConverter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */; }; + A928C9191D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; }; + A928C91A1D0488DC00071B88 /* SPIRVConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = A928C9171D0488DC00071B88 /* SPIRVConversion.h */; }; +@@ -55,12 +52,6 @@ + A97CC7411C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A97CC73E1C7527F3004A5C7E /* MoltenVKShaderConverterTool.cpp */; }; + A98149681FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; }; + A98149691FB6A98A005F00B4 /* MVKStrings.h in Headers */ = {isa = PBXBuildFile; fileRef = A98149651FB6A98A005F00B4 /* MVKStrings.h */; }; +- A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; }; +- A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; }; +- A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98386F824EEE91A00199A05 /* SPIRVCross.xcframework */; }; +- A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; }; +- A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; }; +- A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A983870224EEE94800199A05 /* SPIRVTools.xcframework */; }; + A9A14E332244388700C080F3 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9A14E322244388700C080F3 /* Metal.framework */; }; + A9B51BDD225E98BB00AC74D2 /* MVKOSExtensions.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9B51BDB225E98BB00AC74D2 /* MVKOSExtensions.mm */; }; + A9F042B21FB4D060009FCCB8 /* MVKCommonEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = A9F042AA1FB4D060009FCCB8 /* MVKCommonEnvironment.h */; }; +@@ -115,9 +106,6 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( +- A983870824EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */, +- A98386FB24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */, +- A920A8B0251B77910076851C /* glslang.xcframework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -134,9 +122,6 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( +- A983870724EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */, +- A98386FA24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */, +- A920A8AF251B77900076851C /* glslang.xcframework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -144,9 +129,6 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( +- A983870924EEE94800199A05 /* SPIRVTools.xcframework in Frameworks */, +- A98386FC24EEE91A00199A05 /* SPIRVCross.xcframework in Frameworks */, +- A920A8B1251B77920076851C /* glslang.xcframework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -313,7 +295,7 @@ + A925B71D1C78DEBF006E7ECD /* PBXTargetDependency */, + ); + name = MoltenVKShaderConverter; +- productName = MetalGLShaderConverterTool; ++ productName = MoltenVKShaderConverter; + productReference = A964BD5F1C57EFBD00D930D8 /* MoltenVKShaderConverter */; + productType = "com.apple.product-type.tool"; + }; +@@ -349,7 +331,7 @@ + dependencies = ( + ); + name = "MoltenVKShaderConverter-macOS"; +- productName = "MetalGLShaderConverter-macOS"; ++ productName = MoltenVKShaderConverter; + productReference = A93903C71C57E9ED00FE90DC /* libMoltenVKShaderConverter.a */; + productType = "com.apple.product-type.library.static"; + }; +@@ -536,6 +518,17 @@ + OTHER_LDFLAGS = ( + "-ObjC", + "-w", ++ "-lMachineIndependent", ++ "-lGenericCodeGen", ++ "-lOGLCompiler", ++ "-lglslang", ++ "-lOSDependent", ++ "-lSPIRV", ++ "-lSPIRV-Tools", ++ "-lSPIRV-Tools-opt", ++ "-lspirv-cross-msl", ++ "-lspirv-cross-core", ++ "-lspirv-cross-glsl", + ); + SDKROOT = macosx; + }; +@@ -548,6 +541,17 @@ + OTHER_LDFLAGS = ( + "-ObjC", + "-w", ++ "-lMachineIndependent", ++ "-lGenericCodeGen", ++ "-lOGLCompiler", ++ "-lglslang", ++ "-lOSDependent", ++ "-lSPIRV", ++ "-lSPIRV-Tools", ++ "-lSPIRV-Tools-opt", ++ "-lspirv-cross-msl", ++ "-lspirv-cross-core", ++ "-lspirv-cross-glsl", + ); + SDKROOT = macosx; + }; +@@ -624,15 +628,24 @@ + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + HEADER_SEARCH_PATHS = ( +- "$(inherited)", +- "\"$(SRCROOT)\"", +- "\"$(SRCROOT)/SPIRV-Cross\"", +- "\"$(SRCROOT)/glslang\"", +- "\"$(SRCROOT)/glslang/External/spirv-tools/include\"", ++ "@@sourceRoot@@/Common", ++ "@@glslang@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@spirv-tools@@/include", ++ "@@spirv-headers@@/include/spirv/unified1/", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; ++ LIBRARY_SEARCH_PATHS = ( ++ "@@glslang@@/lib", ++ "@@spirv-cross@@/lib", ++ "@@spirv-tools@@/lib", ++ ); + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRODUCT_NAME = MoltenVKShaderConverter; + SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.0; +@@ -683,15 +696,24 @@ + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + HEADER_SEARCH_PATHS = ( +- "$(inherited)", +- "\"$(SRCROOT)\"", +- "\"$(SRCROOT)/SPIRV-Cross\"", +- "\"$(SRCROOT)/glslang\"", +- "\"$(SRCROOT)/glslang/External/spirv-tools/include\"", ++ "@@sourceRoot@@/Common", ++ "@@glslang@@/include", ++ "@@spirv-cross@@/include/spirv_cross", ++ "@@spirv-tools@@/include", ++ "@@spirv-headers@@/include/spirv/unified1/", + ); + IPHONEOS_DEPLOYMENT_TARGET = 9.0; ++ LIBRARY_SEARCH_PATHS = ( ++ "@@glslang@@/lib", ++ "@@spirv-cross@@/lib", ++ "@@spirv-tools@@/lib", ++ ); + MACH_O_TYPE = staticlib; + MACOSX_DEPLOYMENT_TARGET = 10.11; ++ OTHER_CFLAGS = ( ++ "-isystem", ++ "@@libcxx@@/include/c++/v1", ++ ); + PRODUCT_NAME = MoltenVKShaderConverter; + SKIP_INSTALL = YES; + TVOS_DEPLOYMENT_TARGET = 9.0; diff --git a/pkgs/os-specific/darwin/moltenvk/createDylib.patch b/pkgs/os-specific/darwin/moltenvk/createDylib.patch new file mode 100644 index 000000000000..b4a990cd9891 --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/createDylib.patch @@ -0,0 +1,13 @@ +diff --git a/Scripts/create_dylib.sh b/Scripts/create_dylib.sh +index 5ba75f67..a0405067 100755 +--- a/Scripts/create_dylib.sh ++++ b/Scripts/create_dylib.sh +@@ -57,6 +57,8 @@ ${MVK_SAN} \ + -framework Metal ${MVK_IOSURFACE_FWK} -framework ${MVK_UX_FWK} -framework QuartzCore -framework CoreGraphics ${MVK_IOKIT_FWK} -framework Foundation \ + --library-directory ${MVK_USR_LIB_DIR} \ + -o "${MVK_BUILT_PROD_DIR}/dynamic/${MVK_DYLIB_NAME}" \ ++-L@@sourceRoot@@/outputs/lib -L@@glslang@@/lib -L@@spirv-tools@@/lib -L@@spirv-cross@@/lib \ ++-lobjc -lMoltenVKShaderConverter -lGenericCodeGen -lMachineIndependent -lOGLCompiler -lOSDependent -lSPIRV -lSPIRV-Tools -lSPIRV-Tools-opt -lspirv-cross-core -lspirv-cross-glsl -lspirv-cross-msl -lspirv-cross-reflect \ + -force_load "${MVK_BUILT_PROD_DIR}/lib${PRODUCT_NAME}.a" + + if test "$CONFIGURATION" = Debug; then diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix new file mode 100644 index 000000000000..dc7f3f58fd3a --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -0,0 +1,204 @@ +{ lib +, stdenv +, stdenvNoCC +, fetchurl +, fetchFromGitHub +, cctools +, sigtool +, cereal +, glslang +, spirv-cross +, spirv-headers +, spirv-tools +, vulkan-headers +, AppKit +, Foundation +, Metal +, QuartzCore +}: + +# Even though the derivation is currently impure, it is written to build successfully using +# `xcbuild`. Once the SDK on x86_64-darwin is updated, it should be possible to switch from being +# an impure derivation. +# +# The `sandboxProfile` was copied from the iTerm2 derivation. In order to build you at least need +# the `sandbox` option set to `relaxed` or `false`. Xcode should be available in the default +# location. +let + libcxx.dev = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr"; +in +stdenvNoCC.mkDerivation rec { + pname = "MoltenVK"; + version = "1.1.8"; + + buildInputs = [ + AppKit + Foundation + Metal + QuartzCore + ]; + + outputs = [ "out" "bin" ]; + + # MoltenVK requires specific versions of its dependencies. + # Pin them here except for cereal, which is four years old and has several CVEs. + passthru = { + # The patch required to support DXVK may different from version to version. This should never + # be used except with DXVK, so there’s no package for it. To emphasize that this patch should + # never be used except with DXVK, `dxvk` provides a function for applying this patch. + dxvkPatch = ./dxvk-moltenvk-compat.patch; + glslang = (glslang.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "90d4bd05cd77ef5782a6779a0fe3d084440dc80d"; + hash = "sha256-Q0sk4bPj/skPat1n4GJyuXAlZqpfEn4Td8Bm2IBNUqE="; + }; + })).override { + inherit (passthru) spirv-headers spirv-tools; + }; + spirv-cross = spirv-cross.overrideAttrs (old: { + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-DSPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross" + ]; + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Cross"; + rev = "131278458ea8eebe6a6e9c476fbcf71278726e1a"; + hash = "sha256-LrRYDFGv3Zxfy4qRNLwM2OOa8jbcq0ttPxDamCH21xU="; + }; + }); + spirv-headers = spirv-headers.overrideAttrs (_: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "spirv-headers"; + rev = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"; + hash = "sha256-ks9JCj5rj+Xu++7z5RiHDkU3/sFXhcScw8dATfB/ot0"; + }; + }); + spirv-tools = (spirv-tools.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "spirv-tools"; + rev = "45dd184c790d6bfc78a5a74a10c37e888b1823fa"; + hash = "sha256-DSqZlwfNTbN4fyIrVBKltm5U2U4GthW3L+Ksw4lSVG8="; + }; + meta = old.meta // { + platforms = old.meta.platforms ++ lib.platforms.darwin; + }; + })).override { + inherit (passthru) spirv-headers; + }; + vulkan-headers = vulkan-headers.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Headers"; + rev = "1dace16d8044758d32736eb59802d171970e9448"; + hash = "sha256-C6YgxWcinI3QumcWmoJaiTAf0u6jSDc8sCIarn2t04k"; + }; + meta = old.meta // { + platforms = old.meta.platforms ++ lib.platforms.darwin; + }; + }); + }; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "MoltenVK"; + rev = "v${version}"; + hash = "sha256-IfTBtA2fM7YN4qaSDUTfsiCXzn+omSV6oroL1ivKiVA="; + }; + + patches = [ + # Specify the libraries to link directly since XCFrameworks are not being used. + ./createDylib.patch + # Move `mvkGitRevDerived.h` to a stable location + ./gitRevHeaderStability.patch + # Fix the Xcode projects to play nicely with `xcbuild`. + ./MoltenVKShaderConverter.xcodeproj.patch + ./MoltenVK.xcodeproj.patch + ]; + + postPatch = '' + substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \ + --replace @@sourceRoot@@ $(pwd) \ + --replace @@libcxx@@ "${libcxx.dev}" \ + --replace @@glslang@@ "${passthru.glslang}" \ + --replace @@spirv-cross@@ "${passthru.spirv-cross}" \ + --replace @@spirv-tools@@ "${passthru.glslang.spirv-tools}" \ + --replace @@spirv-headers@@ "${passthru.glslang.spirv-headers}" + substituteInPlace MoltenVK/MoltenVK.xcodeproj/project.pbxproj \ + --replace @@sourceRoot@@ $(pwd) \ + --replace @@libcxx@@ "${libcxx.dev}" \ + --replace @@cereal@@ "${cereal}" \ + --replace @@spirv-cross@@ "${passthru.spirv-cross}" \ + --replace @@vulkan-headers@@ "${passthru.vulkan-headers}" + substituteInPlace Scripts/create_dylib.sh \ + --replace @@sourceRoot@@ $(pwd) \ + --replace @@glslang@@ "${passthru.glslang}" \ + --replace @@spirv-tools@@ "${passthru.glslang.spirv-tools}" \ + --replace @@spirv-cross@@ "${passthru.spirv-cross}" + substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \ + --replace @@sourceRoot@@ $(pwd) \ + --replace '$(git rev-parse HEAD)' ${src.rev} + ''; + + dontConfigure = true; + + buildPhase = '' + # Build each project on its own because `xcbuild` fails to build `MoltenVKPackaging.xcodeproj`. + derived_data_path=$(pwd)/DerivedData + pushd MoltenVKShaderConverter + /usr/bin/xcodebuild build \ + -jobs $NIX_BUILD_CORES \ + -derivedDataPath "$derived_data_path" \ + -configuration Release \ + -project MoltenVKShaderConverter.xcodeproj \ + -scheme MoltenVKShaderConverter \ + -arch ${stdenv.targetPlatform.darwinArch} + popd + mkdir -p outputs/bin outputs/lib + declare -A outputs=( [MoltenVKShaderConverter]=bin [libMoltenVKShaderConverter.a]=lib ) + for output in "''${!outputs[@]}"; do + cp DerivedData/Build/Products/Release/$output "outputs/''${outputs[$output]}/$output" + done + + pushd MoltenVK + /usr/bin/xcodebuild build \ + -jobs $NIX_BUILD_CORES \ + -derivedDataPath "$derived_data_path" \ + -configuration Release \ + -project MoltenVK.xcodeproj \ + -scheme MoltenVK-macOS \ + -arch ${stdenv.targetPlatform.darwinArch} + popd + cp DerivedData/Build/Products/Release/dynamic/libMoltenVK.dylib outputs/lib/libMoltenVK.dylib + ''; + + installPhase = '' + mkdir -p "$out/lib" "$out/share/vulkan/icd.d" "$bin/bin" + cp outputs/bin/MoltenVKShaderConverter "$bin/bin/" + cp outputs/lib/libMoltenVK.dylib "$out/lib/" + ${cctools}/bin/install_name_tool -id "$out/lib/libMoltenVK.dylib" "$out/lib/libMoltenVK.dylib" + # FIXME: https://github.com/NixOS/nixpkgs/issues/148189 + /usr/bin/codesign -s - -f "$out/lib/libMoltenVK.dylib" + install -m644 MoltenVK/icd/MoltenVK_icd.json "$out/share/vulkan/icd.d/MoltenVK_icd.json" + substituteInPlace $out/share/vulkan/icd.d/MoltenVK_icd.json \ + --replace ./libMoltenVK.dylib "$out/share/vulkan/icd.d/MoltenVK_icd.json" + ''; + + sandboxProfile = '' + (allow file-read* file-write* process-exec mach-lookup) + ; block homebrew dependencies + (deny file-read* file-write* process-exec mach-lookup (subpath "/usr/local") (with no-log)) + ''; + + meta = { + description = "A Vulkan Portability implementation built on top of Apple’s Metal API"; + homepage = "https://github.com/KhronosGroup/MoltenVK"; + changelog = "https://github.com/KhronosGroup/MoltenVK/releases"; + maintainers = [ lib.maintainers.reckenrode ]; + license = lib.licenses.asl20; + platforms = lib.platforms.darwin; + }; +} diff --git a/pkgs/os-specific/darwin/moltenvk/dxvk-moltenvk-compat.patch b/pkgs/os-specific/darwin/moltenvk/dxvk-moltenvk-compat.patch new file mode 100644 index 000000000000..7d16fdf70331 --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/dxvk-moltenvk-compat.patch @@ -0,0 +1,59 @@ +Source: https://github.com/Gcenx/MoltenVK/commit/1f268bd45f6c928784d7cb90dedce382895f10ae + +Fake extensions for DXVK; +- _features.geometryShader +- _features.tessellationShader +- _features.shaderCullDistance + +Enabled defaults; +- MVK_ALLOW_METAL_FENCES=1 +- MVK_CONFIG_RESUME_LOST_DEVICE=1 +--- + MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm | 3 +++ + MoltenVK/MoltenVK/Utility/MVKEnvironment.h | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm +index bc6d19df..e1959c6e 100644 +--- a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm ++++ b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm +@@ -1656,6 +1656,8 @@ + _features.robustBufferAccess = true; // XXX Required by Vulkan spec + _features.fullDrawIndexUint32 = true; + _features.independentBlend = true; ++ _features.geometryShader = true; // XXX Required by DXVK for D3D10 ++ _features.tessellationShader = true; // XXX Required by DXVK for D3D11 + _features.sampleRateShading = true; + _features.depthBiasClamp = true; + _features.fillModeNonSolid = true; +@@ -1669,6 +1671,7 @@ + _features.shaderUniformBufferArrayDynamicIndexing = true; + _features.shaderStorageBufferArrayDynamicIndexing = true; + _features.shaderClipDistance = true; ++ _features.shaderCullDistance = true; // XXX Required by DXVK for 10level9 + _features.shaderInt16 = true; + _features.multiDrawIndirect = true; + _features.inheritedQueries = true; +diff --git a/MoltenVK/MoltenVK/Utility/MVKEnvironment.h b/MoltenVK/MoltenVK/Utility/MVKEnvironment.h +index 81d0defc..80c414d3 100644 +--- a/MoltenVK/MoltenVK/Utility/MVKEnvironment.h ++++ b/MoltenVK/MoltenVK/Utility/MVKEnvironment.h +@@ -240,7 +240,7 @@ void mvkSetConfig(const MVKConfiguration& mvkConfig); + # define MVK_ALLOW_METAL_EVENTS 1 + #endif + #ifndef MVK_ALLOW_METAL_FENCES +-# define MVK_ALLOW_METAL_FENCES 0 ++# define MVK_ALLOW_METAL_FENCES 1 // XXX Required by DXVK for Apple/NVidia GPUs (better FPS than CPU Emulation) + #endif + + /** Substitute Metal 2D textures for Vulkan 1D images. Enabled by default. */ +@@ -275,7 +275,7 @@ void mvkSetConfig(const MVKConfiguration& mvkConfig); + + /** Resume MVKDevice VK_ERROR_DEVICE_LOST errors that do not cause MVKPhysicalDevice errors. Disabled by default. */ + #ifndef MVK_CONFIG_RESUME_LOST_DEVICE +-# define MVK_CONFIG_RESUME_LOST_DEVICE 0 ++# define MVK_CONFIG_RESUME_LOST_DEVICE 1 + #endif + + /** Support Metal argument buffers. Disabled by default. */ + \ No newline at end of file diff --git a/pkgs/os-specific/darwin/moltenvk/gitRevHeaderStability.patch b/pkgs/os-specific/darwin/moltenvk/gitRevHeaderStability.patch new file mode 100644 index 000000000000..e28b9ee70b6a --- /dev/null +++ b/pkgs/os-specific/darwin/moltenvk/gitRevHeaderStability.patch @@ -0,0 +1,14 @@ +diff --git a/Scripts/gen_moltenvk_rev_hdr.sh b/Scripts/gen_moltenvk_rev_hdr.sh +index c49ea4e6..9b7d13d1 100755 +--- a/Scripts/gen_moltenvk_rev_hdr.sh ++++ b/Scripts/gen_moltenvk_rev_hdr.sh +@@ -2,7 +2,7 @@ + + # Record the MoltenVK GIT revision as a derived header file suitable for including in a build + MVK_GIT_REV=$(git rev-parse HEAD) +-MVK_HDR_FILE="${BUILT_PRODUCTS_DIR}/mvkGitRevDerived.h" ++MVK_HDR_FILE="@@sourceRoot@@/outputs/include/mvkGitRevDerived.h" ++mkdir -p $(dirname ${MVK_HDR_FILE}) + echo "// Auto-generated by MoltenVK" > "${MVK_HDR_FILE}" + echo "static const char* mvkRevString = \"${MVK_GIT_REV}\";" >> "${MVK_HDR_FILE}" +- diff --git a/pkgs/os-specific/darwin/mysides/default.nix b/pkgs/os-specific/darwin/mysides/default.nix new file mode 100644 index 000000000000..cdbfee5046a2 --- /dev/null +++ b/pkgs/os-specific/darwin/mysides/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, libarchive, p7zip }: + +stdenv.mkDerivation rec { + pname = "mysides"; + version = "1.0.1"; + + src = fetchurl { + url = "https://github.com/mosen/mysides/releases/download/v${version}/mysides-${version}.pkg"; + sha256 = "sha256-dpRrj3xb9xQSXXXxragUDgNPBaniiMc6evRF12wqVRQ="; + }; + + dontBuild = true; + nativeBuildInputs = [ libarchive p7zip ]; + + unpackPhase = '' + 7z x $src + bsdtar -xf Payload~ + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 usr/local/bin/mysides -t $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Manage macOS Finder sidebar favorites"; + homepage = "https://github.com/mosen/mysides"; + license = licenses.mit; + maintainers = with maintainers; [ tboerger ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix new file mode 100644 index 000000000000..cc5c4ae20458 --- /dev/null +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchFromGitHub, memstreamHook, Carbon, Cocoa, SkyLight }: + +let + inherit (stdenv.hostPlatform) system; + target = { + "aarch64-darwin" = "arm"; + "x86_64-darwin" = "x86"; + }.${system} or (throw "Unsupported system: ${system}"); +in + +stdenv.mkDerivation rec { + pname = "sketchybar"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "FelixKratz"; + repo = "SketchyBar"; + rev = "v${version}"; + sha256 = "sha256-ucTyJhRhSVyE4E/x6PtFz7nHRUg6cKKVOrRpPs39iO8="; + }; + + buildInputs = [ Carbon Cocoa SkyLight ] + ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memstreamHook ]; + + makeFlags = [ + target + ]; + + installPhase = '' + mkdir -p $out/bin + cp ./bin/sketchybar_${target} $out/bin/sketchybar + ''; + + meta = with lib; { + description = "A highly customizable macOS status bar replacement"; + homepage = "https://github.com/FelixKratz/SketchyBar"; + platforms = platforms.darwin; + maintainers = [ maintainers.azuwis ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/os-specific/darwin/usr-include/default.nix b/pkgs/os-specific/darwin/usr-include/default.nix deleted file mode 100644 index 26b60ea44f5d..000000000000 --- a/pkgs/os-specific/darwin/usr-include/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, darwin}: - -/* - * This is needed to build GCC on Darwin. - * - * These are the collection of headers that would normally be available under - * /usr/include in macOS machines with command line tools installed. They need - * to be in one folder for gcc to use them correctly. - */ - -stdenv.mkDerivation { - name = "darwin-usr-include"; - buildInputs = [ darwin.CF stdenv.libc ]; - buildCommand = '' - mkdir -p $out - cd $out - ln -sf ${stdenv.libc}/include/* . - mkdir CoreFoundation - ln -sf ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Headers/* CoreFoundation - ''; - - meta.platforms = lib.platforms.darwin; -} diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index 700389a4a183..0724118431ce 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; sourceRoot = "source/src"; - makeFlags = [ + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags ++ [ "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch b/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch new file mode 100644 index 000000000000..b17df9a492e5 --- /dev/null +++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/alsa-plugin-conf-multilib.patch @@ -0,0 +1,232 @@ +diff --git a/src/control/control.c b/src/control/control.c +index d66ed75..42cecad 100644 +--- a/src/control/control.c ++++ b/src/control/control.c +@@ -838,6 +838,10 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name, + #ifndef PIC + extern void *snd_control_open_symbols(void); + #endif ++ ++ snd_config_t *libs = NULL; ++ const char *libs_lib = NULL; ++ + if (snd_config_get_type(ctl_conf) != SND_CONFIG_TYPE_COMPOUND) { + if (name) + SNDERR("Invalid type for CTL %s definition", name); +@@ -879,6 +883,19 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name, + SNDERR("Invalid type for %s", id); + goto _err; + } ++ ++ continue; ++ } ++ // Handle an array of extra libs. ++ if (strcmp(id, "libs") == 0) { ++ if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) { ++ SNDERR("Invalid type for libs definition in CTL %s definition", ++ str); ++ goto _err; ++ } ++ ++ libs = n; ++ + continue; + } + if (strcmp(id, "open") == 0) { +@@ -903,7 +920,62 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name, + open_name = buf; + sprintf(buf, "_snd_ctl_%s_open", str); + } +- if (!lib) { ++ ++#ifndef PIC ++ snd_control_open_symbols(); ++#endif ++ ++ // Normal alsa behaviour when there is no libs array. ++ if (!libs) { ++ if (lib) { ++ open_func = snd_dlobj_cache_get(lib, open_name, ++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 1); ++ } ++ } ++ // Handle libs array. ++ // Suppresses error messages if any function is loaded successfully. ++ else { ++ if (lib) { ++ open_func = snd_dlobj_cache_get(lib, open_name, ++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 0); ++ } ++ ++ if (!open_func) { ++ snd_config_for_each(i, next, libs) { ++ snd_config_t *n = snd_config_iterator_entry(i); ++ ++ err = snd_config_get_string(n, &libs_lib); ++ if (err < 0) { ++ SNDERR("Invalid entry in CTL %s libs definition", str); ++ goto _err; ++ } ++ ++ if (!open_func) { ++ open_func = snd_dlobj_cache_get(libs_lib, open_name, ++ SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 0); ++ } ++ } ++ } ++ ++ // Print error messages. ++ if (!open_func) { ++ if (lib) { ++ SNDERR("Either %s cannot be opened or %s was not defined inside", ++ lib, open_name); ++ } ++ ++ snd_config_for_each(i, next, libs) { ++ snd_config_t *n = snd_config_iterator_entry(i); ++ ++ snd_config_get_string(n, &libs_lib); ++ SNDERR("Either %s cannot be opened or %s was not defined inside", ++ libs_lib, open_name); ++ } ++ } ++ } ++ ++ // Look in ALSA_PLUGIN_DIR iff we found nowhere else to look. ++ if (!lib && (!libs || !libs_lib)) { + const char *const *build_in = build_in_ctls; + while (*build_in) { + if (!strcmp(*build_in, str)) +@@ -919,12 +991,11 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name, + lib = buf1; + sprintf(buf1, "%s/libasound_module_ctl_%s.so", ALSA_PLUGIN_DIR, str); + } +- } +-#ifndef PIC +- snd_control_open_symbols(); +-#endif +- open_func = snd_dlobj_cache_get(lib, open_name, ++ ++ open_func = snd_dlobj_cache_get(lib, open_name, + SND_DLSYM_VERSION(SND_CONTROL_DLSYM_VERSION), 1); ++ } ++ + if (open_func) { + err = open_func(ctlp, name, ctl_root, ctl_conf, mode); + if (err >= 0) { +diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c +index 2e24338..7f489f4 100644 +--- a/src/pcm/pcm.c ++++ b/src/pcm/pcm.c +@@ -2116,6 +2116,10 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name, + #ifndef PIC + extern void *snd_pcm_open_symbols(void); + #endif ++ ++ snd_config_t *libs = NULL; ++ const char *libs_lib = NULL; ++ + if (snd_config_get_type(pcm_conf) != SND_CONFIG_TYPE_COMPOUND) { + char *val; + id = NULL; +@@ -2160,6 +2164,19 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name, + SNDERR("Invalid type for %s", id); + goto _err; + } ++ ++ continue; ++ } ++ // Handle an array of extra libs. ++ if (strcmp(id, "libs") == 0) { ++ if (snd_config_get_type(n) != SND_CONFIG_TYPE_COMPOUND) { ++ SNDERR("Invalid type for libs definition in PCM %s definition", ++ str); ++ goto _err; ++ } ++ ++ libs = n; ++ + continue; + } + if (strcmp(id, "open") == 0) { +@@ -2184,7 +2201,62 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name, + open_name = buf; + sprintf(buf, "_snd_pcm_%s_open", str); + } +- if (!lib) { ++ ++#ifndef PIC ++ snd_pcm_open_symbols(); /* this call is for static linking only */ ++#endif ++ ++ // Normal alsa behaviour when there is no libs array. ++ if (!libs) { ++ if (lib) { ++ open_func = snd_dlobj_cache_get(lib, open_name, ++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 1); ++ } ++ } ++ // Handle libs array. ++ // Suppresses error messages if any function is loaded successfully. ++ else { ++ if (lib) { ++ open_func = snd_dlobj_cache_get(lib, open_name, ++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 0); ++ } ++ ++ if (!open_func) { ++ snd_config_for_each(i, next, libs) { ++ snd_config_t *n = snd_config_iterator_entry(i); ++ ++ err = snd_config_get_string(n, &libs_lib); ++ if (err < 0) { ++ SNDERR("Invalid entry in PCM %s libs definition", str); ++ goto _err; ++ } ++ ++ if (!open_func) { ++ open_func = snd_dlobj_cache_get(libs_lib, open_name, ++ SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 0); ++ } ++ } ++ } ++ ++ // Print error messages. ++ if (!open_func) { ++ if (lib) { ++ SNDERR("Either %s cannot be opened or %s was not defined inside", ++ lib, open_name); ++ } ++ ++ snd_config_for_each(i, next, libs) { ++ snd_config_t *n = snd_config_iterator_entry(i); ++ ++ snd_config_get_string(n, &libs_lib); ++ SNDERR("Either %s cannot be opened or %s was not defined inside", ++ libs_lib, open_name); ++ } ++ } ++ } ++ ++ // Look in ALSA_PLUGIN_DIR iff we found nowhere else to look. ++ if (!lib && (!libs || !libs_lib)) { + const char *const *build_in = build_in_pcms; + while (*build_in) { + if (!strcmp(*build_in, str)) +@@ -2200,12 +2272,11 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name, + lib = buf1; + sprintf(buf1, "%s/libasound_module_pcm_%s.so", ALSA_PLUGIN_DIR, str); + } +- } +-#ifndef PIC +- snd_pcm_open_symbols(); /* this call is for static linking only */ +-#endif +- open_func = snd_dlobj_cache_get(lib, open_name, ++ ++ open_func = snd_dlobj_cache_get(lib, open_name, + SND_DLSYM_VERSION(SND_PCM_DLSYM_VERSION), 1); ++ } ++ + if (open_func) { + err = open_func(pcmp, name, pcm_root, pcm_conf, stream, mode); + if (err >= 0) { diff --git a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix index 445d171d31fd..58e5990ae0a6 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { hash = "sha256-rVgpk9Us21+xWaC+q2CmrFfqsMwb34XcTbbWGX8CMz8="; }; + patches = [ + # Add a "libs" field to the syntax recognized in the /etc/asound.conf file. + # The nixos modules for pulseaudio, jack, and pipewire are leveraging this + # "libs" field to declare locations for both native and 32bit plugins, in + # order to support apps with 32bit sound running on x86_64 architecture. + ./alsa-plugin-conf-multilib.patch + ]; + enableParallelBuilding = true; postInstall = '' diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index b293f8513bbd..241145a24843 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -11,6 +11,7 @@ , expat , libffi , libselinux +, libdrm , udev , kernel ? null }: @@ -204,6 +205,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ + libdrm patchelf perl ]; diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index d684e24db914..2a98aa82ebbd 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -49,13 +49,13 @@ in stdenv.mkDerivation rec { pname = "anbox"; - version = "unstable-2020-11-29"; + version = "unstable-2021-10-20"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "6c10125a7f13908d2cbe56d2d9ab09872755f265"; - sha256 = "00bqssh4zcs0jj6w07b91719xkrpdw75vpcplwrvlhwsvl55f901"; + rev = "84f0268012cbe322ad858d76613f4182074510ac"; + sha256 = "sha256-QXWhatewiUDQ93cH1UZsYgbjUxpgB1ajtGFYZnKmabc="; fetchSubmodules = true; }; diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 62437d662b92..98fd83ed5d51 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 8e95c44f95cd..5c1cf272e0e7 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -304,10 +304,10 @@ let meta = apparmor-meta "kernel patches"; }; - # Generate generic AppArmor rules in a file, - # from the closure of given rootPaths. - # To be included in an AppArmor profile like so: - # include "$(apparmorRulesFromClosure {} [pkgs.hello]}" + # Generate generic AppArmor rules in a file, from the closure of given + # rootPaths. To be included in an AppArmor profile like so: + # + # include "${apparmorRulesFromClosure { } [ pkgs.hello ]}" apparmorRulesFromClosure = { # The store path of the derivation is given in $path additionalRules ? [] diff --git a/pkgs/os-specific/linux/atop/default.upstream b/pkgs/os-specific/linux/atop/default.upstream deleted file mode 100644 index 46099d9c9595..000000000000 --- a/pkgs/os-specific/linux/atop/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url http://atoptool.nl/downloadatop.php -version_link '[.]tar[.]' -version '[^0-9]*[-.]([0-9]([-0-9.]*[0-9])?)[.].*' '\1' -minimize_overwrite diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 9fd24eea6d9b..e9762f44dcdc 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -3,11 +3,13 @@ runCommand, autoreconfHook, autoconf, automake, libtool, - enablePython ? false, python ? null, + # Enabling python support while cross compiling would be possible, but + # the configure script tries executing python to gather info instead of + # relying on python3-config exclusively + enablePython ? stdenv.hostPlatform == stdenv.buildPlatform, python3, swig, + linuxHeaders ? stdenv.cc.libc.linuxHeaders }: -assert enablePython -> python != null; - stdenv.mkDerivation rec { pname = "audit"; version = "2.8.5"; # at the next release, remove the patches below! @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = lib.optional enablePython python; + buildInputs = lib.optionals enablePython [ python3 swig ]; configureFlags = [ # z/OS plugin is not useful on Linux, @@ -69,8 +71,11 @@ stdenv.mkDerivation rec { }) ]; - prePatch = '' + postPatch = '' sed -i 's,#include ,#include \n#include ,' audisp/audispd.c + substituteInPlace bindings/swig/src/auditswig.i \ + --replace "/usr/include/linux/audit.h" \ + "${linuxHeaders}/include/linux/audit.h" '' # According to https://stackoverflow.com/questions/13089166 # --whole-archive linker flag is required to be sure that linker diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 354f4b1bff2c..123c42e83971 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -12,11 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags ++ [ + "KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; hardeningDisable = [ "pic" ]; preBuild = '' - makeFlags="KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" sed -i -e "s,INSTALL_MOD_DIR=,INSTALL_MOD_PATH=$out INSTALL_MOD_DIR=," \ -e /depmod/d Makefile ''; diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index caeaed455f7e..d6e4b059088d 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -7,7 +7,7 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.23.0"; + version = "0.24.0"; disabled = !stdenv.isLinux; @@ -15,7 +15,7 @@ python.pkgs.buildPythonApplication rec { owner = "iovisor"; repo = "bcc"; rev = "v${version}"; - sha256 = "sha256-iLVUwJTDQ8Bn38sgHOcIR8TYxIB+gIlfTgr9+gPU0gE="; + sha256 = "sha256-5Nq6LmphiyiiIyru/P2rCCmA25cwJIWn08oK1+eM3cQ="; }; format = "other"; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 5e81cf6b2c1d..ab9b7055fdda 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -22,11 +22,11 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.62"; + version = "5.63"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-OAkKW3UOF/wI0+UheO2NMlTF9L0sSIMNXBlVuI47wMI="; + sha256 = "sha256-k0nhHoFguz1yCDXScSUNinQk02kPUonm22/gfMZsbXY="; }; buildInputs = [ @@ -135,6 +135,5 @@ in stdenv.mkDerivation rec { homepage = "http://www.bluez.org/"; license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.linux; - repositories.git = "https://git.kernel.org/pub/scm/bluetooth/bluez.git"; }; } diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index b8a017adcf42..7aaedb5b1acd 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, buildPackages, fetchurl, fetchFromGitLab , enableStatic ? stdenv.hostPlatform.isStatic , enableMinimal ? false +, enableAppletSymlinks ? true # Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping: # nix build -f pkgs/top-level/release.nix stdenvBootstrapTools.x86_64-linux.dist , useMusl ? stdenv.hostPlatform.libc == "musl", musl @@ -66,6 +67,8 @@ stdenv.mkDerivation rec { ./busybox-in-store.patch ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; + separateDebugInfo = true; + postPatch = "patchShebangs ."; configurePhase = '' @@ -93,6 +96,11 @@ stdenv.mkDerivation rec { CONFIG_STATIC y ''} + ${lib.optionalString (!enableAppletSymlinks) '' + CONFIG_INSTALL_APPLET_DONT y + CONFIG_INSTALL_APPLET_SYMLINKS n + ''} + # Use the external mount.cifs program. CONFIG_FEATURE_MOUNT_CIFS n CONFIG_FEATURE_MOUNT_HELPERS y @@ -120,6 +128,8 @@ stdenv.mkDerivation rec { makeFlagsArray+=("CC=${stdenv.cc.targetPrefix}cc -isystem ${musl.dev}/include -B${musl}/lib -L${musl}/lib") ''; + makeFlags = [ "SKIP_STRIP=y" ]; + postInstall = '' sed -e ' 1 a busybox() { '$out'/bin/busybox "$@"; }\ diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 9c30aae86fe8..73edb3be9ec3 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -13,16 +13,13 @@ stdenv.mkDerivation { sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq"; }; - KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = "\${out}"; + makeFlags = kernel.makeFlags ++ [ + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; - buildPhase = '' - make modules - ''; - - installPhase = '' - make modules_install - ''; + buildFlags = [ "modules" ]; + installTargets = [ "modules_install" ]; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index 21a69a2234e2..b0d1967d10c2 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20211210"; + version = "20220224"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-4CmJVwDeGm+DNgJSgEiSzVi1TR9f869Et7tq/kEOX0Q="; + sha256 = "sha256-ShneKhGK7kT4Vs0b7PpaGSV0tZV3lTcqhuN9yiTaH50="; }; # For pod2man during the build process. diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index f09679ba2128..cc3a1d81109e 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-vJQ10rG5FGbeEOqCUmH/pZ0P77kAW/MtUarywbtIyHw="; }; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; KERNEL_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 939a7115e89b..a9bd508d16ec 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { version = "2.4.3"; outputs = [ "out" "dev" "man" ]; + separateDebugInfo = true; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v2.4/${pname}-${version}.tar.xz"; @@ -30,8 +31,6 @@ stdenv.mkDerivation rec { "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" "--disable-ssh-token" - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ - "--enable-static-cryptsetup" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/dddvb/default.nix b/pkgs/os-specific/linux/dddvb/default.nix new file mode 100644 index 000000000000..7db444bff0f4 --- /dev/null +++ b/pkgs/os-specific/linux/dddvb/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, kernel +}: + +stdenv.mkDerivation rec { + pname = "dddvb"; + version = "0.9.38-pre.4"; + + src = fetchFromGitHub { + owner = "DigitalDevices"; + repo = "dddvb"; + rev = "e9ccab3578965234c0ea38c5b30969f33600561d"; + sha256 = "sha256-gOG+dAeQ++kTC5xaEpsr3emz3s6FXiKeCHmA9shYBJk="; + }; + + postPatch = '' + sed -i '/depmod/d' Makefile + ''; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + INSTALL_MOD_PATH = placeholder "out"; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/DigitalDevices/dddvb"; + description = "ddbridge linux driver"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 6b5f66f825bd..e26509d3a7cb 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "1l54j85540386a8aypqka7p5hy1b63cwmpsscv9rmmf10f78v8mm"; }; - INSTALL_MOD_PATH = "\${out}"; - postPatch = '' sed 's/udevadm /true /' -i Makefile sed 's/depmod /true /' -i Makefile @@ -38,10 +36,11 @@ stdenv.mkDerivation rec { rm -r $out/lib/udev ''; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KVERSION=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "DESTDIR=${placeholder "out"}" + "INSTALL_MOD_PATH=${placeholder "out"}" ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index 8a083b8b894d..44dd19b27dfb 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, libX11 }: +{ lib, stdenv, fetchFromGitHub, libX11 }: stdenv.mkDerivation { pname = "disk-indicator"; version = "unstable-2014-05-19"; - src = fetchgit { - url = "git://github.com/MeanEYE/Disk-Indicator.git"; + src = fetchFromGitHub { + owner = "MeanEYE"; + repo = "Disk-Indicator"; rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da"; - sha256 = "10jx6mx9qarn21p2l2jayxkn1gmqhvck1wymgsr4jmbwxl8ra5kd"; + sha256 = "sha256-bRaVEe18VUmyftXzMNmGuL5gZ/dKCipuEDYrnHo1XYI="; }; buildInputs = [ libX11 ]; diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 6cc22c25602b..e7e572ce18e1 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -20,22 +20,22 @@ let in stdenv.mkDerivation rec { pname = "displaylink"; - version = "5.4.1-55.174"; + version = "5.5.0-59.151"; src = requireFile rec { - name = "displaylink.zip"; - sha256 = "1biswvjz91gmx7xf9g05h3ra463hf2yv9mr2nkxclyrd283iiiqc"; + name = "displaylink-55.zip"; + sha256 = "0pswmczzrqqq0s0ksp6rfnkm693ligq4nblki1v53jdh0y7d1gff"; message = '' In order to install the DisplayLink drivers, you must first comply with DisplayLink's EULA and download the binaries and sources from here: - https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.4.1 + https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.5 Once you have downloaded the file, please use the following commands and re-run the installation: - mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu ${lib.versions.majorMinor version}.zip" \$PWD/${name} + mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu5.5-EXE.zip" \$PWD/${name} nix-prefetch-url file://\$PWD/${name} ''; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dt $out/lib/displaylink *.spkg install -Dm755 ${bins}/DisplayLinkManager $out/bin/DisplayLinkManager - mkdir -p $out/lib/udev/rules.d + mkdir -p $out/lib/udev/rules.d $out/share cp ${./99-displaylink.rules} $out/lib/udev/rules.d/99-displaylink.rules patchelf \ --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ @@ -59,6 +59,9 @@ stdenv.mkDerivation rec { $out/bin/DisplayLinkManager wrapProgram $out/bin/DisplayLinkManager \ --run "cd $out/lib/displaylink" + + # We introduce a dependency on the source file so that it need not be redownloaded everytime + echo $src >> "$out/share/workspace_dependencies.pin" ''; dontStrip = true; diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index 50124a2bf452..6315d361ed68 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -1,16 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, bash, perl, python2 }: - -# There are fixes for python3 compatibility on master +{ lib, stdenv, fetchFromGitHub, bash, perl, python3 }: stdenv.mkDerivation rec { pname = "dmtcp"; - version = "unstable-2021-03-01"; + version = "unstable-2022-02-28"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "f999adbb8e88fe452a0e57ceb43b6eed7b4409f9"; - sha256 = "sha256-codCHQui3fGfUZSNq8GuH4ad/GjD6I/S9rX83o8oFPc="; + rev = "133687764c6742906006a1d247e3b83cd860fa1d"; + hash = "sha256-9Vr8IhoeATCfyt7Lp7kYe/7e87mFX9KMNGTqxJgIztE="; }; dontDisableStatic = true; @@ -30,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace test/autotest.py \ --replace /bin/bash ${bash}/bin/bash \ --replace /usr/bin/perl ${perl}/bin/perl \ - --replace /usr/bin/python ${python2}/bin/python \ + --replace /usr/bin/python ${python3.interpreter} \ --replace "os.environ['USER']" "\"nixbld1\"" \ --replace "os.getenv('USER')" "\"nixbld1\"" ''; diff --git a/pkgs/os-specific/linux/dpdk-kmods/default.nix b/pkgs/os-specific/linux/dpdk-kmods/default.nix index a188336cbe50..694e508dcd01 100644 --- a/pkgs/os-specific/linux/dpdk-kmods/default.nix +++ b/pkgs/os-specific/linux/dpdk-kmods/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; + makeFlags = kernel.makeFlags ++ [ + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -18,10 +21,9 @@ stdenv.mkDerivation rec { preBuild = "cd linux/igb_uio"; installPhase = '' - make -C ${KSRC} M=$(pwd) modules_install + make -C ${KSRC} M=$(pwd) modules_install $makeFlags ''; - INSTALL_MOD_PATH = placeholder "out"; enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 7592be483f53..1e4f50e42df3 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -1,9 +1,9 @@ { stdenv, lib , kernel , fetchurl -, pkg-config, meson, ninja +, pkg-config, meson, ninja, makeWrapper , libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap, rdma-core -, doxygen, python3 +, doxygen, python3, pciutils , withExamples ? [] , shared ? false }: @@ -20,6 +20,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ + makeWrapper doxygen meson ninja @@ -31,22 +32,27 @@ in stdenv.mkDerivation rec { buildInputs = [ jansson libbpf - libbsd libelf libpcap numactl openssl.dev zlib + python3 ] ++ lib.optionals mod kernel.moduleBuildDependencies; - # Propagated to support current DPDK users in nixpkgs which statically link - # with the framework (e.g. odp-dpdk). propagatedBuildInputs = [ + # Propagated to support current DPDK users in nixpkgs which statically link + # with the framework (e.g. odp-dpdk). rdma-core + # Requested by pkg-config. + libbsd ]; postPatch = '' patchShebangs config/arm buildtools + '' + lib.optionalString mod '' + # kernel_install_dir is hardcoded to `/lib/modules`; patch that. + sed -i "s,kernel_install_dir *= *['\"].*,kernel_install_dir = '$kmod/lib/modules/${kernel.modDirVersion}'," kernel/linux/meson.build ''; mesonFlags = [ @@ -59,30 +65,25 @@ in stdenv.mkDerivation rec { ++ lib.optional (!shared) "-Ddefault_library=static" ++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem" ++ lib.optional stdenv.isAarch64 "-Dmachine=generic" - ++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}" + ++ lib.optional mod "-Dkernel_dir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}"; - # dpdk meson script does not support separate kernel source and installion - # dirs (except via destdir), so we temporarily link the former into the latter. - preConfigure = lib.optionalString mod '' - mkdir -p $kmod/lib/modules/${kernel.modDirVersion} - ln -sf ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ - $kmod/lib/modules/${kernel.modDirVersion} - ''; - - postBuild = lib.optionalString mod '' - rm -f $kmod/lib/modules/${kernel.modDirVersion}/build - ''; - postInstall = '' # Remove Sphinx cache files. Not only are they not useful, but they also # contain store paths causing spurious dependencies. rm -rf $out/share/doc/dpdk/html/.doctrees + + wrapProgram $out/bin/dpdk-devbind.py \ + --prefix PATH : "${lib.makeBinPath [ pciutils ]}" '' + lib.optionalString (withExamples != []) '' - find examples -type f -executable -exec install {} $out/bin \; + mkdir -p $examples/bin + find examples -type f -executable -exec install {} $examples/bin \; ''; - outputs = [ "out" ] ++ lib.optional mod "kmod"; + outputs = + [ "out" "doc" ] + ++ lib.optional mod "kmod" + ++ lib.optional (withExamples != []) "examples"; meta = with lib; { description = "Set of libraries and drivers for fast packet processing"; diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix index 930e9381bb74..ad7468bac0f5 100644 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, pandoc, installShellFiles, withManpage ? false }: +{ lib, stdenv, fetchFromGitHub, pandoc, installShellFiles, withManpage ? false, nixosTests }: stdenv.mkDerivation rec { pname = "earlyoom"; - version = "1.6.2"; + version = "1.7"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; rev = "v${version}"; - sha256 = "16iyn51xlrsbshc7p5xl2338yyfzknaqc538sa7mamgccqwgyvvq"; + sha256 = "sha256-8YcT1TTlAet7F1U9Ginda4IApNqkudegOXqm8rnRGfc="; }; nativeBuildInputs = lib.optionals withManpage [ pandoc installShellFiles ]; @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { installManPage earlyoom.1 ''; + passthru.tests = { + inherit (nixosTests) earlyoom; + }; + meta = with lib; { description = "Early OOM Daemon for Linux"; homepage = "https://github.com/rfjakob/earlyoom"; diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 1257217a5206..5873a2fe2c1d 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; # linux 3.12 NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - strip -S ena.ko + $STRIP -S ena.ko dest=$out/lib/modules/${kernel.modDirVersion}/misc mkdir -p $dest cp ena.ko $dest/ diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index e0d1c46d64ad..721a49ed4a56 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,20 +2,22 @@ stdenv.mkDerivation rec { pname = "evdi"; - version = "unstable-2021-07-07"; + version = "1.10.0"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "b0b2c80eb63f9b858b71afa772135f434aea192a"; - sha256 = "sha256-io+CbZovGjEJjwtmARFH23Djt933ONoHMDoea+i6xFo="; + rev = "v${version}"; + sha256 = "sha256-vMcmUWdnO9JmImxz4vO3/UONlsrCGc8VH/o38YwCIzg="; }; + NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; + nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ kernel libdrm ]; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; @@ -33,6 +35,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = with licenses; [ lgpl21Only gpl2Only ]; homepage = "https://www.displaylink.com/"; - broken = kernel.kernelOlder "4.19" || kernel.kernelAtLeast "5.15" || stdenv.isAarch64; + broken = kernel.kernelOlder "4.19" || stdenv.isAarch64; }; } diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/os-specific/linux/extrace/default.nix index 1eac5997bf3b..e4afe6f85039 100644 --- a/pkgs/os-specific/linux/extrace/default.nix +++ b/pkgs/os-specific/linux/extrace/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "extrace"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = "extrace"; rev = "v${version}"; - sha256 = "sha256-Kg5yzVg9sqlOCzAq/HeFUPZ89Enfkt/r7EunCfOqdA0="; + hash = "sha256-Jy/Ac3NcqBkW0kHyypMAVUGAQ41qWM96BbLAym06ogM="; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' install -dm755 "$out/share/licenses/extrace/" @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/leahneukirchen/extrace"; description = "Trace exec() calls system-wide"; - license = with licenses; [ gpl2 bsd2 ]; + license = with licenses; [ gpl2Plus bsd2 ]; platforms = platforms.linux; maintainers = [ maintainers.leahneukirchen ]; }; diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 348be830562f..c3dc819b5bcf 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "firejail"; - version = "0.9.66"; + version = "0.9.68"; src = fetchFromGitHub { owner = "netblue30"; repo = "firejail"; rev = version; - sha256 = "sha256-oKstTiGt0r4wePaZ9u1o78GZ1XWJ27aS0BdLxmfYk9Q="; + sha256 = "18yy1mykx7h78yj7sz729i3dlsrgi25m17m5x9gbrvsx7f87rw7j"; }; nativeBuildInputs = [ @@ -40,9 +40,6 @@ stdenv.mkDerivation rec { # By default fbuilder hardcodes the firejail binary to the install path. # On NixOS the firejail binary is a setuid wrapper available in $PATH. ./fbuilder-call-firejail-on-path.patch - # Disable symlink check on /etc/hosts, see - # https://github.com/netblue30/firejail/issues/2758#issuecomment-805174951 - ./remove-link-check.patch ]; prePatch = '' diff --git a/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch b/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch index 6016891655b1..548bb80e7bf7 100644 --- a/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch +++ b/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch @@ -1,11 +1,11 @@ --- a/src/fbuilder/build_profile.c +++ b/src/fbuilder/build_profile.c -@@ -67,7 +67,7 @@ - errExit("asprintf"); - - char *cmdlist[] = { -- BINDIR "/firejail", -+ "firejail", - "--quiet", - "--noprofile", - "--caps.drop=all", +@@ -48,7 +48,7 @@ + // build command + char *cmd[len]; + unsigned curr_len = 0; +- cmd[curr_len++] = BINDIR "/firejail"; ++ cmd[curr_len++] = "firejail"; + cmd[curr_len++] = "--quiet"; + cmd[curr_len++] = "--noprofile"; + cmd[curr_len++] = "--caps.drop=all"; diff --git a/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch b/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch index 685314f90758..6493eb4fdf26 100644 --- a/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch +++ b/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch @@ -1,6 +1,6 @@ ---- a/src/firejail/fs.c -+++ b/src/firejail/fs.c -@@ -1143,6 +1143,16 @@ +--- a/src/firejail/fs_overlayfs.c ++++ b/src/firejail/fs_overlayfs.c +@@ -327,6 +327,16 @@ errExit("mounting /dev"); fs_logger("whitelist /dev"); @@ -17,7 +17,7 @@ // mount-bind run directory if (arg_debug) printf("Mounting /run\n"); -@@ -1201,6 +1211,7 @@ +@@ -384,6 +394,7 @@ free(odiff); free(owork); free(dev); diff --git a/pkgs/os-specific/linux/firejail/remove-link-check.patch b/pkgs/os-specific/linux/firejail/remove-link-check.patch deleted file mode 100644 index 477df57a2411..000000000000 --- a/pkgs/os-specific/linux/firejail/remove-link-check.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ccc726f8ec877d8cda720daa2498e43629b6dd48 Mon Sep 17 00:00:00 2001 -From: Jonas Heinrich -Date: Sun, 19 Sep 2021 11:48:06 +0200 -Subject: [PATCH 1/2] remove hosts file link check - ---- - src/firejail/fs_hostname.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c -index 42255070c4..97ce70f9c1 100644 ---- a/src/firejail/fs_hostname.c -+++ b/src/firejail/fs_hostname.c -@@ -132,10 +132,6 @@ char *fs_check_hosts_file(const char *fname) { - invalid_filename(fname); - char *rv = expand_home(fname, cfg.homedir); - -- // no a link -- if (is_link(rv)) -- goto errexit; -- - // the user has read access to the file - if (access(rv, R_OK)) - goto errexit; - -From c2c51e7ca56075e7388b4f50922b148615d1b125 Mon Sep 17 00:00:00 2001 -From: Jonas Heinrich -Date: Sun, 19 Sep 2021 11:49:08 +0200 -Subject: [PATCH 2/2] remove hosts file link check - ---- - src/firejail/fs_hostname.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c -index 97ce70f9c1..b228707131 100644 ---- a/src/firejail/fs_hostname.c -+++ b/src/firejail/fs_hostname.c -@@ -154,9 +154,6 @@ void fs_mount_hosts_file(void) { - struct stat s; - if (stat("/etc/hosts", &s) == -1) - goto errexit; -- // not a link -- if (is_link("/etc/hosts")) -- goto errexit; - // owned by root - if (s.st_uid != 0) - goto errexit; diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix new file mode 100644 index 000000000000..02b549dd9ea1 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -0,0 +1,27 @@ +{ lib +, flutter +, fetchFromGitHub +}: + +flutter.mkFlutterApp { + pname = "firmware-updater"; + version = "unstable"; + + vendorHash = "sha256-L8am4vTx4KlMHUdIhrUsCxGc27vkolawS/9DyFCPOJQ="; + + src = fetchFromGitHub { + owner = "canonical"; + repo = "firmware-updater"; + rev = "a51817a2551e29895352618a91df9cf93d944af1"; + sha256 = "6uhks6a9JcyIC5o0VssqfBlE4pqKiQ7d3KOb6feNTvU="; + fetchSubmodules = true; + }; + + meta = with lib; { + description = "Firmware Updater for Linux"; + homepage = "https://github.com/canonical/firmware-updater"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix b/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix index 0e74b32b3b6b..bd9f0d2474e4 100644 --- a/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "fwupd-efi"; - version = "1.1"; + version = "1.2"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/${pname}-${version}.tar.xz"; - sha256 = "1w879qxlnsaz5xyp168a08f2p8yrgfpkfycls28jw8qxmz6g20aw"; + sha256 = "sha256-aRx38RwhAQSNjauvY8bQ/iLPrQ5dQyIEHJurzrr86z8="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index 66194430b251..bdb2fc34728a 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -1,28 +1,27 @@ diff --git a/data/meson.build b/data/meson.build -index f10d4ff6..2dc66fb6 100644 +index 2ae29ce5..342cac92 100644 --- a/data/meson.build +++ b/data/meson.build -@@ -21,7 +21,7 @@ endif +@@ -26,7 +26,7 @@ endif if build_standalone install_data(['daemon.conf'], - install_dir : join_paths(sysconfdir, 'fwupd') + install_dir : join_paths(sysconfdir_install, 'fwupd') ) - install_data(['power.quirk'], + install_data(['power.quirk', 'cfi.quirk'], install_dir: join_paths(datadir, 'fwupd', 'quirks.d')) diff --git a/data/pki/meson.build b/data/pki/meson.build -index dcd9e128..ff137f3a 100644 +index 2a7d0f24..091981f7 100644 --- a/data/pki/meson.build +++ b/data/pki/meson.build -@@ -2,24 +2,23 @@ install_data([ +@@ -12,13 +12,13 @@ install_data([ 'GPG-KEY-Linux-Foundation-Firmware', 'GPG-KEY-Linux-Vendor-Firmware-Service', ], - install_dir : join_paths(sysconfdir, 'pki', 'fwupd') + install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd') ) - install_data([ 'GPG-KEY-Linux-Foundation-Metadata', 'GPG-KEY-Linux-Vendor-Firmware-Service', @@ -30,7 +29,9 @@ index dcd9e128..ff137f3a 100644 - install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') + install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') ) + endif +@@ -26,11 +26,11 @@ if supported_pkcs7 == '1' install_data([ 'LVFS-CA.pem', ], @@ -43,7 +44,7 @@ index dcd9e128..ff137f3a 100644 - install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') + install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') ) -- + endif diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build index 02d8777b..2c89d593 100644 --- a/data/remotes.d/meson.build @@ -82,10 +83,10 @@ index 02d8777b..2c89d593 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index 7557cd4a..4c98de6d 100644 +index 394f40fa..7b602c73 100644 --- a/meson.build +++ b/meson.build -@@ -190,6 +190,12 @@ endif +@@ -187,6 +187,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -99,14 +100,14 @@ index 7557cd4a..4c98de6d 100644 gio = dependency('gio-2.0', version : '>= 2.45.8') giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false) diff --git a/meson_options.txt b/meson_options.txt -index 94f73898..5de6cc7b 100644 +index c1b483cb..047dbdd8 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('sysconfdir_install', type: 'string', value: '', description: 'sysconfdir to use during installation') option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type') option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support') - option('firmware-packager', type : 'boolean', value : true, description : 'enable firmware-packager installation') + option('static_analysis', type : 'boolean', value : false, description : 'enable GCC static analysis support') diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build index e9f12879..a0126dbb 100644 --- a/plugins/dell-esrt/meson.build @@ -119,8 +120,21 @@ index e9f12879..a0126dbb 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) endif +diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build +index 3ea47456..40dbd116 100644 +--- a/plugins/msr/meson.build ++++ b/plugins/msr/meson.build +@@ -12,7 +12,7 @@ install_data(['fwupd-msr.conf'], + endif + + install_data(['msr.conf'], +- install_dir: join_paths(sysconfdir, 'fwupd') ++ install_dir: join_paths(sysconfdir_install, 'fwupd') + ) + shared_module('fu_plugin_msr', + fu_hash, diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build -index 5263048c..c46fac64 100644 +index 4a0a8664..7d9ba77d 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build @@ -53,7 +53,7 @@ shared_module('fu_plugin_redfish', @@ -129,14 +143,14 @@ index 5263048c..c46fac64 100644 install_data(['redfish.conf'], - install_dir: join_paths(sysconfdir, 'fwupd'), + install_dir: join_paths(sysconfdir_install, 'fwupd'), - install_mode: 'rw-r-----', ) + if get_option('tests') diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build -index 646ed6cb..8d7c59aa 100644 +index 1ba9562f..c074f770 100644 --- a/plugins/thunderbolt/meson.build +++ b/plugins/thunderbolt/meson.build -@@ -35,7 +35,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', +@@ -37,7 +37,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', ) install_data(['thunderbolt.conf'], @@ -146,7 +160,7 @@ index 646ed6cb..8d7c59aa 100644 # we use functions from 2.52 in the tests if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52') diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build -index 708586b0..f29536b1 100644 +index 04cbd51a..9a8c43de 100644 --- a/plugins/uefi-capsule/meson.build +++ b/plugins/uefi-capsule/meson.build @@ -21,7 +21,7 @@ if host_machine.system() == 'linux' @@ -158,7 +172,7 @@ index 708586b0..f29536b1 100644 ) elif host_machine.system() == 'freebsd' backend_srcs += 'fu-uefi-backend-freebsd.c' -@@ -116,7 +116,7 @@ if get_option('man') +@@ -114,7 +114,7 @@ if get_option('compat_cli') and get_option('man') endif install_data(['uefi_capsule.conf'], diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 077c37a72cb3..272bd6dbe8fc 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -12,6 +12,7 @@ , libgudev , polkit , libxmlb +, glib , gusb , sqlite , libarchive @@ -50,6 +51,9 @@ , nixosTests , runCommand , unstableGitUpdater +, modemmanager +, libqmi +, libmbim }: let @@ -112,7 +116,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.7.2"; + version = "1.7.6"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -121,7 +125,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "sha256-hjLfacO6/Fk4fNy1F8POMaWXoJAm5E9ZB9g4RnG5+DQ="; + sha256 = "sha256-fr4VFKy2iNJknOzDktuSkJTaPwPPyYqcD6zKuwhJEvo="; }; patches = [ @@ -136,15 +140,26 @@ let # they are not really part of the library. ./install-fwupdplugin-to-out.patch + # Fix detection of installed tests + # https://github.com/fwupd/fwupd/issues/3880 + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/5bc546221331feae9cedc1892219a25d8837955f.patch"; + sha256 = "XcLhcDrB2/MFCXjKAyhftQgvJG4BBkp07geM9eK3q1g="; + }) + # Installed tests are installed to different output # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. ./installed-tests-path.patch - # Tests detect fwupd is installed when prefix is /usr. - ./fix-install-detection.patch - # EFI capsule is located in fwupd-efi now. ./efi-app-path.patch + + # Drop hard-coded FHS path + # https://github.com/fwupd/fwupd/issues/4360 + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/14cc2e7ee471b66ee2ef54741f4bec1f92204620.patch"; + sha256 = "47682oqE66Y6QKPtN2mYpnb2+TIJFqBgsgx60LmC3FM="; + }) ]; nativeBuildInputs = [ @@ -187,6 +202,9 @@ let efivar fwupd-efi protobufc + modemmanager + libmbim + libqmi ] ++ lib.optionals haveDell [ libsmbios ]; @@ -206,6 +224,7 @@ let "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" "-Defi_os_dir=nixos" + "-Dplugin_modem_manager=true" # We do not want to place the daemon into lib (cyclic reference) "--libexecdir=${placeholder "out"}/libexec" @@ -250,6 +269,9 @@ let contrib/generate-version-script.py \ meson_post_install.sh \ po/test-deps + + substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \ + --replace "gdbus" ${glib.bin}/bin/gdbus ''; preCheck = '' @@ -301,6 +323,7 @@ let passthru = { filesInstalledToEtc = [ "fwupd/daemon.conf" + "fwupd/msr.conf" "fwupd/remotes.d/lvfs-testing.conf" "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" diff --git a/pkgs/os-specific/linux/firmware/fwupd/fix-install-detection.patch b/pkgs/os-specific/linux/firmware/fwupd/fix-install-detection.patch deleted file mode 100644 index 56d7def5c16a..000000000000 --- a/pkgs/os-specific/linux/firmware/fwupd/fix-install-detection.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c -index 4710c769..1c68fdb9 100644 ---- a/plugins/redfish/fu-self-test.c -+++ b/plugins/redfish/fu-self-test.c -@@ -27,7 +27,7 @@ fu_test_is_installed_test(void) - const gchar *builddir = g_getenv("G_TEST_BUILDDIR"); - if (builddir == NULL) - return FALSE; -- return g_str_has_prefix(builddir, "/usr"); -+ return g_str_has_prefix(builddir, "/nix"); - } - - static void diff --git a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch index 2024e84b0a83..ea50d88dfed6 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch @@ -1,8 +1,8 @@ diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build -index adadbcdd..1b51bb9c 100644 +index b8ec916f0..38209b363 100644 --- a/data/installed-tests/meson.build +++ b/data/installed-tests/meson.build -@@ -65,5 +65,5 @@ configure_file( +@@ -83,5 +83,5 @@ configure_file( output : 'fwupd-tests.conf', configuration : con2, install: true, @@ -10,10 +10,10 @@ index adadbcdd..1b51bb9c 100644 + install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index 772b7bbe..f59302cd 100644 +index 32fe6e408..b35d741e0 100644 --- a/meson.build +++ b/meson.build -@@ -177,8 +177,8 @@ else +@@ -183,8 +183,8 @@ else datadir = join_paths(prefix, get_option('datadir')) sysconfdir = join_paths(prefix, get_option('sysconfdir')) localstatedir = join_paths(prefix, get_option('localstatedir')) @@ -24,6 +24,14 @@ index 772b7bbe..f59302cd 100644 endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) +@@ -484,6 +484,7 @@ gnome = import('gnome') + i18n = import('i18n') + + conf.set_quoted('FWUPD_PREFIX', prefix) ++conf.set_quoted('FWUPD_INSTALLED_TEST_PREFIX', get_option('installed_test_prefix')) + conf.set_quoted('FWUPD_BINDIR', bindir) + conf.set_quoted('FWUPD_LIBDIR', libdir) + conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir) diff --git a/meson_options.txt b/meson_options.txt index 0a0e2853..5f68d78b 100644 --- a/meson_options.txt @@ -36,3 +44,16 @@ index 0a0e2853..5f68d78b 100644 option('tests', type : 'boolean', value : true, description : 'enable tests') option('tpm', type : 'boolean', value : true, description : 'enable TPM support') option('udevdir', type: 'string', value: '', description: 'Directory for udev rules') +diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c +index c507fabc8..0cddc3248 100644 +--- a/plugins/redfish/fu-self-test.c ++++ b/plugins/redfish/fu-self-test.c +@@ -27,7 +27,7 @@ fu_test_is_installed_test(void) + const gchar *builddir = g_getenv("G_TEST_BUILDDIR"); + if (builddir == NULL) + return FALSE; +- return g_str_has_prefix(builddir, FWUPD_PREFIX); ++ return g_str_has_prefix(builddir, FWUPD_INSTALLED_TEST_PREFIX); + } + + static void diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index 439cfb03a3b1..22dc930d293d 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20211216"; + version = "20220310"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = "refs/tags/${version}"; - sha256 = "sha256-Q5TPtSbETDDRVKFfwQOp+GGsTGpTpGU5PQ5QkJCtWcM="; + sha256 = "sha256-U5XZHzriZaPlgiAcrZnAA7K8PKnIGy58Pi6JziVFTR8="; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-nyhxyDVO7tWkCD7fMjwiFNuMSh5e/z5w71CIZw3SJH8="; + outputHash = "sha256-CAYJssH36aKhzvl0q60HyxgDXeAluspfnLLmawmWIQw="; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index ba8df751511f..4ade35845ecb 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "raspberrypi-wireless-firmware"; - version = "2021-06-28"; + version = "2021-11-02"; srcs = [ (fetchFromGitHub { @@ -16,8 +16,8 @@ stdenv.mkDerivation { name = "firmware-nonfree"; owner = "RPi-Distro"; repo = "firmware-nonfree"; - rev = "00de3194a96397c913786945ac0af1fd6fbec45b"; - sha256 = "1xnr364dkiq6gmr21lcrj23hwc0g9y5qad8dm2maij647bgzp07r"; + rev = "54ffdd6e2ea6055d46656b78e148fe7def3ec9d8"; + sha256 = "4WTrs/tUyOugufRrrh0qsEmhPclQD64ypYysxsnOyS8="; }) ]; @@ -32,7 +32,8 @@ stdenv.mkDerivation { mkdir -p "$out/lib/firmware/brcm" # Wifi firmware - for filename in firmware-nonfree/brcm/brcmfmac434??-sdio.*; do + shopt -s extglob + for filename in firmware-nonfree/brcm/brcmfmac434??{,s}-sdio.*; do cp "$filename" "$out/lib/firmware/brcm" done @@ -43,7 +44,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0a54gyrq6jfxxvimaa4yjfiyfwf7wv58v0a32l74yrzyarr3ldby"; + outputHash = "l+7VOq7CV5QA8/FWjMBGDcxq8Qe7NFf6E2Y42htZEgE="; meta = with lib; { description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W"; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix index 9934f51487d1..7143d0b55a27 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation { pname = "raspberrypi-armstubs"; - version = "2021-07-05"; + version = "2021-11-01"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "tools"; - rev = "2e59fc67d465510179155973d2b959e50a440e47"; - sha256 = "1ysdl4qldy6ldf8cm1igxjisi14xl3s2pi6cnqzpxb38sgihb1vy"; + rev = "13474ee775d0c5ec8a7da4fb0a9fa84187abfc87"; + sha256 = "s/RPMIpQSznoQfchAP9gpO7I2uuTsOV0Ep4vVz7i2o4="; }; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 29c1859121e0..7f0eef05dc4e 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchurl, unzip }: stdenvNoCC.mkDerivation rec { # NOTE: this should be updated with linux_rpi pname = "raspberrypi-firmware"; - version = "1.20210805"; + version = "1.20220118"; - src = fetchFromGitHub { - owner = "raspberrypi"; - repo = "firmware"; - rev = version; - sha256 = "1nndhjv4il42yw3pq8ni3r4nlp1m0r229fadrf4f9v51mgcg11i1"; + src = fetchurl { + url = "https://github.com/raspberrypi/firmware/archive/${version}.zip"; + sha256 = "sha256-98rbwKIuB7vb4MWbFCr7TYsvJB0HzPdH8Tw0+bktK/M="; }; + nativeBuildInputs = [ unzip ]; + installPhase = '' - mkdir -p $out/share/raspberrypi/boot - cp -R boot/* $out/share/raspberrypi/boot + mkdir -p $out/share/raspberrypi/ + mv boot "$out/share/raspberrypi/" ''; dontConfigure = true; diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/pkgs/os-specific/linux/firmware/rt5677/default.nix index f5d84179fd29..f21d34bbe533 100644 --- a/pkgs/os-specific/linux/firmware/rt5677/default.nix +++ b/pkgs/os-specific/linux/firmware/rt5677/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "rt5677-firmware"; - src = fetchgit { - url = "https://github.com/raphael/linux-samus"; + src = fetchFromGitHub { + owner = "raphael"; + repo = "linux-samus"; rev = "995de6c2093797905fbcd79f1a3625dd3f50be37"; - sha256 = "0a6lz9wadm47cmva136q6wd0lw03bmymf9ispnzb091a7skwacry"; + sha256 = "sha256-PjPFpz4qJLC+vTomV31dA3AKGjfYjKB2ZYfUpnj61Cg="; }; - installPhase = '' mkdir -p $out/lib/firmware cp ./firmware/rt5677_elf_vad $out/lib/firmware diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 73b9cf08b808..5ec2bd70fdb6 100644 --- a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install - version = "1.0.31"; + version = "1.0.32"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = version; - sha256 = "sha256-agtaQ5Te4WcbIdCt8TDK4Y2y/9aHrDCUWuPRE5+aFjc="; + sha256 = "sha256-EV7byqfoz0sAIkf/hgZh+m7D2+54DEnE4td4CTX6c4s="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "sha256-QFHyrvLR1v09RNlXiO/E+blvxPukKwPRRX+vQvlZSNQ="; + cargoSha256 = "sha256-/bf5JQgyFN8TH7o2TWHX5sv/NkxBLJ495iVW8c9Vqis="; # Purposefully don't install systemd unit file, that's for NixOS postInstall = '' diff --git a/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix b/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix new file mode 100644 index 000000000000..0375eb0eead8 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/xow_dongle-firmware/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchurl, cabextract }: + +stdenv.mkDerivation rec { + pname = "xow_dongle-firmware"; + version = "2017-07"; + + dontUnpack = true; + dontInstall = true; + + src = fetchurl { + url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab"; + sha256 = "013g1zngxffavqrk5jy934q3bdhsv6z05ilfixdn8dj0zy26lwv5"; + }; + + nativeBuildInputs = [ cabextract ]; + + buildPhase = '' + cabextract -F FW_ACC_00U.bin ${src} + mkdir -p $out/lib/firmware + cp -a FW_ACC_00U.bin $out/lib/firmware/xow_dongle.bin + ''; + + meta = with lib; { + description = "Xbox One wireless dongle firmware"; + homepage = "https://www.xbox.com/en-NZ/accessories/adapters/wireless-adapter-windows"; + license = licenses.unfree; + maintainers = with lib.maintainers; [ rhysmdnz ]; + platforms = platforms.linux; + }; +} + + diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index baa92decd9fc..e600e163ad73 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -1,22 +1,26 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "fnotifystat"; version = "0.02.07"; - src = fetchurl { - url = "https://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz"; - sha256 = "0ipfg2gymbgx7bqlx1sq5p2y89k5j18iqnb0wa27n5s3kh9sh8w0"; + src = fetchFromGitHub { + owner = "ColinIanKing"; + repo = pname; + rev = "V${version}"; + sha256 = "sha256-5oYM1t+vmWywYRbgXI2RGQlOuNJluj2gwCMf3pTpDC0="; }; - installFlags = [ "DESTDIR=$(out)" ]; - postInstall = '' - mv $out/usr/* $out - rm -r $out/usr - ''; + + installFlags = [ + "BINDIR=${placeholder "out"}/bin" + "MANDIR=${placeholder "out"}/share/man/man8" + "BASHDIR=${placeholder "out"}/share/bash-completion/completions" + ]; + meta = with lib; { description = "File activity monitoring tool"; - homepage = "https://kernel.ubuntu.com/~cking/fnotifystat/"; - license = licenses.gpl2; + homepage = "https://github.com/ColinIanKing/fnotifystat"; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ womfoo ]; + maintainers = with maintainers; [ womfoo dtzWill ]; }; } diff --git a/pkgs/os-specific/linux/forktty/default.nix b/pkgs/os-specific/linux/forktty/default.nix index f060557cdecd..7dc1f0c3b2e4 100644 --- a/pkgs/os-specific/linux/forktty/default.nix +++ b/pkgs/os-specific/linux/forktty/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "1.3"; src = fetchurl { - url = "http://sunsite.unc.edu/pub/linux/utils/terminal/forktty-${version}.tgz"; - sha256 = "sha256-6xc5eshCuCIOsDh0r2DizKAeypGH0TRRotZ4itsvpVk="; + url = "mirror://ibiblioPubLinux/utils/terminal/${pname}-${version}.tgz"; + hash = "sha256-6xc5eshCuCIOsDh0r2DizKAeypGH0TRRotZ4itsvpVk="; }; preBuild = '' diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 226c6e1c72ad..e967dea1c3e1 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "fscrypt"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "google"; repo = "fscrypt"; rev = "v${version}"; - sha256 = "0gi91vm0ai4vjzj6cfnjsfy8kbfxjiq2n7jnbhf5470qbx49qixr"; + hash = "sha256-kkcZuX8tB7N8l9O3X6H92EqEqdAcqSbX+pwr7GrcRFY="; }; postPatch = '' @@ -19,7 +19,7 @@ buildGoModule rec { --replace "/usr/local" "$out" ''; - vendorSha256 = "1gw3q2pn8v6n9wkl5881rbxglislnr98a9gjqnqm894gnz7hfdzb"; + vendorSha256 = "sha256-6zcHz7ePJFSxxfIlhVK2VEf6+soBoUInT9ZsZK/Ag78="; doCheck = false; @@ -27,11 +27,15 @@ buildGoModule rec { buildInputs = [ pam ]; buildPhase = '' + runHook preBuild make + runHook postBuild ''; installPhase = '' + runHook preInstall make install + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix index 737d3316e21d..72f25aa800eb 100644 --- a/pkgs/os-specific/linux/fwts/module.nix +++ b/pkgs/os-specific/linux/fwts/module.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" ]; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; diff --git a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix index ab2e099d9708..bcea220cc96e 100644 --- a/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix +++ b/pkgs/os-specific/linux/gcadapter-oc-kmod/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KERNEL_SOURCE_DIR=${kernel.dev}/${kerneldir}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/os-specific/linux/gogoclient/config-paths.patch b/pkgs/os-specific/linux/gogoclient/config-paths.patch deleted file mode 100644 index 88358038bc7e..000000000000 --- a/pkgs/os-specific/linux/gogoclient/config-paths.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urN gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in gogoc-1_2-RELEASE-fix/gogoc-tsp/conf/gogoc.conf.in ---- gogoc-1_2-RELEASE/gogoc-tsp/conf/gogoc.conf.in 2009-11-20 17:53:12.000000000 +0100 -+++ gogoc-1_2-RELEASE-fix/gogoc-tsp/conf/gogoc.conf.in 2012-02-25 15:16:12.758849219 +0100 -@@ -224,7 +224,7 @@ - # - # broker_list= - # --broker_list=tsp-broker-list.txt -+broker_list=/var/lib/gogoc/tsp-broker-list.txt - - # - # Last Server Used File Name: -@@ -234,7 +234,7 @@ - # - # last_server= - # --last_server=tsp-last-server.txt -+last_server=/var/lib/gogoc/tsp-last-server.txt - - # - # Always Use Last Known Working Server: -@@ -294,7 +294,7 @@ - # - # log_filename= - # --log_filename=gogoc.log -+log_filename=/var/log/gogoc.log - - # - # Log File Rotation: -@@ -313,7 +313,7 @@ - # - # log_rotation= - # --log_rotation=yes -+log_rotation=no - - # - # Log File Rotation Size: diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix deleted file mode 100644 index 75c0f1c3d1bc..000000000000 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{lib, stdenv, fetchurl, openssl, nettools, iproute2, sysctl}: - -stdenv.mkDerivation rec { - pname = "gogoclient"; - version = "1.2"; - - src = fetchurl { - #url = "http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz"; - url = "https://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz"; - sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49"; - }; - patches = [./gcc46-include-fix.patch ./config-paths.patch ]; - makeFlags = ["target=linux"]; - installFlags = ["installdir=$(out)"]; - - hardeningDisable = [ "format" ]; - - buildInputs = [openssl]; - - preFixup = '' - mkdir -p $out/share/gogoclient-${version} - chmod 444 $out/bin/gogoc.conf - mv $out/bin/gogoc.conf $out/share/gogoclient-${version}/gogoc.conf.sample - rm $out/bin/gogoc.conf.sample - - substituteInPlace "$out/template/linux.sh" \ - --replace "/sbin/ifconfig" "${nettools}/bin/ifconfig" \ - --replace "/sbin/route" "${nettools}/bin/route" \ - --replace "/sbin/ip" "${iproute2}/sbin/ip" \ - --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" - sed -i -e 's/^.*Exec \$route -A.*$/& metric 128/' $out/template/linux.sh - ''; - - meta = with lib; { - homepage = "https://ipv6.ernet.in/Tunnel_broker"; - description = "Client to connect to the Freenet6 IPv6 tunnel broker service"; - maintainers = [ maintainers.bluescreen303 ]; - license = licenses.bsd3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch b/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch deleted file mode 100644 index 22ecad187d62..000000000000 --- a/pkgs/os-specific/linux/gogoclient/gcc46-include-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN gogoc-1_2-RELEASE/gogoc-messaging/src/clientmsgsender.cc gogoc-1_2-RELEASE-fix/gogoc-messaging/src/clientmsgsender.cc ---- gogoc-1_2-RELEASE/gogoc-messaging/src/clientmsgsender.cc 2009-11-20 17:34:55.000000000 +0100 -+++ gogoc-1_2-RELEASE-fix/gogoc-messaging/src/clientmsgsender.cc 2012-02-25 15:06:20.764698284 +0100 -@@ -15,6 +15,7 @@ - // ************************************************************************** - #include - #include -+#include - - - namespace gogocmessaging -diff -urN gogoc-1_2-RELEASE/gogoc-messaging/src/servermsgsender.cc gogoc-1_2-RELEASE-fix/gogoc-messaging/src/servermsgsender.cc ---- gogoc-1_2-RELEASE/gogoc-messaging/src/servermsgsender.cc 2009-11-20 17:34:56.000000000 +0100 -+++ gogoc-1_2-RELEASE-fix/gogoc-messaging/src/servermsgsender.cc 2012-02-25 15:06:36.722740288 +0100 -@@ -15,6 +15,7 @@ - // ************************************************************************** - #include - #include -+#include - - - namespace gogocmessaging diff --git a/pkgs/os-specific/linux/greetd/default.nix b/pkgs/os-specific/linux/greetd/default.nix index cfde703cd674..744b43f6f8aa 100644 --- a/pkgs/os-specific/linux/greetd/default.nix +++ b/pkgs/os-specific/linux/greetd/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { that makes no assumptions about what you want to launch. Comes with agreety, a simple, text-based greeter. ''; - homepage = "https://kl.wtf/projects/greetd/"; + homepage = "https://sr.ht/~kennylevinsen/greetd/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ luc65r ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 300bb499f855..2b112a9590b0 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdparm"; - version = "9.62"; + version = "9.63"; src = fetchurl { url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz"; - sha256 = "sha256-LA+ddc2+2pKKJaEozT0LcSBEXsCRDAsp1MEDjtG+d38="; + sha256 = "sha256-cHhd6uu6WHeonBI1aLQd7pkNpV/FFCDxP2CaEHKJlpE="; }; preBuild = '' diff --git a/pkgs/os-specific/linux/hid-nintendo/default.nix b/pkgs/os-specific/linux/hid-nintendo/default.nix index e9ee88252ea8..7d01120b2f3f 100644 --- a/pkgs/os-specific/linux/hid-nintendo/default.nix +++ b/pkgs/os-specific/linux/hid-nintendo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 8124da489aee..3fdbaa9149a6 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -73,7 +73,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://hostap.epitest.fi"; - repositories.git = "git://w1.fi/hostap.git"; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; maintainers = with maintainers; [ ninjatrappeur hexa ]; diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 7de8046483d4..9af2aba3d806 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A better i7 (and now i3, i5) reporting tool for Linux"; homepage = "https://github.com/DimitryAndric/i7z"; - repositories.git = "https://github.com/DimitryAndric/i7z.git"; license = licenses.gpl2; maintainers = with maintainers; [ bluescreen303 ]; # broken on ARM diff --git a/pkgs/os-specific/linux/iotop-c/default.nix b/pkgs/os-specific/linux/iotop-c/default.nix index 680bc53bd91b..4ed45a99ce25 100644 --- a/pkgs/os-specific/linux/iotop-c/default.nix +++ b/pkgs/os-specific/linux/iotop-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.20"; + version = "1.21"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "sha256-6Pg2CLWzsD6EPRKD2xMMgKFkpbSheiMMkd0BvHh9onA="; + sha256 = "sha256-Zzm0EV6baQvKPOC762mnieYe1JM7ZfNovKqFQt20jQ8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch b/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch deleted file mode 100644 index 00c23c6cac14..000000000000 --- a/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: pkg-ipsec-tools/src/racoon/gssapi.c -=================================================================== ---- pkg-ipsec-tools.orig/src/racoon/gssapi.c -+++ pkg-ipsec-tools/src/racoon/gssapi.c -@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1) - gss_name_t princ, canon_princ; - OM_uint32 maj_stat, min_stat; - -+ if (iph1->rmconf == NULL) { -+ plog(LLV_ERROR, LOCATION, NULL, "no remote config\n"); -+ return -1; -+ } -+ - gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state)); - if (gps == NULL) { - plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n"); diff --git a/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch b/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch deleted file mode 100644 index b644d46f8c9d..000000000000 --- a/pkgs/os-specific/linux/ipsec-tools/CVE-2016-10396.patch +++ /dev/null @@ -1,193 +0,0 @@ -From: Antoine_Beaupre -Acked-by: Jiri Bohac -Subject: PR/51682: Avoid DoS with fragment out of order insertion; keep fragments sorted in the list. -References: bsc#1047443, CVE-2016-10396 - - - -Index: a/src/racoon/handler.h -=================================================================== ---- a/src/racoon/handler.h.orig 2018-01-26 18:05:21.114764376 +0100 -+++ a/src/racoon/handler.h 2018-01-26 18:05:33.986741103 +0100 -@@ -141,6 +141,7 @@ struct ph1handle { - #endif - #ifdef ENABLE_FRAG - int frag; /* IKE phase 1 fragmentation */ -+ int frag_last_index; - struct isakmp_frag_item *frag_chain; /* Received fragments */ - #endif - -Index: a/src/racoon/isakmp.c -=================================================================== ---- a/src/racoon/isakmp.c.orig 2018-01-26 18:05:21.118764369 +0100 -+++ a/src/racoon/isakmp.c 2018-01-26 18:05:33.986741103 +0100 -@@ -1069,6 +1069,7 @@ isakmp_ph1begin_i(rmconf, remote, local) - iph1->frag = 1; - else - iph1->frag = 0; -+ iph1->frag_last_index = 0; - iph1->frag_chain = NULL; - #endif - iph1->approval = NULL; -@@ -1173,6 +1174,7 @@ isakmp_ph1begin_r(msg, remote, local, et - #endif - #ifdef ENABLE_FRAG - iph1->frag = 0; -+ iph1->frag_last_index = 0; - iph1->frag_chain = NULL; - #endif - iph1->approval = NULL; -Index: a/src/racoon/isakmp_frag.c -=================================================================== ---- a/src/racoon/isakmp_frag.c.orig 2018-01-26 18:05:21.118764369 +0100 -+++ a/src/racoon/isakmp_frag.c 2018-01-26 18:05:33.986741103 +0100 -@@ -173,6 +173,43 @@ vendorid_frag_cap(gen) - return ntohl(hp[MD5_DIGEST_LENGTH / sizeof(*hp)]); - } - -+static int -+isakmp_frag_insert(struct ph1handle *iph1, struct isakmp_frag_item *item) -+{ -+ struct isakmp_frag_item *pitem = NULL; -+ struct isakmp_frag_item *citem = iph1->frag_chain; -+ -+ /* no frag yet, just insert at beginning of list */ -+ if (iph1->frag_chain == NULL) { -+ iph1->frag_chain = item; -+ return 0; -+ } -+ -+ do { -+ /* duplicate fragment number, abort (CVE-2016-10396) */ -+ if (citem->frag_num == item->frag_num) -+ return -1; -+ -+ /* need to insert before current item */ -+ if (citem->frag_num > item->frag_num) { -+ if (pitem != NULL) -+ pitem->frag_next = item; -+ else -+ /* insert at the beginning of the list */ -+ iph1->frag_chain = item; -+ item->frag_next = citem; -+ return 0; -+ } -+ -+ pitem = citem; -+ citem = citem->frag_next; -+ } while (citem != NULL); -+ -+ /* we reached the end of the list, insert */ -+ pitem->frag_next = item; -+ return 0; -+} -+ - int - isakmp_frag_extract(iph1, msg) - struct ph1handle *iph1; -@@ -224,39 +261,43 @@ isakmp_frag_extract(iph1, msg) - item->frag_next = NULL; - item->frag_packet = buf; - -- /* Look for the last frag while inserting the new item in the chain */ -- if (item->frag_last) -- last_frag = item->frag_num; -+ /* Check for the last frag before inserting the new item in the chain */ -+ if (item->frag_last) { -+ /* if we have the last fragment, indices must match */ -+ if (iph1->frag_last_index != 0 && -+ item->frag_last != iph1->frag_last_index) { -+ plog(LLV_ERROR, LOCATION, NULL, -+ "Repeated last fragment index mismatch\n"); -+ racoon_free(item); -+ vfree(buf); -+ return -1; -+ } - -- if (iph1->frag_chain == NULL) { -- iph1->frag_chain = item; -- } else { -- struct isakmp_frag_item *current; -+ last_frag = iph1->frag_last_index = item->frag_num; -+ } - -- current = iph1->frag_chain; -- while (current->frag_next) { -- if (current->frag_last) -- last_frag = item->frag_num; -- current = current->frag_next; -- } -- current->frag_next = item; -+ /* insert fragment into chain */ -+ if (isakmp_frag_insert(iph1, item) == -1) { -+ plog(LLV_ERROR, LOCATION, NULL, -+ "Repeated fragment index mismatch\n"); -+ racoon_free(item); -+ vfree(buf); -+ return -1; - } - -- /* If we saw the last frag, check if the chain is complete */ -+ /* If we saw the last frag, check if the chain is complete -+ * we have a sorted list now, so just walk through */ - if (last_frag != 0) { -+ item = iph1->frag_chain; - for (i = 1; i <= last_frag; i++) { -- item = iph1->frag_chain; -- do { -- if (item->frag_num == i) -- break; -- item = item->frag_next; -- } while (item != NULL); -- -+ if (item->frag_num != i) -+ break; -+ item = item->frag_next; - if (item == NULL) /* Not found */ - break; - } - -- if (item != NULL) /* It is complete */ -+ if (i > last_frag) /* It is complete */ - return 1; - } - -@@ -291,15 +332,9 @@ isakmp_frag_reassembly(iph1) - } - data = buf->v; - -+ item = iph1->frag_chain; - for (i = 1; i <= frag_count; i++) { -- item = iph1->frag_chain; -- do { -- if (item->frag_num == i) -- break; -- item = item->frag_next; -- } while (item != NULL); -- -- if (item == NULL) { -+ if (item->frag_num != i) { - plog(LLV_ERROR, LOCATION, NULL, - "Missing fragment #%d\n", i); - vfree(buf); -@@ -308,6 +343,7 @@ isakmp_frag_reassembly(iph1) - } - memcpy(data, item->frag_packet->v, item->frag_packet->l); - data += item->frag_packet->l; -+ item = item->frag_next; - } - - out: - - -diff -u -p -r1.50 -r1.51 ---- a/src/racoon/isakmp_inf.c 2013/04/12 09:53:10 1.50 -+++ a/src/racoon/isakmp_inf.c 2017/01/24 19:23:56 1.51 -@@ -720,6 +720,7 @@ isakmp_info_send_nx(isakmp, remote, loca - #endif - #ifdef ENABLE_FRAG - iph1->frag = 0; -+ iph1->frag_last_index = 0; - iph1->frag_chain = NULL; - #endif - diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix deleted file mode 100644 index f10364121a46..000000000000 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, linuxHeaders, readline, openssl, flex, libkrb5, pam }: - -# TODO: These tools are supposed to work under NetBSD and FreeBSD as -# well, so I guess it's not appropriate to place this expression in -# "os-specific/linux/ipsec-tools". Since I cannot verify that the -# expression actually builds on those platforms, I'll leave it here for -# the time being. - -stdenv.mkDerivation rec { - pname = "ipsec-tools"; - version = "0.8.2"; - - src = fetchurl { - url = "mirror://sourceforge/ipsec-tools/ipsec-tools-${version}.tar.bz2"; - sha256 = "0b9gfbz78k2nj0k7jdlm5kajig628ja9qm0z5yksiwz22s3v7dlf"; - }; - - buildInputs = [ readline openssl flex libkrb5 pam ]; - - patches = [ - ./dont-create-localstatedir-during-install.patch - ./CVE-2015-4047.patch - ./CVE-2016-10396.patch - ]; - - # fix build with newer gcc versions - preConfigure = ''substituteInPlace configure --replace "-Werror" "" ''; - - configureFlags = [ - "--sysconfdir=/etc --localstatedir=/var" - "--with-kernel-headers=${linuxHeaders}/include" - "--disable-security-context" - "--enable-adminport" - "--enable-dpd" - "--enable-frag" - "--enable-gssapi" - "--enable-hybrid" - "--enable-natt" - "--enable-shared" - "--enable-stats" - ]; - - meta = with lib; { - homepage = "http://ipsec-tools.sourceforge.net/"; - description = "Port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation"; - license = licenses.bsd3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch b/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch deleted file mode 100644 index 16b80c36d6a5..000000000000 --- a/pkgs/os-specific/linux/ipsec-tools/dont-create-localstatedir-during-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ubr ipsec-tools-0.8.0-orig/src/racoon/Makefile.in ipsec-tools-0.8.0/src/racoon/Makefile.in ---- ipsec-tools-0.8.0-orig/src/racoon/Makefile.in 2012-10-20 13:01:07.700903316 +0200 -+++ ipsec-tools-0.8.0/src/racoon/Makefile.in 2012-10-20 13:01:13.177832616 +0200 -@@ -1085,9 +1085,6 @@ - uninstall-sbinPROGRAMS - - --install-exec-local: -- ${mkinstalldirs} $(DESTDIR)${adminsockdir} -- - # special object rules - crypto_openssl_test.o: crypto_openssl.c - $(COMPILE) -DEAYDEBUG -o crypto_openssl_test.o -c $(srcdir)/crypto_openssl.c diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 50730597d9e6..c6dc10f32bac 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -49,6 +49,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fpletz ]; license = licenses.gpl2; downloadPage = "https://www.netfilter.org/projects/iptables/files/"; - updateWalker = true; }; } diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix index fbd4d8efdac8..c98816746918 100644 --- a/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/pkgs/os-specific/linux/ipvsadm/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnl popt ]; + # Disable parallel build, errors: + # *** No rule to make target 'libipvs/libipvs.a', needed by 'ipvsadm'. Stop. + enableParallelBuilding = false; + preBuild = '' makeFlagsArray+=( INCLUDE=$(pkg-config --cflags libnl-genl-3.0) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 3f725e3e5b26..72ecaffe5f50 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-GcqmMqrZSgvSrsY8FJbPynNWTzSi5A6kmyq+xJ+2i3Y="; }; - outputs = [ "out" "man" ] + outputs = [ "out" "man" "doc" ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test"; nativeBuildInputs = [ @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { doCheck = true; postInstall = '' - mkdir -p $out/share - cp -a doc $out/share/ - cp -a README AUTHORS TODO $out/share/doc/ + mkdir -p $doc/share/doc + cp -a doc $doc/share/doc/iwd + cp -a README AUTHORS TODO $doc/share/doc/iwd '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' mkdir -p $test/bin cp -a test/* $test/bin/ diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 58894de6c2e6..9246ca679a65 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -16,18 +16,18 @@ stdenv.mkDerivation { sed -e 's@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@' -i src/mod/*/Makefile ''; - buildPhase = '' - make -C src/mod - ''; + makeFlags = kernel.makeFlags ++ [ + "-C src/mod" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; - installPhase = '' - make -C src/mod modules_install INSTALL_MOD_PATH=$out - ''; + installTargets = "modules_install"; meta = with lib; { homepage = "https://www.jool.mx/"; description = "Fairly compliant SIIT and Stateful NAT64 for Linux - kernel modules"; platforms = platforms.linux; + license = licenses.gpl2Only; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index 0517c50d4a98..87e36fe5a9eb 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,11 +1,11 @@ { fetchFromGitHub }: rec { - version = "4.1.6"; + version = "4.1.7"; src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; rev = "v${version}"; - sha256 = "09avkiazpfxzrgr3av58jbina5x9jqvqhjkn39475pfhfhrlv9fv"; + sha256 = "08z23mi6xkr6zzp0hzh1cppvl2y0177s0lnpxqbpy8jiii5fxw8f"; }; } diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 3c7e899cba71..833598448878 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -81,12 +81,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "5.15.5"; in + linuxHeaders = let version = "5.16"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "sha256-6VZaMBUlrIHBQs64MvkFPdVoXhB9vPdT0N5MWLyYhR8="; + sha256 = "1fq86dbx2p124vi4j8nan68gj4zyw4xnqh4jxq9aqsdvi24pwz82"; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 012833a538cc..153b41194b85 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -60,16 +60,16 @@ let }; power-management = { + CPU_FREQ_DEFAULT_GOV_PERFORMANCE = yes; + CPU_FREQ_GOV_SCHEDUTIL = yes; PM_ADVANCED_DEBUG = yes; + PM_WAKELOCKS = yes; + POWERCAP = yes; + } // optionalAttrs (stdenv.hostPlatform.isx86) { + INTEL_IDLE = yes; + INTEL_RAPL = whenAtLeast "5.3" module; X86_INTEL_LPSS = yes; X86_INTEL_PSTATE = yes; - INTEL_IDLE = yes; - CPU_FREQ_DEFAULT_GOV_PERFORMANCE = yes; - CPU_FREQ_GOV_SCHEDUTIL = whenAtLeast "4.9" yes; - PM_WAKELOCKS = yes; - # Power-capping framework and support for INTEL RAPL - POWERCAP = yes; - INTEL_RAPL = whenAtLeast "5.3" module; }; external-firmware = { @@ -148,12 +148,12 @@ let IPV6_MROUTE = yes; IPV6_MROUTE_MULTIPLE_TABLES = yes; IPV6_PIMSM_V2 = yes; - IPV6_FOU_TUNNEL = whenAtLeast "4.7" module; + IPV6_FOU_TUNNEL = module; IPV6_SEG6_LWTUNNEL = whenAtLeast "4.10" yes; IPV6_SEG6_HMAC = whenAtLeast "4.10" yes; IPV6_SEG6_BPF = whenAtLeast "4.18" yes; - NET_CLS_BPF = whenAtLeast "4.4" module; - NET_ACT_BPF = whenAtLeast "4.4" module; + NET_CLS_BPF = module; + NET_ACT_BPF = module; NET_SCHED = yes; L2TP_V3 = yes; L2TP_IP = module; @@ -168,7 +168,7 @@ let PPP_FILTER = yes; # needed for iwd WPS support (wpa_supplicant replacement) - KEY_DH_OPERATIONS = whenAtLeast "4.7" yes; + KEY_DH_OPERATIONS = yes; # needed for nftables # Networking Options @@ -208,7 +208,7 @@ let INET_TCP_DIAG = mkDefault module; INET_UDP_DIAG = mkDefault module; INET_RAW_DIAG = whenAtLeast "4.14" (mkDefault module); - INET_DIAG_DESTROY = whenAtLeast "4.9" (mkDefault yes); + INET_DIAG_DESTROY = mkDefault yes; # enable multipath-tcp MPTCP = whenAtLeast "5.6" yes; @@ -218,6 +218,11 @@ let # Kernel TLS TLS = whenAtLeast "4.13" module; TLS_DEVICE = whenAtLeast "4.18" yes; + + # infiniband + INFINIBAND = module; + INFINIBAND_IPOIB = module; + INFINIBAND_IPOIB_CM = yes; }; wireless = { @@ -264,14 +269,12 @@ let DRM_GMA600 = whenOlder "5.13" yes; DRM_GMA3600 = whenOlder "5.12" yes; DRM_VMWGFX_FBCON = yes; - # necessary for amdgpu polaris support - DRM_AMD_POWERPLAY = whenBetween "4.5" "4.9" yes; # (experimental) amdgpu support for verde and newer chipsets - DRM_AMDGPU_SI = whenAtLeast "4.9" yes; + DRM_AMDGPU_SI = yes; # (stable) amdgpu support for bonaire and newer chipsets - DRM_AMDGPU_CIK = whenAtLeast "4.9" yes; + DRM_AMDGPU_CIK = yes; # Allow device firmware updates - DRM_DP_AUX_CHARDEV = whenAtLeast "4.6" yes; + 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; @@ -378,7 +381,7 @@ let EXT4_FS_POSIX_ACL = yes; EXT4_FS_SECURITY = yes; - EXT4_ENCRYPTION = { optional = true; tristate = if (versionOlder version "4.8") then "m" else "y"; }; + EXT4_ENCRYPTION = option yes; REISERFS_FS_XATTR = option yes; REISERFS_FS_POSIX_ACL = option yes; @@ -403,7 +406,6 @@ let F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes; UDF_FS = module; - NFSD_PNFS = whenBetween "4.0" "4.6" yes; NFSD_V2_ACL = yes; NFSD_V3 = yes; NFSD_V3_ACL = yes; @@ -452,13 +454,15 @@ let }; security = { + FORTIFY_SOURCE = whenAtLeast "4.13" (option yes); + # https://googleprojectzero.blogspot.com/2019/11/bad-binder-android-in-wild-exploit.html DEBUG_LIST = yes; # Detect writes to read-only module pages - DEBUG_SET_MODULE_RONX = { optional = true; tristate = whenOlder "4.11" "y"; }; + DEBUG_SET_MODULE_RONX = whenOlder "4.11" (option yes); RANDOMIZE_BASE = option yes; STRICT_DEVMEM = mkDefault yes; # Filter access to /dev/mem - IO_STRICT_DEVMEM = whenAtLeast "4.5" (mkDefault yes); + IO_STRICT_DEVMEM = mkDefault yes; SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default # Prevent processes from ptracing non-children processes SECURITY_YAMA = option yes; @@ -473,6 +477,7 @@ let DEFAULT_SECURITY_APPARMOR = yes; RANDOM_TRUST_CPU = whenAtLeast "4.19" yes; # allow RDRAND to seed the RNG + RANDOM_TRUST_BOOTLOADER = 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 # Depends on MODULE_SIG and only really helps when you sign your modules @@ -513,10 +518,9 @@ let MEMCG = yes; MEMCG_SWAP = yes; - DEVPTS_MULTIPLE_INSTANCES = whenOlder "4.7" yes; BLK_DEV_THROTTLING = yes; CFQ_GROUP_IOSCHED = whenOlder "5.0" yes; # Removed in 5.0-RC1 - CGROUP_PIDS = whenAtLeast "4.3" yes; + CGROUP_PIDS = yes; }; staging = { @@ -541,9 +545,9 @@ let STACK_TRACER = yes; UPROBE_EVENT = { optional = true; tristate = whenOlder "4.11" "y";}; UPROBE_EVENTS = { optional = true; tristate = whenAtLeast "4.11" "y";}; - BPF_SYSCALL = whenAtLeast "4.4" yes; - BPF_UNPRIV_DEFAULT_OFF = whenBetween "5.10" "5.15" yes; - BPF_EVENTS = whenAtLeast "4.4" yes; + BPF_SYSCALL = yes; + BPF_UNPRIV_DEFAULT_OFF = whenBetween "5.10" "5.16" yes; + BPF_EVENTS = yes; FUNCTION_PROFILER = yes; RING_BUFFER_BENCHMARK = no; }; @@ -554,11 +558,10 @@ let HYPERVISOR_GUEST = yes; PARAVIRT_SPINLOCKS = option yes; - KVM_APIC_ARCHITECTURE = whenOlder "4.8" yes; KVM_ASYNC_PF = yes; - KVM_COMPAT = { optional = true; tristate = whenBetween "4.0" "4.12" "y"; }; - KVM_DEVICE_ASSIGNMENT = { optional = true; tristate = whenBetween "3.10" "4.12" "y"; }; - KVM_GENERIC_DIRTYLOG_READ_PROTECT = whenAtLeast "4.0" yes; + KVM_COMPAT = whenOlder "4.12" (option yes); + KVM_DEVICE_ASSIGNMENT = whenOlder "4.12" (option yes); + KVM_GENERIC_DIRTYLOG_READ_PROTECT = yes; KVM_GUEST = yes; KVM_MMIO = yes; KVM_VFIO = yes; @@ -720,7 +723,12 @@ let HID_ACRUX_FF = yes; DRAGONRISE_FF = yes; + GREENASIA_FF = yes; HOLTEK_FF = yes; + JOYSTICK_PSXPAD_SPI_FF = whenAtLeast "4.14" yes; + LOGIG940_FF = yes; + NINTENDO_FF = whenAtLeast "5.16" yes; + PLAYSTATION_FF = whenAtLeast "5.12" yes; SONY_FF = yes; SMARTJOYPLUS_FF = yes; THRUSTMASTER_FF = yes; @@ -760,7 +768,6 @@ let AIC79XX_DEBUG_ENABLE = no; AIC7XXX_DEBUG_ENABLE = no; AIC94XX_DEBUG = no; - B43_PCMCIA = { optional=true; tristate = whenOlder "4.4" "y";}; BLK_DEV_INTEGRITY = yes; @@ -772,16 +779,18 @@ let SERIAL_DEV_CTRL_TTYPORT = whenAtLeast "4.11" yes; # enables support for TTY serial devices BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support - BT_HCIUART_QCA = whenAtLeast "4.3" yes; # Qualcomm Atheros protocol support + BT_HCIUART_QCA = yes; # Qualcomm Atheros protocol support BT_HCIUART_SERDEV = whenAtLeast "4.12" yes; # required by BT_HCIUART_QCA - BT_HCIUART = whenAtLeast "2.5.45" module; # required for BT devices with serial port interface (QCA6390) + BT_HCIUART = module; # required for BT devices with serial port interface (QCA6390) BT_HCIUART_BCSP = option yes; BT_HCIUART_H4 = option yes; # UART (H4) protocol support BT_HCIUART_LL = option yes; BT_RFCOMM_TTY = option yes; # RFCOMM TTY support - BT_QCA = whenAtLeast "4.3" module; # enables QCA6390 bluetooth + BT_QCA = module; # enables QCA6390 bluetooth - CLEANCACHE = option yes; + # Removed on 5.17 as it was unused + # upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0a4ee518185e902758191d968600399f3bc2be31 + CLEANCACHE = whenOlder "5.17" (option yes); CRASH_DUMP = option no; DVB_DYNAMIC_MINORS = option yes; # we use udev @@ -818,14 +827,12 @@ let MEDIA_ATTACH = yes; MEGARAID_NEWGEN = yes; - MLX4_EN_VXLAN = whenOlder "4.8" yes; MLX5_CORE_EN = option yes; NVME_MULTIPATH = whenAtLeast "4.15" yes; PSI = whenAtLeast "4.20" yes; - MODVERSIONS = whenOlder "4.9" yes; MOUSE_ELAN_I2C_SMBUS = yes; MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension MOUSE_PS2_VMMOUSE = yes; diff --git a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch b/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch deleted file mode 100644 index 8f2418c9efce..000000000000 --- a/pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/4.4.patch +++ /dev/null @@ -1,407 +0,0 @@ -commit e7cae741f6d645ac68fe8823ca6ef45dbbf6891b -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, remove pointless cpuacct_stat_desc[] array. - - 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 732e993..77f3ddd 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8512,7 +8512,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; -@@ -8552,7 +8552,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", -@@ -8573,7 +8573,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 -@@ -8599,7 +8599,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 = 1, - }; - -diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c -index dd7cbb5..42b2dd5 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -177,36 +177,33 @@ static int cpuacct_percpu_seq_show(struct seq_file *m, void *V) - return 0; - } - --static const char * const cpuacct_stat_desc[] = { -- [CPUACCT_STAT_USER] = "user", -- [CPUACCT_STAT_SYSTEM] = "system", --}; -- --static int cpuacct_stats_show(struct seq_file *sf, void *v) -+static void cpuacct_stats_read(struct cpuacct *ca, u64 *userp, u64 *sysp) - { -- struct cpuacct *ca = css_ca(seq_css(sf)); - int cpu; -- s64 val = 0; - -+ *userp = 0; - for_each_online_cpu(cpu) { - struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); -- val += kcpustat->cpustat[CPUTIME_USER]; -- val += kcpustat->cpustat[CPUTIME_NICE]; -+ *userp += kcpustat->cpustat[CPUTIME_USER]; -+ *userp += kcpustat->cpustat[CPUTIME_NICE]; - } -- val = cputime64_to_clock_t(val); -- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_USER], val); - -- val = 0; -+ *sysp = 0; - for_each_online_cpu(cpu) { - struct kernel_cpustat *kcpustat = per_cpu_ptr(ca->cpustat, cpu); -- val += kcpustat->cpustat[CPUTIME_SYSTEM]; -- val += kcpustat->cpustat[CPUTIME_IRQ]; -- val += kcpustat->cpustat[CPUTIME_SOFTIRQ]; -+ *sysp += kcpustat->cpustat[CPUTIME_SYSTEM]; -+ *sysp += kcpustat->cpustat[CPUTIME_IRQ]; -+ *sysp += kcpustat->cpustat[CPUTIME_SOFTIRQ]; - } -+} - -- val = cputime64_to_clock_t(val); -- seq_printf(sf, "%s %lld\n", cpuacct_stat_desc[CPUACCT_STAT_SYSTEM], val); -+static int cpuacct_stats_show(struct seq_file *sf, void *v) -+{ -+ cputime64_t user, sys; - -+ cpuacct_stats_read(css_ca(seq_css(sf)), &user, &sys); -+ seq_printf(sf, "user %lld\n", cputime64_to_clock_t(user)); -+ seq_printf(sf, "system %lld\n", cputime64_to_clock_t(sys)); - return 0; - } - - -commit 1bb33e8a69f089f2d3f58a0e681d4ff352e11c97 -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 77f3ddd..7aafe63 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -8591,6 +8591,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_free = cpu_cgroup_css_free, -@@ -8600,7 +8733,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 = 1, -+#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 42b2dd5..b4d32a6 100644 ---- a/kernel/sched/cpuacct.c -+++ b/kernel/sched/cpuacct.c -@@ -224,6 +224,30 @@ 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, user, sys; -+ -+ 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), &user, &sys); -+ -+ user *= TICK_NSEC; -+ sys *= TICK_NSEC; -+ do_div(usage, NSEC_PER_USEC); -+ do_div(user, NSEC_PER_USEC); -+ do_div(sys, NSEC_PER_USEC); -+ -+ seq_printf(sf, "usage_usec %llu\n" -+ "user_usec %llu\n" -+ "system_usec %llu\n", usage, user, sys); -+ -+ 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 ed60562..44eace9 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 *p, 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 *p, int index, u64 val) - { - } - -+static inline void cpuacct_cpu_stats_show(struct seq_file *sf) -+{ -+} -+ - #endif diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 9d90c0cf02b3..cdb6099d4a17 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,51 +2,51 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.262-hardened1.patch", - "sha256": "0z2vdqbsqngdm1w7dh65c1ir25x6vrpmyrjx3c8vgzql67c5xb4b", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.262-hardened1/linux-hardened-4.14.262-hardened1.patch" + "name": "linux-hardened-4.14.269-hardened1.patch", + "sha256": "1hj3yn70aifprcfz4k088pj0lbr92cl5y840g08p0cqz3f3jvf24", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.269-hardened1/linux-hardened-4.14.269-hardened1.patch" }, - "sha256": "05yl51r5n3q9l8pq6azx3bbl69l79lk8vkdivy3cvgzdh59pizac", - "version": "4.14.262" + "sha256": "1lhqq3va468k8w5f4hhsq1rgjcfrgi5l8lnrikfy9jisbi05z9h3", + "version": "4.14.269" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.225-hardened1.patch", - "sha256": "0wqwgsk0giwcp0kwp39nkv5bdqk4s2np7gsjymaqimq9187cnkvv", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.225-hardened1/linux-hardened-4.19.225-hardened1.patch" + "name": "linux-hardened-4.19.232-hardened1.patch", + "sha256": "195gbiial5rpiak4mszw3kn1dmm38npk2bchyb9lfvk1f26h2ybc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.232-hardened1/linux-hardened-4.19.232-hardened1.patch" }, - "sha256": "15k7b04zx5ggfjagp8sfrylr9xgwgz3hb2bygdml7ka1jnbv76jb", - "version": "4.19.225" + "sha256": "0b520cwwqr5b1skc3gbq35hfjqpidxcl3gq7x5bdqqqdg0afiksg", + "version": "4.19.232" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.92-hardened1.patch", - "sha256": "08vhk7vzwd9r76mphyphc5n718kdpg3l2i0smrr92w5mx19pvs8g", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.92-hardened1/linux-hardened-5.10.92-hardened1.patch" + "name": "linux-hardened-5.10.103-hardened1.patch", + "sha256": "0i70cya9llz6nnhf4d5zz3f8xhj21si8capymmzcjczz0378argj", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.103-hardened1/linux-hardened-5.10.103-hardened1.patch" }, - "sha256": "0lmvdskxk1r18p6rn2dhw23wj8g3a8blar6xn5x1sgqxln006xfm", - "version": "5.10.92" + "sha256": "02jq126r8dgqrhgdg8dym2v8xgp9jkjm8kf9zgj440s3wrasvf2g", + "version": "5.10.103" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.15-hardened1.patch", - "sha256": "0js9fz2xx8gshxb5dc6ycmgycmcfqpxdkbpbmx92d397qdnj0460", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.15-hardened1/linux-hardened-5.15.15-hardened1.patch" + "name": "linux-hardened-5.15.26-hardened1.patch", + "sha256": "14pdmiqnn06by8mvxw4gklqfrnngrimyz1ag76pr60iz6ka6y5g8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.26-hardened1/linux-hardened-5.15.26-hardened1.patch" }, - "sha256": "0nisr3i9sxpp0s25wg6sb45287l0v9vmsgnz6d4igbvih37mfg0x", - "version": "5.15.15" + "sha256": "0fmydc5v51iacd5ys7p1m1k2318p47prj8xv02rcngv1y8s224jq", + "version": "5.15.26" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.172-hardened1.patch", - "sha256": "124l2b3km1278dc4lgm35f50jfxnbdia1127j27w3b3dhs37baw9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.172-hardened1/linux-hardened-5.4.172-hardened1.patch" + "name": "linux-hardened-5.4.182-hardened1.patch", + "sha256": "0hcxy2hn836mivydmrbqrpvm4bfdsgf9xpx0iyz92rhd91ipgcyq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.182-hardened1/linux-hardened-5.4.182-hardened1.patch" }, - "sha256": "1r3ci123dmijk0n3z91xqri89rbvnk51hd9d4q430ag8cw5qk7mi", - "version": "5.4.172" + "sha256": "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj", + "version": "5.4.182" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index bf36ad52169e..0683e7d6ad4d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.262"; + version = "4.14.274"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "05yl51r5n3q9l8pq6azx3bbl69l79lk8vkdivy3cvgzdh59pizac"; + sha256 = "1bbz1w5l7im7dspq6g6iy5vahsxcaa1b2ykrw49m3pw8rf7m6hib"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 5953b9ff22ce..6121fccf15fa 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.225"; + version = "4.19.237"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "15k7b04zx5ggfjagp8sfrylr9xgwgz3hb2bygdml7ka1jnbv76jb"; + sha256 = "1n0c4bmmbj145zsp662a5rxh294fpq4dkillpz16wj6c098z7zxs"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix deleted file mode 100644 index 1addff89c2a2..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: - -buildLinux (args // rec { - version = "4.4.299"; - extraMeta.branch = "4.4"; - extraMeta.broken = stdenv.isAarch64; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "019hmplv1zhghl840qky9awziba3gx7jm80khny44gjfbyzf7d4v"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 81f576616f7f..ad58c3ef6413 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.297"; + version = "4.9.309"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "17yqnr6p0prgcw8nikjmi49ll4s77ylaixcja5m15cq9x36shfz4"; + sha256 = "05468rk4hlz9ag1zb7shngn5rl42npw7haqbi5mpaa0yksl5asp8"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 41a48908ff4e..7b5c9cba1444 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.93"; + version = "5.10.109"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1jxv7can60rc5i2yjgj8frcjvwi1jnba1jl8i3070xmb1d1qqy56"; + sha256 = "1p0k46isy2wzzms801lrnb59f1nb9mhywjj7fnkrwrj9nbn25yqq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 607521af1385..dab27c119aa5 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -1,9 +1,9 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: +{ lib, stdenv, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: with lib; buildLinux (args // rec { - version = "5.15.16"; + version = "5.15.32"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -11,8 +11,10 @@ buildLinux (args // rec { # branchVersion needs to be x.y extraMeta.branch = versions.majorMinor version; + extraMeta.broken = stdenv.isi686; + src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "150pzxra564z9xaaclmbbd29x4x9il8y78zz7szi50lzx0a0l2ms"; + sha256 = "11nz2w6hgwy6va6sxf4ic1s4kv24zbpssgjxsq6n321h4bxcsqql"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.16.nix b/pkgs/os-specific/linux/kernel/linux-5.16.nix index be238fb9edcd..4dcb71c4f5cd 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.16.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.16.2"; + version = "5.16.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0i1vcv2zi80ixmgjdcq6yk8qhwaqlbbmmrq0prxk41339lx87zh9"; + sha256 = "096f80m2czj8khvil7s037pqdf1s6pklqn5d9419jqkz7v70piry"; }; } // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.17.nix b/pkgs/os-specific/linux/kernel/linux-5.17.nix new file mode 100644 index 000000000000..edd5339e103d --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.17.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.17.1"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "092cx18va108lb27kxx2b00ma3l9g22nmkk81034apx26bacbmbw"; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index bdfa568ba25d..65c9f6c4b26d 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.173"; + version = "5.4.188"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0ff2jvwxj55547wvwp94a8bsd610s72906d4nsyhiirrn9sy5s4r"; + sha256 = "1g7xf2jx1hx580f42yirfgv9v0f9f88wzxxx0wiwx7wcqbyqpg4z"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 4d078e45fe23..16bbbf614aa9 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/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 = "18517"; - sha256 = "1i4gppn3lyi3aqzscrdhm2dsvfa84xqhymcc468sakn9in3g85gg"; + rev = "18664"; + sha256 = "0yvgnqf355wr7wmfd0r8zydbr7icic06cp5hjp060vv0m9bf87xi"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 02e3902d3c5c..0d56108f2f23 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.14.18"; - suffix = "lqx1"; + version = "5.15.16"; + suffix = "lqx2"; in buildLinux (args // { @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-jn2Y/zusxwOvT5MXlM5HCojiyY0ssC36O92iv7/ZMWU="; + sha256 = "sha256-kdT/hiASZ72pkS0Igta0KT0GWTgDRjxBnd5CQ0eonfg="; }; extraMeta = { diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 17d24c187d5a..99b966ac5cde 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -2,8 +2,9 @@ let # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this - modDirVersion = "5.10.52"; - tag = "1.20210805"; + modDirVersion = "5.10.92"; + tag = "1.20220118"; + rev = "650082a559a570d6c9d2739ecc62843d6f951059"; in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; @@ -12,8 +13,8 @@ lib.overrideDerivation (buildLinux (args // { src = fetchFromGitHub { owner = "raspberrypi"; repo = "linux"; - rev = tag; - sha256 = "1j71xblflslfi4c3zx2srw6fahnhp3bjx4yjfqrp39kzaa41ij0b"; + inherit rev; + sha256 = "sha256-OSDx9dzqm8JnLUvdiv1aKqhRz80uWqfjXLd7m6ycXME="; }; defconfig = { @@ -75,6 +76,7 @@ lib.overrideDerivation (buildLinux (args // { '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux"]) '' copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb '' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux" "aarch64-linux"]) '' + copyDTB bcm2710-rpi-zero-2.dtb bcm2837-rpi-zero-2.dtb copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 7f2811584cfc..cf0744bce681 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.90-rt60"; # updated by ./update-rt.sh + version = "5.10.106-rt64"; # 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 = "0997ijkmvf9iz4hn8m8naiagphhyvl4r6qx4q3gxk8qlq1j44pll"; + sha256 = "0yjrlghcxw3lhd6nc2m4zy4gk536w3a3w6mxdsml690fqz4531n6"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0533s01ckjjw45b08zs9nhpszdcrqgfpwvnjs2dfjmc6yg9d13pi"; + sha256 = "0z5gyi1vyjyd05vyccmk9yfgvm5v1lc8vbfywahx495xzpp9i8xb"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index ce99b70ce68d..747563e3c01f 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.170-rt68"; # updated by ./update-rt.sh + version = "5.4.182-rt71"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "0b1qdmp2q0lpngfvvnwb248cnqn9akk2z4xawrfwziszrzh797xh"; + sha256 = "03gly4ivsdahixmshi021al48ycsalx30vsxr3iyj47hchgj1wdj"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0wzvyybrawn9y3ccgafj6jcmh31vwwq2n5rrlidn80736466a3ba"; + sha256 = "1lxj63v37bhdgynr8ffyd5g8vp5a79dnzi6fng7jsjapfriywzqh"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index e417ee6d389b..e86f6fced569 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,9 +1,9 @@ { lib , fetchpatch , kernel -, date ? "2021-12-26" -, commit ? "b034dfb24fece43a7677b9a29781495aeb62767f" -, diffHash ? "0m7qrnfrcx3dki9lmsq3jk3mcrfm99djh83gwwjh401ql0cycx5p" +, date ? "2022-03-21" +, commit ? "c38b7167aa5f3b1b91dcc93ade57f30e95064590" +, diffHash ? "04lgwnng7p2rlz9sxn74n22750kh524xwfws3agqs12pcrvfsm0j" , kernelPatches # must always be defined in bcachefs' all-packages.nix entry because it's also a top-level attribute supplied by callPackage , argsOverride ? {} , ... @@ -16,7 +16,7 @@ extraMeta = { branch = "master"; - maintainers = with lib.maintainers; [ davidak chiiruno ]; + maintainers = with lib.maintainers; [ davidak Madouura ]; }; } // argsOverride; diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 00e9fd0a09e5..b170ec044b05 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.15.12"; + version = "5.15.27"; release = "1"; suffix = "xanmod${release}-tt"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-XGIq0OjC9nGQ8oUIoLIBT+Nj3pjleDeKvkz2QrZWJcI="; + sha256 = "sha256-ycUvTXDKnffxs8FKZJurX2bDr85gMQlSIFD0nST2Q98="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 257485645f46..0e6cc394a549 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,13 +2,14 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.15.11-zen1"; + modDirVersion = "5.17.0-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; numbers = lib.splitString "." version; branch = "${lib.elemAt numbers 0}.${lib.elemAt numbers 1}"; + rev = if ((lib.elemAt numbers 2) == "0") then "v${branch}-${suffix}" else "v${modDirVersion}"; in buildLinux (args // { @@ -18,8 +19,8 @@ buildLinux (args // { src = fetchFromGitHub { owner = "zen-kernel"; repo = "zen-kernel"; - rev = "v${modDirVersion}"; - sha256 = "sha256-KOy1bmNnfa8LtnE+03Y+0pr9r1OCimY0bjGsVmGnPN4="; + inherit rev; + sha256 = "sha256-8DCcO2oPnwXjjm3PW7vNZKbB3S7XsEB/svAMhbPRJIo="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 4f12337c893f..220f09ed8b50 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -56,7 +56,7 @@ let hasAttr getAttr optional optionals optionalString optionalAttrs maintainers platforms; # Dependencies that are required to build kernel modules - moduleBuildDependencies = optional (lib.versionAtLeast version "4.14") libelf; + moduleBuildDependencies = [ perl ] ++ optional (lib.versionAtLeast version "4.14") libelf; installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' @@ -301,7 +301,6 @@ let + ")"); license = lib.licenses.gpl2Only; homepage = "https://www.kernel.org/"; - repositories.git = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"; maintainers = lib.teams.linux-kernel.members ++ [ maintainers.thoughtpolice ]; diff --git a/pkgs/os-specific/linux/kernel/update-rt.sh b/pkgs/os-specific/linux/kernel/update-rt.sh index ccb017933420..a9e0577fae92 100755 --- a/pkgs/os-specific/linux/kernel/update-rt.sh +++ b/pkgs/os-specific/linux/kernel/update-rt.sh @@ -38,6 +38,7 @@ latest-rt-version() { curl -sL "$mirror/projects/rt/$branch/sha256sums.asc" | sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/p}' | grep -v '\-rc' | + sort --version-sort | tail -n 1 } diff --git a/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch b/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch new file mode 100644 index 000000000000..61ad2a474f9a --- /dev/null +++ b/pkgs/os-specific/linux/keyutils/0001-Remove-unused-function-after_eq.patch @@ -0,0 +1,28 @@ +From 59d91e57d103fb4686d2f45ee3c688878244367a Mon Sep 17 00:00:00 2001 +From: Christian Kampka +Date: Tue, 24 Nov 2020 22:12:40 +0100 +Subject: [PATCH] Remove unused function 'after_eq' + +--- + keyctl_watch.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/keyctl_watch.c b/keyctl_watch.c +index a70a19a..c4ca7f7 100644 +--- a/keyctl_watch.c ++++ b/keyctl_watch.c +@@ -47,11 +47,6 @@ static struct watch_notification_filter filter = { + }, + }; + +-static inline bool after_eq(unsigned int a, unsigned int b) +-{ +- return (signed int)(a - b) >= 0; +-} +- + static void consumer_term(int sig) + { + consumer_stop = 1; +-- +2.28.0 + diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 71f708e210d4..f307bd56d1cf 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { sha256 = "0wnvbjfrbk7rghd032z684l7vk7mhy3bd41zvhkrhgp3cd5id0bm"; }) ./conf-symlink.patch + # This patch solves a duplicate symbol error when building with a clang stdenv + # Before removing this patch, please ensure the package still builds by running eg. + # nix-build -E 'with import ./. {}; pkgs.keyutils.override { stdenv = pkgs.llvmPackages_latest.stdenv; }' + ./0001-Remove-unused-function-after_eq.patch ]; makeFlags = lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1"; diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 4002657ad690..3964538a4096 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnugrep, findutils }: +{ lib, stdenv, fetchurl }: let version = "28-1ubuntu4"; # impish 2021-06-24 @@ -26,8 +26,8 @@ in stdenv.mkDerivation { --replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \ --replace /sbin/rmmod /run/booted-system/sw/bin/rmmod \ --replace /sbin/modprobe /run/booted-system/sw/bin/modprobe \ - --replace " grep " " ${gnugrep}/bin/grep " \ - --replace " xargs " " ${findutils}/bin/xargs " + --replace " grep " " /run/booted-system/sw/bin/grep " \ + --replace " xargs " " /run/booted-system/sw/bin/xargs " ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index 072b53b02ec2..f8a519de847e 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -4,7 +4,6 @@ assert mountPath != ""; let version = "0.5"; - git = "https://github.com/LemonBoy/ldm.git"; in stdenv.mkDerivation rec { pname = "ldm"; @@ -13,7 +12,7 @@ stdenv.mkDerivation rec { # There is a stable release, but we'll use the lvm branch, which # contains important fixes for LVM setups. src = fetchgit { - url = meta.repositories.git; + url = "https://github.com/LemonBoy/ldm"; rev = "refs/tags/v${version}"; sha256 = "0lxfypnbamfx6p9ar5k9wra20gvwn665l4pp2j4vsx4yi5q7rw2n"; }; @@ -36,8 +35,6 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight device mounter, with libudev as only dependency"; license = lib.licenses.mit; - platforms = lib.platforms.linux; - repositories.git = git; }; } diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 81e86fe77efc..8e6b9fa0663a 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -12,20 +12,15 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-/MLPflnfooe7Wjy8M3CTowAi5oYpscruSkDsaVzhmYQ="; + sha256 = "sha256-NFVJ8JquWVzu+QoaaOMzhnu6/IqdP1FPhtJFidXA4L4="; }; - patches = [(fetchpatch { - url = "https://github.com/libbpf/libbpf/pull/41.diff"; - sha256 = "sha256-pg5WARqh6z0nkTHMBhftxwdV2SyswC2lfaCXCpez0VA="; - })]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ libelf zlib ]; @@ -38,7 +33,7 @@ stdenv.mkDerivation rec { postInstall = '' # install linux's libbpf-compatible linux/btf.h - install -Dm444 include/uapi/linux/btf.h -t $out/include/linux + install -Dm444 include/uapi/linux/*.h -t $out/include/linux ''; # FIXME: Multi-output requires some fixes to the way the pkg-config file is diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix index 8b979d479562..070a18f6984a 100644 --- a/pkgs/os-specific/linux/libpsm2/default.nix +++ b/pkgs/os-specific/linux/libpsm2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libpsm2"; - version = "11.2.185"; + version = "11.2.206"; preConfigure= '' export UDEVDIR=$out/etc/udev @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "opa-psm2"; rev = "PSM2_${version}"; - sha256 = "062hg4r6gz7pla9df70nqs5i2a3mp1wszmp4l0g771fykhhrxsjg"; + sha256 = "sha256-HsM2OaoX+SdbIednX1MWw1M4kkkPwUs5Dm32q2H7Mg4="; }; postInstall = '' diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix index 1278e2598706..7ec8ac35e62a 100644 --- a/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/pkgs/os-specific/linux/libtraceevent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libtraceevent"; - version = "1.5.0"; + version = "1.5.1"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; - sha256 = "sha256-ysdsuJ9MvmNY0/XSV+aO7Gh8buWed25DQhBE/5HIASU="; + sha256 = "sha256-g4dB8QhCG6SgZVAU3TCtb70vYYh1KN7FrcldzTGAUnI="; }; # Don't build and install html documentation diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index f3f1a393973d..972a71d50390 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -1,23 +1,36 @@ -{ lib, stdenv, fetchgit, pkg-config, libtraceevent, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: +{ lib +, stdenv +, fetchgit +, pkg-config +, libtraceevent +, asciidoc +, xmlto +, docbook_xml_dtd_45 +, docbook_xsl +, coreutils +, which +, valgrind +, sourceHighlight +}: stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.2.5"; + version = "1.3.0"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; rev = "libtracefs-${version}"; - sha256 = "1rva9ysspf1wqd0zf52qwgpaasrn7jcbns4dwldc59ksk0n93qdb"; + sha256 = "sha256-Kg1mPjTZ2UCeco18Fa8GqmLo2R35XvUE/q2J1HAmtEc="; }; - # Don't build and install html documentation postPatch = '' - sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' Documentation/Makefile + substituteInPlace scripts/utils.mk --replace /bin/pwd ${coreutils}/bin/pwd + patchShebangs check-manpages.sh ''; - outputs = [ "out" "dev" "devman" ]; + outputs = [ "out" "dev" "devman" "doc" ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl which valgrind sourceHighlight ]; buildInputs = [ libtraceevent ]; makeFlags = [ "prefix=${placeholder "out"}" diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix index 8da12d78bc93..95b766aec05b 100644 --- a/pkgs/os-specific/linux/lightum/default.nix +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }: +{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }: stdenv.mkDerivation { pname = "lightum"; version = "unstable-2014-06-07"; - src = fetchgit { - url = "https://github.com/poliva/lightum"; + + src = fetchFromGitHub { + owner = "poliva"; + repo = "lightum"; rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8"; - sha256 = "01x24rcrkgksyvqpgkr9zafg3jgs8nqng8yf0hx0kbmcimar8dbp"; + sha256 = "sha256-dzWUVY2srgk6BM6jZ7FF+snxnPopz3fx9nq+mVkmogc="; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/lsirec/default.nix b/pkgs/os-specific/linux/lsirec/default.nix new file mode 100644 index 000000000000..cf2da7d16480 --- /dev/null +++ b/pkgs/os-specific/linux/lsirec/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3 +}: + +stdenv.mkDerivation rec { + pname = "lsirec"; + version = "unstable-2019-03-03"; + + src = fetchFromGitHub { + owner = "marcan"; + repo = "lsirec"; + rev = "2dfb6dc92649feb01a3ddcfd117d4a99098084f2"; + sha256 = "sha256-8v+KKjAJlJNpUT0poedRTQfPiDiwahrosXD35Bmh3jM="; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + runHook preInstall + + install -Dm755 'lsirec' "$out/bin/lsirec" + install -Dm755 'sbrtool.py' "$out/bin/sbrtool" + + runHook postInstall + ''; + + meta = with lib; { + description = "LSI SAS2008/SAS2108 low-level recovery tool for Linux"; + homepage = "https://github.com/marcan/lsirec"; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index f88cdcda5237..d880e6a60e03 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -14,12 +14,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-aTi+EogY1aDWYq3anjRkjz1mzINVfUPQbOPHthxrvS4="; }; - buildPhase = '' - runHook preBuild - + postPatch = '' substituteInPlace lsiutil.c \ --replace /sbin/modprobe "${kmod}/bin/modprobe" \ --replace /bin/mknod "${coreutils}/bin/mknod" + ''; + + buildPhase = '' + runHook preBuild + gcc -Wall -O lsiutil.c -o lsiutil runHook postBuild diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 8753f34087cf..706ee95fb70a 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -2,23 +2,23 @@ stdenv.mkDerivation rec { pname = "lttng-modules-${kernel.version}"; - version = "2.13.1"; + version = "2.13.2"; src = fetchurl { url = "https://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2"; - sha256 = "0hzksx2fw008jdsgfzpws9g7imy6ryw09ai5y0knvrmvr68nvj57"; + sha256 = "sha256-39VH2QQcjFRa5be/7z8O8tnyUg1qtEGIyeqN5W1dKYo="; }; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - preConfigure = '' - export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - export INSTALL_MOD_PATH="$out" - ''; + makeFlags = kernel.makeFlags ++ [ + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; installTargets = [ "modules_install" ]; diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index 555ff6b0dc14..73f1e9fbdeec 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.14"; - sha256 = "0p5077h3z7mrr0b49ikmhlhrs4v4qb530raypk3y72ja125bqqsa"; + version = "2.03.15"; + sha256 = "17n9xl01by7dcbjwjnr6b4rrkp2frz8hwnjl59svsyp13sjq6llk"; } diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 0749292531bb..07e8c9cb02da 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -9,8 +9,8 @@ , libaio , enableCmdlib ? false , enableDmeventd ? false -, udevSupport ? !stdenv.targetPlatform.isStatic, udev ? null -, onlyLib ? stdenv.targetPlatform.isStatic +, udevSupport ? !stdenv.hostPlatform.isStatic, udev ? null +, onlyLib ? stdenv.hostPlatform.isStatic , nixosTests }: @@ -56,13 +56,14 @@ stdenv.mkDerivation rec { ] ++ lib.optionals udevSupport [ "--enable-udev_rules" "--enable-udev_sync" - ] ++ lib.optionals stdenv.targetPlatform.isStatic [ + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ "--enable-static_link" ]; preConfigure = '' sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in + '' + lib.optionalString (lib.versionOlder version "2.03.15") '' substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ --replace /usr/bin/udevadm /run/current-system/systemd/bin/udevadm # https://github.com/lvmteam/lvm2/issues/36 @@ -82,7 +83,7 @@ stdenv.mkDerivation rec { sed -i 's|^#define LVM_CONFIGURE_LINE.*$|#define LVM_CONFIGURE_LINE ""|g' ./include/configure.h ''; - patches = [ + patches = lib.optionals (lib.versionOlder version "2.03.15") [ # Musl fixes from Alpine. ./fix-stdio-usage.patch (fetchpatch { @@ -90,7 +91,7 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0"; }) - ] ++ lib.optionals stdenv.targetPlatform.isStatic [ + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ ./no-shared.diff ]; @@ -113,7 +114,7 @@ stdenv.mkDerivation rec { ]; installPhase = lib.optionalString onlyLib '' - install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.targetPlatform.isStatic then "a" else "so"} + install -D -t $out/lib libdm/ioctl/libdevmapper.${if stdenv.hostPlatform.isStatic then "a" else "so"} make -C libdm install_include make -C libdm install_pkgconfig ''; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index bfe888c6e448..62f63a8c3ac3 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.11"; + version = "4.0.12"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "0b7hv4n8b3lndhr0jf9j1gkbzxm8897a1myjsfgwzad9gkhq395g"; + sha256 = "1vyk2j5w9gfyh23w3ar09cycyws16mxh3clbb33yhqzwcs1jy96v"; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 6ae44f3fdb87..68bf03552307 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "lxcfs"; - version = "4.0.11"; + version = "4.0.12"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = "lxcfs-${version}"; - sha256 = "sha256-jWOmGV85uTYjBFQZKR3+TgPWZix2vuN8TLA/dhL8jwk="; + sha256 = "sha256-+wp29GD+toXGfQbPGYbDJ7/P+FY1uQY4uK3OQxTE9GM="; }; nativeBuildInputs = [ pkg-config help2man autoreconfHook makeWrapper ]; diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index fe9c11ace1f6..04a89ad038dd 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix index 070b4a6207e1..0b4fec4dfb4e 100644 --- a/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix +++ b/pkgs/os-specific/linux/mbp-modules/mbp2018-bridge-drv/default.nix @@ -11,14 +11,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-o6yGiR+Y5SnX1johdi7fQWP5ts7HdDMqeju75UOhgik="; }; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; + buildPhase = '' make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ - -j$NIX_BUILD_CORES M=$(pwd) modules + -j$NIX_BUILD_CORES M=$(pwd) modules $makeFlags ''; installPhase = '' make -C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build \ - INSTALL_MOD_PATH=$out M=$(pwd) modules_install + INSTALL_MOD_PATH=$out M=$(pwd) modules_install $makeFlags ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 1f5fd889578c..923047ead11a 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20210608"; + version = "20220207"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "08nk353z2lcqsjbm2qdsfapfgrvlfw0rj7r9scr9pllzkjj5n9x3"; + sha256 = "sha256-yNHYAf8AX8C8iSaFWa6u7knUryaUgvI6nIH9jkD4jjw="; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 769bb1e43b44..0de982c3d5ee 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -60,6 +60,5 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributable; maintainers = with maintainers; [ MP2E ]; platforms = platforms.linux; - broken = kernel.kernelOlder "3.2.0"; }; } diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 28f989929a4c..dec1399d1695 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation { sha256 = "0qjw8glfdmngfvbn1w63q128vxdz2jlabw13y140ga9i5ibl6vvk"; }; + nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ kmod zlib ]; hardeningDisable = [ "pic" ]; @@ -36,6 +37,8 @@ stdenv.mkDerivation { kmod=${kmod} substituteAllInPlace netatop.service ''; + makeFlags = kernel.makeFlags; + preInstall = '' mkdir -p $out/lib/systemd/system $out/bin $out/sbin $out/share/man/man{4,8} mkdir -p $out/lib/modules/${kernel.modDirVersion}/extra diff --git a/pkgs/os-specific/linux/nix-ld/default.nix b/pkgs/os-specific/linux/nix-ld/default.nix new file mode 100644 index 000000000000..dcab99cabfe4 --- /dev/null +++ b/pkgs/os-specific/linux/nix-ld/default.nix @@ -0,0 +1,49 @@ +{ stdenv, meson, ninja, lib, nixosTests, fetchFromGitHub }: +let + self = stdenv.mkDerivation { + name = "nix-ld"; + src = fetchFromGitHub { + owner = "Mic92"; + repo = "nix-ld"; + rev = "1.0.0"; + sha256 = "sha256-QYPg8wPpq7q5Xd1jW17Lh36iKFSsVkN/gWYoQRv2XoU="; + }; + + doCheck = true; + + nativeBuildInputs = [ meson ninja ]; + + mesonFlags = [ + "-Dnix-system=${stdenv.system}" + ]; + + hardeningDisable = [ + "stackprotector" + ]; + + postInstall = '' + mkdir -p $out/nix-support + basename $(< ${stdenv.cc}/nix-support/dynamic-linker) > $out/nix-support/ld-name + ''; + + passthru.tests.nix-ld = nixosTests.nix-ld; + passthru.ldPath = let + libDir = if stdenv.system == "x86_64-linux" || + stdenv.system == "mips64-linux" || + stdenv.system == "powerpc64le-linux" + then + "/lib64" + else + "/lib"; + ldName = lib.fileContents "${self}/nix-support/ld-name"; + in "${libDir}/${ldName}"; + + meta = with lib; { + description = "Run unpatched dynamic binaries on NixOS"; + homepage = "https://github.com/Mic92/nix-ld"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.linux; + }; + }; +in self diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix index 08bba5a428d1..34611d3f4009 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -5,6 +5,7 @@ , gnugrep , nix , lib +, nixosTests }: let fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix; @@ -19,4 +20,17 @@ substituteAll { nix_i686_linux = fallback.i686-linux; nix_aarch64_linux = fallback.aarch64-linux; path = lib.makeBinPath [ coreutils gnused gnugrep ]; + + # run some a simple installer tests to make sure nixos-rebuild still works for them + passthru.tests = { + simple-installer-test = nixosTests.installer.simple; + }; + + meta = { + description = "Rebuild your NixOS configuration and switch to it, on local hosts and remote."; + homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/os-specific/linux/nixos-rebuild"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.Profpatsch ]; + mainProgram = "nixos-rebuild"; + }; } diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 1de783a55930..795bedb99d4d 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -31,9 +31,16 @@ profile=/nix/var/nix/profiles/system buildHost=localhost targetHost= remoteSudo= +verboseScript= +noFlake= # comma separated list of vars to preserve when using sudo preservedSudoVars=NIXOS_INSTALL_BOOTLOADER +# log the given argument to stderr +log() { + echo "$@" >&2 +} + while [ "$#" -gt 0 ]; do i="$1"; shift 1 case "$i" in @@ -45,7 +52,7 @@ while [ "$#" -gt 0 ]; do action="$i" ;; --install-grub) - echo "$0: --install-grub deprecated, use --install-bootloader instead" >&2 + log "$0: --install-grub deprecated, use --install-bootloader instead" export NIXOS_INSTALL_BOOTLOADER=1 ;; --install-bootloader) @@ -64,14 +71,18 @@ while [ "$#" -gt 0 ]; do upgrade=1 upgrade_all=1 ;; - -s|--use-substitutes) + --use-substitutes|-s) copyClosureFlags+=("$i") ;; - --max-jobs|-j|--cores|-I|--builders) + -I|--max-jobs|-j|--cores|--builders) j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - --show-trace|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*|-L|--refresh|--no-net|--offline|--impure) + -j*|--quiet|--print-build-logs|-L|--no-build-output|-Q| --show-trace|--keep-going|-k|--keep-failed|-K|--fallback|--refresh|--repair|--impure|--offline|--no-net) + extraBuildFlags+=("$i") + ;; + --verbose|-v|-vv|-vvv|-vvvv|-vvvvv) + verboseScript="true" extraBuildFlags+=("$i") ;; --option) @@ -85,7 +96,7 @@ while [ "$#" -gt 0 ]; do ;; --profile-name|-p) if [ -z "$1" ]; then - echo "$0: ‘--profile-name’ requires an argument" + log "$0: ‘--profile-name’ requires an argument" exit 1 fi if [ "$1" != system ]; then @@ -110,6 +121,9 @@ while [ "$#" -gt 0 ]; do flakeFlags=(--extra-experimental-features 'nix-command flakes') shift 1 ;; + --no-flake) + noFlake=1 + ;; --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file) lockFlags+=("$i") ;; @@ -123,7 +137,7 @@ while [ "$#" -gt 0 ]; do lockFlags+=("$i" "$j" "$k") ;; *) - echo "$0: unknown option \`$i'" + log "$0: unknown option \`$i'" exit 1 ;; esac @@ -143,30 +157,45 @@ if [ "$buildHost" = localhost ]; then buildHost= fi +# log the given argument to stderr if verbose mode is on +logVerbose() { + if [ -n "$verboseScript" ]; then + echo "$@" >&2 + fi +} + +# Run a command, logging it first if verbose mode is on +runCmd() { + logVerbose "$" "$@" + "$@" +} + buildHostCmd() { if [ -z "$buildHost" ]; then - "$@" + runCmd "$@" elif [ -n "$remoteNix" ]; then - ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" env PATH="$remoteNix":'$PATH' "$@" + runCmd ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" env PATH="$remoteNix":'$PATH' "$@" else - ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" "$@" + runCmd ssh $SSHOPTS "$buildHost" "${maybeSudo[@]}" "$@" fi } targetHostCmd() { if [ -z "$targetHost" ]; then - "${maybeSudo[@]}" "$@" + runCmd "${maybeSudo[@]}" "$@" else - ssh $SSHOPTS "$targetHost" "${maybeSudo[@]}" "$@" + runCmd ssh $SSHOPTS "$targetHost" "${maybeSudo[@]}" "$@" fi } copyToTarget() { if ! [ "$targetHost" = "$buildHost" ]; then if [ -z "$targetHost" ]; then - NIX_SSHOPTS=$SSHOPTS nix-copy-closure "${copyClosureFlags[@]}" --from "$buildHost" "$1" + logVerbose "Running nix-copy-closure with these NIX_SSHOPTS: $SSHOPTS" + NIX_SSHOPTS=$SSHOPTS runCmd nix-copy-closure "${copyClosureFlags[@]}" --from "$buildHost" "$1" elif [ -z "$buildHost" ]; then - NIX_SSHOPTS=$SSHOPTS nix-copy-closure "${copyClosureFlags[@]}" --to "$targetHost" "$1" + logVerbose "Running nix-copy-closure with these NIX_SSHOPTS: $SSHOPTS" + NIX_SSHOPTS=$SSHOPTS runCmd nix-copy-closure "${copyClosureFlags[@]}" --to "$targetHost" "$1" else buildHostCmd nix-copy-closure "${copyClosureFlags[@]}" --to "$targetHost" "$1" fi @@ -174,9 +203,12 @@ copyToTarget() { } nixBuild() { + logVerbose "Building in legacy (non-flake) mode." if [ -z "$buildHost" ]; then - nix-build "$@" + logVerbose "No --build-host given, running nix-build locally" + runCmd nix-build "$@" else + logVerbose "buildHost set to \"$buildHost\", running nix-build remotely" local instArgs=() local buildArgs=() local drv= @@ -206,24 +238,26 @@ nixBuild() { esac done - drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")" + drv="$(runCmd nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")" if [ -a "$drv" ]; then - NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$buildHost" "$drv" + logVerbose "Running nix-copy-closure with these NIX_SSHOPTS: $SSHOPTS" + NIX_SSHOPTS=$SSHOPTS runCmd nix-copy-closure --to "$buildHost" "$drv" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" else - echo "nix-instantiate failed" + log "nix-instantiate failed" exit 1 fi fi } nixFlakeBuild() { + logVerbose "Building in flake mode." if [[ -z "$buildHost" && -z "$targetHost" && "$action" != switch && "$action" != boot ]] then - nix "${flakeFlags[@]}" build "$@" + runCmd nix "${flakeFlags[@]}" build "$@" readlink -f ./result elif [ -z "$buildHost" ]; then - nix "${flakeFlags[@]}" build "$@" --out-link "${tmpDir}/result" + runCmd nix "${flakeFlags[@]}" build "$@" --out-link "${tmpDir}/result" readlink -f "${tmpDir}/result" else local attr="$1" @@ -247,18 +281,21 @@ nixFlakeBuild() { local k="$1"; shift 1 evalArgs+=("$i" "$j" "$k") ;; + --impure) # We don't want this in buildArgs, it's only needed at evaluation time, and unsupported during realisation + ;; *) buildArgs+=("$i") ;; esac done - drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildFlags[@]}")" + drv="$(runCmd nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildFlags[@]}")" if [ -a "$drv" ]; then - NIX_SSHOPTS=$SSHOPTS nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" + logVerbose "Running nix with these NIX_SSHOPTS: $SSHOPTS" + NIX_SSHOPTS=$SSHOPTS runCmd nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" else - echo "nix eval failed" + log "nix eval failed" exit 1 fi fi @@ -289,11 +326,11 @@ if [[ -n $upgrade && -z $_NIXOS_REBUILD_REEXEC && -z $flake ]]; then channel_name=$(basename "$channelpath") if [[ "$channel_name" == "nixos" ]]; then - nix-channel --update "$channel_name" + runCmd nix-channel --update "$channel_name" elif [ -e "$channelpath/.update-on-nixos-rebuild" ]; then - nix-channel --update "$channel_name" + runCmd nix-channel --update "$channel_name" elif [[ -n $upgrade_all ]] ; then - nix-channel --update "$channel_name" + runCmd nix-channel --update "$channel_name" fi done fi @@ -311,20 +348,10 @@ fi # Use /etc/nixos/flake.nix if it exists. It can be a symlink to the # actual flake. -if [[ -z $flake && -e /etc/nixos/flake.nix ]]; then +if [[ -z $flake && -e /etc/nixos/flake.nix && -z $noFlake ]]; then flake="$(dirname "$(readlink -f /etc/nixos/flake.nix)")" fi -# Re-execute nixos-rebuild from the Nixpkgs tree. -# FIXME: get nixos-rebuild from $flake. -if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast && -z $flake ]]; then - if p=$(nix-build --no-out-link --expr 'with import {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then - export _NIXOS_REBUILD_REEXEC=1 - exec "$p/bin/nixos-rebuild" "${origArgs[@]}" - exit 1 - fi -fi - # For convenience, use the hostname as the default configuration to # build from the flake. if [[ -n $flake ]]; then @@ -343,23 +370,8 @@ if [[ -n $flake ]]; then fi fi -# Find configuration.nix and open editor instead of building. -if [ "$action" = edit ]; then - if [[ -z $flake ]]; then - NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)} - if [[ -d $NIXOS_CONFIG ]]; then - NIXOS_CONFIG=$NIXOS_CONFIG/default.nix - fi - exec ${EDITOR:-nano} "$NIXOS_CONFIG" - else - exec nix "${flakeFlags[@]}" edit "${lockFlags[@]}" -- "$flake#$flakeAttr" - fi - exit 1 -fi - tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX) -SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60" cleanup() { for ctrl in "$tmpDir"/ssh-*; do @@ -370,6 +382,44 @@ cleanup() { trap cleanup EXIT +# Re-execute nixos-rebuild from the Nixpkgs tree. +if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast ]]; then + if [[ -z $flake ]]; then + if p=$(runCmd nix-build --no-out-link --expr 'with import {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then + SHOULD_REEXEC=1 + fi + else + runCmd nix "${flakeFlags[@]}" build --out-link "${tmpDir}/nixos-rebuild" "$flake#$flakeAttr.config.system.build.nixos-rebuild" "${extraBuildFlags[@]}" "${lockFlags[@]}" + if p=$(readlink -e "${tmpDir}/nixos-rebuild"); then + SHOULD_REEXEC=1 + fi + fi + + if [[ -n $SHOULD_REEXEC ]]; then + export _NIXOS_REBUILD_REEXEC=1 + # Manually call cleanup as the EXIT trap is not triggered when using exec + cleanup + runCmd exec "$p/bin/nixos-rebuild" "${origArgs[@]}" + exit 1 + fi +fi + +# Find configuration.nix and open editor instead of building. +if [ "$action" = edit ]; then + if [[ -z $flake ]]; then + NIXOS_CONFIG=${NIXOS_CONFIG:-$(runCmd nix-instantiate --find-file nixos-config)} + if [[ -d $NIXOS_CONFIG ]]; then + NIXOS_CONFIG=$NIXOS_CONFIG/default.nix + fi + runCmd exec ${EDITOR:-nano} "$NIXOS_CONFIG" + else + runCmd exec nix "${flakeFlags[@]}" edit "${lockFlags[@]}" -- "$flake#$flakeAttr" + fi + exit 1 +fi + +SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60" + # First build Nix, since NixOS may require a newer version than the # current one. if [[ -n "$rollback" || "$action" = dry-build ]]; then @@ -393,32 +443,32 @@ prebuiltNix() { elif [[ "$machine" = aarch64 ]]; then echo @nix_aarch64_linux@ else - echo "$0: unsupported platform" + log "$0: unsupported platform" exit 1 fi } if [[ -n $buildNix && -z $flake ]]; then - echo "building Nix..." >&2 + log "building Nix..." nixDrv= - if ! nixDrv="$(nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then - if ! nixDrv="$(nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A nix "${extraBuildFlags[@]}")"; then - if ! nixStorePath="$(nix-instantiate --eval '' -A "$(nixSystem)" | sed -e 's/^"//' -e 's/"$//')"; then + if ! nixDrv="$(runCmd nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then + if ! nixDrv="$(runCmd nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A nix "${extraBuildFlags[@]}")"; then + if ! nixStorePath="$(runCmd nix-instantiate --eval '' -A "$(nixSystem)" | sed -e 's/^"//' -e 's/"$//')"; then nixStorePath="$(prebuiltNix "$(uname -m)")" fi - if ! nix-store -r "$nixStorePath" --add-root "${tmpDir}/nix" --indirect \ + if ! runCmd nix-store -r "$nixStorePath" --add-root "${tmpDir}/nix" --indirect \ --option extra-binary-caches https://cache.nixos.org/; then - echo "warning: don't know how to get latest Nix" >&2 + log "warning: don't know how to get latest Nix" fi # Older version of nix-store -r don't support --add-root. [ -e "$tmpDir/nix" ] || ln -sf "$nixStorePath" "$tmpDir/nix" if [ -n "$buildHost" ]; then - remoteNixStorePath="$(prebuiltNix "$(buildHostCmd uname -m)")" + remoteNixStorePath="$(runCmd prebuiltNix "$(buildHostCmd uname -m)")" remoteNix="$remoteNixStorePath/bin" if ! buildHostCmd nix-store -r "$remoteNixStorePath" \ --option extra-binary-caches https://cache.nixos.org/ >/dev/null; then remoteNix= - echo "warning: don't know how to get latest Nix" >&2 + log "warning: don't know how to get latest Nix" fi fi fi @@ -440,8 +490,8 @@ fi # Update the version suffix if we're building from Git (so that # nixos-version shows something useful). if [[ -n $canRun && -z $flake ]]; then - if nixpkgs=$(nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then - suffix=$($SHELL "$nixpkgs/nixos/modules/installer/tools/get-version-suffix" "${extraBuildFlags[@]}" || true) + if nixpkgs=$(runCmd nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then + suffix=$(runCmd $SHELL "$nixpkgs/nixos/modules/installer/tools/get-version-suffix" "${extraBuildFlags[@]}" || true) if [ -n "$suffix" ]; then echo -n "$suffix" > "$nixpkgs/.version-suffix" || true fi @@ -458,7 +508,7 @@ fi # or "boot"), or just build it and create a symlink "result" in the # current directory (for "build" and "test"). if [ -z "$rollback" ]; then - echo "building the system configuration..." >&2 + log "building the system configuration..." if [[ "$action" = switch || "$action" = boot ]]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '' --no-out-link -A system "${extraBuildFlags[@]}")" @@ -515,7 +565,7 @@ fi # default and/or activate it now. if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = dry-activate ]]; then if ! targetHostCmd "$pathToConfig/bin/switch-to-configuration" "$action"; then - echo "warning: error(s) occurred while switching to the new configuration" >&2 + log "warning: error(s) occurred while switching to the new configuration" exit 1 fi fi diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index ba972bb6916a..0946d5050db4 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -1,17 +1,32 @@ -{ lib, stdenv, fetchurl, pkg-config, numactl, ncurses, check }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, numactl, ncurses, check }: stdenv.mkDerivation rec { pname = "numatop"; - version = "2.1"; - src = fetchurl { - url = "https://github.com/intel/${pname}/releases/download/v${version}/${pname}-v${version}.tar.xz"; - sha256 = "1s7psq1xyswj0lpx10zg5lnppav2xy9safkfx3rssrs9c2fp5d76"; + version = "2.2"; + src = fetchFromGitHub { + owner = "intel"; + repo = "numatop"; + rev = "v${version}"; + sha256 = "sha256-GJvTwqgx34ZW10eIJj/xiKe3ZkAfs7GlJImz8jrnjfI="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ numactl ncurses ]; checkInputs = [ check ]; + patches = [ + (fetchpatch { + url = "https://github.com/intel/numatop/pull/54.patch"; + sha256 = "sha256-TbMLv7TT9T8wE4uJ1a/AroyPPwrwL0eX5IBLsh9GTTM="; + name = "fix-string-operations.patch"; + }) + (fetchpatch { + url = "https://github.com/intel/numatop/pull/64.patch"; + sha256 = "sha256-IevbSFJRTS5iQ5apHOVXzF67f3LJaW6j7DySFmVuyiM="; + name = "fix-format-strings-mvwprintw.patch"; + }) + ]; + doCheck = true; meta = with lib; { @@ -20,8 +35,8 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; platforms = [ - { kernel.name = "linux"; cpu.family = "x86"; } - { kernel.name = "linux"; cpu.family = "power"; } + "i686-linux" "x86_64-linux" + "powerpc64-linux" "powerpc64le-linux" ]; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index d108ca0d0060..75eb5d8757be 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -89,10 +89,11 @@ installPhase() { sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_icd.json > nvidia_icd.json.fixed fi - if [ "$system" = "i686-linux" ]; then + # nvidia currently only supports x86_64 and i686 + if [ "$i" == "$lib32" ]; then install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.i686.json else - install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.json + install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.x86_64.json fi fi diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 250ebbb59fdb..246295eb7340 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -19,10 +19,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "495.46"; - sha256_64bit = "2Dt30X2gxUZnqlsT1uqVpcUTBCV7Hs8vjUo7WuMcYvU="; - settingsSha256 = "vbcZYn+UBBGwjfrJ6SyXt3+JLBeNcXK4h8mjj7qxZPk="; - persistencedSha256 = "ieYqkVxe26cLw1LUgBsFSSowAyfZkTcItIzQCestCXI="; + version = "510.60.02"; + sha256_64bit = "sha256-qADfwFSQeP2Mbo5ngO+47uh4cuYFXH9fOGpHaM4H4AM="; + settingsSha256 = "sha256-Voa1JZ2qqJ1t+bfwKh/mssEi/hjzLTPwef2XG/gAC+0="; + persistencedSha256 = "sha256-THgK2GpRcttqSN2WxcuJu5My++Q+Y34jG8hm7daxhAQ="; } else legacy_390; @@ -77,6 +77,7 @@ rec { persistencedSha256 = "1ax4xn3nmxg1y6immq933cqzw6cj04x93saiasdc0kjlv0pvvnkn"; useGLVND = false; + broken = with kernel; kernelAtLeast "5.5"; patches = [ ./vm_operations_struct-fault.patch ]; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index ec83b472085d..c7e062534a4d 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -17,7 +17,7 @@ }@args: { lib, stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl -, kernel ? null, perl, nukeReferences +, kernel ? null, perl, nukeReferences, which , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -93,6 +93,7 @@ let libPath = libPathFor pkgs; libPath32 = optionalString i686bundled (libPathFor pkgsi686Linux); + buildInputs = [ which ]; nativeBuildInputs = [ perl nukeReferences ] ++ optionals (!libsOnly) kernel.moduleBuildDependencies; @@ -114,7 +115,7 @@ let description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ jonringer ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" inherit broken; }; diff --git a/pkgs/os-specific/linux/ocf-resource-agents/default.nix b/pkgs/os-specific/linux/ocf-resource-agents/default.nix index 9c9557c7be85..8d7f2b527144 100644 --- a/pkgs/os-specific/linux/ocf-resource-agents/default.nix +++ b/pkgs/os-specific/linux/ocf-resource-agents/default.nix @@ -1,3 +1,5 @@ +# This combines together OCF definitions from other derivations. +# https://github.com/ClusterLabs/resource-agents/blob/master/doc/dev-guides/ra-dev-guide.asc { stdenv , lib , runCommand @@ -8,12 +10,16 @@ , python3 , glib , drbd +, pacemaker }: let drbdForOCF = drbd.override { forOCF = true; }; + pacemakerForOCF = pacemaker.override { + forOCF = true; + }; resource-agentsForOCF = stdenv.mkDerivation rec { pname = "resource-agents"; @@ -53,4 +59,5 @@ runCommand "ocf-resource-agents" {} '' mkdir -p $out/usr/lib/ocf ${lndir}/bin/lndir -silent "${resource-agentsForOCF}/lib/ocf/" $out/usr/lib/ocf ${lndir}/bin/lndir -silent "${drbdForOCF}/usr/lib/ocf/" $out/usr/lib/ocf + ${lndir}/bin/lndir -silent "${pacemakerForOCF}/usr/lib/ocf/" $out/usr/lib/ocf '' diff --git a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index 511dd162785f..1952d31b0247 100644 --- a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix +++ b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -10,12 +10,12 @@ buildGoModule rec { pname = "oci-seccomp-bpf-hook"; - version = "1.2.3"; + version = "1.2.5"; src = fetchFromGitHub { owner = "containers"; repo = "oci-seccomp-bpf-hook"; rev = "v${version}"; - sha256 = "sha256-EKD6tkdQCPlVlb9ScvRwDxYAtbbv9PIqBHH6SvtPDsE="; + sha256 = "sha256-PU7WX5RAV6wWVRsqq6MdEjr00AtlTT4cSacRaxrEF2s="; }; vendorSha256 = null; diff --git a/pkgs/os-specific/linux/openrazer/driver.nix b/pkgs/os-specific/linux/openrazer/driver.nix index 6e387de0719f..2de63580ac33 100644 --- a/pkgs/os-specific/linux/openrazer/driver.nix +++ b/pkgs/os-specific/linux/openrazer/driver.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (common // { nativeBuildInputs = kernel.moduleBuildDependencies; - buildFlags = [ + makeFlags = kernel.makeFlags ++ [ "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index e2346cca95c7..ba93b068fddc 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -8,12 +8,12 @@ let _kernel = kernel; pythonEnv = python3.withPackages (ps: with ps; [ six ]); in stdenv.mkDerivation rec { - version = "2.15.1"; + version = "2.17.0"; pname = "openvswitch"; src = fetchurl { url = "https://www.openvswitch.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0vgijwycf3wvzv9v811jrfr5rlwmihlxwpf16spl6k9n6zaswysw"; + sha256 = "sha256-4Dv6t8qC2Bp9OjbeTzkKO1IQ4/OWV2cfkih3zU6m3HM="; }; kernel = optional (_kernel != null) _kernel.dev; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 33ab4f784fcb..72f91e89c745 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -5,20 +5,23 @@ stdenv.mkDerivation rec { pname = "linux-pam"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://github.com/linux-pam/linux-pam/releases/download/v${version}/Linux-PAM-${version}.tar.xz"; - sha256 = "sha256-IB1AcwsRNbGzzeoJ8sKKxjTXMYHM0Bcs7d7jZJxXkvw="; + sha256 = "sha256-5OxxMakdpEUSV0Jo9JPG2MoQXIcJFpG46bVspoXU+U0="; }; + patches = [ ./suid-wrapper-path.patch ]; + outputs = [ "out" "doc" "man" /* "modules" */ ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ flex ] ++ lib.optional stdenv.buildPlatform.isDarwin gettext; - buildInputs = [ cracklib db4 audit ] + buildInputs = [ cracklib db4 ] + ++ lib.optional stdenv.buildPlatform.isLinux audit ++ lib.optional withLibxcrypt libxcrypt; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/pam/suid-wrapper-path.patch b/pkgs/os-specific/linux/pam/suid-wrapper-path.patch new file mode 100644 index 000000000000..71533c51a190 --- /dev/null +++ b/pkgs/os-specific/linux/pam/suid-wrapper-path.patch @@ -0,0 +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 @@ +- -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \ ++ -DCHKPWD_HELPER=\"/run/wrappers/bin/unix_chkpwd\" \ diff --git a/pkgs/os-specific/linux/pam_p11/default.nix b/pkgs/os-specific/linux/pam_p11/default.nix index 1ed47ba53c2a..35199d3357b1 100644 --- a/pkgs/os-specific/linux/pam_p11/default.nix +++ b/pkgs/os-specific/linux/pam_p11/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, openssl, libp11, pam }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, openssl, libp11, pam, libintl }: stdenv.mkDerivation rec { pname = "pam_p11"; @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ pam openssl libp11 ]; + buildInputs = [ pam openssl libp11 ] + ++ lib.optionals stdenv.isDarwin [ libintl ]; meta = with lib; { homepage = "https://github.com/OpenSC/pam_p11"; diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix index ba525c1a387a..deb3e06ca49d 100644 --- a/pkgs/os-specific/linux/pflask/default.nix +++ b/pkgs/os-specific/linux/pflask/default.nix @@ -1,18 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, python2, wafHook }: +{ lib, stdenv, fetchFromGitHub, python3, wafHook }: stdenv.mkDerivation rec { pname = "pflask"; - version = "unstable-2015-12-17"; + version = "unstable-2018-01-23"; src = fetchFromGitHub { owner = "ghedo"; - repo = "pflask"; - rev = "599418bb6453eaa0ccab493f9411f13726c1a636"; - hash = "sha256-0RjitZd2JUK7WUEJuw4qhUx3joY5OI0Hh74mTzp7GmY="; + repo = pname; + rev = "9ac31ffe2ed29453218aac89ae992abbd6e7cc69"; + hash = "sha256-bAKPUj/EipZ98kHbZiFZZI3hLVMoQpCrYKMmznpSDhg="; }; - nativeBuildInputs = [ wafHook ]; - buildInputs = [ python2 ]; + nativeBuildInputs = [ python3 wafHook ]; + + postInstall = '' + mkdir -p $out/bin + cp build/pflask $out/bin + ''; meta = { description = "Lightweight process containers for Linux"; diff --git a/pkgs/os-specific/linux/procdump/default.nix b/pkgs/os-specific/linux/procdump/default.nix index 0b40a4dd0365..05ec4b90ed70 100644 --- a/pkgs/os-specific/linux/procdump/default.nix +++ b/pkgs/os-specific/linux/procdump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bash, coreutils, gdb, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, bash, coreutils, gdb, zlib }: stdenv.mkDerivation rec { pname = "procdump"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-gVswAezHl7E2cBTJEQhPFXhHkzhWVHSpPF8m0s8+ekc="; }; + patches = [ + # Pull upstream patch to fix parallel builds: + # https://github.com/Sysinternals/ProcDump-for-Linux/pull/133 + (fetchpatch { + name = "parallel.patch"; + url = "https://github.com/Sysinternals/ProcDump-for-Linux/commit/0d735836f11281cc6134be93eac8acb302f2055e.patch"; + sha256 = "sha256-zsqllPHF8ZuXAIDSAPvbzdKa43uSSx9ilUKM1vFVW90="; + }) + ]; + nativeBuildInputs = [ zlib ]; buildInputs = [ bash coreutils gdb ]; @@ -27,6 +37,8 @@ stdenv.mkDerivation rec { "MANDIR=/share/man/man1" ]; + enableParallelBuilding = true; + doCheck = false; # needs sudo root doInstallCheck = true; diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix new file mode 100644 index 000000000000..63de7453935c --- /dev/null +++ b/pkgs/os-specific/linux/projecteur/default.nix @@ -0,0 +1,32 @@ +{ lib, mkDerivation, fetchFromGitHub, + cmake, pkg-config, + qtbase, qtgraphicaleffects, wrapQtAppsHook }: +mkDerivation rec { + pname = "projecteur"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "jahnf"; + repo = "Projecteur"; + rev = "v${version}"; + fetchSubmodules = false; + sha256 = "sha256-kg6oYtJ4H5A6RNATBg+XvMfCb9FlhEBFjfxamGosMQg="; + }; + + buildInputs = [ qtbase qtgraphicaleffects ]; + nativeBuildInputs = [ wrapQtAppsHook cmake pkg-config ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX:PATH=${placeholder "out"}" + "-DPACKAGE_TARGETS=OFF" + "-DCMAKE_INSTALL_UDEVRULESDIR=${placeholder "out"}/lib/udev/rules.d" + ]; + + meta = with lib; { + 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 ]; + }; +} diff --git a/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/pkgs/os-specific/linux/qmk-udev-rules/default.nix index 7fb5b092ca42..5e956f3baf34 100644 --- a/pkgs/os-specific/linux/qmk-udev-rules/default.nix +++ b/pkgs/os-specific/linux/qmk-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "qmk-udev-rules"; - version = "0.13.23"; + version = "0.15.25"; src = fetchFromGitHub { owner = "qmk"; repo = "qmk_firmware"; rev = version; - sha256 = "08d2ri9g6lky3ixd5h0scm95hgc52lcjr3vcnmpdxn780q9ygmkm"; + sha256 = "4U1/9DgoKZ1Al76lZ2P8x4LIvtqaJPLq81cCSCy+9iE="; }; dontBuild = true; diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix index 91e15db2eeb6..bcf5fb8956ab 100644 --- a/pkgs/os-specific/linux/r8168/default.nix +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. - # [1] http://www.realtek.com.tw/downloads/downloadsView.aspx?PFid=5&Level=5&Conn=4&DownTypeID=3 + # [1] https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software # I've verified manually (`diff -r`) that the source code for version 8.046.00 # is the same as the one available on the realtek website. src = fetchFromGitHub { @@ -27,11 +27,13 @@ in stdenv.mkDerivation rec { # avoid using the Makefile directly -- it doesn't understand # any kernel but the current. # based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168 + makeFlags = kernel.makeFlags ++ [ + "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "M=$(PWD)/src" + "modules" + ]; preBuild = '' - makeFlagsArray+=("-C${kernel.dev}/lib/modules/${kernel.modDirVersion}/build") - makeFlagsArray+=("M=$PWD/src") makeFlagsArray+=("EXTRA_CFLAGS=-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN -DCONFIG_ASPM -DENABLE_S5WOL -DENABLE_EEE") - makeFlagsArray+=("modules") ''; enableParallelBuilding = true; @@ -52,5 +54,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ timokau ]; + broken = kernel.kernelAtLeast "5.17"; }; } diff --git a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index 32378e451e8a..c68d40583968 100644 --- a/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -3,13 +3,18 @@ }: stdenvNoCC.mkDerivation rec { pname = "raspberrypi-eeprom"; - version = "2021.04.29-138a1"; + version = "2021.12.02"; + # From 3fdf703f3f7bbe57eacceada3b558031229a34b0 Mon Sep 17 00:00:00 2001 + # From: Peter Harper + # Date: Mon, 13 Dec 2021 11:56:11 +0000 + # Subject: [PATCH] 2021-12-02: Promote the 2021-12-02 beta release to LATEST/STABLE + commit = "3fdf703f3f7bbe57eacceada3b558031229a34b0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; - rev = "v${version}"; - sha256 = "sha256-nzAMPa4gqCAcROFa7z34IoMA3aoMHX9fYCsPFde9dac="; + rev = commit; + sha256 = "sha256-JTL2ziOkT0tnOrOS08ttNtxj3qegsacP73xZBVur7xM="; }; buildInputs = [ python3 ]; @@ -26,7 +31,7 @@ stdenvNoCC.mkDerivation rec { installPhase = '' mkdir -p $out/bin $out/share/rpi-eeprom - cp rpi-eeprom-config rpi-eeprom-update $out/bin + cp rpi-eeprom-config rpi-eeprom-update rpi-eeprom-digest $out/bin cp -r firmware/{beta,critical,old,stable} $out/share/rpi-eeprom cp -P firmware/default firmware/latest $out/share/rpi-eeprom ''; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index 02321d843510..f7543291deda 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "rdma-core"; - version = "38.1"; + version = "39.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "05r5f9agpn7dcx5jmggrsm9953w2k6ly6gfbg9b8wjdc853apqp7"; + sha256 = "sha256-7Z06bdCtv/gdZKzKfcU+JrWl4+b6b/cdKp8pMLCZZo0="; }; strictDeps = true; diff --git a/pkgs/os-specific/linux/rtl8189es/default.nix b/pkgs/os-specific/linux/rtl8189es/default.nix index 500359f7e4fd..c1032473db10 100644 --- a/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/pkgs/os-specific/linux/rtl8189es/default.nix @@ -2,17 +2,16 @@ stdenv.mkDerivation rec { name = "rtl8189es-${kernel.version}-${version}"; - version = "2020-10-03"; + version = "2021-10-01"; src = fetchFromGitHub { owner = "jwrdegoede"; repo = "rtl8189ES_linux"; - rev = "03ac413135a355b55b693154c44b70f86a39732e"; - sha256 = "0wiikviwyvy6h55rgdvy7csi1zqniqg26p8x44rd6mhbw0g00h56"; + rev = "be378f47055da1bae42ff6ec1d62f1a5052ef097"; + sha256 = "sha256-+19q1Xux2BjquavY+s0UDzTubEt6BEUZ9XVDVmj36us="; }; - nativeBuildInputs = [ bc nukeReferences ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" "format" ]; @@ -23,13 +22,10 @@ stdenv.mkDerivation rec { substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; - makeFlags = [ - "ARCH=${stdenv.hostPlatform.linuxArch}" + makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n")) ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n")) - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ - "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; preInstall = '' @@ -46,5 +42,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ danielfullmer lheckemann ]; + broken = kernel.kernelAtLeast "5.17"; }; } diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index b33330611b88..de4dd52e511c 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -6,20 +6,20 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { pname = "rtl8192eu"; - version = "${kernel.version}-4.4.1.20211023"; + version = "${kernel.version}-4.4.1.20220313"; src = fetchFromGitHub { owner = "Mange"; repo = "rtl8192eu-linux-driver"; - rev = "744bbe52976e51895fce2c1d4075f97a98dca2b2"; - sha256 = "1ayb3fljvpljwcgi47h8vj2d2w5imqyjxc7mvmfrvmilzg5d5cj7"; + rev = "e0f967cea1d0037c730246c572f7fef000865ff7"; + sha256 = "sha256-Wgp1MZ/z8AxbZPYsmR6t7Q4nsL0TFEqTEsrkkWPI6gI="; }; hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies ++ [ bc ]; - makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index f9ca60b1112b..dce8733c0cca 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -2,16 +2,17 @@ stdenv.mkDerivation { pname = "rtl8814au"; - version = "${kernel.version}-unstable-2021-10-25"; + version = "${kernel.version}-unstable-2022-02-21"; src = fetchFromGitHub { owner = "morrownr"; repo = "8814au"; - rev = "d36c0874716b0776ac6c7dcd6110598ef0f6dd53"; - sha256 = "0lk3ldff489ggbqmlfi4zvnp1cvxj1b06m0fhpzai82070klzzmj"; + rev = "a538e3878c4b7b0b012f2d2fe7804390caaebd90"; + sha256 = "sha256-xBGbcy/WonFrNflMlFCD/JQOFKhPrv0J3j2XcXWc6hk="; }; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 5800405f2839..dc693f01f572 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl8821au"; - version = "${kernel.version}-unstable-2021-11-05"; + version = "${kernel.version}-unstable-2022-03-08"; src = fetchFromGitHub { owner = "morrownr"; repo = "8821au-20210708"; - rev = "dd9f442d86535fb749ab06f38f97160484d9f04b"; - sha256 = "0d90zd45b8934wxy51q1x39lx4n3i28zjm6jcq98wkm4lypgphxv"; + rev = "2c0c6fef81c0c7dcf8fa06fc4ab72168abc4f7bb"; + sha256 = "sha256-Hdzi3pGqH71O0Jenjd/myG4+rZDLC/CcWHkjDoXBxS0="; }; nativeBuildInputs = [ bc nukeReferences ]; diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 75e12a1b7a46..039d4b3fb7bb 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, kernel, bc }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, kernel +, bc +}: stdenv.mkDerivation rec { pname = "rtl8821ce"; @@ -11,10 +17,16 @@ stdenv.mkDerivation rec { sha256 = "18ma8a8h1l90dss0k6al7q6plwr57jc9g67p22g9917k1jfbhm97"; }; + # Fixes the build on kernel >= 5.17. Can be removed once https://github.com/tomaspinho/rtl8821ce/pull/267 is merged + patches = [(fetchpatch { + url = "https://github.com/tomaspinho/rtl8821ce/commit/7b9e55df64b10fed785f22df9f36ed4a30b59d0e.patch"; + sha256 = "sha256-mpAWOG1aXsklGuDbrRB9Vd36mgeCdctKQaWuuoqEEp0="; + })]; + hardeningDisable = [ "pic" ]; - nativeBuildInputs = [ bc ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 9229a3c13069..a3d767d2ee67 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { pname = "rtl8821cu"; - version = "${kernel.version}-unstable-2021-10-21"; + version = "${kernel.version}-unstable-2022-03-08"; src = fetchFromGitHub { owner = "morrownr"; - repo = "8821cu"; - rev = "4e2d84c5e70245f850877f355e8bf293f252f61c"; - sha256 = "1j32psvfgzfs5b1pdff6xk76iz7j8scakji6zm3vgqb2ssbxx1k1"; + repo = "8821cu-20210118"; + rev = "4bdd7c8668562e43564cd5d786055633e591ad4d"; + sha256 = "sha256-dfvDpjsra/nHwIGywOkZICTEP/Ex7ooH4zzkXqAaDkI="; }; hardeningDisable = [ "pic" ]; - nativeBuildInputs = [ bc ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; prePatch = '' substituteInPlace ./Makefile \ diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 310dac3933f1..e092d145abd2 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2021-11-04"; + version = "${kernel.version}-unstable-2022-02-22"; src = fetchFromGitHub { owner = "morrownr"; - repo = "88x2bu"; - rev = "745d134080b74b92389ffe59c03dcfd6658f8655"; - sha256 = "0f1hsfdw3ar78kqzr4hi04kpp5wnx0hd29f9rm698k0drxaw1g44"; + repo = "88x2bu-20210702"; + rev = "6a5b7f005c071ffa179b6183ee034c98ed30db80"; + sha256 = "sha256-BqTyJpICW3D4EfHHoN5svasteJnunu2Uz449u/CmNE0="; }; hardeningDisable = [ "pic" ]; - nativeBuildInputs = [ bc ]; - buildInputs = kernel.moduleBuildDependencies; + nativeBuildInputs = [ bc ] ++ kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags; - prePatch = '' + prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Realtek rtl88x2bu driver"; - homepage = "https://github.com/morrownr/88x2bu"; + homepage = "https://github.com/morrownr/88x2bu-20210702"; license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index 1f27c262e673..f975cc2b420b 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, kernel }: let - rev = "307d694076b056588c652c2bdaa543a89eb255d9"; + rev = "37e27f9165300c89607144b646545fac576ec510"; in stdenv.mkDerivation rec { pname = "rtl88xxau-aircrack"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "aircrack-ng"; repo = "rtl8812au"; inherit rev; - sha256 = "sha256-iSJnKWc+LxGHUhb/wbFSMh7w6Oi9v4v5V+R+LI96X7w="; + sha256 = "sha256-TpmpueKAaCe7Nlmv8pMvgMXGVmXVa/1mBwtEoy4JyCY="; }; buildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index c3f849df1181..529ee621892b 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation { hash = "sha256-PRzWXC1lre8gt1GfVdnaG836f5YK57P9a8tG20yef0w="; }; - makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/rtw89/default.nix b/pkgs/os-specific/linux/rtw89/default.nix index 6b0f06c5bdc4..6ff208fa6dd9 100644 --- a/pkgs/os-specific/linux/rtw89/default.nix +++ b/pkgs/os-specific/linux/rtw89/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation { sha256 = "0cvawyi1ksw9xkr8pzwipsl7b8hnmrb17w5cblyicwih8fqaw632"; }; - makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/ryzenadj/default.nix b/pkgs/os-specific/linux/ryzenadj/default.nix index cdc2425ae4ad..3013df7e2913 100644 --- a/pkgs/os-specific/linux/ryzenadj/default.nix +++ b/pkgs/os-specific/linux/ryzenadj/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pciutils, cmake }: stdenv.mkDerivation rec { pname = "ryzenadj"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "FlyGoat"; repo = "RyzenAdj"; rev = "v${version}"; - sha256 = "sha256-eb8DskF0SJtc0tDKJ1vU7dtuQmHO7RX8vm4DQki2ZEg="; + sha256 = "sha256-RoKRqqIVY9zjyXzGxHo+J4OV7cKc7CkqsdbpreB7EHc="; }; nativeBuildInputs = [ pciutils cmake ]; diff --git a/pkgs/os-specific/linux/sgx/samples/default.nix b/pkgs/os-specific/linux/sgx/samples/default.nix new file mode 100644 index 000000000000..f9c5ae450545 --- /dev/null +++ b/pkgs/os-specific/linux/sgx/samples/default.nix @@ -0,0 +1,109 @@ +{ stdenv +, lib +, makeWrapper +, sgx-sdk +, sgx-psw +, which + # "SIM" or "HW" +, sgxMode +}: +let + isSimulation = sgxMode == "SIM"; + buildSample = name: stdenv.mkDerivation { + pname = name; + version = sgxMode; + + src = sgx-sdk.out; + sourceRoot = "${sgx-sdk.name}/share/SampleCode/${name}"; + + nativeBuildInputs = [ + makeWrapper + which + ]; + + buildInputs = [ + sgx-sdk + ]; + + # The samples don't have proper support for parallel building + # causing them to fail randomly. + enableParallelBuilding = false; + + buildFlags = [ + "SGX_MODE=${sgxMode}" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib} + install -m 755 app $out/bin + install *.so $out/lib + + wrapProgram "$out/bin/app" \ + --run "cd $out/lib" \ + ${lib.optionalString (!isSimulation) + ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sgx-psw ]}"''} + + runHook postInstall + ''; + + # Breaks the signature of the enclaves + dontFixup = true; + + # We don't have access to real SGX hardware during the build + doInstallCheck = isSimulation; + installCheckPhase = '' + runHook preInstallCheck + + pushd / + echo a | $out/bin/app + popd + + runHook preInstallCheck + ''; + }; +in +{ + cxx11SGXDemo = buildSample "Cxx11SGXDemo"; + localAttestation = (buildSample "LocalAttestation").overrideAttrs (oldAttrs: { + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib} + install -m 755 bin/app* $out/bin + install bin/*.so $out/lib + + for bin in $out/bin/*; do + wrapProgram $bin \ + --run "cd $out/lib" \ + ${lib.optionalString (!isSimulation) + ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ sgx-psw ]}"''} + done + + runHook postInstall + ''; + }); + powerTransition = buildSample "PowerTransition"; + protobufSGXDemo = buildSample "ProtobufSGXDemo"; + remoteAttestation = (buildSample "RemoteAttestation").overrideAttrs (oldAttrs: { + # Makefile sets rpath to point to $TMPDIR + preFixup = '' + patchelf --remove-rpath $out/bin/app + ''; + + postInstall = '' + install sample_libcrypto/*.so $out/lib + ''; + }); + sampleEnclave = buildSample "SampleEnclave"; + sampleEnclavePCL = buildSample "SampleEnclavePCL"; + sampleEnclaveGMIPP = buildSample "SampleEnclaveGMIPP"; + sealUnseal = (buildSample "SealUnseal").overrideAttrs (oldAttrs: { + prePatch = '' + substituteInPlace App/App.cpp \ + --replace '"sealed_data_blob.txt"' '"/tmp/sealed_data_blob.txt"' + ''; + }); + switchless = buildSample "Switchless"; +} diff --git a/pkgs/os-specific/linux/sgx/sdk/default.nix b/pkgs/os-specific/linux/sgx/sdk/default.nix index 93c12da94ac3..baa4ad2a3375 100644 --- a/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -3,15 +3,16 @@ , fetchFromGitHub , fetchpatch , fetchzip -, callPackage , autoconf , automake , binutils +, callPackage , cmake , file , gdb , git , libtool +, linkFarmFromDrvs , nasm , ocaml , ocamlPackages @@ -20,6 +21,7 @@ , python3 , texinfo , validatePkgConfig +, writeShellApplication , writeShellScript , writeText , debug ? false @@ -262,7 +264,25 @@ stdenv.mkDerivation rec { postHooks+=(sgxsdk) ''; - passthru.tests = callPackage ./samples.nix { }; + passthru.tests = callPackage ../samples { sgxMode = "SIM"; }; + + # Run tests in SGX hardware mode on an SGX-enabled machine + # $(nix-build -A sgx-sdk.runTestsHW)/bin/run-tests-hw + passthru.runTestsHW = + let + testsHW = lib.filterAttrs (_: v: v ? "name") (callPackage ../samples { sgxMode = "HW"; }); + testsHWLinked = linkFarmFromDrvs "sgx-samples-hw-bundle" (lib.attrValues testsHW); + in + writeShellApplication { + name = "run-tests-hw"; + text = '' + for test in ${testsHWLinked}/*; do + printf '*** Running test %s ***\n\n' "$(basename "$test")" + printf 'a\n' | "$test/bin/app" + printf '\n' + done + ''; + }; meta = with lib; { description = "Intel SGX SDK for Linux built with IPP Crypto Library"; diff --git a/pkgs/os-specific/linux/sgx/sdk/samples.nix b/pkgs/os-specific/linux/sgx/sdk/samples.nix deleted file mode 100644 index 21b31f824476..000000000000 --- a/pkgs/os-specific/linux/sgx/sdk/samples.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, sgx-sdk -, which -}: -let - buildSample = name: stdenv.mkDerivation rec { - inherit name; - - src = sgx-sdk.out; - sourceRoot = "${sgx-sdk.name}/share/SampleCode/${name}"; - - buildInputs = [ - sgx-sdk - ]; - - # The samples don't have proper support for parallel building - # causing them to fail randomly. - enableParallelBuilding = false; - - buildFlags = [ - "SGX_MODE=SIM" - ]; - - installPhase = '' - mkdir $out - install -m 755 app $out/app - install *.so $out/ - ''; - - doInstallCheck = true; - installCheckInputs = [ which ]; - installCheckPhase = '' - pushd $out - ./app - popd - ''; - }; -in -{ - cxx11SGXDemo = buildSample "Cxx11SGXDemo"; - localAttestation = (buildSample "LocalAttestation").overrideAttrs (oldAttrs: { - installPhase = '' - mkdir $out - cp -r bin/. $out/ - ''; - }); - powerTransition = (buildSample "PowerTransition").overrideAttrs (oldAttrs: { - # Requires interaction - doInstallCheck = false; - }); - protobufSGXDemo = buildSample "ProtobufSGXDemo"; - remoteAttestation = (buildSample "RemoteAttestation").overrideAttrs (oldAttrs: { - dontFixup = true; - installCheckPhase = '' - echo "a" | LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/sample_libcrypto ./app - ''; - }); - sampleEnclave = buildSample "SampleEnclave"; - sampleEnclavePCL = buildSample "SampleEnclavePCL"; - sampleEnclaveGMIPP = buildSample "SampleEnclaveGMIPP"; - sealUnseal = buildSample "SealUnseal"; - switchless = buildSample "Switchless"; -} diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index e20023b2b6eb..2e4ae1649ea8 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -11,7 +11,7 @@ let else assert stdenv.hostPlatform.libc == "glibc"; stdenv.cc.libc; dots_in_usernames = fetchpatch { - url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch"; sha256 = "1fj3rg6x3jppm5jvi9y7fhd2djbi4nc5pgwisw00xlh4qapgz692"; }; diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index b2636382aec6..6308b83b600a 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2 }: +{ lib, stdenv, fetchurl, python3 }: stdenv.mkDerivation rec { pname = "smem"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "19ibv1byxf2b68186ysrgrhy5shkc5mc69abark1h18yigp3j34m"; }; - buildInputs = [ python2 ]; + buildInputs = [ python3 ]; makeFlags = [ "smemcap" ]; diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index d15838868874..22602d12bd5a 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "sssd"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "SSSD"; repo = pname; rev = version; - sha256 = "sha256-qKd6CwjiznoA97G4cnIt4FpVaLQMJYBt3JD2l7h72Z4="; + sha256 = "sha256-m0ArsN9xopfBPnHTiPDEOPuhQHQ2zoICGwVM7P05k3U="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/sysdig/default.upstream b/pkgs/os-specific/linux/sysdig/default.upstream deleted file mode 100644 index 485de5741d79..000000000000 --- a/pkgs/os-specific/linux/sysdig/default.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url https://github.com/draios/sysdig/releases -ensure_choice -version '.*/([0-9.]+)[.]tar[.].*' '\1' -do_overwrite () { - ensure_hash - set_var_value sha256 $CURRENT_HASH - set_var_value version $CURRENT_VERSION -} diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 2d5b3e2ab558..5389caaa33fb 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sysstat"; - version = "12.4.3"; + version = "12.4.4"; src = fetchurl { url = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${version}.tar.xz"; - sha256 = "sha256-rkMkMfRarLyrrPu+Ep4lBeIVyvqc6ZbXVQxgkaRvC/0="; + sha256 = "sha256-lRLnR54E+S4lHFxrS9lLj2Q9ISvQ6Yao6k0Uem6UPSQ="; }; buildInputs = [ gettext ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index f17dd02e7c03..3a3a419093b7 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -594,16 +594,20 @@ stdenv.mkDerivation { rm -rf $out/share/doc ''; - # The interface version prevents NixOS from switching to an - # incompatible systemd at runtime. (Switching across reboots is - # fine, of course.) It should be increased whenever systemd changes - # in a backwards-incompatible way. If the interface version of two - # systemd builds is the same, then we can switch between them at - # runtime; otherwise we can't and we need to reboot. - passthru.interfaceVersion = 2; + passthru = { + # The interface version prevents NixOS from switching to an + # incompatible systemd at runtime. (Switching across reboots is + # fine, of course.) It should be increased whenever systemd changes + # in a backwards-incompatible way. If the interface version of two + # systemd builds is the same, then we can switch between them at + # runtime; otherwise we can't and we need to reboot. + interfaceVersion = 2; - passthru.tests = { - inherit (nixosTests) switchTest; + inherit withCryptsetup; + + tests = { + inherit (nixosTests) switchTest; + }; }; meta = with lib; { @@ -612,6 +616,6 @@ stdenv.mkDerivation { license = licenses.lgpl21Plus; platforms = platforms.linux; priority = 10; - maintainers = with maintainers; [ eelco flokli kloenk ]; + maintainers = with maintainers; [ flokli kloenk mic92 ]; }; } diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 129ec31223c7..a339c60e8dfa 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, libxslt, libtraceevent, libtracefs }: stdenv.mkDerivation rec { pname = "trace-cmd"; - version = "2.9.5"; + version = "2.9.7"; src = fetchgit { url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; rev = "trace-cmd-v${version}"; - sha256 = "0kc5cldk5i7q2zr2nyz3mvs5v7w0km6lpx7g39sy3pmhshp0wqlq"; + sha256 = "sha256-04qsTlOVYh/jHVWxaGuqYj4DkUpcEYcpfUqnqhphIMg="; }; # Don't build and install html documentation @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "User-space tools for the Linux kernel ftrace subsystem"; homepage = "https://www.trace-cmd.org/"; - license = licenses.gpl2; + license = with licenses; [ lgpl21Only gpl2Only ]; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice basvandijk ]; }; diff --git a/pkgs/os-specific/linux/tuigreet/default.nix b/pkgs/os-specific/linux/tuigreet/default.nix index 581b89fb1c64..95de5b8c8d9c 100644 --- a/pkgs/os-specific/linux/tuigreet/default.nix +++ b/pkgs/os-specific/linux/tuigreet/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-H5xqk7Yd3M8sFGHlmhAS0fhh3eM4dkvkNQGVxRSXUJs="; meta = with lib; { - description = "Graphical console greter for greetd"; + description = "Graphical console greeter for greetd"; homepage = "https://github.com/apognu/tuigreet"; license = licenses.gpl3Plus; maintainers = with maintainers; [ luc65r ivar ]; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index fd321d90cb2a..427e19ac9215 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -25,9 +25,11 @@ stdenv.mkDerivation rec { blkid = "${util-linux}/bin/blkid"; false = "${coreutils}/bin/false"; mdadm = "${mdadm}/bin/mdadm"; + mkswap = "${util-linux}/bin/mkswap"; sed = "${gnused}/bin/sed"; sh = "${bash}/bin/sh"; sleep = "${coreutils}/bin/sleep"; + swapon = "${util-linux}/bin/swapon"; true = "${coreutils}/bin/true"; }) (substituteAll { @@ -77,7 +79,7 @@ stdenv.mkDerivation rec { description = "A daemon, tools and libraries to access and manipulate disks, storage devices and technologies"; homepage = "https://www.freedesktop.org/wiki/Software/udisks/"; license = with licenses; [ lgpl2Plus gpl2Plus ]; # lgpl2Plus for the library, gpl2Plus for the tools & daemon - maintainers = with maintainers; [ johnazoidberg ]; + maintainers = teams.freedesktop.members ++ (with maintainers; [ johnazoidberg ]); platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/udisks/fix-paths.patch b/pkgs/os-specific/linux/udisks/fix-paths.patch index 215df565eccd..30bc08da8cfa 100644 --- a/pkgs/os-specific/linux/udisks/fix-paths.patch +++ b/pkgs/os-specific/linux/udisks/fix-paths.patch @@ -1,17 +1,5 @@ -diff --git a/Makefile.am b/Makefile.am -index 56922b79..697f8c6e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --SHELL = @BASH@ -+SHELL = @bash@ - .SHELLFLAGS = -o pipefail -c - - PYTHON ?= python3 diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules -index 39bfa28b..ee1ca90a 100644 +index ca802cce..bfd1c29e 100644 --- a/data/80-udisks2.rules +++ b/data/80-udisks2.rules @@ -17,9 +17,9 @@ ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="?*", GOTO="udisks_probe_end" @@ -66,9 +54,27 @@ index e7df4ed2..ab4356d9 100644 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # diff --git a/src/tests/integration-test b/src/tests/integration-test -index 4499a6a9..8b711f95 100755 +index 07e4e029..3bd8ec51 100755 --- a/src/tests/integration-test +++ b/src/tests/integration-test +@@ -299,7 +299,7 @@ class UDisksTestCase(unittest.TestCase): + if not device: + device = cls.devname(partition) + result = {} +- cmd = subprocess.Popen(['blkid', '-p', '-o', 'udev', device], stdout=subprocess.PIPE) ++ cmd = subprocess.Popen(['@blkid@', '-p', '-o', 'udev', device], stdout=subprocess.PIPE) + for l in cmd.stdout: + (key, value) = l.decode('UTF-8').split('=', 1) + result[key] = value.strip() +@@ -437,7 +437,7 @@ class UDisksTestCase(unittest.TestCase): + f.write('KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ' + 'ATTRS{model}=="scsi_debug*", ' + 'ENV{ID_CDROM_MEDIA}=="?*", ' +- 'IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode"\n') ++ 'IMPORT{program}="@blkid@ -o udev -p -u noraid $tempnode"\n') + # reload udev + subprocess.call('sync; pkill --signal HUP udevd || ' + 'pkill --signal HUP systemd-udevd', @@ -1142,7 +1142,7 @@ class FS(UDisksTestCase): self.assertFalse(os.access(f, os.X_OK)) @@ -150,6 +156,3 @@ index 3ddbdf2c..a87f960a 100644 udisks_spawned_job_start (job); g_object_unref (job); } --- -2.33.1 - diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index d2f17c6666a8..aff9125c236d 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -1,9 +1,14 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab , pkg-config +, rsync , libxslt -, docbook_xsl +, meson +, ninja +, python3 +, gtk-doc +, docbook-xsl-nons , udev , libgudev , libusb1 @@ -15,23 +20,31 @@ , libimobiledevice }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "upower"; - version = "0.99.13"; + version = "0.99.17"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { - url = "https://gitlab.freedesktop.org/upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/upower-0.99.13.tar.xz"; - sha256 = "sha256-XK1w+RVAzH3BIcsX4K1kXl5mPIaC9gp75C7jjNeyPXo="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "upower"; + repo = "upower"; + rev = "v${version}"; + sha256 = "xvvqzGxgkuGcvnO12jnLURNJUoSlnMw2g/mnII+i6Bs="; }; nativeBuildInputs = [ - docbook_xsl + meson + ninja + python3 + gtk-doc + docbook-xsl-nons gettext gobject-introspection libxslt pkg-config + rsync ]; buildInputs = [ @@ -39,33 +52,56 @@ stdenv.mkDerivation { libusb1 udev systemd - ] - ++ lib.optional useIMobileDevice libimobiledevice - ; + ] ++ lib.optionals useIMobileDevice [ + libimobiledevice + ]; propagatedBuildInputs = [ glib ]; - configureFlags = [ + mesonFlags = [ "--localstatedir=/var" - "--with-backend=linux" - "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" - "--with-systemdutildir=${placeholder "out"}/lib/systemd" - "--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d" "--sysconfdir=/etc" + "-Dos_backend=linux" + "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" + "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" ]; doCheck = false; # fails with "env: './linux/integration-test': No such file or directory" - installFlags = [ - "historydir=$(TMPDIR)/foo" - "sysconfdir=${placeholder "out"}/etc" - ]; + postPatch = '' + patchShebangs src/linux/unittest_inspector.py + ''; + + postInstall = '' + # Move stuff from DESTDIR to proper location. + # We use rsync to merge the directories. + for dir in etc var; do + rsync --archive "${DESTDIR}/$dir" "$out" + rm --recursive "${DESTDIR}/$dir" + done + for o in out dev; do + rsync --archive "${DESTDIR}/''${!o}" "$(dirname "''${!o}")" + rm --recursive "${DESTDIR}/''${!o}" + done + # Ensure the DESTDIR is removed. + rmdir "${DESTDIR}/nix/store" "${DESTDIR}/nix" "${DESTDIR}" + ''; + + # HACK: We want to install configuration files to $out/etc + # but upower should read them from /etc on a NixOS system. + # With autotools, it was possible to override Make variables + # at install time but Meson does not support this + # so we need to convince it to install all files to a temporary + # location using DESTDIR and then move it to proper one in postInstall. + DESTDIR = "${placeholder "out"}/dest"; meta = with lib; { homepage = "https://upower.freedesktop.org/"; + changelog = "https://gitlab.freedesktop.org/upower/upower/-/blob/v${version}/NEWS"; description = "A D-Bus service for power management"; + maintainers = teams.freedesktop.members; platforms = platforms.linux; license = licenses.gpl2Plus; }; diff --git a/pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix b/pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix new file mode 100644 index 000000000000..d04c8ddb9398 --- /dev/null +++ b/pkgs/os-specific/linux/usb-blaster-udev-rules/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenvNoCC }: + +stdenvNoCC.mkDerivation rec { + name = "usb-blaster-udev-rules"; + + udevRules = ./usb-blaster.rules; + dontUnpack = true; + + installPhase = '' + install -Dm 644 "${udevRules}" "$out/lib/udev/rules.d/51-usbblaster.rules" + ''; + + meta = with lib; { + description = "udev rules that give NixOS permission to communicate with usb blasters"; + longDescription = '' + udev rules that give NixOS permission to communicate with usb blasters. + To use it under NixOS, add + + services.udev.packages = [ pkgs.usb-blaster-udev-rules ]; + + to the system configuration. + ''; + license = licenses.free; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules b/pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules new file mode 100644 index 000000000000..0add604ee819 --- /dev/null +++ b/pkgs/os-specific/linux/usb-blaster-udev-rules/usb-blaster.rules @@ -0,0 +1,8 @@ +# USB-Blaster +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6001", TAG+="uaccess" +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6002", TAG+="uaccess" +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6003", TAG+="uaccess" + +# USB-Blaster II +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6010", TAG+="uaccess" +ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6810", TAG+="uaccess" diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index 7d4563baee44..35505af5a1ed 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -24,14 +24,14 @@ assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.1.1"; pname = "usbguard"; src = fetchFromGitHub { owner = "USBGuard"; repo = pname; rev = "usbguard-${version}"; - sha256 = "sha256-CPuBQmDOpXWn0jPo4HRyDCZUpDy5NmbvUHxXoVbMd/I="; + sha256 = "sha256-lAh+l9GF+FHQqv2kEYU5JienZKGwR5e45BYAwjieYgw="; fetchSubmodules = true; }; diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index 87b38b9af6e4..934367dcd11b 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }: +{ lib, stdenv, fetchFromGitHub, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }: stdenv.mkDerivation { pname = "usermount"; version = "0.1"; - src = fetchgit { - url = "https://github.com/tom5760/usermount.git"; + src = fetchFromGitHub { + owner = "tom5760"; + repo = "usermount"; rev = "0d6aba3c1f8fec80de502f5b92fd8b28041cc8e4"; - sha256 = "0gpp0vwiwr7kgbhh26jspv3255662mnvnav6g8i2h0qxar8hf8w2"; + sha256 = "sha256-giMHUVYdAygiemYru20VxpQixr5aGgHhevNkHvkG9z4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index afdf335e1b40..bedd2417e7ea 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "util-linux"; - version = "2.37.2"; + version = "2.37.4"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-agdkwarn+2B++KbdLA9sR9Xl/SeqCIIKuq2ewU4o6dk="; + sha256 = "sha256-Y05pFq2RM2bDU2tkaOeER2lUm5mnsr+AMU3nirVlW4M="; }; patches = [ diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 90a052fdef9d..3fdd9e791bd5 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -12,11 +12,11 @@ let # we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt in stdenv.mkDerivation rec { pname = "v4l-utils"; - version = "1.20.0"; + version = "1.22.1"; src = fetchurl { url = "https://linuxtv.org/downloads/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1xr66y6w422hil6s7n8d61a2vhwh4im8l267amf41jvw7xqihqcm"; + hash = "sha256-Zcb76DCkTKEFxEOwJxgsGyyQU6kdHnKthJ36s4i5TjE="; }; outputs = [ "out" ] ++ lib.optional withUtils "lib" ++ [ "dev" ]; @@ -40,14 +40,16 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ libjpeg ]; postPatch = '' - patchShebangs utils/cec-ctl/msg2ctl.pl - patchShebangs utils/libcecutil/cec-gen.pl + patchShebangs utils/ ''; + enableParallelBuilding = true; + meta = with lib; { description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; homepage = "https://linuxtv.org/projects.php"; - license = licenses.lgpl21Plus; + changelog = "https://git.linuxtv.org/v4l-utils.git/plain/ChangeLog?h=v4l-utils-${version}"; + license = with licenses; [ lgpl21Plus gpl2Plus ]; maintainers = with maintainers; [ codyopel ]; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index c1aa7be2af6b..095d873e66cb 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -16,12 +16,9 @@ stdenv.mkDerivation rec { preBuild = '' substituteInPlace Makefile --replace "modules_install" "INSTALL_MOD_PATH=$out modules_install" sed -i '/depmod/d' Makefile - export PATH=${kmod}/sbin:$PATH ''; - nativeBuildInputs = kernel.moduleBuildDependencies; - - buildInputs = [ kmod ]; + nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; postInstall = '' make install-utils PREFIX=$bin @@ -29,7 +26,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" ]; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "KERNELRELEASE=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; diff --git a/pkgs/os-specific/linux/veikk-linux-driver/default.nix b/pkgs/os-specific/linux/veikk-linux-driver/default.nix index a1019d7b7fd6..8cf4896ae027 100644 --- a/pkgs/os-specific/linux/veikk-linux-driver/default.nix +++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ kernel ]; - buildPhase = '' - make BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build - ''; + makeFlags = kernel.makeFlags ++ [ + "BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; installPhase = '' mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/veikk diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix new file mode 100644 index 000000000000..ccf462702fd3 --- /dev/null +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + name = "virtio_vmmci"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "voutilad"; + repo = "virtio_vmmci"; + rev = "${version}"; + sha256 = "104xnpcy5kb4y7ipy1fx1v6byddzs63bv2dqjy3yl23n764fsy43"; + }; + + hardeningDisable = [ "pic" "format" ]; + nativeBuildInputs = kernel.moduleBuildDependencies; + + extraConfig = '' + CONFIG_RTC_HCTOSYS yes + ''; + + makeFlags = kernel.makeFlags ++ [ + "DEPMOD=echo" + "INSTALL_MOD_PATH=$(out)" + "KERNELRELEASE=${kernel.modDirVersion}" + "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + meta = with lib; { + description = "An OpenBSD VMM Control Interface (vmmci) for Linux"; + homepage = "https://github.com/voutilad/virtio_vmmci"; + license = licenses.gpl2; + maintainers = with maintainers; [ qbit ]; + platforms = platforms.linux; + }; + + enableParallelBuilding = true; +} diff --git a/pkgs/os-specific/linux/wlgreet/default.nix b/pkgs/os-specific/linux/wlgreet/default.nix index 4758945e41ab..932aa47fd714 100644 --- a/pkgs/os-specific/linux/wlgreet/default.nix +++ b/pkgs/os-specific/linux/wlgreet/default.nix @@ -4,17 +4,17 @@ }: rustPlatform.buildRustPackage rec { - pname = "wlgreet"; - version = "0.3"; + pname = "wlgreet-unstable"; + version = "2022-01-25"; src = fetchFromSourcehut { owner = "~kennylevinsen"; - repo = pname; - rev = version; - sha256 = "0n0lzg3y1z5s9s6kfkdj5q8w67bqpw08hqfccc5kz0ninzy9j0cc"; + repo = "wlgreet"; + rev = "8517e578cb64a8fb3bd8f8a438cdbe46f208b87c"; + sha256 = "0la4xlikw61cxvbkil1d22dgvazi7rs17n5i2z02090fvnfxxzxh"; }; - cargoSha256 = "1lwy8xmkl9n3fj3wlf80wp728nn9p5rjnbgmm2cbpqxklcgbmxhm"; + cargoSha256 = "651d2bf01612534f1c4b0472c812095a86eb064d16879380c87f684c04fe0d8d"; meta = with lib; { description = "Raw wayland greeter for greetd, to be run under sway or similar"; diff --git a/pkgs/os-specific/linux/wpa_supplicant/Use-unique-IDs-for-networks-and-credentials.patch b/pkgs/os-specific/linux/wpa_supplicant/Use-unique-IDs-for-networks-and-credentials.patch new file mode 100644 index 000000000000..09e5b3673ac4 --- /dev/null +++ b/pkgs/os-specific/linux/wpa_supplicant/Use-unique-IDs-for-networks-and-credentials.patch @@ -0,0 +1,32 @@ +The id and cred_id variables are reset to 0 every time the +wpa_config_read function is called, which is fine as long as it is only +called once. However, this is not the case when using both the -c and -I +options to specify two config files. + +This is a problem because the GUI, since eadfeb0e93748eb396ae62012b92d21a7f533646, +relies on the network IDs being unique (and increasing), and might get +into an infinite loop otherwise. + +This is solved by simply making the variables static. +--- + wpa_supplicant/config_file.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c +index 6db5010db..c996e3916 100644 +--- a/wpa_supplicant/config_file.c ++++ b/wpa_supplicant/config_file.c +@@ -297,8 +297,8 @@ struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp) + struct wpa_ssid *ssid, *tail, *head; + struct wpa_cred *cred, *cred_tail, *cred_head; + struct wpa_config *config; +- int id = 0; +- int cred_id = 0; ++ static int id = 0; ++ static int cred_id = 0; + + if (name == NULL) + return NULL; +-- +2.34.1 + diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 380fca42975a..925ec71d3fa1 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { }; patches = [ + # Fix a bug when using two config files + ./Use-unique-IDs-for-networks-and-credentials.patch ] ++ lib.optionals readOnlyModeSSIDs [ # Allow read-only networks ./0001-Implement-read-only-mode-for-ssids.patch @@ -26,40 +28,41 @@ stdenv.mkDerivation rec { # TODO: Patch epoll so that the dbus actually responds # TODO: Figure out how to get privsep working, currently getting SIGBUS extraConfig = '' + #CONFIG_ELOOP_EPOLL=y + #CONFIG_PRIVSEP=y + #CONFIG_TLSV12=y see #8332 CONFIG_AP=y - CONFIG_LIBNL32=y + CONFIG_BGSCAN_LEARN=y + CONFIG_BGSCAN_SIMPLE=y + CONFIG_DEBUG_SYSLOG=y + CONFIG_EAP_EKE=y CONFIG_EAP_FAST=y - CONFIG_EAP_PWD=y - CONFIG_EAP_PAX=y - CONFIG_EAP_SAKE=y CONFIG_EAP_GPSK=y CONFIG_EAP_GPSK_SHA256=y + CONFIG_EAP_IKEV2=y + CONFIG_EAP_PAX=y + CONFIG_EAP_PWD=y + CONFIG_EAP_SAKE=y + CONFIG_ELOOP=eloop + CONFIG_HS20=y + CONFIG_HT_OVERRIDES=y + CONFIG_IEEE80211AC=y + CONFIG_IEEE80211N=y + CONFIG_IEEE80211R=y + CONFIG_IEEE80211W=y + CONFIG_INTERNETWORKING=y + CONFIG_L2_PACKET=linux + CONFIG_LIBNL32=y CONFIG_OWE=y + CONFIG_P2P=y + CONFIG_TDLS=y + CONFIG_TLS=openssl + CONFIG_TLSV11=y + CONFIG_VHT_OVERRIDES=y + CONFIG_WNM=y CONFIG_WPS=y CONFIG_WPS_ER=y CONFIG_WPS_NFS=y - CONFIG_EAP_IKEV2=y - CONFIG_EAP_EKE=y - CONFIG_HT_OVERRIDES=y - CONFIG_VHT_OVERRIDES=y - CONFIG_ELOOP=eloop - #CONFIG_ELOOP_EPOLL=y - CONFIG_L2_PACKET=linux - CONFIG_IEEE80211W=y - CONFIG_TLS=openssl - CONFIG_TLSV11=y - #CONFIG_TLSV12=y see #8332 - CONFIG_IEEE80211R=y - CONFIG_DEBUG_SYSLOG=y - #CONFIG_PRIVSEP=y - CONFIG_IEEE80211N=y - CONFIG_IEEE80211AC=y - CONFIG_INTERNETWORKING=y - CONFIG_HS20=y - CONFIG_P2P=y - CONFIG_TDLS=y - CONFIG_BGSCAN_SIMPLE=y - CONFIG_BGSCAN_LEARN=y '' + optionalString withPcsclite '' CONFIG_EAP_SIM=y CONFIG_EAP_AKA=y diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index e842b59651e7..db5b040da3a2 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -1,32 +1,45 @@ -{lib, stdenv, fetchurl, pciutils, python2}: +{ lib +, stdenv +, fetchFromGitHub +, pciutils +, pkg-config +, python3 +}: stdenv.mkDerivation rec { - version = "1.30"; pname = "x86info"; + version = "unstable-2021-08-07"; - src = fetchurl { - url = "http://codemonkey.org.uk/projects/x86info/${pname}-${version}.tgz"; - sha256 = "0a4lzka46nabpsrg3n7akwr46q38f96zfszd73xcback1s2hjc7y"; + src = fetchFromGitHub { + owner = "kernelslacker"; + repo = pname; + rev = "061ea35ecb0697761b6260998fa2045b8bb0be68"; + hash = "sha256-/qWioC4dV1bQkU4SiTR8duYqoGIMIH7s8vuAXi75juo="; }; - preConfigure = '' - patchShebangs . + nativeBuildInputs = [ + pkg-config + python3 + ]; - # ignore warnings - sed -i 's/-Werror -Wall//' Makefile + buildInputs = [ + pciutils + ]; + + postBuild = '' + patchShebangs lsmsr/createheader.py + make -C lsmsr ''; - buildInputs = [ pciutils python2 ]; - installPhase = '' mkdir -p $out/bin - cp x86info lsmsr $out/bin + cp x86info $out/bin + cp lsmsr/lsmsr $out/bin ''; meta = { description = "Identification utility for the x86 series of processors"; - longDescription = - '' + longDescription = '' x86info will identify all Intel/AMD/Centaur/Cyrix/VIA CPUs. It leverages the cpuid kernel module where possible. it supports parsing model specific registers (MSRs) via the msr kernel module. it will approximate processor @@ -34,7 +47,7 @@ stdenv.mkDerivation rec { ''; platforms = [ "i686-linux" "x86_64-linux" ]; license = lib.licenses.gpl2; - homepage = "http://codemonkey.org.uk/projects/x86info/"; - maintainers = with lib.maintainers; [jcumming]; + homepage = "https://github.com/kernelslacker/x86info"; + maintainers = with lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 4ebc4ed76638..80762aa784eb 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xf86-input-wacom"; - version = "0.40.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "linuxwacom"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-0U4pAB5vsIlBewCBqQ4SLHDrwqtr9nh7knZpXZMkzck="; + sha256 = "sha256-WitvT1y9KpXJriMr6Z9CrmAQdKPBZ5g9fP2nIgzJzAc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/os-specific/linux/xmm7360-pci/default.nix b/pkgs/os-specific/linux/xmm7360-pci/default.nix index 6a589ff889c3..435ff94afb76 100644 --- a/pkgs/os-specific/linux/xmm7360-pci/default.nix +++ b/pkgs/os-specific/linux/xmm7360-pci/default.nix @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1wdb0phqg9rj9g9ycqdya0m7lx24kzjlh25yw0ifp898ddxrrr0c"; }; - makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + makeFlags = kernel.makeFlags ++ [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + ]; nativeBuildInputs = kernel.moduleBuildDependencies; - INSTALL_MOD_PATH = placeholder "out"; installFlags = [ "DEPMOD=true" ]; meta = with lib; { diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix new file mode 100644 index 000000000000..f04ccc569dff --- /dev/null +++ b/pkgs/os-specific/linux/xone/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchFromGitHub, kernel, fetchurl }: + +stdenv.mkDerivation rec { + name = "xone-${version}-${kernel.version}"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "medusalix"; + repo = "xone"; + rev = "v${version}"; + sha256 = "sha256-m4305Xl5w4nyAVqubjwWsiyPDVtfGykjlSW2eKEytVk="; + }; + + setSourceRoot = '' + export sourceRoot=$(pwd)/source + ''; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = [ + "-C" + "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "M=$(sourceRoot)" + "VERSION=${version}" + ]; + + buildFlags = [ "modules" ]; + installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; + installTargets = [ "modules_install" ]; + + meta = with lib; { + description = "Linux kernel driver for Xbox One and Xbox Series X|S accessories"; + homepage = "https://github.com/medusalix/xone"; + license = licenses.gpl2; + maintainers = with lib.maintainers; [ rhysmdnz ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index c1874877620c..c5aa09a88608 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ bluez ]; - makeFlags = [ + makeFlags = kernel.makeFlags ++ [ "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/pkgs/os-specific/linux/zenmonitor/default.nix index 603cdf7ceec7..8414ac7a1e14 100644 --- a/pkgs/os-specific/linux/zenmonitor/default.nix +++ b/pkgs/os-specific/linux/zenmonitor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zenmonitor"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Ta180m"; repo = "zenmonitor3"; rev = "v${version}"; - sha256 = "sha256-dbjLpfflIsEU+wTApghJYBPxBXqS/7MJqcMBcj50o6I="; + sha256 = "sha256-2EsuSMXnnMg0e0JD1TXJplsi7sOg9em0qqge2WlC6ro="; }; buildInputs = [ gtk3 ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 7341240f95af..6747d511694b 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,11 +16,12 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15 +, linuxPackages_5_17 ? pkgs.linuxKernel.packages.linux_5_17 }: -with lib; let + inherit (lib) any optionalString optionals optional makeBinPath; + smartmon = smartmontools.override { inherit enableMail; }; buildKernel = any (n: n == configFile) [ "kernel" "all" ]; @@ -113,7 +114,7 @@ let configureFlags = [ "--with-config=${configFile}" "--with-tirpc=1" - (withFeatureAs (buildUser && enablePython) "python" python3.interpreter) + (lib.withFeatureAs (buildUser && enablePython) "python" python3.interpreter) ] ++ optionals buildUser [ "--with-dracutdir=$(out)/lib/dracut" "--with-udevdir=$(out)/lib/udev" @@ -200,9 +201,9 @@ let ''; homepage = "https://github.com/openzfs/zfs"; changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; - license = licenses.cddl; - platforms = platforms.linux; - maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ]; + license = lib.licenses.cddl; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ]; mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable. @@ -215,28 +216,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.18"; + latestCompatibleLinuxPackages = linuxPackages_5_17; # this package should point to the latest release. - version = "2.1.2"; + version = "2.1.4"; - sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8="; + sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4="; }; zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.16"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.18"; + latestCompatibleLinuxPackages = linuxPackages_5_17; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.2"; + version = "2.1.4"; # rev = "0000000000000000000000000000000000000000"; - sha256 = "sha256-7oSFZlmjCr+egImIVf429GrFOKn3L3r4SMnK3LHHmL8="; + sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4="; isUnstable = true; }; diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index d45a2f0665de..d51219e69ae9 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, libseccomp, util-linux, qemu }: +{ lib, stdenv, fetchurl, dosfstools, libseccomp, makeWrapper, mtools, parted +, pkg-config, qemu, syslinux, util-linux }: let version = "0.6.9"; @@ -15,7 +16,7 @@ in stdenv.mkDerivation { pname = "solo5"; inherit version; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = lib.optional (stdenv.hostPlatform.isLinux) libseccomp; src = fetchurl { @@ -47,6 +48,14 @@ in stdenv.mkDerivation { [ -n "$CONFIG_${lib.toUpper bind}" ] && make install-opam-${bind} '') targets} + substituteInPlace $out/bin/solo5-virtio-mkimage \ + --replace "/usr/lib/syslinux" "${syslinux}/share/syslinux" \ + --replace "/usr/share/syslinux" "${syslinux}/share/syslinux" \ + --replace "cp " "cp --no-preserve=mode " + + wrapProgram $out/bin/solo5-virtio-mkimage \ + --prefix PATH : ${lib.makeBinPath [ dosfstools mtools parted syslinux ]} + runHook postInstall ''; diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 5e17519d4ce1..495a7094f9b4 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -14,6 +14,15 @@ rec { # The description needs to be overwritten for recursive types type = ...; + # Utility functions for convenience, or special interactions with the + # format (optional) + lib = { + exampleFunction = ... + # Types specific to the format (optional) + types = { ... }; + ... + }; + # generate :: Name -> Value -> Path # A function for generating a file with a value of such a type generate = ...; @@ -147,4 +156,202 @@ rec { ''; }; + + /* For configurations of Elixir project, like config.exs or runtime.exs + + Most Elixir project are configured using the [Config] Elixir DSL + + Since Elixir has more types than Nix, we need a way to map Nix types to + more than 1 Elixir type. To that end, this format provides its own library, + and its own set of types. + + To be more detailed, a Nix attribute set could correspond in Elixir to a + [Keyword list] (the more common type), or it could correspond to a [Map]. + + A Nix string could correspond in Elixir to a [String] (also called + "binary"), an [Atom], or a list of chars (usually discouraged). + + A Nix array could correspond in Elixir to a [List] or a [Tuple]. + + Some more types exists, like records, regexes, but since they are less used, + we can leave the `mkRaw` function as an escape hatch. + + For more information on how to use this format in modules, please refer to + the Elixir section of the Nixos documentation. + + TODO: special Elixir values doesn't show up nicely in the documentation + + [Config]: + [Keyword list]: + [Map]: + [String]: + [Atom]: + [List]: + [Tuple]: + */ + elixirConf = { elixir ? pkgs.elixir }: + with lib; let + toElixir = value: with builtins; + if value == null then "nil" else + if value == true then "true" else + if value == false then "false" else + if isInt value || isFloat value then toString value else + if isString value then string value else + if isAttrs value then attrs value else + if isList value then list value else + abort "formats.elixirConf: should never happen (value = ${value})"; + + escapeElixir = escape [ "\\" "#" "\"" ]; + string = value: "\"${escapeElixir value}\""; + + attrs = set: + if set ? _elixirType then specialType set + else + let + toKeyword = name: value: "${name}: ${toElixir value}"; + keywordList = concatStringsSep ", " (mapAttrsToList toKeyword set); + in + "[" + keywordList + "]"; + + listContent = values: concatStringsSep ", " (map toElixir values); + + list = values: "[" + (listContent values) + "]"; + + specialType = { value, _elixirType }: + if _elixirType == "raw" then value else + if _elixirType == "atom" then value else + if _elixirType == "map" then elixirMap value else + if _elixirType == "tuple" then tuple value else + abort "formats.elixirConf: should never happen (_elixirType = ${_elixirType})"; + + elixirMap = set: + let + toEntry = name: value: "${toElixir name} => ${toElixir value}"; + entries = concatStringsSep ", " (mapAttrsToList toEntry set); + in + "%{${entries}}"; + + tuple = values: "{${listContent values}}"; + + toConf = values: + let + keyConfig = rootKey: key: value: + "config ${rootKey}, ${key}, ${toElixir value}"; + keyConfigs = rootKey: values: mapAttrsToList (keyConfig rootKey) values; + rootConfigs = flatten (mapAttrsToList keyConfigs values); + in + '' + import Config + + ${concatStringsSep "\n" rootConfigs} + ''; + in + { + type = with lib.types; let + valueType = nullOr + (oneOf [ + bool + int + float + str + (attrsOf valueType) + (listOf valueType) + ]) // { + description = "Elixir value"; + }; + in + attrsOf (attrsOf (valueType)); + + lib = + let + mkRaw = value: { + inherit value; + _elixirType = "raw"; + }; + + in + { + inherit mkRaw; + + /* Fetch an environment variable at runtime, with optional fallback + */ + mkGetEnv = { envVariable, fallback ? null }: + mkRaw "System.get_env(${toElixir envVariable}, ${toElixir fallback})"; + + /* Make an Elixir atom. + + Note: lowercase atoms still need to be prefixed by ':' + */ + mkAtom = value: { + inherit value; + _elixirType = "atom"; + }; + + /* Make an Elixir tuple out of a list. + */ + mkTuple = value: { + inherit value; + _elixirType = "tuple"; + }; + + /* Make an Elixir map out of an attribute set. + */ + mkMap = value: { + inherit value; + _elixirType = "map"; + }; + + /* Contains Elixir types. Every type it exports can also be replaced + by raw Elixir code (i.e. every type is `either type rawElixir`). + + It also reexports standard types, wrapping them so that they can + also be raw Elixir. + */ + types = with lib.types; let + isElixirType = type: x: (x._elixirType or "") == type; + + rawElixir = mkOptionType { + name = "rawElixir"; + description = "raw elixir"; + check = isElixirType "raw"; + }; + + elixirOr = other: either other rawElixir; + in + { + inherit rawElixir elixirOr; + + atom = elixirOr (mkOptionType { + name = "elixirAtom"; + description = "elixir atom"; + check = isElixirType "atom"; + }); + + tuple = elixirOr (mkOptionType { + name = "elixirTuple"; + description = "elixir tuple"; + check = isElixirType "tuple"; + }); + + map = elixirOr (mkOptionType { + name = "elixirMap"; + description = "elixir map"; + check = isElixirType "map"; + }); + # Wrap standard types, since anything in the Elixir configuration + # can be raw Elixir + } // lib.mapAttrs (_name: type: elixirOr type) lib.types; + }; + + generate = name: value: pkgs.runCommandNoCC name + { + value = toConf value; + passAsFile = [ "value" ]; + nativeBuildInputs = [ elixir ]; + } '' + cp "$valuePath" "$out" + mix format "$out" + ''; + }; + } diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index c07933129fad..1c2f0621b5d0 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,19 +1,19 @@ { fetchurl, fetchzip }: { "x86_64-darwin" = fetchzip { - sha256 = "sha256-hB3TL1FocAtLpBe+Rv2Pyon4f1ld+Fqapz6TUQ0O1jU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-bTbjkBHOjcI78+jyJJ1JGe/WrmTxXi5RRB1yQO2zuYw="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.5/AdGuardHome_darwin_amd64.zip"; }; "i686-linux" = fetchurl { - sha256 = "sha256-ZPHmFxKLJ1oxT18P6FDv74/leCzlESTrhNYuC8T6u+I="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-wdzj7P+Hhm65i5hY4l2Ty486W473coZyZnCbzx9Poro="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.5/AdGuardHome_linux_386.tar.gz"; }; "x86_64-linux" = fetchurl { - sha256 = "sha256-yOvkEimDp646BCCFV2fnmVGe6R8geFlxtWLfPMVQ9Uk="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-sZQe8rNYD0gBSpNeXS+4hbqoT5nUFbkQSI3c6VuQOC8="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.5/AdGuardHome_linux_amd64.tar.gz"; }; "aarch64-linux" = fetchurl { - sha256 = "sha256-ayNv2O0Ge3dT6YAN4SW/gsyoErCB3BJYsx/daMbGHjs="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-9JsGzFf03en2ClrodglREsYqrwr6j/vypsfEVaMzCTI="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.5/AdGuardHome_linux_arm64.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index cce9a1c1590d..03d2b2ec9666 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.3"; + version = "0.107.5"; src = (import ./bins.nix { inherit fetchurl fetchzip; }).${stdenv.hostPlatform.system}; diff --git a/pkgs/servers/alps/default.nix b/pkgs/servers/alps/default.nix index f367dc59401e..fb10a5369f1d 100644 --- a/pkgs/servers/alps/default.nix +++ b/pkgs/servers/alps/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-xKfRLdfeD7lWdmC0iiq4dOIv2SmzbKH7HcAISCJgdug="; }; - vendorSha256 = "sha256-8fmbv5uPRfzUqsYU95YzsnuFkq4cwj+LN2X3W/yBHyA="; + vendorSha256 = "sha256-Vg0k+YSMg6Ree/jkVV2VQ8RbSbQFUhmUN2MeTBxPeLo="; proxyVendor = true; diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 434aeeb3a198..c6d66427ab20 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -12,8 +12,6 @@ let meta = with lib; { homepage = "https://qpid.apache.org"; - repositories.git = "git://git.apache.org/qpid.git"; - repositories.svn = "http://svn.apache.org/repos/asf/qpid"; description = "An AMQP message broker and a C++ messaging API"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 7203ac704c70..37e6f1fd2430 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.9.13"; + version = "3.9.14"; # 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"; - sha256 = "sha256-DndZ74m+CFyrukxKyOpfoRCb86RID2XL7x0eUZifcno="; + sha256 = "sha256-c6GpB6CSCHiU9hTC9FkxyTc1UpNWxx5iP3y2dbTUfS0="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ]; diff --git a/pkgs/servers/atlassian/bamboo.nix b/pkgs/servers/atlassian/bamboo.nix new file mode 100644 index 000000000000..a60d41d41c1f --- /dev/null +++ b/pkgs/servers/atlassian/bamboo.nix @@ -0,0 +1,37 @@ +{ stdenvNoCC, lib, fetchurl, mysql_jdbc +, withMysql ? true +}: + + +stdenvNoCC.mkDerivation rec { + pname = "atlassian-bamboo"; + version = "8.1.3"; + + src = fetchurl { + url = "https://product-downloads.atlassian.com/software/bamboo/downloads/atlassian-bamboo-${version}.tar.gz"; + sha256 = "sha256-M406audmwCS4SRPj8oYxZ+tBpt9bGoOsA3+9WwdZ1fw="; + }; + + buildPhase = '' + echo "bamboo.home=/run/bamboo/home" > atlassian-bamboo/WEB-INF/classes/bamboo-init.properties + mv conf/server.xml conf/server.xml.dist + ln -sf /run/atlassian-bamboo/server.xml conf/server.xml + rm -r logs; ln -sf /run/atlassian-bamboo/logs/ . + rm -r temp; ln -sf /run/atlassian-bamboo/temp/ . + rm -r work; ln -sf /run/atlassian-bamboo/work/ . + '' + lib.optionalString withMysql '' + cp -v ${mysql_jdbc}/share/java/*jar atlassian-bamboo/lib/ + ''; + + installPhase = '' + cp -rva . $out + patchShebangs $out/bin + ''; + + meta = with lib; { + description = "Bamboo Data Center is a continuous delivery server."; + homepage = "https://www.atlassian.com/software/bamboo"; + license = with licenses; [ unfree ]; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index a4b74c25296d..7880c529c733 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.20.1"; + version = "8.22.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0jygjl5irmnlmc4m2y76b5vj1igyw5ax39gygjzbhwy41zah9p4z"; + sha256 = "sha256-swEq8g/A1Ok1P7JtceUDId7kG0GRtBPGblY09xt81Ys="; }; buildPhase = '' diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 79f17f96b5d9..b4b8b410e553 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.0.2"; + version = "1.0.3"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-aI5uxfMR+UpwxbUsJNNYYjqVX2epk60JbqWHRhB4v7I="; + sha256 = "sha256-VApcTYARC6NaVmwXgpzW8xRE23refGudBgPsyq7Ypig="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 9da7d7e948eb..5c5fec3d892a 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -1,66 +1,39 @@ { lib, stdenv, fetchurl, fetchpatch, flex, bison, readline, libssh, nixosTests }: -with lib; +stdenv.mkDerivation rec { + pname = "bird"; + version = "2.0.9"; -let - - generic = { version, sha256, enableIPv6 ? false }: - stdenv.mkDerivation rec { - pname = "bird"; - inherit version; - - src = fetchurl { - inherit sha256; - url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; - }; - - nativeBuildInputs = [ flex bison ]; - buildInputs = [ readline libssh ]; - - patches = [ - (./. + "/dont-create-sysconfdir-${builtins.substring 0 1 version}.patch") - ] - ++ optional (lib.versionOlder version "2") - # https://github.com/BIRD/bird/pull/4 - (fetchpatch { - url = "https://github.com/BIRD/bird/commit/fca9ab48e3823c734886f47156a92f6b804c16e9.patch"; - sha256 = "1pnndc3n56lqqcy74ln0w5kn3i9rbzsm2dqiyp1qw7j33dpkln1b"; - }) - ; - - CPP="${stdenv.cc.targetPrefix}cpp -E"; - - configureFlags = [ - "--localstatedir=/var" - ] ++ optional enableIPv6 "--enable-ipv6"; - - passthru.tests = nixosTests.bird; - - meta = { - description = "BIRD Internet Routing Daemon"; - homepage = "http://bird.network.cz"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fpletz globin ]; - platforms = platforms.linux; - }; - }; - -in - -{ - bird = generic { - version = "1.6.8"; - sha256 = "1ch0pkkhd7axdjlvhprynh9q08x0nm984nvkm1cjb7gm5rfsnqbc"; + src = fetchurl { + sha256 = "sha256-dnhrvN7TBh4bsiGwEfLMACIewGPenNoASn2bBhoJbV4="; + url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; }; - bird6 = generic { - version = "1.6.8"; - sha256 = "1ch0pkkhd7axdjlvhprynh9q08x0nm984nvkm1cjb7gm5rfsnqbc"; - enableIPv6 = true; - }; + nativeBuildInputs = [ flex bison ]; + buildInputs = [ readline libssh ]; - bird2 = generic { - version = "2.0.8"; - sha256 = "1xp7f0im1v8pqqx3xqyfkd1nsxk8vnbqgrdrwnwhg8r5xs1xxlhr"; + patches = [ + ./dont-create-sysconfdir-2.patch + (fetchurl { + url = "https://gitlab.nic.cz/labs/bird/-/commit/fcb4dd0c831339c4374ace17d8f2ae6ebfeed279.patch"; + sha256 = "sha256-PEgpRnOGLa1orHJDEHlblnVhBVv7XOKPR70M1wUMxMQ="; + }) + ]; + + CPP="${stdenv.cc.targetPrefix}cpp -E"; + + configureFlags = [ + "--localstatedir=/var" + "--runstatedir=/run/bird" + ]; + + passthru.tests = nixosTests.bird; + + meta = with lib; { + description = "BIRD Internet Routing Daemon"; + homepage = "http://bird.network.cz"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fpletz globin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/bird/dont-create-sysconfdir-1.patch b/pkgs/servers/bird/dont-create-sysconfdir-1.patch deleted file mode 100644 index 8f62670aee93..000000000000 --- a/pkgs/servers/bird/dont-create-sysconfdir-1.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- a/tools/Makefile.in -+++ b/tools/Makefile.in -@@ -68,2 +68,2 @@ - install: all -- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir) -+ $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 475541231b16..4d0c07b0bf1f 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { sha256 = "1jb195chy3kbspmv9vyg7llw6kgykkmvz3znd97mxf24f4q622jv"; }; - vendorSha256 = "0d17qaqn33wi7lzw4hlym56d9v4qnmvs6plpm5jiby2g5yckq0mz"; + vendorSha256 = "1w9c0qzah2f9rbjdxqajwrfkia25cwbn30gidviaid3b7ddpd7r8"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index b29f9ca9e8e0..3977521a6f52 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -1,24 +1,24 @@ -{ lib, stdenv, fetchgit, libusb1, pkg-config, pmutils, udev} : +{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config, pmutils, udev} : let - -version = "2.1.1"; -daemonlib = fetchgit { - url = "https://github.com/Tinkerforge/daemonlib.git"; - rev = "refs/tags/brickd-${version}"; - sha256 = "097kaz7d0rzg0ijvcna3y620k3m5fgxpqsac5gbhah8pd7vlj1a4"; + version = "2.1.1"; + daemonlib = fetchFromGitHub { + owner = "Tinkerforge"; + repo = "daemonlib"; + rev = "brickd-${version}"; + sha256 = "sha256-0HhuC4r1S4NJa2FSJa7+fNCfcoRTBckikYbGSE+2FbE="; }; - in stdenv.mkDerivation { pname = "brickd"; inherit version; - src = fetchgit { - url = "git://github.com/Tinkerforge/brickd.git"; - rev = "refs/tags/v${version}"; - sha256 = "0m2q01sbgf8z4559jpr6k3jivb8x98vxv1fhgx8nfcjbwz1q83gb"; + src = fetchFromGitHub { + owner = "Tinkerforge"; + repo = "brickd"; + rev = "v${version}"; + sha256 = "sha256-6w2Ew+dLMmdRf9CF3TdKHa0d5ZgmX5lKIR+5t3QAWFQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index a317925d228d..f6cb86e409c7 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "calibre-web"; - version = "0.6.15"; + version = "0.6.16"; src = fetchFromGitHub { owner = "janeczku"; repo = "calibre-web"; rev = version; - sha256 = "02caq07rzx23iad13wxg8g9z0z77f5ycdrav6fp7z5rl1wi0yc3r"; + sha256 = "sha256-vRnzsV9pubAmyVSxZpBK+mD9Bkbt6BQYo5S0Jsl26Ns="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index be067e477a83..793ee917966c 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "clickhouse"; - version = "21.8.12.29"; + version = "22.3.2.2"; broken = stdenv.buildPlatform.is32bit; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685 @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "ClickHouse"; rev = "v${version}-lts"; fetchSubmodules = true; - sha256 = "1qqacb7v7mhr9k162yll8mcbh0cxa347f5hypz0a8l54v1dz5fyl"; + sha256 = "0rhzgm0gvwpx4h5xyr7y393y7s9slcr4a7grw9316f5m70frxg2v"; }; nativeBuildInputs = [ cmake libtool llvm-bintools ninja ]; @@ -37,8 +37,6 @@ stdenv.mkDerivation rec { --replace 'git rev-parse --show-toplevel' '$src' substituteInPlace utils/check-style/check-ungrouped-includes.sh \ --replace 'git rev-parse --show-toplevel' '$src' - substituteInPlace utils/generate-ya-make/generate-ya-make.sh \ - --replace 'git rev-parse --show-toplevel' '$src' substituteInPlace utils/list-licenses/list-licenses.sh \ --replace 'git rev-parse --show-toplevel' '$src' substituteInPlace utils/check-style/check-style \ diff --git a/pkgs/servers/computing/slurm-spank-stunnel/default.nix b/pkgs/servers/computing/slurm-spank-stunnel/default.nix new file mode 100644 index 000000000000..9fdd5625f78f --- /dev/null +++ b/pkgs/servers/computing/slurm-spank-stunnel/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, slurm } : + +stdenv.mkDerivation rec { + pname = "slurm-spank-stunnel"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "stanford-rc"; + repo = "slurm-spank-stunnel"; + rev = version; + sha256 = "15cpd49ccvzsmmr3gk8svm2nz461rvs4ybczckyf4yla0xzp06gj"; + }; + + buildPhase = '' + gcc -I${slurm.dev}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c + ''; + + installPhase = '' + mkdir -p $out/lib $out/etc/slurm/plugstack.conf.d + install -m 755 stunnel.so $out/lib + install -m 644 plugstack.conf $out/etc/slurm/plugstack.conf.d/stunnel.conf.example + ''; + + meta = with lib; { + homepage = "https://github.com/stanford-rc/slurm-spank-stunnel"; + description = "Plugin for SLURM for SSH tunneling and port forwarding support"; + platforms = platforms.linux; + license = licenses.gpl3Only; + maintainers = with maintainers; [ markuskowa ]; + }; +} diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index c1e092dedcb8..1179e86351a4 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "21.08.5.1"; + version = "21.08.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. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-2ctJnCZCziPnfWeDNvvcE0tPGVdhzjjhqMWJhWhitGo="; + sha256 = "1pdj2nxxky2g9j0y5h6f7fvpypbh0a4g76z90115yr770yf4g2hz"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 4a5846d01160..fe60516b3e58 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -3,34 +3,17 @@ stdenv.mkDerivation rec { pname = "confluent-platform"; - version = "5.3.0"; - scalaVersion = "2.12"; + version = "7.0.1"; src = fetchurl { - url = "http://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}-${scalaVersion}.tar.gz"; - sha256 = "14cilq63fib5yvj40504aj6wssi7xw4f7c2jadlzdmdxzh4ixqmp"; - }; - - confluentCli = fetchFromGitHub { - owner = "confluentinc"; - repo = "confluent-cli"; - rev = "v${version}"; - sha256 = "18yvp56b8l074qfkgr4afirgd43g8b023n9ija6dnk6p6dib1f4j"; + url = "https://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}.tar.gz"; + sha256 = "Q0/A/3M2tn530/+o1RpcgNsPKFQq6YJQnhgysRlpVfU="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre bash ]; installPhase = '' - cp -R $confluentCli confluent-cli - chmod -R +w confluent-cli - - ( - export CONFLUENT_HOME=$PWD - cd confluent-cli - make install - ) - mkdir -p $out cp -R bin etc share src $out rm -rf $out/bin/windows @@ -56,7 +39,7 @@ stdenv.mkDerivation rec { homepage = "https://www.confluent.io/"; description = "Confluent event streaming platform based on Apache Kafka"; license = licenses.asl20; - maintainers = [ maintainers.offline ]; + maintainers = with maintainers; [ zoedsoupe ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 81389064d8e6..240769bfe093 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.11.2"; + version = "1.11.4"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-Ql8MAo4OVvOIOkFbeOLHqzloWe3I8HviUIfWrvo6INk="; + sha256 = "sha256-dQwJ3HzzYxolGrjgHXBElDZO65uXJKEv8UH5sYZ4swc="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256-BRLDV/9dXS82V8B0dxExiSMBq2MkIfC5//2tOrcZY7c="; + vendorSha256 = "sha256-VB7agtH6V7mJU689bFXuhi82qqzGxY16vFOPFBd/DQc="; doCheck = false; diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index df73fb9f48e9..4df8a547dff5 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, kronosnet, nss, nspr, libqb -, dbus, rdma-core, libstatgrab, net-snmp +, systemd, dbus, rdma-core, libstatgrab, net-snmp , enableDbus ? false , enableInfiniBandRdma ? false , enableMonitoring ? false @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ - kronosnet nss nspr libqb + kronosnet nss nspr libqb systemd.dev ] ++ optional enableDbus dbus ++ optional enableInfiniBandRdma rdma-core ++ optional enableMonitoring libstatgrab @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { "--with-logdir=/var/log/corosync" "--enable-watchdog" "--enable-qdevices" + # allows Type=notify in the systemd service + "--enable-systemd" ] ++ optional enableDbus "--enable-dbus" ++ optional enableInfiniBandRdma "--enable-rdma" ++ optional enableMonitoring "--enable-monitoring" @@ -63,6 +65,10 @@ stdenv.mkDerivation rec { --prefix PATH ":" "$out/sbin:${libqb}/sbin" ''; + passthru.tests = { + inherit (nixosTests) pacemaker; + }; + meta = { homepage = "http://corosync.org/"; description = "A Group Communication System with features for implementing high availability within applications"; diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 3d92b2cd4bac..c17c301421fd 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.5.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "1HCVWSxXOR2syN+dLDSvrNzYHTj/vXZRHkXhU0f3m1k="; + sha256 = "sha256-R0xGsngNk8osBh3vRUeYxmEgbbNa+wKOihRjOU40D48="; }; - vendorSha256 = "sha256-RqEt0RAsKWKy6NvMzulqY56nZ7fIxgJkgN/WpEZ3F2I="; + vendorSha256 = "sha256-0Y/RVRWZ0osU/kEcf+Y8TH8K2rmxFmQSqMMNHoRIugo="; passthru.tests = { inherit (nixosTests) dendrite; diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 16dc5f8bafd6..c93f7316301b 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dex"; - version = "2.30.0"; + version = "2.31.0"; src = fetchFromGitHub { owner = "dexidp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z/X9Db57eNUJdjzLCJNIW3lCRw05JP2TQ43PqKO6CiI="; + sha256 = "sha256-tr7rs2ymHpMEtNwvLhgEzp94wO/k/oY814NS0N4ONsg="; }; - vendorSha256 = "sha256-ksN/1boBQVhevlDseVZsGUWL+Bwy4AMgGNdOPgsNNxk="; + vendorSha256 = "sha256-l+/qjYokg5zHAFkKxtkdX49HqVW6kfz7OHqs6SRKDYg="; subPackages = [ "cmd/dex" diff --git a/pkgs/servers/dict/wiktionary/default.nix b/pkgs/servers/dict/wiktionary/default.nix index 98e223010480..9ebbfb767391 100644 --- a/pkgs/servers/dict/wiktionary/default.nix +++ b/pkgs/servers/dict/wiktionary/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dict-db-wiktionary"; - version = "20210920"; + version = "20220301"; src = fetchurl { url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; - sha256 = "UeufbpSpRL+JrU3SkhxzWJncEsrM1es88grRmFwGABk="; + sha256 = "Gobilm9Rlb7qtZU+hlsYOl1/BAjj/MtNp5z2GQx8NN8="; }; # script in nixpkgs does not support python2 diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 19b3a25de595..9dbaa744b30f 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, fetchpatch , perl, pkg-config -, libcap, libtool, libxml2, openssl, libuv +, libcap, libtool, libxml2, openssl, libuv, nghttp2, jemalloc , enableGSSAPI ? true, libkrb5 , enablePython ? false, python3 , enableSeccomp ? false, libseccomp @@ -9,22 +9,21 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.16.16"; + version = "9.18.1"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bJE5Aq34eOfcXiKc6pT678nUD0R3WjAhPt0Ihg92HXs="; + sha256 = "sha256-V8ev2HFpTWFctN77HBvW7QIzUJQ9dFhBTbjUk+9WBCc="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; patches = [ ./dont-keep-configure-flags.patch - ./remove-mkdir-var.patch ]; nativeBuildInputs = [ perl pkg-config ]; - buildInputs = [ libtool libxml2 openssl libuv ] + buildInputs = [ libtool libxml2 openssl libuv nghttp2 jemalloc ] ++ lib.optional stdenv.isLinux libcap ++ lib.optional enableSeccomp libseccomp ++ lib.optional enableGSSAPI libkrb5 @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { "--with-aes" ] ++ lib.optional stdenv.isLinux "--with-libcap=${libcap.dev}" ++ lib.optional enableSeccomp "--enable-seccomp" - ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}" + ++ lib.optional enableGSSAPI "--with-gssapi=${libkrb5.dev}/bin/krb5-config" ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "BUILD_CC=$(CC_FOR_BUILD)"; postInstall = '' @@ -75,10 +74,10 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) bind; }; meta = with lib; { - homepage = "https://www.isc.org/downloads/bind/"; + homepage = "https://www.isc.org/bind/"; description = "Domain name server"; license = licenses.mpl20; - + changelog = "https://downloads.isc.org/isc/bind9/cur/${lib.versions.majorMinor version}/CHANGES"; maintainers = with maintainers; [ globin ]; platforms = platforms.unix; diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch index ceb887e678eb..b1677da434f5 100644 --- a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch +++ b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch @@ -1,37 +1,39 @@ -diff -ru a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h ---- a/bin/named/include/named/globals.h 2020-09-24 17:43:49.398977491 +0200 -+++ b/bin/named/include/named/globals.h 2020-09-24 17:44:36.826590553 +0200 -@@ -69,7 +69,9 @@ - EXTERN const char *named_g_product INIT(PRODUCT); - EXTERN const char *named_g_description INIT(DESCRIPTION); - EXTERN const char *named_g_srcid INIT(SRCID); +diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h +index 82b632ef04..dedfd4d33b 100644 +--- a/bin/named/include/named/globals.h ++++ b/bin/named/include/named/globals.h +@@ -69,7 +69,9 @@ EXTERN const char *named_g_version INIT(PACKAGE_VERSION); + EXTERN const char *named_g_product INIT(PACKAGE_NAME); + EXTERN const char *named_g_description INIT(PACKAGE_DESCRIPTION); + EXTERN const char *named_g_srcid INIT(PACKAGE_SRCID); +#if 0 - EXTERN const char *named_g_configargs INIT(CONFIGARGS); + EXTERN const char *named_g_configargs INIT(PACKAGE_CONFIGARGS); +#endif - EXTERN const char *named_g_builder INIT(BUILDER); - EXTERN in_port_t named_g_port INIT(0); - EXTERN isc_dscp_t named_g_dscp INIT(-1); -diff -ru a/bin/named/main.c b/bin/named/main.c ---- a/bin/named/main.c 2020-09-24 17:43:49.399977504 +0200 -+++ b/bin/named/main.c 2020-09-24 17:44:24.102426273 +0200 -@@ -506,7 +506,9 @@ + EXTERN const char *named_g_builder INIT(PACKAGE_BUILDER); + EXTERN in_port_t named_g_port INIT(0); + EXTERN in_port_t named_g_tlsport INIT(0); +diff --git a/bin/named/main.c b/bin/named/main.c +index 9ad2d0e277..9729a2b3fc 100644 +--- a/bin/named/main.c ++++ b/bin/named/main.c +@@ -481,7 +481,9 @@ printversion(bool verbose) { } printf("running on %s\n", named_os_uname()); +#if 0 - printf("built by %s with %s\n", named_g_builder, named_g_configargs); + printf("built by %s with %s\n", PACKAGE_BUILDER, PACKAGE_CONFIGARGS); +#endif #ifdef __clang__ printf("compiled by CLANG %s\n", __VERSION__); #else /* ifdef __clang__ */ -@@ -1102,9 +1104,11 @@ +@@ -1027,9 +1029,11 @@ setup(void) { NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s", named_os_uname()); +#if 0 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "built with %s", - named_g_configargs); + PACKAGE_CONFIGARGS); +#endif isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, diff --git a/pkgs/servers/dns/bind/remove-mkdir-var.patch b/pkgs/servers/dns/bind/remove-mkdir-var.patch deleted file mode 100644 index d0dcd580c20a..000000000000 --- a/pkgs/servers/dns/bind/remove-mkdir-var.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -53,8 +53,7 @@ docclean manclean maintainer-clean:: - doc man:: ${MANOBJS} - - installdirs: -- $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir} \ -- ${DESTDIR}${localstatedir}/run ${DESTDIR}${sysconfdir} -+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir} ${DESTDIR}${sysconfdir} - $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1 - - install:: isc-config.sh installdirs diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 09991c781452..66298866dbcf 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -2,23 +2,30 @@ buildGoModule rec { pname = "coredns"; - version = "1.8.6"; + version = "1.9.1"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "sha256-0R/HqwZA/ZK9f0i01anIjwnW0JCfsbQpTBMF68CNRUI="; + sha256 = "sha256-1lJrbazEgsRHI10qIgA9KgglsxpnMIdxEWpu6RiJ0pQ="; }; - vendorSha256 = "sha256-MiTg1GHeqNJcQSaqWXW/nW4ZdNzoLTgNlLbbn1bm7aA="; + vendorSha256 = "sha256-ueEuduZ76FUs2wE8oiHGON9+s91jaHhS6gOKr7MNh8g="; - doCheck = false; + postPatch = '' + substituteInPlace test/file_cname_proxy_test.go \ + --replace "TestZoneExternalCNAMELookupWithProxy" \ + "SkipZoneExternalCNAMELookupWithProxy" + + substituteInPlace test/readme_test.go \ + --replace "TestReadme" "SkipReadme" + ''; meta = with lib; { homepage = "https://coredns.io"; description = "A DNS server that runs middleware"; license = licenses.asl20; - maintainers = with maintainers; [ rushmorem rtreffer deltaevo ]; + maintainers = with maintainers; [ rushmorem rtreffer deltaevo superherointj ]; }; } diff --git a/pkgs/servers/dns/https-dns-proxy/default.nix b/pkgs/servers/dns/https-dns-proxy/default.nix index c32d3eca2263..5e2efae8a287 100644 --- a/pkgs/servers/dns/https-dns-proxy/default.nix +++ b/pkgs/servers/dns/https-dns-proxy/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "https-dns-proxy"; # there are no stable releases (yet?) - version = "unstable-20200419"; + version = "unstable-2021-03-29"; src = fetchFromGitHub { owner = "aarond10"; repo = "https_dns_proxy"; - rev = "79fc7b085e3b1ad64c8332f7115dfe2bf5f1f3e4"; - sha256 = "1cdfswfjby4alp6gy7yyjm76kfyclh5ax0zadnqs2pyigg9plh0b"; + rev = "bbd9ef272dcda3ead515871f594768af13192af7"; + sha256 = "sha256-r+IpDklI3vITK8ZlZvIFm3JdDe2r8DK2ND3n1a/ThrM="; }; nativeBuildInputs = [ cmake gtest ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 1938e9c02b66..80939b8df45d 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.1.5"; + version = "3.1.6"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "2da6e50b0662297d55f80e349568224e07fe88cad20bee1d2e22f54bb32da064"; + sha256 = "e9ba1305d750dc08fb08687aec7ac55737ca073deaa0b867c884e0c0f2fdb753"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 4d12a6d7172a..d47b5a3e6a3c 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.4.4"; + version = "5.5.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "588964319e943679d391cc9c886d40ef858ecd9b33ae160023b4e2b5182b2cea"; + sha256 = "4e6f48c74d955f143d603f6072670cb41ab9acdd95d4455d6e74b6908562c55a"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index e9f030dac785..251e4424578c 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.9"; + version = "4.4.0"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-UxVJ8JKJ7L0Fgp4UuzRWMpTYW57d4sYToA9ZevITXo0="; + sha256 = "sha256-z81v3Zk0TKWn73wpQMJBvO9HH8MlK6PcvUxX4GOOiDY="; }; prePatch = '' diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index d106e154277a..7b3b81ace277 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "1wmwkw8x39rall3673cngz0vpgc1z5vx29qy5r6mkg5fk29ma1nz"; + sha256 = "1sqwasqxz4svn5rckrwr05gzk7qzdhzzzjr1l2l7xa44if8011bv"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix new file mode 100644 index 000000000000..ff057b48bd54 --- /dev/null +++ b/pkgs/servers/dns/pdns/default.nix @@ -0,0 +1,59 @@ +{ lib, stdenv, fetchurl, pkg-config, nixosTests +, boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd +, mariadb-connector-c, postgresql, lua, openldap, geoip, curl, unixODBC, lmdb, tinycdb +}: + +stdenv.mkDerivation rec { + pname = "powerdns"; + version = "4.6.1"; + + src = fetchurl { + url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; + sha256 = "sha256-eRKxSIfWKEUYX3zktH21gOqnuLiX3LHJVV3+D6xe+uM="; + }; + # redact configure flags from version output to reduce closure size + patches = [ ./version.patch ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + boost mariadb-connector-c postgresql lua openldap sqlite protobuf geoip + libyamlcpp libsodium curl unixODBC openssl systemd lmdb tinycdb + ]; + + configureFlags = [ + "--disable-silent-rules" + "--enable-dns-over-tls" + "--enable-unit-tests" + "--enable-reproducible" + "--enable-tools" + "--enable-ixfrdist" + "--enable-systemd" + "--with-libsodium" + "--with-sqlite3" + "--with-libcrypto=${openssl.dev}" + ]; + + # nix destroy with-modules arguments, when using configureFlags + preConfigure = '' + configureFlagsArray+=( + "--with-modules=" + "--with-dynmodules=bind geoip gmysql godbc gpgsql gsqlite3 ldap lmdb lua2 pipe remote tinydns" + ) + ''; + + enableParallelBuilding = true; + doCheck = true; + + passthru.tests = { + nixos = nixosTests.powerdns; + }; + + meta = with lib; { + description = "Authoritative DNS server"; + homepage = "https://www.powerdns.com"; + platforms = platforms.unix; + broken = stdenv.isDarwin; + license = licenses.gpl2; + maintainers = with maintainers; [ mic92 disassembler nickcao ]; + }; +} diff --git a/pkgs/servers/dns/pdns/version.patch b/pkgs/servers/dns/pdns/version.patch new file mode 100644 index 000000000000..185d07028833 --- /dev/null +++ b/pkgs/servers/dns/pdns/version.patch @@ -0,0 +1,13 @@ +diff --git a/pdns/version.cc b/pdns/version.cc +index d8f5d40..1368481 100644 +--- a/pdns/version.cc ++++ b/pdns/version.cc +@@ -155,7 +155,7 @@ void showBuildConfiguration() + #ifdef PDNS_CONFIG_ARGS + #define double_escape(s) #s + #define escape_quotes(s) double_escape(s) +- g_log<= 4.4.0 - name = "gcc-10_undefined-reference.diff"; - url = "https://github.com/PowerDNS/pdns/commit/05c9dd77b28.diff"; - sha256 = "1m9szbi02h9kcabgw3kb8k9qrb54d34z0qzizrlfiw3hxs6c2zql"; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip - libyamlcpp libsodium curl unixODBC openssl systemd - ]; - - # nix destroy with-modules arguments, when using configureFlags - preConfigure = '' - configureFlagsArray=( - "--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua2 pipe random remote" - --with-sqlite3 - --with-libcrypto=${openssl.dev} - --with-libsodium - --enable-tools - --disable-dependency-tracking - --disable-silent-rules - --enable-reproducible - --enable-unit-tests - --enable-systemd - ) - ''; - - enableParallelBuilding = true; - doCheck = true; - - passthru.tests = { - nixos = nixosTests.powerdns; - }; - - meta = with lib; { - description = "Authoritative DNS server"; - homepage = "https://www.powerdns.com"; - platforms = platforms.unix; - broken = stdenv.isDarwin; - license = licenses.gpl2; - maintainers = with maintainers; [ mic92 disassembler ]; - }; -} diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/servers/domoticz/default.nix index 883b80776957..2ed4f5f26536 100644 --- a/pkgs/servers/domoticz/default.nix +++ b/pkgs/servers/domoticz/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "domoticz"; - version = "2021.1"; + version = "2022.1"; src = fetchFromGitHub { owner = "domoticz"; repo = pname; rev = version; - sha256 = "03s1fx2ilhiq47p99c6iln1fi0rhdcxxsrv1zaww7f7bc744vzbk"; + sha256 = "sha256-wPSmpk3YeA+dNjx2mBdRkP2Mx/1cfrQOMLV5H5Ti7qU="; fetchSubmodules = true; }; diff --git a/pkgs/servers/endlessh-go/default.nix b/pkgs/servers/endlessh-go/default.nix new file mode 100644 index 000000000000..eae3cd6a8d51 --- /dev/null +++ b/pkgs/servers/endlessh-go/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "endlessh-go"; + version = "20220308.1"; + + src = fetchFromGitHub { + owner = "shizunge"; + repo = "endlessh-go"; + rev = version; + hash = "sha256-U+h/WmTVwwUIBEOiNa/EKS6HvkeoGNmP3NpeP1fcqYw="; + }; + + vendorSha256 = "sha256-h/DpbXO+LUsB9NOAXUfNx3VOfEsiolfBEMBrAqVlU3A="; + + proxyVendor = true; + + meta = with lib; { + description = "An implementation of endlessh exporting Prometheus metrics"; + homepage = "https://github.com/shizunge/endlessh-go"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix index 95ea71a4d3d9..e340d1ff2a50 100644 --- a/pkgs/servers/etebase/default.nix +++ b/pkgs/servers/etebase/default.nix @@ -11,14 +11,14 @@ in buildPythonPackage rec { pname = "etebase-server"; - version = "0.7.0"; + version = "0.8.3"; format = "pyproject"; src = fetchFromGitHub { owner = "etesync"; repo = "server"; rev = "v${version}"; - sha256 = "1r2a7ki9w2h3l6rwqa3fzxjlqfj2lbgfrm8lynjhvcdv02s5abbi"; + sha256 = "sha256-rPs34uzb5veiOw74SACLrDm4Io0CYH9EL9IuV38CkPY="; }; patches = [ ./secret.patch ]; @@ -30,6 +30,7 @@ buildPythonPackage rec { django-cors-headers djangorestframework drf-nested-routers + fastapi msgpack psycopg2 pycparser diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index eee65c3a5d1f..0efadc6524a9 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://nginx.localdomain.pl/wiki/FcgiWrap"; + homepage = "https://github.com/gnosek/fcgiwrap"; description = "Simple server for running CGI applications over FastCGI"; maintainers = with maintainers; [ ]; platforms = with platforms; linux; diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix deleted file mode 100644 index 4fb6f44b4547..000000000000 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl }: - -# !!! Duplication: this package is almost exactly the same as `bsd-fingerd'. - -stdenv.mkDerivation rec { - pname = "bsd-fingerd"; - version = "0.17"; - - src = fetchurl { - url = "mirror://metalab/system/network/finger/bsd-finger-${version}.tar.gz"; - sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; - }; - - NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; - - patches = [ ./ubuntu-0.17-9.patch ]; - - preBuild = "cd fingerd"; - - preInstall = "mkdir -p $out/man/man8 $out/sbin "; - - meta = with lib; { - platforms = platforms.linux; - license = licenses.bsdOriginal; - }; -} diff --git a/pkgs/servers/fingerd/bsd-fingerd/ubuntu-0.17-9.patch b/pkgs/servers/fingerd/bsd-fingerd/ubuntu-0.17-9.patch deleted file mode 100644 index 80968d587ba9..000000000000 --- a/pkgs/servers/fingerd/bsd-fingerd/ubuntu-0.17-9.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- bsd-finger-0.17.orig/fingerd/fingerd.8 -+++ bsd-finger-0.17/fingerd/fingerd.8 -@@ -36,10 +36,10 @@ - .Dt FINGERD 8 - .Os "Linux NetKit (0.17)" - .Sh NAME --.Nm fingerd -+.Nm in.fingerd - .Nd remote user information server - .Sh SYNOPSIS --.Nm fingerd -+.Nm in.fingerd - .Op Fl wulf - .Op Fl pL Ar path - .Op Fl t Ar timeout -@@ -61,7 +61,7 @@ - banner - which also shows some informations (e.g. uptime, operating system name and - release) about the system the --.Nm fingerd -+.Nm in.fingerd - is running on. Some sites may consider this a security risk as it - gives out information that may be useful to crackers. - .Pp -@@ -85,7 +85,7 @@ - .Pp - The - .Fl p --option allows specification of an alternate location for fingerd to find -+option allows specification of an alternate location for in.fingerd to find - the - .Dq finger - program. The -@@ -97,7 +97,7 @@ - option specifies the time to wait for a request before closing the - connection. A value of 0 waits forever. The default is 60 seconds. - .Pp --Options to fingerd should be specified in -+Options to in.fingerd should be specified in - .Pa /etc/inetd.conf . - .Pp - The finger protocol consists mostly of specifying command arguments. -@@ -105,12 +105,12 @@ - .Xr inetd 8 - .Dq super-server - runs --.Nm fingerd -+.Nm in.fingerd - for - .Tn TCP - requests received on port 79. - Once connected --.Nm fingerd -+.Nm in.fingerd - reads a single command line - terminated by a - .Aq Tn CRLF ---- bsd-finger-0.17.orig/fingerd/fingerd.c -+++ bsd-finger-0.17/fingerd/fingerd.c -@@ -55,6 +55,7 @@ - #include - #include - #include -+#include - - #include "pathnames.h" - #include "../version.h" diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 7924f6e6ab4a..5348862ed6d5 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -54,13 +54,13 @@ let base = { }); firebird_3 = stdenv.mkDerivation (base // rec { - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "FirebirdSQL"; repo = "firebird"; - rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-8nGan10qjW8dFF89BL/tUWtwMGhahBiODbOqRrHSrbs="; + rev = "v${version}"; + sha256 = "sha256-l1V3CGxTybPY8pl6WhsExqdWJLiYsOv5BCrU/iD+I7k="; }; buildInputs = base.buildInputs ++ [ zlib libtommath ]; @@ -69,13 +69,13 @@ let base = { }); firebird_4 = stdenv.mkDerivation (base // rec { - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "FirebirdSQL"; repo = "firebird"; rev = "v${version}"; - sha256 = "sha256-Pc3hUAhXgpa6VOkjidfh/vS/60Gtjenid8nHnIH7s0E="; + sha256 = "sha256-0XUu1g/VTrklA3vCpX6HWr7sdW2eQupnelpFNSGcouM="; }; buildInputs = base.buildInputs ++ [ zlib unzip libtommath libtomcrypt ]; diff --git a/pkgs/servers/fishnet/Cargo.lock.patch b/pkgs/servers/fishnet/Cargo.lock.patch new file mode 100644 index 000000000000..7929eeee088e --- /dev/null +++ b/pkgs/servers/fishnet/Cargo.lock.patch @@ -0,0 +1,13 @@ +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/pkgs/servers/fishnet/default.nix b/pkgs/servers/fishnet/default.nix index 784a5525133c..10695e54781f 100644 --- a/pkgs/servers/fishnet/default.nix +++ b/pkgs/servers/fishnet/default.nix @@ -6,21 +6,21 @@ }: let - nnueFile = "nn-6762d36ad265.nnue"; + nnueFile = "nn-13406b1dcbe0.nnue"; nnue = fetchurl { url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; - sha256 = "0727dsxfpns9fkyir95fybibqmigk5h45k154b2c5rk5s9md6qk7"; + sha256 = "sha256-E0BrHcvgo238XgfaUdjbOLekXX2kMHjsJadiTCuDI28="; }; in rustPlatform.buildRustPackage rec { pname = "fishnet"; - version = "2.4.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "niklasf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1Gl2vJFn9yVYH62yBJefAOBX/jJaFAdSZj2Lj3imcps="; + sha256 = "sha256-nVRG60sSpTqfqhCclvWoeyHR0+oO1Jn1PgftigDGq5c="; fetchSubmodules = true; }; @@ -29,7 +29,13 @@ rustPlatform.buildRustPackage rec { cp -v '${nnue}' 'Fairy-Stockfish/src/${nnueFile}' ''; - cargoSha256 = "sha256-/s7Yyi2FUh+EDvgaHLgZ/FA6kk2FQrZr3L3B76fqTuc="; + cargoSha256 = "sha256-BJK7M/pjHRj74xoeciavhkK2YRpeogkELIuXetX73so="; + + # TODO: Cargo.lock is out of date, so fix it. Likely not necessary anymore in + # the next update. + cargoPatches = [ + ./Cargo.lock.patch + ]; meta = with lib; { description = "Distributed Stockfish analysis for lichess.org"; diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 2a94008a4e9a..98fd6ca79813 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -123,7 +123,7 @@ let homepage = "https://www.foundationdb.org"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ thoughtpolice ]; + maintainers = with maintainers; [ thoughtpolice lostnet ]; }; }; in makeFdb diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index b3a876546e78..69e4ad9bd018 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -2,7 +2,7 @@ , lib, fetchurl, fetchpatch, fetchFromGitHub , cmake, ninja, which, findutils, m4, gawk -, python2, python3, openjdk, mono, libressl, boost +, python2, python3, openjdk, mono, libressl, boost168 }@args: let @@ -10,6 +10,7 @@ let cmakeBuild = import ./cmake.nix (args // { gccStdenv = gccStdenv; llvmPackages = llvmPackages; + boost = boost168; }); python3-six-patch = fetchpatch { diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 06ce536b18d1..3999d422d21d 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -1,28 +1,23 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, talloc, finger_bsd, perl -, openssl -, linkOpenssl? true -, openldap -, withLdap ? true -, sqlite -, withSqlite ? true -, libpcap -, withPcap ? true -, libcap -, withCap ? true -, libmemcached -, withMemcached ? false -, hiredis -, withRedis ? false -, libmysqlclient -, withMysql ? false -, json_c -, withJson ? false -, libyubikey -, withYubikey ? false -, collectd -, withCollectd ? false -, curl -, withRest ? false +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, bsd-finger +, perl +, talloc +, linkOpenssl? true, openssl +, withCap ? true, libcap +, withCollectd ? false, collectd +, withJson ? false, json_c +, withLdap ? true, openldap +, withMemcached ? false, libmemcached +, withMysql ? false, libmysqlclient +, withPcap ? true, libpcap +, withRedis ? false, hiredis +, withRest ? false, curl +, withSqlite ? true, sqlite +, withYubikey ? false, libyubikey }: assert withSqlite -> sqlite != null; @@ -36,49 +31,38 @@ assert withYubikey -> libyubikey != null; assert withCollectd -> collectd != null; assert withRest -> curl != null && withJson; -## TODO: include windbind optionally (via samba?) -## TODO: include oracle optionally -## TODO: include ykclient optionally - -with lib; stdenv.mkDerivation rec { pname = "freeradius"; - version = "3.0.21"; + version = "3.0.25"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "1bij07angf6ll6bq8lccd4fx1a1clf7k13kh5vbryh6lf7a19y9b"; + hash = "sha256-SIOmi7PO5GAlNZqXwWkc5lXour/W3DwCHQDhCaL/TBA="; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ openssl talloc finger_bsd perl ] - ++ optional withLdap openldap - ++ optional withSqlite sqlite - ++ optional withPcap libpcap - ++ optional withCap libcap - ++ optional withMemcached libmemcached - ++ optional withRedis hiredis - ++ optional withMysql libmysqlclient - ++ optional withJson json_c - ++ optional withYubikey libyubikey - ++ optional withCollectd collectd - ++ optional withRest curl; - + buildInputs = [ openssl talloc bsd-finger perl ] + ++ lib.optional withCap libcap + ++ lib.optional withCollectd collectd + ++ lib.optional withJson json_c + ++ lib.optional withLdap openldap + ++ lib.optional withMemcached libmemcached + ++ lib.optional withMysql libmysqlclient + ++ lib.optional withPcap libpcap + ++ lib.optional withRedis hiredis + ++ lib.optional withRest curl + ++ lib.optional withSqlite sqlite + ++ lib.optional withYubikey libyubikey; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - ] ++ optional (!linkOpenssl) "--with-openssl=no"; - - patches = lib.optional withRest (fetchpatch { - # Fix HTTP/2 in rest - url = "https://github.com/FreeRADIUS/freeradius-server/commit/6286520698a3cc4053b4d49eb0a61d9ba77632aa.patch"; - sha256 = "1ycvr3ql1mfkvzydnn4aiygnidicv2hgllppv37nb1p2pk02159g"; - }); + ] ++ lib.optional (!linkOpenssl) "--with-openssl=no"; postPatch = '' - substituteInPlace src/main/checkrad.in --replace "/usr/bin/finger" "${finger_bsd}/bin/finger" + substituteInPlace src/main/checkrad.in \ + --replace "/usr/bin/finger" "${bsd-finger}/bin/finger" ''; # By default, freeradius will generate Diffie-Hellman parameters and @@ -105,6 +89,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sheenobu willibutz fpletz lheckemann elseym ]; platforms = with platforms; linux; }; - } - +## TODO: include windbind optionally (via samba?) +## TODO: include oracle optionally +## TODO: include ykclient optionally diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index 015802ac31eb..6bedb469f4d4 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bftpd"; - version = "6.0"; + version = "6.1"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-t+YCys67drYKcD3GXxSVzZo4HTRZArIpA6EofeyPAlw="; + sha256 = "sha256-lyHQYU4aXQ/muAyaigStqO/ULL393SOelagFmuKDqm8="; }; preConfigure = '' diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix index 3aad0460b3fe..3a3517f4f230 100644 --- a/pkgs/servers/ftp/vsftpd/default.nix +++ b/pkgs/servers/ftp/vsftpd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libcap, openssl, pam }: +{ lib, stdenv, fetchurl, libcap, libseccomp, openssl, pam, nixosTests }: stdenv.mkDerivation rec { pname = "vsftpd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-JrYCrkVLC6bZnvRKCba54N+n9nIoEGc23x8njHC8kdM="; }; - buildInputs = [ libcap openssl pam ]; + buildInputs = [ libcap openssl libseccomp pam ]; patches = [ ./CVE-2015-1419.patch ]; @@ -30,10 +30,14 @@ stdenv.mkDerivation rec { "CC=${stdenv.cc.targetPrefix}cc" ]; - NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap"; + NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap -lseccomp"; enableParallelBuilding = true; + passthru = { + tests = { inherit (nixosTests) vsftpd; }; + }; + meta = with lib; { description = "A very secure FTP daemon"; license = licenses.gpl2; diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index 2c45d7c75a4c..ae198707ec59 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -1,17 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ lib, stdenv, nixosTests, fetchFromGitHub, fetchpatch, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.1.0"; + version = "3.2.3"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-miIMz4Lk4R5So96Ceqe1Fl5ozpf47qWq0GgtKFDDCCA="; + sha256 = "sha256-nkWk/0TIAHcYQjxbg0HnT+4S4Cinl22WfqHb9U6u5eI="; }; + cargoSha256 = "sha256-aF86QpizJ+lMNmN9DQKA9o1QZWZObyQ3v3+HmT/s02g="; - cargoSha256 = "sha256-NZpqCl37dZUvXmn4Q1Pvbz3LSxk1s0s5x1CBO0POA/4="; + patches = [ + # https://github.com/mbrubeck/agate/pull/143 + (fetchpatch { + name = "fix-port-collision.patch"; + url = "https://github.com/mbrubeck/agate/commit/2f5d7878ec9d0dd51762c4c7680fc9f825d8ecd5.patch"; + sha256 = "sha256-NEFmfb0y97O2W96YggD+MgcN7tlFEi9T4FNzLCND77s="; + }) + ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -23,6 +31,8 @@ rustPlatform.buildRustPackage rec { runHook postInstallCheck ''; + passthru.tests = { inherit (nixosTests) agate; }; + meta = with lib; { homepage = "https://github.com/mbrubeck/agate"; changelog = "https://github.com/mbrubeck/agate/blob/master/CHANGELOG.md"; diff --git a/pkgs/servers/gemini/gmid/default.nix b/pkgs/servers/gemini/gmid/default.nix index 803945c7a234..b6ccbd1de704 100644 --- a/pkgs/servers/gemini/gmid/default.nix +++ b/pkgs/servers/gemini/gmid/default.nix @@ -1,33 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, bison, libressl, libevent }: +{ lib, stdenv, fetchFromGitHub, bison, which, libressl, libevent }: stdenv.mkDerivation rec { pname = "gmid"; - version = "1.7.5"; + version = "1.8.1"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "sha256-BBd0AL5jRRslxzDnxcTZRR+8J5D23NAQ7mp9K+leXAQ="; + hash = "sha256-XNif164C5b5sVsZW7sy0id4qM/mJzg3RhoHbwJuJqDk="; }; - patches = [ - # Fix cross-compilation - (fetchpatch { - url = "https://github.com/omar-polo/gmid/commit/eb77afa8d308a2f4f422df2ff19f023b5b2cc591.patch"; - sha256 = "sha256-rTTZUpfXOg7X0Ad0Y9evyU7k+aVYpJ0t9SEkNA/sSdk="; - }) - ]; - - nativeBuildInputs = [ bison ]; + nativeBuildInputs = [ bison which ]; buildInputs = [ libressl libevent ]; - configurePhase = '' - runHook preConfigure - ./configure PREFIX=$out - runHook postConfigure - ''; + configureFlags = [ + "PREFIX=${placeholder "out"}" + ]; meta = with lib; { description = "Simple and secure Gemini server"; diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/servers/gemini/gmnisrv/default.nix index 8d8ad16e7849..81e1c17467cc 100644 --- a/pkgs/servers/gemini/gmnisrv/default.nix +++ b/pkgs/servers/gemini/gmnisrv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromSourcehut, pkg-config, openssl, mime-types, scdoc }: +{ stdenv, lib, fetchFromSourcehut, pkg-config, openssl, mailcap, scdoc }: stdenv.mkDerivation rec { pname = "gmnisrv"; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" ''; - MIMEDB = "${mime-types}/etc/mime.types"; + MIMEDB = "${mailcap}/etc/mime.types"; nativeBuildInputs = [ pkg-config scdoc ]; - buildInputs = [ openssl mime-types ]; + buildInputs = [ openssl mailcap ]; meta = with lib; { description = "A simple Gemini protocol server"; diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index b1a37c9dd2a4..bcdd3c97c2a0 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "grocy"; - version = "3.1.3"; + version = "3.2.0"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "sha256-6vgnV9HQHwJGUHGxAMXxXXiEj2kNTWqGcHnpPHvma/Q="; + sha256 = "sha256-UPawutm5MllPYdru+Rpk8UYfHDNcrNYaq4qMbZksouI="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index d05232193d78..ee673b53aad5 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchzip, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "h2"; - - version = "1.4.199"; + version = "2.1.210"; src = fetchzip { - url = "https://h2database.com/h2-2019-03-13.zip"; - sha256 = "0pdvbnx7nqfqs7x1zkwz2q34331l55jknpk6arf6dksvnd71hinj"; + url = "https://github.com/h2database/h2database/releases/download/version-${version}/h2-2022-01-17.zip"; + sha256 = "0zcjblhjj98dsj954ia3by9vx5w7mix1dzi85jnvp18kxmbldmf4"; }; + outputs = [ "out" "doc" ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = @@ -24,8 +25,9 @@ stdenv.mkDerivation rec { fi ''; in '' - mkdir -p $out - cp -R * $out + mkdir -p $out $doc/share/doc/ + cp -R bin $out/ + cp -R docs $doc/share/doc/h2 echo '${h2ToolScript}' > $out/bin/h2tool.sh diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index a9403bf9edd4..f39390f5ea92 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "headphones"; - version = "0.6.0-alpha.1"; + version = "0.6.0-beta.5"; src = fetchFromGitHub { owner = "rembo10"; repo = "headphones"; rev = "v${version}"; - sha256 = "sha256-+mWtceQoHSMRkA8izZnKM0cgbt0P5Hr3arKOevpKvqc="; + sha256 = "1ddqk5ch1dlh895cm99li4gb4a596mvq3d0gah9vrbn6fyhp3b4v"; }; dontBuild = true; @@ -17,17 +17,21 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/opt/headphones cp -R {data,headphones,lib,Headphones.py} $out/opt/headphones echo v${version} > $out/opt/headphones/version.txt makeWrapper $out/opt/headphones/Headphones.py $out/bin/headphones + + runHook postInstall ''; meta = with lib; { description = "Automatic music downloader for SABnzbd"; - license = licenses.gpl3; + license = licenses.gpl3Plus; homepage = "https://github.com/rembo10/headphones"; maintainers = with lib.maintainers; [ rembo10 ]; }; diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 8057b56e9f39..8249eb6d9876 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "headscale"; - version = "0.12.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-PgSjxDmPahGd2o3QBfvytMva+LHWeLPm500DsNdB77Q="; + sha256 = "sha256-ZgChln6jcxyEHbCy89kNnwd9qWcB0yDq05xFkM69WLs="; }; - vendorSha256 = "sha256-gD4jGaR4KQiYL6+yA8g2u6cTEbfySTMErNqerw76Ook="; + vendorSha256 = "sha256-0jZ37tmBG8E0HS/wbQyQvAKo1UKQdaZDa+OTGfGDAi4="; ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ]; @@ -44,6 +44,6 @@ buildGoModule rec { Headscale implements this coordination server. ''; license = licenses.bsd3; - maintainers = with maintainers; [ nkje jk ]; + maintainers = with maintainers; [ nkje jk kradalby ]; }; } diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index 48aa24b2b842..cfbf1c1fb95c 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, fetchpatch, python3 }: python3.pkgs.buildPythonApplication rec { pname = "heisenbridge"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "hifi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rQBmg1CBourj/dDJ7P108gGMRdXWp6nwvHIBiQbJLQ0="; + sha256 = "sha256-c+YP4pEGvLi7wZsDXrkoqR/isuYfXQmTwQp9gN5jHkQ="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7a325693a0ff..822bfcbe5936 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,14 +2,14 @@ # Do not edit! { - version = "2021.12.10"; + version = "2022.3.8"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ aiopulse ]; "actiontec" = ps: with ps; [ ]; - "adax" = ps: with ps; [ adax ]; + "adax" = ps: with ps; [ adax-local adax ]; "adguard" = ps: with ps; [ adguardhome ]; "ads" = ps: with ps; [ pyads ]; "advantage_air" = ps: with ps; [ advantage-air ]; @@ -44,28 +44,28 @@ "apache_kafka" = ps: with ps; [ aiokafka ]; "apcupsd" = ps: with ps; [ apcaccess ]; "api" = ps: with ps; [ aiohttp-cors ]; - "apns" = ps: with ps; [ ]; # missing inputs: apns2 - "apple_tv" = ps: with ps; [ pyatv ]; + "apple_tv" = ps: with ps; [ aiohttp-cors ifaddr pyatv zeroconf ]; "apprise" = ps: with ps; [ apprise ]; "aprs" = ps: with ps; [ aprslib geopy ]; "aqualogic" = ps: with ps; [ aqualogic ]; "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc "arcam_fmj" = ps: with ps; [ arcam-fmj ]; - "arduino" = ps: with ps; [ ]; # missing inputs: PyMata "arest" = ps: with ps; [ ]; "arlo" = ps: with ps; [ ha-ffmpeg pyarlo ]; "arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg "aruba" = ps: with ps; [ pexpect ]; "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox - "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox + "aseko_pool_live" = ps: with ps; [ aioaseko ]; + "asterisk_cdr" = ps: with ps; [ asterisk-mbox ]; + "asterisk_mbox" = ps: with ps; [ asterisk-mbox ]; "asuswrt" = ps: with ps; [ aioasuswrt ]; "atag" = ps: with ps; [ pyatag ]; "aten_pe" = ps: with ps; [ atenpdu ]; "atome" = ps: with ps; [ pyatome ]; "august" = ps: with ps; [ yalexs ]; "aurora" = ps: with ps; [ auroranoaa ]; - "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy + "aurora_abb_powerone" = ps: with ps; [ aurorapy ]; + "aussie_broadband" = ps: with ps; [ pyaussiebb ]; "auth" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ]; "avea" = ps: with ps; [ avea ]; @@ -82,7 +82,7 @@ "bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO "bbox" = ps: with ps; [ ]; # missing inputs: pybbox "beewi_smartclim" = ps: with ps; [ ]; # missing inputs: beewi_smartclim - "bh1750" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense + "bh1750" = ps: with ps; [ i2csense smbus-cffi ]; "binary_sensor" = ps: with ps; [ ]; "bitcoin" = ps: with ps; [ blockchain ]; "bizkaibus" = ps: with ps; [ bizkaibus ]; @@ -97,7 +97,7 @@ "bluesound" = ps: with ps; [ xmltodict ]; "bluetooth_le_tracker" = ps: with ps; [ pygatt ]; "bluetooth_tracker" = ps: with ps; [ bt-proximity pybluez ]; - "bme280" = ps: with ps; [ smbus-cffi ]; # missing inputs: bme280spi i2csense + "bme280" = ps: with ps; [ bme280spi i2csense smbus-cffi ]; "bme680" = ps: with ps; [ bme680 smbus-cffi ]; "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ bimmer-connected ]; @@ -121,7 +121,7 @@ "cast" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa ifaddr mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ pychannels ]; - "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook + "circuit" = ps: with ps; [ circuit-webhook ]; "cisco_ios" = ps: with ps; [ pexpect ]; "cisco_mobility_express" = ps: with ps; [ ciscomobilityexpress ]; "cisco_webex_teams" = ps: with ps; [ webexteamssdk ]; @@ -165,7 +165,7 @@ "deconz" = ps: with ps; [ pydeconz ]; "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client emoji hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ]; + "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ]; "delijn" = ps: with ps; [ pydelijn ]; "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors sqlalchemy ]; @@ -181,17 +181,19 @@ "dexcom" = ps: with ps; [ pydexcom ]; "dhcp" = ps: with ps; [ aiodiscover scapy ]; "dht" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-dht + "diagnostics" = ps: with ps; [ aiohttp-cors ]; "dialogflow" = ps: with ps; [ aiohttp-cors ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower "directv" = ps: with ps; [ directv ]; "discogs" = ps: with ps; [ discogs-client ]; - "discord" = ps: with ps; [ discordpy ]; + "discord" = ps: with ps; [ nextcord ]; "discovery" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; "dlib_face_detect" = ps: with ps; [ face_recognition ]; "dlib_face_identify" = ps: with ps; [ face_recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 "dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ]; + "dlna_dms" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr zeroconf ]; "dnsip" = ps: with ps; [ aiodns ]; "dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi "doods" = ps: with ps; [ pillow pydoods ]; @@ -206,7 +208,7 @@ "dunehd" = ps: with ps; [ pdunehd ]; "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ]; "dweet" = ps: with ps; [ ]; # missing inputs: dweepy - "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices + "dynalite" = ps: with ps; [ dynalite-devices ]; "eafm" = ps: with ps; [ aioeafm ]; "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy @@ -214,7 +216,7 @@ "ecobee" = ps: with ps; [ python-ecobee-api ]; "econet" = ps: with ps; [ pyeconet ]; "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks - "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan] + "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools "edimax" = ps: with ps; [ pyedimax ]; "edl21" = ps: with ps; [ pysml ]; "efergy" = ps: with ps; [ pyefergy ]; @@ -222,7 +224,8 @@ "eight_sleep" = ps: with ps; [ pyeight ]; "elgato" = ps: with ps; [ elgato ]; "eliqonline" = ps: with ps; [ eliqonline ]; - "elkm1" = ps: with ps; [ elkm1-lib ]; + "elkm1" = ps: with ps; [ aiohttp-cors elkm1-lib ifaddr ]; + "elmax" = ps: with ps; [ elmax-api ]; "elv" = ps: with ps; [ pypca ]; "emby" = ps: with ps; [ pyemby ]; "emoncms" = ps: with ps; [ ]; @@ -261,7 +264,7 @@ "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; - "fibaro" = ps: with ps; [ ]; # missing inputs: fiblary3 + "fibaro" = ps: with ps; [ fiblary3-fork ]; "fido" = ps: with ps; [ pyfido ]; "file" = ps: with ps; [ ]; "filesize" = ps: with ps; [ ]; @@ -270,6 +273,7 @@ "fireservicerota" = ps: with ps; [ pyfireservicerota ]; "firmata" = ps: with ps; [ pymata-express ]; "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; + "fivem" = ps: with ps; [ ]; # missing inputs: fivem-api "fixer" = ps: with ps; [ fixerio ]; "fjaraskupan" = ps: with ps; [ fjaraskupan ]; "fleetgo" = ps: with ps; [ ritassist ]; @@ -282,7 +286,7 @@ "flume" = ps: with ps; [ pyflume ]; "flunearyou" = ps: with ps; [ pyflunearyou ]; "flux" = ps: with ps; [ ]; - "flux_led" = ps: with ps; [ flux-led ]; + "flux_led" = ps: with ps; [ aiohttp-cors flux-led ifaddr ]; "folder" = ps: with ps; [ ]; "folder_watcher" = ps: with ps; [ watchdog ]; "foobot" = ps: with ps; [ foobot-async ]; @@ -309,7 +313,7 @@ "generic" = ps: with ps; [ ]; "generic_hygrostat" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ sqlalchemy ]; - "geniushub" = ps: with ps; [ ]; # missing inputs: geniushub-client + "geniushub" = ps: with ps; [ geniushub-client ]; "geo_json_events" = ps: with ps; [ geojson-client ]; "geo_location" = ps: with ps; [ ]; "geo_rss_events" = ps: with ps; [ georss-generic-client ]; @@ -321,10 +325,10 @@ "gitlab_ci" = ps: with ps; [ python-gitlab ]; "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy "glances" = ps: with ps; [ glances-api ]; - "gntp" = ps: with ps; [ gntp ]; "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "goalzero" = ps: with ps; [ goalzero ]; "gogogate2" = ps: with ps; [ ismartgate ]; + "goodwe" = ps: with ps; [ goodwe ]; "google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; @@ -371,13 +375,14 @@ "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors ifaddr zeroconf ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ homematicip ]; + "homewizard" = ps: with ps; [ aiohwenergy ]; "homeworks" = ps: with ps; [ pyhomeworks ]; "honeywell" = ps: with ps; [ somecomfort ]; "horizon" = ps: with ps; [ ]; # missing inputs: horimote "hp_ilo" = ps: with ps; [ python-hpilo ]; "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; "http" = ps: with ps; [ aiohttp-cors ]; - "htu21d" = ps: with ps; [ smbus-cffi ]; # missing inputs: i2csense + "htu21d" = ps: with ps; [ i2csense smbus-cffi ]; "huawei_lte" = ps: with ps; [ huawei-lte-api stringcase url-normalize ]; "hue" = ps: with ps; [ aiohue ]; "huisbaasje" = ps: with ps; [ huisbaasje-client ]; @@ -402,12 +407,14 @@ "incomfort" = ps: with ps; [ incomfort-client ]; "influxdb" = ps: with ps; [ influxdb-client influxdb ]; "input_boolean" = ps: with ps; [ ]; + "input_button" = ps: with ps; [ ]; "input_datetime" = ps: with ps; [ ]; "input_number" = ps: with ps; [ ]; "input_select" = ps: with ps; [ ]; "input_text" = ps: with ps; [ ]; "insteon" = ps: with ps; [ pyinsteon ]; "integration" = ps: with ps; [ ]; + "intellifire" = ps: with ps; [ intellifire4py ]; "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; "intesishome" = ps: with ps; [ pyintesishome ]; @@ -439,7 +446,7 @@ "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client "kmtronic" = ps: with ps; [ pykmtronic ]; "knx" = ps: with ps; [ xknx ]; - "kodi" = ps: with ps; [ pykodi ]; + "kodi" = ps: with ps; [ aiohttp-cors pykodi ]; "konnected" = ps: with ps; [ aiohttp-cors konnected ]; "kostal_plenticore" = ps: with ps; [ ]; # missing inputs: kostal_plenticore "kraken" = ps: with ps; [ krakenex pykrakenapi ]; @@ -452,12 +459,12 @@ "launch_library" = ps: with ps; [ pylaunches ]; "lcn" = ps: with ps; [ pypck ]; "lg_netcast" = ps: with ps; [ pylgnetcast ]; - "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal + "lg_soundbar" = ps: with ps; [ temescal ]; "life360" = ps: with ps; [ life360 ]; "lifx" = ps: with ps; [ aiolifx aiolifx-effects ]; "lifx_cloud" = ps: with ps; [ ]; "light" = ps: with ps; [ ]; - "lightwave" = ps: with ps; [ ]; # missing inputs: lightwave + "lightwave" = ps: with ps; [ lightwave ]; "limitlessled" = ps: with ps; [ limitlessled ]; "linksys_smart" = ps: with ps; [ ]; "linode" = ps: with ps; [ linode-api ]; @@ -482,7 +489,7 @@ "luftdaten" = ps: with ps; [ luftdaten ]; "lupusec" = ps: with ps; [ lupupy ]; "lutron" = ps: with ps; [ pylutron ]; - "lutron_caseta" = ps: with ps; [ aiolip pylutron-caseta ]; + "lutron_caseta" = ps: with ps; [ pylutron-caseta ]; "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lyric" = ps: with ps; [ aiohttp-cors aiolyric ]; "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed @@ -525,11 +532,12 @@ "minio" = ps: with ps; [ minio ]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; - "mobile_app" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors emoji hass-nabucasa pillow ]; + "mobile_app" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa pillow ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad "modbus" = ps: with ps; [ pymodbus ]; "modem_callerid" = ps: with ps; [ aiohttp-cors phone-modem pyserial pyudev ]; "modern_forms" = ps: with ps; [ aiomodernforms ]; + "moehlenhoff_alpha2" = ps: with ps; [ ]; # missing inputs: moehlenhoff-alpha2 "mold_indicator" = ps: with ps; [ ]; "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; @@ -562,7 +570,7 @@ "nest" = ps: with ps; [ aiohttp-cors google-nest-sdm ha-ffmpeg python-nest ]; "netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyatmo ]; "netdata" = ps: with ps; [ netdata ]; - "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear + "netgear" = ps: with ps; [ pynetgear ]; "netgear_lte" = ps: with ps; [ eternalegypt ]; "netio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pynetio "network" = ps: with ps; [ aiohttp-cors ifaddr ]; @@ -574,6 +582,7 @@ "nightscout" = ps: with ps; [ py-nightscout ]; "niko_home_control" = ps: with ps; [ niko-home-control ]; "nilu" = ps: with ps; [ niluclient ]; + "nina" = ps: with ps; [ pynina ]; "nissan_leaf" = ps: with ps; [ pycarwings2 ]; "nmap_tracker" = ps: with ps; [ aiohttp-cors getmac ifaddr netmap ]; # missing inputs: mac-vendor-lookup "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail @@ -601,15 +610,17 @@ "ombi" = ps: with ps; [ pyombi ]; "omnilogic" = ps: with ps; [ omnilogic ]; "onboarding" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; + "oncue" = ps: with ps; [ aiooncue ]; "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; - "onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet + "onewire" = ps: with ps; [ pi1wire pyownet ]; "onkyo" = ps: with ps; [ onkyo-eiscp ]; - "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async + "onvif" = ps: with ps; [ wsdiscovery ha-ffmpeg onvif-zeep-async ]; + "open_meteo" = ps: with ps; [ open-meteo ]; "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; "opencv" = ps: with ps; [ numpy ]; # missing inputs: opencv-python-headless "openerz" = ps: with ps; [ openerz-api ]; - "openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi + "openevse" = ps: with ps; [ openevsewifi ]; "openexchangerates" = ps: with ps; [ ]; "opengarage" = ps: with ps; [ open-garage ]; "openhardwaremonitor" = ps: with ps; [ ]; @@ -626,6 +637,7 @@ "orvibo" = ps: with ps; [ orvibo ]; "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp ]; + "overkiz" = ps: with ps; [ pyoverkiz ]; "ovo_energy" = ps: with ps; [ ovoenergy ]; "owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ]; "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; @@ -669,23 +681,25 @@ "proxy" = ps: with ps; [ pillow ]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "pulseaudio_loopback" = ps: with ps; [ pulsectl ]; + "pure_energie" = ps: with ps; [ gridnet ]; "push" = ps: with ps; [ aiohttp-cors ]; "pushbullet" = ps: with ps; [ pushbullet ]; "pushover" = ps: with ps; [ pushover-complete ]; "pushsafer" = ps: with ps; [ ]; - "pvoutput" = ps: with ps; [ jsonpath xmltodict ]; + "pvoutput" = ps: with ps; [ pvo ]; "pvpc_hourly_pricing" = ps: with ps; [ aiopvpc ]; "pyload" = ps: with ps; [ ]; "python_script" = ps: with ps; [ restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent "qld_bushfire" = ps: with ps; [ georss-qld-bushfire-alert-client ]; "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats - "qrcode" = ps: with ps; [ pillow ]; # missing inputs: pyzbar + "qrcode" = ps: with ps; [ pillow pyzbar ]; "quantum_gateway" = ps: with ps; [ quantum-gateway ]; - "qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro + "qvr_pro" = ps: with ps; [ pyqvrpro ]; "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch "rachio" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa rachiopy ]; "radarr" = ps: with ps; [ ]; + "radio_browser" = ps: with ps; [ radios ]; "radiotherm" = ps: with ps; [ radiotherm ]; "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird "raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy @@ -729,6 +743,7 @@ "rpi_rf" = ps: with ps; [ ]; # missing inputs: RPi.GPIO rpi-rf "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; "rtorrent" = ps: with ps; [ ]; + "rtsp_to_webrtc" = ps: with ps; [ pyturbojpeg aiohttp-cors rtsp-to-webrtc ]; "ruckus_unleashed" = ps: with ps; [ pyruckus ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound @@ -749,6 +764,7 @@ "sendgrid" = ps: with ps; [ sendgrid ]; "sense" = ps: with ps; [ sense-energy ]; "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat + "senseme" = ps: with ps; [ aiosenseme ]; "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo "sensor" = ps: with ps; [ sqlalchemy ]; "sentry" = ps: with ps; [ sentry-sdk ]; @@ -767,7 +783,7 @@ "sia" = ps: with ps; [ pysiaalarm ]; "sigfox" = ps: with ps; [ ]; "sighthound" = ps: with ps; [ pillow simplehound ]; - "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi + "signal_messenger" = ps: with ps; [ pysignalclirestapi ]; "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush "simplisafe" = ps: with ps; [ simplisafe-python ]; "simulated" = ps: with ps; [ ]; @@ -778,7 +794,7 @@ "skybeacon" = ps: with ps; [ pygatt ]; "skybell" = ps: with ps; [ skybellpy ]; "slack" = ps: with ps; [ slackclient ]; - "sleepiq" = ps: with ps; [ sleepyq ]; + "sleepiq" = ps: with ps; [ asyncsleepiq ]; "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "sma" = ps: with ps; [ pysma ]; "smappee" = ps: with ps; [ aiohttp-cors pysmappee ]; @@ -801,9 +817,9 @@ "soma" = ps: with ps; [ pysoma ]; "somfy" = ps: with ps; [ aiohttp-cors pymfy ]; "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; - "sonarr" = ps: with ps; [ sonarr ]; + "sonarr" = ps: with ps; [ aiopyarr ]; "songpal" = ps: with ps; [ python-songpal ]; - "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr plexapi plexauth plexwebsocket soco zeroconf ]; + "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr plexapi plexauth plexwebsocket soco spotipy zeroconf ]; "sony_projector" = ps: with ps; [ pysdcp ]; "soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; @@ -822,9 +838,10 @@ "statistics" = ps: with ps; [ sqlalchemy ]; "statsd" = ps: with ps; [ statsd ]; "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd + "steamist" = ps: with ps; [ aiohttp-cors aiosteamist discovery30303 ifaddr ]; "stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert - "stream" = ps: with ps; [ aiohttp-cors ha-av ]; + "stream" = ps: with ps; [ pyturbojpeg aiohttp-cors av ]; "streamlabswater" = ps: with ps; [ streamlabswater ]; "stt" = ps: with ps; [ aiohttp-cors ]; "subaru" = ps: with ps; [ subarulink ]; @@ -848,11 +865,10 @@ "syslog" = ps: with ps; [ ]; "system_bridge" = ps: with ps; [ aiohttp-cors ifaddr systembridge zeroconf ]; "system_health" = ps: with ps; [ aiohttp-cors ]; - "system_log" = ps: with ps; [ aiohttp-cors ]; + "system_log" = ps: with ps; [ ]; "systemmonitor" = ps: with ps; [ psutil ]; "tado" = ps: with ps; [ python-tado ]; "tag" = ps: with ps; [ ]; - "tahoma" = ps: with ps; [ tahoma-api ]; "tailscale" = ps: with ps; [ tailscale ]; "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility "tankerkoenig" = ps: with ps; [ pytankerkoenig ]; @@ -877,7 +893,7 @@ "thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner "thomson" = ps: with ps; [ ]; "threshold" = ps: with ps; [ ]; - "tibber" = ps: with ps; [ pytibber ]; + "tibber" = ps: with ps; [ pytibber sqlalchemy ]; "tikteck" = ps: with ps; [ ]; # missing inputs: tikteck "tile" = ps: with ps; [ pytile ]; "time_date" = ps: with ps; [ ]; @@ -910,8 +926,8 @@ "twilio" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; - "twinkly" = ps: with ps; [ twinkly-client ]; - "twitch" = ps: with ps; [ python-twitch-client ]; + "twinkly" = ps: with ps; [ ttls ]; + "twitch" = ps: with ps; [ twitchapi ]; "twitter" = ps: with ps; [ twitterapi ]; "ubus" = ps: with ps; [ openwrt-ubus-rpc ]; "ue_smart_radio" = ps: with ps; [ ]; @@ -919,6 +935,7 @@ "unifi" = ps: with ps; [ aiounifi ]; "unifi_direct" = ps: with ps; [ pexpect ]; "unifiled" = ps: with ps; [ unifiled ]; + "unifiprotect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyunifiprotect unifi-discovery "universal" = ps: with ps; [ ]; "upb" = ps: with ps; [ upb-lib ]; "upc_connect" = ps: with ps; [ connect-box ]; @@ -935,7 +952,7 @@ "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp - "velbus" = ps: with ps; [ velbus-aio ]; + "velbus" = ps: with ps; [ aiohttp-cors pyserial pyudev velbus-aio ]; "velux" = ps: with ps; [ pyvlx ]; "venstar" = ps: with ps; [ venstarcolortouch ]; "vera" = ps: with ps; [ pyvera ]; @@ -953,7 +970,7 @@ "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ volkszaehler ]; "volumio" = ps: with ps; [ pyvolumio ]; - "volvooncall" = ps: with ps; [ ]; # missing inputs: volvooncall + "volvooncall" = ps: with ps; [ volvooncall ]; "vultr" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 "wake_on_lan" = ps: with ps; [ wakeonlan ]; @@ -967,15 +984,16 @@ "waze_travel_time" = ps: with ps; [ wazeroutecalculator ]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; - "webostv" = ps: with ps; [ aiopylgtv ]; + "webostv" = ps: with ps; [ aiowebostv sqlalchemy ]; "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ pywemo ]; "whirlpool" = ps: with ps; [ whirlpool-sixth-sense ]; - "whois" = ps: with ps; [ python-whois ]; + "whois" = ps: with ps; [ whois ]; "wiffi" = ps: with ps; [ wiffi ]; "wilight" = ps: with ps; [ pywilight ]; "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api + "wiz" = ps: with ps; [ aiohttp-cors ifaddr pywizlight ]; "wled" = ps: with ps; [ wled ]; "wolflink" = ps: with ps; [ ]; # missing inputs: wolf_smartset "workday" = ps: with ps; [ holidays ]; @@ -984,7 +1002,6 @@ "worxlandroid" = ps: with ps; [ ]; "wsdot" = ps: with ps; [ ]; "x10" = ps: with ps; [ ]; - "xbee" = ps: with ps; [ ]; # missing inputs: xbee-helper "xbox" = ps: with ps; [ aiohttp-cors xbox-webapi ]; "xbox_live" = ps: with ps; [ xboxapi ]; "xeoma" = ps: with ps; [ pyxeoma ]; @@ -1017,6 +1034,7 @@ "zoneminder" = ps: with ps; [ zm-py ]; "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; "zwave_js" = ps: with ps; [ aiohttp-cors pyserial pyudev zwave-js-server-python ]; + "zwave_me" = ps: with ps; [ aiohttp-cors ifaddr url-normalize zeroconf ]; # missing inputs: zwave_me_ws }; # components listed in tests/components for which all dependencies are packaged supportedComponentsWithTests = [ @@ -1052,10 +1070,13 @@ "aprs" "arcam_fmj" "arlo" + "aseko_pool_live" "asuswrt" "atag" "august" "aurora" + "aurora_abb_powerone" + "aussie_broadband" "auth" "automation" "awair" @@ -1103,6 +1124,7 @@ "coronavirus" "counter" "cover" + "cpuspeed" "crownstone" "daikin" "darksky" @@ -1120,21 +1142,26 @@ "devolo_home_network" "dexcom" "dhcp" + "diagnostics" "dialogflow" "directv" "discovery" "dlna_dmr" + "dlna_dms" + "dnsip" "doorbird" "dsmr" "dte_energy_bridge" "duckdns" "dunehd" + "dynalite" "eafm" "ecobee" "econet" "efergy" "elgato" "elkm1" + "elmax" "emonitor" "emulated_hue" "emulated_kasa" @@ -1162,6 +1189,7 @@ "fireservicerota" "firmata" "fjaraskupan" + "flic" "flick_electric" "flipr" "flo" @@ -1194,9 +1222,11 @@ "geonetnz_quakes" "geonetnz_volcano" "gios" + "github" "glances" "goalzero" "gogogate2" + "goodwe" "google" "google_assistant" "google_domains" @@ -1229,6 +1259,7 @@ "homekit_controller" "homematic" "homematicip_cloud" + "homewizard" "honeywell" "html5" "http" @@ -1249,12 +1280,14 @@ "imap_email_content" "influxdb" "input_boolean" + "input_button" "input_datetime" "input_number" "input_select" "input_text" "insteon" "integration" + "intellifire" "intent" "intent_script" "ios" @@ -1277,6 +1310,7 @@ "kraken" "kulersky" "lastfm" + "launch_library" "lcn" "light" "litterrobot" @@ -1314,6 +1348,7 @@ "min_max" "minecraft_server" "minio" + "mjpeg" "mobile_app" "modbus" "modem_callerid" @@ -1340,9 +1375,11 @@ "ness_alarm" "nest" "netatmo" + "netgear" "network" "nexia" "nightscout" + "nina" "no_ip" "notify" "notion" @@ -1355,7 +1392,11 @@ "octoprint" "omnilogic" "onboarding" + "oncue" "ondilo_ico" + "onewire" + "onvif" + "open_meteo" "openalpr_cloud" "openalpr_local" "openerz" @@ -1365,6 +1406,7 @@ "openuv" "openweathermap" "opnsense" + "overkiz" "ovo_energy" "owntracks" "ozw" @@ -1387,13 +1429,16 @@ "prometheus" "prosegur" "proximity" + "pure_energie" "push" "pushbullet" + "pvoutput" "pvpc_hourly_pricing" "python_script" "qld_bushfire" "rachio" "radarr" + "radio_browser" "rainforest_eagle" "rainmachine" "random" @@ -1417,16 +1462,19 @@ "roon" "rpi_power" "rss_feed_template" + "rtsp_to_webrtc" "ruckus_unleashed" "safe_mode" "samsungtv" "scene" + "scrape" "screenlogic" "script" "search" "season" "select" "sense" + "senseme" "sensor" "sentry" "seventeentrack" @@ -1437,6 +1485,7 @@ "sia" "sigfox" "sighthound" + "signal_messenger" "simplisafe" "simulated" "siren" @@ -1453,6 +1502,7 @@ "snips" "solaredge" "solarlog" + "solax" "soma" "somfy" "somfy_mylink" @@ -1473,6 +1523,7 @@ "startca" "statistics" "statsd" + "steamist" "stream" "stt" "subaru" @@ -1560,8 +1611,10 @@ "websocket_api" "wemo" "whirlpool" + "whois" "wiffi" "wilight" + "wiz" "wled" "workday" "worldclock" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e26c38bc87f3..0d9664a700e0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -15,6 +15,9 @@ # Additional packages to add to propagatedBuildInputs , extraPackages ? ps: [] +# Write out info about included extraComponents and extraPackages +, writeText + # Override Python packages using # self: super: { pkg = super.pkg.overridePythonAttrs (oldAttrs: { ... }); } # Applied after defaultOverrides @@ -25,22 +28,35 @@ let defaultOverrides = [ - # aiounify 29 breaks integration tests + # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt + (mkOverride "python-slugify" "4.0.1" "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=") + + # pytest-aiohttp>0.3.0 breaks home-assistant tests (self: super: { - aiounifi = super.aiounifi.overridePythonAttrs (oldAttrs: rec { - version = "28"; - src = fetchFromGitHub { - owner = "Kane610"; - repo = "aiounifi"; - rev = "v${version}"; - sha256 = "1r86pk80sa1la2s7c6v9svh5cpkci6jcw1xziz0h09jdvv5j5iff"; + pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { + version = "0.3.0"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-ySmFQzljeXc3WDhwO2L+9jUoWYvAqdRRY566lfSqpE8="; }; + propagatedBuildInputs = with python3.pkgs; [ aiohttp pytest ]; + doCheck = false; + patches = []; + }); + aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); + hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); + snitun = super.snitun.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 + }); + zwave-js-server-python = super.zwave-js-server-python.overridePythonAttrs (oldAttrs: { + doCheck = false; # requires aiohttp>=1.0.0 }); }) - # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt - (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") - (self: super: { huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec { version = "1.4.18"; @@ -54,36 +70,6 @@ let }); }) - # Pinned due to API changes in iaqualink>=2.0, remove after - # https://github.com/home-assistant/core/pull/48137 was merged - (self: super: { - iaqualink = super.iaqualink.overridePythonAttrs (oldAttrs: rec { - version = "0.3.90"; - src = fetchFromGitHub { - owner = "flz"; - repo = "iaqualink-py"; - rev = "v${version}"; - sha256 = "0c8ckbbr1n8gx5k63ymgyfkbz3d0rbdvghg8fqdvbg4nrigrs5v0"; - }; - checkInputs = oldAttrs.checkInputs ++ [ python3.pkgs.asynctest ]; - }); - }) - - # Pinned due to API changes in influxdb-client>1.21.0 - (self: super: { - influxdb-client = super.influxdb-client.overridePythonAttrs (oldAttrs: rec { - version = "1.21.0"; - src = fetchFromGitHub { - owner = "influxdata"; - repo = "influxdb-client-python"; - rev = "v${version}"; - sha256 = "081pwd3aa7kbgxqcl1hfi2ny4iapnxkcp9ypsfslr69d0khvfc4s"; - }; - }); - }) - - (mkOverride "jinja2" "3.0.3" "1mvwr02s86zck5wsmd9wjxxb9iaqr17hdi5xza9vkwv8rmrv46v1") - # Pinned due to API changes in pyruckus>0.12 (self: super: { pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec { @@ -97,25 +83,22 @@ let }); }) - # Pinned due to API changes in eebrightbox>=0.0.5 + # Pinned due to API changes in 0.1.0 + (mkOverride "poolsense" "0.0.8" "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc=") + + # Pinned due to API changes >0.3.5.3 (self: super: { - eebrightbox = super.eebrightbox.overridePythonAttrs (oldAttrs: rec { - version = "0.0.4"; + pyatag = super.pyatag.overridePythonAttrs (oldAttrs: rec { + version = "0.3.5.3"; src = fetchFromGitHub { - owner = "krygal"; - repo = "eebrightbox"; + owner = "MatsNl"; + repo = "pyatag"; rev = version; - sha256 = "0d8mmpwgrd7gymw5263r1v2wjv6dx6w6pq13d62fkfm4h2hya4a4"; + sha256 = "00ly4injmgrj34p0lyx7cz2crgnfcijmzc0540gf7hpwha0marf6"; }; }); }) - # Pinned due to API changes in 0.1.0 - (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") - - # Requirements for recorder not found: ['sqlalchemy==1.4.27']. - (mkOverride "sqlalchemy" "1.4.27" "031jbd0svrvwr3n52iibp9mkwsj9wicnck45yd26da5kmsfkas6p") - # Pinned due to API changes in 0.4.0 (self: super: { vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec { @@ -148,12 +131,12 @@ let }) ]; - mkOverride = attrname: version: sha256: + mkOverride = attrName: version: hash: self: super: { - ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: { + ${attrName} = super.${attrName}.overridePythonAttrs (oldAttrs: { inherit version; src = oldAttrs.src.override { - inherit version sha256; + inherit version hash; }; }); }; @@ -176,15 +159,20 @@ let # Ensure that we are using a consistent package set extraBuildInputs = extraPackages python.pkgs; + # Create info about included packages and components + extraComponentsFile = writeText "home-assistant-components" (lib.concatStringsSep "\n" extraComponents); + extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); + # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.12.10"; + hassVersion = "2022.3.8"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; version = assert (componentPackages.version == hassVersion); hassVersion; + format = "pyproject"; # check REQUIRED_PYTHON_VER in homeassistant/const.py - disabled = python.pythonOlder "3.8"; + disabled = python.pythonOlder "3.9"; # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; @@ -194,7 +182,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256:0nyddcjy4diq5bakpb76frax44i0jraj2vvpfxrj50h9l5pdwsaf"; + hash = "sha256-FGsMFt/EEokaast81iiwKHqSsB1E4Si5ejTw+MV1MnQ="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -203,7 +191,6 @@ in python.pkgs.buildPythonApplication rec { src = ./patches/ffmpeg-path.patch; ffmpeg = "${lib.getBin ffmpeg}/bin/ffmpeg"; }) - ./patches/tests-ignore-OSErrors-in-hass-fixture.patch ]; postPatch = let @@ -223,9 +210,9 @@ in python.pkgs.buildPythonApplication rec { in '' sed -r -i \ ${lib.concatStringsSep "\n" (map (package: - ''-e 's@${package}[<>=]+.*@${package}",@g' \'' + ''-e 's@${package}[<>=]+.*@${package}@g' \'' ) relaxedConstraints)} - setup.py + setup.cfg substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; @@ -256,8 +243,8 @@ in python.pkgs.buildPythonApplication rec { yarl # Not in setup.py, but used in homeassistant/util/package.py setuptools - ] ++ lib.optionals (pythonOlder "3.9") [ - backports-zoneinfo + # Not in setup.py, but uncounditionally imported via tests/conftest.py + paho-mqtt ] ++ componentBuildInputs ++ extraBuildInputs; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; @@ -280,6 +267,9 @@ in python.pkgs.buildPythonApplication rec { respx stdlib-list tqdm + # required by tests/pylint + astroid + pylint # required by tests/auth/mfa_modules pyotp ] ++ lib.concatMap (component: getPackages component python.pkgs) [ @@ -328,6 +318,11 @@ in python.pkgs.buildPythonApplication rec { export PATH=${inetutils}/bin:$PATH ''; + postInstall = '' + cp -v ${extraComponentsFile} $out/extra_components + cp -v ${extraPackagesFile} $out/extra_packages + ''; + passthru = { inherit availableComponents diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index cdb60172fa8f..9f13a6652d7d 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,15 @@ 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 = "20211229.1"; + version = "20220301.2"; + format = "wheel"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-glVjJ9iOmhAIGD65PHQu9l7Wc/lr5XRya2mi20/UVgs="; + inherit version format; + pname = "home_assistant_frontend"; + dist = "py3"; + python = "py3"; + sha256 = "sha256-iIywlG9ATLV/+bHtOQFx4mRwToelpPdE3DOKSp4yxN0="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index fbe46b237787..0e3d5d5553e7 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -34,16 +34,12 @@ from rich.table import Table COMPONENT_PREFIX = "homeassistant.components" PKG_SET = "home-assistant.python.pkgs" -# If some requirements are matched by multiple Python packages, -# the following can be used to choose one of them +# If some requirements are matched by multiple or no Python packages, the +# following can be used to choose the correct one PKG_PREFERENCES = { - # Use python3Packages.youtube-dl-light instead of python3Packages.youtube-dl - "youtube-dl": "youtube-dl-light", - "tensorflow-bin": "tensorflow", - "tensorflow-bin_2": "tensorflow", - "tensorflowWithoutCuda": "tensorflow", - "tensorflow-build_2": "tensorflow", - "whois": "python-whois", + "youtube_dl": "youtube-dl-light", + "tensorflow": "tensorflow", + "fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466 } @@ -120,39 +116,28 @@ def dump_packages() -> Dict[str, Dict[str, str]]: def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]: - attr_paths = set() + if req in PKG_PREFERENCES: + return f"{PKG_SET}.{PKG_PREFERENCES[req]}" + attr_paths = [] names = [req] # E.g. python-mpd2 is actually called python3.6-mpd2 # instead of python-3.6-python-mpd2 inside Nixpkgs if req.startswith("python-") or req.startswith("python_"): names.append(req[len("python-") :]) - # Add name variant without extra_require, e.g. samsungctl - # instead of samsungctl[websocket] - if req.endswith("]"): - names.append(req[:req.find("[")]) for name in names: # treat "-" and "_" equally name = re.sub("[-_]", "[-_]", name) # python(minor).(major)-(pname)-(version or unstable-date) # we need the version qualifier, or we'll have multiple matches # (e.g. pyserial and pyserial-asyncio when looking for pyserial) - pattern = re.compile("^python\\d\\.\\d-{}-(?:\\d|unstable-.*)".format(name), re.I) + pattern = re.compile(f"^python\\d\\.\\d-{name}-(?:\\d|unstable-.*)", re.I) for attr_path, package in packages.items(): if pattern.match(package["name"]): - attr_paths.add(attr_path) - if len(attr_paths) > 1: - for to_replace, replacement in PKG_PREFERENCES.items(): - try: - attr_paths.remove(PKG_SET + "." + to_replace) - attr_paths.add(PKG_SET + "." + replacement) - except KeyError: - pass + attr_paths.append(attr_path) # Let's hope there's only one derivation with a matching name - assert len(attr_paths) <= 1, "{} matches more than one derivation: {}".format( - req, attr_paths - ) - if len(attr_paths) == 1: - return attr_paths.pop() + assert len(attr_paths) <= 1, f"{req} matches more than one derivation: {attr_paths}" + if attr_paths: + return attr_paths[0] else: return None @@ -180,6 +165,10 @@ def main() -> None: # Therefore, if there's a "#" in the line, only take the part after it req = req[req.find("#") + 1 :] name, required_version = req.split("==", maxsplit=1) + # Remove extra_require from name, e.g. samsungctl instead of + # samsungctl[websocket] + if name.endswith("]"): + name = name[:name.find("[")] attr_path = name_to_attr_path(name, packages) if our_version := get_pkg_version(name, packages): if Version.parse(our_version) < Version.parse(required_version): diff --git a/pkgs/servers/home-assistant/patches/tests-ignore-OSErrors-in-hass-fixture.patch b/pkgs/servers/home-assistant/patches/tests-ignore-OSErrors-in-hass-fixture.patch deleted file mode 100644 index add0ea1d5521..000000000000 --- a/pkgs/servers/home-assistant/patches/tests-ignore-OSErrors-in-hass-fixture.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3e3f5c37252a33ea1e71c39f2ca0f13940c261ad Mon Sep 17 00:00:00 2001 -From: Martin Weinelt -Date: Sat, 17 Jul 2021 16:11:23 +0200 -Subject: [PATCH] tests: ignore OSErrors in hass fixture - -The nix sandbox will cause OSErrors due to limitations imposed on -network interaction. This change makes it so we forgive these cases. ---- - tests/conftest.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/conftest.py b/tests/conftest.py -index 1f5ffc80d0..b284727a0f 100644 ---- a/tests/conftest.py -+++ b/tests/conftest.py -@@ -168,6 +168,8 @@ def hass(loop, load_registries, hass_storage, request): - continue - if isinstance(ex, ServiceNotFound): - continue -+ if isinstance(ex, OSError): -+ continue - raise ex - - --- -2.32.0 - diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 8e552ed15e0b..ae2d91b933f9 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -11,8 +11,10 @@ let config = [ pydispatcher ]; generic = [ ha-av ]; google_translate = [ mutagen ]; + lovelace = [ PyChromecast ]; nest = [ ha-av ]; - onboarding = [ pymetno rpi-bad-power ]; + onboarding = [ pymetno radios rpi-bad-power ]; + version = [ aioaseko ]; voicerss = [ mutagen ]; yandextts = [ mutagen ]; zha = [ pydeconz ]; @@ -27,6 +29,13 @@ let ]; }; + extraDisabledTests = { + roku = [ + # homeassistant.components.roku.media_player:media_player.py:428 Media type music is not supported with format None (mime: audio/x-matroska) + "test_services_play_media_audio" + ]; + }; + extraPytestFlagsArray = { asuswrt = [ # asuswrt/test_config_flow.py: Sandbox network limitations, fails with unexpected error @@ -44,23 +53,22 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( ++ home-assistant.getPackages component home-assistant.python.pkgs ++ extraCheckInputs.${component} or [ ]; + disabledTests = old.disabledTests ++ extraDisabledTests.${component} or []; disabledTestPaths = old.disabledTestPaths ++ extraDisabledTestPaths.${component} or [ ]; pytestFlagsArray = lib.remove "tests" old.pytestFlagsArray ++ extraPytestFlagsArray.${component} or [ ] ++ [ "tests/components/${component}" ]; - preCheck = old.preCheck + lib.optionalString (component != "network") '' + preCheck = old.preCheck + lib.optionalString (builtins.elem component [ "emulated_hue" "songpal" "system_log" ]) '' patch -p1 < ${./patches/tests-mock-source-ip.patch} ''; meta = old.meta // { broken = lib.elem component [ "airtouch4" - "glances" - "ridwell" - "venstar" - "yamaha_musiccast" + "dnsip" + "zwave" ]; # upstream only tests on Linux, so do we. platforms = lib.platforms.linux; diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 1f0fe8845549..7b65a789af89 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.29.1-80"; + version = "4.30.3-87"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}sse42.fc34.x86_64.rpm"; - sha256 = "sha256-TL5zq7fu7tLoWadmVDMXrE8oiVhHbggpmwWrIGRuAnI="; + hash = "sha256-RX9KI+4HGDUJ3y3An1zTMJTz28Of2Awn7COeX6EQc38="; }; unpackPhase = '' diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 56d66a2e99cf..d72dcb9170b5 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv, lynx +{ lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre2, libiconv, lynx, which , nixosTests , proxySupport ? true , sslSupport ? true, openssl @@ -11,17 +11,19 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.52"; + version = "2.4.53"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "sha256-ASf33El+mYPpxRR0vtdeRWB/L4cKdnWobckK9tVy9ck="; + sha256 = "sha256-0LvREhpXtfKm/5LXuW+AUMWkXT8U2xGPZJedUlhY22M="; }; # FIXME: -dev depends on -doc outputs = [ "out" "dev" "man" "doc" ]; setOutputFlags = false; # it would move $out/modules, etc. + nativeBuildInputs = [ which ]; + buildInputs = [ perl ] ++ lib.optional brotliSupport brotli ++ lib.optional sslSupport openssl ++ @@ -42,7 +44,7 @@ stdenv.mkDerivation rec { "--with-apr=${apr.dev}" "--with-apr-util=${aprutil.dev}" "--with-z=${zlib.dev}" - "--with-pcre=${pcre.dev}" + "--with-pcre=${pcre2.dev}/bin/pcre2-config" "--disable-maintainer-mode" "--disable-debugger-mode" "--enable-mods-shared=all" diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 86c9ad6c00dc..a67ea3cc03e7 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -1,12 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, apacheHttpd }: -let - apache-24-patch = fetchurl { - name = "compile-against-apache24.diff"; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42"; - sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4"; - }; -in stdenv.mkDerivation rec { pname = "mod_fastcgi"; version = "2.4.7.1"; @@ -18,8 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-ovir59kCjKkgbraX23nsmzlMzGdeNTyj3MQd8cgvLsg="; }; - patches = [ apache-24-patch ]; - buildInputs = [ apacheHttpd ]; preBuild = '' @@ -43,6 +34,5 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.linux; - broken = true; # patch 'compile-against-apache24.diff' no longer works }; } diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index 9e40bb648ea5..9cdc0c58ee44 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -11,24 +11,25 @@ , systemd , tcp_wrappers , zlib +, c-ares }: stdenv.mkDerivation rec { pname = "apt-cacher-ng"; - version = "3.6.3"; + version = "3.7.4"; src = fetchurl { - url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "sha256-P4ArWpxjOjBi9EiDp/ord17GfUOFwpiTKGvSEuZljGA="; + url = "https://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; + sha256 = "0pwsj9rf6a6q7cnfbpcrfq2gjcy7sylqzqqr49g2zi39lrrh8533"; }; nativeBuildInputs = [ cmake doxygen pkg-config ]; - buildInputs = [ bzip2 fuse libevent xz openssl systemd tcp_wrappers zlib ]; + buildInputs = [ bzip2 fuse libevent xz openssl systemd tcp_wrappers zlib c-ares ]; meta = with lib; { - description = "A caching proxy specialized for linux distribution files"; + description = "A caching proxy specialized for Linux distribution files"; homepage = "https://www.unix-ag.uni-kl.de/~bloch/acng/"; - license = licenses.gpl2; + license = licenses.bsdOriginal; platforms = platforms.linux; maintainers = [ maintainers.makefu ]; }; diff --git a/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch b/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch deleted file mode 100644 index 4bf0a0d0e95d..000000000000 --- a/pkgs/servers/http/envoy/0001-quiche-update-QUICHE-tar-13949.patch +++ /dev/null @@ -1,2980 +0,0 @@ -From 97d7c456e03d4a11157fac17c7b8cbcee1d8a657 Mon Sep 17 00:00:00 2001 -From: danzh -Date: Mon, 16 Nov 2020 14:27:13 -0500 -Subject: [PATCH] quiche: update QUICHE tar (#13949) - -Signed-off-by: Dan Zhang ---- - bazel/envoy_internal.bzl | 2 + - bazel/external/quiche.BUILD | 85 +-- - bazel/repository_locations.bzl | 6 +- - source/extensions/quic_listeners/quiche/BUILD | 1 + - .../quiche/active_quic_listener.cc | 2 +- - .../quiche/envoy_quic_client_connection.cc | 2 +- - .../quiche/envoy_quic_client_stream.cc | 1 + - .../quiche/envoy_quic_connection.cc | 6 +- - .../quiche/envoy_quic_connection.h | 1 + - .../quiche/envoy_quic_dispatcher.cc | 6 +- - .../quiche/envoy_quic_dispatcher.h | 2 +- - .../quiche/envoy_quic_proof_source.cc | 2 +- - .../quiche/envoy_quic_proof_source.h | 2 +- - .../quiche/envoy_quic_proof_source_base.cc | 7 +- - .../quiche/envoy_quic_proof_source_base.h | 6 +- - .../quiche/envoy_quic_proof_verifier_base.cc | 4 +- - .../quiche/envoy_quic_server_connection.cc | 10 +- - .../quiche/envoy_quic_server_connection.h | 1 + - .../quic_listeners/quiche/platform/BUILD | 42 +- - .../quiche/platform/flags_impl.cc | 108 +++- - .../quiche/platform/flags_impl.h | 46 +- - .../quiche/platform/flags_list.h | 502 ------------------ - .../quiche/platform/http2_flags_impl.h | 4 +- - .../quiche/platform/quic_aligned_impl.h | 18 - - .../quiche/platform/quic_cert_utils_impl.cc | 38 +- - .../quiche/platform/quic_cert_utils_impl.h | 9 +- - .../quiche/platform/quic_fallthrough_impl.h | 11 - - .../quiche/platform/quic_file_utils_impl.cc | 4 +- - .../quiche/platform/quic_file_utils_impl.h | 6 +- - .../quiche/platform/quic_flags_impl.h | 6 +- - .../platform/quic_hostname_utils_impl.cc | 6 +- - .../platform/quic_hostname_utils_impl.h | 8 +- - .../quiche/platform/quic_macros_impl.h | 13 - - .../platform/quic_mem_slice_span_impl.cc | 3 +- - .../platform/quic_mem_slice_span_impl.h | 9 +- - ..._ptr_util_impl.h => quic_testvalue_impl.h} | 11 +- - .../platform/quic_udp_socket_platform_impl.h | 3 + - .../quiche/platform/quiche_arraysize_impl.h | 11 - - .../quiche/platform/quiche_optional_impl.h | 17 - - .../quiche/platform/quiche_text_utils_impl.h | 63 +-- - .../quiche/platform/quiche_time_utils_impl.cc | 4 +- - .../quiche/platform/quiche_time_utils_impl.h | 4 +- - .../platform/spdy_endianness_util_impl.h | 29 - - .../quiche/platform/spdy_flags_impl.h | 4 +- - .../quiche/platform/spdy_string_utils_impl.h | 2 +- - .../spdy_server_push_utils_for_envoy.cc | 10 +- - .../quiche/envoy_quic_client_session_test.cc | 2 +- - .../quiche/envoy_quic_client_stream_test.cc | 44 +- - .../quiche/envoy_quic_proof_source_test.cc | 6 +- - .../quiche/envoy_quic_proof_verifier_test.cc | 8 +- - .../quiche/envoy_quic_server_session_test.cc | 3 +- - .../quiche/envoy_quic_server_stream_test.cc | 53 +- - .../quic_listeners/quiche/platform/BUILD | 22 - - .../quiche/platform/http2_platform_test.cc | 22 +- - .../quiche/platform/quic_platform_test.cc | 61 +-- - .../quiche/platform/quic_test_output_impl.cc | 15 +- - .../quiche/platform/quic_test_output_impl.h | 12 +- - .../quiche/platform/quiche_platform_test.cc | 39 -- - .../quiche/platform/spdy_platform_test.cc | 20 +- - .../quic_listeners/quiche/test_proof_source.h | 2 +- - .../quic_listeners/quiche/test_utils.h | 4 +- - 61 files changed, 396 insertions(+), 1054 deletions(-) - delete mode 100644 source/extensions/quic_listeners/quiche/platform/flags_list.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h - rename source/extensions/quic_listeners/quiche/platform/{quiche_ptr_util_impl.h => quic_testvalue_impl.h} (52%) - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h - delete mode 100644 source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h - delete mode 100644 test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc - -diff --git a/bazel/envoy_internal.bzl b/bazel/envoy_internal.bzl -index 5ad86609a..3f9ddfd23 100644 ---- a/bazel/envoy_internal.bzl -+++ b/bazel/envoy_internal.bzl -@@ -54,6 +54,8 @@ def envoy_copts(repository, test = False): - }) + select({ - repository + "//bazel:clang_build": ["-fno-limit-debug-info", "-Wgnu-conditional-omitted-operand", "-Wc++2a-extensions", "-Wrange-loop-analysis"], - repository + "//bazel:gcc_build": ["-Wno-maybe-uninitialized"], -+ # TODO: Replace with /Zc:preprocessor for cl.exe versions >= 16.5 -+ repository + "//bazel:windows_x86_64": ["-experimental:preprocessor", "-Wv:19.4"], - "//conditions:default": [], - }) + select({ - repository + "//bazel:no_debug_info": ["-g0"], -diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD -index 7541909aa..b6b208fc5 100644 ---- a/bazel/external/quiche.BUILD -+++ b/bazel/external/quiche.BUILD -@@ -57,16 +57,12 @@ quiche_common_copts = [ - "-Wno-unused-function", - # quic_inlined_frame.h uses offsetof() to optimize memory usage in frames. - "-Wno-invalid-offsetof", -- "-Wno-range-loop-analysis", - ] - - quiche_copts = select({ - # Ignore unguarded #pragma GCC statements in QUICHE sources - "@envoy//bazel:windows_x86_64": ["-wd4068"], - # Remove these after upstream fix. -- "@envoy//bazel:gcc_build": [ -- "-Wno-sign-compare", -- ] + quiche_common_copts, - "//conditions:default": quiche_common_copts, - }) - -@@ -737,7 +733,6 @@ envoy_cc_library( - hdrs = [ - "quiche/spdy/platform/api/spdy_bug_tracker.h", - "quiche/spdy/platform/api/spdy_containers.h", -- "quiche/spdy/platform/api/spdy_endianness_util.h", - "quiche/spdy/platform/api/spdy_estimate_memory_usage.h", - "quiche/spdy/platform/api/spdy_flags.h", - "quiche/spdy/platform/api/spdy_logging.h", -@@ -935,6 +930,7 @@ envoy_cc_library( - copts = quiche_copts, - repository = "@envoy", - deps = [ -+ ":http2_hpack_huffman_hpack_huffman_encoder_lib", - ":spdy_core_protocol_lib", - ":spdy_platform", - ], -@@ -1049,19 +1045,16 @@ envoy_cc_library( - envoy_cc_library( - name = "quic_platform_base", - hdrs = [ -- "quiche/quic/platform/api/quic_aligned.h", - "quiche/quic/platform/api/quic_bug_tracker.h", - "quiche/quic/platform/api/quic_client_stats.h", - "quiche/quic/platform/api/quic_containers.h", - "quiche/quic/platform/api/quic_error_code_wrappers.h", - "quiche/quic/platform/api/quic_estimate_memory_usage.h", - "quiche/quic/platform/api/quic_exported_stats.h", -- "quiche/quic/platform/api/quic_fallthrough.h", - "quiche/quic/platform/api/quic_flag_utils.h", - "quiche/quic/platform/api/quic_flags.h", - "quiche/quic/platform/api/quic_iovec.h", - "quiche/quic/platform/api/quic_logging.h", -- "quiche/quic/platform/api/quic_macros.h", - "quiche/quic/platform/api/quic_map_util.h", - "quiche/quic/platform/api/quic_mem_slice.h", - "quiche/quic/platform/api/quic_prefetch.h", -@@ -1072,6 +1065,7 @@ envoy_cc_library( - "quiche/quic/platform/api/quic_stream_buffer_allocator.h", - "quiche/quic/platform/api/quic_string_utils.h", - "quiche/quic/platform/api/quic_uint128.h", -+ "quiche/quic/platform/api/quic_testvalue.h", - # TODO: uncomment the following files as implementations are added. - # "quiche/quic/platform/api/quic_fuzzed_data_provider.h", - # "quiche/quic/platform/api/quic_test_loopback.h", -@@ -1147,7 +1141,6 @@ envoy_cc_test_library( - hdrs = ["quiche/quic/platform/api/quic_port_utils.h"], - repository = "@envoy", - tags = ["nofips"], -- deps = ["@envoy//test/extensions/quic_listeners/quiche/platform:quic_platform_port_utils_impl_lib"], - ) - - envoy_cc_library( -@@ -1216,15 +1209,14 @@ envoy_cc_test_library( - ) - - envoy_cc_library( -- name = "quiche_common_platform_endian", -- hdrs = ["quiche/common/platform/api/quiche_endian.h"], -+ name = "quiche_common_endian_lib", -+ hdrs = ["quiche/common/quiche_endian.h"], - repository = "@envoy", - tags = ["nofips"], - visibility = ["//visibility:public"], - deps = - [ - ":quiche_common_platform_export", -- "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_endian_impl_lib", - ], - ) - -@@ -1932,6 +1924,7 @@ envoy_cc_library( - visibility = ["//visibility:public"], - deps = [ - ":quic_core_clock_lib", -+ ":quic_core_crypto_certificate_view_lib", - ":quic_core_crypto_encryption_lib", - ":quic_core_crypto_hkdf_lib", - ":quic_core_crypto_proof_source_interface_lib", -@@ -2167,6 +2160,15 @@ envoy_cc_library( - ], - ) - -+envoy_cc_library( -+ name = "quic_core_flags_list_lib", -+ hdrs = ["quiche/quic/core/quic_flags_list.h"], -+ copts = quiche_copts, -+ repository = "@envoy", -+ tags = ["nofips"], -+ visibility = ["//visibility:public"], -+) -+ - envoy_cc_library( - name = "quic_core_framer_lib", - srcs = ["quiche/quic/core/quic_framer.cc"], -@@ -2339,6 +2341,7 @@ envoy_cc_library( - repository = "@envoy", - tags = ["nofips"], - deps = [ -+ ":http2_constants_lib", - ":quic_core_data_lib", - ":quic_core_error_codes_lib", - ":quic_core_http_http_frames_lib", -@@ -2723,6 +2726,27 @@ envoy_cc_library( - ], - ) - -+envoy_cc_library( -+ name = "quic_core_path_validator_lib", -+ srcs = ["quiche/quic/core/quic_path_validator.cc"], -+ hdrs = ["quiche/quic/core/quic_path_validator.h"], -+ copts = quiche_copts, -+ repository = "@envoy", -+ tags = ["nofips"], -+ deps = [ -+ ":quic_core_alarm_factory_interface_lib", -+ ":quic_core_alarm_interface_lib", -+ ":quic_core_arena_scoped_ptr_lib", -+ ":quic_core_clock_lib", -+ ":quic_core_constants_lib", -+ ":quic_core_crypto_random_lib", -+ ":quic_core_one_block_arena_lib", -+ ":quic_core_packet_writer_interface_lib", -+ ":quic_core_types_lib", -+ ":quic_platform", -+ ], -+) -+ - envoy_cc_library( - name = "quic_core_process_packet_interface_lib", - hdrs = ["quiche/quic/core/quic_process_packet_interface.h"], -@@ -2735,6 +2759,15 @@ envoy_cc_library( - ], - ) - -+envoy_cc_library( -+ name = "quic_core_protocol_flags_list_lib", -+ hdrs = ["quiche/quic/core/quic_protocol_flags_list.h"], -+ copts = quiche_copts, -+ repository = "@envoy", -+ tags = ["nofips"], -+ visibility = ["//visibility:public"], -+) -+ - envoy_cc_library( - name = "quic_core_qpack_blocking_manager_lib", - srcs = ["quiche/quic/core/qpack/qpack_blocking_manager.cc"], -@@ -2896,6 +2929,7 @@ envoy_cc_library( - deps = [ - ":http2_decoder_decode_buffer_lib", - ":http2_decoder_decode_status_lib", -+ ":quic_core_error_codes_lib", - ":quic_core_qpack_qpack_instruction_decoder_lib", - ":quic_core_qpack_qpack_instructions_lib", - ":quic_core_qpack_qpack_stream_receiver_lib", -@@ -3368,7 +3402,7 @@ envoy_cc_library( - ":quic_core_error_codes_lib", - ":quic_core_time_lib", - ":quic_platform_base", -- ":quiche_common_platform_endian", -+ ":quiche_common_endian_lib", - ], - ) - -@@ -3420,6 +3454,7 @@ envoy_cc_library( - repository = "@envoy", - tags = ["nofips"], - deps = [ -+ ":quic_core_circular_deque_lib", - ":quic_core_connection_stats_lib", - ":quic_core_packets_lib", - ":quic_core_session_notifier_interface_lib", -@@ -3459,6 +3494,7 @@ envoy_cc_library( - deps = [ - ":quic_core_versions_lib", - ":quic_platform_base", -+ ":quiche_common_endian_lib", - ], - ) - -@@ -3475,7 +3511,6 @@ envoy_cc_library( - ":quic_core_tag_lib", - ":quic_core_types_lib", - ":quic_platform_base", -- ":quiche_common_platform_endian", - ], - ) - -@@ -3746,6 +3781,7 @@ envoy_cc_test_library( - ":quic_core_packet_creator_lib", - ":quic_core_packet_writer_interface_lib", - ":quic_core_packets_lib", -+ ":quic_core_path_validator_lib", - ":quic_core_received_packet_manager_lib", - ":quic_core_sent_packet_manager_lib", - ":quic_core_server_id_lib", -@@ -3836,25 +3872,10 @@ envoy_cc_test_library( - deps = [":epoll_server_platform"], - ) - --envoy_cc_library( -- name = "quiche_common_platform_optional", -- hdrs = ["quiche/common/platform/api/quiche_optional.h"], -- repository = "@envoy", -- tags = ["nofips"], -- visibility = ["//visibility:public"], -- deps = [ -- ":quiche_common_platform_export", -- "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_optional_impl_lib", -- ], --) -- - envoy_cc_library( - name = "quiche_common_platform", - hdrs = [ -- "quiche/common/platform/api/quiche_arraysize.h", - "quiche/common/platform/api/quiche_logging.h", -- "quiche/common/platform/api/quiche_optional.h", -- "quiche/common/platform/api/quiche_ptr_util.h", - "quiche/common/platform/api/quiche_str_cat.h", - "quiche/common/platform/api/quiche_string_piece.h", - "quiche/common/platform/api/quiche_text_utils.h", -@@ -3866,7 +3887,6 @@ envoy_cc_library( - visibility = ["//visibility:public"], - deps = [ - ":quiche_common_platform_export", -- ":quiche_common_platform_optional", - "@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_impl_lib", - ], - ) -@@ -3874,7 +3894,6 @@ envoy_cc_library( - envoy_cc_test_library( - name = "quiche_common_platform_test", - srcs = [ -- "quiche/common/platform/api/quiche_endian_test.cc", - "quiche/common/platform/api/quiche_str_cat_test.cc", - "quiche/common/platform/api/quiche_text_utils_test.cc", - "quiche/common/platform/api/quiche_time_utils_test.cc", -@@ -3884,7 +3903,6 @@ envoy_cc_test_library( - tags = ["nofips"], - deps = [ - ":quiche_common_platform", -- ":quiche_common_platform_endian", - "@envoy//test/extensions/quic_listeners/quiche/platform:quiche_common_platform_test_impl_lib", - ], - ) -@@ -3904,8 +3922,8 @@ envoy_cc_library( - tags = ["nofips"], - visibility = ["//visibility:public"], - deps = [ -+ ":quiche_common_endian_lib", - ":quiche_common_platform", -- ":quiche_common_platform_endian", - ], - ) - -@@ -3944,6 +3962,7 @@ envoy_cc_test( - deps = [ - ":http2_platform", - ":http2_test_tools_random", -+ ":quiche_common_test_tools_test_utils_lib", - ], - ) - -diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl -index 6eba5a821..19ddc76e8 100644 ---- a/bazel/repository_locations.bzl -+++ b/bazel/repository_locations.bzl -@@ -671,9 +671,9 @@ DEPENDENCY_REPOSITORIES_SPEC = dict( - project_name = "QUICHE", - project_desc = "QUICHE (QUIC, HTTP/2, Etc) is Google‘s implementation of QUIC and related protocols", - project_url = "https://quiche.googlesource.com/quiche", -- # Static snapshot of https://quiche.googlesource.com/quiche/+archive/f555d99a084cdd086a349548c70fb558ac5847cf.tar.gz -- version = "f555d99a084cdd086a349548c70fb558ac5847cf", -- sha256 = "1833f08e7b0f18b49d7498b029b7f3e6559a82113ec82a98a9e945553756e351", -+ # Static snapshot of https://quiche.googlesource.com/quiche/+archive/ecc28c0d7428f3323ea26eb1ddb98a5e06b23dea.tar.gz -+ version = "ecc28c0d7428f3323ea26eb1ddb98a5e06b23dea", -+ sha256 = "52680dea984dbe899c27176155578b97276e1f1516b7c3a63fb16ba593061859", - urls = ["https://storage.googleapis.com/quiche-envoy-integration/{version}.tar.gz"], - use_category = ["dataplane_ext"], - extensions = ["envoy.transport_sockets.quic"], -diff --git a/source/extensions/quic_listeners/quiche/BUILD b/source/extensions/quic_listeners/quiche/BUILD -index 29eb78d15..a90cfde6d 100644 ---- a/source/extensions/quic_listeners/quiche/BUILD -+++ b/source/extensions/quic_listeners/quiche/BUILD -@@ -212,6 +212,7 @@ envoy_cc_library( - "//source/common/buffer:buffer_lib", - "//source/common/common:assert_lib", - "//source/common/http:header_map_lib", -+ "//source/common/http:header_utility_lib", - "//source/extensions/quic_listeners/quiche/platform:quic_platform_mem_slice_storage_impl_lib", - "@com_googlesource_quiche//:quic_core_http_client_lib", - ], -diff --git a/source/extensions/quic_listeners/quiche/active_quic_listener.cc b/source/extensions/quic_listeners/quiche/active_quic_listener.cc -index f4808adc5..86912292a 100644 ---- a/source/extensions/quic_listeners/quiche/active_quic_listener.cc -+++ b/source/extensions/quic_listeners/quiche/active_quic_listener.cc -@@ -55,7 +55,7 @@ ActiveQuicListener::ActiveQuicListener( - quic::QuicRandom* const random = quic::QuicRandom::GetInstance(); - random->RandBytes(random_seed_, sizeof(random_seed_)); - crypto_config_ = std::make_unique( -- quiche::QuicheStringPiece(reinterpret_cast(random_seed_), sizeof(random_seed_)), -+ absl::string_view(reinterpret_cast(random_seed_), sizeof(random_seed_)), - quic::QuicRandom::GetInstance(), - std::make_unique(listen_socket_, listener_config.filterChainManager(), - stats_), -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc -index e79b08ad9..95d63729d 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_client_connection.cc -@@ -43,7 +43,7 @@ EnvoyQuicClientConnection::EnvoyQuicClientConnection( - const quic::ParsedQuicVersionVector& supported_versions, Event::Dispatcher& dispatcher, - Network::ConnectionSocketPtr&& connection_socket) - : EnvoyQuicConnection( -- server_connection_id, -+ server_connection_id, quic::QuicSocketAddress(), - envoyIpAddressToQuicSocketAddress(connection_socket->remoteAddress()->ip()), helper, - alarm_factory, writer, owns_writer, quic::Perspective::IS_CLIENT, supported_versions, - std::move(connection_socket)), -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc b/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc -index 866e35416..a759b26b1 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_client_stream.cc -@@ -20,6 +20,7 @@ - - #include "common/buffer/buffer_impl.h" - #include "common/http/header_map_impl.h" -+#include "common/http/header_utility.h" - #include "common/common/assert.h" - - namespace Envoy { -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc -index dcc311a6e..d813dfe4b 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_connection.cc -@@ -6,6 +6,7 @@ namespace Envoy { - namespace Quic { - - EnvoyQuicConnection::EnvoyQuicConnection(const quic::QuicConnectionId& server_connection_id, -+ quic::QuicSocketAddress initial_self_address, - quic::QuicSocketAddress initial_peer_address, - quic::QuicConnectionHelperInterface& helper, - quic::QuicAlarmFactory& alarm_factory, -@@ -13,8 +14,9 @@ EnvoyQuicConnection::EnvoyQuicConnection(const quic::QuicConnectionId& server_co - quic::Perspective perspective, - const quic::ParsedQuicVersionVector& supported_versions, - Network::ConnectionSocketPtr&& connection_socket) -- : quic::QuicConnection(server_connection_id, initial_peer_address, &helper, &alarm_factory, -- writer, owns_writer, perspective, supported_versions), -+ : quic::QuicConnection(server_connection_id, initial_self_address, initial_peer_address, -+ &helper, &alarm_factory, writer, owns_writer, perspective, -+ supported_versions), - connection_socket_(std::move(connection_socket)) {} - - EnvoyQuicConnection::~EnvoyQuicConnection() { connection_socket_->close(); } -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_connection.h b/source/extensions/quic_listeners/quiche/envoy_quic_connection.h -index f4c8589d7..f8543bc93 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_connection.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_connection.h -@@ -26,6 +26,7 @@ class EnvoyQuicConnection : public quic::QuicConnection, - protected Logger::Loggable { - public: - EnvoyQuicConnection(const quic::QuicConnectionId& server_connection_id, -+ quic::QuicSocketAddress initial_self_address, - quic::QuicSocketAddress initial_peer_address, - quic::QuicConnectionHelperInterface& helper, - quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc -index ba8f7f3a8..e6351f643 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc -@@ -48,11 +48,11 @@ void EnvoyQuicDispatcher::OnConnectionClosed(quic::QuicConnectionId connection_i - } - - std::unique_ptr EnvoyQuicDispatcher::CreateQuicSession( -- quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& /*self_address*/, -- const quic::QuicSocketAddress& peer_address, quiche::QuicheStringPiece /*alpn*/, -+ quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& self_address, -+ const quic::QuicSocketAddress& peer_address, absl::string_view /*alpn*/, - const quic::ParsedQuicVersion& version) { - auto quic_connection = std::make_unique( -- server_connection_id, peer_address, *helper(), *alarm_factory(), writer(), -+ server_connection_id, self_address, peer_address, *helper(), *alarm_factory(), writer(), - /*owns_writer=*/false, quic::ParsedQuicVersionVector{version}, listen_socket_); - auto quic_session = std::make_unique( - config(), quic::ParsedQuicVersionVector{version}, std::move(quic_connection), this, -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h -index 589ff5327..d59307f41 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h -@@ -62,7 +62,7 @@ protected: - std::unique_ptr - CreateQuicSession(quic::QuicConnectionId server_connection_id, - const quic::QuicSocketAddress& self_address, -- const quic::QuicSocketAddress& peer_address, quiche::QuicheStringPiece alpn, -+ const quic::QuicSocketAddress& peer_address, absl::string_view alpn, - const quic::ParsedQuicVersion& version) override; - - private: -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc -index 1f65e4e7e..967765829 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.cc -@@ -36,7 +36,7 @@ EnvoyQuicProofSource::GetCertChain(const quic::QuicSocketAddress& server_address - - void EnvoyQuicProofSource::signPayload( - const quic::QuicSocketAddress& server_address, const quic::QuicSocketAddress& client_address, -- const std::string& hostname, uint16_t signature_algorithm, quiche::QuicheStringPiece in, -+ const std::string& hostname, uint16_t signature_algorithm, absl::string_view in, - std::unique_ptr callback) { - CertConfigWithFilterChain res = - getTlsCertConfigAndFilterChain(server_address, client_address, hostname); -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h -index 6e1c74c92..e22bf3465 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source.h -@@ -28,7 +28,7 @@ protected: - // quic::ProofSource - void signPayload(const quic::QuicSocketAddress& server_address, - const quic::QuicSocketAddress& client_address, const std::string& hostname, -- uint16_t signature_algorithm, quiche::QuicheStringPiece in, -+ uint16_t signature_algorithm, absl::string_view in, - std::unique_ptr callback) override; - - private: -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc -index 2c82c04d9..9ad3cb07f 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.cc -@@ -21,7 +21,7 @@ void EnvoyQuicProofSourceBase::GetProof(const quic::QuicSocketAddress& server_ad - const std::string& hostname, - const std::string& server_config, - quic::QuicTransportVersion /*transport_version*/, -- quiche::QuicheStringPiece chlo_hash, -+ absl::string_view chlo_hash, - std::unique_ptr callback) { - quic::QuicReferenceCountedPointer chain = - GetCertChain(server_address, client_address, hostname); -@@ -68,13 +68,12 @@ void EnvoyQuicProofSourceBase::GetProof(const quic::QuicSocketAddress& server_ad - auto signature_callback = std::make_unique(std::move(callback), chain); - - signPayload(server_address, client_address, hostname, sign_alg, -- quiche::QuicheStringPiece(payload.get(), payload_size), -- std::move(signature_callback)); -+ absl::string_view(payload.get(), payload_size), std::move(signature_callback)); - } - - void EnvoyQuicProofSourceBase::ComputeTlsSignature( - const quic::QuicSocketAddress& server_address, const quic::QuicSocketAddress& client_address, -- const std::string& hostname, uint16_t signature_algorithm, quiche::QuicheStringPiece in, -+ const std::string& hostname, uint16_t signature_algorithm, absl::string_view in, - std::unique_ptr callback) { - signPayload(server_address, client_address, hostname, signature_algorithm, in, - std::move(callback)); -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h -index b7d76981e..a9e7e8c3f 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_source_base.h -@@ -57,7 +57,7 @@ public: - void GetProof(const quic::QuicSocketAddress& server_address, - const quic::QuicSocketAddress& client_address, const std::string& hostname, - const std::string& server_config, quic::QuicTransportVersion /*transport_version*/, -- quiche::QuicheStringPiece chlo_hash, -+ absl::string_view chlo_hash, - std::unique_ptr callback) override; - - TicketCrypter* GetTicketCrypter() override { return nullptr; } -@@ -65,14 +65,14 @@ public: - void ComputeTlsSignature(const quic::QuicSocketAddress& server_address, - const quic::QuicSocketAddress& client_address, - const std::string& hostname, uint16_t signature_algorithm, -- quiche::QuicheStringPiece in, -+ absl::string_view in, - std::unique_ptr callback) override; - - protected: - virtual void signPayload(const quic::QuicSocketAddress& server_address, - const quic::QuicSocketAddress& client_address, - const std::string& hostname, uint16_t signature_algorithm, -- quiche::QuicheStringPiece in, -+ absl::string_view in, - std::unique_ptr callback) PURE; - - private: -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc b/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc -index 229b3ab36..e37590529 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_base.cc -@@ -58,8 +58,8 @@ bool EnvoyQuicProofVerifierBase::verifySignature(const std::string& server_confi - *error_details = "QuicPacketWriter error."; - return false; - } -- bool valid = cert_view->VerifySignature(quiche::QuicheStringPiece(payload.get(), payload_size), -- signature, sign_alg); -+ bool valid = cert_view->VerifySignature(absl::string_view(payload.get(), payload_size), signature, -+ sign_alg); - if (!valid) { - *error_details = "Signature is not valid."; - } -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc -index b8fa94221..974c6c8eb 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.cc -@@ -11,11 +11,13 @@ namespace Quic { - - EnvoyQuicServerConnection::EnvoyQuicServerConnection( - const quic::QuicConnectionId& server_connection_id, -- quic::QuicSocketAddress initial_peer_address, quic::QuicConnectionHelperInterface& helper, -- quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, bool owns_writer, -+ quic::QuicSocketAddress initial_self_address, quic::QuicSocketAddress initial_peer_address, -+ quic::QuicConnectionHelperInterface& helper, quic::QuicAlarmFactory& alarm_factory, -+ quic::QuicPacketWriter* writer, bool owns_writer, - const quic::ParsedQuicVersionVector& supported_versions, Network::Socket& listen_socket) -- : EnvoyQuicConnection(server_connection_id, initial_peer_address, helper, alarm_factory, writer, -- owns_writer, quic::Perspective::IS_SERVER, supported_versions, -+ : EnvoyQuicConnection(server_connection_id, initial_self_address, initial_peer_address, helper, -+ alarm_factory, writer, owns_writer, quic::Perspective::IS_SERVER, -+ supported_versions, - std::make_unique( - // Wraps the real IoHandle instance so that if the connection socket - // gets closed, the real IoHandle won't be affected. -diff --git a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h -index 7b7fac05e..7625fad02 100644 ---- a/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h -+++ b/source/extensions/quic_listeners/quiche/envoy_quic_server_connection.h -@@ -10,6 +10,7 @@ namespace Quic { - class EnvoyQuicServerConnection : public EnvoyQuicConnection { - public: - EnvoyQuicServerConnection(const quic::QuicConnectionId& server_connection_id, -+ quic::QuicSocketAddress initial_self_address, - quic::QuicSocketAddress initial_peer_address, - quic::QuicConnectionHelperInterface& helper, - quic::QuicAlarmFactory& alarm_factory, quic::QuicPacketWriter* writer, -diff --git a/source/extensions/quic_listeners/quiche/platform/BUILD b/source/extensions/quic_listeners/quiche/platform/BUILD -index f53e07b58..839664d52 100644 ---- a/source/extensions/quic_listeners/quiche/platform/BUILD -+++ b/source/extensions/quic_listeners/quiche/platform/BUILD -@@ -36,15 +36,16 @@ envoy_extension_package() - envoy_cc_library( - name = "flags_impl_lib", - srcs = ["flags_impl.cc"], -- hdrs = [ -- "flags_impl.h", -- "flags_list.h", -- ], -+ hdrs = ["flags_impl.h"], - external_deps = [ - "abseil_base", - "abseil_synchronization", - ], - visibility = ["//visibility:public"], -+ deps = [ -+ "@com_googlesource_quiche//:quic_core_flags_list_lib", -+ "@com_googlesource_quiche//:quic_core_protocol_flags_list_lib", -+ ], - ) - - envoy_cc_library( -@@ -62,7 +63,6 @@ envoy_cc_library( - envoy_cc_library( - name = "http2_platform_impl_lib", - hdrs = [ -- "http2_arraysize_impl.h", - "http2_bug_tracker_impl.h", - "http2_containers_impl.h", - "http2_estimate_memory_usage_impl.h", -@@ -74,7 +74,6 @@ envoy_cc_library( - ], - external_deps = [ - "abseil_base", -- "abseil_optional", - "abseil_str_format", - ], - visibility = ["//visibility:public"], -@@ -114,16 +113,13 @@ envoy_cc_library( - "quic_mem_slice_impl.cc", - ], - hdrs = [ -- "quic_aligned_impl.h", - "quic_client_stats_impl.h", - "quic_containers_impl.h", - "quic_error_code_wrappers_impl.h", - "quic_estimate_memory_usage_impl.h", -- "quic_fallthrough_impl.h", - "quic_flag_utils_impl.h", - "quic_flags_impl.h", - "quic_iovec_impl.h", -- "quic_macros_impl.h", - "quic_map_util_impl.h", - "quic_mem_slice_impl.h", - "quic_prefetch_impl.h", -@@ -132,6 +128,7 @@ envoy_cc_library( - "quic_server_stats_impl.h", - "quic_stack_trace_impl.h", - "quic_stream_buffer_allocator_impl.h", -+ "quic_testvalue_impl.h", - "quic_uint128_impl.h", - ], - external_deps = [ -@@ -141,7 +138,6 @@ envoy_cc_library( - "abseil_memory", - "abseil_node_hash_map", - "abseil_node_hash_set", -- "abseil_optional", - ], - tags = ["nofips"], - visibility = ["//visibility:public"], -@@ -236,6 +232,7 @@ envoy_cc_library( - }), - repository = "@envoy", - tags = ["nofips"], -+ visibility = ["//visibility:public"], - ) - - envoy_cc_library( -@@ -250,23 +247,12 @@ envoy_cc_library( - ], - ) - --envoy_cc_library( -- name = "quiche_common_platform_optional_impl_lib", -- hdrs = ["quiche_optional_impl.h"], -- external_deps = [ -- "abseil_node_hash_map", -- ], -- visibility = ["//visibility:public"], --) -- - envoy_cc_library( - name = "quiche_common_platform_impl_lib", - srcs = ["quiche_time_utils_impl.cc"], - hdrs = [ -- "quiche_arraysize_impl.h", - "quiche_logging_impl.h", - "quiche_map_util_impl.h", -- "quiche_ptr_util_impl.h", - "quiche_str_cat_impl.h", - "quiche_string_piece_impl.h", - "quiche_text_utils_impl.h", -@@ -281,17 +267,14 @@ envoy_cc_library( - deps = [ - ":quic_platform_logging_impl_lib", - ":string_utils_lib", -- "@com_googlesource_quiche//:quiche_common_platform_optional", - ], - ) - - envoy_cc_library( - name = "spdy_platform_impl_lib", - hdrs = [ -- "spdy_arraysize_impl.h", - "spdy_bug_tracker_impl.h", - "spdy_containers_impl.h", -- "spdy_endianness_util_impl.h", - "spdy_estimate_memory_usage_impl.h", - "spdy_flags_impl.h", - "spdy_logging_impl.h", -@@ -331,14 +314,3 @@ envoy_cc_library( - tags = ["nofips"], - visibility = ["//visibility:public"], - ) -- --envoy_cc_library( -- name = "quiche_common_platform_endian_impl_lib", -- hdrs = ["quiche_endian_impl.h"], -- tags = ["nofips"], -- visibility = ["//visibility:public"], -- deps = [ -- "quiche_common_platform_export_impl_lib", -- "//source/common/common:byte_order_lib", -- ], --) -diff --git a/source/extensions/quic_listeners/quiche/platform/flags_impl.cc b/source/extensions/quic_listeners/quiche/platform/flags_impl.cc -index 70fb182d6..9d4ea89ce 100644 ---- a/source/extensions/quic_listeners/quiche/platform/flags_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/flags_impl.cc -@@ -15,12 +15,24 @@ namespace quiche { - - namespace { - --absl::flat_hash_map MakeFlagMap() { -+absl::flat_hash_map makeFlagMap() { - absl::flat_hash_map flags; - --#define QUICHE_FLAG(type, flag, value, help) flags.emplace(FLAGS_##flag->name(), FLAGS_##flag); --#include "extensions/quic_listeners/quiche/platform/flags_list.h" --#undef QUICHE_FLAG -+#define QUIC_FLAG(flag, ...) flags.emplace(flag->name(), flag); -+#include "quiche/quic/core/quic_flags_list.h" -+ QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) -+ QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) -+ QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) -+ QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) -+ QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) -+ QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) -+ QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) -+ QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) -+#undef QUIC_FLAG -+ -+#define QUIC_PROTOCOL_FLAG(type, flag, ...) flags.emplace(FLAGS_##flag->name(), FLAGS_##flag); -+#include "quiche/quic/core/quic_protocol_flags_list.h" -+#undef QUIC_PROTOCOL_FLAG - - return flags; - } -@@ -28,75 +40,123 @@ absl::flat_hash_map MakeFlagMap() { - } // namespace - - // static --FlagRegistry& FlagRegistry::GetInstance() { -+FlagRegistry& FlagRegistry::getInstance() { - static auto* instance = new FlagRegistry(); - return *instance; - } - --FlagRegistry::FlagRegistry() : flags_(MakeFlagMap()) {} -+FlagRegistry::FlagRegistry() : flags_(makeFlagMap()) {} - --void FlagRegistry::ResetFlags() const { -+void FlagRegistry::resetFlags() const { - for (auto& kv : flags_) { -- kv.second->ResetValue(); -+ kv.second->resetValue(); - } - } - --Flag* FlagRegistry::FindFlag(const std::string& name) const { -+Flag* FlagRegistry::findFlag(const std::string& name) const { - auto it = flags_.find(name); - return (it != flags_.end()) ? it->second : nullptr; - } - --template <> bool TypedFlag::SetValueFromString(const std::string& value_str) { -+template <> bool TypedFlag::setValueFromString(const std::string& value_str) { - static const auto* kTrueValues = new std::set({"1", "t", "true", "y", "yes"}); - static const auto* kFalseValues = new std::set({"0", "f", "false", "n", "no"}); - auto lower = absl::AsciiStrToLower(value_str); - if (kTrueValues->find(lower) != kTrueValues->end()) { -- SetValue(true); -+ setValue(true); - return true; - } - if (kFalseValues->find(lower) != kFalseValues->end()) { -- SetValue(false); -+ setValue(false); - return true; - } - return false; - } - --template <> bool TypedFlag::SetValueFromString(const std::string& value_str) { -+template <> bool TypedFlag::setValueFromString(const std::string& value_str) { - int32_t value; - if (absl::SimpleAtoi(value_str, &value)) { -- SetValue(value); -+ setValue(value); - return true; - } - return false; - } - --template <> bool TypedFlag::SetValueFromString(const std::string& value_str) { -+template <> bool TypedFlag::setValueFromString(const std::string& value_str) { - int64_t value; - if (absl::SimpleAtoi(value_str, &value)) { -- SetValue(value); -+ setValue(value); - return true; - } - return false; - } - --template <> bool TypedFlag::SetValueFromString(const std::string& value_str) { -+template <> bool TypedFlag::setValueFromString(const std::string& value_str) { - double value; - if (absl::SimpleAtod(value_str, &value)) { -- SetValue(value); -+ setValue(value); - return true; - } - return false; - } - --template <> bool TypedFlag::SetValueFromString(const std::string& value_str) { -- SetValue(value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str) { -+ setValue(value_str); - return true; - } - -+template <> bool TypedFlag::setValueFromString(const std::string& value_str) { -+ unsigned long value; -+ if (absl::SimpleAtoi(value_str, &value)) { -+ setValue(value); -+ return true; -+ } -+ return false; -+} -+ -+template <> bool TypedFlag::setValueFromString(const std::string& value_str) { -+ unsigned long long value; -+ if (absl::SimpleAtoi(value_str, &value)) { -+ setValue(value); -+ return true; -+ } -+ return false; -+} -+ - // Flag definitions --#define QUICHE_FLAG(type, flag, value, help) \ -- TypedFlag* FLAGS_##flag = new TypedFlag(#flag, value, help); --#include "extensions/quic_listeners/quiche/platform/flags_list.h" --#undef QUICHE_FLAG -+#define QUIC_FLAG(flag, value) TypedFlag* flag = new TypedFlag(#flag, value, ""); -+#include "quiche/quic/core/quic_flags_list.h" -+QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) -+ -+#undef QUIC_FLAG -+ -+#define STRINGIFY(X) #X -+ -+#define DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, value, help) \ -+ TypedFlag* FLAGS_##flag = new TypedFlag(STRINGIFY(FLAGS_##flag), value, help); -+ -+#define DEFINE_QUIC_PROTOCOL_FLAG_SINGLE_VALUE(type, flag, value, doc) \ -+ DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, value, doc) -+ -+#define DEFINE_QUIC_PROTOCOL_FLAG_TWO_VALUES(type, flag, internal_value, external_value, doc) \ -+ DEFINE_QUIC_PROTOCOL_FLAG_IMPL(type, flag, external_value, doc) -+ -+// Select the right macro based on the number of arguments. -+#define GET_6TH_ARG(arg1, arg2, arg3, arg4, arg5, arg6, ...) arg6 -+ -+#define QUIC_PROTOCOL_FLAG_MACRO_CHOOSER(...) \ -+ GET_6TH_ARG(__VA_ARGS__, DEFINE_QUIC_PROTOCOL_FLAG_TWO_VALUES, \ -+ DEFINE_QUIC_PROTOCOL_FLAG_SINGLE_VALUE) -+ -+#define QUIC_PROTOCOL_FLAG(...) QUIC_PROTOCOL_FLAG_MACRO_CHOOSER(__VA_ARGS__)(__VA_ARGS__) -+#include "quiche/quic/core/quic_protocol_flags_list.h" -+#undef QUIC_PROTOCOL_FLAG - - } // namespace quiche -diff --git a/source/extensions/quic_listeners/quiche/platform/flags_impl.h b/source/extensions/quic_listeners/quiche/platform/flags_impl.h -index 5db939925..83ed8430c 100644 ---- a/source/extensions/quic_listeners/quiche/platform/flags_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/flags_impl.h -@@ -26,13 +26,13 @@ public: - ~FlagRegistry() = default; - - // Return singleton instance. -- static FlagRegistry& GetInstance(); -+ static FlagRegistry& getInstance(); - - // Reset all registered flags to their default values. -- void ResetFlags() const; -+ void resetFlags() const; - - // Look up a flag by name. -- Flag* FindFlag(const std::string& name) const; -+ Flag* findFlag(const std::string& name) const; - - private: - FlagRegistry(); -@@ -48,10 +48,10 @@ public: - virtual ~Flag() = default; - - // Set flag value from given string, returning true iff successful. -- virtual bool SetValueFromString(const std::string& value_str) = 0; -+ virtual bool setValueFromString(const std::string& value_str) = 0; - - // Reset flag to default value. -- virtual void ResetValue() = 0; -+ virtual void resetValue() = 0; - - // Return flag name. - std::string name() const { return name_; } -@@ -70,15 +70,15 @@ public: - TypedFlag(const char* name, T default_value, const char* help) - : Flag(name, help), value_(default_value), default_value_(default_value) {} - -- bool SetValueFromString(const std::string& value_str) override; -+ bool setValueFromString(const std::string& value_str) override; - -- void ResetValue() override { -+ void resetValue() override { - absl::MutexLock lock(&mutex_); - value_ = default_value_; - } - - // Set flag value. -- void SetValue(T value) { -+ void setValue(T value) { - absl::MutexLock lock(&mutex_); - value_ = value; - } -@@ -96,15 +96,29 @@ private: - }; - - // SetValueFromString specializations --template <> bool TypedFlag::SetValueFromString(const std::string& value_str); --template <> bool TypedFlag::SetValueFromString(const std::string& value_str); --template <> bool TypedFlag::SetValueFromString(const std::string& value_str); --template <> bool TypedFlag::SetValueFromString(const std::string& value_str); --template <> bool TypedFlag::SetValueFromString(const std::string& value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str); -+template <> bool TypedFlag::setValueFromString(const std::string& value_str); - - // Flag declarations --#define QUICHE_FLAG(type, flag, value, help) extern TypedFlag* FLAGS_##flag; --#include "extensions/quic_listeners/quiche/platform/flags_list.h" --#undef QUICHE_FLAG -+#define QUIC_FLAG(flag, ...) extern TypedFlag* flag; -+#include "quiche/quic/core/quic_flags_list.h" -+QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_spdy_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_restart_flag_spdy_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_reloadable_flag_http2_testonly_default_true, true) -+QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_false, false) -+QUIC_FLAG(FLAGS_quic_restart_flag_http2_testonly_default_true, true) -+#undef QUIC_FLAG -+ -+#define QUIC_PROTOCOL_FLAG(type, flag, ...) extern TypedFlag* FLAGS_##flag; -+#include "quiche/quic/core/quic_protocol_flags_list.h" -+#undef QUIC_PROTOCOL_FLAG - - } // namespace quiche -diff --git a/source/extensions/quic_listeners/quiche/platform/flags_list.h b/source/extensions/quic_listeners/quiche/platform/flags_list.h -deleted file mode 100644 -index 7e9e20a7c..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/flags_list.h -+++ /dev/null -@@ -1,502 +0,0 @@ --// This file intentionally does not have header guards. It is intended to be --// included multiple times, each time with a different definition of --// QUICHE_FLAG. -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --// This file is generated by //third_party/quic/tools:quic_flags_list in --// Google3. -- --#if defined(QUICHE_FLAG) -- --QUICHE_FLAG( -- bool, http2_reloadable_flag_http2_backend_alpn_failure_error_code, false, -- "If true, the GFE will return a new ResponseCodeDetails error when ALPN to the backend fails.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_http2_ip_based_cwnd_exp, true, -- "If true, enable IP address based CWND bootstrapping experiment with different " -- "bandwidth models and priorities in HTTP2.") -- --QUICHE_FLAG( -- bool, http2_reloadable_flag_http2_load_based_goaway_warning, false, -- "If true, load-based connection closures will send a warning GOAWAY before the actual GOAWAY.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_http2_security_requirement_for_client3, false, -- "If true, check whether client meets security requirements during SSL handshake. If " -- "flag is true and client does not meet security requirements, do not negotiate HTTP/2 " -- "with client or terminate the session with SPDY_INADEQUATE_SECURITY if HTTP/2 is " -- "already negotiated. The spec contains both cipher and TLS version requirements.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_http2_websocket_detection, false, -- "If true, uses a HTTP/2-specific method of detecting websocket upgrade requests.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_permissive_http2_switch, false, -- "If true, the GFE allows both HTTP/1.0 and HTTP/1.1 versions in HTTP/2 upgrade " -- "requests/responses.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_advertise_quic_for_https_for_debugips, false, "") -- --QUICHE_FLAG(bool, quic_reloadable_flag_advertise_quic_for_https_for_external_users, false, "") -- --QUICHE_FLAG(bool, quic_reloadable_flag_gclb_quic_allow_alia, true, -- "If gfe2_reloadable_flag_gclb_use_alia is also true, use Alia for GCLB QUIC " -- "handshakes. To be used as a big red button if there's a problem with Alia/QUIC.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_abort_qpack_on_stream_close, false, -- "If true, abort async QPACK header decompression in QuicSpdyStream::OnClose().") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_ack_delay_alarm_granularity, false, -- "When true, ensure the ACK delay is never less than the alarm granularity when ACK " -- "decimation is enabled.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_missing_connected_checks, false, -- "If true, add missing connected checks.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_silent_idle_timeout, true, -- "If true, when server is silently closing connections due to idle timeout, serialize " -- "the connection close packets which will be added to time wait list.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_add_stream_info_to_idle_close_detail, false, -- "If true, include stream information in idle timeout connection close detail.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_allow_backend_set_stream_ttl, false, -- "If true, check backend response header for X-Response-Ttl. If it is provided, the " -- "stream TTL is set. A QUIC stream will be immediately canceled when tries to write " -- "data if this TTL expired.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_allow_client_enabled_bbr_v2, true, -- "If true, allow client to enable BBRv2 on server via connection option 'B2ON'.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_alpn_dispatch, false, -- "Support different QUIC sessions, as indicated by ALPN. Used for QBONE.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_avoid_too_low_probe_bw_cwnd, false, -- "If true, QUIC BBRv2's PROBE_BW mode will not reduce cwnd below BDP+ack_height.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_fewer_startup_round_trips, false, -- "When true, the 1RTT and 2RTT connection options decrease the number of round trips in " -- "BBRv2 STARTUP without a 25% bandwidth increase to 1 or 2 round trips respectively.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_bbr2_limit_inflight_hi, false, -- "When true, the B2HI connection option limits reduction of inflight_hi to (1-Beta)*CWND.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr2_use_post_inflight_to_detect_queuing, false, -- "If true, QUIC BBRv2 will use inflight byte after congestion event to detect queuing " -- "during PROBE_UP.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bbr_no_bytes_acked_in_startup_recovery, false, -- "When in STARTUP and recovery, do not add bytes_acked to QUIC BBR's CWND in " -- "CalculateCongestionWindow()") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_bootstrap_cwnd_by_spdy_priority, true, -- "If true, bootstrap initial QUIC cwnd by SPDY priorities.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_cap_large_client_initial_rtt, true, -- "If true, cap client suggested initial RTT to 1s if it is longer than 1s.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_clean_up_spdy_session_destructor, false, -- "If true, QuicSpdySession's destructor won't need to do cleanup.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_close_connection_in_on_can_write_with_blocked_writer, -- false, -- "If true, close connection if writer is still blocked while OnCanWrite is called.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_close_connection_on_serialization_failure, false, -- "If true, close connection on packet serialization failures.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_conservative_bursts, false, -- "If true, set burst token to 2 in cwnd bootstrapping experiment.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_conservative_cwnd_and_pacing_gains, false, -- "If true, uses conservative cwnd gain and pacing gain when cwnd gets bootstrapped.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_copy_bbr_cwnd_to_bbr2, false, -- "If true, when switching from BBR to BBRv2, BBRv2 will use BBR's cwnd as its initial cwnd.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_enable_5rto_blackhole_detection2, true, -- "If true, default-enable 5RTO blachole detection.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_on_pto, false, -- "If true, default on PTO which unifies TLP + RTO loss recovery.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_to_bbr, true, -- "When true, defaults to BBR congestion control instead of Cubic.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_default_to_bbr_v2, false, -- "If true, use BBRv2 as the default congestion controller. Takes precedence over " -- "--quic_default_to_bbr.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_server_blackhole_detection, false, -- "If true, disable blackhole detection on server side.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_draft_27, false, -- "If true, disable QUIC version h3-27.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_draft_29, false, -- "If true, disable QUIC version h3-29.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q043, false, -- "If true, disable QUIC version Q043.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q046, false, -- "If true, disable QUIC version Q046.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_q050, false, -- "If true, disable QUIC version Q050.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_t050, false, -- "If true, disable QUIC version h3-T050.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_disable_version_t051, false, -- "If true, disable QUIC version h3-T051.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_discard_initial_packet_with_key_dropped, false, -- "If true, discard INITIAL packet if the key has been dropped.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_do_not_accept_stop_waiting, false, -- "In v44 and above, where STOP_WAITING is never sent, close the connection if it's received.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_donot_reset_ideal_next_packet_send_time, false, -- "If true, stop resetting ideal_next_packet_send_time_ in pacing sender.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_enable_loss_detection_experiment_at_gfe, false, -- "If ture, enable GFE-picked loss detection experiment.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_enable_loss_detection_tuner, false, -- "If true, allow QUIC loss detection tuning to be enabled by connection option ELDT.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_enable_mtu_discovery_at_server, false, -- "If true, QUIC will default enable MTU discovery at server, with a target of 1450 bytes.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_enabled, false, "") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_arm_pto_for_application_data, false, -- "If true, do not arm PTO for application data until handshake confirmed.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_bytes_left_for_batch_write, false, -- "If true, convert bytes_left_for_batch_write_ to unsigned int.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_fix_http3_goaway_stream_id, false, -- "If true, send the lowest stream ID that can be retried by the client in a GOAWAY frame. If " -- "false, send the highest received stream ID, which actually should not be retried.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_out_of_order_sending, false, -- "If true, fix a potential out of order sending caused by handshake gets confirmed " -- "while the coalescer is not empty.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_fix_pto_pending_timer_count, false, -- "If true, make sure there is pending timer credit when trying to PTO retransmit any packets.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_fix_undecryptable_packets2, false, -- "If true, remove processed undecryptable packets.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_get_stream_information_from_stream_map, true, -- "If true, gQUIC will only consult stream_map in QuicSession::GetNumActiveStreams().") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_give_sent_packet_to_debug_visitor_after_sent, false, -- "If true, QUIC connection will pass sent packet information to the debug visitor after " -- "a packet is recorded as sent in sent packet manager.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_http3_new_default_urgency_value, false, -- "If true, QuicStream::kDefaultUrgency is 3, otherwise 1.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_ip_based_cwnd_exp, true, -- "If true, enable IP address based CWND bootstrapping experiment with different " -- "bandwidth models and priorities. ") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_listener_never_fake_epollout, false, -- "If true, QuicListener::OnSocketIsWritable will always return false, which means there " -- "will never be a fake EPOLLOUT event in the next epoll iteration.") -- --QUICHE_FLAG(bool, -- quic_reloadable_flag_quic_neuter_initial_packet_in_coalescer_with_initial_key_discarded, -- false, "If true, neuter initial packet in the coalescer when discarding initial keys.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_no_dup_experiment_id_2, false, -- "If true, transport connection stats doesn't report duplicated experiments for same " -- "connection.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_no_silent_close_for_idle_timeout, true, -- "If true, always send connection close for idle timeout if NSLC is received.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_only_set_uaid_in_tcs_visitor, false, -- "If true, QuicTransportConnectionStatsVisitor::PopulateTransportConnectionStats will " -- "be the only place where TCS's uaid field is set.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_only_truncate_long_cids, true, -- "In IETF QUIC, only truncate long CIDs from the client's Initial, don't modify them.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_preferred_altsvc_version, false, -- "When true, we will send a preferred QUIC version at the start of our Alt-Svc list.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_proxy_write_packed_strings, false, -- "If true, QuicProxyDispatcher will write packed_client_address and packed_server_vip " -- "in TcpProxyHeaderProto.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_record_frontend_service_vip_mapping, true, -- "If true, for L1 GFE, as requests come in, record frontend service to VIP mapping " -- "which is used to announce VIP in SHLO for proxied sessions. ") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_record_received_min_ack_delay, false, -- "If true, record the received min_ack_delay in transport parameters to QUIC config.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_reject_all_traffic, false, "") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_remove_zombie_streams, true, -- "If true, QuicSession doesn't keep a separate zombie_streams. Instead, all streams are " -- "stored in stream_map_.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_require_handshake_confirmation, false, -- "If true, require handshake confirmation for QUIC connections, functionally disabling " -- "0-rtt handshakes.") -- --QUICHE_FLAG( -- bool, quic_reloadable_flag_quic_send_key_update_not_yet_supported, false, -- "When true, QUIC+TLS versions will send the key_update_not_yet_supported transport parameter.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_send_path_response, false, -- "If true, send PATH_RESPONSE upon receiving PATH_CHALLENGE regardless of perspective. " -- "--gfe2_reloadable_flag_quic_start_peer_migration_earlier has to be true before turn " -- "on this flag.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_send_timestamps, false, -- "When the STMP connection option is sent by the client, timestamps in the QUIC ACK " -- "frame are sent and processed.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_server_push, false, -- "If true, enable server push feature on QUIC.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_set_resumed_ssl_session_early, false, -- "If true, set resumed_ssl_session if this is a 0-RTT connection.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_start_peer_migration_earlier, false, -- "If true, while reading an IETF quic packet, start peer migration immediately when " -- "detecting the existence of any non-probing frame instead of at the end of the packet.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_stop_sending_uses_ietf_error_code, false, -- "If true, use IETF QUIC application error codes in STOP_SENDING frames. If false, use " -- "QuicRstStreamErrorCodes.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_testonly_default_false, false, -- "A testonly reloadable flag that will always default to false.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_testonly_default_true, true, -- "A testonly reloadable flag that will always default to true.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_unified_iw_options, false, -- "When true, set the initial congestion control window from connection options in " -- "QuicSentPacketManager rather than TcpCubicSenderBytes.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_use_header_stage_idle_list2, false, -- "If true, use header stage idle list for QUIC connections in GFE.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_quic_use_leto_key_exchange, false, -- "If true, QUIC will attempt to use the Leto key exchange service and only fall back to " -- "local key exchange if that fails.") -- --QUICHE_FLAG(bool, quic_reloadable_flag_send_quic_fallback_server_config_on_leto_error, false, -- "If true and using Leto for QUIC shared-key calculations, GFE will react to a failure " -- "to contact Leto by sending a REJ containing a fallback ServerConfig, allowing the " -- "client to continue the handshake.") -- --QUICHE_FLAG( -- bool, quic_restart_flag_dont_fetch_quic_private_keys_from_leto, false, -- "If true, GFE will not request private keys when fetching QUIC ServerConfigs from Leto.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_adjust_initial_cwnd_by_gws, true, -- "If true, GFE informs backend that a client request is the first one on the connection " -- "via frontline header \"first_request=1\". Also, adjust initial cwnd based on " -- "X-Google-Gws-Initial-Cwnd-Mode sent by GWS.") -- --QUICHE_FLAG( -- bool, quic_restart_flag_quic_allow_loas_multipacket_chlo, false, -- "If true, inspects QUIC CHLOs for kLOAS and early creates sessions to allow multi-packet CHLOs") -- --QUICHE_FLAG( -- bool, quic_restart_flag_quic_disable_gws_cwnd_experiment, false, -- "If true, X-Google-Gws-Initial-Cwnd-Mode related header sent by GWS becomes no-op for QUIC.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_enable_tls_resumption_v4, true, -- "If true, enables support for TLS resumption in QUIC.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_enable_zero_rtt_for_tls_v2, true, -- "If true, support for IETF QUIC 0-rtt is enabled.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_offload_pacing_to_usps2, false, -- "If true, QUIC offload pacing when using USPS as egress method.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_rx_ring_use_tpacket_v3, false, -- "If true, use TPACKET_V3 for QuicRxRing instead of TPACKET_V2.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_should_accept_new_connection, false, -- "If true, reject QUIC CHLO packets when dispatcher is asked to do so.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_support_release_time_for_gso, false, -- "If true, QuicGsoBatchWriter will support release time if it is available and the " -- "process has the permission to do so.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_testonly_default_false, false, -- "A testonly restart flag that will always default to false.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_testonly_default_true, true, -- "A testonly restart flag that will always default to true.") -- --QUICHE_FLAG( -- bool, quic_restart_flag_quic_use_leto_for_quic_configs, false, -- "If true, use Leto to fetch QUIC server configs instead of using the seeds from Memento.") -- --QUICHE_FLAG(bool, quic_restart_flag_quic_use_pigeon_socket_to_backend, false, -- "If true, create a shared pigeon socket for all quic to backend connections and switch " -- "to use it after successful handshake.") -- --QUICHE_FLAG(bool, spdy_reloadable_flag_quic_bootstrap_cwnd_by_spdy_priority, true, -- "If true, bootstrap initial QUIC cwnd by SPDY priorities.") -- --QUICHE_FLAG(bool, spdy_reloadable_flag_quic_clean_up_spdy_session_destructor, false, -- "If true, QuicSpdySession's destructor won't need to do cleanup.") -- --QUICHE_FLAG( -- bool, spdy_reloadable_flag_spdy_discard_response_body_if_disallowed, false, -- "If true, SPDY will discard all response body bytes when response code indicates no response " -- "body should exist. Previously, we only discard partial bytes on the first response processing " -- "and the rest of the response bytes would still be delivered even though the response code " -- "said there should not be any body associated with the response code.") -- --QUICHE_FLAG(bool, quic_allow_chlo_buffering, true, -- "If true, allows packets to be buffered in anticipation of a " -- "future CHLO, and allow CHLO packets to be buffered until next " -- "iteration of the event loop.") -- --QUICHE_FLAG(bool, quic_disable_pacing_for_perf_tests, false, "If true, disable pacing in QUIC") -- --QUICHE_FLAG(bool, quic_enforce_single_packet_chlo, true, -- "If true, enforce that QUIC CHLOs fit in one packet") -- --QUICHE_FLAG(int64_t, quic_time_wait_list_max_connections, 600000, -- "Maximum number of connections on the time-wait list. " -- "A negative value implies no configured limit.") -- --QUICHE_FLAG(int64_t, quic_time_wait_list_seconds, 200, -- "Time period for which a given connection_id should live in " -- "the time-wait state.") -- --QUICHE_FLAG(double, quic_bbr_cwnd_gain, 2.0f, -- "Congestion window gain for QUIC BBR during PROBE_BW phase.") -- --QUICHE_FLAG(int32_t, quic_buffered_data_threshold, 8 * 1024, -- "If buffered data in QUIC stream is less than this " -- "threshold, buffers all provided data or asks upper layer for more data") -- --QUICHE_FLAG(int32_t, quic_send_buffer_max_data_slice_size, 4 * 1024, -- "Max size of data slice in bytes for QUIC stream send buffer.") -- --QUICHE_FLAG(int32_t, quic_lumpy_pacing_size, 2, -- "Number of packets that the pacing sender allows in bursts during " -- "pacing. This flag is ignored if a flow's estimated bandwidth is " -- "lower than 1200 kbps.") -- --QUICHE_FLAG(double, quic_lumpy_pacing_cwnd_fraction, 0.25f, -- "Congestion window fraction that the pacing sender allows in bursts " -- "during pacing.") -- --QUICHE_FLAG(int32_t, quic_max_pace_time_into_future_ms, 10, -- "Max time that QUIC can pace packets into the future in ms.") -- --QUICHE_FLAG(double, quic_pace_time_into_future_srtt_fraction, 0.125f, -- "Smoothed RTT fraction that a connection can pace packets into the future.") -- --QUICHE_FLAG(bool, quic_export_server_num_packets_per_write_histogram, false, -- "If true, export number of packets written per write operation histogram.") -- --QUICHE_FLAG(bool, quic_disable_version_negotiation_grease_randomness, false, -- "If true, use predictable version negotiation versions.") -- --QUICHE_FLAG(bool, quic_enable_http3_grease_randomness, true, -- "If true, use random greased settings and frames.") -- --QUICHE_FLAG(int64_t, quic_max_tracked_packet_count, 10000, "Maximum number of tracked packets.") -- --QUICHE_FLAG(bool, quic_prober_uses_length_prefixed_connection_ids, false, -- "If true, QuicFramer::WriteClientVersionNegotiationProbePacket uses " -- "length-prefixed connection IDs.") -- --QUICHE_FLAG(bool, quic_client_convert_http_header_name_to_lowercase, true, -- "If true, HTTP request header names sent from QuicSpdyClientBase(and " -- "descendents) will be automatically converted to lower case.") -- --QUICHE_FLAG(bool, quic_enable_http3_server_push, false, -- "If true, server push will be allowed in QUIC versions that use HTTP/3.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_base_duration_ms, 2000, -- "The default minimum duration for BBRv2-native probes, in milliseconds.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_max_rand_duration_ms, 1000, -- "The default upper bound of the random amount of BBRv2-native " -- "probes, in milliseconds.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_probe_rtt_period_ms, 10000, -- "The default period for entering PROBE_RTT, in milliseconds.") -- --QUICHE_FLAG(double, quic_bbr2_default_loss_threshold, 0.02, -- "The default loss threshold for QUIC BBRv2, should be a value " -- "between 0 and 1.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_startup_full_loss_count, 8, -- "The default minimum number of loss marking events to exit STARTUP.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_probe_bw_full_loss_count, 2, -- "The default minimum number of loss marking events to exit PROBE_UP phase.") -- --QUICHE_FLAG(double, quic_bbr2_default_inflight_hi_headroom, 0.01, -- "The default fraction of unutilized headroom to try to leave in path " -- "upon high loss.") -- --QUICHE_FLAG(int32_t, quic_bbr2_default_initial_ack_height_filter_window, 10, -- "The default initial value of the max ack height filter's window length.") -- --QUICHE_FLAG(double, quic_ack_aggregation_bandwidth_threshold, 1.0, -- "If the bandwidth during ack aggregation is smaller than (estimated " -- "bandwidth * this flag), consider the current aggregation completed " -- "and starts a new one.") -- --QUICHE_FLAG(int32_t, quic_anti_amplification_factor, 5, -- "Anti-amplification factor. Before address validation, server will " -- "send no more than factor times bytes received.") -- --QUICHE_FLAG(int32_t, quic_max_buffered_crypto_bytes, 16 * 1024, -- "The maximum amount of CRYPTO frame data that can be buffered.") -- --QUICHE_FLAG(int32_t, quic_max_aggressive_retransmittable_on_wire_ping_count, 0, -- "If set to non-zero, the maximum number of consecutive pings that " -- "can be sent with aggressive initial retransmittable on wire timeout " -- "if there is no new data received. After which, the timeout will be " -- "exponentially back off until exceeds the default ping timeout.") -- --QUICHE_FLAG(int32_t, quic_max_congestion_window, 2000, "The maximum congestion window in packets.") -- --QUICHE_FLAG(int32_t, quic_max_streams_window_divisor, 2, -- "The divisor that controls how often MAX_STREAMS frame is sent.") -- --QUICHE_FLAG(bool, http2_reloadable_flag_http2_testonly_default_false, false, -- "A testonly reloadable flag that will always default to false.") -- --QUICHE_FLAG(bool, http2_restart_flag_http2_testonly_default_false, false, -- "A testonly restart flag that will always default to false.") -- --QUICHE_FLAG(bool, spdy_reloadable_flag_spdy_testonly_default_false, false, -- "A testonly reloadable flag that will always default to false.") -- --QUICHE_FLAG(bool, spdy_restart_flag_spdy_testonly_default_false, false, -- "A testonly restart flag that will always default to false.") -- --#endif -diff --git a/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h -index 7d2561469..dc6fe5429 100644 ---- a/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/http2_flags_impl.h -@@ -8,10 +8,10 @@ - - #include "extensions/quic_listeners/quiche/platform/flags_impl.h" - --#define GetHttp2ReloadableFlagImpl(flag) quiche::FLAGS_http2_reloadable_flag_##flag->value() -+#define GetHttp2ReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() - - #define SetHttp2ReloadableFlagImpl(flag, value) \ -- quiche::FLAGS_http2_reloadable_flag_##flag->SetValue(value) -+ quiche::FLAGS_quic_reloadable_flag_##flag->setValue(value) - - #define HTTP2_CODE_COUNT_N_IMPL(flag, instance, total) \ - do { \ -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h -deleted file mode 100644 -index 3f595380b..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quic_aligned_impl.h -+++ /dev/null -@@ -1,18 +0,0 @@ --#pragma once -- --#include "absl/base/optimization.h" -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#define QUIC_ALIGN_OF_IMPL alignof --#ifdef _MSC_VER --#define QUIC_ALIGNED_IMPL(X) __declspec(align(X)) --#else --#define QUIC_ALIGNED_IMPL(X) __attribute__((aligned(X))) --#endif --#define QUIC_CACHELINE_ALIGNED_IMPL ABSL_CACHELINE_ALIGNED --#define QUIC_CACHELINE_SIZE_IMPL ABSL_CACHELINE_SIZE -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc -index 2a886a12c..27b977908 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.cc -@@ -10,25 +10,7 @@ - - namespace quic { - --// static --bool QuicCertUtilsImpl::ExtractSubjectNameFromDERCert(quiche::QuicheStringPiece cert, -- quiche::QuicheStringPiece* subject_out) { -- CBS tbs_certificate; -- if (!SeekToSubject(cert, &tbs_certificate)) { -- return false; -- } -- -- CBS subject; -- if (!CBS_get_asn1_element(&tbs_certificate, &subject, CBS_ASN1_SEQUENCE)) { -- return false; -- } -- *subject_out = -- absl::string_view(reinterpret_cast(CBS_data(&subject)), CBS_len(&subject)); -- return true; --} -- --// static --bool QuicCertUtilsImpl::SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_certificate) { -+bool seekToSubject(absl::string_view cert, CBS* tbs_certificate) { - CBS der; - CBS_init(&der, reinterpret_cast(cert.data()), cert.size()); - CBS certificate; -@@ -65,4 +47,22 @@ bool QuicCertUtilsImpl::SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_c - return true; - } - -+// static -+// NOLINTNEXTLINE(readability-identifier-naming) -+bool QuicCertUtilsImpl::ExtractSubjectNameFromDERCert(absl::string_view cert, -+ absl::string_view* subject_out) { -+ CBS tbs_certificate; -+ if (!seekToSubject(cert, &tbs_certificate)) { -+ return false; -+ } -+ -+ CBS subject; -+ if (!CBS_get_asn1_element(&tbs_certificate, &subject, CBS_ASN1_SEQUENCE)) { -+ return false; -+ } -+ *subject_out = -+ absl::string_view(reinterpret_cast(CBS_data(&subject)), CBS_len(&subject)); -+ return true; -+} -+ - } // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h -index 0c41b9dbc..29b882b7d 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_cert_utils_impl.h -@@ -6,18 +6,15 @@ - // consumed or referenced directly by other Envoy code. It serves purely as a - // porting layer for QUICHE. - -+#include "absl/strings/string_view.h" - #include "openssl/base.h" --#include "quiche/common/platform/api/quiche_string_piece.h" - - namespace quic { - - class QuicCertUtilsImpl { - public: -- static bool ExtractSubjectNameFromDERCert(quiche::QuicheStringPiece cert, -- quiche::QuicheStringPiece* subject_out); -- --private: -- static bool SeekToSubject(quiche::QuicheStringPiece cert, CBS* tbs_certificate); -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ static bool ExtractSubjectNameFromDERCert(absl::string_view cert, absl::string_view* subject_out); - }; - - } // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h -deleted file mode 100644 -index aa9d6bc36..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quic_fallthrough_impl.h -+++ /dev/null -@@ -1,11 +0,0 @@ --#pragma once -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#include "absl/base/macros.h" -- --#define QUIC_FALLTHROUGH_INTENDED_IMPL ABSL_FALLTHROUGH_INTENDED -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc -index 91d52c44a..b2e396fab 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.cc -@@ -36,6 +36,7 @@ void depthFirstTraverseDirectory(const std::string& dirname, std::vector ReadFileContentsImpl(const std::string& dirname) { - std::vector files; - depthFirstTraverseDirectory(dirname, files); -@@ -43,7 +44,8 @@ std::vector ReadFileContentsImpl(const std::string& dirname) { - } - - // Reads the contents of |filename| as a string into |contents|. --void ReadFileContentsImpl(quiche::QuicheStringPiece filename, std::string* contents) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+void ReadFileContentsImpl(absl::string_view filename, std::string* contents) { - #ifdef WIN32 - Envoy::Filesystem::InstanceImplWin32 fs; - #else -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h -index 654c1ad18..25c31e9de 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_file_utils_impl.h -@@ -8,7 +8,7 @@ - - #include - --#include "quiche/common/platform/api/quiche_string_piece.h" -+#include "absl/strings/string_view.h" - - namespace quic { - -@@ -16,6 +16,7 @@ namespace quic { - * Traverses the directory |dirname| and returns all of the files it contains. - * @param dirname full path without trailing '/'. - */ -+// NOLINTNEXTLINE(readability-identifier-naming)` - std::vector ReadFileContentsImpl(const std::string& dirname); - - /** -@@ -23,6 +24,7 @@ std::vector ReadFileContentsImpl(const std::string& dirname); - * @param filename the full path to the file. - * @param contents output location of the file content. - */ --void ReadFileContentsImpl(quiche::QuicheStringPiece filename, std::string* contents); -+// NOLINTNEXTLINE(readability-identifier-naming) -+void ReadFileContentsImpl(absl::string_view filename, std::string* contents); - - } // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h -index 872495f2d..d562bb1a4 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_flags_impl.h -@@ -15,16 +15,16 @@ - #define GetQuicFlagImpl(flag) (quiche::flag)->value() - - // |flag| is the global flag variable, which is a pointer to TypedFlag. --#define SetQuicFlagImpl(flag, value) (quiche::flag)->SetValue(value) -+#define SetQuicFlagImpl(flag, value) (quiche::flag)->setValue(value) - - #define GetQuicReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() - - #define SetQuicReloadableFlagImpl(flag, value) \ -- quiche::FLAGS_quic_reloadable_flag_##flag->SetValue(value) -+ quiche::FLAGS_quic_reloadable_flag_##flag->setValue(value) - - #define GetQuicRestartFlagImpl(flag) quiche::FLAGS_quic_restart_flag_##flag->value() - --#define SetQuicRestartFlagImpl(flag, value) quiche::FLAGS_quic_restart_flag_##flag->SetValue(value) -+#define SetQuicRestartFlagImpl(flag, value) quiche::FLAGS_quic_restart_flag_##flag->setValue(value) - - // Not wired into command-line parsing. - #define DEFINE_QUIC_COMMAND_LINE_FLAG_IMPL(type, flag, value, help) \ -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc -index bcbafb566..75849611d 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.cc -@@ -19,7 +19,8 @@ - namespace quic { - - // static --bool QuicHostnameUtilsImpl::IsValidSNI(quiche::QuicheStringPiece sni) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+bool QuicHostnameUtilsImpl::IsValidSNI(absl::string_view sni) { - // TODO(wub): Implement it on top of GoogleUrl, once it is available. - - return sni.find_last_of('.') != std::string::npos && -@@ -27,7 +28,8 @@ bool QuicHostnameUtilsImpl::IsValidSNI(quiche::QuicheStringPiece sni) { - } - - // static --std::string QuicHostnameUtilsImpl::NormalizeHostname(quiche::QuicheStringPiece hostname) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+std::string QuicHostnameUtilsImpl::NormalizeHostname(absl::string_view hostname) { - // TODO(wub): Implement it on top of GoogleUrl, once it is available. - std::string host = absl::AsciiStrToLower(hostname); - -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h -index 2b7ed4357..67cd787d0 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_hostname_utils_impl.h -@@ -6,7 +6,7 @@ - // consumed or referenced directly by other Envoy code. It serves purely as a - // porting layer for QUICHE. - --#include "quiche/common/platform/api/quiche_string_piece.h" -+#include "absl/strings/string_view.h" - #include "quiche/quic/platform/api/quic_export.h" - - namespace quic { -@@ -18,7 +18,8 @@ public: - // (2) check that the hostname contains valid characters only; and - // (3) contains at least one dot. - // NOTE(wub): Only (3) is implemented for now. -- static bool IsValidSNI(quiche::QuicheStringPiece sni); -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ static bool IsValidSNI(absl::string_view sni); - - // Normalize a hostname: - // (1) Canonicalize it, similar to what Chromium does in -@@ -27,7 +28,8 @@ public: - // (3) Remove the trailing '.'. - // WARNING: May mutate |hostname| in place. - // NOTE(wub): Only (2) and (3) are implemented for now. -- static std::string NormalizeHostname(quiche::QuicheStringPiece hostname); -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ static std::string NormalizeHostname(absl::string_view hostname); - - private: - QuicHostnameUtilsImpl() = delete; -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h -deleted file mode 100644 -index b8b70a042..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quic_macros_impl.h -+++ /dev/null -@@ -1,13 +0,0 @@ --#pragma once -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#include "absl/base/attributes.h" -- --#define QUIC_MUST_USE_RESULT_IMPL ABSL_MUST_USE_RESULT --#define QUIC_UNUSED_IMPL ABSL_ATTRIBUTE_UNUSED --#define QUIC_CONST_INIT_IMPL ABSL_CONST_INIT -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc -index c2eb527d6..9e46c37df 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.cc -@@ -10,7 +10,8 @@ - - namespace quic { - --quiche::QuicheStringPiece QuicMemSliceSpanImpl::GetData(size_t index) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+absl::string_view QuicMemSliceSpanImpl::GetData(size_t index) { - Envoy::Buffer::RawSliceVector slices = buffer_->getRawSlices(/*max_slices=*/index + 1); - ASSERT(slices.size() > index); - return {reinterpret_cast(slices[index].mem_), slices[index].len_}; -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h -index 1824fb8d1..ef40e6387 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_mem_slice_span_impl.h -@@ -9,7 +9,7 @@ - #include "envoy/buffer/buffer.h" - - #include "absl/container/fixed_array.h" --#include "quiche/common/platform/api/quiche_string_piece.h" -+#include "absl/strings/string_view.h" - #include "quiche/quic/core/quic_types.h" - #include "quiche/quic/platform/api/quic_mem_slice.h" - -@@ -43,9 +43,13 @@ public: - } - - // QuicMemSliceSpan -- quiche::QuicheStringPiece GetData(size_t index); -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ absl::string_view GetData(size_t index); -+ // NOLINTNEXTLINE(readability-identifier-naming) - QuicByteCount total_length() { return buffer_->length(); }; -+ // NOLINTNEXTLINE(readability-identifier-naming) - size_t NumSlices() { return buffer_->getRawSlices().size(); } -+ // NOLINTNEXTLINE(readability-identifier-naming) - template QuicByteCount ConsumeAll(ConsumeFunction consume); - bool empty() const { return buffer_->length() == 0; } - -@@ -54,6 +58,7 @@ private: - }; - - template -+// NOLINTNEXTLINE(readability-identifier-naming) - QuicByteCount QuicMemSliceSpanImpl::ConsumeAll(ConsumeFunction consume) { - size_t saved_length = 0; - for (auto& slice : buffer_->getRawSlices()) { -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h -similarity index 52% -rename from source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h -rename to source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h -index aaebe5d5c..4b0201c35 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_ptr_util_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_testvalue_impl.h -@@ -6,12 +6,11 @@ - // consumed or referenced directly by other Envoy code. It serves purely as a - // porting layer for QUICHE. - --#include "absl/memory/memory.h" -+#include "absl/strings/string_view.h" - --namespace quiche { -+namespace quic { - --template std::unique_ptr QuicheWrapUniqueImpl(T* ptr) { -- return absl::WrapUnique(ptr); --} -+// NOLINTNEXTLINE(readability-identifier-naming) -+template void AdjustTestValueImpl(absl::string_view /*label*/, T* /*var*/) {} - --} // namespace quiche -+} // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h b/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h -index 248cfc193..1e88abe46 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quic_udp_socket_platform_impl.h -@@ -19,4 +19,7 @@ inline bool GetGooglePacketHeadersFromControlMessageImpl(struct ::cmsghdr* /*cms - return false; - } - -+// NOLINTNEXTLINE(readability-identifier-naming) -+inline void SetGoogleSocketOptionsImpl(int /*fd*/) {} -+ - } // namespace quic -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h -deleted file mode 100644 -index 7a23b53da..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_arraysize_impl.h -+++ /dev/null -@@ -1,11 +0,0 @@ --#pragma once -- --#include "absl/base/macros.h" -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#define QUICHE_ARRAYSIZE_IMPL(array) ABSL_ARRAYSIZE(array) -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h -deleted file mode 100644 -index f8b2b6c08..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_optional_impl.h -+++ /dev/null -@@ -1,17 +0,0 @@ --#pragma once -- --#include "absl/types/optional.h" -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --namespace quiche { -- --template using QuicheOptionalImpl = absl::optional; -- --#define QUICHE_NULLOPT_IMPL absl::nullopt -- --} // namespace quiche -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h -index 3a6d1a393..7b87c1cd6 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quiche_text_utils_impl.h -@@ -2,7 +2,6 @@ - - #include "common/common/base64.h" - --#include "extensions/quic_listeners/quiche/platform/quiche_optional_impl.h" - #include "extensions/quic_listeners/quiche/platform/quiche_string_piece_impl.h" - #include "extensions/quic_listeners/quiche/platform/string_utils.h" - -@@ -13,6 +12,7 @@ - #include "absl/strings/str_cat.h" - #include "absl/strings/str_format.h" - #include "absl/strings/str_split.h" -+#include "absl/types/optional.h" - - // NOLINT(namespace-envoy) - -@@ -25,58 +25,16 @@ namespace quiche { - class QuicheTextUtilsImpl { - public: - // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StartsWith(QuicheStringPieceImpl data, QuicheStringPieceImpl prefix) { -- return absl::StartsWith(data, prefix); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool EndsWith(QuicheStringPieceImpl data, QuicheStringPieceImpl suffix) { -- return absl::EndsWith(data, suffix); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool EndsWithIgnoreCase(QuicheStringPieceImpl data, QuicheStringPieceImpl suffix) { -- return absl::EndsWithIgnoreCase(data, suffix); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string ToLower(QuicheStringPieceImpl data) { return absl::AsciiStrToLower(data); } -+ static std::string ToLower(absl::string_view data) { return absl::AsciiStrToLower(data); } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static void RemoveLeadingAndTrailingWhitespace(QuicheStringPieceImpl* data) { -+ static void RemoveLeadingAndTrailingWhitespace(absl::string_view* data) { - *data = absl::StripAsciiWhitespace(*data); - } - -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StringToUint64(QuicheStringPieceImpl in, uint64_t* out) { -- return absl::SimpleAtoi(in, out); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StringToInt(QuicheStringPieceImpl in, int* out) { return absl::SimpleAtoi(in, out); } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StringToUint32(QuicheStringPieceImpl in, uint32_t* out) { -- return absl::SimpleAtoi(in, out); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static bool StringToSizeT(QuicheStringPieceImpl in, size_t* out) { -- return absl::SimpleAtoi(in, out); -- } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string Uint64ToString(uint64_t in) { return absl::StrCat(in); } -- -- // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string HexEncode(QuicheStringPieceImpl data) { return absl::BytesToHexString(data); } -- - // NOLINTNEXTLINE(readability-identifier-naming) - static std::string Hex(uint32_t v) { return absl::StrCat(absl::Hex(v)); } - -- // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string HexDecode(QuicheStringPieceImpl data) { return absl::HexStringToBytes(data); } -- - // NOLINTNEXTLINE(readability-identifier-naming) - static void Base64Encode(const uint8_t* data, size_t data_len, std::string* output) { - *output = -@@ -84,27 +42,28 @@ public: - } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static QuicheOptionalImpl Base64Decode(QuicheStringPieceImpl input) { -+ static absl::optional Base64Decode(absl::string_view input) { - return Envoy::Base64::decodeWithoutPadding(input); - } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static std::string HexDump(QuicheStringPieceImpl binary_data) { -- return quiche::HexDump(binary_data); -- } -+ static std::string Uint64ToString(uint64_t in) { return absl::StrCat(in); } -+ -+ // NOLINTNEXTLINE(readability-identifier-naming) -+ static std::string HexDump(absl::string_view binary_data) { return quiche::HexDump(binary_data); } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static bool ContainsUpperCase(QuicheStringPieceImpl data) { -+ static bool ContainsUpperCase(absl::string_view data) { - return std::any_of(data.begin(), data.end(), absl::ascii_isupper); - } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static bool IsAllDigits(QuicheStringPieceImpl data) { -+ static bool IsAllDigits(absl::string_view data) { - return std::all_of(data.begin(), data.end(), absl::ascii_isdigit); - } - - // NOLINTNEXTLINE(readability-identifier-naming) -- static std::vector Split(QuicheStringPieceImpl data, char delim) { -+ static std::vector Split(absl::string_view data, char delim) { - return absl::StrSplit(data, delim); - } - }; -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc -index 3260eafee..5387e0598 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc -+++ b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.cc -@@ -9,7 +9,7 @@ - namespace quiche { - - namespace { --QuicheOptional quicheUtcDateTimeToUnixSecondsInner(int year, int month, int day, int hour, -+absl::optional quicheUtcDateTimeToUnixSecondsInner(int year, int month, int day, int hour, - int minute, int second) { - const absl::CivilSecond civil_time(year, month, day, hour, minute, second); - if (second != 60 && (civil_time.year() != year || civil_time.month() != month || -@@ -24,7 +24,7 @@ QuicheOptional quicheUtcDateTimeToUnixSecondsInner(int year, int month, - } // namespace - - // NOLINTNEXTLINE(readability-identifier-naming) --QuicheOptional QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, -+absl::optional QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, - int minute, int second) { - // Handle leap seconds without letting any other irregularities happen. - if (second == 60) { -diff --git a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h -index a1b70b70a..5e2ef7956 100644 ---- a/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/quiche_time_utils_impl.h -@@ -10,12 +10,12 @@ - - #include "absl/time/civil_time.h" - #include "absl/time/time.h" --#include "quiche/common/platform/api/quiche_optional.h" -+#include "absl/types/optional.h" - - namespace quiche { - - // NOLINTNEXTLINE(readability-identifier-naming) --QuicheOptional QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, -+absl::optional QuicheUtcDateTimeToUnixSecondsImpl(int year, int month, int day, int hour, - int minute, int second); - - } // namespace quiche -diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h -deleted file mode 100644 -index 737b81ee2..000000000 ---- a/source/extensions/quic_listeners/quiche/platform/spdy_endianness_util_impl.h -+++ /dev/null -@@ -1,29 +0,0 @@ --#pragma once -- --#include -- --#include "envoy/common/platform.h" -- --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --namespace spdy { -- --inline uint16_t SpdyNetToHost16Impl(uint16_t x) { return ntohs(x); } -- --inline uint32_t SpdyNetToHost32Impl(uint32_t x) { return ntohl(x); } -- --// TODO: implement --inline uint64_t SpdyNetToHost64Impl(uint64_t /*x*/) { return 0; } -- --inline uint16_t SpdyHostToNet16Impl(uint16_t x) { return htons(x); } -- --inline uint32_t SpdyHostToNet32Impl(uint32_t x) { return htonl(x); } -- --// TODO: implement --inline uint64_t SpdyHostToNet64Impl(uint64_t /*x*/) { return 0; } -- --} // namespace spdy -diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h -index a3cbd680f..833562fab 100644 ---- a/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/spdy_flags_impl.h -@@ -8,9 +8,9 @@ - - #include "extensions/quic_listeners/quiche/platform/flags_impl.h" - --#define GetSpdyReloadableFlagImpl(flag) quiche::FLAGS_spdy_reloadable_flag_##flag->value() -+#define GetSpdyReloadableFlagImpl(flag) quiche::FLAGS_quic_reloadable_flag_##flag->value() - --#define GetSpdyRestartFlagImpl(flag) quiche::FLAGS_spdy_restart_flag_##flag->value() -+#define GetSpdyRestartFlagImpl(flag) quiche::FLAGS_quic_restart_flag_##flag->value() - - #define SPDY_CODE_COUNT_N_IMPL(flag, instance, total) \ - do { \ -diff --git a/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h b/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h -index 41fa3cad8..4b01b2dbd 100644 ---- a/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h -+++ b/source/extensions/quic_listeners/quiche/platform/spdy_string_utils_impl.h -@@ -50,7 +50,7 @@ inline std::string SpdyHexEncodeUInt32AndTrimImpl(uint32_t data) { - inline std::string SpdyHexDumpImpl(absl::string_view data) { return quiche::HexDump(data); } - - struct SpdyStringPieceCaseHashImpl { -- size_t operator()(quiche::QuicheStringPiece data) const { -+ size_t operator()(absl::string_view data) const { - std::string lower = absl::AsciiStrToLower(data); - return absl::Hash()(lower); - } -diff --git a/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc b/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc -index 3bd0bc295..5ac5738c4 100644 ---- a/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc -+++ b/source/extensions/quic_listeners/quiche/spdy_server_push_utils_for_envoy.cc -@@ -12,25 +12,29 @@ using spdy::SpdyHeaderBlock; - namespace quic { - - // static -+// NOLINTNEXTLINE(readability-identifier-naming) - std::string SpdyServerPushUtils::GetPromisedUrlFromHeaders(const SpdyHeaderBlock& /*headers*/) { - NOT_IMPLEMENTED_GCOVR_EXCL_LINE; - } - - // static - std::string -+// NOLINTNEXTLINE(readability-identifier-naming) - SpdyServerPushUtils::GetPromisedHostNameFromHeaders(const SpdyHeaderBlock& /*headers*/) { - NOT_IMPLEMENTED_GCOVR_EXCL_LINE; - } - - // static -+// NOLINTNEXTLINE(readability-identifier-naming) - bool SpdyServerPushUtils::PromisedUrlIsValid(const SpdyHeaderBlock& /*headers*/) { - NOT_IMPLEMENTED_GCOVR_EXCL_LINE; - } - - // static --std::string SpdyServerPushUtils::GetPushPromiseUrl(quiche::QuicheStringPiece /*scheme*/, -- quiche::QuicheStringPiece /*authority*/, -- quiche::QuicheStringPiece /*path*/) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+std::string SpdyServerPushUtils::GetPushPromiseUrl(absl::string_view /*scheme*/, -+ absl::string_view /*authority*/, -+ absl::string_view /*path*/) { - NOT_IMPLEMENTED_GCOVR_EXCL_LINE; - } - -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc -index e2d90d916..8fa7d9fe9 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc -@@ -49,9 +49,9 @@ public: - Network::ConnectionSocketPtr&& connection_socket) - : EnvoyQuicClientConnection(server_connection_id, helper, alarm_factory, &writer, false, - supported_versions, dispatcher, std::move(connection_socket)) { -- SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); - SetEncrypter(quic::ENCRYPTION_FORWARD_SECURE, - std::make_unique(quic::Perspective::IS_CLIENT)); -+ SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); - } - - MOCK_METHOD(void, SendConnectionClosePacket, (quic::QuicErrorCode, const std::string&)); -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc -index 98359c618..f3b02f4cc 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc -@@ -48,11 +48,11 @@ public: - quic_session_.ActivateStream(std::unique_ptr(quic_stream_)); - EXPECT_CALL(quic_session_, ShouldYield(_)).WillRepeatedly(testing::Return(false)); - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillRepeatedly( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - EXPECT_CALL(writer_, WritePacket(_, _, _, _, _)) - .WillRepeatedly(Invoke([](const char*, size_t buf_len, const quic::QuicIpAddress&, - const quic::QuicSocketAddress&, quic::PerPacketOptions*) { -@@ -146,7 +146,7 @@ TEST_P(EnvoyQuicClientStreamTest, PostRequestAndResponse) { - std::unique_ptr data_buffer; - quic::QuicByteCount data_frame_header_length = - quic::HttpEncoder::SerializeDataFrameHeader(response_body_.length(), &data_buffer); -- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); -+ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); - data = absl::StrCat(data_frame_header, response_body_); - } - quic::QuicStreamFrame frame(stream_id_, false, 0, data); -@@ -184,7 +184,7 @@ TEST_P(EnvoyQuicClientStreamTest, OutOfOrderTrailers) { - std::unique_ptr data_buffer; - quic::QuicByteCount data_frame_header_length = - quic::HttpEncoder::SerializeDataFrameHeader(response_body_.length(), &data_buffer); -- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); -+ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); - data = absl::StrCat(data_frame_header, response_body_); - } - quic::QuicStreamFrame frame(stream_id_, false, 0, data); -@@ -301,11 +301,11 @@ TEST_P(EnvoyQuicClientStreamTest, HeadersContributeToWatermarkIquic) { - // Unblock writing now, and this will write out 16kB data and cause stream to - // be blocked by the flow control limit. - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - EXPECT_CALL(stream_callbacks_, onBelowWriteBufferLowWatermark()); - quic_session_.OnCanWrite(); - EXPECT_TRUE(quic_stream_->IsFlowControlBlocked()); -@@ -315,20 +315,20 @@ TEST_P(EnvoyQuicClientStreamTest, HeadersContributeToWatermarkIquic) { - 32 * 1024); - quic_stream_->OnWindowUpdateFrame(window_update1); - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - quic_session_.OnCanWrite(); - // No data should be buffered at this point. - - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -+ })); - // Send more data. If watermark bytes counting were not cleared in previous - // OnCanWrite, this write would have caused the stream to exceed its high watermark. - std::string request1(16 * 1024 - 3, 'a'); -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc -index cbf66f511..8a493a8e8 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_proof_source_test.cc -@@ -25,7 +25,7 @@ namespace Quic { - class TestGetProofCallback : public quic::ProofSource::Callback { - public: - TestGetProofCallback(bool& called, bool should_succeed, const std::string& server_config, -- quic::QuicTransportVersion& version, quiche::QuicheStringPiece chlo_hash, -+ quic::QuicTransportVersion& version, absl::string_view chlo_hash, - Network::FilterChain& filter_chain) - : called_(called), should_succeed_(should_succeed), server_config_(server_config), - version_(version), chlo_hash_(chlo_hash), expected_filter_chain_(filter_chain) { -@@ -100,7 +100,7 @@ private: - bool should_succeed_; - const std::string& server_config_; - const quic::QuicTransportVersion& version_; -- quiche::QuicheStringPiece chlo_hash_; -+ absl::string_view chlo_hash_; - Network::FilterChain& expected_filter_chain_; - NiceMock store_; - Event::GlobalTimeSystem time_system_; -@@ -178,7 +178,7 @@ protected: - quic::QuicSocketAddress server_address_; - quic::QuicSocketAddress client_address_; - quic::QuicTransportVersion version_{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash_{"aaaaa"}; -+ absl::string_view chlo_hash_{"aaaaa"}; - std::string server_config_{"Server Config"}; - std::string expected_certs_{quic::test::kTestCertificateChainPem}; - std::string pkey_{quic::test::kTestCertificatePrivateKeyPem}; -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc -index 4a1dfe144..9cdc169cd 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_proof_verifier_test.cc -@@ -163,7 +163,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureEmptyCertChain) { - std::unique_ptr cert_view = - quic::CertificateView::ParseSingleCertificate(leaf_cert_); - quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; -+ absl::string_view chlo_hash{"aaaaa"}; - std::string server_config{"Server Config"}; - const std::string ocsp_response; - const std::string cert_sct; -@@ -181,7 +181,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidLeafCert) { - std::unique_ptr cert_view = - quic::CertificateView::ParseSingleCertificate(leaf_cert_); - quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; -+ absl::string_view chlo_hash{"aaaaa"}; - std::string server_config{"Server Config"}; - const std::string ocsp_response; - const std::string cert_sct; -@@ -197,7 +197,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidLeafCert) { - TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureUnsupportedECKey) { - configCertVerificationDetails(true); - quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; -+ absl::string_view chlo_hash{"aaaaa"}; - std::string server_config{"Server Config"}; - const std::string ocsp_response; - const std::string cert_sct; -@@ -236,7 +236,7 @@ TEST_F(EnvoyQuicProofVerifierTest, VerifyProofFailureInvalidSignature) { - std::unique_ptr cert_view = - quic::CertificateView::ParseSingleCertificate(leaf_cert_); - quic::QuicTransportVersion version{quic::QUIC_VERSION_UNSUPPORTED}; -- quiche::QuicheStringPiece chlo_hash{"aaaaa"}; -+ absl::string_view chlo_hash{"aaaaa"}; - std::string server_config{"Server Config"}; - const std::string ocsp_response; - const std::string cert_sct; -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc -index 05307c6b9..4fc376857 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc -@@ -61,6 +61,7 @@ public: - const quic::ParsedQuicVersionVector& supported_versions, - Network::Socket& listen_socket) - : EnvoyQuicServerConnection(quic::test::TestConnectionId(), -+ quic::QuicSocketAddress(quic::QuicIpAddress::Any4(), 12345), - quic::QuicSocketAddress(quic::QuicIpAddress::Loopback4(), 12345), - helper, alarm_factory, &writer, /*owns_writer=*/false, - supported_versions, listen_socket) {} -@@ -201,10 +202,10 @@ public: - crypto_stream_ = test_crypto_stream; - } - quic::test::QuicServerSessionBasePeer::SetCryptoStream(&envoy_quic_session_, crypto_stream); -- quic_connection_->SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); - quic_connection_->SetEncrypter( - quic::ENCRYPTION_FORWARD_SECURE, - std::make_unique(quic::Perspective::IS_SERVER)); -+ quic_connection_->SetDefaultEncryptionLevel(quic::ENCRYPTION_FORWARD_SECURE); - } - - bool installReadFilter() { -diff --git a/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc b/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc -index c2fd31c6f..f602e2c9a 100644 ---- a/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc -+++ b/test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc -@@ -51,6 +51,7 @@ public: - POOL_GAUGE(listener_config_.listenerScope()), - POOL_HISTOGRAM(listener_config_.listenerScope()))}), - quic_connection_(quic::test::TestConnectionId(), -+ quic::QuicSocketAddress(quic::QuicIpAddress::Any6(), 123), - quic::QuicSocketAddress(quic::QuicIpAddress::Any6(), 12345), - connection_helper_, alarm_factory_, &writer_, - /*owns_writer=*/false, {quic_version_}, *listener_config_.socket_), -@@ -66,11 +67,11 @@ public: - quic_session_.ActivateStream(std::unique_ptr(quic_stream_)); - EXPECT_CALL(quic_session_, ShouldYield(_)).WillRepeatedly(testing::Return(false)); - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillRepeatedly( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - EXPECT_CALL(writer_, WritePacket(_, _, _, _, _)) - .WillRepeatedly(Invoke([](const char*, size_t buf_len, const quic::QuicIpAddress&, - const quic::QuicSocketAddress&, quic::PerPacketOptions*) { -@@ -110,7 +111,7 @@ public: - std::unique_ptr data_buffer; - quic::QuicByteCount data_frame_header_length = - quic::HttpEncoder::SerializeDataFrameHeader(body.length(), &data_buffer); -- quiche::QuicheStringPiece data_frame_header(data_buffer.get(), data_frame_header_length); -+ absl::string_view data_frame_header(data_buffer.get(), data_frame_header_length); - data = absl::StrCat(data_frame_header, body); - } - return data; -@@ -397,11 +398,11 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { - - // Make the stream blocked by congestion control. - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t /*write_length*/, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t /*write_length*/, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -+ })); - quic_stream_->encodeHeaders(response_headers_, /*end_stream=*/false); - - // Encode 16kB -10 bytes request body. Because the high watermark is 16KB, with previously -@@ -415,11 +416,11 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { - // Unblock writing now, and this will write out 16kB data and cause stream to - // be blocked by the flow control limit. - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - EXPECT_CALL(stream_callbacks_, onBelowWriteBufferLowWatermark()); - quic_session_.OnCanWrite(); - EXPECT_TRUE(quic_stream_->IsFlowControlBlocked()); -@@ -429,20 +430,20 @@ TEST_P(EnvoyQuicServerStreamTest, HeadersContributeToWatermarkIquic) { - 32 * 1024); - quic_stream_->OnWindowUpdateFrame(window_update1); - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillOnce(Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -- })); -+ .WillOnce( -+ Invoke([](quic::QuicStreamId, size_t write_length, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{write_length, state != quic::NO_FIN}; -+ })); - quic_session_.OnCanWrite(); - // No data should be buffered at this point. - - EXPECT_CALL(quic_session_, WritevData(_, _, _, _, _, _)) -- .WillRepeatedly(Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, -- quic::StreamSendingState state, bool, -- quiche::QuicheOptional) { -- return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -- })); -+ .WillRepeatedly( -+ Invoke([](quic::QuicStreamId, size_t, quic::QuicStreamOffset, -+ quic::StreamSendingState state, bool, absl::optional) { -+ return quic::QuicConsumedData{0u, state != quic::NO_FIN}; -+ })); - // Send more data. If watermark bytes counting were not cleared in previous - // OnCanWrite, this write would have caused the stream to exceed its high watermark. - std::string response1(16 * 1024 - 3, 'a'); -diff --git a/test/extensions/quic_listeners/quiche/platform/BUILD b/test/extensions/quic_listeners/quiche/platform/BUILD -index 420e812b8..7dbb08d82 100644 ---- a/test/extensions/quic_listeners/quiche/platform/BUILD -+++ b/test/extensions/quic_listeners/quiche/platform/BUILD -@@ -9,16 +9,6 @@ licenses(["notice"]) # Apache 2 - - envoy_package() - --envoy_cc_test( -- name = "quiche_platform_test", -- srcs = ["quiche_platform_test.cc"], -- external_deps = ["quiche_common_platform"], -- deps = [ -- "@com_googlesource_quiche//:quiche_common_platform", -- "@com_googlesource_quiche//:quiche_common_platform_endian", -- ], --) -- - envoy_cc_test( - name = "http2_platform_test", - srcs = ["http2_platform_test.cc"], -@@ -63,7 +53,6 @@ envoy_cc_test( - "@com_googlesource_quiche//:quic_platform_mem_slice_span", - "@com_googlesource_quiche//:quic_platform_mem_slice_storage", - "@com_googlesource_quiche//:quic_platform_mock_log", -- "@com_googlesource_quiche//:quic_platform_port_utils", - "@com_googlesource_quiche//:quic_platform_sleep", - "@com_googlesource_quiche//:quic_platform_system_event_loop", - "@com_googlesource_quiche//:quic_platform_test", -@@ -150,17 +139,6 @@ envoy_cc_test_library( - deps = ["@com_googlesource_quiche//:quic_platform_base"], - ) - --envoy_cc_test_library( -- name = "quic_platform_port_utils_impl_lib", -- srcs = ["quic_port_utils_impl.cc"], -- hdrs = ["quic_port_utils_impl.h"], -- tags = ["nofips"], -- deps = [ -- "//source/common/network:utility_lib", -- "//test/test_common:environment_lib", -- ], --) -- - envoy_cc_test_library( - name = "quic_platform_test_mem_slice_vector_impl_lib", - hdrs = ["quic_test_mem_slice_vector_impl.h"], -diff --git a/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc -index 069a79eab..35aee5d27 100644 ---- a/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc -+++ b/test/extensions/quic_listeners/quiche/platform/http2_platform_test.cc -@@ -72,20 +72,14 @@ TEST(Http2PlatformTest, Http2Log) { - HTTP2_DLOG_EVERY_N(ERROR, 2) << "DLOG_EVERY_N(ERROR, 2)"; - } - --TEST(Http2PlatformTest, Http2StringPiece) { -- std::string s = "bar"; -- quiche::QuicheStringPiece sp(s); -- EXPECT_EQ('b', sp[0]); --} -- - TEST(Http2PlatformTest, Http2Macro) { - EXPECT_DEBUG_DEATH(HTTP2_UNREACHABLE(), ""); - EXPECT_DEATH(HTTP2_DIE_IF_NULL(nullptr), ""); - } - - TEST(Http2PlatformTest, Http2Flags) { -- auto& flag_registry = quiche::FlagRegistry::GetInstance(); -- flag_registry.ResetFlags(); -+ auto& flag_registry = quiche::FlagRegistry::getInstance(); -+ flag_registry.resetFlags(); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); - SetHttp2ReloadableFlag(http2_testonly_default_false, true); - EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); -@@ -93,22 +87,22 @@ TEST(Http2PlatformTest, Http2Flags) { - for (std::string s : {"1", "t", "true", "TRUE", "y", "yes", "Yes"}) { - SetHttp2ReloadableFlag(http2_testonly_default_false, false); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); -- EXPECT_TRUE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") -- ->SetValueFromString(s)); -+ EXPECT_TRUE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") -+ ->setValueFromString(s)); - EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); - } - for (std::string s : {"0", "f", "false", "FALSE", "n", "no", "No"}) { - SetHttp2ReloadableFlag(http2_testonly_default_false, true); - EXPECT_TRUE(GetHttp2ReloadableFlag(http2_testonly_default_false)); -- EXPECT_TRUE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") -- ->SetValueFromString(s)); -+ EXPECT_TRUE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") -+ ->setValueFromString(s)); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); - } - for (std::string s : {"some", "invalid", "values", ""}) { - SetHttp2ReloadableFlag(http2_testonly_default_false, false); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); -- EXPECT_FALSE(flag_registry.FindFlag("http2_reloadable_flag_http2_testonly_default_false") -- ->SetValueFromString(s)); -+ EXPECT_FALSE(flag_registry.findFlag("FLAGS_quic_reloadable_flag_http2_testonly_default_false") -+ ->setValueFromString(s)); - EXPECT_FALSE(GetHttp2ReloadableFlag(http2_testonly_default_false)); - } - } -diff --git a/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc -index 68141aa94..902ad1a9e 100644 ---- a/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc -+++ b/test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc -@@ -30,7 +30,6 @@ - #include "gtest/gtest.h" - #include "quiche/common/platform/api/quiche_string_piece.h" - #include "quiche/epoll_server/fake_simple_epoll_server.h" --#include "quiche/quic/platform/api/quic_aligned.h" - #include "quiche/quic/platform/api/quic_bug_tracker.h" - #include "quiche/quic/platform/api/quic_cert_utils.h" - #include "quiche/quic/platform/api/quic_client_stats.h" -@@ -42,7 +41,6 @@ - #include "quiche/quic/platform/api/quic_flags.h" - #include "quiche/quic/platform/api/quic_hostname_utils.h" - #include "quiche/quic/platform/api/quic_logging.h" --#include "quiche/quic/platform/api/quic_macros.h" - #include "quiche/quic/platform/api/quic_map_util.h" - #include "quiche/quic/platform/api/quic_mem_slice.h" - #include "quiche/quic/platform/api/quic_mem_slice_span.h" -@@ -50,7 +48,6 @@ - #include "quiche/quic/platform/api/quic_mock_log.h" - #include "quiche/quic/platform/api/quic_mutex.h" - #include "quiche/quic/platform/api/quic_pcc_sender.h" --#include "quiche/quic/platform/api/quic_port_utils.h" - #include "quiche/quic/platform/api/quic_ptr_util.h" - #include "quiche/quic/platform/api/quic_server_stats.h" - #include "quiche/quic/platform/api/quic_sleep.h" -@@ -92,8 +89,6 @@ protected: - const int verbosity_log_threshold_; - }; - --TEST_F(QuicPlatformTest, QuicAlignOf) { EXPECT_LT(0, QUIC_ALIGN_OF(int)); } -- - enum class TestEnum { ZERO = 0, ONE, TWO, COUNT }; - - TEST_F(QuicPlatformTest, QuicBugTracker) { -@@ -468,9 +463,9 @@ TEST_F(QuicPlatformTest, QuicCertUtils) { - unsigned char* der = nullptr; - int len = i2d_X509(x509_cert.get(), &der); - ASSERT_GT(len, 0); -- quiche::QuicheStringPiece out; -+ absl::string_view out; - QuicCertUtils::ExtractSubjectNameFromDERCert( -- quiche::QuicheStringPiece(reinterpret_cast(der), len), &out); -+ absl::string_view(reinterpret_cast(der), len), &out); - EXPECT_EQ("0z1\v0\t\x6\x3U\x4\x6\x13\x2US1\x13" - "0\x11\x6\x3U\x4\b\f\nCalifornia1\x16" - "0\x14\x6\x3U\x4\a\f\rSan Francisco1\r" -@@ -566,8 +561,8 @@ TEST_F(QuicPlatformTest, MonotonicityWithFakeEpollClock) { - } - - TEST_F(QuicPlatformTest, QuicFlags) { -- auto& flag_registry = quiche::FlagRegistry::GetInstance(); -- flag_registry.ResetFlags(); -+ auto& flag_registry = quiche::FlagRegistry::getInstance(); -+ flag_registry.resetFlags(); - - EXPECT_FALSE(GetQuicReloadableFlag(quic_testonly_default_false)); - EXPECT_TRUE(GetQuicReloadableFlag(quic_testonly_default_true)); -@@ -583,14 +578,15 @@ TEST_F(QuicPlatformTest, QuicFlags) { - SetQuicFlag(FLAGS_quic_time_wait_list_seconds, 100); - EXPECT_EQ(100, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); - -- flag_registry.ResetFlags(); -+ flag_registry.resetFlags(); - EXPECT_FALSE(GetQuicReloadableFlag(quic_testonly_default_false)); - EXPECT_TRUE(GetQuicRestartFlag(quic_testonly_default_true)); - EXPECT_EQ(200, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); -- flag_registry.FindFlag("quic_reloadable_flag_quic_testonly_default_false") -- ->SetValueFromString("true"); -- flag_registry.FindFlag("quic_restart_flag_quic_testonly_default_true")->SetValueFromString("0"); -- flag_registry.FindFlag("quic_time_wait_list_seconds")->SetValueFromString("100"); -+ flag_registry.findFlag("FLAGS_quic_reloadable_flag_quic_testonly_default_false") -+ ->setValueFromString("true"); -+ flag_registry.findFlag("FLAGS_quic_restart_flag_quic_testonly_default_true") -+ ->setValueFromString("0"); -+ flag_registry.findFlag("FLAGS_quic_time_wait_list_seconds")->setValueFromString("100"); - EXPECT_TRUE(GetQuicReloadableFlag(quic_testonly_default_false)); - EXPECT_FALSE(GetQuicRestartFlag(quic_testonly_default_true)); - EXPECT_EQ(100, GetQuicFlag(FLAGS_quic_time_wait_list_seconds)); -@@ -661,35 +657,6 @@ TEST_F(FileUtilsTest, ReadFileContents) { - EXPECT_EQ(data, output); - } - --TEST_F(QuicPlatformTest, PickUnsedPort) { -- int port = QuicPickServerPortForTestsOrDie(); -- std::vector supported_versions = -- Envoy::TestEnvironment::getIpVersionsForTest(); -- for (auto ip_version : supported_versions) { -- Envoy::Network::Address::InstanceConstSharedPtr addr = -- Envoy::Network::Test::getCanonicalLoopbackAddress(ip_version); -- Envoy::Network::Address::InstanceConstSharedPtr addr_with_port = -- Envoy::Network::Utility::getAddressWithPort(*addr, port); -- Envoy::Network::SocketImpl sock(Envoy::Network::Socket::Type::Datagram, addr_with_port); -- // binding of given port should success. -- EXPECT_EQ(0, sock.bind(addr_with_port).rc_); -- } --} -- --TEST_F(QuicPlatformTest, FailToPickUnsedPort) { -- Envoy::Api::MockOsSysCalls os_sys_calls; -- Envoy::TestThreadsafeSingletonInjector os_calls(&os_sys_calls); -- // Actually create sockets. -- EXPECT_CALL(os_sys_calls, socket(_, _, _)).WillRepeatedly([](int domain, int type, int protocol) { -- os_fd_t fd = ::socket(domain, type, protocol); -- return Envoy::Api::SysCallSocketResult{fd, errno}; -- }); -- // Fail bind call's to mimic port exhaustion. -- EXPECT_CALL(os_sys_calls, bind(_, _, _)) -- .WillRepeatedly(Return(Envoy::Api::SysCallIntResult{-1, SOCKET_ERROR_ADDR_IN_USE})); -- EXPECT_DEATH(QuicPickServerPortForTestsOrDie(), "Failed to pick a port for test."); --} -- - TEST_F(QuicPlatformTest, TestEnvoyQuicBufferAllocator) { - QuicStreamBufferAllocator allocator; - Envoy::Stats::TestUtil::MemoryTest memory_test; -@@ -711,14 +678,6 @@ TEST_F(QuicPlatformTest, TestSystemEventLoop) { - QuicSystemEventLoop("dummy"); - } - --QUIC_MUST_USE_RESULT bool dummyTestFunction() { return false; } -- --TEST_F(QuicPlatformTest, TestQuicMacros) { -- // Just make sure it compiles. -- EXPECT_FALSE(dummyTestFunction()); -- int a QUIC_UNUSED; --} -- - TEST(EnvoyQuicMemSliceTest, ConstructMemSliceFromBuffer) { - std::string str(512, 'b'); - // Fragment needs to out-live buffer. -diff --git a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc -index 556f6cd3e..9eaf8532a 100644 ---- a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc -+++ b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.cc -@@ -19,7 +19,7 @@ - namespace quic { - namespace { - --void QuicRecordTestOutputToFile(const std::string& filename, quiche::QuicheStringPiece data) { -+void quicRecordTestOutputToFile(const std::string& filename, absl::string_view data) { - const char* output_dir_env = std::getenv("QUIC_TEST_OUTPUT_DIR"); - if (output_dir_env == nullptr) { - QUIC_LOG(WARNING) << "Could not save test output since QUIC_TEST_OUTPUT_DIR is not set"; -@@ -64,11 +64,13 @@ void QuicRecordTestOutputToFile(const std::string& filename, quiche::QuicheStrin - } - } // namespace - --void QuicSaveTestOutputImpl(quiche::QuicheStringPiece filename, quiche::QuicheStringPiece data) { -- QuicRecordTestOutputToFile(filename.data(), data); -+// NOLINTNEXTLINE(readability-identifier-naming) -+void QuicSaveTestOutputImpl(absl::string_view filename, absl::string_view data) { -+ quicRecordTestOutputToFile(filename.data(), data); - } - --bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* data) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+bool QuicLoadTestOutputImpl(absl::string_view filename, std::string* data) { - const char* read_dir_env = std::getenv("QUIC_TEST_OUTPUT_DIR"); - if (read_dir_env == nullptr) { - QUIC_LOG(WARNING) << "Could not load test output since QUIC_TEST_OUTPUT_DIR is not set"; -@@ -96,7 +98,8 @@ bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* dat - return true; - } - --void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStringPiece data) { -+// NOLINTNEXTLINE(readability-identifier-naming) -+void QuicRecordTraceImpl(absl::string_view identifier, absl::string_view data) { - const testing::TestInfo* test_info = testing::UnitTest::GetInstance()->current_test_info(); - - std::string timestamp = absl::FormatTime("%Y%m%d%H%M%S", absl::Now(), absl::LocalTimeZone()); -@@ -104,7 +107,7 @@ void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStr - std::string filename = fmt::sprintf("%s.%s.%s.%s.qtr", test_info->name(), - test_info->test_case_name(), identifier.data(), timestamp); - -- QuicRecordTestOutputToFile(filename, data); -+ quicRecordTestOutputToFile(filename, data); - } - - } // namespace quic -diff --git a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h -index a1c6c7305..fcf0c47b3 100644 ---- a/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h -+++ b/test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h -@@ -6,14 +6,16 @@ - // consumed or referenced directly by other Envoy code. It serves purely as a - // porting layer for QUICHE. - --#include "quiche/common/platform/api/quiche_string_piece.h" -+#include "absl/strings/string_view.h" - - namespace quic { -+// NOLINTNEXTLINE(readability-identifier-naming) -+void QuicSaveTestOutputImpl(absl::string_view filename, absl::string_view data); - --void QuicSaveTestOutputImpl(quiche::QuicheStringPiece filename, quiche::QuicheStringPiece data); -+// NOLINTNEXTLINE(readability-identifier-naming) -+bool QuicLoadTestOutputImpl(absl::string_view filename, std::string* data); - --bool QuicLoadTestOutputImpl(quiche::QuicheStringPiece filename, std::string* data); -- --void QuicRecordTraceImpl(quiche::QuicheStringPiece identifier, quiche::QuicheStringPiece data); -+// NOLINTNEXTLINE(readability-identifier-naming) -+void QuicRecordTraceImpl(absl::string_view identifier, absl::string_view data); - - } // namespace quic -diff --git a/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc -deleted file mode 100644 -index a733894b5..000000000 ---- a/test/extensions/quic_listeners/quiche/platform/quiche_platform_test.cc -+++ /dev/null -@@ -1,39 +0,0 @@ --// NOLINT(namespace-envoy) -- --// This file is part of the QUICHE platform implementation, and is not to be --// consumed or referenced directly by other Envoy code. It serves purely as a --// porting layer for QUICHE. -- --#include "gtest/gtest.h" --#include "quiche/common/platform/api/quiche_arraysize.h" --#include "quiche/common/platform/api/quiche_endian.h" --#include "quiche/common/platform/api/quiche_optional.h" --#include "quiche/common/platform/api/quiche_ptr_util.h" --#include "quiche/common/platform/api/quiche_string_piece.h" -- --namespace quiche { -- --TEST(QuichePlatformTest, Arraysize) { -- int array[] = {0, 1, 2, 3, 4}; -- EXPECT_EQ(5, QUICHE_ARRAYSIZE(array)); --} -- --TEST(QuichePlatformTest, StringPiece) { -- std::string s = "bar"; -- QuicheStringPiece sp(s); -- EXPECT_EQ('b', sp[0]); --} -- --TEST(QuichePlatformTest, WrapUnique) { -- auto p = QuicheWrapUnique(new int(6)); -- EXPECT_EQ(6, *p); --} -- --TEST(QuichePlatformTest, TestQuicheOptional) { -- QuicheOptional maybe_a; -- EXPECT_FALSE(maybe_a.has_value()); -- maybe_a = 1; -- EXPECT_EQ(1, *maybe_a); --} -- --} // namespace quiche -diff --git a/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc b/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc -index 56453e232..eeae58c0a 100644 ---- a/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc -+++ b/test/extensions/quic_listeners/quiche/platform/spdy_platform_test.cc -@@ -8,7 +8,6 @@ - #include "gtest/gtest.h" - #include "quiche/spdy/platform/api/spdy_bug_tracker.h" - #include "quiche/spdy/platform/api/spdy_containers.h" --#include "quiche/spdy/platform/api/spdy_endianness_util.h" - #include "quiche/spdy/platform/api/spdy_estimate_memory_usage.h" - #include "quiche/spdy/platform/api/spdy_flags.h" - #include "quiche/spdy/platform/api/spdy_logging.h" -@@ -47,11 +46,6 @@ TEST(SpdyPlatformTest, SpdyHashSet) { - EXPECT_EQ(0, hset.count("qux")); - } - --TEST(SpdyPlatformTest, SpdyEndianness) { -- EXPECT_EQ(0x1234, spdy::SpdyNetToHost16(spdy::SpdyHostToNet16(0x1234))); -- EXPECT_EQ(0x12345678, spdy::SpdyNetToHost32(spdy::SpdyHostToNet32(0x12345678))); --} -- - TEST(SpdyPlatformTest, SpdyEstimateMemoryUsage) { - std::string s = "foo"; - // Stubbed out to always return 0. -@@ -92,19 +86,19 @@ TEST(SpdyPlatformTest, SpdyTestHelpers) { - } - - TEST(SpdyPlatformTest, SpdyFlags) { -- auto& flag_registry = quiche::FlagRegistry::GetInstance(); -- flag_registry.ResetFlags(); -+ auto& flag_registry = quiche::FlagRegistry::getInstance(); -+ flag_registry.resetFlags(); - EXPECT_FALSE(GetSpdyReloadableFlag(spdy_testonly_default_false)); - EXPECT_FALSE(GetSpdyRestartFlag(spdy_testonly_default_false)); - -- flag_registry.FindFlag("spdy_reloadable_flag_spdy_testonly_default_false") -- ->SetValueFromString("true"); -+ flag_registry.findFlag("FLAGS_quic_reloadable_flag_spdy_testonly_default_false") -+ ->setValueFromString("true"); - EXPECT_TRUE(GetSpdyReloadableFlag(spdy_testonly_default_false)); - EXPECT_FALSE(GetSpdyRestartFlag(spdy_testonly_default_false)); - -- flag_registry.ResetFlags(); -- flag_registry.FindFlag("spdy_restart_flag_spdy_testonly_default_false") -- ->SetValueFromString("yes"); -+ flag_registry.resetFlags(); -+ flag_registry.findFlag("FLAGS_quic_restart_flag_spdy_testonly_default_false") -+ ->setValueFromString("yes"); - EXPECT_FALSE(GetSpdyReloadableFlag(spdy_testonly_default_false)); - EXPECT_TRUE(GetSpdyRestartFlag(spdy_testonly_default_false)); - } -diff --git a/test/extensions/quic_listeners/quiche/test_proof_source.h b/test/extensions/quic_listeners/quiche/test_proof_source.h -index a249b4314..bbedfd6c7 100644 ---- a/test/extensions/quic_listeners/quiche/test_proof_source.h -+++ b/test/extensions/quic_listeners/quiche/test_proof_source.h -@@ -36,7 +36,7 @@ protected: - void signPayload(const quic::QuicSocketAddress& /*server_address*/, - const quic::QuicSocketAddress& /*client_address*/, - const std::string& /*hostname*/, uint16_t /*signature_algorithm*/, -- quiche::QuicheStringPiece in, -+ absl::string_view in, - std::unique_ptr callback) override { - callback->Run(true, absl::StrCat("Fake signature for { ", in, " }"), - std::make_unique(filter_chain_)); -diff --git a/test/extensions/quic_listeners/quiche/test_utils.h b/test/extensions/quic_listeners/quiche/test_utils.h -index 102f7608e..7f0ea78e8 100644 ---- a/test/extensions/quic_listeners/quiche/test_utils.h -+++ b/test/extensions/quic_listeners/quiche/test_utils.h -@@ -46,7 +46,7 @@ public: - MOCK_METHOD(quic::QuicConsumedData, WritevData, - (quic::QuicStreamId id, size_t write_length, quic::QuicStreamOffset offset, - quic::StreamSendingState state, quic::TransmissionType type, -- quiche::QuicheOptional level)); -+ absl::optional level)); - MOCK_METHOD(bool, ShouldYield, (quic::QuicStreamId id)); - - absl::string_view requestedServerName() const override { -@@ -90,7 +90,7 @@ public: - MOCK_METHOD(quic::QuicConsumedData, WritevData, - (quic::QuicStreamId id, size_t write_length, quic::QuicStreamOffset offset, - quic::StreamSendingState state, quic::TransmissionType type, -- quiche::QuicheOptional level)); -+ absl::optional level)); - MOCK_METHOD(bool, ShouldYield, (quic::QuicStreamId id)); - - absl::string_view requestedServerName() const override { --- -2.29.2 - diff --git a/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch b/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch deleted file mode 100644 index 370682efaa39..000000000000 --- a/pkgs/servers/http/envoy/0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 8b531c41f956b27e4be32b430db2e7a44e0cdd3e Mon Sep 17 00:00:00 2001 -From: Luke Granger-Brown -Date: Thu, 7 Jan 2021 11:09:18 +0000 -Subject: [PATCH] Add upb patch to make it compile under GCC10 - ---- - bazel/repositories.bzl | 5 +++- - bazel/upb2.patch | 55 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 59 insertions(+), 1 deletion(-) - create mode 100644 bazel/upb2.patch - -diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl -index 64d61ea49..c6cadc9df 100644 ---- a/bazel/repositories.bzl -+++ b/bazel/repositories.bzl -@@ -811,7 +811,10 @@ def _com_github_grpc_grpc(): - def _upb(): - _repository_impl( - name = "upb", -- patches = ["@envoy//bazel:upb.patch"], -+ patches = [ -+ "@envoy//bazel:upb.patch", -+ "@envoy//bazel:upb2.patch", -+ ], - patch_args = ["-p1"], - ) - -diff --git a/bazel/upb2.patch b/bazel/upb2.patch -new file mode 100644 -index 000000000..6e436c61b ---- /dev/null -+++ b/bazel/upb2.patch -@@ -0,0 +1,55 @@ -+From 9bd23dab4240b015321a53c45b3c9e4847fbf020 Mon Sep 17 00:00:00 2001 -+From: Joshua Haberman -+Date: Tue, 7 Apr 2020 15:22:11 -0700 -+Subject: [PATCH] Changed upb status to suit GCC10's warning about strncpy(). -+ (#268) -+ -+Added tests for all cases. Also removed ellipses from truncated -+messages, they were more trouble than they are worth. -+--- -+ tests/test_generated_code.c | 33 +++++++++++++++++++++++++++++++++ -+ upb/upb.c | 17 +++-------------- -+ 2 files changed, 36 insertions(+), 14 deletions(-) -+ -+diff --git a/upb/upb.c b/upb/upb.c -+index cb2cdfd9d..258192d79 100644 -+--- a/upb/upb.c -++++ b/upb/upb.c -+@@ -11,17 +11,6 @@ -+ -+ #include "upb/port_def.inc" -+ -+-/* Guarantee null-termination and provide ellipsis truncation. -+- * It may be tempting to "optimize" this by initializing these final -+- * four bytes up-front and then being careful never to overwrite them, -+- * this is safer and simpler. */ -+-static void nullz(upb_status *status) { -+- const char *ellipsis = "..."; -+- size_t len = strlen(ellipsis); -+- UPB_ASSERT(sizeof(status->msg) > len); -+- memcpy(status->msg + sizeof(status->msg) - len, ellipsis, len); -+-} -+- -+ /* upb_status *****************************************************************/ -+ -+ void upb_status_clear(upb_status *status) { -+@@ -37,8 +26,8 @@ const char *upb_status_errmsg(const upb_status *status) { return status->msg; } -+ void upb_status_seterrmsg(upb_status *status, const char *msg) { -+ if (!status) return; -+ status->ok = false; -+- strncpy(status->msg, msg, sizeof(status->msg)); -+- nullz(status); -++ strncpy(status->msg, msg, UPB_STATUS_MAX_MESSAGE - 1); -++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0'; -+ } -+ -+ void upb_status_seterrf(upb_status *status, const char *fmt, ...) { -+@@ -52,7 +41,7 @@ void upb_status_vseterrf(upb_status *status, const char *fmt, va_list args) { -+ if (!status) return; -+ status->ok = false; -+ _upb_vsnprintf(status->msg, sizeof(status->msg), fmt, args); -+- nullz(status); -++ status->msg[UPB_STATUS_MAX_MESSAGE - 1] = '\0'; -+ } -+ -+ /* upb_alloc ******************************************************************/ --- -2.29.2 - diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index c81d79dbb24b..0c5038898ea3 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -1,6 +1,8 @@ { lib +, bazel_4 , buildBazelPackage , fetchFromGitHub +, fetchpatch , stdenv , cmake , gn @@ -8,6 +10,7 @@ , jdk , ninja , python3 +, linuxHeaders , nixosTests }: @@ -17,23 +20,24 @@ 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.19.1"; - commit = "a2a1e3eed4214a38608ec223859fcfa8fb679b14"; + version = "1.21.1"; + rev = "af50070ee60866874b0a9383daf9364e884ded22"; }; in buildBazelPackage rec { pname = "envoy"; - version = srcVer.version; + inherit (srcVer) version; + bazel = bazel_4; src = fetchFromGitHub { owner = "envoyproxy"; repo = "envoy"; - rev = srcVer.commit; - hash = "sha256:1v1hv4blrppnhllsxd9d3k2wl6nhd59r4ydljy389na3bb41jwf9"; + inherit (srcVer) rev ; + hash = "sha256:11mm72zmb479ss585jzqzhklyyqmdadnvr91ghzvjxc0j2a1hrr4"; extraPostFetch = '' chmod -R +w $out rm $out/.bazelversion - echo ${srcVer.commit} > $out/SOURCE_VERSION + echo ${srcVer.rev} > $out/SOURCE_VERSION sed -i 's/GO_VERSION = ".*"/GO_VERSION = "host"/g' $out/bazel/dependency_imports.bzl ''; }; @@ -48,6 +52,14 @@ buildBazelPackage rec { --replace '"''$$WEE8_BUILD_ARGS"' '"''$$WEE8_BUILD_ARGS use_gold=false"' ''; + patches = [ + # make linux/tcp.h relative. drop when upgrading to >1.21 + (fetchpatch { + url = "https://github.com/envoyproxy/envoy/commit/68448aae7a78a3123097b6ea96016b270457e7b8.patch"; + sha256 = "123kv3x37p8fgfp29jhw5xg5js5q5ipibs8hsm7gzfd5bcllnpfh"; + }) + ]; + nativeBuildInputs = [ cmake python3 @@ -57,8 +69,12 @@ buildBazelPackage rec { ninja ]; + buildInputs = [ + linuxHeaders + ]; + fetchAttrs = { - sha256 = "sha256:0vnl0gq6nhvyzz39jg1bvvna0xyhxalg71bp1jbxib7ql026004r"; + sha256 = "0f7mls2zrpjjvbz6pgkzrvr55bv05xn2l76j9i1r0cf367qqfkz8"; dontUseCmakeConfigure = true; dontUseGnConfigure = true; preInstall = '' @@ -84,7 +100,7 @@ buildBazelPackage rec { dontUseGnConfigure = true; dontUseNinjaInstall = true; preConfigure = '' - sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/tools/build_defs/framework.bzl + sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/foreign_cc/private/framework/toolchains/linux_commands.bzl # Add paths to Nix store back. sed -i \ diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index ffeead30a293..a907de3e73fe 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.48.0"; + version = "1.51.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-oSimHF4qiI2zcMSx51qxs88AcrrewHIbhaRW8s4Ut7Q="; + sha256 = "sha256-TOHD3SEKz5aVG4ikqls4sYMa+FnP8YaCoVAl+HRG9Sc="; }; - vendorSha256 = "sha256-dzYO1yAQSVJmDJvjB5XPRBiYCk+ko1n928CTtUXbHBc="; + vendorSha256 = "sha256-0Vp+dVDMLl52dKLj1v+mgg+odu5DNfrANBzTztVymh8="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 25eb0c6312cb..645abba303af 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.43.v20210629"; + version = "11.0.8"; src = fetchurl { - url = "mirror://maven/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; - sha256 = "sha256-AfrmVLCZMuRGAZqoWeevbgXifbreErVM17rjJJ/HI9k="; + url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; + sha256 = "sha256-fHd0o5f+WLdbDK1nmSnHNKjDO0mV7+vkPs4zVEaqeyw="; }; dontBuild = true; installPhase = '' mkdir -p $out - mv etc lib modules start.ini start.jar $out + mv etc lib modules start.jar $out ''; meta = with lib; { diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 356b21d354f7..d0b11d9b7c16 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre, libxml2, zlib, bzip2, which, file +{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre2, libxml2, zlib, bzip2, which, file +, fetchpatch , openssl , enableDbi ? false, libdbi , enableMagnet ? false, lua5_1 @@ -9,23 +10,22 @@ , enableWebDAV ? false, sqlite, libuuid , enableExtendedAttrs ? false, attr , perl -, fetchpatch }: stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.63"; + version = "1.4.64"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "1fgasvif13gvzz4rf5mjpy28cbw9fs4ymhx18494mxgb080pzvra"; + sha256 = "sha256-4Uidn6dJb78uBxwzi1k7IwDTjCPx5ZZ+UsnvSC4bDiY="; }; patches = [ (fetchpatch { - name = "CVE-2022-22707.patch"; - url = "https://github.com/lighttpd/lighttpd1.4/commit/8c62a890e23f5853b1a562b03fe3e1bccc6e7664.patch"; - sha256 = "0zm2khgllsd1ivh9m7sisfsyrdfz45zsmiwl963wf0gn8m100gzk"; + name = "macos-10.12-avoid-ccrandomgeneratebytes.patch"; + url = "https://redmine.lighttpd.net/projects/lighttpd/repository/14/revisions/6791f71b20a127b5b0091020dd065f4f9c7cafb6/diff?format=diff"; + sha256 = "1x5ybkvxwinl7s1nv3rrc57m4mj38q0gbyjp1ijr4w5lhabw4vzs"; }) ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ] + buildInputs = [ pcre2 pcre2.dev libxml2 zlib bzip2 which file openssl ] ++ lib.optional enableDbi libdbi ++ lib.optional enableMagnet lua5_1 ++ lib.optional enableMysql libmysqlclient @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableExtendedAttrs "--with-attr"; preConfigure = '' - export PATH=$PATH:${pcre.dev}/bin + export PATH=$PATH:${pcre2.dev}/bin sed -i "s:/usr/bin/file:${file}/bin/file:g" configure ''; diff --git a/pkgs/servers/http/lwan/default.nix b/pkgs/servers/http/lwan/default.nix index 3e90857d8db8..5aff026aa9ce 100644 --- a/pkgs/servers/http/lwan/default.nix +++ b/pkgs/servers/http/lwan/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, cmake, jemalloc }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, cmake, enableJemalloc ? !stdenv.hostPlatform.isMusl, jemalloc }: stdenv.mkDerivation rec { pname = "lwan"; @@ -13,7 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ jemalloc zlib ]; + buildInputs = [ zlib ] ++ lib.optional enableJemalloc jemalloc; + + # Note: tcmalloc and mimalloc are also supported (and normal malloc) + cmakeFlags = lib.optional enableJemalloc "-DUSE_ALTERNATIVE_MALLOC=jemalloc"; + + hardeningDisable = lib.optional stdenv.hostPlatform.isMusl "pie"; meta = with lib; { description = "Lightweight high-performance multi-threaded web server"; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index ee36216686a5..f4b5bf65fea0 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, openssl_3_0, ... }@args: callPackage ./generic.nix (args // { openssl = openssl_3_0; }) { - version = "1.21.5"; - sha256 = "sha256-sg879TOlGKbw86eWff7thy0mjTHkzBIaAAEylgLdz7s="; + version = "1.21.6"; + sha256 = "1bh52jqqcaj5wlh2kvhxr00jhk2hnk8k97ki4pwyj4c8920p1p36"; } diff --git a/pkgs/servers/http/nginx/mainline.upstream b/pkgs/servers/http/nginx/mainline.upstream deleted file mode 100644 index 7bb025499592..000000000000 --- a/pkgs/servers/http/nginx/mainline.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url http://nginx.org/en/download.html -version_link '.*-([0-9]+[.][0-9]+([.][0-9]+)*)[.]tar[.][a-z0-9]*$' - -do_overwrite() { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 4860dd9a9347..2b8e2ac7f793 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, pkgs }: +{ fetchFromGitHub, fetchFromGitLab, lib, pkgs }: let @@ -33,6 +33,29 @@ in inputs = [ pkgs.openssl ]; }; + auth-a2aclr = { + src = fetchFromGitLab { + name = "auth-a2aclr"; + owner = "arpa2"; + repo = "nginx-auth-a2aclr"; + rev = "bbabf9480bb2b40ac581551883a18dfa6522dd63"; + sha256 = "sha256-h2LgMhreCgod+H/bNQzY9BvqG9ezkwikwWB3T6gHH04="; + }; + inputs = [ + (pkgs.arpa2common.overrideAttrs + (old: rec { + version = "0.7.1"; + + src = fetchFromGitLab { + owner = "arpa2"; + repo = "arpa2common"; + rev = "v${version}"; + sha256 = "sha256-8zVsAlGtmya9EK4OkGUMu2FKJRn2Q3bg2QWGjqcii64="; + }; + })) + ]; + }; + aws-auth = { src = fetchFromGitHub { name = "aws-auth"; @@ -50,20 +73,21 @@ in repo = "ngx_brotli"; rev = "25f86f0bac1101b6512135eac5f93c49c63609e3"; sha256 = "02hfvfa6milj40qc2ikpb9f95sxqvxk4hly3x74kqhysbdi06hhv"; - }; in pkgs.runCommand "ngx_brotli-src" {} '' - cp -a ${gitsrc} $out - substituteInPlace $out/filter/config \ - --replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev pkgs.brotli} - ''; + }; in + pkgs.runCommand "ngx_brotli-src" { } '' + cp -a ${gitsrc} $out + substituteInPlace $out/filter/config \ + --replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev pkgs.brotli} + ''; inputs = [ pkgs.brotli ]; }; cache-purge = { src = fetchFromGitHub { name = "cache-purge"; - owner = "nginx-modules"; - repo = "ngx_cache_purge"; - rev = "2.5.1"; + owner = "nginx-modules"; + repo = "ngx_cache_purge"; + rev = "2.5.1"; sha256 = "0va4jz36mxj76nmq05n3fgnpdad30cslg7c10vnlhdmmic9vqncd"; }; }; @@ -71,9 +95,9 @@ in coolkit = { src = fetchFromGitHub { name = "coolkit"; - owner = "FRiCKLE"; - repo = "ngx_coolkit"; - rev = "0.2"; + owner = "FRiCKLE"; + repo = "ngx_coolkit"; + rev = "0.2"; sha256 = "1idj0cqmfsdqawjcqpr1fsq670fdki51ksqk2lslfpcs3yrfjpqh"; }; }; @@ -132,6 +156,21 @@ in }; }; + geoip2 = { + src = fetchFromGitHub { + name = "geoip2"; + owner = "leev"; + repo = "ngx_http_geoip2_module"; + rev = "3.3"; + sha256 = "EEn/qxPsBFgVBqOgPYTrRhaLPwSBlSPWYYSr3SL8wZA="; + }; + inputs = [ pkgs.libmaxminddb ]; + + meta = { + maintainers = with lib.maintainers; [ pinpox ]; + }; + }; + http_proxy_connect_module_v18 = http_proxy_connect_module_generic "proxy_connect_rewrite_1018" // { supports = with lib.versions; version: major version == "1" && minor version == "18"; }; @@ -141,13 +180,14 @@ in }; ipscrub = { - src = fetchFromGitHub { - name = "ipscrub"; - owner = "masonicboom"; - repo = "ipscrub"; - rev = "v1.0.1"; - sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz"; - } + "/ipscrub"; + src = fetchFromGitHub + { + name = "ipscrub"; + owner = "masonicboom"; + repo = "ipscrub"; + rev = "v1.0.1"; + sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz"; + } + "/ipscrub"; inputs = [ pkgs.libbsd ]; }; @@ -161,7 +201,7 @@ in }; }; - live ={ + live = { src = fetchFromGitHub { name = "live"; owner = "arut"; @@ -212,10 +252,11 @@ in name = "modsecurity-nginx"; owner = "SpiderLabs"; repo = "ModSecurity-nginx"; - rev = "v1.0.1"; - sha256 = "0cbb3g3g4v6q5zc6an212ia5kjjad62bidnkm8b70i4qv1615pzf"; + rev = "v1.0.2"; + sha256 = "sha256-UXiitc3jZlgXlCsDPS+xEFLNRVgRbn8BCCXUEqAWlII="; }; inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ]; + disableIPC = true; }; moreheaders = { @@ -228,7 +269,7 @@ in }; }; - mpeg-ts ={ + mpeg-ts = { src = fetchFromGitHub { name = "mpeg-ts"; owner = "arut"; @@ -238,14 +279,15 @@ in }; }; - naxsi ={ - src = fetchFromGitHub { - name = "naxsi"; - owner = "nbs-system"; - repo = "naxsi"; - rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7"; - sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3"; - } + "/naxsi_src"; + naxsi = { + src = fetchFromGitHub + { + name = "naxsi"; + owner = "nbs-system"; + repo = "naxsi"; + rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7"; + sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3"; + } + "/naxsi_src"; }; opentracing = { @@ -266,10 +308,10 @@ in version = pkgs.psol.version; moduleSrc = fetchFromGitHub { - name = "pagespeed"; - owner = "pagespeed"; - repo = "ngx_pagespeed"; - rev = "v${version}-stable"; + name = "pagespeed"; + owner = "pagespeed"; + repo = "ngx_pagespeed"; + rev = "v${version}-stable"; sha256 = "0ry7vmkb2bx0sspl1kgjlrzzz6lbz07313ks2lr80rrdm2zb16wp"; }; @@ -278,8 +320,8 @@ in { meta = { description = "PageSpeed module for Nginx"; - homepage = "https://developers.google.com/speed/pagespeed/module/"; - license = pkgs.lib.licenses.asl20; + homepage = "https://developers.google.com/speed/pagespeed/module/"; + license = pkgs.lib.licenses.asl20; }; } '' @@ -287,7 +329,8 @@ in chmod -R +w "$out" ln -s "${pkgs.psol}" "$out/psol" ''; - in { + in + { src = ngx_pagespeed; inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps allowMemoryWriteExecute = true; @@ -314,7 +357,7 @@ in }; }; - push-stream ={ + push-stream = { src = fetchFromGitHub { name = "push-stream"; owner = "wandenberg"; @@ -378,9 +421,9 @@ in slowfs-cache = { src = fetchFromGitHub { name = "slowfs-cache"; - owner = "FRiCKLE"; - repo = "ngx_slowfs_cache"; - rev = "1.10"; + owner = "FRiCKLE"; + repo = "ngx_slowfs_cache"; + rev = "1.10"; sha256 = "1gyza02pcws3zqm1phv3ag50db5gnapxyjwy8skjmvawz7p5bmxr"; }; }; diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index f0a7a3675558..4db1b19644c3 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -6,8 +6,8 @@ callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "6f8253673669"; # branch=quic - sha256 = "sha256:0zl4rws07vr8z7ml7sqlb70v3cx1cms7iablndqd38iqcx0bvjrq"; + rev = "55b38514729b"; # branch=quic + sha256 = "sha256-EJ3Fuxb4Z43I5eSb3mzzIOBfppAZ4Adv1yVZWbVCv0A="; }; preConfigure = '' @@ -19,5 +19,5 @@ callPackage ./generic.nix args { "--with-stream_quic_module" ]; - version = "1.21.5-quic"; + version = "1.21.7-quic"; } diff --git a/pkgs/servers/http/nginx/stable.upstream b/pkgs/servers/http/nginx/stable.upstream deleted file mode 100644 index c20139017436..000000000000 --- a/pkgs/servers/http/nginx/stable.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url http://nginx.org/en/download.html -version_link '.*-([0-9]+[.][0-9]*[02468]([.][0-9]+)*)[.]tar[.][a-z0-9]*$' - -do_overwrite() { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index cbf2fe194354..8a5580d5d0db 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -4,6 +4,7 @@ , envoy , zip , nixosTests +, pomerium-cli }: let @@ -11,18 +12,17 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.15.7"; + version = "0.17.0"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256:0adlk4ylny1z43x1dw3ny0s1932vhb61hpf5wdz4r65y8k9qyfgr"; + hash = "sha256:1hv76i6k9f0kp527nxlxqhklsvkh2cmfnqlszmlk2hxij31qnf8q"; }; - vendorSha256 = "sha256:1fszfbra84pcs8v1h2kf7iy603vf9v2ysg6il76aqmqrxmb1p7nv"; + vendorSha256 = "sha256:1cq4m5a7z64yg3v1c68d15ilw78il6p53vaqzxgn338zjggr3kig"; subPackages = [ "cmd/pomerium" - "cmd/pomerium-cli" ]; ldflags = let @@ -74,11 +74,11 @@ buildGoModule rec { installPhase = '' install -Dm0755 $GOPATH/bin/pomerium $out/bin/pomerium - install -Dm0755 $GOPATH/bin/pomerium-cli $out/bin/pomerium-cli ''; passthru.tests = { inherit (nixosTests) pomerium; + inherit pomerium-cli; }; meta = with lib; { diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index ced4a6dec1fd..ba163a719b10 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - vendorSha256 = "sha256-TxeHfO5IUVsKmKZ1e0/KXi+6dk2nn6AoNG0eB3jyGkY="; + vendorSha256 = "sha256-hvmIOCqVZTfV7EnkDUWiChynGkwTpHClMbW4LpbdAgo="; proxyVendor = true; buildInputs = [ ffmpeg ]; diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 00dfd7c48176..c5966a10937e 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -30,8 +30,8 @@ let pname = "hylafaxplus"; - version = "7.0.4"; - sha256 = "1y4b178rxa4ivxm8cnypnnyc8db7cjqyyzy60hiw215x4cyyj4i5"; + version = "7.0.5"; + sha256 = "1blv251r0yhnhxk9wgkjgr35al50q23hiskjkcbs8lmqqrz0cm8f"; configSite = substituteAll { name = "${pname}-config.site"; @@ -87,11 +87,16 @@ stdenv.mkDerivation { openldap # optional pam # optional ]; + # Disable parallel build, errors: + # *** No rule to make target '../util/libfaxutil.so.7.0.4', needed by 'faxmsg'. Stop. + enableParallelBuilding = false; + postPatch = ". ${postPatch}"; dontAddPrefix = true; postInstall = ". ${postInstall}"; postInstallCheck = ". ${./post-install-check.sh}"; meta = { + changelog = "https://hylafax.sourceforge.io/news/${version}.php"; description = "enterprise-class system for sending and receiving facsimiles"; downloadPage = "https://hylafax.sourceforge.io/download.php"; homepage = "https://hylafax.sourceforge.io"; diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 7a0d75dab24d..75282ad15c4f 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.9.5"; + version = "2.10.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "sha256-yKnG+wxWVgLwG9hRRiLPmNzm9pBrf/mh5V/lLdj8Sv8="; + sha256 = "sha256:0fhhq6mzpwj3dh6w583n4sngshf15dm8zgbli5cacy7jkzmsz0wn"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix index 7e67e645be91..e9075d7d043a 100644 --- a/pkgs/servers/icingaweb2/ipl.nix +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-ipl"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-library"; rev = "v${version}"; - sha256 = "sha256:118bg9mxjxajm2ydbycgqdmdx8przwxblsaxc373r0g1dp1lv0fz"; + sha256 = "sha256:05k0qcd5c5xb124dpp6lvfdh4dzf6bkd34v4sy7aj776p4hrlqx2"; }; installPhase = '' diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index f4ef0636b02b..d35c53de9afe 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.2.1"; + version = "3.3.3"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-89LBpENzDIvlRfNeigSvzBrprw8MRsdRZMQ5qUs0wI8="; + sha256 = "sha256-VS2EZUMUvzuSP/Rs0pY0qo5VcB9VU3+IzZG6AdTrhmk="; rev = "v${version}"; }; - vendorSha256 = "sha256-MHcV6n6uZsjC85vQVl+o6JD+psvE2xuPr//3RueT8V0="; + vendorSha256 = "sha256-Rp0vTtpdKpYg/7UjX73Qwxu6dOqDr24nqp41fKN1IYw="; doCheck = false; diff --git a/pkgs/servers/invidious/default.nix b/pkgs/servers/invidious/default.nix index 7e939f51bc95..adcd694bad94 100644 --- a/pkgs/servers/invidious/default.nix +++ b/pkgs/servers/invidious/default.nix @@ -1,24 +1,27 @@ -{ lib, crystal, fetchFromGitHub, librsvg, pkg-config, libxml2, openssl, sqlite, lsquic, nixosTests }: +{ lib, stdenv, crystal, fetchFromGitHub, librsvg, pkg-config, libxml2, openssl, shards, sqlite, lsquic, videojs, nixosTests }: let - # When updating, always update the following: - # * the git revision - # * the version attribute - # * the source hash (sha256) - # If the shards.lock file changed, also the following: - # * shards.nix (by running `crystal2nix` in invidious’ source tree) - # * If the lsquic.cr dependency changed: lsquic in lsquic.nix (version, sha256) - # * If the lsquic version changed: boringssl' in lsquic.nix (version, sha256) - rev = "21879da80d2dfa97e789a13b90e82e466c4854e3"; + # All versions, revisions, and checksums are stored in ./versions.json. + # The update process is the following: + # * pick the latest commit + # * update .invidious.rev, .invidious.version, and .invidious.sha256 + # * prefetch the videojs dependencies with scripts/fetch-player-dependencies.cr + # and update .videojs.sha256 (they are normally fetched during build + # but nix's sandboxing does not allow that) + # * if shard.lock changed + # * recreate shards.nix by running crystal2nix + # * update lsquic and boringssl if necessarry, lsquic.cr depends on + # the same version of lsquic and lsquic requires the boringssl + # commit mentioned in its README + versions = builtins.fromJSON (builtins.readFile ./versions.json); in crystal.buildCrystalPackage rec { pname = "invidious"; - version = "unstable-2021-11-08"; + inherit (versions.invidious) version; src = fetchFromGitHub { owner = "iv-org"; repo = pname; - inherit rev; - sha256 = "0jvnwjdh2l0hxfvzim00r3zbs528bb93y1nk0bjrbbrcfv5cn5ss"; + inherit (versions.invidious) rev sha256; }; postPatch = @@ -33,13 +36,15 @@ crystal.buildCrystalPackage rec { assetCommitTemplate = ''{{ "#{`git rev-list HEAD --max-count=1 --abbrev-commit -- assets`.strip}" }}''; in '' + for d in ${videojs}/*; do ln -s "$d" assets/videojs; done + # Use the version metadata from the derivation instead of using git at # build-time substituteInPlace src/invidious.cr \ --replace ${lib.escapeShellArg branchTemplate} '"master"' \ - --replace ${lib.escapeShellArg commitTemplate} '"${lib.substring 0 7 rev}"' \ + --replace ${lib.escapeShellArg commitTemplate} '"${lib.substring 0 7 versions.invidious.rev}"' \ --replace ${lib.escapeShellArg versionTemplate} '"${lib.replaceChars ["-"] ["."] (lib.substring 9 10 version)}"' \ - --replace ${lib.escapeShellArg assetCommitTemplate} '"${lib.substring 0 7 rev}"' + --replace ${lib.escapeShellArg assetCommitTemplate} '"${lib.substring 0 7 versions.invidious.rev}"' # Patch the assets and locales paths to be absolute substituteInPlace src/invidious.cr \ @@ -48,19 +53,22 @@ crystal.buildCrystalPackage rec { --replace 'File.read("locales/' 'File.read("${placeholder "out"}/share/invidious/locales/' # Reference sql initialisation/migration scripts by absolute path - substituteInPlace src/invidious/helpers/helpers.cr \ + substituteInPlace src/invidious/database/base.cr \ --replace 'config/sql' '${placeholder "out"}/share/invidious/config/sql' - substituteInPlace src/invidious/users.cr \ + substituteInPlace src/invidious/user/captcha.cr \ --replace 'Process.run(%(rsvg-convert' 'Process.run(%(${lib.getBin librsvg}/bin/rsvg-convert' ''; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config shards ]; buildInputs = [ libxml2 openssl sqlite ]; format = "crystal"; shardsFile = ./shards.nix; - crystalBinaries.invidious.src = "src/invidious.cr"; + crystalBinaries.invidious = { + src = "src/invidious.cr"; + options = [ "--release" "--progress" "--verbose" "--no-debug" "-Dskip_videojs_download" ]; + }; postConfigure = '' # lib includes nix store paths which can’t be patched, so the links have to @@ -88,12 +96,17 @@ crystal.buildCrystalPackage rec { INVIDIOUS_CONFIG="database_url: sqlite3:///dev/null" $out/bin/invidious --help ''; - passthru.tests = { inherit (nixosTests) invidious; }; + passthru = { + inherit lsquic; + tests = { inherit (nixosTests) invidious; }; + updateScript = ./update.sh; + }; meta = with lib; { description = "An open source alternative front-end to YouTube"; homepage = "https://invidious.io/"; license = licenses.agpl3; maintainers = with maintainers; [ infinisil sbruder ]; + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/servers/invidious/lsquic.nix b/pkgs/servers/invidious/lsquic.nix index acc9b97ae5df..292d37ce6cd5 100644 --- a/pkgs/servers/invidious/lsquic.nix +++ b/pkgs/servers/invidious/lsquic.nix @@ -1,24 +1,30 @@ { lib, boringssl, stdenv, fetchgit, fetchFromGitHub, cmake, zlib, perl, libevent }: let + versions = builtins.fromJSON (builtins.readFile ./versions.json); + # lsquic requires a specific boringssl version (noted in its README) - boringssl' = boringssl.overrideAttrs (old: rec { - version = "251b5169fd44345f455438312ec4e18ae07fd58c"; + boringssl' = boringssl.overrideAttrs (old: { + version = versions.boringssl.rev; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = version; - sha256 = "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="; + inherit (versions.boringssl) rev sha256; }; + + patches = [ + # Use /etc/ssl/certs/ca-certificates.crt instead of /etc/ssl/cert.pem + ./use-etc-ssl-certs.patch + ]; }); in stdenv.mkDerivation rec { pname = "lsquic"; - version = "2.18.1"; + version = versions.lsquic.version; src = fetchFromGitHub { owner = "litespeedtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM="; + inherit (versions.lsquic) sha256; fetchSubmodules = true; }; @@ -49,6 +55,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.boringssl = boringssl'; + meta = with lib; { description = "A library for QUIC and HTTP/3 (version for Invidious)"; homepage = "https://github.com/litespeedtech/lsquic"; diff --git a/pkgs/servers/invidious/shards.nix b/pkgs/servers/invidious/shards.nix index 778b34496a62..582a4083e7db 100644 --- a/pkgs/servers/invidious/shards.nix +++ b/pkgs/servers/invidious/shards.nix @@ -59,10 +59,22 @@ rev = "v0.4.1"; sha256 = "1l08cydkdidq9yyil1wl240hvk41iycv04jrg6nx5mkvzw4z1bzg"; }; + spectator = { + owner = "icy-arctic-fox"; + repo = "spectator"; + rev = "v0.10.4"; + sha256 = "0rcxq2nbslvwrd8m9ajw6dzaw3hagxmkdy9s8p34cgnr4c9dijdq"; + }; sqlite3 = { owner = "crystal-lang"; repo = "crystal-sqlite3"; rev = "v0.18.0"; sha256 = "03nnvpchhq9f9ywsm3pk2rrj4a3figw7xs96zdziwgr5znkz6x93"; }; + ameba = { + owner = "crystal-ameba"; + repo = "ameba"; + rev = "v0.14.3"; + sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1"; + }; } diff --git a/pkgs/servers/invidious/update.sh b/pkgs/servers/invidious/update.sh new file mode 100755 index 000000000000..580d6136388a --- /dev/null +++ b/pkgs/servers/invidious/update.sh @@ -0,0 +1,96 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl crystal crystal2nix jq git moreutils nix nix-prefetch pkg-config +git_url='https://github.com/iv-org/invidious.git' +git_branch='master' +git_dir='/var/tmp/invidious.git' +pkg='invidious' + +set -euo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" + +info() { + if [ -t 2 ]; then + set -- '\033[32m%s\033[39m\n' "$@" + else + set -- '%s\n' "$@" + fi + printf "$@" >&2 +} + +json_get() { + jq -r "$1" < 'versions.json' +} + +json_set() { + jq --arg x "$2" "$1 = \$x" < 'versions.json' | sponge 'versions.json' +} + +old_rev=$(json_get '.invidious.rev') +old_version=$(json_get '.invidious.version') +today=$(LANG=C date -u +'%Y-%m-%d') + +info "fetching $git_url..." +if [ ! -d "$git_dir" ]; then + git init --initial-branch="$git_branch" "$git_dir" + git -C "$git_dir" remote add origin "$git_url" +fi +git -C "$git_dir" fetch origin "$git_branch" + +# use latest commit before today, we should not call the version *today* +# because there might still be commits coming +# use the day of the latest commit we picked as version +new_rev=$(git -C "$git_dir" log -n 1 --format='format:%H' --before="${today}T00:00:00Z" "origin/$git_branch") +new_version="unstable-$(git -C "$git_dir" log -n 1 --format='format:%cs' "$new_rev")" +info "latest commit before $today: $new_rev" + +if [ "$new_rev" = "$old_rev" ]; then + info "$pkg is up-to-date." + exit +fi + +json_set '.invidious.version' "$new_version" +json_set '.invidious.rev' "$new_rev" +new_sha256=$(nix-prefetch -I 'nixpkgs=../../..' "$pkg") +json_set '.invidious.sha256' "$new_sha256" +commit_msg="$pkg: $old_version -> $new_version" + +# fetch video.js dependencies +info "Running scripts/fetch-player-dependencies.cr..." +git -C "$git_dir" reset --hard "$new_rev" +(cd "$git_dir" && crystal run scripts/fetch-player-dependencies.cr -- --minified) +rm -f "$git_dir/assets/videojs/.gitignore" +videojs_new_sha256=$(nix hash-path --type sha256 --base32 "$git_dir/assets/videojs") +json_set '.videojs.sha256' "$videojs_new_sha256" + +if git -C "$git_dir" diff-tree --quiet "${old_rev}..${new_rev}" -- 'shard.lock'; then + info "shard.lock did not change since $old_rev." +else + info "Updating shards.nix..." + crystal2nix -- "$git_dir/shard.lock" # argv's index seems broken + + lsquic_old_version=$(json_get '.lsquic.version') + # lsquic.cr's version tracks lsquic's, so lsquic must be updated to the + # version in the shards file + lsquic_new_version=$(nix eval --raw -f 'shards.nix' lsquic.rev \ + | sed -e 's/^v//' -e 's/-[0-9]*$//') + if [ "$lsquic_old_version" != "$lsquic_new_version" ]; then + info "Updating lsquic to $lsquic_new_version..." + json_set '.lsquic.version' "$lsquic_new_version" + lsquic_new_sha256=$(nix-prefetch -I 'nixpkgs=../../..' "${pkg}.lsquic") + json_set '.lsquic.sha256' "$lsquic_new_sha256" + + info "Updating boringssl..." + # lsquic specifies the boringssl commit it requires in its README + boringssl_new_rev=$(curl -LSsf "https://github.com/litespeedtech/lsquic/raw/v${lsquic_new_version}/README.md" \ + | grep -Pom1 '(?<=^git checkout ).*') + json_set '.boringssl.rev' "$boringssl_new_rev" + boringssl_new_sha256=$(nix-prefetch -I 'nixpkgs=../../..' "${pkg}.lsquic.boringssl") + json_set '.boringssl.sha256' "$boringssl_new_sha256" + commit_msg="$commit_msg + +lsquic: $lsquic_old_version -> $lsquic_new_version" + fi +fi + +git commit --verbose --message "$commit_msg" -- versions.json shards.nix diff --git a/pkgs/servers/invidious/use-etc-ssl-certs.patch b/pkgs/servers/invidious/use-etc-ssl-certs.patch new file mode 100644 index 000000000000..b60b0b1f1a12 --- /dev/null +++ b/pkgs/servers/invidious/use-etc-ssl-certs.patch @@ -0,0 +1,13 @@ +diff --git a/crypto/x509/x509_def.c b/crypto/x509/x509_def.c +index d2bc3e5c1..329580075 100644 +--- a/crypto/x509/x509_def.c ++++ b/crypto/x509/x509_def.c +@@ -67,7 +67,7 @@ + + #define X509_CERT_AREA OPENSSLDIR + #define X509_CERT_DIR OPENSSLDIR "/certs" +-#define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++#define X509_CERT_FILE "/etc/ssl/certs/ca-certificates.crt" + #define X509_PRIVATE_DIR OPENSSLDIR "/private" + #define X509_CERT_DIR_EVP "SSL_CERT_DIR" + #define X509_CERT_FILE_EVP "SSL_CERT_FILE" diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json new file mode 100644 index 000000000000..cec068a09bf1 --- /dev/null +++ b/pkgs/servers/invidious/versions.json @@ -0,0 +1,18 @@ +{ + "boringssl": { + "rev": "251b5169fd44345f455438312ec4e18ae07fd58c", + "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" + }, + "invidious": { + "rev": "ed265cfdcd131b9df5398d899cc5d7036a5b7846", + "sha256": "0hhnq4s0slwbgxra7gxapl7dcz60a7k71cndi4crqcikmazzac3b", + "version": "unstable-2022-03-16" + }, + "lsquic": { + "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", + "version": "2.18.1" + }, + "videojs": { + "sha256": "0b4vxd29kpvy60yhqm376r1872gds17s6wljqw0zlr16j762k50r" + } +} diff --git a/pkgs/servers/invidious/videojs.nix b/pkgs/servers/invidious/videojs.nix new file mode 100644 index 000000000000..e4470793e51e --- /dev/null +++ b/pkgs/servers/invidious/videojs.nix @@ -0,0 +1,18 @@ +{ stdenvNoCC, cacert, crystal, openssl, pkg-config, invidious }: + +let + versions = builtins.fromJSON (builtins.readFile ./versions.json); +in +stdenvNoCC.mkDerivation { + name = "videojs"; + + inherit (invidious) src; + + builder = ./videojs.sh; + + nativeBuildInputs = [ cacert crystal openssl pkg-config ]; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = versions.videojs.sha256; +} diff --git a/pkgs/servers/invidious/videojs.sh b/pkgs/servers/invidious/videojs.sh new file mode 100644 index 000000000000..31609db14eb3 --- /dev/null +++ b/pkgs/servers/invidious/videojs.sh @@ -0,0 +1,9 @@ +source $stdenv/setup + +unpackPhase +cd source +# this helper downloads the videojs files and checks their checksums +# against videojs-dependencies.yml so it should be pure +crystal run scripts/fetch-player-dependencies.cr -- --minified +rm -f assets/videojs/.gitignore +mv assets/videojs "$out" diff --git a/pkgs/servers/irc/atheme/default.nix b/pkgs/servers/irc/atheme/default.nix index eb6f9345b2d0..9db7ef3aaca8 100644 --- a/pkgs/servers/irc/atheme/default.nix +++ b/pkgs/servers/irc/atheme/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "atheme"; - version = "7.2.11"; + version = "7.2.12"; src = fetchgit { url = "https://github.com/atheme/atheme.git"; rev = "v${version}"; - sha256 = "15fs48cgzxblh2g4abl5v647ndfx9hg8cih2x67v3y7s9wz68wk2"; + sha256 = "sha256-KAC1ZPNo4TqfVryKOYYef8cRWRgFmyEdvl1bgvpGNiM="; leaveDotGit = true; }; diff --git a/pkgs/servers/irc/ergochat/default.nix b/pkgs/servers/irc/ergochat/default.nix index 1aa5f5158aa8..57f79ff916c3 100644 --- a/pkgs/servers/irc/ergochat/default.nix +++ b/pkgs/servers/irc/ergochat/default.nix @@ -1,6 +1,6 @@ -{ buildGo117Module, fetchFromGitHub, lib, nixosTests }: +{ buildGoModule, fetchFromGitHub, lib, nixosTests }: -buildGo117Module rec { +buildGoModule rec { pname = "ergo"; version = "2.9.1"; diff --git a/pkgs/servers/irc/irccat/default.nix b/pkgs/servers/irc/irccat/default.nix new file mode 100644 index 000000000000..fdcb39af0b82 --- /dev/null +++ b/pkgs/servers/irc/irccat/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "irccat"; + version = "0.4.8"; + + src = fetchFromGitHub { + owner = "irccloud"; + repo = "irccat"; + rev = "v${version}"; + sha256 = "sha256-fr5x1usviJPbc4t5SpIVgV9Q6071XG8eYtyeyraddts="; + }; + + vendorSha256 = "030hnkwh45yqppm96yy15j82skf7wmax5xkm7j5khr1l9lrz4591"; + + meta = with lib; { + homepage = "https://github.com/irccloud/irccat"; + description = "Send events to IRC channels from scripts and other applications"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.gpl3Only; + }; +} diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index f02fc8df3b1b..a7f48861487a 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -16,13 +16,13 @@ in with python3Packages; buildPythonApplication rec { pname = "isso"; - version = "0.12.5"; + version = "0.12.6.1"; src = fetchFromGitHub { owner = "posativ"; repo = pname; rev = version; - sha256 = "12ccfba2kwbfm9h4zhlxrcigi98akbdm4qi89iglr4z53ygzpay5"; + sha256 = "sha256-b2iJmOOsaI4lqJ5//jmHflXRx4yFDaAoKZixXoWIyZg="; }; propagatedBuildInputs = [ @@ -47,10 +47,13 @@ with python3Packages; buildPythonApplication rec { make js ''; - checkInputs = [ nose ]; + checkInputs = [ + pytest + pytest-cov + ]; checkPhase = '' - ${python.interpreter} setup.py nosetests + pytest ''; passthru.tests = { inherit (nixosTests) isso; }; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 6327f5079386..69e891fe595e 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.428"; + version = "0.20.709"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "Wf1eQkKovRIMUQeqadmOQl5R0syoKWiZENjRR4jGUdk="; + sha256 = "Gx1VHjs37XBcvw20pQNrA/meLuVmogdGIzroRXvTv5Q="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/jackett/deps.nix b/pkgs/servers/jackett/deps.nix index 3b99b595292f..022c604d0a91 100644 --- a/pkgs/servers/jackett/deps.nix +++ b/pkgs/servers/jackett/deps.nix @@ -8,7 +8,7 @@ (fetchNuGet { pname = "CommandLineParser"; version = "2.8.0"; sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb"; }) (fetchNuGet { pname = "coverlet.msbuild"; version = "3.1.0"; sha256 = "1rx5x2zks2aryy6mbly86a83gxzm0y7bbx9834b3224673rs7ra0"; }) (fetchNuGet { pname = "DotNet4.SocksProxy"; version = "1.4.0.1"; sha256 = "1ig2a9ism041a6qrqkxa9xhvp19yxzcadlap5i1kz97f05a2msvb"; }) - (fetchNuGet { pname = "FlareSolverrSharp"; version = "2.1.0"; sha256 = "17khlhfl3pg2619pyn3rbyw5hbjwra3rwzrkiqcwkikfla5185gf"; }) + (fetchNuGet { pname = "FlareSolverrSharp"; version = "2.2.0"; sha256 = "07jsyhlrg0jb1cjn1p20wp2c9rsjqxv7kh6vvd0xv0mjd88idchr"; }) (fetchNuGet { pname = "FluentAssertions"; version = "6.2.0"; sha256 = "10zhr7hgzm9w0gfg0sa0h2qdlna0w7n2jl72s4j7hi6mf68px2xm"; }) (fetchNuGet { pname = "Microsoft.AspNetCore"; version = "2.2.0"; sha256 = "0vsv7hcsmnsgqhs67zp207n7m9ix3dbwm1p2ch3dizkcdvz235f9"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Antiforgery"; version = "2.2.0"; sha256 = "026wjdwjx0lgccqv0xi5gxylxzgz5ifgxf25p5pqakgrhkz0a59l"; }) @@ -152,6 +152,9 @@ (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.Extensions.WebEncoders"; version = "2.2.0"; sha256 = "1mhnichccw6mjf37d38q2i1kr7qp485m7apa1b872ji0q16yy1y3"; }) + (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.1.0"; sha256 = "1a02bll0flsin9grd3jxbi76ycl42qamynalbp7qbqcsprabw3ai"; }) + (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) (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 = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) @@ -159,9 +162,6 @@ (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; }) - (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.1.0"; sha256 = "1a02bll0flsin9grd3jxbi76ycl42qamynalbp7qbqcsprabw3ai"; }) - (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.0"; sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.0.0"; sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.0.0"; sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) @@ -185,8 +185,8 @@ (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "4.14.0"; sha256 = "1q2v44inp4xjynncxpv432k2qjkfara1bpipmv3p3in0yv14l3wg"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; }) - (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.1.0"; sha256 = "1z5g15npmsjszhfmkrdmp4ds7jpxzhxblss2rjl5mfn5sihy4cww"; }) (fetchNuGet { pname = "NUnit.ConsoleRunner"; version = "3.12.0"; sha256 = "00ihk6i3wzqndrn6yyh1csh4b3h226x5kwdp3716p75p4nljs1ik"; }) + (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.1.0"; sha256 = "1z5g15npmsjszhfmkrdmp4ds7jpxzhxblss2rjl5mfn5sihy4cww"; }) (fetchNuGet { pname = "Polly"; version = "7.2.2"; sha256 = "0s15n5zwj44i6sw3v40ca8l6j0ijydxcakvad49j52rp49iwrmkn"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index 1ccaca421337..3400b5c50541 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "0.11.5"; + version = "1.0.0"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+ojBVdglOTqdmWT8QPUzJRT7RgtXxEOLNC5GqP0vO6Y="; + sha256 = "sha256-BREPSDmGR85kDx1PWLdwpbwImAFuctLLx3AcHqAcURk="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 4dce2a7258fa..814d8eecdc38 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -70,11 +70,6 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - export HOME=$(mktemp -d) - - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_NOLOGO=1 - nuget sources Add -Name nixos -Source "$PWD/nixos" nuget init "$nugetDeps" "$PWD/nixos" diff --git a/pkgs/servers/jibri/default.nix b/pkgs/servers/jibri/default.nix index cea7901b949f..383bd524d640 100644 --- a/pkgs/servers/jibri/default.nix +++ b/pkgs/servers/jibri/default.nix @@ -13,10 +13,10 @@ let in stdenv.mkDerivation rec { pname = "jibri"; - version = "8.0-114-g20e233e"; + version = "8.0-93-g51fe7a2"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "DD1l7HQLqpPXgSzfKkZ9dYnGhinEoiGhVj4bbWWBnQM="; + sha256 = "8jBSkFIBi7NYxV41VtFmGfevVp6+emRWdoQ1l4dS6PA="; }; dontBuild = true; diff --git a/pkgs/servers/keycloak/all-plugins.nix b/pkgs/servers/keycloak/all-plugins.nix new file mode 100644 index 000000000000..4dbd24872631 --- /dev/null +++ b/pkgs/servers/keycloak/all-plugins.nix @@ -0,0 +1,7 @@ +{ callPackage }: + +{ + scim-for-keycloak = callPackage ./scim-for-keycloak {}; + keycloak-discord = callPackage ./keycloak-discord {}; + keycloak-metrics-spi = callPackage ./keycloak-metrics-spi {}; +} diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 9d8a2b31bf12..d9797de6d174 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchzip, makeWrapper, jre, writeText, nixosTests , postgresql_jdbc ? null, mysql_jdbc ? null +, callPackage }: let @@ -50,12 +51,17 @@ stdenv.mkDerivation rec { ln -s ${mkModuleXml "com.mysql" "mysql-connector-java.jar"} $module_path/com/mysql/main/module.xml ''} - wrapProgram $out/bin/standalone.sh --set JAVA_HOME ${jre} - wrapProgram $out/bin/add-user-keycloak.sh --set JAVA_HOME ${jre} - wrapProgram $out/bin/jboss-cli.sh --set JAVA_HOME ${jre} + for script in add-user-keycloak.sh add-user.sh domain.sh elytron-tool.sh jboss-cli.sh jconsole.sh jdr.sh standalone.sh wsconsume.sh wsprovide.sh; do + wrapProgram $out/bin/$script --set JAVA_HOME ${jre} + done + wrapProgram $out/bin/kcadm.sh --prefix PATH : ${jre}/bin + wrapProgram $out/bin/kcreg.sh --prefix PATH : ${jre}/bin ''; - passthru.tests = nixosTests.keycloak; + passthru = { + tests = nixosTests.keycloak; + plugins = callPackage ./all-plugins.nix {}; + }; meta = with lib; { homepage = "https://www.keycloak.org/"; diff --git a/pkgs/servers/keycloak/keycloak-discord/default.nix b/pkgs/servers/keycloak/keycloak-discord/default.nix new file mode 100644 index 000000000000..047bc67fbc56 --- /dev/null +++ b/pkgs/servers/keycloak/keycloak-discord/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, lib +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "keycloak-discord"; + version = "0.3.1"; + + src = fetchurl { + url = "https://github.com/wadahiro/keycloak-discord/releases/download/v${version}/keycloak-discord-ear-${version}.ear"; + sha256 = "0fswhbnxc80dpfqf5y6j29dxk3vcnm4kki6qdk22qliasvpw5n9c"; + }; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + mkdir -p "$out" + install "$src" "$out/${pname}-ear-${version}.ear" + ''; + + meta = with lib; { + homepage = "https://github.com/wadahiro/keycloak-discord"; + description = "Keycloak Social Login extension for Discord"; + license = licenses.apsl20; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix new file mode 100644 index 000000000000..b5e23d0fe22d --- /dev/null +++ b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchurl }: + +stdenv.mkDerivation rec { + pname = "keycloak-metrics-spi"; + version = "2.5.3"; + + src = fetchurl { + url = "https://github.com/aerogear/keycloak-metrics-spi/releases/download/${version}/keycloak-metrics-spi-${version}.jar"; + sha256 = "15lsy8wjw6nlfdfhllc45z9l5474p0lsghrwzzsssvd68bw54gwv"; + }; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out + install "$src" "$out" + ''; + + meta = with lib; { + homepage = "https://github.com/aerogear/keycloak-metrics-spi"; + description = "Keycloak Service Provider that adds a metrics endpoint"; + license = licenses.apsl20; + maintainers = with maintainers; [ benley ]; + }; +} diff --git a/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/pkgs/servers/keycloak/scim-for-keycloak/default.nix new file mode 100644 index 000000000000..1ef06061326e --- /dev/null +++ b/pkgs/servers/keycloak/scim-for-keycloak/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, maven +, javaPackages +}: + +javaPackages.mavenfod rec { + pname = "scim-for-keycloak"; + version = "kc-15-b2"; # When updating also update mvnHash + + src = fetchFromGitHub { + owner = "Captain-P-Goldfish"; + repo = "scim-for-keycloak"; + rev = version; + sha256 = "K34c7xISjEETI3jFkRLdZ0C8pZHTWtPtrrIzwC76Tv0="; + }; + + mvnHash = "sha256-kDYhXTEOAWH/dcRJalKtbwBpoxcD1aX9eqcRKs6ewbE="; + + nativeBuildInputs = [ + maven + ]; + + installPhase = '' + EAR=$(find -iname "*.ear") + install -D "$EAR" "$out/$(basename $EAR)" + ''; + + meta = with lib; { + homepage = "https://github.com/Captain-P-Goldfish/scim-for-keycloak"; + description = "A third party module that extends Keycloak with SCIM functionality"; + license = licenses.bsd3; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 7d5ae0c74f29..490bb9c9e094 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2021-12-24"; + version = "unstable-2022-03-11"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "247cd753e283e70a9949e76d0ba669d99c0eb144"; - sha256 = "sha256-65wxhE/XqNK6ly+fxZFLjtImvpJlgU54RStUve40CJA="; + rev = "e3beafbdb4f2ac3f889f81aec0cad5ec473c8612"; + sha256 = "sha256-xZSZUJ2TNaUzfwEFpnzr5EPlOvILLyiQ/3K1iiup7kU="; }; sourceRoot = "source/klippy"; @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/klipper cp -r ./* $out/lib/klipper + # Moonraker expects `config_examples` and `docs` to be available + # under `klipper_path` + cp -r $src/docs $out/lib/docs + cp -r $src/config $out/lib/config + chmod 755 $out/lib/klipper/klippy.py runHook postInstall ''; diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/servers/kubemq-community/default.nix new file mode 100644 index 000000000000..823f3125cbe5 --- /dev/null +++ b/pkgs/servers/kubemq-community/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "kubemq-community"; + version = "2.2.12"; + src = fetchFromGitHub { + owner = "kubemq-io"; + repo = pname; + rev = "v${version}"; + sha256 = "06n3avcqknqzf9y03xqcsg36pwcha29j2psp9xsnir7hrx66zww8"; + }; + + CGO_ENABLED=0; + + ldflags=[ "-w" "-s" "-X main.version=${version}" ]; + + doCheck = false; # grpc tests are flaky + + vendorSha256 = "1sh0dzz8z065964k2gzkzw9p3db3rcf6mv901zym0wqm4p71045w"; + + meta = { + homepage = "https://github.com/kubemq-io/kubemq-community"; + description = "KubeMQ Community is the open-source version of KubeMQ, the Kubernetes native message broker."; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ brianmcgee ]; + }; +} diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 121eeb991f93..1661104dcef2 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.21.7"; + version = "0.22.5"; src = fetchFromGitHub { owner = "spikecodes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pALPhSoamsU5xEbSoXFe+Cikl16gxTXccUATMkYB97M="; + sha256 = "sha256-yzYmlewM9NcNHPUmfGiUP0Px2s+sagZOU82wK4973rY="; }; - cargoSha256 = "sha256-/P8wyFPCcCoGINtJ0qom3xLlkunH6xZPd7/7ynXmTy4="; + cargoSha256 = "sha256-XZkTfpi9stW13l7yo0LFZryAPITVZa9MALrSWSei5LU="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/servers/limesurvey/default.nix b/pkgs/servers/limesurvey/default.nix index e71ff33e2f9d..d74e1a0fab64 100644 --- a/pkgs/servers/limesurvey/default.nix +++ b/pkgs/servers/limesurvey/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "limesurvey"; - version = "3.23.7+201006"; + version = "3.27.33+220125"; src = fetchFromGitHub { owner = "LimeSurvey"; repo = "LimeSurvey"; rev = version; - sha256 = "19p978p0flknsg3iqlrrbr76qsk5ha2a84nxywqsvjrjvqrh5jrc"; + sha256 = "sha256-iwTsn+glh8fwt1IaH9iDKDhEAnx1s1zvv1dmsdzUk8g="; }; phpConfig = writeText "config.php" '' @@ -37,10 +37,5 @@ stdenv.mkDerivation rec { homepage = "https://www.limesurvey.org"; maintainers = with maintainers; [offline]; platforms = with platforms; unix; - knownVulnerabilities = [ - # https://github.com/LimeSurvey/LimeSurvey/blob/3.x-LTS/docs/release_notes.txt - "Unauthorized access to statistics of a survey with certain permission configurations" - "Persistent XSS in browse response" - ]; }; } diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index e5d282e64ec1..046ad481457f 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { version = "0.5.20"; proxyVendor = true; - vendorSha256 = "sha256-pyPxONcWniJoA0qYusHktF3/taYda2StaMiMhyRYEm4="; + vendorSha256 = "sha256-aRZoAEnRai8i5H08ReW8lEFlbmarYxU0lBRhR/Llw+M="; src = fetchFromGitHub { owner = "livepeer"; diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index b4ddb80c1653..11da56c6eb99 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "maddy"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "foxcpp"; repo = "maddy"; rev = "v${version}"; - sha256 = "sha256-b85g8Eu7qWTI+ggMr7JL/2BAVbkXocpsR89P6s6TfMg="; + sha256 = "sha256-FWoPAb/aHaQLxT+UUUoViCmLvauVuAzUyOmRNB8F72U="; }; - vendorSha256 = "sha256-kzSwqT3r6uGxq1GNzCWCn8VoCxmVtiUb23XLCpsPv/c="; + vendorSha256 = "sha256-rcHboPfs2mWg3sgsLmN1IPoppmuDcsx0bQICp6EzYsQ="; ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ]; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 45300a8073f9..266bb0a383d8 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; - version = "2.3.17.1"; + version = "2.3.18"; nativeBuildInputs = [ perl pkg-config ]; buildInputs = @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "1f525bvpjvi4rnwqjsqaqrbdii08sqmc1v8xq03m19w1vk6cqrqw"; + hash = "sha256-Buc/ZoxsCTxFve7rfCA5irjcSTFyNPS1eBrF4sxdbDM="; }; enableParallelBuilding = true; diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 9af34371490d..e6ec00633386 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, dovecot, libtool, xapian, icu64 }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, sqlite, pkg-config, dovecot, libtool, xapian, icu64 }: stdenv.mkDerivation rec { pname = "dovecot-fts-xapian"; - version = "1.5.2"; + version = "1.5.4b"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; rev = version; - sha256 = "1ap4jb43gvy7caa8lg2hg811q0n5c2gqbmcjl4126wz44hb7waa1"; + sha256 = "sha256-RzwJjcUgk1XXQZpNdz86Pr9HsUaQCOSt5oSejnGVmgA="; }; - buildInputs = [ dovecot xapian icu64 ]; + buildInputs = [ dovecot xapian icu64 sqlite ]; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 2b75a36c6c42..3f1f2d270a36 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -3,11 +3,11 @@ let dovecotMajorMinor = lib.versions.majorMinor dovecot.version; in stdenv.mkDerivation rec { pname = "dovecot-pigeonhole"; - version = "0.5.17.1"; + version = "0.5.18"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz"; - sha256 = "04j5z3y8yyci4ni9j9i7cy0zg1qj2sm9zfarmjcvs9vydpga7i1w"; + hash = "sha256-ptgo+Nby3sulEFND7OXHplJFvZTkaorkQyptl1QxCKU="; }; buildInputs = [ dovecot openssl ]; diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index b33e4535ca91..8d73542bec68 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -100,9 +100,9 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://nuclearelephant.com/"; + homepage = "http://dspam.sourceforge.net/"; description = "Community Driven Antispam Filter"; - license = licenses.agpl3; + license = licenses.agpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index f66b0a9f6b03..d1e4581789e0 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -43,6 +43,9 @@ buildPythonPackage rec { postPatch = '' # isort is a development dependency sed -i '/isort/d' setup.py + # Fix mistune imports for mistune >= 2.0.0 + # https://gitlab.com/mailman/hyperkitty/-/merge_requests/379 + sed -i 's/mistune.scanner/mistune.util/' hyperkitty/lib/renderer.py ''; propagatedBuildInputs = [ diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index c517cb3e4e30..adad9d219433 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # Django is depended on transitively by hyperkitty and postorius, # and mailman_web has overly restrictive version bounds on it, so # let's remove it. - sed -i '/^ Django/d' setup.cfg + sed -i '/^[[:space:]]*django/Id' setup.cfg # Upstream seems to mostly target installing on top of existing # distributions, and uses a path appropriate for that, but we are diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 92fe6e0403a2..08c55f771724 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.6.3"; + version = "3.6.5"; src = fetchurl { url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz"; - sha256 = "1g5ii5vvcr87qkabsbyg3n7kzy1g5k2n5gwa8468w5d0ava424hg"; + hash = "sha256-MA+ogRzqINAdJcYZ01m/+rgmVucE2qcZ4MmvxOz/SAg="; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/servers/mail/sympa/default.nix index 4d439bf760af..196cd07ceff8 100644 --- a/pkgs/servers/mail/sympa/default.nix +++ b/pkgs/servers/mail/sympa/default.nix @@ -61,13 +61,13 @@ let in stdenv.mkDerivation rec { pname = "sympa"; - version = "6.2.66"; + version = "6.2.68"; src = fetchFromGitHub { owner = "sympa-community"; repo = pname; rev = version; - sha256 = "sha256-rD6sYsEsAyu+4Vy2wMtWCtlzXoLeZgeu9hkoxOvwiP4="; + sha256 = "sha256-biTF2We9/ZBFBNpltyJonAe5tpXz+eNam+Bu6esJPiY="; }; configureFlags = [ diff --git a/pkgs/servers/mapcache/default.nix b/pkgs/servers/mapcache/default.nix index ff502d203285..3eae9c2b33cb 100644 --- a/pkgs/servers/mapcache/default.nix +++ b/pkgs/servers/mapcache/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mapcache"; - version = "1.10.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "MapServer"; repo = pname; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-HrvcJAf0a6tu8AKKuW5TaCtqPMgzH21fGMBxIfUzdgY="; + sha256 = "sha256-NuiZMWcmsN5wDCd37Hvj3cazwT3Ea+OknV/YR3urZB0="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix index e863451bb5e0..dfe1a6d26ec9 100644 --- a/pkgs/servers/mastodon/default.nix +++ b/pkgs/servers/mastodon/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv +{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, fetchpatch, bundlerEnv, nixosTests , yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript +, fetchYarnDeps, fixup_yarn_lock # Allow building a fork or custom version of Mastodon: , pname ? "mastodon" @@ -15,6 +16,19 @@ stdenv.mkDerivation rec { # Putting the callPackage up in the arguments list also does not work. src = if srcOverride != null then srcOverride else callPackage ./source.nix {}; + patches = [ + (fetchpatch { + name = "CVE-2022-0432.patch"; + url = "https://github.com/mastodon/mastodon/commit/4d6d4b43c6186a13e67b92eaf70fe1b70ea24a09.patch"; + sha256 = "sha256-C18X2ErBqP/dIEt8NrA7hdiqxUg5977clouuu7Lv4/E="; + }) + ]; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + sha256 = "sha256-Z+nFMJcC2f+nDUxa2vPYnNezMLBGXfLdh+xMXPHqYyw="; + }; + mastodon-gems = bundlerEnv { name = "${pname}-gems-${version}"; inherit version; @@ -35,55 +49,43 @@ stdenv.mkDerivation rec { ''; }; - mastodon-js-modules = mkYarnPackage { + mastodon-modules = stdenv.mkDerivation { pname = "${pname}-modules"; - yarnNix = dependenciesDir + "/yarn.nix"; - packageJSON = dependenciesDir + "/package.json"; - inherit src version; - }; - - mastodon-assets = stdenv.mkDerivation { - pname = "${pname}-assets"; inherit src version; - buildInputs = [ - mastodon-gems nodejs-slim yarn - ]; + nativeBuildInputs = [ fixup_yarn_lock mastodon-gems nodejs-slim yarn ]; - # FIXME: "production" would require OTP_SECRET to be set, so we use - # development here. - RAILS_ENV = "development"; + RAILS_ENV = "production"; + NODE_ENV = "production"; buildPhase = '' - # Support Mastodon forks which don't call themselves 'mastodon' or which - # omit the organization name from package.json. - if [ "$(ls ${mastodon-js-modules}/libexec/* | grep node_modules)" ]; then - cp -r ${mastodon-js-modules}/libexec/*/node_modules node_modules - else - cp -r ${mastodon-js-modules}/libexec/*/*/node_modules node_modules - fi - chmod -R u+w node_modules - rake webpacker:compile - rails assets:precompile + export HOME=$PWD + fixup_yarn_lock ~/yarn.lock + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress + patchShebangs ~/node_modules + + OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder \ + rails assets:precompile + yarn cache clean --offline + rm -rf ~/node_modules/.cache ''; installPhase = '' mkdir -p $out/public + cp -r node_modules $out/node_modules cp -r public/assets $out/public cp -r public/packs $out/public ''; }; - passthru.updateScript = callPackage ./update.nix {}; + propagatedBuildInputs = [ imagemagick ffmpeg file mastodon-gems.wrappedRuby ]; + buildInputs = [ mastodon-gems nodejs-slim ]; buildPhase = '' - if [ "$(ls ${mastodon-js-modules}/libexec/* | grep node_modules)" ]; then - ln -s ${mastodon-js-modules}/libexec/*/node_modules node_modules - else - ln -s ${mastodon-js-modules}/libexec/*/*/node_modules node_modules - fi - ln -s ${mastodon-assets}/public/assets public/assets - ln -s ${mastodon-assets}/public/packs public/packs + ln -s ${mastodon-modules}/node_modules node_modules + ln -s ${mastodon-modules}/public/assets public/assets + ln -s ${mastodon-modules}/public/packs public/packs patchShebangs bin/ for b in $(ls ${mastodon-gems}/bin/) @@ -98,8 +100,6 @@ stdenv.mkDerivation rec { ln -s /tmp tmp ''; - propagatedBuildInputs = [ imagemagick ffmpeg file mastodon-gems.wrappedRuby ]; - installPhase = let run-streaming = writeShellScript "run-streaming.sh" '' # NixOS helper script to consistently use the same NodeJS version the package was built with. @@ -111,11 +111,16 @@ stdenv.mkDerivation rec { ln -s ${run-streaming} $out/run-streaming.sh ''; + passthru = { + tests.mastodon = nixosTests.mastodon; + updateScript = callPackage ./update.nix {}; + }; + meta = with lib; { description = "Self-hosted, globally interconnected microblogging software based on ActivityPub"; homepage = "https://joinmastodon.org"; license = licenses.agpl3Plus; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ petabyteboy happy-river erictapen ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ petabyteboy happy-river erictapen izorkin ]; }; } diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index ea59f73b88df..f18145ec47d0 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -2392,15 +2392,15 @@ version = "1.11.0"; }; ruby-saml = { - dependencies = ["nokogiri"]; + dependencies = ["nokogiri" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ps79g3f39iy6dpc9z4z5wwxdkbaciqjfbi0pfl7dbkz1d8q14qi"; + sha256 = "1706dyk5jdma75bnl9rhmx8vgzjw12ixnj3y32inmpcgzgsvs76k"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; }; ruby2_keywords = { groups = ["default"]; diff --git a/pkgs/servers/mastodon/package.json b/pkgs/servers/mastodon/package.json deleted file mode 100644 index b81940521c82..000000000000 --- a/pkgs/servers/mastodon/package.json +++ /dev/null @@ -1,197 +0,0 @@ -{ - "version": "3.4.4", - "name": "@mastodon/mastodon", - "license": "AGPL-3.0-or-later", - "engines": { - "node": ">=12" - }, - "scripts": { - "postversion": "git push --tags", - "build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack", - "build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack", - "manage:translations": "node ./config/webpack/translationRunner.js", - "start": "node ./streaming/index.js", - "test": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:jest", - "test:lint": "${npm_execpath} run test:lint:js && ${npm_execpath} run test:lint:sass", - "test:lint:js": "eslint --ext=js . --cache", - "test:lint:sass": "sass-lint -v", - "test:jest": "cross-env NODE_ENV=test jest --coverage" - }, - "repository": { - "type": "git", - "url": "https://github.com/mastodon/mastodon.git" - }, - "browserslist": [ - "last 2 versions", - "not IE 11", - "iOS >= 9", - "not dead" - ], - "jest": { - "projects": [ - "/app/javascript/mastodon" - ], - "testPathIgnorePatterns": [ - "/node_modules/", - "/vendor/", - "/config/", - "/log/", - "/public/", - "/tmp/" - ], - "setupFiles": [ - "raf/polyfill" - ], - "setupFilesAfterEnv": [ - "/app/javascript/mastodon/test_setup.js" - ], - "collectCoverageFrom": [ - "app/javascript/mastodon/**/*.js", - "!app/javascript/mastodon/features/emoji/emoji_compressed.js", - "!app/javascript/mastodon/locales/locale-data/*.js", - "!app/javascript/mastodon/service_worker/entry.js", - "!app/javascript/mastodon/test_setup.js" - ], - "coverageDirectory": "/coverage", - "moduleDirectories": [ - "/node_modules", - "/app/javascript" - ] - }, - "private": true, - "dependencies": { - "@babel/core": "^7.14.3", - "@babel/plugin-proposal-decorators": "^7.14.2", - "@babel/plugin-transform-react-inline-elements": "^7.12.13", - "@babel/plugin-transform-runtime": "^7.14.3", - "@babel/preset-env": "^7.14.4", - "@babel/preset-react": "^7.13.13", - "@babel/runtime": "^7.14.0", - "@gamestdio/websocket": "^0.3.2", - "@github/webauthn-json": "^0.5.7", - "@rails/ujs": "^6.1.3", - "array-includes": "^3.1.3", - "arrow-key-navigation": "^1.2.0", - "autoprefixer": "^9.8.6", - "axios": "^0.21.1", - "babel-loader": "^8.2.2", - "babel-plugin-lodash": "^3.3.4", - "babel-plugin-preval": "^5.0.0", - "babel-plugin-react-intl": "^6.2.0", - "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "babel-runtime": "^6.26.0", - "blurhash": "^1.1.3", - "classnames": "^2.3.1", - "color-blend": "^3.0.1", - "compression-webpack-plugin": "^6.1.1", - "cross-env": "^7.0.3", - "css-loader": "^5.2.6", - "cssnano": "^4.1.11", - "detect-passive-events": "^2.0.3", - "dotenv": "^9.0.2", - "emoji-mart": "^3.0.1", - "es6-symbol": "^3.1.3", - "escape-html": "^1.0.3", - "exif-js": "^2.3.0", - "express": "^4.17.1", - "file-loader": "^6.2.0", - "font-awesome": "^4.7.0", - "glob": "^7.1.7", - "history": "^4.10.1", - "http-link-header": "^1.0.3", - "immutable": "^3.8.2", - "imports-loader": "^1.2.0", - "intersection-observer": "^0.12.0", - "intl": "^1.2.5", - "intl-messageformat": "^2.2.0", - "intl-relativeformat": "^6.4.3", - "is-nan": "^1.3.2", - "js-yaml": "^4.1.0", - "lodash": "^4.17.21", - "mark-loader": "^0.1.6", - "marky": "^1.2.2", - "mini-css-extract-plugin": "^1.6.0", - "mkdirp": "^1.0.4", - "npmlog": "^4.1.2", - "object-assign": "^4.1.1", - "object-fit-images": "^3.2.3", - "object.values": "^1.1.3", - "offline-plugin": "^5.0.7", - "path-complete-extname": "^1.0.0", - "pg": "^8.5.0", - "postcss-loader": "^3.0.0", - "postcss-object-fit-images": "^1.1.2", - "promise.prototype.finally": "^3.1.2", - "prop-types": "^15.5.10", - "punycode": "^2.1.0", - "react": "^16.14.0", - "react-dom": "^16.14.0", - "react-hotkeys": "^1.1.4", - "react-immutable-proptypes": "^2.2.0", - "react-immutable-pure-component": "^2.2.2", - "react-intl": "^2.9.0", - "react-masonry-infinite": "^1.2.2", - "react-motion": "^0.5.2", - "react-notification": "^6.8.5", - "react-overlays": "^0.9.3", - "react-redux": "^7.2.4", - "react-redux-loading-bar": "^4.0.8", - "react-router-dom": "^4.1.1", - "react-router-scroll-4": "^1.0.0-beta.1", - "react-select": "^4.3.1", - "react-sparklines": "^1.7.0", - "react-swipeable-views": "^0.14.0", - "react-textarea-autosize": "^8.3.2", - "react-toggle": "^4.1.2", - "redis": "^3.1.2", - "redux": "^4.1.0", - "redux-immutable": "^4.0.0", - "redux-thunk": "^2.2.0", - "regenerator-runtime": "^0.13.7", - "rellax": "^1.12.1", - "requestidlecallback": "^0.3.0", - "reselect": "^4.0.0", - "rimraf": "^3.0.2", - "sass": "^1.34.0", - "sass-loader": "^10.2.0", - "stacktrace-js": "^2.0.2", - "stringz": "^2.1.0", - "substring-trie": "^1.0.2", - "terser-webpack-plugin": "^4.2.3", - "tesseract.js": "^2.1.1", - "throng": "^4.0.0", - "tiny-queue": "^0.2.1", - "twitter-text": "3.1.0", - "uuid": "^8.3.1", - "webpack": "^4.46.0", - "webpack-assets-manifest": "^4.0.6", - "webpack-bundle-analyzer": "^4.4.2", - "webpack-cli": "^3.3.12", - "webpack-merge": "^5.7.3", - "wicg-inert": "^3.1.1", - "ws": "^7.4.6", - "kind-of": "^6.0.3" - }, - "devDependencies": { - "@testing-library/jest-dom": "^5.12.0", - "@testing-library/react": "^11.2.7", - "babel-eslint": "^10.1.0", - "babel-jest": "^27.0.2", - "eslint": "^7.27.0", - "eslint-plugin-import": "~2.23.4", - "eslint-plugin-jsx-a11y": "~6.4.1", - "eslint-plugin-promise": "~5.1.0", - "eslint-plugin-react": "~7.24.0", - "jest": "^26.6.3", - "raf": "^3.4.1", - "react-intl-translations-manager": "^5.0.3", - "react-test-renderer": "^16.14.0", - "sass-lint": "^1.13.1", - "webpack-dev-server": "^3.11.2", - "yargs": "^17.0.1" - }, - "optionalDependencies": { - "bufferutil": "^4.0.3", - "utf-8-validate": "^5.0.5" - } -} diff --git a/pkgs/servers/mastodon/resolutions.patch b/pkgs/servers/mastodon/resolutions.patch deleted file mode 100644 index f1f30725f1d4..000000000000 --- a/pkgs/servers/mastodon/resolutions.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/package.json b/package.json -index f485b1370..ce8e42699 100644 ---- a/package.json -+++ b/package.json -@@ -168,7 +168,8 @@ - "webpack-cli": "^3.3.12", - "webpack-merge": "^5.7.3", - "wicg-inert": "^3.1.1", -- "ws": "^7.4.6" -+ "ws": "^7.4.6", -+ "kind-of": "^6.0.3" - }, - "devDependencies": { - "@testing-library/jest-dom": "^5.12.0", -@@ -188,9 +189,6 @@ - "webpack-dev-server": "^3.11.2", - "yargs": "^17.0.1" - }, -- "resolutions": { -- "kind-of": "^6.0.3" -- }, - "optionalDependencies": { - "bufferutil": "^4.0.3", - "utf-8-validate": "^5.0.5" -diff --git a/yarn.lock b/yarn.lock -index b8ea0f369..32e929c0d 100644 ---- a/yarn.lock -+++ b/yarn.lock -@@ -5939,6 +5939,11 @@ is-boolean-object@^1.1.0: - dependencies: - call-bind "^1.0.2" - -+is-buffer@^1.1.5: -+ version "1.1.6" -+ resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" -+ integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -+ - is-callable@^1.1.4, is-callable@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" -@@ -6971,7 +6976,26 @@ killable@^1.0.1: - resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" - integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg== - --kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^4.0.0, kind-of@^5.0.0, kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: -+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: -+ version "3.2.2" -+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" -+ integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= -+ dependencies: -+ is-buffer "^1.1.5" -+ -+kind-of@^4.0.0: -+ version "4.0.0" -+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" -+ integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= -+ dependencies: -+ is-buffer "^1.1.5" -+ -+kind-of@^5.0.0: -+ version "5.1.0" -+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" -+ integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== -+ -+kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 4b1cd55b5e9e..3493962e6bd9 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -2,10 +2,10 @@ { fetchgit, applyPatches }: let src = fetchgit { url = "https://github.com/tootsuite/mastodon.git"; - rev = "v3.4.4"; - sha256 = "0gi818ns7ws63g7izhcqq5b28kifzmvg0p278lq82h02ysg9grj3"; + rev = "v3.4.6"; + sha256 = "1lg25m6wsnb7iabbn1vpvn85csv6ywyvcm0ji6d8iq7wwgyq77xs"; }; in applyPatches { inherit src; - patches = [./resolutions.patch ./version.patch ]; + patches = [ ]; } diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh index be06f52207d0..7d53845a8cba 100755 --- a/pkgs/servers/mastodon/update.sh +++ b/pkgs/servers/mastodon/update.sh @@ -50,7 +50,7 @@ if [[ -z "$REVISION" ]]; then REVISION="$VERSION" fi -rm -f gemset.nix yarn.nix version.nix version.patch source.nix package.json +rm -f gemset.nix version.nix source.nix TARGET_DIR="$PWD" @@ -78,21 +78,6 @@ FETCHED_SOURCE_DIR=$(grep '^path is' $WORK_DIR/nix-prefetch-git.out | sed 's/^pa echo "Creating version.nix" echo \"$VERSION\" | sed 's/^"v/"/' > version.nix -echo "Creating source.nix" -# yarn2nix and mkYarnPackage want the version to be present in -# package.json. Mastodon itself does not include the version in -# package.json but at least one fork (Soapbox) does. -if [ $(jq .version $FETCHED_SOURCE_DIR/package.json) == "null" ]; then - mkdir $WORK_DIR/a $WORK_DIR/b - cp $FETCHED_SOURCE_DIR/package.json $WORK_DIR/a - cd $WORK_DIR - jq "{version:$(cat $TARGET_DIR/version.nix)} + ." a/package.json > b/package.json - diff -Naur --label a/package.json --label b/package.json a b > $TARGET_DIR/version.patch || true - rm -rf a b tmp - cd $TARGET_DIR - PATCHES="$PATCHES ./version.patch " -fi - cat > source.nix << EOF # This file was generated by pkgs.mastodon.updateScript. { fetchgit, applyPatches }: let @@ -111,11 +96,3 @@ SOURCE_DIR="$(nix-build --no-out-link -E '(import {}).callPackage ./so echo "Creating gemset.nix" bundix --lockfile="$SOURCE_DIR/Gemfile.lock" --gemfile="$SOURCE_DIR/Gemfile" echo "" >> $TARGET_DIR/gemset.nix # Create trailing newline to please EditorConfig checks - -echo "Creating yarn.nix" -cp -r $SOURCE_DIR/* $WORK_DIR -chmod -R u+w $WORK_DIR -cd $WORK_DIR -yarn2nix > $TARGET_DIR/yarn.nix -sed "s/https___.*_//g" -i $TARGET_DIR/yarn.nix -cp $WORK_DIR/package.json $TARGET_DIR diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix index 852b6be5f4b3..77b242e89770 100644 --- a/pkgs/servers/mastodon/version.nix +++ b/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"3.4.4" +"3.4.6" diff --git a/pkgs/servers/mastodon/version.patch b/pkgs/servers/mastodon/version.patch deleted file mode 100644 index 2d8d60071650..000000000000 --- a/pkgs/servers/mastodon/version.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Naur --label a/package.json --label b/package.json a/package.json b/package.json ---- a/package.json -+++ b/package.json -@@ -1,4 +1,5 @@ - { -+ "version": "3.4.4", - "name": "@mastodon/mastodon", - "license": "AGPL-3.0-or-later", - "engines": { diff --git a/pkgs/servers/mastodon/yarn.nix b/pkgs/servers/mastodon/yarn.nix deleted file mode 100644 index be436875f979..000000000000 --- a/pkgs/servers/mastodon/yarn.nix +++ /dev/null @@ -1,12637 +0,0 @@ -{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { - offline_cache = linkFarm "offline" packages; - packages = [ - { - name = "_babel_code_frame___code_frame_7.12.11.tgz"; - path = fetchurl { - name = "_babel_code_frame___code_frame_7.12.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; - sha1 = "f4ad435aa263db935b8f10f2c552d23fb716a63f"; - }; - } - { - name = "_babel_code_frame___code_frame_7.12.13.tgz"; - path = fetchurl { - name = "_babel_code_frame___code_frame_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; - sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; - }; - } - { - name = "_babel_compat_data___compat_data_7.14.4.tgz"; - path = fetchurl { - name = "_babel_compat_data___compat_data_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.4.tgz"; - sha1 = "45720fe0cecf3fd42019e1d12cc3d27fadc98d58"; - }; - } - { - name = "_babel_core___core_7.14.3.tgz"; - path = fetchurl { - name = "_babel_core___core_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz"; - sha1 = "5395e30405f0776067fbd9cf0884f15bfb770a38"; - }; - } - { - name = "_babel_generator___generator_7.14.3.tgz"; - path = fetchurl { - name = "_babel_generator___generator_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz"; - sha1 = "0c2652d91f7bddab7cccc6ba8157e4f40dcedb91"; - }; - } - { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; - sha1 = "5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"; - }; - } - { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.12.13.tgz"; - path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; - sha1 = "0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"; - }; - } - { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.12.13.tgz"; - path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; - sha1 = "6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"; - }; - } - { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.12.13.tgz"; - path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.12.13.tgz"; - sha1 = "df6a76fb83feb6b8e6dcfb46bb49010098cb51f0"; - }; - } - { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; - path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.4.tgz"; - sha1 = "33ebd0ffc34248051ee2089350a929ab02f2a516"; - }; - } - { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.3.tgz"; - path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.3.tgz"; - sha1 = "832111bcf4f57ca57a4c5b1a000fc125abc6554a"; - }; - } - { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.4.tgz"; - path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.4.tgz"; - sha1 = "abf888d836a441abee783c75229279748705dc42"; - }; - } - { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.13.tgz"; - path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.13.tgz"; - sha1 = "0996d370a92896c612ae41a4215544bd152579c0"; - }; - } - { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.0.tgz"; - path = fetchurl { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz"; - sha1 = "a640051772045fedaaecc6f0c6c69f02bdd34bf1"; - }; - } - { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.12.13.tgz"; - path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz"; - sha1 = "0e46990da9e271502f77507efa4c9918d3d8634a"; - }; - } - { - name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; - path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; - sha1 = "93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"; - }; - } - { - name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz"; - path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz"; - sha1 = "397688b590760b6ef7725b5f0860c82427ebaac2"; - }; - } - { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; - path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; - sha1 = "bc63451d403a3b3082b97e1d8b3fe5bd4091e583"; - }; - } - { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.0.tgz"; - path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz"; - sha1 = "5d5882e855b5c5eda91e0cadc26c6e7a2c8593d8"; - }; - } - { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.13.tgz"; - path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.13.tgz"; - sha1 = "c5715695b4f8bab32660dbdcdc2341dec7e3df40"; - }; - } - { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; - path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; - sha1 = "dfe368f26d426a07299d8d6513821768216e6d72"; - }; - } - { - name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; - path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; - sha1 = "c6a369a6f3621cb25da014078684da9196b61977"; - }; - } - { - name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz"; - path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz"; - sha1 = "ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5"; - }; - } - { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; - path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; - sha1 = "5c02d171b4c8615b1e7163f888c1c81c30a2aaea"; - }; - } - { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; - path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; - sha1 = "806526ce125aed03373bc416a828321e3a6a33af"; - }; - } - { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.13.0.tgz"; - path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz"; - sha1 = "376a760d9f7b4b2077a9dd05aa9c3927cadb2209"; - }; - } - { - name = "_babel_helper_replace_supers___helper_replace_supers_7.12.13.tgz"; - path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz"; - sha1 = "00ec4fb6862546bd3d0aff9aac56074277173121"; - }; - } - { - name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; - path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz"; - sha1 = "6442f4c1ad912502481a564a7386de0c77ff3804"; - }; - } - { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz"; - path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz"; - sha1 = "ca17b318b859d107f0e9b722d58cf12d94436600"; - }; - } - { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; - path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.4.tgz"; - sha1 = "b2ab16875deecfff3ddfcd539bc315f72998d836"; - }; - } - { - name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; - path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; - sha1 = "dd6c538afb61819d205a012c31792a39c7a5eaf6"; - }; - } - { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; - path = fetchurl { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; - sha1 = "462dc63a7e435ade8468385c63d2b84cce4b3cbf"; - }; - } - { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; - path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; - sha1 = "e9430be00baf3e88b0e13e6f9d4eaf2136372b05"; - }; - } - { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; - path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; - sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; - }; - } - { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; - path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; - sha1 = "d26cad8a47c65286b15df1547319a5d0bcf27288"; - }; - } - { - name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; - path = fetchurl { - name = "_babel_helper_validator_option___helper_validator_option_7.12.17.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; - sha1 = "d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"; - }; - } - { - name = "_babel_helper_wrap_function___helper_wrap_function_7.13.0.tgz"; - path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz"; - sha1 = "bdb5c66fda8526ec235ab894ad53a1235c79fcc4"; - }; - } - { - name = "_babel_helpers___helpers_7.14.0.tgz"; - path = fetchurl { - name = "_babel_helpers___helpers_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz"; - sha1 = "ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"; - }; - } - { - name = "_babel_highlight___highlight_7.12.13.tgz"; - path = fetchurl { - name = "_babel_highlight___highlight_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz"; - sha1 = "8ab538393e00370b26271b01fa08f7f27f2e795c"; - }; - } - { - name = "_babel_parser___parser_7.14.3.tgz"; - path = fetchurl { - name = "_babel_parser___parser_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz"; - sha1 = "9b530eecb071fd0c93519df25c5ff9f14759f298"; - }; - } - { - name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.13.12.tgz"; - path = fetchurl { - name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz"; - sha1 = "a3484d84d0b549f3fc916b99ee4783f26fabad2a"; - }; - } - { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.14.2.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.2.tgz"; - sha1 = "3a2085abbf5d5f962d480dbc81347385ed62eb1e"; - }; - } - { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.13.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz"; - sha1 = "146376000b94efd001e57a40a88a525afaab9f37"; - }; - } - { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.14.3.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.3.tgz"; - sha1 = "5a527e2cae4a4753119c3a3e7f64ecae8ccf1360"; - }; - } - { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.14.2.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.14.2.tgz"; - sha1 = "e68c3c5e4a6a08834456568256fc3e71b93590cf"; - }; - } - { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.14.2.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.2.tgz"; - sha1 = "01ebabd7c381cff231fa43e302939a9de5be9d9f"; - }; - } - { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.14.2.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.2.tgz"; - sha1 = "62542f94aa9ce8f6dba79eec698af22112253791"; - }; - } - { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.14.2.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.2.tgz"; - sha1 = "830b4e2426a782e8b2878fbfe2cba85b70cbf98c"; - }; - } - { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.14.2.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.2.tgz"; - sha1 = "222348c080a1678e0e74ea63fe76f275882d1fd7"; - }; - } - { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.14.2.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.2.tgz"; - sha1 = "425b11dc62fc26939a2ab42cbba680bdf5734546"; - }; - } - { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.14.2.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.2.tgz"; - sha1 = "82b4cc06571143faf50626104b335dd71baa4f9e"; - }; - } - { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.4.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.4.tgz"; - sha1 = "0e2b4de419915dc0b409378e829412e2031777c4"; - }; - } - { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.14.2.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.2.tgz"; - sha1 = "150d4e58e525b16a9a1431bd5326c4eed870d717"; - }; - } - { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.14.2.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.2.tgz"; - sha1 = "df8171a8b9c43ebf4c1dabe6311b432d83e1b34e"; - }; - } - { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.13.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz"; - sha1 = "04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"; - }; - } - { - name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.14.0.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz"; - sha1 = "b1a1f2030586b9d3489cc26179d2eb5883277636"; - }; - } - { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; - sha1 = "bebde51339be829c17aaaaced18641deb62b39ba"; - }; - } - { - name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; - sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"; - }; - } - { - name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"; - sha1 = "4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"; - }; - } - { - name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; - sha1 = "b5c987274c4a3a82b89714796931a6b53544ae10"; - }; - } - { - name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz"; - sha1 = "8e3d674b0613e67975ceac2776c97b60cafc5c9c"; - }; - } - { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz"; - sha1 = "fac829bf3c7ef4a1bc916257b403e58c6bdaf648"; - }; - } - { - name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; - sha1 = "62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"; - }; - } - { - name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; - sha1 = "028964a9ba80dbc094c915c487ad7c4e7a66465a"; - }; - } - { - name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"; - sha1 = "ee601348c370fa334d2207be158777496521fd51"; - }; - } - { - name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; - sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a"; - }; - } - { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz"; - sha1 = "044fb81ebad6698fe62c478875575bcbb9b70f15"; - }; - } - { - name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; - sha1 = "ca91ef46303530448b906652bac2e9fe9941f699"; - }; - } - { - name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; - sha1 = "167ed70368886081f74b5c36c65a88c03b66d1a9"; - }; - } - { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; - sha1 = "b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"; - }; - } - { - name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; - sha1 = "60e225edcbd98a640332a2e72dd3e66f1af55871"; - }; - } - { - name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; - sha1 = "6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"; - }; - } - { - name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; - sha1 = "4f69c2ab95167e0180cd5336613f8c5788f7d48a"; - }; - } - { - name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz"; - sha1 = "762a4babec61176fec6c88480dec40372b140c0b"; - }; - } - { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; - sha1 = "c5f0fa6e249f5b739727f923540cf7a806130178"; - }; - } - { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.13.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz"; - sha1 = "10a59bebad52d637a027afa692e8d5ceff5e3dae"; - }; - } - { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.13.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz"; - sha1 = "8e112bf6771b82bf1e974e5e26806c5c99aa516f"; - }; - } - { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; - sha1 = "a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"; - }; - } - { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.4.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.4.tgz"; - sha1 = "caf140b0b2e2462c509553d140e6d0abefb61ed8"; - }; - } - { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.4.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.4.tgz"; - sha1 = "a83c15503fc71a0f99e876fdce7dadbc6575ec3a"; - }; - } - { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.13.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz"; - sha1 = "845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"; - }; - } - { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.14.4.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.4.tgz"; - sha1 = "acbec502e9951f30f4441eaca1d2f29efade59ed"; - }; - } - { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; - sha1 = "3f1601cc29905bfcb67f53910f197aeafebb25ad"; - }; - } - { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; - sha1 = "6f06b87a8b803fd928e54b81c258f0a0033904de"; - }; - } - { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; - sha1 = "4d52390b9a273e651e4aba6aee49ef40e80cd0a1"; - }; - } - { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.13.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz"; - sha1 = "c799f881a8091ac26b54867a845c3e97d2696062"; - }; - } - { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; - sha1 = "bb024452f9aaed861d374c8e7a24252ce3a50051"; - }; - } - { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; - sha1 = "2ca45bafe4a820197cf315794a4d26560fe4bdb9"; - }; - } - { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; - sha1 = "5ffa66cd59b9e191314c9f1f803b938e8c081e40"; - }; - } - { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.2.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.2.tgz"; - sha1 = "6622806fe1a7c07a1388444222ef9535f2ca17b0"; - }; - } - { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.14.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz"; - sha1 = "52bc199cb581e0992edba0f0f80356467587f161"; - }; - } - { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.13.8.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.13.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz"; - sha1 = "6d066ee2bff3c7b3d60bf28dec169ad993831ae3"; - }; - } - { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.14.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz"; - sha1 = "2f8179d1bbc9263665ce4a65f305526b2ea8ac34"; - }; - } - { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; - sha1 = "2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"; - }; - } - { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; - sha1 = "e22d8c3af24b150dd528cbd6e685e799bf1c351c"; - }; - } - { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; - sha1 = "b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"; - }; - } - { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.14.2.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.2.tgz"; - sha1 = "e4290f72e0e9e831000d066427c4667098decc31"; - }; - } - { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; - sha1 = "4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"; - }; - } - { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz"; - sha1 = "c28effd771b276f4647411c9733dbb2d2da954bd"; - }; - } - { - name = "_babel_plugin_transform_react_inline_elements___plugin_transform_react_inline_elements_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_inline_elements___plugin_transform_react_inline_elements_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.12.13.tgz"; - sha1 = "0a9e1496e51c9e9cf8751165a23c79bd753dba7d"; - }; - } - { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.17.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.12.17.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz"; - sha1 = "f510c0fa7cd7234153539f9a362ced41a5ca1447"; - }; - } - { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.13.12.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz"; - sha1 = "1df5dfaf0f4b784b43e96da6f28d630e775f68b3"; - }; - } - { - name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.12.1.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.12.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz"; - sha1 = "05d46f0ab4d1339ac59adf20a1462c91b37a1a42"; - }; - } - { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.13.15.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.13.15.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz"; - sha1 = "e5eb28945bf8b6563e7f818945f966a8d2997f39"; - }; - } - { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; - sha1 = "7d9988d4f06e0fe697ea1d9803188aa18b472695"; - }; - } - { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.14.3.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.3.tgz"; - sha1 = "1fd885a2d0de1d3c223795a4e9be72c2db4515cf"; - }; - } - { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; - sha1 = "db755732b70c539d504c6390d9ce90fe64aff7ad"; - }; - } - { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.13.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz"; - sha1 = "84887710e273c1815ace7ae459f6f42a5d31d5fd"; - }; - } - { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; - sha1 = "760ffd936face73f860ae646fb86ee82f3d06d1f"; - }; - } - { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.13.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.13.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz"; - sha1 = "a36049127977ad94438dee7443598d1cefdf409d"; - }; - } - { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; - sha1 = "785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"; - }; - } - { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; - sha1 = "840ced3b816d3b5127dd1d12dcedc5dead1a5e74"; - }; - } - { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; - sha1 = "b52521685804e155b1202e83fc188d34bb70f5ac"; - }; - } - { - name = "_babel_preset_env___preset_env_7.14.4.tgz"; - path = fetchurl { - name = "_babel_preset_env___preset_env_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.4.tgz"; - sha1 = "73fc3228c59727e5e974319156f304f0d6685a2d"; - }; - } - { - name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; - path = fetchurl { - name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; - sha1 = "362f2b68c662842970fdb5e254ffc8fc1c2e415e"; - }; - } - { - name = "_babel_preset_react___preset_react_7.13.13.tgz"; - path = fetchurl { - name = "_babel_preset_react___preset_react_7.13.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.13.13.tgz"; - sha1 = "fa6895a96c50763fe693f9148568458d5a839761"; - }; - } - { - name = "_babel_runtime_corejs3___runtime_corejs3_7.10.3.tgz"; - path = fetchurl { - name = "_babel_runtime_corejs3___runtime_corejs3_7.10.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.3.tgz"; - sha1 = "931ed6941d3954924a7aa967ee440e60c507b91a"; - }; - } - { - name = "_babel_runtime___runtime_7.0.0.tgz"; - path = fetchurl { - name = "_babel_runtime___runtime_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz"; - sha1 = "adeb78fedfc855aa05bc041640f3f6f98e85424c"; - }; - } - { - name = "_babel_runtime___runtime_7.14.0.tgz"; - path = fetchurl { - name = "_babel_runtime___runtime_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz"; - sha1 = "46794bc20b612c5f75e62dd071e24dfd95f1cbe6"; - }; - } - { - name = "_babel_template___template_7.12.13.tgz"; - path = fetchurl { - name = "_babel_template___template_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz"; - sha1 = "530265be8a2589dbb37523844c5bcb55947fb327"; - }; - } - { - name = "_babel_traverse___traverse_7.14.2.tgz"; - path = fetchurl { - name = "_babel_traverse___traverse_7.14.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz"; - sha1 = "9201a8d912723a831c2679c7ebbf2fe1416d765b"; - }; - } - { - name = "_babel_types___types_7.14.4.tgz"; - path = fetchurl { - name = "_babel_types___types_7.14.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.4.tgz"; - sha1 = "bfd6980108168593b38b3eb48a24aa026b919bc0"; - }; - } - { - name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz"; - path = fetchurl { - name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz"; - url = "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"; - sha1 = "75a2e8b51cb758a7553d6804a5932d7aace75c39"; - }; - } - { - name = "_cnakazawa_watch___watch_1.0.4.tgz"; - path = fetchurl { - name = "_cnakazawa_watch___watch_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz"; - sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a"; - }; - } - { - name = "_emotion_cache___cache_11.4.0.tgz"; - path = fetchurl { - name = "_emotion_cache___cache_11.4.0.tgz"; - url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.4.0.tgz"; - sha1 = "293fc9d9a7a38b9aad8e9337e5014366c3b09ac0"; - }; - } - { - name = "_emotion_hash___hash_0.8.0.tgz"; - path = fetchurl { - name = "_emotion_hash___hash_0.8.0.tgz"; - url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz"; - sha1 = "bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"; - }; - } - { - name = "_emotion_memoize___memoize_0.7.5.tgz"; - path = fetchurl { - name = "_emotion_memoize___memoize_0.7.5.tgz"; - url = "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz"; - sha1 = "2c40f81449a4e554e9fc6396910ed4843ec2be50"; - }; - } - { - name = "_emotion_react___react_11.1.4.tgz"; - path = fetchurl { - name = "_emotion_react___react_11.1.4.tgz"; - url = "https://registry.yarnpkg.com/@emotion/react/-/react-11.1.4.tgz"; - sha1 = "ddee4247627ff7dd7d0c6ae52f1cfd6b420357d2"; - }; - } - { - name = "_emotion_serialize___serialize_1.0.0.tgz"; - path = fetchurl { - name = "_emotion_serialize___serialize_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.0.tgz"; - sha1 = "1a61f4f037cf39995c97fc80ebe99abc7b191ca9"; - }; - } - { - name = "_emotion_sheet___sheet_1.0.1.tgz"; - path = fetchurl { - name = "_emotion_sheet___sheet_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz"; - sha1 = "245f54abb02dfd82326e28689f34c27aa9b2a698"; - }; - } - { - name = "_emotion_unitless___unitless_0.7.5.tgz"; - path = fetchurl { - name = "_emotion_unitless___unitless_0.7.5.tgz"; - url = "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz"; - sha1 = "77211291c1900a700b8a78cfafda3160d76949ed"; - }; - } - { - name = "_emotion_utils___utils_1.0.0.tgz"; - path = fetchurl { - name = "_emotion_utils___utils_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz"; - sha1 = "abe06a83160b10570816c913990245813a2fd6af"; - }; - } - { - name = "_emotion_weak_memoize___weak_memoize_0.2.5.tgz"; - path = fetchurl { - name = "_emotion_weak_memoize___weak_memoize_0.2.5.tgz"; - url = "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz"; - sha1 = "8eed982e2ee6f7f4e44c253e12962980791efd46"; - }; - } - { - name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; - path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz"; - sha1 = "442763b88cecbe3ee0ec7ca6d6dd6168550cbf14"; - }; - } - { - name = "_formatjs_intl_unified_numberformat___intl_unified_numberformat_3.3.6.tgz"; - path = fetchurl { - name = "_formatjs_intl_unified_numberformat___intl_unified_numberformat_3.3.6.tgz"; - url = "https://registry.yarnpkg.com/@formatjs/intl-unified-numberformat/-/intl-unified-numberformat-3.3.6.tgz"; - sha1 = "ab69818f7568894023cb31fdb5b5c7eed62c6537"; - }; - } - { - name = "_formatjs_intl_utils___intl_utils_2.2.5.tgz"; - path = fetchurl { - name = "_formatjs_intl_utils___intl_utils_2.2.5.tgz"; - url = "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-2.2.5.tgz"; - sha1 = "eaafd94df3d102ee13e54e80f992a33868a6b1e8"; - }; - } - { - name = "_gamestdio_websocket___websocket_0.3.2.tgz"; - path = fetchurl { - name = "_gamestdio_websocket___websocket_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/@gamestdio/websocket/-/websocket-0.3.2.tgz"; - sha1 = "321ba0976ee30fd14e51dbf8faa85ce7b325f76a"; - }; - } - { - name = "_github_webauthn_json___webauthn_json_0.5.7.tgz"; - path = fetchurl { - name = "_github_webauthn_json___webauthn_json_0.5.7.tgz"; - url = "https://registry.yarnpkg.com/@github/webauthn-json/-/webauthn-json-0.5.7.tgz"; - sha1 = "143bc67f6e0f75f8d188e565741507bb08c31214"; - }; - } - { - name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz"; - path = fetchurl { - name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"; - sha1 = "fd3db1d59ecf7cf121e80650bb86712f9b55eced"; - }; - } - { - name = "_istanbuljs_schema___schema_0.1.2.tgz"; - path = fetchurl { - name = "_istanbuljs_schema___schema_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz"; - sha1 = "26520bf09abe4a5644cd5414e37125a8954241dd"; - }; - } - { - name = "_jest_console___console_26.6.2.tgz"; - path = fetchurl { - name = "_jest_console___console_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz"; - sha1 = "4e04bc464014358b03ab4937805ee36a0aeb98f2"; - }; - } - { - name = "_jest_core___core_26.6.3.tgz"; - path = fetchurl { - name = "_jest_core___core_26.6.3.tgz"; - url = "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz"; - sha1 = "7639fcb3833d748a4656ada54bde193051e45fad"; - }; - } - { - name = "_jest_environment___environment_26.6.2.tgz"; - path = fetchurl { - name = "_jest_environment___environment_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz"; - sha1 = "ba364cc72e221e79cc8f0a99555bf5d7577cf92c"; - }; - } - { - name = "_jest_fake_timers___fake_timers_26.6.2.tgz"; - path = fetchurl { - name = "_jest_fake_timers___fake_timers_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz"; - sha1 = "459c329bcf70cee4af4d7e3f3e67848123535aad"; - }; - } - { - name = "_jest_globals___globals_26.6.2.tgz"; - path = fetchurl { - name = "_jest_globals___globals_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz"; - sha1 = "5b613b78a1aa2655ae908eba638cc96a20df720a"; - }; - } - { - name = "_jest_reporters___reporters_26.6.2.tgz"; - path = fetchurl { - name = "_jest_reporters___reporters_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz"; - sha1 = "1f518b99637a5f18307bd3ecf9275f6882a667f6"; - }; - } - { - name = "_jest_source_map___source_map_26.6.2.tgz"; - path = fetchurl { - name = "_jest_source_map___source_map_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz"; - sha1 = "29af5e1e2e324cafccc936f218309f54ab69d535"; - }; - } - { - name = "_jest_test_result___test_result_26.6.2.tgz"; - path = fetchurl { - name = "_jest_test_result___test_result_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz"; - sha1 = "55da58b62df134576cc95476efa5f7949e3f5f18"; - }; - } - { - name = "_jest_test_sequencer___test_sequencer_26.6.3.tgz"; - path = fetchurl { - name = "_jest_test_sequencer___test_sequencer_26.6.3.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz"; - sha1 = "98e8a45100863886d074205e8ffdc5a7eb582b17"; - }; - } - { - name = "_jest_transform___transform_26.6.2.tgz"; - path = fetchurl { - name = "_jest_transform___transform_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz"; - sha1 = "5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"; - }; - } - { - name = "_jest_transform___transform_27.0.2.tgz"; - path = fetchurl { - name = "_jest_transform___transform_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz"; - sha1 = "b073b7c589e3f4b842102468875def2bb722d6b5"; - }; - } - { - name = "_jest_types___types_25.5.0.tgz"; - path = fetchurl { - name = "_jest_types___types_25.5.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz"; - sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d"; - }; - } - { - name = "_jest_types___types_26.6.2.tgz"; - path = fetchurl { - name = "_jest_types___types_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz"; - sha1 = "bef5a532030e1d88a2f5a6d933f84e97226ed48e"; - }; - } - { - name = "_jest_types___types_27.0.2.tgz"; - path = fetchurl { - name = "_jest_types___types_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.2.tgz"; - sha1 = "e153d6c46bda0f2589f0702b071f9898c7bbd37e"; - }; - } - { - name = "_npmcli_move_file___move_file_1.0.1.tgz"; - path = fetchurl { - name = "_npmcli_move_file___move_file_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz"; - sha1 = "de103070dac0f48ce49cf6693c23af59c0f70464"; - }; - } - { - name = "_polka_url___url_1.0.0_next.11.tgz"; - path = fetchurl { - name = "_polka_url___url_1.0.0_next.11.tgz"; - url = "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.11.tgz"; - sha1 = "aeb16f50649a91af79dbe36574b66d0f9e4d9f71"; - }; - } - { - name = "_rails_ujs___ujs_6.1.3.tgz"; - path = fetchurl { - name = "_rails_ujs___ujs_6.1.3.tgz"; - url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.3.tgz"; - sha1 = "90ef26caa0925492b1a3b1495db09cfbe49e745e"; - }; - } - { - name = "_sinonjs_commons___commons_1.8.1.tgz"; - path = fetchurl { - name = "_sinonjs_commons___commons_1.8.1.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz"; - sha1 = "e7df00f98a203324f6dc7cc606cad9d4a8ab2217"; - }; - } - { - name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz"; - path = fetchurl { - name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz"; - sha1 = "293674fccb3262ac782c7aadfdeca86b10c75c40"; - }; - } - { - name = "_testing_library_dom___dom_7.28.1.tgz"; - path = fetchurl { - name = "_testing_library_dom___dom_7.28.1.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.28.1.tgz"; - sha1 = "dea78be6e1e6db32ddcb29a449e94d9700c79eb9"; - }; - } - { - name = "_testing_library_jest_dom___jest_dom_5.12.0.tgz"; - path = fetchurl { - name = "_testing_library_jest_dom___jest_dom_5.12.0.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.12.0.tgz"; - sha1 = "6a5d340b092c44b7bce17a4791b47d9bc2c61443"; - }; - } - { - name = "_testing_library_react___react_11.2.7.tgz"; - path = fetchurl { - name = "_testing_library_react___react_11.2.7.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/react/-/react-11.2.7.tgz"; - sha1 = "b29e2e95c6765c815786c0bc1d5aed9cb2bf7818"; - }; - } - { - name = "_types_aria_query___aria_query_4.2.0.tgz"; - path = fetchurl { - name = "_types_aria_query___aria_query_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz"; - sha1 = "14264692a9d6e2fa4db3df5e56e94b5e25647ac0"; - }; - } - { - name = "_types_babel__core___babel__core_7.1.14.tgz"; - path = fetchurl { - name = "_types_babel__core___babel__core_7.1.14.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz"; - sha1 = "faaeefc4185ec71c389f4501ee5ec84b170cc402"; - }; - } - { - name = "_types_babel__generator___babel__generator_7.6.1.tgz"; - path = fetchurl { - name = "_types_babel__generator___babel__generator_7.6.1.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz"; - sha1 = "4901767b397e8711aeb99df8d396d7ba7b7f0e04"; - }; - } - { - name = "_types_babel__template___babel__template_7.0.2.tgz"; - path = fetchurl { - name = "_types_babel__template___babel__template_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz"; - sha1 = "4ff63d6b52eddac1de7b975a5223ed32ecea9307"; - }; - } - { - name = "_types_babel__traverse___babel__traverse_7.0.13.tgz"; - path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.0.13.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.13.tgz"; - sha1 = "1874914be974a492e1b4cb00585cabb274e8ba18"; - }; - } - { - name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; - path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz"; - sha1 = "db9e4238931eb69ef8aab0ad6523d4d4caa39d03"; - }; - } - { - name = "_types_color_name___color_name_1.1.1.tgz"; - path = fetchurl { - name = "_types_color_name___color_name_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; - sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; - }; - } - { - name = "_types_events___events_3.0.0.tgz"; - path = fetchurl { - name = "_types_events___events_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz"; - sha1 = "2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"; - }; - } - { - name = "_types_glob___glob_7.1.1.tgz"; - path = fetchurl { - name = "_types_glob___glob_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz"; - sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575"; - }; - } - { - name = "_types_graceful_fs___graceful_fs_4.1.3.tgz"; - path = fetchurl { - name = "_types_graceful_fs___graceful_fs_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz"; - sha1 = "039af35fe26bec35003e8d86d2ee9c586354348f"; - }; - } - { - name = "_types_hoist_non_react_statics___hoist_non_react_statics_3.3.1.tgz"; - path = fetchurl { - name = "_types_hoist_non_react_statics___hoist_non_react_statics_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz"; - sha1 = "1124aafe5118cb591977aeb1ceaaed1070eb039f"; - }; - } - { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; - path = fetchurl { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; - sha1 = "4ba8ddb720221f432e443bd5f9117fd22cfd4762"; - }; - } - { - name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; - path = fetchurl { - name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha1 = "c14c24f18ea8190c118ee7562b7ff99a36552686"; - }; - } - { - name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; - path = fetchurl { - name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz"; - sha1 = "e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"; - }; - } - { - name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; - path = fetchurl { - name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz"; - sha1 = "508b13aa344fa4976234e75dddcc34925737d821"; - }; - } - { - name = "_types_jest___jest_26.0.3.tgz"; - path = fetchurl { - name = "_types_jest___jest_26.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.3.tgz"; - sha1 = "79534e0e94857171c0edc596db0ebe7cb7863251"; - }; - } - { - name = "_types_json_schema___json_schema_7.0.6.tgz"; - path = fetchurl { - name = "_types_json_schema___json_schema_7.0.6.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz"; - sha1 = "f4c7ec43e81b319a9815115031709f26987891f0"; - }; - } - { - name = "_types_json5___json5_0.0.29.tgz"; - path = fetchurl { - name = "_types_json5___json5_0.0.29.tgz"; - url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; - sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; - }; - } - { - name = "_types_minimatch___minimatch_3.0.3.tgz"; - path = fetchurl { - name = "_types_minimatch___minimatch_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; - }; - } - { - name = "_types_node___node_14.11.1.tgz"; - path = fetchurl { - name = "_types_node___node_14.11.1.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.11.1.tgz"; - sha1 = "56af902ad157e763f9ba63d671c39cda3193c835"; - }; - } - { - name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; - path = fetchurl { - name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha1 = "e486d0d97396d79beedd0a6e33f4534ff6b4973e"; - }; - } - { - name = "_types_parse_json___parse_json_4.0.0.tgz"; - path = fetchurl { - name = "_types_parse_json___parse_json_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; - }; - } - { - name = "_types_prettier___prettier_2.0.2.tgz"; - path = fetchurl { - name = "_types_prettier___prettier_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.2.tgz"; - sha1 = "5bb52ee68d0f8efa9cc0099920e56be6cc4e37f3"; - }; - } - { - name = "_types_prop_types___prop_types_15.7.3.tgz"; - path = fetchurl { - name = "_types_prop_types___prop_types_15.7.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz"; - sha1 = "2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"; - }; - } - { - name = "_types_q___q_1.5.2.tgz"; - path = fetchurl { - name = "_types_q___q_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz"; - sha1 = "690a1475b84f2a884fd07cd797c00f5f31356ea8"; - }; - } - { - name = "_types_react_redux___react_redux_7.1.16.tgz"; - path = fetchurl { - name = "_types_react_redux___react_redux_7.1.16.tgz"; - url = "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.16.tgz"; - sha1 = "0fbd04c2500c12105494c83d4a3e45c084e3cb21"; - }; - } - { - name = "_types_react___react_17.0.3.tgz"; - path = fetchurl { - name = "_types_react___react_17.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz"; - sha1 = "ba6e215368501ac3826951eef2904574c262cc79"; - }; - } - { - name = "_types_scheduler___scheduler_0.16.1.tgz"; - path = fetchurl { - name = "_types_scheduler___scheduler_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz"; - sha1 = "18845205e86ff0038517aab7a18a62a6b9f71275"; - }; - } - { - name = "_types_schema_utils___schema_utils_1.0.0.tgz"; - path = fetchurl { - name = "_types_schema_utils___schema_utils_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/schema-utils/-/schema-utils-1.0.0.tgz"; - sha1 = "295d36f01e2cb8bc3207ca1d9a68e210db6b40cb"; - }; - } - { - name = "_types_stack_utils___stack_utils_2.0.0.tgz"; - path = fetchurl { - name = "_types_stack_utils___stack_utils_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz"; - sha1 = "7036640b4e21cc2f259ae826ce843d277dad8cff"; - }; - } - { - name = "_types_testing_library__jest_dom___testing_library__jest_dom_5.9.1.tgz"; - path = fetchurl { - name = "_types_testing_library__jest_dom___testing_library__jest_dom_5.9.1.tgz"; - url = "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.9.1.tgz"; - sha1 = "aba5ee062b7880f69c212ef769389f30752806e5"; - }; - } - { - name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; - path = fetchurl { - name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; - sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; - }; - } - { - name = "_types_yargs___yargs_15.0.5.tgz"; - path = fetchurl { - name = "_types_yargs___yargs_15.0.5.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz"; - sha1 = "947e9a6561483bdee9adffc983e91a6902af8b79"; - }; - } - { - name = "_types_yargs___yargs_16.0.3.tgz"; - path = fetchurl { - name = "_types_yargs___yargs_16.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.3.tgz"; - sha1 = "4b6d35bb8e680510a7dc2308518a80ee1ef27e01"; - }; - } - { - name = "_webassemblyjs_ast___ast_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_ast___ast_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz"; - sha1 = "bd850604b4042459a5a41cd7d338cbed695ed964"; - }; - } - { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz"; - sha1 = "3c3d3b271bddfc84deb00f71344438311d52ffb4"; - }; - } - { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_api_error___helper_api_error_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz"; - sha1 = "203f676e333b96c9da2eeab3ccef33c45928b6a2"; - }; - } - { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_buffer___helper_buffer_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz"; - sha1 = "a1442d269c5feb23fcbc9ef759dac3547f29de00"; - }; - } - { - name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz"; - sha1 = "647f8892cd2043a82ac0c8c5e75c36f1d9159f27"; - }; - } - { - name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_fsm___helper_fsm_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz"; - sha1 = "c05256b71244214671f4b08ec108ad63b70eddb8"; - }; - } - { - name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_module_context___helper_module_context_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz"; - sha1 = "25d8884b76839871a08a6c6f806c3979ef712f07"; - }; - } - { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz"; - sha1 = "4fed8beac9b8c14f8c58b70d124d549dd1fe5790"; - }; - } - { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz"; - sha1 = "5a4138d5a6292ba18b04c5ae49717e4167965346"; - }; - } - { - name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_ieee754___ieee754_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz"; - sha1 = "15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"; - }; - } - { - name = "_webassemblyjs_leb128___leb128_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_leb128___leb128_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz"; - sha1 = "f19ca0b76a6dc55623a09cffa769e838fa1e1c95"; - }; - } - { - name = "_webassemblyjs_utf8___utf8_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_utf8___utf8_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz"; - sha1 = "04d33b636f78e6a6813227e82402f7637b6229ab"; - }; - } - { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_edit___wasm_edit_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz"; - sha1 = "3fe6d79d3f0f922183aa86002c42dd256cfee9cf"; - }; - } - { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_gen___wasm_gen_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz"; - sha1 = "50bc70ec68ded8e2763b01a1418bf43491a7a49c"; - }; - } - { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_opt___wasm_opt_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz"; - sha1 = "2211181e5b31326443cc8112eb9f0b9028721a61"; - }; - } - { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_wasm_parser___wasm_parser_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz"; - sha1 = "9d48e44826df4a6598294aa6c87469d642fff65e"; - }; - } - { - name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_wast_parser___wast_parser_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz"; - sha1 = "3031115d79ac5bd261556cecc3fa90a3ef451914"; - }; - } - { - name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz"; - path = fetchurl { - name = "_webassemblyjs_wast_printer___wast_printer_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz"; - sha1 = "4935d54c85fef637b00ce9f52377451d00d47899"; - }; - } - { - name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; - path = fetchurl { - name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; - sha1 = "eef014a3145ae477a1cbc00cd1e552336dceb790"; - }; - } - { - name = "_xtuc_long___long_4.2.2.tgz"; - path = fetchurl { - name = "_xtuc_long___long_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz"; - sha1 = "d291c6a4e97989b5c61d9acf396ae4fe133a718d"; - }; - } - { - name = "abab___abab_2.0.5.tgz"; - path = fetchurl { - name = "abab___abab_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; - sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a"; - }; - } - { - name = "accepts___accepts_1.3.7.tgz"; - path = fetchurl { - name = "accepts___accepts_1.3.7.tgz"; - url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; - sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; - }; - } - { - name = "acorn_globals___acorn_globals_6.0.0.tgz"; - path = fetchurl { - name = "acorn_globals___acorn_globals_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz"; - sha1 = "46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"; - }; - } - { - name = "acorn_jsx___acorn_jsx_3.0.1.tgz"; - path = fetchurl { - name = "acorn_jsx___acorn_jsx_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz"; - sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; - }; - } - { - name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; - path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; - sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; - }; - } - { - name = "acorn_walk___acorn_walk_7.2.0.tgz"; - path = fetchurl { - name = "acorn_walk___acorn_walk_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; - sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc"; - }; - } - { - name = "acorn_walk___acorn_walk_8.0.0.tgz"; - path = fetchurl { - name = "acorn_walk___acorn_walk_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.0.0.tgz"; - sha1 = "56ae4c0f434a45fff4a125e7ea95fa9c98f67a16"; - }; - } - { - name = "acorn___acorn_3.3.0.tgz"; - path = fetchurl { - name = "acorn___acorn_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz"; - sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; - }; - } - { - name = "acorn___acorn_5.7.3.tgz"; - path = fetchurl { - name = "acorn___acorn_5.7.3.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; - sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; - }; - } - { - name = "acorn___acorn_6.4.1.tgz"; - path = fetchurl { - name = "acorn___acorn_6.4.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; - sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; - }; - } - { - name = "acorn___acorn_7.4.1.tgz"; - path = fetchurl { - name = "acorn___acorn_7.4.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; - sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; - }; - } - { - name = "acorn___acorn_8.0.4.tgz"; - path = fetchurl { - name = "acorn___acorn_8.0.4.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.0.4.tgz"; - sha1 = "7a3ae4191466a6984eee0fe3407a4f3aa9db8354"; - }; - } - { - name = "aggregate_error___aggregate_error_3.1.0.tgz"; - path = fetchurl { - name = "aggregate_error___aggregate_error_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; - sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; - }; - } - { - name = "ajv_errors___ajv_errors_1.0.1.tgz"; - path = fetchurl { - name = "ajv_errors___ajv_errors_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz"; - sha1 = "f35986aceb91afadec4102fbd85014950cefa64d"; - }; - } - { - name = "ajv_keywords___ajv_keywords_1.5.1.tgz"; - path = fetchurl { - name = "ajv_keywords___ajv_keywords_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz"; - sha1 = "314dd0a4b3368fad3dfcdc54ede6171b886daf3c"; - }; - } - { - name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; - path = fetchurl { - name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; - sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; - }; - } - { - name = "ajv___ajv_4.11.8.tgz"; - path = fetchurl { - name = "ajv___ajv_4.11.8.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz"; - sha1 = "82ffb02b29e662ae53bdc20af15947706739c536"; - }; - } - { - name = "ajv___ajv_6.12.6.tgz"; - path = fetchurl { - name = "ajv___ajv_6.12.6.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; - sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; - }; - } - { - name = "ajv___ajv_8.5.0.tgz"; - path = fetchurl { - name = "ajv___ajv_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz"; - sha1 = "695528274bcb5afc865446aa275484049a18ae4b"; - }; - } - { - name = "alphanum_sort___alphanum_sort_1.0.2.tgz"; - path = fetchurl { - name = "alphanum_sort___alphanum_sort_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz"; - sha1 = "97a1119649b211ad33691d9f9f486a8ec9fbe0a3"; - }; - } - { - name = "ansi_colors___ansi_colors_3.2.4.tgz"; - path = fetchurl { - name = "ansi_colors___ansi_colors_3.2.4.tgz"; - url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz"; - sha1 = "e3a3da4bfbae6c86a9c285625de124a234026fbf"; - }; - } - { - name = "ansi_colors___ansi_colors_4.1.1.tgz"; - path = fetchurl { - name = "ansi_colors___ansi_colors_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; - sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; - }; - } - { - name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; - path = fetchurl { - name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz"; - sha1 = "d3a8a83b319aa67793662b13e761c7911422306e"; - }; - } - { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; - path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; - sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; - }; - } - { - name = "ansi_html___ansi_html_0.0.7.tgz"; - path = fetchurl { - name = "ansi_html___ansi_html_0.0.7.tgz"; - url = "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz"; - sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; - }; - } - { - name = "ansi_regex___ansi_regex_2.1.1.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - } - { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; - }; - } - { - name = "ansi_regex___ansi_regex_4.1.0.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; - }; - } - { - name = "ansi_regex___ansi_regex_5.0.0.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; - }; - } - { - name = "ansi_styles___ansi_styles_2.2.1.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; - }; - } - { - name = "ansi_styles___ansi_styles_3.2.1.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; - }; - } - { - name = "ansi_styles___ansi_styles_4.2.1.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; - sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; - }; - } - { - name = "anymatch___anymatch_2.0.0.tgz"; - path = fetchurl { - name = "anymatch___anymatch_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz"; - sha1 = "bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"; - }; - } - { - name = "anymatch___anymatch_3.1.1.tgz"; - path = fetchurl { - name = "anymatch___anymatch_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; - sha1 = "c55ecf02185e2469259399310c173ce31233b142"; - }; - } - { - name = "aproba___aproba_1.2.0.tgz"; - path = fetchurl { - name = "aproba___aproba_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; - sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; - }; - } - { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - path = fetchurl { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; - }; - } - { - name = "argparse___argparse_1.0.10.tgz"; - path = fetchurl { - name = "argparse___argparse_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; - sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; - }; - } - { - name = "argparse___argparse_2.0.1.tgz"; - path = fetchurl { - name = "argparse___argparse_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; - sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; - }; - } - { - name = "aria_query___aria_query_4.2.2.tgz"; - path = fetchurl { - name = "aria_query___aria_query_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz"; - sha1 = "0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"; - }; - } - { - name = "arr_diff___arr_diff_4.0.0.tgz"; - path = fetchurl { - name = "arr_diff___arr_diff_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"; - sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; - }; - } - { - name = "arr_flatten___arr_flatten_1.1.0.tgz"; - path = fetchurl { - name = "arr_flatten___arr_flatten_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; - }; - } - { - name = "arr_union___arr_union_3.1.0.tgz"; - path = fetchurl { - name = "arr_union___arr_union_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz"; - sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; - }; - } - { - name = "array_flatten___array_flatten_1.1.1.tgz"; - path = fetchurl { - name = "array_flatten___array_flatten_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; - sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; - }; - } - { - name = "array_flatten___array_flatten_2.1.2.tgz"; - path = fetchurl { - name = "array_flatten___array_flatten_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz"; - sha1 = "24ef80a28c1a893617e2149b0c6d0d788293b099"; - }; - } - { - name = "array_includes___array_includes_3.1.3.tgz"; - path = fetchurl { - name = "array_includes___array_includes_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz"; - sha1 = "c7f619b382ad2afaf5326cddfdc0afc61af7690a"; - }; - } - { - name = "array_union___array_union_1.0.2.tgz"; - path = fetchurl { - name = "array_union___array_union_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz"; - sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; - }; - } - { - name = "array_uniq___array_uniq_1.0.3.tgz"; - path = fetchurl { - name = "array_uniq___array_uniq_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz"; - sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; - }; - } - { - name = "array_unique___array_unique_0.3.2.tgz"; - path = fetchurl { - name = "array_unique___array_unique_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"; - sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; - }; - } - { - name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; - path = fetchurl { - name = "array.prototype.flat___array.prototype.flat_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz"; - sha1 = "6ef638b43312bd401b4c6199fdec7e2dc9e9a123"; - }; - } - { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; - path = fetchurl { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz"; - sha1 = "94cfd47cc1556ec0747d97f7c7738c58122004c9"; - }; - } - { - name = "arrow_key_navigation___arrow_key_navigation_1.2.0.tgz"; - path = fetchurl { - name = "arrow_key_navigation___arrow_key_navigation_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/arrow-key-navigation/-/arrow-key-navigation-1.2.0.tgz"; - sha1 = "edefc5f8b4fc4e384e7c20ddecf81db7ffc970a9"; - }; - } - { - name = "asn1.js___asn1.js_5.4.1.tgz"; - path = fetchurl { - name = "asn1.js___asn1.js_5.4.1.tgz"; - url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz"; - sha1 = "11a980b84ebb91781ce35b0fdc2ee294e3783f07"; - }; - } - { - name = "asn1___asn1_0.2.4.tgz"; - path = fetchurl { - name = "asn1___asn1_0.2.4.tgz"; - url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; - sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; - }; - } - { - name = "assert_plus___assert_plus_1.0.0.tgz"; - path = fetchurl { - name = "assert_plus___assert_plus_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - } - { - name = "assert___assert_1.5.0.tgz"; - path = fetchurl { - name = "assert___assert_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz"; - sha1 = "55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"; - }; - } - { - name = "assign_symbols___assign_symbols_1.0.0.tgz"; - path = fetchurl { - name = "assign_symbols___assign_symbols_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"; - sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; - }; - } - { - name = "ast_types_flow___ast_types_flow_0.0.7.tgz"; - path = fetchurl { - name = "ast_types_flow___ast_types_flow_0.0.7.tgz"; - url = "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz"; - sha1 = "f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"; - }; - } - { - name = "astral_regex___astral_regex_2.0.0.tgz"; - path = fetchurl { - name = "astral_regex___astral_regex_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; - sha1 = "483143c567aeed4785759c0865786dc77d7d2e31"; - }; - } - { - name = "async_each___async_each_1.0.3.tgz"; - path = fetchurl { - name = "async_each___async_each_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; - sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf"; - }; - } - { - name = "async_limiter___async_limiter_1.0.1.tgz"; - path = fetchurl { - name = "async_limiter___async_limiter_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz"; - sha1 = "dd379e94f0db8310b08291f9d64c3209766617fd"; - }; - } - { - name = "async___async_2.6.3.tgz"; - path = fetchurl { - name = "async___async_2.6.3.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; - sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; - }; - } - { - name = "asynckit___asynckit_0.4.0.tgz"; - path = fetchurl { - name = "asynckit___asynckit_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; - }; - } - { - name = "atob___atob_2.1.2.tgz"; - path = fetchurl { - name = "atob___atob_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; - sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9"; - }; - } - { - name = "autoprefixer___autoprefixer_9.8.6.tgz"; - path = fetchurl { - name = "autoprefixer___autoprefixer_9.8.6.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz"; - sha1 = "3b73594ca1bf9266320c5acf1588d74dea74210f"; - }; - } - { - name = "aws_sign2___aws_sign2_0.7.0.tgz"; - path = fetchurl { - name = "aws_sign2___aws_sign2_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; - }; - } - { - name = "aws4___aws4_1.10.1.tgz"; - path = fetchurl { - name = "aws4___aws4_1.10.1.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz"; - sha1 = "e1e82e4f3e999e2cfd61b161280d16a111f86428"; - }; - } - { - name = "axe_core___axe_core_4.0.2.tgz"; - path = fetchurl { - name = "axe_core___axe_core_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.0.2.tgz"; - sha1 = "c7cf7378378a51fcd272d3c09668002a4990b1cb"; - }; - } - { - name = "axios___axios_0.21.1.tgz"; - path = fetchurl { - name = "axios___axios_0.21.1.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz"; - sha1 = "22563481962f4d6bde9a76d516ef0e5d3c09b2b8"; - }; - } - { - name = "axobject_query___axobject_query_2.2.0.tgz"; - path = fetchurl { - name = "axobject_query___axobject_query_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz"; - sha1 = "943d47e10c0b704aa42275e20edf3722648989be"; - }; - } - { - name = "babel_eslint___babel_eslint_10.1.0.tgz"; - path = fetchurl { - name = "babel_eslint___babel_eslint_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; - sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232"; - }; - } - { - name = "babel_jest___babel_jest_26.6.3.tgz"; - path = fetchurl { - name = "babel_jest___babel_jest_26.6.3.tgz"; - url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz"; - sha1 = "d87d25cb0037577a0c89f82e5755c5d293c01056"; - }; - } - { - name = "babel_jest___babel_jest_27.0.2.tgz"; - path = fetchurl { - name = "babel_jest___babel_jest_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz"; - sha1 = "7dc18adb01322acce62c2af76ea2c7cd186ade37"; - }; - } - { - name = "babel_loader___babel_loader_8.2.2.tgz"; - path = fetchurl { - name = "babel_loader___babel_loader_8.2.2.tgz"; - url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz"; - sha1 = "9363ce84c10c9a40e6c753748e1441b60c8a0b81"; - }; - } - { - name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; - path = fetchurl { - name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; - sha1 = "84fda19c976ec5c6defef57f9427b3def66e17a3"; - }; - } - { - name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz"; - path = fetchurl { - name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz"; - sha1 = "e159ccdc9af95e0b570c75b4573b7c34d671d765"; - }; - } - { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_26.6.2.tgz"; - path = fetchurl { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz"; - sha1 = "8185bd030348d254c6d7dd974355e6a28b21e62d"; - }; - } - { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.1.tgz"; - path = fetchurl { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.1.tgz"; - sha1 = "a6d10e484c93abff0f4e95f437dad26e5736ea11"; - }; - } - { - name = "babel_plugin_lodash___babel_plugin_lodash_3.3.4.tgz"; - path = fetchurl { - name = "babel_plugin_lodash___babel_plugin_lodash_3.3.4.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz"; - sha1 = "4f6844358a1340baed182adbeffa8df9967bc196"; - }; - } - { - name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; - path = fetchurl { - name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; - sha1 = "0f958a7cc6556b1e65344465d99111a1e5e10138"; - }; - } - { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.0.tgz"; - path = fetchurl { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz"; - sha1 = "686775bf9a5aa757e10520903675e3889caeedc4"; - }; - } - { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.0.tgz"; - path = fetchurl { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz"; - sha1 = "f4b4bb7b19329827df36ff56f6e6d367026cb7a2"; - }; - } - { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.0.tgz"; - path = fetchurl { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz"; - sha1 = "853f5f5716f4691d98c84f8069c7636ea8da7ab8"; - }; - } - { - name = "babel_plugin_preval___babel_plugin_preval_5.0.0.tgz"; - path = fetchurl { - name = "babel_plugin_preval___babel_plugin_preval_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-5.0.0.tgz"; - sha1 = "6cabb947ecc241664966e1f99eb56a3b4bb63d1e"; - }; - } - { - name = "babel_plugin_react_intl___babel_plugin_react_intl_6.2.0.tgz"; - path = fetchurl { - name = "babel_plugin_react_intl___babel_plugin_react_intl_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-6.2.0.tgz"; - sha1 = "ac51ca757f318938792fc91e1747515e9225386a"; - }; - } - { - name = "babel_plugin_transform_react_remove_prop_types___babel_plugin_transform_react_remove_prop_types_0.4.24.tgz"; - path = fetchurl { - name = "babel_plugin_transform_react_remove_prop_types___babel_plugin_transform_react_remove_prop_types_0.4.24.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz"; - sha1 = "f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"; - }; - } - { - name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.0.tgz"; - path = fetchurl { - name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz"; - sha1 = "cf5feef29551253471cfa82fc8e0f5063df07a77"; - }; - } - { - name = "babel_preset_jest___babel_preset_jest_26.6.2.tgz"; - path = fetchurl { - name = "babel_preset_jest___babel_preset_jest_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz"; - sha1 = "747872b1171df032252426586881d62d31798fee"; - }; - } - { - name = "babel_preset_jest___babel_preset_jest_27.0.1.tgz"; - path = fetchurl { - name = "babel_preset_jest___babel_preset_jest_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.1.tgz"; - sha1 = "7a50c75d16647c23a2cf5158d5bb9eb206b10e20"; - }; - } - { - name = "babel_runtime___babel_runtime_6.26.0.tgz"; - path = fetchurl { - name = "babel_runtime___babel_runtime_6.26.0.tgz"; - url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; - sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; - }; - } - { - name = "balanced_match___balanced_match_1.0.0.tgz"; - path = fetchurl { - name = "balanced_match___balanced_match_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; - }; - } - { - name = "base64_js___base64_js_1.3.1.tgz"; - path = fetchurl { - name = "base64_js___base64_js_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; - sha1 = "58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"; - }; - } - { - name = "base___base_0.11.2.tgz"; - path = fetchurl { - name = "base___base_0.11.2.tgz"; - url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; - sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f"; - }; - } - { - name = "batch___batch_0.6.1.tgz"; - path = fetchurl { - name = "batch___batch_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz"; - sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; - }; - } - { - name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; - path = fetchurl { - name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; - }; - } - { - name = "big.js___big.js_3.2.0.tgz"; - path = fetchurl { - name = "big.js___big.js_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz"; - sha1 = "a5fc298b81b9e0dca2e458824784b65c52ba588e"; - }; - } - { - name = "big.js___big.js_5.2.2.tgz"; - path = fetchurl { - name = "big.js___big.js_5.2.2.tgz"; - url = "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz"; - sha1 = "65f0af382f578bcdc742bd9c281e9cb2d7768328"; - }; - } - { - name = "binary_extensions___binary_extensions_1.13.1.tgz"; - path = fetchurl { - name = "binary_extensions___binary_extensions_1.13.1.tgz"; - url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz"; - sha1 = "598afe54755b2868a5330d2aff9d4ebb53209b65"; - }; - } - { - name = "binary_extensions___binary_extensions_2.1.0.tgz"; - path = fetchurl { - name = "binary_extensions___binary_extensions_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz"; - sha1 = "30fa40c9e7fe07dbc895678cd287024dea241dd9"; - }; - } - { - name = "bindings___bindings_1.5.0.tgz"; - path = fetchurl { - name = "bindings___bindings_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; - sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; - }; - } - { - name = "bluebird___bluebird_3.7.2.tgz"; - path = fetchurl { - name = "bluebird___bluebird_3.7.2.tgz"; - url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; - sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; - }; - } - { - name = "blurhash___blurhash_1.1.3.tgz"; - path = fetchurl { - name = "blurhash___blurhash_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/blurhash/-/blurhash-1.1.3.tgz"; - sha1 = "dc325af7da836d07a0861d830bdd63694382483e"; - }; - } - { - name = "bmp_js___bmp_js_0.1.0.tgz"; - path = fetchurl { - name = "bmp_js___bmp_js_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.1.0.tgz"; - sha1 = "e05a63f796a6c1ff25f4771ec7adadc148c07233"; - }; - } - { - name = "bn.js___bn.js_4.12.0.tgz"; - path = fetchurl { - name = "bn.js___bn.js_4.12.0.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz"; - sha1 = "775b3f278efbb9718eec7361f483fb36fbbfea88"; - }; - } - { - name = "bn.js___bn.js_5.1.3.tgz"; - path = fetchurl { - name = "bn.js___bn.js_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz"; - sha1 = "beca005408f642ebebea80b042b4d18d2ac0ee6b"; - }; - } - { - name = "body_parser___body_parser_1.19.0.tgz"; - path = fetchurl { - name = "body_parser___body_parser_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; - sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; - }; - } - { - name = "bonjour___bonjour_3.5.0.tgz"; - path = fetchurl { - name = "bonjour___bonjour_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz"; - sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"; - }; - } - { - name = "boolbase___boolbase_1.0.0.tgz"; - path = fetchurl { - name = "boolbase___boolbase_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz"; - sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; - }; - } - { - name = "brace_expansion___brace_expansion_1.1.11.tgz"; - path = fetchurl { - name = "brace_expansion___brace_expansion_1.1.11.tgz"; - url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; - }; - } - { - name = "braces___braces_2.3.2.tgz"; - path = fetchurl { - name = "braces___braces_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; - sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729"; - }; - } - { - name = "braces___braces_3.0.2.tgz"; - path = fetchurl { - name = "braces___braces_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; - sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; - }; - } - { - name = "bricks.js___bricks.js_1.8.0.tgz"; - path = fetchurl { - name = "bricks.js___bricks.js_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/bricks.js/-/bricks.js-1.8.0.tgz"; - sha1 = "8fdeb3c0226af251f4d5727a7df7f9ac0092b4b2"; - }; - } - { - name = "brorand___brorand_1.1.0.tgz"; - path = fetchurl { - name = "brorand___brorand_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz"; - sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; - }; - } - { - name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; - path = fetchurl { - name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; - sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; - }; - } - { - name = "browserify_aes___browserify_aes_1.2.0.tgz"; - path = fetchurl { - name = "browserify_aes___browserify_aes_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz"; - sha1 = "326734642f403dabc3003209853bb70ad428ef48"; - }; - } - { - name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; - path = fetchurl { - name = "browserify_cipher___browserify_cipher_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; - sha1 = "8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"; - }; - } - { - name = "browserify_des___browserify_des_1.0.2.tgz"; - path = fetchurl { - name = "browserify_des___browserify_des_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz"; - sha1 = "3af4f1f59839403572f1c66204375f7a7f703e9c"; - }; - } - { - name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; - path = fetchurl { - name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; - sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; - }; - } - { - name = "browserify_sign___browserify_sign_4.2.1.tgz"; - path = fetchurl { - name = "browserify_sign___browserify_sign_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz"; - sha1 = "eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"; - }; - } - { - name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; - path = fetchurl { - name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; - sha1 = "2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"; - }; - } - { - name = "browserslist___browserslist_4.16.6.tgz"; - path = fetchurl { - name = "browserslist___browserslist_4.16.6.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz"; - sha1 = "d7901277a5a88e554ed305b183ec9b0c08f66fa2"; - }; - } - { - name = "bser___bser_2.1.1.tgz"; - path = fetchurl { - name = "bser___bser_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz"; - sha1 = "e6787da20ece9d07998533cfd9de6f5c38f4bc05"; - }; - } - { - name = "buffer_from___buffer_from_1.1.1.tgz"; - path = fetchurl { - name = "buffer_from___buffer_from_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; - sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; - }; - } - { - name = "buffer_indexof___buffer_indexof_1.1.1.tgz"; - path = fetchurl { - name = "buffer_indexof___buffer_indexof_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; - sha1 = "52fabcc6a606d1a00302802648ef68f639da268c"; - }; - } - { - name = "buffer_writer___buffer_writer_2.0.0.tgz"; - path = fetchurl { - name = "buffer_writer___buffer_writer_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz"; - sha1 = "ce7eb81a38f7829db09c873f2fbb792c0c98ec04"; - }; - } - { - name = "buffer_xor___buffer_xor_1.0.3.tgz"; - path = fetchurl { - name = "buffer_xor___buffer_xor_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz"; - sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; - }; - } - { - name = "buffer___buffer_4.9.2.tgz"; - path = fetchurl { - name = "buffer___buffer_4.9.2.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz"; - sha1 = "230ead344002988644841ab0244af8c44bbe3ef8"; - }; - } - { - name = "bufferutil___bufferutil_4.0.3.tgz"; - path = fetchurl { - name = "bufferutil___bufferutil_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.3.tgz"; - sha1 = "66724b756bed23cd7c28c4d306d7994f9943cc6b"; - }; - } - { - name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; - path = fetchurl { - name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; - sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; - }; - } - { - name = "bytes___bytes_3.0.0.tgz"; - path = fetchurl { - name = "bytes___bytes_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz"; - sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; - }; - } - { - name = "bytes___bytes_3.1.0.tgz"; - path = fetchurl { - name = "bytes___bytes_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; - sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; - }; - } - { - name = "cacache___cacache_12.0.4.tgz"; - path = fetchurl { - name = "cacache___cacache_12.0.4.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz"; - sha1 = "668bcbd105aeb5f1d92fe25570ec9525c8faa40c"; - }; - } - { - name = "cacache___cacache_15.0.5.tgz"; - path = fetchurl { - name = "cacache___cacache_15.0.5.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz"; - sha1 = "69162833da29170d6732334643c60e005f5f17d0"; - }; - } - { - name = "cache_base___cache_base_1.0.1.tgz"; - path = fetchurl { - name = "cache_base___cache_base_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"; - sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2"; - }; - } - { - name = "call_bind___call_bind_1.0.2.tgz"; - path = fetchurl { - name = "call_bind___call_bind_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; - sha1 = "b1d4e89e688119c3c9a903ad30abb2f6a919be3c"; - }; - } - { - name = "caller_callsite___caller_callsite_2.0.0.tgz"; - path = fetchurl { - name = "caller_callsite___caller_callsite_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz"; - sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; - }; - } - { - name = "caller_path___caller_path_0.1.0.tgz"; - path = fetchurl { - name = "caller_path___caller_path_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz"; - sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f"; - }; - } - { - name = "caller_path___caller_path_2.0.0.tgz"; - path = fetchurl { - name = "caller_path___caller_path_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz"; - sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; - }; - } - { - name = "callsites___callsites_0.2.0.tgz"; - path = fetchurl { - name = "callsites___callsites_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz"; - sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; - }; - } - { - name = "callsites___callsites_2.0.0.tgz"; - path = fetchurl { - name = "callsites___callsites_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz"; - sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; - }; - } - { - name = "callsites___callsites_3.1.0.tgz"; - path = fetchurl { - name = "callsites___callsites_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; - sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; - }; - } - { - name = "camelcase___camelcase_5.3.1.tgz"; - path = fetchurl { - name = "camelcase___camelcase_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; - sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; - }; - } - { - name = "camelcase___camelcase_6.2.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz"; - sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; - }; - } - { - name = "caniuse_api___caniuse_api_3.0.0.tgz"; - path = fetchurl { - name = "caniuse_api___caniuse_api_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz"; - sha1 = "5e4d90e2274961d46291997df599e3ed008ee4c0"; - }; - } - { - name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; - path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz"; - sha1 = "bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"; - }; - } - { - name = "capture_exit___capture_exit_2.0.0.tgz"; - path = fetchurl { - name = "capture_exit___capture_exit_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz"; - sha1 = "fb953bfaebeb781f62898239dabb426d08a509a4"; - }; - } - { - name = "caseless___caseless_0.12.0.tgz"; - path = fetchurl { - name = "caseless___caseless_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; - }; - } - { - name = "chalk___chalk_1.1.3.tgz"; - path = fetchurl { - name = "chalk___chalk_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - } - { - name = "chalk___chalk_2.4.2.tgz"; - path = fetchurl { - name = "chalk___chalk_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; - }; - } - { - name = "chalk___chalk_3.0.0.tgz"; - path = fetchurl { - name = "chalk___chalk_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; - sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; - }; - } - { - name = "chalk___chalk_4.1.0.tgz"; - path = fetchurl { - name = "chalk___chalk_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; - sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; - }; - } - { - name = "char_regex___char_regex_1.0.2.tgz"; - path = fetchurl { - name = "char_regex___char_regex_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz"; - sha1 = "d744358226217f981ed58f479b1d6bcc29545dcf"; - }; - } - { - name = "chokidar___chokidar_3.5.1.tgz"; - path = fetchurl { - name = "chokidar___chokidar_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz"; - sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a"; - }; - } - { - name = "chokidar___chokidar_2.1.8.tgz"; - path = fetchurl { - name = "chokidar___chokidar_2.1.8.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz"; - sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917"; - }; - } - { - name = "chownr___chownr_1.1.4.tgz"; - path = fetchurl { - name = "chownr___chownr_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; - sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; - }; - } - { - name = "chownr___chownr_2.0.0.tgz"; - path = fetchurl { - name = "chownr___chownr_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; - sha1 = "15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"; - }; - } - { - name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; - path = fetchurl { - name = "chrome_trace_event___chrome_trace_event_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; - sha1 = "234090ee97c7d4ad1a2c4beae27505deffc608a4"; - }; - } - { - name = "ci_info___ci_info_2.0.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; - }; - } - { - name = "ci_info___ci_info_3.2.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz"; - sha1 = "2876cb948a498797b5236f0095bc057d0dca38b6"; - }; - } - { - name = "cipher_base___cipher_base_1.0.4.tgz"; - path = fetchurl { - name = "cipher_base___cipher_base_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz"; - sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de"; - }; - } - { - name = "circular_json___circular_json_0.3.3.tgz"; - path = fetchurl { - name = "circular_json___circular_json_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz"; - sha1 = "815c99ea84f6809529d2f45791bdf82711352d66"; - }; - } - { - name = "cjs_module_lexer___cjs_module_lexer_0.6.0.tgz"; - path = fetchurl { - name = "cjs_module_lexer___cjs_module_lexer_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz"; - sha1 = "4186fcca0eae175970aee870b9fe2d6cf8d5655f"; - }; - } - { - name = "class_utils___class_utils_0.3.6.tgz"; - path = fetchurl { - name = "class_utils___class_utils_0.3.6.tgz"; - url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"; - sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463"; - }; - } - { - name = "classnames___classnames_2.3.1.tgz"; - path = fetchurl { - name = "classnames___classnames_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz"; - sha1 = "dfcfa3891e306ec1dad105d0e88f4417b8535e8e"; - }; - } - { - name = "clean_stack___clean_stack_2.2.0.tgz"; - path = fetchurl { - name = "clean_stack___clean_stack_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; - sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; - }; - } - { - name = "cli_cursor___cli_cursor_1.0.2.tgz"; - path = fetchurl { - name = "cli_cursor___cli_cursor_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz"; - sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; - }; - } - { - name = "cli_width___cli_width_2.2.1.tgz"; - path = fetchurl { - name = "cli_width___cli_width_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; - sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; - }; - } - { - name = "cliui___cliui_5.0.0.tgz"; - path = fetchurl { - name = "cliui___cliui_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; - sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; - }; - } - { - name = "cliui___cliui_6.0.0.tgz"; - path = fetchurl { - name = "cliui___cliui_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz"; - sha1 = "511d702c0c4e41ca156d7d0e96021f23e13225b1"; - }; - } - { - name = "cliui___cliui_7.0.3.tgz"; - path = fetchurl { - name = "cliui___cliui_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.3.tgz"; - sha1 = "ef180f26c8d9bff3927ee52428bfec2090427981"; - }; - } - { - name = "clone_deep___clone_deep_4.0.1.tgz"; - path = fetchurl { - name = "clone_deep___clone_deep_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"; - sha1 = "c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"; - }; - } - { - name = "co___co_4.6.0.tgz"; - path = fetchurl { - name = "co___co_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; - }; - } - { - name = "coa___coa_2.0.2.tgz"; - path = fetchurl { - name = "coa___coa_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz"; - sha1 = "43f6c21151b4ef2bf57187db0d73de229e3e7ec3"; - }; - } - { - name = "code_point_at___code_point_at_1.1.0.tgz"; - path = fetchurl { - name = "code_point_at___code_point_at_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; - }; - } - { - name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; - path = fetchurl { - name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz"; - sha1 = "cc2c8e94fc18bbdffe64d6534570c8a673b27f59"; - }; - } - { - name = "collection_visit___collection_visit_1.0.0.tgz"; - path = fetchurl { - name = "collection_visit___collection_visit_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz"; - sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; - }; - } - { - name = "color_blend___color_blend_3.0.1.tgz"; - path = fetchurl { - name = "color_blend___color_blend_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/color-blend/-/color-blend-3.0.1.tgz"; - sha1 = "3882ed1190ca18760ffe11570d8537960171172b"; - }; - } - { - name = "color_convert___color_convert_1.9.3.tgz"; - path = fetchurl { - name = "color_convert___color_convert_1.9.3.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; - }; - } - { - name = "color_convert___color_convert_2.0.1.tgz"; - path = fetchurl { - name = "color_convert___color_convert_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; - sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; - }; - } - { - name = "color_name___color_name_1.1.3.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; - }; - } - { - name = "color_name___color_name_1.1.4.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; - }; - } - { - name = "color_string___color_string_1.5.3.tgz"; - path = fetchurl { - name = "color_string___color_string_1.5.3.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz"; - sha1 = "c9bbc5f01b58b5492f3d6857459cb6590ce204cc"; - }; - } - { - name = "color___color_3.1.2.tgz"; - path = fetchurl { - name = "color___color_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz"; - sha1 = "68148e7f85d41ad7649c5fa8c8106f098d229e10"; - }; - } - { - name = "colorette___colorette_1.2.2.tgz"; - path = fetchurl { - name = "colorette___colorette_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; - sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; - }; - } - { - name = "combined_stream___combined_stream_1.0.8.tgz"; - path = fetchurl { - name = "combined_stream___combined_stream_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; - sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; - }; - } - { - name = "commander___commander_2.20.3.tgz"; - path = fetchurl { - name = "commander___commander_2.20.3.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; - sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; - }; - } - { - name = "commander___commander_6.2.0.tgz"; - path = fetchurl { - name = "commander___commander_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz"; - sha1 = "b990bfb8ac030aedc6d11bc04d1488ffef56db75"; - }; - } - { - name = "commondir___commondir_1.0.1.tgz"; - path = fetchurl { - name = "commondir___commondir_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz"; - sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; - }; - } - { - name = "component_emitter___component_emitter_1.3.0.tgz"; - path = fetchurl { - name = "component_emitter___component_emitter_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; - sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0"; - }; - } - { - name = "compressible___compressible_2.0.18.tgz"; - path = fetchurl { - name = "compressible___compressible_2.0.18.tgz"; - url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz"; - sha1 = "af53cca6b070d4c3c0750fbd77286a6d7cc46fba"; - }; - } - { - name = "compression_webpack_plugin___compression_webpack_plugin_6.1.1.tgz"; - path = fetchurl { - name = "compression_webpack_plugin___compression_webpack_plugin_6.1.1.tgz"; - url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-6.1.1.tgz"; - sha1 = "ae8e4b2ffdb7396bb776e66918d751a20d8ccf0e"; - }; - } - { - name = "compression___compression_1.7.4.tgz"; - path = fetchurl { - name = "compression___compression_1.7.4.tgz"; - url = "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz"; - sha1 = "95523eff170ca57c29a0ca41e6fe131f41e5bb8f"; - }; - } - { - name = "concat_map___concat_map_0.0.1.tgz"; - path = fetchurl { - name = "concat_map___concat_map_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - } - { - name = "concat_stream___concat_stream_1.6.2.tgz"; - path = fetchurl { - name = "concat_stream___concat_stream_1.6.2.tgz"; - url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; - sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; - }; - } - { - name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; - path = fetchurl { - name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; - sha1 = "8b32089359308d111115d81cad3fceab888f97bc"; - }; - } - { - name = "console_browserify___console_browserify_1.2.0.tgz"; - path = fetchurl { - name = "console_browserify___console_browserify_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz"; - sha1 = "67063cef57ceb6cf4993a2ab3a55840ae8c49336"; - }; - } - { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - path = fetchurl { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; - }; - } - { - name = "constants_browserify___constants_browserify_1.0.0.tgz"; - path = fetchurl { - name = "constants_browserify___constants_browserify_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz"; - sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; - }; - } - { - name = "content_disposition___content_disposition_0.5.3.tgz"; - path = fetchurl { - name = "content_disposition___content_disposition_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; - sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; - }; - } - { - name = "content_type___content_type_1.0.4.tgz"; - path = fetchurl { - name = "content_type___content_type_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; - sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; - }; - } - { - name = "convert_source_map___convert_source_map_1.7.0.tgz"; - path = fetchurl { - name = "convert_source_map___convert_source_map_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; - }; - } - { - name = "cookie_signature___cookie_signature_1.0.6.tgz"; - path = fetchurl { - name = "cookie_signature___cookie_signature_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; - }; - } - { - name = "cookie___cookie_0.4.0.tgz"; - path = fetchurl { - name = "cookie___cookie_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; - sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; - }; - } - { - name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; - path = fetchurl { - name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; - sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0"; - }; - } - { - name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; - path = fetchurl { - name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; - sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; - }; - } - { - name = "core_js_compat___core_js_compat_3.10.1.tgz"; - path = fetchurl { - name = "core_js_compat___core_js_compat_3.10.1.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.10.1.tgz"; - sha1 = "62183a3a77ceeffcc420d907a3e6fc67d9b27f1c"; - }; - } - { - name = "core_js_pure___core_js_pure_3.6.5.tgz"; - path = fetchurl { - name = "core_js_pure___core_js_pure_3.6.5.tgz"; - url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz"; - sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813"; - }; - } - { - name = "core_js___core_js_2.6.11.tgz"; - path = fetchurl { - name = "core_js___core_js_2.6.11.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; - sha1 = "38831469f9922bded8ee21c9dc46985e0399308c"; - }; - } - { - name = "core_js___core_js_2.6.12.tgz"; - path = fetchurl { - name = "core_js___core_js_2.6.12.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz"; - sha1 = "d9333dfa7b065e347cc5682219d6f690859cc2ec"; - }; - } - { - name = "core_util_is___core_util_is_1.0.2.tgz"; - path = fetchurl { - name = "core_util_is___core_util_is_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - } - { - name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; - path = fetchurl { - name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; - sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; - }; - } - { - name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; - path = fetchurl { - name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; - sha1 = "da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"; - }; - } - { - name = "create_ecdh___create_ecdh_4.0.4.tgz"; - path = fetchurl { - name = "create_ecdh___create_ecdh_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz"; - sha1 = "d6e7f4bffa66736085a0762fd3a632684dabcc4e"; - }; - } - { - name = "create_hash___create_hash_1.2.0.tgz"; - path = fetchurl { - name = "create_hash___create_hash_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz"; - sha1 = "889078af11a63756bcfb59bd221996be3a9ef196"; - }; - } - { - name = "create_hmac___create_hmac_1.1.7.tgz"; - path = fetchurl { - name = "create_hmac___create_hmac_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz"; - sha1 = "69170c78b3ab957147b2b8b04572e47ead2243ff"; - }; - } - { - name = "cross_env___cross_env_7.0.3.tgz"; - path = fetchurl { - name = "cross_env___cross_env_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz"; - sha1 = "865264b29677dc015ba8418918965dd232fc54cf"; - }; - } - { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; - }; - } - { - name = "cross_spawn___cross_spawn_7.0.3.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; - }; - } - { - name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; - path = fetchurl { - name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; - url = "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; - sha1 = "396cf9f3137f03e4b8e532c58f698254e00f80ec"; - }; - } - { - name = "css_color_names___css_color_names_0.0.4.tgz"; - path = fetchurl { - name = "css_color_names___css_color_names_0.0.4.tgz"; - url = "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz"; - sha1 = "808adc2e79cf84738069b646cb20ec27beb629e0"; - }; - } - { - name = "css_declaration_sorter___css_declaration_sorter_4.0.1.tgz"; - path = fetchurl { - name = "css_declaration_sorter___css_declaration_sorter_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"; - sha1 = "c198940f63a76d7e36c1e71018b001721054cb22"; - }; - } - { - name = "css_font_size_keywords___css_font_size_keywords_1.0.0.tgz"; - path = fetchurl { - name = "css_font_size_keywords___css_font_size_keywords_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz"; - sha1 = "854875ace9aca6a8d2ee0d345a44aae9bb6db6cb"; - }; - } - { - name = "css_font_stretch_keywords___css_font_stretch_keywords_1.0.1.tgz"; - path = fetchurl { - name = "css_font_stretch_keywords___css_font_stretch_keywords_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/css-font-stretch-keywords/-/css-font-stretch-keywords-1.0.1.tgz"; - sha1 = "50cee9b9ba031fb5c952d4723139f1e107b54b10"; - }; - } - { - name = "css_font_style_keywords___css_font_style_keywords_1.0.1.tgz"; - path = fetchurl { - name = "css_font_style_keywords___css_font_style_keywords_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/css-font-style-keywords/-/css-font-style-keywords-1.0.1.tgz"; - sha1 = "5c3532813f63b4a1de954d13cea86ab4333409e4"; - }; - } - { - name = "css_font_weight_keywords___css_font_weight_keywords_1.0.0.tgz"; - path = fetchurl { - name = "css_font_weight_keywords___css_font_weight_keywords_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz"; - sha1 = "9bc04671ac85bc724b574ef5d3ac96b0d604fd97"; - }; - } - { - name = "css_global_keywords___css_global_keywords_1.0.1.tgz"; - path = fetchurl { - name = "css_global_keywords___css_global_keywords_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/css-global-keywords/-/css-global-keywords-1.0.1.tgz"; - sha1 = "72a9aea72796d019b1d2a3252de4e5aaa37e4a69"; - }; - } - { - name = "css_list_helpers___css_list_helpers_1.0.1.tgz"; - path = fetchurl { - name = "css_list_helpers___css_list_helpers_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/css-list-helpers/-/css-list-helpers-1.0.1.tgz"; - sha1 = "fff57192202db83240c41686f919e449a7024f7d"; - }; - } - { - name = "css_loader___css_loader_5.2.6.tgz"; - path = fetchurl { - name = "css_loader___css_loader_5.2.6.tgz"; - url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.6.tgz"; - sha1 = "c3c82ab77fea1f360e587d871a6811f4450cc8d1"; - }; - } - { - name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz"; - path = fetchurl { - name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"; - sha1 = "3b2ff4972cc362ab88561507a95408a1432135d7"; - }; - } - { - name = "css_select___css_select_2.1.0.tgz"; - path = fetchurl { - name = "css_select___css_select_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz"; - sha1 = "6a34653356635934a81baca68d0255432105dbef"; - }; - } - { - name = "css_system_font_keywords___css_system_font_keywords_1.0.0.tgz"; - path = fetchurl { - name = "css_system_font_keywords___css_system_font_keywords_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/css-system-font-keywords/-/css-system-font-keywords-1.0.0.tgz"; - sha1 = "85c6f086aba4eb32c571a3086affc434b84823ed"; - }; - } - { - name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; - path = fetchurl { - name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; - sha1 = "98bebd62c4c1d9f960ec340cf9f7522e30709a22"; - }; - } - { - name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; - path = fetchurl { - name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; - sha1 = "2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb"; - }; - } - { - name = "css_what___css_what_3.3.0.tgz"; - path = fetchurl { - name = "css_what___css_what_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-3.3.0.tgz"; - sha1 = "10fec696a9ece2e591ac772d759aacabac38cd39"; - }; - } - { - name = "css.escape___css.escape_1.5.1.tgz"; - path = fetchurl { - name = "css.escape___css.escape_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz"; - sha1 = "42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"; - }; - } - { - name = "css___css_3.0.0.tgz"; - path = fetchurl { - name = "css___css_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz"; - sha1 = "4447a4d58fdd03367c516ca9f64ae365cee4aa5d"; - }; - } - { - name = "cssesc___cssesc_3.0.0.tgz"; - path = fetchurl { - name = "cssesc___cssesc_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz"; - sha1 = "37741919903b868565e1c09ea747445cd18983ee"; - }; - } - { - name = "cssnano_preset_default___cssnano_preset_default_4.0.8.tgz"; - path = fetchurl { - name = "cssnano_preset_default___cssnano_preset_default_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz"; - sha1 = "920622b1fc1e95a34e8838203f1397a504f2d3ff"; - }; - } - { - name = "cssnano_util_get_arguments___cssnano_util_get_arguments_4.0.0.tgz"; - path = fetchurl { - name = "cssnano_util_get_arguments___cssnano_util_get_arguments_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz"; - sha1 = "ed3a08299f21d75741b20f3b81f194ed49cc150f"; - }; - } - { - name = "cssnano_util_get_match___cssnano_util_get_match_4.0.0.tgz"; - path = fetchurl { - name = "cssnano_util_get_match___cssnano_util_get_match_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz"; - sha1 = "c0e4ca07f5386bb17ec5e52250b4f5961365156d"; - }; - } - { - name = "cssnano_util_raw_cache___cssnano_util_raw_cache_4.0.1.tgz"; - path = fetchurl { - name = "cssnano_util_raw_cache___cssnano_util_raw_cache_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"; - sha1 = "b26d5fd5f72a11dfe7a7846fb4c67260f96bf282"; - }; - } - { - name = "cssnano_util_same_parent___cssnano_util_same_parent_4.0.1.tgz"; - path = fetchurl { - name = "cssnano_util_same_parent___cssnano_util_same_parent_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"; - sha1 = "574082fb2859d2db433855835d9a8456ea18bbf3"; - }; - } - { - name = "cssnano___cssnano_4.1.11.tgz"; - path = fetchurl { - name = "cssnano___cssnano_4.1.11.tgz"; - url = "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz"; - sha1 = "c7b5f5b81da269cb1fd982cb960c1200910c9a99"; - }; - } - { - name = "csso___csso_4.0.3.tgz"; - path = fetchurl { - name = "csso___csso_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz"; - sha1 = "0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"; - }; - } - { - name = "cssom___cssom_0.4.4.tgz"; - path = fetchurl { - name = "cssom___cssom_0.4.4.tgz"; - url = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz"; - sha1 = "5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"; - }; - } - { - name = "cssom___cssom_0.3.8.tgz"; - path = fetchurl { - name = "cssom___cssom_0.3.8.tgz"; - url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz"; - sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"; - }; - } - { - name = "cssstyle___cssstyle_2.3.0.tgz"; - path = fetchurl { - name = "cssstyle___cssstyle_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz"; - sha1 = "ff665a0ddbdc31864b09647f34163443d90b0852"; - }; - } - { - name = "csstype___csstype_2.6.13.tgz"; - path = fetchurl { - name = "csstype___csstype_2.6.13.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz"; - sha1 = "a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f"; - }; - } - { - name = "csstype___csstype_3.0.6.tgz"; - path = fetchurl { - name = "csstype___csstype_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.6.tgz"; - sha1 = "865d0b5833d7d8d40f4e5b8a6d76aea3de4725ef"; - }; - } - { - name = "cyclist___cyclist_1.0.1.tgz"; - path = fetchurl { - name = "cyclist___cyclist_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz"; - sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; - }; - } - { - name = "d___d_1.0.1.tgz"; - path = fetchurl { - name = "d___d_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz"; - sha1 = "8698095372d58dbee346ffd0c7093f99f8f9eb5a"; - }; - } - { - name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; - path = fetchurl { - name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"; - sha1 = "143c1641cb3d85c60c32329e26899adea8701791"; - }; - } - { - name = "dashdash___dashdash_1.14.1.tgz"; - path = fetchurl { - name = "dashdash___dashdash_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - } - { - name = "data_urls___data_urls_2.0.0.tgz"; - path = fetchurl { - name = "data_urls___data_urls_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz"; - sha1 = "156485a72963a970f5d5821aaf642bef2bf2db9b"; - }; - } - { - name = "debug___debug_2.6.9.tgz"; - path = fetchurl { - name = "debug___debug_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; - }; - } - { - name = "debug___debug_3.2.7.tgz"; - path = fetchurl { - name = "debug___debug_3.2.7.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz"; - sha1 = "72580b7e9145fb39b6676f9c5e5fb100b934179a"; - }; - } - { - name = "debug___debug_4.1.1.tgz"; - path = fetchurl { - name = "debug___debug_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; - sha1 = "3b72260255109c6b589cee050f1d516139664791"; - }; - } - { - name = "decamelize___decamelize_1.2.0.tgz"; - path = fetchurl { - name = "decamelize___decamelize_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - } - { - name = "decimal.js___decimal.js_10.2.1.tgz"; - path = fetchurl { - name = "decimal.js___decimal.js_10.2.1.tgz"; - url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz"; - sha1 = "238ae7b0f0c793d3e3cea410108b35a2c01426a3"; - }; - } - { - name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; - path = fetchurl { - name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; - }; - } - { - name = "deep_equal___deep_equal_1.1.1.tgz"; - path = fetchurl { - name = "deep_equal___deep_equal_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; - sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; - }; - } - { - name = "deep_extend___deep_extend_0.5.1.tgz"; - path = fetchurl { - name = "deep_extend___deep_extend_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz"; - sha1 = "b894a9dd90d3023fbf1c55a394fb858eb2066f1f"; - }; - } - { - name = "deep_is___deep_is_0.1.3.tgz"; - path = fetchurl { - name = "deep_is___deep_is_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; - }; - } - { - name = "deepmerge___deepmerge_4.2.2.tgz"; - path = fetchurl { - name = "deepmerge___deepmerge_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz"; - sha1 = "44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"; - }; - } - { - name = "default_gateway___default_gateway_4.2.0.tgz"; - path = fetchurl { - name = "default_gateway___default_gateway_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz"; - sha1 = "167104c7500c2115f6dd69b0a536bb8ed720552b"; - }; - } - { - name = "define_properties___define_properties_1.1.3.tgz"; - path = fetchurl { - name = "define_properties___define_properties_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; - sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; - }; - } - { - name = "define_property___define_property_0.2.5.tgz"; - path = fetchurl { - name = "define_property___define_property_0.2.5.tgz"; - url = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz"; - sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; - }; - } - { - name = "define_property___define_property_1.0.0.tgz"; - path = fetchurl { - name = "define_property___define_property_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz"; - sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; - }; - } - { - name = "define_property___define_property_2.0.2.tgz"; - path = fetchurl { - name = "define_property___define_property_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"; - sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d"; - }; - } - { - name = "del___del_4.1.1.tgz"; - path = fetchurl { - name = "del___del_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz"; - sha1 = "9e8f117222ea44a31ff3a156c049b99052a9f0b4"; - }; - } - { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; - path = fetchurl { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - } - { - name = "delegates___delegates_1.0.0.tgz"; - path = fetchurl { - name = "delegates___delegates_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; - }; - } - { - name = "denque___denque_1.5.0.tgz"; - path = fetchurl { - name = "denque___denque_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz"; - sha1 = "773de0686ff2d8ec2ff92914316a47b73b1c73de"; - }; - } - { - name = "depd___depd_1.1.2.tgz"; - path = fetchurl { - name = "depd___depd_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; - }; - } - { - name = "des.js___des.js_1.0.1.tgz"; - path = fetchurl { - name = "des.js___des.js_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz"; - sha1 = "5382142e1bdc53f85d86d53e5f4aa7deb91e0843"; - }; - } - { - name = "destroy___destroy_1.0.4.tgz"; - path = fetchurl { - name = "destroy___destroy_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; - }; - } - { - name = "detect_file___detect_file_1.0.0.tgz"; - path = fetchurl { - name = "detect_file___detect_file_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz"; - sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; - }; - } - { - name = "detect_it___detect_it_4.0.1.tgz"; - path = fetchurl { - name = "detect_it___detect_it_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/detect-it/-/detect-it-4.0.1.tgz"; - sha1 = "3f8de6b8330f5086270571251bedf10aec049e18"; - }; - } - { - name = "detect_newline___detect_newline_3.1.0.tgz"; - path = fetchurl { - name = "detect_newline___detect_newline_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz"; - sha1 = "576f5dfc63ae1a192ff192d8ad3af6308991b651"; - }; - } - { - name = "detect_node___detect_node_2.0.4.tgz"; - path = fetchurl { - name = "detect_node___detect_node_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz"; - sha1 = "014ee8f8f669c5c58023da64b8179c083a28c46c"; - }; - } - { - name = "detect_passive_events___detect_passive_events_2.0.3.tgz"; - path = fetchurl { - name = "detect_passive_events___detect_passive_events_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/detect-passive-events/-/detect-passive-events-2.0.3.tgz"; - sha1 = "1f75ebf80660a66c615d8be23c3241cdda6977e0"; - }; - } - { - name = "diff_sequences___diff_sequences_25.2.6.tgz"; - path = fetchurl { - name = "diff_sequences___diff_sequences_25.2.6.tgz"; - url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz"; - sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd"; - }; - } - { - name = "diff_sequences___diff_sequences_26.6.2.tgz"; - path = fetchurl { - name = "diff_sequences___diff_sequences_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz"; - sha1 = "48ba99157de1923412eed41db6b6d4aa9ca7c0b1"; - }; - } - { - name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; - path = fetchurl { - name = "diffie_hellman___diffie_hellman_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; - sha1 = "40e8ee98f55a2149607146921c63e1ae5f3d2875"; - }; - } - { - name = "dns_equal___dns_equal_1.0.0.tgz"; - path = fetchurl { - name = "dns_equal___dns_equal_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz"; - sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; - }; - } - { - name = "dns_packet___dns_packet_1.3.4.tgz"; - path = fetchurl { - name = "dns_packet___dns_packet_1.3.4.tgz"; - url = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz"; - sha1 = "e3455065824a2507ba886c55a89963bb107dec6f"; - }; - } - { - name = "dns_txt___dns_txt_2.0.2.tgz"; - path = fetchurl { - name = "dns_txt___dns_txt_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz"; - sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; - }; - } - { - name = "doctrine___doctrine_1.5.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz"; - sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; - }; - } - { - name = "doctrine___doctrine_2.1.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; - sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; - }; - } - { - name = "doctrine___doctrine_3.0.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; - sha1 = "addebead72a6574db783639dc87a121773973961"; - }; - } - { - name = "dom_accessibility_api___dom_accessibility_api_0.5.4.tgz"; - path = fetchurl { - name = "dom_accessibility_api___dom_accessibility_api_0.5.4.tgz"; - url = "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.4.tgz"; - sha1 = "b06d059cdd4a4ad9a79275f9d414a5c126241166"; - }; - } - { - name = "dom_helpers___dom_helpers_3.4.0.tgz"; - path = fetchurl { - name = "dom_helpers___dom_helpers_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz"; - sha1 = "e9b369700f959f62ecde5a6babde4bccd9169af8"; - }; - } - { - name = "dom_helpers___dom_helpers_5.1.3.tgz"; - path = fetchurl { - name = "dom_helpers___dom_helpers_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.1.3.tgz"; - sha1 = "7233248eb3a2d1f74aafca31e52c5299cc8ce821"; - }; - } - { - name = "dom_serializer___dom_serializer_0.2.2.tgz"; - path = fetchurl { - name = "dom_serializer___dom_serializer_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz"; - sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; - }; - } - { - name = "domain_browser___domain_browser_1.2.0.tgz"; - path = fetchurl { - name = "domain_browser___domain_browser_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz"; - sha1 = "3d31f50191a6749dd1375a7f522e823d42e54eda"; - }; - } - { - name = "domelementtype___domelementtype_1.3.1.tgz"; - path = fetchurl { - name = "domelementtype___domelementtype_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz"; - sha1 = "d048c44b37b0d10a7f2a3d5fee3f4333d790481f"; - }; - } - { - name = "domelementtype___domelementtype_2.0.1.tgz"; - path = fetchurl { - name = "domelementtype___domelementtype_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz"; - sha1 = "1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"; - }; - } - { - name = "domexception___domexception_2.0.1.tgz"; - path = fetchurl { - name = "domexception___domexception_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz"; - sha1 = "fb44aefba793e1574b0af6aed2801d057529f304"; - }; - } - { - name = "domutils___domutils_1.7.0.tgz"; - path = fetchurl { - name = "domutils___domutils_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz"; - sha1 = "56ea341e834e06e6748af7a1cb25da67ea9f8c2a"; - }; - } - { - name = "dot_prop___dot_prop_5.3.0.tgz"; - path = fetchurl { - name = "dot_prop___dot_prop_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; - sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; - }; - } - { - name = "dotenv___dotenv_9.0.2.tgz"; - path = fetchurl { - name = "dotenv___dotenv_9.0.2.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; - sha1 = "dacc20160935a37dea6364aa1bef819fb9b6ab05"; - }; - } - { - name = "duplexer___duplexer_0.1.2.tgz"; - path = fetchurl { - name = "duplexer___duplexer_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz"; - sha1 = "3abe43aef3835f8ae077d136ddce0f276b0400e6"; - }; - } - { - name = "duplexify___duplexify_3.7.1.tgz"; - path = fetchurl { - name = "duplexify___duplexify_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz"; - sha1 = "2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"; - }; - } - { - name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; - path = fetchurl { - name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; - }; - } - { - name = "ee_first___ee_first_1.1.1.tgz"; - path = fetchurl { - name = "ee_first___ee_first_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; - }; - } - { - name = "ejs___ejs_2.7.4.tgz"; - path = fetchurl { - name = "ejs___ejs_2.7.4.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz"; - sha1 = "48661287573dcc53e366c7a1ae52c3a120eec9ba"; - }; - } - { - name = "electron_to_chromium___electron_to_chromium_1.3.736.tgz"; - path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.736.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz"; - sha1 = "f632d900a1f788dab22fec9c62ec5c9c8f0c4052"; - }; - } - { - name = "elliptic___elliptic_6.5.4.tgz"; - path = fetchurl { - name = "elliptic___elliptic_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz"; - sha1 = "da37cebd31e79a1367e941b592ed1fbebd58abbb"; - }; - } - { - name = "emittery___emittery_0.7.1.tgz"; - path = fetchurl { - name = "emittery___emittery_0.7.1.tgz"; - url = "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz"; - sha1 = "c02375a927a40948c0345cc903072597f5270451"; - }; - } - { - name = "emoji_mart___emoji_mart_3.0.1.tgz"; - path = fetchurl { - name = "emoji_mart___emoji_mart_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-3.0.1.tgz"; - sha1 = "9ce86706e02aea0506345f98464814a662ca54c6"; - }; - } - { - name = "emoji_regex___emoji_regex_7.0.3.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; - }; - } - { - name = "emoji_regex___emoji_regex_8.0.0.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; - }; - } - { - name = "emoji_regex___emoji_regex_9.0.0.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.0.0.tgz"; - sha1 = "48a2309cc8a1d2e9d23bc6a67c39b63032e76ea4"; - }; - } - { - name = "emojis_list___emojis_list_2.1.0.tgz"; - path = fetchurl { - name = "emojis_list___emojis_list_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz"; - sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; - }; - } - { - name = "emojis_list___emojis_list_3.0.0.tgz"; - path = fetchurl { - name = "emojis_list___emojis_list_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; - sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78"; - }; - } - { - name = "encodeurl___encodeurl_1.0.2.tgz"; - path = fetchurl { - name = "encodeurl___encodeurl_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; - }; - } - { - name = "end_of_stream___end_of_stream_1.4.4.tgz"; - path = fetchurl { - name = "end_of_stream___end_of_stream_1.4.4.tgz"; - url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; - }; - } - { - name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; - path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz"; - sha1 = "2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"; - }; - } - { - name = "enquirer___enquirer_2.3.6.tgz"; - path = fetchurl { - name = "enquirer___enquirer_2.3.6.tgz"; - url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; - sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; - }; - } - { - name = "entities___entities_2.0.3.tgz"; - path = fetchurl { - name = "entities___entities_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"; - sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f"; - }; - } - { - name = "errno___errno_0.1.7.tgz"; - path = fetchurl { - name = "errno___errno_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz"; - sha1 = "4684d71779ad39af177e3f007996f7c67c852618"; - }; - } - { - name = "error_ex___error_ex_1.3.2.tgz"; - path = fetchurl { - name = "error_ex___error_ex_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; - sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; - }; - } - { - name = "error_stack_parser___error_stack_parser_2.0.6.tgz"; - path = fetchurl { - name = "error_stack_parser___error_stack_parser_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.6.tgz"; - sha1 = "5a99a707bd7a4c58a797902d48d82803ede6aad8"; - }; - } - { - name = "es_abstract___es_abstract_1.17.7.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.17.7.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz"; - sha1 = "a4de61b2f66989fc7421676c1cb9787573ace54c"; - }; - } - { - name = "es_abstract___es_abstract_1.18.0_next.2.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.18.0_next.2.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.2.tgz"; - sha1 = "088101a55f0541f595e7e057199e27ddc8f3a5c2"; - }; - } - { - name = "es_abstract___es_abstract_1.18.3.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.18.3.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz"; - sha1 = "25c4c3380a27aa203c44b2b685bba94da31b63e0"; - }; - } - { - name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; - path = fetchurl { - name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; - }; - } - { - name = "es5_ext___es5_ext_0.10.53.tgz"; - path = fetchurl { - name = "es5_ext___es5_ext_0.10.53.tgz"; - url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz"; - sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1"; - }; - } - { - name = "es6_iterator___es6_iterator_2.0.3.tgz"; - path = fetchurl { - name = "es6_iterator___es6_iterator_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz"; - sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; - }; - } - { - name = "es6_map___es6_map_0.1.5.tgz"; - path = fetchurl { - name = "es6_map___es6_map_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz"; - sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; - }; - } - { - name = "es6_set___es6_set_0.1.5.tgz"; - path = fetchurl { - name = "es6_set___es6_set_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz"; - sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; - }; - } - { - name = "es6_symbol___es6_symbol_3.1.1.tgz"; - path = fetchurl { - name = "es6_symbol___es6_symbol_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz"; - sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; - }; - } - { - name = "es6_symbol___es6_symbol_3.1.3.tgz"; - path = fetchurl { - name = "es6_symbol___es6_symbol_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz"; - sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; - }; - } - { - name = "es6_weak_map___es6_weak_map_2.0.3.tgz"; - path = fetchurl { - name = "es6_weak_map___es6_weak_map_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz"; - sha1 = "b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"; - }; - } - { - name = "escalade___escalade_3.1.1.tgz"; - path = fetchurl { - name = "escalade___escalade_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; - sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; - }; - } - { - name = "escape_html___escape_html_1.0.3.tgz"; - path = fetchurl { - name = "escape_html___escape_html_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; - }; - } - { - name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - } - { - name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; - sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344"; - }; - } - { - name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; - }; - } - { - name = "escodegen___escodegen_1.14.3.tgz"; - path = fetchurl { - name = "escodegen___escodegen_1.14.3.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; - sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; - }; - } - { - name = "escope___escope_3.6.0.tgz"; - path = fetchurl { - name = "escope___escope_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz"; - sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; - }; - } - { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; - path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; - sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; - }; - } - { - name = "eslint_module_utils___eslint_module_utils_2.6.1.tgz"; - path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz"; - sha1 = "b51be1e473dd0de1c5ea638e22429c2490ea8233"; - }; - } - { - name = "eslint_plugin_import___eslint_plugin_import_2.23.4.tgz"; - path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.23.4.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz"; - sha1 = "8dceb1ed6b73e46e50ec9a5bb2411b645e7d3d97"; - }; - } - { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.tgz"; - path = fetchurl { - name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.4.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz"; - sha1 = "a2d84caa49756942f42f1ffab9002436391718fd"; - }; - } - { - name = "eslint_plugin_promise___eslint_plugin_promise_5.1.0.tgz"; - path = fetchurl { - name = "eslint_plugin_promise___eslint_plugin_promise_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz"; - sha1 = "fb2188fb734e4557993733b41aa1a688f46c6f24"; - }; - } - { - name = "eslint_plugin_react___eslint_plugin_react_7.24.0.tgz"; - path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.24.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz"; - sha1 = "eadedfa351a6f36b490aa17f4fa9b14e842b9eb4"; - }; - } - { - name = "eslint_scope___eslint_scope_4.0.3.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz"; - sha1 = "ca03833310f6889a3264781aa82e63eb9cfe7848"; - }; - } - { - name = "eslint_scope___eslint_scope_5.1.1.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; - sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; - }; - } - { - name = "eslint_utils___eslint_utils_2.1.0.tgz"; - path = fetchurl { - name = "eslint_utils___eslint_utils_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; - sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; - }; - } - { - name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; - path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; - sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; - }; - } - { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; - path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; - sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; - }; - } - { - name = "eslint___eslint_2.13.1.tgz"; - path = fetchurl { - name = "eslint___eslint_2.13.1.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-2.13.1.tgz"; - sha1 = "e4cc8fa0f009fb829aaae23855a29360be1f6c11"; - }; - } - { - name = "eslint___eslint_7.27.0.tgz"; - path = fetchurl { - name = "eslint___eslint_7.27.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.27.0.tgz"; - sha1 = "665a1506d8f95655c9274d84bd78f7166b07e9c7"; - }; - } - { - name = "espree___espree_3.5.4.tgz"; - path = fetchurl { - name = "espree___espree_3.5.4.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz"; - sha1 = "b0f447187c8a8bed944b815a660bddf5deb5d1a7"; - }; - } - { - name = "espree___espree_7.3.1.tgz"; - path = fetchurl { - name = "espree___espree_7.3.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; - sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6"; - }; - } - { - name = "esprima___esprima_4.0.1.tgz"; - path = fetchurl { - name = "esprima___esprima_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; - sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; - }; - } - { - name = "esquery___esquery_1.4.0.tgz"; - path = fetchurl { - name = "esquery___esquery_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; - sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; - }; - } - { - name = "esrecurse___esrecurse_4.3.0.tgz"; - path = fetchurl { - name = "esrecurse___esrecurse_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; - sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; - }; - } - { - name = "estraverse___estraverse_4.3.0.tgz"; - path = fetchurl { - name = "estraverse___estraverse_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; - sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; - }; - } - { - name = "estraverse___estraverse_5.2.0.tgz"; - path = fetchurl { - name = "estraverse___estraverse_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; - sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; - }; - } - { - name = "esutils___esutils_2.0.3.tgz"; - path = fetchurl { - name = "esutils___esutils_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; - sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; - }; - } - { - name = "etag___etag_1.8.1.tgz"; - path = fetchurl { - name = "etag___etag_1.8.1.tgz"; - url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; - }; - } - { - name = "event_emitter___event_emitter_0.3.5.tgz"; - path = fetchurl { - name = "event_emitter___event_emitter_0.3.5.tgz"; - url = "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz"; - sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; - }; - } - { - name = "eventemitter3___eventemitter3_4.0.7.tgz"; - path = fetchurl { - name = "eventemitter3___eventemitter3_4.0.7.tgz"; - url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz"; - sha1 = "2de9b68f6528d5644ef5c59526a1b4a07306169f"; - }; - } - { - name = "events___events_3.2.0.tgz"; - path = fetchurl { - name = "events___events_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz"; - sha1 = "93b87c18f8efcd4202a461aec4dfc0556b639379"; - }; - } - { - name = "eventsource___eventsource_1.0.7.tgz"; - path = fetchurl { - name = "eventsource___eventsource_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz"; - sha1 = "8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"; - }; - } - { - name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; - path = fetchurl { - name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; - sha1 = "7fcbdb198dc71959432efe13842684e0525acb02"; - }; - } - { - name = "exec_sh___exec_sh_0.3.4.tgz"; - path = fetchurl { - name = "exec_sh___exec_sh_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz"; - sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"; - }; - } - { - name = "execa___execa_1.0.0.tgz"; - path = fetchurl { - name = "execa___execa_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; - sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; - }; - } - { - name = "execa___execa_4.1.0.tgz"; - path = fetchurl { - name = "execa___execa_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz"; - sha1 = "4e5491ad1572f2f17a77d388c6c857135b22847a"; - }; - } - { - name = "exif_js___exif_js_2.3.0.tgz"; - path = fetchurl { - name = "exif_js___exif_js_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/exif-js/-/exif-js-2.3.0.tgz"; - sha1 = "9d10819bf571f873813e7640241255ab9ce1a814"; - }; - } - { - name = "exit_hook___exit_hook_1.1.1.tgz"; - path = fetchurl { - name = "exit_hook___exit_hook_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz"; - sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; - }; - } - { - name = "exit___exit_0.1.2.tgz"; - path = fetchurl { - name = "exit___exit_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz"; - sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; - }; - } - { - name = "expand_brackets___expand_brackets_2.1.4.tgz"; - path = fetchurl { - name = "expand_brackets___expand_brackets_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"; - sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; - }; - } - { - name = "expand_tilde___expand_tilde_2.0.2.tgz"; - path = fetchurl { - name = "expand_tilde___expand_tilde_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz"; - sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; - }; - } - { - name = "expect___expect_26.6.2.tgz"; - path = fetchurl { - name = "expect___expect_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz"; - sha1 = "c6b996bf26bf3fe18b67b2d0f51fc981ba934417"; - }; - } - { - name = "express___express_4.17.1.tgz"; - path = fetchurl { - name = "express___express_4.17.1.tgz"; - url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; - sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; - }; - } - { - name = "ext___ext_1.4.0.tgz"; - path = fetchurl { - name = "ext___ext_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz"; - sha1 = "89ae7a07158f79d35517882904324077e4379244"; - }; - } - { - name = "extend_shallow___extend_shallow_2.0.1.tgz"; - path = fetchurl { - name = "extend_shallow___extend_shallow_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz"; - sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; - }; - } - { - name = "extend_shallow___extend_shallow_3.0.2.tgz"; - path = fetchurl { - name = "extend_shallow___extend_shallow_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz"; - sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; - }; - } - { - name = "extend___extend_3.0.2.tgz"; - path = fetchurl { - name = "extend___extend_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; - sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; - }; - } - { - name = "extglob___extglob_2.0.4.tgz"; - path = fetchurl { - name = "extglob___extglob_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; - sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543"; - }; - } - { - name = "extsprintf___extsprintf_1.3.0.tgz"; - path = fetchurl { - name = "extsprintf___extsprintf_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - } - { - name = "extsprintf___extsprintf_1.4.0.tgz"; - path = fetchurl { - name = "extsprintf___extsprintf_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; - sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; - }; - } - { - name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; - path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; - }; - } - { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; - path = fetchurl { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; - }; - } - { - name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; - path = fetchurl { - name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; - }; - } - { - name = "faye_websocket___faye_websocket_0.11.3.tgz"; - path = fetchurl { - name = "faye_websocket___faye_websocket_0.11.3.tgz"; - url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz"; - sha1 = "5c0e9a8968e8912c286639fde977a8b209f2508e"; - }; - } - { - name = "fb_watchman___fb_watchman_2.0.1.tgz"; - path = fetchurl { - name = "fb_watchman___fb_watchman_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz"; - sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85"; - }; - } - { - name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; - path = fetchurl { - name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; - sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"; - }; - } - { - name = "figures___figures_1.7.0.tgz"; - path = fetchurl { - name = "figures___figures_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz"; - sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; - }; - } - { - name = "file_entry_cache___file_entry_cache_1.3.1.tgz"; - path = fetchurl { - name = "file_entry_cache___file_entry_cache_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-1.3.1.tgz"; - sha1 = "44c61ea607ae4be9c1402f41f44270cbfe334ff8"; - }; - } - { - name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; - path = fetchurl { - name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; - }; - } - { - name = "file_loader___file_loader_6.2.0.tgz"; - path = fetchurl { - name = "file_loader___file_loader_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz"; - sha1 = "baef7cf8e1840df325e4390b4484879480eebe4d"; - }; - } - { - name = "file_type___file_type_12.4.2.tgz"; - path = fetchurl { - name = "file_type___file_type_12.4.2.tgz"; - url = "https://registry.yarnpkg.com/file-type/-/file-type-12.4.2.tgz"; - sha1 = "a344ea5664a1d01447ee7fb1b635f72feb6169d9"; - }; - } - { - name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; - path = fetchurl { - name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; - sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; - }; - } - { - name = "fill_range___fill_range_4.0.0.tgz"; - path = fetchurl { - name = "fill_range___fill_range_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz"; - sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; - }; - } - { - name = "fill_range___fill_range_7.0.1.tgz"; - path = fetchurl { - name = "fill_range___fill_range_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; - sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; - }; - } - { - name = "finalhandler___finalhandler_1.1.2.tgz"; - path = fetchurl { - name = "finalhandler___finalhandler_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; - sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; - }; - } - { - name = "find_cache_dir___find_cache_dir_2.1.0.tgz"; - path = fetchurl { - name = "find_cache_dir___find_cache_dir_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; - sha1 = "8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"; - }; - } - { - name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; - path = fetchurl { - name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; - sha1 = "89b33fad4a4670daa94f855f7fbe31d6d84fe880"; - }; - } - { - name = "find_up___find_up_2.1.0.tgz"; - path = fetchurl { - name = "find_up___find_up_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz"; - sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; - }; - } - { - name = "find_up___find_up_3.0.0.tgz"; - path = fetchurl { - name = "find_up___find_up_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; - sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; - }; - } - { - name = "find_up___find_up_4.1.0.tgz"; - path = fetchurl { - name = "find_up___find_up_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; - }; - } - { - name = "findup_sync___findup_sync_3.0.0.tgz"; - path = fetchurl { - name = "findup_sync___findup_sync_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz"; - sha1 = "17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"; - }; - } - { - name = "flat_cache___flat_cache_1.3.4.tgz"; - path = fetchurl { - name = "flat_cache___flat_cache_1.3.4.tgz"; - url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz"; - sha1 = "2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"; - }; - } - { - name = "flat_cache___flat_cache_3.0.4.tgz"; - path = fetchurl { - name = "flat_cache___flat_cache_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; - sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11"; - }; - } - { - name = "flatted___flatted_3.1.0.tgz"; - path = fetchurl { - name = "flatted___flatted_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz"; - sha1 = "a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"; - }; - } - { - name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; - path = fetchurl { - name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; - sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"; - }; - } - { - name = "follow_redirects___follow_redirects_1.13.0.tgz"; - path = fetchurl { - name = "follow_redirects___follow_redirects_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz"; - sha1 = "b42e8d93a2a7eea5ed88633676d6597bc8e384db"; - }; - } - { - name = "font_awesome___font_awesome_4.7.0.tgz"; - path = fetchurl { - name = "font_awesome___font_awesome_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz"; - sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133"; - }; - } - { - name = "for_in___for_in_1.0.2.tgz"; - path = fetchurl { - name = "for_in___for_in_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"; - sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; - }; - } - { - name = "forever_agent___forever_agent_0.6.1.tgz"; - path = fetchurl { - name = "forever_agent___forever_agent_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - } - { - name = "form_data___form_data_2.3.3.tgz"; - path = fetchurl { - name = "form_data___form_data_2.3.3.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; - sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; - }; - } - { - name = "forwarded___forwarded_0.1.2.tgz"; - path = fetchurl { - name = "forwarded___forwarded_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; - }; - } - { - name = "fragment_cache___fragment_cache_0.2.1.tgz"; - path = fetchurl { - name = "fragment_cache___fragment_cache_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz"; - sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; - }; - } - { - name = "fresh___fresh_0.5.2.tgz"; - path = fetchurl { - name = "fresh___fresh_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; - }; - } - { - name = "from2___from2_2.3.0.tgz"; - path = fetchurl { - name = "from2___from2_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; - sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; - }; - } - { - name = "front_matter___front_matter_2.1.2.tgz"; - path = fetchurl { - name = "front_matter___front_matter_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/front-matter/-/front-matter-2.1.2.tgz"; - sha1 = "f75983b9f2f413be658c93dfd7bd8ce4078f5cdb"; - }; - } - { - name = "fs_extra___fs_extra_3.0.1.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz"; - sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; - }; - } - { - name = "fs_extra___fs_extra_8.1.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; - sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; - }; - } - { - name = "fs_minipass___fs_minipass_2.1.0.tgz"; - path = fetchurl { - name = "fs_minipass___fs_minipass_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; - sha1 = "7f5036fdbf12c63c169190cbe4199c852271f9fb"; - }; - } - { - name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; - path = fetchurl { - name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; - sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; - }; - } - { - name = "fs.realpath___fs.realpath_1.0.0.tgz"; - path = fetchurl { - name = "fs.realpath___fs.realpath_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - } - { - name = "fsevents___fsevents_1.2.13.tgz"; - path = fetchurl { - name = "fsevents___fsevents_1.2.13.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; - sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38"; - }; - } - { - name = "fsevents___fsevents_2.1.3.tgz"; - path = fetchurl { - name = "fsevents___fsevents_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz"; - sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e"; - }; - } - { - name = "fsevents___fsevents_2.3.2.tgz"; - path = fetchurl { - name = "fsevents___fsevents_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; - sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; - }; - } - { - name = "function_bind___function_bind_1.1.1.tgz"; - path = fetchurl { - name = "function_bind___function_bind_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; - sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; - }; - } - { - name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; - path = fetchurl { - name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; - }; - } - { - name = "gauge___gauge_2.7.4.tgz"; - path = fetchurl { - name = "gauge___gauge_2.7.4.tgz"; - url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; - }; - } - { - name = "generate_function___generate_function_2.3.1.tgz"; - path = fetchurl { - name = "generate_function___generate_function_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz"; - sha1 = "f069617690c10c868e73b8465746764f97c3479f"; - }; - } - { - name = "generate_object_property___generate_object_property_1.2.0.tgz"; - path = fetchurl { - name = "generate_object_property___generate_object_property_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - } - { - name = "gensync___gensync_1.0.0_beta.2.tgz"; - path = fetchurl { - name = "gensync___gensync_1.0.0_beta.2.tgz"; - url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz"; - sha1 = "32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"; - }; - } - { - name = "get_caller_file___get_caller_file_2.0.5.tgz"; - path = fetchurl { - name = "get_caller_file___get_caller_file_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; - }; - } - { - name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; - path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; - sha1 = "15f59f376f855c446963948f0d24cd3637b4abc6"; - }; - } - { - name = "get_package_type___get_package_type_0.1.0.tgz"; - path = fetchurl { - name = "get_package_type___get_package_type_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz"; - sha1 = "8de2d803cff44df3bc6c456e6668b36c3926e11a"; - }; - } - { - name = "get_stream___get_stream_4.1.0.tgz"; - path = fetchurl { - name = "get_stream___get_stream_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; - sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; - }; - } - { - name = "get_stream___get_stream_5.2.0.tgz"; - path = fetchurl { - name = "get_stream___get_stream_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; - sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; - }; - } - { - name = "get_value___get_value_2.0.6.tgz"; - path = fetchurl { - name = "get_value___get_value_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"; - sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; - }; - } - { - name = "getpass___getpass_0.1.7.tgz"; - path = fetchurl { - name = "getpass___getpass_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; - }; - } - { - name = "glob_parent___glob_parent_3.1.0.tgz"; - path = fetchurl { - name = "glob_parent___glob_parent_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz"; - sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; - }; - } - { - name = "glob_parent___glob_parent_5.1.1.tgz"; - path = fetchurl { - name = "glob_parent___glob_parent_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; - sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; - }; - } - { - name = "glob___glob_7.1.7.tgz"; - path = fetchurl { - name = "glob___glob_7.1.7.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; - sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; - }; - } - { - name = "global_modules___global_modules_1.0.0.tgz"; - path = fetchurl { - name = "global_modules___global_modules_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz"; - sha1 = "6d770f0eb523ac78164d72b5e71a8877265cc3ea"; - }; - } - { - name = "global_modules___global_modules_2.0.0.tgz"; - path = fetchurl { - name = "global_modules___global_modules_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; - sha1 = "997605ad2345f27f51539bea26574421215c7780"; - }; - } - { - name = "global_prefix___global_prefix_1.0.2.tgz"; - path = fetchurl { - name = "global_prefix___global_prefix_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz"; - sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; - }; - } - { - name = "global_prefix___global_prefix_3.0.0.tgz"; - path = fetchurl { - name = "global_prefix___global_prefix_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz"; - sha1 = "fc85f73064df69f50421f47f883fe5b913ba9b97"; - }; - } - { - name = "globals___globals_11.12.0.tgz"; - path = fetchurl { - name = "globals___globals_11.12.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; - sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e"; - }; - } - { - name = "globals___globals_12.3.0.tgz"; - path = fetchurl { - name = "globals___globals_12.3.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz"; - sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13"; - }; - } - { - name = "globals___globals_13.6.0.tgz"; - path = fetchurl { - name = "globals___globals_13.6.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.6.0.tgz"; - sha1 = "d77138e53738567bb96a3916ff6f6b487af20ef7"; - }; - } - { - name = "globals___globals_9.18.0.tgz"; - path = fetchurl { - name = "globals___globals_9.18.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz"; - sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; - }; - } - { - name = "globby___globby_6.1.0.tgz"; - path = fetchurl { - name = "globby___globby_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz"; - sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; - }; - } - { - name = "globule___globule_1.3.2.tgz"; - path = fetchurl { - name = "globule___globule_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz"; - sha1 = "d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4"; - }; - } - { - name = "gonzales_pe_sl___gonzales_pe_sl_4.2.3.tgz"; - path = fetchurl { - name = "gonzales_pe_sl___gonzales_pe_sl_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/gonzales-pe-sl/-/gonzales-pe-sl-4.2.3.tgz"; - sha1 = "6a868bc380645f141feeb042c6f97fcc71b59fe6"; - }; - } - { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; - }; - } - { - name = "growly___growly_1.3.0.tgz"; - path = fetchurl { - name = "growly___growly_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz"; - sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; - }; - } - { - name = "gzip_size___gzip_size_6.0.0.tgz"; - path = fetchurl { - name = "gzip_size___gzip_size_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz"; - sha1 = "065367fd50c239c0671cbcbad5be3e2eeb10e462"; - }; - } - { - name = "handle_thing___handle_thing_2.0.1.tgz"; - path = fetchurl { - name = "handle_thing___handle_thing_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz"; - sha1 = "857f79ce359580c340d43081cc648970d0bb234e"; - }; - } - { - name = "har_schema___har_schema_2.0.0.tgz"; - path = fetchurl { - name = "har_schema___har_schema_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; - }; - } - { - name = "har_validator___har_validator_5.1.5.tgz"; - path = fetchurl { - name = "har_validator___har_validator_5.1.5.tgz"; - url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; - sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; - }; - } - { - name = "has_ansi___has_ansi_2.0.0.tgz"; - path = fetchurl { - name = "has_ansi___has_ansi_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - } - { - name = "has_bigints___has_bigints_1.0.1.tgz"; - path = fetchurl { - name = "has_bigints___has_bigints_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz"; - sha1 = "64fe6acb020673e3b78db035a5af69aa9d07b113"; - }; - } - { - name = "has_flag___has_flag_1.0.0.tgz"; - path = fetchurl { - name = "has_flag___has_flag_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz"; - sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; - }; - } - { - name = "has_flag___has_flag_3.0.0.tgz"; - path = fetchurl { - name = "has_flag___has_flag_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; - }; - } - { - name = "has_flag___has_flag_4.0.0.tgz"; - path = fetchurl { - name = "has_flag___has_flag_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; - sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; - }; - } - { - name = "has_symbols___has_symbols_1.0.1.tgz"; - path = fetchurl { - name = "has_symbols___has_symbols_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; - sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; - }; - } - { - name = "has_symbols___has_symbols_1.0.2.tgz"; - path = fetchurl { - name = "has_symbols___has_symbols_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; - sha1 = "165d3070c00309752a1236a479331e3ac56f1423"; - }; - } - { - name = "has_unicode___has_unicode_2.0.1.tgz"; - path = fetchurl { - name = "has_unicode___has_unicode_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; - }; - } - { - name = "has_value___has_value_0.3.1.tgz"; - path = fetchurl { - name = "has_value___has_value_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz"; - sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; - }; - } - { - name = "has_value___has_value_1.0.0.tgz"; - path = fetchurl { - name = "has_value___has_value_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz"; - sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; - }; - } - { - name = "has_values___has_values_0.1.4.tgz"; - path = fetchurl { - name = "has_values___has_values_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz"; - sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; - }; - } - { - name = "has_values___has_values_1.0.0.tgz"; - path = fetchurl { - name = "has_values___has_values_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz"; - sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; - }; - } - { - name = "has___has_1.0.3.tgz"; - path = fetchurl { - name = "has___has_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; - sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; - }; - } - { - name = "hash_base___hash_base_3.1.0.tgz"; - path = fetchurl { - name = "hash_base___hash_base_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz"; - sha1 = "55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"; - }; - } - { - name = "hash.js___hash.js_1.1.7.tgz"; - path = fetchurl { - name = "hash.js___hash.js_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz"; - sha1 = "0babca538e8d4ee4a0f8988d68866537a003cf42"; - }; - } - { - name = "hex_color_regex___hex_color_regex_1.1.0.tgz"; - path = fetchurl { - name = "hex_color_regex___hex_color_regex_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz"; - sha1 = "4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"; - }; - } - { - name = "history___history_4.10.1.tgz"; - path = fetchurl { - name = "history___history_4.10.1.tgz"; - url = "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz"; - sha1 = "33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"; - }; - } - { - name = "history___history_4.7.2.tgz"; - path = fetchurl { - name = "history___history_4.7.2.tgz"; - url = "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz"; - sha1 = "22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"; - }; - } - { - name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; - path = fetchurl { - name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; - sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; - }; - } - { - name = "hoist_non_react_statics___hoist_non_react_statics_2.5.5.tgz"; - path = fetchurl { - name = "hoist_non_react_statics___hoist_non_react_statics_2.5.5.tgz"; - url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz"; - sha1 = "c5903cf409c0dfd908f388e619d86b9c1174cb47"; - }; - } - { - name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; - path = fetchurl { - name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; - url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"; - sha1 = "ece0acaf71d62c2969c2ec59feff42a4b1a85b45"; - }; - } - { - name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; - path = fetchurl { - name = "homedir_polyfill___homedir_polyfill_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; - sha1 = "743298cef4e5af3e194161fbadcc2151d3a058e8"; - }; - } - { - name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; - path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; - sha1 = "dffc0bf9a21c02209090f2aa69429e1414daf3f9"; - }; - } - { - name = "hpack.js___hpack.js_2.1.6.tgz"; - path = fetchurl { - name = "hpack.js___hpack.js_2.1.6.tgz"; - url = "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz"; - sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; - }; - } - { - name = "hsl_regex___hsl_regex_1.0.0.tgz"; - path = fetchurl { - name = "hsl_regex___hsl_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz"; - sha1 = "d49330c789ed819e276a4c0d272dffa30b18fe6e"; - }; - } - { - name = "hsla_regex___hsla_regex_1.0.0.tgz"; - path = fetchurl { - name = "hsla_regex___hsla_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz"; - sha1 = "c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"; - }; - } - { - name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; - path = fetchurl { - name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"; - sha1 = "42a6dc4fd33f00281176e8b23759ca4e4fa185f3"; - }; - } - { - name = "html_entities___html_entities_1.3.1.tgz"; - path = fetchurl { - name = "html_entities___html_entities_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz"; - sha1 = "fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"; - }; - } - { - name = "html_escaper___html_escaper_2.0.2.tgz"; - path = fetchurl { - name = "html_escaper___html_escaper_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz"; - sha1 = "dfd60027da36a36dfcbe236262c00a5822681453"; - }; - } - { - name = "http_deceiver___http_deceiver_1.2.7.tgz"; - path = fetchurl { - name = "http_deceiver___http_deceiver_1.2.7.tgz"; - url = "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz"; - sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; - }; - } - { - name = "http_errors___http_errors_1.7.2.tgz"; - path = fetchurl { - name = "http_errors___http_errors_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; - sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; - }; - } - { - name = "http_errors___http_errors_1.6.3.tgz"; - path = fetchurl { - name = "http_errors___http_errors_1.6.3.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz"; - sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; - }; - } - { - name = "http_errors___http_errors_1.7.3.tgz"; - path = fetchurl { - name = "http_errors___http_errors_1.7.3.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; - sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06"; - }; - } - { - name = "http_link_header___http_link_header_1.0.3.tgz"; - path = fetchurl { - name = "http_link_header___http_link_header_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/http-link-header/-/http-link-header-1.0.3.tgz"; - sha1 = "abbc2cdc5e06dd7e196a4983adac08a2d085ec90"; - }; - } - { - name = "http_parser_js___http_parser_js_0.4.10.tgz"; - path = fetchurl { - name = "http_parser_js___http_parser_js_0.4.10.tgz"; - url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz"; - sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; - }; - } - { - name = "http_parser_js___http_parser_js_0.5.3.tgz"; - path = fetchurl { - name = "http_parser_js___http_parser_js_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz"; - sha1 = "01d2709c79d41698bb01d4decc5e9da4e4a033d9"; - }; - } - { - name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz"; - path = fetchurl { - name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz"; - sha1 = "183c7dc4aa1479150306498c210cdaf96080a43a"; - }; - } - { - name = "http_proxy___http_proxy_1.18.1.tgz"; - path = fetchurl { - name = "http_proxy___http_proxy_1.18.1.tgz"; - url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz"; - sha1 = "401541f0534884bbf95260334e72f88ee3976549"; - }; - } - { - name = "http_signature___http_signature_1.2.0.tgz"; - path = fetchurl { - name = "http_signature___http_signature_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; - }; - } - { - name = "https_browserify___https_browserify_1.0.0.tgz"; - path = fetchurl { - name = "https_browserify___https_browserify_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz"; - sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; - }; - } - { - name = "human_signals___human_signals_1.1.1.tgz"; - path = fetchurl { - name = "human_signals___human_signals_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz"; - sha1 = "c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"; - }; - } - { - name = "iconv_lite___iconv_lite_0.4.24.tgz"; - path = fetchurl { - name = "iconv_lite___iconv_lite_0.4.24.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; - }; - } - { - name = "icss_utils___icss_utils_5.1.0.tgz"; - path = fetchurl { - name = "icss_utils___icss_utils_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz"; - sha1 = "c6be6858abd013d768e98366ae47e25d5887b1ae"; - }; - } - { - name = "idb_keyval___idb_keyval_3.2.0.tgz"; - path = fetchurl { - name = "idb_keyval___idb_keyval_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/idb-keyval/-/idb-keyval-3.2.0.tgz"; - sha1 = "cbbf354deb5684b6cdc84376294fc05932845bd6"; - }; - } - { - name = "ieee754___ieee754_1.1.13.tgz"; - path = fetchurl { - name = "ieee754___ieee754_1.1.13.tgz"; - url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz"; - sha1 = "ec168558e95aa181fd87d37f55c32bbcb6708b84"; - }; - } - { - name = "iferr___iferr_0.1.5.tgz"; - path = fetchurl { - name = "iferr___iferr_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz"; - sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; - }; - } - { - name = "ignore___ignore_3.3.10.tgz"; - path = fetchurl { - name = "ignore___ignore_3.3.10.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz"; - sha1 = "0a97fb876986e8081c631160f8f9f389157f0043"; - }; - } - { - name = "ignore___ignore_4.0.6.tgz"; - path = fetchurl { - name = "ignore___ignore_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; - sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; - }; - } - { - name = "immutable___immutable_3.8.2.tgz"; - path = fetchurl { - name = "immutable___immutable_3.8.2.tgz"; - url = "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz"; - sha1 = "c2439951455bb39913daf281376f1530e104adf3"; - }; - } - { - name = "import_cwd___import_cwd_2.1.0.tgz"; - path = fetchurl { - name = "import_cwd___import_cwd_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz"; - sha1 = "aa6cf36e722761285cb371ec6519f53e2435b0a9"; - }; - } - { - name = "import_fresh___import_fresh_2.0.0.tgz"; - path = fetchurl { - name = "import_fresh___import_fresh_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz"; - sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; - }; - } - { - name = "import_fresh___import_fresh_3.2.1.tgz"; - path = fetchurl { - name = "import_fresh___import_fresh_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; - sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; - }; - } - { - name = "import_from___import_from_2.1.0.tgz"; - path = fetchurl { - name = "import_from___import_from_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz"; - sha1 = "335db7f2a7affd53aaa471d4b8021dee36b7f3b1"; - }; - } - { - name = "import_local___import_local_2.0.0.tgz"; - path = fetchurl { - name = "import_local___import_local_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz"; - sha1 = "55070be38a5993cf18ef6db7e961f5bee5c5a09d"; - }; - } - { - name = "import_local___import_local_3.0.2.tgz"; - path = fetchurl { - name = "import_local___import_local_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz"; - sha1 = "a8cfd0431d1de4a2199703d003e3e62364fa6db6"; - }; - } - { - name = "imports_loader___imports_loader_1.2.0.tgz"; - path = fetchurl { - name = "imports_loader___imports_loader_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/imports-loader/-/imports-loader-1.2.0.tgz"; - sha1 = "b06823d0bb42e6f5ff89bc893829000eda46693f"; - }; - } - { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - path = fetchurl { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; - }; - } - { - name = "indent_string___indent_string_4.0.0.tgz"; - path = fetchurl { - name = "indent_string___indent_string_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; - sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; - }; - } - { - name = "indexes_of___indexes_of_1.0.1.tgz"; - path = fetchurl { - name = "indexes_of___indexes_of_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz"; - sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; - }; - } - { - name = "infer_owner___infer_owner_1.0.4.tgz"; - path = fetchurl { - name = "infer_owner___infer_owner_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz"; - sha1 = "c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"; - }; - } - { - name = "inflight___inflight_1.0.6.tgz"; - path = fetchurl { - name = "inflight___inflight_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; - }; - } - { - name = "inherits___inherits_2.0.4.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; - }; - } - { - name = "inherits___inherits_2.0.1.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }; - } - { - name = "inherits___inherits_2.0.3.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - } - { - name = "ini___ini_1.3.7.tgz"; - path = fetchurl { - name = "ini___ini_1.3.7.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz"; - sha1 = "a09363e1911972ea16d7a8851005d84cf09a9a84"; - }; - } - { - name = "inquirer___inquirer_0.12.0.tgz"; - path = fetchurl { - name = "inquirer___inquirer_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz"; - sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; - }; - } - { - name = "internal_ip___internal_ip_4.3.0.tgz"; - path = fetchurl { - name = "internal_ip___internal_ip_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz"; - sha1 = "845452baad9d2ca3b69c635a137acb9a0dad0907"; - }; - } - { - name = "internal_slot___internal_slot_1.0.3.tgz"; - path = fetchurl { - name = "internal_slot___internal_slot_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; - sha1 = "7347e307deeea2faac2ac6205d4bc7d34967f59c"; - }; - } - { - name = "interpret___interpret_1.4.0.tgz"; - path = fetchurl { - name = "interpret___interpret_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz"; - sha1 = "665ab8bc4da27a774a40584e812e3e0fa45b1a1e"; - }; - } - { - name = "intersection_observer___intersection_observer_0.12.0.tgz"; - path = fetchurl { - name = "intersection_observer___intersection_observer_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.12.0.tgz"; - sha1 = "6c84628f67ce8698e5f9ccf857d97718745837aa"; - }; - } - { - name = "intl_format_cache___intl_format_cache_2.2.9.tgz"; - path = fetchurl { - name = "intl_format_cache___intl_format_cache_2.2.9.tgz"; - url = "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-2.2.9.tgz"; - sha1 = "fb560de20c549cda20b569cf1ffb6dc62b5b93b4"; - }; - } - { - name = "intl_messageformat_parser___intl_messageformat_parser_1.4.0.tgz"; - path = fetchurl { - name = "intl_messageformat_parser___intl_messageformat_parser_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz"; - sha1 = "b43d45a97468cadbe44331d74bb1e8dea44fc075"; - }; - } - { - name = "intl_messageformat_parser___intl_messageformat_parser_4.1.4.tgz"; - path = fetchurl { - name = "intl_messageformat_parser___intl_messageformat_parser_4.1.4.tgz"; - url = "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-4.1.4.tgz"; - sha1 = "98f3415e6990d44bebf2e0ad8e4cfbacf3ef5ed3"; - }; - } - { - name = "intl_messageformat___intl_messageformat_2.2.0.tgz"; - path = fetchurl { - name = "intl_messageformat___intl_messageformat_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-2.2.0.tgz"; - sha1 = "345bcd46de630b7683330c2e52177ff5eab484fc"; - }; - } - { - name = "intl_relativeformat___intl_relativeformat_2.2.0.tgz"; - path = fetchurl { - name = "intl_relativeformat___intl_relativeformat_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz"; - sha1 = "6aca95d019ec8d30b6c5653b6629f9983ea5b6c5"; - }; - } - { - name = "intl_relativeformat___intl_relativeformat_6.4.3.tgz"; - path = fetchurl { - name = "intl_relativeformat___intl_relativeformat_6.4.3.tgz"; - url = "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-6.4.3.tgz"; - sha1 = "cb5559e1e257cc2e763583502012a354bb777efe"; - }; - } - { - name = "intl___intl_1.2.5.tgz"; - path = fetchurl { - name = "intl___intl_1.2.5.tgz"; - url = "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz"; - sha1 = "82244a2190c4e419f8371f5aa34daa3420e2abde"; - }; - } - { - name = "invariant___invariant_2.2.4.tgz"; - path = fetchurl { - name = "invariant___invariant_2.2.4.tgz"; - url = "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz"; - sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6"; - }; - } - { - name = "ip_regex___ip_regex_2.1.0.tgz"; - path = fetchurl { - name = "ip_regex___ip_regex_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz"; - sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; - }; - } - { - name = "ip___ip_1.1.5.tgz"; - path = fetchurl { - name = "ip___ip_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz"; - sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; - }; - } - { - name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; - path = fetchurl { - name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; - }; - } - { - name = "is_absolute_url___is_absolute_url_2.1.0.tgz"; - path = fetchurl { - name = "is_absolute_url___is_absolute_url_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz"; - sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"; - }; - } - { - name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; - path = fetchurl { - name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; - sha1 = "96c6a22b6a23929b11ea0afb1836c36ad4a5d698"; - }; - } - { - name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; - path = fetchurl { - name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; - url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; - }; - } - { - name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; - path = fetchurl { - name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656"; - }; - } - { - name = "is_arguments___is_arguments_1.0.4.tgz"; - path = fetchurl { - name = "is_arguments___is_arguments_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz"; - sha1 = "3faf966c7cba0ff437fb31f6250082fcf0448cf3"; - }; - } - { - name = "is_arrayish___is_arrayish_0.2.1.tgz"; - path = fetchurl { - name = "is_arrayish___is_arrayish_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; - }; - } - { - name = "is_arrayish___is_arrayish_0.3.2.tgz"; - path = fetchurl { - name = "is_arrayish___is_arrayish_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz"; - sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03"; - }; - } - { - name = "is_bigint___is_bigint_1.0.2.tgz"; - path = fetchurl { - name = "is_bigint___is_bigint_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz"; - sha1 = "ffb381442503235ad245ea89e45b3dbff040ee5a"; - }; - } - { - name = "is_binary_path___is_binary_path_1.0.1.tgz"; - path = fetchurl { - name = "is_binary_path___is_binary_path_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz"; - sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; - }; - } - { - name = "is_binary_path___is_binary_path_2.1.0.tgz"; - path = fetchurl { - name = "is_binary_path___is_binary_path_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; - sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; - }; - } - { - name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; - path = fetchurl { - name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz"; - sha1 = "3c0878f035cb821228d350d2e1e36719716a3de8"; - }; - } - { - name = "is_buffer___is_buffer_1.1.6.tgz"; - path = fetchurl { - name = "is_buffer___is_buffer_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; - sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; - }; - } - { - name = "is_callable___is_callable_1.2.2.tgz"; - path = fetchurl { - name = "is_callable___is_callable_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz"; - sha1 = "c7c6715cd22d4ddb48d3e19970223aceabb080d9"; - }; - } - { - name = "is_callable___is_callable_1.2.3.tgz"; - path = fetchurl { - name = "is_callable___is_callable_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz"; - sha1 = "8b1e0500b73a1d76c70487636f368e519de8db8e"; - }; - } - { - name = "is_ci___is_ci_2.0.0.tgz"; - path = fetchurl { - name = "is_ci___is_ci_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; - sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c"; - }; - } - { - name = "is_ci___is_ci_3.0.0.tgz"; - path = fetchurl { - name = "is_ci___is_ci_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.0.tgz"; - sha1 = "c7e7be3c9d8eef7d0fa144390bd1e4b88dc4c994"; - }; - } - { - name = "is_color_stop___is_color_stop_1.1.0.tgz"; - path = fetchurl { - name = "is_color_stop___is_color_stop_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz"; - sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; - }; - } - { - name = "is_core_module___is_core_module_2.4.0.tgz"; - path = fetchurl { - name = "is_core_module___is_core_module_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz"; - sha1 = "8e9fc8e15027b011418026e98f0e6f4d86305cc1"; - }; - } - { - name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; - path = fetchurl { - name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; - }; - } - { - name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; - path = fetchurl { - name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha1 = "d84876321d0e7add03990406abbbbd36ba9268c7"; - }; - } - { - name = "is_date_object___is_date_object_1.0.2.tgz"; - path = fetchurl { - name = "is_date_object___is_date_object_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; - sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; - }; - } - { - name = "is_descriptor___is_descriptor_0.1.6.tgz"; - path = fetchurl { - name = "is_descriptor___is_descriptor_0.1.6.tgz"; - url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha1 = "366d8240dde487ca51823b1ab9f07a10a78251ca"; - }; - } - { - name = "is_descriptor___is_descriptor_1.0.2.tgz"; - path = fetchurl { - name = "is_descriptor___is_descriptor_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec"; - }; - } - { - name = "is_directory___is_directory_0.3.1.tgz"; - path = fetchurl { - name = "is_directory___is_directory_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz"; - sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; - }; - } - { - name = "is_docker___is_docker_2.1.1.tgz"; - path = fetchurl { - name = "is_docker___is_docker_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz"; - sha1 = "4125a88e44e450d384e09047ede71adc2d144156"; - }; - } - { - name = "is_electron___is_electron_2.2.0.tgz"; - path = fetchurl { - name = "is_electron___is_electron_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-electron/-/is-electron-2.2.0.tgz"; - sha1 = "8943084f09e8b731b3a7a0298a7b5d56f6b7eef0"; - }; - } - { - name = "is_extendable___is_extendable_0.1.1.tgz"; - path = fetchurl { - name = "is_extendable___is_extendable_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz"; - sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; - }; - } - { - name = "is_extendable___is_extendable_1.0.1.tgz"; - path = fetchurl { - name = "is_extendable___is_extendable_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"; - sha1 = "a7470f9e426733d81bd81e1155264e3a3507cab4"; - }; - } - { - name = "is_extglob___is_extglob_2.1.1.tgz"; - path = fetchurl { - name = "is_extglob___is_extglob_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; - }; - } - { - name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; - path = fetchurl { - name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz"; - sha1 = "7d140adc389aaf3011a8f2a2a4cfa6faadffb118"; - }; - } - { - name = "is_glob___is_glob_3.1.0.tgz"; - path = fetchurl { - name = "is_glob___is_glob_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz"; - sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; - }; - } - { - name = "is_glob___is_glob_4.0.1.tgz"; - path = fetchurl { - name = "is_glob___is_glob_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; - sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; - }; - } - { - name = "is_my_ip_valid___is_my_ip_valid_1.0.0.tgz"; - path = fetchurl { - name = "is_my_ip_valid___is_my_ip_valid_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz"; - sha1 = "7b351b8e8edd4d3995d4d066680e664d94696824"; - }; - } - { - name = "is_my_json_valid___is_my_json_valid_2.20.5.tgz"; - path = fetchurl { - name = "is_my_json_valid___is_my_json_valid_2.20.5.tgz"; - url = "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz"; - sha1 = "5eca6a8232a687f68869b7361be1612e7512e5df"; - }; - } - { - name = "is_nan___is_nan_1.3.2.tgz"; - path = fetchurl { - name = "is_nan___is_nan_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz"; - sha1 = "043a54adea31748b55b6cd4e09aadafa69bd9e1d"; - }; - } - { - name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; - path = fetchurl { - name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; - sha1 = "3de746c18dda2319241a53675908d8f766f11c24"; - }; - } - { - name = "is_number_object___is_number_object_1.0.5.tgz"; - path = fetchurl { - name = "is_number_object___is_number_object_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz"; - sha1 = "6edfaeed7950cff19afedce9fbfca9ee6dd289eb"; - }; - } - { - name = "is_number___is_number_3.0.0.tgz"; - path = fetchurl { - name = "is_number___is_number_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz"; - sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; - }; - } - { - name = "is_number___is_number_7.0.0.tgz"; - path = fetchurl { - name = "is_number___is_number_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; - sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; - }; - } - { - name = "is_obj___is_obj_2.0.0.tgz"; - path = fetchurl { - name = "is_obj___is_obj_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; - sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; - }; - } - { - name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; - path = fetchurl { - name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; - sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb"; - }; - } - { - name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; - path = fetchurl { - name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; - sha1 = "bfe2dca26c69f397265a4009963602935a053acb"; - }; - } - { - name = "is_path_inside___is_path_inside_2.1.0.tgz"; - path = fetchurl { - name = "is_path_inside___is_path_inside_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz"; - sha1 = "7c9810587d659a40d27bcdb4d5616eab059494b2"; - }; - } - { - name = "is_plain_object___is_plain_object_2.0.4.tgz"; - path = fetchurl { - name = "is_plain_object___is_plain_object_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; - }; - } - { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; - path = fetchurl { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz"; - sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; - }; - } - { - name = "is_property___is_property_1.0.2.tgz"; - path = fetchurl { - name = "is_property___is_property_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; - }; - } - { - name = "is_regex___is_regex_1.1.0.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz"; - sha1 = "ece38e389e490df0dc21caea2bd596f987f767ff"; - }; - } - { - name = "is_regex___is_regex_1.1.1.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz"; - sha1 = "c6f98aacc546f6cec5468a07b7b153ab564a57b9"; - }; - } - { - name = "is_regex___is_regex_1.1.3.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz"; - sha1 = "d029f9aff6448b93ebbe3f33dac71511fdcbef9f"; - }; - } - { - name = "is_resolvable___is_resolvable_1.1.0.tgz"; - path = fetchurl { - name = "is_resolvable___is_resolvable_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz"; - sha1 = "fb18f87ce1feb925169c9a407c19318a3206ed88"; - }; - } - { - name = "is_stream___is_stream_1.1.0.tgz"; - path = fetchurl { - name = "is_stream___is_stream_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; - }; - } - { - name = "is_stream___is_stream_2.0.0.tgz"; - path = fetchurl { - name = "is_stream___is_stream_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz"; - sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3"; - }; - } - { - name = "is_string___is_string_1.0.5.tgz"; - path = fetchurl { - name = "is_string___is_string_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; - sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; - }; - } - { - name = "is_string___is_string_1.0.6.tgz"; - path = fetchurl { - name = "is_string___is_string_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz"; - sha1 = "3fe5d5992fb0d93404f32584d4b0179a71b54a5f"; - }; - } - { - name = "is_symbol___is_symbol_1.0.3.tgz"; - path = fetchurl { - name = "is_symbol___is_symbol_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; - sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; - }; - } - { - name = "is_symbol___is_symbol_1.0.4.tgz"; - path = fetchurl { - name = "is_symbol___is_symbol_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz"; - sha1 = "a6dac93b635b063ca6872236de88910a57af139c"; - }; - } - { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - path = fetchurl { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - } - { - name = "is_url___is_url_1.2.4.tgz"; - path = fetchurl { - name = "is_url___is_url_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz"; - sha1 = "04a4df46d28c4cff3d73d01ff06abeb318a1aa52"; - }; - } - { - name = "is_windows___is_windows_1.0.2.tgz"; - path = fetchurl { - name = "is_windows___is_windows_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; - sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d"; - }; - } - { - name = "is_wsl___is_wsl_1.1.0.tgz"; - path = fetchurl { - name = "is_wsl___is_wsl_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz"; - sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; - }; - } - { - name = "is_wsl___is_wsl_2.2.0.tgz"; - path = fetchurl { - name = "is_wsl___is_wsl_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; - sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271"; - }; - } - { - name = "isarray___isarray_0.0.1.tgz"; - path = fetchurl { - name = "isarray___isarray_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - } - { - name = "isarray___isarray_1.0.0.tgz"; - path = fetchurl { - name = "isarray___isarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; - }; - } - { - name = "isexe___isexe_2.0.0.tgz"; - path = fetchurl { - name = "isexe___isexe_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; - }; - } - { - name = "isobject___isobject_2.1.0.tgz"; - path = fetchurl { - name = "isobject___isobject_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; - }; - } - { - name = "isobject___isobject_3.0.1.tgz"; - path = fetchurl { - name = "isobject___isobject_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; - sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; - }; - } - { - name = "isstream___isstream_0.1.2.tgz"; - path = fetchurl { - name = "isstream___isstream_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - } - { - name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz"; - path = fetchurl { - name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"; - sha1 = "f5944a37c70b550b02a78a5c3b2055b280cec8ec"; - }; - } - { - name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz"; - path = fetchurl { - name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz"; - sha1 = "873c6fff897450118222774696a3f28902d77c1d"; - }; - } - { - name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; - path = fetchurl { - name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha1 = "7518fe52ea44de372f460a76b5ecda9ffb73d8a6"; - }; - } - { - name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; - path = fetchurl { - name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz"; - sha1 = "75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"; - }; - } - { - name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; - path = fetchurl { - name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz"; - sha1 = "d593210e5000683750cb09fc0644e4b6e27fd53b"; - }; - } - { - name = "jest_changed_files___jest_changed_files_26.6.2.tgz"; - path = fetchurl { - name = "jest_changed_files___jest_changed_files_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz"; - sha1 = "f6198479e1cc66f22f9ae1e22acaa0b429c042d0"; - }; - } - { - name = "jest_cli___jest_cli_26.6.3.tgz"; - path = fetchurl { - name = "jest_cli___jest_cli_26.6.3.tgz"; - url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz"; - sha1 = "43117cfef24bc4cd691a174a8796a532e135e92a"; - }; - } - { - name = "jest_config___jest_config_26.6.3.tgz"; - path = fetchurl { - name = "jest_config___jest_config_26.6.3.tgz"; - url = "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz"; - sha1 = "64f41444eef9eb03dc51d5c53b75c8c71f645349"; - }; - } - { - name = "jest_diff___jest_diff_25.5.0.tgz"; - path = fetchurl { - name = "jest_diff___jest_diff_25.5.0.tgz"; - url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz"; - sha1 = "1dd26ed64f96667c068cef026b677dfa01afcfa9"; - }; - } - { - name = "jest_diff___jest_diff_26.6.2.tgz"; - path = fetchurl { - name = "jest_diff___jest_diff_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz"; - sha1 = "1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"; - }; - } - { - name = "jest_docblock___jest_docblock_26.0.0.tgz"; - path = fetchurl { - name = "jest_docblock___jest_docblock_26.0.0.tgz"; - url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz"; - sha1 = "3e2fa20899fc928cb13bd0ff68bd3711a36889b5"; - }; - } - { - name = "jest_each___jest_each_26.6.2.tgz"; - path = fetchurl { - name = "jest_each___jest_each_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz"; - sha1 = "02526438a77a67401c8a6382dfe5999952c167cb"; - }; - } - { - name = "jest_environment_jsdom___jest_environment_jsdom_26.6.2.tgz"; - path = fetchurl { - name = "jest_environment_jsdom___jest_environment_jsdom_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz"; - sha1 = "78d09fe9cf019a357009b9b7e1f101d23bd1da3e"; - }; - } - { - name = "jest_environment_node___jest_environment_node_26.6.2.tgz"; - path = fetchurl { - name = "jest_environment_node___jest_environment_node_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz"; - sha1 = "824e4c7fb4944646356f11ac75b229b0035f2b0c"; - }; - } - { - name = "jest_get_type___jest_get_type_25.2.6.tgz"; - path = fetchurl { - name = "jest_get_type___jest_get_type_25.2.6.tgz"; - url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz"; - sha1 = "0b0a32fab8908b44d508be81681487dbabb8d877"; - }; - } - { - name = "jest_get_type___jest_get_type_26.3.0.tgz"; - path = fetchurl { - name = "jest_get_type___jest_get_type_26.3.0.tgz"; - url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz"; - sha1 = "e97dc3c3f53c2b406ca7afaed4493b1d099199e0"; - }; - } - { - name = "jest_haste_map___jest_haste_map_26.6.2.tgz"; - path = fetchurl { - name = "jest_haste_map___jest_haste_map_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz"; - sha1 = "dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"; - }; - } - { - name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; - path = fetchurl { - name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz"; - sha1 = "3f1819400c671237e48b4d4b76a80a0dbed7577f"; - }; - } - { - name = "jest_jasmine2___jest_jasmine2_26.6.3.tgz"; - path = fetchurl { - name = "jest_jasmine2___jest_jasmine2_26.6.3.tgz"; - url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz"; - sha1 = "adc3cf915deacb5212c93b9f3547cd12958f2edd"; - }; - } - { - name = "jest_leak_detector___jest_leak_detector_26.6.2.tgz"; - path = fetchurl { - name = "jest_leak_detector___jest_leak_detector_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz"; - sha1 = "7717cf118b92238f2eba65054c8a0c9c653a91af"; - }; - } - { - name = "jest_matcher_utils___jest_matcher_utils_26.6.2.tgz"; - path = fetchurl { - name = "jest_matcher_utils___jest_matcher_utils_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz"; - sha1 = "8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"; - }; - } - { - name = "jest_message_util___jest_message_util_26.6.2.tgz"; - path = fetchurl { - name = "jest_message_util___jest_message_util_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz"; - sha1 = "58173744ad6fc0506b5d21150b9be56ef001ca07"; - }; - } - { - name = "jest_mock___jest_mock_26.6.2.tgz"; - path = fetchurl { - name = "jest_mock___jest_mock_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz"; - sha1 = "d6cb712b041ed47fe0d9b6fc3474bc6543feb302"; - }; - } - { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; - path = fetchurl { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"; - sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c"; - }; - } - { - name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; - path = fetchurl { - name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; - url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz"; - sha1 = "d25e7184b36e39fd466c3bc41be0971e821fee28"; - }; - } - { - name = "jest_regex_util___jest_regex_util_27.0.1.tgz"; - path = fetchurl { - name = "jest_regex_util___jest_regex_util_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.1.tgz"; - sha1 = "69d4b1bf5b690faa3490113c47486ed85dd45b68"; - }; - } - { - name = "jest_resolve_dependencies___jest_resolve_dependencies_26.6.3.tgz"; - path = fetchurl { - name = "jest_resolve_dependencies___jest_resolve_dependencies_26.6.3.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz"; - sha1 = "6680859ee5d22ee5dcd961fe4871f59f4c784fb6"; - }; - } - { - name = "jest_resolve___jest_resolve_26.6.2.tgz"; - path = fetchurl { - name = "jest_resolve___jest_resolve_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz"; - sha1 = "a3ab1517217f469b504f1b56603c5bb541fbb507"; - }; - } - { - name = "jest_runner___jest_runner_26.6.3.tgz"; - path = fetchurl { - name = "jest_runner___jest_runner_26.6.3.tgz"; - url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz"; - sha1 = "2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"; - }; - } - { - name = "jest_runtime___jest_runtime_26.6.3.tgz"; - path = fetchurl { - name = "jest_runtime___jest_runtime_26.6.3.tgz"; - url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz"; - sha1 = "4f64efbcfac398331b74b4b3c82d27d401b8fa2b"; - }; - } - { - name = "jest_serializer___jest_serializer_26.6.2.tgz"; - path = fetchurl { - name = "jest_serializer___jest_serializer_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz"; - sha1 = "d139aafd46957d3a448f3a6cdabe2919ba0742d1"; - }; - } - { - name = "jest_serializer___jest_serializer_27.0.1.tgz"; - path = fetchurl { - name = "jest_serializer___jest_serializer_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.1.tgz"; - sha1 = "2464d04dcc33fb71dc80b7c82e3c5e8a08cb1020"; - }; - } - { - name = "jest_snapshot___jest_snapshot_26.6.2.tgz"; - path = fetchurl { - name = "jest_snapshot___jest_snapshot_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz"; - sha1 = "f3b0af1acb223316850bd14e1beea9837fb39c84"; - }; - } - { - name = "jest_util___jest_util_26.6.2.tgz"; - path = fetchurl { - name = "jest_util___jest_util_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz"; - sha1 = "907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"; - }; - } - { - name = "jest_util___jest_util_27.0.2.tgz"; - path = fetchurl { - name = "jest_util___jest_util_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.2.tgz"; - sha1 = "fc2c7ace3c75ae561cf1e5fdb643bf685a5be7c7"; - }; - } - { - name = "jest_validate___jest_validate_26.6.2.tgz"; - path = fetchurl { - name = "jest_validate___jest_validate_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz"; - sha1 = "23d380971587150467342911c3d7b4ac57ab20ec"; - }; - } - { - name = "jest_watcher___jest_watcher_26.6.2.tgz"; - path = fetchurl { - name = "jest_watcher___jest_watcher_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz"; - sha1 = "a5b683b8f9d68dbcb1d7dae32172d2cca0592975"; - }; - } - { - name = "jest_worker___jest_worker_26.5.0.tgz"; - path = fetchurl { - name = "jest_worker___jest_worker_26.5.0.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz"; - sha1 = "87deee86dbbc5f98d9919e0dadf2c40e3152fa30"; - }; - } - { - name = "jest_worker___jest_worker_26.6.2.tgz"; - path = fetchurl { - name = "jest_worker___jest_worker_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz"; - sha1 = "7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"; - }; - } - { - name = "jest_worker___jest_worker_27.0.2.tgz"; - path = fetchurl { - name = "jest_worker___jest_worker_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz"; - sha1 = "4ebeb56cef48b3e7514552f80d0d80c0129f0b05"; - }; - } - { - name = "jest___jest_26.6.3.tgz"; - path = fetchurl { - name = "jest___jest_26.6.3.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz"; - sha1 = "40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"; - }; - } - { - name = "js_base64___js_base64_2.6.4.tgz"; - path = fetchurl { - name = "js_base64___js_base64_2.6.4.tgz"; - url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz"; - sha1 = "f4e686c5de1ea1f867dbcad3d46d969428df98c4"; - }; - } - { - name = "js_tokens___js_tokens_4.0.0.tgz"; - path = fetchurl { - name = "js_tokens___js_tokens_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; - sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; - }; - } - { - name = "js_yaml___js_yaml_3.14.1.tgz"; - path = fetchurl { - name = "js_yaml___js_yaml_3.14.1.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; - sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; - }; - } - { - name = "js_yaml___js_yaml_4.1.0.tgz"; - path = fetchurl { - name = "js_yaml___js_yaml_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; - sha1 = "c1fb65f8f5017901cdd2c951864ba18458a10602"; - }; - } - { - name = "jsbn___jsbn_0.1.1.tgz"; - path = fetchurl { - name = "jsbn___jsbn_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - } - { - name = "jsdom___jsdom_16.4.0.tgz"; - path = fetchurl { - name = "jsdom___jsdom_16.4.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz"; - sha1 = "36005bde2d136f73eee1a830c6d45e55408edddb"; - }; - } - { - name = "jsesc___jsesc_2.5.2.tgz"; - path = fetchurl { - name = "jsesc___jsesc_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; - sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4"; - }; - } - { - name = "jsesc___jsesc_0.5.0.tgz"; - path = fetchurl { - name = "jsesc___jsesc_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; - sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; - }; - } - { - name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; - path = fetchurl { - name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; - sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; - }; - } - { - name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; - path = fetchurl { - name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; - }; - } - { - name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; - path = fetchurl { - name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; - sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; - }; - } - { - name = "json_schema___json_schema_0.2.3.tgz"; - path = fetchurl { - name = "json_schema___json_schema_0.2.3.tgz"; - url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - } - { - name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; - path = fetchurl { - name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; - }; - } - { - name = "json_stable_stringify___json_stable_stringify_1.0.1.tgz"; - path = fetchurl { - name = "json_stable_stringify___json_stable_stringify_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; - }; - } - { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - path = fetchurl { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - } - { - name = "json3___json3_3.3.3.tgz"; - path = fetchurl { - name = "json3___json3_3.3.3.tgz"; - url = "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz"; - sha1 = "7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"; - }; - } - { - name = "json5___json5_0.5.1.tgz"; - path = fetchurl { - name = "json5___json5_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; - }; - } - { - name = "json5___json5_1.0.1.tgz"; - path = fetchurl { - name = "json5___json5_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; - sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe"; - }; - } - { - name = "json5___json5_2.1.3.tgz"; - path = fetchurl { - name = "json5___json5_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; - sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; - }; - } - { - name = "jsonfile___jsonfile_3.0.1.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz"; - sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; - }; - } - { - name = "jsonfile___jsonfile_4.0.0.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; - }; - } - { - name = "jsonify___jsonify_0.0.0.tgz"; - path = fetchurl { - name = "jsonify___jsonify_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; - }; - } - { - name = "jsonpointer___jsonpointer_4.1.0.tgz"; - path = fetchurl { - name = "jsonpointer___jsonpointer_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.1.0.tgz"; - sha1 = "501fb89986a2389765ba09e6053299ceb4f2c2cc"; - }; - } - { - name = "jsprim___jsprim_1.4.1.tgz"; - path = fetchurl { - name = "jsprim___jsprim_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; - }; - } - { - name = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz"; - path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz"; - sha1 = "642f1d7b88aa6d7eb9d8f2210e166478444fa891"; - }; - } - { - name = "keycode___keycode_2.2.0.tgz"; - path = fetchurl { - name = "keycode___keycode_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz"; - sha1 = "3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"; - }; - } - { - name = "killable___killable_1.0.1.tgz"; - path = fetchurl { - name = "killable___killable_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz"; - sha1 = "4c8ce441187a061c7474fb87ca08e2a638194892"; - }; - } - { - name = "kind_of___kind_of_3.2.2.tgz"; - path = fetchurl { - name = "kind_of___kind_of_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; - }; - } - { - name = "kind_of___kind_of_4.0.0.tgz"; - path = fetchurl { - name = "kind_of___kind_of_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz"; - sha1 = "20813df3d712928b207378691a45066fae72dd57"; - }; - } - { - name = "kind_of___kind_of_5.1.0.tgz"; - path = fetchurl { - name = "kind_of___kind_of_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"; - sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d"; - }; - } - { - name = "kind_of___kind_of_6.0.3.tgz"; - path = fetchurl { - name = "kind_of___kind_of_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; - sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; - }; - } - { - name = "kleur___kleur_3.0.3.tgz"; - path = fetchurl { - name = "kleur___kleur_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz"; - sha1 = "a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"; - }; - } - { - name = "klona___klona_2.0.4.tgz"; - path = fetchurl { - name = "klona___klona_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz"; - sha1 = "7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"; - }; - } - { - name = "knot.js___knot.js_1.1.5.tgz"; - path = fetchurl { - name = "knot.js___knot.js_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/knot.js/-/knot.js-1.1.5.tgz"; - sha1 = "28e72522f703f50fe98812fde224dd72728fef5d"; - }; - } - { - name = "known_css_properties___known_css_properties_0.3.0.tgz"; - path = fetchurl { - name = "known_css_properties___known_css_properties_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.3.0.tgz"; - sha1 = "a3d135bbfc60ee8c6eacf2f7e7e6f2d4755e49a4"; - }; - } - { - name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz"; - path = fetchurl { - name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz"; - url = "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.20.tgz"; - sha1 = "a00a37121894f224f763268e431c55556b0c0755"; - }; - } - { - name = "language_tags___language_tags_1.0.5.tgz"; - path = fetchurl { - name = "language_tags___language_tags_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz"; - sha1 = "d321dbc4da30ba8bf3024e040fa5c14661f9193a"; - }; - } - { - name = "leven___leven_3.1.0.tgz"; - path = fetchurl { - name = "leven___leven_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz"; - sha1 = "77891de834064cccba82ae7842bb6b14a13ed7f2"; - }; - } - { - name = "levn___levn_0.3.0.tgz"; - path = fetchurl { - name = "levn___levn_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; - }; - } - { - name = "levn___levn_0.4.1.tgz"; - path = fetchurl { - name = "levn___levn_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; - sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; - }; - } - { - name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; - path = fetchurl { - name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; - sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; - }; - } - { - name = "load_json_file___load_json_file_4.0.0.tgz"; - path = fetchurl { - name = "load_json_file___load_json_file_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz"; - sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; - }; - } - { - name = "loader_runner___loader_runner_2.4.0.tgz"; - path = fetchurl { - name = "loader_runner___loader_runner_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz"; - sha1 = "ed47066bfe534d7e84c4c7b9998c2a75607d9357"; - }; - } - { - name = "loader_utils___loader_utils_0.2.17.tgz"; - path = fetchurl { - name = "loader_utils___loader_utils_0.2.17.tgz"; - url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz"; - sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348"; - }; - } - { - name = "loader_utils___loader_utils_1.4.0.tgz"; - path = fetchurl { - name = "loader_utils___loader_utils_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz"; - sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; - }; - } - { - name = "loader_utils___loader_utils_2.0.0.tgz"; - path = fetchurl { - name = "loader_utils___loader_utils_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz"; - sha1 = "e4cace5b816d425a166b5f097e10cd12b36064b0"; - }; - } - { - name = "locate_path___locate_path_2.0.0.tgz"; - path = fetchurl { - name = "locate_path___locate_path_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz"; - sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; - }; - } - { - name = "locate_path___locate_path_3.0.0.tgz"; - path = fetchurl { - name = "locate_path___locate_path_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz"; - sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; - }; - } - { - name = "locate_path___locate_path_5.0.0.tgz"; - path = fetchurl { - name = "locate_path___locate_path_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; - }; - } - { - name = "lockfile___lockfile_1.0.4.tgz"; - path = fetchurl { - name = "lockfile___lockfile_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz"; - sha1 = "07f819d25ae48f87e538e6578b6964a4981a5609"; - }; - } - { - name = "lodash.capitalize___lodash.capitalize_4.2.1.tgz"; - path = fetchurl { - name = "lodash.capitalize___lodash.capitalize_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz"; - sha1 = "f826c9b4e2a8511d84e3aca29db05e1a4f3b72a9"; - }; - } - { - name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; - path = fetchurl { - name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; - }; - } - { - name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; - path = fetchurl { - name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; - }; - } - { - name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; - path = fetchurl { - name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; - sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; - }; - } - { - name = "lodash.get___lodash.get_4.4.2.tgz"; - path = fetchurl { - name = "lodash.get___lodash.get_4.4.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz"; - sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; - }; - } - { - name = "lodash.has___lodash.has_4.5.2.tgz"; - path = fetchurl { - name = "lodash.has___lodash.has_4.5.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz"; - sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"; - }; - } - { - name = "lodash.isboolean___lodash.isboolean_3.0.3.tgz"; - path = fetchurl { - name = "lodash.isboolean___lodash.isboolean_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; - sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6"; - }; - } - { - name = "lodash.isequal___lodash.isequal_4.5.0.tgz"; - path = fetchurl { - name = "lodash.isequal___lodash.isequal_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; - sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; - }; - } - { - name = "lodash.isobject___lodash.isobject_3.0.2.tgz"; - path = fetchurl { - name = "lodash.isobject___lodash.isobject_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz"; - sha1 = "3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"; - }; - } - { - name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; - path = fetchurl { - name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"; - sha1 = "8489b1cb0d29ff88195cceca448ff6d6cc295c36"; - }; - } - { - name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; - path = fetchurl { - name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; - sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; - }; - } - { - name = "lodash.merge___lodash.merge_4.6.2.tgz"; - path = fetchurl { - name = "lodash.merge___lodash.merge_4.6.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; - sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; - }; - } - { - name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; - path = fetchurl { - name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; - sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; - }; - } - { - name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; - path = fetchurl { - name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; - sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; - }; - } - { - name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; - path = fetchurl { - name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; - }; - } - { - name = "lodash___lodash_4.17.21.tgz"; - path = fetchurl { - name = "lodash___lodash_4.17.21.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; - sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; - }; - } - { - name = "loglevel___loglevel_1.7.0.tgz"; - path = fetchurl { - name = "loglevel___loglevel_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz"; - sha1 = "728166855a740d59d38db01cf46f042caa041bb0"; - }; - } - { - name = "loose_envify___loose_envify_1.4.0.tgz"; - path = fetchurl { - name = "loose_envify___loose_envify_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; - sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; - }; - } - { - name = "lru_cache___lru_cache_5.1.1.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; - sha1 = "1da27e6710271947695daf6848e847f01d84b920"; - }; - } - { - name = "lru_cache___lru_cache_6.0.0.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; - sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; - }; - } - { - name = "lz_string___lz_string_1.4.4.tgz"; - path = fetchurl { - name = "lz_string___lz_string_1.4.4.tgz"; - url = "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz"; - sha1 = "c0d8eaf36059f705796e1e344811cf4c498d3a26"; - }; - } - { - name = "make_dir___make_dir_2.1.0.tgz"; - path = fetchurl { - name = "make_dir___make_dir_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz"; - sha1 = "5f0310e18b8be898cc07009295a30ae41e91e6f5"; - }; - } - { - name = "make_dir___make_dir_3.1.0.tgz"; - path = fetchurl { - name = "make_dir___make_dir_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; - sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; - }; - } - { - name = "makeerror___makeerror_1.0.11.tgz"; - path = fetchurl { - name = "makeerror___makeerror_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz"; - sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; - }; - } - { - name = "map_cache___map_cache_0.2.2.tgz"; - path = fetchurl { - name = "map_cache___map_cache_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz"; - sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; - }; - } - { - name = "map_visit___map_visit_1.0.0.tgz"; - path = fetchurl { - name = "map_visit___map_visit_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz"; - sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; - }; - } - { - name = "mark_loader___mark_loader_0.1.6.tgz"; - path = fetchurl { - name = "mark_loader___mark_loader_0.1.6.tgz"; - url = "https://registry.yarnpkg.com/mark-loader/-/mark-loader-0.1.6.tgz"; - sha1 = "0abb477dca7421d70e20128ff6489f5cae8676d5"; - }; - } - { - name = "marky___marky_1.2.2.tgz"; - path = fetchurl { - name = "marky___marky_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/marky/-/marky-1.2.2.tgz"; - sha1 = "4456765b4de307a13d263a69b0c79bf226e68323"; - }; - } - { - name = "md5.js___md5.js_1.3.5.tgz"; - path = fetchurl { - name = "md5.js___md5.js_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz"; - sha1 = "b5d07b8e3216e3e27cd728d72f70d1e6a342005f"; - }; - } - { - name = "mdn_data___mdn_data_2.0.4.tgz"; - path = fetchurl { - name = "mdn_data___mdn_data_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz"; - sha1 = "699b3c38ac6f1d728091a64650b65d388502fd5b"; - }; - } - { - name = "mdn_data___mdn_data_2.0.6.tgz"; - path = fetchurl { - name = "mdn_data___mdn_data_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz"; - sha1 = "852dc60fcaa5daa2e8cf6c9189c440ed3e042978"; - }; - } - { - name = "media_typer___media_typer_0.3.0.tgz"; - path = fetchurl { - name = "media_typer___media_typer_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; - }; - } - { - name = "memoize_one___memoize_one_5.1.1.tgz"; - path = fetchurl { - name = "memoize_one___memoize_one_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz"; - sha1 = "047b6e3199b508eaec03504de71229b8eb1d75c0"; - }; - } - { - name = "memory_fs___memory_fs_0.4.1.tgz"; - path = fetchurl { - name = "memory_fs___memory_fs_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz"; - sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; - }; - } - { - name = "memory_fs___memory_fs_0.5.0.tgz"; - path = fetchurl { - name = "memory_fs___memory_fs_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz"; - sha1 = "324c01288b88652966d161db77838720845a8e3c"; - }; - } - { - name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; - path = fetchurl { - name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; - }; - } - { - name = "merge_stream___merge_stream_2.0.0.tgz"; - path = fetchurl { - name = "merge_stream___merge_stream_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; - sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; - }; - } - { - name = "merge___merge_1.2.1.tgz"; - path = fetchurl { - name = "merge___merge_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz"; - sha1 = "38bebf80c3220a8a487b6fcfb3941bb11720c145"; - }; - } - { - name = "methods___methods_1.1.2.tgz"; - path = fetchurl { - name = "methods___methods_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; - }; - } - { - name = "micromatch___micromatch_3.1.10.tgz"; - path = fetchurl { - name = "micromatch___micromatch_3.1.10.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"; - sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; - }; - } - { - name = "micromatch___micromatch_4.0.2.tgz"; - path = fetchurl { - name = "micromatch___micromatch_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz"; - sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; - }; - } - { - name = "micromatch___micromatch_4.0.4.tgz"; - path = fetchurl { - name = "micromatch___micromatch_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; - sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; - }; - } - { - name = "miller_rabin___miller_rabin_4.0.1.tgz"; - path = fetchurl { - name = "miller_rabin___miller_rabin_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz"; - sha1 = "f080351c865b0dc562a8462966daa53543c78a4d"; - }; - } - { - name = "mime_db___mime_db_1.44.0.tgz"; - path = fetchurl { - name = "mime_db___mime_db_1.44.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; - sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; - }; - } - { - name = "mime_types___mime_types_2.1.27.tgz"; - path = fetchurl { - name = "mime_types___mime_types_2.1.27.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; - sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; - }; - } - { - name = "mime___mime_1.6.0.tgz"; - path = fetchurl { - name = "mime___mime_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; - sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; - }; - } - { - name = "mime___mime_2.4.7.tgz"; - path = fetchurl { - name = "mime___mime_2.4.7.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz"; - sha1 = "962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"; - }; - } - { - name = "mime___mime_2.4.4.tgz"; - path = fetchurl { - name = "mime___mime_2.4.4.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; - sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; - }; - } - { - name = "mimic_fn___mimic_fn_2.1.0.tgz"; - path = fetchurl { - name = "mimic_fn___mimic_fn_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; - }; - } - { - name = "min_indent___min_indent_1.0.1.tgz"; - path = fetchurl { - name = "min_indent___min_indent_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz"; - sha1 = "a63f681673b30571fbe8bc25686ae746eefa9869"; - }; - } - { - name = "mini_css_extract_plugin___mini_css_extract_plugin_1.6.0.tgz"; - path = fetchurl { - name = "mini_css_extract_plugin___mini_css_extract_plugin_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.0.tgz"; - sha1 = "b4db2525af2624899ed64a23b0016e0036411893"; - }; - } - { - name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; - path = fetchurl { - name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"; - }; - } - { - name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; - path = fetchurl { - name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; - sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; - }; - } - { - name = "minimatch___minimatch_3.0.4.tgz"; - path = fetchurl { - name = "minimatch___minimatch_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; - }; - } - { - name = "minimist___minimist_1.1.3.tgz"; - path = fetchurl { - name = "minimist___minimist_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz"; - sha1 = "3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"; - }; - } - { - name = "minimist___minimist_1.2.5.tgz"; - path = fetchurl { - name = "minimist___minimist_1.2.5.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; - }; - } - { - name = "minipass_collect___minipass_collect_1.0.2.tgz"; - path = fetchurl { - name = "minipass_collect___minipass_collect_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; - sha1 = "22b813bf745dc6edba2576b940022ad6edc8c617"; - }; - } - { - name = "minipass_flush___minipass_flush_1.0.5.tgz"; - path = fetchurl { - name = "minipass_flush___minipass_flush_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; - sha1 = "82e7135d7e89a50ffe64610a787953c4c4cbb373"; - }; - } - { - name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; - path = fetchurl { - name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; - sha1 = "68472f79711c084657c067c5c6ad93cddea8214c"; - }; - } - { - name = "minipass___minipass_3.1.3.tgz"; - path = fetchurl { - name = "minipass___minipass_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz"; - sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd"; - }; - } - { - name = "minizlib___minizlib_2.1.2.tgz"; - path = fetchurl { - name = "minizlib___minizlib_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; - sha1 = "e90d3466ba209b932451508a11ce3d3632145931"; - }; - } - { - name = "mississippi___mississippi_3.0.0.tgz"; - path = fetchurl { - name = "mississippi___mississippi_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz"; - sha1 = "ea0a3291f97e0b5e8776b363d5f0a12d94c67022"; - }; - } - { - name = "mixin_deep___mixin_deep_1.3.2.tgz"; - path = fetchurl { - name = "mixin_deep___mixin_deep_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; - sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; - }; - } - { - name = "mkdirp___mkdirp_0.5.5.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; - }; - } - { - name = "mkdirp___mkdirp_1.0.4.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; - sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"; - }; - } - { - name = "mousetrap___mousetrap_1.6.5.tgz"; - path = fetchurl { - name = "mousetrap___mousetrap_1.6.5.tgz"; - url = "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.5.tgz"; - sha1 = "8a766d8c272b08393d5f56074e0b5ec183485bf9"; - }; - } - { - name = "move_concurrently___move_concurrently_1.0.1.tgz"; - path = fetchurl { - name = "move_concurrently___move_concurrently_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz"; - sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; - }; - } - { - name = "ms___ms_2.0.0.tgz"; - path = fetchurl { - name = "ms___ms_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; - }; - } - { - name = "ms___ms_2.1.1.tgz"; - path = fetchurl { - name = "ms___ms_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; - sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; - }; - } - { - name = "ms___ms_2.1.2.tgz"; - path = fetchurl { - name = "ms___ms_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; - sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; - }; - } - { - name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; - path = fetchurl { - name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; - sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; - }; - } - { - name = "multicast_dns___multicast_dns_6.2.3.tgz"; - path = fetchurl { - name = "multicast_dns___multicast_dns_6.2.3.tgz"; - url = "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz"; - sha1 = "a0ec7bd9055c4282f790c3c82f4e28db3b31b229"; - }; - } - { - name = "mute_stream___mute_stream_0.0.5.tgz"; - path = fetchurl { - name = "mute_stream___mute_stream_0.0.5.tgz"; - url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz"; - sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0"; - }; - } - { - name = "nan___nan_2.14.1.tgz"; - path = fetchurl { - name = "nan___nan_2.14.1.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz"; - sha1 = "d7be34dfa3105b91494c3147089315eff8874b01"; - }; - } - { - name = "nanoid___nanoid_3.1.23.tgz"; - path = fetchurl { - name = "nanoid___nanoid_3.1.23.tgz"; - url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz"; - sha1 = "f744086ce7c2bc47ee0a8472574d5c78e4183a81"; - }; - } - { - name = "nanomatch___nanomatch_1.2.13.tgz"; - path = fetchurl { - name = "nanomatch___nanomatch_1.2.13.tgz"; - url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; - sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119"; - }; - } - { - name = "natural_compare___natural_compare_1.4.0.tgz"; - path = fetchurl { - name = "natural_compare___natural_compare_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; - sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; - }; - } - { - name = "negotiator___negotiator_0.6.2.tgz"; - path = fetchurl { - name = "negotiator___negotiator_0.6.2.tgz"; - url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; - sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; - }; - } - { - name = "neo_async___neo_async_2.6.2.tgz"; - path = fetchurl { - name = "neo_async___neo_async_2.6.2.tgz"; - url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; - sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"; - }; - } - { - name = "next_tick___next_tick_1.0.0.tgz"; - path = fetchurl { - name = "next_tick___next_tick_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz"; - sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; - }; - } - { - name = "nice_try___nice_try_1.0.5.tgz"; - path = fetchurl { - name = "nice_try___nice_try_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; - sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; - }; - } - { - name = "node_fetch___node_fetch_2.6.1.tgz"; - path = fetchurl { - name = "node_fetch___node_fetch_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; - sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; - }; - } - { - name = "node_forge___node_forge_0.10.0.tgz"; - path = fetchurl { - name = "node_forge___node_forge_0.10.0.tgz"; - url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz"; - sha1 = "32dea2afb3e9926f02ee5ce8794902691a676bf3"; - }; - } - { - name = "node_gyp_build___node_gyp_build_4.2.3.tgz"; - path = fetchurl { - name = "node_gyp_build___node_gyp_build_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz"; - sha1 = "ce6277f853835f718829efb47db20f3e4d9c4739"; - }; - } - { - name = "node_int64___node_int64_0.4.0.tgz"; - path = fetchurl { - name = "node_int64___node_int64_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz"; - sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; - }; - } - { - name = "node_libs_browser___node_libs_browser_2.2.1.tgz"; - path = fetchurl { - name = "node_libs_browser___node_libs_browser_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz"; - sha1 = "b64f513d18338625f90346d27b0d235e631f6425"; - }; - } - { - name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz"; - path = fetchurl { - name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz"; - sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; - }; - } - { - name = "node_notifier___node_notifier_8.0.1.tgz"; - path = fetchurl { - name = "node_notifier___node_notifier_8.0.1.tgz"; - url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz"; - sha1 = "f86e89bbc925f2b068784b31f382afdc6ca56be1"; - }; - } - { - name = "node_releases___node_releases_1.1.72.tgz"; - path = fetchurl { - name = "node_releases___node_releases_1.1.72.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz"; - sha1 = "14802ab6b1039a79a0c7d662b610a5bbd76eacbe"; - }; - } - { - name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; - path = fetchurl { - name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; - sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; - }; - } - { - name = "normalize_path___normalize_path_2.1.1.tgz"; - path = fetchurl { - name = "normalize_path___normalize_path_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz"; - sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; - }; - } - { - name = "normalize_path___normalize_path_3.0.0.tgz"; - path = fetchurl { - name = "normalize_path___normalize_path_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; - sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; - }; - } - { - name = "normalize_range___normalize_range_0.1.2.tgz"; - path = fetchurl { - name = "normalize_range___normalize_range_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz"; - sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; - }; - } - { - name = "normalize_url___normalize_url_3.3.0.tgz"; - path = fetchurl { - name = "normalize_url___normalize_url_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz"; - sha1 = "b2e1c4dc4f7c6d57743df733a4f5978d18650559"; - }; - } - { - name = "npm_run_path___npm_run_path_2.0.2.tgz"; - path = fetchurl { - name = "npm_run_path___npm_run_path_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; - }; - } - { - name = "npm_run_path___npm_run_path_4.0.1.tgz"; - path = fetchurl { - name = "npm_run_path___npm_run_path_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; - sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"; - }; - } - { - name = "npmlog___npmlog_4.1.2.tgz"; - path = fetchurl { - name = "npmlog___npmlog_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; - sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; - }; - } - { - name = "nth_check___nth_check_1.0.2.tgz"; - path = fetchurl { - name = "nth_check___nth_check_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz"; - sha1 = "b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"; - }; - } - { - name = "num2fraction___num2fraction_1.2.2.tgz"; - path = fetchurl { - name = "num2fraction___num2fraction_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz"; - sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; - }; - } - { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - path = fetchurl { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - } - { - name = "nwsapi___nwsapi_2.2.0.tgz"; - path = fetchurl { - name = "nwsapi___nwsapi_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; - sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7"; - }; - } - { - name = "oauth_sign___oauth_sign_0.9.0.tgz"; - path = fetchurl { - name = "oauth_sign___oauth_sign_0.9.0.tgz"; - url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; - }; - } - { - name = "object_assign___object_assign_4.1.1.tgz"; - path = fetchurl { - name = "object_assign___object_assign_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; - }; - } - { - name = "object_copy___object_copy_0.1.0.tgz"; - path = fetchurl { - name = "object_copy___object_copy_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz"; - sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; - }; - } - { - name = "object_fit_images___object_fit_images_3.2.4.tgz"; - path = fetchurl { - name = "object_fit_images___object_fit_images_3.2.4.tgz"; - url = "https://registry.yarnpkg.com/object-fit-images/-/object-fit-images-3.2.4.tgz"; - sha1 = "6c299d38fdf207746e5d2d46c2877f6f25d15b52"; - }; - } - { - name = "object_inspect___object_inspect_1.10.3.tgz"; - path = fetchurl { - name = "object_inspect___object_inspect_1.10.3.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz"; - sha1 = "c2aa7d2d09f50c99375704f7a0adf24c5782d369"; - }; - } - { - name = "object_inspect___object_inspect_1.8.0.tgz"; - path = fetchurl { - name = "object_inspect___object_inspect_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz"; - sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"; - }; - } - { - name = "object_inspect___object_inspect_1.9.0.tgz"; - path = fetchurl { - name = "object_inspect___object_inspect_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz"; - sha1 = "c90521d74e1127b67266ded3394ad6116986533a"; - }; - } - { - name = "object_is___object_is_1.1.3.tgz"; - path = fetchurl { - name = "object_is___object_is_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz"; - sha1 = "2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"; - }; - } - { - name = "object_keys___object_keys_1.1.1.tgz"; - path = fetchurl { - name = "object_keys___object_keys_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; - }; - } - { - name = "object_visit___object_visit_1.0.1.tgz"; - path = fetchurl { - name = "object_visit___object_visit_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz"; - sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; - }; - } - { - name = "object.assign___object.assign_4.1.1.tgz"; - path = fetchurl { - name = "object.assign___object.assign_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz"; - sha1 = "303867a666cdd41936ecdedfb1f8f3e32a478cdd"; - }; - } - { - name = "object.assign___object.assign_4.1.2.tgz"; - path = fetchurl { - name = "object.assign___object.assign_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; - sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940"; - }; - } - { - name = "object.entries___object.entries_1.1.4.tgz"; - path = fetchurl { - name = "object.entries___object.entries_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz"; - sha1 = "43ccf9a50bc5fd5b649d45ab1a579f24e088cafd"; - }; - } - { - name = "object.fromentries___object.fromentries_2.0.4.tgz"; - path = fetchurl { - name = "object.fromentries___object.fromentries_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz"; - sha1 = "26e1ba5c4571c5c6f0890cef4473066456a120b8"; - }; - } - { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; - path = fetchurl { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha1 = "369bf1f9592d8ab89d712dced5cb81c7c5352649"; - }; - } - { - name = "object.pick___object.pick_1.3.0.tgz"; - path = fetchurl { - name = "object.pick___object.pick_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz"; - sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; - }; - } - { - name = "object.values___object.values_1.1.4.tgz"; - path = fetchurl { - name = "object.values___object.values_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz"; - sha1 = "0d273762833e816b693a637d30073e7051535b30"; - }; - } - { - name = "obuf___obuf_1.1.2.tgz"; - path = fetchurl { - name = "obuf___obuf_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz"; - sha1 = "09bea3343d41859ebd446292d11c9d4db619084e"; - }; - } - { - name = "offline_plugin___offline_plugin_5.0.7.tgz"; - path = fetchurl { - name = "offline_plugin___offline_plugin_5.0.7.tgz"; - url = "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-5.0.7.tgz"; - sha1 = "26936ad1a7699f4d67e0a095a258972a4ccf1788"; - }; - } - { - name = "on_finished___on_finished_2.3.0.tgz"; - path = fetchurl { - name = "on_finished___on_finished_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; - }; - } - { - name = "on_headers___on_headers_1.0.2.tgz"; - path = fetchurl { - name = "on_headers___on_headers_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz"; - sha1 = "772b0ae6aaa525c399e489adfad90c403eb3c28f"; - }; - } - { - name = "once___once_1.4.0.tgz"; - path = fetchurl { - name = "once___once_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - } - { - name = "onetime___onetime_1.1.0.tgz"; - path = fetchurl { - name = "onetime___onetime_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz"; - sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; - }; - } - { - name = "onetime___onetime_5.1.2.tgz"; - path = fetchurl { - name = "onetime___onetime_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; - sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; - }; - } - { - name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; - path = fetchurl { - name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz"; - sha1 = "7a0fff978f6dbfa4d006238fbac98ed4198c3259"; - }; - } - { - name = "opener___opener_1.5.2.tgz"; - path = fetchurl { - name = "opener___opener_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz"; - sha1 = "5d37e1f35077b9dcac4301372271afdeb2a13598"; - }; - } - { - name = "opn___opn_5.5.0.tgz"; - path = fetchurl { - name = "opn___opn_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz"; - sha1 = "fc7164fab56d235904c51c3b27da6758ca3b9bfc"; - }; - } - { - name = "optionator___optionator_0.8.3.tgz"; - path = fetchurl { - name = "optionator___optionator_0.8.3.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; - sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; - }; - } - { - name = "optionator___optionator_0.9.1.tgz"; - path = fetchurl { - name = "optionator___optionator_0.9.1.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; - sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; - }; - } - { - name = "original___original_1.0.2.tgz"; - path = fetchurl { - name = "original___original_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz"; - sha1 = "e442a61cffe1c5fd20a65f3261c26663b303f25f"; - }; - } - { - name = "os_browserify___os_browserify_0.3.0.tgz"; - path = fetchurl { - name = "os_browserify___os_browserify_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz"; - sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; - }; - } - { - name = "os_homedir___os_homedir_1.0.2.tgz"; - path = fetchurl { - name = "os_homedir___os_homedir_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - } - { - name = "p_each_series___p_each_series_2.1.0.tgz"; - path = fetchurl { - name = "p_each_series___p_each_series_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz"; - sha1 = "961c8dd3f195ea96c747e636b262b800a6b1af48"; - }; - } - { - name = "p_finally___p_finally_1.0.0.tgz"; - path = fetchurl { - name = "p_finally___p_finally_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; - }; - } - { - name = "p_limit___p_limit_1.3.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz"; - sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"; - }; - } - { - name = "p_limit___p_limit_2.3.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; - sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; - }; - } - { - name = "p_limit___p_limit_3.0.2.tgz"; - path = fetchurl { - name = "p_limit___p_limit_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.0.2.tgz"; - sha1 = "1664e010af3cadc681baafd3e2a437be7b0fb5fe"; - }; - } - { - name = "p_locate___p_locate_2.0.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz"; - sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; - }; - } - { - name = "p_locate___p_locate_3.0.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz"; - sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4"; - }; - } - { - name = "p_locate___p_locate_4.1.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; - }; - } - { - name = "p_map___p_map_2.1.0.tgz"; - path = fetchurl { - name = "p_map___p_map_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; - sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; - }; - } - { - name = "p_map___p_map_4.0.0.tgz"; - path = fetchurl { - name = "p_map___p_map_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; - sha1 = "bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"; - }; - } - { - name = "p_retry___p_retry_3.0.1.tgz"; - path = fetchurl { - name = "p_retry___p_retry_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz"; - sha1 = "316b4c8893e2c8dc1cfa891f406c4b422bebf328"; - }; - } - { - name = "p_try___p_try_1.0.0.tgz"; - path = fetchurl { - name = "p_try___p_try_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz"; - sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; - }; - } - { - name = "p_try___p_try_2.2.0.tgz"; - path = fetchurl { - name = "p_try___p_try_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; - }; - } - { - name = "packet_reader___packet_reader_1.0.0.tgz"; - path = fetchurl { - name = "packet_reader___packet_reader_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz"; - sha1 = "9238e5480dedabacfe1fe3f2771063f164157d74"; - }; - } - { - name = "pako___pako_1.0.11.tgz"; - path = fetchurl { - name = "pako___pako_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz"; - sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf"; - }; - } - { - name = "parallel_transform___parallel_transform_1.2.0.tgz"; - path = fetchurl { - name = "parallel_transform___parallel_transform_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz"; - sha1 = "9049ca37d6cb2182c3b1d2c720be94d14a5814fc"; - }; - } - { - name = "parent_module___parent_module_1.0.1.tgz"; - path = fetchurl { - name = "parent_module___parent_module_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; - sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; - }; - } - { - name = "parse_asn1___parse_asn1_5.1.6.tgz"; - path = fetchurl { - name = "parse_asn1___parse_asn1_5.1.6.tgz"; - url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz"; - sha1 = "385080a3ec13cb62a62d39409cb3e88844cdaed4"; - }; - } - { - name = "parse_css_font___parse_css_font_2.0.2.tgz"; - path = fetchurl { - name = "parse_css_font___parse_css_font_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/parse-css-font/-/parse-css-font-2.0.2.tgz"; - sha1 = "7b60b060705a25a9b90b7f0ed493e5823248a652"; - }; - } - { - name = "parse_json___parse_json_4.0.0.tgz"; - path = fetchurl { - name = "parse_json___parse_json_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; - }; - } - { - name = "parse_json___parse_json_5.0.1.tgz"; - path = fetchurl { - name = "parse_json___parse_json_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.1.tgz"; - sha1 = "7cfe35c1ccd641bce3981467e6c2ece61b3b3878"; - }; - } - { - name = "parse_passwd___parse_passwd_1.0.0.tgz"; - path = fetchurl { - name = "parse_passwd___parse_passwd_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz"; - sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; - }; - } - { - name = "parse5___parse5_5.1.1.tgz"; - path = fetchurl { - name = "parse5___parse5_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz"; - sha1 = "f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"; - }; - } - { - name = "parseurl___parseurl_1.3.3.tgz"; - path = fetchurl { - name = "parseurl___parseurl_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; - sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; - }; - } - { - name = "pascalcase___pascalcase_0.1.1.tgz"; - path = fetchurl { - name = "pascalcase___pascalcase_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; - sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; - }; - } - { - name = "path_browserify___path_browserify_0.0.1.tgz"; - path = fetchurl { - name = "path_browserify___path_browserify_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz"; - sha1 = "e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"; - }; - } - { - name = "path_complete_extname___path_complete_extname_1.0.0.tgz"; - path = fetchurl { - name = "path_complete_extname___path_complete_extname_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-complete-extname/-/path-complete-extname-1.0.0.tgz"; - sha1 = "f889985dc91000c815515c0bfed06c5acda0752b"; - }; - } - { - name = "path_dirname___path_dirname_1.0.2.tgz"; - path = fetchurl { - name = "path_dirname___path_dirname_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz"; - sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; - }; - } - { - name = "path_exists___path_exists_3.0.0.tgz"; - path = fetchurl { - name = "path_exists___path_exists_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz"; - sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; - }; - } - { - name = "path_exists___path_exists_4.0.0.tgz"; - path = fetchurl { - name = "path_exists___path_exists_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; - }; - } - { - name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; - path = fetchurl { - name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - } - { - name = "path_is_inside___path_is_inside_1.0.2.tgz"; - path = fetchurl { - name = "path_is_inside___path_is_inside_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz"; - sha1 = "365417dede44430d1c11af61027facf074bdfc53"; - }; - } - { - name = "path_key___path_key_2.0.1.tgz"; - path = fetchurl { - name = "path_key___path_key_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; - sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; - }; - } - { - name = "path_key___path_key_3.1.1.tgz"; - path = fetchurl { - name = "path_key___path_key_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; - sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; - }; - } - { - name = "path_parse___path_parse_1.0.6.tgz"; - path = fetchurl { - name = "path_parse___path_parse_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; - sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; - }; - } - { - name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; - path = fetchurl { - name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; - }; - } - { - name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; - path = fetchurl { - name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; - sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; - }; - } - { - name = "path_type___path_type_3.0.0.tgz"; - path = fetchurl { - name = "path_type___path_type_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz"; - sha1 = "cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"; - }; - } - { - name = "path_type___path_type_4.0.0.tgz"; - path = fetchurl { - name = "path_type___path_type_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; - sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; - }; - } - { - name = "pbkdf2___pbkdf2_3.1.1.tgz"; - path = fetchurl { - name = "pbkdf2___pbkdf2_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz"; - sha1 = "cb8724b0fada984596856d1a6ebafd3584654b94"; - }; - } - { - name = "performance_now___performance_now_0.2.0.tgz"; - path = fetchurl { - name = "performance_now___performance_now_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; - }; - } - { - name = "performance_now___performance_now_2.1.0.tgz"; - path = fetchurl { - name = "performance_now___performance_now_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; - }; - } - { - name = "pg_connection_string___pg_connection_string_2.4.0.tgz"; - path = fetchurl { - name = "pg_connection_string___pg_connection_string_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.4.0.tgz"; - sha1 = "c979922eb47832999a204da5dbe1ebf2341b6a10"; - }; - } - { - name = "pg_int8___pg_int8_1.0.1.tgz"; - path = fetchurl { - name = "pg_int8___pg_int8_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz"; - sha1 = "943bd463bf5b71b4170115f80f8efc9a0c0eb78c"; - }; - } - { - name = "pg_pool___pg_pool_3.2.2.tgz"; - path = fetchurl { - name = "pg_pool___pg_pool_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.2.2.tgz"; - sha1 = "a560e433443ed4ad946b84d774b3f22452694dff"; - }; - } - { - name = "pg_protocol___pg_protocol_1.4.0.tgz"; - path = fetchurl { - name = "pg_protocol___pg_protocol_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.4.0.tgz"; - sha1 = "43a71a92f6fe3ac559952555aa3335c8cb4908be"; - }; - } - { - name = "pg_types___pg_types_2.2.0.tgz"; - path = fetchurl { - name = "pg_types___pg_types_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz"; - sha1 = "2d0250d636454f7cfa3b6ae0382fdfa8063254a3"; - }; - } - { - name = "pg___pg_8.5.1.tgz"; - path = fetchurl { - name = "pg___pg_8.5.1.tgz"; - url = "https://registry.yarnpkg.com/pg/-/pg-8.5.1.tgz"; - sha1 = "34dcb15f6db4a29c702bf5031ef2e1e25a06a120"; - }; - } - { - name = "pgpass___pgpass_1.0.4.tgz"; - path = fetchurl { - name = "pgpass___pgpass_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.4.tgz"; - sha1 = "85eb93a83800b20f8057a2b029bf05abaf94ea9c"; - }; - } - { - name = "picomatch___picomatch_2.2.2.tgz"; - path = fetchurl { - name = "picomatch___picomatch_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; - sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; - }; - } - { - name = "picomatch___picomatch_2.3.0.tgz"; - path = fetchurl { - name = "picomatch___picomatch_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; - sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; - }; - } - { - name = "pify___pify_2.3.0.tgz"; - path = fetchurl { - name = "pify___pify_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; - }; - } - { - name = "pify___pify_3.0.0.tgz"; - path = fetchurl { - name = "pify___pify_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; - }; - } - { - name = "pify___pify_4.0.1.tgz"; - path = fetchurl { - name = "pify___pify_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz"; - sha1 = "4b2cd25c50d598735c50292224fd8c6df41e3231"; - }; - } - { - name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; - path = fetchurl { - name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; - }; - } - { - name = "pinkie___pinkie_2.0.4.tgz"; - path = fetchurl { - name = "pinkie___pinkie_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; - }; - } - { - name = "pirates___pirates_4.0.1.tgz"; - path = fetchurl { - name = "pirates___pirates_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz"; - sha1 = "643a92caf894566f91b2b986d2c66950a8e2fb87"; - }; - } - { - name = "pkg_dir___pkg_dir_2.0.0.tgz"; - path = fetchurl { - name = "pkg_dir___pkg_dir_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz"; - sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; - }; - } - { - name = "pkg_dir___pkg_dir_3.0.0.tgz"; - path = fetchurl { - name = "pkg_dir___pkg_dir_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz"; - sha1 = "2749020f239ed990881b1f71210d51eb6523bea3"; - }; - } - { - name = "pkg_dir___pkg_dir_4.2.0.tgz"; - path = fetchurl { - name = "pkg_dir___pkg_dir_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; - }; - } - { - name = "pkg_up___pkg_up_2.0.0.tgz"; - path = fetchurl { - name = "pkg_up___pkg_up_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; - sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; - }; - } - { - name = "pluralize___pluralize_1.2.1.tgz"; - path = fetchurl { - name = "pluralize___pluralize_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz"; - sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; - }; - } - { - name = "portfinder___portfinder_1.0.28.tgz"; - path = fetchurl { - name = "portfinder___portfinder_1.0.28.tgz"; - url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz"; - sha1 = "67c4622852bd5374dd1dd900f779f53462fac778"; - }; - } - { - name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; - path = fetchurl { - name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; - sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; - }; - } - { - name = "postcss_calc___postcss_calc_7.0.4.tgz"; - path = fetchurl { - name = "postcss_calc___postcss_calc_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.4.tgz"; - sha1 = "5e177ddb417341e6d4a193c5d9fd8ada79094f8b"; - }; - } - { - name = "postcss_colormin___postcss_colormin_4.0.3.tgz"; - path = fetchurl { - name = "postcss_colormin___postcss_colormin_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz"; - sha1 = "ae060bce93ed794ac71264f08132d550956bd381"; - }; - } - { - name = "postcss_convert_values___postcss_convert_values_4.0.1.tgz"; - path = fetchurl { - name = "postcss_convert_values___postcss_convert_values_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"; - sha1 = "ca3813ed4da0f812f9d43703584e449ebe189a7f"; - }; - } - { - name = "postcss_discard_comments___postcss_discard_comments_4.0.2.tgz"; - path = fetchurl { - name = "postcss_discard_comments___postcss_discard_comments_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"; - sha1 = "1fbabd2c246bff6aaad7997b2b0918f4d7af4033"; - }; - } - { - name = "postcss_discard_duplicates___postcss_discard_duplicates_4.0.2.tgz"; - path = fetchurl { - name = "postcss_discard_duplicates___postcss_discard_duplicates_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"; - sha1 = "3fe133cd3c82282e550fc9b239176a9207b784eb"; - }; - } - { - name = "postcss_discard_empty___postcss_discard_empty_4.0.1.tgz"; - path = fetchurl { - name = "postcss_discard_empty___postcss_discard_empty_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"; - sha1 = "c8c951e9f73ed9428019458444a02ad90bb9f765"; - }; - } - { - name = "postcss_discard_overridden___postcss_discard_overridden_4.0.1.tgz"; - path = fetchurl { - name = "postcss_discard_overridden___postcss_discard_overridden_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"; - sha1 = "652aef8a96726f029f5e3e00146ee7a4e755ff57"; - }; - } - { - name = "postcss_load_config___postcss_load_config_2.1.2.tgz"; - path = fetchurl { - name = "postcss_load_config___postcss_load_config_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz"; - sha1 = "c5ea504f2c4aef33c7359a34de3573772ad7502a"; - }; - } - { - name = "postcss_loader___postcss_loader_3.0.0.tgz"; - path = fetchurl { - name = "postcss_loader___postcss_loader_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz"; - sha1 = "6b97943e47c72d845fa9e03f273773d4e8dd6c2d"; - }; - } - { - name = "postcss_merge_longhand___postcss_merge_longhand_4.0.11.tgz"; - path = fetchurl { - name = "postcss_merge_longhand___postcss_merge_longhand_4.0.11.tgz"; - url = "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"; - sha1 = "62f49a13e4a0ee04e7b98f42bb16062ca2549e24"; - }; - } - { - name = "postcss_merge_rules___postcss_merge_rules_4.0.3.tgz"; - path = fetchurl { - name = "postcss_merge_rules___postcss_merge_rules_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"; - sha1 = "362bea4ff5a1f98e4075a713c6cb25aefef9a650"; - }; - } - { - name = "postcss_minify_font_values___postcss_minify_font_values_4.0.2.tgz"; - path = fetchurl { - name = "postcss_minify_font_values___postcss_minify_font_values_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"; - sha1 = "cd4c344cce474343fac5d82206ab2cbcb8afd5a6"; - }; - } - { - name = "postcss_minify_gradients___postcss_minify_gradients_4.0.2.tgz"; - path = fetchurl { - name = "postcss_minify_gradients___postcss_minify_gradients_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"; - sha1 = "93b29c2ff5099c535eecda56c4aa6e665a663471"; - }; - } - { - name = "postcss_minify_params___postcss_minify_params_4.0.2.tgz"; - path = fetchurl { - name = "postcss_minify_params___postcss_minify_params_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"; - sha1 = "6b9cef030c11e35261f95f618c90036d680db874"; - }; - } - { - name = "postcss_minify_selectors___postcss_minify_selectors_4.0.2.tgz"; - path = fetchurl { - name = "postcss_minify_selectors___postcss_minify_selectors_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"; - sha1 = "e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8"; - }; - } - { - name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; - path = fetchurl { - name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; - sha1 = "cda1f047c0ae80c97dbe28c3e76a43b88025741d"; - }; - } - { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; - path = fetchurl { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; - sha1 = "ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"; - }; - } - { - name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; - path = fetchurl { - name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; - sha1 = "9ef3151456d3bbfa120ca44898dfca6f2fa01f06"; - }; - } - { - name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; - path = fetchurl { - name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; - sha1 = "d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"; - }; - } - { - name = "postcss_normalize_charset___postcss_normalize_charset_4.0.1.tgz"; - path = fetchurl { - name = "postcss_normalize_charset___postcss_normalize_charset_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"; - sha1 = "8b35add3aee83a136b0471e0d59be58a50285dd4"; - }; - } - { - name = "postcss_normalize_display_values___postcss_normalize_display_values_4.0.2.tgz"; - path = fetchurl { - name = "postcss_normalize_display_values___postcss_normalize_display_values_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"; - sha1 = "0dbe04a4ce9063d4667ed2be476bb830c825935a"; - }; - } - { - name = "postcss_normalize_positions___postcss_normalize_positions_4.0.2.tgz"; - path = fetchurl { - name = "postcss_normalize_positions___postcss_normalize_positions_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"; - sha1 = "05f757f84f260437378368a91f8932d4b102917f"; - }; - } - { - name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_4.0.2.tgz"; - path = fetchurl { - name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"; - sha1 = "c4ebbc289f3991a028d44751cbdd11918b17910c"; - }; - } - { - name = "postcss_normalize_string___postcss_normalize_string_4.0.2.tgz"; - path = fetchurl { - name = "postcss_normalize_string___postcss_normalize_string_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"; - sha1 = "cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c"; - }; - } - { - name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_4.0.2.tgz"; - path = fetchurl { - name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"; - sha1 = "8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9"; - }; - } - { - name = "postcss_normalize_unicode___postcss_normalize_unicode_4.0.1.tgz"; - path = fetchurl { - name = "postcss_normalize_unicode___postcss_normalize_unicode_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"; - sha1 = "841bd48fdcf3019ad4baa7493a3d363b52ae1cfb"; - }; - } - { - name = "postcss_normalize_url___postcss_normalize_url_4.0.1.tgz"; - path = fetchurl { - name = "postcss_normalize_url___postcss_normalize_url_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"; - sha1 = "10e437f86bc7c7e58f7b9652ed878daaa95faae1"; - }; - } - { - name = "postcss_normalize_whitespace___postcss_normalize_whitespace_4.0.2.tgz"; - path = fetchurl { - name = "postcss_normalize_whitespace___postcss_normalize_whitespace_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"; - sha1 = "bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82"; - }; - } - { - name = "postcss_object_fit_images___postcss_object_fit_images_1.1.2.tgz"; - path = fetchurl { - name = "postcss_object_fit_images___postcss_object_fit_images_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-object-fit-images/-/postcss-object-fit-images-1.1.2.tgz"; - sha1 = "8b773043db14672ef6cd6f2cb1f0d8b26a9f573b"; - }; - } - { - name = "postcss_ordered_values___postcss_ordered_values_4.1.2.tgz"; - path = fetchurl { - name = "postcss_ordered_values___postcss_ordered_values_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"; - sha1 = "0cf75c820ec7d5c4d280189559e0b571ebac0eee"; - }; - } - { - name = "postcss_reduce_initial___postcss_reduce_initial_4.0.3.tgz"; - path = fetchurl { - name = "postcss_reduce_initial___postcss_reduce_initial_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"; - sha1 = "7fd42ebea5e9c814609639e2c2e84ae270ba48df"; - }; - } - { - name = "postcss_reduce_transforms___postcss_reduce_transforms_4.0.2.tgz"; - path = fetchurl { - name = "postcss_reduce_transforms___postcss_reduce_transforms_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"; - sha1 = "17efa405eacc6e07be3414a5ca2d1074681d4e29"; - }; - } - { - name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; - path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; - sha1 = "b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"; - }; - } - { - name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; - path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; - sha1 = "934cf799d016c83411859e09dcecade01286ec5c"; - }; - } - { - name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; - path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; - sha1 = "56075a1380a04604c38b063ea7767a129af5c2b3"; - }; - } - { - name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; - path = fetchurl { - name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz"; - sha1 = "343a2cdbac9505d416243d496f724f38894c941e"; - }; - } - { - name = "postcss_unique_selectors___postcss_unique_selectors_4.0.1.tgz"; - path = fetchurl { - name = "postcss_unique_selectors___postcss_unique_selectors_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"; - sha1 = "9446911f3289bfd64c6d680f073c03b1f9ee4bac"; - }; - } - { - name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; - path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"; - sha1 = "9ff822547e2893213cf1c30efa51ac5fd1ba8281"; - }; - } - { - name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; - path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; - sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; - }; - } - { - name = "postcss___postcss_5.2.18.tgz"; - path = fetchurl { - name = "postcss___postcss_5.2.18.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz"; - sha1 = "badfa1497d46244f6390f58b319830d9107853c5"; - }; - } - { - name = "postcss___postcss_7.0.32.tgz"; - path = fetchurl { - name = "postcss___postcss_7.0.32.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz"; - sha1 = "4310d6ee347053da3433db2be492883d62cec59d"; - }; - } - { - name = "postcss___postcss_8.3.0.tgz"; - path = fetchurl { - name = "postcss___postcss_8.3.0.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-8.3.0.tgz"; - sha1 = "b1a713f6172ca427e3f05ef1303de8b65683325f"; - }; - } - { - name = "postgres_array___postgres_array_2.0.0.tgz"; - path = fetchurl { - name = "postgres_array___postgres_array_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz"; - sha1 = "48f8fce054fbc69671999329b8834b772652d82e"; - }; - } - { - name = "postgres_bytea___postgres_bytea_1.0.0.tgz"; - path = fetchurl { - name = "postgres_bytea___postgres_bytea_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; - sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; - }; - } - { - name = "postgres_date___postgres_date_1.0.7.tgz"; - path = fetchurl { - name = "postgres_date___postgres_date_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz"; - sha1 = "51bc086006005e5061c591cee727f2531bf641a8"; - }; - } - { - name = "postgres_interval___postgres_interval_1.2.0.tgz"; - path = fetchurl { - name = "postgres_interval___postgres_interval_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz"; - sha1 = "b460c82cb1587507788819a06aa0fffdb3544695"; - }; - } - { - name = "prelude_ls___prelude_ls_1.2.1.tgz"; - path = fetchurl { - name = "prelude_ls___prelude_ls_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; - sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; - }; - } - { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - path = fetchurl { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; - }; - } - { - name = "pretty_format___pretty_format_25.5.0.tgz"; - path = fetchurl { - name = "pretty_format___pretty_format_25.5.0.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz"; - sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a"; - }; - } - { - name = "pretty_format___pretty_format_26.6.2.tgz"; - path = fetchurl { - name = "pretty_format___pretty_format_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz"; - sha1 = "e35c2705f14cb7fe2fe94fa078345b444120fc93"; - }; - } - { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - path = fetchurl { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; - }; - } - { - name = "process___process_0.11.10.tgz"; - path = fetchurl { - name = "process___process_0.11.10.tgz"; - url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz"; - sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; - }; - } - { - name = "progress___progress_1.1.8.tgz"; - path = fetchurl { - name = "progress___progress_1.1.8.tgz"; - url = "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz"; - sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; - }; - } - { - name = "progress___progress_2.0.3.tgz"; - path = fetchurl { - name = "progress___progress_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; - sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; - }; - } - { - name = "promise_inflight___promise_inflight_1.0.1.tgz"; - path = fetchurl { - name = "promise_inflight___promise_inflight_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz"; - sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; - }; - } - { - name = "promise.prototype.finally___promise.prototype.finally_3.1.2.tgz"; - path = fetchurl { - name = "promise.prototype.finally___promise.prototype.finally_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.2.tgz"; - sha1 = "b8af89160c9c673cefe3b4c4435b53cfd0287067"; - }; - } - { - name = "prompts___prompts_2.3.2.tgz"; - path = fetchurl { - name = "prompts___prompts_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz"; - sha1 = "480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"; - }; - } - { - name = "prop_types_extra___prop_types_extra_1.1.1.tgz"; - path = fetchurl { - name = "prop_types_extra___prop_types_extra_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/prop-types-extra/-/prop-types-extra-1.1.1.tgz"; - sha1 = "58c3b74cbfbb95d304625975aa2f0848329a010b"; - }; - } - { - name = "prop_types___prop_types_15.7.2.tgz"; - path = fetchurl { - name = "prop_types___prop_types_15.7.2.tgz"; - url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; - sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; - }; - } - { - name = "proxy_addr___proxy_addr_2.0.6.tgz"; - path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; - }; - } - { - name = "prr___prr_1.0.1.tgz"; - path = fetchurl { - name = "prr___prr_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz"; - sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; - }; - } - { - name = "psl___psl_1.8.0.tgz"; - path = fetchurl { - name = "psl___psl_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; - sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; - }; - } - { - name = "public_encrypt___public_encrypt_4.0.3.tgz"; - path = fetchurl { - name = "public_encrypt___public_encrypt_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz"; - sha1 = "4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"; - }; - } - { - name = "pump___pump_2.0.1.tgz"; - path = fetchurl { - name = "pump___pump_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz"; - sha1 = "12399add6e4cf7526d973cbc8b5ce2e2908b3909"; - }; - } - { - name = "pump___pump_3.0.0.tgz"; - path = fetchurl { - name = "pump___pump_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; - sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; - }; - } - { - name = "pumpify___pumpify_1.5.1.tgz"; - path = fetchurl { - name = "pumpify___pumpify_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz"; - sha1 = "36513be246ab27570b1a374a5ce278bfd74370ce"; - }; - } - { - name = "punycode___punycode_1.3.2.tgz"; - path = fetchurl { - name = "punycode___punycode_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; - }; - } - { - name = "punycode___punycode_1.4.1.tgz"; - path = fetchurl { - name = "punycode___punycode_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - } - { - name = "punycode___punycode_2.1.1.tgz"; - path = fetchurl { - name = "punycode___punycode_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; - }; - } - { - name = "q___q_1.5.1.tgz"; - path = fetchurl { - name = "q___q_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz"; - sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; - }; - } - { - name = "qs___qs_6.7.0.tgz"; - path = fetchurl { - name = "qs___qs_6.7.0.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; - sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; - }; - } - { - name = "qs___qs_6.5.2.tgz"; - path = fetchurl { - name = "qs___qs_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; - sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; - }; - } - { - name = "querystring_es3___querystring_es3_0.2.1.tgz"; - path = fetchurl { - name = "querystring_es3___querystring_es3_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz"; - sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; - }; - } - { - name = "querystring___querystring_0.2.0.tgz"; - path = fetchurl { - name = "querystring___querystring_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz"; - sha1 = "b209849203bb25df820da756e747005878521620"; - }; - } - { - name = "querystringify___querystringify_2.2.0.tgz"; - path = fetchurl { - name = "querystringify___querystringify_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz"; - sha1 = "3345941b4153cb9d082d8eee4cda2016a9aef7f6"; - }; - } - { - name = "quote___quote_0.4.0.tgz"; - path = fetchurl { - name = "quote___quote_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/quote/-/quote-0.4.0.tgz"; - sha1 = "10839217f6c1362b89194044d29b233fd7f32f01"; - }; - } - { - name = "raf___raf_3.4.1.tgz"; - path = fetchurl { - name = "raf___raf_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz"; - sha1 = "0742e99a4a6552f445d73e3ee0328af0ff1ede39"; - }; - } - { - name = "randombytes___randombytes_2.1.0.tgz"; - path = fetchurl { - name = "randombytes___randombytes_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; - sha1 = "df6f84372f0270dc65cdf6291349ab7a473d4f2a"; - }; - } - { - name = "randomfill___randomfill_1.0.4.tgz"; - path = fetchurl { - name = "randomfill___randomfill_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz"; - sha1 = "c92196fc86ab42be983f1bf31778224931d61458"; - }; - } - { - name = "range_parser___range_parser_1.2.1.tgz"; - path = fetchurl { - name = "range_parser___range_parser_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; - sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; - }; - } - { - name = "raw_body___raw_body_2.4.0.tgz"; - path = fetchurl { - name = "raw_body___raw_body_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; - sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; - }; - } - { - name = "react_dom___react_dom_16.14.0.tgz"; - path = fetchurl { - name = "react_dom___react_dom_16.14.0.tgz"; - url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz"; - sha1 = "7ad838ec29a777fb3c75c3a190f661cf92ab8b89"; - }; - } - { - name = "react_event_listener___react_event_listener_0.6.6.tgz"; - path = fetchurl { - name = "react_event_listener___react_event_listener_0.6.6.tgz"; - url = "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.6.6.tgz"; - sha1 = "758f7b991cad9086dd39fd29fad72127e1d8962a"; - }; - } - { - name = "react_hotkeys___react_hotkeys_1.1.4.tgz"; - path = fetchurl { - name = "react_hotkeys___react_hotkeys_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/react-hotkeys/-/react-hotkeys-1.1.4.tgz"; - sha1 = "a0712aa2e0c03a759fd7885808598497a4dace72"; - }; - } - { - name = "react_immutable_proptypes___react_immutable_proptypes_2.2.0.tgz"; - path = fetchurl { - name = "react_immutable_proptypes___react_immutable_proptypes_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz"; - sha1 = "cce96d68cc3c18e89617cbf3092d08e35126af4a"; - }; - } - { - name = "react_immutable_pure_component___react_immutable_pure_component_2.2.2.tgz"; - path = fetchurl { - name = "react_immutable_pure_component___react_immutable_pure_component_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/react-immutable-pure-component/-/react-immutable-pure-component-2.2.2.tgz"; - sha1 = "3014d3e20cd5a7a4db73b81f1f1464f4d351684b"; - }; - } - { - name = "react_infinite_scroller___react_infinite_scroller_1.2.4.tgz"; - path = fetchurl { - name = "react_infinite_scroller___react_infinite_scroller_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/react-infinite-scroller/-/react-infinite-scroller-1.2.4.tgz"; - sha1 = "f67eaec4940a4ce6417bebdd6e3433bfc38826e9"; - }; - } - { - name = "react_input_autosize___react_input_autosize_3.0.0.tgz"; - path = fetchurl { - name = "react_input_autosize___react_input_autosize_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-3.0.0.tgz"; - sha1 = "6b5898c790d4478d69420b55441fcc31d5c50a85"; - }; - } - { - name = "react_intl_translations_manager___react_intl_translations_manager_5.0.3.tgz"; - path = fetchurl { - name = "react_intl_translations_manager___react_intl_translations_manager_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/react-intl-translations-manager/-/react-intl-translations-manager-5.0.3.tgz"; - sha1 = "aee010ecf35975673e033ca5d7d3f4147894324d"; - }; - } - { - name = "react_intl___react_intl_2.9.0.tgz"; - path = fetchurl { - name = "react_intl___react_intl_2.9.0.tgz"; - url = "https://registry.yarnpkg.com/react-intl/-/react-intl-2.9.0.tgz"; - sha1 = "c97c5d17d4718f1575fdbd5a769f96018a3b1843"; - }; - } - { - name = "react_is___react_is_16.13.1.tgz"; - path = fetchurl { - name = "react_is___react_is_16.13.1.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; - sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; - }; - } - { - name = "react_is___react_is_17.0.1.tgz"; - path = fetchurl { - name = "react_is___react_is_17.0.1.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz"; - sha1 = "5b3531bd76a645a4c9fb6e693ed36419e3301339"; - }; - } - { - name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; - path = fetchurl { - name = "react_lifecycles_compat___react_lifecycles_compat_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"; - sha1 = "4f1a273afdfc8f3488a8c516bfda78f872352362"; - }; - } - { - name = "react_masonry_infinite___react_masonry_infinite_1.2.2.tgz"; - path = fetchurl { - name = "react_masonry_infinite___react_masonry_infinite_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/react-masonry-infinite/-/react-masonry-infinite-1.2.2.tgz"; - sha1 = "20c1386f9ccdda9747527c8f42bc2c02dd2e7951"; - }; - } - { - name = "react_motion___react_motion_0.5.2.tgz"; - path = fetchurl { - name = "react_motion___react_motion_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/react-motion/-/react-motion-0.5.2.tgz"; - sha1 = "0dd3a69e411316567927917c6626551ba0607316"; - }; - } - { - name = "react_notification___react_notification_6.8.5.tgz"; - path = fetchurl { - name = "react_notification___react_notification_6.8.5.tgz"; - url = "https://registry.yarnpkg.com/react-notification/-/react-notification-6.8.5.tgz"; - sha1 = "7ea90a633bb2a280d899e30c93cf372265cce4f0"; - }; - } - { - name = "react_overlays___react_overlays_0.9.3.tgz"; - path = fetchurl { - name = "react_overlays___react_overlays_0.9.3.tgz"; - url = "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.9.3.tgz"; - sha1 = "5bac8c1e9e7e057a125181dee2d784864dd62902"; - }; - } - { - name = "react_redux_loading_bar___react_redux_loading_bar_4.0.8.tgz"; - path = fetchurl { - name = "react_redux_loading_bar___react_redux_loading_bar_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/react-redux-loading-bar/-/react-redux-loading-bar-4.0.8.tgz"; - sha1 = "e84d59d1517b79f53b0f39c8ddb40682af648c1b"; - }; - } - { - name = "react_redux___react_redux_7.2.4.tgz"; - path = fetchurl { - name = "react_redux___react_redux_7.2.4.tgz"; - url = "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.4.tgz"; - sha1 = "1ebb474032b72d806de2e0519cd07761e222e225"; - }; - } - { - name = "react_router_dom___react_router_dom_4.3.1.tgz"; - path = fetchurl { - name = "react_router_dom___react_router_dom_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz"; - sha1 = "4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"; - }; - } - { - name = "react_router_scroll_4___react_router_scroll_4_1.0.0_beta.2.tgz"; - path = fetchurl { - name = "react_router_scroll_4___react_router_scroll_4_1.0.0_beta.2.tgz"; - url = "https://registry.yarnpkg.com/react-router-scroll-4/-/react-router-scroll-4-1.0.0-beta.2.tgz"; - sha1 = "d887063ec0f66124aaf450158dd158ff7d3dc279"; - }; - } - { - name = "react_router___react_router_4.3.1.tgz"; - path = fetchurl { - name = "react_router___react_router_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz"; - sha1 = "aada4aef14c809cb2e686b05cee4742234506c4e"; - }; - } - { - name = "react_select___react_select_4.3.1.tgz"; - path = fetchurl { - name = "react_select___react_select_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz"; - sha1 = "389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81"; - }; - } - { - name = "react_sparklines___react_sparklines_1.7.0.tgz"; - path = fetchurl { - name = "react_sparklines___react_sparklines_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/react-sparklines/-/react-sparklines-1.7.0.tgz"; - sha1 = "9b1d97e8c8610095eeb2ad658d2e1fcf91f91a60"; - }; - } - { - name = "react_swipeable_views_core___react_swipeable_views_core_0.14.0.tgz"; - path = fetchurl { - name = "react_swipeable_views_core___react_swipeable_views_core_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.14.0.tgz"; - sha1 = "6ac443a7cc7bc5ea022fbd549292bb5fff361cce"; - }; - } - { - name = "react_swipeable_views_utils___react_swipeable_views_utils_0.14.0.tgz"; - path = fetchurl { - name = "react_swipeable_views_utils___react_swipeable_views_utils_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/react-swipeable-views-utils/-/react-swipeable-views-utils-0.14.0.tgz"; - sha1 = "6b76e251906747482730c22002fe47ab1014ba32"; - }; - } - { - name = "react_swipeable_views___react_swipeable_views_0.14.0.tgz"; - path = fetchurl { - name = "react_swipeable_views___react_swipeable_views_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/react-swipeable-views/-/react-swipeable-views-0.14.0.tgz"; - sha1 = "149c0df3d92220cc89e3f6d5c04a78dfe46f9b54"; - }; - } - { - name = "react_test_renderer___react_test_renderer_16.14.0.tgz"; - path = fetchurl { - name = "react_test_renderer___react_test_renderer_16.14.0.tgz"; - url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.14.0.tgz"; - sha1 = "e98360087348e260c56d4fe2315e970480c228ae"; - }; - } - { - name = "react_textarea_autosize___react_textarea_autosize_8.3.2.tgz"; - path = fetchurl { - name = "react_textarea_autosize___react_textarea_autosize_8.3.2.tgz"; - url = "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.2.tgz"; - sha1 = "4f9374d357b0a6f6469956726722549124a1b2db"; - }; - } - { - name = "react_toggle___react_toggle_4.1.2.tgz"; - path = fetchurl { - name = "react_toggle___react_toggle_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/react-toggle/-/react-toggle-4.1.2.tgz"; - sha1 = "b00500832f925ad524356d909821821ae39f6c52"; - }; - } - { - name = "react_transition_group___react_transition_group_2.9.0.tgz"; - path = fetchurl { - name = "react_transition_group___react_transition_group_2.9.0.tgz"; - url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz"; - sha1 = "df9cdb025796211151a436c69a8f3b97b5b07c8d"; - }; - } - { - name = "react_transition_group___react_transition_group_4.3.0.tgz"; - path = fetchurl { - name = "react_transition_group___react_transition_group_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.3.0.tgz"; - sha1 = "fea832e386cf8796c58b61874a3319704f5ce683"; - }; - } - { - name = "react___react_16.14.0.tgz"; - path = fetchurl { - name = "react___react_16.14.0.tgz"; - url = "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz"; - sha1 = "94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"; - }; - } - { - name = "read_pkg_up___read_pkg_up_3.0.0.tgz"; - path = fetchurl { - name = "read_pkg_up___read_pkg_up_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz"; - sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07"; - }; - } - { - name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; - path = fetchurl { - name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; - sha1 = "f3a6135758459733ae2b95638056e1854e7ef507"; - }; - } - { - name = "read_pkg___read_pkg_3.0.0.tgz"; - path = fetchurl { - name = "read_pkg___read_pkg_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz"; - sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; - }; - } - { - name = "read_pkg___read_pkg_5.2.0.tgz"; - path = fetchurl { - name = "read_pkg___read_pkg_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; - sha1 = "7bf295438ca5a33e56cd30e053b34ee7250c93cc"; - }; - } - { - name = "readable_stream___readable_stream_2.3.7.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_2.3.7.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; - }; - } - { - name = "readable_stream___readable_stream_3.6.0.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; - }; - } - { - name = "readdirp___readdirp_2.2.1.tgz"; - path = fetchurl { - name = "readdirp___readdirp_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"; - sha1 = "0e87622a3325aa33e892285caf8b4e846529a525"; - }; - } - { - name = "readdirp___readdirp_3.5.0.tgz"; - path = fetchurl { - name = "readdirp___readdirp_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz"; - sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"; - }; - } - { - name = "readline2___readline2_1.0.1.tgz"; - path = fetchurl { - name = "readline2___readline2_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz"; - sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; - }; - } - { - name = "redent___redent_3.0.0.tgz"; - path = fetchurl { - name = "redent___redent_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz"; - sha1 = "e557b7998316bb53c9f1f56fa626352c6963059f"; - }; - } - { - name = "redis_commands___redis_commands_1.7.0.tgz"; - path = fetchurl { - name = "redis_commands___redis_commands_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.7.0.tgz"; - sha1 = "15a6fea2d58281e27b1cd1acfb4b293e278c3a89"; - }; - } - { - name = "redis_errors___redis_errors_1.2.0.tgz"; - path = fetchurl { - name = "redis_errors___redis_errors_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz"; - sha1 = "eb62d2adb15e4eaf4610c04afe1529384250abad"; - }; - } - { - name = "redis_parser___redis_parser_3.0.0.tgz"; - path = fetchurl { - name = "redis_parser___redis_parser_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz"; - sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; - }; - } - { - name = "redis___redis_3.1.2.tgz"; - path = fetchurl { - name = "redis___redis_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/redis/-/redis-3.1.2.tgz"; - sha1 = "766851117e80653d23e0ed536254677ab647638c"; - }; - } - { - name = "redux_immutable___redux_immutable_4.0.0.tgz"; - path = fetchurl { - name = "redux_immutable___redux_immutable_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/redux-immutable/-/redux-immutable-4.0.0.tgz"; - sha1 = "3a1a32df66366462b63691f0e1dc35e472bbc9f3"; - }; - } - { - name = "redux_thunk___redux_thunk_2.3.0.tgz"; - path = fetchurl { - name = "redux_thunk___redux_thunk_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz"; - sha1 = "51c2c19a185ed5187aaa9a2d08b666d0d6467622"; - }; - } - { - name = "redux___redux_4.1.0.tgz"; - path = fetchurl { - name = "redux___redux_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/redux/-/redux-4.1.0.tgz"; - sha1 = "eb049679f2f523c379f1aff345c8612f294c88d4"; - }; - } - { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; - path = fetchurl { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; - sha1 = "e5de7111d655e7ba60c057dbe9ff37c87e65cdec"; - }; - } - { - name = "regenerate___regenerate_1.4.1.tgz"; - path = fetchurl { - name = "regenerate___regenerate_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz"; - sha1 = "cad92ad8e6b591773485fbe05a485caf4f457e6f"; - }; - } - { - name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; - }; - } - { - name = "regenerator_runtime___regenerator_runtime_0.12.1.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.12.1.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz"; - sha1 = "fa1a71544764c036f8c49b13a08b2594c9f8a0de"; - }; - } - { - name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; - sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55"; - }; - } - { - name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; - path = fetchurl { - name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; - url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; - sha1 = "c98da154683671c9c4dcb16ece736517e1b7feb4"; - }; - } - { - name = "regex_not___regex_not_1.0.2.tgz"; - path = fetchurl { - name = "regex_not___regex_not_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"; - sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; - }; - } - { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; - sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; - }; - } - { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; - sha1 = "7ef352ae8d159e758c0eadca6f8fcb4eef07be26"; - }; - } - { - name = "regexpp___regexpp_3.1.0.tgz"; - path = fetchurl { - name = "regexpp___regexpp_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; - sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; - }; - } - { - name = "regexpu_core___regexpu_core_4.7.1.tgz"; - path = fetchurl { - name = "regexpu_core___regexpu_core_4.7.1.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz"; - sha1 = "2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"; - }; - } - { - name = "regjsgen___regjsgen_0.5.2.tgz"; - path = fetchurl { - name = "regjsgen___regjsgen_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz"; - sha1 = "92ff295fb1deecbf6ecdab2543d207e91aa33733"; - }; - } - { - name = "regjsparser___regjsparser_0.6.4.tgz"; - path = fetchurl { - name = "regjsparser___regjsparser_0.6.4.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz"; - sha1 = "a769f8684308401a66e9b529d2436ff4d0666272"; - }; - } - { - name = "rellax___rellax_1.12.1.tgz"; - path = fetchurl { - name = "rellax___rellax_1.12.1.tgz"; - url = "https://registry.yarnpkg.com/rellax/-/rellax-1.12.1.tgz"; - sha1 = "1b433ef7ac4aa3573449a33efab391c112f6b34d"; - }; - } - { - name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; - path = fetchurl { - name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; - sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; - }; - } - { - name = "repeat_element___repeat_element_1.1.3.tgz"; - path = fetchurl { - name = "repeat_element___repeat_element_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz"; - sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce"; - }; - } - { - name = "repeat_string___repeat_string_1.6.1.tgz"; - path = fetchurl { - name = "repeat_string___repeat_string_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - } - { - name = "request_promise_core___request_promise_core_1.1.4.tgz"; - path = fetchurl { - name = "request_promise_core___request_promise_core_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz"; - sha1 = "3eedd4223208d419867b78ce815167d10593a22f"; - }; - } - { - name = "request_promise_native___request_promise_native_1.0.9.tgz"; - path = fetchurl { - name = "request_promise_native___request_promise_native_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz"; - sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28"; - }; - } - { - name = "request___request_2.88.2.tgz"; - path = fetchurl { - name = "request___request_2.88.2.tgz"; - url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; - sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; - }; - } - { - name = "requestidlecallback___requestidlecallback_0.3.0.tgz"; - path = fetchurl { - name = "requestidlecallback___requestidlecallback_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/requestidlecallback/-/requestidlecallback-0.3.0.tgz"; - sha1 = "6fb74e0733f90df3faa4838f9f6a2a5f9b742ac5"; - }; - } - { - name = "require_directory___require_directory_2.1.1.tgz"; - path = fetchurl { - name = "require_directory___require_directory_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; - }; - } - { - name = "require_from_string___require_from_string_2.0.2.tgz"; - path = fetchurl { - name = "require_from_string___require_from_string_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; - sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; - }; - } - { - name = "require_main_filename___require_main_filename_2.0.0.tgz"; - path = fetchurl { - name = "require_main_filename___require_main_filename_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; - }; - } - { - name = "require_package_name___require_package_name_2.0.1.tgz"; - path = fetchurl { - name = "require_package_name___require_package_name_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz"; - sha1 = "c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"; - }; - } - { - name = "require_uncached___require_uncached_1.0.3.tgz"; - path = fetchurl { - name = "require_uncached___require_uncached_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz"; - sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; - }; - } - { - name = "requires_port___requires_port_1.0.0.tgz"; - path = fetchurl { - name = "requires_port___requires_port_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"; - sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; - }; - } - { - name = "reselect___reselect_4.0.0.tgz"; - path = fetchurl { - name = "reselect___reselect_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz"; - sha1 = "f2529830e5d3d0e021408b246a206ef4ea4437f7"; - }; - } - { - name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; - path = fetchurl { - name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; - sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; - }; - } - { - name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; - path = fetchurl { - name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; - sha1 = "0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"; - }; - } - { - name = "resolve_dir___resolve_dir_1.0.1.tgz"; - path = fetchurl { - name = "resolve_dir___resolve_dir_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz"; - sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; - }; - } - { - name = "resolve_from___resolve_from_1.0.1.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz"; - sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"; - }; - } - { - name = "resolve_from___resolve_from_3.0.0.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz"; - sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; - }; - } - { - name = "resolve_from___resolve_from_4.0.0.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; - sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; - }; - } - { - name = "resolve_from___resolve_from_5.0.0.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; - sha1 = "c35225843df8f776df21c57557bc087e9dfdfc69"; - }; - } - { - name = "resolve_pathname___resolve_pathname_2.2.0.tgz"; - path = fetchurl { - name = "resolve_pathname___resolve_pathname_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz"; - sha1 = "7e9ae21ed815fd63ab189adeee64dc831eefa879"; - }; - } - { - name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; - path = fetchurl { - name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz"; - sha1 = "99d02224d3cf263689becbb393bc560313025dcd"; - }; - } - { - name = "resolve_url___resolve_url_0.2.1.tgz"; - path = fetchurl { - name = "resolve_url___resolve_url_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz"; - sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; - }; - } - { - name = "resolve___resolve_1.20.0.tgz"; - path = fetchurl { - name = "resolve___resolve_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; - sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; - }; - } - { - name = "resolve___resolve_2.0.0_next.3.tgz"; - path = fetchurl { - name = "resolve___resolve_2.0.0_next.3.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz"; - sha1 = "d41016293d4a8586a39ca5d9b5f15cbea1f55e46"; - }; - } - { - name = "restore_cursor___restore_cursor_1.0.1.tgz"; - path = fetchurl { - name = "restore_cursor___restore_cursor_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz"; - sha1 = "34661f46886327fed2991479152252df92daa541"; - }; - } - { - name = "ret___ret_0.1.15.tgz"; - path = fetchurl { - name = "ret___ret_0.1.15.tgz"; - url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; - sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; - }; - } - { - name = "retry___retry_0.12.0.tgz"; - path = fetchurl { - name = "retry___retry_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; - sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; - }; - } - { - name = "rgb_regex___rgb_regex_1.0.1.tgz"; - path = fetchurl { - name = "rgb_regex___rgb_regex_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz"; - sha1 = "c0e0d6882df0e23be254a475e8edd41915feaeb1"; - }; - } - { - name = "rgba_regex___rgba_regex_1.0.0.tgz"; - path = fetchurl { - name = "rgba_regex___rgba_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz"; - sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3"; - }; - } - { - name = "rimraf___rimraf_2.7.1.tgz"; - path = fetchurl { - name = "rimraf___rimraf_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; - sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; - }; - } - { - name = "rimraf___rimraf_3.0.2.tgz"; - path = fetchurl { - name = "rimraf___rimraf_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; - sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; - }; - } - { - name = "rimraf___rimraf_2.6.3.tgz"; - path = fetchurl { - name = "rimraf___rimraf_2.6.3.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; - sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"; - }; - } - { - name = "ripemd160___ripemd160_2.0.2.tgz"; - path = fetchurl { - name = "ripemd160___ripemd160_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz"; - sha1 = "a1c1a6f624751577ba5d07914cbc92850585890c"; - }; - } - { - name = "rsvp___rsvp_4.8.5.tgz"; - path = fetchurl { - name = "rsvp___rsvp_4.8.5.tgz"; - url = "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz"; - sha1 = "c8f155311d167f68f21e168df71ec5b083113734"; - }; - } - { - name = "run_async___run_async_0.1.0.tgz"; - path = fetchurl { - name = "run_async___run_async_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz"; - sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389"; - }; - } - { - name = "run_queue___run_queue_1.0.3.tgz"; - path = fetchurl { - name = "run_queue___run_queue_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz"; - sha1 = "e848396f057d223f24386924618e25694161ec47"; - }; - } - { - name = "rx_lite___rx_lite_3.1.2.tgz"; - path = fetchurl { - name = "rx_lite___rx_lite_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz"; - sha1 = "19ce502ca572665f3b647b10939f97fd1615f102"; - }; - } - { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; - }; - } - { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; - }; - } - { - name = "safe_regex___safe_regex_1.1.0.tgz"; - path = fetchurl { - name = "safe_regex___safe_regex_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz"; - sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; - }; - } - { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - path = fetchurl { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; - }; - } - { - name = "sane___sane_4.1.0.tgz"; - path = fetchurl { - name = "sane___sane_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz"; - sha1 = "ed881fd922733a6c461bc189dc2b6c006f3ffded"; - }; - } - { - name = "sass_lint___sass_lint_1.13.1.tgz"; - path = fetchurl { - name = "sass_lint___sass_lint_1.13.1.tgz"; - url = "https://registry.yarnpkg.com/sass-lint/-/sass-lint-1.13.1.tgz"; - sha1 = "5fd2b2792e9215272335eb0f0dc607f61e8acc8f"; - }; - } - { - name = "sass_loader___sass_loader_10.2.0.tgz"; - path = fetchurl { - name = "sass_loader___sass_loader_10.2.0.tgz"; - url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.2.0.tgz"; - sha1 = "3d64c1590f911013b3fa48a0b22a83d5e1494716"; - }; - } - { - name = "sass___sass_1.34.0.tgz"; - path = fetchurl { - name = "sass___sass_1.34.0.tgz"; - url = "https://registry.yarnpkg.com/sass/-/sass-1.34.0.tgz"; - sha1 = "e46d5932d8b0ecc4feb846d861f26a578f7f7172"; - }; - } - { - name = "sax___sax_1.2.4.tgz"; - path = fetchurl { - name = "sax___sax_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; - sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; - }; - } - { - name = "saxes___saxes_5.0.1.tgz"; - path = fetchurl { - name = "saxes___saxes_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz"; - sha1 = "eebab953fa3b7608dbe94e5dadb15c888fa6696d"; - }; - } - { - name = "scheduler___scheduler_0.19.1.tgz"; - path = fetchurl { - name = "scheduler___scheduler_0.19.1.tgz"; - url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz"; - sha1 = "4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"; - }; - } - { - name = "schema_utils___schema_utils_1.0.0.tgz"; - path = fetchurl { - name = "schema_utils___schema_utils_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz"; - sha1 = "0b79a93204d7b600d4b2850d1f66c2a34951c770"; - }; - } - { - name = "schema_utils___schema_utils_2.7.1.tgz"; - path = fetchurl { - name = "schema_utils___schema_utils_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; - sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"; - }; - } - { - name = "schema_utils___schema_utils_3.0.0.tgz"; - path = fetchurl { - name = "schema_utils___schema_utils_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz"; - sha1 = "67502f6aa2b66a2d4032b4279a2944978a0913ef"; - }; - } - { - name = "scroll_behavior___scroll_behavior_0.9.12.tgz"; - path = fetchurl { - name = "scroll_behavior___scroll_behavior_0.9.12.tgz"; - url = "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.12.tgz"; - sha1 = "1c22d273ec4ce6cd4714a443fead50227da9424c"; - }; - } - { - name = "select_hose___select_hose_2.0.0.tgz"; - path = fetchurl { - name = "select_hose___select_hose_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz"; - sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; - }; - } - { - name = "selfsigned___selfsigned_1.10.8.tgz"; - path = fetchurl { - name = "selfsigned___selfsigned_1.10.8.tgz"; - url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz"; - sha1 = "0d17208b7d12c33f8eac85c41835f27fc3d81a30"; - }; - } - { - name = "semver___semver_5.7.1.tgz"; - path = fetchurl { - name = "semver___semver_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; - }; - } - { - name = "semver___semver_7.0.0.tgz"; - path = fetchurl { - name = "semver___semver_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; - sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; - }; - } - { - name = "semver___semver_6.3.0.tgz"; - path = fetchurl { - name = "semver___semver_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; - }; - } - { - name = "semver___semver_7.3.5.tgz"; - path = fetchurl { - name = "semver___semver_7.3.5.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; - sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; - }; - } - { - name = "send___send_0.17.1.tgz"; - path = fetchurl { - name = "send___send_0.17.1.tgz"; - url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; - sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; - }; - } - { - name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; - path = fetchurl { - name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; - sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61"; - }; - } - { - name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; - path = fetchurl { - name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; - sha1 = "7886ec848049a462467a97d3d918ebb2aaf934f4"; - }; - } - { - name = "serve_index___serve_index_1.9.1.tgz"; - path = fetchurl { - name = "serve_index___serve_index_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz"; - sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; - }; - } - { - name = "serve_static___serve_static_1.14.1.tgz"; - path = fetchurl { - name = "serve_static___serve_static_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; - sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; - }; - } - { - name = "set_blocking___set_blocking_2.0.0.tgz"; - path = fetchurl { - name = "set_blocking___set_blocking_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; - }; - } - { - name = "set_value___set_value_2.0.1.tgz"; - path = fetchurl { - name = "set_value___set_value_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; - sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; - }; - } - { - name = "setimmediate___setimmediate_1.0.5.tgz"; - path = fetchurl { - name = "setimmediate___setimmediate_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz"; - sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; - }; - } - { - name = "setprototypeof___setprototypeof_1.1.0.tgz"; - path = fetchurl { - name = "setprototypeof___setprototypeof_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz"; - sha1 = "d0bd85536887b6fe7c0d818cb962d9d91c54e656"; - }; - } - { - name = "setprototypeof___setprototypeof_1.1.1.tgz"; - path = fetchurl { - name = "setprototypeof___setprototypeof_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; - }; - } - { - name = "sha.js___sha.js_2.4.11.tgz"; - path = fetchurl { - name = "sha.js___sha.js_2.4.11.tgz"; - url = "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz"; - sha1 = "37a5cf0b81ecbc6943de109ba2960d1b26584ae7"; - }; - } - { - name = "shallow_clone___shallow_clone_3.0.1.tgz"; - path = fetchurl { - name = "shallow_clone___shallow_clone_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz"; - sha1 = "8f2981ad92531f55035b01fb230769a40e02efa3"; - }; - } - { - name = "shallow_equal___shallow_equal_1.2.1.tgz"; - path = fetchurl { - name = "shallow_equal___shallow_equal_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz"; - sha1 = "4c16abfa56043aa20d050324efa68940b0da79da"; - }; - } - { - name = "shebang_command___shebang_command_1.2.0.tgz"; - path = fetchurl { - name = "shebang_command___shebang_command_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; - }; - } - { - name = "shebang_command___shebang_command_2.0.0.tgz"; - path = fetchurl { - name = "shebang_command___shebang_command_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; - sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; - }; - } - { - name = "shebang_regex___shebang_regex_1.0.0.tgz"; - path = fetchurl { - name = "shebang_regex___shebang_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; - }; - } - { - name = "shebang_regex___shebang_regex_3.0.0.tgz"; - path = fetchurl { - name = "shebang_regex___shebang_regex_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; - }; - } - { - name = "shelljs___shelljs_0.6.1.tgz"; - path = fetchurl { - name = "shelljs___shelljs_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.1.tgz"; - sha1 = "ec6211bed1920442088fe0f70b2837232ed2c8a8"; - }; - } - { - name = "shellwords___shellwords_0.1.1.tgz"; - path = fetchurl { - name = "shellwords___shellwords_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz"; - sha1 = "d6b9181c1a48d397324c84871efbcfc73fc0654b"; - }; - } - { - name = "side_channel___side_channel_1.0.4.tgz"; - path = fetchurl { - name = "side_channel___side_channel_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz"; - sha1 = "efce5c8fdc104ee751b25c58d4290011fa5ea2cf"; - }; - } - { - name = "signal_exit___signal_exit_3.0.3.tgz"; - path = fetchurl { - name = "signal_exit___signal_exit_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; - sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; - }; - } - { - name = "simple_swizzle___simple_swizzle_0.2.2.tgz"; - path = fetchurl { - name = "simple_swizzle___simple_swizzle_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; - sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; - }; - } - { - name = "sirv___sirv_1.0.10.tgz"; - path = fetchurl { - name = "sirv___sirv_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/sirv/-/sirv-1.0.10.tgz"; - sha1 = "3e591f5a9ae2520f50d5830f5fae38d97e7be194"; - }; - } - { - name = "sisteransi___sisteransi_1.0.5.tgz"; - path = fetchurl { - name = "sisteransi___sisteransi_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; - sha1 = "134d681297756437cc05ca01370d3a7a571075ed"; - }; - } - { - name = "slash___slash_1.0.0.tgz"; - path = fetchurl { - name = "slash___slash_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz"; - sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; - }; - } - { - name = "slash___slash_3.0.0.tgz"; - path = fetchurl { - name = "slash___slash_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; - sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; - }; - } - { - name = "slice_ansi___slice_ansi_0.0.4.tgz"; - path = fetchurl { - name = "slice_ansi___slice_ansi_0.0.4.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz"; - sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; - }; - } - { - name = "slice_ansi___slice_ansi_4.0.0.tgz"; - path = fetchurl { - name = "slice_ansi___slice_ansi_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; - sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; - }; - } - { - name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; - path = fetchurl { - name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; - sha1 = "6c175f86ff14bdb0724563e8f3c1b021a286853b"; - }; - } - { - name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; - path = fetchurl { - name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; - sha1 = "f956479486f2acd79700693f6f7b805e45ab56e2"; - }; - } - { - name = "snapdragon___snapdragon_0.8.2.tgz"; - path = fetchurl { - name = "snapdragon___snapdragon_0.8.2.tgz"; - url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; - sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d"; - }; - } - { - name = "sockjs_client___sockjs_client_1.5.0.tgz"; - path = fetchurl { - name = "sockjs_client___sockjs_client_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.0.tgz"; - sha1 = "2f8ff5d4b659e0d092f7aba0b7c386bd2aa20add"; - }; - } - { - name = "sockjs___sockjs_0.3.21.tgz"; - path = fetchurl { - name = "sockjs___sockjs_0.3.21.tgz"; - url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz"; - sha1 = "b34ffb98e796930b60a0cfa11904d6a339a7d417"; - }; - } - { - name = "source_list_map___source_list_map_2.0.1.tgz"; - path = fetchurl { - name = "source_list_map___source_list_map_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz"; - sha1 = "3993bd873bfc48479cca9ea3a547835c7c154b34"; - }; - } - { - name = "source_map_js___source_map_js_0.6.2.tgz"; - path = fetchurl { - name = "source_map_js___source_map_js_0.6.2.tgz"; - url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz"; - sha1 = "0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"; - }; - } - { - name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; - path = fetchurl { - name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; - sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; - }; - } - { - name = "source_map_resolve___source_map_resolve_0.6.0.tgz"; - path = fetchurl { - name = "source_map_resolve___source_map_resolve_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz"; - sha1 = "3d9df87e236b53f16d01e58150fc7711138e5ed2"; - }; - } - { - name = "source_map_support___source_map_support_0.5.19.tgz"; - path = fetchurl { - name = "source_map_support___source_map_support_0.5.19.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; - sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; - }; - } - { - name = "source_map_url___source_map_url_0.4.0.tgz"; - path = fetchurl { - name = "source_map_url___source_map_url_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; - }; - } - { - name = "source_map___source_map_0.5.6.tgz"; - path = fetchurl { - name = "source_map___source_map_0.5.6.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz"; - sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; - }; - } - { - name = "source_map___source_map_0.5.7.tgz"; - path = fetchurl { - name = "source_map___source_map_0.5.7.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; - }; - } - { - name = "source_map___source_map_0.6.1.tgz"; - path = fetchurl { - name = "source_map___source_map_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; - }; - } - { - name = "source_map___source_map_0.7.3.tgz"; - path = fetchurl { - name = "source_map___source_map_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; - sha1 = "5302f8169031735226544092e64981f751750383"; - }; - } - { - name = "spdx_correct___spdx_correct_3.1.1.tgz"; - path = fetchurl { - name = "spdx_correct___spdx_correct_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; - sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; - }; - } - { - name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; - path = fetchurl { - name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; - sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; - }; - } - { - name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; - path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; - sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; - }; - } - { - name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; - path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; - sha1 = "c80757383c28abf7296744998cbc106ae8b854ce"; - }; - } - { - name = "spdy_transport___spdy_transport_3.0.0.tgz"; - path = fetchurl { - name = "spdy_transport___spdy_transport_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz"; - sha1 = "00d4863a6400ad75df93361a1608605e5dcdcf31"; - }; - } - { - name = "spdy___spdy_4.0.2.tgz"; - path = fetchurl { - name = "spdy___spdy_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz"; - sha1 = "b74f466203a3eda452c02492b91fb9e84a27677b"; - }; - } - { - name = "split_string___split_string_3.1.0.tgz"; - path = fetchurl { - name = "split_string___split_string_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"; - sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2"; - }; - } - { - name = "split2___split2_3.2.2.tgz"; - path = fetchurl { - name = "split2___split2_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz"; - sha1 = "bf2cf2a37d838312c249c89206fd7a17dd12365f"; - }; - } - { - name = "sprintf_js___sprintf_js_1.0.3.tgz"; - path = fetchurl { - name = "sprintf_js___sprintf_js_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; - }; - } - { - name = "sshpk___sshpk_1.16.1.tgz"; - path = fetchurl { - name = "sshpk___sshpk_1.16.1.tgz"; - url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; - sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; - }; - } - { - name = "ssri___ssri_6.0.2.tgz"; - path = fetchurl { - name = "ssri___ssri_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz"; - sha1 = "157939134f20464e7301ddba3e90ffa8f7728ac5"; - }; - } - { - name = "ssri___ssri_8.0.0.tgz"; - path = fetchurl { - name = "ssri___ssri_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-8.0.0.tgz"; - sha1 = "79ca74e21f8ceaeddfcb4b90143c458b8d988808"; - }; - } - { - name = "stable___stable_0.1.8.tgz"; - path = fetchurl { - name = "stable___stable_0.1.8.tgz"; - url = "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz"; - sha1 = "836eb3c8382fe2936feaf544631017ce7d47a3cf"; - }; - } - { - name = "stack_generator___stack_generator_2.0.5.tgz"; - path = fetchurl { - name = "stack_generator___stack_generator_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.5.tgz"; - sha1 = "fb00e5b4ee97de603e0773ea78ce944d81596c36"; - }; - } - { - name = "stack_utils___stack_utils_2.0.2.tgz"; - path = fetchurl { - name = "stack_utils___stack_utils_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz"; - sha1 = "5cf48b4557becb4638d0bc4f21d23f5d19586593"; - }; - } - { - name = "stackframe___stackframe_1.2.0.tgz"; - path = fetchurl { - name = "stackframe___stackframe_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz"; - sha1 = "52429492d63c62eb989804c11552e3d22e779303"; - }; - } - { - name = "stacktrace_gps___stacktrace_gps_3.0.4.tgz"; - path = fetchurl { - name = "stacktrace_gps___stacktrace_gps_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.0.4.tgz"; - sha1 = "7688dc2fc09ffb3a13165ebe0dbcaf41bcf0c69a"; - }; - } - { - name = "stacktrace_js___stacktrace_js_2.0.2.tgz"; - path = fetchurl { - name = "stacktrace_js___stacktrace_js_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/stacktrace-js/-/stacktrace-js-2.0.2.tgz"; - sha1 = "4ca93ea9f494752d55709a081d400fdaebee897b"; - }; - } - { - name = "static_extend___static_extend_0.1.2.tgz"; - path = fetchurl { - name = "static_extend___static_extend_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"; - sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; - }; - } - { - name = "statuses___statuses_1.5.0.tgz"; - path = fetchurl { - name = "statuses___statuses_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; - sha1 = "161c7dac177659fd9811f43771fa99381478628c"; - }; - } - { - name = "stealthy_require___stealthy_require_1.1.1.tgz"; - path = fetchurl { - name = "stealthy_require___stealthy_require_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz"; - sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; - }; - } - { - name = "stream_browserify___stream_browserify_2.0.2.tgz"; - path = fetchurl { - name = "stream_browserify___stream_browserify_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz"; - sha1 = "87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"; - }; - } - { - name = "stream_each___stream_each_1.2.3.tgz"; - path = fetchurl { - name = "stream_each___stream_each_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz"; - sha1 = "ebe27a0c389b04fbcc233642952e10731afa9bae"; - }; - } - { - name = "stream_http___stream_http_2.8.3.tgz"; - path = fetchurl { - name = "stream_http___stream_http_2.8.3.tgz"; - url = "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz"; - sha1 = "b2d242469288a5a27ec4fe8933acf623de6514fc"; - }; - } - { - name = "stream_shift___stream_shift_1.0.1.tgz"; - path = fetchurl { - name = "stream_shift___stream_shift_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"; - sha1 = "d7088281559ab2778424279b0877da3c392d5a3d"; - }; - } - { - name = "string_length___string_length_4.0.1.tgz"; - path = fetchurl { - name = "string_length___string_length_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz"; - sha1 = "4a973bf31ef77c4edbceadd6af2611996985f8a1"; - }; - } - { - name = "string_width___string_width_1.0.2.tgz"; - path = fetchurl { - name = "string_width___string_width_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - } - { - name = "string_width___string_width_2.1.1.tgz"; - path = fetchurl { - name = "string_width___string_width_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; - sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; - }; - } - { - name = "string_width___string_width_3.1.0.tgz"; - path = fetchurl { - name = "string_width___string_width_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; - sha1 = "22767be21b62af1081574306f69ac51b62203961"; - }; - } - { - name = "string_width___string_width_4.2.0.tgz"; - path = fetchurl { - name = "string_width___string_width_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; - sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; - }; - } - { - name = "string.prototype.matchall___string.prototype.matchall_4.0.5.tgz"; - path = fetchurl { - name = "string.prototype.matchall___string.prototype.matchall_4.0.5.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz"; - sha1 = "59370644e1db7e4c0c045277690cf7b01203c4da"; - }; - } - { - name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; - path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha1 = "85812a6b847ac002270f5808146064c995fb6913"; - }; - } - { - name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; - path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; - sha1 = "e75ae90c2942c63504686c18b287b4a0b1a45f80"; - }; - } - { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; - path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; - }; - } - { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; - path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; - sha1 = "b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"; - }; - } - { - name = "string_decoder___string_decoder_1.3.0.tgz"; - path = fetchurl { - name = "string_decoder___string_decoder_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; - sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; - }; - } - { - name = "string_decoder___string_decoder_1.1.1.tgz"; - path = fetchurl { - name = "string_decoder___string_decoder_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; - }; - } - { - name = "stringz___stringz_2.1.0.tgz"; - path = fetchurl { - name = "stringz___stringz_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/stringz/-/stringz-2.1.0.tgz"; - sha1 = "5896b4713eac31157556040fb90258fb02c1630c"; - }; - } - { - name = "strip_ansi___strip_ansi_3.0.1.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - } - { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; - }; - } - { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; - }; - } - { - name = "strip_ansi___strip_ansi_6.0.0.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; - }; - } - { - name = "strip_bom___strip_bom_3.0.0.tgz"; - path = fetchurl { - name = "strip_bom___strip_bom_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz"; - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; - }; - } - { - name = "strip_bom___strip_bom_4.0.0.tgz"; - path = fetchurl { - name = "strip_bom___strip_bom_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz"; - sha1 = "9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"; - }; - } - { - name = "strip_comments___strip_comments_2.0.1.tgz"; - path = fetchurl { - name = "strip_comments___strip_comments_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz"; - sha1 = "4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b"; - }; - } - { - name = "strip_eof___strip_eof_1.0.0.tgz"; - path = fetchurl { - name = "strip_eof___strip_eof_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; - }; - } - { - name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; - path = fetchurl { - name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; - sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; - }; - } - { - name = "strip_indent___strip_indent_3.0.0.tgz"; - path = fetchurl { - name = "strip_indent___strip_indent_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz"; - sha1 = "c32e1cee940b6b3432c771bc2c54bcce73cd3001"; - }; - } - { - name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; - path = fetchurl { - name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; - sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; - }; - } - { - name = "strip_json_comments___strip_json_comments_1.0.4.tgz"; - path = fetchurl { - name = "strip_json_comments___strip_json_comments_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; - sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; - }; - } - { - name = "stylehacks___stylehacks_4.0.3.tgz"; - path = fetchurl { - name = "stylehacks___stylehacks_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz"; - sha1 = "6718fcaf4d1e07d8a1318690881e8d96726a71d5"; - }; - } - { - name = "stylis___stylis_4.0.6.tgz"; - path = fetchurl { - name = "stylis___stylis_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/stylis/-/stylis-4.0.6.tgz"; - sha1 = "0d8b97b6bc4748bea46f68602b6df27641b3c548"; - }; - } - { - name = "substring_trie___substring_trie_1.0.2.tgz"; - path = fetchurl { - name = "substring_trie___substring_trie_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/substring-trie/-/substring-trie-1.0.2.tgz"; - sha1 = "7b42592391628b4f2cb17365c6cce4257c7b7af5"; - }; - } - { - name = "supports_color___supports_color_2.0.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - } - { - name = "supports_color___supports_color_3.2.3.tgz"; - path = fetchurl { - name = "supports_color___supports_color_3.2.3.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz"; - sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; - }; - } - { - name = "supports_color___supports_color_5.5.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; - }; - } - { - name = "supports_color___supports_color_6.1.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; - sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; - }; - } - { - name = "supports_color___supports_color_7.2.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; - sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; - }; - } - { - name = "supports_color___supports_color_8.1.1.tgz"; - path = fetchurl { - name = "supports_color___supports_color_8.1.1.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz"; - sha1 = "cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"; - }; - } - { - name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; - path = fetchurl { - name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz"; - sha1 = "f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"; - }; - } - { - name = "svgo___svgo_1.3.2.tgz"; - path = fetchurl { - name = "svgo___svgo_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz"; - sha1 = "b6dc511c063346c9e415b81e43401145b96d4167"; - }; - } - { - name = "symbol_tree___symbol_tree_3.2.4.tgz"; - path = fetchurl { - name = "symbol_tree___symbol_tree_3.2.4.tgz"; - url = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz"; - sha1 = "430637d248ba77e078883951fb9aa0eed7c63fa2"; - }; - } - { - name = "table___table_3.8.3.tgz"; - path = fetchurl { - name = "table___table_3.8.3.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz"; - sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; - }; - } - { - name = "table___table_6.7.1.tgz"; - path = fetchurl { - name = "table___table_6.7.1.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz"; - sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2"; - }; - } - { - name = "tapable___tapable_1.1.3.tgz"; - path = fetchurl { - name = "tapable___tapable_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz"; - sha1 = "a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"; - }; - } - { - name = "tar___tar_6.0.5.tgz"; - path = fetchurl { - name = "tar___tar_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.0.5.tgz"; - sha1 = "bde815086e10b39f1dcd298e89d596e1535e200f"; - }; - } - { - name = "tcomb___tcomb_2.7.0.tgz"; - path = fetchurl { - name = "tcomb___tcomb_2.7.0.tgz"; - url = "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz"; - sha1 = "10d62958041669a5d53567b9a4ee8cde22b1c2b0"; - }; - } - { - name = "terminal_link___terminal_link_2.1.1.tgz"; - path = fetchurl { - name = "terminal_link___terminal_link_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz"; - sha1 = "14a64a27ab3c0df933ea546fba55f2d078edc994"; - }; - } - { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; - path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; - sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"; - }; - } - { - name = "terser_webpack_plugin___terser_webpack_plugin_4.2.3.tgz"; - path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz"; - sha1 = "28daef4a83bd17c1db0297070adc07fc8cfc6a9a"; - }; - } - { - name = "terser___terser_4.8.0.tgz"; - path = fetchurl { - name = "terser___terser_4.8.0.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz"; - sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17"; - }; - } - { - name = "terser___terser_5.3.4.tgz"; - path = fetchurl { - name = "terser___terser_5.3.4.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-5.3.4.tgz"; - sha1 = "e510e05f86e0bd87f01835c3238839193f77a60c"; - }; - } - { - name = "tesseract.js_core___tesseract.js_core_2.2.0.tgz"; - path = fetchurl { - name = "tesseract.js_core___tesseract.js_core_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/tesseract.js-core/-/tesseract.js-core-2.2.0.tgz"; - sha1 = "6ef78051272a381969fac3e45a226e85022cffef"; - }; - } - { - name = "tesseract.js___tesseract.js_2.1.1.tgz"; - path = fetchurl { - name = "tesseract.js___tesseract.js_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/tesseract.js/-/tesseract.js-2.1.1.tgz"; - sha1 = "5c50fc95542ce8d834cb952bfb75a8fc85f1441d"; - }; - } - { - name = "test_exclude___test_exclude_6.0.0.tgz"; - path = fetchurl { - name = "test_exclude___test_exclude_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz"; - sha1 = "04a8698661d805ea6fa293b6cb9e63ac044ef15e"; - }; - } - { - name = "text_table___text_table_0.2.0.tgz"; - path = fetchurl { - name = "text_table___text_table_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; - sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; - }; - } - { - name = "throat___throat_5.0.0.tgz"; - path = fetchurl { - name = "throat___throat_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz"; - sha1 = "c5199235803aad18754a667d659b5e72ce16764b"; - }; - } - { - name = "throng___throng_4.0.0.tgz"; - path = fetchurl { - name = "throng___throng_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/throng/-/throng-4.0.0.tgz"; - sha1 = "983c6ba1993b58eae859998aa687ffe88df84c17"; - }; - } - { - name = "through2___through2_2.0.5.tgz"; - path = fetchurl { - name = "through2___through2_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"; - sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd"; - }; - } - { - name = "through___through_2.3.8.tgz"; - path = fetchurl { - name = "through___through_2.3.8.tgz"; - url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - } - { - name = "thunky___thunky_1.1.0.tgz"; - path = fetchurl { - name = "thunky___thunky_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz"; - sha1 = "5abaf714a9405db0504732bbccd2cedd9ef9537d"; - }; - } - { - name = "timers_browserify___timers_browserify_2.0.11.tgz"; - path = fetchurl { - name = "timers_browserify___timers_browserify_2.0.11.tgz"; - url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz"; - sha1 = "800b1f3eee272e5bc53ee465a04d0e804c31211f"; - }; - } - { - name = "timsort___timsort_0.3.0.tgz"; - path = fetchurl { - name = "timsort___timsort_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz"; - sha1 = "405411a8e7e6339fe64db9a234de11dc31e02bd4"; - }; - } - { - name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; - path = fetchurl { - name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz"; - sha1 = "634c5f8efdc27714b7f386c35e6760991d230875"; - }; - } - { - name = "tiny_queue___tiny_queue_0.2.1.tgz"; - path = fetchurl { - name = "tiny_queue___tiny_queue_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.1.tgz"; - sha1 = "25a67f2c6e253b2ca941977b5ef7442ef97a6046"; - }; - } - { - name = "tiny_warning___tiny_warning_1.0.3.tgz"; - path = fetchurl { - name = "tiny_warning___tiny_warning_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz"; - sha1 = "94a30db453df4c643d0fd566060d60a875d84754"; - }; - } - { - name = "tmpl___tmpl_1.0.4.tgz"; - path = fetchurl { - name = "tmpl___tmpl_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz"; - sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; - }; - } - { - name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz"; - path = fetchurl { - name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; - sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; - }; - } - { - name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; - path = fetchurl { - name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; - }; - } - { - name = "to_object_path___to_object_path_0.3.0.tgz"; - path = fetchurl { - name = "to_object_path___to_object_path_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"; - sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; - }; - } - { - name = "to_regex_range___to_regex_range_2.1.1.tgz"; - path = fetchurl { - name = "to_regex_range___to_regex_range_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz"; - sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; - }; - } - { - name = "to_regex_range___to_regex_range_5.0.1.tgz"; - path = fetchurl { - name = "to_regex_range___to_regex_range_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; - }; - } - { - name = "to_regex___to_regex_3.0.2.tgz"; - path = fetchurl { - name = "to_regex___to_regex_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"; - sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"; - }; - } - { - name = "toidentifier___toidentifier_1.0.0.tgz"; - path = fetchurl { - name = "toidentifier___toidentifier_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; - sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; - }; - } - { - name = "totalist___totalist_1.1.0.tgz"; - path = fetchurl { - name = "totalist___totalist_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz"; - sha1 = "a4d65a3e546517701e3e5c37a47a70ac97fe56df"; - }; - } - { - name = "tough_cookie___tough_cookie_2.5.0.tgz"; - path = fetchurl { - name = "tough_cookie___tough_cookie_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; - }; - } - { - name = "tough_cookie___tough_cookie_3.0.1.tgz"; - path = fetchurl { - name = "tough_cookie___tough_cookie_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz"; - sha1 = "9df4f57e739c26930a018184887f4adb7dca73b2"; - }; - } - { - name = "tr46___tr46_2.0.2.tgz"; - path = fetchurl { - name = "tr46___tr46_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz"; - sha1 = "03273586def1595ae08fedb38d7733cee91d2479"; - }; - } - { - name = "ts_essentials___ts_essentials_2.0.12.tgz"; - path = fetchurl { - name = "ts_essentials___ts_essentials_2.0.12.tgz"; - url = "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz"; - sha1 = "c9303f3d74f75fa7528c3d49b80e089ab09d8745"; - }; - } - { - name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; - path = fetchurl { - name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; - url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; - sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; - }; - } - { - name = "tslib___tslib_1.13.0.tgz"; - path = fetchurl { - name = "tslib___tslib_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; - sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; - }; - } - { - name = "tty_browserify___tty_browserify_0.0.0.tgz"; - path = fetchurl { - name = "tty_browserify___tty_browserify_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz"; - sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; - }; - } - { - name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; - path = fetchurl { - name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; - }; - } - { - name = "tweetnacl___tweetnacl_0.14.5.tgz"; - path = fetchurl { - name = "tweetnacl___tweetnacl_0.14.5.tgz"; - url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; - }; - } - { - name = "twemoji_parser___twemoji_parser_11.0.2.tgz"; - path = fetchurl { - name = "twemoji_parser___twemoji_parser_11.0.2.tgz"; - url = "https://registry.yarnpkg.com/twemoji-parser/-/twemoji-parser-11.0.2.tgz"; - sha1 = "24e87c2008abe8544c962f193b88b331de32b446"; - }; - } - { - name = "twitter_text___twitter_text_3.1.0.tgz"; - path = fetchurl { - name = "twitter_text___twitter_text_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/twitter-text/-/twitter-text-3.1.0.tgz"; - sha1 = "798e932b289f506efe2a1f03fe917ba30627f125"; - }; - } - { - name = "type_check___type_check_0.4.0.tgz"; - path = fetchurl { - name = "type_check___type_check_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; - sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; - }; - } - { - name = "type_check___type_check_0.3.2.tgz"; - path = fetchurl { - name = "type_check___type_check_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; - }; - } - { - name = "type_detect___type_detect_4.0.8.tgz"; - path = fetchurl { - name = "type_detect___type_detect_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz"; - sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c"; - }; - } - { - name = "type_fest___type_fest_0.11.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.11.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; - sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; - }; - } - { - name = "type_fest___type_fest_0.20.2.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.20.2.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; - }; - } - { - name = "type_fest___type_fest_0.6.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; - sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b"; - }; - } - { - name = "type_fest___type_fest_0.8.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.8.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; - sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; - }; - } - { - name = "type_is___type_is_1.6.18.tgz"; - path = fetchurl { - name = "type_is___type_is_1.6.18.tgz"; - url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; - sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; - }; - } - { - name = "type___type_1.2.0.tgz"; - path = fetchurl { - name = "type___type_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz"; - sha1 = "848dd7698dafa3e54a6c479e759c4bc3f18847a0"; - }; - } - { - name = "type___type_2.0.0.tgz"; - path = fetchurl { - name = "type___type_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz"; - sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3"; - }; - } - { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - path = fetchurl { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; - }; - } - { - name = "typedarray___typedarray_0.0.6.tgz"; - path = fetchurl { - name = "typedarray___typedarray_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; - }; - } - { - name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; - path = fetchurl { - name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; - sha1 = "085e215625ec3162574dc8859abee78a59b14471"; - }; - } - { - name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; - path = fetchurl { - name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; - sha1 = "2619800c4c825800efdd8343af7dd9933cbe2818"; - }; - } - { - name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; - path = fetchurl { - name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; - sha1 = "8ed2a32569961bce9227d09cd3ffbb8fed5f020c"; - }; - } - { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; - path = fetchurl { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; - sha1 = "0d91f600eeeb3096aa962b1d6fc88876e64ea531"; - }; - } - { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; - path = fetchurl { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; - sha1 = "dd57a99f6207bedff4628abefb94c50db941c8f4"; - }; - } - { - name = "union_value___union_value_1.0.1.tgz"; - path = fetchurl { - name = "union_value___union_value_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; - sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; - }; - } - { - name = "uniq___uniq_1.0.1.tgz"; - path = fetchurl { - name = "uniq___uniq_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz"; - sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; - }; - } - { - name = "uniqs___uniqs_2.0.0.tgz"; - path = fetchurl { - name = "uniqs___uniqs_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz"; - sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02"; - }; - } - { - name = "unique_filename___unique_filename_1.1.1.tgz"; - path = fetchurl { - name = "unique_filename___unique_filename_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; - sha1 = "1d69769369ada0583103a1e6ae87681b56573230"; - }; - } - { - name = "unique_slug___unique_slug_2.0.2.tgz"; - path = fetchurl { - name = "unique_slug___unique_slug_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz"; - sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c"; - }; - } - { - name = "universalify___universalify_0.1.2.tgz"; - path = fetchurl { - name = "universalify___universalify_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; - sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; - }; - } - { - name = "unpipe___unpipe_1.0.0.tgz"; - path = fetchurl { - name = "unpipe___unpipe_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; - }; - } - { - name = "unquote___unquote_1.1.1.tgz"; - path = fetchurl { - name = "unquote___unquote_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz"; - sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544"; - }; - } - { - name = "unset_value___unset_value_1.0.0.tgz"; - path = fetchurl { - name = "unset_value___unset_value_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz"; - sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; - }; - } - { - name = "upath___upath_1.2.0.tgz"; - path = fetchurl { - name = "upath___upath_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz"; - sha1 = "8f66dbcd55a883acdae4408af8b035a5044c1894"; - }; - } - { - name = "uri_js___uri_js_4.4.0.tgz"; - path = fetchurl { - name = "uri_js___uri_js_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz"; - sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602"; - }; - } - { - name = "urix___urix_0.1.0.tgz"; - path = fetchurl { - name = "urix___urix_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; - sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; - }; - } - { - name = "url_parse___url_parse_1.5.1.tgz"; - path = fetchurl { - name = "url_parse___url_parse_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz"; - sha1 = "d5fa9890af8a5e1f274a2c98376510f6425f6e3b"; - }; - } - { - name = "url___url_0.11.0.tgz"; - path = fetchurl { - name = "url___url_0.11.0.tgz"; - url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz"; - sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; - }; - } - { - name = "use_composed_ref___use_composed_ref_1.0.0.tgz"; - path = fetchurl { - name = "use_composed_ref___use_composed_ref_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.0.0.tgz"; - sha1 = "bb13e8f4a0b873632cde4940abeb88b92d03023a"; - }; - } - { - name = "use_isomorphic_layout_effect___use_isomorphic_layout_effect_1.0.0.tgz"; - path = fetchurl { - name = "use_isomorphic_layout_effect___use_isomorphic_layout_effect_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.0.0.tgz"; - sha1 = "f56b4ed633e1c21cd9fc76fe249002a1c28989fb"; - }; - } - { - name = "use_latest___use_latest_1.1.0.tgz"; - path = fetchurl { - name = "use_latest___use_latest_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/use-latest/-/use-latest-1.1.0.tgz"; - sha1 = "7bf9684555869c3f5f37e10d0884c8accf4d3aa6"; - }; - } - { - name = "use___use_3.1.1.tgz"; - path = fetchurl { - name = "use___use_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; - sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f"; - }; - } - { - name = "user_home___user_home_2.0.0.tgz"; - path = fetchurl { - name = "user_home___user_home_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz"; - sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; - }; - } - { - name = "utf_8_validate___utf_8_validate_5.0.5.tgz"; - path = fetchurl { - name = "utf_8_validate___utf_8_validate_5.0.5.tgz"; - url = "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.5.tgz"; - sha1 = "dd32c2e82c72002dc9f02eb67ba6761f43456ca1"; - }; - } - { - name = "util_deprecate___util_deprecate_1.0.2.tgz"; - path = fetchurl { - name = "util_deprecate___util_deprecate_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - } - { - name = "util.promisify___util.promisify_1.0.1.tgz"; - path = fetchurl { - name = "util.promisify___util.promisify_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz"; - sha1 = "6baf7774b80eeb0f7520d8b81d07982a59abbaee"; - }; - } - { - name = "util___util_0.10.3.tgz"; - path = fetchurl { - name = "util___util_0.10.3.tgz"; - url = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz"; - sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; - }; - } - { - name = "util___util_0.10.4.tgz"; - path = fetchurl { - name = "util___util_0.10.4.tgz"; - url = "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz"; - sha1 = "3aa0125bfe668a4672de58857d3ace27ecb76901"; - }; - } - { - name = "util___util_0.11.1.tgz"; - path = fetchurl { - name = "util___util_0.11.1.tgz"; - url = "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz"; - sha1 = "3236733720ec64bb27f6e26f421aaa2e1b588d61"; - }; - } - { - name = "utils_merge___utils_merge_1.0.1.tgz"; - path = fetchurl { - name = "utils_merge___utils_merge_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; - }; - } - { - name = "uuid___uuid_3.4.0.tgz"; - path = fetchurl { - name = "uuid___uuid_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; - sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; - }; - } - { - name = "uuid___uuid_8.3.2.tgz"; - path = fetchurl { - name = "uuid___uuid_8.3.2.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz"; - sha1 = "80d5b5ced271bb9af6c445f21a1a04c606cefbe2"; - }; - } - { - name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; - path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; - sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; - }; - } - { - name = "v8_to_istanbul___v8_to_istanbul_7.0.0.tgz"; - path = fetchurl { - name = "v8_to_istanbul___v8_to_istanbul_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz"; - sha1 = "b4fe00e35649ef7785a9b7fcebcea05f37c332fc"; - }; - } - { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - path = fetchurl { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; - }; - } - { - name = "value_equal___value_equal_0.4.0.tgz"; - path = fetchurl { - name = "value_equal___value_equal_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz"; - sha1 = "c5bdd2f54ee093c04839d71ce2e4758a6890abc7"; - }; - } - { - name = "value_equal___value_equal_1.0.1.tgz"; - path = fetchurl { - name = "value_equal___value_equal_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz"; - sha1 = "1e0b794c734c5c0cade179c437d356d931a34d6c"; - }; - } - { - name = "vary___vary_1.1.2.tgz"; - path = fetchurl { - name = "vary___vary_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; - }; - } - { - name = "vendors___vendors_1.0.4.tgz"; - path = fetchurl { - name = "vendors___vendors_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz"; - sha1 = "e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"; - }; - } - { - name = "verror___verror_1.10.0.tgz"; - path = fetchurl { - name = "verror___verror_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; - }; - } - { - name = "vm_browserify___vm_browserify_1.1.2.tgz"; - path = fetchurl { - name = "vm_browserify___vm_browserify_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz"; - sha1 = "78641c488b8e6ca91a75f511e7a3b32a86e5dda0"; - }; - } - { - name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; - path = fetchurl { - name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; - sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; - }; - } - { - name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; - path = fetchurl { - name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"; - sha1 = "3e7104a05b75146cc60f564380b7f683acf1020a"; - }; - } - { - name = "walker___walker_1.0.7.tgz"; - path = fetchurl { - name = "walker___walker_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz"; - sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; - }; - } - { - name = "warning___warning_3.0.0.tgz"; - path = fetchurl { - name = "warning___warning_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz"; - sha1 = "32e5377cb572de4ab04753bdf8821c01ed605b7c"; - }; - } - { - name = "warning___warning_4.0.3.tgz"; - path = fetchurl { - name = "warning___warning_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz"; - sha1 = "16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"; - }; - } - { - name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; - path = fetchurl { - name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"; - sha1 = "9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"; - }; - } - { - name = "watchpack___watchpack_1.7.4.tgz"; - path = fetchurl { - name = "watchpack___watchpack_1.7.4.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz"; - sha1 = "6e9da53b3c80bb2d6508188f5b200410866cd30b"; - }; - } - { - name = "wbuf___wbuf_1.7.3.tgz"; - path = fetchurl { - name = "wbuf___wbuf_1.7.3.tgz"; - url = "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz"; - sha1 = "c1d8d149316d3ea852848895cb6a0bfe887b87df"; - }; - } - { - name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; - path = fetchurl { - name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; - sha1 = "ae59c8a00b121543a2acc65c0434f57b0fc11aff"; - }; - } - { - name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; - path = fetchurl { - name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; - sha1 = "9111b4d7ea80acd40f5270d666621afa78b69514"; - }; - } - { - name = "webpack_assets_manifest___webpack_assets_manifest_4.0.6.tgz"; - path = fetchurl { - name = "webpack_assets_manifest___webpack_assets_manifest_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/webpack-assets-manifest/-/webpack-assets-manifest-4.0.6.tgz"; - sha1 = "cb8cfd2d2d8d129228cea645c832448380c21ae0"; - }; - } - { - name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.2.tgz"; - path = fetchurl { - name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.2.tgz"; - url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz"; - sha1 = "39898cf6200178240910d629705f0f3493f7d666"; - }; - } - { - name = "webpack_cli___webpack_cli_3.3.12.tgz"; - path = fetchurl { - name = "webpack_cli___webpack_cli_3.3.12.tgz"; - url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz"; - sha1 = "94e9ada081453cd0aa609c99e500012fd3ad2d4a"; - }; - } - { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; - path = fetchurl { - name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz"; - sha1 = "0019c3db716e3fa5cecbf64f2ab88a74bab331f3"; - }; - } - { - name = "webpack_dev_server___webpack_dev_server_3.11.2.tgz"; - path = fetchurl { - name = "webpack_dev_server___webpack_dev_server_3.11.2.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz"; - sha1 = "695ebced76a4929f0d5de7fd73fafe185fe33708"; - }; - } - { - name = "webpack_log___webpack_log_2.0.0.tgz"; - path = fetchurl { - name = "webpack_log___webpack_log_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz"; - sha1 = "5b7928e0637593f119d32f6227c1e0ac31e1b47f"; - }; - } - { - name = "webpack_merge___webpack_merge_5.7.3.tgz"; - path = fetchurl { - name = "webpack_merge___webpack_merge_5.7.3.tgz"; - url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz"; - sha1 = "2a0754e1877a25a8bbab3d2475ca70a052708213"; - }; - } - { - name = "webpack_sources___webpack_sources_1.4.3.tgz"; - path = fetchurl { - name = "webpack_sources___webpack_sources_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz"; - sha1 = "eedd8ec0b928fbf1cbfe994e22d2d890f330a933"; - }; - } - { - name = "webpack___webpack_4.46.0.tgz"; - path = fetchurl { - name = "webpack___webpack_4.46.0.tgz"; - url = "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz"; - sha1 = "bf9b4404ea20a073605e0a011d188d77cb6ad542"; - }; - } - { - name = "websocket_driver___websocket_driver_0.7.3.tgz"; - path = fetchurl { - name = "websocket_driver___websocket_driver_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz"; - sha1 = "a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"; - }; - } - { - name = "websocket_driver___websocket_driver_0.7.4.tgz"; - path = fetchurl { - name = "websocket_driver___websocket_driver_0.7.4.tgz"; - url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz"; - sha1 = "89ad5295bbf64b480abcba31e4953aca706f5760"; - }; - } - { - name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; - path = fetchurl { - name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; - sha1 = "7f8473bc839dfd87608adb95d7eb075211578a42"; - }; - } - { - name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; - path = fetchurl { - name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; - sha1 = "5abacf777c32166a51d085d6b4f3e7d27113ddb0"; - }; - } - { - name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; - path = fetchurl { - name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; - sha1 = "3d4b1e0312d2079879f826aff18dbeeca5960fbf"; - }; - } - { - name = "whatwg_url___whatwg_url_8.2.2.tgz"; - path = fetchurl { - name = "whatwg_url___whatwg_url_8.2.2.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.2.2.tgz"; - sha1 = "85e7f9795108b53d554cec640b2e8aee2a0d4bfd"; - }; - } - { - name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; - path = fetchurl { - name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; - sha1 = "13757bc89b209b049fe5d86430e21cf40a89a8e6"; - }; - } - { - name = "which_module___which_module_2.0.0.tgz"; - path = fetchurl { - name = "which_module___which_module_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; - }; - } - { - name = "which___which_1.3.1.tgz"; - path = fetchurl { - name = "which___which_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; - sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; - }; - } - { - name = "which___which_2.0.2.tgz"; - path = fetchurl { - name = "which___which_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; - sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; - }; - } - { - name = "wicg_inert___wicg_inert_3.1.1.tgz"; - path = fetchurl { - name = "wicg_inert___wicg_inert_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/wicg-inert/-/wicg-inert-3.1.1.tgz"; - sha1 = "b033fd4fbfb9e3fd709e5d84becbdf2e06e5c229"; - }; - } - { - name = "wide_align___wide_align_1.1.3.tgz"; - path = fetchurl { - name = "wide_align___wide_align_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; - sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; - }; - } - { - name = "wildcard___wildcard_2.0.0.tgz"; - path = fetchurl { - name = "wildcard___wildcard_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz"; - sha1 = "a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"; - }; - } - { - name = "word_wrap___word_wrap_1.2.3.tgz"; - path = fetchurl { - name = "word_wrap___word_wrap_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; - sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; - }; - } - { - name = "worker_farm___worker_farm_1.7.0.tgz"; - path = fetchurl { - name = "worker_farm___worker_farm_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz"; - sha1 = "26a94c5391bbca926152002f69b84a4bf772e5a8"; - }; - } - { - name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; - }; - } - { - name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; - sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53"; - }; - } - { - name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; - }; - } - { - name = "wrappy___wrappy_1.0.2.tgz"; - path = fetchurl { - name = "wrappy___wrappy_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - } - { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; - path = fetchurl { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; - sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8"; - }; - } - { - name = "write___write_0.2.1.tgz"; - path = fetchurl { - name = "write___write_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz"; - sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757"; - }; - } - { - name = "ws___ws_6.2.1.tgz"; - path = fetchurl { - name = "ws___ws_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz"; - sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"; - }; - } - { - name = "ws___ws_7.4.6.tgz"; - path = fetchurl { - name = "ws___ws_7.4.6.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz"; - sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"; - }; - } - { - name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; - path = fetchurl { - name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; - sha1 = "6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"; - }; - } - { - name = "xmlchars___xmlchars_2.2.0.tgz"; - path = fetchurl { - name = "xmlchars___xmlchars_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz"; - sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"; - }; - } - { - name = "xtend___xtend_4.0.2.tgz"; - path = fetchurl { - name = "xtend___xtend_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; - sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; - }; - } - { - name = "y18n___y18n_4.0.0.tgz"; - path = fetchurl { - name = "y18n___y18n_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz"; - sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b"; - }; - } - { - name = "y18n___y18n_5.0.5.tgz"; - path = fetchurl { - name = "y18n___y18n_5.0.5.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz"; - sha1 = "8769ec08d03b1ea2df2500acef561743bbb9ab18"; - }; - } - { - name = "yallist___yallist_3.1.1.tgz"; - path = fetchurl { - name = "yallist___yallist_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; - sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"; - }; - } - { - name = "yallist___yallist_4.0.0.tgz"; - path = fetchurl { - name = "yallist___yallist_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; - }; - } - { - name = "yaml___yaml_1.10.0.tgz"; - path = fetchurl { - name = "yaml___yaml_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz"; - sha1 = "3b593add944876077d4d683fee01081bd9fff31e"; - }; - } - { - name = "yargs_parser___yargs_parser_13.1.2.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_13.1.2.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; - sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; - }; - } - { - name = "yargs_parser___yargs_parser_18.1.3.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_18.1.3.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz"; - sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0"; - }; - } - { - name = "yargs_parser___yargs_parser_20.2.3.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.3.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.3.tgz"; - sha1 = "92419ba867b858c868acf8bae9bf74af0dd0ce26"; - }; - } - { - name = "yargs___yargs_13.3.2.tgz"; - path = fetchurl { - name = "yargs___yargs_13.3.2.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; - sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; - }; - } - { - name = "yargs___yargs_15.4.1.tgz"; - path = fetchurl { - name = "yargs___yargs_15.4.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz"; - sha1 = "0d87a16de01aee9d8bec2bfbf74f67851730f4f8"; - }; - } - { - name = "yargs___yargs_17.0.1.tgz"; - path = fetchurl { - name = "yargs___yargs_17.0.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz"; - sha1 = "6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"; - }; - } - { - name = "zlibjs___zlibjs_0.3.1.tgz"; - path = fetchurl { - name = "zlibjs___zlibjs_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/zlibjs/-/zlibjs-0.3.1.tgz"; - sha1 = "50197edb28a1c42ca659cc8b4e6a9ddd6d444554"; - }; - } - ]; -} diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/servers/matrix-conduit/default.nix index 1e69fcd7778d..c2cb3123b747 100644 --- a/pkgs/servers/matrix-conduit/default.nix +++ b/pkgs/servers/matrix-conduit/default.nix @@ -1,22 +1,33 @@ -{ stdenv, lib, fetchFromGitLab, rustPlatform, }: +{ stdenv, lib, fetchFromGitLab, rustPlatform, pkgs }: rustPlatform.buildRustPackage rec { pname = "matrix-conduit"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitLab { owner = "famedly"; repo = "conduit"; rev = "v${version}"; - sha256 = "0k3313bnv399v738j1xja9hngsmi39r3vzvgwssl5c24yvkvskdr"; + sha256 = "sha256-jCBvenwXPgYms5Tbu16q/F8UNpvaw0Shao9kLEZLbHM="; }; - cargoSha256 = "0379dvc8m8clc9lrxd1x0aciqvcgv3hjq7xfspz3bh8aq2a43pcs"; + cargoSha256 = "sha256-fpjzc2HiWP6nV8YZOwxsIOhy4ht/tQqcvCkcLMIFUaQ="; + + nativeBuildInputs = with pkgs; [ + rustPlatform.bindgenHook + ]; + + buildInputs = with pkgs; [ + pkg-config + rocksdb + ]; + + cargoBuildFlags = "--bin conduit"; meta = with lib; { description = "A Matrix homeserver written in Rust"; homepage = "https://conduit.rs/"; license = licenses.asl20; - maintainers = with maintainers; [ pstn piegames ]; + maintainers = with maintainers; [ pstn piegames pimeys ]; }; } diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index b94257e6d5e2..cd762c7dc8be 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.51.0"; + version = "1.55.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qhwFRveFCwflQmVCwzThC8sP+YCqckgCaXAc3IRms0g="; + sha256 = "sha256-IfLyp6IexNTMrq795qUMAPQ62mrMPwFyLE1yL8cu0T0="; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix index 88ec52f45363..505e9e4ebae9 100644 --- a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix +++ b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "matrix-synapse-mjolnir-antispam"; - version = "1.2.1"; + version = "1.4.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "v${version}"; - sha256 = "0fvdzn5l1a6bhr1qzgs30a3kh6nj0byqichnl149sjgr0v4lpkz1"; + sha256 = "sha256-zVb0lD5tYhX2a2MzNVQ8u7rMuQ8yGC/JlodbY4nsqNU="; }; sourceRoot = "./source/synapse_antispam"; diff --git a/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix b/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix index 5c0dc1e2ce2b..3df7f1e5a5d4 100644 --- a/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix +++ b/pkgs/servers/matrix-synapse/plugins/shared-secret-auth.nix @@ -1,18 +1,26 @@ -{ buildPythonPackage, fetchFromGitHub, twisted }: +{ lib, buildPythonPackage, fetchFromGitHub, matrix-synapse, twisted }: buildPythonPackage rec { pname = "matrix-synapse-shared-secret-auth"; - version = "1.0.2"; + version = "2.0.1"; src = fetchFromGitHub { owner = "devture"; repo = "matrix-synapse-shared-secret-auth"; rev = version; - sha256 = "0cnxp3bp8mmk01a0g3lzgvaawyywjg754j4nb9iwkmm3c2nqvnpz"; + sha256 = "sha256-kaok5IwKx97FYDrVIGAtUJfExqDln5vxEKrZda2RdzE="; }; doCheck = false; pythonImportsCheck = [ "shared_secret_authenticator" ]; + buildInputs = [ matrix-synapse ]; propagatedBuildInputs = [ twisted ]; + + meta = with lib; { + description = "Shared Secret Authenticator password provider module for Matrix Synapse"; + homepage = "https://github.com/devture/matrix-synapse-shared-secret-auth"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ sumnerevans ]; + }; } diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/servers/matrix-synapse/tools/synadm.nix index 68099e50b139..46c9add3d88e 100644 --- a/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -4,12 +4,12 @@ with python3Packages; buildPythonApplication rec { pname = "synadm"; - version = "0.32"; + version = "0.33.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "e3fc0db4920d36092a00080fe5b6dac867a6d19f630f69822c8544568f5885e2"; + sha256 = "sha256-eIpRyx1iErZuB3n+Sl231BE47ckIXYzaelod7OtdSF8="; }; postPatch = '' diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index d0fde791291c..e5fbe803854b 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "matterbridge"; - version = "1.23.2"; + version = "1.24.1"; src = fetchFromGitHub { owner = "42wim"; repo = pname; rev = "v${version}"; - sha256 = "03fxq8dxkd5qiiw4zfsacdk2skg3apb4aw7k3wq0fv4n65hk25y3"; + sha256 = "sha256-oT7CFJ266guNM6CEWn1BoNcERvLv89cVSlsrN6S/0h0="; }; vendorSha256 = null; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 78e2ace87544..77ae99a9297e 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, buildGo117Package, buildEnv +{ lib, stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv # The suffix for the Mattermost version. , versionSuffix ? "nixpkgs" @@ -10,11 +10,11 @@ , storePathAsBuildHash ? false }: let - version = "6.3.1"; + version = "6.3.3"; goPackagePath = "github.com/mattermost/mattermost-server"; - mattermost-server-build = buildGo117Package rec { + mattermost-server-build = buildGoPackage rec { pname = "mattermost-server"; inherit version goPackagePath; @@ -22,7 +22,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "cUeGjKutz6Yeq/cP7nYx0zPJ87GKOQWRyNSERzq/nPw="; + sha256 = "OSN8Bscgv7rPfKIfZ3ZnegdgsygFpSM7/vGWojj0P3k="; }; ldflags = [ @@ -65,7 +65,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "lFwSZsAcQuuWTN+4wCe7GDLkhp1ASn5GE7/K5Vppr14="; + sha256 = "Og9DUGyE4cWYF7EQP/8szIrWM1Ldqnpqc+HW+L7XApo="; }; installPhase = '' diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index 33df669aaac5..b51ae848cc87 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-facebook"; - version = "2022-01-10"; + version = "0.3.3"; src = fetchFromGitHub { owner = "mautrix"; repo = "facebook"; - rev = "eebfbe49fc699806e1d71becf261ba0995c91f60"; - hash = "sha256-zfsuoPySIRAAmsSL0NUUVH7k+xV7rZOHOkIvBQdVe0A="; + rev = "v${version}"; + hash = "sha256-lIUGuc6ZL+GW7jw5OhPE3/mU5pg8Y09dd+p5kiy14io="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch b/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch deleted file mode 100644 index f1ec3e622cf8..000000000000 --- a/pkgs/servers/mautrix-telegram/0002-Don-t-depend-on-pytest-runner.patch +++ /dev/null @@ -1,24 +0,0 @@ -From eb39954acf73096d65ba1e9575cbeb3d4307d5df Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sun, 29 Nov 2020 20:55:17 +0100 -Subject: [PATCH 2/2] Don't depend on pytest-runner - ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 95dbf89..89ea2a7 100644 ---- a/setup.py -+++ b/setup.py -@@ -57,7 +57,6 @@ setuptools.setup( - ] - }, - -- setup_requires=["pytest-runner"], - tests_require=["pytest", "pytest-asyncio", "pytest-mock"], - - classifiers=[ --- -2.28.0 - diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 267f89182fb2..e96427f30f3a 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -6,11 +6,11 @@ let python = python3.override { packageOverrides = self: super: { tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.25.0a3"; + version = "1.25.0a5"; pname = "tulir-telethon"; src = oldAttrs.src.override { inherit pname version; - sha256 = "sha256-/kau9Q2+7giVx52tmjvYIbcDcY1/om31X9BlRvZipuk="; + sha256 = "sha256-WFiWczuw6eVVid2Z1LsnGE6BCEhqeCuiQ/p0d2Ahbi8="; }; }); }; @@ -25,22 +25,17 @@ let in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.11.1"; + version = "0.11.2"; disabled = python.pythonOlder "3.7"; src = fetchFromGitHub { owner = "mautrix"; repo = "telegram"; rev = "v${version}"; - sha256 = "sha256-Df+v1Q+5Iaa9GKcwIabMKjJwmVd5Qub8M54jEEiAPFc="; + sha256 = "sha256-ZECTHAP5l9tAk9Ies8XuPpH9jqYDJSRSHVKz1lA6Sjg="; }; patches = [ ./0001-Re-add-entrypoint.patch ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "telethon>=1.22,<1.23" "telethon" - ''; - propagatedBuildInputs = with python.pkgs; ([ Mako diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 7579db1c090d..e26743b9edf8 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,19 +1,19 @@ -{ lib, buildGo117Module, fetchFromGitHub, olm }: +{ lib, buildGoModule, fetchFromGitHub, olm }: -buildGo117Module rec { +buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "sha256-vMRmxu1TNCw5c+PuSdAPdMJpZGLdcCTzpTNz/AFrWi8="; + sha256 = "M44APMnpQU+9TTJu4NF528o0JvGvWja4H7XUcAHtxrA="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-bvbZ7Tnd6s6zr9trN4egR/9KV5cU09mQI+U1UxyYzlE="; + vendorSha256 = "o3KTcnMd6Tqt9QIfW29wvN8POIFThNg8AdeGDF5wbVc="; doCheck = false; diff --git a/pkgs/servers/mbtileserver/default.nix b/pkgs/servers/mbtileserver/default.nix index 59adcde1a691..c928fcfbe6dd 100644 --- a/pkgs/servers/mbtileserver/default.nix +++ b/pkgs/servers/mbtileserver/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mbtileserver"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "consbio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C6Gz+RBUrjnfJWo4Ou+s/JYJ8iVP9FMYJ/cxJjcVsXk="; + sha256 = "sha256-aa0YsP+SYYDtaSstTfluEe0/+yDl82KHUSss8LZ2gOc="; }; - vendorSha256 = "sha256-36tUTZud0hxH9oZlnKxeK/xzoEzfw3xFMnd/r0srw6U="; + vendorSha256 = "sha256-eVnL+28eOgbR0bjWv7XotcHDl5309EO0wV8AGMslvZw="; meta = with lib; { description = "A simple Go-based server for map tiles stored in mbtiles format"; diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix deleted file mode 100644 index 3f5ac6530e16..000000000000 --- a/pkgs/servers/mediatomb/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchgit -, sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg, file -, pkg-config, autoreconfHook, nixosTests }: - -stdenv.mkDerivation rec { - pname = "mediatomb"; - version = "0.12.1"; - - src = fetchgit { - url = meta.repositories.git; - rev = "7ab761696354868bd5d67ff4f2d849994e4c98e2"; - sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd"; - }; - - buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg file mp4v2 flac - pkg-config autoreconfHook ]; - - passthru.tests = { inherit (nixosTests) mediatomb; }; - - meta = with lib; { - homepage = "http://mediatomb.cc"; - repositories.git = "git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb"; - description = "UPnP MediaServer with a web user interface"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index ca91d4eb12b7..4461930b13cc 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.12"; + version = "1.6.14"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-8pGjX4Lvl1btHZUoee9fS+hw+TK9/LKrYTVmCav4I0Y="; + sha256 = "sha256-VNY3QsaIbc3E4Mh/RDmikwqHbNnyv6AdaZsMa60XB7M="; }; configureFlags = [ @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A distributed memory object caching system"; - repositories.git = "https://github.com/memcached/memcached.git"; homepage = "http://memcached.org/"; license = licenses.bsd3; maintainers = [ maintainers.coconnor ]; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 990ef950e6bd..814626fec125 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.41.5"; + version = "0.42.1"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "sha256-DH1xy1cTVDNNXyOIaayGHzOi4g0ZukNFFbZjufY+XLk="; + hash = "sha256-PmcVVAS/5mDhmOSoFvkZeYkbvFD/KOcgVYuScwD4Olg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -14,13 +14,15 @@ stdenv.mkDerivation rec { dontUnpack = true; installPhase = '' + runHook preInstall makeWrapper ${jdk11}/bin/java $out/bin/metabase --add-flags "-jar $src" + runHook postInstall ''; meta = with lib; { description = "The easy, open source way for everyone in your company to ask questions and learn from data"; homepage = "https://metabase.com"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.all; maintainers = with maintainers; [ schneefux thoughtpolice mmahut ]; }; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 57a554ff5813..fa1133b7d53d 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.35"; + version = "2.0.36"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = "v2"; rev = version; - sha256 = "sha256-tOainlvEB0O6yMzIm0df4r8D68swtjXBFUDsPcNc3uA="; + sha256 = "sha256-Ly4Ep+ZyjEb1ywXO/W1P1ZDvqSAtJY4wuE8n9jbbeuU="; }; - vendorSha256 = "sha256-dxtQAGlNOVO9NtuGbF6Nifa4QhnFGyHKhlDS3+V5HuM="; + vendorSha256 = "sha256-ZEIQeN7t9Az1W6T2Z+ZKHqs2O8UNNMl0nANM1mVyiTA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index ce441e661b34..afa537bddd46 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-01-08T03-11-54Z"; + version = "2022-03-22T02-05-10Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-aOFG3/BnDJOjPiVZL1jKwYUzPX6mI9FkRDZIzTAnT+8="; + sha256 = "sha256-N0ua+XHkLr33PElSdOzVQF3POPU+lx4/M6LJzxtkisI="; }; - vendorSha256 = "sha256-sQoD+Kdw3epjzDmqCfw6rXC0dQCeaEpvfLqZpxKcViw="; + vendorSha256 = "sha256-Ql3J2r489Hzhy6E9uZwQXJIw/njb5oafCYjOyWGzbXs="; doCheck = false; diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index dc1b0d6bd6a2..0a3e9af51073 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "2.34.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-xyakq5DXwzONEP6EvDpAuzCrTDWcs+7asDlq9Vf4c1k="; + sha256 = "sha256-gyaAtFJubvDiz5b7lk6vmPHIqr9ccWK3N2iy4LvYiMg="; }; - vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw="; + vendorSha256 = "sha256-RSsvFD3RvYKxdwPDGG3YHVUzKLgwReZkoVabH5KWXMA="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 2bec7f6912e7..17e648e59ab1 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,17 +4,17 @@ with lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.47.0"; + version = "0.47.5"; src = fetchurl (if stdenv.hostPlatform.system == "x86_64-linux" then { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "sha256-MoBv2dTCotLnGaZOUWLScYd1+gKSjPXTSkHAR6UircA="; + sha256 = "sha256-AkSjtln53HDdIcQgnA8Wj010RXnOlOsFm2wfVgbvwtc="; } else { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_arm64.tar.gz"; - sha256 = "sha256-FIjrw+BBJXOjh1AoVdfPZIdcDyk5yS/zKD1O+u31YlE="; + sha256 = "sha256-+VBRiV2zKa6PwamWj/jmE4iuoohAD6oeGnlFi4/01HM="; }); nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index bc047f6552a6..7cd209f95e3f 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.12.9"; + version = "0.13.1"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "0d3ymw747frl40w5d6r33lf1s72v7fiv742yjr1m6la2phb9h834"; + sha256 = "sha256-oWZ+o19bNR7/QuYTquRa3l7GfRLMEdyPtBUOwb2p3jA="; }; sourceRoot = "source/src"; diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix new file mode 100644 index 000000000000..d8ae7ca61d93 --- /dev/null +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -0,0 +1,25 @@ +{ lib, rustPlatform, fetchFromGitLab, libcap_ng, libseccomp }: + +rustPlatform.buildRustPackage rec { + pname = "virtiofsd"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "virtio-fs"; + repo = "virtiofsd"; + rev = "v${version}"; + sha256 = "sha256-WB0zu2M/5enBOoOUUSXnNAkbsA+JzDgtoLncE1YcDLs="; + }; + + cargoSha256 = "sha256-uRPmZE/xc0yeurBZ4rnrZua5d4lbPwStMUacFgbquuk="; + + buildInputs = [ libcap_ng libseccomp ]; + + meta = with lib; { + homepage = "https://gitlab.com/virtio-fs/virtiofsd"; + description = "vhost-user virtio-fs device backend written in Rust"; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.linux; + license = with licenses; [ asl20 /* and */ bsd3 ]; + }; +} diff --git a/pkgs/servers/mjolnir/default.nix b/pkgs/servers/mjolnir/default.nix index 8480cf4e8bf1..318ee14eb9d3 100644 --- a/pkgs/servers/mjolnir/default.nix +++ b/pkgs/servers/mjolnir/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "mjolnir"; - version = "1.2.1"; + version = "1.4.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "v${version}"; - sha256 = "4c9LyQb5SZ1IoBayiP0C0ho4hwJDv49DhsuoQIv9bTs="; + sha256 = "zVb0lD5tYhX2a2MzNVQ8u7rMuQ8yGC/JlodbY4nsqNU="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mjolnir/node-composition.nix b/pkgs/servers/mjolnir/node-composition.nix index ef810f1b06e7..7b8937a3647c 100644 --- a/pkgs/servers/mjolnir/node-composition.nix +++ b/pkgs/servers/mjolnir/node-composition.nix @@ -2,11 +2,11 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/servers/mjolnir/node-deps.nix b/pkgs/servers/mjolnir/node-deps.nix index 8a10a95cdd81..abdea7148824 100644 --- a/pkgs/servers/mjolnir/node-deps.nix +++ b/pkgs/servers/mjolnir/node-deps.nix @@ -13,31 +13,31 @@ let sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; }; }; - "@babel/code-frame-7.16.0" = { + "@babel/code-frame-7.16.7" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz"; - sha512 = "IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"; + sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; }; - "@babel/helper-validator-identifier-7.15.7" = { + "@babel/helper-validator-identifier-7.16.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.15.7"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; - sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; + sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; }; }; - "@babel/highlight-7.16.0" = { + "@babel/highlight-7.16.10" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.16.0"; + version = "7.16.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz"; - sha512 = "t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz"; + sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; }; }; "@eslint/eslintrc-0.4.3" = { @@ -67,13 +67,13 @@ let sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; }; }; - "@jest/types-27.2.5" = { + "@jest/types-27.5.1" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "27.2.5"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-27.2.5.tgz"; - sha512 = "nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ=="; + url = "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz"; + sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw=="; }; }; "@selderee/plugin-htmlparser2-0.6.0" = { @@ -94,15 +94,6 @@ let sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; - "@types/axios-0.14.0" = { - name = "_at_types_slash_axios"; - packageName = "@types/axios"; - version = "0.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/axios/-/axios-0.14.0.tgz"; - sha1 = "ec2300fbe7d7dddd7eb9d3abf87999964cafce46"; - }; - }; "@types/body-parser-1.19.2" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -112,6 +103,15 @@ let sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; }; }; + "@types/config-0.0.41" = { + name = "_at_types_slash_config"; + packageName = "@types/config"; + version = "0.0.41"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/config/-/config-0.0.41.tgz"; + sha512 = "HjXUmIld0gwvyG8MU/17QtLzOyuMX4jbGuijmS9sWsob5xxgZ/hY9cbRCaHIHqTQ3HMLhwS3F8uXq3Bt9zgzHA=="; + }; + }; "@types/connect-3.4.35" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; @@ -121,13 +121,13 @@ let sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; }; }; - "@types/crypto-js-4.0.2" = { + "@types/crypto-js-4.1.1" = { name = "_at_types_slash_crypto-js"; packageName = "@types/crypto-js"; - version = "4.0.2"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.0.2.tgz"; - sha512 = "sCVniU+h3GcGqxOmng11BRvf9TfN9yIs8KKjB8C8d75W69cpTfZG80gau9yTx5SxF3gvHGbJhdESzzvnjtf3Og=="; + url = "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.1.1.tgz"; + sha512 = "BG7fQKZ689HIoc5h+6D2Dgq1fABRa0RbBWKBd9SP/MVRVXROflpm5fhwyATX5duFmbStzyzyycPB8qUYKDH3NA=="; }; }; "@types/express-4.17.13" = { @@ -139,22 +139,40 @@ let sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; - "@types/express-serve-static-core-4.17.25" = { + "@types/express-serve-static-core-4.17.28" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.25"; + version = "4.17.28"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.25.tgz"; - sha512 = "OUJIVfRMFijZukGGwTpKNFprqCCXk5WjNGvUgB/CxxBR40QWSjsNK86+yvGKlCOGc7sbwfHLaXhkG+NsytwBaQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz"; + sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; }; }; - "@types/istanbul-lib-coverage-2.0.3" = { + "@types/html-to-text-8.1.0" = { + name = "_at_types_slash_html-to-text"; + packageName = "@types/html-to-text"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/html-to-text/-/html-to-text-8.1.0.tgz"; + sha512 = "54YF2fGmN4g62/w+T85uQ8n0FyBhMY5cjKZ1imsbIh4Pgbeno1mAaQktC/pv/+C2ToUYkTZis9ADgn9GRRz9nQ=="; + }; + }; + "@types/humanize-duration-3.27.1" = { + name = "_at_types_slash_humanize-duration"; + packageName = "@types/humanize-duration"; + version = "3.27.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/humanize-duration/-/humanize-duration-3.27.1.tgz"; + sha512 = "K3e+NZlpCKd6Bd/EIdqjFJRFHbrq5TzPPLwREk5Iv/YoIjQrs6ljdAUCo+Lb2xFlGNOjGSE0dqsVD19cZL137w=="; + }; + }; + "@types/istanbul-lib-coverage-2.0.4" = { name = "_at_types_slash_istanbul-lib-coverage"; packageName = "@types/istanbul-lib-coverage"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; - sha512 = "sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="; + url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz"; + sha512 = "z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="; }; }; "@types/istanbul-lib-report-3.0.0" = { @@ -175,13 +193,13 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; - "@types/jsdom-16.2.13" = { + "@types/jsdom-16.2.14" = { name = "_at_types_slash_jsdom"; packageName = "@types/jsdom"; - version = "16.2.13"; + version = "16.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.13.tgz"; - sha512 = "8JQCjdeAidptSsOcRWk2iTm9wCcwn9l+kRG6k5bzUacrnm1ezV4forq0kWjUih/tumAeoG+OspOvQEbbRucBTw=="; + url = "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.14.tgz"; + sha512 = "6BAy1xXEmMuHeAJ4Fv4yXKwBDTGTOseExKE3OaHiNycdHdZw59KfYzrt0DkDluvwmik1HRt6QS7bImxUmpSy+w=="; }; }; "@types/json5-0.0.29" = { @@ -202,31 +220,31 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/mocha-9.0.0" = { + "@types/mocha-9.1.0" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "9.0.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz"; - sha512 = "scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.0.tgz"; + sha512 = "QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg=="; }; }; - "@types/node-16.11.7" = { + "@types/node-16.11.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.7"; + version = "16.11.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz"; - sha512 = "QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz"; + sha512 = "GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ=="; }; }; - "@types/parse5-6.0.2" = { + "@types/parse5-6.0.3" = { name = "_at_types_slash_parse5"; packageName = "@types/parse5"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.2.tgz"; - sha512 = "+hQX+WyJAOne7Fh3zF5CxPemILIbuhNcqHHodzK9caYOLnC8pD5efmPleRnw0z++LfKUC/sVNMwk0Gap+B0baA=="; + url = "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz"; + sha512 = "SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g=="; }; }; "@types/qs-6.9.7" = { @@ -256,6 +274,15 @@ let sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; }; }; + "@types/shell-quote-1.7.1" = { + name = "_at_types_slash_shell-quote"; + packageName = "@types/shell-quote"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/shell-quote/-/shell-quote-1.7.1.tgz"; + sha512 = "SWZ2Nom1pkyXCDohRSrkSKvDh8QOG9RfAsrt5/NsPQC4UQJ55eG0qClA40I+Gkez4KTQ0uDUT8ELRXThf3J5jw=="; + }; + }; "@types/stack-utils-2.0.1" = { name = "_at_types_slash_stack-utils"; packageName = "@types/stack-utils"; @@ -283,13 +310,13 @@ let sha512 = "T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw=="; }; }; - "@types/yargs-parser-20.2.1" = { + "@types/yargs-parser-21.0.0" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "20.2.1"; + version = "21.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; - sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; + sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; }; "@ungap/promise-all-settled-1.1.2" = { @@ -310,13 +337,13 @@ let sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; }; }; - "accepts-1.3.7" = { + "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; + sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; "acorn-7.4.1" = { @@ -328,13 +355,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.6.0" = { + "acorn-8.7.0" = { name = "acorn"; packageName = "acorn"; - version = "8.6.0"; + version = "8.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz"; - sha512 = "U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz"; + sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; }; }; "acorn-globals-6.0.0" = { @@ -382,13 +409,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-8.8.1" = { + "ajv-8.10.0" = { name = "ajv"; packageName = "ajv"; - version = "8.8.1"; + version = "8.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.8.1.tgz"; - sha512 = "6CiMNDrzv0ZR916u2T+iRunnD60uWmNn8SkdB44/6stVORUg0aAkWO7PkOhpCmjmW8f2I/G/xnowD66fxGyQJg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz"; + sha512 = "bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw=="; }; }; "ansi-colors-4.1.1" = { @@ -535,15 +562,6 @@ let sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; - "axios-0.21.4" = { - name = "axios"; - packageName = "axios"; - version = "0.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"; - sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; - }; - }; "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; @@ -589,13 +607,13 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "body-parser-1.19.0" = { + "body-parser-1.19.2" = { name = "body-parser"; packageName = "body-parser"; - version = "1.19.0"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"; + sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; }; }; "brace-expansion-1.1.11" = { @@ -652,13 +670,13 @@ let sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; }; }; - "bytes-3.1.0" = { + "bytes-3.1.2" = { name = "bytes"; packageName = "bytes"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; - sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"; + sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; }; "callsites-3.1.0" = { @@ -670,13 +688,13 @@ let sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; }; - "camelcase-6.2.1" = { + "camelcase-6.3.0" = { name = "camelcase"; packageName = "camelcase"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz"; - sha512 = "tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; "caseless-0.12.0" = { @@ -706,13 +724,13 @@ let sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; - "chokidar-3.5.2" = { + "chokidar-3.5.3" = { name = "chokidar"; packageName = "chokidar"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"; - sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; + sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; }; }; "cliui-7.0.4" = { @@ -796,22 +814,22 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; - "config-3.3.6" = { + "config-3.3.7" = { name = "config"; packageName = "config"; - version = "3.3.6"; + version = "3.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/config/-/config-3.3.6.tgz"; - sha512 = "Hj5916C5HFawjYJat1epbyY2PlAgLpBtDUlr0MxGLgo3p5+7kylyvnRY18PqJHgnNWXcdd0eWDemT7eYWuFgwg=="; + url = "https://registry.npmjs.org/config/-/config-3.3.7.tgz"; + sha512 = "mX/n7GKDYZMqvvkY6e6oBY49W8wxdmQt+ho/5lhwFDXqQW9gI+Ahp8EKp8VAbISPnmf2+Bv5uZK7lKXZ6pf1aA=="; }; }; - "content-disposition-0.5.3" = { + "content-disposition-0.5.4" = { name = "content-disposition"; packageName = "content-disposition"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; - sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"; + sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; }; "content-type-1.0.4" = { @@ -823,13 +841,13 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "cookie-0.4.0" = { + "cookie-0.4.2" = { name = "cookie"; packageName = "cookie"; - version = "0.4.0"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; - sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; + sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; }; }; "cookie-signature-1.0.6" = { @@ -922,13 +940,22 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-4.3.2" = { + "debug-4.3.3" = { name = "debug"; packageName = "debug"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; + }; + }; + "debug-4.3.4" = { + name = "debug"; + packageName = "debug"; + version = "4.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; }; "decamelize-4.0.0" = { @@ -1030,13 +1057,13 @@ let sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="; }; }; - "diff-sequences-27.0.6" = { + "diff-sequences-27.5.1" = { name = "diff-sequences"; packageName = "diff-sequences"; - version = "27.0.6"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.6.tgz"; - sha512 = "ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ=="; + url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz"; + sha512 = "k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="; }; }; "discontinuous-range-1.0.0" = { @@ -1093,13 +1120,13 @@ let sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; }; }; - "domhandler-4.2.2" = { + "domhandler-4.3.1" = { name = "domhandler"; packageName = "domhandler"; - version = "4.2.2"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz"; - sha512 = "PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"; + sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="; }; }; "domutils-2.8.0" = { @@ -1345,22 +1372,22 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "expect-27.3.1" = { + "expect-27.5.1" = { name = "expect"; packageName = "expect"; - version = "27.3.1"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-27.3.1.tgz"; - sha512 = "MrNXV2sL9iDRebWPGOGFdPQRl2eDQNu/uhxIMShjjx74T6kC6jFIkmQ6OqXDtevjGUkyB2IT56RzDBqXf/QPCg=="; + url = "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz"; + sha512 = "E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw=="; }; }; - "express-4.17.1" = { + "express-4.17.3" = { name = "express"; packageName = "express"; - version = "4.17.1"; + version = "4.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; - sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz"; + sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; }; }; "extend-3.0.2" = { @@ -1462,22 +1489,13 @@ let sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; }; - "flatted-3.2.4" = { + "flatted-3.2.5" = { name = "flatted"; packageName = "flatted"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz"; - sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; - }; - }; - "follow-redirects-1.14.5" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz"; - sha512 = "wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; }; "forever-agent-0.6.1" = { @@ -1579,15 +1597,6 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "glob-7.1.7" = { - name = "glob"; - packageName = "glob"; - version = "7.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; - sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; - }; - }; "glob-7.2.0" = { name = "glob"; packageName = "glob"; @@ -1615,22 +1624,22 @@ let sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; }; }; - "globals-13.12.0" = { + "globals-13.13.0" = { name = "globals"; packageName = "globals"; - version = "13.12.0"; + version = "13.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz"; - sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; + url = "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz"; + sha512 = "EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A=="; }; }; - "graceful-fs-4.2.8" = { + "graceful-fs-4.2.9" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.8"; + version = "4.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; }; }; "growl-1.10.5" = { @@ -1759,13 +1768,13 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; - "http-errors-1.7.2" = { + "http-errors-1.8.1" = { name = "http-errors"; packageName = "http-errors"; - version = "1.7.2"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; - sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; + sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; }; "http-proxy-agent-4.0.1" = { @@ -1795,6 +1804,24 @@ let sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; }; }; + "humanize-duration-3.27.1" = { + name = "humanize-duration"; + packageName = "humanize-duration"; + version = "3.27.1"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.1.tgz"; + sha512 = "jCVkMl+EaM80rrMrAPl96SGG4NRac53UyI1o/yAzebDntEY6K6/Fj2HOjdPg8omTqIe5Y0wPBai2q5xXrIbarA=="; + }; + }; + "humanize-duration-ts-2.1.1" = { + name = "humanize-duration-ts"; + packageName = "humanize-duration-ts"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-duration-ts/-/humanize-duration-ts-2.1.1.tgz"; + sha512 = "TibNF2/fkypjAfHdGpWL/dmWUS0G6Qi+3mKyiB6LDCowbMy+PtzbgPTnFMNTOVAJXDau01jYrJ3tFoz5AJSqhA=="; + }; + }; "iconv-lite-0.4.24" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -1840,13 +1867,13 @@ let sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; }; }; - "inherits-2.0.3" = { + "inherits-2.0.4" = { name = "inherits"; packageName = "inherits"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; "ipaddr.js-1.9.1" = { @@ -1867,13 +1894,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-core-module-2.8.0" = { + "is-core-module-2.8.1" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz"; - sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"; + sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; }; }; "is-extglob-2.1.1" = { @@ -1984,49 +2011,40 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; - "jest-diff-27.3.1" = { + "jest-diff-27.5.1" = { name = "jest-diff"; packageName = "jest-diff"; - version = "27.3.1"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.3.1.tgz"; - sha512 = "PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz"; + sha512 = "m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw=="; }; }; - "jest-get-type-27.3.1" = { + "jest-get-type-27.5.1" = { name = "jest-get-type"; packageName = "jest-get-type"; - version = "27.3.1"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.3.1.tgz"; - sha512 = "+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg=="; + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz"; + sha512 = "2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="; }; }; - "jest-matcher-utils-27.3.1" = { + "jest-matcher-utils-27.5.1" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "27.3.1"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.3.1.tgz"; - sha512 = "hX8N7zXS4k+8bC1Aj0OWpGb7D3gIXxYvPNK1inP5xvE4ztbz3rc4AkI6jGVaerepBnfWB17FL5lWFJT3s7qo8w=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz"; + sha512 = "z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw=="; }; }; - "jest-message-util-27.3.1" = { + "jest-message-util-27.5.1" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "27.3.1"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.3.1.tgz"; - sha512 = "bh3JEmxsTZ/9rTm0jQrPElbY2+y48Rw2t47uMfByNyUVR+OfPh4anuyKsGqsNkXk/TI4JbLRZx+7p7Hdt6q1yg=="; - }; - }; - "jest-regex-util-27.0.6" = { - name = "jest-regex-util"; - packageName = "jest-regex-util"; - version = "27.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.6.tgz"; - sha512 = "SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ=="; + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz"; + sha512 = "rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g=="; }; }; "js-tokens-4.0.0" = { @@ -2074,13 +2092,13 @@ let sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw=="; }; }; - "json-schema-0.2.3" = { + "json-schema-0.4.0" = { name = "json-schema"; packageName = "json-schema"; - version = "0.2.3"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"; + sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; }; }; "json-schema-traverse-0.4.1" = { @@ -2128,22 +2146,22 @@ let sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; }; }; - "json5-2.2.0" = { + "json5-2.2.1" = { name = "json5"; packageName = "json5"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz"; - sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"; + sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; }; }; - "jsprim-1.4.1" = { + "jsprim-1.4.2" = { name = "jsprim"; packageName = "jsprim"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz"; + sha512 = "P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="; }; }; "levn-0.3.0" = { @@ -2299,22 +2317,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.51.0" = { + "mime-db-1.52.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.51.0"; + version = "1.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; - sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; }; }; - "mime-types-2.1.34" = { + "mime-types-2.1.35" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.34"; + version = "2.1.35"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; - sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; + sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; }; }; "minimalistic-assert-1.0.1" = { @@ -2326,22 +2344,31 @@ let sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; }; - "minimatch-3.0.4" = { + "minimatch-3.1.2" = { name = "minimatch"; packageName = "minimatch"; - version = "3.0.4"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; + sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; - "minimist-1.2.5" = { + "minimatch-4.2.1" = { + name = "minimatch"; + packageName = "minimatch"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz"; + sha512 = "9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g=="; + }; + }; + "minimist-1.2.6" = { name = "minimist"; packageName = "minimist"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"; + sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; }; "mkdirp-0.5.5" = { @@ -2362,13 +2389,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mocha-9.1.3" = { + "mocha-9.2.2" = { name = "mocha"; packageName = "mocha"; - version = "9.1.3"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz"; - sha512 = "Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz"; + sha512 = "L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g=="; }; }; "moo-0.5.1" = { @@ -2398,15 +2425,6 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; - "ms-2.1.1" = { - name = "ms"; - packageName = "ms"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; - }; - }; "ms-2.1.2" = { name = "ms"; packageName = "ms"; @@ -2425,22 +2443,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "nanoid-3.1.25" = { + "nanoid-3.3.1" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.25"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz"; - sha512 = "rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="; - }; - }; - "nanoid-3.1.30" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.1.30"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz"; - sha512 = "zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz"; + sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="; }; }; "natural-compare-1.4.0" = { @@ -2461,13 +2470,13 @@ let sha512 = "+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ=="; }; }; - "negotiator-0.6.2" = { + "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; }; }; "normalize-path-3.0.0" = { @@ -2569,6 +2578,15 @@ let sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; }; + "parse-duration-1.0.2" = { + name = "parse-duration"; + packageName = "parse-duration"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-duration/-/parse-duration-1.0.2.tgz"; + sha512 = "Dg27N6mfok+ow1a2rj/nRjtCfaKrHUZV2SJpEn/s8GaVUSlf4GGRCRP1c13Hj+wfPKVMrFDqLMLITkYKgKxyyg=="; + }; + }; "parse-srcset-1.0.2" = { name = "parse-srcset"; packageName = "parse-srcset"; @@ -2668,13 +2686,13 @@ let sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; }; }; - "picomatch-2.3.0" = { + "picomatch-2.3.1" = { name = "picomatch"; packageName = "picomatch"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; - sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"; + sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; "pify-3.0.0" = { @@ -2686,13 +2704,13 @@ let sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; }; - "postcss-8.3.11" = { + "postcss-8.4.12" = { name = "postcss"; packageName = "postcss"; - version = "8.3.11"; + version = "8.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz"; - sha512 = "hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz"; + sha512 = "lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg=="; }; }; "prelude-ls-1.1.2" = { @@ -2713,13 +2731,13 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "pretty-format-27.3.1" = { + "pretty-format-27.5.1" = { name = "pretty-format"; packageName = "pretty-format"; - version = "27.3.1"; + version = "27.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.3.1.tgz"; - sha512 = "DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz"; + sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="; }; }; "progress-2.0.3" = { @@ -2767,22 +2785,22 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "qs-6.5.2" = { + "qs-6.5.3" = { name = "qs"; packageName = "qs"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + url = "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz"; + sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; }; }; - "qs-6.7.0" = { + "qs-6.9.7" = { name = "qs"; packageName = "qs"; - version = "6.7.0"; + version = "6.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; - sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz"; + sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; }; }; "railroad-diagrams-1.0.0" = { @@ -2821,13 +2839,13 @@ let sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; - "raw-body-2.4.0" = { + "raw-body-2.4.3" = { name = "raw-body"; packageName = "raw-body"; - version = "2.4.0"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; - sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz"; + sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; }; }; "react-is-17.0.2" = { @@ -2902,13 +2920,13 @@ let sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; }; - "resolve-1.20.0" = { + "resolve-1.22.0" = { name = "resolve"; packageName = "resolve"; - version = "1.20.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; - sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; + sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; }; }; "resolve-from-4.0.0" = { @@ -2947,6 +2965,15 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; + "safe-buffer-5.2.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -2956,13 +2983,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-2.5.3" = { + "sanitize-html-2.7.0" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "2.5.3"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.5.3.tgz"; - sha512 = "DGATXd1fs/Rm287/i5FBKVYSBBUL0iAaztOA1/RFhEs4yqo39/X52i/q/CwsfCUG5cilmXSBmnQmyWfnKhBlOg=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.0.tgz"; + sha512 = "jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA=="; }; }; "saxes-5.0.1" = { @@ -3001,13 +3028,13 @@ let sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; }; - "send-0.17.1" = { + "send-0.17.2" = { name = "send"; packageName = "send"; - version = "0.17.1"; + version = "0.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; - sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz"; + sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; }; }; "serialize-javascript-6.0.0" = { @@ -3019,22 +3046,22 @@ let sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; }; }; - "serve-static-1.14.1" = { + "serve-static-1.14.2" = { name = "serve-static"; packageName = "serve-static"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; - sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz"; + sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; }; }; - "setprototypeof-1.1.1" = { + "setprototypeof-1.2.0" = { name = "setprototypeof"; packageName = "setprototypeof"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; + sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; }; }; "shebang-command-2.0.0" = { @@ -3055,6 +3082,15 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; + "shell-quote-1.7.3" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz"; + sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; + }; + }; "sigmund-1.0.1" = { name = "sigmund"; packageName = "sigmund"; @@ -3091,22 +3127,22 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "source-map-js-0.6.2" = { + "source-map-js-1.0.2" = { name = "source-map-js"; packageName = "source-map-js"; - version = "0.6.2"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz"; - sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="; + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"; + sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; }; }; - "source-map-support-0.5.20" = { + "source-map-support-0.5.21" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.20"; + version = "0.5.21"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz"; - sha512 = "n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"; + sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; }; }; "sprintf-js-1.0.3" = { @@ -3118,13 +3154,13 @@ let sha1 = "04e6926f662895354f3dd015203633b857297e2c"; }; }; - "sshpk-1.16.1" = { + "sshpk-1.17.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.16.1"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz"; + sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; }; }; "stack-utils-2.0.5" = { @@ -3226,6 +3262,15 @@ let sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; }; }; + "supports-preserve-symlinks-flag-1.0.0" = { + name = "supports-preserve-symlinks-flag"; + packageName = "supports-preserve-symlinks-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; + }; + }; "symbol-tree-3.2.4" = { name = "symbol-tree"; packageName = "symbol-tree"; @@ -3235,13 +3280,13 @@ let sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; }; }; - "table-6.7.3" = { + "table-6.8.0" = { name = "table"; packageName = "table"; - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.7.3.tgz"; - sha512 = "5DkIxeA7XERBqMwJq0aHZOdMadBx4e6eDoFRuyT5VR82J0Ycg2DwM6GfA/EQAhJ+toRTaS1lIdSQCqgrmhPnlw=="; + url = "https://registry.npmjs.org/table/-/table-6.8.0.tgz"; + sha512 = "s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA=="; }; }; "text-table-0.2.0" = { @@ -3262,13 +3307,13 @@ let sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; - "toidentifier-1.0.0" = { + "toidentifier-1.0.1" = { name = "toidentifier"; packageName = "toidentifier"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; - sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; + sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; }; }; "tough-cookie-2.5.0" = { @@ -3316,13 +3361,13 @@ let sha512 = "BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw=="; }; }; - "tsconfig-paths-3.11.0" = { + "tsconfig-paths-3.14.0" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; - version = "3.11.0"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz"; - sha512 = "7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA=="; + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz"; + sha512 = "cg/1jAZoL57R39+wiw4u/SCC6Ic9Q5NqjBOb+9xISedOYurfog9ZNmKJSxAnb2m/5Bq4lE9lhUcau33Ml8DM0g=="; }; }; "tslib-1.14.1" = { @@ -3406,13 +3451,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typescript-4.5.2" = { + "typescript-4.6.2" = { name = "typescript"; packageName = "typescript"; - version = "4.5.2"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz"; - sha512 = "5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz"; + sha512 = "HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg=="; }; }; "typescript-formatter-7.2.2" = { @@ -3577,13 +3622,13 @@ let sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; }; - "workerpool-6.1.5" = { + "workerpool-6.2.0" = { name = "workerpool"; packageName = "workerpool"; - version = "6.1.5"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz"; - sha512 = "XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz"; + sha512 = "Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A=="; }; }; "wrap-ansi-7.0.0" = { @@ -3604,13 +3649,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "ws-7.5.5" = { + "ws-7.5.7" = { name = "ws"; packageName = "ws"; - version = "7.5.5"; + version = "7.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz"; - sha512 = "BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz"; + sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="; }; }; "xml-name-validator-3.0.0" = { @@ -3707,12 +3752,12 @@ let args = { name = "mjolnir"; packageName = "mjolnir"; - version = "1.2.1"; - src = ../../../../../../../nix/store/8x9ib7ymf5yj075632mz4qap4m0nzd52-source; + version = "1.4.1"; + src = ../../../../../../../nix/store/lb7jkhbcx6z00m9j6ck8pa237c26bhi0-source; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.15.7" - (sources."@babel/highlight-7.16.0" // { + sources."@babel/helper-validator-identifier-7.16.7" + (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -3726,47 +3771,50 @@ let (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ sources."argparse-1.0.10" - sources."debug-4.3.2" + sources."debug-4.3.4" sources."js-yaml-3.14.1" sources."ms-2.1.2" ]; }) (sources."@humanwhocodes/config-array-0.5.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."@humanwhocodes/object-schema-1.2.1" - sources."@jest/types-27.2.5" + sources."@jest/types-27.5.1" sources."@selderee/plugin-htmlparser2-0.6.0" sources."@tootallnate/once-1.1.2" - sources."@types/axios-0.14.0" sources."@types/body-parser-1.19.2" + sources."@types/config-0.0.41" sources."@types/connect-3.4.35" - sources."@types/crypto-js-4.0.2" + sources."@types/crypto-js-4.1.1" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.25" - sources."@types/istanbul-lib-coverage-2.0.3" + sources."@types/express-serve-static-core-4.17.28" + sources."@types/html-to-text-8.1.0" + sources."@types/humanize-duration-3.27.1" + sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/jsdom-16.2.13" + sources."@types/jsdom-16.2.14" sources."@types/json5-0.0.29" sources."@types/mime-1.3.2" - sources."@types/mocha-9.0.0" - sources."@types/node-16.11.7" - sources."@types/parse5-6.0.2" + sources."@types/mocha-9.1.0" + sources."@types/node-16.11.26" + sources."@types/parse5-6.0.3" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/serve-static-1.13.10" + sources."@types/shell-quote-1.7.1" sources."@types/stack-utils-2.0.1" sources."@types/tough-cookie-4.0.1" sources."@types/yargs-16.0.4" - sources."@types/yargs-parser-20.2.1" + sources."@types/yargs-parser-21.0.0" sources."@ungap/promise-all-settled-1.1.2" sources."abab-2.0.5" - sources."accepts-1.3.7" - sources."acorn-8.6.0" + sources."accepts-1.3.8" + sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -3776,7 +3824,7 @@ let sources."acorn-walk-7.2.0" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -3794,25 +3842,28 @@ let sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."axios-0.21.4" sources."balanced-match-1.0.2" - sources."basic-auth-2.0.1" + (sources."basic-auth-2.0.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.2.0" sources."bluebird-3.7.2" - sources."body-parser-1.19.0" + sources."body-parser-1.19.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" sources."browser-stdout-1.3.1" sources."buffer-from-1.1.2" sources."builtin-modules-1.1.1" - sources."bytes-3.1.0" + sources."bytes-3.1.2" sources."callsites-3.1.0" - sources."camelcase-6.2.1" + sources."camelcase-6.3.0" sources."caseless-0.12.0" sources."chalk-4.1.2" - sources."chokidar-3.5.2" + sources."chokidar-3.5.3" sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -3820,10 +3871,10 @@ let sources."commander-2.20.3" sources."commandpost-1.4.0" sources."concat-map-0.0.1" - sources."config-3.3.6" - sources."content-disposition-0.5.3" + sources."config-3.3.7" + sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.0" + sources."cookie-0.4.2" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" @@ -3845,7 +3896,7 @@ let sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff-sequences-27.0.6" + sources."diff-sequences-27.5.1" sources."discontinuous-range-1.0.0" sources."doctrine-3.0.0" sources."dom-serializer-1.3.2" @@ -3855,7 +3906,7 @@ let sources."webidl-conversions-5.0.0" ]; }) - sources."domhandler-4.2.2" + sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."ecc-jsbn-0.1.2" (sources."editorconfig-0.15.3" // { @@ -3877,7 +3928,7 @@ let (sources."eslint-7.32.0" // { dependencies = [ sources."argparse-1.0.10" - sources."debug-4.3.2" + sources."debug-4.3.4" sources."js-yaml-3.14.1" sources."levn-0.4.1" sources."ms-2.1.2" @@ -3909,12 +3960,8 @@ let sources."estraverse-5.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" - (sources."expect-27.3.1" // { - dependencies = [ - sources."ansi-styles-5.2.0" - ]; - }) - sources."express-4.17.1" + sources."expect-27.5.1" + sources."express-4.17.3" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" @@ -3926,8 +3973,7 @@ let sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" - sources."follow-redirects-1.14.5" + sources."flatted-3.2.5" sources."forever-agent-0.6.1" sources."form-data-3.0.1" sources."forwarded-0.2.0" @@ -3941,8 +3987,8 @@ let sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" - sources."globals-13.12.0" - sources."graceful-fs-4.2.8" + sources."globals-13.13.0" + sources."graceful-fs-4.2.9" sources."growl-1.10.5" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -3954,29 +4000,31 @@ let sources."html-to-text-8.1.0" sources."htmlencode-0.0.4" sources."htmlparser2-6.1.0" - sources."http-errors-1.7.2" + sources."http-errors-1.8.1" (sources."http-proxy-agent-4.0.1" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."http-signature-1.2.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.2" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) + sources."humanize-duration-3.27.1" + sources."humanize-duration-ts-2.1.1" sources."iconv-lite-0.4.24" 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.3" + sources."inherits-2.0.4" sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.8.0" + sources."is-core-module-2.8.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -3989,25 +4037,24 @@ let sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."jest-diff-27.3.1" - sources."jest-get-type-27.3.1" - sources."jest-matcher-utils-27.3.1" - (sources."jest-message-util-27.3.1" // { + sources."jest-diff-27.5.1" + sources."jest-get-type-27.5.1" + sources."jest-matcher-utils-27.5.1" + (sources."jest-message-util-27.5.1" // { dependencies = [ - sources."@babel/code-frame-7.16.0" + sources."@babel/code-frame-7.16.7" ]; }) - sources."jest-regex-util-27.0.6" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" sources."jsdom-16.7.0" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.2.0" - sources."jsprim-1.4.1" + sources."json5-2.2.1" + sources."jsprim-1.4.2" sources."levn-0.3.0" sources."locate-path-6.0.0" sources."lodash-4.17.21" @@ -4029,22 +4076,21 @@ let sources."methods-1.1.2" sources."micromatch-4.0.4" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" sources."mkdirp-1.0.4" - (sources."mocha-9.1.3" // { + (sources."mocha-9.2.2" // { dependencies = [ - (sources."debug-4.3.2" // { + (sources."debug-4.3.3" // { dependencies = [ sources."ms-2.1.2" ]; }) - sources."glob-7.1.7" + sources."minimatch-4.2.1" sources."ms-2.1.3" - sources."nanoid-3.1.25" sources."supports-color-8.1.1" ]; }) @@ -4055,10 +4101,10 @@ let ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.30" + sources."nanoid-3.3.1" sources."natural-compare-1.4.0" sources."nearley-2.20.1" - sources."negotiator-0.6.2" + sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" @@ -4069,6 +4115,7 @@ let sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."parent-module-1.0.1" + sources."parse-duration-1.0.2" sources."parse-srcset-1.0.2" sources."parse5-6.0.1" sources."parseley-0.7.0" @@ -4080,11 +4127,11 @@ let sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" sources."picocolors-1.0.0" - sources."picomatch-2.3.0" + sources."picomatch-2.3.1" sources."pify-3.0.0" - sources."postcss-8.3.11" + sources."postcss-8.4.12" sources."prelude-ls-1.1.2" - (sources."pretty-format-27.3.1" // { + (sources."pretty-format-27.5.1" // { dependencies = [ sources."ansi-styles-5.2.0" ]; @@ -4094,19 +4141,19 @@ let sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."punycode-2.1.1" - sources."qs-6.7.0" + sources."qs-6.9.7" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.0" + sources."raw-body-2.4.3" sources."react-is-17.0.2" sources."readdirp-3.6.0" sources."regexpp-3.2.0" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" - sources."qs-6.5.2" + sources."qs-6.5.3" sources."tough-cookie-2.5.0" ]; }) @@ -4118,34 +4165,35 @@ let sources."request-promise-core-1.1.4" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."resolve-1.20.0" + sources."resolve-1.22.0" sources."resolve-from-4.0.0" sources."ret-0.1.15" sources."rimraf-3.0.2" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sanitize-html-2.5.3" + sources."sanitize-html-2.7.0" sources."saxes-5.0.1" sources."selderee-0.6.0" sources."semver-7.3.5" - (sources."send-0.17.1" // { + (sources."send-0.17.2" // { dependencies = [ - sources."ms-2.1.1" + sources."ms-2.1.3" ]; }) sources."serialize-javascript-6.0.0" - sources."serve-static-1.14.1" - sources."setprototypeof-1.1.1" + sources."serve-static-1.14.2" + sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" + sources."shell-quote-1.7.3" sources."sigmund-1.0.1" sources."slash-3.0.0" sources."slice-ansi-4.0.0" sources."source-map-0.6.1" - sources."source-map-js-0.6.2" - sources."source-map-support-0.5.20" + sources."source-map-js-1.0.2" + sources."source-map-support-0.5.21" sources."sprintf-js-1.0.3" - sources."sshpk-1.16.1" + sources."sshpk-1.17.0" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -4159,16 +4207,17 @@ let sources."strip-bom-3.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-7.2.0" + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-tree-3.2.4" - (sources."table-6.7.3" // { + (sources."table-6.8.0" // { dependencies = [ - sources."ajv-8.8.1" + sources."ajv-8.10.0" sources."json-schema-traverse-1.0.0" ]; }) sources."text-table-0.2.0" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."tough-cookie-4.0.0" sources."tr46-2.1.0" sources."ts-mocha-8.0.0" @@ -4178,7 +4227,7 @@ let sources."mkdirp-0.5.5" ]; }) - (sources."tsconfig-paths-3.11.0" // { + (sources."tsconfig-paths-3.14.0" // { dependencies = [ sources."json5-1.0.1" ]; @@ -4206,7 +4255,7 @@ let sources."type-check-0.3.2" sources."type-fest-0.20.2" sources."type-is-1.6.18" - sources."typescript-4.5.2" + sources."typescript-4.6.2" sources."typescript-formatter-7.2.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -4224,10 +4273,10 @@ let sources."whatwg-url-8.7.0" sources."which-2.0.2" sources."word-wrap-1.2.3" - sources."workerpool-6.1.5" + sources."workerpool-6.2.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.5.5" + sources."ws-7.5.7" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" diff --git a/pkgs/servers/mjolnir/node-env.nix b/pkgs/servers/mjolnir/node-env.nix index 21089c4d5459..5f055785791b 100644 --- a/pkgs/servers/mjolnir/node-env.nix +++ b/pkgs/servers/mjolnir/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: let # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master @@ -40,36 +40,22 @@ let ''; }; - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules + # Common shell logic + installPackage = writeShellScript "install-package" '' + installPackage() { + local packageName=$1 src=$2 - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi + local strippedName - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) + local DIR=$PWD cd $TMPDIR - unpackFile ${src} + unpackFile $src # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" + mkdir -p "$(dirname "$DIR/$packageName")" - if [ -f "${src}" ] + if [ -f "$src" ] then # Figure out what directory has been unpacked packageDir="$(find . -maxdepth 1 -type d | tail -1)" @@ -79,28 +65,53 @@ let chmod -R u+w "$packageDir" # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] + mv "$packageDir" "$DIR/$packageName" + elif [ -d "$src" ] then # Get a stripped name (without hash) of the source directory. # On old nixpkgs it's already set internally. if [ -z "$strippedName" ] then - strippedName="$(stripHash ${src})" + strippedName="$(stripHash $src)" fi # Restore write permissions to make building work chmod -R u+w "$strippedName" # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" + mv "$strippedName" "$DIR/$packageName" fi - # Unset the stripped name to not confuse the next unpack step - unset strippedName + # Change to the package directory to install dependencies + cd "$DIR/$packageName" + } + ''; - # Include the dependencies of the package - cd "$DIR/${packageName}" + # Bundle the dependencies of the package + # + # Only include dependencies if they don't exist. They may also be bundled in the package. + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) ( + '' + mkdir -p node_modules + cd node_modules + '' + + (lib.concatMapStrings (dependency: + '' + if [ ! -e "${dependency.name}" ]; then + ${composePackage dependency} + fi + '' + ) dependencies) + + '' + cd .. + '' + ); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + installPackage "${packageName}" "${src}" ${includeDependencies { inherit dependencies; }} cd .. ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} @@ -415,6 +426,8 @@ let passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -492,6 +505,8 @@ let passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + mkdir -p $out/${packageName} cd $out/${packageName} diff --git a/pkgs/servers/mjolnir/update.sh b/pkgs/servers/mjolnir/update.sh index 6c7b2fb417b3..62c0c6eaa7e7 100755 --- a/pkgs/servers/mjolnir/update.sh +++ b/pkgs/servers/mjolnir/update.sh @@ -20,7 +20,7 @@ store_src="$(nix-build . -A mjolnir.src --no-out-link)" cd "$(dirname "${BASH_SOURCE[0]}")" node2nix \ - --nodejs-12 \ + --nodejs-14 \ --development \ --node-env ./node-env.nix \ --output ./node-deps.nix \ diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index c55c67f5f62d..c4e2cc53291b 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -63,6 +63,7 @@ perlPackages.buildPerlPackage rec { cp -r bin $out cp -r lib $out + cp -r share $out for cur in $out/bin/*; do if [ -x "$cur" ]; then diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index b5ae64030689..35d44072a9f0 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -1,4 +1,6 @@ -{ lib, mkYarnPackage, fetchFromGitHub, nodejs, runtimeShell }: +{ lib, mkYarnPackage, fetchFromGitHub, nodejs, runtimeShell +, nodePackages, python3, vips, glib, pkg-config +}: # Notes for the upgrade: # * Download the tarball of the new version to use. @@ -10,13 +12,13 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - sha256 = "sha256-q4w40Do3e4vMluwAb1YwSGMVHO6QRZr8Fa5I+05uzLI="; + sha256 = "sha256-6yw+zp83T6VVa4A9KYX6rzMKG5GoyJ7M8Z+cEHE4uts="; }; buildPhase = '' @@ -35,6 +37,14 @@ mkYarnPackage rec { yarnNix = ./yarn.nix; yarnLock = ./yarn.lock; + pkgConfig.sharp = { + nativeBuildInputs = [ nodePackages.node-gyp python3 pkg-config ]; + buildInputs = [ glib vips ]; + postInstall = '' + node-gyp rebuild + ''; + }; + distPhase = '' runHook preDist diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index dbc39a3aafcb..0e22150e0e22 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -5,7 +5,7 @@ "license": "Apache-2.0", "repository": { "type": "git", - "url": "https://github.com/grafana/grafana-image-renderer.git" + "url": "http://github.com/grafana/grafana-image-renderer.git" }, "scripts": { "eslint": "eslint . --ext .ts", @@ -14,6 +14,7 @@ "prettier:write": "prettier --list-different \"**/*.ts\" --write", "precommit": "npm run eslint & npm run typecheck", "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" }, @@ -30,8 +31,10 @@ "morgan": "^1.9.0", "on-finished": "^2.3.0", "prom-client": "^11.5.3", - "puppeteer": "^10.0.0", + "puppeteer": "^13.1.3", "puppeteer-cluster": "^0.22.0", + "poolpeteer": "^0.22.0", + "sharp": "0.29.3", "unique-filename": "^1.1.0", "winston": "^3.2.1" }, @@ -39,6 +42,7 @@ "@grafana/eslint-config": "^2.5.0", "@types/express": "^4.11.1", "@types/node": "^14.14.41", + "cross-env": "7.0.3", "@typescript-eslint/eslint-plugin": "^4.32.0", "@typescript-eslint/parser": "^4.32.0", "eslint": "^7.32.0", @@ -49,7 +53,7 @@ "eslint-plugin-react-hooks": "^4.2.0", "husky": "^4.3.8", "lint-staged": "^11.2.0", - "pkg": "^5.4.1", + "pkg": "5.5.2", "prettier": "2.2.1", "tsc-watch": "^4.2.3", "typescript": "^4.3.2" @@ -69,7 +73,7 @@ }, "bin": "build/app.js", "engines": { - "node": ">=14 <15" + "node": ">=14 <=16" }, "volta": { "node": "14.16.1" diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock index dae82acb1311..de9fa1f9b9d4 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock @@ -1,3848 +1,3878 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@babel/code-frame@7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" - integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== - dependencies: - "@babel/highlight" "^7.10.4" - -"@babel/code-frame@^7.0.0": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" - integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== - dependencies: - "@babel/highlight" "^7.14.5" - -"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.5": - version "7.15.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" - integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== - -"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" - integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== - dependencies: - "@babel/helper-validator-identifier" "^7.14.5" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/parser@7.13.13": - version "7.13.13" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df" - integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw== - -"@babel/types@7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.12.tgz#edbf99208ef48852acdff1c8a681a1e4ade580cd" - integrity sha512-K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA== - dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - lodash "^4.17.19" - to-fast-properties "^2.0.0" - -"@dabh/diagnostics@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz#290d08f7b381b8f94607dc8f471a12c675f9db31" - integrity sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q== - dependencies: - colorspace "1.1.x" - enabled "2.0.x" - kuler "^2.0.0" - -"@es-joy/jsdoccomment@0.10.8": - version "0.10.8" - resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.10.8.tgz#b3152887e25246410ed4ea569a55926ec13b2b05" - integrity sha512-3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ== - dependencies: - comment-parser "1.2.4" - esquery "^1.4.0" - jsdoc-type-pratt-parser "1.1.1" - -"@eslint/eslintrc@^0.4.0", "@eslint/eslintrc@^0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" - integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== - dependencies: - ajv "^6.12.4" - debug "^4.1.1" - espree "^7.3.0" - globals "^13.9.0" - ignore "^4.0.6" - import-fresh "^3.2.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - strip-json-comments "^3.1.1" - -"@grafana/eslint-config@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@grafana/eslint-config/-/eslint-config-2.5.0.tgz#d028898e201f242748a94d5582f0e14a493f5853" - integrity sha512-JHckBXfUoGYXT18br2n2nTqo4eX7V51/Ec4Y2I7ALh5XsW6OnO+/1AAPymE2J/4WGt3IocW7vJoNV2GRW1JSQg== - dependencies: - "@typescript-eslint/eslint-plugin" "4.28.0" - "@typescript-eslint/parser" "4.28.0" - eslint "7.21.0" - eslint-config-prettier "7.2.0" - eslint-plugin-jsdoc "31.6.1" - eslint-plugin-prettier "3.3.1" - eslint-plugin-react "7.22.0" - eslint-plugin-react-hooks "4.2.0" - prettier "2.2.1" - typescript "4.3.4" - -"@grpc/grpc-js@^1.0": - version "1.3.7" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.7.tgz#58b687aff93b743aafde237fd2ee9a3259d7f2d8" - integrity sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA== - dependencies: - "@types/node" ">=12.12.47" - -"@grpc/proto-loader@^0.5.4": - version "0.5.6" - resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz#1dea4b8a6412b05e2d58514d507137b63a52a98d" - integrity sha512-DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ== - dependencies: - lodash.camelcase "^4.3.0" - protobufjs "^6.8.6" - -"@hapi/boom@^9.1.0": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.4.tgz#1f9dad367c6a7da9f8def24b4a986fc5a7bd9db6" - integrity sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw== - dependencies: - "@hapi/hoek" "9.x.x" - -"@hapi/hoek@9.x.x": - version "9.2.1" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" - integrity sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw== - -"@humanwhocodes/config-array@^0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" - integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== - dependencies: - "@humanwhocodes/object-schema" "^1.2.0" - debug "^4.1.1" - minimatch "^3.0.4" - -"@humanwhocodes/object-schema@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" - integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== - -"@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== - dependencies: - "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" - -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== - -"@nodelib/fs.walk@^1.2.3": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== - dependencies: - "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" - -"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" - integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78= - -"@protobufjs/base64@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" - integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== - -"@protobufjs/codegen@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" - integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== - -"@protobufjs/eventemitter@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" - integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A= - -"@protobufjs/fetch@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" - integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU= - dependencies: - "@protobufjs/aspromise" "^1.1.1" - "@protobufjs/inquire" "^1.1.0" - -"@protobufjs/float@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" - integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E= - -"@protobufjs/inquire@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" - integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik= - -"@protobufjs/path@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" - integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0= - -"@protobufjs/pool@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" - integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q= - -"@protobufjs/utf8@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" - integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= - -"@types/body-parser@*": - version "1.19.1" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz#0c0174c42a7d017b818303d4b5d969cb0b75929c" - integrity sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg== - dependencies: - "@types/connect" "*" - "@types/node" "*" - -"@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== - dependencies: - "@types/node" "*" - -"@types/express-serve-static-core@^4.17.18": - version "4.17.24" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07" - integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/express@^4.11.1": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" - integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" - "@types/qs" "*" - "@types/serve-static" "*" - -"@types/json-schema@^7.0.7": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" - integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== - -"@types/long@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" - integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== - -"@types/mime@^1": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" - integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== - -"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0": - version "16.10.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.2.tgz#5764ca9aa94470adb4e1185fe2e9f19458992b2e" - integrity sha512-zCclL4/rx+W5SQTzFs9wyvvyCwoK9QtBpratqz2IYJ3O8Umrn0m3nsTv0wQBk9sRGpvUe9CwPDrQFB10f1FIjQ== - -"@types/node@^14.14.41": - version "14.17.20" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.20.tgz#74cc80438fd0467dc4377ee5bbad89a886df3c10" - integrity sha512-gI5Sl30tmhXsqkNvopFydP7ASc4c2cLfGNQrVKN3X90ADFWFsPEsotm/8JHSUJQKTHbwowAHtcJPeyVhtKv0TQ== - -"@types/parse-json@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" - integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== - -"@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== - -"@types/range-parser@*": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" - integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== - -"@types/serve-static@*": - version "1.13.10" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" - integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== - dependencies: - "@types/mime" "^1" - "@types/node" "*" - -"@types/yauzl@^2.9.1": - version "2.9.2" - resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a" - integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA== - dependencies: - "@types/node" "*" - -"@typescript-eslint/eslint-plugin@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.0.tgz#1a66f03b264844387beb7dc85e1f1d403bd1803f" - integrity sha512-KcF6p3zWhf1f8xO84tuBailV5cN92vhS+VT7UJsPzGBm9VnQqfI9AsiMUFUCYHTYPg1uCCo+HyiDnpDuvkAMfQ== - dependencies: - "@typescript-eslint/experimental-utils" "4.28.0" - "@typescript-eslint/scope-manager" "4.28.0" - debug "^4.3.1" - functional-red-black-tree "^1.0.1" - regexpp "^3.1.0" - semver "^7.3.5" - tsutils "^3.21.0" - -"@typescript-eslint/eslint-plugin@^4.32.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276" - integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg== - dependencies: - "@typescript-eslint/experimental-utils" "4.33.0" - "@typescript-eslint/scope-manager" "4.33.0" - debug "^4.3.1" - functional-red-black-tree "^1.0.1" - ignore "^5.1.8" - regexpp "^3.1.0" - semver "^7.3.5" - tsutils "^3.21.0" - -"@typescript-eslint/experimental-utils@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.0.tgz#13167ed991320684bdc23588135ae62115b30ee0" - integrity sha512-9XD9s7mt3QWMk82GoyUpc/Ji03vz4T5AYlHF9DcoFNfJ/y3UAclRsfGiE2gLfXtyC+JRA3trR7cR296TEb1oiQ== - dependencies: - "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.28.0" - "@typescript-eslint/types" "4.28.0" - "@typescript-eslint/typescript-estree" "4.28.0" - eslint-scope "^5.1.1" - eslint-utils "^3.0.0" - -"@typescript-eslint/experimental-utils@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd" - integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q== - dependencies: - "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.33.0" - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/typescript-estree" "4.33.0" - eslint-scope "^5.1.1" - eslint-utils "^3.0.0" - -"@typescript-eslint/parser@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.0.tgz#2404c16751a28616ef3abab77c8e51d680a12caa" - integrity sha512-7x4D22oPY8fDaOCvkuXtYYTQ6mTMmkivwEzS+7iml9F9VkHGbbZ3x4fHRwxAb5KeuSkLqfnYjs46tGx2Nour4A== - dependencies: - "@typescript-eslint/scope-manager" "4.28.0" - "@typescript-eslint/types" "4.28.0" - "@typescript-eslint/typescript-estree" "4.28.0" - debug "^4.3.1" - -"@typescript-eslint/parser@^4.32.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899" - integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA== - dependencies: - "@typescript-eslint/scope-manager" "4.33.0" - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/typescript-estree" "4.33.0" - debug "^4.3.1" - -"@typescript-eslint/scope-manager@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.0.tgz#6a3009d2ab64a30fc8a1e257a1a320067f36a0ce" - integrity sha512-eCALCeScs5P/EYjwo6se9bdjtrh8ByWjtHzOkC4Tia6QQWtQr3PHovxh3TdYTuFcurkYI4rmFsRFpucADIkseg== - dependencies: - "@typescript-eslint/types" "4.28.0" - "@typescript-eslint/visitor-keys" "4.28.0" - -"@typescript-eslint/scope-manager@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3" - integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ== - dependencies: - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/visitor-keys" "4.33.0" - -"@typescript-eslint/types@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.0.tgz#a33504e1ce7ac51fc39035f5fe6f15079d4dafb0" - integrity sha512-p16xMNKKoiJCVZY5PW/AfILw2xe1LfruTcfAKBj3a+wgNYP5I9ZEKNDOItoRt53p4EiPV6iRSICy8EPanG9ZVA== - -"@typescript-eslint/types@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72" - integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ== - -"@typescript-eslint/typescript-estree@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.0.tgz#e66d4e5aa2ede66fec8af434898fe61af10c71cf" - integrity sha512-m19UQTRtxMzKAm8QxfKpvh6OwQSXaW1CdZPoCaQuLwAq7VZMNuhJmZR4g5281s2ECt658sldnJfdpSZZaxUGMQ== - dependencies: - "@typescript-eslint/types" "4.28.0" - "@typescript-eslint/visitor-keys" "4.28.0" - debug "^4.3.1" - globby "^11.0.3" - is-glob "^4.0.1" - semver "^7.3.5" - tsutils "^3.21.0" - -"@typescript-eslint/typescript-estree@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609" - integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA== - dependencies: - "@typescript-eslint/types" "4.33.0" - "@typescript-eslint/visitor-keys" "4.33.0" - debug "^4.3.1" - globby "^11.0.3" - is-glob "^4.0.1" - semver "^7.3.5" - tsutils "^3.21.0" - -"@typescript-eslint/visitor-keys@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.0.tgz#255c67c966ec294104169a6939d96f91c8a89434" - integrity sha512-PjJyTWwrlrvM5jazxYF5ZPs/nl0kHDZMVbuIcbpawVXaDPelp3+S9zpOz5RmVUfS/fD5l5+ZXNKnWhNYjPzCvw== - dependencies: - "@typescript-eslint/types" "4.28.0" - eslint-visitor-keys "^2.0.0" - -"@typescript-eslint/visitor-keys@4.33.0": - version "4.33.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd" - integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg== - dependencies: - "@typescript-eslint/types" "4.33.0" - eslint-visitor-keys "^2.0.0" - -accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== - dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" - -acorn-jsx@^5.3.1: - version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" - integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== - -acorn@^7.4.0: - version "7.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" - integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== - -agent-base@6: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" - -ajv@^6.10.0, ajv@^6.12.4: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^8.0.1: - version "8.6.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764" - integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - -ansi-colors@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - -ansi-escapes@^4.3.0: - version "4.3.2" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" - integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== - dependencies: - type-fest "^0.21.3" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== - -are-we-there-yet@~1.1.2: - version "1.1.7" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" - integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= - -array-includes@^3.1.1, array-includes@^3.1.3: - version "3.1.4" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" - integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - get-intrinsic "^1.1.1" - is-string "^1.0.7" - -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== - -array.prototype.flatmap@^1.2.3, array.prototype.flatmap@^1.2.4: - version "1.2.5" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446" - integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - es-abstract "^1.19.0" - -astral-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" - integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== - -async@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz#d3274ec66d107a47476a4c49136aacdb00665fc8" - integrity sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg== - -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -base64-js@^1.3.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -basic-auth@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" - integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== - dependencies: - safe-buffer "5.1.2" - -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -bintrees@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524" - integrity sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ= - -bl@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -body-parser@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== - dependencies: - bytes "3.1.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.7.2" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^3.0.1, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= - -buffer@^5.2.1, buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== - -call-bind@^1.0.0, call-bind@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - -chalk@^2.0.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - 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" - -chalk@^4.0.0, chalk@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chokidar@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" - integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== - 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" - optionalDependencies: - fsevents "~2.3.2" - -chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" - integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== - -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== - dependencies: - restore-cursor "^3.1.0" - -cli-truncate@2.1.0, cli-truncate@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" - integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== - dependencies: - slice-ansi "^3.0.0" - string-width "^4.2.0" - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - -color-convert@^1.9.0, color-convert@^1.9.1: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - -color-name@^1.0.0, color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -color-string@^1.5.2: - version "1.6.0" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312" - integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA== - dependencies: - color-name "^1.0.0" - simple-swizzle "^0.2.2" - -color@3.0.x: - version "3.0.0" - resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a" - integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w== - dependencies: - color-convert "^1.9.1" - color-string "^1.5.2" - -colorette@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" - integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== - -colors@^1.2.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" - integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== - -colorspace@1.1.x: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.2.tgz#e0128950d082b86a2168580796a0aa5d6c68d8c5" - integrity sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ== - dependencies: - color "3.0.x" - text-hex "1.0.x" - -commander@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.2.0.tgz#37fe2bde301d87d47a53adeff8b5915db1381ca8" - integrity sha512-LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA== - -comment-parser@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.1.2.tgz#e5317d7a2ec22b470dcb54a29b25426c30bf39d8" - integrity sha512-AOdq0i8ghZudnYv8RUnHrhTgafUGs61Rdz9jemU5x2lnZwAWyOq7vySo626K59e1fVKH1xSRorJwPVRLSWOoAQ== - -comment-parser@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.2.4.tgz#489f3ee55dfd184a6e4bffb31baba284453cb760" - integrity sha512-pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw== - -compare-versions@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" - integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== - dependencies: - safe-buffer "5.1.2" - -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= - -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== - -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - -cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" - integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== - dependencies: - "@types/parse-json" "^4.0.0" - import-fresh "^3.2.1" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.10.0" - -cross-spawn@^7.0.2, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -debug@2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@4, debug@^4.0.1, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== - dependencies: - ms "2.1.2" - -debug@4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -decompress-response@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" - integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== - dependencies: - mimic-response "^2.0.0" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -deep-is@^0.1.3, deep-is@~0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" - integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== - -define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== - dependencies: - object-keys "^1.0.12" - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - -depd@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" - integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== - -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= - -detect-libc@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - -devtools-protocol@0.0.901419: - version "0.0.901419" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz#79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd" - integrity sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ== - -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== - dependencies: - path-type "^4.0.0" - -doctrine@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" - integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== - dependencies: - esutils "^2.0.2" - -doctrine@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" - integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== - dependencies: - esutils "^2.0.2" - -duplexer@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" - integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -enabled@2.0.x: - version "2.0.0" - resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" - integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= - -end-of-stream@^1.1.0, end-of-stream@^1.4.1: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - -enquirer@^2.3.5, enquirer@^2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" - integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== - dependencies: - ansi-colors "^4.1.1" - -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -es-abstract@^1.19.0, es-abstract@^1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" - integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== - dependencies: - call-bind "^1.0.2" - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - get-intrinsic "^1.1.1" - get-symbol-description "^1.0.0" - has "^1.0.3" - has-symbols "^1.0.2" - internal-slot "^1.0.3" - is-callable "^1.2.4" - is-negative-zero "^2.0.1" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.1" - is-string "^1.0.7" - is-weakref "^1.0.1" - object-inspect "^1.11.0" - object-keys "^1.1.1" - object.assign "^4.1.2" - string.prototype.trimend "^1.0.4" - string.prototype.trimstart "^1.0.4" - unbox-primitive "^1.0.1" - -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -escodegen@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" - integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== - dependencies: - esprima "^4.0.1" - estraverse "^5.2.0" - esutils "^2.0.2" - optionator "^0.8.1" - optionalDependencies: - source-map "~0.6.1" - -eslint-config-prettier@7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9" - integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg== - -eslint-config-prettier@^8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a" - integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew== - -eslint-plugin-jsdoc@31.6.1: - version "31.6.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-31.6.1.tgz#98040c801500572fff71c984a097d89946f1e450" - integrity sha512-5hCV3u+1VSEUMyfdTl+dpWsioD7tqQr2ILQw+KbXrF42AVxCLO8gnNLR6zDCDjqGGpt79V1sgY0RRchCWuCigg== - dependencies: - comment-parser "1.1.2" - debug "^4.3.1" - jsdoctypeparser "^9.0.0" - lodash "^4.17.20" - regextras "^0.7.1" - semver "^7.3.4" - spdx-expression-parse "^3.0.1" - -eslint-plugin-jsdoc@^36.1.0: - version "36.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.0.tgz#8dfe5f27edfb6aa3812e6d86ccaea849ddc86b03" - integrity sha512-Qpied2AJCQcScxfzTObLKRiP5QgLXjMU/ITjBagEV5p2Q/HpumD1EQtazdRYdjDSwPmXhwOl2yquwOGQ4HOJNw== - dependencies: - "@es-joy/jsdoccomment" "0.10.8" - comment-parser "1.2.4" - debug "^4.3.2" - esquery "^1.4.0" - jsdoc-type-pratt-parser "^1.1.1" - lodash "^4.17.21" - regextras "^0.8.0" - semver "^7.3.5" - spdx-expression-parse "^3.0.1" - -eslint-plugin-prettier@3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7" - integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ== - dependencies: - prettier-linter-helpers "^1.0.0" - -eslint-plugin-prettier@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0" - integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ== - dependencies: - prettier-linter-helpers "^1.0.0" - -eslint-plugin-react-hooks@4.2.0, eslint-plugin-react-hooks@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556" - integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ== - -eslint-plugin-react@7.22.0: - version "7.22.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz#3d1c542d1d3169c45421c1215d9470e341707269" - integrity sha512-p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA== - dependencies: - array-includes "^3.1.1" - array.prototype.flatmap "^1.2.3" - doctrine "^2.1.0" - has "^1.0.3" - jsx-ast-utils "^2.4.1 || ^3.0.0" - object.entries "^1.1.2" - object.fromentries "^2.0.2" - object.values "^1.1.1" - prop-types "^15.7.2" - resolve "^1.18.1" - string.prototype.matchall "^4.0.2" - -eslint-plugin-react@^7.26.1: - version "7.26.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz#41bcfe3e39e6a5ac040971c1af94437c80daa40e" - integrity sha512-Lug0+NOFXeOE+ORZ5pbsh6mSKjBKXDXItUD2sQoT+5Yl0eoT82DqnXeTMfUare4QVCn9QwXbfzO/dBLjLXwVjQ== - dependencies: - array-includes "^3.1.3" - array.prototype.flatmap "^1.2.4" - doctrine "^2.1.0" - estraverse "^5.2.0" - jsx-ast-utils "^2.4.1 || ^3.0.0" - minimatch "^3.0.4" - object.entries "^1.1.4" - object.fromentries "^2.0.4" - object.hasown "^1.0.0" - object.values "^1.1.4" - prop-types "^15.7.2" - resolve "^2.0.0-next.3" - semver "^6.3.0" - string.prototype.matchall "^4.0.5" - -eslint-scope@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - -eslint-utils@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" - integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== - dependencies: - eslint-visitor-keys "^1.1.0" - -eslint-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" - integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== - dependencies: - eslint-visitor-keys "^2.0.0" - -eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" - integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== - -eslint-visitor-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" - integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== - -eslint@7.21.0: - version "7.21.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz#4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83" - integrity sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg== - dependencies: - "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.0" - ajv "^6.10.0" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.0.1" - doctrine "^3.0.0" - enquirer "^2.3.5" - eslint-scope "^5.1.1" - eslint-utils "^2.1.0" - eslint-visitor-keys "^2.0.0" - espree "^7.3.1" - esquery "^1.4.0" - esutils "^2.0.2" - file-entry-cache "^6.0.1" - functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" - globals "^12.1.0" - ignore "^4.0.6" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - js-yaml "^3.13.1" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash "^4.17.20" - minimatch "^3.0.4" - natural-compare "^1.4.0" - optionator "^0.9.1" - progress "^2.0.0" - regexpp "^3.1.0" - semver "^7.2.1" - strip-ansi "^6.0.0" - strip-json-comments "^3.1.0" - table "^6.0.4" - text-table "^0.2.0" - v8-compile-cache "^2.0.3" - -eslint@^7.32.0: - version "7.32.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" - integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== - dependencies: - "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.3" - "@humanwhocodes/config-array" "^0.5.0" - ajv "^6.10.0" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.0.1" - doctrine "^3.0.0" - enquirer "^2.3.5" - escape-string-regexp "^4.0.0" - eslint-scope "^5.1.1" - eslint-utils "^2.1.0" - eslint-visitor-keys "^2.0.0" - espree "^7.3.1" - esquery "^1.4.0" - esutils "^2.0.2" - fast-deep-equal "^3.1.3" - file-entry-cache "^6.0.1" - functional-red-black-tree "^1.0.1" - glob-parent "^5.1.2" - globals "^13.6.0" - ignore "^4.0.6" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - js-yaml "^3.13.1" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash.merge "^4.6.2" - minimatch "^3.0.4" - natural-compare "^1.4.0" - optionator "^0.9.1" - progress "^2.0.0" - regexpp "^3.1.0" - semver "^7.2.1" - strip-ansi "^6.0.0" - strip-json-comments "^3.1.0" - table "^6.0.9" - text-table "^0.2.0" - v8-compile-cache "^2.0.3" - -espree@^7.3.0, espree@^7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" - integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== - dependencies: - acorn "^7.4.0" - acorn-jsx "^5.3.1" - eslint-visitor-keys "^1.3.0" - -esprima@^4.0.0, esprima@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - -esquery@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" - integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== - dependencies: - estraverse "^5.1.0" - -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - -estraverse@^5.1.0, estraverse@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" - integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== - -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= - -event-stream@=3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" - integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE= - dependencies: - duplexer "~0.1.1" - from "~0" - map-stream "~0.1.0" - pause-stream "0.0.11" - split "0.3" - stream-combiner "~0.0.4" - through "~2.3.1" - -execa@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - 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" - -expand-template@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" - integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== - -express-prom-bundle@^5.1.5: - version "5.1.5" - resolved "https://registry.yarnpkg.com/express-prom-bundle/-/express-prom-bundle-5.1.5.tgz#f298615879299a58cf8ec1350186f4de91d91fa4" - integrity sha512-tUaQUBu0r9zGYcVDpKBI2AeWimuuodaC5BSBkzLPQxRTxaKQShQNnONQSYwjLxbHfPwlCKVZlzfbB9Recnj0Vg== - dependencies: - on-finished "^2.3.0" - url-value-parser "^2.0.0" - -express@^4.16.3: - version "4.17.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" - integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== - dependencies: - accepts "~1.3.7" - array-flatten "1.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" - content-type "~1.0.4" - cookie "0.4.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "~1.1.2" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" - range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" - statuses "~1.5.0" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - -extract-zip@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" - integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== - dependencies: - debug "^4.1.1" - get-stream "^5.1.0" - yauzl "^2.10.0" - optionalDependencies: - "@types/yauzl" "^2.9.1" - -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-diff@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" - integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== - -fast-glob@^3.1.1: - version "3.2.7" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" - integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== - 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" - -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= - -fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== - dependencies: - reusify "^1.0.4" - -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= - dependencies: - pend "~1.2.0" - -fecha@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.1.tgz#0a83ad8f86ef62a091e22bb5a039cd03d23eecce" - integrity sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q== - -file-entry-cache@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" - integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== - dependencies: - flat-cache "^3.0.4" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" - -find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -find-versions@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965" - integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ== - dependencies: - semver-regex "^3.1.2" - -flat-cache@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" - integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== - dependencies: - flatted "^3.1.0" - rimraf "^3.0.2" - -flatted@^3.1.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" - integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== - -fn.name@1.x.x: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" - integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== - -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= - -from2@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" - integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= - dependencies: - inherits "^2.0.1" - readable-stream "^2.0.0" - -from@~0: - version "0.1.7" - resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" - integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= - -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - -fs-extra@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -functional-red-black-tree@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - -get-own-enumerable-property-symbols@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" - integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== - -get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/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.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - -get-symbol-description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" - integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - -github-from-package@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" - integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= - -glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - -glob@^7.1.3: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== - dependencies: - type-fest "^0.8.1" - -globals@^13.6.0, globals@^13.9.0: - version "13.11.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7" - integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g== - dependencies: - type-fest "^0.20.2" - -globby@^11.0.3: - version "11.0.4" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" - integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.1.1" - ignore "^5.1.4" - merge2 "^1.3.0" - slash "^3.0.0" - -google-protobuf@3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.5.0.tgz#b8cc63c74d83457bd8a9a904503c8efb26bca339" - integrity sha1-uMxjx02DRXvYqakEUDyO+ya8ozk= - -graceful-fs@^4.1.6, graceful-fs@^4.2.0: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== - -has-bigints@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" - integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-symbols@^1.0.1, has-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== - -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== - dependencies: - has-symbols "^1.0.2" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== - dependencies: - agent-base "6" - debug "4" - -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - -husky@^4.3.8: - version "4.3.8" - resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d" - integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow== - dependencies: - chalk "^4.0.0" - ci-info "^2.0.0" - compare-versions "^3.6.0" - cosmiconfig "^7.0.0" - find-versions "^4.0.0" - opencollective-postinstall "^2.0.2" - pkg-dir "^5.0.0" - please-upgrade-node "^3.2.0" - slash "^3.0.0" - which-pm-runs "^1.0.0" - -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -ignore@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" - integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== - -ignore@^5.1.4, ignore@^5.1.8: - version "5.1.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" - integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== - -import-fresh@^3.0.0, import-fresh@^3.2.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" - integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= - -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - -ini@~1.3.0: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - -internal-slot@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" - integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== - dependencies: - get-intrinsic "^1.1.0" - has "^1.0.3" - side-channel "^1.0.4" - -into-stream@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-6.0.0.tgz#4bfc1244c0128224e18b8870e85b2de8e66c6702" - integrity sha512-XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA== - dependencies: - from2 "^2.3.0" - p-is-promise "^3.0.0" - -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= - -is-arrayish@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" - integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== - -is-bigint@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" - integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== - dependencies: - has-bigints "^1.0.1" - -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - -is-boolean-object@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" - integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-callable@^1.1.4, is-callable@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" - integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== - -is-core-module@^2.2.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3" - integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ== - dependencies: - has "^1.0.3" - -is-date-object@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== - dependencies: - has-tostringtag "^1.0.0" - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== - dependencies: - is-extglob "^2.1.1" - -is-negative-zero@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" - integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== - -is-number-object@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" - integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== - dependencies: - has-tostringtag "^1.0.0" - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-obj@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" - integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= - -is-regex@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" - integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= - -is-shared-array-buffer@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" - integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== - -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - -is-string@^1.0.5, is-string@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" - integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== - dependencies: - has-tostringtag "^1.0.0" - -is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" - integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== - dependencies: - has-symbols "^1.0.2" - -is-weakref@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2" - integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ== - dependencies: - call-bind "^1.0.0" - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= - -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -jsdoc-type-pratt-parser@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz#10fe5e409ba38de22a48b555598955a26ff0160f" - integrity sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g== - -jsdoc-type-pratt-parser@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.2.0.tgz#3482a3833b74a88c95a6ba7253f0c0de3b77b9f5" - integrity sha512-4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg== - -jsdoctypeparser@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz#8c97e2fb69315eb274b0f01377eaa5c940bd7b26" - integrity sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw== - -json-parse-even-better-errors@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - -json-stable-stringify-without-jsonify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= - -jsonfile@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" - integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== - dependencies: - universalify "^2.0.0" - optionalDependencies: - graceful-fs "^4.1.6" - -"jsx-ast-utils@^2.4.1 || ^3.0.0": - version "3.2.1" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b" - integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA== - dependencies: - array-includes "^3.1.3" - object.assign "^4.1.2" - -kuler@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" - integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== - -levn@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" - integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== - dependencies: - prelude-ls "^1.2.1" - type-check "~0.4.0" - -levn@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= - dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" - -lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= - -lint-staged@^11.2.0: - version "11.2.0" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.2.0.tgz#6b9774a74b3eb4bef5c59fb6475bff84d6853008" - integrity sha512-0KIcRuO4HQS2Su7qWtjrfTXgSklvyIb9Fk9qVWRZkGHa5S81Vj6WBbs+ogQBvHUwLJYq1eQ4R+H82GSak4OM7w== - dependencies: - cli-truncate "2.1.0" - colorette "^1.4.0" - commander "^8.2.0" - cosmiconfig "^7.0.1" - debug "^4.3.2" - enquirer "^2.3.6" - execa "^5.1.1" - listr2 "^3.12.2" - micromatch "^4.0.4" - normalize-path "^3.0.0" - please-upgrade-node "^3.2.0" - string-argv "0.3.1" - stringify-object "3.3.0" - supports-color "8.1.1" - -listr2@^3.12.2: - version "3.12.2" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.12.2.tgz#2d55cc627111603ad4768a9e87c9c7bb9b49997e" - integrity sha512-64xC2CJ/As/xgVI3wbhlPWVPx0wfTqbUAkpb7bjDi0thSWMqrf07UFhrfsGoo8YSXmF049Rp9C0cjLC8rZxK9A== - dependencies: - cli-truncate "^2.1.0" - colorette "^1.4.0" - log-update "^4.0.0" - p-map "^4.0.0" - rxjs "^6.6.7" - through "^2.3.8" - wrap-ansi "^7.0.0" - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -lodash.camelcase@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= - -lodash.clonedeep@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - -lodash.merge@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - -lodash.truncate@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" - integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= - -lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -log-update@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1" - integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg== - dependencies: - ansi-escapes "^4.3.0" - cli-cursor "^3.1.0" - slice-ansi "^4.0.0" - wrap-ansi "^6.2.0" - -logform@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.3.0.tgz#a3997a05985de2ebd325ae0d166dffc9c6fe6b57" - integrity sha512-graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ== - dependencies: - colors "^1.2.1" - fecha "^4.2.0" - ms "^2.1.1" - safe-stable-stringify "^1.1.0" - triple-beam "^1.3.0" - -long@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== - -loose-envify@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" - integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== - dependencies: - js-tokens "^3.0.0 || ^4.0.0" - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -map-stream@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194" - integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ= - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -merge2@^1.3.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= - -micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== - dependencies: - braces "^3.0.1" - picomatch "^2.2.3" - -mime-db@1.50.0: - version "1.50.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f" - integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A== - -mime-types@~2.1.24: - version "2.1.33" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz#1fa12a904472fafd068e48d9e8401f74d3f70edb" - integrity sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g== - dependencies: - mime-db "1.50.0" - -mime@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mimic-response@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" - integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== - -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - -mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" - integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== - -mkdirp@^0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" - -morgan@^1.9.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" - integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== - dependencies: - basic-auth "~2.0.1" - debug "2.6.9" - depd "~2.0.0" - on-finished "~2.3.0" - on-headers "~1.0.2" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -ms@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -multistream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz#7bf00dfd119556fbc153cff3de4c6d477909f5a8" - integrity sha512-J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw== - dependencies: - once "^1.4.0" - readable-stream "^3.6.0" - -napi-build-utils@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" - integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= - -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - -node-abi@^2.7.0: - version "2.30.1" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" - integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== - dependencies: - semver "^5.4.1" - -node-cleanup@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz#7ac19abd297e09a7f72a71545d951b517e4dde2c" - integrity sha1-esGavSl+Caf3KnFUXZUbUX5N3iw= - -node-fetch@2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== - -node-fetch@^2.6.1: - version "2.6.5" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" - integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ== - dependencies: - whatwg-url "^5.0.0" - -noop-logger@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" - integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= - -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - -npmlog@^4.0.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - -object-assign@^4.1.0, object-assign@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - -object-inspect@^1.11.0, object-inspect@^1.9.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" - integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== - -object-keys@^1.0.12, object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - -object.assign@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" - integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - has-symbols "^1.0.1" - object-keys "^1.1.1" - -object.entries@^1.1.2, object.entries@^1.1.4: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861" - integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - -object.fromentries@^2.0.2, object.fromentries@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251" - integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - -object.hasown@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5" - integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.19.1" - -object.values@^1.1.1, object.values@^1.1.4: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" - integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - -on-finished@^2.3.0, on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= - dependencies: - ee-first "1.1.1" - -on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -one-time@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" - integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== - dependencies: - fn.name "1.x.x" - -onetime@^5.1.0, onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -opencollective-postinstall@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" - integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== - -optionator@^0.8.1: - version "0.8.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" - integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== - dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.6" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - word-wrap "~1.2.3" - -optionator@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" - integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== - dependencies: - deep-is "^0.1.3" - fast-levenshtein "^2.0.6" - levn "^0.4.1" - prelude-ls "^1.2.1" - type-check "^0.4.0" - word-wrap "^1.2.3" - -p-is-promise@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz#58e78c7dfe2e163cf2a04ff869e7c1dba64a5971" - integrity sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ== - -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== - dependencies: - callsites "^3.0.0" - -parse-json@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - -parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -path-key@^3.0.0, path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -path-parse@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= - -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - -pause-stream@0.0.11: - version "0.0.11" - resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" - integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= - dependencies: - through "~2.3" - -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= - -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== - -pkg-dir@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -pkg-dir@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760" - integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA== - dependencies: - find-up "^5.0.0" - -pkg-fetch@3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.2.4.tgz#5372734b12167d4bacd872be348217461b517390" - integrity sha512-ewUD26GP86/8+Fu93zrb30CpJjKOtT4maSgm4SwTX9Ujy1pfdUdv+1PubsY9tTJES0iBYItAtqbfkf7Wu5LV9w== - dependencies: - chalk "^4.1.0" - fs-extra "^9.1.0" - https-proxy-agent "^5.0.0" - node-fetch "^2.6.1" - progress "^2.0.3" - semver "^7.3.5" - yargs "^16.2.0" - -pkg@^5.4.1: - version "5.4.1" - resolved "https://registry.yarnpkg.com/pkg/-/pkg-5.4.1.tgz#4d824e42c454f32131e471d7cd8d14bfdb3e1c4c" - integrity sha512-iJs3W6MCgeZ4MrH7iZtX6HTqsNzoh2U9rGILL3eOLbQFV43U8WPAzrqRK7cBQGuHx38UXxcGT6G/2yDl/GveRg== - dependencies: - "@babel/parser" "7.13.13" - "@babel/types" "7.13.12" - chalk "^4.1.0" - escodegen "^2.0.0" - fs-extra "^9.1.0" - globby "^11.0.3" - into-stream "^6.0.0" - minimist "^1.2.5" - multistream "^4.1.0" - pkg-fetch "3.2.4" - prebuild-install "6.0.1" - progress "^2.0.3" - resolve "^1.20.0" - stream-meter "^1.0.4" - tslib "2.1.0" - -please-upgrade-node@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" - integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== - dependencies: - semver-compare "^1.0.0" - -prebuild-install@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.0.1.tgz#5902172f7a40eb67305b96c2a695db32636ee26d" - integrity sha512-7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ== - dependencies: - detect-libc "^1.0.3" - expand-template "^2.0.3" - github-from-package "0.0.0" - minimist "^1.2.3" - mkdirp-classic "^0.5.3" - napi-build-utils "^1.0.1" - node-abi "^2.7.0" - noop-logger "^0.1.1" - npmlog "^4.0.1" - pump "^3.0.0" - rc "^1.2.7" - simple-get "^3.0.3" - tar-fs "^2.0.0" - tunnel-agent "^0.6.0" - which-pm-runs "^1.0.0" - -prelude-ls@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" - integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== - -prelude-ls@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= - -prettier-linter-helpers@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" - integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== - dependencies: - fast-diff "^1.1.2" - -prettier@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" - integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -progress@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31" - integrity sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg== - -progress@^2.0.0, progress@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - -prom-client@^11.5.3: - version "11.5.3" - resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-11.5.3.tgz#5fedfce1083bac6c2b223738e966d0e1643756f8" - integrity sha512-iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q== - dependencies: - tdigest "^0.1.1" - -prop-types@^15.7.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.8.1" - -protobufjs@^6.8.6: - version "6.11.2" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" - integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw== - dependencies: - "@protobufjs/aspromise" "^1.1.2" - "@protobufjs/base64" "^1.1.2" - "@protobufjs/codegen" "^2.0.4" - "@protobufjs/eventemitter" "^1.1.0" - "@protobufjs/fetch" "^1.1.0" - "@protobufjs/float" "^1.0.2" - "@protobufjs/inquire" "^1.1.0" - "@protobufjs/path" "^1.1.2" - "@protobufjs/pool" "^1.1.0" - "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.1" - "@types/node" ">=13.7.0" - long "^4.0.0" - -proxy-addr@~2.0.5: - version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" - integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== - dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" - -proxy-from-env@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" - integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== - -ps-tree@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.2.0.tgz#5e7425b89508736cdd4f2224d028f7bb3f722ebd" - integrity sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA== - dependencies: - event-stream "=3.3.4" - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -punycode@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - -puppeteer-cluster@^0.22.0: - version "0.22.0" - resolved "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.22.0.tgz#4ab214671f414f15ad6a94a4b61ed0b4172e86e6" - integrity sha512-hmydtMwfVM+idFIDzS8OXetnujHGre7RY3BGL+3njy9+r8Dcu3VALkZHfuBEPf6byKssTCgzxU1BvLczifXd5w== - dependencies: - debug "^4.1.1" - -puppeteer@^10.0.0: - version "10.4.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.4.0.tgz#a6465ff97fda0576c4ac29601406f67e6fea3dc7" - integrity sha512-2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w== - dependencies: - debug "4.3.1" - devtools-protocol "0.0.901419" - extract-zip "2.0.1" - https-proxy-agent "5.0.0" - node-fetch "2.6.1" - pkg-dir "4.2.0" - progress "2.0.1" - proxy-from-env "1.1.0" - rimraf "3.0.2" - tar-fs "2.0.0" - unbzip2-stream "1.3.3" - ws "7.4.6" - -qs@6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" - integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== - -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - -range-parser@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== - -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== - dependencies: - bytes "3.1.0" - http-errors "1.7.2" - iconv-lite "0.4.24" - unpipe "1.0.0" - -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -react-is@^16.8.1: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== - -readable-stream@^2.0.0, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.3.7: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - -regexp.prototype.flags@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" - integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -regexpp@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" - integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== - -regextras@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.7.1.tgz#be95719d5f43f9ef0b9fa07ad89b7c606995a3b2" - integrity sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w== - -regextras@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.8.0.tgz#ec0f99853d4912839321172f608b544814b02217" - integrity sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ== - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== - -resolve@^1.18.1, resolve@^1.20.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== - dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" - -resolve@^2.0.0-next.3: - version "2.0.0-next.3" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46" - integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q== - dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" - -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - -rimraf@3.0.2, rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - -rxjs@^6.6.7: - version "6.6.7" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" - integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== - dependencies: - tslib "^1.9.0" - -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@^5.0.1, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-stable-stringify@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz#c8a220ab525cd94e60ebf47ddc404d610dc5d84a" - integrity sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw== - -"safer-buffer@>= 2.1.2 < 3": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= - -semver-regex@^3.1.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.3.tgz#b2bcc6f97f63269f286994e297e229b6245d0dc3" - integrity sha512-Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ== - -semver@^5.4.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.2.1, semver@^7.3.4, semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== - dependencies: - lru-cache "^6.0.0" - -send@0.17.1: - version "0.17.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" - integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== - dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "~1.7.2" - mime "1.6.0" - ms "2.1.1" - on-finished "~2.3.0" - range-parser "~1.2.1" - statuses "~1.5.0" - -serve-static@1.14.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.17.1" - -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" - integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== - dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" - -signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.5" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" - integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== - -simple-concat@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" - integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== - -simple-get@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" - integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== - dependencies: - decompress-response "^4.2.0" - once "^1.3.1" - simple-concat "^1.0.0" - -simple-swizzle@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" - integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= - dependencies: - is-arrayish "^0.3.1" - -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - -slice-ansi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" - integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -slice-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" - integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== - -spdx-expression-parse@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.10" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b" - integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA== - -split@0.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" - integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8= - dependencies: - through "2" - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - -stack-trace@0.0.x: - version "0.0.10" - resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" - integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= - -"statuses@>= 1.5.0 < 2", statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= - -stream-combiner@~0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14" - integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ= - dependencies: - duplexer "~0.1.1" - -stream-meter@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/stream-meter/-/stream-meter-1.0.4.tgz#52af95aa5ea760a2491716704dbff90f73afdd1d" - integrity sha1-Uq+Vql6nYKJJFxZwTb/5D3Ov3R0= - dependencies: - readable-stream "^2.1.4" - -string-argv@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" - integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== - -string-argv@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.1.2.tgz#c5b7bc03fb2b11983ba3a72333dd0559e77e4738" - integrity sha512-mBqPGEOMNJKXRo7z0keX0wlAhbBAjilUdPW13nN0PecVryZxdHIeM7TqbsSUA7VYuS00HGC6mojP7DlQzfa9ZA== - -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2": - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string.prototype.matchall@^4.0.2, string.prototype.matchall@^4.0.5: - version "4.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa" - integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - get-intrinsic "^1.1.1" - has-symbols "^1.0.2" - internal-slot "^1.0.3" - regexp.prototype.flags "^1.3.1" - side-channel "^1.0.4" - -string.prototype.trimend@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" - integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -string.prototype.trimstart@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" - integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -stringify-object@3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" - integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== - dependencies: - get-own-enumerable-property-symbols "^3.0.0" - is-obj "^1.0.1" - is-regexp "^1.0.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= - dependencies: - ansi-regex "^3.0.0" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - -strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - -supports-color@8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -table@^6.0.4, table@^6.0.9: - version "6.7.2" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0" - integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g== - dependencies: - ajv "^8.0.1" - lodash.clonedeep "^4.5.0" - lodash.truncate "^4.4.2" - slice-ansi "^4.0.0" - string-width "^4.2.3" - strip-ansi "^6.0.1" - -tar-fs@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad" - integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA== - dependencies: - chownr "^1.1.1" - mkdirp "^0.5.1" - pump "^3.0.0" - tar-stream "^2.0.0" - -tar-fs@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" - integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== - dependencies: - chownr "^1.1.1" - mkdirp-classic "^0.5.2" - pump "^3.0.0" - tar-stream "^2.1.4" - -tar-stream@^2.0.0, tar-stream@^2.1.4: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" - integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== - dependencies: - bl "^4.0.3" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - -tdigest@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.1.tgz#2e3cb2c39ea449e55d1e6cd91117accca4588021" - integrity sha1-Ljyyw56kSeVdHmzZEReszKRYgCE= - dependencies: - bintrees "1.0.1" - -text-hex@1.0.x: - version "1.0.0" - resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" - integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== - -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= - -through@2, through@^2.3.8, through@~2.3, through@~2.3.1: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== - -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= - -triple-beam@^1.2.0, triple-beam@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" - integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== - -tsc-watch@^4.2.3: - version "4.5.0" - resolved "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.5.0.tgz#d6884b932822b2c2ccd37f1c1f3748304566a474" - integrity sha512-aXhN4jY+1YEcn/NwCQ/+fHqU43EqOpW+pS+933EPsVEsrKhvyrodPDIjQsk1a1niFrabAK3RIBrRbAslVefEbQ== - dependencies: - cross-spawn "^7.0.3" - node-cleanup "^2.1.2" - ps-tree "^1.2.0" - string-argv "^0.1.1" - strip-ansi "^6.0.0" - -tslib@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== - -tslib@^1.8.1, tslib@^1.9.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tsutils@^3.21.0: - version "3.21.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" - integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== - dependencies: - tslib "^1.8.1" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= - dependencies: - safe-buffer "^5.0.1" - -type-check@^0.4.0, type-check@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" - integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== - dependencies: - prelude-ls "^1.2.1" - -type-check@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= - dependencies: - prelude-ls "~1.1.2" - -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - -type-fest@^0.21.3: - version "0.21.3" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" - integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== - -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - -type-is@~1.6.17, type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" - -typescript@4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz#3f85b986945bcf31071decdd96cf8bfa65f9dcbc" - integrity sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew== - -typescript@^4.3.2: - version "4.4.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324" - integrity sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA== - -unbox-primitive@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" - integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== - dependencies: - function-bind "^1.1.1" - has-bigints "^1.0.1" - has-symbols "^1.0.2" - which-boxed-primitive "^1.0.2" - -unbzip2-stream@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a" - integrity sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg== - dependencies: - buffer "^5.2.1" - through "^2.3.8" - -unique-filename@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" - integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== - dependencies: - unique-slug "^2.0.0" - -unique-slug@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" - integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== - dependencies: - imurmurhash "^0.1.4" - -universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -url-value-parser@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.0.3.tgz#cd4b8d6754e458d65e8125260c09718d926e6e21" - integrity sha512-FjIX+Q9lYmDM9uYIGdMYfQW0uLbWVwN2NrL2ayAI7BTOvEwzH+VoDdNquwB9h4dFAx+u6mb0ONLa3sHD5DvyvA== - -util-deprecate@^1.0.1, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= - -v8-compile-cache@^2.0.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" - integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== - -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= - -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= - -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= - dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" - -which-boxed-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" - integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== - dependencies: - is-bigint "^1.0.1" - is-boolean-object "^1.1.0" - is-number-object "^1.0.4" - is-string "^1.0.5" - is-symbol "^1.0.3" - -which-pm-runs@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" - integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= - -which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== - dependencies: - string-width "^1.0.2 || 2" - -winston-transport@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59" - integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw== - dependencies: - readable-stream "^2.3.7" - triple-beam "^1.2.0" - -winston@^3.2.1: - version "3.3.3" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz#ae6172042cafb29786afa3d09c8ff833ab7c9170" - integrity sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw== - dependencies: - "@dabh/diagnostics" "^2.0.2" - async "^3.1.0" - is-stream "^2.0.0" - logform "^2.2.0" - one-time "^1.0.0" - readable-stream "^3.4.0" - stack-trace "0.0.x" - triple-beam "^1.3.0" - winston-transport "^4.4.0" - -word-wrap@^1.2.3, word-wrap@~1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== - -wrap-ansi@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" - integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -ws@7.4.6: - version "7.4.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" - integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yaml@^1.10.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== - -yargs-parser@^20.2.2: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs@^16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/code-frame@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== + dependencies: + "@babel/highlight" "^7.10.4" + +"@babel/code-frame@^7.0.0": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" + integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== + dependencies: + "@babel/highlight" "^7.16.7" + +"@babel/helper-validator-identifier@^7.15.7", "@babel/helper-validator-identifier@^7.16.7": + version "7.16.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" + integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== + +"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7": + version "7.16.10" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88" + integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw== + dependencies: + "@babel/helper-validator-identifier" "^7.16.7" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@7.16.2": + version "7.16.2" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.2.tgz#3723cd5c8d8773eef96ce57ea1d9b7faaccd12ac" + integrity sha512-RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw== + +"@babel/types@7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" + integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg== + dependencies: + "@babel/helper-validator-identifier" "^7.15.7" + to-fast-properties "^2.0.0" + +"@dabh/diagnostics@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz#290d08f7b381b8f94607dc8f471a12c675f9db31" + integrity sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q== + dependencies: + colorspace "1.1.x" + enabled "2.0.x" + kuler "^2.0.0" + +"@es-joy/jsdoccomment@0.10.8": + version "0.10.8" + resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.10.8.tgz#b3152887e25246410ed4ea569a55926ec13b2b05" + integrity sha512-3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ== + dependencies: + comment-parser "1.2.4" + esquery "^1.4.0" + jsdoc-type-pratt-parser "1.1.1" + +"@es-joy/jsdoccomment@~0.18.0": + version "0.18.0" + resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz#2532b2ecb8576d694011b157c447ed6b12534c70" + integrity sha512-TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA== + dependencies: + comment-parser "1.3.0" + esquery "^1.4.0" + jsdoc-type-pratt-parser "~2.2.2" + +"@eslint/eslintrc@^0.4.2", "@eslint/eslintrc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" + integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^13.9.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + +"@grafana/eslint-config@^2.5.0": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@grafana/eslint-config/-/eslint-config-2.5.2.tgz#4343bdd2dbd362b061395010f209fea316ca3f61" + integrity sha512-LfTKRbeAshEIr5VELcr6dw5U0Er586yeyb5X/IwrfutHwdcrJdepRf1E/LwMVAUoBzJRQfTLErkS9Mw0Xlv/aA== + dependencies: + "@typescript-eslint/eslint-plugin" "5.10.0" + "@typescript-eslint/parser" "5.10.0" + eslint "7.28.0" + eslint-config-prettier "8.3.0" + eslint-plugin-jsdoc "37.7.0" + eslint-plugin-prettier "4.0.0" + eslint-plugin-react "7.28.0" + eslint-plugin-react-hooks "4.3.0" + prettier "2.5.1" + typescript "4.4.4" + +"@grpc/grpc-js@^1.0": + version "1.5.4" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.5.4.tgz#dd0237ad7df80a7a24766fe516d7e4a22cb4855e" + integrity sha512-+nJTOsqpFAXnfFrMZ7Too4XXZ/J9O+8jYvSoaunupoC7I7b9H4iex1BRsbTdOmiowfPGJrWit7jUPmbENSUSpw== + dependencies: + "@grpc/proto-loader" "^0.6.4" + "@types/node" ">=12.12.47" + +"@grpc/proto-loader@^0.5.4": + version "0.5.6" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz#1dea4b8a6412b05e2d58514d507137b63a52a98d" + integrity sha512-DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ== + dependencies: + lodash.camelcase "^4.3.0" + protobufjs "^6.8.6" + +"@grpc/proto-loader@^0.6.4": + version "0.6.9" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.9.tgz#4014eef366da733f8e04a9ddd7376fe8a58547b7" + integrity sha512-UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg== + dependencies: + "@types/long" "^4.0.1" + lodash.camelcase "^4.3.0" + long "^4.0.0" + protobufjs "^6.10.0" + yargs "^16.2.0" + +"@hapi/boom@^9.1.0": + version "9.1.4" + resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.4.tgz#1f9dad367c6a7da9f8def24b4a986fc5a7bd9db6" + integrity sha512-Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw== + dependencies: + "@hapi/hoek" "9.x.x" + +"@hapi/hoek@9.x.x": + version "9.2.1" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" + integrity sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw== + +"@humanwhocodes/config-array@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" + integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== + dependencies: + "@humanwhocodes/object-schema" "^1.2.0" + debug "^4.1.1" + minimatch "^3.0.4" + +"@humanwhocodes/object-schema@^1.2.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.3": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + +"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" + integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78= + +"@protobufjs/base64@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" + integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== + +"@protobufjs/codegen@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" + integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== + +"@protobufjs/eventemitter@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" + integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A= + +"@protobufjs/fetch@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" + integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU= + dependencies: + "@protobufjs/aspromise" "^1.1.1" + "@protobufjs/inquire" "^1.1.0" + +"@protobufjs/float@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" + integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E= + +"@protobufjs/inquire@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" + integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik= + +"@protobufjs/path@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" + integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0= + +"@protobufjs/pool@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" + integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q= + +"@protobufjs/utf8@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" + integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= + +"@types/body-parser@*": + version "1.19.2" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" + integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== + dependencies: + "@types/connect" "*" + "@types/node" "*" + +"@types/connect@*": + version "3.4.35" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" + integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== + dependencies: + "@types/node" "*" + +"@types/express-serve-static-core@^4.17.18": + version "4.17.28" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8" + integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + +"@types/express@^4.11.1": + version "4.17.13" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" + "@types/serve-static" "*" + +"@types/json-schema@^7.0.7", "@types/json-schema@^7.0.9": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== + +"@types/long@^4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" + integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== + +"@types/mime@^1": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== + +"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0": + version "17.0.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.14.tgz#33b9b94f789a8fedd30a68efdbca4dbb06b61f20" + integrity sha512-SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng== + +"@types/node@^14.14.41": + version "14.18.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.10.tgz#774f43868964f3cfe4ced1f5417fe15818a4eaea" + integrity sha512-6iihJ/Pp5fsFJ/aEDGyvT4pHGmCpq7ToQ/yf4bl5SbVAvwpspYJ+v3jO7n8UyjhQVHTy+KNszOozDdv+O6sovQ== + +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== + +"@types/qs@*": + version "6.9.7" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" + integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== + +"@types/range-parser@*": + version "1.2.4" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== + +"@types/serve-static@*": + version "1.13.10" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" + integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== + dependencies: + "@types/mime" "^1" + "@types/node" "*" + +"@types/yauzl@^2.9.1": + version "2.9.2" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a" + integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA== + dependencies: + "@types/node" "*" + +"@typescript-eslint/eslint-plugin@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.0.tgz#e90afea96dff8620892ad216b0e4ccdf8ee32d3a" + integrity sha512-XXVKnMsq2fuu9K2KsIxPUGqb6xAImz8MEChClbXmE3VbveFtBUU5bzM6IPVWqzyADIgdkS2Ws/6Xo7W2TeZWjQ== + dependencies: + "@typescript-eslint/scope-manager" "5.10.0" + "@typescript-eslint/type-utils" "5.10.0" + "@typescript-eslint/utils" "5.10.0" + debug "^4.3.2" + functional-red-black-tree "^1.0.1" + ignore "^5.1.8" + regexpp "^3.2.0" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/eslint-plugin@^4.32.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276" + integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg== + dependencies: + "@typescript-eslint/experimental-utils" "4.33.0" + "@typescript-eslint/scope-manager" "4.33.0" + debug "^4.3.1" + functional-red-black-tree "^1.0.1" + ignore "^5.1.8" + regexpp "^3.1.0" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/experimental-utils@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd" + integrity sha512-zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q== + dependencies: + "@types/json-schema" "^7.0.7" + "@typescript-eslint/scope-manager" "4.33.0" + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/typescript-estree" "4.33.0" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + +"@typescript-eslint/parser@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.10.0.tgz#8f59e036f5f1cffc178cacbd5ccdd02aeb96c91c" + integrity sha512-pJB2CCeHWtwOAeIxv8CHVGJhI5FNyJAIpx5Pt72YkK3QfEzt6qAlXZuyaBmyfOdM62qU0rbxJzNToPTVeJGrQw== + dependencies: + "@typescript-eslint/scope-manager" "5.10.0" + "@typescript-eslint/types" "5.10.0" + "@typescript-eslint/typescript-estree" "5.10.0" + debug "^4.3.2" + +"@typescript-eslint/parser@^4.32.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz#dfe797570d9694e560528d18eecad86c8c744899" + integrity sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA== + dependencies: + "@typescript-eslint/scope-manager" "4.33.0" + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/typescript-estree" "4.33.0" + debug "^4.3.1" + +"@typescript-eslint/scope-manager@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3" + integrity sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ== + dependencies: + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/visitor-keys" "4.33.0" + +"@typescript-eslint/scope-manager@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.10.0.tgz#bb5d872e8b9e36203908595507fbc4d3105329cb" + integrity sha512-tgNgUgb4MhqK6DoKn3RBhyZ9aJga7EQrw+2/OiDk5hKf3pTVZWyqBi7ukP+Z0iEEDMF5FDa64LqODzlfE4O/Dg== + dependencies: + "@typescript-eslint/types" "5.10.0" + "@typescript-eslint/visitor-keys" "5.10.0" + +"@typescript-eslint/type-utils@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz#8524b9479c19c478347a7df216827e749e4a51e5" + integrity sha512-TzlyTmufJO5V886N+hTJBGIfnjQDQ32rJYxPaeiyWKdjsv2Ld5l8cbS7pxim4DeNs62fKzRSt8Q14Evs4JnZyQ== + dependencies: + "@typescript-eslint/utils" "5.10.0" + debug "^4.3.2" + tsutils "^3.21.0" + +"@typescript-eslint/types@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72" + integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ== + +"@typescript-eslint/types@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.10.0.tgz#beb3cb345076f5b088afe996d57bcd1dfddaa75c" + integrity sha512-wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ== + +"@typescript-eslint/typescript-estree@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609" + integrity sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA== + dependencies: + "@typescript-eslint/types" "4.33.0" + "@typescript-eslint/visitor-keys" "4.33.0" + debug "^4.3.1" + globby "^11.0.3" + is-glob "^4.0.1" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/typescript-estree@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz#4be24a3dea0f930bb1397c46187d0efdd955a224" + integrity sha512-x+7e5IqfwLwsxTdliHRtlIYkgdtYXzE0CkFeV6ytAqq431ZyxCFzNMNR5sr3WOlIG/ihVZr9K/y71VHTF/DUQA== + dependencies: + "@typescript-eslint/types" "5.10.0" + "@typescript-eslint/visitor-keys" "5.10.0" + debug "^4.3.2" + globby "^11.0.4" + is-glob "^4.0.3" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/utils@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.10.0.tgz#c3d152a85da77c400e37281355561c72fb1b5a65" + integrity sha512-IGYwlt1CVcFoE2ueW4/ioEwybR60RAdGeiJX/iDAw0t5w0wK3S7QncDwpmsM70nKgGTuVchEWB8lwZwHqPAWRg== + dependencies: + "@types/json-schema" "^7.0.9" + "@typescript-eslint/scope-manager" "5.10.0" + "@typescript-eslint/types" "5.10.0" + "@typescript-eslint/typescript-estree" "5.10.0" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + +"@typescript-eslint/visitor-keys@4.33.0": + version "4.33.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd" + integrity sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg== + dependencies: + "@typescript-eslint/types" "4.33.0" + eslint-visitor-keys "^2.0.0" + +"@typescript-eslint/visitor-keys@5.10.0": + version "5.10.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz#770215497ad67cd15a572b52089991d5dfe06281" + integrity sha512-GMxj0K1uyrFLPKASLmZzCuSddmjZVbVj3Ouy5QVuIGKZopxvOr24JsS7gruz6C3GExE01mublZ3mIBOaon9zuQ== + dependencies: + "@typescript-eslint/types" "5.10.0" + eslint-visitor-keys "^3.0.0" + +accepts@~1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + dependencies: + mime-types "~2.1.24" + negotiator "0.6.2" + +acorn-jsx@^5.3.1: + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== + +acorn@^7.4.0: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + +ajv@^6.10.0, ajv@^6.12.4: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ajv@^8.0.1: + version "8.9.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18" + integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + +ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + +ansi-escapes@^4.3.0: + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== + dependencies: + type-fest "^0.21.3" + +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +anymatch@~3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + +are-we-there-yet@~1.1.2: + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + +array-includes@^3.1.3, array-includes@^3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" + integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + get-intrinsic "^1.1.1" + is-string "^1.0.7" + +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + +array.prototype.flatmap@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446" + integrity sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + es-abstract "^1.19.0" + +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + +async@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" + integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== + +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +basic-auth@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" + integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== + dependencies: + safe-buffer "5.1.2" + +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + +bintrees@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524" + integrity sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ= + +bl@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + +body-parser@1.19.1: + version "1.19.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4" + integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA== + dependencies: + bytes "3.1.1" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.8.1" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.9.6" + raw-body "2.4.2" + type-is "~1.6.18" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^3.0.1, braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + +buffer@^5.2.1, buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +bytes@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a" + integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg== + +call-bind@^1.0.0, call-bind@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +chalk@^2.0.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + 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" + +chalk@^4.0.0, chalk@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chokidar@^3.5.2: + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + 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" + optionalDependencies: + fsevents "~2.3.2" + +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + +cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== + dependencies: + restore-cursor "^3.1.0" + +cli-truncate@2.1.0, cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== + dependencies: + slice-ansi "^3.0.0" + string-width "^4.2.0" + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + +color-convert@^1.9.0, color-convert@^1.9.3: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@^1.0.0, color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +color-string@^1.6.0, color-string@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz#63b6ebd1bec11999d1df3a79a7569451ac2be8aa" + integrity sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ== + dependencies: + color-name "^1.0.0" + simple-swizzle "^0.2.2" + +color@^3.1.3: + version "3.2.1" + resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" + integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== + dependencies: + color-convert "^1.9.3" + color-string "^1.6.0" + +color@^4.0.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/color/-/color-4.2.0.tgz#0c782459a3e98838ea01e4bc0fb43310ca35af78" + integrity sha512-hHTcrbvEnGjC7WBMk6ibQWFVDgEFTVmjrz2Q5HlU6ltwxv0JJN2Z8I7uRbWeQLF04dikxs8zgyZkazRJvSMtyQ== + dependencies: + color-convert "^2.0.1" + color-string "^1.9.0" + +colorette@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" + integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== + +colorette@^2.0.16: + version "2.0.16" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" + integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== + +colors@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" + integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + +colorspace@1.1.x: + version "1.1.4" + resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243" + integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w== + dependencies: + color "^3.1.3" + text-hex "1.0.x" + +commander@^8.2.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== + +comment-parser@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.2.4.tgz#489f3ee55dfd184a6e4bffb31baba284453cb760" + integrity sha512-pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw== + +comment-parser@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.0.tgz#68beb7dbe0849295309b376406730cd16c719c44" + integrity sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA== + +compare-versions@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" + integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + +content-disposition@0.5.4: + version "0.5.4" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== + dependencies: + safe-buffer "5.2.1" + +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + +cookie@0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" + integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + +cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== + dependencies: + "@types/parse-json" "^4.0.0" + import-fresh "^3.2.1" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.10.0" + +cross-env@7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + +cross-fetch@3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" + integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== + dependencies: + node-fetch "2.6.7" + +cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +debug@2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@4, debug@4.3.3, debug@^4.0.1, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + dependencies: + ms "2.1.2" + +decompress-response@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" + integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== + dependencies: + mimic-response "^2.0.0" + +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + dependencies: + mimic-response "^3.1.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +deep-is@^0.1.3, deep-is@~0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== + +define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + +depd@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + +detect-libc@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.0.tgz#c528bc09bc6d1aa30149228240917c225448f204" + integrity sha512-S55LzUl8HUav8l9E2PBTlC5PAJrHK7tkM+XXFGD+fbsbkTzhCpG6K05LxJcUOEWzMa4v6ptcMZ9s3fOdJDu0Zw== + +devtools-protocol@0.0.960912: + version "0.0.960912" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.960912.tgz#411c1fa355eddb72f06c4a8743f2808766db6245" + integrity sha512-I3hWmV9rWHbdnUdmMKHF2NuYutIM2kXz2mdXW8ha7TbRlGTVs+PF+PsB5QWvpCek4Fy9B+msiispCfwlhG5Sqg== + +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +doctrine@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== + dependencies: + esutils "^2.0.2" + +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + +duplexer@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +enabled@2.0.x: + version "2.0.0" + resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" + integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +end-of-stream@^1.1.0, end-of-stream@^1.4.1: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +enquirer@^2.3.5, enquirer@^2.3.6: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +es-abstract@^1.19.0, es-abstract@^1.19.1: + version "1.19.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== + dependencies: + call-bind "^1.0.2" + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + get-intrinsic "^1.1.1" + get-symbol-description "^1.0.0" + has "^1.0.3" + has-symbols "^1.0.2" + internal-slot "^1.0.3" + is-callable "^1.2.4" + is-negative-zero "^2.0.1" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.1" + is-string "^1.0.7" + is-weakref "^1.0.1" + object-inspect "^1.11.0" + object-keys "^1.1.1" + object.assign "^4.1.2" + string.prototype.trimend "^1.0.4" + string.prototype.trimstart "^1.0.4" + unbox-primitive "^1.0.1" + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== + dependencies: + esprima "^4.0.1" + estraverse "^5.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +eslint-config-prettier@8.3.0, eslint-config-prettier@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a" + integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew== + +eslint-plugin-jsdoc@37.7.0: + version "37.7.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-37.7.0.tgz#975d9f18cb0520dde7a2b0db5f4421dfee3fdd17" + integrity sha512-vzy3/ltXoGtabRnjLogaEmhGxxIv5B8HK5MJLIrdxFJUvhBppZjuVuLr71DjIBi0jg6bFomwkYKjojt29cN8PA== + dependencies: + "@es-joy/jsdoccomment" "~0.18.0" + comment-parser "1.3.0" + debug "^4.3.3" + escape-string-regexp "^4.0.0" + esquery "^1.4.0" + regextras "^0.8.0" + semver "^7.3.5" + spdx-expression-parse "^3.0.1" + +eslint-plugin-jsdoc@^36.1.0: + version "36.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.1.tgz#124cd0e53a5d07f01ebde916a96dd1a6009625d6" + integrity sha512-nuLDvH1EJaKx0PCa9oeQIxH6pACIhZd1gkalTUxZbaxxwokjs7TplqY0Q8Ew3CoZaf5aowm0g/Z3JGHCatt+gQ== + dependencies: + "@es-joy/jsdoccomment" "0.10.8" + comment-parser "1.2.4" + debug "^4.3.2" + esquery "^1.4.0" + jsdoc-type-pratt-parser "^1.1.1" + lodash "^4.17.21" + regextras "^0.8.0" + semver "^7.3.5" + spdx-expression-parse "^3.0.1" + +eslint-plugin-prettier@4.0.0, eslint-plugin-prettier@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0" + integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ== + dependencies: + prettier-linter-helpers "^1.0.0" + +eslint-plugin-react-hooks@4.3.0, eslint-plugin-react-hooks@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172" + integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA== + +eslint-plugin-react@7.28.0, eslint-plugin-react@^7.26.1: + version "7.28.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz#8f3ff450677571a659ce76efc6d80b6a525adbdf" + integrity sha512-IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw== + dependencies: + array-includes "^3.1.4" + array.prototype.flatmap "^1.2.5" + doctrine "^2.1.0" + estraverse "^5.3.0" + jsx-ast-utils "^2.4.1 || ^3.0.0" + minimatch "^3.0.4" + object.entries "^1.1.5" + object.fromentries "^2.0.5" + object.hasown "^1.1.0" + object.values "^1.1.5" + prop-types "^15.7.2" + resolve "^2.0.0-next.3" + semver "^6.3.0" + string.prototype.matchall "^4.0.6" + +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +eslint-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== + dependencies: + eslint-visitor-keys "^1.1.0" + +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== + dependencies: + eslint-visitor-keys "^2.0.0" + +eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint-visitor-keys@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz#6fbb166a6798ee5991358bc2daa1ba76cc1254a1" + integrity sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ== + +eslint@7.28.0: + version "7.28.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820" + integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g== + dependencies: + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.2" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + escape-string-regexp "^4.0.0" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.4.0" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.1.2" + globals "^13.6.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.9" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + +eslint@^7.32.0: + version "7.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" + integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== + dependencies: + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.3" + "@humanwhocodes/config-array" "^0.5.0" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + escape-string-regexp "^4.0.0" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.4.0" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.1.2" + globals "^13.6.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.9" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== + dependencies: + acorn "^7.4.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^1.3.0" + +esprima@^4.0.0, esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== + dependencies: + estraverse "^5.1.0" + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + +event-stream@=3.3.4: + version "3.3.4" + resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" + integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE= + dependencies: + duplexer "~0.1.1" + from "~0" + map-stream "~0.1.0" + pause-stream "0.0.11" + split "0.3" + stream-combiner "~0.0.4" + through "~2.3.1" + +execa@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + 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" + +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== + +express-prom-bundle@^5.1.5: + version "5.1.5" + resolved "https://registry.yarnpkg.com/express-prom-bundle/-/express-prom-bundle-5.1.5.tgz#f298615879299a58cf8ec1350186f4de91d91fa4" + integrity sha512-tUaQUBu0r9zGYcVDpKBI2AeWimuuodaC5BSBkzLPQxRTxaKQShQNnONQSYwjLxbHfPwlCKVZlzfbB9Recnj0Vg== + dependencies: + on-finished "^2.3.0" + url-value-parser "^2.0.0" + +express@^4.16.3: + version "4.17.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3" + integrity sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.1" + content-disposition "0.5.4" + content-type "~1.0.4" + cookie "0.4.1" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.7" + qs "6.9.6" + range-parser "~1.2.1" + safe-buffer "5.2.1" + send "0.17.2" + serve-static "1.14.2" + setprototypeof "1.2.0" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + +extract-zip@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" + integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== + dependencies: + debug "^4.1.1" + get-stream "^5.1.0" + yauzl "^2.10.0" + optionalDependencies: + "@types/yauzl" "^2.9.1" + +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-diff@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" + integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== + +fast-glob@^3.2.9: + version "3.2.11" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" + integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== + 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" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +fastq@^1.6.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== + dependencies: + reusify "^1.0.4" + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= + dependencies: + pend "~1.2.0" + +fecha@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.1.tgz#0a83ad8f86ef62a091e22bb5a039cd03d23eecce" + integrity sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q== + +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== + dependencies: + flat-cache "^3.0.4" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + +find-versions@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz#3c57e573bf97769b8cb8df16934b627915da4965" + integrity sha512-wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ== + dependencies: + semver-regex "^3.1.2" + +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + dependencies: + flatted "^3.1.0" + rimraf "^3.0.2" + +flatted@^3.1.0: + version "3.2.5" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" + integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== + +fn.name@1.x.x: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" + integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== + +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + +from2@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" + integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= + dependencies: + inherits "^2.0.1" + readable-stream "^2.0.0" + +from@~0: + version "0.1.7" + resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" + integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= + +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-extra@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + +get-own-enumerable-property-symbols@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== + +get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/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.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= + +glob-parent@^5.1.2, glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob@^7.1.3: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globals@^13.6.0, globals@^13.9.0: + version "13.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e" + integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg== + dependencies: + type-fest "^0.20.2" + +globby@^11.0.3, globby@^11.0.4: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" + slash "^3.0.0" + +google-protobuf@3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.5.0.tgz#b8cc63c74d83457bd8a9a904503c8efb26bca339" + integrity sha1-uMxjx02DRXvYqakEUDyO+ya8ozk= + +graceful-fs@^4.1.6, graceful-fs@^4.2.0: + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== + +has-bigints@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-symbols@^1.0.1, has-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== + +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +http-errors@1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" + integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.1" + +https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" + +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + +husky@^4.3.8: + version "4.3.8" + resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d" + integrity sha512-LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow== + dependencies: + chalk "^4.0.0" + ci-info "^2.0.0" + compare-versions "^3.6.0" + cosmiconfig "^7.0.0" + find-versions "^4.0.0" + opencollective-postinstall "^2.0.2" + pkg-dir "^5.0.0" + please-upgrade-node "^3.2.0" + slash "^3.0.0" + which-pm-runs "^1.0.0" + +iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +ignore@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" + integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== + +ignore@^5.1.8, ignore@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" + integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== + +import-fresh@^3.0.0, import-fresh@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + dependencies: + get-intrinsic "^1.1.0" + has "^1.0.3" + side-channel "^1.0.4" + +into-stream@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-6.0.0.tgz#4bfc1244c0128224e18b8870e85b2de8e66c6702" + integrity sha512-XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA== + dependencies: + from2 "^2.3.0" + p-is-promise "^3.0.0" + +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-arrayish@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" + integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== + +is-bigint@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-boolean-object@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-callable@^1.1.4, is-callable@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== + +is-core-module@^2.2.0, is-core-module@^2.8.1: + version "2.8.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" + integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== + dependencies: + has "^1.0.3" + +is-date-object@^1.0.1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + +is-negative-zero@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" + integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== + +is-number-object@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" + integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== + dependencies: + has-tostringtag "^1.0.0" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-obj@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= + +is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" + integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= + +is-shared-array-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" + integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== + +is-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + +is-string@^1.0.5, is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" + +is-symbol@^1.0.2, is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== + dependencies: + has-symbols "^1.0.2" + +is-weakref@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" + integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== + dependencies: + call-bind "^1.0.2" + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsdoc-type-pratt-parser@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz#10fe5e409ba38de22a48b555598955a26ff0160f" + integrity sha512-uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g== + +jsdoc-type-pratt-parser@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.2.0.tgz#3482a3833b74a88c95a6ba7253f0c0de3b77b9f5" + integrity sha512-4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg== + +jsdoc-type-pratt-parser@~2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.2.tgz#a85e407ac502b444dc23333aa4d6d0dc83f76187" + integrity sha512-zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw== + +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + +"jsx-ast-utils@^2.4.1 || ^3.0.0": + version "3.2.1" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b" + integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA== + dependencies: + array-includes "^3.1.3" + object.assign "^4.1.2" + +kuler@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" + integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== + +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +lines-and-columns@^1.1.6: + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== + +lint-staged@^11.2.0: + version "11.2.6" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.2.6.tgz#f477b1af0294db054e5937f171679df63baa4c43" + integrity sha512-Vti55pUnpvPE0J9936lKl0ngVeTdSZpEdTNhASbkaWX7J5R9OEifo1INBGQuGW4zmy6OG+TcWPJ3m5yuy5Q8Tg== + dependencies: + cli-truncate "2.1.0" + colorette "^1.4.0" + commander "^8.2.0" + cosmiconfig "^7.0.1" + debug "^4.3.2" + enquirer "^2.3.6" + execa "^5.1.1" + listr2 "^3.12.2" + micromatch "^4.0.4" + normalize-path "^3.0.0" + please-upgrade-node "^3.2.0" + string-argv "0.3.1" + stringify-object "3.3.0" + supports-color "8.1.1" + +listr2@^3.12.2: + version "3.14.0" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e" + integrity sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g== + dependencies: + cli-truncate "^2.1.0" + colorette "^2.0.16" + log-update "^4.0.0" + p-map "^4.0.0" + rfdc "^1.3.0" + rxjs "^7.5.1" + through "^2.3.8" + wrap-ansi "^7.0.0" + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= + +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + +lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +log-update@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1" + integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg== + dependencies: + ansi-escapes "^4.3.0" + cli-cursor "^3.1.0" + slice-ansi "^4.0.0" + wrap-ansi "^6.2.0" + +logform@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.3.2.tgz#68babe6a74ab09a1fd15a9b1e6cbc7713d41cb5b" + integrity sha512-V6JiPThZzTsbVRspNO6TmHkR99oqYTs8fivMBYQkjZj6rxW92KxtDCPE6IkAk1DNBnYKNkjm4jYBm6JDUcyhOA== + dependencies: + colors "1.4.0" + fecha "^4.2.0" + ms "^2.1.1" + safe-stable-stringify "^1.1.0" + triple-beam "^1.3.0" + +long@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" + integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== + +loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +map-stream@~0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194" + integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ= + +media-typer@0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +merge2@^1.3.0, merge2@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +methods@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + +micromatch@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + dependencies: + braces "^3.0.1" + picomatch "^2.2.3" + +mime-db@1.51.0: + version "1.51.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== + +mime-types@~2.1.24: + version "2.1.34" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== + dependencies: + mime-db "1.51.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mimic-response@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" + integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== + +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + +morgan@^1.9.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" + integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== + dependencies: + basic-auth "~2.0.1" + debug "2.6.9" + depd "~2.0.0" + on-finished "~2.3.0" + on-headers "~1.0.2" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@2.1.3, ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +multistream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz#7bf00dfd119556fbc153cff3de4c6d477909f5a8" + integrity sha512-J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw== + dependencies: + once "^1.4.0" + readable-stream "^3.6.0" + +napi-build-utils@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" + integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== + +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + +node-abi@^2.21.0: + version "2.30.1" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" + integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== + dependencies: + semver "^5.4.1" + +node-abi@^3.3.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.7.0.tgz#ed980f6dbb6db9ff3b31aeb27d43cd9b096f6e9e" + integrity sha512-3J+U4CvxVNEk9+lGdJkmYbN8cIN0HMTDT9R0ezX7pmp7aD6BaKsfAHwVn3IvVg6pYIRUuQ+gHW1eawrvywnSQQ== + dependencies: + semver "^7.3.5" + +node-addon-api@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" + integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== + +node-cleanup@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz#7ac19abd297e09a7f72a71545d951b517e4dde2c" + integrity sha1-esGavSl+Caf3KnFUXZUbUX5N3iw= + +node-fetch@2.6.7, node-fetch@^2.6.6: + version "2.6.7" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== + dependencies: + whatwg-url "^5.0.0" + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +npm-run-path@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +npmlog@^4.0.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + +object-assign@^4.1.0, object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + +object-inspect@^1.11.0, object-inspect@^1.9.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" + integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== + +object-keys@^1.0.12, object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object.assign@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" + +object.entries@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861" + integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + +object.fromentries@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251" + integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + +object.hasown@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5" + integrity sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.19.1" + +object.values@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + +on-finished@^2.3.0, on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + +on-headers@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +one-time@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" + integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== + dependencies: + fn.name "1.x.x" + +onetime@^5.1.0, onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +opencollective-postinstall@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259" + integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q== + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" + +p-is-promise@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz#58e78c7dfe2e163cf2a04ff869e7c1dba64a5971" + integrity sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ== + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-json@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.6, path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +pause-stream@0.0.11: + version "0.0.11" + resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" + integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= + dependencies: + through "~2.3" + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + +pkg-dir@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +pkg-dir@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760" + integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA== + dependencies: + find-up "^5.0.0" + +pkg-fetch@3.2.6: + version "3.2.6" + resolved "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.2.6.tgz#8473e1da5763522c4c3c051917db7274b75836fa" + integrity sha512-Q8fx6SIT022g0cdSE4Axv/xpfHeltspo2gg1KsWRinLQZOTRRAtOOaEFghA1F3jJ8FVsh8hGrL/Pb6Ea5XHIFw== + dependencies: + chalk "^4.1.2" + fs-extra "^9.1.0" + https-proxy-agent "^5.0.0" + node-fetch "^2.6.6" + progress "^2.0.3" + semver "^7.3.5" + tar-fs "^2.1.1" + yargs "^16.2.0" + +pkg@5.5.2: + version "5.5.2" + resolved "https://registry.yarnpkg.com/pkg/-/pkg-5.5.2.tgz#c21ca9b5cb48feceb3b158c17df855ada350086d" + integrity sha512-pD0UB2ud01C6pVv2wpGsTYJrXI/bnvGRYvMLd44wFzA1p+A2jrlTGFPAYa7YEYzmitXhx23PqalaG1eUEnSwcA== + dependencies: + "@babel/parser" "7.16.2" + "@babel/types" "7.16.0" + chalk "^4.1.2" + escodegen "^2.0.0" + fs-extra "^9.1.0" + globby "^11.0.4" + into-stream "^6.0.0" + minimist "^1.2.5" + multistream "^4.1.0" + pkg-fetch "3.2.6" + prebuild-install "6.1.4" + progress "^2.0.3" + resolve "^1.20.0" + stream-meter "^1.0.4" + tslib "2.3.1" + +please-upgrade-node@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" + integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== + dependencies: + semver-compare "^1.0.0" + +poolpeteer@^0.22.0: + version "0.22.20" + resolved "https://registry.yarnpkg.com/poolpeteer/-/poolpeteer-0.22.20.tgz#0079b8bb96b6d576379ebdfcfe5291ca7cd79430" + integrity sha512-+bEpQoW5YpmZ3fUEhdL9tcgYVULHc5ylI140QDka1F4a6ew9Jv3bWHpkgrR5OLeEbHdfSdJZOXIysna3GgRkIw== + dependencies: + debug "^4.1.1" + +prebuild-install@6.1.4: + version "6.1.4" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" + integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^2.21.0" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^3.0.3" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + +prebuild-install@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.1.tgz#c10075727c318efe72412f333e0ef625beaf3870" + integrity sha512-QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg== + dependencies: + detect-libc "^2.0.0" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^3.3.0" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^4.0.0" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + +prettier-linter-helpers@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" + integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== + dependencies: + fast-diff "^1.1.2" + +prettier@2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" + integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== + +prettier@2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a" + integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg== + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +progress@2.0.3, progress@^2.0.0, progress@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +prom-client@^11.5.3: + version "11.5.3" + resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-11.5.3.tgz#5fedfce1083bac6c2b223738e966d0e1643756f8" + integrity sha512-iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q== + dependencies: + tdigest "^0.1.1" + +prop-types@^15.7.2: + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.13.1" + +protobufjs@^6.10.0, protobufjs@^6.8.6: + version "6.11.2" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" + integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.1" + "@types/node" ">=13.7.0" + long "^4.0.0" + +proxy-addr@~2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== + dependencies: + forwarded "0.2.0" + ipaddr.js "1.9.1" + +proxy-from-env@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + +ps-tree@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.2.0.tgz#5e7425b89508736cdd4f2224d028f7bb3f722ebd" + integrity sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA== + dependencies: + event-stream "=3.3.4" + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +puppeteer-cluster@^0.22.0: + version "0.22.0" + resolved "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.22.0.tgz#4ab214671f414f15ad6a94a4b61ed0b4172e86e6" + integrity sha512-hmydtMwfVM+idFIDzS8OXetnujHGre7RY3BGL+3njy9+r8Dcu3VALkZHfuBEPf6byKssTCgzxU1BvLczifXd5w== + dependencies: + debug "^4.1.1" + +puppeteer@^13.1.3: + version "13.3.2" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.3.2.tgz#4ff1cf6e2009df29fd80038bc702dc067776f79d" + integrity sha512-TIt8/R0eaUwY1c0/O0sCJpSglvGEWVoWFfGZ2dNtxX3eHuBo1ln9abaWfxTjZfsrkYATLSs8oqEdRZpMNnCsvg== + dependencies: + cross-fetch "3.1.5" + debug "4.3.3" + devtools-protocol "0.0.960912" + extract-zip "2.0.1" + https-proxy-agent "5.0.0" + pkg-dir "4.2.0" + progress "2.0.3" + proxy-from-env "1.1.0" + rimraf "3.0.2" + tar-fs "2.1.1" + unbzip2-stream "1.4.3" + ws "8.5.0" + +qs@6.9.6: + version "6.9.6" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee" + integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ== + +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + +range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32" + integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ== + dependencies: + bytes "3.1.1" + http-errors "1.8.1" + iconv-lite "0.4.24" + unpipe "1.0.0" + +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +react-is@^16.13.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + +readable-stream@^2.0.0, readable-stream@^2.0.6, readable-stream@^2.1.4: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + +regexp.prototype.flags@^1.3.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307" + integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +regexpp@^3.1.0, regexpp@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== + +regextras@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.8.0.tgz#ec0f99853d4912839321172f608b544814b02217" + integrity sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ== + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve@^1.20.0: + version "1.22.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" + integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== + dependencies: + is-core-module "^2.8.1" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +resolve@^2.0.0-next.3: + version "2.0.0-next.3" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46" + integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + +restore-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" + integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rfdc@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" + integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== + +rimraf@3.0.2, rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + +rxjs@^7.5.1: + version "7.5.2" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.2.tgz#11e4a3a1dfad85dbf7fb6e33cbba17668497490b" + integrity sha512-PwDt186XaL3QN5qXj/H9DGyHhP3/RYYgZZwqBv9Tv8rsAaiwFH1IsJJlcgD37J7UW5a6O67qX0KWKS3/pu0m4w== + dependencies: + tslib "^2.1.0" + +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-stable-stringify@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz#c8a220ab525cd94e60ebf47ddc404d610dc5d84a" + integrity sha512-ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw== + +safe-stable-stringify@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz#ab67cbe1fe7d40603ca641c5e765cb942d04fc73" + integrity sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg== + +"safer-buffer@>= 2.1.2 < 3": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= + +semver-regex@^3.1.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.3.tgz#b2bcc6f97f63269f286994e297e229b6245d0dc3" + integrity sha512-Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ== + +semver@^5.4.1: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@^7.2.1, semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +send@0.17.2: + version "0.17.2" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" + integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "1.8.1" + mime "1.6.0" + ms "2.1.3" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + +serve-static@1.14.2: + version "1.14.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa" + integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.2" + +set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + +sharp@0.29.3: + version "0.29.3" + resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.29.3.tgz#0da183d626094c974516a48fab9b3e4ba92eb5c2" + integrity sha512-fKWUuOw77E4nhpyzCCJR1ayrttHoFHBT2U/kR/qEMRhvPEcluG4BKj324+SCO1e84+knXHwhJ1HHJGnUt4ElGA== + dependencies: + color "^4.0.1" + detect-libc "^1.0.3" + node-addon-api "^4.2.0" + prebuild-install "^7.0.0" + semver "^7.3.5" + simple-get "^4.0.0" + tar-fs "^2.1.1" + tunnel-agent "^0.6.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: + version "3.0.6" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== + +simple-concat@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" + integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== + +simple-get@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.1.tgz#cc7ba77cfbe761036fbfce3d021af25fc5584d55" + integrity sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA== + dependencies: + decompress-response "^4.2.0" + once "^1.3.1" + simple-concat "^1.0.0" + +simple-get@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" + integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== + dependencies: + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" + +simple-swizzle@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" + integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= + dependencies: + is-arrayish "^0.3.1" + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + +source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +spdx-exceptions@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== + +spdx-expression-parse@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.11" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95" + integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g== + +split@0.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" + integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8= + dependencies: + through "2" + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +stack-trace@0.0.x: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" + integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= + +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + +stream-combiner@~0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14" + integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ= + dependencies: + duplexer "~0.1.1" + +stream-meter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/stream-meter/-/stream-meter-1.0.4.tgz#52af95aa5ea760a2491716704dbff90f73afdd1d" + integrity sha1-Uq+Vql6nYKJJFxZwTb/5D3Ov3R0= + dependencies: + readable-stream "^2.1.4" + +string-argv@0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" + integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== + +string-argv@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.1.2.tgz#c5b7bc03fb2b11983ba3a72333dd0559e77e4738" + integrity sha512-mBqPGEOMNJKXRo7z0keX0wlAhbBAjilUdPW13nN0PecVryZxdHIeM7TqbsSUA7VYuS00HGC6mojP7DlQzfa9ZA== + +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string.prototype.matchall@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa" + integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.19.1" + get-intrinsic "^1.1.1" + has-symbols "^1.0.2" + internal-slot "^1.0.3" + regexp.prototype.flags "^1.3.1" + side-channel "^1.0.4" + +string.prototype.trimend@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +string.prototype.trimstart@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +stringify-object@3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== + dependencies: + get-own-enumerable-property-symbols "^3.0.0" + is-obj "^1.0.1" + is-regexp "^1.0.0" + +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +supports-color@8.1.1: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + +table@^6.0.9: + version "6.8.0" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca" + integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA== + dependencies: + ajv "^8.0.1" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + +tar-fs@2.1.1, tar-fs@^2.0.0, tar-fs@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" + integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== + dependencies: + chownr "^1.1.1" + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^2.1.4" + +tar-stream@^2.1.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + +tdigest@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.1.tgz#2e3cb2c39ea449e55d1e6cd91117accca4588021" + integrity sha1-Ljyyw56kSeVdHmzZEReszKRYgCE= + dependencies: + bintrees "1.0.1" + +text-hex@1.0.x: + version "1.0.0" + resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" + integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== + +text-table@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + +through@2, through@^2.3.8, through@~2.3, through@~2.3.1: + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== + +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + +triple-beam@^1.2.0, triple-beam@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" + integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== + +tsc-watch@^4.2.3: + version "4.6.0" + resolved "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.6.0.tgz#a0eba1300cbe3048ab6d3a3e06de47141b613beb" + integrity sha512-DRMADjFe44EDWb+YMIOj4b83UrU6le27L3/o0/9FlmA01ikFd5Dl9RD5h1hpeh0mQdIqXvwfHZszCcjhH3bAmQ== + dependencies: + cross-spawn "^7.0.3" + node-cleanup "^2.1.2" + ps-tree "^1.2.0" + string-argv "^0.1.1" + strip-ansi "^6.0.0" + +tslib@2.3.1, tslib@^2.1.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== + +tslib@^1.8.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== + +tsutils@^3.21.0: + version "3.21.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== + dependencies: + tslib "^1.8.1" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + dependencies: + prelude-ls "~1.1.2" + +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + +type-is@~1.6.18: + version "1.6.18" + resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" + integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== + dependencies: + media-typer "0.3.0" + mime-types "~2.1.24" + +typescript@4.4.4: + version "4.4.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz#2cd01a1a1f160704d3101fd5a58ff0f9fcb8030c" + integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA== + +typescript@^4.3.2: + version "4.5.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3" + integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA== + +unbox-primitive@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== + dependencies: + function-bind "^1.1.1" + has-bigints "^1.0.1" + has-symbols "^1.0.2" + which-boxed-primitive "^1.0.2" + +unbzip2-stream@1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" + integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== + dependencies: + buffer "^5.2.1" + through "^2.3.8" + +unique-filename@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" + integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== + dependencies: + unique-slug "^2.0.0" + +unique-slug@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" + integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== + dependencies: + imurmurhash "^0.1.4" + +universalify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== + +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +url-value-parser@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.1.0.tgz#fe1ae776122b2eea4bbf284896bbdcd7fc75e1fa" + integrity sha512-gIYPWXujdUdwd/9TGCHTf5Vvgw6lOxjE5Q/k+7WNByYyS0vW5WX0k+xuVlhvPq6gRNhzXVv/ezC+OfeAet5Kcw== + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + +v8-compile-cache@^2.0.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + +which-pm-runs@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" + integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= + +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +wide-align@^1.1.0: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + +winston-transport@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.2.tgz#554efe3fce229d046df006e0e3c411d240652e51" + integrity sha512-9jmhltAr5ygt5usgUTQbEiw/7RYXpyUbEAFRCSicIacpUzPkrnQsQZSPGEI12aLK9Jth4zNcYJx3Cvznwrl8pw== + dependencies: + logform "^2.3.2" + readable-stream "^3.4.0" + triple-beam "^1.2.0" + +winston@^3.2.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.5.1.tgz#b25cc899d015836dbf8c583dec8c4c4483a0da2e" + integrity sha512-tbRtVy+vsSSCLcZq/8nXZaOie/S2tPXPFt4be/Q3vI/WtYwm7rrwidxVw2GRa38FIXcJ1kUM6MOZ9Jmnk3F3UA== + dependencies: + "@dabh/diagnostics" "^2.0.2" + async "^3.2.3" + is-stream "^2.0.0" + logform "^2.3.2" + one-time "^1.0.0" + readable-stream "^3.4.0" + safe-stable-stringify "^2.3.1" + stack-trace "0.0.x" + triple-beam "^1.3.0" + winston-transport "^4.4.2" + +word-wrap@^1.2.3, word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +ws@8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" + integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yaml@^1.10.0: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + +yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix index f72f4e59bf0e..556b6eef845b 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix @@ -6,47 +6,47 @@ path = fetchurl { name = "_babel_code_frame___code_frame_7.12.11.tgz"; url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; - sha1 = "f4ad435aa263db935b8f10f2c552d23fb716a63f"; + sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; }; } { - name = "_babel_code_frame___code_frame_7.14.5.tgz"; + name = "_babel_code_frame___code_frame_7.16.7.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz"; - sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb"; + name = "_babel_code_frame___code_frame_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz"; + sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.15.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; - sha1 = "220df993bfe904a4a6b02ab4f3385a5ebf6e2389"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; + sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; }; } { - name = "_babel_highlight___highlight_7.14.5.tgz"; + name = "_babel_highlight___highlight_7.16.10.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; - sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; + name = "_babel_highlight___highlight_7.16.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz"; + sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; }; } { - name = "_babel_parser___parser_7.13.13.tgz"; + name = "_babel_parser___parser_7.16.2.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.13.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz"; - sha1 = "42f03862f4aed50461e543270916b47dd501f0df"; + name = "_babel_parser___parser_7.16.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.2.tgz"; + sha512 = "RUVpT0G2h6rOZwqLDTrKk7ksNv7YpAilTnYe1/Q+eDjxEceRMKVWbCsX7t8h6C1qCFi/1Y8WZjcEPBAFG27GPw=="; }; } { - name = "_babel_types___types_7.13.12.tgz"; + name = "_babel_types___types_7.16.0.tgz"; path = fetchurl { - name = "_babel_types___types_7.13.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.13.12.tgz"; - sha1 = "edbf99208ef48852acdff1c8a681a1e4ade580cd"; + name = "_babel_types___types_7.16.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz"; + sha512 = "PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg=="; }; } { @@ -54,7 +54,7 @@ path = fetchurl { name = "_dabh_diagnostics___diagnostics_2.0.2.tgz"; url = "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; - sha1 = "290d08f7b381b8f94607dc8f471a12c675f9db31"; + sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; } { @@ -62,7 +62,15 @@ path = fetchurl { name = "_es_joy_jsdoccomment___jsdoccomment_0.10.8.tgz"; url = "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.10.8.tgz"; - sha1 = "b3152887e25246410ed4ea569a55926ec13b2b05"; + sha512 = "3P1JiGL4xaR9PoTKUHa2N/LKwa2/eUdRqGwijMWWgBqbFEqJUVpmaOi2TcjcemrsRMgFLBzQCK4ToPhrSVDiFQ=="; + }; + } + { + name = "_es_joy_jsdoccomment___jsdoccomment_0.18.0.tgz"; + path = fetchurl { + name = "_es_joy_jsdoccomment___jsdoccomment_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.18.0.tgz"; + sha512 = "TjT8KJULV4I6ZiwIoKr6eMs+XpRejqwJ/VA+QPDeFGe9j6bZFKmMJ81EeFsGm6JNZhnzm37aoxVROmTh2PZoyA=="; }; } { @@ -70,23 +78,23 @@ path = fetchurl { name = "_eslint_eslintrc___eslintrc_0.4.3.tgz"; url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"; - sha1 = "9e42981ef035beb3dd49add17acb96e8ff6f394c"; + sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; } { - name = "_grafana_eslint_config___eslint_config_2.5.0.tgz"; + name = "_grafana_eslint_config___eslint_config_2.5.2.tgz"; path = fetchurl { - name = "_grafana_eslint_config___eslint_config_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/@grafana/eslint-config/-/eslint-config-2.5.0.tgz"; - sha1 = "d028898e201f242748a94d5582f0e14a493f5853"; + name = "_grafana_eslint_config___eslint_config_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/@grafana/eslint-config/-/eslint-config-2.5.2.tgz"; + sha512 = "LfTKRbeAshEIr5VELcr6dw5U0Er586yeyb5X/IwrfutHwdcrJdepRf1E/LwMVAUoBzJRQfTLErkS9Mw0Xlv/aA=="; }; } { - name = "_grpc_grpc_js___grpc_js_1.3.7.tgz"; + name = "_grpc_grpc_js___grpc_js_1.5.4.tgz"; path = fetchurl { - name = "_grpc_grpc_js___grpc_js_1.3.7.tgz"; - url = "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.7.tgz"; - sha1 = "58b687aff93b743aafde237fd2ee9a3259d7f2d8"; + name = "_grpc_grpc_js___grpc_js_1.5.4.tgz"; + url = "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.5.4.tgz"; + sha512 = "+nJTOsqpFAXnfFrMZ7Too4XXZ/J9O+8jYvSoaunupoC7I7b9H4iex1BRsbTdOmiowfPGJrWit7jUPmbENSUSpw=="; }; } { @@ -94,7 +102,15 @@ path = fetchurl { name = "_grpc_proto_loader___proto_loader_0.5.6.tgz"; url = "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.5.6.tgz"; - sha1 = "1dea4b8a6412b05e2d58514d507137b63a52a98d"; + sha512 = "DT14xgw3PSzPxwS13auTEwxhMMOoz33DPUKNtmYK/QYbBSpLXJy78FGGs5yVoxVobEqPm4iW9MOIoz0A3bLTRQ=="; + }; + } + { + name = "_grpc_proto_loader___proto_loader_0.6.9.tgz"; + path = fetchurl { + name = "_grpc_proto_loader___proto_loader_0.6.9.tgz"; + url = "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.9.tgz"; + sha512 = "UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg=="; }; } { @@ -102,7 +118,7 @@ path = fetchurl { name = "_hapi_boom___boom_9.1.4.tgz"; url = "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.4.tgz"; - sha1 = "1f9dad367c6a7da9f8def24b4a986fc5a7bd9db6"; + sha512 = "Ls1oH8jaN1vNsqcaHVYJrKmgMcKsC1wcp8bujvXrHaAqD2iDYq3HoOwsxwo09Cuda5R5nC0o0IxlrlTuvPuzSw=="; }; } { @@ -110,7 +126,7 @@ path = fetchurl { name = "_hapi_hoek___hoek_9.2.1.tgz"; url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz"; - sha1 = "9551142a1980503752536b5050fd99f4a7f13b17"; + sha512 = "gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw=="; }; } { @@ -118,15 +134,15 @@ path = fetchurl { name = "_humanwhocodes_config_array___config_array_0.5.0.tgz"; url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"; - sha1 = "1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"; + sha512 = "FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg=="; }; } { - name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; + name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; path = fetchurl { - name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz"; - sha1 = "87de7af9c231826fdd68ac7258f77c429e0e5fcf"; + name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; + sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; }; } { @@ -134,7 +150,7 @@ path = fetchurl { name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; - sha1 = "7619c2eb21b25483f6d167548b4cfd5a7488c3d5"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; } { @@ -142,7 +158,7 @@ path = fetchurl { name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; - sha1 = "5bd262af94e9d25bd1e71b05deed44876a222e8b"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; } { @@ -150,7 +166,7 @@ path = fetchurl { name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; - sha1 = "e95737e8bb6746ddedf69c556953494f196fe69a"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; } { @@ -158,7 +174,7 @@ path = fetchurl { name = "_protobufjs_aspromise___aspromise_1.1.2.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz"; - sha1 = "9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"; + sha1 = "m4sMxmPWaafY9vXQiToU00jzD78="; }; } { @@ -166,7 +182,7 @@ path = fetchurl { name = "_protobufjs_base64___base64_1.1.2.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz"; - sha1 = "4c85730e59b9a1f1f349047dbf24296034bb2735"; + sha512 = "AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="; }; } { @@ -174,7 +190,7 @@ path = fetchurl { name = "_protobufjs_codegen___codegen_2.0.4.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz"; - sha1 = "7ef37f0d010fb028ad1ad59722e506d9262815cb"; + sha512 = "YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="; }; } { @@ -182,7 +198,7 @@ path = fetchurl { name = "_protobufjs_eventemitter___eventemitter_1.1.0.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz"; - sha1 = "355cbc98bafad5978f9ed095f397621f1d066b70"; + sha1 = "NVy8mLr61ZePntCV85diHx0Ga3A="; }; } { @@ -190,7 +206,7 @@ path = fetchurl { name = "_protobufjs_fetch___fetch_1.1.0.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz"; - sha1 = "ba99fb598614af65700c1619ff06d454b0d84c45"; + sha1 = "upn7WYYUr2VwDBYZ/wbUVLDYTEU="; }; } { @@ -198,7 +214,7 @@ path = fetchurl { name = "_protobufjs_float___float_1.0.2.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz"; - sha1 = "5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"; + sha1 = "Xp4avctz/Ap8uLKR33jIy9l7h9E="; }; } { @@ -206,7 +222,7 @@ path = fetchurl { name = "_protobufjs_inquire___inquire_1.1.0.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz"; - sha1 = "ff200e3e7cf2429e2dcafc1140828e8cc638f089"; + sha1 = "/yAOPnzyQp4tyvwRQIKOjMY48Ik="; }; } { @@ -214,7 +230,7 @@ path = fetchurl { name = "_protobufjs_path___path_1.1.2.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz"; - sha1 = "6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"; + sha1 = "bMKyDFya1q0NzP0hynZz2Nf79o0="; }; } { @@ -222,7 +238,7 @@ path = fetchurl { name = "_protobufjs_pool___pool_1.1.0.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz"; - sha1 = "09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"; + sha1 = "Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q="; }; } { @@ -230,15 +246,15 @@ path = fetchurl { name = "_protobufjs_utf8___utf8_1.1.0.tgz"; url = "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz"; - sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; + sha1 = "p3c2C1s5oaLlEG+OhY8v0tBgxXA="; }; } { - name = "_types_body_parser___body_parser_1.19.1.tgz"; + name = "_types_body_parser___body_parser_1.19.2.tgz"; path = fetchurl { - name = "_types_body_parser___body_parser_1.19.1.tgz"; - url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz"; - sha1 = "0c0174c42a7d017b818303d4b5d969cb0b75929c"; + name = "_types_body_parser___body_parser_1.19.2.tgz"; + url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz"; + sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; }; } { @@ -246,15 +262,15 @@ path = fetchurl { name = "_types_connect___connect_3.4.35.tgz"; url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz"; - sha1 = "5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"; + sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; }; } { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.24.tgz"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.28.tgz"; path = fetchurl { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.24.tgz"; - url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz"; - sha1 = "ea41f93bf7e0d59cd5a76665068ed6aab6815c07"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.28.tgz"; + url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz"; + sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; }; } { @@ -262,7 +278,7 @@ path = fetchurl { name = "_types_express___express_4.17.13.tgz"; url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz"; - sha1 = "a76e2995728999bab51a33fabce1d705a3709034"; + sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; } { @@ -270,7 +286,7 @@ path = fetchurl { name = "_types_json_schema___json_schema_7.0.9.tgz"; url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz"; - sha1 = "97edc9037ea0c38585320b28964dde3b39e4660d"; + sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="; }; } { @@ -278,7 +294,7 @@ path = fetchurl { name = "_types_long___long_4.0.1.tgz"; url = "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz"; - sha1 = "459c65fa1867dafe6a8f322c4c51695663cc55e9"; + sha512 = "5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="; }; } { @@ -286,23 +302,23 @@ path = fetchurl { name = "_types_mime___mime_1.3.2.tgz"; url = "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz"; - sha1 = "93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"; + sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; } { - name = "_types_node___node_16.10.2.tgz"; + name = "_types_node___node_17.0.14.tgz"; path = fetchurl { - name = "_types_node___node_16.10.2.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.10.2.tgz"; - sha1 = "5764ca9aa94470adb4e1185fe2e9f19458992b2e"; + name = "_types_node___node_17.0.14.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.14.tgz"; + sha512 = "SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng=="; }; } { - name = "_types_node___node_14.17.20.tgz"; + name = "_types_node___node_14.18.10.tgz"; path = fetchurl { - name = "_types_node___node_14.17.20.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.20.tgz"; - sha1 = "74cc80438fd0467dc4377ee5bbad89a886df3c10"; + name = "_types_node___node_14.18.10.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.10.tgz"; + sha512 = "6iihJ/Pp5fsFJ/aEDGyvT4pHGmCpq7ToQ/yf4bl5SbVAvwpspYJ+v3jO7n8UyjhQVHTy+KNszOozDdv+O6sovQ=="; }; } { @@ -310,7 +326,7 @@ path = fetchurl { name = "_types_parse_json___parse_json_4.0.0.tgz"; url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; + sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; }; } { @@ -318,7 +334,7 @@ path = fetchurl { name = "_types_qs___qs_6.9.7.tgz"; url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz"; - sha1 = "63bb7d067db107cc1e457c303bc25d511febf6cb"; + sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; }; } { @@ -326,7 +342,7 @@ path = fetchurl { name = "_types_range_parser___range_parser_1.2.4.tgz"; url = "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz"; - sha1 = "cd667bcfdd025213aafb7ca5915a932590acdcdc"; + sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; } { @@ -334,7 +350,7 @@ path = fetchurl { name = "_types_serve_static___serve_static_1.13.10.tgz"; url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz"; - sha1 = "f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"; + sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; }; } { @@ -342,15 +358,15 @@ path = fetchurl { name = "_types_yauzl___yauzl_2.9.2.tgz"; url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz"; - sha1 = "c48e5d56aff1444409e39fa164b0b4d4552a7b7a"; + sha512 = "8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA=="; }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.10.0.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.0.tgz"; - sha1 = "1a66f03b264844387beb7dc85e1f1d403bd1803f"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.0.tgz"; + sha512 = "XXVKnMsq2fuu9K2KsIxPUGqb6xAImz8MEChClbXmE3VbveFtBUU5bzM6IPVWqzyADIgdkS2Ws/6Xo7W2TeZWjQ=="; }; } { @@ -358,15 +374,7 @@ path = fetchurl { name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.33.0.tgz"; url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz"; - sha1 = "c24dc7c8069c7706bc40d99f6fa87edcb2005276"; - }; - } - { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.0.tgz"; - sha1 = "13167ed991320684bdc23588135ae62115b30ee0"; + sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; } { @@ -374,15 +382,15 @@ path = fetchurl { name = "_typescript_eslint_experimental_utils___experimental_utils_4.33.0.tgz"; url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz"; - sha1 = "6f2a786a4209fa2222989e9380b5331b2810f7fd"; + sha512 = "zeQjOoES5JFjTnAhI5QY7ZviczMzDptls15GFsI6jyUOq0kOf9+WonkhtlIhh0RgHRnqj5gdNxW5j1EvAyYg6Q=="; }; } { - name = "_typescript_eslint_parser___parser_4.28.0.tgz"; + name = "_typescript_eslint_parser___parser_5.10.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.0.tgz"; - sha1 = "2404c16751a28616ef3abab77c8e51d680a12caa"; + name = "_typescript_eslint_parser___parser_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.10.0.tgz"; + sha512 = "pJB2CCeHWtwOAeIxv8CHVGJhI5FNyJAIpx5Pt72YkK3QfEzt6qAlXZuyaBmyfOdM62qU0rbxJzNToPTVeJGrQw=="; }; } { @@ -390,15 +398,7 @@ path = fetchurl { name = "_typescript_eslint_parser___parser_4.33.0.tgz"; url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.33.0.tgz"; - sha1 = "dfe797570d9694e560528d18eecad86c8c744899"; - }; - } - { - name = "_typescript_eslint_scope_manager___scope_manager_4.28.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.0.tgz"; - sha1 = "6a3009d2ab64a30fc8a1e257a1a320067f36a0ce"; + sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; } { @@ -406,15 +406,23 @@ path = fetchurl { name = "_typescript_eslint_scope_manager___scope_manager_4.33.0.tgz"; url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz"; - sha1 = "d38e49280d983e8772e29121cf8c6e9221f280a3"; + sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; } { - name = "_typescript_eslint_types___types_4.28.0.tgz"; + name = "_typescript_eslint_scope_manager___scope_manager_5.10.0.tgz"; path = fetchurl { - name = "_typescript_eslint_types___types_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.0.tgz"; - sha1 = "a33504e1ce7ac51fc39035f5fe6f15079d4dafb0"; + name = "_typescript_eslint_scope_manager___scope_manager_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.10.0.tgz"; + sha512 = "tgNgUgb4MhqK6DoKn3RBhyZ9aJga7EQrw+2/OiDk5hKf3pTVZWyqBi7ukP+Z0iEEDMF5FDa64LqODzlfE4O/Dg=="; + }; + } + { + name = "_typescript_eslint_type_utils___type_utils_5.10.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_type_utils___type_utils_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz"; + sha512 = "TzlyTmufJO5V886N+hTJBGIfnjQDQ32rJYxPaeiyWKdjsv2Ld5l8cbS7pxim4DeNs62fKzRSt8Q14Evs4JnZyQ=="; }; } { @@ -422,15 +430,15 @@ path = fetchurl { name = "_typescript_eslint_types___types_4.33.0.tgz"; url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz"; - sha1 = "a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"; + sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.0.tgz"; + name = "_typescript_eslint_types___types_5.10.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.0.tgz"; - sha1 = "e66d4e5aa2ede66fec8af434898fe61af10c71cf"; + name = "_typescript_eslint_types___types_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.10.0.tgz"; + sha512 = "wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ=="; }; } { @@ -438,15 +446,23 @@ path = fetchurl { name = "_typescript_eslint_typescript_estree___typescript_estree_4.33.0.tgz"; url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz"; - sha1 = "0dfb51c2908f68c5c08d82aefeaf166a17c24609"; + sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; } { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.0.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_5.10.0.tgz"; path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.0.tgz"; - sha1 = "255c67c966ec294104169a6939d96f91c8a89434"; + name = "_typescript_eslint_typescript_estree___typescript_estree_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz"; + sha512 = "x+7e5IqfwLwsxTdliHRtlIYkgdtYXzE0CkFeV6ytAqq431ZyxCFzNMNR5sr3WOlIG/ihVZr9K/y71VHTF/DUQA=="; + }; + } + { + name = "_typescript_eslint_utils___utils_5.10.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_utils___utils_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.10.0.tgz"; + sha512 = "IGYwlt1CVcFoE2ueW4/ioEwybR60RAdGeiJX/iDAw0t5w0wK3S7QncDwpmsM70nKgGTuVchEWB8lwZwHqPAWRg=="; }; } { @@ -454,7 +470,15 @@ path = fetchurl { name = "_typescript_eslint_visitor_keys___visitor_keys_4.33.0.tgz"; url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz"; - sha1 = "2a22f77a41604289b7a186586e9ec48ca92ef1dd"; + sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; + }; + } + { + name = "_typescript_eslint_visitor_keys___visitor_keys_5.10.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_visitor_keys___visitor_keys_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz"; + sha512 = "GMxj0K1uyrFLPKASLmZzCuSddmjZVbVj3Ouy5QVuIGKZopxvOr24JsS7gruz6C3GExE01mublZ3mIBOaon9zuQ=="; }; } { @@ -462,7 +486,7 @@ path = fetchurl { name = "accepts___accepts_1.3.7.tgz"; url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; - sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; } { @@ -470,7 +494,7 @@ path = fetchurl { name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; - sha1 = "7ed5bb55908b3b2f1bc55c6af1653bada7f07937"; + sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; }; } { @@ -478,7 +502,7 @@ path = fetchurl { name = "acorn___acorn_7.4.1.tgz"; url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; - sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; } { @@ -486,7 +510,7 @@ path = fetchurl { name = "agent_base___agent_base_6.0.2.tgz"; url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; - sha1 = "49fff58577cfee3f37176feab4c22e00f86d7f77"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; } { @@ -494,7 +518,7 @@ path = fetchurl { name = "aggregate_error___aggregate_error_3.1.0.tgz"; url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; - sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; }; } { @@ -502,15 +526,15 @@ path = fetchurl { name = "ajv___ajv_6.12.6.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; - sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; } { - name = "ajv___ajv_8.6.3.tgz"; + name = "ajv___ajv_8.9.0.tgz"; path = fetchurl { - name = "ajv___ajv_8.6.3.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz"; - sha1 = "11a66527761dc3e9a3845ea775d2d3c0414e8764"; + name = "ajv___ajv_8.9.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz"; + sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ=="; }; } { @@ -518,7 +542,7 @@ path = fetchurl { name = "ansi_colors___ansi_colors_4.1.1.tgz"; url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; - sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; } { @@ -526,7 +550,7 @@ path = fetchurl { name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; - sha1 = "6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"; + sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; }; } { @@ -534,15 +558,7 @@ path = fetchurl { name = "ansi_regex___ansi_regex_2.1.1.tgz"; url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - } - { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8="; }; } { @@ -550,7 +566,7 @@ path = fetchurl { name = "ansi_regex___ansi_regex_5.0.1.tgz"; url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha1 = "082cb2c89c9fe8659a311a53bd6a4dc5301db304"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; } { @@ -558,7 +574,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_3.2.1.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; } { @@ -566,7 +582,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_4.3.0.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; } { @@ -574,7 +590,7 @@ path = fetchurl { name = "anymatch___anymatch_3.1.2.tgz"; url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; - sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; + sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; }; } { @@ -582,7 +598,7 @@ path = fetchurl { name = "aproba___aproba_1.2.0.tgz"; url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; - sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; }; } { @@ -590,7 +606,7 @@ path = fetchurl { name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; - sha1 = "b15474a932adab4ff8a50d9adfa7e4e926f21146"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; }; } { @@ -598,7 +614,7 @@ path = fetchurl { name = "argparse___argparse_1.0.10.tgz"; url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; - sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; } { @@ -606,7 +622,7 @@ path = fetchurl { name = "array_flatten___array_flatten_1.1.1.tgz"; url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; - sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + sha1 = "ml9pkFGx5wczKPKgCJaLZOopVdI="; }; } { @@ -614,7 +630,7 @@ path = fetchurl { name = "array_includes___array_includes_3.1.4.tgz"; url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz"; - sha1 = "f5b493162c760f3539631f005ba2bb46acb45ba9"; + sha512 = "ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw=="; }; } { @@ -622,7 +638,7 @@ path = fetchurl { name = "array_union___array_union_2.1.0.tgz"; url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; - sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; } { @@ -630,7 +646,7 @@ path = fetchurl { name = "array.prototype.flatmap___array.prototype.flatmap_1.2.5.tgz"; url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz"; - sha1 = "908dc82d8a406930fdf38598d51e7411d18d4446"; + sha512 = "08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA=="; }; } { @@ -638,15 +654,15 @@ path = fetchurl { name = "astral_regex___astral_regex_2.0.0.tgz"; url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; - sha1 = "483143c567aeed4785759c0865786dc77d7d2e31"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; }; } { - name = "async___async_3.2.1.tgz"; + name = "async___async_3.2.3.tgz"; path = fetchurl { - name = "async___async_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz"; - sha1 = "d3274ec66d107a47476a4c49136aacdb00665fc8"; + name = "async___async_3.2.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz"; + sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; }; } { @@ -654,7 +670,7 @@ path = fetchurl { name = "at_least_node___at_least_node_1.0.0.tgz"; url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; - sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; + sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; }; } { @@ -662,7 +678,7 @@ path = fetchurl { name = "balanced_match___balanced_match_1.0.2.tgz"; url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; - sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; } { @@ -670,7 +686,7 @@ path = fetchurl { name = "base64_js___base64_js_1.5.1.tgz"; url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; - sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; } { @@ -678,7 +694,7 @@ path = fetchurl { name = "basic_auth___basic_auth_2.0.1.tgz"; url = "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz"; - sha1 = "b998279bf47ce38344b4f3cf916d4679bbf51e3a"; + sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; }; } { @@ -686,7 +702,7 @@ path = fetchurl { name = "binary_extensions___binary_extensions_2.2.0.tgz"; url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; - sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d"; + sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; }; } { @@ -694,7 +710,7 @@ path = fetchurl { name = "bintrees___bintrees_1.0.1.tgz"; url = "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz"; - sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524"; + sha1 = "DmVcm5wkNeqraL9AJyJtK1WjRSQ="; }; } { @@ -702,15 +718,15 @@ path = fetchurl { name = "bl___bl_4.1.0.tgz"; url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; - sha1 = "451535264182bec2fbbc83a62ab98cf11d9f7b3a"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; } { - name = "body_parser___body_parser_1.19.0.tgz"; + name = "body_parser___body_parser_1.19.1.tgz"; path = fetchurl { - name = "body_parser___body_parser_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; - sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; + name = "body_parser___body_parser_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz"; + sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA=="; }; } { @@ -718,7 +734,7 @@ path = fetchurl { name = "brace_expansion___brace_expansion_1.1.11.tgz"; url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; } { @@ -726,7 +742,7 @@ path = fetchurl { name = "braces___braces_3.0.2.tgz"; url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; - sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; } { @@ -734,7 +750,7 @@ path = fetchurl { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + sha1 = "DTM+PwDqxQqhRUq9MO+MKl2ackI="; }; } { @@ -742,15 +758,15 @@ path = fetchurl { name = "buffer___buffer_5.7.1.tgz"; url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; - sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; } { - name = "bytes___bytes_3.1.0.tgz"; + name = "bytes___bytes_3.1.1.tgz"; path = fetchurl { - name = "bytes___bytes_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; - sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + name = "bytes___bytes_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz"; + sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; }; } { @@ -758,7 +774,7 @@ path = fetchurl { name = "call_bind___call_bind_1.0.2.tgz"; url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; - sha1 = "b1d4e89e688119c3c9a903ad30abb2f6a919be3c"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; } { @@ -766,7 +782,7 @@ path = fetchurl { name = "callsites___callsites_3.1.0.tgz"; url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; - sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; } { @@ -774,7 +790,7 @@ path = fetchurl { name = "chalk___chalk_2.4.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; } { @@ -782,15 +798,15 @@ path = fetchurl { name = "chalk___chalk_4.1.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; - sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; } { - name = "chokidar___chokidar_3.5.2.tgz"; + name = "chokidar___chokidar_3.5.3.tgz"; path = fetchurl { - name = "chokidar___chokidar_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz"; - sha1 = "dba3976fcadb016f66fd365021d91600d01c1e75"; + name = "chokidar___chokidar_3.5.3.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz"; + sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; }; } { @@ -798,7 +814,7 @@ path = fetchurl { name = "chownr___chownr_1.1.4.tgz"; url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; - sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; } { @@ -806,7 +822,7 @@ path = fetchurl { name = "ci_info___ci_info_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; } { @@ -814,7 +830,7 @@ path = fetchurl { name = "clean_stack___clean_stack_2.2.0.tgz"; url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; - sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; + sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; }; } { @@ -822,7 +838,7 @@ path = fetchurl { name = "cli_cursor___cli_cursor_3.1.0.tgz"; url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; - sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307"; + sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; }; } { @@ -830,7 +846,7 @@ path = fetchurl { name = "cli_truncate___cli_truncate_2.1.0.tgz"; url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz"; - sha1 = "c39e28bf05edcde5be3b98992a22deed5a2b93c7"; + sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; }; } { @@ -838,7 +854,7 @@ path = fetchurl { name = "cliui___cliui_7.0.4.tgz"; url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; - sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; + sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; } { @@ -846,7 +862,7 @@ path = fetchurl { name = "code_point_at___code_point_at_1.1.0.tgz"; url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + sha1 = "DQcLTQQ6W+ozovGkDi7bPZpMz3c="; }; } { @@ -854,7 +870,7 @@ path = fetchurl { name = "color_convert___color_convert_1.9.3.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; } { @@ -862,7 +878,7 @@ path = fetchurl { name = "color_convert___color_convert_2.0.1.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; - sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; }; } { @@ -870,7 +886,7 @@ path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; }; } { @@ -878,23 +894,31 @@ path = fetchurl { name = "color_name___color_name_1.1.4.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; } { - name = "color_string___color_string_1.6.0.tgz"; + name = "color_string___color_string_1.9.0.tgz"; path = fetchurl { - name = "color_string___color_string_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz"; - sha1 = "c3915f61fe267672cb7e1e064c9d692219f6c312"; + name = "color_string___color_string_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz"; + sha512 = "9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ=="; }; } { - name = "color___color_3.0.0.tgz"; + name = "color___color_3.2.1.tgz"; path = fetchurl { - name = "color___color_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz"; - sha1 = "d920b4328d534a3ac8295d68f7bd4ba6c427be9a"; + name = "color___color_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz"; + sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="; + }; + } + { + name = "color___color_4.2.0.tgz"; + path = fetchurl { + name = "color___color_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/color/-/color-4.2.0.tgz"; + sha512 = "hHTcrbvEnGjC7WBMk6ibQWFVDgEFTVmjrz2Q5HlU6ltwxv0JJN2Z8I7uRbWeQLF04dikxs8zgyZkazRJvSMtyQ=="; }; } { @@ -902,7 +926,15 @@ path = fetchurl { name = "colorette___colorette_1.4.0.tgz"; url = "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz"; - sha1 = "5190fbb87276259a86ad700bff2c6d6faa3fca40"; + sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; + }; + } + { + name = "colorette___colorette_2.0.16.tgz"; + path = fetchurl { + name = "colorette___colorette_2.0.16.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz"; + sha512 = "hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="; }; } { @@ -910,31 +942,23 @@ path = fetchurl { name = "colors___colors_1.4.0.tgz"; url = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz"; - sha1 = "c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"; + sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; }; } { - name = "colorspace___colorspace_1.1.2.tgz"; + name = "colorspace___colorspace_1.1.4.tgz"; path = fetchurl { - name = "colorspace___colorspace_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.2.tgz"; - sha1 = "e0128950d082b86a2168580796a0aa5d6c68d8c5"; + name = "colorspace___colorspace_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz"; + sha512 = "BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w=="; }; } { - name = "commander___commander_8.2.0.tgz"; + name = "commander___commander_8.3.0.tgz"; path = fetchurl { - name = "commander___commander_8.2.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-8.2.0.tgz"; - sha1 = "37fe2bde301d87d47a53adeff8b5915db1381ca8"; - }; - } - { - name = "comment_parser___comment_parser_1.1.2.tgz"; - path = fetchurl { - name = "comment_parser___comment_parser_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.1.2.tgz"; - sha1 = "e5317d7a2ec22b470dcb54a29b25426c30bf39d8"; + name = "commander___commander_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz"; + sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; }; } { @@ -942,7 +966,15 @@ path = fetchurl { name = "comment_parser___comment_parser_1.2.4.tgz"; url = "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.2.4.tgz"; - sha1 = "489f3ee55dfd184a6e4bffb31baba284453cb760"; + sha512 = "pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw=="; + }; + } + { + name = "comment_parser___comment_parser_1.3.0.tgz"; + path = fetchurl { + name = "comment_parser___comment_parser_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.0.tgz"; + sha512 = "hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA=="; }; } { @@ -950,7 +982,7 @@ path = fetchurl { name = "compare_versions___compare_versions_3.6.0.tgz"; url = "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz"; - sha1 = "1a5689913685e5a87637b8d3ffca75514ec41d62"; + sha512 = "W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA=="; }; } { @@ -958,7 +990,7 @@ path = fetchurl { name = "concat_map___concat_map_0.0.1.tgz"; url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; }; } { @@ -966,15 +998,15 @@ path = fetchurl { name = "console_control_strings___console_control_strings_1.1.0.tgz"; url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + sha1 = "PXz0Rk22RG6mRL9LOVB/mFEAjo4="; }; } { - name = "content_disposition___content_disposition_0.5.3.tgz"; + name = "content_disposition___content_disposition_0.5.4.tgz"; path = fetchurl { - name = "content_disposition___content_disposition_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; - sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; + name = "content_disposition___content_disposition_0.5.4.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz"; + sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; } { @@ -982,7 +1014,7 @@ path = fetchurl { name = "content_type___content_type_1.0.4.tgz"; url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; - sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; } { @@ -990,15 +1022,15 @@ path = fetchurl { name = "cookie_signature___cookie_signature_1.0.6.tgz"; url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + sha1 = "4wOogrNCzD7oylE6eZmXNNqzriw="; }; } { - name = "cookie___cookie_0.4.0.tgz"; + name = "cookie___cookie_0.4.1.tgz"; path = fetchurl { - name = "cookie___cookie_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; - sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + name = "cookie___cookie_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz"; + sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; } { @@ -1006,7 +1038,7 @@ path = fetchurl { name = "core_util_is___core_util_is_1.0.3.tgz"; url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; - sha1 = "a6042d3634c2b27e9328f837b965fac83808db85"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; } { @@ -1014,7 +1046,23 @@ path = fetchurl { name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; - sha1 = "714d756522cace867867ccb4474c5d01bbae5d6d"; + sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; + }; + } + { + name = "cross_env___cross_env_7.0.3.tgz"; + path = fetchurl { + name = "cross_env___cross_env_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz"; + sha512 = "+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw=="; + }; + } + { + name = "cross_fetch___cross_fetch_3.1.5.tgz"; + path = fetchurl { + name = "cross_fetch___cross_fetch_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz"; + sha512 = "lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw=="; }; } { @@ -1022,7 +1070,7 @@ path = fetchurl { name = "cross_spawn___cross_spawn_7.0.3.tgz"; url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; } { @@ -1030,23 +1078,15 @@ path = fetchurl { name = "debug___debug_2.6.9.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; } { - name = "debug___debug_4.3.2.tgz"; + name = "debug___debug_4.3.3.tgz"; path = fetchurl { - name = "debug___debug_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; - }; - } - { - name = "debug___debug_4.3.1.tgz"; - path = fetchurl { - name = "debug___debug_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; - sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; + name = "debug___debug_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; }; } { @@ -1054,7 +1094,15 @@ path = fetchurl { name = "decompress_response___decompress_response_4.2.1.tgz"; url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz"; - sha1 = "414023cc7a302da25ce2ec82d0d5238ccafd8986"; + sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; + }; + } + { + name = "decompress_response___decompress_response_6.0.0.tgz"; + path = fetchurl { + name = "decompress_response___decompress_response_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz"; + sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; }; } { @@ -1062,7 +1110,7 @@ path = fetchurl { name = "deep_extend___deep_extend_0.6.0.tgz"; url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; - sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; } { @@ -1070,7 +1118,7 @@ path = fetchurl { name = "deep_is___deep_is_0.1.4.tgz"; url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; - sha1 = "a6f2dce612fadd2ef1f519b73551f17e85199831"; + sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; }; } { @@ -1078,7 +1126,7 @@ path = fetchurl { name = "define_properties___define_properties_1.1.3.tgz"; url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; - sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; } { @@ -1086,7 +1134,7 @@ path = fetchurl { name = "delegates___delegates_1.0.0.tgz"; url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + sha1 = "hMbhWbgZBP3KWaDvRM2HDTElD5o="; }; } { @@ -1094,7 +1142,7 @@ path = fetchurl { name = "depd___depd_1.1.2.tgz"; url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + sha1 = "m81S4UwJd2PnSbJ0xDRu0uVgtak="; }; } { @@ -1102,7 +1150,7 @@ path = fetchurl { name = "depd___depd_2.0.0.tgz"; url = "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz"; - sha1 = "b696163cc757560d09cf22cc8fad1571b79e76df"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; } { @@ -1110,7 +1158,7 @@ path = fetchurl { name = "destroy___destroy_1.0.4.tgz"; url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; + sha1 = "l4hXRCxEdJ5CBmE+N5RiBYJqvYA="; }; } { @@ -1118,15 +1166,23 @@ path = fetchurl { name = "detect_libc___detect_libc_1.0.3.tgz"; url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + sha1 = "+hN8S9aY7fVc1c0CrFWfkaTEups="; }; } { - name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; + name = "detect_libc___detect_libc_2.0.0.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz"; - sha1 = "79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd"; + name = "detect_libc___detect_libc_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.0.tgz"; + sha512 = "S55LzUl8HUav8l9E2PBTlC5PAJrHK7tkM+XXFGD+fbsbkTzhCpG6K05LxJcUOEWzMa4v6ptcMZ9s3fOdJDu0Zw=="; + }; + } + { + name = "devtools_protocol___devtools_protocol_0.0.960912.tgz"; + path = fetchurl { + name = "devtools_protocol___devtools_protocol_0.0.960912.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.960912.tgz"; + sha512 = "I3hWmV9rWHbdnUdmMKHF2NuYutIM2kXz2mdXW8ha7TbRlGTVs+PF+PsB5QWvpCek4Fy9B+msiispCfwlhG5Sqg=="; }; } { @@ -1134,7 +1190,7 @@ path = fetchurl { name = "dir_glob___dir_glob_3.0.1.tgz"; url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; - sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; }; } { @@ -1142,7 +1198,7 @@ path = fetchurl { name = "doctrine___doctrine_2.1.0.tgz"; url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; - sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; + sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; }; } { @@ -1150,7 +1206,7 @@ path = fetchurl { name = "doctrine___doctrine_3.0.0.tgz"; url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; - sha1 = "addebead72a6574db783639dc87a121773973961"; + sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; }; } { @@ -1158,7 +1214,7 @@ path = fetchurl { name = "duplexer___duplexer_0.1.2.tgz"; url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz"; - sha1 = "3abe43aef3835f8ae077d136ddce0f276b0400e6"; + sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; }; } { @@ -1166,7 +1222,7 @@ path = fetchurl { name = "ee_first___ee_first_1.1.1.tgz"; url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + sha1 = "WQxhFWsK4vTwJVcyoViyZrxWsh0="; }; } { @@ -1174,7 +1230,7 @@ path = fetchurl { name = "emoji_regex___emoji_regex_8.0.0.tgz"; url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; } { @@ -1182,7 +1238,7 @@ path = fetchurl { name = "enabled___enabled_2.0.0.tgz"; url = "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz"; - sha1 = "f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"; + sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; }; } { @@ -1190,7 +1246,7 @@ path = fetchurl { name = "encodeurl___encodeurl_1.0.2.tgz"; url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; }; } { @@ -1198,7 +1254,7 @@ path = fetchurl { name = "end_of_stream___end_of_stream_1.4.4.tgz"; url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; } { @@ -1206,7 +1262,7 @@ path = fetchurl { name = "enquirer___enquirer_2.3.6.tgz"; url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; - sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; + sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; }; } { @@ -1214,7 +1270,7 @@ path = fetchurl { name = "error_ex___error_ex_1.3.2.tgz"; url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; - sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; } { @@ -1222,7 +1278,7 @@ path = fetchurl { name = "es_abstract___es_abstract_1.19.1.tgz"; url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz"; - sha1 = "d4885796876916959de78edaa0df456627115ec3"; + sha512 = "2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w=="; }; } { @@ -1230,7 +1286,7 @@ path = fetchurl { name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; } { @@ -1238,7 +1294,7 @@ path = fetchurl { name = "escalade___escalade_3.1.1.tgz"; url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; - sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; } { @@ -1246,7 +1302,7 @@ path = fetchurl { name = "escape_html___escape_html_1.0.3.tgz"; url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + sha1 = "Aljq5NPQwJdN4cFpGI7wBR0dGYg="; }; } { @@ -1254,7 +1310,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; }; } { @@ -1262,7 +1318,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; } { @@ -1270,15 +1326,7 @@ path = fetchurl { name = "escodegen___escodegen_2.0.0.tgz"; url = "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz"; - sha1 = "5e32b12833e8aa8fa35e1bf0befa89380484c7dd"; - }; - } - { - name = "eslint_config_prettier___eslint_config_prettier_7.2.0.tgz"; - path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz"; - sha1 = "f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"; + sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; }; } { @@ -1286,31 +1334,23 @@ path = fetchurl { name = "eslint_config_prettier___eslint_config_prettier_8.3.0.tgz"; url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz"; - sha1 = "f7471b20b6fe8a9a9254cc684454202886a2dd7a"; + sha512 = "BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew=="; }; } { - name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_31.6.1.tgz"; + name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_37.7.0.tgz"; path = fetchurl { - name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_31.6.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-31.6.1.tgz"; - sha1 = "98040c801500572fff71c984a097d89946f1e450"; + name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_37.7.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-37.7.0.tgz"; + sha512 = "vzy3/ltXoGtabRnjLogaEmhGxxIv5B8HK5MJLIrdxFJUvhBppZjuVuLr71DjIBi0jg6bFomwkYKjojt29cN8PA=="; }; } { - name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_36.1.0.tgz"; + name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_36.1.1.tgz"; path = fetchurl { - name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_36.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.0.tgz"; - sha1 = "8dfe5f27edfb6aa3812e6d86ccaea849ddc86b03"; - }; - } - { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.3.1.tgz"; - path = fetchurl { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz"; - sha1 = "7079cfa2497078905011e6f82e8dd8453d1371b7"; + name = "eslint_plugin_jsdoc___eslint_plugin_jsdoc_36.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-36.1.1.tgz"; + sha512 = "nuLDvH1EJaKx0PCa9oeQIxH6pACIhZd1gkalTUxZbaxxwokjs7TplqY0Q8Ew3CoZaf5aowm0g/Z3JGHCatt+gQ=="; }; } { @@ -1318,31 +1358,23 @@ path = fetchurl { name = "eslint_plugin_prettier___eslint_plugin_prettier_4.0.0.tgz"; url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz"; - sha1 = "8b99d1e4b8b24a762472b4567992023619cb98e0"; + sha512 = "98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ=="; }; } { - name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.2.0.tgz"; + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.3.0.tgz"; path = fetchurl { - name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz"; - sha1 = "8c229c268d468956334c943bb45fc860280f5556"; + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz"; + sha512 = "XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA=="; }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.22.0.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.28.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.22.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz"; - sha1 = "3d1c542d1d3169c45421c1215d9470e341707269"; - }; - } - { - name = "eslint_plugin_react___eslint_plugin_react_7.26.1.tgz"; - path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.26.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.26.1.tgz"; - sha1 = "41bcfe3e39e6a5ac040971c1af94437c80daa40e"; + name = "eslint_plugin_react___eslint_plugin_react_7.28.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.28.0.tgz"; + sha512 = "IOlFIRHzWfEQQKcAD4iyYDndHwTQiCMcJVJjxempf203jnNLUnW34AXLrV33+nEXoifJE2ZEGmcjKPL8957eSw=="; }; } { @@ -1350,7 +1382,7 @@ path = fetchurl { name = "eslint_scope___eslint_scope_5.1.1.tgz"; url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; - sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; } { @@ -1358,7 +1390,7 @@ path = fetchurl { name = "eslint_utils___eslint_utils_2.1.0.tgz"; url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; - sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; + sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; } { @@ -1366,7 +1398,7 @@ path = fetchurl { name = "eslint_utils___eslint_utils_3.0.0.tgz"; url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz"; - sha1 = "8aebaface7345bb33559db0a1f13a1d2d48c3672"; + sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; }; } { @@ -1374,7 +1406,7 @@ path = fetchurl { name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; - sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; }; } { @@ -1382,15 +1414,23 @@ path = fetchurl { name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; - sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; + sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; } { - name = "eslint___eslint_7.21.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_3.2.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.21.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz"; - sha1 = "4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83"; + name = "eslint_visitor_keys___eslint_visitor_keys_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz"; + sha512 = "IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ=="; + }; + } + { + name = "eslint___eslint_7.28.0.tgz"; + path = fetchurl { + name = "eslint___eslint_7.28.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz"; + sha512 = "UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g=="; }; } { @@ -1398,7 +1438,7 @@ path = fetchurl { name = "eslint___eslint_7.32.0.tgz"; url = "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz"; - sha1 = "c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"; + sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; } { @@ -1406,7 +1446,7 @@ path = fetchurl { name = "espree___espree_7.3.1.tgz"; url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; - sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6"; + sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; } { @@ -1414,7 +1454,7 @@ path = fetchurl { name = "esprima___esprima_4.0.1.tgz"; url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; - sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; } { @@ -1422,7 +1462,7 @@ path = fetchurl { name = "esquery___esquery_1.4.0.tgz"; url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; - sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; }; } { @@ -1430,7 +1470,7 @@ path = fetchurl { name = "esrecurse___esrecurse_4.3.0.tgz"; url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; - sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; }; } { @@ -1438,15 +1478,15 @@ path = fetchurl { name = "estraverse___estraverse_4.3.0.tgz"; url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; - sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; } { - name = "estraverse___estraverse_5.2.0.tgz"; + name = "estraverse___estraverse_5.3.0.tgz"; path = fetchurl { - name = "estraverse___estraverse_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; - sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + name = "estraverse___estraverse_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz"; + sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; } { @@ -1454,7 +1494,7 @@ path = fetchurl { name = "esutils___esutils_2.0.3.tgz"; url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; - sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; }; } { @@ -1462,7 +1502,7 @@ path = fetchurl { name = "etag___etag_1.8.1.tgz"; url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + sha1 = "Qa4u62XvpiJorr/qg6x9eSmbCIc="; }; } { @@ -1470,7 +1510,7 @@ path = fetchurl { name = "event_stream___event_stream_3.3.4.tgz"; url = "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz"; - sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; + sha1 = "SrTJoPWlTbkzi0w02Gv86PSzVXE="; }; } { @@ -1478,7 +1518,7 @@ path = fetchurl { name = "execa___execa_5.1.1.tgz"; url = "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz"; - sha1 = "f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"; + sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; }; } { @@ -1486,7 +1526,7 @@ path = fetchurl { name = "expand_template___expand_template_2.0.3.tgz"; url = "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz"; - sha1 = "6e14b3fcee0f3a6340ecb57d2e8918692052a47c"; + sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; } { @@ -1494,15 +1534,15 @@ path = fetchurl { name = "express_prom_bundle___express_prom_bundle_5.1.5.tgz"; url = "https://registry.yarnpkg.com/express-prom-bundle/-/express-prom-bundle-5.1.5.tgz"; - sha1 = "f298615879299a58cf8ec1350186f4de91d91fa4"; + sha512 = "tUaQUBu0r9zGYcVDpKBI2AeWimuuodaC5BSBkzLPQxRTxaKQShQNnONQSYwjLxbHfPwlCKVZlzfbB9Recnj0Vg=="; }; } { - name = "express___express_4.17.1.tgz"; + name = "express___express_4.17.2.tgz"; path = fetchurl { - name = "express___express_4.17.1.tgz"; - url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; - sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; + name = "express___express_4.17.2.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz"; + sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; }; } { @@ -1510,7 +1550,7 @@ path = fetchurl { name = "extract_zip___extract_zip_2.0.1.tgz"; url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; - sha1 = "663dca56fe46df890d5f131ef4a06d22bb8ba13a"; + sha512 = "GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg=="; }; } { @@ -1518,7 +1558,7 @@ path = fetchurl { name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; } { @@ -1526,15 +1566,15 @@ path = fetchurl { name = "fast_diff___fast_diff_1.2.0.tgz"; url = "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz"; - sha1 = "73ee11982d86caaf7959828d519cfe927fac5f03"; + sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; } { - name = "fast_glob___fast_glob_3.2.7.tgz"; + name = "fast_glob___fast_glob_3.2.11.tgz"; path = fetchurl { - name = "fast_glob___fast_glob_3.2.7.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz"; - sha1 = "fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"; + name = "fast_glob___fast_glob_3.2.11.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz"; + sha512 = "xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew=="; }; } { @@ -1542,7 +1582,7 @@ path = fetchurl { name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; } { @@ -1550,7 +1590,7 @@ path = fetchurl { name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; }; } { @@ -1558,7 +1598,7 @@ path = fetchurl { name = "fastq___fastq_1.13.0.tgz"; url = "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz"; - sha1 = "616760f88a7526bdfc596b7cab8c18938c36b98c"; + sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; }; } { @@ -1566,7 +1606,7 @@ path = fetchurl { name = "fd_slicer___fd_slicer_1.1.0.tgz"; url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; - sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + sha1 = "JcfInLH5B3+IkbvmHY85Dq4lbx4="; }; } { @@ -1574,7 +1614,7 @@ path = fetchurl { name = "fecha___fecha_4.2.1.tgz"; url = "https://registry.yarnpkg.com/fecha/-/fecha-4.2.1.tgz"; - sha1 = "0a83ad8f86ef62a091e22bb5a039cd03d23eecce"; + sha512 = "MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="; }; } { @@ -1582,7 +1622,7 @@ path = fetchurl { name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; } { @@ -1590,7 +1630,7 @@ path = fetchurl { name = "fill_range___fill_range_7.0.1.tgz"; url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; - sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; } { @@ -1598,7 +1638,7 @@ path = fetchurl { name = "finalhandler___finalhandler_1.1.2.tgz"; url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; - sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; } { @@ -1606,7 +1646,7 @@ path = fetchurl { name = "find_up___find_up_4.1.0.tgz"; url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; } { @@ -1614,7 +1654,7 @@ path = fetchurl { name = "find_up___find_up_5.0.0.tgz"; url = "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz"; - sha1 = "4c92819ecb7083561e4f4a240a86be5198f536fc"; + sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; }; } { @@ -1622,7 +1662,7 @@ path = fetchurl { name = "find_versions___find_versions_4.0.0.tgz"; url = "https://registry.yarnpkg.com/find-versions/-/find-versions-4.0.0.tgz"; - sha1 = "3c57e573bf97769b8cb8df16934b627915da4965"; + sha512 = "wgpWy002tA+wgmO27buH/9KzyEOQnKsG/R0yrcjPT9BOFm0zRBVQbZ95nRGXWMywS8YR5knRbpohio0bcJABxQ=="; }; } { @@ -1630,15 +1670,15 @@ path = fetchurl { name = "flat_cache___flat_cache_3.0.4.tgz"; url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; - sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; } { - name = "flatted___flatted_3.2.2.tgz"; + name = "flatted___flatted_3.2.5.tgz"; path = fetchurl { - name = "flatted___flatted_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz"; - sha1 = "64bfed5cb68fe3ca78b3eb214ad97b63bedce561"; + name = "flatted___flatted_3.2.5.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; } { @@ -1646,7 +1686,7 @@ path = fetchurl { name = "fn.name___fn.name_1.1.0.tgz"; url = "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz"; - sha1 = "26cad8017967aea8731bc42961d04a3d5988accc"; + sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; } { @@ -1654,7 +1694,7 @@ path = fetchurl { name = "forwarded___forwarded_0.2.0.tgz"; url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz"; - sha1 = "2269936428aad4c15c7ebe9779a84bf0b2a81811"; + sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; } { @@ -1662,7 +1702,7 @@ path = fetchurl { name = "fresh___fresh_0.5.2.tgz"; url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + sha1 = "PYyt2Q2XZWn6g1qx+OSyOhBWBac="; }; } { @@ -1670,7 +1710,7 @@ path = fetchurl { name = "from2___from2_2.3.0.tgz"; url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; - sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + sha1 = "i/tVAr3kpNNs/e6gB/zKIdfjgq8="; }; } { @@ -1678,7 +1718,7 @@ path = fetchurl { name = "from___from_0.1.7.tgz"; url = "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz"; - sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe"; + sha1 = "g8YK/Fi5xWmXAH7Rp2izqzA6RP4="; }; } { @@ -1686,7 +1726,7 @@ path = fetchurl { name = "fs_constants___fs_constants_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; - sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; }; } { @@ -1694,7 +1734,7 @@ path = fetchurl { name = "fs_extra___fs_extra_9.1.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; - sha1 = "5954460c764a8da2094ba3554bf839e6b9a7c86d"; + sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; }; } { @@ -1702,7 +1742,7 @@ path = fetchurl { name = "fs.realpath___fs.realpath_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; }; } { @@ -1710,7 +1750,7 @@ path = fetchurl { name = "fsevents___fsevents_2.3.2.tgz"; url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; - sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; }; } { @@ -1718,7 +1758,7 @@ path = fetchurl { name = "function_bind___function_bind_1.1.1.tgz"; url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; - sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; } { @@ -1726,7 +1766,7 @@ path = fetchurl { name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + sha1 = "GwqzvVU7Kg1jmdKcDj6gslIHgyc="; }; } { @@ -1734,7 +1774,7 @@ path = fetchurl { name = "gauge___gauge_2.7.4.tgz"; url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; - sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + sha1 = "LANAXHU4w51+s3sxcCLjJfsBi/c="; }; } { @@ -1742,7 +1782,7 @@ path = fetchurl { name = "get_caller_file___get_caller_file_2.0.5.tgz"; url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; } { @@ -1750,7 +1790,7 @@ path = fetchurl { name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; - sha1 = "15f59f376f855c446963948f0d24cd3637b4abc6"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; }; } { @@ -1758,7 +1798,7 @@ path = fetchurl { name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; - sha1 = "b5fde77f22cbe35f390b4e089922c50bce6ef664"; + sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="; }; } { @@ -1766,7 +1806,7 @@ path = fetchurl { name = "get_stream___get_stream_5.2.0.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; - sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; } { @@ -1774,7 +1814,7 @@ path = fetchurl { name = "get_stream___get_stream_6.0.1.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz"; - sha1 = "a262d8eef67aced57c2852ad6167526a43cbf7b7"; + sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; }; } { @@ -1782,7 +1822,7 @@ path = fetchurl { name = "get_symbol_description___get_symbol_description_1.0.0.tgz"; url = "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha1 = "7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"; + sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; }; } { @@ -1790,7 +1830,7 @@ path = fetchurl { name = "github_from_package___github_from_package_0.0.0.tgz"; url = "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz"; - sha1 = "97fb5d96bfde8973313f20e8288ef9a167fa64ce"; + sha1 = "l/tdlr/eiXMxPyDoKI75oWf6ZM4="; }; } { @@ -1798,7 +1838,7 @@ path = fetchurl { name = "glob_parent___glob_parent_5.1.2.tgz"; url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; - sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; } { @@ -1806,31 +1846,23 @@ path = fetchurl { name = "glob___glob_7.2.0.tgz"; url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; - sha1 = "d15535af7732e02e948f4c41628bd910293f6023"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; } { - name = "globals___globals_12.4.0.tgz"; + name = "globals___globals_13.12.0.tgz"; path = fetchurl { - name = "globals___globals_12.4.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; - sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; + name = "globals___globals_13.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz"; + sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; }; } { - name = "globals___globals_13.11.0.tgz"; + name = "globby___globby_11.1.0.tgz"; path = fetchurl { - name = "globals___globals_13.11.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz"; - sha1 = "40ef678da117fe7bd2e28f1fab24951bd0255be7"; - }; - } - { - name = "globby___globby_11.0.4.tgz"; - path = fetchurl { - name = "globby___globby_11.0.4.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz"; - sha1 = "2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"; + name = "globby___globby_11.1.0.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz"; + sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; } { @@ -1838,15 +1870,15 @@ path = fetchurl { name = "google_protobuf___google_protobuf_3.5.0.tgz"; url = "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.5.0.tgz"; - sha1 = "b8cc63c74d83457bd8a9a904503c8efb26bca339"; + sha1 = "uMxjx02DRXvYqakEUDyO+ya8ozk="; }; } { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; }; } { @@ -1854,7 +1886,7 @@ path = fetchurl { name = "has_bigints___has_bigints_1.0.1.tgz"; url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz"; - sha1 = "64fe6acb020673e3b78db035a5af69aa9d07b113"; + sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="; }; } { @@ -1862,7 +1894,7 @@ path = fetchurl { name = "has_flag___has_flag_3.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; }; } { @@ -1870,7 +1902,7 @@ path = fetchurl { name = "has_flag___has_flag_4.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; - sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; } { @@ -1878,7 +1910,7 @@ path = fetchurl { name = "has_symbols___has_symbols_1.0.2.tgz"; url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; - sha1 = "165d3070c00309752a1236a479331e3ac56f1423"; + sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; }; } { @@ -1886,7 +1918,7 @@ path = fetchurl { name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; url = "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha1 = "7e133818a7d394734f941e73c3d3f9291e658b25"; + sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; }; } { @@ -1894,7 +1926,7 @@ path = fetchurl { name = "has_unicode___has_unicode_2.0.1.tgz"; url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + sha1 = "4Ob+aijPUROIVeCG0Wkedx3iqLk="; }; } { @@ -1902,23 +1934,15 @@ path = fetchurl { name = "has___has_1.0.3.tgz"; url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; - sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; }; } { - name = "http_errors___http_errors_1.7.2.tgz"; + name = "http_errors___http_errors_1.8.1.tgz"; path = fetchurl { - name = "http_errors___http_errors_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; - sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; - }; - } - { - name = "http_errors___http_errors_1.7.3.tgz"; - path = fetchurl { - name = "http_errors___http_errors_1.7.3.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; - sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06"; + name = "http_errors___http_errors_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz"; + sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; } { @@ -1926,7 +1950,7 @@ path = fetchurl { name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha1 = "e2a90542abb68a762e0a0850f6c9edadfd8506b2"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; }; } { @@ -1934,7 +1958,7 @@ path = fetchurl { name = "human_signals___human_signals_2.1.0.tgz"; url = "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz"; - sha1 = "dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"; + sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; } { @@ -1942,7 +1966,7 @@ path = fetchurl { name = "husky___husky_4.3.8.tgz"; url = "https://registry.yarnpkg.com/husky/-/husky-4.3.8.tgz"; - sha1 = "31144060be963fd6850e5cc8f019a1dfe194296d"; + sha512 = "LCqqsB0PzJQ/AlCgfrfzRe3e3+NvmefAdKQhRYpxS4u6clblBoDdzzvHi8fmxKRzvMxPY/1WZWzomPZww0Anow=="; }; } { @@ -1950,7 +1974,7 @@ path = fetchurl { name = "iconv_lite___iconv_lite_0.4.24.tgz"; url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; } { @@ -1958,7 +1982,7 @@ path = fetchurl { name = "ieee754___ieee754_1.2.1.tgz"; url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; - sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; } { @@ -1966,15 +1990,15 @@ path = fetchurl { name = "ignore___ignore_4.0.6.tgz"; url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; - sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; + sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; } { - name = "ignore___ignore_5.1.8.tgz"; + name = "ignore___ignore_5.2.0.tgz"; path = fetchurl { - name = "ignore___ignore_5.1.8.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; - sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; + name = "ignore___ignore_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz"; + sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; }; } { @@ -1982,7 +2006,7 @@ path = fetchurl { name = "import_fresh___import_fresh_3.3.0.tgz"; url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; - sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; } { @@ -1990,7 +2014,7 @@ path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; }; } { @@ -1998,7 +2022,7 @@ path = fetchurl { name = "indent_string___indent_string_4.0.0.tgz"; url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; - sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; }; } { @@ -2006,7 +2030,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; }; } { @@ -2014,15 +2038,7 @@ path = fetchurl { name = "inherits___inherits_2.0.4.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; - }; - } - { - name = "inherits___inherits_2.0.3.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } { @@ -2030,7 +2046,7 @@ path = fetchurl { name = "ini___ini_1.3.8.tgz"; url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; - sha1 = "a29da425b48806f34767a4efce397269af28432c"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; } { @@ -2038,7 +2054,7 @@ path = fetchurl { name = "internal_slot___internal_slot_1.0.3.tgz"; url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; - sha1 = "7347e307deeea2faac2ac6205d4bc7d34967f59c"; + sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; }; } { @@ -2046,7 +2062,7 @@ path = fetchurl { name = "into_stream___into_stream_6.0.0.tgz"; url = "https://registry.yarnpkg.com/into-stream/-/into-stream-6.0.0.tgz"; - sha1 = "4bfc1244c0128224e18b8870e85b2de8e66c6702"; + sha512 = "XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA=="; }; } { @@ -2054,7 +2070,7 @@ path = fetchurl { name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; } { @@ -2062,7 +2078,7 @@ path = fetchurl { name = "is_arrayish___is_arrayish_0.2.1.tgz"; url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + sha1 = "d8mYQFJ6qOyxqLppe4BkWnqSap0="; }; } { @@ -2070,7 +2086,7 @@ path = fetchurl { name = "is_arrayish___is_arrayish_0.3.2.tgz"; url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz"; - sha1 = "4574a2ae56f7ab206896fb431eaeed066fdf8f03"; + sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; } { @@ -2078,7 +2094,7 @@ path = fetchurl { name = "is_bigint___is_bigint_1.0.4.tgz"; url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz"; - sha1 = "08147a1875bc2b32005d41ccd8291dffc6691df3"; + sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; }; } { @@ -2086,7 +2102,7 @@ path = fetchurl { name = "is_binary_path___is_binary_path_2.1.0.tgz"; url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; - sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; } { @@ -2094,7 +2110,7 @@ path = fetchurl { name = "is_boolean_object___is_boolean_object_1.1.2.tgz"; url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; - sha1 = "5c6dc200246dd9321ae4b885a114bb1f75f63719"; + sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; }; } { @@ -2102,15 +2118,15 @@ path = fetchurl { name = "is_callable___is_callable_1.2.4.tgz"; url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz"; - sha1 = "47301d58dd0259407865547853df6d61fe471945"; + sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; }; } { - name = "is_core_module___is_core_module_2.7.0.tgz"; + name = "is_core_module___is_core_module_2.8.1.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.7.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz"; - sha1 = "3c0ef7d31b4acfc574f80c58409d568a836848e3"; + name = "is_core_module___is_core_module_2.8.1.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz"; + sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; }; } { @@ -2118,7 +2134,7 @@ path = fetchurl { name = "is_date_object___is_date_object_1.0.5.tgz"; url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz"; - sha1 = "0841d5536e724c25597bf6ea62e1bd38298df31f"; + sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; }; } { @@ -2126,7 +2142,7 @@ path = fetchurl { name = "is_extglob___is_extglob_2.1.1.tgz"; url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + sha1 = "qIwCU1eR8C7TfHahueqXc8gz+MI="; }; } { @@ -2134,15 +2150,7 @@ path = fetchurl { name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + sha1 = "754xOG8DGn8NZDr4L95QxFfvAMs="; }; } { @@ -2150,7 +2158,7 @@ path = fetchurl { name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; } { @@ -2158,15 +2166,15 @@ path = fetchurl { name = "is_glob___is_glob_4.0.3.tgz"; url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz"; - sha1 = "64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"; + sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; } { - name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + name = "is_negative_zero___is_negative_zero_2.0.2.tgz"; path = fetchurl { - name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; - sha1 = "3de746c18dda2319241a53675908d8f766f11c24"; + name = "is_negative_zero___is_negative_zero_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; + sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; }; } { @@ -2174,7 +2182,7 @@ path = fetchurl { name = "is_number_object___is_number_object_1.0.6.tgz"; url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz"; - sha1 = "6a7aaf838c7f0686a50b4553f7e54a96494e89f0"; + sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g=="; }; } { @@ -2182,7 +2190,7 @@ path = fetchurl { name = "is_number___is_number_7.0.0.tgz"; url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; - sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; } { @@ -2190,7 +2198,7 @@ path = fetchurl { name = "is_obj___is_obj_1.0.1.tgz"; url = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + sha1 = "PkcprB9f3gJc19g6iW2rn09n2w8="; }; } { @@ -2198,7 +2206,7 @@ path = fetchurl { name = "is_regex___is_regex_1.1.4.tgz"; url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz"; - sha1 = "eef5663cd59fa4c0ae339505323df6854bb15958"; + sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; }; } { @@ -2206,7 +2214,7 @@ path = fetchurl { name = "is_regexp___is_regexp_1.0.0.tgz"; url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz"; - sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + sha1 = "/S2INUXEa6xaYz57mgnof6LLUGk="; }; } { @@ -2214,7 +2222,7 @@ path = fetchurl { name = "is_shared_array_buffer___is_shared_array_buffer_1.0.1.tgz"; url = "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz"; - sha1 = "97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"; + sha512 = "IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="; }; } { @@ -2222,7 +2230,7 @@ path = fetchurl { name = "is_stream___is_stream_2.0.1.tgz"; url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz"; - sha1 = "fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"; + sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; }; } { @@ -2230,7 +2238,7 @@ path = fetchurl { name = "is_string___is_string_1.0.7.tgz"; url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz"; - sha1 = "0dd12bf2006f255bb58f695110eff7491eebc0fd"; + sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; }; } { @@ -2238,15 +2246,15 @@ path = fetchurl { name = "is_symbol___is_symbol_1.0.4.tgz"; url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz"; - sha1 = "a6dac93b635b063ca6872236de88910a57af139c"; + sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; } { - name = "is_weakref___is_weakref_1.0.1.tgz"; + name = "is_weakref___is_weakref_1.0.2.tgz"; path = fetchurl { - name = "is_weakref___is_weakref_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz"; - sha1 = "842dba4ec17fa9ac9850df2d6efbc1737274f2a2"; + name = "is_weakref___is_weakref_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz"; + sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; }; } { @@ -2254,7 +2262,7 @@ path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; }; } { @@ -2262,7 +2270,7 @@ path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; }; } { @@ -2270,7 +2278,7 @@ path = fetchurl { name = "js_tokens___js_tokens_4.0.0.tgz"; url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; - sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; } { @@ -2278,7 +2286,7 @@ path = fetchurl { name = "js_yaml___js_yaml_3.14.1.tgz"; url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; - sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; } { @@ -2286,7 +2294,7 @@ path = fetchurl { name = "jsdoc_type_pratt_parser___jsdoc_type_pratt_parser_1.1.1.tgz"; url = "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.1.1.tgz"; - sha1 = "10fe5e409ba38de22a48b555598955a26ff0160f"; + sha512 = "uelRmpghNwPBuZScwgBG/OzodaFk5RbO5xaivBdsAY70icWfShwZ7PCMO0x1zSkOa8T1FzHThmrdoyg/0AwV5g=="; }; } { @@ -2294,15 +2302,15 @@ path = fetchurl { name = "jsdoc_type_pratt_parser___jsdoc_type_pratt_parser_1.2.0.tgz"; url = "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.2.0.tgz"; - sha1 = "3482a3833b74a88c95a6ba7253f0c0de3b77b9f5"; + sha512 = "4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg=="; }; } { - name = "jsdoctypeparser___jsdoctypeparser_9.0.0.tgz"; + name = "jsdoc_type_pratt_parser___jsdoc_type_pratt_parser_2.2.2.tgz"; path = fetchurl { - name = "jsdoctypeparser___jsdoctypeparser_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz"; - sha1 = "8c97e2fb69315eb274b0f01377eaa5c940bd7b26"; + name = "jsdoc_type_pratt_parser___jsdoc_type_pratt_parser_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.2.tgz"; + sha512 = "zRokSWcPLSWkoNzsWn9pq7YYSwDhKyEe+cJYT2qaPqLOOJb5sFSi46BPj81vP+e8chvCNdQL9RG86Bi9EI6MDw=="; }; } { @@ -2310,7 +2318,7 @@ path = fetchurl { name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; - sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; }; } { @@ -2318,7 +2326,7 @@ path = fetchurl { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; } { @@ -2326,7 +2334,7 @@ path = fetchurl { name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; - sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; + sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; }; } { @@ -2334,7 +2342,7 @@ path = fetchurl { name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + sha1 = "nbe1lJatPzz+8wp1FC0tkwrXJlE="; }; } { @@ -2342,7 +2350,7 @@ path = fetchurl { name = "jsonfile___jsonfile_6.1.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; - sha1 = "bc55b2634793c679ec6403094eb13698a6ec0aae"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; }; } { @@ -2350,7 +2358,7 @@ path = fetchurl { name = "jsx_ast_utils___jsx_ast_utils_3.2.1.tgz"; url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz"; - sha1 = "720b97bfe7d901b927d87c3773637ae8ea48781b"; + sha512 = "uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA=="; }; } { @@ -2358,7 +2366,7 @@ path = fetchurl { name = "kuler___kuler_2.0.0.tgz"; url = "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz"; - sha1 = "e2c570a3800388fb44407e851531c1d670b061b3"; + sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; }; } { @@ -2366,7 +2374,7 @@ path = fetchurl { name = "levn___levn_0.4.1.tgz"; url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; - sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; + sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; }; } { @@ -2374,31 +2382,31 @@ path = fetchurl { name = "levn___levn_0.3.0.tgz"; url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + sha1 = "OwmSTt+fCDwEkP3UwLxEIeBHZO4="; }; } { - name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; path = fetchurl { - name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; - sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; + sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; }; } { - name = "lint_staged___lint_staged_11.2.0.tgz"; + name = "lint_staged___lint_staged_11.2.6.tgz"; path = fetchurl { - name = "lint_staged___lint_staged_11.2.0.tgz"; - url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.2.0.tgz"; - sha1 = "6b9774a74b3eb4bef5c59fb6475bff84d6853008"; + name = "lint_staged___lint_staged_11.2.6.tgz"; + url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.2.6.tgz"; + sha512 = "Vti55pUnpvPE0J9936lKl0ngVeTdSZpEdTNhASbkaWX7J5R9OEifo1INBGQuGW4zmy6OG+TcWPJ3m5yuy5Q8Tg=="; }; } { - name = "listr2___listr2_3.12.2.tgz"; + name = "listr2___listr2_3.14.0.tgz"; path = fetchurl { - name = "listr2___listr2_3.12.2.tgz"; - url = "https://registry.yarnpkg.com/listr2/-/listr2-3.12.2.tgz"; - sha1 = "2d55cc627111603ad4768a9e87c9c7bb9b49997e"; + name = "listr2___listr2_3.14.0.tgz"; + url = "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz"; + sha512 = "TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g=="; }; } { @@ -2406,7 +2414,7 @@ path = fetchurl { name = "locate_path___locate_path_5.0.0.tgz"; url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; } { @@ -2414,7 +2422,7 @@ path = fetchurl { name = "locate_path___locate_path_6.0.0.tgz"; url = "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz"; - sha1 = "55321eb309febbc59c4801d931a72452a681d286"; + sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; }; } { @@ -2422,15 +2430,7 @@ path = fetchurl { name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; url = "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; - sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; - }; - } - { - name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; - path = fetchurl { - name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + sha1 = "soqmKIorn8ZRA1x3EfZathkDMaY="; }; } { @@ -2438,7 +2438,7 @@ path = fetchurl { name = "lodash.merge___lodash.merge_4.6.2.tgz"; url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; - sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; } { @@ -2446,7 +2446,7 @@ path = fetchurl { name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; - sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + sha1 = "WjUNoLERO4N+z//VgSy+WNbq4ZM="; }; } { @@ -2454,7 +2454,7 @@ path = fetchurl { name = "lodash___lodash_4.17.21.tgz"; url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; - sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; } { @@ -2462,15 +2462,15 @@ path = fetchurl { name = "log_update___log_update_4.0.0.tgz"; url = "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz"; - sha1 = "589ecd352471f2a1c0c570287543a64dfd20e0a1"; + sha512 = "9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg=="; }; } { - name = "logform___logform_2.3.0.tgz"; + name = "logform___logform_2.3.2.tgz"; path = fetchurl { - name = "logform___logform_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/logform/-/logform-2.3.0.tgz"; - sha1 = "a3997a05985de2ebd325ae0d166dffc9c6fe6b57"; + name = "logform___logform_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/logform/-/logform-2.3.2.tgz"; + sha512 = "V6JiPThZzTsbVRspNO6TmHkR99oqYTs8fivMBYQkjZj6rxW92KxtDCPE6IkAk1DNBnYKNkjm4jYBm6JDUcyhOA=="; }; } { @@ -2478,7 +2478,7 @@ path = fetchurl { name = "long___long_4.0.0.tgz"; url = "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz"; - sha1 = "9a7b71cfb7d361a194ea555241c92f7468d5bf28"; + sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; }; } { @@ -2486,7 +2486,7 @@ path = fetchurl { name = "loose_envify___loose_envify_1.4.0.tgz"; url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; - sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; }; } { @@ -2494,7 +2494,7 @@ path = fetchurl { name = "lru_cache___lru_cache_6.0.0.tgz"; url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; - sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } { @@ -2502,7 +2502,7 @@ path = fetchurl { name = "map_stream___map_stream_0.1.0.tgz"; url = "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz"; - sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + sha1 = "5WqpTEyAVaFkBKBnS3jyFffI4ZQ="; }; } { @@ -2510,7 +2510,7 @@ path = fetchurl { name = "media_typer___media_typer_0.3.0.tgz"; url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + sha1 = "hxDXrwqmJvj/+hzgAWhUUmMlV0g="; }; } { @@ -2518,7 +2518,7 @@ path = fetchurl { name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + sha1 = "sAqqVW3YtEVoFQ7J0blT8/kMu2E="; }; } { @@ -2526,7 +2526,7 @@ path = fetchurl { name = "merge_stream___merge_stream_2.0.0.tgz"; url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; - sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; }; } { @@ -2534,7 +2534,7 @@ path = fetchurl { name = "merge2___merge2_1.4.1.tgz"; url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; - sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; }; } { @@ -2542,7 +2542,7 @@ path = fetchurl { name = "methods___methods_1.1.2.tgz"; url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + sha1 = "VSmk1nZUE07cxSZmVoNbD4Ua/O4="; }; } { @@ -2550,23 +2550,23 @@ path = fetchurl { name = "micromatch___micromatch_4.0.4.tgz"; url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; - sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; + sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; }; } { - name = "mime_db___mime_db_1.50.0.tgz"; + name = "mime_db___mime_db_1.51.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.50.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz"; - sha1 = "abd4ac94e98d3c0e185016c67ab45d5fde40c11f"; + name = "mime_db___mime_db_1.51.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; } { - name = "mime_types___mime_types_2.1.33.tgz"; + name = "mime_types___mime_types_2.1.34.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.33.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.33.tgz"; - sha1 = "1fa12a904472fafd068e48d9e8401f74d3f70edb"; + name = "mime_types___mime_types_2.1.34.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; } { @@ -2574,7 +2574,7 @@ path = fetchurl { name = "mime___mime_1.6.0.tgz"; url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; - sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; } { @@ -2582,7 +2582,7 @@ path = fetchurl { name = "mimic_fn___mimic_fn_2.1.0.tgz"; url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; } { @@ -2590,7 +2590,15 @@ path = fetchurl { name = "mimic_response___mimic_response_2.1.0.tgz"; url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz"; - sha1 = "d13763d35f613d09ec37ebb30bac0469c0ee8f43"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; + }; + } + { + name = "mimic_response___mimic_response_3.1.0.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz"; + sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; }; } { @@ -2598,7 +2606,7 @@ path = fetchurl { name = "minimatch___minimatch_3.0.4.tgz"; url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; } { @@ -2606,7 +2614,7 @@ path = fetchurl { name = "minimist___minimist_1.2.5.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; } { @@ -2614,15 +2622,7 @@ path = fetchurl { name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; url = "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; - sha1 = "fa10c9115cc6d8865be221ba47ee9bed78601113"; - }; - } - { - name = "mkdirp___mkdirp_0.5.5.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; } { @@ -2630,7 +2630,7 @@ path = fetchurl { name = "morgan___morgan_1.10.0.tgz"; url = "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz"; - sha1 = "091778abc1fc47cd3509824653dae1faab6b17d7"; + sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; }; } { @@ -2638,15 +2638,7 @@ path = fetchurl { name = "ms___ms_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; - }; - } - { - name = "ms___ms_2.1.1.tgz"; - path = fetchurl { - name = "ms___ms_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; - sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; }; } { @@ -2654,7 +2646,7 @@ path = fetchurl { name = "ms___ms_2.1.2.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; - sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; } { @@ -2662,7 +2654,7 @@ path = fetchurl { name = "ms___ms_2.1.3.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; - sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; } { @@ -2670,7 +2662,7 @@ path = fetchurl { name = "multistream___multistream_4.1.0.tgz"; url = "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz"; - sha1 = "7bf00dfd119556fbc153cff3de4c6d477909f5a8"; + sha512 = "J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw=="; }; } { @@ -2678,7 +2670,7 @@ path = fetchurl { name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; url = "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; - sha1 = "b1fddc0b2c46e380a0b7a76f984dd47c41a13806"; + sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; }; } { @@ -2686,7 +2678,7 @@ path = fetchurl { name = "natural_compare___natural_compare_1.4.0.tgz"; url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; - sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + sha1 = "Sr6/7tdUHywnrPspvbvRXI1bpPc="; }; } { @@ -2694,7 +2686,7 @@ path = fetchurl { name = "negotiator___negotiator_0.6.2.tgz"; url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; - sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; } { @@ -2702,7 +2694,23 @@ path = fetchurl { name = "node_abi___node_abi_2.30.1.tgz"; url = "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz"; - sha1 = "c437d4b1fe0e285aaf290d45b45d4d7afedac4cf"; + sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; + }; + } + { + name = "node_abi___node_abi_3.7.0.tgz"; + path = fetchurl { + name = "node_abi___node_abi_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.7.0.tgz"; + sha512 = "3J+U4CvxVNEk9+lGdJkmYbN8cIN0HMTDT9R0ezX7pmp7aD6BaKsfAHwVn3IvVg6pYIRUuQ+gHW1eawrvywnSQQ=="; + }; + } + { + name = "node_addon_api___node_addon_api_4.3.0.tgz"; + path = fetchurl { + name = "node_addon_api___node_addon_api_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz"; + sha512 = "73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ=="; }; } { @@ -2710,31 +2718,15 @@ path = fetchurl { name = "node_cleanup___node_cleanup_2.1.2.tgz"; url = "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz"; - sha1 = "7ac19abd297e09a7f72a71545d951b517e4dde2c"; + sha1 = "esGavSl+Caf3KnFUXZUbUX5N3iw="; }; } { - name = "node_fetch___node_fetch_2.6.1.tgz"; + name = "node_fetch___node_fetch_2.6.7.tgz"; path = fetchurl { - name = "node_fetch___node_fetch_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; - sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; - }; - } - { - name = "node_fetch___node_fetch_2.6.5.tgz"; - path = fetchurl { - name = "node_fetch___node_fetch_2.6.5.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz"; - sha1 = "42735537d7f080a7e5f78b6c549b7146be1742fd"; - }; - } - { - name = "noop_logger___noop_logger_0.1.1.tgz"; - path = fetchurl { - name = "noop_logger___noop_logger_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz"; - sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; + name = "node_fetch___node_fetch_2.6.7.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz"; + sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; } { @@ -2742,7 +2734,7 @@ path = fetchurl { name = "normalize_path___normalize_path_3.0.0.tgz"; url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; - sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; } { @@ -2750,7 +2742,7 @@ path = fetchurl { name = "npm_run_path___npm_run_path_4.0.1.tgz"; url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; - sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"; + sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; }; } { @@ -2758,7 +2750,7 @@ path = fetchurl { name = "npmlog___npmlog_4.1.2.tgz"; url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; - sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; }; } { @@ -2766,7 +2758,7 @@ path = fetchurl { name = "number_is_nan___number_is_nan_1.0.1.tgz"; url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + sha1 = "CXtgK1NCKlIsGvuHkDGDNpQaAR0="; }; } { @@ -2774,15 +2766,15 @@ path = fetchurl { name = "object_assign___object_assign_4.1.1.tgz"; url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + sha1 = "IQmtx5ZYh8/AXLvUQsrIv7s2CGM="; }; } { - name = "object_inspect___object_inspect_1.11.0.tgz"; + name = "object_inspect___object_inspect_1.12.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz"; - sha1 = "9dceb146cedd4148a0d9e51ab88d34cf509922b1"; + name = "object_inspect___object_inspect_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz"; + sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="; }; } { @@ -2790,7 +2782,7 @@ path = fetchurl { name = "object_keys___object_keys_1.1.1.tgz"; url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; } { @@ -2798,7 +2790,7 @@ path = fetchurl { name = "object.assign___object.assign_4.1.2.tgz"; url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; - sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; }; } { @@ -2806,7 +2798,7 @@ path = fetchurl { name = "object.entries___object.entries_1.1.5.tgz"; url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz"; - sha1 = "e1acdd17c4de2cd96d5a08487cfb9db84d881861"; + sha512 = "TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g=="; }; } { @@ -2814,7 +2806,7 @@ path = fetchurl { name = "object.fromentries___object.fromentries_2.0.5.tgz"; url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz"; - sha1 = "7b37b205109c21e741e605727fe8b0ad5fa08251"; + sha512 = "CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw=="; }; } { @@ -2822,7 +2814,7 @@ path = fetchurl { name = "object.hasown___object.hasown_1.1.0.tgz"; url = "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz"; - sha1 = "7232ed266f34d197d15cac5880232f7a4790afe5"; + sha512 = "MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg=="; }; } { @@ -2830,7 +2822,7 @@ path = fetchurl { name = "object.values___object.values_1.1.5.tgz"; url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz"; - sha1 = "959f63e3ce9ef108720333082131e4a459b716ac"; + sha512 = "QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg=="; }; } { @@ -2838,7 +2830,7 @@ path = fetchurl { name = "on_finished___on_finished_2.3.0.tgz"; url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + sha1 = "IPEzZIGwg811M3mSoWlxqi2QaUc="; }; } { @@ -2846,7 +2838,7 @@ path = fetchurl { name = "on_headers___on_headers_1.0.2.tgz"; url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz"; - sha1 = "772b0ae6aaa525c399e489adfad90c403eb3c28f"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; }; } { @@ -2854,7 +2846,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; }; } { @@ -2862,7 +2854,7 @@ path = fetchurl { name = "one_time___one_time_1.0.0.tgz"; url = "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz"; - sha1 = "e06bc174aed214ed58edede573b433bbf827cb45"; + sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; }; } { @@ -2870,7 +2862,7 @@ path = fetchurl { name = "onetime___onetime_5.1.2.tgz"; url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; - sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; } { @@ -2878,7 +2870,7 @@ path = fetchurl { name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz"; - sha1 = "7a0fff978f6dbfa4d006238fbac98ed4198c3259"; + sha512 = "8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q=="; }; } { @@ -2886,7 +2878,7 @@ path = fetchurl { name = "optionator___optionator_0.8.3.tgz"; url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; - sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; }; } { @@ -2894,7 +2886,7 @@ path = fetchurl { name = "optionator___optionator_0.9.1.tgz"; url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; - sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; + sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; }; } { @@ -2902,7 +2894,7 @@ path = fetchurl { name = "p_is_promise___p_is_promise_3.0.0.tgz"; url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz"; - sha1 = "58e78c7dfe2e163cf2a04ff869e7c1dba64a5971"; + sha512 = "Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ=="; }; } { @@ -2910,7 +2902,7 @@ path = fetchurl { name = "p_limit___p_limit_2.3.0.tgz"; url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; - sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; } { @@ -2918,7 +2910,7 @@ path = fetchurl { name = "p_limit___p_limit_3.1.0.tgz"; url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; - sha1 = "e1daccbe78d0d1388ca18c64fea38e3e57e3706b"; + sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; }; } { @@ -2926,7 +2918,7 @@ path = fetchurl { name = "p_locate___p_locate_4.1.0.tgz"; url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; } { @@ -2934,7 +2926,7 @@ path = fetchurl { name = "p_locate___p_locate_5.0.0.tgz"; url = "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz"; - sha1 = "83c8315c6785005e3bd021839411c9e110e6d834"; + sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; }; } { @@ -2942,7 +2934,7 @@ path = fetchurl { name = "p_map___p_map_4.0.0.tgz"; url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; - sha1 = "bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; }; } { @@ -2950,7 +2942,7 @@ path = fetchurl { name = "p_try___p_try_2.2.0.tgz"; url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; } { @@ -2958,7 +2950,7 @@ path = fetchurl { name = "parent_module___parent_module_1.0.1.tgz"; url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; - sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; }; } { @@ -2966,7 +2958,7 @@ path = fetchurl { name = "parse_json___parse_json_5.2.0.tgz"; url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; - sha1 = "c76fc66dee54231c962b22bcc8a72cf2f99753cd"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; }; } { @@ -2974,7 +2966,7 @@ path = fetchurl { name = "parseurl___parseurl_1.3.3.tgz"; url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; - sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; } { @@ -2982,7 +2974,7 @@ path = fetchurl { name = "path_exists___path_exists_4.0.0.tgz"; url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; }; } { @@ -2990,7 +2982,7 @@ path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; }; } { @@ -2998,7 +2990,7 @@ path = fetchurl { name = "path_key___path_key_3.1.1.tgz"; url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; - sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; } { @@ -3006,7 +2998,7 @@ path = fetchurl { name = "path_parse___path_parse_1.0.7.tgz"; url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; - sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; } { @@ -3014,7 +3006,7 @@ path = fetchurl { name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + sha1 = "32BBeABfUi8V60SQ5yR6G/qmf4w="; }; } { @@ -3022,7 +3014,7 @@ path = fetchurl { name = "path_type___path_type_4.0.0.tgz"; url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; - sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; } { @@ -3030,7 +3022,7 @@ path = fetchurl { name = "pause_stream___pause_stream_0.0.11.tgz"; url = "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz"; - sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + sha1 = "/lo0sMvOErWqaitAPuLnO2AvFEU="; }; } { @@ -3038,15 +3030,15 @@ path = fetchurl { name = "pend___pend_1.2.0.tgz"; url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + sha1 = "elfrVQpng/kRUzH89GY9XI4AelA="; }; } { - name = "picomatch___picomatch_2.3.0.tgz"; + name = "picomatch___picomatch_2.3.1.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; - sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; + name = "picomatch___picomatch_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz"; + sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; } { @@ -3054,7 +3046,7 @@ path = fetchurl { name = "pkg_dir___pkg_dir_4.2.0.tgz"; url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; } { @@ -3062,23 +3054,23 @@ path = fetchurl { name = "pkg_dir___pkg_dir_5.0.0.tgz"; url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz"; - sha1 = "a02d6aebe6ba133a928f74aec20bafdfe6b8e760"; + sha512 = "NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA=="; }; } { - name = "pkg_fetch___pkg_fetch_3.2.4.tgz"; + name = "pkg_fetch___pkg_fetch_3.2.6.tgz"; path = fetchurl { - name = "pkg_fetch___pkg_fetch_3.2.4.tgz"; - url = "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.2.4.tgz"; - sha1 = "5372734b12167d4bacd872be348217461b517390"; + name = "pkg_fetch___pkg_fetch_3.2.6.tgz"; + url = "https://registry.yarnpkg.com/pkg-fetch/-/pkg-fetch-3.2.6.tgz"; + sha512 = "Q8fx6SIT022g0cdSE4Axv/xpfHeltspo2gg1KsWRinLQZOTRRAtOOaEFghA1F3jJ8FVsh8hGrL/Pb6Ea5XHIFw=="; }; } { - name = "pkg___pkg_5.4.1.tgz"; + name = "pkg___pkg_5.5.2.tgz"; path = fetchurl { - name = "pkg___pkg_5.4.1.tgz"; - url = "https://registry.yarnpkg.com/pkg/-/pkg-5.4.1.tgz"; - sha1 = "4d824e42c454f32131e471d7cd8d14bfdb3e1c4c"; + name = "pkg___pkg_5.5.2.tgz"; + url = "https://registry.yarnpkg.com/pkg/-/pkg-5.5.2.tgz"; + sha512 = "pD0UB2ud01C6pVv2wpGsTYJrXI/bnvGRYvMLd44wFzA1p+A2jrlTGFPAYa7YEYzmitXhx23PqalaG1eUEnSwcA=="; }; } { @@ -3086,15 +3078,31 @@ path = fetchurl { name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; url = "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"; - sha1 = "aeddd3f994c933e4ad98b99d9a556efa0e2fe942"; + sha512 = "gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg=="; }; } { - name = "prebuild_install___prebuild_install_6.0.1.tgz"; + name = "poolpeteer___poolpeteer_0.22.20.tgz"; path = fetchurl { - name = "prebuild_install___prebuild_install_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.0.1.tgz"; - sha1 = "5902172f7a40eb67305b96c2a695db32636ee26d"; + name = "poolpeteer___poolpeteer_0.22.20.tgz"; + url = "https://registry.yarnpkg.com/poolpeteer/-/poolpeteer-0.22.20.tgz"; + sha512 = "+bEpQoW5YpmZ3fUEhdL9tcgYVULHc5ylI140QDka1F4a6ew9Jv3bWHpkgrR5OLeEbHdfSdJZOXIysna3GgRkIw=="; + }; + } + { + name = "prebuild_install___prebuild_install_6.1.4.tgz"; + path = fetchurl { + name = "prebuild_install___prebuild_install_6.1.4.tgz"; + url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz"; + sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; + }; + } + { + name = "prebuild_install___prebuild_install_7.0.1.tgz"; + path = fetchurl { + name = "prebuild_install___prebuild_install_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.0.1.tgz"; + sha512 = "QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg=="; }; } { @@ -3102,7 +3110,7 @@ path = fetchurl { name = "prelude_ls___prelude_ls_1.2.1.tgz"; url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; - sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; + sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; } { @@ -3110,7 +3118,7 @@ path = fetchurl { name = "prelude_ls___prelude_ls_1.1.2.tgz"; url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + sha1 = "IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="; }; } { @@ -3118,7 +3126,7 @@ path = fetchurl { name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; url = "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; - sha1 = "d23d41fe1375646de2d0104d3454a3008802cf7b"; + sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; }; } { @@ -3126,7 +3134,15 @@ path = fetchurl { name = "prettier___prettier_2.2.1.tgz"; url = "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz"; - sha1 = "795a1a78dd52f073da0cd42b21f9c91381923ff5"; + sha512 = "PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q=="; + }; + } + { + name = "prettier___prettier_2.5.1.tgz"; + path = fetchurl { + name = "prettier___prettier_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz"; + sha512 = "vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg=="; }; } { @@ -3134,15 +3150,7 @@ path = fetchurl { name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; - }; - } - { - name = "progress___progress_2.0.1.tgz"; - path = fetchurl { - name = "progress___progress_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz"; - sha1 = "c9242169342b1c29d275889c95734621b1952e31"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; } { @@ -3150,7 +3158,7 @@ path = fetchurl { name = "progress___progress_2.0.3.tgz"; url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; - sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; } { @@ -3158,15 +3166,15 @@ path = fetchurl { name = "prom_client___prom_client_11.5.3.tgz"; url = "https://registry.yarnpkg.com/prom-client/-/prom-client-11.5.3.tgz"; - sha1 = "5fedfce1083bac6c2b223738e966d0e1643756f8"; + sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q=="; }; } { - name = "prop_types___prop_types_15.7.2.tgz"; + name = "prop_types___prop_types_15.8.1.tgz"; path = fetchurl { - name = "prop_types___prop_types_15.7.2.tgz"; - url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; - sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; + name = "prop_types___prop_types_15.8.1.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz"; + sha512 = "oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="; }; } { @@ -3174,7 +3182,7 @@ path = fetchurl { name = "protobufjs___protobufjs_6.11.2.tgz"; url = "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz"; - sha1 = "de39fabd4ed32beaa08e9bb1e30d08544c1edf8b"; + sha512 = "4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw=="; }; } { @@ -3182,7 +3190,7 @@ path = fetchurl { name = "proxy_addr___proxy_addr_2.0.7.tgz"; url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz"; - sha1 = "f19fe69ceab311eeb94b42e70e8c2070f9ba1025"; + sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; } { @@ -3190,7 +3198,7 @@ path = fetchurl { name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; - sha1 = "e102f16ca355424865755d2c9e8ea4f24d58c3e2"; + sha512 = "D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="; }; } { @@ -3198,7 +3206,7 @@ path = fetchurl { name = "ps_tree___ps_tree_1.2.0.tgz"; url = "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.2.0.tgz"; - sha1 = "5e7425b89508736cdd4f2224d028f7bb3f722ebd"; + sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="; }; } { @@ -3206,7 +3214,7 @@ path = fetchurl { name = "pump___pump_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; - sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; } { @@ -3214,7 +3222,7 @@ path = fetchurl { name = "punycode___punycode_2.1.1.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; } { @@ -3222,23 +3230,23 @@ path = fetchurl { name = "puppeteer_cluster___puppeteer_cluster_0.22.0.tgz"; url = "https://registry.yarnpkg.com/puppeteer-cluster/-/puppeteer-cluster-0.22.0.tgz"; - sha1 = "4ab214671f414f15ad6a94a4b61ed0b4172e86e6"; + sha512 = "hmydtMwfVM+idFIDzS8OXetnujHGre7RY3BGL+3njy9+r8Dcu3VALkZHfuBEPf6byKssTCgzxU1BvLczifXd5w=="; }; } { - name = "puppeteer___puppeteer_10.4.0.tgz"; + name = "puppeteer___puppeteer_13.3.2.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_10.4.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.4.0.tgz"; - sha1 = "a6465ff97fda0576c4ac29601406f67e6fea3dc7"; + name = "puppeteer___puppeteer_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.3.2.tgz"; + sha512 = "TIt8/R0eaUwY1c0/O0sCJpSglvGEWVoWFfGZ2dNtxX3eHuBo1ln9abaWfxTjZfsrkYATLSs8oqEdRZpMNnCsvg=="; }; } { - name = "qs___qs_6.7.0.tgz"; + name = "qs___qs_6.9.6.tgz"; path = fetchurl { - name = "qs___qs_6.7.0.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; - sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; + name = "qs___qs_6.9.6.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz"; + sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; }; } { @@ -3246,7 +3254,7 @@ path = fetchurl { name = "queue_microtask___queue_microtask_1.2.3.tgz"; url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; - sha1 = "4929228bbc724dfac43e0efb058caf7b6cfb6243"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; } { @@ -3254,15 +3262,15 @@ path = fetchurl { name = "range_parser___range_parser_1.2.1.tgz"; url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; - sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; } { - name = "raw_body___raw_body_2.4.0.tgz"; + name = "raw_body___raw_body_2.4.2.tgz"; path = fetchurl { - name = "raw_body___raw_body_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; - sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; + name = "raw_body___raw_body_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz"; + sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; }; } { @@ -3270,7 +3278,7 @@ path = fetchurl { name = "rc___rc_1.2.8.tgz"; url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; - sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; } { @@ -3278,7 +3286,7 @@ path = fetchurl { name = "react_is___react_is_16.13.1.tgz"; url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; - sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; + sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; }; } { @@ -3286,7 +3294,7 @@ path = fetchurl { name = "readable_stream___readable_stream_2.3.7.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; } { @@ -3294,7 +3302,7 @@ path = fetchurl { name = "readable_stream___readable_stream_3.6.0.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; } { @@ -3302,15 +3310,15 @@ path = fetchurl { name = "readdirp___readdirp_3.6.0.tgz"; url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz"; - sha1 = "74a370bd857116e245b29cc97340cd431a02a6c7"; + sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; } { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.4.1.tgz"; path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; - sha1 = "7ef352ae8d159e758c0eadca6f8fcb4eef07be26"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz"; + sha512 = "pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ=="; }; } { @@ -3318,15 +3326,7 @@ path = fetchurl { name = "regexpp___regexpp_3.2.0.tgz"; url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; - sha1 = "0425a2768d8f23bad70ca4b90461fa2f1213e1b2"; - }; - } - { - name = "regextras___regextras_0.7.1.tgz"; - path = fetchurl { - name = "regextras___regextras_0.7.1.tgz"; - url = "https://registry.yarnpkg.com/regextras/-/regextras-0.7.1.tgz"; - sha1 = "be95719d5f43f9ef0b9fa07ad89b7c606995a3b2"; + sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; } { @@ -3334,7 +3334,7 @@ path = fetchurl { name = "regextras___regextras_0.8.0.tgz"; url = "https://registry.yarnpkg.com/regextras/-/regextras-0.8.0.tgz"; - sha1 = "ec0f99853d4912839321172f608b544814b02217"; + sha512 = "k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ=="; }; } { @@ -3342,7 +3342,7 @@ path = fetchurl { name = "require_directory___require_directory_2.1.1.tgz"; url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + sha1 = "jGStX9MNqxyXbiNE/+f3kqam30I="; }; } { @@ -3350,7 +3350,7 @@ path = fetchurl { name = "require_from_string___require_from_string_2.0.2.tgz"; url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; - sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; + sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; } { @@ -3358,15 +3358,15 @@ path = fetchurl { name = "resolve_from___resolve_from_4.0.0.tgz"; url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; - sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; }; } { - name = "resolve___resolve_1.20.0.tgz"; + name = "resolve___resolve_1.22.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.20.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; - sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + name = "resolve___resolve_1.22.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz"; + sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; }; } { @@ -3374,7 +3374,7 @@ path = fetchurl { name = "resolve___resolve_2.0.0_next.3.tgz"; url = "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz"; - sha1 = "d41016293d4a8586a39ca5d9b5f15cbea1f55e46"; + sha512 = "W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q=="; }; } { @@ -3382,7 +3382,7 @@ path = fetchurl { name = "restore_cursor___restore_cursor_3.1.0.tgz"; url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; - sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; + sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; }; } { @@ -3390,7 +3390,15 @@ path = fetchurl { name = "reusify___reusify_1.0.4.tgz"; url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; - sha1 = "90da382b1e126efc02146e90845a88db12925d76"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + }; + } + { + name = "rfdc___rfdc_1.3.0.tgz"; + path = fetchurl { + name = "rfdc___rfdc_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz"; + sha512 = "V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="; }; } { @@ -3398,7 +3406,7 @@ path = fetchurl { name = "rimraf___rimraf_3.0.2.tgz"; url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; - sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; } { @@ -3406,15 +3414,15 @@ path = fetchurl { name = "run_parallel___run_parallel_1.2.0.tgz"; url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; - sha1 = "66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; }; } { - name = "rxjs___rxjs_6.6.7.tgz"; + name = "rxjs___rxjs_7.5.2.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.6.7.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz"; - sha1 = "90ac018acabf491bf65044235d5863c4dab804c9"; + name = "rxjs___rxjs_7.5.2.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.2.tgz"; + sha512 = "PwDt186XaL3QN5qXj/H9DGyHhP3/RYYgZZwqBv9Tv8rsAaiwFH1IsJJlcgD37J7UW5a6O67qX0KWKS3/pu0m4w=="; }; } { @@ -3422,7 +3430,7 @@ path = fetchurl { name = "safe_buffer___safe_buffer_5.1.2.tgz"; url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; } { @@ -3430,7 +3438,7 @@ path = fetchurl { name = "safe_buffer___safe_buffer_5.2.1.tgz"; url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; } { @@ -3438,7 +3446,15 @@ path = fetchurl { name = "safe_stable_stringify___safe_stable_stringify_1.1.1.tgz"; url = "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz"; - sha1 = "c8a220ab525cd94e60ebf47ddc404d610dc5d84a"; + sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="; + }; + } + { + name = "safe_stable_stringify___safe_stable_stringify_2.3.1.tgz"; + path = fetchurl { + name = "safe_stable_stringify___safe_stable_stringify_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz"; + sha512 = "kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg=="; }; } { @@ -3446,7 +3462,7 @@ path = fetchurl { name = "safer_buffer___safer_buffer_2.1.2.tgz"; url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; } { @@ -3454,7 +3470,7 @@ path = fetchurl { name = "semver_compare___semver_compare_1.0.0.tgz"; url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; - sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + sha1 = "De4hahyUGrN+nvsXiPavxf9VN/w="; }; } { @@ -3462,7 +3478,7 @@ path = fetchurl { name = "semver_regex___semver_regex_3.1.3.tgz"; url = "https://registry.yarnpkg.com/semver-regex/-/semver-regex-3.1.3.tgz"; - sha1 = "b2bcc6f97f63269f286994e297e229b6245d0dc3"; + sha512 = "Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ=="; }; } { @@ -3470,7 +3486,7 @@ path = fetchurl { name = "semver___semver_5.7.1.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; } { @@ -3478,7 +3494,7 @@ path = fetchurl { name = "semver___semver_6.3.0.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; } { @@ -3486,23 +3502,23 @@ path = fetchurl { name = "semver___semver_7.3.5.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; - sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; } { - name = "send___send_0.17.1.tgz"; + name = "send___send_0.17.2.tgz"; path = fetchurl { - name = "send___send_0.17.1.tgz"; - url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; - sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; + name = "send___send_0.17.2.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz"; + sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; }; } { - name = "serve_static___serve_static_1.14.1.tgz"; + name = "serve_static___serve_static_1.14.2.tgz"; path = fetchurl { - name = "serve_static___serve_static_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; - sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; + name = "serve_static___serve_static_1.14.2.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz"; + sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; }; } { @@ -3510,15 +3526,23 @@ path = fetchurl { name = "set_blocking___set_blocking_2.0.0.tgz"; url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + sha1 = "BF+XgtARrppoA93TgrJDkrPYkPc="; }; } { - name = "setprototypeof___setprototypeof_1.1.1.tgz"; + name = "setprototypeof___setprototypeof_1.2.0.tgz"; path = fetchurl { - name = "setprototypeof___setprototypeof_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; + name = "setprototypeof___setprototypeof_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz"; + sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; + }; + } + { + name = "sharp___sharp_0.29.3.tgz"; + path = fetchurl { + name = "sharp___sharp_0.29.3.tgz"; + url = "https://registry.yarnpkg.com/sharp/-/sharp-0.29.3.tgz"; + sha512 = "fKWUuOw77E4nhpyzCCJR1ayrttHoFHBT2U/kR/qEMRhvPEcluG4BKj324+SCO1e84+knXHwhJ1HHJGnUt4ElGA=="; }; } { @@ -3526,7 +3550,7 @@ path = fetchurl { name = "shebang_command___shebang_command_2.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; - sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; } { @@ -3534,7 +3558,7 @@ path = fetchurl { name = "shebang_regex___shebang_regex_3.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; } { @@ -3542,15 +3566,15 @@ path = fetchurl { name = "side_channel___side_channel_1.0.4.tgz"; url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz"; - sha1 = "efce5c8fdc104ee751b25c58d4290011fa5ea2cf"; + sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; }; } { - name = "signal_exit___signal_exit_3.0.5.tgz"; + name = "signal_exit___signal_exit_3.0.6.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz"; - sha1 = "9e3e8cc0c75a99472b44321033a7702e7738252f"; + name = "signal_exit___signal_exit_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz"; + sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; }; } { @@ -3558,15 +3582,23 @@ path = fetchurl { name = "simple_concat___simple_concat_1.0.1.tgz"; url = "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz"; - sha1 = "f46976082ba35c2263f1c8ab5edfe26c41c9552f"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; }; } { - name = "simple_get___simple_get_3.1.0.tgz"; + name = "simple_get___simple_get_3.1.1.tgz"; path = fetchurl { - name = "simple_get___simple_get_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz"; - sha1 = "b45be062435e50d159540b576202ceec40b9c6b3"; + name = "simple_get___simple_get_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.1.tgz"; + sha512 = "CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA=="; + }; + } + { + name = "simple_get___simple_get_4.0.1.tgz"; + path = fetchurl { + name = "simple_get___simple_get_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz"; + sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; } { @@ -3574,7 +3606,7 @@ path = fetchurl { name = "simple_swizzle___simple_swizzle_0.2.2.tgz"; url = "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; - sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + sha1 = "pNprY1/8zMoz9w0Xy5JZLeleVXo="; }; } { @@ -3582,7 +3614,7 @@ path = fetchurl { name = "slash___slash_3.0.0.tgz"; url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; - sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; } { @@ -3590,7 +3622,7 @@ path = fetchurl { name = "slice_ansi___slice_ansi_3.0.0.tgz"; url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz"; - sha1 = "31ddc10930a1b7e0b67b08c96c2f49b77a789787"; + sha512 = "pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="; }; } { @@ -3598,7 +3630,7 @@ path = fetchurl { name = "slice_ansi___slice_ansi_4.0.0.tgz"; url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; - sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; + sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; }; } { @@ -3606,7 +3638,7 @@ path = fetchurl { name = "source_map___source_map_0.6.1.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; } { @@ -3614,7 +3646,7 @@ path = fetchurl { name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; - sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; }; } { @@ -3622,15 +3654,15 @@ path = fetchurl { name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; - sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.10.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.11.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.10.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; - sha1 = "0d9becccde7003d6c658d487dd48a32f0bf3014b"; + name = "spdx_license_ids___spdx_license_ids_3.0.11.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"; + sha512 = "Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="; }; } { @@ -3638,7 +3670,7 @@ path = fetchurl { name = "split___split_0.3.3.tgz"; url = "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz"; - sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + sha1 = "zQ7qXmOiEd//frDwkcQTPi0N0o8="; }; } { @@ -3646,7 +3678,7 @@ path = fetchurl { name = "sprintf_js___sprintf_js_1.0.3.tgz"; url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + sha1 = "BOaSb2YolTVPPdAVIDYzuFcpfiw="; }; } { @@ -3654,7 +3686,7 @@ path = fetchurl { name = "stack_trace___stack_trace_0.0.10.tgz"; url = "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz"; - sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + sha1 = "VHxws0fo0ytOEI6hoqFZ5f3eGcA="; }; } { @@ -3662,7 +3694,7 @@ path = fetchurl { name = "statuses___statuses_1.5.0.tgz"; url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; - sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + sha1 = "Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="; }; } { @@ -3670,7 +3702,7 @@ path = fetchurl { name = "stream_combiner___stream_combiner_0.0.4.tgz"; url = "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz"; - sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + sha1 = "TV5DPBhSYd3mI8o/RMWGvPXErRQ="; }; } { @@ -3678,7 +3710,7 @@ path = fetchurl { name = "stream_meter___stream_meter_1.0.4.tgz"; url = "https://registry.yarnpkg.com/stream-meter/-/stream-meter-1.0.4.tgz"; - sha1 = "52af95aa5ea760a2491716704dbff90f73afdd1d"; + sha1 = "Uq+Vql6nYKJJFxZwTb/5D3Ov3R0="; }; } { @@ -3686,7 +3718,7 @@ path = fetchurl { name = "string_argv___string_argv_0.3.1.tgz"; url = "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz"; - sha1 = "95e2fbec0427ae19184935f816d74aaa4c5c19da"; + sha512 = "a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg=="; }; } { @@ -3694,7 +3726,7 @@ path = fetchurl { name = "string_argv___string_argv_0.1.2.tgz"; url = "https://registry.yarnpkg.com/string-argv/-/string-argv-0.1.2.tgz"; - sha1 = "c5b7bc03fb2b11983ba3a72333dd0559e77e4738"; + sha512 = "mBqPGEOMNJKXRo7z0keX0wlAhbBAjilUdPW13nN0PecVryZxdHIeM7TqbsSUA7VYuS00HGC6mojP7DlQzfa9ZA=="; }; } { @@ -3702,15 +3734,7 @@ path = fetchurl { name = "string_width___string_width_1.0.2.tgz"; url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - } - { - name = "string_width___string_width_2.1.1.tgz"; - path = fetchurl { - name = "string_width___string_width_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; - sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + sha1 = "EYvfW4zcUaKn5w0hHgfisLmxB9M="; }; } { @@ -3718,7 +3742,7 @@ path = fetchurl { name = "string_width___string_width_4.2.3.tgz"; url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; - sha1 = "269c7117d27b05ad2e536830a8ec895ef9c6d010"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; } { @@ -3726,7 +3750,7 @@ path = fetchurl { name = "string.prototype.matchall___string.prototype.matchall_4.0.6.tgz"; url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz"; - sha1 = "5abb5dabc94c7b0ea2380f65ba610b3a544b15fa"; + sha512 = "6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg=="; }; } { @@ -3734,7 +3758,7 @@ path = fetchurl { name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; - sha1 = "e75ae90c2942c63504686c18b287b4a0b1a45f80"; + sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; }; } { @@ -3742,7 +3766,7 @@ path = fetchurl { name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; - sha1 = "b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"; + sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; }; } { @@ -3750,7 +3774,7 @@ path = fetchurl { name = "string_decoder___string_decoder_1.3.0.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; - sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; } { @@ -3758,7 +3782,7 @@ path = fetchurl { name = "string_decoder___string_decoder_1.1.1.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; } { @@ -3766,7 +3790,7 @@ path = fetchurl { name = "stringify_object___stringify_object_3.3.0.tgz"; url = "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz"; - sha1 = "703065aefca19300d3ce88af4f5b3956d7556629"; + sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; }; } { @@ -3774,15 +3798,7 @@ path = fetchurl { name = "strip_ansi___strip_ansi_3.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - } - { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + sha1 = "ajhfuIU9lS1f8F0Oiq+UJ43GPc8="; }; } { @@ -3790,7 +3806,7 @@ path = fetchurl { name = "strip_ansi___strip_ansi_6.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha1 = "9e26c63d30f53443e9489495b2105d37b67a85d9"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; } { @@ -3798,7 +3814,7 @@ path = fetchurl { name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; - sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; + sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; }; } { @@ -3806,7 +3822,7 @@ path = fetchurl { name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; - sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; }; } { @@ -3814,7 +3830,7 @@ path = fetchurl { name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + sha1 = "PFMZQukIwml8DsNEhYwobHygpgo="; }; } { @@ -3822,7 +3838,7 @@ path = fetchurl { name = "supports_color___supports_color_8.1.1.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz"; - sha1 = "cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; }; } { @@ -3830,7 +3846,7 @@ path = fetchurl { name = "supports_color___supports_color_5.5.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; } { @@ -3838,23 +3854,23 @@ path = fetchurl { name = "supports_color___supports_color_7.2.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; - sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; } { - name = "table___table_6.7.2.tgz"; + name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; path = fetchurl { - name = "table___table_6.7.2.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz"; - sha1 = "a8d39b9f5966693ca8b0feba270a78722cbaf3b0"; + name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; } { - name = "tar_fs___tar_fs_2.0.0.tgz"; + name = "table___table_6.8.0.tgz"; path = fetchurl { - name = "tar_fs___tar_fs_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz"; - sha1 = "677700fc0c8b337a78bee3623fdc235f21d7afad"; + name = "table___table_6.8.0.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz"; + sha512 = "s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA=="; }; } { @@ -3862,7 +3878,7 @@ path = fetchurl { name = "tar_fs___tar_fs_2.1.1.tgz"; url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz"; - sha1 = "489a15ab85f1f0befabb370b7de4f9eb5cbe8784"; + sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; }; } { @@ -3870,7 +3886,7 @@ path = fetchurl { name = "tar_stream___tar_stream_2.2.0.tgz"; url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; - sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; }; } { @@ -3878,7 +3894,7 @@ path = fetchurl { name = "tdigest___tdigest_0.1.1.tgz"; url = "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.1.tgz"; - sha1 = "2e3cb2c39ea449e55d1e6cd91117accca4588021"; + sha1 = "Ljyyw56kSeVdHmzZEReszKRYgCE="; }; } { @@ -3886,7 +3902,7 @@ path = fetchurl { name = "text_hex___text_hex_1.0.0.tgz"; url = "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz"; - sha1 = "69dc9c1b17446ee79a92bf5b884bb4b9127506f5"; + sha512 = "uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="; }; } { @@ -3894,7 +3910,7 @@ path = fetchurl { name = "text_table___text_table_0.2.0.tgz"; url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; - sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + sha1 = "f17oI66AUgfACvLfSoTsP8+lcLQ="; }; } { @@ -3902,7 +3918,7 @@ path = fetchurl { name = "through___through_2.3.8.tgz"; url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; }; } { @@ -3910,7 +3926,7 @@ path = fetchurl { name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + sha1 = "3F5pjL0HkmW8c+A3doGk5Og/YW4="; }; } { @@ -3918,15 +3934,15 @@ path = fetchurl { name = "to_regex_range___to_regex_range_5.0.1.tgz"; url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; } { - name = "toidentifier___toidentifier_1.0.0.tgz"; + name = "toidentifier___toidentifier_1.0.1.tgz"; path = fetchurl { - name = "toidentifier___toidentifier_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; - sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; + name = "toidentifier___toidentifier_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz"; + sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; }; } { @@ -3934,7 +3950,7 @@ path = fetchurl { name = "tr46___tr46_0.0.3.tgz"; url = "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz"; - sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + sha1 = "gYT9NH2snNwYWZLzpmIuFLnZq2o="; }; } { @@ -3942,23 +3958,23 @@ path = fetchurl { name = "triple_beam___triple_beam_1.3.0.tgz"; url = "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz"; - sha1 = "a595214c7298db8339eeeee083e4d10bd8cb8dd9"; + sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; } { - name = "tsc_watch___tsc_watch_4.5.0.tgz"; + name = "tsc_watch___tsc_watch_4.6.0.tgz"; path = fetchurl { - name = "tsc_watch___tsc_watch_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.5.0.tgz"; - sha1 = "d6884b932822b2c2ccd37f1c1f3748304566a474"; + name = "tsc_watch___tsc_watch_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/tsc-watch/-/tsc-watch-4.6.0.tgz"; + sha512 = "DRMADjFe44EDWb+YMIOj4b83UrU6le27L3/o0/9FlmA01ikFd5Dl9RD5h1hpeh0mQdIqXvwfHZszCcjhH3bAmQ=="; }; } { - name = "tslib___tslib_2.1.0.tgz"; + name = "tslib___tslib_2.3.1.tgz"; path = fetchurl { - name = "tslib___tslib_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz"; - sha1 = "da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"; + name = "tslib___tslib_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz"; + sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; }; } { @@ -3966,7 +3982,7 @@ path = fetchurl { name = "tslib___tslib_1.14.1.tgz"; url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; - sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; } { @@ -3974,7 +3990,7 @@ path = fetchurl { name = "tsutils___tsutils_3.21.0.tgz"; url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz"; - sha1 = "b48717d394cea6c1e096983eed58e9d61715b623"; + sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; }; } { @@ -3982,7 +3998,7 @@ path = fetchurl { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + sha1 = "J6XeoGs2sEoKmWZ3SykIaPD8QP0="; }; } { @@ -3990,7 +4006,7 @@ path = fetchurl { name = "type_check___type_check_0.4.0.tgz"; url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; - sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; + sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; }; } { @@ -3998,7 +4014,7 @@ path = fetchurl { name = "type_check___type_check_0.3.2.tgz"; url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + sha1 = "WITKtRLPHTVeP7eE8wgEsrUg23I="; }; } { @@ -4006,7 +4022,7 @@ path = fetchurl { name = "type_fest___type_fest_0.20.2.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; }; } { @@ -4014,15 +4030,7 @@ path = fetchurl { name = "type_fest___type_fest_0.21.3.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz"; - sha1 = "d260a24b0198436e133fa26a524a6d65fa3b2e37"; - }; - } - { - name = "type_fest___type_fest_0.8.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.8.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; - sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; + sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; }; } { @@ -4030,23 +4038,23 @@ path = fetchurl { name = "type_is___type_is_1.6.18.tgz"; url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; - sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; } { - name = "typescript___typescript_4.3.4.tgz"; + name = "typescript___typescript_4.4.4.tgz"; path = fetchurl { - name = "typescript___typescript_4.3.4.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.3.4.tgz"; - sha1 = "3f85b986945bcf31071decdd96cf8bfa65f9dcbc"; + name = "typescript___typescript_4.4.4.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz"; + sha512 = "DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA=="; }; } { - name = "typescript___typescript_4.4.3.tgz"; + name = "typescript___typescript_4.5.5.tgz"; path = fetchurl { - name = "typescript___typescript_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz"; - sha1 = "bdc5407caa2b109efd4f82fe130656f977a29324"; + name = "typescript___typescript_4.5.5.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz"; + sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; }; } { @@ -4054,15 +4062,15 @@ path = fetchurl { name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; - sha1 = "085e215625ec3162574dc8859abee78a59b14471"; + sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; }; } { - name = "unbzip2_stream___unbzip2_stream_1.3.3.tgz"; + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; path = fetchurl { - name = "unbzip2_stream___unbzip2_stream_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz"; - sha1 = "d156d205e670d8d8c393e1c02ebd506422873f6a"; + name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; + sha512 = "mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg=="; }; } { @@ -4070,7 +4078,7 @@ path = fetchurl { name = "unique_filename___unique_filename_1.1.1.tgz"; url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; - sha1 = "1d69769369ada0583103a1e6ae87681b56573230"; + sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; }; } { @@ -4078,7 +4086,7 @@ path = fetchurl { name = "unique_slug___unique_slug_2.0.2.tgz"; url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz"; - sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c"; + sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; }; } { @@ -4086,7 +4094,7 @@ path = fetchurl { name = "universalify___universalify_2.0.0.tgz"; url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; - sha1 = "75a4984efedc4b08975c5aeb73f530d02df25717"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; }; } { @@ -4094,7 +4102,7 @@ path = fetchurl { name = "unpipe___unpipe_1.0.0.tgz"; url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + sha1 = "sr9O6FFKrmFltIF4KdIbLvSZBOw="; }; } { @@ -4102,15 +4110,15 @@ path = fetchurl { name = "uri_js___uri_js_4.4.1.tgz"; url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; - sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; } { - name = "url_value_parser___url_value_parser_2.0.3.tgz"; + name = "url_value_parser___url_value_parser_2.1.0.tgz"; path = fetchurl { - name = "url_value_parser___url_value_parser_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.0.3.tgz"; - sha1 = "cd4b8d6754e458d65e8125260c09718d926e6e21"; + name = "url_value_parser___url_value_parser_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/url-value-parser/-/url-value-parser-2.1.0.tgz"; + sha512 = "gIYPWXujdUdwd/9TGCHTf5Vvgw6lOxjE5Q/k+7WNByYyS0vW5WX0k+xuVlhvPq6gRNhzXVv/ezC+OfeAet5Kcw=="; }; } { @@ -4118,7 +4126,7 @@ path = fetchurl { name = "util_deprecate___util_deprecate_1.0.2.tgz"; url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; }; } { @@ -4126,7 +4134,7 @@ path = fetchurl { name = "utils_merge___utils_merge_1.0.1.tgz"; url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + sha1 = "n5VxD1CiZ5R7LMwSR0HBAoQn5xM="; }; } { @@ -4134,7 +4142,7 @@ path = fetchurl { name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; - sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; + sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; }; } { @@ -4142,7 +4150,7 @@ path = fetchurl { name = "vary___vary_1.1.2.tgz"; url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + sha1 = "IpnwLG3tMNSllhsLn3RSShj2NPw="; }; } { @@ -4150,7 +4158,7 @@ path = fetchurl { name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + sha1 = "JFNCdeKnvGvnvIZhHMFq4KVlSHE="; }; } { @@ -4158,7 +4166,7 @@ path = fetchurl { name = "whatwg_url___whatwg_url_5.0.0.tgz"; url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; + sha1 = "lmRU6HZUYuN2RNNib2dCzotwll0="; }; } { @@ -4166,7 +4174,7 @@ path = fetchurl { name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; - sha1 = "13757bc89b209b049fe5d86430e21cf40a89a8e6"; + sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; } { @@ -4174,7 +4182,7 @@ path = fetchurl { name = "which_pm_runs___which_pm_runs_1.0.0.tgz"; url = "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz"; - sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; + sha1 = "Zws6+8VS4LVd9rd4DKdGFfI60cs="; }; } { @@ -4182,31 +4190,31 @@ path = fetchurl { name = "which___which_2.0.2.tgz"; url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; - sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; } { - name = "wide_align___wide_align_1.1.3.tgz"; + name = "wide_align___wide_align_1.1.5.tgz"; path = fetchurl { - name = "wide_align___wide_align_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; - sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; + name = "wide_align___wide_align_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; } { - name = "winston_transport___winston_transport_4.4.0.tgz"; + name = "winston_transport___winston_transport_4.4.2.tgz"; path = fetchurl { - name = "winston_transport___winston_transport_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz"; - sha1 = "17af518daa690d5b2ecccaa7acf7b20ca7925e59"; + name = "winston_transport___winston_transport_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.2.tgz"; + sha512 = "9jmhltAr5ygt5usgUTQbEiw/7RYXpyUbEAFRCSicIacpUzPkrnQsQZSPGEI12aLK9Jth4zNcYJx3Cvznwrl8pw=="; }; } { - name = "winston___winston_3.3.3.tgz"; + name = "winston___winston_3.5.1.tgz"; path = fetchurl { - name = "winston___winston_3.3.3.tgz"; - url = "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz"; - sha1 = "ae6172042cafb29786afa3d09c8ff833ab7c9170"; + name = "winston___winston_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/winston/-/winston-3.5.1.tgz"; + sha512 = "tbRtVy+vsSSCLcZq/8nXZaOie/S2tPXPFt4be/Q3vI/WtYwm7rrwidxVw2GRa38FIXcJ1kUM6MOZ9Jmnk3F3UA=="; }; } { @@ -4214,7 +4222,7 @@ path = fetchurl { name = "word_wrap___word_wrap_1.2.3.tgz"; url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; - sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; } { @@ -4222,7 +4230,7 @@ path = fetchurl { name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; - sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53"; + sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; }; } { @@ -4230,7 +4238,7 @@ path = fetchurl { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; } { @@ -4238,15 +4246,15 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; }; } { - name = "ws___ws_7.4.6.tgz"; + name = "ws___ws_8.5.0.tgz"; path = fetchurl { - name = "ws___ws_7.4.6.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz"; - sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"; + name = "ws___ws_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz"; + sha512 = "BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg=="; }; } { @@ -4254,7 +4262,7 @@ path = fetchurl { name = "y18n___y18n_5.0.8.tgz"; url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; - sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; } { @@ -4262,7 +4270,7 @@ path = fetchurl { name = "yallist___yallist_4.0.0.tgz"; url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; } { @@ -4270,7 +4278,7 @@ path = fetchurl { name = "yaml___yaml_1.10.2.tgz"; url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz"; - sha1 = "2301c5ffbf12b467de8da2333a459e29e7920e4b"; + sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; } { @@ -4278,7 +4286,7 @@ path = fetchurl { name = "yargs_parser___yargs_parser_20.2.9.tgz"; url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; + sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; } { @@ -4286,7 +4294,7 @@ path = fetchurl { name = "yargs___yargs_16.2.0.tgz"; url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; - sha1 = "1c82bf0f6b6a66eafce7ef30e376f49a12477f66"; + sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; } { @@ -4294,7 +4302,7 @@ path = fetchurl { name = "yauzl___yauzl_2.10.0.tgz"; url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; - sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + sha1 = "x+sXyT4RLLEIb6bY5R+wZnt5pfk="; }; } { @@ -4302,7 +4310,7 @@ path = fetchurl { name = "yocto_queue___yocto_queue_0.1.0.tgz"; url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; - sha1 = "0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"; + sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; }; } ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index bb6c0b7f3846..2b3ae9f64de8 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGo117Module, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: -buildGo117Module rec { +buildGoModule rec { pname = "grafana"; - version = "8.3.4"; + version = "8.4.4"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,15 +10,15 @@ buildGo117Module rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-Ikvl8jsStMGDIc0y4cKWwyXJHTu4V4nCKiLUyERjRsw="; + sha256 = "sha256-WLmmf2GlP7axuYj0TLJlDwe1k/9xNQbLvAggG+AshKg="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-UI+NouSRwQVmAgx19OHhWcoDLj9KD05xh57/1gLvWmA="; + sha256 = "sha256-eH6L7X1WvvL+9+R9FrpvVMxVJYcrHicaLkH2LUJs3AQ="; }; - vendorSha256 = "sha256-gaY6liueEmngxjPSegmycrLpfsB0p1YWWrNGbzpHHOc="; + vendorSha256 = "sha256-RugV5cHlpR739CA1C/7FkXasvkv18m7pPsK6mxfSkC0="; nativeBuildInputs = [ wire ]; diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index 13036f81de6d..d11add105f6b 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.72.3"; + version = "0.72.8"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o2+5kMHDigrLXjwdkMKSujW/Lov72WmRvw7/aew3s9w="; + sha256 = "sha256-IejLCi1TJ2Q0lpA2ZK3hea18YX483FV4IisYRRVD1Vg="; }; nativeBuildInputs = [ makeWrapper ]; checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorSha256 = "sha256-h2z+R16XS3AJdG/4gZRLton1DKYrFElGXNjOaekAC0Q="; + vendorSha256 = "sha256-4hdy+Yr9EoUjJ4+pJ2ZEPGlnq+4sx5JLm92eFFav6tU="; subPackages = [ "." ]; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 28ff8ac80705..258247c34f47 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perlPackages -, python2, ruby, jre, nettools, bc +, python3, ruby, jre, nettools, bc }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { perlPackages.ListMoreUtils perlPackages.LWP perlPackages.DBDPg - python2 + python3 ruby jre # tests @@ -89,6 +89,10 @@ stdenv.mkDerivation rec { sed -i '/ENV{PATH}/d' node/lib/Munin/Node/Service.pm ''; + # Disable parallel build, errors: + # Can't locate Munin/Common/Defaults.pm in @INC ... + enableParallelBuilding = false; + # DESTDIR shouldn't be needed (and shouldn't have worked), but munin # developers have forgotten to use PREFIX everywhere, so we use DESTDIR to # ensure that everything is installed in $out. @@ -97,7 +101,7 @@ stdenv.mkDerivation rec { "DESTDIR=$(out)" "PERLLIB=$(out)/${perlPackages.perl.libPrefix}" "PERL=${perlPackages.perl.outPath}/bin/perl" - "PYTHON=${python2.outPath}/bin/python" + "PYTHON=${python3.interpreter}" "RUBY=${ruby.outPath}/bin/ruby" "JAVARUN=${jre.outPath}/bin/java" "PLUGINUSER=munin" diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index ed6afbcd2524..b55b47cd7afd 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.19.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "sha256-HNvchmP975k971EYpDFCqxx8w1Oq/IIEy+r1il0PjmQ="; + sha256 = "sha256-RGl6Fgm9FVaZQMWHl93RwHvrScz69VgbIyDBqMh3PVo="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 251c977bd4df..e42469f04785 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,20 +1,22 @@ -{ lib, go, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "alertmanager"; - version = "0.21.0"; + version = "0.24.0"; rev = "v${version}"; - goPackagePath = "github.com/prometheus/alertmanager"; - src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "0zrzyaqs73pz4rmj4xaj15x4n1542m0nb7jqm2j77k07j75r5w41"; + sha256 = "sha256-hoCE0wD9/Sh/oBce7kCg/wG44FmMs6dAKnEYP+2sH0w="; }; - ldflags = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in [ + vendorSha256 = "sha256-ePb9qdCTEHHIV6JlbrBlaZjD5APwQuoGloO88W5S7Oc="; + + subPackages = [ "cmd/alertmanager" "cmd/amtool" ]; + + ldflags = let t = "github.com/prometheus/common/version"; in [ "-X ${t}.Version=${version}" "-X ${t}.Revision=${src.rev}" "-X ${t}.Branch=unknown" @@ -28,6 +30,8 @@ buildGoPackage rec { postInstall = '' $out/bin/amtool --completion-script-bash > amtool.bash installShellCompletion amtool.bash + $out/bin/amtool --completion-script-zsh > amtool.zsh + installShellCompletion amtool.zsh ''; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix index 64105c9c58f2..c2f903228503 100644 --- a/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/apcupsd-exporter.nix @@ -2,18 +2,16 @@ buildGoModule rec { pname = "apcupsd-exporter"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mdlayher"; repo = "apcupsd_exporter"; rev = "v${version}"; - sha256 = "0gjj23qdjs7rqimq95rbfw43m4l6g73j840svxjlmpd1vzzz2v2q"; + sha256 = "sha256-c0LsUqpJbmWQmbmSGdEy7Bbk20my6iWNLeqtU5BjYlw="; }; - vendorSha256 = "09x8y8pmgfn897hvnk122ry460y12b8a7y5fafri5wn9vxab9r82"; - - doCheck = false; + vendorSha256 = "sha256-bvLwHLviIAGmxYY1O0wFDWAMginEUklicrbjIbbPuUw="; passthru.tests = { inherit (nixosTests.prometheus-exporters) apcupsd; }; diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/servers/monitoring/prometheus/bird-exporter.nix index f15f7b6e0057..caa17ce97fc4 100644 --- a/pkgs/servers/monitoring/prometheus/bird-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bird-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bird-exporter"; - version = "1.2.6"; + version = "1.4.0"; src = fetchFromGitHub { owner = "czerwonk"; repo = "bird_exporter"; rev = version; - sha256 = "sha256-zQKdO1E5VKZaQLNOfL3e/iCdugwNx3xFy7R7vun/Efs="; + sha256 = "sha256-N/00+2OrP0BsEazD9bHk+w/xO9E6sFT6nC0MM4n9lR4="; }; - vendorSha256 = "sha256-o/OVWALLOw7eNH3xsQlQ5ZNFV3l9iD8lhyckBt6Qn3E="; + vendorSha256 = "sha256-9xKMwHNgPMtC+J3mwwUNSJnpMGttpaWF6l8gv0YtvHE="; passthru.tests = { inherit (nixosTests.prometheus-exporters) bird; }; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index da235ff96fb2..2349bac177c9 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "blackbox_exporter"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "1lrabbp6nsd9h3hs3y5a37yl4g8zzkv0m3vhz2vrir3wmfn07n4g"; + sha256 = "sha256-Y3HdFIChkQVooxy2I2Gbqw3WLHsI4Zm+osHTzFluRZA="; }; - vendorSha256 = "1wi9dmbxb6i1qglnp1v0lkqpp7l29lrbsg4lvx052nkcwkgq8g1y"; + vendorSha256 = "sha256-KFLR0In4txQQp5dt8P0yAFtf82b4SBq2xMnlz+vMuuU="; # dns-lookup is performed for the tests doCheck = false; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 931e5f7ffeae..25053e837949 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -9,6 +9,24 @@ , mkYarnPackage , nixosTests , fetchpatch +, enableAWS ? true +, enableAzure ? true +, enableConsul ? true +, enableDigitalOcean ? true +, enableEureka ? true +, enableGCE ? true +, enableHetzner ? true +, enableKubernetes ? true +, enableLinode ? true +, enableMarathon ? true +, enableMoby ? true +, enableOpenstack ? true +, enablePuppetDB ? true +, enableScaleway ? true +, enableTriton ? true +, enableUyuni ? true +, enableXDS ? true +, enableZookeeper ? true }: let @@ -92,6 +110,44 @@ buildGoModule rec { # webui-codemirror ln -s ${codemirror}/dist web/ui/module/codemirror-promql/dist ln -s ${codemirror}/lib web/ui/module/codemirror-promql/lib + + # Disable some service discovery to shrink binaries. + ${lib.optionalString (!enableAWS) + "sed -i -e '/register aws/d' discovery/install/install.go"} + ${lib.optionalString (!enableAzure) + "sed -i -e '/register azure/d' discovery/install/install.go"} + ${lib.optionalString (!enableConsul) + "sed -i -e '/register consul/d' discovery/install/install.go"} + ${lib.optionalString (!enableDigitalOcean) + "sed -i -e '/register digitalocean/d' discovery/install/install.go"} + ${lib.optionalString (!enableEureka) + "sed -i -e '/register eureka/d' discovery/install/install.go"} + ${lib.optionalString (!enableGCE) + "sed -i -e '/register gce/d' discovery/install/install.go"} + ${lib.optionalString (!enableHetzner) + "sed -i -e '/register hetzner/d' discovery/install/install.go"} + ${lib.optionalString (!enableKubernetes) + "sed -i -e '/register kubernetes/d' discovery/install/install.go"} + ${lib.optionalString (!enableLinode) + "sed -i -e '/register linode/d' discovery/install/install.go"} + ${lib.optionalString (!enableMarathon) + "sed -i -e '/register marathon/d' discovery/install/install.go"} + ${lib.optionalString (!enableMoby) + "sed -i -e '/register moby/d' discovery/install/install.go"} + ${lib.optionalString (!enableOpenstack) + "sed -i -e '/register openstack/d' discovery/install/install.go"} + ${lib.optionalString (!enablePuppetDB) + "sed -i -e '/register puppetdb/d' discovery/install/install.go"} + ${lib.optionalString (!enableScaleway) + "sed -i -e '/register scaleway/d' discovery/install/install.go"} + ${lib.optionalString (!enableTriton) + "sed -i -e '/register triton/d' discovery/install/install.go"} + ${lib.optionalString (!enableUyuni) + "sed -i -e '/register uyuni/d' discovery/install/install.go"} + ${lib.optionalString (!enableXDS) + "sed -i -e '/register xds/d' discovery/install/install.go"} + ${lib.optionalString (!enableZookeeper) + "sed -i -e '/register zookeeper/d' discovery/install/install.go"} ''; tags = [ "builtinassets" ]; diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-exporter/default.nix new file mode 100644 index 000000000000..98848ee67022 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/default.nix @@ -0,0 +1,58 @@ +{ poetry2nix, pkgs, lib }: + +let + inherit (poetry2nix.mkPoetryPackages { + projectDir = ./.; + overrides = [ + poetry2nix.defaultPoetryOverrides + (import ./poetry-git-overlay.nix { inherit pkgs; }) + (self: super: { + dmarc-metrics-exporter = super.dmarc-metrics-exporter.overridePythonAttrs ({ meta ? {}, ... }: { + meta = with lib; meta // { + license = licenses.mit; + homepage = "https://github.com/jgosmann/dmarc-metrics-exporter/"; + description = " Export Prometheus metrics from DMARC reports"; + maintainers = with maintainers; [ ma27 ]; + }; + }); + more-properties = super.more-properties.overridePythonAttrs (old: { + src = pkgs.fetchFromGitHub { + owner = "madman-bob"; + repo = "python-more-properties"; + rev = old.version; + sha256 = "sha256-dKG97rw5IG19m7u3ZDBM2yGScL5cFaKBvGZxPVJaUTE="; + }; + postPatch = '' + sed -i -e '/dataclasses/d' requirements.txt + cp ./pypi_upload/setup.py setup.py + substituteInPlace setup.py \ + --replace "parents[1]" "parents[0]" + ''; + }); + dataclasses-serialization = super.dataclasses-serialization.overridePythonAttrs (old: { + src = pkgs.fetchFromGitHub { + owner = "madman-bob"; + repo = "python-dataclasses-serialization"; + rev = old.version; + sha256 = "sha256-jLMR2D01KgzHHRP0zduMBJt8xgBmIquWLCjZYLo2/AA="; + }; + postPatch = '' + sed -i -e '/dataclasses/d' requirements.txt + cp ./pypi_upload/setup.py setup.py + substituteInPlace setup.py \ + --replace "parents[1]" "parents[0]" + ''; + }); + dataclasses = null; + }) + ]; + }) python; + env = python.withPackages (p: [ p.dmarc-metrics-exporter ]); +in + +(pkgs.writeShellScriptBin "prometheus-dmarc-exporter" '' + export PYTHONPATH="${env}/lib/${env.libPrefix}/site-packages''${PYTHONPATH:+:}''${PYTHONPATH}" + exec ${env}/bin/python3 -m dmarc_metrics_exporter "$@" +'') // { + inherit (python.pkgs.dmarc-metrics-exporter) meta; +} diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry-git-overlay.nix b/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry-git-overlay.nix new file mode 100644 index 000000000000..cb8d7170a190 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry-git-overlay.nix @@ -0,0 +1,14 @@ +{ pkgs }: +self: super: { + + dmarc-metrics-exporter = super.dmarc-metrics-exporter.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/jgosmann/dmarc-metrics-exporter.git"; + rev = "3f1a0161d7ed51b9de48c056dcbc545b6375e872"; + sha256 = "18sndv32ig0xq7s42hvkdxbb9qxvycmnrawm3x22cp7zfidgfkh2"; + }; + } + ); + +} diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry.lock b/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry.lock new file mode 100644 index 000000000000..80b99127b0c8 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/poetry.lock @@ -0,0 +1,503 @@ +[[package]] +name = "asgiref" +version = "3.5.0" +description = "ASGI specs, helper code, and adapters" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + +[package.extras] +tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] + +[[package]] +name = "bite-parser" +version = "0.1.1" +description = "Asynchronous parser taking incremental bites out of your byte input stream." +category = "main" +optional = false +python-versions = ">=3.7,<=3.10" + +[[package]] +name = "click" +version = "8.0.4" +description = "Composable command line interface toolkit" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} +importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} + +[[package]] +name = "colorama" +version = "0.4.4" +description = "Cross-platform colored terminal text." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "dataclasses" +version = "0.6" +description = "A backport of the dataclasses module for Python 3.6" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "dataclasses-serialization" +version = "1.3.1" +description = "Serialize/deserialize Python dataclasses to various other data formats" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +dataclasses = "*" +more-properties = ">=1.1.0" +toolz = "*" +toposort = "*" +typing-inspect = "*" + +[[package]] +name = "dmarc-metrics-exporter" +version = "0.5.1" +description = "Export Prometheus metrics from DMARC reports." +category = "main" +optional = false +python-versions = "^3.7,<3.10" +develop = false + +[package.dependencies] +bite-parser = "^0.1.1" +dataclasses-serialization = "^1.3.1" +prometheus_client = "^0.11.0" +typing-extensions = "^4.0.1" +uvicorn = {version = "^0.15.0", extras = ["standard"]} +xsdata = "^21.9" + +[package.source] +type = "git" +url = "https://github.com/jgosmann/dmarc-metrics-exporter.git" +reference = "v0.5.1" +resolved_reference = "3f1a0161d7ed51b9de48c056dcbc545b6375e872" + +[[package]] +name = "h11" +version = "0.13.0" +description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + +[[package]] +name = "httptools" +version = "0.2.0" +description = "A collection of framework independent HTTP protocol utils." +category = "main" +optional = false +python-versions = "*" + +[package.extras] +test = ["Cython (==0.29.22)"] + +[[package]] +name = "importlib-metadata" +version = "4.11.1" +description = "Read metadata from Python packages" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} +zipp = ">=0.5" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +perf = ["ipython"] +testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy (>=0.9.1)", "importlib-resources (>=1.3)"] + +[[package]] +name = "more-properties" +version = "1.1.1" +description = "A collection of property variants" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +dataclasses = "*" + +[[package]] +name = "mypy-extensions" +version = "0.4.3" +description = "Experimental type system extensions for programs checked with the mypy typechecker." +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "prometheus-client" +version = "0.11.0" +description = "Python client for the Prometheus monitoring system." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[package.extras] +twisted = ["twisted"] + +[[package]] +name = "python-dotenv" +version = "0.19.2" +description = "Read key-value pairs from a .env file and set them as environment variables" +category = "main" +optional = false +python-versions = ">=3.5" + +[package.extras] +cli = ["click (>=5.0)"] + +[[package]] +name = "pyyaml" +version = "6.0" +description = "YAML parser and emitter for Python" +category = "main" +optional = false +python-versions = ">=3.6" + +[[package]] +name = "toolz" +version = "0.11.2" +description = "List processing tools and functional utilities" +category = "main" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "toposort" +version = "1.7" +description = "\"Implements a topological sort algorithm.\"" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "typing-extensions" +version = "4.1.1" +description = "Backported and Experimental Type Hints for Python 3.6+" +category = "main" +optional = false +python-versions = ">=3.6" + +[[package]] +name = "typing-inspect" +version = "0.7.1" +description = "Runtime inspection utilities for typing module." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +mypy-extensions = ">=0.3.0" +typing-extensions = ">=3.7.4" + +[[package]] +name = "uvicorn" +version = "0.15.0" +description = "The lightning-fast ASGI server." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +asgiref = ">=3.4.0" +click = ">=7.0" +colorama = {version = ">=0.4", optional = true, markers = "sys_platform == \"win32\" and extra == \"standard\""} +h11 = ">=0.8" +httptools = {version = ">=0.2.0,<0.3.0", optional = true, markers = "extra == \"standard\""} +python-dotenv = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} +PyYAML = {version = ">=5.1", optional = true, markers = "extra == \"standard\""} +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} +uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} +watchgod = {version = ">=0.6", optional = true, markers = "extra == \"standard\""} +websockets = {version = ">=9.1", optional = true, markers = "extra == \"standard\""} + +[package.extras] +standard = ["websockets (>=9.1)", "httptools (>=0.2.0,<0.3.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] + +[[package]] +name = "uvloop" +version = "0.16.0" +description = "Fast implementation of asyncio event loop on top of libuv" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.extras] +dev = ["Cython (>=0.29.24,<0.30.0)", "pytest (>=3.6.0)", "Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)", "aiohttp", "flake8 (>=3.9.2,<3.10.0)", "psutil", "pycodestyle (>=2.7.0,<2.8.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] +docs = ["Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)"] +test = ["aiohttp", "flake8 (>=3.9.2,<3.10.0)", "psutil", "pycodestyle (>=2.7.0,<2.8.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] + +[[package]] +name = "watchgod" +version = "0.7" +description = "Simple, modern file watching and code reload in python." +category = "main" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "websockets" +version = "10.2" +description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)" +category = "main" +optional = false +python-versions = ">=3.7" + +[[package]] +name = "xsdata" +version = "21.12" +description = "Python XML Binding" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} + +[package.extras] +cli = ["click (>=5.0)", "click-default-group (>=1.2)", "docformatter", "jinja2 (>=2.10)", "toposort (>=1.5)"] +docs = ["furo", "sphinx", "sphinx-autobuild", "sphinx-autodoc-typehints", "sphinx-copybutton", "sphinx-inline-tabs"] +lxml = ["lxml (>=4.4.1)"] +soap = ["requests"] +test = ["codecov", "pre-commit", "pytest", "pytest-benchmark", "pytest-cov", "tox"] + +[[package]] +name = "zipp" +version = "3.7.0" +description = "Backport of pathlib-compatible object wrapper for zip files" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.extras] +docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] +testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] + +[metadata] +lock-version = "1.1" +python-versions = "^3.7,<3.10" +content-hash = "60bf34673c42fc90f369a810cb542b1b03c8e52cd019e7a9e86650de19544d01" + +[metadata.files] +asgiref = [ + {file = "asgiref-3.5.0-py3-none-any.whl", hash = "sha256:88d59c13d634dcffe0510be048210188edd79aeccb6a6c9028cdad6f31d730a9"}, + {file = "asgiref-3.5.0.tar.gz", hash = "sha256:2f8abc20f7248433085eda803936d98992f1343ddb022065779f37c5da0181d0"}, +] +bite-parser = [ + {file = "bite-parser-0.1.1.tar.gz", hash = "sha256:8021100bfbd6cc6056605361e763a3591efdea38014b3d8aa76c74c74de4ead4"}, + {file = "bite_parser-0.1.1-py3-none-any.whl", hash = "sha256:96803e7d63112e81544c9747fbd50cca61097dcf5973ae6cc710f3a96646600a"}, +] +click = [ + {file = "click-8.0.4-py3-none-any.whl", hash = "sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1"}, + {file = "click-8.0.4.tar.gz", hash = "sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb"}, +] +colorama = [ + {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, + {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, +] +dataclasses = [ + {file = "dataclasses-0.6-py3-none-any.whl", hash = "sha256:454a69d788c7fda44efd71e259be79577822f5e3f53f029a22d08004e951dc9f"}, + {file = "dataclasses-0.6.tar.gz", hash = "sha256:6988bd2b895eef432d562370bb707d540f32f7360ab13da45340101bc2307d84"}, +] +dataclasses-serialization = [ + {file = "dataclasses_serialization-1.3.1-py3-none-any.whl", hash = "sha256:34294b1a68944c8d8ac00d2a53aecb8499301401aec6d024ba829ac3931e3b2a"}, + {file = "dataclasses_serialization-1.3.1.tar.gz", hash = "sha256:7f9cf6b11e0650ab89691b1a0050dcce3aef4d389dd4540a53316c4151485921"}, +] +dmarc-metrics-exporter = [] +h11 = [ + {file = "h11-0.13.0-py3-none-any.whl", hash = "sha256:8ddd78563b633ca55346c8cd41ec0af27d3c79931828beffb46ce70a379e7442"}, + {file = "h11-0.13.0.tar.gz", hash = "sha256:70813c1135087a248a4d38cc0e1a0181ffab2188141a93eaf567940c3957ff06"}, +] +httptools = [ + {file = "httptools-0.2.0-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:79dbc21f3612a78b28384e989b21872e2e3cf3968532601544696e4ed0007ce5"}, + {file = "httptools-0.2.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:78d03dd39b09c99ec917d50189e6743adbfd18c15d5944392d2eabda688bf149"}, + {file = "httptools-0.2.0-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:a23166e5ae2775709cf4f7ad4c2048755ebfb272767d244e1a96d55ac775cca7"}, + {file = "httptools-0.2.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:3ab1f390d8867f74b3b5ee2a7ecc9b8d7f53750bd45714bf1cb72a953d7dfa77"}, + {file = "httptools-0.2.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a7594f9a010cdf1e16a58b3bf26c9da39bbf663e3b8d46d39176999d71816658"}, + {file = "httptools-0.2.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:01b392a166adcc8bc2f526a939a8aabf89fe079243e1543fd0e7dc1b58d737cb"}, + {file = "httptools-0.2.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:80ffa04fe8c8dfacf6e4cef8277347d35b0442c581f5814f3b0cf41b65c43c6e"}, + {file = "httptools-0.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d5682eeb10cca0606c4a8286a3391d4c3c5a36f0c448e71b8bd05be4e1694bfb"}, + {file = "httptools-0.2.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:a289c27ccae399a70eacf32df9a44059ca2ba4ac444604b00a19a6c1f0809943"}, + {file = "httptools-0.2.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:813871f961edea6cb2fe312f2d9b27d12a51ba92545380126f80d0de1917ea15"}, + {file = "httptools-0.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:cc9be041e428c10f8b6ab358c6b393648f9457094e1dcc11b4906026d43cd380"}, + {file = "httptools-0.2.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:b08d00d889a118f68f37f3c43e359aab24ee29eb2e3fe96d64c6a2ba8b9d6557"}, + {file = "httptools-0.2.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fd3b8905e21431ad306eeaf56644a68fdd621bf8f3097eff54d0f6bdf7262065"}, + {file = "httptools-0.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:200fc1cdf733a9ff554c0bb97a4047785cfaad9875307d6087001db3eb2b417f"}, + {file = "httptools-0.2.0.tar.gz", hash = "sha256:94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"}, +] +importlib-metadata = [ + {file = "importlib_metadata-4.11.1-py3-none-any.whl", hash = "sha256:e0bc84ff355328a4adfc5240c4f211e0ab386f80aa640d1b11f0618a1d282094"}, + {file = "importlib_metadata-4.11.1.tar.gz", hash = "sha256:175f4ee440a0317f6e8d81b7f8d4869f93316170a65ad2b007d2929186c8052c"}, +] +more-properties = [ + {file = "more_properties-1.1.1-py3-none-any.whl", hash = "sha256:0992c49041cb2600e5ff4d8414bdf5761551f5404d00a4e553ced4f14d34b0bb"}, + {file = "more_properties-1.1.1.tar.gz", hash = "sha256:47b136857d89c72b53def0fade2f2e0a23a95071c3eb87d5a77cfc91554f106c"}, +] +mypy-extensions = [ + {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, + {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, +] +prometheus-client = [ + {file = "prometheus_client-0.11.0-py2.py3-none-any.whl", hash = "sha256:b014bc76815eb1399da8ce5fc84b7717a3e63652b0c0f8804092c9363acab1b2"}, + {file = "prometheus_client-0.11.0.tar.gz", hash = "sha256:3a8baade6cb80bcfe43297e33e7623f3118d660d41387593758e2fb1ea173a86"}, +] +python-dotenv = [ + {file = "python-dotenv-0.19.2.tar.gz", hash = "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"}, + {file = "python_dotenv-0.19.2-py2.py3-none-any.whl", hash = "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3"}, +] +pyyaml = [ + {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-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"}, +] +toolz = [ + {file = "toolz-0.11.2-py3-none-any.whl", hash = "sha256:a5700ce83414c64514d82d60bcda8aabfde092d1c1a8663f9200c07fdcc6da8f"}, + {file = "toolz-0.11.2.tar.gz", hash = "sha256:6b312d5e15138552f1bda8a4e66c30e236c831b612b2bf0005f8a1df10a4bc33"}, +] +toposort = [ + {file = "toposort-1.7-py2.py3-none-any.whl", hash = "sha256:8ed8e109e96ae30bf66da2d2155e4eb9989d9c5c743c837e37d9774a4eddd804"}, + {file = "toposort-1.7.tar.gz", hash = "sha256:ddc2182c42912a440511bd7ff5d3e6a1cabc3accbc674a3258c8c41cbfbb2125"}, +] +typing-extensions = [ + {file = "typing_extensions-4.1.1-py3-none-any.whl", hash = "sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2"}, + {file = "typing_extensions-4.1.1.tar.gz", hash = "sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42"}, +] +typing-inspect = [ + {file = "typing_inspect-0.7.1-py2-none-any.whl", hash = "sha256:b1f56c0783ef0f25fb064a01be6e5407e54cf4a4bf4f3ba3fe51e0bd6dcea9e5"}, + {file = "typing_inspect-0.7.1-py3-none-any.whl", hash = "sha256:3cd7d4563e997719a710a3bfe7ffb544c6b72069b6812a02e9b414a8fa3aaa6b"}, + {file = "typing_inspect-0.7.1.tar.gz", hash = "sha256:047d4097d9b17f46531bf6f014356111a1b6fb821a24fe7ac909853ca2a782aa"}, +] +uvicorn = [ + {file = "uvicorn-0.15.0-py3-none-any.whl", hash = "sha256:17f898c64c71a2640514d4089da2689e5db1ce5d4086c2d53699bf99513421c1"}, + {file = "uvicorn-0.15.0.tar.gz", hash = "sha256:d9a3c0dd1ca86728d3e235182683b4cf94cd53a867c288eaeca80ee781b2caff"}, +] +uvloop = [ + {file = "uvloop-0.16.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:6224f1401025b748ffecb7a6e2652b17768f30b1a6a3f7b44660e5b5b690b12d"}, + {file = "uvloop-0.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:30ba9dcbd0965f5c812b7c2112a1ddf60cf904c1c160f398e7eed3a6b82dcd9c"}, + {file = "uvloop-0.16.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bd53f7f5db562f37cd64a3af5012df8cac2c464c97e732ed556800129505bd64"}, + {file = "uvloop-0.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:772206116b9b57cd625c8a88f2413df2fcfd0b496eb188b82a43bed7af2c2ec9"}, + {file = "uvloop-0.16.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b572256409f194521a9895aef274cea88731d14732343da3ecdb175228881638"}, + {file = "uvloop-0.16.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:04ff57aa137230d8cc968f03481176041ae789308b4d5079118331ab01112450"}, + {file = "uvloop-0.16.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a19828c4f15687675ea912cc28bbcb48e9bb907c801873bd1519b96b04fb805"}, + {file = "uvloop-0.16.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e814ac2c6f9daf4c36eb8e85266859f42174a4ff0d71b99405ed559257750382"}, + {file = "uvloop-0.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bd8f42ea1ea8f4e84d265769089964ddda95eb2bb38b5cbe26712b0616c3edee"}, + {file = "uvloop-0.16.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:647e481940379eebd314c00440314c81ea547aa636056f554d491e40503c8464"}, + {file = "uvloop-0.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0d26fa5875d43ddbb0d9d79a447d2ace4180d9e3239788208527c4784f7cab"}, + {file = "uvloop-0.16.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:6ccd57ae8db17d677e9e06192e9c9ec4bd2066b77790f9aa7dede2cc4008ee8f"}, + {file = "uvloop-0.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:089b4834fd299d82d83a25e3335372f12117a7d38525217c2258e9b9f4578897"}, + {file = "uvloop-0.16.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98d117332cc9e5ea8dfdc2b28b0a23f60370d02e1395f88f40d1effd2cb86c4f"}, + {file = "uvloop-0.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e5f2e2ff51aefe6c19ee98af12b4ae61f5be456cd24396953244a30880ad861"}, + {file = "uvloop-0.16.0.tar.gz", hash = "sha256:f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228"}, +] +watchgod = [ + {file = "watchgod-0.7-py3-none-any.whl", hash = "sha256:d6c1ea21df37847ac0537ca0d6c2f4cdf513562e95f77bb93abbcf05573407b7"}, + {file = "watchgod-0.7.tar.gz", hash = "sha256:48140d62b0ebe9dd9cf8381337f06351e1f2e70b2203fa9c6eff4e572ca84f29"}, +] +websockets = [ + {file = "websockets-10.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d5396710f86a306cf52f87fd8ea594a0e894ba0cc5a36059eaca3a477dc332aa"}, + {file = "websockets-10.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b22bdc795e62e71118b63e14a08bacfa4f262fd2877de7e5b950f5ac16b0348f"}, + {file = "websockets-10.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5b04270b5613f245ec84bb2c6a482a9d009aefad37c0575f6cda8499125d5d5c"}, + {file = "websockets-10.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5c335dc0e7dc271ef36df3f439868b3c790775f345338c2f61a562f1074187b"}, + {file = "websockets-10.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6a009eb551c46fd79737791c0c833fc0e5b56bcd1c3057498b262d660b92e9cd"}, + {file = "websockets-10.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a10c0c1ee02164246f90053273a42d72a3b2452a7e7486fdae781138cf7fbe2d"}, + {file = "websockets-10.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7b38a5c9112e3dbbe45540f7b60c5204f49b3cb501b40950d6ab34cd202ab1d0"}, + {file = "websockets-10.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:2aa9b91347ecd0412683f28aabe27f6bad502d89bd363b76e0a3508b1596402e"}, + {file = "websockets-10.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b7fe45ae43ac814beb8ca09d6995b56800676f2cfa8e23f42839dc69bba34a42"}, + {file = "websockets-10.2-cp310-cp310-win32.whl", hash = "sha256:cef40a1b183dcf39d23b392e9dd1d9b07ab9c46aadf294fff1350fb79146e72b"}, + {file = "websockets-10.2-cp310-cp310-win_amd64.whl", hash = "sha256:c21a67ab9a94bd53e10bba21912556027fea944648a09e6508415ad14e37c325"}, + {file = "websockets-10.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cb316b87cbe3c0791c2ad92a5a36bf6adc87c457654335810b25048c1daa6fd5"}, + {file = "websockets-10.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f14bd10e170abc01682a9f8b28b16e6f20acf6175945ef38db6ffe31b0c72c3f"}, + {file = "websockets-10.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:fa35c5d1830d0fb7b810324e9eeab9aa92e8f273f11fdbdc0741dcded6d72b9f"}, + {file = "websockets-10.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:71a4491cfe7a9f18ee57d41163cb6a8a3fa591e0f0564ca8b0ed86b2a30cced4"}, + {file = "websockets-10.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:6193bbc1ee63aadeb9a4d81de0e19477401d150d506aee772d8380943f118186"}, + {file = "websockets-10.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:8beac786a388bb99a66c3be4ab0fb38273c0e3bc17f612a4e0a47c4fc8b9c045"}, + {file = "websockets-10.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:c67d9cacb3f6537ca21e9b224d4fd08481538e43bcac08b3d93181b0816def39"}, + {file = "websockets-10.2-cp37-cp37m-win32.whl", hash = "sha256:a03a25d95cc7400bd4d61a63460b5d85a7761c12075ee2f51de1ffe73aa593d3"}, + {file = "websockets-10.2-cp37-cp37m-win_amd64.whl", hash = "sha256:f8296b8408ec6853b26771599990721a26403e62b9de7e50ac0a056772ac0b5e"}, + {file = "websockets-10.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:7bb9d8a6beca478c7e9bdde0159bd810cc1006ad6a7cb460533bae39da692ca2"}, + {file = "websockets-10.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:05f6e9757017270e7a92a2975e2ae88a9a582ffc4629086fd6039aa80e99cd86"}, + {file = "websockets-10.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:1c9031e90ebfc486e9cdad532b94004ade3aa39a31d3c46c105bb0b579cd2490"}, + {file = "websockets-10.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:82bc33db6d8309dc27a3bee11f7da2288ad925fcbabc2a4bb78f7e9c56249baf"}, + {file = "websockets-10.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:24b879ba7db12bb525d4e58089fcbe6a3df3ce4666523183654170e86d372cbe"}, + {file = "websockets-10.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cf931c33db9c87c53d009856045dd524e4a378445693382a920fa1e0eb77c36c"}, + {file = "websockets-10.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:669e54228a4d9457abafed27cbf0e2b9f401445c4dfefc12bf8e4db9751703b8"}, + {file = "websockets-10.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:bffc65442dd35c473ca9790a3fa3ba06396102a950794f536783f4b8060af8dd"}, + {file = "websockets-10.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d4d110a84b63c5cfdd22485acc97b8b919aefeecd6300c0c9d551e055b9a88ea"}, + {file = "websockets-10.2-cp38-cp38-win32.whl", hash = "sha256:117383d0a17a0dda349f7a8790763dde75c1508ff8e4d6e8328b898b7df48397"}, + {file = "websockets-10.2-cp38-cp38-win_amd64.whl", hash = "sha256:0b66421f9f13d4df60cd48ab977ed2c2b6c9147ae1a33caf5a9f46294422fda1"}, + {file = "websockets-10.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:ac081aa0307f263d63c5ff0727935c736c8dad51ddf2dc9f5d0c4759842aefaa"}, + {file = "websockets-10.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b4059e2ccbe6587b6dc9a01db5fc49ead9a884faa4076eea96c5ec62cb32f42a"}, + {file = "websockets-10.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9ca2ca05a4c29179f06cf6727b45dba5d228da62623ec9df4184413d8aae6cb9"}, + {file = "websockets-10.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97950c7c844ec6f8d292440953ae18b99e3a6a09885e09d20d5e7ecd9b914cf8"}, + {file = "websockets-10.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:98f57b3120f8331cd7440dbe0e776474f5e3632fdaa474af1f6b754955a47d71"}, + {file = "websockets-10.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a72b92f96e5e540d5dda99ee3346e199ade8df63152fa3c737260da1730c411f"}, + {file = "websockets-10.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:038afef2a05893578d10dadbdbb5f112bd115c46347e1efe99f6a356ff062138"}, + {file = "websockets-10.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f09f46b1ff6d09b01c7816c50bd1903cf7d02ebbdb63726132717c2fcda835d5"}, + {file = "websockets-10.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:2349fa81b6b959484bb2bda556ccb9eb70ba68987646a0f8a537a1a18319fb03"}, + {file = "websockets-10.2-cp39-cp39-win32.whl", hash = "sha256:bef03a51f9657fb03d8da6ccd233fe96e04101a852f0ffd35f5b725b28221ff3"}, + {file = "websockets-10.2-cp39-cp39-win_amd64.whl", hash = "sha256:1c1f3b18c8162e3b09761d0c6a0305fd642934202541cc511ef972cb9463261e"}, + {file = "websockets-10.2-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5a38a0175ae82e4a8c4bac29fc01b9ee26d7d5a614e5ee11e7813c68a7d938ce"}, + {file = "websockets-10.2-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c6e56606842bb24e16e36ae7eb308d866b4249cf0be8f63b212f287eeb76b124"}, + {file = "websockets-10.2-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0f73cb2526d6da268e86977b2c4b58f2195994e53070fe567d5487c6436047e6"}, + {file = "websockets-10.2-pp37-pypy37_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0cd02f36d37e503aca88ab23cc0a1a0e92a263d37acf6331521eb38040dcf77b"}, + {file = "websockets-10.2-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:56d48eebe9e39ce0d68701bce3b21df923aa05dcc00f9fd8300de1df31a7c07c"}, + {file = "websockets-10.2.tar.gz", hash = "sha256:8351c3c86b08156337b0e4ece0e3c5ec3e01fcd14e8950996832a23c99416098"}, +] +xsdata = [ + {file = "xsdata-21.12-py3-none-any.whl", hash = "sha256:857ef5d1c1fdee09f7f1a0a0e8f2771c0469dcc60b28f9b2a7b2a0d2aba3a58f"}, + {file = "xsdata-21.12.tar.gz", hash = "sha256:baba44a2909fc928f783b0cdde4e1a96d5c632414588b9934aa8adf5f60002e8"}, +] +zipp = [ + {file = "zipp-3.7.0-py3-none-any.whl", hash = "sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375"}, + {file = "zipp-3.7.0.tar.gz", hash = "sha256:9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d"}, +] diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/pyproject.toml b/pkgs/servers/monitoring/prometheus/dmarc-exporter/pyproject.toml new file mode 100644 index 000000000000..f3b95e154eef --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/pyproject.toml @@ -0,0 +1,14 @@ +[tool.poetry] +name = "dmarc-metrics-exporter-env" +version = "0.5.1" +description = "" +authors = [] + +[tool.poetry.dependencies] +python = "^3.7,<3.10" +dmarc-metrics-exporter = {git="https://github.com/jgosmann/dmarc-metrics-exporter.git", tag = "v0.5.1"} +bite-parser = "0.1.1" + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" diff --git a/pkgs/servers/monitoring/prometheus/dmarc-exporter/update b/pkgs/servers/monitoring/prometheus/dmarc-exporter/update new file mode 100755 index 000000000000..77cfe9ff86d9 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/dmarc-exporter/update @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p poetry poetry2nix.cli +set -eu +poetry lock +poetry2nix lock diff --git a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix index 38976521c0f7..1c24c065ed77 100644 --- a/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix @@ -2,23 +2,28 @@ buildGoModule rec { pname = "gitlab-ci-pipelines-exporter"; - version = "0.4.9"; + version = "0.5.3"; src = fetchFromGitHub { owner = "mvisonneau"; repo = pname; rev = "v${version}"; - sha256 = "13zs8140n4z56i0xkl6jvvmwy80l07dxyb23wxzd5avbdm8knypz"; + sha256 = "1i0ry93w2pk8m7i4fbdn1xvsmvjn83d6lr6l7yywid9d0kmkjz13"; }; - vendorSha256 = "1k620r3d1swhj7cfmqjh5n08da2a6w87fwrsajl0y324iyw2chsa"; + subPackages = [ "cmd/${pname}" ]; + ldflags = [ + "-X main.version=v${version}" + ]; + + vendorSha256 = "UszZaxql5sO4DSDVD/UIjeeDojCQEPF+ATL7O9MaTG8="; doCheck = true; meta = with lib; { description = "Prometheus / OpenMetrics exporter for GitLab CI pipelines insights"; homepage = "https://github.com/mvisonneau/gitlab-ci-pipelines-exporter"; license = licenses.asl20; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut mvisonneau ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index 268cdff93485..6d63c6b1d668 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus-json-exporter"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "json_exporter"; rev = "v${version}"; - sha256 = "0nhww7pbyqpiikcli1ysqa15d4y76h3jaij1j0sj8i3mhv1nsjz9"; + sha256 = "sha256-BzzDa+5YIyaqG88AZumGVEbbHomcNWhVWhSrITdD6XA="; }; - vendorSha256 = "1fiy6x06mqxbv9c4rxfl4q7hvblbzhknkpcp0alz61f3fk5wxsgp"; + vendorSha256 = "sha256-Xw5xsEwd+v2f4DBsjY4q0tzABgNo4NuEtiTMoZ/pFNE="; passthru.tests = { inherit (nixosTests.prometheus-exporters) json; }; diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index e07c8a5a5c0b..4f96e516278f 100644 --- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus-nextcloud-exporter"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "xperimental"; repo = "nextcloud-exporter"; rev = "v${version}"; - sha256 = "0kq0ka2gjlibl7vhk3s4z15ja5ai7cmwl144gj4dyhylp2xzr72a"; + sha256 = "sha256-73IxGxnKgbG50nr57Wft+hh0KT7redrwXc4EZFn25qs="; }; - vendorSha256 = "0qs3p4jl8p0323bklrrhxzql7652pm6a1hj9ch9xyfhkwsx87l4d"; + vendorSha256 = "sha256-vIhHUFg8m6raKF82DcXRGKCgSM2FJ2VTM+MdMjP7KUY="; passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; }; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 7d40e919773d..0da2bb604a0b 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,4 +1,7 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests + # darwin + , CoreFoundation, IOKit +}: buildGoModule rec { pname = "node_exporter"; @@ -17,6 +20,13 @@ buildGoModule rec { # FIXME: tests fail due to read-only nix store doCheck = false; + buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation IOKit ]; + # upstream currently doesn't work with the version of the macOS SDK + # we're building against in nix-darwin without a patch. + # this patch has been submitted upstream at https://github.com/prometheus/node_exporter/pull/2327 + # and only needs to be carried until it lands in a new release. + patches = lib.optionals stdenv.isDarwin [ ./node-exporter/node-exporter-darwin.patch ]; + excludedPackages = [ "docs/node-mixin" ]; ldflags = [ diff --git a/pkgs/servers/monitoring/prometheus/node-exporter/node-exporter-darwin.patch b/pkgs/servers/monitoring/prometheus/node-exporter/node-exporter-darwin.patch new file mode 100644 index 000000000000..8077bbc47511 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/node-exporter/node-exporter-darwin.patch @@ -0,0 +1,17 @@ +diff --git a/collector/powersupplyclass_darwin.go b/collector/powersupplyclass_darwin.go +index a070f64..01d7f18 100644 +--- a/collector/powersupplyclass_darwin.go ++++ b/collector/powersupplyclass_darwin.go +@@ -18,9 +18,11 @@ package collector + + /* + #cgo LDFLAGS: -framework IOKit -framework CoreFoundation ++#include ++#include ++#include + #include + #include +-#include + + // values collected from IOKit Power Source APIs + // Functions documentation available at diff --git a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix index e24d0232dfe2..0925cf5dcc63 100644 --- a/pkgs/servers/monitoring/prometheus/pihole-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pihole-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pihole-exporter"; - version = "0.0.11"; + version = "0.2.0"; src = fetchFromGitHub { owner = "eko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SojEq6pedoq08wo/3zPHex7ex1QqSVIzZpBd49tLOjI="; + sha256 = "sha256-JxznxE4Pq1fhlt3l1jbGWD5eUg5VF0GmewkuSYECG0Y="; }; - vendorSha256 = "sha256-LXgI9ioJgyhUiOCqRku0Q4enZF7q6MB0hYhPJlLusdc="; + vendorSha256 = "sha256-jfpM192LtFGVgsVv+F+P8avTGD5c8I+7JFsn4oVoqr0="; meta = with lib; { description = "Prometheus exporter for PI-Hole's Raspberry PI ad blocker"; diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index 4db534add8c2..af6d6cfebb9c 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { - owner = "wrouesnel"; + owner = "prometheus-community"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-QU/pPw0gOHF5SAET8S/v7nTPyEvBqkxwwGQ42PbQNvw="; + sha256 = "sha256-AH4nVwmNS4YtKxrWlFNqN+Q59TaSCGdoiCfpelPtJuM="; }; - vendorSha256 = "sha256-sSJjJR0wlW95I6bgzLKx4aVcqwKMRyzzWC4uz0BKLNY="; + vendorSha256 = "sha256-ST/Mc8RDEu2G6ufus8Gi7dwdBNIpaKJjn+Fw1AKCaXs="; doCheck = true; diff --git a/pkgs/servers/monitoring/prometheus/promscale/default.nix b/pkgs/servers/monitoring/prometheus/promscale/default.nix index c318a18a9d9e..dd297d4c2585 100644 --- a/pkgs/servers/monitoring/prometheus/promscale/default.nix +++ b/pkgs/servers/monitoring/prometheus/promscale/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "promscale"; - version = "0.8.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = version; - sha256 = "sha256-h76NHEPY3ABq2NbRQXNR+zSkriBasi550rfSkl3Xdas="; + sha256 = "sha256-KF+aD9vJYqNJkJftx27ZsxmOIXZ/2ciKwjwcTw0GBvY="; }; patches = [ ./0001-remove-jaeger-test-dep.patch ]; - vendorSha256 = "sha256-PxmTS8fSh21BcLS4PsSfHhKOXWWJLboPR6E8/Jx/UGY="; + vendorSha256 = "sha256-/cjRM8CrOKnx0BcRu2+MLV28MYLOrG5x1DN24mRUJzQ="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix new file mode 100644 index 000000000000..707c121cc50a --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -0,0 +1,37 @@ +{ lib +, python3 +, nixosTests +}: + +python3.pkgs.buildPythonApplication rec { + pname = "prometheus-pve-exporter"; + version = "2.2.2"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "0vvsiw8nj8zkx6v42f260xbsdd92l0ac4vwpm7w38j3qwvanar7k"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + prometheus-client + proxmoxer + pyyaml + requests + werkzeug + ]; + + doCheck = false; + + pythonImportsCheck = [ "pve_exporter" ]; + + passthru.tests = { + inherit (nixosTests.prometheus-exporters) pve; + }; + + meta = with lib; { + description = "Exposes information gathered from Proxmox VE cluster for use by the Prometheus monitoring system"; + homepage = "https://github.com/prometheus-pve/prometheus-pve-exporter"; + license = licenses.asl20; + maintainers = with maintainers; [ nukaduka ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 59ccf2c80597..fa654c3a4656 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.34.1"; + version = "1.37.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-poD7cuOxrNhhyW/GRxBjlJlRle38aYrQJ/g1d8TZ5o0="; + sha256 = "sha256-S60/SwbMp6INf98MGc26zMZH8q7gBynyaT/ivN7o0rA="; }; - vendorSha256 = "sha256-1ogMI8Aw1xBd2PQ2QRiDLifQL3Z3kU4PbbCgHLHtp6A="; + vendorSha256 = "sha256-u9FfKOD6kiCFTjwQ7LHE9WC4j2vPm0ZCluL8pC4aQIc="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/pkgs/servers/monitoring/prometheus/sql-exporter.nix index 553613a9c7e9..235e8863bc2f 100644 --- a/pkgs/servers/monitoring/prometheus/sql-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "sql_exporter"; - version = "0.4.0"; + version = "0.4.2"; vendorSha256 = null; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "justwatchcom"; repo = pname; rev = "v${version}"; - sha256 = "0dxzcd3b430xby741fdc85k4d2380jrh34xxskmdzxbf2kqdc5k8"; + sha256 = "sha256-Ujon6TLniQrYRxJe4+ZTu4/dI2K94r9M/lBmMizDZrA="; }; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 51fb56382dfc..398af2453547 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "statsd_exporter"; - version = "0.20.2"; + version = "0.22.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "statsd_exporter"; - sha256 = "1k98dmjn2mfwg36khpbxg7yk6rn4sk4v264i4rmqs4v8gss2h3kn"; + sha256 = "sha256-pLzUbeSCMV0yr4gSR7m6NYrpm8ZhCPbwwZ5nQzy6lEM="; }; - vendorSha256 = "1fihbchl5g5z9xrca68kaq26l674chcby634k8iz5h31dai8hpyh"; + vendorSha256 = "sha256-gBeeOxnVT0+x33VuwZhfjk3Fb8JHZdAzaDuFZlUfdgM="; meta = with lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index 27eb3721c95d..8f9e5884ae7c 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus_varnish_exporter"; - version = "1.6"; + version = "1.6.1"; src = fetchFromGitHub { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; rev = version; - sha256 = "1cp7c1w237r271m8b1y8pj5jy7j2iadp4vbislxfyp4kga9i4dcc"; + sha256 = "15w2ijz621caink2imlp1666j0ih5pmlj62cbzggyb34ncl37ifn"; }; - vendorSha256 = "1cslg29l9mmyhpdz14ca9m18iaz4hhznplz8fmi3wa3l8r7ih751"; + vendorSha256 = "00i9znb1pk5jpmyhxfg9zbw935fk3c1r0qrgf868xlcf9p8x2rrz"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index 1dbb31796275..61cf36f882df 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.5.0"; + version = "3.6.2"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "sha256-LHhqQ0p2qt6ZAdkpY1SEAcGXH47TPhHvlDv+eL8GC58="; + sha256 = "sha256-eVGyBynKZLGlsaLwUOx7cJWdRHl65S0Wk1K5c9T8ysQ="; }; - cargoSha256 = "sha256-lNFsO7FSmH1+DLM7ID0vn6234qTdtUoaLSnqKcbHoXE="; + cargoSha256 = "sha256-JbFoaMTs6TPYq2qgBkT7WX1itMXohgcWbC1UvaXOi8o="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 9b07f299f729..883771e424ef 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,19 +4,19 @@ let generic = { subPackages, pname, postInstall ? "", mainProgram }: buildGoModule rec { inherit pname; - version = "6.4.1"; + version = "6.6.6"; shortRev = "3a1ac58"; # for internal version info src = fetchFromGitHub { owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "sha256-tVmjBfRvQQ1+VtARP1lN8Fu06tujZhZj9IpGVF0mKqA="; + sha256 = "sha256-//ZJV34H5c16QjppIH5hyk9eKrfEzKdL6GCVTp/k8Uo="; }; inherit subPackages postInstall; - vendorSha256 = "sha256-fStGEKAR9fzA6Uom6r59jFGTBUfTTj0TzytoJWuicbU="; + vendorSha256 = "sha256-ha8HHd2jYx+rKvRN3FPDZiO180bWciiiRD5yn2gztLk="; doCheck = false; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 12b124b78415..3250d2339941 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGo117Module, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGo117Module rec { +buildGoModule rec { pname = "telegraf"; - version = "1.20.4"; + version = "1.22.0"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGo117Module rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-AK2KCbwFHeryqdK7iYtKEaP8JYINdX1i42/EHCAGkFk="; + sha256 = "sha256-Y7vR6kmh1rObDyyHA2NFvBkilBz+Bx8BHqlAoVY/gGo="; }; - vendorSha256 = "sha256-35jcieU/EdJ3d4WfYhwXpDNZRrS+DQsWZYp2EoxpKU4"; + vendorSha256 = "sha256-oSN6nHOtXA2cSZEmToRvALkSxAyel9BU7bh1groEnsw="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index 269a8c6ba66f..f11af1809981 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -24,6 +24,10 @@ import ./versions.nix ({ version, sha256 }: "--with-libpcre" "--with-openssl=${openssl.dev}" ]; + makeFlags = [ + "AR:=$(AR)" + "RANLIB:=$(RANLIB)" + ]; postInstall = '' cp conf/zabbix_agentd/*.conf $out/etc/zabbix_agentd.conf.d/ diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index c5ba909c4181..2350cd18042a 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater }: +{ lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater, nixosTests }: let pythonEnv = python3.withPackages (packages: with packages; [ tornado - pyserial + pyserial-asyncio pillow lmdb streaming-form-data @@ -12,16 +12,21 @@ let libnacl paho-mqtt pycurl + zeroconf + preprocess-cancellation + jinja2 + dbus-next + apprise ]); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2021-11-13"; + version = "unstable-2022-03-10"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "bed239c90a3b5fef5c6bf4559a774b9d09987c30"; - sha256 = "2gnW6dPsKMfoZnjs9F3opxRCeym+P43ZJOmGM44twfw="; + rev = "ee312ee9c6597c8d077d7c3208ccea4e696c97ca"; + sha256 = "l0VOQIfKgZ/Je4z+SKhWMgYzxye8WKs9W1GkNs7kABo="; }; nativeBuildInputs = [ makeWrapper ]; @@ -34,7 +39,10 @@ in stdenvNoCC.mkDerivation rec { --add-flags "$out/lib/moonraker/moonraker.py" ''; - passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; + passthru = { + updateScript = unstableGitUpdater { url = meta.homepage; }; + tests.moonraker = nixosTests.moonraker; + }; meta = with lib; { description = "API web server for Klipper"; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 9eff996f78c3..c83d6e3e1fbc 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -116,13 +116,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.5"; + version = "0.23.6"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-zsxh/rUJtcuke0zYBrh225Qd6RKo1SiFDbMmROdkyjI="; + sha256 = "sha256-pVIbaCg3qDw7bjhLQHz6Rr3m498LeKNQVhRk4m5tpVQ="; }; buildInputs = [ @@ -157,6 +157,10 @@ let outputs = [ "out" "doc" ] ++ lib.optional (builtins.elem "documentation" features_) "man"; + CXXFLAGS = lib.optionals stdenv.isDarwin [ + "-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0" + ]; + mesonFlags = [ "-Dtest=true" "-Dmanpages=true" diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index d2606148768d..92e446487c05 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchFromGitHub, pkgs, lib, nodejs, nodePackages, pkg-config, libjpeg +{ stdenv, fetchFromGitHub, pkgs, lib, nodejs-14_x, nodePackages, pkg-config, libjpeg , pixman, cairo, pango }: let + nodejs = nodejs-14_x; # No official version ever released src = fetchFromGitHub { owner = "matrix-discord"; repo = "mx-puppet-discord"; - rev = "c17384a6a12a42a528e0b1259f8073e8db89b8f4"; - sha256 = "1yczhfpa4qzvijcpgc2pr10s009qb6jwlfwpcbb17g2wsx6zj0c2"; + rev = "bb6438a504182a7a64048b992179427587ccfded"; + sha256 = "0g2p5xwxxgvlnq0fg0x4q9x4asqyppdv6b5z6bvncm62kc70z6xk"; }; myNodePackages = import ./node-composition.nix { @@ -17,6 +18,7 @@ let in myNodePackages.package.override { pname = "mx-puppet-discord"; + version = "2021-08-01"; inherit src; diff --git a/pkgs/servers/mx-puppet-discord/generate.sh b/pkgs/servers/mx-puppet-discord/generate.sh index 851671a147a8..deac865a33db 100755 --- a/pkgs/servers/mx-puppet-discord/generate.sh +++ b/pkgs/servers/mx-puppet-discord/generate.sh @@ -2,14 +2,15 @@ #! nix-shell -i bash -p nodePackages.node2nix # No official release -rev=c17384a6a12a42a528e0b1259f8073e8db89b8f4 +rev=bb6438a504182a7a64048b992179427587ccfded u=https://raw.githubusercontent.com/matrix-discord/mx-puppet-discord/$rev # Download package.json and package-lock.json curl -O $u/package.json -curl -O $u/package-lock.json +curl $u/package-lock.json | + sed -e 's|git+ssh://git@|git+https://|g' > package-lock.json node2nix \ - --nodejs-12 \ + --nodejs-14 \ --node-env ../../development/node-packages/node-env.nix \ --input package.json \ --lock package-lock.json \ diff --git a/pkgs/servers/mx-puppet-discord/node-composition.nix b/pkgs/servers/mx-puppet-discord/node-composition.nix index 1285e13cfba4..51af28fd44fd 100644 --- a/pkgs/servers/mx-puppet-discord/node-composition.nix +++ b/pkgs/servers/mx-puppet-discord/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import ../../.. { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/mx-puppet-discord/node-packages.nix b/pkgs/servers/mx-puppet-discord/node-packages.nix index b3dc83bb343c..696e401347e7 100644 --- a/pkgs/servers/mx-puppet-discord/node-packages.nix +++ b/pkgs/servers/mx-puppet-discord/node-packages.nix @@ -58,13 +58,13 @@ let sha512 = "JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ=="; }; }; - "@sorunome/matrix-bot-sdk-0.5.8" = { + "@sorunome/matrix-bot-sdk-0.5.13" = { name = "_at_sorunome_slash_matrix-bot-sdk"; packageName = "@sorunome/matrix-bot-sdk"; - version = "0.5.8"; + version = "0.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@sorunome/matrix-bot-sdk/-/matrix-bot-sdk-0.5.8.tgz"; - sha512 = "Uifu8saeD1fPrj6F8ZdYiCeADCluySbdi/nVKJy0NQOi6cA5p68ZaeydlCyl+YuFJoCjsDWBe+Szq9CgFd/SpA=="; + url = "https://registry.npmjs.org/@sorunome/matrix-bot-sdk/-/matrix-bot-sdk-0.5.13.tgz"; + sha512 = "WEeuei8/QS9FO76n71nT17TBZ3tRW2POjOpN7YIvsy5tA0WD0tMUKWZDcTo1A+xKOvzgjRTy9v88rKSLIr4wHA=="; }; }; "@szmarczak/http-timer-4.0.5" = { @@ -76,13 +76,13 @@ let sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; }; }; - "@types/body-parser-1.19.0" = { + "@types/body-parser-1.19.1" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.1.tgz"; + sha512 = "a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg=="; }; }; "@types/cacheable-request-6.0.1" = { @@ -94,31 +94,31 @@ let sha512 = "ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ=="; }; }; - "@types/connect-3.4.34" = { + "@types/connect-3.4.35" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; - version = "3.4.34"; + version = "3.4.35"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz"; - sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"; + sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; }; }; - "@types/express-4.17.11" = { + "@types/express-4.17.13" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.11"; + version = "4.17.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz"; - sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz"; + sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; - "@types/express-serve-static-core-4.17.18" = { + "@types/express-serve-static-core-4.17.24" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.18"; + version = "4.17.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz"; - sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz"; + sha512 = "3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA=="; }; }; "@types/http-cache-semantics-4.0.0" = { @@ -166,22 +166,22 @@ let sha512 = "KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="; }; }; - "@types/qs-6.9.5" = { + "@types/qs-6.9.7" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.5"; + version = "6.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz"; - sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"; + sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; }; }; - "@types/range-parser-1.2.3" = { + "@types/range-parser-1.2.4" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz"; - sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; + url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"; + sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; "@types/react-17.0.0" = { @@ -202,13 +202,13 @@ let sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; }; }; - "@types/serve-static-1.13.9" = { + "@types/serve-static-1.13.10" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.9"; + version = "1.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz"; - sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz"; + sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; }; }; "abbrev-1.1.1" = { @@ -383,13 +383,13 @@ let sha256 = "ab87453cc9db05b3bc691f27e92c5a4a6a14a528c98c7d313d6dd42f1741124a"; }; }; - "better-sqlite3-6.0.1" = { + "better-sqlite3-7.4.3" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "6.0.1"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-6.0.1.tgz"; - sha512 = "4aV1zEknM9g1a6B0mVBx1oIlmYioEJ8gSS3J6EpN1b1bKYEE+N5lmpmXHKNKTi0qjHziSd7XrXwHl1kpqvEcHQ=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-7.4.3.tgz"; + sha512 = "07bKjClZg/f4KMVRkzWtoIvazVPcF1gsvVKVIXlxwleC2DxuIhnra3KCMlUT1rFeRYXXckot2a46UciF2d9KLw=="; }; }; "bindings-1.5.0" = { @@ -410,13 +410,13 @@ let sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524"; }; }; - "bl-4.0.3" = { + "bl-4.1.0" = { name = "bl"; packageName = "bl"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz"; - sha512 = "fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg=="; + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; }; "blurhash-1.1.3" = { @@ -518,13 +518,13 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; - "chalk-4.1.0" = { + "chalk-4.1.1" = { name = "chalk"; packageName = "chalk"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; - sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz"; + sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; }; }; "chownr-1.1.4" = { @@ -536,6 +536,15 @@ let sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; + "chownr-2.0.0" = { + name = "chownr"; + packageName = "chownr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; + }; + }; "clone-response-1.0.2" = { name = "clone-response"; packageName = "clone-response"; @@ -608,6 +617,15 @@ let sha512 = "57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw=="; }; }; + "colorette-1.2.2" = { + name = "colorette"; + packageName = "colorette"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz"; + sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; + }; + }; "colors-1.4.0" = { name = "colors"; packageName = "colors"; @@ -788,6 +806,15 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; + "deepmerge-4.2.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; + sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; + }; + }; "defer-to-connect-2.0.0" = { name = "defer-to-connect"; packageName = "defer-to-connect"; @@ -860,32 +887,32 @@ let sha512 = "A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="; }; }; - "discord-markdown-git://github.com/Sorunome/discord-markdown.git#0f38420fdd41340d6eadd38cd5b71784ca954085" = { + "discord-markdown-git+https://github.com/Sorunome/discord-markdown.git#0f38420fdd41340d6eadd38cd5b71784ca954085" = { name = "discord-markdown"; packageName = "discord-markdown"; version = "2.3.1"; src = fetchgit { - url = "git://github.com/Sorunome/discord-markdown.git"; + url = "https://github.com/Sorunome/discord-markdown.git"; rev = "0f38420fdd41340d6eadd38cd5b71784ca954085"; sha256 = "61a5ffd248b6d2784665fa710bfe4c39f241c75be07dbe53f5f48575a4df229c"; }; }; - "dom-serializer-1.2.0" = { + "dom-serializer-1.3.2" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz"; - sha512 = "n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; + sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; }; }; - "domelementtype-2.1.0" = { + "domelementtype-2.2.0" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz"; - sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz"; + sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; }; }; "domhandler-3.3.0" = { @@ -897,22 +924,22 @@ let sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; }; }; - "domhandler-4.0.0" = { + "domhandler-4.2.0" = { name = "domhandler"; packageName = "domhandler"; - version = "4.0.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz"; - sha512 = "KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz"; + sha512 = "zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA=="; }; }; - "domutils-2.4.4" = { + "domutils-2.7.0" = { name = "domutils"; packageName = "domutils"; - version = "2.4.4"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.4.4.tgz"; - sha512 = "jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz"; + sha512 = "8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg=="; }; }; "ee-first-1.1.1" = { @@ -960,13 +987,13 @@ let sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; }; }; - "entities-2.1.0" = { + "entities-2.2.0" = { name = "entities"; packageName = "entities"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; - sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; "escape-html-1.0.3" = { @@ -987,6 +1014,15 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; + "escape-string-regexp-4.0.0" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; + }; + }; "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; @@ -1158,13 +1194,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "forwarded-0.1.2" = { + "forwarded-0.2.0" = { name = "forwarded"; packageName = "forwarded"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; + sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; }; "fresh-0.5.2" = { @@ -1194,6 +1230,15 @@ let sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; }; }; + "fs-minipass-2.1.0" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; + }; + }; "fs.realpath-1.0.0" = { name = "fs.realpath"; packageName = "fs.realpath"; @@ -1257,13 +1302,13 @@ let sha512 = "ErhWb4IUjQzJ3vGs3+RR12NWlBDDkRciFpAkQ1LPUxi6OnwhGj07gQxjPsyIk69s7qMihwKrKquV6VQq7JNYLA=="; }; }; - "graceful-fs-4.2.4" = { + "graceful-fs-4.2.6" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.4"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; }; }; "has-flag-3.0.0" = { @@ -1329,6 +1374,15 @@ let sha512 = "yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg=="; }; }; + "html-to-text-6.0.0" = { + name = "html-to-text"; + packageName = "html-to-text"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-6.0.0.tgz"; + sha512 = "r0KNC5aqCAItsjlgtirW6RW25c92Ee3ybQj8z//4Sl4suE3HIPqM4deGpYCUJULLjtVPEP1+Ma+1ZeX1iMsCiA=="; + }; + }; "htmlencode-0.0.4" = { name = "htmlencode"; packageName = "htmlencode"; @@ -1347,6 +1401,15 @@ let sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; }; }; + "htmlparser2-6.1.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz"; + sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; + }; + }; "http-cache-semantics-4.1.0" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; @@ -1437,15 +1500,6 @@ let sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; }; - "integer-3.0.1" = { - name = "integer"; - packageName = "integer"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/integer/-/integer-3.0.1.tgz"; - sha512 = "OqtER6W2GIJTIcnT5o2B/pWGgvurnVOYs4OZCgay40QEIbMTnNq4R0KSaIw1TZyFtPWjm5aNM+pBBMTfc3exmw=="; - }; - }; "ipaddr.js-1.9.1" = { name = "ipaddr.js"; packageName = "ipaddr.js"; @@ -1482,6 +1536,15 @@ let sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; }; }; + "is-plain-object-5.0.0" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; + }; + }; "is-promise-2.2.2" = { name = "is-promise"; packageName = "is-promise"; @@ -1545,6 +1608,15 @@ let sha512 = "xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw=="; }; }; + "klona-2.0.4" = { + name = "klona"; + packageName = "klona"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz"; + sha512 = "ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="; + }; + }; "kuler-2.0.0" = { name = "kuler"; packageName = "kuler"; @@ -1563,13 +1635,13 @@ let sha512 = "GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw=="; }; }; - "lodash-4.17.20" = { + "lodash-4.17.21" = { name = "lodash"; packageName = "lodash"; - version = "4.17.20"; + version = "4.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; - sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; }; "lodash.camelcase-4.3.0" = { @@ -1797,6 +1869,15 @@ let sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; }; }; + "minipass-3.1.3" = { + name = "minipass"; + packageName = "minipass"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz"; + sha512 = "Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg=="; + }; + }; "minizlib-1.3.3" = { name = "minizlib"; packageName = "minizlib"; @@ -1806,6 +1887,15 @@ let sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; }; }; + "minizlib-2.1.2" = { + name = "minizlib"; + packageName = "minizlib"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; + }; + }; "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -1878,13 +1968,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "mx-puppet-bridge-0.1.4" = { + "mx-puppet-bridge-0.1.6" = { name = "mx-puppet-bridge"; packageName = "mx-puppet-bridge"; - version = "0.1.4"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/mx-puppet-bridge/-/mx-puppet-bridge-0.1.4.tgz"; - sha512 = "Jg4hszVqQv1n35Mvb5HcfK4VafjB0LaCEay8ylgiu/M2oIPE0fadFNdQpkwssXmShDzSeth/xga3HgP8G6O5Fg=="; + url = "https://registry.npmjs.org/mx-puppet-bridge/-/mx-puppet-bridge-0.1.6.tgz"; + sha512 = "q8XtOcmn25NkdBPM1LWYGAlgZZi+mI7+Dp7F5a1zQD0JM9cMcpW9FIO/JqAer+s3Y8CgTim3JZ2AyrUjfLRKsg=="; }; }; "nan-2.14.2" = { @@ -1896,6 +1986,15 @@ let sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; }; }; + "nanoid-3.1.23" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.23"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz"; + sha512 = "FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw=="; + }; + }; "napi-build-utils-1.0.2" = { name = "napi-build-utils"; packageName = "napi-build-utils"; @@ -1923,13 +2022,13 @@ let sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; }; - "node-abi-2.19.3" = { + "node-abi-2.30.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.19.3"; + version = "2.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz"; - sha512 = "9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.30.0.tgz"; + sha512 = "g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg=="; }; }; "node-emoji-1.10.0" = { @@ -1968,15 +2067,6 @@ let sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; }; }; - "noop-logger-0.1.1" = { - name = "noop-logger"; - packageName = "noop-logger"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz"; - sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; - }; - }; "nopt-4.0.3" = { name = "nopt"; packageName = "nopt"; @@ -1986,13 +2076,13 @@ let sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; }; }; - "normalize-url-4.5.0" = { + "normalize-url-4.5.1" = { name = "normalize-url"; packageName = "normalize-url"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; - sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; }; "normalize-version-1.0.5" = { @@ -2292,13 +2382,13 @@ let sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; }; - "postcss-7.0.35" = { + "postcss-8.3.6" = { name = "postcss"; packageName = "postcss"; - version = "7.0.35"; + version = "8.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; - sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"; + sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; }; "postgres-array-2.0.0" = { @@ -2337,13 +2427,13 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; - "prebuild-install-5.3.6" = { + "prebuild-install-6.1.3" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "5.3.6"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz"; - sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.3.tgz"; + sha512 = "iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q=="; }; }; "prism-media-1.2.3" = { @@ -2382,13 +2472,13 @@ let sha512 = "M7ZNjIO6x+2R/vjSD13yjJPjpoZA8eEwH2Bp2Re0/PvzozD7azikv+SaBtZes4Q1ca/xHjZ4RSCuTag3YZLg1A=="; }; }; - "proxy-addr-2.0.6" = { + "proxy-addr-2.0.7" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; "pump-3.0.0" = { @@ -2526,13 +2616,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-1.27.5" = { + "sanitize-html-2.4.0" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "1.27.5"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.5.tgz"; - sha512 = "M4M5iXDAUEcZKLXkmk90zSYWEtk5NH3JmojQxKxV371fnMh+x9t1rqdmXaGoyEHw3z/X/8vnFhKjGL5xFGOJ3A=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.4.0.tgz"; + sha512 = "Y1OgkUiTPMqwZNRLPERSEi39iOebn2XJLbeiGOBhaJD/yLqtLGu6GE5w7evx177LeGgSE+4p4e107LMiydOf6A=="; }; }; "sax-1.2.4" = { @@ -2661,13 +2751,13 @@ let sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; }; }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; + "source-map-js-0.6.2" = { + name = "source-map-js"; + packageName = "source-map-js"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz"; + sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="; }; }; "spex-3.2.0" = { @@ -2769,15 +2859,6 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; - "supports-color-6.1.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz"; - sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; - }; - }; "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -2805,6 +2886,15 @@ let sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA=="; }; }; + "tar-6.1.0" = { + name = "tar"; + packageName = "tar"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz"; + sha512 = "DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA=="; + }; + }; "tar-fs-2.1.1" = { name = "tar-fs"; packageName = "tar-fs"; @@ -3039,15 +3129,6 @@ let sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; }; }; - "which-pm-runs-1.0.0" = { - name = "which-pm-runs"; - packageName = "which-pm-runs"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz"; - sha1 = "670b3afbc552e0b55df6b7780ca74615f23ad1cb"; - }; - }; "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; @@ -3111,13 +3192,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "ws-7.4.1" = { + "ws-7.5.3" = { name = "ws"; packageName = "ws"; - version = "7.4.1"; + version = "7.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz"; - sha512 = "pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz"; + sha512 = "kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="; }; }; "xtend-4.0.2" = { @@ -3160,10 +3241,10 @@ let sources."@discordjs/collection-0.1.6" sources."@discordjs/form-data-3.0.1" sources."@sindresorhus/is-3.1.2" - (sources."@sorunome/matrix-bot-sdk-0.5.8" // { + (sources."@sorunome/matrix-bot-sdk-0.5.13" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -3172,20 +3253,20 @@ let ]; }) sources."@szmarczak/http-timer-4.0.5" - sources."@types/body-parser-1.19.0" + sources."@types/body-parser-1.19.1" sources."@types/cacheable-request-6.0.1" - sources."@types/connect-3.4.34" - sources."@types/express-4.17.11" - sources."@types/express-serve-static-core-4.17.18" + sources."@types/connect-3.4.35" + sources."@types/express-4.17.13" + sources."@types/express-serve-static-core-4.17.24" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/node-14.6.3" sources."@types/prop-types-15.7.3" - sources."@types/qs-6.9.5" - sources."@types/range-parser-1.2.3" + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" sources."@types/react-17.0.0" sources."@types/responselike-1.0.0" - (sources."@types/serve-static-1.13.9" // { + (sources."@types/serve-static-1.13.10" // { dependencies = [ sources."@types/mime-1.3.2" ]; @@ -3207,10 +3288,19 @@ let sources."base64-js-1.5.1" sources."basic-auth-2.0.1" sources."better-discord.js-git+https://github.com/Sorunome/better-discord.js.git#5e58e1e7510cf2192f3503ca146dd61a56a75c72" - sources."better-sqlite3-6.0.1" + (sources."better-sqlite3-7.4.3" // { + dependencies = [ + sources."chownr-2.0.0" + sources."fs-minipass-2.1.0" + sources."minipass-3.1.3" + sources."minizlib-2.1.2" + sources."mkdirp-1.0.4" + sources."tar-6.1.0" + ]; + }) sources."bindings-1.5.0" sources."bintrees-1.0.1" - (sources."bl-4.0.3" // { + (sources."bl-4.1.0" // { dependencies = [ sources."inherits-2.0.4" sources."readable-stream-3.6.0" @@ -3234,6 +3324,7 @@ let sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.4" + sources."colorette-1.2.2" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" @@ -3261,6 +3352,7 @@ let ]; }) sources."deep-extend-0.6.0" + sources."deepmerge-4.2.2" sources."defer-to-connect-2.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -3268,24 +3360,24 @@ let sources."destroy-1.0.4" sources."detect-libc-1.0.3" sources."diff-3.5.0" - sources."discord-markdown-git://github.com/Sorunome/discord-markdown.git#0f38420fdd41340d6eadd38cd5b71784ca954085" - (sources."dom-serializer-1.2.0" // { + sources."discord-markdown-git+https://github.com/Sorunome/discord-markdown.git#0f38420fdd41340d6eadd38cd5b71784ca954085" + (sources."dom-serializer-1.3.2" // { dependencies = [ - sources."domhandler-4.0.0" + sources."domhandler-4.2.0" ]; }) - sources."domelementtype-2.1.0" + sources."domelementtype-2.2.0" sources."domhandler-3.3.0" - (sources."domutils-2.4.4" // { + (sources."domutils-2.7.0" // { dependencies = [ - sources."domhandler-4.0.0" + sources."domhandler-4.2.0" ]; }) sources."ee-first-1.1.1" sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."entities-2.1.0" + sources."entities-2.2.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -3305,7 +3397,7 @@ let sources."finalhandler-1.1.2" sources."find-replace-3.0.0" sources."fn.name-1.1.0" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-constants-1.0.0" sources."fs-minipass-1.2.7" @@ -3316,13 +3408,14 @@ let sources."glob-7.1.4" sources."glob-to-regexp-0.4.1" sources."got-11.6.0" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.6" sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."hash.js-1.1.7" sources."hasha-5.2.2" sources."he-1.2.0" sources."highlight.js-10.4.1" + sources."html-to-text-6.0.0" sources."htmlencode-0.0.4" sources."htmlparser2-4.1.0" sources."http-cache-semantics-4.1.0" @@ -3334,11 +3427,11 @@ let sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.8" - sources."integer-3.0.1" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-1.0.0" + sources."is-plain-object-5.0.0" sources."is-promise-2.2.2" sources."is-stream-2.0.0" sources."isarray-1.0.0" @@ -3346,9 +3439,10 @@ let sources."js-yaml-3.13.1" sources."json-buffer-3.0.1" sources."keyv-4.0.1" + sources."klona-2.0.4" sources."kuler-2.0.0" sources."linkify-it-2.2.0" - sources."lodash-4.17.20" + sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.padend-4.6.1" sources."lodash.toarray-4.4.0" @@ -3392,12 +3486,13 @@ let ]; }) sources."ms-2.0.0" - (sources."mx-puppet-bridge-0.1.4" // { + (sources."mx-puppet-bridge-0.1.6" // { dependencies = [ sources."events-3.2.0" ]; }) sources."nan-2.14.2" + sources."nanoid-3.1.23" sources."napi-build-utils-1.0.2" (sources."needle-2.6.0" // { dependencies = [ @@ -3406,14 +3501,13 @@ let ]; }) sources."negotiator-0.6.2" - sources."node-abi-2.19.3" + sources."node-abi-2.30.0" sources."node-emoji-1.10.0" sources."node-fetch-2.6.1" sources."node-html-parser-1.4.9" sources."node-pre-gyp-0.11.0" - sources."noop-logger-0.1.1" sources."nopt-4.0.3" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."normalize-version-1.0.5" sources."npm-bundled-1.1.1" sources."npm-normalize-package-bin-1.0.1" @@ -3447,21 +3541,17 @@ let sources."pg-types-2.2.0" sources."pgpass-1.0.4" sources."pify-3.0.0" - (sources."postcss-7.0.35" // { - dependencies = [ - sources."supports-color-6.1.0" - ]; - }) + sources."postcss-8.3.6" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" - sources."prebuild-install-5.3.6" + sources."prebuild-install-6.1.3" sources."prism-media-1.2.3" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."prom-client-13.0.0" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."pump-3.0.0" sources."qs-6.7.0" sources."quick-lru-5.1.1" @@ -3476,7 +3566,13 @@ let sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sanitize-html-1.27.5" + (sources."sanitize-html-2.4.0" // { + dependencies = [ + sources."domhandler-4.2.0" + sources."escape-string-regexp-4.0.0" + sources."htmlparser2-6.1.0" + ]; + }) sources."sax-1.2.4" sources."semver-5.7.0" sources."semver-closest-0.1.2" @@ -3500,7 +3596,7 @@ let }) sources."simple-markdown-0.7.2" sources."simple-swizzle-0.2.2" - sources."source-map-0.6.1" + sources."source-map-js-0.6.2" sources."spex-3.2.0" (sources."split2-3.2.2" // { dependencies = [ @@ -3556,7 +3652,6 @@ let sources."utils-merge-1.0.1" sources."uuid-3.4.0" sources."vary-1.1.2" - sources."which-pm-runs-1.0.0" sources."wide-align-1.1.3" (sources."winston-3.3.3" // { dependencies = [ @@ -3582,7 +3677,7 @@ let ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.1" + sources."ws-7.5.3" sources."xtend-4.0.2" sources."yallist-4.0.0" ]; diff --git a/pkgs/servers/mycorrhiza/default.nix b/pkgs/servers/mycorrhiza/default.nix index 8036d966d722..65c6d8ae77a4 100644 --- a/pkgs/servers/mycorrhiza/default.nix +++ b/pkgs/servers/mycorrhiza/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "mycorrhiza"; - version = "1.7.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "bouncepaw"; repo = "mycorrhiza"; rev = "v${version}"; - sha256 = "1dd18n9lq4wxz7kn1szavigw9098r7rcwz9j53q92mx100fa42q6"; + sha256 = "sha256-+8cW7xNr4gzNHQ/hBpASoe9g7W/QFQhtO/dZ9umgJec="; }; - vendorSha256 = "1s7n0lk3cr4lkay3plvlqfpx2gh03n2afb43gv9lmwljbry9zbss"; + vendorSha256 = "sha256-foAjMPvNJnjpxRAXEgNeYuvDAoBdMwiQc9BiNxifzUc="; subPackages = [ "." ]; diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 226294e5f425..7b6b1238d4d0 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -1,21 +1,23 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -with lib; - -buildGoPackage rec { +buildGoModule rec { pname = "nats-server"; - version = "2.7.0"; - - goPackagePath = "github.com/nats-io/${pname}"; + version = "2.7.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-LQ817nZrFkF1zdj2m2SQK58BqDbUPSnncSWR+Woi+Ao="; + sha256 = "sha256-lMwFh+njzQr1hOJFbO3LnPdBK7U4XmX4F/6MlIRILlU="; }; - meta = { + vendorSha256 = "sha256-EEOvDOqMbqfB0S3Nf7RQMKGSZX802eqa3eGaNjUHxQ4="; + + doCheck = false; + + passthru.tests.nats = nixosTests.nats; + + meta = with lib; { description = "High-Performance server for NATS"; license = licenses.asl20; maintainers = with maintainers; [ swdunlop derekcollison ]; diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index 4d6fdbda636d..247f9d840070 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -1,19 +1,23 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib }: with lib; -buildGoPackage rec { +buildGoModule rec { pname = "nats-streaming-server"; - version = "0.23.0"; - goPackagePath = "github.com/nats-io/${pname}"; + version = "0.24.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-Uol1A4+0V4dUQ7Qw0qRUWHzFBugVDYSulDGTJZ4a+ts="; + sha256 = "sha256-vpDOiFuxLpqor+9SztdZrJvwC8QGwt5+df4R2OTcxlA="; }; + vendorSha256 = "sha256:1m783cq20xlv5aglf252g5127r5ilfq4fqj00vim38v271511hmy"; + + # tests fail and ask to `go install` + doCheck = false; + meta = { description = "NATS Streaming System Server"; license = licenses.asl20; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 5490b29090e0..92e8d6ff5d21 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -33,31 +33,26 @@ let }; }; in { - nextcloud20 = throw '' - Nextcloud v20 has been removed from `nixpkgs` as the support for it was dropped - by upstream in 2021-10. Please upgrade to at least Nextcloud v21 by declaring + nextcloud21 = throw '' + Nextcloud v21 has been removed from `nixpkgs` as the support for it was dropped + by upstream in 2022-02. Please upgrade to at least Nextcloud v22 by declaring - services.nextcloud.package = pkgs.nextcloud21; + services.nextcloud.package = pkgs.nextcloud22; in your NixOS config. - WARNING: if you were on Nextcloud 19 on NixOS 21.05 you have to upgrade to Nextcloud 20 - first on 21.05 because Nextcloud doesn't support upgrades accross multiple major versions! + WARNING: if you were on Nextcloud 20 on NixOS 21.11 you have to upgrade to Nextcloud 21 + first on 21.11 because Nextcloud doesn't support upgrades accross multiple major versions! ''; - nextcloud21 = generic { - version = "21.0.7"; - sha256 = "sha256-WZMhWW613q5c6grR/dzVSCKJKru7XPtRoxgBhi8VE7c="; - }; - nextcloud22 = generic { - version = "22.2.3"; - sha256 = "sha256-ZqKaakkHOMCr7bZ3y2jHyR+rqz5kGaPJnYtAaJnrlCo="; + version = "22.2.6"; + sha256 = "0f1d0f0cb000c51b11886be25a8adce478846c3233572fcf28b44c5d4036e235"; }; nextcloud23 = generic { - version = "23.0.0"; - sha256 = "sha256-w3WSq8O2XI/ShFkoGiT0FLh69S/IwuqXm+P5vnXQGiw="; + version = "23.0.3"; + sha256 = "39401d400fab02a84a175ea6e995b8ed4110fbaea48c876230b4f09755a62986"; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix index de51da4ca661..32c7ac21dae4 100644 --- a/pkgs/servers/nitter/default.nix +++ b/pkgs/servers/nitter/default.nix @@ -2,14 +2,14 @@ nimPackages.buildNimPackage rec { pname = "nitter"; - version = "unstable-2022-01-32"; + version = "unstable-2022-02-11"; nimBinOnly = true; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "cdb4efadfeb5102b501c7ff79261fefc7327edb9"; - sha256 = "sha256-kNK0UQd1whkaZwj98b2JYtYwjUSE1qBcAYytqnSaK1o="; + rev = "6695784050605c77a301c0a66764fa9a9580a2f5"; + sha256 = "1lddzf6m74bw5kkv465cp211xxqbwnfacav7ia3y9i38rrnqwk6m"; }; buildInputs = with nimPackages; [ diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/servers/nominatim/default.nix new file mode 100644 index 000000000000..4b7f9e3e2577 --- /dev/null +++ b/pkgs/servers/nominatim/default.nix @@ -0,0 +1,68 @@ +{ stdenv, lib, fetchFromGitHub, fetchurl +, clang-tools, cmake, bzip2, zlib, expat, boost, git, pandoc, gzip +, postgresql_12 +, python3, python3Packages, php +}: + +let + countryGrid = fetchurl { + # Nominatim docs mention https://www.nominatim.org/data/country_grid.sql.gz but it's not a very good URL for pinning + url = "https://web.archive.org/web/20220323041006/https://nominatim.org/data/country_grid.sql.gz"; + sha256 = "sha256-/mY5Oq9WF0klXOv0xh0TqEJeMmuM5QQJ2IxANRZd4Ek="; + }; +in +stdenv.mkDerivation rec { + pname = "nominatim"; + version = "4.0.1"; + + src = fetchFromGitHub { + owner = "osm-search"; + repo = "Nominatim"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-sKI/KBKveb5kAWJ7y1xw+ZF1thynr402rJhVjkIdFMo="; + }; + + nativeBuildInputs = [ + cmake + clang-tools + git + pandoc + php + ]; + + buildInputs = [ + bzip2 + zlib + expat + boost + python3 + # 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 + ]; + + postPatch = '' + mkdir -p ./data + ln -s ${countryGrid} ./data/country_osm_grid.sql.gz + ''; + + meta = with lib; { + description = "Search engine for OpenStreetMap data"; + homepage = "https://nominatim.org/"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.mausch ]; + }; +} diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 32bc4449e12f..983ff0e8be7d 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "4.3.2"; + version = "4.4.0"; src = fetchurl { url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "sha256-+GNxf79RkmHUXI99e3BZIyboiEj8TiVfVtlgQADku+Y="; + sha256 = "sha256-/+F7wKklFiJ3dTHd650IBSnAYOAx/ZLbk9ofoZF9E8k="; }; buildInputs = [ makeWrapper diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream b/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream deleted file mode 100644 index a18675347d58..000000000000 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream +++ /dev/null @@ -1,4 +0,0 @@ -name apache-jena-fuseki -attribute apache-jena-fuseki -target fuseki-binary.nix -minimize_overwrite diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix index 7788e3ff381a..d9f5978f2649 100644 --- a/pkgs/servers/nosql/cassandra/3.0.nix +++ b/pkgs/servers/nosql/cassandra/3.0.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.0.24"; - sha256 = "1yxw4jg9n49dbi1mjdfpxczsznl9m6sxlzkmzjancmjzvj5s6bvz"; + version = "3.0.26"; + sha256 = "09wim1w2yizcqpja62jk64fhaw3jgnrgrjlrm4kgmcc3g3bsmw6i"; generation = "3_0"; }) diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix index bcdfc8793db5..fc839fa8c356 100644 --- a/pkgs/servers/nosql/cassandra/3.11.nix +++ b/pkgs/servers/nosql/cassandra/3.11.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.11.10"; - sha256 = "1wcv0drhb765fda6kkpsxsyfdv4cqf7nqfwc4bimh4c4djap5rxv"; + version = "3.11.12"; + sha256 = "16j58l7r47qrfh8q7fm92y935ykgvnbj3qn984c42qda15x92hkw"; generation = "3_11"; }) diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 6e2a55b4e948..ca11b838e325 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { $out/LICENSE.txt \ $out/NEWS.txt \ $out/NOTICE.txt \ - $out/javadoc \ $out/share/doc/${pname}-${version} if [[ -d $out/doc ]]; then diff --git a/pkgs/servers/nosql/eventstore/create-deps.sh b/pkgs/servers/nosql/eventstore/create-deps.sh index 8001fea4d26f..afeee592de3d 100755 --- a/pkgs/servers/nosql/eventstore/create-deps.sh +++ b/pkgs/servers/nosql/eventstore/create-deps.sh @@ -8,7 +8,7 @@ set -euo pipefail # this script is inspired: # - pkgs/servers/nosql/eventstore/create-deps.sh # - pkgs/development/dotnet-modules/python-language-server/create_deps.sh -# - pkgs/misc/emulators/ryujinx/updater.sh +# - pkgs/applications/emulators/ryujinx/updater.sh cd "$(dirname "${BASH_SOURCE[0]}")" diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 769c45ffc6c5..035d906b2bdb 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -43,10 +43,6 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - mkdir home - export HOME=$PWD/home - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 export FrameworkPathOverride=${mono}/lib/mono/4.7.1-api # disable default-source so nuget does not try to download from online-repo diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix index 7002749a0df5..7f9ce7d5b568 100644 --- a/pkgs/servers/oauth2-proxy/default.nix +++ b/pkgs/servers/oauth2-proxy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "v${version}"; }; - vendorSha256 = "sha256-bmF38dj+ovVlSbTtv2TSXGLe/W1R4NUbeDrpgGlfPf4="; + vendorSha256 = "sha256-+5/j2lZJpyo67uRRSn4Fd8S2K0gfAGMe69OoEEdWijc="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X main.VERSION=${version}" ]; diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index 1e63b44450e7..a99349d8c0db 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -10,14 +10,14 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-BLtoT6UHsur+jFp4KBlE10/Z/V6RDy0k16H10IC98WQ="; - arm64-linux_hash = "sha256-s8EV/VqiUXWRTNxacx4sy6r+TIAqkqhESAYYa9s0uAQ="; - x64-osx_hash = "sha256-woXFYmX+499NTtWmmGBpZ12PxTUazJ8klA6IPQIDjLE="; + x64-linux_hash = "sha256-O/dfLZst7RFnqDZj8UX6ejL2EBjGnCBY3e8JB3peRgY="; + arm64-linux_hash = "sha256-DkCOK1A7L1gMqY/XPIJFFz7qvUvxA6aJa24Hrh3dT/U="; + x64-osx_hash = "sha256-4N0/FTVhxUooauhh+7u527aViSBILiCb+a4cI17QTAg="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "ombi"; - version = "4.3.3"; + version = "4.10.2"; sourceRoot = "."; diff --git a/pkgs/servers/ombi/update.sh b/pkgs/servers/ombi/update.sh index a549a9f1731d..9b49180b6f11 100755 --- a/pkgs/servers/ombi/update.sh +++ b/pkgs/servers/ombi/update.sh @@ -15,7 +15,7 @@ updateHash() url="https://github.com/Ombi-app/Ombi/releases/download/v$version/$os-$arch.tar.gz" hash=$(nix-prefetch-url --type sha256 $url) - sriHash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)" + sriHash="$(nix hash to-sri --type sha256 $hash)" sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix" } @@ -25,7 +25,7 @@ updateVersion() sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" } -currentVersion=$(cd $dirname && nix eval --raw '(with import ../../.. {}; ombi.version)') +currentVersion=$(cd $dirname && nix eval --raw -f ../../.. ombi.version) latestTag=$(curl https://api.github.com/repos/Ombi-App/Ombi/releases/latest | jq -r ".tag_name") latestVersion="$(expr $latestTag : 'v\(.*\)')" diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 02966d2ac70d..53834e5ccc1f 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation { license = licenses.ipl10; platforms = platforms.linux; maintainers = with maintainers; [ maggesi spacefrogg ]; - broken = versionOlder kernel.version "3.18" || kernel.isHardened; + broken = kernel.kernelOlder "3.18" || kernel.kernelAtLeast "5.17" || kernel.isHardened; }; } diff --git a/pkgs/servers/owncast/default.nix b/pkgs/servers/owncast/default.nix index 68591f458230..774f51bc0f63 100644 --- a/pkgs/servers/owncast/default.nix +++ b/pkgs/servers/owncast/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "owncast"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "owncast"; repo = "owncast"; rev = "v${version}"; - sha256 = "sha256-OcolQ4KnZbSgS1dpphbCML40jlheKAxbac7rjRul6Oc="; + sha256 = "sha256-SVe7CH+qx3hFZ/cay6Hh5+vx0ncHACiNSM6k7fCDH18="; }; - vendorSha256 = "sha256-NARHYeOVT7sxfL1BdJc/CPCgHNZzjWE7kACJvrEC71Y="; + vendorSha256 = "sha256-19FTfUCG1omk5y1HC2yb7/0CM2x6k5BGSM+sZwlKrxY="; propagatedBuildInputs = [ ffmpeg ]; diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 67f7fd76606c..558c21c6cd15 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -1,34 +1,33 @@ { lib, stdenv, callPackage, fetchurl, fetchFromGitHub, buildGoModule, fetchYarnDeps, nixosTests -, esbuild, fixup_yarn_lock, jq, nodejs, yarn -, nodePackages, youtube-dl +, fixup_yarn_lock, jq, nodejs, yarn }: let arch = if stdenv.hostPlatform.system == "x86_64-linux" then "linux-x64" else throw "Unsupported architecture: ${stdenv.hostPlatform.system}"; - version = "3.4.1"; + version = "4.1.1"; source = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - sha256 = "0l1ibqmliy4aq60a16v383v4ijv1c9sf2a35k9q365mkl42jbzx1"; + sha256 = "sha256-yBRontvkcVU3BNUIB6WfH2a5blU9u3CNyHrou16h42s="; }; yarnOfflineCacheServer = fetchYarnDeps { yarnLock = "${source}/yarn.lock"; - sha256 = "0zyxf1km79w6329jay4bcpw5bgvhnvmvl11r9hka5c6s46d3ms7n"; + sha256 = "sha256-L1Nr6sGjYVm42OyeFOQeQ6WEXjmNkngWilBtfQJ6bPE="; }; yarnOfflineCacheTools = fetchYarnDeps { yarnLock = "${source}/server/tools/yarn.lock"; - sha256 = "12xmwc8lnalcpx3nww457avn5zw04ly4pp4kjxkvhsqs69arfl2m"; + sha256 = "sha256-maPR8OCiuNlle0JQIkZSgAqW+BrSxPwVm6CkxIrIg5k="; }; yarnOfflineCacheClient = fetchYarnDeps { yarnLock = "${source}/client/yarn.lock"; - sha256 = "1glnip6mpizif36vil61sw8i8lnn0jg5hrqgqw6k4cc7hkd2qkpc"; + sha256 = "sha256-cBa0lNq9JsYi34EJzl0pPbDXSYL9a8g6MmiL6Ge65ms="; }; bcrypt_version = "5.0.1"; @@ -37,33 +36,12 @@ let sha256 = "3R3dBZyPansTuM77Nmm3f7BbTDkDdiT2HQIrti2Ottc="; }; - wrtc_version = "0.4.7"; - wrtc_lib = fetchurl { - url = "https://node-webrtc.s3.amazonaws.com/wrtc/v${wrtc_version}/Release/${arch}.tar.gz"; - sha256 = "1zd3jlwq3lc2vhmr3bs1h6mrzyswdp3y20vb4d9s67ir9q7jn1zf"; - }; - - esbuild_locked = buildGoModule rec { - pname = "esbuild"; - version = "0.12.17"; - - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - sha256 = "16xxscha2y69mgm20rpjdxykyqiy0qy8gayh8046q6m0sf6834y1"; - }; - vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q"; - }; - in stdenv.mkDerivation rec { inherit version; pname = "peertube"; src = source; - nativeBuildInputs = [ esbuild fixup_yarn_lock jq nodejs yarn ]; - - buildInputs = [ nodePackages.node-gyp-build youtube-dl ]; + nativeBuildInputs = [ fixup_yarn_lock jq nodejs yarn ]; buildPhase = '' # Build node modules @@ -93,31 +71,21 @@ in stdenv.mkDerivation rec { fi mkdir -p ./lib/binding && tar -C ./lib/binding -xf ${bcrypt_lib} - # Fix youtube-dl node module - cd ~/node_modules/youtube-dl - mkdir ./bin - ln -s ${youtube-dl}/bin/youtube-dl ./bin/youtube-dl - cat > ./bin/details <